From 73b2cc55f358cc81bb274c745796e1fb7ee7b3d9 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 9 Feb 2018 22:22:08 +1300
Subject: [PATCH 0001/1036] #1254 - SpringJdbcTransactionManager inifinite
 recursion #1254

Fix. Note tested in ebean-spring-txn.
---
 .../ExternalTransactionScopeManager.java      | 38 +------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java b/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java
index c9701dc16..a80ba0852 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java
@@ -1,12 +1,11 @@
 package io.ebeaninternal.server.transaction;
 
 import io.ebean.config.ExternalTransactionManager;
-import io.ebeaninternal.api.SpiTransaction;
 
 /**
  * A TransactionScopeManager aware of external transaction managers.
  */
-public class ExternalTransactionScopeManager extends TransactionScopeManager {
+public class ExternalTransactionScopeManager extends DefaultTransactionScopeManager {
 
   private final ExternalTransactionManager externalManager;
 
@@ -23,39 +22,4 @@ public class ExternalTransactionScopeManager extends TransactionScopeManager {
     externalManager.setTransactionManager(manager);
   }
 
-  @Override
-  public void commit() {
-    DefaultTransactionThreadLocal.commit(serverName);
-  }
-
-
-  @Override
-  public void end() {
-    DefaultTransactionThreadLocal.end(serverName);
-  }
-
-  @Override
-  public SpiTransaction getMaybeInactive() {
-    return get();
-  }
-
-  @Override
-  public SpiTransaction get() {
-    return (SpiTransaction) externalManager.getCurrentTransaction();
-  }
-
-  @Override
-  public void replace(SpiTransaction trans) {
-    DefaultTransactionThreadLocal.replace(serverName, trans);
-  }
-
-  @Override
-  public void rollback() {
-    DefaultTransactionThreadLocal.rollback(serverName);
-  }
-
-  @Override
-  public void set(SpiTransaction trans) {
-    DefaultTransactionThreadLocal.set(serverName, trans);
-  }
 }

From 175714046a996d075ae4b16409c574dc4c9b1395 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 9 Feb 2018 23:03:07 +1300
Subject: [PATCH 0002/1036] #1254 - SpringJdbcTransactionManager inifinite
 recursion #1254

Yeah, nah. This is the real fix. Expose:

   SpiTransaction TransctionManager.getInScope();

... and have ebean-spring-txn SpringJdbcTransactionManager call it instead of getActive().
---
 .../api/SpiTransactionManager.java            |  2 +-
 .../server/core/DefaultServer.java            |  8 +++----
 .../DefaultTransactionScopeManager.java       |  4 ++--
 .../ExternalTransactionScopeManager.java      |  6 +++++
 .../transaction/TransactionManager.java       | 24 +++++++++----------
 .../transaction/TransactionScopeManager.java  |  8 +++----
 6 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/api/SpiTransactionManager.java b/src/main/java/io/ebeaninternal/api/SpiTransactionManager.java
index e914d200e..d08e5aa2b 100644
--- a/src/main/java/io/ebeaninternal/api/SpiTransactionManager.java
+++ b/src/main/java/io/ebeaninternal/api/SpiTransactionManager.java
@@ -22,7 +22,7 @@ public interface SpiTransactionManager {
   /**
    * Return the currently active transaction (can be null).
    */
-  SpiTransaction get();
+  SpiTransaction getActive();
 
   /**
    * Push an externally managed transaction into scope (e.g. Spring managed transaction).
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 2c3c21d48..1fce54334 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -613,7 +613,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     id = desc.convertId(id);
 
     PersistenceContext pc = null;
-    SpiTransaction t = transactionManager.get();
+    SpiTransaction t = transactionManager.getActive();
     if (t != null) {
       pc = t.getPersistenceContext();
       Object existing = desc.contextGet(pc, id);
@@ -725,7 +725,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    */
   @Override
   public SpiTransaction currentServerTransaction() {
-    return transactionManager.get();
+    return transactionManager.getActive();
   }
 
   /**
@@ -773,7 +773,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    */
   @Override
   public Transaction currentTransaction() {
-    return transactionManager.get();
+    return transactionManager.getActive();
   }
 
   @Override
@@ -2035,7 +2035,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     if (t != null) {
       return new ObtainedTransaction((SpiTransaction) t);
     }
-    SpiTransaction trans = transactionManager.get();
+    SpiTransaction trans = transactionManager.getActive();
     if (trans != null) {
       return new ObtainedTransaction(trans);
     }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java
index 0d54b9b22..0f376b3cb 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java
@@ -28,12 +28,12 @@ public class DefaultTransactionScopeManager extends TransactionScopeManager {
   }
 
   @Override
-  public SpiTransaction getMaybeInactive() {
+  public SpiTransaction getInScope() {
     return DefaultTransactionThreadLocal.get(serverName);
   }
 
   @Override
-  public SpiTransaction get() {
+  public SpiTransaction getActive() {
     SpiTransaction t = DefaultTransactionThreadLocal.get(serverName);
     if (t == null || !t.isActive()) {
       return null;
diff --git a/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java b/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java
index a80ba0852..ffa3bdb1e 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.transaction;
 
 import io.ebean.config.ExternalTransactionManager;
+import io.ebeaninternal.api.SpiTransaction;
 
 /**
  * A TransactionScopeManager aware of external transaction managers.
@@ -22,4 +23,9 @@ public class ExternalTransactionScopeManager extends DefaultTransactionScopeMana
     externalManager.setTransactionManager(manager);
   }
 
+  @Override
+  public SpiTransaction getActive() {
+    return (SpiTransaction) externalManager.getCurrentTransaction();
+  }
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index 1ff2c453e..d4e0379ff 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -201,22 +201,22 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Return the current active transaction.
    */
-  public SpiTransaction get() {
-    return scopeManager.get();
+  public SpiTransaction getActive() {
+    return scopeManager.getActive();
   }
 
   /**
    * Return the current active transaction as a scoped transaction.
    */
-  public ScopedTransaction getScoped() {
-    return (ScopedTransaction) scopeManager.get();
+  public ScopedTransaction getActiveScoped() {
+    return (ScopedTransaction) scopeManager.getActive();
   }
 
   /**
-   * Return the current scoped transaction allowing it to be inactive (already committed or rolled back).
+   * Return the current transaction from thread local scope. Note that it may be inactive.
    */
-  private ScopedTransaction getMaybeInactive() {
-    return (ScopedTransaction)scopeManager.getMaybeInactive();
+  public SpiTransaction getInScope() {
+    return scopeManager.getInScope();
   }
 
   /**
@@ -420,7 +420,7 @@ public class TransactionManager implements SpiTransactionManager {
   }
 
   public void externalModification(TransactionEventTable tableEvent) {
-    SpiTransaction t = get();
+    SpiTransaction t = getActive();
     if (t != null) {
       t.getEvent().add(tableEvent);
     } else {
@@ -555,11 +555,11 @@ public class TransactionManager implements SpiTransactionManager {
    * Exit a scoped transaction (that can be inactive - already committed etc).
    */
   public void exitScopedTransaction(Object returnOrThrowable, int opCode) {
-    ScopedTransaction st = getMaybeInactive();
-    if (st != null) {
+    SpiTransaction st = getInScope();
+    if (st instanceof ScopedTransaction) {
       // can be null for Supports as that can start as a 'No Transaction' and then
       // effectively be replaced by transactions inside the scope
-      st.complete(returnOrThrowable, opCode);
+      ((ScopedTransaction)st).complete(returnOrThrowable, opCode);
     }
   }
 
@@ -588,7 +588,7 @@ public class TransactionManager implements SpiTransactionManager {
     txScope = initTxScope(txScope);
 
     boolean setToScope = false;
-    ScopedTransaction txnContainer = getScoped();
+    ScopedTransaction txnContainer = getActiveScoped();
     if (txnContainer == null) {
       setToScope = true;
       txnContainer = createScopedTransaction();
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java
index 994a667a9..541b07b1d 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java
@@ -20,14 +20,14 @@ public abstract class TransactionScopeManager implements SpiTransactionScopeMana
   public abstract void register(TransactionManager manager);
 
   /**
-   * Return the current Transaction allowing it to be inactive.
+   * Return the current Transaction from internal Ebean scope.
    */
-  public abstract SpiTransaction getMaybeInactive();
+  public abstract SpiTransaction getInScope();
 
   /**
-   * Return the current Transaction for this serverName and Thread.
+   * Return the current Transaction potentially looking in external scope (like Spring).
    */
-  public abstract SpiTransaction get();
+  public abstract SpiTransaction getActive();
 
   /**
    * Set a new Transaction for this serverName and Thread.

From 5b2aa0c74da9635e88b132ee21f8c4945d5e7fb4 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 9 Feb 2018 23:42:28 +1300
Subject: [PATCH 0003/1036] [maven-release-plugin] prepare release
 ebean-11.10.3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f3e7f3cb5..ce7beb2b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.10.3-SNAPSHOT</version>
+  <version>11.10.3</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.10.3</tag>
   </scm>
 
   <profiles>

From f78f24136a5c6063d39589bf908553a6bc289535 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 9 Feb 2018 23:42:42 +1300
Subject: [PATCH 0004/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ce7beb2b4..a2da3dc05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.10.3</version>
+  <version>11.10.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.10.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From e5a1f9f7ccc84d1db20ad331c74683c1a4dc697b Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sat, 10 Feb 2018 00:07:27 +1300
Subject: [PATCH 0005/1036] Testing - modify .travis adding docker service

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 372ace1ff..cfd2f10ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,9 @@ addons:
   postgresql: "9.6"
 
 services:
+  - docker
   - postgresql
+#  - mysql
 
 before_script:
   - ./.travis/setup_database
@@ -19,6 +21,7 @@ before_script:
 env:
   - EBEAN_DB=h2
   - EBEAN_DB=pg
+#  - EBEAN_DB=mysql
 
 install: true
 

From b1027a2f2544b89d997df679997fe202a5420899 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sat, 10 Feb 2018 00:18:33 +1300
Subject: [PATCH 0006/1036] Testing - modify .travis to run mysql as docker
 container

---
 .travis.yml                              | 2 +-
 src/test/resources/docker-run.properties | 8 ++++++--
 src/test/resources/ebean.properties      | 8 +++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cfd2f10ad..1e2f4a947 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ before_script:
 env:
   - EBEAN_DB=h2
   - EBEAN_DB=pg
-#  - EBEAN_DB=mysql
+  - EBEAN_DB=mysql
 
 install: true
 
diff --git a/src/test/resources/docker-run.properties b/src/test/resources/docker-run.properties
index c5f5af698..52369203c 100644
--- a/src/test/resources/docker-run.properties
+++ b/src/test/resources/docker-run.properties
@@ -1,4 +1,10 @@
 
+mysql.version=5.7
+mysql.dbName=test_ebean
+mysql.dbUser=test_ebean
+mysql.dbPassword=test
+mysql.startMode=dropcreate
+
 #sqlserver.version=2017-CU2
 #sqlserver.port=1433
 #sqlserver.dbName=test_ebean
@@ -11,8 +17,6 @@
 #oracle.dbPassword=test
 ##oracle.startMode=dropcreate
 
-#mysql.version=5.7
-#mysql.startMode=dropcreate
 
 #postgres.version=9.6
 ##postgres.dbName=test_db
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 9e9a42ac8..62b6ee97e 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -103,11 +103,9 @@ datasource.hsqldb.databaseUrl=jdbc:hsqldb:mem:tests
 datasource.hsqldb.databaseDriver=org.hsqldb.jdbcDriver
 
 
-datasource.mysql.username=unit
-datasource.mysql.password=unit
-datasource.mysql.databaseUrl=jdbc:mysql://127.0.0.1:3306/unit
-#connection String for Connector/j 6.0
-#datasource.mysql.databaseUrl=jdbc:mysql://127.0.0.1:3306/unit?useLegacyDatetimeCode=false&serverTimezone=UTC
+datasource.mysql.username=test_ebean
+datasource.mysql.password=test
+datasource.mysql.databaseUrl=jdbc:mysql://127.0.0.1:4306/test_ebean
 datasource.mysql.databaseDriver=com.mysql.jdbc.Driver
 
 

From 3fdb76d18f78d836d8bf094be731047d56cd85d5 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sat, 10 Feb 2018 00:31:39 +1300
Subject: [PATCH 0007/1036] Testing - modify .travis to run mysql as service

---
 .travis.yml                              | 10 +++++++++-
 src/test/resources/docker-run.properties | 10 +++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1e2f4a947..c27858e69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,14 +9,22 @@ git:
 
 addons:
   postgresql: "9.6"
+  apt:
+    packages:
+    - mysql-server-5.6
+    - mysql-client-core-5.6
+    - mysql-client-5.6
 
 services:
   - docker
   - postgresql
-#  - mysql
+  - mysql
 
 before_script:
   - ./.travis/setup_database
+  - mysql -u root -e 'CREATE DATABASE test_ebean;'
+  - mysql -u root -e "CREATE USER 'test_ebean'@'localhost' IDENTIFIED BY 'test';"
+  - mysql -u root -e "GRANT ALL ON test_ebean.* TO 'test_ebean'@'localhost';"
 
 env:
   - EBEAN_DB=h2
diff --git a/src/test/resources/docker-run.properties b/src/test/resources/docker-run.properties
index 52369203c..467515d9b 100644
--- a/src/test/resources/docker-run.properties
+++ b/src/test/resources/docker-run.properties
@@ -1,9 +1,9 @@
 
-mysql.version=5.7
-mysql.dbName=test_ebean
-mysql.dbUser=test_ebean
-mysql.dbPassword=test
-mysql.startMode=dropcreate
+#mysql.version=5.7
+#mysql.dbName=test_ebean
+#mysql.dbUser=test_ebean
+#mysql.dbPassword=test
+#mysql.startMode=dropcreate
 
 #sqlserver.version=2017-CU2
 #sqlserver.port=1433

From 0f7158ea18053c57dbf4e37698972eda6bb1981f Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sat, 10 Feb 2018 00:34:34 +1300
Subject: [PATCH 0008/1036] Testing - modify .travis to run mysql as service

---
 src/test/resources/ebean.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 62b6ee97e..826d41ad6 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -105,7 +105,7 @@ datasource.hsqldb.databaseDriver=org.hsqldb.jdbcDriver
 
 datasource.mysql.username=test_ebean
 datasource.mysql.password=test
-datasource.mysql.databaseUrl=jdbc:mysql://127.0.0.1:4306/test_ebean
+datasource.mysql.databaseUrl=jdbc:mysql://127.0.0.1:3306/test_ebean
 datasource.mysql.databaseDriver=com.mysql.jdbc.Driver
 
 

From f1c2f134add02a6cd8dfb0355177bb15350a1503 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sat, 10 Feb 2018 00:56:05 +1300
Subject: [PATCH 0009/1036] #1255 - Regression on raw LIKE expression with
 slashes on Postgres

Related update for Sqlite
---
 .../io/ebean/config/dbplatform/sqlite/SQLitePlatform.java    | 5 +++++
 .../java/io/ebeaninternal/server/core/DefaultContainer.java  | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java b/src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java
index a9a8dd65c..74823549a 100644
--- a/src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java
@@ -19,12 +19,17 @@ public class SQLitePlatform extends DatabasePlatform {
     this.dbIdentity.setSelectLastInsertedIdTemplate("select last_insert_rowid()");
 
     this.booleanDbType = Types.INTEGER;
+    this.likeClauseRaw = "like ?";
+    this.likeClauseEscaped = "like ?";
 
     dbTypeMap.put(DbType.BIT, new DbPlatformType("int default 0"));
     dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("int default 0"));
     dbTypeMap.put(DbType.BIGINT, new DbPlatformType("integer"));
     dbTypeMap.put(DbType.SMALLINT, new DbPlatformType("integer"));
+  }
 
+  protected void escapeLikeCharacter(char ch, StringBuilder sb) {
+    sb.append(ch);
   }
 
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index 1ef44d978..ff4fd4338 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -331,6 +331,7 @@ public class DefaultContainer implements SpiContainer {
       dsConfig.setAutoCommit(true);
       //dsConfig.setReadOnly(true);
       dsConfig.setDefaults(config.getDataSourceConfig());
+      dsConfig.setIsolationLevel(config.getDataSourceConfig().getIsolationLevel());
     }
     String poolName = config.getName() + (readOnly ? "-ro" : "");
     return factory.createPool(poolName, dsConfig);

From 6474f306b596f72ae509f3dc2435d13b852e50a0 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sat, 10 Feb 2018 00:57:19 +1300
Subject: [PATCH 0010/1036] #1255 - Regression on raw LIKE expression with
 slashes on Postgres

Related update for Sqlite
---
 src/test/resources/ebean.properties | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 826d41ad6..39776ad38 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -94,8 +94,6 @@ datasource.sqlite.password=
 datasource.sqlite.databaseUrl=jdbc:sqlite:mydb.db
 datasource.sqlite.databaseDriver=org.sqlite.JDBC
 datasource.sqlite.isolationlevel=read_uncommitted
-datasource.sqlite.minConnections=1
-datasource.sqlite.maxConnections=25
 
 datasource.hsqldb.username=sa
 datasource.hsqldb.password=

From e4d9e4f2de01d950ca3c1a8071115217e94e9971 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sat, 10 Feb 2018 01:04:19 +1300
Subject: [PATCH 0011/1036] Testing - modify .travis to run mysql as service
 (bump MySql version to 5.7)

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c27858e69..90914b1e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,9 +11,9 @@ addons:
   postgresql: "9.6"
   apt:
     packages:
-    - mysql-server-5.6
-    - mysql-client-core-5.6
-    - mysql-client-5.6
+    - mysql-server-5.7
+    - mysql-client-core-5.7
+    - mysql-client-5.7
 
 services:
   - docker
@@ -29,7 +29,7 @@ before_script:
 env:
   - EBEAN_DB=h2
   - EBEAN_DB=pg
-  - EBEAN_DB=mysql
+#  - EBEAN_DB=mysql
 
 install: true
 

From f1b2a09b30929b4b669f16ccfd819ee9a0627248 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sat, 10 Feb 2018 01:16:40 +1300
Subject: [PATCH 0012/1036] Testing - modify .travis to run mysql as service
 (bump MySql version to 5.7)

---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 90914b1e6..2126f0a28 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,11 +9,11 @@ git:
 
 addons:
   postgresql: "9.6"
-  apt:
-    packages:
-    - mysql-server-5.7
-    - mysql-client-core-5.7
-    - mysql-client-5.7
+#  apt:
+#    packages:
+#    - mysql-server-5.7
+#    - mysql-client-core-5.7
+#    - mysql-client-5.7
 
 services:
   - docker

From 17a54e3804f3b1ab43db9abd47461f1c4c0caa0b Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 13 Feb 2018 14:09:08 +1300
Subject: [PATCH 0013/1036] No effective change - extra tests for
 DeployPropertyParser

---
 .../deploy/DeployPropertyParserTest.java      | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java

diff --git a/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java b/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java
new file mode 100644
index 000000000..a6be2b9f7
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java
@@ -0,0 +1,38 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebean.BaseTestCase;
+import org.junit.Test;
+import org.tests.model.basic.Customer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+
+public class DeployPropertyParserTest extends BaseTestCase {
+
+  private final BeanDescriptor<Customer> descriptor = getBeanDescriptor(Customer.class);
+
+  @Test
+  public void depth0_path() {
+    assertThat(parser().parse("pre status post")).isEqualTo("pre ${}status post");
+  }
+
+  @Test
+  public void depth1_path() {
+    assertThat(parser().parse("billingAddress.city")).isEqualTo("${billingAddress}city");
+  }
+
+  @Test
+  public void depth2_path() {
+    assertThat(parser().parse("max(billingAddress.country.name)")).isEqualTo("max(${billingAddress.country}name)");
+  }
+
+  @Test
+  public void unknown_path() {
+    assertThat(parser().parse(" foo ")).isEqualTo(" foo ");
+  }
+
+  private DeployPropertyParser parser() {
+    return descriptor.createDeployPropertyParser();
+  }
+
+}

From a95fd063ae0dc5cafa47b5c8b28d3b8b0023a146 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 13 Feb 2018 14:52:18 +1300
Subject: [PATCH 0014/1036] #1256 - Query where many isNotEmpty() ... on
 ManyToMany with SoftDelete produces incorrect SQL (Part 2)

---
 .../server/deploy/DeployParser.java             | 17 ++++++++++++++---
 .../server/deploy/DeployPropertyParser.java     | 12 +++++++++++-
 .../server/query/CQueryPredicates.java          | 14 ++++----------
 .../server/deploy/DeployPropertyParserTest.java |  5 +++++
 .../java/org/tests/m2m/softdelete/MsManyA.java  | 10 ++++++++++
 5 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java b/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java
index e61e5f144..ff693b1ec 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java
@@ -37,6 +37,8 @@ public abstract class DeployParser {
 
   protected int pos;
 
+  protected String priorWord;
+
   protected String word;
 
   protected char wordTerminator;
@@ -45,7 +47,6 @@ public abstract class DeployParser {
 
   public abstract String getDeployWord(String expression);
 
-
   /**
    * Return the join includes.
    */
@@ -67,8 +68,14 @@ public abstract class DeployParser {
     this.sb = new StringBuilder(source.length() + 20);
 
     while (nextWord()) {
-      String deployWord = convertWord();
-      sb.append(deployWord);
+      if (skipWordConvert()) {
+        sb.append(word);
+        priorWord = word;
+      } else {
+        String deployWord = convertWord();
+        sb.append(deployWord);
+        priorWord = deployWord;
+      }
       if (pos < sourceLength) {
         sb.append(wordTerminator);
         if (wordTerminator == SINGLE_QUOTE) {
@@ -80,6 +87,10 @@ public abstract class DeployParser {
     return sb.toString();
   }
 
+  protected boolean skipWordConvert() {
+    return false;
+  }
+
   private boolean nextWord() {
 
     if (!findWordStart()) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java b/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java
index a698b9f9e..108e8f2d7 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java
@@ -14,12 +14,15 @@ import java.util.Set;
  */
 public final class DeployPropertyParser extends DeployParser {
 
+  private static final String JOIN = "join";
+
+  private static final String FROM = "from";
 
   private final BeanDescriptor<?> beanDescriptor;
 
   private final Set<String> includes = new HashSet<>();
 
-  public DeployPropertyParser(BeanDescriptor<?> beanDescriptor) {
+  DeployPropertyParser(BeanDescriptor<?> beanDescriptor) {
     this.beanDescriptor = beanDescriptor;
   }
 
@@ -28,6 +31,13 @@ public final class DeployPropertyParser extends DeployParser {
     return includes;
   }
 
+  /**
+   * Skip if in raw sql expression with from tableName or join tableName.
+   */
+  protected boolean skipWordConvert() {
+    return FROM.equalsIgnoreCase(priorWord) || JOIN.equalsIgnoreCase(priorWord);
+  }
+
   @Override
   public String getDeployWord(String expression) {
     ElPropertyDeploy elProp = beanDescriptor.getElPropertyDeploy(expression);
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java b/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
index b49f65a59..98fe40941 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.query;
 
-import io.ebeaninternal.server.rawsql.SpiRawSql;
 import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.SpiExpressionList;
 import io.ebeaninternal.api.SpiQuery;
@@ -12,6 +11,7 @@ import io.ebeaninternal.server.expression.DefaultExpressionRequest;
 import io.ebeaninternal.server.persist.Binder;
 import io.ebeaninternal.server.querydefn.OrmQueryProperties;
 import io.ebeaninternal.server.querydefn.OrmUpdateProperties;
+import io.ebeaninternal.server.rawsql.SpiRawSql;
 import io.ebeaninternal.server.type.DataBind;
 import io.ebeaninternal.server.util.BindParamsParser;
 import org.slf4j.Logger;
@@ -318,15 +318,9 @@ public class CQueryPredicates {
   }
 
   private String parse(String expr, DeployParser deployParser) {
-
-    StringBuilder sb = new StringBuilder();
-    if (!isEmpty(expr)) {
-      if (sb.length() > 0) {
-        sb.append(" and ");
-      }
-      sb.append(deployParser.parse(expr));
-    }
-    return sb.toString();
+    if (expr == null) return "";
+    if (expr.isEmpty()) return expr;
+    return deployParser.parse(expr);
   }
 
   private String deriveHaving(DeployParser deployParser) {
diff --git a/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java b/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java
index a6be2b9f7..1d6a9cafa 100644
--- a/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java
@@ -11,6 +11,11 @@ public class DeployPropertyParserTest extends BaseTestCase {
 
   private final BeanDescriptor<Customer> descriptor = getBeanDescriptor(Customer.class);
 
+  @Test
+  public void from_prefix_expect_unchanged() {
+    assertThat(parser().parse("(select x from status join status)")).isEqualTo("(select x from status join status)");
+  }
+
   @Test
   public void depth0_path() {
     assertThat(parser().parse("pre status post")).isEqualTo("pre ${}status post");
diff --git a/src/test/java/org/tests/m2m/softdelete/MsManyA.java b/src/test/java/org/tests/m2m/softdelete/MsManyA.java
index 193eb5b0c..0b9cf1f24 100644
--- a/src/test/java/org/tests/m2m/softdelete/MsManyA.java
+++ b/src/test/java/org/tests/m2m/softdelete/MsManyA.java
@@ -18,6 +18,16 @@ public class MsManyA {
   @SoftDelete
   boolean deleted;
 
+  /**
+   * Name clash with M2M intersection table name.
+   */
+  boolean ms_many_a_many_b;
+
+  /**
+   * Name clash with other side table name.
+   */
+  boolean ms_many_b;
+
   @ManyToMany
   List<MsManyB> manybs;
 

From b2967dec1eb0732430740037d02393997a41606e Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 13 Feb 2018 16:22:52 +1300
Subject: [PATCH 0015/1036] #1257 - ServerConfig with register = true,
 defaultServer = false ... fails as it tries to create the default server

---
 src/main/java/io/ebean/Ebean.java              | 14 +++-----------
 src/main/java/io/ebean/EbeanServerFactory.java |  4 +---
 src/test/java/io/ebean/PrimaryServerTest.java  |  6 +++---
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/main/java/io/ebean/Ebean.java b/src/main/java/io/ebean/Ebean.java
index edb4a5d6f..df48ce3ba 100644
--- a/src/main/java/io/ebean/Ebean.java
+++ b/src/main/java/io/ebean/Ebean.java
@@ -5,10 +5,10 @@ import io.ebean.cache.ServerCacheManager;
 import io.ebean.config.ServerConfig;
 import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;
-import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.annotation.Nullable;
 import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
 import java.util.Collection;
@@ -131,8 +131,7 @@ public final class Ebean {
     private final ConcurrentHashMap<String, EbeanServer> concMap = new ConcurrentHashMap<>();
 
     /**
-     * Cache for synchronized read, creation and put. Protected by the monitor
-     * object.
+     * Cache for synchronized read, creation and put. Protected by the monitor object.
      */
     private final HashMap<String, EbeanServer> syncMap = new HashMap<>();
 
@@ -146,14 +145,7 @@ public final class Ebean {
     private ServerManager() {
 
       try {
-        // skipDefaultServer is set by EbeanServerFactory
-        // ... when it is creating the primaryServer
-        if (PrimaryServer.isSkip()) {
-          // primary server being created by EbeanServerFactory
-          // ... so we should not try and create it here
-          logger.debug("PrimaryServer.isSkip()");
-
-        } else {
+        if (!PrimaryServer.isSkip()) {
           // look to see if there is a default server defined
           String defaultName = PrimaryServer.getDefaultServerName();
           logger.debug("defaultName:{}", defaultName);
diff --git a/src/main/java/io/ebean/EbeanServerFactory.java b/src/main/java/io/ebean/EbeanServerFactory.java
index 090e23e9a..888b54647 100644
--- a/src/main/java/io/ebean/EbeanServerFactory.java
+++ b/src/main/java/io/ebean/EbeanServerFactory.java
@@ -65,10 +65,8 @@ public class EbeanServerFactory {
 
     EbeanServer server = createInternal(config);
 
-    if (config.isDefaultServer()) {
-      PrimaryServer.setSkip(true);
-    }
     if (config.isRegister()) {
+      PrimaryServer.setSkip(true);
       Ebean.register(server, config.isDefaultServer());
     }
 
diff --git a/src/test/java/io/ebean/PrimaryServerTest.java b/src/test/java/io/ebean/PrimaryServerTest.java
index ce5a198dd..56460f7f3 100644
--- a/src/test/java/io/ebean/PrimaryServerTest.java
+++ b/src/test/java/io/ebean/PrimaryServerTest.java
@@ -14,7 +14,7 @@ public class PrimaryServerTest extends BaseTestCase {
 
 
   @Test
-  public void testIsSkipPrimaryServer() throws Exception {
+  public void testIsSkipPrimaryServer() {
     PrimaryServer.setSkip(true);
     assertTrue(PrimaryServer.isSkip());
     PrimaryServer.setSkip(false);
@@ -23,14 +23,14 @@ public class PrimaryServerTest extends BaseTestCase {
 
   @Test
   @ForPlatform(Platform.H2)
-  public void testGetPrimaryServerName() throws Exception {
+  public void testGetPrimaryServerName() {
 
     String primaryServerName = PrimaryServer.getDefaultServerName();
     assertEquals("h2", primaryServerName);
   }
 
   @Test
-  public void testLoadProperties() throws Exception {
+  public void testLoadProperties() {
 
     Properties properties = PrimaryServer.getProperties();
     assertTrue(!properties.isEmpty());

From 7c477827fe5761c653dfe32886bb216ed82896ad Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 14 Feb 2018 12:39:35 +1300
Subject: [PATCH 0016/1036] #1259 - Throw explicit mapping error when an Enum
 is mapped to both ORDINAL and STRING

---
 .../server/deploy/parse/DeployUtil.java       | 34 ++-----
 .../server/type/DefaultTypeManager.java       | 18 ++--
 .../server/type/ScalarTypeDayOfWeek.java      |  9 ++
 .../server/type/ScalarTypeEnum.java           | 16 +++-
 .../server/type/ScalarTypeEnumStandard.java   | 11 +++
 .../type/ScalarTypeEnumWithMapping.java       |  6 ++
 .../server/type/ScalarTypeMonth.java          |  9 ++
 .../io/ebean/server/type/TestTypeManager.java | 20 +++-
 .../server/type/DefaultTypeManagerTest.java   | 91 ++++++++++++++++++-
 9 files changed, 176 insertions(+), 38 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
index 8f524f1ac..b821cb89a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
@@ -112,30 +112,16 @@ public class DeployUtil {
     if (!enumType.isEnum()) {
       throw new IllegalArgumentException("Class [" + enumType + "] is Not a Enum?");
     }
-    ScalarType<?> scalarType = typeManager.getScalarType(enumType);
-    if (enumOverrideDefaultMapping(enumerated, scalarType)) {
-      logger.debug("override default enum mapping for type {}", enumType);
-      scalarType = null;
-    }
-    if (scalarType == null) {
-      // look for @DbEnumValue or @EnumValue annotations etc
-      Class<? extends Enum<?>> enumClass = (Class<? extends Enum<?>>) enumType;
-      EnumType type = enumerated != null ? enumerated.value() : null;
-      scalarType = typeManager.createEnumScalarType(enumClass, type);
-    }
-    prop.setScalarType(scalarType);
-    prop.setDbType(scalarType.getJdbcType());
-  }
+    try {
+	    Class<? extends Enum<?>> enumClass = (Class<? extends Enum<?>>) enumType;
+	    EnumType type = enumerated != null ? enumerated.value() : null;
+      ScalarType<?> scalarType = typeManager.createEnumScalarType(enumClass, type);
+      prop.setScalarType(scalarType);
+      prop.setDbType(scalarType.getJdbcType());
 
-  /**
-   * Return true if there is an existing default mapping for the enum that needs
-   * to be overridden (for example, DayOfWeek defaults to Integer mapping 1 to 7
-   * and some might want this mapped to 'MONDAY' etc).
-   */
-  private boolean enumOverrideDefaultMapping(Enumerated enumerated, ScalarType<?> scalarType) {
-    return enumerated != null && scalarType != null
-      && enumerated.value() == EnumType.STRING
-      && scalarType.getJdbcType() != Types.VARCHAR;
+    } catch (IllegalStateException e) {
+      throw new PersistenceException("Error mapping property " + prop.getFullBeanName() + " - " + e.getMessage());
+    }
   }
 
   /**
@@ -304,7 +290,7 @@ public class DeployUtil {
     prop.setScalarType(scalarType);
   }
 
-  public boolean isClobType(Class<?> type) {
+  private boolean isClobType(Class<?> type) {
     return type.equals(String.class);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 439b4f347..1e3812b3a 100644
--- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -271,6 +271,7 @@ public final class DefaultTypeManager implements TypeManager {
   public void addEnumType(ScalarType<?> scalarType, Class<? extends Enum> enumClass) {
 
     Set<Class<?>> mappedClasses = new HashSet<>();
+    mappedClasses.add(enumClass);
     for (Object value : EnumSet.allOf(enumClass).toArray()) {
       mappedClasses.add(value.getClass());
     }
@@ -552,7 +553,7 @@ public final class DefaultTypeManager implements TypeManager {
    * Return null if the EnumValue annotations are not present/used.
    * </p>
    */
-  private ScalarType<?> createEnumScalarType2(Class<?> enumType) {
+  private ScalarTypeEnum<?> createEnumScalarType2(Class<?> enumType) {
 
     boolean integerType = true;
 
@@ -589,8 +590,11 @@ public final class DefaultTypeManager implements TypeManager {
   @Override
   public ScalarType<?> createEnumScalarType(Class<? extends Enum<?>> enumType, EnumType type) {
 
-    ScalarType<?> scalarType = getScalarType(enumType);
-    if (scalarType != null) {
+    ScalarTypeEnum<?> scalarType = (ScalarTypeEnum<?>) getScalarType(enumType);
+    if (scalarType != null && !scalarType.isOverrideBy(type)) {
+      if (type != null && !scalarType.isCompatible(type)) {
+        throw new IllegalStateException("Error mapping Enum type:"+enumType+" It is mapped using 2 different modes when only one is supported (ORDINAL, STRING or an Ebean mapping)");
+      }
       return scalarType;
     }
 
@@ -603,7 +607,7 @@ public final class DefaultTypeManager implements TypeManager {
     return scalarType;
   }
 
-  private ScalarType<?> createEnumScalarTypePerSpec(Class<?> enumType, EnumType type) {
+  private ScalarTypeEnum<?> createEnumScalarTypePerSpec(Class<?> enumType, EnumType type) {
     if (type == null) {
       // default as per spec is ORDINAL
       return new ScalarTypeEnumStandard.OrdinalEnum(enumType);
@@ -616,7 +620,7 @@ public final class DefaultTypeManager implements TypeManager {
     }
   }
 
-  private ScalarType<?> createEnumScalarTypePerExtentions(Class<? extends Enum<?>> enumType) {
+  private ScalarTypeEnum<?> createEnumScalarTypePerExtentions(Class<? extends Enum<?>> enumType) {
 
     Method[] methods = enumType.getMethods();
     for (Method method : methods) {
@@ -638,7 +642,7 @@ public final class DefaultTypeManager implements TypeManager {
    * Return null if the EnumValue annotations are not present/used.
    * </p>
    */
-  private ScalarType<?> createEnumScalarTypeDbValue(Class<? extends Enum<?>> enumType, Method method, boolean integerType) {
+  private ScalarTypeEnum<?> createEnumScalarTypeDbValue(Class<? extends Enum<?>> enumType, Method method, boolean integerType) {
 
     Map<String, String> nameValueMap = new HashMap<>();
 
@@ -664,7 +668,7 @@ public final class DefaultTypeManager implements TypeManager {
    * length create the ScalarType for the Enum.
    */
   @SuppressWarnings({"unchecked", "rawtypes"})
-  private ScalarType<?> createEnumScalarType(Class enumType, Map<String, String> nameValueMap, boolean integerType, int dbColumnLength) {
+  private ScalarTypeEnum<?> createEnumScalarType(Class enumType, Map<String, String> nameValueMap, boolean integerType, int dbColumnLength) {
 
     EnumToDbValueMap<?> beanDbMap = EnumToDbValueMap.create(integerType);
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java
index 31a46c3fc..9bfc8abca 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.type;
 
+import javax.persistence.EnumType;
 import java.sql.SQLException;
 import java.sql.Types;
 import java.time.DayOfWeek;
@@ -22,6 +23,14 @@ public class ScalarTypeDayOfWeek extends ScalarTypeEnumWithMapping {
     super(beanDbMap, DayOfWeek.class, 1);
   }
 
+  /**
+   * We allow this to be overridden by a JPA EnumType.
+   */
+  @Override
+  public boolean isOverrideBy(EnumType type) {
+    return type != null;
+  }
+
   /**
    * Bind DayOfWeek enum using getValue().
    */
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnum.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnum.java
index f01229e9d..1dc3de475 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnum.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnum.java
@@ -1,15 +1,29 @@
 package io.ebeaninternal.server.type;
 
+import javax.persistence.EnumType;
 import java.util.Set;
 
 /**
  * Marker interface for the Enum scalar types.
  */
-public interface ScalarTypeEnum {
+public interface ScalarTypeEnum<T> extends ScalarType<T> {
 
   /**
    * Return the IN values for DB constraint construction.
    */
   Set<String> getDbCheckConstraintValues();
 
+  /**
+   * Return true if we allow this scalar enum type to be overridden.
+   * Ability to override the built-in support for java time DayOfWeek and Month.
+   */
+  default boolean isOverrideBy(EnumType type) {
+    return false;
+  }
+
+  /**
+   * Return true if the scalar type is compatible with the specified enum type.
+   */
+  boolean isCompatible(EnumType enumType);
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java
index cbcf533ab..17a66a69b 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.text.TextException;
 import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 
+import javax.persistence.EnumType;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
@@ -40,6 +41,11 @@ public class ScalarTypeEnumStandard {
       this.length = maxValueLength(enumType);
     }
 
+    @Override
+    public boolean isCompatible(EnumType enumType) {
+      return EnumType.STRING == enumType;
+    }
+
     /**
      * Return the IN values for DB constraint construction.
      */
@@ -128,6 +134,11 @@ public class ScalarTypeEnumStandard {
       this.enumArray = EnumSet.allOf(enumType).toArray();
     }
 
+    @Override
+    public boolean isCompatible(EnumType enumType) {
+      return EnumType.ORDINAL == enumType;
+    }
+
     /**
      * Return the IN values for DB constraint construction.
      */
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java
index 56e3674fc..fe996266b 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.type;
 
+import javax.persistence.EnumType;
 import java.sql.SQLException;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
@@ -24,6 +25,11 @@ public class ScalarTypeEnumWithMapping extends ScalarTypeEnumStandard.EnumBase i
     this.length = length;
   }
 
+  @Override
+  public boolean isCompatible(EnumType enumType) {
+    return enumType == null;
+  }
+
   @Override
   public long asVersion(Object value) {
     throw new RuntimeException("not supported");
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java
index c4605cad9..0f86ed315 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.type;
 
+import javax.persistence.EnumType;
 import java.sql.SQLException;
 import java.sql.Types;
 import java.time.Month;
@@ -22,6 +23,14 @@ public class ScalarTypeMonth extends ScalarTypeEnumWithMapping {
     super(beanDbMap, Month.class, 1);
   }
 
+  /**
+   * We allow this to be overridden by a JPA EnumType.
+   */
+  @Override
+  public boolean isOverrideBy(EnumType type) {
+    return type != null;
+  }
+
   /**
    * Bind Month enum value.
    */
diff --git a/src/test/java/io/ebean/server/type/TestTypeManager.java b/src/test/java/io/ebean/server/type/TestTypeManager.java
index 4e552b69f..e5ab13393 100644
--- a/src/test/java/io/ebean/server/type/TestTypeManager.java
+++ b/src/test/java/io/ebean/server/type/TestTypeManager.java
@@ -12,10 +12,12 @@ import org.junit.Test;
 import org.tests.model.ivo.Money;
 import org.tests.model.ivo.converter.MoneyTypeConverter;
 
+import javax.persistence.EnumType;
 import java.sql.SQLException;
 import java.sql.Types;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertTrue;
 
 public class TestTypeManager extends BaseTestCase {
 
@@ -42,6 +44,13 @@ public class TestTypeManager extends BaseTestCase {
     assertThat(typeA).isNotNull();
     ScalarType<?> typeC = typeManager.getScalarType(MyEnum.Cval.getClass());
     assertThat(typeC).isNotNull();
+
+    try {
+      typeManager.createEnumScalarType(MyEnum.class, EnumType.STRING);
+      assertTrue("never get here",false);
+    } catch (IllegalStateException e) {
+      assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported");
+    }
   }
 
   @Test
@@ -65,6 +74,13 @@ public class TestTypeManager extends BaseTestCase {
 
     val = dayOfWeekType.read(new DummyDataReader("FRIDAY   "));
     assertThat(val).isEqualTo(MyDayOfWeek.FRIDAY);
+
+    try {
+      typeManager.createEnumScalarType(MyDayOfWeek.class, EnumType.ORDINAL);
+      assertTrue("never get here",false);
+    } catch (IllegalStateException e) {
+      assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported");
+    }
   }
 
   @Test
@@ -73,8 +89,8 @@ public class TestTypeManager extends BaseTestCase {
     DefaultTypeManager typeManager = createTypeManager();
 
     ScalarType<?> scalarType = typeManager.getScalarType(Money.class);
-    Assert.assertTrue(scalarType.getJdbcType() == Types.DECIMAL);
-    Assert.assertTrue(!scalarType.isJdbcNative());
+    assertTrue(scalarType.getJdbcType() == Types.DECIMAL);
+    assertTrue(!scalarType.isJdbcNative());
     Assert.assertEquals(Money.class, scalarType.getType());
 
   }
diff --git a/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java b/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java
index 635f64d04..b03a452f4 100644
--- a/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java
@@ -5,23 +5,28 @@ import io.ebean.config.dbplatform.postgres.PostgresPlatform;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
 import org.junit.Test;
 
+import javax.persistence.EnumType;
+import java.time.DayOfWeek;
+import java.time.Month;
+
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 public class DefaultTypeManagerTest {
 
-  DefaultTypeManager typeManager;
-
-  public DefaultTypeManagerTest() {
+  private DefaultTypeManager create() {
     ServerConfig serverConfig = new ServerConfig();
     serverConfig.setDatabasePlatform(new PostgresPlatform());
     BootupClasses bootupClasses = new BootupClasses();
-    typeManager = new DefaultTypeManager(serverConfig, bootupClasses);
+    return new DefaultTypeManager(serverConfig, bootupClasses);
   }
 
   @Test
   public void isIntegerType() {
 
+    DefaultTypeManager typeManager = create();
+
     assertTrue(typeManager.isIntegerType("1"));
     assertTrue(typeManager.isIntegerType("0"));
 
@@ -33,4 +38,82 @@ public class DefaultTypeManagerTest {
     assertFalse(typeManager.isIntegerType(" A"));
   }
 
+
+  @Test
+  public void enumDayMonth_builtIn_overrideAsString() {
+
+    DefaultTypeManager typeManager = create();
+
+    ScalarType<?> type = typeManager.createEnumScalarType(Month.class, null);
+    assertThat(type).isInstanceOf(ScalarTypeEnumWithMapping.class).as("built in type");
+
+    // mapped explicitly as JPA EnumType.STRING
+    type = typeManager.createEnumScalarType(Month.class, EnumType.STRING);
+    assertThat(type).isInstanceOf(ScalarTypeEnumStandard.StringEnum.class).as("override built in type");
+
+    try {
+      typeManager.createEnumScalarType(Month.class, EnumType.ORDINAL);
+      assertThat(true).isFalse().as("never get here");
+
+    } catch (IllegalStateException e) {
+      assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported");
+    }
+  }
+
+  @Test
+  public void enumMonth_builtIn_overrideAsOrdinal() {
+
+    DefaultTypeManager typeManager = create();
+
+    // mapped explicitly as JPA EnumType.STRING
+    ScalarType<?> type = typeManager.createEnumScalarType(Month.class, EnumType.ORDINAL);
+    assertThat(type).isInstanceOf(ScalarTypeEnumStandard.OrdinalEnum.class).as("override built in type");
+
+    try {
+      typeManager.createEnumScalarType(Month.class, EnumType.STRING);
+      assertThat(true).isFalse().as("never get here");
+
+    } catch (IllegalStateException e) {
+      assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported");
+    }
+  }
+
+  @Test
+  public void enumDayOfWeek_builtIn_overrideAsString() {
+
+    DefaultTypeManager typeManager = create();
+
+    ScalarType<?> type = typeManager.createEnumScalarType(DayOfWeek.class, null);
+    assertThat(type).isInstanceOf(ScalarTypeEnumWithMapping.class).as("built in type");
+
+    // mapped explicitly as JPA EnumType.STRING
+    type = typeManager.createEnumScalarType(DayOfWeek.class, EnumType.STRING);
+    assertThat(type).isInstanceOf(ScalarTypeEnumStandard.StringEnum.class).as("override built in type");
+
+    try {
+      typeManager.createEnumScalarType(DayOfWeek.class, EnumType.ORDINAL);
+      assertThat(true).isFalse().as("never get here");
+
+    } catch (IllegalStateException e) {
+      assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported");
+    }
+  }
+
+  @Test
+  public void enumDayOfWeek_builtIn_overrideAsOrdinal() {
+
+    DefaultTypeManager typeManager = create();
+
+    // mapped explicitly as JPA EnumType.STRING
+    ScalarType<?> type = typeManager.createEnumScalarType(DayOfWeek.class, EnumType.ORDINAL);
+    assertThat(type).isInstanceOf(ScalarTypeEnumStandard.OrdinalEnum.class).as("override built in type");
+
+    try {
+      typeManager.createEnumScalarType(DayOfWeek.class, EnumType.STRING);
+      assertThat(true).isFalse().as("never get here");
+
+    } catch (IllegalStateException e) {
+      assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported");
+    }
+  }
 }

From 2a986ab590f4866bbe5e86bee5a6dce34002c9e2 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 14 Feb 2018 15:28:13 +1300
Subject: [PATCH 0017/1036] #1260 - Mark query.setForUpdate(true) as deprecated
 - migrate to query.forUpdate()

---
 src/main/java/io/ebean/Query.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index 53499f9c6..8d61e223c 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -1436,9 +1436,12 @@ public interface Query<T> {
   String getGeneratedSql();
 
   /**
+   * Deprecated - migrate to forUpdate().
+   *
    * executed the select with "for update" which should lock the record
    * "on read"
    */
+  @Deprecated
   Query<T> setForUpdate(boolean forUpdate);
 
   /**

From 4bd9e6770342f4c094903b9eaf76370dbce29a2a Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 14 Feb 2018 15:29:12 +1300
Subject: [PATCH 0018/1036] [maven-release-plugin] prepare release
 ebean-11.10.4

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a2da3dc05..48881fbd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.10.4-SNAPSHOT</version>
+  <version>11.10.4</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.10.4</tag>
   </scm>
 
   <profiles>

From d9125db9575547755a35e425f8e94746412e0762 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 14 Feb 2018 15:29:26 +1300
Subject: [PATCH 0019/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 48881fbd1..621a03706 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.10.4</version>
+  <version>11.10.5-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.10.4</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 6db9a60f4f27a6f1a52ac348add85f8f1725fb10 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 14 Feb 2018 17:24:14 +1300
Subject: [PATCH 0020/1036] #107 - Fix existing test - Ah ??? ... this
 PrimaryKeyJoinColumn was ignored and should never have been in this test.

---
 src/test/java/org/tests/model/onetoone/OtoBChild.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/tests/model/onetoone/OtoBChild.java b/src/test/java/org/tests/model/onetoone/OtoBChild.java
index a2772a5e8..56c1b58a5 100644
--- a/src/test/java/org/tests/model/onetoone/OtoBChild.java
+++ b/src/test/java/org/tests/model/onetoone/OtoBChild.java
@@ -3,8 +3,8 @@ package org.tests.model.onetoone;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
 import javax.persistence.OneToOne;
-import javax.persistence.PrimaryKeyJoinColumn;
 
 @Entity
 public class OtoBChild {
@@ -16,7 +16,7 @@ public class OtoBChild {
   String child;
 
   @OneToOne
-  @PrimaryKeyJoinColumn(name = "master_id", referencedColumnName = "id")
+  @JoinColumn(name = "master_id", referencedColumnName = "id")
   OtoBMaster master;
 
   public Long getId() {

From 842292ef6b95434ee787eaa512071a964c835b92 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 14 Feb 2018 22:59:57 +1300
Subject: [PATCH 0021/1036] #107 - Mapping - Add support for
 @PrimaryKeyJoinColumn/@PrimaryKeyJoinColumns

---
 .../build/ModelBuildPropertyVisitor.java      | 10 ++-
 .../server/deploy/BeanCascadeInfo.java        |  2 +-
 .../server/deploy/BeanDescriptor.java         |  6 ++
 .../server/deploy/BeanDescriptorManager.java  |  8 ++
 .../server/deploy/BeanPropertyAssocOne.java   | 19 ++--
 .../server/deploy/BeanTable.java              |  9 ++
 .../deploy/meta/DeployBeanDescriptor.java     | 21 ++++-
 .../meta/DeployBeanPropertyAssocOne.java      | 10 +++
 .../deploy/parse/AnnotationAssocOnes.java     | 64 +++++++++++---
 .../server/deploy/parse/DeployBeanInfo.java   | 10 ++-
 .../org/tests/model/onetoone/OtoPrime.java    | 67 ++++++++++++++
 .../tests/model/onetoone/OtoPrimeExtra.java   | 49 +++++++++++
 .../onetoone/TestOneToOnePrimaryKeyJoin.java  | 87 +++++++++++++++++++
 13 files changed, 337 insertions(+), 25 deletions(-)
 create mode 100644 src/test/java/org/tests/model/onetoone/OtoPrime.java
 create mode 100644 src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java
 create mode 100644 src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java

diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
index 719dcbfcc..ba90cdd1c 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
@@ -11,6 +11,7 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 import io.ebeaninternal.server.deploy.IndexDefinition;
 import io.ebeaninternal.server.deploy.InheritInfo;
+import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.deploy.TableJoinColumn;
 import io.ebeaninternal.server.deploy.id.ImportedId;
 
@@ -148,8 +149,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
 
     TableJoinColumn[] columns = p.getTableJoin().columns();
     if (columns.length == 0) {
-      String msg = "No join columns for " + p.getFullBeanName();
-      throw new RuntimeException(msg);
+      throw new RuntimeException("No join columns for " + p.getFullBeanName());
     }
 
     ImportedId importedId = p.getImportedId();
@@ -231,6 +231,12 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
       if (p.getBeanDescriptor().isUseIdGenerator()) {
         col.setIdentity(true);
       }
+      TableJoin primaryKeyJoin = p.getBeanDescriptor().getPrimaryKeyJoin();
+      if (primaryKeyJoin != null) {
+        TableJoinColumn[] columns = primaryKeyJoin.columns();
+        col.setReferences(primaryKeyJoin.getTable() + "." + columns[0].getForeignDbColumn());
+        col.setForeignKeyName(determineForeignKeyConstraintName(col.getName()));
+      }
     } else {
       col.setDefaultValue(p.getDbColumnDefault());
       col.setDbMigrationInfos(p.getDbMigrationInfos());
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java b/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java
index 54801eae9..af231db1d 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java
@@ -22,7 +22,7 @@ public class BeanCascadeInfo {
     }
   }
 
-  private void setType(CascadeType type) {
+  public void setType(CascadeType type) {
     switch (type) {
       case ALL:
         save = true;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 3a225cc92..c5b82b19d 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -179,6 +179,7 @@ public class BeanDescriptor<T> implements BeanType<T> {
   private final String baseTableAsOf;
   private final String baseTableVersionsBetween;
   private final boolean historySupport;
+  private final TableJoin primaryKeyJoin;
 
   private final BeanProperty softDeleteProperty;
   private final boolean softDelete;
@@ -454,6 +455,7 @@ public class BeanDescriptor<T> implements BeanType<T> {
     this.draftTable = deploy.getDraftTable();
     this.baseTable = InternString.intern(deploy.getBaseTable());
     this.baseTableAsOf = deploy.getBaseTableAsOf();
+    this.primaryKeyJoin = deploy.getPrimaryKeyJoin();
     this.baseTableVersionsBetween = deploy.getBaseTableVersionsBetween();
     this.dependentTables = deploy.getDependentTables();
     this.dbComment = deploy.getDbComment();
@@ -2888,6 +2890,10 @@ public class BeanDescriptor<T> implements BeanType<T> {
     }
   }
 
+  public TableJoin getPrimaryKeyJoin() {
+    return primaryKeyJoin;
+  }
+
   @Override
   public BeanProperty getIdProperty() {
     return idProperty;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 20c7396e7..c9341c74a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -1546,6 +1546,14 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     return changeLogListener;
   }
 
+  public void addPrimaryKeyJoin(DeployBeanPropertyAssocOne<?> prop, DeployTableJoin inverse) {
+
+    TableJoin inverseJoin = new TableJoin(inverse);
+
+    DeployBeanInfo<?> target = deployInfoMap.get(prop.getTargetType());
+    target.setPrimaryKeyJoin(inverseJoin);
+  }
+
   /**
    * Comparator to sort the BeanDescriptors by name.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index 6aabd4927..2bc1bd27c 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -39,15 +39,14 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
 
   private final boolean importedPrimaryKey;
 
+  private final boolean primaryKeyExport;
+
   private AssocOneHelp localHelp;
 
   protected final BeanProperty[] embeddedProps;
 
   private final HashMap<String, BeanProperty> embeddedPropsMap;
 
-  /**
-   * The information for Imported foreign Keys.
-   */
   protected ImportedId importedId;
 
   private String deleteByParentIdSql;
@@ -70,6 +69,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
 
     super(descriptor, deploy);
 
+    primaryKeyExport = deploy.isPrimaryKeyExport();
     importedPrimaryKey = deploy.isImportedPrimaryKey();
     oneToOne = deploy.isOneToOne();
     oneToOneExported = deploy.isOneToOneExported();
@@ -550,13 +550,17 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
   @Override
   public void appendSelect(DbSqlContext ctx, boolean subQuery) {
     if (!isTransient) {
-      localHelp.appendSelect(ctx, subQuery);
+      if (primaryKeyExport) {
+        descriptor.getIdProperty().appendSelect(ctx, subQuery);
+      } else {
+        localHelp.appendSelect(ctx, subQuery);
+      }
     }
   }
 
   @Override
   public void appendFrom(DbSqlContext ctx, SqlJoinType joinType) {
-    if (!isTransient) {
+    if (!isTransient && !primaryKeyExport) {
       localHelp.appendFrom(ctx, joinType);
       if (sqlFormulaJoin != null) {
         ctx.appendFormulaJoin(sqlFormulaJoin, joinType);
@@ -734,6 +738,11 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
    */
   public void setParentBeanToChild(EntityBean parent, EntityBean child) {
 
+    if (primaryKeyExport) {
+      Object parentId = descriptor.getId(parent);
+      targetDescriptor.convertSetId(parentId, child);
+    }
+
     if (mappedBy != null) {
       BeanProperty beanProperty = targetDescriptor.getBeanProperty(mappedBy);
       if (beanProperty != null && beanProperty.getValue(child) == null) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java b/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java
index a091aa979..d9e3e1413 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java
@@ -121,4 +121,13 @@ public class BeanTable {
 
   }
 
+  /**
+   * Return the primary key DB column.
+   */
+  public String getIdColumn() {
+    if (idProperties.length != 1) {
+      throw new IllegalStateException("Expecting only one Id column to join to on "+beanType);
+    }
+    return idProperties[0].dbColumn;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index 396c3e06e..2e8b4165c 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -27,6 +27,7 @@ import io.ebeaninternal.server.deploy.ChainedBeanPostLoad;
 import io.ebeaninternal.server.deploy.ChainedBeanQueryAdapter;
 import io.ebeaninternal.server.deploy.IndexDefinition;
 import io.ebeaninternal.server.deploy.InheritInfo;
+import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.deploy.parse.DeployBeanInfo;
 import io.ebeaninternal.server.idgen.UuidIdGenerator;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
@@ -55,10 +56,7 @@ public class DeployBeanDescriptor<T> {
 
     @Override
     public int compare(DeployBeanProperty o1, DeployBeanProperty o2) {
-
-      int v2 = o1.getSortOrder();
-      int v1 = o2.getSortOrder();
-      return (v1 < v2 ? -1 : (v1 == v2 ? 0 : 1));
+      return Integer.compare(o2.getSortOrder(), o1.getSortOrder());
     }
   }
 
@@ -203,6 +201,7 @@ public class DeployBeanDescriptor<T> {
   private DocStoreMode docStoreDelete;
 
   private List<DeployBeanProperty> idProperties;
+  private TableJoin primaryKeyJoin;
 
   private short profileId;
 
@@ -215,6 +214,20 @@ public class DeployBeanDescriptor<T> {
     this.beanType = beanType;
   }
 
+  /**
+   * PK is also a FK.
+   */
+  public void setPrimaryKeyJoin(TableJoin join) {
+    this.primaryKeyJoin = join;
+    this.idType = IdType.EXTERNAL;
+    this.idGeneratorName = null;
+    this.idGenerator = null;
+  }
+
+  public TableJoin getPrimaryKeyJoin() {
+    return primaryKeyJoin;
+  }
+
   /**
    * Return the DeployBeanInfo for the given bean class.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
index fff547d9c..dc21bbe82 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
@@ -9,6 +9,8 @@ public class DeployBeanPropertyAssocOne<T> extends DeployBeanPropertyAssoc<T> {
 
   private boolean oneToOneExported;
 
+  private boolean primaryKeyExport;
+
   private boolean importedPrimaryKey;
 
   private DeployBeanEmbedded deployEmbedded;
@@ -115,4 +117,12 @@ public class DeployBeanPropertyAssocOne<T> extends DeployBeanPropertyAssoc<T> {
   public String getColumnPrefix() {
     return columnPrefix;
   }
+
+  public void setPrimaryKeyExport() {
+    this.primaryKeyExport = true;
+  }
+
+  public boolean isPrimaryKeyExport() {
+    return primaryKeyExport;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index be49ab616..985608df7 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -6,9 +6,15 @@ import io.ebean.config.NamingConvention;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
 import io.ebeaninternal.server.deploy.BeanTable;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
+import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
+import io.ebeaninternal.server.deploy.meta.DeployTableJoin;
+import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn;
 import io.ebeaninternal.server.query.SqlJoinType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Embedded;
 import javax.persistence.EmbeddedId;
@@ -17,6 +23,7 @@ import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToOne;
+import javax.persistence.PrimaryKeyJoinColumn;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -24,12 +31,14 @@ import javax.validation.constraints.NotNull;
  */
 public class AnnotationAssocOnes extends AnnotationParser {
 
+  private static final Logger log = LoggerFactory.getLogger(AnnotationAssocOnes.class);
+
   private final BeanDescriptorManager factory;
 
   /**
    * Create with the deploy Info.
    */
-  public AnnotationAssocOnes(DeployBeanInfo<?> info, boolean javaxValidationAnnotations, BeanDescriptorManager factory) {
+  AnnotationAssocOnes(DeployBeanInfo<?> info, boolean javaxValidationAnnotations, BeanDescriptorManager factory) {
     super(info, javaxValidationAnnotations);
     this.factory = factory;
   }
@@ -88,6 +97,11 @@ public class AnnotationAssocOnes extends AnnotationParser {
       prop.setExtraWhere(where.clause());
     }
 
+    PrimaryKeyJoinColumn primaryKeyJoin = get(prop, PrimaryKeyJoinColumn.class);
+    if (primaryKeyJoin != null) {
+      readPrimaryKeyJoin(primaryKeyJoin, prop);
+    }
+
     FetchPreference fetchPreference = get(prop, FetchPreference.class);
     if (fetchPreference != null) {
       prop.setFetchPreference(fetchPreference.value());
@@ -156,18 +170,21 @@ public class AnnotationAssocOnes extends AnnotationParser {
     return "Error with association to [" + type + "] from [" + from + "]. Is " + type + " registered?";
   }
 
+  private BeanTable beanTable(DeployBeanPropertyAssoc<?> prop) {
+    BeanTable assoc = factory.getBeanTable(prop.getPropertyType());
+    if (assoc == null) {
+      throw new RuntimeException(errorMsgMissingBeanTable(prop.getPropertyType(), prop.getFullBeanName()));
+    }
+    return assoc;
+  }
+
   private void readManyToOne(ManyToOne propAnn, DeployBeanProperty prop) {
 
     DeployBeanPropertyAssocOne<?> beanProp = (DeployBeanPropertyAssocOne<?>) prop;
 
     setCascadeTypes(propAnn.cascade(), beanProp.getCascadeInfo());
 
-    BeanTable assoc = factory.getBeanTable(beanProp.getPropertyType());
-    if (assoc == null) {
-      String msg = errorMsgMissingBeanTable(beanProp.getPropertyType(), prop.getFullBeanName());
-      throw new RuntimeException(msg);
-    }
-    beanProp.setBeanTable(assoc);
+    beanProp.setBeanTable(beanTable(beanProp));
     beanProp.setDbInsertable(true);
     beanProp.setDbUpdateable(true);
     beanProp.setNullable(propAnn.optional());
@@ -187,14 +204,37 @@ public class AnnotationAssocOnes extends AnnotationParser {
     }
 
     setCascadeTypes(propAnn.cascade(), prop.getCascadeInfo());
+    prop.setBeanTable(beanTable(prop));
+  }
 
-    BeanTable assoc = factory.getBeanTable(prop.getPropertyType());
-    if (assoc == null) {
-      String msg = errorMsgMissingBeanTable(prop.getPropertyType(), prop.getFullBeanName());
-      throw new RuntimeException(msg);
+  private void readPrimaryKeyJoin(PrimaryKeyJoinColumn primaryKeyJoin, DeployBeanPropertyAssocOne<?> prop) {
+
+    if (!prop.isOneToOne()) {
+      throw new IllegalStateException("Expecting property " + prop.getFullBeanName() + " with PrimaryKeyJoinColumn to be a OneToOne?");
+    }
+    prop.setPrimaryKeyExport();
+    prop.setOneToOneExported();
+    if (!prop.getCascadeInfo().isSave()) {
+      // we pretty much need to cascade save so turning that on automatically ...
+      prop.getCascadeInfo().setType(CascadeType.ALL);
     }
 
-    prop.setBeanTable(assoc);
+    if (!primaryKeyJoin.name().isEmpty()) {
+      log.warn("Automatically determining join columns and ignoring PrimaryKeyJoinColumn.name {} on {}", primaryKeyJoin.name(), prop.getFullBeanName());
+    }
+    if (!primaryKeyJoin.referencedColumnName().isEmpty()) {
+      log.warn("Automatically determining join columns and Ignoring PrimaryKeyJoinColumn.referencedColumnName {} on {}", primaryKeyJoin.referencedColumnName(), prop.getFullBeanName());
+    }
+
+    BeanTable baseBeanTable = factory.getBeanTable(info.getDescriptor().getBeanType());
+
+    String localPrimaryKey = baseBeanTable.getIdColumn();
+    String foreignColumn = beanTable(prop).getIdColumn();
+
+    prop.getTableJoin().addJoinColumn(new DeployTableJoinColumn(localPrimaryKey, foreignColumn, false, false));
+
+    DeployTableJoin inverse = prop.getTableJoin().createInverse(baseBeanTable.getBaseTable());
+    factory.addPrimaryKeyJoin(prop, inverse);
   }
 
   private void readEmbedded(DeployBeanPropertyAssocOne<?> prop, Embedded embedded) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java
index f84a9dd69..553e263c8 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java
@@ -1,11 +1,12 @@
 package io.ebeaninternal.server.deploy.parse;
 
 import io.ebean.RawSql;
-import io.ebeaninternal.server.rawsql.SpiRawSql;
+import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoin;
 import io.ebeaninternal.server.query.SqlJoinType;
+import io.ebeaninternal.server.rawsql.SpiRawSql;
 
 import java.util.HashMap;
 
@@ -91,4 +92,11 @@ public class DeployBeanInfo<T> {
   public void addNamedQuery(String name, String query) {
     descriptor.addNamedQuery(name, query);
   }
+
+  /**
+   * Set that the PK is also a foreign key.
+   */
+  public void setPrimaryKeyJoin(TableJoin join) {
+    descriptor.setPrimaryKeyJoin(join);
+  }
 }
diff --git a/src/test/java/org/tests/model/onetoone/OtoPrime.java b/src/test/java/org/tests/model/onetoone/OtoPrime.java
new file mode 100644
index 000000000..d1f2ddb20
--- /dev/null
+++ b/src/test/java/org/tests/model/onetoone/OtoPrime.java
@@ -0,0 +1,67 @@
+package org.tests.model.onetoone;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.Version;
+
+@Entity
+public class OtoPrime {
+
+  @Id
+  Long pid;
+
+  String name;
+
+  /**
+   * Automatically set Cascade PERSIST and mapped by.
+   */
+  @OneToOne(optional = false, cascade = CascadeType.ALL) //, mappedBy = "prime")
+  @PrimaryKeyJoinColumn
+  OtoPrimeExtra extra;
+
+  @Version
+  Long version;
+
+  public OtoPrime(String name) {
+    this.name = name;
+  }
+
+  public String toString() {
+    return "id:"+ pid +" name:"+name+" extra:"+extra;
+  }
+
+  public Long getPid() {
+    return pid;
+  }
+
+  public void setPid(Long pid) {
+    this.pid = pid;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public OtoPrimeExtra getExtra() {
+    return extra;
+  }
+
+  public void setExtra(OtoPrimeExtra extra) {
+    this.extra = extra;
+  }
+
+  public Long getVersion() {
+    return version;
+  }
+
+  public void setVersion(Long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java b/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java
new file mode 100644
index 000000000..acb6fc28e
--- /dev/null
+++ b/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java
@@ -0,0 +1,49 @@
+package org.tests.model.onetoone;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Version;
+
+@Entity
+public class OtoPrimeExtra {
+
+  @Id
+  Long eid;
+
+  String extra;
+
+  @Version
+  Long version;
+
+  public OtoPrimeExtra(String extra) {
+    this.extra = extra;
+  }
+
+  public String toString() {
+    return "exId:"+ eid +" "+extra;
+  }
+
+  public Long getEid() {
+    return eid;
+  }
+
+  public void setEid(Long eid) {
+    this.eid = eid;
+  }
+
+  public String getExtra() {
+    return extra;
+  }
+
+  public void setExtra(String extra) {
+    this.extra = extra;
+  }
+
+  public Long getVersion() {
+    return version;
+  }
+
+  public void setVersion(Long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java b/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java
new file mode 100644
index 000000000..b2ab2d1c6
--- /dev/null
+++ b/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java
@@ -0,0 +1,87 @@
+package org.tests.model.onetoone;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.Query;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestOneToOnePrimaryKeyJoin extends BaseTestCase {
+
+
+  private OtoPrime insert(String desc) {
+    OtoPrime prime = new OtoPrime("p" + desc);
+    OtoPrimeExtra extra = new OtoPrimeExtra("e" + desc);
+    prime.setExtra(extra);
+    Ebean.save(prime);
+    return prime;
+  }
+
+  @Test
+  public void insertUpdateDelete() {
+
+    String desc = "" + System.currentTimeMillis();
+    OtoPrime p1 = insert(desc);
+
+    assertThat(p1.getExtra().getEid()).isEqualTo(p1.getPid()).as("Same id values");
+
+
+    Query<OtoPrime> query = Ebean.find(OtoPrime.class).setId(p1.getPid());
+
+    OtoPrime found = query.findOne();
+
+    assertThat(found).isNotNull();
+    assertThat(sqlOf(query)).contains("select t0.pid, t0.name, t0.version, t0.pid from oto_prime t0 where t0.pid = ?")
+      .as("we don't join to oto_prime_extra");
+
+    assertThat(found.getName()).isEqualTo("p" + desc);
+
+    Query<OtoPrime> queryWithFetch = Ebean.find(OtoPrime.class)
+      .setId(p1.getPid())
+      .fetch("extra");
+
+    OtoPrime oneWith = queryWithFetch.findOne();
+
+    assertThat(oneWith).isNotNull();
+    assertThat(sqlOf(queryWithFetch)).contains("select t0.pid, t0.name, t0.version, t1.eid, t1.extra, t1.version from oto_prime t0 join oto_prime_extra t1 on t1.eid = t0.pid  where t0.pid = ?")
+      .as("we join to oto_prime_extra");
+
+
+    assertThat(oneWith.getExtra().getExtra()).isEqualTo("e" + desc);
+
+    thenUpdate(oneWith);
+    thenDelete(found);
+  }
+
+  private void thenUpdate(OtoPrime oneWith) {
+
+    OtoPrimeExtra extra = oneWith.getExtra();
+    extra.setExtra("modified");
+
+    Ebean.save(oneWith);
+
+    extra.setExtra("mod2");
+    oneWith.setName("mod2");
+
+    Ebean.save(oneWith);
+  }
+
+  private void thenDelete(OtoPrime found) {
+
+
+    OtoPrime bean = Ebean.find(OtoPrime.class, found.getPid());
+
+    LoggedSqlCollector.start();
+    Ebean.delete(bean);
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("delete from oto_prime_extra where");
+    assertThat(sql.get(1)).contains("delete from oto_prime where");
+
+  }
+}

From 6a067c0cf718643ab7e7892ff5a3522e6276160f Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 14 Feb 2018 23:09:10 +1300
Subject: [PATCH 0022/1036] #107 - Mapping - Add support for
 @PrimaryKeyJoinColumn/@PrimaryKeyJoinColumns

Extra test with UUID and optional OneToOne so has left join
---
 .../org/tests/model/onetoone/OtoPrime.java    |  3 +-
 .../org/tests/model/onetoone/OtoUPrime.java   | 68 +++++++++++++++
 .../tests/model/onetoone/OtoUPrimeExtra.java  | 50 +++++++++++
 .../TestOneToOnePrimaryKeyJoinOptional.java   | 87 +++++++++++++++++++
 4 files changed, 207 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/org/tests/model/onetoone/OtoUPrime.java
 create mode 100644 src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java
 create mode 100644 src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java

diff --git a/src/test/java/org/tests/model/onetoone/OtoPrime.java b/src/test/java/org/tests/model/onetoone/OtoPrime.java
index d1f2ddb20..771b2de9b 100644
--- a/src/test/java/org/tests/model/onetoone/OtoPrime.java
+++ b/src/test/java/org/tests/model/onetoone/OtoPrime.java
@@ -17,8 +17,9 @@ public class OtoPrime {
 
   /**
    * Automatically set Cascade PERSIST and mapped by.
+   * OneToOne not optional so inner join to extra.
    */
-  @OneToOne(optional = false, cascade = CascadeType.ALL) //, mappedBy = "prime")
+  @OneToOne(optional = false, cascade = CascadeType.ALL)
   @PrimaryKeyJoinColumn
   OtoPrimeExtra extra;
 
diff --git a/src/test/java/org/tests/model/onetoone/OtoUPrime.java b/src/test/java/org/tests/model/onetoone/OtoUPrime.java
new file mode 100644
index 000000000..052dbf876
--- /dev/null
+++ b/src/test/java/org/tests/model/onetoone/OtoUPrime.java
@@ -0,0 +1,68 @@
+package org.tests.model.onetoone;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.Version;
+import java.util.UUID;
+
+@Entity
+public class OtoUPrime {
+
+  @Id
+  UUID pid;
+
+  String name;
+
+  /**
+   * Effectively Ebean automatically sets Cascade PERSIST and mapped by for PrimaryKeyJoinColumn.
+   * This OneToOne is optional so left join to extra.
+   */
+  @OneToOne
+  @PrimaryKeyJoinColumn
+  OtoUPrimeExtra extra;
+
+  @Version
+  Long version;
+
+  public OtoUPrime(String name) {
+    this.name = name;
+  }
+
+  public String toString() {
+    return "id:"+ pid +" name:"+name+" extra:"+extra;
+  }
+
+  public UUID getPid() {
+    return pid;
+  }
+
+  public void setPid(UUID pid) {
+    this.pid = pid;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public OtoUPrimeExtra getExtra() {
+    return extra;
+  }
+
+  public void setExtra(OtoUPrimeExtra extra) {
+    this.extra = extra;
+  }
+
+  public Long getVersion() {
+    return version;
+  }
+
+  public void setVersion(Long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java b/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java
new file mode 100644
index 000000000..7c3fae318
--- /dev/null
+++ b/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java
@@ -0,0 +1,50 @@
+package org.tests.model.onetoone;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Version;
+import java.util.UUID;
+
+@Entity
+public class OtoUPrimeExtra {
+
+  @Id
+  UUID eid;
+
+  String extra;
+
+  @Version
+  Long version;
+
+  public OtoUPrimeExtra(String extra) {
+    this.extra = extra;
+  }
+
+  public String toString() {
+    return "exId:"+ eid +" "+extra;
+  }
+
+  public UUID getEid() {
+    return eid;
+  }
+
+  public void setEid(UUID eid) {
+    this.eid = eid;
+  }
+
+  public String getExtra() {
+    return extra;
+  }
+
+  public void setExtra(String extra) {
+    this.extra = extra;
+  }
+
+  public Long getVersion() {
+    return version;
+  }
+
+  public void setVersion(Long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java b/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java
new file mode 100644
index 000000000..64835b68b
--- /dev/null
+++ b/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java
@@ -0,0 +1,87 @@
+package org.tests.model.onetoone;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.Query;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestOneToOnePrimaryKeyJoinOptional extends BaseTestCase {
+
+
+  private OtoUPrime insert(String desc) {
+    OtoUPrime prime = new OtoUPrime("u" + desc);
+    OtoUPrimeExtra extra = new OtoUPrimeExtra("v" + desc);
+    prime.setExtra(extra);
+    Ebean.save(prime);
+    return prime;
+  }
+
+  @Test
+  public void insertUpdateDelete() {
+
+    String desc = "" + System.currentTimeMillis();
+    OtoUPrime p1 = insert(desc);
+
+    assertThat(p1.getExtra().getEid()).isEqualTo(p1.getPid()).as("Same id values");
+
+
+    Query<OtoUPrime> query = Ebean.find(OtoUPrime.class).setId(p1.getPid());
+
+    OtoUPrime found = query.findOne();
+
+    assertThat(found).isNotNull();
+    assertThat(sqlOf(query)).contains("select t0.pid, t0.name, t0.version, t0.pid from oto_uprime t0 where t0.pid = ?")
+      .as("we don't join to oto_uprime_extra");
+
+    assertThat(found.getName()).isEqualTo("u" + desc);
+
+    Query<OtoUPrime> queryWithFetch = Ebean.find(OtoUPrime.class)
+      .setId(p1.getPid())
+      .fetch("extra");
+
+    OtoUPrime oneWith = queryWithFetch.findOne();
+
+    assertThat(oneWith).isNotNull();
+    assertThat(sqlOf(queryWithFetch)).contains("select t0.pid, t0.name, t0.version, t1.eid, t1.extra, t1.version from oto_uprime t0 left join oto_uprime_extra t1 on t1.eid = t0.pid  where t0.pid = ?")
+      .as("we join to oto_prime_extra");
+
+
+    assertThat(oneWith.getExtra().getExtra()).isEqualTo("v" + desc);
+
+    thenUpdate(oneWith);
+    thenDelete(found);
+  }
+
+  private void thenUpdate(OtoUPrime oneWith) {
+
+    OtoUPrimeExtra extra = oneWith.getExtra();
+    extra.setExtra("modified");
+
+    Ebean.save(oneWith);
+
+    extra.setExtra("mod2");
+    oneWith.setName("mod2");
+
+    Ebean.save(oneWith);
+  }
+
+  private void thenDelete(OtoUPrime found) {
+
+
+    OtoUPrime bean = Ebean.find(OtoUPrime.class, found.getPid());
+
+    LoggedSqlCollector.start();
+    Ebean.delete(bean);
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("delete from oto_uprime_extra where");
+    assertThat(sql.get(1)).contains("delete from oto_uprime where");
+
+  }
+}

From 31cac603938a9c2553ee6989c0fca3be2accd2fb Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 15 Feb 2018 00:49:51 +1300
Subject: [PATCH 0023/1036] #107 - Mapping - Add support for
 @PrimaryKeyJoinColumn/@PrimaryKeyJoinColumns

Adds Bi-directional support
---
 .../server/deploy/BeanDescriptorManager.java  | 30 ++++++-
 .../deploy/meta/DeployBeanProperty.java       |  6 +-
 .../deploy/meta/DeployBeanPropertyAssoc.java  |  2 +-
 .../meta/DeployBeanPropertyAssocOne.java      | 27 +++++-
 .../deploy/parse/AnnotationAssocOnes.java     | 12 +--
 .../org/tests/model/onetoone/OtoUBPrime.java  | 65 ++++++++++++++
 .../tests/model/onetoone/OtoUBPrimeExtra.java | 67 ++++++++++++++
 .../TestOneToOnePrimaryKeyJoinBidi.java       | 87 +++++++++++++++++++
 8 files changed, 278 insertions(+), 18 deletions(-)
 create mode 100644 src/test/java/org/tests/model/onetoone/OtoUBPrime.java
 create mode 100644 src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java
 create mode 100644 src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index c9341c74a..d9452bc8f 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -797,8 +797,12 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     // We only perform 'circular' checks etc after we have
     // all the DeployBeanDescriptors created and in the map.
 
+    List<DeployBeanPropertyAssocOne<?>> primaryKeyJoinCheck = new ArrayList<>();
     for (DeployBeanInfo<?> info : deployInfoMap.values()) {
-      checkMappedBy(info);
+      checkMappedBy(info, primaryKeyJoinCheck);
+    }
+    for (DeployBeanPropertyAssocOne<?> prop : primaryKeyJoinCheck) {
+      checkUniDirectionalPrimaryKeyJoin(prop);
     }
 
     for (DeployBeanInfo<?> info : deployInfoMap.values()) {
@@ -868,12 +872,14 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * relationships.
    * </p>
    */
-  private void checkMappedBy(DeployBeanInfo<?> info) {
+  private void checkMappedBy(DeployBeanInfo<?> info, List<DeployBeanPropertyAssocOne<?>> primaryKeyJoinCheck) {
 
     for (DeployBeanPropertyAssocOne<?> oneProp : info.getDescriptor().propertiesAssocOne()) {
       if (!oneProp.isTransient()) {
         if (oneProp.getMappedBy() != null) {
           checkMappedByOneToOne(oneProp);
+        } else if (oneProp.isPrimaryKeyJoin()) {
+          primaryKeyJoinCheck.add(oneProp);
         }
       }
     }
@@ -1071,6 +1077,21 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
       DeployTableJoin otherTableJoin = mappedAssocOne.getTableJoin();
       otherTableJoin.copyWithoutType(tableJoin, true, tableJoin.getTable());
     }
+
+    if (mappedAssocOne.isPrimaryKeyJoin()) {
+      // bi-directional PrimaryKeyJoin ...
+      mappedAssocOne.setPrimaryKeyJoin(false);
+      prop.setPrimaryKeyExport();
+      addPrimaryKeyJoin(prop);
+    }
+  }
+
+  private void checkUniDirectionalPrimaryKeyJoin(DeployBeanPropertyAssocOne<?> prop) {
+    if (prop.isPrimaryKeyJoin()) {
+      // uni-directional PrimaryKeyJoin ...
+      prop.setPrimaryKeyExport();
+      addPrimaryKeyJoin(prop);
+    }
   }
 
   /**
@@ -1546,7 +1567,10 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     return changeLogListener;
   }
 
-  public void addPrimaryKeyJoin(DeployBeanPropertyAssocOne<?> prop, DeployTableJoin inverse) {
+  public void addPrimaryKeyJoin(DeployBeanPropertyAssocOne<?> prop) {
+
+    String baseTable = prop.getDesc().getBaseTable();
+    DeployTableJoin inverse = prop.getTableJoin().createInverse(baseTable);
 
     TableJoin inverseJoin = new TableJoin(inverse);
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
index c588028f5..5e2cfa517 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
@@ -17,8 +17,8 @@ import io.ebean.config.dbplatform.DbEncryptFunction;
 import io.ebean.util.AnnotationUtil;
 import io.ebeaninternal.server.core.InternString;
 import io.ebeaninternal.server.deploy.BeanProperty;
-import io.ebeaninternal.server.deploy.DeployDocPropertyOptions;
 import io.ebeaninternal.server.deploy.DbMigrationInfo;
+import io.ebeaninternal.server.deploy.DeployDocPropertyOptions;
 import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty;
 import io.ebeaninternal.server.el.ElPropertyValue;
 import io.ebeaninternal.server.properties.BeanPropertyGetter;
@@ -284,6 +284,10 @@ public class DeployBeanProperty {
     return desc.getFullName() + "." + name;
   }
 
+  public DeployBeanDescriptor<?> getDesc() {
+    return desc;
+  }
+
   /**
    * Return the DB column length for character columns.
    * <p>
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java
index e0bbc9f0e..cbe3dc48f 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java
@@ -16,7 +16,7 @@ public abstract class DeployBeanPropertyAssoc<T> extends DeployBeanProperty {
   /**
    * Persist settings.
    */
-  private final BeanCascadeInfo cascadeInfo = new BeanCascadeInfo();
+  protected final BeanCascadeInfo cascadeInfo = new BeanCascadeInfo();
 
   /**
    * The join table information.
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
index dc21bbe82..9e257def2 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.deploy.meta;
 
+import javax.persistence.CascadeType;
+
 /**
  * Property mapped to a joined bean.
  */
@@ -9,6 +11,8 @@ public class DeployBeanPropertyAssocOne<T> extends DeployBeanPropertyAssoc<T> {
 
   private boolean oneToOneExported;
 
+  private boolean primaryKeyJoin;
+
   private boolean primaryKeyExport;
 
   private boolean importedPrimaryKey;
@@ -118,11 +122,30 @@ public class DeployBeanPropertyAssocOne<T> extends DeployBeanPropertyAssoc<T> {
     return columnPrefix;
   }
 
-  public void setPrimaryKeyExport() {
-    this.primaryKeyExport = true;
+  /**
+   * Mark as PrimaryKeyJoin (we don't know which side is the export side initially).
+   */
+  public void setPrimaryKeyJoin(boolean primaryKeyJoin) {
+    this.primaryKeyJoin = primaryKeyJoin;
+  }
+
+  public boolean isPrimaryKeyJoin() {
+    return primaryKeyJoin;
   }
 
   public boolean isPrimaryKeyExport() {
     return primaryKeyExport;
   }
+
+  /**
+   * Set as export side of OneToOne with PrimaryKeyJoin.
+   */
+  public void setPrimaryKeyExport() {
+    this.primaryKeyExport = true;
+    this.oneToOneExported = true;
+    if (!cascadeInfo.isSave()) {
+      // we pretty much need to cascade save so turning that on automatically ...
+      cascadeInfo.setType(CascadeType.ALL);
+    }
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index 985608df7..4e5b04e36 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -8,13 +8,11 @@ import io.ebeaninternal.server.deploy.BeanTable;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
-import io.ebeaninternal.server.deploy.meta.DeployTableJoin;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn;
 import io.ebeaninternal.server.query.SqlJoinType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Embedded;
 import javax.persistence.EmbeddedId;
@@ -212,12 +210,7 @@ public class AnnotationAssocOnes extends AnnotationParser {
     if (!prop.isOneToOne()) {
       throw new IllegalStateException("Expecting property " + prop.getFullBeanName() + " with PrimaryKeyJoinColumn to be a OneToOne?");
     }
-    prop.setPrimaryKeyExport();
-    prop.setOneToOneExported();
-    if (!prop.getCascadeInfo().isSave()) {
-      // we pretty much need to cascade save so turning that on automatically ...
-      prop.getCascadeInfo().setType(CascadeType.ALL);
-    }
+    prop.setPrimaryKeyJoin(true);
 
     if (!primaryKeyJoin.name().isEmpty()) {
       log.warn("Automatically determining join columns and ignoring PrimaryKeyJoinColumn.name {} on {}", primaryKeyJoin.name(), prop.getFullBeanName());
@@ -232,9 +225,6 @@ public class AnnotationAssocOnes extends AnnotationParser {
     String foreignColumn = beanTable(prop).getIdColumn();
 
     prop.getTableJoin().addJoinColumn(new DeployTableJoinColumn(localPrimaryKey, foreignColumn, false, false));
-
-    DeployTableJoin inverse = prop.getTableJoin().createInverse(baseBeanTable.getBaseTable());
-    factory.addPrimaryKeyJoin(prop, inverse);
   }
 
   private void readEmbedded(DeployBeanPropertyAssocOne<?> prop, Embedded embedded) {
diff --git a/src/test/java/org/tests/model/onetoone/OtoUBPrime.java b/src/test/java/org/tests/model/onetoone/OtoUBPrime.java
new file mode 100644
index 000000000..9416135c6
--- /dev/null
+++ b/src/test/java/org/tests/model/onetoone/OtoUBPrime.java
@@ -0,0 +1,65 @@
+package org.tests.model.onetoone;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Version;
+import java.util.UUID;
+
+@Entity
+public class OtoUBPrime {
+
+  @Id
+  UUID pid;
+
+  String name;
+
+  /**
+   * Master side of bi-directional PrimaryJoinColumn.
+   */
+  @OneToOne(mappedBy = "prime")
+  OtoUBPrimeExtra extra;
+
+  @Version
+  Long version;
+
+  public OtoUBPrime(String name) {
+    this.name = name;
+  }
+
+  public String toString() {
+    return "id:"+ pid +" name:"+name+" extra:"+extra;
+  }
+
+  public UUID getPid() {
+    return pid;
+  }
+
+  public void setPid(UUID pid) {
+    this.pid = pid;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public OtoUBPrimeExtra getExtra() {
+    return extra;
+  }
+
+  public void setExtra(OtoUBPrimeExtra extra) {
+    this.extra = extra;
+  }
+
+  public Long getVersion() {
+    return version;
+  }
+
+  public void setVersion(Long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java b/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java
new file mode 100644
index 000000000..3b50b73f8
--- /dev/null
+++ b/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java
@@ -0,0 +1,67 @@
+package org.tests.model.onetoone;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.Version;
+import java.util.UUID;
+
+@Entity
+public class OtoUBPrimeExtra {
+
+  @Id
+  UUID eid;
+
+  String extra;
+
+  /**
+   * Child side of bi-directional PrimaryJoinColumn.
+   */
+  @OneToOne
+  @PrimaryKeyJoinColumn
+  OtoUBPrime prime;
+
+  @Version
+  Long version;
+
+  public OtoUBPrimeExtra(String extra) {
+    this.extra = extra;
+  }
+
+  public String toString() {
+    return "exId:" + eid + " " + extra;
+  }
+
+  public UUID getEid() {
+    return eid;
+  }
+
+  public void setEid(UUID eid) {
+    this.eid = eid;
+  }
+
+  public String getExtra() {
+    return extra;
+  }
+
+  public void setExtra(String extra) {
+    this.extra = extra;
+  }
+
+  public OtoUBPrime getPrime() {
+    return prime;
+  }
+
+  public void setPrime(OtoUBPrime prime) {
+    this.prime = prime;
+  }
+
+  public Long getVersion() {
+    return version;
+  }
+
+  public void setVersion(Long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java b/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java
new file mode 100644
index 000000000..8becdfe02
--- /dev/null
+++ b/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java
@@ -0,0 +1,87 @@
+package org.tests.model.onetoone;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.Query;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestOneToOnePrimaryKeyJoinBidi extends BaseTestCase {
+
+
+  private OtoUBPrime insert(String desc) {
+    OtoUBPrime prime = new OtoUBPrime("u" + desc);
+    OtoUBPrimeExtra extra = new OtoUBPrimeExtra("v" + desc);
+    prime.setExtra(extra);
+    Ebean.save(prime);
+    return prime;
+  }
+
+  @Test
+  public void insertUpdateDelete() {
+
+    String desc = "" + System.currentTimeMillis();
+    OtoUBPrime p1 = insert(desc);
+
+    assertThat(p1.getExtra().getEid()).isEqualTo(p1.getPid()).as("Same id values");
+
+
+    Query<OtoUBPrime> query = Ebean.find(OtoUBPrime.class).setId(p1.getPid());
+
+    OtoUBPrime found = query.findOne();
+
+    assertThat(found).isNotNull();
+    assertThat(sqlOf(query)).contains("select t0.pid, t0.name, t0.version, t0.pid from oto_ubprime t0 where t0.pid = ?")
+      .as("we don't join to oto_ubprime_extra");
+
+    assertThat(found.getName()).isEqualTo("u" + desc);
+
+    Query<OtoUBPrime> queryWithFetch = Ebean.find(OtoUBPrime.class)
+      .setId(p1.getPid())
+      .fetch("extra");
+
+    OtoUBPrime oneWith = queryWithFetch.findOne();
+
+    assertThat(oneWith).isNotNull();
+    assertThat(sqlOf(queryWithFetch)).contains("select t0.pid, t0.name, t0.version, t1.eid, t1.extra, t1.version, t1.eid from oto_ubprime t0 left join oto_ubprime_extra t1 on t1.eid = t0.pid  where t0.pid = ?")
+      .as("we join to oto_prime_extra");
+
+
+    assertThat(oneWith.getExtra().getExtra()).isEqualTo("v" + desc);
+
+    thenUpdate(oneWith);
+    thenDelete(found);
+  }
+
+  private void thenUpdate(OtoUBPrime oneWith) {
+
+    OtoUBPrimeExtra extra = oneWith.getExtra();
+    extra.setExtra("modified");
+
+    Ebean.save(oneWith);
+
+    extra.setExtra("mod2");
+    oneWith.setName("mod2");
+
+    Ebean.save(oneWith);
+  }
+
+  private void thenDelete(OtoUBPrime found) {
+
+
+    OtoUBPrime bean = Ebean.find(OtoUBPrime.class, found.getPid());
+
+    LoggedSqlCollector.start();
+    Ebean.delete(bean);
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("delete from oto_ubprime_extra where");
+    assertThat(sql.get(1)).contains("delete from oto_ubprime where");
+
+  }
+}

From 628af31dddedfcef0e36be1cf87a64de45d67290 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 15 Feb 2018 22:31:41 +1300
Subject: [PATCH 0024/1036] #1142 - Mapping - Add support for @OrderColumn
 (Ebean automatically maintains an order column)

---
 .../java/io/ebean/bean/BeanCollection.java    |   5 +
 .../io/ebean/bean/EntityBeanIntercept.java    |  18 ++
 .../ebean/common/AbstractBeanCollection.java  |   7 +-
 .../java/io/ebean/common/ModifyHolder.java    |  13 +
 .../server/deploy/BeanDescriptor.java         |   9 +
 .../server/deploy/BeanDescriptorManager.java  |  23 ++
 .../server/deploy/BeanPropertyAssocMany.java  |  10 +
 .../deploy/BeanPropertyOrderColumn.java       |  36 +++
 .../deploy/meta/DeployBeanDescriptor.java     |  10 +
 .../meta/DeployBeanPropertyAssocMany.java     |  30 ++-
 .../deploy/meta/DeployBeanPropertyLists.java  |  26 +-
 .../server/deploy/meta/DeployOrderColumn.java |  39 +++
 .../deploy/parse/AnnotationAssocManys.java    |  11 +
 .../server/persist/DefaultPersister.java      | 189 +-------------
 .../server/persist/SaveManyPropRequest.java   | 247 ++++++++++++++++++
 .../server/persist/dml/MetaFactory.java       |   7 +
 .../persist/dmlbind/BindableOrderColumn.java  |  37 +++
 .../server/type/DefaultTypeManager.java       |   4 +-
 .../server/type/ScalarTypeInteger.java        |   8 +-
 .../server/type/ScalarTypeString.java         |   8 +-
 .../org/tests/cascade/OmOrderedDetail.java    |  57 ++++
 .../org/tests/cascade/OmOrderedMaster.java    |  63 +++++
 .../org/tests/cascade/TestOrderedList.java    |  98 +++++++
 23 files changed, 746 insertions(+), 209 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOrderColumn.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/meta/DeployOrderColumn.java
 create mode 100644 src/main/java/io/ebeaninternal/server/persist/SaveManyPropRequest.java
 create mode 100644 src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableOrderColumn.java
 create mode 100644 src/test/java/org/tests/cascade/OmOrderedDetail.java
 create mode 100644 src/test/java/org/tests/cascade/OmOrderedMaster.java
 create mode 100644 src/test/java/org/tests/cascade/TestOrderedList.java

diff --git a/src/main/java/io/ebean/bean/BeanCollection.java b/src/main/java/io/ebean/bean/BeanCollection.java
index 25d84de7d..28b17bd05 100644
--- a/src/main/java/io/ebean/bean/BeanCollection.java
+++ b/src/main/java/io/ebean/bean/BeanCollection.java
@@ -227,6 +227,11 @@ public interface BeanCollection<E> extends Serializable {
    */
   void modifyReset();
 
+  /**
+   * Has been modified by an addition or removal.
+   */
+  boolean wasTouched();
+
   /**
    * Return a shallow copy of this collection that is modifiable.
    */
diff --git a/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/src/main/java/io/ebean/bean/EntityBeanIntercept.java
index cdeb21bba..17b1eac73 100644
--- a/src/main/java/io/ebean/bean/EntityBeanIntercept.java
+++ b/src/main/java/io/ebean/bean/EntityBeanIntercept.java
@@ -90,6 +90,7 @@ public final class EntityBeanIntercept implements Serializable {
   private int lazyLoadProperty = -1;
 
   private Object ownerId;
+  private int sortOrder;
 
   /**
    * Create a intercept with a given entity.
@@ -693,6 +694,9 @@ public final class EntityBeanIntercept implements Serializable {
    * Add and return a dirty property hash recursing into embedded beans.
    */
   private void addDirtyPropertyKey(StringBuilder sb) {
+    if (sortOrder > 0) {
+      sb.append("s,");
+    }
     int len = getPropertyLength();
     for (int i = 0; i < len; i++) {
       if (changedProps != null && changedProps[i]) {
@@ -1050,4 +1054,18 @@ public final class EntityBeanIntercept implements Serializable {
   public void setOldValue(int propertyIndex, Object oldValue) {
     setChangedPropertyValue(propertyIndex, true, oldValue);
   }
+
+  /**
+   * Return the sort order value for an order column.
+   */
+  public int getSortOrder() {
+    return sortOrder;
+  }
+
+  /**
+   * Set the sort order value for an order column.
+   */
+  public void setSortOrder(int sortOrder) {
+    this.sortOrder = sortOrder;
+  }
 }
diff --git a/src/main/java/io/ebean/common/AbstractBeanCollection.java b/src/main/java/io/ebean/common/AbstractBeanCollection.java
index e13a6dc1d..d02c0ffc7 100644
--- a/src/main/java/io/ebean/common/AbstractBeanCollection.java
+++ b/src/main/java/io/ebean/common/AbstractBeanCollection.java
@@ -213,7 +213,12 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
   boolean holdsModifications() {
     return modifyHolder != null && modifyHolder.hasModifications();
   }
-  
+
+  @Override
+  public boolean wasTouched() {
+    return modifyHolder != null && modifyHolder.wasTouched();
+  }
+
   /**
    * Copies all relevant properties for a clone. See {@link #getShallowCopy()}
    * @param other
diff --git a/src/main/java/io/ebean/common/ModifyHolder.java b/src/main/java/io/ebean/common/ModifyHolder.java
index 1e4008c32..247fb5cf2 100644
--- a/src/main/java/io/ebean/common/ModifyHolder.java
+++ b/src/main/java/io/ebean/common/ModifyHolder.java
@@ -28,7 +28,10 @@ class ModifyHolder<E> implements Serializable {
    */
   private Set<E> modifyAdditions = new LinkedHashSet<>();
 
+  private boolean touched;
+
   void reset() {
+    touched = false;
     modifyDeletions = new LinkedHashSet<>();
     modifyAdditions = new LinkedHashSet<>();
   }
@@ -50,6 +53,7 @@ class ModifyHolder<E> implements Serializable {
 
   void modifyAddition(E bean) {
     if (bean != null) {
+      touched = true;
       // If it is to delete then just remove the deletion
       if (!undoDeletion(bean)) {
         // Insert
@@ -65,6 +69,7 @@ class ModifyHolder<E> implements Serializable {
   @SuppressWarnings("unchecked")
   void modifyRemoval(Object bean) {
     if (bean != null) {
+      touched = true;
       // If it is to be added then just remove the addition
       if (!undoAddition(bean)) {
         modifyDeletions.add((E) bean);
@@ -80,6 +85,14 @@ class ModifyHolder<E> implements Serializable {
     return modifyDeletions;
   }
 
+  /**
+   * Return true if the collection was touched in some way. This is still true even if
+   * a bean was removed and then added (which is not held as a modification).
+   */
+  boolean wasTouched() {
+    return touched;
+  }
+
   /**
    * Return true if there additions or removals.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index c5b82b19d..1c34a0783 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -308,6 +308,7 @@ public class BeanDescriptor<T> implements BeanType<T> {
 
 
   private final BeanPropertyAssocOne<?> unidirectional;
+  private final BeanProperty orderColumn;
 
   /**
    * list of properties that are Lists/Sets/Maps (Derived).
@@ -480,6 +481,7 @@ public class BeanDescriptor<T> implements BeanType<T> {
     this.propertiesLocal = listHelper.getLocal();
     this.propertiesMutable = listHelper.getMutable();
     this.unidirectional = listHelper.getUnidirectional();
+    this.orderColumn = listHelper.getOrderColumn();
     this.propertiesOne = listHelper.getOnes();
     this.propertiesOneExportedSave = listHelper.getOneExportedSave();
     this.propertiesOneExportedDelete = listHelper.getOneExportedDelete();
@@ -1925,6 +1927,13 @@ public class BeanDescriptor<T> implements BeanType<T> {
     return owner.getBeanDescriptor(otherType);
   }
 
+  /**
+   * Return the order column property.
+   */
+  public BeanProperty getOrderColumn() {
+    return orderColumn;
+  }
+
   /**
    * Return the "shadow" property to support unidirectional relationships.
    * <p>
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index d9452bc8f..d523bb739 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -38,6 +38,7 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
 import io.ebeaninternal.server.deploy.meta.DeployBeanTable;
+import io.ebeaninternal.server.deploy.meta.DeployOrderColumn;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoin;
 import io.ebeaninternal.server.deploy.parse.DeployBeanInfo;
 import io.ebeaninternal.server.deploy.parse.DeployCreateProperties;
@@ -50,6 +51,7 @@ import io.ebeaninternal.server.properties.BeanPropertiesReader;
 import io.ebeaninternal.server.properties.BeanPropertyAccess;
 import io.ebeaninternal.server.properties.EnhanceBeanPropertyAccess;
 import io.ebeaninternal.server.query.CQueryPlan;
+import io.ebeaninternal.server.type.ScalarTypeInteger;
 import io.ebeaninternal.xmlmapping.XmlMappingReader;
 import io.ebeaninternal.xmlmapping.model.XmAliasMapping;
 import io.ebeaninternal.xmlmapping.model.XmColumnMapping;
@@ -979,6 +981,23 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     throw new PersistenceException(msg);
   }
 
+  private void makeOrderColumn(DeployBeanPropertyAssocMany<?> oneToMany) {
+
+    DeployBeanDescriptor<?> targetDesc = getTargetDescriptor(oneToMany);
+
+    DeployOrderColumn orderColumn = oneToMany.getOrderColumn();
+    DeployBeanProperty orderProperty = new DeployBeanProperty(targetDesc, Integer.class, ScalarTypeInteger.INSTANCE, null);
+
+    orderProperty.setName(DeployOrderColumn.LOGICAL_NAME);
+    orderProperty.setDbColumn(orderColumn.getName());
+    orderProperty.setNullable(orderColumn.isNullable());
+    orderProperty.setDbInsertable(orderColumn.isInsertable());
+    orderProperty.setDbUpdateable(orderColumn.isUpdatable());
+    orderProperty.setDbRead(true);
+
+    targetDesc.setOrderColumn(orderProperty);
+  }
+
   /**
    * A OneToMany with no matching mappedBy property in the target so must be
    * unidirectional.
@@ -1112,6 +1131,10 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
       prop.getCascadeInfo().setSaveDelete(true, true);
     }
 
+    if (prop.hasOrderColumn()) {
+      makeOrderColumn(prop);
+    }
+
     if (prop.getMappedBy() == null) {
       // if we are doc store only we are done
       // this allowes the use of @OneToMany in @DocStore - Entities
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index 1a04e8ef9..8f902c047 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -58,6 +58,11 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
    */
   private final boolean unidirectional;
 
+  /**
+   * Flag to indicate that the target has a order column to auto populate.
+   */
+  private final boolean hasOrderColumn;
+
   /**
    * Flag to indicate manyToMany relationship.
    */
@@ -109,6 +114,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
   public BeanPropertyAssocMany(BeanDescriptor<?> descriptor, DeployBeanPropertyAssocMany<T> deploy) {
     super(descriptor, deploy);
     this.unidirectional = deploy.isUnidirectional();
+    this.hasOrderColumn = deploy.hasOrderColumn();
     this.manyToMany = deploy.isManyToMany();
     this.manyType = deploy.getManyType();
     this.mapKey = deploy.getMapKey();
@@ -534,6 +540,10 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
     return true;
   }
 
+  public boolean hasOrderColumn() {
+    return hasOrderColumn;
+  }
+
   @Override
   public boolean isAssocMany() {
     return true;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOrderColumn.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOrderColumn.java
new file mode 100644
index 000000000..319c8830b
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOrderColumn.java
@@ -0,0 +1,36 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
+
+/**
+ * Bean property for synthetic sort order value / order column.
+ *
+ * The value of which is held on the entity bean intercept.
+ */
+public class BeanPropertyOrderColumn extends BeanProperty {
+
+  public BeanPropertyOrderColumn(BeanDescriptor<?> descriptor, DeployBeanProperty deploy) {
+    super(descriptor, deploy);
+  }
+
+  @Override
+  public Object getValue(EntityBean bean) {
+    return bean._ebean_getIntercept().getSortOrder();
+  }
+
+  @Override
+  public Object getValueIntercept(EntityBean bean) {
+    return bean._ebean_getIntercept().getSortOrder();
+  }
+
+  @Override
+  public void setValue(EntityBean bean, Object value) {
+    bean._ebean_getIntercept().setSortOrder((int)value);
+  }
+
+  @Override
+  public void setValueIntercept(EntityBean bean, Object value) {
+    bean._ebean_getIntercept().setSortOrder((int)value);
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index 2e8b4165c..36e14a2e8 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -81,6 +81,8 @@ public class DeployBeanDescriptor<T> {
 
   private DeployBeanPropertyAssocOne<?> unidirectional;
 
+  private DeployBeanProperty orderColumn;
+
   /**
    * Type of Identity generation strategy used.
    */
@@ -446,6 +448,14 @@ public class DeployBeanDescriptor<T> {
     this.unidirectional = unidirectional;
   }
 
+  public void setOrderColumn(DeployBeanProperty orderColumn) {
+    this.orderColumn = orderColumn;
+  }
+
+  public DeployBeanProperty getOrderColumn() {
+    return orderColumn;
+  }
+
   /**
    * Return the concurrency mode used for beans of this type.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java
index 06a6c9915..121938fab 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java
@@ -12,35 +12,37 @@ public class DeployBeanPropertyAssocMany<T> extends DeployBeanPropertyAssoc<T> {
   /**
    * The type of the many, set, list or map.
    */
-  final ManyType manyType;
+  private final ManyType manyType;
 
   ModifyListenMode modifyListenMode = ModifyListenMode.NONE;
 
   /**
    * Flag to indicate manyToMany relationship.
    */
-  boolean manyToMany;
+  private boolean manyToMany;
 
   /**
    * Flag to indicate this is a unidirectional relationship.
    */
-  boolean unidirectional;
+  private boolean unidirectional;
 
   /**
    * Join for manyToMany intersection table.
    */
-  DeployTableJoin intersectionJoin;
+  private DeployTableJoin intersectionJoin;
 
   /**
    * For ManyToMany this is the Inverse join used to build reference queries.
    */
-  DeployTableJoin inverseJoin;
+  private DeployTableJoin inverseJoin;
 
-  String fetchOrderBy;
+  private String fetchOrderBy;
 
-  String mapKey;
+  private String mapKey;
 
-  String intersectionDraftTable;
+  private String intersectionDraftTable;
+
+  private DeployOrderColumn orderColumn;
 
   /**
    * Create this property.
@@ -206,4 +208,16 @@ public class DeployBeanPropertyAssocMany<T> extends DeployBeanPropertyAssoc<T> {
   public void setIntersectionDraftTable() {
     this.intersectionDraftTable = intersectionJoin.getTable() + "_draft";
   }
+
+  public void setOrderColumn(DeployOrderColumn orderColumn) {
+    this.orderColumn = orderColumn;
+  }
+
+  public DeployOrderColumn getOrderColumn() {
+    return orderColumn;
+  }
+
+  public boolean hasOrderColumn() {
+    return orderColumn != null;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
index 5fb1b7010..c8bcfc6ce 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
@@ -6,6 +6,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptorMap;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
+import io.ebeaninternal.server.deploy.BeanPropertyOrderColumn;
 import io.ebeaninternal.server.deploy.BeanPropertySimpleCollection;
 import io.ebeaninternal.server.deploy.InheritInfo;
 import io.ebeaninternal.server.deploy.TableJoin;
@@ -64,6 +65,7 @@ public class DeployBeanPropertyLists {
   private final TableJoin[] tableJoins;
 
   private final BeanPropertyAssocOne<?> unidirectional;
+  private final BeanProperty orderColumn;
 
   @SuppressWarnings({"unchecked", "rawtypes"})
   public DeployBeanPropertyLists(BeanDescriptorMap owner, BeanDescriptor<?> desc, DeployBeanDescriptor<?> deploy) {
@@ -71,12 +73,11 @@ public class DeployBeanPropertyLists {
 
     setImportedPrimaryKeys(deploy);
 
+    DeployBeanProperty deployOrderColumn = deploy.getOrderColumn();
+    this.orderColumn = deployOrderColumn != null ? new BeanPropertyOrderColumn(desc, deployOrderColumn) : null;
+
     DeployBeanPropertyAssocOne<?> deployUnidirectional = deploy.getUnidirectional();
-    if (deployUnidirectional == null) {
-      unidirectional = null;
-    } else {
-      unidirectional = new BeanPropertyAssocOne(owner, desc, deployUnidirectional);
-    }
+    this.unidirectional = deployUnidirectional == null ? null : new BeanPropertyAssocOne(owner, desc, deployUnidirectional);
 
     this.propertyMap = new LinkedHashMap<>();
 
@@ -89,7 +90,7 @@ public class DeployBeanPropertyLists {
       // Create a BeanProperty for the discriminator column to support
       // using RawSql queries with inheritance
       discriminatorColumn = inheritInfo.getDiscriminatorColumn();
-      DeployBeanProperty discDeployProp = new DeployBeanProperty(deploy, String.class, new ScalarTypeString(), null);
+      DeployBeanProperty discDeployProp = new DeployBeanProperty(deploy, String.class, ScalarTypeString.INSTANCE, null);
       discDeployProp.setDiscriminator();
       discDeployProp.setName(discriminatorColumn);
       discDeployProp.setDbColumn(discriminatorColumn);
@@ -115,6 +116,12 @@ public class DeployBeanPropertyLists {
       allocateToList(prop);
     }
 
+    if (orderColumn != null) {
+      orderColumn.setDeployOrder(order++);
+      allocateToList(orderColumn);
+      propertyMap.put(orderColumn.getName(), orderColumn);
+    }
+
     if (discProperty != null) {
       // put the discriminator property into the property map only
       // (after the real properties have been organised into their lists)
@@ -160,6 +167,13 @@ public class DeployBeanPropertyLists {
     return unidirectional;
   }
 
+  /**
+   * Return the order column property.
+   */
+  public BeanProperty getOrderColumn() {
+    return orderColumn;
+  }
+
   /**
    * Allocate the property to a list.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployOrderColumn.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployOrderColumn.java
new file mode 100644
index 000000000..26a8402b6
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployOrderColumn.java
@@ -0,0 +1,39 @@
+package io.ebeaninternal.server.deploy.meta;
+
+import javax.persistence.OrderColumn;
+
+public class DeployOrderColumn {
+
+  /**
+   * Logical property name used for order by and available for expression language.
+   */
+  public static final String LOGICAL_NAME = "orderColumn";
+
+  private final String name;
+  private final boolean insertable;
+  private final boolean updatable;
+  private final boolean nullable;
+
+  public DeployOrderColumn(OrderColumn orderColumn) {
+    this.name = orderColumn.name();
+    this.insertable = orderColumn.insertable();
+    this.updatable = orderColumn.updatable();
+    this.nullable = orderColumn.nullable();
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public boolean isInsertable() {
+    return insertable;
+  }
+
+  public boolean isUpdatable() {
+    return updatable;
+  }
+
+  public boolean isNullable() {
+    return nullable;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index 2d4b72ced..a451886ba 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -13,16 +13,19 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanTable;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany;
+import io.ebeaninternal.server.deploy.meta.DeployOrderColumn;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoin;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn;
 import io.ebeaninternal.server.query.SqlJoinType;
 
+import javax.persistence.CascadeType;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.MapKey;
 import javax.persistence.OneToMany;
 import javax.persistence.OrderBy;
+import javax.persistence.OrderColumn;
 import java.util.Set;
 
 /**
@@ -66,6 +69,14 @@ class AnnotationAssocManys extends AnnotationParser {
         prop.setModifyListenMode(ModifyListenMode.REMOVALS);
         prop.getCascadeInfo().setDelete(privateOwned.cascadeRemove());
       }
+      OrderColumn orderColumn = get(prop, OrderColumn.class);
+      if (orderColumn != null) {
+        // need to cascade as we set the order on cascade
+        prop.setOrderColumn(new DeployOrderColumn(orderColumn));
+        prop.setFetchOrderBy(DeployOrderColumn.LOGICAL_NAME);
+        prop.getCascadeInfo().setType(CascadeType.ALL);
+        prop.setModifyListenMode(ModifyListenMode.ALL);
+      }
     }
     ManyToMany manyToMany = get(prop, ManyToMany.class);
     if (manyToMany != null) {
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 5de669ab3..3c9effc4d 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -8,7 +8,6 @@ import io.ebean.Update;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanCollection.ModifyListenMode;
 import io.ebean.bean.EntityBean;
-import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.bean.PersistenceContext;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiTransaction;
@@ -21,7 +20,6 @@ import io.ebeaninternal.server.core.PersistRequestCallableSql;
 import io.ebeaninternal.server.core.PersistRequestOrmUpdate;
 import io.ebeaninternal.server.core.PersistRequestUpdateSql;
 import io.ebeaninternal.server.core.Persister;
-import io.ebeaninternal.server.deploy.BeanCollectionUtil;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
 import io.ebeaninternal.server.deploy.BeanManager;
@@ -29,7 +27,6 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 import io.ebeaninternal.server.deploy.IntersectionRow;
-import io.ebeaninternal.server.deploy.ManyType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -413,7 +410,7 @@ public final class DefaultPersister implements Persister {
     }
   }
 
-  private void saveRecurse(EntityBean bean, Transaction t, Object parentBean, boolean insertMode, boolean publish) {
+  void saveRecurse(EntityBean bean, Transaction t, Object parentBean, boolean insertMode, boolean publish) {
 
     // determine insert or update taking into account stateless updates
     PersistRequestBean<?> request = createRequestRecurse(bean, t, parentBean, insertMode, publish);
@@ -826,86 +823,6 @@ public final class DefaultPersister implements Persister {
     }
   }
 
-  /**
-   * Helper to wrap the details when saving a OneToMany or ManyToMany
-   * relationship.
-   */
-  private static class SaveManyPropRequest {
-    private final boolean insertedParent;
-    private final BeanPropertyAssocMany<?> many;
-    private final EntityBean parentBean;
-    private final SpiTransaction transaction;
-    private final boolean cascade;
-    private final boolean deleteMissingChildren;
-    private final boolean publish;
-
-    private SaveManyPropRequest(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
-      this.insertedParent = insertedParent;
-      this.many = many;
-      this.cascade = many.getCascadeInfo().isSave();
-      this.parentBean = parentBean;
-      this.transaction = request.getTransaction();
-      this.deleteMissingChildren = request.isDeleteMissingChildren();
-      this.publish = request.isPublish();
-    }
-
-    public boolean isSaveIntersection() {
-      return transaction.isSaveAssocManyIntersection(many.getIntersectionTableJoin().getTable(), many.getBeanDescriptor().getName());
-    }
-
-    private Object getValue() {
-      return many.getValue(parentBean);
-    }
-
-    private boolean isModifyListenMode() {
-      return ModifyListenMode.REMOVALS == many.getModifyListenMode();
-    }
-
-    private boolean isDeleteMissingChildren() {
-      return deleteMissingChildren;
-    }
-
-    private boolean isInsertedParent() {
-      return insertedParent;
-    }
-
-    private BeanPropertyAssocMany<?> getMany() {
-      return many;
-    }
-
-    private EntityBean getParentBean() {
-      return parentBean;
-    }
-
-    private SpiTransaction getTransaction() {
-      return transaction;
-    }
-
-    private boolean isCascade() {
-      return cascade;
-    }
-
-    public void modifyListenReset(BeanCollection<?> c) {
-      if (insertedParent) {
-        // after insert set the modify listening mode
-        // for private owned etc
-        c.setModifyListening(many.getModifyListenMode());
-      }
-      c.modifyReset();
-    }
-
-    public boolean isPublish() {
-      return publish;
-    }
-
-    private void resetModifyState() {
-      Object details = getValue();
-      if (details instanceof BeanCollection<?>) {
-        modifyListenReset((BeanCollection<?>) details);
-      }
-    }
-  }
-
   private void saveMany(SaveManyPropRequest saveMany, boolean insertMode) {
 
     if (saveMany.getMany().isManyToMany()) {
@@ -967,107 +884,7 @@ public final class DefaultPersister implements Persister {
    */
   private void saveAssocManyDetails(SaveManyPropRequest saveMany, boolean deleteMissingChildren, boolean insertMode) {
 
-    BeanPropertyAssocMany<?> prop = saveMany.getMany();
-
-    Object details = saveMany.getValue();
-
-    // check that the list is not null and if it is a BeanCollection
-    // check that is has been populated (don't trigger lazy loading)
-    // For a Map this is a collection of Map.Entry objects and not beans
-    Collection<?> collection = BeanCollectionUtil.getActualEntries(details);
-
-    if (collection == null) {
-      // nothing to do here
-      return;
-    }
-
-    BeanDescriptor<?> targetDescriptor = prop.getTargetDescriptor();
-    if (saveMany.isInsertedParent()) {
-      // performance optimisation for large collections
-      targetDescriptor.preAllocateIds(collection.size());
-    }
-
-    SpiTransaction t = saveMany.getTransaction();
-    boolean isMap = ManyType.MAP == prop.getManyType();
-    EntityBean parentBean = saveMany.getParentBean();
-
-    if (deleteMissingChildren) {
-      // collect the Id's (to exclude from deleteManyDetails)
-      List<Object> detailIds = collectIds(collection, targetDescriptor, isMap);
-      // deleting missing children - children not in our collected detailIds
-      deleteManyDetails(t, prop.getBeanDescriptor(), parentBean, prop, detailIds, false);
-    }
-
-    // increase depth for batching order
-    t.depth(+1);
-
-    // if a map, then we get the key value and
-    // set it to the appropriate property on the
-    // detail bean before we save it
-    Object mapKeyValue = null;
-
-    boolean saveSkippable = prop.isSaveRecurseSkippable();
-    boolean skipSavingThisBean;
-
-    for (Object detailBean : collection) {
-      if (isMap) {
-        // its a map so need the key and value
-        Map.Entry<?, ?> entry = (Map.Entry<?, ?>) detailBean;
-        mapKeyValue = entry.getKey();
-        detailBean = entry.getValue();
-      }
-
-      if (detailBean instanceof EntityBean) {
-        EntityBean detail = (EntityBean) detailBean;
-        EntityBeanIntercept ebi = detail._ebean_getIntercept();
-        if (prop.isManyToMany()) {
-          skipSavingThisBean = targetDescriptor.isReference(ebi);
-        } else {
-          if (targetDescriptor.isReference(ebi)) {
-            // we can skip this one
-            skipSavingThisBean = true;
-
-          } else if (ebi.isNewOrDirty()) {
-            skipSavingThisBean = false;
-            // set the parent bean to detailBean
-            prop.setJoinValuesToChild(parentBean, detail, mapKeyValue);
-
-          } else {
-            // unmodified so skip depending on prop.isSaveRecurseSkippable();
-            skipSavingThisBean = saveSkippable;
-          }
-        }
-
-        if (!skipSavingThisBean) {
-          saveRecurse(detail, t, parentBean, insertMode, saveMany.isPublish());
-        }
-      }
-    }
-
-    t.depth(-1);
-  }
-
-  /**
-   * Collect the Id values of the details to remove 'missing children' for stateless updates.
-   */
-  private List<Object> collectIds(Collection<?> collection, BeanDescriptor<?> targetDescriptor, boolean isMap) {
-
-    List<Object> detailIds = new ArrayList<>();
-    // stateless update with deleteMissingChildren so first
-    // collect the Id values to remove the 'missing children'
-    for (Object detailBean : collection) {
-      if (isMap) {
-        detailBean = ((Map.Entry<?, ?>) detailBean).getValue();
-      }
-      if (detailBean instanceof EntityBean) {
-        Object id = targetDescriptor.getId((EntityBean) detailBean);
-        if (!DmlUtil.isNullOrZero(id)) {
-          // remember the Id (other details not in the collection) will be removed
-          detailIds.add(id);
-        }
-      }
-    }
-    return detailIds;
+    saveMany.saveDetails(this, deleteMissingChildren, insertMode);
   }
 
   /**
@@ -1266,7 +1083,7 @@ public final class DefaultPersister implements Persister {
    * collection (and should not be deleted).
    * </p>
    */
-  private void deleteManyDetails(SpiTransaction t, BeanDescriptor<?> desc, EntityBean parentBean,
+  void deleteManyDetails(SpiTransaction t, BeanDescriptor<?> desc, EntityBean parentBean,
                                  BeanPropertyAssocMany<?> many, List<Object> excludeDetailIds, boolean softDelete) {
 
     if (many.getCascadeInfo().isDelete()) {
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyPropRequest.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyPropRequest.java
new file mode 100644
index 000000000..f25fd9d48
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyPropRequest.java
@@ -0,0 +1,247 @@
+package io.ebeaninternal.server.persist;
+
+import io.ebean.bean.BeanCollection;
+import io.ebean.bean.EntityBean;
+import io.ebean.bean.EntityBeanIntercept;
+import io.ebeaninternal.api.SpiTransaction;
+import io.ebeaninternal.server.core.PersistRequestBean;
+import io.ebeaninternal.server.deploy.BeanCollectionUtil;
+import io.ebeaninternal.server.deploy.BeanDescriptor;
+import io.ebeaninternal.server.deploy.BeanProperty;
+import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
+import io.ebeaninternal.server.deploy.ManyType;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Helper to wrap the details when saving a OneToMany or ManyToMany relationship.
+ */
+class SaveManyPropRequest {
+
+  private final boolean insertedParent;
+  private final BeanPropertyAssocMany<?> many;
+  private final EntityBean parentBean;
+  private final SpiTransaction transaction;
+  private final boolean cascade;
+  private final boolean deleteMissingChildren;
+  private final boolean publish;
+
+  private final Object value;
+  private final BeanDescriptor<?> targetDescriptor;
+  private final boolean isMap;
+  private final boolean saveRecurseSkippable;
+
+  private Collection<?> collection;
+  private DefaultPersister persister;
+  private boolean deleteMissing;
+  private boolean insertMode;
+  private int sortOrder;
+
+  SaveManyPropRequest(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
+    this.insertedParent = insertedParent;
+    this.many = many;
+    this.cascade = many.getCascadeInfo().isSave();
+    this.parentBean = parentBean;
+    this.transaction = request.getTransaction();
+    this.deleteMissingChildren = request.isDeleteMissingChildren();
+    this.publish = request.isPublish();
+    this.value = many.getValue(parentBean);
+    this.targetDescriptor = many.getTargetDescriptor();
+    this.isMap = ManyType.MAP == many.getManyType();
+    this.saveRecurseSkippable = many.isSaveRecurseSkippable();
+  }
+
+  public boolean isSaveIntersection() {
+    return transaction.isSaveAssocManyIntersection(many.getIntersectionTableJoin().getTable(), many.getBeanDescriptor().getName());
+  }
+
+  Object getValue() {
+    return value;
+  }
+
+  boolean isModifyListenMode() {
+    return BeanCollection.ModifyListenMode.REMOVALS == many.getModifyListenMode();
+  }
+
+  boolean isDeleteMissingChildren() {
+    return deleteMissingChildren;
+  }
+
+  boolean isInsertedParent() {
+    return insertedParent;
+  }
+
+  BeanPropertyAssocMany<?> getMany() {
+    return many;
+  }
+
+  EntityBean getParentBean() {
+    return parentBean;
+  }
+
+  SpiTransaction getTransaction() {
+    return transaction;
+  }
+
+  boolean isCascade() {
+    return cascade;
+  }
+
+  boolean isPublish() {
+    return publish;
+  }
+
+  void modifyListenReset(BeanCollection<?> c) {
+    if (insertedParent) {
+      // after insert set the modify listening mode for private owned etc
+      c.setModifyListening(many.getModifyListenMode());
+    }
+    c.modifyReset();
+  }
+
+  void resetModifyState() {
+    if (value instanceof BeanCollection<?>) {
+      modifyListenReset((BeanCollection<?>) value);
+    }
+  }
+
+  void saveDetails(DefaultPersister persister, boolean deleteMissing, boolean insertMode) {
+
+    this.persister = persister;
+    this.deleteMissing = deleteMissing;
+    this.insertMode = insertMode;
+
+    // check that the list is not null and if it is a BeanCollection
+    // check that is has been populated (don't trigger lazy loading)
+    // For a Map this is a collection of Map.Entry objects and not beans
+    collection = BeanCollectionUtil.getActualEntries(value);
+    if (collection != null) {
+      processDetails();
+    }
+  }
+
+  private void processDetails() {
+
+    BeanProperty orderColumn = null;
+    boolean hasOrderColumn = many.hasOrderColumn();
+    if (hasOrderColumn) {
+      if (!insertedParent && canSkipForOrderColumn()) {
+        return;
+      }
+      orderColumn = targetDescriptor.getOrderColumn();
+    }
+
+    if (insertedParent) {
+      // performance optimisation for large collections
+      targetDescriptor.preAllocateIds(collection.size());
+    }
+
+    if (deleteMissing) {
+      // collect the Id's (to exclude from deleteManyDetails)
+      List<Object> detailIds = collectIds(collection, targetDescriptor, isMap);
+      // deleting missing children - children not in our collected detailIds
+      persister.deleteManyDetails(transaction, many.getBeanDescriptor(), parentBean, many, detailIds, false);
+    }
+
+    transaction.depth(+1);
+    saveAllBeans(orderColumn);
+    if (hasOrderColumn) {
+      resetModifyState();
+    }
+    transaction.depth(-1);
+  }
+
+
+  private void saveAllBeans(BeanProperty orderColumn) {
+
+    // if a map, then we get the key value and
+    // set it to the appropriate property on the
+    // detail bean before we save it
+    Object mapKeyValue = null;
+    boolean skipSavingThisBean;
+
+    for (Object detailBean : collection) {
+      sortOrder++;
+      if (isMap) {
+        // its a map so need the key and value
+        Map.Entry<?, ?> entry = (Map.Entry<?, ?>) detailBean;
+        mapKeyValue = entry.getKey();
+        detailBean = entry.getValue();
+      }
+
+      if (detailBean instanceof EntityBean) {
+        EntityBean detail = (EntityBean) detailBean;
+        EntityBeanIntercept ebi = detail._ebean_getIntercept();
+        if (many.isManyToMany()) {
+          skipSavingThisBean = targetDescriptor.isReference(ebi);
+        } else {
+          if (orderColumn != null) {
+            orderColumn.setValue(detail, sortOrder);
+            ebi.setDirty(true);
+          }
+          if (targetDescriptor.isReference(ebi)) {
+            // we can skip this one
+            skipSavingThisBean = true;
+
+          } else if (ebi.isNewOrDirty()) {
+            skipSavingThisBean = false;
+            // set the parent bean to detailBean
+            many.setJoinValuesToChild(parentBean, detail, mapKeyValue);
+
+          } else {
+            // unmodified so skip depending on prop.isSaveRecurseSkippable();
+            skipSavingThisBean = saveRecurseSkippable;
+          }
+        }
+
+        if (!skipSavingThisBean) {
+          persister.saveRecurse(detail, transaction, parentBean, insertMode, publish);
+        }
+      }
+    }
+  }
+
+  /**
+   * Return true if we can skip based on .. no modifications to the collection and no beans are dirty.
+   */
+  private boolean canSkipForOrderColumn() {
+    return value instanceof BeanCollection
+      && !((BeanCollection<?>) value).wasTouched()
+      && noDirtyBeans();
+  }
+
+  private boolean noDirtyBeans() {
+    for (Object bean : collection) {
+      if (bean instanceof EntityBean && ((EntityBean) bean)._ebean_getIntercept().isDirty()) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  /**
+   * Collect the Id values of the details to remove 'missing children' for stateless updates.
+   */
+  private List<Object> collectIds(Collection<?> collection, BeanDescriptor<?> targetDescriptor, boolean isMap) {
+
+    List<Object> detailIds = new ArrayList<>();
+    // stateless update with deleteMissingChildren so first
+    // collect the Id values to remove the 'missing children'
+    for (Object detailBean : collection) {
+      if (isMap) {
+        detailBean = ((Map.Entry<?, ?>) detailBean).getValue();
+      }
+      if (detailBean instanceof EntityBean) {
+        Object id = targetDescriptor.getId((EntityBean) detailBean);
+        if (!DmlUtil.isNullOrZero(id)) {
+          // remember the Id (other details not in the collection) will be removed
+          detailIds.add(id);
+        }
+      }
+    }
+    return detailIds;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java b/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java
index 9ab432141..7bc370757 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java
@@ -3,10 +3,12 @@ package io.ebeaninternal.server.persist.dml;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbEncrypt;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
+import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 import io.ebeaninternal.server.persist.dmlbind.Bindable;
 import io.ebeaninternal.server.persist.dmlbind.BindableId;
 import io.ebeaninternal.server.persist.dmlbind.BindableList;
+import io.ebeaninternal.server.persist.dmlbind.BindableOrderColumn;
 import io.ebeaninternal.server.persist.dmlbind.BindableUnidirectional;
 import io.ebeaninternal.server.persist.dmlbind.FactoryAssocOnes;
 import io.ebeaninternal.server.persist.dmlbind.FactoryBaseProperties;
@@ -62,6 +64,11 @@ public class MetaFactory {
     embeddedFact.create(setList, desc, DmlMode.UPDATE, includeLobs);
     assocOneFact.create(setList, desc, DmlMode.UPDATE);
 
+    BeanProperty orderColumn = desc.getOrderColumn();
+    if (orderColumn != null) {
+      setList.add(new BindableOrderColumn(orderColumn));
+    }
+
     BindableId id = idFact.createId(desc);
     Bindable version = versionFact.create(desc);
     Bindable tenantId = versionFact.createTenantId(desc);
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableOrderColumn.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableOrderColumn.java
new file mode 100644
index 000000000..ef7046634
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableOrderColumn.java
@@ -0,0 +1,37 @@
+package io.ebeaninternal.server.persist.dmlbind;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.core.PersistRequestBean;
+import io.ebeaninternal.server.deploy.BeanProperty;
+
+import java.sql.SQLException;
+import java.util.List;
+
+/**
+ * Bindable for the synthetic order column.
+ */
+public class BindableOrderColumn extends BindableProperty {
+
+  public BindableOrderColumn(BeanProperty prop) {
+    super(prop);
+  }
+
+  @Override
+  public void addToUpdate(PersistRequestBean<?> request, List<Bindable> list) {
+    int sortOrder = request.getEntityBeanIntercept().getSortOrder();
+    if (sortOrder > 0) {
+      list.add(this);
+    }
+  }
+
+  /**
+   * Normal binding of a property value from the bean.
+   */
+  @Override
+  public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException {
+
+    int sortOrder = bean._ebean_getIntercept().getSortOrder();
+    request.bind(sortOrder, prop);
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 1e3812b3a..a6dd341d4 100644
--- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -109,7 +109,7 @@ public final class DefaultTypeManager implements TypeManager {
 
   private final ScalarType<?> shortType = new ScalarTypeShort();
 
-  private final ScalarType<?> integerType = new ScalarTypeInteger();
+  private final ScalarType<?> integerType = ScalarTypeInteger.INSTANCE;
 
   private final ScalarType<?> longType = new ScalarTypeLong();
 
@@ -130,7 +130,7 @@ public final class DefaultTypeManager implements TypeManager {
   private final ScalarType<?> currencyType = new ScalarTypeCurrency();
   private final ScalarType<?> timeZoneType = new ScalarTypeTimeZone();
 
-  private final ScalarType<?> stringType = new ScalarTypeString();
+  private final ScalarType<?> stringType = ScalarTypeString.INSTANCE;
 
   private final ScalarType<?> classType = new ScalarTypeClass();
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
index 6a4caddcd..51f6cfe4d 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
@@ -1,10 +1,10 @@
 package io.ebeaninternal.server.type;
 
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.text.TextException;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 import io.ebeanservice.docstore.api.mapping.DocPropertyType;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -17,7 +17,9 @@ import java.sql.Types;
  */
 public class ScalarTypeInteger extends ScalarTypeBase<Integer> {
 
-  public ScalarTypeInteger() {
+  public static ScalarTypeInteger INSTANCE = new ScalarTypeInteger();
+
+  private ScalarTypeInteger() {
     super(Integer.class, true, Types.INTEGER);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeString.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeString.java
index 164a55fcf..f9a31355c 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeString.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeString.java
@@ -1,9 +1,9 @@
 package io.ebeaninternal.server.type;
 
-import io.ebeaninternal.server.core.BasicTypeConverter;
-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
+import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -16,7 +16,9 @@ import java.sql.Types;
  */
 public class ScalarTypeString extends ScalarTypeBase<String> {
 
-  public ScalarTypeString() {
+  public static final ScalarTypeString INSTANCE = new ScalarTypeString();
+
+  private ScalarTypeString() {
     super(String.class, true, Types.VARCHAR);
   }
 
diff --git a/src/test/java/org/tests/cascade/OmOrderedDetail.java b/src/test/java/org/tests/cascade/OmOrderedDetail.java
new file mode 100644
index 000000000..b15a4ff8e
--- /dev/null
+++ b/src/test/java/org/tests/cascade/OmOrderedDetail.java
@@ -0,0 +1,57 @@
+package org.tests.cascade;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Version;
+
+@Entity
+public class OmOrderedDetail {
+
+  @Id
+  Long id;
+
+  String name;
+
+  @ManyToOne
+  OmOrderedMaster master;
+
+  @Version
+  Long version;
+
+  public OmOrderedDetail(String name) {
+    this.name = name;
+  }
+
+  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 OmOrderedMaster getMaster() {
+    return master;
+  }
+
+  public void setMaster(OmOrderedMaster master) {
+    this.master = master;
+  }
+
+  public Long getVersion() {
+    return version;
+  }
+
+  public void setVersion(Long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/cascade/OmOrderedMaster.java b/src/test/java/org/tests/cascade/OmOrderedMaster.java
new file mode 100644
index 000000000..8607084d3
--- /dev/null
+++ b/src/test/java/org/tests/cascade/OmOrderedMaster.java
@@ -0,0 +1,63 @@
+package org.tests.cascade;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderColumn;
+import javax.persistence.Version;
+import java.util.List;
+
+@Entity
+public class OmOrderedMaster {
+
+  @Id
+  Long id;
+
+  String name;
+
+  /**
+   * Cascade ALL set automatically as we set order values when cascading.
+   */
+  @OneToMany(mappedBy = "master") //, cascade = CascadeType.ALL)
+  @OrderColumn(name="sort_order")
+  List<OmOrderedDetail> details;
+
+  @Version
+  Long version;
+
+  public OmOrderedMaster(String name) {
+    this.name = name;
+  }
+
+  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 List<OmOrderedDetail> getDetails() {
+    return details;
+  }
+
+  public void setDetails(List<OmOrderedDetail> details) {
+    this.details = details;
+  }
+
+  public Long getVersion() {
+    return version;
+  }
+
+  public void setVersion(Long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/cascade/TestOrderedList.java b/src/test/java/org/tests/cascade/TestOrderedList.java
new file mode 100644
index 000000000..9baf7a601
--- /dev/null
+++ b/src/test/java/org/tests/cascade/TestOrderedList.java
@@ -0,0 +1,98 @@
+package org.tests.cascade;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestOrderedList extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    OmOrderedMaster master = new OmOrderedMaster("m1");
+
+    List<OmOrderedDetail> details = master.getDetails();
+    for (int i = 0; i < 5; i++) {
+      details.add(new OmOrderedDetail("d"+i));
+    }
+
+    LoggedSqlCollector.start();
+    Ebean.save(master);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql.size()).isGreaterThan(1);
+    assertThat(sql.get(0)).contains("insert into om_ordered_master");
+    assertThat(sql.get(1)).contains("insert into om_ordered_detail (name, version, sort_order, master_id) values (?,?,?,?)");
+
+    // update without any changes
+    Ebean.save(master);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty();
+
+
+    // update just changing master
+    master.setName("m1-mod");
+    Ebean.save(master);
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("update om_ordered_master set name=?, version=?");
+
+
+    fetchAndReorder(master.getId());
+
+  }
+
+  private void fetchAndReorder(Long id) {
+
+    OmOrderedMaster fresh = Ebean.find(OmOrderedMaster.class).setId(id).fetch("details").findOne();
+    List<OmOrderedDetail> details1 = fresh.getDetails();
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql.get(0)).contains("order by t0.id, t1.sort_order");
+
+    // fetched, not dirty
+    Ebean.save(fresh);
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty();
+
+
+    // reorder
+    OmOrderedDetail third = details1.remove(2);
+    OmOrderedDetail first = details1.remove(0);
+    details1.add(first);
+    details1.add(third);
+
+    fresh.setName("m1-reorder");
+
+    Ebean.save(fresh);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(6);
+    assertThat(sql.get(0)).contains("update om_ordered_master set name=?, version=?");
+    assertThat(sql.get(1)).contains("update om_ordered_detail set version=?, sort_order=? where id=? and version=?");
+
+    details1.get(1).setName("was 1");
+    fresh.setName("m1-mod3");
+    Ebean.save(fresh);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(6);
+    assertThat(sql.get(0)).contains("update om_ordered_master set name=?, version=?");
+    assertThat(sql.get(1)).contains("update om_ordered_detail set version=?, sort_order=? where id=? and version=?");
+    assertThat(sql.get(2)).contains("update om_ordered_detail set name=?, version=?, sort_order=? where id=? and version=?");
+
+
+    Ebean.delete(fresh);
+
+    sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("delete from om_ordered_detail where master_id = ?");
+    assertThat(sql.get(1)).contains("delete from om_ordered_master where id=? and version=?");
+  }
+}

From 49b568e7d45f9fe0e0bd27f1c7c41bc1f444b1d0 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 15 Feb 2018 22:32:43 +1300
Subject: [PATCH 0025/1036] [maven-release-plugin] prepare release
 ebean-11.10.5

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 621a03706..1bfed8150 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.10.5-SNAPSHOT</version>
+  <version>11.10.5</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.10.5</tag>
   </scm>
 
   <profiles>

From 6c1b295d4195c047f9baa6ec7b72e784fccb0a73 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 15 Feb 2018 22:32:56 +1300
Subject: [PATCH 0026/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1bfed8150..be7fed8e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.10.5</version>
+  <version>11.10.6-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.10.5</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 9926cad7f16cdc3e4cd27ac1c4b6a556ca6042d4 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 16 Feb 2018 00:11:27 +1300
Subject: [PATCH 0027/1036] #1262 - ENH: Support firstRow maxRows with
 findNative()

---
 .../server/query/CQueryBuilder.java           |  7 ++
 .../server/querydefn/DefaultOrmQuery.java     |  2 +-
 .../rawsql/nativesql/TestNativeSqlBasic.java  | 73 ++++++++++++-------
 3 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 5753d4021..6ae7a12a0 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -366,6 +366,10 @@ class CQueryBuilder {
     return new SqlTreeBuilder(this, request, predicates).build();
   }
 
+  private String nativeQueryPaging(SpiQuery<?> query, String sql) {
+    return dbPlatform.getBasicSqlLimiter().limit(sql, query.getFirstRow(), query.getMaxRows());
+  }
+
   /**
    * Create the SqlTree by reading the ResultSetMetaData and mapping table/columns to bean property paths.
    */
@@ -375,6 +379,9 @@ class CQueryBuilder {
 
     // parse named parameters returning the final sql to execute
     String sql = predicates.parseBindParams(query.getNativeSql());
+    if (query.hasMaxRowsOrFirstRow()) {
+      sql = nativeQueryPaging(query, sql);
+    }
     query.setGeneratedSql(sql);
 
     Connection connection = request.getTransaction().getConnection();
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 7a85fe2d8..a2cb55362 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -996,7 +996,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   CQueryPlanKey createQueryPlanKey() {
 
     if (isNativeSql()) {
-      queryPlanKey = new NativeSqlQueryPlanKey(nativeSql);
+      queryPlanKey = new NativeSqlQueryPlanKey(nativeSql + "-" + firstRow + "-" + maxRows);
     } else {
       queryPlanKey = new OrmQueryPlanKey(beanDescriptor.getDiscValue(), m2mIncludeJoin, type, detail, maxRows, firstRow,
         disableLazyLoading, orderBy,
diff --git a/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java b/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java
index 77ceba129..94f7219a4 100644
--- a/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java
+++ b/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java
@@ -3,7 +3,6 @@ package org.tests.rawsql.nativesql;
 import io.ebean.BaseTestCase;
 import io.ebean.BeanState;
 import io.ebean.Ebean;
-import io.ebean.EbeanServer;
 import io.ebean.Query;
 import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.Platform;
@@ -24,16 +23,14 @@ public class TestNativeSqlBasic extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    EbeanServer server = Ebean.getDefaultServer();
-
     String nativeSql = "select id, name from o_customer";
 
-    Query<Customer> query = server.findNative(Customer.class, nativeSql);
+    Query<Customer> query = Ebean.findNative(Customer.class, nativeSql);
 
     List<Customer> customers = query.findList();
     assertThat(customers).isNotEmpty();
 
-    BeanState beanState = server.getBeanState(customers.get(0));
+    BeanState beanState = Ebean.getBeanState(customers.get(0));
     assertThat(beanState.getLoadedProps()).contains("id", "name");
   }
 
@@ -42,15 +39,13 @@ public class TestNativeSqlBasic extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    EbeanServer server = Ebean.getDefaultServer();
-
     String nativeSql = "select * from o_customer";
-    Query<Customer> query = server.findNative(Customer.class, nativeSql);
+    Query<Customer> query = Ebean.findNative(Customer.class, nativeSql);
 
     List<Customer> customers = query.findList();
     assertThat(customers).isNotEmpty();
 
-    BeanState beanState = server.getBeanState(customers.get(0));
+    BeanState beanState = Ebean.getBeanState(customers.get(0));
     assertThat(beanState.getLoadedProps().size()).isGreaterThan(10);
   }
 
@@ -59,10 +54,8 @@ public class TestNativeSqlBasic extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    EbeanServer server = Ebean.getDefaultServer();
-
     String nativeSql = "select c.*, b.city from o_customer c join o_address b on b.id = c.billing_address_id";
-    Query<Customer> query = server.findNative(Customer.class, nativeSql);
+    Query<Customer> query = Ebean.findNative(Customer.class, nativeSql);
 
     List<Customer> customers = query.findList();
     assertThat(customers).isNotEmpty();
@@ -73,33 +66,67 @@ public class TestNativeSqlBasic extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    EbeanServer server = Ebean.getDefaultServer();
-
     String nativeSql = "select id, name from o_customer where id > :some";
 
-    Query<Customer> query = server.findNative(Customer.class, nativeSql);
+    Query<Customer> query = Ebean.findNative(Customer.class, nativeSql);
     query.setParameter("some", 1);
 
     List<Customer> customers = query.findList();
     assertThat(customers).isNotEmpty();
 
-    Query<Customer> query2 = server.findNative(Customer.class, nativeSql);
+    Query<Customer> query2 = Ebean.findNative(Customer.class, nativeSql);
     query2.setParameter("some", 2);
 
     List<Customer> customers2 = query2.findList();
     assertThat(customers2).isNotEmpty();
   }
 
+  @Test
+  public void withMaxRows() {
+
+    ResetBasicData.reset();
+
+    String nativeSql = "select id, name from o_customer where id > :some";
+
+    Query<Customer> query = Ebean.findNative(Customer.class, nativeSql)
+      .setParameter("some", 1)
+      .setMaxRows(10);
+
+    query.findList();
+
+    if (isH2() || isPostgres()) {
+      assertThat(sqlOf(query)).contains(" limit 10");
+    }
+  }
+
+  @Test
+  public void withFirstRowsMaxRows() {
+
+    ResetBasicData.reset();
+
+    String nativeSql = "select id, name from o_customer where id > :some";
+
+    Query<Customer> query = Ebean.findNative(Customer.class, nativeSql)
+      .setParameter("some", 1)
+      .setFirstRow(20)
+      .setMaxRows(10);
+
+    query.findList();
+
+    if (isH2() || isPostgres()) {
+      assertThat(sqlOf(query)).contains(" limit 10 offset 20");
+    }
+  }
+
+
   @Test
   public void partialAndLazyLoad() {
 
     ResetBasicData.reset();
 
-    EbeanServer server = Ebean.getDefaultServer();
-
     String nativeSql = "select id, name from o_customer where id > ?";
 
-    List<Customer> customers = server.findNative(Customer.class, nativeSql)
+    List<Customer> customers = Ebean.findNative(Customer.class, nativeSql)
       .setParameter(1, 1)
       .findList();
 
@@ -117,11 +144,9 @@ public class TestNativeSqlBasic extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    EbeanServer server = Ebean.getDefaultServer();
-
     String nativeSql = "select o.id, o.status, c.id, c.name, c.version from o_order o join o_customer c on c.id = o.kcustomer_id ";
 
-    List<Order> orders = server.findNative(Order.class, nativeSql)
+    List<Order> orders = Ebean.findNative(Order.class, nativeSql)
       .findList();
 
     for (Order order : orders) {
@@ -135,11 +160,9 @@ public class TestNativeSqlBasic extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    EbeanServer server = Ebean.getDefaultServer();
-
     String nativeSql = "select o.id, o.status, o.kcustomer_id from o_order o";
 
-    List<Order> orders = server.findNative(Order.class, nativeSql)
+    List<Order> orders = Ebean.findNative(Order.class, nativeSql)
       .findList();
 
     LoggedSqlCollector.start();

From 5237e8ba666e2389eeb1e656177e27fe80c438d9 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 16 Feb 2018 09:45:49 +1300
Subject: [PATCH 0028/1036] #1261 - ENH: Support use of getGeneratedKeys with
 SqlUpdate

---
 src/main/java/io/ebean/SqlUpdate.java         |  24 ++++
 .../io/ebeaninternal/api/SpiSqlUpdate.java    |  16 +++
 .../server/core/DefaultSqlUpdate.java         |  31 +++++
 .../server/core/PersistRequestUpdateSql.java  |   5 +
 .../server/persist/ExeOrmUpdate.java          |   6 +-
 .../server/persist/ExeUpdateSql.java          |  27 +++-
 .../server/persist/PstmtFactory.java          |  13 +-
 .../server/persist/dml/DmlHandler.java        |   5 +-
 .../java/io/ebeaninternal/util/JdbcClose.java |  14 ++
 .../java/org/tests/update/EPersonOnline.java  |  57 ++++++++
 .../org/tests/update/TestSqlUpdateUpsert.java | 128 ++++++++++++++++++
 src/test/resources/ebean.properties           |   2 +-
 12 files changed, 315 insertions(+), 13 deletions(-)
 create mode 100644 src/test/java/org/tests/update/EPersonOnline.java
 create mode 100644 src/test/java/org/tests/update/TestSqlUpdateUpsert.java

diff --git a/src/main/java/io/ebean/SqlUpdate.java b/src/main/java/io/ebean/SqlUpdate.java
index 1f8401eed..59865f815 100644
--- a/src/main/java/io/ebean/SqlUpdate.java
+++ b/src/main/java/io/ebean/SqlUpdate.java
@@ -54,6 +54,25 @@ public interface SqlUpdate {
    */
   int execute();
 
+  /**
+   * Return the generated key value.
+   */
+  Object getGeneratedKey();
+
+  /**
+   * Execute and return the generated key. This is effectively a short cut for:
+   *
+   * <pre>{@code
+   *
+   *   sqlUpdate.execute();
+   *   Object key = sqlUpdate.getGeneratedKey();
+   *
+   * }</pre>
+   *
+   * @return The generated key value
+   */
+  Object executeGetKey();
+
   /**
    * Return true if eBean should automatically deduce the table modification
    * information and process it.
@@ -88,6 +107,11 @@ public interface SqlUpdate {
    */
   SqlUpdate setLabel(String label);
 
+  /**
+   * Set to true when we want to use getGeneratedKeys with this statement.
+   */
+  SqlUpdate setGetGeneratedKeys(boolean getGeneratedKeys);
+
   /**
    * Return the sql statement.
    */
diff --git a/src/main/java/io/ebeaninternal/api/SpiSqlUpdate.java b/src/main/java/io/ebeaninternal/api/SpiSqlUpdate.java
index d9da393c8..10c7ccad7 100644
--- a/src/main/java/io/ebeaninternal/api/SpiSqlUpdate.java
+++ b/src/main/java/io/ebeaninternal/api/SpiSqlUpdate.java
@@ -4,7 +4,23 @@ import io.ebean.SqlUpdate;
 
 public interface SpiSqlUpdate extends SqlUpdate {
 
+  /**
+   * Return the Bind parameters.
+   */
   BindParams getBindParams();
 
+  /**
+   * Set the final sql being executed with named parameters replaced etc.
+   */
   void setGeneratedSql(String sql);
+
+  /**
+   * Return true if we are using getGeneratedKeys.
+   */
+  boolean isGetGeneratedKeys();
+
+  /**
+   * Set the generated key value.
+   */
+  void setGeneratedKey(Object idValue);
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java b/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
index ea8a4c3cc..c65b6c269 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
@@ -65,6 +65,10 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
    */
   private int addPos;
 
+  private boolean getGeneratedKeys;
+
+  private Object generatedKey;
+
   /**
    * Create with server sql and bindParams object.
    * <p>
@@ -93,6 +97,12 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
     this(null, sql, new BindParams());
   }
 
+  @Override
+  public Object executeGetKey() {
+    execute();
+    return getGeneratedKey();
+  }
+
   @Override
   public int execute() {
     if (server != null) {
@@ -103,6 +113,16 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
     }
   }
 
+  @Override
+  public Object getGeneratedKey() {
+    return generatedKey;
+  }
+
+  @Override
+  public void setGeneratedKey(Object idValue) {
+    this.generatedKey = idValue;
+  }
+
   @Override
   public boolean isAutoTableMod() {
     return isAutoTableMod;
@@ -125,6 +145,17 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
     return this;
   }
 
+  @Override
+  public boolean isGetGeneratedKeys() {
+    return getGeneratedKeys;
+  }
+
+  @Override
+  public SqlUpdate setGetGeneratedKeys(boolean getGeneratedKeys) {
+    this.getGeneratedKeys = getGeneratedKeys;
+    return this;
+  }
+
   @Override
   public String getGeneratedSql() {
     return generatedSql;
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
index 52add1204..05fd26cd6 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
@@ -73,6 +73,11 @@ public final class PersistRequestUpdateSql extends PersistRequest {
    */
   @Override
   public void setGeneratedKey(Object idValue) {
+    updateSql.setGeneratedKey(idValue);
+  }
+
+  public boolean isGetGeneratedKeys() {
+    return updateSql.isGetGeneratedKeys();
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java b/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java
index 756111a72..3830096a6 100644
--- a/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java
+++ b/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java
@@ -16,7 +16,7 @@ import java.sql.SQLException;
 /**
  * Executes the UpdateSql requests.
  */
-public class ExeOrmUpdate {
+class ExeOrmUpdate {
 
   private static final Logger logger = LoggerFactory.getLogger(ExeOrmUpdate.class);
 
@@ -27,7 +27,7 @@ public class ExeOrmUpdate {
   /**
    * Create with a given binder.
    */
-  public ExeOrmUpdate(Binder binder) {
+  ExeOrmUpdate(Binder binder) {
     this.pstmtFactory = new PstmtFactory();
     this.binder = binder;
   }
@@ -107,7 +107,7 @@ public class ExeOrmUpdate {
       if (logSql) {
         t.logSql(sql);
       }
-      pstmt = pstmtFactory.getPstmt(t, sql);
+      pstmt = pstmtFactory.getPstmt(t, sql, false);
     }
 
     String bindLog = null;
diff --git a/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java b/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java
index 7e265033a..b8e050783 100644
--- a/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java
+++ b/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java
@@ -6,17 +6,19 @@ import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.core.PersistRequestUpdateSql;
 import io.ebeaninternal.server.core.PersistRequestUpdateSql.SqlType;
 import io.ebeaninternal.server.util.BindParamsParser;
+import io.ebeaninternal.util.JdbcClose;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.persistence.PersistenceException;
 import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import java.sql.SQLException;
 
 /**
  * Executes the UpdateSql requests.
  */
-public class ExeUpdateSql {
+class ExeUpdateSql {
 
   private static final Logger logger = LoggerFactory.getLogger(ExeUpdateSql.class);
 
@@ -27,7 +29,7 @@ public class ExeUpdateSql {
   /**
    * Create with a given binder.
    */
-  public ExeUpdateSql(Binder binder) {
+  ExeUpdateSql(Binder binder) {
     this.binder = binder;
     this.pstmtFactory = new PstmtFactory();
   }
@@ -51,6 +53,9 @@ public class ExeUpdateSql {
       } else {
         int rowCount = pstmt.executeUpdate();
         request.checkRowCount(rowCount);
+        if (request.isGetGeneratedKeys()) {
+          readGeneratedKeys(pstmt, request);
+        }
         request.postExecute();
         return rowCount;
       }
@@ -68,6 +73,22 @@ public class ExeUpdateSql {
     }
   }
 
+  private void readGeneratedKeys(PreparedStatement stmt, PersistRequestUpdateSql request) {
+
+    ResultSet resultSet = null;
+      try {
+        resultSet = stmt.getGeneratedKeys();
+        if (resultSet.next()) {
+          request.setGeneratedKey(resultSet.getObject(1));
+        }
+      } catch (SQLException ex) {
+        throw new PersistenceException(ex);
+
+      } finally {
+        JdbcClose.close(resultSet);
+      }
+  }
+
   private PreparedStatement bindStmt(PersistRequestUpdateSql request, boolean batchThisRequest) throws SQLException {
 
     SpiSqlUpdate updateSql = request.getUpdateSql();
@@ -90,7 +111,7 @@ public class ExeUpdateSql {
       if (logSql) {
         t.logSql(TrimLogSql.trim(sql));
       }
-      pstmt = pstmtFactory.getPstmt(t, sql);
+      pstmt = pstmtFactory.getPstmt(t, sql, request.isGetGeneratedKeys());
     }
 
     if (updateSql.getTimeout() > 0) {
diff --git a/src/main/java/io/ebeaninternal/server/persist/PstmtFactory.java b/src/main/java/io/ebeaninternal/server/persist/PstmtFactory.java
index 6655e4cbb..df1c348b1 100644
--- a/src/main/java/io/ebeaninternal/server/persist/PstmtFactory.java
+++ b/src/main/java/io/ebeaninternal/server/persist/PstmtFactory.java
@@ -6,6 +6,7 @@ import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.sql.Statement;
 
 /**
  * Factory for creating Statements.
@@ -14,9 +15,9 @@ import java.sql.SQLException;
  * getGeneratedKeys.
  * </p>
  */
-public class PstmtFactory {
+class PstmtFactory {
 
-  public PstmtFactory() {
+  PstmtFactory() {
   }
 
   /**
@@ -30,9 +31,13 @@ public class PstmtFactory {
   /**
    * Get a prepared statement without any batching.
    */
-  public PreparedStatement getPstmt(SpiTransaction t, String sql) throws SQLException {
+  public PreparedStatement getPstmt(SpiTransaction t, String sql, boolean getGeneratedKeys) throws SQLException {
     Connection conn = t.getInternalConnection();
-    return conn.prepareStatement(sql);
+    if (getGeneratedKeys) {
+      return conn.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
+    } else {
+      return conn.prepareStatement(sql);
+    }
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
index 22777d865..3b7d0e857 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
@@ -24,6 +24,8 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
 
   private static final Logger logger = LoggerFactory.getLogger(DmlHandler.class);
 
+  private static final int[] GENERATED_KEY_COLUMNS = new int[]{1};
+
   /**
    * The originating request.
    */
@@ -260,8 +262,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
       // the Id generated is always the first column
       // Required to stop Oracle10 giving us Oracle rowId??
       // Other jdbc drivers seem fine without this hint.
-      int[] columns = {1};
-      return conn.prepareStatement(sql, columns);
+      return conn.prepareStatement(sql, GENERATED_KEY_COLUMNS);
 
     } else {
       return conn.prepareStatement(sql);
diff --git a/src/main/java/io/ebeaninternal/util/JdbcClose.java b/src/main/java/io/ebeaninternal/util/JdbcClose.java
index 4fc2432e7..647f34709 100644
--- a/src/main/java/io/ebeaninternal/util/JdbcClose.java
+++ b/src/main/java/io/ebeaninternal/util/JdbcClose.java
@@ -4,6 +4,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.sql.Connection;
+import java.sql.ResultSet;
 import java.sql.SQLException;
 
 /**
@@ -13,6 +14,19 @@ public class JdbcClose {
 
   private static final Logger logger = LoggerFactory.getLogger(JdbcClose.class);
 
+  /**
+   * Close the resultSet logging if an error occurs.
+   */
+  public static void close(ResultSet resultSet) {
+    try {
+      if (resultSet != null) {
+        resultSet.close();
+      }
+    } catch (SQLException e) {
+      logger.warn("Error closing resultSet", e);
+    }
+  }
+
   /**
    * Close the connection logging if an error occurs.
    */
diff --git a/src/test/java/org/tests/update/EPersonOnline.java b/src/test/java/org/tests/update/EPersonOnline.java
new file mode 100644
index 000000000..f9a3e3e04
--- /dev/null
+++ b/src/test/java/org/tests/update/EPersonOnline.java
@@ -0,0 +1,57 @@
+package org.tests.update;
+
+import io.ebean.annotation.Index;
+import io.ebean.annotation.WhenModified;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.time.Instant;
+
+@Entity
+@Table(name = "e_person_online")
+public class EPersonOnline {
+
+  @Id
+  Long id;
+
+  @Index(unique = true)
+  String email;
+
+  boolean online;
+
+  @WhenModified
+  Instant whenUpdated;
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public String getEmail() {
+    return email;
+  }
+
+  public void setEmail(String email) {
+    this.email = email;
+  }
+
+  public boolean isOnline() {
+    return online;
+  }
+
+  public void setOnline(boolean online) {
+    this.online = online;
+  }
+
+  public Instant getWhenUpdated() {
+    return whenUpdated;
+  }
+
+  public void setWhenUpdated(Instant whenUpdated) {
+    this.whenUpdated = whenUpdated;
+  }
+}
diff --git a/src/test/java/org/tests/update/TestSqlUpdateUpsert.java b/src/test/java/org/tests/update/TestSqlUpdateUpsert.java
new file mode 100644
index 000000000..92aa0dd3f
--- /dev/null
+++ b/src/test/java/org/tests/update/TestSqlUpdateUpsert.java
@@ -0,0 +1,128 @@
+package org.tests.update;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.SqlUpdate;
+import io.ebean.annotation.ForPlatform;
+import io.ebean.annotation.Platform;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestSqlUpdateUpsert extends BaseTestCase {
+
+  @ForPlatform(Platform.H2)
+  @Test
+  public void h2Merge() {
+
+    String sql = "merge into e_person_online (email, online, when_updated) key(email) values (?, ?, now())";
+
+    String email = "baz@one.com";
+
+    Object key = Ebean.createSqlUpdate(sql)
+      .setGetGeneratedKeys(true)
+      .setParameter(1, email)
+      .setParameter(2, true)
+      .executeGetKey();
+
+    EPersonOnline found = Ebean.find(EPersonOnline.class, key);
+    assertThat(found).isNotNull();
+    assertThat(found.getEmail()).isEqualTo(email);
+    assertThat(found.isOnline()).isTrue();
+
+    String sqlNamed = "merge into e_person_online (email, online, when_updated) key(email) values (:email, :online, now())";
+
+    SqlUpdate sqlUpdate2 = Ebean.createSqlUpdate(sqlNamed)
+      .setGetGeneratedKeys(true)
+      .setParameter("email", email)
+      .setParameter("online", false);
+
+    Object key2 = sqlUpdate2.executeGetKey();
+    assertThat(key2).isNull();
+
+
+    EPersonOnline found2 = Ebean.find(EPersonOnline.class).where().eq("email", email).findOne();
+    assertThat(found2).isNotNull();
+    assertThat(found2.getId()).isEqualTo(key);
+    assertThat(found2.getEmail()).isEqualTo(email);
+    assertThat(found2.isOnline()).isFalse();
+    assertThat(found2.getWhenUpdated()).isGreaterThan(found.getWhenUpdated());
+  }
+
+  @ForPlatform(Platform.POSTGRES)
+  @Test
+  public void postgresUpsert() {
+
+    String sql = "insert into e_person_online (email, online, when_updated) values (?, ?, now()) on conflict (email) do update set when_updated=now(), online = ?";
+
+    String email = "foo@one.com";
+
+    Object key = Ebean.createSqlUpdate(sql)
+      .setGetGeneratedKeys(true)
+      .setParameter(1, email)
+      .setParameter(2, true)
+      .setParameter(3, true)
+      .executeGetKey();
+
+    EPersonOnline found = Ebean.find(EPersonOnline.class, key);
+    assertThat(found).isNotNull();
+    assertThat(found.getEmail()).isEqualTo("foo@one.com");
+    assertThat(found.isOnline()).isTrue();
+
+
+    String sqlNamed = "insert into e_person_online (email, online, when_updated) values (:email, :online, now()) on conflict (email) do update set when_updated=now(), online = :online";
+    SqlUpdate sqlUpdate2 = Ebean.createSqlUpdate(sqlNamed)
+      .setGetGeneratedKeys(true)
+      .setParameter("email", email)
+      .setParameter("online", false);
+
+    Object key2 = sqlUpdate2.executeGetKey();
+
+    EPersonOnline found2 = Ebean.find(EPersonOnline.class, key2);
+    assertThat(found2).isNotNull();
+    assertThat(found2.getId()).isEqualTo(key);
+    assertThat(found2.getEmail()).isEqualTo("foo@one.com");
+    assertThat(found2.isOnline()).isFalse();
+    assertThat(found2.getWhenUpdated()).isGreaterThan(found.getWhenUpdated());
+
+  }
+
+  @ForPlatform(Platform.MYSQL)
+  @Test
+  public void mySqlUpsert() {
+
+    String email = "bar@one.com";
+
+    String sql = "insert into e_person_online (email, online, when_updated) values (?, ?, current_time) on duplicate key update when_updated=current_time, online = ?";
+    SqlUpdate sqlUpdate = Ebean.createSqlUpdate(sql)
+      .setGetGeneratedKeys(true)
+      .setParameter(1, email)
+      .setParameter(2, true)
+      .setParameter(3, true);
+
+    Object key = sqlUpdate.executeGetKey();
+    assertThat(key).isNotNull();
+
+    EPersonOnline found = Ebean.find(EPersonOnline.class, key);
+    assertThat(found).isNotNull();
+    assertThat(found.getEmail()).isEqualTo("bar@one.com");
+    assertThat(found.isOnline()).isTrue();
+
+
+    String sqlNamed = "insert into e_person_online (email, online, when_updated) values (:email, :online, current_time) on duplicate key update when_updated=current_time, online = :online";
+    SqlUpdate sqlUpdate2 = Ebean.createSqlUpdate(sqlNamed)
+      .setGetGeneratedKeys(true)
+      .setParameter("email", email)
+      .setParameter("online", false);
+
+    sqlUpdate2.execute();
+    Object key2 = sqlUpdate2.getGeneratedKey();
+
+    EPersonOnline found2 = Ebean.find(EPersonOnline.class, key2);
+    assertThat(found2).isNotNull();
+    assertThat(found2.getId()).isEqualTo(key);
+    assertThat(found2.getEmail()).isEqualTo("bar@one.com");
+    assertThat(found2.isOnline()).isFalse();
+
+  }
+}
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 39776ad38..d2e64ef00 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -103,7 +103,7 @@ datasource.hsqldb.databaseDriver=org.hsqldb.jdbcDriver
 
 datasource.mysql.username=test_ebean
 datasource.mysql.password=test
-datasource.mysql.databaseUrl=jdbc:mysql://127.0.0.1:3306/test_ebean
+datasource.mysql.databaseUrl=jdbc:mysql://127.0.0.1:4306/test_ebean
 datasource.mysql.databaseDriver=com.mysql.jdbc.Driver
 
 

From a5c6f483b0cc3a7cd42a4376e212f9095177951a Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 16 Feb 2018 11:18:17 +1300
Subject: [PATCH 0029/1036] #1258 - ENH: Add ServerConfig
 notifyL2CacheInForeground option ... was ServerCachePlugin BackgroundExecutor
 problem

---
 .../java/io/ebean/config/ServerConfig.java    | 27 ++++++++++++++++++-
 .../server/core/InternalConfiguration.java    |  4 +--
 .../transaction/PostCommitProcessing.java     |  2 +-
 .../transaction/TransactionManager.java       |  4 +--
 .../TransactionManagerOptions.java            |  6 ++---
 .../io/ebean/config/ServerConfigTest.java     | 13 +++++++++
 6 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index e2b1af685..a3f9348c9 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -463,6 +463,12 @@ public class ServerConfig {
    */
   private boolean disableL2Cache;
 
+  /**
+   * Generally we want to perform L2 cache notification in the background and not impact
+   * the performance of executing transactions.
+   */
+  private boolean notifyL2CacheInForeground;
+
   /**
    * The time in millis used to determine when a query is alerted for being slow.
    */
@@ -473,7 +479,6 @@ public class ServerConfig {
    */
   private SlowQueryListener slowQueryListener;
 
-
   private ProfilingConfig profilingConfig = new ProfilingConfig();
 
   /**
@@ -2680,6 +2685,7 @@ public class ServerConfig {
     slowQueryMillis = p.getLong("slowQueryMillis", slowQueryMillis);
     docStoreOnly = p.getBoolean("docStoreOnly", docStoreOnly);
     disableL2Cache = p.getBoolean("disableL2Cache", disableL2Cache);
+    notifyL2CacheInForeground = p.getBoolean("notifyL2CacheInForeground", notifyL2CacheInForeground);
     explicitTransactionBeginMode = p.getBoolean("explicitTransactionBeginMode", explicitTransactionBeginMode);
     autoCommitMode = p.getBoolean("autoCommitMode", autoCommitMode);
     useJtaTransactionManager = p.getBoolean("useJtaTransactionManager", useJtaTransactionManager);
@@ -2900,6 +2906,25 @@ public class ServerConfig {
     this.disableL2Cache = disableL2Cache;
   }
 
+  /**
+   * Return true if L2 cache notification should run in the foreground.
+   */
+  public boolean isNotifyL2CacheInForeground() {
+    return notifyL2CacheInForeground;
+  }
+
+  /**
+   * Set this to true to run L2 cache notification in the foreground.
+   * <p>
+   * In general we don't want to do that as when we use a distributed cache (like Ignite, Hazelcast etc)
+   * we are making network calls and we prefer to do this in background and not impact the response time
+   * of the executing transaction.
+   * </p>
+   */
+  public void setNotifyL2CacheInForeground(boolean notifyL2CacheInForeground) {
+    this.notifyL2CacheInForeground = notifyL2CacheInForeground;
+  }
+
   /**
    * Return the query plan time to live.
    */
diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index e2da8f4b4..3702d1984 100644
--- a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -372,10 +372,10 @@ public class InternalConfiguration {
   public TransactionManager createTransactionManager(DocStoreUpdateProcessor indexUpdateProcessor) {
 
     TransactionScopeManager scopeManager = createTransactionScopeManager();
-    boolean localL2 = cacheManager.isLocalL2Caching();
+    boolean notifyL2CacheInForeground = cacheManager.isLocalL2Caching() || serverConfig.isNotifyL2CacheInForeground();
 
     TransactionManagerOptions options =
-      new TransactionManagerOptions(localL2, serverConfig, scopeManager, clusterManager, backgroundExecutor,
+      new TransactionManagerOptions(notifyL2CacheInForeground, serverConfig, scopeManager, clusterManager, backgroundExecutor,
                                     indexUpdateProcessor, beanDescriptorManager, dataSource(), profileHandler());
 
     if (serverConfig.isExplicitTransactionBeginMode()) {
diff --git a/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java b/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
index 637482a2c..ac3a57560 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
@@ -86,7 +86,7 @@ public final class PostCommitProcessing {
    */
   void notifyLocalCache() {
     processTableEvents(event.getEventTables());
-    if (manager.localL2Caching) {
+    if (manager.notifyL2CacheInForeground) {
       // process l2 cache changes in foreground
       processCacheChanges(event.buildCacheChanges(manager.viewInvalidation));
     } else {
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index d4e0379ff..b9d3ce08f 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -120,7 +120,7 @@ public class TransactionManager implements SpiTransactionManager {
    */
   private final boolean changeLogAsync;
 
-  protected final boolean localL2Caching;
+  protected final boolean notifyL2CacheInForeground;
 
   protected final boolean viewInvalidation;
 
@@ -144,7 +144,7 @@ public class TransactionManager implements SpiTransactionManager {
 
     this.databasePlatform = options.config.getDatabasePlatform();
     this.skipCacheAfterWrite = options.config.isSkipCacheAfterWrite();
-    this.localL2Caching = options.localL2Caching;
+    this.notifyL2CacheInForeground = options.notifyL2CacheInForeground;
     this.persistBatch = options.config.getPersistBatch();
     this.persistBatchOnCascade = options.config.appliedPersistBatchOnCascade();
     this.rollbackOnChecked = options.config.isTransactionRollbackOnChecked();
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java
index 87a469b80..6c8c40d47 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java
@@ -12,7 +12,7 @@ import io.ebeanservice.docstore.api.DocStoreUpdateProcessor;
  */
 public class TransactionManagerOptions {
 
-  final boolean localL2Caching;
+  final boolean notifyL2CacheInForeground;
   final ServerConfig config;
   final ClusterManager clusterManager;
   final BackgroundExecutor backgroundExecutor;
@@ -23,11 +23,11 @@ public class TransactionManagerOptions {
   final SpiProfileHandler profileHandler;
   final TransactionScopeManager scopeManager;
 
-  public TransactionManagerOptions(boolean localL2Caching, ServerConfig config, TransactionScopeManager scopeManager, ClusterManager clusterManager,
+  public TransactionManagerOptions(boolean notifyL2CacheInForeground, ServerConfig config, TransactionScopeManager scopeManager, ClusterManager clusterManager,
                                    BackgroundExecutor backgroundExecutor, DocStoreUpdateProcessor docStoreUpdateProcessor,
                                    BeanDescriptorManager descMgr, DataSourceSupplier dataSourceSupplier, SpiProfileHandler profileHandler) {
 
-    this.localL2Caching = localL2Caching;
+    this.notifyL2CacheInForeground = notifyL2CacheInForeground;
     this.config = config;
     this.scopeManager = scopeManager;
     this.clusterManager = clusterManager;
diff --git a/src/test/java/io/ebean/config/ServerConfigTest.java b/src/test/java/io/ebean/config/ServerConfigTest.java
index dbeb9cdb8..860ad9582 100644
--- a/src/test/java/io/ebean/config/ServerConfigTest.java
+++ b/src/test/java/io/ebean/config/ServerConfigTest.java
@@ -7,6 +7,7 @@ import org.junit.Test;
 import java.util.Properties;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -43,9 +44,13 @@ public class ServerConfigTest {
     props.setProperty("dbOffline", "true");
     props.setProperty("jsonDateTime", "ISO8601");
     props.setProperty("autoReadOnlyDataSource", "true");
+    props.setProperty("disableL2Cache", "true");
+    props.setProperty("notifyL2CacheInForeground", "true");
 
     serverConfig.loadFromProperties(props);
 
+    assertTrue(serverConfig.isDisableL2Cache());
+    assertTrue(serverConfig.isNotifyL2CacheInForeground());
     assertTrue(serverConfig.isDbOffline());
     assertTrue(serverConfig.isAutoReadOnlyDataSource());
 
@@ -66,7 +71,15 @@ public class ServerConfigTest {
     props1.setProperty("ebean.persistBatch", "ALL");
     props1.setProperty("ebean.persistBatchOnCascade", "ALL");
 
+    serverConfig.setNotifyL2CacheInForeground(true);
+    serverConfig.setDisableL2Cache(true);
+    props1.setProperty("ebean.disableL2Cache", "false");
+    props1.setProperty("ebean.notifyL2CacheInForeground", "false");
+
     serverConfig.loadFromProperties(props1);
+    assertFalse(serverConfig.isDisableL2Cache());
+    assertFalse(serverConfig.isNotifyL2CacheInForeground());
+
     serverConfig.loadTestProperties();
 
     assertEquals(PersistBatch.ALL, serverConfig.getPersistBatch());

From cc7e22014dd023c5866a1986424f1ad0473648c2 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 16 Feb 2018 12:24:57 +1300
Subject: [PATCH 0030/1036] #997 - TypeReflectHelper does not resolve type
 variables correctly in non-trivial cases

Initial failing test ... and TypeResolver prior to cleanup
---
 .../server/type/TypeResolver.java             | 517 ++++++++++++++++++
 1 file changed, 517 insertions(+)
 create mode 100644 src/main/java/io/ebeaninternal/server/type/TypeResolver.java

diff --git a/src/main/java/io/ebeaninternal/server/type/TypeResolver.java b/src/main/java/io/ebeaninternal/server/type/TypeResolver.java
new file mode 100644
index 000000000..46b91a00a
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/type/TypeResolver.java
@@ -0,0 +1,517 @@
+package io.ebeaninternal.server.type;
+
+
+//import java.lang.ref.Reference;
+//import java.lang.ref.WeakReference;
+//import java.lang.reflect.AccessibleObject;
+
+import java.lang.reflect.Array;
+import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.util.HashMap;
+import java.util.Map;
+
+//import java.lang.reflect.Constructor;
+//import java.lang.reflect.Field;
+//import java.lang.reflect.Member;
+//import java.lang.reflect.Method;
+//import java.lang.reflect.Modifier;
+//import java.security.AccessController;
+//import java.security.PrivilegedExceptionAction;
+//import java.util.Arrays;
+//import java.util.Collections;
+//import java.util.WeakHashMap;
+
+//import sun.misc.Unsafe;
+
+public class TypeResolver {
+
+  /** Cache of type variable/argument pairs */
+//  private static final Map<Class<?>, Reference<Map<TypeVariable<?>, Type>>> TYPE_VARIABLE_CACHE = Collections
+//    .synchronizedMap(new WeakHashMap<Class<?>, Reference<Map<TypeVariable<?>, Type>>>());
+//  private static volatile boolean CACHE_ENABLED = true;
+//  private static boolean RESOLVES_LAMBDAS;
+//  private static Method GET_CONSTANT_POOL;
+//  private static Method GET_CONSTANT_POOL_SIZE;
+//  private static Method GET_CONSTANT_POOL_METHOD_AT;
+//  private static final Map<String, Method> OBJECT_METHODS = new HashMap<String, Method>();
+//  private static final Map<Class<?>, Class<?>> PRIMITIVE_WRAPPERS;
+//  private static final Double JAVA_VERSION;
+//
+//  static {
+//    JAVA_VERSION = Double.parseDouble(System.getProperty("java.specification.version", "0"));
+//
+//    try {
+////      Unsafe unsafe = AccessController.doPrivileged(new PrivilegedExceptionAction<Unsafe>() {
+////        @Override
+////        public Unsafe run() throws Exception {
+////          final Field f = Unsafe.class.getDeclaredField("theUnsafe");
+////          f.setAccessible(true);
+////
+////          return (Unsafe) f.get(null);
+////        }
+////      });
+//
+////      GET_CONSTANT_POOL = Class.class.getDeclaredMethod("getConstantPool");
+////      String constantPoolName = JAVA_VERSION < 9 ? "sun.reflect.ConstantPool" : "jdk.internal.reflect.ConstantPool";
+////      Class<?> constantPoolClass = Class.forName(constantPoolName);
+////      GET_CONSTANT_POOL_SIZE = constantPoolClass.getDeclaredMethod("getSize");
+////      GET_CONSTANT_POOL_METHOD_AT = constantPoolClass.getDeclaredMethod("getMethodAt", int.class);
+//
+//      // setting the methods as accessible
+////      Field overrideField = AccessibleObject.class.getDeclaredField("override");
+////      long overrideFieldOffset = unsafe.objectFieldOffset(overrideField);
+////      unsafe.putBoolean(GET_CONSTANT_POOL, overrideFieldOffset, true);
+////      unsafe.putBoolean(GET_CONSTANT_POOL_SIZE, overrideFieldOffset, true);
+////      unsafe.putBoolean(GET_CONSTANT_POOL_METHOD_AT, overrideFieldOffset, true);
+//
+//      // additional checks - make sure we get a result when invoking the Class::getConstantPool and
+//      // ConstantPool::getSize on a class
+////      Object constantPool = GET_CONSTANT_POOL.invoke(Object.class);
+////      GET_CONSTANT_POOL_SIZE.invoke(constantPool);
+//
+////      for (Method method : Object.class.getDeclaredMethods())
+////        OBJECT_METHODS.put(method.getName(), method);
+//
+////      RESOLVES_LAMBDAS = true;
+//    } catch (Exception ignore) {
+//    }
+//
+////    Map<Class<?>, Class<?>> types = new HashMap<Class<?>, Class<?>>();
+////    types.put(boolean.class, Boolean.class);
+////    types.put(byte.class, Byte.class);
+////    types.put(char.class, Character.class);
+////    types.put(double.class, Double.class);
+////    types.put(float.class, Float.class);
+////    types.put(int.class, Integer.class);
+////    types.put(long.class, Long.class);
+////    types.put(short.class, Short.class);
+////    types.put(void.class, Void.class);
+////    PRIMITIVE_WRAPPERS = Collections.unmodifiableMap(types);
+//  }
+
+  /** An unknown type. */
+  public static final class Unknown {
+    private Unknown() {
+    }
+  }
+
+  private TypeResolver() {
+  }
+
+//  /**
+//   * Enables the internal caching of resolved TypeVariables.
+//   */
+//  public static void enableCache() {
+//    CACHE_ENABLED = true;
+//  }
+//
+//  /**
+//   * Disables the internal caching of resolved TypeVariables.
+//   */
+//  public static void disableCache() {
+//    TYPE_VARIABLE_CACHE.clear();
+//    CACHE_ENABLED = false;
+//  }
+
+  /**
+   * Returns the raw class representing the argument for the {@code type} using type variable information from the
+   * {@code subType}. If no arguments can be resolved then {@code Unknown.class} is returned.
+   *
+   * @param type to resolve argument for
+   * @param subType to extract type variable information from
+   * @return argument for {@code type} else {@link Unknown}.class if no type arguments are declared
+   * @throws IllegalArgumentException if more or less than one argument is resolved for the {@code type}
+   */
+  public static <T, S extends T> Class<?> resolveRawArgument(Class<T> type, Class<S> subType) {
+    return resolveRawArgument(resolveGenericType(type, subType), subType);
+  }
+
+  /**
+   * Returns the raw class representing the argument for the {@code genericType} using type variable information from
+   * the {@code subType}. If {@code genericType} is an instance of class, then {@code genericType} is returned. If no
+   * arguments can be resolved then {@code Unknown.class} is returned.
+   *
+   * @param genericType to resolve argument for
+   * @param subType to extract type variable information from
+   * @return argument for {@code genericType} else {@link Unknown}.class if no type arguments are declared
+   * @throws IllegalArgumentException if more or less than one argument is resolved for the {@code genericType}
+   */
+  public static Class<?> resolveRawArgument(Type genericType, Class<?> subType) {
+    Class<?>[] arguments = resolveRawArguments(genericType, subType);
+    if (arguments == null)
+      return Unknown.class;
+
+    if (arguments.length != 1)
+      throw new IllegalArgumentException(
+        "Expected 1 argument for generic type " + genericType + " but found " + arguments.length);
+
+    return arguments[0];
+  }
+
+  /**
+   * Returns an array of raw classes representing arguments for the {@code type} using type variable information from
+   * the {@code subType}. Arguments for {@code type} that cannot be resolved are returned as {@code Unknown.class}. If
+   * no arguments can be resolved then {@code null} is returned.
+   *
+   * @param type to resolve arguments for
+   * @param subType to extract type variable information from
+   * @return array of raw classes representing arguments for the {@code type} else {@code null} if no type arguments are
+   *         declared
+   */
+  public static Class<?>[] resolveRawArgs(Class<?> type, Class<?> subType) {
+    return resolveRawArguments(resolveGenericType(type, subType), subType);
+  }
+
+  /**
+   * Returns an array of raw classes representing arguments for the {@code genericType} using type variable information
+   * from the {@code subType}. Arguments for {@code genericType} that cannot be resolved are returned as
+   * {@code Unknown.class}. If no arguments can be resolved then {@code null} is returned.
+   *
+   * @param genericType to resolve arguments for
+   * @param subType to extract type variable information from
+   * @return array of raw classes representing arguments for the {@code genericType} else {@code null} if no type
+   *         arguments are declared
+   */
+  public static Class<?>[] resolveRawArguments(Type genericType, Class<?> subType) {
+    Class<?>[] result = null;
+    Class<?> functionalInterface = null;
+
+//    // Handle lambdas
+//    if (RESOLVES_LAMBDAS && subType.isSynthetic()) {
+//      Class<?> fi = genericType instanceof ParameterizedType
+//        && ((ParameterizedType) genericType).getRawType() instanceof Class
+//        ? (Class<?>) ((ParameterizedType) genericType).getRawType()
+//        : genericType instanceof Class ? (Class<?>) genericType : null;
+//      if (fi != null && fi.isInterface())
+//        functionalInterface = fi;
+//    }
+
+    if (genericType instanceof ParameterizedType) {
+      ParameterizedType paramType = (ParameterizedType) genericType;
+      Type[] arguments = paramType.getActualTypeArguments();
+      result = new Class[arguments.length];
+      for (int i = 0; i < arguments.length; i++)
+        result[i] = resolveRawClass(arguments[i], subType, functionalInterface);
+    } else if (genericType instanceof TypeVariable) {
+      result = new Class[1];
+      result[0] = resolveRawClass(genericType, subType, functionalInterface);
+    } else if (genericType instanceof Class) {
+      TypeVariable<?>[] typeParams = ((Class<?>) genericType).getTypeParameters();
+      result = new Class[typeParams.length];
+      for (int i = 0; i < typeParams.length; i++)
+        result[i] = resolveRawClass(typeParams[i], subType, functionalInterface);
+    }
+
+    return result;
+  }
+
+  /**
+   * Returns the generic {@code type} using type variable information from the {@code subType} else {@code null} if the
+   * generic type cannot be resolved.
+   *
+   * @param type to resolve generic type for
+   * @param subType to extract type variable information from
+   * @return generic {@code type} else {@code null} if it cannot be resolved
+   */
+  public static Type resolveGenericType(Class<?> type, Type subType) {
+    Class<?> rawType;
+    if (subType instanceof ParameterizedType)
+      rawType = (Class<?>) ((ParameterizedType) subType).getRawType();
+    else
+      rawType = (Class<?>) subType;
+
+    if (type.equals(rawType))
+      return subType;
+
+    Type result;
+    if (type.isInterface()) {
+      for (Type superInterface : rawType.getGenericInterfaces())
+        if (superInterface != null && !superInterface.equals(Object.class))
+          if ((result = resolveGenericType(type, superInterface)) != null)
+            return result;
+    }
+
+    Type superClass = rawType.getGenericSuperclass();
+    if (superClass != null && !superClass.equals(Object.class))
+      if ((result = resolveGenericType(type, superClass)) != null)
+        return result;
+
+    return null;
+  }
+
+  /**
+   * Resolves the raw class for the {@code genericType}, using the type variable information from the {@code subType}
+   * else {@link Unknown} if the raw class cannot be resolved.
+   *
+   * @param genericType to resolve raw class for
+   * @param subType to extract type variable information from
+   * @return raw class for the {@code genericType} else {@link Unknown} if it cannot be resolved
+   */
+  public static Class<?> resolveRawClass(Type genericType, Class<?> subType) {
+    return resolveRawClass(genericType, subType, null);
+  }
+
+  private static Class<?> resolveRawClass(Type genericType, Class<?> subType, Class<?> functionalInterface) {
+    if (genericType instanceof Class) {
+      return (Class<?>) genericType;
+    } else if (genericType instanceof ParameterizedType) {
+      return resolveRawClass(((ParameterizedType) genericType).getRawType(), subType, functionalInterface);
+    } else if (genericType instanceof GenericArrayType) {
+      GenericArrayType arrayType = (GenericArrayType) genericType;
+      Class<?> component = resolveRawClass(arrayType.getGenericComponentType(), subType, functionalInterface);
+      return Array.newInstance(component, 0).getClass();
+    } else if (genericType instanceof TypeVariable) {
+      TypeVariable<?> variable = (TypeVariable<?>) genericType;
+      genericType = getTypeVariableMap(subType, functionalInterface).get(variable);
+      genericType = genericType == null ? resolveBound(variable)
+        : resolveRawClass(genericType, subType, functionalInterface);
+    }
+
+    return genericType instanceof Class ? (Class<?>) genericType : Unknown.class;
+  }
+
+  private static Map<TypeVariable<?>, Type> getTypeVariableMap(final Class<?> targetType, Class<?> functionalInterface) {
+
+    //Reference<Map<TypeVariable<?>, Type>> ref = TYPE_VARIABLE_CACHE.get(targetType);
+    Map<TypeVariable<?>, Type> map = null;//ref != null ? ref.get() : null;
+
+    if (map == null) {
+      map = new HashMap<TypeVariable<?>, Type>();
+
+//      // Populate lambdas
+//      if (functionalInterface != null)
+//        populateLambdaArgs(functionalInterface, targetType, map);
+
+      // Populate interfaces
+      populateSuperTypeArgs(targetType.getGenericInterfaces(), map, functionalInterface != null);
+
+      // Populate super classes and interfaces
+      Type genericType = targetType.getGenericSuperclass();
+      Class<?> type = targetType.getSuperclass();
+      while (type != null && !Object.class.equals(type)) {
+        if (genericType instanceof ParameterizedType)
+          populateTypeArgs((ParameterizedType) genericType, map, false);
+        populateSuperTypeArgs(type.getGenericInterfaces(), map, false);
+
+        genericType = type.getGenericSuperclass();
+        type = type.getSuperclass();
+      }
+
+      // Populate enclosing classes
+      type = targetType;
+      while (type.isMemberClass()) {
+        genericType = type.getGenericSuperclass();
+        if (genericType instanceof ParameterizedType)
+          populateTypeArgs((ParameterizedType) genericType, map, functionalInterface != null);
+
+        type = type.getEnclosingClass();
+      }
+
+//      if (CACHE_ENABLED)
+//        TYPE_VARIABLE_CACHE.put(targetType, new WeakReference<Map<TypeVariable<?>, Type>>(map));
+    }
+
+    return map;
+  }
+
+  /**
+   * Populates the {@code map} with with variable/argument pairs for the given {@code types}.
+   */
+  private static void populateSuperTypeArgs(final Type[] types, final Map<TypeVariable<?>, Type> map,
+                                            boolean depthFirst) {
+    for (Type type : types) {
+      if (type instanceof ParameterizedType) {
+        ParameterizedType parameterizedType = (ParameterizedType) type;
+        if (!depthFirst)
+          populateTypeArgs(parameterizedType, map, depthFirst);
+        Type rawType = parameterizedType.getRawType();
+        if (rawType instanceof Class)
+          populateSuperTypeArgs(((Class<?>) rawType).getGenericInterfaces(), map, depthFirst);
+        if (depthFirst)
+          populateTypeArgs(parameterizedType, map, depthFirst);
+      } else if (type instanceof Class) {
+        populateSuperTypeArgs(((Class<?>) type).getGenericInterfaces(), map, depthFirst);
+      }
+    }
+  }
+
+  /**
+   * Populates the {@code map} with variable/argument pairs for the given {@code type}.
+   */
+  private static void populateTypeArgs(ParameterizedType type, Map<TypeVariable<?>, Type> map, boolean depthFirst) {
+    if (type.getRawType() instanceof Class) {
+      TypeVariable<?>[] typeVariables = ((Class<?>) type.getRawType()).getTypeParameters();
+      Type[] typeArguments = type.getActualTypeArguments();
+
+      if (type.getOwnerType() != null) {
+        Type owner = type.getOwnerType();
+        if (owner instanceof ParameterizedType)
+          populateTypeArgs((ParameterizedType) owner, map, depthFirst);
+      }
+
+      for (int i = 0; i < typeArguments.length; i++) {
+        TypeVariable<?> variable = typeVariables[i];
+        Type typeArgument = typeArguments[i];
+
+        if (typeArgument instanceof Class) {
+          map.put(variable, typeArgument);
+        } else if (typeArgument instanceof GenericArrayType) {
+          map.put(variable, typeArgument);
+        } else if (typeArgument instanceof ParameterizedType) {
+          map.put(variable, typeArgument);
+        } else if (typeArgument instanceof TypeVariable) {
+          TypeVariable<?> typeVariableArgument = (TypeVariable<?>) typeArgument;
+          if (depthFirst) {
+            Type existingType = map.get(variable);
+            if (existingType != null) {
+              map.put(typeVariableArgument, existingType);
+              continue;
+            }
+          }
+
+          Type resolvedType = map.get(typeVariableArgument);
+          if (resolvedType == null)
+            resolvedType = resolveBound(typeVariableArgument);
+          map.put(variable, resolvedType);
+        }
+      }
+    }
+  }
+
+  /**
+   * Resolves the first bound for the {@code typeVariable}, returning {@code Unknown.class} if none can be resolved.
+   */
+  public static Type resolveBound(TypeVariable<?> typeVariable) {
+    Type[] bounds = typeVariable.getBounds();
+    if (bounds.length == 0)
+      return Unknown.class;
+
+    Type bound = bounds[0];
+    if (bound instanceof TypeVariable)
+      bound = resolveBound((TypeVariable<?>) bound);
+
+    return bound == Object.class ? Unknown.class : bound;
+  }
+
+//  /**
+//   * Populates the {@code map} with variable/argument pairs for the {@code functionalInterface}.
+//   */
+//  private static void populateLambdaArgs(Class<?> functionalInterface, final Class<?> lambdaType,
+//                                         Map<TypeVariable<?>, Type> map) {
+//    if (RESOLVES_LAMBDAS) {
+//      // Find SAM
+//      for (Method m : functionalInterface.getMethods()) {
+//        if (!isDefaultMethod(m) && !Modifier.isStatic(m.getModifiers()) && !m.isBridge()) {
+//          // Skip methods that override Object.class
+//          Method objectMethod = OBJECT_METHODS.get(m.getName());
+//          if (objectMethod != null && Arrays.equals(m.getTypeParameters(), objectMethod.getTypeParameters()))
+//            continue;
+//
+//          // Get functional interface's type params
+//          Type returnTypeVar = m.getGenericReturnType();
+//          Type[] paramTypeVars = m.getGenericParameterTypes();
+//
+//          Member member = getMemberRef(lambdaType);
+//          if (member == null)
+//            return;
+//
+//          // Populate return type argument
+//          if (returnTypeVar instanceof TypeVariable) {
+//            Class<?> returnType = member instanceof Method ? ((Method) member).getReturnType()
+//              : ((Constructor<?>) member).getDeclaringClass();
+//            returnType = wrapPrimitives(returnType);
+//            if (!returnType.equals(Void.class))
+//              map.put((TypeVariable<?>) returnTypeVar, returnType);
+//          }
+//
+//          Class<?>[] arguments = member instanceof Method ? ((Method) member).getParameterTypes()
+//            : ((Constructor<?>) member).getParameterTypes();
+//
+//          // Populate object type from arbitrary object method reference
+//          int paramOffset = 0;
+//          if (paramTypeVars.length > 0 && paramTypeVars[0] instanceof TypeVariable
+//            && paramTypeVars.length == arguments.length + 1) {
+//            Class<?> instanceType = member.getDeclaringClass();
+//            map.put((TypeVariable<?>) paramTypeVars[0], instanceType);
+//            paramOffset = 1;
+//          }
+//
+//          // Handle additional arguments that are captured from the lambda's enclosing scope
+//          int argOffset = 0;
+//          if (paramTypeVars.length < arguments.length) {
+//            argOffset = arguments.length - paramTypeVars.length;
+//          }
+//
+//          // Populate type arguments
+//          for (int i = 0; i + argOffset < arguments.length; i++) {
+//            if (paramTypeVars[i] instanceof TypeVariable)
+//              map.put((TypeVariable<?>) paramTypeVars[i + paramOffset], wrapPrimitives(arguments[i + argOffset]));
+//          }
+//
+//          return;
+//        }
+//      }
+//    }
+//  }
+//
+//  private static boolean isDefaultMethod(Method m) {
+//    return JAVA_VERSION >= 1.8 && m.isDefault();
+//  }
+//
+//  private static Member getMemberRef(Class<?> type) {
+//    Object constantPool;
+//    try {
+//      constantPool = GET_CONSTANT_POOL.invoke(type);
+//    } catch (Exception ignore) {
+//      return null;
+//    }
+//
+//    Member result = null;
+//    for (int i = getConstantPoolSize(constantPool) - 1; i >= 0; i--) {
+//      Member member = getConstantPoolMethodAt(constantPool, i);
+//      // Skip SerializedLambda constructors and members of the "type" class
+//      if (member == null
+//        || (member instanceof Constructor
+//        && member.getDeclaringClass().getName().equals("java.lang.invoke.SerializedLambda"))
+//        || member.getDeclaringClass().isAssignableFrom(type))
+//        continue;
+//
+//      result = member;
+//
+//      // Return if not valueOf method
+//      if (!(member instanceof Method) || !isAutoBoxingMethod((Method) member))
+//        break;
+//    }
+//
+//    return result;
+//  }
+//
+//  private static boolean isAutoBoxingMethod(Method method) {
+//    Class<?>[] parameters = method.getParameterTypes();
+//    return method.getName().equals("valueOf") && parameters.length == 1 && parameters[0].isPrimitive()
+//      && wrapPrimitives(parameters[0]).equals(method.getDeclaringClass());
+//  }
+//
+//  private static Class<?> wrapPrimitives(Class<?> clazz) {
+//    return clazz.isPrimitive() ? PRIMITIVE_WRAPPERS.get(clazz) : clazz;
+//  }
+//
+//  private static int getConstantPoolSize(Object constantPool) {
+//    try {
+//      return (Integer) GET_CONSTANT_POOL_SIZE.invoke(constantPool);
+//    } catch (Exception ignore) {
+//      return 0;
+//    }
+//  }
+//
+//  private static Member getConstantPoolMethodAt(Object constantPool, int i) {
+//    try {
+//      return (Member) GET_CONSTANT_POOL_METHOD_AT.invoke(constantPool, i);
+//    } catch (Exception ignore) {
+//      return null;
+//    }
+//  }
+}

From 1829c746948e4ed54a745beadb1a19ab009824bd Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 16 Feb 2018 12:25:07 +1300
Subject: [PATCH 0031/1036] #997 - TypeReflectHelper does not resolve type
 variables correctly in non-trivial cases

Initial failing test ... and TypeResolver prior to cleanup
---
 .../server/type/TypeReflectHelperTest.java    | 105 ++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java

diff --git a/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java b/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java
new file mode 100644
index 000000000..2197ce6d2
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java
@@ -0,0 +1,105 @@
+package io.ebeaninternal.server.type;
+
+import io.ebean.config.ScalarTypeConverter;
+import org.junit.Test;
+import org.tests.model.ivo.Money;
+import org.tests.model.ivo.Oid;
+import org.tests.model.ivo.SysTime;
+import org.tests.model.ivo.converter.MoneyTypeConverter;
+import org.tests.model.ivo.converter.OidTypeConverter;
+import org.tests.model.ivo.converter.SysTimeConverter;
+
+import javax.persistence.AttributeConverter;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TypeReflectHelperTest {
+
+  @Test
+  public void getParams_MoneyTypeConverter() {
+
+    Class<?>[] params0 = TypeResolver.resolveRawArgs(AttributeConverter.class, MoneyTypeConverter.class);
+
+    Class<?>[] params = TypeReflectHelper.getParams(MoneyTypeConverter.class, AttributeConverter.class);
+
+    assertThat(params.length).isEqualTo(2);
+    assertThat(params[0]).isEqualTo(Money.class);
+    assertThat(params[1]).isEqualTo(BigDecimal.class);
+
+    assertThat(params0[0]).isEqualTo(Money.class);
+    assertThat(params0[1]).isEqualTo(BigDecimal.class);
+  }
+
+  @Test
+  public void getParams_OidTypeConverter() {
+
+    Class<?>[] params0 = TypeResolver.resolveRawArgs(ScalarTypeConverter.class, OidTypeConverter.class);
+
+    Class<?>[] params = TypeReflectHelper.getParams(OidTypeConverter.class, ScalarTypeConverter.class);
+
+    assertThat(params.length).isEqualTo(2);
+    assertThat(params[0]).isEqualTo(Oid.class);
+    assertThat(params[1]).isEqualTo(Long.class);
+
+    assertThat(params0[0]).isEqualTo(Oid.class);
+    assertThat(params0[1]).isEqualTo(Long.class);
+  }
+
+  @Test
+  public void getParams_SysTimeConverter() {
+
+    Class<?>[] params0 = TypeResolver.resolveRawArgs(ScalarTypeConverter.class, SysTimeConverter.class);
+
+    Class<?>[] params = TypeReflectHelper.getParams(SysTimeConverter.class, ScalarTypeConverter.class);
+
+    assertThat(params.length).isEqualTo(2);
+    assertThat(params[0]).isEqualTo(SysTime.class);
+    assertThat(params[1]).isEqualTo(Timestamp.class);
+
+    assertThat(params0[0]).isEqualTo(SysTime.class);
+    assertThat(params0[1]).isEqualTo(Timestamp.class);
+  }
+
+  @Test
+  public void getParams_RichTextConverter() {
+
+    Class<?>[] params0 = TypeResolver.resolveRawArgs(ScalarTypeConverter.class, RichTextConverter.class);
+    assertThat(params0.length).isEqualTo(2);
+    assertThat(params0[0]).isEqualTo(RichText.class);
+    assertThat(params0[1]).isEqualTo(byte[].class);
+
+    // failing test here with NPE
+    Class<?>[] params = TypeReflectHelper.getParams(RichTextConverter.class, ScalarTypeConverter.class);
+
+    assertThat(params.length).isEqualTo(2);
+    assertThat(params[0]).isEqualTo(RichText.class);
+    assertThat(params[1]).isEqualTo(byte[].class);
+  }
+
+  static class RichText {
+
+  }
+
+  static class RichTextConverter extends Direct<RichText> {}
+
+  static class Direct<M>  implements ScalarTypeConverter<M, byte[]> {
+
+    @Override
+    public M getNullValue() {
+      return null;
+    }
+
+    @Override
+    public M wrapValue(byte[] scalarType) {
+      return null;
+    }
+
+    @Override
+    public byte[] unwrapValue(M beanType) {
+      return new byte[0];
+    }
+  }
+
+}

From ac36172cc61e38b1f982135cc2ab72965d7da0f5 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 16 Feb 2018 12:47:10 +1300
Subject: [PATCH 0032/1036] #997 - TypeReflectHelper does not resolve type
 variables correctly in non-trivial cases

Part 2 - Fix the failing test, swap in use of TypeResolver and remove all the unused features.
---
 .../server/type/TypeReflectHelper.java        |  24 +-
 .../server/type/TypeResolver.java             | 421 +++---------------
 .../server/type/TypeReflectHelperTest.java    |  21 -
 3 files changed, 75 insertions(+), 391 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java b/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java
index 95cc0529f..a69dcd75d 100644
--- a/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java
+++ b/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java
@@ -6,13 +6,7 @@ import java.lang.reflect.Type;
 public class TypeReflectHelper {
 
   public static Class<?>[] getParams(Class<?> cls, Class<?> matchRawType) {
-
-    Type[] types = getParamType(cls, matchRawType);
-    Class<?>[] result = new Class<?>[types.length];
-    for (int i = 0; i < result.length; i++) {
-      result[i] = getClass(types[i]);
-    }
-    return result;
+    return TypeResolver.resolveRawArgs(matchRawType, cls);
   }
 
   public static Class<?> getClass(Type type) {
@@ -26,20 +20,4 @@ public class TypeReflectHelper {
       return (Class<?>) type;
     }
   }
-
-  private static Type[] getParamType(Class<?> cls, Class<?> matchRawType) {
-
-    Type[] gis = cls.getGenericInterfaces();
-    for (Type type : gis) {
-      if (type instanceof ParameterizedType) {
-        ParameterizedType paramType = (ParameterizedType) type;
-        Type rawType = paramType.getRawType();
-        if (rawType.equals(matchRawType)) {
-
-          return paramType.getActualTypeArguments();
-        }
-      }
-    }
-    return null;
-  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/type/TypeResolver.java b/src/main/java/io/ebeaninternal/server/type/TypeResolver.java
index 46b91a00a..2fecd6a4b 100644
--- a/src/main/java/io/ebeaninternal/server/type/TypeResolver.java
+++ b/src/main/java/io/ebeaninternal/server/type/TypeResolver.java
@@ -1,10 +1,6 @@
 package io.ebeaninternal.server.type;
 
 
-//import java.lang.ref.Reference;
-//import java.lang.ref.WeakReference;
-//import java.lang.reflect.AccessibleObject;
-
 import java.lang.reflect.Array;
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.ParameterizedType;
@@ -13,87 +9,16 @@ import java.lang.reflect.TypeVariable;
 import java.util.HashMap;
 import java.util.Map;
 
-//import java.lang.reflect.Constructor;
-//import java.lang.reflect.Field;
-//import java.lang.reflect.Member;
-//import java.lang.reflect.Method;
-//import java.lang.reflect.Modifier;
-//import java.security.AccessController;
-//import java.security.PrivilegedExceptionAction;
-//import java.util.Arrays;
-//import java.util.Collections;
-//import java.util.WeakHashMap;
-
-//import sun.misc.Unsafe;
-
-public class TypeResolver {
-
-  /** Cache of type variable/argument pairs */
-//  private static final Map<Class<?>, Reference<Map<TypeVariable<?>, Type>>> TYPE_VARIABLE_CACHE = Collections
-//    .synchronizedMap(new WeakHashMap<Class<?>, Reference<Map<TypeVariable<?>, Type>>>());
-//  private static volatile boolean CACHE_ENABLED = true;
-//  private static boolean RESOLVES_LAMBDAS;
-//  private static Method GET_CONSTANT_POOL;
-//  private static Method GET_CONSTANT_POOL_SIZE;
-//  private static Method GET_CONSTANT_POOL_METHOD_AT;
-//  private static final Map<String, Method> OBJECT_METHODS = new HashMap<String, Method>();
-//  private static final Map<Class<?>, Class<?>> PRIMITIVE_WRAPPERS;
-//  private static final Double JAVA_VERSION;
-//
-//  static {
-//    JAVA_VERSION = Double.parseDouble(System.getProperty("java.specification.version", "0"));
-//
-//    try {
-////      Unsafe unsafe = AccessController.doPrivileged(new PrivilegedExceptionAction<Unsafe>() {
-////        @Override
-////        public Unsafe run() throws Exception {
-////          final Field f = Unsafe.class.getDeclaredField("theUnsafe");
-////          f.setAccessible(true);
-////
-////          return (Unsafe) f.get(null);
-////        }
-////      });
-//
-////      GET_CONSTANT_POOL = Class.class.getDeclaredMethod("getConstantPool");
-////      String constantPoolName = JAVA_VERSION < 9 ? "sun.reflect.ConstantPool" : "jdk.internal.reflect.ConstantPool";
-////      Class<?> constantPoolClass = Class.forName(constantPoolName);
-////      GET_CONSTANT_POOL_SIZE = constantPoolClass.getDeclaredMethod("getSize");
-////      GET_CONSTANT_POOL_METHOD_AT = constantPoolClass.getDeclaredMethod("getMethodAt", int.class);
-//
-//      // setting the methods as accessible
-////      Field overrideField = AccessibleObject.class.getDeclaredField("override");
-////      long overrideFieldOffset = unsafe.objectFieldOffset(overrideField);
-////      unsafe.putBoolean(GET_CONSTANT_POOL, overrideFieldOffset, true);
-////      unsafe.putBoolean(GET_CONSTANT_POOL_SIZE, overrideFieldOffset, true);
-////      unsafe.putBoolean(GET_CONSTANT_POOL_METHOD_AT, overrideFieldOffset, true);
-//
-//      // additional checks - make sure we get a result when invoking the Class::getConstantPool and
-//      // ConstantPool::getSize on a class
-////      Object constantPool = GET_CONSTANT_POOL.invoke(Object.class);
-////      GET_CONSTANT_POOL_SIZE.invoke(constantPool);
-//
-////      for (Method method : Object.class.getDeclaredMethods())
-////        OBJECT_METHODS.put(method.getName(), method);
-//
-////      RESOLVES_LAMBDAS = true;
-//    } catch (Exception ignore) {
-//    }
-//
-////    Map<Class<?>, Class<?>> types = new HashMap<Class<?>, Class<?>>();
-////    types.put(boolean.class, Boolean.class);
-////    types.put(byte.class, Byte.class);
-////    types.put(char.class, Character.class);
-////    types.put(double.class, Double.class);
-////    types.put(float.class, Float.class);
-////    types.put(int.class, Integer.class);
-////    types.put(long.class, Long.class);
-////    types.put(short.class, Short.class);
-////    types.put(void.class, Void.class);
-////    PRIMITIVE_WRAPPERS = Collections.unmodifiableMap(types);
-//  }
+/**
+ * This class is a modified version of TypeResolver from https://github.com/jhalterman/typetools
+ * which is Apache 2 license.
+ *
+ * It is a cut down version removing the lambda support and related sun.misc.Unsafe use etc.
+ */
+class TypeResolver {
 
   /** An unknown type. */
-  public static final class Unknown {
+  private static final class Unknown {
     private Unknown() {
     }
   }
@@ -101,56 +26,6 @@ public class TypeResolver {
   private TypeResolver() {
   }
 
-//  /**
-//   * Enables the internal caching of resolved TypeVariables.
-//   */
-//  public static void enableCache() {
-//    CACHE_ENABLED = true;
-//  }
-//
-//  /**
-//   * Disables the internal caching of resolved TypeVariables.
-//   */
-//  public static void disableCache() {
-//    TYPE_VARIABLE_CACHE.clear();
-//    CACHE_ENABLED = false;
-//  }
-
-  /**
-   * Returns the raw class representing the argument for the {@code type} using type variable information from the
-   * {@code subType}. If no arguments can be resolved then {@code Unknown.class} is returned.
-   *
-   * @param type to resolve argument for
-   * @param subType to extract type variable information from
-   * @return argument for {@code type} else {@link Unknown}.class if no type arguments are declared
-   * @throws IllegalArgumentException if more or less than one argument is resolved for the {@code type}
-   */
-  public static <T, S extends T> Class<?> resolveRawArgument(Class<T> type, Class<S> subType) {
-    return resolveRawArgument(resolveGenericType(type, subType), subType);
-  }
-
-  /**
-   * Returns the raw class representing the argument for the {@code genericType} using type variable information from
-   * the {@code subType}. If {@code genericType} is an instance of class, then {@code genericType} is returned. If no
-   * arguments can be resolved then {@code Unknown.class} is returned.
-   *
-   * @param genericType to resolve argument for
-   * @param subType to extract type variable information from
-   * @return argument for {@code genericType} else {@link Unknown}.class if no type arguments are declared
-   * @throws IllegalArgumentException if more or less than one argument is resolved for the {@code genericType}
-   */
-  public static Class<?> resolveRawArgument(Type genericType, Class<?> subType) {
-    Class<?>[] arguments = resolveRawArguments(genericType, subType);
-    if (arguments == null)
-      return Unknown.class;
-
-    if (arguments.length != 1)
-      throw new IllegalArgumentException(
-        "Expected 1 argument for generic type " + genericType + " but found " + arguments.length);
-
-    return arguments[0];
-  }
-
   /**
    * Returns an array of raw classes representing arguments for the {@code type} using type variable information from
    * the {@code subType}. Arguments for {@code type} that cannot be resolved are returned as {@code Unknown.class}. If
@@ -161,7 +36,7 @@ public class TypeResolver {
    * @return array of raw classes representing arguments for the {@code type} else {@code null} if no type arguments are
    *         declared
    */
-  public static Class<?>[] resolveRawArgs(Class<?> type, Class<?> subType) {
+  static Class<?>[] resolveRawArgs(Class<?> type, Class<?> subType) {
     return resolveRawArguments(resolveGenericType(type, subType), subType);
   }
 
@@ -175,34 +50,27 @@ public class TypeResolver {
    * @return array of raw classes representing arguments for the {@code genericType} else {@code null} if no type
    *         arguments are declared
    */
-  public static Class<?>[] resolveRawArguments(Type genericType, Class<?> subType) {
+  private static Class<?>[] resolveRawArguments(Type genericType, Class<?> subType) {
     Class<?>[] result = null;
-    Class<?> functionalInterface = null;
-
-//    // Handle lambdas
-//    if (RESOLVES_LAMBDAS && subType.isSynthetic()) {
-//      Class<?> fi = genericType instanceof ParameterizedType
-//        && ((ParameterizedType) genericType).getRawType() instanceof Class
-//        ? (Class<?>) ((ParameterizedType) genericType).getRawType()
-//        : genericType instanceof Class ? (Class<?>) genericType : null;
-//      if (fi != null && fi.isInterface())
-//        functionalInterface = fi;
-//    }
 
     if (genericType instanceof ParameterizedType) {
       ParameterizedType paramType = (ParameterizedType) genericType;
       Type[] arguments = paramType.getActualTypeArguments();
       result = new Class[arguments.length];
-      for (int i = 0; i < arguments.length; i++)
-        result[i] = resolveRawClass(arguments[i], subType, functionalInterface);
+      for (int i = 0; i < arguments.length; i++) {
+        result[i] = resolveRawClass(arguments[i], subType);
+      }
+
     } else if (genericType instanceof TypeVariable) {
       result = new Class[1];
-      result[0] = resolveRawClass(genericType, subType, functionalInterface);
+      result[0] = resolveRawClass(genericType, subType);
+
     } else if (genericType instanceof Class) {
       TypeVariable<?>[] typeParams = ((Class<?>) genericType).getTypeParameters();
       result = new Class[typeParams.length];
-      for (int i = 0; i < typeParams.length; i++)
-        result[i] = resolveRawClass(typeParams[i], subType, functionalInterface);
+      for (int i = 0; i < typeParams.length; i++) {
+        result[i] = resolveRawClass(typeParams[i], subType);
+      }
     }
 
     return result;
@@ -216,15 +84,17 @@ public class TypeResolver {
    * @param subType to extract type variable information from
    * @return generic {@code type} else {@code null} if it cannot be resolved
    */
-  public static Type resolveGenericType(Class<?> type, Type subType) {
+  private static Type resolveGenericType(Class<?> type, Type subType) {
     Class<?> rawType;
-    if (subType instanceof ParameterizedType)
+    if (subType instanceof ParameterizedType) {
       rawType = (Class<?>) ((ParameterizedType) subType).getRawType();
-    else
+    } else {
       rawType = (Class<?>) subType;
+    }
 
-    if (type.equals(rawType))
+    if (type.equals(rawType)) {
       return subType;
+    }
 
     Type result;
     if (type.isInterface()) {
@@ -235,83 +105,65 @@ public class TypeResolver {
     }
 
     Type superClass = rawType.getGenericSuperclass();
-    if (superClass != null && !superClass.equals(Object.class))
-      if ((result = resolveGenericType(type, superClass)) != null)
+    if (superClass != null && !superClass.equals(Object.class)) {
+      if ((result = resolveGenericType(type, superClass)) != null) {
         return result;
+      }
+    }
 
     return null;
   }
 
-  /**
-   * Resolves the raw class for the {@code genericType}, using the type variable information from the {@code subType}
-   * else {@link Unknown} if the raw class cannot be resolved.
-   *
-   * @param genericType to resolve raw class for
-   * @param subType to extract type variable information from
-   * @return raw class for the {@code genericType} else {@link Unknown} if it cannot be resolved
-   */
-  public static Class<?> resolveRawClass(Type genericType, Class<?> subType) {
-    return resolveRawClass(genericType, subType, null);
-  }
-
-  private static Class<?> resolveRawClass(Type genericType, Class<?> subType, Class<?> functionalInterface) {
+  private static Class<?> resolveRawClass(Type genericType, Class<?> subType) {
     if (genericType instanceof Class) {
       return (Class<?>) genericType;
+
     } else if (genericType instanceof ParameterizedType) {
-      return resolveRawClass(((ParameterizedType) genericType).getRawType(), subType, functionalInterface);
+      return resolveRawClass(((ParameterizedType) genericType).getRawType(), subType);
+
     } else if (genericType instanceof GenericArrayType) {
       GenericArrayType arrayType = (GenericArrayType) genericType;
-      Class<?> component = resolveRawClass(arrayType.getGenericComponentType(), subType, functionalInterface);
+      Class<?> component = resolveRawClass(arrayType.getGenericComponentType(), subType);
       return Array.newInstance(component, 0).getClass();
+
     } else if (genericType instanceof TypeVariable) {
       TypeVariable<?> variable = (TypeVariable<?>) genericType;
-      genericType = getTypeVariableMap(subType, functionalInterface).get(variable);
+      genericType = getTypeVariableMap(subType).get(variable);
       genericType = genericType == null ? resolveBound(variable)
-        : resolveRawClass(genericType, subType, functionalInterface);
+        : resolveRawClass(genericType, subType);
     }
 
     return genericType instanceof Class ? (Class<?>) genericType : Unknown.class;
   }
 
-  private static Map<TypeVariable<?>, Type> getTypeVariableMap(final Class<?> targetType, Class<?> functionalInterface) {
+  private static Map<TypeVariable<?>, Type> getTypeVariableMap(final Class<?> targetType) {
 
-    //Reference<Map<TypeVariable<?>, Type>> ref = TYPE_VARIABLE_CACHE.get(targetType);
-    Map<TypeVariable<?>, Type> map = null;//ref != null ? ref.get() : null;
+    Map<TypeVariable<?>, Type> map = new HashMap<>();
 
-    if (map == null) {
-      map = new HashMap<TypeVariable<?>, Type>();
+    // Populate interfaces
+    populateSuperTypeArgs(targetType.getGenericInterfaces(), map);
 
-//      // Populate lambdas
-//      if (functionalInterface != null)
-//        populateLambdaArgs(functionalInterface, targetType, map);
-
-      // Populate interfaces
-      populateSuperTypeArgs(targetType.getGenericInterfaces(), map, functionalInterface != null);
-
-      // Populate super classes and interfaces
-      Type genericType = targetType.getGenericSuperclass();
-      Class<?> type = targetType.getSuperclass();
-      while (type != null && !Object.class.equals(type)) {
-        if (genericType instanceof ParameterizedType)
-          populateTypeArgs((ParameterizedType) genericType, map, false);
-        populateSuperTypeArgs(type.getGenericInterfaces(), map, false);
-
-        genericType = type.getGenericSuperclass();
-        type = type.getSuperclass();
+    // Populate super classes and interfaces
+    Type genericType = targetType.getGenericSuperclass();
+    Class<?> type = targetType.getSuperclass();
+    while (type != null && !Object.class.equals(type)) {
+      if (genericType instanceof ParameterizedType) {
+        populateTypeArgs((ParameterizedType) genericType, map);
       }
+      populateSuperTypeArgs(type.getGenericInterfaces(), map);
 
-      // Populate enclosing classes
-      type = targetType;
-      while (type.isMemberClass()) {
-        genericType = type.getGenericSuperclass();
-        if (genericType instanceof ParameterizedType)
-          populateTypeArgs((ParameterizedType) genericType, map, functionalInterface != null);
+      genericType = type.getGenericSuperclass();
+      type = type.getSuperclass();
+    }
 
-        type = type.getEnclosingClass();
+    // Populate enclosing classes
+    type = targetType;
+    while (type.isMemberClass()) {
+      genericType = type.getGenericSuperclass();
+      if (genericType instanceof ParameterizedType) {
+        populateTypeArgs((ParameterizedType) genericType, map);
       }
-
-//      if (CACHE_ENABLED)
-//        TYPE_VARIABLE_CACHE.put(targetType, new WeakReference<Map<TypeVariable<?>, Type>>(map));
+      type = type.getEnclosingClass();
     }
 
     return map;
@@ -320,20 +172,18 @@ public class TypeResolver {
   /**
    * Populates the {@code map} with with variable/argument pairs for the given {@code types}.
    */
-  private static void populateSuperTypeArgs(final Type[] types, final Map<TypeVariable<?>, Type> map,
-                                            boolean depthFirst) {
+  private static void populateSuperTypeArgs(final Type[] types, final Map<TypeVariable<?>, Type> map) {
+
     for (Type type : types) {
       if (type instanceof ParameterizedType) {
         ParameterizedType parameterizedType = (ParameterizedType) type;
-        if (!depthFirst)
-          populateTypeArgs(parameterizedType, map, depthFirst);
+        populateTypeArgs(parameterizedType, map);
         Type rawType = parameterizedType.getRawType();
-        if (rawType instanceof Class)
-          populateSuperTypeArgs(((Class<?>) rawType).getGenericInterfaces(), map, depthFirst);
-        if (depthFirst)
-          populateTypeArgs(parameterizedType, map, depthFirst);
+        if (rawType instanceof Class) {
+          populateSuperTypeArgs(((Class<?>) rawType).getGenericInterfaces(), map);
+        }
       } else if (type instanceof Class) {
-        populateSuperTypeArgs(((Class<?>) type).getGenericInterfaces(), map, depthFirst);
+        populateSuperTypeArgs(((Class<?>) type).getGenericInterfaces(), map);
       }
     }
   }
@@ -341,15 +191,16 @@ public class TypeResolver {
   /**
    * Populates the {@code map} with variable/argument pairs for the given {@code type}.
    */
-  private static void populateTypeArgs(ParameterizedType type, Map<TypeVariable<?>, Type> map, boolean depthFirst) {
+  private static void populateTypeArgs(ParameterizedType type, Map<TypeVariable<?>, Type> map) {
     if (type.getRawType() instanceof Class) {
       TypeVariable<?>[] typeVariables = ((Class<?>) type.getRawType()).getTypeParameters();
       Type[] typeArguments = type.getActualTypeArguments();
 
       if (type.getOwnerType() != null) {
         Type owner = type.getOwnerType();
-        if (owner instanceof ParameterizedType)
-          populateTypeArgs((ParameterizedType) owner, map, depthFirst);
+        if (owner instanceof ParameterizedType) {
+          populateTypeArgs((ParameterizedType) owner, map);
+        }
       }
 
       for (int i = 0; i < typeArguments.length; i++) {
@@ -364,14 +215,6 @@ public class TypeResolver {
           map.put(variable, typeArgument);
         } else if (typeArgument instanceof TypeVariable) {
           TypeVariable<?> typeVariableArgument = (TypeVariable<?>) typeArgument;
-          if (depthFirst) {
-            Type existingType = map.get(variable);
-            if (existingType != null) {
-              map.put(typeVariableArgument, existingType);
-              continue;
-            }
-          }
-
           Type resolvedType = map.get(typeVariableArgument);
           if (resolvedType == null)
             resolvedType = resolveBound(typeVariableArgument);
@@ -384,134 +227,18 @@ public class TypeResolver {
   /**
    * Resolves the first bound for the {@code typeVariable}, returning {@code Unknown.class} if none can be resolved.
    */
-  public static Type resolveBound(TypeVariable<?> typeVariable) {
+  private static Type resolveBound(TypeVariable<?> typeVariable) {
     Type[] bounds = typeVariable.getBounds();
-    if (bounds.length == 0)
+    if (bounds.length == 0) {
       return Unknown.class;
+    }
 
     Type bound = bounds[0];
-    if (bound instanceof TypeVariable)
+    if (bound instanceof TypeVariable) {
       bound = resolveBound((TypeVariable<?>) bound);
+    }
 
     return bound == Object.class ? Unknown.class : bound;
   }
 
-//  /**
-//   * Populates the {@code map} with variable/argument pairs for the {@code functionalInterface}.
-//   */
-//  private static void populateLambdaArgs(Class<?> functionalInterface, final Class<?> lambdaType,
-//                                         Map<TypeVariable<?>, Type> map) {
-//    if (RESOLVES_LAMBDAS) {
-//      // Find SAM
-//      for (Method m : functionalInterface.getMethods()) {
-//        if (!isDefaultMethod(m) && !Modifier.isStatic(m.getModifiers()) && !m.isBridge()) {
-//          // Skip methods that override Object.class
-//          Method objectMethod = OBJECT_METHODS.get(m.getName());
-//          if (objectMethod != null && Arrays.equals(m.getTypeParameters(), objectMethod.getTypeParameters()))
-//            continue;
-//
-//          // Get functional interface's type params
-//          Type returnTypeVar = m.getGenericReturnType();
-//          Type[] paramTypeVars = m.getGenericParameterTypes();
-//
-//          Member member = getMemberRef(lambdaType);
-//          if (member == null)
-//            return;
-//
-//          // Populate return type argument
-//          if (returnTypeVar instanceof TypeVariable) {
-//            Class<?> returnType = member instanceof Method ? ((Method) member).getReturnType()
-//              : ((Constructor<?>) member).getDeclaringClass();
-//            returnType = wrapPrimitives(returnType);
-//            if (!returnType.equals(Void.class))
-//              map.put((TypeVariable<?>) returnTypeVar, returnType);
-//          }
-//
-//          Class<?>[] arguments = member instanceof Method ? ((Method) member).getParameterTypes()
-//            : ((Constructor<?>) member).getParameterTypes();
-//
-//          // Populate object type from arbitrary object method reference
-//          int paramOffset = 0;
-//          if (paramTypeVars.length > 0 && paramTypeVars[0] instanceof TypeVariable
-//            && paramTypeVars.length == arguments.length + 1) {
-//            Class<?> instanceType = member.getDeclaringClass();
-//            map.put((TypeVariable<?>) paramTypeVars[0], instanceType);
-//            paramOffset = 1;
-//          }
-//
-//          // Handle additional arguments that are captured from the lambda's enclosing scope
-//          int argOffset = 0;
-//          if (paramTypeVars.length < arguments.length) {
-//            argOffset = arguments.length - paramTypeVars.length;
-//          }
-//
-//          // Populate type arguments
-//          for (int i = 0; i + argOffset < arguments.length; i++) {
-//            if (paramTypeVars[i] instanceof TypeVariable)
-//              map.put((TypeVariable<?>) paramTypeVars[i + paramOffset], wrapPrimitives(arguments[i + argOffset]));
-//          }
-//
-//          return;
-//        }
-//      }
-//    }
-//  }
-//
-//  private static boolean isDefaultMethod(Method m) {
-//    return JAVA_VERSION >= 1.8 && m.isDefault();
-//  }
-//
-//  private static Member getMemberRef(Class<?> type) {
-//    Object constantPool;
-//    try {
-//      constantPool = GET_CONSTANT_POOL.invoke(type);
-//    } catch (Exception ignore) {
-//      return null;
-//    }
-//
-//    Member result = null;
-//    for (int i = getConstantPoolSize(constantPool) - 1; i >= 0; i--) {
-//      Member member = getConstantPoolMethodAt(constantPool, i);
-//      // Skip SerializedLambda constructors and members of the "type" class
-//      if (member == null
-//        || (member instanceof Constructor
-//        && member.getDeclaringClass().getName().equals("java.lang.invoke.SerializedLambda"))
-//        || member.getDeclaringClass().isAssignableFrom(type))
-//        continue;
-//
-//      result = member;
-//
-//      // Return if not valueOf method
-//      if (!(member instanceof Method) || !isAutoBoxingMethod((Method) member))
-//        break;
-//    }
-//
-//    return result;
-//  }
-//
-//  private static boolean isAutoBoxingMethod(Method method) {
-//    Class<?>[] parameters = method.getParameterTypes();
-//    return method.getName().equals("valueOf") && parameters.length == 1 && parameters[0].isPrimitive()
-//      && wrapPrimitives(parameters[0]).equals(method.getDeclaringClass());
-//  }
-//
-//  private static Class<?> wrapPrimitives(Class<?> clazz) {
-//    return clazz.isPrimitive() ? PRIMITIVE_WRAPPERS.get(clazz) : clazz;
-//  }
-//
-//  private static int getConstantPoolSize(Object constantPool) {
-//    try {
-//      return (Integer) GET_CONSTANT_POOL_SIZE.invoke(constantPool);
-//    } catch (Exception ignore) {
-//      return 0;
-//    }
-//  }
-//
-//  private static Member getConstantPoolMethodAt(Object constantPool, int i) {
-//    try {
-//      return (Member) GET_CONSTANT_POOL_METHOD_AT.invoke(constantPool, i);
-//    } catch (Exception ignore) {
-//      return null;
-//    }
-//  }
 }
diff --git a/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java b/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java
index 2197ce6d2..fe815617d 100644
--- a/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java
@@ -20,57 +20,36 @@ public class TypeReflectHelperTest {
   @Test
   public void getParams_MoneyTypeConverter() {
 
-    Class<?>[] params0 = TypeResolver.resolveRawArgs(AttributeConverter.class, MoneyTypeConverter.class);
-
     Class<?>[] params = TypeReflectHelper.getParams(MoneyTypeConverter.class, AttributeConverter.class);
 
     assertThat(params.length).isEqualTo(2);
     assertThat(params[0]).isEqualTo(Money.class);
     assertThat(params[1]).isEqualTo(BigDecimal.class);
-
-    assertThat(params0[0]).isEqualTo(Money.class);
-    assertThat(params0[1]).isEqualTo(BigDecimal.class);
   }
 
   @Test
   public void getParams_OidTypeConverter() {
 
-    Class<?>[] params0 = TypeResolver.resolveRawArgs(ScalarTypeConverter.class, OidTypeConverter.class);
-
     Class<?>[] params = TypeReflectHelper.getParams(OidTypeConverter.class, ScalarTypeConverter.class);
 
     assertThat(params.length).isEqualTo(2);
     assertThat(params[0]).isEqualTo(Oid.class);
     assertThat(params[1]).isEqualTo(Long.class);
-
-    assertThat(params0[0]).isEqualTo(Oid.class);
-    assertThat(params0[1]).isEqualTo(Long.class);
   }
 
   @Test
   public void getParams_SysTimeConverter() {
 
-    Class<?>[] params0 = TypeResolver.resolveRawArgs(ScalarTypeConverter.class, SysTimeConverter.class);
-
     Class<?>[] params = TypeReflectHelper.getParams(SysTimeConverter.class, ScalarTypeConverter.class);
 
     assertThat(params.length).isEqualTo(2);
     assertThat(params[0]).isEqualTo(SysTime.class);
     assertThat(params[1]).isEqualTo(Timestamp.class);
-
-    assertThat(params0[0]).isEqualTo(SysTime.class);
-    assertThat(params0[1]).isEqualTo(Timestamp.class);
   }
 
   @Test
   public void getParams_RichTextConverter() {
 
-    Class<?>[] params0 = TypeResolver.resolveRawArgs(ScalarTypeConverter.class, RichTextConverter.class);
-    assertThat(params0.length).isEqualTo(2);
-    assertThat(params0[0]).isEqualTo(RichText.class);
-    assertThat(params0[1]).isEqualTo(byte[].class);
-
-    // failing test here with NPE
     Class<?>[] params = TypeReflectHelper.getParams(RichTextConverter.class, ScalarTypeConverter.class);
 
     assertThat(params.length).isEqualTo(2);

From 3d62e84d591d38349d02d37cacc0b85816f37942 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 16 Feb 2018 14:40:35 +1300
Subject: [PATCH 0033/1036] #1263 - ENH: Make Transaction API Fluid such that
 we can set multiple thing like batchSize and label in a fluid fashion

---
 src/main/java/io/ebean/Transaction.java       | 36 ++++-----
 .../ebeaninternal/api/ScopedTransaction.java  |  4 +-
 .../api/SpiTransactionProxy.java              | 52 ++++++++-----
 .../transaction/DocStoreOnlyTransaction.java  |  5 +-
 .../ImplicitReadOnlyTransaction.java          | 52 ++++++++-----
 .../server/transaction/JdbcTransaction.java   | 55 +++++++++-----
 .../server/transaction/NoTransaction.java     | 73 ++++++++++---------
 .../batchinsert/TestBatchInsertFlush.java     | 12 +--
 .../batchinsert/TestBatchInsertSimple.java    | 13 ++--
 .../tests/transaction/TestSqlServerBatch.java |  4 +-
 10 files changed, 180 insertions(+), 126 deletions(-)

diff --git a/src/main/java/io/ebean/Transaction.java b/src/main/java/io/ebean/Transaction.java
index 743fcc138..b629c24f9 100644
--- a/src/main/java/io/ebean/Transaction.java
+++ b/src/main/java/io/ebean/Transaction.java
@@ -57,7 +57,7 @@ public interface Transaction extends AutoCloseable {
   /**
    * Register a TransactionCallback with this transaction.
    */
-  void register(TransactionCallback callback);
+  Transaction register(TransactionCallback callback);
 
   /**
    * Set a label on the transaction.
@@ -65,7 +65,7 @@ public interface Transaction extends AutoCloseable {
    * This label is used to group transaction execution times for performance metrics reporting.
    * </p>
    */
-  void setLabel(String label);
+  Transaction setLabel(String label);
 
   /**
    * Return true if this transaction is read only.
@@ -75,7 +75,7 @@ public interface Transaction extends AutoCloseable {
   /**
    * Set whether this transaction should be readOnly.
    */
-  void setReadOnly(boolean readOnly);
+  Transaction setReadOnly(boolean readOnly);
 
   /**
    * Commits the transaction at this point with the expectation that another
@@ -139,7 +139,7 @@ public interface Transaction extends AutoCloseable {
   /**
    * Mark the transaction for rollback only.
    */
-  void setRollbackOnly();
+  Transaction setRollbackOnly();
 
   /**
    * Return true if the transaction is marked as rollback only.
@@ -172,7 +172,7 @@ public interface Transaction extends AutoCloseable {
    * to control how that is sent to the document store.
    * </p>
    */
-  void setDocStoreMode(DocStoreMode mode);
+  Transaction setDocStoreMode(DocStoreMode mode);
 
   /**
    * Set the batch size to use for sending messages to the document store.
@@ -184,7 +184,7 @@ public interface Transaction extends AutoCloseable {
    * Setting this overrides the default of {@link DocStoreConfig#getBulkBatchSize()}
    * </p>
    */
-  void setDocStoreBatchSize(int batchSize);
+  Transaction setDocStoreBatchSize(int batchSize);
 
   /**
    * Explicitly turn off or on the cascading nature of save() and delete(). This
@@ -199,7 +199,7 @@ public interface Transaction extends AutoCloseable {
    * that do not support getGeneratedKeys.
    * </p>
    */
-  void setPersistCascade(boolean persistCascade);
+  Transaction setPersistCascade(boolean persistCascade);
 
   /**
    * Set to true when you want all loaded properties to be included in the update
@@ -210,7 +210,7 @@ public interface Transaction extends AutoCloseable {
    * and hence better JDBC batch performance.
    * </p>
    */
-  void setUpdateAllLoadedProperties(boolean updateAllLoadedProperties);
+  Transaction setUpdateAllLoadedProperties(boolean updateAllLoadedProperties);
 
   /**
    * Set if the L2 cache should be skipped for "find by id" and "find by natural key" queries.
@@ -269,7 +269,7 @@ public interface Transaction extends AutoCloseable {
    *
    * @see ServerConfig#isSkipCacheAfterWrite()
    */
-  void setSkipCache(boolean skipCache);
+  Transaction setSkipCache(boolean skipCache);
 
   /**
    * Return true if the L2 cache should be skipped. More accurately if true then find by id
@@ -344,7 +344,7 @@ public interface Transaction extends AutoCloseable {
    *
    * }</pre>
    */
-  void setBatchMode(boolean useBatch);
+  Transaction setBatchMode(boolean useBatch);
 
   /**
    * The JDBC batch mode to use for this transaction.
@@ -356,7 +356,7 @@ public interface Transaction extends AutoCloseable {
    * @param persistBatchMode the batch mode to use for this transaction
    * @see io.ebean.config.ServerConfig#setPersistBatch(PersistBatch)
    */
-  void setBatch(PersistBatch persistBatchMode);
+  Transaction setBatch(PersistBatch persistBatchMode);
 
   /**
    * Return the batch mode at the transaction level.
@@ -377,7 +377,7 @@ public interface Transaction extends AutoCloseable {
    * @param batchOnCascadeMode the batch mode to use per save(), insert(), update() or delete()
    * @see io.ebean.config.ServerConfig#setPersistBatchOnCascade(PersistBatch)
    */
-  void setBatchOnCascade(PersistBatch batchOnCascadeMode);
+  Transaction setBatchOnCascade(PersistBatch batchOnCascadeMode);
 
   /**
    * Return the batch mode at the request level (for each save(), insert(), update() or delete()).
@@ -387,7 +387,7 @@ public interface Transaction extends AutoCloseable {
   /**
    * Specify the number of statements before a batch is flushed automatically.
    */
-  void setBatchSize(int batchSize);
+  Transaction setBatchSize(int batchSize);
 
   /**
    * Return the current batch size.
@@ -405,7 +405,7 @@ public interface Transaction extends AutoCloseable {
    * number of objects and you don't care about getting back the ids.
    * </p>
    */
-  void setBatchGetGeneratedKeys(boolean getGeneratedKeys);
+  Transaction setBatchGetGeneratedKeys(boolean getGeneratedKeys);
 
   /**
    * By default when mixing UpdateSql (or CallableSql) with Beans the batch is
@@ -422,7 +422,7 @@ public interface Transaction extends AutoCloseable {
    * have a 2 step process (delayed binding).
    * </p>
    */
-  void setBatchFlushOnMixed(boolean batchFlushOnMixed);
+  Transaction setBatchFlushOnMixed(boolean batchFlushOnMixed);
 
   /**
    * By default executing a query will automatically flush any batched
@@ -432,7 +432,7 @@ public interface Transaction extends AutoCloseable {
    * execute a query and the batch will not be automatically flushed.
    * </p>
    */
-  void setBatchFlushOnQuery(boolean batchFlushOnQuery);
+  Transaction setBatchFlushOnQuery(boolean batchFlushOnQuery);
 
   /**
    * Return true if the batch (of persisted beans or executed UpdateSql etc)
@@ -498,14 +498,14 @@ public interface Transaction extends AutoCloseable {
    * caches in synch and maintain text indexes.
    * </p>
    */
-  void addModification(String tableName, boolean inserts, boolean updates, boolean deletes);
+  Transaction addModification(String tableName, boolean inserts, boolean updates, boolean deletes);
 
   /**
    * Add an arbitrary user object to the transaction. The objects added have no
    * impact on any internals of ebean and are solely meant as a convenient
    * method push user information (although somewhat replaced by TransactionCallback).
    */
-  void putUserObject(String name, Object value);
+  Transaction putUserObject(String name, Object value);
 
   /**
    * Get an object added with {@link #putUserObject(String, Object)}.
diff --git a/src/main/java/io/ebeaninternal/api/ScopedTransaction.java b/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
index 9ecd6a3b7..17f4fae57 100644
--- a/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
+++ b/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.api;
 
+import io.ebean.Transaction;
 import io.ebeaninternal.server.transaction.TransactionScopeManager;
 import io.ebeaninternal.server.util.ArrayStack;
 
@@ -93,8 +94,9 @@ public class ScopedTransaction extends SpiTransactionProxy {
   }
 
   @Override
-  public void setRollbackOnly() {
+  public Transaction setRollbackOnly() {
     current.setRollbackOnly();
+    return this;
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java b/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
index b9907aa3a..7c7b1e317 100644
--- a/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
+++ b/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.api;
 
 import io.ebean.ProfileLocation;
+import io.ebean.Transaction;
 import io.ebean.TransactionCallback;
 import io.ebean.annotation.DocStoreMode;
 import io.ebean.annotation.PersistBatch;
@@ -31,8 +32,9 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public void setLabel(String label) {
+  public Transaction setLabel(String label) {
     transaction.setLabel(label);
+    return this;
   }
 
   @Override
@@ -101,8 +103,9 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public void setDocStoreMode(DocStoreMode mode) {
+  public Transaction setDocStoreMode(DocStoreMode mode) {
     transaction.setDocStoreMode(mode);
+    return this;
   }
 
   @Override
@@ -111,8 +114,9 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public void setDocStoreBatchSize(int batchSize) {
+  public Transaction setDocStoreBatchSize(int batchSize) {
     transaction.setDocStoreBatchSize(batchSize);
+    return this;
   }
 
   @Override
@@ -141,8 +145,9 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public void setSkipCache(boolean skipCache) {
+  public Transaction setSkipCache(boolean skipCache) {
     transaction.setSkipCache(skipCache);
+    return this;
   }
 
   @Override
@@ -196,8 +201,9 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public void register(TransactionCallback callback) {
+  public Transaction register(TransactionCallback callback) {
     transaction.register(callback);
+    return this;
   }
 
   @Override
@@ -206,8 +212,9 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public void setReadOnly(boolean readOnly) {
+  public Transaction setReadOnly(boolean readOnly) {
     transaction.setReadOnly(readOnly);
+    return this;
   }
 
   @Override
@@ -216,13 +223,15 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public void setPersistCascade(boolean persistCascade) {
+  public Transaction setPersistCascade(boolean persistCascade) {
     transaction.setPersistCascade(persistCascade);
+    return this;
   }
 
   @Override
-  public void setUpdateAllLoadedProperties(boolean updateAllLoaded) {
+  public Transaction setUpdateAllLoadedProperties(boolean updateAllLoaded) {
     transaction.setUpdateAllLoadedProperties(updateAllLoaded);
+    return this;
   }
 
   @Override
@@ -231,13 +240,15 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public void setBatchMode(boolean useBatch) {
+  public Transaction setBatchMode(boolean useBatch) {
     transaction.setBatchMode(useBatch);
+    return this;
   }
 
   @Override
-  public void setBatch(PersistBatch persistBatchMode) {
+  public Transaction setBatch(PersistBatch persistBatchMode) {
     transaction.setBatch(persistBatchMode);
+    return this;
   }
 
   @Override
@@ -246,8 +257,9 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public void setBatchOnCascade(PersistBatch batchOnCascadeMode) {
+  public Transaction setBatchOnCascade(PersistBatch batchOnCascadeMode) {
     transaction.setBatchOnCascade(batchOnCascadeMode);
+    return this;
   }
 
   @Override
@@ -256,8 +268,9 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public void setBatchSize(int batchSize) {
+  public Transaction setBatchSize(int batchSize) {
     transaction.setBatchSize(batchSize);
+    return this;
   }
 
   @Override
@@ -266,8 +279,9 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public void setBatchGetGeneratedKeys(boolean getGeneratedKeys) {
+  public Transaction setBatchGetGeneratedKeys(boolean getGeneratedKeys) {
     transaction.setBatchGetGeneratedKeys(getGeneratedKeys);
+    return this;
   }
 
   @Override
@@ -276,13 +290,15 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public void setBatchFlushOnMixed(boolean batchFlushOnMixed) {
+  public Transaction setBatchFlushOnMixed(boolean batchFlushOnMixed) {
     transaction.setBatchFlushOnMixed(batchFlushOnMixed);
+    return this;
   }
 
   @Override
-  public void setBatchFlushOnQuery(boolean batchFlushOnQuery) {
+  public Transaction setBatchFlushOnQuery(boolean batchFlushOnQuery) {
     transaction.setBatchFlushOnQuery(batchFlushOnQuery);
+    return this;
   }
 
   @Override
@@ -306,13 +322,15 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public void addModification(String tableName, boolean inserts, boolean updates, boolean deletes) {
+  public Transaction addModification(String tableName, boolean inserts, boolean updates, boolean deletes) {
     transaction.addModification(tableName, inserts, updates, deletes);
+    return this;
   }
 
   @Override
-  public void putUserObject(String name, Object value) {
+  public Transaction putUserObject(String name, Object value) {
     transaction.putUserObject(name, value);
+    return this;
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java
index 4bb23735e..dbf1ce00d 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.transaction;
 
+import io.ebean.Transaction;
+
 import java.sql.Connection;
 import java.sql.SQLException;
 
@@ -21,8 +23,9 @@ public class DocStoreOnlyTransaction extends JdbcTransaction {
   }
 
   @Override
-  public void setReadOnly(boolean readOnly) {
+  public Transaction setReadOnly(boolean readOnly) {
     // do nothing
+    return this;
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
index 0e95880cb..6f39932bc 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.transaction;
 
 import io.ebean.ProfileLocation;
+import io.ebean.Transaction;
 import io.ebean.TransactionCallback;
 import io.ebean.annotation.DocStoreMode;
 import io.ebean.annotation.PersistBatch;
@@ -85,8 +86,9 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public void setLabel(String label) {
+  public Transaction setLabel(String label) {
     // do nothing
+    return this;
   }
 
   @Override
@@ -130,7 +132,8 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public void setSkipCache(boolean skipCache) {
+  public Transaction setSkipCache(boolean skipCache) {
+    return this;
   }
 
   @Override
@@ -149,7 +152,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public void register(TransactionCallback callback) {
+  public Transaction register(TransactionCallback callback) {
     throw new IllegalStateException(notExpectedMessage);
   }
 
@@ -159,7 +162,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public void setDocStoreBatchSize(int docStoreBatchSize) {
+  public Transaction setDocStoreBatchSize(int docStoreBatchSize) {
     throw new IllegalStateException(notExpectedMessage);
   }
 
@@ -169,7 +172,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public void setDocStoreMode(DocStoreMode docStoreMode) {
+  public Transaction setDocStoreMode(DocStoreMode docStoreMode) {
     throw new IllegalStateException(notExpectedMessage);
   }
 
@@ -244,19 +247,21 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public void setReadOnly(boolean readOnly) {
+  public Transaction setReadOnly(boolean readOnly) {
     if (!isActive()) {
       throw new IllegalStateException(illegalStateMessage);
     }
     try {
       connection.setReadOnly(readOnly);
+      return this;
     } catch (SQLException e) {
       throw new PersistenceException(e);
     }
   }
 
   @Override
-  public void setUpdateAllLoadedProperties(boolean updateAllLoadedProperties) {
+  public Transaction setUpdateAllLoadedProperties(boolean updateAllLoadedProperties) {
+    return this;
   }
 
   @Override
@@ -265,13 +270,13 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public void setBatchMode(boolean batchMode) {
-
+  public Transaction setBatchMode(boolean batchMode) {
+    return this;
   }
 
   @Override
-  public void setBatch(PersistBatch batchMode) {
-
+  public Transaction setBatch(PersistBatch batchMode) {
+    return this;
   }
 
   @Override
@@ -280,7 +285,8 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public void setBatchOnCascade(PersistBatch batchOnCascadeMode) {
+  public Transaction setBatchOnCascade(PersistBatch batchOnCascadeMode) {
+    return this;
   }
 
   @Override
@@ -294,11 +300,13 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public void setBatchGetGeneratedKeys(boolean getGeneratedKeys) {
+  public Transaction setBatchGetGeneratedKeys(boolean getGeneratedKeys) {
+    return this;
   }
 
   @Override
-  public void setBatchFlushOnMixed(boolean batchFlushOnMixed) {
+  public Transaction setBatchFlushOnMixed(boolean batchFlushOnMixed) {
+    return this;
   }
 
   /**
@@ -313,7 +321,8 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public void setBatchSize(int batchSize) {
+  public Transaction setBatchSize(int batchSize) {
+    return this;
   }
 
   @Override
@@ -322,7 +331,8 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public void setBatchFlushOnQuery(boolean batchFlushOnQuery) {
+  public Transaction setBatchFlushOnQuery(boolean batchFlushOnQuery) {
+    return this;
   }
 
   /**
@@ -536,7 +546,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
    * Mark the transaction as rollback only.
    */
   @Override
-  public void setRollbackOnly() {
+  public Transaction setRollbackOnly() {
     // expect AutoCommit so we can't really support rollbackOnly
     throw new IllegalStateException(notExpectedMessage);
   }
@@ -586,11 +596,12 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public void setPersistCascade(boolean persistCascade) {
+  public Transaction setPersistCascade(boolean persistCascade) {
+    return this;
   }
 
   @Override
-  public void addModification(String tableName, boolean inserts, boolean updates, boolean deletes) {
+  public Transaction addModification(String tableName, boolean inserts, boolean updates, boolean deletes) {
     throw new IllegalStateException(notExpectedMessage);
   }
 
@@ -600,11 +611,12 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public void putUserObject(String name, Object value) {
+  public Transaction putUserObject(String name, Object value) {
     if (userObjects == null) {
       userObjects = new HashMap<>();
     }
     userObjects.put(name, value);
+    return this;
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index 322f70725..d0b60fea9 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.transaction;
 
 import io.ebean.ProfileLocation;
+import io.ebean.Transaction;
 import io.ebean.TransactionCallback;
 import io.ebean.annotation.DocStoreMode;
 import io.ebean.annotation.PersistBatch;
@@ -217,8 +218,9 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void setLabel(String label) {
+  public Transaction setLabel(String label) {
     this.label = label;
+    return this;
   }
 
   @Override
@@ -288,8 +290,9 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void setSkipCache(boolean skipCache) {
+  public Transaction setSkipCache(boolean skipCache) {
     this.skipCache = skipCache;
+    return this;
   }
 
   @Override
@@ -318,11 +321,12 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void register(TransactionCallback callback) {
+  public Transaction register(TransactionCallback callback) {
     if (callbackList == null) {
       callbackList = new ArrayList<>(4);
     }
     callbackList.add(callback);
+    return this;
   }
 
   protected void firePreRollback() {
@@ -385,8 +389,9 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void setDocStoreBatchSize(int docStoreBatchSize) {
+  public Transaction setDocStoreBatchSize(int docStoreBatchSize) {
     this.docStoreBatchSize = docStoreBatchSize;
+    return this;
   }
 
   @Override
@@ -395,8 +400,9 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void setDocStoreMode(DocStoreMode docStoreMode) {
+  public Transaction setDocStoreMode(DocStoreMode docStoreMode) {
     this.docStoreMode = docStoreMode;
+    return this;
   }
 
   @Override
@@ -529,21 +535,23 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void setReadOnly(boolean readOnly) {
+  public Transaction setReadOnly(boolean readOnly) {
     if (!isActive()) {
       throw new IllegalStateException(illegalStateMessage);
     }
     try {
       localReadOnly = readOnly;
       connection.setReadOnly(readOnly);
+      return this;
     } catch (SQLException e) {
       throw new PersistenceException(e);
     }
   }
 
   @Override
-  public void setUpdateAllLoadedProperties(boolean updateAllLoadedProperties) {
+  public Transaction setUpdateAllLoadedProperties(boolean updateAllLoadedProperties) {
     this.updateAllLoadedProperties = updateAllLoadedProperties;
+    return this;
   }
 
   @Override
@@ -552,19 +560,21 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void setBatchMode(boolean batchMode) {
+  public Transaction setBatchMode(boolean batchMode) {
     if (!isActive()) {
       throw new IllegalStateException(illegalStateMessage);
     }
     this.batchMode = (batchMode) ? PersistBatch.ALL : PersistBatch.NONE;
+    return this;
   }
 
   @Override
-  public void setBatch(PersistBatch batchMode) {
+  public Transaction setBatch(PersistBatch batchMode) {
     if (!isActive()) {
       throw new IllegalStateException(illegalStateMessage);
     }
     this.batchMode = batchMode;
+    return this;
   }
 
   @Override
@@ -573,11 +583,12 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void setBatchOnCascade(PersistBatch batchOnCascadeMode) {
+  public Transaction setBatchOnCascade(PersistBatch batchOnCascadeMode) {
     if (!isActive()) {
       throw new IllegalStateException(illegalStateMessage);
     }
     this.batchOnCascadeMode = batchOnCascadeMode;
+    return this;
   }
 
   @Override
@@ -591,19 +602,21 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void setBatchGetGeneratedKeys(boolean getGeneratedKeys) {
+  public Transaction setBatchGetGeneratedKeys(boolean getGeneratedKeys) {
     this.batchGetGeneratedKeys = getGeneratedKeys;
     if (batchControl != null) {
       batchControl.setGetGeneratedKeys(getGeneratedKeys);
     }
+    return this;
   }
 
   @Override
-  public void setBatchFlushOnMixed(boolean batchFlushOnMixed) {
+  public Transaction setBatchFlushOnMixed(boolean batchFlushOnMixed) {
     this.batchFlushOnMixed = batchFlushOnMixed;
     if (batchControl != null) {
       batchControl.setBatchFlushOnMixed(batchFlushOnMixed);
     }
+    return this;
   }
 
   /**
@@ -618,11 +631,12 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void setBatchSize(int batchSize) {
+  public Transaction setBatchSize(int batchSize) {
     this.batchSize = batchSize;
     if (batchControl != null) {
       batchControl.setBatchSize(batchSize);
     }
+    return this;
   }
 
   @Override
@@ -631,8 +645,9 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void setBatchFlushOnQuery(boolean batchFlushOnQuery) {
+  public Transaction setBatchFlushOnQuery(boolean batchFlushOnQuery) {
     this.batchFlushOnQuery = batchFlushOnQuery;
+    return this;
   }
 
   /**
@@ -1113,8 +1128,9 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * Mark the transaction as rollback only.
    */
   @Override
-  public void setRollbackOnly() {
+  public Transaction setRollbackOnly() {
     this.rollbackOnly = true;
+    return this;
   }
 
   /**
@@ -1182,13 +1198,15 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void setPersistCascade(boolean persistCascade) {
+  public Transaction setPersistCascade(boolean persistCascade) {
     this.persistCascade = persistCascade;
+    return this;
   }
 
   @Override
-  public void addModification(String tableName, boolean inserts, boolean updates, boolean deletes) {
+  public Transaction addModification(String tableName, boolean inserts, boolean updates, boolean deletes) {
     getEvent().add(tableName, inserts, updates, deletes);
+    return this;
   }
 
   @Override
@@ -1201,11 +1219,12 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void putUserObject(String name, Object value) {
+  public Transaction putUserObject(String name, Object value) {
     if (userObjects == null) {
       userObjects = new HashMap<>();
     }
     userObjects.put(name, value);
+    return this;
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
index 9ee156066..73c6eb930 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.transaction;
 
 import io.ebean.ProfileLocation;
+import io.ebean.Transaction;
 import io.ebean.TransactionCallback;
 import io.ebean.annotation.DocStoreMode;
 import io.ebean.annotation.PersistBatch;
@@ -28,8 +29,8 @@ class NoTransaction implements SpiTransaction {
   static final NoTransaction INSTANCE = new NoTransaction();
 
   @Override
-  public void setLabel(String label) {
-    // do nothing
+  public Transaction setLabel(String label) {
+    return this;
   }
 
   @Override
@@ -150,8 +151,8 @@ class NoTransaction implements SpiTransaction {
   }
 
   @Override
-  public void register(TransactionCallback callback) {
-
+  public Transaction register(TransactionCallback callback) {
+    return this;
   }
 
   @Override
@@ -160,13 +161,13 @@ class NoTransaction implements SpiTransaction {
   }
 
   @Override
-  public void setReadOnly(boolean readOnly) {
-
+  public Transaction setReadOnly(boolean readOnly) {
+    return this;
   }
 
   @Override
-  public void setRollbackOnly() {
-
+  public Transaction setRollbackOnly() {
+    return this;
   }
 
   @Override
@@ -176,28 +177,28 @@ class NoTransaction implements SpiTransaction {
 
 
   @Override
-  public void setDocStoreMode(DocStoreMode mode) {
-
+  public Transaction setDocStoreMode(DocStoreMode mode) {
+    return this;
   }
 
   @Override
-  public void setDocStoreBatchSize(int batchSize) {
-
+  public Transaction setDocStoreBatchSize(int batchSize) {
+    return this;
   }
 
   @Override
-  public void setPersistCascade(boolean persistCascade) {
-
+  public Transaction setPersistCascade(boolean persistCascade) {
+    return this;
   }
 
   @Override
-  public void setUpdateAllLoadedProperties(boolean updateAllLoadedProperties) {
-
+  public Transaction setUpdateAllLoadedProperties(boolean updateAllLoadedProperties) {
+    return this;
   }
 
   @Override
-  public void setSkipCache(boolean skipCache) {
-
+  public Transaction setSkipCache(boolean skipCache) {
+    return this;
   }
 
   @Override
@@ -206,13 +207,13 @@ class NoTransaction implements SpiTransaction {
   }
 
   @Override
-  public void setBatchMode(boolean useBatch) {
-
+  public Transaction setBatchMode(boolean useBatch) {
+    return this;
   }
 
   @Override
-  public void setBatch(PersistBatch persistBatchMode) {
-
+  public Transaction setBatch(PersistBatch persistBatchMode) {
+    return this;
   }
 
   @Override
@@ -221,8 +222,8 @@ class NoTransaction implements SpiTransaction {
   }
 
   @Override
-  public void setBatchOnCascade(PersistBatch batchOnCascadeMode) {
-
+  public Transaction setBatchOnCascade(PersistBatch batchOnCascadeMode) {
+    return this;
   }
 
   @Override
@@ -231,8 +232,8 @@ class NoTransaction implements SpiTransaction {
   }
 
   @Override
-  public void setBatchSize(int batchSize) {
-
+  public Transaction setBatchSize(int batchSize) {
+    return this;
   }
 
   @Override
@@ -241,18 +242,18 @@ class NoTransaction implements SpiTransaction {
   }
 
   @Override
-  public void setBatchGetGeneratedKeys(boolean getGeneratedKeys) {
-
+  public Transaction setBatchGetGeneratedKeys(boolean getGeneratedKeys) {
+    return this;
   }
 
   @Override
-  public void setBatchFlushOnMixed(boolean batchFlushOnMixed) {
-
+  public Transaction setBatchFlushOnMixed(boolean batchFlushOnMixed) {
+    return this;
   }
 
   @Override
-  public void setBatchFlushOnQuery(boolean batchFlushOnQuery) {
-
+  public Transaction setBatchFlushOnQuery(boolean batchFlushOnQuery) {
+    return this;
   }
 
   @Override
@@ -276,13 +277,13 @@ class NoTransaction implements SpiTransaction {
   }
 
   @Override
-  public void addModification(String tableName, boolean inserts, boolean updates, boolean deletes) {
-
+  public Transaction addModification(String tableName, boolean inserts, boolean updates, boolean deletes) {
+    return this;
   }
 
   @Override
-  public void putUserObject(String name, Object value) {
-
+  public Transaction putUserObject(String name, Object value) {
+    return this;
   }
 
   @Override
diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
index f1618b8d3..d5b5add3f 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
@@ -32,13 +32,13 @@ public class TestBatchInsertFlush extends BaseTestCase {
     MetaInfoManager metaInfoManager = server.getMetaInfoManager();
     metaInfoManager.collectTransactionStatistics(true);
 
-    Transaction transaction = server.beginTransaction();
-    try {
-      transaction.setPersistCascade(false);
-      transaction.setBatchSize(10);
-      transaction.setBatch(PersistBatch.ALL);
-      transaction.setLabel("TestBatchInsertFlush.no_cascade");
+    Transaction transaction = server.beginTransaction()
+      .setPersistCascade(false)
+      .setBatchSize(10)
+      .setBatch(PersistBatch.ALL)
+      .setLabel("TestBatchInsertFlush.no_cascade");
 
+    try {
 
       LoggedSqlCollector.start();
 
diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java b/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java
index 97b13a649..b49aebc75 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java
@@ -3,11 +3,11 @@ package org.tests.batchinsert;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Transaction;
-import io.ebean.annotation.Transactional;
 import io.ebean.annotation.PersistBatch;
+import io.ebean.annotation.Transactional;
+import org.junit.Test;
 import org.tests.model.basic.UTDetail;
 import org.tests.model.basic.UTMaster;
-import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -128,11 +128,12 @@ public class TestBatchInsertSimple extends BaseTestCase {
       masters.add(createMasterAndDetails(i, 7));
     }
 
-    Transaction transaction = Ebean.beginTransaction();
+    Transaction transaction = Ebean.beginTransaction()
+      .setBatch(PersistBatch.NONE)
+      .setBatchOnCascade(PersistBatch.ALL)
+      .setBatchSize(20);
+
     try {
-      transaction.setBatch(PersistBatch.NONE);
-      transaction.setBatchOnCascade(PersistBatch.ALL);
-      transaction.setBatchSize(20);
 
       // escalate based on batchOnCascade value
       Ebean.saveAll(masters);
diff --git a/src/test/java/org/tests/transaction/TestSqlServerBatch.java b/src/test/java/org/tests/transaction/TestSqlServerBatch.java
index 6b463236b..38cd60050 100644
--- a/src/test/java/org/tests/transaction/TestSqlServerBatch.java
+++ b/src/test/java/org/tests/transaction/TestSqlServerBatch.java
@@ -22,10 +22,8 @@ public class TestSqlServerBatch extends BaseTestCase {
   @Test
   public void testBasicIdentityBatch() {
 
-    Transaction txn = Ebean.beginTransaction();
+    Transaction txn = Ebean.beginTransaction().setBatchMode(true).setBatchSize(3);
     try {
-      txn.setBatchMode(true);
-      txn.setBatchSize(3);
 
       for (int i = 0; i < 10; i++) {
         ESimple model = new ESimple();

From 70ccc6588d8f1c3214be6ca8c5b1456d508d43e6 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 16 Feb 2018 14:45:16 +1300
Subject: [PATCH 0034/1036] [maven-release-plugin] prepare release
 ebean-11.10.6

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index be7fed8e4..3c6cbf87b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.10.6-SNAPSHOT</version>
+  <version>11.10.6</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.10.6</tag>
   </scm>
 
   <profiles>

From a1d0fbb19484bcd9f9cd25fc986883bf06a1dd07 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 16 Feb 2018 14:45:29 +1300
Subject: [PATCH 0035/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3c6cbf87b..e60b0ec7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.10.6</version>
+  <version>11.10.7-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.10.6</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From b8aa822a3038260017c356a54ced8baa706122b4 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 19 Feb 2018 04:15:28 +0100
Subject: [PATCH 0036/1036] [utf8mb4-support] limited the size of all indexed
 string columns, as max key length on mysql/mariadb is 767 bytes (which are <=
 191 chars on utf8mb4) (#1264)

---
 src/test/ddl-review/h2-create.sql             |  4 +--
 src/test/ddl-review/ms-create.sql             |  4 +--
 src/test/ddl-review/mysql-create.sql          |  4 +--
 src/test/ddl-review/ora-create.sql            |  4 +--
 src/test/ddl-review/pg-create.sql             |  4 +--
 src/test/java/misc/migration/v1_0/EBasic.java | 30 ++++++++++++-------
 src/test/java/misc/migration/v1_1/EBasic.java |  9 ++++++
 src/test/java/misc/migration/v1_2/EBasic.java | 24 ++++++++++-----
 .../org/tests/compositekeys/db/ItemKey.java   |  6 +++-
 .../org/tests/model/basic/BWithQIdent.java    |  3 ++
 .../org/tests/model/basic/CKeyParentId.java   |  2 ++
 .../java/org/tests/model/basic/Contact.java   |  5 ++++
 .../java/org/tests/model/basic/EBasic.java    |  3 ++
 .../model/basic/EBasicWithUniqueCon.java      |  7 +++++
 .../java/org/tests/model/basic/ECustomId.java |  2 ++
 .../java/org/tests/model/basic/TSDetail.java  |  2 ++
 .../org/tests/model/carwheeltruck/TCar.java   |  3 ++
 .../tests/model/composite/RCustomerKey.java   |  5 ++++
 .../org/tests/model/composite/ROrder.java     |  2 ++
 .../org/tests/model/composite/ROrderPK.java   |  5 +++-
 .../org/tests/model/draftable/Document.java   |  2 ++
 .../tests/model/orderentity/OrderEntity.java  |  3 ++
 .../model/orderentity/OrderItemEntity.java    |  3 ++
 .../java/org/tests/model/pview/Wview.java     |  3 ++
 .../java/org/tests/update/EPersonOnline.java  |  3 ++
 .../ModelBuild_compoundKeyTest/apply.sql      |  4 +--
 src/test/resources/assert/changeset-apply.txt |  4 +--
 .../resources/assert/changeset-pg-apply.sql   |  4 +--
 .../resources/container/test-compoundkey.xml  |  4 +--
 .../migrationtest/db2/1.0__initial.sql        | 16 +++++-----
 .../migrationtest/h2/1.0__initial.sql         | 16 +++++-----
 .../migrationtest/hsqldb/1.0__initial.sql     | 16 +++++-----
 .../model/1.0__initial.model.xml              | 16 +++++-----
 .../migrationtest/mysql/1.0__initial.sql      | 16 +++++-----
 .../migrationtest/oracle/1.0__initial.sql     | 16 +++++-----
 .../migrationtest/postgres/1.0__initial.sql   | 16 +++++-----
 .../migrationtest/sqlite/1.0__initial.sql     | 16 +++++-----
 .../migrationtest/sqlserver/1.0__initial.sql  | 16 +++++-----
 38 files changed, 193 insertions(+), 109 deletions(-)

diff --git a/src/test/ddl-review/h2-create.sql b/src/test/ddl-review/h2-create.sql
index 660744c0c..af29ea19d 100644
--- a/src/test/ddl-review/h2-create.sql
+++ b/src/test/ddl-review/h2-create.sql
@@ -177,14 +177,14 @@ create table ckey_detail (
   id                            integer not null,
   something                     varchar(255),
   one_key                       integer,
-  two_key                       varchar(255),
+  two_key                       varchar(127),
   constraint pk_ckey_detail primary key (id)
 );
 create sequence ckey_detail_seq;
 
 create table ckey_parent (
   one_key                       integer not null,
-  two_key                       varchar(255) not null,
+  two_key                       varchar(127) not null,
   name                          varchar(255),
   assoc_id                      integer,
   version                       integer not null,
diff --git a/src/test/ddl-review/ms-create.sql b/src/test/ddl-review/ms-create.sql
index 0ae653fbe..62ac79821 100644
--- a/src/test/ddl-review/ms-create.sql
+++ b/src/test/ddl-review/ms-create.sql
@@ -158,13 +158,13 @@ create table ckey_detail (
   id                            integer identity(1,1) not null,
   something                     varchar(255),
   one_key                       integer,
-  two_key                       varchar(255),
+  two_key                       varchar(127),
   constraint pk_ckey_detail primary key (id)
 );
 
 create table ckey_parent (
   one_key                       integer not null,
-  two_key                       varchar(255) not null,
+  two_key                       varchar(127) not null,
   name                          varchar(255),
   assoc_id                      integer,
   version                       integer not null,
diff --git a/src/test/ddl-review/mysql-create.sql b/src/test/ddl-review/mysql-create.sql
index f81a883cd..974b5461d 100644
--- a/src/test/ddl-review/mysql-create.sql
+++ b/src/test/ddl-review/mysql-create.sql
@@ -158,13 +158,13 @@ create table ckey_detail (
   id                            integer auto_increment not null,
   something                     varchar(255),
   one_key                       integer,
-  two_key                       varchar(255),
+  two_key                       varchar(127),
   constraint pk_ckey_detail primary key (id)
 );
 
 create table ckey_parent (
   one_key                       integer not null,
-  two_key                       varchar(255) not null,
+  two_key                       varchar(127) not null,
   name                          varchar(255),
   assoc_id                      integer,
   version                       integer not null,
diff --git a/src/test/ddl-review/ora-create.sql b/src/test/ddl-review/ora-create.sql
index f857a9ecf..5dc24914c 100644
--- a/src/test/ddl-review/ora-create.sql
+++ b/src/test/ddl-review/ora-create.sql
@@ -177,14 +177,14 @@ create table ckey_detail (
   id                            number(10) not null,
   something                     varchar2(255),
   one_key                       number(10),
-  two_key                       varchar2(255),
+  two_key                       varchar2(127),
   constraint pk_ckey_detail primary key (id)
 );
 create sequence ckey_detail_seq;
 
 create table ckey_parent (
   one_key                       number(10) not null,
-  two_key                       varchar2(255) not null,
+  two_key                       varchar2(127) not null,
   name                          varchar2(255),
   assoc_id                      number(10),
   version                       number(10) not null,
diff --git a/src/test/ddl-review/pg-create.sql b/src/test/ddl-review/pg-create.sql
index 7eb9473f7..4956fd1bb 100644
--- a/src/test/ddl-review/pg-create.sql
+++ b/src/test/ddl-review/pg-create.sql
@@ -159,13 +159,13 @@ create table ckey_detail (
   id                            serial not null,
   something                     varchar(255),
   one_key                       integer,
-  two_key                       varchar(255),
+  two_key                       varchar(127),
   constraint pk_ckey_detail primary key (id)
 );
 
 create table ckey_parent (
   one_key                       integer not null,
-  two_key                       varchar(255) not null,
+  two_key                       varchar(127) not null,
   name                          varchar(255),
   assoc_id                      integer,
   version                       integer not null,
diff --git a/src/test/java/misc/migration/v1_0/EBasic.java b/src/test/java/misc/migration/v1_0/EBasic.java
index ebdcceb3f..8c90882ef 100644
--- a/src/test/java/misc/migration/v1_0/EBasic.java
+++ b/src/test/java/misc/migration/v1_0/EBasic.java
@@ -8,6 +8,8 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
+import javax.validation.constraints.Size;
+
 import java.sql.Timestamp;
 
 @Entity
@@ -29,9 +31,11 @@ public class EBasic {
   Integer id;
 
   Status status;
-  
+
+  @Size(max=127)
   String name;
 
+  @Size(max=127)
   String description;
 
   Timestamp someDate;
@@ -42,28 +46,34 @@ public class EBasic {
   
   @ManyToOne
   ERef eref;
-  
-  
+
+
   // test add & remove indices
   @Index
+  @Size(max=127)
   String indextest1;
-  
+
   @Index(unique = true)
+  @Size(max=127)
   String indextest2;
-  
+
+  @Size(max=127)
   String indextest3;
-  
+
+  @Size(max=127)
   String indextest4;
-  
+
   @Index(unique = false)
+  @Size(max=127)
   String indextest5;
-  
+
   @Index(unique = true)
+  @Size(max=127)
   String indextest6;
-  
+
   @NotNull
   int user_id;
-  
+
   public EBasic() {
 
   }
diff --git a/src/test/java/misc/migration/v1_1/EBasic.java b/src/test/java/misc/migration/v1_1/EBasic.java
index f4dc7c990..b11c6f9e2 100644
--- a/src/test/java/misc/migration/v1_1/EBasic.java
+++ b/src/test/java/misc/migration/v1_1/EBasic.java
@@ -11,6 +11,7 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
+import javax.validation.constraints.Size;
 
 import java.sql.Timestamp;
 
@@ -51,11 +52,13 @@ public class EBasic {
   Status status;
 
   @Index(unique = true)
+  @Size(max=127)
   String name;
 
 
   @DbMigration(preAlter = "-- rename all collisions")
   @Column(unique = true)
+  @Size(max=127)
   String description;
 
   @NotNull
@@ -75,20 +78,26 @@ public class EBasic {
   @DbDefault("true")
   boolean newBooleanField2;
 
+  @Size(max=127)
   String indextest1;
 
+  @Size(max=127)
   String indextest2;
 
   @Index
+  @Size(max=127)
   String indextest3;
 
   @Index(unique = true)
+  @Size(max=127)
   String indextest4;
 
   @Index(unique = true)
+  @Size(max=127)
   String indextest5;
 
   @Index(unique = false)
+  @Size(max=127)
   String indextest6;
 
   @NotNull
diff --git a/src/test/java/misc/migration/v1_2/EBasic.java b/src/test/java/misc/migration/v1_2/EBasic.java
index 16f459775..5753cb767 100644
--- a/src/test/java/misc/migration/v1_2/EBasic.java
+++ b/src/test/java/misc/migration/v1_2/EBasic.java
@@ -9,6 +9,8 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
+import javax.validation.constraints.Size;
+
 import java.sql.Timestamp;
 
 @Entity
@@ -30,9 +32,11 @@ public class EBasic {
   Integer id;
 
   Status status;
-  
+
+  @Size(max=127)
   String name;
 
+  @Size(max=127)
   String description;
 
   Timestamp someDate;
@@ -47,21 +51,27 @@ public class EBasic {
   
   // test add & remove indices
   @Index
+  @Size(max=127)
   String indextest1;
-  
+
   @Index(unique = true)
+  @Size(max=127)
   String indextest2;
-  
+
+  @Size(max=127)
   String indextest3;
-  
+
+  @Size(max=127)
   String indextest4;
-  
+
   @Index(unique = false)
+  @Size(max=127)
   String indextest5;
-  
+
   @Index(unique = true)
+  @Size(max=127)
   String indextest6;
-  
+
   @NotNull
   @DbDefault("23")
   int user_id;
diff --git a/src/test/java/org/tests/compositekeys/db/ItemKey.java b/src/test/java/org/tests/compositekeys/db/ItemKey.java
index 0f35d91ea..0f4589612 100644
--- a/src/test/java/org/tests/compositekeys/db/ItemKey.java
+++ b/src/test/java/org/tests/compositekeys/db/ItemKey.java
@@ -2,12 +2,16 @@ package org.tests.compositekeys.db;
 
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
+import javax.validation.constraints.Size;
+
 
 @Embeddable
 public class ItemKey {
+  @Size(max=127)
   private int customer;
 
-  @Column(name = "itemNumber")
+  @Column(name = "itemnumber")
+  @Size(max=127)
   private String itemNumber;
 
   public int getCustomer() {
diff --git a/src/test/java/org/tests/model/basic/BWithQIdent.java b/src/test/java/org/tests/model/basic/BWithQIdent.java
index d101c2e0a..329d40f41 100644
--- a/src/test/java/org/tests/model/basic/BWithQIdent.java
+++ b/src/test/java/org/tests/model/basic/BWithQIdent.java
@@ -4,6 +4,8 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Version;
+import javax.validation.constraints.Size;
+
 import java.sql.Timestamp;
 
 @Entity
@@ -13,6 +15,7 @@ public class BWithQIdent {
   Integer id;
 
   @Column(name = "`Name`", unique = true)
+  @Size(max = 191) // key must not exceed 767 Bytes, so max key len for mysql with utf8mb4 = 191*4 = 764 bytes
   String name;
 
   @Version
diff --git a/src/test/java/org/tests/model/basic/CKeyParentId.java b/src/test/java/org/tests/model/basic/CKeyParentId.java
index b57313779..a0d8c828c 100644
--- a/src/test/java/org/tests/model/basic/CKeyParentId.java
+++ b/src/test/java/org/tests/model/basic/CKeyParentId.java
@@ -1,11 +1,13 @@
 package org.tests.model.basic;
 
 import javax.persistence.Embeddable;
+import javax.validation.constraints.Size;
 
 @Embeddable
 public class CKeyParentId {
 
   Integer oneKey;
+  @Size(max = 127)
   String twoKey;
 
   public CKeyParentId() {
diff --git a/src/test/java/org/tests/model/basic/Contact.java b/src/test/java/org/tests/model/basic/Contact.java
index e15f572b2..402a4fc2a 100644
--- a/src/test/java/org/tests/model/basic/Contact.java
+++ b/src/test/java/org/tests/model/basic/Contact.java
@@ -13,6 +13,8 @@ import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Version;
+import javax.validation.constraints.Size;
+
 import java.sql.Timestamp;
 import java.util.List;
 
@@ -26,7 +28,10 @@ public class Contact {
   @Id
   int id;
 
+  @Size(max=127)
   String firstName;
+
+  @Size(max=127)
   String lastName;
 
   String phone;
diff --git a/src/test/java/org/tests/model/basic/EBasic.java b/src/test/java/org/tests/model/basic/EBasic.java
index 5b67551f8..278328f92 100644
--- a/src/test/java/org/tests/model/basic/EBasic.java
+++ b/src/test/java/org/tests/model/basic/EBasic.java
@@ -6,6 +6,8 @@ import io.ebean.annotation.Index;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.validation.constraints.Size;
+
 import java.sql.Timestamp;
 
 @Entity
@@ -29,6 +31,7 @@ public class EBasic {
   Status status;
 
   @Index
+  @Size(max=127)
   String name;
 
   String description;
diff --git a/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java b/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java
index 63c09d4de..4766414dc 100644
--- a/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java
+++ b/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java
@@ -6,6 +6,8 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
 import javax.persistence.Version;
+import javax.validation.constraints.Size;
+
 import java.sql.Timestamp;
 
 @Entity
@@ -17,10 +19,15 @@ public class EBasicWithUniqueCon {
   Integer id;
 
   @Column(unique = true)
+  @Size(max=127)
   String name;
 
+  @Size(max=127)
   String other;
+
+  @Size(max=127)
   String otherOne;
+
   String description;
 
   @Version
diff --git a/src/test/java/org/tests/model/basic/ECustomId.java b/src/test/java/org/tests/model/basic/ECustomId.java
index fc6c94d2c..0655ac781 100644
--- a/src/test/java/org/tests/model/basic/ECustomId.java
+++ b/src/test/java/org/tests/model/basic/ECustomId.java
@@ -3,12 +3,14 @@ package org.tests.model.basic;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.validation.constraints.Size;
 
 @Entity
 public class ECustomId {
 
   @Id
   @GeneratedValue(generator = "shortUid")
+  @Size(max=127)
   String id;
 
   String name;
diff --git a/src/test/java/org/tests/model/basic/TSDetail.java b/src/test/java/org/tests/model/basic/TSDetail.java
index b89ec11f4..cca4584cc 100644
--- a/src/test/java/org/tests/model/basic/TSDetail.java
+++ b/src/test/java/org/tests/model/basic/TSDetail.java
@@ -8,6 +8,7 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
+import javax.validation.constraints.Size;
 
 /**
  * A basic entity to test simple things.
@@ -26,6 +27,7 @@ public class TSDetail {
   String description;
 
   @Index(unique = true)
+  @Size(max=127)
   String someUniqueValue;
 
   boolean active;
diff --git a/src/test/java/org/tests/model/carwheeltruck/TCar.java b/src/test/java/org/tests/model/carwheeltruck/TCar.java
index 5274259a2..1a8aa356c 100644
--- a/src/test/java/org/tests/model/carwheeltruck/TCar.java
+++ b/src/test/java/org/tests/model/carwheeltruck/TCar.java
@@ -8,6 +8,8 @@ import javax.persistence.Id;
 import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;
 import javax.persistence.OneToMany;
+import javax.validation.constraints.Size;
+
 import java.util.List;
 
 @Entity
@@ -17,6 +19,7 @@ import java.util.List;
 public class TCar {
 
   @Id
+  @Size(max=32)
   String plateNo;
 
   @OneToMany(cascade = CascadeType.ALL)
diff --git a/src/test/java/org/tests/model/composite/RCustomerKey.java b/src/test/java/org/tests/model/composite/RCustomerKey.java
index 881d01674..a871d49aa 100644
--- a/src/test/java/org/tests/model/composite/RCustomerKey.java
+++ b/src/test/java/org/tests/model/composite/RCustomerKey.java
@@ -2,10 +2,15 @@ package org.tests.model.composite;
 
 
 import javax.persistence.Embeddable;
+import javax.validation.constraints.Size;
 
 @Embeddable
 public class RCustomerKey {
+
+  @Size(max=127)
   private String company;
+
+  @Size(max=127)
   private String name;
 
   public RCustomerKey() {
diff --git a/src/test/java/org/tests/model/composite/ROrder.java b/src/test/java/org/tests/model/composite/ROrder.java
index 56b8639df..14fd2d9c9 100644
--- a/src/test/java/org/tests/model/composite/ROrder.java
+++ b/src/test/java/org/tests/model/composite/ROrder.java
@@ -8,6 +8,7 @@ import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumns;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
+import javax.validation.constraints.Size;
 
 
 /**
@@ -28,6 +29,7 @@ public class ROrder {
   private RCustomer customer;
 
   @Column(name = "customerName")
+  @Size(max=127)
   private String customerName;
 
   private String item;
diff --git a/src/test/java/org/tests/model/composite/ROrderPK.java b/src/test/java/org/tests/model/composite/ROrderPK.java
index 72962acff..2c808d82b 100644
--- a/src/test/java/org/tests/model/composite/ROrderPK.java
+++ b/src/test/java/org/tests/model/composite/ROrderPK.java
@@ -4,6 +4,7 @@ package org.tests.model.composite;
 import java.io.Serializable;
 
 import javax.persistence.Embeddable;
+import javax.validation.constraints.Size;
 
 /**
  * @author rnentjes
@@ -12,8 +13,10 @@ import javax.persistence.Embeddable;
 public class ROrderPK implements Serializable {
 
   private static final long serialVersionUID = 7632735517186104883L;
-
+  @Size(max=127)
   private String company;
+
+  @Size(max=127)
   private Integer orderNumber;
 
   public ROrderPK() {
diff --git a/src/test/java/org/tests/model/draftable/Document.java b/src/test/java/org/tests/model/draftable/Document.java
index acfff0ff6..5340ee4fe 100644
--- a/src/test/java/org/tests/model/draftable/Document.java
+++ b/src/test/java/org/tests/model/draftable/Document.java
@@ -8,6 +8,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
+import javax.validation.constraints.Size;
 import java.sql.Timestamp;
 import java.util.List;
 
@@ -19,6 +20,7 @@ public class Document extends BaseDomain {
   public static DocumentFinder find = new DocumentFinder();
 
   @Column(unique = true)
+  @Size(max=127)
   String title;
 
   String body;
diff --git a/src/test/java/org/tests/model/orderentity/OrderEntity.java b/src/test/java/org/tests/model/orderentity/OrderEntity.java
index 6b2acd451..2a1e032dc 100644
--- a/src/test/java/org/tests/model/orderentity/OrderEntity.java
+++ b/src/test/java/org/tests/model/orderentity/OrderEntity.java
@@ -7,6 +7,8 @@ import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
+import javax.validation.constraints.Size;
+
 import java.util.List;
 
 @Entity
@@ -19,6 +21,7 @@ public class OrderEntity {
    */
   @Id
   @Column(name = "uuid")
+  @Size(max=40)
   private String id;
 
   @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, mappedBy = "order")
diff --git a/src/test/java/org/tests/model/orderentity/OrderItemEntity.java b/src/test/java/org/tests/model/orderentity/OrderItemEntity.java
index 024be3cc6..d1d40961c 100644
--- a/src/test/java/org/tests/model/orderentity/OrderItemEntity.java
+++ b/src/test/java/org/tests/model/orderentity/OrderItemEntity.java
@@ -6,6 +6,8 @@ import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
+import javax.validation.constraints.Size;
+
 import java.math.BigDecimal;
 
 @Entity
@@ -18,6 +20,7 @@ public class OrderItemEntity {
    */
   @Id
   @Column(name = "uuid")
+  @Size(max=40)
   private String id;
 
   @Column(name = "product_variant_uuid")
diff --git a/src/test/java/org/tests/model/pview/Wview.java b/src/test/java/org/tests/model/pview/Wview.java
index f88c65d19..364b73bf0 100644
--- a/src/test/java/org/tests/model/pview/Wview.java
+++ b/src/test/java/org/tests/model/pview/Wview.java
@@ -5,6 +5,8 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.validation.constraints.Size;
+
 import java.util.UUID;
 
 @Entity
@@ -17,6 +19,7 @@ public class Wview {
 
   @Basic(optional = false)
   @Column(unique = true)
+  @Size(max=127)
   private String name;
 
   public UUID getId() {
diff --git a/src/test/java/org/tests/update/EPersonOnline.java b/src/test/java/org/tests/update/EPersonOnline.java
index f9a3e3e04..7b1f2bb88 100644
--- a/src/test/java/org/tests/update/EPersonOnline.java
+++ b/src/test/java/org/tests/update/EPersonOnline.java
@@ -6,6 +6,8 @@ import io.ebean.annotation.WhenModified;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.validation.constraints.Size;
+
 import java.time.Instant;
 
 @Entity
@@ -16,6 +18,7 @@ public class EPersonOnline {
   Long id;
 
   @Index(unique = true)
+  @Size(max=127)
   String email;
 
   boolean online;
diff --git a/src/test/resources/assert/ModelBuild_compoundKeyTest/apply.sql b/src/test/resources/assert/ModelBuild_compoundKeyTest/apply.sql
index 6c5a6587c..e0789ab8a 100644
--- a/src/test/resources/assert/ModelBuild_compoundKeyTest/apply.sql
+++ b/src/test/resources/assert/ModelBuild_compoundKeyTest/apply.sql
@@ -8,13 +8,13 @@ create table ckey_detail (
   id                            integer auto_increment not null,
   something                     varchar(255),
   one_key                       integer,
-  two_key                       varchar(255),
+  two_key                       varchar(127),
   constraint pk_ckey_detail primary key (id)
 );
 
 create table ckey_parent (
   one_key                       integer not null,
-  two_key                       varchar(255) not null,
+  two_key                       varchar(127) not null,
   name                          varchar(255),
   assoc_id                      integer,
   version                       integer not null,
diff --git a/src/test/resources/assert/changeset-apply.txt b/src/test/resources/assert/changeset-apply.txt
index 46bf5c1b1..16d68bacc 100644
--- a/src/test/resources/assert/changeset-apply.txt
+++ b/src/test/resources/assert/changeset-apply.txt
@@ -177,14 +177,14 @@ create table ckey_detail (
   id                            integer not null,
   something                     varchar(255),
   one_key                       integer,
-  two_key                       varchar(255),
+  two_key                       varchar(127),
   constraint pk_ckey_detail primary key (id)
 );
 create sequence ckey_detail_seq;
 
 create table ckey_parent (
   one_key                       integer not null,
-  two_key                       varchar(255) not null,
+  two_key                       varchar(127) not null,
   name                          varchar(255),
   assoc_id                      integer,
   version                       integer not null,
diff --git a/src/test/resources/assert/changeset-pg-apply.sql b/src/test/resources/assert/changeset-pg-apply.sql
index ec2f0f3f0..c995e7c84 100644
--- a/src/test/resources/assert/changeset-pg-apply.sql
+++ b/src/test/resources/assert/changeset-pg-apply.sql
@@ -158,13 +158,13 @@ create table ckey_detail (
   id                            serial not null,
   something                     varchar(255),
   one_key                       integer,
-  two_key                       varchar(255),
+  two_key                       varchar(127),
   constraint pk_ckey_detail primary key (id)
 );
 
 create table ckey_parent (
   one_key                       integer not null,
-  two_key                       varchar(255) not null,
+  two_key                       varchar(127) not null,
   name                          varchar(255),
   assoc_id                      integer,
   version                       integer not null,
diff --git a/src/test/resources/container/test-compoundkey.xml b/src/test/resources/container/test-compoundkey.xml
index a38205d98..20955a77a 100644
--- a/src/test/resources/container/test-compoundkey.xml
+++ b/src/test/resources/container/test-compoundkey.xml
@@ -13,13 +13,13 @@
       <column name="id"         type="integer"          primaryKey="true" identity="true"/>
       <column name="something"  type="varchar(255)"     />
       <column name="one_key"    type="integer"          />
-      <column name="two_key"    type="varchar(255)"     />
+      <column name="two_key"    type="varchar(127)"     />
       <foreignKey name="fk_ckey_detail_parent" columnNames="one_key,two_key" refColumnNames="one_key,two_key" refTableName="ckey_parent" indexName="ix_ckey_detail_parent"/>
     </createTable>
     
     <createTable name="ckey_parent" pkName="pk_ckey_parent">
       <column name="one_key"    type="integer"         primaryKey="true" />
-      <column name="two_key"    type="varchar(255)"    primaryKey="true" />
+      <column name="two_key"    type="varchar(127)"    primaryKey="true" />
       <column name="name"       type="varchar(255)"    />
       <column name="assoc_id"   type="integer"         references="ckey_assoc.id" foreignKeyName="fk_ckey_parent_assoc_id" foreignKeyIndex="ix_ckey_parent_assoc_id"/>
       <column name="version"    type="integer"         notnull="true" />
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
index 8cb33ca98..ac49b8e02 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
@@ -2,18 +2,18 @@
 create table migtest_e_basic (
   id                            integer generated by default as identity not null,
   status                        varchar(1),
-  name                          varchar(255),
-  description                   varchar(255),
+  name                          varchar(127),
+  description                   varchar(127),
   some_date                     timestamp,
   old_boolean                   boolean default false not null,
   old_boolean2                  boolean,
   eref_id                       integer,
-  indextest1                    varchar(255),
-  indextest2                    varchar(255),
-  indextest3                    varchar(255),
-  indextest4                    varchar(255),
-  indextest5                    varchar(255),
-  indextest6                    varchar(255),
+  indextest1                    varchar(127),
+  indextest2                    varchar(127),
+  indextest3                    varchar(127),
+  indextest4                    varchar(127),
+  indextest5                    varchar(127),
+  indextest6                    varchar(127),
   user_id                       integer not null,
   constraint ck_migtest_e_basic_status check ( status in ('N','A','I')),
   constraint pk_migtest_e_basic primary key (id)
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
index 92ce9e535..60dc196b2 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
@@ -2,18 +2,18 @@
 create table migtest_e_basic (
   id                            integer auto_increment not null,
   status                        varchar(1),
-  name                          varchar(255),
-  description                   varchar(255),
+  name                          varchar(127),
+  description                   varchar(127),
   some_date                     timestamp,
   old_boolean                   boolean default false not null,
   old_boolean2                  boolean,
   eref_id                       integer,
-  indextest1                    varchar(255),
-  indextest2                    varchar(255),
-  indextest3                    varchar(255),
-  indextest4                    varchar(255),
-  indextest5                    varchar(255),
-  indextest6                    varchar(255),
+  indextest1                    varchar(127),
+  indextest2                    varchar(127),
+  indextest3                    varchar(127),
+  indextest4                    varchar(127),
+  indextest5                    varchar(127),
+  indextest6                    varchar(127),
   user_id                       integer not null,
   constraint ck_migtest_e_basic_status check ( status in ('N','A','I')),
   constraint uq_migtest_e_basic_indextest2 unique (indextest2),
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
index 98a8aefd4..b5ba4b578 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
@@ -2,18 +2,18 @@
 create table migtest_e_basic (
   id                            integer generated by default as identity (start with 1)  not null,
   status                        varchar(1),
-  name                          varchar(255),
-  description                   varchar(255),
+  name                          varchar(127),
+  description                   varchar(127),
   some_date                     timestamp,
   old_boolean                   boolean default false not null,
   old_boolean2                  boolean,
   eref_id                       integer,
-  indextest1                    varchar(255),
-  indextest2                    varchar(255),
-  indextest3                    varchar(255),
-  indextest4                    varchar(255),
-  indextest5                    varchar(255),
-  indextest6                    varchar(255),
+  indextest1                    varchar(127),
+  indextest2                    varchar(127),
+  indextest3                    varchar(127),
+  indextest4                    varchar(127),
+  indextest5                    varchar(127),
+  indextest6                    varchar(127),
   user_id                       integer not null,
   constraint ck_migtest_e_basic_status check ( status in ('N','A','I')),
   constraint uq_migtest_e_basic_indextest2 unique (indextest2),
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
index a01d7db52..e489d342c 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
@@ -5,18 +5,18 @@
         <createTable name="migtest_e_basic" pkName="pk_migtest_e_basic">
             <column name="id" type="integer" primaryKey="true"/>
             <column name="status" type="varchar(1)" checkConstraint="check ( status in ('N','A','I'))" checkConstraintName="ck_migtest_e_basic_status"/>
-            <column name="name" type="varchar"/>
-            <column name="description" type="varchar"/>
+            <column name="name" type="varchar(127)"/>
+            <column name="description" type="varchar(127)"/>
             <column name="some_date" type="timestamp"/>
             <column name="old_boolean" type="boolean" defaultValue="false" notnull="true"/>
             <column name="old_boolean2" type="boolean"/>
             <column name="eref_id" type="integer" references="migtest_e_ref.id" foreignKeyName="fk_migtest_e_basic_eref_id" foreignKeyIndex="ix_migtest_e_basic_eref_id"/>
-            <column name="indextest1" type="varchar"/>
-            <column name="indextest2" type="varchar"/>
-            <column name="indextest3" type="varchar"/>
-            <column name="indextest4" type="varchar"/>
-            <column name="indextest5" type="varchar"/>
-            <column name="indextest6" type="varchar"/>
+            <column name="indextest1" type="varchar(127)"/>
+            <column name="indextest2" type="varchar(127)"/>
+            <column name="indextest3" type="varchar(127)"/>
+            <column name="indextest4" type="varchar(127)"/>
+            <column name="indextest5" type="varchar(127)"/>
+            <column name="indextest6" type="varchar(127)"/>
             <column name="user_id" type="integer" notnull="true"/>
             <uniqueConstraint name="uq_migtest_e_basic_indextest2" columnNames="indextest2"/>
             <uniqueConstraint name="uq_migtest_e_basic_indextest6" columnNames="indextest6"/>
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
index 8fe02c94c..d0cd55dbd 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
@@ -2,18 +2,18 @@
 create table migtest_e_basic (
   id                            integer auto_increment not null,
   status                        varchar(1),
-  name                          varchar(255),
-  description                   varchar(255),
+  name                          varchar(127),
+  description                   varchar(127),
   some_date                     datetime(6),
   old_boolean                   tinyint(1) default 0 not null,
   old_boolean2                  tinyint(1) default 0,
   eref_id                       integer,
-  indextest1                    varchar(255),
-  indextest2                    varchar(255),
-  indextest3                    varchar(255),
-  indextest4                    varchar(255),
-  indextest5                    varchar(255),
-  indextest6                    varchar(255),
+  indextest1                    varchar(127),
+  indextest2                    varchar(127),
+  indextest3                    varchar(127),
+  indextest4                    varchar(127),
+  indextest5                    varchar(127),
+  indextest6                    varchar(127),
   user_id                       integer not null,
   constraint ck_migtest_e_basic_status check ( status in ('N','A','I')),
   constraint uq_migtest_e_basic_indextest2 unique (indextest2),
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
index 439cc5a00..9cb945a13 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
@@ -2,18 +2,18 @@
 create table migtest_e_basic (
   id                            number(10) not null,
   status                        varchar2(1),
-  name                          varchar2(255),
-  description                   varchar2(255),
+  name                          varchar2(127),
+  description                   varchar2(127),
   some_date                     timestamp,
   old_boolean                   number(1) default 0 not null,
   old_boolean2                  number(1) default 0,
   eref_id                       number(10),
-  indextest1                    varchar2(255),
-  indextest2                    varchar2(255),
-  indextest3                    varchar2(255),
-  indextest4                    varchar2(255),
-  indextest5                    varchar2(255),
-  indextest6                    varchar2(255),
+  indextest1                    varchar2(127),
+  indextest2                    varchar2(127),
+  indextest3                    varchar2(127),
+  indextest4                    varchar2(127),
+  indextest5                    varchar2(127),
+  indextest6                    varchar2(127),
   user_id                       number(10) not null,
   constraint ck_migtest_e_basic_status check ( status in ('N','A','I')),
   constraint uq_migtest_e_basic_indextest2 unique (indextest2),
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
index 372bcf4ba..09be87a42 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
@@ -2,18 +2,18 @@
 create table migtest_e_basic (
   id                            serial not null,
   status                        varchar(1),
-  name                          varchar(255),
-  description                   varchar(255),
+  name                          varchar(127),
+  description                   varchar(127),
   some_date                     timestamptz,
   old_boolean                   boolean default false not null,
   old_boolean2                  boolean,
   eref_id                       integer,
-  indextest1                    varchar(255),
-  indextest2                    varchar(255),
-  indextest3                    varchar(255),
-  indextest4                    varchar(255),
-  indextest5                    varchar(255),
-  indextest6                    varchar(255),
+  indextest1                    varchar(127),
+  indextest2                    varchar(127),
+  indextest3                    varchar(127),
+  indextest4                    varchar(127),
+  indextest5                    varchar(127),
+  indextest6                    varchar(127),
   user_id                       integer not null,
   constraint ck_migtest_e_basic_status check ( status in ('N','A','I')),
   constraint uq_migtest_e_basic_indextest2 unique (indextest2),
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
index 88d329a2b..fb9e4c859 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
@@ -2,18 +2,18 @@
 create table migtest_e_basic (
   id                            integer not null,
   status                        varchar(1),
-  name                          varchar(255),
-  description                   varchar(255),
+  name                          varchar(127),
+  description                   varchar(127),
   some_date                     timestamp,
   old_boolean                   int default 0 not null,
   old_boolean2                  int default 0,
   eref_id                       integer,
-  indextest1                    varchar(255),
-  indextest2                    varchar(255),
-  indextest3                    varchar(255),
-  indextest4                    varchar(255),
-  indextest5                    varchar(255),
-  indextest6                    varchar(255),
+  indextest1                    varchar(127),
+  indextest2                    varchar(127),
+  indextest3                    varchar(127),
+  indextest4                    varchar(127),
+  indextest5                    varchar(127),
+  indextest6                    varchar(127),
   user_id                       integer not null,
   constraint ck_migtest_e_basic_status check ( status in ('N','A','I')),
   constraint uq_migtest_e_basic_indextest2 unique (indextest2),
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql
index 39fff72cf..7c8eb6b47 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql
@@ -2,18 +2,18 @@
 create table migtest_e_basic (
   id                            integer identity(1,1) not null,
   status                        varchar(1),
-  name                          varchar(255),
-  description                   varchar(255),
+  name                          varchar(127),
+  description                   varchar(127),
   some_date                     datetime2,
   old_boolean                   bit default 0 not null,
   old_boolean2                  bit default 0,
   eref_id                       integer,
-  indextest1                    varchar(255),
-  indextest2                    varchar(255),
-  indextest3                    varchar(255),
-  indextest4                    varchar(255),
-  indextest5                    varchar(255),
-  indextest6                    varchar(255),
+  indextest1                    varchar(127),
+  indextest2                    varchar(127),
+  indextest3                    varchar(127),
+  indextest4                    varchar(127),
+  indextest5                    varchar(127),
+  indextest6                    varchar(127),
   user_id                       integer not null,
   constraint ck_migtest_e_basic_status check ( status in ('N','A','I')),
   constraint pk_migtest_e_basic primary key (id)

From 40634412f5c43340a1af17bc8afdb3c789ee45b5 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 19 Feb 2018 22:24:37 +1300
Subject: [PATCH 0037/1036] #323 - DDL Generation support for foreign key
 cascade options

---
 .../ddlgeneration/platform/BaseTableDdl.java  |  84 +++------------
 .../ddlgeneration/platform/Oracle10Ddl.java   |  18 +++-
 .../ddlgeneration/platform/PlatformDdl.java   |  63 ++++++++---
 .../ddlgeneration/platform/SQLiteDdl.java     |   8 +-
 .../ddlgeneration/platform/SplitColumns.java  |  12 +++
 .../ddlgeneration/platform/SqlServerDdl.java  |   9 +-
 .../platform/WriteForeignKey.java             | 100 ++++++++++++++++++
 .../dbmigration/migration/AlterColumn.java    |  51 ++++++++-
 .../dbmigration/migration/Column.java         |  51 ++++++++-
 .../dbmigration/migration/ForeignKey.java     |  47 +++++++-
 .../dbmigration/model/MColumn.java            |  28 ++++-
 .../build/ModelBuildPropertyVisitor.java      |  26 +++--
 .../server/deploy/BeanDescriptorManager.java  |  15 ++-
 .../server/deploy/BeanPropertyAssocOne.java   |  15 +++
 .../server/deploy/PropertyForeignKey.java     |  35 ++++++
 .../meta/DeployBeanPropertyAssocOne.java      |  12 +++
 .../deploy/parse/AnnotationAssocOnes.java     |   7 ++
 src/main/resources/ebean-dbmigration-1.0.xsd  |   6 ++
 .../platform/Oracle10DdlTest.java             |  54 ++++++++++
 .../org/tests/cascade/TestOrderedList.java    |   7 +-
 src/test/java/org/tests/ddl/DfkCascade.java   |  50 +++++++++
 .../java/org/tests/ddl/DfkCascadeOne.java     |  47 ++++++++
 src/test/java/org/tests/ddl/DfkNone.java      |  49 +++++++++
 src/test/java/org/tests/ddl/DfkOne.java       |  33 ++++++
 src/test/java/org/tests/ddl/DfkSetNull.java   |  50 +++++++++
 .../org/tests/ddl/TestForeignKeyModes.java    |  77 ++++++++++++++
 .../onetoone/TestOneToOnePrimaryKeyJoin.java  |   4 +-
 .../TestOneToOnePrimaryKeyJoinBidi.java       |   4 +-
 .../TestOneToOnePrimaryKeyJoinOptional.java   |   4 +-
 .../java/org/tests/update/EPersonOnline.java  |  11 +-
 .../org/tests/update/TestSqlUpdateUpsert.java |  24 ++---
 31 files changed, 868 insertions(+), 133 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SplitColumns.java
 create mode 100644 src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteForeignKey.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/PropertyForeignKey.java
 create mode 100644 src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Oracle10DdlTest.java
 create mode 100644 src/test/java/org/tests/ddl/DfkCascade.java
 create mode 100644 src/test/java/org/tests/ddl/DfkCascadeOne.java
 create mode 100644 src/test/java/org/tests/ddl/DfkNone.java
 create mode 100644 src/test/java/org/tests/ddl/DfkOne.java
 create mode 100644 src/test/java/org/tests/ddl/DfkSetNull.java
 create mode 100644 src/test/java/org/tests/ddl/TestForeignKeyModes.java

diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
index 80da05f97..8969e7c7d 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
@@ -389,14 +389,7 @@ public class BaseTableDdl implements TableDdl {
 
   protected void writeInlineForeignKey(DdlWrite write, Column column) throws IOException {
 
-    String references = column.getReferences();
-    int pos = references.lastIndexOf('.');
-    if (pos == -1) {
-      throw new IllegalStateException("Expecting period '.' character for table.column split but not found in [" + references + "]");
-    }
-    String refTableName = references.substring(0, pos);
-    String refColumnName = references.substring(pos + 1);
-    String fkConstraint = platformDdl.tableInlineForeignKey(new String[]{column.getName()}, refTableName, new String[]{refColumnName});
+    String fkConstraint = platformDdl.tableInlineForeignKey(new WriteForeignKey(null, column));
     write.apply().append(",").newLine().append("  ").append(fkConstraint);
   }
 
@@ -404,11 +397,7 @@ public class BaseTableDdl implements TableDdl {
 
     List<ForeignKey> foreignKey = createTable.getForeignKey();
     for (ForeignKey key : foreignKey) {
-      String refTableName = key.getRefTableName();
-      String[] cols = toColumnNamesSplit(key.getColumnNames());
-      String[] refColumns = toColumnNamesSplit(key.getRefColumnNames());
-
-      String fkConstraint = platformDdl.tableInlineForeignKey(cols, refTableName, refColumns);
+      String fkConstraint = platformDdl.tableInlineForeignKey(new WriteForeignKey(null, key));
       write.apply().append(",").newLine().append("  ").append(fkConstraint);
     }
   }
@@ -433,61 +422,42 @@ public class BaseTableDdl implements TableDdl {
 
     List<ForeignKey> foreignKey = createTable.getForeignKey();
     for (ForeignKey key : foreignKey) {
-
-      String refTableName = key.getRefTableName();
-      String fkName = key.getName();
-      String[] cols = toColumnNamesSplit(key.getColumnNames());
-      String[] refColumns = toColumnNamesSplit(key.getRefColumnNames());
-
-      writeForeignKey(write, fkName, tableName, cols, refTableName, refColumns, key.getIndexName());
+      writeForeignKey(write, new WriteForeignKey(tableName, key));
     }
   }
 
   protected void writeForeignKey(DdlWrite write, String tableName, Column column) throws IOException {
-
-    String fkName = column.getForeignKeyName();
-    String references = column.getReferences();
-    int pos = references.lastIndexOf('.');
-    if (pos == -1) {
-      throw new IllegalStateException("Expecting period '.' character for table.column split but not found in [" + references + "]");
-    }
-    String refTableName = references.substring(0, pos);
-    String refColumnName = references.substring(pos + 1);
-
-    String[] cols = {column.getName()};
-    String[] refCols = {refColumnName};
-
-    writeForeignKey(write, fkName, tableName, cols, refTableName, refCols, column.getForeignKeyIndex());
+    writeForeignKey(write, new WriteForeignKey(tableName, column));
   }
 
-  protected void writeForeignKey(DdlWrite write, String fkName, String tableName, String[] columns, String refTable, String[] refColumns, String indexName) throws IOException {
+  protected void writeForeignKey(DdlWrite write, WriteForeignKey request) throws IOException {
 
-    tableName = lowerTableName(tableName);
+    String tableName = lowerTableName(request.table());
     DdlBuffer fkeyBuffer = write.applyForeignKeys();
-    alterTableAddForeignKey(fkeyBuffer, fkName, tableName, columns, refTable, refColumns);
+    alterTableAddForeignKey(fkeyBuffer, request);
 
-    if (indexName != null) {
+    if (request.indexName() != null) {
       // no matching unique constraint so add the index
-      fkeyBuffer.append(platformDdl.createIndex(indexName, tableName, columns)).endOfStatement();
+      fkeyBuffer.append(platformDdl.createIndex(request.indexName(), tableName, request.cols())).endOfStatement();
     }
 
     fkeyBuffer.end();
 
     write.dropAllForeignKeys()
-      .append(platformDdl.alterTableDropForeignKey(tableName, fkName)).endOfStatement();
+      .append(platformDdl.alterTableDropForeignKey(tableName, request.fkName())).endOfStatement();
 
-    if (indexName != null) {
+    if (request.indexName() != null) {
       write.dropAllForeignKeys()
-        .append(platformDdl.dropIndex(indexName, tableName)).endOfStatement();
+        .append(platformDdl.dropIndex(request.indexName(), tableName)).endOfStatement();
     }
 
     write.dropAllForeignKeys().end();
 
   }
 
-  protected void alterTableAddForeignKey(DdlBuffer buffer, String fkName, String tableName, String[] columns, String refTable, String[] refColumns) throws IOException {
+  protected void alterTableAddForeignKey(DdlBuffer buffer, WriteForeignKey request) throws IOException {
 
-    String fkConstraint = platformDdl.alterTableAddForeignKey(tableName, fkName, columns, refTable, refColumns);
+    String fkConstraint = platformDdl.alterTableAddForeignKey(request);
     if (fkConstraint != null && !fkConstraint.isEmpty()) {
       buffer.append(fkConstraint).endOfStatement();
     }
@@ -554,7 +524,7 @@ public class BaseTableDdl implements TableDdl {
     for (UniqueConstraint uniqueConstraint : uniqueConstraints) {
        if (inlineUniqueWhenNull) {
         String uqName = uniqueConstraint.getName();
-        String[] columns = toColumnNamesSplit(uniqueConstraint.getColumnNames());
+        String[] columns = SplitColumns.split(uniqueConstraint.getColumnNames());
         apply.append(",").newLine();
         apply.append("  constraint ").append(uqName).append(" unique");
         appendColumns(columns, apply);
@@ -625,13 +595,6 @@ public class BaseTableDdl implements TableDdl {
     return cols;
   }
 
-  /**
-   * Return as an array of string column names.
-   */
-  protected String[] toColumnNamesSplit(String columns) {
-    return columns.split(",");
-  }
-
   /**
    * Convert the table lower case.
    */
@@ -662,7 +625,7 @@ public class BaseTableDdl implements TableDdl {
   @Override
   public void generate(DdlWrite writer, CreateIndex createIndex) throws IOException {
 
-    String[] cols = toColumnNamesSplit(createIndex.getColumns());
+    String[] cols = SplitColumns.split(createIndex.getColumns());
     writer.apply()
       .append(platformDdl.createIndex(createIndex.getIndexName(), createIndex.getTableName(), cols))
       .endOfStatement();
@@ -931,22 +894,9 @@ public class BaseTableDdl implements TableDdl {
     }
   }
 
-
   protected void alterColumnAddForeignKey(DdlWrite writer, AlterColumn alterColumn) throws IOException {
 
-    String tableName = alterColumn.getTableName();
-    String fkName = alterColumn.getForeignKeyName();
-    String[] cols = {alterColumn.getColumnName()};
-    String references = alterColumn.getReferences();
-    int pos = references.lastIndexOf('.');
-    if (pos == -1) {
-      throw new IllegalStateException("Expecting period '.' character for table.column split but not found in [" + references + "]");
-    }
-    String refTableName = references.substring(0, pos);
-    String refColumnName = references.substring(pos + 1);
-    String[] refCols = {refColumnName};
-
-    alterTableAddForeignKey(writer.apply(), fkName, tableName, cols, refTableName, refCols);
+    alterTableAddForeignKey(writer.apply(), new WriteForeignKey(alterColumn));
   }
 
   protected void alterColumnDropForeignKey(DdlWrite writer, AlterColumn alter) throws IOException {
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Oracle10Ddl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Oracle10Ddl.java
index 2e4ae9b9c..2071a94e2 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Oracle10Ddl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Oracle10Ddl.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
+import io.ebean.annotation.ConstraintMode;
 import io.ebean.config.dbplatform.DatabasePlatform;
 
 /**
@@ -14,7 +15,6 @@ public class Oracle10Ddl extends PlatformDdl {
     this.dropConstraintIfExists = "drop constraint";
     this.dropIndexIfExists = "drop index ";
     this.dropTableCascade = " cascade constraints purge";
-    this.foreignKeyRestrict = "";
     this.alterColumn = "modify";
     this.columnSetNotnull = "not null";
     this.columnSetNull = "null";
@@ -22,4 +22,20 @@ public class Oracle10Ddl extends PlatformDdl {
     this.identitySuffix = " generated always as identity";
   }
 
+  @Override
+  protected void appendForeignKeyOnUpdate(StringBuilder buffer, ConstraintMode mode) {
+    // do nothing, no on update clause for oracle
+  }
+
+  @Override
+  protected void appendForeignKeyMode(StringBuilder buffer, String onMode, ConstraintMode mode) {
+    switch (mode) {
+      case SET_NULL:
+      case CASCADE:
+        super.appendForeignKeyMode(buffer, onMode, mode);
+      default:
+        // do nothing, defaults to RESTRICT effectively
+    }
+  }
+
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
index c870608f2..3088e49c1 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -1,11 +1,13 @@
 package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
+import io.ebean.annotation.ConstraintMode;
 import io.ebean.config.DbConstraintNaming;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbDefaultValue;
 import io.ebean.config.dbplatform.DbIdentity;
 import io.ebean.config.dbplatform.IdType;
+import io.ebean.util.StringHelper;
 import io.ebeaninternal.dbmigration.ddlgeneration.BaseDdlHandler;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler;
@@ -17,7 +19,6 @@ import io.ebeaninternal.dbmigration.migration.Column;
 import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
 import io.ebeaninternal.dbmigration.migration.IdentityType;
 import io.ebeaninternal.dbmigration.model.MTable;
-import io.ebean.util.StringHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -62,7 +63,8 @@ public class PlatformDdl {
    */
   protected String dropSequenceIfExists = "drop sequence if exists ";
 
-  protected String foreignKeyRestrict = "on delete restrict on update restrict";
+  protected String foreignKeyOnDelete = "on delete";
+  protected String foreignKeyOnUpdate = "on update";
 
   protected String identitySuffix = " auto_increment";
 
@@ -351,37 +353,68 @@ public class PlatformDdl {
   /**
    * Return the foreign key constraint when used inline with create table.
    */
-  public String tableInlineForeignKey(String[] columns, String refTable, String[] refColumns) {
+  public String tableInlineForeignKey(WriteForeignKey request) {
 
     StringBuilder buffer = new StringBuilder(90);
     buffer.append("foreign key");
-    appendColumns(columns, buffer);
-    buffer.append(" references ").append(lowerTableName(refTable));
-    appendColumns(refColumns, buffer);
-    appendWithSpace(foreignKeyRestrict, buffer);
+    appendColumns(request.cols(), buffer);
+    buffer.append(" references ").append(lowerTableName(request.refTable()));
+    appendColumns(request.refCols(), buffer);
+    appendForeignKeySuffix(request, buffer);
     return buffer.toString();
   }
 
   /**
    * Add foreign key.
    */
-  public String alterTableAddForeignKey(String tableName, String fkName, String[] columns, String refTable, String[] refColumns) {
+  public String alterTableAddForeignKey(WriteForeignKey request) {
 
     StringBuilder buffer = new StringBuilder(90);
     buffer
-      .append("alter table ").append(tableName)
-      .append(" add constraint ").append(fkName)
+      .append("alter table ").append(lowerTableName(request.table()))
+      .append(" add constraint ").append(request.fkName())
       .append(" foreign key");
-    appendColumns(columns, buffer);
+    appendColumns(request.cols(), buffer);
     buffer
       .append(" references ")
-      .append(lowerTableName(refTable));
-    appendColumns(refColumns, buffer);
-    appendWithSpace(foreignKeyRestrict, buffer);
-
+      .append(lowerTableName(request.refTable()));
+    appendColumns(request.refCols(), buffer);
+    appendForeignKeySuffix(request, buffer);
     return buffer.toString();
   }
 
+  protected void appendForeignKeySuffix(WriteForeignKey request, StringBuilder buffer) {
+    appendForeignKeyOnDelete(buffer, withDefault(request.onDelete()));
+    appendForeignKeyOnUpdate(buffer, withDefault(request.onDelete()));
+  }
+
+  protected ConstraintMode withDefault(ConstraintMode mode) {
+    return (mode == null || mode == ConstraintMode.GLOBAL_DEFAULT) ? ConstraintMode.RESTRICT : mode;
+  }
+
+  protected void appendForeignKeyOnDelete(StringBuilder buffer, ConstraintMode mode) {
+    appendForeignKeyMode(buffer, foreignKeyOnDelete, mode);
+  }
+
+  protected void appendForeignKeyOnUpdate(StringBuilder buffer, ConstraintMode mode) {
+    appendForeignKeyMode(buffer, foreignKeyOnUpdate, mode);
+  }
+
+  protected void appendForeignKeyMode(StringBuilder buffer, String onMode, ConstraintMode mode) {
+    buffer.append(" ").append(onMode).append(" ").append(translate(mode));
+  }
+
+  protected String translate(ConstraintMode mode) {
+    switch(mode) {
+      case SET_NULL: return "set null";
+      case SET_DEFAULT: return "set default";
+      case RESTRICT: return "restrict";
+      case CASCADE: return "cascade";
+      default:
+        throw new IllegalStateException("Unknown mode "+mode);
+    }
+  }
+
   /**
    * Drop a unique constraint from the table (Sometimes this is an index).
    */
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SQLiteDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SQLiteDdl.java
index 0f555d097..bd2b41830 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SQLiteDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SQLiteDdl.java
@@ -3,8 +3,6 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
 
-import java.io.IOException;
-
 /**
  * DB2 platform specific DDL.
  */
@@ -17,17 +15,17 @@ public class SQLiteDdl extends PlatformDdl {
   }
 
   @Override
-  public void addTableComment(DdlBuffer apply, String tableName, String tableComment) throws IOException {
+  public void addTableComment(DdlBuffer apply, String tableName, String tableComment) {
     // not supported
   }
 
   @Override
-  public void addColumnComment(DdlBuffer apply, String table, String column, String comment) throws IOException {
+  public void addColumnComment(DdlBuffer apply, String table, String column, String comment) {
     // not supported
   }
 
   @Override
-  public String alterTableAddForeignKey(String tableName, String fkName, String[] columns, String refTable, String[] refColumns) {
+  public String alterTableAddForeignKey(WriteForeignKey request) {
     // not supported
     return null;
   }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SplitColumns.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SplitColumns.java
new file mode 100644
index 000000000..a1c83c4e2
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SplitColumns.java
@@ -0,0 +1,12 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+public class SplitColumns {
+
+  /**
+   * Return as an array of string column names.
+   */
+  public static String[] split(String columns) {
+    return columns.split(",");
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
index 5fd7d9175..16b541d88 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
+import io.ebean.annotation.ConstraintMode;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
 import io.ebeaninternal.dbmigration.migration.AlterColumn;
@@ -14,7 +15,6 @@ public class SqlServerDdl extends PlatformDdl {
   public SqlServerDdl(DatabasePlatform platform) {
     super(platform);
     this.identitySuffix = " identity(1,1)";
-    this.foreignKeyRestrict = "";
     this.alterTableIfExists = "";
     this.addColumn = "add";
     this.inlineUniqueWhenNullable = false;
@@ -23,6 +23,13 @@ public class SqlServerDdl extends PlatformDdl {
     this.historyDdl = new SqlServerHistoryDdl();
   }
 
+  @Override
+  protected void appendForeignKeyMode(StringBuilder buffer, String onMode, ConstraintMode mode) {
+    if (mode != ConstraintMode.RESTRICT) {
+      super.appendForeignKeyMode(buffer, onMode, mode);
+    }
+  }
+
   @Override
   public String dropTable(String tableName) {
     StringBuilder buffer = new StringBuilder();
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteForeignKey.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteForeignKey.java
new file mode 100644
index 000000000..f9fab239d
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteForeignKey.java
@@ -0,0 +1,100 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+import io.ebean.annotation.ConstraintMode;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.Column;
+import io.ebeaninternal.dbmigration.migration.ForeignKey;
+
+class WriteForeignKey {
+
+  private final String fkName;
+  private final String tableName;
+  private final String[] cols;
+  private String refTableName;
+  private String[] refCols;
+  private final String indexName;
+  private final ConstraintMode onDelete;
+  private final ConstraintMode onUpdate;
+
+  WriteForeignKey(AlterColumn alterColumn) {
+    this.tableName = alterColumn.getTableName();
+    this.indexName = alterColumn.getForeignKeyIndex();
+    this.fkName = alterColumn.getForeignKeyName();
+    this.cols = new String[]{alterColumn.getColumnName()};
+    setReferences(alterColumn.getReferences());
+    this.onDelete = modeOf(alterColumn.getForeignKeyOnDelete());
+    this.onUpdate = modeOf(alterColumn.getForeignKeyOnUpdate());
+  }
+
+  WriteForeignKey(String tableName, ForeignKey key) {
+    this.tableName = tableName;
+    this.indexName = key.getIndexName();
+    this.fkName = key.getName();
+    this.cols = toCols(key.getColumnNames());
+    this.refTableName = key.getRefTableName();
+    this.refCols = toCols(key.getRefColumnNames());
+    this.onDelete = modeOf(key.getOnDelete());
+    this.onUpdate = modeOf(key.getOnUpdate());
+  }
+
+  WriteForeignKey(String tableName, Column column) {
+    this.tableName = tableName;
+    this.indexName = column.getForeignKeyIndex();
+    this.fkName = column.getForeignKeyName();
+    this.cols = new String[]{column.getName()};
+    setReferences(column.getReferences());
+    this.onDelete = modeOf(column.getForeignKeyOnDelete());
+    this.onUpdate = modeOf(column.getForeignKeyOnUpdate());
+  }
+
+  private void setReferences(String references) {
+    int pos = references.lastIndexOf('.');
+    if (pos == -1) {
+      throw new IllegalStateException("Expecting period '.' character for table.column split but not found in [" + references + "]");
+    }
+    this.refTableName = references.substring(0, pos);
+    String refColumnName = references.substring(pos + 1);
+    this.refCols = new String[]{refColumnName};
+  }
+
+  private String[] toCols(String columns) {
+    return SplitColumns.split(columns);
+  }
+
+  private ConstraintMode modeOf(String value) {
+    return (value == null) ? null : ConstraintMode.valueOf(value);
+  }
+
+  public String table() {
+    return tableName;
+  }
+
+  public String[] cols() {
+    return cols;
+  }
+
+  public String indexName() {
+    return indexName;
+  }
+
+  public String fkName() {
+    return fkName;
+  }
+
+  public String refTable() {
+    return refTableName;
+  }
+
+  public String[] refCols() {
+    return refCols;
+  }
+
+  public ConstraintMode onDelete() {
+    return onDelete;
+  }
+
+  public ConstraintMode onUpdate() {
+    return onUpdate;
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java b/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java
index 4e2ab2b02..47f9a413b 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java
@@ -1,14 +1,13 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
 
 
 /**
@@ -40,6 +39,8 @@ import javax.xml.bind.annotation.XmlType;
  *       &lt;attribute name="references" type="{http://www.w3.org/2001/XMLSchema}string" />
  *       &lt;attribute name="foreignKeyName" type="{http://www.w3.org/2001/XMLSchema}string" />
  *       &lt;attribute name="foreignKeyIndex" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="foreignKeyOnDelete" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="foreignKeyOnUpdate" type="{http://www.w3.org/2001/XMLSchema}string" />
  *       &lt;attribute name="dropForeignKey" type="{http://www.w3.org/2001/XMLSchema}string" />
  *       &lt;attribute name="dropForeignKeyIndex" type="{http://www.w3.org/2001/XMLSchema}string" />
  *     &lt;/restriction>
@@ -99,6 +100,10 @@ public class AlterColumn {
   protected String foreignKeyName;
   @XmlAttribute(name = "foreignKeyIndex")
   protected String foreignKeyIndex;
+  @XmlAttribute(name = "foreignKeyOnDelete")
+  protected String foreignKeyOnDelete;
+  @XmlAttribute(name = "foreignKeyOnUpdate")
+  protected String foreignKeyOnUpdate;
   @XmlAttribute(name = "dropForeignKey")
   protected String dropForeignKey;
   @XmlAttribute(name = "dropForeignKeyIndex")
@@ -504,6 +509,46 @@ public class AlterColumn {
     this.foreignKeyIndex = value;
   }
 
+  /**
+   * Gets the value of the foreignKeyOnDelete property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getForeignKeyOnDelete() {
+    return foreignKeyOnDelete;
+  }
+
+  /**
+   * Sets the value of the foreignKeyOnDelete property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setForeignKeyOnDelete(String value) {
+    this.foreignKeyOnDelete = value;
+  }
+
+  /**
+   * Gets the value of the foreignKeyOnUpdate property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getForeignKeyOnUpdate() {
+    return foreignKeyOnUpdate;
+  }
+
+  /**
+   * Sets the value of the foreignKeyOnUpdate property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setForeignKeyOnUpdate(String value) {
+    this.foreignKeyOnUpdate = value;
+  }
+
   /**
    * Gets the value of the dropForeignKey property.
    *
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java b/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java
index a2385b2a9..0aefdfbc8 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java
@@ -1,14 +1,13 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
 
 
 /**
@@ -34,6 +33,8 @@ import javax.xml.bind.annotation.XmlType;
  *       &lt;attribute name="references" type="{http://www.w3.org/2001/XMLSchema}string" />
  *       &lt;attribute name="foreignKeyName" type="{http://www.w3.org/2001/XMLSchema}string" />
  *       &lt;attribute name="foreignKeyIndex" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="foreignKeyOnDelete" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="foreignKeyOnUpdate" type="{http://www.w3.org/2001/XMLSchema}string" />
  *       &lt;attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
  *     &lt;/restriction>
  *   &lt;/complexContent>
@@ -80,6 +81,10 @@ public class Column {
   protected String foreignKeyName;
   @XmlAttribute(name = "foreignKeyIndex")
   protected String foreignKeyIndex;
+  @XmlAttribute(name = "foreignKeyOnDelete")
+  protected String foreignKeyOnDelete;
+  @XmlAttribute(name = "foreignKeyOnUpdate")
+  protected String foreignKeyOnUpdate;
   @XmlAttribute(name = "comment")
   protected String comment;
 
@@ -378,6 +383,46 @@ public class Column {
     this.foreignKeyIndex = value;
   }
 
+  /**
+   * Gets the value of the foreignOnDelete property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getForeignKeyOnDelete() {
+    return foreignKeyOnDelete;
+  }
+
+  /**
+   * Sets the value of the foreignKeyOnDelete property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setForeignKeyOnDelete(String value) {
+    this.foreignKeyOnDelete = value;
+  }
+
+  /**
+   * Gets the value of the foreignOnUpdate property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getForeignKeyOnUpdate() {
+    return foreignKeyOnUpdate;
+  }
+
+  /**
+   * Sets the value of the foreignKeyOnUpdate property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setForeignKeyOnUpdate(String value) {
+    this.foreignKeyOnUpdate = value;
+  }
+
   /**
    * Gets the value of the comment property.
    *
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java b/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java
index 8aa3763d3..37d314207 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java
@@ -21,6 +21,8 @@ import javax.xml.bind.annotation.XmlType;
  *       &lt;attribute name="refColumnNames" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
  *       &lt;attribute name="refTableName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
  *       &lt;attribute name="indexName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="onDelete" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="onUpdate" type="{http://www.w3.org/2001/XMLSchema}string" />
  *     &lt;/restriction>
  *   &lt;/complexContent>
  * &lt;/complexType>
@@ -41,7 +43,10 @@ public class ForeignKey {
   protected String refTableName;
   @XmlAttribute(name = "indexName")
   protected String indexName;
-
+  @XmlAttribute(name = "onDelete")
+  protected String onDelete;
+  @XmlAttribute(name = "onUpdate")
+  protected String onUpdate;
   /**
    * Gets the value of the name property.
    *
@@ -142,4 +147,44 @@ public class ForeignKey {
     this.indexName = value;
   }
 
+  /**
+   * Gets the value of the onDelete property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getOnDelete() {
+    return onDelete;
+  }
+
+  /**
+   * Sets the value of the onDelete property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setOnDelete(String value) {
+    this.onDelete = value;
+  }
+
+  /**
+   * Gets the value of the onUpdate property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getOnUpdate() {
+    return onUpdate;
+  }
+
+  /**
+   * Sets the value of the onUpdate property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setOnUpdate(String value) {
+    this.onUpdate = value;
+  }
+
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java b/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java
index 1ed8ff067..f9eb80a8c 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java
@@ -1,13 +1,14 @@
 package io.ebeaninternal.dbmigration.model;
 
-import java.util.List;
-
+import io.ebean.annotation.ConstraintMode;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.DdlHelp;
 import io.ebeaninternal.dbmigration.migration.AlterColumn;
 import io.ebeaninternal.dbmigration.migration.Column;
 import io.ebeaninternal.dbmigration.migration.DdlScript;
 import io.ebeaninternal.server.deploy.DbMigrationInfo;
 
+import java.util.List;
+
 /**
  * A column in the logical model.
  */
@@ -21,6 +22,8 @@ public class MColumn {
   private String references;
   private String foreignKeyName;
   private String foreignKeyIndex;
+  private ConstraintMode fkeyOnDelete;
+  private ConstraintMode fkeyOnUpdate;
   private String comment;
 
   private boolean historyExclude;
@@ -55,6 +58,8 @@ public class MColumn {
     this.references = column.getReferences();
     this.foreignKeyName = column.getForeignKeyName();
     this.foreignKeyIndex = column.getForeignKeyIndex();
+    this.fkeyOnDelete = fkeyMode(column.getForeignKeyOnDelete());
+    this.fkeyOnUpdate = fkeyMode(column.getForeignKeyOnUpdate());
     this.notnull = Boolean.TRUE.equals(column.isNotnull());
     this.primaryKey = Boolean.TRUE.equals(column.isPrimaryKey());
     this.identity = Boolean.TRUE.equals(column.isIdentity());
@@ -63,6 +68,10 @@ public class MColumn {
     this.historyExclude = Boolean.TRUE.equals(column.isHistoryExclude());
   }
 
+  private ConstraintMode fkeyMode(String mode) {
+    return (mode == null) ? null : ConstraintMode.valueOf(mode);
+  }
+
   public MColumn(String name, String type) {
     this.name = name;
     this.type = type;
@@ -89,6 +98,8 @@ public class MColumn {
     copy.comment = comment;
     copy.foreignKeyName = foreignKeyName;
     copy.foreignKeyIndex = foreignKeyIndex;
+    copy.fkeyOnUpdate = fkeyOnUpdate;
+    copy.fkeyOnDelete = fkeyOnDelete;
     copy.historyExclude = historyExclude;
     copy.notnull = notnull;
     copy.primaryKey = primaryKey;
@@ -154,6 +165,11 @@ public class MColumn {
     this.foreignKeyIndex = foreignKeyIndex;
   }
 
+  public void setForeignKeyModes(ConstraintMode onDelete, ConstraintMode onUpdate) {
+    this.fkeyOnDelete = onDelete;
+    this.fkeyOnUpdate = onUpdate;
+  }
+
   public String getDefaultValue() {
     return defaultValue;
   }
@@ -196,7 +212,7 @@ public class MColumn {
 
   /**
    * Set unique specifically for OneToOne mapping.
-   * We need special DDL for this case for MsSqlServer.
+   * We need special DDL for this case for SqlServer.
    */
   public void setUniqueOneToOne(String uniqueOneToOne) {
     this.uniqueOneToOne = uniqueOneToOne;
@@ -260,6 +276,8 @@ public class MColumn {
     c.setReferences(references);
     c.setForeignKeyName(foreignKeyName);
     c.setForeignKeyIndex(foreignKeyIndex);
+    c.setForeignKeyOnDelete(fkeyModeOf(fkeyOnDelete));
+    c.setForeignKeyOnUpdate(fkeyModeOf(fkeyOnUpdate));
     c.setDefaultValue(defaultValue);
     c.setComment(comment);
     c.setUnique(unique);
@@ -286,6 +304,10 @@ public class MColumn {
     return c;
   }
 
+  private String fkeyModeOf(ConstraintMode mode) {
+    return (mode == null) ? null : mode.name();
+  }
+
   protected static boolean different(String val1, String val2) {
     return (val1 == null) ? val2 != null : !val1.equals(val2);
   }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
index ba90cdd1c..b5b631458 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
@@ -11,6 +11,7 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 import io.ebeaninternal.server.deploy.IndexDefinition;
 import io.ebeaninternal.server.deploy.InheritInfo;
+import io.ebeaninternal.server.deploy.PropertyForeignKey;
 import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.deploy.TableJoinColumn;
 import io.ebeaninternal.server.deploy.id.ImportedId;
@@ -156,6 +157,8 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
 
     List<MColumn> modelColumns = new ArrayList<>(columns.length);
 
+    PropertyForeignKey foreignKey = p.getForeignKey();
+
     MCompoundForeignKey compoundKey = null;
     if (columns.length > 1) {
       // compound foreign key
@@ -180,15 +183,22 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
       col.setDbMigrationInfos(p.getDbMigrationInfos());
       col.setDefaultValue(p.getDbColumnDefault());
       if (columns.length == 1) {
-        // single references column (put it on the column)
-        String refTable = importedProperty.getBeanDescriptor().getBaseTable();
-        if (refTable == null) {
-          // odd case where an EmbeddedId only has 1 property
-          refTable = p.getTargetDescriptor().getBaseTable();
+        if (p.hasForeignKey()) {
+          // single references column (put it on the column)
+          String refTable = importedProperty.getBeanDescriptor().getBaseTable();
+          if (refTable == null) {
+            // odd case where an EmbeddedId only has 1 property
+            refTable = p.getTargetDescriptor().getBaseTable();
+          }
+          col.setReferences(refTable + "." + refColumn);
+          col.setForeignKeyName(determineForeignKeyConstraintName(col.getName()));
+          if (p.hasForeignKeyIndex()) {
+            col.setForeignKeyIndex(determineForeignKeyIndexName(col.getName()));
+          }
+          if (foreignKey != null) {
+            col.setForeignKeyModes(foreignKey.getOnDelete(), foreignKey.getOnUpdate());
+          }
         }
-        col.setReferences(refTable + "." + refColumn);
-        col.setForeignKeyName(determineForeignKeyConstraintName(col.getName()));
-        col.setForeignKeyIndex(determineForeignKeyIndexName(col.getName()));
       } else {
         compoundKey.addColumnPair(dbCol, refColumn);
       }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index d523bb739..134d4c3e6 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.deploy;
 import io.ebean.BackgroundExecutor;
 import io.ebean.Model;
 import io.ebean.RawSqlBuilder;
+import io.ebean.annotation.ConstraintMode;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebean.config.EncryptKey;
@@ -1156,7 +1157,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     // get the mappedBy property
     DeployBeanProperty mappedProp = targetDesc.getBeanProperty(mappedBy);
     if (mappedProp == null) {
-
       String m = "Error on " + prop.getFullBeanName();
       m += "  Can not find mappedBy property [" + mappedBy + "] ";
       m += "in [" + targetDesc + "]";
@@ -1179,6 +1179,19 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
       otherTableJoin.copyTo(tableJoin, true, tableJoin.getTable());
     }
 
+    PropertyForeignKey foreignKey = mappedAssocOne.getForeignKey();
+    if (foreignKey != null) {
+      ConstraintMode onDelete = foreignKey.getOnDelete();
+      switch (onDelete) {
+        case SET_DEFAULT:
+        case SET_NULL:
+        case CASCADE: {
+          // turn off cascade delete when we are using the foreign
+          // key constraint to cascade the delete or set null
+          prop.getCascadeInfo().setDelete(false);
+        }
+      }
+    }
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index 2bc1bd27c..04e953aca 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -41,6 +41,8 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
 
   private final boolean primaryKeyExport;
 
+  private final PropertyForeignKey foreignKey;
+
   private AssocOneHelp localHelp;
 
   protected final BeanProperty[] embeddedProps;
@@ -69,6 +71,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
 
     super(descriptor, deploy);
 
+    foreignKey = deploy.getForeignKey();
     primaryKeyExport = deploy.isPrimaryKeyExport();
     importedPrimaryKey = deploy.isImportedPrimaryKey();
     oneToOne = deploy.isOneToOne();
@@ -309,6 +312,18 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
     }
   }
 
+  public PropertyForeignKey getForeignKey() {
+    return foreignKey;
+  }
+
+  public boolean hasForeignKey() {
+    return foreignKey == null || !foreignKey.isNoConstraint();
+  }
+
+  public boolean hasForeignKeyIndex() {
+    return foreignKey == null || !foreignKey.isNoIndex();
+  }
+
   /**
    * Return true if this a OneToOne property. Otherwise assumed ManyToOne.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/PropertyForeignKey.java b/src/main/java/io/ebeaninternal/server/deploy/PropertyForeignKey.java
new file mode 100644
index 000000000..ab5b75111
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/PropertyForeignKey.java
@@ -0,0 +1,35 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebean.annotation.ConstraintMode;
+import io.ebean.annotation.DbForeignKey;
+
+public class PropertyForeignKey {
+
+  private final boolean noIndex;
+  private final boolean noConstraint;
+  private final ConstraintMode onDelete;
+  private final ConstraintMode onUpdate;
+
+  public PropertyForeignKey(DbForeignKey dbForeignKey) {
+    this.noIndex = dbForeignKey.noIndex();
+    this.noConstraint = dbForeignKey.noConstraint();
+    this.onDelete = dbForeignKey.onDelete();
+    this.onUpdate = dbForeignKey.onUpdate();
+  }
+
+  public boolean isNoIndex() {
+    return noIndex;
+  }
+
+  public boolean isNoConstraint() {
+    return noConstraint;
+  }
+
+  public ConstraintMode getOnDelete() {
+    return onDelete;
+  }
+
+  public ConstraintMode getOnUpdate() {
+    return onUpdate;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
index 9e257def2..93c57efb7 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.deploy.meta;
 
+import io.ebeaninternal.server.deploy.PropertyForeignKey;
+
 import javax.persistence.CascadeType;
 
 /**
@@ -21,6 +23,8 @@ public class DeployBeanPropertyAssocOne<T> extends DeployBeanPropertyAssoc<T> {
 
   private String columnPrefix;
 
+  private PropertyForeignKey foreignKey;
+
   /**
    * Create the property.
    */
@@ -148,4 +152,12 @@ public class DeployBeanPropertyAssocOne<T> extends DeployBeanPropertyAssoc<T> {
       cascadeInfo.setType(CascadeType.ALL);
     }
   }
+
+  public void setForeignKey(PropertyForeignKey foreignKey) {
+    this.foreignKey = foreignKey;
+  }
+
+  public PropertyForeignKey getForeignKey() {
+    return foreignKey;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index 4e5b04e36..6294c5e82 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -1,10 +1,12 @@
 package io.ebeaninternal.server.deploy.parse;
 
+import io.ebean.annotation.DbForeignKey;
 import io.ebean.annotation.FetchPreference;
 import io.ebean.annotation.Where;
 import io.ebean.config.NamingConvention;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
 import io.ebeaninternal.server.deploy.BeanTable;
+import io.ebeaninternal.server.deploy.PropertyForeignKey;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
@@ -89,6 +91,11 @@ public class AnnotationAssocOnes extends AnnotationParser {
       prop.setNullable(false);
     }
 
+    DbForeignKey dbForeignKey = get(prop, DbForeignKey.class);
+    if (dbForeignKey != null){
+      prop.setForeignKey(new PropertyForeignKey(dbForeignKey));
+    }
+
     Where where = get(prop, Where.class);
     if (where != null) {
       // not expecting this to be used on assoc one properties
diff --git a/src/main/resources/ebean-dbmigration-1.0.xsd b/src/main/resources/ebean-dbmigration-1.0.xsd
index 4233f28ef..ade3fc9a7 100644
--- a/src/main/resources/ebean-dbmigration-1.0.xsd
+++ b/src/main/resources/ebean-dbmigration-1.0.xsd
@@ -136,6 +136,8 @@
       <xsd:attribute name="refColumnNames" type="xsd:string" use="required"/>
       <xsd:attribute name="refTableName" type="xsd:string" use="required"/>
       <xsd:attribute name="indexName" type="xsd:string"/>
+      <xsd:attribute name="onDelete" type="xsd:string"/>
+      <xsd:attribute name="onUpdate" type="xsd:string"/>
     </xsd:complexType>
   </xsd:element>
 
@@ -221,6 +223,8 @@
       <xsd:attribute name="references" type="xsd:string"/>
       <xsd:attribute name="foreignKeyName" type="xsd:string"/>
       <xsd:attribute name="foreignKeyIndex" type="xsd:string"/>
+      <xsd:attribute name="foreignOnDelete" type="xsd:string"/>
+      <xsd:attribute name="foreignOnUpdate" type="xsd:string"/>
       <xsd:attribute name="dropForeignKey" type="xsd:string"/>
       <xsd:attribute name="dropForeignKeyIndex" type="xsd:string"/>
     </xsd:complexType>
@@ -271,6 +275,8 @@
       <xsd:attribute name="references" type="xsd:string"/>
       <xsd:attribute name="foreignKeyName" type="xsd:string"/>
       <xsd:attribute name="foreignKeyIndex" type="xsd:string"/>
+      <xsd:attribute name="foreignKeyOnDelete" type="xsd:string"/>
+      <xsd:attribute name="foreignKeyOnUpdate" type="xsd:string"/>
       <xsd:attribute name="comment" type="xsd:string"/>
     </xsd:complexType>
   </xsd:element>
diff --git a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Oracle10DdlTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Oracle10DdlTest.java
new file mode 100644
index 000000000..efd8c395c
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Oracle10DdlTest.java
@@ -0,0 +1,54 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+import io.ebean.annotation.ConstraintMode;
+import io.ebean.config.dbplatform.oracle.OraclePlatform;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class Oracle10DdlTest {
+
+  Oracle10Ddl create() {
+    return new Oracle10Ddl(new OraclePlatform());
+  }
+
+  @Test
+  public void appendForeignKeyOnDelete_expectEmtpy_when_nullRestrictSetDefault() {
+
+    Oracle10Ddl oracle = create();
+
+    StringBuilder sb = new StringBuilder();
+    oracle.appendForeignKeyOnDelete(sb, oracle.withDefault(null));
+    assertThat(sb.toString()).isEqualTo("");
+
+    sb = new StringBuilder();
+    oracle.appendForeignKeyOnDelete(sb, ConstraintMode.RESTRICT);
+    assertThat(sb.toString()).isEqualTo("");
+
+
+    sb = new StringBuilder();
+    oracle.appendForeignKeyOnDelete(sb, ConstraintMode.SET_DEFAULT);
+    assertThat(sb.toString()).isEqualTo("");
+  }
+
+  @Test
+  public void appendForeignKeyOnDelete_setNull() {
+
+    Oracle10Ddl oracle = create();
+
+    StringBuilder sb = new StringBuilder();
+    oracle.appendForeignKeyOnDelete(sb, ConstraintMode.SET_NULL);
+    assertThat(sb.toString()).isEqualTo(" on delete set null");
+  }
+
+  @Test
+  public void appendForeignKeyOnDelete_cascade() {
+
+    Oracle10Ddl oracle = create();
+
+    StringBuilder sb = new StringBuilder();
+    oracle.appendForeignKeyOnDelete(sb, ConstraintMode.CASCADE);
+    assertThat(sb.toString()).isEqualTo(" on delete cascade");
+  }
+
+}
diff --git a/src/test/java/org/tests/cascade/TestOrderedList.java b/src/test/java/org/tests/cascade/TestOrderedList.java
index 9baf7a601..4b8540adb 100644
--- a/src/test/java/org/tests/cascade/TestOrderedList.java
+++ b/src/test/java/org/tests/cascade/TestOrderedList.java
@@ -27,7 +27,12 @@ public class TestOrderedList extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.current();
     assertThat(sql.size()).isGreaterThan(1);
     assertThat(sql.get(0)).contains("insert into om_ordered_master");
-    assertThat(sql.get(1)).contains("insert into om_ordered_detail (name, version, sort_order, master_id) values (?,?,?,?)");
+    boolean hasId = sql.get(1).contains(" (id, name");
+    if (hasId) {
+      assertThat(sql.get(1)).contains("insert into om_ordered_detail (id, name, version, sort_order, master_id) values (?,?,?,?,?)");
+    } else {
+      assertThat(sql.get(1)).contains("insert into om_ordered_detail (name, version, sort_order, master_id) values (?,?,?,?)");
+    }
 
     // update without any changes
     Ebean.save(master);
diff --git a/src/test/java/org/tests/ddl/DfkCascade.java b/src/test/java/org/tests/ddl/DfkCascade.java
new file mode 100644
index 000000000..18f4f8201
--- /dev/null
+++ b/src/test/java/org/tests/ddl/DfkCascade.java
@@ -0,0 +1,50 @@
+package org.tests.ddl;
+
+import io.ebean.annotation.ConstraintMode;
+import io.ebean.annotation.DbForeignKey;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+@Entity
+public class DfkCascade {
+
+  @Id
+  long id;
+
+  String name;
+
+  @ManyToOne
+  @DbForeignKey(onDelete = ConstraintMode.CASCADE)
+  DfkCascadeOne one;
+
+  public DfkCascade(String name, DfkCascadeOne one) {
+    this.name = name;
+    this.one = one;
+  }
+
+  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 DfkCascadeOne getOne() {
+    return one;
+  }
+
+  public void setOne(DfkCascadeOne one) {
+    this.one = one;
+  }
+}
diff --git a/src/test/java/org/tests/ddl/DfkCascadeOne.java b/src/test/java/org/tests/ddl/DfkCascadeOne.java
new file mode 100644
index 000000000..fa3c14c2c
--- /dev/null
+++ b/src/test/java/org/tests/ddl/DfkCascadeOne.java
@@ -0,0 +1,47 @@
+package org.tests.ddl;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import java.util.List;
+
+@Entity
+public class DfkCascadeOne {
+
+  @Id
+  long id;
+
+  String name;
+
+  @OneToMany(mappedBy = "one", cascade = CascadeType.ALL)
+  List<DfkCascade> details;
+
+  public DfkCascadeOne(String name) {
+    this.name = name;
+  }
+
+  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 List<DfkCascade> getDetails() {
+    return details;
+  }
+
+  public void setDetails(List<DfkCascade> details) {
+    this.details = details;
+  }
+}
diff --git a/src/test/java/org/tests/ddl/DfkNone.java b/src/test/java/org/tests/ddl/DfkNone.java
new file mode 100644
index 000000000..995ba990d
--- /dev/null
+++ b/src/test/java/org/tests/ddl/DfkNone.java
@@ -0,0 +1,49 @@
+package org.tests.ddl;
+
+import io.ebean.annotation.DbForeignKey;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+@Entity
+public class DfkNone {
+
+  @Id
+  long id;
+
+  String name;
+
+  @ManyToOne
+  @DbForeignKey(noConstraint = true)
+  DfkOne one;
+
+  public DfkNone(String name, DfkOne one) {
+    this.name = name;
+    this.one = one;
+  }
+
+  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 DfkOne getOne() {
+    return one;
+  }
+
+  public void setOne(DfkOne one) {
+    this.one = one;
+  }
+}
diff --git a/src/test/java/org/tests/ddl/DfkOne.java b/src/test/java/org/tests/ddl/DfkOne.java
new file mode 100644
index 000000000..84bb826d8
--- /dev/null
+++ b/src/test/java/org/tests/ddl/DfkOne.java
@@ -0,0 +1,33 @@
+package org.tests.ddl;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class DfkOne {
+
+  @Id
+  long id;
+
+  String name;
+
+  public DfkOne(String name) {
+    this.name = name;
+  }
+
+  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;
+  }
+}
diff --git a/src/test/java/org/tests/ddl/DfkSetNull.java b/src/test/java/org/tests/ddl/DfkSetNull.java
new file mode 100644
index 000000000..5f55e3f0b
--- /dev/null
+++ b/src/test/java/org/tests/ddl/DfkSetNull.java
@@ -0,0 +1,50 @@
+package org.tests.ddl;
+
+import io.ebean.annotation.ConstraintMode;
+import io.ebean.annotation.DbForeignKey;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+@Entity
+public class DfkSetNull {
+
+  @Id
+  long id;
+
+  String name;
+
+  @ManyToOne
+  @DbForeignKey(onDelete = ConstraintMode.SET_NULL)
+  DfkOne one;
+
+  public DfkSetNull(String name, DfkOne one) {
+    this.name = name;
+    this.one = one;
+  }
+
+  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 DfkOne getOne() {
+    return one;
+  }
+
+  public void setOne(DfkOne one) {
+    this.one = one;
+  }
+}
diff --git a/src/test/java/org/tests/ddl/TestForeignKeyModes.java b/src/test/java/org/tests/ddl/TestForeignKeyModes.java
new file mode 100644
index 000000000..d0e8bdccf
--- /dev/null
+++ b/src/test/java/org/tests/ddl/TestForeignKeyModes.java
@@ -0,0 +1,77 @@
+package org.tests.ddl;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestForeignKeyModes extends BaseTestCase {
+
+  @Test
+  public void none() {
+
+    DfkOne one = new DfkOne("one");
+    Ebean.save(one);
+
+    DfkNone none = new DfkNone("none", one);
+    Ebean.save(none);
+
+    // fails unless there is no Foreign key ...
+    Ebean.delete(one);
+
+    DfkNone found = Ebean.find(DfkNone.class, none.getId());
+    assertThat(found).isNotNull();
+    // we still reference one ... even though it does not exist anymore
+    assertThat(found.getOne()).isNotNull();
+  }
+
+
+  @Test
+  public void setNullOnDelete() {
+
+    DfkOne one = new DfkOne("one2");
+    Ebean.save(one);
+
+    DfkSetNull other = new DfkSetNull("none", one);
+    Ebean.save(other);
+
+    // success with ... fkey value set to null
+    Ebean.delete(one);
+
+    DfkSetNull found = Ebean.find(DfkSetNull.class, other.getId());
+    assertThat(found).isNotNull();
+    assertThat(found.getOne()).isNull();
+
+  }
+
+  @Test
+  public void onDeleteCascade() {
+
+    DfkCascadeOne one = new DfkCascadeOne("one3");
+
+
+    DfkCascade other = new DfkCascade("cascade1", one);
+    one.getDetails().add(other);
+    one.getDetails().add(new DfkCascade("cascade2", one));
+    one.getDetails().add(new DfkCascade("cascade3", one));
+
+    Ebean.save(one);
+
+
+    LoggedSqlCollector.start();
+    Ebean.delete(one);
+
+    List<String> sql = LoggedSqlCollector.stop();
+
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("delete from dfk_cascade_one where id=?");
+
+    DfkCascade found = Ebean.find(DfkCascade.class, other.getId());
+    assertThat(found).isNull();
+
+  }
+}
diff --git a/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java b/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java
index b2ab2d1c6..0b207f938 100644
--- a/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java
+++ b/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java
@@ -35,7 +35,7 @@ public class TestOneToOnePrimaryKeyJoin extends BaseTestCase {
     OtoPrime found = query.findOne();
 
     assertThat(found).isNotNull();
-    assertThat(sqlOf(query)).contains("select t0.pid, t0.name, t0.version, t0.pid from oto_prime t0 where t0.pid = ?")
+    assertThat(sqlOf(query, 10)).contains("select t0.pid, t0.name, t0.version, t0.pid from oto_prime t0 where t0.pid = ?")
       .as("we don't join to oto_prime_extra");
 
     assertThat(found.getName()).isEqualTo("p" + desc);
@@ -47,7 +47,7 @@ public class TestOneToOnePrimaryKeyJoin extends BaseTestCase {
     OtoPrime oneWith = queryWithFetch.findOne();
 
     assertThat(oneWith).isNotNull();
-    assertThat(sqlOf(queryWithFetch)).contains("select t0.pid, t0.name, t0.version, t1.eid, t1.extra, t1.version from oto_prime t0 join oto_prime_extra t1 on t1.eid = t0.pid  where t0.pid = ?")
+    assertThat(sqlOf(queryWithFetch, 10)).contains("select t0.pid, t0.name, t0.version, t1.eid, t1.extra, t1.version from oto_prime t0 join oto_prime_extra t1 on t1.eid = t0.pid  where t0.pid = ?")
       .as("we join to oto_prime_extra");
 
 
diff --git a/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java b/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java
index 8becdfe02..7903abc02 100644
--- a/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java
+++ b/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java
@@ -35,7 +35,7 @@ public class TestOneToOnePrimaryKeyJoinBidi extends BaseTestCase {
     OtoUBPrime found = query.findOne();
 
     assertThat(found).isNotNull();
-    assertThat(sqlOf(query)).contains("select t0.pid, t0.name, t0.version, t0.pid from oto_ubprime t0 where t0.pid = ?")
+    assertThat(sqlOf(query, 10)).contains("select t0.pid, t0.name, t0.version, t0.pid from oto_ubprime t0 where t0.pid = ?")
       .as("we don't join to oto_ubprime_extra");
 
     assertThat(found.getName()).isEqualTo("u" + desc);
@@ -47,7 +47,7 @@ public class TestOneToOnePrimaryKeyJoinBidi extends BaseTestCase {
     OtoUBPrime oneWith = queryWithFetch.findOne();
 
     assertThat(oneWith).isNotNull();
-    assertThat(sqlOf(queryWithFetch)).contains("select t0.pid, t0.name, t0.version, t1.eid, t1.extra, t1.version, t1.eid from oto_ubprime t0 left join oto_ubprime_extra t1 on t1.eid = t0.pid  where t0.pid = ?")
+    assertThat(sqlOf(queryWithFetch, 10)).contains("select t0.pid, t0.name, t0.version, t1.eid, t1.extra, t1.version, t1.eid from oto_ubprime t0 left join oto_ubprime_extra t1 on t1.eid = t0.pid  where t0.pid = ?")
       .as("we join to oto_prime_extra");
 
 
diff --git a/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java b/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java
index 64835b68b..259991b85 100644
--- a/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java
+++ b/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java
@@ -35,7 +35,7 @@ public class TestOneToOnePrimaryKeyJoinOptional extends BaseTestCase {
     OtoUPrime found = query.findOne();
 
     assertThat(found).isNotNull();
-    assertThat(sqlOf(query)).contains("select t0.pid, t0.name, t0.version, t0.pid from oto_uprime t0 where t0.pid = ?")
+    assertThat(sqlOf(query, 4)).contains("select t0.pid, t0.name, t0.version, t0.pid from oto_uprime t0 where t0.pid = ?")
       .as("we don't join to oto_uprime_extra");
 
     assertThat(found.getName()).isEqualTo("u" + desc);
@@ -47,7 +47,7 @@ public class TestOneToOnePrimaryKeyJoinOptional extends BaseTestCase {
     OtoUPrime oneWith = queryWithFetch.findOne();
 
     assertThat(oneWith).isNotNull();
-    assertThat(sqlOf(queryWithFetch)).contains("select t0.pid, t0.name, t0.version, t1.eid, t1.extra, t1.version from oto_uprime t0 left join oto_uprime_extra t1 on t1.eid = t0.pid  where t0.pid = ?")
+    assertThat(sqlOf(queryWithFetch, 6)).contains("select t0.pid, t0.name, t0.version, t1.eid, t1.extra, t1.version from oto_uprime t0 left join oto_uprime_extra t1 on t1.eid = t0.pid  where t0.pid = ?")
       .as("we join to oto_prime_extra");
 
 
diff --git a/src/test/java/org/tests/update/EPersonOnline.java b/src/test/java/org/tests/update/EPersonOnline.java
index 7b1f2bb88..232226652 100644
--- a/src/test/java/org/tests/update/EPersonOnline.java
+++ b/src/test/java/org/tests/update/EPersonOnline.java
@@ -7,7 +7,6 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.validation.constraints.Size;
-
 import java.time.Instant;
 
 @Entity
@@ -21,7 +20,7 @@ public class EPersonOnline {
   @Size(max=127)
   String email;
 
-  boolean online;
+  boolean onlineStatus;
 
   @WhenModified
   Instant whenUpdated;
@@ -42,12 +41,12 @@ public class EPersonOnline {
     this.email = email;
   }
 
-  public boolean isOnline() {
-    return online;
+  public boolean isOnlineStatus() {
+    return onlineStatus;
   }
 
-  public void setOnline(boolean online) {
-    this.online = online;
+  public void setOnlineStatus(boolean onlineStatus) {
+    this.onlineStatus = onlineStatus;
   }
 
   public Instant getWhenUpdated() {
diff --git a/src/test/java/org/tests/update/TestSqlUpdateUpsert.java b/src/test/java/org/tests/update/TestSqlUpdateUpsert.java
index 92aa0dd3f..eeb761b4b 100644
--- a/src/test/java/org/tests/update/TestSqlUpdateUpsert.java
+++ b/src/test/java/org/tests/update/TestSqlUpdateUpsert.java
@@ -15,7 +15,7 @@ public class TestSqlUpdateUpsert extends BaseTestCase {
   @Test
   public void h2Merge() {
 
-    String sql = "merge into e_person_online (email, online, when_updated) key(email) values (?, ?, now())";
+    String sql = "merge into e_person_online (email, online_status, when_updated) key(email) values (?, ?, now())";
 
     String email = "baz@one.com";
 
@@ -28,9 +28,9 @@ public class TestSqlUpdateUpsert extends BaseTestCase {
     EPersonOnline found = Ebean.find(EPersonOnline.class, key);
     assertThat(found).isNotNull();
     assertThat(found.getEmail()).isEqualTo(email);
-    assertThat(found.isOnline()).isTrue();
+    assertThat(found.isOnlineStatus()).isTrue();
 
-    String sqlNamed = "merge into e_person_online (email, online, when_updated) key(email) values (:email, :online, now())";
+    String sqlNamed = "merge into e_person_online (email, online_status, when_updated) key(email) values (:email, :online, now())";
 
     SqlUpdate sqlUpdate2 = Ebean.createSqlUpdate(sqlNamed)
       .setGetGeneratedKeys(true)
@@ -45,7 +45,7 @@ public class TestSqlUpdateUpsert extends BaseTestCase {
     assertThat(found2).isNotNull();
     assertThat(found2.getId()).isEqualTo(key);
     assertThat(found2.getEmail()).isEqualTo(email);
-    assertThat(found2.isOnline()).isFalse();
+    assertThat(found2.isOnlineStatus()).isFalse();
     assertThat(found2.getWhenUpdated()).isGreaterThan(found.getWhenUpdated());
   }
 
@@ -53,7 +53,7 @@ public class TestSqlUpdateUpsert extends BaseTestCase {
   @Test
   public void postgresUpsert() {
 
-    String sql = "insert into e_person_online (email, online, when_updated) values (?, ?, now()) on conflict (email) do update set when_updated=now(), online = ?";
+    String sql = "insert into e_person_online (email, online_status, when_updated) values (?, ?, now()) on conflict (email) do update set when_updated=now(), online_status = ?";
 
     String email = "foo@one.com";
 
@@ -67,10 +67,10 @@ public class TestSqlUpdateUpsert extends BaseTestCase {
     EPersonOnline found = Ebean.find(EPersonOnline.class, key);
     assertThat(found).isNotNull();
     assertThat(found.getEmail()).isEqualTo("foo@one.com");
-    assertThat(found.isOnline()).isTrue();
+    assertThat(found.isOnlineStatus()).isTrue();
 
 
-    String sqlNamed = "insert into e_person_online (email, online, when_updated) values (:email, :online, now()) on conflict (email) do update set when_updated=now(), online = :online";
+    String sqlNamed = "insert into e_person_online (email, online_status, when_updated) values (:email, :online, now()) on conflict (email) do update set when_updated=now(), online_status = :online";
     SqlUpdate sqlUpdate2 = Ebean.createSqlUpdate(sqlNamed)
       .setGetGeneratedKeys(true)
       .setParameter("email", email)
@@ -82,7 +82,7 @@ public class TestSqlUpdateUpsert extends BaseTestCase {
     assertThat(found2).isNotNull();
     assertThat(found2.getId()).isEqualTo(key);
     assertThat(found2.getEmail()).isEqualTo("foo@one.com");
-    assertThat(found2.isOnline()).isFalse();
+    assertThat(found2.isOnlineStatus()).isFalse();
     assertThat(found2.getWhenUpdated()).isGreaterThan(found.getWhenUpdated());
 
   }
@@ -93,7 +93,7 @@ public class TestSqlUpdateUpsert extends BaseTestCase {
 
     String email = "bar@one.com";
 
-    String sql = "insert into e_person_online (email, online, when_updated) values (?, ?, current_time) on duplicate key update when_updated=current_time, online = ?";
+    String sql = "insert into e_person_online (email, online_status, when_updated) values (?, ?, current_time) on duplicate key update when_updated=current_time, online_status = ?";
     SqlUpdate sqlUpdate = Ebean.createSqlUpdate(sql)
       .setGetGeneratedKeys(true)
       .setParameter(1, email)
@@ -106,10 +106,10 @@ public class TestSqlUpdateUpsert extends BaseTestCase {
     EPersonOnline found = Ebean.find(EPersonOnline.class, key);
     assertThat(found).isNotNull();
     assertThat(found.getEmail()).isEqualTo("bar@one.com");
-    assertThat(found.isOnline()).isTrue();
+    assertThat(found.isOnlineStatus()).isTrue();
 
 
-    String sqlNamed = "insert into e_person_online (email, online, when_updated) values (:email, :online, current_time) on duplicate key update when_updated=current_time, online = :online";
+    String sqlNamed = "insert into e_person_online (email, online_status, when_updated) values (:email, :online, current_time) on duplicate key update when_updated=current_time, online_status = :online";
     SqlUpdate sqlUpdate2 = Ebean.createSqlUpdate(sqlNamed)
       .setGetGeneratedKeys(true)
       .setParameter("email", email)
@@ -122,7 +122,7 @@ public class TestSqlUpdateUpsert extends BaseTestCase {
     assertThat(found2).isNotNull();
     assertThat(found2.getId()).isEqualTo(key);
     assertThat(found2.getEmail()).isEqualTo("bar@one.com");
-    assertThat(found2.isOnline()).isFalse();
+    assertThat(found2.isOnlineStatus()).isFalse();
 
   }
 }

From 183d079b58606509ede02dea2afda7a11df12795 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 19 Feb 2018 22:24:51 +1300
Subject: [PATCH 0038/1036] #323 - DDL Generation support for foreign key
 cascade options

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e60b0ec7e..b5f9956c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>3.6</version>
+      <version>3.7</version>
     </dependency>
 
     <dependency>

From 2be3099d55147249ebc78743c1a35f7697342230 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 19 Feb 2018 22:45:47 +1300
Subject: [PATCH 0039/1036] #1228 - Add support to not generate FK Constraint
 when @JoinColumn(foreignKey=@ForeignKey(ConstraintMode.NO_CONSTRAINT))

---
 .../server/deploy/PropertyForeignKey.java     | 13 +++++
 .../deploy/parse/AnnotationAssocOnes.java     | 10 ++++
 .../java/org/tests/ddl/DfkNoneViaJoin.java    | 50 +++++++++++++++++++
 .../org/tests/ddl/TestForeignKeyModes.java    | 18 +++++++
 4 files changed, 91 insertions(+)
 create mode 100644 src/test/java/org/tests/ddl/DfkNoneViaJoin.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/PropertyForeignKey.java b/src/main/java/io/ebeaninternal/server/deploy/PropertyForeignKey.java
index ab5b75111..8badce0ce 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/PropertyForeignKey.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/PropertyForeignKey.java
@@ -10,6 +10,19 @@ public class PropertyForeignKey {
   private final ConstraintMode onDelete;
   private final ConstraintMode onUpdate;
 
+  /**
+   * Construct for "No Constraint".
+   */
+  public PropertyForeignKey() {
+    this.noConstraint = true;
+    this.noIndex = false;
+    this.onDelete = ConstraintMode.GLOBAL_DEFAULT;
+    this.onUpdate = ConstraintMode.GLOBAL_DEFAULT;
+  }
+
+  /**
+   * Construct for the mapping annotation.
+   */
   public PropertyForeignKey(DbForeignKey dbForeignKey) {
     this.noIndex = dbForeignKey.noIndex();
     this.noConstraint = dbForeignKey.noConstraint();
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index 6294c5e82..15a3ed4de 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -16,8 +16,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.persistence.Column;
+import javax.persistence.ConstraintMode;
 import javax.persistence.Embedded;
 import javax.persistence.EmbeddedId;
+import javax.persistence.ForeignKey;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
@@ -131,6 +133,7 @@ public class AnnotationAssocOnes extends AnnotationParser {
       if (!joinColumn.nullable()) {
         prop.setNullable(false);
       }
+      checkForNoConstraint(prop, joinColumn);
     }
 
 
@@ -171,6 +174,13 @@ public class AnnotationAssocOnes extends AnnotationParser {
     }
   }
 
+  private void checkForNoConstraint(DeployBeanPropertyAssocOne<?> prop, JoinColumn joinColumn) {
+    ForeignKey foreignKey = joinColumn.foreignKey();
+    if (foreignKey != null && foreignKey.value() == ConstraintMode.NO_CONSTRAINT) {
+      prop.setForeignKey(new PropertyForeignKey());
+    }
+  }
+
   private String errorMsgMissingBeanTable(Class<?> type, String from) {
     return "Error with association to [" + type + "] from [" + from + "]. Is " + type + " registered?";
   }
diff --git a/src/test/java/org/tests/ddl/DfkNoneViaJoin.java b/src/test/java/org/tests/ddl/DfkNoneViaJoin.java
new file mode 100644
index 000000000..148e219b9
--- /dev/null
+++ b/src/test/java/org/tests/ddl/DfkNoneViaJoin.java
@@ -0,0 +1,50 @@
+package org.tests.ddl;
+
+import javax.persistence.ConstraintMode;
+import javax.persistence.Entity;
+import javax.persistence.ForeignKey;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+
+@Entity
+public class DfkNoneViaJoin {
+
+  @Id
+  long id;
+
+  String name;
+
+  @ManyToOne
+  @JoinColumn(name = "one_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+  DfkOne one;
+
+  public DfkNoneViaJoin(String name, DfkOne one) {
+    this.name = name;
+    this.one = one;
+  }
+
+  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 DfkOne getOne() {
+    return one;
+  }
+
+  public void setOne(DfkOne one) {
+    this.one = one;
+  }
+}
diff --git a/src/test/java/org/tests/ddl/TestForeignKeyModes.java b/src/test/java/org/tests/ddl/TestForeignKeyModes.java
index d0e8bdccf..a9b1216b2 100644
--- a/src/test/java/org/tests/ddl/TestForeignKeyModes.java
+++ b/src/test/java/org/tests/ddl/TestForeignKeyModes.java
@@ -30,6 +30,24 @@ public class TestForeignKeyModes extends BaseTestCase {
   }
 
 
+  @Test
+  public void noneViaJoin() {
+
+    DfkOne one = new DfkOne("one2");
+    Ebean.save(one);
+
+    DfkNoneViaJoin none = new DfkNoneViaJoin("none2", one);
+    Ebean.save(none);
+
+    // fails unless there is no Foreign key ...
+    Ebean.delete(one);
+
+    DfkNoneViaJoin found = Ebean.find(DfkNoneViaJoin.class, none.getId());
+    assertThat(found).isNotNull();
+    // we still reference one ... even though it does not exist anymore
+    assertThat(found.getOne()).isNotNull();
+  }
+
   @Test
   public void setNullOnDelete() {
 

From 81d48d67a798f7f2e23fc163310a33922a283547 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 20 Feb 2018 14:40:21 +1300
Subject: [PATCH 0040/1036] #123 - Mapping - Add support for OneToMany
 JoinTables

---
 .../java/io/ebean/bean/BeanCollection.java    |   5 +
 .../ebean/common/AbstractBeanCollection.java  |   5 +
 .../ddlgeneration/platform/BaseTableDdl.java  |  17 ++-
 .../platform/WriteUniqueConstraint.java       |  47 +++++++
 .../dbmigration/model/MTable.java             |   1 -
 .../build/ModelBuildIntersectionTable.java    |   4 +-
 .../build/ModelBuildPropertyVisitor.java      |  13 +-
 .../server/deploy/BeanDescriptorManager.java  |   6 +-
 .../server/deploy/BeanPropertyAssocMany.java  |  87 ++++++-------
 .../meta/DeployBeanPropertyAssocMany.java     |  12 ++
 .../deploy/meta/DeployBeanPropertyLists.java  |  10 +-
 .../deploy/parse/AnnotationAssocManys.java    |   6 +-
 .../server/persist/DefaultPersister.java      |  29 ++++-
 .../server/persist/SaveManyPropRequest.java   |   2 +-
 .../server/query/SqlTreeNodeBean.java         |   4 +-
 .../server/query/SqlTreeNodeExtraJoin.java    |   2 +-
 .../query/SqlTreeNodeManyWhereJoin.java       |   2 +-
 src/test/java/io/ebean/BaseTestCase.java      |  11 +-
 .../org/tests/o2m/jointable/JtMonkey.java     |  57 +++++++++
 .../org/tests/o2m/jointable/JtTrainer.java    |  66 ++++++++++
 .../java/org/tests/o2m/jointable/JtTroop.java |  65 ++++++++++
 .../o2m/jointable/TestOneToManyJoinTable.java | 115 ++++++++++++++++++
 22 files changed, 478 insertions(+), 88 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteUniqueConstraint.java
 create mode 100644 src/test/java/org/tests/o2m/jointable/JtMonkey.java
 create mode 100644 src/test/java/org/tests/o2m/jointable/JtTrainer.java
 create mode 100644 src/test/java/org/tests/o2m/jointable/JtTroop.java
 create mode 100644 src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java

diff --git a/src/main/java/io/ebean/bean/BeanCollection.java b/src/main/java/io/ebean/bean/BeanCollection.java
index 28b17bd05..8c3b95b08 100644
--- a/src/main/java/io/ebean/bean/BeanCollection.java
+++ b/src/main/java/io/ebean/bean/BeanCollection.java
@@ -191,6 +191,11 @@ public interface BeanCollection<E> extends Serializable {
    */
   void setModifyListening(ModifyListenMode modifyListenMode);
 
+  /**
+   * Return the current modify listening mode. Can be null for on newly created beans.
+   */
+  ModifyListenMode getModifyListening();
+
   /**
    * Add an object to the additions list.
    * <p>
diff --git a/src/main/java/io/ebean/common/AbstractBeanCollection.java b/src/main/java/io/ebean/common/AbstractBeanCollection.java
index d02c0ffc7..866d8d0c0 100644
--- a/src/main/java/io/ebean/common/AbstractBeanCollection.java
+++ b/src/main/java/io/ebean/common/AbstractBeanCollection.java
@@ -140,6 +140,11 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
   // Support for modify additions deletions etc - ManyToMany
   // ---------------------------------------------------------
 
+  @Override
+  public ModifyListenMode getModifyListening() {
+    return modifyListenMode;
+  }
+
   /**
    * set modifyListening to be on or off.
    */
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
index 8969e7c7d..d94c59837 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
@@ -541,17 +541,14 @@ public class BaseTableDdl implements TableDdl {
 
     boolean inlineUniqueWhenNullable = platformDdl.isInlineUniqueWhenNullable();
 
-    List<Column> columns = createTable.getColumn();
+    List<Column> columns = new WriteUniqueConstraint(createTable.getColumn()).uniqueKeys();
     for (Column column : columns) {
-      if (!Boolean.TRUE.equals(column.isPrimaryKey())
-          && (hasValue(column.getUnique()) || hasValue(column.getUniqueOneToOne()))) {
-        if (Boolean.TRUE.equals(column.isNotnull()) || inlineUniqueWhenNullable) {
-          // normal mechanism for adding unique constraint
-          inlineUniqueConstraintSingle(apply, column);
-        } else {
-          // MsSqlServer & DB2 specific mechanism for adding unique constraints (that allow nulls)
-          externalUnique.add(column);
-        }
+      if (Boolean.TRUE.equals(column.isNotnull()) || inlineUniqueWhenNullable) {
+        // normal mechanism for adding unique constraint
+        inlineUniqueConstraintSingle(apply, column);
+      } else {
+        // SqlServer & DB2 specific mechanism for adding unique constraints (that allow nulls)
+        externalUnique.add(column);
       }
     }
   }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteUniqueConstraint.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteUniqueConstraint.java
new file mode 100644
index 000000000..b3e1c242b
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteUniqueConstraint.java
@@ -0,0 +1,47 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+import io.ebeaninternal.dbmigration.migration.Column;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class WriteUniqueConstraint {
+
+  private final List<Column> primaryKeys = new ArrayList<>();
+  private final List<Column> uniqueKeys = new ArrayList<>();
+
+  WriteUniqueConstraint(List<Column> columns) {
+
+    // filter for unique and primary keys
+    for (Column column : columns) {
+      if (Boolean.TRUE.equals(column.isPrimaryKey())) {
+        primaryKeys.add(column);
+      }
+      if (hasValue(column.getUnique()) || hasValue(column.getUniqueOneToOne())){
+        uniqueKeys.add(column);
+      }
+    }
+  }
+
+  /**
+   * Return true if null or trimmed string is empty.
+   */
+  boolean hasValue(String value) {
+    return value != null && !value.trim().isEmpty();
+  }
+
+  /**
+   * Return the single columns with unique constraints (that are not the primary key).
+   */
+  public List<Column> uniqueKeys() {
+    if (uniqueKeys.isEmpty() || primaryKeys.size() > 1) {
+      // all single column unique constraints are valid
+      return uniqueKeys;
+    }
+    // filter out PFK
+    for (Column primaryKey : primaryKeys) {
+      uniqueKeys.remove(primaryKey);
+    }
+    return uniqueKeys;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
index 2401d6b31..7e02a0e03 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
@@ -408,7 +408,6 @@ public class MTable {
    * Return all the columns (excluding columns marked as dropped).
    */
   public Collection<MColumn> allColumns() {
-
     return columns.values();
   }
 
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java
index a0b70e594..9bf4d50c0 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java
@@ -9,7 +9,6 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.deploy.TableJoinColumn;
 
-
 /**
  * Add the intersection table to the model.
  */
@@ -32,7 +31,7 @@ public class ModelBuildIntersectionTable {
     this.tableJoin = manyProp.getTableJoin();
   }
 
-  public void build() {
+  public MTable build() {
 
     intersectionTable = createTable();
     MTable existingTable = ctx.addTable(intersectionTable);
@@ -47,6 +46,7 @@ public class ModelBuildIntersectionTable {
       ctx.createDraft(intersectionTable, false);
     }
 
+    return intersectionTable;
   }
 
   private void buildFkConstraints() {
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
index b5b631458..8d9f64be5 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
@@ -17,6 +17,7 @@ import io.ebeaninternal.server.deploy.TableJoinColumn;
 import io.ebeaninternal.server.deploy.id.ImportedId;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
@@ -120,7 +121,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
 
   @Override
   public void visitMany(BeanPropertyAssocMany<?> p) {
-    if (p.isManyToMany()) {
+    if (p.hasJoinTable()) {
       if (p.getMappedBy() == null) {
         // only create on other 'owning' side
 
@@ -130,7 +131,15 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
         // build the create table and fkey constraints
         // putting the DDL into ctx for later output as we are
         // in the middle of rendering the create table DDL
-        new ModelBuildIntersectionTable(ctx, p).build();
+        MTable intersectionTable = new ModelBuildIntersectionTable(ctx, p).build();
+        if (p.isO2mJoinTable()) {
+          Collection<MColumn> cols = intersectionTable.allColumns();
+          if (cols.size() == 2) {
+            // always the second column that we put the unique constraint on
+            MColumn col = new ArrayList<>(cols).get(1);
+            col.setUnique(determineUniqueConstraintName(col.getName()));
+          }
+        }
       }
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 134d4c3e6..ed2945ef6 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -1138,14 +1138,16 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
     if (prop.getMappedBy() == null) {
       // if we are doc store only we are done
-      // this allowes the use of @OneToMany in @DocStore - Entities
+      // this allows the use of @OneToMany in @DocStore - Entities
       if (info.getDescriptor().isDocStoreOnly()) {
         prop.setUnidirectional();
         return;
       }
 
       if (!findMappedBy(prop)) {
-        makeUnidirectional(info, prop);
+        if (!prop.isO2mJoinTable()) {
+          makeUnidirectional(info, prop);
+        }
         return;
       }
     }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index 8f902c047..7c2f3cc08 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -58,6 +58,8 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
    */
   private final boolean unidirectional;
 
+  private final boolean o2mJoinTable;
+
   /**
    * Flag to indicate that the target has a order column to auto populate.
    */
@@ -114,6 +116,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
   public BeanPropertyAssocMany(BeanDescriptor<?> descriptor, DeployBeanPropertyAssocMany<T> deploy) {
     super(descriptor, deploy);
     this.unidirectional = deploy.isUnidirectional();
+    this.o2mJoinTable = deploy.isO2mJoinTable();
     this.hasOrderColumn = deploy.hasOrderColumn();
     this.manyToMany = deploy.isManyToMany();
     this.manyType = deploy.getManyType();
@@ -139,8 +142,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
     if (!isTransient) {
       this.help = BeanCollectionHelpFactory.create(this);
 
-      if (manyToMany) {
-        // only manyToMany's have imported properties
+      if (hasJoinTable()) {
         importedId = createImportedId(this, targetDescriptor, tableJoin);
 
       } else {
@@ -169,7 +171,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
               sb.append(", ");
             }
             // these fk columns are either on the intersection (int_) or base table (t0)
-            String fkTableAlias = isManyToMany() ? "int_" : "t0";
+            String fkTableAlias = hasJoinTable() ? "int_" : "t0";
             sb.append(fkTableAlias).append(".").append(exportedProperties[i].getForeignDbColumn());
           }
           sb.append(", ").append(fetchOrderBy);
@@ -178,7 +180,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
       }
 
       String delStmt;
-      if (manyToMany) {
+      if (hasJoinTable()) {
         delStmt = "delete from " + inverseJoin.getTable() + " where ";
       } else {
         delStmt = "delete from " + targetDescriptor.getBaseTable() + " where ";
@@ -347,8 +349,8 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
    */
   private void addWhereParentIdIn(SpiQuery<?> query, List<Object> parentIds) {
 
-    String tableAlias = manyToMany ? "int_." : "t0.";
-    if (manyToMany) {
+    String tableAlias = hasJoinTable() ? "int_." : "t0.";
+    if (hasJoinTable()) {
       query.setM2MIncludeJoin(inverseJoin);
     }
     String rawWhere = deriveWhereParentIdSql(true, tableAlias);
@@ -475,12 +477,12 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
 
     StringBuilder sb = new StringBuilder(50);
     SpiQuery<?> query = request.getQueryRequest().getQuery();
-    if (manyToMany) {
+    if (hasJoinTable()) {
       sb.append(query.isAsDraft() ? intersectionDraftTable : intersectionPublishTable);
     } else {
       sb.append(targetDescriptor.getBaseTable(query.getTemporalMode()));
     }
-    if (softDelete && manyToMany) {
+    if (softDelete && hasJoinTable()) {
       sb.append(" x join ");
       sb.append(targetDescriptor.getBaseTable(query.getTemporalMode()));
       sb.append(" x2 on ");
@@ -497,7 +499,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
       exportedProperties[i].appendWhere(sb, "x.", path);
     }
     if (softDelete) {
-      String alias = (manyToMany) ? "x2" : "x";
+      String alias = hasJoinTable() ? "x2" : "x";
       sb.append(" and ").append(targetDescriptor.getSoftDeletePredicate(alias));
     }
     return sb.toString();
@@ -574,6 +576,20 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
     return manyType;
   }
 
+  /**
+   * Return true if this is many to many.
+   */
+  public boolean hasJoinTable() {
+    return manyToMany || o2mJoinTable;
+  }
+
+  /**
+   * Return true if this is a one to many with a join table.
+   */
+  public boolean isO2mJoinTable() {
+    return o2mJoinTable;
+  }
+
   /**
    * Return true if this is many to many.
    */
@@ -661,7 +677,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
 
   public void addSelectExported(DbSqlContext ctx, String tableAlias) {
 
-    String alias = manyToMany ? "int_" : tableAlias;
+    String alias = hasJoinTable() ? "int_" : tableAlias;
     if (alias == null) {
       alias = "t0";
     }
@@ -694,45 +710,6 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
     return sb.toString();
   }
 
-//	public void setPredicates(SpiQuery<?> query, EntityBean parentBean) {
-//
-//		if (manyToMany){
-//			// for ManyToMany lazy loading we need to include a
-//			// join to the intersection table. The predicate column
-//			// is not on the 'destination many table'.
-//			query.setIncludeTableJoin(inverseJoin);
-//		}
-//
-//		if (embeddedExportedProperties) {
-//			// use the EmbeddedId object instead of the parentBean
-//			BeanProperty idProp = descriptor.getIdProperty();
-//			parentBean = (EntityBean)idProp.getValue(parentBean);
-//		}
-//
-//		for (int i = 0; i < exportedProperties.length; i++) {
-//			Object val = exportedProperties[i].getValue(parentBean);
-//			String fkColumn = exportedProperties[i].getForeignDbColumn();
-//			if (!manyToMany){
-//				fkColumn = targetDescriptor.getBaseTableAlias()+"."+fkColumn;
-//			} else {
-//				// use hard coded alias for intersection table
-//				fkColumn = "int_."+fkColumn;
-//			}
-//			query.where().eq(fkColumn, val);
-//		}
-//
-//		if (extraWhere != null){
-//			// replace the table alias place holder
-//			String ta = targetDescriptor.getBaseTableAlias();
-//			String where = StringHelper.replaceString(extraWhere, "${ta}", ta);
-//			query.where().raw(where);
-//		}
-//
-//		if (fetchOrderBy != null){
-//			query.order(fetchOrderBy);
-//		}
-//	}
-
   /**
    * Create the array of ExportedProperty used to build reference objects.
    */
@@ -776,7 +753,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
 
     String searchTable;
     TableJoinColumn[] columns;
-    if (manyToMany) {
+    if (hasJoinTable()) {
       // look for column going to intersection
       columns = intersectionJoin.columns();
       searchTable = intersectionJoin.getTable();
@@ -1024,4 +1001,14 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
     return liveMap;
   }
 
+  public boolean isIncludeCascadeSave() {
+    // Note ManyToMany always included as we always 'save'
+    // the relationship via insert/delete of intersection table
+    // REMOVALS means including PrivateOwned relationships
+    return cascadeInfo.isSave() || hasJoinTable() || ModifyListenMode.REMOVALS == modifyListenMode;
+  }
+
+  public boolean isIncludeCascadeDelete() {
+    return cascadeInfo.isDelete() || o2mJoinTable || ModifyListenMode.REMOVALS == modifyListenMode;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java
index 121938fab..112223110 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java
@@ -21,6 +21,8 @@ public class DeployBeanPropertyAssocMany<T> extends DeployBeanPropertyAssoc<T> {
    */
   private boolean manyToMany;
 
+  private boolean o2mJoinTable;
+
   /**
    * Flag to indicate this is a unidirectional relationship.
    */
@@ -220,4 +222,14 @@ public class DeployBeanPropertyAssocMany<T> extends DeployBeanPropertyAssoc<T> {
   public boolean hasOrderColumn() {
     return orderColumn != null;
   }
+
+  public boolean isO2mJoinTable() {
+    return o2mJoinTable;
+  }
+
+  public void setO2mJoinTable() {
+    this.o2mJoinTable = true;
+    setModifyListenMode(ModifyListenMode.ALL);
+  }
 }
+
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
index c8bcfc6ce..b67093ec3 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.deploy.meta;
 
-import io.ebean.bean.BeanCollection.ModifyListenMode;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanDescriptorMap;
 import io.ebeaninternal.server.deploy.BeanProperty;
@@ -437,17 +436,12 @@ public class DeployBeanPropertyLists {
     for (BeanPropertyAssocMany<?> prop : manys) {
       switch (mode) {
         case Save:
-          if (prop.getCascadeInfo().isSave() || prop.isManyToMany()
-            || ModifyListenMode.REMOVALS == prop.getModifyListenMode()) {
-            // Note ManyToMany always included as we always 'save'
-            // the relationship via insert/delete of intersection table
-            // REMOVALS means including PrivateOwned relationships
+          if (prop.isIncludeCascadeSave()) {
             list.add(prop);
           }
           break;
         case Delete:
-          if (prop.getCascadeInfo().isDelete() || ModifyListenMode.REMOVALS == prop.getModifyListenMode()) {
-            // REMOVALS means including PrivateOwned relationships
+          if (prop.isIncludeCascadeDelete()) {
             list.add(prop);
           }
           break;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index a451886ba..df4edb1d6 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -122,8 +122,10 @@ class AnnotationAssocManys extends AnnotationParser {
         readJoinTable(joinTable, prop);
 
       } else {
-        // OneToMany in theory
-        prop.getTableJoin().addJoinColumn(true, joinTable.joinColumns(), beanTable);
+        // OneToMany with @JoinTable
+        prop.setO2mJoinTable();
+        readJoinTable(joinTable, prop);
+        manyToManyDefaultJoins(prop);
       }
     }
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 3c9effc4d..41cce82bf 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -825,7 +825,7 @@ public final class DefaultPersister implements Persister {
 
   private void saveMany(SaveManyPropRequest saveMany, boolean insertMode) {
 
-    if (saveMany.getMany().isManyToMany()) {
+    if (saveMany.getMany().hasJoinTable()) {
 
       // check if we can save the m2m intersection in this direction
       // we only allow one direction based on first traversed basis
@@ -925,13 +925,19 @@ public final class DefaultPersister implements Persister {
         throw new PersistenceException(msg);
       }
       if (!vanillaCollection) {
-        ((BeanCollection<?>) value).modifyReset();
+        BeanCollection<?> manyValue = (BeanCollection<?>) value;
+        setListenMode(manyValue, prop);
+        manyValue.modifyReset();
       }
     } else {
       // BeanCollection so get the additions/deletions
       BeanCollection<?> manyValue = (BeanCollection<?>) value;
-      additions = manyValue.getModifyAdditions();
-      deletions = manyValue.getModifyRemovals();
+      if (setListenMode(manyValue, prop)) {
+        additions = manyValue.getActualDetails();
+      } else {
+        additions = manyValue.getModifyAdditions();
+        deletions = manyValue.getModifyRemovals();
+      }
       // reset so the changes are only processed once
       manyValue.modifyReset();
     }
@@ -986,6 +992,19 @@ public final class DefaultPersister implements Persister {
     t.depth(-1);
   }
 
+  /**
+   * Check if we need to set the listen mode (on new collections persisted for the first time).
+   */
+  private boolean setListenMode(BeanCollection<?> manyValue, BeanPropertyAssocMany<?> prop) {
+    ModifyListenMode mode = manyValue.getModifyListening();
+    if (mode == null) {
+      // new collection persisted for the first time
+      manyValue.setModifyListening(prop.getModifyListenMode());
+      return true;
+    }
+    return false;
+  }
+
   private int deleteAssocManyIntersection(EntityBean bean, BeanPropertyAssocMany<?> many, Transaction t, boolean publish) {
 
     // delete all intersection rows for this bean
@@ -1039,7 +1058,7 @@ public final class DefaultPersister implements Persister {
     // Many's with delete cascade
     BeanPropertyAssocMany<?>[] manys = desc.propertiesManyDelete();
     for (BeanPropertyAssocMany<?> many : manys) {
-      if (many.isManyToMany()) {
+      if (many.hasJoinTable()) {
         if (!softDelete) {
           // delete associated rows from intersection table (but not during soft delete)
           deleteAssocManyIntersection(parentBean, many, t, request.isPublish());
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyPropRequest.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyPropRequest.java
index f25fd9d48..4556edcd2 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyPropRequest.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyPropRequest.java
@@ -175,7 +175,7 @@ class SaveManyPropRequest {
       if (detailBean instanceof EntityBean) {
         EntityBean detail = (EntityBean) detailBean;
         EntityBeanIntercept ebi = detail._ebean_getIntercept();
-        if (many.isManyToMany()) {
+        if (many.hasJoinTable()) {
           skipSavingThisBean = targetDescriptor.isReference(ebi);
         } else {
           if (orderColumn != null) {
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
index a041c49c2..22a3be01d 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
@@ -12,8 +12,8 @@ import io.ebeaninternal.api.SpiQuery.Mode;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssoc;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
+import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 import io.ebeaninternal.server.deploy.DbReadContext;
 import io.ebeaninternal.server.deploy.DbSqlContext;
 import io.ebeaninternal.server.deploy.InheritInfo;
@@ -597,7 +597,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
 
     if (nodeBeanProp instanceof BeanPropertyAssocMany<?>) {
       BeanPropertyAssocMany<?> manyProp = (BeanPropertyAssocMany<?>) nodeBeanProp;
-      if (manyProp.isManyToMany()) {
+      if (manyProp.hasJoinTable()) {
 
         String alias = ctx.getTableAlias(prefix);
         String[] split = SplitName.split(prefix);
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
index 93d664c79..d6d642166 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
@@ -105,7 +105,7 @@ class SqlTreeNodeExtraJoin implements SqlTreeNode {
 
     if (assocBeanProperty instanceof BeanPropertyAssocMany<?>) {
       BeanPropertyAssocMany<?> manyProp = (BeanPropertyAssocMany<?>) assocBeanProperty;
-      if (manyProp.isManyToMany()) {
+      if (manyProp.hasJoinTable()) {
 
         manyToMany = true;
 
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java
index 3ec80cbab..07ab86398 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java
@@ -96,7 +96,7 @@ class SqlTreeNodeManyWhereJoin implements SqlTreeNode {
 
     } else {
       BeanPropertyAssocMany<?> manyProp = (BeanPropertyAssocMany<?>) nodeBeanProp;
-      if (!manyProp.isManyToMany()) {
+      if (!manyProp.hasJoinTable()) {
         manyProp.addJoin(joinType, parentAlias, alias, ctx);
 
       } else {
diff --git a/src/test/java/io/ebean/BaseTestCase.java b/src/test/java/io/ebean/BaseTestCase.java
index effac9205..a7cbb0644 100644
--- a/src/test/java/io/ebean/BaseTestCase.java
+++ b/src/test/java/io/ebean/BaseTestCase.java
@@ -40,7 +40,7 @@ public abstract class BaseTestCase {
    * Return the generated sql trimming column alias if required.
    */
   protected String sqlOf(Query<?> query) {
-    return trimSql(query.getGeneratedSql(), 0);
+    return trimSql(query.getGeneratedSql());
   }
 
   /**
@@ -50,6 +50,15 @@ public abstract class BaseTestCase {
     return trimSql(query.getGeneratedSql(), columns);
   }
 
+  protected String trimSql(String sql) {
+
+    if (sql.contains(" c1,")) {
+      // for oracle we include column alias so lets remove those
+      return trimSql(sql, 10);
+    }
+    return trimSql(sql, 0);
+  }
+
   /**
    * Trim out column alias if required from the generated sql.
    */
diff --git a/src/test/java/org/tests/o2m/jointable/JtMonkey.java b/src/test/java/org/tests/o2m/jointable/JtMonkey.java
new file mode 100644
index 000000000..eda26cf3d
--- /dev/null
+++ b/src/test/java/org/tests/o2m/jointable/JtMonkey.java
@@ -0,0 +1,57 @@
+package org.tests.o2m.jointable;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name="monkey")
+public class JtMonkey {
+
+  @Id
+  long mid;
+
+  String name;
+
+  String foodPreference;
+
+  @Version
+  long version;
+
+  public JtMonkey(String name) {
+    this.name = name;
+  }
+
+  public long getMid() {
+    return mid;
+  }
+
+  public void setMid(long mid) {
+    this.mid = mid;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getFoodPreference() {
+    return foodPreference;
+  }
+
+  public void setFoodPreference(String foodPreference) {
+    this.foodPreference = foodPreference;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/o2m/jointable/JtTrainer.java b/src/test/java/org/tests/o2m/jointable/JtTrainer.java
new file mode 100644
index 000000000..66a2e3474
--- /dev/null
+++ b/src/test/java/org/tests/o2m/jointable/JtTrainer.java
@@ -0,0 +1,66 @@
+package org.tests.o2m.jointable;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinTable;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.Version;
+import java.util.List;
+
+@Entity
+@Table(name="trainer")
+public class JtTrainer {
+
+  @Id
+  long tid;
+
+  String name;
+
+  /**
+   * Cascade so maintain join table and save any dirty Monkey beans.
+   */
+  @OneToMany(cascade = CascadeType.PERSIST)
+  @JoinTable(name = "trainer_monkey")
+  List<JtMonkey> monkeys;
+
+  @Version
+  long version;
+
+  public JtTrainer(String name) {
+    this.name = name;
+  }
+
+  public long getTid() {
+    return tid;
+  }
+
+  public void setTid(long tid) {
+    this.tid = tid;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public List<JtMonkey> getMonkeys() {
+    return monkeys;
+  }
+
+  public void setMonkeys(List<JtMonkey> monkeys) {
+    this.monkeys = monkeys;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/o2m/jointable/JtTroop.java b/src/test/java/org/tests/o2m/jointable/JtTroop.java
new file mode 100644
index 000000000..06a4b79eb
--- /dev/null
+++ b/src/test/java/org/tests/o2m/jointable/JtTroop.java
@@ -0,0 +1,65 @@
+package org.tests.o2m.jointable;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinTable;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.Version;
+import java.util.List;
+
+@Entity
+@Table(name="troop")
+public class JtTroop {
+
+  @Id
+  long pid;
+
+  String name;
+
+  /**
+   * No cascading over to Monkey but we do maintain the join table regardless.
+   */
+  @OneToMany
+  @JoinTable(name = "troop_monkey")
+  List<JtMonkey> monkeys;
+
+  @Version
+  long version;
+
+  public JtTroop(String name) {
+    this.name = name;
+  }
+
+  public long getPid() {
+    return pid;
+  }
+
+  public void setPid(long pid) {
+    this.pid = pid;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public List<JtMonkey> getMonkeys() {
+    return monkeys;
+  }
+
+  public void setMonkeys(List<JtMonkey> monkeys) {
+    this.monkeys = monkeys;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java
new file mode 100644
index 000000000..dd7f6b6c1
--- /dev/null
+++ b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java
@@ -0,0 +1,115 @@
+package org.tests.o2m.jointable;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestOneToManyJoinTable extends BaseTestCase {
+
+  private JtTroop troop = new JtTroop("Blue");
+
+  private JtMonkey m0 = new JtMonkey("Sim");
+  private JtMonkey m1 = new JtMonkey("Tim");
+  private JtMonkey m2 = new JtMonkey("Uim");
+
+  private void initialInsert() {
+    Ebean.saveAll(Arrays.asList(troop, m0, m1, m2));
+  }
+
+  @Test
+  public void base() {
+
+    initialInsert();
+
+    LoggedSqlCollector.start();
+
+    // make m0 dirty ... but no cascade saved?
+    m0.setFoodPreference("banana");
+    troop.getMonkeys().add(m0);
+    troop.getMonkeys().add(m1);
+
+    Ebean.save(troop);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("insert into troop_monkey (troop_pid, monkey_mid) values (?, ?)");
+
+    int intersectionRows = Ebean.createSqlQuery("select count(*) as total from troop_monkey where troop_pid = ?")
+      .setParameter(1, troop.getPid())
+      .findOne()
+      .getInteger("total");
+
+    assertThat(intersectionRows).isEqualTo(2);
+
+    LoggedSqlCollector.current();
+    JtTroop fetchTroop = Ebean.find(JtTroop.class)
+      .fetch("monkeys")
+      .where().idEq(troop.getPid())
+      .findOne();
+
+    assertThat(fetchTroop.getMonkeys()).hasSize(2);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(1);
+    assertThat(trimSql(sql.get(0))).contains("from troop t0 left join troop_monkey t1z_ on t1z_.troop_pid = t0.pid  left join monkey t1 on t1.mid = t1z_.monkey_mid  where t0.pid = ?");
+    assertThat(trimSql(sql.get(0))).contains("select t0.pid, t0.name, t0.version, t1.mid, t1.name, t1.food_preference, t1.version");
+
+    Ebean.delete(troop);
+
+    sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("delete from troop_monkey where troop_pid = ?");
+    assertThat(sql.get(1)).contains("delete from troop where pid=? and version=?");
+
+
+    insertWithCascade();
+  }
+
+  private void insertWithCascade() {
+
+    JtTrainer trainer = new JtTrainer("Frank");
+
+    // make m2 dirty ... cascades to an update on Uim
+    m2.setFoodPreference("Apple");
+    trainer.getMonkeys().add(m2);
+    trainer.getMonkeys().add(Ebean.getReference(JtMonkey.class, m1.getMid()));
+    trainer.getMonkeys().add(new JtMonkey("FAlp"));
+    trainer.getMonkeys().add(new JtMonkey("FBet"));
+    trainer.getMonkeys().add(new JtMonkey("FThe"));
+
+    LoggedSqlCollector.start();
+    Ebean.save(trainer);
+
+    List<String> sql = LoggedSqlCollector.current();
+
+    assertThat(sql).hasSize(6);
+    assertThat(sql.get(0)).contains("insert into trainer ");
+    assertThat(sql.get(1)).contains("insert into monkey ");
+    assertThat(sql.get(4)).contains("update monkey set name=?, food_preference=?, version=? where mid=? and version=?");
+    assertThat(sql.get(5)).contains("insert into trainer_monkey ");
+
+
+    int intersectionRows = Ebean.createSqlQuery("select count(*) as total from trainer_monkey where trainer_tid = ?")
+      .setParameter(1, trainer.getTid())
+      .findOne()
+      .getInteger("total");
+
+    assertThat(intersectionRows).isEqualTo(5);
+
+
+    LoggedSqlCollector.current();
+    Ebean.delete(trainer);
+
+    sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("delete from trainer_monkey where trainer_tid = ?");
+    assertThat(sql.get(1)).contains("delete from trainer where tid=?");
+
+  }
+}

From 3e8b06e38ea9864cec2d5fe7c6405ce1ce29c8b0 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 20 Feb 2018 16:59:55 +1300
Subject: [PATCH 0041/1036] #994 - @OneToOne cacade does not honor
 orphanRemoval = true

---
 .../server/core/PersistRequestBean.java       | 16 +++-
 .../server/deploy/BeanPropertyAssocOne.java   |  7 ++
 .../meta/DeployBeanPropertyAssocOne.java      | 10 +++
 .../deploy/parse/AnnotationAssocOnes.java     |  1 +
 .../server/persist/DefaultPersister.java      |  9 +++
 .../org/tests/model/onetoone/OtoCust.java     | 61 +++++++++++++++
 .../tests/model/onetoone/OtoCustAddress.java  | 76 +++++++++++++++++++
 .../onetoone/TestOneToOneOrphanRemove.java    | 50 ++++++++++++
 8 files changed, 229 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/org/tests/model/onetoone/OtoCust.java
 create mode 100644 src/test/java/org/tests/model/onetoone/OtoCustAddress.java
 create mode 100644 src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java

diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index 3cfca39d7..6160691c2 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -11,8 +11,8 @@ import io.ebean.event.BeanPersistRequest;
 import io.ebean.event.changelog.BeanChange;
 import io.ebeaninternal.api.ConcurrencyMode;
 import io.ebeaninternal.api.SpiEbeanServer;
-import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.api.SpiProfileTransactionEvent;
+import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.api.TransactionEvent;
 import io.ebeaninternal.server.cache.CacheChangeSet;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
@@ -713,6 +713,20 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
     return intercept.isLoadedProperty(prop.getPropertyIndex());
   }
 
+  /**
+   * Return true if the property is dirty.
+   */
+  public boolean isDirtyProperty(BeanProperty prop) {
+    return intercept.isDirtyProperty(prop.getPropertyIndex());
+  }
+
+  /**
+   * Return the original / old value for the given property.
+   */
+  public Object getOrigValue(BeanProperty prop) {
+    return intercept.getOrigValue(prop.getPropertyIndex());
+  }
+
   @Override
   public int executeNow() {
     if (getterCallback) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index 04e953aca..df0a7b8ae 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -37,6 +37,8 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
 
   private final boolean oneToOneExported;
 
+  private final boolean orphanRemoval;
+
   private final boolean importedPrimaryKey;
 
   private final boolean primaryKeyExport;
@@ -76,6 +78,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
     importedPrimaryKey = deploy.isImportedPrimaryKey();
     oneToOne = deploy.isOneToOne();
     oneToOneExported = deploy.isOneToOneExported();
+    orphanRemoval = deploy.isOrphanRemoval();
 
     if (embedded) {
       // Overriding of the columns and use table alias of owning BeanDescriptor
@@ -338,6 +341,10 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
     return oneToOneExported;
   }
 
+  public boolean isOrphanRemoval() {
+    return orphanRemoval;
+  }
+
   /**
    * If true this bean maps to the primary key.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
index 93c57efb7..021f5e2f8 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
@@ -25,6 +25,8 @@ public class DeployBeanPropertyAssocOne<T> extends DeployBeanPropertyAssoc<T> {
 
   private PropertyForeignKey foreignKey;
 
+  private boolean orphanRemoval;
+
   /**
    * Create the property.
    */
@@ -160,4 +162,12 @@ public class DeployBeanPropertyAssocOne<T> extends DeployBeanPropertyAssoc<T> {
   public PropertyForeignKey getForeignKey() {
     return foreignKey;
   }
+
+  public void setOrphanRemoval(boolean orphanRemoval) {
+    this.orphanRemoval = orphanRemoval;
+  }
+
+  public boolean isOrphanRemoval() {
+    return orphanRemoval;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index 15a3ed4de..872d97c0d 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -216,6 +216,7 @@ public class AnnotationAssocOnes extends AnnotationParser {
     prop.setMappedBy(propAnn.mappedBy());
     if (!"".equals(propAnn.mappedBy())) {
       prop.setOneToOneExported();
+      prop.setOrphanRemoval(propAnn.orphanRemoval());
     }
 
     setCascadeTypes(propAnn.cascade(), prop.getCascadeInfo());
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 41cce82bf..48538582a 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -1173,6 +1173,15 @@ public final class DefaultPersister implements Persister {
         }
       }
     }
+
+    for (BeanPropertyAssocOne<?> prop : desc.propertiesOneExportedSave()) {
+      if (prop.isOrphanRemoval() && request.isDirtyProperty(prop)) {
+        Object origValue = request.getOrigValue(prop);
+        if (origValue instanceof EntityBean) {
+          delete((EntityBean) origValue, request.getTransaction(), true);
+        }
+      }
+    }
   }
 
   /**
diff --git a/src/test/java/org/tests/model/onetoone/OtoCust.java b/src/test/java/org/tests/model/onetoone/OtoCust.java
new file mode 100644
index 000000000..50f5efad6
--- /dev/null
+++ b/src/test/java/org/tests/model/onetoone/OtoCust.java
@@ -0,0 +1,61 @@
+package org.tests.model.onetoone;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Version;
+
+@Entity
+public class OtoCust {
+
+  @Id
+  long cid;
+
+  String name;
+
+  /**
+   * Orphan removal so must delete 'old' address when it has been replace or set to null.
+   */
+  @OneToOne(mappedBy = "customer", cascade = CascadeType.ALL, orphanRemoval = true)
+  OtoCustAddress address;
+
+  @Version
+  long version;
+
+  public OtoCust(String name) {
+    this.name = name;
+  }
+
+  public long getCid() {
+    return cid;
+  }
+
+  public void setCid(long cid) {
+    this.cid = cid;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public OtoCustAddress getAddress() {
+    return address;
+  }
+
+  public void setAddress(OtoCustAddress address) {
+    this.address = address;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/onetoone/OtoCustAddress.java b/src/test/java/org/tests/model/onetoone/OtoCustAddress.java
new file mode 100644
index 000000000..25bba8431
--- /dev/null
+++ b/src/test/java/org/tests/model/onetoone/OtoCustAddress.java
@@ -0,0 +1,76 @@
+package org.tests.model.onetoone;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Version;
+
+@Entity
+public class OtoCustAddress {
+
+  @Id
+  long aid;
+
+  String line1;
+  String line2;
+  String line3;
+
+  @OneToOne
+  OtoCust customer;
+
+  @Version
+  long version;
+
+  public OtoCustAddress(String line1, String line2) {
+    this.line1 = line1;
+    this.line2 = line2;
+  }
+
+  public long getAid() {
+    return aid;
+  }
+
+  public void setAid(long aid) {
+    this.aid = aid;
+  }
+
+  public OtoCust getCustomer() {
+    return customer;
+  }
+
+  public void setCustomer(OtoCust customer) {
+    this.customer = customer;
+  }
+
+  public String getLine1() {
+    return line1;
+  }
+
+  public void setLine1(String line1) {
+    this.line1 = line1;
+  }
+
+  public String getLine2() {
+    return line2;
+  }
+
+  public void setLine2(String line2) {
+    this.line2 = line2;
+  }
+
+  public String getLine3() {
+    return line3;
+  }
+
+  public void setLine3(String line3) {
+    this.line3 = line3;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java b/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java
new file mode 100644
index 000000000..8ab94707e
--- /dev/null
+++ b/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java
@@ -0,0 +1,50 @@
+package org.tests.model.onetoone;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestOneToOneOrphanRemove extends BaseTestCase {
+
+  @Test
+  public void base() {
+
+    OtoCust jack = new OtoCust("Jack");
+
+    OtoCustAddress address = new OtoCustAddress("line1", "line2");
+
+    jack.setAddress(address);
+    Ebean.save(jack);
+
+    // set new address
+    OtoCustAddress address2 = new OtoCustAddress("other1", "other2");
+    jack.setAddress(address2);
+
+    // Fail do to uniqueness constraint
+    LoggedSqlCollector.start();
+    Ebean.save(jack);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(3);
+    assertThat(sql.get(0)).contains("delete from oto_cust_address where aid=? and version=?");
+    assertThat(sql.get(1)).contains("update oto_cust set version=? where cid=? and version=?");
+    assertThat(sql.get(2)).contains("insert into oto_cust_address (line1, line2, line3, version, customer_cid)");
+
+    jack.setAddress(null);
+    Ebean.save(jack);
+
+    sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("delete from oto_cust_address where aid=? and version=?");
+    assertThat(sql.get(1)).contains("update oto_cust set version=? where cid=? and version=?");
+
+    OtoCustAddress foundAddress = Ebean.find(OtoCustAddress.class, address2.getAid());
+    assertThat(foundAddress).isNull();
+  }
+
+}

From 0b1c3a4233f553cfbc8109b483a203d977a6b854 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 21 Feb 2018 09:44:07 +1300
Subject: [PATCH 0042/1036] Bump version to 11.11.1-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b5f9956c8..28d25e71c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.10.7-SNAPSHOT</version>
+  <version>11.11.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>

From eaa48468cdacbaec6d0692481955c8ead5f3c5bb Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 21 Feb 2018 09:44:37 +1300
Subject: [PATCH 0043/1036] #1174 - ENH: Support mapping @TenantId to an entity
 bean via @ManyToOne

---
 .../server/core/PersistRequestBean.java       |  2 +-
 .../server/deploy/BeanDescriptor.java         | 27 +++++++++++++++++--
 .../server/deploy/BeanProperty.java           | 17 +++++++++++-
 .../server/deploy/BeanPropertyAssocMany.java  |  2 +-
 .../server/deploy/BeanPropertyAssocOne.java   | 13 ++++++++-
 .../deploy/meta/DeployBeanPropertyLists.java  |  5 ++--
 .../deploy/parse/AnnotationAssocOnes.java     |  4 +++
 .../server/persist/DefaultPersister.java      |  2 +-
 .../server/deploy/BeanDescriptorTest.java     |  5 +++-
 9 files changed, 67 insertions(+), 10 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index 6160691c2..8c0113b1e 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -642,7 +642,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    * Create and return a new reference bean matching this beans Id value.
    */
   public T createReference() {
-    return beanDescriptor.createReference(Boolean.FALSE, false, getBeanId(), null);
+    return beanDescriptor.createReference(getBeanId(), null);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 1c34a0783..87161ce55 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -1204,7 +1204,7 @@ public class BeanDescriptor<T> implements BeanType<T> {
     if (tenant != null && !query.isNativeSql()) {
       Object tenantId = ebeanServer.currentTenantId();
       if (tenantId != null) {
-        query.where().eq(tenant.getName(), tenantId);
+        tenant.addTenant(query, tenantId);
       }
     }
     if (isDocStoreOnly()) {
@@ -1872,6 +1872,29 @@ public class BeanDescriptor<T> implements BeanType<T> {
     }
   }
 
+  /**
+   * Create a non read only reference bean without checking cacheSharableBeans.
+   */
+  @SuppressWarnings("unchecked")
+  public T createReference(Object id, PersistenceContext pc) {
+
+    try {
+      EntityBean eb = createEntityBean();
+      id = convertSetId(id, eb);
+      EntityBeanIntercept ebi = eb._ebean_getIntercept();
+      ebi.setBeanLoader(ebeanServer);
+      ebi.setReference(idPropertyIndex);
+      if (pc != null) {
+        contextPut(pc, id, eb);
+        ebi.setPersistenceContext(pc);
+      }
+      return (T) eb;
+
+    } catch (Exception ex) {
+      throw new PersistenceException(ex);
+    }
+  }
+
   /**
    * Return the bean property traversing the object graph and taking into
    * account inheritance.
@@ -2725,7 +2748,7 @@ public class BeanDescriptor<T> implements BeanType<T> {
    */
   public void setTenantId(EntityBean entityBean, Object tenantId) {
     if (tenant != null) {
-      tenant.setValue(entityBean, tenantId);
+      tenant.setTenantValue(entityBean, tenantId);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 05f1d8d70..03b4bb2bd 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -9,8 +9,10 @@ import io.ebean.config.dbplatform.DbEncryptFunction;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.plugin.Property;
 import io.ebean.text.StringParser;
+import io.ebean.util.SplitName;
 import io.ebean.util.StringHelper;
 import io.ebeaninternal.api.SpiExpressionRequest;
+import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.core.InternString;
 import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty;
 import io.ebeaninternal.server.deploy.generatedproperty.GeneratedWhenCreated;
@@ -20,7 +22,6 @@ import io.ebeaninternal.server.el.ElPropertyChainBuilder;
 import io.ebeaninternal.server.el.ElPropertyValue;
 import io.ebeaninternal.server.properties.BeanPropertyGetter;
 import io.ebeaninternal.server.properties.BeanPropertySetter;
-import io.ebean.util.SplitName;
 import io.ebeaninternal.server.query.SqlBeanLoad;
 import io.ebeaninternal.server.query.SqlJoinType;
 import io.ebeaninternal.server.text.json.ReadJson;
@@ -720,6 +721,20 @@ public class BeanProperty implements ElPropertyValue, Property {
     bean._ebean_getIntercept().setChangedProperty(propertyIndex);
   }
 
+  /**
+   * Add the tenantId predicate to the query.
+   */
+  public void addTenant(SpiQuery<?> query, Object tenantId) {
+    query.where().eq(name, tenantId);
+  }
+
+  /**
+   * Set the tenantId onto the bean.
+   */
+  public void setTenantValue(EntityBean entityBean, Object tenantId) {
+    setValue(entityBean, tenantId);
+  }
+
   /**
    * Set the value of the property without interception or
    * PropertyChangeSupport.
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index 7c2f3cc08..c58c658db 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -967,7 +967,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
       if (isManyToMany()) {
         if (liveBean == null) {
           // add new relationship (Map not allowed here)
-          liveVal.addBean(targetDescriptor.createReference(Boolean.FALSE, false, id, null));
+          liveVal.addBean(targetDescriptor.createReference(id, null));
         }
 
       } else {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index df0a7b8ae..584f0fbfb 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -8,6 +8,7 @@ import io.ebean.ValuePair;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.PersistenceContext;
 import io.ebean.util.SplitName;
+import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.cache.CacheChangeSet;
 import io.ebeaninternal.server.cache.CachedBeanData;
 import io.ebeaninternal.server.core.DefaultSqlUpdate;
@@ -419,7 +420,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
         // cacheData is the id value, maybe already in persistence context
         Object assocBean = targetDescriptor.contextGet(context, cacheData);
         if (assocBean == null) {
-          assocBean = targetDescriptor.createReference(Boolean.FALSE, false, cacheData, context);
+          assocBean = targetDescriptor.createReference(cacheData, context);
         }
         setValue(bean, assocBean);
       }
@@ -605,6 +606,16 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
     return localHelp.read(ctx);
   }
 
+  public void addTenant(SpiQuery<?> query, Object tenantId) {
+    T refBean = targetDescriptor.createReference(tenantId, null);
+    query.where().eq(name, refBean);
+  }
+
+  public void setTenantValue(EntityBean entityBean, Object tenantId) {
+    T refBean = targetDescriptor.createReference(tenantId, null);
+    setValue(entityBean, refBean);
+  }
+
   @Override
   public void setValue(EntityBean bean, Object value) {
     super.setValue(bean, value);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
index b67093ec3..8c849e76b 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
@@ -207,6 +207,9 @@ public class DeployBeanPropertyLists {
 
     } else {
       nonManys.add(prop);
+      if (prop.isTenantId()) {
+        tenant = prop;
+      }
       if (prop instanceof BeanPropertyAssocOne<?>) {
         BeanPropertyAssocOne<?> assocOne = (BeanPropertyAssocOne<?>) prop;
         if (prop.isEmbedded()) {
@@ -227,8 +230,6 @@ public class DeployBeanPropertyLists {
           }
         } else if (prop.isDraftDirty()) {
           draftDirty = prop;
-        } else if (prop.isTenantId()) {
-          tenant = prop;
         }
         if (!prop.isAggregation()) {
           baseScalar.add(prop);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index 872d97c0d..7c614dee6 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.deploy.parse;
 
 import io.ebean.annotation.DbForeignKey;
 import io.ebean.annotation.FetchPreference;
+import io.ebean.annotation.TenantId;
 import io.ebean.annotation.Where;
 import io.ebean.config.NamingConvention;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
@@ -63,6 +64,9 @@ public class AnnotationAssocOnes extends AnnotationParser {
     ManyToOne manyToOne = get(prop, ManyToOne.class);
     if (manyToOne != null) {
       readManyToOne(manyToOne, prop);
+      if (get(prop, TenantId.class) != null) {
+        prop.setTenantId();
+      }
     }
     OneToOne oneToOne = get(prop, OneToOne.class);
     if (oneToOne != null) {
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 48538582a..bc6a5cfe8 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -1138,7 +1138,7 @@ public final class DefaultPersister implements Persister {
       // convert into a list of reference objects and perform delete by object
       List<Object> refList = new ArrayList<>(childIds.size());
       for (Object id : childIds) {
-        refList.add(targetDesc.createReference(null, false, id, null));
+        refList.add(targetDesc.createReference(id, null));
       }
       deleteList(refList, t, softDelete);
 
diff --git a/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java b/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java
index 795ffe6f4..fa9762127 100644
--- a/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java
+++ b/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java
@@ -3,9 +3,9 @@ package io.ebeaninternal.server.deploy;
 import io.ebean.BaseTestCase;
 import io.ebean.bean.EntityBean;
 import io.ebean.plugin.Property;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
-import org.junit.Test;
 
 import java.util.Collection;
 
@@ -35,6 +35,9 @@ public class BeanDescriptorTest extends BaseTestCase {
 
     Customer bean = customerDesc.createReference(Boolean.FALSE, false, 42, null);
     assertThat(server().getBeanState(bean).isReadOnly()).isFalse();
+
+    bean = customerDesc.createReference(42, null);
+    assertThat(server().getBeanState(bean).isReadOnly()).isFalse();
   }
 
   @Test

From 83384c6f0e3f87d2f9dd458674f86eef58fe4a36 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 21 Feb 2018 11:04:04 +1300
Subject: [PATCH 0044/1036] #323 - DDL Generation support for foreign key
 cascade options

Tidy up, no GLOBAL_DEFAULT.
---
 pom.xml                                                       | 2 +-
 .../dbmigration/ddlgeneration/platform/PlatformDdl.java       | 2 +-
 .../io/ebeaninternal/server/deploy/PropertyForeignKey.java    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 28d25e71c..1a19a7abd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>3.7</version>
+      <version>3.8</version>
     </dependency>
 
     <dependency>
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
index 3088e49c1..55057bddf 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -389,7 +389,7 @@ public class PlatformDdl {
   }
 
   protected ConstraintMode withDefault(ConstraintMode mode) {
-    return (mode == null || mode == ConstraintMode.GLOBAL_DEFAULT) ? ConstraintMode.RESTRICT : mode;
+    return (mode == null) ? ConstraintMode.RESTRICT : mode;
   }
 
   protected void appendForeignKeyOnDelete(StringBuilder buffer, ConstraintMode mode) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/PropertyForeignKey.java b/src/main/java/io/ebeaninternal/server/deploy/PropertyForeignKey.java
index 8badce0ce..480362e2a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/PropertyForeignKey.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/PropertyForeignKey.java
@@ -16,8 +16,8 @@ public class PropertyForeignKey {
   public PropertyForeignKey() {
     this.noConstraint = true;
     this.noIndex = false;
-    this.onDelete = ConstraintMode.GLOBAL_DEFAULT;
-    this.onUpdate = ConstraintMode.GLOBAL_DEFAULT;
+    this.onDelete = ConstraintMode.RESTRICT;
+    this.onUpdate = ConstraintMode.RESTRICT;
   }
 
   /**

From 4d122ea05be13b6f960262525cec89ada54dd90d Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 22 Feb 2018 22:09:53 +1300
Subject: [PATCH 0045/1036] #1267 - DDL issue on @OneToMany @JoinTable ...
 extra unnecessary index created on fk column

---
 .../java/io/ebeaninternal/dbmigration/model/MTable.java   | 8 ++++++++
 .../model/build/ModelBuildPropertyVisitor.java            | 1 +
 2 files changed, 9 insertions(+)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
index 7e02a0e03..a92408496 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
@@ -656,4 +656,12 @@ public class MTable {
     return draftTableName + "." + references.substring(lastDot + 1);
   }
 
+  /**
+   * Clear the indexes on the foreign keys as they are covered by unique constraints.
+   */
+  public void clearForeignKeyIndexes() {
+    for (MCompoundForeignKey compoundKey : compoundKeys) {
+      compoundKey.setIndexName(null);
+    }
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
index 8d9f64be5..f6a939d1a 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
@@ -133,6 +133,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
         // in the middle of rendering the create table DDL
         MTable intersectionTable = new ModelBuildIntersectionTable(ctx, p).build();
         if (p.isO2mJoinTable()) {
+          intersectionTable.clearForeignKeyIndexes();
           Collection<MColumn> cols = intersectionTable.allColumns();
           if (cols.size() == 2) {
             // always the second column that we put the unique constraint on

From dd907cc4bc9aa138365e79f1a0b458ce615367ec Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 22 Feb 2018 22:10:59 +1300
Subject: [PATCH 0046/1036] Test only change - fix keys for testing against
 Oracle

---
 src/test/java/org/tests/compositekeys/db/ItemKey.java | 4 ++--
 src/test/java/org/tests/model/composite/ROrderPK.java | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/test/java/org/tests/compositekeys/db/ItemKey.java b/src/test/java/org/tests/compositekeys/db/ItemKey.java
index 0f4589612..adc176769 100644
--- a/src/test/java/org/tests/compositekeys/db/ItemKey.java
+++ b/src/test/java/org/tests/compositekeys/db/ItemKey.java
@@ -7,11 +7,11 @@ import javax.validation.constraints.Size;
 
 @Embeddable
 public class ItemKey {
-  @Size(max=127)
+
   private int customer;
 
   @Column(name = "itemnumber")
-  @Size(max=127)
+  @Size(max = 127)
   private String itemNumber;
 
   public int getCustomer() {
diff --git a/src/test/java/org/tests/model/composite/ROrderPK.java b/src/test/java/org/tests/model/composite/ROrderPK.java
index 2c808d82b..3952899e2 100644
--- a/src/test/java/org/tests/model/composite/ROrderPK.java
+++ b/src/test/java/org/tests/model/composite/ROrderPK.java
@@ -1,10 +1,9 @@
 package org.tests.model.composite;
 
 
-import java.io.Serializable;
-
 import javax.persistence.Embeddable;
 import javax.validation.constraints.Size;
+import java.io.Serializable;
 
 /**
  * @author rnentjes
@@ -16,7 +15,6 @@ public class ROrderPK implements Serializable {
   @Size(max=127)
   private String company;
 
-  @Size(max=127)
   private Integer orderNumber;
 
   public ROrderPK() {

From 20bd2241e4b471116361a855e2b0c68a1429529c Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 22 Feb 2018 22:11:36 +1300
Subject: [PATCH 0047/1036] Test only change - fix test assert to support
 sequence and identity insert

---
 .../java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java b/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java
index 8ab94707e..3dca53db0 100644
--- a/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java
+++ b/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java
@@ -33,7 +33,7 @@ public class TestOneToOneOrphanRemove extends BaseTestCase {
     assertThat(sql).hasSize(3);
     assertThat(sql.get(0)).contains("delete from oto_cust_address where aid=? and version=?");
     assertThat(sql.get(1)).contains("update oto_cust set version=? where cid=? and version=?");
-    assertThat(sql.get(2)).contains("insert into oto_cust_address (line1, line2, line3, version, customer_cid)");
+    assertThat(sql.get(2)).contains("insert into oto_cust_address ");
 
     jack.setAddress(null);
     Ebean.save(jack);

From f2d438f21af8f671813dadb3b33ce6de5ad17702 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 22 Feb 2018 22:11:56 +1300
Subject: [PATCH 0048/1036] Test only change - fix test assert for sql server

---
 src/test/java/org/tests/query/finder/TestCustomerFinder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/src/test/java/org/tests/query/finder/TestCustomerFinder.java
index 554c6c9a1..bfd51e476 100644
--- a/src/test/java/org/tests/query/finder/TestCustomerFinder.java
+++ b/src/test/java/org/tests/query/finder/TestCustomerFinder.java
@@ -154,7 +154,7 @@ public class TestCustomerFinder extends BaseTestCase {
     Customer.find.byId(3);
 
     List<MetaQueryPlanStatistic> planStats = metaInfoManager.collectQueryPlanStatistics(true);
-    assertThat(planStats).hasSize(6);
+    assertThat(planStats.size()).isGreaterThan(4);
 
     for (MetaQueryPlanStatistic planStat : planStats) {
       System.out.println(planStat);

From ec7b376612e1277283bc40256fba8f455c735b5d Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 22 Feb 2018 22:12:30 +1300
Subject: [PATCH 0049/1036] Test only change - fix test assert for sql server

---
 src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
index e88673a5f..9b97f5888 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
@@ -58,7 +58,7 @@ public class DbMigrationTest extends BaseTestCase {
     }
   }
 
-  @IgnorePlatform(Platform.ORACLE)
+  @IgnorePlatform({Platform.ORACLE, Platform.SQLSERVER})
   @Test
   public void testRunMigration() throws IOException {
     // first clean up previously created objects

From 8ee68ac5e1f860444296f8b9ed6187d5c5b78634 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 22 Feb 2018 22:40:22 +1300
Subject: [PATCH 0050/1036] #1269 - Paging queries should not ALWAYS append an
 order by ID ... but only when the order by is empty

---
 .../server/deploy/BeanDescriptor.java             | 13 ++++---------
 .../ebeaninternal/server/query/CQueryEngine.java  |  2 +-
 .../server/querydefn/DefaultOrmQuery.java         |  9 +++++++++
 src/test/java/io/ebean/EbeanServer_eqlTest.java   |  4 ++--
 .../java/io/ebean/TestUnsetLoadedProperties.java  |  9 +++++++--
 .../query/TestAddOrderByWithFirstRowsMaxRows.java |  6 +++---
 .../org/tests/query/TestLimitAlterFetchMany.java  |  4 ++--
 .../java/org/tests/rawsql/TestRawSqlOrmQuery.java | 15 ++++++++++-----
 8 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 87161ce55..696fa5dbf 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.OrderBy;
 import io.ebean.PersistenceContextScope;
 import io.ebean.ProfileLocation;
 import io.ebean.Query;
@@ -3055,14 +3054,10 @@ public class BeanDescriptor<T> implements BeanType<T> {
   public void appendOrderById(SpiQuery<T> query) {
 
     if (idProperty != null && !idProperty.isEmbedded()) {
-      OrderBy<T> orderBy = query.getOrderBy();
-      if (orderBy == null || orderBy.isEmpty()) {
-        SpiRawSql rawSql = query.getRawSql();
-        if (rawSql != null) {
-          query.order(rawSql.getSql().getOrderBy());
-        }
-        query.order().asc(idProperty.getName());
-      } else if (!orderBy.containsProperty(idProperty.getName())) {
+      SpiRawSql rawSql = query.getRawSql();
+      if (rawSql != null) {
+        query.order(rawSql.getSql().getOrderBy());
+      } else {
         query.order().asc(idProperty.getName());
       }
     }
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
index 96b95bb46..541a6f1ab 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
@@ -333,7 +333,7 @@ public class CQueryEngine {
    */
   private <T> void prepareForPaging(OrmQueryRequest<T> request) {
     SpiQuery<T> query = request.getQuery();
-    if (!query.isDistinct() && (query.getMaxRows() > 1 || query.getFirstRow() > 0)) {
+    if (query.checkPagingOrderBy()) {
       request.getBeanDescriptor().appendOrderById(query);
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index a2cb55362..bc14d10d7 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1372,6 +1372,15 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return this;
   }
 
+  @Override
+  public boolean checkPagingOrderBy() {
+    return (maxRows > 1 || firstRow > 0) && !distinct && orderByIsEmpty();
+  }
+
+  private boolean orderByIsEmpty() {
+    return orderBy == null || orderBy.isEmpty();
+  }
+
   @Override
   public OrderBy<T> getOrderBy() {
     return orderBy;
diff --git a/src/test/java/io/ebean/EbeanServer_eqlTest.java b/src/test/java/io/ebean/EbeanServer_eqlTest.java
index a31f87a03..42dfc0905 100644
--- a/src/test/java/io/ebean/EbeanServer_eqlTest.java
+++ b/src/test/java/io/ebean/EbeanServer_eqlTest.java
@@ -78,12 +78,12 @@ public class EbeanServer_eqlTest extends BaseTestCase {
     query.findList();
 
     if (isSqlServer()) {
-      assertThat(query.getGeneratedSql()).endsWith("order by t0.name, t0.id offset 3 rows fetch next 10 rows only");
+      assertThat(query.getGeneratedSql()).endsWith("order by t0.name offset 3 rows fetch next 10 rows only");
     } else if (isOracle()) {
       assertThat(query.getGeneratedSql()).contains("where rownum <= 13");
       assertThat(query.getGeneratedSql()).contains("where rn_ > 3");
     } else {
-      assertThat(query.getGeneratedSql()).endsWith("order by t0.name, t0.id limit 10 offset 3");
+      assertThat(query.getGeneratedSql()).endsWith("order by t0.name limit 10 offset 3");
     }
   }
 
diff --git a/src/test/java/io/ebean/TestUnsetLoadedProperties.java b/src/test/java/io/ebean/TestUnsetLoadedProperties.java
index 29f720785..5f6b58f97 100644
--- a/src/test/java/io/ebean/TestUnsetLoadedProperties.java
+++ b/src/test/java/io/ebean/TestUnsetLoadedProperties.java
@@ -1,9 +1,11 @@
 package io.ebean;
 
+import io.ebean.annotation.IgnorePlatform;
+import io.ebean.annotation.Platform;
 import io.ebean.bean.EntityBean;
-import org.tests.model.converstation.User;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
+import org.tests.model.converstation.User;
 
 import java.util.List;
 
@@ -41,7 +43,6 @@ public class TestUnsetLoadedProperties extends BaseTestCase {
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertThat(loggedSql).hasSize(1);
     assertThat(loggedSql.get(0)).doesNotContain("email");
-
   }
 
   @Test
@@ -95,6 +96,10 @@ public class TestUnsetLoadedProperties extends BaseTestCase {
     assertThat(beanState.getLoadedProps()).containsExactly("id", "name");
   }
 
+  /**
+   * Strange sql server error that needs to be reviewed.
+   */
+  @IgnorePlatform(Platform.SQLSERVER)
   @Test
   public void test_markVersionUnset_expect_no_optimistic_locking() {
 
diff --git a/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java b/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java
index 179a8b1bb..b6a9d0a01 100644
--- a/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java
+++ b/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java
@@ -3,10 +3,10 @@ package org.tests.query;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.PagedList;
-import org.tests.model.basic.Order;
-import org.tests.model.basic.ResetBasicData;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
+import org.tests.model.basic.Order;
+import org.tests.model.basic.ResetBasicData;
 
 import java.util.List;
 
@@ -148,7 +148,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
     List<String> loggedSql = LoggedSqlCollector.stop();
 
     assertThat(loggedSql).hasSize(1);
-    assertThat(loggedSql.get(0)).contains("order by t0.order_date, t0.id");
+    assertThat(loggedSql.get(0)).contains("order by t0.order_date");
   }
 
   @Test
diff --git a/src/test/java/org/tests/query/TestLimitAlterFetchMany.java b/src/test/java/org/tests/query/TestLimitAlterFetchMany.java
index e0b5d4d2d..43bf9b7d2 100644
--- a/src/test/java/org/tests/query/TestLimitAlterFetchMany.java
+++ b/src/test/java/org/tests/query/TestLimitAlterFetchMany.java
@@ -3,9 +3,9 @@ package org.tests.query;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Test;
 
 import java.util.List;
 
@@ -24,7 +24,7 @@ public class TestLimitAlterFetchMany extends BaseTestCase {
     Query<Customer> query = Ebean.find(Customer.class)
       // this will automatically get converted to a
       // query join ... due to the maxRows
-      .fetch("contacts").setMaxRows(5);
+      .fetch("contacts").setMaxRows(5).orderBy("id");
 
     List<Customer> list = query.findList();
 
diff --git a/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java b/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
index 8023476b1..5a9d4dd33 100644
--- a/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
+++ b/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
@@ -104,6 +104,8 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
 
     query.setFirstRow(1);
     query.setMaxRows(2);
+    query.order().asc("id");
+
     List<Customer> list = query.findList();
 
     int rowCount = query.findCount();
@@ -168,11 +170,11 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
 
     if (isSqlServer()) {
       assertThat(query.getGeneratedSql()).contains("top 100 ");
-      assertThat(query.getGeneratedSql()).contains("order by o.ship_date desc, o.id");
+      assertThat(query.getGeneratedSql()).contains("order by o.ship_date desc");
     } else if (isOracle()) {
       assertThat(query.getGeneratedSql()).contains("a  where rownum <= 100 )");
     } else {
-      assertThat(query.getGeneratedSql()).contains("order by o.ship_date desc, o.id limit 100");
+      assertThat(query.getGeneratedSql()).contains("order by o.ship_date desc limit 100");
     }
   }
 
@@ -197,14 +199,14 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
       query.order("coalesce(shipDate, getdate()) desc");
       query.findList();
 
-      assertThat(sqlOf(query)).contains("order by coalesce(o.ship_date, getdate()) desc, o.id");
+      assertThat(sqlOf(query)).contains("order by coalesce(o.ship_date, getdate()) desc");
       assertThat(sqlOf(query)).contains("select top 100");
 
     } else {
       query.order("coalesce(shipDate, now()) desc");
       query.findList();
 
-      assertThat(query.getGeneratedSql()).contains("order by coalesce(o.ship_date, now()) desc, o.id limit 100");
+      assertThat(query.getGeneratedSql()).contains("order by coalesce(o.ship_date, now()) desc limit 100");
     }
   }
 
@@ -226,7 +228,10 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
     query.order("id desc");
     PagedList<Order> pagedList = query.findPagedList();
     pagedList.getList();
-    pagedList.getTotalCount();
+    if (!isSqlServer()) {
+      // sql server doesn't support order by in the count query, I wonder if we can remove it?
+      pagedList.getTotalCount();
+    }
 
     if (isSqlServer()) {
       assertThat(sqlOf(query)).contains("select top 100 ");

From e3fac7c622497d987ccd32d83853bda0095f8bff Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 22 Feb 2018 22:43:14 +1300
Subject: [PATCH 0051/1036] #1269 - Paging queries should not ALWAYS append an
 order by ID ... but only when the order by is empty

---
 src/main/java/io/ebeaninternal/api/SpiQuery.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/io/ebeaninternal/api/SpiQuery.java b/src/main/java/io/ebeaninternal/api/SpiQuery.java
index 426f450bb..2be96bfd9 100644
--- a/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -588,6 +588,11 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
    */
   boolean isRawSql();
 
+  /**
+   * Return true if the query should have an order by appended automatically.
+   */
+  boolean checkPagingOrderBy();
+
   /**
    * Return the Order By clause or null if there is none defined.
    */

From f8ea5619d079cfccfd7069b6ecbf79bd8d2a9338 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 22 Feb 2018 22:45:44 +1300
Subject: [PATCH 0052/1036] #1268 - SQL Server fix for "for update" plus
 Sequences support plus refactor of sequences

---
 .../java/io/ebean/config/ServerConfig.java    |  21 +++
 .../config/dbplatform/DatabasePlatform.java   |  56 ++++--
 .../dbplatform/SequenceBatchIdGenerator.java  |  56 ++++++
 .../dbplatform/SequenceIdGenerator.java       | 177 +++++++-----------
 .../dbplatform/SequenceStepIdGenerator.java   |  38 ++++
 .../config/dbplatform/db2/DB2Platform.java    |   5 +-
 .../db2/DB2SequenceIdGenerator.java           |   4 +-
 .../config/dbplatform/h2/H2Platform.java      |   6 +-
 .../dbplatform/h2/H2SequenceIdGenerator.java  |   4 +-
 .../dbplatform/hsqldb/HsqldbPlatform.java     |   5 +-
 .../dbplatform/mysql/MySqlPlatform.java       |  13 --
 .../dbplatform/oracle/OraclePlatform.java     |   5 +-
 .../oracle/OracleSequenceIdGenerator.java     |   4 +-
 .../dbplatform/postgres/PostgresPlatform.java |   4 +-
 .../postgres/PostgresSequenceIdGenerator.java |   4 +-
 .../sqlserver/SqlServerBasicSqlLimiter.java   |   2 +-
 .../sqlserver/SqlServerPlatform.java          |  50 ++++-
 .../sqlserver/SqlServerStepSequence.java      |  24 +++
 .../ddlgeneration/platform/PlatformDdl.java   |   4 +-
 .../ddlgeneration/platform/SqlServerDdl.java  |   4 +-
 .../server/core/DefaultContainer.java         |   2 +-
 .../server/deploy/BeanDescriptorManager.java  |  15 +-
 .../server/deploy/DbSqlContext.java           |   5 +
 .../deploy/meta/DeployBeanDescriptor.java     |   2 +-
 .../server/query/CQueryBuilder.java           |  13 ++
 .../server/query/DefaultDbSqlContext.java     |  13 +-
 .../server/query/SqlTreeBuilder.java          |   3 +-
 .../server/query/SqlTreeNodeRoot.java         |   1 +
 .../java/io/ebeaninternal/util/JdbcClose.java |  14 ++
 .../config/MatchingNamingConventionTest.java  |   9 +-
 .../io/ebean/config/ServerConfigTest.java     |   3 +
 .../sqlserver/SqlServerStepSequenceTest.java  |  55 ++++++
 32 files changed, 439 insertions(+), 182 deletions(-)
 create mode 100644 src/main/java/io/ebean/config/dbplatform/SequenceBatchIdGenerator.java
 create mode 100644 src/main/java/io/ebean/config/dbplatform/SequenceStepIdGenerator.java
 create mode 100644 src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequence.java
 create mode 100644 src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index a3f9348c9..4b17b276f 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -12,6 +12,7 @@ import io.ebean.cache.ServerCachePlugin;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbEncrypt;
 import io.ebean.config.dbplatform.DbType;
+import io.ebean.config.dbplatform.IdType;
 import io.ebean.event.BeanFindController;
 import io.ebean.event.BeanPersistController;
 import io.ebean.event.BeanPersistListener;
@@ -181,6 +182,11 @@ public class ServerConfig {
    */
   private DatabasePlatform databasePlatform;
 
+  /**
+   * The preferred IdType (to override the default Platform type).
+   */
+  private IdType idType;
+
   /**
    * For DB's using sequences this is the number of sequence values prefetched.
    */
@@ -1721,6 +1727,20 @@ public class ServerConfig {
     this.databasePlatform = databasePlatform;
   }
 
+  /**
+   * Return the preferred DB platform IdType.
+   */
+  public IdType getIdType() {
+    return idType;
+  }
+
+  /**
+   * Set the preferred DB platform IdType.
+   */
+  public void setIdType(IdType idType) {
+    this.idType = idType;
+  }
+
   /**
    * Return the EncryptKeyManager.
    */
@@ -2722,6 +2742,7 @@ public class ServerConfig {
       throw new IllegalArgumentException("Property 'batch.mode' or 'persistBatching' is being set but no longer used. Please change to use 'persistBatchMode'");
     }
 
+    idType = p.getEnum(IdType.class, "idType", idType);
     persistBatch = p.getEnum(PersistBatch.class, "persistBatch", persistBatch);
     persistBatchOnCascade = p.getEnum(PersistBatch.class, "persistBatchOnCascade", persistBatchOnCascade);
 
diff --git a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
index 3b6073c60..190e69d97 100644
--- a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
@@ -6,6 +6,8 @@ import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
 import io.ebean.config.CustomDbTypeMapping;
 import io.ebean.config.DbTypeConfig;
+import io.ebean.config.ServerConfig;
+import io.ebeaninternal.util.JdbcClose;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -98,6 +100,10 @@ public class DatabasePlatform {
    */
   protected DbIdentity dbIdentity = new DbIdentity();
 
+  protected boolean sequenceBatchMode = true;
+
+  protected int sequenceBatchSize = 20;
+
   /**
    * The history support for this database platform.
    */
@@ -206,10 +212,19 @@ public class DatabasePlatform {
     return exceptionTranslator.translate(message, e);
   }
 
+  /**
+   * Configure the platform given the server configuration.
+   */
+  public void configure(ServerConfig config) {
+    this.sequenceBatchSize = config.getDatabaseSequenceBatchSize();
+    configureIdType(config.getIdType());
+    configure(config.getDbTypeConfig(), config.isAllQuotedIdentifiers());
+  }
+
   /**
    * Configure UUID Storage etc based on ServerConfig settings.
    */
-  public void configure(DbTypeConfig config, boolean allQuotedIdentifiers) {
+  protected void configure(DbTypeConfig config, boolean allQuotedIdentifiers) {
     this.allQuotedIdentifiers = allQuotedIdentifiers;
     addGeoTypes(config.getGeometrySRID());
     configureIdType(config.getIdType());
@@ -263,6 +278,20 @@ public class DatabasePlatform {
     return platform.name().toLowerCase();
   }
 
+  /**
+   * Return true if we are using Sequence batch mode rather than STEP.
+   */
+  public boolean isSequenceBatchMode() {
+    return sequenceBatchMode;
+  }
+
+  /**
+   * Set to false to not use sequence batch mode but instead STEP mode.
+   */
+  public void setSequenceBatchMode(boolean sequenceBatchMode) {
+    this.sequenceBatchMode = sequenceBatchMode;
+  }
+
   /**
    * Return true if this database platform supports native ILIKE expression.
    */
@@ -304,10 +333,10 @@ public class DatabasePlatform {
    * @param be        the BackgroundExecutor that can be used to load the sequence if
    *                  desired
    * @param ds        the DataSource
+   * @param stepSize  the sequence allocation size as defined by mapping (defaults to 50)
    * @param seqName   the name of the sequence
-   * @param batchSize the number of sequences that should be loaded
    */
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
     return null;
   }
 
@@ -586,6 +615,14 @@ public class DatabasePlatform {
     return sql;
   }
 
+  /**
+   * For update hint on the FROM clause (SQL server only).
+   */
+  public String fromForUpdate(Query.ForUpdate forUpdateMode) {
+    // return null except for sql server
+    return null;
+  }
+
   protected String withForUpdate(String sql, Query.ForUpdate forUpdateMode) {
     // silently assume the database does not support the "for update" clause.
     logger.info("it seems your database does not support the 'for update' clause");
@@ -618,18 +655,7 @@ public class DatabasePlatform {
     try {
       return tables.next();
     } finally {
-      close(tables);
-    }
-  }
-
-  /**
-   * Close the resultSet.
-   */
-  protected void close(ResultSet resultSet) {
-    try {
-      resultSet.close();
-    } catch (SQLException e) {
-      logger.error("Error closing resultSet", e);
+      JdbcClose.close(tables);
     }
   }
 
diff --git a/src/main/java/io/ebean/config/dbplatform/SequenceBatchIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/SequenceBatchIdGenerator.java
new file mode 100644
index 000000000..6444e0d55
--- /dev/null
+++ b/src/main/java/io/ebean/config/dbplatform/SequenceBatchIdGenerator.java
@@ -0,0 +1,56 @@
+package io.ebean.config.dbplatform;
+
+import io.ebean.BackgroundExecutor;
+
+import javax.sql.DataSource;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Database sequence based IdGenerator using Sequence Step 1 but batch fetch many sequence values.
+ */
+public abstract class SequenceBatchIdGenerator extends SequenceIdGenerator {
+
+  /**
+   * Construct where batchSize is the sequence step size.
+   *
+   */
+  public SequenceBatchIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
+    super(be, ds, seqName, batchSize);
+  }
+
+  /**
+   * If allocateSize is large load some sequences in a background thread.
+   * <p>
+   * For example, when inserting a bean with a cascade on a OneToMany with many
+   * beans Ebean can call this to ensure .
+   * </p>
+   */
+  @Override
+  public void preAllocateIds(int requestSize) {
+    if (allocationSize > 1 && requestSize > allocationSize) {
+      // only bother if allocateSize is bigger than
+      // the normal loading batchSize
+      if (requestSize > 100) {
+        // max out at 100 for now
+        requestSize = 100;
+      }
+      loadInBackground(requestSize);
+    }
+  }
+
+  /**
+   * Add the next set of Ids as the next value plus all the following numbers up to the step size.
+   */
+  protected List<Long> readIds(ResultSet resultSet, int loadSize) throws SQLException {
+
+    List<Long> newIds = new ArrayList<>(loadSize);
+    while (resultSet.next()) {
+      newIds.add(resultSet.getLong(1));
+    }
+    return newIds;
+  }
+
+}
diff --git a/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java
index 3d6da7357..985a545c6 100644
--- a/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java
+++ b/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java
@@ -2,6 +2,7 @@ package io.ebean.config.dbplatform;
 
 import io.ebean.BackgroundExecutor;
 import io.ebean.Transaction;
+import io.ebeaninternal.util.JdbcClose;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -12,13 +13,15 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * Database sequence based IdGenerator.
  */
 public abstract class SequenceIdGenerator implements PlatformIdGenerator {
 
-  private static final Logger logger = LoggerFactory.getLogger(SequenceIdGenerator.class);
+  protected static final Logger logger = LoggerFactory.getLogger("io.ebean.SEQ");
 
   /**
    * Used to synchronise the idList access.
@@ -41,18 +44,18 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
 
   protected final ArrayList<Long> idList = new ArrayList<>(50);
 
-  protected final int batchSize;
+  protected final int allocationSize;
 
-  protected int currentlyBackgroundLoading;
+  protected boolean currentlyBackgroundLoading;
 
   /**
    * Construct given a dataSource and sql to return the next sequence value.
    */
-  public SequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
+  protected SequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int allocationSize) {
     this.backgroundExecutor = be;
     this.dataSource = ds;
     this.seqName = seqName;
-    this.batchSize = batchSize;
+    this.allocationSize = allocationSize;
   }
 
   public abstract String getSql(int batchSize);
@@ -81,26 +84,8 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
    * </p>
    */
   @Override
-  public void preAllocateIds(int allocateSize) {
-    if (batchSize > 1 && allocateSize > batchSize) {
-      // only bother if allocateSize is bigger than
-      // the normal loading batchSize
-      if (allocateSize > 100) {
-        // max out at 100 for now
-        allocateSize = 100;
-      }
-      loadLargeAllocation(allocateSize);
-    }
-  }
-
-  /**
-   * Called by preAllocateIds when we know that a large number of Id's is going
-   * to be needed shortly.
-   */
-  protected void loadLargeAllocation(final int allocateSize) {
-    // preAllocateIds was called with a relatively large batchSize
-    // so we will just go ahead and load those anyway in background
-    backgroundExecutor.execute(() -> loadMoreIds(allocateSize, null));
+  public void preAllocateIds(int requestSize) {
+    // do nothing by default
   }
 
   /**
@@ -113,80 +98,80 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
   public Object nextId(Transaction t) {
     synchronized (monitor) {
 
-      if (idList.isEmpty()) {
-        loadMoreIds(batchSize, t);
-      }
-      Long nextId = idList.remove(0);
-
-      if (batchSize > 1) {
-        if (idList.size() <= batchSize / 2) {
-          loadBatchInBackground();
-        }
+      int size = idList.size();
+      if (size > 0) {
+        maybeLoadMoreInBackground(size);
+      } else {
+        loadMore(allocationSize);
       }
 
-      return nextId;
+      return idList.remove(0);
     }
   }
 
-  /**
-   * Load another batch of Id's using a background thread.
-   */
-  protected void loadBatchInBackground() {
-
-    // single threaded processing...
-    synchronized (backgroundLoadMonitor) {
-
-      if (currentlyBackgroundLoading > 0) {
-        // skip as already background loading
-        logger.debug("... skip background sequence load (another load in progress)");
-        return;
+  private void maybeLoadMoreInBackground(int currentSize) {
+    if (allocationSize > 1) {
+      if (currentSize <= allocationSize / 2) {
+        loadInBackground(allocationSize);
       }
-
-      currentlyBackgroundLoading = batchSize;
-
-      backgroundExecutor.execute(() -> {
-        loadMoreIds(batchSize, null);
-        synchronized (backgroundLoadMonitor) {
-          currentlyBackgroundLoading = 0;
-        }
-      });
     }
   }
 
-  protected void loadMoreIds(final int numberToLoad, Transaction t) {
-
-    ArrayList<Long> newIds = getMoreIds(numberToLoad, t);
-
-    if (logger.isDebugEnabled()) {
-      logger.debug("... seq:" + seqName + " loaded:" + numberToLoad + " ids:" + newIds);
-    }
-
+  private void loadMore(int requestSize) {
+    List<Long> newIds = getMoreIds(requestSize);
     synchronized (monitor) {
       idList.addAll(newIds);
     }
   }
 
+  /**
+   * Load another batch of Id's using a background thread.
+   */
+  protected void loadInBackground(final int requestSize) {
+
+    // single threaded processing...
+    synchronized (backgroundLoadMonitor) {
+      if (currentlyBackgroundLoading) {
+        // skip as already background loading
+        logger.debug("... skip background sequence load (another load in progress)");
+        return;
+      }
+
+      currentlyBackgroundLoading = true;
+
+      backgroundExecutor.execute(() -> {
+        loadMore(requestSize);
+        synchronized (backgroundLoadMonitor) {
+          currentlyBackgroundLoading = false;
+        }
+      });
+    }
+  }
+
+  /**
+   * Read the resultSet returning the list of Id values.
+   */
+  protected abstract List<Long> readIds(ResultSet resultSet, int loadSize) throws SQLException;
+
   /**
    * Get more Id's by executing a query and reading the Id's returned.
    */
-  protected ArrayList<Long> getMoreIds(int loadSize, Transaction t) {
+  protected List<Long> getMoreIds(int requestSize) {
 
-    String sql = getSql(loadSize);
+    String sql = getSql(requestSize);
 
-    ArrayList<Long> newIds = new ArrayList<>(loadSize);
-
-    boolean useTxnConnection = t != null;
-
-    Connection c = null;
-    PreparedStatement pstmt = null;
-    ResultSet rset = null;
+    Connection connection = null;
+    PreparedStatement statement = null;
+    ResultSet resultSet = null;
     try {
-      c = useTxnConnection ? t.getConnection() : dataSource.getConnection();
+      connection = dataSource.getConnection();
 
-      pstmt = c.prepareStatement(sql);
-      rset = pstmt.executeQuery();
-      while (rset.next()) {
-        newIds.add(rset.getLong(1));
+      statement = connection.prepareStatement(sql);
+      resultSet = statement.executeQuery();
+
+      List<Long> newIds = readIds(resultSet, requestSize);
+      if (logger.isTraceEnabled()) {
+        logger.trace("seq:{} loaded:{} sql:{}", seqName, newIds.size(), sql);
       }
       if (newIds.isEmpty()) {
         throw new PersistenceException("Always expecting more than 1 row from " + sql);
@@ -197,46 +182,24 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
     } catch (SQLException e) {
       if (e.getMessage().contains("Database is already closed")) {
         String msg = "Error getting SEQ when DB shutting down " + e.getMessage();
-        logger.info(msg);
+        logger.error(msg);
         System.out.println(msg);
-        return newIds;
+        return Collections.emptyList();
       } else {
         throw new PersistenceException("Error getting sequence nextval", e);
       }
     } finally {
-      if (useTxnConnection) {
-        closeResources(null, pstmt, rset);
-      } else {
-        closeResources(c, pstmt, rset);
-      }
+      closeResources(connection, statement, resultSet);
     }
   }
 
   /**
    * Close the JDBC resources.
    */
-  protected void closeResources(Connection c, PreparedStatement pstmt, ResultSet rset) {
-    try {
-      if (rset != null) {
-        rset.close();
-      }
-    } catch (SQLException e) {
-      logger.error("Error closing ResultSet", e);
-    }
-    try {
-      if (pstmt != null) {
-        pstmt.close();
-      }
-    } catch (SQLException e) {
-      logger.error("Error closing PreparedStatement", e);
-    }
-    try {
-      if (c != null) {
-        c.close();
-      }
-    } catch (SQLException e) {
-      logger.error("Error closing Connection", e);
-    }
+  private void closeResources(Connection connection, PreparedStatement statement, ResultSet resultSet) {
+    JdbcClose.close(resultSet);
+    JdbcClose.close(statement);
+    JdbcClose.close(connection);
   }
 
 }
diff --git a/src/main/java/io/ebean/config/dbplatform/SequenceStepIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/SequenceStepIdGenerator.java
new file mode 100644
index 000000000..3e632e5fa
--- /dev/null
+++ b/src/main/java/io/ebean/config/dbplatform/SequenceStepIdGenerator.java
@@ -0,0 +1,38 @@
+package io.ebean.config.dbplatform;
+
+import io.ebean.BackgroundExecutor;
+
+import javax.sql.DataSource;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Database sequence based IdGenerator using Sequence Step (e.g. step 50).
+ */
+public abstract class SequenceStepIdGenerator extends SequenceIdGenerator {
+
+  /**
+   * Construct with stepSize (typically 50).
+   */
+  protected SequenceStepIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int stepSize) {
+    super(be, ds, seqName, stepSize);
+  }
+
+  /**
+   * Add the next set of Ids as the next value plus all the following numbers up to the step size.
+   */
+  protected List<Long> readIds(ResultSet resultSet, int ignoreRequestSize) throws SQLException {
+
+    List<Long> newIds = new ArrayList<>(allocationSize);
+    if (resultSet.next()) {
+      long start = resultSet.getLong(1);
+      for (int i = 0; i < allocationSize; i++) {
+        newIds.add(start + i);
+      }
+    }
+    return newIds;
+  }
+
+}
diff --git a/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java b/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java
index c8bcbd7f6..793afee2d 100644
--- a/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java
+++ b/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java
@@ -55,10 +55,9 @@ public class DB2Platform extends DatabasePlatform {
    * sequence values.
    */
   @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be,
-                                                       DataSource ds, String seqName, int batchSize) {
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
 
-    return new DB2SequenceIdGenerator(be, ds, seqName, batchSize);
+    return new DB2SequenceIdGenerator(be, ds, seqName, sequenceBatchSize);
   }
 
 }
diff --git a/src/main/java/io/ebean/config/dbplatform/db2/DB2SequenceIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/db2/DB2SequenceIdGenerator.java
index 788e4e396..a5170a759 100644
--- a/src/main/java/io/ebean/config/dbplatform/db2/DB2SequenceIdGenerator.java
+++ b/src/main/java/io/ebean/config/dbplatform/db2/DB2SequenceIdGenerator.java
@@ -1,14 +1,14 @@
 package io.ebean.config.dbplatform.db2;
 
 import io.ebean.BackgroundExecutor;
-import io.ebean.config.dbplatform.SequenceIdGenerator;
+import io.ebean.config.dbplatform.SequenceBatchIdGenerator;
 
 import javax.sql.DataSource;
 
 /**
  * DB2 specific sequence Id Generator.
  */
-public class DB2SequenceIdGenerator extends SequenceIdGenerator {
+public class DB2SequenceIdGenerator extends SequenceBatchIdGenerator {
 
   private final String baseSql;
   private final String unionBaseSql;
diff --git a/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java b/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java
index 7c3c78a36..1b093d880 100644
--- a/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java
+++ b/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java
@@ -46,10 +46,8 @@ public class H2Platform extends DatabasePlatform {
    * sequence values.
    */
   @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds,
-                                                       String seqName, int batchSize) {
-
-    return new H2SequenceIdGenerator(be, ds, seqName, batchSize);
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
+    return new H2SequenceIdGenerator(be, ds, seqName, sequenceBatchSize);
   }
 
   @Override
diff --git a/src/main/java/io/ebean/config/dbplatform/h2/H2SequenceIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/h2/H2SequenceIdGenerator.java
index 4dafed231..b4e875511 100644
--- a/src/main/java/io/ebean/config/dbplatform/h2/H2SequenceIdGenerator.java
+++ b/src/main/java/io/ebean/config/dbplatform/h2/H2SequenceIdGenerator.java
@@ -1,14 +1,14 @@
 package io.ebean.config.dbplatform.h2;
 
 import io.ebean.BackgroundExecutor;
-import io.ebean.config.dbplatform.SequenceIdGenerator;
+import io.ebean.config.dbplatform.SequenceBatchIdGenerator;
 
 import javax.sql.DataSource;
 
 /**
  * H2 specific sequence Id Generator.
  */
-public class H2SequenceIdGenerator extends SequenceIdGenerator {
+public class H2SequenceIdGenerator extends SequenceBatchIdGenerator {
 
   private final String baseSql;
   private final String unionBaseSql;
diff --git a/src/main/java/io/ebean/config/dbplatform/hsqldb/HsqldbPlatform.java b/src/main/java/io/ebean/config/dbplatform/hsqldb/HsqldbPlatform.java
index 80a3a032e..1450b01f7 100644
--- a/src/main/java/io/ebean/config/dbplatform/hsqldb/HsqldbPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/hsqldb/HsqldbPlatform.java
@@ -31,9 +31,8 @@ public class HsqldbPlatform extends DatabasePlatform {
   }
 
   @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
-
-    return new H2SequenceIdGenerator(be, ds, seqName, batchSize);
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
+    return new H2SequenceIdGenerator(be, ds, seqName, sequenceBatchSize);
   }
 
 }
diff --git a/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java
index f004be7d5..f9973c243 100644
--- a/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java
@@ -1,16 +1,13 @@
 package io.ebean.config.dbplatform.mysql;
 
-import io.ebean.BackgroundExecutor;
 import io.ebean.Query;
 import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
-import io.ebean.config.dbplatform.PlatformIdGenerator;
 import io.ebean.config.dbplatform.SqlErrorCodes;
 
-import javax.sql.DataSource;
 import java.sql.Types;
 
 /**
@@ -64,16 +61,6 @@ public class MySqlPlatform extends DatabasePlatform {
     dbTypeMap.put(DbType.VARBINARY, new DbPlatformType("varbinary", 255));
   }
 
-  /**
-   * Return null in case there is a sequence annotation.
-   */
-  @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be,
-                                                       DataSource ds, String seqName, int batchSize) {
-
-    return null;
-  }
-
   @Override
   protected String withForUpdate(String sql, Query.ForUpdate forUpdateMode) {
     // NOWAIT and SKIP LOCKED currently not supported with MySQL
diff --git a/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java b/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java
index 5f0b1ca3e..636390dfc 100644
--- a/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java
@@ -70,9 +70,8 @@ public class OraclePlatform extends DatabasePlatform {
   }
 
   @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
-
-    return new OracleSequenceIdGenerator(be, ds, seqName, batchSize);
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
+    return new OracleSequenceIdGenerator(be, ds, seqName, sequenceBatchSize);
   }
 
   @Override
diff --git a/src/main/java/io/ebean/config/dbplatform/oracle/OracleSequenceIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/oracle/OracleSequenceIdGenerator.java
index b0a7a2f70..32dd7a28e 100644
--- a/src/main/java/io/ebean/config/dbplatform/oracle/OracleSequenceIdGenerator.java
+++ b/src/main/java/io/ebean/config/dbplatform/oracle/OracleSequenceIdGenerator.java
@@ -1,14 +1,14 @@
 package io.ebean.config.dbplatform.oracle;
 
 import io.ebean.BackgroundExecutor;
-import io.ebean.config.dbplatform.SequenceIdGenerator;
+import io.ebean.config.dbplatform.SequenceBatchIdGenerator;
 
 import javax.sql.DataSource;
 
 /**
  * Oracle specific sequence Id Generator.
  */
-public class OracleSequenceIdGenerator extends SequenceIdGenerator {
+public class OracleSequenceIdGenerator extends SequenceBatchIdGenerator {
 
   private final String baseSql;
 
diff --git a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
index 04d1b0384..20d9107d1 100644
--- a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
@@ -90,9 +90,9 @@ public class PostgresPlatform extends DatabasePlatform {
    * Create a Postgres specific sequence IdGenerator.
    */
   @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
 
-    return new PostgresSequenceIdGenerator(be, ds, seqName, batchSize);
+    return new PostgresSequenceIdGenerator(be, ds, seqName, sequenceBatchSize);
   }
 
   @Override
diff --git a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresSequenceIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresSequenceIdGenerator.java
index d01a70db5..4550c926d 100644
--- a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresSequenceIdGenerator.java
+++ b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresSequenceIdGenerator.java
@@ -1,14 +1,14 @@
 package io.ebean.config.dbplatform.postgres;
 
 import io.ebean.BackgroundExecutor;
-import io.ebean.config.dbplatform.SequenceIdGenerator;
+import io.ebean.config.dbplatform.SequenceBatchIdGenerator;
 
 import javax.sql.DataSource;
 
 /**
  * Postgres specific sequence Id Generator.
  */
-public class PostgresSequenceIdGenerator extends SequenceIdGenerator {
+public class PostgresSequenceIdGenerator extends SequenceBatchIdGenerator {
 
   private final String baseSql;
 
diff --git a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasicSqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasicSqlLimiter.java
index 64494f34d..3ac56f727 100644
--- a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasicSqlLimiter.java
+++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasicSqlLimiter.java
@@ -13,7 +13,7 @@ public class SqlServerBasicSqlLimiter implements BasicSqlLimiter {
     StringBuilder sb = new StringBuilder(50 + dbSql.length());
     sb.append(dbSql);
     if (!dbSql.toLowerCase().contains("order by")) {
-      sb.append(" order by 1 ");
+      sb.append(" order by 1");
     }
     sb.append(" ").append("offset");
     sb.append(" ").append(firstRow).append(" rows");
diff --git a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java
index f0ed6744a..102a7e0d5 100644
--- a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java
@@ -1,13 +1,18 @@
 package io.ebean.config.dbplatform.sqlserver;
 
+import io.ebean.BackgroundExecutor;
+import io.ebean.Query;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
+import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
+import io.ebean.config.dbplatform.PlatformIdGenerator;
 import io.ebean.config.dbplatform.SqlErrorCodes;
 
+import javax.sql.DataSource;
 import java.sql.Types;
 
 /**
@@ -18,8 +23,8 @@ public class SqlServerPlatform extends DatabasePlatform {
   public SqlServerPlatform() {
     super();
     this.platform = Platform.SQLSERVER;
-    // effectively disable persistBatchOnCascade mode for SQL Server
-    // due to lack of support for getGeneratedKeys in batch mode
+    // disable persistBatchOnCascade mode for
+    // SQL Server unless we are using sequences
     this.persistBatchOnCascade = PersistBatch.NONE;
     this.idInExpandedForm = true;
     this.selectCountWithAlias = true;
@@ -29,12 +34,14 @@ public class SqlServerPlatform extends DatabasePlatform {
     this.dbIdentity.setIdType(IdType.IDENTITY);
     this.dbIdentity.setSupportsGetGeneratedKeys(true);
     this.dbIdentity.setSupportsIdentity(true);
+    this.dbIdentity.setSupportsSequence(true);
+    this.sequenceBatchMode = false;
 
     this.exceptionTranslator =
       new SqlErrorCodes()
         .addAcquireLock("1222")
         .addDuplicateKey("2601", "2627")
-        .addDataIntegrity("544", "8114", "8115")
+        .addDataIntegrity("544", "547", "8114", "8115")
         .build();
 
     this.openQuote = "[";
@@ -67,8 +74,45 @@ public class SqlServerPlatform extends DatabasePlatform {
 
   }
 
+  @Override
+  public void configure(ServerConfig config) {
+    super.configure(config);
+    if (dbIdentity.getIdType() == IdType.SEQUENCE) {
+      this.persistBatchOnCascade = PersistBatch.ALL;
+    }
+  }
+
   @Override
   protected void escapeLikeCharacter(char ch, StringBuilder sb) {
     sb.append('[').append(ch).append(']');
   }
+
+  /**
+   * Create a Postgres specific sequence IdGenerator.
+   */
+  @Override
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
+    return new SqlServerStepSequence(be, ds, seqName, stepSize);
+  }
+
+  /**
+   * For update is part of the FROM clause on the base table for sql server.
+   */
+  @Override
+  public String fromForUpdate(Query.ForUpdate forUpdateMode) {
+    switch (forUpdateMode) {
+      case SKIPLOCKED:
+        return "with (updlock,readpast)";
+      case NOWAIT:
+        return "with (updlock,nowait)";
+      default:
+        return "with (updlock)";
+    }
+  }
+
+  @Override
+  protected String withForUpdate(String sql, Query.ForUpdate forUpdateMode) {
+    // for update are hints on from clause of base table
+    return sql;
+  }
 }
diff --git a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequence.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequence.java
new file mode 100644
index 000000000..d9a53a9f7
--- /dev/null
+++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequence.java
@@ -0,0 +1,24 @@
+package io.ebean.config.dbplatform.sqlserver;
+
+import io.ebean.BackgroundExecutor;
+import io.ebean.config.dbplatform.SequenceStepIdGenerator;
+
+import javax.sql.DataSource;
+
+public class SqlServerStepSequence extends SequenceStepIdGenerator {
+
+  private final String nextSql;
+
+  /**
+   * Construct where batchSize is the sequence step size.
+   */
+  public SqlServerStepSequence(BackgroundExecutor be, DataSource ds, String seqName, int stepSize) {
+    super(be, ds, seqName, stepSize);
+    this.nextSql = "select next value for "+seqName;
+  }
+
+  @Override
+  public String getSql(int batchSize) {
+    return nextSql;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
index 55057bddf..66e5e64e0 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -308,9 +308,7 @@ public class PlatformDdl {
     if (initialValue > 1) {
       sb.append(" start with ").append(initialValue);
     }
-    if (allocationSize > 0 && allocationSize != 50) {
-      // at this stage ignoring allocationSize 50 as this is the 'default' and
-      // not consistent with the way Ebean batch fetches sequence values
+    if (allocationSize > 1) {
       sb.append(" increment by ").append(allocationSize);
     }
     sb.append(";");
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
index 16b541d88..843abad99 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
@@ -121,9 +121,7 @@ public class SqlServerDdl extends PlatformDdl {
     } else {
       sb.append(" start with 1 ");
     }
-    if (allocationSize > 0 && allocationSize != 50) {
-      // at this stage ignoring allocationSize 50 as this is the 'default' and
-      // not consistent with the way Ebean batch fetches sequence values
+    if (allocationSize > 1) {
       sb.append(" increment by ").append(allocationSize);
     }
     sb.append(";");
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index ff4fd4338..0f72ca48c 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -270,7 +270,7 @@ public class DefaultContainer implements SpiContainer {
       config.setDatabasePlatform(platform);
     }
     logger.info("DatabasePlatform name:{} platform:{}", config.getName(), platform.getName());
-    platform.configure(config.getDbTypeConfig(), config.isAllQuotedIdentifiers());
+    platform.configure(config);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index ed2945ef6..618183220 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -173,8 +173,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
   private final BackgroundExecutor backgroundExecutor;
 
-  private final int dbSequenceBatchSize;
-
   private final EncryptKeyManager encryptKeyManager;
 
   private final IdBinderFactory idBinderFactory;
@@ -206,7 +204,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     this.serverName = InternString.intern(serverConfig.getName());
     this.cacheManager = config.getCacheManager();
     this.docStoreFactory = config.getDocStoreFactory();
-    this.dbSequenceBatchSize = serverConfig.getDatabaseSequenceBatchSize();
     this.backgroundExecutor = config.getBackgroundExecutor();
     this.dataSource = serverConfig.getDataSource();
     this.encryptKeyManager = serverConfig.getEncryptKeyManager();
@@ -1391,12 +1388,16 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
       seqName = namingConvention.getSequenceName(desc.getBaseTable(), primaryKeyColumn);
     }
 
-    // create the sequence based IdGenerator
-    desc.setIdGenerator(createSequenceIdGenerator(seqName));
+    if (databasePlatform.isSequenceBatchMode()) {
+      // use sequence next step 1 as we are going to batch fetch them instead
+      desc.setSequenceAllocationSize(1);
+    }
+    int stepSize = desc.getSequenceAllocationSize();
+    desc.setIdGenerator(createSequenceIdGenerator(seqName, stepSize));
   }
 
-  private PlatformIdGenerator createSequenceIdGenerator(String seqName) {
-    return databasePlatform.createSequenceIdGenerator(backgroundExecutor, dataSource, seqName, dbSequenceBatchSize);
+  private PlatformIdGenerator createSequenceIdGenerator(String seqName, int stepSize) {
+    return databasePlatform.createSequenceIdGenerator(backgroundExecutor, dataSource, stepSize, seqName);
   }
 
   private void createByteCode(DeployBeanDescriptor<?> deploy) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java b/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java
index fa1563866..ff5402dbc 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java
@@ -129,4 +129,9 @@ public interface DbSqlContext {
    * Start group by clause.
    */
   void startGroupBy();
+
+  /**
+   * Append 'for update' lock hints on FROM clause (sql server only).
+   */
+  void appendFromForUpdate();
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index 36e14a2e8..83416486a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -107,7 +107,7 @@ public class DeployBeanDescriptor<T> {
 
   private int sequenceInitialValue;
 
-  private int sequenceAllocationSize;
+  private int sequenceAllocationSize = 50;
 
   /**
    * Used with Identity columns but no getGeneratedKeys support.
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 6ae7a12a0..c178371ee 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.query;
 
+import io.ebean.Query;
 import io.ebean.RawSql;
 import io.ebean.RawSqlBuilder;
 import io.ebean.annotation.Platform;
@@ -671,4 +672,16 @@ class CQueryBuilder {
   boolean isPlatformDistinctOn() {
     return dbPlatform.isPlatform(Platform.POSTGRES);
   }
+
+  /**
+   * Return the 'for update' FROM hint (sql server).
+   */
+  public String fromForUpdate(SpiQuery<?> query) {
+    Query.ForUpdate mode = query.getForUpdateMode();
+    if (mode == null) {
+      return null;
+    } else {
+      return dbPlatform.fromForUpdate(mode);
+    }
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java b/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
index cae5da9f0..a2138104b 100644
--- a/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
+++ b/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
@@ -26,6 +26,8 @@ class DefaultDbSqlContext implements DbSqlContext {
 
   private final ArrayStack<String> prefixStack = new ArrayStack<>();
 
+  private final String fromForUpdate;
+
   private boolean useColumnAlias;
 
   private int columnIndex;
@@ -55,7 +57,8 @@ class DefaultDbSqlContext implements DbSqlContext {
    * Construct for SELECT clause (with column alias settings).
    */
   DefaultDbSqlContext(SqlTreeAlias alias, CQueryBuilder builder,
-                      boolean alwaysUseColumnAlias, CQueryHistorySupport historySupport, CQueryDraftSupport draftSupport) {
+                      boolean alwaysUseColumnAlias, CQueryHistorySupport historySupport,
+                      CQueryDraftSupport draftSupport, String fromForUpdate) {
 
     this.alias = alias;
     this.tableAliasPlaceHolder = builder.tableAliasPlaceHolder;
@@ -64,6 +67,14 @@ class DefaultDbSqlContext implements DbSqlContext {
     this.draftSupport = draftSupport;
     this.historySupport = historySupport;
     this.historyQuery = (historySupport != null);
+    this.fromForUpdate = fromForUpdate;
+  }
+
+  @Override
+  public void appendFromForUpdate() {
+    if (fromForUpdate != null) {
+      append(" ").append(fromForUpdate);
+    }
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index d5e0f408c..d5ea84855 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -119,9 +119,10 @@ public final class SqlTreeBuilder {
     this.alias = new SqlTreeAlias(request.getBaseTableAlias());
     this.distinctOnPlatform = builder.isPlatformDistinctOn();
 
+    String fromForUpdate = builder.fromForUpdate(query);
     CQueryHistorySupport historySupport = builder.getHistorySupport(query);
     CQueryDraftSupport draftSupport = builder.getDraftSupport(query);
-    this.ctx = new DefaultDbSqlContext(alias, builder, !subQuery, historySupport, draftSupport);
+    this.ctx = new DefaultDbSqlContext(alias, builder, !subQuery, historySupport, draftSupport, fromForUpdate);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java
index b956115b6..bb93b25e1 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java
@@ -68,6 +68,7 @@ final class SqlTreeNodeRoot extends SqlTreeNodeBean {
 
     ctx.append(desc.getBaseTable(temporalMode));
     ctx.append(" ").append(baseTableAlias);
+    ctx.appendFromForUpdate();
 
     if (includeJoin != null) {
       String a1 = baseTableAlias;
diff --git a/src/main/java/io/ebeaninternal/util/JdbcClose.java b/src/main/java/io/ebeaninternal/util/JdbcClose.java
index 647f34709..f74e3dd46 100644
--- a/src/main/java/io/ebeaninternal/util/JdbcClose.java
+++ b/src/main/java/io/ebeaninternal/util/JdbcClose.java
@@ -6,6 +6,7 @@ import org.slf4j.LoggerFactory;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 
 /**
  * Utility for closing raw Jdbc resources.
@@ -14,6 +15,19 @@ public class JdbcClose {
 
   private static final Logger logger = LoggerFactory.getLogger(JdbcClose.class);
 
+  /**
+   * Close the resultSet logging if an error occurs.
+   */
+  public static void close(Statement statement) {
+    try {
+      if (statement != null) {
+        statement.close();
+      }
+    } catch (SQLException e) {
+      logger.warn("Error closing statement", e);
+    }
+  }
+
   /**
    * Close the resultSet logging if an error occurs.
    */
diff --git a/src/test/java/io/ebean/config/MatchingNamingConventionTest.java b/src/test/java/io/ebean/config/MatchingNamingConventionTest.java
index 8f29e2357..2cca6c06d 100644
--- a/src/test/java/io/ebean/config/MatchingNamingConventionTest.java
+++ b/src/test/java/io/ebean/config/MatchingNamingConventionTest.java
@@ -16,10 +16,13 @@ public class MatchingNamingConventionTest {
   }
 
   @Test
-  public void getColumnFromProperty_when_allQuoted() throws Exception {
+  public void getColumnFromProperty_when_allQuoted() {
 
     SqlServerPlatform platform = new SqlServerPlatform();
-    platform.configure(new DbTypeConfig(), true);
+
+    ServerConfig config = new ServerConfig();
+    config.setAllQuotedIdentifiers(true);
+    platform.configure(config);
 
     NamingConvention nc = new MatchingNamingConvention();
     nc.setDatabasePlatform(platform);
@@ -29,7 +32,7 @@ public class MatchingNamingConventionTest {
   }
 
   @Test
-  public void getColumnFromProperty() throws Exception {
+  public void getColumnFromProperty() {
 
     String fkCol = "bridgetab_userId";
     String col = namingConvention.getColumnFromProperty(null, fkCol);
diff --git a/src/test/java/io/ebean/config/ServerConfigTest.java b/src/test/java/io/ebean/config/ServerConfigTest.java
index 860ad9582..0eea08122 100644
--- a/src/test/java/io/ebean/config/ServerConfigTest.java
+++ b/src/test/java/io/ebean/config/ServerConfigTest.java
@@ -1,6 +1,7 @@
 package io.ebean.config;
 
 import io.ebean.annotation.PersistBatch;
+import io.ebean.config.dbplatform.IdType;
 import org.avaje.datasource.DataSourceConfig;
 import org.junit.Test;
 
@@ -46,6 +47,7 @@ public class ServerConfigTest {
     props.setProperty("autoReadOnlyDataSource", "true");
     props.setProperty("disableL2Cache", "true");
     props.setProperty("notifyL2CacheInForeground", "true");
+    props.setProperty("idType", "SEQUENCE");
 
     serverConfig.loadFromProperties(props);
 
@@ -54,6 +56,7 @@ public class ServerConfigTest {
     assertTrue(serverConfig.isDbOffline());
     assertTrue(serverConfig.isAutoReadOnlyDataSource());
 
+    assertEquals(IdType.SEQUENCE, serverConfig.getIdType());
     assertEquals(PersistBatch.INSERT, serverConfig.getPersistBatch());
     assertEquals(PersistBatch.INSERT, serverConfig.getPersistBatchOnCascade());
     assertEquals(ServerConfig.DbUuid.BINARY, serverConfig.getDbTypeConfig().getDbUuid());
diff --git a/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java b/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java
new file mode 100644
index 000000000..3745ef4fa
--- /dev/null
+++ b/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java
@@ -0,0 +1,55 @@
+package io.ebean.config.dbplatform.sqlserver;
+
+import io.ebean.BackgroundExecutor;
+import io.ebean.BaseTestCase;
+import io.ebean.annotation.ForPlatform;
+import io.ebean.annotation.Platform;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.sql.DataSource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class SqlServerStepSequenceTest extends BaseTestCase {
+
+  private static final Logger log = LoggerFactory.getLogger(SqlServerStepSequenceTest.class);
+
+  @Ignore
+  @ForPlatform(Platform.SQLSERVER)
+  @Test
+  public void seq() {
+
+
+    server().createSqlUpdate("drop sequence if exists sqls_testseq_9876").execute();
+    server().createSqlUpdate("create sequence sqls_testseq_9876 start with 1 increment by 50").execute();
+
+    BackgroundExecutor be = server().getBackgroundExecutor();
+    DataSource ds = server().getPluginApi().getDataSource();
+
+    SqlServerStepSequence s = new SqlServerStepSequence(be, ds, "sqls_testseq_9876", 50);
+
+    Object id = s.nextId(null);
+    assertThat(id).isEqualTo(1L);
+
+    for (int i = 0; i < 20; i++) {
+      Object val = s.nextId(null);
+      log.warn("val: "+val);
+    }
+
+    log.warn("here");
+
+    for (int i = 0; i < 20; i++) {
+      Object val = s.nextId(null);
+      log.warn("val: "+val);
+    }
+
+    for (int i = 0; i < 100; i++) {
+      Object val = s.nextId(null);
+      log.warn("val: "+val);
+    }
+  }
+
+}

From 29bb9d3b487e52c77013d4135c6a0f83a03d9874 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 22 Feb 2018 22:46:17 +1300
Subject: [PATCH 0053/1036] #1268 - SQL Server fix for "for update" plus
 Sequences support plus refactor of sequences

---
 src/test/resources/ebean.properties | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index d2e64ef00..233b18ff6 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -15,6 +15,7 @@ ebean.encryptKeyManager=org.tests.basic.encrypt.BasicEncyptKeyManager
 #ebean.autotune.profiling=true
 #ebean.autotune.profilingUpdateFrequency=5
 
+ebean.sqlserver.ddl.createOnly=true
 ebean.ddl.generate=true
 ebean.ddl.run=true
 ebean.packages=org.tests
@@ -88,6 +89,10 @@ datasource.h2ebasicver.password=
 datasource.h2ebasicver.databaseUrl=jdbc:h2:mem:h2ebasicver
 datasource.h2ebasicver.databaseDriver=org.h2.Driver
 
+datasource.h2ebasicver2.username=sa
+datasource.h2ebasicver2.password=
+datasource.h2ebasicver2.databaseUrl=jdbc:h2:mem:h2ebasicver
+datasource.h2ebasicver2.databaseDriver=org.h2.Driver
 
 datasource.sqlite.username=
 datasource.sqlite.password=
@@ -122,9 +127,10 @@ datasource.pg.databaseDriver=org.postgresql.Driver
 #datasource.pg.capturestacktrace=true
 datasource.pg.maxStackTraceSize=50
 
+ebean.sqlserver.idType=SEQUENCE
 datasource.sqlserver.username=test_ebean
 datasource.sqlserver.password=SqlS3rv#r
-datasource.sqlserver.databaseUrl=jdbc:sqlserver://localhost:1433;databaseName=test_ebean;selectMethod=cursor
+datasource.sqlserver.databaseUrl=jdbc:sqlserver://localhost:1433;databaseName=test_ebean
 datasource.sqlserver.databaseDriver=com.microsoft.sqlserver.jdbc.SQLServerDriver
 
 datasource.db2.username=db2admin

From 18d944f2287b133da8a7618e76be672bff6daaca Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 23 Feb 2018 10:13:57 +1300
Subject: [PATCH 0054/1036] Test only - copy/add multi-tenant partition tests

---
 .../multitenant/partition/CurrentTenant.java  | 14 ++++
 .../multitenant/partition/MtBaseDomain.java   | 57 +++++++++++++
 .../org/multitenant/partition/MtContent.java  | 32 ++++++++
 .../org/multitenant/partition/MtTenant.java   | 67 ++++++++++++++++
 .../multitenant/partition/MtTenantAware.java  | 22 +++++
 .../partition/MultiTenantPartitionTest.java   | 80 +++++++++++++++++++
 .../multitenant/partition/UserContext.java    | 46 +++++++++++
 7 files changed, 318 insertions(+)
 create mode 100644 src/test/java/org/multitenant/partition/CurrentTenant.java
 create mode 100644 src/test/java/org/multitenant/partition/MtBaseDomain.java
 create mode 100644 src/test/java/org/multitenant/partition/MtContent.java
 create mode 100644 src/test/java/org/multitenant/partition/MtTenant.java
 create mode 100644 src/test/java/org/multitenant/partition/MtTenantAware.java
 create mode 100644 src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java
 create mode 100644 src/test/java/org/multitenant/partition/UserContext.java

diff --git a/src/test/java/org/multitenant/partition/CurrentTenant.java b/src/test/java/org/multitenant/partition/CurrentTenant.java
new file mode 100644
index 000000000..7e8b73b9f
--- /dev/null
+++ b/src/test/java/org/multitenant/partition/CurrentTenant.java
@@ -0,0 +1,14 @@
+package org.multitenant.partition;
+
+import io.ebean.config.CurrentTenantProvider;
+
+class CurrentTenant implements CurrentTenantProvider {
+
+  /**
+   * Return the current tenantId from the user context.
+   */
+  @Override
+  public String currentId() {
+    return UserContext.get().getTenantId();
+  }
+}
diff --git a/src/test/java/org/multitenant/partition/MtBaseDomain.java b/src/test/java/org/multitenant/partition/MtBaseDomain.java
new file mode 100644
index 000000000..41a23d20f
--- /dev/null
+++ b/src/test/java/org/multitenant/partition/MtBaseDomain.java
@@ -0,0 +1,57 @@
+package org.multitenant.partition;
+
+import io.ebean.annotation.WhenCreated;
+import io.ebean.annotation.WhenModified;
+
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Version;
+import java.time.Instant;
+
+@MappedSuperclass
+public abstract class MtBaseDomain {
+
+  @Id
+  long id;
+
+  @WhenModified
+  Instant whenModified;
+
+  @WhenCreated
+  Instant whenCreated;
+
+  @Version
+  long version;
+
+  public long getId() {
+    return id;
+  }
+
+  public void setId(long id) {
+    this.id = id;
+  }
+
+  public Instant getWhenModified() {
+    return whenModified;
+  }
+
+  public void setWhenModified(Instant whenModified) {
+    this.whenModified = whenModified;
+  }
+
+  public Instant getWhenCreated() {
+    return whenCreated;
+  }
+
+  public void setWhenCreated(Instant whenCreated) {
+    this.whenCreated = whenCreated;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/multitenant/partition/MtContent.java b/src/test/java/org/multitenant/partition/MtContent.java
new file mode 100644
index 000000000..9489c1342
--- /dev/null
+++ b/src/test/java/org/multitenant/partition/MtContent.java
@@ -0,0 +1,32 @@
+package org.multitenant.partition;
+
+import javax.persistence.Entity;
+
+@Entity
+public class MtContent extends MtTenantAware {
+
+  String title;
+
+  String body;
+
+  public MtContent(String title) {
+    this.title = title;
+  }
+
+  public String getTitle() {
+    return title;
+  }
+
+  public void setTitle(String title) {
+    this.title = title;
+  }
+
+  public String getBody() {
+    return body;
+  }
+
+  public void setBody(String body) {
+    this.body = body;
+  }
+
+}
diff --git a/src/test/java/org/multitenant/partition/MtTenant.java b/src/test/java/org/multitenant/partition/MtTenant.java
new file mode 100644
index 000000000..9c21a14e0
--- /dev/null
+++ b/src/test/java/org/multitenant/partition/MtTenant.java
@@ -0,0 +1,67 @@
+package org.multitenant.partition;
+
+import io.ebean.annotation.Length;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Version;
+
+@Entity
+public class MtTenant {
+
+  @Id
+  final String id;
+
+  @Length(50)
+  String name;
+
+  @Length(50)
+  String email;
+
+  String notes;
+
+  @Version
+  long version;
+
+  public MtTenant(String id, String name, String email) {
+    this.id = id;
+    this.name = name;
+    this.email = email;
+  }
+
+  public String getId() {
+    return id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getEmail() {
+    return email;
+  }
+
+  public void setEmail(String email) {
+    this.email = email;
+  }
+
+  public String getNotes() {
+    return notes;
+  }
+
+  public void setNotes(String notes) {
+    this.notes = notes;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/multitenant/partition/MtTenantAware.java b/src/test/java/org/multitenant/partition/MtTenantAware.java
new file mode 100644
index 000000000..ea6337a89
--- /dev/null
+++ b/src/test/java/org/multitenant/partition/MtTenantAware.java
@@ -0,0 +1,22 @@
+package org.multitenant.partition;
+
+import io.ebean.annotation.TenantId;
+
+import javax.persistence.ManyToOne;
+import javax.persistence.MappedSuperclass;
+
+@MappedSuperclass
+public abstract class MtTenantAware extends MtBaseDomain {
+
+  @TenantId
+  @ManyToOne(optional = false)
+  MtTenant tenant;
+
+  public MtTenant getTenant() {
+    return tenant;
+  }
+
+  public void setTenant(MtTenant tenant) {
+    this.tenant = tenant;
+  }
+}
diff --git a/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java b/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java
new file mode 100644
index 000000000..ff007a938
--- /dev/null
+++ b/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java
@@ -0,0 +1,80 @@
+package org.multitenant.partition;
+
+import io.ebean.EbeanServer;
+import io.ebean.EbeanServerFactory;
+import io.ebean.config.ServerConfig;
+import io.ebean.config.TenantMode;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class MultiTenantPartitionTest {
+
+  private static String[] names = {"Ace", "Base", "Case", "Dae", "Eva"};
+
+  static List<MtTenant> tenants() {
+    List<MtTenant> tenants = new ArrayList<>();
+    for (int i = 0; i < 5; i++) {
+      tenants.add(new MtTenant("ten_"+i, names[i], names[i]+"@foo.com".toLowerCase()));
+    }
+    return tenants;
+  }
+
+  private static EbeanServer server = init();
+
+  static {
+    server.saveAll(tenants());
+  }
+
+  @Test
+  public void start() {
+
+    UserContext.set("rob", "ten_1");
+
+    LoggedSqlCollector.start();
+    MtContent content = new MtContent("first title");
+    server.save(content);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql.get(0)).contains("insert into mt_content (title, body, when_modified, when_created, version, tenant_id) values (?,?,?,?,?,?)");
+
+    content.setBody("some body");
+    server.save(content);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql.get(0)).contains("update mt_content set body=?, when_modified=?, version=? where id=? and tenant_id=? and version=?");
+
+    server.delete(content);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql.get(0)).contains("delete from mt_content where id=? and tenant_id=? and version=?");
+
+    LoggedSqlCollector.stop();
+
+  }
+
+
+  private static EbeanServer init() {
+    System.setProperty("ebean.ignoreExtraDdl", "true");
+
+    ServerConfig config = new ServerConfig();
+
+    config.setName("h2multitenant");
+    config.loadFromProperties();
+    config.setDdlGenerate(true);
+    config.setDdlRun(true);
+    config.setRegister(false);
+    config.setDefaultServer(false);
+    config.setCurrentTenantProvider(new CurrentTenant());
+    config.setTenantMode(TenantMode.PARTITION);
+
+    config.getClasses().add(MtTenant.class);
+    config.getClasses().add(MtContent.class);
+
+    return EbeanServerFactory.create(config);
+  }
+}
diff --git a/src/test/java/org/multitenant/partition/UserContext.java b/src/test/java/org/multitenant/partition/UserContext.java
new file mode 100644
index 000000000..60794b674
--- /dev/null
+++ b/src/test/java/org/multitenant/partition/UserContext.java
@@ -0,0 +1,46 @@
+package org.multitenant.partition;
+
+public final class UserContext {
+
+  private static final UserContextThreadLocal local = new UserContextThreadLocal();
+
+  private String userId;
+  private String tenantId;
+
+  private UserContext(String userId, String tenantId) {
+    this.userId = userId;
+    this.tenantId = tenantId;
+  }
+
+  private UserContext() {
+  }
+
+  public String getUserId() {
+    return userId;
+  }
+
+  public String getTenantId() {
+    return tenantId;
+  }
+
+  public static UserContext get() {
+    return local.get();
+  }
+
+  public static void reset() {
+    local.remove();
+  }
+
+  public static void set(String userId, String tenantId) {
+    local.set(new UserContext(userId, tenantId));
+  }
+
+
+  private static class UserContextThreadLocal extends ThreadLocal<UserContext> {
+
+    @Override
+    protected UserContext initialValue() {
+      return new UserContext();
+    }
+  }
+}

From 9aee7c892df60af640ea7127ab1e35e44697ff86 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 23 Feb 2018 10:14:27 +1300
Subject: [PATCH 0055/1036] Test only - copy/add multi-tenant partition tests

---
 src/test/resources/ebean.properties | 6 ++++++
 src/test/resources/logback-test.xml | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 233b18ff6..22eb59a86 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -68,6 +68,12 @@ datasource.h2.maxStackTraceSize=20
 datasource.h2.poolListener=org.tests.basic.MyTestDataSourcePoolListener
 #datasource.h2.customProperties=IGNORECASE=TRUE;MODE=Oracle;
 
+
+datasource.h2multitenant.username=sa
+datasource.h2multitenant.password=
+datasource.h2multitenant.url=jdbc:h2:mem:h2multitenant
+datasource.h2multitenant.driver=org.h2.Driver
+
 datasource.h2autocommit.autoCommit=true
 datasource.h2autocommit.username=sa
 datasource.h2autocommit.password=
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
index a86b99666..7ab47450e 100644
--- a/src/test/resources/logback-test.xml
+++ b/src/test/resources/logback-test.xml
@@ -79,7 +79,7 @@
   <logger name="org.tests" level="INFO"/>
   <logger name="io.ebean" level="INFO"/>
 
-  <!--<logger name="org.avaje.docker" level="TRACE"/>-->
+  <logger name="org.avaje.docker" level="TRACE"/>
   <!--<logger name="io.ebean.DDL" level="DEBUG"/>-->
 
   <logger name="io.ebean.SQL" level="TRACE"/>

From 4a243a76a713f6d5565e8454923972ff6f00816e Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 23 Feb 2018 10:26:47 +1300
Subject: [PATCH 0056/1036] #1270 - Multi-tenant - partition mode - Delete by
 id does not include tenantId value in predicate

---
 .../server/deploy/BeanDescriptor.java         |  7 ++++
 .../server/persist/DefaultPersister.java      | 19 ++++++++-
 .../persist/dmlbind/BindableAssocOne.java     | 11 ------
 .../persist/dmlbind/BindableAssocTenant.java  | 20 ++++++++++
 .../persist/dmlbind/BindableProperty.java     | 11 ------
 .../persist/dmlbind/FactoryVersion.java       |  9 ++++-
 .../partition/MultiTenantPartitionTest.java   | 39 +++++++++++++++++++
 7 files changed, 92 insertions(+), 24 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocTenant.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 696fa5dbf..9cc43fef5 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -3155,6 +3155,13 @@ public class BeanDescriptor<T> implements BeanType<T> {
     return versionProperty;
   }
 
+  /**
+   * Return true if this type is tenant aware.
+   */
+  public boolean isMultiTenant() {
+    return tenant != null;
+  }
+
   /**
    * Return the tenant property when multi-tenant partitioning support is used.
    */
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index bc6a5cfe8..8459d8e2d 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -578,6 +578,16 @@ public final class DefaultPersister implements Persister {
     }
 
     BeanDescriptor<?> descriptor = beanDescriptorManager.getBeanDescriptor(beanType);
+    boolean softDelete = !permanent && descriptor.isSoftDelete();
+    if (descriptor.isMultiTenant()) {
+      // convert to a delete by bean
+      for (Object id : ids) {
+        EntityBean bean = descriptor.createEntityBean();
+        descriptor.convertSetId(id, bean);
+        deleteRecurse(bean, transaction, permanent);
+      }
+      return ids.size();
+    }
 
     ArrayList<Object> idList = new ArrayList<>(ids.size());
     for (Object id : ids) {
@@ -585,7 +595,6 @@ public final class DefaultPersister implements Persister {
       idList.add(descriptor.convertId(id));
     }
 
-    boolean softDelete = !permanent && descriptor.isSoftDelete();
     return delete(descriptor, null, idList, transaction, softDelete);
   }
 
@@ -595,6 +604,14 @@ public final class DefaultPersister implements Persister {
   @Override
   public int delete(Class<?> beanType, Object id, Transaction transaction, boolean permanent) {
     BeanDescriptor<?> descriptor = beanDescriptorManager.getBeanDescriptor(beanType);
+    if (descriptor.isMultiTenant()) {
+      // convert to a delete by bean
+      EntityBean bean = descriptor.createEntityBean();
+      descriptor.convertSetId(id, bean);
+      delete(bean, transaction, permanent);
+      return 1;
+    }
+
     id = descriptor.convertId(id);
     boolean softDelete = !permanent && descriptor.isSoftDelete();
     return delete(descriptor, id, null, transaction, softDelete);
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java
index 9ccb00aea..bf4339410 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java
@@ -66,15 +66,4 @@ class BindableAssocOne implements Bindable {
     }
   }
 
-  /**
-   * Cast to an EntityBean allowing null.
-   */
-  EntityBean castToEntityBean(Object objectValue) {
-    if (objectValue instanceof EntityBean || objectValue == null) {
-      return (EntityBean) objectValue;
-    } else {
-      throw new IllegalStateException("Bean " + objectValue.getClass() + " is not enhanced?");
-    }
-  }
-
 }
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocTenant.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocTenant.java
new file mode 100644
index 000000000..eab3678a5
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocTenant.java
@@ -0,0 +1,20 @@
+package io.ebeaninternal.server.persist.dmlbind;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
+
+import java.sql.SQLException;
+
+class BindableAssocTenant extends BindableAssocOne {
+
+  BindableAssocTenant(BeanPropertyAssocOne<?> assocOne) {
+    super(assocOne);
+  }
+
+  @Override
+  public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException {
+
+    EntityBean assocBean = (EntityBean) assocOne.getValue(bean);
+    importedId.bind(request, assocBean);
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java
index bc0840ce2..0d76baf3c 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java
@@ -54,15 +54,4 @@ public class BindableProperty implements Bindable {
     request.bind(value, prop);
   }
 
-  /**
-   * For compound types bind one of the underlying scalar values for a compound type.
-   */
-  public void dmlBindObject(BindableRequest request, Object bean) throws SQLException {
-
-    Object value = null;
-    if (bean != null) {
-      value = prop.getValueObject(bean);
-    }
-    request.bind(value, prop);
-  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryVersion.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryVersion.java
index e52484d81..abb7f1a20 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryVersion.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryVersion.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.persist.dmlbind;
 
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanProperty;
+import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 
 /**
  * Creates a Bindable to support version concurrency where clauses.
@@ -36,6 +37,12 @@ public class FactoryVersion {
   public Bindable createTenantId(BeanDescriptor<?> desc) {
 
     BeanProperty tenant = desc.getTenantProperty();
-    return (tenant == null) ? null : new BindableProperty(tenant);
+    if (tenant == null) {
+      return null;
+    } else if (tenant instanceof BeanPropertyAssocOne) {
+      return new BindableAssocTenant((BeanPropertyAssocOne<?>) tenant);
+    } else {
+      return new BindableProperty(tenant);
+    }
   }
 }
diff --git a/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java b/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java
index ff007a938..2625266ef 100644
--- a/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java
+++ b/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java
@@ -8,6 +8,7 @@ import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -54,7 +55,45 @@ public class MultiTenantPartitionTest {
     assertThat(sql.get(0)).contains("delete from mt_content where id=? and tenant_id=? and version=?");
 
     LoggedSqlCollector.stop();
+  }
 
+  @Test
+  public void deleteById() {
+
+    UserContext.set("fred", "ten_2");
+
+    MtContent content = new MtContent("first title");
+    server.save(content);
+
+    LoggedSqlCollector.start();
+    server.delete(MtContent.class, content.getId());
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("delete from mt_content where id=? and tenant_id=?");
+  }
+
+  @Test
+  public void deleteByIds() {
+
+    UserContext.set("fred", "ten_2");
+
+    MtContent a = newContent("title a");
+    MtContent b = newContent("title b");
+
+
+    List<Long> ids = Arrays.asList(a.getId(), b.getId());
+
+    LoggedSqlCollector.start();
+    server.deleteAll(MtContent.class, ids);
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("delete from mt_content where id=? and tenant_id=?");
+  }
+
+  private MtContent newContent(String title) {
+    MtContent content = new MtContent(title);
+    server.save(content);
+    return content;
   }
 
 

From 60a3c24cbaa252fc196b2434cc62acf6f20951e9 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 23 Feb 2018 10:31:22 +1300
Subject: [PATCH 0057/1036] No Effective change - Tidy pom removing commented
 out old sqlserver jdbc driver

---
 pom.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1a19a7abd..7d67bc788 100644
--- a/pom.xml
+++ b/pom.xml
@@ -191,13 +191,6 @@
       <!--<scope>test</scope>-->
     <!--</dependency>-->
 
-    <!--<dependency>-->
-      <!--<groupId>microsoft</groupId>-->
-      <!--<artifactId>sqlserver-jdbc</artifactId>-->
-      <!--<version>4.2</version>-->
-      <!--<scope>test</scope>-->
-    <!--</dependency>-->
-
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-docker-run</artifactId>

From b037be5d3edd1ba802e0bcaddbb2bec25921f4f7 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 23 Feb 2018 12:48:06 +1300
Subject: [PATCH 0058/1036] No Effective change - bump agent in pom (with query
 bean enhancement of interface default methods)

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7d67bc788..6e27f6bdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -215,7 +215,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-agent</artifactId>
-      <version>11.9.1</version>
+      <version>11.10.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -288,7 +288,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>11.9.1</version>
+        <version>11.10.1</version>
         <executions>
           <execution>
             <id>test</id>

From 47d55a2f295197ce8ee1641cd7ba5db132b0cd94 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 23 Feb 2018 12:50:45 +1300
Subject: [PATCH 0059/1036] [maven-release-plugin] prepare release
 ebean-11.11.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6e27f6bdf..3fce9bfeb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.11.1-SNAPSHOT</version>
+  <version>11.11.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.11.1</tag>
   </scm>
 
   <profiles>

From 0e62d0579e75172f6e60783db5601ba9d4c7954a Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 23 Feb 2018 12:50:59 +1300
Subject: [PATCH 0060/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3fce9bfeb..5d56073f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.11.1</version>
+  <version>11.11.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.11.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 40704e2ef76c6b6c6e4729fec41da3479c4d8013 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 23 Feb 2018 13:37:43 +1300
Subject: [PATCH 0061/1036] No Effective change - change test to use assertJ

---
 .../org/tests/basic/event/TestQueryAdapter.java  | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/test/java/org/tests/basic/event/TestQueryAdapter.java b/src/test/java/org/tests/basic/event/TestQueryAdapter.java
index a8c87024d..ab7dbd763 100644
--- a/src/test/java/org/tests/basic/event/TestQueryAdapter.java
+++ b/src/test/java/org/tests/basic/event/TestQueryAdapter.java
@@ -3,10 +3,11 @@ package org.tests.basic.event;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import org.junit.Test;
 import org.tests.model.basic.ResetBasicData;
 import org.tests.model.basic.TOne;
-import org.junit.Assert;
-import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestQueryAdapter extends BaseTestCase {
 
@@ -20,16 +21,11 @@ public class TestQueryAdapter extends BaseTestCase {
 
     Ebean.save(o);
 
-    //Ebean.find(TOne.class, o.getId());
-
-    Query<TOne> queryFindId = Ebean.find(TOne.class)
-      .setId(o.getId());
+    Query<TOne> queryFindId = Ebean.find(TOne.class).setId(o.getId());
 
     TOne one = queryFindId.findOne();
-    Assert.assertNotNull(one);
-    Assert.assertEquals(one.getId(), o.getId());
-    String generatedSql = queryFindId.getGeneratedSql();
-    Assert.assertTrue(generatedSql.contains(" 1=1"));
 
+    assertThat(one.getId()).isEqualTo(o.getId());
+    assertThat(sqlOf(queryFindId)).contains(" 1=1");
   }
 }

From 8b18e907afd2a3c4430d6b6d8ef4a5902562037a Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 23 Feb 2018 14:04:36 +1300
Subject: [PATCH 0062/1036] #1063 - Add Event Listeners capable of being
 notified for delete by query or update by query

Adds QueryType and adds method query.getQueryType() which then can be used in a BeanQueryAdapter
---
 src/main/java/io/ebean/Query.java             |  5 ++++
 src/main/java/io/ebean/QueryType.java         | 22 ++++++++++++++++
 .../server/querydefn/DefaultOrmQuery.java     | 14 +++++++++++
 .../tests/basic/event/TestQueryAdapter.java   | 25 +++++++++++++++++++
 .../basic/event/SimpleTOneQueryAdapter.java   | 18 ++++++++++---
 5 files changed, 80 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/io/ebean/QueryType.java

diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index 8d61e223c..d8898ae5d 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -1485,6 +1485,11 @@ public interface Query<T> {
    */
   Class<T> getBeanType();
 
+  /**
+   * Return the type of query being executed.
+   */
+  QueryType getQueryType();
+
   /**
    * Set true if you want to disable lazy loading.
    * <p>
diff --git a/src/main/java/io/ebean/QueryType.java b/src/main/java/io/ebean/QueryType.java
new file mode 100644
index 000000000..4c167ac7d
--- /dev/null
+++ b/src/main/java/io/ebean/QueryType.java
@@ -0,0 +1,22 @@
+package io.ebean;
+
+/**
+ * The type of the query being executed.
+ */
+public enum QueryType {
+
+  /**
+   * A find query.
+   */
+  FIND,
+
+  /**
+   * An update query.
+   */
+  UPDATE,
+
+  /**
+   * A delete query.
+   */
+  DELETE
+}
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index bc14d10d7..a7aef2d50 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -17,6 +17,7 @@ import io.ebean.PersistenceContextScope;
 import io.ebean.ProfileLocation;
 import io.ebean.Query;
 import io.ebean.QueryIterator;
+import io.ebean.QueryType;
 import io.ebean.RawSql;
 import io.ebean.Version;
 import io.ebean.bean.CallStack;
@@ -914,6 +915,19 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     this.profilingListener = profilingListener;
   }
 
+  @Override
+  public QueryType getQueryType() {
+    if (type != null) {
+      switch (type) {
+        case DELETE:
+          return QueryType.DELETE;
+        case UPDATE:
+          return QueryType.UPDATE;
+      }
+    }
+    return QueryType.FIND;
+  }
+
   @Override
   public Mode getMode() {
     return mode;
diff --git a/src/test/java/org/tests/basic/event/TestQueryAdapter.java b/src/test/java/org/tests/basic/event/TestQueryAdapter.java
index ab7dbd763..4aea4efa9 100644
--- a/src/test/java/org/tests/basic/event/TestQueryAdapter.java
+++ b/src/test/java/org/tests/basic/event/TestQueryAdapter.java
@@ -3,10 +3,14 @@ package org.tests.basic.event;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import io.ebean.QueryType;
+import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.model.basic.ResetBasicData;
 import org.tests.model.basic.TOne;
 
+import java.util.List;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestQueryAdapter extends BaseTestCase {
@@ -27,5 +31,26 @@ public class TestQueryAdapter extends BaseTestCase {
 
     assertThat(one.getId()).isEqualTo(o.getId());
     assertThat(sqlOf(queryFindId)).contains(" 1=1");
+
+    Query<TOne> notUsedQuery = Ebean.find(TOne.class);
+    assertThat(notUsedQuery.getQueryType()).isEqualTo(QueryType.FIND);
+
+    LoggedSqlCollector.start();
+
+    Ebean.update(TOne.class)
+      .set("name", "mod")
+      .where().idEq(o.getId())
+      .update();
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql.get(0)).contains(" 2=2");
+
+    Ebean.find(TOne.class)
+      .where().idEq(o.getId())
+      .delete();
+
+    sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains(" 3=3");
+
   }
 }
diff --git a/src/test/java/org/tests/model/basic/event/SimpleTOneQueryAdapter.java b/src/test/java/org/tests/model/basic/event/SimpleTOneQueryAdapter.java
index 040fc5cef..6a4ccd346 100644
--- a/src/test/java/org/tests/model/basic/event/SimpleTOneQueryAdapter.java
+++ b/src/test/java/org/tests/model/basic/event/SimpleTOneQueryAdapter.java
@@ -23,10 +23,20 @@ public class SimpleTOneQueryAdapter implements BeanQueryAdapter {
 
     Query<?> query = request.getQuery();
 
-    // can get the type of query Bean, List, RowCount, Id's etc
-    //Type queryType = query.getType();
-
-    query.where().raw("1=1");
+    switch (query.getQueryType()) {
+      case DELETE: {
+        query.where().raw("3=3");
+        break;
+      }
+      case UPDATE: {
+        query.where().raw("2=2");
+        break;
+      }
+      case FIND: {
+        query.where().raw("1=1");
+        break;
+      }
+    }
   }
 
 

From ff111eaf3369395f2f823634f0a1ce2d1446acf7 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 23 Feb 2018 14:34:08 +1300
Subject: [PATCH 0063/1036] #1063 - Add Event Listeners capable of being
 notified for delete by id

Adds BeanDeleteIdRequest and adds a method to BeanPersistController and BeanPersistAdapter
---
 .../io/ebean/event/BeanDeleteIdRequest.java   | 26 +++++++++++++
 .../io/ebean/event/BeanPersistAdapter.java    |  7 ++++
 .../io/ebean/event/BeanPersistController.java |  5 +++
 .../deploy/ChainedBeanPersistController.java  |  8 ++++
 .../server/persist/DefaultPersister.java      | 18 +++++++++
 .../server/persist/DeleteIdRequest.java       | 37 +++++++++++++++++++
 .../event/BeanPersistControllerTest.java      | 22 +++++++++--
 7 files changed, 120 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/io/ebean/event/BeanDeleteIdRequest.java
 create mode 100644 src/main/java/io/ebeaninternal/server/persist/DeleteIdRequest.java

diff --git a/src/main/java/io/ebean/event/BeanDeleteIdRequest.java b/src/main/java/io/ebean/event/BeanDeleteIdRequest.java
new file mode 100644
index 000000000..795886830
--- /dev/null
+++ b/src/main/java/io/ebean/event/BeanDeleteIdRequest.java
@@ -0,0 +1,26 @@
+package io.ebean.event;
+
+import io.ebean.EbeanServer;
+import io.ebean.Transaction;
+
+/**
+ * A request to delete a bean by Id value.
+ */
+public interface BeanDeleteIdRequest {
+
+  /**
+   * Return the server processing the request.
+   */
+  EbeanServer getEbeanServer();
+
+  /**
+   * Return the Transaction associated with this request.
+   */
+  Transaction getTransaction();
+
+  /**
+   * Returns the Id value of the bean being deleted.
+   */
+  Object getId();
+
+}
diff --git a/src/main/java/io/ebean/event/BeanPersistAdapter.java b/src/main/java/io/ebean/event/BeanPersistAdapter.java
index 6e38ce2aa..4b6cf2cc6 100644
--- a/src/main/java/io/ebean/event/BeanPersistAdapter.java
+++ b/src/main/java/io/ebean/event/BeanPersistAdapter.java
@@ -87,4 +87,11 @@ public abstract class BeanPersistAdapter implements BeanPersistController {
   public void postSoftDelete(BeanPersistRequest<?> request) {
   }
 
+  /**
+   * Does nothing by default.
+   */
+  @Override
+  public void preDelete(BeanDeleteIdRequest request) {
+
+  }
 }
diff --git a/src/main/java/io/ebean/event/BeanPersistController.java b/src/main/java/io/ebean/event/BeanPersistController.java
index 6c55cf310..15160cb28 100644
--- a/src/main/java/io/ebean/event/BeanPersistController.java
+++ b/src/main/java/io/ebean/event/BeanPersistController.java
@@ -92,6 +92,11 @@ public interface BeanPersistController {
    */
   boolean preSoftDelete(BeanPersistRequest<?> request);
 
+  /**
+   * Prior to a delete by id perform some action.
+   */
+  void preDelete(BeanDeleteIdRequest request);
+
   /**
    * Called after the insert was performed.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java
index ff6bfe6c1..639a856ad 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.deploy;
 
+import io.ebean.event.BeanDeleteIdRequest;
 import io.ebean.event.BeanPersistController;
 import io.ebean.event.BeanPersistRequest;
 
@@ -147,6 +148,13 @@ public class ChainedBeanPersistController implements BeanPersistController {
     return true;
   }
 
+  @Override
+  public void preDelete(BeanDeleteIdRequest request) {
+    for (BeanPersistController aChain : chain) {
+      aChain.preDelete(request);
+    }
+  }
+
   @Override
   public boolean preInsert(BeanPersistRequest<?> request) {
     for (BeanPersistController aChain : chain) {
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 8459d8e2d..cbf9aba38 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -9,6 +9,7 @@ import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanCollection.ModifyListenMode;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.PersistenceContext;
+import io.ebean.event.BeanPersistController;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.api.SpiUpdate;
@@ -718,6 +719,7 @@ public final class DefaultPersister implements Persister {
     }
 
     // use Id's to update L2 cache rather than Bulk table event
+    notifyDeleteById(descriptor, id, idList, transaction);
     deleteById.setAutoTableMod(false);
     if (idList != null) {
       t.getEvent().addDeleteByIdList(descriptor, idList);
@@ -738,6 +740,22 @@ public final class DefaultPersister implements Persister {
     return rows;
   }
 
+  private void notifyDeleteById(BeanDescriptor<?> descriptor, Object id, List<Object> idList, Transaction transaction) {
+
+    BeanPersistController controller = descriptor.getPersistController();
+    if (controller != null) {
+      DeleteIdRequest request = new DeleteIdRequest(server, transaction, id);
+      if (idList == null) {
+        controller.preDelete(request);
+      } else {
+        for (Object idValue : idList) {
+          request.setId(idValue);
+          controller.preDelete(request);
+        }
+      }
+    }
+  }
+
   /**
    * We need to create and execute a query to get the foreign key values as
    * the delete cascades to them (foreign keys).
diff --git a/src/main/java/io/ebeaninternal/server/persist/DeleteIdRequest.java b/src/main/java/io/ebeaninternal/server/persist/DeleteIdRequest.java
new file mode 100644
index 000000000..0cad9918a
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/persist/DeleteIdRequest.java
@@ -0,0 +1,37 @@
+package io.ebeaninternal.server.persist;
+
+import io.ebean.EbeanServer;
+import io.ebean.Transaction;
+import io.ebean.event.BeanDeleteIdRequest;
+import io.ebeaninternal.api.SpiEbeanServer;
+
+class DeleteIdRequest implements BeanDeleteIdRequest {
+
+  private final EbeanServer server;
+  private final Transaction transaction;
+  private Object id;
+
+  DeleteIdRequest(SpiEbeanServer server, Transaction transaction, Object id) {
+    this.server = server;
+    this.transaction = transaction;
+  }
+
+  void setId(Object id) {
+    this.id = id;
+  }
+
+  @Override
+  public EbeanServer getEbeanServer() {
+    return server;
+  }
+
+  @Override
+  public Transaction getTransaction() {
+    return transaction;
+  }
+
+  @Override
+  public Object getId() {
+    return id;
+  }
+}
diff --git a/src/test/java/io/ebean/event/BeanPersistControllerTest.java b/src/test/java/io/ebean/event/BeanPersistControllerTest.java
index 03f7a1170..58d351a1c 100644
--- a/src/test/java/io/ebean/event/BeanPersistControllerTest.java
+++ b/src/test/java/io/ebean/event/BeanPersistControllerTest.java
@@ -4,19 +4,20 @@ package io.ebean.event;
 import io.ebean.EbeanServer;
 import io.ebean.EbeanServerFactory;
 import io.ebean.config.ServerConfig;
-import org.tests.model.basic.EBasicVer;
 import org.junit.Test;
+import org.tests.model.basic.EBasicVer;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class BeanPersistControllerTest {
 
-  PersistAdapter continuePersistingAdapter = new PersistAdapter(true);
+  private PersistAdapter continuePersistingAdapter = new PersistAdapter(true);
 
-  PersistAdapter stopPersistingAdapter = new PersistAdapter(false);
+  private PersistAdapter stopPersistingAdapter = new PersistAdapter(false);
 
   @Test
   public void testInsertUpdateDelete_given_continuePersistingAdapter() {
@@ -64,7 +65,17 @@ public class BeanPersistControllerTest {
     ebeanServer.delete(bean);
     assertThat(stopPersistingAdapter.methodsCalled).hasSize(1);
     assertThat(stopPersistingAdapter.methodsCalled).containsExactly("preDelete");
+    stopPersistingAdapter.methodsCalled.clear();
 
+    ebeanServer.delete(EBasicVer.class, 22);
+    assertThat(stopPersistingAdapter.methodsCalled).hasSize(1);
+    assertThat(stopPersistingAdapter.methodsCalled).containsExactly("preDeleteById");
+    stopPersistingAdapter.methodsCalled.clear();
+
+    ebeanServer.deleteAll(EBasicVer.class, Arrays.asList(22,23,24));
+    assertThat(stopPersistingAdapter.methodsCalled).hasSize(3);
+    assertThat(stopPersistingAdapter.methodsCalled).containsExactly("preDeleteById", "preDeleteById", "preDeleteById");
+    stopPersistingAdapter.methodsCalled.clear();
   }
 
   private EbeanServer getEbeanServer(PersistAdapter persistAdapter) {
@@ -136,6 +147,11 @@ public class BeanPersistControllerTest {
     public void postUpdate(BeanPersistRequest<?> request) {
       methodsCalled.add("postUpdate");
     }
+
+    @Override
+    public void preDelete(BeanDeleteIdRequest request) {
+      methodsCalled.add("preDeleteById");
+    }
   }
 
 }

From 7d0ed261b534fc958df58e34e58bc1fb0d69323f Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 23 Feb 2018 16:55:07 +1300
Subject: [PATCH 0064/1036] #1271 - ENH: Add BeanFinder and BeanRepository ...
 such that there is a read to go base class for DI repository style

---
 src/main/java/io/ebean/BeanFinder.java        | 169 +++++++++++++++++
 src/main/java/io/ebean/BeanRepository.java    | 178 ++++++++++++++++++
 .../tests/repository/CustomerRepository.java  |  36 ++++
 .../tests/repository/TestBeanRepository.java  |  61 ++++++
 4 files changed, 444 insertions(+)
 create mode 100644 src/main/java/io/ebean/BeanFinder.java
 create mode 100644 src/main/java/io/ebean/BeanRepository.java
 create mode 100644 src/test/java/org/tests/repository/CustomerRepository.java
 create mode 100644 src/test/java/org/tests/repository/TestBeanRepository.java

diff --git a/src/main/java/io/ebean/BeanFinder.java b/src/main/java/io/ebean/BeanFinder.java
new file mode 100644
index 000000000..0afcc7227
--- /dev/null
+++ b/src/main/java/io/ebean/BeanFinder.java
@@ -0,0 +1,169 @@
+package io.ebean;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * Provides finder functionality for use with "Dependency Injection style" use of Ebean.
+ * <p>
+ * Note that typically users would extend BeanRepository rather than BeanFinder.
+ * </p>
+ * <pre>{@code
+ *
+ * public class CustomerFinder extends BeanFinder<Long,Customer> {
+ *
+ *   @Inject
+ *   public CustomerFinder(EbeanServer server) {
+ *     super(Customer.class, server);
+ *   }
+ *
+ *   // ... add customer specific finders
+ * }
+ *
+ * }</pre>
+ *
+ * @param <I> The ID type
+ * @param <T> The Bean type
+ */
+public abstract class BeanFinder<I,T> {
+
+  protected final EbeanServer server;
+
+  protected final Class<T> type;
+
+  /**
+   * Create with the given bean type and EbeanServer instance.
+   *
+   * @param type The bean type
+   * @param server The EbeanServer instance typically created via Spring factory or equivalent.
+   */
+  protected BeanFinder(Class<T> type, EbeanServer server) {
+    this.type = type;
+    this.server = server;
+  }
+
+  /**
+   * Return the EbeanServer to use.
+   */
+  public EbeanServer db() {
+    return server;
+  }
+
+  /**
+   * Return the current transaction.
+   */
+  public Transaction currentTransaction() {
+    return db().currentTransaction();
+  }
+
+  /**
+   * Flush the JDBC batch on the current transaction.
+   */
+  public void flush() {
+    db().flush();
+  }
+
+  /**
+   * Return typically a different EbeanServer to the default.
+   * <p>
+   * This is equivalent to {@link Ebean#getServer(String)}
+   *
+   * @param server The name of the EbeanServer. If this is null then the default EbeanServer is
+   *               returned.
+   */
+  public EbeanServer db(String server) {
+    return Ebean.getServer(server);
+  }
+
+  /**
+   * Creates an entity reference for this ID.
+   * <p>
+   * Equivalent to {@link EbeanServer#getReference(Class, Object)}
+   */
+  @Nonnull
+  public T ref(I id) {
+    return db().getReference(type, id);
+  }
+
+  /**
+   * Retrieves an entity by ID.
+   * <p>
+   * Equivalent to {@link EbeanServer#find(Class, Object)}
+   */
+  @Nullable
+  public T findById(I id) {
+    return db().find(type, id);
+  }
+
+  /**
+   * Find an entity by ID returning an Optional.
+   */
+  @Nullable
+  public Optional<T> findByIdOrEmpty(I id) {
+    return db().find(type).setId(id).findOneOrEmpty();
+  }
+
+  /**
+   * Delete a bean by Id.
+   * <p>
+   * Equivalent to {@link EbeanServer#delete(Class, Object)}
+   */
+  public void deleteById(I id) {
+    db().delete(type, id);
+  }
+
+  /**
+   * Retrieves all entities of the given type.
+   */
+  @Nonnull
+  public List<T> findAll() {
+    return query().findList();
+  }
+
+  /**
+   * Creates an update query.
+   *
+   * <pre>{@code
+   *
+   *  int rows =
+   *      updateQuery()
+   *      .set("status", Customer.Status.ACTIVE)
+   *      .set("updtime", new Timestamp(System.currentTimeMillis()))
+   *      .where()
+   *        .gt("id", 1000)
+   *        .update();
+   *
+   * }</pre>
+   *
+   * <p>
+   * Equivalent to {@link EbeanServer#update(Class)}
+   */
+  protected UpdateQuery<T> updateQuery() {
+    return db().update(type);
+  }
+
+  /**
+   * Creates a query.
+   * <p>
+   * Equivalent to {@link EbeanServer#find(Class)}
+   */
+  protected Query<T> query() {
+    return db().find(type);
+  }
+
+  /**
+   * Creates a native sql query.
+   */
+  protected Query<T> nativeSql(String nativeSql) {
+    return db().findNative(type, nativeSql);
+  }
+
+  /**
+   * Creates a query using the ORM query language.
+   */
+  protected Query<T> query(String ormQuery) {
+    return db().createQuery(type, ormQuery);
+  }
+}
diff --git a/src/main/java/io/ebean/BeanRepository.java b/src/main/java/io/ebean/BeanRepository.java
new file mode 100644
index 000000000..3c588b65c
--- /dev/null
+++ b/src/main/java/io/ebean/BeanRepository.java
@@ -0,0 +1,178 @@
+package io.ebean;
+
+import io.ebean.bean.EntityBean;
+
+/**
+ * Provides finder functionality for use with "Dependency Injection style" use of Ebean.
+ * <p>
+ * <pre>{@code
+ *
+ * @Repository
+ * public class CustomerRepository extends BeanRepository<Long,Customer> {
+ *
+ *   @Inject
+ *   public CustomerRepository(EbeanServer server) {
+ *     super(Customer.class, server);
+ *   }
+ *
+ *   // ... add customer specific finders and persist logic
+ *
+ *   public List<Customer> findByName(String nameStart) {
+ *     return query().where()
+ *             .istartsWith("name", nameStart)
+ *             .findList();
+ *   }
+ *
+ * }
+ * }</pre>
+ *
+ * @param <I> The ID type
+ * @param <T> The Bean type
+ */
+public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
+
+  /**
+   * Create with the given bean type and EbeanServer instance.
+   * <p>
+   * Typically users would extend BeanRepository rather than BeanFinder.
+   * </p>
+   * <pre>{@code
+   *
+   *   @Inject
+   *   public CustomerRepository(EbeanServer server) {
+   *     super(Customer.class, server);
+   *   }
+   *
+   * }</pre>
+   *
+   * @param type   The bean type
+   * @param server The EbeanServer instance typically created via Spring factory or equivalent
+   */
+  protected BeanRepository(Class<T> type, EbeanServer server) {
+    super(type, server);
+  }
+
+  /**
+   * Marks the entity bean as dirty.
+   * <p>
+   * This is used so that when a bean that is otherwise unmodified is updated the version
+   * property is updated.
+   * <p>
+   * An unmodified bean that is saved or updated is normally skipped and this marks the bean as
+   * dirty so that it is not skipped.
+   * <p>
+   * <pre>{@code
+   *
+   * Customer customer = customerRepository.byId(id);
+   *
+   * // mark the bean as dirty so that a save() or update() will
+   * // increment the version property
+   *
+   * customerRepository.markAsDirty(customer);
+   * customerRepository.save(customer);
+   *
+   * }</pre>
+   *
+   * @see EbeanServer#markAsDirty(Object)
+   */
+  public void markAsDirty(T bean) {
+    db().markAsDirty(bean);
+  }
+
+  /**
+   * Mark the property as unset or 'not loaded'.
+   * <p>
+   * This would be used to specify a property that we did not wish to include in a stateless update.
+   * </p>
+   * <pre>{@code
+   *
+   *   // populate an entity bean from JSON or whatever
+   *   Customer customer = ...;
+   *
+   *   // mark the email property as 'unset' so that it is not
+   *   // included in a 'stateless update'
+   *   customerRepository.markPropertyUnset(customer, "email");
+   *
+   *   customerRepository.update(customer);
+   *
+   * }</pre>
+   *
+   * @param propertyName the name of the property on the bean to be marked as 'unset'
+   */
+  public void markPropertyUnset(T bean, String propertyName) {
+    ((EntityBean) bean)._ebean_getIntercept().setPropertyLoaded(propertyName, false);
+  }
+
+  /**
+   * Insert or update this entity depending on its state.
+   * <p>
+   * Ebean will detect if this is a new bean or a previously fetched bean and perform either an
+   * insert or an update based on that.
+   *
+   * @see EbeanServer#save(Object)
+   */
+  public void save(T bean) {
+    db().save(bean);
+  }
+
+  /**
+   * Update this entity.
+   *
+   * @see EbeanServer#update(Object)
+   */
+  public void update(T bean) {
+    db().update(bean);
+  }
+
+  /**
+   * Insert this entity.
+   *
+   * @see EbeanServer#insert(Object)
+   */
+  public void insert(T bean) {
+    db().insert(bean);
+  }
+
+  /**
+   * Delete this bean.
+   * <p>
+   * This will return true if the bean was deleted successfully or JDBC batch is being used.
+   * </p>
+   * <p>
+   * If there is no current transaction one will be created and committed for
+   * you automatically.
+   * </p>
+   * <p>
+   * If the Bean does not have a version property (or loaded version property) and
+   * the bean does not exist then this returns false indicating that nothing was
+   * deleted. Note that, if JDBC batch mode is used then this always returns true.
+   * </p>
+   *
+   * @see EbeanServer#delete(Object)
+   */
+  public boolean delete(T bean) {
+    return db().delete(bean);
+  }
+
+  /**
+   * Delete a bean permanently without soft delete.
+   * <p>
+   * This is used when the bean contains a <code>@SoftDelete</code> property and we
+   * want to perform a hard/permanent delete.
+   * </p>
+   *
+   * @see EbeanServer#deletePermanent(Object)
+   */
+  public boolean deletePermanent(T bean) {
+    return db().deletePermanent(bean);
+  }
+
+  /**
+   * Refreshes this entity from the database.
+   *
+   * @see EbeanServer#refresh(Object)
+   */
+  public void refresh(T bean) {
+    db().refresh(bean);
+  }
+}
diff --git a/src/test/java/org/tests/repository/CustomerRepository.java b/src/test/java/org/tests/repository/CustomerRepository.java
new file mode 100644
index 000000000..31d18ef96
--- /dev/null
+++ b/src/test/java/org/tests/repository/CustomerRepository.java
@@ -0,0 +1,36 @@
+package org.tests.repository;
+
+import io.ebean.BeanRepository;
+import io.ebean.EbeanServer;
+import org.tests.model.basic.Customer;
+
+import javax.inject.Inject;
+import java.util.List;
+
+public class CustomerRepository extends BeanRepository<Integer, Customer> {
+
+  @Inject
+  public CustomerRepository(EbeanServer server) {
+    super(Customer.class, server);
+  }
+
+  public List<Customer> findByName(String nameStart) {
+    return query().where()
+      .istartsWith("name", nameStart)
+      .findList();
+  }
+
+  public Customer findMatchName(String matchName) {
+    return nativeSql("select id, name from o_customer where name = ?")
+      .setParameter(1, matchName)
+      .findOne();
+  }
+
+  public int updateNotes(String blah, String whot) {
+
+    return updateQuery()
+      .set("smallnote", whot)
+      .where().eq("name", blah)
+      .update();
+  }
+}
diff --git a/src/test/java/org/tests/repository/TestBeanRepository.java b/src/test/java/org/tests/repository/TestBeanRepository.java
new file mode 100644
index 000000000..cd2f7f666
--- /dev/null
+++ b/src/test/java/org/tests/repository/TestBeanRepository.java
@@ -0,0 +1,61 @@
+package org.tests.repository;
+
+import io.ebean.BaseTestCase;
+import org.junit.Test;
+import org.tests.model.basic.Customer;
+
+import java.util.List;
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestBeanRepository extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    CustomerRepository repository = new CustomerRepository(server());
+
+    Customer customer = new Customer();
+    customer.setName("RepoCustomer");
+
+    repository.save(customer);
+
+    Customer fetchCustomer = repository.findById(customer.getId());
+    fetchCustomer.setSmallnote("yeah maybe");
+
+    repository.update(fetchCustomer);
+    repository.delete(fetchCustomer);
+  }
+
+  @Test
+  public void findByName() {
+
+    CustomerRepository repository = new CustomerRepository(server());
+
+    Customer blah = new Customer();
+    blah.setName("Blah");
+
+    repository.markAsDirty(blah);
+    repository.markPropertyUnset(blah, "smallnote");
+    repository.save(blah);
+
+    Optional<Customer> maybe = repository.findByIdOrEmpty(blah.getId());
+    assertThat(maybe.isPresent()).isTrue();
+
+    List<Customer> names = repository.findByName("bla");
+    assertThat(names).hasSize(1);
+
+    Customer matchName = repository.findMatchName("Blah");
+    assertThat(matchName).isNotNull();
+
+    int rows = repository.updateNotes("Blah", "whot");
+    assertThat(rows).isEqualTo(1);
+
+    repository.deletePermanent(blah);
+
+    repository.deleteById(1099);
+    repository.findAll();
+
+  }
+}

From 265bda8cf23b3499d6d11c95189696ecbbe0e60b Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 23 Feb 2018 17:41:01 +1300
Subject: [PATCH 0065/1036] #1272 - ENH: Add built in support for Joda Period

---
 .../server/type/DefaultTypeManager.java       |  1 +
 .../server/type/ScalarTypeJodaPeriod.java     | 39 +++++++++++++++++
 .../server/type/ScalarTypeJodaPeriodTest.java | 43 +++++++++++++++++++
 .../org/tests/model/joda/BasicJodaEntity.java | 11 +++++
 .../model/joda/TestJodaInsertUpdate.java      | 12 +++++-
 5 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java
 create mode 100644 src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java

diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index a6dd341d4..369928843 100644
--- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -875,6 +875,7 @@ public final class DefaultTypeManager implements TypeManager {
       typeMap.put(DateTime.class, new ScalarTypeJodaDateTime(mode));
       typeMap.put(LocalDate.class, new ScalarTypeJodaLocalDate());
       typeMap.put(org.joda.time.DateMidnight.class, new ScalarTypeJodaDateMidnight());
+      typeMap.put(org.joda.time.Period.class, new ScalarTypeJodaPeriod());
 
       String jodaLocalTimeMode = config.getJodaLocalTimeMode();
       if ("normal".equalsIgnoreCase(jodaLocalTimeMode)) {
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java
new file mode 100644
index 000000000..5d3e3ee4e
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java
@@ -0,0 +1,39 @@
+package io.ebeaninternal.server.type;
+
+import org.joda.time.Period;
+
+/**
+ * ScalarType for Joda Period stored as DB VARCHAR
+ */
+public class ScalarTypeJodaPeriod extends ScalarTypeBaseVarchar<Period> {
+
+  public ScalarTypeJodaPeriod() {
+    super(Period.class);
+  }
+
+  @Override
+  public int getLength() {
+    return 50;
+  }
+
+  @Override
+  public String formatValue(Period v) {
+    return v.toString();
+  }
+
+  @Override
+  public Period parse(String value) {
+    return Period.parse(value);
+  }
+
+  @Override
+  public Period convertFromDbString(String dbValue) {
+    return Period.parse(dbValue);
+  }
+
+  @Override
+  public String convertToDbString(Period beanValue) {
+    return beanValue.toString();
+  }
+
+}
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java
new file mode 100644
index 000000000..3a58e9fbf
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java
@@ -0,0 +1,43 @@
+package io.ebeaninternal.server.type;
+
+import org.joda.time.Period;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ScalarTypeJodaPeriodTest {
+
+  private ScalarTypeJodaPeriod scalarType = new ScalarTypeJodaPeriod();
+
+  @Test
+  public void getLength() {
+    assertThat(scalarType.getLength()).isEqualTo(50);
+  }
+
+  @Test
+  public void formatAndParse() {
+
+    Period original = Period.years(1).plusMonths(2).plusDays(4)
+      .plusHours(12).plusMinutes(19).plusSeconds(20);
+
+    String value = scalarType.formatValue(original);
+    assertThat(value).isEqualTo("P1Y2M4DT12H19M20S");
+
+    Period period = scalarType.parse(value);
+    assertThat(period).isEqualTo(original);
+  }
+
+
+  @Test
+  public void convertFromDbString() {
+
+    Period original = Period.years(1).plusMonths(2).plusDays(4)
+      .plusHours(23).plusMinutes(19).plusSeconds(20).plusMillis(987);
+
+    String stringVal = scalarType.convertToDbString(original);
+    Period period = scalarType.convertFromDbString(stringVal);
+
+    assertThat(period).isEqualTo(original);
+  }
+
+}
diff --git a/src/test/java/org/tests/model/joda/BasicJodaEntity.java b/src/test/java/org/tests/model/joda/BasicJodaEntity.java
index acb025fe0..52e528e27 100644
--- a/src/test/java/org/tests/model/joda/BasicJodaEntity.java
+++ b/src/test/java/org/tests/model/joda/BasicJodaEntity.java
@@ -4,6 +4,7 @@ import io.ebean.annotation.CreatedTimestamp;
 import io.ebean.annotation.UpdatedTimestamp;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDateTime;
+import org.joda.time.Period;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -23,6 +24,8 @@ public class BasicJodaEntity {
   @UpdatedTimestamp
   DateTime updated;
 
+  Period period;
+
   @Version
   LocalDateTime version;
 
@@ -42,6 +45,14 @@ public class BasicJodaEntity {
     this.name = name;
   }
 
+  public Period getPeriod() {
+    return period;
+  }
+
+  public void setPeriod(Period period) {
+    this.period = period;
+  }
+
   public LocalDateTime getCreated() {
     return created;
   }
diff --git a/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java b/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java
index 7240eca43..df8a79fb5 100644
--- a/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java
+++ b/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java
@@ -4,9 +4,13 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDateTime;
+import org.joda.time.Period;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
 
 public class TestJodaInsertUpdate extends BaseTestCase {
 
@@ -27,6 +31,7 @@ public class TestJodaInsertUpdate extends BaseTestCase {
 
     Thread.sleep(10);
     e0.setName("bar");
+    e0.setPeriod(Period.years(12).plusDays(1));
     Ebean.save(e0);
 
     LocalDateTime created1 = e0.getCreated();
@@ -36,5 +41,10 @@ public class TestJodaInsertUpdate extends BaseTestCase {
     assertSame(created, created1);
     assertNotSame(updated, updated1);
     assertNotSame(version, version1);
+
+
+    BasicJodaEntity found = Ebean.find(BasicJodaEntity.class, e0.getId());
+
+    assertThat(found.getPeriod()).isEqualTo(e0.getPeriod());
   }
 }

From 75462e7410fd30e7f9384f6ccb19392bb58a7798 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 23 Feb 2018 17:54:02 +1300
Subject: [PATCH 0066/1036] #1272 - ENH: Add built in support for Joda Period
 and java time Period

---
 .../server/type/DefaultTypeManager.java       |  1 +
 .../server/type/ScalarTypePeriod.java         | 39 +++++++++++++++++
 .../server/type/ScalarTypePeriodTest.java     | 42 +++++++++++++++++++
 .../tests/model/types/SomeNewTypesBean.java   | 11 +++++
 .../java/org/tests/types/TestNewTypes.java    | 19 ++++++---
 5 files changed, 107 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/type/ScalarTypePeriod.java
 create mode 100644 src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java

diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 369928843..6bdb05661 100644
--- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -838,6 +838,7 @@ public final class DefaultTypeManager implements TypeManager {
 
     if (config.getClassLoadConfig().isJavaTimePresent()) {
       logger.debug("Registering java.time data types");
+      typeMap.put(java.time.Period.class, new ScalarTypePeriod());
       typeMap.put(java.time.LocalDate.class, new ScalarTypeLocalDate());
       typeMap.put(java.time.LocalDateTime.class, new ScalarTypeLocalDateTime(mode));
       typeMap.put(OffsetDateTime.class, new ScalarTypeOffsetDateTime(mode));
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypePeriod.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypePeriod.java
new file mode 100644
index 000000000..573ba6e5c
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypePeriod.java
@@ -0,0 +1,39 @@
+package io.ebeaninternal.server.type;
+
+import java.time.Period;
+
+/**
+ * ScalarType for Joda Period stored as DB VARCHAR
+ */
+public class ScalarTypePeriod extends ScalarTypeBaseVarchar<Period> {
+
+  public ScalarTypePeriod() {
+    super(Period.class);
+  }
+
+  @Override
+  public int getLength() {
+    return 20;
+  }
+
+  @Override
+  public String formatValue(Period v) {
+    return v.toString();
+  }
+
+  @Override
+  public Period parse(String value) {
+    return Period.parse(value);
+  }
+
+  @Override
+  public Period convertFromDbString(String dbValue) {
+    return Period.parse(dbValue);
+  }
+
+  @Override
+  public String convertToDbString(Period beanValue) {
+    return beanValue.toString();
+  }
+
+}
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java
new file mode 100644
index 000000000..858c2d10d
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java
@@ -0,0 +1,42 @@
+package io.ebeaninternal.server.type;
+
+import org.junit.Test;
+
+import java.time.Period;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ScalarTypePeriodTest {
+
+  private ScalarTypePeriod scalarType = new ScalarTypePeriod();
+
+  @Test
+  public void getLength() {
+    assertThat(scalarType.getLength()).isEqualTo(20);
+  }
+
+  @Test
+  public void formatAndParse() {
+
+    Period original = Period.of(1,2, 4);
+
+    String value = scalarType.formatValue(original);
+    assertThat(value).isEqualTo("P1Y2M4D");
+
+    Period period = scalarType.parse(value);
+    assertThat(period).isEqualTo(original);
+  }
+
+
+  @Test
+  public void convertFromDbString() {
+
+    Period original = Period.of(1, 2, 4);
+
+    String stringVal = scalarType.convertToDbString(original);
+    Period period = scalarType.convertFromDbString(stringVal);
+
+    assertThat(period).isEqualTo(original);
+  }
+
+}
diff --git a/src/test/java/org/tests/model/types/SomeNewTypesBean.java b/src/test/java/org/tests/model/types/SomeNewTypesBean.java
index 3374615b2..64f0a2220 100644
--- a/src/test/java/org/tests/model/types/SomeNewTypesBean.java
+++ b/src/test/java/org/tests/model/types/SomeNewTypesBean.java
@@ -11,6 +11,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.Month;
 import java.time.OffsetDateTime;
+import java.time.Period;
 import java.time.Year;
 import java.time.YearMonth;
 import java.time.ZoneId;
@@ -54,6 +55,8 @@ public class SomeNewTypesBean {
 
   Path path;
 
+  Period period;
+
   public Long getId() {
     return id;
   }
@@ -165,4 +168,12 @@ public class SomeNewTypesBean {
   public void setPath(Path path) {
     this.path = path;
   }
+
+  public Period getPeriod() {
+    return period;
+  }
+
+  public void setPeriod(Period period) {
+    this.period = period;
+  }
 }
diff --git a/src/test/java/org/tests/types/TestNewTypes.java b/src/test/java/org/tests/types/TestNewTypes.java
index a08c03b93..de34a2d71 100644
--- a/src/test/java/org/tests/types/TestNewTypes.java
+++ b/src/test/java/org/tests/types/TestNewTypes.java
@@ -2,11 +2,10 @@ package org.tests.types;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
-import org.tests.model.types.SomeNewTypesBean;
 import org.junit.Test;
+import org.tests.model.types.SomeNewTypesBean;
 
 import java.io.File;
-import java.io.IOException;
 import java.nio.file.Paths;
 import java.time.DayOfWeek;
 import java.time.Instant;
@@ -14,20 +13,23 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.Month;
 import java.time.OffsetDateTime;
+import java.time.Period;
 import java.time.Year;
 import java.time.YearMonth;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.List;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 public class TestNewTypes extends BaseTestCase {
 
   private static final String TEMP_PATH = new File("/tmp").getAbsolutePath();
 
   @Test
-  public void testInsertUpdate() throws IOException, InterruptedException {
+  public void testInsertUpdate() throws  InterruptedException {
     SomeNewTypesBean bean = new SomeNewTypesBean();
     bean.setLocalDate(LocalDate.now());
     bean.setLocalDateTime(LocalDateTime.now());
@@ -41,6 +43,7 @@ public class TestNewTypes extends BaseTestCase {
     bean.setZoneOffset(ZonedDateTime.now().getOffset());
     bean.setYearMonth(YearMonth.of(2014, 9));
     bean.setPath(Paths.get(TEMP_PATH));
+    bean.setPeriod(Period.of(4,3,2));
 
 
     Ebean.save(bean);
@@ -83,6 +86,9 @@ public class TestNewTypes extends BaseTestCase {
     list = Ebean.find(SomeNewTypesBean.class).where().eq("path", Paths.get(TEMP_PATH)).findList();
     assertTrue(!list.isEmpty());
 
+    list = Ebean.find(SomeNewTypesBean.class).where().eq("period", Period.of(4,3,2)).findList();
+    assertTrue(!list.isEmpty());
+
     SomeNewTypesBean fetched = Ebean.find(SomeNewTypesBean.class, bean.getId());
 
     assertEquals(bean.getZoneId(), fetched.getZoneId());
@@ -95,6 +101,8 @@ public class TestNewTypes extends BaseTestCase {
     assertEquals(bean.getOffsetDateTime(), fetched.getOffsetDateTime());
     assertEquals(bean.getInstant(), fetched.getInstant());
     assertEquals(bean.getPath(), fetched.getPath());
+    assertEquals(bean.getPeriod(), fetched.getPeriod());
+
 
     String asJson = Ebean.json().toJson(fetched);
 
@@ -111,6 +119,7 @@ public class TestNewTypes extends BaseTestCase {
     assertEquals(bean.getInstant(), toBean.getInstant());
     // FIXME: This test fails on Windows with: expected:<\tmp> but was:<C:\tmp>
     assertEquals(bean.getPath(), toBean.getPath());
+    assertEquals(bean.getPeriod(), toBean.getPeriod());
 
   }
 
@@ -133,6 +142,6 @@ public class TestNewTypes extends BaseTestCase {
     assertNull(fetched.getOffsetDateTime());
     assertNull(fetched.getInstant());
     assertNull(fetched.getPath());
-
+    assertNull(fetched.getPeriod());
   }
 }

From 8e9843ab8ae35d7d7a5b14c7cdce43a163f34a63 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 26 Feb 2018 08:35:47 +1300
Subject: [PATCH 0067/1036] #1246 - Support use of application.yml and
 application-test.yml ... (as alternative to ebean.properties,
 test-ebean.properties)

---
 pom.xml                                       |  10 +
 src/main/java/io/ebean/PrimaryServer.java     |   4 +-
 .../io/ebean/config/PropertiesWrapper.java    |  46 +---
 .../io/ebean/config/PropertyExpression.java   | 178 ---------------
 .../java/io/ebean/config/PropertyMap.java     | 168 ---------------
 .../io/ebean/config/PropertyMapLoader.java    | 163 --------------
 .../java/io/ebean/config/ServerConfig.java    |  12 +-
 .../ebean/config/properties/LoadContext.java  |  97 +++++++++
 .../io/ebean/config/properties/Loader.java    | 164 ++++++++++++++
 .../config/properties/PropertiesLoader.java   |  58 +++++
 .../ebean/config/properties/PropertyEval.java | 202 ++++++++++++++++++
 .../ebean/config/properties/YamlLoader.java   |  54 +++++
 .../server/core/DefaultContainer.java         |   7 +-
 .../ebean/config/PropertiesWrapperTest.java   |  29 +--
 .../java/io/ebean/config/PropertyMapTest.java |  23 --
 .../ebean/config/properties/LoaderTest.java   |  65 ++++++
 .../config/properties/PropertyEvalTest.java   |  73 +++++++
 .../transaction/TestAutoCommitDataSource.java |   8 +-
 .../TestExplicitTransactionMode.java          |   8 +-
 .../test-properties/application.properties    |   2 +
 .../resources/test-properties/application.yml |   8 +
 src/test/resources/test-properties/foo.yml    |  17 ++
 .../resources/test-properties/one.properties  |   3 +
 test-dummy.properties                         |   1 +
 test-dummy.yml                                |   3 +
 25 files changed, 788 insertions(+), 615 deletions(-)
 delete mode 100644 src/main/java/io/ebean/config/PropertyExpression.java
 delete mode 100644 src/main/java/io/ebean/config/PropertyMap.java
 delete mode 100644 src/main/java/io/ebean/config/PropertyMapLoader.java
 create mode 100644 src/main/java/io/ebean/config/properties/LoadContext.java
 create mode 100644 src/main/java/io/ebean/config/properties/Loader.java
 create mode 100644 src/main/java/io/ebean/config/properties/PropertiesLoader.java
 create mode 100644 src/main/java/io/ebean/config/properties/PropertyEval.java
 create mode 100644 src/main/java/io/ebean/config/properties/YamlLoader.java
 delete mode 100644 src/test/java/io/ebean/config/PropertyMapTest.java
 create mode 100644 src/test/java/io/ebean/config/properties/LoaderTest.java
 create mode 100644 src/test/java/io/ebean/config/properties/PropertyEvalTest.java
 create mode 100644 src/test/resources/test-properties/application.properties
 create mode 100644 src/test/resources/test-properties/application.yml
 create mode 100644 src/test/resources/test-properties/foo.yml
 create mode 100644 src/test/resources/test-properties/one.properties
 create mode 100644 test-dummy.properties
 create mode 100644 test-dummy.yml

diff --git a/pom.xml b/pom.xml
index 5d56073f8..b83d0f88f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,16 @@
       <scope>provided</scope>
     </dependency>
 
+    <!--
+    If snakeyaml is in the classpath we will read yml configuration files
+    -->
+    <dependency>
+      <groupId>org.yaml</groupId>
+      <artifactId>snakeyaml</artifactId>
+      <version>1.19</version>
+      <scope>provided</scope>
+    </dependency>
+
     <!--
     Class retention Nonnull and Nullable annotations
     to assist with IDE auto-completion with Ebean API
diff --git a/src/main/java/io/ebean/PrimaryServer.java b/src/main/java/io/ebean/PrimaryServer.java
index 4265b7022..d2f46f180 100644
--- a/src/main/java/io/ebean/PrimaryServer.java
+++ b/src/main/java/io/ebean/PrimaryServer.java
@@ -1,6 +1,6 @@
 package io.ebean;
 
-import io.ebean.config.PropertyMap;
+import io.ebean.config.properties.PropertiesLoader;
 
 import java.util.Properties;
 
@@ -44,7 +44,7 @@ class PrimaryServer {
    */
   static synchronized Properties getProperties() {
     if (globalProperties == null) {
-      globalProperties = PropertyMap.defaultProperties();
+      globalProperties = PropertiesLoader.load();
     }
     if (defaultServerName == null) {
       defaultServerName = determineDefaultServerName();
diff --git a/src/main/java/io/ebean/config/PropertiesWrapper.java b/src/main/java/io/ebean/config/PropertiesWrapper.java
index 61ff55f94..a3d9f0364 100644
--- a/src/main/java/io/ebean/config/PropertiesWrapper.java
+++ b/src/main/java/io/ebean/config/PropertiesWrapper.java
@@ -10,16 +10,13 @@ public class PropertiesWrapper {
 
   protected final String serverName;
 
-  protected final PropertyMap propertyMap;
-
   /**
    * Construct with a prefix, serverName and properties.
    */
   public PropertiesWrapper(String prefix, String serverName, Properties properties) {
     this.serverName = serverName;
     this.prefix = prefix;
-    this.propertyMap = PropertyMapLoader.load(null, properties);
-    this.properties = propertyMap.asProperties();
+    this.properties = properties;
   }
 
   /**
@@ -29,27 +26,6 @@ public class PropertiesWrapper {
     this(null, null, properties);
   }
 
-  /**
-   * Internal copy constructor when changing prefix.
-   */
-  protected PropertiesWrapper(String prefix, String serverName, PropertyMap propertyMap, Properties properties) {
-    this.serverName = serverName;
-    this.prefix = prefix;
-    this.propertyMap = propertyMap;
-    this.properties = properties;
-  }
-
-  /**
-   * Return a PropertiesWrapper instance with a different prefix but same underlying properties.
-   * <p/>
-   * Used when wanting to use "datasource" as the prefix rather than "ebean".
-   * <p/>
-   * The returning instance should only be used in a read only fashion.
-   */
-  public PropertiesWrapper withPrefix(String prefix) {
-    return new PropertiesWrapper(prefix, serverName, propertyMap, properties);
-  }
-
   /**
    * Return the serverName (optional).
    */
@@ -57,16 +33,6 @@ public class PropertiesWrapper {
     return serverName;
   }
 
-  /**
-   * Return as Properties with lower case keys and after evaluation and additional properties loading has occurred.
-   * <p>
-   * Ebean has historically ignored the case of keys hence returning the Properties with all the keys lower cased.
-   * </p>
-   */
-  public Properties asPropertiesLowerCase() {
-    return properties;
-  }
-
   /**
    * Get a property with no default value.
    */
@@ -90,17 +56,21 @@ public class PropertiesWrapper {
 
     String value = null;
     if (serverName != null && prefix != null) {
-      value = propertyMap.get(prefix + "." + serverName + "." + key, null);
+      value = internalGet(prefix + "." + serverName + "." + key);
     }
     if (value == null && prefix != null) {
-      value = propertyMap.get(prefix + "." + key, null);
+      value = internalGet(prefix + "." + key);
     }
     if (value == null) {
-      value = propertyMap.get(key, null);
+      value = internalGet(key);
     }
     return value == null ? defaultValue : value;
   }
 
+  private String internalGet(String key) {
+    return properties.getProperty(key);
+  }
+
   /**
    * Return a double property value.
    */
diff --git a/src/main/java/io/ebean/config/PropertyExpression.java b/src/main/java/io/ebean/config/PropertyExpression.java
deleted file mode 100644
index 4dc7e6565..000000000
--- a/src/main/java/io/ebean/config/PropertyExpression.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package io.ebean.config;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-/**
- * Helper used to evaluate expressions such as ${CATALINA_HOME}.
- * <p>
- * The expressions can contain environment variables, system properties or JNDI
- * properties. JNDI expressions take the form ${jndi:propertyName} where you
- * substitute propertyName with the name of the jndi property you wish to
- * evaluate.
- * </p>
- */
-final class PropertyExpression {
-
-  private static final Logger logger = LoggerFactory.getLogger(PropertyExpression.class);
-
-  /**
-   * Prefix for looking up JNDI Environment variable.
-   */
-  private static final String JAVA_COMP_ENV = "java:comp/env/";
-
-  /**
-   * Used to detect the start of an expression.
-   */
-  private static final String START = "${";
-
-  /**
-   * Used to detect the end of an expression.
-   */
-  private static final String END = "}";
-
-  /**
-   * Specify the PropertyHolder.
-   */
-  private PropertyExpression() {
-  }
-
-  /**
-   * Return the property value evaluating and replacing any expressions such as
-   * ${CATALINA_HOME}.
-   */
-  static String eval(String val, PropertyMap map) {
-    if (val == null) {
-      return null;
-    }
-    int sp = val.indexOf(START);
-    if (sp > -1) {
-      int ep = val.indexOf(END, sp + 1);
-      if (ep > -1) {
-        return eval(val, sp, ep, map);
-      }
-    }
-    return val;
-  }
-
-  /**
-   * Convert the expression using JNDI, Environment variables, System Properties
-   * or existing an property in SystemProperties itself.
-   */
-  private static String evaluateExpression(String exp, PropertyMap map) {
-
-    if (isJndiExpression(exp)) {
-      // JNDI property lookup...
-      String val = getJndiProperty(exp);
-      if (val != null) {
-        return val;
-      }
-    }
-
-    // check Environment Variables first
-    String val = System.getenv(exp);
-    if (val == null) {
-      // then check system properties
-      val = System.getProperty(exp);
-    }
-    if (val == null && map != null) {
-      // then check PropertyMap
-      val = map.get(exp);
-    }
-
-    if (val != null) {
-      return val;
-
-    } else {
-      // unable to evaluate yet... but maybe later based on the order
-      // in which properties are being set/loaded. You can use
-      // GlobalProperties.evaluateExpressions() to get any unresolved
-      // expressions to be evaluated
-      logger.debug("Unable to evaluate expression [{}]", exp);
-      return null;
-    }
-  }
-
-  private static String eval(String val, int sp, int ep, PropertyMap map) {
-
-    StringBuilder sb = new StringBuilder();
-    sb.append(val.substring(0, sp));
-
-    String cal = evalExpression(val, sp, ep, map);
-    sb.append(cal);
-
-    eval(val, ep + 1, sb, map);
-
-    return sb.toString();
-  }
-
-  private static void eval(String val, int startPos, StringBuilder sb, PropertyMap map) {
-    if (startPos < val.length()) {
-      int sp = val.indexOf(START, startPos);
-      if (sp > -1) {
-        // append what is between the last token and the new one (if startPos ==
-        // sp nothing gets added)
-        sb.append(val.substring(startPos, sp));
-        int ep = val.indexOf(END, sp + 1);
-        if (ep > -1) {
-          String cal = evalExpression(val, sp, ep, map);
-          sb.append(cal);
-          eval(val, ep + 1, sb, map);
-          return;
-        }
-      }
-    }
-    // append what is left...
-    sb.append(val.substring(startPos));
-  }
-
-  private static String evalExpression(String val, int sp, int ep, PropertyMap map) {
-    // trim off start and end ${ and }
-    String exp = val.substring(sp + START.length(), ep);
-
-    // evaluate the variable
-    String evaled = evaluateExpression(exp, map);
-    if (evaled != null) {
-      return evaled;
-    } else {
-      // unable to evaluate at this stage (maybe later)
-      return START + exp + END;
-    }
-  }
-
-  private static boolean isJndiExpression(String exp) {
-    return exp.startsWith("JNDI:") || exp.startsWith("jndi:");
-  }
-
-  /**
-   * Returns null if JNDI is not setup or if the property is not found.
-   *
-   * @param key the key of the JNDI Environment property including a JNDI: prefix.
-   */
-  private static String getJndiProperty(String key) {
-
-    try {
-      // remove the JNDI: prefix
-      key = key.substring(5);
-
-      return (String) getJndiObject(key);
-
-    } catch (NamingException ex) {
-      return null;
-    }
-  }
-
-  /**
-   * Similar to getProperty but throws NamingException if JNDI is not setup or
-   * if the property is not found.
-   */
-  private static Object getJndiObject(String key) throws NamingException {
-
-    InitialContext ctx = new InitialContext();
-    return ctx.lookup(JAVA_COMP_ENV + key);
-  }
-
-}
diff --git a/src/main/java/io/ebean/config/PropertyMap.java b/src/main/java/io/ebean/config/PropertyMap.java
deleted file mode 100644
index 2da152d78..000000000
--- a/src/main/java/io/ebean/config/PropertyMap.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package io.ebean.config;
-
-import java.io.Serializable;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-
-/**
- * A map like structure of properties.
- * <p/>
- * Handles evaluation of expressions like ${home} and provides convenience methods for int, long and boolean.
- */
-public final class PropertyMap implements Serializable {
-
-  private static final long serialVersionUID = 1L;
-
-  private final LinkedHashMap<String, String> map = new LinkedHashMap<>();
-
-  /**
-   * Return properties loaded from test-ebean.properties.
-   */
-  public static Properties testProperties() {
-    PropertyMap propertyMap = PropertyMapLoader.loadTestProperties();
-    return (propertyMap == null) ? new Properties() : propertyMap.asProperties();
-  }
-
-  public static Properties defaultProperties() {
-    PropertyMap propertyMap = PropertyMapLoader.loadGlobalProperties();
-    return (propertyMap == null) ? new Properties() : propertyMap.asProperties();
-  }
-
-  public static boolean loadTestProperties() {
-    String disable = System.getProperty("disableTestProperties");
-    return (disable == null || !disable.equalsIgnoreCase("true"));
-  }
-
-  @Override
-  public String toString() {
-    return map.toString();
-  }
-
-  /**
-   * Return as standard Properties.
-   */
-  public Properties asProperties() {
-    Properties properties = new Properties();
-    for (Entry<String, String> e : entrySet()) {
-      properties.put(e.getKey(), e.getValue());
-    }
-    return properties;
-  }
-
-  /**
-   * Go through all the properties and evaluate any expressions that have not
-   * been resolved.
-   */
-  public void evaluateProperties() {
-
-    for (Entry<String, String> e : entrySet()) {
-      String key = e.getKey();
-      String val = e.getValue();
-      String eval = eval(val);
-      if (eval != null && !eval.equals(val)) {
-        put(key, eval);
-      }
-    }
-  }
-
-  /**
-   * Returns the value with expressions like ${home} evaluated using system properties and environment variables.
-   */
-  public synchronized String eval(String val) {
-    return PropertyExpression.eval(val, this);
-  }
-
-  /**
-   * Return the boolean property value with a given default.
-   */
-  public synchronized boolean getBoolean(String key, boolean defaultValue) {
-    String value = get(key);
-    if (value == null) {
-      return defaultValue;
-    } else {
-      return Boolean.parseBoolean(value);
-    }
-  }
-
-  /**
-   * Return the int property value with a given default.
-   */
-  public synchronized int getInt(String key, int defaultValue) {
-    String value = get(key);
-    if (value == null) {
-      return defaultValue;
-    } else {
-      return Integer.parseInt(value);
-    }
-  }
-
-  /**
-   * Return the long property value with a given default.
-   */
-  public synchronized long getLong(String key, long defaultValue) {
-    String value = get(key);
-    if (value == null) {
-      return defaultValue;
-    } else {
-      return Long.parseLong(value);
-    }
-  }
-
-  /**
-   * Return the string property value with a given default.
-   */
-  public synchronized String get(String key, String defaultValue) {
-    String value = map.get(key.toLowerCase());
-    return value == null ? defaultValue : value;
-  }
-
-  /**
-   * Return the property value returning null if there is no value defined.
-   */
-  public synchronized String get(String key) {
-    return map.get(key.toLowerCase());
-  }
-
-  /**
-   * Put all evaluating any expressions in the values.
-   */
-  public synchronized void putEvalAll(Map<String, String> keyValueMap) {
-
-    for (Map.Entry<String, String> entry : keyValueMap.entrySet()) {
-      putEval(entry.getKey(), entry.getValue());
-    }
-  }
-
-  /**
-   * Put a single key value evaluating any expressions in the value.
-   */
-  public synchronized String putEval(String key, String value) {
-    value = PropertyExpression.eval(value, this);
-    return map.put(key.toLowerCase(), value);
-  }
-
-  /**
-   * Put a single key value with no expression evaluation.
-   */
-  public synchronized String put(String key, String value) {
-    return map.put(key.toLowerCase(), value);
-  }
-
-  /**
-   * Remove an entry.
-   */
-  public synchronized String remove(String key) {
-    return map.remove(key.toLowerCase());
-  }
-
-  /**
-   * Return the entries.
-   */
-  public synchronized Set<Entry<String, String>> entrySet() {
-    return map.entrySet();
-  }
-
-}
diff --git a/src/main/java/io/ebean/config/PropertyMapLoader.java b/src/main/java/io/ebean/config/PropertyMapLoader.java
deleted file mode 100644
index 7444de7fe..000000000
--- a/src/main/java/io/ebean/config/PropertyMapLoader.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package io.ebean.config;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * Helper used to load the ebean.properties into a PropertyMap.
- */
-final class PropertyMapLoader {
-
-  private static final Logger logger = LoggerFactory.getLogger(PropertyMapLoader.class);
-
-  private static final Pattern OTHER_PROPS_REPLACE = Pattern.compile("\\", Pattern.LITERAL);
-
-  /**
-   * Load the <code>test-ebean.properties</code>.
-   */
-  public static PropertyMap loadTestProperties() {
-    if (!PropertyMap.loadTestProperties()) {
-      return new PropertyMap();
-    }
-    return load(null, "test-ebean.properties");
-  }
-
-  /**
-   * Load the ebean.properties (and test-ebean.properties if present).
-   */
-  public static PropertyMap loadGlobalProperties() {
-
-    boolean loadTestProperties = false;
-    String fileName = System.getenv("EBEAN_PROPS_FILE");
-    if (fileName == null) {
-      fileName = System.getProperty("ebean.props.file");
-      if (fileName == null) {
-        loadTestProperties = PropertyMap.loadTestProperties();
-        fileName = "ebean.properties";
-      }
-    }
-
-    PropertyMap map = load(null, fileName);
-    if (loadTestProperties) {
-      // load test properties if present in classpath
-      map = load(map, "test-ebean.properties");
-    }
-    return map;
-  }
-
-  /**
-   * Load the file returning the property map.
-   *
-   * @param p        an existing property map to load into.
-   * @param fileName the name of the properties file to load.
-   */
-  public static PropertyMap load(PropertyMap p, String fileName) {
-
-    InputStream is = findInputStream(fileName);
-    if (is == null) {
-      return p;
-    } else {
-      return load(p, is);
-    }
-  }
-
-  /**
-   * Load the InputStream returning the property map.
-   *
-   * @param p  an existing property map to load into.
-   * @param in the InputStream of the properties file to load.
-   */
-  public static PropertyMap load(PropertyMap p, InputStream in) {
-
-    Properties props = new Properties();
-    try {
-      props.load(in);
-      in.close();
-      return load(p, props);
-
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  public static PropertyMap load(PropertyMap p, Properties props) {
-
-    if (p == null) {
-      p = new PropertyMap();
-    }
-
-    // put values in initially without any evaluation
-    for (Map.Entry<Object, Object> entry : props.entrySet()) {
-      String key = ((String) entry.getKey()).toLowerCase();
-      String val = ((String) entry.getValue());
-      if (val != null) {
-        val = val.trim();
-      }
-      p.put(key, val);
-    }
-
-    p.evaluateProperties();
-
-    String otherProps = p.remove("load.properties");
-    if (otherProps == null) {
-      otherProps = p.remove("load.properties.override");
-    }
-    if (otherProps != null) {
-      otherProps = OTHER_PROPS_REPLACE.matcher(otherProps).replaceAll(Matcher.quoteReplacement("/"));
-      InputStream is = findInputStream(otherProps);
-      if (is != null) {
-        logger.debug("loading properties from {}", otherProps);
-        load(p, is);
-      } else {
-        logger.error("load.properties " + otherProps + " not found.");
-      }
-    }
-
-    return p;
-  }
-
-  /**
-   * Find the input stream given the file name.
-   */
-  private static InputStream findInputStream(String fileName) {
-
-    if (fileName == null) {
-      throw new NullPointerException("fileName is null?");
-    }
-
-    try {
-      File f = new File(fileName);
-
-      if (f.exists()) {
-        logger.debug("{} found in file system", fileName);
-        return new FileInputStream(f);
-      } else {
-        InputStream in = findInClassPath(fileName);
-        if (in != null) {
-          logger.debug("{} found in classpath", fileName);
-        }
-        return in;
-      }
-
-    } catch (FileNotFoundException ex) {
-      // already made the check so this
-      // should never be thrown
-      throw new RuntimeException(ex);
-    }
-  }
-
-  private static InputStream findInClassPath(String fileName) {
-    return Thread.currentThread().getContextClassLoader().getResourceAsStream(fileName);
-  }
-
-}
diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 4b17b276f..03fcf0eed 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -13,6 +13,7 @@ import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbEncrypt;
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
+import io.ebean.config.properties.PropertiesLoader;
 import io.ebean.event.BeanFindController;
 import io.ebean.event.BeanPersistController;
 import io.ebean.event.BeanPersistListener;
@@ -2576,7 +2577,7 @@ public class ServerConfig {
    * Load settings from ebean.properties.
    */
   public void loadFromProperties() {
-    loadFromProperties(PropertyMap.defaultProperties());
+    loadFromProperties(PropertiesLoader.load());
   }
 
   /**
@@ -2590,18 +2591,17 @@ public class ServerConfig {
   }
 
   /**
+   * Deprecated - this does nothing now, we always try to read test configuration.
+   * <p>
    * Load settings from test-ebean.properties and do nothing if the properties is not found.
    * <p>
    * This is typically used when test-ebean.properties is put into the test class path and used
    * to configure Ebean for running tests.
    * </p>
    */
+  @Deprecated
   public void loadTestProperties() {
-    Properties properties = PropertyMap.testProperties();
-    if (!properties.isEmpty()) {
-      PropertiesWrapper p = new PropertiesWrapper("ebean", name, properties);
-      loadSettings(p);
-    }
+    // do nothing now ... as we always try to read test configuration and that should only
   }
 
   /**
diff --git a/src/main/java/io/ebean/config/properties/LoadContext.java b/src/main/java/io/ebean/config/properties/LoadContext.java
new file mode 100644
index 000000000..7ec6a8f38
--- /dev/null
+++ b/src/main/java/io/ebean/config/properties/LoadContext.java
@@ -0,0 +1,97 @@
+package io.ebean.config.properties;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+/**
+ * Manages the underlying map of properties we are gathering.
+ */
+class LoadContext {
+
+	private static final Logger log = LoggerFactory.getLogger(LoadContext.class);
+
+  /**
+   * Map we are loading the properties into.
+   */
+	private final Map<String, String> map = new LinkedHashMap<>();
+
+  /**
+   * Names of resources/files that were loaded.
+   */
+	private final Set<String> loadedResources = new LinkedHashSet<>();
+
+  /**
+   * Return the input stream (maybe null) for the given source.
+   */
+	InputStream resource(String resourcePath, Loader.Source source) {
+
+    InputStream is = null;
+    if (source == Loader.Source.RESOURCE) {
+      is = getClass().getResourceAsStream("/" + resourcePath);
+      if (is != null) {
+        loadedResources.add(resourcePath);
+      }
+    } else {
+      File file = new File(resourcePath);
+      if (file.exists()) {
+        try {
+          is = new FileInputStream(file);
+          loadedResources.add("file:"+resourcePath);
+        } catch (FileNotFoundException e) {
+          throw new IllegalStateException(e);
+        }
+      }
+    }
+
+		return is;
+	}
+
+  /**
+   * Add a property entry.
+   */
+	void put(String key, String val) {
+	  if (val != null) {
+	    val = val.trim();
+    }
+		map.put(key, val);
+	}
+
+  /**
+   * Evaluate all the expressions and return as a Properties object.
+   */
+	Properties eval() {
+
+		log.info("loaded properties from {}", loadedResources);
+
+		Properties properties = new Properties();
+
+		for (Map.Entry<String, String> entry : map.entrySet()) {
+			String key = entry.getKey();
+			String value = PropertyEval.eval(entry.getValue());
+			properties.setProperty(key, value);
+		}
+
+		return properties;
+	}
+
+  /**
+   * Read the special properties that can point to an external properties source.
+   */
+  String indirectLocation() {
+    String indirectLocation = map.get("load.properties");
+    if (indirectLocation == null) {
+      indirectLocation = map.get("load.properties.override");
+    }
+    return indirectLocation;
+  }
+}
diff --git a/src/main/java/io/ebean/config/properties/Loader.java b/src/main/java/io/ebean/config/properties/Loader.java
new file mode 100644
index 000000000..036b504fa
--- /dev/null
+++ b/src/main/java/io/ebean/config/properties/Loader.java
@@ -0,0 +1,164 @@
+package io.ebean.config.properties;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Enumeration;
+import java.util.Properties;
+
+/**
+ * Loads the configuration from known/expected locations.
+ * <p>
+ * Defines the loading order of resources and files.
+ * </p>
+ */
+class Loader {
+
+	private static final Logger log = LoggerFactory.getLogger(Loader.class);
+
+	enum Source {
+	  RESOURCE,
+    FILE
+  }
+
+  private final LoadContext loadContext = new LoadContext();
+
+  private YamlLoader yamlLoader;
+
+	Loader() {
+
+		try {
+			Class<?> exists = Class.forName("org.yaml.snakeyaml.Yaml");
+			if (exists != null) {
+				yamlLoader = new YamlLoader(loadContext);
+			}
+		} catch (Exception e) {
+			// ignored
+		}
+	}
+
+  /**
+   * Load the configuration with the expected ordering.
+   */
+	void load() {
+
+    loadMain(Source.RESOURCE);
+    // external file configuration overrides the resources configuration
+    loadMain(Source.FILE);
+
+		loadViaSystemProperty();
+		loadViaIndirection();
+
+		// test configuration (if found) overrides main configuration
+    // we should only find these resources when running tests
+		loadTest();
+	}
+
+  /**
+   * Load test configuration.
+   */
+  private void loadTest() {
+    loadProperties("application-test.properties", Source.RESOURCE);
+    loadYaml("application-test.yml", Source.RESOURCE);
+    loadProperties("test-ebean.properties", Source.RESOURCE);
+  }
+
+  /**
+   * Load configuration defined by a <em>load.properties</em> entry in properties file.
+   */
+  private void loadViaIndirection() {
+
+    String location = loadContext.indirectLocation();
+    if (location != null) {
+      location = PropertyEval.eval(location);
+      loadWithExtensionCheck(location);
+    }
+  }
+
+  /**
+   * Load the main configuration for the given source.
+   */
+  private void loadMain(Source source) {
+    loadYaml("application.yml", source);
+    loadProperties("application.properties", source);
+    loadProperties("ebean.properties", source);
+  }
+
+  private void loadViaSystemProperty() {
+	  String fileName = System.getenv("EBEAN_PROPS_FILE");
+    if (fileName == null) {
+      fileName = System.getProperty("ebean.props.file");
+      if (fileName != null) {
+        loadWithExtensionCheck(fileName);
+      }
+    }
+  }
+
+  void loadWithExtensionCheck(String fileName) {
+    if (fileName.endsWith("yml")) {
+      loadYaml(fileName, Source.FILE);
+    } else if (fileName.endsWith("properties")) {
+      loadProperties(fileName, Source.FILE);
+    } else {
+      throw new IllegalArgumentException("Expecting only yml or properties file but got [" + fileName + "]");
+    }
+  }
+
+  /**
+   * Evaluate all the configuration entries and return as properties.
+   */
+  Properties eval() {
+		return loadContext.eval();
+	}
+
+	void loadYaml(String resourcePath, Source source) {
+		if (yamlLoader != null) {
+			yamlLoader.load(resource(resourcePath, source));
+		}
+	}
+
+	void loadProperties(String resourcePath, Source source) {
+		InputStream is = resource(resourcePath, source);
+		if (is != null) {
+			loadProperties(is);
+		}
+	}
+
+	private InputStream resource(String resourcePath, Source source) {
+		return loadContext.resource(resourcePath, source);
+	}
+
+	private void loadProperties(InputStream is) {
+
+		if (is != null) {
+			try {
+				Properties properties = new Properties();
+				properties.load(is);
+				put(properties);
+			} catch (IOException e) {
+				throw new RuntimeException("Failed to load properties?", e);
+			} finally {
+				close(is);
+			}
+		}
+	}
+
+	private void put(Properties properties) {
+		Enumeration<?> enumeration = properties.propertyNames();
+		while (enumeration.hasMoreElements()) {
+			String key = (String) enumeration.nextElement();
+			String property = properties.getProperty(key);
+			loadContext.put(key, property);
+		}
+	}
+
+	private void close(InputStream is) {
+		try {
+			is.close();
+		} catch (IOException e) {
+			log.warn("Error closing input stream for properties", e);
+		}
+	}
+}
diff --git a/src/main/java/io/ebean/config/properties/PropertiesLoader.java b/src/main/java/io/ebean/config/properties/PropertiesLoader.java
new file mode 100644
index 000000000..77b059b5b
--- /dev/null
+++ b/src/main/java/io/ebean/config/properties/PropertiesLoader.java
@@ -0,0 +1,58 @@
+package io.ebean.config.properties;
+
+import java.util.Properties;
+
+/**
+ * Loads and evaluates properties and yml configuration.
+ */
+public class PropertiesLoader {
+
+  private static Properties properties;
+
+  /**
+   * Provides properties by reading known locations.
+   * <p>
+   * <h3>Main configuration</h3>
+   * <p>
+   * <p>Firstly loads from main resources</p>
+   * <pre>
+   *   - application.properties
+   *   - application.yml
+   *   - ebean.properties
+   * </pre>
+   * <p>
+   * <p>Then loads from local files</p>
+   * <pre>
+   *   - application.properties
+   *   - application.yml
+   *   - ebean.properties
+   * </pre>
+   * <p>
+   * <p>Then loads from environment variable <em>EBEAN_PROPS_FILE</em></p>
+   * <p>Then loads from system property <em>ebean.props.file</em></p>
+   * <p>Then loads from <em>load.properties</em></p>
+   * <p>
+   * <h3>Test configuration</h3>
+   * <p>
+   * Once the main configuration is read it will try to read common test configuration.
+   * This will only be successful if the test resources are available (i.e. running tests).
+   * </p>
+   * <p>Loads from test resources</p>
+   * <pre>
+   *   - application-test.properties
+   *   - application-test.yml
+   *   - test-ebean.properties
+   * </pre>
+   */
+  public static synchronized Properties load() {
+
+    if (properties == null) {
+      Loader loader = new Loader();
+      loader.load();
+      properties = loader.eval();
+    }
+
+    return properties;
+  }
+
+}
diff --git a/src/main/java/io/ebean/config/properties/PropertyEval.java b/src/main/java/io/ebean/config/properties/PropertyEval.java
new file mode 100644
index 000000000..f1763cb3e
--- /dev/null
+++ b/src/main/java/io/ebean/config/properties/PropertyEval.java
@@ -0,0 +1,202 @@
+package io.ebean.config.properties;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+/**
+ * Helper used to evaluate expressions such as ${CATALINA_HOME}.
+ * <p>
+ * The expressions can contain environment variables, system properties or JNDI
+ * properties. JNDI expressions take the form ${jndi:propertyName} where you
+ * substitute propertyName with the name of the jndi property you wish to
+ * evaluate.
+ * </p>
+ */
+final class PropertyEval {
+
+	/**
+	 * Prefix for looking up JNDI Environment variable.
+	 */
+	private static final String JAVA_COMP_ENV = "java:comp/env/";
+
+	/**
+	 * Used to detect the start of an expression.
+	 */
+	private static final String START = "${";
+
+	/**
+	 * Used to detect the end of an expression.
+	 */
+	private static final String END = "}";
+
+	/**
+	 * Specify the PropertyHolder.
+	 */
+	private PropertyEval() {
+	}
+
+	/**
+	 * Return the property value evaluating and replacing any expressions such as
+	 * ${CATALINA_HOME}.
+	 */
+	static String eval(String val) {
+		if (val == null) {
+			return null;
+		}
+		int sp = val.indexOf(START);
+		if (sp > -1) {
+			int ep = val.indexOf(END, sp + 1);
+			if (ep > -1) {
+				return eval(val, sp, ep);
+			}
+		}
+		return val;
+	}
+
+	/**
+	 * Convert the expression using JNDI, Environment variables, System Properties
+	 * or existing an property in SystemProperties itself.
+	 */
+	private static String evaluateExpression(String exp) {
+
+		if (isJndiExpression(exp)) {
+			// JNDI property lookup...
+			String val = getJndiProperty(exp);
+			if (val != null) {
+				return val;
+			}
+		}
+		String val = System.getProperty(exp);
+		if (val == null) {
+			val = System.getenv(exp);
+		}
+		return val;
+	}
+
+	private static String eval(String val, int sp, int ep) {
+
+		return new EvalBuffer(val, sp, ep).process();
+	}
+
+
+	private static boolean isJndiExpression(String exp) {
+		return exp.startsWith("JNDI:") || exp.startsWith("jndi:");
+	}
+
+	/**
+	 * Returns null if JNDI is not setup or if the property is not found.
+	 *
+	 * @param key the key of the JNDI Environment property including a JNDI: prefix.
+	 */
+	private static String getJndiProperty(String key) {
+
+		try {
+			// remove the JNDI: prefix
+			key = key.substring(5);
+			return (String) getJndiObject(key);
+		} catch (NamingException ex) {
+			return null;
+		}
+	}
+
+	/**
+	 * Similar to getProperty but throws NamingException if JNDI is not setup or
+	 * if the property is not found.
+	 */
+	private static Object getJndiObject(String key) throws NamingException {
+
+		InitialContext ctx = new InitialContext();
+		return ctx.lookup(JAVA_COMP_ENV + key);
+	}
+
+
+	private static class EvalBuffer {
+
+		private final StringBuilder buf = new StringBuilder();
+		private final String original;
+		private int position;
+		private int start;
+		private int end;
+
+		private String expression;
+		private String defaultValue;
+
+		EvalBuffer(String val, int start, int ep) {
+			this.original = val;
+			this.start = start;
+			this.end = ep;
+			this.position = 0;
+			moveToStart();
+		}
+
+		void moveToStart() {
+			if (start > position) {
+				buf.append(original.substring(position, start));
+				position = start;
+			}
+		}
+
+		void parseForDefault() {
+			int colonPos = original.lastIndexOf(':', end);
+			if (colonPos > start) {
+				expression = original.substring(start + START.length(), colonPos);
+				defaultValue = original.substring(colonPos + 1, end);
+			} else {
+				expression = original.substring(start + START.length(), end);
+			}
+		}
+
+		void evaluate() {
+			String eval = evaluateExpression(expression);
+			if (eval != null) {
+				buf.append(eval);
+			} else {
+				if (defaultValue != null) {
+					buf.append(defaultValue);
+				} else {
+					buf.append(START).append(expression).append(END);
+				}
+			}
+		}
+
+		String end() {
+			if (end < original.length() - 1) {
+				buf.append(original.substring(end + 1));
+			}
+			return buf.toString();
+		}
+
+		boolean next() {
+			if (end < original.length()) {
+				int startPos = original.indexOf(START, end + 1);
+				if (startPos > -1) {
+					int endPos = original.indexOf(END, startPos + 1);
+					if (endPos > -1) {
+						if (startPos > end + 1) {
+							buf.append(original.substring(end + 1, startPos));
+						}
+						this.start = startPos;
+						this.end = endPos;
+						return true;
+					}
+				}
+			}
+			return false;
+		}
+
+		private void evalNext() {
+			parseForDefault();
+			evaluate();
+		}
+
+		String process() {
+			evalNext();
+			while (next()) {
+				evalNext();
+			}
+			return end();
+		}
+
+	}
+
+}
diff --git a/src/main/java/io/ebean/config/properties/YamlLoader.java b/src/main/java/io/ebean/config/properties/YamlLoader.java
new file mode 100644
index 000000000..764c73a38
--- /dev/null
+++ b/src/main/java/io/ebean/config/properties/YamlLoader.java
@@ -0,0 +1,54 @@
+package io.ebean.config.properties;
+
+import org.yaml.snakeyaml.Yaml;
+
+import java.io.InputStream;
+import java.util.Map;
+
+/**
+ * Loads configuration from Yml into the load context.
+ * <p>
+ * Note that this ignores 'lists' so just reads 'maps' and scalar values.
+ * </p>
+ */
+class YamlLoader {
+
+	private final Yaml yaml = new Yaml();
+
+	private final LoadContext loadContext;
+
+	YamlLoader(LoadContext loadContext) {
+		this.loadContext = loadContext;
+	}
+
+	void load(InputStream is) {
+		if (is != null) {
+			loadMap(yaml.load(is), null);
+		}
+	}
+
+	void loadMap(Map<String, Object> map, String path) {
+
+		for (Map.Entry<String, Object> entry : map.entrySet()) {
+			String key = entry.getKey();
+			if (path != null) {
+				key = path + "." + key;
+			}
+			Object val = entry.getValue();
+			if (val instanceof Map) {
+				loadMap((Map<String, Object>) val, key);
+			} else  {
+				addScalar(key, val);
+			}
+		}
+	}
+
+	private void addScalar(String key, Object val) {
+		if (val instanceof String) {
+			loadContext.put(key, (String) val);
+		} else if (val instanceof Number || val instanceof Boolean) {
+			loadContext.put(key, val.toString());
+		}
+	}
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index 0f72ca48c..63536ee51 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -5,12 +5,12 @@ import io.ebean.cache.ServerCacheFactory;
 import io.ebean.cache.ServerCacheOptions;
 import io.ebean.cache.ServerCachePlugin;
 import io.ebean.config.ContainerConfig;
-import io.ebean.config.PropertyMap;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.TenantMode;
 import io.ebean.config.UnderscoreNamingConvention;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.h2.H2Platform;
+import io.ebean.config.properties.PropertiesLoader;
 import io.ebean.service.SpiContainer;
 import io.ebeaninternal.api.SpiBackgroundExecutor;
 import io.ebeaninternal.api.SpiContainerBootup;
@@ -37,7 +37,6 @@ import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Properties;
 import java.util.ServiceLoader;
 
 /**
@@ -84,9 +83,7 @@ public class DefaultContainer implements SpiContainer {
 
     ServerConfig config = new ServerConfig();
     config.setName(name);
-
-    Properties prop = PropertyMap.defaultProperties();
-    config.loadFromProperties(prop);
+    config.loadFromProperties(PropertiesLoader.load());
 
     return createServer(config);
   }
diff --git a/src/test/java/io/ebean/config/PropertiesWrapperTest.java b/src/test/java/io/ebean/config/PropertiesWrapperTest.java
index 38d45368a..ee9e294f4 100644
--- a/src/test/java/io/ebean/config/PropertiesWrapperTest.java
+++ b/src/test/java/io/ebean/config/PropertiesWrapperTest.java
@@ -12,7 +12,7 @@ public class PropertiesWrapperTest {
 
 
   @Test
-  public void testGetServerName() throws Exception {
+  public void testGetServerName() {
 
     PropertiesWrapper pw = new PropertiesWrapper(null, "myserver", new Properties());
     assertEquals("myserver", pw.getServerName());
@@ -35,23 +35,20 @@ public class PropertiesWrapperTest {
 
     Properties properties = new Properties();
     properties.put("someBasic", " hello ");
-    properties.put("someInt", " 42 ");
+    properties.put("someInt", "42");
     properties.put("noTrimReqr", "jim");
     properties.put("includeSpaces", " jim bob ");
 
     PropertiesWrapper pw = new PropertiesWrapper("pref", "myserver", properties);
-    assertEquals("hello", pw.get("someBasic"));
+    assertEquals(" hello ", pw.get("someBasic"));
     assertEquals(42, pw.getInt("someInt", 1));
     assertNull(pw.get("doesNotExist", null));
     assertEquals("jim", pw.get("noTrimReqr"));
-    assertEquals("jim bob", pw.get("includeSpaces"));
+    assertEquals(" jim bob ", pw.get("includeSpaces"));
   }
 
   @Test
-  public void testGetProperties() throws Exception {
-
-    String home = System.getenv("HOME");
-    String tmpDir = System.getProperty("java.io.tmpdir");
+  public void testGetProperties() {
 
     Properties properties = new Properties();
     properties.put("someBasic", "hello");
@@ -64,28 +61,12 @@ public class PropertiesWrapperTest {
 
     assertEquals(42, pw.getInt("someInt", 99));
     assertEquals(Double.valueOf(5.5D), (Double.valueOf(pw.getDouble("someDouble", 99.9D))));
-    assertEquals(home + "/hello", pw.get("somePath", null));
-    assertEquals(tmpDir, "/aaa/" + tmpDir + "/bbb", pw.get("someSystemProp"));
-
-    Properties properties1 = pw.asPropertiesLowerCase();
-    assertEquals("hello", properties1.getProperty("somebasic"));
-    assertEquals("42", properties1.getProperty("someint"));
-    assertEquals(home + "/hello", properties1.get("somepath"));
-    assertEquals(tmpDir, "/aaa/" + tmpDir + "/bbb", properties1.get("somesystemprop"));
 
 
     pw = new PropertiesWrapper(properties);
 
     assertEquals(42, pw.getInt("someInt", 99));
     assertEquals(Double.valueOf(5.5D), (Double.valueOf(pw.getDouble("someDouble", 99.9D))));
-    assertEquals(home + "/hello", pw.get("somePath", null));
-    assertEquals(tmpDir, "/aaa/" + tmpDir + "/bbb", pw.get("someSystemProp"));
-
-    properties1 = pw.asPropertiesLowerCase();
-    assertEquals("hello", properties1.getProperty("somebasic"));
-    assertEquals("42", properties1.getProperty("someint"));
-    assertEquals(home + "/hello", properties1.get("somepath"));
-    assertEquals(tmpDir, "/aaa/" + tmpDir + "/bbb", properties1.get("somesystemprop"));
   }
 
 }
diff --git a/src/test/java/io/ebean/config/PropertyMapTest.java b/src/test/java/io/ebean/config/PropertyMapTest.java
deleted file mode 100644
index e4d19a3ef..000000000
--- a/src/test/java/io/ebean/config/PropertyMapTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.ebean.config;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class PropertyMapTest {
-
-  @Test
-  public void testDefaultProperties() throws Exception {
-
-    PropertyMap.defaultProperties();
-  }
-
-  @Test
-  public void testEval() throws Exception {
-
-    String home = System.getenv("HOME");
-    PropertyMap map = new PropertyMap();
-    assertEquals(home, map.eval("${HOME}"));
-  }
-
-}
diff --git a/src/test/java/io/ebean/config/properties/LoaderTest.java b/src/test/java/io/ebean/config/properties/LoaderTest.java
new file mode 100644
index 000000000..e5b5d3ee5
--- /dev/null
+++ b/src/test/java/io/ebean/config/properties/LoaderTest.java
@@ -0,0 +1,65 @@
+package io.ebean.config.properties;
+
+import org.junit.Test;
+
+import java.util.Properties;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+
+public class LoaderTest {
+
+  @Test
+  public void load() {
+
+    Loader loader = new Loader();
+    loader.loadProperties("test-properties/application.properties", Loader.Source.RESOURCE);
+    loader.loadYaml("test-properties/application.yml", Loader.Source.RESOURCE);
+
+    loader.loadProperties("test-properties/one.properties", Loader.Source.RESOURCE);
+    loader.loadYaml("test-properties/foo.yml", Loader.Source.RESOURCE);
+
+    Properties properties = loader.eval();
+
+    assertEquals("fromProperties", properties.getProperty("app.fromProperties"));
+    assertEquals("Two", properties.getProperty("app.two"));
+
+    assertEquals("bart", properties.getProperty("eval.withDefault"));
+    assertEquals("/home/rob/after", properties.getProperty("eval.home"));
+    assertEquals("rob", properties.getProperty("eval.name"));
+  }
+
+  @Test
+  public void loadWithExtensionCheck() {
+
+    Loader loader = new Loader();
+    loader.loadWithExtensionCheck("test-dummy.properties");
+    loader.loadWithExtensionCheck("test-dummy.yml");
+
+    Properties properties = loader.eval();
+    assertThat(properties.getProperty("dummy.yml.foo")).isEqualTo("bar");
+    assertThat(properties.getProperty("dummy.properties.foo")).isEqualTo("bar");
+  }
+
+
+  @Test
+  public void loadYaml() {
+
+    Loader loader = new Loader();
+    loader.loadYaml("test-properties/foo.yml", Loader.Source.RESOURCE);
+    Properties properties = loader.eval();
+
+    assertThat(properties.getProperty("ebean.oracle.password")).isEqualTo("someDefault");
+  }
+
+  @Test
+  public void loadProperties() {
+
+    Loader loader = new Loader();
+    loader.loadProperties("test-properties/one.properties", Loader.Source.RESOURCE);
+    Properties properties = loader.eval();
+
+    assertThat(properties.getProperty("hello")).isEqualTo("there");
+    assertThat(properties.getProperty("name")).isEqualTo("Rob");
+  }
+}
diff --git a/src/test/java/io/ebean/config/properties/PropertyEvalTest.java b/src/test/java/io/ebean/config/properties/PropertyEvalTest.java
new file mode 100644
index 000000000..f074ff7a4
--- /dev/null
+++ b/src/test/java/io/ebean/config/properties/PropertyEvalTest.java
@@ -0,0 +1,73 @@
+package io.ebean.config.properties;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class PropertyEvalTest {
+
+	@Test
+	public void eval_null() {
+		assertNull(PropertyEval.eval(null));
+	}
+
+	@Test
+	public void eval_empty() {
+		assertEquals("", PropertyEval.eval(""));
+	}
+
+	@Test
+	public void eval_noExpressions() {
+		assertEquals("basic", PropertyEval.eval("basic"));
+		assertEquals("{basic}", PropertyEval.eval("{basic}"));
+	}
+
+	@Test
+	public void eval_singleExpression() {
+		System.setProperty("foo", "Hello");
+		assertEquals("Hello", PropertyEval.eval("${foo}"));
+		assertEquals("preHello", PropertyEval.eval("pre${foo}"));
+		assertEquals("HelloPost", PropertyEval.eval("${foo}Post"));
+		assertEquals("beforeHelloAfter", PropertyEval.eval("before${foo}After"));
+		System.clearProperty("foo");
+	}
+
+	@Test
+	public void eval_singleExpression_withDefault() {
+
+		System.setProperty("foo", "Hello");
+		assertEquals("Hello", PropertyEval.eval("${foo:bart}"));
+		assertEquals("beforeHelloAfter", PropertyEval.eval("before${foo:bart}After"));
+		assertEquals("preHello", PropertyEval.eval("pre${foo:bart}"));
+		assertEquals("HelloPost", PropertyEval.eval("${foo:bart}Post"));
+
+		System.clearProperty("foo");
+		assertEquals("bart", PropertyEval.eval("${foo:bart}"));
+		assertEquals("before-bart-after", PropertyEval.eval("before-${foo:bart}-after"));
+		assertEquals("pre-bart", PropertyEval.eval("pre-${foo:bart}"));
+		assertEquals("bart-post", PropertyEval.eval("${foo:bart}-post"));
+
+	}
+
+	@Test
+	public void eval_multiExpression_withDefault() {
+
+		assertEquals("num1num2", PropertyEval.eval("${one:num1}${two:num2}"));
+		assertEquals("num1-num2", PropertyEval.eval("${one:num1}-${two:num2}"));
+		assertEquals("num1abnum2", PropertyEval.eval("${one:num1}ab${two:num2}"));
+		assertEquals("anum1bcnum2d", PropertyEval.eval("a${one:num1}bc${two:num2}d"));
+
+		System.setProperty("one", "first");
+		System.setProperty("two", "second");
+
+		assertEquals("firstsecond", PropertyEval.eval("${one:num1}${two:num2}"));
+		assertEquals("first-second", PropertyEval.eval("${one:num1}-${two:num2}"));
+		assertEquals("pre-first-second-post", PropertyEval.eval("pre-${one:num1}-${two:num2}-post"));
+		assertEquals("AfirstBCsecondD", PropertyEval.eval("A${one:num1}BC${two:num2}D"));
+
+
+		System.clearProperty("one");
+		System.clearProperty("two");
+	}
+}
diff --git a/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java b/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java
index 2193b4318..2fd66a13d 100644
--- a/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java
+++ b/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java
@@ -5,14 +5,14 @@ import io.ebean.EbeanServer;
 import io.ebean.EbeanServerFactory;
 import io.ebean.Query;
 import io.ebean.Transaction;
-import io.ebean.config.PropertyMap;
 import io.ebean.config.ServerConfig;
-import org.tests.model.basic.UTDetail;
-import org.tests.model.basic.UTMaster;
+import io.ebean.config.properties.PropertiesLoader;
 import org.avaje.datasource.DataSourceConfig;
 import org.avaje.datasource.DataSourcePool;
 import org.avaje.datasource.pool.ConnectionPool;
 import org.junit.Test;
+import org.tests.model.basic.UTDetail;
+import org.tests.model.basic.UTMaster;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -27,7 +27,7 @@ public class TestAutoCommitDataSource extends BaseTestCase {
   @Test
   public void test() throws SQLException {
 
-    Properties properties = PropertyMap.defaultProperties();
+    Properties properties = PropertiesLoader.load();
 
     DataSourceConfig dsConfig = new DataSourceConfig();
     dsConfig.loadSettings(properties, "h2autocommit");//"pg"
diff --git a/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
index 2fc6308c0..1a9acff18 100644
--- a/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
+++ b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
@@ -5,14 +5,14 @@ import io.ebean.EbeanServer;
 import io.ebean.EbeanServerFactory;
 import io.ebean.Query;
 import io.ebean.Transaction;
-import io.ebean.config.PropertyMap;
 import io.ebean.config.ServerConfig;
-import org.tests.model.basic.UTDetail;
-import org.tests.model.basic.UTMaster;
+import io.ebean.config.properties.PropertiesLoader;
 import org.avaje.datasource.DataSourceConfig;
 import org.avaje.datasource.DataSourcePool;
 import org.avaje.datasource.pool.ConnectionPool;
 import org.junit.Test;
+import org.tests.model.basic.UTDetail;
+import org.tests.model.basic.UTMaster;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -27,7 +27,7 @@ public class TestExplicitTransactionMode extends BaseTestCase {
   @Test
   public void test() throws SQLException {
 
-    Properties properties = PropertyMap.defaultProperties();
+    Properties properties = PropertiesLoader.load();
 
     DataSourceConfig dsConfig = new DataSourceConfig();
     dsConfig.loadSettings(properties, "h2autocommit");//"h2autocommit","pg"
diff --git a/src/test/resources/test-properties/application.properties b/src/test/resources/test-properties/application.properties
new file mode 100644
index 000000000..3c68ed991
--- /dev/null
+++ b/src/test/resources/test-properties/application.properties
@@ -0,0 +1,2 @@
+app.one=Alpha
+app.fromProperties=fromProperties
diff --git a/src/test/resources/test-properties/application.yml b/src/test/resources/test-properties/application.yml
new file mode 100644
index 000000000..292d0701f
--- /dev/null
+++ b/src/test/resources/test-properties/application.yml
@@ -0,0 +1,8 @@
+app:
+  one: Beta
+  two: Two
+
+eval:
+  home: ${user.home}/after
+  name: ${user.name:bart}
+  withDefault: ${withDefault:bart}
diff --git a/src/test/resources/test-properties/foo.yml b/src/test/resources/test-properties/foo.yml
new file mode 100644
index 000000000..0b9229490
--- /dev/null
+++ b/src/test/resources/test-properties/foo.yml
@@ -0,0 +1,17 @@
+ebean:
+  ddl:
+    generate: true
+    run: true
+
+  oracle:
+    username: rob
+    password: ${db_user:someDefault}
+    url: something here
+    driver: com.foo.Bar
+
+  mysql:
+    username: fiona
+    url: other
+    maxConnections: 90
+
+
diff --git a/src/test/resources/test-properties/one.properties b/src/test/resources/test-properties/one.properties
new file mode 100644
index 000000000..82ae9f0b4
--- /dev/null
+++ b/src/test/resources/test-properties/one.properties
@@ -0,0 +1,3 @@
+hello=there
+name=${some:Rob}
+db.driver=${other:com.h2database.Driver}
diff --git a/test-dummy.properties b/test-dummy.properties
new file mode 100644
index 000000000..a691223ec
--- /dev/null
+++ b/test-dummy.properties
@@ -0,0 +1 @@
+dummy.properties.foo=bar
diff --git a/test-dummy.yml b/test-dummy.yml
new file mode 100644
index 000000000..9a7f1e647
--- /dev/null
+++ b/test-dummy.yml
@@ -0,0 +1,3 @@
+dummy:
+  yml:
+    foo: bar

From e3425a885082200d43cff2e08ef7cc1bafe9cb82 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Sun, 25 Feb 2018 20:40:53 +0100
Subject: [PATCH 0068/1036] FIX: possible resource leaking in testcases (all
 created transactions are closed by followed try statement) (#1273)

---
 .../io/ebean/EbeanServer_saveAllTest.java     |   2 +-
 .../org/tests/basic/TestQueryForUpdate.java   |   1 -
 .../batchinsert/TestBatchInsertFlush.java     |  11 +-
 .../batchinsert/TestBatchInsertSimple.java    |   9 +-
 .../TestBatchOnCascadeExceptionHandling.java  |   6 +-
 .../cache/TestL2DirtyFlagOnLazyLoad.java      |  63 +++++-----
 .../org/tests/compositekeys/TestCore.java     | 118 +++++++++---------
 .../TestDeleteByIdWithPersistenceContext.java |  23 ++--
 .../org/tests/idkeys/TestGeneratedKeys.java   |  38 +++---
 .../query/TestConnectionCloseOnSqlerr.java    |   2 +-
 .../org/tests/query/TestManyWhereJoinM2M.java |  49 ++++----
 .../tests/rawsql/TestRawSqlNamedParams.java   |   1 -
 .../tests/rawsql/TestRawSqlWithResultSet.java |   4 +-
 .../org/tests/timezone/TimezoneTests.java     |  49 ++++----
 .../transaction/TestAutoCommitDataSource.java |  34 ++---
 .../tests/transaction/TestBeanStateReset.java |   1 -
 .../TestBeginTransactionWithExisting.java     |   5 +-
 .../TestExplicitTransactionMode.java          |  37 +++---
 .../transaction/TestPersistContextClear.java  |  16 +--
 .../tests/transaction/TestSqlServerBatch.java |   3 +-
 .../TestStatelessUpdateClearPC.java           |  33 ++---
 .../transaction/TestTransactionCallback.java  |  16 ++-
 .../org/tests/update/TestSqlUpdateInTxn.java  |  22 ++--
 23 files changed, 278 insertions(+), 265 deletions(-)

diff --git a/src/test/java/io/ebean/EbeanServer_saveAllTest.java b/src/test/java/io/ebean/EbeanServer_saveAllTest.java
index 743fa59c6..69bc95753 100644
--- a/src/test/java/io/ebean/EbeanServer_saveAllTest.java
+++ b/src/test/java/io/ebean/EbeanServer_saveAllTest.java
@@ -60,8 +60,8 @@ public class EbeanServer_saveAllTest extends BaseTestCase {
     EbeanServer server = Ebean.getDefaultServer();
 
     Transaction transaction = server.beginTransaction();
-    transaction.setBatch(PersistBatch.ALL);
     try {
+      transaction.setBatch(PersistBatch.ALL);
       LoggedSqlCollector.start();
 
       for (EBasicVer bean : beans(2)) {
diff --git a/src/test/java/org/tests/basic/TestQueryForUpdate.java b/src/test/java/org/tests/basic/TestQueryForUpdate.java
index 4a2c63c31..c78aaebaa 100644
--- a/src/test/java/org/tests/basic/TestQueryForUpdate.java
+++ b/src/test/java/org/tests/basic/TestQueryForUpdate.java
@@ -49,7 +49,6 @@ public class TestQueryForUpdate extends BaseTestCase {
     ResetBasicData.reset();
 
     Ebean.beginTransaction();
-
     try {
       Query<Customer> query = Ebean.find(Customer.class)
         .forUpdateNoWait()
diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
index d5b5add3f..7b5d61ce4 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
@@ -32,13 +32,12 @@ public class TestBatchInsertFlush extends BaseTestCase {
     MetaInfoManager metaInfoManager = server.getMetaInfoManager();
     metaInfoManager.collectTransactionStatistics(true);
 
-    Transaction transaction = server.beginTransaction()
-      .setPersistCascade(false)
-      .setBatchSize(10)
-      .setBatch(PersistBatch.ALL)
-      .setLabel("TestBatchInsertFlush.no_cascade");
-
+    Transaction transaction = server.beginTransaction();
     try {
+      transaction.setPersistCascade(false)
+        .setBatchSize(10)
+        .setBatch(PersistBatch.ALL)
+        .setLabel("TestBatchInsertFlush.no_cascade");
 
       LoggedSqlCollector.start();
 
diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java b/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java
index b49aebc75..e73842925 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java
@@ -128,12 +128,11 @@ public class TestBatchInsertSimple extends BaseTestCase {
       masters.add(createMasterAndDetails(i, 7));
     }
 
-    Transaction transaction = Ebean.beginTransaction()
-      .setBatch(PersistBatch.NONE)
-      .setBatchOnCascade(PersistBatch.ALL)
-      .setBatchSize(20);
-
+    Transaction transaction = Ebean.beginTransaction();
     try {
+      transaction.setBatch(PersistBatch.NONE)
+        .setBatchOnCascade(PersistBatch.ALL)
+        .setBatchSize(20);
 
       // escalate based on batchOnCascade value
       Ebean.saveAll(masters);
diff --git a/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java b/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java
index a9dc9facb..568dd0e8b 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java
@@ -82,10 +82,10 @@ public class TestBatchOnCascadeExceptionHandling extends BaseTestCase {
 
   protected void testBatchOnCascadeIsExceptionSafe(EbeanServer server, Runnable failingOperation) {
     Transaction txn = server.beginTransaction();
-    assertThat(txn.getBatch()).isSameAs(PersistBatch.NONE);
-    assertThat(txn.getBatchOnCascade()).isSameAs(PersistBatch.ALL);
-
     try {
+      assertThat(txn.getBatch()).isSameAs(PersistBatch.NONE);
+      assertThat(txn.getBatchOnCascade()).isSameAs(PersistBatch.ALL);
+
       failingOperation.run();
       Assertions.fail("PersistenceException expected");
     } catch (PersistenceException e) {
diff --git a/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java b/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java
index 1720d33c6..bd655c2fd 100644
--- a/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java
+++ b/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java
@@ -16,50 +16,51 @@ public class TestL2DirtyFlagOnLazyLoad extends BaseTestCase {
 
   @Test
   public void dirtyFlag_reset_after_lazy() {
-
-    //PREPARE
-    Transaction tx0 = Ebean.beginTransaction();
     L2CachedLazyDirtFlagResetBean bean = new L2CachedLazyDirtFlagResetBean();
-    bean.setName("findById");
-    Ebean.save(bean);
-    //bean.save();
-    tx0.commit();
+    //PREPARE
+    try (Transaction tx0 = Ebean.beginTransaction()) {
+      bean.setName("findById");
+      Ebean.save(bean);
+      //bean.save();
+      tx0.commit();
+    }
 
     // clearAll() caches via the ServerCacheManager ...
     // Clear all the caches on the default/primary EbeanServer
     server().getServerCacheManager().clearAll();
 
     //TEST
-    Transaction tx1 = Ebean.beginTransaction();
-    // load (and dont touch any related entity)
-    L2CachedLazyDirtFlagResetBean bean1 = Ebean.find(L2CachedLazyDirtFlagResetBean.class, bean.getId());
-    assertThat(bean1).isNotNull();
-    tx1.commit();
+    try (Transaction tx1 = Ebean.beginTransaction()) {
+      // load (and dont touch any related entity)
+      L2CachedLazyDirtFlagResetBean bean1 = Ebean.find(L2CachedLazyDirtFlagResetBean.class, bean.getId());
+      assertThat(bean1).isNotNull();
+      tx1.commit();
+    }
 
+    try (Transaction tx2 = Ebean.beginTransaction()) {
+      // load (and modify)
 
-    Transaction tx2 = Ebean.beginTransaction();
-    // load (and modify)
+      L2CachedLazyDirtFlagResetBean bean2 = Ebean.find(L2CachedLazyDirtFlagResetBean.class, bean.getId());
+      assertNotNull(bean2);
+      assertEquals("findById", bean2.getName());
+      bean2.setName("something");
+      BeanState beanState = Ebean.getBeanState(bean2);
+      assertTrue(beanState.isDirty());
+      //bean2.getChildren().size();
+      bean2.someRichObjectMethod();
+      assertTrue(beanState.isDirty());
 
-    L2CachedLazyDirtFlagResetBean bean2 = Ebean.find(L2CachedLazyDirtFlagResetBean.class, bean.getId());
-    assertNotNull(bean2);
-    assertEquals("findById", bean2.getName());
-    bean2.setName("something");
-    BeanState beanState = Ebean.getBeanState(bean2);
-    assertTrue(beanState.isDirty());
-    //bean2.getChildren().size();
-    bean2.someRichObjectMethod();
-    assertTrue(beanState.isDirty());
+      Ebean.update(bean2);
+      tx2.commit();
+    }
 
-    Ebean.update(bean2);
-    tx2.commit();
+    try(Transaction tx3 = Ebean.beginTransaction()) {
+      // validation
 
-    Transaction tx3 = Ebean.beginTransaction();
-    // validation
+      L2CachedLazyDirtFlagResetBean bean3 = Ebean.find(L2CachedLazyDirtFlagResetBean.class, bean.getId());
+      assertEquals("something", bean3.getName());
 
-    L2CachedLazyDirtFlagResetBean bean3 = Ebean.find(L2CachedLazyDirtFlagResetBean.class, bean.getId());
-    assertEquals("something", bean3.getName());
-
-    tx3.rollback();
+    }
 
   }
 }
diff --git a/src/test/java/org/tests/compositekeys/TestCore.java b/src/test/java/org/tests/compositekeys/TestCore.java
index 8eaf3e27b..0a1f96500 100644
--- a/src/test/java/org/tests/compositekeys/TestCore.java
+++ b/src/test/java/org/tests/compositekeys/TestCore.java
@@ -37,72 +37,72 @@ public class TestCore extends BaseTestCase {
     Ebean.createUpdate(Type.class, "delete from Type").execute();
     Ebean.createUpdate(SubType.class, "delete from SubType").execute();
 
-    Transaction tx = server().beginTransaction();
+    try (Transaction tx = server().beginTransaction()) {
+      SubType subType = new SubType();
+      SubTypeKey subTypeKey = new SubTypeKey();
+      subTypeKey.setSubTypeId(1);
+      subType.setKey(subTypeKey);
+      subType.setDescription("ANY SUBTYPE");
+      server().save(subType);
 
-    SubType subType = new SubType();
-    SubTypeKey subTypeKey = new SubTypeKey();
-    subTypeKey.setSubTypeId(1);
-    subType.setKey(subTypeKey);
-    subType.setDescription("ANY SUBTYPE");
-    server().save(subType);
+      Type type = new Type();
+      TypeKey typeKey = new TypeKey();
+      typeKey.setCustomer(1);
+      typeKey.setType(10);
+      type.setKey(typeKey);
+      type.setDescription("Type Old-Item - Customer 1");
+      type.setSubType(subType);
+      server().save(type);
 
-    Type type = new Type();
-    TypeKey typeKey = new TypeKey();
-    typeKey.setCustomer(1);
-    typeKey.setType(10);
-    type.setKey(typeKey);
-    type.setDescription("Type Old-Item - Customer 1");
-    type.setSubType(subType);
-    server().save(type);
+      type = new Type();
+      typeKey = new TypeKey();
+      typeKey.setCustomer(2);
+      typeKey.setType(10);
+      type.setKey(typeKey);
+      type.setDescription("Type Old-Item - Customer 2");
+      type.setSubType(subType);
+      server().save(type);
 
-    type = new Type();
-    typeKey = new TypeKey();
-    typeKey.setCustomer(2);
-    typeKey.setType(10);
-    type.setKey(typeKey);
-    type.setDescription("Type Old-Item - Customer 2");
-    type.setSubType(subType);
-    server().save(type);
+      Region region = new Region();
+      RegionKey regionKey = new RegionKey();
+      regionKey.setCustomer(1);
+      regionKey.setType(500);
+      region.setKey(regionKey);
+      region.setDescription("Region West - Customer 1");
+      server().save(region);
 
-    Region region = new Region();
-    RegionKey regionKey = new RegionKey();
-    regionKey.setCustomer(1);
-    regionKey.setType(500);
-    region.setKey(regionKey);
-    region.setDescription("Region West - Customer 1");
-    server().save(region);
+      region = new Region();
+      regionKey = new RegionKey();
+      regionKey.setCustomer(2);
+      regionKey.setType(500);
+      region.setKey(regionKey);
+      region.setDescription("Region West - Customer 2");
+      server().save(region);
 
-    region = new Region();
-    regionKey = new RegionKey();
-    regionKey.setCustomer(2);
-    regionKey.setType(500);
-    region.setKey(regionKey);
-    region.setDescription("Region West - Customer 2");
-    server().save(region);
+      Item item = new Item();
+      ItemKey itemKey = new ItemKey();
+      itemKey.setCustomer(1);
+      itemKey.setItemNumber("ITEM1");
+      item.setKey(itemKey);
+      item.setUnits("P");
+      item.setDescription("Fancy Car - Customer 1");
+      item.setRegion(500);
+      item.setType(10);
+      server().save(item);
 
-    Item item = new Item();
-    ItemKey itemKey = new ItemKey();
-    itemKey.setCustomer(1);
-    itemKey.setItemNumber("ITEM1");
-    item.setKey(itemKey);
-    item.setUnits("P");
-    item.setDescription("Fancy Car - Customer 1");
-    item.setRegion(500);
-    item.setType(10);
-    server().save(item);
+      item = new Item();
+      itemKey = new ItemKey();
+      itemKey.setCustomer(2);
+      itemKey.setItemNumber("ITEM1");
+      item.setKey(itemKey);
+      item.setUnits("P");
+      item.setDescription("Another Fancy Car - Customer 2");
+      item.setRegion(500);
+      item.setType(10);
+      server().save(item);
 
-    item = new Item();
-    itemKey = new ItemKey();
-    itemKey.setCustomer(2);
-    itemKey.setItemNumber("ITEM1");
-    item.setKey(itemKey);
-    item.setUnits("P");
-    item.setDescription("Another Fancy Car - Customer 2");
-    item.setRegion(500);
-    item.setType(10);
-    server().save(item);
-
-    tx.commit();
+      tx.commit();
+    }
   }
 
   @Test
diff --git a/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java b/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java
index 066fc237b..9e7f2a348 100644
--- a/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java
+++ b/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java
@@ -3,6 +3,7 @@ package org.tests.delete;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.EbeanServer;
+import io.ebean.Transaction;
 import org.tests.model.basic.Product;
 import org.tests.model.basic.ResetBasicData;
 import org.junit.Assert;
@@ -26,21 +27,21 @@ public class TestDeleteByIdWithPersistenceContext extends BaseTestCase {
     Product prod2 = createProduct(101, "bananas");
     server.insert(prod2);
 
-    server.beginTransaction();
-    // effectively load these into the persistence context
-    server.find(Product.class, prod1.getId());
-    server.find(Product.class, prod2.getId());
+    try (Transaction txn = server.beginTransaction()) {
+      // effectively load these into the persistence context
+      server.find(Product.class, prod1.getId());
+      server.find(Product.class, prod2.getId());
 
-    server.deleteAll(Product.class, Arrays.asList(prod1.getId(), prod2.getId()));
+      server.deleteAll(Product.class, Arrays.asList(prod1.getId(), prod2.getId()));
 
-    // are these found in the persistence context?
-    Product shadow1 = server.find(Product.class, prod1.getId());
-    Product shadow2 = server.find(Product.class, prod2.getId());
+      // are these found in the persistence context?
+      Product shadow1 = server.find(Product.class, prod1.getId());
+      Product shadow2 = server.find(Product.class, prod2.getId());
 
-    Assert.assertNull(shadow1);
-    Assert.assertNull(shadow2);
+      Assert.assertNull(shadow1);
+      Assert.assertNull(shadow2);
 
-    server.endTransaction();
+    }
 
   }
 
diff --git a/src/test/java/org/tests/idkeys/TestGeneratedKeys.java b/src/test/java/org/tests/idkeys/TestGeneratedKeys.java
index d1b82d9ad..9e35598cd 100644
--- a/src/test/java/org/tests/idkeys/TestGeneratedKeys.java
+++ b/src/test/java/org/tests/idkeys/TestGeneratedKeys.java
@@ -30,20 +30,21 @@ public class TestGeneratedKeys extends BaseTestCase {
       return;
     }
 
-    Transaction tx = server.beginTransaction();
+    try (Transaction tx = server.beginTransaction()) {
 
-    long sequenceStart = readSequenceValue(tx, GenKeySequence.SEQUENCE_NAME);
+      long sequenceStart = readSequenceValue(tx, GenKeySequence.SEQUENCE_NAME);
 
-    GenKeySequence al = new GenKeySequence();
-    al.setDescription("my description");
-    server.save(al);
+      GenKeySequence al = new GenKeySequence();
+      al.setDescription("my description");
+      server.save(al);
 
 
-    long sequenceCurrent = readSequenceValue(tx, GenKeySequence.SEQUENCE_NAME);
+      long sequenceCurrent = readSequenceValue(tx, GenKeySequence.SEQUENCE_NAME);
 
-    assertNotNull(al.getId());
-    assertFalse(sequenceStart == sequenceCurrent);
-    assertEquals(sequenceStart + 20, sequenceCurrent);
+      assertNotNull(al.getId());
+      assertFalse(sequenceStart == sequenceCurrent);
+      assertEquals(sequenceStart + 20, sequenceCurrent);
+    }
 
   }
 
@@ -76,19 +77,20 @@ public class TestGeneratedKeys extends BaseTestCase {
       return;
     }
 
-    Transaction tx = server.beginTransaction();
+    try (Transaction tx = server.beginTransaction()) {
 
-    GenKeyIdentity al = new GenKeyIdentity();
-    al.setDescription("my description");
-    server.save(al);
+      GenKeyIdentity al = new GenKeyIdentity();
+      al.setDescription("my description");
+      server.save(al);
 
-    // For JDBC batching we won't get the id until after
-    // the batch has been flushed explicitly or via commit
-    //assertNotNull(al.getId());
+      // For JDBC batching we won't get the id until after
+      // the batch has been flushed explicitly or via commit
+      //assertNotNull(al.getId());
 
-    tx.commit();
+      tx.commit();
 
-    assertNotNull(al.getId());
+      assertNotNull(al.getId());
+    }
   }
 
 }
diff --git a/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java b/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java
index 7c5a6bde0..baddc58dc 100644
--- a/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java
+++ b/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java
@@ -49,8 +49,8 @@ public class TestConnectionCloseOnSqlerr extends BaseTestCase {
 
     try {
       for (int i = 0; i < 100; i++) {
+        Ebean.beginTransaction();
         try {
-          Ebean.beginTransaction();
           Query<Customer> q0 = Ebean.find(Customer.class).where().icontains("namexxx", "Rob")
             .query();
 
diff --git a/src/test/java/org/tests/query/TestManyWhereJoinM2M.java b/src/test/java/org/tests/query/TestManyWhereJoinM2M.java
index c68aa823d..f936e2442 100644
--- a/src/test/java/org/tests/query/TestManyWhereJoinM2M.java
+++ b/src/test/java/org/tests/query/TestManyWhereJoinM2M.java
@@ -3,6 +3,7 @@ package org.tests.query;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import io.ebean.Transaction;
 import org.tests.model.basic.MRole;
 import org.tests.model.basic.MUser;
 import org.junit.Assert;
@@ -17,39 +18,39 @@ public class TestManyWhereJoinM2M extends BaseTestCase {
   @Test
   public void test() {
 
-    Ebean.beginTransaction();
+    try (Transaction txn = Ebean.beginTransaction()) {
 
-    MRole r1 = new MRole();
-    r1.setRoleName("role1");
-    Ebean.save(r1);
+      MRole r1 = new MRole();
+      r1.setRoleName("role1");
+      Ebean.save(r1);
 
-    MRole r2 = new MRole();
-    r2.setRoleName("role2special");
-    Ebean.save(r2);
+      MRole r2 = new MRole();
+      r2.setRoleName("role2special");
+      Ebean.save(r2);
 
-    MRole r3 = new MRole();
-    r3.setRoleName("role3");
-    Ebean.save(r3);
+      MRole r3 = new MRole();
+      r3.setRoleName("role3");
+      Ebean.save(r3);
 
-    MUser u0 = new MUser();
-    u0.setUserName("user0");
-    u0.addRole(r1);
-    u0.addRole(r2);
+      MUser u0 = new MUser();
+      u0.setUserName("user0");
+      u0.addRole(r1);
+      u0.addRole(r2);
 
-    Ebean.save(u0);
+      Ebean.save(u0);
 
-    MUser u1 = new MUser();
-    u1.setUserName("user1");
-    u1.addRole(r1);
+      MUser u1 = new MUser();
+      u1.setUserName("user1");
+      u1.addRole(r1);
 
-    Ebean.save(u1);
+      Ebean.save(u1);
 
-    MUser u2 = new MUser();
-    u2.setUserName("user2");
-    Ebean.save(u2);
-
-    Ebean.commitTransaction();
+      MUser u2 = new MUser();
+      u2.setUserName("user2");
+      Ebean.save(u2);
 
+      txn.commit();
+    }
     Query<MUser> query = Ebean.find(MUser.class).fetch("roles")
       // the where on a 'many' (like orders) requires an
       // additional join and distinct which is independent
diff --git a/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java b/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java
index c3703719b..e123f30f0 100644
--- a/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java
+++ b/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java
@@ -49,7 +49,6 @@ public class TestRawSqlNamedParams extends BaseTestCase {
     ResetBasicData.reset();
 
     Transaction transaction = Ebean.beginTransaction();
-
     try {
       CallableSql callableSql = Ebean.createCallableSql("set @total = 0");
       Ebean.execute(callableSql);
diff --git a/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java b/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java
index 238d203a2..5c80f071d 100644
--- a/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java
+++ b/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java
@@ -23,11 +23,11 @@ public class TestRawSqlWithResultSet extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    // Transaction supplies our jdbc Connection
-    Transaction txn = Ebean.beginTransaction();
 
     PreparedStatement pstmt = null;
 
+    // Transaction supplies our jdbc Connection
+    Transaction txn = Ebean.beginTransaction();
     try {
       pstmt = txn.getConnection().prepareStatement("select id, name, billing_address_id from o_customer");
 
diff --git a/src/test/java/org/tests/timezone/TimezoneTests.java b/src/test/java/org/tests/timezone/TimezoneTests.java
index a0b3e4db0..7f144f77f 100644
--- a/src/test/java/org/tests/timezone/TimezoneTests.java
+++ b/src/test/java/org/tests/timezone/TimezoneTests.java
@@ -44,22 +44,21 @@ public class TimezoneTests {
   }
 
   private void fetch() throws SQLException {
-    Transaction transaction = Ebean.beginTransaction();
-    Connection connection = transaction.getConnection();
+    try (
+        Transaction transaction = Ebean.beginTransaction();
+        Connection connection = transaction.getConnection();
+        PreparedStatement statement = connection.prepareStatement("select * from tztest");
+        ResultSet resultSet = statement.executeQuery()) {
 
-    PreparedStatement statement = connection.prepareStatement("select * from tztest");
-    ResultSet resultSet = statement.executeQuery();
-    while (resultSet.next()) {
-      System.out.println(" zone:" + resultSet.getString("zone"));
-      System.out.println("   ts:" + tsof(resultSet.getTimestamp("ts")));
-      System.out.println(" tstz:" + tsof(resultSet.getTimestamp("tstz")));
-      System.out.println("  ts1:" + tsof(resultSet.getTimestamp("ts1", cal())));
-      System.out.println("tstz1:" + tsof(resultSet.getTimestamp("tstz1", cal())));
+      while (resultSet.next()) {
+        System.out.println(" zone:" + resultSet.getString("zone"));
+        System.out.println("   ts:" + tsof(resultSet.getTimestamp("ts")));
+        System.out.println(" tstz:" + tsof(resultSet.getTimestamp("tstz")));
+        System.out.println("  ts1:" + tsof(resultSet.getTimestamp("ts1", cal())));
+        System.out.println("tstz1:" + tsof(resultSet.getTimestamp("tstz1", cal())));
+      }
+      System.out.println("");
     }
-    System.out.println("");
-    resultSet.close();
-    statement.close();
-    transaction.end();
   }
 
   private String tsof(Timestamp timestamp) {
@@ -79,17 +78,19 @@ public class TimezoneTests {
       setZone(zone);
     }
 
-    Transaction transaction = Ebean.beginTransaction();
-    Connection connection = transaction.getConnection();
-    PreparedStatement statement = connection.prepareStatement(insert);
-    statement.setString(1, zone);
-    statement.setTimestamp(2, nowTs);
-    statement.setTimestamp(3, nowTs);
-    statement.setTimestamp(4, nowTs, cal());
-    statement.setTimestamp(5, nowTs, cal());
-    statement.executeUpdate();
+    try (
+        Transaction transaction = Ebean.beginTransaction();
+        Connection connection = transaction.getConnection();
+        PreparedStatement statement = connection.prepareStatement(insert)) {
+      statement.setString(1, zone);
+      statement.setTimestamp(2, nowTs);
+      statement.setTimestamp(3, nowTs);
+      statement.setTimestamp(4, nowTs, cal());
+      statement.setTimestamp(5, nowTs, cal());
+      statement.executeUpdate();
 
-    transaction.commit();
+      transaction.commit();
+    }
   }
 
   private Calendar cal() {
diff --git a/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java b/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java
index 2fd66a13d..28ab7d2f0 100644
--- a/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java
+++ b/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java
@@ -65,30 +65,30 @@ public class TestAutoCommitDataSource extends BaseTestCase {
     UTMaster bean3 = new UTMaster("three3");
 
     // use a different transaction to do final query check
-    Transaction otherTxn = ebeanServer.createTransaction();
-    Transaction txn = ebeanServer.beginTransaction();
+    try (Transaction otherTxn = ebeanServer.createTransaction()) {
 
-    assertTrue(txn.getConnection().getAutoCommit());
+      Transaction txn = ebeanServer.beginTransaction();
+      try {
+        assertTrue(txn.getConnection().getAutoCommit());
+        ebeanServer.save(bean1);
+        ebeanServer.save(bean2);
 
-    try {
-      ebeanServer.save(bean1);
-      ebeanServer.save(bean2);
+        Query<UTMaster> query2 = ebeanServer.find(UTMaster.class);
+        details = ebeanServer.findList(query2, otherTxn);
+        assertEquals(2, details.size());
 
-      Query<UTMaster> query2 = ebeanServer.find(UTMaster.class);
-      details = ebeanServer.findList(query2, otherTxn);
-      assertEquals(2, details.size());
+        ebeanServer.save(bean3);
 
-      ebeanServer.save(bean3);
+        txn.rollback();
 
-      txn.rollback();
+      } finally {
+        txn.end();
+      }
 
-    } finally {
-      txn.end();
+      Query<UTMaster> query3 = ebeanServer.find(UTMaster.class);
+      details = ebeanServer.findList(query3, otherTxn);
+      assertEquals(3, details.size());
     }
 
-    Query<UTMaster> query3 = ebeanServer.find(UTMaster.class);
-    details = ebeanServer.findList(query3, otherTxn);
-    assertEquals(3, details.size());
-
   }
 }
diff --git a/src/test/java/org/tests/transaction/TestBeanStateReset.java b/src/test/java/org/tests/transaction/TestBeanStateReset.java
index e7f17d5e1..ad332da9c 100644
--- a/src/test/java/org/tests/transaction/TestBeanStateReset.java
+++ b/src/test/java/org/tests/transaction/TestBeanStateReset.java
@@ -61,7 +61,6 @@ public class TestBeanStateReset extends BaseTestCase {
     b.getCs().add(c);
 
     Transaction transaction = Ebean.beginTransaction();
-
     try {
       // turn off cascade ...
       transaction.setPersistCascade(false);
diff --git a/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java b/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java
index 757208367..eb61b7010 100644
--- a/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java
+++ b/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java
@@ -10,6 +10,7 @@ import javax.persistence.PersistenceException;
 import java.sql.Connection;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 public class TestBeginTransactionWithExisting extends BaseTestCase {
 
@@ -30,7 +31,9 @@ public class TestBeginTransactionWithExisting extends BaseTestCase {
     Transaction txn = Ebean.beginTransaction();
     try {
 
-      Ebean.beginTransaction(TxIsolation.READ_COMMITED);
+      try (Transaction txn2 = Ebean.beginTransaction(TxIsolation.READ_COMMITED)) {
+        fail("Expected persitenceException here");
+      }
 
     } finally {
       txn.end();
diff --git a/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
index 1a9acff18..59ebdd121 100644
--- a/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
+++ b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
@@ -77,29 +77,30 @@ public class TestExplicitTransactionMode extends BaseTestCase {
     UTMaster bean3 = new UTMaster("three3");
 
     // use a different transaction to do final query check
-    Transaction otherTxn = ebeanServer.createTransaction();
-    Transaction txn = ebeanServer.beginTransaction();
+    try (Transaction otherTxn = ebeanServer.createTransaction()) {
 
-    try {
-      ebeanServer.save(bean1);
-      ebeanServer.save(bean2);
+      Transaction txn = ebeanServer.beginTransaction();
+      try {
+        ebeanServer.save(bean1);
+        ebeanServer.save(bean2);
 
-      // not visible in other transaction
-      Query<UTMaster> query2 = ebeanServer.find(UTMaster.class);
-      details = ebeanServer.findList(query2, otherTxn);
-      assertEquals(0, details.size());
+        // not visible in other transaction
+        Query<UTMaster> query2 = ebeanServer.find(UTMaster.class);
+        details = ebeanServer.findList(query2, otherTxn);
+        assertEquals(0, details.size());
 
-      ebeanServer.save(bean3);
+        ebeanServer.save(bean3);
 
-      txn.commit();
+        txn.commit();
 
-    } finally {
-      txn.end();
+      } finally {
+        txn.end();
+      }
+
+      // commit as expected
+      Query<UTMaster> query3 = ebeanServer.find(UTMaster.class);
+      details = ebeanServer.findList(query3, otherTxn);
+      assertEquals(3, details.size());
     }
-
-    // commit as expected
-    Query<UTMaster> query3 = ebeanServer.find(UTMaster.class);
-    details = ebeanServer.findList(query3, otherTxn);
-    assertEquals(3, details.size());
   }
 }
diff --git a/src/test/java/org/tests/transaction/TestPersistContextClear.java b/src/test/java/org/tests/transaction/TestPersistContextClear.java
index d80caa0a9..06f9f2517 100644
--- a/src/test/java/org/tests/transaction/TestPersistContextClear.java
+++ b/src/test/java/org/tests/transaction/TestPersistContextClear.java
@@ -22,17 +22,17 @@ public class TestPersistContextClear extends BaseTestCase {
     ResetBasicData.reset();
 
     ResetBasicData.createOrderCustAndOrder("testPc");
+    Order order0 = null;
 
     Transaction t = Ebean.beginTransaction();
-    SpiTransaction spiTxn = (SpiTransaction) t;
-    PersistenceContext pc = spiTxn.getPersistenceContext();
-
-    // no orders or customers in the PC
-    Assert.assertEquals(0, pc.size(Order.class));
-    Assert.assertEquals(0, pc.size(Customer.class));
-
-    Order order0 = null;
     try {
+      SpiTransaction spiTxn = (SpiTransaction) t;
+      PersistenceContext pc = spiTxn.getPersistenceContext();
+
+      // no orders or customers in the PC
+      Assert.assertEquals(0, pc.size(Order.class));
+      Assert.assertEquals(0, pc.size(Customer.class));
+
 
       EbeanServer server = Ebean.getServer(null);
       List<Order> list = server.find(Order.class).fetch("customer").fetch("details").findList();
diff --git a/src/test/java/org/tests/transaction/TestSqlServerBatch.java b/src/test/java/org/tests/transaction/TestSqlServerBatch.java
index 38cd60050..e2a716ef6 100644
--- a/src/test/java/org/tests/transaction/TestSqlServerBatch.java
+++ b/src/test/java/org/tests/transaction/TestSqlServerBatch.java
@@ -22,8 +22,9 @@ public class TestSqlServerBatch extends BaseTestCase {
   @Test
   public void testBasicIdentityBatch() {
 
-    Transaction txn = Ebean.beginTransaction().setBatchMode(true).setBatchSize(3);
+    Transaction txn = Ebean.beginTransaction();
     try {
+      txn.setBatchMode(true).setBatchSize(3);
 
       for (int i = 0; i < 10; i++) {
         ESimple model = new ESimple();
diff --git a/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java b/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java
index 8e1b59924..bb2222038 100644
--- a/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java
+++ b/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java
@@ -15,24 +15,25 @@ public class TestStatelessUpdateClearPC extends BaseTestCase {
 
 
     Ebean.beginTransaction();
+    try {
+      EBasic newUser = new EBasic();
+      newUser.setName("any@email.com");
+      Ebean.save(newUser);
 
-    EBasic newUser = new EBasic();
-    newUser.setName("any@email.com");
-    Ebean.save(newUser);
+      // load the bean into the persistence context
+      EBasic dummyLoadedUser = Ebean.find(EBasic.class, newUser.getId()); // This row is added
+      assertNotNull(dummyLoadedUser);
 
-    // load the bean into the persistence context
-    EBasic dummyLoadedUser = Ebean.find(EBasic.class, newUser.getId()); // This row is added
-    assertNotNull(dummyLoadedUser);
+      // stateless update (should clear the bean from the persistence context)
+      EBasic updateUser = new EBasic();
+      updateUser.setId(newUser.getId());
+      updateUser.setName("anyNew@email.com");
+      Ebean.update(updateUser);
 
-    // stateless update (should clear the bean from the persistence context)
-    EBasic updateUser = new EBasic();
-    updateUser.setId(newUser.getId());
-    updateUser.setName("anyNew@email.com");
-    Ebean.update(updateUser);
-
-    EBasic loadedUser = Ebean.find(EBasic.class, newUser.getId());
-    assertEquals("anyNew@email.com", loadedUser.getName());
-
-    Ebean.rollbackTransaction();
+      EBasic loadedUser = Ebean.find(EBasic.class, newUser.getId());
+      assertEquals("anyNew@email.com", loadedUser.getName());
+    } finally {
+      Ebean.rollbackTransaction();
+    }
   }
 }
diff --git a/src/test/java/org/tests/transaction/TestTransactionCallback.java b/src/test/java/org/tests/transaction/TestTransactionCallback.java
index 1c6b5ccbe..44e91f601 100644
--- a/src/test/java/org/tests/transaction/TestTransactionCallback.java
+++ b/src/test/java/org/tests/transaction/TestTransactionCallback.java
@@ -28,10 +28,11 @@ public class TestTransactionCallback extends BaseTestCase {
   public void test_commitAndRollback() {
 
 
-    Transaction txn = Ebean.beginTransaction();
-    Ebean.register(new MyCallback());
-    txn.getConnection();
-    Ebean.commitTransaction();
+    try (Transaction txn = Ebean.beginTransaction()) {
+      Ebean.register(new MyCallback());
+      txn.getConnection();
+      Ebean.commitTransaction();
+    }
 
     assertEquals(1, countPreCommit);
     assertEquals(1, countPostCommit);
@@ -39,8 +40,11 @@ public class TestTransactionCallback extends BaseTestCase {
     assertEquals(0, countPostRollback);
 
     Ebean.beginTransaction();
-    Ebean.register(new MyCallback());
-    Ebean.rollbackTransaction();
+    try {
+      Ebean.register(new MyCallback());
+    } finally {
+      Ebean.rollbackTransaction();
+    }
 
     assertEquals(1, countPreCommit);
     assertEquals(1, countPostCommit);
diff --git a/src/test/java/org/tests/update/TestSqlUpdateInTxn.java b/src/test/java/org/tests/update/TestSqlUpdateInTxn.java
index 3ede3004d..3b167abc1 100644
--- a/src/test/java/org/tests/update/TestSqlUpdateInTxn.java
+++ b/src/test/java/org/tests/update/TestSqlUpdateInTxn.java
@@ -96,18 +96,20 @@ public class TestSqlUpdateInTxn extends BaseTestCase {
 
 
     Ebean.beginTransaction();
+    try {
+      SqlUpdate update = Ebean.createSqlUpdate(updateDml);
+      update.setParameter("desc", "foo4");
+      update.setParameter("id", id);
+      update.execute();
 
-    SqlUpdate update = Ebean.createSqlUpdate(updateDml);
-    update.setParameter("desc", "foo4");
-    update.setParameter("id", id);
-    update.execute();
-
-    updateMod = Ebean.createSqlUpdate(updateModDml);
-    updateMod.setParameter("desc", "mod2");
-    updateMod.execute();
-
-    Ebean.commitTransaction();
+      updateMod = Ebean.createSqlUpdate(updateModDml);
+      updateMod.setParameter("desc", "mod2");
+      updateMod.execute();
 
+      Ebean.commitTransaction();
+    } finally {
+      Ebean.endTransaction();
+    }
     AuditLog log5 = Ebean.find(AuditLog.class, log.getId());
     Assert.assertEquals("foo4", log5.getDescription());
     Assert.assertEquals("mod2", log5.getModifiedDescription());

From 0de084caec4f61bdbc792f08286ec31d6675edfd Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Sun, 25 Feb 2018 20:42:18 +0100
Subject: [PATCH 0069/1036] removed escapeLikeCharacter method, as it is
 covered by parent implementation (#1274)

---
 src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java | 4 ----
 .../java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java  | 4 ----
 .../io/ebean/config/dbplatform/oracle/OraclePlatform.java     | 4 ----
 .../io/ebean/config/dbplatform/sqlite/SQLitePlatform.java     | 1 +
 4 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java b/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java
index 793afee2d..b8ba7d227 100644
--- a/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java
+++ b/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java
@@ -46,10 +46,6 @@ public class DB2Platform extends DatabasePlatform {
     persistBatchOnCascade = PersistBatch.NONE;
   }
 
-  @Override
-  protected void escapeLikeCharacter(char ch, StringBuilder sb) {
-    sb.append('|').append(ch);
-  }
   /**
    * Return a DB2 specific sequence IdGenerator that supports batch fetching
    * sequence values.
diff --git a/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java
index f9973c243..bea7ed391 100644
--- a/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java
@@ -67,8 +67,4 @@ public class MySqlPlatform extends DatabasePlatform {
     return sql + " for update";
   }
 
-  @Override
-  protected void escapeLikeCharacter(char ch, StringBuilder sb) {
-    sb.append('|').append(ch);
-  }
 }
diff --git a/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java b/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java
index 636390dfc..b73f8091a 100644
--- a/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java
@@ -86,8 +86,4 @@ public class OraclePlatform extends DatabasePlatform {
     }
   }
 
-  @Override
-  protected void escapeLikeCharacter(char ch, StringBuilder sb) {
-    sb.append('|').append(ch);
-  }
 }
diff --git a/src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java b/src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java
index 74823549a..b4957f6d1 100644
--- a/src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java
@@ -28,6 +28,7 @@ public class SQLitePlatform extends DatabasePlatform {
     dbTypeMap.put(DbType.SMALLINT, new DbPlatformType("integer"));
   }
 
+  @Override
   protected void escapeLikeCharacter(char ch, StringBuilder sb) {
     sb.append(ch);
   }

From 21182da793014d75b959410770d94bc8084b03ba Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 26 Feb 2018 09:18:45 +1300
Subject: [PATCH 0070/1036] Fix test LoaderTest

---
 src/test/java/io/ebean/config/properties/LoaderTest.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/test/java/io/ebean/config/properties/LoaderTest.java b/src/test/java/io/ebean/config/properties/LoaderTest.java
index e5b5d3ee5..7a4edea8d 100644
--- a/src/test/java/io/ebean/config/properties/LoaderTest.java
+++ b/src/test/java/io/ebean/config/properties/LoaderTest.java
@@ -12,6 +12,9 @@ public class LoaderTest {
   @Test
   public void load() {
 
+    String userName = System.getProperty("user.name");
+    String userHome = System.getProperty("user.home");
+
     Loader loader = new Loader();
     loader.loadProperties("test-properties/application.properties", Loader.Source.RESOURCE);
     loader.loadYaml("test-properties/application.yml", Loader.Source.RESOURCE);
@@ -25,8 +28,8 @@ public class LoaderTest {
     assertEquals("Two", properties.getProperty("app.two"));
 
     assertEquals("bart", properties.getProperty("eval.withDefault"));
-    assertEquals("/home/rob/after", properties.getProperty("eval.home"));
-    assertEquals("rob", properties.getProperty("eval.name"));
+    assertEquals(userName, properties.getProperty("eval.name"));
+    assertEquals(userHome + "/after", properties.getProperty("eval.home"));
   }
 
   @Test

From 0e219a9bc63ad3d112ee50b62c319570df5b8215 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 26 Feb 2018 11:45:49 +1300
Subject: [PATCH 0071/1036] Revert #1263 - ENH: Make Transaction API Fluid such
 that we can set multiple thing like batchSize and label in a fluid fashion
 #1276

---
 src/main/java/io/ebean/Transaction.java       | 36 ++++-----
 .../ebeaninternal/api/ScopedTransaction.java  |  4 +-
 .../api/SpiTransactionProxy.java              | 52 +++++--------
 .../transaction/DocStoreOnlyTransaction.java  |  5 +-
 .../ImplicitReadOnlyTransaction.java          | 52 +++++--------
 .../server/transaction/JdbcTransaction.java   | 55 +++++---------
 .../server/transaction/NoTransaction.java     | 73 +++++++++----------
 .../batchinsert/TestBatchInsertFlush.java     |  8 +-
 .../batchinsert/TestBatchInsertSimple.java    |  6 +-
 .../tests/transaction/TestSqlServerBatch.java |  3 +-
 10 files changed, 120 insertions(+), 174 deletions(-)

diff --git a/src/main/java/io/ebean/Transaction.java b/src/main/java/io/ebean/Transaction.java
index b629c24f9..743fcc138 100644
--- a/src/main/java/io/ebean/Transaction.java
+++ b/src/main/java/io/ebean/Transaction.java
@@ -57,7 +57,7 @@ public interface Transaction extends AutoCloseable {
   /**
    * Register a TransactionCallback with this transaction.
    */
-  Transaction register(TransactionCallback callback);
+  void register(TransactionCallback callback);
 
   /**
    * Set a label on the transaction.
@@ -65,7 +65,7 @@ public interface Transaction extends AutoCloseable {
    * This label is used to group transaction execution times for performance metrics reporting.
    * </p>
    */
-  Transaction setLabel(String label);
+  void setLabel(String label);
 
   /**
    * Return true if this transaction is read only.
@@ -75,7 +75,7 @@ public interface Transaction extends AutoCloseable {
   /**
    * Set whether this transaction should be readOnly.
    */
-  Transaction setReadOnly(boolean readOnly);
+  void setReadOnly(boolean readOnly);
 
   /**
    * Commits the transaction at this point with the expectation that another
@@ -139,7 +139,7 @@ public interface Transaction extends AutoCloseable {
   /**
    * Mark the transaction for rollback only.
    */
-  Transaction setRollbackOnly();
+  void setRollbackOnly();
 
   /**
    * Return true if the transaction is marked as rollback only.
@@ -172,7 +172,7 @@ public interface Transaction extends AutoCloseable {
    * to control how that is sent to the document store.
    * </p>
    */
-  Transaction setDocStoreMode(DocStoreMode mode);
+  void setDocStoreMode(DocStoreMode mode);
 
   /**
    * Set the batch size to use for sending messages to the document store.
@@ -184,7 +184,7 @@ public interface Transaction extends AutoCloseable {
    * Setting this overrides the default of {@link DocStoreConfig#getBulkBatchSize()}
    * </p>
    */
-  Transaction setDocStoreBatchSize(int batchSize);
+  void setDocStoreBatchSize(int batchSize);
 
   /**
    * Explicitly turn off or on the cascading nature of save() and delete(). This
@@ -199,7 +199,7 @@ public interface Transaction extends AutoCloseable {
    * that do not support getGeneratedKeys.
    * </p>
    */
-  Transaction setPersistCascade(boolean persistCascade);
+  void setPersistCascade(boolean persistCascade);
 
   /**
    * Set to true when you want all loaded properties to be included in the update
@@ -210,7 +210,7 @@ public interface Transaction extends AutoCloseable {
    * and hence better JDBC batch performance.
    * </p>
    */
-  Transaction setUpdateAllLoadedProperties(boolean updateAllLoadedProperties);
+  void setUpdateAllLoadedProperties(boolean updateAllLoadedProperties);
 
   /**
    * Set if the L2 cache should be skipped for "find by id" and "find by natural key" queries.
@@ -269,7 +269,7 @@ public interface Transaction extends AutoCloseable {
    *
    * @see ServerConfig#isSkipCacheAfterWrite()
    */
-  Transaction setSkipCache(boolean skipCache);
+  void setSkipCache(boolean skipCache);
 
   /**
    * Return true if the L2 cache should be skipped. More accurately if true then find by id
@@ -344,7 +344,7 @@ public interface Transaction extends AutoCloseable {
    *
    * }</pre>
    */
-  Transaction setBatchMode(boolean useBatch);
+  void setBatchMode(boolean useBatch);
 
   /**
    * The JDBC batch mode to use for this transaction.
@@ -356,7 +356,7 @@ public interface Transaction extends AutoCloseable {
    * @param persistBatchMode the batch mode to use for this transaction
    * @see io.ebean.config.ServerConfig#setPersistBatch(PersistBatch)
    */
-  Transaction setBatch(PersistBatch persistBatchMode);
+  void setBatch(PersistBatch persistBatchMode);
 
   /**
    * Return the batch mode at the transaction level.
@@ -377,7 +377,7 @@ public interface Transaction extends AutoCloseable {
    * @param batchOnCascadeMode the batch mode to use per save(), insert(), update() or delete()
    * @see io.ebean.config.ServerConfig#setPersistBatchOnCascade(PersistBatch)
    */
-  Transaction setBatchOnCascade(PersistBatch batchOnCascadeMode);
+  void setBatchOnCascade(PersistBatch batchOnCascadeMode);
 
   /**
    * Return the batch mode at the request level (for each save(), insert(), update() or delete()).
@@ -387,7 +387,7 @@ public interface Transaction extends AutoCloseable {
   /**
    * Specify the number of statements before a batch is flushed automatically.
    */
-  Transaction setBatchSize(int batchSize);
+  void setBatchSize(int batchSize);
 
   /**
    * Return the current batch size.
@@ -405,7 +405,7 @@ public interface Transaction extends AutoCloseable {
    * number of objects and you don't care about getting back the ids.
    * </p>
    */
-  Transaction setBatchGetGeneratedKeys(boolean getGeneratedKeys);
+  void setBatchGetGeneratedKeys(boolean getGeneratedKeys);
 
   /**
    * By default when mixing UpdateSql (or CallableSql) with Beans the batch is
@@ -422,7 +422,7 @@ public interface Transaction extends AutoCloseable {
    * have a 2 step process (delayed binding).
    * </p>
    */
-  Transaction setBatchFlushOnMixed(boolean batchFlushOnMixed);
+  void setBatchFlushOnMixed(boolean batchFlushOnMixed);
 
   /**
    * By default executing a query will automatically flush any batched
@@ -432,7 +432,7 @@ public interface Transaction extends AutoCloseable {
    * execute a query and the batch will not be automatically flushed.
    * </p>
    */
-  Transaction setBatchFlushOnQuery(boolean batchFlushOnQuery);
+  void setBatchFlushOnQuery(boolean batchFlushOnQuery);
 
   /**
    * Return true if the batch (of persisted beans or executed UpdateSql etc)
@@ -498,14 +498,14 @@ public interface Transaction extends AutoCloseable {
    * caches in synch and maintain text indexes.
    * </p>
    */
-  Transaction addModification(String tableName, boolean inserts, boolean updates, boolean deletes);
+  void addModification(String tableName, boolean inserts, boolean updates, boolean deletes);
 
   /**
    * Add an arbitrary user object to the transaction. The objects added have no
    * impact on any internals of ebean and are solely meant as a convenient
    * method push user information (although somewhat replaced by TransactionCallback).
    */
-  Transaction putUserObject(String name, Object value);
+  void putUserObject(String name, Object value);
 
   /**
    * Get an object added with {@link #putUserObject(String, Object)}.
diff --git a/src/main/java/io/ebeaninternal/api/ScopedTransaction.java b/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
index 17f4fae57..9ecd6a3b7 100644
--- a/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
+++ b/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.api;
 
-import io.ebean.Transaction;
 import io.ebeaninternal.server.transaction.TransactionScopeManager;
 import io.ebeaninternal.server.util.ArrayStack;
 
@@ -94,9 +93,8 @@ public class ScopedTransaction extends SpiTransactionProxy {
   }
 
   @Override
-  public Transaction setRollbackOnly() {
+  public void setRollbackOnly() {
     current.setRollbackOnly();
-    return this;
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java b/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
index 7c7b1e317..b9907aa3a 100644
--- a/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
+++ b/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
@@ -1,7 +1,6 @@
 package io.ebeaninternal.api;
 
 import io.ebean.ProfileLocation;
-import io.ebean.Transaction;
 import io.ebean.TransactionCallback;
 import io.ebean.annotation.DocStoreMode;
 import io.ebean.annotation.PersistBatch;
@@ -32,9 +31,8 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public Transaction setLabel(String label) {
+  public void setLabel(String label) {
     transaction.setLabel(label);
-    return this;
   }
 
   @Override
@@ -103,9 +101,8 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public Transaction setDocStoreMode(DocStoreMode mode) {
+  public void setDocStoreMode(DocStoreMode mode) {
     transaction.setDocStoreMode(mode);
-    return this;
   }
 
   @Override
@@ -114,9 +111,8 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public Transaction setDocStoreBatchSize(int batchSize) {
+  public void setDocStoreBatchSize(int batchSize) {
     transaction.setDocStoreBatchSize(batchSize);
-    return this;
   }
 
   @Override
@@ -145,9 +141,8 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public Transaction setSkipCache(boolean skipCache) {
+  public void setSkipCache(boolean skipCache) {
     transaction.setSkipCache(skipCache);
-    return this;
   }
 
   @Override
@@ -201,9 +196,8 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public Transaction register(TransactionCallback callback) {
+  public void register(TransactionCallback callback) {
     transaction.register(callback);
-    return this;
   }
 
   @Override
@@ -212,9 +206,8 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public Transaction setReadOnly(boolean readOnly) {
+  public void setReadOnly(boolean readOnly) {
     transaction.setReadOnly(readOnly);
-    return this;
   }
 
   @Override
@@ -223,15 +216,13 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public Transaction setPersistCascade(boolean persistCascade) {
+  public void setPersistCascade(boolean persistCascade) {
     transaction.setPersistCascade(persistCascade);
-    return this;
   }
 
   @Override
-  public Transaction setUpdateAllLoadedProperties(boolean updateAllLoaded) {
+  public void setUpdateAllLoadedProperties(boolean updateAllLoaded) {
     transaction.setUpdateAllLoadedProperties(updateAllLoaded);
-    return this;
   }
 
   @Override
@@ -240,15 +231,13 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public Transaction setBatchMode(boolean useBatch) {
+  public void setBatchMode(boolean useBatch) {
     transaction.setBatchMode(useBatch);
-    return this;
   }
 
   @Override
-  public Transaction setBatch(PersistBatch persistBatchMode) {
+  public void setBatch(PersistBatch persistBatchMode) {
     transaction.setBatch(persistBatchMode);
-    return this;
   }
 
   @Override
@@ -257,9 +246,8 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public Transaction setBatchOnCascade(PersistBatch batchOnCascadeMode) {
+  public void setBatchOnCascade(PersistBatch batchOnCascadeMode) {
     transaction.setBatchOnCascade(batchOnCascadeMode);
-    return this;
   }
 
   @Override
@@ -268,9 +256,8 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public Transaction setBatchSize(int batchSize) {
+  public void setBatchSize(int batchSize) {
     transaction.setBatchSize(batchSize);
-    return this;
   }
 
   @Override
@@ -279,9 +266,8 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public Transaction setBatchGetGeneratedKeys(boolean getGeneratedKeys) {
+  public void setBatchGetGeneratedKeys(boolean getGeneratedKeys) {
     transaction.setBatchGetGeneratedKeys(getGeneratedKeys);
-    return this;
   }
 
   @Override
@@ -290,15 +276,13 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public Transaction setBatchFlushOnMixed(boolean batchFlushOnMixed) {
+  public void setBatchFlushOnMixed(boolean batchFlushOnMixed) {
     transaction.setBatchFlushOnMixed(batchFlushOnMixed);
-    return this;
   }
 
   @Override
-  public Transaction setBatchFlushOnQuery(boolean batchFlushOnQuery) {
+  public void setBatchFlushOnQuery(boolean batchFlushOnQuery) {
     transaction.setBatchFlushOnQuery(batchFlushOnQuery);
-    return this;
   }
 
   @Override
@@ -322,15 +306,13 @@ abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public Transaction addModification(String tableName, boolean inserts, boolean updates, boolean deletes) {
+  public void addModification(String tableName, boolean inserts, boolean updates, boolean deletes) {
     transaction.addModification(tableName, inserts, updates, deletes);
-    return this;
   }
 
   @Override
-  public Transaction putUserObject(String name, Object value) {
+  public void putUserObject(String name, Object value) {
     transaction.putUserObject(name, value);
-    return this;
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java
index dbf1ce00d..4bb23735e 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java
@@ -1,7 +1,5 @@
 package io.ebeaninternal.server.transaction;
 
-import io.ebean.Transaction;
-
 import java.sql.Connection;
 import java.sql.SQLException;
 
@@ -23,9 +21,8 @@ public class DocStoreOnlyTransaction extends JdbcTransaction {
   }
 
   @Override
-  public Transaction setReadOnly(boolean readOnly) {
+  public void setReadOnly(boolean readOnly) {
     // do nothing
-    return this;
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
index 6f39932bc..0e95880cb 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
@@ -1,7 +1,6 @@
 package io.ebeaninternal.server.transaction;
 
 import io.ebean.ProfileLocation;
-import io.ebean.Transaction;
 import io.ebean.TransactionCallback;
 import io.ebean.annotation.DocStoreMode;
 import io.ebean.annotation.PersistBatch;
@@ -86,9 +85,8 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public Transaction setLabel(String label) {
+  public void setLabel(String label) {
     // do nothing
-    return this;
   }
 
   @Override
@@ -132,8 +130,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public Transaction setSkipCache(boolean skipCache) {
-    return this;
+  public void setSkipCache(boolean skipCache) {
   }
 
   @Override
@@ -152,7 +149,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public Transaction register(TransactionCallback callback) {
+  public void register(TransactionCallback callback) {
     throw new IllegalStateException(notExpectedMessage);
   }
 
@@ -162,7 +159,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public Transaction setDocStoreBatchSize(int docStoreBatchSize) {
+  public void setDocStoreBatchSize(int docStoreBatchSize) {
     throw new IllegalStateException(notExpectedMessage);
   }
 
@@ -172,7 +169,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public Transaction setDocStoreMode(DocStoreMode docStoreMode) {
+  public void setDocStoreMode(DocStoreMode docStoreMode) {
     throw new IllegalStateException(notExpectedMessage);
   }
 
@@ -247,21 +244,19 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public Transaction setReadOnly(boolean readOnly) {
+  public void setReadOnly(boolean readOnly) {
     if (!isActive()) {
       throw new IllegalStateException(illegalStateMessage);
     }
     try {
       connection.setReadOnly(readOnly);
-      return this;
     } catch (SQLException e) {
       throw new PersistenceException(e);
     }
   }
 
   @Override
-  public Transaction setUpdateAllLoadedProperties(boolean updateAllLoadedProperties) {
-    return this;
+  public void setUpdateAllLoadedProperties(boolean updateAllLoadedProperties) {
   }
 
   @Override
@@ -270,13 +265,13 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public Transaction setBatchMode(boolean batchMode) {
-    return this;
+  public void setBatchMode(boolean batchMode) {
+
   }
 
   @Override
-  public Transaction setBatch(PersistBatch batchMode) {
-    return this;
+  public void setBatch(PersistBatch batchMode) {
+
   }
 
   @Override
@@ -285,8 +280,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public Transaction setBatchOnCascade(PersistBatch batchOnCascadeMode) {
-    return this;
+  public void setBatchOnCascade(PersistBatch batchOnCascadeMode) {
   }
 
   @Override
@@ -300,13 +294,11 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public Transaction setBatchGetGeneratedKeys(boolean getGeneratedKeys) {
-    return this;
+  public void setBatchGetGeneratedKeys(boolean getGeneratedKeys) {
   }
 
   @Override
-  public Transaction setBatchFlushOnMixed(boolean batchFlushOnMixed) {
-    return this;
+  public void setBatchFlushOnMixed(boolean batchFlushOnMixed) {
   }
 
   /**
@@ -321,8 +313,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public Transaction setBatchSize(int batchSize) {
-    return this;
+  public void setBatchSize(int batchSize) {
   }
 
   @Override
@@ -331,8 +322,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public Transaction setBatchFlushOnQuery(boolean batchFlushOnQuery) {
-    return this;
+  public void setBatchFlushOnQuery(boolean batchFlushOnQuery) {
   }
 
   /**
@@ -546,7 +536,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
    * Mark the transaction as rollback only.
    */
   @Override
-  public Transaction setRollbackOnly() {
+  public void setRollbackOnly() {
     // expect AutoCommit so we can't really support rollbackOnly
     throw new IllegalStateException(notExpectedMessage);
   }
@@ -596,12 +586,11 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public Transaction setPersistCascade(boolean persistCascade) {
-    return this;
+  public void setPersistCascade(boolean persistCascade) {
   }
 
   @Override
-  public Transaction addModification(String tableName, boolean inserts, boolean updates, boolean deletes) {
+  public void addModification(String tableName, boolean inserts, boolean updates, boolean deletes) {
     throw new IllegalStateException(notExpectedMessage);
   }
 
@@ -611,12 +600,11 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public Transaction putUserObject(String name, Object value) {
+  public void putUserObject(String name, Object value) {
     if (userObjects == null) {
       userObjects = new HashMap<>();
     }
     userObjects.put(name, value);
-    return this;
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index d0b60fea9..322f70725 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -1,7 +1,6 @@
 package io.ebeaninternal.server.transaction;
 
 import io.ebean.ProfileLocation;
-import io.ebean.Transaction;
 import io.ebean.TransactionCallback;
 import io.ebean.annotation.DocStoreMode;
 import io.ebean.annotation.PersistBatch;
@@ -218,9 +217,8 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public Transaction setLabel(String label) {
+  public void setLabel(String label) {
     this.label = label;
-    return this;
   }
 
   @Override
@@ -290,9 +288,8 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public Transaction setSkipCache(boolean skipCache) {
+  public void setSkipCache(boolean skipCache) {
     this.skipCache = skipCache;
-    return this;
   }
 
   @Override
@@ -321,12 +318,11 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public Transaction register(TransactionCallback callback) {
+  public void register(TransactionCallback callback) {
     if (callbackList == null) {
       callbackList = new ArrayList<>(4);
     }
     callbackList.add(callback);
-    return this;
   }
 
   protected void firePreRollback() {
@@ -389,9 +385,8 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public Transaction setDocStoreBatchSize(int docStoreBatchSize) {
+  public void setDocStoreBatchSize(int docStoreBatchSize) {
     this.docStoreBatchSize = docStoreBatchSize;
-    return this;
   }
 
   @Override
@@ -400,9 +395,8 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public Transaction setDocStoreMode(DocStoreMode docStoreMode) {
+  public void setDocStoreMode(DocStoreMode docStoreMode) {
     this.docStoreMode = docStoreMode;
-    return this;
   }
 
   @Override
@@ -535,23 +529,21 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public Transaction setReadOnly(boolean readOnly) {
+  public void setReadOnly(boolean readOnly) {
     if (!isActive()) {
       throw new IllegalStateException(illegalStateMessage);
     }
     try {
       localReadOnly = readOnly;
       connection.setReadOnly(readOnly);
-      return this;
     } catch (SQLException e) {
       throw new PersistenceException(e);
     }
   }
 
   @Override
-  public Transaction setUpdateAllLoadedProperties(boolean updateAllLoadedProperties) {
+  public void setUpdateAllLoadedProperties(boolean updateAllLoadedProperties) {
     this.updateAllLoadedProperties = updateAllLoadedProperties;
-    return this;
   }
 
   @Override
@@ -560,21 +552,19 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public Transaction setBatchMode(boolean batchMode) {
+  public void setBatchMode(boolean batchMode) {
     if (!isActive()) {
       throw new IllegalStateException(illegalStateMessage);
     }
     this.batchMode = (batchMode) ? PersistBatch.ALL : PersistBatch.NONE;
-    return this;
   }
 
   @Override
-  public Transaction setBatch(PersistBatch batchMode) {
+  public void setBatch(PersistBatch batchMode) {
     if (!isActive()) {
       throw new IllegalStateException(illegalStateMessage);
     }
     this.batchMode = batchMode;
-    return this;
   }
 
   @Override
@@ -583,12 +573,11 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public Transaction setBatchOnCascade(PersistBatch batchOnCascadeMode) {
+  public void setBatchOnCascade(PersistBatch batchOnCascadeMode) {
     if (!isActive()) {
       throw new IllegalStateException(illegalStateMessage);
     }
     this.batchOnCascadeMode = batchOnCascadeMode;
-    return this;
   }
 
   @Override
@@ -602,21 +591,19 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public Transaction setBatchGetGeneratedKeys(boolean getGeneratedKeys) {
+  public void setBatchGetGeneratedKeys(boolean getGeneratedKeys) {
     this.batchGetGeneratedKeys = getGeneratedKeys;
     if (batchControl != null) {
       batchControl.setGetGeneratedKeys(getGeneratedKeys);
     }
-    return this;
   }
 
   @Override
-  public Transaction setBatchFlushOnMixed(boolean batchFlushOnMixed) {
+  public void setBatchFlushOnMixed(boolean batchFlushOnMixed) {
     this.batchFlushOnMixed = batchFlushOnMixed;
     if (batchControl != null) {
       batchControl.setBatchFlushOnMixed(batchFlushOnMixed);
     }
-    return this;
   }
 
   /**
@@ -631,12 +618,11 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public Transaction setBatchSize(int batchSize) {
+  public void setBatchSize(int batchSize) {
     this.batchSize = batchSize;
     if (batchControl != null) {
       batchControl.setBatchSize(batchSize);
     }
-    return this;
   }
 
   @Override
@@ -645,9 +631,8 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public Transaction setBatchFlushOnQuery(boolean batchFlushOnQuery) {
+  public void setBatchFlushOnQuery(boolean batchFlushOnQuery) {
     this.batchFlushOnQuery = batchFlushOnQuery;
-    return this;
   }
 
   /**
@@ -1128,9 +1113,8 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * Mark the transaction as rollback only.
    */
   @Override
-  public Transaction setRollbackOnly() {
+  public void setRollbackOnly() {
     this.rollbackOnly = true;
-    return this;
   }
 
   /**
@@ -1198,15 +1182,13 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public Transaction setPersistCascade(boolean persistCascade) {
+  public void setPersistCascade(boolean persistCascade) {
     this.persistCascade = persistCascade;
-    return this;
   }
 
   @Override
-  public Transaction addModification(String tableName, boolean inserts, boolean updates, boolean deletes) {
+  public void addModification(String tableName, boolean inserts, boolean updates, boolean deletes) {
     getEvent().add(tableName, inserts, updates, deletes);
-    return this;
   }
 
   @Override
@@ -1219,12 +1201,11 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public Transaction putUserObject(String name, Object value) {
+  public void putUserObject(String name, Object value) {
     if (userObjects == null) {
       userObjects = new HashMap<>();
     }
     userObjects.put(name, value);
-    return this;
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
index 73c6eb930..9ee156066 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
@@ -1,7 +1,6 @@
 package io.ebeaninternal.server.transaction;
 
 import io.ebean.ProfileLocation;
-import io.ebean.Transaction;
 import io.ebean.TransactionCallback;
 import io.ebean.annotation.DocStoreMode;
 import io.ebean.annotation.PersistBatch;
@@ -29,8 +28,8 @@ class NoTransaction implements SpiTransaction {
   static final NoTransaction INSTANCE = new NoTransaction();
 
   @Override
-  public Transaction setLabel(String label) {
-    return this;
+  public void setLabel(String label) {
+    // do nothing
   }
 
   @Override
@@ -151,8 +150,8 @@ class NoTransaction implements SpiTransaction {
   }
 
   @Override
-  public Transaction register(TransactionCallback callback) {
-    return this;
+  public void register(TransactionCallback callback) {
+
   }
 
   @Override
@@ -161,13 +160,13 @@ class NoTransaction implements SpiTransaction {
   }
 
   @Override
-  public Transaction setReadOnly(boolean readOnly) {
-    return this;
+  public void setReadOnly(boolean readOnly) {
+
   }
 
   @Override
-  public Transaction setRollbackOnly() {
-    return this;
+  public void setRollbackOnly() {
+
   }
 
   @Override
@@ -177,28 +176,28 @@ class NoTransaction implements SpiTransaction {
 
 
   @Override
-  public Transaction setDocStoreMode(DocStoreMode mode) {
-    return this;
+  public void setDocStoreMode(DocStoreMode mode) {
+
   }
 
   @Override
-  public Transaction setDocStoreBatchSize(int batchSize) {
-    return this;
+  public void setDocStoreBatchSize(int batchSize) {
+
   }
 
   @Override
-  public Transaction setPersistCascade(boolean persistCascade) {
-    return this;
+  public void setPersistCascade(boolean persistCascade) {
+
   }
 
   @Override
-  public Transaction setUpdateAllLoadedProperties(boolean updateAllLoadedProperties) {
-    return this;
+  public void setUpdateAllLoadedProperties(boolean updateAllLoadedProperties) {
+
   }
 
   @Override
-  public Transaction setSkipCache(boolean skipCache) {
-    return this;
+  public void setSkipCache(boolean skipCache) {
+
   }
 
   @Override
@@ -207,13 +206,13 @@ class NoTransaction implements SpiTransaction {
   }
 
   @Override
-  public Transaction setBatchMode(boolean useBatch) {
-    return this;
+  public void setBatchMode(boolean useBatch) {
+
   }
 
   @Override
-  public Transaction setBatch(PersistBatch persistBatchMode) {
-    return this;
+  public void setBatch(PersistBatch persistBatchMode) {
+
   }
 
   @Override
@@ -222,8 +221,8 @@ class NoTransaction implements SpiTransaction {
   }
 
   @Override
-  public Transaction setBatchOnCascade(PersistBatch batchOnCascadeMode) {
-    return this;
+  public void setBatchOnCascade(PersistBatch batchOnCascadeMode) {
+
   }
 
   @Override
@@ -232,8 +231,8 @@ class NoTransaction implements SpiTransaction {
   }
 
   @Override
-  public Transaction setBatchSize(int batchSize) {
-    return this;
+  public void setBatchSize(int batchSize) {
+
   }
 
   @Override
@@ -242,18 +241,18 @@ class NoTransaction implements SpiTransaction {
   }
 
   @Override
-  public Transaction setBatchGetGeneratedKeys(boolean getGeneratedKeys) {
-    return this;
+  public void setBatchGetGeneratedKeys(boolean getGeneratedKeys) {
+
   }
 
   @Override
-  public Transaction setBatchFlushOnMixed(boolean batchFlushOnMixed) {
-    return this;
+  public void setBatchFlushOnMixed(boolean batchFlushOnMixed) {
+
   }
 
   @Override
-  public Transaction setBatchFlushOnQuery(boolean batchFlushOnQuery) {
-    return this;
+  public void setBatchFlushOnQuery(boolean batchFlushOnQuery) {
+
   }
 
   @Override
@@ -277,13 +276,13 @@ class NoTransaction implements SpiTransaction {
   }
 
   @Override
-  public Transaction addModification(String tableName, boolean inserts, boolean updates, boolean deletes) {
-    return this;
+  public void addModification(String tableName, boolean inserts, boolean updates, boolean deletes) {
+
   }
 
   @Override
-  public Transaction putUserObject(String name, Object value) {
-    return this;
+  public void putUserObject(String name, Object value) {
+
   }
 
   @Override
diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
index 7b5d61ce4..7046d8c64 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
@@ -34,10 +34,10 @@ public class TestBatchInsertFlush extends BaseTestCase {
 
     Transaction transaction = server.beginTransaction();
     try {
-      transaction.setPersistCascade(false)
-        .setBatchSize(10)
-        .setBatch(PersistBatch.ALL)
-        .setLabel("TestBatchInsertFlush.no_cascade");
+      transaction.setPersistCascade(false);
+      transaction.setBatchSize(10);
+      transaction.setBatch(PersistBatch.ALL);
+      transaction.setLabel("TestBatchInsertFlush.no_cascade");
 
       LoggedSqlCollector.start();
 
diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java b/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java
index e73842925..0b90b4ffa 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java
@@ -130,9 +130,9 @@ public class TestBatchInsertSimple extends BaseTestCase {
 
     Transaction transaction = Ebean.beginTransaction();
     try {
-      transaction.setBatch(PersistBatch.NONE)
-        .setBatchOnCascade(PersistBatch.ALL)
-        .setBatchSize(20);
+      transaction.setBatch(PersistBatch.NONE);
+      transaction.setBatchOnCascade(PersistBatch.ALL);
+      transaction.setBatchSize(20);
 
       // escalate based on batchOnCascade value
       Ebean.saveAll(masters);
diff --git a/src/test/java/org/tests/transaction/TestSqlServerBatch.java b/src/test/java/org/tests/transaction/TestSqlServerBatch.java
index e2a716ef6..6b463236b 100644
--- a/src/test/java/org/tests/transaction/TestSqlServerBatch.java
+++ b/src/test/java/org/tests/transaction/TestSqlServerBatch.java
@@ -24,7 +24,8 @@ public class TestSqlServerBatch extends BaseTestCase {
 
     Transaction txn = Ebean.beginTransaction();
     try {
-      txn.setBatchMode(true).setBatchSize(3);
+      txn.setBatchMode(true);
+      txn.setBatchSize(3);
 
       for (int i = 0; i < 10; i++) {
         ESimple model = new ESimple();

From 91cb5a23fda77aa0e928be3f07202a4a88a00571 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 26 Feb 2018 00:37:54 +0100
Subject: [PATCH 0072/1036] Fix dbmigration (#1277)

ENH: Support adding a '-- Generated by' comment to DDL including version and timestamp
---
 src/main/java/io/ebean/Ebean.java             |  5 ++-
 .../java/io/ebean/EbeanServerFactory.java     |  4 ++
 src/main/java/io/ebean/EbeanVersion.java      | 43 +++++++++++++++++++
 .../io/ebean/config/DbMigrationConfig.java    | 23 ++++++++++
 .../ddlgeneration/BaseDdlHandler.java         |  9 +++-
 .../dbmigration/ddlgeneration/DdlHandler.java |  4 +-
 .../dbmigration/ddlgeneration/TableDdl.java   |  8 +++-
 .../ddlgeneration/platform/BaseTableDdl.java  |  8 +++-
 .../ddlgeneration/platform/PlatformDdl.java   | 15 +++++++
 .../dbmigration/model/CurrentModel.java       | 10 +++++
 .../dbmigration/model/PlatformDdlWriter.java  |  8 +++-
 .../model/build/ModelBuildBeanVisitor.java    |  4 +-
 .../build/ModelBuild_compoundKeyTest.java     |  4 +-
 .../ModelBuild_explicitSequencesTest.java     |  8 +++-
 .../migrationtest/db2/1.0__initial.sql        |  1 +
 .../dbmigration/migrationtest/db2/1.1.sql     |  1 +
 .../migrationtest/db2/1.2__dropsFor_1.1.sql   |  1 +
 .../dbmigration/migrationtest/db2/1.3.sql     |  1 +
 .../migrationtest/db2/1.4__dropsFor_1.3.sql   |  1 +
 .../migrationtest/h2/1.0__initial.sql         |  1 +
 .../dbmigration/migrationtest/h2/1.1.sql      |  1 +
 .../migrationtest/h2/1.2__dropsFor_1.1.sql    |  1 +
 .../dbmigration/migrationtest/h2/1.3.sql      |  1 +
 .../migrationtest/h2/1.4__dropsFor_1.3.sql    |  1 +
 .../migrationtest/hsqldb/1.0__initial.sql     |  1 +
 .../dbmigration/migrationtest/hsqldb/1.1.sql  |  1 +
 .../hsqldb/1.2__dropsFor_1.1.sql              |  1 +
 .../dbmigration/migrationtest/hsqldb/1.3.sql  |  1 +
 .../hsqldb/1.4__dropsFor_1.3.sql              |  1 +
 .../migrationtest/mysql/1.0__initial.sql      |  1 +
 .../dbmigration/migrationtest/mysql/1.1.sql   |  1 +
 .../migrationtest/mysql/1.2__dropsFor_1.1.sql |  1 +
 .../dbmigration/migrationtest/mysql/1.3.sql   |  1 +
 .../migrationtest/mysql/1.4__dropsFor_1.3.sql |  1 +
 .../migrationtest/oracle/1.0__initial.sql     |  1 +
 .../dbmigration/migrationtest/oracle/1.1.sql  |  1 +
 .../oracle/1.2__dropsFor_1.1.sql              |  1 +
 .../dbmigration/migrationtest/oracle/1.3.sql  |  1 +
 .../oracle/1.4__dropsFor_1.3.sql              |  1 +
 .../migrationtest/postgres/1.0__initial.sql   |  1 +
 .../migrationtest/postgres/1.1.sql            |  1 +
 .../postgres/1.2__dropsFor_1.1.sql            |  1 +
 .../migrationtest/postgres/1.3.sql            |  1 +
 .../postgres/1.4__dropsFor_1.3.sql            |  1 +
 .../migrationtest/sqlite/1.0__initial.sql     |  1 +
 .../dbmigration/migrationtest/sqlite/1.1.sql  |  1 +
 .../sqlite/1.2__dropsFor_1.1.sql              |  1 +
 .../dbmigration/migrationtest/sqlite/1.3.sql  |  1 +
 .../sqlite/1.4__dropsFor_1.3.sql              |  1 +
 .../migrationtest/sqlserver/1.0__initial.sql  |  1 +
 .../migrationtest/sqlserver/1.1.sql           |  1 +
 .../sqlserver/1.2__dropsFor_1.1.sql           |  2 +
 .../migrationtest/sqlserver/1.3.sql           |  1 +
 .../sqlserver/1.4__dropsFor_1.3.sql           |  2 +
 src/test/resources/ebean.properties           |  2 +
 55 files changed, 184 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/io/ebean/EbeanVersion.java

diff --git a/src/main/java/io/ebean/Ebean.java b/src/main/java/io/ebean/Ebean.java
index df48ce3ba..b29cbc3eb 100644
--- a/src/main/java/io/ebean/Ebean.java
+++ b/src/main/java/io/ebean/Ebean.java
@@ -113,7 +113,10 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public final class Ebean {
   private static final Logger logger = LoggerFactory.getLogger(Ebean.class);
-
+  static {
+    EbeanVersion.getVersion(); // initalizes the version class and logs the version.
+  }
+ 
   /**
    * Manages creation and cache of EbeanServers.
    */
diff --git a/src/main/java/io/ebean/EbeanServerFactory.java b/src/main/java/io/ebean/EbeanServerFactory.java
index 888b54647..0880dd25f 100644
--- a/src/main/java/io/ebean/EbeanServerFactory.java
+++ b/src/main/java/io/ebean/EbeanServerFactory.java
@@ -33,6 +33,10 @@ public class EbeanServerFactory {
 
   private static SpiContainer container;
 
+  static {
+    EbeanVersion.getVersion(); // initalizes the version class and logs the version.
+  }
+
   /**
    * Initialise the container with clustering configuration.
    * <p>
diff --git a/src/main/java/io/ebean/EbeanVersion.java b/src/main/java/io/ebean/EbeanVersion.java
new file mode 100644
index 000000000..caf1fc9eb
--- /dev/null
+++ b/src/main/java/io/ebean/EbeanVersion.java
@@ -0,0 +1,43 @@
+package io.ebean;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+/**
+ * Class to determine the ebean version. (
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+public class EbeanVersion {
+  private EbeanVersion() {
+    
+  }
+  private static final Logger logger = LoggerFactory.getLogger(EbeanVersion.class);
+  
+  private static String version = "unknown";
+  static {
+    try {
+      Properties prop = new Properties();
+      InputStream in = Ebean.class.getResourceAsStream("/META-INF/maven/io.ebean/ebean/pom.properties");
+      if (in != null) {
+        prop.load(in);
+        in.close();
+        version = prop.getProperty("version");
+      }
+      logger.info("ebean version: {}", version);
+    } catch (IOException e) {
+      logger.warn("Could not determine ebean version: {}", e.getMessage());
+    }
+  }
+  
+  /**
+   * Returns the ebean version (read from /META-INF/maven/io.ebean/ebean/pom.properties)
+   */
+  public static String getVersion() {
+    return version;
+  }
+  
+}
diff --git a/src/main/java/io/ebean/config/DbMigrationConfig.java b/src/main/java/io/ebean/config/DbMigrationConfig.java
index 9b1457e1f..21ad71f4e 100644
--- a/src/main/java/io/ebean/config/DbMigrationConfig.java
+++ b/src/main/java/io/ebean/config/DbMigrationConfig.java
@@ -1,11 +1,16 @@
 package io.ebean.config;
 
+import io.ebean.EbeanVersion;
 import io.ebean.annotation.Platform;
 import io.ebean.migration.MigrationConfig;
 import io.ebean.migration.MigrationRunner;
+import io.ebean.util.StringHelper;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Map;
 import java.util.Properties;
 
@@ -116,6 +121,11 @@ public class DbMigrationConfig {
    */
   protected boolean strictMode = true;
 
+  /**
+   * Contains the DDL-header information.
+   */
+  protected String ddlHeader;
+
   /**
    * Return the DB platform to generate migration DDL for.
    * <p>
@@ -387,6 +397,14 @@ public class DbMigrationConfig {
     return patchResetChecksumOn;
   }
 
+  /**
+   * Returns a DDL header prepend for each DDL. E.g. for copyright headers
+   * You can use placeholders like ${version} or ${timestamp} in properties file.
+   */
+  public String getDdlHeader() {
+    return ddlHeader;
+  }
+
   /**
    * Set migration versions that should have their checksum reset and not run.
    * <p>
@@ -454,6 +472,11 @@ public class DbMigrationConfig {
     String adminPwd = properties.get("datasource." + serverName + ".password", dbPassword);
     adminPwd = properties.get("datasource." + serverName + ".adminpassword", adminPwd);
     dbPassword = properties.get("migration.dbpassword", adminPwd);
+    ddlHeader = properties.get("ddl.header", ddlHeader);
+    if (ddlHeader != null && !ddlHeader.isEmpty()) {
+      ddlHeader = StringHelper.replaceString(ddlHeader, "${version}", EbeanVersion.getVersion());
+      ddlHeader = StringHelper.replaceString(ddlHeader, "${timestamp}", ZonedDateTime.now().format( DateTimeFormatter.ISO_INSTANT ));
+    }
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java
index d01e08adb..93a900b30 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java
@@ -66,8 +66,13 @@ public class BaseDdlHandler implements DdlHandler {
   }
 
   @Override
-  public void generateExtra(DdlWrite write) throws IOException {
-    tableDdl.generateExtra(write);
+  public void generateProlog(DdlWrite write) throws IOException {
+    tableDdl.generateProlog(write);
+  }
+
+  @Override
+  public void generateEpilog(DdlWrite write) throws IOException {
+    tableDdl.generateEpilog(write);
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlHandler.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlHandler.java
index 66d8c0fe1..f49cefbb1 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlHandler.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlHandler.java
@@ -41,5 +41,7 @@ public interface DdlHandler {
 
   void generate(DdlWrite writer, DropIndex dropIndex) throws IOException;
 
-  void generateExtra(DdlWrite write) throws IOException;
+  void generateProlog(DdlWrite write) throws IOException;
+
+  void generateEpilog(DdlWrite write) throws IOException;
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java
index 263c9e136..f938b0b89 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java
@@ -68,8 +68,14 @@ public interface TableDdl {
    */
   void generate(DdlWrite writer, DropIndex dropIndex) throws IOException;
 
+  /**
+  /**
+   * Generate any extra DDL such as stored procedures or TableValueParameters.
+   */
+  void generateProlog(DdlWrite write) throws IOException;
+
   /**
    * Generate any extra DDL such as regeneration of history triggers.
    */
-  void generateExtra(DdlWrite write) throws IOException;
+  void generateEpilog(DdlWrite write) throws IOException;
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
index d94c59837..455c802e8 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
@@ -656,14 +656,20 @@ public class BaseTableDdl implements TableDdl {
     platformDdl.dropHistoryTable(writer, dropHistoryTable);
   }
 
+  @Override
+  public void generateProlog(DdlWrite write) throws IOException {
+    platformDdl.generateProlog(write);
+  }
+
   /**
    * Called at the end to generate additional ddl such as regenerate history triggers.
    */
   @Override
-  public void generateExtra(DdlWrite write) throws IOException {
+  public void generateEpilog(DdlWrite write) throws IOException {
     for (HistoryTableUpdate update : this.regenerateHistoryTriggers.values()) {
       platformDdl.regenerateHistoryTriggers(write, update);
     }
+    platformDdl.generateEpilog(write);
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
index 66e5e64e0..af7d41453 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -617,4 +617,19 @@ public class PlatformDdl {
     }
     apply.append(String.format("comment on column %s.%s is '%s'", table, column, comment)).endOfStatement();
   }
+
+  /**
+   * Use this to generate a prolog for each script (stored procedures)
+   */
+  public void generateProlog(DdlWrite write) throws IOException {
+
+  }
+
+  /**
+   * Use this to generate an epilog. Will be added at the end of script
+   */
+  public void generateEpilog(DdlWrite write) throws IOException {
+
+  }
+
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java b/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
index c3b70769f..a90a56fb7 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
@@ -107,6 +107,10 @@ public class CurrentModel {
     createDdl();
 
     StringBuilder ddl = new StringBuilder(2000);
+    String header = server.getServerConfig().getMigrationConfig().getDdlHeader();
+    if (header != null && !header.isEmpty()) {
+      ddl.append(header).append('\n');
+    }
     ddl.append(write.apply().getBuffer());
     ddl.append(write.applyForeignKeys().getBuffer());
     ddl.append(write.applyHistory().getBuffer());
@@ -122,6 +126,10 @@ public class CurrentModel {
     createDdl();
 
     StringBuilder ddl = new StringBuilder(2000);
+    String header = server.getServerConfig().getMigrationConfig().getDdlHeader();
+    if (header != null && !header.isEmpty()) {
+      ddl.append(header).append('\n');
+    }
     ddl.append(write.dropAllForeignKeys().getBuffer());
     ddl.append(write.dropAll().getBuffer());
 
@@ -139,7 +147,9 @@ public class CurrentModel {
       write = new DdlWrite(new MConfiguration(), model);
 
       DdlHandler handler = handler();
+      handler.generateProlog(write);
       handler.generate(write, createChangeSet);
+      handler.generateEpilog(write);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java b/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java
index facb992de..4529e0975 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java
@@ -45,14 +45,14 @@ public class PlatformDdlWriter {
   public void processMigration(Migration dbMigration, DdlWrite write, File writePath, String fullVersion) throws IOException {
 
     DdlHandler handler = handler();
-
+    handler.generateProlog(write);
     List<ChangeSet> changeSets = dbMigration.getChangeSet();
     for (ChangeSet changeSet : changeSets) {
       if (isApply(changeSet)) {
         handler.generate(write, changeSet);
       }
     }
-    handler.generateExtra(write);
+    handler.generateEpilog(write);
 
     writePlatformDdl(write, writePath, fullVersion);
   }
@@ -88,6 +88,10 @@ public class PlatformDdlWriter {
    */
   protected void writeApplyDdl(Writer writer, DdlWrite write) throws IOException {
 
+    String header = config.getDdlHeader();
+    if (header != null) {
+      writer.append(header).append('\n');
+    }
     // merge the apply buffers in the appropriate order
     prependDropDependencies(writer, write.applyDropDependencies());
     writer.append("-- apply changes\n");
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitor.java b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitor.java
index bc96b0c87..74a7dd856 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitor.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitor.java
@@ -90,7 +90,9 @@ public class ModelBuildBeanVisitor implements BeanVisitor {
     if (!descriptor.isIdTypePlatformDefault() || initialValue > 0 || allocationSize > 0) {
       // explicitly set to use sequence or identity (generally not recommended practice)
       if (IdType.IDENTITY == descriptor.getIdType()) {
-        table.setIdentityType(IdentityType.IDENTITY);
+        if (!descriptor.isIdTypePlatformDefault()) {
+          table.setIdentityType(IdentityType.IDENTITY);
+        }
       } else {
         // explicit sequence defined
         table.setIdentityType(IdentityType.SEQUENCE);
diff --git a/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compoundKeyTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compoundKeyTest.java
index 1b29121fa..b62dae809 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compoundKeyTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compoundKeyTest.java
@@ -63,7 +63,7 @@ public class ModelBuild_compoundKeyTest extends BaseTestCase {
     String apply = Helper.asText(this, "/assert/ModelBuild_compoundKeyTest/apply.sql");
 
     String createDdl = currentModel.getCreateDdl();
-    assertThat(createDdl).isEqualTo(apply);
+    assertThat(createDdl).startsWith("-- Generated by ebean").endsWith(apply);
 
   }
 
@@ -81,6 +81,6 @@ public class ModelBuild_compoundKeyTest extends BaseTestCase {
     String createDdl = currentModel.getCreateDdl();
     String apply = Helper.asText(this, "/assert/ModelBuild_compoundKeyTest/apply.sql");
 
-    assertThat(createDdl).isEqualTo(apply);
+    assertThat(createDdl).startsWith("-- Generated by ebean").endsWith(apply);
   }
 }
diff --git a/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_explicitSequencesTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_explicitSequencesTest.java
index b2f37df0a..6e699e4de 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_explicitSequencesTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_explicitSequencesTest.java
@@ -45,7 +45,9 @@ public class ModelBuild_explicitSequencesTest extends BaseTestCase {
     CurrentModel currentModel = new CurrentModel(ebeanServer);
 
     String apply = currentModel.getCreateDdl();
-    assertThat(apply).isEqualTo(Helper.asText(this, "/assert/ModelBuild_explicitSequencesTest/apply.sql"));
+    assertThat(apply)
+      .startsWith("-- Generated by ebean")
+      .endsWith(Helper.asText(this, "/assert/ModelBuild_explicitSequencesTest/apply.sql"));
 
   }
 
@@ -56,7 +58,9 @@ public class ModelBuild_explicitSequencesTest extends BaseTestCase {
     CurrentModel currentModel = new CurrentModel(ebeanServer);
 
     String apply = currentModel.getCreateDdl();
-    assertThat(apply).isEqualTo(Helper.asText(this, "/assert/ModelBuild_explicitSequencesTest/pg-apply.sql"));
+    assertThat(apply)
+      .startsWith("-- Generated by ebean")
+      .endsWith(Helper.asText(this,  "/assert/ModelBuild_explicitSequencesTest/pg-apply.sql"));
 
   }
 
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
index ac49b8e02..a2eb29cff 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_e_basic (
   id                            integer generated by default as identity not null,
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.1.sql b/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
index 6e54e10e2..a87c144d6 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_e_user (
   id                            integer generated by default as identity not null,
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/db2/1.2__dropsFor_1.1.sql
index 81b4fe749..602c2d381 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.2__dropsFor_1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.2__dropsFor_1.1.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 alter table migtest_e_basic drop column old_boolean;
 
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.3.sql b/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
index e1ff6206a..5c2deaf38 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_e_ref (
   id                            integer generated by default as identity not null,
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql
index f4cb4ebd8..493c72e93 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 alter table migtest_e_basic drop column new_string_field;
 
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
index 60dc196b2..b03ff9e59 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_e_basic (
   id                            integer auto_increment not null,
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.1.sql b/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
index 88dc14a3d..eb40d76f3 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_e_user (
   id                            integer auto_increment not null,
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/h2/1.2__dropsFor_1.1.sql
index 652aa4dcb..057cfb3f3 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.2__dropsFor_1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.2__dropsFor_1.1.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 alter table migtest_e_basic drop column old_boolean;
 
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.3.sql b/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
index 3c1834cc4..47191bda1 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_e_ref (
   id                            integer auto_increment not null,
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql
index ca2eda59b..fec1ee7a8 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- drop dependencies
 drop trigger migtest_e_history_history_upd;
 drop view migtest_e_history_with_history;
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
index b5ba4b578..40bdf0daa 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_e_basic (
   id                            integer generated by default as identity (start with 1)  not null,
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
index b83f9267e..f258c4c21 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_e_user (
   id                            integer generated by default as identity (start with 1)  not null,
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.2__dropsFor_1.1.sql
index 652aa4dcb..057cfb3f3 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.2__dropsFor_1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.2__dropsFor_1.1.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 alter table migtest_e_basic drop column old_boolean;
 
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
index 29dae3bf0..3dec87912 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_e_ref (
   id                            integer generated by default as identity (start with 1)  not null,
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql
index 9e22e4a76..91d85f62b 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 alter table migtest_e_basic drop column new_string_field;
 
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
index d0cd55dbd..c7136f74c 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_e_basic (
   id                            integer auto_increment not null,
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
index 3299a9517..7b9e7054b 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_e_user (
   id                            integer auto_increment not null,
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.2__dropsFor_1.1.sql
index 05a3f449e..0c6ddbf56 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.2__dropsFor_1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.2__dropsFor_1.1.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 alter table migtest_e_basic drop column old_boolean;
 
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
index 90f5f63d6..b325b79ae 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_e_ref (
   id                            integer auto_increment not null,
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql
index f7207d883..41953acfe 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- drop dependencies
 drop trigger migtest_e_history_history_upd;
 drop trigger migtest_e_history_history_del;
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
index 9cb945a13..75b731c36 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_e_basic (
   id                            number(10) not null,
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
index 23faa95f0..6b7829121 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_e_user (
   id                            number(10) not null,
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.2__dropsFor_1.1.sql
index 0e8f695a2..9851e7f65 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.2__dropsFor_1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.2__dropsFor_1.1.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 alter table migtest_e_basic drop column old_boolean;
 
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
index ab7ac0adc..e511427bb 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_e_ref (
   id                            number(10) not null,
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql
index 5337f9fe6..d5272cd51 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 alter table migtest_e_basic drop column new_string_field;
 
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
index 09be87a42..37a24ed33 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_e_basic (
   id                            serial not null,
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
index 6838be60f..4bb9858ba 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- drop dependencies
 drop view if exists migtest_e_history2_with_history;
 
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql
index b6fdce9f1..7917b78da 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 alter table migtest_e_basic drop column old_boolean;
 
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
index 7dc779bc8..059350256 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_e_ref (
   id                            serial not null,
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql
index 105207717..34086204d 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- drop dependencies
 drop trigger if exists migtest_e_history_history_upd on migtest_e_history cascade;
 drop function if exists migtest_e_history_history_version();
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
index fb9e4c859..8145120ce 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_e_basic (
   id                            integer not null,
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
index c649f78b8..e664099c4 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_e_user (
   id                            integer not null,
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.2__dropsFor_1.1.sql
index 05a3f449e..0c6ddbf56 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.2__dropsFor_1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.2__dropsFor_1.1.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 alter table migtest_e_basic drop column old_boolean;
 
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
index 7593d6696..85c1872c4 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_e_ref (
   id                            integer not null,
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql
index 957772584..12531750d 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 alter table migtest_e_basic drop column new_string_field;
 
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql
index 7c8eb6b47..dabb1f219 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_e_basic (
   id                            integer identity(1,1) not null,
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql
index 07aaf23d4..f8d092588 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_e_user (
   id                            integer identity(1,1) not null,
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.2__dropsFor_1.1.sql
index b0b4bdf40..d3a7a9a24 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.2__dropsFor_1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.2__dropsFor_1.1.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 -- drop column migtest_e_basic.old_boolean;
 IF (OBJECT_ID('uq_migtest_e_basic_old_boolean', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_old_boolean;
@@ -39,3 +40,4 @@ IF OBJECT_ID('fk_migtest_e_basic_eref_id', 'F') IS NOT NULL alter table migtest_
 alter table migtest_e_basic drop column eref_id;
 
 IF OBJECT_ID('migtest_e_ref', 'U') IS NOT NULL drop table migtest_e_ref;
+IF OBJECT_ID('migtest_e_ref_seq', 'SO') IS NOT NULL drop sequence migtest_e_ref_seq;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql
index 3700d2298..1fadd3ad6 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_e_ref (
   id                            integer identity(1,1) not null,
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.4__dropsFor_1.3.sql
index 8d4df2e09..745ec6bd2 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.4__dropsFor_1.3.sql
@@ -1,3 +1,4 @@
+-- Migrationscripts for ebean unittest
 -- apply changes
 -- drop column migtest_e_basic.new_string_field;
 IF (OBJECT_ID('uq_migtest_e_basic_new_string_field', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_new_string_field;
@@ -104,6 +105,7 @@ IF OBJECT_ID('fk_migtest_e_softdelete_deleted', 'F') IS NOT NULL alter table mig
 alter table migtest_e_softdelete drop column deleted;
 
 IF OBJECT_ID('migtest_e_user', 'U') IS NOT NULL drop table migtest_e_user;
+IF OBJECT_ID('migtest_e_user_seq', 'SO') IS NOT NULL drop sequence migtest_e_user_seq;
 -- dropping history support for migtest_e_history;
 delimiter $$
 DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 22eb59a86..de6dedf71 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -18,6 +18,7 @@ ebean.encryptKeyManager=org.tests.basic.encrypt.BasicEncyptKeyManager
 ebean.sqlserver.ddl.createOnly=true
 ebean.ddl.generate=true
 ebean.ddl.run=true
+ebean.ddl.header=-- Generated by ebean ${version} at ${timestamp}
 ebean.packages=org.tests
 datasource.default=h2
 
@@ -152,6 +153,7 @@ datasource.migrationtest.databaseDriver=org.h2.Driver
 ebean.migrationtest.applyPrefix=V
 ebean.migrationtest.ddl.generate=false
 ebean.migrationtest.ddl.run=false
+ebean.migrationtest.ddl.header=-- Migrationscripts for ebean unittest
 ebean.migrationtest.migration.appName=migrationtest
 ebean.migrationtest.migration.migrationPath=dbmigration/migrationtest
 ebean.migrationtest.migration.strict=true

From 347225efb21347ab57f25c88f09b47515ad66f12 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 26 Feb 2018 13:16:20 +1300
Subject: [PATCH 0073/1036] #1278 - Multi-tenant delete by id ... doesn't
 return 0 when no rows deleted

---
 .../server/core/DefaultServer.java            |  7 ++-
 .../ebeaninternal/server/core/Persister.java  |  2 +-
 .../server/persist/DefaultPersister.java      | 56 +++++++++++--------
 .../partition/MultiTenantPartitionTest.java   | 11 +++-
 4 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 1fce54334..90c78b0dc 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -1741,7 +1741,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   }
 
   private int deleteAll(Class<?> beanType, Collection<?> ids, Transaction transaction, boolean permanent) {
-
     return executeInTrans((txn) -> persister.deleteMany(beanType, ids, txn, permanent), transaction);
   }
 
@@ -1758,7 +1757,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    */
   @Override
   public boolean delete(Object bean, Transaction t) throws OptimisticLockException {
-    return persister.delete(checkEntityBean(bean), t, false);
+    // this should really return an int where -1 means jdbc batch/unknown
+    return persister.delete(checkEntityBean(bean), t, false) == 1;
   }
 
   @Override
@@ -1768,7 +1768,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   @Override
   public boolean deletePermanent(Object bean, Transaction t) throws OptimisticLockException {
-    return persister.delete(checkEntityBean(bean), t, true);
+    // this should really return an int where -1 means jdbc batch/unknown
+    return persister.delete(checkEntityBean(bean), t, true) == 1;
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/core/Persister.java b/src/main/java/io/ebeaninternal/server/core/Persister.java
index ea6155cb5..f6044d040 100644
--- a/src/main/java/io/ebeaninternal/server/core/Persister.java
+++ b/src/main/java/io/ebeaninternal/server/core/Persister.java
@@ -46,7 +46,7 @@ public interface Persister {
   /**
    * Delete the bean.
    */
-  boolean delete(EntityBean entityBean, Transaction t, boolean permanent);
+  int delete(EntityBean entityBean, Transaction t, boolean permanent);
 
   /**
    * Delete multiple beans given a collection of Id values.
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index cbf9aba38..7343a8ac5 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -335,10 +335,9 @@ public final class DefaultPersister implements Persister {
   /**
    * Recursively delete the bean. This calls back to the EbeanServer.
    */
-  private void deleteRecurse(EntityBean detailBean, Transaction t, boolean softDelete) {
-
+  private int deleteRecurse(EntityBean detailBean, Transaction t, boolean softDelete) {
     Type deleteType = softDelete ? Type.SOFT_DELETE : Type.DELETE_PERMANENT;
-    deleteRequest(createRequest(detailBean, t, deleteType));
+    return deleteRequest(createRequest(detailBean, t, deleteType));
   }
 
   /**
@@ -505,7 +504,7 @@ public final class DefaultPersister implements Persister {
    * Return false if the delete is executed without OCC and 0 rows were deleted.
    */
   @Override
-  public boolean delete(EntityBean bean, Transaction t, boolean permanent) {
+  public int delete(EntityBean bean, Transaction t, boolean permanent) {
 
     Type deleteType = permanent ? Type.DELETE_PERMANENT : Type.DELETE;
     PersistRequestBean<EntityBean> originalRequest = createRequest(bean, t, deleteType);
@@ -524,7 +523,7 @@ public final class DefaultPersister implements Persister {
   /**
    * Execute the delete request returning true if a delete occurred.
    */
-  private boolean deleteRequest(PersistRequestBean<?> req) {
+  private int deleteRequest(PersistRequestBean<?> req) {
     return deleteRequest(req, null);
   }
 
@@ -532,7 +531,7 @@ public final class DefaultPersister implements Persister {
    * Execute the delete request support a second delete request for live and draft permanent delete.
    * A common transaction is used across both requests.
    */
-  private boolean deleteRequest(PersistRequestBean<?> req, PersistRequestBean<?> draftReq) {
+  private int deleteRequest(PersistRequestBean<?> req, PersistRequestBean<?> draftReq) {
 
     if (req.isRegisteredForDeleteBean()) {
       // skip deleting bean. Used where cascade is on
@@ -540,21 +539,21 @@ public final class DefaultPersister implements Persister {
       if (logger.isDebugEnabled()) {
         logger.debug("skipping delete on alreadyRegistered " + req.getBean());
       }
-      return false;
+      return 0;
     }
 
     try {
       req.initTransIfRequiredWithBatchCascade();
-      boolean deleted = delete(req);
+      int rows = delete(req);
       if (draftReq != null) {
         // delete the 'draft' bean ('live' bean deleted first)
         draftReq.setTrans(req.getTransaction());
-        deleted = delete(draftReq);
+        rows = delete(draftReq);
       }
       req.commitTransIfRequired();
       req.flushBatchOnCascade();
 
-      return deleted;
+      return rows;
 
     } catch (RuntimeException ex) {
       req.rollbackTransIfRequired();
@@ -581,13 +580,7 @@ public final class DefaultPersister implements Persister {
     BeanDescriptor<?> descriptor = beanDescriptorManager.getBeanDescriptor(beanType);
     boolean softDelete = !permanent && descriptor.isSoftDelete();
     if (descriptor.isMultiTenant()) {
-      // convert to a delete by bean
-      for (Object id : ids) {
-        EntityBean bean = descriptor.createEntityBean();
-        descriptor.convertSetId(id, bean);
-        deleteRecurse(bean, transaction, permanent);
-      }
-      return ids.size();
+      return deleteAsBeans(ids, transaction, permanent, descriptor);
     }
 
     ArrayList<Object> idList = new ArrayList<>(ids.size());
@@ -599,6 +592,25 @@ public final class DefaultPersister implements Persister {
     return delete(descriptor, null, idList, transaction, softDelete);
   }
 
+  /**
+   * Convert delete by Ids into delete many beans.
+   */
+  private int deleteAsBeans(Collection<?> ids, Transaction transaction, boolean permanent, BeanDescriptor<?> descriptor) {
+    // convert to a delete by bean
+    int total = 0;
+    for (Object id : ids) {
+      EntityBean bean = descriptor.createEntityBean();
+      descriptor.convertSetId(id, bean);
+      int rowCount = deleteRecurse(bean, transaction, permanent);
+      if (rowCount == -1) {
+        total = -1;
+      } else if (total != -1){
+        total += rowCount;
+      }
+    }
+    return total;
+  }
+
   /**
    * Delete by Id.
    */
@@ -609,8 +621,7 @@ public final class DefaultPersister implements Persister {
       // convert to a delete by bean
       EntityBean bean = descriptor.createEntityBean();
       descriptor.convertSetId(id, bean);
-      delete(bean, transaction, permanent);
-      return 1;
+      return delete(bean, transaction, permanent);
     }
 
     id = descriptor.convertId(id);
@@ -649,8 +660,7 @@ public final class DefaultPersister implements Persister {
           if (bean == null) {
             return 0;
           } else {
-            deleteRecurse(bean, t, softDelete);
-            return 1;
+            return deleteRecurse(bean, t, softDelete);
           }
         }
       }
@@ -782,7 +792,7 @@ public final class DefaultPersister implements Persister {
    * Note that preDelete fires before the deletion of children.
    * </p>
    */
-  private boolean delete(PersistRequestBean<?> request) {
+  private int delete(PersistRequestBean<?> request) {
 
     DeleteUnloadedForeignKeys unloadedForeignKeys = null;
 
@@ -812,7 +822,7 @@ public final class DefaultPersister implements Persister {
     }
 
     // return true if using JDBC batch (as we can't tell until the batch is flushed)
-    return count != 0;
+    return count;
   }
 
   /**
diff --git a/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java b/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java
index 2625266ef..9104c0179 100644
--- a/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java
+++ b/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java
@@ -66,10 +66,14 @@ public class MultiTenantPartitionTest {
     server.save(content);
 
     LoggedSqlCollector.start();
-    server.delete(MtContent.class, content.getId());
+    int rows = server.delete(MtContent.class, content.getId());
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql.get(0)).contains("delete from mt_content where id=? and tenant_id=?");
+    assertThat(rows).isEqualTo(1);
+
+    rows = server.delete(MtContent.class, 99999);
+    assertThat(rows).isEqualTo(0);
   }
 
   @Test
@@ -81,10 +85,11 @@ public class MultiTenantPartitionTest {
     MtContent b = newContent("title b");
 
 
-    List<Long> ids = Arrays.asList(a.getId(), b.getId());
+    List<Long> ids = Arrays.asList(a.getId(), b.getId(), 99998L);
 
     LoggedSqlCollector.start();
-    server.deleteAll(MtContent.class, ids);
+    int rows = server.deleteAll(MtContent.class, ids);
+    assertThat(rows).isEqualTo(2);
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql.get(0)).contains("delete from mt_content where id=? and tenant_id=?");

From 1c19d4cf7e69ed5e69a9eba0b69ba78e36610df0 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 26 Feb 2018 13:20:49 +1300
Subject: [PATCH 0074/1036] #1278 - Multi-tenant delete by id ... doesn't
 return 0 when no rows deleted

Where -1 (jdbc batch) is returned as true as per current behaviour
---
 src/main/java/io/ebeaninternal/server/core/DefaultServer.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 90c78b0dc..927620ae9 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -1758,7 +1758,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   @Override
   public boolean delete(Object bean, Transaction t) throws OptimisticLockException {
     // this should really return an int where -1 means jdbc batch/unknown
-    return persister.delete(checkEntityBean(bean), t, false) == 1;
+    return persister.delete(checkEntityBean(bean), t, false) != 0;
   }
 
   @Override
@@ -1769,7 +1769,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   @Override
   public boolean deletePermanent(Object bean, Transaction t) throws OptimisticLockException {
     // this should really return an int where -1 means jdbc batch/unknown
-    return persister.delete(checkEntityBean(bean), t, true) == 1;
+    return persister.delete(checkEntityBean(bean), t, true) != 0;
   }
 
   @Override

From a64a244745a970ec2a1f912298b9b4f00066cc13 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 26 Feb 2018 13:26:26 +1300
Subject: [PATCH 0075/1036] Bump pom to 11.12.1-SNAPSHOT (Event listener change
 #1063, Yaml properties change #1246)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b83d0f88f..caa46ead1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.11.2-SNAPSHOT</version>
+  <version>11.12.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>

From da7bb834e7b0fcb34ce97182f1c3b438aaa6e76f Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 26 Feb 2018 02:24:52 +0100
Subject: [PATCH 0076/1036] DbMigration supports altering UniqueConstraints and
 foreign keys (#1279)

* NEW: Ebean reads version from pop.properties and prints it at start up

* DDL generation and migration can append a header and platformMigration is prepared to append epilog & prolog to scripts

* FIX: Set identity only, if it is not the platform default type

* Updated reference scripts

* ADD basic support for foreign key migration

* DbMigration detects alter foreign keys

* tests
---
 .../ddlgeneration/BaseDdlHandler.java         |  15 ++
 .../dbmigration/ddlgeneration/DdlHandler.java |   6 +
 .../dbmigration/ddlgeneration/TableDdl.java   |  12 ++
 .../ddlgeneration/platform/BaseTableDdl.java  |  45 +++-
 .../ddlgeneration/platform/DB2Ddl.java        |   8 +-
 .../ddlgeneration/platform/DdlHelp.java       |  33 ++-
 .../ddlgeneration/platform/MySqlDdl.java      |   9 +
 .../ddlgeneration/platform/Oracle10Ddl.java   |  10 +
 .../ddlgeneration/platform/PlatformDdl.java   |   2 +-
 .../ddlgeneration/platform/SqlServerDdl.java  |   8 +-
 .../platform/WriteForeignKey.java             |  12 ++
 .../migration/AddUniqueConstraint.java        | 137 ++++++++++++
 .../migration/AlterForeignKey.java            | 199 ++++++++++++++++++
 .../dbmigration/migration/ChangeSet.java      |   4 +-
 .../dbmigration/migration/ObjectFactory.java  |  12 ++
 .../migration/UniqueConstraint.java           |  45 ++++
 .../dbmigration/model/MColumn.java            |  17 +-
 .../model/MCompoundForeignKey.java            |  49 +++++
 .../model/MCompoundUniqueConstraint.java      |  82 ++++++++
 .../dbmigration/model/MTable.java             | 124 +++++++++--
 .../dbmigration/model/ModelContainer.java     |  35 +++
 .../dbmigration/model/ModelDiff.java          |  16 ++
 .../build/ModelBuildPropertyVisitor.java      |   2 +
 .../server/query/CQueryBuilder.java           |   4 +
 .../dbmigration/DbMigrationTest.java          |  90 +++++---
 .../java/misc/migration/v1_0/DfkCascade.java  |  22 ++
 .../misc/migration/v1_0/DfkCascadeOne.java    |  21 ++
 .../java/misc/migration/v1_0/DfkNone.java     |  21 ++
 .../misc/migration/v1_0/DfkNoneViaJoin.java   |  22 ++
 src/test/java/misc/migration/v1_0/DfkOne.java |  13 ++
 .../java/misc/migration/v1_0/DfkSetNull.java  |  22 ++
 .../java/misc/migration/v1_1/DfkCascade.java  |  22 ++
 .../misc/migration/v1_1/DfkCascadeOne.java    |  21 ++
 .../java/misc/migration/v1_1/DfkNone.java     |  21 ++
 .../misc/migration/v1_1/DfkNoneViaJoin.java   |  22 ++
 src/test/java/misc/migration/v1_1/DfkOne.java |  13 ++
 .../java/misc/migration/v1_1/DfkSetNull.java  |  22 ++
 .../java/misc/migration/v1_2/DfkCascade.java  |  22 ++
 .../misc/migration/v1_2/DfkCascadeOne.java    |  21 ++
 .../java/misc/migration/v1_2/DfkNone.java     |  21 ++
 .../misc/migration/v1_2/DfkNoneViaJoin.java   |  22 ++
 src/test/java/misc/migration/v1_2/DfkOne.java |  13 ++
 .../java/misc/migration/v1_2/DfkSetNull.java  |  22 ++
 .../migrationtest/db2/1.0__initial.sql        |  40 ++++
 .../dbmigration/migrationtest/db2/1.1.sql     |  11 +
 .../dbmigration/migrationtest/db2/1.3.sql     |  11 +
 .../migrationtest/h2/1.0__initial.sql         |  40 ++++
 .../dbmigration/migrationtest/h2/1.1.sql      |  11 +
 .../dbmigration/migrationtest/h2/1.3.sql      |  11 +
 .../migrationtest/hsqldb/1.0__initial.sql     |  40 ++++
 .../dbmigration/migrationtest/hsqldb/1.1.sql  |  11 +
 .../dbmigration/migrationtest/hsqldb/1.3.sql  |  11 +
 .../model/1.0__initial.model.xml              |  26 ++-
 .../migrationtest/model/1.1.model.xml         |   9 +
 .../migrationtest/model/1.3.model.xml         |   9 +
 .../migrationtest/mysql/1.0__initial.sql      |  40 ++++
 .../dbmigration/migrationtest/mysql/1.1.sql   |  12 +-
 .../dbmigration/migrationtest/mysql/1.3.sql   |  14 +-
 .../migrationtest/oracle/1.0__initial.sql     |  46 ++++
 .../dbmigration/migrationtest/oracle/1.1.sql  |  13 +-
 .../dbmigration/migrationtest/oracle/1.3.sql  |  11 +
 .../migrationtest/postgres/1.0__initial.sql   |  40 ++++
 .../migrationtest/postgres/1.1.sql            |  11 +
 .../migrationtest/postgres/1.3.sql            |  11 +
 .../migrationtest/sqlite/1.0__initial.sql     |  36 ++++
 .../dbmigration/migrationtest/sqlite/1.1.sql  |   7 +
 .../dbmigration/migrationtest/sqlite/1.3.sql  |   9 +
 .../migrationtest/sqlserver/1.0__initial.sql  |  40 ++++
 .../migrationtest/sqlserver/1.1.sql           |  13 ++
 .../migrationtest/sqlserver/1.3.sql           |  14 ++
 70 files changed, 1806 insertions(+), 80 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java
 create mode 100644 src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java
 create mode 100644 src/test/java/misc/migration/v1_0/DfkCascade.java
 create mode 100644 src/test/java/misc/migration/v1_0/DfkCascadeOne.java
 create mode 100644 src/test/java/misc/migration/v1_0/DfkNone.java
 create mode 100644 src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java
 create mode 100644 src/test/java/misc/migration/v1_0/DfkOne.java
 create mode 100644 src/test/java/misc/migration/v1_0/DfkSetNull.java
 create mode 100644 src/test/java/misc/migration/v1_1/DfkCascade.java
 create mode 100644 src/test/java/misc/migration/v1_1/DfkCascadeOne.java
 create mode 100644 src/test/java/misc/migration/v1_1/DfkNone.java
 create mode 100644 src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java
 create mode 100644 src/test/java/misc/migration/v1_1/DfkOne.java
 create mode 100644 src/test/java/misc/migration/v1_1/DfkSetNull.java
 create mode 100644 src/test/java/misc/migration/v1_2/DfkCascade.java
 create mode 100644 src/test/java/misc/migration/v1_2/DfkCascadeOne.java
 create mode 100644 src/test/java/misc/migration/v1_2/DfkNone.java
 create mode 100644 src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java
 create mode 100644 src/test/java/misc/migration/v1_2/DfkOne.java
 create mode 100644 src/test/java/misc/migration/v1_2/DfkSetNull.java

diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java
index 93a900b30..ac5f64557 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java
@@ -6,7 +6,9 @@ import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl;
 import io.ebeaninternal.dbmigration.migration.AddColumn;
 import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
 import io.ebeaninternal.dbmigration.migration.AddTableComment;
+import io.ebeaninternal.dbmigration.migration.AddUniqueConstraint;
 import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.AlterForeignKey;
 import io.ebeaninternal.dbmigration.migration.ChangeSet;
 import io.ebeaninternal.dbmigration.migration.CreateIndex;
 import io.ebeaninternal.dbmigration.migration.CreateTable;
@@ -59,6 +61,10 @@ public class BaseDdlHandler implements DdlHandler {
         generate(writer, (AddHistoryTable) change);
       } else if (change instanceof DropHistoryTable) {
         generate(writer, (DropHistoryTable) change);
+      } else if (change instanceof AddUniqueConstraint) {
+        generate(writer, (AddUniqueConstraint) change);
+      } else if (change instanceof AlterForeignKey) {
+        generate(writer, (AlterForeignKey) change);
       } else {
         throw new IllegalArgumentException("Unsupported change: " + change);
       }
@@ -125,4 +131,13 @@ public class BaseDdlHandler implements DdlHandler {
     tableDdl.generate(writer, dropIndex);
   }
 
+  @Override
+  public void generate(DdlWrite writer, AddUniqueConstraint constraint) throws IOException {
+    tableDdl.generate(writer, constraint);
+  }
+
+  @Override
+  public void generate(DdlWrite writer, AlterForeignKey alterForeignKey) throws IOException {
+    tableDdl.generate(writer, alterForeignKey);
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlHandler.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlHandler.java
index f49cefbb1..9a693640f 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlHandler.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlHandler.java
@@ -3,7 +3,9 @@ package io.ebeaninternal.dbmigration.ddlgeneration;
 import io.ebeaninternal.dbmigration.migration.AddColumn;
 import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
 import io.ebeaninternal.dbmigration.migration.AddTableComment;
+import io.ebeaninternal.dbmigration.migration.AddUniqueConstraint;
 import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.AlterForeignKey;
 import io.ebeaninternal.dbmigration.migration.ChangeSet;
 import io.ebeaninternal.dbmigration.migration.CreateIndex;
 import io.ebeaninternal.dbmigration.migration.CreateTable;
@@ -41,6 +43,10 @@ public interface DdlHandler {
 
   void generate(DdlWrite writer, DropIndex dropIndex) throws IOException;
 
+  void generate(DdlWrite writer, AddUniqueConstraint constraint) throws IOException;
+
+  void generate(DdlWrite writer, AlterForeignKey alterForeignKey) throws IOException;
+
   void generateProlog(DdlWrite write) throws IOException;
 
   void generateEpilog(DdlWrite write) throws IOException;
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java
index f938b0b89..3ea2eacad 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java
@@ -3,7 +3,9 @@ package io.ebeaninternal.dbmigration.ddlgeneration;
 import io.ebeaninternal.dbmigration.migration.AddColumn;
 import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
 import io.ebeaninternal.dbmigration.migration.AddTableComment;
+import io.ebeaninternal.dbmigration.migration.AddUniqueConstraint;
 import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.AlterForeignKey;
 import io.ebeaninternal.dbmigration.migration.CreateIndex;
 import io.ebeaninternal.dbmigration.migration.CreateTable;
 import io.ebeaninternal.dbmigration.migration.DropColumn;
@@ -69,6 +71,16 @@ public interface TableDdl {
   void generate(DdlWrite writer, DropIndex dropIndex) throws IOException;
 
   /**
+   * Write add unique constraint.
+   */
+  void generate(DdlWrite writer, AddUniqueConstraint constraint) throws IOException;
+
+  /**
+   * Writes alter foreign key statements.
+   * @throws IOException
+   */
+  void generate(DdlWrite writer, AlterForeignKey alterForeignKey) throws IOException;
+
   /**
    * Generate any extra DDL such as stored procedures or TableValueParameters.
    */
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
index 455c802e8..abe8dfbbd 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
@@ -13,7 +13,9 @@ import io.ebeaninternal.dbmigration.ddlgeneration.platform.util.IndexSet;
 import io.ebeaninternal.dbmigration.migration.AddColumn;
 import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
 import io.ebeaninternal.dbmigration.migration.AddTableComment;
+import io.ebeaninternal.dbmigration.migration.AddUniqueConstraint;
 import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.AlterForeignKey;
 import io.ebeaninternal.dbmigration.migration.Column;
 import io.ebeaninternal.dbmigration.migration.CreateIndex;
 import io.ebeaninternal.dbmigration.migration.CreateTable;
@@ -330,7 +332,7 @@ public class BaseTableDdl implements TableDdl {
       }
       String[] columnNames = {col.getName()};
       write.apply()
-        .append(platformDdl.alterTableAddUniqueConstraint(tableName, uqName, columnNames, Boolean.TRUE.equals(col.isNotnull())))
+        .append(platformDdl.alterTableAddUniqueConstraint(tableName, uqName, columnNames, Boolean.TRUE.equals(col.isNotnull()) ? null : columnNames))
         .endOfStatement();
 
       write.dropAllForeignKeys()
@@ -340,9 +342,10 @@ public class BaseTableDdl implements TableDdl {
 
     for (UniqueConstraint constraint : externalCompoundUnique) {
       String uqName = constraint.getName();
-      String[] columnNames = StringHelper.delimitedToArray(constraint.getColumnNames(), ",", false);
+      String[] columnNames = SplitColumns.split(constraint.getColumnNames());
+      String[] nullableColumns = SplitColumns.split(constraint.getNullableColumns());
       write.apply()
-        .append(platformDdl.alterTableAddUniqueConstraint(tableName, uqName, columnNames, false)) // TODO: check if nullable
+        .append(platformDdl.alterTableAddUniqueConstraint(tableName, uqName, columnNames, nullableColumns))
         .endOfStatement();
 
       write.dropAllForeignKeys()
@@ -639,6 +642,40 @@ public class BaseTableDdl implements TableDdl {
       .append(platformDdl.dropIndex(dropIndex.getIndexName(), dropIndex.getTableName()))
       .endOfStatement();
   }
+  @Override
+  public void generate(DdlWrite writer, AddUniqueConstraint constraint) throws IOException {
+
+    if (DdlHelp.isDropConstraint(constraint.getColumnNames())) {
+      String ddl = platformDdl.alterTableDropUniqueConstraint(constraint.getTableName(), constraint.getConstraintName());
+      if (hasValue(ddl)) {
+        writer.apply().append(ddl).endOfStatement();
+      }
+    } else {
+      String[] cols = SplitColumns.split(constraint.getColumnNames());
+      String[] nullableColumns = SplitColumns.split(constraint.getNullableColumns());
+      String ddl = platformDdl.alterTableAddUniqueConstraint(constraint.getTableName(), constraint.getConstraintName(), cols, nullableColumns);
+      if (hasValue(ddl)) {
+        writer.apply().append(ddl).endOfStatement();
+      }
+    }
+  }
+
+  @Override
+  public void generate(DdlWrite writer, AlterForeignKey alterForeignKey) throws IOException {
+    if (DdlHelp.isDropForeignKey(alterForeignKey.getColumnNames())) {
+
+      String ddl = platformDdl.alterTableDropForeignKey(alterForeignKey.getTableName(),
+          alterForeignKey.getName());
+      if (hasValue(ddl)) {
+        writer.apply().append(ddl).endOfStatement();
+      }
+    } else {
+      String ddl = platformDdl.alterTableAddForeignKey(new WriteForeignKey(alterForeignKey));
+      if (hasValue(ddl)) {
+        writer.apply().append(ddl).endOfStatement();
+      }
+    }
+  }
 
   /**
    * Add add history table DDL.
@@ -932,7 +969,7 @@ public class BaseTableDdl implements TableDdl {
     String[] cols = {alter.getColumnName()};
     boolean notNull = alter.isNotnull() != null ? alter.isNotnull() : Boolean.TRUE.equals(alter.isNotnull());
     writer.apply()
-      .append(platformDdl.alterTableAddUniqueConstraint(alter.getTableName(), uqName, cols, notNull))
+      .append(platformDdl.alterTableAddUniqueConstraint(alter.getTableName(), uqName, cols, notNull ? null : cols))
       .endOfStatement();
 
     writer.dropAllForeignKeys()
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java
index 0a8659421..17a463d60 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java
@@ -18,12 +18,12 @@ public class DB2Ddl extends PlatformDdl {
   }
 
   @Override
-  public String alterTableAddUniqueConstraint(String tableName, String uqName, String[] columns, boolean notNull) {
-    if (notNull) {
-      return super.alterTableAddUniqueConstraint(tableName, uqName, columns, true);
+  public String alterTableAddUniqueConstraint(String tableName, String uqName, String[] columns, String[] nullableColumns) {
+    if (nullableColumns == null || nullableColumns.length == 0) {
+      return super.alterTableAddUniqueConstraint(tableName, uqName, columns, nullableColumns);
     } else {
       // Hmm: Complex workaround: https://www.ibm.com/developerworks/mydeveloperworks/blogs/SQLTips4DB2LUW/entry/unique_where_not_null_indexes26?lang=en
-      return "-- NOT SUPPORTED " + super.alterTableAddUniqueConstraint(tableName, uqName, columns, true);
+      return "-- NOT SUPPORTED " + super.alterTableAddUniqueConstraint(tableName, uqName, columns, nullableColumns);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DdlHelp.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DdlHelp.java
index 1ee1ff53b..ceb531530 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DdlHelp.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DdlHelp.java
@@ -5,18 +5,35 @@ public class DdlHelp {
 
   public static final String DROP_COMMENT = "DROP COMMENT";
 
-  /**
-   * Return true if the default value is the special DROP DEFAULT value.
-   */
-  public static boolean isDropDefault(String defaultValue) {
-    return DROP_DEFAULT.equals(defaultValue);
-  }
+  public static final String DROP_CONSTRAINT = "DROP CONSTRAINT";
+
+  public static final String DROP_FOREIGN_KEY = "DROP FOREIGN KEY";
 
   /**
    * Return true if the default value is the special DROP DEFAULT value.
    */
-  public static boolean isDropComment(String comment) {
-    return DROP_COMMENT.equals(comment);
+  public static boolean isDropDefault(String value) {
+    return DROP_DEFAULT.equals(value);
   }
 
+  /**
+   * Return true if the default value is the special DROP COMMENT value.
+   */
+  public static boolean isDropComment(String value) {
+    return DROP_COMMENT.equals(value);
+  }
+  
+  /**
+   * Return true if the default value is the special DROP CONSTRAINT value.
+   */
+  public static boolean isDropConstraint(String value) {
+    return DROP_CONSTRAINT.equals(value);
+  }
+
+  /**
+   * Return true if the default value is the special DROP FOREIGN KEY value.
+   */
+  public static boolean isDropForeignKey(String value) {
+    return DROP_FOREIGN_KEY.equals(value);
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
index 6e80e4d72..0baf8ab4e 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
@@ -108,6 +108,15 @@ public class MySqlDdl extends PlatformDdl {
    */
   @Override
   public void addTableComment(DdlBuffer apply, String tableName, String tableComment) throws IOException {
+    if (DdlHelp.isDropComment(tableComment)) {
+      tableComment = "";
+    }
     apply.append(String.format("alter table %s comment = '%s'", tableName, tableComment)).endOfStatement();
   }
+  
+  @Override
+  public void addColumnComment(DdlBuffer apply, String table, String column, String comment) throws IOException {
+    // alter comment currently not supported as it requires to repeat whole column definition
+  }
+  
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Oracle10Ddl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Oracle10Ddl.java
index 2071a94e2..9481660ea 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Oracle10Ddl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Oracle10Ddl.java
@@ -22,6 +22,16 @@ public class Oracle10Ddl extends PlatformDdl {
     this.identitySuffix = " generated always as identity";
   }
 
+  @Override
+  public String alterTableAddUniqueConstraint(String tableName, String uqName, String[] columns, String[] nullableColumns) {
+    if (nullableColumns == null || nullableColumns.length == 0) {
+      return super.alterTableAddUniqueConstraint(tableName, uqName, columns, nullableColumns);
+    } else {
+      // Hmm: https://stackoverflow.com/questions/11893134/oracle-create-unique-index-but-ignore-nulls
+      return "-- NOT YET IMPLEMENTED: " + super.alterTableAddUniqueConstraint(tableName, uqName, columns, nullableColumns);
+    }
+  }
+
   @Override
   protected void appendForeignKeyOnUpdate(StringBuilder buffer, ConstraintMode mode) {
     // do nothing, no on update clause for oracle
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
index af7d41453..db37454c6 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -432,7 +432,7 @@ public class PlatformDdl {
    * <p>
    * Overridden by MsSqlServer for specific null handling on unique constraints.
    */
-  public String alterTableAddUniqueConstraint(String tableName, String uqName, String[] columns, boolean notNull) {
+  public String alterTableAddUniqueConstraint(String tableName, String uqName, String[] columns, String[] nullableColumns) {
 
     StringBuilder buffer = new StringBuilder(90);
     buffer.append("alter table ").append(tableName).append(" add constraint ").append(uqName).append(" unique ");
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
index 843abad99..6b094f9d9 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
@@ -63,9 +63,9 @@ public class SqlServerDdl extends PlatformDdl {
    * MsSqlServer specific null handling on unique constraints.
    */
   @Override
-  public String alterTableAddUniqueConstraint(String tableName, String uqName, String[] columns, boolean notNull) {
-    if (notNull) {
-      return super.alterTableAddUniqueConstraint(tableName, uqName, columns, notNull);
+  public String alterTableAddUniqueConstraint(String tableName, String uqName, String[] columns, String[] nullableColumns) {
+    if (nullableColumns == null || nullableColumns.length == 0) {
+      return super.alterTableAddUniqueConstraint(tableName, uqName, columns, nullableColumns);
     }
     if (uqName == null) {
       throw new NullPointerException();
@@ -82,7 +82,7 @@ public class SqlServerDdl extends PlatformDdl {
     }
     sb.append(") where");
     String sep = " ";
-    for (String column : columns) {
+    for (String column : nullableColumns) {
       sb.append(sep).append(column).append(" is not null");
       sep = " and ";
     }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteForeignKey.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteForeignKey.java
index f9fab239d..e2ed698f0 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteForeignKey.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteForeignKey.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
 import io.ebean.annotation.ConstraintMode;
 import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.AlterForeignKey;
 import io.ebeaninternal.dbmigration.migration.Column;
 import io.ebeaninternal.dbmigration.migration.ForeignKey;
 
@@ -37,6 +38,17 @@ class WriteForeignKey {
     this.onUpdate = modeOf(key.getOnUpdate());
   }
 
+  WriteForeignKey(AlterForeignKey key) {
+    this.tableName = key.getTableName();
+    this.indexName = key.getIndexName();
+    this.fkName = key.getName();
+    this.cols = toCols(key.getColumnNames());
+    this.refTableName = key.getRefTableName();
+    this.refCols = toCols(key.getRefColumnNames());
+    this.onDelete = modeOf(key.getOnDelete());
+    this.onUpdate = modeOf(key.getOnUpdate());
+  }
+
   WriteForeignKey(String tableName, Column column) {
     this.tableName = tableName;
     this.indexName = column.getForeignKeyIndex();
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java b/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java
new file mode 100644
index 000000000..8ed14b23f
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java
@@ -0,0 +1,137 @@
+package io.ebeaninternal.dbmigration.migration;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * <p>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * TODO
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "addUniqueConstraint")
+public class AddUniqueConstraint {
+
+  @XmlAttribute(name = "constraintName", required = true)
+  protected String constraintName;
+
+  @XmlAttribute(name = "tableName", required = true)
+  protected String tableName;
+
+  @XmlAttribute(name = "columnNames", required = true)
+  protected String columnNames;
+
+  @XmlAttribute(name = "nullableColumns", required = true)
+  protected String nullableColumns;
+    
+  @XmlAttribute(name = "oneToOne", required = false)
+  protected Boolean oneToOne;
+
+  /**
+   * Gets the value of the constraintName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getConstraintName() {
+    return constraintName;
+  }
+
+  /**
+   * Sets the value of the constraintName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setConstraintName(String value) {
+    this.constraintName = value;
+  }
+  
+  /**
+   * Gets the value of the tableName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getTableName() {
+    return tableName;
+  }
+  
+  /**
+   * Sets the value of the tableName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setTableName(String tableName) {
+    this.tableName = tableName;
+  }
+
+  /**
+   * Gets the value of the columnNames property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getColumnNames() {
+    return columnNames;
+  }
+
+  /**
+   * Sets the value of the columnNames property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setColumnNames(String value) {
+    this.columnNames = value;
+  }
+
+  /**
+   * Gets the value of the nullableColumns property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getNullableColumns() {
+    return nullableColumns;
+  }
+
+  /**
+   * Sets the value of the nullableColumns property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setNullableColumns(String value) {
+    this.nullableColumns = value;
+  }
+  
+  /**
+   * Gets the value of the oneToOne property.
+   *
+   * @return true if oneToOne was set
+   */
+  public boolean isOneToOne() {
+    return Boolean.TRUE.equals(oneToOne);
+  }
+
+  /**
+   * Sets the value of the oneToOne property.
+   *
+   * @param value boolean
+   */
+  public void setOneToOne(boolean oneToOne) {
+    this.oneToOne = oneToOne;
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java b/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java
new file mode 100644
index 000000000..4286b3132
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java
@@ -0,0 +1,199 @@
+package io.ebeaninternal.dbmigration.migration;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * <p>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * TODO
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "foreignKey")
+public class AlterForeignKey {
+
+  @XmlAttribute(name = "name", required = true)
+  protected String name;
+  @XmlAttribute(name = "columnNames", required = true)
+  protected String columnNames;
+  @XmlAttribute(name = "refColumnNames", required = true)
+  protected String refColumnNames;
+  @XmlAttribute(name = "refTableName", required = true)
+  protected String refTableName;
+  @XmlAttribute(name = "indexName")
+  protected String indexName;
+  @XmlAttribute(name = "tableName", required = true)
+  protected String tableName;
+  @XmlAttribute(name = "onDelete")
+  protected String onDelete;
+  @XmlAttribute(name = "onUpdate")
+  protected String onUpdate;
+  /**
+   * Gets the value of the name property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getName() {
+    return name;
+  }
+
+  /**
+   * Sets the value of the name property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setName(String value) {
+    this.name = value;
+  }
+
+  /**
+   * Gets the value of the columnNames property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getColumnNames() {
+    return columnNames;
+  }
+
+  /**
+   * Sets the value of the columnNames property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setColumnNames(String value) {
+    this.columnNames = value;
+  }
+
+  /**
+   * Gets the value of the refColumnNames property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getRefColumnNames() {
+    return refColumnNames;
+  }
+
+  /**
+   * Sets the value of the refColumnNames property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setRefColumnNames(String value) {
+    this.refColumnNames = value;
+  }
+
+  /**
+   * Gets the value of the refTableName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getRefTableName() {
+    return refTableName;
+  }
+
+  /**
+   * Sets the value of the refTableName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setRefTableName(String value) {
+    this.refTableName = value;
+  }
+
+  /**
+   * Gets the value of the indexName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getIndexName() {
+    return indexName;
+  }
+
+  /**
+   * Sets the value of the indexName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setIndexName(String value) {
+    this.indexName = value;
+  }
+
+  /**
+   * Gets the value of the tableName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getTableName() {
+    return tableName;
+  }
+
+  /**
+   * Sets the value of the tableName property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setTableName(String value) {
+    this.tableName = value;
+  }
+
+  /**
+   * Gets the value of the onDelete property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getOnDelete() {
+    return onDelete;
+  }
+
+  /**
+   * Sets the value of the onDelete property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setOnDelete(String value) {
+    this.onDelete = value;
+  }
+
+  /**
+   * Gets the value of the onUpdate property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getOnUpdate() {
+    return onUpdate;
+  }
+
+  /**
+   * Sets the value of the onUpdate property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setOnUpdate(String value) {
+    this.onUpdate = value;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java b/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java
index b756b7d1d..be9259950 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java
@@ -57,7 +57,9 @@ public class ChangeSet {
     @XmlElement(name = "alterColumn", type = AlterColumn.class),
     @XmlElement(name = "renameColumn", type = RenameColumn.class),
     @XmlElement(name = "createIndex", type = CreateIndex.class),
-    @XmlElement(name = "dropIndex", type = DropIndex.class)
+    @XmlElement(name = "dropIndex", type = DropIndex.class),
+    @XmlElement(name = "addUniqueConstraint", type = AddUniqueConstraint.class),
+    @XmlElement(name = "alterForeignKey", type = AlterForeignKey.class),
   })
   protected List<Object> changeSetChildren;
   @XmlAttribute(name = "type", required = true)
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java b/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java
index 1b0e81dd1..7687edf4f 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java
@@ -194,5 +194,17 @@ public class ObjectFactory {
     return new DdlScript();
   }
 
+  /**
+   * Create an instance of {@link CompoundUniqueConstraint }
+   */
+  public AddUniqueConstraint createCompoundUniqueConstraint() {
+    return new AddUniqueConstraint();
+  }
 
+  /**
+   * Create an instance of {@link AddUniqueConstraint }
+   */
+  public AlterForeignKey createAlterForeignKey() {
+    return new AlterForeignKey();
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java b/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java
index cd023273a..d4c61fd8f 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java
@@ -30,9 +30,16 @@ public class UniqueConstraint {
 
   @XmlAttribute(name = "name", required = true)
   protected String name;
+
   @XmlAttribute(name = "columnNames", required = true)
   protected String columnNames;
 
+  @XmlAttribute(name = "oneToOne", required = false)
+  protected Boolean oneToOne;
+
+  @XmlAttribute(name = "nullableColumns", required = true)
+  protected String nullableColumns;
+  
   /**
    * Gets the value of the name property.
    *
@@ -72,5 +79,43 @@ public class UniqueConstraint {
   public void setColumnNames(String value) {
     this.columnNames = value;
   }
+  
+  /**
+   * Gets the value of the oneToOne property.
+   *
+   * @return true if oneToOne was set
+   */
+  public boolean isOneToOne() {
+    return Boolean.TRUE.equals(oneToOne);
+  }
+  
+  /**
+   * Sets the value of the oneToOne property.
+   *
+   * @param value boolean
+   */
+  public void setOneToOne(boolean oneToOne) {
+    this.oneToOne = oneToOne;
+  }
+
+  /**
+   * Gets the value of the nullableColumns property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getNullableColumns() {
+    return nullableColumns;
+  }
+
+  /**
+   * Sets the value of the nullableColumns property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setNullableColumns(String value) {
+    this.nullableColumns = value;
+  }
 
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java b/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java
index f9eb80a8c..1aa3722e5 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java
@@ -404,7 +404,9 @@ public class MColumn {
         alter.setCheckConstraint(newColumn.checkConstraint);
       }
     }
-    if (different(references, newColumn.references)) {
+    if (different(references, newColumn.references)
+        || hasValue(newColumn.references) && fkeyOnDelete != newColumn.fkeyOnDelete
+        || hasValue(newColumn.references) && fkeyOnUpdate != newColumn.fkeyOnUpdate) {
       // foreign key change
       AlterColumn alter = getAlterColumn(tableName, tableWithHistory);
       if (hasValue(foreignKeyName)) {
@@ -418,6 +420,12 @@ public class MColumn {
         alter.setReferences(newColumn.references);
         alter.setForeignKeyName(newColumn.foreignKeyName);
         alter.setForeignKeyIndex(newColumn.foreignKeyIndex);
+        if (newColumn.fkeyOnDelete != null) {
+          alter.setForeignKeyOnDelete(fkeyModeOf(newColumn.fkeyOnDelete));
+        }
+        if (newColumn.fkeyOnUpdate != null) {
+          alter.setForeignKeyOnUpdate(fkeyModeOf(newColumn.fkeyOnUpdate));
+        }
       }
     }
 
@@ -513,6 +521,11 @@ public class MColumn {
         comment = null;
       }
     }
-
+    if (hasValue(alterColumn.getForeignKeyOnDelete())) {
+      fkeyOnDelete = fkeyMode(alterColumn.getForeignKeyOnDelete());
+    }
+    if (hasValue(alterColumn.getForeignKeyOnUpdate())) {
+      fkeyOnUpdate = fkeyMode(alterColumn.getForeignKeyOnUpdate());
+    }
   }
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundForeignKey.java b/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundForeignKey.java
index 772856b8b..a3087b909 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundForeignKey.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundForeignKey.java
@@ -1,9 +1,12 @@
 package io.ebeaninternal.dbmigration.model;
 
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.DdlHelp;
+import io.ebeaninternal.dbmigration.migration.AlterForeignKey;
 import io.ebeaninternal.dbmigration.migration.ForeignKey;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * A unique constraint for multiple columns.
@@ -46,6 +49,32 @@ public class MCompoundForeignKey {
     fk.setRefTableName(referenceTable);
     return fk;
   }
+  
+  /**
+   * Create and return an AlterForeignKey migration element.
+   */
+  public AlterForeignKey addForeignKey(String tableName) {
+    AlterForeignKey fk = new AlterForeignKey();
+    fk.setName(name);
+    fk.setIndexName(indexName);
+    fk.setColumnNames(toColumnNames(columns));
+    fk.setRefColumnNames(toColumnNames(referenceColumns));
+    fk.setRefTableName(referenceTable);
+    fk.setTableName(tableName);
+    return fk;
+  }
+  
+  /**
+   * Create and return an AlterForeignKey migration element.
+   */
+  public AlterForeignKey dropForeignKey(String tableName) {
+    AlterForeignKey fk = new AlterForeignKey();
+    fk.setName(name);
+    fk.setIndexName(indexName);
+    fk.setColumnNames(DdlHelp.DROP_FOREIGN_KEY);
+    fk.setTableName(tableName);
+    return fk;
+  }
 
   /**
    * Add a counter to the foreign key and index names to avoid duplication.
@@ -99,4 +128,24 @@ public class MCompoundForeignKey {
     return sb.toString();
   }
 
+  @Override
+  public int hashCode() {
+    return Objects.hash(columns, indexName, name, referenceColumns, referenceTable);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj)
+      return true;
+    if (!(obj instanceof MCompoundForeignKey))
+      return false;
+    
+    MCompoundForeignKey other = (MCompoundForeignKey) obj;
+    return Objects.equals(columns, other.columns)
+        && Objects.equals(indexName, other.indexName)
+        && Objects.equals(name, other.name)
+        && Objects.equals(referenceColumns, other.referenceColumns)
+        && Objects.equals(referenceTable, other.referenceTable);
+  }
+
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundUniqueConstraint.java b/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundUniqueConstraint.java
index 0d4613a96..daf3a19e2 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundUniqueConstraint.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundUniqueConstraint.java
@@ -1,5 +1,11 @@
 package io.ebeaninternal.dbmigration.model;
 
+import java.util.Arrays;
+import java.util.Objects;
+
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.DdlHelp;
+import io.ebeaninternal.dbmigration.migration.AddUniqueConstraint;
+import io.ebeaninternal.dbmigration.migration.UniqueConstraint;
 /**
  * A unique constraint for multiple columns.
  * <p>
@@ -20,6 +26,8 @@ public class MCompoundUniqueConstraint {
    * The columns combined to be unique.
    */
   private final String[] columns;
+  
+  private String[] nullableColumns;
 
   public MCompoundUniqueConstraint(String[] columns, boolean oneToOne, String name) {
     this.name = name;
@@ -47,4 +55,78 @@ public class MCompoundUniqueConstraint {
   public String getName() {
     return name;
   }
+  public UniqueConstraint getUniqueConstraint() {
+    UniqueConstraint uq = new UniqueConstraint();
+    uq.setName(getName());
+    uq.setColumnNames(join(columns));
+    uq.setNullableColumns(join(nullableColumns));
+    uq.setOneToOne(isOneToOne());
+    return uq;
+  }
+  /**
+   * Return a AddUniqueConstraint migration for this constraint.
+   */
+  public AddUniqueConstraint addUniqueConstraint(String tableName) {
+    AddUniqueConstraint create = new AddUniqueConstraint();
+    create.setConstraintName(getName());
+    create.setTableName(tableName);
+    create.setColumnNames(join(columns));
+    create.setNullableColumns(join(nullableColumns));
+    create.setOneToOne(isOneToOne());
+    return create;
+  }
+
+  /**
+   * Create a AddUniqueConstraint migration with 'DROP CONSTRAINT' set for this index.
+   */
+  public AddUniqueConstraint dropUniqueConstraint(String tableName) {
+    AddUniqueConstraint dropUniqueConstraint = new AddUniqueConstraint();
+    dropUniqueConstraint.setConstraintName(name);
+    dropUniqueConstraint.setTableName(tableName);
+    dropUniqueConstraint.setColumnNames(DdlHelp.DROP_CONSTRAINT);
+    dropUniqueConstraint.setNullableColumns(join(nullableColumns));
+    return dropUniqueConstraint;
+  }
+  
+  public void setNullableColumns(String[] nullableColumns) {
+    if (nullableColumns != null && nullableColumns.length == 0) {
+      this.nullableColumns = null;
+    } else {
+      this.nullableColumns = nullableColumns;
+    }
+  }
+
+  private String join(String[] arr) {
+    if (arr == null) {
+      return "";
+    }
+    StringBuilder sb = new StringBuilder(50);
+    for (int i = 0; i < arr.length; i++) {
+      if (i > 0) {
+        sb.append(",");
+      }
+      sb.append(arr[i]);
+    }
+    return sb.toString();
+  }
+  
+  @Override
+  public int hashCode() {
+    return Arrays.hashCode(columns) + 31 * Objects.hash(name, oneToOne);
+  }
+  
+  @Override
+  public boolean equals(Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof MCompoundUniqueConstraint)) {
+      return false;
+    }
+    MCompoundUniqueConstraint other = (MCompoundUniqueConstraint) obj;
+    return Arrays.equals(columns, other.columns)
+        && Arrays.equals(nullableColumns, other.nullableColumns)
+        && Objects.equals(name, other.name)
+        && oneToOne == other.oneToOne;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
index a92408496..a78d6fd53 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.dbmigration.model;
 
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.DdlHelp;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.SplitColumns;
 import io.ebeaninternal.dbmigration.migration.AddColumn;
 import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
 import io.ebeaninternal.dbmigration.migration.AddTableComment;
@@ -10,6 +11,7 @@ import io.ebeaninternal.dbmigration.migration.CreateTable;
 import io.ebeaninternal.dbmigration.migration.DropColumn;
 import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
 import io.ebeaninternal.dbmigration.migration.DropTable;
+import io.ebeaninternal.dbmigration.migration.ForeignKey;
 import io.ebeaninternal.dbmigration.migration.IdentityType;
 import io.ebeaninternal.dbmigration.migration.UniqueConstraint;
 import org.slf4j.Logger;
@@ -165,9 +167,36 @@ public class MTable {
     for (Column column : cols) {
       addColumn(column);
     }
+    List<UniqueConstraint> uqConstraints = createTable.getUniqueConstraint();
+    for (UniqueConstraint uq : uqConstraints) {
+      MCompoundUniqueConstraint mUq = new MCompoundUniqueConstraint(
+          SplitColumns.split(uq.getColumnNames()), uq.isOneToOne(), uq.getName());
+      mUq.setNullableColumns(SplitColumns.split(uq.getNullableColumns()));
+      uniqueConstraints.add(mUq);
+    }
+
+    for (ForeignKey fk : createTable.getForeignKey()) {
+      if (DdlHelp.isDropForeignKey(fk.getColumnNames())) {
+        removeForeignKey(fk.getName());
+      } else {
+        addForeignKey(fk.getName(), fk.getRefTableName(), fk.getIndexName(), fk.getColumnNames(), fk.getRefColumnNames());
+      }
+    }
   }
 
 
+  public void addForeignKey(String name, String refTableName, String indexName, String columnNames,
+      String refColumnNames) {
+    MCompoundForeignKey foreignKey = new MCompoundForeignKey(name, refTableName, indexName);
+    String[] cols = SplitColumns.split(columnNames);
+    String[] refCols = SplitColumns.split(refColumnNames);
+    for (int i = 0; i < cols.length && i < refCols.length; i++) {
+      foreignKey.addColumnPair(cols[i], refCols[i]);
+    }
+    addForeignKey(foreignKey);
+
+  }
+
   /**
    * Construct typically from EbeanServer meta data.
    */
@@ -236,17 +265,7 @@ public class MTable {
     }
 
     for (MCompoundUniqueConstraint constraint : uniqueConstraints) {
-      UniqueConstraint uq = new UniqueConstraint();
-      uq.setName(constraint.getName());
-      String[] columns = constraint.getColumns();
-      StringBuilder sb = new StringBuilder();
-      for (int i = 0; i < columns.length; i++) {
-        if (i > 0) {
-          sb.append(",");
-        }
-        sb.append(columns[i]);
-      }
-      uq.setColumnNames(sb.toString());
+      UniqueConstraint uq = constraint.getUniqueConstraint();
       createTable.getUniqueConstraint().add(uq);
     }
 
@@ -271,6 +290,25 @@ public class MTable {
       }
     }
 
+    compareColumns(modelDiff, newTable);
+
+    if (MColumn.different(comment, newTable.comment)) {
+      AddTableComment addTableComment = new AddTableComment();
+      addTableComment.setName(name);
+      if (newTable.comment == null) {
+        addTableComment.setComment(DdlHelp.DROP_COMMENT);
+      } else {
+        addTableComment.setComment(newTable.comment);
+      }
+      modelDiff.addTableComment(addTableComment);
+    }
+
+
+    compareCompoundKeys(modelDiff, newTable);
+    compareUniqueKeys(modelDiff, newTable);
+  }
+
+  private void compareColumns(ModelDiff modelDiff, MTable newTable) {
     addColumn = null;
 
     Map<String, MColumn> newColumnMap = newTable.getColumns();
@@ -303,16 +341,39 @@ public class MTable {
     if (addColumn != null) {
       modelDiff.addAddColumn(addColumn);
     }
+  }
 
-    if (MColumn.different(comment, newTable.comment)) {
-      AddTableComment addTableComment = new AddTableComment();
-      addTableComment.setName(name);
-      if (newTable.comment == null) {
-        addTableComment.setComment(DdlHelp.DROP_COMMENT);
-      } else {
-        addTableComment.setComment(newTable.comment);
-      }
-      modelDiff.addTableComment(addTableComment);
+
+  private void compareCompoundKeys(ModelDiff modelDiff, MTable newTable) {
+    List<MCompoundForeignKey> newKeys = new ArrayList<>(newTable.getCompoundKeys());
+    List<MCompoundForeignKey> currentKeys = new ArrayList<>(getCompoundKeys());
+
+    // remove keys that have not changed
+    currentKeys.removeAll(newTable.getCompoundKeys());
+    newKeys.removeAll(getCompoundKeys());
+
+    for (MCompoundForeignKey currentKey : currentKeys) {
+      modelDiff.addAlterForeignKey(currentKey.dropForeignKey(name));
+    }
+
+    for (MCompoundForeignKey newKey : newKeys) {
+      modelDiff.addAlterForeignKey(newKey.addForeignKey(name));
+    }
+  }
+
+  private void compareUniqueKeys(ModelDiff modelDiff, MTable newTable) {
+    List<MCompoundUniqueConstraint> newKeys = new ArrayList<>(newTable.getUniqueConstraints());
+    List<MCompoundUniqueConstraint> currentKeys = new ArrayList<>(getUniqueConstraints());
+
+    // remove keys that have not changed
+    currentKeys.removeAll(newTable.getUniqueConstraints());
+    newKeys.removeAll(getUniqueConstraints());
+
+    for (MCompoundUniqueConstraint currentKey: currentKeys) {
+      modelDiff.addUniqueConstraint(currentKey.dropUniqueConstraint(name));
+    }
+    for (MCompoundUniqueConstraint newKey: newKeys) {
+      modelDiff.addUniqueConstraint(newKey.addUniqueConstraint(name));
     }
   }
 
@@ -656,6 +717,29 @@ public class MTable {
     return draftTableName + "." + references.substring(lastDot + 1);
   }
 
+  /**
+   * This method adds information which columns are nullable or not to the compound indices.
+   */
+  public void updateCompoundIndices() {
+    for (MCompoundUniqueConstraint uniq : uniqueConstraints) {
+      List<String> nullableColumns = new ArrayList<>();
+      for (String columnName : uniq.getColumns()) {
+        MColumn col = getColumn(columnName);
+        if (col == null) {
+          throw new IllegalStateException("Column '" + columnName + "' not found in table " + getName());
+        }
+        if (!col.isNotnull()) {
+          nullableColumns.add(columnName);
+        }
+      }
+      uniq.setNullableColumns(nullableColumns.toArray(new String[nullableColumns.size()]));
+    }
+  }
+
+  public void removeForeignKey(String name) {
+    compoundKeys.removeIf(fk -> fk.getName().equals(name));
+  }
+
   /**
    * Clear the indexes on the foreign keys as they are covered by unique constraints.
    */
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java b/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
index 08136cd1e..6f4abfe51 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
@@ -1,10 +1,13 @@
 package io.ebeaninternal.dbmigration.model;
 
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.DdlHelp;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.SplitColumns;
 import io.ebeaninternal.dbmigration.migration.AddColumn;
 import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
 import io.ebeaninternal.dbmigration.migration.AddTableComment;
+import io.ebeaninternal.dbmigration.migration.AddUniqueConstraint;
 import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.AlterForeignKey;
 import io.ebeaninternal.dbmigration.migration.ChangeSet;
 import io.ebeaninternal.dbmigration.migration.ChangeSetType;
 import io.ebeaninternal.dbmigration.migration.CreateIndex;
@@ -134,6 +137,10 @@ public class ModelContainer {
         applyChange((AddHistoryTable) change);
       } else if (change instanceof DropHistoryTable) {
         applyChange((DropHistoryTable) change);
+      } else if (change instanceof AddUniqueConstraint) {
+        applyChange((AddUniqueConstraint) change);
+      } else if (change instanceof AlterForeignKey) {
+        applyChange((AlterForeignKey) change);
       } else if (change instanceof AddTableComment) {
         applyChange((AddTableComment) change);
       } else {
@@ -166,6 +173,34 @@ public class ModelContainer {
     table.setWithHistory(false);
   }
 
+  private void applyChange(AddUniqueConstraint change) {
+    MTable table = tables.get(change.getTableName());
+    if (table == null) {
+      throw new IllegalStateException("Table [" + change.getTableName() + "] does not exist in model?");
+    }
+    if (DdlHelp.isDropConstraint(change.getColumnNames())) {
+      table.getUniqueConstraints().removeIf(constraint -> constraint.getName().equals(change.getConstraintName()));
+    } else {
+      MCompoundUniqueConstraint constraint = new MCompoundUniqueConstraint(
+          SplitColumns.split(change.getColumnNames()), change.isOneToOne(), change.getConstraintName());
+      constraint.setNullableColumns(SplitColumns.split(change.getNullableColumns()));
+      table.getUniqueConstraints().add(constraint);
+    }
+  }
+
+  private void applyChange(AlterForeignKey change) {
+    MTable table = tables.get(change.getTableName());
+    if (table == null) {
+      throw new IllegalStateException("Table [" + change.getName() + "] does not exist in model?");
+    }
+    if (DdlHelp.isDropForeignKey(change.getColumnNames())) {
+      table.removeForeignKey(change.getName());
+    } else {
+      table.addForeignKey(change.getName(), change.getRefTableName(), change.getIndexName(), change.getColumnNames(),
+          change.getRefColumnNames());
+    }
+  }
+
   private void applyChange(AddTableComment change) {
     MTable table = tables.get(change.getName());
     if (table == null) {
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/ModelDiff.java b/src/main/java/io/ebeaninternal/dbmigration/model/ModelDiff.java
index ec37cf04e..6aa390e65 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/ModelDiff.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/ModelDiff.java
@@ -3,7 +3,9 @@ package io.ebeaninternal.dbmigration.model;
 import io.ebeaninternal.dbmigration.migration.AddColumn;
 import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
 import io.ebeaninternal.dbmigration.migration.AddTableComment;
+import io.ebeaninternal.dbmigration.migration.AddUniqueConstraint;
 import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.AlterForeignKey;
 import io.ebeaninternal.dbmigration.migration.ChangeSet;
 import io.ebeaninternal.dbmigration.migration.ChangeSetType;
 import io.ebeaninternal.dbmigration.migration.CreateIndex;
@@ -245,4 +247,18 @@ public class ModelDiff {
   public void addTableComment(AddTableComment addTableComment) {
     applyChanges.add(addTableComment);
   }
+
+  /**
+   * Adds (or drops) a unique constraint to the 'apply' changes.
+   */
+  public void addUniqueConstraint(AddUniqueConstraint addUniqueConstraint) {
+    applyChanges.add(addUniqueConstraint);
+  }
+
+  /**
+   * Adds (or drops) a foreign key constraint to the 'apply' changes.
+   */
+  public void addAlterForeignKey(AlterForeignKey alterForeignKey) {
+    applyChanges.add(alterForeignKey);
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
index f6a939d1a..dc9bc4692 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
@@ -105,6 +105,8 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
     }
 
     addDraftTable();
+
+    table.updateCompoundIndices();
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index c178371ee..843828025 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -273,6 +273,10 @@ class CQueryBuilder {
     SqlLimitResponse s = buildSql(sqlSelect, request, predicates, sqlTree);
     String sql = s.getSql();
     if (hasMany || query.isRawSql()) {
+      int pos = sql.lastIndexOf(" order by "); // remove order by - mssql does not accept order by in subqueries
+      if (pos != -1) {
+        sql = sql.substring(0, pos);
+      }
       sql = "select count(*) from ( " + sql + ")";
       if (selectCountWithAlias) {
         sql += " as c";
diff --git a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
index 9b97f5888..0bf580245 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
@@ -8,11 +8,12 @@ import io.ebean.Transaction;
 import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.migration.ddl.DdlRunner;
+import io.ebeaninternal.dbmigration.ddlgeneration.Helper;
+
 import org.junit.Test;
 
 import javax.persistence.PersistenceException;
 import java.io.IOException;
-import java.io.InputStream;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Timestamp;
@@ -23,14 +24,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class DbMigrationTest extends BaseTestCase {
 
   private int runScript(boolean expectErrors, String scriptName) throws IOException {
-    try (InputStream stream = getClass().getResourceAsStream("/dbmigration/migrationtest/" + server().getPluginApi().getDatabasePlatform().getName()+"/" + scriptName);
-      java.util.Scanner s = new java.util.Scanner(stream)) {
-      s.useDelimiter("\\A");
-      if (s.hasNext()) {
-        return runScript(expectErrors, s.next(), scriptName);
-      }
-    }
-    return 0;
+    String ddl = Helper.asText(this, "/dbmigration/migrationtest/" + server().getPluginApi().getDatabasePlatform().getName()+"/" + scriptName);
+    return runScript(expectErrors, ddl, scriptName);
   }
 
   private int runScript(boolean expectErrors, String content, String scriptName) {
@@ -58,35 +53,44 @@ public class DbMigrationTest extends BaseTestCase {
     }
   }
 
-  @IgnorePlatform({Platform.ORACLE, Platform.SQLSERVER})
+  @IgnorePlatform(Platform.ORACLE)
   @Test
   public void testRunMigration() throws IOException {
     // first clean up previously created objects
-    runScript(true, "drop table migtest_e_ref;\n","test");
-    runScript(true, "drop table migtest_e_basic;\n"
-        + "drop table migtest_e_history;\n"
-        + "drop table migtest_e_ref;\n"
-        + "drop table migtest_e_ref cascade;\n"
-        + "drop table migtest_e_user;\n"
-        + "drop table migtest_e_history;\n"
-        + "drop table migtest_e_history cascade;\n" // pg
-        + "drop table migtest_e_history_history cascade;\n" // pg
-        + "drop sequence migtest_e_basic_seq;\n"
-        + "drop sequence migtest_e_history_seq;\n"
-        + "drop sequence migtest_e_ref_seq;\n"
-        + "drop sequence migtest_e_user;\n"
-        + "drop sequence migtest_e_history;\n"
-        , "cleanup");
+    cleanup("migtest_ckey_assoc",
+        "migtest_ckey_detail",
+        "migtest_ckey_parent",
+        "migtest_e_basic",
+        "migtest_e_history",
+        "migtest_e_history2",
+        "migtest_e_ref",
+        "migtest_e_softdelete",
+        "migtest_e_user",
+        "migtest_mtm_c",
+        "migtest_mtm_m",
+        "migtest_mtm_c_migtest_mtm_m",
+        "migtest_mtm_m_migtest_mtm_c",
+        "migtest_oto_child",
+        "migtest_oto_master");
 
 
     runScript(false, "1.0__initial.sql");
 
-    SqlUpdate update = server().createSqlUpdate("insert into migtest_e_basic (id, old_boolean, user_id) values (1, :false, 1), (2, :true, 1)");
-    update.setParameter("false", false);
-    update.setParameter("true", true);
+    if (isOracle()) {
+      SqlUpdate update = server().createSqlUpdate("insert into migtest_e_basic (id, old_boolean, user_id) values (1, :false, 1)");
+      update.setParameter("false", false);
+      assertThat(server().execute(update)).isEqualTo(1);
 
-    assertThat(server().execute(update)).isEqualTo(2);
+      update = server().createSqlUpdate("insert into migtest_e_basic (id, old_boolean, user_id) values (2, :true, 1)");
+      update.setParameter("true", true);
+      assertThat(server().execute(update)).isEqualTo(1);
+    } else {
+      SqlUpdate update = server().createSqlUpdate("insert into migtest_e_basic (id, old_boolean, user_id) values (1, :false, 1), (2, :true, 1)");
+      update.setParameter("false", false);
+      update.setParameter("true", true);
 
+      assertThat(server().execute(update)).isEqualTo(2);
+    }
 
     // Run migration
     runScript(false, "1.1.sql");
@@ -115,10 +119,19 @@ public class DbMigrationTest extends BaseTestCase {
     assertThat(row.getTimestamp("some_date")).isEqualTo(new Timestamp(100, 0, 1, 0, 0, 0, 0)); // = 2000-01-01T00:00:00
 
     // Run migration & drops
+    if (isMySql()) {
+      return; // TODO: mysql cannot drop table (need stored procedure for drop column)
+    }
     runScript(false, "1.2__dropsFor_1.1.sql");
 
 
-    select = server().createSqlQuery("select * from migtest_e_basic order by id");
+    // Oracle caches the statement and does not detect schema change. It fails with
+    // an ORA-01007
+    if (isOracle()) {
+      select = server().createSqlQuery("select * from migtest_e_basic order by id,id");
+    } else {
+      select = server().createSqlQuery("select * from migtest_e_basic order by id");
+    }
     result = select.findList();
     assertThat(result).hasSize(2);
     row = result.get(0);
@@ -135,4 +148,21 @@ public class DbMigrationTest extends BaseTestCase {
     assertThat(row.keySet()).contains("old_boolean", "old_boolean2");
   }
 
+  private void cleanup(String ... tables) {
+    StringBuilder sb = new StringBuilder();
+    for (String table : tables) {
+      // simple and stupid try to execute all commands on all dialects.
+      sb.append("alter table ").append(table).append(" set ( system_versioning = OFF  );\n");
+      sb.append("drop table ").append(table).append(";\n");
+      sb.append("drop table ").append(table).append(" cascade;\n");
+      sb.append("drop table ").append(table).append("_history;\n");
+      sb.append("drop table ").append(table).append("_history cascade;\n");
+      sb.append("drop view ").append(table).append("_with_history;\n");
+      sb.append("drop sequence ").append(table).append("_seq;\n");
+    }
+
+    runScript(true, sb.toString(), "cleanup");
+    runScript(true, sb.toString(), "cleanup");
+
+  }
 }
diff --git a/src/test/java/misc/migration/v1_0/DfkCascade.java b/src/test/java/misc/migration/v1_0/DfkCascade.java
new file mode 100644
index 000000000..f7b14f321
--- /dev/null
+++ b/src/test/java/misc/migration/v1_0/DfkCascade.java
@@ -0,0 +1,22 @@
+package misc.migration.v1_0;
+
+import io.ebean.annotation.ConstraintMode;
+import io.ebean.annotation.DbForeignKey;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_fk_cascade")
+public class DfkCascade {
+
+  @Id
+  long id;
+
+  @ManyToOne
+  @DbForeignKey(onDelete = ConstraintMode.CASCADE)
+  DfkCascadeOne one;
+
+}
diff --git a/src/test/java/misc/migration/v1_0/DfkCascadeOne.java b/src/test/java/misc/migration/v1_0/DfkCascadeOne.java
new file mode 100644
index 000000000..1d57570bf
--- /dev/null
+++ b/src/test/java/misc/migration/v1_0/DfkCascadeOne.java
@@ -0,0 +1,21 @@
+package misc.migration.v1_0;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+
+import java.util.List;
+
+@Entity
+@Table(name = "migtest_fk_cascade_one")
+public class DfkCascadeOne {
+
+  @Id
+  long id;
+
+  @OneToMany(mappedBy = "one", cascade = CascadeType.ALL)
+  List<DfkCascade> details;
+
+}
diff --git a/src/test/java/misc/migration/v1_0/DfkNone.java b/src/test/java/misc/migration/v1_0/DfkNone.java
new file mode 100644
index 000000000..1c44c06d6
--- /dev/null
+++ b/src/test/java/misc/migration/v1_0/DfkNone.java
@@ -0,0 +1,21 @@
+package misc.migration.v1_0;
+
+import io.ebean.annotation.DbForeignKey;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+
+@Entity
+@Table(name = "migtest_fk_none")
+public class DfkNone {
+
+  @Id
+  long id;
+
+  @ManyToOne
+  @DbForeignKey(noConstraint = true)
+  DfkOne one;
+}
diff --git a/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java b/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java
new file mode 100644
index 000000000..c8147fdcd
--- /dev/null
+++ b/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java
@@ -0,0 +1,22 @@
+package misc.migration.v1_0;
+
+import javax.persistence.ConstraintMode;
+import javax.persistence.Entity;
+import javax.persistence.ForeignKey;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_fk_none_via_join")
+public class DfkNoneViaJoin {
+
+  @Id
+  long id;
+
+  @ManyToOne
+  @JoinColumn(name = "one_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+  DfkOne one;
+
+}
diff --git a/src/test/java/misc/migration/v1_0/DfkOne.java b/src/test/java/misc/migration/v1_0/DfkOne.java
new file mode 100644
index 000000000..28e2da229
--- /dev/null
+++ b/src/test/java/misc/migration/v1_0/DfkOne.java
@@ -0,0 +1,13 @@
+package misc.migration.v1_0;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_fk_one")
+public class DfkOne {
+
+  @Id
+  long id;
+}
diff --git a/src/test/java/misc/migration/v1_0/DfkSetNull.java b/src/test/java/misc/migration/v1_0/DfkSetNull.java
new file mode 100644
index 000000000..6c46d7529
--- /dev/null
+++ b/src/test/java/misc/migration/v1_0/DfkSetNull.java
@@ -0,0 +1,22 @@
+package misc.migration.v1_0;
+
+import io.ebean.annotation.ConstraintMode;
+import io.ebean.annotation.DbForeignKey;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_fk_set_null")
+public class DfkSetNull {
+
+  @Id
+  long id;
+
+  @ManyToOne
+  @DbForeignKey(onDelete = ConstraintMode.SET_NULL)
+  DfkOne one;
+
+}
diff --git a/src/test/java/misc/migration/v1_1/DfkCascade.java b/src/test/java/misc/migration/v1_1/DfkCascade.java
new file mode 100644
index 000000000..22f1c88f8
--- /dev/null
+++ b/src/test/java/misc/migration/v1_1/DfkCascade.java
@@ -0,0 +1,22 @@
+package misc.migration.v1_1;
+
+import io.ebean.annotation.ConstraintMode;
+import io.ebean.annotation.DbForeignKey;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_fk_cascade")
+public class DfkCascade {
+
+  @Id
+  long id;
+
+  @ManyToOne
+  @DbForeignKey(onDelete = ConstraintMode.RESTRICT)
+  DfkCascadeOne one;
+
+}
diff --git a/src/test/java/misc/migration/v1_1/DfkCascadeOne.java b/src/test/java/misc/migration/v1_1/DfkCascadeOne.java
new file mode 100644
index 000000000..07a523039
--- /dev/null
+++ b/src/test/java/misc/migration/v1_1/DfkCascadeOne.java
@@ -0,0 +1,21 @@
+package misc.migration.v1_1;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+
+import java.util.List;
+
+@Entity
+@Table(name = "migtest_fk_cascade_one")
+public class DfkCascadeOne {
+
+  @Id
+  long id;
+
+  @OneToMany(mappedBy = "one", cascade = CascadeType.ALL)
+  List<DfkCascade> details;
+
+}
diff --git a/src/test/java/misc/migration/v1_1/DfkNone.java b/src/test/java/misc/migration/v1_1/DfkNone.java
new file mode 100644
index 000000000..16129121f
--- /dev/null
+++ b/src/test/java/misc/migration/v1_1/DfkNone.java
@@ -0,0 +1,21 @@
+package misc.migration.v1_1;
+
+import io.ebean.annotation.DbForeignKey;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+
+@Entity
+@Table(name = "migtest_fk_none")
+public class DfkNone {
+
+  @Id
+  long id;
+
+  @ManyToOne
+  @DbForeignKey(noConstraint = false)
+  DfkOne one;
+}
diff --git a/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java b/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java
new file mode 100644
index 000000000..dae77dd67
--- /dev/null
+++ b/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java
@@ -0,0 +1,22 @@
+package misc.migration.v1_1;
+
+import javax.persistence.ConstraintMode;
+import javax.persistence.Entity;
+import javax.persistence.ForeignKey;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_fk_none_via_join")
+public class DfkNoneViaJoin {
+
+  @Id
+  long id;
+
+  @ManyToOne
+  @JoinColumn(name = "one_id", foreignKey = @ForeignKey(ConstraintMode.CONSTRAINT))
+  DfkOne one;
+
+}
diff --git a/src/test/java/misc/migration/v1_1/DfkOne.java b/src/test/java/misc/migration/v1_1/DfkOne.java
new file mode 100644
index 000000000..eb04c6d64
--- /dev/null
+++ b/src/test/java/misc/migration/v1_1/DfkOne.java
@@ -0,0 +1,13 @@
+package misc.migration.v1_1;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_fk_one")
+public class DfkOne {
+
+  @Id
+  long id;
+}
diff --git a/src/test/java/misc/migration/v1_1/DfkSetNull.java b/src/test/java/misc/migration/v1_1/DfkSetNull.java
new file mode 100644
index 000000000..be199b097
--- /dev/null
+++ b/src/test/java/misc/migration/v1_1/DfkSetNull.java
@@ -0,0 +1,22 @@
+package misc.migration.v1_1;
+
+import io.ebean.annotation.ConstraintMode;
+import io.ebean.annotation.DbForeignKey;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_fk_set_null")
+public class DfkSetNull {
+
+  @Id
+  long id;
+
+  @ManyToOne
+  @DbForeignKey(onDelete = ConstraintMode.RESTRICT)
+  DfkOne one;
+
+}
diff --git a/src/test/java/misc/migration/v1_2/DfkCascade.java b/src/test/java/misc/migration/v1_2/DfkCascade.java
new file mode 100644
index 000000000..31f91eb2a
--- /dev/null
+++ b/src/test/java/misc/migration/v1_2/DfkCascade.java
@@ -0,0 +1,22 @@
+package misc.migration.v1_2;
+
+import io.ebean.annotation.ConstraintMode;
+import io.ebean.annotation.DbForeignKey;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_fk_cascade")
+public class DfkCascade {
+
+  @Id
+  long id;
+
+  @ManyToOne
+  @DbForeignKey(onDelete = ConstraintMode.CASCADE)
+  DfkCascadeOne one;
+
+}
diff --git a/src/test/java/misc/migration/v1_2/DfkCascadeOne.java b/src/test/java/misc/migration/v1_2/DfkCascadeOne.java
new file mode 100644
index 000000000..8cdb2a38a
--- /dev/null
+++ b/src/test/java/misc/migration/v1_2/DfkCascadeOne.java
@@ -0,0 +1,21 @@
+package misc.migration.v1_2;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+
+import java.util.List;
+
+@Entity
+@Table(name = "migtest_fk_cascade_one")
+public class DfkCascadeOne {
+
+  @Id
+  long id;
+
+  @OneToMany(mappedBy = "one", cascade = CascadeType.ALL)
+  List<DfkCascade> details;
+
+}
diff --git a/src/test/java/misc/migration/v1_2/DfkNone.java b/src/test/java/misc/migration/v1_2/DfkNone.java
new file mode 100644
index 000000000..4bc65eb4d
--- /dev/null
+++ b/src/test/java/misc/migration/v1_2/DfkNone.java
@@ -0,0 +1,21 @@
+package misc.migration.v1_2;
+
+import io.ebean.annotation.DbForeignKey;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+
+@Entity
+@Table(name = "migtest_fk_none")
+public class DfkNone {
+
+  @Id
+  long id;
+
+  @ManyToOne
+  @DbForeignKey(noConstraint = true)
+  DfkOne one;
+}
diff --git a/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java b/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java
new file mode 100644
index 000000000..809b17f76
--- /dev/null
+++ b/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java
@@ -0,0 +1,22 @@
+package misc.migration.v1_2;
+
+import javax.persistence.ConstraintMode;
+import javax.persistence.Entity;
+import javax.persistence.ForeignKey;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_fk_none_via_join")
+public class DfkNoneViaJoin {
+
+  @Id
+  long id;
+
+  @ManyToOne
+  @JoinColumn(name = "one_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+  DfkOne one;
+
+}
diff --git a/src/test/java/misc/migration/v1_2/DfkOne.java b/src/test/java/misc/migration/v1_2/DfkOne.java
new file mode 100644
index 000000000..f1141d186
--- /dev/null
+++ b/src/test/java/misc/migration/v1_2/DfkOne.java
@@ -0,0 +1,13 @@
+package misc.migration.v1_2;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_fk_one")
+public class DfkOne {
+
+  @Id
+  long id;
+}
diff --git a/src/test/java/misc/migration/v1_2/DfkSetNull.java b/src/test/java/misc/migration/v1_2/DfkSetNull.java
new file mode 100644
index 000000000..01b643c99
--- /dev/null
+++ b/src/test/java/misc/migration/v1_2/DfkSetNull.java
@@ -0,0 +1,22 @@
+package misc.migration.v1_2;
+
+import io.ebean.annotation.ConstraintMode;
+import io.ebean.annotation.DbForeignKey;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_fk_set_null")
+public class DfkSetNull {
+
+  @Id
+  long id;
+
+  @ManyToOne
+  @DbForeignKey(onDelete = ConstraintMode.SET_NULL)
+  DfkOne one;
+
+}
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
index a2eb29cff..ebd35cdcf 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
@@ -1,5 +1,39 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+create table migtest_fk_cascade (
+  id                            bigint generated by default as identity not null,
+  one_id                        bigint,
+  constraint pk_migtest_fk_cascade primary key (id)
+);
+
+create table migtest_fk_cascade_one (
+  id                            bigint generated by default as identity not null,
+  constraint pk_migtest_fk_cascade_one primary key (id)
+);
+
+create table migtest_fk_none (
+  id                            bigint generated by default as identity not null,
+  one_id                        bigint,
+  constraint pk_migtest_fk_none primary key (id)
+);
+
+create table migtest_fk_none_via_join (
+  id                            bigint generated by default as identity not null,
+  one_id                        bigint,
+  constraint pk_migtest_fk_none_via_join primary key (id)
+);
+
+create table migtest_fk_one (
+  id                            bigint generated by default as identity not null,
+  constraint pk_migtest_fk_one primary key (id)
+);
+
+create table migtest_fk_set_null (
+  id                            bigint generated by default as identity not null,
+  one_id                        bigint,
+  constraint pk_migtest_fk_set_null primary key (id)
+);
+
 create table migtest_e_basic (
   id                            integer generated by default as identity not null,
   status                        varchar(1),
@@ -47,6 +81,12 @@ create table migtest_e_softdelete (
 
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
+create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
+
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
+create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
+
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.1.sql b/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
index a87c144d6..26650c8ff 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
@@ -5,6 +5,12 @@ create table migtest_e_user (
   constraint pk_migtest_e_user primary key (id)
 );
 
+alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete restrict on update restrict;
+alter table migtest_fk_none add constraint fk_migtest_fk_none_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
+alter table migtest_fk_none_via_join add constraint fk_migtest_fk_none_via_join_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
+alter table migtest_fk_set_null drop constraint fk_migtest_fk_set_null_one_id;
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
 
 update migtest_e_basic set status = 'A' where status is null;
 alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
@@ -31,6 +37,11 @@ alter table migtest_e_basic add column progress integer not null default 0;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2));
 alter table migtest_e_basic add column new_integer integer not null default 42;
 
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
+-- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_name unique  (name);
+-- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique  (indextest4);
+-- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
 comment on column migtest_e_history.test_string is 'Column altered to long now';
 alter table migtest_e_history alter column test_string bigint;
 comment on table migtest_e_history is 'We have history now';
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.3.sql b/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
index 5c2deaf38..d8c19fa03 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
@@ -5,6 +5,12 @@ create table migtest_e_ref (
   constraint pk_migtest_e_ref primary key (id)
 );
 
+alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
+alter table migtest_fk_none drop constraint fk_migtest_fk_none_one_id;
+alter table migtest_fk_none_via_join drop constraint fk_migtest_fk_none_via_join_one_id;
+alter table migtest_fk_set_null drop constraint fk_migtest_fk_set_null_one_id;
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
 alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
 alter table migtest_e_basic alter column status drop default;
 alter table migtest_e_basic alter column status set null;
@@ -21,6 +27,11 @@ alter table migtest_e_basic add column old_boolean boolean not null default fals
 alter table migtest_e_basic add column old_boolean2 boolean;
 alter table migtest_e_basic add column eref_id integer;
 
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
+-- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique  (indextest2);
+-- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique  (indextest6);
 comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
 alter table migtest_e_history2 alter column test_string drop default;
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
index b03ff9e59..5b472d0c4 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
@@ -1,5 +1,39 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+create table migtest_fk_cascade (
+  id                            bigint auto_increment not null,
+  one_id                        bigint,
+  constraint pk_migtest_fk_cascade primary key (id)
+);
+
+create table migtest_fk_cascade_one (
+  id                            bigint auto_increment not null,
+  constraint pk_migtest_fk_cascade_one primary key (id)
+);
+
+create table migtest_fk_none (
+  id                            bigint auto_increment not null,
+  one_id                        bigint,
+  constraint pk_migtest_fk_none primary key (id)
+);
+
+create table migtest_fk_none_via_join (
+  id                            bigint auto_increment not null,
+  one_id                        bigint,
+  constraint pk_migtest_fk_none_via_join primary key (id)
+);
+
+create table migtest_fk_one (
+  id                            bigint auto_increment not null,
+  constraint pk_migtest_fk_one primary key (id)
+);
+
+create table migtest_fk_set_null (
+  id                            bigint auto_increment not null,
+  one_id                        bigint,
+  constraint pk_migtest_fk_set_null primary key (id)
+);
+
 create table migtest_e_basic (
   id                            integer auto_increment not null,
   status                        varchar(1),
@@ -47,6 +81,12 @@ create table migtest_e_softdelete (
 
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
+create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
+
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
+create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
+
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.1.sql b/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
index eb40d76f3..733391e0f 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
@@ -5,6 +5,12 @@ create table migtest_e_user (
   constraint pk_migtest_e_user primary key (id)
 );
 
+alter table migtest_fk_cascade drop constraint if exists fk_migtest_fk_cascade_one_id;
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete restrict on update restrict;
+alter table migtest_fk_none add constraint fk_migtest_fk_none_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
+alter table migtest_fk_none_via_join add constraint fk_migtest_fk_none_via_join_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
+alter table migtest_fk_set_null drop constraint if exists fk_migtest_fk_set_null_one_id;
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
 
 update migtest_e_basic set status = 'A' where status is null;
 alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
@@ -31,6 +37,11 @@ alter table migtest_e_basic add column progress integer not null default 0;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2));
 alter table migtest_e_basic add column new_integer integer not null default 42;
 
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
+alter table migtest_e_basic add constraint uq_migtest_e_basic_name unique  (name);
+alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique  (indextest4);
+alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
 comment on column migtest_e_history.test_string is 'Column altered to long now';
 alter table migtest_e_history alter column test_string bigint;
 comment on table migtest_e_history is 'We have history now';
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.3.sql b/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
index 47191bda1..e096649a9 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
@@ -5,6 +5,12 @@ create table migtest_e_ref (
   constraint pk_migtest_e_ref primary key (id)
 );
 
+alter table migtest_fk_cascade drop constraint if exists fk_migtest_fk_cascade_one_id;
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
+alter table migtest_fk_none drop constraint if exists fk_migtest_fk_none_one_id;
+alter table migtest_fk_none_via_join drop constraint if exists fk_migtest_fk_none_via_join_one_id;
+alter table migtest_fk_set_null drop constraint if exists fk_migtest_fk_set_null_one_id;
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
 alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
 alter table migtest_e_basic alter column status drop default;
 alter table migtest_e_basic alter column status set null;
@@ -21,6 +27,11 @@ alter table migtest_e_basic add column old_boolean boolean not null default fals
 alter table migtest_e_basic add column old_boolean2 boolean;
 alter table migtest_e_basic add column eref_id integer;
 
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
+alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique  (indextest2);
+alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique  (indextest6);
 comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
 alter table migtest_e_history2 alter column test_string drop default;
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
index 40bdf0daa..3294b84f7 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
@@ -1,5 +1,39 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+create table migtest_fk_cascade (
+  id                            bigint generated by default as identity (start with 1)  not null,
+  one_id                        bigint,
+  constraint pk_migtest_fk_cascade primary key (id)
+);
+
+create table migtest_fk_cascade_one (
+  id                            bigint generated by default as identity (start with 1)  not null,
+  constraint pk_migtest_fk_cascade_one primary key (id)
+);
+
+create table migtest_fk_none (
+  id                            bigint generated by default as identity (start with 1)  not null,
+  one_id                        bigint,
+  constraint pk_migtest_fk_none primary key (id)
+);
+
+create table migtest_fk_none_via_join (
+  id                            bigint generated by default as identity (start with 1)  not null,
+  one_id                        bigint,
+  constraint pk_migtest_fk_none_via_join primary key (id)
+);
+
+create table migtest_fk_one (
+  id                            bigint generated by default as identity (start with 1)  not null,
+  constraint pk_migtest_fk_one primary key (id)
+);
+
+create table migtest_fk_set_null (
+  id                            bigint generated by default as identity (start with 1)  not null,
+  one_id                        bigint,
+  constraint pk_migtest_fk_set_null primary key (id)
+);
+
 create table migtest_e_basic (
   id                            integer generated by default as identity (start with 1)  not null,
   status                        varchar(1),
@@ -47,6 +81,12 @@ create table migtest_e_softdelete (
 
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
+create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
+
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
+create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
+
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
index f258c4c21..8fcfa6dbe 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
@@ -5,6 +5,12 @@ create table migtest_e_user (
   constraint pk_migtest_e_user primary key (id)
 );
 
+alter table migtest_fk_cascade drop constraint if exists fk_migtest_fk_cascade_one_id;
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete restrict on update restrict;
+alter table migtest_fk_none add constraint fk_migtest_fk_none_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
+alter table migtest_fk_none_via_join add constraint fk_migtest_fk_none_via_join_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
+alter table migtest_fk_set_null drop constraint if exists fk_migtest_fk_set_null_one_id;
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
 
 update migtest_e_basic set status = 'A' where status is null;
 alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
@@ -31,6 +37,11 @@ alter table migtest_e_basic add column progress integer not null default 0;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2));
 alter table migtest_e_basic add column new_integer integer not null default 42;
 
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
+alter table migtest_e_basic add constraint uq_migtest_e_basic_name unique  (name);
+alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique  (indextest4);
+alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
 comment on column migtest_e_history.test_string is 'Column altered to long now';
 alter table migtest_e_history alter column test_string bigint;
 comment on table migtest_e_history is 'We have history now';
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
index 3dec87912..4f2436cbd 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
@@ -5,6 +5,12 @@ create table migtest_e_ref (
   constraint pk_migtest_e_ref primary key (id)
 );
 
+alter table migtest_fk_cascade drop constraint if exists fk_migtest_fk_cascade_one_id;
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
+alter table migtest_fk_none drop constraint if exists fk_migtest_fk_none_one_id;
+alter table migtest_fk_none_via_join drop constraint if exists fk_migtest_fk_none_via_join_one_id;
+alter table migtest_fk_set_null drop constraint if exists fk_migtest_fk_set_null_one_id;
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
 alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
 alter table migtest_e_basic alter column status drop default;
 alter table migtest_e_basic alter column status set null;
@@ -21,6 +27,11 @@ alter table migtest_e_basic add column old_boolean boolean not null default fals
 alter table migtest_e_basic add column old_boolean2 boolean;
 alter table migtest_e_basic add column eref_id integer;
 
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
+alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique  (indextest2);
+alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique  (indextest6);
 comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
 alter table migtest_e_history2 alter column test_string drop default;
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
index e489d342c..06a49484a 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
@@ -2,6 +2,28 @@
 <!DOCTYPE xml>
 <migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
     <changeSet type="apply">
+        <createTable name="migtest_fk_cascade" pkName="pk_migtest_fk_cascade">
+            <column name="id" type="bigint" primaryKey="true"/>
+            <column name="one_id" type="bigint" references="migtest_fk_cascade_one.id" foreignKeyName="fk_migtest_fk_cascade_one_id" foreignKeyIndex="ix_migtest_fk_cascade_one_id" foreignKeyOnDelete="CASCADE" foreignKeyOnUpdate="RESTRICT"/>
+        </createTable>
+        <createTable name="migtest_fk_cascade_one" pkName="pk_migtest_fk_cascade_one">
+            <column name="id" type="bigint" primaryKey="true"/>
+        </createTable>
+        <createTable name="migtest_fk_none" pkName="pk_migtest_fk_none">
+            <column name="id" type="bigint" primaryKey="true"/>
+            <column name="one_id" type="bigint"/>
+        </createTable>
+        <createTable name="migtest_fk_none_via_join" pkName="pk_migtest_fk_none_via_join">
+            <column name="id" type="bigint" primaryKey="true"/>
+            <column name="one_id" type="bigint"/>
+        </createTable>
+        <createTable name="migtest_fk_one" pkName="pk_migtest_fk_one">
+            <column name="id" type="bigint" primaryKey="true"/>
+        </createTable>
+        <createTable name="migtest_fk_set_null" pkName="pk_migtest_fk_set_null">
+            <column name="id" type="bigint" primaryKey="true"/>
+            <column name="one_id" type="bigint" references="migtest_fk_one.id" foreignKeyName="fk_migtest_fk_set_null_one_id" foreignKeyIndex="ix_migtest_fk_set_null_one_id" foreignKeyOnDelete="SET_NULL" foreignKeyOnUpdate="RESTRICT"/>
+        </createTable>
         <createTable name="migtest_e_basic" pkName="pk_migtest_e_basic">
             <column name="id" type="integer" primaryKey="true"/>
             <column name="status" type="varchar(1)" checkConstraint="check ( status in ('N','A','I'))" checkConstraintName="ck_migtest_e_basic_status"/>
@@ -18,8 +40,8 @@
             <column name="indextest5" type="varchar(127)"/>
             <column name="indextest6" type="varchar(127)"/>
             <column name="user_id" type="integer" notnull="true"/>
-            <uniqueConstraint name="uq_migtest_e_basic_indextest2" columnNames="indextest2"/>
-            <uniqueConstraint name="uq_migtest_e_basic_indextest6" columnNames="indextest6"/>
+            <uniqueConstraint name="uq_migtest_e_basic_indextest2" columnNames="indextest2" oneToOne="false" nullableColumns="indextest2"/>
+            <uniqueConstraint name="uq_migtest_e_basic_indextest6" columnNames="indextest6" oneToOne="false" nullableColumns="indextest6"/>
         </createTable>
         <createTable name="migtest_e_history" pkName="pk_migtest_e_history">
             <column name="id" type="integer" primaryKey="true"/>
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
index bf86d2450..aea35068e 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE xml>
 <migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
     <changeSet type="apply">
+        <alterColumn columnName="one_id" tableName="migtest_fk_cascade" references="migtest_fk_cascade_one.id" foreignKeyName="fk_migtest_fk_cascade_one_id" foreignKeyIndex="ix_migtest_fk_cascade_one_id" foreignKeyOnDelete="RESTRICT" foreignKeyOnUpdate="RESTRICT" dropForeignKey="fk_migtest_fk_cascade_one_id" dropForeignKeyIndex="ix_migtest_fk_cascade_one_id"/>
+        <alterColumn columnName="one_id" tableName="migtest_fk_none" references="migtest_fk_one.id" foreignKeyName="fk_migtest_fk_none_one_id" foreignKeyIndex="ix_migtest_fk_none_one_id" foreignKeyOnDelete="RESTRICT" foreignKeyOnUpdate="RESTRICT"/>
+        <alterColumn columnName="one_id" tableName="migtest_fk_none_via_join" references="migtest_fk_one.id" foreignKeyName="fk_migtest_fk_none_via_join_one_id" foreignKeyIndex="ix_migtest_fk_none_via_join_one_id"/>
+        <alterColumn columnName="one_id" tableName="migtest_fk_set_null" references="migtest_fk_one.id" foreignKeyName="fk_migtest_fk_set_null_one_id" foreignKeyIndex="ix_migtest_fk_set_null_one_id" foreignKeyOnDelete="RESTRICT" foreignKeyOnUpdate="RESTRICT" dropForeignKey="fk_migtest_fk_set_null_one_id" dropForeignKeyIndex="ix_migtest_fk_set_null_one_id"/>
         <alterColumn columnName="status" tableName="migtest_e_basic" currentType="varchar(1)" defaultValue="'A'" notnull="true" currentNotnull="false" checkConstraint="check ( status in ('N','A','I','?'))" checkConstraintName="ck_migtest_e_basic_status"/>
         <alterColumn columnName="description" tableName="migtest_e_basic" unique="uq_migtest_e_basic_description">
             <before>-- rename all collisions</before>
@@ -19,6 +23,11 @@
             <column name="progress" type="integer" defaultValue="0" notnull="true" checkConstraint="check ( progress in (0,1,2))" checkConstraintName="ck_migtest_e_basic_progress"/>
             <column name="new_integer" type="integer" defaultValue="42" notnull="true"/>
         </addColumn>
+        <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest2" tableName="migtest_e_basic" columnNames="DROP CONSTRAINT" nullableColumns="indextest2"/>
+        <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest6" tableName="migtest_e_basic" columnNames="DROP CONSTRAINT" nullableColumns="indextest6"/>
+        <addUniqueConstraint constraintName="uq_migtest_e_basic_name" tableName="migtest_e_basic" columnNames="name" nullableColumns="name" oneToOne="false"/>
+        <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest4" tableName="migtest_e_basic" columnNames="indextest4" nullableColumns="indextest4" oneToOne="false"/>
+        <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest5" tableName="migtest_e_basic" columnNames="indextest5" nullableColumns="indextest5" oneToOne="false"/>
         <addHistoryTable baseTable="migtest_e_history"/>
         <alterColumn columnName="test_string" tableName="migtest_e_history" type="bigint" currentType="varchar" currentNotnull="false" comment="Column altered to long now">
             <before platforms="postgres">alter table ${table} alter column ${column} TYPE bigint USING (${column}::integer)</before>
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
index 2d08341e2..24aa3c189 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE xml>
 <migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
     <changeSet type="apply">
+        <alterColumn columnName="one_id" tableName="migtest_fk_cascade" references="migtest_fk_cascade_one.id" foreignKeyName="fk_migtest_fk_cascade_one_id" foreignKeyIndex="ix_migtest_fk_cascade_one_id" foreignKeyOnDelete="CASCADE" foreignKeyOnUpdate="RESTRICT" dropForeignKey="fk_migtest_fk_cascade_one_id" dropForeignKeyIndex="ix_migtest_fk_cascade_one_id"/>
+        <alterColumn columnName="one_id" tableName="migtest_fk_none" dropForeignKey="fk_migtest_fk_none_one_id" dropForeignKeyIndex="ix_migtest_fk_none_one_id"/>
+        <alterColumn columnName="one_id" tableName="migtest_fk_none_via_join" dropForeignKey="fk_migtest_fk_none_via_join_one_id" dropForeignKeyIndex="ix_migtest_fk_none_via_join_one_id"/>
+        <alterColumn columnName="one_id" tableName="migtest_fk_set_null" references="migtest_fk_one.id" foreignKeyName="fk_migtest_fk_set_null_one_id" foreignKeyIndex="ix_migtest_fk_set_null_one_id" foreignKeyOnDelete="SET_NULL" foreignKeyOnUpdate="RESTRICT" dropForeignKey="fk_migtest_fk_set_null_one_id" dropForeignKeyIndex="ix_migtest_fk_set_null_one_id"/>
         <alterColumn columnName="status" tableName="migtest_e_basic" currentType="varchar(1)" defaultValue="DROP DEFAULT" notnull="false" currentNotnull="true" checkConstraint="check ( status in ('N','A','I'))" checkConstraintName="ck_migtest_e_basic_status"/>
         <alterColumn columnName="description" tableName="migtest_e_basic" dropUnique="uq_migtest_e_basic_description"/>
         <alterColumn columnName="some_date" tableName="migtest_e_basic" currentType="timestamp" defaultValue="DROP DEFAULT" notnull="false" currentNotnull="true"/>
@@ -11,6 +15,11 @@
             <column name="old_boolean2" type="boolean"/>
             <column name="eref_id" type="integer" references="migtest_e_ref.id" foreignKeyName="fk_migtest_e_basic_eref_id" foreignKeyIndex="ix_migtest_e_basic_eref_id"/>
         </addColumn>
+        <addUniqueConstraint constraintName="uq_migtest_e_basic_name" tableName="migtest_e_basic" columnNames="DROP CONSTRAINT" nullableColumns="name"/>
+        <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest4" tableName="migtest_e_basic" columnNames="DROP CONSTRAINT" nullableColumns="indextest4"/>
+        <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest5" tableName="migtest_e_basic" columnNames="DROP CONSTRAINT" nullableColumns="indextest5"/>
+        <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest2" tableName="migtest_e_basic" columnNames="indextest2" nullableColumns="indextest2" oneToOne="false"/>
+        <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest6" tableName="migtest_e_basic" columnNames="indextest6" nullableColumns="indextest6" oneToOne="false"/>
         <alterColumn columnName="test_string" tableName="migtest_e_history" withHistory="true" comment="DROP COMMENT"/>
         <addTableComment name="migtest_e_history" comment="DROP COMMENT"/>
         <alterColumn columnName="test_string" tableName="migtest_e_history2" withHistory="true" currentType="varchar" defaultValue="DROP DEFAULT" notnull="false" currentNotnull="true"/>
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
index c7136f74c..7bfa87ed5 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
@@ -1,5 +1,39 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+create table migtest_fk_cascade (
+  id                            bigint auto_increment not null,
+  one_id                        bigint,
+  constraint pk_migtest_fk_cascade primary key (id)
+);
+
+create table migtest_fk_cascade_one (
+  id                            bigint auto_increment not null,
+  constraint pk_migtest_fk_cascade_one primary key (id)
+);
+
+create table migtest_fk_none (
+  id                            bigint auto_increment not null,
+  one_id                        bigint,
+  constraint pk_migtest_fk_none primary key (id)
+);
+
+create table migtest_fk_none_via_join (
+  id                            bigint auto_increment not null,
+  one_id                        bigint,
+  constraint pk_migtest_fk_none_via_join primary key (id)
+);
+
+create table migtest_fk_one (
+  id                            bigint auto_increment not null,
+  constraint pk_migtest_fk_one primary key (id)
+);
+
+create table migtest_fk_set_null (
+  id                            bigint auto_increment not null,
+  one_id                        bigint,
+  constraint pk_migtest_fk_set_null primary key (id)
+);
+
 create table migtest_e_basic (
   id                            integer auto_increment not null,
   status                        varchar(1),
@@ -47,6 +81,12 @@ create table migtest_e_softdelete (
 
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
+create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
+
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
+create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
+
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
index 7b9e7054b..9025e83c4 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
@@ -5,6 +5,12 @@ create table migtest_e_user (
   constraint pk_migtest_e_user primary key (id)
 );
 
+alter table migtest_fk_cascade drop foreign key fk_migtest_fk_cascade_one_id;
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete restrict on update restrict;
+alter table migtest_fk_none add constraint fk_migtest_fk_none_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
+alter table migtest_fk_none_via_join add constraint fk_migtest_fk_none_via_join_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
+alter table migtest_fk_set_null drop foreign key fk_migtest_fk_set_null_one_id;
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
 
 update migtest_e_basic set status = 'A' where status is null;
 alter table migtest_e_basic alter status set default 'A';
@@ -30,7 +36,11 @@ alter table migtest_e_basic add column progress integer not null default 0;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2));
 alter table migtest_e_basic add column new_integer integer not null default 42;
 
-comment on column migtest_e_history.test_string is 'Column altered to long now';
+alter table migtest_e_basic drop index uq_migtest_e_basic_indextest2;
+alter table migtest_e_basic drop index uq_migtest_e_basic_indextest6;
+alter table migtest_e_basic add constraint uq_migtest_e_basic_name unique  (name);
+alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique  (indextest4);
+alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
 alter table migtest_e_history modify test_string bigint;
 alter table migtest_e_history comment = 'We have history now';
 
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
index b325b79ae..6a4f5c74d 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
@@ -5,6 +5,12 @@ create table migtest_e_ref (
   constraint pk_migtest_e_ref primary key (id)
 );
 
+alter table migtest_fk_cascade drop foreign key fk_migtest_fk_cascade_one_id;
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
+alter table migtest_fk_none drop foreign key fk_migtest_fk_none_one_id;
+alter table migtest_fk_none_via_join drop foreign key fk_migtest_fk_none_via_join_one_id;
+alter table migtest_fk_set_null drop foreign key fk_migtest_fk_set_null_one_id;
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
 alter table migtest_e_basic alter status drop default;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I'));
 alter table migtest_e_basic drop index uq_migtest_e_basic_description;
@@ -18,8 +24,12 @@ alter table migtest_e_basic add column old_boolean tinyint(1) default 0 not null
 alter table migtest_e_basic add column old_boolean2 tinyint(1) default 0;
 alter table migtest_e_basic add column eref_id integer;
 
-comment on column migtest_e_history.test_string is '';
-alter table migtest_e_history comment = 'DROP COMMENT';
+alter table migtest_e_basic drop index uq_migtest_e_basic_name;
+alter table migtest_e_basic drop index uq_migtest_e_basic_indextest4;
+alter table migtest_e_basic drop index uq_migtest_e_basic_indextest5;
+alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique  (indextest2);
+alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique  (indextest6);
+alter table migtest_e_history comment = '';
 alter table migtest_e_history2 alter test_string drop default;
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
index 75b731c36..d621493ff 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
@@ -1,5 +1,45 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+create table migtest_fk_cascade (
+  id                            number(19) not null,
+  one_id                        number(19),
+  constraint pk_migtest_fk_cascade primary key (id)
+);
+create sequence migtest_fk_cascade_seq;
+
+create table migtest_fk_cascade_one (
+  id                            number(19) not null,
+  constraint pk_migtest_fk_cascade_one primary key (id)
+);
+create sequence migtest_fk_cascade_one_seq;
+
+create table migtest_fk_none (
+  id                            number(19) not null,
+  one_id                        number(19),
+  constraint pk_migtest_fk_none primary key (id)
+);
+create sequence migtest_fk_none_seq;
+
+create table migtest_fk_none_via_join (
+  id                            number(19) not null,
+  one_id                        number(19),
+  constraint pk_migtest_fk_none_via_join primary key (id)
+);
+create sequence migtest_fk_none_via_join_seq;
+
+create table migtest_fk_one (
+  id                            number(19) not null,
+  constraint pk_migtest_fk_one primary key (id)
+);
+create sequence migtest_fk_one_seq;
+
+create table migtest_fk_set_null (
+  id                            number(19) not null,
+  one_id                        number(19),
+  constraint pk_migtest_fk_set_null primary key (id)
+);
+create sequence migtest_fk_set_null_seq;
+
 create table migtest_e_basic (
   id                            number(10) not null,
   status                        varchar2(1),
@@ -52,6 +92,12 @@ create sequence migtest_e_softdelete_seq;
 
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
+create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
+
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null;
+create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
+
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id);
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
index 6b7829121..99bf46431 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
@@ -6,6 +6,12 @@ create table migtest_e_user (
 );
 create sequence migtest_e_user_seq;
 
+alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id);
+alter table migtest_fk_none add constraint fk_migtest_fk_none_one_id foreign key (one_id) references migtest_fk_one (id);
+alter table migtest_fk_none_via_join add constraint fk_migtest_fk_none_via_join_one_id foreign key (one_id) references migtest_fk_one (id);
+alter table migtest_fk_set_null drop constraint fk_migtest_fk_set_null_one_id;
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id);
 
 update migtest_e_basic set status = 'A' where status is null;
 alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
@@ -14,7 +20,7 @@ alter table migtest_e_basic modify status not null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
 
 -- rename all collisions;
-alter table migtest_e_basic add constraint uq_migtest_e_basic_description unique  (description);
+-- NOT YET IMPLEMENTED: alter table migtest_e_basic add constraint uq_migtest_e_basic_description unique  (description);
 
 update migtest_e_basic set some_date = '2000-01-01T00:00:00' where some_date is null;
 alter table migtest_e_basic modify some_date default '2000-01-01T00:00:00';
@@ -32,6 +38,11 @@ alter table migtest_e_basic add column progress number(10) not null default 0;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2));
 alter table migtest_e_basic add column new_integer number(10) not null default 42;
 
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
+-- NOT YET IMPLEMENTED: alter table migtest_e_basic add constraint uq_migtest_e_basic_name unique  (name);
+-- NOT YET IMPLEMENTED: alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique  (indextest4);
+-- NOT YET IMPLEMENTED: alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
 comment on column migtest_e_history.test_string is 'Column altered to long now';
 alter table migtest_e_history modify test_string number(19);
 comment on table migtest_e_history is 'We have history now';
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
index e511427bb..60e6bbf6a 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
@@ -6,6 +6,12 @@ create table migtest_e_ref (
 );
 create sequence migtest_e_ref_seq;
 
+alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
+alter table migtest_fk_none drop constraint fk_migtest_fk_none_one_id;
+alter table migtest_fk_none_via_join drop constraint fk_migtest_fk_none_via_join_one_id;
+alter table migtest_fk_set_null drop constraint fk_migtest_fk_set_null_one_id;
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null;
 alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
 alter table migtest_e_basic modify status drop default;
 alter table migtest_e_basic modify status null;
@@ -22,6 +28,11 @@ alter table migtest_e_basic add column old_boolean number(1) default 0 not null;
 alter table migtest_e_basic add column old_boolean2 number(1) default 0;
 alter table migtest_e_basic add column eref_id number(10);
 
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
+-- NOT YET IMPLEMENTED: alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique  (indextest2);
+-- NOT YET IMPLEMENTED: alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique  (indextest6);
 comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
 alter table migtest_e_history2 modify test_string drop default;
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
index 37a24ed33..3a964227e 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
@@ -1,5 +1,39 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+create table migtest_fk_cascade (
+  id                            bigserial not null,
+  one_id                        bigint,
+  constraint pk_migtest_fk_cascade primary key (id)
+);
+
+create table migtest_fk_cascade_one (
+  id                            bigserial not null,
+  constraint pk_migtest_fk_cascade_one primary key (id)
+);
+
+create table migtest_fk_none (
+  id                            bigserial not null,
+  one_id                        bigint,
+  constraint pk_migtest_fk_none primary key (id)
+);
+
+create table migtest_fk_none_via_join (
+  id                            bigserial not null,
+  one_id                        bigint,
+  constraint pk_migtest_fk_none_via_join primary key (id)
+);
+
+create table migtest_fk_one (
+  id                            bigserial not null,
+  constraint pk_migtest_fk_one primary key (id)
+);
+
+create table migtest_fk_set_null (
+  id                            bigserial not null,
+  one_id                        bigint,
+  constraint pk_migtest_fk_set_null primary key (id)
+);
+
 create table migtest_e_basic (
   id                            serial not null,
   status                        varchar(1),
@@ -47,6 +81,12 @@ create table migtest_e_softdelete (
 
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
+create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
+
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
+create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
+
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
index 4bb9858ba..d26dab182 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
@@ -8,6 +8,12 @@ create table migtest_e_user (
   constraint pk_migtest_e_user primary key (id)
 );
 
+alter table if exists migtest_fk_cascade drop constraint if exists fk_migtest_fk_cascade_one_id;
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete restrict on update restrict;
+alter table migtest_fk_none add constraint fk_migtest_fk_none_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
+alter table migtest_fk_none_via_join add constraint fk_migtest_fk_none_via_join_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
+alter table if exists migtest_fk_set_null drop constraint if exists fk_migtest_fk_set_null_one_id;
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
 
 update migtest_e_basic set status = 'A' where status is null;
 alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
@@ -34,6 +40,11 @@ alter table migtest_e_basic add column progress integer not null default 0;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2));
 alter table migtest_e_basic add column new_integer integer not null default 42;
 
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
+alter table migtest_e_basic add constraint uq_migtest_e_basic_name unique  (name);
+alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique  (indextest4);
+alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
 
 alter table migtest_e_history alter column test_string TYPE bigint USING (test_string::integer);
 comment on column migtest_e_history.test_string is 'Column altered to long now';
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
index 059350256..e68509998 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
@@ -5,6 +5,12 @@ create table migtest_e_ref (
   constraint pk_migtest_e_ref primary key (id)
 );
 
+alter table if exists migtest_fk_cascade drop constraint if exists fk_migtest_fk_cascade_one_id;
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
+alter table if exists migtest_fk_none drop constraint if exists fk_migtest_fk_none_one_id;
+alter table if exists migtest_fk_none_via_join drop constraint if exists fk_migtest_fk_none_via_join_one_id;
+alter table if exists migtest_fk_set_null drop constraint if exists fk_migtest_fk_set_null_one_id;
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
 alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
 alter table migtest_e_basic alter column status drop default;
 alter table migtest_e_basic alter column status drop not null;
@@ -21,6 +27,11 @@ alter table migtest_e_basic add column old_boolean boolean not null default fals
 alter table migtest_e_basic add column old_boolean2 boolean;
 alter table migtest_e_basic add column eref_id integer;
 
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
+alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique  (indextest2);
+alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique  (indextest6);
 comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
 alter table migtest_e_history2 alter column test_string drop default;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
index 8145120ce..cf4fd1839 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
@@ -1,5 +1,41 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+create table migtest_fk_cascade (
+  id                            integer not null,
+  one_id                        integer,
+  constraint pk_migtest_fk_cascade primary key (id),
+  foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade
+);
+
+create table migtest_fk_cascade_one (
+  id                            integer not null,
+  constraint pk_migtest_fk_cascade_one primary key (id)
+);
+
+create table migtest_fk_none (
+  id                            integer not null,
+  one_id                        integer,
+  constraint pk_migtest_fk_none primary key (id)
+);
+
+create table migtest_fk_none_via_join (
+  id                            integer not null,
+  one_id                        integer,
+  constraint pk_migtest_fk_none_via_join primary key (id)
+);
+
+create table migtest_fk_one (
+  id                            integer not null,
+  constraint pk_migtest_fk_one primary key (id)
+);
+
+create table migtest_fk_set_null (
+  id                            integer not null,
+  one_id                        integer,
+  constraint pk_migtest_fk_set_null primary key (id),
+  foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null
+);
+
 create table migtest_e_basic (
   id                            integer not null,
   status                        varchar(1),
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
index e664099c4..f1e14b4fb 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
@@ -5,6 +5,8 @@ create table migtest_e_user (
   constraint pk_migtest_e_user primary key (id)
 );
 
+alter table migtest_fk_cascade drop constraint if exists fk_migtest_fk_cascade_one_id;
+alter table migtest_fk_set_null drop constraint if exists fk_migtest_fk_set_null_one_id;
 
 update migtest_e_basic set status = 'A' where status is null;
 alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
@@ -30,6 +32,11 @@ alter table migtest_e_basic add column progress integer not null default 0;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2));
 alter table migtest_e_basic add column new_integer integer not null default 42;
 
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
+alter table migtest_e_basic add constraint uq_migtest_e_basic_name unique  (name);
+alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique  (indextest4);
+alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
 alter table migtest_e_history alter column test_string integer;
 
 update migtest_e_history2 set test_string = 'unknown' where test_string is null;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
index 85c1872c4..262edf014 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
@@ -5,6 +5,10 @@ create table migtest_e_ref (
   constraint pk_migtest_e_ref primary key (id)
 );
 
+alter table migtest_fk_cascade drop constraint if exists fk_migtest_fk_cascade_one_id;
+alter table migtest_fk_none drop constraint if exists fk_migtest_fk_none_one_id;
+alter table migtest_fk_none_via_join drop constraint if exists fk_migtest_fk_none_via_join_one_id;
+alter table migtest_fk_set_null drop constraint if exists fk_migtest_fk_set_null_one_id;
 alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
 alter table migtest_e_basic alter column status drop default;
 alter table migtest_e_basic alter column status set null;
@@ -21,6 +25,11 @@ alter table migtest_e_basic add column old_boolean int default 0 not null;
 alter table migtest_e_basic add column old_boolean2 int default 0;
 alter table migtest_e_basic add column eref_id integer;
 
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
+alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique  (indextest2);
+alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique  (indextest6);
 alter table migtest_e_history2 alter column test_string drop default;
 alter table migtest_e_history2 alter column test_string set null;
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql
index dabb1f219..7237ea044 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql
@@ -1,5 +1,39 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+create table migtest_fk_cascade (
+  id                            numeric(19) identity(1,1) not null,
+  one_id                        numeric(19),
+  constraint pk_migtest_fk_cascade primary key (id)
+);
+
+create table migtest_fk_cascade_one (
+  id                            numeric(19) identity(1,1) not null,
+  constraint pk_migtest_fk_cascade_one primary key (id)
+);
+
+create table migtest_fk_none (
+  id                            numeric(19) identity(1,1) not null,
+  one_id                        numeric(19),
+  constraint pk_migtest_fk_none primary key (id)
+);
+
+create table migtest_fk_none_via_join (
+  id                            numeric(19) identity(1,1) not null,
+  one_id                        numeric(19),
+  constraint pk_migtest_fk_none_via_join primary key (id)
+);
+
+create table migtest_fk_one (
+  id                            numeric(19) identity(1,1) not null,
+  constraint pk_migtest_fk_one primary key (id)
+);
+
+create table migtest_fk_set_null (
+  id                            numeric(19) identity(1,1) not null,
+  one_id                        numeric(19),
+  constraint pk_migtest_fk_set_null primary key (id)
+);
+
 create table migtest_e_basic (
   id                            integer identity(1,1) not null,
   status                        varchar(1),
@@ -47,6 +81,12 @@ create table migtest_e_softdelete (
 
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
+create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
+
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
+create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
+
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id);
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql
index f8d092588..810437398 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql
@@ -5,6 +5,12 @@ create table migtest_e_user (
   constraint pk_migtest_e_user primary key (id)
 );
 
+IF OBJECT_ID('fk_migtest_fk_cascade_one_id', 'F') IS NOT NULL alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id);
+alter table migtest_fk_none add constraint fk_migtest_fk_none_one_id foreign key (one_id) references migtest_fk_one (id);
+alter table migtest_fk_none_via_join add constraint fk_migtest_fk_none_via_join_one_id foreign key (one_id) references migtest_fk_one (id);
+IF OBJECT_ID('fk_migtest_fk_set_null_one_id', 'F') IS NOT NULL alter table migtest_fk_set_null drop constraint fk_migtest_fk_set_null_one_id;
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id);
 
 update migtest_e_basic set status = 'A' where status is null;
 IF (OBJECT_ID('ck_migtest_e_basic_status', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
@@ -31,6 +37,13 @@ alter table migtest_e_basic add progress integer not null default 0;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2));
 alter table migtest_e_basic add new_integer integer not null default 42;
 
+IF (OBJECT_ID('uq_migtest_e_basic_indextest2', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_indextest2') drop index uq_migtest_e_basic_indextest2 ON migtest_e_basic;
+IF (OBJECT_ID('uq_migtest_e_basic_indextest6', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_indextest6') drop index uq_migtest_e_basic_indextest6 ON migtest_e_basic;
+create unique nonclustered index uq_migtest_e_basic_name on migtest_e_basic(name) where name is not null;
+create unique nonclustered index uq_migtest_e_basic_indextest4 on migtest_e_basic(indextest4) where indextest4 is not null;
+create unique nonclustered index uq_migtest_e_basic_indextest5 on migtest_e_basic(indextest5) where indextest5 is not null;
 alter table migtest_e_history alter column test_string numeric(19);
 
 update migtest_e_history2 set test_string = 'unknown' where test_string is null;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql
index 1fadd3ad6..9cfd7a26d 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql
@@ -5,6 +5,12 @@ create table migtest_e_ref (
   constraint pk_migtest_e_ref primary key (id)
 );
 
+IF OBJECT_ID('fk_migtest_fk_cascade_one_id', 'F') IS NOT NULL alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
+IF OBJECT_ID('fk_migtest_fk_none_one_id', 'F') IS NOT NULL alter table migtest_fk_none drop constraint fk_migtest_fk_none_one_id;
+IF OBJECT_ID('fk_migtest_fk_none_via_join_one_id', 'F') IS NOT NULL alter table migtest_fk_none_via_join drop constraint fk_migtest_fk_none_via_join_one_id;
+IF OBJECT_ID('fk_migtest_fk_set_null_one_id', 'F') IS NOT NULL alter table migtest_fk_set_null drop constraint fk_migtest_fk_set_null_one_id;
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
 IF (OBJECT_ID('ck_migtest_e_basic_status', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
 delimiter $$
 DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
@@ -28,6 +34,14 @@ alter table migtest_e_basic add old_boolean bit default 0 not null;
 alter table migtest_e_basic add old_boolean2 bit default 0;
 alter table migtest_e_basic add eref_id integer;
 
+IF (OBJECT_ID('uq_migtest_e_basic_name', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_name') drop index uq_migtest_e_basic_name ON migtest_e_basic;
+IF (OBJECT_ID('uq_migtest_e_basic_indextest4', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_indextest4') drop index uq_migtest_e_basic_indextest4 ON migtest_e_basic;
+IF (OBJECT_ID('uq_migtest_e_basic_indextest5', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_indextest5') drop index uq_migtest_e_basic_indextest5 ON migtest_e_basic;
+create unique nonclustered index uq_migtest_e_basic_indextest2 on migtest_e_basic(indextest2) where indextest2 is not null;
+create unique nonclustered index uq_migtest_e_basic_indextest6 on migtest_e_basic(indextest6) where indextest6 is not null;
 delimiter $$
 DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
   join sys.columns t2 on t1.object_id = t2.default_object_id

From cec65cc888732008c3f5c96f68337744b3cfc342 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 26 Feb 2018 14:32:38 +1300
Subject: [PATCH 0077/1036] #1279 - Change ObjectFactory method to match, tidy
 format (no real change here)

---
 .../ebeaninternal/dbmigration/ddlgeneration/TableDdl.java  | 1 -
 .../dbmigration/ddlgeneration/platform/BaseTableDdl.java   | 4 +---
 .../ebeaninternal/dbmigration/migration/ObjectFactory.java | 4 ++--
 .../java/io/ebeaninternal/dbmigration/model/MTable.java    | 7 ++-----
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java
index 3ea2eacad..1ef34384b 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java
@@ -77,7 +77,6 @@ public interface TableDdl {
 
   /**
    * Writes alter foreign key statements.
-   * @throws IOException
    */
   void generate(DdlWrite writer, AlterForeignKey alterForeignKey) throws IOException;
 
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
index abe8dfbbd..459531eea 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
@@ -663,9 +663,7 @@ public class BaseTableDdl implements TableDdl {
   @Override
   public void generate(DdlWrite writer, AlterForeignKey alterForeignKey) throws IOException {
     if (DdlHelp.isDropForeignKey(alterForeignKey.getColumnNames())) {
-
-      String ddl = platformDdl.alterTableDropForeignKey(alterForeignKey.getTableName(),
-          alterForeignKey.getName());
+      String ddl = platformDdl.alterTableDropForeignKey(alterForeignKey.getTableName(), alterForeignKey.getName());
       if (hasValue(ddl)) {
         writer.apply().append(ddl).endOfStatement();
       }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java b/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java
index 7687edf4f..472d67261 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java
@@ -195,9 +195,9 @@ public class ObjectFactory {
   }
 
   /**
-   * Create an instance of {@link CompoundUniqueConstraint }
+   * Create an instance of {@link AddUniqueConstraint }
    */
-  public AddUniqueConstraint createCompoundUniqueConstraint() {
+  public AddUniqueConstraint createAddUniqueConstraint() {
     return new AddUniqueConstraint();
   }
 
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
index a78d6fd53..cf5c64aff 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
@@ -169,8 +169,7 @@ public class MTable {
     }
     List<UniqueConstraint> uqConstraints = createTable.getUniqueConstraint();
     for (UniqueConstraint uq : uqConstraints) {
-      MCompoundUniqueConstraint mUq = new MCompoundUniqueConstraint(
-          SplitColumns.split(uq.getColumnNames()), uq.isOneToOne(), uq.getName());
+      MCompoundUniqueConstraint mUq = new MCompoundUniqueConstraint(SplitColumns.split(uq.getColumnNames()), uq.isOneToOne(), uq.getName());
       mUq.setNullableColumns(SplitColumns.split(uq.getNullableColumns()));
       uniqueConstraints.add(mUq);
     }
@@ -185,8 +184,7 @@ public class MTable {
   }
 
 
-  public void addForeignKey(String name, String refTableName, String indexName, String columnNames,
-      String refColumnNames) {
+  public void addForeignKey(String name, String refTableName, String indexName, String columnNames, String refColumnNames) {
     MCompoundForeignKey foreignKey = new MCompoundForeignKey(name, refTableName, indexName);
     String[] cols = SplitColumns.split(columnNames);
     String[] refCols = SplitColumns.split(refColumnNames);
@@ -194,7 +192,6 @@ public class MTable {
       foreignKey.addColumnPair(cols[i], refCols[i]);
     }
     addForeignKey(foreignKey);
-
   }
 
   /**

From 58def02cd12ff9248d74bb84b9b07c4628a341ed Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 26 Feb 2018 14:41:56 +1300
Subject: [PATCH 0078/1036] #1280 - Update test for - Remove "order by" clause
 of RawSql query when executing findCount()

The code fix associated with this is in CQueryBuilder line 276
---
 src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java b/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
index 5a9d4dd33..ffa8b83c8 100644
--- a/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
+++ b/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
@@ -228,10 +228,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
     query.order("id desc");
     PagedList<Order> pagedList = query.findPagedList();
     pagedList.getList();
-    if (!isSqlServer()) {
-      // sql server doesn't support order by in the count query, I wonder if we can remove it?
-      pagedList.getTotalCount();
-    }
+    pagedList.getTotalCount();
 
     if (isSqlServer()) {
       assertThat(sqlOf(query)).contains("select top 100 ");

From a3e5c3a7865cf2611282e38e9d03921471f48bf1 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 26 Feb 2018 15:04:57 +1300
Subject: [PATCH 0079/1036] #1281 - Test change only - Update DbMigrationTest
 for SQL Server using SEQUENCE based Identity

---
 .../migrationtest/sqlserver/1.0__initial.sql  | 34 +++++++++++++------
 .../migrationtest/sqlserver/1.1.sql           |  5 +--
 .../migrationtest/sqlserver/1.3.sql           |  1 +
 src/test/resources/docker-run.properties      | 12 +++----
 src/test/resources/ebean.properties           |  4 +--
 5 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql
index 7237ea044..70742f488 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql
@@ -1,41 +1,48 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_fk_cascade (
-  id                            numeric(19) identity(1,1) not null,
+  id                            numeric(19) not null,
   one_id                        numeric(19),
   constraint pk_migtest_fk_cascade primary key (id)
 );
+create sequence migtest_fk_cascade_seq as bigint  start with 1  increment by 50;
 
 create table migtest_fk_cascade_one (
-  id                            numeric(19) identity(1,1) not null,
+  id                            numeric(19) not null,
   constraint pk_migtest_fk_cascade_one primary key (id)
 );
+create sequence migtest_fk_cascade_one_seq as bigint  start with 1  increment by 50;
 
 create table migtest_fk_none (
-  id                            numeric(19) identity(1,1) not null,
+  id                            numeric(19) not null,
   one_id                        numeric(19),
   constraint pk_migtest_fk_none primary key (id)
 );
+create sequence migtest_fk_none_seq as bigint  start with 1  increment by 50;
 
 create table migtest_fk_none_via_join (
-  id                            numeric(19) identity(1,1) not null,
+  id                            numeric(19) not null,
   one_id                        numeric(19),
   constraint pk_migtest_fk_none_via_join primary key (id)
 );
+create sequence migtest_fk_none_via_join_seq as bigint  start with 1  increment by 50;
 
 create table migtest_fk_one (
-  id                            numeric(19) identity(1,1) not null,
+  id                            numeric(19) not null,
   constraint pk_migtest_fk_one primary key (id)
 );
+create sequence migtest_fk_one_seq as bigint  start with 1  increment by 50;
+
 
 create table migtest_fk_set_null (
-  id                            numeric(19) identity(1,1) not null,
+  id                            numeric(19) not null,
   one_id                        numeric(19),
   constraint pk_migtest_fk_set_null primary key (id)
 );
+create sequence migtest_fk_set_null_seq as bigint  start with 1  increment by 50;
 
 create table migtest_e_basic (
-  id                            integer identity(1,1) not null,
+  id                            integer not null,
   status                        varchar(1),
   name                          varchar(127),
   description                   varchar(127),
@@ -55,29 +62,34 @@ create table migtest_e_basic (
 );
 create unique nonclustered index uq_migtest_e_basic_indextest2 on migtest_e_basic(indextest2) where indextest2 is not null;
 create unique nonclustered index uq_migtest_e_basic_indextest6 on migtest_e_basic(indextest6) where indextest6 is not null;
+create sequence migtest_e_basic_seq as bigint  start with 1  increment by 50;
 
 create table migtest_e_history (
-  id                            integer identity(1,1) not null,
+  id                            integer not null,
   test_string                   varchar(255),
   constraint pk_migtest_e_history primary key (id)
 );
+create sequence pk_migtest_e_history_seq as bigint  start with 1  increment by 50;
 
 create table migtest_e_history2 (
-  id                            integer identity(1,1) not null,
+  id                            integer not null,
   test_string                   varchar(255),
   constraint pk_migtest_e_history2 primary key (id)
 );
+create sequence migtest_e_history2_seq as bigint  start with 1  increment by 50;
 
 create table migtest_e_ref (
-  id                            integer identity(1,1) not null,
+  id                            integer not null,
   constraint pk_migtest_e_ref primary key (id)
 );
+create sequence migtest_e_ref_seq as bigint  start with 1  increment by 50;
 
 create table migtest_e_softdelete (
-  id                            integer identity(1,1) not null,
+  id                            integer not null,
   test_string                   varchar(255),
   constraint pk_migtest_e_softdelete primary key (id)
 );
+create sequence migtest_e_softdelete_seq as bigint  start with 1  increment by 50;
 
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql
index 810437398..9bdf6cdc6 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql
@@ -1,9 +1,10 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_e_user (
-  id                            integer identity(1,1) not null,
+  id                            integer not null,
   constraint pk_migtest_e_user primary key (id)
 );
+create sequence migtest_e_user_seq as bigint  start with 1  increment by 50;
 
 IF OBJECT_ID('fk_migtest_fk_cascade_one_id', 'F') IS NOT NULL alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id);
@@ -32,7 +33,7 @@ alter table migtest_e_basic add new_string_field varchar(255) not null default '
 alter table migtest_e_basic add new_boolean_field bit default 0 not null;
 update migtest_e_basic set new_boolean_field = old_boolean;
 
-alter table migtest_e_basic add new_boolean_field2 bit default 0 not null;
+alter table migtest_e_basic add new_boolean_field2 bit default 1 not null;
 alter table migtest_e_basic add progress integer not null default 0;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2));
 alter table migtest_e_basic add new_integer integer not null default 42;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql
index 9cfd7a26d..c6add60d1 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql
@@ -4,6 +4,7 @@ create table migtest_e_ref (
   id                            integer identity(1,1) not null,
   constraint pk_migtest_e_ref primary key (id)
 );
+create sequence migtest_e_ref_seq as bigint  start with 1  increment by 50;
 
 IF OBJECT_ID('fk_migtest_fk_cascade_one_id', 'F') IS NOT NULL alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
diff --git a/src/test/resources/docker-run.properties b/src/test/resources/docker-run.properties
index 467515d9b..c19909fda 100644
--- a/src/test/resources/docker-run.properties
+++ b/src/test/resources/docker-run.properties
@@ -5,12 +5,12 @@
 #mysql.dbPassword=test
 #mysql.startMode=dropcreate
 
-#sqlserver.version=2017-CU2
-#sqlserver.port=1433
-#sqlserver.dbName=test_ebean
-#sqlserver.dbUser=test_ebean
-#sqlserver.dbPassword=SqlS3rv#r
-#sqlserver.startMode=dropcreate
+sqlserver.version=2017-CU2
+sqlserver.port=1433
+sqlserver.dbName=test_ebean
+sqlserver.dbUser=test_ebean
+sqlserver.dbPassword=SqlS3rv#r
+sqlserver.startMode=dropcreate
 
 #oracle.version=latest
 #oracle.dbUser=test_ebean
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index de6dedf71..6ad2403a8 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -15,12 +15,12 @@ ebean.encryptKeyManager=org.tests.basic.encrypt.BasicEncyptKeyManager
 #ebean.autotune.profiling=true
 #ebean.autotune.profilingUpdateFrequency=5
 
-ebean.sqlserver.ddl.createOnly=true
+#ebean.sqlserver.ddl.createOnly=true
 ebean.ddl.generate=true
 ebean.ddl.run=true
 ebean.ddl.header=-- Generated by ebean ${version} at ${timestamp}
 ebean.packages=org.tests
-datasource.default=h2
+datasource.default=sqlserver
 
 ebean.autoReadOnlyDataSource=true
 

From 0cba0664f8be4b5be1af3a96defe63f59f74249f Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 26 Feb 2018 15:06:17 +1300
Subject: [PATCH 0080/1036] #1281 - Test change only - default back from sql
 server to h2

---
 src/test/resources/docker-run.properties | 12 ++++++------
 src/test/resources/ebean.properties      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/test/resources/docker-run.properties b/src/test/resources/docker-run.properties
index c19909fda..467515d9b 100644
--- a/src/test/resources/docker-run.properties
+++ b/src/test/resources/docker-run.properties
@@ -5,12 +5,12 @@
 #mysql.dbPassword=test
 #mysql.startMode=dropcreate
 
-sqlserver.version=2017-CU2
-sqlserver.port=1433
-sqlserver.dbName=test_ebean
-sqlserver.dbUser=test_ebean
-sqlserver.dbPassword=SqlS3rv#r
-sqlserver.startMode=dropcreate
+#sqlserver.version=2017-CU2
+#sqlserver.port=1433
+#sqlserver.dbName=test_ebean
+#sqlserver.dbUser=test_ebean
+#sqlserver.dbPassword=SqlS3rv#r
+#sqlserver.startMode=dropcreate
 
 #oracle.version=latest
 #oracle.dbUser=test_ebean
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 6ad2403a8..99522c35b 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -20,7 +20,7 @@ ebean.ddl.generate=true
 ebean.ddl.run=true
 ebean.ddl.header=-- Generated by ebean ${version} at ${timestamp}
 ebean.packages=org.tests
-datasource.default=sqlserver
+datasource.default=h2
 
 ebean.autoReadOnlyDataSource=true
 

From a712be29178beaffd4be754dc063995b20664851 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 26 Feb 2018 22:09:52 +0100
Subject: [PATCH 0081/1036] auomatically append "order by id" when paging and
 query.orderById = true (#1275)

Add ServerConfig.setDefaultOrderById() and query.orderById(boolean) ... to control automatically append "order by id" with paging query
---
 src/main/java/io/ebean/Query.java             |  8 ++
 .../java/io/ebean/config/ServerConfig.java    | 21 +++++
 .../java/io/ebeaninternal/api/SpiQuery.java   |  8 +-
 .../server/deploy/BeanDescriptor.java         |  9 +-
 .../server/query/CQueryEngine.java            | 15 +---
 .../server/querydefn/DefaultOrmQuery.java     | 50 +++++++++--
 .../java/io/ebean/EbeanServer_eqlTest.java    | 37 ++++++++
 .../orderby/TestOrderByWithDistinct.java      | 26 ++++++
 .../query/other/TestQuerySingleAttribute.java |  4 +-
 .../org/tests/rawsql/TestRawSqlOrmQuery.java  | 89 ++++++++++++++++++-
 .../org/tests/update/TestSqlUpdateUpsert.java |  5 +-
 11 files changed, 235 insertions(+), 37 deletions(-)

diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index d8898ae5d..6102926c3 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -1507,4 +1507,12 @@ public interface Query<T> {
    */
   Set<String> validate();
 
+  /**
+   * Controls, if paginated queries should always append an 'order by id' statement at the end to
+   * guarantee a deterministic sort result. This may affect performance.
+   * If this is not enabled, and an orderBy is set on the query, it's up to the programmer that
+   * this query provides a deterministic result.
+   */
+  Query<T> orderById(boolean orderById);
+
 }
diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 03fcf0eed..b336029f8 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -488,6 +488,11 @@ public class ServerConfig {
 
   private ProfilingConfig profilingConfig = new ProfilingConfig();
 
+  /**
+   * Controls the default order by id setting of queries. See {@link Query#orderById(boolean)}
+   */
+  private boolean defaultOrderById = false;
+
   /**
    * Construct a Server Configuration for programmatically creating an EbeanServer.
    */
@@ -523,6 +528,21 @@ public class ServerConfig {
     this.slowQueryListener = slowQueryListener;
   }
 
+
+  /**
+   * Sets the default orderById setting for queries.
+   */
+  public void setDefaultOrderById(boolean defaultOrderById) {
+    this.defaultOrderById = defaultOrderById;
+  }
+
+  /**
+   * Returns the default orderById setting for queries.
+   */
+  public boolean isDefaultOrderById() {
+    return defaultOrderById;
+  }
+
   /**
    * Put a service object into configuration such that it can be passed to a plugin.
    * <p>
@@ -2767,6 +2787,7 @@ public class ServerConfig {
     databaseBooleanTrue = p.get("databaseBooleanTrue", databaseBooleanTrue);
     databaseBooleanFalse = p.get("databaseBooleanFalse", databaseBooleanFalse);
     databasePlatformName = p.get("databasePlatformName", databasePlatformName);
+    defaultOrderById = p.getBoolean("defaultOrderById", defaultOrderById);
 
     DbUuid dbUuid = p.getEnum(DbUuid.class, "dbuuid", null);
     if (dbUuid != null) {
diff --git a/src/main/java/io/ebeaninternal/api/SpiQuery.java b/src/main/java/io/ebeaninternal/api/SpiQuery.java
index 2be96bfd9..869f2ca1c 100644
--- a/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -1,7 +1,6 @@
 package io.ebeaninternal.api;
 
 import io.ebean.CacheMode;
-import io.ebean.EbeanServer;
 import io.ebean.ExpressionList;
 import io.ebean.OrderBy;
 import io.ebean.PersistenceContextScope;
@@ -338,7 +337,7 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
   /**
    * Return a copy of the query attaching to a different EbeanServer.
    */
-  SpiQuery<T> copy(EbeanServer server);
+  SpiQuery<T> copy(SpiEbeanServer server);
 
   /**
    * Return the type of query (List, Set, Map, Bean, rowCount etc).
@@ -593,6 +592,11 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
    */
   boolean checkPagingOrderBy();
 
+  /**
+   * Return true if there is no Order By clause.
+   */
+  boolean orderByIsEmpty();
+
   /**
    * Return the Order By clause or null if there is none defined.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 9cc43fef5..424c91363 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -3053,13 +3053,8 @@ public class BeanDescriptor<T> implements BeanType<T> {
    */
   public void appendOrderById(SpiQuery<T> query) {
 
-    if (idProperty != null && !idProperty.isEmbedded()) {
-      SpiRawSql rawSql = query.getRawSql();
-      if (rawSql != null) {
-        query.order(rawSql.getSql().getOrderBy());
-      } else {
-        query.order().asc(idProperty.getName());
-      }
+    if (idProperty != null && !idProperty.isEmbedded() && !query.order().containsProperty(idProperty.getName())) {
+      query.order().asc(idProperty.getName());
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
index 541a6f1ab..f03efc1a0 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
@@ -190,7 +190,6 @@ public class CQueryEngine {
    */
   public <T> QueryIterator<T> findIterate(OrmQueryRequest<T> request) {
 
-    prepareForPaging(request);
     CQuery<T> cquery = queryBuilder.buildQuery(request);
     request.setCancelableQuery(cquery);
 
@@ -326,24 +325,12 @@ public class CQueryEngine {
     return historySupport.getSysPeriodLower(rootTableAlias);
   }
 
-  /**
-   * deemed to be a be a paging query - check that the order by contains the id
-   * property to ensure unique row ordering for predicable paging but only in
-   * case, this is not a distinct query
-   */
-  private <T> void prepareForPaging(OrmQueryRequest<T> request) {
-    SpiQuery<T> query = request.getQuery();
-    if (query.checkPagingOrderBy()) {
-      request.getBeanDescriptor().appendOrderById(query);
-    }
-  }
+
   /**
    * Find a list/map/set of beans.
    */
   <T> BeanCollection<T> findMany(OrmQueryRequest<T> request) {
 
-    prepareForPaging(request);
-
     CQuery<T> cquery = queryBuilder.buildQuery(request);
     request.setCancelableQuery(cquery);
 
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index a7aef2d50..6a8648e90 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1,7 +1,6 @@
 package io.ebeaninternal.server.querydefn;
 
 import io.ebean.CacheMode;
-import io.ebean.EbeanServer;
 import io.ebean.Expression;
 import io.ebean.ExpressionFactory;
 import io.ebean.ExpressionList;
@@ -32,6 +31,7 @@ import io.ebeaninternal.api.CQueryPlanKey;
 import io.ebeaninternal.api.HashQuery;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.NaturalKeyQueryData;
+import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionList;
 import io.ebeaninternal.api.SpiExpressionValidation;
@@ -39,6 +39,7 @@ import io.ebeaninternal.api.SpiNamedParam;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.SpiQuerySecondary;
 import io.ebeaninternal.server.autotune.ProfilingListener;
+import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.TableJoin;
@@ -75,7 +76,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   private final BeanDescriptor<T> beanDescriptor;
 
-  private final EbeanServer server;
+  private final SpiEbeanServer server;
 
   private final ExpressionFactory expressionFactory;
 
@@ -254,6 +255,8 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   private String nativeSql;
 
+  private boolean orderById;
+
   /**
    * Identity the query for profiling purposes (expected to be unique for a bean type).
    */
@@ -261,10 +264,11 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   private ProfileLocation profileLocation;
 
-  public DefaultOrmQuery(BeanDescriptor<T> desc, EbeanServer server, ExpressionFactory expressionFactory) {
+  public DefaultOrmQuery(BeanDescriptor<T> desc, SpiEbeanServer server, ExpressionFactory expressionFactory) {
     this.beanDescriptor = desc;
     this.beanType = desc.getBeanType();
     this.server = server;
+    this.orderById = server.getServerConfig().isDefaultOrderById();
     this.expressionFactory = expressionFactory;
     this.detail = new OrmQueryDetail();
   }
@@ -279,6 +283,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
 
+  @Override
   public boolean isFindAll() {
     return whereExpressions == null && nativeSql == null && rawSql == null;
   }
@@ -304,6 +309,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     }
   }
 
+  @Override
   public short getProfileId() {
     return profileId;
   }
@@ -717,8 +723,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public DefaultOrmQuery<T> copy(EbeanServer server) {
-
+  public DefaultOrmQuery<T> copy(SpiEbeanServer server) {
     DefaultOrmQuery<T> copy = new DefaultOrmQuery<>(beanDescriptor, server, expressionFactory);
     copy.m2mIncludeJoin = m2mIncludeJoin;
     copy.profilingListener = profilingListener;
@@ -742,6 +747,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     if (orderBy != null) {
       copy.orderBy = orderBy.copy();
     }
+    copy.orderById = orderById;
     if (bindParams != null) {
       copy.bindParams = bindParams.copy();
     }
@@ -1037,6 +1043,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   public CQueryPlanKey prepare(BeanQueryRequest<?> request) {
 
     prepareExpressions(request);
+    prepareForPaging((OrmQueryRequest) request);
     queryPlanKey = createQueryPlanKey();
     return queryPlanKey;
   }
@@ -1054,6 +1061,24 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     }
   }
 
+  /**
+   * deemed to be a be a paging query - check that the order by contains the id
+   * property to ensure unique row ordering for predicable paging but only in
+   * case, this is not a distinct query
+   */
+  private void prepareForPaging(OrmQueryRequest<T> request) {
+
+    // add the rawSql statement - if any
+    if (orderByIsEmpty()) {
+      SpiRawSql rawSql = getRawSql();
+      if (rawSql != null && rawSql.getSql() != null) {
+        order(rawSql.getSql().getOrderBy());
+      }
+    }
+    if (checkPagingOrderBy()) {
+      request.getBeanDescriptor().appendOrderById(this);
+    }
+  }
   /**
    * Calculate a hash based on the bind values used in the query.
    * <p>
@@ -1388,10 +1413,11 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   @Override
   public boolean checkPagingOrderBy() {
-    return (maxRows > 1 || firstRow > 0) && !distinct && orderByIsEmpty();
+    return (maxRows > 1 || firstRow > 0) && !distinct && (orderByIsEmpty() || isOrderById());
   }
 
-  private boolean orderByIsEmpty() {
+  @Override
+  public boolean orderByIsEmpty() {
     return orderBy == null || orderBy.isEmpty();
   }
 
@@ -1776,4 +1802,14 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   public ProfileLocation getProfileLocation() {
     return profileLocation;
   }
+
+  @Override
+  public Query<T> orderById(boolean orderById) {
+    this.orderById = orderById;
+    return this;
+  }
+
+  public boolean isOrderById() {
+    return orderById;
+  }
 }
diff --git a/src/test/java/io/ebean/EbeanServer_eqlTest.java b/src/test/java/io/ebean/EbeanServer_eqlTest.java
index 42dfc0905..a29e00bad 100644
--- a/src/test/java/io/ebean/EbeanServer_eqlTest.java
+++ b/src/test/java/io/ebean/EbeanServer_eqlTest.java
@@ -1,5 +1,6 @@
 package io.ebean;
 
+import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
@@ -8,6 +9,8 @@ import javax.persistence.PersistenceException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.util.List;
+
 public class EbeanServer_eqlTest extends BaseTestCase {
 
 
@@ -85,6 +88,40 @@ public class EbeanServer_eqlTest extends BaseTestCase {
     } else {
       assertThat(query.getGeneratedSql()).endsWith("order by t0.name limit 10 offset 3");
     }
+
+    // check also select count(*)
+    LoggedSqlCollector.start();
+    query.findCount();
+    List<String>sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).startsWith("select count(*) from o_customer t0;");
+  }
+
+  @Test
+  public void basic_limit_offset2_with_id() {
+
+    ResetBasicData.reset();
+
+    Query<Customer> query = Ebean.createQuery(Customer.class, "order by name");
+    query.setMaxRows(10);
+    query.setFirstRow(3);
+    query.orderById(true);
+    query.findList();
+
+    if (isSqlServer()) {
+      assertThat(query.getGeneratedSql()).endsWith("order by t0.name, t0.id offset 3 rows fetch next 10 rows only");
+    } else if (isOracle()) {
+      assertThat(query.getGeneratedSql()).contains("where rownum <= 13");
+      assertThat(query.getGeneratedSql()).contains("where rn_ > 3");
+    } else {
+      assertThat(query.getGeneratedSql()).endsWith("order by t0.name, t0.id limit 10 offset 3");
+    }
+
+    // check also select count(*)
+    LoggedSqlCollector.start();
+    query.findCount();
+    List<String>sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).startsWith("select count(*) from o_customer t0;");
+
   }
 
   @Test
diff --git a/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java b/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java
index 4b5b2292a..2090a0566 100644
--- a/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java
+++ b/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java
@@ -37,6 +37,32 @@ public class TestOrderByWithDistinct extends BaseTestCase {
 
   }
 
+
+  @Test
+  public void testOrderByWithDistinct() {
+    Query<MUser> query = Ebean.find(MUser.class);
+    query.findList();
+
+    assertThat(query.getGeneratedSql()).doesNotContain("order by");
+    assertThat(query.getGeneratedSql()).doesNotContain("select distinct");
+
+    query.setMaxRows(1000);
+    query.findList();
+    assertThat(query.getGeneratedSql()).contains("order by t0.userid");
+
+    query = Ebean.find(MUser.class)
+        .where()
+        .eq("roles.roleName", "A")
+        .query();
+    query.findList();
+    assertThat(query.getGeneratedSql()).doesNotContain("order by");
+    assertThat(query.getGeneratedSql()).contains("select distinct");
+
+    query.setMaxRows(1000);
+    query.findList();
+    assertThat(query.getGeneratedSql()).contains("order by t0.userid");
+  }
+
   @Test
   public void test() {
     /*
diff --git a/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
index 125c01373..27305412c 100644
--- a/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
+++ b/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
@@ -244,11 +244,11 @@ public class TestQuerySingleAttribute extends BaseTestCase {
 
     List<String> ids = query.findSingleAttributeList();
     if (isSqlServer()) {
-      assertThat(sqlOf(query)).contains("select top 100 t0.id from o_customer t0");
+      assertThat(sqlOf(query)).contains("select top 100 t0.id from o_customer t0 order by t0.id");
     } else if (isOracle()) {
       assertThat(sqlOf(query)).contains("where rownum <= 100");
     } else {
-      assertThat(sqlOf(query)).contains("select t0.id from o_customer t0 limit 100");
+      assertThat(sqlOf(query)).contains("select t0.id from o_customer t0 order by t0.id limit 100");
     }
     assertThat(ids).isNotEmpty();
   }
diff --git a/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java b/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
index ffa8b83c8..fe0850c4d 100644
--- a/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
+++ b/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
@@ -10,6 +10,8 @@ import io.ebean.RawSql;
 import io.ebean.RawSqlBuilder;
 import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.Platform;
+
+import org.ebeantest.LoggedSqlCollector;
 import org.junit.Assert;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
@@ -67,6 +69,13 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
 
     List<Customer> list = query.findList();
     Assert.assertNotNull(list);
+
+    // check also select count(*)
+    LoggedSqlCollector.start();
+    assertThat(query.findCount()).isEqualTo(list.size());
+    List<String>sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).startsWith("select count(*) from ( select r.id, r.name from o_customer r");
+    assertThat(sql.get(0)).doesNotContain("order by");
   }
 
   @Test
@@ -104,7 +113,6 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
 
     query.setFirstRow(1);
     query.setMaxRows(2);
-    query.order().asc("id");
 
     List<Customer> list = query.findList();
 
@@ -170,12 +178,54 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
 
     if (isSqlServer()) {
       assertThat(query.getGeneratedSql()).contains("top 100 ");
-      assertThat(query.getGeneratedSql()).contains("order by o.ship_date desc");
+      assertThat(query.getGeneratedSql()).contains("order by o.ship_date desc ");
     } else if (isOracle()) {
       assertThat(query.getGeneratedSql()).contains("a  where rownum <= 100 )");
     } else {
       assertThat(query.getGeneratedSql()).contains("order by o.ship_date desc limit 100");
     }
+
+    // check also select count(*)
+    LoggedSqlCollector.start();
+    query.findCount();
+    List<String>sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).startsWith("select count(*) from ( select o.id, o.order_date, o.ship_date from o_order o");
+    assertThat(sql.get(0)).doesNotContain("order by");
+  }
+
+  @Test
+  public void testPaging_with_existingRawSqlOrderBy_expect_id_appendToOrderBy_with_id() {
+
+    ResetBasicData.reset();
+
+    RawSql rawSql = RawSqlBuilder.parse("select o.id, o.order_date, o.ship_date from o_order o order by o.ship_date desc")
+      .columnMapping("o.id", "id")
+      .columnMapping("o.order_date", "orderDate")
+      .columnMapping("o.ship_date", "shipDate")
+      .create();
+
+    Query<Order> query = Ebean.find(Order.class);
+    query.setRawSql(rawSql);
+    query.orderById(true);
+
+    query.setMaxRows(100);
+    query.findList();
+
+    if (isSqlServer()) {
+      assertThat(query.getGeneratedSql()).contains("top 100 ");
+      assertThat(query.getGeneratedSql()).contains("order by o.ship_date desc, o.id ");
+    } else if (isOracle()) {
+      assertThat(query.getGeneratedSql()).contains("a  where rownum <= 100 )");
+    } else {
+      assertThat(query.getGeneratedSql()).contains("order by o.ship_date desc, o.id limit 100");
+    }
+
+    // check also select count(*)
+    LoggedSqlCollector.start();
+    query.findCount();
+    List<String>sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).startsWith("select count(*) from ( select o.id, o.order_date, o.ship_date from o_order o");
+    assertThat(sql.get(0)).doesNotContain("order by");
   }
 
   @IgnorePlatform(Platform.ORACLE)
@@ -199,7 +249,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
       query.order("coalesce(shipDate, getdate()) desc");
       query.findList();
 
-      assertThat(sqlOf(query)).contains("order by coalesce(o.ship_date, getdate()) desc");
+      assertThat(sqlOf(query)).contains("order by coalesce(o.ship_date, getdate()) desc ");
       assertThat(sqlOf(query)).contains("select top 100");
 
     } else {
@@ -210,6 +260,39 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
     }
   }
 
+  @IgnorePlatform(Platform.ORACLE)
+  @Test
+  public void testPaging_when_setOrderBy_expect_id_appendToOrderBy_with_id() {
+
+    ResetBasicData.reset();
+
+    RawSql rawSql = RawSqlBuilder.parse("select o.id, o.order_date, o.ship_date from o_order o order by o.ship_date desc nulls last")
+      .columnMapping("o.id", "id")
+      .columnMapping("o.order_date", "orderDate")
+      .columnMapping("o.ship_date", "shipDate")
+      .create();
+
+    Query<Order> query = Ebean.find(Order.class);
+    query.setRawSql(rawSql);
+
+    query.setMaxRows(100);
+    query.orderById(true);
+
+    if (isSqlServer()) {
+      query.order("coalesce(shipDate, getdate()) desc");
+      query.findList();
+
+      assertThat(sqlOf(query)).contains("order by coalesce(o.ship_date, getdate()) desc, o.id");
+      assertThat(sqlOf(query)).contains("select top 100");
+
+    } else {
+      query.order("coalesce(shipDate, now()) desc");
+      query.findList();
+
+      assertThat(query.getGeneratedSql()).contains("order by coalesce(o.ship_date, now()) desc, o.id limit 100");
+    }
+  }
+
   @Test
   public void testPaging_when_setOrderBy_containsId_expect_leaveAsIs() {
 
diff --git a/src/test/java/org/tests/update/TestSqlUpdateUpsert.java b/src/test/java/org/tests/update/TestSqlUpdateUpsert.java
index eeb761b4b..fe8669c82 100644
--- a/src/test/java/org/tests/update/TestSqlUpdateUpsert.java
+++ b/src/test/java/org/tests/update/TestSqlUpdateUpsert.java
@@ -13,7 +13,7 @@ public class TestSqlUpdateUpsert extends BaseTestCase {
 
   @ForPlatform(Platform.H2)
   @Test
-  public void h2Merge() {
+  public void h2Merge() throws InterruptedException {
 
     String sql = "merge into e_person_online (email, online_status, when_updated) key(email) values (?, ?, now())";
 
@@ -30,6 +30,7 @@ public class TestSqlUpdateUpsert extends BaseTestCase {
     assertThat(found.getEmail()).isEqualTo(email);
     assertThat(found.isOnlineStatus()).isTrue();
 
+    Thread.sleep(50); // have to wait some millis here
     String sqlNamed = "merge into e_person_online (email, online_status, when_updated) key(email) values (:email, :online, now())";
 
     SqlUpdate sqlUpdate2 = Ebean.createSqlUpdate(sqlNamed)
@@ -46,7 +47,7 @@ public class TestSqlUpdateUpsert extends BaseTestCase {
     assertThat(found2.getId()).isEqualTo(key);
     assertThat(found2.getEmail()).isEqualTo(email);
     assertThat(found2.isOnlineStatus()).isFalse();
-    assertThat(found2.getWhenUpdated()).isGreaterThan(found.getWhenUpdated());
+    assertThat(found2.getWhenUpdated()).isGreaterThan(found.getWhenUpdated()); // otherwise this test fails on my machine
   }
 
   @ForPlatform(Platform.POSTGRES)

From cdbbd749a3e06d9d147d19dd7cdb344583fb1268 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 26 Feb 2018 22:11:10 +0100
Subject: [PATCH 0082/1036] FIX: h2Merge test - which may fail due timing
 issues (#1284)

Test only change - FIX: h2Merge test - which may fail due timing issues

From 0e3f47ee82934d3cc4adea529a30f43e9aa4a764 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 26 Feb 2018 22:15:19 +0100
Subject: [PATCH 0083/1036] No effective code change: Fixwarnings, overrides,
 generics etc. (#1285)

---
 src/main/java/io/ebean/Pairs.java             |  2 +
 src/main/java/io/ebean/bean/CallStack.java    |  1 +
 .../config/dbplatform/DatabasePlatform.java   |  2 +-
 .../dbplatform/SequenceBatchIdGenerator.java  |  1 +
 .../dbplatform/SequenceStepIdGenerator.java   |  1 +
 .../ebean/config/properties/YamlLoader.java   | 63 ++++++++++---------
 src/main/java/io/ebean/text/json/EJson.java   |  1 -
 .../java/io/ebean/util/AnnotationUtil.java    |  8 ++-
 .../java/io/ebeaninternal/api/ScopeTrans.java |  1 +
 .../ebeaninternal/api/ScopedTransaction.java  |  1 +
 .../io/ebeaninternal/api/SpiExpression.java   |  2 +-
 .../server/cache/RemoteCacheEvent.java        |  1 +
 .../server/core/OrmQueryRequest.java          |  1 +
 .../deploy/BeanDescriptorCacheHelp.java       |  4 +-
 .../server/deploy/BeanProperty.java           |  5 +-
 .../server/deploy/BeanPropertyAssocOne.java   |  2 +
 .../server/deploy/DeployPropertyParser.java   |  1 +
 .../server/expression/AbstractExpression.java |  2 +-
 .../expression/DefaultExampleExpression.java  |  2 +-
 .../expression/DefaultExpressionList.java     |  2 +-
 .../expression/ExistsQueryExpression.java     |  2 +-
 .../server/expression/InExpression.java       |  2 +-
 .../server/expression/InPairsExpression.java  |  2 +-
 .../server/expression/JunctionExpression.java |  2 +-
 .../server/expression/LogicExpression.java    |  2 +-
 .../NestedPathWrapperExpression.java          |  2 +-
 .../expression/NonPrepareExpression.java      |  2 +-
 .../server/expression/NoopExpression.java     |  2 +-
 .../server/expression/NotExpression.java      |  2 +-
 .../server/expression/SimpleExpression.java   |  2 +-
 .../server/profile/BasicProfileLocation.java  |  2 +
 .../server/profile/DProfileLocation.java      |  2 +
 .../server/profile/DTimeMetricStats.java      |  2 +
 .../server/profile/DTimedMetric.java          |  2 +-
 .../server/querydefn/OrmQueryPlanKey.java     |  1 +
 .../transaction/TransactionManager.java       |  3 +
 .../server/type/ArrayElementConverter.java    |  1 +
 .../type/ArrayElementConverterEnum.java       |  2 +-
 .../server/type/ScalarTypeArrayList.java      |  1 -
 .../server/type/ScalarTypeArraySetH2.java     |  4 +-
 .../dbmigration/model/EntryTest.java          |  1 -
 .../TestDiffHelpInsertWithEmbedded.java       |  1 -
 .../org/tests/model/onetoone/OtoPrime.java    |  1 +
 .../tests/model/onetoone/OtoPrimeExtra.java   |  1 +
 .../org/tests/model/onetoone/OtoUBPrime.java  |  1 +
 .../tests/model/onetoone/OtoUBPrimeExtra.java |  1 +
 .../org/tests/model/onetoone/OtoUPrime.java   |  1 +
 .../tests/model/onetoone/OtoUPrimeExtra.java  |  1 +
 48 files changed, 89 insertions(+), 62 deletions(-)

diff --git a/src/main/java/io/ebean/Pairs.java b/src/main/java/io/ebean/Pairs.java
index 8929e3dd1..d32d1c986 100644
--- a/src/main/java/io/ebean/Pairs.java
+++ b/src/main/java/io/ebean/Pairs.java
@@ -158,6 +158,7 @@ public class Pairs {
     return this;
   }
 
+  @Override
   public String toString() {
     return "p0:" + property0 + " p1:" + property1 + " entries:" + entries;
   }
@@ -183,6 +184,7 @@ public class Pairs {
       this.b = b;
     }
 
+    @Override
     public String toString() {
       return "{" + a + "," + b + "}";
     }
diff --git a/src/main/java/io/ebean/bean/CallStack.java b/src/main/java/io/ebean/bean/CallStack.java
index 1453c4238..d9006a026 100644
--- a/src/main/java/io/ebean/bean/CallStack.java
+++ b/src/main/java/io/ebean/bean/CallStack.java
@@ -43,6 +43,7 @@ public final class CallStack implements Serializable {
     return hc;
   }
 
+  @Override
   public int hashCode() {
     return hc;
   }
diff --git a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
index 190e69d97..2f105e0d6 100644
--- a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
@@ -7,7 +7,7 @@ import io.ebean.annotation.Platform;
 import io.ebean.config.CustomDbTypeMapping;
 import io.ebean.config.DbTypeConfig;
 import io.ebean.config.ServerConfig;
-import io.ebeaninternal.util.JdbcClose;
+import io.ebeaninternal.util.JdbcClose; // FIXME: should not import ebeaninternal here
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/ebean/config/dbplatform/SequenceBatchIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/SequenceBatchIdGenerator.java
index 6444e0d55..683203b8c 100644
--- a/src/main/java/io/ebean/config/dbplatform/SequenceBatchIdGenerator.java
+++ b/src/main/java/io/ebean/config/dbplatform/SequenceBatchIdGenerator.java
@@ -44,6 +44,7 @@ public abstract class SequenceBatchIdGenerator extends SequenceIdGenerator {
   /**
    * Add the next set of Ids as the next value plus all the following numbers up to the step size.
    */
+  @Override
   protected List<Long> readIds(ResultSet resultSet, int loadSize) throws SQLException {
 
     List<Long> newIds = new ArrayList<>(loadSize);
diff --git a/src/main/java/io/ebean/config/dbplatform/SequenceStepIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/SequenceStepIdGenerator.java
index 3e632e5fa..c4039a6f2 100644
--- a/src/main/java/io/ebean/config/dbplatform/SequenceStepIdGenerator.java
+++ b/src/main/java/io/ebean/config/dbplatform/SequenceStepIdGenerator.java
@@ -23,6 +23,7 @@ public abstract class SequenceStepIdGenerator extends SequenceIdGenerator {
   /**
    * Add the next set of Ids as the next value plus all the following numbers up to the step size.
    */
+  @Override
   protected List<Long> readIds(ResultSet resultSet, int ignoreRequestSize) throws SQLException {
 
     List<Long> newIds = new ArrayList<>(allocationSize);
diff --git a/src/main/java/io/ebean/config/properties/YamlLoader.java b/src/main/java/io/ebean/config/properties/YamlLoader.java
index 764c73a38..2c472b22b 100644
--- a/src/main/java/io/ebean/config/properties/YamlLoader.java
+++ b/src/main/java/io/ebean/config/properties/YamlLoader.java
@@ -13,42 +13,43 @@ import java.util.Map;
  */
 class YamlLoader {
 
-	private final Yaml yaml = new Yaml();
+  private final Yaml yaml = new Yaml();
 
-	private final LoadContext loadContext;
+  private final LoadContext loadContext;
 
-	YamlLoader(LoadContext loadContext) {
-		this.loadContext = loadContext;
-	}
+  YamlLoader(LoadContext loadContext) {
+    this.loadContext = loadContext;
+  }
 
-	void load(InputStream is) {
-		if (is != null) {
-			loadMap(yaml.load(is), null);
-		}
-	}
+  void load(InputStream is) {
+    if (is != null) {
+      loadMap(yaml.load(is), null);
+    }
+  }
 
-	void loadMap(Map<String, Object> map, String path) {
+  @SuppressWarnings("unchecked")
+  void loadMap(Map<String, Object> map, String path) {
 
-		for (Map.Entry<String, Object> entry : map.entrySet()) {
-			String key = entry.getKey();
-			if (path != null) {
-				key = path + "." + key;
-			}
-			Object val = entry.getValue();
-			if (val instanceof Map) {
-				loadMap((Map<String, Object>) val, key);
-			} else  {
-				addScalar(key, val);
-			}
-		}
-	}
+    for (Map.Entry<String, Object> entry : map.entrySet()) {
+      String key = entry.getKey();
+      if (path != null) {
+        key = path + "." + key;
+      }
+      Object val = entry.getValue();
+      if (val instanceof Map) {
+        loadMap((Map<String, Object>) val, key);
+      } else  {
+        addScalar(key, val);
+      }
+    }
+  }
 
-	private void addScalar(String key, Object val) {
-		if (val instanceof String) {
-			loadContext.put(key, (String) val);
-		} else if (val instanceof Number || val instanceof Boolean) {
-			loadContext.put(key, val.toString());
-		}
-	}
+  private void addScalar(String key, Object val) {
+    if (val instanceof String) {
+      loadContext.put(key, (String) val);
+    } else if (val instanceof Number || val instanceof Boolean) {
+      loadContext.put(key, val.toString());
+    }
+  }
 
 }
diff --git a/src/main/java/io/ebean/text/json/EJson.java b/src/main/java/io/ebean/text/json/EJson.java
index b33b26dcb..f57253c22 100644
--- a/src/main/java/io/ebean/text/json/EJson.java
+++ b/src/main/java/io/ebean/text/json/EJson.java
@@ -136,7 +136,6 @@ public class EJson {
   /**
    * Parse the json returning as a List taking into account the current token.
    */
-  @SuppressWarnings("unchecked")
   public static <T> List<T> parseList(JsonParser parser, JsonToken currentToken) throws IOException {
     return plugin.parseList(parser, currentToken);
   }
diff --git a/src/main/java/io/ebean/util/AnnotationUtil.java b/src/main/java/io/ebean/util/AnnotationUtil.java
index 0f1f2275a..1aa7e421c 100644
--- a/src/main/java/io/ebean/util/AnnotationUtil.java
+++ b/src/main/java/io/ebean/util/AnnotationUtil.java
@@ -34,13 +34,14 @@ public class AnnotationUtil {
    * does not execute specialized search algorithms for classes or methods. It only traverses through Annotations!
    * It also does not filter out platform dependent annotations!
    */
+  @SuppressWarnings("unchecked")
   public static <A extends Annotation> A findAnnotation(AnnotatedElement annotatedElement, Class<A> annotationType) {
     if (annotationType == null) {
       return null;
     }
     // check if directly present, if not, start search for meta-annotations.
-    Annotation[] anns = annotatedElement.getAnnotations(); 
-    if (anns.length == 0) { 
+    Annotation[] anns = annotatedElement.getAnnotations();
+    if (anns.length == 0) {
       return null; // no annotations present, so searching for meta annotations not required
     }
 
@@ -51,7 +52,7 @@ public class AnnotationUtil {
         return (A) ann;
       }
     }
-    
+
     return findAnnotation(anns, annotationType, new HashSet<>());
 
   }
@@ -62,6 +63,7 @@ public class AnnotationUtil {
    * the supplied element.
    * <p><strong>Note</strong>: this method searches for annotations at class & superClass(es)!
    */
+  @SuppressWarnings("unchecked")
   public static <A extends Annotation> A findAnnotationRecursive(Class<?> clazz, Class<A> annotationType) {
     if (annotationType == null) {
       return null;
diff --git a/src/main/java/io/ebeaninternal/api/ScopeTrans.java b/src/main/java/io/ebeaninternal/api/ScopeTrans.java
index d1326423b..27c0430c9 100644
--- a/src/main/java/io/ebeaninternal/api/ScopeTrans.java
+++ b/src/main/java/io/ebeaninternal/api/ScopeTrans.java
@@ -89,6 +89,7 @@ public class ScopeTrans {
 
   }
 
+  @Override
   public String toString() {
     return "ScopeTrans[" + transaction + "]";
   }
diff --git a/src/main/java/io/ebeaninternal/api/ScopedTransaction.java b/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
index 9ecd6a3b7..833a3d7b6 100644
--- a/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
+++ b/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
@@ -25,6 +25,7 @@ public class ScopedTransaction extends SpiTransactionProxy {
     this.manager = manager;
   }
 
+  @Override
   public String toString() {
     return "ScopedTransaction[" + current + "]";
   }
diff --git a/src/main/java/io/ebeaninternal/api/SpiExpression.java b/src/main/java/io/ebeaninternal/api/SpiExpression.java
index f97380eb1..2e4954799 100644
--- a/src/main/java/io/ebeaninternal/api/SpiExpression.java
+++ b/src/main/java/io/ebeaninternal/api/SpiExpression.java
@@ -101,5 +101,5 @@ public interface SpiExpression extends Expression {
   /**
    * Check for match to a natural key query returning false if it doesn't match.
    */
-  boolean naturalKey(NaturalKeyQueryData data);
+  boolean naturalKey(NaturalKeyQueryData<?> data);
 }
diff --git a/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java b/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java
index 4881cfd77..e0def309f 100644
--- a/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java
+++ b/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java
@@ -51,6 +51,7 @@ public class RemoteCacheEvent {
     return clearCaches;
   }
 
+  @Override
   public String toString() {
     return "clearAll:" + clearAll + " caches:" + clearCaches;
   }
diff --git a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index 98692c0fc..e63a49d56 100644
--- a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -272,6 +272,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements BeanQueryRe
   /**
    * Rollback the transaction if it was created for this request.
    */
+  @Override
   public void rollbackTransIfRequired() {
     if (createdTransaction) {
       try {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index 97883d3d5..ac131a884 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -429,7 +429,7 @@ final class BeanDescriptorCacheHelp<T> {
 
   private Class<?> theClassOf(Collection<EntityBean> beans) {
     if (beans instanceof List) {
-      return ((List)beans).get(0).getClass();
+      return ((List<?>)beans).get(0).getClass();
     }
     return beans.iterator().next().getClass();
   }
@@ -532,7 +532,6 @@ final class BeanDescriptorCacheHelp<T> {
   /**
    * Return a bean from the bean cache.
    */
-  @SuppressWarnings("unchecked")
   private T beanCacheGetInternal(Object id, Boolean readOnly, PersistenceContext context) {
 
     CachedBeanData data = (CachedBeanData) getBeanCache().get(id);
@@ -548,6 +547,7 @@ final class BeanDescriptorCacheHelp<T> {
     return convertToBean(id, readOnly, context, data);
   }
 
+  @SuppressWarnings("unchecked")
   private T convertToBean(Object id, Boolean readOnly, PersistenceContext context, CachedBeanData data) {
     if (cacheSharableBeans && !Boolean.FALSE.equals(readOnly)) {
       Object bean = data.getSharableBean();
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 03b4bb2bd..05e69add2 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -1035,7 +1035,7 @@ public class BeanProperty implements ElPropertyValue, Property {
    */
   public Set<String> getDbCheckConstraintValues() {
     if (scalarType instanceof ScalarTypeEnum) {
-      return ((ScalarTypeEnum) scalarType).getDbCheckConstraintValues();
+      return ((ScalarTypeEnum<?>) scalarType).getDbCheckConstraintValues();
     }
     return null;
   }
@@ -1391,7 +1391,6 @@ public class BeanProperty implements ElPropertyValue, Property {
   /**
    * JSON write the property for 'insert only depth'.
    */
-  @SuppressWarnings("unchecked")
   public void jsonWriteForInsert(SpiJsonWriter writeJson, EntityBean bean) throws IOException {
     if (!jsonSerialize) {
       return;
@@ -1422,7 +1421,6 @@ public class BeanProperty implements ElPropertyValue, Property {
     jsonWriteVal(writeJson, getValueIntercept(bean));
   }
 
-  @SuppressWarnings("unchecked")
   private void jsonWriteVal(SpiJsonWriter writeJson, Object value) throws IOException {
     if (value == null) {
       writeJson.writeNullField(name);
@@ -1431,6 +1429,7 @@ public class BeanProperty implements ElPropertyValue, Property {
     }
   }
 
+  @SuppressWarnings("unchecked")
   private void jsonWriteScalar(SpiJsonWriter writeJson, Object value) throws IOException {
     if (scalarType != null) {
       writeJson.writeFieldName(name);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index 584f0fbfb..305ea9aa4 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -606,11 +606,13 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
     return localHelp.read(ctx);
   }
 
+  @Override
   public void addTenant(SpiQuery<?> query, Object tenantId) {
     T refBean = targetDescriptor.createReference(tenantId, null);
     query.where().eq(name, refBean);
   }
 
+  @Override
   public void setTenantValue(EntityBean entityBean, Object tenantId) {
     T refBean = targetDescriptor.createReference(tenantId, null);
     setValue(entityBean, refBean);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java b/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java
index 108e8f2d7..320d76a96 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java
@@ -34,6 +34,7 @@ public final class DeployPropertyParser extends DeployParser {
   /**
    * Skip if in raw sql expression with from tableName or join tableName.
    */
+  @Override
   protected boolean skipWordConvert() {
     return FROM.equalsIgnoreCase(priorWord) || JOIN.equalsIgnoreCase(priorWord);
   }
diff --git a/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java b/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java
index bef8c338e..0ae5cd6fc 100644
--- a/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java
@@ -23,7 +23,7 @@ public abstract class AbstractExpression implements SpiExpression {
   }
 
   @Override
-  public boolean naturalKey(NaturalKeyQueryData data) {
+  public boolean naturalKey(NaturalKeyQueryData<?> data) {
     // by default can't use naturalKey cache
     return false;
   }
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
index 6f35c9619..f1ac4243a 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
@@ -89,7 +89,7 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
   }
 
   @Override
-  public boolean naturalKey(NaturalKeyQueryData data) {
+  public boolean naturalKey(NaturalKeyQueryData<?> data) {
     // can't use naturalKey cache
     return false;
   }
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index ba342e559..49a6daec2 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -126,7 +126,7 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
   }
 
   @Override
-  public boolean naturalKey(NaturalKeyQueryData data) {
+  public boolean naturalKey(NaturalKeyQueryData<?> data) {
     // can't use naturalKey cache
     return false;
   }
diff --git a/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java b/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
index 37fa4d565..c6c214f4e 100644
--- a/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
@@ -37,7 +37,7 @@ class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreExpress
   }
 
   @Override
-  public boolean naturalKey(NaturalKeyQueryData data) {
+  public boolean naturalKey(NaturalKeyQueryData<?> data) {
     // can't use naturalKey cache
     return false;
   }
diff --git a/src/main/java/io/ebeaninternal/server/expression/InExpression.java b/src/main/java/io/ebeaninternal/server/expression/InExpression.java
index daf2a3f57..8c2d5f55d 100644
--- a/src/main/java/io/ebeaninternal/server/expression/InExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/InExpression.java
@@ -46,7 +46,7 @@ class InExpression extends AbstractExpression {
   }
 
   @Override
-  public boolean naturalKey(NaturalKeyQueryData data) {
+  public boolean naturalKey(NaturalKeyQueryData<?> data) {
     // can't use naturalKey cache for NOT IN
     return !not && data.matchIn(propName, bindValues);
   }
diff --git a/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java b/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
index ac02ef1d6..91f6742d6 100644
--- a/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
@@ -41,7 +41,7 @@ class InPairsExpression extends AbstractExpression {
   }
 
   @Override
-  public boolean naturalKey(NaturalKeyQueryData data) {
+  public boolean naturalKey(NaturalKeyQueryData<?> data) {
     return !not && data.matchInPairs(pairs);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index 5d16121ec..d54096cc6 100644
--- a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -61,7 +61,7 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
   }
 
   @Override
-  public boolean naturalKey(NaturalKeyQueryData data) {
+  public boolean naturalKey(NaturalKeyQueryData<?> data) {
     // can't use naturalKey cache
     return false;
   }
diff --git a/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java b/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java
index 670abb0ce..363b40aab 100644
--- a/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java
@@ -58,7 +58,7 @@ abstract class LogicExpression implements SpiExpression {
   }
 
   @Override
-  public boolean naturalKey(NaturalKeyQueryData data) {
+  public boolean naturalKey(NaturalKeyQueryData<?> data) {
     // can't use naturalKey cache
     return false;
   }
diff --git a/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java b/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java
index 61e0d82c8..c7f5d193e 100644
--- a/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java
@@ -25,7 +25,7 @@ class NestedPathWrapperExpression implements SpiExpression {
   }
 
   @Override
-  public boolean naturalKey(NaturalKeyQueryData data) {
+  public boolean naturalKey(NaturalKeyQueryData<?> data) {
     // can't use naturalKey cache
     return false;
   }
diff --git a/src/main/java/io/ebeaninternal/server/expression/NonPrepareExpression.java b/src/main/java/io/ebeaninternal/server/expression/NonPrepareExpression.java
index f27ab9f97..675e641ee 100644
--- a/src/main/java/io/ebeaninternal/server/expression/NonPrepareExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/NonPrepareExpression.java
@@ -10,7 +10,7 @@ import io.ebeaninternal.api.NaturalKeyQueryData;
 abstract class NonPrepareExpression implements SpiExpression {
 
   @Override
-  public boolean naturalKey(NaturalKeyQueryData data) {
+  public boolean naturalKey(NaturalKeyQueryData<?> data) {
     // can't use naturalKey cache
     return false;
   }
diff --git a/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java b/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java
index 28ff54916..6d6a7a58a 100644
--- a/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java
@@ -18,7 +18,7 @@ class NoopExpression implements SpiExpression {
   protected static final NoopExpression INSTANCE = new NoopExpression();
 
   @Override
-  public boolean naturalKey(NaturalKeyQueryData data) {
+  public boolean naturalKey(NaturalKeyQueryData<?> data) {
     // can't use naturalKey cache
     return false;
   }
diff --git a/src/main/java/io/ebeaninternal/server/expression/NotExpression.java b/src/main/java/io/ebeaninternal/server/expression/NotExpression.java
index 264d0d3db..8bafa95b0 100644
--- a/src/main/java/io/ebeaninternal/server/expression/NotExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/NotExpression.java
@@ -23,7 +23,7 @@ final class NotExpression implements SpiExpression {
   }
 
   @Override
-  public boolean naturalKey(NaturalKeyQueryData data) {
+  public boolean naturalKey(NaturalKeyQueryData<?> data) {
     // can't use naturalKey cache
     return false;
   }
diff --git a/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java b/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java
index e653873eb..4069999c3 100644
--- a/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java
@@ -28,7 +28,7 @@ public class SimpleExpression extends AbstractValueExpression {
   }
 
   @Override
-  public boolean naturalKey(NaturalKeyQueryData data) {
+  public boolean naturalKey(NaturalKeyQueryData<?> data) {
     // can't use naturalKey cache for NOT IN
     if (type != Op.EQ) {
       return false;
diff --git a/src/main/java/io/ebeaninternal/server/profile/BasicProfileLocation.java b/src/main/java/io/ebeaninternal/server/profile/BasicProfileLocation.java
index 4f0a9071b..790bf2128 100644
--- a/src/main/java/io/ebeaninternal/server/profile/BasicProfileLocation.java
+++ b/src/main/java/io/ebeaninternal/server/profile/BasicProfileLocation.java
@@ -15,6 +15,7 @@ class BasicProfileLocation implements ProfileLocation {
     this.shortDescription = shortDesc(location);
   }
 
+  @Override
   public String toString() {
     return shortDescription;
   }
@@ -24,6 +25,7 @@ class BasicProfileLocation implements ProfileLocation {
     // do nothing
   }
 
+  @Override
   public String obtain() {
     return location;
   }
diff --git a/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java b/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java
index 6ca3252e7..9a4afc62d 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java
@@ -28,6 +28,7 @@ class DProfileLocation implements ProfileLocation {
     this.lineNumber = lineNumber;
   }
 
+  @Override
   public String toString() {
     return "location: " + location;
   }
@@ -37,6 +38,7 @@ class DProfileLocation implements ProfileLocation {
     // do nothing
   }
 
+  @Override
   public String obtain() {
     // atomic assignment so happy with this
     if (location == null) {
diff --git a/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java b/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
index c69d1c00b..a30c41ff4 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
@@ -29,6 +29,7 @@ class DTimeMetricStats implements TimedMetricStats {
     this.max = max != Long.MIN_VALUE ? max : (count < 1 ? 0 : Math.round(total / count));
   }
 
+  @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     if (location != null) {
@@ -43,6 +44,7 @@ class DTimeMetricStats implements TimedMetricStats {
     return sb.toString();
   }
 
+  @Override
   public void setLocation(String location) {
     this.location = location;
   }
diff --git a/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java b/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
index be7927c29..4ba32caa7 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
@@ -54,7 +54,7 @@ class DTimedMetric implements TimedMetric {
     }
   }
 
-//  @Override
+  @Override
   public DTimeMetricStats collect(boolean reset) {
     boolean empty = count.sum() == 0;
     if (empty) {
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
index 314996b56..f8abd66b3 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
@@ -109,6 +109,7 @@ class OrmQueryPlanKey implements CQueryPlanKey {
     return planHash;
   }
 
+  @Override
   public String toString() {
     return description + " maxRows:" + maxRows + " firstRow:" + firstRow + " rawSqlKey:" + rawSqlKey + " planHash:" + planHash;
   }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index b9d3ce08f..2a8bf37cc 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -201,6 +201,7 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Return the current active transaction.
    */
+  @Override
   public SpiTransaction getActive() {
     return scopeManager.getActive();
   }
@@ -288,10 +289,12 @@ public class TransactionManager implements SpiTransactionManager {
     return serverName;
   }
 
+  @Override
   public DataSource getDataSource() {
     return dataSourceSupplier.getDataSource();
   }
 
+  @Override
   public DataSource getReadOnlyDataSource() {
     return dataSourceSupplier.getReadOnlyDataSource();
   }
diff --git a/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java b/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java
index e13a7d212..2c6c09b76 100644
--- a/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java
+++ b/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java
@@ -101,6 +101,7 @@ interface ArrayElementConverter<T> {
   /**
    * String converter (noop based).
    */
+  @SuppressWarnings("rawtypes")
   class EnumConverter implements ArrayElementConverter {
 
     private final ScalarType<?> scalarType;
diff --git a/src/main/java/io/ebeaninternal/server/type/ArrayElementConverterEnum.java b/src/main/java/io/ebeaninternal/server/type/ArrayElementConverterEnum.java
index 12f3aa624..fe5e9a490 100644
--- a/src/main/java/io/ebeaninternal/server/type/ArrayElementConverterEnum.java
+++ b/src/main/java/io/ebeaninternal/server/type/ArrayElementConverterEnum.java
@@ -13,7 +13,7 @@ public class ArrayElementConverterEnum implements ArrayElementConverter<String>
 
   @Override
   public String toElement(Object rawValue) {
-
+    // FIXME: Don't understand for what is this.
     Enum<?>[] enumConstants = valueType1.getEnumConstants();
     if (scalarType == null) {
       return rawValue.toString();
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
index 424f8da8b..0621fe833 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
@@ -59,7 +59,6 @@ public class ScalarTypeArrayList extends ScalarTypeJsonCollection<List> implemen
     }
 
     @Override
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     public ScalarTypeArrayList typeForEnum(ScalarType<?> scalarType) {
       return new ScalarTypeArrayList("varchar", DocPropertyType.TEXT, new ArrayElementConverter.EnumConverter(scalarType));
     }
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java
index 2c7ac0123..1d54314fa 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java
@@ -28,7 +28,6 @@ class ScalarTypeArraySetH2<T> extends ScalarTypeArraySet<T> {
      * Return the ScalarType to use based on the List's generic parameter type.
      */
     @Override
-    @SuppressWarnings("unchecked")
     public ScalarTypeArraySetH2<?> typeFor(Type valueType) {
       if (valueType.equals(java.util.UUID.class)) {
         return UUID;
@@ -49,12 +48,13 @@ class ScalarTypeArraySetH2<T> extends ScalarTypeArraySet<T> {
     }
 
     @Override
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     public ScalarTypeArraySetH2 typeForEnum(ScalarType<?> scalarType) {
       return new ScalarTypeArraySetH2("varchar", DocPropertyType.TEXT, new ArrayElementConverter.EnumConverter(scalarType));
     }
   }
 
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({ "unchecked", "rawtypes" })
   private ScalarTypeArraySetH2(String arrayType, DocPropertyType docPropertyType, ArrayElementConverter converter) {
     super(arrayType, docPropertyType, converter);
   }
diff --git a/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java
index 680ea207f..0a3546fd8 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java
@@ -2,7 +2,6 @@ package io.ebeaninternal.dbmigration.model;
 
 import io.ebeaninternal.dbmigration.migration.ChangeSet;
 import io.ebeaninternal.dbmigration.migration.DropColumn;
-import javax.annotation.Nonnull;
 import org.junit.Test;
 
 import static org.assertj.core.api.StrictAssertions.assertThat;
diff --git a/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java b/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java
index 2cfed3cde..7e04187dd 100644
--- a/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java
+++ b/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java
@@ -28,7 +28,6 @@ public class TestDiffHelpInsertWithEmbedded extends BaseTestCase {
   }
 
   @Test
-  @SuppressWarnings("unchecked")
   public void simple() throws IOException {
 
     EMain emain1 = createEMain();
diff --git a/src/test/java/org/tests/model/onetoone/OtoPrime.java b/src/test/java/org/tests/model/onetoone/OtoPrime.java
index 771b2de9b..33adbd04a 100644
--- a/src/test/java/org/tests/model/onetoone/OtoPrime.java
+++ b/src/test/java/org/tests/model/onetoone/OtoPrime.java
@@ -30,6 +30,7 @@ public class OtoPrime {
     this.name = name;
   }
 
+  @Override
   public String toString() {
     return "id:"+ pid +" name:"+name+" extra:"+extra;
   }
diff --git a/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java b/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java
index acb6fc28e..f7683c5ac 100644
--- a/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java
+++ b/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java
@@ -19,6 +19,7 @@ public class OtoPrimeExtra {
     this.extra = extra;
   }
 
+  @Override
   public String toString() {
     return "exId:"+ eid +" "+extra;
   }
diff --git a/src/test/java/org/tests/model/onetoone/OtoUBPrime.java b/src/test/java/org/tests/model/onetoone/OtoUBPrime.java
index 9416135c6..36d7104c2 100644
--- a/src/test/java/org/tests/model/onetoone/OtoUBPrime.java
+++ b/src/test/java/org/tests/model/onetoone/OtoUBPrime.java
@@ -27,6 +27,7 @@ public class OtoUBPrime {
     this.name = name;
   }
 
+  @Override
   public String toString() {
     return "id:"+ pid +" name:"+name+" extra:"+extra;
   }
diff --git a/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java b/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java
index 3b50b73f8..0a87366fa 100644
--- a/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java
+++ b/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java
@@ -29,6 +29,7 @@ public class OtoUBPrimeExtra {
     this.extra = extra;
   }
 
+  @Override
   public String toString() {
     return "exId:" + eid + " " + extra;
   }
diff --git a/src/test/java/org/tests/model/onetoone/OtoUPrime.java b/src/test/java/org/tests/model/onetoone/OtoUPrime.java
index 052dbf876..4b2bd894b 100644
--- a/src/test/java/org/tests/model/onetoone/OtoUPrime.java
+++ b/src/test/java/org/tests/model/onetoone/OtoUPrime.java
@@ -30,6 +30,7 @@ public class OtoUPrime {
     this.name = name;
   }
 
+  @Override
   public String toString() {
     return "id:"+ pid +" name:"+name+" extra:"+extra;
   }
diff --git a/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java b/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java
index 7c3fae318..edd72b0ae 100644
--- a/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java
+++ b/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java
@@ -20,6 +20,7 @@ public class OtoUPrimeExtra {
     this.extra = extra;
   }
 
+  @Override
   public String toString() {
     return "exId:"+ eid +" "+extra;
   }

From 10f3d85d9f67534733ff4b4f7097ca0360143c64 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 26 Feb 2018 22:57:07 +0100
Subject: [PATCH 0084/1036] No effective code change - add
 serialize/serialversionuid (#1286)

---
 src/test/java/org/tests/model/family/ChildPerson.java       | 1 +
 src/test/java/org/tests/model/family/GrandParentPerson.java | 3 ++-
 src/test/java/org/tests/model/family/InheritablePerson.java | 5 ++++-
 src/test/java/org/tests/model/family/ParentPerson.java      | 1 +
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/tests/model/family/ChildPerson.java b/src/test/java/org/tests/model/family/ChildPerson.java
index d5ead1109..a0139709c 100644
--- a/src/test/java/org/tests/model/family/ChildPerson.java
+++ b/src/test/java/org/tests/model/family/ChildPerson.java
@@ -9,6 +9,7 @@ import javax.persistence.ManyToOne;
 
 @Entity
 public class ChildPerson extends InheritablePerson {
+  private static final long serialVersionUID = 1L;
 
   private static final String PARENTS_JOIN = "join parent_person j1 on j1.identifier = ${ta}.parent_identifier "
     + "join grand_parent_person j2 on j2.identifier = j1.parent_identifier";
diff --git a/src/test/java/org/tests/model/family/GrandParentPerson.java b/src/test/java/org/tests/model/family/GrandParentPerson.java
index 2307ee3cb..4246290b6 100644
--- a/src/test/java/org/tests/model/family/GrandParentPerson.java
+++ b/src/test/java/org/tests/model/family/GrandParentPerson.java
@@ -13,7 +13,8 @@ import java.util.List;
 
 @Entity
 public class GrandParentPerson extends InheritablePerson {
-
+  private static final long serialVersionUID = 1L;
+  
   @OneToMany(mappedBy = "parent", cascade = CascadeType.ALL)
   @OrderBy("identifier")
   private List<ParentPerson> children = new ArrayList<>();
diff --git a/src/test/java/org/tests/model/family/InheritablePerson.java b/src/test/java/org/tests/model/family/InheritablePerson.java
index 7fe12c5a0..36c7fc74f 100644
--- a/src/test/java/org/tests/model/family/InheritablePerson.java
+++ b/src/test/java/org/tests/model/family/InheritablePerson.java
@@ -2,12 +2,15 @@ package org.tests.model.family;
 
 import org.tests.model.basic.EBasic;
 
+import java.io.Serializable;
+
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 import javax.persistence.MappedSuperclass;
 
 @MappedSuperclass
-public abstract class InheritablePerson {
+public abstract class InheritablePerson implements Serializable {
+  private static final long serialVersionUID = 1L;
 
   @Id
   private Integer identifier;
diff --git a/src/test/java/org/tests/model/family/ParentPerson.java b/src/test/java/org/tests/model/family/ParentPerson.java
index 166e3c93a..97472ef7b 100644
--- a/src/test/java/org/tests/model/family/ParentPerson.java
+++ b/src/test/java/org/tests/model/family/ParentPerson.java
@@ -14,6 +14,7 @@ import java.util.List;
 
 @Entity
 public class ParentPerson extends InheritablePerson {
+  private static final long serialVersionUID = 1L;
 
   //This rather complex formulas should be built later by CustomAnnotationParser
   private static final String CHILD_PERSON_AGGREGATE_JOIN = "left join "

From 3f8b9529e141ae1184e0e6f16c80d537e1358cd4 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 26 Feb 2018 22:59:19 +0100
Subject: [PATCH 0085/1036] Fix clock sync (#1287)

Test only change - Fix clock sync timing issues with tests using -DdbClockDelta
---
 pom.xml                                          |  5 +++++
 src/test/java/io/ebean/BaseTestCase.java         | 16 ++++++++++++++++
 .../org/tests/history/TestHistoryInsert.java     |  2 +-
 .../tests/model/history/TestHistoryExclude.java  |  2 +-
 .../tests/model/history/TestHistoryInclude.java  |  2 +-
 5 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index caa46ead1..7da7e58fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -331,6 +331,11 @@
               <name>datasource.default</name>
               <value>${datasource.default}</value>
             </property>
+            <property>
+              <!-- transfer dbClockDelta parameter -->
+              <name>dbClockDelta</name>
+              <value>${dbClockDelta}</value>
+            </property>
           </systemProperties>
         </configuration>
       </plugin>
diff --git a/src/test/java/io/ebean/BaseTestCase.java b/src/test/java/io/ebean/BaseTestCase.java
index a7cbb0644..bdef878cf 100644
--- a/src/test/java/io/ebean/BaseTestCase.java
+++ b/src/test/java/io/ebean/BaseTestCase.java
@@ -22,7 +22,23 @@ public abstract class BaseTestCase {
 
   protected static Logger logger = LoggerFactory.getLogger(BaseTestCase.class);
 
+  /**
+   * this is the clock delta that may occur between testing machine and db server.
+   * If the clock delta of DB server is in future, an "asOf" query may not find the
+   * correct entry.
+   *
+   * Note: That some tests may use a Thread.sleep to wait, so that the local system clock
+   * can catch up. So don't set that to a too high value.
+   */
+  public static final int DB_CLOCK_DELTA;
+
   static {
+    String s = System.getProperty("dbClockDelta");
+    if (s != null && !s.isEmpty()) {
+      DB_CLOCK_DELTA = Integer.parseInt(s);
+    } else {
+      DB_CLOCK_DELTA = 100;
+    }
     logger.debug("... preStart");
     if (!AgentLoader.loadAgentFromClasspath("ebean-agent", "debug=1")) {
       logger.info("avaje-ebeanorm-agent not found in classpath - not dynamically loaded");
diff --git a/src/test/java/org/tests/history/TestHistoryInsert.java b/src/test/java/org/tests/history/TestHistoryInsert.java
index 2331c26f1..bdbcb873d 100644
--- a/src/test/java/org/tests/history/TestHistoryInsert.java
+++ b/src/test/java/org/tests/history/TestHistoryInsert.java
@@ -34,7 +34,7 @@ public class TestHistoryInsert extends BaseTestCase {
     Ebean.save(user);
     logger.info("-- initial save");
 
-    Thread.sleep(100);
+    Thread.sleep(DB_CLOCK_DELTA); // wait, so that our system clock can catch up
     Timestamp afterInsert = new Timestamp(System.currentTimeMillis());
 
     List<SqlRow> history = fetchHistory(user);
diff --git a/src/test/java/org/tests/model/history/TestHistoryExclude.java b/src/test/java/org/tests/model/history/TestHistoryExclude.java
index b7b11bbb3..a8b4c746f 100644
--- a/src/test/java/org/tests/model/history/TestHistoryExclude.java
+++ b/src/test/java/org/tests/model/history/TestHistoryExclude.java
@@ -44,7 +44,7 @@ public class TestHistoryExclude extends BaseTestCase {
     prepare();
 
     HeLink linkFound = Ebean.find(HeLink.class)
-      .asOf(new Timestamp(System.currentTimeMillis()))
+      .asOf(new Timestamp(System.currentTimeMillis() + DB_CLOCK_DELTA))
       .setId(link.getId())
       .findOne();
 
diff --git a/src/test/java/org/tests/model/history/TestHistoryInclude.java b/src/test/java/org/tests/model/history/TestHistoryInclude.java
index f556ad7d0..1ba178b70 100644
--- a/src/test/java/org/tests/model/history/TestHistoryInclude.java
+++ b/src/test/java/org/tests/model/history/TestHistoryInclude.java
@@ -44,7 +44,7 @@ public class TestHistoryInclude extends BaseTestCase {
     prepare();
 
     HiLink linkFound = Ebean.find(HiLink.class)
-      .asOf(new Timestamp(System.currentTimeMillis()))
+      .asOf(new Timestamp(System.currentTimeMillis() + DB_CLOCK_DELTA))
       .setId(link.getId())
       .findOne();
 

From 78f8d48e2e8b414cb8d4909168a4a6b41f4663d9 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 26 Feb 2018 23:00:58 +0100
Subject: [PATCH 0086/1036] FIX: more timing issues - mysql does not support
 resolution in millis (#1288)

---
 .../java/org/tests/draftable/DocLinkTest.java     |  2 +-
 .../embedded/TestMultipleEmbeddedLoading.java     |  3 ++-
 src/test/java/org/tests/types/TestNewTypes.java   | 15 ++++++++-------
 .../org/tests/update/TestStatelessUpdate.java     |  3 ++-
 .../java/org/tests/update/TestUpdatePartial.java  |  3 ++-
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/test/java/org/tests/draftable/DocLinkTest.java b/src/test/java/org/tests/draftable/DocLinkTest.java
index 98259c101..48b5c6213 100644
--- a/src/test/java/org/tests/draftable/DocLinkTest.java
+++ b/src/test/java/org/tests/draftable/DocLinkTest.java
@@ -175,7 +175,7 @@ public class DocLinkTest extends BaseTestCase {
 
     Link linkLive = server.publish(Link.class, link1.getId(), null);
     StrictAssertions.assertThat(linkLive.getComment()).isEqualTo(comment);
-    StrictAssertions.assertThat(linkLive.getWhenPublish()).isEqualTo(when);
+    StrictAssertions.assertThat(linkLive.getWhenPublish()).isEqualToIgnoringMillis(when);
 
     Link draft1b = Ebean.find(Link.class).setId(link1.getId()).asDraft().findOne();
     StrictAssertions.assertThat(draft1b.isDirty()).isFalse();
diff --git a/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java b/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java
index e5a158d6f..b6ca2d3c0 100644
--- a/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java
+++ b/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java
@@ -13,6 +13,7 @@ import org.junit.Test;
 
 import java.util.Date;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
@@ -46,7 +47,7 @@ public class TestMultipleEmbeddedLoading extends BaseTestCase {
     // assert fetched bean populated as expected
     assertEquals(invoice.getId(), invoice2.getId());
     assertEquals(invoice.getState(), invoice2.getState());
-    assertEquals(invoice.getInvoiceDate(), invoice2.getInvoiceDate());
+    assertThat(invoice2.getInvoiceDate()).isEqualToIgnoringMillis(invoice.getInvoiceDate());
     assertEquals("2 Apple St", invoice.getBillAddress().getStreet());
     assertEquals("2 Apple St", invoice2.getBillAddress().getStreet());
 
diff --git a/src/test/java/org/tests/types/TestNewTypes.java b/src/test/java/org/tests/types/TestNewTypes.java
index de34a2d71..8248c8028 100644
--- a/src/test/java/org/tests/types/TestNewTypes.java
+++ b/src/test/java/org/tests/types/TestNewTypes.java
@@ -20,6 +20,7 @@ import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.List;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -52,7 +53,7 @@ public class TestNewTypes extends BaseTestCase {
     bean.setMonth(Month.SEPTEMBER);
 
     Ebean.save(bean);
-    Thread.sleep(10); // wait, to ensure that instant < Instant.now()
+    Thread.sleep(DB_CLOCK_DELTA); // wait, to ensure that instant < Instant.now()
     List<SomeNewTypesBean> list = Ebean.find(SomeNewTypesBean.class).where().lt("instant", Instant.now()).findList();
     assertTrue(!list.isEmpty());
 
@@ -97,9 +98,9 @@ public class TestNewTypes extends BaseTestCase {
     assertEquals(bean.getYear(), fetched.getYear());
     assertEquals(bean.getYearMonth(), fetched.getYearMonth());
     assertEquals(bean.getLocalDate(), fetched.getLocalDate());
-    assertEquals(bean.getLocalDateTime(), fetched.getLocalDateTime());
-    assertEquals(bean.getOffsetDateTime(), fetched.getOffsetDateTime());
-    assertEquals(bean.getInstant(), fetched.getInstant());
+    assertThat(fetched.getLocalDateTime()).isEqualToIgnoringNanos(bean.getLocalDateTime());
+    assertThat(fetched.getOffsetDateTime()).isEqualToIgnoringNanos(bean.getOffsetDateTime());
+    assertEquals(bean.getInstant().toEpochMilli() / 1000, fetched.getInstant().toEpochMilli() / 1000);
     assertEquals(bean.getPath(), fetched.getPath());
     assertEquals(bean.getPeriod(), fetched.getPeriod());
 
@@ -114,9 +115,9 @@ public class TestNewTypes extends BaseTestCase {
     assertEquals(bean.getYear(), toBean.getYear());
     assertEquals(bean.getYearMonth(), toBean.getYearMonth());
     assertEquals(bean.getLocalDate(), toBean.getLocalDate());
-    assertEquals(bean.getLocalDateTime(), toBean.getLocalDateTime());
-    assertEquals(bean.getOffsetDateTime(), toBean.getOffsetDateTime());
-    assertEquals(bean.getInstant(), toBean.getInstant());
+    assertThat(toBean.getLocalDateTime()).isEqualToIgnoringNanos(bean.getLocalDateTime());
+    assertThat(toBean.getOffsetDateTime()).isEqualToIgnoringNanos(bean.getOffsetDateTime());
+    assertEquals(bean.getInstant().toEpochMilli() / 1000, toBean.getInstant().toEpochMilli() / 1000);
     // FIXME: This test fails on Windows with: expected:<\tmp> but was:<C:\tmp>
     assertEquals(bean.getPath(), toBean.getPath());
     assertEquals(bean.getPeriod(), toBean.getPeriod());
diff --git a/src/test/java/org/tests/update/TestStatelessUpdate.java b/src/test/java/org/tests/update/TestStatelessUpdate.java
index 72eb8b8a3..1362893a6 100644
--- a/src/test/java/org/tests/update/TestStatelessUpdate.java
+++ b/src/test/java/org/tests/update/TestStatelessUpdate.java
@@ -16,6 +16,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
@@ -119,7 +120,7 @@ public class TestStatelessUpdate extends BaseTestCase {
     Customer result = Ebean.find(Customer.class, customer.getId());
 
     // assert
-    assertEquals(customer.getUpdtime().getTime(), result.getUpdtime().getTime());
+    assertThat(result.getUpdtime()).isEqualToIgnoringMillis(customer.getUpdtime());
   }
 
   /**
diff --git a/src/test/java/org/tests/update/TestUpdatePartial.java b/src/test/java/org/tests/update/TestUpdatePartial.java
index 722ed9f0a..091e10a1c 100644
--- a/src/test/java/org/tests/update/TestUpdatePartial.java
+++ b/src/test/java/org/tests/update/TestUpdatePartial.java
@@ -7,6 +7,7 @@ import io.ebean.SqlRow;
 import org.tests.model.basic.Customer;
 import org.junit.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 
 public class TestUpdatePartial extends BaseTestCase {
@@ -69,6 +70,6 @@ public class TestUpdatePartial extends BaseTestCase {
     Customer customerWithoutChanges = Ebean.find(Customer.class, customer.getId());
     Ebean.save(customerWithoutChanges);
 
-    assertEquals(customer.getUpdtime().getTime(), customerWithoutChanges.getUpdtime().getTime());
+    assertThat(customerWithoutChanges.getUpdtime()).isEqualToIgnoringMillis(customer.getUpdtime());
   }
 }

From ac9f3408b28fd8a898f756e617377a549ae21d8b Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 26 Feb 2018 23:03:27 +0100
Subject: [PATCH 0087/1036] FIX: reset cache statistics (fixes test cases in
 eclipse when run in different order) (#1289)

---
 src/test/java/org/tests/cache/TestQueryCacheInsert.java | 1 +
 src/test/java/org/tests/readaudit/TestReadAudit.java    | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/tests/cache/TestQueryCacheInsert.java b/src/test/java/org/tests/cache/TestQueryCacheInsert.java
index dad6caf1f..3a5ca02ea 100644
--- a/src/test/java/org/tests/cache/TestQueryCacheInsert.java
+++ b/src/test/java/org/tests/cache/TestQueryCacheInsert.java
@@ -45,6 +45,7 @@ public class TestQueryCacheInsert extends BaseTestCase {
     Ebean.save(doda);
 
     ServerCache queryCache = Ebean.getServerCacheManager().getQueryCache(EBasicVer.class);
+    queryCache.getStatistics(true);
 
     Optional<EBasicVer> found0 = Ebean.find(EBasicVer.class)
       .where().eq("description", "OddButUniqueSillyExample")
diff --git a/src/test/java/org/tests/readaudit/TestReadAudit.java b/src/test/java/org/tests/readaudit/TestReadAudit.java
index 22a0257d6..d41e7fd13 100644
--- a/src/test/java/org/tests/readaudit/TestReadAudit.java
+++ b/src/test/java/org/tests/readaudit/TestReadAudit.java
@@ -83,6 +83,9 @@ public class TestReadAudit extends BaseTestCase {
   public void test_findById_usingL2Cache() {
     resetCounters();
 
+    ServerCache beanCache = server.getServerCacheManager().getBeanCache(EBasicChangeLog.class);
+    beanCache.getStatistics(true);
+
     EBasicChangeLog found = server.find(EBasicChangeLog.class, id1);
     assertThat(found).isNotNull();
     assertThat(readAuditPrepare.count).isEqualTo(1);
@@ -91,7 +94,6 @@ public class TestReadAudit extends BaseTestCase {
     assertThat(readAuditLogger.beans.get(0).getBeanType()).isEqualTo(EBasicChangeLog.class.getName());
     assertThat(readAuditLogger.beans.get(0).getId()).isEqualTo(id1);
 
-    ServerCache beanCache = server.getServerCacheManager().getBeanCache(EBasicChangeLog.class);
     ServerCacheStatistics statistics = beanCache.getStatistics(false);
     assertThat(statistics.getSize()).isEqualTo(1);
     assertThat(statistics.getHitCount()).isEqualTo(0);
@@ -109,6 +111,9 @@ public class TestReadAudit extends BaseTestCase {
   public void test_findById_usingL2Cache_sharedBean() {
     resetCounters();
 
+    ServerCache beanCache = server.getServerCacheManager().getBeanCache(Country.class);
+    beanCache.getStatistics(true);
+
     Country found = server.find(Country.class, "AR");
     assertThat(found).isNotNull();
     assertThat(readAuditPrepare.count).isEqualTo(1);
@@ -117,7 +122,6 @@ public class TestReadAudit extends BaseTestCase {
     assertThat(readAuditLogger.beans.get(0).getBeanType()).isEqualTo(Country.class.getName());
     assertThat(readAuditLogger.beans.get(0).getId()).isEqualTo("AR");
 
-    ServerCache beanCache = server.getServerCacheManager().getBeanCache(Country.class);
     ServerCacheStatistics statistics = beanCache.getStatistics(false);
     assertThat(statistics.getSize()).isEqualTo(1);
     assertThat(statistics.getHitCount()).isEqualTo(0);

From bb418456e39e6131e1d19c4b8a09f80099d43fdc Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 26 Feb 2018 23:06:35 +0100
Subject: [PATCH 0088/1036] Misc fixes (#1290)

---
 .../dbmigration/DbMigrationTest.java              |  6 ++++++
 .../java/org/tests/delete/TestDeleteByQuery.java  |  9 +++++----
 .../java/org/tests/history/TestHistoryInsert.java |  8 ++++----
 src/test/java/org/tests/query/TestWhereIn.java    | 10 ++--------
 .../org/tests/rawsql/TestRawSqlNamedParams.java   | 15 ++++++++++-----
 5 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
index 0bf580245..569f63311 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
@@ -66,6 +66,12 @@ public class DbMigrationTest extends BaseTestCase {
         "migtest_e_ref",
         "migtest_e_softdelete",
         "migtest_e_user",
+        "migtest_fk_cascade",
+        "migtest_fk_cascade_one",
+        "migtest_fk_none",
+        "migtest_fk_none_via_join",
+        "migtest_fk_one",
+        "migtest_fk_set_null",
         "migtest_mtm_c",
         "migtest_mtm_m",
         "migtest_mtm_c_migtest_mtm_m",
diff --git a/src/test/java/org/tests/delete/TestDeleteByQuery.java b/src/test/java/org/tests/delete/TestDeleteByQuery.java
index 4adeef974..89dd04c72 100644
--- a/src/test/java/org/tests/delete/TestDeleteByQuery.java
+++ b/src/test/java/org/tests/delete/TestDeleteByQuery.java
@@ -4,6 +4,9 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import io.ebean.Query;
+import io.ebean.annotation.IgnorePlatform;
+import io.ebean.annotation.Platform;
+
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
@@ -17,13 +20,11 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class TestDeleteByQuery extends BaseTestCase {
 
   @Test
+  @IgnorePlatform(Platform.MYSQL)
+  // FIXME: MySql does not the sub query selecting from the delete table
   public void test() {
 
     EbeanServer server = Ebean.getDefaultServer();
-    if (server.getName().equals("mysql")) {
-      // MySql does not the sub query selecting from the delete table
-      return;
-    }
 
     Query<Contact> query = server.find(Contact.class).where().eq("group.name", "NahYeahMaybe").query();
 
diff --git a/src/test/java/org/tests/history/TestHistoryInsert.java b/src/test/java/org/tests/history/TestHistoryInsert.java
index bdbcb873d..67a1e93e4 100644
--- a/src/test/java/org/tests/history/TestHistoryInsert.java
+++ b/src/test/java/org/tests/history/TestHistoryInsert.java
@@ -5,6 +5,9 @@ import io.ebean.Ebean;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
 import io.ebean.Version;
+import io.ebean.annotation.ForPlatform;
+import io.ebean.annotation.Platform;
+
 import org.tests.model.converstation.User;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -20,12 +23,9 @@ public class TestHistoryInsert extends BaseTestCase {
   private final Logger logger = LoggerFactory.getLogger(TestHistoryInsert.class);
 
   @Test
+  @ForPlatform({Platform.H2, Platform.POSTGRES})
   public void test() throws InterruptedException {
 
-    if (!isH2() && !isPostgres()) {
-      return;
-    }
-
     User user = new User();
     user.setName("Jim");
     user.setEmail("one@email.com");
diff --git a/src/test/java/org/tests/query/TestWhereIn.java b/src/test/java/org/tests/query/TestWhereIn.java
index 9fa85e82a..4be3ecb91 100644
--- a/src/test/java/org/tests/query/TestWhereIn.java
+++ b/src/test/java/org/tests/query/TestWhereIn.java
@@ -7,7 +7,6 @@ import org.junit.Test;
 import org.tests.model.basic.Country;
 import org.tests.model.basic.ResetBasicData;
 
-import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestWhereIn extends BaseTestCase {
 
@@ -21,10 +20,7 @@ public class TestWhereIn extends BaseTestCase {
       .query();
 
     query.findList();
-    if (isPostgres()) {
-      assertThat(sqlOf(query)).contains(" = any(");
-    }
-
+    platformAssertIn(sqlOf(query), "");
   }
 
 
@@ -38,8 +34,6 @@ public class TestWhereIn extends BaseTestCase {
       .query();
 
     query.findList();
-    if (isPostgres()) {
-      assertThat(sqlOf(query)).contains(" != all(");
-    }
+    platformAssertNotIn(sqlOf(query), "");
   }
 }
diff --git a/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java b/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java
index e123f30f0..62f3f3002 100644
--- a/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java
+++ b/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java
@@ -7,12 +7,16 @@ import io.ebean.Query;
 import io.ebean.RawSql;
 import io.ebean.RawSqlBuilder;
 import io.ebean.Transaction;
+import io.ebean.annotation.ForPlatform;
+import io.ebean.annotation.Platform;
+
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.sql.SQLException;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -40,16 +44,17 @@ public class TestRawSqlNamedParams extends BaseTestCase {
   }
 
   @Test
-  public void testMySqlColonEquals() {
-
-    if (!isMySql()) {
-      return;
-    }
+  @ForPlatform(Platform.MYSQL)
+  public void testMySqlColonEquals() throws SQLException {
 
     ResetBasicData.reset();
 
     Transaction transaction = Ebean.beginTransaction();
+
     try {
+      if ("MariaDB connector/J".equals(transaction.getConnection().getMetaData().getDriverName())) {
+        return; // MariaDb only supports callable statements in the form "? = call function x(?)"
+      }
       CallableSql callableSql = Ebean.createCallableSql("set @total = 0");
       Ebean.execute(callableSql);
 

From 83cf768369d224d3e6396322f1a832fe3047b3d5 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 26 Feb 2018 23:09:44 +0100
Subject: [PATCH 0089/1036] Append preconfigured database to dbMigration
 (#1291)

---
 src/main/java/io/ebean/dbmigration/DbMigration.java      | 8 ++++++++
 .../io/ebeaninternal/dbmigration/DefaultDbMigration.java | 5 +++++
 .../dbmigration/DbMigrationGenerateTest.java             | 9 ++++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebean/dbmigration/DbMigration.java b/src/main/java/io/ebean/dbmigration/DbMigration.java
index eaa0dee3b..cd9c122a0 100644
--- a/src/main/java/io/ebean/dbmigration/DbMigration.java
+++ b/src/main/java/io/ebean/dbmigration/DbMigration.java
@@ -102,6 +102,14 @@ public interface DbMigration {
    */
   void addPlatform(Platform platform, String prefix);
 
+  /**
+   * Add an additional databasePlatform to write the migration DDL.
+   * <p>
+   * Use this when you want to add preconfigured database platforms.
+   * </p>
+   */
+  void addDatabasePlatform(DatabasePlatform databasePlatform, String prefix);
+
   /**
    * Generate the next migration xml file and associated apply and rollback sql scripts.
    * <p>
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index a8d4877c9..9bf36c631 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -183,6 +183,11 @@ public class DefaultDbMigration implements DbMigration {
     platforms.add(new Pair(getPlatform(platform), prefix));
   }
 
+  @Override
+  public void addDatabasePlatform(DatabasePlatform databasePlatform, String prefix) {
+    platforms.add(new Pair(databasePlatform, prefix));
+  }
+
   /**
    * Generate the next migration xml file and associated apply and rollback sql scripts.
    * <p>
diff --git a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
index 6ea8a19e3..6d16f0d1c 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
@@ -4,6 +4,9 @@ import io.ebean.EbeanServer;
 import io.ebean.EbeanServerFactory;
 import io.ebean.annotation.Platform;
 import io.ebean.config.ServerConfig;
+import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebean.config.dbplatform.IdType;
+import io.ebean.config.dbplatform.sqlserver.SqlServerPlatform;
 
 import org.junit.*;
 import org.slf4j.Logger;
@@ -52,7 +55,11 @@ public class DbMigrationGenerateTest {
     migration.addPlatform(Platform.POSTGRES, "postgres");
     migration.addPlatform(Platform.ORACLE, "oracle");
     migration.addPlatform(Platform.SQLITE, "sqlite");
-    migration.addPlatform(Platform.SQLSERVER, "sqlserver");
+
+    // we need sequence here, so that migration will work properly
+    DatabasePlatform sqlServer = new SqlServerPlatform();
+    sqlServer.getDbIdentity().setIdType(IdType.SEQUENCE);
+    migration.addDatabasePlatform(sqlServer, "sqlserver");
 
     ServerConfig config = new ServerConfig();
     config.setName("migrationtest");

From e751f991cba1125d1b15948eac9b77e9c5428778 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 27 Feb 2018 11:31:30 +1300
Subject: [PATCH 0090/1036] #1275 - Additional refactor for - Add
 ServerConfig.setDefaultOrderById() ...

Removes the cast on DefaultOrmQuery.prepare()
---
 src/main/java/io/ebeaninternal/api/SpiQuery.java   |  4 ++--
 .../ebeaninternal/server/core/OrmQueryRequest.java |  3 +--
 .../server/core/SpiOrmQueryRequest.java            |  5 +++--
 .../server/querydefn/DefaultOrmQuery.java          |  8 ++++----
 .../server/querydefn/DefaultOrmQueryTest.java      | 14 +++++++-------
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/api/SpiQuery.java b/src/main/java/io/ebeaninternal/api/SpiQuery.java
index 869f2ca1c..1134d660f 100644
--- a/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -9,10 +9,10 @@ import io.ebean.Query;
 import io.ebean.bean.CallStack;
 import io.ebean.bean.ObjectGraphNode;
 import io.ebean.bean.PersistenceContext;
-import io.ebean.event.BeanQueryRequest;
 import io.ebean.event.readaudit.ReadEvent;
 import io.ebean.plugin.BeanType;
 import io.ebeaninternal.server.autotune.ProfilingListener;
+import io.ebeaninternal.server.core.SpiOrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.TableJoin;
@@ -566,7 +566,7 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
    * The query plan excludes actual bind values (as they don't effect the query plan).
    * </p>
    */
-  CQueryPlanKey prepare(BeanQueryRequest<?> request);
+  CQueryPlanKey prepare(SpiOrmQueryRequest<T> request);
 
   /**
    * Calculate a hash based on the bind values used in the query.
diff --git a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index e63a49d56..7df2185b3 100644
--- a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -12,7 +12,6 @@ import io.ebean.common.BeanList;
 import io.ebean.common.CopyOnFirstWriteList;
 import io.ebean.event.BeanFindController;
 import io.ebean.event.BeanQueryAdapter;
-import io.ebean.event.BeanQueryRequest;
 import io.ebean.text.json.JsonReadOptions;
 import io.ebeaninternal.api.BeanCacheResult;
 import io.ebeaninternal.api.CQueryPlanKey;
@@ -52,7 +51,7 @@ import java.util.function.Predicate;
 /**
  * Wraps the objects involved in executing a Query.
  */
-public final class OrmQueryRequest<T> extends BeanRequest implements BeanQueryRequest<T>, SpiOrmQueryRequest<T> {
+public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQueryRequest<T> {
 
   private static final Logger log = LoggerFactory.getLogger(OrmQueryRequest.class);
 
diff --git a/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
index 279ddf6c9..32ab198ff 100644
--- a/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.core;
 
 import io.ebean.QueryIterator;
 import io.ebean.Version;
+import io.ebean.event.BeanQueryRequest;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeanservice.docstore.api.DocQueryRequest;
@@ -15,7 +16,7 @@ import java.util.function.Predicate;
 /**
  * Defines the ORM query request api.
  */
-public interface SpiOrmQueryRequest<T> extends DocQueryRequest<T> {
+public interface SpiOrmQueryRequest<T> extends BeanQueryRequest<T>, DocQueryRequest<T> {
 
   /**
    * Return the query.
@@ -26,7 +27,7 @@ public interface SpiOrmQueryRequest<T> extends DocQueryRequest<T> {
   /**
    * Return the associated BeanDescriptor.
    */
-  BeanDescriptor<?> getBeanDescriptor();
+  BeanDescriptor<T> getBeanDescriptor();
 
   /**
    * This will create a local (readOnly) transaction if no current transaction
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 6a8648e90..103e5d483 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -39,7 +39,7 @@ import io.ebeaninternal.api.SpiNamedParam;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.SpiQuerySecondary;
 import io.ebeaninternal.server.autotune.ProfilingListener;
-import io.ebeaninternal.server.core.OrmQueryRequest;
+import io.ebeaninternal.server.core.SpiOrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.TableJoin;
@@ -1040,10 +1040,10 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
    * Prepare the query which prepares any expressions (sub-query expressions etc) and calculates the query plan key.
    */
   @Override
-  public CQueryPlanKey prepare(BeanQueryRequest<?> request) {
+  public CQueryPlanKey prepare(SpiOrmQueryRequest<T> request) {
 
     prepareExpressions(request);
-    prepareForPaging((OrmQueryRequest) request);
+    prepareForPaging(request);
     queryPlanKey = createQueryPlanKey();
     return queryPlanKey;
   }
@@ -1066,7 +1066,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
    * property to ensure unique row ordering for predicable paging but only in
    * case, this is not a distinct query
    */
-  private void prepareForPaging(OrmQueryRequest<T> request) {
+  private void prepareForPaging(SpiOrmQueryRequest<T> request) {
 
     // add the rawSql statement - if any
     if (orderByIsEmpty()) {
diff --git a/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java b/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java
index 0d3ee55c9..d9e621221 100644
--- a/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java
+++ b/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java
@@ -18,7 +18,7 @@ public class DefaultOrmQueryTest extends BaseTestCase {
   public void when_forUpdate_then_excludeFromBeanCache() {
 
     DefaultOrmQuery<Customer> q1 = (DefaultOrmQuery<Customer>) Ebean.find(Customer.class)
-      .setForUpdate(true).where().eq("id", 42).query();
+      .forUpdate().where().eq("id", 42).query();
 
     assertThat(q1.getUseBeanCache()).isSameAs(CacheMode.OFF);
   }
@@ -88,13 +88,13 @@ public class DefaultOrmQueryTest extends BaseTestCase {
   }
 
   @Test
-  public void when_diffFirstMaxRows_then_differentPlan() throws Exception {
+  public void when_diffFirstMaxRows_then_differentPlan() {
 
-    DefaultOrmQuery<?> query1 = (DefaultOrmQuery<?>) Ebean.find(Order.class)
+    DefaultOrmQuery<Order> query1 = (DefaultOrmQuery<Order>) Ebean.find(Order.class)
       .setFirstRow(0)
       .setMaxRows(31);
 
-    DefaultOrmQuery<?> query2 = (DefaultOrmQuery<?>) Ebean.find(Order.class)
+    DefaultOrmQuery<Order> query2 = (DefaultOrmQuery<Order>) Ebean.find(Order.class)
       .setFirstRow(1)
       .setMaxRows(0);
 
@@ -102,12 +102,12 @@ public class DefaultOrmQueryTest extends BaseTestCase {
     assertThat(query1.createQueryPlanKey()).isNotEqualTo(query2.createQueryPlanKey());
   }
 
-  private void prepare(DefaultOrmQuery<?> q1, DefaultOrmQuery<?> q2) {
+  private <T> void prepare(DefaultOrmQuery<T> q1, DefaultOrmQuery<T> q2) {
 
-    OrmQueryRequest<?> r1 = createQueryRequest(SpiQuery.Type.LIST, q1, null);
+    OrmQueryRequest<T> r1 = createQueryRequest(SpiQuery.Type.LIST, q1, null);
     q1.prepare(r1);
 
-    OrmQueryRequest<?> r2 = createQueryRequest(SpiQuery.Type.LIST, q2, null);
+    OrmQueryRequest<T> r2 = createQueryRequest(SpiQuery.Type.LIST, q2, null);
     q2.prepare(r2);
   }
 }

From a569c7fc960570141fef7835b12e6ef59aa6ed97 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 27 Feb 2018 11:35:10 +1300
Subject: [PATCH 0091/1036] #1275 - Additional refactor of
 DefaultOrmQuery.prepareForPaging() for - Add
 ServerConfig.setDefaultOrderById() ...

Remove use of SpiOrmQueryRequest<T> request
---
 .../io/ebeaninternal/server/querydefn/DefaultOrmQuery.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 103e5d483..ded44b52e 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1043,7 +1043,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   public CQueryPlanKey prepare(SpiOrmQueryRequest<T> request) {
 
     prepareExpressions(request);
-    prepareForPaging(request);
+    prepareForPaging();
     queryPlanKey = createQueryPlanKey();
     return queryPlanKey;
   }
@@ -1066,17 +1066,16 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
    * property to ensure unique row ordering for predicable paging but only in
    * case, this is not a distinct query
    */
-  private void prepareForPaging(SpiOrmQueryRequest<T> request) {
+  private void prepareForPaging() {
 
     // add the rawSql statement - if any
     if (orderByIsEmpty()) {
-      SpiRawSql rawSql = getRawSql();
       if (rawSql != null && rawSql.getSql() != null) {
         order(rawSql.getSql().getOrderBy());
       }
     }
     if (checkPagingOrderBy()) {
-      request.getBeanDescriptor().appendOrderById(this);
+      beanDescriptor.appendOrderById(this);
     }
   }
   /**

From 3dfdd0e2e878d6815e77b9a676501bfdebc06c77 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 26 Feb 2018 23:58:10 +0100
Subject: [PATCH 0092/1036] #1292 - Fix for non-native / number boolean types
 (MySql, SqlServer, Oracle, Sqlite, SqlAnywhere) removing "default 0" + Fix
 for DB2 add foreign key update clause

---
 howto-test.md                                 | 13 +++++-----
 .../dbplatform/mysql/MySqlPlatform.java       |  9 +++++--
 .../dbplatform/oracle/OraclePlatform.java     |  6 ++++-
 .../dbplatform/postgres/PostgresPlatform.java |  2 ++
 .../sqlanywhere/SqlAnywherePlatform.java      |  2 +-
 .../dbplatform/sqlite/SQLitePlatform.java     |  7 ++++--
 .../sqlserver/SqlServerPlatform.java          |  5 +++-
 .../ddlgeneration/platform/DB2Ddl.java        |  6 +++++
 .../ddlgeneration/platform/PlatformDdl.java   | 24 ++++++------------
 .../config/dbplatform/MySqlPlatformTest.java  |  4 +--
 .../config/dbplatform/OraclePlatformTest.java |  2 +-
 .../migrationtest/db2/1.0__initial.sql        |  6 ++---
 .../dbmigration/migrationtest/db2/1.1.sql     | 24 +++++++++---------
 .../dbmigration/migrationtest/db2/1.3.sql     |  8 +++---
 .../dbmigration/migrationtest/h2/1.1.sql      | 14 +++++------
 .../dbmigration/migrationtest/h2/1.3.sql      |  2 +-
 .../dbmigration/migrationtest/hsqldb/1.1.sql  | 14 +++++------
 .../dbmigration/migrationtest/hsqldb/1.3.sql  |  2 +-
 .../migrationtest/mysql/1.0__initial.sql      |  2 +-
 .../dbmigration/migrationtest/mysql/1.1.sql   | 12 ++++-----
 .../dbmigration/migrationtest/mysql/1.3.sql   |  2 +-
 .../migrationtest/oracle/1.0__initial.sql     |  2 +-
 .../dbmigration/migrationtest/oracle/1.1.sql  | 12 ++++-----
 .../dbmigration/migrationtest/oracle/1.3.sql  |  2 +-
 .../migrationtest/postgres/1.1.sql            | 14 +++++------
 .../migrationtest/postgres/1.3.sql            |  2 +-
 .../migrationtest/sqlite/1.0__initial.sql     |  2 +-
 .../dbmigration/migrationtest/sqlite/1.1.sql  | 12 ++++-----
 .../dbmigration/migrationtest/sqlite/1.3.sql  |  2 +-
 .../migrationtest/sqlserver/1.0__initial.sql  | 25 +++++++++----------
 .../migrationtest/sqlserver/1.1.sql           | 12 ++++-----
 .../migrationtest/sqlserver/1.3.sql           |  6 ++---
 32 files changed, 135 insertions(+), 122 deletions(-)

diff --git a/howto-test.md b/howto-test.md
index 243ed5200..dcb2c727d 100644
--- a/howto-test.md
+++ b/howto-test.md
@@ -48,7 +48,8 @@ Reqirements
 run: `mvn clean test -Ddatasource.default=pg`
 
 Current status: PASS
-Tests run: 1986, Failures: 0, Errors: 0, Skipped: 16
+Tests run: 2166, Failures: 0, Errors: 0, Skipped: 25
+
 
 
 'mysql' platform
@@ -61,8 +62,8 @@ Reqirements
 
 run: `mvn clean test -Ddatasource.default=mysql`
 
-Current status: FAIL
-Tests run: 1986, Failures: 2, Errors: 4, Skipped: 16
+Current status: PASS
+Tests run: 2166, Failures: 0, Errors: 0, Skipped: 33
 
 
 
@@ -76,8 +77,8 @@ Reqires an installed sqlserver - e.g. https://hub.docker.com/r/microsoft/mssql-s
   
 run: `mvn clean test -Ddatasource.default=mssql`
 
-Current status: FAIL
-Tests run: 1986, Failures: 19, Errors: 43, Skipped: 16
+Current status: PASS
+Tests run: 2166, Failures: 0, Errors: 0, Skipped: 39
 
 
 
@@ -107,7 +108,7 @@ Reqires a locally installed DB2 Express-C server.
 run: `mvn clean test -Ddatasource.default=db2 -Pdb2`
 
 Current status: FAIL
-Tests run: 1986, Failures: 33, Errors: 26, Skipped: 16
+Tests run: 2166, Failures: 29, Errors: 58, Skipped: 30
 
 
 'sqlite' platform
diff --git a/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java
index bea7ed391..9ee373288 100644
--- a/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java
@@ -35,6 +35,11 @@ public class MySqlPlatform extends DatabasePlatform {
     this.dbIdentity.setSupportsGetGeneratedKeys(true);
     this.dbIdentity.setSupportsIdentity(true);
     this.dbIdentity.setSupportsSequence(false);
+    
+    this.dbDefaultValue.setNow("now(6)"); // must have same precision as TIMESTAMP
+    this.dbDefaultValue.setFalse("0");
+    this.dbDefaultValue.setTrue("1");
+
 
     this.exceptionTranslator =
       new SqlErrorCodes()
@@ -52,8 +57,8 @@ public class MySqlPlatform extends DatabasePlatform {
     this.forwardOnlyHintOnFindIterate = true;
     this.booleanDbType = Types.BIT;
 
-    dbTypeMap.put(DbType.BIT, new DbPlatformType("tinyint(1) default 0"));
-    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("tinyint(1) default 0"));
+    dbTypeMap.put(DbType.BIT, new DbPlatformType("tinyint(1)"));
+    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("tinyint(1)"));
     dbTypeMap.put(DbType.TIMESTAMP, new DbPlatformType("datetime(6)"));
     dbTypeMap.put(DbType.CLOB, new MySqlClob());
     dbTypeMap.put(DbType.BLOB, new MySqlBlob());
diff --git a/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java b/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java
index b73f8091a..3eae9a8c6 100644
--- a/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java
@@ -35,6 +35,10 @@ public class OraclePlatform extends DatabasePlatform {
     dbIdentity.setSupportsIdentity(true);
     dbIdentity.setSupportsGetGeneratedKeys(true);
 
+    this.dbDefaultValue.setFalse("0");
+    this.dbDefaultValue.setTrue("1");
+    this.dbDefaultValue.setNow("current_timestamp");
+
     this.treatEmptyStringsAsNull = true;
     this.likeClauseRaw = "like ?";
 
@@ -49,7 +53,7 @@ public class OraclePlatform extends DatabasePlatform {
     this.closeQuote = "\"";
 
     booleanDbType = Types.INTEGER;
-    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("number(1) default 0"));
+    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("number(1)"));
 
     dbTypeMap.put(DbType.INTEGER, new DbPlatformType("number", 10));
     dbTypeMap.put(DbType.BIGINT, new DbPlatformType("number", 19));
diff --git a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
index 20d9107d1..9a9b584fd 100644
--- a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
@@ -39,6 +39,8 @@ public class PostgresPlatform extends DatabasePlatform {
     this.dbIdentity.setSupportsGetGeneratedKeys(true);
     this.dbIdentity.setSupportsSequence(true);
 
+    this.dbDefaultValue.setNow("current_timestamp");
+
     this.exceptionTranslator =
       new SqlErrorCodes()
         .addAcquireLock("55P03")
diff --git a/src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywherePlatform.java b/src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywherePlatform.java
index 045eeab30..7ca86a219 100644
--- a/src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywherePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywherePlatform.java
@@ -27,7 +27,7 @@ public class SqlAnywherePlatform extends DatabasePlatform {
     this.dbIdentity.setSelectLastInsertedIdTemplate("select @@IDENTITY as X");
     this.dbIdentity.setSupportsIdentity(true);
 
-    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("bit default 0"));
+    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("bit"));
     dbTypeMap.put(DbType.BIGINT, new DbPlatformType("numeric", 19));
     dbTypeMap.put(DbType.REAL, new DbPlatformType("float(16)"));
     dbTypeMap.put(DbType.DOUBLE, new DbPlatformType("float(32)"));
diff --git a/src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java b/src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java
index b4957f6d1..2e15fd007 100644
--- a/src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java
@@ -21,9 +21,12 @@ public class SQLitePlatform extends DatabasePlatform {
     this.booleanDbType = Types.INTEGER;
     this.likeClauseRaw = "like ?";
     this.likeClauseEscaped = "like ?";
+    this.dbDefaultValue.setFalse("0");
+    this.dbDefaultValue.setTrue("1");
+    this.dbDefaultValue.setNow("CURRENT_TIMESTAMP");
 
-    dbTypeMap.put(DbType.BIT, new DbPlatformType("int default 0"));
-    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("int default 0"));
+    dbTypeMap.put(DbType.BIT, new DbPlatformType("int"));
+    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("int"));
     dbTypeMap.put(DbType.BIGINT, new DbPlatformType("integer"));
     dbTypeMap.put(DbType.SMALLINT, new DbPlatformType("integer"));
   }
diff --git a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java
index 102a7e0d5..31e1a8525 100644
--- a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java
@@ -51,7 +51,10 @@ public class SqlServerPlatform extends DatabasePlatform {
     this.likeClauseEscaped = "like ? collate Latin1_General_BIN";
 
     booleanDbType = Types.INTEGER;
-    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("bit default 0"));
+    this.dbDefaultValue.setFalse("0");
+    this.dbDefaultValue.setTrue("1");
+    this.dbDefaultValue.setNow("SYSUTCDATETIME()");
+    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("bit"));
 
     dbTypeMap.put(DbType.INTEGER, new DbPlatformType("integer", false));
     dbTypeMap.put(DbType.BIGINT, new DbPlatformType("numeric", 19));
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java
index 17a463d60..d3cf92028 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
+import io.ebean.annotation.ConstraintMode;
 import io.ebean.config.dbplatform.DatabasePlatform;
 
 /**
@@ -27,4 +28,9 @@ public class DB2Ddl extends PlatformDdl {
     }
   }
 
+  @Override
+  protected void appendForeignKeyOnUpdate(StringBuilder buffer, ConstraintMode mode) {
+    // do nothing, no on update clause for db2
+  }
+
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
index db37454c6..512d6efc2 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -213,7 +213,7 @@ public class PlatformDdl {
     buffer.append("  ");
     buffer.append(lowerColumnName(column.getName()), 29);
     buffer.append(platformType);
-    if (!Boolean.TRUE.equals(column.isPrimaryKey()) && !typeContainsDefault(platformType)) {
+    if (!Boolean.TRUE.equals(column.isPrimaryKey())) {
       String defaultValue = convertDefaultValue(column.getDefaultValue());
       if (defaultValue != null) {
         buffer.append(" default ").append(defaultValue);
@@ -227,13 +227,6 @@ public class PlatformDdl {
     // so that the database can potentially provide a nice SQL error
   }
 
-  /**
-   * Return true if the type definition already contains a default value.
-   */
-  private boolean typeContainsDefault(String platformType) {
-    return platformType.toLowerCase().contains(" default");
-  }
-
   /**
    * Convert the DB column default literal to platform specific.
    */
@@ -449,17 +442,14 @@ public class PlatformDdl {
       .append(" ").append(convertedType);
 
     if (!onHistoryTable) {
-      if (isTrue(column.isNotnull())) {
-        buffer.append(" not null");
-      }
 
       if (defaultValue != null) {
-        if (typeContainsDefault(convertedType)) {
-          logger.error("Cannot set default value for '" + tableName + "." + column.getName() + "'");
-        } else {
-          buffer.append(" default ");
-          buffer.append(defaultValue);
-        }
+        buffer.append(" default ");
+        buffer.append(defaultValue);
+      }
+
+      if (isTrue(column.isNotnull())) {
+        buffer.append(" not null");
       }
       buffer.endOfStatement();
 
diff --git a/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java b/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java
index 74a789348..ed0fc2bf9 100644
--- a/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java
+++ b/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java
@@ -20,8 +20,8 @@ public class MySqlPlatformTest {
     assertThat(ddl.convert("json", false)).isEqualTo("longtext");
     assertThat(ddl.convert("jsonb", false)).isEqualTo("longtext");
     assertThat(ddl.convert("varchar(20)", false)).isEqualTo("varchar(20)");
-    assertThat(ddl.convert("boolean", false)).isEqualTo("tinyint(1) default 0");
-    assertThat(ddl.convert("bit", false)).isEqualTo("tinyint(1) default 0");
+    assertThat(ddl.convert("boolean", false)).isEqualTo("tinyint(1)");
+    assertThat(ddl.convert("bit", false)).isEqualTo("tinyint(1)");
   }
 
   @Test
diff --git a/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java b/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java
index 4f21ae90c..11da787e2 100644
--- a/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java
+++ b/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java
@@ -27,7 +27,7 @@ public class OraclePlatformTest {
     assertThat(ddl.convert("varchar(20)", false)).isEqualTo("varchar2(20)");
     assertThat(ddl.convert("decimal(10)", false)).isEqualTo("number(10)");
     assertThat(ddl.convert("decimal(8,4)", false)).isEqualTo("number(8,4)");
-    assertThat(ddl.convert("boolean", false)).isEqualTo("number(1) default 0");
+    assertThat(ddl.convert("boolean", false)).isEqualTo("number(1)");
     assertThat(ddl.convert("bit", false)).isEqualTo("bit");
     assertThat(ddl.convert("tinyint", false)).isEqualTo("number(3)");
     assertThat(ddl.convert("binary(16)", false)).isEqualTo("raw(16)");
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
index ebd35cdcf..2ed9f31ab 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
@@ -81,12 +81,12 @@ create table migtest_e_softdelete (
 
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
-alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
 create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
 
-alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null;
 create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
 
-alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
+alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict;
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.1.sql b/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
index 26650c8ff..2304caa0c 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
@@ -6,11 +6,11 @@ create table migtest_e_user (
 );
 
 alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
-alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete restrict on update restrict;
-alter table migtest_fk_none add constraint fk_migtest_fk_none_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
-alter table migtest_fk_none_via_join add constraint fk_migtest_fk_none_via_join_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete restrict;
+alter table migtest_fk_none add constraint fk_migtest_fk_none_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict;
+alter table migtest_fk_none_via_join add constraint fk_migtest_fk_none_via_join_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict;
 alter table migtest_fk_set_null drop constraint fk_migtest_fk_set_null_one_id;
-alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict;
 
 update migtest_e_basic set status = 'A' where status is null;
 alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
@@ -26,16 +26,16 @@ alter table migtest_e_basic alter column some_date set default '2000-01-01T00:00
 alter table migtest_e_basic alter column some_date set not null;
 
 insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
-alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict on update restrict;
+alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict;
 alter table migtest_e_basic alter column user_id set null;
-alter table migtest_e_basic add column new_string_field varchar(255) not null default 'foo''bar';
-alter table migtest_e_basic add column new_boolean_field boolean not null default true;
+alter table migtest_e_basic add column new_string_field varchar(255) default 'foo''bar' not null;
+alter table migtest_e_basic add column new_boolean_field boolean default true not null;
 update migtest_e_basic set new_boolean_field = old_boolean;
 
-alter table migtest_e_basic add column new_boolean_field2 boolean not null default true;
-alter table migtest_e_basic add column progress integer not null default 0;
+alter table migtest_e_basic add column new_boolean_field2 boolean default true not null;
+alter table migtest_e_basic add column progress integer default 0 not null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2));
-alter table migtest_e_basic add column new_integer integer not null default 42;
+alter table migtest_e_basic add column new_integer integer default 42 not null;
 
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
@@ -50,11 +50,11 @@ update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 alter table migtest_e_history2 alter column test_string set default 'unknown';
 alter table migtest_e_history2 alter column test_string set not null;
 alter table migtest_e_history2 add column test_string2 varchar(255);
-alter table migtest_e_history2 add column test_string3 varchar(255) not null default 'unknown';
+alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null;
 alter table migtest_e_history2_history add column test_string2 varchar(255);
 alter table migtest_e_history2_history add column test_string3 varchar(255);
 
-alter table migtest_e_softdelete add column deleted boolean not null default false;
+alter table migtest_e_softdelete add column deleted boolean default false not null;
 
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.3.sql b/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
index d8c19fa03..e99cc4048 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
@@ -6,11 +6,11 @@ create table migtest_e_ref (
 );
 
 alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
-alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
 alter table migtest_fk_none drop constraint fk_migtest_fk_none_one_id;
 alter table migtest_fk_none_via_join drop constraint fk_migtest_fk_none_via_join_one_id;
 alter table migtest_fk_set_null drop constraint fk_migtest_fk_set_null_one_id;
-alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null;
 alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
 alter table migtest_e_basic alter column status drop default;
 alter table migtest_e_basic alter column status set null;
@@ -23,7 +23,7 @@ update migtest_e_basic set user_id = 23 where user_id is null;
 alter table migtest_e_basic drop constraint fk_migtest_e_basic_user_id;
 alter table migtest_e_basic alter column user_id set default 23;
 alter table migtest_e_basic alter column user_id set not null;
-alter table migtest_e_basic add column old_boolean boolean not null default false;
+alter table migtest_e_basic add column old_boolean boolean default false not null;
 alter table migtest_e_basic add column old_boolean2 boolean;
 alter table migtest_e_basic add column eref_id integer;
 
@@ -40,6 +40,6 @@ create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 drop index ix_migtest_e_basic_indextest3;
 drop index ix_migtest_e_basic_indextest6;
-alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
+alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict;
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.1.sql b/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
index 733391e0f..e786f4ecc 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
@@ -28,14 +28,14 @@ alter table migtest_e_basic alter column some_date set not null;
 insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict on update restrict;
 alter table migtest_e_basic alter column user_id set null;
-alter table migtest_e_basic add column new_string_field varchar(255) not null default 'foo''bar';
-alter table migtest_e_basic add column new_boolean_field boolean not null default true;
+alter table migtest_e_basic add column new_string_field varchar(255) default 'foo''bar' not null;
+alter table migtest_e_basic add column new_boolean_field boolean default true not null;
 update migtest_e_basic set new_boolean_field = old_boolean;
 
-alter table migtest_e_basic add column new_boolean_field2 boolean not null default true;
-alter table migtest_e_basic add column progress integer not null default 0;
+alter table migtest_e_basic add column new_boolean_field2 boolean default true not null;
+alter table migtest_e_basic add column progress integer default 0 not null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2));
-alter table migtest_e_basic add column new_integer integer not null default 42;
+alter table migtest_e_basic add column new_integer integer default 42 not null;
 
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
@@ -50,11 +50,11 @@ update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 alter table migtest_e_history2 alter column test_string set default 'unknown';
 alter table migtest_e_history2 alter column test_string set not null;
 alter table migtest_e_history2 add column test_string2 varchar(255);
-alter table migtest_e_history2 add column test_string3 varchar(255) not null default 'unknown';
+alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null;
 alter table migtest_e_history2_history add column test_string2 varchar(255);
 alter table migtest_e_history2_history add column test_string3 varchar(255);
 
-alter table migtest_e_softdelete add column deleted boolean not null default false;
+alter table migtest_e_softdelete add column deleted boolean default false not null;
 
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.3.sql b/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
index e096649a9..9f3c659df 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
@@ -23,7 +23,7 @@ update migtest_e_basic set user_id = 23 where user_id is null;
 alter table migtest_e_basic drop constraint if exists fk_migtest_e_basic_user_id;
 alter table migtest_e_basic alter column user_id set default 23;
 alter table migtest_e_basic alter column user_id set not null;
-alter table migtest_e_basic add column old_boolean boolean not null default false;
+alter table migtest_e_basic add column old_boolean boolean default false not null;
 alter table migtest_e_basic add column old_boolean2 boolean;
 alter table migtest_e_basic add column eref_id integer;
 
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
index 8fcfa6dbe..3c48db53c 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
@@ -28,14 +28,14 @@ alter table migtest_e_basic alter column some_date set not null;
 insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict on update restrict;
 alter table migtest_e_basic alter column user_id set null;
-alter table migtest_e_basic add column new_string_field varchar(255) not null default 'foo''bar';
-alter table migtest_e_basic add column new_boolean_field boolean not null default true;
+alter table migtest_e_basic add column new_string_field varchar(255) default 'foo''bar' not null;
+alter table migtest_e_basic add column new_boolean_field boolean default true not null;
 update migtest_e_basic set new_boolean_field = old_boolean;
 
-alter table migtest_e_basic add column new_boolean_field2 boolean not null default true;
-alter table migtest_e_basic add column progress integer not null default 0;
+alter table migtest_e_basic add column new_boolean_field2 boolean default true not null;
+alter table migtest_e_basic add column progress integer default 0 not null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2));
-alter table migtest_e_basic add column new_integer integer not null default 42;
+alter table migtest_e_basic add column new_integer integer default 42 not null;
 
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
@@ -50,11 +50,11 @@ update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 alter table migtest_e_history2 alter column test_string set default 'unknown';
 alter table migtest_e_history2 alter column test_string set not null;
 alter table migtest_e_history2 add column test_string2 varchar(255);
-alter table migtest_e_history2 add column test_string3 varchar(255) not null default 'unknown';
+alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null;
 alter table migtest_e_history2_history add column test_string2 varchar(255);
 alter table migtest_e_history2_history add column test_string3 varchar(255);
 
-alter table migtest_e_softdelete add column deleted boolean not null default false;
+alter table migtest_e_softdelete add column deleted boolean default false not null;
 
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
index 4f2436cbd..d89e67fd1 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
@@ -23,7 +23,7 @@ update migtest_e_basic set user_id = 23 where user_id is null;
 alter table migtest_e_basic drop constraint if exists fk_migtest_e_basic_user_id;
 alter table migtest_e_basic alter column user_id set default 23;
 alter table migtest_e_basic alter column user_id set not null;
-alter table migtest_e_basic add column old_boolean boolean not null default false;
+alter table migtest_e_basic add column old_boolean boolean default false not null;
 alter table migtest_e_basic add column old_boolean2 boolean;
 alter table migtest_e_basic add column eref_id integer;
 
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
index 7bfa87ed5..8d5563048 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
@@ -41,7 +41,7 @@ create table migtest_e_basic (
   description                   varchar(127),
   some_date                     datetime(6),
   old_boolean                   tinyint(1) default 0 not null,
-  old_boolean2                  tinyint(1) default 0,
+  old_boolean2                  tinyint(1),
   eref_id                       integer,
   indextest1                    varchar(127),
   indextest2                    varchar(127),
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
index 9025e83c4..3fc961b1a 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
@@ -27,14 +27,14 @@ alter table migtest_e_basic modify some_date datetime(6) not null;
 insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict on update restrict;
 alter table migtest_e_basic modify user_id integer;
-alter table migtest_e_basic add column new_string_field varchar(255) not null default 'foo''bar';
-alter table migtest_e_basic add column new_boolean_field tinyint(1) default 0 not null;
+alter table migtest_e_basic add column new_string_field varchar(255) default 'foo''bar' not null;
+alter table migtest_e_basic add column new_boolean_field tinyint(1) default 1 not null;
 update migtest_e_basic set new_boolean_field = old_boolean;
 
-alter table migtest_e_basic add column new_boolean_field2 tinyint(1) default 0 not null;
-alter table migtest_e_basic add column progress integer not null default 0;
+alter table migtest_e_basic add column new_boolean_field2 tinyint(1) default 1 not null;
+alter table migtest_e_basic add column progress integer default 0 not null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2));
-alter table migtest_e_basic add column new_integer integer not null default 42;
+alter table migtest_e_basic add column new_integer integer default 42 not null;
 
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest2;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest6;
@@ -48,7 +48,7 @@ update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 alter table migtest_e_history2 alter test_string set default 'unknown';
 alter table migtest_e_history2 modify test_string varchar(255) not null;
 alter table migtest_e_history2 add column test_string2 varchar(255);
-alter table migtest_e_history2 add column test_string3 varchar(255) not null default 'unknown';
+alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null;
 alter table migtest_e_history2_history add column test_string2 varchar(255);
 alter table migtest_e_history2_history add column test_string3 varchar(255);
 
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
index 6a4f5c74d..a408ec0f3 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
@@ -21,7 +21,7 @@ alter table migtest_e_basic drop foreign key fk_migtest_e_basic_user_id;
 alter table migtest_e_basic alter user_id set default 23;
 alter table migtest_e_basic modify user_id integer not null;
 alter table migtest_e_basic add column old_boolean tinyint(1) default 0 not null;
-alter table migtest_e_basic add column old_boolean2 tinyint(1) default 0;
+alter table migtest_e_basic add column old_boolean2 tinyint(1);
 alter table migtest_e_basic add column eref_id integer;
 
 alter table migtest_e_basic drop index uq_migtest_e_basic_name;
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
index d621493ff..fce202026 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
@@ -47,7 +47,7 @@ create table migtest_e_basic (
   description                   varchar2(127),
   some_date                     timestamp,
   old_boolean                   number(1) default 0 not null,
-  old_boolean2                  number(1) default 0,
+  old_boolean2                  number(1),
   eref_id                       number(10),
   indextest1                    varchar2(127),
   indextest2                    varchar2(127),
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
index 99bf46431..6f280989f 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
@@ -29,14 +29,14 @@ alter table migtest_e_basic modify some_date not null;
 insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id);
 alter table migtest_e_basic modify user_id null;
-alter table migtest_e_basic add column new_string_field varchar2(255) not null default 'foo''bar';
-alter table migtest_e_basic add column new_boolean_field number(1) default 0 not null;
+alter table migtest_e_basic add column new_string_field varchar2(255) default 'foo''bar' not null;
+alter table migtest_e_basic add column new_boolean_field number(1) default 1 not null;
 update migtest_e_basic set new_boolean_field = old_boolean;
 
-alter table migtest_e_basic add column new_boolean_field2 number(1) default 0 not null;
-alter table migtest_e_basic add column progress number(10) not null default 0;
+alter table migtest_e_basic add column new_boolean_field2 number(1) default 1 not null;
+alter table migtest_e_basic add column progress number(10) default 0 not null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2));
-alter table migtest_e_basic add column new_integer number(10) not null default 42;
+alter table migtest_e_basic add column new_integer number(10) default 42 not null;
 
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
@@ -51,7 +51,7 @@ update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 alter table migtest_e_history2 modify test_string default 'unknown';
 alter table migtest_e_history2 modify test_string not null;
 alter table migtest_e_history2 add column test_string2 varchar2(255);
-alter table migtest_e_history2 add column test_string3 varchar2(255) not null default 'unknown';
+alter table migtest_e_history2 add column test_string3 varchar2(255) default 'unknown' not null;
 
 alter table migtest_e_softdelete add column deleted number(1) default 0 not null;
 
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
index 60e6bbf6a..f5cc85a85 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
@@ -25,7 +25,7 @@ alter table migtest_e_basic drop constraint fk_migtest_e_basic_user_id;
 alter table migtest_e_basic modify user_id default 23;
 alter table migtest_e_basic modify user_id not null;
 alter table migtest_e_basic add column old_boolean number(1) default 0 not null;
-alter table migtest_e_basic add column old_boolean2 number(1) default 0;
+alter table migtest_e_basic add column old_boolean2 number(1);
 alter table migtest_e_basic add column eref_id number(10);
 
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
index d26dab182..21b6c7129 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
@@ -31,14 +31,14 @@ alter table migtest_e_basic alter column some_date set not null;
 insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict on update restrict;
 alter table migtest_e_basic alter column user_id drop not null;
-alter table migtest_e_basic add column new_string_field varchar(255) not null default 'foo''bar';
-alter table migtest_e_basic add column new_boolean_field boolean not null default true;
+alter table migtest_e_basic add column new_string_field varchar(255) default 'foo''bar' not null;
+alter table migtest_e_basic add column new_boolean_field boolean default true not null;
 update migtest_e_basic set new_boolean_field = old_boolean;
 
-alter table migtest_e_basic add column new_boolean_field2 boolean not null default true;
-alter table migtest_e_basic add column progress integer not null default 0;
+alter table migtest_e_basic add column new_boolean_field2 boolean default true not null;
+alter table migtest_e_basic add column progress integer default 0 not null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2));
-alter table migtest_e_basic add column new_integer integer not null default 42;
+alter table migtest_e_basic add column new_integer integer default 42 not null;
 
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
@@ -55,11 +55,11 @@ update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 alter table migtest_e_history2 alter column test_string set default 'unknown';
 alter table migtest_e_history2 alter column test_string set not null;
 alter table migtest_e_history2 add column test_string2 varchar(255);
-alter table migtest_e_history2 add column test_string3 varchar(255) not null default 'unknown';
+alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null;
 alter table migtest_e_history2_history add column test_string2 varchar(255);
 alter table migtest_e_history2_history add column test_string3 varchar(255);
 
-alter table migtest_e_softdelete add column deleted boolean not null default false;
+alter table migtest_e_softdelete add column deleted boolean default false not null;
 
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
index e68509998..a68497900 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
@@ -23,7 +23,7 @@ update migtest_e_basic set user_id = 23 where user_id is null;
 alter table if exists migtest_e_basic drop constraint if exists fk_migtest_e_basic_user_id;
 alter table migtest_e_basic alter column user_id set default 23;
 alter table migtest_e_basic alter column user_id set not null;
-alter table migtest_e_basic add column old_boolean boolean not null default false;
+alter table migtest_e_basic add column old_boolean boolean default false not null;
 alter table migtest_e_basic add column old_boolean2 boolean;
 alter table migtest_e_basic add column eref_id integer;
 
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
index cf4fd1839..7817850a0 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
@@ -43,7 +43,7 @@ create table migtest_e_basic (
   description                   varchar(127),
   some_date                     timestamp,
   old_boolean                   int default 0 not null,
-  old_boolean2                  int default 0,
+  old_boolean2                  int,
   eref_id                       integer,
   indextest1                    varchar(127),
   indextest2                    varchar(127),
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
index f1e14b4fb..6bfca30fe 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
@@ -23,14 +23,14 @@ alter table migtest_e_basic alter column some_date set not null;
 
 insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
 alter table migtest_e_basic alter column user_id set null;
-alter table migtest_e_basic add column new_string_field varchar(255) not null default 'foo''bar';
-alter table migtest_e_basic add column new_boolean_field int default 0 not null;
+alter table migtest_e_basic add column new_string_field varchar(255) default 'foo''bar' not null;
+alter table migtest_e_basic add column new_boolean_field int default 1 not null;
 update migtest_e_basic set new_boolean_field = old_boolean;
 
-alter table migtest_e_basic add column new_boolean_field2 int default 0 not null;
-alter table migtest_e_basic add column progress integer not null default 0;
+alter table migtest_e_basic add column new_boolean_field2 int default 1 not null;
+alter table migtest_e_basic add column progress integer default 0 not null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2));
-alter table migtest_e_basic add column new_integer integer not null default 42;
+alter table migtest_e_basic add column new_integer integer default 42 not null;
 
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
@@ -43,7 +43,7 @@ update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 alter table migtest_e_history2 alter column test_string set default 'unknown';
 alter table migtest_e_history2 alter column test_string set not null;
 alter table migtest_e_history2 add column test_string2 varchar(255);
-alter table migtest_e_history2 add column test_string3 varchar(255) not null default 'unknown';
+alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null;
 alter table migtest_e_history2_history add column test_string2 varchar(255);
 alter table migtest_e_history2_history add column test_string3 varchar(255);
 
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
index 262edf014..77f17afb5 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
@@ -22,7 +22,7 @@ alter table migtest_e_basic drop constraint if exists fk_migtest_e_basic_user_id
 alter table migtest_e_basic alter column user_id set default 23;
 alter table migtest_e_basic alter column user_id set not null;
 alter table migtest_e_basic add column old_boolean int default 0 not null;
-alter table migtest_e_basic add column old_boolean2 int default 0;
+alter table migtest_e_basic add column old_boolean2 int;
 alter table migtest_e_basic add column eref_id integer;
 
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql
index 70742f488..58a36d80e 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql
@@ -5,41 +5,40 @@ create table migtest_fk_cascade (
   one_id                        numeric(19),
   constraint pk_migtest_fk_cascade primary key (id)
 );
-create sequence migtest_fk_cascade_seq as bigint  start with 1  increment by 50;
+create sequence migtest_fk_cascade_seq as bigint  start with 1 ;
 
 create table migtest_fk_cascade_one (
   id                            numeric(19) not null,
   constraint pk_migtest_fk_cascade_one primary key (id)
 );
-create sequence migtest_fk_cascade_one_seq as bigint  start with 1  increment by 50;
+create sequence migtest_fk_cascade_one_seq as bigint  start with 1 ;
 
 create table migtest_fk_none (
   id                            numeric(19) not null,
   one_id                        numeric(19),
   constraint pk_migtest_fk_none primary key (id)
 );
-create sequence migtest_fk_none_seq as bigint  start with 1  increment by 50;
+create sequence migtest_fk_none_seq as bigint  start with 1 ;
 
 create table migtest_fk_none_via_join (
   id                            numeric(19) not null,
   one_id                        numeric(19),
   constraint pk_migtest_fk_none_via_join primary key (id)
 );
-create sequence migtest_fk_none_via_join_seq as bigint  start with 1  increment by 50;
+create sequence migtest_fk_none_via_join_seq as bigint  start with 1 ;
 
 create table migtest_fk_one (
   id                            numeric(19) not null,
   constraint pk_migtest_fk_one primary key (id)
 );
-create sequence migtest_fk_one_seq as bigint  start with 1  increment by 50;
-
+create sequence migtest_fk_one_seq as bigint  start with 1 ;
 
 create table migtest_fk_set_null (
   id                            numeric(19) not null,
   one_id                        numeric(19),
   constraint pk_migtest_fk_set_null primary key (id)
 );
-create sequence migtest_fk_set_null_seq as bigint  start with 1  increment by 50;
+create sequence migtest_fk_set_null_seq as bigint  start with 1 ;
 
 create table migtest_e_basic (
   id                            integer not null,
@@ -48,7 +47,7 @@ create table migtest_e_basic (
   description                   varchar(127),
   some_date                     datetime2,
   old_boolean                   bit default 0 not null,
-  old_boolean2                  bit default 0,
+  old_boolean2                  bit,
   eref_id                       integer,
   indextest1                    varchar(127),
   indextest2                    varchar(127),
@@ -62,34 +61,34 @@ create table migtest_e_basic (
 );
 create unique nonclustered index uq_migtest_e_basic_indextest2 on migtest_e_basic(indextest2) where indextest2 is not null;
 create unique nonclustered index uq_migtest_e_basic_indextest6 on migtest_e_basic(indextest6) where indextest6 is not null;
-create sequence migtest_e_basic_seq as bigint  start with 1  increment by 50;
+create sequence migtest_e_basic_seq as bigint  start with 1 ;
 
 create table migtest_e_history (
   id                            integer not null,
   test_string                   varchar(255),
   constraint pk_migtest_e_history primary key (id)
 );
-create sequence pk_migtest_e_history_seq as bigint  start with 1  increment by 50;
+create sequence migtest_e_history_seq as bigint  start with 1 ;
 
 create table migtest_e_history2 (
   id                            integer not null,
   test_string                   varchar(255),
   constraint pk_migtest_e_history2 primary key (id)
 );
-create sequence migtest_e_history2_seq as bigint  start with 1  increment by 50;
+create sequence migtest_e_history2_seq as bigint  start with 1 ;
 
 create table migtest_e_ref (
   id                            integer not null,
   constraint pk_migtest_e_ref primary key (id)
 );
-create sequence migtest_e_ref_seq as bigint  start with 1  increment by 50;
+create sequence migtest_e_ref_seq as bigint  start with 1 ;
 
 create table migtest_e_softdelete (
   id                            integer not null,
   test_string                   varchar(255),
   constraint pk_migtest_e_softdelete primary key (id)
 );
-create sequence migtest_e_softdelete_seq as bigint  start with 1  increment by 50;
+create sequence migtest_e_softdelete_seq as bigint  start with 1 ;
 
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql
index 9bdf6cdc6..b873a0152 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql
@@ -4,7 +4,7 @@ create table migtest_e_user (
   id                            integer not null,
   constraint pk_migtest_e_user primary key (id)
 );
-create sequence migtest_e_user_seq as bigint  start with 1  increment by 50;
+create sequence migtest_e_user_seq as bigint  start with 1 ;
 
 IF OBJECT_ID('fk_migtest_fk_cascade_one_id', 'F') IS NOT NULL alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id);
@@ -29,14 +29,14 @@ alter table migtest_e_basic alter column some_date datetime2 not null;
 insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id);
 alter table migtest_e_basic alter column user_id integer;
-alter table migtest_e_basic add new_string_field varchar(255) not null default 'foo''bar';
-alter table migtest_e_basic add new_boolean_field bit default 0 not null;
+alter table migtest_e_basic add new_string_field varchar(255) default 'foo''bar' not null;
+alter table migtest_e_basic add new_boolean_field bit default 1 not null;
 update migtest_e_basic set new_boolean_field = old_boolean;
 
 alter table migtest_e_basic add new_boolean_field2 bit default 1 not null;
-alter table migtest_e_basic add progress integer not null default 0;
+alter table migtest_e_basic add progress integer default 0 not null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2));
-alter table migtest_e_basic add new_integer integer not null default 42;
+alter table migtest_e_basic add new_integer integer default 42 not null;
 
 IF (OBJECT_ID('uq_migtest_e_basic_indextest2', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_indextest2') drop index uq_migtest_e_basic_indextest2 ON migtest_e_basic;
@@ -51,7 +51,7 @@ update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 alter table migtest_e_history2 add default 'unknown' for test_string;
 alter table migtest_e_history2 alter column test_string varchar(255) not null;
 alter table migtest_e_history2 add test_string2 varchar(255);
-alter table migtest_e_history2 add test_string3 varchar(255) not null default 'unknown';
+alter table migtest_e_history2 add test_string3 varchar(255) default 'unknown' not null;
 
 alter table migtest_e_softdelete add deleted bit default 0 not null;
 
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql
index c6add60d1..944c52349 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql
@@ -1,10 +1,10 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
 create table migtest_e_ref (
-  id                            integer identity(1,1) not null,
+  id                            integer not null,
   constraint pk_migtest_e_ref primary key (id)
 );
-create sequence migtest_e_ref_seq as bigint  start with 1  increment by 50;
+create sequence migtest_e_ref_seq as bigint  start with 1 ;
 
 IF OBJECT_ID('fk_migtest_fk_cascade_one_id', 'F') IS NOT NULL alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
@@ -32,7 +32,7 @@ IF OBJECT_ID('fk_migtest_e_basic_user_id', 'F') IS NOT NULL alter table migtest_
 alter table migtest_e_basic add default 23 for user_id;
 alter table migtest_e_basic alter column user_id integer not null;
 alter table migtest_e_basic add old_boolean bit default 0 not null;
-alter table migtest_e_basic add old_boolean2 bit default 0;
+alter table migtest_e_basic add old_boolean2 bit;
 alter table migtest_e_basic add eref_id integer;
 
 IF (OBJECT_ID('uq_migtest_e_basic_name', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;

From 06bce35f5ad7d3f530114c85e580e913393ab717 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 27 Feb 2018 12:56:20 +1300
Subject: [PATCH 0093/1036] #1293 - Refactor - move JdbcClose into
 io.ebean.util ... from io.ebeaninternal.util as it is used in public API
 (platform code, sequences etc)

---
 .../config/dbplatform/DatabasePlatform.java   |  2 +-
 .../dbplatform/SequenceIdGenerator.java       |  2 +-
 .../dbplatform/SimpleSequenceIdGenerator.java | 25 +++-----------
 .../util/JdbcClose.java                       |  2 +-
 .../server/core/RelationalQueryRequest.java   | 21 ++----------
 .../server/persist/ExeCallableSql.java        | 17 +++-------
 .../server/persist/ExeOrmUpdate.java          | 13 ++-----
 .../server/persist/ExeUpdateSql.java          | 14 ++------
 .../server/persist/dml/InsertHandler.java     | 28 +++------------
 .../io/ebeaninternal/server/query/CQuery.java | 13 +++----
 .../query/CQueryFetchSingleAttribute.java     | 11 ++----
 .../server/query/CQueryRowCount.java          |  5 +--
 .../server/query/CQueryUpdate.java            |  3 +-
 .../ebeaninternal/server/query/UtilJdbc.java  | 34 -------------------
 .../transaction/JtaTransactionManager.java    |  2 +-
 .../transaction/TransactionFactory.java       |  2 +-
 .../transaction/TransactionFactoryBasic.java  |  2 +-
 .../TransactionFactoryBasicWithRead.java      |  2 +-
 .../transaction/TransactionFactoryTenant.java |  2 +-
 .../TransactionFactoryTenantWithRead.java     |  2 +-
 20 files changed, 43 insertions(+), 159 deletions(-)
 rename src/main/java/io/{ebeaninternal => ebean}/util/JdbcClose.java (97%)
 delete mode 100644 src/main/java/io/ebeaninternal/server/query/UtilJdbc.java

diff --git a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
index 2f105e0d6..166a9b5df 100644
--- a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
@@ -7,7 +7,7 @@ import io.ebean.annotation.Platform;
 import io.ebean.config.CustomDbTypeMapping;
 import io.ebean.config.DbTypeConfig;
 import io.ebean.config.ServerConfig;
-import io.ebeaninternal.util.JdbcClose; // FIXME: should not import ebeaninternal here
+import io.ebean.util.JdbcClose;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java
index 985a545c6..44f20e643 100644
--- a/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java
+++ b/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java
@@ -2,7 +2,7 @@ package io.ebean.config.dbplatform;
 
 import io.ebean.BackgroundExecutor;
 import io.ebean.Transaction;
-import io.ebeaninternal.util.JdbcClose;
+import io.ebean.util.JdbcClose;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java
index 902579384..95ee33894 100644
--- a/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java
+++ b/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java
@@ -1,6 +1,7 @@
 package io.ebean.config.dbplatform;
 
 import io.ebean.Transaction;
+import io.ebean.util.JdbcClose;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -82,27 +83,9 @@ public class SimpleSequenceIdGenerator implements PlatformIdGenerator {
   }
 
   private void closeResources(ResultSet rset, PreparedStatement pstmt, Connection c) {
-    try {
-      if (rset != null) {
-        rset.close();
-      }
-    } catch (SQLException e) {
-      logger.error("Error closing ResultSet", e);
-    }
-    try {
-      if (pstmt != null) {
-        pstmt.close();
-      }
-    } catch (SQLException e) {
-      logger.error("Error closing PreparedStatement", e);
-    }
-    try {
-      if (c != null) {
-        c.close();
-      }
-    } catch (SQLException e) {
-      logger.error("Error closing Connection", e);
-    }
+    JdbcClose.close(rset);
+    JdbcClose.close(pstmt);
+    JdbcClose.close(c);
   }
 
 }
diff --git a/src/main/java/io/ebeaninternal/util/JdbcClose.java b/src/main/java/io/ebean/util/JdbcClose.java
similarity index 97%
rename from src/main/java/io/ebeaninternal/util/JdbcClose.java
rename to src/main/java/io/ebean/util/JdbcClose.java
index f74e3dd46..92b3f7e28 100644
--- a/src/main/java/io/ebeaninternal/util/JdbcClose.java
+++ b/src/main/java/io/ebean/util/JdbcClose.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.util;
+package io.ebean.util;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
index 115c7e93c..9461142f0 100644
--- a/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
@@ -4,6 +4,7 @@ import io.ebean.EbeanServer;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
 import io.ebean.Transaction;
+import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiSqlQuery;
@@ -14,8 +15,6 @@ import io.ebeaninternal.server.persist.TrimLogSql;
 import io.ebeaninternal.server.query.DefaultSqlRow;
 import io.ebeaninternal.server.transaction.TransactionManager;
 import io.ebeaninternal.server.util.BindParamsParser;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -32,8 +31,6 @@ import java.util.function.Predicate;
  */
 public final class RelationalQueryRequest {
 
-  private static final Logger logger = LoggerFactory.getLogger(RelationalQueryRequest.class);
-
   private final SpiSqlQuery query;
 
   private final RelationalQueryEngine queryEngine;
@@ -168,20 +165,8 @@ public final class RelationalQueryRequest {
    * Close the underlying resources.
    */
   public void close() {
-    try {
-      if (resultSet != null) {
-        resultSet.close();
-      }
-    } catch (SQLException e) {
-      logger.error(null, e);
-    }
-    try {
-      if (pstmt != null) {
-        pstmt.close();
-      }
-    } catch (SQLException e) {
-      logger.error(null, e);
-    }
+    JdbcClose.close(resultSet);
+    JdbcClose.close(pstmt);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java b/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java
index dde0be020..a1e8daa4e 100644
--- a/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java
+++ b/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java
@@ -1,12 +1,11 @@
 package io.ebeaninternal.server.persist;
 
+import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.SpiCallableSql;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.core.PersistRequestCallableSql;
 import io.ebeaninternal.server.util.BindParamsParser;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.persistence.PersistenceException;
 import java.sql.CallableStatement;
@@ -15,15 +14,13 @@ import java.sql.SQLException;
 /**
  * Handles the execution of CallableSql requests.
  */
-public class ExeCallableSql {
-
-  private static final Logger logger = LoggerFactory.getLogger(ExeCallableSql.class);
+class ExeCallableSql {
 
   private final Binder binder;
 
   private final PstmtFactory pstmtFactory;
 
-  public ExeCallableSql(Binder binder) {
+  ExeCallableSql(Binder binder) {
     this.binder = binder;
     this.pstmtFactory = new PstmtFactory();
   }
@@ -54,12 +51,8 @@ public class ExeCallableSql {
       throw new PersistenceException(ex);
 
     } finally {
-      if (!batchThisRequest && cstmt != null) {
-        try {
-          cstmt.close();
-        } catch (SQLException e) {
-          logger.error(null, e);
-        }
+      if (!batchThisRequest) {
+        JdbcClose.close(cstmt);
       }
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java b/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java
index 3830096a6..32faa0924 100644
--- a/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java
+++ b/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java
@@ -1,13 +1,12 @@
 package io.ebeaninternal.server.persist;
 
+import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.api.SpiUpdate;
 import io.ebeaninternal.server.core.PersistRequestOrmUpdate;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.util.BindParamsParser;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.persistence.PersistenceException;
 import java.sql.PreparedStatement;
@@ -18,8 +17,6 @@ import java.sql.SQLException;
  */
 class ExeOrmUpdate {
 
-  private static final Logger logger = LoggerFactory.getLogger(ExeOrmUpdate.class);
-
   private final Binder binder;
 
   private final PstmtFactory pstmtFactory;
@@ -61,12 +58,8 @@ class ExeOrmUpdate {
       throw new PersistenceException("Error executing: " + request.getOrmUpdate().getGeneratedSql(), ex);
 
     } finally {
-      if (!batchThisRequest && pstmt != null) {
-        try {
-          pstmt.close();
-        } catch (SQLException e) {
-          logger.error(null, e);
-        }
+      if (!batchThisRequest) {
+        JdbcClose.close(pstmt);
       }
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java b/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java
index b8e050783..fd1f0c7d4 100644
--- a/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java
+++ b/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java
@@ -1,14 +1,12 @@
 package io.ebeaninternal.server.persist;
 
+import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.SpiSqlUpdate;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.core.PersistRequestUpdateSql;
 import io.ebeaninternal.server.core.PersistRequestUpdateSql.SqlType;
 import io.ebeaninternal.server.util.BindParamsParser;
-import io.ebeaninternal.util.JdbcClose;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.persistence.PersistenceException;
 import java.sql.PreparedStatement;
@@ -20,8 +18,6 @@ import java.sql.SQLException;
  */
 class ExeUpdateSql {
 
-  private static final Logger logger = LoggerFactory.getLogger(ExeUpdateSql.class);
-
   private final Binder binder;
 
   private final PstmtFactory pstmtFactory;
@@ -63,12 +59,8 @@ class ExeUpdateSql {
       throw new PersistenceException(ex);
 
     } finally {
-      if (!batchThisRequest && pstmt != null) {
-        try {
-          pstmt.close();
-        } catch (SQLException e) {
-          logger.error(null, e);
-        }
+      if (!batchThisRequest) {
+        JdbcClose.close(pstmt);
       }
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
index df8b82d5c..ec8cdd7df 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
@@ -1,13 +1,12 @@
 package io.ebeaninternal.server.persist.dml;
 
 import io.ebean.bean.EntityBean;
+import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.core.Message;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.persist.DmlUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
@@ -21,8 +20,6 @@ import java.sql.SQLException;
  */
 public class InsertHandler extends DmlHandler {
 
-  private static final Logger logger = LoggerFactory.getLogger(InsertHandler.class);
-
   /**
    * The associated InsertMeta data.
    */
@@ -142,12 +139,7 @@ public class InsertHandler extends DmlHandler {
     try {
       setGeneratedKey(rset);
     } finally {
-      try {
-        rset.close();
-      } catch (SQLException ex) {
-        String msg = "Error closing rset for returning generatedKeys?";
-        logger.warn(msg, ex);
-      }
+      JdbcClose.close(rset);
     }
   }
 
@@ -178,20 +170,8 @@ public class InsertHandler extends DmlHandler {
       rset = stmt.executeQuery();
       setGeneratedKey(rset);
     } finally {
-      try {
-        if (rset != null) {
-          rset.close();
-        }
-      } catch (SQLException ex) {
-        logger.warn("Error closing ResultSet for fetchGeneratedKeyUsingSelect?", ex);
-      }
-      try {
-        if (stmt != null) {
-          stmt.close();
-        }
-      } catch (SQLException ex) {
-        logger.warn("Error closing Statement for fetchGeneratedKeyUsingSelect?", ex);
-      }
+      JdbcClose.close(rset);
+      JdbcClose.close(stmt);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/query/CQuery.java b/src/main/java/io/ebeaninternal/server/query/CQuery.java
index 95c3d9767..6ab29d742 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQuery.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQuery.java
@@ -10,10 +10,11 @@ import io.ebean.bean.NodeUsageListener;
 import io.ebean.bean.ObjectGraphNode;
 import io.ebean.bean.PersistenceContext;
 import io.ebean.event.readaudit.ReadEvent;
+import io.ebean.util.JdbcClose;
+import io.ebeaninternal.api.SpiProfileTransactionEvent;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.SpiQuery.Mode;
 import io.ebeaninternal.api.SpiTransaction;
-import io.ebeaninternal.api.SpiProfileTransactionEvent;
 import io.ebeaninternal.server.autotune.ProfilingListener;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.core.SpiOrmQueryRequest;
@@ -381,14 +382,8 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
     } catch (SQLException e) {
       logger.error("Error closing dataReader", e);
     }
-    try {
-      if (pstmt != null) {
-        pstmt.close();
-        pstmt = null;
-      }
-    } catch (SQLException e) {
-      logger.error("Error closing preparedStatement", e);
-    }
+    JdbcClose.close(pstmt);
+    pstmt = null;
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java b/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
index af6420980..8ea69624c 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.query;
 
+import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.SpiProfileTransactionEvent;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.SpiTransaction;
@@ -169,14 +170,8 @@ class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent {
     } catch (SQLException e) {
       logger.error("Error closing DataReader", e);
     }
-    try {
-      if (pstmt != null) {
-        pstmt.close();
-        pstmt = null;
-      }
-    } catch (SQLException e) {
-      logger.error("Error closing PreparedStatement", e);
-    }
+    JdbcClose.close(pstmt);
+    pstmt = null;
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java b/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java
index efa590883..5ddfe7b02 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.query;
 
+import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.SpiProfileTransactionEvent;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.SpiTransaction;
@@ -141,8 +142,8 @@ class CQueryRowCount implements SpiProfileTransactionEvent {
    * Close the resources.
    */
   private void close() {
-    UtilJdbc.close(rset);
-    UtilJdbc.close(pstmt);
+    JdbcClose.close(rset);
+    JdbcClose.close(pstmt);
     rset = null;
     pstmt = null;
   }
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java b/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java
index a64738f0a..6331c1cb6 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.query;
 
+import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.SpiProfileTransactionEvent;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.SpiTransaction;
@@ -127,7 +128,7 @@ class CQueryUpdate implements SpiProfileTransactionEvent {
    * Close the resources.
    */
   private void close() {
-    UtilJdbc.close(pstmt);
+    JdbcClose.close(pstmt);
     pstmt = null;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/query/UtilJdbc.java b/src/main/java/io/ebeaninternal/server/query/UtilJdbc.java
deleted file mode 100644
index 56cec9d40..000000000
--- a/src/main/java/io/ebeaninternal/server/query/UtilJdbc.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package io.ebeaninternal.server.query;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-public class UtilJdbc {
-
-  private static final Logger logger = LoggerFactory.getLogger(UtilJdbc.class);
-
-  public static void close(ResultSet resultSet) {
-    try {
-      if (resultSet != null) {
-        resultSet.close();
-      }
-    } catch (SQLException e) {
-      logger.error("Error closing ResultSet", e);
-    }
-  }
-
-  public static void close(PreparedStatement statement) {
-    try {
-      if (statement != null) {
-        statement.close();
-      }
-    } catch (SQLException e) {
-      logger.error("Error closing PreparedStatement", e);
-    }
-  }
-
-}
diff --git a/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java
index 1a0c0043c..1933b10c6 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.transaction;
 
 import io.ebean.config.ExternalTransactionManager;
+import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.SpiTransaction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,7 +19,6 @@ import javax.transaction.Synchronization;
 import javax.transaction.SystemException;
 import javax.transaction.TransactionSynchronizationRegistry;
 import javax.transaction.UserTransaction;
-import io.ebeaninternal.util.JdbcClose;
 
 /**
  * Hook into external JTA transaction manager.
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java
index a1593736d..c30a430ba 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.transaction;
 
+import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.SpiTransaction;
-import io.ebeaninternal.util.JdbcClose;
 import org.slf4j.Logger;
 
 import javax.persistence.PersistenceException;
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java
index 3b552bf27..88959e921 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.transaction;
 
+import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.SpiTransaction;
-import io.ebeaninternal.util.JdbcClose;
 
 import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java
index 19926ffea..dbab9e870 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.transaction;
 
+import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.SpiTransaction;
-import io.ebeaninternal.util.JdbcClose;
 
 import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java
index c1fa5f670..fdb76e23e 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java
@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.transaction;
 
 import io.ebean.config.CurrentTenantProvider;
+import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.SpiTransaction;
-import io.ebeaninternal.util.JdbcClose;
 
 import javax.persistence.PersistenceException;
 import java.sql.Connection;
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java
index 94f83d5fd..77bec4413 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java
@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.transaction;
 
 import io.ebean.config.CurrentTenantProvider;
+import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.SpiTransaction;
-import io.ebeaninternal.util.JdbcClose;
 
 import javax.persistence.PersistenceException;
 import java.sql.Connection;

From 45a023f0e4af21fb746e9b2e9af62cb8f754ce00 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 27 Feb 2018 14:25:44 +1300
Subject: [PATCH 0094/1036] #1282 - Not supported for @DbArray mapping when
 using kotlin var instead of val

---
 .../server/type/DefaultTypeManager.java       | 24 ++++---
 .../server/type/TypeReflectHelper.java        | 39 +++++++++++-
 .../server/type/TypeReflectHelperTest.java    | 62 ++++++++++++++++++-
 3 files changed, 107 insertions(+), 18 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 6bdb05661..e0f2c6ac5 100644
--- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -266,7 +266,7 @@ public final class DefaultTypeManager implements TypeManager {
    * can have many classes if it uses method overrides and we need to register all
    * the variations/classes for the enum.
    */
-  @SuppressWarnings({ "rawtypes", "unchecked" })
+  @SuppressWarnings({"rawtypes", "unchecked"})
   @Override
   public void addEnumType(ScalarType<?> scalarType, Class<? extends Enum> enumClass) {
 
@@ -339,7 +339,7 @@ public final class DefaultTypeManager implements TypeManager {
     Type valueType = getValueType(genericType);
     if (type.equals(List.class)) {
       if (arrayTypeListFactory != null) {
-        if(isEnumType(valueType)) {
+        if (isEnumType(valueType)) {
           return arrayTypeListFactory.typeForEnum(createEnumScalarType(asEnumClass(valueType), EnumType.STRING));
         }
         return arrayTypeListFactory.typeFor(valueType);
@@ -348,7 +348,7 @@ public final class DefaultTypeManager implements TypeManager {
       return new ScalarTypeJsonList.Varchar(getDocType(valueType));
     } else if (type.equals(Set.class)) {
       if (arrayTypeSetFactory != null) {
-        if(isEnumType(valueType)) {
+        if (isEnumType(valueType)) {
           return arrayTypeSetFactory.typeForEnum(createEnumScalarType(asEnumClass(valueType), EnumType.STRING));
         }
         return arrayTypeSetFactory.typeFor(valueType);
@@ -359,13 +359,12 @@ public final class DefaultTypeManager implements TypeManager {
     throw new IllegalStateException("Type [" + type + "] not supported for @DbArray");
   }
 
-  @SuppressWarnings("unchecked")
   private Class<? extends Enum<?>> asEnumClass(Type valueType) {
-    return (Class<? extends Enum<?>>)valueType;
+    return TypeReflectHelper.asEnumClass(valueType);
   }
 
   private boolean isEnumType(Type valueType) {
-    return valueType instanceof Class && ((Class<?>)valueType).isEnum();
+    return TypeReflectHelper.isEnumType(valueType);
   }
 
   @Override
@@ -430,14 +429,13 @@ public final class DefaultTypeManager implements TypeManager {
   /**
    * Return true if value parameter type of the map is Object.
    */
-  private boolean isValueTypeSimple(Type genericType) {
-    Type[] typeArgs = ((ParameterizedType) genericType).getActualTypeArguments();
-    return String.class.equals(typeArgs[0]) || Long.class.equals(typeArgs[0]);
+  private boolean isValueTypeSimple(Type collectionType) {
+    Type typeArg = TypeReflectHelper.getValueType(collectionType);
+    return String.class.equals(typeArg) || Long.class.equals(typeArg);
   }
 
-  private Type getValueType(Type genericType) {
-    Type[] typeArgs = ((ParameterizedType) genericType).getActualTypeArguments();
-    return typeArgs[0];
+  private Type getValueType(Type collectionType) {
+    return TypeReflectHelper.getValueType(collectionType);
   }
 
   /**
@@ -593,7 +591,7 @@ public final class DefaultTypeManager implements TypeManager {
     ScalarTypeEnum<?> scalarType = (ScalarTypeEnum<?>) getScalarType(enumType);
     if (scalarType != null && !scalarType.isOverrideBy(type)) {
       if (type != null && !scalarType.isCompatible(type)) {
-        throw new IllegalStateException("Error mapping Enum type:"+enumType+" It is mapped using 2 different modes when only one is supported (ORDINAL, STRING or an Ebean mapping)");
+        throw new IllegalStateException("Error mapping Enum type:" + enumType + " It is mapped using 2 different modes when only one is supported (ORDINAL, STRING or an Ebean mapping)");
       }
       return scalarType;
     }
diff --git a/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java b/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java
index a69dcd75d..392c0829b 100644
--- a/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java
+++ b/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.type;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import java.lang.reflect.WildcardType;
 
 public class TypeReflectHelper {
 
@@ -9,14 +10,48 @@ public class TypeReflectHelper {
     return TypeResolver.resolveRawArgs(matchRawType, cls);
   }
 
-  public static Class<?> getClass(Type type) {
+  /**
+   * Return the enum class for this type taking into account wildcard type.
+   */
+  @SuppressWarnings("unchecked")
+  public static Class<? extends Enum<?>> asEnumClass(Type valueType) {
+    Class<?> enumClass = getClass(valueType);
+    return (Class<? extends Enum<?>>) enumClass;
+  }
+
+  /**
+   * Return true if the type is an enum.
+   */
+  public static boolean isEnumType(Type valueType) {
+    try {
+      return getClass(valueType).isEnum();
+    } catch (ClassCastException | IllegalArgumentException e) {
+      return false;
+    }
+  }
+
+  /**
+   * Return the value type of a collection type (list, set, map values).
+   */
+  public static Type getValueType(Type collectionType) {
+    Type[] typeArgs = ((ParameterizedType) collectionType).getActualTypeArguments();
+    return typeArgs[0];
+  }
+
+  private static Class<?> getClass(Type type) {
 
     while (true) {
       if (type instanceof ParameterizedType) {
         type = ((ParameterizedType) type).getRawType();
         continue;
       }
-
+      if (type instanceof WildcardType) {
+        Type[] upperBounds = ((WildcardType) type).getUpperBounds();
+        if (upperBounds != null && upperBounds.length == 1) {
+          return getClass(upperBounds[0]);
+        }
+        throw new IllegalArgumentException("Don't know how to determine Class from Type [" + type + "]");
+      }
       return (Class<?>) type;
     }
   }
diff --git a/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java b/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java
index fe815617d..8ba6d612f 100644
--- a/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.type;
 
 import io.ebean.config.ScalarTypeConverter;
 import org.junit.Test;
+import org.tests.model.basic.Order;
 import org.tests.model.ivo.Money;
 import org.tests.model.ivo.Oid;
 import org.tests.model.ivo.SysTime;
@@ -10,8 +11,13 @@ import org.tests.model.ivo.converter.OidTypeConverter;
 import org.tests.model.ivo.converter.SysTimeConverter;
 
 import javax.persistence.AttributeConverter;
+import java.lang.reflect.Field;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -57,13 +63,63 @@ public class TypeReflectHelperTest {
     assertThat(params[1]).isEqualTo(byte[].class);
   }
 
-  static class RichText {
+  @Test
+  public void isEnumType_wildCard() throws NoSuchFieldException {
+
+    Field wildOrderStatus = Some.class.getDeclaredField("wildOrderStatus");
+    assertThat(TypeReflectHelper.isEnumType(getValueType(wildOrderStatus.getGenericType()))).isTrue();
+
+    Class<?> aClass = TypeReflectHelper.asEnumClass(getValueType(wildOrderStatus.getGenericType()));
+    assertThat(aClass).isEqualTo(Order.Status.class);
+  }
+
+
+  @Test
+  public void isEnumType_simpleType() throws NoSuchFieldException {
+
+    Field orderStatus = Some.class.getDeclaredField("orderStatus");
+
+    assertThat(TypeReflectHelper.isEnumType(getValueType(orderStatus.getGenericType()))).isTrue();
+
+    Class<? extends Enum> aClass = TypeReflectHelper.asEnumClass(getValueType(orderStatus.getGenericType()));
+    assertThat(aClass).isEqualTo(Order.Status.class);
+  }
+
+  @Test
+  public void getValueType_simpleType() throws NoSuchFieldException {
+
+    Field orderStatus = Some.class.getDeclaredField("orderStatus");
+
+    Type expected = getValueType(orderStatus.getGenericType());
+    assertThat(TypeReflectHelper.getValueType(orderStatus.getGenericType())).isEqualTo(expected);
+  }
+
+  @Test
+  public void getValueType_wildcardType() throws NoSuchFieldException {
+
+    Field orderStatus = Some.class.getDeclaredField("wildOrderStatus");
+
+    Type expected = getValueType(orderStatus.getGenericType());
+    assertThat(TypeReflectHelper.getValueType(orderStatus.getGenericType())).isEqualTo(expected);
+  }
+
+  private Type getValueType(Type genericType) {
+    return ((ParameterizedType) genericType).getActualTypeArguments()[0];
+  }
+
+  private static class Some {
+
+    List<? extends Order.Status> wildOrderStatus = new ArrayList<>();
+    List<Order.Status> orderStatus = new ArrayList<>();
+  }
+
+  private static class RichText {
 
   }
 
-  static class RichTextConverter extends Direct<RichText> {}
+  private static class RichTextConverter extends Direct<RichText> {}
 
-  static class Direct<M>  implements ScalarTypeConverter<M, byte[]> {
+  private static class Direct<M>  implements ScalarTypeConverter<M, byte[]> {
 
     @Override
     public M getNullValue() {

From 68a470a086e6531f24acda2fd17db2e3ff1cf120 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 27 Feb 2018 15:00:13 +1300
Subject: [PATCH 0095/1036] Test change only - No effective change, remove noop
 ServerConfig.loadTestProperties()

---
 .../io/ebean/EbeanServerFactory_MultiTenancy_Test.java | 10 ++++++----
 src/test/java/io/ebean/config/ServerConfigTest.java    |  2 --
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java b/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java
index 8d1669e56..a12db5bbb 100644
--- a/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java
+++ b/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java
@@ -1,6 +1,11 @@
 package io.ebean;
 
-import io.ebean.config.*;
+import io.ebean.config.CurrentTenantProvider;
+import io.ebean.config.ServerConfig;
+import io.ebean.config.TenantCatalogProvider;
+import io.ebean.config.TenantDataSourceProvider;
+import io.ebean.config.TenantMode;
+import io.ebean.config.TenantSchemaProvider;
 import io.ebean.config.dbplatform.mysql.MySqlPlatform;
 import io.ebean.config.dbplatform.postgres.PostgresPlatform;
 import org.junit.Test;
@@ -27,7 +32,6 @@ public class EbeanServerFactory_MultiTenancy_Test extends BaseTestCase {
     ServerConfig config = new ServerConfig();
     config.setName("multiTenantDb");
     config.loadFromProperties();
-    config.loadTestProperties();
     config.setRegister(false);
     config.setDefaultServer(false);
 
@@ -62,7 +66,6 @@ public class EbeanServerFactory_MultiTenancy_Test extends BaseTestCase {
     ServerConfig config = new ServerConfig();
     config.setName("h2");
     config.loadFromProperties();
-    config.loadTestProperties();
     config.setRegister(false);
     config.setDefaultServer(false);
 
@@ -92,7 +95,6 @@ public class EbeanServerFactory_MultiTenancy_Test extends BaseTestCase {
     ServerConfig config = new ServerConfig();
     config.setName("h2");
     config.loadFromProperties();
-    config.loadTestProperties();
     config.setRegister(false);
     config.setDefaultServer(false);
 
diff --git a/src/test/java/io/ebean/config/ServerConfigTest.java b/src/test/java/io/ebean/config/ServerConfigTest.java
index 0eea08122..fcf62fee5 100644
--- a/src/test/java/io/ebean/config/ServerConfigTest.java
+++ b/src/test/java/io/ebean/config/ServerConfigTest.java
@@ -83,8 +83,6 @@ public class ServerConfigTest {
     assertFalse(serverConfig.isDisableL2Cache());
     assertFalse(serverConfig.isNotifyL2CacheInForeground());
 
-    serverConfig.loadTestProperties();
-
     assertEquals(PersistBatch.ALL, serverConfig.getPersistBatch());
     assertEquals(PersistBatch.ALL, serverConfig.getPersistBatchOnCascade());
   }

From c8e199177c31419b985d31fd9dc00cff1e1dc5d8 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 27 Feb 2018 15:31:26 +1300
Subject: [PATCH 0096/1036] #1294 - NPE when delete cascade from bean with
 SoftDelete to imported OneToOne without SoftDelete

---
 .../server/deploy/BeanPropertyAssoc.java      |  7 ++
 .../server/persist/DefaultPersister.java      | 20 +++---
 .../tests/model/softdelete/ESoftDelOneA.java  | 71 +++++++++++++++++++
 .../tests/model/softdelete/ESoftDelOneB.java  | 57 +++++++++++++++
 .../softdelete/TestSoftDeleteOtoCascade.java  | 38 ++++++++++
 5 files changed, 185 insertions(+), 8 deletions(-)
 create mode 100644 src/test/java/org/tests/model/softdelete/ESoftDelOneA.java
 create mode 100644 src/test/java/org/tests/model/softdelete/ESoftDelOneB.java
 create mode 100644 src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
index 499276dce..656f5d0bc 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
@@ -186,6 +186,13 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty {
     return targetDescriptor;
   }
 
+  /**
+   * Return true if the target side has soft delete.
+   */
+  public boolean isTargetSoftDelete() {
+    return targetDescriptor.isSoftDelete();
+  }
+
   /**
    * Return true if REFRESH should cascade.
    */
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 7343a8ac5..a825c1653 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -1080,7 +1080,7 @@ public final class DefaultPersister implements Persister {
       DeleteUnloadedForeignKeys unloaded = null;
       for (BeanPropertyAssocOne<?> prop : expOnes) {
         // for soft delete check cascade type also supports soft delete
-        if (!softDelete || prop.getTargetDescriptor().isSoftDelete()) {
+        if (!softDelete || prop.isTargetSoftDelete()) {
           if (request.isLoadedProperty(prop)) {
             Object detailBean = prop.getValue(parentBean);
             if (detailBean != null) {
@@ -1113,7 +1113,7 @@ public final class DefaultPersister implements Persister {
         if (ModifyListenMode.REMOVALS == many.getModifyListenMode()) {
           // PrivateOwned ...
           // if soft delete then check target also supports soft delete
-          if (!softDelete || many.getTargetDescriptor().isSoftDelete()) {
+          if (!softDelete || many.isTargetSoftDelete()) {
             Object details = many.getValue(parentBean);
             if (details instanceof BeanCollection<?>) {
               Set<?> modifyRemovals = ((BeanCollection<?>) details).getModifyRemovals();
@@ -1257,14 +1257,18 @@ public final class DefaultPersister implements Persister {
    */
   private void deleteAssocOne(PersistRequestBean<?> request) {
 
+    boolean softDelete = request.isSoftDelete();
+
     BeanPropertyAssocOne<?>[] ones = request.getBeanDescriptor().propertiesOneImportedDelete();
     for (BeanPropertyAssocOne<?> prop : ones) {
-      if (request.isLoadedProperty(prop)) {
-        Object detailBean = prop.getValue(request.getEntityBean());
-        if (detailBean != null) {
-          EntityBean detail = (EntityBean) detailBean;
-          if (prop.hasId(detail)) {
-            deleteRecurse(detail, request.getTransaction(), request.isSoftDelete());
+      if (!softDelete || prop.isTargetSoftDelete()) {
+        if (request.isLoadedProperty(prop)) {
+          Object detailBean = prop.getValue(request.getEntityBean());
+          if (detailBean != null) {
+            EntityBean detail = (EntityBean) detailBean;
+            if (prop.hasId(detail)) {
+              deleteRecurse(detail, request.getTransaction(), request.isSoftDelete());
+            }
           }
         }
       }
diff --git a/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java b/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java
new file mode 100644
index 000000000..3ecd9b044
--- /dev/null
+++ b/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java
@@ -0,0 +1,71 @@
+package org.tests.model.softdelete;
+
+import io.ebean.annotation.SoftDelete;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Version;
+
+@Entity
+public class ESoftDelOneA {
+
+  @Id
+  long id;
+
+  String name;
+
+  @OneToOne(cascade = CascadeType.ALL)
+  ESoftDelOneB oneb;
+
+  @SoftDelete
+  boolean deleted;
+
+  @Version
+  long version;
+
+  public ESoftDelOneA(String name) {
+    this.name = name;
+  }
+
+  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 ESoftDelOneB getOneb() {
+    return oneb;
+  }
+
+  public void setOneb(ESoftDelOneB oneb) {
+    this.oneb = oneb;
+  }
+
+  public boolean isDeleted() {
+    return deleted;
+  }
+
+  public void setDeleted(boolean deleted) {
+    this.deleted = deleted;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/softdelete/ESoftDelOneB.java b/src/test/java/org/tests/model/softdelete/ESoftDelOneB.java
new file mode 100644
index 000000000..b89192b31
--- /dev/null
+++ b/src/test/java/org/tests/model/softdelete/ESoftDelOneB.java
@@ -0,0 +1,57 @@
+package org.tests.model.softdelete;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Version;
+
+@Entity
+public class ESoftDelOneB {
+
+  @Id
+  long id;
+
+  String name;
+
+  @OneToOne(mappedBy = "oneb")
+  ESoftDelOneA onea;
+
+  @Version
+  long version;
+
+  public ESoftDelOneB(String name) {
+    this.name = name;
+  }
+
+  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 ESoftDelOneA getOnea() {
+    return onea;
+  }
+
+  public void setOnea(ESoftDelOneA onea) {
+    this.onea = onea;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java b/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java
new file mode 100644
index 000000000..bad534614
--- /dev/null
+++ b/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java
@@ -0,0 +1,38 @@
+package org.tests.softdelete;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+import org.tests.model.softdelete.ESoftDelOneA;
+import org.tests.model.softdelete.ESoftDelOneB;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestSoftDeleteOtoCascade extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    ESoftDelOneA a = new ESoftDelOneA("a1");
+    ESoftDelOneB b = new ESoftDelOneB("b1");
+
+    a.setOneb(b);
+    b.setOnea(a);
+
+    Ebean.save(a);
+
+    LoggedSqlCollector.start();
+
+    // delete doesn't cascade to ESoftDelOneB as this is a
+    // soft delete and ESoftDelOneB doesn't have soft delete flag
+    Ebean.delete(a);
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("update esoft_del_one_a set deleted=?, version=? where id=? and version=?");
+
+  }
+}

From 57b0190cd2c92f906de95c990ea7506cd1c0d668 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 27 Feb 2018 18:28:03 +1300
Subject: [PATCH 0097/1036] #1283 - ENH: Support simplified test configuration
 (with docker setup typically via application-test.yml)

---
 pom.xml                                           |  3 +--
 src/main/java/io/ebean/config/AutoConfigure.java  | 15 +++++++++++++++
 src/main/java/io/ebean/config/ServerConfig.java   | 12 ++++++++++++
 .../ebean/config/properties/PropertiesLoader.java | 11 +++++++++++
 4 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/io/ebean/config/AutoConfigure.java

diff --git a/pom.xml b/pom.xml
index 7da7e58fa..e391767ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,13 +84,12 @@
     </dependency>
 
     <!--
-    If snakeyaml is in the classpath we will read yml configuration files
+    Exclude snakeyaml if you desire - it is not strictly required.
     -->
     <dependency>
       <groupId>org.yaml</groupId>
       <artifactId>snakeyaml</artifactId>
       <version>1.19</version>
-      <scope>provided</scope>
     </dependency>
 
     <!--
diff --git a/src/main/java/io/ebean/config/AutoConfigure.java b/src/main/java/io/ebean/config/AutoConfigure.java
new file mode 100644
index 000000000..5c0ef18af
--- /dev/null
+++ b/src/main/java/io/ebean/config/AutoConfigure.java
@@ -0,0 +1,15 @@
+package io.ebean.config;
+
+/**
+ * Used to provide some automatic configuration early in the creation of an EbeanServer.
+ */
+public interface AutoConfigure {
+
+  /**
+   * Provide some configuration the ServerConfig prior to server creation.
+   * <p>
+   * Return true if the autoConfiguration applies to this ServerConfig.
+   */
+  void configure(ServerConfig serverConfig);
+
+}
diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index b336029f8..d2819f42b 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -2606,10 +2606,22 @@ public class ServerConfig {
   public void loadFromProperties(Properties properties) {
     // keep the properties used for configuration so that these are available for plugins
     this.properties = properties;
+    autoConfiguration();
     PropertiesWrapper p = new PropertiesWrapper("ebean", name, properties);
     loadSettings(p);
   }
 
+  /**
+   * Use a 'plugin' to provide automatic configuration. Intended for automatic testing
+   * configuration with Docker containers via ebean-test-config.
+   */
+  private void autoConfiguration() {
+    Iterator<AutoConfigure> iterator = serviceLoad(AutoConfigure.class).iterator();
+    while (iterator.hasNext()) {
+      iterator.next().configure(this);
+    }
+  }
+
   /**
    * Deprecated - this does nothing now, we always try to read test configuration.
    * <p>
diff --git a/src/main/java/io/ebean/config/properties/PropertiesLoader.java b/src/main/java/io/ebean/config/properties/PropertiesLoader.java
index 77b059b5b..b62236de3 100644
--- a/src/main/java/io/ebean/config/properties/PropertiesLoader.java
+++ b/src/main/java/io/ebean/config/properties/PropertiesLoader.java
@@ -55,4 +55,15 @@ public class PropertiesLoader {
     return properties;
   }
 
+  /**
+   * Set (override) a configuration property.
+   *
+   * This is expected to be only called by test configuration logic
+   * (ala automatic test configuration via ebean-test-config).
+   */
+  public static synchronized void setProperty(String key, String value) {
+    load();
+    properties.setProperty(key, value);
+  }
+
 }

From 0d0a3422fce8ac1bafeac0ca5c9b4a04c988474e Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 28 Feb 2018 21:11:49 +1300
Subject: [PATCH 0098/1036] #1283 - ENH: Support simplified test configuration
 (with docker setup typically via application-test.yml)

Refactor tidy - no effective change on this commit.
---
 src/main/java/io/ebean/config/ServerConfig.java          | 5 ++---
 .../io/ebeaninternal/server/core/ClassPathScanners.java  | 9 ++-------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index d2819f42b..29ac1032d 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -2616,9 +2616,8 @@ public class ServerConfig {
    * configuration with Docker containers via ebean-test-config.
    */
   private void autoConfiguration() {
-    Iterator<AutoConfigure> iterator = serviceLoad(AutoConfigure.class).iterator();
-    while (iterator.hasNext()) {
-      iterator.next().configure(this);
+    for (AutoConfigure autoConfigure : serviceLoad(AutoConfigure.class)) {
+      autoConfigure.configure(this);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/core/ClassPathScanners.java b/src/main/java/io/ebeaninternal/server/core/ClassPathScanners.java
index 38222784a..9074eba55 100644
--- a/src/main/java/io/ebeaninternal/server/core/ClassPathScanners.java
+++ b/src/main/java/io/ebeaninternal/server/core/ClassPathScanners.java
@@ -6,7 +6,6 @@ import org.avaje.classpath.scanner.ClassPathScannerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.ServiceLoader;
 
 /**
  * Utility to finds and return the list of ClassPathScanner services.
@@ -19,13 +18,9 @@ public class ClassPathScanners {
   public static List<ClassPathScanner> find(ServerConfig serverConfig) {
 
     List<ClassPathScanner> scanners = new ArrayList<>();
-
-    ServiceLoader<ClassPathScannerFactory> scannerLoader = serverConfig.serviceLoad(ClassPathScannerFactory.class);
-    for (ClassPathScannerFactory factory : scannerLoader) {
-      ClassPathScanner scanner = factory.createScanner(serverConfig.getClassLoadConfig().getClassLoader());
-      scanners.add(scanner);
+    for (ClassPathScannerFactory factory : serverConfig.serviceLoad(ClassPathScannerFactory.class)) {
+      scanners.add(factory.createScanner(serverConfig.getClassLoadConfig().getClassLoader()));
     }
-
     return scanners;
   }
 }

From 6f2e1c024825b9fc7a168a3d5a3f5880c9f99141 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Mar 2018 12:55:22 +1300
Subject: [PATCH 0099/1036] #1295 - Multiple platform DbMigration generation
 with non-native boolean type (BIT, INTEGER etc) produces incorrect DDL for
 other DB Platform with native boolean

---
 .../config/dbplatform/DbPlatformType.java     | 36 +++++++++++--------
 .../dbplatform/DbPlatformTypeMapping.java     | 17 ++++++++-
 .../server/type/ScalarTypeBool.java           |  2 +-
 .../server/type/ScalarTypeBoolean.java        |  5 +++
 .../dbplatform/DbPlatformTypeMappingTest.java | 20 +++++++++++
 .../server/type/ScalarTypeBooleanTest.java    | 16 ++++++++-
 6 files changed, 78 insertions(+), 18 deletions(-)
 create mode 100644 src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java

diff --git a/src/main/java/io/ebean/config/dbplatform/DbPlatformType.java b/src/main/java/io/ebean/config/dbplatform/DbPlatformType.java
index 4a65853ff..13c0d1fcb 100644
--- a/src/main/java/io/ebean/config/dbplatform/DbPlatformType.java
+++ b/src/main/java/io/ebean/config/dbplatform/DbPlatformType.java
@@ -126,27 +126,33 @@ public class DbPlatformType implements ExtraDbTypes {
 
     StringBuilder sb = new StringBuilder();
     sb.append(name);
-
     if (canHaveLength || !strict) {
-      // see if there is a precision/scale to add (or not)
-      int len = deployLength != 0 ? deployLength : defaultLength;
-      if (len == Integer.MAX_VALUE) {
-        sb.append("(max)"); // TODO: this is sqlserver specific
-      } else if (len > 0) {
-        sb.append("(");
-        sb.append(len);
-        int scale = deployScale != 0 ? deployScale : defaultScale;
-        if (scale > 0) {
-          sb.append(",");
-          sb.append(scale);
-        }
-        sb.append(")");
-      }
+      renderLengthScale(deployLength, deployScale, sb);
     }
 
     return sb.toString();
   }
 
+  /**
+   * Render the length and scale part of the column definition.
+   */
+  protected void renderLengthScale(int deployLength, int deployScale, StringBuilder sb) {
+    // see if there is a precision/scale to add (or not)
+    int len = deployLength != 0 ? deployLength : defaultLength;
+    if (len == Integer.MAX_VALUE) {
+      sb.append("(max)"); // TODO: this is sqlserver specific
+    } else if (len > 0) {
+      sb.append("(");
+      sb.append(len);
+      int scale = deployScale != 0 ? deployScale : defaultScale;
+      if (scale > 0) {
+        sb.append(",");
+        sb.append(scale);
+      }
+      sb.append(")");
+    }
+  }
+
   /**
    * Create a copy of the type with a new default length.
    */
diff --git a/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java b/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java
index 6ad6f9e95..b26576247 100644
--- a/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java
+++ b/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java
@@ -10,8 +10,23 @@ import java.util.Map;
  */
 public class DbPlatformTypeMapping {
 
+  /**
+   * Boolean type used for logical model.
+   */
+  private static class BooleanLogicalType extends DbPlatformType {
+    BooleanLogicalType() {
+      super("boolean", false);
+    }
+    @Override
+    protected void renderLengthScale(int deployLength, int deployScale, StringBuilder sb) {
+      // do not have length - even if platform boolean type does like integer(1)
+    }
+  }
+
   private static DbPlatformTypeLookup lookup = new DbPlatformTypeLookup();
 
+  private static final DbPlatformType BOOLEAN_LOGICAL = new BooleanLogicalType();
+
   private static final DbPlatformType UUID_NATIVE = new DbPlatformType("uuid", false);
   @SuppressWarnings("unused")
   private static final DbPlatformType UUID_PLACEHOLDER = new DbPlatformType("uuidPlaceholder");
@@ -51,7 +66,7 @@ public class DbPlatformTypeMapping {
    */
   private void loadDefaults(boolean logicalTypes) {
 
-    put(DbType.BOOLEAN);
+    put(DbType.BOOLEAN, BOOLEAN_LOGICAL);
     put(DbType.BIT);
     put(DbType.INTEGER);
     put(DbType.BIGINT);
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBool.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBool.java
index a64663837..35a5a9346 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBool.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBool.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.type;
 /**
  * Boolean ScalarType's must implement to support DDL default values etc.
  */
-public interface ScalarTypeBool extends ScalarType<Boolean> {
+public interface ScalarTypeBool extends ScalarType<Boolean>, ScalarTypeLogicalType {
 
   /**
    * Return the DB literal value for FALSE.
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java
index b25df4beb..d6f411684 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java
@@ -302,6 +302,11 @@ public class ScalarTypeBoolean {
       super(Boolean.class, jdbcNative, jdbcType);
     }
 
+    @Override
+    public int getLogicalType() {
+      return Types.BOOLEAN;
+    }
+
     /**
      * Return the DB literal value for false.
      */
diff --git a/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java b/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java
new file mode 100644
index 000000000..0f1307446
--- /dev/null
+++ b/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java
@@ -0,0 +1,20 @@
+package io.ebean.config.dbplatform;
+
+import org.junit.Test;
+
+import java.sql.Types;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class DbPlatformTypeMappingTest {
+
+  @Test
+  public void logicalBoolean_renderType_expect_noLength() {
+
+    DbPlatformTypeMapping logicalMapping = DbPlatformTypeMapping.logicalTypes();
+
+    DbPlatformType type = logicalMapping.get(Types.BOOLEAN);
+    String colDefinition = type.renderType(1, 1, false);
+    assertThat(colDefinition).isEqualTo("boolean");
+  }
+}
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java
index 2347e913c..5c4c83ea5 100644
--- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java
@@ -6,7 +6,12 @@ import io.ebean.text.json.JsonContext;
 import org.tests.model.basic.TOne;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import java.sql.Types;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 public class ScalarTypeBooleanTest {
 
@@ -40,4 +45,13 @@ public class ScalarTypeBooleanTest {
     assertEquals(json, "{\"id\":42,\"active\":false}");
   }
 
+
+  @Test
+  public void IntBoolean_isLogicalBoolean() {
+
+    ScalarTypeBoolean.IntBoolean intBoolean = new ScalarTypeBoolean.IntBoolean(1, 0);
+    assertThat(intBoolean).isInstanceOf(ScalarTypeLogicalType.class);
+
+    assertThat(intBoolean.getLogicalType()).isEqualTo(Types.BOOLEAN);
+  }
 }

From 525afbc00f760ba568af4e23aa6b57f671c6ee0b Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Mar 2018 13:38:09 +1300
Subject: [PATCH 0100/1036] #1296 - where().exampleLike(bean) ... with 'empty
 bean' produces invalid SQL

---
 .../expression/DefaultExampleExpression.java  |  8 ++++----
 .../DefaultExampleExpressionTest.java         | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
index f1ac4243a..53653e416 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
@@ -6,13 +6,13 @@ import io.ebean.bean.EntityBean;
 import io.ebean.event.BeanQueryRequest;
 import io.ebean.util.SplitName;
 import io.ebeaninternal.api.ManyWhereJoins;
+import io.ebeaninternal.api.NaturalKeyQueryData;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.api.SpiExpressionValidation;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
-import io.ebeaninternal.api.NaturalKeyQueryData;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -201,9 +201,10 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
   @Override
   public void addSql(SpiExpressionRequest request) {
 
-    if (!list.isEmpty()) {
+    if (list.isEmpty()) {
+      request.append("1=1");
+    } else {
       request.append("(");
-
       for (int i = 0; i < list.size(); i++) {
         SpiExpression item = list.get(i);
         if (i > 0) {
@@ -211,7 +212,6 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
         }
         item.addSql(request);
       }
-
       request.append(") ");
     }
   }
diff --git a/src/test/java/io/ebeaninternal/server/expression/DefaultExampleExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/DefaultExampleExpressionTest.java
index 00ba20dc2..a593bfe01 100644
--- a/src/test/java/io/ebeaninternal/server/expression/DefaultExampleExpressionTest.java
+++ b/src/test/java/io/ebeaninternal/server/expression/DefaultExampleExpressionTest.java
@@ -91,6 +91,25 @@ public class DefaultExampleExpressionTest extends BaseExpressionTest {
 
   }
 
+  @Test
+  public void emptyExampleBean() {
+
+    ResetBasicData.reset();
+
+    Customer customer = new Customer();
+
+    Query<Customer> query = server().find(Customer.class)
+      .where()
+      .eq("status", Customer.Status.NEW)
+      .exampleLike(customer)
+      .startsWith("name", "Rob")
+      .query();
+
+    query.findList();
+
+    assertThat(sqlOf(query)).contains("and 1=1 and t0.name like");
+  }
+
   private <T> OrmQueryRequest<T> create(SpiQuery<T> query) {
     return new OrmQueryRequest<>(null, null, query, null);
   }

From d4e72eefa0f3e5e9a6e3a5bd523637d343e39415 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Mar 2018 13:43:14 +1300
Subject: [PATCH 0101/1036] [maven-release-plugin] prepare release
 ebean-11.12.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e391767ed..ad735503b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.12.1-SNAPSHOT</version>
+  <version>11.12.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.12.1</tag>
   </scm>
 
   <profiles>

From 9e2ddc9f8cd612910e935dbc209a295726b00454 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Mar 2018 13:43:27 +1300
Subject: [PATCH 0102/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ad735503b..7b445c63e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.12.1</version>
+  <version>11.12.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.12.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 11e180aa3ffffc33646e43e50f23284a60ca31f0 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Thu, 1 Mar 2018 21:10:21 +0100
Subject: [PATCH 0103/1036] FIX: introduced TransactionalTestCase, so that
 changes to DB are not persisted (#1298)

* FIX: introduced TransactionalTestCase, so that changes to DB are not persisted

* removed license header
---
 .../java/io/ebean/TransactionalTestCase.java  | 30 +++++++++++++
 .../tests/basic/TestDeleteByIdCollection.java |  5 ++-
 .../tests/basic/TestOrderByAnnotation.java    |  6 +--
 .../tests/basic/TestPersistenceContext.java   |  9 ++--
 .../org/tests/basic/TestWhereAnnotation.java  |  6 +--
 .../basic/delete/TestDeleteByIdList.java      |  2 +
 .../basic/delete/TestDeleteCascadeById.java   |  2 +
 .../tests/basic/join/TestSecondaryJoin.java   |  5 ++-
 .../one2one/TestOne2OneBookingInvoice.java    |  9 ++++
 .../tests/basic/type/TestInetAddressType.java |  5 ++-
 .../TestLazyLoadEmptyCollection.java          |  8 ++--
 .../tests/batchload/TestSecondaryQueries.java | 15 ++-----
 .../cascade/TestPrivateOwnedCascadeOrder.java |  6 ++-
 .../other/TestFindWhereUsingEnumerated.java   |  4 +-
 .../tests/query/other/TestLikeEscaping.java   | 40 ++++++++---------
 .../softdelete/TestSoftDeletePagingList.java  |  5 ++-
 .../tests/refresh/TestRefreshWithMany.java    |  6 +--
 .../tests/softdelete/TestSoftDeleteBasic.java | 44 +++++++++++--------
 .../text/json/TestTextJsonUpdateCascade.java  |  6 +--
 .../transaction/TestPersistContextClear.java  |  2 +-
 .../TestTransactionTryResources.java          | 11 ++++-
 .../org/tests/update/TestStatelessUpdate.java |  5 ++-
 22 files changed, 142 insertions(+), 89 deletions(-)
 create mode 100644 src/test/java/io/ebean/TransactionalTestCase.java

diff --git a/src/test/java/io/ebean/TransactionalTestCase.java b/src/test/java/io/ebean/TransactionalTestCase.java
new file mode 100644
index 000000000..64093c213
--- /dev/null
+++ b/src/test/java/io/ebean/TransactionalTestCase.java
@@ -0,0 +1,30 @@
+package io.ebean;
+
+import org.junit.After;
+import org.junit.Before;
+import org.tests.model.basic.ResetBasicData;
+
+/**
+ * Transactional test case. Every test is coverered by a transaction, which is roll backed.
+ * So no changes will persist to database.
+ *
+ * Use this test case if you modify data in your test case, so that the test does not interfere
+ * other tests.
+ *
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+public abstract class TransactionalTestCase extends BaseTestCase {
+
+  @Before
+  public void startTransaction() {
+    ResetBasicData.reset();
+    Ebean.beginTransaction();
+  }
+
+  @After
+  public void endTransaction() {
+    Ebean.rollbackTransaction();
+    Ebean.endTransaction();
+  }
+}
diff --git a/src/test/java/org/tests/basic/TestDeleteByIdCollection.java b/src/test/java/org/tests/basic/TestDeleteByIdCollection.java
index db14f8a62..d84b8caf4 100644
--- a/src/test/java/org/tests/basic/TestDeleteByIdCollection.java
+++ b/src/test/java/org/tests/basic/TestDeleteByIdCollection.java
@@ -1,7 +1,8 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.TransactionalTestCase;
+
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
@@ -11,7 +12,7 @@ import org.junit.Test;
 import java.util.ArrayList;
 import java.util.List;
 
-public class TestDeleteByIdCollection extends BaseTestCase {
+public class TestDeleteByIdCollection extends TransactionalTestCase {
 
   @Test
   public void test() {
diff --git a/src/test/java/org/tests/basic/TestOrderByAnnotation.java b/src/test/java/org/tests/basic/TestOrderByAnnotation.java
index db5623394..90ee62c0d 100644
--- a/src/test/java/org/tests/basic/TestOrderByAnnotation.java
+++ b/src/test/java/org/tests/basic/TestOrderByAnnotation.java
@@ -1,8 +1,9 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import io.ebean.TransactionalTestCase;
+
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
@@ -11,12 +12,11 @@ import org.junit.Test;
 
 import java.util.List;
 
-public class TestOrderByAnnotation extends BaseTestCase {
+public class TestOrderByAnnotation extends TransactionalTestCase {
 
   @Test
   public void testOrderBy() {
 
-    ResetBasicData.reset();
     Customer custTest = ResetBasicData.createCustAndOrder("testOrderByAnn");
 
     Customer customer = Ebean.find(Customer.class, custTest.getId());
diff --git a/src/test/java/org/tests/basic/TestPersistenceContext.java b/src/test/java/org/tests/basic/TestPersistenceContext.java
index e8e233a3d..2e786d5bb 100644
--- a/src/test/java/org/tests/basic/TestPersistenceContext.java
+++ b/src/test/java/org/tests/basic/TestPersistenceContext.java
@@ -52,14 +52,13 @@ public class TestPersistenceContext extends BaseTestCase {
     Assert.assertTrue(oAfter != oBefore);
     Assert.assertTrue(oAfter != order);
 
-
-    Order testOrder = ResetBasicData.createOrderCustAndOrder("testPC");
-    Integer id = testOrder.getCustomer().getId();
-    Integer orderId = testOrder.getId();
-
     // start a persistence context
     Ebean.beginTransaction();
     try {
+      Order testOrder = ResetBasicData.createOrderCustAndOrder("testPC");
+      Integer id = testOrder.getCustomer().getId();
+      Integer orderId = testOrder.getId();
+
       Customer customer = Ebean.find(Customer.class)
         .setUseCache(false)
         .setId(id)
diff --git a/src/test/java/org/tests/basic/TestWhereAnnotation.java b/src/test/java/org/tests/basic/TestWhereAnnotation.java
index 207eb5a1c..5d02dfcab 100644
--- a/src/test/java/org/tests/basic/TestWhereAnnotation.java
+++ b/src/test/java/org/tests/basic/TestWhereAnnotation.java
@@ -1,8 +1,9 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import io.ebean.TransactionalTestCase;
+
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
@@ -11,12 +12,11 @@ import org.junit.Test;
 
 import java.util.List;
 
-public class TestWhereAnnotation extends BaseTestCase {
+public class TestWhereAnnotation extends TransactionalTestCase {
 
   @Test
   public void testWhere() {
 
-    ResetBasicData.reset();
     Customer custTest = ResetBasicData.createCustAndOrder("testWhereAnn");
 
     Customer customer = Ebean.find(Customer.class, custTest.getId());
diff --git a/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java b/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java
index 4aec6a6d6..7cc33ffc8 100644
--- a/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java
+++ b/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java
@@ -33,6 +33,8 @@ public class TestDeleteByIdList extends BaseTestCase {
     Assert.assertEquals(2, orderIds.size());
 
     Ebean.deleteAll(Order.class, orderIds);
+    Ebean.delete(c0);
+    Ebean.delete(c1);
 
   }
 }
diff --git a/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java b/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java
index 8a5ab99b0..97511df79 100644
--- a/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java
+++ b/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java
@@ -32,7 +32,9 @@ public class TestDeleteCascadeById extends BaseTestCase {
     Order o = orders.get(0);
     Assert.assertNotNull(o);
 
+    // cleanup
     Ebean.delete(o);
+    Ebean.delete(cust);
 
   }
 }
diff --git a/src/test/java/org/tests/basic/join/TestSecondaryJoin.java b/src/test/java/org/tests/basic/join/TestSecondaryJoin.java
index d36dd554f..b218b6168 100644
--- a/src/test/java/org/tests/basic/join/TestSecondaryJoin.java
+++ b/src/test/java/org/tests/basic/join/TestSecondaryJoin.java
@@ -1,7 +1,8 @@
 package org.tests.basic.join;
 
-import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.TransactionalTestCase;
+
 import org.tests.model.basic.Order;
 import org.tests.model.basic.Order.Status;
 import org.tests.model.basic.ResetBasicData;
@@ -9,7 +10,7 @@ import org.junit.Test;
 
 import java.util.List;
 
-public class TestSecondaryJoin extends BaseTestCase {
+public class TestSecondaryJoin extends TransactionalTestCase {
 
   @Test
   public void test() {
diff --git a/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java b/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java
index d38f36435..ded00f249 100644
--- a/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java
+++ b/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java
@@ -2,6 +2,7 @@ package org.tests.basic.one2one;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -42,5 +43,13 @@ public class TestOne2OneBookingInvoice extends BaseTestCase {
     Assert.assertEquals(b1.getId(), b2.getId());
     Assert.assertSame(b1, b2);
 
+    // cleanup
+    ai.setBooking(null);
+    ci.setBooking(null);
+    Ebean.save(ai);
+    Ebean.save(ci);
+    Ebean.delete(b);
+
+
   }
 }
diff --git a/src/test/java/org/tests/basic/type/TestInetAddressType.java b/src/test/java/org/tests/basic/type/TestInetAddressType.java
index 679963693..dda0e0ae8 100644
--- a/src/test/java/org/tests/basic/type/TestInetAddressType.java
+++ b/src/test/java/org/tests/basic/type/TestInetAddressType.java
@@ -1,7 +1,8 @@
 package org.tests.basic.type;
 
-import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.TransactionalTestCase;
+
 import org.tests.model.basic.EWithInetAddr;
 import org.junit.Assert;
 import org.junit.Test;
@@ -9,7 +10,7 @@ import org.junit.Test;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
-public class TestInetAddressType extends BaseTestCase {
+public class TestInetAddressType extends TransactionalTestCase {
 
   @Test
   public void testIp4() throws UnknownHostException {
diff --git a/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java b/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java
index a11679e32..4a7989482 100644
--- a/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java
+++ b/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java
@@ -1,22 +1,20 @@
 package org.tests.batchload;
 
-import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.FetchConfig;
+import io.ebean.TransactionalTestCase;
+
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
-import org.tests.model.basic.ResetBasicData;
 import org.junit.Test;
 
 import java.util.List;
 
-public class TestLazyLoadEmptyCollection extends BaseTestCase {
+public class TestLazyLoadEmptyCollection extends TransactionalTestCase {
 
   @Test
   public void test() {
 
-    ResetBasicData.reset();
-
     Customer c = new Customer();
     c.setName("lazytest");
 
diff --git a/src/test/java/org/tests/batchload/TestSecondaryQueries.java b/src/test/java/org/tests/batchload/TestSecondaryQueries.java
index fbe1891df..de0e1ccce 100644
--- a/src/test/java/org/tests/batchload/TestSecondaryQueries.java
+++ b/src/test/java/org/tests/batchload/TestSecondaryQueries.java
@@ -1,9 +1,10 @@
 package org.tests.batchload;
 
-import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.FetchConfig;
 import io.ebean.Query;
+import io.ebean.TransactionalTestCase;
+
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
@@ -18,13 +19,11 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class TestSecondaryQueries extends BaseTestCase {
+public class TestSecondaryQueries extends TransactionalTestCase {
 
   @Test
   public void fetchQuery() {
 
-    ResetBasicData.reset();
-
     LoggedSqlCollector.start();
 
     Ebean.find(Order.class)
@@ -43,8 +42,6 @@ public class TestSecondaryQueries extends BaseTestCase {
   @Test
   public void fetchLazy() {
 
-    ResetBasicData.reset();
-
     LoggedSqlCollector.start();
 
     List<Order> orders = Ebean.find(Order.class)
@@ -79,8 +76,6 @@ public class TestSecondaryQueries extends BaseTestCase {
   @Test
   public void fetchIterate() {
 
-    ResetBasicData.reset();
-
     LoggedSqlCollector.start();
 
     Iterator<Order> orders = Ebean.find(Order.class)
@@ -104,8 +99,6 @@ public class TestSecondaryQueries extends BaseTestCase {
   @Test
   public void testSecQueryOneToMany() {
 
-    ResetBasicData.reset();
-
     Order testOrder = ResetBasicData.createOrderCustAndOrder("testSecQry10");
     Integer custId = testOrder.getCustomer().getId();
 
@@ -133,8 +126,6 @@ public class TestSecondaryQueries extends BaseTestCase {
   @Test
   public void testManyToOneWithManyPlusOneToMany() {
 
-    ResetBasicData.reset();
-
     Query<Order> query = Ebean.find(Order.class)
       .select("status")
       .fetch("customer", "name, status", new FetchConfig().query())
diff --git a/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java b/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java
index 2f66a8a3a..d3b81fa05 100644
--- a/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java
+++ b/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java
@@ -42,7 +42,7 @@ public class TestPrivateOwnedCascadeOrder extends BaseTestCase {
     // act
     TSMaster master1 = Ebean.find(master.getClass(), master.getId());
 
-    // Check Ebean deletes the existing c97 first as the unique values clash
+    // Check Ebean deletes the existing d96 first as the unique values clash
     Transaction transaction = Ebean.beginTransaction();
     try {
       master1.getDetails().clear();
@@ -53,5 +53,9 @@ public class TestPrivateOwnedCascadeOrder extends BaseTestCase {
     } finally {
       transaction.end();
     }
+
+    // Cleanup
+    Ebean.find(TSDetail.class).where().or().eq("name", "d97").eq("name", "d98").delete();
+    Ebean.delete(master1);
   }
 }
diff --git a/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java b/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java
index 1d04c8632..a90d1dc56 100644
--- a/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java
+++ b/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java
@@ -2,13 +2,15 @@ package org.tests.query.other;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.TransactionalTestCase;
+
 import org.tests.model.basic.MNonEnum;
 import org.tests.model.basic.MNonUpdPropEntity;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TestFindWhereUsingEnumerated extends BaseTestCase {
+public class TestFindWhereUsingEnumerated extends TransactionalTestCase {
 
   @Test
   public void test() {
diff --git a/src/test/java/org/tests/query/other/TestLikeEscaping.java b/src/test/java/org/tests/query/other/TestLikeEscaping.java
index 341348cca..2592ad098 100644
--- a/src/test/java/org/tests/query/other/TestLikeEscaping.java
+++ b/src/test/java/org/tests/query/other/TestLikeEscaping.java
@@ -1,33 +1,33 @@
 package org.tests.query.other;
 
-import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.TransactionalTestCase;
+
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TestLikeEscaping extends BaseTestCase {
+public class TestLikeEscaping extends TransactionalTestCase {
 
 
   @Test
   public void testLikeEscaping() {
-    ResetBasicData.reset();
     // Mysql, PgSql, H2 special chars: "_"  "%"
-    // MsSql special chars:  "_"  "%"  "[" AND different Quoting! 
+    // MsSql special chars:  "_"  "%"  "[" AND different Quoting!
     Ebean.save(ResetBasicData.createCustomer("Paul % Percentage", "*Star", "[none]", 0, null));
     Ebean.save(ResetBasicData.createCustomer("(none)", "More * Star", "[none]", 0, null));
-    
+
     Ebean.save(ResetBasicData.createCustomer("Paul %% Doublepercentage", "|Pipeway", "[other]", 1, null));
     Ebean.save(ResetBasicData.createCustomer("_Udo Underscore", "|Pipeway", "[other]", 1, null));
-    
+
     Ebean.save(ResetBasicData.createCustomer("Bodo \\ backslash", "\\BS", "[other]", 1, null));
-    
+
     assertThat(Ebean.find(Customer.class)
         .where().contains("name", "Paul %%").findCount()
     ).isEqualTo(1);
-    
+
     assertThat(Ebean.find(Customer.class)
         .where().contains("name", "o \\ b").findCount()
     ).isEqualTo(1);
@@ -35,7 +35,7 @@ public class TestLikeEscaping extends BaseTestCase {
     assertThat(Ebean.find(Customer.class)
         .where().contains("name", "o \\\\ b").findCount()
     ).isEqualTo(0);
-    
+
     assertThat(Ebean.find(Customer.class)
         .where().startsWith("name", "_").findCount()
     ).isEqualTo(1);
@@ -43,7 +43,7 @@ public class TestLikeEscaping extends BaseTestCase {
     assertThat(Ebean.find(Customer.class)
         .where().startsWith("name", "_u").findCount()
     ).isEqualTo(0);
-    
+
     assertThat(Ebean.find(Customer.class)
         .where().istartsWith("name", "_U").findCount()
     ).isEqualTo(1);
@@ -51,40 +51,40 @@ public class TestLikeEscaping extends BaseTestCase {
     assertThat(Ebean.find(Customer.class)
         .where().startsWith("shippingAddress.line1", "|p").findCount()
     ).isEqualTo(0);
-    
+
     assertThat(Ebean.find(Customer.class)
         .where().startsWith("shippingAddress.line1", "|P").findCount()
     ).isEqualTo(2);
-    
+
     assertThat(Ebean.find(Customer.class)
         .where().startsWith("shippingAddress.line1", "\\B").findCount()
     ).isEqualTo(1);
-   
+
     assertThat(Ebean.find(Customer.class)
         .where().endsWith("billingAddress.line1", "]").findCount()
     ).isEqualTo(5);
-    
+
     assertThat(Ebean.find(Customer.class)
         .where().endsWith("billingAddress.line1", "[none]").findCount()
     ).isEqualTo(2);
-    
+
     assertThat(Ebean.find(Customer.class)
         .where().startsWith("billingAddress.line1", "[none]").findCount()
     ).isEqualTo(2);
-    
+
     assertThat(Ebean.find(Customer.class)
         .where().contains("billingAddress.line1", "[none]").findCount()
     ).isEqualTo(2);
-    
-    
+
+
     assertThat(Ebean.find(Customer.class)
         .where().contains("shippingAddress.line1", "*").findCount()
     ).isEqualTo(2);
-    
+
     assertThat(Ebean.find(Customer.class)
         .where().startsWith("shippingAddress.line1", "*").findCount()
     ).isEqualTo(1);
-    
+
     assertThat(Ebean.find(Customer.class)
         .where().endsWith("shippingAddress.line1", "*").findCount()
     ).isEqualTo(0);
diff --git a/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java b/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java
index 765cb8b52..da591cab2 100644
--- a/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java
+++ b/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java
@@ -1,8 +1,9 @@
 package org.tests.query.softdelete;
 
-import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.PagedList;
+import io.ebean.TransactionalTestCase;
+
 import org.tests.model.onetoone.album.Cover;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
@@ -12,7 +13,7 @@ import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TestSoftDeletePagingList extends BaseTestCase {
+public class TestSoftDeletePagingList extends TransactionalTestCase {
 
   @Test
   public void test() {
diff --git a/src/test/java/org/tests/refresh/TestRefreshWithMany.java b/src/test/java/org/tests/refresh/TestRefreshWithMany.java
index 36943226e..91093663a 100644
--- a/src/test/java/org/tests/refresh/TestRefreshWithMany.java
+++ b/src/test/java/org/tests/refresh/TestRefreshWithMany.java
@@ -1,8 +1,9 @@
 package org.tests.refresh;
 
-import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.SqlRow;
+import io.ebean.TransactionalTestCase;
+
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
@@ -12,12 +13,11 @@ import java.util.List;
 
 import static org.junit.Assert.assertEquals;
 
-public class TestRefreshWithMany extends BaseTestCase {
+public class TestRefreshWithMany extends TransactionalTestCase {
 
   @Test
   public void test() {
 
-    ResetBasicData.reset();
 
     Customer customer = ResetBasicData.createCustomer("refresher", "22 refresh set", "23 fresh", 9);
 
diff --git a/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java b/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
index 3406295fa..d15698cda 100644
--- a/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
+++ b/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
@@ -5,6 +5,8 @@ import io.ebean.Ebean;
 import io.ebean.Query;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
+import io.ebean.Transaction;
+
 import org.tests.model.softdelete.EBasicSDChild;
 import org.tests.model.softdelete.EBasicSoftDelete;
 import org.ebeantest.LoggedSqlCollector;
@@ -63,6 +65,9 @@ public class TestSoftDeleteBasic extends BaseTestCase {
     List<EBasicSoftDelete> list = query.findList();
     assertThat(query.getGeneratedSql()).contains("deleted = ?");
     assertThat(list).hasSize(1);
+
+    // Cleanup created entity
+    query.delete();
   }
 
   @Test
@@ -236,29 +241,30 @@ public class TestSoftDeleteBasic extends BaseTestCase {
   @Test
   public void testFetchWithIncludeSoftDeletes() {
 
-    EBasicSoftDelete bean = new EBasicSoftDelete();
-    bean.setName("fetchWithInclude");
-    bean.addChild("child1", 91);
-    bean.addChild("child2", 92);
+    try (Transaction tyn = Ebean.beginTransaction()) {
+      EBasicSoftDelete bean = new EBasicSoftDelete();
+      bean.setName("fetchWithInclude");
+      bean.addChild("child1", 91);
+      bean.addChild("child2", 92);
 
-    Ebean.save(bean);
+      Ebean.save(bean);
 
-    EBasicSDChild child0 = bean.getChildren().get(0);
+      EBasicSDChild child0 = bean.getChildren().get(0);
 
-    EBasicSDChild upd = new EBasicSDChild();
-    upd.setId(child0.getId());
-    upd.setDeleted(true);
-    Ebean.update(upd);
+      EBasicSDChild upd = new EBasicSDChild();
+      upd.setId(child0.getId());
+      upd.setDeleted(true);
+      Ebean.update(upd);
 
-    Query<EBasicSoftDelete> query = Ebean.find(EBasicSoftDelete.class)
-      .fetch("children")
-      .setIncludeSoftDeletes()
-      .where().eq("name", "fetchWithInclude")
-      .query();
-
-    List<EBasicSoftDelete> top = query.findList();
-    assertThat(top).hasSize(1);
-    assertThat(top.get(0).getChildren()).hasSize(2);
+      Query<EBasicSoftDelete> query = Ebean.find(EBasicSoftDelete.class)
+        .fetch("children")
+        .setIncludeSoftDeletes()
+        .where().eq("name", "fetchWithInclude")
+        .query();
 
+      List<EBasicSoftDelete> top = query.findList();
+      assertThat(top).hasSize(1);
+      assertThat(top.get(0).getChildren()).hasSize(2);
+    }
   }
 }
diff --git a/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java b/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java
index ca1b5b9b4..ff79d7fac 100644
--- a/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java
+++ b/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java
@@ -1,8 +1,8 @@
 package org.tests.text.json;
 
-import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.EbeanServer;
+import io.ebean.TransactionalTestCase;
 import io.ebean.text.json.JsonContext;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.MRole;
@@ -18,13 +18,11 @@ import org.junit.Test;
 import java.io.IOException;
 import java.util.List;
 
-public class TestTextJsonUpdateCascade extends BaseTestCase {
+public class TestTextJsonUpdateCascade extends TransactionalTestCase {
 
   @Test
   public void test() throws IOException {
 
-    ResetBasicData.reset();
-
     Customer c0 = ResetBasicData.createCustAndOrder("Test Json");
 
     Customer c2 = Ebean.getReference(Customer.class, c0.getId());
diff --git a/src/test/java/org/tests/transaction/TestPersistContextClear.java b/src/test/java/org/tests/transaction/TestPersistContextClear.java
index 06f9f2517..21a39af21 100644
--- a/src/test/java/org/tests/transaction/TestPersistContextClear.java
+++ b/src/test/java/org/tests/transaction/TestPersistContextClear.java
@@ -21,11 +21,11 @@ public class TestPersistContextClear extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    ResetBasicData.createOrderCustAndOrder("testPc");
     Order order0 = null;
 
     Transaction t = Ebean.beginTransaction();
     try {
+      ResetBasicData.createOrderCustAndOrder("testPc");
       SpiTransaction spiTxn = (SpiTransaction) t;
       PersistenceContext pc = spiTxn.getPersistenceContext();
 
diff --git a/src/test/java/org/tests/transaction/TestTransactionTryResources.java b/src/test/java/org/tests/transaction/TestTransactionTryResources.java
index 2dce73451..a9978a237 100644
--- a/src/test/java/org/tests/transaction/TestTransactionTryResources.java
+++ b/src/test/java/org/tests/transaction/TestTransactionTryResources.java
@@ -34,15 +34,18 @@ public class TestTransactionTryResources extends BaseTestCase {
 
     Document document = Document.find.asDraft(doc.getId());
     assertThat(document).isNotNull();
+
+    // cleanup
+    Ebean.delete(document);
   }
 
   @Test
   @IgnorePlatform(Platform.ORACLE) // does not support uncommited reads
   public void tryWithResources_catch() {
-
+    Document doc = null;
     try (Transaction transaction = Ebean.beginTransaction()) {
 
-      Document doc = new Document();
+      doc = new Document();
       doc.setTitle("tryWithResources_catch");
       doc.setBody("tryWithResources_catch_1");
       doc.save();
@@ -69,6 +72,10 @@ public class TestTransactionTryResources extends BaseTestCase {
         .findList();
 
       assertThat(docs).hasSize(1);
+      assertThat(doc).isNotNull();
+      // Cleanup
+      Ebean.delete(Document.class, doc.getId());
+      Ebean.delete(Document.class, doc3.getId());
     }
   }
 }
diff --git a/src/test/java/org/tests/update/TestStatelessUpdate.java b/src/test/java/org/tests/update/TestStatelessUpdate.java
index 1362893a6..184248b88 100644
--- a/src/test/java/org/tests/update/TestStatelessUpdate.java
+++ b/src/test/java/org/tests/update/TestStatelessUpdate.java
@@ -1,8 +1,9 @@
 package org.tests.update;
 
-import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.EbeanServer;
+import io.ebean.TransactionalTestCase;
+
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.EBasic;
@@ -20,7 +21,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-public class TestStatelessUpdate extends BaseTestCase {
+public class TestStatelessUpdate extends TransactionalTestCase {
 
   private EbeanServer server = server();
 

From 021d57f4b2efacb16c7693985cfaa147dca954d7 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Thu, 1 Mar 2018 23:43:08 +0100
Subject: [PATCH 0104/1036] FIX: @Formula on @ManyToOne produces SQLException
 ... fix appends missing FROM clause for formula joins #1299

---
 .../server/query/SqlTreeNodeBean.java         |  5 ++-
 .../server/query/SqlTreeNodeExtraJoin.java    |  4 ++
 .../org/tests/family/TestInheritance.java     | 42 +++++++++++++++++++
 .../tests/model/family/GrandParentPerson.java | 16 ++++++-
 .../org/tests/model/family/ParentPerson.java  |  2 +-
 5 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
index 22a3be01d..3d16f8ff2 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
@@ -531,7 +531,10 @@ class SqlTreeNodeBean implements SqlTreeNode {
    */
   @Override
   public void appendFrom(DbSqlContext ctx, SqlJoinType joinType) {
-
+    if (nodeBeanProp != null && nodeBeanProp.isFormula()) {
+      // add joins for formula beans
+      nodeBeanProp.appendFrom(ctx, joinType);
+    }
     ctx.pushJoin(prefix);
     ctx.pushTableAlias(prefix);
 
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
index d6d642166..ba83d4ced 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
@@ -126,6 +126,10 @@ class SqlTreeNodeExtraJoin implements SqlTreeNode {
       joinType = SqlJoinType.OUTER;
     }
     if (!manyToMany) {
+      if (assocBeanProperty.isFormula()) {
+        // add joins for formula beans 
+        assocBeanProperty.appendFrom(ctx, joinType);
+      }
       joinType = assocBeanProperty.addJoin(joinType, prefix, ctx);
     }
 
diff --git a/src/test/java/org/tests/family/TestInheritance.java b/src/test/java/org/tests/family/TestInheritance.java
index 3246d2d0c..de4ea30d5 100644
--- a/src/test/java/org/tests/family/TestInheritance.java
+++ b/src/test/java/org/tests/family/TestInheritance.java
@@ -219,4 +219,46 @@ public class TestInheritance extends BaseTestCase {
     assertEquals("Munich", grandparent1.getAddress());
     assertEquals(1, grandparent1.getEffectiveBean().getId().intValue());
   }
+
+  @Test
+  public void testFindCount() {
+    EBasic basicA = new EBasic();
+    basicA.setName("FamilyName A");
+    basicA.setDescription("Description A");
+    server().save(basicA);
+
+    EBasic basicB = new EBasic();
+    basicB.setName("FamilyName B");
+    basicB.setDescription("Description B");
+    server().save(basicB);
+
+
+    GrandParentPerson gp1 = new GrandParentPerson();
+    gp1.setFamilyName("FamilyName A");
+    gp1.setName("Franz");
+    server().save(gp1);
+
+    gp1 = server().find(GrandParentPerson.class).where().eq("name", "Franz").findOne();
+    assertEquals("FamilyName A", gp1.getFamilyName());
+    assertEquals("Description A", gp1.getBasicSameName().getDescription());
+
+
+    gp1 = server().find(GrandParentPerson.class).where().eq("basicSameName.name", "FamilyName A").findOne();
+    assertEquals("FamilyName A", gp1.getFamilyName());
+    assertEquals("Description A", gp1.getBasicSameName().getDescription());
+
+
+    gp1 = server().find(GrandParentPerson.class).where().eq("basicSameName.description", "Description A").findOne();
+    assertEquals("FamilyName A", gp1.getFamilyName());
+    assertEquals("Description A", gp1.getBasicSameName().getDescription());
+
+    int count;
+    count = server().find(GrandParentPerson.class).where().eq("name", "Franz").findCount();
+    assertEquals(1, count);
+    count = server().find(GrandParentPerson.class).where().eq("basicSameName.name", "FamilyName A").findCount();
+    assertEquals(1, count);
+    count = server().find(GrandParentPerson.class).where().eq("basicSameName.description", "Description A").findCount();
+    assertEquals(1, count);
+
+  }
 }
diff --git a/src/test/java/org/tests/model/family/GrandParentPerson.java b/src/test/java/org/tests/model/family/GrandParentPerson.java
index 4246290b6..9ea2c97a2 100644
--- a/src/test/java/org/tests/model/family/GrandParentPerson.java
+++ b/src/test/java/org/tests/model/family/GrandParentPerson.java
@@ -5,6 +5,7 @@ import org.tests.model.basic.EBasic;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.OrderBy;
@@ -22,7 +23,7 @@ public class GrandParentPerson extends InheritablePerson {
   // This rather complex formulas should be built later by CustomAnnotationParser
   private static final String PARENT_PERSON_AGGREGATE_JOIN = "left join "
     + "(select i1.parent_identifier, count(*) as child_count, sum(i1.age) as child_age from parent_person i1 group by i1.parent_identifier) "
-    + "as f1 on f1.parent_identifier = ${ta}.identifier";
+    + "f1 on f1.parent_identifier = ${ta}.identifier";
 
   //@Count("children")
   @Formula(select = "coalesce(f1.child_count, 0)", join = PARENT_PERSON_AGGREGATE_JOIN)
@@ -37,6 +38,11 @@ public class GrandParentPerson extends InheritablePerson {
   private String address;
 
 
+  @ManyToOne(optional = true, fetch = FetchType.EAGER)
+  @Formula(select = "f3.id", join = "left join e_basic f3 on f3.name = ${ta}.family_name")
+  private EBasic basicSameName;
+  
+  
   // Demonstrate formula usage
   @Formula(select = "coalesce(${ta}.some_bean_id,1)")
   @ManyToOne
@@ -78,4 +84,12 @@ public class GrandParentPerson extends InheritablePerson {
   public EBasic getEffectiveBean() {
     return effectiveBean;
   }
+  
+  public EBasic getBasicSameName() {
+    return basicSameName;
+  }
+  
+  public void setBasicSameName(EBasic basicSameName) {
+    this.basicSameName = basicSameName;
+  }
 }
diff --git a/src/test/java/org/tests/model/family/ParentPerson.java b/src/test/java/org/tests/model/family/ParentPerson.java
index 97472ef7b..242721993 100644
--- a/src/test/java/org/tests/model/family/ParentPerson.java
+++ b/src/test/java/org/tests/model/family/ParentPerson.java
@@ -19,7 +19,7 @@ public class ParentPerson extends InheritablePerson {
   //This rather complex formulas should be built later by CustomAnnotationParser
   private static final String CHILD_PERSON_AGGREGATE_JOIN = "left join "
     + "(select i2.parent_identifier, count(*) as child_count, sum(i2.age) as child_age from child_person i2 group by i2.parent_identifier) "
-    + "as f2 on f2.parent_identifier = ${ta}.identifier";
+    + "f2 on f2.parent_identifier = ${ta}.identifier";
 
   private static final String GRAND_PARENT_PERSON_JOIN = "join grand_parent_person j1 on j1.identifier = ${ta}.parent_identifier";
 

From c1b022c1233039c978ccc5f52cee19656d016dd7 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Thu, 1 Mar 2018 23:46:41 +0100
Subject: [PATCH 0105/1036] NEW: FetchCountDistinct - query can return distinct
 values with their counts (#1300)

* NEW: FetchCountDistinct - query can return distinct values with their counts

* Have to disable asserts, because of #1298
---
 .../java/io/ebean/CountDistinctOrder.java     |  27 ++++
 src/main/java/io/ebean/CountedValue.java      |  33 ++++
 src/main/java/io/ebean/Query.java             |  10 ++
 .../java/io/ebeaninternal/api/SpiQuery.java   |   6 +
 .../server/query/CQueryBuilder.java           |  40 ++++-
 .../query/CQueryFetchSingleAttribute.java     |  12 +-
 .../server/query/SqlTreeBuilder.java          |   2 +-
 .../server/querydefn/DefaultOrmQuery.java     |  21 ++-
 .../server/querydefn/OrmQueryPlanKey.java     |   6 +-
 .../server/querydefn/OrmQueryPlanKeyTest.java | 146 +++++++++---------
 .../query/other/TestQuerySingleAttribute.java | 109 +++++++++++++
 11 files changed, 329 insertions(+), 83 deletions(-)
 create mode 100644 src/main/java/io/ebean/CountDistinctOrder.java
 create mode 100644 src/main/java/io/ebean/CountedValue.java

diff --git a/src/main/java/io/ebean/CountDistinctOrder.java b/src/main/java/io/ebean/CountDistinctOrder.java
new file mode 100644
index 000000000..e23ac4fd4
--- /dev/null
+++ b/src/main/java/io/ebean/CountDistinctOrder.java
@@ -0,0 +1,27 @@
+package io.ebean;
+/**
+ * Enumeration to use with {@link Query#setCountDistinct(CountDistinctOrder)}.
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+public enum CountDistinctOrder {
+  NO_ORDERING,
+  
+  /** order by attribute ascending */
+  ATTR_ASC, 
+  
+  /** order by attribute descending */
+  ATTR_DESC, 
+  
+  /** order by count ascending and attribute ascending */
+  COUNT_ASC_ATTR_ASC,
+  
+  /** order by count ascending and attribute descending */
+  COUNT_ASC_ATTR_DESC,
+  
+  /** order by count descending and attribute ascending */
+  COUNT_DESC_ATTR_ASC,
+  
+  /** order by count descending and attribute descending */
+  COUNT_DESC_ATTR_DESC,
+}
diff --git a/src/main/java/io/ebean/CountedValue.java b/src/main/java/io/ebean/CountedValue.java
new file mode 100644
index 000000000..3752f8e51
--- /dev/null
+++ b/src/main/java/io/ebean/CountedValue.java
@@ -0,0 +1,33 @@
+package io.ebean;
+
+import java.io.Serializable;
+/**
+ * Holds a distinct value with it's count.
+ * (Used with {@link Query#findSingleAttributeList()} and {@link Query#setCountDistinct(CountDistinctOrder)}.)
+ * @author Roland Praml, FOCONIS AG
+ */
+public class CountedValue<A> implements Serializable {
+  private static final long serialVersionUID = -2267971668356749695L;
+
+  private final A value;
+  private final long count;
+
+  public CountedValue(A value, long count) {
+    this.value = value;
+    this.count = count;
+  }
+
+  public long getCount() {
+    return count;
+  }
+  
+  public A getValue() {
+    return value;
+  }
+  
+  @Override
+  public String toString() {
+    return count + ": " + value;
+  }
+  
+}
diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index 6102926c3..b69e0c631 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -828,6 +828,11 @@ public interface Query<T> {
    */
   <A> A findSingleAttribute();
 
+  /**
+   * Return true if this is countDistinct query.
+   */
+  boolean isCountDistinct();
+
   /**
    * Execute the query returning either a single bean or null (if no matching
    * bean is found).
@@ -1272,6 +1277,11 @@ public interface Query<T> {
    */
   Query<T> setDistinct(boolean isDistinct);
 
+  /**
+   * Extended version for setDistinct in conjunction with "findSingleAttributeList";
+   */
+  Query<T> setCountDistinct(CountDistinctOrder orderBy);
+
   /**
    * Return the first row value.
    */
diff --git a/src/main/java/io/ebeaninternal/api/SpiQuery.java b/src/main/java/io/ebeaninternal/api/SpiQuery.java
index 1134d660f..065d3c9a5 100644
--- a/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.api;
 
 import io.ebean.CacheMode;
+import io.ebean.CountDistinctOrder;
 import io.ebean.ExpressionList;
 import io.ebean.OrderBy;
 import io.ebean.PersistenceContextScope;
@@ -822,4 +823,9 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
    * Simplify nested expression lists where possible.
    */
   void simplifyExpressions();
+
+  /**
+   * Returns the count distinct order setting.
+   */
+  CountDistinctOrder getCountDistinctOrder();
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 843828025..1d95f7517 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.query;
 
+import io.ebean.CountDistinctOrder;
 import io.ebean.Query;
 import io.ebean.RawSql;
 import io.ebean.RawSqlBuilder;
@@ -190,7 +191,7 @@ class CQueryBuilder {
     CQueryPlan queryPlan = request.getQueryPlan();
     if (queryPlan != null) {
       predicates.prepare(false);
-      return new CQueryFetchSingleAttribute(request, predicates, queryPlan);
+      return new CQueryFetchSingleAttribute(request, predicates, queryPlan, query.isCountDistinct());
     }
 
     // use RawSql or generated Sql
@@ -201,7 +202,7 @@ class CQueryBuilder {
 
     queryPlan = new CQueryPlan(request, s.getSql(), sqlTree, false, s.isIncludesRowNumberColumn(), predicates.getLogWhereSql());
     request.putQueryPlan(queryPlan);
-    return new CQueryFetchSingleAttribute(request, predicates, queryPlan);
+    return new CQueryFetchSingleAttribute(request, predicates, queryPlan, query.isCountDistinct());
   }
 
   /**
@@ -549,8 +550,13 @@ class CQueryBuilder {
           }
         }
       }
-
-      sb.append(select.getSelectSql());
+      if (query.isCountDistinct() && query.isSingleAttribute()) {
+        sb.append("r1.attribute_, count(*) from (select ");
+        sb.append(select.getSelectSql());
+        sb.append(" as attribute_");
+      } else {
+        sb.append(select.getSelectSql());
+      }
       if (query.isDistinctQuery() && dbOrderBy != null && !query.isSingleAttribute()) {
         // add the orderBy columns to the select clause (due to distinct)
         sb.append(", ").append(DbOrderByTrim.trim(dbOrderBy));
@@ -642,10 +648,15 @@ class CQueryBuilder {
       sb.append(" having ").append(dbHaving);
     }
 
-    if (dbOrderBy != null) {
+    if (dbOrderBy != null && !query.isCountDistinct()) {
       sb.append(" order by ").append(dbOrderBy);
     }
 
+    if (query.isCountDistinct() && query.isSingleAttribute()) {
+      sb.append(") r1 group by r1.attribute_");
+      sb.append(toSql(query.getCountDistinctOrder()));
+    }
+
     if (useSqlLimiter) {
       // use LIMIT/OFFSET, ROW_NUMBER() or rownum type SQL query limitation
       SqlLimitRequest r = new OrmQueryLimitRequest(sb.toString(), dbOrderBy, query, dbPlatform);
@@ -657,6 +668,25 @@ class CQueryBuilder {
 
   }
 
+  private String toSql(CountDistinctOrder orderBy) {
+    switch(orderBy) {
+    case ATTR_ASC:
+      return " order by r1.attribute_";
+    case ATTR_DESC:
+      return " order by r1.attribute_ desc";
+    case COUNT_ASC_ATTR_ASC:
+      return " order by count(*), r1.attribute_";
+    case COUNT_ASC_ATTR_DESC:
+      return " order by count(*), r1.attribute_ desc";
+    case COUNT_DESC_ATTR_ASC:
+      return " order by count(*) desc, r1.attribute_";
+    case COUNT_DESC_ATTR_DESC:
+      return " order by count(*) desc, r1.attribute_ desc";
+    default:
+      throw new IllegalArgumentException("Illegal enum: "+ orderBy);
+    }
+  }
+  
   /**
    * Append where or and based on the hasWhere flag.
    */
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java b/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
index 8ea69624c..b5d2d05b1 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.query;
 
 import io.ebean.util.JdbcClose;
+import io.ebean.CountedValue;
 import io.ebeaninternal.api.SpiProfileTransactionEvent;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.SpiTransaction;
@@ -60,18 +61,21 @@ class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent {
 
   private final ScalarType<?> scalarType;
 
+  private final boolean containsCounts;
+
   private long profileOffset;
 
   /**
    * Create the Sql select based on the request.
    */
-  CQueryFetchSingleAttribute(OrmQueryRequest<?> request, CQueryPredicates predicates, CQueryPlan queryPlan) {
+  CQueryFetchSingleAttribute(OrmQueryRequest<?> request, CQueryPredicates predicates, CQueryPlan queryPlan, boolean containsCounts) {
     this.request = request;
     this.queryPlan = queryPlan;
     this.query = request.getQuery();
     this.sql = queryPlan.getSql();
     this.desc = request.getBeanDescriptor();
     this.predicates = predicates;
+    this.containsCounts = containsCounts;
     this.scalarType = queryPlan.getSingleAttributeScalarType();
     query.setGeneratedSql(sql);
   }
@@ -101,7 +105,11 @@ class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent {
 
       List<Object> result = new ArrayList<>();
       while (dataReader.next()) {
-        result.add(scalarType.read(dataReader));
+        Object value = scalarType.read(dataReader);
+        if (containsCounts) {
+          value = new CountedValue<>(value, dataReader.getLong());
+        }
+        result.add(value);
         dataReader.resetColumnPosition();
         rowCount++;
       }
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index d5ea84855..5a26fcc5d 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -110,7 +110,7 @@ public final class SqlTreeBuilder {
     this.query = request.getQuery();
     this.temporalMode = SpiQuery.TemporalMode.of(query);
     this.disableLazyLoad = query.isDisableLazyLoading();
-    this.subQuery = Type.SUBQUERY == query.getType() || Type.ID_LIST == query.getType();
+    this.subQuery = Type.SUBQUERY == query.getType() || Type.ID_LIST == query.getType() || Type.DELETE == query.getType() || query.isCountDistinct();
     this.includeJoin = query.getM2mIncludeJoin();
     this.manyWhereJoins = query.getManyWhereJoins();
     this.queryDetail = query.getDetail();
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index ded44b52e..a66619796 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.querydefn;
 
 import io.ebean.CacheMode;
+import io.ebean.CountDistinctOrder;
 import io.ebean.Expression;
 import io.ebean.ExpressionFactory;
 import io.ebean.ExpressionList;
@@ -217,6 +218,8 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   private boolean singleAttribute;
 
+  private CountDistinctOrder countDistinctOrder;
+
   /**
    * Set to true if this query has been tuned by autoTune.
    */
@@ -655,6 +658,11 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return singleAttribute;
   }
 
+  @Override
+  public CountDistinctOrder getCountDistinctOrder() {
+    return countDistinctOrder;
+  }
+
   /**
    * Return true if the Id should be included in the query.
    */
@@ -1021,7 +1029,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
       queryPlanKey = new OrmQueryPlanKey(beanDescriptor.getDiscValue(), m2mIncludeJoin, type, detail, maxRows, firstRow,
         disableLazyLoading, orderBy,
         distinct, sqlDistinct, mapKey, id, bindParams, whereExpressions, havingExpressions,
-        temporalMode, forUpdate, rootTableAlias, rawSql, updateProperties);
+        temporalMode, forUpdate, rootTableAlias, rawSql, updateProperties, countDistinctOrder);
     }
     return queryPlanKey;
   }
@@ -1484,6 +1492,17 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return this;
   }
 
+  @Override
+  public DefaultOrmQuery<T> setCountDistinct(CountDistinctOrder countDistinctOrder) {
+    this.countDistinctOrder = countDistinctOrder;
+    return this;
+  }
+
+  @Override
+  public boolean isCountDistinct() {
+    return countDistinctOrder != null;
+  }
+
   /**
    * Return true if this query uses SQL DISTINCT either explicitly by the user or internally defined
    * by ebean.
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
index f8abd66b3..eb7ca79c1 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.querydefn;
 
+import io.ebean.CountDistinctOrder;
 import io.ebean.OrderBy;
 import io.ebean.Query;
 import io.ebeaninternal.api.BindParams;
@@ -23,7 +24,7 @@ class OrmQueryPlanKey implements CQueryPlanKey {
   OrmQueryPlanKey(String discValue, TableJoin m2mIncludeTable, SpiQuery.Type type, OrmQueryDetail detail, int maxRows, int firstRow, boolean disableLazyLoading,
                   OrderBy<?> orderBy, boolean distinct, boolean sqlDistinct, String mapKey, Object id, BindParams bindParams,
                   SpiExpression whereExpressions, SpiExpression havingExpressions, SpiQuery.TemporalMode temporalMode,
-                  Query.ForUpdate forUpdate, String rootTableAlias, SpiRawSql rawSql, OrmUpdateProperties updateProperties) {
+                  Query.ForUpdate forUpdate, String rootTableAlias, SpiRawSql rawSql, OrmUpdateProperties updateProperties, CountDistinctOrder countDistinctOrder) {
 
     StringBuilder sb = new StringBuilder(300);
     if (type != null) {
@@ -62,6 +63,9 @@ class OrmQueryPlanKey implements CQueryPlanKey {
     if (mapKey != null) {
       sb.append(",mapKey:").append(mapKey);
     }
+    if (countDistinctOrder != null) {
+      sb.append(",countdistinctoder:").append(countDistinctOrder.name());
+    }
     this.maxRows = maxRows;
     this.firstRow = firstRow;
     this.rawSqlKey = (rawSql == null) ? null : rawSql.getKey();
diff --git a/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java b/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java
index c204076c7..1ab27c6d0 100644
--- a/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java
+++ b/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java
@@ -21,8 +21,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
   @Test
   public void equals_when_defaults() {
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
 
     assertSame(key1, key2);
   }
@@ -30,9 +30,9 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
   @Test
   public void equals_when_diffDiscValue() {
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey("A", null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key3 = new OrmQueryPlanKey("B", null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey("A", null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key3 = new OrmQueryPlanKey("B", null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
     assertDifferent(key2, key3);
   }
@@ -42,8 +42,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
 
     TableJoin tableJoin = tableJoin("table", "id", "customer_id");
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, tableJoin, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, tableJoin, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
 
     assertDifferent(key1, key2);
   }
@@ -54,8 +54,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
     TableJoin tableJoin1 = tableJoin("one", "id", "customer_id");
     TableJoin tableJoin2 = tableJoin("two", "id", "customer_id");
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, tableJoin1, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, tableJoin2, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, tableJoin1, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, tableJoin2, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
 
     assertDifferent(key1, key2);
   }
@@ -66,8 +66,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
     TableJoin tableJoin1 = tableJoin("one", "id", "customer_id");
     TableJoin tableJoin2 = tableJoin("one", "id", "customer_id");
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, tableJoin1, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, tableJoin2, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, tableJoin1, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, tableJoin2, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
 
     assertSame(key1, key2);
   }
@@ -82,8 +82,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
   @Test
   public void equals_when_diffQueryType() {
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.LIST, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.LIST, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
 
     assertDifferent(key1, key2);
   }
@@ -91,8 +91,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
   @Test
   public void equals_when_firstRowsDifferent() {
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 10, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 10, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
 
     assertDifferent(key1, key2);
   }
@@ -100,8 +100,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
   @Test
   public void equals_when_maxRowsDifferent() {
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 10, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 10, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
 
     assertDifferent(key1, key2);
   }
@@ -109,8 +109,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
   @Test
   public void equals_when_firstRowsMaxRowsSame() {
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 10, 20, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 10, 20, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 10, 20, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 10, 20, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
 
     assertSame(key1, key2);
   }
@@ -118,8 +118,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
   @Test
   public void equals_when_diffDisableLazyLoading() {
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, true, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, true, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
 
     assertDifferent(key1, key2);
   }
@@ -128,8 +128,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
   public void equals_when_diffOrderByNull() {
 
     OrderBy<Object> o1 = new OrderBy<>("id");
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, o1, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, o1, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
 
     assertDifferent(key1, key2);
   }
@@ -139,121 +139,121 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
 
     OrderBy<Object> o1 = new OrderBy<>("id, name");
     OrderBy<Object> o2 = new OrderBy<>("id, name");
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, o1, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, o2, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, o1, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, o2, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
 
     assertSame(key1, key2);
   }
 
   @Test
   public void equals_when_diffDistinct() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, true, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, true, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_sameDistinct() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, true, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, true, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, true, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, true, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertSame(key1, key2);
   }
 
   @Test
   public void equals_when_diffSqlDistinct() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, true, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, true, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_sameSqlDistinct() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, true, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, true, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, true, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, true, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertSame(key1, key2);
   }
 
   @Test
   public void equals_when_diffMapKeyNull() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, "mapKey", null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, "mapKey", null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_diffMapKey() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, "mapKey", null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, "diff", null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, "mapKey", null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, "diff", null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_sameMapKey() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, "mapKey", null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, "mapKey", null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, "mapKey", null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, "mapKey", null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertSame(key1, key2);
   }
 
   @Test
   public void equals_when_diffIdNull() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, 42, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, 42, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_idBothGiven() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, 42, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, 23, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, 42, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, 23, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertSame(key1, key2);
   }
 
   @Test
   public void equals_when_diffTemporalMode() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.DRAFT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.DRAFT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_diffForUpdate() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, Query.ForUpdate.BASE, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, Query.ForUpdate.BASE, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_diffForUpdate_NoWait() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, Query.ForUpdate.BASE, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, Query.ForUpdate.NOWAIT, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, Query.ForUpdate.BASE, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, Query.ForUpdate.NOWAIT, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_diffForUpdate_SkipLocked() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, Query.ForUpdate.BASE, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, Query.ForUpdate.SKIPLOCKED, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, Query.ForUpdate.BASE, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, Query.ForUpdate.SKIPLOCKED, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_diffRootAliasNull() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, "rootAlias", null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, "rootAlias", null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_diffRootAlias() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, "rootAlias", null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, "diff", null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, "rootAlias", null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, "diff", null, null, null);
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_sameRootAlias() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, "rootAlias", null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, "rootAlias", null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, "rootAlias", null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, "rootAlias", null, null, null);
     assertSame(key1, key2);
   }
 
@@ -280,8 +280,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
     SpiExpressionList<Customer> list1 = list_id_eq_42();
     SpiExpressionList<Customer> list2 = list_id_eq_43();
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, list1, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, list2, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, list1, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, list2, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertSame(key1, key2);
   }
 
@@ -292,8 +292,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
     SpiExpressionList<Customer> where1 = list_id_eq_42();
     SpiExpressionList<Customer> where2 = list_id_eq_42_and_name_eq_rob();
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, where1, null, SpiQuery.TemporalMode.DRAFT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, where2, null, SpiQuery.TemporalMode.DRAFT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, where1, null, SpiQuery.TemporalMode.DRAFT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, where2, null, SpiQuery.TemporalMode.DRAFT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
@@ -302,8 +302,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
 
     SpiExpressionList<Customer> list1 = list_id_eq_42();
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, list1, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, list1, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
@@ -312,8 +312,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
 
     SpiExpressionList<Customer> list1 = list_id_eq_42();
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, list1, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, list1, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
@@ -323,8 +323,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
     SpiExpression having1 = list_id_eq_42().copyForPlanKey();
     SpiExpression having2 = list_id_eq_42_and_name_eq_rob().copyForPlanKey();
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, having1, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, having2, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, having1, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, having2, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
@@ -334,8 +334,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
     SpiExpression having1 = list_id_eq_42().copyForPlanKey();
     SpiExpression having2 = list_id_eq_42().copyForPlanKey();
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, having1, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, having2, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, having1, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, having2, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertSame(key1, key2);
   }
 
@@ -344,8 +344,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
 
     SpiExpression having1 = list_id_eq_42().copyForPlanKey();
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, having1, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, having1, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
@@ -354,8 +354,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
 
     SpiExpression having1 = list_id_eq_42().copyForPlanKey();
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, having1, SpiQuery.TemporalMode.CURRENT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, having1, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
diff --git a/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
index 27305412c..101c0326f 100644
--- a/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
+++ b/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
@@ -1,6 +1,8 @@
 package org.tests.query.other;
 
 import io.ebean.BaseTestCase;
+import io.ebean.CountDistinctOrder;
+import io.ebean.CountedValue;
 import io.ebean.Ebean;
 import io.ebean.Query;
 import org.junit.Ignore;
@@ -438,4 +440,111 @@ public class TestQuerySingleAttribute extends BaseTestCase {
         + "order by t1.billing_address_id desc");
 
   }
+  @Test
+  public void distinctWithCascadedFetchCount() {
+
+    ResetBasicData.reset();
+
+
+    int count = Ebean.find(Contact.class).findCount();
+    assertThat(count).isGreaterThanOrEqualTo(12);
+
+    Query<Contact> query = Ebean.find(Contact.class)
+        .select("firstName");
+
+    List<CountedValue<Object>> list1 = query
+        .setCountDistinct(CountDistinctOrder.ATTR_ASC)
+
+        .findSingleAttributeList();
+    assertThat(sqlOf(query)).contains("select r1.attribute_, count(*) from ("
+        + "select t0.first_name as attribute_ from contact t0"
+        + ") r1 group by r1.attribute_ order by r1.attribute_");
+    assertThat(list1.get(0)).isInstanceOf(CountedValue.class);
+    // FIXME: These asserts will fail, because other tests will interfere. see #1298
+    //assertThat(list1.toString()).isEqualTo("[3: Bugs1, 1: Fiona, 3: Fred1, 1: Jack, 3: Jim1, 1: Tracy]");
+
+
+    query = Ebean.find(Contact.class).select("firstName");
+    list1 = query
+        .setCountDistinct(CountDistinctOrder.ATTR_DESC)
+        .findSingleAttributeList();
+    assertThat(list1.get(0)).isInstanceOf(CountedValue.class);
+    //assertThat(list1.toString()).isEqualTo("[1: Tracy, 3: Jim1, 1: Jack, 3: Fred1, 1: Fiona, 3: Bugs1]");
+
+    query = Ebean.find(Contact.class).select("firstName");
+    list1 = query
+        .setCountDistinct(CountDistinctOrder.COUNT_ASC_ATTR_DESC)
+        .findSingleAttributeList();
+    assertThat(list1.get(0)).isInstanceOf(CountedValue.class);
+    //assertThat(list1.toString()).isEqualTo("[1: Tracy, 1: Jack, 1: Fiona, 3: Jim1, 3: Fred1, 3: Bugs1]");
+
+    query = Ebean.find(Contact.class).fetch("customer.shippingAddress","line1");//("firstName")
+    List<CountedValue<Object>> list2 = query
+        .setCountDistinct(CountDistinctOrder.ATTR_ASC)
+        .findSingleAttributeList();
+    assertThat(sqlOf(query)).contains("select r1.attribute_, count(*) from ("
+        + "select t2.line_1 as attribute_ "
+        + "from contact t0 join o_customer t1 on t1.id = t0.customer_id  "
+        + "left join o_address t2 on t2.id = t1.shipping_address_id "
+        + ") r1 group by r1.attribute_ order by r1.attribute_");
+    assertThat(list2.get(0)).isInstanceOf(CountedValue.class);
+    //assertThat(list2.toString()).isEqualTo("[1: null, 3: 1 Banana St, 5: 12 Apple St, 3: 15 Kumera Way]");
+
+
+    query = Ebean.find(Contact.class).select("firstName")
+        .where().eq("customer.shippingAddress.line1", "12 Apple St").query();
+    List<CountedValue<Object>> list3 = query
+        .setCountDistinct(CountDistinctOrder.ATTR_ASC)
+        .findSingleAttributeList();
+    assertThat(sqlOf(query)).contains("select r1.attribute_, count(*) from ("
+        + "select t0.first_name as attribute_ from contact t0 "
+        + "join o_customer t1 on t1.id = t0.customer_id  "
+        + "left join o_address t2 on t2.id = t1.shipping_address_id  where t2.line_1 = ? "
+        + ") r1 group by r1.attribute_ order by r1.attribute_");
+    assertThat(list3.get(0)).isInstanceOf(CountedValue.class);
+    //assertThat(list3.toString()).isEqualTo("[1: Bugs1, 1: Fiona, 1: Fred1, 1: Jim1, 1: Tracy]");
+
+
+    query = Ebean.find(Contact.class).fetch("customer.billingAddress","line1")
+        .where().or()
+          .ne("customer.shippingAddress.line1", "12 Apple St")
+          .isNull("customer.shippingAddress.line1")
+         .endOr().query();
+    List<CountedValue<Object>> list4 = query
+        .setCountDistinct(CountDistinctOrder.ATTR_ASC)
+        .findSingleAttributeList();
+    assertThat(sqlOf(query)).contains("select r1.attribute_, count(*) from ("
+        + "select t2.line_1 as attribute_ "
+        + "from contact t0 join o_customer t1 on t1.id = t0.customer_id  "
+        + "left join o_address t2 on t2.id = t1.billing_address_id  "
+        + "left join o_address t3 on t3.id = t1.shipping_address_id  "
+        + "where (t3.line_1 <> ?  or t3.line_1 is null ) "
+        + ") r1 group by r1.attribute_ order by r1.attribute_");
+    assertThat(list4.get(0)).isInstanceOf(CountedValue.class);
+    //assertThat(list4.toString()).isEqualTo("[1: null, 3: Bos town, 3: P.O.Box 1234]");
+
+
+    // Test Limiter for MSSQL
+    query = Ebean.find(Contact.class).fetch("customer.billingAddress","line1").setFirstRow(1).setMaxRows(2);
+    List<CountedValue<Object>> list5 = query
+        .where().isNotNull("customer.billingAddress.line1").query()
+        .setCountDistinct(CountDistinctOrder.ATTR_DESC)
+        .findSingleAttributeList();
+    assertThat(sqlOf(query)).contains("select r1.attribute_, count(*) from ("
+        + "select t2.line_1 as attribute_ from contact t0 "
+        + "join o_customer t1 on t1.id = t0.customer_id  "
+        + "left join o_address t2 on t2.id = t1.billing_address_id  "
+        + "where t2.line_1 is not null "
+        + ") r1 group by r1.attribute_ order by r1.attribute_ desc ");
+    if (isSqlServer()) {
+    	assertThat(sqlOf(query)).endsWith(" fetch next 2 rows only");
+    } else if (isDb2()) {
+      assertThat(query.getGeneratedSql()).endsWith("FETCH FIRST 2 ROWS ONLY");
+    } else {
+    	assertThat(sqlOf(query)).endsWith(" limit 2 offset 1");
+    }
+    assertThat(list5.get(0)).isInstanceOf(CountedValue.class);
+    //assertThat(list5.toString()).isEqualTo("[3: P.O.Box 1234, 3: Bos town]");
+  }
+
 }

From 0c368ed7b381e4a6f0c62e3b43a05ac50ecd548b Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Thu, 1 Mar 2018 23:48:35 +0100
Subject: [PATCH 0106/1036] FIX: extra-ddl can contribute to "drop-all" script,
 otherwise the drop all script is not appyable to h2:file (#1301)

---
 .../ebeaninternal/dbmigration/DdlGenerator.java  | 10 +++++++++-
 .../dbmigration/DefaultDbMigration.java          |  3 ++-
 .../ebeaninternal/extraddl/model/DdlScript.java  | 16 ++++++++++++++++
 .../extraddl/model/ExtraDdlXmlReader.java        |  5 +++--
 .../extraddl/model/ExtraDdlXmlReaderTest.java    |  6 +++---
 src/test/resources/extra-ddl.xml                 |  3 +++
 6 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
index e6ed35533..2a54e6f9a 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
@@ -127,6 +127,14 @@ public class DdlGenerator {
 
   protected void runDropSql() throws IOException {
     if (!createOnly) {
+      String ignoreExtraDdl = System.getProperty("ebean.ignoreExtraDdl");
+      if (!"true".equalsIgnoreCase(ignoreExtraDdl) && jaxbPresent) {
+        String extraApply = ExtraDdlXmlReader.buildExtra(server.getDatabasePlatform().getName(), true);
+        if (extraApply != null) {
+          runScript(false, extraApply, "extra-dll");
+        }
+      }
+
       if (dropAllContent == null) {
         dropAllContent = readFile(getDropFileName());
       }
@@ -142,7 +150,7 @@ public class DdlGenerator {
 
     String ignoreExtraDdl = System.getProperty("ebean.ignoreExtraDdl");
     if (!"true".equalsIgnoreCase(ignoreExtraDdl) && jaxbPresent) {
-      String extraApply = ExtraDdlXmlReader.buildExtra(server.getDatabasePlatform().getName());
+      String extraApply = ExtraDdlXmlReader.buildExtra(server.getDatabasePlatform().getName(), false);
       if (extraApply != null) {
         runScript(false, extraApply, "extra-dll");
       }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index 9bf36c631..900e049f3 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -268,7 +268,8 @@ public class DefaultDbMigration implements DbMigration {
       if (extraDdl != null) {
         List<DdlScript> ddlScript = extraDdl.getDdlScript();
         for (DdlScript script : ddlScript) {
-          if (ExtraDdlXmlReader.matchPlatform(dbPlatform.getName(), script.getPlatforms())) {
+          if (script.isDrop() == false
+              && ExtraDdlXmlReader.matchPlatform(dbPlatform.getName(), script.getPlatforms())) {
             writeExtraDdl(migrationDir, script);
           }
         }
diff --git a/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java b/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java
index c5bd66989..3b0c945ec 100644
--- a/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java
+++ b/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java
@@ -37,6 +37,8 @@ public class DdlScript {
   protected String name;
   @XmlAttribute(name = "platforms")
   protected String platforms;
+  @XmlAttribute(name = "drop")
+  protected boolean drop;
 
   /**
    * Gets the value of the value property.
@@ -98,4 +100,18 @@ public class DdlScript {
     this.platforms = value;
   }
 
+  /**
+   * Return if this a drop script.
+   */
+  public boolean isDrop() {
+    return drop;
+  }
+
+  /**
+   * Sets that this is a drop script.
+   */
+  public void setDrop(boolean drop) {
+    this.drop = drop;
+  }
+
 }
diff --git a/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java b/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
index 1d3fdd723..b9c7e8392 100644
--- a/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
+++ b/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
@@ -20,7 +20,7 @@ public class ExtraDdlXmlReader {
   /**
    * Return the combined extra DDL that should be run given the platform name.
    */
-  public static String buildExtra(String platformName) {
+  public static String buildExtra(String platformName, boolean drops) {
 
     ExtraDdl read = ExtraDdlXmlReader.read("/extra-ddl.xml");
     if (read == null) {
@@ -28,7 +28,8 @@ public class ExtraDdlXmlReader {
     }
     StringBuilder sb = new StringBuilder(300);
     for (DdlScript script : read.getDdlScript()) {
-      if (matchPlatform(platformName, script.getPlatforms())) {
+      if (script.isDrop() == drops
+          && matchPlatform(platformName, script.getPlatforms())) {
         logger.debug("include script {}", script.getName());
         String value = script.getValue();
         sb.append(value);
diff --git a/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java b/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java
index b6e71e8e5..440e889c0 100644
--- a/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java
+++ b/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java
@@ -17,7 +17,7 @@ public class ExtraDdlXmlReaderTest {
   @Test
   public void buildExtra_when_h2() {
 
-    String ddl = ExtraDdlXmlReader.buildExtra("h2");
+    String ddl = ExtraDdlXmlReader.buildExtra("h2", false);
 
     assertThat(ddl).contains("create or replace view order_agg_vw");
     assertThat(ddl).contains("-- h2 and postgres script");
@@ -27,7 +27,7 @@ public class ExtraDdlXmlReaderTest {
   @Test
   public void buildExtra_when_oracle() {
 
-    String ddl = ExtraDdlXmlReader.buildExtra("oracle");
+    String ddl = ExtraDdlXmlReader.buildExtra("oracle", false);
 
     assertThat(ddl).contains("create or replace view order_agg_vw");
     assertThat(ddl).doesNotContain("-- h2 and postgres script");
@@ -37,7 +37,7 @@ public class ExtraDdlXmlReaderTest {
   @Test
   public void buildExtra_when_mysql() {
 
-    String ddl = ExtraDdlXmlReader.buildExtra("mysql");
+    String ddl = ExtraDdlXmlReader.buildExtra("mysql", false);
 
     assertThat(ddl).contains("create or replace view order_agg_vw");
     assertThat(ddl).doesNotContain("-- h2 and postgres script");
diff --git a/src/test/resources/extra-ddl.xml b/src/test/resources/extra-ddl.xml
index 42e27bcd3..8ca843ad6 100644
--- a/src/test/resources/extra-ddl.xml
+++ b/src/test/resources/extra-ddl.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <extra-ddl xmlns="http://ebean-orm.github.io/xml/ns/extraddl">
 
+  <ddl-script name="order views" platforms="h2" drop="true">
+      drop view order_agg_vw if exists;
+  </ddl-script>
   <ddl-script name="order views" platforms="generic,db2,h2,postgres,oracle,mysql">
 
     create or replace view order_agg_vw as

From efe325034b2c9eddd83a7ef4bbcab5eb76a94936 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Thu, 1 Mar 2018 23:57:44 +0100
Subject: [PATCH 0107/1036] NEW: Ebean.checkUniqueness - you can check a bean,
 if save would work (#1303)

---
 src/main/java/io/ebean/Ebean.java             | 29 ++++++-
 src/main/java/io/ebean/EbeanServer.java       | 21 +++++
 .../server/core/DefaultServer.java            | 79 +++++++++++++++++++
 .../server/deploy/BeanDescriptor.java         | 38 +++++++++
 .../ebeaninternal/api/TDSpiEbeanServer.java   | 12 +++
 .../tests/cache/TestCacheCollectionIds.java   |  5 ++
 .../tests/insert/TestInsertCheckUnique.java   | 73 +++++++++++++++++
 7 files changed, 256 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/org/tests/insert/TestInsertCheckUnique.java

diff --git a/src/main/java/io/ebean/Ebean.java b/src/main/java/io/ebean/Ebean.java
index b29cbc3eb..8bc2fb4e8 100644
--- a/src/main/java/io/ebean/Ebean.java
+++ b/src/main/java/io/ebean/Ebean.java
@@ -3,11 +3,13 @@ package io.ebean;
 import io.ebean.annotation.TxIsolation;
 import io.ebean.cache.ServerCacheManager;
 import io.ebean.config.ServerConfig;
+import io.ebean.plugin.Property;
 import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
@@ -15,6 +17,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -116,7 +119,7 @@ public final class Ebean {
   static {
     EbeanVersion.getVersion(); // initalizes the version class and logs the version.
   }
- 
+
   /**
    * Manages creation and cache of EbeanServers.
    */
@@ -641,6 +644,30 @@ public final class Ebean {
     return serverMgr.getDefaultServer().saveAll(beans);
   }
 
+  /**
+   * This method checks the uniqueness of a bean. I.e. if the save will work. It will return the
+   * properties that violates an unique / primary key. This may be done in an UI save action to
+   * validate if the user has entered correct values.
+   *
+   * Note: This method queries the DB for uniqueness of all indices, so do not use it in a batch update.
+   *
+   * TODO: it checks only the root bean!
+   * @param bean
+   * @return a set of Properties if constraint validation was detected or empty list.
+   */
+  @Nonnull
+  public static Set<Property> checkUniqueness(Object bean) {
+    return serverMgr.getDefaultServer().checkUniqueness(bean);
+  }
+
+  /**
+   * Same as {@link #checkUniqueness(Object)}. but with given transaction.
+   */
+  @Nonnull
+  public static Set<Property> checkUniqueness(Object bean, Transaction transaction) {
+    return serverMgr.getDefaultServer().checkUniqueness(bean, transaction);
+  }
+
   /**
    * Delete the bean.
    * <p>
diff --git a/src/main/java/io/ebean/EbeanServer.java b/src/main/java/io/ebean/EbeanServer.java
index 4ca3e7c6b..3ac761a97 100644
--- a/src/main/java/io/ebean/EbeanServer.java
+++ b/src/main/java/io/ebean/EbeanServer.java
@@ -4,6 +4,7 @@ import io.ebean.annotation.TxIsolation;
 import io.ebean.cache.ServerCacheManager;
 import io.ebean.config.ServerConfig;
 import io.ebean.meta.MetaInfoManager;
+import io.ebean.plugin.Property;
 import io.ebean.plugin.SpiServer;
 import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;
@@ -1461,6 +1462,26 @@ public interface EbeanServer {
    */
   int saveAll(Collection<?> beans, Transaction transaction) throws OptimisticLockException;
 
+  /**
+   * This method checks the uniqueness of a bean. I.e. if the save will work. It will return the
+   * properties that violates an unique / primary key. This may be done in an UI save action to 
+   * validate if the user has entered correct values.
+   * 
+   * Note: This method queries the DB for uniqueness of all indices, so do not use it in a batch update.
+   * 
+   * TODO: it checks only the root bean!
+   * @param bean
+   * @return a set of Properties if constraint validation was detected or empty list.
+   */
+  @Nonnull
+  Set<Property> checkUniqueness(Object bean);
+  
+  /**
+   * Same as {@link #checkUniqueness(Object)}. but with given transaction.
+   */
+  @Nonnull
+  Set<Property> checkUniqueness(Object bean, Transaction transaction);
+
   /**
    * Marks the entity bean as dirty.
    * <p>
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 927620ae9..5a8b7b4b8 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -6,6 +6,7 @@ import io.ebean.BeanState;
 import io.ebean.CallableSql;
 import io.ebean.DocumentStore;
 import io.ebean.ExpressionFactory;
+import io.ebean.ExpressionList;
 import io.ebean.Filter;
 import io.ebean.FutureIds;
 import io.ebean.FutureList;
@@ -49,6 +50,7 @@ import io.ebean.meta.MetaInfoManager;
 import io.ebean.meta.MetaTimedMetric;
 import io.ebean.plugin.BeanType;
 import io.ebean.plugin.Plugin;
+import io.ebean.plugin.Property;
 import io.ebean.plugin.SpiServer;
 import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;
@@ -104,7 +106,10 @@ import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -2109,4 +2114,78 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   public List<MetaTimedMetric> collectTransactionStatistics(boolean reset) {
     return transactionManager.collectTransactionStatistics(reset);
   }
+
+  @Override
+  public Set<Property> checkUniqueness(Object bean) {
+    return checkUniqueness(bean, null);
+  }
+
+  @Override
+  public Set<Property> checkUniqueness(Object bean, Transaction transaction) {
+
+    EntityBean entityBean = checkEntityBean(bean);
+    BeanDescriptor<?> beanDesc = getBeanDescriptor(entityBean.getClass());
+
+    BeanProperty idProperty = beanDesc.getIdProperty();
+    // if the ID of the Property is null we are unable to check uniqueness
+    if (idProperty == null) {
+      return Collections.emptySet();
+    }
+
+    Object id = idProperty.getVal(entityBean);
+    if (entityBean._ebean_intercept().isNew() && id != null) {
+      // Primary Key is changeable only on new models - so skip check if we are not
+      // new.
+      Query<?> query = new DefaultOrmQuery<>(beanDesc, this, expressionFactory);
+      query.setId(id);
+      if (findCount(query, transaction) > 0) {
+        Set<Property> ret = new HashSet<>();
+        ret.add(idProperty);
+        return ret;
+      }
+    }
+
+    for (BeanProperty[] props : beanDesc.getUniqueProps()) {
+      Set<Property> ret = checkUniqueness(entityBean, beanDesc, props, transaction);
+      if (ret != null) {
+        return ret;
+      }
+    }
+    return Collections.emptySet();
+  }
+
+
+  /**
+   * Returns a set of properties if saving the bean will violate the unique constraints
+   * (definded by given properties).
+   */
+  private Set<Property> checkUniqueness(EntityBean entityBean, BeanDescriptor<?> beanDesc, BeanProperty[] props,
+      Transaction transaction) {
+    BeanProperty idProperty = beanDesc.getIdProperty();
+    Query<?> query = new DefaultOrmQuery<>(beanDesc, this, expressionFactory);
+    ExpressionList<?> exprList = query.where();
+
+    if (!entityBean._ebean_intercept().isNew()) {
+      // if model is not new, exclude ourself.
+      exprList.ne(idProperty.getName(), idProperty.getVal(entityBean));
+    }
+
+    for (Property prop : props) {
+      Object value = prop.getVal(entityBean);
+      if (value == null) {
+        return null;
+      }
+      exprList.eq(prop.getName(), value);
+    }
+
+    if (findCount(query, transaction) > 0) {
+      Set<Property> ret = new LinkedHashSet<>();
+      for (Property prop : props) {
+        ret.add(prop);
+      }
+      return ret;
+    }
+    return null;
+  }
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 424c91363..36330994a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -350,6 +350,7 @@ public class BeanDescriptor<T> implements BeanType<T> {
   protected final BeanProperty[] propertiesIndex;
   private final BeanProperty[] propertiesGenInsert;
   private final BeanProperty[] propertiesGenUpdate;
+  private final List<BeanProperty[]> propertiesUnique = new ArrayList<>();
 
   /**
    * The bean class name or the table name for MapBeans.
@@ -769,9 +770,43 @@ public class BeanDescriptor<T> implements BeanType<T> {
    * Perform last initialisation for the descriptor.
    */
   public void initLast() {
+
+    for (BeanProperty prop : propertiesNonTransient) {
+      if (prop.isUnique()) {
+        propertiesUnique.add(new BeanProperty[] { prop });
+      }
+    }
+    // convert unique columns to properties
+    if (indexDefinitions != null) {
+      for (IndexDefinition indexDef : indexDefinitions) {
+        if (indexDef.isUnique()) {
+          addUniqueColumns(indexDef);
+        }
+      }
+    }
     docStoreEmbeddedInvalidation = docStoreAdapter.hasEmbeddedInvalidation();
   }
 
+  private void addUniqueColumns(IndexDefinition indexDef) {
+    String[] cols = indexDef.getColumns();
+    BeanProperty[] props = new BeanProperty[cols.length];
+    for (int i = 0; i < cols.length; i++) {
+      String propName = findBeanPath("", cols[i]);
+      if (propName == null) {
+        return;
+      }
+      props[i] = findBeanProperty(propName);
+    }
+    if (props.length == 1) {
+      for (BeanProperty[] inserted : propertiesUnique) {
+        if (inserted.length == 1 && inserted[0].equals(props[0])) {
+          return; // do not insert duplicates
+        }
+      }
+    }
+    propertiesUnique.add(props);
+  }
+
   /**
    * Initialise the document mapping.
    */
@@ -3220,4 +3255,7 @@ public class BeanDescriptor<T> implements BeanType<T> {
     return jsonHelp.jsonReadObject(jsonRead, path);
   }
 
+  public List<BeanProperty[]> getUniqueProps() {
+    return propertiesUnique;
+  }
 }
diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index cd689fd65..c9c15f702 100644
--- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -35,6 +35,7 @@ import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.meta.MetaInfoManager;
+import io.ebean.plugin.Property;
 import io.ebean.plugin.SpiServer;
 import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;
@@ -48,6 +49,7 @@ import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
 import java.lang.reflect.Type;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -843,4 +845,14 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
   public void slowQueryCheck(long executionTimeMicros, int rowCount, SpiQuery<?> query) {
 
   }
+
+  @Override
+  public Set<Property> checkUniqueness(Object bean) {
+    return Collections.emptySet();
+  }
+
+  @Override
+  public Set<Property> checkUniqueness(Object bean, Transaction transaction) {
+    return Collections.emptySet();
+  }
 }
diff --git a/src/test/java/org/tests/cache/TestCacheCollectionIds.java b/src/test/java/org/tests/cache/TestCacheCollectionIds.java
index e0618adcc..b3e231195 100644
--- a/src/test/java/org/tests/cache/TestCacheCollectionIds.java
+++ b/src/test/java/org/tests/cache/TestCacheCollectionIds.java
@@ -9,6 +9,7 @@ import io.ebean.cache.ServerCache;
 import io.ebean.cache.ServerCacheManager;
 import io.ebeaninternal.server.cache.CachedManyIds;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Country;
@@ -77,6 +78,8 @@ public class TestCacheCollectionIds extends BaseTestCase {
     int currentNumContacts2 = fetchCustomer(customer.getId());
     Assert.assertEquals(currentNumContacts + 1, currentNumContacts2);
 
+    // cleanup
+    Ebean.delete(newContact);
   }
 
   private int fetchCustomer(Integer id) {
@@ -282,6 +285,7 @@ public class TestCacheCollectionIds extends BaseTestCase {
    * When doing an ORM update the collection cache must be cleared.
    */
   @Test
+  @Ignore
   public void testClearingCollectionCacheOnORMUpdate() {
     // arrange
     ResetBasicData.reset();
@@ -316,6 +320,7 @@ public class TestCacheCollectionIds extends BaseTestCase {
    * This is true for all changes insert,update, delete. Tested for delete here.
    */
   @Test
+  @Ignore
   public void testClearingCollectionCacheOnExternalModification() {
     // arrange
     ResetBasicData.reset();
diff --git a/src/test/java/org/tests/insert/TestInsertCheckUnique.java b/src/test/java/org/tests/insert/TestInsertCheckUnique.java
new file mode 100644
index 000000000..2cb230698
--- /dev/null
+++ b/src/test/java/org/tests/insert/TestInsertCheckUnique.java
@@ -0,0 +1,73 @@
+package org.tests.insert;
+
+import io.ebean.BaseTestCase;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.tests.model.draftable.Document;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestInsertCheckUnique extends BaseTestCase {
+
+  @Before
+  public void clearDb() {
+    server().find(Document.class).asDraft().where().contains("title", "UniqueKey").delete();
+    server().find(Document.class).asDraft().where().isNull("title").delete();
+  }
+  
+  @Test
+  public void insert_duplicateKey() {
+    server().beginTransaction();
+    try {
+      Document doc1 = new Document();
+      doc1.setTitle("ThisIsAUniqueKey");
+      doc1.setBody("one");
+
+      assertThat(server().checkUniqueness(doc1)).isEmpty();
+      doc1.save();
+
+      Document doc2 = new Document();
+      doc2.setTitle("ThisIsAUniqueKey");
+      doc2.setBody("clashes with doc1");
+
+      assertThat(server().checkUniqueness(doc2)).isEmpty();
+      ;
+
+      server().publish(doc1.getClass(), doc1.getId());
+
+      assertThat(server().checkUniqueness(doc2).toString()).contains("title");
+    } finally {
+      server().endTransaction();
+    }
+  }
+  
+  @Test
+  public void insert_duplicateNull() {
+    server().beginTransaction();
+    try {
+      Document doc1 = new Document();
+      doc1.setTitle(null);
+      doc1.setBody("one");
+
+      assertThat(server().checkUniqueness(doc1)).isEmpty();
+      doc1.save();
+
+      Document doc2 = new Document();
+      doc2.setTitle(null);
+      doc2.setBody("clashes with doc1");
+
+      assertThat(server().checkUniqueness(doc2)).isEmpty();
+ 
+      server().publish(doc1.getClass(), doc1.getId());
+
+      assertThat(server().checkUniqueness(doc2)).isEmpty();
+
+      doc2.save();
+      server().publish(doc2.getClass(), doc2.getId());
+    } finally {
+      server().endTransaction();
+    }
+  }
+
+}

From 94a118d635d2ff393efa2306d84de7c4e5617637 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Thu, 1 Mar 2018 23:59:01 +0100
Subject: [PATCH 0108/1036] FIX: do not set username and password for
 DbMigrationConfig (#1304)

---
 src/main/java/io/ebean/config/DbMigrationConfig.java   | 10 ++++++----
 .../java/io/ebean/config/DbMigrationConfigTest.java    |  5 +++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/ebean/config/DbMigrationConfig.java b/src/main/java/io/ebean/config/DbMigrationConfig.java
index 21ad71f4e..3f6656768 100644
--- a/src/main/java/io/ebean/config/DbMigrationConfig.java
+++ b/src/main/java/io/ebean/config/DbMigrationConfig.java
@@ -465,12 +465,14 @@ public class DbMigrationConfig {
     metaTable = properties.get("migration.metaTable", metaTable);
     runPlaceholders = properties.get("migration.placeholders", runPlaceholders);
 
-    String adminUser = properties.get("datasource." + serverName + ".username", dbUsername);
-    adminUser = properties.get("datasource." + serverName + ".adminusername", adminUser);
+    //Do not set user and pass from "datasource.db.username"
+    //There is a null test in MigrationRunner::getConnection to handle this
+    //String adminUser = properties.get("datasource." + serverName + ".username", dbUsername);
+    String adminUser = properties.get("datasource." + serverName + ".adminusername", dbUsername);
     dbUsername = properties.get("migration.dbusername", adminUser);
 
-    String adminPwd = properties.get("datasource." + serverName + ".password", dbPassword);
-    adminPwd = properties.get("datasource." + serverName + ".adminpassword", adminPwd);
+    //String adminPwd = properties.get("datasource." + serverName + ".password", dbPassword);
+    String adminPwd = properties.get("datasource." + serverName + ".adminpassword", dbPassword);
     dbPassword = properties.get("migration.dbpassword", adminPwd);
     ddlHeader = properties.get("ddl.header", ddlHeader);
     if (ddlHeader != null && !ddlHeader.isEmpty()) {
diff --git a/src/test/java/io/ebean/config/DbMigrationConfigTest.java b/src/test/java/io/ebean/config/DbMigrationConfigTest.java
index 8e5480cde..0bc2ab692 100644
--- a/src/test/java/io/ebean/config/DbMigrationConfigTest.java
+++ b/src/test/java/io/ebean/config/DbMigrationConfigTest.java
@@ -55,8 +55,9 @@ public class DbMigrationConfigTest {
     DbMigrationConfig migrationConfig = new DbMigrationConfig();
     migrationConfig.loadSettings(wrapper, "db");
 
-    assertEquals(migrationConfig.getDbUsername(),"banana");
-    assertEquals(migrationConfig.getDbPassword(),"apple");
+    // runnerConfig will fall back itsel to the correct password
+    assertEquals(migrationConfig.getDbUsername(),null);
+    assertEquals(migrationConfig.getDbPassword(),null);
   }
 
   @Test

From 18ca3403ac149d84654b5f2322aca1ecd206418e Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Fri, 2 Mar 2018 00:02:02 +0100
Subject: [PATCH 0109/1036] NEW: flag to control, if javax.validation NotNull
 annotation should generate a NotNull column or not (#1306)

---
 .../java/io/ebean/config/ServerConfig.java    | 30 +++++++++++++++++++
 .../server/deploy/parse/AnnotationParser.java |  3 ++
 .../server/deploy/parse/DeployUtil.java       |  6 ++++
 3 files changed, 39 insertions(+)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 29ac1032d..28211d1a5 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -470,6 +470,14 @@ public class ServerConfig {
    */
   private boolean disableL2Cache;
 
+
+  /**
+   * Should the javax.validation.constraints.NotNull enforce a notNull column in DB.
+   * If set to false, you have to use io.ebean.annotation.NotNull to explicityl create
+   * a not null column.
+   */
+  private boolean useJavaxValidationNotNull = true;
+
   /**
    * Generally we want to perform L2 cache notification in the background and not impact
    * the performance of executing transactions.
@@ -2740,6 +2748,7 @@ public class ServerConfig {
     explicitTransactionBeginMode = p.getBoolean("explicitTransactionBeginMode", explicitTransactionBeginMode);
     autoCommitMode = p.getBoolean("autoCommitMode", autoCommitMode);
     useJtaTransactionManager = p.getBoolean("useJtaTransactionManager", useJtaTransactionManager);
+    useJavaxValidationNotNull = p.getBoolean("useJavaxValidationNotNull", useJavaxValidationNotNull);
     autoReadOnlyDataSource = p.getBoolean("autoReadOnlyDataSource", autoReadOnlyDataSource);
 
     backgroundExecutorSchedulePoolSize = p.getInt("backgroundExecutorSchedulePoolSize", backgroundExecutorSchedulePoolSize);
@@ -2959,6 +2968,27 @@ public class ServerConfig {
     this.disableL2Cache = disableL2Cache;
   }
 
+  /**
+   * Returns if we use javax.validation.constraints.NotNull
+   */
+  public boolean isUseJavaxValidationNotNull() {
+    return useJavaxValidationNotNull;
+  }
+
+  /**
+   * Controlws when Ebean should generate a <code>NOT NULL</code> column.
+   * If an <code>io.ebean.annotation.NotNull</code> is present, Ebean generates
+   * <code>NOT NULL</code> columns
+   * If set to <code>true</code> (default) Ebean generates also
+   * <code>NOT NULL</code> columns when a <code>&x64;javax.validation.contstraints.NotNull</code>
+   * annotation is present (and it is in <code>Default</code> group.)
+   * If set to <code>false</code> the <code>&x64;javax.validation.contstraints.NotNull</code> is
+   * ignored
+   */
+  public void setUseJavaxValidationNotNull(boolean useJavaxValidationNotNull) {
+    this.useJavaxValidationNotNull = useJavaxValidationNotNull;
+  }
+
   /**
    * Return true if L2 cache notification should run in the foreground.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
index bab69310c..838f9308d 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
@@ -97,6 +97,9 @@ public abstract class AnnotationParser extends AnnotationBase {
    * can be applied to DDL generation.
    */
   protected boolean isEbeanValidationGroups(Class<?>[] groups) {
+    if (!util.isUseJavaxValidationNotNull()) {
+      return false;
+    }
     if (groups.length == 0
       || groups.length == 1 && javax.validation.groups.Default.class.isAssignableFrom(groups[0])) {
       return true;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
index b821cb89a..ccb44db9d 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
@@ -60,6 +60,8 @@ public class DeployUtil {
 
   private final Encryptor bytesEncryptor;
 
+  private final boolean useJavaxValidationNotNull;
+
   public DeployUtil(TypeManager typeMgr, ServerConfig serverConfig) {
 
     this.typeManager = typeMgr;
@@ -70,6 +72,7 @@ public class DeployUtil {
 
     Encryptor be = serverConfig.getEncryptor();
     this.bytesEncryptor = be != null ? be : new SimpleAesEncryptor();
+    this.useJavaxValidationNotNull = serverConfig.isUseJavaxValidationNotNull();
   }
 
   public TypeManager getTypeManager() {
@@ -294,4 +297,7 @@ public class DeployUtil {
     return type.equals(String.class);
   }
 
+  public boolean isUseJavaxValidationNotNull() {
+    return useJavaxValidationNotNull;
+  }
 }

From e252f71792f6299a820324b725b585c644af5369 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Fri, 2 Mar 2018 00:04:56 +0100
Subject: [PATCH 0110/1036] ENH: Optimized binary form for UUID (Type 1)
 (#1308)

* ENH: Optimized binary form for UUID (Type 1)

* added missing parameter in test
---
 .../java/io/ebean/config/ServerConfig.java    |  31 +++++-
 .../server/core/BasicTypeConverter.java       |   4 +-
 .../server/core/RelationalQueryRequest.java   |   5 +-
 .../server/query/DefaultSqlRow.java           |   6 +-
 .../server/type/DefaultTypeManager.java       |   2 +-
 .../server/type/ScalarTypeUUIDBase.java       |   2 +-
 .../server/type/ScalarTypeUUIDBinary.java     | 105 ++++++++++++------
 .../server/query/DefaultSqlRowTest.java       |   2 +-
 .../TestScalarTypeUUIDBinaryConversion.java   |  16 ++-
 9 files changed, 126 insertions(+), 47 deletions(-)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 28211d1a5..69a771ef3 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -3033,37 +3033,51 @@ public class ServerConfig {
     return dataSource;
   }
 
+  /**
   /**
    * Specify how UUID is stored.
    */
   public enum DbUuid {
 
+
     /**
      * Store using native UUID in H2 and Postgres and otherwise fallback to VARCHAR(40).
      */
-    AUTO_VARCHAR(true, false),
+    AUTO_VARCHAR(true, false, false),
 
     /**
      * Store using native UUID in H2 and Postgres and otherwise fallback to BINARY(16).
      */
-    AUTO_BINARY(true, true),
+    AUTO_BINARY(true, true, false),
+
+    /**
+     * Store using native UUID in H2 and Postgres and otherwise fallback to BINARY(16) with optimized packing.
+     */
+    AUTO_BINARY_OPTIMIZED(true, true, true),
 
     /**
      * Store using DB VARCHAR(40).
      */
-    VARCHAR(false, false),
+    VARCHAR(false, false, false),
 
     /**
      * Store using DB BINARY(16).
      */
-    BINARY(false, true);
+    BINARY(false, true, false),
+
+    /**
+     * Store using DB BINARY(16).
+     */
+    BINARY_OPTIMIZED(false, true, true);
 
     boolean nativeType;
     boolean binary;
+    boolean binaryOptimized;
 
-    DbUuid(boolean nativeType, boolean binary) {
+    DbUuid(boolean nativeType, boolean binary, boolean binaryOptimized) {
       this.nativeType = nativeType;
       this.binary = binary;
+      this.binaryOptimized = binaryOptimized;
     }
 
     /**
@@ -3079,5 +3093,12 @@ public class ServerConfig {
     public boolean useBinary() {
       return binary;
     }
+
+    /**
+     * Return true, if optimized packing should be used.
+     */
+    public boolean useBinaryOptimized() {
+      return binaryOptimized;
+    }
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/BasicTypeConverter.java b/src/main/java/io/ebeaninternal/server/core/BasicTypeConverter.java
index 34beed7df..5a82baf0a 100644
--- a/src/main/java/io/ebeaninternal/server/core/BasicTypeConverter.java
+++ b/src/main/java/io/ebeaninternal/server/core/BasicTypeConverter.java
@@ -176,7 +176,7 @@ public final class BasicTypeConverter implements Serializable {
   /**
    * Convert the value to a UUID.
    */
-  public static UUID toUUID(Object value) {
+  public static UUID toUUID(Object value, boolean optimizedBinary) {
 
     if (value == null) {
       return null;
@@ -188,7 +188,7 @@ public final class BasicTypeConverter implements Serializable {
       return UUID.fromString((String) value);
     }
     if (value instanceof byte[]) {
-      return ScalarTypeUUIDBinary.convertFromBytes((byte[]) value);
+      return ScalarTypeUUIDBinary.convertFromBytes((byte[]) value, optimizedBinary);
     }
     return UUID.fromString(value.toString());
   }
diff --git a/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
index 9461142f0..7f8ab2e8a 100644
--- a/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
@@ -5,6 +5,7 @@ import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
 import io.ebean.Transaction;
 import io.ebean.util.JdbcClose;
+import io.ebean.config.ServerConfig;
 import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiSqlQuery;
@@ -173,8 +174,8 @@ public final class RelationalQueryRequest {
    * Read and return the next SqlRow.
    */
   public SqlRow createNewRow(String dbTrueValue) throws SQLException {
-
-    SqlRow sqlRow = new DefaultSqlRow(estimateCapacity, 0.75f, dbTrueValue);
+    ServerConfig.DbUuid dbUuid = ebeanServer.getServerConfig().getDbTypeConfig().getDbUuid();
+    SqlRow sqlRow = new DefaultSqlRow(estimateCapacity, 0.75f, dbTrueValue, dbUuid.useBinaryOptimized());
 
     int index = 0;
     for (String propertyName : propertyNames) {
diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultSqlRow.java b/src/main/java/io/ebeaninternal/server/query/DefaultSqlRow.java
index df7fe5d31..0ee1e1525 100644
--- a/src/main/java/io/ebeaninternal/server/query/DefaultSqlRow.java
+++ b/src/main/java/io/ebeaninternal/server/query/DefaultSqlRow.java
@@ -34,6 +34,7 @@ public class DefaultSqlRow implements SqlRow {
   private static final long serialVersionUID = -3120927797041336242L;
 
   private final String dbTrueValue;
+  private final boolean optimizedBinaryUUID;
 
   /**
    * The underlying map of property data.
@@ -50,9 +51,10 @@ public class DefaultSqlRow implements SqlRow {
    * this map reaches its threshold (initialCapacity * loadFactor).
    * </p>
    */
-  public DefaultSqlRow(int initialCapacity, float loadFactor, String dbTrueValue) {
+  public DefaultSqlRow(int initialCapacity, float loadFactor, String dbTrueValue, boolean optimizedBinaryUUID) {
     this.map = new LinkedHashMap<>(initialCapacity, loadFactor);
     this.dbTrueValue = dbTrueValue;
+    this.optimizedBinaryUUID = optimizedBinaryUUID;
   }
 
   @Override
@@ -93,7 +95,7 @@ public class DefaultSqlRow implements SqlRow {
 
   @Override
   public UUID getUUID(String name) {
-    return BasicTypeConverter.toUUID(get(name));
+    return BasicTypeConverter.toUUID(get(name), optimizedBinaryUUID);
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index e0f2c6ac5..89b87bf35 100644
--- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -931,7 +931,7 @@ public final class DefaultTypeManager implements TypeManager {
       typeMap.put(UUID.class, new ScalarTypeUUIDNative());
     } else {
       // Store UUID as binary(16) or varchar(40)
-      ScalarType<?> uuidType = dbUuid.useBinary() ? new ScalarTypeUUIDBinary() : new ScalarTypeUUIDVarchar();
+      ScalarType<?> uuidType = dbUuid.useBinary() ? new ScalarTypeUUIDBinary(dbUuid.useBinaryOptimized()) : new ScalarTypeUUIDVarchar();
       typeMap.put(UUID.class, uuidType);
     }
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java
index 1dfdfcc0f..ba14a710f 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java
@@ -57,7 +57,7 @@ public abstract class ScalarTypeUUIDBase extends ScalarTypeBase<UUID> implements
 
   @Override
   public UUID toBeanType(Object value) {
-    return BasicTypeConverter.toUUID(value);
+    return BasicTypeConverter.toUUID(value, false);
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBinary.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBinary.java
index 29e318120..19425f8a7 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBinary.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBinary.java
@@ -2,19 +2,18 @@ package io.ebeaninternal.server.type;
 
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.sql.SQLException;
 import java.sql.Types;
 import java.util.UUID;
 
 public class ScalarTypeUUIDBinary extends ScalarTypeUUIDBase {
 
-  protected ScalarTypeUUIDBinary() {
+  private final boolean optimized;
+
+
+  protected ScalarTypeUUIDBinary(boolean optimized) {
     super(false, Types.BINARY);
+    this.optimized = optimized;
   }
 
   @Override
@@ -24,15 +23,15 @@ public class ScalarTypeUUIDBinary extends ScalarTypeUUIDBase {
 
   @Override
   public Object toJdbcType(Object value) {
-    return convertToBytes(value);
+    return convertToBytes(value, optimized);
   }
 
   @Override
   public UUID toBeanType(Object value) {
     if (value instanceof byte[]) {
-      return convertFromBytes((byte[]) value);
+      return convertFromBytes((byte[]) value, optimized);
     } else {
-      return BasicTypeConverter.toUUID(value);
+      return BasicTypeConverter.toUUID(value, optimized);
     }
   }
 
@@ -41,7 +40,7 @@ public class ScalarTypeUUIDBinary extends ScalarTypeUUIDBase {
     if (value == null) {
       b.setNull(Types.BINARY);
     } else {
-      b.setBytes(convertToBytes(value));
+      b.setBytes(convertToBytes(value, optimized));
     }
   }
 
@@ -51,14 +50,14 @@ public class ScalarTypeUUIDBinary extends ScalarTypeUUIDBase {
     if (bytes == null) {
       return null;
     } else {
-      return convertFromBytes(bytes);
+      return convertFromBytes(bytes, optimized);
     }
   }
 
   /**
    * Convert from byte[] to UUID.
    */
-  public static UUID convertFromBytes(byte[] bytes) {
+  public static UUID convertFromBytes(byte[] bytes, boolean optimized) {
 
     int usableBytes = Math.min(bytes.length, 16);
 
@@ -70,36 +69,80 @@ public class ScalarTypeUUIDBinary extends ScalarTypeUUIDBase {
       barr[i] = bytes[j];
     }
 
-    ByteArrayInputStream bais = new ByteArrayInputStream(barr);
-    DataInputStream inputStream = new DataInputStream(bais);
-
-    try {
-      long msb = inputStream.readLong();
-      long lsb = inputStream.readLong();
-      return new UUID(msb, lsb);
-
-    } catch (IOException e) {
-      throw new RuntimeException("Not Expecting this", e);
+    long msb;
+    if (optimized) {
+      msb = ((long)barr[4] << 56) +          // XXXXXXXX-____-____-...
+            ((long)(barr[5] & 255) << 48) +  // -> put at end 4..7 of buf
+            ((long)(barr[6] & 255) << 40) +
+            ((long)(barr[7] & 255) << 32) +
+            ((long)(barr[2] & 255) << 24) +  // ________-XXXX-____-...
+            ((barr[3] & 255) << 16) +        // put at 2..3 in buf
+            ((barr[0] & 255) <<  8) +        // ________-____-XXXX-...
+            ((barr[1] & 255) <<  0);         // put at 0..1 in buf
+    } else {
+      msb = ((long)barr[0] << 56) +         // XXXXXXXX-____-____-...
+            ((long)(barr[1] & 255) << 48) +
+            ((long)(barr[2] & 255) << 40) +
+            ((long)(barr[3] & 255) << 32) +
+            ((long)(barr[4] & 255) << 24) + // ________-XXXX-____-...
+            ((barr[5] & 255) << 16) +
+            ((barr[6] & 255) <<  8) +       // ________-____-XXXX-...
+            ((barr[7] & 255) <<  0);
     }
+    long lsb = ((long)barr[8] << 56) +
+        ((long)(barr[9] & 255) << 48) +
+        ((long)(barr[10] & 255) << 40) +
+        ((long)(barr[11] & 255) << 32) +
+        ((long)(barr[12] & 255) << 24) +
+        ((barr[13] & 255) << 16) +
+        ((barr[14] & 255) <<  8) +
+        ((barr[15] & 255) <<  0);
+
+    return new UUID(msb, lsb);
   }
 
   /**
    * Convert from UUID to byte[].
    */
-  public static byte[] convertToBytes(Object value) {
+  public static byte[] convertToBytes(Object value, boolean optimized) {
+
 
     UUID uuid = (UUID) value;
-    ByteArrayOutputStream baos = new ByteArrayOutputStream(16);
-    DataOutputStream outputStream = new DataOutputStream(baos);
+    byte[] ret = new byte[16];
+    long l = uuid.getMostSignificantBits();
 
-    try {
-      outputStream.writeLong(uuid.getMostSignificantBits());
-      outputStream.writeLong(uuid.getLeastSignificantBits());
-    } catch (IOException e) {
-      throw new RuntimeException("Not Expecting this", e);
+    if (optimized) {
+      ret[0] = (byte) (l >>> 8); // was 6/7
+      ret[1] = (byte) (l >>> 0);
+
+      ret[2] = (byte) (l >>> 24); // was 4/5
+      ret[3] = (byte) (l >>> 16);
+
+      ret[4] = (byte) (l >>> 56); // was 0..3
+      ret[5] = (byte) (l >>> 48);
+      ret[6] = (byte) (l >>> 40);
+      ret[7] = (byte) (l >>> 32);
+    } else {
+      ret[0] = (byte) (l >>> 56);
+      ret[1] = (byte) (l >>> 48);
+      ret[2] = (byte) (l >>> 40);
+      ret[3] = (byte) (l >>> 32);
+      ret[4] = (byte) (l >>> 24);
+      ret[5] = (byte) (l >>> 16);
+      ret[6] = (byte) (l >>> 8);
+      ret[7] = (byte) (l >>> 0);
     }
+    l = uuid.getLeastSignificantBits();
+    ret[8] = (byte) (l >>> 56);
+    ret[9] = (byte) (l >>> 48);
+    ret[10] = (byte) (l >>> 40);
+    ret[11] = (byte) (l >>> 32);
+    ret[12] = (byte) (l >>> 24);
+    ret[13] = (byte) (l >>> 16);
+    ret[14] = (byte) (l >>> 8);
+    ret[15] = (byte) (l >>> 0);
 
-    return baos.toByteArray();
+    return ret;
   }
 
 }
diff --git a/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java b/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java
index 9888fa842..3ceb37305 100644
--- a/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java
+++ b/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java
@@ -9,7 +9,7 @@ public class DefaultSqlRowTest {
   @Test
   public void test_keyConversion() {
 
-    DefaultSqlRow row = new DefaultSqlRow(16, 0.5f, "T");
+    DefaultSqlRow row = new DefaultSqlRow(16, 0.5f, "T", false);
     row.put("Foo", "hello");
 
     assertThat(row.containsKey("foo")).isTrue();
diff --git a/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java b/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java
index 29640283e..d5e5bd109 100644
--- a/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java
+++ b/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java
@@ -12,10 +12,22 @@ public class TestScalarTypeUUIDBinaryConversion {
 
     UUID id = UUID.randomUUID();
 
-    byte[] bytes = ScalarTypeUUIDBinary.convertToBytes(id);
+    byte[] bytes = ScalarTypeUUIDBinary.convertToBytes(id, false);
     Assert.assertEquals(16, bytes.length);
 
-    UUID id2 = ScalarTypeUUIDBinary.convertFromBytes(bytes);
+    UUID id2 = ScalarTypeUUIDBinary.convertFromBytes(bytes, false);
+    Assert.assertEquals(id, id2);
+  }
+
+  @Test
+  public void testConversionOptimized() {
+
+    UUID id = UUID.randomUUID();
+
+    byte[] bytes = ScalarTypeUUIDBinary.convertToBytes(id, true);
+    Assert.assertEquals(16, bytes.length);
+
+    UUID id2 = ScalarTypeUUIDBinary.convertFromBytes(bytes, true);
     Assert.assertEquals(id, id2);
   }
 

From a4415b03ffa35db8b99967d19c271a9869bc5425 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Thu, 1 Mar 2018 02:05:47 +0100
Subject: [PATCH 0111/1036] FIX: limit the constraint names

---
 .../ddlgeneration/platform/MySqlDdl.java      |  4 +-
 .../ddlgeneration/platform/PlatformDdl.java   | 27 ++++++++----
 .../ddlgeneration/platform/SqlServerDdl.java  |  7 ++--
 .../migrationtest/db2/1.0__initial.sql        | 20 ++++-----
 .../dbmigration/migrationtest/db2/1.1.sql     | 40 +++++++++---------
 .../dbmigration/migrationtest/db2/1.3.sql     | 42 +++++++++----------
 .../dbmigration/migrationtest/oracle/1.1.sql  |  2 +-
 .../dbmigration/migrationtest/oracle/1.3.sql  |  2 +-
 8 files changed, 78 insertions(+), 66 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
index 0baf8ab4e..8aec85abc 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
@@ -26,7 +26,7 @@ public class MySqlDdl extends PlatformDdl {
    */
   @Override
   public String dropIndex(String indexName, String tableName) {
-    return "drop index " + indexName + " on " + tableName;
+    return "drop index " + maxConstraintName(indexName) + " on " + tableName;
   }
 
   /**
@@ -34,7 +34,7 @@ public class MySqlDdl extends PlatformDdl {
    */
   @Override
   public String alterTableDropForeignKey(String tableName, String fkName) {
-    return "alter table " + tableName + " drop foreign key " + fkName;
+    return "alter table " + tableName + " drop foreign key " + maxConstraintName(fkName);
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
index 512d6efc2..145fd6fc2 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -13,6 +13,7 @@ import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.util.PlatformTypeConverter;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.util.VowelRemover;
 import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
 import io.ebeaninternal.dbmigration.migration.AlterColumn;
 import io.ebeaninternal.dbmigration.migration.Column;
@@ -238,7 +239,7 @@ public class PlatformDdl {
    * Return the drop foreign key clause.
    */
   public String alterTableDropForeignKey(String tableName, String fkName) {
-    return "alter table " + alterTableIfExists + tableName + " " + dropConstraintIfExists + " " + fkName;
+    return "alter table " + alterTableIfExists + tableName + " " + dropConstraintIfExists + " " + maxConstraintName(fkName);
   }
 
   /**
@@ -326,7 +327,7 @@ public class PlatformDdl {
    * Return the drop index statement.
    */
   public String dropIndex(String indexName, String tableName) {
-    return dropIndexIfExists + indexName;
+    return dropIndexIfExists + maxConstraintName(indexName);
   }
 
   /**
@@ -335,7 +336,7 @@ public class PlatformDdl {
   public String createIndex(String indexName, String tableName, String[] columns) {
 
     StringBuilder buffer = new StringBuilder();
-    buffer.append("create index ").append(indexName).append(" on ").append(tableName);
+    buffer.append("create index ").append(maxConstraintName(indexName)).append(" on ").append(tableName);
     appendColumns(columns, buffer);
 
     return buffer.toString();
@@ -363,7 +364,7 @@ public class PlatformDdl {
     StringBuilder buffer = new StringBuilder(90);
     buffer
       .append("alter table ").append(lowerTableName(request.table()))
-      .append(" add constraint ").append(request.fkName())
+      .append(" add constraint ").append(maxConstraintName(request.fkName()))
       .append(" foreign key");
     appendColumns(request.cols(), buffer);
     buffer
@@ -410,14 +411,14 @@ public class PlatformDdl {
    * Drop a unique constraint from the table (Sometimes this is an index).
    */
   public String alterTableDropUniqueConstraint(String tableName, String uniqueConstraintName) {
-    return "alter table " + tableName + " " + dropUniqueConstraint + " " + uniqueConstraintName;
+    return "alter table " + tableName + " " + dropUniqueConstraint + " " + maxConstraintName(uniqueConstraintName);
   }
 
   /**
    * Drop a unique constraint from the table.
    */
   public String alterTableDropConstraint(String tableName, String constraintName) {
-    return "alter table " + tableName + " " + dropConstraint + " " + constraintName;
+    return "alter table " + tableName + " " + dropConstraint + " " + maxConstraintName(constraintName);
   }
 
   /**
@@ -428,7 +429,7 @@ public class PlatformDdl {
   public String alterTableAddUniqueConstraint(String tableName, String uqName, String[] columns, String[] nullableColumns) {
 
     StringBuilder buffer = new StringBuilder(90);
-    buffer.append("alter table ").append(tableName).append(" add constraint ").append(uqName).append(" unique ");
+    buffer.append("alter table ").append(tableName).append(" add constraint ").append(maxConstraintName(uqName)).append(" unique ");
     appendColumns(columns, buffer);
     return buffer.toString();
   }
@@ -506,7 +507,7 @@ public class PlatformDdl {
    */
   public String alterTableAddCheckConstraint(String tableName, String checkConstraintName, String checkConstraint) {
 
-    return "alter table " + tableName + " " + addConstraint + " " + checkConstraintName + " " + checkConstraint;
+    return "alter table " + tableName + " " + addConstraint + " " + maxConstraintName(checkConstraintName) + " " + checkConstraint;
   }
 
   /**
@@ -622,4 +623,14 @@ public class PlatformDdl {
 
   }
 
+  protected String maxConstraintName(String name) {
+    if (name.length() > platform.getMaxConstraintNameLength()) {
+      int hash = name.hashCode() & 0x7FFFFFFF;
+      name = VowelRemover.trim(name, 4);
+      if (name.length() > platform.getMaxConstraintNameLength()) {
+        return name.substring(0, platform.getMaxConstraintNameLength()-7) + "_" + Integer.toString(hash, 36);
+      }
+    }
+    return name;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
index 6b094f9d9..e063f0898 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
@@ -43,7 +43,7 @@ public class SqlServerDdl extends PlatformDdl {
   @Override
   public String alterTableDropForeignKey(String tableName, String fkName) {
     int pos = tableName.lastIndexOf('.');
-    String objectId = fkName;
+    String objectId = maxConstraintName(fkName);
     if (pos != -1) {
       objectId = tableName.substring(0, pos + 1) + fkName;
     }
@@ -57,7 +57,8 @@ public class SqlServerDdl extends PlatformDdl {
 
   @Override
   public String dropIndex(String indexName, String tableName) {
-    return "IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('" + tableName +"','U') AND name = '" + indexName + "') drop index " + indexName + " ON " + tableName;
+    return "IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('" + tableName + "','U') AND name = '"
+        + maxConstraintName(indexName) + "') drop index " + maxConstraintName(indexName) + " ON " + tableName;
   }
   /**
    * MsSqlServer specific null handling on unique constraints.
@@ -102,7 +103,7 @@ public class SqlServerDdl extends PlatformDdl {
   @Override
   public String alterTableDropUniqueConstraint(String tableName, String uniqueConstraintName) {
     StringBuilder sb = new StringBuilder();
-    sb.append("IF (OBJECT_ID('").append(uniqueConstraintName).append("', 'UQ') IS NOT NULL) ");
+    sb.append("IF (OBJECT_ID('").append(maxConstraintName(uniqueConstraintName)).append("', 'UQ') IS NOT NULL) ");
     sb.append(super.alterTableDropUniqueConstraint(tableName, uniqueConstraintName)).append(";\n");
     sb.append(dropIndex(uniqueConstraintName, tableName));
     return sb.toString();
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
index 2ed9f31ab..96e7aebd1 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
@@ -53,8 +53,8 @@ create table migtest_e_basic (
   constraint ck_migtest_e_basic_status check ( status in ('N','A','I')),
   constraint pk_migtest_e_basic primary key (id)
 );
--- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique  (indextest2);
--- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique  (indextest6);
+-- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__b_4aybzy unique  (indextest2);
+-- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__b_4ayc02 unique  (indextest6);
 
 create table migtest_e_history (
   id                            integer generated by default as identity not null,
@@ -79,14 +79,14 @@ create table migtest_e_softdelete (
   constraint pk_migtest_e_softdelete primary key (id)
 );
 
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
-alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
-create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
+create index ix_mgtst__b_eu8csq on migtest_e_basic (indextest1);
+create index ix_mgtst__b_eu8csu on migtest_e_basic (indextest5);
+alter table migtest_fk_cascade add constraint fk_mgtst_fk_65kf6l foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
+create index ix_mgtst_fk_mok1xj on migtest_fk_cascade (one_id);
 
-alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null;
-create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
+alter table migtest_fk_set_null add constraint fk_mgtst_fk_wicx8x foreign key (one_id) references migtest_fk_one (id) on delete set null;
+create index ix_mgtst_fk_c4p3mv on migtest_fk_set_null (one_id);
 
-alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict;
-create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
+alter table migtest_e_basic add constraint fk_mgtst__bsc_rf_d foreign key (eref_id) references migtest_e_ref (id) on delete restrict;
+create index ix_mgtst__bsc_rf_d on migtest_e_basic (eref_id);
 
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.1.sql b/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
index 2304caa0c..b9e748e6d 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
@@ -5,28 +5,28 @@ create table migtest_e_user (
   constraint pk_migtest_e_user primary key (id)
 );
 
-alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
-alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete restrict;
-alter table migtest_fk_none add constraint fk_migtest_fk_none_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict;
-alter table migtest_fk_none_via_join add constraint fk_migtest_fk_none_via_join_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict;
-alter table migtest_fk_set_null drop constraint fk_migtest_fk_set_null_one_id;
-alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict;
+alter table migtest_fk_cascade drop constraint fk_mgtst_fk_65kf6l;
+alter table migtest_fk_cascade add constraint fk_mgtst_fk_65kf6l foreign key (one_id) references migtest_fk_cascade_one (id) on delete restrict;
+alter table migtest_fk_none add constraint fk_mgtst_fk_nn_n_d foreign key (one_id) references migtest_fk_one (id) on delete restrict;
+alter table migtest_fk_none_via_join add constraint fk_mgtst_fk_9tknzj foreign key (one_id) references migtest_fk_one (id) on delete restrict;
+alter table migtest_fk_set_null drop constraint fk_mgtst_fk_wicx8x;
+alter table migtest_fk_set_null add constraint fk_mgtst_fk_wicx8x foreign key (one_id) references migtest_fk_one (id) on delete restrict;
 
 update migtest_e_basic set status = 'A' where status is null;
-alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
+alter table migtest_e_basic drop constraint ck_mgtst__bsc_stts;
 alter table migtest_e_basic alter column status set default 'A';
 alter table migtest_e_basic alter column status set not null;
-alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
+alter table migtest_e_basic add constraint ck_mgtst__bsc_stts check ( status in ('N','A','I','?'));
 
 -- rename all collisions;
--- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_description unique  (description);
+-- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__b_vs45xo unique  (description);
 
 update migtest_e_basic set some_date = '2000-01-01T00:00:00' where some_date is null;
 alter table migtest_e_basic alter column some_date set default '2000-01-01T00:00:00';
 alter table migtest_e_basic alter column some_date set not null;
 
 insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
-alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict;
+alter table migtest_e_basic add constraint fk_mgtst__bsc_sr_d foreign key (user_id) references migtest_e_user (id) on delete restrict;
 alter table migtest_e_basic alter column user_id set null;
 alter table migtest_e_basic add column new_string_field varchar(255) default 'foo''bar' not null;
 alter table migtest_e_basic add column new_boolean_field boolean default true not null;
@@ -34,14 +34,14 @@ update migtest_e_basic set new_boolean_field = old_boolean;
 
 alter table migtest_e_basic add column new_boolean_field2 boolean default true not null;
 alter table migtest_e_basic add column progress integer default 0 not null;
-alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2));
+alter table migtest_e_basic add constraint ck_mgtst__b_l39g41 check ( progress in (0,1,2));
 alter table migtest_e_basic add column new_integer integer default 42 not null;
 
-alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
-alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
--- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_name unique  (name);
--- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique  (indextest4);
--- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
+alter table migtest_e_basic drop constraint uq_mgtst__b_4aybzy;
+alter table migtest_e_basic drop constraint uq_mgtst__b_4ayc02;
+-- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__bsc_nm unique  (name);
+-- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__b_4ayc00 unique  (indextest4);
+-- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__b_4ayc01 unique  (indextest5);
 comment on column migtest_e_history.test_string is 'Column altered to long now';
 alter table migtest_e_history alter column test_string bigint;
 comment on table migtest_e_history is 'We have history now';
@@ -56,7 +56,7 @@ alter table migtest_e_history2_history add column test_string3 varchar(255);
 
 alter table migtest_e_softdelete add column deleted boolean default false not null;
 
-create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
-create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
-drop index ix_migtest_e_basic_indextest1;
-drop index ix_migtest_e_basic_indextest5;
+create index ix_mgtst__b_eu8css on migtest_e_basic (indextest3);
+create index ix_mgtst__b_eu8csv on migtest_e_basic (indextest6);
+drop index ix_mgtst__b_eu8csq;
+drop index ix_mgtst__b_eu8csu;
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.3.sql b/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
index e99cc4048..17a7ba123 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
@@ -5,41 +5,41 @@ create table migtest_e_ref (
   constraint pk_migtest_e_ref primary key (id)
 );
 
-alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
-alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
-alter table migtest_fk_none drop constraint fk_migtest_fk_none_one_id;
-alter table migtest_fk_none_via_join drop constraint fk_migtest_fk_none_via_join_one_id;
-alter table migtest_fk_set_null drop constraint fk_migtest_fk_set_null_one_id;
-alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null;
-alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
+alter table migtest_fk_cascade drop constraint fk_mgtst_fk_65kf6l;
+alter table migtest_fk_cascade add constraint fk_mgtst_fk_65kf6l foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
+alter table migtest_fk_none drop constraint fk_mgtst_fk_nn_n_d;
+alter table migtest_fk_none_via_join drop constraint fk_mgtst_fk_9tknzj;
+alter table migtest_fk_set_null drop constraint fk_mgtst_fk_wicx8x;
+alter table migtest_fk_set_null add constraint fk_mgtst_fk_wicx8x foreign key (one_id) references migtest_fk_one (id) on delete set null;
+alter table migtest_e_basic drop constraint ck_mgtst__bsc_stts;
 alter table migtest_e_basic alter column status drop default;
 alter table migtest_e_basic alter column status set null;
-alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I'));
-alter table migtest_e_basic drop constraint uq_migtest_e_basic_description;
+alter table migtest_e_basic add constraint ck_mgtst__bsc_stts check ( status in ('N','A','I'));
+alter table migtest_e_basic drop constraint uq_mgtst__b_vs45xo;
 alter table migtest_e_basic alter column some_date drop default;
 alter table migtest_e_basic alter column some_date set null;
 
 update migtest_e_basic set user_id = 23 where user_id is null;
-alter table migtest_e_basic drop constraint fk_migtest_e_basic_user_id;
+alter table migtest_e_basic drop constraint fk_mgtst__bsc_sr_d;
 alter table migtest_e_basic alter column user_id set default 23;
 alter table migtest_e_basic alter column user_id set not null;
 alter table migtest_e_basic add column old_boolean boolean default false not null;
 alter table migtest_e_basic add column old_boolean2 boolean;
 alter table migtest_e_basic add column eref_id integer;
 
-alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
-alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
-alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
--- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique  (indextest2);
--- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique  (indextest6);
+alter table migtest_e_basic drop constraint uq_mgtst__bsc_nm;
+alter table migtest_e_basic drop constraint uq_mgtst__b_4ayc00;
+alter table migtest_e_basic drop constraint uq_mgtst__b_4ayc01;
+-- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__b_4aybzy unique  (indextest2);
+-- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__b_4ayc02 unique  (indextest6);
 comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
 alter table migtest_e_history2 alter column test_string drop default;
 alter table migtest_e_history2 alter column test_string set null;
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
-drop index ix_migtest_e_basic_indextest3;
-drop index ix_migtest_e_basic_indextest6;
-alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict;
-create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
+create index ix_mgtst__b_eu8csq on migtest_e_basic (indextest1);
+create index ix_mgtst__b_eu8csu on migtest_e_basic (indextest5);
+drop index ix_mgtst__b_eu8css;
+drop index ix_mgtst__b_eu8csv;
+alter table migtest_e_basic add constraint fk_mgtst__bsc_rf_d foreign key (eref_id) references migtest_e_ref (id) on delete restrict;
+create index ix_mgtst__bsc_rf_d on migtest_e_basic (eref_id);
 
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
index 6f280989f..ba1870ec5 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
@@ -9,7 +9,7 @@ create sequence migtest_e_user_seq;
 alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id);
 alter table migtest_fk_none add constraint fk_migtest_fk_none_one_id foreign key (one_id) references migtest_fk_one (id);
-alter table migtest_fk_none_via_join add constraint fk_migtest_fk_none_via_join_one_id foreign key (one_id) references migtest_fk_one (id);
+alter table migtest_fk_none_via_join add constraint fk_mgtst_fk_nn_v_jn_n_d foreign key (one_id) references migtest_fk_one (id);
 alter table migtest_fk_set_null drop constraint fk_migtest_fk_set_null_one_id;
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id);
 
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
index f5cc85a85..fc8570f4d 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
@@ -9,7 +9,7 @@ create sequence migtest_e_ref_seq;
 alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
 alter table migtest_fk_none drop constraint fk_migtest_fk_none_one_id;
-alter table migtest_fk_none_via_join drop constraint fk_migtest_fk_none_via_join_one_id;
+alter table migtest_fk_none_via_join drop constraint fk_mgtst_fk_nn_v_jn_n_d;
 alter table migtest_fk_set_null drop constraint fk_migtest_fk_set_null_one_id;
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null;
 alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;

From 56a742ad7037e2a985638ea4a6d5510545955ecc Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Fri, 2 Mar 2018 00:09:21 +0100
Subject: [PATCH 0112/1036] NEW: UUID version 1 generator (#1309)

* NEW: Uuid Type 1 generator

* Remove parameter (from other PR)

* FIX: Mac detection

* Have to use nodeId in generation
---
 .gitignore                                    |   1 +
 .../java/io/ebean/config/ServerConfig.java    |  48 +++++
 .../deploy/meta/DeployBeanDescriptor.java     |  22 +-
 .../server/idgen/UuidV1IdGenerator.java       | 197 ++++++++++++++++++
 .../server/idgen/UuidV1RndIdGenerator.java    | 179 ++++++++++++++++
 ...dGenerator.java => UuidV4IdGenerator.java} |   8 +-
 .../server/idgen/TestUuidGenerator.java       | 141 +++++++++++++
 7 files changed, 591 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/idgen/UuidV1IdGenerator.java
 create mode 100644 src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java
 rename src/main/java/io/ebeaninternal/server/idgen/{UuidIdGenerator.java => UuidV4IdGenerator.java} (68%)
 create mode 100644 src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java

diff --git a/.gitignore b/.gitignore
index 0d96b2f95..1b88dd830 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ profiling/
 *.ipr
 *.iws
 .idea/
+*uuid.state
\ No newline at end of file
diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 69a771ef3..0b42551b1 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -372,6 +372,16 @@ public class ServerConfig {
    */
   private DbTypeConfig dbTypeConfig = new DbTypeConfig();
 
+  /**
+   * The UUID version to use.
+   */
+  private UuidVersion uuidVersion = UuidVersion.VERSION4;
+
+  /**
+   * The UUID state file (for Version 1 UUIDs).
+   */
+  private String uuidStateFile = "ebean-uuid.state";
+
   private List<IdGenerator> idGenerators = new ArrayList<>();
   private List<BeanFindController> findControllers = new ArrayList<>();
   private List<BeanPersistController> persistControllers = new ArrayList<>();
@@ -1891,6 +1901,34 @@ public class ServerConfig {
     this.dbTypeConfig.setDbUuid(dbUuid);
   }
 
+  /**
+   * Returns the UUID version mode.
+   */
+  public UuidVersion getUuidVersion() {
+    return uuidVersion;
+  }
+
+  /**
+   * Sets the UUID version mode.
+   */
+  public void setUuidVersion(UuidVersion uuidVersion) {
+    this.uuidVersion = uuidVersion;
+  }
+
+  /**
+   * Return the UUID state file.
+   */
+  public String getUuidStateFile() {
+    return uuidStateFile;
+  }
+
+  /**
+   * Set the UUID state file.
+   */
+  public void setUuidStateFile(String uuidStateFile) {
+    this.uuidStateFile = uuidStateFile;
+  }
+
   /**
    * Return true if LocalTime should be persisted with nanos precision.
    */
@@ -2816,6 +2854,10 @@ public class ServerConfig {
     if (p.getBoolean("uuidStoreAsBinary", false)) {
       dbTypeConfig.setDbUuid(DbUuid.BINARY);
     }
+
+    uuidVersion = p.getEnum(UuidVersion.class, "uuidVersion", uuidVersion);
+    uuidStateFile = p.get("uuidStateFile", uuidStateFile);
+
     localTimeWithNanos = p.getBoolean("localTimeWithNanos", localTimeWithNanos);
     jodaLocalTimeMode = p.get("jodaLocalTimeMode", jodaLocalTimeMode);
 
@@ -3101,4 +3143,10 @@ public class ServerConfig {
       return binaryOptimized;
     }
   }
+
+  public enum UuidVersion {
+    VERSION4,
+    VERSION1,
+    VERSION1RND
+  };
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index 83416486a..cfd837967 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -29,7 +29,9 @@ import io.ebeaninternal.server.deploy.IndexDefinition;
 import io.ebeaninternal.server.deploy.InheritInfo;
 import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.deploy.parse.DeployBeanInfo;
-import io.ebeaninternal.server.idgen.UuidIdGenerator;
+import io.ebeaninternal.server.idgen.UuidV1IdGenerator;
+import io.ebeaninternal.server.idgen.UuidV1RndIdGenerator;
+import io.ebeaninternal.server.idgen.UuidV4IdGenerator;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
 
 import javax.persistence.Entity;
@@ -844,8 +846,22 @@ public class DeployBeanDescriptor<T> {
    */
   public void setUuidGenerator() {
     this.idType = IdType.EXTERNAL;
-    this.idGeneratorName = UuidIdGenerator.AUTO_UUID;
-    this.idGenerator = UuidIdGenerator.INSTANCE;
+    this.idGeneratorName = PlatformIdGenerator.AUTO_UUID;
+
+    switch (serverConfig.getUuidVersion()) {
+    case VERSION1:
+      this.idGenerator = UuidV1IdGenerator.getInstance(serverConfig.getUuidStateFile());
+      break;
+
+    case VERSION1RND:
+      this.idGenerator = UuidV1RndIdGenerator.INSTANCE;
+      break;
+
+    case VERSION4:
+    default:
+      this.idGenerator = UuidV4IdGenerator.INSTANCE;
+      break;
+    }
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/idgen/UuidV1IdGenerator.java b/src/main/java/io/ebeaninternal/server/idgen/UuidV1IdGenerator.java
new file mode 100644
index 000000000..0202ab816
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/idgen/UuidV1IdGenerator.java
@@ -0,0 +1,197 @@
+package io.ebeaninternal.server.idgen;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.Map;
+import java.util.Properties;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * IdGenerator for java util UUID.
+ *
+ * It extends the UuidV1RndIdGenerator so that it can generate rfc4122 compliant Type 1 UUIDs.
+ *
+ * This generator produces real Type 1 UUIDs (best for sqlserver) - You should use this generator only,
+ * if you can guarantee, that mac addess is uniqe.
+ */
+public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
+
+  private static final Logger logger = LoggerFactory.getLogger("io.ebean.IDGEN");
+
+  private final File stateFile;
+
+  private byte[] nodeId = null;
+
+  private boolean canSaveState = true;
+
+  private static final Map<File, UuidV1IdGenerator> INSTANCES = new ConcurrentHashMap<>();
+
+  /**
+   * Returns an instance for given file.
+   */
+  public static UuidV1IdGenerator getInstance(String file) {
+    return INSTANCES.computeIfAbsent(new File(file), UuidV1IdGenerator::new);
+  }
+
+  /**
+   * Returns an instance for given file.
+   */
+  public static UuidV1IdGenerator getInstance(File file) {
+    return INSTANCES.computeIfAbsent(file, UuidV1IdGenerator::new);
+  }
+
+  /**
+   * Returns an alternative node id - set with the 'ebean.uuid.nodeId' system property.
+   */
+  private static byte[] getAlternativeNodeId() {
+    try {
+      String altNodeId = System.getProperty("ebean.uuid.nodeId");
+      if (altNodeId != null) {
+        String[] components = altNodeId.split("-");
+        if (components.length != 5) {
+          throw new IllegalArgumentException("Invalid nodeId string: " + altNodeId);
+        }
+        byte[] nodeId = new byte[6];
+        for (int i=0; i<5; i++) {
+          nodeId[i] = Byte.decode("0x"+components[i]).byteValue();
+        }
+        return nodeId;
+      }
+    } catch (SecurityException se) {
+      // ignore
+    }
+    return null;
+  }
+
+  /**
+   * Find hardware ID.
+   */
+  private static byte[] getHardwareId() throws SocketException {
+    final Enumeration<NetworkInterface> e = NetworkInterface.getNetworkInterfaces();
+    while (e.hasMoreElements()) {
+      NetworkInterface network = e.nextElement();
+      if (!network.isLoopback()) {
+        return network.getHardwareAddress();
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Creates a new instance of UuidGenerator. Note that there should not be more
+   * than one instance per stateFile.
+   */
+  private UuidV1IdGenerator(final File stateFile) {
+    super();
+    this.stateFile = stateFile;
+    try {
+      // See, if there is an alternative MAC address set.
+      nodeId = getAlternativeNodeId();
+      if (nodeId != null) {
+        logger.info("Using alternative MAC {} to generate Type 1 UUIDs", getNodeIdentifier());
+      } else {
+        nodeId = getHardwareId();
+        logger.info("Using MAC {} to generate Type 1 UUIDs", getNodeIdentifier());
+      }
+      if (nodeId == null) {
+        canSaveState = false;
+        // RFC 4.5 use random portion for node
+        nodeId = super.getNodeIdBytes();
+        logger.error("Have to fall back to random node identifier {} (Reason: No suitable network interface found)", getNodeIdentifier());
+
+      } else {
+        boolean flag = restoreState();
+        UUID uuid = nextId(null);
+        long ts = timeStamp.get();
+        ts -= UUID_EPOCH_OFFSET;
+        ts /= MILLIS_TO_UUID;
+
+        saveState();
+        logger.debug("RestoreState: {}, ClockSeq {}, Timestamp {}, uuid {}, stateFile: {})", flag, clockSeq.get(),
+            new Date(ts), uuid, stateFile);
+      }
+    } catch (IOException e) {
+      canSaveState = false;
+      // RFC 4.5 use random portion for node
+      nodeId = super.getNodeIdBytes();
+      logger.error("Have to fall back to random node identifier {} (Reason: {} )", getNodeIdentifier(), e.getMessage());
+    }
+  }
+
+  /**
+   * Returns the Node-identifier (=MAC address) as string
+   */
+  public String getNodeIdentifier() {
+    if (nodeId == null) {
+      return "none";
+    }
+    StringBuilder sb = new StringBuilder();
+    for (int i = 0; i < nodeId.length; i++) {
+      sb.append(String.format("%02X%s", nodeId[i], (i < nodeId.length - 1) ? "-" : ""));
+    }
+    return sb.toString();
+  }
+
+  /**
+   * Restores the state from the state file.
+   */
+  private boolean restoreState() throws IOException {
+    Properties prop = new Properties();
+    if (stateFile.exists()) {
+      try (InputStream is = new FileInputStream(stateFile)) {
+        prop.load(is);
+      }
+    }
+    if (getNodeIdentifier().equals(prop.getProperty("nodeId"))) {
+      try {
+        Integer seq = Integer.valueOf(prop.getProperty("clockSeq")) & 0x3FFF;
+        Long ts = Long.valueOf(prop.getProperty("timeStamp"));
+        clockSeq.set(seq);
+        timeStamp.set(ts);
+        logger.debug("Restored state from '{}'", stateFile);
+        return true;
+      } catch (NumberFormatException nfe) {
+        // nop
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Saves the state to the state file;
+   */
+  @Override
+  protected void saveState() {
+    if (!canSaveState) {
+      return;
+    }
+    Properties prop = new Properties();
+    prop.setProperty("nodeId", getNodeIdentifier());
+    prop.setProperty("clockSeq", String.valueOf(clockSeq.get()));
+    prop.setProperty("timeStamp", String.valueOf(timeStamp.get()));
+    try (OutputStream os = new FileOutputStream(stateFile)) {
+      prop.store(os, "ebean uuid state file");
+      logger.debug("Persisted state to '{}'", stateFile);
+    } catch (IOException e) {
+      logger.error("Could not persist uuid state to '{}'", stateFile, e);
+    }
+  }
+
+  @Override
+  protected byte[] getNodeIdBytes() {
+    return nodeId;
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java b/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java
new file mode 100644
index 000000000..4db84223d
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java
@@ -0,0 +1,179 @@
+package io.ebeaninternal.server.idgen;
+
+import io.ebean.Transaction;
+import io.ebean.config.dbplatform.PlatformIdGenerator;
+
+import java.security.SecureRandom;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * IdGenerator for (pseudo) type 1 UUIDs.
+ *
+ * This implementation generates a type 1 UUID according to
+ * https://tools.ietf.org/html/rfc4122.html#section-4.2
+ * but has no persistence storage. It generates a new random 47 bit node ID with every
+ * UUID.
+ *
+ * Use this, if you want randomness in your UUIDs but want to take advantage of index
+ * optimizations of the database. It may be good with AUTO_BINARY_OPTIMIZED and MySql.
+ *
+ * See: https://www.percona.com/blog/2014/12/19/store-uuid-optimized-way/
+ */
+public class UuidV1RndIdGenerator implements PlatformIdGenerator {
+
+  protected static final Logger logger = LoggerFactory.getLogger("io.ebean.IDGEN");
+
+  // UUID epoch 1582-10-15 00:00:00 and the Unix epoch 1970-01-01 00:00:00.
+  protected static final long UUID_EPOCH_OFFSET = 0x01B21DD213814000L;
+
+  // the resolution is 100ns
+  protected static final long MILLIS_TO_UUID = 10000;
+
+  public static final UuidV1RndIdGenerator INSTANCE = new UuidV1RndIdGenerator();
+
+  protected final AtomicInteger clockSeq = new AtomicInteger((int) (Math.random() * 0x3FFF));
+
+  private final SecureRandom numberGenerator = new SecureRandom();
+
+  protected AtomicLong timeStamp = new AtomicLong(currentUuidTime());
+
+  private AtomicLong nanoToMilliOffset = new AtomicLong(currentUuidTime());
+
+
+  /**
+   * Returns the uuid epoch.
+   *
+   * This is the number of 100ns intervals since 1582-10-15 00:00:00
+   */
+  private static long currentUuidTime() {
+    return (System.currentTimeMillis() * MILLIS_TO_UUID) + UUID_EPOCH_OFFSET;
+  }
+
+  public UuidV1RndIdGenerator() {
+    computeNanoOffset();
+  }
+
+  /**
+   * Computes the internal offset between System.nanoTime() and System.currentTimeMillis().
+   */
+  protected void computeNanoOffset() {
+    long currentTime = currentUuidTime();
+    long fromNanos = System.nanoTime() / 100L + nanoToMilliOffset.get();
+    long offset =  currentTime - fromNanos;
+    if (Math.abs(offset) > MILLIS_TO_UUID * 1000  ) {
+      nanoToMilliOffset.addAndGet(offset);
+    }
+  }
+
+  /**
+   * Method to overwrite to save the state in a non volatile place.
+   */
+  protected void saveState() {
+
+  }
+
+  /**
+   * returns a random 47 bit value according to https://tools.ietf.org/html/rfc4122.html#section-4.5
+   */
+  protected byte[] getNodeIdBytes() {
+    byte[] idBytes = new byte[6];
+    numberGenerator.nextBytes(idBytes);
+    idBytes[0] |= 0x01; // set multicast bit.
+    return idBytes;
+  }
+
+  /**
+   * Return UUID from UUID.randomUUID();
+   */
+  @Override
+  public UUID nextId(Transaction t) {
+    long current = System.nanoTime() / 100L + nanoToMilliOffset.get();
+
+    long delta;
+    int seq;
+    do {
+      seq = clockSeq.get();
+      while (true) {
+        long last = timeStamp.get();
+
+        delta = current - last;
+        if (delta < -10000 * 20000) {
+          logger.info("Clock skew of {} ms detected", delta / -10000);
+          // The clock was adjusted back about 2 seconds, or we were generating a lot of ids too fast
+          // if so, we try to set the current as last and also increment the clockSeq.
+          synchronized (this) {
+            if (clockSeq.compareAndSet(seq, seq + 1)) {
+              timeStamp.set(current);
+              saveState();
+              computeNanoOffset();
+            } else {
+              continue;
+            }
+          }
+        }
+        // If current is in the future (most of the cases) try to set it.
+        if (delta > 0 && timeStamp.compareAndSet(last, current)) {
+          break;
+        } else if (timeStamp.compareAndSet(last, last + 1)) {
+          // here we go, if we pull IDs too fast.
+          current = last + 1;
+          break;
+        }
+      }
+      // verify, if this timestamp is for this clock sequence
+    } while (seq != clockSeq.get());
+
+    // save state every 60 seconds
+    if (delta > 60000 * 10000) {
+      saveState();
+      computeNanoOffset();
+    }
+
+    long msb = current << 32; // time low
+    msb |= (current & 0xFFFF00000000L) >> 16; // time mid
+    msb |= 0x1000 | ((current >> 48) & 0x0FFF); // time hi and version 1
+
+    byte[] idBytes = getNodeIdBytes();
+
+    long lsb = 0;
+    for (int i = 0; i < 6; i++) {
+      lsb = (lsb << 8) | (idBytes[i] & 0xff);
+    }
+
+    // RFC 4.1.1. Variant: is set with bits 10xx
+    seq = seq & 0x3FFF | 0x8000;
+    lsb |= (long) seq << 48;
+
+    return new UUID(msb, lsb);
+  }
+
+  /**
+   * Returns "uuid".
+   */
+  @Override
+  public String getName() {
+    return "uuid";
+  }
+
+  /**
+   * Returns false.
+   */
+  @Override
+  public boolean isDbSequence() {
+    return false;
+  }
+
+  /**
+   * Ignored for UUID as not required as a performance optimisation.
+   */
+  @Override
+  public void preAllocateIds(int allocateSize) {
+    // ignored
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/idgen/UuidIdGenerator.java b/src/main/java/io/ebeaninternal/server/idgen/UuidV4IdGenerator.java
similarity index 68%
rename from src/main/java/io/ebeaninternal/server/idgen/UuidIdGenerator.java
rename to src/main/java/io/ebeaninternal/server/idgen/UuidV4IdGenerator.java
index 06a0f8edc..c7d1d8093 100644
--- a/src/main/java/io/ebeaninternal/server/idgen/UuidIdGenerator.java
+++ b/src/main/java/io/ebeaninternal/server/idgen/UuidV4IdGenerator.java
@@ -7,10 +7,14 @@ import java.util.UUID;
 
 /**
  * IdGenerator for java util UUID.
+ *
+ * This generator generates a 60bit random UUID according to
+ * https://tools.ietf.org/html/rfc4122.html#section-4.4
+ * Use this generator if you want truly random UUIDs
  */
-public class UuidIdGenerator implements PlatformIdGenerator {
+public class UuidV4IdGenerator implements PlatformIdGenerator {
 
-  public static final UuidIdGenerator INSTANCE = new UuidIdGenerator();
+  public static final UuidV4IdGenerator INSTANCE = new UuidV4IdGenerator();
 
   /**
    * Return UUID from UUID.randomUUID();
diff --git a/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java b/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java
new file mode 100644
index 000000000..0f27c5a89
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java
@@ -0,0 +1,141 @@
+/*
+ * Licensed Materials - Property of FOCONIS AG
+ * (C) Copyright FOCONIS AG.
+ */
+
+package io.ebeaninternal.server.idgen;
+
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.junit.Test;
+
+import io.ebean.config.dbplatform.PlatformIdGenerator;
+
+
+/**
+ * Run some simple tests for the UUID generator.
+ *
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+public class TestUuidGenerator {
+
+
+/**
+ * Worker to generate UUIDs
+ *
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+  public static class IdTest implements Runnable {
+    private  final Map<UUID, UUID> map;
+    private final PlatformIdGenerator idGen;
+    private final int ids;
+    private final AtomicBoolean failFlag;
+
+    public IdTest(PlatformIdGenerator idGen, int ids, Map<UUID, UUID> map, AtomicBoolean failFlag) {
+      this.idGen = idGen;
+      this.ids = ids;
+      this.map = map;
+      this.failFlag = failFlag;
+    }
+
+    public IdTest(PlatformIdGenerator idGen, int ids) {
+      this.idGen = idGen;
+      this.ids = ids;
+      this.map = null;
+      this.failFlag = null;
+    }
+    @Override
+    public void run() {
+      //System.out.println("Start " + Thread.currentThread());
+      for (int i = 0; i < ids; i++) {
+        UUID uuid = (UUID) idGen.nextId(null);
+        if (map != null && map.put(uuid, uuid) != null) {
+          System.err.println("UUID already in set " + uuid);
+          failFlag.set(true);
+        }
+      }
+    }
+  }
+
+  /**
+   * Test takes ~0.3 sec
+   */
+  @Test
+  public void testUuidV1SingleThread() throws Exception {
+    testGenerator(1, 1_000_000, UuidV1IdGenerator.getInstance("ebean-test-uuid.state"));
+  }
+
+  /**
+   * Test takes ~1.4 sec
+   */
+  @Test
+  public void testUuidV1MultiThread() throws Exception {
+    testGenerator(10, 100_000, UuidV1IdGenerator.getInstance("ebean-test-uuid.state"));
+  }
+
+  /**
+   * Test takes ~3.1 sec
+   */
+  @Test
+  public void testUuidV1RndMultiThread() throws Exception {
+    testGenerator(10, 100_000, UuidV1RndIdGenerator.INSTANCE);
+  }
+
+  /**
+   * Test takes ~2.0 sec
+   */
+  @Test
+  public void testUuidType1RndSingleThread() throws Exception {
+    testGenerator(1, 1_000_000, UuidV1RndIdGenerator.INSTANCE);
+  }
+
+  /**
+   * Test takes ~4.9 sec
+   */
+  @Test
+  public void testUuidType4MultiThread() throws Exception {
+    testGenerator(10, 100_000, UuidV4IdGenerator.INSTANCE);
+  }
+
+  /**
+   * Test takes ~3.1 sec
+   */
+  @Test
+  public void testUuidType4SingleThread() throws Exception {
+    testGenerator(1, 1_000_000, UuidV4IdGenerator.INSTANCE);
+  }
+
+
+
+
+  private void testGenerator(int threadCount, int count, PlatformIdGenerator generator) throws Exception {
+    System.out.println("Printing 5 consecutive IDs of " + generator);
+    for (int i = 0; i < 5; i++) {
+      System.out.println(generator.nextId(null));
+    }
+
+    AtomicBoolean failFlag = new AtomicBoolean();
+    ConcurrentHashMap<UUID, UUID> map = new ConcurrentHashMap<>();
+    Thread[] threads = new Thread[threadCount];
+    for (int i = 0; i < threads.length; i++) {
+      threads[i] = new Thread(new IdTest(generator, count, map, failFlag));
+    }
+    for (int i = 0; i < threads.length; i++) {
+      threads[i].start();
+    }
+    for (int i = 0; i < threads.length; i++) {
+      threads[i].join();
+    }
+    assertThat(failFlag.get()).isFalse();
+    assertThat(map.size()).isEqualTo(threadCount * count);
+
+  }
+}

From 78628ffad0b9c021c46ca8feb6b1d0ee284a47c6 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Fri, 2 Mar 2018 00:12:34 +0100
Subject: [PATCH 0113/1036] NEW: DB-with-Master option (#1311)

---
 .../java/io/ebean/config/ServerConfig.java    | 16 +++++++++++
 src/main/java/io/ebean/config/TenantMode.java | 28 +++++++++++++++----
 .../dbmigration/DdlGenerator.java             |  2 +-
 .../server/core/InternalConfiguration.java    |  1 +
 4 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 0b42551b1..679692b88 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -2878,6 +2878,22 @@ public class ServerConfig {
     ddlInitSql = p.get("ddl.initSql", ddlInitSql);
     ddlSeedSql = p.get("ddl.seedSql", ddlSeedSql);
 
+    // read tenant-configuration from config:
+    // tenant.mode = NONE | DB | SCHEMA | CATALOG | PARTITION
+    String mode = p.get("tenant.mode");
+    if (mode != null) {
+      for (TenantMode value : TenantMode.values()) {
+        if (value.name().equalsIgnoreCase(mode)) {
+          tenantMode = value;
+          break;
+        }
+      }
+    }
+
+    currentTenantProvider = createInstance(p, CurrentTenantProvider.class, "tenant.currentTenantProvider", currentTenantProvider);
+    tenantCatalogProvider = createInstance(p, TenantCatalogProvider.class, "tenant.catalogProvider", tenantCatalogProvider);
+    tenantSchemaProvider = createInstance(p, TenantSchemaProvider.class, "tenant.schemaProvider", tenantSchemaProvider);
+    tenantPartitionColumn = p.get("tenant.partitionColumn", tenantPartitionColumn);
     classes = getClasses(p);
   }
 
diff --git a/src/main/java/io/ebean/config/TenantMode.java b/src/main/java/io/ebean/config/TenantMode.java
index 1205fca58..2f659704a 100644
--- a/src/main/java/io/ebean/config/TenantMode.java
+++ b/src/main/java/io/ebean/config/TenantMode.java
@@ -8,32 +8,40 @@ public enum TenantMode {
   /**
    * No multi-tenancy.
    */
-  NONE(false),
+  NONE(false, true),
 
   /**
    * Each Tenant has their own Database (javax.sql.DataSource)
    */
-  DB(true),
+  DB(true, false),
 
   /**
    * Each Tenant has their own Database schema.
    */
-  SCHEMA(true),
+  SCHEMA(true, false),
 
   /**
    * Each Tenant has their own Database but with in connection pool
    */
-  CATALOG(true),
+  CATALOG(true, false),
 
   /**
    * Tenants share tables but have a discriminator/partition column that partitions the data.
    */
-  PARTITION(false);
+  PARTITION(false, true),
 
+  /**
+   * Each Tenant has their own Database (javax.sql.DataSource), and there is also one master-database
+   * (that holds configuration e.g.)
+   */
+  DB_WITH_MASTER(true, true);
+  
   boolean dynamicDataSource;
+  boolean ddlEnabled;
 
-  TenantMode(boolean dynamicDataSource) {
+  TenantMode(boolean dynamicDataSource, boolean ddlEnabled) {
     this.dynamicDataSource = dynamicDataSource;
+    this.ddlEnabled = ddlEnabled;
   }
 
   /**
@@ -42,4 +50,12 @@ public enum TenantMode {
   public boolean isDynamicDataSource() {
     return dynamicDataSource;
   }
+  
+  /**
+   * Returns true, if DDL is enabled.
+   */
+  public boolean isDdlEnabled() {
+    return ddlEnabled;
+  }
+ 
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
index 2a54e6f9a..ae1ef4d08 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
@@ -47,7 +47,7 @@ public class DdlGenerator {
     this.jaxbPresent = serverConfig.getClassLoadConfig().isJavaxJAXBPresent();
     this.generateDdl = serverConfig.isDdlGenerate();
     this.createOnly = serverConfig.isDdlCreateOnly();
-    if (serverConfig.getTenantMode().isDynamicDataSource() && serverConfig.isDdlRun()) {
+    if (!serverConfig.getTenantMode().isDdlEnabled() && serverConfig.isDdlRun()) {
       log.warn("DDL can't be run on startup with TenantMode " + serverConfig.getTenantMode());
       this.runDdl = false;
     } else {
diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index 3702d1984..a65dd2194 100644
--- a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -409,6 +409,7 @@ public class InternalConfiguration {
   private DataSourceSupplier dataSource() {
     switch (serverConfig.getTenantMode()) {
       case DB:
+      case DB_WITH_MASTER:
         return new MultiTenantDbSupplier(serverConfig.getCurrentTenantProvider(), serverConfig.getTenantDataSourceProvider());
       case SCHEMA:
         return new MultiTenantDbSchemaSupplier(serverConfig.getCurrentTenantProvider(), serverConfig.getDataSource(), serverConfig.getReadOnlyDataSource(), serverConfig.getTenantSchemaProvider());

From aea7d937ebe15ef9576bd7267c215cbb921ef6c0 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Fri, 2 Mar 2018 00:13:16 +0100
Subject: [PATCH 0114/1036] ENH: added SqlRow factory method to RawSqlService
 (#1312)

* ENH: added SqlRow factory method to RawSqlService

* compile fixes

* ADD: sqlRow factory also to RawSqlBuilder
---
 src/main/java/io/ebean/RawSqlBuilder.java     | 10 ++++++++++
 .../io/ebean/service/SpiRawSqlService.java    |  8 ++++++++
 .../server/rawsql/DRawSqlService.java         | 20 +++++++++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/src/main/java/io/ebean/RawSqlBuilder.java b/src/main/java/io/ebean/RawSqlBuilder.java
index 3d1e4f4ca..44121962c 100644
--- a/src/main/java/io/ebean/RawSqlBuilder.java
+++ b/src/main/java/io/ebean/RawSqlBuilder.java
@@ -1,6 +1,7 @@
 package io.ebean;
 
 import java.sql.ResultSet;
+import java.sql.SQLException;
 
 /**
  * Builds RawSql instances from a SQL string and column mappings.
@@ -24,6 +25,15 @@ public interface RawSqlBuilder {
     return XServiceProvider.rawSql().resultSet(resultSet, propertyNames);
   }
 
+  /**
+   * Create and return a SqlRow based on the resultSet and the dbTrueValue.
+   * @throws SQLException
+   */
+  static SqlRow sqlRow(ResultSet resultSet, final String dbTrueValue) throws SQLException {
+    return XServiceProvider.rawSql().sqlRow(resultSet, dbTrueValue);
+
+  }
+
   /**
    * Return an unparsed RawSqlBuilder. Unlike a parsed one this query can not be
    * modified - so no additional WHERE or HAVING expressions can be added to
diff --git a/src/main/java/io/ebean/service/SpiRawSqlService.java b/src/main/java/io/ebean/service/SpiRawSqlService.java
index aa668486a..4d201fc58 100644
--- a/src/main/java/io/ebean/service/SpiRawSqlService.java
+++ b/src/main/java/io/ebean/service/SpiRawSqlService.java
@@ -2,8 +2,10 @@ package io.ebean.service;
 
 import io.ebean.RawSql;
 import io.ebean.RawSqlBuilder;
+import io.ebean.SqlRow;
 
 import java.sql.ResultSet;
+import java.sql.SQLException;
 
 /**
  * Service provided by Ebean for parsing and column mapping raw SQL queries.
@@ -24,4 +26,10 @@ public interface SpiRawSqlService {
    * Unparsed SQL so explicit column mapping expected.
    */
   RawSqlBuilder unparsed(String sql);
+
+  /**
+   * Create based on a JDBC ResultSet.
+   * @throws SQLException 
+   */
+  SqlRow sqlRow(ResultSet resultSet, String dbTrueValue) throws SQLException;
 }
diff --git a/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java b/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
index fe33d1bbc..27f90a017 100644
--- a/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
+++ b/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
@@ -2,9 +2,13 @@ package io.ebeaninternal.server.rawsql;
 
 import io.ebean.RawSql;
 import io.ebean.RawSqlBuilder;
+import io.ebean.SqlRow;
 import io.ebean.service.SpiRawSqlService;
+import io.ebeaninternal.server.query.DefaultSqlRow;
 
 import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
 
 public class DRawSqlService implements SpiRawSqlService {
 
@@ -28,4 +32,20 @@ public class DRawSqlService implements SpiRawSqlService {
     SpiRawSql.Sql s = new SpiRawSql.Sql(sql);
     return new DRawSqlBuilder(s, new SpiRawSql.ColumnMapping());
   }
+
+  @Override
+  public SqlRow sqlRow(ResultSet resultSet, String dbTrueValue) throws SQLException {
+    ResultSetMetaData meta = resultSet.getMetaData();
+    int estCap = (int) (meta.getColumnCount() / 0.7f) + 1;
+    DefaultSqlRow ret = new DefaultSqlRow(estCap, 0.75f, dbTrueValue);
+
+    for (int i = 1; i <= meta.getColumnCount(); i++) {
+      String name = meta.getColumnLabel(i);
+      if (name == null) {
+        name = meta.getColumnName(i);
+      }
+      ret.put(name, resultSet.getObject(i));
+    }
+    return ret;
+  }
 }

From 83b463040fd8aa9f615923fcc94deee95e951c48 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Fri, 2 Mar 2018 00:14:09 +0100
Subject: [PATCH 0115/1036] ENH: Add sanity check to InExpression (#1313)

---
 .../io/ebeaninternal/server/expression/InExpression.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/expression/InExpression.java b/src/main/java/io/ebeaninternal/server/expression/InExpression.java
index 8c2d5f55d..c1101b9a2 100644
--- a/src/main/java/io/ebeaninternal/server/expression/InExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/InExpression.java
@@ -40,6 +40,7 @@ class InExpression extends AbstractExpression {
   private List<Object> values() {
     List<Object> vals = new ArrayList<>(sourceValues.size());
     for (Object sourceValue : sourceValues) {
+      assert sourceValue != null : "null is not allowed in in-queries";
       NamedParamHelp.valueAdd(vals, sourceValue);
     }
     return vals;
@@ -66,7 +67,11 @@ class InExpression extends AbstractExpression {
 
   @Override
   public void addBindValues(SpiExpressionRequest request) {
-
+    for (Object value : bindValues) {
+      if (value == null) {
+        throw new NullPointerException("null values in 'in(...)' queries must be handled separately!");
+      }
+    }
     ElPropertyValue prop = getElProp(request);
     if (prop != null && !prop.isAssocId()) {
       prop = null;

From 0e1c815826c0d970a0722f12917eb5ed52875af2 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Fri, 2 Mar 2018 00:15:01 +0100
Subject: [PATCH 0116/1036] FIX: DataReader was read twice in exception-path
 (#1314)

---
 .../io/ebeaninternal/server/type/ScalarTypeJsonList.java     | 5 +++--
 .../java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
index c628af5f8..92f12f1cf 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
@@ -70,11 +70,12 @@ public class ScalarTypeJsonList {
 
     @Override
     public List read(DataReader dataReader) throws SQLException {
+      String json = dataReader.getString();
       try {
         // parse JSON into modifyAware list
-        return EJson.parseList(dataReader.getString(), true);
+        return EJson.parseList(json, true);
       } catch (IOException e) {
-        throw new SQLException("Failed to parse JSON content as List: [" + dataReader.getString() + "]", e);
+        throw new SQLException("Failed to parse JSON content as List: [" + json + "]", e);
       }
     }
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
index f2605331f..afe521fe6 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
@@ -73,11 +73,12 @@ public class ScalarTypeJsonSet {
 
     @Override
     public Set read(DataReader dataReader) throws SQLException {
+      String json = dataReader.getString();
       try {
         // parse JSON into modifyAware list
-        return EJson.parseSet(dataReader.getString(), true);
+        return EJson.parseSet(json, true);
       } catch (IOException e) {
-        throw new SQLException("Failed to parse JSON content as List: [" + dataReader.getString() + "]", e);
+        throw new SQLException("Failed to parse JSON content as List: [" + json + "]", e);
       }
     }
 

From b642b3c644cdb65e2e604db93bedcda6cb120a40 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Fri, 2 Mar 2018 00:16:29 +0100
Subject: [PATCH 0117/1036]  FIX: Splitcolumns must return an empty array if
 string was empty  (#1315)

* Add test suite from rpraml

* FIX: Splitcolumns must return an empty array if string was empty

* Just the reference scripts
---
 .../ddlgeneration/platform/SplitColumns.java  |  3 +
 .../java/misc/migration/v1_0/CKeyAssoc.java   | 32 ++++++++
 .../java/misc/migration/v1_0/CKeyDetail.java  | 41 ++++++++++
 .../java/misc/migration/v1_0/CKeyParent.java  | 44 +++++++++++
 .../misc/migration/v1_0/CKeyParentId.java     | 60 ++++++++++++++
 src/test/java/misc/migration/v1_0/ERef.java   |  9 +++
 .../java/misc/migration/v1_0/MtmChild.java    | 34 ++++++++
 .../java/misc/migration/v1_0/MtmMaster.java   | 32 ++++++++
 .../java/misc/migration/v1_0/OtoChild.java    | 32 ++++++++
 .../java/misc/migration/v1_0/OtoMaster.java   | 32 ++++++++
 .../java/misc/migration/v1_1/CKeyAssoc.java   | 32 ++++++++
 .../java/misc/migration/v1_1/CKeyDetail.java  | 57 ++++++++++++++
 .../java/misc/migration/v1_1/CKeyParent.java  | 78 +++++++++++++++++++
 .../misc/migration/v1_1/CKeyParentId.java     | 60 ++++++++++++++
 src/test/java/misc/migration/v1_1/EBasic.java |  1 +
 .../java/misc/migration/v1_1/MtmChild.java    | 45 +++++++++++
 .../java/misc/migration/v1_1/MtmMaster.java   | 46 +++++++++++
 .../java/misc/migration/v1_1/OtoChild.java    | 44 +++++++++++
 .../java/misc/migration/v1_1/OtoMaster.java   | 45 +++++++++++
 .../java/misc/migration/v1_2/CKeyAssoc.java   | 32 ++++++++
 .../java/misc/migration/v1_2/CKeyDetail.java  | 41 ++++++++++
 .../java/misc/migration/v1_2/CKeyParent.java  | 44 +++++++++++
 .../misc/migration/v1_2/CKeyParentId.java     | 60 ++++++++++++++
 src/test/java/misc/migration/v1_2/ERef.java   |  9 +++
 .../java/misc/migration/v1_2/MtmChild.java    | 34 ++++++++
 .../java/misc/migration/v1_2/MtmMaster.java   | 32 ++++++++
 .../java/misc/migration/v1_2/OtoChild.java    | 32 ++++++++
 .../java/misc/migration/v1_2/OtoMaster.java   | 32 ++++++++
 .../migrationtest/db2/1.0__initial.sql        | 46 +++++++++++
 .../dbmigration/migrationtest/db2/1.1.sql     | 38 +++++++++
 .../dbmigration/migrationtest/db2/1.3.sql     |  4 +
 .../migrationtest/db2/1.4__dropsFor_1.3.sql   | 10 +++
 .../migrationtest/h2/1.0__initial.sql         | 46 +++++++++++
 .../dbmigration/migrationtest/h2/1.1.sql      | 38 +++++++++
 .../dbmigration/migrationtest/h2/1.3.sql      |  4 +
 .../migrationtest/h2/1.4__dropsFor_1.3.sql    | 10 +++
 .../migrationtest/hsqldb/1.0__initial.sql     | 46 +++++++++++
 .../dbmigration/migrationtest/hsqldb/1.1.sql  | 38 +++++++++
 .../dbmigration/migrationtest/hsqldb/1.3.sql  |  4 +
 .../hsqldb/1.4__dropsFor_1.3.sql              | 10 +++
 .../model/1.0__initial.model.xml              | 32 ++++++++
 .../migrationtest/model/1.1.model.xml         | 24 ++++++
 .../migrationtest/model/1.3.model.xml         | 10 +++
 .../model/1.4__dropsFor_1.3.model.xml         |  6 ++
 .../migrationtest/mysql/1.0__initial.sql      | 46 +++++++++++
 .../dbmigration/migrationtest/mysql/1.1.sql   | 38 +++++++++
 .../dbmigration/migrationtest/mysql/1.3.sql   |  4 +
 .../migrationtest/mysql/1.4__dropsFor_1.3.sql | 10 +++
 .../migrationtest/oracle/1.0__initial.sql     | 52 +++++++++++++
 .../dbmigration/migrationtest/oracle/1.1.sql  | 38 +++++++++
 .../dbmigration/migrationtest/oracle/1.3.sql  |  4 +
 .../oracle/1.4__dropsFor_1.3.sql              | 10 +++
 .../migrationtest/postgres/1.0__initial.sql   | 46 +++++++++++
 .../migrationtest/postgres/1.1.sql            | 38 +++++++++
 .../migrationtest/postgres/1.3.sql            |  4 +
 .../postgres/1.4__dropsFor_1.3.sql            | 10 +++
 .../migrationtest/sqlite/1.0__initial.sql     | 46 +++++++++++
 .../dbmigration/migrationtest/sqlite/1.1.sql  | 27 +++++++
 .../dbmigration/migrationtest/sqlite/1.3.sql  |  4 +
 .../sqlite/1.4__dropsFor_1.3.sql              | 10 +++
 .../migrationtest/sqlserver/1.0__initial.sql  | 52 +++++++++++++
 .../migrationtest/sqlserver/1.1.sql           | 38 +++++++++
 .../migrationtest/sqlserver/1.3.sql           |  5 ++
 .../sqlserver/1.4__dropsFor_1.3.sql           | 54 +++++++++++++
 64 files changed, 1945 insertions(+)
 create mode 100644 src/test/java/misc/migration/v1_0/CKeyAssoc.java
 create mode 100644 src/test/java/misc/migration/v1_0/CKeyDetail.java
 create mode 100644 src/test/java/misc/migration/v1_0/CKeyParent.java
 create mode 100644 src/test/java/misc/migration/v1_0/CKeyParentId.java
 create mode 100644 src/test/java/misc/migration/v1_0/MtmChild.java
 create mode 100644 src/test/java/misc/migration/v1_0/MtmMaster.java
 create mode 100644 src/test/java/misc/migration/v1_0/OtoChild.java
 create mode 100644 src/test/java/misc/migration/v1_0/OtoMaster.java
 create mode 100644 src/test/java/misc/migration/v1_1/CKeyAssoc.java
 create mode 100644 src/test/java/misc/migration/v1_1/CKeyDetail.java
 create mode 100644 src/test/java/misc/migration/v1_1/CKeyParent.java
 create mode 100644 src/test/java/misc/migration/v1_1/CKeyParentId.java
 create mode 100644 src/test/java/misc/migration/v1_1/MtmChild.java
 create mode 100644 src/test/java/misc/migration/v1_1/MtmMaster.java
 create mode 100644 src/test/java/misc/migration/v1_1/OtoChild.java
 create mode 100644 src/test/java/misc/migration/v1_1/OtoMaster.java
 create mode 100644 src/test/java/misc/migration/v1_2/CKeyAssoc.java
 create mode 100644 src/test/java/misc/migration/v1_2/CKeyDetail.java
 create mode 100644 src/test/java/misc/migration/v1_2/CKeyParent.java
 create mode 100644 src/test/java/misc/migration/v1_2/CKeyParentId.java
 create mode 100644 src/test/java/misc/migration/v1_2/MtmChild.java
 create mode 100644 src/test/java/misc/migration/v1_2/MtmMaster.java
 create mode 100644 src/test/java/misc/migration/v1_2/OtoChild.java
 create mode 100644 src/test/java/misc/migration/v1_2/OtoMaster.java

diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SplitColumns.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SplitColumns.java
index a1c83c4e2..6c906124e 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SplitColumns.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SplitColumns.java
@@ -6,6 +6,9 @@ public class SplitColumns {
    * Return as an array of string column names.
    */
   public static String[] split(String columns) {
+    if (columns == null || columns.isEmpty()) {
+      return new String[0];
+    }
     return columns.split(",");
   }
 
diff --git a/src/test/java/misc/migration/v1_0/CKeyAssoc.java b/src/test/java/misc/migration/v1_0/CKeyAssoc.java
new file mode 100644
index 000000000..75f0c7013
--- /dev/null
+++ b/src/test/java/misc/migration/v1_0/CKeyAssoc.java
@@ -0,0 +1,32 @@
+package misc.migration.v1_0;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_ckey_assoc")
+public class CKeyAssoc {
+
+  @Id
+  Integer id;
+
+  String assocOne;
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public String getAssocOne() {
+    return assocOne;
+  }
+
+  public void setAssocOne(String assocOne) {
+    this.assocOne = assocOne;
+  }
+
+}
diff --git a/src/test/java/misc/migration/v1_0/CKeyDetail.java b/src/test/java/misc/migration/v1_0/CKeyDetail.java
new file mode 100644
index 000000000..2d8c7f956
--- /dev/null
+++ b/src/test/java/misc/migration/v1_0/CKeyDetail.java
@@ -0,0 +1,41 @@
+package misc.migration.v1_0;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_ckey_detail")
+public class CKeyDetail {
+
+  @Id
+  Integer id;
+
+  String something;
+
+
+  public CKeyDetail() {
+
+  }
+
+  public CKeyDetail(String something) {
+    this.something = something;
+  }
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public String getSomething() {
+    return something;
+  }
+
+  public void setSomething(String something) {
+    this.something = something;
+  }
+
+}
diff --git a/src/test/java/misc/migration/v1_0/CKeyParent.java b/src/test/java/misc/migration/v1_0/CKeyParent.java
new file mode 100644
index 000000000..dacf6febe
--- /dev/null
+++ b/src/test/java/misc/migration/v1_0/CKeyParent.java
@@ -0,0 +1,44 @@
+package misc.migration.v1_0;
+
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name = "migtest_ckey_parent")
+public class CKeyParent {
+
+  @EmbeddedId
+  CKeyParentId id;
+
+  String name;
+
+  @Version
+  int version;
+
+  public CKeyParentId getId() {
+    return id;
+  }
+
+  public void setId(CKeyParentId id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public int getVersion() {
+    return version;
+  }
+
+  public void setVersion(int version) {
+    this.version = version;
+  }
+
+}
diff --git a/src/test/java/misc/migration/v1_0/CKeyParentId.java b/src/test/java/misc/migration/v1_0/CKeyParentId.java
new file mode 100644
index 000000000..2413977b5
--- /dev/null
+++ b/src/test/java/misc/migration/v1_0/CKeyParentId.java
@@ -0,0 +1,60 @@
+package misc.migration.v1_0;
+
+import javax.persistence.Embeddable;
+import javax.validation.constraints.Size;
+
+@Embeddable
+public class CKeyParentId {
+
+  @Size(max=127)
+  Integer oneKey;
+
+  @Size(max=127)
+  String twoKey;
+
+  public CKeyParentId() {
+
+  }
+
+  public CKeyParentId(Integer oneKey, String twoKey) {
+    this.oneKey = oneKey;
+    this.twoKey = twoKey;
+  }
+
+  public Integer getOneKey() {
+    return oneKey;
+  }
+
+  public void setOneKey(Integer oneKey) {
+    this.oneKey = oneKey;
+  }
+
+  public String getTwoKey() {
+    return twoKey;
+  }
+
+  public void setTwoKey(String twoKey) {
+    this.twoKey = twoKey;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof CKeyParentId)) {
+      return false;
+    }
+
+    CKeyParentId otherKey = (CKeyParentId) o;
+    return otherKey.hashCode() == hashCode();
+  }
+
+  @Override
+  public int hashCode() {
+    int hc = getClass().getName().hashCode();
+    hc = 31 * hc + oneKey;
+    hc = 31 * hc + twoKey.hashCode();
+    return hc;
+  }
+}
diff --git a/src/test/java/misc/migration/v1_0/ERef.java b/src/test/java/misc/migration/v1_0/ERef.java
index c96f43d03..f4cfdf875 100644
--- a/src/test/java/misc/migration/v1_0/ERef.java
+++ b/src/test/java/misc/migration/v1_0/ERef.java
@@ -6,6 +6,10 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
+import javax.validation.constraints.Size;
+
+import io.ebean.annotation.Index;
+import io.ebean.annotation.NotNull;
 
 @Entity
 @Table(name = "migtest_e_ref")
@@ -16,4 +20,9 @@ public class ERef {
   
   @OneToMany
   List<EBasic> basics;
+
+  @NotNull
+  @Index(unique = true)
+  @Size(max=127)
+  String name;
 }
diff --git a/src/test/java/misc/migration/v1_0/MtmChild.java b/src/test/java/misc/migration/v1_0/MtmChild.java
new file mode 100644
index 000000000..c0f9f5918
--- /dev/null
+++ b/src/test/java/misc/migration/v1_0/MtmChild.java
@@ -0,0 +1,34 @@
+package misc.migration.v1_0;
+
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_mtm_c")
+public class MtmChild {
+
+  @Id
+  Integer id;
+
+  String name;
+
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+}
diff --git a/src/test/java/misc/migration/v1_0/MtmMaster.java b/src/test/java/misc/migration/v1_0/MtmMaster.java
new file mode 100644
index 000000000..87b23387c
--- /dev/null
+++ b/src/test/java/misc/migration/v1_0/MtmMaster.java
@@ -0,0 +1,32 @@
+package misc.migration.v1_0;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_mtm_m")
+public class MtmMaster {
+
+  @Id
+  Long id;
+
+  String name;
+
+  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;
+  }
+
+}
diff --git a/src/test/java/misc/migration/v1_0/OtoChild.java b/src/test/java/misc/migration/v1_0/OtoChild.java
new file mode 100644
index 000000000..fceaf5eca
--- /dev/null
+++ b/src/test/java/misc/migration/v1_0/OtoChild.java
@@ -0,0 +1,32 @@
+package misc.migration.v1_0;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_oto_child")
+public class OtoChild {
+
+  @Id
+  Integer id;
+
+  String name;
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+}
diff --git a/src/test/java/misc/migration/v1_0/OtoMaster.java b/src/test/java/misc/migration/v1_0/OtoMaster.java
new file mode 100644
index 000000000..770c3e754
--- /dev/null
+++ b/src/test/java/misc/migration/v1_0/OtoMaster.java
@@ -0,0 +1,32 @@
+package misc.migration.v1_0;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_oto_master")
+public class OtoMaster {
+
+  @Id
+  Long id;
+
+  String name;
+
+  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;
+  }
+
+}
diff --git a/src/test/java/misc/migration/v1_1/CKeyAssoc.java b/src/test/java/misc/migration/v1_1/CKeyAssoc.java
new file mode 100644
index 000000000..847ddc32c
--- /dev/null
+++ b/src/test/java/misc/migration/v1_1/CKeyAssoc.java
@@ -0,0 +1,32 @@
+package misc.migration.v1_1;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_ckey_assoc")
+public class CKeyAssoc {
+
+  @Id
+  Integer id;
+
+  String assocOne;
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public String getAssocOne() {
+    return assocOne;
+  }
+
+  public void setAssocOne(String assocOne) {
+    this.assocOne = assocOne;
+  }
+
+}
diff --git a/src/test/java/misc/migration/v1_1/CKeyDetail.java b/src/test/java/misc/migration/v1_1/CKeyDetail.java
new file mode 100644
index 000000000..2b8655c0b
--- /dev/null
+++ b/src/test/java/misc/migration/v1_1/CKeyDetail.java
@@ -0,0 +1,57 @@
+package misc.migration.v1_1;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_ckey_detail")
+public class CKeyDetail {
+
+  @Id
+  Integer id;
+
+  String something;
+
+  @ManyToOne
+//	@JoinColumns({
+//			@JoinColumn(name="parent_one_key", referencedColumnName="one_key"),
+//			@JoinColumn(name="parent_two_key", referencedColumnName="two_key")
+//	})
+    CKeyParent parent;
+
+  public CKeyDetail() {
+
+  }
+
+  public CKeyDetail(String something) {
+    this.something = something;
+  }
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public String getSomething() {
+    return something;
+  }
+
+  public void setSomething(String something) {
+    this.something = something;
+  }
+
+  public CKeyParent getParent() {
+    return parent;
+  }
+
+  public void setParent(CKeyParent parent) {
+    this.parent = parent;
+  }
+
+
+}
diff --git a/src/test/java/misc/migration/v1_1/CKeyParent.java b/src/test/java/misc/migration/v1_1/CKeyParent.java
new file mode 100644
index 000000000..e331399ed
--- /dev/null
+++ b/src/test/java/misc/migration/v1_1/CKeyParent.java
@@ -0,0 +1,78 @@
+package misc.migration.v1_1;
+
+import javax.persistence.CascadeType;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.Version;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Table(name = "migtest_ckey_parent")
+public class CKeyParent {
+
+  @EmbeddedId
+  CKeyParentId id;
+
+  String name;
+
+  @Version
+  int version;
+
+  @ManyToOne(cascade = CascadeType.PERSIST)
+  CKeyAssoc assoc;
+
+  @OneToMany(cascade = CascadeType.PERSIST, mappedBy = "parent")
+  List<CKeyDetail> details;
+
+  public CKeyParentId getId() {
+    return id;
+  }
+
+  public void setId(CKeyParentId id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public int getVersion() {
+    return version;
+  }
+
+  public void setVersion(int version) {
+    this.version = version;
+  }
+
+  public CKeyAssoc getAssoc() {
+    return assoc;
+  }
+
+  public void setAssoc(CKeyAssoc assoc) {
+    this.assoc = assoc;
+  }
+
+  public List<CKeyDetail> getDetails() {
+    return details;
+  }
+
+  public void setDetails(List<CKeyDetail> details) {
+    this.details = details;
+  }
+
+  public void add(CKeyDetail detail) {
+    if (details == null) {
+      details = new ArrayList<>();
+    }
+    details.add(detail);
+  }
+
+}
diff --git a/src/test/java/misc/migration/v1_1/CKeyParentId.java b/src/test/java/misc/migration/v1_1/CKeyParentId.java
new file mode 100644
index 000000000..dfc86560d
--- /dev/null
+++ b/src/test/java/misc/migration/v1_1/CKeyParentId.java
@@ -0,0 +1,60 @@
+package misc.migration.v1_1;
+
+import javax.persistence.Embeddable;
+import javax.validation.constraints.Size;
+
+@Embeddable
+public class CKeyParentId {
+
+  @Size(max=127)
+  Integer oneKey;
+
+  @Size(max=127)
+  String twoKey;
+
+  public CKeyParentId() {
+
+  }
+
+  public CKeyParentId(Integer oneKey, String twoKey) {
+    this.oneKey = oneKey;
+    this.twoKey = twoKey;
+  }
+
+  public Integer getOneKey() {
+    return oneKey;
+  }
+
+  public void setOneKey(Integer oneKey) {
+    this.oneKey = oneKey;
+  }
+
+  public String getTwoKey() {
+    return twoKey;
+  }
+
+  public void setTwoKey(String twoKey) {
+    this.twoKey = twoKey;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof CKeyParentId)) {
+      return false;
+    }
+
+    CKeyParentId otherKey = (CKeyParentId) o;
+    return otherKey.hashCode() == hashCode();
+  }
+
+  @Override
+  public int hashCode() {
+    int hc = getClass().getName().hashCode();
+    hc = 31 * hc + oneKey;
+    hc = 31 * hc + twoKey.hashCode();
+    return hc;
+  }
+}
diff --git a/src/test/java/misc/migration/v1_1/EBasic.java b/src/test/java/misc/migration/v1_1/EBasic.java
index b11c6f9e2..9fa379bdd 100644
--- a/src/test/java/misc/migration/v1_1/EBasic.java
+++ b/src/test/java/misc/migration/v1_1/EBasic.java
@@ -17,6 +17,7 @@ import java.sql.Timestamp;
 
 @Entity
 @Table(name = "migtest_e_basic")
+@Index(columnNames  = { "status" , "indextest1"}, unique = true)
 public class EBasic {
 
   public enum Status {
diff --git a/src/test/java/misc/migration/v1_1/MtmChild.java b/src/test/java/misc/migration/v1_1/MtmChild.java
new file mode 100644
index 000000000..7cf239f91
--- /dev/null
+++ b/src/test/java/misc/migration/v1_1/MtmChild.java
@@ -0,0 +1,45 @@
+package misc.migration.v1_1;
+
+import java.util.List;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_mtm_c")
+public class MtmChild {
+
+  @Id
+  Integer id;
+
+  String name;
+
+  @ManyToMany
+  List<MtmMaster> masters;
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public List<MtmMaster> getMasters() {
+    return masters;
+  }
+  
+  public void setMasters(List<MtmMaster> masters) {
+    this.masters = masters;
+  }
+}
diff --git a/src/test/java/misc/migration/v1_1/MtmMaster.java b/src/test/java/misc/migration/v1_1/MtmMaster.java
new file mode 100644
index 000000000..067d396dc
--- /dev/null
+++ b/src/test/java/misc/migration/v1_1/MtmMaster.java
@@ -0,0 +1,46 @@
+package misc.migration.v1_1;
+
+import java.util.List;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_mtm_m")
+public class MtmMaster {
+
+  @Id
+  Long id;
+
+  String name;
+
+  @ManyToMany
+  List<MtmChild> children;
+
+  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 List<MtmChild> getChildren() {
+    return children;
+  }
+  
+  public void setChildren(List<MtmChild> children) {
+    this.children = children;
+  }
+
+}
diff --git a/src/test/java/misc/migration/v1_1/OtoChild.java b/src/test/java/misc/migration/v1_1/OtoChild.java
new file mode 100644
index 000000000..1877b8f53
--- /dev/null
+++ b/src/test/java/misc/migration/v1_1/OtoChild.java
@@ -0,0 +1,44 @@
+package misc.migration.v1_1;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_oto_child")
+public class OtoChild {
+
+  @Id
+  Integer id;
+
+  String name;
+
+  @OneToOne
+  OtoMaster master;
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public OtoMaster getMaster() {
+    return master;
+  }
+
+  public void setMaster(OtoMaster master) {
+    this.master = master;
+  }
+
+}
diff --git a/src/test/java/misc/migration/v1_1/OtoMaster.java b/src/test/java/misc/migration/v1_1/OtoMaster.java
new file mode 100644
index 000000000..f44bbaa9d
--- /dev/null
+++ b/src/test/java/misc/migration/v1_1/OtoMaster.java
@@ -0,0 +1,45 @@
+package misc.migration.v1_1;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_oto_master")
+public class OtoMaster {
+
+  @Id
+  Long id;
+
+  String name;
+
+  @OneToOne(cascade = CascadeType.ALL, mappedBy = "master")
+  OtoChild child;
+
+  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 OtoChild getChild() {
+    return child;
+  }
+
+  public void setChild(OtoChild child) {
+    this.child = child;
+  }
+
+}
diff --git a/src/test/java/misc/migration/v1_2/CKeyAssoc.java b/src/test/java/misc/migration/v1_2/CKeyAssoc.java
new file mode 100644
index 000000000..351bb3ca7
--- /dev/null
+++ b/src/test/java/misc/migration/v1_2/CKeyAssoc.java
@@ -0,0 +1,32 @@
+package misc.migration.v1_2;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_ckey_assoc")
+public class CKeyAssoc {
+
+  @Id
+  Integer id;
+
+  String assocOne;
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public String getAssocOne() {
+    return assocOne;
+  }
+
+  public void setAssocOne(String assocOne) {
+    this.assocOne = assocOne;
+  }
+
+}
diff --git a/src/test/java/misc/migration/v1_2/CKeyDetail.java b/src/test/java/misc/migration/v1_2/CKeyDetail.java
new file mode 100644
index 000000000..c02288f0a
--- /dev/null
+++ b/src/test/java/misc/migration/v1_2/CKeyDetail.java
@@ -0,0 +1,41 @@
+package misc.migration.v1_2;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_ckey_detail")
+public class CKeyDetail {
+
+  @Id
+  Integer id;
+
+  String something;
+
+
+  public CKeyDetail() {
+
+  }
+
+  public CKeyDetail(String something) {
+    this.something = something;
+  }
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public String getSomething() {
+    return something;
+  }
+
+  public void setSomething(String something) {
+    this.something = something;
+  }
+
+}
diff --git a/src/test/java/misc/migration/v1_2/CKeyParent.java b/src/test/java/misc/migration/v1_2/CKeyParent.java
new file mode 100644
index 000000000..7c44a42dc
--- /dev/null
+++ b/src/test/java/misc/migration/v1_2/CKeyParent.java
@@ -0,0 +1,44 @@
+package misc.migration.v1_2;
+
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name = "migtest_ckey_parent")
+public class CKeyParent {
+
+  @EmbeddedId
+  CKeyParentId id;
+
+  String name;
+
+  @Version
+  int version;
+
+  public CKeyParentId getId() {
+    return id;
+  }
+
+  public void setId(CKeyParentId id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public int getVersion() {
+    return version;
+  }
+
+  public void setVersion(int version) {
+    this.version = version;
+  }
+
+}
diff --git a/src/test/java/misc/migration/v1_2/CKeyParentId.java b/src/test/java/misc/migration/v1_2/CKeyParentId.java
new file mode 100644
index 000000000..4a7f30150
--- /dev/null
+++ b/src/test/java/misc/migration/v1_2/CKeyParentId.java
@@ -0,0 +1,60 @@
+package misc.migration.v1_2;
+
+import javax.persistence.Embeddable;
+import javax.validation.constraints.Size;
+
+@Embeddable
+public class CKeyParentId {
+
+  @Size(max=127)
+  Integer oneKey;
+
+  @Size(max=127)
+  String twoKey;
+
+  public CKeyParentId() {
+
+  }
+
+  public CKeyParentId(Integer oneKey, String twoKey) {
+    this.oneKey = oneKey;
+    this.twoKey = twoKey;
+  }
+
+  public Integer getOneKey() {
+    return oneKey;
+  }
+
+  public void setOneKey(Integer oneKey) {
+    this.oneKey = oneKey;
+  }
+
+  public String getTwoKey() {
+    return twoKey;
+  }
+
+  public void setTwoKey(String twoKey) {
+    this.twoKey = twoKey;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof CKeyParentId)) {
+      return false;
+    }
+
+    CKeyParentId otherKey = (CKeyParentId) o;
+    return otherKey.hashCode() == hashCode();
+  }
+
+  @Override
+  public int hashCode() {
+    int hc = getClass().getName().hashCode();
+    hc = 31 * hc + oneKey;
+    hc = 31 * hc + twoKey.hashCode();
+    return hc;
+  }
+}
diff --git a/src/test/java/misc/migration/v1_2/ERef.java b/src/test/java/misc/migration/v1_2/ERef.java
index aa22e9034..df16ba21c 100644
--- a/src/test/java/misc/migration/v1_2/ERef.java
+++ b/src/test/java/misc/migration/v1_2/ERef.java
@@ -6,6 +6,10 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
+import javax.validation.constraints.Size;
+
+import io.ebean.annotation.Index;
+import io.ebean.annotation.NotNull;
 
 @Entity
 @Table(name = "migtest_e_ref")
@@ -16,4 +20,9 @@ public class ERef {
   
   @OneToMany
   List<EBasic> basics;
+
+  @NotNull
+  @Index(unique = true)
+  @Size(max=127)
+  String name;
 }
diff --git a/src/test/java/misc/migration/v1_2/MtmChild.java b/src/test/java/misc/migration/v1_2/MtmChild.java
new file mode 100644
index 000000000..de83d8194
--- /dev/null
+++ b/src/test/java/misc/migration/v1_2/MtmChild.java
@@ -0,0 +1,34 @@
+package misc.migration.v1_2;
+
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_mtm_c")
+public class MtmChild {
+
+  @Id
+  Integer id;
+
+  String name;
+
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+}
diff --git a/src/test/java/misc/migration/v1_2/MtmMaster.java b/src/test/java/misc/migration/v1_2/MtmMaster.java
new file mode 100644
index 000000000..a1e5e41cf
--- /dev/null
+++ b/src/test/java/misc/migration/v1_2/MtmMaster.java
@@ -0,0 +1,32 @@
+package misc.migration.v1_2;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_mtm_m")
+public class MtmMaster {
+
+  @Id
+  Long id;
+
+  String name;
+
+  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;
+  }
+
+}
diff --git a/src/test/java/misc/migration/v1_2/OtoChild.java b/src/test/java/misc/migration/v1_2/OtoChild.java
new file mode 100644
index 000000000..4ca5e6b4b
--- /dev/null
+++ b/src/test/java/misc/migration/v1_2/OtoChild.java
@@ -0,0 +1,32 @@
+package misc.migration.v1_2;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_oto_child")
+public class OtoChild {
+
+  @Id
+  Integer id;
+
+  String name;
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+}
diff --git a/src/test/java/misc/migration/v1_2/OtoMaster.java b/src/test/java/misc/migration/v1_2/OtoMaster.java
new file mode 100644
index 000000000..e33578ff9
--- /dev/null
+++ b/src/test/java/misc/migration/v1_2/OtoMaster.java
@@ -0,0 +1,32 @@
+package misc.migration.v1_2;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "migtest_oto_master")
+public class OtoMaster {
+
+  @Id
+  Long id;
+
+  String name;
+
+  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;
+  }
+
+}
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
index 2ed9f31ab..25c370c04 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
@@ -1,5 +1,25 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+create table migtest_ckey_assoc (
+  id                            integer generated by default as identity not null,
+  assoc_one                     varchar(255),
+  constraint pk_migtest_ckey_assoc primary key (id)
+);
+
+create table migtest_ckey_detail (
+  id                            integer generated by default as identity not null,
+  something                     varchar(255),
+  constraint pk_migtest_ckey_detail primary key (id)
+);
+
+create table migtest_ckey_parent (
+  one_key                       integer not null,
+  two_key                       varchar(127) not null,
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_migtest_ckey_parent primary key (one_key,two_key)
+);
+
 create table migtest_fk_cascade (
   id                            bigint generated by default as identity not null,
   one_id                        bigint,
@@ -70,8 +90,10 @@ create table migtest_e_history2 (
 
 create table migtest_e_ref (
   id                            integer generated by default as identity not null,
+  name                          varchar(127) not null,
   constraint pk_migtest_e_ref primary key (id)
 );
+alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique  (name);
 
 create table migtest_e_softdelete (
   id                            integer generated by default as identity not null,
@@ -79,6 +101,30 @@ create table migtest_e_softdelete (
   constraint pk_migtest_e_softdelete primary key (id)
 );
 
+create table migtest_mtm_c (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_migtest_mtm_c primary key (id)
+);
+
+create table migtest_mtm_m (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_migtest_mtm_m primary key (id)
+);
+
+create table migtest_oto_child (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_migtest_oto_child primary key (id)
+);
+
+create table migtest_oto_master (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_migtest_oto_master primary key (id)
+);
+
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.1.sql b/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
index 2304caa0c..a6dcedf46 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
@@ -5,6 +5,24 @@ create table migtest_e_user (
   constraint pk_migtest_e_user primary key (id)
 );
 
+create table migtest_mtm_c_migtest_mtm_m (
+  migtest_mtm_c_id              integer not null,
+  migtest_mtm_m_id              bigint not null,
+  constraint pk_migtest_mtm_c_migtest_mtm_m primary key (migtest_mtm_c_id,migtest_mtm_m_id)
+);
+
+create table migtest_mtm_m_migtest_mtm_c (
+  migtest_mtm_m_id              bigint not null,
+  migtest_mtm_c_id              integer not null,
+  constraint pk_migtest_mtm_m_migtest_mtm_c primary key (migtest_mtm_m_id,migtest_mtm_c_id)
+);
+
+alter table migtest_ckey_detail add column one_key integer;
+alter table migtest_ckey_detail add column two_key varchar(127);
+
+alter table migtest_ckey_detail add constraint fk_migtest_ckey_detail_parent foreign key (one_key,two_key) references migtest_ckey_parent (one_key,two_key) on delete restrict;
+alter table migtest_ckey_parent add column assoc_id integer;
+
 alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete restrict;
 alter table migtest_fk_none add constraint fk_migtest_fk_none_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict;
@@ -39,6 +57,7 @@ alter table migtest_e_basic add column new_integer integer default 42 not null;
 
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
+-- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_status_indextest1 unique  (status,indextest1);
 -- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_name unique  (name);
 -- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique  (indextest4);
 -- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
@@ -56,7 +75,26 @@ alter table migtest_e_history2_history add column test_string3 varchar(255);
 
 alter table migtest_e_softdelete add column deleted boolean default false not null;
 
+alter table migtest_oto_child add column master_id bigint;
+
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 drop index ix_migtest_e_basic_indextest1;
 drop index ix_migtest_e_basic_indextest5;
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict;
+create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
+
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict;
+create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m on migtest_mtm_c_migtest_mtm_m (migtest_mtm_m_id);
+
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict;
+create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m on migtest_mtm_m_migtest_mtm_c (migtest_mtm_m_id);
+
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict;
+create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c on migtest_mtm_m_migtest_mtm_c (migtest_mtm_c_id);
+
+alter table migtest_ckey_parent add constraint fk_migtest_ckey_parent_assoc_id foreign key (assoc_id) references migtest_ckey_assoc (id) on delete restrict;
+create index ix_migtest_ckey_parent_assoc_id on migtest_ckey_parent (assoc_id);
+
+alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict;
+
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.3.sql b/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
index e99cc4048..94536ae4a 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
@@ -2,9 +2,12 @@
 -- apply changes
 create table migtest_e_ref (
   id                            integer generated by default as identity not null,
+  name                          varchar(127) not null,
   constraint pk_migtest_e_ref primary key (id)
 );
+alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique  (name);
 
+alter table migtest_ckey_detail drop constraint fk_migtest_ckey_detail_parent;
 alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
 alter table migtest_fk_none drop constraint fk_migtest_fk_none_one_id;
@@ -27,6 +30,7 @@ alter table migtest_e_basic add column old_boolean boolean default false not nul
 alter table migtest_e_basic add column old_boolean2 boolean;
 alter table migtest_e_basic add column eref_id integer;
 
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_status_indextest1;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql
index 493c72e93..0ae87600a 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql
@@ -1,5 +1,11 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+alter table migtest_ckey_detail drop column one_key;
+
+alter table migtest_ckey_detail drop column two_key;
+
+alter table migtest_ckey_parent drop column assoc_id;
+
 alter table migtest_e_basic drop column new_string_field;
 
 alter table migtest_e_basic drop column new_boolean_field;
@@ -18,5 +24,9 @@ alter table migtest_e_history2_history drop column test_string3;
 
 alter table migtest_e_softdelete drop column deleted;
 
+alter table migtest_oto_child drop column master_id;
+
 drop table migtest_e_user;
 drop sequence migtest_e_user_seq;
+drop table migtest_mtm_c_migtest_mtm_m;
+drop table migtest_mtm_m_migtest_mtm_c;
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
index 5b472d0c4..4b6052a9a 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
@@ -1,5 +1,25 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+create table migtest_ckey_assoc (
+  id                            integer auto_increment not null,
+  assoc_one                     varchar(255),
+  constraint pk_migtest_ckey_assoc primary key (id)
+);
+
+create table migtest_ckey_detail (
+  id                            integer auto_increment not null,
+  something                     varchar(255),
+  constraint pk_migtest_ckey_detail primary key (id)
+);
+
+create table migtest_ckey_parent (
+  one_key                       integer(127) not null,
+  two_key                       varchar(127) not null,
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_migtest_ckey_parent primary key (one_key,two_key)
+);
+
 create table migtest_fk_cascade (
   id                            bigint auto_increment not null,
   one_id                        bigint,
@@ -70,6 +90,8 @@ create table migtest_e_history2 (
 
 create table migtest_e_ref (
   id                            integer auto_increment not null,
+  name                          varchar(127) not null,
+  constraint uq_migtest_e_ref_name unique (name),
   constraint pk_migtest_e_ref primary key (id)
 );
 
@@ -79,6 +101,30 @@ create table migtest_e_softdelete (
   constraint pk_migtest_e_softdelete primary key (id)
 );
 
+create table migtest_mtm_c (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  constraint pk_migtest_mtm_c primary key (id)
+);
+
+create table migtest_mtm_m (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_migtest_mtm_m primary key (id)
+);
+
+create table migtest_oto_child (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  constraint pk_migtest_oto_child primary key (id)
+);
+
+create table migtest_oto_master (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_migtest_oto_master primary key (id)
+);
+
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.1.sql b/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
index e786f4ecc..126c0eb18 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
@@ -5,6 +5,24 @@ create table migtest_e_user (
   constraint pk_migtest_e_user primary key (id)
 );
 
+create table migtest_mtm_c_migtest_mtm_m (
+  migtest_mtm_c_id              integer not null,
+  migtest_mtm_m_id              bigint not null,
+  constraint pk_migtest_mtm_c_migtest_mtm_m primary key (migtest_mtm_c_id,migtest_mtm_m_id)
+);
+
+create table migtest_mtm_m_migtest_mtm_c (
+  migtest_mtm_m_id              bigint not null,
+  migtest_mtm_c_id              integer not null,
+  constraint pk_migtest_mtm_m_migtest_mtm_c primary key (migtest_mtm_m_id,migtest_mtm_c_id)
+);
+
+alter table migtest_ckey_detail add column one_key integer(127);
+alter table migtest_ckey_detail add column two_key varchar(127);
+
+alter table migtest_ckey_detail add constraint fk_migtest_ckey_detail_parent foreign key (one_key,two_key) references migtest_ckey_parent (one_key,two_key) on delete restrict on update restrict;
+alter table migtest_ckey_parent add column assoc_id integer;
+
 alter table migtest_fk_cascade drop constraint if exists fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete restrict on update restrict;
 alter table migtest_fk_none add constraint fk_migtest_fk_none_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
@@ -39,6 +57,7 @@ alter table migtest_e_basic add column new_integer integer default 42 not null;
 
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
+alter table migtest_e_basic add constraint uq_migtest_e_basic_status_indextest1 unique  (status,indextest1);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_name unique  (name);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique  (indextest4);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
@@ -56,10 +75,29 @@ alter table migtest_e_history2_history add column test_string3 varchar(255);
 
 alter table migtest_e_softdelete add column deleted boolean default false not null;
 
+alter table migtest_oto_child add column master_id bigint;
+
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 drop index if exists ix_migtest_e_basic_indextest1;
 drop index if exists ix_migtest_e_basic_indextest5;
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
+create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
+
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
+create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m on migtest_mtm_c_migtest_mtm_m (migtest_mtm_m_id);
+
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
+create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m on migtest_mtm_m_migtest_mtm_c (migtest_mtm_m_id);
+
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
+create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c on migtest_mtm_m_migtest_mtm_c (migtest_mtm_c_id);
+
+alter table migtest_ckey_parent add constraint fk_migtest_ckey_parent_assoc_id foreign key (assoc_id) references migtest_ckey_assoc (id) on delete restrict on update restrict;
+create index ix_migtest_ckey_parent_assoc_id on migtest_ckey_parent (assoc_id);
+
+alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict on update restrict;
+
 alter table migtest_e_history add column sys_period_start datetime(6) default now(6);
 alter table migtest_e_history add column sys_period_end datetime(6);
 create table migtest_e_history_history(
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.3.sql b/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
index 9f3c659df..233f0524b 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
@@ -2,9 +2,12 @@
 -- apply changes
 create table migtest_e_ref (
   id                            integer auto_increment not null,
+  name                          varchar(127) not null,
+  constraint uq_migtest_e_ref_name unique (name),
   constraint pk_migtest_e_ref primary key (id)
 );
 
+alter table migtest_ckey_detail drop constraint if exists fk_migtest_ckey_detail_parent;
 alter table migtest_fk_cascade drop constraint if exists fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
 alter table migtest_fk_none drop constraint if exists fk_migtest_fk_none_one_id;
@@ -27,6 +30,7 @@ alter table migtest_e_basic add column old_boolean boolean default false not nul
 alter table migtest_e_basic add column old_boolean2 boolean;
 alter table migtest_e_basic add column eref_id integer;
 
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_status_indextest1;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql
index fec1ee7a8..a644d1461 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql
@@ -8,6 +8,12 @@ drop table migtest_e_history_history;
 
 
 -- apply changes
+alter table migtest_ckey_detail drop column one_key;
+
+alter table migtest_ckey_detail drop column two_key;
+
+alter table migtest_ckey_parent drop column assoc_id;
+
 alter table migtest_e_basic drop column new_string_field;
 
 alter table migtest_e_basic drop column new_boolean_field;
@@ -26,8 +32,12 @@ alter table migtest_e_history2_history drop column test_string3;
 
 alter table migtest_e_softdelete drop column deleted;
 
+alter table migtest_oto_child drop column master_id;
+
 drop table if exists migtest_e_user;
 drop sequence if exists migtest_e_user_seq;
+drop table if exists migtest_mtm_c_migtest_mtm_m;
+drop table if exists migtest_mtm_m_migtest_mtm_c;
 -- changes: [drop test_string2, drop test_string3]
 drop trigger migtest_e_history2_history_upd;
 create trigger migtest_e_history2_history_upd before update,delete on migtest_e_history2 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
index 3294b84f7..390cf2fd3 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
@@ -1,5 +1,25 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+create table migtest_ckey_assoc (
+  id                            integer generated by default as identity (start with 1)  not null,
+  assoc_one                     varchar(255),
+  constraint pk_migtest_ckey_assoc primary key (id)
+);
+
+create table migtest_ckey_detail (
+  id                            integer generated by default as identity (start with 1)  not null,
+  something                     varchar(255),
+  constraint pk_migtest_ckey_detail primary key (id)
+);
+
+create table migtest_ckey_parent (
+  one_key                       integer not null,
+  two_key                       varchar(127) not null,
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_migtest_ckey_parent primary key (one_key,two_key)
+);
+
 create table migtest_fk_cascade (
   id                            bigint generated by default as identity (start with 1)  not null,
   one_id                        bigint,
@@ -70,6 +90,8 @@ create table migtest_e_history2 (
 
 create table migtest_e_ref (
   id                            integer generated by default as identity (start with 1)  not null,
+  name                          varchar(127) not null,
+  constraint uq_migtest_e_ref_name unique (name),
   constraint pk_migtest_e_ref primary key (id)
 );
 
@@ -79,6 +101,30 @@ create table migtest_e_softdelete (
   constraint pk_migtest_e_softdelete primary key (id)
 );
 
+create table migtest_mtm_c (
+  id                            integer generated by default as identity (start with 1)  not null,
+  name                          varchar(255),
+  constraint pk_migtest_mtm_c primary key (id)
+);
+
+create table migtest_mtm_m (
+  id                            bigint generated by default as identity (start with 1)  not null,
+  name                          varchar(255),
+  constraint pk_migtest_mtm_m primary key (id)
+);
+
+create table migtest_oto_child (
+  id                            integer generated by default as identity (start with 1)  not null,
+  name                          varchar(255),
+  constraint pk_migtest_oto_child primary key (id)
+);
+
+create table migtest_oto_master (
+  id                            bigint generated by default as identity (start with 1)  not null,
+  name                          varchar(255),
+  constraint pk_migtest_oto_master primary key (id)
+);
+
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
index 3c48db53c..02e5f135a 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
@@ -5,6 +5,24 @@ create table migtest_e_user (
   constraint pk_migtest_e_user primary key (id)
 );
 
+create table migtest_mtm_c_migtest_mtm_m (
+  migtest_mtm_c_id              integer not null,
+  migtest_mtm_m_id              bigint not null,
+  constraint pk_migtest_mtm_c_migtest_mtm_m primary key (migtest_mtm_c_id,migtest_mtm_m_id)
+);
+
+create table migtest_mtm_m_migtest_mtm_c (
+  migtest_mtm_m_id              bigint not null,
+  migtest_mtm_c_id              integer not null,
+  constraint pk_migtest_mtm_m_migtest_mtm_c primary key (migtest_mtm_m_id,migtest_mtm_c_id)
+);
+
+alter table migtest_ckey_detail add column one_key integer;
+alter table migtest_ckey_detail add column two_key varchar(127);
+
+alter table migtest_ckey_detail add constraint fk_migtest_ckey_detail_parent foreign key (one_key,two_key) references migtest_ckey_parent (one_key,two_key) on delete restrict on update restrict;
+alter table migtest_ckey_parent add column assoc_id integer;
+
 alter table migtest_fk_cascade drop constraint if exists fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete restrict on update restrict;
 alter table migtest_fk_none add constraint fk_migtest_fk_none_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
@@ -39,6 +57,7 @@ alter table migtest_e_basic add column new_integer integer default 42 not null;
 
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
+alter table migtest_e_basic add constraint uq_migtest_e_basic_status_indextest1 unique  (status,indextest1);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_name unique  (name);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique  (indextest4);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
@@ -56,7 +75,26 @@ alter table migtest_e_history2_history add column test_string3 varchar(255);
 
 alter table migtest_e_softdelete add column deleted boolean default false not null;
 
+alter table migtest_oto_child add column master_id bigint;
+
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 drop index if exists ix_migtest_e_basic_indextest1;
 drop index if exists ix_migtest_e_basic_indextest5;
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
+create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
+
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
+create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m on migtest_mtm_c_migtest_mtm_m (migtest_mtm_m_id);
+
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
+create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m on migtest_mtm_m_migtest_mtm_c (migtest_mtm_m_id);
+
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
+create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c on migtest_mtm_m_migtest_mtm_c (migtest_mtm_c_id);
+
+alter table migtest_ckey_parent add constraint fk_migtest_ckey_parent_assoc_id foreign key (assoc_id) references migtest_ckey_assoc (id) on delete restrict on update restrict;
+create index ix_migtest_ckey_parent_assoc_id on migtest_ckey_parent (assoc_id);
+
+alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict on update restrict;
+
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
index d89e67fd1..6d0ef4b55 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
@@ -2,9 +2,12 @@
 -- apply changes
 create table migtest_e_ref (
   id                            integer generated by default as identity (start with 1)  not null,
+  name                          varchar(127) not null,
+  constraint uq_migtest_e_ref_name unique (name),
   constraint pk_migtest_e_ref primary key (id)
 );
 
+alter table migtest_ckey_detail drop constraint if exists fk_migtest_ckey_detail_parent;
 alter table migtest_fk_cascade drop constraint if exists fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
 alter table migtest_fk_none drop constraint if exists fk_migtest_fk_none_one_id;
@@ -27,6 +30,7 @@ alter table migtest_e_basic add column old_boolean boolean default false not nul
 alter table migtest_e_basic add column old_boolean2 boolean;
 alter table migtest_e_basic add column eref_id integer;
 
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_status_indextest1;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql
index 91d85f62b..95542680e 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql
@@ -1,5 +1,11 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+alter table migtest_ckey_detail drop column one_key;
+
+alter table migtest_ckey_detail drop column two_key;
+
+alter table migtest_ckey_parent drop column assoc_id;
+
 alter table migtest_e_basic drop column new_string_field;
 
 alter table migtest_e_basic drop column new_boolean_field;
@@ -18,5 +24,9 @@ alter table migtest_e_history2_history drop column test_string3;
 
 alter table migtest_e_softdelete drop column deleted;
 
+alter table migtest_oto_child drop column master_id;
+
 drop table if exists migtest_e_user;
 drop sequence if exists migtest_e_user_seq;
+drop table if exists migtest_mtm_c_migtest_mtm_m;
+drop table if exists migtest_mtm_m_migtest_mtm_c;
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
index 06a49484a..1e951234e 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
@@ -2,6 +2,20 @@
 <!DOCTYPE xml>
 <migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
     <changeSet type="apply">
+        <createTable name="migtest_ckey_assoc" pkName="pk_migtest_ckey_assoc">
+            <column name="id" type="integer" primaryKey="true"/>
+            <column name="assoc_one" type="varchar"/>
+        </createTable>
+        <createTable name="migtest_ckey_detail" pkName="pk_migtest_ckey_detail">
+            <column name="id" type="integer" primaryKey="true"/>
+            <column name="something" type="varchar"/>
+        </createTable>
+        <createTable name="migtest_ckey_parent" pkName="pk_migtest_ckey_parent">
+            <column name="one_key" type="integer(127)" primaryKey="true"/>
+            <column name="two_key" type="varchar(127)" primaryKey="true"/>
+            <column name="name" type="varchar"/>
+            <column name="version" type="integer" notnull="true"/>
+        </createTable>
         <createTable name="migtest_fk_cascade" pkName="pk_migtest_fk_cascade">
             <column name="id" type="bigint" primaryKey="true"/>
             <column name="one_id" type="bigint" references="migtest_fk_cascade_one.id" foreignKeyName="fk_migtest_fk_cascade_one_id" foreignKeyIndex="ix_migtest_fk_cascade_one_id" foreignKeyOnDelete="CASCADE" foreignKeyOnUpdate="RESTRICT"/>
@@ -53,11 +67,29 @@
         </createTable>
         <createTable name="migtest_e_ref" pkName="pk_migtest_e_ref">
             <column name="id" type="integer" primaryKey="true"/>
+            <column name="name" type="varchar(127)" notnull="true"/>
+            <uniqueConstraint name="uq_migtest_e_ref_name" columnNames="name" oneToOne="false" nullableColumns=""/>
         </createTable>
         <createTable name="migtest_e_softdelete" pkName="pk_migtest_e_softdelete">
             <column name="id" type="integer" primaryKey="true"/>
             <column name="test_string" type="varchar"/>
         </createTable>
+        <createTable name="migtest_mtm_c" pkName="pk_migtest_mtm_c">
+            <column name="id" type="integer" primaryKey="true"/>
+            <column name="name" type="varchar"/>
+        </createTable>
+        <createTable name="migtest_mtm_m" pkName="pk_migtest_mtm_m">
+            <column name="id" type="bigint" primaryKey="true"/>
+            <column name="name" type="varchar"/>
+        </createTable>
+        <createTable name="migtest_oto_child" pkName="pk_migtest_oto_child">
+            <column name="id" type="integer" primaryKey="true"/>
+            <column name="name" type="varchar"/>
+        </createTable>
+        <createTable name="migtest_oto_master" pkName="pk_migtest_oto_master">
+            <column name="id" type="bigint" primaryKey="true"/>
+            <column name="name" type="varchar"/>
+        </createTable>
         <createIndex indexName="ix_migtest_e_basic_indextest1" tableName="migtest_e_basic" columns="indextest1"/>
         <createIndex indexName="ix_migtest_e_basic_indextest5" tableName="migtest_e_basic" columns="indextest5"/>
     </changeSet>
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
index aea35068e..d1c893673 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
@@ -2,6 +2,14 @@
 <!DOCTYPE xml>
 <migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
     <changeSet type="apply">
+        <addColumn tableName="migtest_ckey_detail">
+            <column name="one_key" type="integer(127)"/>
+            <column name="two_key" type="varchar(127)"/>
+        </addColumn>
+        <alterForeignKey name="fk_migtest_ckey_detail_parent" columnNames="one_key,two_key" refColumnNames="one_key,two_key" refTableName="migtest_ckey_parent" indexName="ix_migtest_ckey_detail_parent" tableName="migtest_ckey_detail"/>
+        <addColumn tableName="migtest_ckey_parent">
+            <column name="assoc_id" type="integer" references="migtest_ckey_assoc.id" foreignKeyName="fk_migtest_ckey_parent_assoc_id" foreignKeyIndex="ix_migtest_ckey_parent_assoc_id"/>
+        </addColumn>
         <alterColumn columnName="one_id" tableName="migtest_fk_cascade" references="migtest_fk_cascade_one.id" foreignKeyName="fk_migtest_fk_cascade_one_id" foreignKeyIndex="ix_migtest_fk_cascade_one_id" foreignKeyOnDelete="RESTRICT" foreignKeyOnUpdate="RESTRICT" dropForeignKey="fk_migtest_fk_cascade_one_id" dropForeignKeyIndex="ix_migtest_fk_cascade_one_id"/>
         <alterColumn columnName="one_id" tableName="migtest_fk_none" references="migtest_fk_one.id" foreignKeyName="fk_migtest_fk_none_one_id" foreignKeyIndex="ix_migtest_fk_none_one_id" foreignKeyOnDelete="RESTRICT" foreignKeyOnUpdate="RESTRICT"/>
         <alterColumn columnName="one_id" tableName="migtest_fk_none_via_join" references="migtest_fk_one.id" foreignKeyName="fk_migtest_fk_none_via_join_one_id" foreignKeyIndex="ix_migtest_fk_none_via_join_one_id"/>
@@ -25,6 +33,7 @@
         </addColumn>
         <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest2" tableName="migtest_e_basic" columnNames="DROP CONSTRAINT" nullableColumns="indextest2"/>
         <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest6" tableName="migtest_e_basic" columnNames="DROP CONSTRAINT" nullableColumns="indextest6"/>
+        <addUniqueConstraint constraintName="uq_migtest_e_basic_status_indextest1" tableName="migtest_e_basic" columnNames="status,indextest1" nullableColumns="indextest1" oneToOne="false"/>
         <addUniqueConstraint constraintName="uq_migtest_e_basic_name" tableName="migtest_e_basic" columnNames="name" nullableColumns="name" oneToOne="false"/>
         <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest4" tableName="migtest_e_basic" columnNames="indextest4" nullableColumns="indextest4" oneToOne="false"/>
         <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest5" tableName="migtest_e_basic" columnNames="indextest5" nullableColumns="indextest5" oneToOne="false"/>
@@ -44,6 +53,21 @@
         <createTable name="migtest_e_user" pkName="pk_migtest_e_user">
             <column name="id" type="integer" primaryKey="true"/>
         </createTable>
+        <createTable name="migtest_mtm_c_migtest_mtm_m" pkName="pk_migtest_mtm_c_migtest_mtm_m">
+            <column name="migtest_mtm_c_id" type="integer" notnull="true" primaryKey="true"/>
+            <column name="migtest_mtm_m_id" type="bigint" notnull="true" primaryKey="true"/>
+            <foreignKey name="fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c" columnNames="migtest_mtm_c_id" refColumnNames="id" refTableName="migtest_mtm_c" indexName="ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c"/>
+            <foreignKey name="fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m" columnNames="migtest_mtm_m_id" refColumnNames="id" refTableName="migtest_mtm_m" indexName="ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m"/>
+        </createTable>
+        <createTable name="migtest_mtm_m_migtest_mtm_c" pkName="pk_migtest_mtm_m_migtest_mtm_c">
+            <column name="migtest_mtm_m_id" type="bigint" notnull="true" primaryKey="true"/>
+            <column name="migtest_mtm_c_id" type="integer" notnull="true" primaryKey="true"/>
+            <foreignKey name="fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m" columnNames="migtest_mtm_m_id" refColumnNames="id" refTableName="migtest_mtm_m" indexName="ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m"/>
+            <foreignKey name="fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c" columnNames="migtest_mtm_c_id" refColumnNames="id" refTableName="migtest_mtm_c" indexName="ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c"/>
+        </createTable>
+        <addColumn tableName="migtest_oto_child">
+            <column name="master_id" type="bigint" uniqueOneToOne="uq_migtest_oto_child_master_id" references="migtest_oto_master.id" foreignKeyName="fk_migtest_oto_child_master_id"/>
+        </addColumn>
         <createIndex indexName="ix_migtest_e_basic_indextest3" tableName="migtest_e_basic" columns="indextest3"/>
         <createIndex indexName="ix_migtest_e_basic_indextest6" tableName="migtest_e_basic" columns="indextest6"/>
         <dropIndex indexName="ix_migtest_e_basic_indextest1" tableName="migtest_e_basic"/>
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
index 24aa3c189..f9b23929f 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE xml>
 <migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
     <changeSet type="apply">
+        <alterForeignKey name="fk_migtest_ckey_detail_parent" columnNames="DROP FOREIGN KEY" indexName="ix_migtest_ckey_detail_parent" tableName="migtest_ckey_detail"/>
         <alterColumn columnName="one_id" tableName="migtest_fk_cascade" references="migtest_fk_cascade_one.id" foreignKeyName="fk_migtest_fk_cascade_one_id" foreignKeyIndex="ix_migtest_fk_cascade_one_id" foreignKeyOnDelete="CASCADE" foreignKeyOnUpdate="RESTRICT" dropForeignKey="fk_migtest_fk_cascade_one_id" dropForeignKeyIndex="ix_migtest_fk_cascade_one_id"/>
         <alterColumn columnName="one_id" tableName="migtest_fk_none" dropForeignKey="fk_migtest_fk_none_one_id" dropForeignKeyIndex="ix_migtest_fk_none_one_id"/>
         <alterColumn columnName="one_id" tableName="migtest_fk_none_via_join" dropForeignKey="fk_migtest_fk_none_via_join_one_id" dropForeignKeyIndex="ix_migtest_fk_none_via_join_one_id"/>
@@ -15,6 +16,7 @@
             <column name="old_boolean2" type="boolean"/>
             <column name="eref_id" type="integer" references="migtest_e_ref.id" foreignKeyName="fk_migtest_e_basic_eref_id" foreignKeyIndex="ix_migtest_e_basic_eref_id"/>
         </addColumn>
+        <addUniqueConstraint constraintName="uq_migtest_e_basic_status_indextest1" tableName="migtest_e_basic" columnNames="DROP CONSTRAINT" nullableColumns="indextest1"/>
         <addUniqueConstraint constraintName="uq_migtest_e_basic_name" tableName="migtest_e_basic" columnNames="DROP CONSTRAINT" nullableColumns="name"/>
         <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest4" tableName="migtest_e_basic" columnNames="DROP CONSTRAINT" nullableColumns="indextest4"/>
         <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest5" tableName="migtest_e_basic" columnNames="DROP CONSTRAINT" nullableColumns="indextest5"/>
@@ -25,6 +27,8 @@
         <alterColumn columnName="test_string" tableName="migtest_e_history2" withHistory="true" currentType="varchar" defaultValue="DROP DEFAULT" notnull="false" currentNotnull="true"/>
         <createTable name="migtest_e_ref" pkName="pk_migtest_e_ref">
             <column name="id" type="integer" primaryKey="true"/>
+            <column name="name" type="varchar(127)" notnull="true"/>
+            <uniqueConstraint name="uq_migtest_e_ref_name" columnNames="name" oneToOne="false" nullableColumns=""/>
         </createTable>
         <createIndex indexName="ix_migtest_e_basic_indextest1" tableName="migtest_e_basic" columns="indextest1"/>
         <createIndex indexName="ix_migtest_e_basic_indextest5" tableName="migtest_e_basic" columns="indextest5"/>
@@ -32,6 +36,9 @@
         <dropIndex indexName="ix_migtest_e_basic_indextest6" tableName="migtest_e_basic"/>
     </changeSet>
     <changeSet type="pendingDrops">
+        <dropColumn columnName="one_key" tableName="migtest_ckey_detail"/>
+        <dropColumn columnName="two_key" tableName="migtest_ckey_detail"/>
+        <dropColumn columnName="assoc_id" tableName="migtest_ckey_parent"/>
         <dropColumn columnName="new_string_field" tableName="migtest_e_basic"/>
         <dropColumn columnName="new_boolean_field" tableName="migtest_e_basic"/>
         <dropColumn columnName="new_boolean_field2" tableName="migtest_e_basic"/>
@@ -41,6 +48,9 @@
         <dropColumn columnName="test_string2" tableName="migtest_e_history2" withHistory="true"/>
         <dropColumn columnName="test_string3" tableName="migtest_e_history2" withHistory="true"/>
         <dropColumn columnName="deleted" tableName="migtest_e_softdelete"/>
+        <dropColumn columnName="master_id" tableName="migtest_oto_child"/>
         <dropTable name="migtest_e_user" sequenceCol="id"/>
+        <dropTable name="migtest_mtm_c_migtest_mtm_m"/>
+        <dropTable name="migtest_mtm_m_migtest_mtm_c"/>
     </changeSet>
 </migration>
\ No newline at end of file
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml
index 214b60a2a..6d17f89f2 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE xml>
 <migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
     <changeSet type="apply" dropsFor="1.3">
+        <dropColumn columnName="one_key" tableName="migtest_ckey_detail"/>
+        <dropColumn columnName="two_key" tableName="migtest_ckey_detail"/>
+        <dropColumn columnName="assoc_id" tableName="migtest_ckey_parent"/>
         <dropColumn columnName="new_string_field" tableName="migtest_e_basic"/>
         <dropColumn columnName="new_boolean_field" tableName="migtest_e_basic"/>
         <dropColumn columnName="new_boolean_field2" tableName="migtest_e_basic"/>
@@ -11,6 +14,9 @@
         <dropColumn columnName="test_string2" tableName="migtest_e_history2" withHistory="true"/>
         <dropColumn columnName="test_string3" tableName="migtest_e_history2" withHistory="true"/>
         <dropColumn columnName="deleted" tableName="migtest_e_softdelete"/>
+        <dropColumn columnName="master_id" tableName="migtest_oto_child"/>
         <dropTable name="migtest_e_user" sequenceCol="id"/>
+        <dropTable name="migtest_mtm_c_migtest_mtm_m"/>
+        <dropTable name="migtest_mtm_m_migtest_mtm_c"/>
     </changeSet>
 </migration>
\ No newline at end of file
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
index 8d5563048..0d8e39910 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
@@ -1,5 +1,25 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+create table migtest_ckey_assoc (
+  id                            integer auto_increment not null,
+  assoc_one                     varchar(255),
+  constraint pk_migtest_ckey_assoc primary key (id)
+);
+
+create table migtest_ckey_detail (
+  id                            integer auto_increment not null,
+  something                     varchar(255),
+  constraint pk_migtest_ckey_detail primary key (id)
+);
+
+create table migtest_ckey_parent (
+  one_key                       integer(127) not null,
+  two_key                       varchar(127) not null,
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_migtest_ckey_parent primary key (one_key,two_key)
+);
+
 create table migtest_fk_cascade (
   id                            bigint auto_increment not null,
   one_id                        bigint,
@@ -70,6 +90,8 @@ create table migtest_e_history2 (
 
 create table migtest_e_ref (
   id                            integer auto_increment not null,
+  name                          varchar(127) not null,
+  constraint uq_migtest_e_ref_name unique (name),
   constraint pk_migtest_e_ref primary key (id)
 );
 
@@ -79,6 +101,30 @@ create table migtest_e_softdelete (
   constraint pk_migtest_e_softdelete primary key (id)
 );
 
+create table migtest_mtm_c (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  constraint pk_migtest_mtm_c primary key (id)
+);
+
+create table migtest_mtm_m (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_migtest_mtm_m primary key (id)
+);
+
+create table migtest_oto_child (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  constraint pk_migtest_oto_child primary key (id)
+);
+
+create table migtest_oto_master (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_migtest_oto_master primary key (id)
+);
+
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
index 3fc961b1a..9b9c7a41d 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
@@ -5,6 +5,24 @@ create table migtest_e_user (
   constraint pk_migtest_e_user primary key (id)
 );
 
+create table migtest_mtm_c_migtest_mtm_m (
+  migtest_mtm_c_id              integer not null,
+  migtest_mtm_m_id              bigint not null,
+  constraint pk_migtest_mtm_c_migtest_mtm_m primary key (migtest_mtm_c_id,migtest_mtm_m_id)
+);
+
+create table migtest_mtm_m_migtest_mtm_c (
+  migtest_mtm_m_id              bigint not null,
+  migtest_mtm_c_id              integer not null,
+  constraint pk_migtest_mtm_m_migtest_mtm_c primary key (migtest_mtm_m_id,migtest_mtm_c_id)
+);
+
+alter table migtest_ckey_detail add column one_key integer(127);
+alter table migtest_ckey_detail add column two_key varchar(127);
+
+alter table migtest_ckey_detail add constraint fk_migtest_ckey_detail_parent foreign key (one_key,two_key) references migtest_ckey_parent (one_key,two_key) on delete restrict on update restrict;
+alter table migtest_ckey_parent add column assoc_id integer;
+
 alter table migtest_fk_cascade drop foreign key fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete restrict on update restrict;
 alter table migtest_fk_none add constraint fk_migtest_fk_none_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
@@ -38,6 +56,7 @@ alter table migtest_e_basic add column new_integer integer default 42 not null;
 
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest2;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest6;
+alter table migtest_e_basic add constraint uq_migtest_e_basic_status_indextest1 unique  (status,indextest1);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_name unique  (name);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique  (indextest4);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
@@ -54,10 +73,29 @@ alter table migtest_e_history2_history add column test_string3 varchar(255);
 
 alter table migtest_e_softdelete add column deleted tinyint(1) default 0 not null;
 
+alter table migtest_oto_child add column master_id bigint;
+
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 drop index ix_migtest_e_basic_indextest1 on migtest_e_basic;
 drop index ix_migtest_e_basic_indextest5 on migtest_e_basic;
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
+create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
+
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
+create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m on migtest_mtm_c_migtest_mtm_m (migtest_mtm_m_id);
+
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
+create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m on migtest_mtm_m_migtest_mtm_c (migtest_mtm_m_id);
+
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
+create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c on migtest_mtm_m_migtest_mtm_c (migtest_mtm_c_id);
+
+alter table migtest_ckey_parent add constraint fk_migtest_ckey_parent_assoc_id foreign key (assoc_id) references migtest_ckey_assoc (id) on delete restrict on update restrict;
+create index ix_migtest_ckey_parent_assoc_id on migtest_ckey_parent (assoc_id);
+
+alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict on update restrict;
+
 alter table migtest_e_history add column sys_period_start datetime(6) default now(6);
 alter table migtest_e_history add column sys_period_end datetime(6);
 create table migtest_e_history_history(
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
index a408ec0f3..804d8022f 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
@@ -2,9 +2,12 @@
 -- apply changes
 create table migtest_e_ref (
   id                            integer auto_increment not null,
+  name                          varchar(127) not null,
+  constraint uq_migtest_e_ref_name unique (name),
   constraint pk_migtest_e_ref primary key (id)
 );
 
+alter table migtest_ckey_detail drop foreign key fk_migtest_ckey_detail_parent;
 alter table migtest_fk_cascade drop foreign key fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
 alter table migtest_fk_none drop foreign key fk_migtest_fk_none_one_id;
@@ -24,6 +27,7 @@ alter table migtest_e_basic add column old_boolean tinyint(1) default 0 not null
 alter table migtest_e_basic add column old_boolean2 tinyint(1);
 alter table migtest_e_basic add column eref_id integer;
 
+alter table migtest_e_basic drop index uq_migtest_e_basic_status_indextest1;
 alter table migtest_e_basic drop index uq_migtest_e_basic_name;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest5;
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql
index 41953acfe..93f1fecae 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql
@@ -9,6 +9,12 @@ drop table migtest_e_history_history;
 
 
 -- apply changes
+alter table migtest_ckey_detail drop column one_key;
+
+alter table migtest_ckey_detail drop column two_key;
+
+alter table migtest_ckey_parent drop column assoc_id;
+
 alter table migtest_e_basic drop column new_string_field;
 
 alter table migtest_e_basic drop column new_boolean_field;
@@ -27,7 +33,11 @@ alter table migtest_e_history2_history drop column test_string3;
 
 alter table migtest_e_softdelete drop column deleted;
 
+alter table migtest_oto_child drop column master_id;
+
 drop table if exists migtest_e_user;
+drop table if exists migtest_mtm_c_migtest_mtm_m;
+drop table if exists migtest_mtm_m_migtest_mtm_c;
 -- changes: [drop test_string2, drop test_string3]
 lock tables migtest_e_history2 write;
 drop trigger migtest_e_history2_history_upd;
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
index fce202026..c0ddc9b36 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
@@ -1,5 +1,27 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+create table migtest_ckey_assoc (
+  id                            number(10) not null,
+  assoc_one                     varchar2(255),
+  constraint pk_migtest_ckey_assoc primary key (id)
+);
+create sequence migtest_ckey_assoc_seq;
+
+create table migtest_ckey_detail (
+  id                            number(10) not null,
+  something                     varchar2(255),
+  constraint pk_migtest_ckey_detail primary key (id)
+);
+create sequence migtest_ckey_detail_seq;
+
+create table migtest_ckey_parent (
+  one_key                       number(127) not null,
+  two_key                       varchar2(127) not null,
+  name                          varchar2(255),
+  version                       number(10) not null,
+  constraint pk_migtest_ckey_parent primary key (one_key,two_key)
+);
+
 create table migtest_fk_cascade (
   id                            number(19) not null,
   one_id                        number(19),
@@ -79,6 +101,8 @@ create sequence migtest_e_history2_seq;
 
 create table migtest_e_ref (
   id                            number(10) not null,
+  name                          varchar2(127) not null,
+  constraint uq_migtest_e_ref_name unique (name),
   constraint pk_migtest_e_ref primary key (id)
 );
 create sequence migtest_e_ref_seq;
@@ -90,6 +114,34 @@ create table migtest_e_softdelete (
 );
 create sequence migtest_e_softdelete_seq;
 
+create table migtest_mtm_c (
+  id                            number(10) not null,
+  name                          varchar2(255),
+  constraint pk_migtest_mtm_c primary key (id)
+);
+create sequence migtest_mtm_c_seq;
+
+create table migtest_mtm_m (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  constraint pk_migtest_mtm_m primary key (id)
+);
+create sequence migtest_mtm_m_seq;
+
+create table migtest_oto_child (
+  id                            number(10) not null,
+  name                          varchar2(255),
+  constraint pk_migtest_oto_child primary key (id)
+);
+create sequence migtest_oto_child_seq;
+
+create table migtest_oto_master (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  constraint pk_migtest_oto_master primary key (id)
+);
+create sequence migtest_oto_master_seq;
+
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
index 6f280989f..42734f8e4 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
@@ -6,6 +6,24 @@ create table migtest_e_user (
 );
 create sequence migtest_e_user_seq;
 
+create table migtest_mtm_c_migtest_mtm_m (
+  migtest_mtm_c_id              number(10) not null,
+  migtest_mtm_m_id              number(19) not null,
+  constraint pk_migtest_mtm_c_migtest_mtm_m primary key (migtest_mtm_c_id,migtest_mtm_m_id)
+);
+
+create table migtest_mtm_m_migtest_mtm_c (
+  migtest_mtm_m_id              number(19) not null,
+  migtest_mtm_c_id              number(10) not null,
+  constraint pk_migtest_mtm_m_migtest_mtm_c primary key (migtest_mtm_m_id,migtest_mtm_c_id)
+);
+
+alter table migtest_ckey_detail add column one_key number(127);
+alter table migtest_ckey_detail add column two_key varchar2(127);
+
+alter table migtest_ckey_detail add constraint fk_migtest_ckey_detail_parent foreign key (one_key,two_key) references migtest_ckey_parent (one_key,two_key);
+alter table migtest_ckey_parent add column assoc_id number(10);
+
 alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id);
 alter table migtest_fk_none add constraint fk_migtest_fk_none_one_id foreign key (one_id) references migtest_fk_one (id);
@@ -40,6 +58,7 @@ alter table migtest_e_basic add column new_integer number(10) default 42 not nul
 
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
+-- NOT YET IMPLEMENTED: alter table migtest_e_basic add constraint uq_migtest_e_basic_status_indextest1 unique  (status,indextest1);
 -- NOT YET IMPLEMENTED: alter table migtest_e_basic add constraint uq_migtest_e_basic_name unique  (name);
 -- NOT YET IMPLEMENTED: alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique  (indextest4);
 -- NOT YET IMPLEMENTED: alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
@@ -55,7 +74,26 @@ alter table migtest_e_history2 add column test_string3 varchar2(255) default 'un
 
 alter table migtest_e_softdelete add column deleted number(1) default 0 not null;
 
+alter table migtest_oto_child add column master_id number(19);
+
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 drop index ix_migtest_e_basic_indextest1;
 drop index ix_migtest_e_basic_indextest5;
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id);
+create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
+
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id);
+create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m on migtest_mtm_c_migtest_mtm_m (migtest_mtm_m_id);
+
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id);
+create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m on migtest_mtm_m_migtest_mtm_c (migtest_mtm_m_id);
+
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id);
+create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c on migtest_mtm_m_migtest_mtm_c (migtest_mtm_c_id);
+
+alter table migtest_ckey_parent add constraint fk_migtest_ckey_parent_assoc_id foreign key (assoc_id) references migtest_ckey_assoc (id);
+create index ix_migtest_ckey_parent_assoc_id on migtest_ckey_parent (assoc_id);
+
+alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id);
+
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
index f5cc85a85..28d4a8eb8 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
@@ -2,10 +2,13 @@
 -- apply changes
 create table migtest_e_ref (
   id                            number(10) not null,
+  name                          varchar2(127) not null,
+  constraint uq_migtest_e_ref_name unique (name),
   constraint pk_migtest_e_ref primary key (id)
 );
 create sequence migtest_e_ref_seq;
 
+alter table migtest_ckey_detail drop constraint fk_migtest_ckey_detail_parent;
 alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
 alter table migtest_fk_none drop constraint fk_migtest_fk_none_one_id;
@@ -28,6 +31,7 @@ alter table migtest_e_basic add column old_boolean number(1) default 0 not null;
 alter table migtest_e_basic add column old_boolean2 number(1);
 alter table migtest_e_basic add column eref_id number(10);
 
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_status_indextest1;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql
index d5272cd51..cf48c760e 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql
@@ -1,5 +1,11 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+alter table migtest_ckey_detail drop column one_key;
+
+alter table migtest_ckey_detail drop column two_key;
+
+alter table migtest_ckey_parent drop column assoc_id;
+
 alter table migtest_e_basic drop column new_string_field;
 
 alter table migtest_e_basic drop column new_boolean_field;
@@ -16,5 +22,9 @@ alter table migtest_e_history2 drop column test_string3;
 
 alter table migtest_e_softdelete drop column deleted;
 
+alter table migtest_oto_child drop column master_id;
+
 drop table migtest_e_user cascade constraints purge;
 drop sequence migtest_e_user_seq;
+drop table migtest_mtm_c_migtest_mtm_m cascade constraints purge;
+drop table migtest_mtm_m_migtest_mtm_c cascade constraints purge;
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
index 3a964227e..83a1b08b5 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
@@ -1,5 +1,25 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+create table migtest_ckey_assoc (
+  id                            serial not null,
+  assoc_one                     varchar(255),
+  constraint pk_migtest_ckey_assoc primary key (id)
+);
+
+create table migtest_ckey_detail (
+  id                            serial not null,
+  something                     varchar(255),
+  constraint pk_migtest_ckey_detail primary key (id)
+);
+
+create table migtest_ckey_parent (
+  one_key                       integer not null,
+  two_key                       varchar(127) not null,
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_migtest_ckey_parent primary key (one_key,two_key)
+);
+
 create table migtest_fk_cascade (
   id                            bigserial not null,
   one_id                        bigint,
@@ -70,6 +90,8 @@ create table migtest_e_history2 (
 
 create table migtest_e_ref (
   id                            serial not null,
+  name                          varchar(127) not null,
+  constraint uq_migtest_e_ref_name unique (name),
   constraint pk_migtest_e_ref primary key (id)
 );
 
@@ -79,6 +101,30 @@ create table migtest_e_softdelete (
   constraint pk_migtest_e_softdelete primary key (id)
 );
 
+create table migtest_mtm_c (
+  id                            serial not null,
+  name                          varchar(255),
+  constraint pk_migtest_mtm_c primary key (id)
+);
+
+create table migtest_mtm_m (
+  id                            bigserial not null,
+  name                          varchar(255),
+  constraint pk_migtest_mtm_m primary key (id)
+);
+
+create table migtest_oto_child (
+  id                            serial not null,
+  name                          varchar(255),
+  constraint pk_migtest_oto_child primary key (id)
+);
+
+create table migtest_oto_master (
+  id                            bigserial not null,
+  name                          varchar(255),
+  constraint pk_migtest_oto_master primary key (id)
+);
+
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
index 21b6c7129..86009299b 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
@@ -8,6 +8,24 @@ create table migtest_e_user (
   constraint pk_migtest_e_user primary key (id)
 );
 
+create table migtest_mtm_c_migtest_mtm_m (
+  migtest_mtm_c_id              integer not null,
+  migtest_mtm_m_id              bigint not null,
+  constraint pk_migtest_mtm_c_migtest_mtm_m primary key (migtest_mtm_c_id,migtest_mtm_m_id)
+);
+
+create table migtest_mtm_m_migtest_mtm_c (
+  migtest_mtm_m_id              bigint not null,
+  migtest_mtm_c_id              integer not null,
+  constraint pk_migtest_mtm_m_migtest_mtm_c primary key (migtest_mtm_m_id,migtest_mtm_c_id)
+);
+
+alter table migtest_ckey_detail add column one_key integer;
+alter table migtest_ckey_detail add column two_key varchar(127);
+
+alter table migtest_ckey_detail add constraint fk_migtest_ckey_detail_parent foreign key (one_key,two_key) references migtest_ckey_parent (one_key,two_key) on delete restrict on update restrict;
+alter table migtest_ckey_parent add column assoc_id integer;
+
 alter table if exists migtest_fk_cascade drop constraint if exists fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete restrict on update restrict;
 alter table migtest_fk_none add constraint fk_migtest_fk_none_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
@@ -42,6 +60,7 @@ alter table migtest_e_basic add column new_integer integer default 42 not null;
 
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
+alter table migtest_e_basic add constraint uq_migtest_e_basic_status_indextest1 unique  (status,indextest1);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_name unique  (name);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique  (indextest4);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
@@ -61,10 +80,29 @@ alter table migtest_e_history2_history add column test_string3 varchar(255);
 
 alter table migtest_e_softdelete add column deleted boolean default false not null;
 
+alter table migtest_oto_child add column master_id bigint;
+
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 drop index if exists ix_migtest_e_basic_indextest1;
 drop index if exists ix_migtest_e_basic_indextest5;
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
+create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
+
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
+create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m on migtest_mtm_c_migtest_mtm_m (migtest_mtm_m_id);
+
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
+create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m on migtest_mtm_m_migtest_mtm_c (migtest_mtm_m_id);
+
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
+create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c on migtest_mtm_m_migtest_mtm_c (migtest_mtm_c_id);
+
+alter table migtest_ckey_parent add constraint fk_migtest_ckey_parent_assoc_id foreign key (assoc_id) references migtest_ckey_assoc (id) on delete restrict on update restrict;
+create index ix_migtest_ckey_parent_assoc_id on migtest_ckey_parent (assoc_id);
+
+alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict on update restrict;
+
 alter table migtest_e_history add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
 create table migtest_e_history_history(like migtest_e_history);
 create view migtest_e_history_with_history as select * from migtest_e_history union all select * from migtest_e_history_history;
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
index a68497900..345be4828 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
@@ -2,9 +2,12 @@
 -- apply changes
 create table migtest_e_ref (
   id                            serial not null,
+  name                          varchar(127) not null,
+  constraint uq_migtest_e_ref_name unique (name),
   constraint pk_migtest_e_ref primary key (id)
 );
 
+alter table if exists migtest_ckey_detail drop constraint if exists fk_migtest_ckey_detail_parent;
 alter table if exists migtest_fk_cascade drop constraint if exists fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
 alter table if exists migtest_fk_none drop constraint if exists fk_migtest_fk_none_one_id;
@@ -27,6 +30,7 @@ alter table migtest_e_basic add column old_boolean boolean default false not nul
 alter table migtest_e_basic add column old_boolean2 boolean;
 alter table migtest_e_basic add column eref_id integer;
 
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_status_indextest1;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql
index 34086204d..e877b64da 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql
@@ -10,6 +10,12 @@ drop table migtest_e_history_history;
 drop view if exists migtest_e_history2_with_history;
 
 -- apply changes
+alter table migtest_ckey_detail drop column one_key;
+
+alter table migtest_ckey_detail drop column two_key;
+
+alter table migtest_ckey_parent drop column assoc_id;
+
 alter table migtest_e_basic drop column new_string_field;
 
 alter table migtest_e_basic drop column new_boolean_field;
@@ -28,8 +34,12 @@ alter table migtest_e_history2_history drop column test_string3;
 
 alter table migtest_e_softdelete drop column deleted;
 
+alter table migtest_oto_child drop column master_id;
+
 drop table if exists migtest_e_user cascade;
 drop sequence if exists migtest_e_user_seq;
+drop table if exists migtest_mtm_c_migtest_mtm_m cascade;
+drop table if exists migtest_mtm_m_migtest_mtm_c cascade;
 -- changes: [drop test_string2, drop test_string3]
 create or replace view migtest_e_history2_with_history as select id, test_string, sys_period from migtest_e_history2 union all select id, test_string, sys_period from migtest_e_history2_history;
 
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
index 7817850a0..5720ef6ab 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
@@ -1,5 +1,25 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+create table migtest_ckey_assoc (
+  id                            integer not null,
+  assoc_one                     varchar(255),
+  constraint pk_migtest_ckey_assoc primary key (id)
+);
+
+create table migtest_ckey_detail (
+  id                            integer not null,
+  something                     varchar(255),
+  constraint pk_migtest_ckey_detail primary key (id)
+);
+
+create table migtest_ckey_parent (
+  one_key                       integer(127) not null,
+  two_key                       varchar(127) not null,
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_migtest_ckey_parent primary key (one_key,two_key)
+);
+
 create table migtest_fk_cascade (
   id                            integer not null,
   one_id                        integer,
@@ -73,6 +93,8 @@ create table migtest_e_history2 (
 
 create table migtest_e_ref (
   id                            integer not null,
+  name                          varchar(127) not null,
+  constraint uq_migtest_e_ref_name unique (name),
   constraint pk_migtest_e_ref primary key (id)
 );
 
@@ -82,5 +104,29 @@ create table migtest_e_softdelete (
   constraint pk_migtest_e_softdelete primary key (id)
 );
 
+create table migtest_mtm_c (
+  id                            integer not null,
+  name                          varchar(255),
+  constraint pk_migtest_mtm_c primary key (id)
+);
+
+create table migtest_mtm_m (
+  id                            integer not null,
+  name                          varchar(255),
+  constraint pk_migtest_mtm_m primary key (id)
+);
+
+create table migtest_oto_child (
+  id                            integer not null,
+  name                          varchar(255),
+  constraint pk_migtest_oto_child primary key (id)
+);
+
+create table migtest_oto_master (
+  id                            integer not null,
+  name                          varchar(255),
+  constraint pk_migtest_oto_master primary key (id)
+);
+
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
index 6bfca30fe..d5e7c150e 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
@@ -5,6 +5,27 @@ create table migtest_e_user (
   constraint pk_migtest_e_user primary key (id)
 );
 
+create table migtest_mtm_c_migtest_mtm_m (
+  migtest_mtm_c_id              integer not null,
+  migtest_mtm_m_id              integer not null,
+  constraint pk_migtest_mtm_c_migtest_mtm_m primary key (migtest_mtm_c_id,migtest_mtm_m_id),
+  foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict,
+  foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict
+);
+
+create table migtest_mtm_m_migtest_mtm_c (
+  migtest_mtm_m_id              integer not null,
+  migtest_mtm_c_id              integer not null,
+  constraint pk_migtest_mtm_m_migtest_mtm_c primary key (migtest_mtm_m_id,migtest_mtm_c_id),
+  foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict,
+  foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict
+);
+
+alter table migtest_ckey_detail add column one_key integer(127);
+alter table migtest_ckey_detail add column two_key varchar(127);
+
+alter table migtest_ckey_parent add column assoc_id integer;
+
 alter table migtest_fk_cascade drop constraint if exists fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_set_null drop constraint if exists fk_migtest_fk_set_null_one_id;
 
@@ -34,6 +55,7 @@ alter table migtest_e_basic add column new_integer integer default 42 not null;
 
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
+alter table migtest_e_basic add constraint uq_migtest_e_basic_status_indextest1 unique  (status,indextest1);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_name unique  (name);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique  (indextest4);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
@@ -49,7 +71,12 @@ alter table migtest_e_history2_history add column test_string3 varchar(255);
 
 alter table migtest_e_softdelete add column deleted int default 0 not null;
 
+alter table migtest_oto_child add column master_id integer;
+
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 drop index if exists ix_migtest_e_basic_indextest1;
 drop index if exists ix_migtest_e_basic_indextest5;
+create index ix_migtest_ckey_parent_assoc_id on migtest_ckey_parent (assoc_id);
+
+
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
index 77f17afb5..f06daf11d 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
@@ -2,9 +2,12 @@
 -- apply changes
 create table migtest_e_ref (
   id                            integer not null,
+  name                          varchar(127) not null,
+  constraint uq_migtest_e_ref_name unique (name),
   constraint pk_migtest_e_ref primary key (id)
 );
 
+alter table migtest_ckey_detail drop constraint if exists fk_migtest_ckey_detail_parent;
 alter table migtest_fk_cascade drop constraint if exists fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_none drop constraint if exists fk_migtest_fk_none_one_id;
 alter table migtest_fk_none_via_join drop constraint if exists fk_migtest_fk_none_via_join_one_id;
@@ -25,6 +28,7 @@ alter table migtest_e_basic add column old_boolean int default 0 not null;
 alter table migtest_e_basic add column old_boolean2 int;
 alter table migtest_e_basic add column eref_id integer;
 
+alter table migtest_e_basic drop constraint uq_migtest_e_basic_status_indextest1;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql
index 12531750d..0d3d24380 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql
@@ -1,5 +1,11 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+alter table migtest_ckey_detail drop column one_key;
+
+alter table migtest_ckey_detail drop column two_key;
+
+alter table migtest_ckey_parent drop column assoc_id;
+
 alter table migtest_e_basic drop column new_string_field;
 
 alter table migtest_e_basic drop column new_boolean_field;
@@ -18,4 +24,8 @@ alter table migtest_e_history2_history drop column test_string3;
 
 alter table migtest_e_softdelete drop column deleted;
 
+alter table migtest_oto_child drop column master_id;
+
 drop table if exists migtest_e_user;
+drop table if exists migtest_mtm_c_migtest_mtm_m;
+drop table if exists migtest_mtm_m_migtest_mtm_c;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql
index 58a36d80e..be7ab17be 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql
@@ -1,5 +1,27 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+create table migtest_ckey_assoc (
+  id                            integer not null,
+  assoc_one                     varchar(255),
+  constraint pk_migtest_ckey_assoc primary key (id)
+);
+create sequence migtest_ckey_assoc_seq as bigint  start with 1 ;
+
+create table migtest_ckey_detail (
+  id                            integer not null,
+  something                     varchar(255),
+  constraint pk_migtest_ckey_detail primary key (id)
+);
+create sequence migtest_ckey_detail_seq as bigint  start with 1 ;
+
+create table migtest_ckey_parent (
+  one_key                       integer not null,
+  two_key                       varchar(127) not null,
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_migtest_ckey_parent primary key (one_key,two_key)
+);
+
 create table migtest_fk_cascade (
   id                            numeric(19) not null,
   one_id                        numeric(19),
@@ -79,8 +101,10 @@ create sequence migtest_e_history2_seq as bigint  start with 1 ;
 
 create table migtest_e_ref (
   id                            integer not null,
+  name                          varchar(127) not null,
   constraint pk_migtest_e_ref primary key (id)
 );
+alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique  (name);
 create sequence migtest_e_ref_seq as bigint  start with 1 ;
 
 create table migtest_e_softdelete (
@@ -90,6 +114,34 @@ create table migtest_e_softdelete (
 );
 create sequence migtest_e_softdelete_seq as bigint  start with 1 ;
 
+create table migtest_mtm_c (
+  id                            integer not null,
+  name                          varchar(255),
+  constraint pk_migtest_mtm_c primary key (id)
+);
+create sequence migtest_mtm_c_seq as bigint  start with 1 ;
+
+create table migtest_mtm_m (
+  id                            numeric(19) not null,
+  name                          varchar(255),
+  constraint pk_migtest_mtm_m primary key (id)
+);
+create sequence migtest_mtm_m_seq as bigint  start with 1 ;
+
+create table migtest_oto_child (
+  id                            integer not null,
+  name                          varchar(255),
+  constraint pk_migtest_oto_child primary key (id)
+);
+create sequence migtest_oto_child_seq as bigint  start with 1 ;
+
+create table migtest_oto_master (
+  id                            numeric(19) not null,
+  name                          varchar(255),
+  constraint pk_migtest_oto_master primary key (id)
+);
+create sequence migtest_oto_master_seq as bigint  start with 1 ;
+
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql
index b873a0152..e20737814 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql
@@ -6,6 +6,24 @@ create table migtest_e_user (
 );
 create sequence migtest_e_user_seq as bigint  start with 1 ;
 
+create table migtest_mtm_c_migtest_mtm_m (
+  migtest_mtm_c_id              integer not null,
+  migtest_mtm_m_id              numeric(19) not null,
+  constraint pk_migtest_mtm_c_migtest_mtm_m primary key (migtest_mtm_c_id,migtest_mtm_m_id)
+);
+
+create table migtest_mtm_m_migtest_mtm_c (
+  migtest_mtm_m_id              numeric(19) not null,
+  migtest_mtm_c_id              integer not null,
+  constraint pk_migtest_mtm_m_migtest_mtm_c primary key (migtest_mtm_m_id,migtest_mtm_c_id)
+);
+
+alter table migtest_ckey_detail add one_key integer;
+alter table migtest_ckey_detail add two_key varchar(127);
+
+alter table migtest_ckey_detail add constraint fk_migtest_ckey_detail_parent foreign key (one_key,two_key) references migtest_ckey_parent (one_key,two_key);
+alter table migtest_ckey_parent add assoc_id integer;
+
 IF OBJECT_ID('fk_migtest_fk_cascade_one_id', 'F') IS NOT NULL alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id);
 alter table migtest_fk_none add constraint fk_migtest_fk_none_one_id foreign key (one_id) references migtest_fk_one (id);
@@ -42,6 +60,7 @@ IF (OBJECT_ID('uq_migtest_e_basic_indextest2', 'UQ') IS NOT NULL) alter table mi
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_indextest2') drop index uq_migtest_e_basic_indextest2 ON migtest_e_basic;
 IF (OBJECT_ID('uq_migtest_e_basic_indextest6', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_indextest6') drop index uq_migtest_e_basic_indextest6 ON migtest_e_basic;
+create unique nonclustered index uq_migtest_e_basic_status_indextest1 on migtest_e_basic(status,indextest1) where indextest1 is not null;
 create unique nonclustered index uq_migtest_e_basic_name on migtest_e_basic(name) where name is not null;
 create unique nonclustered index uq_migtest_e_basic_indextest4 on migtest_e_basic(indextest4) where indextest4 is not null;
 create unique nonclustered index uq_migtest_e_basic_indextest5 on migtest_e_basic(indextest5) where indextest5 is not null;
@@ -55,10 +74,29 @@ alter table migtest_e_history2 add test_string3 varchar(255) default 'unknown' n
 
 alter table migtest_e_softdelete add deleted bit default 0 not null;
 
+alter table migtest_oto_child add master_id numeric(19);
+
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest1') drop index ix_migtest_e_basic_indextest1 ON migtest_e_basic;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest5') drop index ix_migtest_e_basic_indextest5 ON migtest_e_basic;
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id);
+create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
+
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id);
+create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m on migtest_mtm_c_migtest_mtm_m (migtest_mtm_m_id);
+
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id);
+create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m on migtest_mtm_m_migtest_mtm_c (migtest_mtm_m_id);
+
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id);
+create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c on migtest_mtm_m_migtest_mtm_c (migtest_mtm_c_id);
+
+alter table migtest_ckey_parent add constraint fk_migtest_ckey_parent_assoc_id foreign key (assoc_id) references migtest_ckey_assoc (id);
+create index ix_migtest_ckey_parent_assoc_id on migtest_ckey_parent (assoc_id);
+
+alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id);
+
 alter table migtest_e_history
     add sys_periodFrom datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(),
         sys_periodTo   datetime2 GENERATED ALWAYS AS ROW END   NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql
index 944c52349..5109fb90e 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql
@@ -2,10 +2,13 @@
 -- apply changes
 create table migtest_e_ref (
   id                            integer not null,
+  name                          varchar(127) not null,
   constraint pk_migtest_e_ref primary key (id)
 );
+alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique  (name);
 create sequence migtest_e_ref_seq as bigint  start with 1 ;
 
+IF OBJECT_ID('fk_migtest_ckey_detail_parent', 'F') IS NOT NULL alter table migtest_ckey_detail drop constraint fk_migtest_ckey_detail_parent;
 IF OBJECT_ID('fk_migtest_fk_cascade_one_id', 'F') IS NOT NULL alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
 IF OBJECT_ID('fk_migtest_fk_none_one_id', 'F') IS NOT NULL alter table migtest_fk_none drop constraint fk_migtest_fk_none_one_id;
@@ -35,6 +38,8 @@ alter table migtest_e_basic add old_boolean bit default 0 not null;
 alter table migtest_e_basic add old_boolean2 bit;
 alter table migtest_e_basic add eref_id integer;
 
+IF (OBJECT_ID('uq_migtest_e_basic_status_indextest1', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_status_indextest1;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_status_indextest1') drop index uq_migtest_e_basic_status_indextest1 ON migtest_e_basic;
 IF (OBJECT_ID('uq_migtest_e_basic_name', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_name') drop index uq_migtest_e_basic_name ON migtest_e_basic;
 IF (OBJECT_ID('uq_migtest_e_basic_indextest4', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.4__dropsFor_1.3.sql
index 745ec6bd2..50be4368d 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.4__dropsFor_1.3.sql
@@ -1,5 +1,44 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+-- drop column migtest_ckey_detail.one_key;
+IF (OBJECT_ID('uq_migtest_ckey_detail_one_key', 'UQ') IS NOT NULL) alter table migtest_ckey_detail drop constraint uq_migtest_ckey_detail_one_key;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_ckey_detail','U') AND name = 'uq_migtest_ckey_detail_one_key') drop index uq_migtest_ckey_detail_one_key ON migtest_ckey_detail;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_ckey_detail') and t2.name = 'one_key';
+if @Tmp is not null EXEC('alter table migtest_ckey_detail drop constraint ' + @Tmp)$$;
+IF (OBJECT_ID('ck_migtest_ckey_detail_one_key', 'C') IS NOT NULL) alter table migtest_ckey_detail drop constraint ck_migtest_ckey_detail_one_key;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_ckey_detail','U') AND name = 'ix_migtest_ckey_detail_one_key') drop index ix_migtest_ckey_detail_one_key ON migtest_ckey_detail;
+IF OBJECT_ID('fk_migtest_ckey_detail_one_key', 'F') IS NOT NULL alter table migtest_ckey_detail drop constraint fk_migtest_ckey_detail_one_key;
+alter table migtest_ckey_detail drop column one_key;
+
+-- drop column migtest_ckey_detail.two_key;
+IF (OBJECT_ID('uq_migtest_ckey_detail_two_key', 'UQ') IS NOT NULL) alter table migtest_ckey_detail drop constraint uq_migtest_ckey_detail_two_key;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_ckey_detail','U') AND name = 'uq_migtest_ckey_detail_two_key') drop index uq_migtest_ckey_detail_two_key ON migtest_ckey_detail;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_ckey_detail') and t2.name = 'two_key';
+if @Tmp is not null EXEC('alter table migtest_ckey_detail drop constraint ' + @Tmp)$$;
+IF (OBJECT_ID('ck_migtest_ckey_detail_two_key', 'C') IS NOT NULL) alter table migtest_ckey_detail drop constraint ck_migtest_ckey_detail_two_key;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_ckey_detail','U') AND name = 'ix_migtest_ckey_detail_two_key') drop index ix_migtest_ckey_detail_two_key ON migtest_ckey_detail;
+IF OBJECT_ID('fk_migtest_ckey_detail_two_key', 'F') IS NOT NULL alter table migtest_ckey_detail drop constraint fk_migtest_ckey_detail_two_key;
+alter table migtest_ckey_detail drop column two_key;
+
+-- drop column migtest_ckey_parent.assoc_id;
+IF (OBJECT_ID('uq_migtest_ckey_parent_assoc_id', 'UQ') IS NOT NULL) alter table migtest_ckey_parent drop constraint uq_migtest_ckey_parent_assoc_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_ckey_parent','U') AND name = 'uq_migtest_ckey_parent_assoc_id') drop index uq_migtest_ckey_parent_assoc_id ON migtest_ckey_parent;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_ckey_parent') and t2.name = 'assoc_id';
+if @Tmp is not null EXEC('alter table migtest_ckey_parent drop constraint ' + @Tmp)$$;
+IF (OBJECT_ID('ck_migtest_ckey_parent_assoc_id', 'C') IS NOT NULL) alter table migtest_ckey_parent drop constraint ck_migtest_ckey_parent_assoc_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_ckey_parent','U') AND name = 'ix_migtest_ckey_parent_assoc_id') drop index ix_migtest_ckey_parent_assoc_id ON migtest_ckey_parent;
+IF OBJECT_ID('fk_migtest_ckey_parent_assoc_id', 'F') IS NOT NULL alter table migtest_ckey_parent drop constraint fk_migtest_ckey_parent_assoc_id;
+alter table migtest_ckey_parent drop column assoc_id;
+
 -- drop column migtest_e_basic.new_string_field;
 IF (OBJECT_ID('uq_migtest_e_basic_new_string_field', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_new_string_field;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_new_string_field') drop index uq_migtest_e_basic_new_string_field ON migtest_e_basic;
@@ -104,8 +143,23 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_s
 IF OBJECT_ID('fk_migtest_e_softdelete_deleted', 'F') IS NOT NULL alter table migtest_e_softdelete drop constraint fk_migtest_e_softdelete_deleted;
 alter table migtest_e_softdelete drop column deleted;
 
+-- drop column migtest_oto_child.master_id;
+IF (OBJECT_ID('uq_migtest_oto_child_master_id', 'UQ') IS NOT NULL) alter table migtest_oto_child drop constraint uq_migtest_oto_child_master_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_oto_child','U') AND name = 'uq_migtest_oto_child_master_id') drop index uq_migtest_oto_child_master_id ON migtest_oto_child;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_oto_child') and t2.name = 'master_id';
+if @Tmp is not null EXEC('alter table migtest_oto_child drop constraint ' + @Tmp)$$;
+IF (OBJECT_ID('ck_migtest_oto_child_master_id', 'C') IS NOT NULL) alter table migtest_oto_child drop constraint ck_migtest_oto_child_master_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_oto_child','U') AND name = 'ix_migtest_oto_child_master_id') drop index ix_migtest_oto_child_master_id ON migtest_oto_child;
+IF OBJECT_ID('fk_migtest_oto_child_master_id', 'F') IS NOT NULL alter table migtest_oto_child drop constraint fk_migtest_oto_child_master_id;
+alter table migtest_oto_child drop column master_id;
+
 IF OBJECT_ID('migtest_e_user', 'U') IS NOT NULL drop table migtest_e_user;
 IF OBJECT_ID('migtest_e_user_seq', 'SO') IS NOT NULL drop sequence migtest_e_user_seq;
+IF OBJECT_ID('migtest_mtm_c_migtest_mtm_m', 'U') IS NOT NULL drop table migtest_mtm_c_migtest_mtm_m;
+IF OBJECT_ID('migtest_mtm_m_migtest_mtm_c', 'U') IS NOT NULL drop table migtest_mtm_m_migtest_mtm_c;
 -- dropping history support for migtest_e_history;
 delimiter $$
 DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1

From 392eb2744dff4cc84f6248f9e5d92ebb5fbcbda2 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Fri, 2 Mar 2018 00:17:23 +0100
Subject: [PATCH 0118/1036] ADD: comment

---
 .../dbmigration/ddlgeneration/platform/PlatformDdl.java   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
index 145fd6fc2..14fb23163 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -623,6 +623,14 @@ public class PlatformDdl {
 
   }
 
+  /**
+   * Shortens the given name to the maximum constraint name length of the platform in a deterministic way.
+   *
+   * First, all vowels are removed, If the string is still to long, 31 bits are taken from the hash code
+   * of the string and base36 encoded (10 digits and 26 chars) string.
+   *
+   * As 36^6 > 31^2, the resulting string is never longer as 6 chars.
+   */
   protected String maxConstraintName(String name) {
     if (name.length() > platform.getMaxConstraintNameLength()) {
       int hash = name.hashCode() & 0x7FFFFFFF;

From 9953ef35ebb9aa335ce481da12bc004bfde79b39 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Wed, 28 Feb 2018 21:41:04 +0100
Subject: [PATCH 0119/1036] ENH: native UUID-support for SqlServer

---
 .../ebean/config/dbplatform/sqlserver/SqlServerPlatform.java  | 4 ++++
 .../io/ebeaninternal/server/type/ScalarTypeUUIDNative.java    | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java
index 31e1a8525..d38c06eae 100644
--- a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java
@@ -31,6 +31,7 @@ public class SqlServerPlatform extends DatabasePlatform {
     this.sqlLimiter = new SqlServerSqlLimiter();
     this.basicSqlLimiter = new SqlServerBasicSqlLimiter();
     this.historySupport = new SqlServerHistorySupport();
+    this.nativeUuidType = true;
     this.dbIdentity.setIdType(IdType.IDENTITY);
     this.dbIdentity.setSupportsGetGeneratedKeys(true);
     this.dbIdentity.setSupportsIdentity(true);
@@ -83,6 +84,9 @@ public class SqlServerPlatform extends DatabasePlatform {
     if (dbIdentity.getIdType() == IdType.SEQUENCE) {
       this.persistBatchOnCascade = PersistBatch.ALL;
     }
+    if (nativeUuidType && config.getDbTypeConfig().getDbUuid().useNativeType()) {
+      dbTypeMap.put(DbType.UUID, new DbPlatformType("uniqueidentifier", false));
+    }
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDNative.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDNative.java
index cf96f2704..fc4600ed4 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDNative.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDNative.java
@@ -20,6 +20,9 @@ public class ScalarTypeUUIDNative extends ScalarTypeUUIDBase {
     if (value == null) {
       return null;
     }
+    if (value instanceof String) {
+      return UUID.fromString((String) value);
+    }
     return (UUID) value;
   }
 

From 54530248a5ba2fdd9aa2a79adbf389f524ac2920 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 2 Mar 2018 13:25:55 +1300
Subject: [PATCH 0120/1036] #1312 - ENH: added SqlRow factory method to
 RawSqlService

Support the PR added binaryOptimizedUUID
---
 src/main/java/io/ebean/RawSqlBuilder.java                 | 8 +++-----
 src/main/java/io/ebean/service/SpiRawSqlService.java      | 7 +++++--
 .../io/ebeaninternal/server/rawsql/DRawSqlService.java    | 5 +++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/ebean/RawSqlBuilder.java b/src/main/java/io/ebean/RawSqlBuilder.java
index 44121962c..0df4ac184 100644
--- a/src/main/java/io/ebean/RawSqlBuilder.java
+++ b/src/main/java/io/ebean/RawSqlBuilder.java
@@ -26,12 +26,10 @@ public interface RawSqlBuilder {
   }
 
   /**
-   * Create and return a SqlRow based on the resultSet and the dbTrueValue.
-   * @throws SQLException
+   * Create and return a SqlRow based on the resultSet with dbTrueValue and binaryOptimizedUUID options.
    */
-  static SqlRow sqlRow(ResultSet resultSet, final String dbTrueValue) throws SQLException {
-    return XServiceProvider.rawSql().sqlRow(resultSet, dbTrueValue);
-
+  static SqlRow sqlRow(ResultSet resultSet, final String dbTrueValue, boolean binaryOptimizedUUID) throws SQLException {
+    return XServiceProvider.rawSql().sqlRow(resultSet, dbTrueValue, binaryOptimizedUUID);
   }
 
   /**
diff --git a/src/main/java/io/ebean/service/SpiRawSqlService.java b/src/main/java/io/ebean/service/SpiRawSqlService.java
index 4d201fc58..323d3f055 100644
--- a/src/main/java/io/ebean/service/SpiRawSqlService.java
+++ b/src/main/java/io/ebean/service/SpiRawSqlService.java
@@ -29,7 +29,10 @@ public interface SpiRawSqlService {
 
   /**
    * Create based on a JDBC ResultSet.
-   * @throws SQLException 
+   *
+   * @param resultSet           The ResultSet row to read as a SqlRow
+   * @param dbTrueValue         The DB true value
+   * @param binaryOptimizedUUID Flag set to true if the UUID value is stored as optimised binary(16)
    */
-  SqlRow sqlRow(ResultSet resultSet, String dbTrueValue) throws SQLException;
+  SqlRow sqlRow(ResultSet resultSet, String dbTrueValue, boolean binaryOptimizedUUID) throws SQLException;
 }
diff --git a/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java b/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
index 27f90a017..dd573111b 100644
--- a/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
+++ b/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
@@ -34,10 +34,11 @@ public class DRawSqlService implements SpiRawSqlService {
   }
 
   @Override
-  public SqlRow sqlRow(ResultSet resultSet, String dbTrueValue) throws SQLException {
+  public SqlRow sqlRow(ResultSet resultSet, String dbTrueValue, boolean binaryOptimizedUUID) throws SQLException {
+
     ResultSetMetaData meta = resultSet.getMetaData();
     int estCap = (int) (meta.getColumnCount() / 0.7f) + 1;
-    DefaultSqlRow ret = new DefaultSqlRow(estCap, 0.75f, dbTrueValue);
+    DefaultSqlRow ret = new DefaultSqlRow(estCap, 0.75f, dbTrueValue, binaryOptimizedUUID);
 
     for (int i = 1; i <= meta.getColumnCount(); i++) {
       String name = meta.getColumnLabel(i);

From 09786a7062b554c9f415d39d26595184b766f963 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 2 Mar 2018 13:30:40 +1300
Subject: [PATCH 0121/1036] #1301 - No effective change - format lines

---
 .editorconfig                                               | 1 +
 .../io/ebeaninternal/dbmigration/DefaultDbMigration.java    | 3 +--
 .../io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java  | 6 ++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 837d975fa..18b710430 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,3 +10,4 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 spaces_around_operators = true
+max_line_length = 130
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index 900e049f3..d767d62a6 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -268,8 +268,7 @@ public class DefaultDbMigration implements DbMigration {
       if (extraDdl != null) {
         List<DdlScript> ddlScript = extraDdl.getDdlScript();
         for (DdlScript script : ddlScript) {
-          if (script.isDrop() == false
-              && ExtraDdlXmlReader.matchPlatform(dbPlatform.getName(), script.getPlatforms())) {
+          if (!script.isDrop() && ExtraDdlXmlReader.matchPlatform(dbPlatform.getName(), script.getPlatforms())) {
             writeExtraDdl(migrationDir, script);
           }
         }
diff --git a/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java b/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
index b9c7e8392..629c9d202 100644
--- a/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
+++ b/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
@@ -1,10 +1,9 @@
 package io.ebeaninternal.extraddl.model;
 
+import io.ebean.util.StringHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import io.ebean.util.StringHelper;
-
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
@@ -28,8 +27,7 @@ public class ExtraDdlXmlReader {
     }
     StringBuilder sb = new StringBuilder(300);
     for (DdlScript script : read.getDdlScript()) {
-      if (script.isDrop() == drops
-          && matchPlatform(platformName, script.getPlatforms())) {
+      if (script.isDrop() == drops && matchPlatform(platformName, script.getPlatforms())) {
         logger.debug("include script {}", script.getName());
         String value = script.getValue();
         sb.append(value);

From 78912d75e0392c3ca363938427b70db9bc7bae6d Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 2 Mar 2018 13:45:31 +1300
Subject: [PATCH 0122/1036] #1306 - No effective change - javadoc update

---
 .../java/io/ebean/config/ServerConfig.java    | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 679692b88..b0b341fb8 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -293,7 +293,7 @@ public class ServerConfig {
   /**
    * When true create a read only DataSource using readOnlyDataSourceConfig defaulting values from dataSourceConfig.
    * I believe this will default to true in some future release (as it has a nice performance benefit).
-   *
+   * <p>
    * autoReadOnlyDataSource is an unfortunate name for this config option but I haven't come up with a better one.
    */
   private boolean autoReadOnlyDataSource;
@@ -483,8 +483,7 @@ public class ServerConfig {
 
   /**
    * Should the javax.validation.constraints.NotNull enforce a notNull column in DB.
-   * If set to false, you have to use io.ebean.annotation.NotNull to explicityl create
-   * a not null column.
+   * If set to false, use io.ebean.annotation.NotNull or Column(nullable=true).
    */
   private boolean useJavaxValidationNotNull = true;
 
@@ -3034,14 +3033,12 @@ public class ServerConfig {
   }
 
   /**
-   * Controlws when Ebean should generate a <code>NOT NULL</code> column.
-   * If an <code>io.ebean.annotation.NotNull</code> is present, Ebean generates
-   * <code>NOT NULL</code> columns
-   * If set to <code>true</code> (default) Ebean generates also
-   * <code>NOT NULL</code> columns when a <code>&x64;javax.validation.contstraints.NotNull</code>
-   * annotation is present (and it is in <code>Default</code> group.)
-   * If set to <code>false</code> the <code>&x64;javax.validation.contstraints.NotNull</code> is
-   * ignored
+   * Controls if Ebean should ignore <code>&x64;javax.validation.contstraints.NotNull</code>
+   * with respect to generating a <code>NOT NULL</code> column.
+   * <p>
+   * Normally when Ebean sees javax NotNull annotation it means that column is defined as NOT NULL.
+   * Set this to <code>false</code> and the javax NotNull annotation is effectively ignored (and
+   * we instead use Ebean's own NotNull annotation or JPA Column(nullable=false) annotation.
    */
   public void setUseJavaxValidationNotNull(boolean useJavaxValidationNotNull) {
     this.useJavaxValidationNotNull = useJavaxValidationNotNull;
@@ -3091,7 +3088,6 @@ public class ServerConfig {
     return dataSource;
   }
 
-  /**
   /**
    * Specify how UUID is stored.
    */
@@ -3164,5 +3160,5 @@ public class ServerConfig {
     VERSION4,
     VERSION1,
     VERSION1RND
-  };
+  }
 }

From 98e014f8c86366bd51da27b34d686a4cd3721b10 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 2 Mar 2018 14:30:38 +1300
Subject: [PATCH 0123/1036] #1300 - NEW: FetchCountDistinct ... add example to
 javadoc + support chaining use via ExpressionList

---
 src/main/java/io/ebean/ExpressionList.java    |  30 +++
 src/main/java/io/ebean/Query.java             |  26 ++
 .../expression/DefaultExpressionList.java     |   5 +
 .../server/expression/JunctionExpression.java |   6 +
 .../query/other/TestQuerySingleAttribute.java | 230 ++++++++++--------
 5 files changed, 193 insertions(+), 104 deletions(-)

diff --git a/src/main/java/io/ebean/ExpressionList.java b/src/main/java/io/ebean/ExpressionList.java
index 1a5db3a21..588a6f7c0 100644
--- a/src/main/java/io/ebean/ExpressionList.java
+++ b/src/main/java/io/ebean/ExpressionList.java
@@ -480,6 +480,36 @@ public interface ExpressionList<T> {
    */
   Query<T> setUseQueryCache(CacheMode useCache);
 
+  /**
+   * Extended version for setDistinct in conjunction with "findSingleAttributeList";
+   *
+   * <pre>{@code
+   *
+   *  List<CountedValue<Order.Status>> orderStatusCount =
+   *
+   *     Ebean.find(Order.class)
+   *      .select("status")
+   *      .where()
+   *      .gt("orderDate", LocalDate.now().minusMonths(3))
+   *
+   *      // fetch as single attribute with a COUNT
+   *      .setCountDistinct(CountDistinctOrder.COUNT_DESC_ATTR_ASC)
+   *      .findSingleAttributeList();
+   *
+   *     for (CountedValue<Order.Status> entry : orderStatusCount) {
+   *       System.out.println(" count:" + entry.getCount()+" orderStatus:" + entry.getValue() );
+   *     }
+   *
+   *   // produces
+   *
+   *   count:3 orderStatus:NEW
+   *   count:1 orderStatus:SHIPPED
+   *   count:1 orderStatus:COMPLETE
+   *
+   * }</pre>
+   */
+  Query<T> setCountDistinct(CountDistinctOrder orderBy);
+
   /**
    * Calls {@link #setUseQueryCache(CacheMode)} with <code>ON</code> or <code>OFF</code>.
    *
diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index b69e0c631..c7e4ed104 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -1279,6 +1279,32 @@ public interface Query<T> {
 
   /**
    * Extended version for setDistinct in conjunction with "findSingleAttributeList";
+   *
+   * <pre>{@code
+   *
+   *  List<CountedValue<Order.Status>> orderStatusCount =
+   *
+   *     Ebean.find(Order.class)
+   *      .select("status")
+   *      .where()
+   *      .gt("orderDate", LocalDate.now().minusMonths(3))
+   *
+   *      // fetch as single attribute with a COUNT
+   *      .setCountDistinct(CountDistinctOrder.COUNT_DESC_ATTR_ASC)
+   *      .findSingleAttributeList();
+   *
+   *     for (CountedValue<Order.Status> entry : orderStatusCount) {
+   *       System.out.println(" count:" + entry.getCount()+" orderStatus:" + entry.getValue() );
+   *     }
+   *
+   *   // produces
+   *
+   *   count:3 orderStatus:NEW
+   *   count:1 orderStatus:SHIPPED
+   *   count:1 orderStatus:COMPLETE
+   *
+   * }</pre>
+   *
    */
   Query<T> setCountDistinct(CountDistinctOrder orderBy);
 
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 49a6daec2..ec0e9b738 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.CacheMode;
+import io.ebean.CountDistinctOrder;
 import io.ebean.Expression;
 import io.ebean.ExpressionFactory;
 import io.ebean.ExpressionList;
@@ -493,6 +494,10 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return query.setUseQueryCache(useCache);
   }
 
+  public Query<T> setCountDistinct(CountDistinctOrder orderBy) {
+    return query.setCountDistinct(orderBy);
+  }
+
   @Override
   public Query<T> setUseDocStore(boolean useDocsStore) {
     return query.setUseDocStore(useDocsStore);
diff --git a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index d54096cc6..6b54867ff 100644
--- a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.CacheMode;
+import io.ebean.CountDistinctOrder;
 import io.ebean.Expression;
 import io.ebean.ExpressionList;
 import io.ebean.FetchPath;
@@ -792,6 +793,11 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.setDisableReadAuditing();
   }
 
+  @Override
+  public Query<T> setCountDistinct(CountDistinctOrder orderBy) {
+    return exprList.setCountDistinct(orderBy);
+  }
+
   @Override
   public ExpressionList<T> startsWith(String propertyName, String value) {
     return exprList.startsWith(propertyName, value);
diff --git a/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
index 101c0326f..ade6d2a91 100644
--- a/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
+++ b/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
@@ -12,9 +12,11 @@ import org.tests.inherit.Data;
 import org.tests.inherit.EUncle;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
+import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
 
 import java.sql.Date;
+import java.time.LocalDate;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -161,11 +163,11 @@ public class TestQuerySingleAttribute extends BaseTestCase {
   }
 
   @Test
-  public void distinctOnIdProperty(){
+  public void distinctOnIdProperty() {
     Query<Customer> query = Ebean.find(Customer.class)
-        .setDistinct(true)
-        .select("id")
-        .setMaxRows(100);
+      .setDistinct(true)
+      .select("id")
+      .setMaxRows(100);
 
     List<String> ids = query.findSingleAttributeList();
     if (isSqlServer()) {
@@ -185,8 +187,8 @@ public class TestQuerySingleAttribute extends BaseTestCase {
     ResetBasicData.reset();
 
     Query<Customer> query = Ebean.find(Customer.class)
-        .setDistinct(true)
-        .fetch("billingAddress","city");
+      .setDistinct(true)
+      .fetch("billingAddress", "city");
 
     List<String> cities = query.findSingleAttributeList();
 
@@ -200,22 +202,23 @@ public class TestQuerySingleAttribute extends BaseTestCase {
     ResetBasicData.reset();
 
     Query<Contact> query = Ebean.find(Contact.class)
-        .setDistinct(true)
-        .fetch("customer.billingAddress","city");
+      .setDistinct(true)
+      .fetch("customer.billingAddress", "city");
 
     List<String> cities = query.findSingleAttributeList();
 
     assertThat(sqlOf(query)).contains("select distinct t2.city from contact t0 join o_customer t1 on t1.id = t0.customer_id  left join o_address t2 on t2.id = t1.billing_address_id");
     assertThat(cities).contains("Auckland").containsNull();
   }
+
   @Test
   public void distinctSelectOnInheritedBean() {
 
     ResetBasicData.reset();
 
     Query<ChildA> query = Ebean.find(ChildA.class)
-        .setDistinct(true)
-        .select("more");
+      .setDistinct(true)
+      .select("more");
 
     query.findSingleAttributeList();
     assertThat(sqlOf(query)).contains("select distinct t0.more from rawinherit_parent t0 where t0.type = 'A' ");
@@ -228,8 +231,8 @@ public class TestQuerySingleAttribute extends BaseTestCase {
     ResetBasicData.reset();
 
     Query<EUncle> query = Ebean.find(EUncle.class)
-        .setDistinct(true)
-        .fetch("parent","more");
+      .setDistinct(true)
+      .fetch("parent", "more");
 
     query.findSingleAttributeList();
 
@@ -239,10 +242,10 @@ public class TestQuerySingleAttribute extends BaseTestCase {
 
   // hmm - same problem when not using distinct
   @Test
-  public void findSingleOnIdProperty(){
+  public void findSingleOnIdProperty() {
     Query<Customer> query = Ebean.find(Customer.class)
-        .select("id")
-        .setMaxRows(100);
+      .select("id")
+      .setMaxRows(100);
 
     List<String> ids = query.findSingleAttributeList();
     if (isSqlServer()) {
@@ -261,7 +264,7 @@ public class TestQuerySingleAttribute extends BaseTestCase {
     ResetBasicData.reset();
 
     Query<Customer> query = Ebean.find(Customer.class)
-        .fetch("billingAddress","city");
+      .fetch("billingAddress", "city");
 
     List<String> cities = query.findSingleAttributeList();
 
@@ -275,7 +278,7 @@ public class TestQuerySingleAttribute extends BaseTestCase {
     ResetBasicData.reset();
 
     Query<ChildA> query = Ebean.find(ChildA.class)
-        .select("more");
+      .select("more");
 
     query.findSingleAttributeList();
     assertThat(sqlOf(query)).contains("select t0.more from rawinherit_parent t0 where t0.type = 'A'");
@@ -288,7 +291,7 @@ public class TestQuerySingleAttribute extends BaseTestCase {
     ResetBasicData.reset();
 
     Query<EUncle> query = Ebean.find(EUncle.class)
-        .fetch("parent","more");
+      .fetch("parent", "more");
 
     query.findSingleAttributeList();
 
@@ -301,7 +304,7 @@ public class TestQuerySingleAttribute extends BaseTestCase {
     ResetBasicData.reset();
 
     Query<EUncle> query = Ebean.find(EUncle.class)
-      .fetch("parent","more");
+      .fetch("parent", "more");
 
     Ebean.getDefaultServer().findSingleAttributeList(query, null);
 
@@ -315,15 +318,15 @@ public class TestQuerySingleAttribute extends BaseTestCase {
     ResetBasicData.reset();
 
     Query<Data> query = Ebean.find(Data.class)
-        .setDistinct(true)
-        .fetch("parents","more")
-        .setMaxRows(100);
+      .setDistinct(true)
+      .fetch("parents", "more")
+      .setMaxRows(100);
 
     query.findSingleAttributeList();
 
     assertThat(sqlOf(query)).contains("select distinct t0.more from rawinherit_data t0 "
-        + "join rawinherit_parent_rawinherit_data t1 on t0.id = t1.rawinherit_data_id "
-        + "join parent t2 on t1.rawinherit_parent_id = t2.id");
+      + "join rawinherit_parent_rawinherit_data t1 on t0.id = t1.rawinherit_data_id "
+      + "join parent t2 on t1.rawinherit_parent_id = t2.id");
   }
 
   @Test
@@ -348,7 +351,7 @@ public class TestQuerySingleAttribute extends BaseTestCase {
 
     Query<Contact> query = Ebean.find(Contact.class)
       .setDistinct(true)
-      .fetch("customer","billingAddress")
+      .fetch("customer", "billingAddress")
       .orderBy().desc("customer.billingAddress");
 
     query.findSingleAttributeList();
@@ -362,19 +365,19 @@ public class TestQuerySingleAttribute extends BaseTestCase {
     ResetBasicData.reset();
 
     Query<Contact> query = Ebean.find(Contact.class)
-        .setDistinct(true)
-        .fetch("customer","billingAddress")
-        .where().eq("customer.billingAddress.city", "Auckland")
-        .orderBy().desc("customer.billingAddress.id");
+      .setDistinct(true)
+      .fetch("customer", "billingAddress")
+      .where().eq("customer.billingAddress.city", "Auckland")
+      .orderBy().desc("customer.billingAddress.id");
 
     List<Integer> ids = query.findSingleAttributeList();
     assertThat(ids).isNotEmpty();
 
     assertThat(sqlOf(query)).contains("select distinct t1.billing_address_id from contact t0 "
-        + "join o_customer t1 on t1.id = t0.customer_id  "  // two spaces!
-        + "left join o_address t2 on t2.id = t1.billing_address_id  "
-        + "where t2.city = ?  "
-        + "order by t1.billing_address_id desc");
+      + "join o_customer t1 on t1.id = t0.customer_id  "  // two spaces!
+      + "left join o_address t2 on t2.id = t1.billing_address_id  "
+      + "where t2.city = ?  "
+      + "order by t1.billing_address_id desc");
   }
 
   @Test
@@ -383,19 +386,19 @@ public class TestQuerySingleAttribute extends BaseTestCase {
     ResetBasicData.reset();
 
     Query<Contact> query = Ebean.find(Contact.class)
-        .setDistinct(true)
-        .fetch("customer","billingAddress")
-        .where().eq("customer.billingAddress.city", "Auckland")
-        .orderBy().desc("customer.billingAddress.id");
+      .setDistinct(true)
+      .fetch("customer", "billingAddress")
+      .where().eq("customer.billingAddress.city", "Auckland")
+      .orderBy().desc("customer.billingAddress.id");
 
     List<Short> ids = query.findSingleAttributeList();
     assertThat(ids).isNotEmpty();
 
     assertThat(sqlOf(query)).contains("select distinct t1.billing_address_id from contact t0 "
-        + "join o_customer t1 on t1.id = t0.customer_id  "
-         + "left join o_address t2 on t2.id = t1.billing_address_id  "
-         + "where t2.city = ?  "
-         + "order by t1.billing_address_id desc");
+      + "join o_customer t1 on t1.id = t0.customer_id  "
+      + "left join o_address t2 on t2.id = t1.billing_address_id  "
+      + "where t2.city = ?  "
+      + "order by t1.billing_address_id desc");
   }
 
   @Test
@@ -404,19 +407,19 @@ public class TestQuerySingleAttribute extends BaseTestCase {
     ResetBasicData.reset();
 
     Query<Contact> query = Ebean.find(Contact.class)
-        .setDistinct(true)
-        .fetch("customer","billingAddress")
-        .where().eq("customer.billingAddress.city", "Auckland")
-        .orderBy().desc("customer.billingAddress.id");
+      .setDistinct(true)
+      .fetch("customer", "billingAddress")
+      .where().eq("customer.billingAddress.city", "Auckland")
+      .orderBy().desc("customer.billingAddress.id");
 
     List<Integer> ids = query.findSingleAttributeList();
     assertThat(ids).isNotEmpty();
 
     assertThat(sqlOf(query)).contains("select distinct t1.billing_address_id from contact t0 "
-        + "join o_customer t1 on t1.id = t0.customer_id  "
-         + "left join o_address t2 on t2.id = t1.billing_address_id  "
-         + "where t2.city = ?  "
-         + "order by t1.billing_address");
+      + "join o_customer t1 on t1.id = t0.customer_id  "
+      + "left join o_address t2 on t2.id = t1.billing_address_id  "
+      + "where t2.city = ?  "
+      + "order by t1.billing_address");
   }
 
   @Test
@@ -425,21 +428,22 @@ public class TestQuerySingleAttribute extends BaseTestCase {
     ResetBasicData.reset();
 
     Query<Contact> query = Ebean.find(Contact.class)
-        .setDistinct(true)
-        .fetch("customer","billingAddress")
-        .where().eq("customer.shippingAddress.city", "Auckland") // query on shippingAddress
-        .orderBy().desc("customer.billingAddress.id");
+      .setDistinct(true)
+      .fetch("customer", "billingAddress")
+      .where().eq("customer.shippingAddress.city", "Auckland") // query on shippingAddress
+      .orderBy().desc("customer.billingAddress.id");
 
     List<Short> ids = query.findSingleAttributeList();
     assertThat(ids).isNotEmpty();
 
     assertThat(sqlOf(query)).contains("select distinct t1.billing_address_id from contact t0 "
-        + "join o_customer t1 on t1.id = t0.customer_id  "
-        + "left join o_address t2 on t2.id = t1.shipping_address_id  "
-        + "where t2.city = ?  "
-        + "order by t1.billing_address_id desc");
+      + "join o_customer t1 on t1.id = t0.customer_id  "
+      + "left join o_address t2 on t2.id = t1.shipping_address_id  "
+      + "where t2.city = ?  "
+      + "order by t1.billing_address_id desc");
 
   }
+
   @Test
   public void distinctWithCascadedFetchCount() {
 
@@ -450,15 +454,15 @@ public class TestQuerySingleAttribute extends BaseTestCase {
     assertThat(count).isGreaterThanOrEqualTo(12);
 
     Query<Contact> query = Ebean.find(Contact.class)
-        .select("firstName");
+      .select("firstName");
 
     List<CountedValue<Object>> list1 = query
-        .setCountDistinct(CountDistinctOrder.ATTR_ASC)
+      .setCountDistinct(CountDistinctOrder.ATTR_ASC)
 
-        .findSingleAttributeList();
+      .findSingleAttributeList();
     assertThat(sqlOf(query)).contains("select r1.attribute_, count(*) from ("
-        + "select t0.first_name as attribute_ from contact t0"
-        + ") r1 group by r1.attribute_ order by r1.attribute_");
+      + "select t0.first_name as attribute_ from contact t0"
+      + ") r1 group by r1.attribute_ order by r1.attribute_");
     assertThat(list1.get(0)).isInstanceOf(CountedValue.class);
     // FIXME: These asserts will fail, because other tests will interfere. see #1298
     //assertThat(list1.toString()).isEqualTo("[3: Bugs1, 1: Fiona, 3: Fred1, 1: Jack, 3: Jim1, 1: Tracy]");
@@ -466,85 +470,103 @@ public class TestQuerySingleAttribute extends BaseTestCase {
 
     query = Ebean.find(Contact.class).select("firstName");
     list1 = query
-        .setCountDistinct(CountDistinctOrder.ATTR_DESC)
-        .findSingleAttributeList();
+      .setCountDistinct(CountDistinctOrder.ATTR_DESC)
+      .findSingleAttributeList();
     assertThat(list1.get(0)).isInstanceOf(CountedValue.class);
     //assertThat(list1.toString()).isEqualTo("[1: Tracy, 3: Jim1, 1: Jack, 3: Fred1, 1: Fiona, 3: Bugs1]");
 
     query = Ebean.find(Contact.class).select("firstName");
     list1 = query
-        .setCountDistinct(CountDistinctOrder.COUNT_ASC_ATTR_DESC)
-        .findSingleAttributeList();
+      .setCountDistinct(CountDistinctOrder.COUNT_ASC_ATTR_DESC)
+      .findSingleAttributeList();
     assertThat(list1.get(0)).isInstanceOf(CountedValue.class);
     //assertThat(list1.toString()).isEqualTo("[1: Tracy, 1: Jack, 1: Fiona, 3: Jim1, 3: Fred1, 3: Bugs1]");
 
-    query = Ebean.find(Contact.class).fetch("customer.shippingAddress","line1");//("firstName")
+    query = Ebean.find(Contact.class).fetch("customer.shippingAddress", "line1");//("firstName")
     List<CountedValue<Object>> list2 = query
-        .setCountDistinct(CountDistinctOrder.ATTR_ASC)
-        .findSingleAttributeList();
+      .setCountDistinct(CountDistinctOrder.ATTR_ASC)
+      .findSingleAttributeList();
     assertThat(sqlOf(query)).contains("select r1.attribute_, count(*) from ("
-        + "select t2.line_1 as attribute_ "
-        + "from contact t0 join o_customer t1 on t1.id = t0.customer_id  "
-        + "left join o_address t2 on t2.id = t1.shipping_address_id "
-        + ") r1 group by r1.attribute_ order by r1.attribute_");
+      + "select t2.line_1 as attribute_ "
+      + "from contact t0 join o_customer t1 on t1.id = t0.customer_id  "
+      + "left join o_address t2 on t2.id = t1.shipping_address_id "
+      + ") r1 group by r1.attribute_ order by r1.attribute_");
     assertThat(list2.get(0)).isInstanceOf(CountedValue.class);
     //assertThat(list2.toString()).isEqualTo("[1: null, 3: 1 Banana St, 5: 12 Apple St, 3: 15 Kumera Way]");
 
 
     query = Ebean.find(Contact.class).select("firstName")
-        .where().eq("customer.shippingAddress.line1", "12 Apple St").query();
+      .where().eq("customer.shippingAddress.line1", "12 Apple St").query();
     List<CountedValue<Object>> list3 = query
-        .setCountDistinct(CountDistinctOrder.ATTR_ASC)
-        .findSingleAttributeList();
+      .setCountDistinct(CountDistinctOrder.ATTR_ASC)
+      .findSingleAttributeList();
     assertThat(sqlOf(query)).contains("select r1.attribute_, count(*) from ("
-        + "select t0.first_name as attribute_ from contact t0 "
-        + "join o_customer t1 on t1.id = t0.customer_id  "
-        + "left join o_address t2 on t2.id = t1.shipping_address_id  where t2.line_1 = ? "
-        + ") r1 group by r1.attribute_ order by r1.attribute_");
+      + "select t0.first_name as attribute_ from contact t0 "
+      + "join o_customer t1 on t1.id = t0.customer_id  "
+      + "left join o_address t2 on t2.id = t1.shipping_address_id  where t2.line_1 = ? "
+      + ") r1 group by r1.attribute_ order by r1.attribute_");
     assertThat(list3.get(0)).isInstanceOf(CountedValue.class);
     //assertThat(list3.toString()).isEqualTo("[1: Bugs1, 1: Fiona, 1: Fred1, 1: Jim1, 1: Tracy]");
 
 
-    query = Ebean.find(Contact.class).fetch("customer.billingAddress","line1")
-        .where().or()
-          .ne("customer.shippingAddress.line1", "12 Apple St")
-          .isNull("customer.shippingAddress.line1")
-         .endOr().query();
+    query = Ebean.find(Contact.class).fetch("customer.billingAddress", "line1")
+      .where().or()
+      .ne("customer.shippingAddress.line1", "12 Apple St")
+      .isNull("customer.shippingAddress.line1")
+      .endOr().query();
     List<CountedValue<Object>> list4 = query
-        .setCountDistinct(CountDistinctOrder.ATTR_ASC)
-        .findSingleAttributeList();
+      .setCountDistinct(CountDistinctOrder.ATTR_ASC)
+      .findSingleAttributeList();
     assertThat(sqlOf(query)).contains("select r1.attribute_, count(*) from ("
-        + "select t2.line_1 as attribute_ "
-        + "from contact t0 join o_customer t1 on t1.id = t0.customer_id  "
-        + "left join o_address t2 on t2.id = t1.billing_address_id  "
-        + "left join o_address t3 on t3.id = t1.shipping_address_id  "
-        + "where (t3.line_1 <> ?  or t3.line_1 is null ) "
-        + ") r1 group by r1.attribute_ order by r1.attribute_");
+      + "select t2.line_1 as attribute_ "
+      + "from contact t0 join o_customer t1 on t1.id = t0.customer_id  "
+      + "left join o_address t2 on t2.id = t1.billing_address_id  "
+      + "left join o_address t3 on t3.id = t1.shipping_address_id  "
+      + "where (t3.line_1 <> ?  or t3.line_1 is null ) "
+      + ") r1 group by r1.attribute_ order by r1.attribute_");
     assertThat(list4.get(0)).isInstanceOf(CountedValue.class);
     //assertThat(list4.toString()).isEqualTo("[1: null, 3: Bos town, 3: P.O.Box 1234]");
 
 
     // Test Limiter for MSSQL
-    query = Ebean.find(Contact.class).fetch("customer.billingAddress","line1").setFirstRow(1).setMaxRows(2);
+    query = Ebean.find(Contact.class).fetch("customer.billingAddress", "line1").setFirstRow(1).setMaxRows(2);
     List<CountedValue<Object>> list5 = query
-        .where().isNotNull("customer.billingAddress.line1").query()
-        .setCountDistinct(CountDistinctOrder.ATTR_DESC)
-        .findSingleAttributeList();
+      .where().isNotNull("customer.billingAddress.line1").query()
+      .setCountDistinct(CountDistinctOrder.ATTR_DESC)
+      .findSingleAttributeList();
     assertThat(sqlOf(query)).contains("select r1.attribute_, count(*) from ("
-        + "select t2.line_1 as attribute_ from contact t0 "
-        + "join o_customer t1 on t1.id = t0.customer_id  "
-        + "left join o_address t2 on t2.id = t1.billing_address_id  "
-        + "where t2.line_1 is not null "
-        + ") r1 group by r1.attribute_ order by r1.attribute_ desc ");
+      + "select t2.line_1 as attribute_ from contact t0 "
+      + "join o_customer t1 on t1.id = t0.customer_id  "
+      + "left join o_address t2 on t2.id = t1.billing_address_id  "
+      + "where t2.line_1 is not null "
+      + ") r1 group by r1.attribute_ order by r1.attribute_ desc ");
     if (isSqlServer()) {
-    	assertThat(sqlOf(query)).endsWith(" fetch next 2 rows only");
+      assertThat(sqlOf(query)).endsWith(" fetch next 2 rows only");
     } else if (isDb2()) {
       assertThat(query.getGeneratedSql()).endsWith("FETCH FIRST 2 ROWS ONLY");
     } else {
-    	assertThat(sqlOf(query)).endsWith(" limit 2 offset 1");
+      assertThat(sqlOf(query)).endsWith(" limit 2 offset 1");
     }
     assertThat(list5.get(0)).isInstanceOf(CountedValue.class);
     //assertThat(list5.toString()).isEqualTo("[3: P.O.Box 1234, 3: Bos town]");
   }
 
+  @Test
+  public void example() {
+
+    ResetBasicData.reset();
+
+    List<CountedValue<Order.Status>> orderStatusCount =
+
+      Ebean.find(Order.class)
+        .select("status")
+        .where()
+        .gt("orderDate", LocalDate.now().minusMonths(3))
+        .setCountDistinct(CountDistinctOrder.COUNT_DESC_ATTR_ASC)
+        .findSingleAttributeList();
+
+    for (CountedValue<Order.Status> entry : orderStatusCount) {
+      System.out.println(" count:" + entry.getCount()+" orderStatus:" + entry.getValue() );
+    }
+  }
 }

From ebaeafc11b65cd3e0582755627c5ff3de384dfca Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 2 Mar 2018 16:25:13 +1300
Subject: [PATCH 0124/1036] #1303 - NEW: Ebean.checkUniqueness ... add example
 to javadoc

---
 src/main/java/io/ebean/Ebean.java             | 44 +++++++++++++--
 src/main/java/io/ebean/EbeanServer.java       | 48 +++++++++++++---
 .../tests/insert/TestInsertCheckUnique.java   | 55 +++++++++++++++++--
 3 files changed, 131 insertions(+), 16 deletions(-)

diff --git a/src/main/java/io/ebean/Ebean.java b/src/main/java/io/ebean/Ebean.java
index 8bc2fb4e8..643e2179d 100644
--- a/src/main/java/io/ebean/Ebean.java
+++ b/src/main/java/io/ebean/Ebean.java
@@ -116,6 +116,7 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public final class Ebean {
   private static final Logger logger = LoggerFactory.getLogger(Ebean.class);
+
   static {
     EbeanVersion.getVersion(); // initalizes the version class and logs the version.
   }
@@ -374,7 +375,7 @@ public final class Ebean {
    * Note that this provides an try finally alternative to using {@link #executeCall(TxScope, Callable)} or
    * {@link #execute(TxScope, Runnable)}.
    * </p>
-   *
+   * <p>
    * <h3>REQUIRES_NEW example:</h3>
    * <pre>{@code
    * // Start a new transaction. If there is a current transaction
@@ -648,11 +649,46 @@ public final class Ebean {
    * This method checks the uniqueness of a bean. I.e. if the save will work. It will return the
    * properties that violates an unique / primary key. This may be done in an UI save action to
    * validate if the user has entered correct values.
-   *
+   * <p>
    * Note: This method queries the DB for uniqueness of all indices, so do not use it in a batch update.
+   * <p>
+   * Note: This checks only the root bean!
+   * <p>
+   * <pre>{@code
    *
-   * TODO: it checks only the root bean!
-   * @param bean
+   *   // there is a unique constraint on title
+   *
+   *   Document doc = new Document();
+   *   doc.setTitle("One flew over the cuckoo's nest");
+   *   doc.setBody("clashes with doc1");
+   *
+   *   Set<Property> properties = server().checkUniqueness(doc);
+   *
+   *   if (properties.isEmpty()) {
+   *     // it is unique ... carry on
+   *
+   *   } else {
+   *     // build a user friendly message
+   *     // to return message back to user
+   *
+   *     String uniqueProperties = properties.toString();
+   *
+   *     StringBuilder msg = new StringBuilder();
+   *
+   *     properties.forEach((it)-> {
+   *       Object propertyValue = it.getVal(doc);
+   *       String propertyName = it.getName();
+   *       msg.append(" property["+propertyName+"] value["+propertyValue+"]");
+   *     });
+   *
+   *     // uniqueProperties > [title]
+   *     //       custom msg > property[title] value[One flew over the cuckoo's nest]
+   *
+   *  }
+   *
+   * }</pre>
+   *
+   * @param bean The entity bean to check uniqueness on
    * @return a set of Properties if constraint validation was detected or empty list.
    */
   @Nonnull
diff --git a/src/main/java/io/ebean/EbeanServer.java b/src/main/java/io/ebean/EbeanServer.java
index 3ac761a97..d8bead322 100644
--- a/src/main/java/io/ebean/EbeanServer.java
+++ b/src/main/java/io/ebean/EbeanServer.java
@@ -11,7 +11,6 @@ import io.ebean.text.json.JsonContext;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
 import javax.persistence.NonUniqueResultException;
 import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
@@ -1464,18 +1463,53 @@ public interface EbeanServer {
 
   /**
    * This method checks the uniqueness of a bean. I.e. if the save will work. It will return the
-   * properties that violates an unique / primary key. This may be done in an UI save action to 
+   * properties that violates an unique / primary key. This may be done in an UI save action to
    * validate if the user has entered correct values.
-   * 
+   * <p>
    * Note: This method queries the DB for uniqueness of all indices, so do not use it in a batch update.
-   * 
-   * TODO: it checks only the root bean!
-   * @param bean
+   * <p>
+   * Note: This checks only the root bean!
+   * <p>
+   * <pre>{@code
+   *
+   *   // there is a unique constraint on title
+   *
+   *   Document doc = new Document();
+   *   doc.setTitle("One flew over the cuckoo's nest");
+   *   doc.setBody("clashes with doc1");
+   *
+   *   Set<Property> properties = server().checkUniqueness(doc);
+   *
+   *   if (properties.isEmpty()) {
+   *     // it is unique ... carry on
+   *
+   *   } else {
+   *     // build a user friendly message
+   *     // to return message back to user
+   *
+   *     String uniqueProperties = properties.toString();
+   *
+   *     StringBuilder msg = new StringBuilder();
+   *
+   *     properties.forEach((it)-> {
+   *       Object propertyValue = it.getVal(doc);
+   *       String propertyName = it.getName();
+   *       msg.append(" property["+propertyName+"] value["+propertyValue+"]");
+   *     });
+   *
+   *     // uniqueProperties > [title]
+   *     //       custom msg > property[title] value[One flew over the cuckoo's nest]
+   *
+   *  }
+   *
+   * }</pre>
+   *
+   * @param bean The entity bean to check uniqueness on
    * @return a set of Properties if constraint validation was detected or empty list.
    */
   @Nonnull
   Set<Property> checkUniqueness(Object bean);
-  
+
   /**
    * Same as {@link #checkUniqueness(Object)}. but with given transaction.
    */
diff --git a/src/test/java/org/tests/insert/TestInsertCheckUnique.java b/src/test/java/org/tests/insert/TestInsertCheckUnique.java
index 2cb230698..61884f35e 100644
--- a/src/test/java/org/tests/insert/TestInsertCheckUnique.java
+++ b/src/test/java/org/tests/insert/TestInsertCheckUnique.java
@@ -1,11 +1,13 @@
 package org.tests.insert;
 
 import io.ebean.BaseTestCase;
-
+import io.ebean.plugin.Property;
 import org.junit.Before;
 import org.junit.Test;
 import org.tests.model.draftable.Document;
 
+import java.util.Set;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestInsertCheckUnique extends BaseTestCase {
@@ -15,7 +17,7 @@ public class TestInsertCheckUnique extends BaseTestCase {
     server().find(Document.class).asDraft().where().contains("title", "UniqueKey").delete();
     server().find(Document.class).asDraft().where().isNull("title").delete();
   }
-  
+
   @Test
   public void insert_duplicateKey() {
     server().beginTransaction();
@@ -32,7 +34,6 @@ public class TestInsertCheckUnique extends BaseTestCase {
       doc2.setBody("clashes with doc1");
 
       assertThat(server().checkUniqueness(doc2)).isEmpty();
-      ;
 
       server().publish(doc1.getClass(), doc1.getId());
 
@@ -41,7 +42,7 @@ public class TestInsertCheckUnique extends BaseTestCase {
       server().endTransaction();
     }
   }
-  
+
   @Test
   public void insert_duplicateNull() {
     server().beginTransaction();
@@ -58,7 +59,7 @@ public class TestInsertCheckUnique extends BaseTestCase {
       doc2.setBody("clashes with doc1");
 
       assertThat(server().checkUniqueness(doc2)).isEmpty();
- 
+
       server().publish(doc1.getClass(), doc1.getId());
 
       assertThat(server().checkUniqueness(doc2)).isEmpty();
@@ -70,4 +71,48 @@ public class TestInsertCheckUnique extends BaseTestCase {
     }
   }
 
+  @Test
+  public void example() {
+
+    server().beginTransaction();
+    try {
+      Document doc1 = new Document();
+      doc1.setTitle("One flew over the cuckoo's nest");
+      doc1.setBody("one");
+      doc1.save();
+
+      server().publish(doc1.getClass(), doc1.getId());
+
+      Document doc2 = new Document();
+      doc2.setTitle("One flew over the cuckoo's nest");
+      doc2.setBody("clashes with doc1");
+
+      Set<Property> properties = server().checkUniqueness(doc2);
+      if (properties.isEmpty()) {
+        // it is unique ... carry on
+      } else {
+        // build a user friendly message
+        // to return message back to user
+
+        String uniqueProperties = properties.toString();
+
+        StringBuilder msg = new StringBuilder();
+
+        properties.forEach((it)-> {
+          Object propertyValue = it.getVal(doc2);
+          String propertyName = it.getName();
+          msg.append(" property["+propertyName+"] value["+propertyValue+"]");
+        });
+
+        System.out.println("uniqueProperties > "+uniqueProperties);
+        System.out.println("      custom msg > " + msg.toString());
+
+      }
+
+
+      assertThat(server().checkUniqueness(doc2).toString()).contains("title");
+    } finally {
+      server().endTransaction();
+    }
+  }
 }

From 8faa95adc19fabae66aba58572cc82d992ae5398 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Fri, 2 Mar 2018 04:28:41 +0100
Subject: [PATCH 0125/1036] ENH: new method
 AnnotationUtil.findMetaAnnotationsRecursive (#1319)

* ENH: new method AnnotationUtil.findMetaAnnotationsRecursive

* clarified in javadoc
---
 .../java/io/ebean/util/AnnotationUtil.java    | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/ebean/util/AnnotationUtil.java b/src/main/java/io/ebean/util/AnnotationUtil.java
index 1aa7e421c..de82dc460 100644
--- a/src/main/java/io/ebean/util/AnnotationUtil.java
+++ b/src/main/java/io/ebean/util/AnnotationUtil.java
@@ -104,7 +104,7 @@ public class AnnotationUtil {
   }
 
   /**
-   * Finds all annotations recusively for a class and its superclasses.
+   * Finds all annotations recusively for a class and its superclasses or interfaces.
    */
   public static <A extends Annotation> Set<A> findAnnotationsRecursive(Class<?> clazz, Class<A> annotationType) {
     if (annotationType == null) {
@@ -112,13 +112,28 @@ public class AnnotationUtil {
     }
     Set<A> ret = new LinkedHashSet<>();
     Set<Annotation> visited = new HashSet<>();
-    while (clazz != null && clazz != Object.class) {
-      findMetaAnnotations(clazz, annotationType, ret, visited);
+    Set<Class<?>> visitedInterfaces = new HashSet<>();
+    while (clazz != null && !clazz.getName().startsWith("java.lang.")) {
+      findMetaAnnotationsRecursive(clazz, annotationType, ret, visited, visitedInterfaces);
       clazz = clazz.getSuperclass();
     }
     return ret;
   }
 
+  /**
+   * Searches the interfaces for annotations.
+   */
+  private static <A extends Annotation> void findMetaAnnotationsRecursive(Class<?> clazz,
+      Class<A> annotationType, Set<A> ret,
+      Set<Annotation> visited, Set<Class<?>> visitedInterfaces) {
+    findMetaAnnotations(clazz, annotationType, ret, visited);
+    for (Class<?> iface : clazz.getInterfaces()) {
+      if (!iface.getName().startsWith("java.lang.") && visitedInterfaces.add(iface)) {
+        findMetaAnnotationsRecursive(iface, annotationType, ret, visited, visitedInterfaces);
+      }
+    }
+  }
+
   /**
    * Perform the search algorithm avoiding endless recursion by tracking which
    * annotations have already been visited.

From 514416a1e0c85bf8ba205ff8aac0ebb2a22cc80d Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Fri, 2 Mar 2018 04:38:59 +0100
Subject: [PATCH 0126/1036] Testcase Fix for SqlServer (#1326)

Test change only - Testcase Fix for SqlServer
---
 src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java b/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
index fe0850c4d..51e3d53c5 100644
--- a/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
+++ b/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
@@ -178,7 +178,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
 
     if (isSqlServer()) {
       assertThat(query.getGeneratedSql()).contains("top 100 ");
-      assertThat(query.getGeneratedSql()).contains("order by o.ship_date desc ");
+      assertThat(query.getGeneratedSql()).contains("order by o.ship_date desc");
     } else if (isOracle()) {
       assertThat(query.getGeneratedSql()).contains("a  where rownum <= 100 )");
     } else {
@@ -213,7 +213,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
 
     if (isSqlServer()) {
       assertThat(query.getGeneratedSql()).contains("top 100 ");
-      assertThat(query.getGeneratedSql()).contains("order by o.ship_date desc, o.id ");
+      assertThat(query.getGeneratedSql()).contains("order by o.ship_date desc, o.id");
     } else if (isOracle()) {
       assertThat(query.getGeneratedSql()).contains("a  where rownum <= 100 )");
     } else {
@@ -249,7 +249,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
       query.order("coalesce(shipDate, getdate()) desc");
       query.findList();
 
-      assertThat(sqlOf(query)).contains("order by coalesce(o.ship_date, getdate()) desc ");
+      assertThat(sqlOf(query)).contains("order by coalesce(o.ship_date, getdate()) desc");
       assertThat(sqlOf(query)).contains("select top 100");
 
     } else {

From 5801f7620d2a4a160b4acf3e37ebe308c755aadc Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Fri, 2 Mar 2018 04:39:53 +0100
Subject: [PATCH 0127/1036] FIX: add columnDefaultValue to more places (#1327)

---
 .../dbmigration/ddlgeneration/platform/PlatformDdl.java         | 2 +-
 .../dbmigration/ddlgeneration/platform/SqlServerDdl.java        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
index 512d6efc2..ec0a1f335 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -513,7 +513,7 @@ public class PlatformDdl {
    * Alter column setting the default value.
    */
   public String alterColumnDefaultValue(String tableName, String columnName, String defaultValue) {
-    String suffix = DdlHelp.isDropDefault(defaultValue) ? columnDropDefault : columnSetDefault + " " + defaultValue;
+    String suffix = DdlHelp.isDropDefault(defaultValue) ? columnDropDefault : columnSetDefault + " " + convertDefaultValue(defaultValue);
     return "alter table " + tableName + " " + alterColumn + " " + columnName + " " + suffix;
   }
 
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
index 6b094f9d9..39aa5d7c9 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
@@ -145,7 +145,7 @@ public class SqlServerDdl extends PlatformDdl {
       sb.append("if @Tmp is not null EXEC('alter table ").append(tableName).append(" drop constraint ' + @Tmp)$$");
     } else {
       sb.append("alter table ").append(tableName);
-      sb.append(" add default ").append(defaultValue).append(" for ").append(columnName);
+      sb.append(" add default ").append(convertDefaultValue(defaultValue)).append(" for ").append(columnName);
     }
     return sb.toString();
   }

From aad5b33db225ccbba074ec896512bbdfbe26b0f6 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 2 Mar 2018 23:32:01 +1300
Subject: [PATCH 0128/1036] #1297 - ENH: Add DtoQuery ... such that we can map
 native SQL queries automatically into "DTO beans"

---
 src/main/java/io/ebean/DtoQuery.java          | 133 +++++++
 src/main/java/io/ebean/Ebean.java             |  15 +
 src/main/java/io/ebean/EbeanServer.java       |  13 +
 .../java/io/ebean/meta/MetaInfoManager.java   |   5 +
 .../java/io/ebean/meta/MetaQueryMetric.java   |  23 ++
 .../java/io/ebean/meta/MetaTimedMetric.java   |  13 +-
 .../io/ebeaninternal/api/SpiDtoQuery.java     |  46 +++
 .../io/ebeaninternal/api/SpiEbeanServer.java  |  22 ++
 .../io/ebeaninternal/api/SpiSqlBinding.java   |  38 ++
 .../io/ebeaninternal/api/SpiSqlQuery.java     |  32 +-
 .../ebeaninternal/metric/MetricFactory.java   |   9 +
 .../metric/QueryPlanCollector.java            |  26 ++
 .../ebeaninternal/metric/QueryPlanMetric.java |  17 +
 .../io/ebeaninternal/metric/TimedMetric.java  |   7 +-
 .../server/core/AbstractSqlQueryRequest.java  | 182 ++++++++++
 .../server/core/DefaultMetaInfoManager.java   |   6 +
 .../server/core/DefaultServer.java            |  69 ++++
 .../server/core/DtoQueryRequest.java          | 103 ++++++
 .../server/core/InternalConfiguration.java    |  17 +-
 .../server/core/RelationalQueryEngine.java    |   5 +
 .../server/core/RelationalQueryRequest.java   | 202 ++---------
 .../server/dto/DtoBeanDescriptor.java         |  45 +++
 .../server/dto/DtoBeanManager.java            |  53 +++
 .../ebeaninternal/server/dto/DtoColumn.java   |  23 ++
 .../server/dto/DtoMappingRequest.java         |  49 +++
 .../io/ebeaninternal/server/dto/DtoMeta.java  | 119 +++++++
 .../server/dto/DtoMetaBuilder.java            |  77 ++++
 .../server/dto/DtoMetaConstructor.java        |  67 ++++
 .../server/dto/DtoMetaProperty.java           |  68 ++++
 .../server/dto/DtoQueryPlan.java              |  27 ++
 .../server/dto/DtoQueryPlanBase.java          |  28 ++
 .../server/dto/DtoQueryPlanConPlus.java       |  32 ++
 .../server/dto/DtoQueryPlanConSetter.java     |  32 ++
 .../server/dto/DtoQueryPlanConstructor.java   |  24 ++
 .../ebeaninternal/server/dto/DtoReadSet.java  |  21 ++
 .../server/dto/DtoReadSetColumnSkip.java      |  21 ++
 .../server/profile/DMetricFactory.java        |  12 +
 .../server/profile/DQueryPlanCollector.java   |  33 ++
 .../server/profile/DQueryPlanMeta.java        |  31 ++
 .../server/profile/DQueryPlanMetric.java      | 102 ++++++
 .../server/profile/DTimeMetricStats.java      |  12 +-
 .../server/profile/DTimedMetric.java          |  51 +--
 .../query/DefaultRelationalQueryEngine.java   |  32 +-
 .../server/query/dto/DtoQueryEngine.java      |  66 ++++
 .../server/querydefn/DefaultDtoQuery.java     | 196 ++++++++++
 src/test/java/io/ebean/DtoQueryTest.java      | 336 ++++++++++++++++++
 .../ebeaninternal/api/TDSpiEbeanServer.java   |  26 ++
 47 files changed, 2293 insertions(+), 273 deletions(-)
 create mode 100644 src/main/java/io/ebean/DtoQuery.java
 create mode 100644 src/main/java/io/ebean/meta/MetaQueryMetric.java
 create mode 100644 src/main/java/io/ebeaninternal/api/SpiDtoQuery.java
 create mode 100644 src/main/java/io/ebeaninternal/api/SpiSqlBinding.java
 create mode 100644 src/main/java/io/ebeaninternal/metric/QueryPlanCollector.java
 create mode 100644 src/main/java/io/ebeaninternal/metric/QueryPlanMetric.java
 create mode 100644 src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
 create mode 100644 src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
 create mode 100644 src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java
 create mode 100644 src/main/java/io/ebeaninternal/server/dto/DtoBeanManager.java
 create mode 100644 src/main/java/io/ebeaninternal/server/dto/DtoColumn.java
 create mode 100644 src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java
 create mode 100644 src/main/java/io/ebeaninternal/server/dto/DtoMeta.java
 create mode 100644 src/main/java/io/ebeaninternal/server/dto/DtoMetaBuilder.java
 create mode 100644 src/main/java/io/ebeaninternal/server/dto/DtoMetaConstructor.java
 create mode 100644 src/main/java/io/ebeaninternal/server/dto/DtoMetaProperty.java
 create mode 100644 src/main/java/io/ebeaninternal/server/dto/DtoQueryPlan.java
 create mode 100644 src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanBase.java
 create mode 100644 src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanConPlus.java
 create mode 100644 src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanConSetter.java
 create mode 100644 src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanConstructor.java
 create mode 100644 src/main/java/io/ebeaninternal/server/dto/DtoReadSet.java
 create mode 100644 src/main/java/io/ebeaninternal/server/dto/DtoReadSetColumnSkip.java
 create mode 100644 src/main/java/io/ebeaninternal/server/profile/DQueryPlanCollector.java
 create mode 100644 src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java
 create mode 100644 src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
 create mode 100644 src/main/java/io/ebeaninternal/server/query/dto/DtoQueryEngine.java
 create mode 100644 src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
 create mode 100644 src/test/java/io/ebean/DtoQueryTest.java

diff --git a/src/main/java/io/ebean/DtoQuery.java b/src/main/java/io/ebean/DtoQuery.java
new file mode 100644
index 000000000..c99ffdfbb
--- /dev/null
+++ b/src/main/java/io/ebean/DtoQuery.java
@@ -0,0 +1,133 @@
+package io.ebean;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+/**
+ * Query for performing native SQL queries that return DTO Bean's.
+ * <p>
+ * These beans are just normal classes. They must have public constructors
+ * and setters.
+ * <p>
+ * Constructors with arguments are used if the number of constructor arguments
+ * matches the number of columns in the resultSet.
+ * </p>
+ * <p>
+ * If the number of columns in the resultSet is greater than the largest constructor
+ * then the largest constructor is used for the first columns and remaining columns
+ * are mapped by setter methods.
+ * </p>
+ *
+ * <pre>{@code
+ *
+ *   // CustomerDto is just a 'bean like' class
+ *   // with public constructor(s) and public setter methods
+ *
+ *   String sql = "select id, name from customer where name like :name and status_code = :status";
+ *
+ *   List<CustomerDto> beans =
+ *     Ebean.findDto(CustomrDto.class, sql)
+ *     .setParameter("name", "Acme%")
+ *     .setParameter("status", "ACTIVE")
+ *     .findList();
+ *
+ * }</pre>
+ */
+public interface DtoQuery<T> {
+
+  /**
+   * Execute the query returning a list.
+   */
+  @Nonnull
+  List<T> findList();
+
+  /**
+   * Execute the query iterating a row at a time.
+   * <p>
+   * This streaming type query is useful for large query execution as only 1 row needs to be held in memory.
+   * </p>
+   */
+  void findEach(Consumer<T> consumer);
+
+  /**
+   * Execute the query iterating a row at a time with the ability to stop consuming part way through.
+   * <p>
+   * Returning false after processing a row stops the iteration through the query results.
+   * </p>
+   * <p>
+   * This streaming type query is useful for large query execution as only 1 row needs to be held in memory.
+   * </p>
+   */
+  void findEachWhile(Predicate<T> consumer);
+
+  /**
+   * Execute the query returning a single bean.
+   */
+  @Nullable
+  T findOne();
+
+  /**
+   * Execute the query returning an optional bean.
+   */
+  @Nonnull
+  Optional<T> findOneOrEmpty();
+
+  /**
+   * The same as bind for named parameters.
+   */
+  DtoQuery<T> setParameter(String name, Object value);
+
+  /**
+   * The same as bind for positioned parameters.
+   */
+  DtoQuery<T> setParameter(int position, Object value);
+
+  /**
+   * Set the index of the first row of the results to return.
+   */
+  DtoQuery<T> setFirstRow(int firstRow);
+
+  /**
+   * Set the maximum number of query results to return.
+   */
+  DtoQuery<T> setMaxRows(int maxRows);
+
+  /**
+   * When resultSet columns are not able to be mapped to a bean property then instead of
+   * throwing effectively skip reading that column.
+   */
+  DtoQuery<T> setRelaxedMode();
+
+  /**
+   * Set a label on the query to make it easier to identify queries related to query execution statistics.
+   *
+   * @param label A label that is unique to the DTO bean type.
+   */
+  DtoQuery<T> setLabel(String label);
+
+  /**
+   * Set a timeout on this query.
+   * <p>
+   * This will typically result in a call to setQueryTimeout() on a
+   * preparedStatement. If the timeout occurs an exception will be thrown - this
+   * will be a SQLException wrapped up in a PersistenceException.
+   * </p>
+   *
+   * @param secs the query timeout limit in seconds. Zero means there is no limit.
+   */
+  DtoQuery<T> setTimeout(int secs);
+
+  /**
+   * A hint which for JDBC translates to the Statement.fetchSize().
+   * <p>
+   * Gives the JDBC driver a hint as to the number of rows that should be
+   * fetched from the database when more rows are needed for ResultSet.
+   * </p>
+   */
+  DtoQuery<T> setBufferFetchSizeHint(int bufferFetchSizeHint);
+
+}
diff --git a/src/main/java/io/ebean/Ebean.java b/src/main/java/io/ebean/Ebean.java
index 643e2179d..2f0031fd1 100644
--- a/src/main/java/io/ebean/Ebean.java
+++ b/src/main/java/io/ebean/Ebean.java
@@ -1116,6 +1116,21 @@ public final class Ebean {
     return serverMgr.getDefaultServer().findNative(beanType, nativeSql);
   }
 
+  /**
+   * Create a Query for DTO beans.
+   * <p>
+   * DTO beans are just normal bean like classes with public constructor(s) and setters.
+   * They do not need to be registered with Ebean before use.
+   * </p>
+   *
+   * @param dtoType The type of the DTO bean the rows will be mapped into.
+   * @param sql     The SQL query to execute.
+   * @param <T>     The type of the DTO bean.
+   */
+  public static <T> DtoQuery<T> findDto(Class<T> dtoType, String sql) {
+    return serverMgr.getDefaultServer().findDto(dtoType, sql);
+  }
+
   /**
    * Create an Update query to perform a bulk update.
    * <p>
diff --git a/src/main/java/io/ebean/EbeanServer.java b/src/main/java/io/ebean/EbeanServer.java
index d8bead322..eab9ee668 100644
--- a/src/main/java/io/ebean/EbeanServer.java
+++ b/src/main/java/io/ebean/EbeanServer.java
@@ -424,6 +424,19 @@ public interface EbeanServer {
    */
   <T> Update<T> createUpdate(Class<T> beanType, String ormUpdate);
 
+  /**
+   * Create a Query for DTO beans.
+   * <p>
+   * DTO beans are just normal bean like classes with public constructor(s) and setters.
+   * They do not need to be registered with Ebean before use.
+   * </p>
+   *
+   * @param dtoType The type of the DTO bean the rows will be mapped into.
+   * @param sql     The SQL query to execute.
+   * @param <T>     The type of the DTO bean.
+   */
+  <T> DtoQuery<T> findDto(Class<T> dtoType, String sql);
+
   /**
    * Create a SqlQuery for executing native sql
    * query statements.
diff --git a/src/main/java/io/ebean/meta/MetaInfoManager.java b/src/main/java/io/ebean/meta/MetaInfoManager.java
index d9113d156..c8d88cf83 100644
--- a/src/main/java/io/ebean/meta/MetaInfoManager.java
+++ b/src/main/java/io/ebean/meta/MetaInfoManager.java
@@ -12,6 +12,11 @@ public interface MetaInfoManager {
    */
   List<MetaTimedMetric> collectTransactionStatistics(boolean reset);
 
+  /**
+   * Collect query plan statistics (new, will migrate ORM query stats over to this).
+   */
+  List<MetaQueryMetric> collectQueryStatistics(boolean reset);
+
   /**
    * Collect and return the non-empty query plan statistics for all the beans.
    * <p>
diff --git a/src/main/java/io/ebean/meta/MetaQueryMetric.java b/src/main/java/io/ebean/meta/MetaQueryMetric.java
new file mode 100644
index 000000000..c59142dc6
--- /dev/null
+++ b/src/main/java/io/ebean/meta/MetaQueryMetric.java
@@ -0,0 +1,23 @@
+package io.ebean.meta;
+
+/**
+ * Query execution metrics.
+ */
+public interface MetaQueryMetric extends MetaTimedMetric {
+
+  /**
+   * The type of entity or DTO bean.
+   */
+  Class<?> getType();
+
+  /**
+   * The label for the query (can be null).
+   */
+  String getLabel();
+
+  /**
+   * The actual SQL of the query.
+   */
+  String getSql();
+
+}
diff --git a/src/main/java/io/ebean/meta/MetaTimedMetric.java b/src/main/java/io/ebean/meta/MetaTimedMetric.java
index 719ff07fa..ada73a66f 100644
--- a/src/main/java/io/ebean/meta/MetaTimedMetric.java
+++ b/src/main/java/io/ebean/meta/MetaTimedMetric.java
@@ -27,17 +27,24 @@ public interface MetaTimedMetric {
   long getCount();
 
   /**
-   * Return the total execution time.
+   * Return the total execution time in micros.
    */
   long getTotal();
 
   /**
-   * Return the max execution time.
+   * Return the max execution time in micros.
    */
   long getMax();
 
   /**
-   * Return the mean execution time.
+   * Return the mean execution time in micros.
    */
   long getMean();
+
+  /**
+   * Return the total beans or rows processed or loaded.
+   *
+   * This will be 0 if the metric isn't a query plan (like transaction execution statistics).
+   */
+  long getBeanCount();
 }
diff --git a/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java b/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java
new file mode 100644
index 000000000..d2c4b1fb9
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java
@@ -0,0 +1,46 @@
+package io.ebeaninternal.api;
+
+import io.ebean.DtoQuery;
+import io.ebeaninternal.server.dto.DtoMappingRequest;
+import io.ebeaninternal.server.dto.DtoQueryPlan;
+
+/**
+ * Internal extension to DtoQuery.
+ */
+public interface SpiDtoQuery<T> extends DtoQuery<T>, SpiSqlBinding {
+
+  /**
+   * Return the key for query plan.
+   */
+  String planKey();
+
+  /**
+   * Get the query plan for the cache.
+   */
+  DtoQueryPlan getQueryPlan(String planKey);
+
+  /**
+   * Build the query plan.
+   */
+  DtoQueryPlan buildPlan(DtoMappingRequest request);
+
+  /**
+   * Put the query plan into the cache.
+   */
+  void putQueryPlan(String planKey, DtoQueryPlan plan);
+
+  /**
+   * Return true if the query is in relaxed mapping mode.
+   */
+  boolean isRelaxedMode();
+
+  /**
+   * Return the label for the query.
+   */
+  String getLabel();
+
+  /**
+   * Return the associated DTO bean type.
+   */
+  Class<T> getType();
+}
diff --git a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
index 423c37792..0e6af2a99 100644
--- a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
+++ b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
@@ -20,6 +20,8 @@ import io.ebeaninternal.server.query.CQuery;
 import io.ebeaninternal.server.transaction.RemoteTransactionEvent;
 
 import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
 
 /**
  * Service Provider extension to EbeanServer.
@@ -224,4 +226,24 @@ public interface SpiEbeanServer extends EbeanServer, BeanLoader, BeanCollectionL
    */
   void scopedTransactionExit(Object returnOrThrowable, int opCode);
 
+  /**
+   * DTO findList query.
+   */
+  <T> List<T> findDtoList(SpiDtoQuery<T> query);
+
+  /**
+   * DTO findOne query.
+   */
+  <T> T findDtoOne(SpiDtoQuery<T> query);
+
+  /**
+   * DTO findEach query.
+   */
+  <T> void findDtoEach(SpiDtoQuery<T> query, Consumer<T> consumer);
+
+  /**
+   * DTO findEachWhile query.
+   */
+  <T> void findDtoEachWhile(SpiDtoQuery<T> query, Predicate<T> consumer);
+
 }
diff --git a/src/main/java/io/ebeaninternal/api/SpiSqlBinding.java b/src/main/java/io/ebeaninternal/api/SpiSqlBinding.java
new file mode 100644
index 000000000..6da641dea
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/api/SpiSqlBinding.java
@@ -0,0 +1,38 @@
+package io.ebeaninternal.api;
+
+/**
+ * SQL query binding (for SqlQuery and DtoQuery).
+ */
+public interface SpiSqlBinding {
+
+  /**
+   * Return the named or positioned parameters.
+   */
+  BindParams getBindParams();
+
+  /**
+   * return the query.
+   */
+  String getQuery();
+
+  /**
+   * Return the first row to fetch.
+   */
+  int getFirstRow();
+
+  /**
+   * Return the maximum number of rows to fetch.
+   */
+  int getMaxRows();
+
+  /**
+   * Return the query timeout.
+   */
+  int getTimeout();
+
+  /**
+   * Return the hint for Statement.setFetchSize().
+   */
+  int getBufferFetchSizeHint();
+
+}
diff --git a/src/main/java/io/ebeaninternal/api/SpiSqlQuery.java b/src/main/java/io/ebeaninternal/api/SpiSqlQuery.java
index b296badcd..e289b5b65 100644
--- a/src/main/java/io/ebeaninternal/api/SpiSqlQuery.java
+++ b/src/main/java/io/ebeaninternal/api/SpiSqlQuery.java
@@ -5,36 +5,6 @@ import io.ebean.SqlQuery;
 /**
  * SQL query - Internal extension to SqlQuery.
  */
-public interface SpiSqlQuery extends SqlQuery {
-
-  /**
-   * Return the named or positioned parameters.
-   */
-  BindParams getBindParams();
-
-  /**
-   * return the query.
-   */
-  String getQuery();
-
-  /**
-   * Return the first row to fetch.
-   */
-  int getFirstRow();
-
-  /**
-   * Return the maximum number of rows to fetch.
-   */
-  int getMaxRows();
-
-  /**
-   * Return the query timeout.
-   */
-  int getTimeout();
-
-  /**
-   * Return the hint for Statement.setFetchSize().
-   */
-  int getBufferFetchSizeHint();
+public interface SpiSqlQuery extends SqlQuery, SpiSqlBinding {
 
 }
diff --git a/src/main/java/io/ebeaninternal/metric/MetricFactory.java b/src/main/java/io/ebeaninternal/metric/MetricFactory.java
index 3ea15470e..6f83c3e89 100644
--- a/src/main/java/io/ebeaninternal/metric/MetricFactory.java
+++ b/src/main/java/io/ebeaninternal/metric/MetricFactory.java
@@ -22,4 +22,13 @@ public interface MetricFactory {
    */
   TimedMetric createTimedMetric(String name);
 
+  /**
+   * Create a Timed metric.
+   */
+  QueryPlanMetric createQueryPlanMetric(Class<?> type, String label, String sql);
+
+  /**
+   * Return a instance used to collect Query plan metrics.
+   */
+  QueryPlanCollector createCollector(boolean reset);
 }
diff --git a/src/main/java/io/ebeaninternal/metric/QueryPlanCollector.java b/src/main/java/io/ebeaninternal/metric/QueryPlanCollector.java
new file mode 100644
index 000000000..aa7e901d5
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/metric/QueryPlanCollector.java
@@ -0,0 +1,26 @@
+package io.ebeaninternal.metric;
+
+import io.ebean.meta.MetaQueryMetric;
+
+import java.util.List;
+
+/**
+ * Object used to collect query plan metrics.
+ */
+public interface QueryPlanCollector {
+
+  /**
+   * Return true if the statistics should be reset.
+   */
+  boolean isReset();
+
+  /**
+   * Add the query plan statistic.
+   */
+  void add(MetaQueryMetric stats);
+
+  /**
+   * Return all the collected query plan statistics.
+   */
+  List<MetaQueryMetric> complete();
+}
diff --git a/src/main/java/io/ebeaninternal/metric/QueryPlanMetric.java b/src/main/java/io/ebeaninternal/metric/QueryPlanMetric.java
new file mode 100644
index 000000000..893a97593
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/metric/QueryPlanMetric.java
@@ -0,0 +1,17 @@
+package io.ebeaninternal.metric;
+
+/**
+ * Internal Query plan metric holder.
+ */
+public interface QueryPlanMetric {
+
+  /**
+   * Return the underlying timed metric.
+   */
+  TimedMetric getMetric();
+
+  /**
+   * Collect the non-empty query plan metrics.
+   */
+  void collect(QueryPlanCollector collector);
+}
diff --git a/src/main/java/io/ebeaninternal/metric/TimedMetric.java b/src/main/java/io/ebeaninternal/metric/TimedMetric.java
index c45fa19dc..a2a29e030 100644
--- a/src/main/java/io/ebeaninternal/metric/TimedMetric.java
+++ b/src/main/java/io/ebeaninternal/metric/TimedMetric.java
@@ -12,7 +12,12 @@ public interface TimedMetric {
   /**
    * Add a time event (usually in microseconds).
    */
-  void add(long value);
+  void add(long micros);
+
+  /**
+   * Add a time event with the number of loaded beans or rows.
+   */
+  void add(long micros, long beans);
 
   /**
    * Return true if there are no metrics collected since the last collection.
diff --git a/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
new file mode 100644
index 000000000..7726fae36
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
@@ -0,0 +1,182 @@
+package io.ebeaninternal.server.core;
+
+import io.ebean.EbeanServer;
+import io.ebean.Transaction;
+import io.ebean.util.JdbcClose;
+import io.ebeaninternal.api.BindParams;
+import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.api.SpiSqlBinding;
+import io.ebeaninternal.api.SpiTransaction;
+import io.ebeaninternal.server.lib.util.Str;
+import io.ebeaninternal.server.persist.Binder;
+import io.ebeaninternal.server.persist.TrimLogSql;
+import io.ebeaninternal.server.transaction.TransactionManager;
+import io.ebeaninternal.server.util.BindParamsParser;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * Wraps the objects involved in executing a SQL / Relational Query.
+ */
+public abstract class AbstractSqlQueryRequest {
+
+  private final SpiSqlBinding query;
+
+  protected final SpiEbeanServer ebeanServer;
+
+  protected SpiTransaction trans;
+
+  private boolean createdTransaction;
+
+  protected String sql;
+
+  protected ResultSet resultSet;
+
+  protected String bindLog = "";
+
+  protected PreparedStatement pstmt;
+
+  protected long startNano;
+
+  /**
+   * Create the BeanFindRequest.
+   */
+  AbstractSqlQueryRequest(SpiEbeanServer server, SpiSqlBinding query, Transaction t) {
+    this.ebeanServer = server;
+    this.query = query;
+    this.trans = (SpiTransaction) t;
+  }
+
+  /**
+   * Create a transaction if none currently exists.
+   */
+  public void initTransIfRequired() {
+    if (trans == null) {
+      trans = ebeanServer.currentServerTransaction();
+      if (trans == null || !trans.isActive()) {
+        // create a local readOnly transaction
+        trans = ebeanServer.createQueryTransaction(null);
+        createdTransaction = true;
+      }
+    }
+  }
+
+  /**
+   * End the transaction if it was locally created.
+   */
+  public void endTransIfRequired() {
+    if (createdTransaction) {
+      trans.commit();
+    }
+  }
+
+  public EbeanServer getEbeanServer() {
+    return ebeanServer;
+  }
+
+  public SpiTransaction getTransaction() {
+    return trans;
+  }
+
+  public boolean isLogSql() {
+    return trans.isLogSql();
+  }
+
+  abstract void setResultSet(ResultSet resultSet) throws SQLException;
+
+  /**
+   * Return the bindLog for this request.
+   */
+  public String getBindLog() {
+    return bindLog;
+  }
+
+  /**
+   * Return true if we can navigate to the next row.
+   */
+  public boolean next() throws SQLException {
+    return resultSet.next();
+  }
+
+  protected abstract void requestComplete();
+
+  /**
+   * Close the underlying resources.
+   */
+  public void close() {
+    requestComplete();
+    JdbcClose.close(resultSet);
+    JdbcClose.close(pstmt);
+  }
+
+
+  /**
+   * Prepare the SQL taking into account named bind parameters.
+   */
+  private void prepareSql() {
+
+    String sql = query.getQuery();
+    BindParams bindParams = query.getBindParams();
+    if (!bindParams.isEmpty()) {
+      // convert any named parameters if required
+      sql = BindParamsParser.parse(bindParams, sql);
+    }
+    this.sql = limitOffset(sql);
+  }
+
+  private String limitOffset(String sql) {
+
+    int firstRow = query.getFirstRow();
+    int maxRows = query.getMaxRows();
+    if (firstRow > 0 || maxRows > 0) {
+      return ebeanServer.getDatabasePlatform().getBasicSqlLimiter().limit(sql, firstRow, maxRows);
+    }
+    return sql;
+  }
+
+  /**
+   * Prepare and execute the SQL using the Binder.
+   */
+  public void executeSql(Binder binder) throws SQLException {
+
+    startNano = System.nanoTime();
+
+    prepareSql();
+
+    Connection conn = trans.getInternalConnection();
+
+    pstmt = conn.prepareStatement(sql);
+    if (query.getTimeout() > 0) {
+      pstmt.setQueryTimeout(query.getTimeout());
+    }
+    if (query.getBufferFetchSizeHint() > 0) {
+      pstmt.setFetchSize(query.getBufferFetchSizeHint());
+    }
+
+    BindParams bindParams = query.getBindParams();
+    if (!bindParams.isEmpty()) {
+      this.bindLog = binder.bind(bindParams, pstmt, conn);
+    }
+
+    if (isLogSql()) {
+      String logSql = TrimLogSql.trim(sql);
+      if (TransactionManager.SQL_LOGGER.isTraceEnabled()) {
+        logSql = Str.add(logSql, "; --bind(", bindLog, ")");
+      }
+      trans.logSql(logSql);
+    }
+
+    setResultSet(pstmt.executeQuery());
+  }
+
+  /**
+   * Return the SQL executed for this query.
+   */
+  public String getSql() {
+    return sql;
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java b/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java
index f69aea9d2..b52c66390 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.core;
 
 import io.ebean.meta.MetaInfoManager;
 import io.ebean.meta.MetaObjectGraphNodeStats;
+import io.ebean.meta.MetaQueryMetric;
 import io.ebean.meta.MetaQueryPlanStatistic;
 import io.ebean.meta.MetaTimedMetric;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
@@ -26,6 +27,11 @@ public class DefaultMetaInfoManager implements MetaInfoManager {
     return server.collectTransactionStatistics(reset);
   }
 
+  @Override
+  public List<MetaQueryMetric> collectQueryStatistics(boolean reset) {
+    return server.collectQueryStatistics(reset);
+  }
+
   @Override
   public List<MetaQueryPlanStatistic> collectQueryPlanStatistics(boolean reset) {
 
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 5a8b7b4b8..e74e14e53 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -5,6 +5,7 @@ import io.ebean.BackgroundExecutor;
 import io.ebean.BeanState;
 import io.ebean.CallableSql;
 import io.ebean.DocumentStore;
+import io.ebean.DtoQuery;
 import io.ebean.ExpressionFactory;
 import io.ebean.ExpressionList;
 import io.ebean.Filter;
@@ -47,6 +48,7 @@ import io.ebean.event.BeanPersistController;
 import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.meta.MetaInfoManager;
+import io.ebean.meta.MetaQueryMetric;
 import io.ebean.meta.MetaTimedMetric;
 import io.ebean.plugin.BeanType;
 import io.ebean.plugin.Plugin;
@@ -58,6 +60,7 @@ import io.ebeaninternal.api.LoadBeanRequest;
 import io.ebeaninternal.api.LoadManyRequest;
 import io.ebeaninternal.api.ScopedTransaction;
 import io.ebeaninternal.api.SpiBackgroundExecutor;
+import io.ebeaninternal.api.SpiDtoQuery;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiJsonContext;
 import io.ebeaninternal.api.SpiQuery;
@@ -74,6 +77,8 @@ import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.InheritInfo;
+import io.ebeaninternal.server.dto.DtoBeanDescriptor;
+import io.ebeaninternal.server.dto.DtoBeanManager;
 import io.ebeaninternal.server.el.ElFilter;
 import io.ebeaninternal.server.grammer.EqlParser;
 import io.ebeaninternal.server.lib.ShutdownManager;
@@ -86,6 +91,8 @@ import io.ebeaninternal.server.query.LimitOffsetPagedList;
 import io.ebeaninternal.server.query.QueryFutureIds;
 import io.ebeaninternal.server.query.QueryFutureList;
 import io.ebeaninternal.server.query.QueryFutureRowCount;
+import io.ebeaninternal.server.query.dto.DtoQueryEngine;
+import io.ebeaninternal.server.querydefn.DefaultDtoQuery;
 import io.ebeaninternal.server.querydefn.DefaultOrmQuery;
 import io.ebeaninternal.server.querydefn.DefaultOrmUpdate;
 import io.ebeaninternal.server.querydefn.DefaultRelationalQuery;
@@ -147,9 +154,11 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   private final OrmQueryEngine queryEngine;
 
   private final RelationalQueryEngine relationalQueryEngine;
+  private final DtoQueryEngine dtoQueryEngine;
 
   private final ServerCacheManager serverCacheManager;
 
+  private final DtoBeanManager dtoBeanManager;
   private final BeanDescriptorManager beanDescriptorManager;
 
   private final AutoTuneService autoTuneService;
@@ -220,6 +229,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    */
   public DefaultServer(InternalConfiguration config, ServerCacheManager cache) {
 
+    this.dtoBeanManager = config.getDtoBeanManager();
     this.serverConfig = config.getServerConfig();
     this.objectGraphStats = new ConcurrentHashMap<>();
     this.metaInfoManager = new DefaultMetaInfoManager(this);
@@ -249,6 +259,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     this.persister = config.createPersister(this);
     this.queryEngine = config.createOrmQueryEngine();
     this.relationalQueryEngine = config.createRelationalQueryEngine();
+    this.dtoQueryEngine = config.createDtoQueryEngine();
 
     this.autoTuneService = config.createAutoTuneService(this);
     this.readAuditPrepare = config.getReadAuditPrepare();
@@ -967,6 +978,13 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return new DefaultOrmUpdate<>(beanType, this, desc.getBaseTable(), ormUpdate);
   }
 
+  @Override
+  public <T> DtoQuery<T> findDto(Class<T> dtoType, String sql) {
+
+    DtoBeanDescriptor<T> descriptor = dtoBeanManager.getDescriptor(dtoType);
+    return new DefaultDtoQuery<>(this, descriptor, sql.trim());
+  }
+
   @Override
   public SqlQuery createSqlQuery(String sql) {
     return new DefaultRelationalQuery(this, sql.trim());
@@ -1500,6 +1518,54 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Override
+  public <T> void findDtoEach(SpiDtoQuery<T> query, Consumer<T> consumer) {
+    DtoQueryRequest<T> request = new DtoQueryRequest<>(this, dtoQueryEngine, query);
+    try {
+      request.initTransIfRequired();
+      request.findEach(consumer);
+
+    } finally {
+      request.endTransIfRequired();
+    }
+  }
+
+  @Override
+  public <T> void findDtoEachWhile(SpiDtoQuery<T> query, Predicate<T> consumer) {
+    DtoQueryRequest<T> request = new DtoQueryRequest<>(this, dtoQueryEngine, query);
+    try {
+      request.initTransIfRequired();
+      request.findEachWhile(consumer);
+
+    } finally {
+      request.endTransIfRequired();
+    }
+  }
+
+  @Override
+  public <T> List<T> findDtoList(SpiDtoQuery<T> query) {
+    DtoQueryRequest<T> request = new DtoQueryRequest<>(this, dtoQueryEngine, query);
+    try {
+      request.initTransIfRequired();
+      return request.findList();
+
+    } finally {
+      request.endTransIfRequired();
+    }
+  }
+
+  @Override
+  public <T> T findDtoOne(SpiDtoQuery<T> query) {
+    DtoQueryRequest<T> request = new DtoQueryRequest<>(this, dtoQueryEngine, query);
+    try {
+      request.initTransIfRequired();
+      return extractUnique(request.findList());
+
+    } finally {
+      request.endTransIfRequired();
+    }
+  }
+
   /**
    * Persist the bean by either performing an insert or update.
    */
@@ -2188,4 +2254,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return null;
   }
 
+  public List<MetaQueryMetric> collectQueryStatistics(boolean reset) {
+    return dtoBeanManager.collectStats(reset);
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
new file mode 100644
index 000000000..b0801eb2e
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
@@ -0,0 +1,103 @@
+package io.ebeaninternal.server.core;
+
+import io.ebeaninternal.api.SpiDtoQuery;
+import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.server.dto.DtoColumn;
+import io.ebeaninternal.server.dto.DtoMappingRequest;
+import io.ebeaninternal.server.dto.DtoQueryPlan;
+import io.ebeaninternal.server.query.dto.DtoQueryEngine;
+import io.ebeaninternal.server.type.DataReader;
+import io.ebeaninternal.server.type.RsetDataReader;
+
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+/**
+ * Wraps the objects involved in executing a DtoQuery.
+ */
+public final class DtoQueryRequest<T> extends AbstractSqlQueryRequest {
+
+  private final SpiDtoQuery<T> query;
+
+  private final DtoQueryEngine queryEngine;
+
+  private DtoQueryPlan plan;
+
+  private DataReader dataReader;
+
+  private int beanCount;
+
+  DtoQueryRequest(SpiEbeanServer server, DtoQueryEngine engine, SpiDtoQuery<T> query) {
+    super(server, query, null);
+    this.queryEngine = engine;
+    this.query = query;
+  }
+
+  @Override
+  protected void setResultSet(ResultSet resultSet) throws SQLException {
+    this.resultSet = resultSet;
+    this.dataReader = new RsetDataReader(ebeanServer.getDataTimeZone(), resultSet);
+    obtainPlan();
+  }
+
+  private void obtainPlan() throws SQLException {
+    String planKey = query.planKey();
+    plan = query.getQueryPlan(planKey);
+    if (plan == null) {
+      plan = query.buildPlan(mappingRequest());
+      query.putQueryPlan(planKey, plan);
+    }
+  }
+
+  @Override
+  protected void requestComplete() {
+    if (plan != null) {
+      long exeMicros = (System.nanoTime() - startNano) / 1000L;
+      plan.collect(exeMicros, beanCount);
+    }
+  }
+
+  public void findEach(Consumer<T> consumer) {
+    queryEngine.findEach(this, consumer);
+  }
+
+  public void findEachWhile(Predicate<T> consumer) {
+    queryEngine.findEachWhile(this, consumer);
+  }
+
+  public List<T> findList() {
+    return queryEngine.findList(this);
+  }
+
+  @SuppressWarnings("unchecked")
+  public T readNextBean() throws SQLException {
+    beanCount++;
+    dataReader.resetColumnPosition();
+    return (T)plan.readRow(dataReader);
+  }
+
+  private DtoMappingRequest mappingRequest() throws SQLException {
+    return new DtoMappingRequest(query, sql, readMeta());
+  }
+
+  private DtoColumn[] readMeta() throws SQLException {
+
+    ResultSetMetaData metaData = resultSet.getMetaData();
+    int cols = metaData.getColumnCount();
+    DtoColumn[] meta = new DtoColumn[cols];
+    for (int i = 0; i < cols; i++) {
+      int pos = i+1;
+      String columnLabel = metaData.getColumnLabel(pos);
+      if (columnLabel == null) {
+        columnLabel = metaData.getColumnName(pos);
+      }
+      meta[i] = new DtoColumn(columnLabel);
+    }
+    return meta;
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index a65dd2194..dc835fb6c 100644
--- a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -40,6 +40,7 @@ import io.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory
 import io.ebeaninternal.server.deploy.parse.DeployCreateProperties;
 import io.ebeaninternal.server.deploy.parse.DeployInherit;
 import io.ebeaninternal.server.deploy.parse.DeployUtil;
+import io.ebeaninternal.server.dto.DtoBeanManager;
 import io.ebeaninternal.server.expression.DefaultExpressionFactory;
 import io.ebeaninternal.server.persist.Binder;
 import io.ebeaninternal.server.persist.DefaultPersister;
@@ -48,6 +49,7 @@ import io.ebeaninternal.server.persist.platform.PostgresMultiValueBind;
 import io.ebeaninternal.server.query.CQueryEngine;
 import io.ebeaninternal.server.query.DefaultOrmQueryEngine;
 import io.ebeaninternal.server.query.DefaultRelationalQueryEngine;
+import io.ebeaninternal.server.query.dto.DtoQueryEngine;
 import io.ebeaninternal.server.readaudit.DefaultReadAuditLogger;
 import io.ebeaninternal.server.readaudit.DefaultReadAuditPrepare;
 import io.ebeaninternal.server.text.json.DJsonContext;
@@ -97,6 +99,8 @@ public class InternalConfiguration {
 
   private final TypeManager typeManager;
 
+  private final DtoBeanManager dtoBeanManager;
+
   private final DataTimeZone dataTimeZone;
 
   private final Binder binder;
@@ -149,6 +153,7 @@ public class InternalConfiguration {
 
     this.deployCreateProperties = new DeployCreateProperties(typeManager);
     this.deployUtil = new DeployUtil(typeManager, serverConfig);
+    this.dtoBeanManager = new DtoBeanManager(typeManager);
 
     this.beanDescriptorManager = new BeanDescriptorManager(this);
     Map<String, String> asOfTableMapping = beanDescriptorManager.deploy();
@@ -294,8 +299,12 @@ public class InternalConfiguration {
     return AutoTuneServiceFactory.create(server, serverConfig);
   }
 
+  public DtoQueryEngine createDtoQueryEngine() {
+    return new DtoQueryEngine(binder);
+  }
+
   public RelationalQueryEngine createRelationalQueryEngine() {
-    return new DefaultRelationalQueryEngine(binder, serverConfig.getDatabaseBooleanTrue());
+    return new DefaultRelationalQueryEngine(binder, serverConfig.getDatabaseBooleanTrue(), serverConfig.getDbTypeConfig().getDbUuid().useBinaryOptimized());
   }
 
   public OrmQueryEngine createOrmQueryEngine() {
@@ -435,7 +444,7 @@ public class InternalConfiguration {
   /**
    * Create the TransactionScopeManager taking into account JTA or external transaction manager.
    */
-  public TransactionScopeManager createTransactionScopeManager() {
+  private TransactionScopeManager createTransactionScopeManager() {
 
     ExternalTransactionManager externalTransactionManager = serverConfig.getExternalTransactionManager();
     if (externalTransactionManager == null && serverConfig.isUseJtaTransactionManager()) {
@@ -505,4 +514,8 @@ public class InternalConfiguration {
   public MultiValueBind getMultiValueBind() {
     return multiValueBind;
   }
+
+  public DtoBeanManager getDtoBeanManager() {
+    return dtoBeanManager;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java b/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java
index b0f01d8cb..ae4dde8f1 100644
--- a/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java
@@ -9,6 +9,11 @@ import java.util.function.Predicate;
 
 public interface RelationalQueryEngine {
 
+  /**
+   * Return a new SqlRow with appropriate mapping for DB true and optimised binary UUID etc.
+   */
+  SqlRow createSqlRow(int estimateCapacity);
+
   /**
    * Find a list of beans using relational query.
    */
diff --git a/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
index 7f8ab2e8a..81ae0aad9 100644
--- a/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
@@ -1,24 +1,11 @@
 package io.ebeaninternal.server.core;
 
-import io.ebean.EbeanServer;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
 import io.ebean.Transaction;
-import io.ebean.util.JdbcClose;
-import io.ebean.config.ServerConfig;
-import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.SpiEbeanServer;
-import io.ebeaninternal.api.SpiSqlQuery;
-import io.ebeaninternal.api.SpiTransaction;
-import io.ebeaninternal.server.lib.util.Str;
-import io.ebeaninternal.server.persist.Binder;
-import io.ebeaninternal.server.persist.TrimLogSql;
-import io.ebeaninternal.server.query.DefaultSqlRow;
-import io.ebeaninternal.server.transaction.TransactionManager;
-import io.ebeaninternal.server.util.BindParamsParser;
+import io.ebeaninternal.api.SpiSqlBinding;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
@@ -30,63 +17,36 @@ import java.util.function.Predicate;
 /**
  * Wraps the objects involved in executing a SqlQuery.
  */
-public final class RelationalQueryRequest {
-
-  private final SpiSqlQuery query;
+public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
 
   private final RelationalQueryEngine queryEngine;
 
-  private final SpiEbeanServer ebeanServer;
-
-  private SpiTransaction trans;
-
-  private boolean createdTransaction;
-
-  private String sql;
-
-  private ResultSet resultSet;
-
-  private int rowCount;
-
-  private String bindLog = "";
-
   private String[] propertyNames;
 
   private int estimateCapacity;
 
-  private PreparedStatement pstmt;
+  private int rows;
 
   /**
    * Create the BeanFindRequest.
    */
   RelationalQueryRequest(SpiEbeanServer server, RelationalQueryEngine engine, SqlQuery q, Transaction t) {
-    this.ebeanServer = server;
+    super(server, (SpiSqlBinding) q, t);
     this.queryEngine = engine;
-    this.query = (SpiSqlQuery) q;
-    this.trans = (SpiTransaction) t;
   }
 
-  /**
-   * Create a transaction if none currently exists.
-   */
-  public void initTransIfRequired() {
-    if (trans == null) {
-      trans = ebeanServer.currentServerTransaction();
-      if (trans == null || !trans.isActive()) {
-        // create a local readOnly transaction
-        trans = ebeanServer.beginServerTransaction();
-        createdTransaction = true;
-      }
-    }
+  @Override
+  protected void setResultSet(ResultSet resultSet) throws SQLException {
+    this.resultSet = resultSet;
+    this.propertyNames = getPropertyNames();
+    // calculate the initialCapacity of the Map to reduce rehashing
+    float initCap = (propertyNames.length) / 0.7f;
+    this.estimateCapacity = (int) initCap + 1;
   }
 
-  /**
-   * End the transaction if it was locally created.
-   */
-  public void endTransIfRequired() {
-    if (createdTransaction) {
-      ebeanServer.commitTransaction();
-    }
+  @Override
+  protected void requestComplete() {
+
   }
 
   public void findEach(Consumer<SqlRow> consumer) {
@@ -101,37 +61,6 @@ public final class RelationalQueryRequest {
     return queryEngine.findList(this);
   }
 
-  /**
-   * Return the find that is to be performed.
-   */
-  public SpiSqlQuery getQuery() {
-    return query;
-  }
-
-  public EbeanServer getEbeanServer() {
-    return ebeanServer;
-  }
-
-  public SpiTransaction getTransaction() {
-    return trans;
-  }
-
-  public boolean isLogSql() {
-    return trans.isLogSql();
-  }
-
-  public boolean isLogSummary() {
-    return trans.isLogSummary();
-  }
-
-  private void setResultSet(ResultSet resultSet) throws SQLException {
-    this.resultSet = resultSet;
-    this.propertyNames = getPropertyNames();
-    // calculate the initialCapacity of the Map to reduce rehashing
-    float initCap = (propertyNames.length) / 0.7f;
-    this.estimateCapacity = (int) initCap + 1;
-  }
-
   /**
    * Build the list of property names.
    */
@@ -147,36 +76,14 @@ public final class RelationalQueryRequest {
     return propNames.toArray(new String[propNames.size()]);
   }
 
-  /**
-   * Return the bindLog for this request.
-   */
-  public String getBindLog() {
-    return bindLog;
-  }
-
-  /**
-   * Return true if we can navigate to the next row.
-   */
-  public boolean next() throws SQLException {
-    rowCount++;
-    return resultSet.next();
-  }
-
-  /**
-   * Close the underlying resources.
-   */
-  public void close() {
-    JdbcClose.close(resultSet);
-    JdbcClose.close(pstmt);
-  }
-
   /**
    * Read and return the next SqlRow.
    */
-  public SqlRow createNewRow(String dbTrueValue) throws SQLException {
-    ServerConfig.DbUuid dbUuid = ebeanServer.getServerConfig().getDbTypeConfig().getDbUuid();
-    SqlRow sqlRow = new DefaultSqlRow(estimateCapacity, 0.75f, dbTrueValue, dbUuid.useBinaryOptimized());
+  public SqlRow createNewRow() throws SQLException {
 
+    rows++;
+
+    SqlRow sqlRow = queryEngine.createSqlRow(estimateCapacity);
     int index = 0;
     for (String propertyName : propertyNames) {
       index++;
@@ -186,76 +93,11 @@ public final class RelationalQueryRequest {
     return sqlRow;
   }
 
-  /**
-   * Prepare the SQL taking into account named bind parameters.
-   */
-  private void prepareSql() {
-
-    String sql = query.getQuery();
-    BindParams bindParams = query.getBindParams();
-    if (!bindParams.isEmpty()) {
-      // convert any named parameters if required
-      sql = BindParamsParser.parse(bindParams, sql);
+  public void logSummary() {
+    if (trans.isLogSummary()) {
+      long micros = (System.nanoTime() - startNano) / 1000L;
+      trans.logSummary("SqlQuery  rows[" + rows + "] micros[" + micros + "] bind[" + bindLog + "]");
     }
-    this.sql = limitOffset(sql);
   }
 
-  private String limitOffset(String sql) {
-
-    int firstRow = query.getFirstRow();
-    int maxRows = query.getMaxRows();
-    if (firstRow > 0 || maxRows > 0) {
-      return ebeanServer.getDatabasePlatform().getBasicSqlLimiter().limit(sql, firstRow, maxRows);
-    }
-    return sql;
-  }
-
-  /**
-   * Prepare and execute the SQL using the Binder.
-   */
-  public void executeSql(Binder binder) throws SQLException {
-
-    prepareSql();
-
-    Connection conn = trans.getInternalConnection();
-
-    // synchronise for query.cancel() support
-    pstmt = conn.prepareStatement(sql);
-    if (query.getTimeout() > 0) {
-      pstmt.setQueryTimeout(query.getTimeout());
-    }
-    if (query.getBufferFetchSizeHint() > 0) {
-      pstmt.setFetchSize(query.getBufferFetchSizeHint());
-    }
-
-    BindParams bindParams = query.getBindParams();
-    if (!bindParams.isEmpty()) {
-      this.bindLog = binder.bind(bindParams, pstmt, conn);
-    }
-
-    if (isLogSql()) {
-      String logSql = TrimLogSql.trim(sql);
-      if (TransactionManager.SQL_LOGGER.isTraceEnabled()) {
-        logSql = Str.add(logSql, "; --bind(", bindLog, ")");
-      }
-      trans.logSql(logSql);
-    }
-
-    setResultSet(pstmt.executeQuery());
-
-  }
-
-  /**
-   * Return the SQL executed for this query.
-   */
-  public String getSql() {
-    return sql;
-  }
-
-  /**
-   * Return the rows read.
-   */
-  public int getRowCount() {
-    return rowCount - 1;
-  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java
new file mode 100644
index 000000000..6d7698857
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java
@@ -0,0 +1,45 @@
+package io.ebeaninternal.server.dto;
+
+import io.ebeaninternal.metric.QueryPlanCollector;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Manages the query plans for a given DTO bean type.
+ */
+public class DtoBeanDescriptor<T> {
+
+  private final Map<String, DtoQueryPlan> plans = new ConcurrentHashMap<>();
+
+  private final Class<T> dtoType;
+
+  private final DtoMeta meta;
+
+  DtoBeanDescriptor(Class<T> dtoType, DtoMeta meta) {
+    this.dtoType = dtoType;
+    this.meta = meta;
+  }
+
+  public Class<T> getType() {
+    return dtoType;
+  }
+
+  public DtoQueryPlan getQueryPlan(String planKey) {
+    return plans.get(planKey);
+  }
+
+  public DtoQueryPlan buildPlan(DtoMappingRequest request) {
+    return meta.match(request);
+  }
+
+  public void putQueryPlan(String planKey, DtoQueryPlan plan) {
+    plans.put(planKey, plan);
+  }
+
+  public void collectStats(QueryPlanCollector collector) {
+    for (DtoQueryPlan plan : plans.values()) {
+      plan.collectStats(collector);
+    }
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoBeanManager.java b/src/main/java/io/ebeaninternal/server/dto/DtoBeanManager.java
new file mode 100644
index 000000000..87e58a453
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoBeanManager.java
@@ -0,0 +1,53 @@
+package io.ebeaninternal.server.dto;
+
+import io.ebean.meta.MetaQueryMetric;
+import io.ebeaninternal.metric.MetricFactory;
+import io.ebeaninternal.metric.QueryPlanCollector;
+import io.ebeaninternal.server.type.TypeManager;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Manages all the DTO bean descriptors.
+ */
+public class DtoBeanManager {
+
+  private final TypeManager typeManager;
+
+  private final Map<Class, DtoBeanDescriptor> descriptorMap = new ConcurrentHashMap<>();
+
+  public DtoBeanManager(TypeManager typeManager) {
+    this.typeManager = typeManager;
+  }
+
+  /**
+   * Return the descriptor for the given DTO bean class.
+   */
+  @SuppressWarnings("unchecked")
+  public <T> DtoBeanDescriptor<T> getDescriptor(Class<T> dtoType) {
+
+    return descriptorMap.computeIfAbsent(dtoType, this::createDescriptor);
+  }
+
+  private <T> DtoBeanDescriptor createDescriptor(Class<T> dtoType) {
+
+    try {
+      DtoMeta meta = new DtoMetaBuilder(dtoType, typeManager).build();
+      return new DtoBeanDescriptor<>(dtoType, meta);
+    } catch (Exception e) {
+      throw new IllegalStateException(e);
+    }
+  }
+
+  public List<MetaQueryMetric> collectStats(boolean reset) {
+
+    QueryPlanCollector collector = MetricFactory.get().createCollector(reset);
+
+    for (DtoBeanDescriptor value : descriptorMap.values()) {
+      value.collectStats(collector);
+    }
+    return collector.complete();
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoColumn.java b/src/main/java/io/ebeaninternal/server/dto/DtoColumn.java
new file mode 100644
index 000000000..187caf97f
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoColumn.java
@@ -0,0 +1,23 @@
+package io.ebeaninternal.server.dto;
+
+/**
+ * A column in the resultSet that we want to map to a bean property.
+ */
+public class DtoColumn {
+
+  private final String label;
+
+  public DtoColumn(String label) {
+    this.label = label;
+  }
+
+  public String getLabel() {
+    return label;
+  }
+
+  @Override
+  public String toString() {
+    return label;
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java b/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java
new file mode 100644
index 000000000..d781e35c0
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java
@@ -0,0 +1,49 @@
+package io.ebeaninternal.server.dto;
+
+import io.ebeaninternal.api.SpiDtoQuery;
+import io.ebeaninternal.metric.MetricFactory;
+import io.ebeaninternal.metric.QueryPlanMetric;
+
+/**
+ * Request to map a resultSet columns for a query into a DTO bean.
+ */
+public class DtoMappingRequest {
+
+  private final Class type;
+
+  private final String label;
+
+  private final String sql;
+
+  private final boolean relaxedMode;
+
+  private final DtoColumn[] columnMeta;
+
+  public DtoMappingRequest(SpiDtoQuery query, String sql, DtoColumn[] columnMeta) {
+    this.type = query.getType();
+    this.label = query.getLabel();
+    this.sql = sql;
+    this.relaxedMode = query.isRelaxedMode();
+    this.columnMeta = columnMeta;
+  }
+
+  public DtoColumn[] getColumnMeta() {
+    return columnMeta;
+  }
+
+  public boolean isRelaxedMode() {
+    return relaxedMode;
+  }
+
+  public String getLabel() {
+    return label;
+  }
+
+  public String getSql() {
+    return sql;
+  }
+
+  public QueryPlanMetric createMetric() {
+    return MetricFactory.get().createQueryPlanMetric(type, label, sql);
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoMeta.java b/src/main/java/io/ebeaninternal/server/dto/DtoMeta.java
new file mode 100644
index 000000000..272e962b5
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoMeta.java
@@ -0,0 +1,119 @@
+package io.ebeaninternal.server.dto;
+
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Holds property and constructor meta data for a given DTO bean type.
+ *
+ * Uses this to map a mapping request (columns) to a 'query plan' (constructor and setters).
+ */
+class DtoMeta {
+
+  private final Class<?> dtoType;
+  private final Map<String, DtoMetaProperty> propMap = new LinkedHashMap<>();
+
+  private final Map<Integer, DtoMetaConstructor> constructorMap = new LinkedHashMap<>();
+
+  private final DtoMetaConstructor defaultConstructor;
+  private final DtoMetaConstructor maxArgConstructor;
+
+  DtoMeta(Class<?> dtoType, List<DtoMetaConstructor> constructors, List<DtoMetaProperty> properties) {
+    this.dtoType = dtoType;
+
+    for (DtoMetaProperty property : properties) {
+      propMap.put(property.getName().toUpperCase(), property);
+    }
+
+    int maxArg = 0;
+
+    DtoMetaConstructor defaultConstructor = null;
+    DtoMetaConstructor maxArgConstructor = null;
+
+    for (DtoMetaConstructor constructor : constructors) {
+      int args = constructor.getArgCount();
+      constructorMap.put(args, constructor);
+      if (args == 0) {
+        defaultConstructor = constructor;
+      } else if (args > maxArg) {
+        maxArgConstructor = constructor;
+        maxArg = args;
+      }
+    }
+    this.defaultConstructor = defaultConstructor;
+    this.maxArgConstructor = maxArgConstructor;
+  }
+
+  public DtoQueryPlan match(DtoMappingRequest request) {
+
+    DtoColumn[] cols = request.getColumnMeta();
+
+    int colLen = cols.length;
+    DtoMetaConstructor constructor = constructorMap.get(colLen);
+    if (constructor != null) {
+      return new DtoQueryPlanConstructor(request, constructor);
+    }
+    if (maxArgConstructor != null && colLen > maxArgConstructor.getArgCount()) {
+      // maxArgConst + setters
+      return matchMaxArgPlusSetters(request);
+    }
+    if (defaultConstructor != null) {
+      return matchSetters(request);
+    }
+
+    String msg = "Unable to map the resultSet columns " + Arrays.toString(cols)
+      + " to the bean type ["+dtoType+"] as the number of columns in the resultSet is less than the constructor"
+      + " (and that there is no default constructor) ?";
+    throw new IllegalStateException(msg);
+  }
+
+  private DtoQueryPlanConPlus matchMaxArgPlusSetters(DtoMappingRequest request) {
+
+
+    int firstOnes = maxArgConstructor.getArgCount();
+
+    DtoColumn[] cols = request.getColumnMeta();
+
+    DtoReadSet[] setterProps = new DtoReadSet[cols.length - firstOnes];
+
+    int pos = 0;
+    for (int i = firstOnes; i < cols.length; i++) {
+      String label = cols[i].getLabel();
+      DtoReadSet property = propMap.get(label.toUpperCase());
+      if (property == null || property.isReadOnly()) {
+        if (request.isRelaxedMode()) {
+          property = DtoReadSetColumnSkip.INSTANCE;
+        } else {
+          throw new IllegalStateException("Unable to map DB column " + cols[i] + " to a property with a setter method on " + dtoType);
+        }
+      }
+      setterProps[pos++] = property;
+    }
+
+    return new DtoQueryPlanConPlus(request, maxArgConstructor, setterProps);
+  }
+
+  private DtoQueryPlan matchSetters(DtoMappingRequest request) {
+
+    DtoColumn[] cols = request.getColumnMeta();
+
+    DtoReadSet[] setterProps = new DtoReadSet[cols.length];
+
+    for (int i = 0; i < cols.length; i++) {
+      String label = cols[i].getLabel();
+      DtoReadSet property = propMap.get(label.toUpperCase());
+      if (property == null || property.isReadOnly()) {
+        if (request.isRelaxedMode()) {
+          property = DtoReadSetColumnSkip.INSTANCE;
+        } else {
+          throw new IllegalStateException("Unable to map DB column " + cols[i] + " to a property with a setter method on " + dtoType);
+        }
+      }
+      setterProps[i] = property;
+    }
+
+    return new DtoQueryPlanConSetter(request, defaultConstructor, setterProps);
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoMetaBuilder.java b/src/main/java/io/ebeaninternal/server/dto/DtoMetaBuilder.java
new file mode 100644
index 000000000..d1c249f85
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoMetaBuilder.java
@@ -0,0 +1,77 @@
+package io.ebeaninternal.server.dto;
+
+import io.ebeaninternal.server.type.TypeManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Build the DtoMeta for a bean.
+ * <p>
+ * Use TypeManager to map bean property types to ScalarTypes.
+ */
+class DtoMetaBuilder {
+
+  private static final Logger log = LoggerFactory.getLogger(DtoMetaBuilder.class);
+
+  private final TypeManager typeManager;
+
+  private final Class<?> dtoType;
+
+  private final List<DtoMetaProperty> properties = new ArrayList<>();
+
+  private final List<DtoMetaConstructor> constructorList = new ArrayList<>();
+
+  DtoMetaBuilder(Class<?> dtoType, TypeManager typeManager) {
+    this.dtoType = dtoType;
+    this.typeManager = typeManager;
+  }
+
+  public DtoMeta build() throws IntrospectionException {
+
+    readConstructors();
+    readProperties();
+
+    return new DtoMeta(dtoType, constructorList, properties);
+  }
+
+  private void readProperties() throws IntrospectionException {
+
+    BeanInfo beanInfo = Introspector.getBeanInfo(dtoType);
+    for (PropertyDescriptor propertyDescriptor : beanInfo.getPropertyDescriptors()) {
+      if (include(propertyDescriptor)) {
+        try {
+          properties.add(new DtoMetaProperty(typeManager, propertyDescriptor, dtoType));
+        } catch (Exception e) {
+          log.debug("exclude on " + dtoType + " property " + propertyDescriptor.getName(), e);
+        }
+      }
+    }
+  }
+
+  private void readConstructors() {
+
+    Constructor<?>[] constructors = dtoType.getConstructors();
+
+    for (Constructor<?> constructor : constructors) {
+      try {
+        constructorList.add(new DtoMetaConstructor(typeManager, constructor, dtoType));
+      } catch (Exception e) {
+        // we don't want that constructor
+        log.debug("exclude on " + dtoType + " constructor " + constructor, e);
+      }
+    }
+  }
+
+  private boolean include(PropertyDescriptor property) {
+    return !property.getName().equals("class");
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoMetaConstructor.java b/src/main/java/io/ebeaninternal/server/dto/DtoMetaConstructor.java
new file mode 100644
index 000000000..05aec36b6
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoMetaConstructor.java
@@ -0,0 +1,67 @@
+package io.ebeaninternal.server.dto;
+
+import io.ebeaninternal.server.type.DataReader;
+import io.ebeaninternal.server.type.ScalarType;
+import io.ebeaninternal.server.type.TypeManager;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Constructor;
+import java.sql.SQLException;
+
+class DtoMetaConstructor {
+
+	private final Class<?>[] types;
+	private final MethodHandle handle;
+  private final ScalarType<?>[] scalarTypes;
+
+	DtoMetaConstructor(TypeManager typeManager, Constructor<?> constructor, Class<?> someClass) throws NoSuchMethodException, IllegalAccessException {
+
+    this.types = constructor.getParameterTypes();
+    this.scalarTypes = new ScalarType[types.length];
+    for (int i = 0; i < types.length; i++) {
+      scalarTypes[i] = typeManager.getScalarType(types[i]);
+    }
+
+    MethodHandles.Lookup lookup = MethodHandles.publicLookup();
+		this.handle = lookup.findConstructor(someClass, typeFor(types));
+	}
+
+	private MethodType typeFor(Class<?>[] types) {
+		return MethodType.methodType(void.class, types);
+	}
+
+  Class<?>[] getTypes() {
+    return types;
+  }
+
+  int getArgCount() {
+    return types.length;
+  }
+
+  Object defaultConstructor() {
+    try {
+      return handle.invokeWithArguments();
+    } catch (Throwable e) {
+      throw new RuntimeException("Unexpected error invoking constructor", e);
+    }
+  }
+
+	public Object process(DataReader dataReader) throws SQLException {
+    Object[] values = new Object[scalarTypes.length];
+    for (int i = 0; i < scalarTypes.length; i++) {
+      values[i] = scalarTypes[i].read(dataReader);
+    }
+    return invoke(values);
+  }
+
+	private Object invoke(Object... args) {
+	  try {
+	    return handle.invokeWithArguments(args);
+    } catch (Throwable e) {
+	    throw new RuntimeException("Unexpected error invoking constructor", e);
+    }
+	}
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoMetaProperty.java b/src/main/java/io/ebeaninternal/server/dto/DtoMetaProperty.java
new file mode 100644
index 000000000..3b672b100
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoMetaProperty.java
@@ -0,0 +1,68 @@
+package io.ebeaninternal.server.dto;
+
+import io.ebeaninternal.server.type.DataReader;
+import io.ebeaninternal.server.type.ScalarType;
+import io.ebeaninternal.server.type.TypeManager;
+
+import java.beans.PropertyDescriptor;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Method;
+import java.sql.SQLException;
+
+class DtoMetaProperty implements DtoReadSet {
+
+  private final Class<?> dtoType;
+  private final String name;
+  private final MethodHandle setter;
+  private final ScalarType<?> scalarType;
+
+  DtoMetaProperty(TypeManager typeManager, PropertyDescriptor descriptor, Class<?> dtoType) throws IllegalAccessException, NoSuchMethodException {
+
+    this.dtoType = dtoType;
+    this.name = descriptor.getName();
+
+    Method writeMethod = descriptor.getWriteMethod();
+    if (writeMethod != null) {
+
+      Class<?> propertyType = descriptor.getPropertyType();
+
+      MethodHandles.Lookup lookup = MethodHandles.publicLookup();
+      this.setter = lookup.findVirtual(dtoType, writeMethod.getName(), MethodType.methodType(void.class, propertyType));
+      this.scalarType = typeManager.getScalarType(propertyType);
+
+    } else {
+      this.scalarType = null;
+      this.setter = null;
+    }
+  }
+
+  String getName() {
+    return name;
+  }
+
+  @Override
+  public boolean isReadOnly() {
+    return scalarType == null;
+  }
+
+  @Override
+  public void readSet(Object bean, DataReader dataReader) throws SQLException {
+    Object value = scalarType.read(dataReader);
+    invoke(bean, value);
+  }
+
+  private void invoke(Object instance, Object arg) {
+    try {
+      setter.invoke(instance, arg);
+    } catch (Throwable e) {
+      throw new RuntimeException("Error calling setter for property " + fullname() + " with arg: " + arg, e);
+    }
+  }
+
+  private String fullname() {
+    return dtoType.getName() + "." + name;
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlan.java b/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlan.java
new file mode 100644
index 000000000..36d49c351
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlan.java
@@ -0,0 +1,27 @@
+package io.ebeaninternal.server.dto;
+
+import io.ebeaninternal.metric.QueryPlanCollector;
+import io.ebeaninternal.server.type.DataReader;
+
+import java.sql.SQLException;
+
+/**
+ * Knows how to read and map rows into a Bean.
+ */
+public interface DtoQueryPlan {
+
+  /**
+   * Read the row data and return the DTO bean.
+   */
+  Object readRow(DataReader dataReader) throws SQLException;
+
+  /**
+   * Add an event to the query execution statistics.
+   */
+  void collect(long exeMicros, int rows);
+
+  /**
+   * Collect the query plan statistics.
+   */
+  void collectStats(QueryPlanCollector collector);
+}
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanBase.java b/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanBase.java
new file mode 100644
index 000000000..b4a867a50
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanBase.java
@@ -0,0 +1,28 @@
+package io.ebeaninternal.server.dto;
+
+import io.ebeaninternal.metric.QueryPlanCollector;
+import io.ebeaninternal.metric.QueryPlanMetric;
+import io.ebeaninternal.metric.TimedMetric;
+
+abstract class DtoQueryPlanBase implements DtoQueryPlan {
+
+  private final QueryPlanMetric planMetric;
+
+  private final TimedMetric metric;
+
+  DtoQueryPlanBase(DtoMappingRequest request) {
+    this.planMetric = request.createMetric();
+    this.metric = planMetric.getMetric();
+  }
+
+  @Override
+  public void collect(long exeTime, int rows) {
+    metric.add(exeTime, rows);
+  }
+
+  @Override
+  public void collectStats(QueryPlanCollector collector) {
+    planMetric.collect(collector);
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanConPlus.java b/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanConPlus.java
new file mode 100644
index 000000000..a2d188ab0
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanConPlus.java
@@ -0,0 +1,32 @@
+package io.ebeaninternal.server.dto;
+
+import io.ebeaninternal.server.type.DataReader;
+
+import java.sql.SQLException;
+
+/**
+ * Plan based on Constructor plus some setter methods.
+ */
+class DtoQueryPlanConPlus extends DtoQueryPlanBase {
+
+  private final DtoMetaConstructor maxArgConstructor;
+
+  private final DtoReadSet[] setterProps;
+
+  DtoQueryPlanConPlus(DtoMappingRequest request, DtoMetaConstructor maxArgConstructor, DtoReadSet[] setterProps) {
+    super(request);
+    this.maxArgConstructor = maxArgConstructor;
+    this.setterProps = setterProps;
+  }
+
+  @Override
+  public Object readRow(DataReader dataReader) throws SQLException {
+
+    Object bean = maxArgConstructor.process(dataReader);
+    for (DtoReadSet setterProp : setterProps) {
+      setterProp.readSet(bean, dataReader);
+    }
+    return bean;
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanConSetter.java b/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanConSetter.java
new file mode 100644
index 000000000..16d6075f0
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanConSetter.java
@@ -0,0 +1,32 @@
+package io.ebeaninternal.server.dto;
+
+import io.ebeaninternal.server.type.DataReader;
+
+import java.sql.SQLException;
+
+/**
+ * Plan based on default constructor and setter methods.
+ */
+class DtoQueryPlanConSetter extends DtoQueryPlanBase {
+
+  private final DtoMetaConstructor defaultConstructor;
+
+  private final DtoReadSet[] setterProps;
+
+  DtoQueryPlanConSetter(DtoMappingRequest request, DtoMetaConstructor defaultConstructor, DtoReadSet[] setterProps) {
+    super(request);
+    this.defaultConstructor = defaultConstructor;
+    this.setterProps = setterProps;
+  }
+
+  @Override
+  public Object readRow(DataReader dataReader) throws SQLException {
+
+    Object bean = defaultConstructor.defaultConstructor();
+    for (DtoReadSet setterProp : setterProps) {
+      setterProp.readSet(bean, dataReader);
+    }
+    return bean;
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanConstructor.java b/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanConstructor.java
new file mode 100644
index 000000000..1626a18a4
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanConstructor.java
@@ -0,0 +1,24 @@
+package io.ebeaninternal.server.dto;
+
+import io.ebeaninternal.server.type.DataReader;
+
+import java.sql.SQLException;
+
+/**
+ * Plan based on mapping via single constructor only.
+ */
+class DtoQueryPlanConstructor extends DtoQueryPlanBase {
+
+  private final DtoMetaConstructor constructor;
+
+  DtoQueryPlanConstructor(DtoMappingRequest request, DtoMetaConstructor constructor) {
+    super(request);
+    this.constructor = constructor;
+  }
+
+  @Override
+  public Object readRow(DataReader dataReader) throws SQLException {
+    return constructor.process(dataReader);
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoReadSet.java b/src/main/java/io/ebeaninternal/server/dto/DtoReadSet.java
new file mode 100644
index 000000000..37c701a07
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoReadSet.java
@@ -0,0 +1,21 @@
+package io.ebeaninternal.server.dto;
+
+import io.ebeaninternal.server.type.DataReader;
+
+import java.sql.SQLException;
+
+/**
+ * Read and set a property value.
+ */
+public interface DtoReadSet {
+
+  /**
+   * Read the value from the dataReader and set it to the bean.
+   */
+  void readSet(Object bean, DataReader dataReader) throws SQLException;
+
+  /**
+   * Return true if this maps to a read only property (no setter method).
+   */
+  boolean isReadOnly();
+}
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoReadSetColumnSkip.java b/src/main/java/io/ebeaninternal/server/dto/DtoReadSetColumnSkip.java
new file mode 100644
index 000000000..013aa4045
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoReadSetColumnSkip.java
@@ -0,0 +1,21 @@
+package io.ebeaninternal.server.dto;
+
+import io.ebeaninternal.server.type.DataReader;
+
+/**
+ * Placeholder to skip reading a column that isn't mapped to a bean property.
+ */
+class DtoReadSetColumnSkip implements DtoReadSet {
+
+  static final DtoReadSet INSTANCE = new DtoReadSetColumnSkip();
+
+  @Override
+  public void readSet(Object bean, DataReader dataReader) {
+    dataReader.incrementPos(1);
+  }
+
+  @Override
+  public boolean isReadOnly() {
+    return false;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java b/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java
index c2f127d0a..8eae9626c 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java
@@ -1,6 +1,8 @@
 package io.ebeaninternal.server.profile;
 
 import io.ebeaninternal.metric.MetricFactory;
+import io.ebeaninternal.metric.QueryPlanCollector;
+import io.ebeaninternal.metric.QueryPlanMetric;
 import io.ebeaninternal.metric.TimedMetric;
 import io.ebeaninternal.metric.TimedMetricMap;
 
@@ -18,4 +20,14 @@ public class DMetricFactory implements MetricFactory {
   public TimedMetric createTimedMetric(String name) {
     return new DTimedMetric(name);
   }
+
+  @Override
+  public QueryPlanMetric createQueryPlanMetric(Class<?> type, String label, String sql) {
+    return new DQueryPlanMetric(new DQueryPlanMeta(type, label, sql), createTimedMetric(label));
+  }
+
+  @Override
+  public QueryPlanCollector createCollector(boolean reset) {
+    return new DQueryPlanCollector(reset);
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/profile/DQueryPlanCollector.java b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanCollector.java
new file mode 100644
index 000000000..a3903ec1f
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanCollector.java
@@ -0,0 +1,33 @@
+package io.ebeaninternal.server.profile;
+
+import io.ebean.meta.MetaQueryMetric;
+import io.ebeaninternal.metric.QueryPlanCollector;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class DQueryPlanCollector implements QueryPlanCollector {
+
+  private final boolean reset;
+
+  private final List<MetaQueryMetric> list = new ArrayList<>();
+
+  DQueryPlanCollector(boolean reset) {
+    this.reset = reset;
+  }
+
+  @Override
+  public boolean isReset() {
+    return reset;
+  }
+
+  @Override
+  public void add(MetaQueryMetric stats) {
+    list.add(stats);
+  }
+
+  @Override
+  public List<MetaQueryMetric> complete() {
+    return list;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java
new file mode 100644
index 000000000..02c6859c4
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java
@@ -0,0 +1,31 @@
+package io.ebeaninternal.server.profile;
+
+class DQueryPlanMeta {
+
+  private final Class<?> type;
+  private final String label;
+  private final String sql;
+
+  DQueryPlanMeta(Class<?> type, String label, String sql) {
+    this.type = type;
+    this.label = label;
+    this.sql = sql;
+  }
+
+  public Class<?> getType() {
+    return type;
+  }
+
+  public String getLabel() {
+    return label;
+  }
+
+  public String getSql() {
+    return sql;
+  }
+
+  @Override
+  public String toString() {
+    return "type:" + type + " label:" + label;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
new file mode 100644
index 000000000..4ba29d8c3
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
@@ -0,0 +1,102 @@
+package io.ebeaninternal.server.profile;
+
+import io.ebean.meta.MetaQueryMetric;
+import io.ebeaninternal.metric.QueryPlanCollector;
+import io.ebeaninternal.metric.QueryPlanMetric;
+import io.ebeaninternal.metric.TimedMetric;
+import io.ebeaninternal.metric.TimedMetricStats;
+
+class DQueryPlanMetric implements QueryPlanMetric {
+
+  private final DQueryPlanMeta meta;
+  private final TimedMetric metric;
+
+  DQueryPlanMetric(DQueryPlanMeta meta, TimedMetric metric) {
+    this.meta = meta;
+    this.metric = metric;
+  }
+
+  @Override
+  public void collect(QueryPlanCollector collector) {
+    TimedMetricStats stats = metric.collect(collector.isReset());
+    if (stats != null) {
+      collector.add(new Stats(meta, stats));
+    }
+  }
+
+  @Override
+  public TimedMetric getMetric() {
+    return metric;
+  }
+
+  private static class Stats implements MetaQueryMetric {
+
+    private final DQueryPlanMeta meta;
+    private final TimedMetricStats stats;
+
+    private Stats(DQueryPlanMeta meta, TimedMetricStats stats) {
+      this.meta = meta;
+      this.stats = stats;
+    }
+
+    @Override
+    public String toString() {
+      return meta +" "+ stats;
+    }
+
+    @Override
+    public Class<?> getType() {
+      return meta.getType();
+    }
+
+    @Override
+    public String getLabel() {
+      return meta.getLabel();
+    }
+
+    @Override
+    public String getSql() {
+      return meta.getSql();
+    }
+
+    @Override
+    public String getName() {
+      return stats.getName();
+    }
+
+    @Override
+    public String getLocation() {
+      return stats.getLocation();
+    }
+
+    @Override
+    public long getStartTime() {
+      return stats.getStartTime();
+    }
+
+    @Override
+    public long getCount() {
+      return stats.getCount();
+    }
+
+    @Override
+    public long getTotal() {
+      return stats.getTotal();
+    }
+
+    @Override
+    public long getMax() {
+      return stats.getMax();
+    }
+
+    @Override
+    public long getMean() {
+      return stats.getMean();
+    }
+
+    @Override
+    public long getBeanCount() {
+      return stats.getBeanCount();
+    }
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java b/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
index a30c41ff4..1a9d61f8f 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
@@ -19,7 +19,9 @@ class DTimeMetricStats implements TimedMetricStats {
 
   private final long max;
 
-  DTimeMetricStats(String name, long collectionStart, long count, long total, long max) {
+  private final long beanCount;
+
+  DTimeMetricStats(String name, long collectionStart, long count, long total, long max, long beanCount) {
     this.name = name;
     this.startTime = collectionStart;
     this.count = count;
@@ -27,6 +29,7 @@ class DTimeMetricStats implements TimedMetricStats {
     // collection is racy so sanitize the max value if it has not been set
     // this most likely would happen when count = 1 so max = mean
     this.max = max != Long.MIN_VALUE ? max : (count < 1 ? 0 : Math.round(total / count));
+    this.beanCount = beanCount;
   }
 
   @Override
@@ -40,7 +43,8 @@ class DTimeMetricStats implements TimedMetricStats {
     }
     sb.append("count:").append(count)
       .append(" total:").append(total)
-      .append(" max:").append(max);
+      .append(" max:").append(max)
+      .append(" beanCount:").append(beanCount);
     return sb.toString();
   }
 
@@ -99,4 +103,8 @@ class DTimeMetricStats implements TimedMetricStats {
     return (count < 1) ? 0L : Math.round((double)(total / count));
   }
 
+  @Override
+  public long getBeanCount() {
+    return beanCount;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java b/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
index 4ba32caa7..42a7f682c 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
@@ -16,15 +16,17 @@ import java.util.concurrent.atomic.LongAdder;
  */
 class DTimedMetric implements TimedMetric {
 
-  protected final String name;
+  private final String name;
 
-  protected final LongAdder count = new LongAdder();
+  private final LongAdder beanCount = new LongAdder();
 
-  protected final LongAdder total = new LongAdder();
+  private final LongAdder count = new LongAdder();
 
-  protected final LongAccumulator max = new LongAccumulator(Math::max, Long.MIN_VALUE);
+  private final LongAdder total = new LongAdder();
 
-  protected final AtomicLong startTime = new AtomicLong(System.currentTimeMillis());
+  private final LongAccumulator max = new LongAccumulator(Math::max, Long.MIN_VALUE);
+
+  private final AtomicLong startTime = new AtomicLong(System.currentTimeMillis());
 
   DTimedMetric(String name) {
     this.name = name;
@@ -41,6 +43,12 @@ class DTimedMetric implements TimedMetric {
     max.accumulate(value);
   }
 
+  @Override
+  public void add(long micros, long beans) {
+    add(micros);
+    beanCount.add(beans);
+  }
+
   @Override
   public boolean isEmpty() {
     return count.sum() == 0;
@@ -75,14 +83,15 @@ class DTimedMetric implements TimedMetric {
     if (reset) {
       // Note these values are not guaranteed to be consistent wrt each other
       // but should be reasonably consistent (small time between count and total)
+      final long beans = beanCount.sumThenReset();
       final long maxVal = max.getThenReset();
       final long totalVal = total.sumThenReset();
       final long countVal = count.sumThenReset();
       final long startTimeVal = startTime.getAndSet(System.currentTimeMillis());
-      return new DTimeMetricStats(name, startTimeVal, countVal, totalVal, maxVal);
+      return new DTimeMetricStats(name, startTimeVal, countVal, totalVal, maxVal, beans);
 
     } else {
-      return new DTimeMetricStats(name, startTime.get(), count.sum(), total.sum(), max.get());
+      return new DTimeMetricStats(name, startTime.get(), count.sum(), total.sum(), max.get(), beanCount.sum());
     }
   }
 
@@ -96,32 +105,4 @@ class DTimedMetric implements TimedMetric {
     total.reset();
   }
 
-  /**
-   * Return the start time.
-   */
-  public long getStartTime() {
-    return startTime.get();
-  }
-
-  /**
-   * Return the count of values.
-   */
-  public long getCount() {
-    return count.sum();
-  }
-
-  /**
-   * Return the total of values.
-   */
-  public long getTotal() {
-    return total.sum();
-  }
-
-  /**
-   * Return the max value.
-   */
-  public long getMax() {
-    return max.get();
-  }
-
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
index 7447983db..f401863a2 100644
--- a/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
@@ -22,15 +22,22 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
 
   private final String dbTrueValue;
 
-  public DefaultRelationalQueryEngine(Binder binder, String dbTrueValue) {
+  private final boolean binaryOptimizedUUID;
+
+  public DefaultRelationalQueryEngine(Binder binder, String dbTrueValue, boolean binaryOptimizedUUID) {
     this.binder = binder;
     this.dbTrueValue = dbTrueValue == null ? "true" : dbTrueValue;
+    this.binaryOptimizedUUID = binaryOptimizedUUID;
+  }
+
+  @Override
+  public SqlRow createSqlRow(int estimateCapacity) {
+    return new DefaultSqlRow(estimateCapacity, 0.75f, dbTrueValue, binaryOptimizedUUID);
   }
 
   @Override
   public void findEach(RelationalQueryRequest request, Predicate<SqlRow> consumer) {
 
-    long startTime = System.currentTimeMillis();
     try {
       request.executeSql(binder);
       while (request.next()) {
@@ -38,7 +45,7 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
           break;
         }
       }
-      logSummary(request, startTime);
+      request.logSummary();
 
     } catch (Exception e) {
       throw new PersistenceException(Message.msg("fetch.error", e.getMessage(), request.getSql()), e);
@@ -51,14 +58,12 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
   @Override
   public void findEach(RelationalQueryRequest request, Consumer<SqlRow> consumer) {
 
-    long startTime = System.currentTimeMillis();
-
     try {
       request.executeSql(binder);
       while (request.next()) {
         consumer.accept(readRow(request));
       }
-      logSummary(request, startTime);
+      request.logSummary();
 
     } catch (Exception e) {
       throw new PersistenceException(Message.msg("fetch.error", e.getMessage(), request.getSql()), e);
@@ -71,17 +76,14 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
   @Override
   public List<SqlRow> findList(RelationalQueryRequest request) {
 
-    long startTime = System.currentTimeMillis();
     try {
       request.executeSql(binder);
-
       List<SqlRow> rows = new ArrayList<>();
       while (request.next()) {
         rows.add(readRow(request));
       }
 
-      logSummary(request, startTime);
-
+      request.logSummary();
       return rows;
 
     } catch (Exception e) {
@@ -92,19 +94,11 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
     }
   }
 
-  private void logSummary(RelationalQueryRequest request, long startTime) {
-
-    if (request.isLogSummary()) {
-      long exeTime = System.currentTimeMillis() - startTime;
-      request.getTransaction().logSummary("SqlQuery  rows[" + request.getRowCount() + "] time[" + exeTime + "] bind[" + request.getBindLog() + "]");
-    }
-  }
-
   /**
    * Read the row from the ResultSet and return as a MapBean.
    */
   private SqlRow readRow(RelationalQueryRequest request) throws SQLException {
-    return request.createNewRow(dbTrueValue);
+    return request.createNewRow();
   }
 
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/dto/DtoQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/dto/DtoQueryEngine.java
new file mode 100644
index 000000000..29944d117
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/query/dto/DtoQueryEngine.java
@@ -0,0 +1,66 @@
+package io.ebeaninternal.server.query.dto;
+
+import io.ebeaninternal.server.core.DtoQueryRequest;
+import io.ebeaninternal.server.core.Message;
+import io.ebeaninternal.server.persist.Binder;
+
+import javax.persistence.PersistenceException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+public class DtoQueryEngine {
+
+  private final Binder binder;
+
+  public DtoQueryEngine(Binder binder) {
+    this.binder = binder;
+  }
+
+  public <T> List<T> findList(DtoQueryRequest<T> request) {
+    try {
+      request.executeSql(binder);
+      List<T> rows = new ArrayList<>();
+      while (request.next()) {
+        rows.add(request.readNextBean());
+      }
+      return rows;
+
+    } catch (Throwable e) {
+      throw new PersistenceException(Message.msg("fetch.error", e.getMessage(), request.getSql()), e);
+    } finally {
+      request.close();
+    }
+  }
+
+  public <T> void findEach(DtoQueryRequest<T> request, Consumer<T> consumer) {
+     try {
+      request.executeSql(binder);
+      while (request.next()) {
+        consumer.accept(request.readNextBean());
+      }
+    } catch (Exception e) {
+      throw new PersistenceException(Message.msg("fetch.error", e.getMessage(), request.getSql()), e);
+
+    } finally {
+      request.close();
+    }
+  }
+
+  public <T> void findEachWhile(DtoQueryRequest<T> request, Predicate<T> consumer) {
+    try {
+      request.executeSql(binder);
+      while (request.next()) {
+        if (!consumer.test(request.readNextBean())) {
+          break;
+        }
+      }
+    } catch (Exception e) {
+      throw new PersistenceException(Message.msg("fetch.error", e.getMessage(), request.getSql()), e);
+
+    } finally {
+      request.close();
+    }
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
new file mode 100644
index 000000000..a3def9baa
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
@@ -0,0 +1,196 @@
+package io.ebeaninternal.server.querydefn;
+
+import io.ebean.DtoQuery;
+import io.ebeaninternal.api.BindParams;
+import io.ebeaninternal.api.SpiDtoQuery;
+import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.server.dto.DtoBeanDescriptor;
+import io.ebeaninternal.server.dto.DtoMappingRequest;
+import io.ebeaninternal.server.dto.DtoQueryPlan;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+/**
+ * Default implementation of DtoQuery.
+ */
+public class DefaultDtoQuery<T> implements SpiDtoQuery<T> {
+
+  private final SpiEbeanServer server;
+
+  private final DtoBeanDescriptor<T> descriptor;
+
+  private String sql;
+
+  private int firstRow;
+
+  private int maxRows;
+
+  private int timeout;
+
+  private int bufferFetchSizeHint;
+
+  private boolean relaxedMode;
+
+  private String label;
+
+  /**
+   * Bind parameters when using the query language.
+   */
+  private final BindParams bindParams = new BindParams();
+
+  /**
+   * Additional supply a query detail object.
+   */
+  public DefaultDtoQuery(SpiEbeanServer server, DtoBeanDescriptor<T> descriptor, String sql) {
+    this.server = server;
+    this.descriptor = descriptor;
+    this.sql = sql;
+  }
+
+  @Override
+  public String planKey() {
+    return sql+":first"+firstRow+":max"+maxRows;
+  }
+
+  @Override
+  public DtoQueryPlan getQueryPlan(String planKey) {
+    return descriptor.getQueryPlan(planKey);
+  }
+
+  @Override
+  public DtoQueryPlan buildPlan(DtoMappingRequest request) {
+    return descriptor.buildPlan(request);
+  }
+
+  @Override
+  public void putQueryPlan(String planKey, DtoQueryPlan plan) {
+    descriptor.putQueryPlan(planKey, plan);
+  }
+
+  @Override
+  public void findEach(Consumer<T> consumer) {
+    server.findDtoEach(this, consumer);
+  }
+
+  @Override
+  public void findEachWhile(Predicate<T> consumer) {
+    server.findDtoEachWhile(this, consumer);
+  }
+
+  @Override
+  public List<T> findList() {
+    return server.findDtoList(this);
+  }
+
+  @Override
+  public T findOne() {
+    return server.findDtoOne(this);
+  }
+
+  @Override
+  public Optional<T> findOneOrEmpty() {
+    return Optional.ofNullable(findOne());
+  }
+
+  @Override
+  public DtoQuery<T> setParameter(int position, Object value) {
+    bindParams.setParameter(position, value);
+    return this;
+  }
+
+  @Override
+  public DtoQuery<T> setParameter(String paramName, Object value) {
+    bindParams.setParameter(paramName, value);
+    return this;
+  }
+
+  @Override
+  public String toString() {
+    return "DtoQuery [" + sql + "]";
+  }
+
+  @Override
+  public Class<T> getType() {
+    return descriptor.getType();
+  }
+
+  @Override
+  public DtoQuery<T> setRelaxedMode() {
+    this.relaxedMode = true;
+    return this;
+  }
+
+  @Override
+  public boolean isRelaxedMode() {
+    return relaxedMode;
+  }
+
+  @Override
+  public DtoQuery<T> setLabel(String label) {
+    this.label = label;
+    return this;
+  }
+
+  @Override
+  public String getLabel() {
+    return label;
+  }
+
+  @Override
+  public int getFirstRow() {
+    return firstRow;
+  }
+
+  @Override
+  public DtoQuery<T> setFirstRow(int firstRow) {
+    this.firstRow = firstRow;
+    return this;
+  }
+
+  @Override
+  public int getMaxRows() {
+    return maxRows;
+  }
+
+  @Override
+  public DtoQuery<T> setMaxRows(int maxRows) {
+    this.maxRows = maxRows;
+    return this;
+  }
+
+  @Override
+  public int getTimeout() {
+    return timeout;
+  }
+
+  @Override
+  public DtoQuery<T> setTimeout(int secs) {
+    this.timeout = secs;
+    return this;
+  }
+
+  @Override
+  public BindParams getBindParams() {
+    return bindParams;
+  }
+
+  @Override
+  public DtoQuery<T> setBufferFetchSizeHint(int bufferFetchSizeHint) {
+    this.bufferFetchSizeHint = bufferFetchSizeHint;
+    return this;
+  }
+
+  @Override
+  public int getBufferFetchSizeHint() {
+    return bufferFetchSizeHint;
+  }
+
+  @Override
+  public String getQuery() {
+    return sql;
+  }
+
+}
diff --git a/src/test/java/io/ebean/DtoQueryTest.java b/src/test/java/io/ebean/DtoQueryTest.java
new file mode 100644
index 000000000..53bf02730
--- /dev/null
+++ b/src/test/java/io/ebean/DtoQueryTest.java
@@ -0,0 +1,336 @@
+package io.ebean;
+
+import io.ebean.meta.MetaQueryMetric;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.tests.model.basic.ResetBasicData;
+
+import java.util.List;
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class DtoQueryTest extends BaseTestCase {
+
+  private static final Logger log = LoggerFactory.getLogger(DtoQueryTest.class);
+
+  @Test
+  public void dto_findList_constructorMatch() {
+
+    ResetBasicData.reset();
+
+    DtoQuery<DCust> dtoQuery = server().findDto(DCust.class, "select id, name from o_customer");
+
+    List<DCust> list = dtoQuery.findList();
+
+    log.info(list.toString());
+    assertThat(list).isNotEmpty();
+  }
+
+  @Test
+  public void dto_findEach_constructorMatch() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+    server().findDto(DCust.class, "select id, name from o_customer where id > :id")
+      .setParameter("id", 0)
+      .findEach(it -> log.info("got " + it.getId() + " " + it.getName()));
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select id, name from o_customer where id > ?");
+  }
+
+  @Test
+  public void dto_findEachWhile_constructorMatch() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+    server().findDto(DCust.class, "select id, name from o_customer where id > :id order by id desc")
+      .setParameter("id", 0)
+      .findEachWhile(customer -> {
+        log.info("got " + customer.getId() + " " + customer.getName());
+        return customer.getId() > 3;
+      });
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select id, name from o_customer where id > ?");
+  }
+
+  @Test
+  public void dto_findOneEmpty() {
+
+    ResetBasicData.reset();
+
+    Optional<DCust> rob = server().findDto(DCust.class, "select id, name from o_customer where name = :name")
+      .setParameter("name", "Fiona")
+      .findOneOrEmpty();
+
+    assertThat(rob.isPresent()).isTrue();
+
+    Optional<DCust> oneOrEmpty = server().findDto(DCust.class, "select id, name from o_customer where name = :name")
+      .setParameter("name", "DoesNotExistMyFriend")
+      .findOneOrEmpty();
+
+    assertThat(oneOrEmpty.isPresent()).isFalse();
+  }
+
+  @Test
+  public void dto_findOne() {
+
+    ResetBasicData.reset();
+
+    DCust fiona = server().findDto(DCust.class, "select id, name from o_customer where name = :name")
+      .setParameter("name", "Fiona")
+      .findOne();
+
+    assertThat(fiona.getName()).isEqualTo("Fiona");
+
+    DCust empty = server().findDto(DCust.class, "select id, name from o_customer where name = :name")
+      .setParameter("name", "DoesNotExistMyFriend")
+      .findOne();
+
+    assertThat(empty).isNull();
+  }
+
+
+  @Test
+  public void dto_queryPlanHits() {
+
+    ResetBasicData.reset();
+
+    server().getMetaInfoManager().collectQueryStatistics(true);
+
+    String[] names = {"Rob", "Fiona", "Shrek"};
+
+    for (String name : names) {
+
+      List<DCust> custs = server().findDto(DCust.class, "select c3.id, c3.name from o_customer c3 where c3.name = :name")
+        .setLabel("basic")
+        .setParameter("name", name)
+        .findList();
+
+      log.info("Found " + custs);
+    }
+
+    List<MetaQueryMetric> stats = server().getMetaInfoManager().collectQueryStatistics(false);
+
+    assertThat(stats).hasSize(1);
+
+    MetaQueryMetric queryMetric = stats.get(0);
+
+    assertThat(queryMetric.getLabel()).isEqualTo("basic");
+    assertThat(queryMetric.getCount()).isEqualTo(3);
+
+
+    server().findDto(DCust.class, "select c4.id, c4.name from o_customer c4 where lower(c4.name) = :name")
+      .setLabel("basic2")
+      .setParameter("name", "rob")
+      .findList();
+
+    stats = server().getMetaInfoManager().collectQueryStatistics(true);
+    assertThat(stats).hasSize(2);
+
+    log.info("stats " + stats);
+
+  }
+
+  @Test
+  public void dto_findList_relaxedMode() {
+
+    ResetBasicData.reset();
+
+    List<DCust3> list = server().findDto(DCust3.class, "select id, name, 42 as total, '42' as something_we_cannot_map from o_customer")
+      .setRelaxedMode()
+      .findList();
+
+    log.info(list.toString());
+    assertThat(list).isNotEmpty();
+  }
+
+  @Test
+  public void dto_findList_relaxedMode_defaultConstructor() {
+
+    ResetBasicData.reset();
+
+    List<DCust2> list = server().findDto(DCust2.class, "select id, '42' as something_we_cannot_map, name from o_customer")
+      .setRelaxedMode()
+      .findList();
+
+    log.info(list.toString());
+    assertThat(list).isNotEmpty();
+  }
+
+  @Test
+  public void dto_findList_constructorPlusMatch() {
+
+    ResetBasicData.reset();
+
+    String sql = "select c.id, c.name, count(o.id) as totalOrders " +
+      "from o_customer c " +
+      "join o_order o on o.kcustomer_id = c.id " +
+      "where c.name like :name " +
+      "group by c.id, c.name";
+
+    List<DCust> dtos = server().findDto(DCust.class, sql)
+      .setParameter("name", "Rob")
+      .findList();
+
+    log.info(dtos.toString());
+    assertThat(dtos).isNotEmpty();
+  }
+
+  @Test
+  public void dto_findList_setters() {
+
+    ResetBasicData.reset();
+
+    DtoQuery<DCust2> dtoQuery = server().findDto(DCust2.class, "select id, name from o_customer");
+
+    List<DCust2> list = dtoQuery.findList();
+
+    assertThat(list).isNotEmpty();
+  }
+
+  @Test
+  public void dto3_findList_constructorMatch() {
+
+    ResetBasicData.reset();
+
+    List<DCust3> robs = server().findDto(DCust3.class, "select id, name, 42 as totalOrders from o_customer where name like ?")
+      .setParameter(1, "Rob")
+      .setMaxRows(10)
+      .findList();
+
+
+    log.info(robs.toString());
+    assertThat(robs).isNotEmpty();
+  }
+
+  @Test
+  public void dto3_findList_settersMatch() {
+
+    ResetBasicData.reset();
+
+    List<DCust3> robs = server().findDto(DCust3.class, "select id, name from o_customer where name = :name")
+      .setParameter("name", "Rob")
+      .findList();
+
+
+    log.info(robs.toString());
+    assertThat(robs).isNotEmpty();
+  }
+
+  public static class DCust {
+
+    final Integer id;
+
+    final String name;
+
+    int totalOrders;
+
+    public DCust(Integer id, String name) {
+      this.id = id;
+      this.name = name;
+    }
+
+    @Override
+    public String toString() {
+      return "id:" + id + " name:" + name + " totalOrders:" + totalOrders;
+    }
+
+    public Integer getId() {
+      return id;
+    }
+
+    public String getName() {
+      return name;
+    }
+
+    public int getTotalOrders() {
+      return totalOrders;
+    }
+
+    public void setTotalOrders(int totalOrders) {
+      this.totalOrders = totalOrders;
+    }
+  }
+
+  public static class DCust2 {
+
+    Integer id;
+
+    String name;
+
+    @Override
+    public String toString() {
+      return "id:" + id + " name:" + name;
+    }
+
+    public Integer getId() {
+      return id;
+    }
+
+    public void setId(Integer id) {
+      this.id = id;
+    }
+
+    public String getName() {
+      return name;
+    }
+
+    public void setName(String name) {
+      this.name = name;
+    }
+  }
+
+  public static class DCust3 {
+
+    Integer id;
+
+    String name;
+
+    int totalOrders;
+
+    public DCust3() {
+    }
+
+    public DCust3(Integer id, String name, int totalOrders) {
+      this.id = id;
+      this.name = name;
+      this.totalOrders = totalOrders;
+    }
+
+    @Override
+    public String toString() {
+      return "id:" + id + " name:" + name + " totalOrders:" + totalOrders;
+    }
+
+    public Integer getId() {
+      return id;
+    }
+
+    public String getName() {
+      return name;
+    }
+
+    public int getTotalOrders() {
+      return totalOrders;
+    }
+
+    public void setTotalOrders(int totalOrders) {
+      this.totalOrders = totalOrders;
+    }
+
+    public void setId(Integer id) {
+      this.id = id;
+    }
+
+    public void setName(String name) {
+      this.name = name;
+    }
+  }
+}
diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index c9c15f702..28bf61ec4 100644
--- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -5,6 +5,7 @@ import io.ebean.BackgroundExecutor;
 import io.ebean.BeanState;
 import io.ebean.CallableSql;
 import io.ebean.DocumentStore;
+import io.ebean.DtoQuery;
 import io.ebean.ExpressionFactory;
 import io.ebean.Filter;
 import io.ebean.FutureIds;
@@ -388,6 +389,31 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
     return null;
   }
 
+  @Override
+  public <T> void findDtoEach(SpiDtoQuery<T> query, Consumer<T> consumer) {
+
+  }
+
+  @Override
+  public <T> void findDtoEachWhile(SpiDtoQuery<T> query, Predicate<T> consumer) {
+
+  }
+
+  @Override
+  public <T> List<T> findDtoList(SpiDtoQuery<T> query) {
+    return null;
+  }
+
+  @Override
+  public <T> T findDtoOne(SpiDtoQuery<T> query) {
+    return null;
+  }
+
+  @Override
+  public <D> DtoQuery<D> findDto(Class<D> dtoType, String sql) {
+    return null;
+  }
+
   @Override
   public SqlQuery createSqlQuery(String sql) {
     return null;

From aa84dfe7d81cd2f0696f929fc5b6e066792493c3 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Fri, 2 Mar 2018 11:33:10 +0100
Subject: [PATCH 0129/1036] Add: Configuration md that describes the ebean
 options (#1325)

---
 CONFIGURATION.md | 298 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 298 insertions(+)
 create mode 100644 CONFIGURATION.md

diff --git a/CONFIGURATION.md b/CONFIGURATION.md
new file mode 100644
index 000000000..16fa6d698
--- /dev/null
+++ b/CONFIGURATION.md
@@ -0,0 +1,298 @@
+Overview of ebean.properties file
+=================================
+
+
+### DbMigration options
+
+You can set individual values for different platforms when generating migrations
+
+`dbmigration.platform.<PLATFORM>.databaseSequenceBatchSize`
+For DB's using sequences this is the number of sequence values prefetched.
+ 
+`dbmigration.platform.<PLATFORM>.dbuuid`
+Control, how UUID generation should work - it affects DDL which column type is generated. Possible values:
+- BINARY enforces binary UUID 
+- VARCHAR enforces varchar UUID
+- BINARY_OPTIMIZED enforces binary-optimized UUID (makes sense only with Type1 ID)
+- AUTO_BINARY use binary when platform does not support native UUID
+- AUTO_BINARY_OPTIMIZED use binary-optimized when platform does not support native UUID
+- AUTO_VARCHAR (default) use varchar when platform does not support UUID 
+
+`dbmigration.platform.<PLATFORM>.uuidStoreAsBinary`
+Same as setting dbuuid to BINARY
+
+`dbmigration.platform.<PLATFORM>.geometrySRID`
+The Geometry SRID value (default 4326).
+
+`dbmigration.platform.<PLATFORM>.idType`
+The ID type (IDENTITY, SEQUENCE, GENERATOR, EXTERNAL)
+
+`dbmigration.platform.<PLATFORM>.mapping`
+Adjust the mapping. For example `BOOLEAN=integer(32);BIT=tinyint(3)`
+
+
+`ebean.migration.applyPrefix`
+Set this to "V" to be compatible with FlywayDB.
+
+`ebean.migration.applySuffix`
+Defaults to '.sql'
+
+`ebean.migration.dbusername`
+DB user used to run the DB migration.
+
+`ebean.migration.dbpassword`
+DB password used to run the DB migration.
+
+`ebean.migration.generate`
+Set to true if the DB migration should be generated on server start.
+
+`ebean.migration.generatePendingDrop`
+The version of a pending drop that should be generated as the next migration.
+
+`ebean.migration.includeGeneratedFileComment`
+TODO
+
+`ebean.migration.metaTable`
+For running migration the DB table that holds migration execution status. Default 'db_migration'
+
+`ebean.migration.migrationPath`
+Resource path for the migration xml and sql.
+
+`ebean.migration.modelPath`
+Subdirectory the model xml files go into. Default 'model'
+
+`ebean.migration.modelSuffix`
+Suffix. Default '.model.xml' 
+
+`ebean.migration.name`
+Description text that can be appended to the version to become the ddl script file name
+ 
+`ebean.migration.patchInsertOn`
+migration versions that should be added to history without running.
+
+`ebean.migration.patchResetChecksumOn`
+migration versions that should have their checksum reset and not run.
+Use this if you get a 'Checksum mismatch' error.
+
+`ebean.migration.placeholders`
+A comma and equals delimited placeholders that are substituted in SQL scripts when running migration (used by DB Migration runner only).
+
+`ebean.migration.platform`
+The database platform to generate migration DDL for.
+
+`ebean.migration.run`
+Flag set to true means to run any outstanding migrations on startup.
+
+`ebean.migration.version`
+The migration version name (typically FlywayDb compatible). Example: 1.1.1_2
+
+
+### Ebean UUID options
+
+`ebean.uuidVersion`
+Controls, how the UUIDs are generated. Possible values
+- VERSION4 (default) generate random V4 UUIDs,
+- VERSION1 generate rfc4122 compliant Type 1 UUIDs (requires a state file)
+- VERSION1RND generate fake Type 1 UUIDs
+
+Note, that V1 UUIDs in conjunction with AUTO_BINARY_OPTIMIZED will give you the best index performance, but you MUST understand how this works to avoid collisions.
+
+`ebean.uuidStateFile`
+The state file that is Required to generate V1 UUIDs
+
+
+### DocStoreConfig
+
+`ebean.docstore.active`
+True when the Document store integration is active/on.
+
+`ebean.docstore.allowAllCertificates`
+Set to true such that the client allows connections to invalid/self signed SSL certificates.
+
+`ebean.docstore.bulkBatchSize`
+The default batch size to use for the Bulk API calls.
+
+`ebean.docstore.create`
+When true the Document store should create any document indexes that don't already exist.
+
+`ebean.docstore.dropCreate`
+When true the Document store should drop and re-create document indexes.
+
+`ebean.docstore.generateMapping`
+Set to true means Ebean will generate mapping files on startup.
+
+`ebean.docstore.mappingPath`
+Resource path for the Document store mapping files.
+
+`ebean.docstore.mappingSuffix`
+Suffix used for mapping files.
+
+`ebean.docstore.password`
+ Password credential that be used for authentication to document store.
+ 
+`ebean.docstore.pathToResources`
+Location of resources that mapping files are generated into.
+
+`ebean.docstore.persist`
+The default mode used by indexes. `DEFAULT|IGNORE|QUEUE|UPDATE`
+
+`ebean.docstore.url`
+The URL of the Document store server. For example: http://localhost:9200.
+
+`ebean.docstore.username`
+Credential that be used for authentication to document store.
+
+### Ebean Autotune
+
+`ebean.autoTune.mode`
+The autoTune mode `DEFAULT_OFF|DEFAULT_ON|DEFAULT_ONIFEMPTY`
+
+`ebean.autoTune.profiling`
+TODO
+
+`ebean.autoTune.profilingBase`
+TODO
+
+`ebean.autoTune.profilingFile`
+TODO
+
+`ebean.autoTune.profilingRate`
+TODO
+
+`ebean.autoTune.profilingUpdateFrequency`
+TODO
+
+`ebean.autoTune.queryTuning`
+TODO
+
+`ebean.autoTune.queryTuningAddVersion`
+TODO
+
+`ebean.autoTune.queryTuningFile`
+TODO
+
+`ebean.autoTune.skipGarbageCollectionOnShutdown`
+TODO
+
+`ebean.autoTune.skipProfileReportingOnShutdown`
+TODO
+
+
+### Ebean options
+`ebean.allQuotedIdentifiers`
+Quote all identifiers
+
+`ebean.asOfSysPeriod`
+Column used to support history and 'As of' queries. This column is a timestamp range or equivalent.
+
+`ebean.asOfViewSuffix`
+Suffix appended to the base table to derive the view that contains the union of the base table and the history table in order to support asOf queries.
+
+`ebean.autoCommitMode`
+Set to true if the DataSource uses autoCommit. Indicates that Ebean should use autoCommit friendly Transactions and TransactionManager.
+
+`ebean.autoReadOnlyDataSource`
+When true create a read only DataSource using readOnlyDataSourceConfig defaulting values from dataSourceConfig
+
+`ebean.autostart`
+Should the server start all
+
+`ebean.backgroundExecutorSchedulePoolSize`
+TODO
+
+`ebean.backgroundExecutorShutdownSecs`
+TODO
+
+and some more todos:
+`ebean.batch.mode`
+`ebean.batch.size`
+`ebean.changeLogAsync`
+`ebean.changeLogIncludeInserts`
+`ebean.classes`
+`ebean.collectQueryOrigins`
+`ebean.collectQueryStatsByNode`
+`ebean.currentUserProvider`
+`ebean.dataSourceJndiName`
+`ebean.dataTimeZone`
+`ebean.databaseBooleanFalse`
+`ebean.databaseBooleanTrue`
+`ebean.databasePlatform`
+`ebean.databasePlatformName`
+`ebean.databaseSequenceBatchSize`
+ebean.datasource.h2.adminpassword
+ebean.datasource.h2.adminusername
+`ebean.dbEncrypt`
+`ebean.dbOffline`
+ebean.ddl.createOnly
+ebean.ddl.generate
+ebean.ddl.header
+ebean.ddl.initSql
+ebean.ddl.run
+ebean.ddl.seedSql
+ebean.defaultDeleteMissingChildren
+ebean.defaultOrderById
+ebean.disableClasspathSearch
+ebean.disableL2Cache
+ebean.docStoreOnly
+ebean.docstore.active
+ebean.docstore.allowAllCertificates
+ebean.docstore.bulkBatchSize
+ebean.docstore.create
+ebean.docstore.dropCreate
+ebean.docstore.generateMapping
+ebean.docstore.mappingPath
+ebean.docstore.mappingSuffix
+ebean.docstore.password
+ebean.docstore.pathToResources
+ebean.docstore.persist
+ebean.docstore.url
+ebean.docstore.username
+ebean.encryptDeployManager
+ebean.encryptKeyManager
+ebean.encryptor
+ebean.explicitTransactionBeginMode
+ebean.expressionEqualsWithNullAsNoop
+ebean.expressionNativeIlike
+ebean.geometrySRID
+ebean.historyTableSuffix
+ebean.jdbcFetchSizeFindEach
+ebean.jdbcFetchSizeFindList
+ebean.jodaLocalTimeMode
+ebean.jsonDateTime
+ebean.jsonInclude
+ebean.lazyLoadBatchSize
+ebean.localTimeWithNanos
+ebean.namingConvention.schema
+ebean.namingConvention.sequenceFormat
+ebean.namingConvention.useForeignKeyPrefix
+ebean.namingconvention
+ebean.notifyL2CacheInForeground
+ebean.packages
+ebean.persistBatch
+ebean.persistBatchOnCascade
+ebean.persistBatchSize
+ebean.persistBatching
+ebean.persistenceContextScope
+ebean.profiling
+ebean.profiling.directory
+ebean.profiling.includeProfileIds
+ebean.profiling.minimumMicros
+ebean.profiling.profilesPerFile
+ebean.profiling.verbose
+ebean.queryBatchSize
+ebean.queryPlanTTLSeconds
+ebean.search.packages
+ebean.serverCachePlugin
+ebean.skipCacheAfterWrite
+ebean.slowQueryMillis
+ebean.tenant.catalogProvider
+ebean.tenant.currentTenantProvider
+ebean.tenant.mode
+ebean.tenant.partitionColumn
+ebean.tenant.schemaProvider
+ebean.updateAllPropertiesInBatch
+ebean.updateChangesOnly
+ebean.updatesDeleteMissingChildren
+ebean.useJavaxValidationNotNull
+ebean.useJtaTransactionManager
+

From 31581082d25c9e71f7db998f8bf409ba671ffaea Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 2 Mar 2018 23:37:38 +1300
Subject: [PATCH 0130/1036] Bump to 11.13.1-SNAPSHOT ... added findDto()

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7b445c63e..089493a76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.12.2-SNAPSHOT</version>
+  <version>11.13.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>

From ab84cfae522a3cffb92e078b324bf9f50f671665 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 2 Mar 2018 23:39:03 +1300
Subject: [PATCH 0131/1036] [maven-release-plugin] prepare release
 ebean-11.13.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 089493a76..7e04436f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.13.1-SNAPSHOT</version>
+  <version>11.13.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.13.1</tag>
   </scm>
 
   <profiles>

From 130356cb3b448c752ca94e34c4677a55e1eedf96 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 2 Mar 2018 23:39:17 +1300
Subject: [PATCH 0132/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7e04436f9..8291abdc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.13.1</version>
+  <version>11.13.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.13.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 740532da4b7e2ead7c08588c2942e5033df0a8bb Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 5 Mar 2018 19:19:27 +1300
Subject: [PATCH 0133/1036] #1329 - Ebean 11.12.1 broken when using
 ScalarTypeConverter with enum

---
 .../server/type/DefaultTypeManager.java       | 28 +++++++++++--------
 .../java/org/tests/model/ddd/DExhEntity.java  | 10 +++++++
 .../model/ddd/TestScalarTypeConverter.java    | 27 ++++++++++++++++++
 .../tests/model/ivo/converter/AnEnumType.java |  6 ++++
 .../ivo/converter/AnEnumTypeConvert.java      | 21 ++++++++++++++
 5 files changed, 81 insertions(+), 11 deletions(-)
 create mode 100644 src/test/java/org/tests/model/ddd/TestScalarTypeConverter.java
 create mode 100644 src/test/java/org/tests/model/ivo/converter/AnEnumType.java
 create mode 100644 src/test/java/org/tests/model/ivo/converter/AnEnumTypeConvert.java

diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 89b87bf35..4ffe6074b 100644
--- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -588,21 +588,27 @@ public final class DefaultTypeManager implements TypeManager {
   @Override
   public ScalarType<?> createEnumScalarType(Class<? extends Enum<?>> enumType, EnumType type) {
 
-    ScalarTypeEnum<?> scalarType = (ScalarTypeEnum<?>) getScalarType(enumType);
-    if (scalarType != null && !scalarType.isOverrideBy(type)) {
-      if (type != null && !scalarType.isCompatible(type)) {
-        throw new IllegalStateException("Error mapping Enum type:" + enumType + " It is mapped using 2 different modes when only one is supported (ORDINAL, STRING or an Ebean mapping)");
-      }
+    ScalarType<?> scalarType = getScalarType(enumType);
+    if (scalarType instanceof ScalarTypeWrapper) {
+      // no override or further mapping required
       return scalarType;
     }
 
-    scalarType = createEnumScalarTypePerExtentions(enumType);
-    if (scalarType == null) {
-      // use JPA normal Enum type (without mapping)
-      scalarType = createEnumScalarTypePerSpec(enumType, type);
+    ScalarTypeEnum<?> scalarEnum = (ScalarTypeEnum<?>)scalarType;
+    if (scalarEnum != null && !scalarEnum.isOverrideBy(type)) {
+      if (type != null && !scalarEnum.isCompatible(type)) {
+        throw new IllegalStateException("Error mapping Enum type:" + enumType + " It is mapped using 2 different modes when only one is supported (ORDINAL, STRING or an Ebean mapping)");
+      }
+      return scalarEnum;
     }
-    addEnumType(scalarType, enumType);
-    return scalarType;
+
+    scalarEnum = createEnumScalarTypePerExtentions(enumType);
+    if (scalarEnum == null) {
+      // use JPA normal Enum type (without mapping)
+      scalarEnum = createEnumScalarTypePerSpec(enumType, type);
+    }
+    addEnumType(scalarEnum, enumType);
+    return scalarEnum;
   }
 
   private ScalarTypeEnum<?> createEnumScalarTypePerSpec(Class<?> enumType, EnumType type) {
diff --git a/src/test/java/org/tests/model/ddd/DExhEntity.java b/src/test/java/org/tests/model/ddd/DExhEntity.java
index 73252744c..7e4a03777 100644
--- a/src/test/java/org/tests/model/ddd/DExhEntity.java
+++ b/src/test/java/org/tests/model/ddd/DExhEntity.java
@@ -1,6 +1,7 @@
 package org.tests.model.ddd;
 
 import org.tests.model.ivo.Oid;
+import org.tests.model.ivo.converter.AnEnumType;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -15,6 +16,8 @@ public class DExhEntity {
 
   String exhange;
 
+  AnEnumType anEnumType;
+
   @Version
   Timestamp lastUpdated;
 
@@ -42,4 +45,11 @@ public class DExhEntity {
     this.lastUpdated = lastUpdated;
   }
 
+  public AnEnumType getAnEnumType() {
+    return anEnumType;
+  }
+
+  public void setAnEnumType(AnEnumType anEnumType) {
+    this.anEnumType = anEnumType;
+  }
 }
diff --git a/src/test/java/org/tests/model/ddd/TestScalarTypeConverter.java b/src/test/java/org/tests/model/ddd/TestScalarTypeConverter.java
new file mode 100644
index 000000000..dec65742a
--- /dev/null
+++ b/src/test/java/org/tests/model/ddd/TestScalarTypeConverter.java
@@ -0,0 +1,27 @@
+package org.tests.model.ddd;
+
+import io.ebean.Ebean;
+import org.junit.Test;
+import org.tests.model.ivo.Oid;
+import org.tests.model.ivo.converter.AnEnumType;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestScalarTypeConverter {
+
+  @Test
+  public void integration() {
+
+    DExhEntity exhEntity = new DExhEntity();
+    exhEntity.setOid(new Oid<>(12));
+    exhEntity.setAnEnumType(AnEnumType.ONE);
+
+    Ebean.save(exhEntity);
+
+    int count = Ebean.find(DExhEntity.class)
+      .where().eq("anEnumType", AnEnumType.ONE)
+      .findCount();
+
+    assertThat(count).isGreaterThan(0);
+  }
+}
diff --git a/src/test/java/org/tests/model/ivo/converter/AnEnumType.java b/src/test/java/org/tests/model/ivo/converter/AnEnumType.java
new file mode 100644
index 000000000..cbf435e9b
--- /dev/null
+++ b/src/test/java/org/tests/model/ivo/converter/AnEnumType.java
@@ -0,0 +1,6 @@
+package org.tests.model.ivo.converter;
+
+public enum AnEnumType {
+  ONE,
+  TWO
+}
diff --git a/src/test/java/org/tests/model/ivo/converter/AnEnumTypeConvert.java b/src/test/java/org/tests/model/ivo/converter/AnEnumTypeConvert.java
new file mode 100644
index 000000000..06bce5367
--- /dev/null
+++ b/src/test/java/org/tests/model/ivo/converter/AnEnumTypeConvert.java
@@ -0,0 +1,21 @@
+package org.tests.model.ivo.converter;
+
+import io.ebean.config.ScalarTypeConverter;
+
+public class AnEnumTypeConvert implements ScalarTypeConverter<AnEnumType, String> {
+
+  @Override
+  public AnEnumType getNullValue() {
+    return null;
+  }
+
+  @Override
+  public AnEnumType wrapValue(String value) {
+    return AnEnumType.valueOf(value);
+  }
+
+  @Override
+  public String unwrapValue(AnEnumType beanType) {
+    return beanType.name();
+  }
+}

From 62cdfb3209d9893a2b04923c4aa199e5b2c0eb83 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 5 Mar 2018 19:22:38 +1300
Subject: [PATCH 0134/1036] #1330 - Update ANTLR dependency to 4.7.1

---
 pom.xml                                       |   2 +-
 .../server/grammer/EqlParser.java             |   4 +-
 .../server/grammer/antlr/EQLBaseListener.java |   2 +-
 .../server/grammer/antlr/EQLLexer.java        |  54 +-
 .../server/grammer/antlr/EQLListener.java     |   2 +-
 .../server/grammer/antlr/EQLParser.java       | 589 +++++++++---------
 .../server/grammer/EqlParserTest.java         |  86 +--
 src/test/resources/EQL.g4                     |  16 +-
 8 files changed, 372 insertions(+), 383 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8291abdc3..bf454b12d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,7 +136,7 @@
     <dependency>
       <groupId>org.antlr</groupId>
       <artifactId>antlr4-runtime</artifactId>
-      <version>4.6</version>
+      <version>4.7.1</version>
     </dependency>
 
     <!-- Jackson core used internally by Ebean -->
diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlParser.java b/src/main/java/io/ebeaninternal/server/grammer/EqlParser.java
index f4e8a184d..b65b8ada5 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/EqlParser.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlParser.java
@@ -3,8 +3,8 @@ package io.ebeaninternal.server.grammer;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.grammer.antlr.EQLLexer;
 import io.ebeaninternal.server.grammer.antlr.EQLParser;
-import org.antlr.v4.runtime.ANTLRInputStream;
 import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.RecognitionException;
 import org.antlr.v4.runtime.Recognizer;
@@ -22,7 +22,7 @@ public class EqlParser {
    */
   public static <T> void parse(String raw, SpiQuery<T> query) {
 
-    EQLLexer lexer = new EQLLexer(new ANTLRInputStream(raw));
+    EQLLexer lexer = new EQLLexer(CharStreams.fromString(raw));
     CommonTokenStream tokens = new CommonTokenStream(lexer);
     EQLParser parser = new EQLParser(tokens);
     parser.addErrorListener(errorListener);
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
index 639967cb0..e368fb917 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
@@ -1,4 +1,4 @@
-// Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.6
+// Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.7
 package io.ebeaninternal.server.grammer.antlr;
 
 import org.antlr.v4.runtime.ParserRuleContext;
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
index 040ef83e1..b0c5076a4 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
@@ -1,9 +1,8 @@
-// Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.6
+// Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.7
 package io.ebeaninternal.server.grammer.antlr;
 
 import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.Lexer;
-import org.antlr.v4.runtime.RecognitionException;
 import org.antlr.v4.runtime.RuntimeMetaData;
 import org.antlr.v4.runtime.Vocabulary;
 import org.antlr.v4.runtime.VocabularyImpl;
@@ -16,7 +15,7 @@ import org.antlr.v4.runtime.dfa.DFA;
 @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
 public class EQLLexer extends Lexer {
   static {
-    RuntimeMetaData.checkVersion("4.6", RuntimeMetaData.VERSION);
+    RuntimeMetaData.checkVersion("4.7", RuntimeMetaData.VERSION);
   }
 
   protected static final DFA[] _decisionToDFA;
@@ -33,6 +32,10 @@ public class EQLLexer extends Lexer {
     T__52 = 53, T__53 = 54, T__54 = 55, T__55 = 56, T__56 = 57, INPUT_VARIABLE = 58, PATH_VARIABLE = 59,
     BOOLEAN_LITERAL = 60, NUMBER_LITERAL = 61, DOUBLE = 62, INT = 63, ZERO = 64, STRING_LITERAL = 65,
     WS = 66;
+  public static String[] channelNames = {
+    "DEFAULT_TOKEN_CHANNEL", "HIDDEN"
+  };
+
   public static String[] modeNames = {
     "DEFAULT_MODE"
   };
@@ -104,12 +107,6 @@ public class EQLLexer extends Lexer {
   }
 
 
-  @Override
-  public void recover(RecognitionException e) {
-    throw new RuntimeException("Error in grammer - " + e.getMessage());
-  }
-
-
   public EQLLexer(CharStream input) {
     super(input);
     _interp = new LexerATNSimulator(this, _ATN, _decisionToDFA, _sharedContextCache);
@@ -130,6 +127,11 @@ public class EQLLexer extends Lexer {
     return _serializedATN;
   }
 
+  @Override
+  public String[] getChannelNames() {
+    return channelNames;
+  }
+
   @Override
   public String[] getModeNames() {
     return modeNames;
@@ -141,7 +143,7 @@ public class EQLLexer extends Lexer {
   }
 
   public static final String _serializedATN =
-    "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\2D\u0200\b\1\4\2\t" +
+    "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2D\u0200\b\1\4\2\t" +
       "\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13" +
       "\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22" +
       "\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31" +
@@ -177,22 +179,22 @@ public class EQLLexer extends Lexer {
       ";\37= ?!A\"C#E$G%I&K\'M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63e\64g\65i\66k\67" +
       "m8o9q:s;u<w=y>{?}@\177A\u0081B\u0083C\u0085D\3\2\t\5\2C\\aac|\6\2\62;" +
       "C\\aac|\7\2\60\60\62;C\\aac|\3\2\62;\3\2\63;\3\2))\5\2\13\f\17\17\"\"" +
-      "\u020b\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2" +
-      "\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3" +
-      "\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2\2\2" +
-      "\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2\2\2\2" +
-      "/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2\29\3\2\2" +
-      "\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3\2\2\2\2" +
-      "G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2\2\2S\3" +
-      "\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2\2_\3\2\2" +
-      "\2\2a\3\2\2\2\2c\3\2\2\2\2e\3\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2k\3\2\2\2\2" +
-      "m\3\2\2\2\2o\3\2\2\2\2q\3\2\2\2\2s\3\2\2\2\2u\3\2\2\2\2w\3\2\2\2\2y\3" +
-      "\2\2\2\2{\3\2\2\2\2}\3\2\2\2\2\177\3\2\2\2\2\u0081\3\2\2\2\2\u0083\3\2" +
-      "\2\2\2\u0085\3\2\2\2\3\u0087\3\2\2\2\5\u008e\3\2\2\2\7\u0090\3\2\2\2\t" +
-      "\u0092\3\2\2\2\13\u009b\3\2\2\2\r\u00a1\3\2\2\2\17\u00a7\3\2\2\2\21\u00aa" +
-      "\3\2\2\2\23\u00ac\3\2\2\2\25\u00b2\3\2\2\2\27\u00b8\3\2\2\2\31\u00bd\3" +
-      "\2\2\2\33\u00c1\3\2\2\2\35\u00c6\3\2\2\2\37\u00cc\3\2\2\2!\u00d3\3\2\2" +
-      "\2#\u00d9\3\2\2\2%\u00db\3\2\2\2\'\u00e1\3\2\2\2)\u00e6\3\2\2\2+\u00e9" +
+      "\2\u020b\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2" +
+      "\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27" +
+      "\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2\2" +
+      "\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2\2\2" +
+      "\2/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2\29\3\2" +
+      "\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3\2\2\2" +
+      "\2G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2\2\2S" +
+      "\3\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2\2_\3\2" +
+      "\2\2\2a\3\2\2\2\2c\3\2\2\2\2e\3\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2k\3\2\2\2" +
+      "\2m\3\2\2\2\2o\3\2\2\2\2q\3\2\2\2\2s\3\2\2\2\2u\3\2\2\2\2w\3\2\2\2\2y" +
+      "\3\2\2\2\2{\3\2\2\2\2}\3\2\2\2\2\177\3\2\2\2\2\u0081\3\2\2\2\2\u0083\3" +
+      "\2\2\2\2\u0085\3\2\2\2\3\u0087\3\2\2\2\5\u008e\3\2\2\2\7\u0090\3\2\2\2" +
+      "\t\u0092\3\2\2\2\13\u009b\3\2\2\2\r\u00a1\3\2\2\2\17\u00a7\3\2\2\2\21" +
+      "\u00aa\3\2\2\2\23\u00ac\3\2\2\2\25\u00b2\3\2\2\2\27\u00b8\3\2\2\2\31\u00bd" +
+      "\3\2\2\2\33\u00c1\3\2\2\2\35\u00c6\3\2\2\2\37\u00cc\3\2\2\2!\u00d3\3\2" +
+      "\2\2#\u00d9\3\2\2\2%\u00db\3\2\2\2\'\u00e1\3\2\2\2)\u00e6\3\2\2\2+\u00e9" +
       "\3\2\2\2-\u00ed\3\2\2\2/\u00f1\3\2\2\2\61\u00f4\3\2\2\2\63\u00fc\3\2\2" +
       "\2\65\u00ff\3\2\2\2\67\u0104\3\2\2\29\u010b\3\2\2\2;\u0115\3\2\2\2=\u011d" +
       "\3\2\2\2?\u0123\3\2\2\2A\u012b\3\2\2\2C\u0136\3\2\2\2E\u013f\3\2\2\2G" +
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java
index 7d8e0738b..6fddb3633 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java
@@ -1,4 +1,4 @@
-// Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.6
+// Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.7
 package io.ebeaninternal.server.grammer.antlr;
 
 import org.antlr.v4.runtime.tree.ParseTreeListener;
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
index 57b0a573c..151146b94 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
@@ -1,4 +1,4 @@
-// Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.6
+// Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.7
 package io.ebeaninternal.server.grammer.antlr;
 
 import org.antlr.v4.runtime.NoViableAltException;
@@ -23,7 +23,7 @@ import java.util.List;
 @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
 public class EQLParser extends Parser {
   static {
-    RuntimeMetaData.checkVersion("4.6", RuntimeMetaData.VERSION);
+    RuntimeMetaData.checkVersion("4.7", RuntimeMetaData.VERSION);
   }
 
   protected static final DFA[] _decisionToDFA;
@@ -142,18 +142,16 @@ public class EQLParser extends Parser {
     return _ATN;
   }
 
-
-//  @Override
-//  public void reportError(RecognitionException e) {
-//    throw new RuntimeException("Error in grammer - " + e.getMessage());
-//  }
-
   public EQLParser(TokenStream input) {
     super(input);
     _interp = new ParserATNSimulator(this, _ATN, _decisionToDFA, _sharedContextCache);
   }
 
   public static class Select_statementContext extends ParserRuleContext {
+    public TerminalNode EOF() {
+      return getToken(EQLParser.EOF, 0);
+    }
+
     public Select_clauseContext select_clause() {
       return getRuleContext(Select_clauseContext.class, 0);
     }
@@ -259,6 +257,8 @@ public class EQLParser extends Parser {
           }
         }
 
+        setState(98);
+        match(EOF);
       }
     } catch (RecognitionException re) {
       _localctx.exception = re;
@@ -306,23 +306,23 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(98);
-        match(T__0);
         setState(100);
+        match(T__0);
+        setState(102);
         _errHandler.sync(this);
         _la = _input.LA(1);
         if (_la == T__3) {
           {
-            setState(99);
+            setState(101);
             distinct();
           }
         }
 
-        setState(102);
-        match(T__1);
-        setState(103);
-        fetch_property_group();
         setState(104);
+        match(T__1);
+        setState(105);
+        fetch_property_group();
+        setState(106);
         match(T__2);
       }
     } catch (RecognitionException re) {
@@ -362,7 +362,7 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(106);
+        setState(108);
         match(T__3);
       }
     } catch (RecognitionException re) {
@@ -406,7 +406,7 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(108);
+        setState(110);
         fetch_path();
       }
     } catch (RecognitionException re) {
@@ -450,9 +450,9 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(110);
+        setState(112);
         match(T__4);
-        setState(111);
+        setState(113);
         conditional_expression();
       }
     } catch (RecognitionException re) {
@@ -501,25 +501,25 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(113);
-        match(T__5);
-        setState(114);
-        match(T__6);
         setState(115);
+        match(T__5);
+        setState(116);
+        match(T__6);
+        setState(117);
         orderby_property();
-        setState(120);
+        setState(122);
         _errHandler.sync(this);
         _la = _input.LA(1);
         while (_la == T__7) {
           {
             {
-              setState(116);
+              setState(118);
               match(T__7);
-              setState(117);
+              setState(119);
               orderby_property();
             }
           }
-          setState(122);
+          setState(124);
           _errHandler.sync(this);
           _la = _input.LA(1);
         }
@@ -574,24 +574,24 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(123);
-        match(PATH_VARIABLE);
         setState(125);
+        match(PATH_VARIABLE);
+        setState(127);
         _errHandler.sync(this);
         _la = _input.LA(1);
         if (_la == T__11 || _la == T__12) {
           {
-            setState(124);
+            setState(126);
             asc_desc();
           }
         }
 
-        setState(128);
+        setState(130);
         _errHandler.sync(this);
         _la = _input.LA(1);
         if (_la == T__8) {
           {
-            setState(127);
+            setState(129);
             nulls_firstlast();
           }
         }
@@ -632,24 +632,24 @@ public class EQLParser extends Parser {
     Nulls_firstlastContext _localctx = new Nulls_firstlastContext(_ctx, getState());
     enterRule(_localctx, 14, RULE_nulls_firstlast);
     try {
-      setState(134);
+      setState(136);
       _errHandler.sync(this);
       switch (getInterpreter().adaptivePredict(_input, 9, _ctx)) {
         case 1:
           enterOuterAlt(_localctx, 1);
         {
-          setState(130);
+          setState(132);
           match(T__8);
-          setState(131);
+          setState(133);
           match(T__9);
         }
         break;
         case 2:
           enterOuterAlt(_localctx, 2);
         {
-          setState(132);
+          setState(134);
           match(T__8);
-          setState(133);
+          setState(135);
           match(T__10);
         }
         break;
@@ -692,7 +692,7 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(136);
+        setState(138);
         _la = _input.LA(1);
         if (!(_la == T__11 || _la == T__12)) {
           _errHandler.recoverInline(this);
@@ -748,16 +748,16 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(138);
+        setState(140);
         match(T__13);
-        setState(139);
-        match(NUMBER_LITERAL);
         setState(141);
+        match(NUMBER_LITERAL);
+        setState(143);
         _errHandler.sync(this);
         _la = _input.LA(1);
         if (_la == T__14) {
           {
-            setState(140);
+            setState(142);
             offset_clause();
           }
         }
@@ -804,9 +804,9 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(143);
+        setState(145);
         match(T__14);
-        setState(144);
+        setState(146);
         match(NUMBER_LITERAL);
       }
     } catch (RecognitionException re) {
@@ -859,26 +859,26 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(146);
-        match(T__15);
         setState(148);
+        match(T__15);
+        setState(150);
         _errHandler.sync(this);
         _la = _input.LA(1);
         if (_la == T__17 || _la == T__18) {
           {
-            setState(147);
+            setState(149);
             fetch_option();
           }
         }
 
-        setState(150);
-        match(PATH_VARIABLE);
         setState(152);
+        match(PATH_VARIABLE);
+        setState(154);
         _errHandler.sync(this);
         _la = _input.LA(1);
         if (_la == T__1) {
           {
-            setState(151);
+            setState(153);
             fetch_property_set();
           }
         }
@@ -925,11 +925,11 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(154);
-        match(T__1);
-        setState(155);
-        fetch_property_group();
         setState(156);
+        match(T__1);
+        setState(157);
+        fetch_property_group();
+        setState(158);
         match(T__2);
       }
     } catch (RecognitionException re) {
@@ -978,21 +978,21 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(158);
+        setState(160);
         fetch_property();
-        setState(163);
+        setState(165);
         _errHandler.sync(this);
         _la = _input.LA(1);
         while (_la == T__7) {
           {
             {
-              setState(159);
+              setState(161);
               match(T__7);
-              setState(160);
+              setState(162);
               fetch_property();
             }
           }
-          setState(165);
+          setState(167);
           _errHandler.sync(this);
           _la = _input.LA(1);
         }
@@ -1044,27 +1044,27 @@ public class EQLParser extends Parser {
     Fetch_propertyContext _localctx = new Fetch_propertyContext(_ctx, getState());
     enterRule(_localctx, 28, RULE_fetch_property);
     try {
-      setState(169);
+      setState(171);
       _errHandler.sync(this);
       switch (getInterpreter().adaptivePredict(_input, 14, _ctx)) {
         case 1:
           enterOuterAlt(_localctx, 1);
         {
-          setState(166);
+          setState(168);
           match(PATH_VARIABLE);
         }
         break;
         case 2:
           enterOuterAlt(_localctx, 2);
         {
-          setState(167);
+          setState(169);
           fetch_query_hint();
         }
         break;
         case 3:
           enterOuterAlt(_localctx, 3);
         {
-          setState(168);
+          setState(170);
           fetch_lazy_hint();
         }
         break;
@@ -1110,9 +1110,9 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(171);
+        setState(173);
         match(T__16);
-        setState(172);
+        setState(174);
         fetch_query_option();
       }
     } catch (RecognitionException re) {
@@ -1156,9 +1156,9 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(174);
+        setState(176);
         match(T__16);
-        setState(175);
+        setState(177);
         fetch_lazy_option();
       }
     } catch (RecognitionException re) {
@@ -1204,20 +1204,20 @@ public class EQLParser extends Parser {
     Fetch_optionContext _localctx = new Fetch_optionContext(_ctx, getState());
     enterRule(_localctx, 34, RULE_fetch_option);
     try {
-      setState(179);
+      setState(181);
       _errHandler.sync(this);
       switch (_input.LA(1)) {
         case T__17:
           enterOuterAlt(_localctx, 1);
         {
-          setState(177);
+          setState(179);
           fetch_query_option();
         }
         break;
         case T__18:
           enterOuterAlt(_localctx, 2);
         {
-          setState(178);
+          setState(180);
           fetch_lazy_option();
         }
         break;
@@ -1266,14 +1266,14 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(181);
-        match(T__17);
         setState(183);
+        match(T__17);
+        setState(185);
         _errHandler.sync(this);
         _la = _input.LA(1);
         if (_la == T__1) {
           {
-            setState(182);
+            setState(184);
             fetch_batch_size();
           }
         }
@@ -1321,14 +1321,14 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(185);
-        match(T__18);
         setState(187);
+        match(T__18);
+        setState(189);
         _errHandler.sync(this);
         _la = _input.LA(1);
         if (_la == T__1) {
           {
-            setState(186);
+            setState(188);
             fetch_batch_size();
           }
         }
@@ -1375,11 +1375,11 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(189);
-        match(T__1);
-        setState(190);
-        match(NUMBER_LITERAL);
         setState(191);
+        match(T__1);
+        setState(192);
+        match(NUMBER_LITERAL);
+        setState(193);
         match(T__2);
       }
     } catch (RecognitionException re) {
@@ -1428,21 +1428,21 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(193);
+        setState(195);
         conditional_term();
-        setState(198);
+        setState(200);
         _errHandler.sync(this);
         _la = _input.LA(1);
         while (_la == T__19) {
           {
             {
-              setState(194);
+              setState(196);
               match(T__19);
-              setState(195);
+              setState(197);
               conditional_term();
             }
           }
-          setState(200);
+          setState(202);
           _errHandler.sync(this);
           _la = _input.LA(1);
         }
@@ -1493,21 +1493,21 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(201);
+        setState(203);
         conditional_factor();
-        setState(206);
+        setState(208);
         _errHandler.sync(this);
         _la = _input.LA(1);
         while (_la == T__20) {
           {
             {
-              setState(202);
+              setState(204);
               match(T__20);
-              setState(203);
+              setState(205);
               conditional_factor();
             }
           }
-          setState(208);
+          setState(210);
           _errHandler.sync(this);
           _la = _input.LA(1);
         }
@@ -1554,17 +1554,17 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(210);
+        setState(212);
         _errHandler.sync(this);
         _la = _input.LA(1);
         if (_la == T__21) {
           {
-            setState(209);
+            setState(211);
             match(T__21);
           }
         }
 
-        setState(212);
+        setState(214);
         conditional_primary();
       }
     } catch (RecognitionException re) {
@@ -1610,24 +1610,24 @@ public class EQLParser extends Parser {
     Conditional_primaryContext _localctx = new Conditional_primaryContext(_ctx, getState());
     enterRule(_localctx, 48, RULE_conditional_primary);
     try {
-      setState(219);
+      setState(221);
       _errHandler.sync(this);
       switch (getInterpreter().adaptivePredict(_input, 21, _ctx)) {
         case 1:
           enterOuterAlt(_localctx, 1);
         {
-          setState(214);
+          setState(216);
           any_expression();
         }
         break;
         case 2:
           enterOuterAlt(_localctx, 2);
         {
-          setState(215);
-          match(T__1);
-          setState(216);
-          conditional_expression();
           setState(217);
+          match(T__1);
+          setState(218);
+          conditional_expression();
+          setState(219);
           match(T__2);
         }
         break;
@@ -1707,80 +1707,80 @@ public class EQLParser extends Parser {
     Any_expressionContext _localctx = new Any_expressionContext(_ctx, getState());
     enterRule(_localctx, 50, RULE_any_expression);
     try {
-      setState(234);
+      setState(236);
       _errHandler.sync(this);
       switch (getInterpreter().adaptivePredict(_input, 22, _ctx)) {
         case 1:
           enterOuterAlt(_localctx, 1);
         {
-          setState(221);
+          setState(223);
           comparison_expression();
         }
         break;
         case 2:
           enterOuterAlt(_localctx, 2);
         {
-          setState(222);
+          setState(224);
           like_expression();
         }
         break;
         case 3:
           enterOuterAlt(_localctx, 3);
         {
-          setState(223);
+          setState(225);
           between_expression();
         }
         break;
         case 4:
           enterOuterAlt(_localctx, 4);
         {
-          setState(224);
+          setState(226);
           propertyBetween_expression();
         }
         break;
         case 5:
           enterOuterAlt(_localctx, 5);
         {
-          setState(225);
+          setState(227);
           in_expression();
         }
         break;
         case 6:
           enterOuterAlt(_localctx, 6);
         {
-          setState(226);
+          setState(228);
           isNull_expression();
         }
         break;
         case 7:
           enterOuterAlt(_localctx, 7);
         {
-          setState(227);
+          setState(229);
           isNotNull_expression();
         }
         break;
         case 8:
           enterOuterAlt(_localctx, 8);
         {
-          setState(228);
+          setState(230);
           isEmpty_expression();
         }
         break;
         case 9:
           enterOuterAlt(_localctx, 9);
         {
-          setState(229);
+          setState(231);
           isNotEmpty_expression();
         }
         break;
         case 10:
           enterOuterAlt(_localctx, 10);
         {
-          setState(230);
-          match(T__1);
-          setState(231);
-          any_expression();
           setState(232);
+          match(T__1);
+          setState(233);
+          any_expression();
+          setState(234);
           match(T__2);
         }
         break;
@@ -1830,11 +1830,11 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(236);
-        match(PATH_VARIABLE);
-        setState(237);
-        match(T__22);
         setState(238);
+        match(PATH_VARIABLE);
+        setState(239);
+        match(T__22);
+        setState(240);
         in_value();
       }
     } catch (RecognitionException re) {
@@ -1885,40 +1885,40 @@ public class EQLParser extends Parser {
     enterRule(_localctx, 54, RULE_in_value);
     int _la;
     try {
-      setState(252);
+      setState(254);
       _errHandler.sync(this);
       switch (_input.LA(1)) {
         case INPUT_VARIABLE:
           enterOuterAlt(_localctx, 1);
         {
-          setState(240);
+          setState(242);
           match(INPUT_VARIABLE);
         }
         break;
         case T__1:
           enterOuterAlt(_localctx, 2);
         {
-          setState(241);
+          setState(243);
           match(T__1);
-          setState(242);
+          setState(244);
           value_expression();
-          setState(247);
+          setState(249);
           _errHandler.sync(this);
           _la = _input.LA(1);
           while (_la == T__7) {
             {
               {
-                setState(243);
+                setState(245);
                 match(T__7);
-                setState(244);
+                setState(246);
                 value_expression();
               }
             }
-            setState(249);
+            setState(251);
             _errHandler.sync(this);
             _la = _input.LA(1);
           }
-          setState(250);
+          setState(252);
           match(T__2);
         }
         break;
@@ -1974,16 +1974,16 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(254);
-        match(PATH_VARIABLE);
-        setState(255);
-        match(T__23);
         setState(256);
-        value_expression();
+        match(PATH_VARIABLE);
         setState(257);
-        match(T__20);
+        match(T__23);
         setState(258);
         value_expression();
+        setState(259);
+        match(T__20);
+        setState(260);
+        value_expression();
       }
     } catch (RecognitionException re) {
       _localctx.exception = re;
@@ -2034,16 +2034,16 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(260);
-        value_expression();
-        setState(261);
-        match(T__23);
         setState(262);
-        match(PATH_VARIABLE);
+        value_expression();
         setState(263);
-        match(T__20);
+        match(T__23);
         setState(264);
         match(PATH_VARIABLE);
+        setState(265);
+        match(T__20);
+        setState(266);
+        match(PATH_VARIABLE);
       }
     } catch (RecognitionException re) {
       _localctx.exception = re;
@@ -2084,26 +2084,26 @@ public class EQLParser extends Parser {
     IsNull_expressionContext _localctx = new IsNull_expressionContext(_ctx, getState());
     enterRule(_localctx, 60, RULE_isNull_expression);
     try {
-      setState(271);
+      setState(273);
       _errHandler.sync(this);
       switch (getInterpreter().adaptivePredict(_input, 25, _ctx)) {
         case 1:
           enterOuterAlt(_localctx, 1);
         {
-          setState(266);
-          match(PATH_VARIABLE);
-          setState(267);
-          match(T__24);
           setState(268);
+          match(PATH_VARIABLE);
+          setState(269);
+          match(T__24);
+          setState(270);
           match(T__25);
         }
         break;
         case 2:
           enterOuterAlt(_localctx, 2);
         {
-          setState(269);
+          setState(271);
           match(PATH_VARIABLE);
-          setState(270);
+          setState(272);
           match(T__26);
         }
         break;
@@ -2147,37 +2147,37 @@ public class EQLParser extends Parser {
     IsNotNull_expressionContext _localctx = new IsNotNull_expressionContext(_ctx, getState());
     enterRule(_localctx, 62, RULE_isNotNull_expression);
     try {
-      setState(281);
+      setState(283);
       _errHandler.sync(this);
       switch (getInterpreter().adaptivePredict(_input, 26, _ctx)) {
         case 1:
           enterOuterAlt(_localctx, 1);
         {
-          setState(273);
-          match(PATH_VARIABLE);
-          setState(274);
-          match(T__24);
           setState(275);
-          match(T__21);
+          match(PATH_VARIABLE);
           setState(276);
+          match(T__24);
+          setState(277);
+          match(T__21);
+          setState(278);
           match(T__25);
         }
         break;
         case 2:
           enterOuterAlt(_localctx, 2);
         {
-          setState(277);
+          setState(279);
           match(PATH_VARIABLE);
-          setState(278);
+          setState(280);
           match(T__27);
         }
         break;
         case 3:
           enterOuterAlt(_localctx, 3);
         {
-          setState(279);
+          setState(281);
           match(PATH_VARIABLE);
-          setState(280);
+          setState(282);
           match(T__28);
         }
         break;
@@ -2221,26 +2221,26 @@ public class EQLParser extends Parser {
     IsEmpty_expressionContext _localctx = new IsEmpty_expressionContext(_ctx, getState());
     enterRule(_localctx, 64, RULE_isEmpty_expression);
     try {
-      setState(288);
+      setState(290);
       _errHandler.sync(this);
       switch (getInterpreter().adaptivePredict(_input, 27, _ctx)) {
         case 1:
           enterOuterAlt(_localctx, 1);
         {
-          setState(283);
-          match(PATH_VARIABLE);
-          setState(284);
-          match(T__24);
           setState(285);
+          match(PATH_VARIABLE);
+          setState(286);
+          match(T__24);
+          setState(287);
           match(T__29);
         }
         break;
         case 2:
           enterOuterAlt(_localctx, 2);
         {
-          setState(286);
+          setState(288);
           match(PATH_VARIABLE);
-          setState(287);
+          setState(289);
           match(T__30);
         }
         break;
@@ -2284,37 +2284,37 @@ public class EQLParser extends Parser {
     IsNotEmpty_expressionContext _localctx = new IsNotEmpty_expressionContext(_ctx, getState());
     enterRule(_localctx, 66, RULE_isNotEmpty_expression);
     try {
-      setState(298);
+      setState(300);
       _errHandler.sync(this);
       switch (getInterpreter().adaptivePredict(_input, 28, _ctx)) {
         case 1:
           enterOuterAlt(_localctx, 1);
         {
-          setState(290);
-          match(PATH_VARIABLE);
-          setState(291);
-          match(T__24);
           setState(292);
-          match(T__21);
+          match(PATH_VARIABLE);
           setState(293);
+          match(T__24);
+          setState(294);
+          match(T__21);
+          setState(295);
           match(T__29);
         }
         break;
         case 2:
           enterOuterAlt(_localctx, 2);
         {
-          setState(294);
+          setState(296);
           match(PATH_VARIABLE);
-          setState(295);
+          setState(297);
           match(T__31);
         }
         break;
         case 3:
           enterOuterAlt(_localctx, 3);
         {
-          setState(296);
+          setState(298);
           match(PATH_VARIABLE);
-          setState(297);
+          setState(299);
           match(T__32);
         }
         break;
@@ -2368,11 +2368,11 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(300);
-        match(PATH_VARIABLE);
-        setState(301);
-        like_op();
         setState(302);
+        match(PATH_VARIABLE);
+        setState(303);
+        like_op();
+        setState(304);
         value_expression();
       }
     } catch (RecognitionException re) {
@@ -2413,7 +2413,7 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(304);
+        setState(306);
         _la = _input.LA(1);
         if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__33) | (1L << T__34) | (1L << T__35) | (1L << T__36) | (1L << T__37) | (1L << T__38) | (1L << T__39) | (1L << T__40))) != 0))) {
           _errHandler.recoverInline(this);
@@ -2470,17 +2470,17 @@ public class EQLParser extends Parser {
     Comparison_expressionContext _localctx = new Comparison_expressionContext(_ctx, getState());
     enterRule(_localctx, 72, RULE_comparison_expression);
     try {
-      setState(314);
+      setState(316);
       _errHandler.sync(this);
       switch (_input.LA(1)) {
         case PATH_VARIABLE:
           enterOuterAlt(_localctx, 1);
         {
-          setState(306);
-          match(PATH_VARIABLE);
-          setState(307);
-          comparison_operator();
           setState(308);
+          match(PATH_VARIABLE);
+          setState(309);
+          comparison_operator();
+          setState(310);
           value_expression();
         }
         break;
@@ -2490,11 +2490,11 @@ public class EQLParser extends Parser {
         case STRING_LITERAL:
           enterOuterAlt(_localctx, 2);
         {
-          setState(310);
-          value_expression();
-          setState(311);
-          comparison_operator();
           setState(312);
+          value_expression();
+          setState(313);
+          comparison_operator();
+          setState(314);
           match(PATH_VARIABLE);
         }
         break;
@@ -2539,7 +2539,7 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(316);
+        setState(318);
         _la = _input.LA(1);
         if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__41) | (1L << T__42) | (1L << T__43) | (1L << T__44) | (1L << T__45) | (1L << T__46) | (1L << T__47) | (1L << T__48) | (1L << T__49) | (1L << T__50) | (1L << T__51) | (1L << T__52) | (1L << T__53) | (1L << T__54) | (1L << T__55) | (1L << T__56))) != 0))) {
           _errHandler.recoverInline(this);
@@ -2592,7 +2592,7 @@ public class EQLParser extends Parser {
     Value_expressionContext _localctx = new Value_expressionContext(_ctx, getState());
     enterRule(_localctx, 76, RULE_value_expression);
     try {
-      setState(320);
+      setState(322);
       _errHandler.sync(this);
       switch (_input.LA(1)) {
         case BOOLEAN_LITERAL:
@@ -2600,14 +2600,14 @@ public class EQLParser extends Parser {
         case STRING_LITERAL:
           enterOuterAlt(_localctx, 1);
         {
-          setState(318);
+          setState(320);
           literal();
         }
         break;
         case INPUT_VARIABLE:
           enterOuterAlt(_localctx, 2);
         {
-          setState(319);
+          setState(321);
           match(INPUT_VARIABLE);
         }
         break;
@@ -2664,7 +2664,7 @@ public class EQLParser extends Parser {
     try {
       enterOuterAlt(_localctx, 1);
       {
-        setState(322);
+        setState(324);
         _la = _input.LA(1);
         if (!(((((_la - 60)) & ~0x3f) == 0 && ((1L << (_la - 60)) & ((1L << (BOOLEAN_LITERAL - 60)) | (1L << (NUMBER_LITERAL - 60)) | (1L << (STRING_LITERAL - 60)))) != 0))) {
           _errHandler.recoverInline(this);
@@ -2685,114 +2685,115 @@ public class EQLParser extends Parser {
   }
 
   public static final String _serializedATN =
-    "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3D\u0147\4\2\t\2\4" +
+    "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3D\u0149\4\2\t\2\4" +
       "\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t" +
       "\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22" +
       "\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31" +
       "\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\4\36\t\36\4\37\t\37\4 \t \4!" +
       "\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\3\2\5\2T\n\2\3" +
-      "\2\7\2W\n\2\f\2\16\2Z\13\2\3\2\5\2]\n\2\3\2\5\2`\n\2\3\2\5\2c\n\2\3\3" +
-      "\3\3\5\3g\n\3\3\3\3\3\3\3\3\3\3\4\3\4\3\5\3\5\3\6\3\6\3\6\3\7\3\7\3\7" +
-      "\3\7\3\7\7\7y\n\7\f\7\16\7|\13\7\3\b\3\b\5\b\u0080\n\b\3\b\5\b\u0083\n" +
-      "\b\3\t\3\t\3\t\3\t\5\t\u0089\n\t\3\n\3\n\3\13\3\13\3\13\5\13\u0090\n\13" +
-      "\3\f\3\f\3\f\3\r\3\r\5\r\u0097\n\r\3\r\3\r\5\r\u009b\n\r\3\16\3\16\3\16" +
-      "\3\16\3\17\3\17\3\17\7\17\u00a4\n\17\f\17\16\17\u00a7\13\17\3\20\3\20" +
-      "\3\20\5\20\u00ac\n\20\3\21\3\21\3\21\3\22\3\22\3\22\3\23\3\23\5\23\u00b6" +
-      "\n\23\3\24\3\24\5\24\u00ba\n\24\3\25\3\25\5\25\u00be\n\25\3\26\3\26\3" +
-      "\26\3\26\3\27\3\27\3\27\7\27\u00c7\n\27\f\27\16\27\u00ca\13\27\3\30\3" +
-      "\30\3\30\7\30\u00cf\n\30\f\30\16\30\u00d2\13\30\3\31\5\31\u00d5\n\31\3" +
-      "\31\3\31\3\32\3\32\3\32\3\32\3\32\5\32\u00de\n\32\3\33\3\33\3\33\3\33" +
-      "\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\5\33\u00ed\n\33\3\34\3\34" +
-      "\3\34\3\34\3\35\3\35\3\35\3\35\3\35\7\35\u00f8\n\35\f\35\16\35\u00fb\13" +
-      "\35\3\35\3\35\5\35\u00ff\n\35\3\36\3\36\3\36\3\36\3\36\3\36\3\37\3\37" +
-      "\3\37\3\37\3\37\3\37\3 \3 \3 \3 \3 \5 \u0112\n \3!\3!\3!\3!\3!\3!\3!\3" +
-      "!\5!\u011c\n!\3\"\3\"\3\"\3\"\3\"\5\"\u0123\n\"\3#\3#\3#\3#\3#\3#\3#\3" +
-      "#\5#\u012d\n#\3$\3$\3$\3$\3%\3%\3&\3&\3&\3&\3&\3&\3&\3&\5&\u013d\n&\3" +
-      "\'\3\'\3(\3(\5(\u0143\n(\3)\3)\3)\2\2*\2\4\6\b\n\f\16\20\22\24\26\30\32" +
-      "\34\36 \"$&(*,.\60\62\64\668:<>@BDFHJLNP\2\6\3\2\16\17\3\2$+\3\2,;\4\2" +
-      ">?CC\u0148\2S\3\2\2\2\4d\3\2\2\2\6l\3\2\2\2\bn\3\2\2\2\np\3\2\2\2\fs\3" +
-      "\2\2\2\16}\3\2\2\2\20\u0088\3\2\2\2\22\u008a\3\2\2\2\24\u008c\3\2\2\2" +
-      "\26\u0091\3\2\2\2\30\u0094\3\2\2\2\32\u009c\3\2\2\2\34\u00a0\3\2\2\2\36" +
-      "\u00ab\3\2\2\2 \u00ad\3\2\2\2\"\u00b0\3\2\2\2$\u00b5\3\2\2\2&\u00b7\3" +
-      "\2\2\2(\u00bb\3\2\2\2*\u00bf\3\2\2\2,\u00c3\3\2\2\2.\u00cb\3\2\2\2\60" +
-      "\u00d4\3\2\2\2\62\u00dd\3\2\2\2\64\u00ec\3\2\2\2\66\u00ee\3\2\2\28\u00fe" +
-      "\3\2\2\2:\u0100\3\2\2\2<\u0106\3\2\2\2>\u0111\3\2\2\2@\u011b\3\2\2\2B" +
-      "\u0122\3\2\2\2D\u012c\3\2\2\2F\u012e\3\2\2\2H\u0132\3\2\2\2J\u013c\3\2" +
-      "\2\2L\u013e\3\2\2\2N\u0142\3\2\2\2P\u0144\3\2\2\2RT\5\4\3\2SR\3\2\2\2" +
-      "ST\3\2\2\2TX\3\2\2\2UW\5\b\5\2VU\3\2\2\2WZ\3\2\2\2XV\3\2\2\2XY\3\2\2\2" +
-      "Y\\\3\2\2\2ZX\3\2\2\2[]\5\n\6\2\\[\3\2\2\2\\]\3\2\2\2]_\3\2\2\2^`\5\f" +
-      "\7\2_^\3\2\2\2_`\3\2\2\2`b\3\2\2\2ac\5\24\13\2ba\3\2\2\2bc\3\2\2\2c\3" +
-      "\3\2\2\2df\7\3\2\2eg\5\6\4\2fe\3\2\2\2fg\3\2\2\2gh\3\2\2\2hi\7\4\2\2i" +
-      "j\5\34\17\2jk\7\5\2\2k\5\3\2\2\2lm\7\6\2\2m\7\3\2\2\2no\5\30\r\2o\t\3" +
-      "\2\2\2pq\7\7\2\2qr\5,\27\2r\13\3\2\2\2st\7\b\2\2tu\7\t\2\2uz\5\16\b\2" +
-      "vw\7\n\2\2wy\5\16\b\2xv\3\2\2\2y|\3\2\2\2zx\3\2\2\2z{\3\2\2\2{\r\3\2\2" +
-      "\2|z\3\2\2\2}\177\7=\2\2~\u0080\5\22\n\2\177~\3\2\2\2\177\u0080\3\2\2" +
-      "\2\u0080\u0082\3\2\2\2\u0081\u0083\5\20\t\2\u0082\u0081\3\2\2\2\u0082" +
-      "\u0083\3\2\2\2\u0083\17\3\2\2\2\u0084\u0085\7\13\2\2\u0085\u0089\7\f\2" +
-      "\2\u0086\u0087\7\13\2\2\u0087\u0089\7\r\2\2\u0088\u0084\3\2\2\2\u0088" +
-      "\u0086\3\2\2\2\u0089\21\3\2\2\2\u008a\u008b\t\2\2\2\u008b\23\3\2\2\2\u008c" +
-      "\u008d\7\20\2\2\u008d\u008f\7?\2\2\u008e\u0090\5\26\f\2\u008f\u008e\3" +
-      "\2\2\2\u008f\u0090\3\2\2\2\u0090\25\3\2\2\2\u0091\u0092\7\21\2\2\u0092" +
-      "\u0093\7?\2\2\u0093\27\3\2\2\2\u0094\u0096\7\22\2\2\u0095\u0097\5$\23" +
-      "\2\u0096\u0095\3\2\2\2\u0096\u0097\3\2\2\2\u0097\u0098\3\2\2\2\u0098\u009a" +
-      "\7=\2\2\u0099\u009b\5\32\16\2\u009a\u0099\3\2\2\2\u009a\u009b\3\2\2\2" +
-      "\u009b\31\3\2\2\2\u009c\u009d\7\4\2\2\u009d\u009e\5\34\17\2\u009e\u009f" +
-      "\7\5\2\2\u009f\33\3\2\2\2\u00a0\u00a5\5\36\20\2\u00a1\u00a2\7\n\2\2\u00a2" +
-      "\u00a4\5\36\20\2\u00a3\u00a1\3\2\2\2\u00a4\u00a7\3\2\2\2\u00a5\u00a3\3" +
-      "\2\2\2\u00a5\u00a6\3\2\2\2\u00a6\35\3\2\2\2\u00a7\u00a5\3\2\2\2\u00a8" +
-      "\u00ac\7=\2\2\u00a9\u00ac\5 \21\2\u00aa\u00ac\5\"\22\2\u00ab\u00a8\3\2" +
-      "\2\2\u00ab\u00a9\3\2\2\2\u00ab\u00aa\3\2\2\2\u00ac\37\3\2\2\2\u00ad\u00ae" +
-      "\7\23\2\2\u00ae\u00af\5&\24\2\u00af!\3\2\2\2\u00b0\u00b1\7\23\2\2\u00b1" +
-      "\u00b2\5(\25\2\u00b2#\3\2\2\2\u00b3\u00b6\5&\24\2\u00b4\u00b6\5(\25\2" +
-      "\u00b5\u00b3\3\2\2\2\u00b5\u00b4\3\2\2\2\u00b6%\3\2\2\2\u00b7\u00b9\7" +
-      "\24\2\2\u00b8\u00ba\5*\26\2\u00b9\u00b8\3\2\2\2\u00b9\u00ba\3\2\2\2\u00ba" +
-      "\'\3\2\2\2\u00bb\u00bd\7\25\2\2\u00bc\u00be\5*\26\2\u00bd\u00bc\3\2\2" +
-      "\2\u00bd\u00be\3\2\2\2\u00be)\3\2\2\2\u00bf\u00c0\7\4\2\2\u00c0\u00c1" +
-      "\7?\2\2\u00c1\u00c2\7\5\2\2\u00c2+\3\2\2\2\u00c3\u00c8\5.\30\2\u00c4\u00c5" +
-      "\7\26\2\2\u00c5\u00c7\5.\30\2\u00c6\u00c4\3\2\2\2\u00c7\u00ca\3\2\2\2" +
-      "\u00c8\u00c6\3\2\2\2\u00c8\u00c9\3\2\2\2\u00c9-\3\2\2\2\u00ca\u00c8\3" +
-      "\2\2\2\u00cb\u00d0\5\60\31\2\u00cc\u00cd\7\27\2\2\u00cd\u00cf\5\60\31" +
-      "\2\u00ce\u00cc\3\2\2\2\u00cf\u00d2\3\2\2\2\u00d0\u00ce\3\2\2\2\u00d0\u00d1" +
-      "\3\2\2\2\u00d1/\3\2\2\2\u00d2\u00d0\3\2\2\2\u00d3\u00d5\7\30\2\2\u00d4" +
-      "\u00d3\3\2\2\2\u00d4\u00d5\3\2\2\2\u00d5\u00d6\3\2\2\2\u00d6\u00d7\5\62" +
-      "\32\2\u00d7\61\3\2\2\2\u00d8\u00de\5\64\33\2\u00d9\u00da\7\4\2\2\u00da" +
-      "\u00db\5,\27\2\u00db\u00dc\7\5\2\2\u00dc\u00de\3\2\2\2\u00dd\u00d8\3\2" +
-      "\2\2\u00dd\u00d9\3\2\2\2\u00de\63\3\2\2\2\u00df\u00ed\5J&\2\u00e0\u00ed" +
-      "\5F$\2\u00e1\u00ed\5:\36\2\u00e2\u00ed\5<\37\2\u00e3\u00ed\5\66\34\2\u00e4" +
-      "\u00ed\5> \2\u00e5\u00ed\5@!\2\u00e6\u00ed\5B\"\2\u00e7\u00ed\5D#\2\u00e8" +
-      "\u00e9\7\4\2\2\u00e9\u00ea\5\64\33\2\u00ea\u00eb\7\5\2\2\u00eb\u00ed\3" +
-      "\2\2\2\u00ec\u00df\3\2\2\2\u00ec\u00e0\3\2\2\2\u00ec\u00e1\3\2\2\2\u00ec" +
-      "\u00e2\3\2\2\2\u00ec\u00e3\3\2\2\2\u00ec\u00e4\3\2\2\2\u00ec\u00e5\3\2" +
-      "\2\2\u00ec\u00e6\3\2\2\2\u00ec\u00e7\3\2\2\2\u00ec\u00e8\3\2\2\2\u00ed" +
-      "\65\3\2\2\2\u00ee\u00ef\7=\2\2\u00ef\u00f0\7\31\2\2\u00f0\u00f1\58\35" +
-      "\2\u00f1\67\3\2\2\2\u00f2\u00ff\7<\2\2\u00f3\u00f4\7\4\2\2\u00f4\u00f9" +
-      "\5N(\2\u00f5\u00f6\7\n\2\2\u00f6\u00f8\5N(\2\u00f7\u00f5\3\2\2\2\u00f8" +
-      "\u00fb\3\2\2\2\u00f9\u00f7\3\2\2\2\u00f9\u00fa\3\2\2\2\u00fa\u00fc\3\2" +
-      "\2\2\u00fb\u00f9\3\2\2\2\u00fc\u00fd\7\5\2\2\u00fd\u00ff\3\2\2\2\u00fe" +
-      "\u00f2\3\2\2\2\u00fe\u00f3\3\2\2\2\u00ff9\3\2\2\2\u0100\u0101\7=\2\2\u0101" +
-      "\u0102\7\32\2\2\u0102\u0103\5N(\2\u0103\u0104\7\27\2\2\u0104\u0105\5N" +
-      "(\2\u0105;\3\2\2\2\u0106\u0107\5N(\2\u0107\u0108\7\32\2\2\u0108\u0109" +
-      "\7=\2\2\u0109\u010a\7\27\2\2\u010a\u010b\7=\2\2\u010b=\3\2\2\2\u010c\u010d" +
-      "\7=\2\2\u010d\u010e\7\33\2\2\u010e\u0112\7\34\2\2\u010f\u0110\7=\2\2\u0110" +
-      "\u0112\7\35\2\2\u0111\u010c\3\2\2\2\u0111\u010f\3\2\2\2\u0112?\3\2\2\2" +
-      "\u0113\u0114\7=\2\2\u0114\u0115\7\33\2\2\u0115\u0116\7\30\2\2\u0116\u011c" +
-      "\7\34\2\2\u0117\u0118\7=\2\2\u0118\u011c\7\36\2\2\u0119\u011a\7=\2\2\u011a" +
-      "\u011c\7\37\2\2\u011b\u0113\3\2\2\2\u011b\u0117\3\2\2\2\u011b\u0119\3" +
-      "\2\2\2\u011cA\3\2\2\2\u011d\u011e\7=\2\2\u011e\u011f\7\33\2\2\u011f\u0123" +
-      "\7 \2\2\u0120\u0121\7=\2\2\u0121\u0123\7!\2\2\u0122\u011d\3\2\2\2\u0122" +
-      "\u0120\3\2\2\2\u0123C\3\2\2\2\u0124\u0125\7=\2\2\u0125\u0126\7\33\2\2" +
-      "\u0126\u0127\7\30\2\2\u0127\u012d\7 \2\2\u0128\u0129\7=\2\2\u0129\u012d" +
-      "\7\"\2\2\u012a\u012b\7=\2\2\u012b\u012d\7#\2\2\u012c\u0124\3\2\2\2\u012c" +
-      "\u0128\3\2\2\2\u012c\u012a\3\2\2\2\u012dE\3\2\2\2\u012e\u012f\7=\2\2\u012f" +
-      "\u0130\5H%\2\u0130\u0131\5N(\2\u0131G\3\2\2\2\u0132\u0133\t\3\2\2\u0133" +
-      "I\3\2\2\2\u0134\u0135\7=\2\2\u0135\u0136\5L\'\2\u0136\u0137\5N(\2\u0137" +
-      "\u013d\3\2\2\2\u0138\u0139\5N(\2\u0139\u013a\5L\'\2\u013a\u013b\7=\2\2" +
-      "\u013b\u013d\3\2\2\2\u013c\u0134\3\2\2\2\u013c\u0138\3\2\2\2\u013dK\3" +
-      "\2\2\2\u013e\u013f\t\4\2\2\u013fM\3\2\2\2\u0140\u0143\5P)\2\u0141\u0143" +
-      "\7<\2\2\u0142\u0140\3\2\2\2\u0142\u0141\3\2\2\2\u0143O\3\2\2\2\u0144\u0145" +
-      "\t\5\2\2\u0145Q\3\2\2\2!SX\\_bfz\177\u0082\u0088\u008f\u0096\u009a\u00a5" +
-      "\u00ab\u00b5\u00b9\u00bd\u00c8\u00d0\u00d4\u00dd\u00ec\u00f9\u00fe\u0111" +
-      "\u011b\u0122\u012c\u013c\u0142";
+      "\2\7\2W\n\2\f\2\16\2Z\13\2\3\2\5\2]\n\2\3\2\5\2`\n\2\3\2\5\2c\n\2\3\2" +
+      "\3\2\3\3\3\3\5\3i\n\3\3\3\3\3\3\3\3\3\3\4\3\4\3\5\3\5\3\6\3\6\3\6\3\7" +
+      "\3\7\3\7\3\7\3\7\7\7{\n\7\f\7\16\7~\13\7\3\b\3\b\5\b\u0082\n\b\3\b\5\b" +
+      "\u0085\n\b\3\t\3\t\3\t\3\t\5\t\u008b\n\t\3\n\3\n\3\13\3\13\3\13\5\13\u0092" +
+      "\n\13\3\f\3\f\3\f\3\r\3\r\5\r\u0099\n\r\3\r\3\r\5\r\u009d\n\r\3\16\3\16" +
+      "\3\16\3\16\3\17\3\17\3\17\7\17\u00a6\n\17\f\17\16\17\u00a9\13\17\3\20" +
+      "\3\20\3\20\5\20\u00ae\n\20\3\21\3\21\3\21\3\22\3\22\3\22\3\23\3\23\5\23" +
+      "\u00b8\n\23\3\24\3\24\5\24\u00bc\n\24\3\25\3\25\5\25\u00c0\n\25\3\26\3" +
+      "\26\3\26\3\26\3\27\3\27\3\27\7\27\u00c9\n\27\f\27\16\27\u00cc\13\27\3" +
+      "\30\3\30\3\30\7\30\u00d1\n\30\f\30\16\30\u00d4\13\30\3\31\5\31\u00d7\n" +
+      "\31\3\31\3\31\3\32\3\32\3\32\3\32\3\32\5\32\u00e0\n\32\3\33\3\33\3\33" +
+      "\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\5\33\u00ef\n\33\3\34" +
+      "\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\35\7\35\u00fa\n\35\f\35\16\35\u00fd" +
+      "\13\35\3\35\3\35\5\35\u0101\n\35\3\36\3\36\3\36\3\36\3\36\3\36\3\37\3" +
+      "\37\3\37\3\37\3\37\3\37\3 \3 \3 \3 \3 \5 \u0114\n \3!\3!\3!\3!\3!\3!\3" +
+      "!\3!\5!\u011e\n!\3\"\3\"\3\"\3\"\3\"\5\"\u0125\n\"\3#\3#\3#\3#\3#\3#\3" +
+      "#\3#\5#\u012f\n#\3$\3$\3$\3$\3%\3%\3&\3&\3&\3&\3&\3&\3&\3&\5&\u013f\n" +
+      "&\3\'\3\'\3(\3(\5(\u0145\n(\3)\3)\3)\2\2*\2\4\6\b\n\f\16\20\22\24\26\30" +
+      "\32\34\36 \"$&(*,.\60\62\64\668:<>@BDFHJLNP\2\6\3\2\16\17\3\2$+\3\2,;" +
+      "\4\2>?CC\2\u014a\2S\3\2\2\2\4f\3\2\2\2\6n\3\2\2\2\bp\3\2\2\2\nr\3\2\2" +
+      "\2\fu\3\2\2\2\16\177\3\2\2\2\20\u008a\3\2\2\2\22\u008c\3\2\2\2\24\u008e" +
+      "\3\2\2\2\26\u0093\3\2\2\2\30\u0096\3\2\2\2\32\u009e\3\2\2\2\34\u00a2\3" +
+      "\2\2\2\36\u00ad\3\2\2\2 \u00af\3\2\2\2\"\u00b2\3\2\2\2$\u00b7\3\2\2\2" +
+      "&\u00b9\3\2\2\2(\u00bd\3\2\2\2*\u00c1\3\2\2\2,\u00c5\3\2\2\2.\u00cd\3" +
+      "\2\2\2\60\u00d6\3\2\2\2\62\u00df\3\2\2\2\64\u00ee\3\2\2\2\66\u00f0\3\2" +
+      "\2\28\u0100\3\2\2\2:\u0102\3\2\2\2<\u0108\3\2\2\2>\u0113\3\2\2\2@\u011d" +
+      "\3\2\2\2B\u0124\3\2\2\2D\u012e\3\2\2\2F\u0130\3\2\2\2H\u0134\3\2\2\2J" +
+      "\u013e\3\2\2\2L\u0140\3\2\2\2N\u0144\3\2\2\2P\u0146\3\2\2\2RT\5\4\3\2" +
+      "SR\3\2\2\2ST\3\2\2\2TX\3\2\2\2UW\5\b\5\2VU\3\2\2\2WZ\3\2\2\2XV\3\2\2\2" +
+      "XY\3\2\2\2Y\\\3\2\2\2ZX\3\2\2\2[]\5\n\6\2\\[\3\2\2\2\\]\3\2\2\2]_\3\2" +
+      "\2\2^`\5\f\7\2_^\3\2\2\2_`\3\2\2\2`b\3\2\2\2ac\5\24\13\2ba\3\2\2\2bc\3" +
+      "\2\2\2cd\3\2\2\2de\7\2\2\3e\3\3\2\2\2fh\7\3\2\2gi\5\6\4\2hg\3\2\2\2hi" +
+      "\3\2\2\2ij\3\2\2\2jk\7\4\2\2kl\5\34\17\2lm\7\5\2\2m\5\3\2\2\2no\7\6\2" +
+      "\2o\7\3\2\2\2pq\5\30\r\2q\t\3\2\2\2rs\7\7\2\2st\5,\27\2t\13\3\2\2\2uv" +
+      "\7\b\2\2vw\7\t\2\2w|\5\16\b\2xy\7\n\2\2y{\5\16\b\2zx\3\2\2\2{~\3\2\2\2" +
+      "|z\3\2\2\2|}\3\2\2\2}\r\3\2\2\2~|\3\2\2\2\177\u0081\7=\2\2\u0080\u0082" +
+      "\5\22\n\2\u0081\u0080\3\2\2\2\u0081\u0082\3\2\2\2\u0082\u0084\3\2\2\2" +
+      "\u0083\u0085\5\20\t\2\u0084\u0083\3\2\2\2\u0084\u0085\3\2\2\2\u0085\17" +
+      "\3\2\2\2\u0086\u0087\7\13\2\2\u0087\u008b\7\f\2\2\u0088\u0089\7\13\2\2" +
+      "\u0089\u008b\7\r\2\2\u008a\u0086\3\2\2\2\u008a\u0088\3\2\2\2\u008b\21" +
+      "\3\2\2\2\u008c\u008d\t\2\2\2\u008d\23\3\2\2\2\u008e\u008f\7\20\2\2\u008f" +
+      "\u0091\7?\2\2\u0090\u0092\5\26\f\2\u0091\u0090\3\2\2\2\u0091\u0092\3\2" +
+      "\2\2\u0092\25\3\2\2\2\u0093\u0094\7\21\2\2\u0094\u0095\7?\2\2\u0095\27" +
+      "\3\2\2\2\u0096\u0098\7\22\2\2\u0097\u0099\5$\23\2\u0098\u0097\3\2\2\2" +
+      "\u0098\u0099\3\2\2\2\u0099\u009a\3\2\2\2\u009a\u009c\7=\2\2\u009b\u009d" +
+      "\5\32\16\2\u009c\u009b\3\2\2\2\u009c\u009d\3\2\2\2\u009d\31\3\2\2\2\u009e" +
+      "\u009f\7\4\2\2\u009f\u00a0\5\34\17\2\u00a0\u00a1\7\5\2\2\u00a1\33\3\2" +
+      "\2\2\u00a2\u00a7\5\36\20\2\u00a3\u00a4\7\n\2\2\u00a4\u00a6\5\36\20\2\u00a5" +
+      "\u00a3\3\2\2\2\u00a6\u00a9\3\2\2\2\u00a7\u00a5\3\2\2\2\u00a7\u00a8\3\2" +
+      "\2\2\u00a8\35\3\2\2\2\u00a9\u00a7\3\2\2\2\u00aa\u00ae\7=\2\2\u00ab\u00ae" +
+      "\5 \21\2\u00ac\u00ae\5\"\22\2\u00ad\u00aa\3\2\2\2\u00ad\u00ab\3\2\2\2" +
+      "\u00ad\u00ac\3\2\2\2\u00ae\37\3\2\2\2\u00af\u00b0\7\23\2\2\u00b0\u00b1" +
+      "\5&\24\2\u00b1!\3\2\2\2\u00b2\u00b3\7\23\2\2\u00b3\u00b4\5(\25\2\u00b4" +
+      "#\3\2\2\2\u00b5\u00b8\5&\24\2\u00b6\u00b8\5(\25\2\u00b7\u00b5\3\2\2\2" +
+      "\u00b7\u00b6\3\2\2\2\u00b8%\3\2\2\2\u00b9\u00bb\7\24\2\2\u00ba\u00bc\5" +
+      "*\26\2\u00bb\u00ba\3\2\2\2\u00bb\u00bc\3\2\2\2\u00bc\'\3\2\2\2\u00bd\u00bf" +
+      "\7\25\2\2\u00be\u00c0\5*\26\2\u00bf\u00be\3\2\2\2\u00bf\u00c0\3\2\2\2" +
+      "\u00c0)\3\2\2\2\u00c1\u00c2\7\4\2\2\u00c2\u00c3\7?\2\2\u00c3\u00c4\7\5" +
+      "\2\2\u00c4+\3\2\2\2\u00c5\u00ca\5.\30\2\u00c6\u00c7\7\26\2\2\u00c7\u00c9" +
+      "\5.\30\2\u00c8\u00c6\3\2\2\2\u00c9\u00cc\3\2\2\2\u00ca\u00c8\3\2\2\2\u00ca" +
+      "\u00cb\3\2\2\2\u00cb-\3\2\2\2\u00cc\u00ca\3\2\2\2\u00cd\u00d2\5\60\31" +
+      "\2\u00ce\u00cf\7\27\2\2\u00cf\u00d1\5\60\31\2\u00d0\u00ce\3\2\2\2\u00d1" +
+      "\u00d4\3\2\2\2\u00d2\u00d0\3\2\2\2\u00d2\u00d3\3\2\2\2\u00d3/\3\2\2\2" +
+      "\u00d4\u00d2\3\2\2\2\u00d5\u00d7\7\30\2\2\u00d6\u00d5\3\2\2\2\u00d6\u00d7" +
+      "\3\2\2\2\u00d7\u00d8\3\2\2\2\u00d8\u00d9\5\62\32\2\u00d9\61\3\2\2\2\u00da" +
+      "\u00e0\5\64\33\2\u00db\u00dc\7\4\2\2\u00dc\u00dd\5,\27\2\u00dd\u00de\7" +
+      "\5\2\2\u00de\u00e0\3\2\2\2\u00df\u00da\3\2\2\2\u00df\u00db\3\2\2\2\u00e0" +
+      "\63\3\2\2\2\u00e1\u00ef\5J&\2\u00e2\u00ef\5F$\2\u00e3\u00ef\5:\36\2\u00e4" +
+      "\u00ef\5<\37\2\u00e5\u00ef\5\66\34\2\u00e6\u00ef\5> \2\u00e7\u00ef\5@" +
+      "!\2\u00e8\u00ef\5B\"\2\u00e9\u00ef\5D#\2\u00ea\u00eb\7\4\2\2\u00eb\u00ec" +
+      "\5\64\33\2\u00ec\u00ed\7\5\2\2\u00ed\u00ef\3\2\2\2\u00ee\u00e1\3\2\2\2" +
+      "\u00ee\u00e2\3\2\2\2\u00ee\u00e3\3\2\2\2\u00ee\u00e4\3\2\2\2\u00ee\u00e5" +
+      "\3\2\2\2\u00ee\u00e6\3\2\2\2\u00ee\u00e7\3\2\2\2\u00ee\u00e8\3\2\2\2\u00ee" +
+      "\u00e9\3\2\2\2\u00ee\u00ea\3\2\2\2\u00ef\65\3\2\2\2\u00f0\u00f1\7=\2\2" +
+      "\u00f1\u00f2\7\31\2\2\u00f2\u00f3\58\35\2\u00f3\67\3\2\2\2\u00f4\u0101" +
+      "\7<\2\2\u00f5\u00f6\7\4\2\2\u00f6\u00fb\5N(\2\u00f7\u00f8\7\n\2\2\u00f8" +
+      "\u00fa\5N(\2\u00f9\u00f7\3\2\2\2\u00fa\u00fd\3\2\2\2\u00fb\u00f9\3\2\2" +
+      "\2\u00fb\u00fc\3\2\2\2\u00fc\u00fe\3\2\2\2\u00fd\u00fb\3\2\2\2\u00fe\u00ff" +
+      "\7\5\2\2\u00ff\u0101\3\2\2\2\u0100\u00f4\3\2\2\2\u0100\u00f5\3\2\2\2\u0101" +
+      "9\3\2\2\2\u0102\u0103\7=\2\2\u0103\u0104\7\32\2\2\u0104\u0105\5N(\2\u0105" +
+      "\u0106\7\27\2\2\u0106\u0107\5N(\2\u0107;\3\2\2\2\u0108\u0109\5N(\2\u0109" +
+      "\u010a\7\32\2\2\u010a\u010b\7=\2\2\u010b\u010c\7\27\2\2\u010c\u010d\7" +
+      "=\2\2\u010d=\3\2\2\2\u010e\u010f\7=\2\2\u010f\u0110\7\33\2\2\u0110\u0114" +
+      "\7\34\2\2\u0111\u0112\7=\2\2\u0112\u0114\7\35\2\2\u0113\u010e\3\2\2\2" +
+      "\u0113\u0111\3\2\2\2\u0114?\3\2\2\2\u0115\u0116\7=\2\2\u0116\u0117\7\33" +
+      "\2\2\u0117\u0118\7\30\2\2\u0118\u011e\7\34\2\2\u0119\u011a\7=\2\2\u011a" +
+      "\u011e\7\36\2\2\u011b\u011c\7=\2\2\u011c\u011e\7\37\2\2\u011d\u0115\3" +
+      "\2\2\2\u011d\u0119\3\2\2\2\u011d\u011b\3\2\2\2\u011eA\3\2\2\2\u011f\u0120" +
+      "\7=\2\2\u0120\u0121\7\33\2\2\u0121\u0125\7 \2\2\u0122\u0123\7=\2\2\u0123" +
+      "\u0125\7!\2\2\u0124\u011f\3\2\2\2\u0124\u0122\3\2\2\2\u0125C\3\2\2\2\u0126" +
+      "\u0127\7=\2\2\u0127\u0128\7\33\2\2\u0128\u0129\7\30\2\2\u0129\u012f\7" +
+      " \2\2\u012a\u012b\7=\2\2\u012b\u012f\7\"\2\2\u012c\u012d\7=\2\2\u012d" +
+      "\u012f\7#\2\2\u012e\u0126\3\2\2\2\u012e\u012a\3\2\2\2\u012e\u012c\3\2" +
+      "\2\2\u012fE\3\2\2\2\u0130\u0131\7=\2\2\u0131\u0132\5H%\2\u0132\u0133\5" +
+      "N(\2\u0133G\3\2\2\2\u0134\u0135\t\3\2\2\u0135I\3\2\2\2\u0136\u0137\7=" +
+      "\2\2\u0137\u0138\5L\'\2\u0138\u0139\5N(\2\u0139\u013f\3\2\2\2\u013a\u013b" +
+      "\5N(\2\u013b\u013c\5L\'\2\u013c\u013d\7=\2\2\u013d\u013f\3\2\2\2\u013e" +
+      "\u0136\3\2\2\2\u013e\u013a\3\2\2\2\u013fK\3\2\2\2\u0140\u0141\t\4\2\2" +
+      "\u0141M\3\2\2\2\u0142\u0145\5P)\2\u0143\u0145\7<\2\2\u0144\u0142\3\2\2" +
+      "\2\u0144\u0143\3\2\2\2\u0145O\3\2\2\2\u0146\u0147\t\5\2\2\u0147Q\3\2\2" +
+      "\2!SX\\_bh|\u0081\u0084\u008a\u0091\u0098\u009c\u00a7\u00ad\u00b7\u00bb" +
+      "\u00bf\u00ca\u00d2\u00d6\u00df\u00ee\u00fb\u0100\u0113\u011d\u0124\u012e" +
+      "\u013e\u0144";
   public static final ATN _ATN =
     new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 
diff --git a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
index d4c569262..0f09a79a1 100644
--- a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
@@ -17,12 +17,12 @@ public class EqlParserTest extends BaseTestCase {
 
 
   @Test(expected = IllegalArgumentException.class)
-  public void illegal_syntax() throws Exception {
+  public void illegal_syntax() {
     parse("find Article where name = :p0");
   }
 
   @Test
-  public void where_eq() throws Exception {
+  public void where_eq() {
 
     Query<Customer> query = parse("where name eq 'Rob'");
     query.findList();
@@ -31,7 +31,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void where_eq_reverse() throws Exception {
+  public void where_eq_reverse() {
 
     Query<Customer> query = parse("where 'Rob' eq name");
     query.findList();
@@ -40,7 +40,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void where_gt_reverse() throws Exception {
+  public void where_gt_reverse() {
 
     Query<Customer> query = parse("where 'Rob' > name");
     query.findList();
@@ -48,7 +48,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void where_gte_reverse() throws Exception {
+  public void where_gte_reverse() {
 
     Query<Customer> query = parse("where 'Rob' >= name");
     query.findList();
@@ -56,7 +56,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void where_lt_reverse() throws Exception {
+  public void where_lt_reverse() {
 
     Query<Customer> query = parse("where 'Rob' < name");
     query.findList();
@@ -64,7 +64,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void where_lte_reverse() throws Exception {
+  public void where_lte_reverse() {
 
     Query<Customer> query = parse("where 'Rob' <= name");
     query.findList();
@@ -72,7 +72,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void where_ieq() throws Exception {
+  public void where_ieq() {
 
     Query<Customer> query = parse("where name ieq 'Rob'");
     query.findList();
@@ -81,7 +81,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void where_ieq_reverse() throws Exception {
+  public void where_ieq_reverse() {
 
     Query<Customer> query = parse("where 'Rob' ieq name");
     query.findList();
@@ -89,7 +89,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void where_eq2() throws Exception {
+  public void where_eq2() {
 
     Query<Customer> query = parse("where name = 'Rob'");
     query.findList();
@@ -98,7 +98,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void where_namedParam() throws Exception {
+  public void where_namedParam() {
 
     Query<Customer> query = parse("where name eq :name");
     query.setParameter("name", "Rob");
@@ -117,7 +117,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void where_namedParam_startsWith() throws Exception {
+  public void where_namedParam_startsWith() {
 
     Query<Customer> query = parse("where name startsWith :name");
     query.setParameter("name", "Rob");
@@ -127,7 +127,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void where_or1() throws Exception {
+  public void where_or1() {
 
     Query<Customer> query = parse("where name = 'Rob' or (status = 'NEW' and smallnote is null)");
     query.findList();
@@ -136,7 +136,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void where_or2() throws Exception {
+  public void where_or2() {
 
     Query<Customer> query = parse("where (name = 'Rob' or status = 'NEW') and smallnote is null");
     query.findList();
@@ -145,7 +145,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void test_simplifyExpressions() throws Exception {
+  public void test_simplifyExpressions() {
 
     Query<Customer> query = parse("where not (name = 'Rob' and status = 'NEW')");
     query.findList();
@@ -162,7 +162,7 @@ public class EqlParserTest extends BaseTestCase {
 
 
   @Test
-  public void where_in() throws Exception {
+  public void where_in() {
 
     Query<Customer> query = parse("where name in ('Rob','Jim')");
     query.findList();
@@ -171,7 +171,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void where_in_when_namedParams() throws Exception {
+  public void where_in_when_namedParams() {
 
     Query<Customer> query = parse("where name in (:one, :two)");
     query.setParameter("one", "Foo");
@@ -182,7 +182,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void where_in_when_namedParams_withWhitespace() throws Exception {
+  public void where_in_when_namedParams_withWhitespace() {
 
     Query<Customer> query = parse("where name in (:one,  :two)");
     query.setParameter("one", "Foo");
@@ -193,7 +193,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void where_in_when_namedParams_withNoWhitespace() throws Exception {
+  public void where_in_when_namedParams_withNoWhitespace() {
 
     Query<Customer> query = parse("where name in (:one,:two)");
     query.setParameter("one", "Foo");
@@ -204,7 +204,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void where_in_when_namedParamAsList() throws Exception {
+  public void where_in_when_namedParamAsList() {
 
     Query<Customer> query = parse("where name in (:names)");
     query.setParameter("names", Arrays.asList("Baz", "Maz", "Jim"));
@@ -214,7 +214,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void where_between() throws Exception {
+  public void where_between() {
 
     Query<Customer> query = parse("where name between 'As' and 'B'");
     query.findList();
@@ -223,7 +223,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void where_between_withNamedParams() throws Exception {
+  public void where_between_withNamedParams() {
 
     Query<Customer> query = parse("where name between :one and :two");
     query.setParameter("one", "a");
@@ -234,7 +234,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void where_betweenProperty() throws Exception {
+  public void where_betweenProperty() {
 
     Query<Customer> query = parse("where 'x' between name and smallnote");
     query.findList();
@@ -243,7 +243,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void where_betweenProperty_withNamed() throws Exception {
+  public void where_betweenProperty_withNamed() {
 
     Query<Customer> query = parse("where :some between name and smallnote");
     query.setParameter("some", "A");
@@ -253,7 +253,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void fetch_basic() throws Exception {
+  public void fetch_basic() {
 
     Query<Customer> query = parse("fetch billingAddress");
     query.findList();
@@ -262,7 +262,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void fetch_withProperty() throws Exception {
+  public void fetch_withProperty() {
 
     Query<Customer> query = parse("fetch billingAddress (city)");
     query.findList();
@@ -271,7 +271,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void fetch_withProperty_noWhitespace() throws Exception {
+  public void fetch_withProperty_noWhitespace() {
 
     Query<Customer> query = parse("fetch billingAddress(city)");
     query.findList();
@@ -280,7 +280,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void fetch_basic_multiple() throws Exception {
+  public void fetch_basic_multiple() {
 
     Query<Customer> query = parse("fetch billingAddress fetch shippingAddress");
     query.findList();
@@ -290,7 +290,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void fetch_basic_multiple_withProperties() throws Exception {
+  public void fetch_basic_multiple_withProperties() {
 
     Query<Customer> query = parse("fetch billingAddress (city) fetch shippingAddress (city)");
     query.findList();
@@ -299,7 +299,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void fetch_lazy() throws Exception {
+  public void fetch_lazy() {
 
     Query<Customer> query = parse("fetch lazy billingAddress");
     query.findList();
@@ -308,7 +308,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void fetch_lazy50() throws Exception {
+  public void fetch_lazy50() {
 
     Query<Customer> query = parse("fetch lazy(50) billingAddress");
     query.findList();
@@ -317,7 +317,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void fetch_query50() throws Exception {
+  public void fetch_query50() {
 
     ResetBasicData.reset();
     Query<Customer> query = parse("fetch query(50) billingAddress");
@@ -327,7 +327,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void fetch_query50_asHint() throws Exception {
+  public void fetch_query50_asHint() {
 
     ResetBasicData.reset();
     Query<Customer> query = parse("fetch billingAddress (+query(50),city)");
@@ -337,7 +337,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void fetch_lazy50_asHint() throws Exception {
+  public void fetch_lazy50_asHint() {
 
     ResetBasicData.reset();
     Query<Customer> query = parse("fetch billingAddress (+lazy(50),city) order by id");
@@ -350,7 +350,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void select() throws Exception {
+  public void select() {
 
     ResetBasicData.reset();
 
@@ -360,7 +360,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void selectDistinct() throws Exception {
+  public void selectDistinct() {
 
     ResetBasicData.reset();
 
@@ -371,7 +371,7 @@ public class EqlParserTest extends BaseTestCase {
 
 
   @Test
-  public void limit() throws Exception {
+  public void limit() {
 
     ResetBasicData.reset();
 
@@ -383,7 +383,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void limitOffset() throws Exception {
+  public void limitOffset() {
 
     ResetBasicData.reset();
 
@@ -395,7 +395,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void orderBy() throws Exception {
+  public void orderBy() {
 
     ResetBasicData.reset();
 
@@ -407,7 +407,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void orderBy_desc() throws Exception {
+  public void orderBy_desc() {
 
     ResetBasicData.reset();
 
@@ -419,7 +419,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void orderBy_nullsLast() throws Exception {
+  public void orderBy_nullsLast() {
 
     if (!isPlatformOrderNullsSupport()) {
       return;
@@ -435,7 +435,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void orderBy_nullsFirst() throws Exception {
+  public void orderBy_nullsFirst() {
 
     if (!isPlatformOrderNullsSupport()) {
       return;
@@ -450,7 +450,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
-  public void orderBy_multiple() throws Exception {
+  public void orderBy_multiple() {
 
     if (!isPlatformOrderNullsSupport()) {
       return;
diff --git a/src/test/resources/EQL.g4 b/src/test/resources/EQL.g4
index da25a2851..4e021172b 100644
--- a/src/test/resources/EQL.g4
+++ b/src/test/resources/EQL.g4
@@ -1,21 +1,7 @@
 grammar EQL;
 
-@parser::members {
-  @Override
-  public void reportError(RecognitionException e) {
-    throw new RuntimeException("Error in grammer - " + e.getMessage());
-  }
-}
-
-@lexer::members {
-  @Override
-  public void reportError(RecognitionException e) {
-    throw new RuntimeException("Error in grammer - " + e.getMessage());
-  }
-}
-
 select_statement
-   : select_clause? fetch_clause* where_clause? orderby_clause? limit_clause?
+   : select_clause? fetch_clause* where_clause? orderby_clause? limit_clause? EOF
    ;
 
 select_clause

From 7e56a147be3008c84e78d7bf41d7c5f987a3b315 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 5 Mar 2018 07:29:40 +0100
Subject: [PATCH 0135/1036] FIX: ReadOnlyDatasource must also be configured
 (#1323)

---
 src/main/java/io/ebean/config/ServerConfig.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index b0b341fb8..0c6edcc64 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -2724,6 +2724,7 @@ public class ServerConfig {
    */
   protected void loadDataSourceSettings(PropertiesWrapper p) {
     dataSourceConfig.loadSettings(p.properties, name);
+    readOnlyDataSourceConfig.loadSettings(p.properties, name);
   }
 
   /**

From 5a3e386b7c699548d9dd7a91ce0225da7edeacfc Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 5 Mar 2018 19:59:40 +1300
Subject: [PATCH 0136/1036] No effective change - add test for selecting only
 some @Aggregation properties

---
 .../query/aggregation/TestAggregationCount.java      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/test/java/org/tests/query/aggregation/TestAggregationCount.java b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
index 778db90ef..abd586eb9 100644
--- a/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
+++ b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
@@ -111,6 +111,18 @@ public class TestAggregationCount extends BaseTestCase {
     assertThat(sql).contains(" order by sum(u1.units), t0.name");
   }
 
+  @Test
+  public void testSelectSome() {
+
+    Query<TEventOne> query0 = Ebean.find(TEventOne.class)
+      .select("name, count, totalUnits");
+
+    query0.findList();
+    String sql = sqlOf(query0, 5);
+    assertThat(sql).contains("select t0.id, t0.name, count(u1.id), sum(u1.units) from tevent_one t0");
+    assertThat(sql).contains("group by t0.id, t0.name");
+  }
+
   @Test
   public void testSelectOnly() {
 

From ec2c3b13d485b7294fe8753aaa1360e7a2f6e89b Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 6 Mar 2018 01:08:42 +1300
Subject: [PATCH 0137/1036] No effective change - add test for deploy parser

---
 .../deploy/DeployPropertyParserTest.java      | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java b/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java
index 1d6a9cafa..9c7369a46 100644
--- a/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.deploy;
 
 import io.ebean.BaseTestCase;
 import org.junit.Test;
+import org.tests.model.basic.Address;
 import org.tests.model.basic.Customer;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -11,6 +12,8 @@ public class DeployPropertyParserTest extends BaseTestCase {
 
   private final BeanDescriptor<Customer> descriptor = getBeanDescriptor(Customer.class);
 
+  private final BeanDescriptor<Address> addressBeanDescriptor = getBeanDescriptor(Address.class);
+
   @Test
   public void from_prefix_expect_unchanged() {
     assertThat(parser().parse("(select x from status join status)")).isEqualTo("(select x from status join status)");
@@ -31,6 +34,21 @@ public class DeployPropertyParserTest extends BaseTestCase {
     assertThat(parser().parse("max(billingAddress.country.name)")).isEqualTo("max(${billingAddress.country}name)");
   }
 
+  @Test
+  public void simpleMax() {
+    assertThat(parser().parse("max(name)")).isEqualTo("max(${}name)");
+  }
+
+  @Test
+  public void combined() {
+    assertThat(parser().parse("sum(status * name)")).isEqualTo("sum(${}status * ${}name)");
+  }
+
+  @Test
+  public void combined_withAtColumn() {
+    assertThat(adddressParser().parse("concat(line1, line2, '-EA')")).isEqualTo("concat(${}line_1, ${}line_2, '-EA')");
+  }
+
   @Test
   public void unknown_path() {
     assertThat(parser().parse(" foo ")).isEqualTo(" foo ");
@@ -39,5 +57,9 @@ public class DeployPropertyParserTest extends BaseTestCase {
   private DeployPropertyParser parser() {
     return descriptor.createDeployPropertyParser();
   }
+  
+  private DeployPropertyParser adddressParser() {
+    return addressBeanDescriptor.createDeployPropertyParser();
+  }
 
 }

From 3ca4efc818cd3a3331bf606f7bd8f1a29447e76a Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 6 Mar 2018 12:58:43 +1300
Subject: [PATCH 0138/1036] #1331 - ENH: Support Aggregation formula with
 findSingleAttribute() ... max, min, avg, count and count(distinct ..)

---
 .../server/deploy/BeanDescriptor.java         |  42 ++++
 .../server/deploy/BeanDescriptorManager.java  |  12 +-
 .../server/deploy/BeanDescriptorMap.java      |   6 +
 .../server/deploy/BeanProperty.java           |   8 +-
 .../server/deploy/DbSqlContext.java           |   5 +
 .../server/deploy/DeployParser.java           |  15 +-
 .../deploy/DeployPropertyParserMap.java       |   2 +-
 .../server/deploy/DetermineAggPath.java       |   4 +
 .../DynamicPropertyAggregationFormula.java    |  52 +++++
 .../server/deploy/DynamicPropertyBase.java    |  70 ++++++
 .../server/deploy/FormulaPropertyPath.java    |  89 ++++++++
 .../deploy/meta/DeployBeanDescriptor.java     |  55 ++++-
 .../deploy/meta/DeployBeanProperty.java       |  24 +-
 .../server/query/DefaultDbSqlContext.java     |  12 +-
 .../server/query/SqlBeanLoad.java             |  17 ++
 .../server/query/SqlTreeBuilder.java          |   4 +-
 .../server/query/SqlTreeNodeBean.java         |  23 +-
 .../server/query/SqlTreeProperties.java       |  27 ++-
 .../server/query/SqlTreeProperty.java         |  76 +++++++
 .../deploy/FormulaPropertyPathTest.java       |  35 +++
 .../org/tests/model/tevent/TEventOne.java     |  26 ++-
 .../aggregation/TestAggregationCount.java     | 215 +++++++++++++++++-
 .../query/other/TestQuerySingleAttribute.java |  15 ++
 23 files changed, 783 insertions(+), 51 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
 create mode 100644 src/main/java/io/ebeaninternal/server/query/SqlTreeProperty.java
 create mode 100644 src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 36330994a..2552d2600 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -62,11 +62,13 @@ import io.ebeaninternal.server.el.ElPropertyValue;
 import io.ebeaninternal.server.persist.DmlUtil;
 import io.ebeaninternal.server.query.CQueryPlan;
 import io.ebeaninternal.server.query.CQueryPlanStatsCollector;
+import io.ebeaninternal.server.query.SqlTreeProperty;
 import io.ebeaninternal.server.querydefn.OrmQueryDetail;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
 import io.ebeaninternal.server.text.json.ReadJson;
 import io.ebeaninternal.server.text.json.SpiJsonWriter;
 import io.ebeaninternal.server.type.DataBind;
+import io.ebeaninternal.server.type.ScalarType;
 import io.ebeaninternal.util.SortByClause;
 import io.ebeaninternal.util.SortByClauseParser;
 import io.ebeanservice.docstore.api.DocStoreBeanAdapter;
@@ -112,6 +114,8 @@ public class BeanDescriptor<T> implements BeanType<T> {
 
   private final ConcurrentHashMap<String, ElComparator<T>> comparatorCache = new ConcurrentHashMap<>();
 
+  private final ConcurrentHashMap<String, SqlTreeProperty> dynamicProperty = new ConcurrentHashMap<>();
+
   private final Map<String, SpiRawSql> namedRawSql;
 
   private final Map<String, String> namedQuery;
@@ -1055,6 +1059,13 @@ public class BeanDescriptor<T> implements BeanType<T> {
     return owner.getEncryptKey(tableName, columnName);
   }
 
+  /**
+   * Return the Scalar type for the given JDBC type.
+   */
+  public ScalarType<?> getScalarType(int jdbcType) {
+    return owner.getScalarType(jdbcType);
+  }
+
   /**
    * Return true if this bean type has a default select clause that is not
    * simply select all properties.
@@ -2437,6 +2448,37 @@ public class BeanDescriptor<T> implements BeanType<T> {
     return null;
   }
 
+  /**
+   * Return a 'dynamic property' used to read a formula.
+   */
+  private SqlTreeProperty findSqlTreeFormula(String formulaExpression) {
+
+    return dynamicProperty.computeIfAbsent(formulaExpression, (formula) -> {
+      FormulaPropertyPath propertyFormula = new FormulaPropertyPath(formula);
+      if (!propertyFormula.isFormula()) {
+        throw new IllegalStateException("unable to parse formula [" + formula + "} on bean type " + fullName);
+      }
+      String baseName = propertyFormula.basePropertyName();
+      BeanProperty base = _findBeanProperty(baseName);
+      if (base == null) {
+        throw new IllegalStateException("unable to find property [" + baseName + "] from formula [" + formula + "} on bean type " + fullName);
+      }
+      return propertyFormula.formulaProperty(base);
+    });
+  }
+
+  /**
+   * Return a property that is part of the SQL tree.
+   *
+   * The property can be a dynamic formula or a well known bean property.
+   */
+  public SqlTreeProperty findSqlTreeProperty(String propName) {
+    if (propName.indexOf('(') > -1) {
+      return findSqlTreeFormula(propName);
+    }
+    return _findBeanProperty(propName);
+  }
+
   /**
    * Find a BeanProperty including searching the inheritance hierarchy.
    * <p>
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 618183220..9d8c6fbe6 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -52,7 +52,9 @@ import io.ebeaninternal.server.properties.BeanPropertiesReader;
 import io.ebeaninternal.server.properties.BeanPropertyAccess;
 import io.ebeaninternal.server.properties.EnhanceBeanPropertyAccess;
 import io.ebeaninternal.server.query.CQueryPlan;
+import io.ebeaninternal.server.type.ScalarType;
 import io.ebeaninternal.server.type.ScalarTypeInteger;
+import io.ebeaninternal.server.type.TypeManager;
 import io.ebeaninternal.xmlmapping.XmlMappingReader;
 import io.ebeaninternal.xmlmapping.model.XmAliasMapping;
 import io.ebeaninternal.xmlmapping.model.XmColumnMapping;
@@ -139,6 +141,8 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
   private final MultiValueBind multiValueBind;
 
+  private final TypeManager typeManager;
+
   private int entityBeanCount;
 
   private final boolean updateChangesOnly;
@@ -222,6 +226,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     this.dbIdentity = config.getDatabasePlatform().getDbIdentity();
     this.deplyInherit = config.getDeployInherit();
     this.deployUtil = config.getDeployUtil();
+    this.typeManager = deployUtil.getTypeManager();
 
     this.beanManagerFactory = new BeanManagerFactory(config.getDatabasePlatform());
 
@@ -260,6 +265,11 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     }
   }
 
+  @Override
+  public ScalarType<?> getScalarType(int jdbcType) {
+    return typeManager.getScalarType(jdbcType);
+  }
+
   /**
    * Return the AsOfViewSuffix based on the DbHistorySupport.
    */
@@ -1463,7 +1473,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
         prop.setGetter(beanPropertyAccess.getGetter(propertyIndex));
         prop.setSetter(beanPropertyAccess.getSetter(propertyIndex));
         if (prop.isAggregation()) {
-          prop.setAggregationPrefix(DetermineAggPath.manyPath(prop.getAggregation(), desc));
+          prop.setAggregationPrefix(DetermineAggPath.manyPath(prop.getRawAggregation(), desc));
         }
       }
     }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorMap.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorMap.java
index 2cb357a2e..9d8387565 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorMap.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorMap.java
@@ -6,6 +6,7 @@ import io.ebean.config.ServerConfig;
 import io.ebeaninternal.server.cache.SpiCacheManager;
 import io.ebeaninternal.server.deploy.id.IdBinder;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
+import io.ebeaninternal.server.type.ScalarType;
 import io.ebeanservice.docstore.api.DocStoreBeanAdapter;
 
 /**
@@ -60,4 +61,9 @@ public interface BeanDescriptorMap {
    * Create a doc store specific adapter for this bean type.
    */
   <T> DocStoreBeanAdapter<T> createDocStoreBeanAdapter(BeanDescriptor<T> descriptor, DeployBeanDescriptor<T> deploy);
+
+  /**
+   * Return the scalarType for the given JDBC type.
+   */
+  ScalarType<?> getScalarType(int jdbcType);
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 05e69add2..85f66e177 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -24,6 +24,7 @@ import io.ebeaninternal.server.properties.BeanPropertyGetter;
 import io.ebeaninternal.server.properties.BeanPropertySetter;
 import io.ebeaninternal.server.query.SqlBeanLoad;
 import io.ebeaninternal.server.query.SqlJoinType;
+import io.ebeaninternal.server.query.SqlTreeProperty;
 import io.ebeaninternal.server.text.json.ReadJson;
 import io.ebeaninternal.server.text.json.SpiJsonWriter;
 import io.ebeaninternal.server.type.DataBind;
@@ -55,7 +56,7 @@ import java.util.Set;
  * Description of a property of a bean. Includes its deployment information such
  * as database column mapping information.
  */
-public class BeanProperty implements ElPropertyValue, Property {
+public class BeanProperty implements ElPropertyValue, Property, SqlTreeProperty {
 
   private static final Logger logger = LoggerFactory.getLogger(BeanProperty.class);
 
@@ -321,7 +322,7 @@ public class BeanProperty implements ElPropertyValue, Property {
 
     this.dbColumn = tableAliasIntern(descriptor, deploy.getDbColumn(), false, null);
     this.dbComment = deploy.getDbComment();
-    this.aggregation = deploy.getAggregation();
+    this.aggregation = deploy.parseAggregation();
     this.sqlFormulaJoin = InternString.intern(deploy.getSqlFormulaJoin());
     this.sqlFormulaSelect = InternString.intern(deploy.getSqlFormulaSelect());
     this.formula = sqlFormulaSelect != null;
@@ -575,8 +576,7 @@ public class BeanProperty implements ElPropertyValue, Property {
   public void appendSelect(DbSqlContext ctx, boolean subQuery) {
 
     if (aggregation != null) {
-      ctx.appendRawColumn(aggregation);
-
+      ctx.appendFormulaSelect(aggregation);
     } else if (formula) {
       ctx.appendFormulaSelect(sqlFormulaSelect);
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java b/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java
index ff5402dbc..5b7e335f0 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java
@@ -64,6 +64,11 @@ public interface DbSqlContext {
    */
   void appendColumn(String column);
 
+  /**
+   * Parse and add formula with standard table alias replacement.
+   */
+  void appendParseSelect(String parseSelect);
+
   /**
    * Append a Sql Formula select. This converts the "${ta}" keyword to the
    * current table alias.
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java b/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java
index ff693b1ec..9d01766fa 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java
@@ -27,6 +27,8 @@ public abstract class DeployParser {
    */
   protected static final char PERIOD = '.';
 
+  protected static final char OPEN_BRACKET = '(';
+
   protected boolean encrypted;
 
   protected String source;
@@ -43,6 +45,8 @@ public abstract class DeployParser {
 
   protected char wordTerminator;
 
+  private StringBuilder wordBuffer;
+
   protected abstract String convertWord();
 
   public abstract String getDeployWord(String expression);
@@ -77,7 +81,9 @@ public abstract class DeployParser {
         priorWord = deployWord;
       }
       if (pos < sourceLength) {
-        sb.append(wordTerminator);
+        if (wordTerminator != OPEN_BRACKET) {
+          sb.append(wordTerminator);
+        }
         if (wordTerminator == SINGLE_QUOTE) {
           readLiteral();
         }
@@ -97,7 +103,7 @@ public abstract class DeployParser {
       return false;
     }
 
-    StringBuilder wordBuffer = new StringBuilder();
+    wordBuffer = new StringBuilder();
     wordBuffer.append(source.charAt(pos));
     while (++pos < sourceLength) {
       char ch = source.charAt(pos);
@@ -172,6 +178,11 @@ public abstract class DeployParser {
    * return true if the char is a letter, digit or underscore.
    */
   private boolean isWordPart(char ch) {
+    if (ch == OPEN_BRACKET) {
+      // include in the 'word' such that "count(" formula doesn't clash with property "count"
+      wordBuffer.append(ch);
+      return false;
+    }
     return Character.isLetterOrDigit(ch) || ch == UNDERSCORE || ch == PERIOD;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParserMap.java b/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParserMap.java
index 415ffd9d0..fc8aaadab 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParserMap.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParserMap.java
@@ -7,7 +7,7 @@ import java.util.Set;
 /**
  * Converts logical property names to database columns using a Map.
  */
-public final class DeployPropertyParserMap extends DeployParser {
+public class DeployPropertyParserMap extends DeployParser {
 
   private final Map<String, String> map;
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java b/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java
index 83608456b..fff0a1438 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java
@@ -12,6 +12,10 @@ class DetermineAggPath {
    */
   static String manyPath(String aggregation, DeployBeanDescriptor<?> desc) {
     DetermineAggPath.Path path = paths(aggregation);
+    if (path.length() == 1) {
+      // a top level aggregation (so here we need to exclude Id property)
+      return null;
+    }
     return path.getManyPath(0, desc);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
new file mode 100644
index 000000000..e7f55721e
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
@@ -0,0 +1,52 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebeaninternal.server.query.SqlBeanLoad;
+import io.ebeaninternal.server.type.ScalarType;
+
+import javax.persistence.PersistenceException;
+
+/**
+ * Dynamic property based on aggregation (max, min, avg, count).
+ */
+class DynamicPropertyAggregationFormula extends DynamicPropertyBase {
+
+  private final String parsedAggregation;
+
+  private final BeanProperty asTarget;
+
+  DynamicPropertyAggregationFormula(String name, ScalarType<?> scalarType, String parsedAggregation, BeanProperty asTarget) {
+    super(name, name, null, scalarType);
+    this.parsedAggregation = parsedAggregation;
+    this.asTarget = asTarget;
+  }
+
+  @Override
+  public String toString() {
+    return "DynamicPropertyFormula[" + parsedAggregation + "]";
+  }
+
+  @Override
+  public boolean isAggregation() {
+    return true;
+  }
+
+  @Override
+  public void load(SqlBeanLoad sqlBeanLoad) {
+
+    try {
+      Object value = scalarType.read(sqlBeanLoad.ctx().getDataReader());
+      if (asTarget != null) {
+        sqlBeanLoad.load(asTarget, value);
+      }
+
+    } catch (Exception e) {
+      throw new PersistenceException("Error loading on " + fullName, e);
+    }
+  }
+
+  @Override
+  public void appendSelect(DbSqlContext ctx, boolean subQuery) {
+    ctx.appendParseSelect(parsedAggregation);
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java
new file mode 100644
index 000000000..e0fae9d19
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java
@@ -0,0 +1,70 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebeaninternal.server.query.SqlJoinType;
+import io.ebeaninternal.server.query.SqlTreeProperty;
+import io.ebeaninternal.server.type.ScalarType;
+
+import java.util.List;
+
+/**
+ * Abstract base for dynamic properties.
+ */
+abstract class DynamicPropertyBase implements SqlTreeProperty {
+
+  final String name;
+  final String fullName;
+  final String elPrefix;
+  final ScalarType<?> scalarType;
+
+  public DynamicPropertyBase(String name, String fullName, String elPrefix, ScalarType<?> scalarType) {
+    this.name = name;
+    this.fullName = fullName;
+    this.elPrefix = elPrefix;
+    this.scalarType = scalarType;
+  }
+
+  @Override
+  public String getName() {
+    return name;
+  }
+
+  @Override
+  public String getFullBeanName() {
+    return fullName;
+  }
+
+  @Override
+  public boolean isId() {
+    return false;
+  }
+
+  @Override
+  public boolean isEmbedded() {
+    return false;
+  }
+
+  @Override
+  public String getElPrefix() {
+    return elPrefix;
+  }
+
+  @Override
+  public ScalarType<?> getScalarType() {
+    return scalarType;
+  }
+
+  @Override
+  public void buildRawSqlSelectChain(String prefix, List<String> selectChain) {
+    // do nothing, only for RawSql
+  }
+
+  @Override
+  public void loadIgnore(DbReadContext ctx) {
+    scalarType.loadIgnore(ctx.getDataReader());
+  }
+
+  @Override
+  public void appendFrom(DbSqlContext ctx, SqlJoinType joinType) {
+    // do not add to from usually
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java b/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
new file mode 100644
index 000000000..bb350f536
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
@@ -0,0 +1,89 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebeaninternal.server.query.SqlTreeProperty;
+import io.ebeaninternal.server.type.ScalarType;
+
+import java.sql.Types;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+class FormulaPropertyPath {
+
+  private static final Pattern pattern = Pattern.compile("(max|min|avg|count)\\((.*)\\)");
+
+  private static final String DISTINCT_ = "distinct ";
+
+  private final String aggType;
+
+  private final String baseName;
+
+  private boolean countDistinct;
+
+  FormulaPropertyPath(String propName) {
+
+    Matcher matcher = pattern.matcher(propName);
+    if (matcher.find()) {
+      aggType = matcher.group(1);
+      baseName = trimDistinct(matcher.group(2));
+
+    } else {
+      aggType = null;
+      baseName = null;
+    }
+  }
+
+  private String trimDistinct(String propertyName) {
+    if (propertyName.startsWith(DISTINCT_)){
+      countDistinct = true;
+      return propertyName.substring(DISTINCT_.length());
+    } else {
+      return propertyName;
+    }
+  }
+
+  boolean isFormula() {
+    return aggType != null;
+  }
+
+  String aggType() {
+    return aggType;
+  }
+
+  String basePropertyName() {
+    return baseName;
+  }
+
+  /**
+   * Create a bean property dynamically for the formula in the select clause.
+   */
+  SqlTreeProperty formulaProperty(BeanProperty base) {
+
+    String parsedAggregation = buildFormula(base);
+    String name = logicalName();
+
+    ScalarType<?> scalarType = base.getScalarType();
+    if (isCount()) {
+      // count maps to Long / BIGINT
+      scalarType = base.getBeanDescriptor().getScalarType(Types.BIGINT);
+    }
+
+    return new DynamicPropertyAggregationFormula(name, scalarType, parsedAggregation, null);
+  }
+
+  private String buildFormula(BeanProperty base) {
+    if (countDistinct) {
+      return "count(distinct ${}"+base.getDbColumn()+")";
+    } else {
+      return aggType+"(${}"+base.getDbColumn()+")";
+    }
+  }
+
+  private boolean isCount() {
+    return aggType.equals("count");
+  }
+
+  private String logicalName() {
+    return aggType+Character.toUpperCase(baseName.charAt(0))+baseName.substring(1);
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index cfd837967..1df0d8ffd 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -25,6 +25,7 @@ import io.ebeaninternal.server.deploy.ChainedBeanPersistListener;
 import io.ebeaninternal.server.deploy.ChainedBeanPostConstructListener;
 import io.ebeaninternal.server.deploy.ChainedBeanPostLoad;
 import io.ebeaninternal.server.deploy.ChainedBeanQueryAdapter;
+import io.ebeaninternal.server.deploy.DeployPropertyParserMap;
 import io.ebeaninternal.server.deploy.IndexDefinition;
 import io.ebeaninternal.server.deploy.InheritInfo;
 import io.ebeaninternal.server.deploy.TableJoin;
@@ -849,18 +850,18 @@ public class DeployBeanDescriptor<T> {
     this.idGeneratorName = PlatformIdGenerator.AUTO_UUID;
 
     switch (serverConfig.getUuidVersion()) {
-    case VERSION1:
-      this.idGenerator = UuidV1IdGenerator.getInstance(serverConfig.getUuidStateFile());
-      break;
+      case VERSION1:
+        this.idGenerator = UuidV1IdGenerator.getInstance(serverConfig.getUuidStateFile());
+        break;
 
-    case VERSION1RND:
-      this.idGenerator = UuidV1RndIdGenerator.INSTANCE;
-      break;
+      case VERSION1RND:
+        this.idGenerator = UuidV1RndIdGenerator.INSTANCE;
+        break;
 
-    case VERSION4:
-    default:
-      this.idGenerator = UuidV4IdGenerator.INSTANCE;
-      break;
+      case VERSION4:
+      default:
+        this.idGenerator = UuidV4IdGenerator.INSTANCE;
+        break;
     }
   }
 
@@ -1168,4 +1169,38 @@ public class DeployBeanDescriptor<T> {
     }
     namedRawSql.put(name, rawSql);
   }
+
+  /**
+   * Parse the aggregation formula into expressions with table alias placeholders.
+   */
+  public String parse(String aggregation) {
+    return new Parser(this).parse(aggregation);
+  }
+
+  /**
+   * Parser for top level properties into EL expressions (table alias placeholders).
+   */
+  private static class Parser extends DeployPropertyParserMap {
+
+    private final DeployBeanDescriptor<?> descriptor;
+
+    Parser(DeployBeanDescriptor<?> descriptor) {
+      super(null);
+      this.descriptor = descriptor;
+    }
+
+    public String getDeployWord(String expression) {
+      return descriptor.getDeployWord(expression);
+    }
+  }
+
+  private String getDeployWord(String expression) {
+    if (expression.charAt(expression.length() - 1) == '(') {
+      return null;
+    }
+    // use 'current' table alias - refer BeanProperty appendSelect() for aggregation
+    DeployBeanProperty property = propMap.get(expression);
+    return (property == null) ? null : "${ta}." + property.getDbColumn();
+  }
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
index 5e2cfa517..a363fdbdd 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
@@ -175,6 +175,7 @@ public class DeployBeanProperty {
 
   private String aggregationPrefix;
   private String aggregation;
+  private String aggregationParsed;
 
   private String sqlFormulaSelect;
   private String sqlFormulaJoin;
@@ -615,10 +616,23 @@ public class DeployBeanProperty {
     return aggregation != null;
   }
 
-  public String getAggregation() {
+  /**
+   * Get the raw/logical aggregation formula.
+   */
+  public String getRawAggregation() {
     return aggregation;
   }
 
+  /**
+   * Get the parsed aggregation formula with table alias placeholders.
+   */
+  public String parseAggregation() {
+    if (aggregation != null) {
+      aggregationParsed = desc.parse(aggregation);
+    }
+    return aggregationParsed;
+  }
+
   public void setAggregation(String aggregation) {
     this.aggregation = aggregation;
     this.dbRead = true;
@@ -629,9 +643,9 @@ public class DeployBeanProperty {
   /**
    * Set the path to the aggregation.
    */
-  public void setAggregationPrefix(String aggregationPrefix) {
-    this.aggregationPrefix = aggregationPrefix;
-    this.aggregation = aggregation.replace(aggregationPrefix, "u1");
+  public void setAggregationPrefix(String prefix) {
+    this.aggregationPrefix = prefix;
+    this.aggregation = (prefix == null) ? aggregation : aggregation.replace(aggregationPrefix, "u1");
   }
 
   public String getElPrefix() {
@@ -644,7 +658,7 @@ public class DeployBeanProperty {
 
   public String getElPlaceHolder() {
     if (aggregation != null) {
-      return aggregation;
+      return aggregationParsed;
     } else if (sqlFormulaSelect != null) {
       return sqlFormulaSelect;
     } else {
diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java b/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
index a2138104b..dfb611e14 100644
--- a/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
+++ b/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
@@ -273,13 +273,19 @@ class DefaultDbSqlContext implements DbSqlContext {
     sb.append(" ");
   }
 
+  @Override
+  public void appendParseSelect(String parseSelect) {
+    String converted = alias.parse(parseSelect);
+    sb.append(COMMA);
+    sb.append(converted);
+    appendColumnAlias();
+  }
+
   @Override
   public void appendFormulaSelect(String sqlFormulaSelect) {
 
     String tableAlias = tableAliasStack.peek();
-    String converted = StringHelper.replaceString(sqlFormulaSelect, tableAliasPlaceHolder,
-      tableAlias);
-
+    String converted = StringHelper.replaceString(sqlFormulaSelect, tableAliasPlaceHolder, tableAlias);
     sb.append(COMMA);
     sb.append(converted);
 
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java b/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java
index fc851f006..b5855576d 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java
@@ -44,6 +44,13 @@ public class SqlBeanLoad {
     return lazyLoading;
   }
 
+  /**
+   * Return the DB read context.
+   */
+  public DbReadContext ctx() {
+    return ctx;
+  }
+
   /**
    * Increment the resultSet index 1.
    */
@@ -86,4 +93,14 @@ public class SqlBeanLoad {
     }
   }
 
+  /**
+   * Load the given value into the property.
+   */
+  public void load(BeanProperty target, Object dbVal) {
+    if (!refreshLoading) {
+      target.setValue(bean, dbVal);
+    } else {
+      target.setValueIntercept(bean, dbVal);
+    }
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 5a26fcc5d..1c572cf91 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -418,7 +418,7 @@ public final class SqlTreeBuilder {
 
       // make sure we only included the base/embedded bean once
       if (!selectProps.containsProperty(baseName)) {
-        BeanProperty p = desc.findBeanProperty(baseName);
+        SqlTreeProperty p = desc.findSqlTreeProperty(baseName);
         if (p == null) {
           logger.error("property [" + propName + "] not found on " + desc + " for query - excluding it.");
 
@@ -436,7 +436,7 @@ public final class SqlTreeBuilder {
     } else {
       // find the property including searching the
       // sub class hierarchy if required
-      BeanProperty p = desc.findBeanProperty(propName);
+      SqlTreeProperty p = desc.findSqlTreeProperty(propName);
       if (p == null) {
         logger.error("property [" + propName + "] not found on " + desc + " for query - excluding it.");
         p = desc.findBeanProperty("id");
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
index 3d16f8ff2..806e64adb 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
@@ -48,7 +48,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
    */
   private final boolean partialObject;
 
-  protected final BeanProperty[] properties;
+  protected final SqlTreeProperty[] properties;
 
   /**
    * Extra where clause added by Where annotation on associated many.
@@ -87,6 +87,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
   private boolean intersectionAsOfTableAlias;
 
   private final boolean aggregation;
+  private final boolean aggregationRoot;
 
   /**
    * Construct for leaf node.
@@ -124,13 +125,15 @@ class SqlTreeNodeBean implements SqlTreeNode {
     this.nodeBeanProp = beanProp;
     this.extraWhere = (beanProp == null) ? null : beanProp.getExtraWhere();
 
+    this.aggregation = props.isAggregation();
+    this.aggregationRoot = props.isAggregationRoot();
+
     // the bean has an Id property and we want to use it
-    this.readId = withId && (desc.getIdProperty() != null);
+    this.readId = !aggregationRoot && withId && (desc.getIdProperty() != null);
     this.disableLazyLoad = disableLazyLoad || !readId || desc.isRawSqlBased() || temporalVersions;
 
     this.partialObject = props.isPartialObject();
     this.properties = props.getProps();
-    this.aggregation = props.isAggregation();
     this.children = myChildren == null ? NO_CHILDREN : myChildren.toArray(new SqlTreeNode[myChildren.size()]);
 
     pathMap = createPathMap(prefix, desc);
@@ -186,7 +189,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
       }
       idBinder.buildRawSqlSelectChain(prefix, selectChain);
     }
-    for (BeanProperty property : properties) {
+    for (SqlTreeProperty property : properties) {
       property.buildRawSqlSelectChain(prefix, selectChain);
     }
     // recursively continue reading...
@@ -289,14 +292,14 @@ class SqlTreeNodeBean implements SqlTreeNode {
 
     if (inheritInfo == null) {
       // normal behavior with no inheritance
-      for (BeanProperty property : properties) {
+      for (SqlTreeProperty property : properties) {
         property.load(sqlBeanLoad);
       }
 
     } else {
       // take account of inheritance and due to subclassing approach
       // need to get a 'local' version of the property
-      for (BeanProperty property : properties) {
+      for (SqlTreeProperty property : properties) {
         // get a local version of the BeanProperty
         BeanProperty p = localDesc.getBeanProperty(property.getName());
         if (p != null) {
@@ -416,7 +419,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
     if (readId) {
       appendSelectId(ctx, idBinder.getBeanProperty());
     }
-    for (BeanProperty property : properties) {
+    for (SqlTreeProperty property : properties) {
       if (!property.isAggregation()) {
         property.appendSelect(ctx, subQuery);
       }
@@ -483,9 +486,9 @@ class SqlTreeNodeBean implements SqlTreeNode {
   /**
    * Append the properties to the buffer.
    */
-  private void appendSelect(DbSqlContext ctx, boolean subQuery, BeanProperty[] props) {
+  private void appendSelect(DbSqlContext ctx, boolean subQuery, SqlTreeProperty[] props) {
 
-    for (BeanProperty prop : props) {
+    for (SqlTreeProperty prop : props) {
       prop.appendSelect(ctx, subQuery);
     }
   }
@@ -543,7 +546,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
     // join and return SqlJoinType to use for child joins
     joinType = appendFromBaseTable(ctx, joinType);
 
-    for (BeanProperty property : properties) {
+    for (SqlTreeProperty property : properties) {
       // usually nothing... except for 1-1 Exported
       property.appendFrom(ctx, joinType);
     }
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
index 9c762b7b8..9c717173e 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
@@ -1,7 +1,6 @@
 package io.ebeaninternal.server.query;
 
 import io.ebeaninternal.api.ManyWhereJoins;
-import io.ebeaninternal.server.deploy.BeanProperty;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -21,7 +20,7 @@ public class SqlTreeProperties {
   /**
    * The bean properties in order.
    */
-  private final List<BeanProperty> propsList = new ArrayList<>();
+  private final List<SqlTreeProperty> propsList = new ArrayList<>();
 
   /**
    * Maintain a list of property names to detect embedded bean additions.
@@ -32,6 +31,8 @@ public class SqlTreeProperties {
 
   private boolean aggregation;
 
+  private String aggregationPath;
+
   SqlTreeProperties() {
   }
 
@@ -39,17 +40,17 @@ public class SqlTreeProperties {
     return propNames.contains(propName);
   }
 
-  public void add(BeanProperty[] props) {
+  public void add(SqlTreeProperty[] props) {
     propsList.addAll(Arrays.asList(props));
   }
 
-  public void add(BeanProperty prop) {
+  public void add(SqlTreeProperty prop) {
     propsList.add(prop);
     propNames.add(prop.getName());
   }
 
-  public BeanProperty[] getProps() {
-    return propsList.toArray(new BeanProperty[propsList.size()]);
+  public SqlTreeProperty[] getProps() {
+    return propsList.toArray(new SqlTreeProperty[propsList.size()]);
   }
 
   boolean isPartialObject() {
@@ -77,7 +78,6 @@ public class SqlTreeProperties {
   boolean requireSqlDistinct(ManyWhereJoins manyWhereJoins) {
     String joinProperty = aggregationJoin();
     if (joinProperty != null) {
-      aggregation = true;
       manyWhereJoins.addAggregationJoin(joinProperty);
       return false;
     } else {
@@ -97,12 +97,21 @@ public class SqlTreeProperties {
    */
   private String aggregationJoin() {
     if (!allProperties) {
-      for (BeanProperty beanProperty : propsList) {
+      for (SqlTreeProperty beanProperty : propsList) {
         if (beanProperty.isAggregation()) {
-          return beanProperty.getElPrefix();
+          aggregation = true;
+          aggregationPath = beanProperty.getElPrefix();
+          return aggregationPath;
         }
       }
     }
     return null;
   }
+
+  /**
+   * Return true if a top level aggregation which means the Id property must be excluded.
+   */
+  public boolean isAggregationRoot() {
+    return aggregation && (aggregationPath == null);
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeProperty.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeProperty.java
new file mode 100644
index 000000000..2543cc825
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeProperty.java
@@ -0,0 +1,76 @@
+package io.ebeaninternal.server.query;
+
+import io.ebeaninternal.server.deploy.DbReadContext;
+import io.ebeaninternal.server.deploy.DbSqlContext;
+import io.ebeaninternal.server.type.ScalarType;
+
+import java.util.List;
+
+/**
+ * A property in the SQL Tree.
+ *
+ * A BeanProperty or a dynamically created property based on formula.
+ */
+public interface SqlTreeProperty {
+
+  /**
+   * Return the property name.
+   */
+  String getName();
+
+  /**
+   * Return the full property name (for error messages).
+   */
+  String getFullBeanName();
+
+  /**
+   * Return true if the property is the Id.
+   */
+  boolean isId();
+
+  /**
+   * Return true if the property is an embedded type.
+   */
+  boolean isEmbedded();
+
+  /**
+   * Return true if the property is an aggregation.
+   */
+  boolean isAggregation();
+
+  /**
+   * Return the Expression language prefix (join path).
+   */
+  String getElPrefix();
+
+  /**
+   * Return the underlying scalar type for the property (for findSingleAttribute).
+   */
+  ScalarType<?> getScalarType();
+
+  /**
+   * For RawSql build the select chain.
+   */
+  void buildRawSqlSelectChain(String prefix, List<String> selectChain);
+
+  /**
+   * Load into the bean (from the DataReader/ResultSet).
+   */
+  void load(SqlBeanLoad sqlBeanLoad);
+
+  /**
+   * Ignore the property (moving the column index position without reading).
+   */
+  void loadIgnore(DbReadContext ctx);
+
+  /**
+   * Append to the select clause.
+   */
+  void appendSelect(DbSqlContext ctx, boolean subQuery);
+
+  /**
+   * Append to the from clause.
+   */
+  void appendFrom(DbSqlContext ctx, SqlJoinType joinType);
+
+}
diff --git a/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java b/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java
new file mode 100644
index 000000000..c3d840603
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java
@@ -0,0 +1,35 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebean.BaseTestCase;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class FormulaPropertyPathTest extends BaseTestCase {
+
+  //private BeanDescriptor<Customer> customerDesc = getBeanDescriptor(Customer.class);
+
+  @Test
+  public void isFormula() {
+
+    assertFormula("max(foo)", "max", "foo");
+    assertFormula("min(bar)", "min", "bar");
+    assertFormula("avg(baz)", "avg", "baz");
+  }
+
+  @Test
+  public void isFormula_count() {
+    assertFormula("count(moo)", "count", "moo");
+    assertFormula("count(distinct joo)", "count", "joo");
+  }
+
+  private void assertFormula(String input, String aggType, String baseProperty) {
+
+    FormulaPropertyPath propertyPath = new FormulaPropertyPath(input);
+
+    assertThat(propertyPath.isFormula()).isTrue();
+    assertThat(propertyPath.basePropertyName()).isEqualTo(baseProperty);
+    assertThat(propertyPath.aggType()).isEqualTo(aggType);
+
+  }
+}
diff --git a/src/test/java/org/tests/model/tevent/TEventOne.java b/src/test/java/org/tests/model/tevent/TEventOne.java
index c5b1dbb01..88bc2e2fd 100644
--- a/src/test/java/org/tests/model/tevent/TEventOne.java
+++ b/src/test/java/org/tests/model/tevent/TEventOne.java
@@ -13,17 +13,27 @@ import java.util.List;
 @Entity
 public class TEventOne {
 
+  public enum Status {
+    AA,
+    BB
+  }
+
   @Id
   Long id;
 
   String name;
 
+  Status status;
+
   @Version
   Long version;
 
   @OneToOne
   TEvent event;
 
+  @Aggregation("max(version)")
+  Long maxVersion;
+
   @Aggregation("count(logs.id)")
   Long count;
 
@@ -36,8 +46,14 @@ public class TEventOne {
   @OneToMany(mappedBy = "event", cascade = CascadeType.ALL)
   List<TEventMany> logs;
 
-  public TEventOne(String name) {
+  public TEventOne(String name, Status status) {
     this.name = name;
+    this.status = status;
+  }
+
+  @Override
+  public String toString() {
+    return "id:" + id + " name:" + name + " status:" + status + " mv:" + maxVersion + " ct:" + count;
   }
 
   public Long getId() {
@@ -60,10 +76,18 @@ public class TEventOne {
     return totalAmount;
   }
 
+  public Long getMaxVersion() {
+    return maxVersion;
+  }
+
   public String getName() {
     return name;
   }
 
+  public Status getStatus() {
+    return status;
+  }
+
   public void setName(String name) {
     this.name = name;
   }
diff --git a/src/test/java/org/tests/query/aggregation/TestAggregationCount.java b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
index abd586eb9..34c231b26 100644
--- a/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
+++ b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
@@ -3,11 +3,18 @@ package org.tests.query.aggregation;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import org.assertj.core.api.Assertions;
+import org.ebeantest.LoggedSqlCollector;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.tests.model.basic.Contact;
+import org.tests.model.basic.Order;
+import org.tests.model.basic.OrderDetail;
+import org.tests.model.basic.ResetBasicData;
 import org.tests.model.tevent.TEventMany;
 import org.tests.model.tevent.TEventOne;
 
+import java.sql.Timestamp;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -16,17 +23,23 @@ public class TestAggregationCount extends BaseTestCase {
 
   @BeforeClass
   public static void setup() {
-    TEventOne one = new TEventOne("first");
+    TEventOne one = new TEventOne("first", TEventOne.Status.AA);
     one.getLogs().add(new TEventMany("all", 1, 10));
     one.getLogs().add(new TEventMany("be", 2, 12.2));
     one.getLogs().add(new TEventMany("add", 3, 13));
     Ebean.save(one);
 
-    TEventOne two = new TEventOne("second");
+    TEventOne two = new TEventOne("second", TEventOne.Status.AA);
     two.getLogs().add(new TEventMany("at", 10, 10));
     two.getLogs().add(new TEventMany("add", 30, 13));
     two.getLogs().add(new TEventMany("alf", 30, 13));
     Ebean.save(two);
+
+    TEventOne three = new TEventOne("thrird", TEventOne.Status.BB);
+    Ebean.save(three);
+    three.setName("third");
+    Ebean.save(three);
+
   }
 
   @Test
@@ -36,7 +49,7 @@ public class TestAggregationCount extends BaseTestCase {
     List<TEventOne> list = query.findList();
 
     String sql = sqlOf(query, 5);
-    assertThat(sql).contains("select t0.id, t0.name, t0.version, t0.event_id from tevent_one t0");
+    assertThat(sql).contains("select t0.id, t0.name, t0.status, t0.version, t0.event_id from tevent_one t0");
 
     for (TEventOne eventOne : list) {
       // lazy loading on Aggregation properties
@@ -172,4 +185,200 @@ public class TestAggregationCount extends BaseTestCase {
     assertThat(sql).contains("select t0.id, t0.name, count(u1.id), t1.id, t1.name from tevent_one t0 left join tevent t1 on t1.id = t0.event_id  join tevent_many u1 on u1.event_id = t0.id ");
     assertThat(sql).contains("group by t0.id, t0.name, t1.id, t1.name");
   }
+
+  @Test
+  public void testTopLevelAggregation() {
+
+    Query<TEventOne> query0 = Ebean.find(TEventOne.class)
+      .select("status, maxVersion")
+      .where().isNotNull("name")
+      .having().ge("maxVersion", 1)
+      .query();
+
+    List<TEventOne> list = query0.findList();
+
+    String sql = sqlOf(query0, 5);
+    assertThat(sql).contains("select t0.status, max(t0.version) from tevent_one t0");
+    assertThat(sql).contains("where t0.name is not null");
+    assertThat(sql).contains("group by t0.status");
+    assertThat(sql).contains("having max(t0.version) >= ?");
+
+
+    LoggedSqlCollector.start();
+
+    for (TEventOne eventOne : list) {
+      assertThat(eventOne.getStatus()).isNotNull();
+      assertThat(eventOne.getMaxVersion()).isNotNull();
+
+      // bean has no Id, so it is not in Persistence Context, nor Load context
+      assertThat(eventOne.getId()).isNull();
+      // ... and it will not invoke lazy loading
+      assertThat(eventOne.getName()).isNull();
+    }
+
+    List<String> lazyLoadSql = LoggedSqlCollector.stop();
+    assertThat(lazyLoadSql).isEmpty();
+  }
+
+  @Test
+  public void testDynamicSingleAttributeAggregation() {
+
+    ResetBasicData.reset();
+
+    Query<Order> query0 = Ebean.find(Order.class)
+      .select("max(updtime)")
+      .where().eq("status", Order.Status.NEW)
+      .query();
+
+    Timestamp maxUpdateTime = query0.findSingleAttribute();
+    System.out.println(""+maxUpdateTime);
+    assertThat(maxUpdateTime).isNotNull();
+
+    String sql = sqlOf(query0, 5);
+    assertThat(sql).contains("select max(t0.updtime) from o_order t0");
+
+    Timestamp maxNotNew = Ebean.find(Order.class)
+      .select("max(updtime)")
+      .where().ne("status", Order.Status.NEW)
+      .findSingleAttribute();
+
+    assertThat(maxNotNew).isNotNull();
+
+  }
+
+  @Test
+  public void testDynamicSingleAttributeAggregation_maxInteger() {
+
+    ResetBasicData.reset();
+
+    Query<OrderDetail> query = Ebean.find(OrderDetail.class)
+      .select("max(orderQty)");
+
+    Integer maxOrderQty = query.findSingleAttribute();
+    System.out.println(""+maxOrderQty);
+    Assertions.assertThat(maxOrderQty).isGreaterThan(20);
+
+    String sql = sqlOf(query, 5);
+    assertThat(sql).contains("select max(t0.order_qty) from o_order_detail t0");
+  }
+
+  @Test
+  public void testDynamicSingleAttributeAggregation_minInteger() {
+
+    ResetBasicData.reset();
+
+    Query<OrderDetail> query = Ebean.find(OrderDetail.class)
+      .select("min(orderQty)");
+
+    Integer minOrderQty = query.findSingleAttribute();
+    System.out.println(""+minOrderQty);
+    assertThat(minOrderQty).isLessThan(10);
+
+    String sql = sqlOf(query, 5);
+    assertThat(sql).contains("select min(t0.order_qty) from o_order_detail t0");
+  }
+
+  @Test
+  public void testDynamicSingleAttributeAggregation_maxString() {
+
+    ResetBasicData.reset();
+
+    Query<Contact> query = Ebean.find(Contact.class)
+      .select("max(lastName)");
+
+    String maxName = query.findSingleAttribute();
+    System.out.println(""+maxName);
+
+    String sql = sqlOf(query, 5);
+    assertThat(sql).contains("select max(t0.last_name) from contact t0");
+  }
+
+  @Test
+  public void testDynamicSingleAttributeAggregation_minString() {
+
+    ResetBasicData.reset();
+
+    Query<Contact> query = Ebean.find(Contact.class)
+      .select("min(firstName)");
+
+    String minName = query.findSingleAttribute();
+    System.out.println(""+minName);
+    assertThat(minName).isNotNull();
+
+    String sql = sqlOf(query, 5);
+    assertThat(sql).contains("select min(t0.first_name) from contact t0");
+  }
+
+
+  @Test
+  public void testDynamicSingleAttributeAggregation_count() {
+
+    ResetBasicData.reset();
+
+    Query<Contact> query = Ebean.find(Contact.class)
+      .select("count(lastName)");
+
+    Long count = query.findSingleAttribute();
+    System.out.println(""+count);
+    assertThat(count).isNotNull();
+
+    String sql = sqlOf(query, 5);
+    assertThat(sql).contains("select count(t0.last_name) from contact t0");
+  }
+
+  @Test
+  public void testDynamicSingleAttributeAggregation_countDistinct() {
+
+    ResetBasicData.reset();
+
+    Query<Contact> query = Ebean.find(Contact.class)
+      .select("count(distinct lastName)");
+
+    Long count = query.findSingleAttribute();
+    System.out.println(""+count);
+    assertThat(count).isNotNull();
+
+    String sql = sqlOf(query, 5);
+    assertThat(sql).contains("select count(distinct t0.last_name) from contact t0");
+  }
+
+  @Test
+  public void example() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    String maxLastName =
+      Ebean.find(Contact.class)
+      .select("max(lastName)")
+      .where().isNull("phone")
+      .findSingleAttribute();
+
+    assertThat(maxLastName).isNotNull();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select max(t0.last_name) from contact t0");
+  }
+
+  @Test
+  public void example_countDistinct() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    Long count =
+      Ebean.find(Contact.class)
+      .select("count(distinct lastName)")
+      .where().isEmpty("notes")
+      .findSingleAttribute();
+
+    System.out.println(""+count);
+    assertThat(count).isNotNull();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select count(distinct t0.last_name) from contact t0 where not exists (select 1 from contact_note x where x.contact_id = t0.id)");
+  }
+
 }
diff --git a/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
index ade6d2a91..ff482a03e 100644
--- a/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
+++ b/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
@@ -99,6 +99,21 @@ public class TestQuerySingleAttribute extends BaseTestCase {
     assertThat(name).isNotNull();
   }
 
+  @Test
+  public void findSingleAttribute_with_aggregate() {
+
+    ResetBasicData.reset();
+
+    Query<Customer> query = Ebean.find(Customer.class)
+      .select("max(name)")
+      .where().gt("id", 1).query();
+
+    String name = query.findSingleAttribute();
+
+    assertThat(sqlOf(query)).contains("select max(t0.name) from o_customer t0");
+    assertThat(name).isNotNull();
+  }
+
   @Test
   public void findSingleAttribute_viaExpression() {
 

From 05b8adbf6e7ccf0d6f654dbe15bab09c9a30f97f Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 6 Mar 2018 16:37:47 +1300
Subject: [PATCH 0139/1036] No effective change - change test from extends
 testcase to normal junit

---
 .../server/rawsql/TestRawSqlColumnParsing.java       | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java b/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java
index c24d47b6d..b9b5175db 100644
--- a/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java
+++ b/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java
@@ -2,12 +2,15 @@ package io.ebeaninternal.server.rawsql;
 
 import io.ebeaninternal.server.rawsql.SpiRawSql.ColumnMapping;
 import io.ebeaninternal.server.rawsql.SpiRawSql.ColumnMapping.Column;
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import java.util.Map;
 
-public class TestRawSqlColumnParsing extends TestCase {
+import static org.junit.Assert.assertEquals;
 
+public class TestRawSqlColumnParsing {
+
+  @Test
   public void test_simple() {
 
     ColumnMapping columnMapping = DRawSqlColumnsParser.parse("a,b,c");
@@ -30,6 +33,7 @@ public class TestRawSqlColumnParsing extends TestCase {
 
   }
 
+  @Test
   public void test_simpleWithSpacing() {
 
     ColumnMapping columnMapping = DRawSqlColumnsParser.parse(" a  ,  b    ,  c   ");
@@ -52,6 +56,7 @@ public class TestRawSqlColumnParsing extends TestCase {
 
   }
 
+  @Test
   public void test_withAlias() {
 
     ColumnMapping columnMapping = DRawSqlColumnsParser.parse("a a0,b    b1, c  c2 ,   d    d3  , e  e4 ");
@@ -88,6 +93,7 @@ public class TestRawSqlColumnParsing extends TestCase {
 
   }
 
+  @Test
   public void test_withDatabaseFunction() {
 
     ColumnMapping columnMapping = DRawSqlColumnsParser.parse("a a0,b    b1, MONTH(MAKEDATE(2015, 241)) m2 ,   d    d3  , e  e4 ");
@@ -124,6 +130,7 @@ public class TestRawSqlColumnParsing extends TestCase {
 
   }
 
+  @Test
   public void test_withAsAlias() {
 
     ColumnMapping columnMapping = DRawSqlColumnsParser.parse("a as a0,'b'    b1, \"c(blah)\" as c2 ,   d as   d3  , e     as e4 ");
@@ -160,6 +167,7 @@ public class TestRawSqlColumnParsing extends TestCase {
 
   }
 
+  @Test
   public void test_doubleColon() {
 
     ColumnMapping columnMapping = DRawSqlColumnsParser.parse("a,MD5(id::text) as b,c");

From c1c85b67c28c22b17cef8062cdc7a4f8f6c145d3 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 6 Mar 2018 17:29:45 +1300
Subject: [PATCH 0140/1036] #1333 - ENH: Support "dynamic formula" with
 findSingleAttributeList() ... e.g. .select("concat(lastName,', ',firstName)")

---
 .../server/core/OrmQueryRequest.java          |  2 +-
 .../server/deploy/BeanDescriptor.java         | 17 +---
 .../server/deploy/DeployPropertyParser.java   | 22 +++++
 .../DynamicPropertyAggregationFormula.java    | 15 ++--
 .../server/deploy/FormulaPropertyPath.java    | 85 +++++++++++--------
 .../querydefn/OrmQueryPropertiesParser.java   | 13 ++-
 .../server/rawsql/DRawSqlColumnsParser.java   | 40 +++------
 .../server/util/DSelectColumnsParser.java     | 55 ++++++++++++
 .../deploy/DeployPropertyParserTest.java      | 10 +--
 .../deploy/FormulaPropertyPathTest.java       | 26 ++++--
 .../server/util/DSelectColumnsParserTest.java | 60 +++++++++++++
 .../aggregation/TestAggregationCount.java     | 21 +++++
 12 files changed, 266 insertions(+), 100 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/util/DSelectColumnsParser.java
 create mode 100644 src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java

diff --git a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index 7df2185b3..490e53762 100644
--- a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -222,7 +222,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
     if (query.isRawSql()) {
       return new DeployPropertyParserMap(query.getRawSql().getColumnMapping().getMapping());
     } else {
-      return beanDescriptor.createDeployPropertyParser();
+      return beanDescriptor.parser();
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 2552d2600..41ba76d32 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -1582,7 +1582,7 @@ public class BeanDescriptor<T> implements BeanType<T> {
     }
   }
 
-  public DeployPropertyParser createDeployPropertyParser() {
+  public DeployPropertyParser parser() {
     return new DeployPropertyParser(this);
   }
 
@@ -2453,18 +2453,7 @@ public class BeanDescriptor<T> implements BeanType<T> {
    */
   private SqlTreeProperty findSqlTreeFormula(String formulaExpression) {
 
-    return dynamicProperty.computeIfAbsent(formulaExpression, (formula) -> {
-      FormulaPropertyPath propertyFormula = new FormulaPropertyPath(formula);
-      if (!propertyFormula.isFormula()) {
-        throw new IllegalStateException("unable to parse formula [" + formula + "} on bean type " + fullName);
-      }
-      String baseName = propertyFormula.basePropertyName();
-      BeanProperty base = _findBeanProperty(baseName);
-      if (base == null) {
-        throw new IllegalStateException("unable to find property [" + baseName + "] from formula [" + formula + "} on bean type " + fullName);
-      }
-      return propertyFormula.formulaProperty(base);
-    });
+    return dynamicProperty.computeIfAbsent(formulaExpression, (formula) -> new FormulaPropertyPath(this, formula).build());
   }
 
   /**
@@ -2497,7 +2486,7 @@ public class BeanDescriptor<T> implements BeanType<T> {
     return _findBeanProperty(propName);
   }
 
-  private BeanProperty _findBeanProperty(String propName) {
+  BeanProperty _findBeanProperty(String propName) {
     BeanProperty prop = propMap.get(propName);
     if (prop == null && inheritInfo != null) {
       // search in sub types...
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java b/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java
index 320d76a96..bf98172a2 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java
@@ -22,10 +22,29 @@ public final class DeployPropertyParser extends DeployParser {
 
   private final Set<String> includes = new HashSet<>();
 
+  private boolean catchFirst;
+
+  private ElPropertyDeploy firstProp;
+
   DeployPropertyParser(BeanDescriptor<?> beanDescriptor) {
     this.beanDescriptor = beanDescriptor;
   }
 
+  /**
+   * Set to true to catch the first property.
+   */
+  public DeployPropertyParser setCatchFirst(boolean catchFirst) {
+    this.catchFirst = catchFirst;
+    return this;
+  }
+
+  /**
+   * Return the first property found by the parser.
+   */
+  public ElPropertyDeploy getFirstProp() {
+    return firstProp;
+  }
+
   @Override
   public Set<String> getIncludes() {
     return includes;
@@ -45,6 +64,9 @@ public final class DeployPropertyParser extends DeployParser {
     if (elProp == null) {
       return null;
     } else {
+      if (catchFirst && firstProp == null) {
+        firstProp = elProp;
+      }
       addIncludes(elProp.getElPrefix());
       return elProp.getElPlaceholder(encrypted);
     }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
index e7f55721e..28f494bd4 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
@@ -10,24 +10,27 @@ import javax.persistence.PersistenceException;
  */
 class DynamicPropertyAggregationFormula extends DynamicPropertyBase {
 
-  private final String parsedAggregation;
+  private final String parsedFormula;
+
+  private final boolean aggregate;
 
   private final BeanProperty asTarget;
 
-  DynamicPropertyAggregationFormula(String name, ScalarType<?> scalarType, String parsedAggregation, BeanProperty asTarget) {
+  DynamicPropertyAggregationFormula(String name, ScalarType<?> scalarType, String parsedFormula, boolean aggregate, BeanProperty asTarget) {
     super(name, name, null, scalarType);
-    this.parsedAggregation = parsedAggregation;
+    this.parsedFormula = parsedFormula;
+    this.aggregate = aggregate;
     this.asTarget = asTarget;
   }
 
   @Override
   public String toString() {
-    return "DynamicPropertyFormula[" + parsedAggregation + "]";
+    return "DynamicPropertyFormula[" + parsedFormula + "]";
   }
 
   @Override
   public boolean isAggregation() {
-    return true;
+    return aggregate;
   }
 
   @Override
@@ -46,7 +49,7 @@ class DynamicPropertyAggregationFormula extends DynamicPropertyBase {
 
   @Override
   public void appendSelect(DbSqlContext ctx, boolean subQuery) {
-    ctx.appendParseSelect(parsedAggregation);
+    ctx.appendParseSelect(parsedFormula);
   }
 
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java b/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
index bb350f536..b4c82f790 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.deploy;
 
+import io.ebeaninternal.server.el.ElPropertyDeploy;
 import io.ebeaninternal.server.query.SqlTreeProperty;
 import io.ebeaninternal.server.type.ScalarType;
 
@@ -9,27 +10,34 @@ import java.util.regex.Pattern;
 
 class FormulaPropertyPath {
 
-  private static final Pattern pattern = Pattern.compile("(max|min|avg|count)\\((.*)\\)");
+  private static final String[] AGG_FUNCTIONS = {"count","max","min","avg"};
+
+  private static final Pattern pattern = Pattern.compile("([a-zA-Z]*)\\((.*)\\)");
 
   private static final String DISTINCT_ = "distinct ";
 
-  private final String aggType;
+  private final BeanDescriptor<?> descriptor;
 
-  private final String baseName;
+  private final String formula;
+
+  private final String outerFunction;
+
+  private final String internalExpression;
 
   private boolean countDistinct;
 
-  FormulaPropertyPath(String propName) {
+  FormulaPropertyPath(BeanDescriptor<?> descriptor, String formula) {
 
-    Matcher matcher = pattern.matcher(propName);
-    if (matcher.find()) {
-      aggType = matcher.group(1);
-      baseName = trimDistinct(matcher.group(2));
+    this.descriptor = descriptor;
+    this.formula = formula;
 
-    } else {
-      aggType = null;
-      baseName = null;
+    Matcher matcher = pattern.matcher(formula);
+    if (!matcher.find()) {
+      throw new IllegalStateException("Unable to parse formula [" + formula + "]");
     }
+    //int groupCount = matcher.groupCount();
+    outerFunction = matcher.group(1);
+    internalExpression = trimDistinct(matcher.group(2));
   }
 
   private String trimDistinct(String propertyName) {
@@ -41,49 +49,58 @@ class FormulaPropertyPath {
     }
   }
 
-  boolean isFormula() {
-    return aggType != null;
-  }
-
   String aggType() {
-    return aggType;
+    return outerFunction;
   }
 
   String basePropertyName() {
-    return baseName;
+    return internalExpression;
   }
 
-  /**
-   * Create a bean property dynamically for the formula in the select clause.
-   */
-  SqlTreeProperty formulaProperty(BeanProperty base) {
 
-    String parsedAggregation = buildFormula(base);
-    String name = logicalName();
+  SqlTreeProperty build() {
 
-    ScalarType<?> scalarType = base.getScalarType();
+    DeployPropertyParser parser = descriptor.parser().setCatchFirst(true);
+
+    String parsed = parser.parse(internalExpression);
+    ElPropertyDeploy firstProp = parser.getFirstProp();
+
+    ScalarType<?> scalarType;
     if (isCount()) {
       // count maps to Long / BIGINT
-      scalarType = base.getBeanDescriptor().getScalarType(Types.BIGINT);
+      scalarType = descriptor.getScalarType(Types.BIGINT);
+    } else {
+      // determine scalarType based on first property found by parser
+      if (firstProp != null) {
+        scalarType = firstProp.getBeanProperty().getScalarType();
+      } else {
+        throw new IllegalStateException("unable to determine scalarType of formula [" + formula + "] for type " + descriptor+" - maybe use a cast like ::String ?");
+      }
     }
 
-    return new DynamicPropertyAggregationFormula(name, scalarType, parsedAggregation, null);
+    String parsedAggregation = buildFormula(parsed);
+    return new DynamicPropertyAggregationFormula(formula, scalarType, parsedAggregation, isAggregate(),null);
   }
 
-  private String buildFormula(BeanProperty base) {
+  private boolean isAggregate() {
+    for (String aggFunction : AGG_FUNCTIONS) {
+      if (aggFunction.equals(outerFunction)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  private String buildFormula(String parsed) {
     if (countDistinct) {
-      return "count(distinct ${}"+base.getDbColumn()+")";
+      return "count(distinct "+parsed+")";
     } else {
-      return aggType+"(${}"+base.getDbColumn()+")";
+      return outerFunction +"("+parsed+")";
     }
   }
 
   private boolean isCount() {
-    return aggType.equals("count");
-  }
-
-  private String logicalName() {
-    return aggType+Character.toUpperCase(baseName.charAt(0))+baseName.substring(1);
+    return outerFunction.equals("count");
   }
 
 }
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java
index 9b774c9bc..1baa3409a 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java
@@ -2,8 +2,10 @@ package io.ebeaninternal.server.querydefn;
 
 import io.ebean.FetchConfig;
 import io.ebean.util.StringHelper;
+import io.ebeaninternal.server.util.DSelectColumnsParser;
 
 import java.util.LinkedHashSet;
+import java.util.List;
 
 /**
  * Parses the path properties string.
@@ -113,10 +115,10 @@ class OrmQueryPropertiesParser {
       return null;
     }
 
-    String[] res = inputProperties.split(",");
+    List<String> res = splitRawSelect(inputProperties);
 
     StringBuilder sb = new StringBuilder(70);
-    LinkedHashSet<String> propertySet = new LinkedHashSet<>(res.length * 2);
+    LinkedHashSet<String> propertySet = new LinkedHashSet<>(res.size() * 2);
 
     int count = 0;
     String temp;
@@ -148,6 +150,13 @@ class OrmQueryPropertiesParser {
     return propertySet;
   }
 
+  /**
+   * Split allowing 'dynamic function based properties'.
+   */
+  private List<String> splitRawSelect(String inputProperties) {
+    return DSelectColumnsParser.parse(inputProperties);
+  }
+
   private int parseBatchHint(int pos, String option) {
 
     int startPos = pos + option.length();
diff --git a/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java b/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java
index 6e17ed5a9..92e3e1078 100644
--- a/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java
+++ b/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java
@@ -1,10 +1,12 @@
 package io.ebeaninternal.server.rawsql;
 
 import io.ebeaninternal.server.rawsql.SpiRawSql.ColumnMapping;
+import io.ebeaninternal.server.util.DSelectColumnsParser;
 
-import java.util.regex.Pattern;
 import javax.persistence.PersistenceException;
 import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
 
 /**
  * Parses columnMapping (select clause) mapping columns to bean properties.
@@ -13,12 +15,8 @@ final class DRawSqlColumnsParser {
 
   private static final Pattern COLINFO_SPLIT = Pattern.compile("\\s(?=[^\\)]*(?:\\(|$))");
 
-  private final int end;
-
   private final String sqlSelect;
 
-  private int pos;
-
   private int indexPos;
 
   public static ColumnMapping parse(String sqlSelect) {
@@ -27,25 +25,21 @@ final class DRawSqlColumnsParser {
 
   private DRawSqlColumnsParser(String sqlSelect) {
     this.sqlSelect = sqlSelect;
-    this.end = sqlSelect.length();
   }
 
   private ColumnMapping parse() {
 
-    ArrayList<ColumnMapping.Column> columns = new ArrayList<>();
-    while (pos <= end) {
-      ColumnMapping.Column c = nextColumnInfo();
-      columns.add(c);
-    }
+    List<String> columnList = DSelectColumnsParser.parse(sqlSelect);
 
+    List<ColumnMapping.Column> columns = new ArrayList<>(columnList.size());
+
+    for (String rawColumn : columnList) {
+      columns.add(parseColumn(rawColumn));
+    }
     return new ColumnMapping(columns);
   }
 
-  private ColumnMapping.Column nextColumnInfo() {
-    int start = pos;
-    nextComma();
-    String colInfo = sqlSelect.substring(start, pos++);
-    colInfo = colInfo.trim();
+  private ColumnMapping.Column parseColumn(String colInfo) {
 
     String[] split = COLINFO_SPLIT.split(colInfo);
     if (split.length > 1) {
@@ -82,18 +76,4 @@ final class DRawSqlColumnsParser {
     return new ColumnMapping.Column(indexPos++, sb.toString(), split[split.length - 1]);
   }
 
-  private void nextComma() {
-    boolean inQuote = false;
-    int inbrackets = 0;
-    while (pos < end) {
-      char c = sqlSelect.charAt(pos);
-      if (c == '\'') inQuote = !inQuote;
-      else if (c == '(') inbrackets++;
-      else if (c == ')') inbrackets--;
-      else if (!inQuote && inbrackets == 0 && c == ',') {
-        return;
-      }
-      pos++;
-    }
-  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/util/DSelectColumnsParser.java b/src/main/java/io/ebeaninternal/server/util/DSelectColumnsParser.java
new file mode 100644
index 000000000..c172f92b2
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/util/DSelectColumnsParser.java
@@ -0,0 +1,55 @@
+package io.ebeaninternal.server.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Splits a select clause into 'logical columns' taking into account functions and quotes.
+ */
+public final class DSelectColumnsParser {
+
+  private final int end;
+
+  private final String selectClause;
+
+  private int pos;
+
+  public static List<String> parse(String sqlSelect) {
+    return new DSelectColumnsParser(sqlSelect).parse();
+  }
+
+  private DSelectColumnsParser(String selectClause) {
+    this.selectClause = selectClause;
+    this.end = selectClause.length();
+  }
+
+  private List<String> parse() {
+
+    ArrayList<String> columns = new ArrayList<>();
+    while (pos <= end) {
+      columns.add(nextColumnInfo());
+    }
+    return columns;
+  }
+
+  private String nextColumnInfo() {
+    int start = pos;
+    nextComma();
+    return selectClause.substring(start, pos++).trim();
+  }
+
+  private void nextComma() {
+    boolean inQuote = false;
+    int inBrackets = 0;
+    while (pos < end) {
+      char c = selectClause.charAt(pos);
+      if (c == '\'') inQuote = !inQuote;
+      else if (c == '(') inBrackets++;
+      else if (c == ')') inBrackets--;
+      else if (!inQuote && inBrackets == 0 && c == ',') {
+        return;
+      }
+      pos++;
+    }
+  }
+}
diff --git a/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java b/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java
index 9c7369a46..10056984e 100644
--- a/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java
@@ -46,7 +46,7 @@ public class DeployPropertyParserTest extends BaseTestCase {
 
   @Test
   public void combined_withAtColumn() {
-    assertThat(adddressParser().parse("concat(line1, line2, '-EA')")).isEqualTo("concat(${}line_1, ${}line_2, '-EA')");
+    assertThat(addressParser().parse("concat(line1, line2, '-EA')")).isEqualTo("concat(${}line_1, ${}line_2, '-EA')");
   }
 
   @Test
@@ -55,11 +55,11 @@ public class DeployPropertyParserTest extends BaseTestCase {
   }
 
   private DeployPropertyParser parser() {
-    return descriptor.createDeployPropertyParser();
+    return descriptor.parser();
   }
-  
-  private DeployPropertyParser adddressParser() {
-    return addressBeanDescriptor.createDeployPropertyParser();
+
+  private DeployPropertyParser addressParser() {
+    return addressBeanDescriptor.parser();
   }
 
 }
diff --git a/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java b/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java
index c3d840603..b990d6077 100644
--- a/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java
+++ b/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java
@@ -1,35 +1,45 @@
 package io.ebeaninternal.server.deploy;
 
 import io.ebean.BaseTestCase;
+import io.ebeaninternal.server.query.SqlTreeProperty;
 import org.junit.Test;
+import org.tests.model.basic.Customer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class FormulaPropertyPathTest extends BaseTestCase {
 
-  //private BeanDescriptor<Customer> customerDesc = getBeanDescriptor(Customer.class);
+  private BeanDescriptor<Customer> customerDesc = getBeanDescriptor(Customer.class);
 
   @Test
   public void isFormula() {
 
-    assertFormula("max(foo)", "max", "foo");
-    assertFormula("min(bar)", "min", "bar");
-    assertFormula("avg(baz)", "avg", "baz");
+    assertFormula("max(version)", "max", "version");
+    assertFormula("min(name)", "min", "name");
+    assertFormula("avg(id)", "avg", "id");
   }
 
   @Test
   public void isFormula_count() {
-    assertFormula("count(moo)", "count", "moo");
-    assertFormula("count(distinct joo)", "count", "joo");
+    assertFormula("count(status)", "count", "status");
+    assertFormula("count(distinct name)", "count", "name");
+  }
+
+  @Test
+  public void concat() {
+
+    assertFormula("concat(name,'-end')", "concat", "name,'-end'");
   }
 
   private void assertFormula(String input, String aggType, String baseProperty) {
 
-    FormulaPropertyPath propertyPath = new FormulaPropertyPath(input);
+    FormulaPropertyPath propertyPath = new FormulaPropertyPath(customerDesc, input);
 
-    assertThat(propertyPath.isFormula()).isTrue();
     assertThat(propertyPath.basePropertyName()).isEqualTo(baseProperty);
     assertThat(propertyPath.aggType()).isEqualTo(aggType);
 
+    SqlTreeProperty treeProperty = propertyPath.build();
+
+    assertThat(treeProperty).isNotNull();
   }
 }
diff --git a/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java b/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java
new file mode 100644
index 000000000..0b30e225c
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java
@@ -0,0 +1,60 @@
+package io.ebeaninternal.server.util;
+
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class DSelectColumnsParserTest {
+
+  @Test
+  public void parse() {
+
+    List<String> cols = DSelectColumnsParser.parse("a,MD5(id::text) as b,c");
+    assertThat(cols).containsExactly("a", "MD5(id::text) as b", "c");
+  }
+
+  @Test
+  public void whitespace_is_trimmed() {
+
+    List<String> cols = DSelectColumnsParser.parse("a , MD5(id::text) as b  , c ");
+    assertThat(cols).containsExactly("a", "MD5(id::text) as b", "c");
+  }
+
+  @Test
+  public void nestedFunctions() {
+
+    List<String> cols = DSelectColumnsParser.parse("a , concat(id,'sd',inner(foo)) as b  , c ");
+    assertThat(cols).containsExactly("a", "concat(id,'sd',inner(foo)) as b", "c");
+  }
+
+  @Test
+  public void basic() {
+
+    List<String> cols = DSelectColumnsParser.parse("name , status  , billingAddress ");
+    assertThat(cols).containsExactly("name", "status", "billingAddress");
+  }
+
+  @Test
+  public void basic_noWhitespace() {
+
+    List<String> cols = DSelectColumnsParser.parse("a,b,c");
+    assertThat(cols).containsExactly("a", "b", "c");
+  }
+
+  @Test
+  public void formula_noWhitespace() {
+
+    List<String> cols = DSelectColumnsParser.parse("a,concat(x,y),c");
+    assertThat(cols).containsExactly("a", "concat(x,y)", "c");
+  }
+
+  @Test
+  public void with_logicalCast_andAsAlias() {
+
+    List<String> cols = DSelectColumnsParser.parse("name , concat(status,'-end')::String as fullName  , billingAddress ");
+    assertThat(cols).containsExactly("name", "concat(status,'-end')::String as fullName", "billingAddress");
+  }
+
+}
diff --git a/src/test/java/org/tests/query/aggregation/TestAggregationCount.java b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
index 34c231b26..6a0c4404a 100644
--- a/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
+++ b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
@@ -381,4 +381,25 @@ public class TestAggregationCount extends BaseTestCase {
     assertThat(sql.get(0)).contains("select count(distinct t0.last_name) from contact t0 where not exists (select 1 from contact_note x where x.contact_id = t0.id)");
   }
 
+  @Test
+  public void example_nonAggregateFormula() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    List<String> names =
+
+      Ebean.find(Contact.class)
+        .select("concat(lastName,', ',firstName)")
+        .where().isNull("phone")
+        .orderBy().asc("lastName")
+        .findSingleAttributeList();
+
+    assertThat(names).isNotEmpty();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select concat(t0.last_name,', ',t0.first_name) from contact t0 where t0.phone is null  order by t0.last_name");
+  }
+
 }

From e1af7c29eb0b2620e7c556cbc0a85322e6476ef6 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 6 Mar 2018 17:35:26 +1300
Subject: [PATCH 0141/1036] #1333 - ENH: Support "dynamic formula" with
 findSingleAttributeList() ... e.g. .select("concat(lastName,', ',firstName)")

Concat automatically maps to String ScalarType
---
 .../server/deploy/FormulaPropertyPath.java    | 21 ++++++++++++-------
 .../aggregation/TestAggregationCount.java     | 21 +++++++++++++++++++
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java b/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
index b4c82f790..cc7d86bc1 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
@@ -10,7 +10,7 @@ import java.util.regex.Pattern;
 
 class FormulaPropertyPath {
 
-  private static final String[] AGG_FUNCTIONS = {"count","max","min","avg"};
+  private static final String[] AGG_FUNCTIONS = {"count", "max", "min", "avg"};
 
   private static final Pattern pattern = Pattern.compile("([a-zA-Z]*)\\((.*)\\)");
 
@@ -41,7 +41,7 @@ class FormulaPropertyPath {
   }
 
   private String trimDistinct(String propertyName) {
-    if (propertyName.startsWith(DISTINCT_)){
+    if (propertyName.startsWith(DISTINCT_)) {
       countDistinct = true;
       return propertyName.substring(DISTINCT_.length());
     } else {
@@ -67,19 +67,22 @@ class FormulaPropertyPath {
 
     ScalarType<?> scalarType;
     if (isCount()) {
-      // count maps to Long / BIGINT
       scalarType = descriptor.getScalarType(Types.BIGINT);
+
+    } else if (isConcat()) {
+      scalarType = descriptor.getScalarType(Types.VARCHAR);
+
     } else {
       // determine scalarType based on first property found by parser
       if (firstProp != null) {
         scalarType = firstProp.getBeanProperty().getScalarType();
       } else {
-        throw new IllegalStateException("unable to determine scalarType of formula [" + formula + "] for type " + descriptor+" - maybe use a cast like ::String ?");
+        throw new IllegalStateException("unable to determine scalarType of formula [" + formula + "] for type " + descriptor + " - maybe use a cast like ::String ?");
       }
     }
 
     String parsedAggregation = buildFormula(parsed);
-    return new DynamicPropertyAggregationFormula(formula, scalarType, parsedAggregation, isAggregate(),null);
+    return new DynamicPropertyAggregationFormula(formula, scalarType, parsedAggregation, isAggregate(), null);
   }
 
   private boolean isAggregate() {
@@ -93,9 +96,9 @@ class FormulaPropertyPath {
 
   private String buildFormula(String parsed) {
     if (countDistinct) {
-      return "count(distinct "+parsed+")";
+      return "count(distinct " + parsed + ")";
     } else {
-      return outerFunction +"("+parsed+")";
+      return outerFunction + "(" + parsed + ")";
     }
   }
 
@@ -103,4 +106,8 @@ class FormulaPropertyPath {
     return outerFunction.equals("count");
   }
 
+  private boolean isConcat() {
+    return outerFunction.equals("concat");
+  }
+
 }
diff --git a/src/test/java/org/tests/query/aggregation/TestAggregationCount.java b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
index 6a0c4404a..0ace4031c 100644
--- a/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
+++ b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
@@ -402,4 +402,25 @@ public class TestAggregationCount extends BaseTestCase {
     assertThat(sql.get(0)).contains("select concat(t0.last_name,', ',t0.first_name) from contact t0 where t0.phone is null  order by t0.last_name");
   }
 
+  @Test
+  public void concat_expectString() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    List<String> names =
+
+      Ebean.find(Contact.class)
+        .select("concat(updtime,', ',firstName)")
+        .where().isNull("phone")
+        .orderBy().asc("lastName")
+        .findSingleAttributeList();
+
+    assertThat(names).isNotEmpty();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select concat(t0.updtime,', ',t0.first_name) from contact t0");
+  }
+
 }

From 873c14faaf5be36d252fa43e1a497dcdfbc6c901 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 6 Mar 2018 20:58:30 +1300
Subject: [PATCH 0142/1036] #1333 - ENH: Support "dynamic formula" with
 findSingleAttributeList() ... e.g. .select("concat(lastName,', ',firstName)")

Support cast of formula like ... select("max(updtime)::Instant")
---
 .../server/deploy/BeanDescriptor.java         |   4 +
 .../server/deploy/BeanDescriptorManager.java  |   5 +
 .../server/deploy/BeanDescriptorMap.java      |   5 +
 .../server/deploy/FormulaPropertyPath.java    |  69 ++++++++--
 .../server/type/DefaultTypeManager.java       | 129 ++++++++++--------
 .../server/type/TypeManager.java              |   5 +
 .../deploy/FormulaPropertyPathTest.java       |  44 +++++-
 .../aggregation/TestAggregationCount.java     |  21 +++
 8 files changed, 208 insertions(+), 74 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 41ba76d32..06810d7e0 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -1066,6 +1066,10 @@ public class BeanDescriptor<T> implements BeanType<T> {
     return owner.getScalarType(jdbcType);
   }
 
+  public ScalarType<?> getScalarType(String cast) {
+    return owner.getScalarType(cast);
+  }
+
   /**
    * Return true if this bean type has a default select clause that is not
    * simply select all properties.
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 9d8c6fbe6..9b2a26d11 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -265,6 +265,11 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     }
   }
 
+  @Override
+  public ScalarType<?> getScalarType(String cast) {
+    return typeManager.getScalarType(cast);
+  }
+
   @Override
   public ScalarType<?> getScalarType(int jdbcType) {
     return typeManager.getScalarType(jdbcType);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorMap.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorMap.java
index 9d8387565..90fe0c5ff 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorMap.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorMap.java
@@ -66,4 +66,9 @@ public interface BeanDescriptorMap {
    * Return the scalarType for the given JDBC type.
    */
   ScalarType<?> getScalarType(int jdbcType);
+
+  /**
+   * Return the scalarType for the given logical type.
+   */
+  ScalarType<?> getScalarType(String cast);
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java b/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
index cc7d86bc1..38b348162 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
@@ -5,15 +5,11 @@ import io.ebeaninternal.server.query.SqlTreeProperty;
 import io.ebeaninternal.server.type.ScalarType;
 
 import java.sql.Types;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 class FormulaPropertyPath {
 
   private static final String[] AGG_FUNCTIONS = {"count", "max", "min", "avg"};
 
-  private static final Pattern pattern = Pattern.compile("([a-zA-Z]*)\\((.*)\\)");
-
   private static final String DISTINCT_ = "distinct ";
 
   private final BeanDescriptor<?> descriptor;
@@ -26,18 +22,46 @@ class FormulaPropertyPath {
 
   private boolean countDistinct;
 
+  private String cast;
+  private String alias;
+
   FormulaPropertyPath(BeanDescriptor<?> descriptor, String formula) {
 
     this.descriptor = descriptor;
     this.formula = formula;
 
-    Matcher matcher = pattern.matcher(formula);
-    if (!matcher.find()) {
+    int openBracket = formula.indexOf('(');
+    int closeBracket = formula.lastIndexOf(')');
+    if (openBracket == -1 || closeBracket == -1) {
       throw new IllegalStateException("Unable to parse formula [" + formula + "]");
     }
-    //int groupCount = matcher.groupCount();
-    outerFunction = matcher.group(1);
-    internalExpression = trimDistinct(matcher.group(2));
+    outerFunction = formula.substring(0, openBracket).trim();
+    internalExpression = trimDistinct(formula.substring(openBracket+1, closeBracket));
+
+    if (closeBracket < formula.length() -1) {
+      // ::CastType as foo
+      String suffix = formula.substring(closeBracket+1).trim();
+      parseSuffix(suffix);
+    }
+  }
+
+  private void parseSuffix(String suffix) {
+    String[] split = suffix.split(" ");
+    if (split.length == 1) {
+      if (split[0].startsWith("::")) {
+        cast = split[0].substring(2);
+      } else {
+        alias = split[0];
+      }
+
+    } else if (split.length == 2) {
+      cast = "as".equals(split[0]) ? null : split[0].substring(2);
+      alias = split[1];
+
+    } else if (split.length == 3) {
+      cast = split[0].substring(2);
+      alias = split[2];
+    }
   }
 
   private String trimDistinct(String propertyName) {
@@ -49,14 +73,21 @@ class FormulaPropertyPath {
     }
   }
 
-  String aggType() {
+  String outerFunction() {
     return outerFunction;
   }
 
-  String basePropertyName() {
+  String internalExpression() {
     return internalExpression;
   }
 
+  String cast() {
+    return cast;
+  }
+
+  String alias() {
+    return alias;
+  }
 
   SqlTreeProperty build() {
 
@@ -66,7 +97,13 @@ class FormulaPropertyPath {
     ElPropertyDeploy firstProp = parser.getFirstProp();
 
     ScalarType<?> scalarType;
-    if (isCount()) {
+    if (cast != null) {
+      scalarType = descriptor.getScalarType(cast);
+      if (scalarType == null) {
+        throw new IllegalStateException("Unable to find scalarType for cast of ["+cast+"] on formula [" + formula + "] for type " + descriptor);
+      }
+
+    } else if (isCount()) {
       scalarType = descriptor.getScalarType(Types.BIGINT);
 
     } else if (isConcat()) {
@@ -81,8 +118,14 @@ class FormulaPropertyPath {
       }
     }
 
+    String logicalName = (alias == null) ? formula : alias;
+    BeanProperty targetProperty = null;
+    if (alias != null) {
+      targetProperty = descriptor._findBeanProperty(alias);
+    }
+
     String parsedAggregation = buildFormula(parsed);
-    return new DynamicPropertyAggregationFormula(formula, scalarType, parsedAggregation, isAggregate(), null);
+    return new DynamicPropertyAggregationFormula(logicalName, scalarType, parsedAggregation, isAggregate(), targetProperty);
   }
 
   private boolean isAggregate() {
diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 4ffe6074b..ef11a43c5 100644
--- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -83,6 +83,8 @@ public final class DefaultTypeManager implements TypeManager {
 
   private final ConcurrentHashMap<Integer, ScalarType<?>> nativeMap;
 
+  private final ConcurrentHashMap<String, ScalarType<?>> logicalMap;
+
   private final DefaultTypeFactory extraTypeFactory;
 
   private final ScalarType<?> hstoreType = new ScalarTypePostgresHstore();
@@ -179,6 +181,7 @@ public final class DefaultTypeManager implements TypeManager {
     this.jsonDateTime = config.getJsonDateTime();
     this.typeMap = new ConcurrentHashMap<>();
     this.nativeMap = new ConcurrentHashMap<>();
+    this.logicalMap = new ConcurrentHashMap<>();
 
     boolean objectMapperPresent = config.getClassLoadConfig().isJacksonObjectMapperPresent();
     this.objectMapper = (objectMapperPresent) ? initObjectMapper(config) : null;
@@ -289,6 +292,11 @@ public final class DefaultTypeManager implements TypeManager {
     }
   }
 
+  @Override
+  public ScalarType<?> getScalarType(String cast) {
+    return logicalMap.get(cast);
+  }
+
   /**
    * Return the ScalarType for the given jdbc type as per java.sql.Types.
    */
@@ -842,30 +850,35 @@ public final class DefaultTypeManager implements TypeManager {
 
     if (config.getClassLoadConfig().isJavaTimePresent()) {
       logger.debug("Registering java.time data types");
-      typeMap.put(java.time.Period.class, new ScalarTypePeriod());
-      typeMap.put(java.time.LocalDate.class, new ScalarTypeLocalDate());
-      typeMap.put(java.time.LocalDateTime.class, new ScalarTypeLocalDateTime(mode));
-      typeMap.put(OffsetDateTime.class, new ScalarTypeOffsetDateTime(mode));
-      typeMap.put(ZonedDateTime.class, new ScalarTypeZonedDateTime(mode));
-      typeMap.put(Instant.class, new ScalarTypeInstant(mode));
+      addType(java.time.Period.class, new ScalarTypePeriod());
+      addType(java.time.LocalDate.class, new ScalarTypeLocalDate());
+      addType(java.time.LocalDateTime.class, new ScalarTypeLocalDateTime(mode));
+      addType(OffsetDateTime.class, new ScalarTypeOffsetDateTime(mode));
+      addType(ZonedDateTime.class, new ScalarTypeZonedDateTime(mode));
+      addType(Instant.class, new ScalarTypeInstant(mode));
 
-      typeMap.put(DayOfWeek.class, new ScalarTypeDayOfWeek());
-      typeMap.put(Month.class, new ScalarTypeMonth());
-      typeMap.put(Year.class, new ScalarTypeYear());
-      typeMap.put(YearMonth.class, new ScalarTypeYearMonthDate());
-      typeMap.put(MonthDay.class, new ScalarTypeMonthDay());
-      typeMap.put(OffsetTime.class, new ScalarTypeOffsetTime());
-      typeMap.put(ZoneId.class, new ScalarTypeZoneId());
-      typeMap.put(ZoneOffset.class, new ScalarTypeZoneOffset());
+      addType(DayOfWeek.class, new ScalarTypeDayOfWeek());
+      addType(Month.class, new ScalarTypeMonth());
+      addType(Year.class, new ScalarTypeYear());
+      addType(YearMonth.class, new ScalarTypeYearMonthDate());
+      addType(MonthDay.class, new ScalarTypeMonthDay());
+      addType(OffsetTime.class, new ScalarTypeOffsetTime());
+      addType(ZoneId.class, new ScalarTypeZoneId());
+      addType(ZoneOffset.class, new ScalarTypeZoneOffset());
 
       boolean localTimeNanos = config.isLocalTimeWithNanos();
-      typeMap.put(java.time.LocalTime.class, (localTimeNanos) ? new ScalarTypeLocalTimeWithNanos() : new ScalarTypeLocalTime());
+      addType(java.time.LocalTime.class, (localTimeNanos) ? new ScalarTypeLocalTimeWithNanos() : new ScalarTypeLocalTime());
 
       boolean durationNanos = config.isDurationWithNanos();
-      typeMap.put(Duration.class, (durationNanos) ? new ScalarTypeDurationWithNanos() : new ScalarTypeDuration());
+      addType(Duration.class, (durationNanos) ? new ScalarTypeDurationWithNanos() : new ScalarTypeDuration());
     }
   }
 
+  private void addType(Class<?> clazz, ScalarType<?> scalarType) {
+    typeMap.put(clazz, scalarType);
+    logicalMap.putIfAbsent(clazz.getSimpleName(), scalarType);
+  }
+
   /**
    * Detect if Joda classes are in the classpath and if so register the Joda data types.
    */
@@ -876,20 +889,20 @@ public final class DefaultTypeManager implements TypeManager {
     if (config.getClassLoadConfig().isJodaTimePresent()) {
       // Joda classes are in the classpath so register the types
       logger.debug("Registering Joda data types");
-      typeMap.put(LocalDateTime.class, new ScalarTypeJodaLocalDateTime(mode));
-      typeMap.put(DateTime.class, new ScalarTypeJodaDateTime(mode));
-      typeMap.put(LocalDate.class, new ScalarTypeJodaLocalDate());
-      typeMap.put(org.joda.time.DateMidnight.class, new ScalarTypeJodaDateMidnight());
-      typeMap.put(org.joda.time.Period.class, new ScalarTypeJodaPeriod());
+      addType(LocalDateTime.class, new ScalarTypeJodaLocalDateTime(mode));
+      addType(DateTime.class, new ScalarTypeJodaDateTime(mode));
+      addType(LocalDate.class, new ScalarTypeJodaLocalDate());
+      addType(org.joda.time.DateMidnight.class, new ScalarTypeJodaDateMidnight());
+      addType(org.joda.time.Period.class, new ScalarTypeJodaPeriod());
 
       String jodaLocalTimeMode = config.getJodaLocalTimeMode();
       if ("normal".equalsIgnoreCase(jodaLocalTimeMode)) {
         // use the expected/normal local time zone
-        typeMap.put(LocalTime.class, new ScalarTypeJodaLocalTime());
+        addType(LocalTime.class, new ScalarTypeJodaLocalTime());
         logger.debug("registered ScalarTypeJodaLocalTime");
       } else if ("utc".equalsIgnoreCase(jodaLocalTimeMode)) {
         // use the old UTC based
-        typeMap.put(LocalTime.class, new ScalarTypeJodaLocalTimeUTC());
+        addType(LocalTime.class, new ScalarTypeJodaLocalTimeUTC());
         logger.debug("registered ScalarTypeJodaLocalTimeUTC");
       }
     }
@@ -908,17 +921,17 @@ public final class DefaultTypeManager implements TypeManager {
     nativeMap.put(DbPlatformType.HSTORE, hstoreType);
 
     ScalarType<?> utilDateType = extraTypeFactory.createUtilDate(mode);
-    typeMap.put(java.util.Date.class, utilDateType);
+    addType(java.util.Date.class, utilDateType);
 
     ScalarType<?> calType = extraTypeFactory.createCalendar(mode);
-    typeMap.put(Calendar.class, calType);
+    addType(Calendar.class, calType);
 
     ScalarType<?> mathBigIntType = extraTypeFactory.createMathBigInteger();
-    typeMap.put(BigInteger.class, mathBigIntType);
+    addType(BigInteger.class, mathBigIntType);
 
     ScalarTypeBool booleanType = extraTypeFactory.createBoolean();
-    typeMap.put(Boolean.class, booleanType);
-    typeMap.put(boolean.class, booleanType);
+    addType(Boolean.class, booleanType);
+    addType(boolean.class, booleanType);
 
     // register the boolean literals to the platform for DDL default values
     databasePlatform.setDbTrueLiteral(booleanType.getDbTrueLiteral());
@@ -934,31 +947,31 @@ public final class DefaultTypeManager implements TypeManager {
     ServerConfig.DbUuid dbUuid = config.getDbTypeConfig().getDbUuid();
 
     if (offlineMigrationGeneration || (databasePlatform.isNativeUuidType() && dbUuid.useNativeType())) {
-      typeMap.put(UUID.class, new ScalarTypeUUIDNative());
+      addType(UUID.class, new ScalarTypeUUIDNative());
     } else {
       // Store UUID as binary(16) or varchar(40)
       ScalarType<?> uuidType = dbUuid.useBinary() ? new ScalarTypeUUIDBinary(dbUuid.useBinaryOptimized()) : new ScalarTypeUUIDVarchar();
-      typeMap.put(UUID.class, uuidType);
+      addType(UUID.class, uuidType);
     }
 
-    typeMap.put(File.class, fileType);
-    typeMap.put(InetAddress.class, inetAddressType);
-    typeMap.put(Locale.class, localeType);
-    typeMap.put(Currency.class, currencyType);
-    typeMap.put(TimeZone.class, timeZoneType);
-    typeMap.put(URL.class, urlType);
-    typeMap.put(URI.class, uriType);
+    addType(File.class, fileType);
+    addType(InetAddress.class, inetAddressType);
+    addType(Locale.class, localeType);
+    addType(Currency.class, currencyType);
+    addType(TimeZone.class, timeZoneType);
+    addType(URL.class, urlType);
+    addType(URI.class, uriType);
 
     // String types
-    typeMap.put(char[].class, charArrayType);
-    typeMap.put(char.class, charType);
-    typeMap.put(String.class, stringType);
+    addType(char[].class, charArrayType);
+    addType(char.class, charType);
+    addType(String.class, stringType);
     nativeMap.put(Types.VARCHAR, stringType);
     nativeMap.put(Types.CHAR, stringType);
     nativeMap.put(Types.LONGVARCHAR, longVarcharType);
 
     // Class<?>
-    typeMap.put(Class.class, classType);
+    addType(Class.class, classType);
 
     if (platformClobType == Types.CLOB) {
       nativeMap.put(Types.CLOB, clobType);
@@ -972,7 +985,7 @@ public final class DefaultTypeManager implements TypeManager {
     }
 
     // Binary type
-    typeMap.put(byte[].class, varbinaryType);
+    addType(byte[].class, varbinaryType);
     nativeMap.put(Types.BINARY, binaryType);
     nativeMap.put(Types.VARBINARY, varbinaryType);
     nativeMap.put(Types.LONGVARBINARY, longVarbinaryType);
@@ -989,43 +1002,43 @@ public final class DefaultTypeManager implements TypeManager {
     }
 
     // Number types
-    typeMap.put(Byte.class, byteType);
-    typeMap.put(byte.class, byteType);
+    addType(Byte.class, byteType);
+    addType(byte.class, byteType);
     nativeMap.put(Types.TINYINT, byteType);
 
-    typeMap.put(Short.class, shortType);
-    typeMap.put(short.class, shortType);
+    addType(Short.class, shortType);
+    addType(short.class, shortType);
     nativeMap.put(Types.SMALLINT, shortType);
 
-    typeMap.put(Integer.class, integerType);
-    typeMap.put(int.class, integerType);
+    addType(Integer.class, integerType);
+    addType(int.class, integerType);
     nativeMap.put(Types.INTEGER, integerType);
 
-    typeMap.put(Long.class, longType);
-    typeMap.put(long.class, longType);
+    addType(Long.class, longType);
+    addType(long.class, longType);
     nativeMap.put(Types.BIGINT, longType);
 
-    typeMap.put(Double.class, doubleType);
-    typeMap.put(double.class, doubleType);
+    addType(Double.class, doubleType);
+    addType(double.class, doubleType);
     nativeMap.put(Types.FLOAT, doubleType);// no this is not a bug
     nativeMap.put(Types.DOUBLE, doubleType);
 
-    typeMap.put(Float.class, floatType);
-    typeMap.put(float.class, floatType);
+    addType(Float.class, floatType);
+    addType(float.class, floatType);
     nativeMap.put(Types.REAL, floatType);// no this is not a bug
 
-    typeMap.put(BigDecimal.class, bigDecimalType);
+    addType(BigDecimal.class, bigDecimalType);
     nativeMap.put(Types.DECIMAL, bigDecimalType);
     nativeMap.put(Types.NUMERIC, bigDecimalType);
 
     // Temporal types
-    typeMap.put(Time.class, timeType);
+    addType(Time.class, timeType);
     nativeMap.put(Types.TIME, timeType);
-    typeMap.put(Date.class, dateType);
+    addType(Date.class, dateType);
     nativeMap.put(Types.DATE, dateType);
 
     ScalarType<?> timestampType = new ScalarTypeTimestamp(mode);
-    typeMap.put(Timestamp.class, timestampType);
+    addType(Timestamp.class, timestampType);
     nativeMap.put(Types.TIMESTAMP, timestampType);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/type/TypeManager.java b/src/main/java/io/ebeaninternal/server/type/TypeManager.java
index 15827cfbe..ebfebc955 100644
--- a/src/main/java/io/ebeaninternal/server/type/TypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/TypeManager.java
@@ -21,6 +21,11 @@ public interface TypeManager {
   @SuppressWarnings("rawtypes")
   void addEnumType(ScalarType<?> type, Class<? extends Enum> myEnumClass);
 
+  /**
+   * Return the scalar type for the given logical type.
+   */
+  ScalarType<?> getScalarType(String cast);
+
   /**
    * Return the ScalarType for a given jdbc type.
    *
diff --git a/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java b/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java
index b990d6077..9526619c9 100644
--- a/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java
+++ b/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java
@@ -31,12 +31,50 @@ public class FormulaPropertyPathTest extends BaseTestCase {
     assertFormula("concat(name,'-end')", "concat", "name,'-end'");
   }
 
-  private void assertFormula(String input, String aggType, String baseProperty) {
+  @Test
+  public void castFormula() {
+
+    assertFormula("concat(name,'-end')::String", "concat", "name,'-end'", "String", null);
+  }
+
+  @Test
+  public void cast_javaInstant() {
+
+    assertFormula("max(updtime)::Instant", "max", "updtime", "Instant", null);
+  }
+
+  @Test
+  public void alias() {
+    assertFormula("concat(name,'-end') name", "concat", "name,'-end'", null, "name");
+    assertFormula("concat(name,'-end') as name", "concat", "name,'-end'", null, "name");
+  }
+
+  @Test
+  public void castAndAlias() {
+    assertFormula("concat(name,'-end')::String name", "concat", "name,'-end'", "String", "name");
+    assertFormula("concat(name,'-end')::String as name", "concat", "name,'-end'", "String", "name");
+  }
+
+  private void assertFormula(String input, String funcName, String expression) {
+    assertFormula(input, funcName, expression, null, null);
+  }
+
+  private void assertFormula(String input, String funcName, String expression, String cast, String alias) {
 
     FormulaPropertyPath propertyPath = new FormulaPropertyPath(customerDesc, input);
 
-    assertThat(propertyPath.basePropertyName()).isEqualTo(baseProperty);
-    assertThat(propertyPath.aggType()).isEqualTo(aggType);
+    assertThat(propertyPath.internalExpression()).isEqualTo(expression);
+    assertThat(propertyPath.outerFunction()).isEqualTo(funcName);
+    if (cast != null) {
+      assertThat(propertyPath.cast()).isEqualTo(cast);
+    } else {
+      assertThat(propertyPath.cast()).isNull();
+    }
+    if (alias != null) {
+      assertThat(propertyPath.alias()).isEqualTo(alias);
+    } else {
+      assertThat(propertyPath.alias()).isNull();
+    }
 
     SqlTreeProperty treeProperty = propertyPath.build();
 
diff --git a/src/test/java/org/tests/query/aggregation/TestAggregationCount.java b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
index 0ace4031c..63732da01 100644
--- a/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
+++ b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
@@ -15,6 +15,7 @@ import org.tests.model.tevent.TEventMany;
 import org.tests.model.tevent.TEventOne;
 
 import java.sql.Timestamp;
+import java.time.Instant;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -423,4 +424,24 @@ public class TestAggregationCount extends BaseTestCase {
     assertThat(sql.get(0)).contains("select concat(t0.updtime,', ',t0.first_name) from contact t0");
   }
 
+  @Test
+  public void explicitCast() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    Instant instant =
+
+      Ebean.find(Contact.class)
+        .select("max(updtime)::Instant")
+        .where().isNull("phone")
+        .findSingleAttribute();
+
+    assertThat(instant).isNotNull();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select max(t0.updtime) from contact t0 where t0.phone is null");
+  }
+
 }

From a18cac035bdae28d2b71dfec70461166c1068fe1 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 6 Mar 2018 21:14:26 +1300
Subject: [PATCH 0143/1036] #1333 - ENH: Support "dynamic formula" with
 findSingleAttributeList() ... e.g. .select("concat(lastName,', ',firstName)")

Support property alias via "AS" ...  concat(lastName,', ',firstName) as lastName
---
 .../server/deploy/DbSqlContext.java           |  2 +-
 .../DynamicPropertyAggregationFormula.java    |  7 +++--
 .../server/deploy/FormulaPropertyPath.java    |  2 +-
 .../server/query/DefaultDbSqlContext.java     | 10 ++++---
 .../aggregation/TestAggregationCount.java     | 27 +++++++++++++++++++
 5 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java b/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java
index 5b7e335f0..0eca9a112 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java
@@ -67,7 +67,7 @@ public interface DbSqlContext {
   /**
    * Parse and add formula with standard table alias replacement.
    */
-  void appendParseSelect(String parseSelect);
+  void appendParseSelect(String parseSelect, String alias);
 
   /**
    * Append a Sql Formula select. This converts the "${ta}" keyword to the
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
index 28f494bd4..d238e7ca2 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
@@ -16,11 +16,14 @@ class DynamicPropertyAggregationFormula extends DynamicPropertyBase {
 
   private final BeanProperty asTarget;
 
-  DynamicPropertyAggregationFormula(String name, ScalarType<?> scalarType, String parsedFormula, boolean aggregate, BeanProperty asTarget) {
+  private final String alias;
+
+  DynamicPropertyAggregationFormula(String name, ScalarType<?> scalarType, String parsedFormula, boolean aggregate, BeanProperty asTarget, String alias) {
     super(name, name, null, scalarType);
     this.parsedFormula = parsedFormula;
     this.aggregate = aggregate;
     this.asTarget = asTarget;
+    this.alias = alias;
   }
 
   @Override
@@ -49,7 +52,7 @@ class DynamicPropertyAggregationFormula extends DynamicPropertyBase {
 
   @Override
   public void appendSelect(DbSqlContext ctx, boolean subQuery) {
-    ctx.appendParseSelect(parsedFormula);
+    ctx.appendParseSelect(parsedFormula, alias);
   }
 
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java b/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
index 38b348162..817868cd5 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
@@ -125,7 +125,7 @@ class FormulaPropertyPath {
     }
 
     String parsedAggregation = buildFormula(parsed);
-    return new DynamicPropertyAggregationFormula(logicalName, scalarType, parsedAggregation, isAggregate(), targetProperty);
+    return new DynamicPropertyAggregationFormula(logicalName, scalarType, parsedAggregation, isAggregate(), targetProperty, alias);
   }
 
   private boolean isAggregate() {
diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java b/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
index dfb611e14..f40b9c2cf 100644
--- a/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
+++ b/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
@@ -274,11 +274,15 @@ class DefaultDbSqlContext implements DbSqlContext {
   }
 
   @Override
-  public void appendParseSelect(String parseSelect) {
-    String converted = alias.parse(parseSelect);
+  public void appendParseSelect(String parseSelect, String columnAlias) {
+    String converted = this.alias.parse(parseSelect);
     sb.append(COMMA);
     sb.append(converted);
-    appendColumnAlias();
+    if (columnAlias != null) {
+      sb.append(" ").append(columnAlias);
+    } else {
+      appendColumnAlias();
+    }
   }
 
   @Override
diff --git a/src/test/java/org/tests/query/aggregation/TestAggregationCount.java b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
index 63732da01..330e769f9 100644
--- a/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
+++ b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
@@ -444,4 +444,31 @@ public class TestAggregationCount extends BaseTestCase {
     assertThat(sql.get(0)).contains("select max(t0.updtime) from contact t0 where t0.phone is null");
   }
 
+
+  @Test
+  public void formula_mapToProperty() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    List<Contact> contacts =
+
+      Ebean.find(Contact.class)
+        .select("email, concat(lastName,', ',firstName) as lastName")
+        .where().isNull("phone")
+        .orderBy().asc("lastName")
+        .findList();
+
+    assertThat(contacts).isNotEmpty();
+
+    for (Contact name : contacts) {
+      String lastName = name.getLastName();
+      assertThat(lastName).contains(", ");
+    }
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select t0.id, t0.email, concat(t0.last_name,', ',t0.first_name) lastName from contact t0 where t0.phone is null  order by t0.last_name; --bind()");
+  }
+
 }

From 55a257a64ce2a569d9b821c148b8be206dec05f4 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 7 Mar 2018 01:52:18 +1300
Subject: [PATCH 0144/1036] #1334 - ENH: Convert ORM query into DTO query ...
 with dynamic formula support

---
 src/main/java/io/ebean/Query.java             |   8 +
 .../io/ebeaninternal/api/SpiDtoQuery.java     |  10 +-
 .../io/ebeaninternal/api/SpiEbeanServer.java  |  11 +
 .../java/io/ebeaninternal/api/SpiQuery.java   |  15 +
 .../server/core/AbstractSqlQueryRequest.java  |  28 +-
 .../server/core/DefaultServer.java            |  15 +
 .../server/core/DtoQueryRequest.java          |  38 ++-
 .../server/core/OrmQueryEngine.java           |   5 +
 .../server/core/OrmQueryRequest.java          |  12 +
 .../server/core/RelationalQueryRequest.java   |   2 +-
 .../server/core/SpiOrmQueryRequest.java       |   5 +
 .../server/core/SpiResultSet.java             |  29 ++
 .../server/dto/DtoBeanDescriptor.java         |   6 +-
 .../io/ebeaninternal/server/dto/DtoMeta.java  |  17 +-
 .../server/profile/DQueryPlanMetric.java      |   2 +-
 .../io/ebeaninternal/server/query/CQuery.java |  26 +-
 .../server/query/CQueryEngine.java            |  34 ++
 .../server/query/DefaultOrmQueryEngine.java   |   7 +
 .../query/DefaultRelationalQueryEngine.java   |   7 +-
 .../server/query/SqlTreeBuilder.java          |   9 +-
 .../server/query/dto/DtoQueryEngine.java      |   7 +-
 .../server/querydefn/DefaultDtoQuery.java     |  41 ++-
 .../server/querydefn/DefaultOrmQuery.java     |  30 +-
 .../server/querydefn/OrmQueryPlanKey.java     |   5 +-
 .../java/io/ebean/DtoQueryFromOrmTest.java    | 297 ++++++++++++++++++
 .../ebeaninternal/api/TDSpiEbeanServer.java   |  11 +
 .../server/querydefn/OrmQueryPlanKeyTest.java | 156 ++++-----
 .../aggregation/TestAggregationCount.java     |  25 +-
 28 files changed, 720 insertions(+), 138 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/core/SpiResultSet.java
 create mode 100644 src/test/java/io/ebean/DtoQueryFromOrmTest.java

diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index c7e4ed104..c5a5f425e 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -236,6 +236,14 @@ public interface Query<T> {
    */
   Query<T> asDraft();
 
+  /**
+   * Convert the query to a DTO bean query.
+   * <p>
+   * We effectively use the underlying ORM query to build the SQL and then execute
+   * and map it into DTO beans.
+   */
+  <D> DtoQuery<D> asDto(Class<D> dtoClass);
+
   /**
    * Cancel the query execution if supported by the underlying database and
    * driver.
diff --git a/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java b/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java
index d2c4b1fb9..c7d3e4f88 100644
--- a/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java
+++ b/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java
@@ -17,7 +17,7 @@ public interface SpiDtoQuery<T> extends DtoQuery<T>, SpiSqlBinding {
   /**
    * Get the query plan for the cache.
    */
-  DtoQueryPlan getQueryPlan(String planKey);
+  DtoQueryPlan getQueryPlan(Object planKey);
 
   /**
    * Build the query plan.
@@ -27,7 +27,7 @@ public interface SpiDtoQuery<T> extends DtoQuery<T>, SpiSqlBinding {
   /**
    * Put the query plan into the cache.
    */
-  void putQueryPlan(String planKey, DtoQueryPlan plan);
+  void putQueryPlan(Object planKey, DtoQueryPlan plan);
 
   /**
    * Return true if the query is in relaxed mapping mode.
@@ -43,4 +43,10 @@ public interface SpiDtoQuery<T> extends DtoQuery<T>, SpiSqlBinding {
    * Return the associated DTO bean type.
    */
   Class<T> getType();
+
+  /**
+   * Return an underlying ORM query (if this query is built from an ORM query).
+   */
+  SpiQuery<?> getOrmQuery();
+
 }
diff --git a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
index 0e6af2a99..305672805 100644
--- a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
+++ b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.api;
 
+import io.ebean.DtoQuery;
 import io.ebean.EbeanServer;
 import io.ebean.PersistenceContextScope;
 import io.ebean.Query;
@@ -14,6 +15,7 @@ import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler;
+import io.ebeaninternal.server.core.SpiResultSet;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.query.CQuery;
@@ -246,4 +248,13 @@ public interface SpiEbeanServer extends EbeanServer, BeanLoader, BeanCollectionL
    */
   <T> void findDtoEachWhile(SpiDtoQuery<T> query, Predicate<T> consumer);
 
+  /**
+   * Return / wrap the ORM query as a DTO query.
+   */
+  <D> DtoQuery<D> findDto(Class<D> dtoType, SpiQuery<?> ormQuery);
+
+  /**
+   * Execute the underlying ORM query returning as a JDBC ResultSet to map to DTO beans.
+   */
+  SpiResultSet findResultSet(SpiQuery<?> ormQuery, SpiTransaction transaction);
 }
diff --git a/src/main/java/io/ebeaninternal/api/SpiQuery.java b/src/main/java/io/ebeaninternal/api/SpiQuery.java
index 065d3c9a5..adaa9f422 100644
--- a/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -215,6 +215,11 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
    */
   BeanDescriptor<T> getBeanDescriptor();
 
+  /**
+   * Return the query plan key.
+   */
+  Object getQueryPlanKey();
+
   /**
    * Return the RawSql that was set to use for this query.
    */
@@ -748,6 +753,16 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
    */
   boolean isDistinct();
 
+  /**
+   * Return true if the Id property is manually included in the query (DTO queries).
+   */
+  boolean isManualId();
+
+  /**
+   * Set to true when we only include the Id property if it is explicitly included in the select().
+   */
+  void setManualId(boolean manualId);
+
   /**
    * Set default select clauses where none have been explicitly defined.
    */
diff --git a/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
index 7726fae36..03feedaf4 100644
--- a/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
@@ -5,6 +5,7 @@ import io.ebean.Transaction;
 import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.SpiSqlBinding;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.lib.util.Str;
@@ -25,7 +26,7 @@ public abstract class AbstractSqlQueryRequest {
 
   private final SpiSqlBinding query;
 
-  protected final SpiEbeanServer ebeanServer;
+  protected final SpiEbeanServer server;
 
   protected SpiTransaction trans;
 
@@ -45,7 +46,7 @@ public abstract class AbstractSqlQueryRequest {
    * Create the BeanFindRequest.
    */
   AbstractSqlQueryRequest(SpiEbeanServer server, SpiSqlBinding query, Transaction t) {
-    this.ebeanServer = server;
+    this.server = server;
     this.query = query;
     this.trans = (SpiTransaction) t;
   }
@@ -55,10 +56,10 @@ public abstract class AbstractSqlQueryRequest {
    */
   public void initTransIfRequired() {
     if (trans == null) {
-      trans = ebeanServer.currentServerTransaction();
+      trans = server.currentServerTransaction();
       if (trans == null || !trans.isActive()) {
         // create a local readOnly transaction
-        trans = ebeanServer.createQueryTransaction(null);
+        trans = server.createQueryTransaction(null);
         createdTransaction = true;
       }
     }
@@ -73,8 +74,8 @@ public abstract class AbstractSqlQueryRequest {
     }
   }
 
-  public EbeanServer getEbeanServer() {
-    return ebeanServer;
+  public EbeanServer getServer() {
+    return server;
   }
 
   public SpiTransaction getTransaction() {
@@ -85,7 +86,10 @@ public abstract class AbstractSqlQueryRequest {
     return trans.isLogSql();
   }
 
-  abstract void setResultSet(ResultSet resultSet) throws SQLException;
+  /**
+   * Set the resultSet and associated query plan if known.
+   */
+  abstract void setResultSet(ResultSet resultSet, Object queryPlanKey) throws SQLException;
 
   /**
    * Return the bindLog for this request.
@@ -132,7 +136,7 @@ public abstract class AbstractSqlQueryRequest {
     int firstRow = query.getFirstRow();
     int maxRows = query.getMaxRows();
     if (firstRow > 0 || maxRows > 0) {
-      return ebeanServer.getDatabasePlatform().getBasicSqlLimiter().limit(sql, firstRow, maxRows);
+      return server.getDatabasePlatform().getBasicSqlLimiter().limit(sql, firstRow, maxRows);
     }
     return sql;
   }
@@ -140,7 +144,11 @@ public abstract class AbstractSqlQueryRequest {
   /**
    * Prepare and execute the SQL using the Binder.
    */
-  public void executeSql(Binder binder) throws SQLException {
+  public void executeSql(Binder binder, SpiQuery.Type type) throws SQLException {
+    executeAsSql(binder);
+  }
+
+  protected void executeAsSql(Binder binder) throws SQLException {
 
     startNano = System.nanoTime();
 
@@ -169,7 +177,7 @@ public abstract class AbstractSqlQueryRequest {
       trans.logSql(logSql);
     }
 
-    setResultSet(pstmt.executeQuery());
+    setResultSet(pstmt.executeQuery(), null);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index e74e14e53..6629aee54 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -985,6 +985,21 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return new DefaultDtoQuery<>(this, descriptor, sql.trim());
   }
 
+  @Override
+  public <T> DtoQuery<T> findDto(Class<T> dtoType, SpiQuery<?> ormQuery) {
+
+    DtoBeanDescriptor<T> descriptor = dtoBeanManager.getDescriptor(dtoType);
+    return new DefaultDtoQuery<>(this, descriptor, ormQuery);
+  }
+
+  @Override
+  public SpiResultSet findResultSet(SpiQuery<?> ormQuery, SpiTransaction transaction) {
+
+    SpiOrmQueryRequest<?> request = createQueryRequest(ormQuery.getType(), ormQuery, transaction);
+    request.initTransIfRequired();
+    return request.findResultSet();
+  }
+
   @Override
   public SqlQuery createSqlQuery(String sql) {
     return new DefaultRelationalQuery(this, sql.trim());
diff --git a/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
index b0801eb2e..99ba16058 100644
--- a/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
@@ -2,9 +2,11 @@ package io.ebeaninternal.server.core;
 
 import io.ebeaninternal.api.SpiDtoQuery;
 import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.dto.DtoColumn;
 import io.ebeaninternal.server.dto.DtoMappingRequest;
 import io.ebeaninternal.server.dto.DtoQueryPlan;
+import io.ebeaninternal.server.persist.Binder;
 import io.ebeaninternal.server.query.dto.DtoQueryEngine;
 import io.ebeaninternal.server.type.DataReader;
 import io.ebeaninternal.server.type.RsetDataReader;
@@ -37,15 +39,39 @@ public final class DtoQueryRequest<T> extends AbstractSqlQueryRequest {
     this.query = query;
   }
 
+  /**
+   * Prepare and execute the SQL using the Binder.
+   */
   @Override
-  protected void setResultSet(ResultSet resultSet) throws SQLException {
-    this.resultSet = resultSet;
-    this.dataReader = new RsetDataReader(ebeanServer.getDataTimeZone(), resultSet);
-    obtainPlan();
+  public void executeSql(Binder binder, SpiQuery.Type type) throws SQLException {
+    SpiQuery<?> ormQuery = query.getOrmQuery();
+    if (ormQuery != null) {
+      ormQuery.setType(type);
+      ormQuery.setManualId(true);
+
+      // execute the underlying ORM query returning the ResultSet
+      SpiResultSet result = server.findResultSet(ormQuery, trans);
+      this.pstmt = result.getStatement();
+      this.sql = ormQuery.getGeneratedSql();
+      setResultSet(result.getResultSet(), ormQuery.getQueryPlanKey());
+
+    } else {
+      // native SQL query execution
+      executeAsSql(binder);
+    }
   }
 
-  private void obtainPlan() throws SQLException {
-    String planKey = query.planKey();
+  @Override
+  protected void setResultSet(ResultSet resultSet, Object queryPlanKey) throws SQLException {
+    this.resultSet = resultSet;
+    this.dataReader = new RsetDataReader(server.getDataTimeZone(), resultSet);
+    obtainPlan(queryPlanKey);
+  }
+
+  private void obtainPlan(Object planKey) throws SQLException {
+    if (planKey == null) {
+      planKey = query.planKey();
+    }
     plan = query.getQueryPlan(planKey);
     if (plan == null) {
       plan = query.buildPlan(mappingRequest());
diff --git a/src/main/java/io/ebeaninternal/server/core/OrmQueryEngine.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryEngine.java
index aeda6a8ad..b080e4a29 100644
--- a/src/main/java/io/ebeaninternal/server/core/OrmQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryEngine.java
@@ -13,6 +13,11 @@ import java.util.List;
  */
 public interface OrmQueryEngine {
 
+  /**
+   * Execute the ORM query returning the JDBC ResultSet (for DTO query processing).
+   */
+  <T> SpiResultSet findResultSet(OrmQueryRequest<T> request);
+
   /**
    * Execute the 'find by id' query returning a single bean.
    */
diff --git a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index 490e53762..5a9e3f6a8 100644
--- a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -353,6 +353,13 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
     return query.getType() == Type.BEAN;
   }
 
+  /**
+   * Return true if this is a findEach, findIterate type query where we expect many results.
+   */
+  public boolean isFindIterate() {
+    return query.getType() == Type.ITERATE;
+  }
+
   /**
    * Execute the query as a delete.
    */
@@ -376,6 +383,11 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
     return rows;
   }
 
+  @Override
+  public SpiResultSet findResultSet() {
+    return queryEngine.findResultSet(this);
+  }
+
   /**
    * Execute the query as findById.
    */
diff --git a/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
index 81ae0aad9..dace84109 100644
--- a/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
@@ -36,7 +36,7 @@ public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
   }
 
   @Override
-  protected void setResultSet(ResultSet resultSet) throws SQLException {
+  protected void setResultSet(ResultSet resultSet, Object planKey) throws SQLException {
     this.resultSet = resultSet;
     this.propertyNames = getPropertyNames();
     // calculate the initialCapacity of the Map to reduce rehashing
diff --git a/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
index 32ab198ff..68895bb88 100644
--- a/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
@@ -114,6 +114,11 @@ public interface SpiOrmQueryRequest<T> extends BeanQueryRequest<T>, DocQueryRequ
    */
   <A> List<A> findSingleAttributeList();
 
+  /**
+   * Execute returning the ResultSet.
+   */
+  SpiResultSet findResultSet();
+
   /**
    * Try to get the query result from the query cache.
    */
diff --git a/src/main/java/io/ebeaninternal/server/core/SpiResultSet.java b/src/main/java/io/ebeaninternal/server/core/SpiResultSet.java
new file mode 100644
index 000000000..6c539e564
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/core/SpiResultSet.java
@@ -0,0 +1,29 @@
+package io.ebeaninternal.server.core;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+
+/**
+ * Hold the JDBC PreparedStatement and ResultSet.
+ *
+ * These both must be closed properly when done.
+ */
+public class SpiResultSet {
+
+  private final PreparedStatement statement;
+
+  private final ResultSet resultSet;
+
+  public SpiResultSet(PreparedStatement statement, ResultSet resultSet) {
+    this.statement = statement;
+    this.resultSet = resultSet;
+  }
+
+  public PreparedStatement getStatement() {
+    return statement;
+  }
+
+  public ResultSet getResultSet() {
+    return resultSet;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java
index 6d7698857..81920e858 100644
--- a/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java
@@ -10,7 +10,7 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public class DtoBeanDescriptor<T> {
 
-  private final Map<String, DtoQueryPlan> plans = new ConcurrentHashMap<>();
+  private final Map<Object, DtoQueryPlan> plans = new ConcurrentHashMap<>();
 
   private final Class<T> dtoType;
 
@@ -25,7 +25,7 @@ public class DtoBeanDescriptor<T> {
     return dtoType;
   }
 
-  public DtoQueryPlan getQueryPlan(String planKey) {
+  public DtoQueryPlan getQueryPlan(Object planKey) {
     return plans.get(planKey);
   }
 
@@ -33,7 +33,7 @@ public class DtoBeanDescriptor<T> {
     return meta.match(request);
   }
 
-  public void putQueryPlan(String planKey, DtoQueryPlan plan) {
+  public void putQueryPlan(Object planKey, DtoQueryPlan plan) {
     plans.put(planKey, plan);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoMeta.java b/src/main/java/io/ebeaninternal/server/dto/DtoMeta.java
index 272e962b5..bd26cfaee 100644
--- a/src/main/java/io/ebeaninternal/server/dto/DtoMeta.java
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoMeta.java
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.dto;
 
+import io.ebean.util.StringHelper;
+
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -81,7 +83,7 @@ class DtoMeta {
     int pos = 0;
     for (int i = firstOnes; i < cols.length; i++) {
       String label = cols[i].getLabel();
-      DtoReadSet property = propMap.get(label.toUpperCase());
+      DtoReadSet property = findProperty(label);
       if (property == null || property.isReadOnly()) {
         if (request.isRelaxedMode()) {
           property = DtoReadSetColumnSkip.INSTANCE;
@@ -103,7 +105,7 @@ class DtoMeta {
 
     for (int i = 0; i < cols.length; i++) {
       String label = cols[i].getLabel();
-      DtoReadSet property = propMap.get(label.toUpperCase());
+      DtoReadSet property = findProperty(label);
       if (property == null || property.isReadOnly()) {
         if (request.isRelaxedMode()) {
           property = DtoReadSetColumnSkip.INSTANCE;
@@ -116,4 +118,15 @@ class DtoMeta {
 
     return new DtoQueryPlanConSetter(request, defaultConstructor, setterProps);
   }
+
+  private DtoReadSet findProperty(String label) {
+
+    String upperLabel = label.toUpperCase();
+    DtoMetaProperty property = propMap.get(upperLabel);
+    if (property == null) {
+      upperLabel = StringHelper.replaceString(upperLabel, "_", "");
+      property = propMap.get(upperLabel);
+    }
+    return property;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
index 4ba29d8c3..b358a5584 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
@@ -41,7 +41,7 @@ class DQueryPlanMetric implements QueryPlanMetric {
 
     @Override
     public String toString() {
-      return meta +" "+ stats;
+      return meta + " " + stats + " sql:" + getSql();
     }
 
     @Override
diff --git a/src/main/java/io/ebeaninternal/server/query/CQuery.java b/src/main/java/io/ebeaninternal/server/query/CQuery.java
index 6ab29d742..da7bdd090 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQuery.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQuery.java
@@ -310,11 +310,21 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
 
   private boolean prepareBindExecuteQueryWithOption(boolean forwardOnlyHint) throws SQLException {
 
+    ResultSet resultSet = prepareResultSet(forwardOnlyHint);
+    if (resultSet == null) {
+      return false;
+    }
+    dataReader = queryPlan.createDataReader(resultSet);
+    return true;
+  }
+
+  ResultSet prepareResultSet(boolean forwardOnlyHint) throws SQLException {
+
     synchronized (this) {
       if (cancelled || query.isCancelled()) {
         // cancelled before we started
         cancelled = true;
-        return false;
+        return null;
       }
 
       startNano = System.nanoTime();
@@ -328,9 +338,8 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
         ResultSet suppliedResultSet = query.getRawSql().getResultSet();
         if (suppliedResultSet != null) {
           // this is a user supplied ResultSet so use that
-          dataReader = queryPlan.createDataReader(suppliedResultSet);
           bindLog = "";
-          return true;
+          return suppliedResultSet;
         }
       }
 
@@ -353,10 +362,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
       bindLog = predicates.bind(dataBind);
 
       // executeQuery
-      ResultSet rset = pstmt.executeQuery();
-      dataReader = queryPlan.createDataReader(rset);
-
-      return true;
+      return pstmt.executeQuery();
     }
   }
 
@@ -793,4 +799,10 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
     }
   }
 
+  /**
+   * Return the underlying PreparedStatement.
+   */
+  PreparedStatement getPstmt() {
+    return pstmt;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
index f03efc1a0..d4a3bd6ba 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
@@ -8,12 +8,14 @@ import io.ebean.bean.EntityBean;
 import io.ebean.bean.ObjectGraphNode;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebean.util.JdbcClose;
 import io.ebean.util.StringHelper;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.core.DiffHelp;
 import io.ebeaninternal.server.core.Message;
 import io.ebeaninternal.server.core.OrmQueryRequest;
+import io.ebeaninternal.server.core.SpiResultSet;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.lib.util.Str;
 import io.ebeaninternal.server.persist.Binder;
@@ -22,6 +24,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.persistence.PersistenceException;
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -325,6 +328,37 @@ public class CQueryEngine {
     return historySupport.getSysPeriodLower(rootTableAlias);
   }
 
+  /**
+   * Execute returning the ResultSet and PreparedStatement for processing (by DTO query usually).
+   */
+  public <T> SpiResultSet findResultSet(OrmQueryRequest<T> request) {
+    CQuery<T> cquery = queryBuilder.buildQuery(request);
+    try {
+      boolean fwdOnly;
+      if (request.isFindIterate()) {
+        // findEach ...
+        fwdOnly = forwardOnlyHintOnFindIterate;
+        if (defaultFetchSizeFindEach > 0) {
+          request.setDefaultFetchBuffer(defaultFetchSizeFindEach);
+        }
+      } else {
+        // findList - aggressive fetch
+        fwdOnly = false;
+        if (defaultFetchSizeFindList > 0) {
+          request.setDefaultFetchBuffer(defaultFetchSizeFindList);
+        }
+      }
+      ResultSet resultSet = cquery.prepareResultSet(fwdOnly);
+      if (request.isLogSql()) {
+        logSql(cquery);
+      }
+      return new SpiResultSet(cquery.getPstmt(), resultSet);
+
+    } catch (SQLException e) {
+      JdbcClose.close(cquery.getPstmt());
+      throw cquery.createPersistenceException(e);
+    }
+  }
 
   /**
    * Find a list/map/set of beans.
diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java
index bed19babe..c6c042c92 100644
--- a/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java
@@ -9,6 +9,7 @@ import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.core.OrmQueryEngine;
 import io.ebeaninternal.server.core.OrmQueryRequest;
+import io.ebeaninternal.server.core.SpiResultSet;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.persist.Binder;
 
@@ -77,6 +78,12 @@ public class DefaultOrmQueryEngine implements OrmQueryEngine {
     return queryEngine.update(request);
   }
 
+  @Override
+  public <T> SpiResultSet findResultSet(OrmQueryRequest<T> request) {
+    flushJdbcBatchOnQuery(request);
+    return queryEngine.findResultSet(request);
+  }
+
   @Override
   public <T> int findCount(OrmQueryRequest<T> request) {
 
diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
index f401863a2..4be7bec7b 100644
--- a/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.query;
 
 import io.ebean.SqlRow;
+import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.core.Message;
 import io.ebeaninternal.server.core.RelationalQueryEngine;
 import io.ebeaninternal.server.core.RelationalQueryRequest;
@@ -39,7 +40,7 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
   public void findEach(RelationalQueryRequest request, Predicate<SqlRow> consumer) {
 
     try {
-      request.executeSql(binder);
+      request.executeSql(binder, SpiQuery.Type.ITERATE);
       while (request.next()) {
         if (!consumer.test(readRow(request))) {
           break;
@@ -59,7 +60,7 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
   public void findEach(RelationalQueryRequest request, Consumer<SqlRow> consumer) {
 
     try {
-      request.executeSql(binder);
+      request.executeSql(binder, SpiQuery.Type.ITERATE);
       while (request.next()) {
         consumer.accept(readRow(request));
       }
@@ -77,7 +78,7 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
   public List<SqlRow> findList(RelationalQueryRequest request) {
 
     try {
-      request.executeSql(binder);
+      request.executeSql(binder, SpiQuery.Type.LIST);
       List<SqlRow> rows = new ArrayList<>();
       while (request.next()) {
         rows.add(readRow(request));
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 1c572cf91..8811096eb 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -442,7 +442,7 @@ public final class SqlTreeBuilder {
         p = desc.findBeanProperty("id");
         selectProps.add(p);
 
-      } else if (p.isId() && isNotSingleAttribute()) {
+      } else if (p.isId() && excludeIdProperty()) {
         // do not bother to include id for normal queries as the
         // id is always added (except for subQueries)
 
@@ -722,6 +722,13 @@ public final class SqlTreeBuilder {
 
   }
 
+  /**
+   * Return true if the Id property should be excluded (as it is automatically included).
+   */
+  private boolean excludeIdProperty() {
+    return query == null || !query.isSingleAttribute() && !query.isManualId();
+  }
+
   /**
    * Return true if the query is not a single attribute query.
    */
diff --git a/src/main/java/io/ebeaninternal/server/query/dto/DtoQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/dto/DtoQueryEngine.java
index 29944d117..fceed1465 100644
--- a/src/main/java/io/ebeaninternal/server/query/dto/DtoQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/query/dto/DtoQueryEngine.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.query.dto;
 
+import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.core.DtoQueryRequest;
 import io.ebeaninternal.server.core.Message;
 import io.ebeaninternal.server.persist.Binder;
@@ -20,7 +21,7 @@ public class DtoQueryEngine {
 
   public <T> List<T> findList(DtoQueryRequest<T> request) {
     try {
-      request.executeSql(binder);
+      request.executeSql(binder, SpiQuery.Type.LIST);
       List<T> rows = new ArrayList<>();
       while (request.next()) {
         rows.add(request.readNextBean());
@@ -36,7 +37,7 @@ public class DtoQueryEngine {
 
   public <T> void findEach(DtoQueryRequest<T> request, Consumer<T> consumer) {
      try {
-      request.executeSql(binder);
+      request.executeSql(binder, SpiQuery.Type.ITERATE);
       while (request.next()) {
         consumer.accept(request.readNextBean());
       }
@@ -50,7 +51,7 @@ public class DtoQueryEngine {
 
   public <T> void findEachWhile(DtoQueryRequest<T> request, Predicate<T> consumer) {
     try {
-      request.executeSql(binder);
+      request.executeSql(binder, SpiQuery.Type.ITERATE);
       while (request.next()) {
         if (!consumer.test(request.readNextBean())) {
           break;
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
index a3def9baa..cf3158974 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
@@ -4,6 +4,7 @@ import io.ebean.DtoQuery;
 import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.SpiDtoQuery;
 import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.dto.DtoBeanDescriptor;
 import io.ebeaninternal.server.dto.DtoMappingRequest;
 import io.ebeaninternal.server.dto.DtoQueryPlan;
@@ -22,6 +23,8 @@ public class DefaultDtoQuery<T> implements SpiDtoQuery<T> {
 
   private final DtoBeanDescriptor<T> descriptor;
 
+  private final SpiQuery<?> ormQuery;
+
   private String sql;
 
   private int firstRow;
@@ -42,11 +45,21 @@ public class DefaultDtoQuery<T> implements SpiDtoQuery<T> {
   private final BindParams bindParams = new BindParams();
 
   /**
-   * Additional supply a query detail object.
+   * Create given an underlying ORM query.
+   */
+  public DefaultDtoQuery(SpiEbeanServer server, DtoBeanDescriptor<T> descriptor, SpiQuery<?> ormQuery) {
+    this.server = server;
+    this.descriptor = descriptor;
+    this.ormQuery = ormQuery;
+  }
+
+  /**
+   * Create given a native SQL query.
    */
   public DefaultDtoQuery(SpiEbeanServer server, DtoBeanDescriptor<T> descriptor, String sql) {
     this.server = server;
     this.descriptor = descriptor;
+    this.ormQuery = null;
     this.sql = sql;
   }
 
@@ -56,7 +69,7 @@ public class DefaultDtoQuery<T> implements SpiDtoQuery<T> {
   }
 
   @Override
-  public DtoQueryPlan getQueryPlan(String planKey) {
+  public DtoQueryPlan getQueryPlan(Object planKey) {
     return descriptor.getQueryPlan(planKey);
   }
 
@@ -66,7 +79,7 @@ public class DefaultDtoQuery<T> implements SpiDtoQuery<T> {
   }
 
   @Override
-  public void putQueryPlan(String planKey, DtoQueryPlan plan) {
+  public void putQueryPlan(Object planKey, DtoQueryPlan plan) {
     descriptor.putQueryPlan(planKey, plan);
   }
 
@@ -97,13 +110,21 @@ public class DefaultDtoQuery<T> implements SpiDtoQuery<T> {
 
   @Override
   public DtoQuery<T> setParameter(int position, Object value) {
-    bindParams.setParameter(position, value);
+    if (ormQuery != null) {
+      ormQuery.setParameter(position, value);
+    } else {
+      bindParams.setParameter(position, value);
+    }
     return this;
   }
 
   @Override
   public DtoQuery<T> setParameter(String paramName, Object value) {
-    bindParams.setParameter(paramName, value);
+    if (ormQuery != null) {
+      ormQuery.setParameter(paramName, value);
+    } else {
+      bindParams.setParameter(paramName, value);
+    }
     return this;
   }
 
@@ -117,6 +138,10 @@ public class DefaultDtoQuery<T> implements SpiDtoQuery<T> {
     return descriptor.getType();
   }
 
+  public SpiQuery<?> getOrmQuery() {
+    return ormQuery;
+  }
+
   @Override
   public DtoQuery<T> setRelaxedMode() {
     this.relaxedMode = true;
@@ -147,6 +172,9 @@ public class DefaultDtoQuery<T> implements SpiDtoQuery<T> {
   @Override
   public DtoQuery<T> setFirstRow(int firstRow) {
     this.firstRow = firstRow;
+    if (ormQuery != null) {
+      ormQuery.setFirstRow(firstRow);
+    }
     return this;
   }
 
@@ -158,6 +186,9 @@ public class DefaultDtoQuery<T> implements SpiDtoQuery<T> {
   @Override
   public DtoQuery<T> setMaxRows(int maxRows) {
     this.maxRows = maxRows;
+    if (ormQuery != null) {
+      ormQuery.setMaxRows(maxRows);
+    }
     return this;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index a66619796..7a908b410 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.querydefn;
 
 import io.ebean.CacheMode;
 import io.ebean.CountDistinctOrder;
+import io.ebean.DtoQuery;
 import io.ebean.Expression;
 import io.ebean.ExpressionFactory;
 import io.ebean.ExpressionList;
@@ -130,6 +131,11 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   private String lazyLoadManyPath;
 
+  /**
+   * Flag set for report/DTO beans when we may choose to explicitly include the Id property.
+   */
+  private boolean manualId;
+
   /**
    * Set to true by a user wanting a DISTINCT query (id property must be excluded).
    */
@@ -280,6 +286,11 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     this.nativeSql = nativeSql;
   }
 
+  @Override
+  public <D> DtoQuery<D> asDto(Class<D> dtoClass) {
+    return server.findDto(dtoClass, this);
+  }
+
   @Override
   public BeanDescriptor<T> getBeanDescriptor() {
     return beanDescriptor;
@@ -668,7 +679,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
    */
   @Override
   public boolean isWithId() {
-    return !distinct && !singleAttribute;
+    return !manualId && !distinct && !singleAttribute;
   }
 
   @Override
@@ -1027,7 +1038,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
       queryPlanKey = new NativeSqlQueryPlanKey(nativeSql + "-" + firstRow + "-" + maxRows);
     } else {
       queryPlanKey = new OrmQueryPlanKey(beanDescriptor.getDiscValue(), m2mIncludeJoin, type, detail, maxRows, firstRow,
-        disableLazyLoading, orderBy,
+        disableLazyLoading, manualId, orderBy,
         distinct, sqlDistinct, mapKey, id, bindParams, whereExpressions, havingExpressions,
         temporalMode, forUpdate, rootTableAlias, rawSql, updateProperties, countDistinctOrder);
     }
@@ -1044,6 +1055,11 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return nativeSql;
   }
 
+  @Override
+  public Object getQueryPlanKey() {
+    return queryPlanKey;
+  }
+
   /**
    * Prepare the query which prepares any expressions (sub-query expressions etc) and calculates the query plan key.
    */
@@ -1475,6 +1491,16 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return this;
   }
 
+  @Override
+  public boolean isManualId() {
+    return manualId;
+  }
+
+  @Override
+  public void setManualId(boolean manualId) {
+    this.manualId = manualId;
+  }
+
   /**
    * return true if user specified to use SQL DISTINCT (effectively excludes id property).
    */
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
index eb7ca79c1..da91f6ea2 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
@@ -22,7 +22,7 @@ class OrmQueryPlanKey implements CQueryPlanKey {
   private final String description;
 
   OrmQueryPlanKey(String discValue, TableJoin m2mIncludeTable, SpiQuery.Type type, OrmQueryDetail detail, int maxRows, int firstRow, boolean disableLazyLoading,
-                  OrderBy<?> orderBy, boolean distinct, boolean sqlDistinct, String mapKey, Object id, BindParams bindParams,
+                  boolean manualId, OrderBy<?> orderBy, boolean distinct, boolean sqlDistinct, String mapKey, Object id, BindParams bindParams,
                   SpiExpression whereExpressions, SpiExpression havingExpressions, SpiQuery.TemporalMode temporalMode,
                   Query.ForUpdate forUpdate, String rootTableAlias, SpiRawSql rawSql, OrmUpdateProperties updateProperties, CountDistinctOrder countDistinctOrder) {
 
@@ -42,6 +42,9 @@ class OrmQueryPlanKey implements CQueryPlanKey {
     if (id != null) {
       sb.append(",id:");
     }
+    if (manualId) {
+      sb.append(",manId:");
+    }
     if (distinct) {
       sb.append(",dist:");
     }
diff --git a/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
new file mode 100644
index 000000000..af22c17c6
--- /dev/null
+++ b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
@@ -0,0 +1,297 @@
+package io.ebean;
+
+import io.ebean.meta.MetaQueryMetric;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.tests.model.basic.Contact;
+import org.tests.model.basic.ResetBasicData;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class DtoQueryFromOrmTest extends BaseTestCase {
+
+//  @BeforeClass
+//  public static void resetStats() {
+//    Ebean.getDefaultServer().getMetaInfoManager().collectQueryStatistics(true);
+//  }
+//
+//  @AfterClass
+//  public static void reportStats() {
+//    List<MetaQueryMetric> stats = Ebean.getDefaultServer().getMetaInfoManager().collectQueryStatistics(false);
+//    for (MetaQueryMetric stat : stats) {
+//      System.out.println(stat);
+//    }
+//  }
+
+  @Ignore
+  @Test
+  public void testPlanHits() {
+
+    ResetBasicData.reset();
+
+    Ebean.getDefaultServer().getMetaInfoManager().collectQueryStatistics(true);
+
+    String[] prefix = {"Bl", "B", "Red"};
+
+    for (String val : prefix) {
+      List<ContactDto> list = Ebean.find(Contact.class)
+        .select("email, concat(lastName,', ',firstName) as fullName")
+        .where().istartsWith("concat(lastName,', ',firstName)", val)
+        .orderBy().asc("lastName")
+        .setMaxRows(10)
+        .asDto(ContactDto.class)
+        .findList();
+
+      System.out.println("List:" + list);
+    }
+
+    List<MetaQueryMetric> stats = Ebean.getDefaultServer().getMetaInfoManager().collectQueryStatistics(true);
+    for (MetaQueryMetric stat : stats) {
+      System.out.println(stat);
+    }
+
+    assertThat(stats).hasSize(1);
+    assertThat(stats.get(0).getCount()).isEqualTo(3);
+
+  }
+
+  @Test
+  public void asDto_withExplicitId() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    DtoQuery<ContactDto> query =
+      Ebean.find(Contact.class)
+        // we must explicitly add the id property for DTO query (if we want it)
+        .select("id, email, concat(lastName,', ',firstName) as fullName")
+        .where().isNotNull("email").isNotNull("lastName")
+        .orderBy().asc("lastName")
+        .asDto(ContactDto.class)
+        .setRelaxedMode();
+
+    List<ContactDto> dtos = query.findList();
+
+    assertThat(dtos).isNotEmpty();
+
+    for (ContactDto dto : dtos) {
+      assertThat(dto.getEmail()).isNotNull();
+      assertThat(dto.getFullName()).isNotNull();
+      System.out.println(dto);
+    }
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select t0.id, t0.email, concat(t0.last_name,', ',t0.first_name) fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+  }
+
+  @Test
+  public void asDto_withoutExplicitId() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    DtoQuery<ContactDto> query =
+      Ebean.find(Contact.class)
+        .select("email, concat(lastName,', ',firstName) as fullName")
+        .where().isNotNull("email").isNotNull("lastName")
+        .orderBy().asc("lastName")
+        .asDto(ContactDto.class);
+
+    List<ContactDto> dtos = query.findList();
+
+    assertThat(dtos).isNotEmpty();
+
+    for (ContactDto dto : dtos) {
+      assertThat(dto.getEmail()).isNotNull();
+      assertThat(dto.getFullName()).isNotNull();
+      System.out.println(dto);
+    }
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select t0.email, concat(t0.last_name,', ',t0.first_name) fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+  }
+
+
+  @Test
+  public void example() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    List<ContactDto> contactDtos
+      = Ebean.find(Contact.class)
+      .select("email, concat(lastName,', ',firstName) as fullName")
+      .where().isNotNull("email").isNotNull("lastName")
+      .orderBy().asc("lastName")
+      .setMaxRows(10)
+      .asDto(ContactDto.class)
+      .findList();
+
+    assertThat(contactDtos).isNotEmpty();
+
+    for (ContactDto dto : contactDtos) {
+      assertThat(dto.getEmail()).isNotNull();
+      assertThat(dto.getFullName()).isNotNull();
+      System.out.println(dto);
+    }
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select t0.email, concat(t0.last_name,', ',t0.first_name) fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+  }
+
+  @Test
+  public void example_explicitId() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    List<ContactDto> contactDtos
+      = Ebean.find(Contact.class)
+      .select("id, email, concat(lastName,', ',firstName) as fullName")
+      .where().isNotNull("email").isNotNull("lastName")
+      .orderBy().asc("lastName")
+      .setMaxRows(10)
+      .asDto(ContactDto.class)
+      .findList();
+
+    assertThat(contactDtos).isNotEmpty();
+
+    for (ContactDto dto : contactDtos) {
+      System.out.println(dto);
+      assertThat(dto.getId()).isNotNull();
+      assertThat(dto.getFullName()).isNotNull();
+      assertThat(dto.getEmail()).isNotNull();
+    }
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select t0.id, t0.email, concat(t0.last_name,', ',t0.first_name) fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+  }
+
+  @Test
+  public void example_singleProperty() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    List<ContactDto> contactDtos
+      = Ebean.find(Contact.class)
+      .select("concat(lastName,', ',firstName) as fullName")
+      .where().isNotNull("lastName")
+      .orderBy().asc("lastName")
+      .asDto(ContactDto.class)
+      .setFirstRow(2)
+      .setMaxRows(5)
+      .findList();
+
+    assertThat(contactDtos).isNotEmpty();
+
+    for (ContactDto dto : contactDtos) {
+      System.out.println(dto);
+      assertThat(dto.getFullName()).isNotNull();
+      assertThat(dto.getId()).isNull();
+      assertThat(dto.getEmail()).isNull();
+    }
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select concat(t0.last_name,', ',t0.first_name) fullName from contact t0 where");
+  }
+
+
+  @Test
+  public void example_aggregate() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    List<ContactTotals> contactDtos
+      = Ebean.find(Contact.class)
+      .select("lastName, count(*) as totalCount")
+      .where().isNotNull("lastName")
+      .having().gt("count(*)", 1)
+      .orderBy().desc("count(*)")
+      .asDto(ContactTotals.class)
+      .findList();
+
+    assertThat(contactDtos).isNotEmpty();
+
+    for (ContactTotals dto : contactDtos) {
+      assertThat(dto.getLastName()).isNotNull();
+      assertThat(dto.getTotalCount()).isNotNull();
+    }
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select t0.last_name, count(*) totalCount from contact t0 where t0.last_name is not null  group by t0.last_name having count(*) > ?");
+  }
+
+  public static class ContactTotals {
+
+    String lastName;
+    Long totalCount;
+
+    @Override
+    public String toString() {
+      return "lastName:" + lastName + " total:" + totalCount;
+    }
+
+    public String getLastName() {
+      return lastName;
+    }
+
+    public void setLastName(String lastName) {
+      this.lastName = lastName;
+    }
+
+    public Long getTotalCount() {
+      return totalCount;
+    }
+
+    public void setTotalCount(Long totalCount) {
+      this.totalCount = totalCount;
+    }
+  }
+
+  public static class ContactDto {
+
+    String email;
+    String fullName;
+    Integer id;
+
+    @Override
+    public String toString() {
+      return "id:" + id + " email:" + email + " fn:" + fullName;
+    }
+
+    public String getEmail() {
+      return email;
+    }
+
+    public String getFullName() {
+      return fullName;
+    }
+
+    public void setEmail(String email) {
+      this.email = email;
+    }
+
+    public void setFullName(String fullName) {
+      this.fullName = fullName;
+    }
+
+    public Integer getId() {
+      return id;
+    }
+
+    public void setId(Integer id) {
+      this.id = id;
+    }
+  }
+}
diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index 28bf61ec4..349767266 100644
--- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -41,6 +41,7 @@ import io.ebean.plugin.SpiServer;
 import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler;
+import io.ebeaninternal.server.core.SpiResultSet;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.query.CQuery;
@@ -414,6 +415,16 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
     return null;
   }
 
+  @Override
+  public <D> DtoQuery<D> findDto(Class<D> dtoType, SpiQuery<?> ormQuery) {
+    return null;
+  }
+
+  @Override
+  public SpiResultSet findResultSet(SpiQuery<?> ormQuery, SpiTransaction transaction) {
+    return null;
+  }
+
   @Override
   public SqlQuery createSqlQuery(String sql) {
     return null;
diff --git a/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java b/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java
index 1ab27c6d0..7df67e9a7 100644
--- a/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java
+++ b/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java
@@ -10,8 +10,8 @@ import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoin;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn;
 import io.ebeaninternal.server.expression.BaseExpressionTest;
-import org.tests.model.basic.Customer;
 import org.junit.Test;
+import org.tests.model.basic.Customer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -21,8 +21,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
   @Test
   public void equals_when_defaults() {
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
 
     assertSame(key1, key2);
   }
@@ -30,9 +30,9 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
   @Test
   public void equals_when_diffDiscValue() {
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey("A", null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key3 = new OrmQueryPlanKey("B", null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey("A", null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key3 = new OrmQueryPlanKey("B", null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
     assertDifferent(key2, key3);
   }
@@ -42,8 +42,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
 
     TableJoin tableJoin = tableJoin("table", "id", "customer_id");
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, tableJoin, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, tableJoin, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
 
     assertDifferent(key1, key2);
   }
@@ -54,8 +54,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
     TableJoin tableJoin1 = tableJoin("one", "id", "customer_id");
     TableJoin tableJoin2 = tableJoin("two", "id", "customer_id");
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, tableJoin1, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, tableJoin2, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, tableJoin1, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, tableJoin2, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
 
     assertDifferent(key1, key2);
   }
@@ -66,8 +66,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
     TableJoin tableJoin1 = tableJoin("one", "id", "customer_id");
     TableJoin tableJoin2 = tableJoin("one", "id", "customer_id");
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, tableJoin1, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, tableJoin2, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, tableJoin1, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, tableJoin2, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
 
     assertSame(key1, key2);
   }
@@ -82,8 +82,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
   @Test
   public void equals_when_diffQueryType() {
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.LIST, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.LIST, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
 
     assertDifferent(key1, key2);
   }
@@ -91,8 +91,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
   @Test
   public void equals_when_firstRowsDifferent() {
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 10, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 10, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
 
     assertDifferent(key1, key2);
   }
@@ -100,8 +100,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
   @Test
   public void equals_when_maxRowsDifferent() {
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 10, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 10, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
 
     assertDifferent(key1, key2);
   }
@@ -109,8 +109,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
   @Test
   public void equals_when_firstRowsMaxRowsSame() {
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 10, 20, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 10, 20, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 10, 20, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 10, 20, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
 
     assertSame(key1, key2);
   }
@@ -118,8 +118,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
   @Test
   public void equals_when_diffDisableLazyLoading() {
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, true, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, true, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
 
     assertDifferent(key1, key2);
   }
@@ -128,8 +128,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
   public void equals_when_diffOrderByNull() {
 
     OrderBy<Object> o1 = new OrderBy<>("id");
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, o1, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, o1, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
 
     assertDifferent(key1, key2);
   }
@@ -139,121 +139,121 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
 
     OrderBy<Object> o1 = new OrderBy<>("id, name");
     OrderBy<Object> o2 = new OrderBy<>("id, name");
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, o1, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, o2, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, o1, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, o2, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
 
     assertSame(key1, key2);
   }
 
   @Test
   public void equals_when_diffDistinct() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, true, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, true, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_sameDistinct() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, true, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, true, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, true, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, true, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertSame(key1, key2);
   }
 
   @Test
   public void equals_when_diffSqlDistinct() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, true, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, true, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_sameSqlDistinct() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, true, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, true, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, true, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, true, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertSame(key1, key2);
   }
 
   @Test
   public void equals_when_diffMapKeyNull() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, "mapKey", null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, "mapKey", null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_diffMapKey() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, "mapKey", null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, "diff", null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, "mapKey", null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, "diff", null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_sameMapKey() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, "mapKey", null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, "mapKey", null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, "mapKey", null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, "mapKey", null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertSame(key1, key2);
   }
 
   @Test
   public void equals_when_diffIdNull() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, 42, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, 42, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_idBothGiven() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, 42, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, 23, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, 42, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, 23, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertSame(key1, key2);
   }
 
   @Test
   public void equals_when_diffTemporalMode() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.DRAFT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.DRAFT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_diffForUpdate() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, Query.ForUpdate.BASE, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, Query.ForUpdate.BASE, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_diffForUpdate_NoWait() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, Query.ForUpdate.BASE, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, Query.ForUpdate.NOWAIT, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, Query.ForUpdate.BASE, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, Query.ForUpdate.NOWAIT, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_diffForUpdate_SkipLocked() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, Query.ForUpdate.BASE, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, Query.ForUpdate.SKIPLOCKED, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, Query.ForUpdate.BASE, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, Query.ForUpdate.SKIPLOCKED, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_diffRootAliasNull() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, "rootAlias", null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, "rootAlias", null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_diffRootAlias() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, "rootAlias", null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, "diff", null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, "rootAlias", null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, "diff", null, null, null);
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_sameRootAlias() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, "rootAlias", null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, "rootAlias", null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, "rootAlias", null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, "rootAlias", null, null, null);
     assertSame(key1, key2);
   }
 
@@ -280,8 +280,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
     SpiExpressionList<Customer> list1 = list_id_eq_42();
     SpiExpressionList<Customer> list2 = list_id_eq_43();
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, list1, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, list2, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, list1, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, list2, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertSame(key1, key2);
   }
 
@@ -292,8 +292,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
     SpiExpressionList<Customer> where1 = list_id_eq_42();
     SpiExpressionList<Customer> where2 = list_id_eq_42_and_name_eq_rob();
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, where1, null, SpiQuery.TemporalMode.DRAFT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, where2, null, SpiQuery.TemporalMode.DRAFT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, where1, null, SpiQuery.TemporalMode.DRAFT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, where2, null, SpiQuery.TemporalMode.DRAFT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
@@ -302,8 +302,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
 
     SpiExpressionList<Customer> list1 = list_id_eq_42();
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, list1, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, list1, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
@@ -312,8 +312,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
 
     SpiExpressionList<Customer> list1 = list_id_eq_42();
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, list1, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, list1, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
@@ -323,8 +323,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
     SpiExpression having1 = list_id_eq_42().copyForPlanKey();
     SpiExpression having2 = list_id_eq_42_and_name_eq_rob().copyForPlanKey();
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, having1, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, having2, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, having1, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, having2, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
@@ -334,8 +334,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
     SpiExpression having1 = list_id_eq_42().copyForPlanKey();
     SpiExpression having2 = list_id_eq_42().copyForPlanKey();
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, having1, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, having2, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, having1, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, having2, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertSame(key1, key2);
   }
 
@@ -344,8 +344,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
 
     SpiExpression having1 = list_id_eq_42().copyForPlanKey();
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, having1, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, having1, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
@@ -354,8 +354,16 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
 
     SpiExpression having1 = list_id_eq_42().copyForPlanKey();
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, having1, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, having1, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    assertDifferent(key1, key2);
+  }
+
+  @Test
+  public void equals_when_manualId() {
+
+    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, true, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
     assertDifferent(key1, key2);
   }
 
diff --git a/src/test/java/org/tests/query/aggregation/TestAggregationCount.java b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
index 330e769f9..dcbdcdf1e 100644
--- a/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
+++ b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
@@ -3,7 +3,6 @@ package org.tests.query.aggregation;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
-import org.assertj.core.api.Assertions;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -40,7 +39,6 @@ public class TestAggregationCount extends BaseTestCase {
     Ebean.save(three);
     three.setName("third");
     Ebean.save(three);
-
   }
 
   @Test
@@ -232,7 +230,6 @@ public class TestAggregationCount extends BaseTestCase {
       .query();
 
     Timestamp maxUpdateTime = query0.findSingleAttribute();
-    System.out.println(""+maxUpdateTime);
     assertThat(maxUpdateTime).isNotNull();
 
     String sql = sqlOf(query0, 5);
@@ -256,8 +253,7 @@ public class TestAggregationCount extends BaseTestCase {
       .select("max(orderQty)");
 
     Integer maxOrderQty = query.findSingleAttribute();
-    System.out.println(""+maxOrderQty);
-    Assertions.assertThat(maxOrderQty).isGreaterThan(20);
+    assertThat(maxOrderQty).isGreaterThan(20);
 
     String sql = sqlOf(query, 5);
     assertThat(sql).contains("select max(t0.order_qty) from o_order_detail t0");
@@ -272,7 +268,6 @@ public class TestAggregationCount extends BaseTestCase {
       .select("min(orderQty)");
 
     Integer minOrderQty = query.findSingleAttribute();
-    System.out.println(""+minOrderQty);
     assertThat(minOrderQty).isLessThan(10);
 
     String sql = sqlOf(query, 5);
@@ -288,7 +283,7 @@ public class TestAggregationCount extends BaseTestCase {
       .select("max(lastName)");
 
     String maxName = query.findSingleAttribute();
-    System.out.println(""+maxName);
+    assertThat(maxName).isNotNull();
 
     String sql = sqlOf(query, 5);
     assertThat(sql).contains("select max(t0.last_name) from contact t0");
@@ -303,7 +298,6 @@ public class TestAggregationCount extends BaseTestCase {
       .select("min(firstName)");
 
     String minName = query.findSingleAttribute();
-    System.out.println(""+minName);
     assertThat(minName).isNotNull();
 
     String sql = sqlOf(query, 5);
@@ -320,7 +314,6 @@ public class TestAggregationCount extends BaseTestCase {
       .select("count(lastName)");
 
     Long count = query.findSingleAttribute();
-    System.out.println(""+count);
     assertThat(count).isNotNull();
 
     String sql = sqlOf(query, 5);
@@ -336,7 +329,6 @@ public class TestAggregationCount extends BaseTestCase {
       .select("count(distinct lastName)");
 
     Long count = query.findSingleAttribute();
-    System.out.println(""+count);
     assertThat(count).isNotNull();
 
     String sql = sqlOf(query, 5);
@@ -352,9 +344,9 @@ public class TestAggregationCount extends BaseTestCase {
 
     String maxLastName =
       Ebean.find(Contact.class)
-      .select("max(lastName)")
-      .where().isNull("phone")
-      .findSingleAttribute();
+        .select("max(lastName)")
+        .where().isNull("phone")
+        .findSingleAttribute();
 
     assertThat(maxLastName).isNotNull();
 
@@ -371,11 +363,10 @@ public class TestAggregationCount extends BaseTestCase {
 
     Long count =
       Ebean.find(Contact.class)
-      .select("count(distinct lastName)")
-      .where().isEmpty("notes")
-      .findSingleAttribute();
+        .select("count(distinct lastName)")
+        .where().isEmpty("notes")
+        .findSingleAttribute();
 
-    System.out.println(""+count);
     assertThat(count).isNotNull();
 
     List<String> sql = LoggedSqlCollector.stop();

From 3cb52917e34f0b96bb205e1c0dfb1ff0af94bd0b Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 7 Mar 2018 02:03:54 +1300
Subject: [PATCH 0145/1036] #1335 - Add Try catch to YAML loading ... add
 system property ebeanSkipYaml ... to enable skipping the read of
 application.yml (well, all yml)

---
 .../io/ebean/config/properties/Loader.java    | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/main/java/io/ebean/config/properties/Loader.java b/src/main/java/io/ebean/config/properties/Loader.java
index 036b504fa..283b2c6e2 100644
--- a/src/main/java/io/ebean/config/properties/Loader.java
+++ b/src/main/java/io/ebean/config/properties/Loader.java
@@ -28,16 +28,18 @@ class Loader {
   private YamlLoader yamlLoader;
 
 	Loader() {
-
-		try {
-			Class<?> exists = Class.forName("org.yaml.snakeyaml.Yaml");
-			if (exists != null) {
-				yamlLoader = new YamlLoader(loadContext);
-			}
-		} catch (Exception e) {
-			// ignored
-		}
-	}
+    String skipYaml = System.getProperty("ebeanSkipYaml");
+    if (!"true".equals(skipYaml)) {
+      try {
+        Class<?> exists = Class.forName("org.yaml.snakeyaml.Yaml");
+        if (exists != null) {
+          yamlLoader = new YamlLoader(loadContext);
+        }
+      } catch (Exception e) {
+        // ignored
+      }
+    }
+  }
 
   /**
    * Load the configuration with the expected ordering.
@@ -115,7 +117,11 @@ class Loader {
 
 	void loadYaml(String resourcePath, Source source) {
 		if (yamlLoader != null) {
-			yamlLoader.load(resource(resourcePath, source));
+		  try {
+			  yamlLoader.load(resource(resourcePath, source));
+      } catch (Exception e) {
+        log.warn("Failed to read yml from:" + resourcePath, e);
+      }
 		}
 	}
 

From 2019bc7bf1454f50936d673293fb9266b65bcd4c Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 7 Mar 2018 02:19:10 +1300
Subject: [PATCH 0146/1036] #1336 - Change DDL generation such that it does
 create index before alter table add foreign key

---
 .../dbmigration/ddlgeneration/platform/BaseTableDdl.java   | 7 +++----
 .../assert/BaseTableDdlTest/createTable-applyLast.txt      | 2 +-
 .../resources/assert/ModelBuild_compoundKeyTest/apply.sql  | 4 ++--
 .../assert/ModelBuild_explicitSequencesTest/apply.sql      | 2 +-
 .../assert/ModelBuild_explicitSequencesTest/pg-apply.sql   | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
index 459531eea..f396312f2 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
@@ -435,15 +435,15 @@ public class BaseTableDdl implements TableDdl {
 
   protected void writeForeignKey(DdlWrite write, WriteForeignKey request) throws IOException {
 
-    String tableName = lowerTableName(request.table());
     DdlBuffer fkeyBuffer = write.applyForeignKeys();
-    alterTableAddForeignKey(fkeyBuffer, request);
-
+    String tableName = lowerTableName(request.table());
     if (request.indexName() != null) {
       // no matching unique constraint so add the index
       fkeyBuffer.append(platformDdl.createIndex(request.indexName(), tableName, request.cols())).endOfStatement();
     }
 
+    alterTableAddForeignKey(fkeyBuffer, request);
+
     fkeyBuffer.end();
 
     write.dropAllForeignKeys()
@@ -455,7 +455,6 @@ public class BaseTableDdl implements TableDdl {
     }
 
     write.dropAllForeignKeys().end();
-
   }
 
   protected void alterTableAddForeignKey(DdlBuffer buffer, WriteForeignKey request) throws IOException {
diff --git a/src/test/resources/assert/BaseTableDdlTest/createTable-applyLast.txt b/src/test/resources/assert/BaseTableDdlTest/createTable-applyLast.txt
index 1f68497c3..c542cc572 100644
--- a/src/test/resources/assert/BaseTableDdlTest/createTable-applyLast.txt
+++ b/src/test/resources/assert/BaseTableDdlTest/createTable-applyLast.txt
@@ -1,3 +1,3 @@
-alter table mytable add constraint fk_mytable_order_id foreign key (order_id) references orders (id) on delete restrict on update restrict;
 create index ix_mytable_order_id on mytable (order_id);
+alter table mytable add constraint fk_mytable_order_id foreign key (order_id) references orders (id) on delete restrict on update restrict;
 
diff --git a/src/test/resources/assert/ModelBuild_compoundKeyTest/apply.sql b/src/test/resources/assert/ModelBuild_compoundKeyTest/apply.sql
index e0789ab8a..8951d13e2 100644
--- a/src/test/resources/assert/ModelBuild_compoundKeyTest/apply.sql
+++ b/src/test/resources/assert/ModelBuild_compoundKeyTest/apply.sql
@@ -21,9 +21,9 @@ create table ckey_parent (
   constraint pk_ckey_parent primary key (one_key,two_key)
 );
 
-alter table ckey_detail add constraint fk_ckey_detail_parent foreign key (one_key,two_key) references ckey_parent (one_key,two_key) on delete restrict on update restrict;
 create index ix_ckey_detail_parent on ckey_detail (one_key,two_key);
+alter table ckey_detail add constraint fk_ckey_detail_parent foreign key (one_key,two_key) references ckey_parent (one_key,two_key) on delete restrict on update restrict;
 
-alter table ckey_parent add constraint fk_ckey_parent_assoc_id foreign key (assoc_id) references ckey_assoc (id) on delete restrict on update restrict;
 create index ix_ckey_parent_assoc_id on ckey_parent (assoc_id);
+alter table ckey_parent add constraint fk_ckey_parent_assoc_id foreign key (assoc_id) references ckey_assoc (id) on delete restrict on update restrict;
 
diff --git a/src/test/resources/assert/ModelBuild_explicitSequencesTest/apply.sql b/src/test/resources/assert/ModelBuild_explicitSequencesTest/apply.sql
index 88a80916d..331c29ad3 100644
--- a/src/test/resources/assert/ModelBuild_explicitSequencesTest/apply.sql
+++ b/src/test/resources/assert/ModelBuild_explicitSequencesTest/apply.sql
@@ -13,6 +13,6 @@ create table phones (
   constraint pk_phones primary key (id)
 );
 
-alter table phones add constraint fk_phones_person_id foreign key (person_id) references persons (id) on delete restrict on update restrict;
 create index ix_phones_person_id on phones (person_id);
+alter table phones add constraint fk_phones_person_id foreign key (person_id) references persons (id) on delete restrict on update restrict;
 
diff --git a/src/test/resources/assert/ModelBuild_explicitSequencesTest/pg-apply.sql b/src/test/resources/assert/ModelBuild_explicitSequencesTest/pg-apply.sql
index d22ff78ec..329da196f 100644
--- a/src/test/resources/assert/ModelBuild_explicitSequencesTest/pg-apply.sql
+++ b/src/test/resources/assert/ModelBuild_explicitSequencesTest/pg-apply.sql
@@ -13,6 +13,6 @@ create table phones (
   constraint pk_phones primary key (id)
 );
 
-alter table phones add constraint fk_phones_person_id foreign key (person_id) references persons (id) on delete restrict on update restrict;
 create index ix_phones_person_id on phones (person_id);
+alter table phones add constraint fk_phones_person_id foreign key (person_id) references persons (id) on delete restrict on update restrict;
 

From 1ba21d5c4324fa3e15c568a41fcaa631d5785538 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 7 Mar 2018 02:22:58 +1300
Subject: [PATCH 0147/1036] Bump to 11.14.1-SNAPSHOT ... Modified DDL
 generation order of create index vs alter table add FK

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bf454b12d..ada2fa29c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.13.2-SNAPSHOT</version>
+  <version>11.14.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>

From 70c3860a65f3c5becebd05de85e86b1f029a67e6 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 7 Mar 2018 02:24:07 +1300
Subject: [PATCH 0148/1036] [maven-release-plugin] prepare release
 ebean-11.14.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ada2fa29c..b9c202534 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.14.1-SNAPSHOT</version>
+  <version>11.14.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.14.1</tag>
   </scm>
 
   <profiles>

From 70aed3906edb0b554a2217cef1741dc76548e27d Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 7 Mar 2018 02:24:21 +1300
Subject: [PATCH 0149/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b9c202534..8918f3d3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.14.1</version>
+  <version>11.14.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.14.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 47e8d27212126cf7e7b7aca8c241c5838674ed9a Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 7 Mar 2018 16:21:00 +1300
Subject: [PATCH 0150/1036] #1337 - Fix YamlLoader ... such that it loads
 multi-part yml source

---
 src/main/java/io/ebean/config/properties/YamlLoader.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebean/config/properties/YamlLoader.java b/src/main/java/io/ebean/config/properties/YamlLoader.java
index 2c472b22b..b7157810e 100644
--- a/src/main/java/io/ebean/config/properties/YamlLoader.java
+++ b/src/main/java/io/ebean/config/properties/YamlLoader.java
@@ -21,9 +21,12 @@ class YamlLoader {
     this.loadContext = loadContext;
   }
 
+  @SuppressWarnings("unchecked")
   void load(InputStream is) {
     if (is != null) {
-      loadMap(yaml.load(is), null);
+      for (Object map : yaml.loadAll(is)) {
+        loadMap((Map<String, Object>)map, null);
+      }
     }
   }
 

From baa7242939047f525beb3f5445e23ac5eeddcc1a Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 7 Mar 2018 16:43:42 +1300
Subject: [PATCH 0151/1036] #1338 - Regression since 11.12.1 - resolve
 expressions in Properties given to serverConfig.loadFromProperties()

---
 src/main/java/io/ebean/config/ServerConfig.java  | 12 ++++++++++--
 .../config/properties/PropertiesLoader.java      | 16 ++++++++++++++++
 .../io/ebean/config/PropertiesWrapperTest.java   | 14 +++++++++++---
 .../java/io/ebean/config/ServerConfigTest.java   | 16 ++++++++++++++++
 4 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 0c6edcc64..b0b5f362a 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -2642,7 +2642,8 @@ public class ServerConfig {
    * Load settings from ebean.properties.
    */
   public void loadFromProperties() {
-    loadFromProperties(PropertiesLoader.load());
+    this.properties = PropertiesLoader.load();
+    configureFromProperties();
   }
 
   /**
@@ -2650,7 +2651,14 @@ public class ServerConfig {
    */
   public void loadFromProperties(Properties properties) {
     // keep the properties used for configuration so that these are available for plugins
-    this.properties = properties;
+    this.properties = PropertiesLoader.eval(properties);
+    configureFromProperties();
+  }
+
+  /**
+   * Load the settings from the given properties
+   */
+  private void configureFromProperties() {
     autoConfiguration();
     PropertiesWrapper p = new PropertiesWrapper("ebean", name, properties);
     loadSettings(p);
diff --git a/src/main/java/io/ebean/config/properties/PropertiesLoader.java b/src/main/java/io/ebean/config/properties/PropertiesLoader.java
index b62236de3..560d255e5 100644
--- a/src/main/java/io/ebean/config/properties/PropertiesLoader.java
+++ b/src/main/java/io/ebean/config/properties/PropertiesLoader.java
@@ -1,5 +1,6 @@
 package io.ebean.config.properties;
 
+import java.util.Enumeration;
 import java.util.Properties;
 
 /**
@@ -66,4 +67,19 @@ public class PropertiesLoader {
     properties.setProperty(key, value);
   }
 
+  /**
+   * Return a copy of the properties with 'eval' run on all the values.
+   * This resolves expressions like ${HOME} etc.
+   */
+  public static Properties eval(Properties properties) {
+    Properties evalCopy = new Properties();
+
+    Enumeration<?> names = properties.propertyNames();
+    while (names.hasMoreElements()) {
+      String name = (String)names.nextElement();
+      String value = PropertyEval.eval(properties.getProperty(name));
+      evalCopy.setProperty(name, value);
+    }
+    return evalCopy;
+  }
 }
diff --git a/src/test/java/io/ebean/config/PropertiesWrapperTest.java b/src/test/java/io/ebean/config/PropertiesWrapperTest.java
index ee9e294f4..016af03c6 100644
--- a/src/test/java/io/ebean/config/PropertiesWrapperTest.java
+++ b/src/test/java/io/ebean/config/PropertiesWrapperTest.java
@@ -1,6 +1,7 @@
 package io.ebean.config;
 
 import io.ebean.annotation.Platform;
+import io.ebean.config.properties.PropertiesLoader;
 import org.junit.Test;
 
 import java.util.Properties;
@@ -50,6 +51,9 @@ public class PropertiesWrapperTest {
   @Test
   public void testGetProperties() {
 
+    String home = System.getenv("HOME");
+    String tmpDir = System.getProperty("java.io.tmpdir");
+
     Properties properties = new Properties();
     properties.put("someBasic", "hello");
     properties.put("someInt", "42");
@@ -57,16 +61,20 @@ public class PropertiesWrapperTest {
     properties.put("somePath", "${HOME}/hello");
     properties.put("someSystemProp", "/aaa/${java.io.tmpdir}/bbb");
 
-    PropertiesWrapper pw = new PropertiesWrapper("pref", "myserver", properties);
+    Properties evalCopy = PropertiesLoader.eval(properties);
+    PropertiesWrapper pw = new PropertiesWrapper("pref", "myserver", evalCopy);
 
     assertEquals(42, pw.getInt("someInt", 99));
     assertEquals(Double.valueOf(5.5D), (Double.valueOf(pw.getDouble("someDouble", 99.9D))));
+    assertEquals(home + "/hello", pw.get("somePath", null));
+    assertEquals(tmpDir, "/aaa/" + tmpDir + "/bbb", pw.get("someSystemProp"));
 
-
-    pw = new PropertiesWrapper(properties);
+    pw = new PropertiesWrapper(evalCopy);
 
     assertEquals(42, pw.getInt("someInt", 99));
     assertEquals(Double.valueOf(5.5D), (Double.valueOf(pw.getDouble("someDouble", 99.9D))));
+    assertEquals(home + "/hello", pw.get("somePath", null));
+    assertEquals(tmpDir, "/aaa/" + tmpDir + "/bbb", pw.get("someSystemProp"));
   }
 
 }
diff --git a/src/test/java/io/ebean/config/ServerConfigTest.java b/src/test/java/io/ebean/config/ServerConfigTest.java
index fcf62fee5..8ee588ad3 100644
--- a/src/test/java/io/ebean/config/ServerConfigTest.java
+++ b/src/test/java/io/ebean/config/ServerConfigTest.java
@@ -7,6 +7,7 @@ import org.junit.Test;
 
 import java.util.Properties;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -24,6 +25,21 @@ public class ServerConfigTest {
     assertNotNull(serverConfig.getProperties());
   }
 
+  @Test
+  public void evalPropertiesInput() {
+
+    String home = System.getenv("HOME");
+
+    Properties props = new Properties();
+    props.setProperty("ddl.initSql", "${HOME}/initSql");
+
+    ServerConfig serverConfig = new ServerConfig();
+    serverConfig.loadFromProperties(props);
+
+    String ddlInitSql = serverConfig.getDdlInitSql();
+    assertThat(ddlInitSql).isEqualTo(home+"/initSql");
+  }
+
   @Test
   public void testLoadWithProperties() {
 

From e182190f96a297c59f44c2b112b8bb1c2b4ca548 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 7 Mar 2018 20:19:48 +1300
Subject: [PATCH 0152/1036] #1339 - Regression: Fix for not throwing
 OptimisticLockException when loaded bean has @Version property set

---
 .../io/ebean/bean/EntityBeanIntercept.java    | 38 +++++++++++++------
 .../java/org/tests/basic/TestIUDVanilla.java  | 15 +++++++-
 2 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/src/main/java/io/ebean/bean/EntityBeanIntercept.java
index 17b1eac73..de6c82456 100644
--- a/src/main/java/io/ebean/bean/EntityBeanIntercept.java
+++ b/src/main/java/io/ebean/bean/EntityBeanIntercept.java
@@ -529,6 +529,16 @@ public final class EntityBeanIntercept implements Serializable {
     }
   }
 
+  /**
+   * Set old value but force it to be set regardless if it already has a value.
+   */
+  private void setOriginalValueForce(int propertyIndex, Object value) {
+    if (origValues == null) {
+      origValues = new Object[owner._ebean_getPropertyNames().length];
+    }
+    origValues[propertyIndex] = value;
+  }
+
   /**
    * For forced update on a 'New' bean set all the loaded properties to changed.
    */
@@ -901,15 +911,19 @@ public final class EntityBeanIntercept implements Serializable {
 
     if (setDirtyState) {
       setOriginalValue(propertyIndex, origValue);
-      if (!dirty) {
-        dirty = true;
-        if (embeddedOwner != null) {
-          // Cascade dirty state from Embedded bean to parent bean
-          embeddedOwner._ebean_getIntercept().setEmbeddedDirty(embeddedOwnerIndex);
-        }
-        if (nodeUsageCollector != null) {
-          nodeUsageCollector.setModified();
-        }
+      setDirtyStatus();
+    }
+  }
+
+  private void setDirtyStatus() {
+    if (!dirty) {
+      dirty = true;
+      if (embeddedOwner != null) {
+        // Cascade dirty state from Embedded bean to parent bean
+        embeddedOwner._ebean_getIntercept().setEmbeddedDirty(embeddedOwnerIndex);
+      }
+      if (nodeUsageCollector != null) {
+        nodeUsageCollector.setModified();
       }
     }
   }
@@ -1049,10 +1063,12 @@ public final class EntityBeanIntercept implements Serializable {
   }
 
   /**
-   * Explicitly set an old value.
+   * Explicitly set an old value with force (the old value is forced even it is already set).
    */
   public void setOldValue(int propertyIndex, Object oldValue) {
-    setChangedPropertyValue(propertyIndex, true, oldValue);
+    setChangedProperty(propertyIndex);
+    setOriginalValueForce(propertyIndex, oldValue);
+    setDirtyStatus();
   }
 
   /**
diff --git a/src/test/java/org/tests/basic/TestIUDVanilla.java b/src/test/java/org/tests/basic/TestIUDVanilla.java
index f215d1614..f5117c4e7 100644
--- a/src/test/java/org/tests/basic/TestIUDVanilla.java
+++ b/src/test/java/org/tests/basic/TestIUDVanilla.java
@@ -2,10 +2,12 @@ package org.tests.basic;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
-import org.tests.model.basic.EBasicVer;
 import org.junit.Assert;
 import org.junit.Test;
+import org.tests.model.basic.EBasicVer;
+import org.tests.model.basic.UTMaster;
 
+import javax.persistence.OptimisticLockException;
 import java.sql.Timestamp;
 
 public class TestIUDVanilla extends BaseTestCase {
@@ -66,4 +68,15 @@ public class TestIUDVanilla extends BaseTestCase {
 
     Ebean.update(e3);
   }
+
+  @Test(expected = OptimisticLockException.class)
+  public void modifyVersion_expect_optimisticLock() {
+
+    UTMaster e0 = new UTMaster("save me");
+    Ebean.save(e0);
+
+    // for this case we know 42 should throw OptimisticLockException
+    e0.setVersion(42);
+    Ebean.update(e0);
+  }
 }

From 4d8bc0a2ce44c66bb1502875a44148462b02ffd5 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 7 Mar 2018 20:22:25 +1300
Subject: [PATCH 0153/1036] [maven-release-plugin] prepare release
 ebean-11.14.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8918f3d3d..f750608b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.14.2-SNAPSHOT</version>
+  <version>11.14.2</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.14.2</tag>
   </scm>
 
   <profiles>

From 54ba1480ebbefa8a18f960b9577597e92bde8fa6 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 7 Mar 2018 20:22:38 +1300
Subject: [PATCH 0154/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f750608b0..d97ca7ad8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.14.2</version>
+  <version>11.14.3-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.14.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From c0efd49c73c67030f29f426db3f25e95d0387694 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Mar 2018 14:12:32 +1300
Subject: [PATCH 0155/1036] #1341 - Cascade persist with JDBC batch and
 BeanPersistAdapter with preUpdate() that invokes lazy loading on persisted
 bean ... results in OptimisticLockException

---
 .../server/persist/BatchedBeanHolder.java     | 15 ++++---
 .../event/BeanPersistControllerTest.java      | 43 +++++++++++++++++++
 2 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java b/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java
index cfe05cd8c..6c974cc56 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java
@@ -85,16 +85,19 @@ public class BatchedBeanHolder {
     // Note updates and deletes can result in many PreparedStatements
     // if their where clauses differ via use of IS NOT NULL.
     if (deletes != null && !deletes.isEmpty()) {
-      control.executeNow(deletes);
-      deletes.clear();
+      ArrayList<PersistRequest> bufferedDeletes = deletes;
+      deletes = new ArrayList<>();
+      control.executeNow(bufferedDeletes);
     }
     if (inserts != null && !inserts.isEmpty()) {
-      control.executeNow(inserts);
-      inserts.clear();
+      ArrayList<PersistRequest> bufferedInserts = inserts;
+      inserts = new ArrayList<>();
+      control.executeNow(bufferedInserts);
     }
     if (updates != null && !updates.isEmpty()) {
-      control.executeNow(updates);
-      updates.clear();
+      ArrayList<PersistRequest> bufferedUpdates = updates;
+      updates = new ArrayList<>();
+      control.executeNow(bufferedUpdates);
     }
     persistedBeans.clear();
   }
diff --git a/src/test/java/io/ebean/event/BeanPersistControllerTest.java b/src/test/java/io/ebean/event/BeanPersistControllerTest.java
index 58d351a1c..e63f77bc3 100644
--- a/src/test/java/io/ebean/event/BeanPersistControllerTest.java
+++ b/src/test/java/io/ebean/event/BeanPersistControllerTest.java
@@ -3,9 +3,12 @@ package io.ebean.event;
 
 import io.ebean.EbeanServer;
 import io.ebean.EbeanServerFactory;
+import io.ebean.Transaction;
 import io.ebean.config.ServerConfig;
 import org.junit.Test;
 import org.tests.model.basic.EBasicVer;
+import org.tests.model.basic.UTDetail;
+import org.tests.model.basic.UTMaster;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -19,6 +22,36 @@ public class BeanPersistControllerTest {
 
   private PersistAdapter stopPersistingAdapter = new PersistAdapter(false);
 
+  @Test
+  public void issue_1341() {
+
+    EbeanServer ebeanServer = getEbeanServer(continuePersistingAdapter);
+
+    UTMaster bean0 = new UTMaster("one0");
+    UTDetail detail0 = new UTDetail("detail0", 12, 23D);
+    bean0.getDetails().add(detail0);
+
+    ebeanServer.save(bean0);
+
+    UTMaster master = ebeanServer.find(UTMaster.class)
+      .setId(bean0.getId())
+      .fetch("details", "name, version")
+      .findOne();
+
+    UTDetail utDetail = master.getDetails().get(0);
+    utDetail.setName("detail0 mod");
+
+    Transaction txn = ebeanServer.beginTransaction();
+    try {
+      txn.setBatchMode(true);
+      ebeanServer.save(master);
+      txn.commit();
+    } finally {
+      txn.end();
+    }
+
+  }
+
   @Test
   public void testInsertUpdateDelete_given_continuePersistingAdapter() {
 
@@ -91,6 +124,8 @@ public class BeanPersistControllerTest {
     config.setRegister(false);
     config.setDefaultServer(false);
     config.getClasses().add(EBasicVer.class);
+    config.getClasses().add(UTMaster.class);
+    config.getClasses().add(UTDetail.class);
 
     config.add(persistAdapter);
 
@@ -130,6 +165,14 @@ public class BeanPersistControllerTest {
     @Override
     public boolean preUpdate(BeanPersistRequest<?> request) {
       methodsCalled.add("preUpdate");
+
+      Object bean = request.getBean();
+      if (bean instanceof UTDetail) {
+        UTDetail detail = (UTDetail)bean;
+        // invoke lazy loading ... which invoke the flush of the jdbc batch
+        detail.setQty(42);
+      }
+
       return continueDefaultPersisting;
     }
 

From 4b594fb53393b2866c2d2c35c3880e44e6a37955 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Mar 2018 14:16:30 +1300
Subject: [PATCH 0156/1036] [maven-release-plugin] prepare release
 ebean-11.14.3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d97ca7ad8..4deeb42da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.14.3-SNAPSHOT</version>
+  <version>11.14.3</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.14.3</tag>
   </scm>
 
   <profiles>

From dbf5f3b57b71052b42c40f095d296d04176c8bf1 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Mar 2018 14:16:45 +1300
Subject: [PATCH 0157/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4deeb42da..2c541ae1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.14.3</version>
+  <version>11.14.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.14.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 6258a5d263ab1c4b1ce6369fd464a5028cf47043 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Mar 2018 14:36:18 +1300
Subject: [PATCH 0158/1036] Logging only change - Drop the logging from WARN to
 DEBUG for beans without an Id property (which is not usual but valid for
 Ebean)

---
 .../io/ebeaninternal/server/deploy/BeanDescriptorManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 9b2a26d11..b0044d91a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -1353,7 +1353,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
       // bean doesn't have an Id property
       if (desc.isBaseTableType() && desc.getBeanFinder() == null) {
         // expecting an id property
-        logger.warn(Message.msg("deploy.nouid", desc.getFullName()));
+        logger.debug(Message.msg("deploy.nouid", desc.getFullName()));
       }
       return;
     }

From 4fc7898f85f052d5f54e50b2a5535d1788644f34 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Mar 2018 17:36:53 +1300
Subject: [PATCH 0159/1036] #1340 - Split SQL Server Platform into SqlServer16
 and SqlServer17 (where 2017 which uses UTF8 types nvarchar etc and prefers
 Sequences).

Changes to main
---
 .../java/io/ebean/config/ServerConfig.java    |  2 +-
 .../sqlserver/SqlServer16Platform.java        | 26 +++++++++++++++++++
 .../sqlserver/SqlServer17Platform.java        | 16 ++++++++++++
 .../sqlserver/SqlServer2005Platform.java      |  2 +-
 ...atform.java => SqlServerBasePlatform.java} | 20 ++++++++------
 .../dbmigration/DefaultDbMigration.java       |  9 +++++--
 .../extraddl/model/ExtraDdlXmlReader.java     | 22 ++++++++++++++++
 .../server/core/DatabasePlatformFactory.java  | 20 +++++++++-----
 .../server/core/PlatformDdlBuilder.java       |  6 +++--
 9 files changed, 102 insertions(+), 21 deletions(-)
 create mode 100644 src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer16Platform.java
 create mode 100644 src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer17Platform.java
 rename src/main/java/io/ebean/config/dbplatform/sqlserver/{SqlServerPlatform.java => SqlServerBasePlatform.java} (86%)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index b0b5f362a..f32473ec6 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -1740,7 +1740,7 @@ public class ServerConfig {
    * that you don't have access to.
    * </p>
    * <p>
-   * Values are oracle, h2, postgres, mysql, mssqlserver2005.
+   * Values are oracle, h2, postgres, mysql, sqlserver16, sqlserver17.
    * </p>
    */
   public void setDatabasePlatformName(String databasePlatformName) {
diff --git a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer16Platform.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer16Platform.java
new file mode 100644
index 000000000..af0d7582a
--- /dev/null
+++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer16Platform.java
@@ -0,0 +1,26 @@
+package io.ebean.config.dbplatform.sqlserver;
+
+import io.ebean.annotation.Platform;
+import io.ebean.config.dbplatform.DbPlatformType;
+import io.ebean.config.dbplatform.DbType;
+import io.ebean.config.dbplatform.IdType;
+
+/**
+ * Microsoft SQL Server platform that has non-UTF8 types (char, varchar, text) and default to Identity rather than Sequence.
+ */
+public class SqlServer16Platform extends SqlServerBasePlatform {
+
+  public SqlServer16Platform() {
+    super();
+    this.platform = Platform.SQLSERVER16;
+    // default to use Identity rather than sequences
+    this.dbIdentity.setIdType(IdType.IDENTITY);
+
+    // non-utf8 column types
+    dbTypeMap.put(DbType.CHAR, new DbPlatformType("char", 1));
+    dbTypeMap.put(DbType.VARCHAR, new DbPlatformType("varchar", 255));
+    dbTypeMap.put(DbType.LONGVARCHAR, new DbPlatformType("text"));
+    dbTypeMap.put(DbType.CLOB, new DbPlatformType("text"));
+  }
+
+}
diff --git a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer17Platform.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer17Platform.java
new file mode 100644
index 000000000..fd17bbe9f
--- /dev/null
+++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer17Platform.java
@@ -0,0 +1,16 @@
+package io.ebean.config.dbplatform.sqlserver;
+
+import io.ebean.annotation.Platform;
+
+/**
+ * Microsoft SQL Server platform - NVarchar UTF types and Sequence preference.
+ */
+public class SqlServer17Platform extends SqlServerBasePlatform {
+
+  public SqlServer17Platform() {
+    super();
+    this.platform = Platform.SQLSERVER17;
+    this.columnAliasPrefix = null;
+  }
+
+}
diff --git a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2005Platform.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2005Platform.java
index 0473e9d3f..44eea1a04 100644
--- a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2005Platform.java
+++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2005Platform.java
@@ -3,7 +3,7 @@ package io.ebean.config.dbplatform.sqlserver;
 /**
  * SQL Server platform using the older ROW_NUMBER() mechanism.
  */
-public class SqlServer2005Platform extends SqlServerPlatform {
+public class SqlServer2005Platform extends SqlServer16Platform {
 
   public SqlServer2005Platform() {
     this.sqlLimiter = new SqlServer2005SqlLimiter();
diff --git a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java
similarity index 86%
rename from src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java
rename to src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java
index 31e1a8525..39727c7b2 100644
--- a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java
@@ -16,11 +16,11 @@ import javax.sql.DataSource;
 import java.sql.Types;
 
 /**
- * Microsoft SQL Server platform.
+ * Base Microsoft SQL Server platform - NVarchar UTF types and Sequence preference by default.
  */
-public class SqlServerPlatform extends DatabasePlatform {
+abstract class SqlServerBasePlatform extends DatabasePlatform {
 
-  public SqlServerPlatform() {
+  SqlServerBasePlatform() {
     super();
     this.platform = Platform.SQLSERVER;
     // disable persistBatchOnCascade mode for
@@ -31,7 +31,7 @@ public class SqlServerPlatform extends DatabasePlatform {
     this.sqlLimiter = new SqlServerSqlLimiter();
     this.basicSqlLimiter = new SqlServerBasicSqlLimiter();
     this.historySupport = new SqlServerHistorySupport();
-    this.dbIdentity.setIdType(IdType.IDENTITY);
+    this.dbIdentity.setIdType(IdType.SEQUENCE);
     this.dbIdentity.setSupportsGetGeneratedKeys(true);
     this.dbIdentity.setSupportsIdentity(true);
     this.dbIdentity.setSupportsSequence(true);
@@ -63,18 +63,22 @@ public class SqlServerPlatform extends DatabasePlatform {
     dbTypeMap.put(DbType.TINYINT, new DbPlatformType("smallint"));
     dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("numeric", 28));
 
-    dbTypeMap.put(DbType.BLOB, new DbPlatformType("image"));
-    dbTypeMap.put(DbType.CLOB, new DbPlatformType("text"));
-    dbTypeMap.put(DbType.LONGVARBINARY, new DbPlatformType("image"));
-    dbTypeMap.put(DbType.LONGVARCHAR, new DbPlatformType("text"));
 
     dbTypeMap.put(DbType.DATE, new DbPlatformType("date"));
     dbTypeMap.put(DbType.TIME, new DbPlatformType("time"));
     dbTypeMap.put(DbType.TIMESTAMP, new DbPlatformType("datetime2"));
 
+    // UTF8 aware types - overwritten in SqlServer16 platform
+    dbTypeMap.put(DbType.CHAR, new DbPlatformType("nchar", 1));
+    dbTypeMap.put(DbType.VARCHAR, new DbPlatformType("nvarchar", 255));
+    dbTypeMap.put(DbType.LONGVARCHAR, new DbPlatformType("nvarchar", Integer.MAX_VALUE));
+    dbTypeMap.put(DbType.CLOB, new DbPlatformType("nvarchar", Integer.MAX_VALUE));
+
     dbTypeMap.put(DbType.JSON, new DbPlatformType("nvarchar", Integer.MAX_VALUE));
     dbTypeMap.put(DbType.JSONB, new DbPlatformType("nvarchar", Integer.MAX_VALUE));
 
+    dbTypeMap.put(DbType.BLOB, new DbPlatformType("image"));
+    dbTypeMap.put(DbType.LONGVARBINARY, new DbPlatformType("image"));
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index d767d62a6..c548bbc64 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -15,7 +15,8 @@ import io.ebean.config.dbplatform.oracle.OraclePlatform;
 import io.ebean.config.dbplatform.postgres.PostgresPlatform;
 import io.ebean.config.dbplatform.sqlanywhere.SqlAnywherePlatform;
 import io.ebean.config.dbplatform.sqlite.SQLitePlatform;
-import io.ebean.config.dbplatform.sqlserver.SqlServerPlatform;
+import io.ebean.config.dbplatform.sqlserver.SqlServer16Platform;
+import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
 import io.ebean.dbmigration.DbMigration;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
@@ -554,8 +555,12 @@ public class DefaultDbMigration implements DbMigration {
         return new OraclePlatform();
       case SQLANYWHERE:
         return new SqlAnywherePlatform();
+      case SQLSERVER16:
+        return new SqlServer16Platform();
+      case SQLSERVER17:
+        return new SqlServer17Platform();
       case SQLSERVER:
-        return new SqlServerPlatform();
+        throw new IllegalArgumentException("Please choose the more specific SQLSERVER16 or SQLSERVER17 platform. Refer to issue #1340 for details");
       case DB2:
         return new DB2Platform();
       case SQLITE:
diff --git a/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java b/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
index 629c9d202..a478a1ac7 100644
--- a/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
+++ b/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.extraddl.model;
 
+import io.ebean.annotation.Platform;
 import io.ebean.util.StringHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,6 +17,8 @@ public class ExtraDdlXmlReader {
 
   private static final Logger logger = LoggerFactory.getLogger(ExtraDdlXmlReader.class);
 
+  private static final String SQLSERVER = Platform.SQLSERVER.name().toLowerCase();
+
   /**
    * Return the combined extra DDL that should be run given the platform name.
    */
@@ -52,14 +55,33 @@ public class ExtraDdlXmlReader {
       return true;
     }
 
+    String genericMatch = genericPlatformMatch(platformName);
+
     for (String name : StringHelper.splitNames(platforms)) {
       if (name.toLowerCase().contains(platformName)) {
         return true;
+      } else if (genericMatch != null && genericMatch.equals(name.toLowerCase())) {
+        // allow sqlserver ... to match sqlserver17 and sqlserver16 platforms
+        return true;
       }
     }
     return false;
   }
 
+  /**
+   * Return a "generic" platform name that can be used. e.g. sqlserver17 -> sqlserver.
+   */
+  private static String genericPlatformMatch(String platformName) {
+    switch (platformName) {
+      case "sqlserver17":
+        return SQLSERVER;
+      case "sqlserver16":
+        return SQLSERVER;
+      default:
+        return null;
+    }
+  }
+
   /**
    * Read and return a ExtraDdl from an xml document at the given resource path.
    */
diff --git a/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java b/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
index 496f67cbb..3f98a1c6d 100644
--- a/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
+++ b/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
@@ -1,17 +1,18 @@
 package io.ebeaninternal.server.core;
 
 import io.ebean.config.ServerConfig;
-import io.ebean.config.dbplatform.db2.DB2Platform;
 import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebean.config.dbplatform.db2.DB2Platform;
 import io.ebean.config.dbplatform.h2.H2Platform;
 import io.ebean.config.dbplatform.hsqldb.HsqldbPlatform;
-import io.ebean.config.dbplatform.sqlserver.SqlServerPlatform;
 import io.ebean.config.dbplatform.mysql.MySqlPlatform;
 import io.ebean.config.dbplatform.oracle.OraclePlatform;
 import io.ebean.config.dbplatform.postgres.Postgres8Platform;
 import io.ebean.config.dbplatform.postgres.PostgresPlatform;
-import io.ebean.config.dbplatform.sqlite.SQLitePlatform;
 import io.ebean.config.dbplatform.sqlanywhere.SqlAnywherePlatform;
+import io.ebean.config.dbplatform.sqlite.SQLitePlatform;
+import io.ebean.config.dbplatform.sqlserver.SqlServer16Platform;
+import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
 import io.ebeaninternal.dbmigration.DbOffline;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -52,8 +53,7 @@ public class DatabasePlatformFactory {
       }
 
       if (serverConfig.getDataSourceConfig().isOffline()) {
-        String m = "You must specify a DatabasePlatformName when you are offline";
-        throw new PersistenceException(m);
+        throw new PersistenceException("You must specify a DatabasePlatformName when you are offline");
       }
       // guess using meta data from driver
       return byDataSource(serverConfig.getDataSource());
@@ -84,8 +84,14 @@ public class DatabasePlatformFactory {
     if (dbName.equals("oracle") || dbName.equals("oracle10") || dbName.equals("oracle9")) {
       return new OraclePlatform();
     }
+    if (dbName.equals("sqlserver16")) {
+      return new SqlServer16Platform();
+    }
+    if (dbName.equals("sqlserver17")) {
+      return new SqlServer17Platform();
+    }
     if (dbName.equals("sqlserver")) {
-      return new SqlServerPlatform();
+      throw new IllegalArgumentException("Please choose the more specific sqlserver16 or sqlserver17 platform. Refer to issue #1340 for details");
     }
     if (dbName.equals("sqlanywhere")) {
       return new SqlAnywherePlatform();
@@ -137,7 +143,7 @@ public class DatabasePlatformFactory {
     if (dbProductName.contains("oracle")) {
       return new OraclePlatform();
     } else if (dbProductName.contains("microsoft")) {
-      return new SqlServerPlatform();
+      throw new IllegalArgumentException("For SqlServer please explicitly choose either sqlserver16 or sqlserver17 as the platform via ServerConfig.setDatabasePlatformName. Refer to issue #1340 for more details");
     } else if (dbProductName.contains("mysql")) {
       return new MySqlPlatform();
     } else if (dbProductName.contains("h2")) {
diff --git a/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java b/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java
index 560bc519e..efd69538e 100644
--- a/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java
@@ -38,10 +38,12 @@ public class PlatformDdlBuilder {
         return new PlatformDdl(platform);
       case POSTGRES:
         return new PostgresDdl(platform);
-      case SQLSERVER:
-        return new SqlServerDdl(platform);
       case SQLANYWHERE:
         return new PlatformDdl(platform);
+      case SQLSERVER16:
+      case SQLSERVER17:
+      case SQLSERVER:
+        return new SqlServerDdl(platform);
       default:
         return new PlatformDdl(platform);
     }

From eef514f922c4cf0735c396a475513314a3430c06 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Mar 2018 17:37:29 +1300
Subject: [PATCH 0160/1036] #1340 - Split SQL Server Platform into SqlServer16
 and SqlServer17 (where 2017 which uses UTF8 types nvarchar etc and prefers
 Sequences).

Changes to pom
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2c541ae1b..9d9eee542 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,7 +112,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>3.8</version>
+      <version>3.11</version>
     </dependency>
 
     <dependency>

From 8e0d2f8749cbc57ec68fdd360c590eaad85e1624 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Mar 2018 17:39:10 +1300
Subject: [PATCH 0161/1036] #1340 - Split SQL Server Platform into SqlServer16
 and SqlServer17 (where 2017 which uses UTF8 types nvarchar etc and prefers
 Sequences).

test - dbmigration ddl
---
 .../migrationtest/sqlserver/1.0__initial.sql  |  48 ++---
 .../migrationtest/sqlserver/1.1.sql           |  22 +--
 .../migrationtest/sqlserver/1.3.sql           |   4 +-
 .../sqlserver17/1.0__initial.sql              | 160 ++++++++++++++++
 .../migrationtest/sqlserver17/1.1.sql         | 104 ++++++++++
 .../sqlserver17/1.2__dropsFor_1.1.sql         |  43 +++++
 .../migrationtest/sqlserver17/1.3.sql         |  62 ++++++
 .../sqlserver17/1.4__dropsFor_1.3.sql         | 179 ++++++++++++++++++
 8 files changed, 585 insertions(+), 37 deletions(-)
 create mode 100644 src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql
 create mode 100644 src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql
 create mode 100644 src/test/resources/dbmigration/migrationtest/sqlserver17/1.2__dropsFor_1.1.sql
 create mode 100644 src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql
 create mode 100644 src/test/resources/dbmigration/migrationtest/sqlserver17/1.4__dropsFor_1.3.sql

diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql
index be7ab17be..ea820be14 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql
@@ -2,22 +2,22 @@
 -- apply changes
 create table migtest_ckey_assoc (
   id                            integer not null,
-  assoc_one                     varchar(255),
+  assoc_one                     nvarchar(255),
   constraint pk_migtest_ckey_assoc primary key (id)
 );
 create sequence migtest_ckey_assoc_seq as bigint  start with 1 ;
 
 create table migtest_ckey_detail (
   id                            integer not null,
-  something                     varchar(255),
+  something                     nvarchar(255),
   constraint pk_migtest_ckey_detail primary key (id)
 );
 create sequence migtest_ckey_detail_seq as bigint  start with 1 ;
 
 create table migtest_ckey_parent (
   one_key                       integer not null,
-  two_key                       varchar(127) not null,
-  name                          varchar(255),
+  two_key                       nvarchar(127) not null,
+  name                          nvarchar(255),
   version                       integer not null,
   constraint pk_migtest_ckey_parent primary key (one_key,two_key)
 );
@@ -64,19 +64,19 @@ create sequence migtest_fk_set_null_seq as bigint  start with 1 ;
 
 create table migtest_e_basic (
   id                            integer not null,
-  status                        varchar(1),
-  name                          varchar(127),
-  description                   varchar(127),
+  status                        nvarchar(1),
+  name                          nvarchar(127),
+  description                   nvarchar(127),
   some_date                     datetime2,
   old_boolean                   bit default 0 not null,
   old_boolean2                  bit,
   eref_id                       integer,
-  indextest1                    varchar(127),
-  indextest2                    varchar(127),
-  indextest3                    varchar(127),
-  indextest4                    varchar(127),
-  indextest5                    varchar(127),
-  indextest6                    varchar(127),
+  indextest1                    nvarchar(127),
+  indextest2                    nvarchar(127),
+  indextest3                    nvarchar(127),
+  indextest4                    nvarchar(127),
+  indextest5                    nvarchar(127),
+  indextest6                    nvarchar(127),
   user_id                       integer not null,
   constraint ck_migtest_e_basic_status check ( status in ('N','A','I')),
   constraint pk_migtest_e_basic primary key (id)
@@ -87,21 +87,21 @@ create sequence migtest_e_basic_seq as bigint  start with 1 ;
 
 create table migtest_e_history (
   id                            integer not null,
-  test_string                   varchar(255),
+  test_string                   nvarchar(255),
   constraint pk_migtest_e_history primary key (id)
 );
 create sequence migtest_e_history_seq as bigint  start with 1 ;
 
 create table migtest_e_history2 (
   id                            integer not null,
-  test_string                   varchar(255),
+  test_string                   nvarchar(255),
   constraint pk_migtest_e_history2 primary key (id)
 );
 create sequence migtest_e_history2_seq as bigint  start with 1 ;
 
 create table migtest_e_ref (
   id                            integer not null,
-  name                          varchar(127) not null,
+  name                          nvarchar(127) not null,
   constraint pk_migtest_e_ref primary key (id)
 );
 alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique  (name);
@@ -109,49 +109,49 @@ create sequence migtest_e_ref_seq as bigint  start with 1 ;
 
 create table migtest_e_softdelete (
   id                            integer not null,
-  test_string                   varchar(255),
+  test_string                   nvarchar(255),
   constraint pk_migtest_e_softdelete primary key (id)
 );
 create sequence migtest_e_softdelete_seq as bigint  start with 1 ;
 
 create table migtest_mtm_c (
   id                            integer not null,
-  name                          varchar(255),
+  name                          nvarchar(255),
   constraint pk_migtest_mtm_c primary key (id)
 );
 create sequence migtest_mtm_c_seq as bigint  start with 1 ;
 
 create table migtest_mtm_m (
   id                            numeric(19) not null,
-  name                          varchar(255),
+  name                          nvarchar(255),
   constraint pk_migtest_mtm_m primary key (id)
 );
 create sequence migtest_mtm_m_seq as bigint  start with 1 ;
 
 create table migtest_oto_child (
   id                            integer not null,
-  name                          varchar(255),
+  name                          nvarchar(255),
   constraint pk_migtest_oto_child primary key (id)
 );
 create sequence migtest_oto_child_seq as bigint  start with 1 ;
 
 create table migtest_oto_master (
   id                            numeric(19) not null,
-  name                          varchar(255),
+  name                          nvarchar(255),
   constraint pk_migtest_oto_master primary key (id)
 );
 create sequence migtest_oto_master_seq as bigint  start with 1 ;
 
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
-alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
 create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
 
-alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
 create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
 
-alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id);
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
+alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id);
 
 alter table migtest_e_history2
     add sys_periodFrom datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(),
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql
index e20737814..90c1f96bf 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql
@@ -19,7 +19,7 @@ create table migtest_mtm_m_migtest_mtm_c (
 );
 
 alter table migtest_ckey_detail add one_key integer;
-alter table migtest_ckey_detail add two_key varchar(127);
+alter table migtest_ckey_detail add two_key nvarchar(127);
 
 alter table migtest_ckey_detail add constraint fk_migtest_ckey_detail_parent foreign key (one_key,two_key) references migtest_ckey_parent (one_key,two_key);
 alter table migtest_ckey_parent add assoc_id integer;
@@ -34,7 +34,7 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 update migtest_e_basic set status = 'A' where status is null;
 IF (OBJECT_ID('ck_migtest_e_basic_status', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
 alter table migtest_e_basic add default 'A' for status;
-alter table migtest_e_basic alter column status varchar(1) not null;
+alter table migtest_e_basic alter column status nvarchar(1) not null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
 
 -- rename all collisions;
@@ -47,7 +47,7 @@ alter table migtest_e_basic alter column some_date datetime2 not null;
 insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id);
 alter table migtest_e_basic alter column user_id integer;
-alter table migtest_e_basic add new_string_field varchar(255) default 'foo''bar' not null;
+alter table migtest_e_basic add new_string_field nvarchar(255) default 'foo''bar' not null;
 alter table migtest_e_basic add new_boolean_field bit default 1 not null;
 update migtest_e_basic set new_boolean_field = old_boolean;
 
@@ -68,9 +68,9 @@ alter table migtest_e_history alter column test_string numeric(19);
 
 update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 alter table migtest_e_history2 add default 'unknown' for test_string;
-alter table migtest_e_history2 alter column test_string varchar(255) not null;
-alter table migtest_e_history2 add test_string2 varchar(255);
-alter table migtest_e_history2 add test_string3 varchar(255) default 'unknown' not null;
+alter table migtest_e_history2 alter column test_string nvarchar(255) not null;
+alter table migtest_e_history2 add test_string2 nvarchar(255);
+alter table migtest_e_history2 add test_string3 nvarchar(255) default 'unknown' not null;
 
 alter table migtest_e_softdelete add deleted bit default 0 not null;
 
@@ -80,20 +80,20 @@ create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest1') drop index ix_migtest_e_basic_indextest1 ON migtest_e_basic;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest5') drop index ix_migtest_e_basic_indextest5 ON migtest_e_basic;
-alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id);
 create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id);
 
-alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id);
 create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m on migtest_mtm_c_migtest_mtm_m (migtest_mtm_m_id);
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id);
 
-alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id);
 create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m on migtest_mtm_m_migtest_mtm_c (migtest_mtm_m_id);
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id);
 
-alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id);
 create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c on migtest_mtm_m_migtest_mtm_c (migtest_mtm_c_id);
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id);
 
-alter table migtest_ckey_parent add constraint fk_migtest_ckey_parent_assoc_id foreign key (assoc_id) references migtest_ckey_assoc (id);
 create index ix_migtest_ckey_parent_assoc_id on migtest_ckey_parent (assoc_id);
+alter table migtest_ckey_parent add constraint fk_migtest_ckey_parent_assoc_id foreign key (assoc_id) references migtest_ckey_assoc (id);
 
 alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id);
 
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql
index 5109fb90e..50c300716 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql
@@ -2,7 +2,7 @@
 -- apply changes
 create table migtest_e_ref (
   id                            integer not null,
-  name                          varchar(127) not null,
+  name                          nvarchar(127) not null,
   constraint pk_migtest_e_ref primary key (id)
 );
 alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique  (name);
@@ -57,6 +57,6 @@ create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest3') drop index ix_migtest_e_basic_indextest3 ON migtest_e_basic;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest6') drop index ix_migtest_e_basic_indextest6 ON migtest_e_basic;
-alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id);
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
+alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id);
 
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql
new file mode 100644
index 000000000..ea820be14
--- /dev/null
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql
@@ -0,0 +1,160 @@
+-- Migrationscripts for ebean unittest
+-- apply changes
+create table migtest_ckey_assoc (
+  id                            integer not null,
+  assoc_one                     nvarchar(255),
+  constraint pk_migtest_ckey_assoc primary key (id)
+);
+create sequence migtest_ckey_assoc_seq as bigint  start with 1 ;
+
+create table migtest_ckey_detail (
+  id                            integer not null,
+  something                     nvarchar(255),
+  constraint pk_migtest_ckey_detail primary key (id)
+);
+create sequence migtest_ckey_detail_seq as bigint  start with 1 ;
+
+create table migtest_ckey_parent (
+  one_key                       integer not null,
+  two_key                       nvarchar(127) not null,
+  name                          nvarchar(255),
+  version                       integer not null,
+  constraint pk_migtest_ckey_parent primary key (one_key,two_key)
+);
+
+create table migtest_fk_cascade (
+  id                            numeric(19) not null,
+  one_id                        numeric(19),
+  constraint pk_migtest_fk_cascade primary key (id)
+);
+create sequence migtest_fk_cascade_seq as bigint  start with 1 ;
+
+create table migtest_fk_cascade_one (
+  id                            numeric(19) not null,
+  constraint pk_migtest_fk_cascade_one primary key (id)
+);
+create sequence migtest_fk_cascade_one_seq as bigint  start with 1 ;
+
+create table migtest_fk_none (
+  id                            numeric(19) not null,
+  one_id                        numeric(19),
+  constraint pk_migtest_fk_none primary key (id)
+);
+create sequence migtest_fk_none_seq as bigint  start with 1 ;
+
+create table migtest_fk_none_via_join (
+  id                            numeric(19) not null,
+  one_id                        numeric(19),
+  constraint pk_migtest_fk_none_via_join primary key (id)
+);
+create sequence migtest_fk_none_via_join_seq as bigint  start with 1 ;
+
+create table migtest_fk_one (
+  id                            numeric(19) not null,
+  constraint pk_migtest_fk_one primary key (id)
+);
+create sequence migtest_fk_one_seq as bigint  start with 1 ;
+
+create table migtest_fk_set_null (
+  id                            numeric(19) not null,
+  one_id                        numeric(19),
+  constraint pk_migtest_fk_set_null primary key (id)
+);
+create sequence migtest_fk_set_null_seq as bigint  start with 1 ;
+
+create table migtest_e_basic (
+  id                            integer not null,
+  status                        nvarchar(1),
+  name                          nvarchar(127),
+  description                   nvarchar(127),
+  some_date                     datetime2,
+  old_boolean                   bit default 0 not null,
+  old_boolean2                  bit,
+  eref_id                       integer,
+  indextest1                    nvarchar(127),
+  indextest2                    nvarchar(127),
+  indextest3                    nvarchar(127),
+  indextest4                    nvarchar(127),
+  indextest5                    nvarchar(127),
+  indextest6                    nvarchar(127),
+  user_id                       integer not null,
+  constraint ck_migtest_e_basic_status check ( status in ('N','A','I')),
+  constraint pk_migtest_e_basic primary key (id)
+);
+create unique nonclustered index uq_migtest_e_basic_indextest2 on migtest_e_basic(indextest2) where indextest2 is not null;
+create unique nonclustered index uq_migtest_e_basic_indextest6 on migtest_e_basic(indextest6) where indextest6 is not null;
+create sequence migtest_e_basic_seq as bigint  start with 1 ;
+
+create table migtest_e_history (
+  id                            integer not null,
+  test_string                   nvarchar(255),
+  constraint pk_migtest_e_history primary key (id)
+);
+create sequence migtest_e_history_seq as bigint  start with 1 ;
+
+create table migtest_e_history2 (
+  id                            integer not null,
+  test_string                   nvarchar(255),
+  constraint pk_migtest_e_history2 primary key (id)
+);
+create sequence migtest_e_history2_seq as bigint  start with 1 ;
+
+create table migtest_e_ref (
+  id                            integer not null,
+  name                          nvarchar(127) not null,
+  constraint pk_migtest_e_ref primary key (id)
+);
+alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique  (name);
+create sequence migtest_e_ref_seq as bigint  start with 1 ;
+
+create table migtest_e_softdelete (
+  id                            integer not null,
+  test_string                   nvarchar(255),
+  constraint pk_migtest_e_softdelete primary key (id)
+);
+create sequence migtest_e_softdelete_seq as bigint  start with 1 ;
+
+create table migtest_mtm_c (
+  id                            integer not null,
+  name                          nvarchar(255),
+  constraint pk_migtest_mtm_c primary key (id)
+);
+create sequence migtest_mtm_c_seq as bigint  start with 1 ;
+
+create table migtest_mtm_m (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_migtest_mtm_m primary key (id)
+);
+create sequence migtest_mtm_m_seq as bigint  start with 1 ;
+
+create table migtest_oto_child (
+  id                            integer not null,
+  name                          nvarchar(255),
+  constraint pk_migtest_oto_child primary key (id)
+);
+create sequence migtest_oto_child_seq as bigint  start with 1 ;
+
+create table migtest_oto_master (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_migtest_oto_master primary key (id)
+);
+create sequence migtest_oto_master_seq as bigint  start with 1 ;
+
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
+create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
+
+create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
+
+create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
+alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id);
+
+alter table migtest_e_history2
+    add sys_periodFrom datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(),
+        sys_periodTo   datetime2 GENERATED ALWAYS AS ROW END   NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',
+period for system_time (sys_periodFrom, sys_periodTo);
+alter table migtest_e_history2 set (system_versioning = on (history_table=dbo.migtest_e_history2_history));
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql
new file mode 100644
index 000000000..90c1f96bf
--- /dev/null
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql
@@ -0,0 +1,104 @@
+-- Migrationscripts for ebean unittest
+-- apply changes
+create table migtest_e_user (
+  id                            integer not null,
+  constraint pk_migtest_e_user primary key (id)
+);
+create sequence migtest_e_user_seq as bigint  start with 1 ;
+
+create table migtest_mtm_c_migtest_mtm_m (
+  migtest_mtm_c_id              integer not null,
+  migtest_mtm_m_id              numeric(19) not null,
+  constraint pk_migtest_mtm_c_migtest_mtm_m primary key (migtest_mtm_c_id,migtest_mtm_m_id)
+);
+
+create table migtest_mtm_m_migtest_mtm_c (
+  migtest_mtm_m_id              numeric(19) not null,
+  migtest_mtm_c_id              integer not null,
+  constraint pk_migtest_mtm_m_migtest_mtm_c primary key (migtest_mtm_m_id,migtest_mtm_c_id)
+);
+
+alter table migtest_ckey_detail add one_key integer;
+alter table migtest_ckey_detail add two_key nvarchar(127);
+
+alter table migtest_ckey_detail add constraint fk_migtest_ckey_detail_parent foreign key (one_key,two_key) references migtest_ckey_parent (one_key,two_key);
+alter table migtest_ckey_parent add assoc_id integer;
+
+IF OBJECT_ID('fk_migtest_fk_cascade_one_id', 'F') IS NOT NULL alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id);
+alter table migtest_fk_none add constraint fk_migtest_fk_none_one_id foreign key (one_id) references migtest_fk_one (id);
+alter table migtest_fk_none_via_join add constraint fk_migtest_fk_none_via_join_one_id foreign key (one_id) references migtest_fk_one (id);
+IF OBJECT_ID('fk_migtest_fk_set_null_one_id', 'F') IS NOT NULL alter table migtest_fk_set_null drop constraint fk_migtest_fk_set_null_one_id;
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id);
+
+update migtest_e_basic set status = 'A' where status is null;
+IF (OBJECT_ID('ck_migtest_e_basic_status', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
+alter table migtest_e_basic add default 'A' for status;
+alter table migtest_e_basic alter column status nvarchar(1) not null;
+alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
+
+-- rename all collisions;
+create unique nonclustered index uq_migtest_e_basic_description on migtest_e_basic(description) where description is not null;
+
+update migtest_e_basic set some_date = '2000-01-01T00:00:00' where some_date is null;
+alter table migtest_e_basic add default '2000-01-01T00:00:00' for some_date;
+alter table migtest_e_basic alter column some_date datetime2 not null;
+
+insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
+alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id);
+alter table migtest_e_basic alter column user_id integer;
+alter table migtest_e_basic add new_string_field nvarchar(255) default 'foo''bar' not null;
+alter table migtest_e_basic add new_boolean_field bit default 1 not null;
+update migtest_e_basic set new_boolean_field = old_boolean;
+
+alter table migtest_e_basic add new_boolean_field2 bit default 1 not null;
+alter table migtest_e_basic add progress integer default 0 not null;
+alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2));
+alter table migtest_e_basic add new_integer integer default 42 not null;
+
+IF (OBJECT_ID('uq_migtest_e_basic_indextest2', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_indextest2') drop index uq_migtest_e_basic_indextest2 ON migtest_e_basic;
+IF (OBJECT_ID('uq_migtest_e_basic_indextest6', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_indextest6') drop index uq_migtest_e_basic_indextest6 ON migtest_e_basic;
+create unique nonclustered index uq_migtest_e_basic_status_indextest1 on migtest_e_basic(status,indextest1) where indextest1 is not null;
+create unique nonclustered index uq_migtest_e_basic_name on migtest_e_basic(name) where name is not null;
+create unique nonclustered index uq_migtest_e_basic_indextest4 on migtest_e_basic(indextest4) where indextest4 is not null;
+create unique nonclustered index uq_migtest_e_basic_indextest5 on migtest_e_basic(indextest5) where indextest5 is not null;
+alter table migtest_e_history alter column test_string numeric(19);
+
+update migtest_e_history2 set test_string = 'unknown' where test_string is null;
+alter table migtest_e_history2 add default 'unknown' for test_string;
+alter table migtest_e_history2 alter column test_string nvarchar(255) not null;
+alter table migtest_e_history2 add test_string2 nvarchar(255);
+alter table migtest_e_history2 add test_string3 nvarchar(255) default 'unknown' not null;
+
+alter table migtest_e_softdelete add deleted bit default 0 not null;
+
+alter table migtest_oto_child add master_id numeric(19);
+
+create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
+create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest1') drop index ix_migtest_e_basic_indextest1 ON migtest_e_basic;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest5') drop index ix_migtest_e_basic_indextest5 ON migtest_e_basic;
+create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id);
+
+create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m on migtest_mtm_c_migtest_mtm_m (migtest_mtm_m_id);
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id);
+
+create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m on migtest_mtm_m_migtest_mtm_c (migtest_mtm_m_id);
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id);
+
+create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c on migtest_mtm_m_migtest_mtm_c (migtest_mtm_c_id);
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id);
+
+create index ix_migtest_ckey_parent_assoc_id on migtest_ckey_parent (assoc_id);
+alter table migtest_ckey_parent add constraint fk_migtest_ckey_parent_assoc_id foreign key (assoc_id) references migtest_ckey_assoc (id);
+
+alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id);
+
+alter table migtest_e_history
+    add sys_periodFrom datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(),
+        sys_periodTo   datetime2 GENERATED ALWAYS AS ROW END   NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',
+period for system_time (sys_periodFrom, sys_periodTo);
+alter table migtest_e_history set (system_versioning = on (history_table=dbo.migtest_e_history_history));
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.2__dropsFor_1.1.sql
new file mode 100644
index 000000000..d3a7a9a24
--- /dev/null
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.2__dropsFor_1.1.sql
@@ -0,0 +1,43 @@
+-- Migrationscripts for ebean unittest
+-- apply changes
+-- drop column migtest_e_basic.old_boolean;
+IF (OBJECT_ID('uq_migtest_e_basic_old_boolean', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_old_boolean;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_old_boolean') drop index uq_migtest_e_basic_old_boolean ON migtest_e_basic;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'old_boolean';
+if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
+IF (OBJECT_ID('ck_migtest_e_basic_old_boolean', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_old_boolean;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_old_boolean') drop index ix_migtest_e_basic_old_boolean ON migtest_e_basic;
+IF OBJECT_ID('fk_migtest_e_basic_old_boolean', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_old_boolean;
+alter table migtest_e_basic drop column old_boolean;
+
+-- drop column migtest_e_basic.old_boolean2;
+IF (OBJECT_ID('uq_migtest_e_basic_old_boolean2', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_old_boolean2;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_old_boolean2') drop index uq_migtest_e_basic_old_boolean2 ON migtest_e_basic;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'old_boolean2';
+if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
+IF (OBJECT_ID('ck_migtest_e_basic_old_boolean2', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_old_boolean2;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_old_boolean2') drop index ix_migtest_e_basic_old_boolean2 ON migtest_e_basic;
+IF OBJECT_ID('fk_migtest_e_basic_old_boolean2', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_old_boolean2;
+alter table migtest_e_basic drop column old_boolean2;
+
+-- drop column migtest_e_basic.eref_id;
+IF (OBJECT_ID('uq_migtest_e_basic_eref_id', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_eref_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_eref_id') drop index uq_migtest_e_basic_eref_id ON migtest_e_basic;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'eref_id';
+if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
+IF (OBJECT_ID('ck_migtest_e_basic_eref_id', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_eref_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_eref_id') drop index ix_migtest_e_basic_eref_id ON migtest_e_basic;
+IF OBJECT_ID('fk_migtest_e_basic_eref_id', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_eref_id;
+alter table migtest_e_basic drop column eref_id;
+
+IF OBJECT_ID('migtest_e_ref', 'U') IS NOT NULL drop table migtest_e_ref;
+IF OBJECT_ID('migtest_e_ref_seq', 'SO') IS NOT NULL drop sequence migtest_e_ref_seq;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql
new file mode 100644
index 000000000..50c300716
--- /dev/null
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql
@@ -0,0 +1,62 @@
+-- Migrationscripts for ebean unittest
+-- apply changes
+create table migtest_e_ref (
+  id                            integer not null,
+  name                          nvarchar(127) not null,
+  constraint pk_migtest_e_ref primary key (id)
+);
+alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique  (name);
+create sequence migtest_e_ref_seq as bigint  start with 1 ;
+
+IF OBJECT_ID('fk_migtest_ckey_detail_parent', 'F') IS NOT NULL alter table migtest_ckey_detail drop constraint fk_migtest_ckey_detail_parent;
+IF OBJECT_ID('fk_migtest_fk_cascade_one_id', 'F') IS NOT NULL alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
+IF OBJECT_ID('fk_migtest_fk_none_one_id', 'F') IS NOT NULL alter table migtest_fk_none drop constraint fk_migtest_fk_none_one_id;
+IF OBJECT_ID('fk_migtest_fk_none_via_join_one_id', 'F') IS NOT NULL alter table migtest_fk_none_via_join drop constraint fk_migtest_fk_none_via_join_one_id;
+IF OBJECT_ID('fk_migtest_fk_set_null_one_id', 'F') IS NOT NULL alter table migtest_fk_set_null drop constraint fk_migtest_fk_set_null_one_id;
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
+IF (OBJECT_ID('ck_migtest_e_basic_status', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'status';
+if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
+alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I'));
+IF (OBJECT_ID('uq_migtest_e_basic_description', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_description;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_description') drop index uq_migtest_e_basic_description ON migtest_e_basic;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'some_date';
+if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
+
+update migtest_e_basic set user_id = 23 where user_id is null;
+IF OBJECT_ID('fk_migtest_e_basic_user_id', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_user_id;
+alter table migtest_e_basic add default 23 for user_id;
+alter table migtest_e_basic alter column user_id integer not null;
+alter table migtest_e_basic add old_boolean bit default 0 not null;
+alter table migtest_e_basic add old_boolean2 bit;
+alter table migtest_e_basic add eref_id integer;
+
+IF (OBJECT_ID('uq_migtest_e_basic_status_indextest1', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_status_indextest1;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_status_indextest1') drop index uq_migtest_e_basic_status_indextest1 ON migtest_e_basic;
+IF (OBJECT_ID('uq_migtest_e_basic_name', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_name') drop index uq_migtest_e_basic_name ON migtest_e_basic;
+IF (OBJECT_ID('uq_migtest_e_basic_indextest4', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_indextest4') drop index uq_migtest_e_basic_indextest4 ON migtest_e_basic;
+IF (OBJECT_ID('uq_migtest_e_basic_indextest5', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_indextest5') drop index uq_migtest_e_basic_indextest5 ON migtest_e_basic;
+create unique nonclustered index uq_migtest_e_basic_indextest2 on migtest_e_basic(indextest2) where indextest2 is not null;
+create unique nonclustered index uq_migtest_e_basic_indextest6 on migtest_e_basic(indextest6) where indextest6 is not null;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_e_history2') and t2.name = 'test_string';
+if @Tmp is not null EXEC('alter table migtest_e_history2 drop constraint ' + @Tmp)$$;
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest3') drop index ix_migtest_e_basic_indextest3 ON migtest_e_basic;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest6') drop index ix_migtest_e_basic_indextest6 ON migtest_e_basic;
+create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
+alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id);
+
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.4__dropsFor_1.3.sql
new file mode 100644
index 000000000..50be4368d
--- /dev/null
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.4__dropsFor_1.3.sql
@@ -0,0 +1,179 @@
+-- Migrationscripts for ebean unittest
+-- apply changes
+-- drop column migtest_ckey_detail.one_key;
+IF (OBJECT_ID('uq_migtest_ckey_detail_one_key', 'UQ') IS NOT NULL) alter table migtest_ckey_detail drop constraint uq_migtest_ckey_detail_one_key;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_ckey_detail','U') AND name = 'uq_migtest_ckey_detail_one_key') drop index uq_migtest_ckey_detail_one_key ON migtest_ckey_detail;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_ckey_detail') and t2.name = 'one_key';
+if @Tmp is not null EXEC('alter table migtest_ckey_detail drop constraint ' + @Tmp)$$;
+IF (OBJECT_ID('ck_migtest_ckey_detail_one_key', 'C') IS NOT NULL) alter table migtest_ckey_detail drop constraint ck_migtest_ckey_detail_one_key;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_ckey_detail','U') AND name = 'ix_migtest_ckey_detail_one_key') drop index ix_migtest_ckey_detail_one_key ON migtest_ckey_detail;
+IF OBJECT_ID('fk_migtest_ckey_detail_one_key', 'F') IS NOT NULL alter table migtest_ckey_detail drop constraint fk_migtest_ckey_detail_one_key;
+alter table migtest_ckey_detail drop column one_key;
+
+-- drop column migtest_ckey_detail.two_key;
+IF (OBJECT_ID('uq_migtest_ckey_detail_two_key', 'UQ') IS NOT NULL) alter table migtest_ckey_detail drop constraint uq_migtest_ckey_detail_two_key;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_ckey_detail','U') AND name = 'uq_migtest_ckey_detail_two_key') drop index uq_migtest_ckey_detail_two_key ON migtest_ckey_detail;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_ckey_detail') and t2.name = 'two_key';
+if @Tmp is not null EXEC('alter table migtest_ckey_detail drop constraint ' + @Tmp)$$;
+IF (OBJECT_ID('ck_migtest_ckey_detail_two_key', 'C') IS NOT NULL) alter table migtest_ckey_detail drop constraint ck_migtest_ckey_detail_two_key;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_ckey_detail','U') AND name = 'ix_migtest_ckey_detail_two_key') drop index ix_migtest_ckey_detail_two_key ON migtest_ckey_detail;
+IF OBJECT_ID('fk_migtest_ckey_detail_two_key', 'F') IS NOT NULL alter table migtest_ckey_detail drop constraint fk_migtest_ckey_detail_two_key;
+alter table migtest_ckey_detail drop column two_key;
+
+-- drop column migtest_ckey_parent.assoc_id;
+IF (OBJECT_ID('uq_migtest_ckey_parent_assoc_id', 'UQ') IS NOT NULL) alter table migtest_ckey_parent drop constraint uq_migtest_ckey_parent_assoc_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_ckey_parent','U') AND name = 'uq_migtest_ckey_parent_assoc_id') drop index uq_migtest_ckey_parent_assoc_id ON migtest_ckey_parent;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_ckey_parent') and t2.name = 'assoc_id';
+if @Tmp is not null EXEC('alter table migtest_ckey_parent drop constraint ' + @Tmp)$$;
+IF (OBJECT_ID('ck_migtest_ckey_parent_assoc_id', 'C') IS NOT NULL) alter table migtest_ckey_parent drop constraint ck_migtest_ckey_parent_assoc_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_ckey_parent','U') AND name = 'ix_migtest_ckey_parent_assoc_id') drop index ix_migtest_ckey_parent_assoc_id ON migtest_ckey_parent;
+IF OBJECT_ID('fk_migtest_ckey_parent_assoc_id', 'F') IS NOT NULL alter table migtest_ckey_parent drop constraint fk_migtest_ckey_parent_assoc_id;
+alter table migtest_ckey_parent drop column assoc_id;
+
+-- drop column migtest_e_basic.new_string_field;
+IF (OBJECT_ID('uq_migtest_e_basic_new_string_field', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_new_string_field;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_new_string_field') drop index uq_migtest_e_basic_new_string_field ON migtest_e_basic;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'new_string_field';
+if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
+IF (OBJECT_ID('ck_migtest_e_basic_new_string_field', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_new_string_field;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_new_string_field') drop index ix_migtest_e_basic_new_string_field ON migtest_e_basic;
+IF OBJECT_ID('fk_migtest_e_basic_new_string_field', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_new_string_field;
+alter table migtest_e_basic drop column new_string_field;
+
+-- drop column migtest_e_basic.new_boolean_field;
+IF (OBJECT_ID('uq_migtest_e_basic_new_boolean_field', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_new_boolean_field;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_new_boolean_field') drop index uq_migtest_e_basic_new_boolean_field ON migtest_e_basic;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'new_boolean_field';
+if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
+IF (OBJECT_ID('ck_migtest_e_basic_new_boolean_field', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_new_boolean_field;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_new_boolean_field') drop index ix_migtest_e_basic_new_boolean_field ON migtest_e_basic;
+IF OBJECT_ID('fk_migtest_e_basic_new_boolean_field', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_new_boolean_field;
+alter table migtest_e_basic drop column new_boolean_field;
+
+-- drop column migtest_e_basic.new_boolean_field2;
+IF (OBJECT_ID('uq_migtest_e_basic_new_boolean_field2', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_new_boolean_field2;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_new_boolean_field2') drop index uq_migtest_e_basic_new_boolean_field2 ON migtest_e_basic;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'new_boolean_field2';
+if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
+IF (OBJECT_ID('ck_migtest_e_basic_new_boolean_field2', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_new_boolean_field2;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_new_boolean_field2') drop index ix_migtest_e_basic_new_boolean_field2 ON migtest_e_basic;
+IF OBJECT_ID('fk_migtest_e_basic_new_boolean_field2', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_new_boolean_field2;
+alter table migtest_e_basic drop column new_boolean_field2;
+
+-- drop column migtest_e_basic.progress;
+IF (OBJECT_ID('uq_migtest_e_basic_progress', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_progress;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_progress') drop index uq_migtest_e_basic_progress ON migtest_e_basic;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'progress';
+if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
+IF (OBJECT_ID('ck_migtest_e_basic_progress', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_progress;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_progress') drop index ix_migtest_e_basic_progress ON migtest_e_basic;
+IF OBJECT_ID('fk_migtest_e_basic_progress', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_progress;
+alter table migtest_e_basic drop column progress;
+
+-- drop column migtest_e_basic.new_integer;
+IF (OBJECT_ID('uq_migtest_e_basic_new_integer', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_new_integer;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_new_integer') drop index uq_migtest_e_basic_new_integer ON migtest_e_basic;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'new_integer';
+if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
+IF (OBJECT_ID('ck_migtest_e_basic_new_integer', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_new_integer;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_new_integer') drop index ix_migtest_e_basic_new_integer ON migtest_e_basic;
+IF OBJECT_ID('fk_migtest_e_basic_new_integer', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_new_integer;
+alter table migtest_e_basic drop column new_integer;
+
+-- drop column migtest_e_history2.test_string2;
+IF (OBJECT_ID('uq_migtest_e_history2_test_string2', 'UQ') IS NOT NULL) alter table migtest_e_history2 drop constraint uq_migtest_e_history2_test_string2;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history2','U') AND name = 'uq_migtest_e_history2_test_string2') drop index uq_migtest_e_history2_test_string2 ON migtest_e_history2;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_e_history2') and t2.name = 'test_string2';
+if @Tmp is not null EXEC('alter table migtest_e_history2 drop constraint ' + @Tmp)$$;
+IF (OBJECT_ID('ck_migtest_e_history2_test_string2', 'C') IS NOT NULL) alter table migtest_e_history2 drop constraint ck_migtest_e_history2_test_string2;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history2','U') AND name = 'ix_migtest_e_history2_test_string2') drop index ix_migtest_e_history2_test_string2 ON migtest_e_history2;
+IF OBJECT_ID('fk_migtest_e_history2_test_string2', 'F') IS NOT NULL alter table migtest_e_history2 drop constraint fk_migtest_e_history2_test_string2;
+alter table migtest_e_history2 drop column test_string2;
+
+-- drop column migtest_e_history2.test_string3;
+IF (OBJECT_ID('uq_migtest_e_history2_test_string3', 'UQ') IS NOT NULL) alter table migtest_e_history2 drop constraint uq_migtest_e_history2_test_string3;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history2','U') AND name = 'uq_migtest_e_history2_test_string3') drop index uq_migtest_e_history2_test_string3 ON migtest_e_history2;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_e_history2') and t2.name = 'test_string3';
+if @Tmp is not null EXEC('alter table migtest_e_history2 drop constraint ' + @Tmp)$$;
+IF (OBJECT_ID('ck_migtest_e_history2_test_string3', 'C') IS NOT NULL) alter table migtest_e_history2 drop constraint ck_migtest_e_history2_test_string3;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history2','U') AND name = 'ix_migtest_e_history2_test_string3') drop index ix_migtest_e_history2_test_string3 ON migtest_e_history2;
+IF OBJECT_ID('fk_migtest_e_history2_test_string3', 'F') IS NOT NULL alter table migtest_e_history2 drop constraint fk_migtest_e_history2_test_string3;
+alter table migtest_e_history2 drop column test_string3;
+
+-- drop column migtest_e_softdelete.deleted;
+IF (OBJECT_ID('uq_migtest_e_softdelete_deleted', 'UQ') IS NOT NULL) alter table migtest_e_softdelete drop constraint uq_migtest_e_softdelete_deleted;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_softdelete','U') AND name = 'uq_migtest_e_softdelete_deleted') drop index uq_migtest_e_softdelete_deleted ON migtest_e_softdelete;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_e_softdelete') and t2.name = 'deleted';
+if @Tmp is not null EXEC('alter table migtest_e_softdelete drop constraint ' + @Tmp)$$;
+IF (OBJECT_ID('ck_migtest_e_softdelete_deleted', 'C') IS NOT NULL) alter table migtest_e_softdelete drop constraint ck_migtest_e_softdelete_deleted;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_softdelete','U') AND name = 'ix_migtest_e_softdelete_deleted') drop index ix_migtest_e_softdelete_deleted ON migtest_e_softdelete;
+IF OBJECT_ID('fk_migtest_e_softdelete_deleted', 'F') IS NOT NULL alter table migtest_e_softdelete drop constraint fk_migtest_e_softdelete_deleted;
+alter table migtest_e_softdelete drop column deleted;
+
+-- drop column migtest_oto_child.master_id;
+IF (OBJECT_ID('uq_migtest_oto_child_master_id', 'UQ') IS NOT NULL) alter table migtest_oto_child drop constraint uq_migtest_oto_child_master_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_oto_child','U') AND name = 'uq_migtest_oto_child_master_id') drop index uq_migtest_oto_child_master_id ON migtest_oto_child;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_oto_child') and t2.name = 'master_id';
+if @Tmp is not null EXEC('alter table migtest_oto_child drop constraint ' + @Tmp)$$;
+IF (OBJECT_ID('ck_migtest_oto_child_master_id', 'C') IS NOT NULL) alter table migtest_oto_child drop constraint ck_migtest_oto_child_master_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_oto_child','U') AND name = 'ix_migtest_oto_child_master_id') drop index ix_migtest_oto_child_master_id ON migtest_oto_child;
+IF OBJECT_ID('fk_migtest_oto_child_master_id', 'F') IS NOT NULL alter table migtest_oto_child drop constraint fk_migtest_oto_child_master_id;
+alter table migtest_oto_child drop column master_id;
+
+IF OBJECT_ID('migtest_e_user', 'U') IS NOT NULL drop table migtest_e_user;
+IF OBJECT_ID('migtest_e_user_seq', 'SO') IS NOT NULL drop sequence migtest_e_user_seq;
+IF OBJECT_ID('migtest_mtm_c_migtest_mtm_m', 'U') IS NOT NULL drop table migtest_mtm_c_migtest_mtm_m;
+IF OBJECT_ID('migtest_mtm_m_migtest_mtm_c', 'U') IS NOT NULL drop table migtest_mtm_m_migtest_mtm_c;
+-- dropping history support for migtest_e_history;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_e_history') and t2.name = 'sys_periodFrom';
+if @Tmp is not null EXEC('alter table migtest_e_history drop constraint ' + @Tmp)$$;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_e_history') and t2.name = 'sys_periodTo';
+if @Tmp is not null EXEC('alter table migtest_e_history drop constraint ' + @Tmp)$$;
+alter table migtest_e_history set (system_versioning = off);
+alter table migtest_e_history drop period for system_time;
+alter table migtest_e_history drop column sys_periodFrom;
+alter table migtest_e_history drop column sys_periodTo;
+IF OBJECT_ID('migtest_e_history_history', 'U') IS NOT NULL drop table migtest_e_history_history;
+

From f840cfc2ae2ec15f23d788b5486c3b86c9c808dd Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Mar 2018 17:40:11 +1300
Subject: [PATCH 0162/1036] #1340 - Split SQL Server Platform into SqlServer16
 and SqlServer17 (where 2017 which uses UTF8 types nvarchar etc and prefers
 Sequences).

test changes
---
 src/test/java/io/ebean/BaseTestCase.java      |   2 +-
 .../java/io/ebean/ConditionalTestRunner.java  |   4 +
 .../java/io/ebean/DtoQueryFromOrmTest.java    |  14 +-
 .../config/MatchingNamingConventionTest.java  |   4 +-
 .../config/ServerConfigSqlServerTest.java     | 134 ++++++++++++++++++
 .../dbplatform/DatabasePlatformTest.java      |   8 +-
 .../sqlserver/SqlServer2016PlatformTest.java  |   4 +-
 .../dbmigration/DbMigrationSqlServerTest.java |  28 ++++
 .../ebean/event/BeanFindControllerTest.java   |  11 +-
 .../dbmigration/DbMigrationGenerateTest.java  |  11 +-
 .../ddlgeneration/BaseDdlHandlerTest.java     |   6 +-
 .../platform/PlatformDdl_AlterColumnTest.java |   6 +-
 .../PlatformDdl_dropUniqueConstraintTest.java |   4 +-
 .../extraddl/model/ExtraDdlXmlReaderTest.java |  37 ++++-
 .../aggregation/TestAggregationCount.java     |  12 +-
 .../TestExplicitTransactionMode.java          |   5 +
 src/test/resources/ebean.properties           |   8 +-
 17 files changed, 260 insertions(+), 38 deletions(-)
 create mode 100644 src/test/java/io/ebean/config/ServerConfigSqlServerTest.java
 create mode 100644 src/test/java/io/ebean/dbmigration/DbMigrationSqlServerTest.java

diff --git a/src/test/java/io/ebean/BaseTestCase.java b/src/test/java/io/ebean/BaseTestCase.java
index bdef878cf..16e4ef45d 100644
--- a/src/test/java/io/ebean/BaseTestCase.java
+++ b/src/test/java/io/ebean/BaseTestCase.java
@@ -93,7 +93,7 @@ public abstract class BaseTestCase {
    * so tests that do this need to be skipped for SQL Server.
    */
   public boolean isSqlServer() {
-    return Platform.SQLSERVER == platform();
+    return Platform.SQLSERVER17 == platform();
   }
 
   public boolean isH2() {
diff --git a/src/test/java/io/ebean/ConditionalTestRunner.java b/src/test/java/io/ebean/ConditionalTestRunner.java
index b70f572f0..c60b46b73 100644
--- a/src/test/java/io/ebean/ConditionalTestRunner.java
+++ b/src/test/java/io/ebean/ConditionalTestRunner.java
@@ -42,6 +42,10 @@ public class ConditionalTestRunner extends BlockJUnit4ClassRunner {
       if (p.equals(current)) {
         return true;
       }
+      if (p == Platform.SQLSERVER && current == Platform.SQLSERVER17) {
+        // treat SQLSERVER as SQLSERVER17 in testing
+        return true;
+      }
     }
     return false;
   }
diff --git a/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
index af22c17c6..c72cfa330 100644
--- a/src/test/java/io/ebean/DtoQueryFromOrmTest.java
+++ b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
@@ -142,7 +142,13 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     }
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(sql.get(0)).contains("select t0.email, concat(t0.last_name,', ',t0.first_name) fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+
+    if (isSqlServer()) {
+      assertThat(sql.get(0)).contains("select top 10 t0.email, concat(t0.last_name,', ',t0.first_name) fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+
+    } else {
+      assertThat(sql.get(0)).contains("select t0.email, concat(t0.last_name,', ',t0.first_name) fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+    }
   }
 
   @Test
@@ -171,7 +177,11 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     }
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(sql.get(0)).contains("select t0.id, t0.email, concat(t0.last_name,', ',t0.first_name) fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+    if (isSqlServer()) {
+      assertThat(sql.get(0)).contains("select top 10 t0.id, t0.email, concat(t0.last_name,', ',t0.first_name) fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+    } else {
+      assertThat(sql.get(0)).contains("select t0.id, t0.email, concat(t0.last_name,', ',t0.first_name) fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+    }
   }
 
   @Test
diff --git a/src/test/java/io/ebean/config/MatchingNamingConventionTest.java b/src/test/java/io/ebean/config/MatchingNamingConventionTest.java
index 2cca6c06d..677b572e7 100644
--- a/src/test/java/io/ebean/config/MatchingNamingConventionTest.java
+++ b/src/test/java/io/ebean/config/MatchingNamingConventionTest.java
@@ -1,7 +1,7 @@
 package io.ebean.config;
 
 import io.ebean.config.dbplatform.h2.H2Platform;
-import io.ebean.config.dbplatform.sqlserver.SqlServerPlatform;
+import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
 import org.junit.Test;
 
 import static org.assertj.core.api.StrictAssertions.assertThat;
@@ -18,7 +18,7 @@ public class MatchingNamingConventionTest {
   @Test
   public void getColumnFromProperty_when_allQuoted() {
 
-    SqlServerPlatform platform = new SqlServerPlatform();
+    SqlServer17Platform platform = new SqlServer17Platform();
 
     ServerConfig config = new ServerConfig();
     config.setAllQuotedIdentifiers(true);
diff --git a/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java b/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java
new file mode 100644
index 000000000..7e3e73bba
--- /dev/null
+++ b/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java
@@ -0,0 +1,134 @@
+package io.ebean.config;
+
+
+import io.ebean.EbeanServer;
+import io.ebean.EbeanServerFactory;
+import io.ebean.annotation.ForPlatform;
+import io.ebean.annotation.Platform;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.tests.model.basic.EBasicVer;
+
+import javax.persistence.PersistenceException;
+import java.util.Properties;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ServerConfigSqlServerTest {
+
+  @Ignore
+  @ForPlatform({Platform.SQLSERVER, Platform.SQLSERVER17, Platform.SQLSERVER16})
+  @Test(expected = PersistenceException.class)
+  public void need_explicitPlatform() {
+
+    Properties props = props("some_sqlserver");
+
+    // no explicit databasePlatformName set ..
+    //props.setProperty("ebean.some_sqlserver.databasePlatformName", "sqlserver17");
+
+    ServerConfig config = new ServerConfig();
+    config.setName("some_sqlserver");
+    config.loadFromProperties(props);
+
+    // not explicitly set ... so we fail to start
+//    config.setDatabasePlatform(new SqlServer17Platform());
+//    config.setDatabasePlatformName("sqlserver17");
+
+    config.setDefaultServer(false);
+    config.setRegister(false);
+    config.getClasses().add(EBasicVer.class);
+
+    EbeanServer sqlServer = EbeanServerFactory.create(config);
+
+    assertThat(sqlServer).isNotNull();
+
+//    javax.persistence.PersistenceException: java.lang.IllegalArgumentException: For SqlServer please choose the more specific sqlserver16 or sqlserver17 platform via ServerConfig.setDatabasePlatformName. Refer to issue #1340 for details
+//
+//    at io.ebeaninternal.server.core.DatabasePlatformFactory.create(DatabasePlatformFactory.java:62)
+//    at io.ebeaninternal.server.core.DefaultContainer.setDatabasePlatform(DefaultContainer.java:266)
+//    at io.ebeaninternal.server.core.DefaultContainer.createServer(DefaultContainer.java:126)
+//    at io.ebeaninternal.server.core.DefaultContainer.createServer(DefaultContainer.java:45)
+//    at io.ebean.EbeanServerFactory.createInternal(EbeanServerFactory.java:109)
+//    at io.ebean.EbeanServerFactory.create(EbeanServerFactory.java:70)
+//    at io.ebean.config.ServerConfigSqlServerTest.need_explicitPlatform(ServerConfigSqlServerTest.java:35)
+
+  }
+
+  @Ignore
+  @ForPlatform({Platform.SQLSERVER, Platform.SQLSERVER17, Platform.SQLSERVER16})
+  @Test
+  public void explicit_17() {
+
+    String name = "testsqlserver17";
+
+    ServerConfig config = new ServerConfig();
+    config.setName(name);
+
+    Properties props = props(name);
+
+    // set via properties
+    //props.setProperty("ebean.testsqlserver17.databasePlatformName", "sqlserver17");
+
+    // or set programmatically ...
+    config.setDatabasePlatformName("sqlserver17");
+
+    config.setDefaultServer(false);
+    config.setRegister(false);
+    config.setDdlGenerate(true);
+    config.setDdlRun(true);
+    config.loadFromProperties(props);
+    config.getClasses().add(EBasicVer.class);
+
+    EbeanServer sqlServer = EbeanServerFactory.create(config);
+
+    assertThat(sqlServer).isNotNull();
+  }
+
+  @Ignore
+  @ForPlatform({Platform.SQLSERVER, Platform.SQLSERVER17, Platform.SQLSERVER16})
+  @Test
+  public void explicit_16() {
+
+    String name = "testsqlserver16";
+    Properties props = props(name);
+    //props.setProperty("ebean.testsqlserver16.databasePlatformName", "sqlserver16");
+
+    ServerConfig config = new ServerConfig();
+    config.setDefaultServer(false);
+    config.setRegister(false);
+    config.setDdlGenerate(true);
+    config.setDdlRun(true);
+
+    config.setName(name); // match dataSource
+    config.setDatabasePlatformName("sqlserver16");
+    config.loadFromProperties(props);
+    config.getClasses().add(EBasicVer.class);
+
+    EbeanServer sqlServer = EbeanServerFactory.create(config);
+
+    assertThat(sqlServer).isNotNull();
+  }
+
+  private Properties props(String dbName) {
+
+    Properties props = new Properties();
+
+    // automatically start docker sqlserver 2017 container ...
+    props.setProperty("ebean.test.platform", "sqlserver");
+    props.setProperty("ebean.test.dbName", "test_ebean");
+    props.setProperty("ebean.test.ddlMode", "dropCreate");
+    //props.setProperty("ebean.test.containerMode","dropCreate");
+
+
+    props.setProperty(key(dbName, "username"), "test_ebean");
+    props.setProperty(key(dbName, "password"), "SqlS3rv#r");
+    props.setProperty(key(dbName, "url"), "jdbc:sqlserver://localhost:1433;databaseName=test_ebean");
+    props.setProperty(key(dbName, "driver"), "com.microsoft.sqlserver.jdbc.SQLServerDriver");
+
+    return props;
+  }
+
+  private String key(String dbName, String key) {
+    return "datasource." + dbName + "." + key;
+  }
+}
diff --git a/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java b/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java
index 65fe0426e..a1e9de455 100644
--- a/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java
+++ b/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java
@@ -1,12 +1,12 @@
 package io.ebean.config.dbplatform;
 
-import io.ebean.config.DbTypeConfig;
 import io.ebean.annotation.Platform;
+import io.ebean.config.DbTypeConfig;
 import io.ebean.config.MatchingNamingConvention;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.h2.H2Platform;
 import io.ebean.config.dbplatform.postgres.PostgresPlatform;
-import io.ebean.config.dbplatform.sqlserver.SqlServerPlatform;
+import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -20,7 +20,7 @@ public class DatabasePlatformTest {
     config.setAllQuotedIdentifiers(true);
     config.setNamingConvention(new MatchingNamingConvention());
 
-    DatabasePlatform dbPlatform = new SqlServerPlatform();
+    DatabasePlatform dbPlatform = new SqlServer17Platform();
     dbPlatform.configure(config.getDbTypeConfig(), config.isAllQuotedIdentifiers());
 
     assertEquals(dbPlatform.convertQuotedIdentifiers("order"),"[order]");
@@ -33,7 +33,7 @@ public class DatabasePlatformTest {
 
     ServerConfig config = new ServerConfig();
 
-    DatabasePlatform dbPlatform = new SqlServerPlatform();
+    DatabasePlatform dbPlatform = new SqlServer17Platform();
     dbPlatform.configure(config.getDbTypeConfig(), config.isAllQuotedIdentifiers());
 
     assertEquals(dbPlatform.convertQuotedIdentifiers("order"),"order");
diff --git a/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java b/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java
index c6efddc6a..092adcebe 100644
--- a/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java
+++ b/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java
@@ -2,7 +2,7 @@ package io.ebean.config.dbplatform.sqlserver;
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author Vilmos Nagy  <vilmos.nagy@outlook.com>
@@ -11,7 +11,7 @@ public class SqlServer2016PlatformTest {
 
   @Test
   public void testHistorySupport() {
-    SqlServerPlatform platform = new SqlServerPlatform();
+    SqlServer17Platform platform = new SqlServer17Platform();
     assertTrue(platform.getHistorySupport() instanceof SqlServerHistorySupport);
   }
 }
diff --git a/src/test/java/io/ebean/dbmigration/DbMigrationSqlServerTest.java b/src/test/java/io/ebean/dbmigration/DbMigrationSqlServerTest.java
new file mode 100644
index 000000000..84249a1d4
--- /dev/null
+++ b/src/test/java/io/ebean/dbmigration/DbMigrationSqlServerTest.java
@@ -0,0 +1,28 @@
+package io.ebean.dbmigration;
+
+import io.ebean.annotation.Platform;
+import org.junit.Test;
+
+public class DbMigrationSqlServerTest {
+
+  @Test(expected = IllegalArgumentException.class)
+  public void need_explicitPlatform() {
+
+    DbMigration dbMigration = DbMigration.create();
+    dbMigration.setPlatform(Platform.SQLSERVER);
+  }
+
+  @Test
+  public void explicit_16_isGood() {
+
+    DbMigration dbMigration = DbMigration.create();
+    dbMigration.setPlatform(Platform.SQLSERVER16);
+  }
+
+  @Test
+  public void explicit_17_isGood() {
+
+    DbMigration dbMigration = DbMigration.create();
+    dbMigration.setPlatform(Platform.SQLSERVER17);
+  }
+}
diff --git a/src/test/java/io/ebean/event/BeanFindControllerTest.java b/src/test/java/io/ebean/event/BeanFindControllerTest.java
index 0d21ffda1..c47d5edca 100644
--- a/src/test/java/io/ebean/event/BeanFindControllerTest.java
+++ b/src/test/java/io/ebean/event/BeanFindControllerTest.java
@@ -6,14 +6,17 @@ import io.ebean.EbeanServerFactory;
 import io.ebean.bean.BeanCollection;
 import io.ebean.common.BeanList;
 import io.ebean.config.ServerConfig;
+import org.junit.Test;
+import org.tests.example.ModUuidGenerator;
 import org.tests.model.basic.EBasic;
 import org.tests.model.basic.ECustomId;
-import org.tests.example.ModUuidGenerator;
-import org.junit.Test;
 
 import java.util.List;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 public class BeanFindControllerTest extends BaseTestCase {
 
@@ -39,6 +42,8 @@ public class BeanFindControllerTest extends BaseTestCase {
 
     EbeanServer ebeanServer = EbeanServerFactory.create(config);
 
+    System.clearProperty("ebean.ignoreExtraDdl");
+
     assertFalse(findController.calledInterceptFind);
     ebeanServer.find(EBasic.class, 42);
     assertTrue(findController.calledInterceptFind);
diff --git a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
index 6d16f0d1c..4966011b6 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
@@ -6,20 +6,19 @@ import io.ebean.annotation.Platform;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.IdType;
-import io.ebean.config.dbplatform.sqlserver.SqlServerPlatform;
-
-import org.junit.*;
+import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
+import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 
 /**
  * This is the Migrationscript generator. It generates 3 migrationscript for the models
@@ -57,7 +56,7 @@ public class DbMigrationGenerateTest {
     migration.addPlatform(Platform.SQLITE, "sqlite");
 
     // we need sequence here, so that migration will work properly
-    DatabasePlatform sqlServer = new SqlServerPlatform();
+    DatabasePlatform sqlServer = new SqlServer17Platform();
     sqlServer.getDbIdentity().setIdType(IdType.SEQUENCE);
     migration.addDatabasePlatform(sqlServer, "sqlserver");
 
diff --git a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java
index 210e8195c..e185e8df7 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java
@@ -6,7 +6,7 @@ import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.h2.H2Platform;
 import io.ebean.config.dbplatform.postgres.PostgresPlatform;
-import io.ebean.config.dbplatform.sqlserver.SqlServerPlatform;
+import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.dbmigration.migration.ChangeSet;
 import io.ebeaninternal.dbmigration.model.CurrentModel;
@@ -34,7 +34,7 @@ public class BaseDdlHandlerTest extends BaseTestCase {
   }
 
   private DdlHandler sqlserverHandler() {
-    return handler(new SqlServerPlatform());
+    return handler(new SqlServer17Platform());
   }
 
   @Test
@@ -46,7 +46,7 @@ public class BaseDdlHandlerTest extends BaseTestCase {
 
     write = new DdlWrite();
     sqlserverHandler().generate(write, Helper.getAddColumn());
-    assertThat(write.apply().getBuffer()).isEqualTo("alter table foo add added_to_foo varchar(20);\n\n");
+    assertThat(write.apply().getBuffer()).isEqualTo("alter table foo add added_to_foo nvarchar(20);\n\n");
   }
 
   @Test
diff --git a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
index 2f22d5c51..5cd6e6a1d 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
@@ -7,7 +7,7 @@ import io.ebean.config.dbplatform.h2.H2Platform;
 import io.ebean.config.dbplatform.mysql.MySqlPlatform;
 import io.ebean.config.dbplatform.oracle.OraclePlatform;
 import io.ebean.config.dbplatform.postgres.PostgresPlatform;
-import io.ebean.config.dbplatform.sqlserver.SqlServerPlatform;
+import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
 import io.ebeaninternal.dbmigration.migration.AlterColumn;
 import io.ebeaninternal.dbmigration.migration.IdentityType;
 import io.ebeaninternal.server.core.PlatformDdlBuilder;
@@ -23,7 +23,7 @@ public class PlatformDdl_AlterColumnTest {
   private PlatformDdl pgDdl = PlatformDdlBuilder.create(new PostgresPlatform());
   private PlatformDdl mysqlDdl = PlatformDdlBuilder.create(new MySqlPlatform());
   private PlatformDdl oraDdl = PlatformDdlBuilder.create(new OraclePlatform());
-  private PlatformDdl sqlServerDdl = PlatformDdlBuilder.create(new SqlServerPlatform());
+  private PlatformDdl sqlServerDdl = PlatformDdlBuilder.create(new SqlServer17Platform());
 
   {
     ServerConfig serverConfig = Ebean.getDefaultServer().getPluginApi().getServerConfig();
@@ -76,7 +76,7 @@ public class PlatformDdl_AlterColumnTest {
     assertEquals("alter table mytab modify acol varchar(5) not null", sql);
 
     sql = sqlServerDdl.alterColumnBaseAttributes(alterColumn);
-    assertEquals("alter table mytab alter column acol varchar(5) not null", sql);
+    assertEquals("alter table mytab alter column acol nvarchar(5) not null", sql);
 
     alterColumn.setNotnull(Boolean.FALSE);
     sql = mysqlDdl.alterColumnBaseAttributes(alterColumn);
diff --git a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java
index f7fd62cbe..e68ece07c 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java
@@ -1,10 +1,10 @@
 package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
 import io.ebean.config.dbplatform.h2.H2Platform;
-import io.ebean.config.dbplatform.sqlserver.SqlServerPlatform;
 import io.ebean.config.dbplatform.mysql.MySqlPlatform;
 import io.ebean.config.dbplatform.oracle.OraclePlatform;
 import io.ebean.config.dbplatform.postgres.PostgresPlatform;
+import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
 import io.ebeaninternal.server.core.PlatformDdlBuilder;
 import org.junit.Test;
 
@@ -17,7 +17,7 @@ public class PlatformDdl_dropUniqueConstraintTest {
   private PlatformDdl pgDdl = PlatformDdlBuilder.create(new PostgresPlatform());
   private PlatformDdl mysqlDdl = PlatformDdlBuilder.create(new MySqlPlatform());
   private PlatformDdl oraDdl = PlatformDdlBuilder.create(new OraclePlatform());
-  private PlatformDdl sqlServerDdl = PlatformDdlBuilder.create(new SqlServerPlatform());
+  private PlatformDdl sqlServerDdl = PlatformDdlBuilder.create(new SqlServer17Platform());
 
   @Test
   public void test() throws Exception {
diff --git a/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java b/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java
index 440e889c0..364fa32a9 100644
--- a/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java
+++ b/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java
@@ -3,12 +3,14 @@ package io.ebeaninternal.extraddl.model;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 public class ExtraDdlXmlReaderTest {
 
   @Test
-  public void read() throws Exception {
+  public void read(){
 
     ExtraDdl read = ExtraDdlXmlReader.read("/extra-ddl.xml");
     assertNotNull(read);
@@ -44,4 +46,37 @@ public class ExtraDdlXmlReaderTest {
     assertThat(ddl).doesNotContain(" -- oracle only script");
   }
 
+  @Test
+  public void matchPlatform() {
+
+    assertTrue(ExtraDdlXmlReader.matchPlatform("h2", "h2"));
+    assertTrue(ExtraDdlXmlReader.matchPlatform("h2", "mysql,h2"));
+    assertTrue(ExtraDdlXmlReader.matchPlatform("h2", "mysql,h2,"));
+    assertTrue(ExtraDdlXmlReader.matchPlatform("h2", "mysql , h2 ,"));
+    assertTrue(ExtraDdlXmlReader.matchPlatform("h2", "mysql , h2, oracle"));
+    assertTrue(ExtraDdlXmlReader.matchPlatform("h2", "mysql , h2, oracle"));
+
+    assertTrue(ExtraDdlXmlReader.matchPlatform("sqlserver17", "sqlserver17"));
+    assertTrue(ExtraDdlXmlReader.matchPlatform("sqlserver16", "sqlserver16"));
+  }
+
+  @Test
+  public void matchPlatform_sqlserver17_matchAlsoToGenericName() {
+
+    assertTrue(ExtraDdlXmlReader.matchPlatform("sqlserver17", "sqlserver"));
+  }
+
+  @Test
+  public void matchPlatform_sqlserver16_matchAlsoToGenericName() {
+
+    assertTrue(ExtraDdlXmlReader.matchPlatform("sqlserver16", "sqlserver"));
+  }
+
+  @Test
+  public void matchPlatform_sqlserver_nonMatch() {
+
+    assertFalse(ExtraDdlXmlReader.matchPlatform("sqlserver16", "sqlserver17"));
+    assertFalse(ExtraDdlXmlReader.matchPlatform("sqlserver17", "sqlserver16"));
+  }
+
 }
diff --git a/src/test/java/org/tests/query/aggregation/TestAggregationCount.java b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
index dcbdcdf1e..3c027b662 100644
--- a/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
+++ b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
@@ -351,7 +351,7 @@ public class TestAggregationCount extends BaseTestCase {
     assertThat(maxLastName).isNotNull();
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(sql.get(0)).contains("select max(t0.last_name) from contact t0");
+    assertThat(trimSql(sql.get(0))).contains("select max(t0.last_name) from contact t0");
   }
 
   @Test
@@ -370,7 +370,7 @@ public class TestAggregationCount extends BaseTestCase {
     assertThat(count).isNotNull();
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(sql.get(0)).contains("select count(distinct t0.last_name) from contact t0 where not exists (select 1 from contact_note x where x.contact_id = t0.id)");
+    assertThat(trimSql(sql.get(0))).contains("select count(distinct t0.last_name) from contact t0 where not exists (select 1 from contact_note x where x.contact_id = t0.id)");
   }
 
   @Test
@@ -391,7 +391,7 @@ public class TestAggregationCount extends BaseTestCase {
     assertThat(names).isNotEmpty();
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(sql.get(0)).contains("select concat(t0.last_name,', ',t0.first_name) from contact t0 where t0.phone is null  order by t0.last_name");
+    assertThat(trimSql(sql.get(0))).contains("select concat(t0.last_name,', ',t0.first_name) from contact t0 where t0.phone is null  order by t0.last_name");
   }
 
   @Test
@@ -412,7 +412,7 @@ public class TestAggregationCount extends BaseTestCase {
     assertThat(names).isNotEmpty();
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(sql.get(0)).contains("select concat(t0.updtime,', ',t0.first_name) from contact t0");
+    assertThat(trimSql(sql.get(0))).contains("select concat(t0.updtime,', ',t0.first_name) from contact t0");
   }
 
   @Test
@@ -432,7 +432,7 @@ public class TestAggregationCount extends BaseTestCase {
     assertThat(instant).isNotNull();
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(sql.get(0)).contains("select max(t0.updtime) from contact t0 where t0.phone is null");
+    assertThat(trimSql(sql.get(0))).contains("select max(t0.updtime) from contact t0 where t0.phone is null");
   }
 
 
@@ -459,7 +459,7 @@ public class TestAggregationCount extends BaseTestCase {
     }
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(sql.get(0)).contains("select t0.id, t0.email, concat(t0.last_name,', ',t0.first_name) lastName from contact t0 where t0.phone is null  order by t0.last_name; --bind()");
+    assertThat(trimSql(sql.get(0))).contains("select t0.id, t0.email, concat(t0.last_name,', ',t0.first_name) lastName from contact t0 where t0.phone is null  order by t0.last_name; --bind()");
   }
 
 }
diff --git a/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
index 59ebdd121..2d0bb7abf 100644
--- a/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
+++ b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
@@ -5,6 +5,8 @@ import io.ebean.EbeanServer;
 import io.ebean.EbeanServerFactory;
 import io.ebean.Query;
 import io.ebean.Transaction;
+import io.ebean.annotation.ForPlatform;
+import io.ebean.annotation.Platform;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.properties.PropertiesLoader;
 import org.avaje.datasource.DataSourceConfig;
@@ -24,6 +26,7 @@ import static org.junit.Assert.assertTrue;
 
 public class TestExplicitTransactionMode extends BaseTestCase {
 
+  @ForPlatform(Platform.H2)
   @Test
   public void test() throws SQLException {
 
@@ -56,6 +59,8 @@ public class TestExplicitTransactionMode extends BaseTestCase {
 
     EbeanServer ebeanServer = EbeanServerFactory.create(config);
 
+    System.clearProperty("ebean.ignoreExtraDdl");
+
     Query<UTMaster> query = ebeanServer.find(UTMaster.class);
     List<UTMaster> details = ebeanServer.findList(query, null);
     assertEquals(0, details.size());
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 99522c35b..7f8ed9918 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -15,12 +15,11 @@ ebean.encryptKeyManager=org.tests.basic.encrypt.BasicEncyptKeyManager
 #ebean.autotune.profiling=true
 #ebean.autotune.profilingUpdateFrequency=5
 
-#ebean.sqlserver.ddl.createOnly=true
 ebean.ddl.generate=true
 ebean.ddl.run=true
 ebean.ddl.header=-- Generated by ebean ${version} at ${timestamp}
 ebean.packages=org.tests
-datasource.default=h2
+datasource.default=sqlserver
 
 ebean.autoReadOnlyDataSource=true
 
@@ -134,7 +133,10 @@ datasource.pg.databaseDriver=org.postgresql.Driver
 #datasource.pg.capturestacktrace=true
 datasource.pg.maxStackTraceSize=50
 
-ebean.sqlserver.idType=SEQUENCE
+#ebean.sqlserver.idType=SEQUENCE
+# Our main testing target for SqlServer is sqlserver17
+ebean.sqlserver.databasePlatformName=sqlserver17
+
 datasource.sqlserver.username=test_ebean
 datasource.sqlserver.password=SqlS3rv#r
 datasource.sqlserver.databaseUrl=jdbc:sqlserver://localhost:1433;databaseName=test_ebean

From 5a3550e603ba7de7118188bb7a5321f06c5a7456 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Mar 2018 17:43:25 +1300
Subject: [PATCH 0163/1036] #1340 - Split SQL Server Platform into SqlServer16
 and SqlServer17 (where 2017 which uses UTF8 types nvarchar etc and prefers
 Sequences).

Unrelated - update dbmigration ddl for create index / add fk change in order (db2)
---
 .../dbmigration/migrationtest/db2/1.0__initial.sql     |  6 +++---
 .../resources/dbmigration/migrationtest/db2/1.1.sql    | 10 +++++-----
 .../resources/dbmigration/migrationtest/db2/1.3.sql    |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
index b21ec7c7f..2a123be20 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
@@ -127,12 +127,12 @@ create table migtest_oto_master (
 
 create index ix_mgtst__b_eu8csq on migtest_e_basic (indextest1);
 create index ix_mgtst__b_eu8csu on migtest_e_basic (indextest5);
-alter table migtest_fk_cascade add constraint fk_mgtst_fk_65kf6l foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
 create index ix_mgtst_fk_mok1xj on migtest_fk_cascade (one_id);
+alter table migtest_fk_cascade add constraint fk_mgtst_fk_65kf6l foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
 
-alter table migtest_fk_set_null add constraint fk_mgtst_fk_wicx8x foreign key (one_id) references migtest_fk_one (id) on delete set null;
 create index ix_mgtst_fk_c4p3mv on migtest_fk_set_null (one_id);
+alter table migtest_fk_set_null add constraint fk_mgtst_fk_wicx8x foreign key (one_id) references migtest_fk_one (id) on delete set null;
 
-alter table migtest_e_basic add constraint fk_mgtst__bsc_rf_d foreign key (eref_id) references migtest_e_ref (id) on delete restrict;
 create index ix_mgtst__bsc_rf_d on migtest_e_basic (eref_id);
+alter table migtest_e_basic add constraint fk_mgtst__bsc_rf_d foreign key (eref_id) references migtest_e_ref (id) on delete restrict;
 
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.1.sql b/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
index c3856edfa..776e7945f 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
@@ -81,20 +81,20 @@ create index ix_mgtst__b_eu8css on migtest_e_basic (indextest3);
 create index ix_mgtst__b_eu8csv on migtest_e_basic (indextest6);
 drop index ix_mgtst__b_eu8csq;
 drop index ix_mgtst__b_eu8csu;
-alter table migtest_mtm_c_migtest_mtm_m add constraint fk_mgtst_mt_93awga foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict;
 create index ix_mgtst_mt_3ug4ok on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_mgtst_mt_93awga foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict;
 
-alter table migtest_mtm_c_migtest_mtm_m add constraint fk_mgtst_mt_93awgk foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict;
 create index ix_mgtst_mt_3ug4ou on migtest_mtm_c_migtest_mtm_m (migtest_mtm_m_id);
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_mgtst_mt_93awgk foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict;
 
-alter table migtest_mtm_m_migtest_mtm_c add constraint fk_mgtst_mt_ggi34k foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict;
 create index ix_mgtst_mt_b7nbcu on migtest_mtm_m_migtest_mtm_c (migtest_mtm_m_id);
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_mgtst_mt_ggi34k foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict;
 
-alter table migtest_mtm_m_migtest_mtm_c add constraint fk_mgtst_mt_ggi34a foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict;
 create index ix_mgtst_mt_b7nbck on migtest_mtm_m_migtest_mtm_c (migtest_mtm_c_id);
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_mgtst_mt_ggi34a foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict;
 
-alter table migtest_ckey_parent add constraint fk_mgtst_ck_da00mr foreign key (assoc_id) references migtest_ckey_assoc (id) on delete restrict;
 create index ix_mgtst_ck_x45o21 on migtest_ckey_parent (assoc_id);
+alter table migtest_ckey_parent add constraint fk_mgtst_ck_da00mr foreign key (assoc_id) references migtest_ckey_assoc (id) on delete restrict;
 
 alter table migtest_oto_child add constraint fk_mgtst_t__csyl38 foreign key (master_id) references migtest_oto_master (id) on delete restrict;
 
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.3.sql b/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
index 17e6a31d1..a9e2d7622 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
@@ -44,6 +44,6 @@ create index ix_mgtst__b_eu8csq on migtest_e_basic (indextest1);
 create index ix_mgtst__b_eu8csu on migtest_e_basic (indextest5);
 drop index ix_mgtst__b_eu8css;
 drop index ix_mgtst__b_eu8csv;
-alter table migtest_e_basic add constraint fk_mgtst__bsc_rf_d foreign key (eref_id) references migtest_e_ref (id) on delete restrict;
 create index ix_mgtst__bsc_rf_d on migtest_e_basic (eref_id);
+alter table migtest_e_basic add constraint fk_mgtst__bsc_rf_d foreign key (eref_id) references migtest_e_ref (id) on delete restrict;
 

From d84cdab71408b1d486f55a1f428bedfd3c59e8c8 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Mar 2018 17:45:19 +1300
Subject: [PATCH 0164/1036] #1340 - Split SQL Server Platform into SqlServer16
 and SqlServer17 (where 2017 which uses UTF8 types nvarchar etc and prefers
 Sequences).

Only need to run H2 based test TestAutoCommitDataSource with H2
---
 .../java/org/tests/transaction/TestAutoCommitDataSource.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java b/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java
index 28ab7d2f0..19db621d5 100644
--- a/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java
+++ b/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java
@@ -5,6 +5,8 @@ import io.ebean.EbeanServer;
 import io.ebean.EbeanServerFactory;
 import io.ebean.Query;
 import io.ebean.Transaction;
+import io.ebean.annotation.ForPlatform;
+import io.ebean.annotation.Platform;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.properties.PropertiesLoader;
 import org.avaje.datasource.DataSourceConfig;
@@ -24,6 +26,7 @@ import static org.junit.Assert.assertTrue;
 
 public class TestAutoCommitDataSource extends BaseTestCase {
 
+  @ForPlatform({Platform.H2, Platform.POSTGRES})
   @Test
   public void test() throws SQLException {
 

From 824f5e468e21487f80d0a11f79982477a9651cb5 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Mar 2018 18:18:13 +1300
Subject: [PATCH 0165/1036] #1340 - (test only change) Split SQL Server
 Platform into SqlServer16 and SqlServer17 (where 2017 which uses UTF8 types
 nvarchar etc and prefers Sequences).

Reset Offline platform in DbMigrationSqlServerTest
---
 .../ebean/dbmigration/DbMigrationSqlServerTest.java   | 11 +++++++++--
 .../transaction/TestExplicitTransactionMode.java      |  6 +++---
 src/test/resources/ebean.properties                   |  8 +++++++-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/test/java/io/ebean/dbmigration/DbMigrationSqlServerTest.java b/src/test/java/io/ebean/dbmigration/DbMigrationSqlServerTest.java
index 84249a1d4..286e3525a 100644
--- a/src/test/java/io/ebean/dbmigration/DbMigrationSqlServerTest.java
+++ b/src/test/java/io/ebean/dbmigration/DbMigrationSqlServerTest.java
@@ -1,6 +1,7 @@
 package io.ebean.dbmigration;
 
 import io.ebean.annotation.Platform;
+import io.ebeaninternal.dbmigration.DbOffline;
 import org.junit.Test;
 
 public class DbMigrationSqlServerTest {
@@ -8,8 +9,12 @@ public class DbMigrationSqlServerTest {
   @Test(expected = IllegalArgumentException.class)
   public void need_explicitPlatform() {
 
-    DbMigration dbMigration = DbMigration.create();
-    dbMigration.setPlatform(Platform.SQLSERVER);
+    try {
+      DbMigration dbMigration = DbMigration.create();
+      dbMigration.setPlatform(Platform.SQLSERVER);
+    } finally {
+      DbOffline.reset();
+    }
   }
 
   @Test
@@ -17,6 +22,7 @@ public class DbMigrationSqlServerTest {
 
     DbMigration dbMigration = DbMigration.create();
     dbMigration.setPlatform(Platform.SQLSERVER16);
+    DbOffline.reset();
   }
 
   @Test
@@ -24,5 +30,6 @@ public class DbMigrationSqlServerTest {
 
     DbMigration dbMigration = DbMigration.create();
     dbMigration.setPlatform(Platform.SQLSERVER17);
+    DbOffline.reset();
   }
 }
diff --git a/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
index 2d0bb7abf..e7614619b 100644
--- a/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
+++ b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
@@ -33,10 +33,10 @@ public class TestExplicitTransactionMode extends BaseTestCase {
     Properties properties = PropertiesLoader.load();
 
     DataSourceConfig dsConfig = new DataSourceConfig();
-    dsConfig.loadSettings(properties, "h2autocommit");//"h2autocommit","pg"
+    dsConfig.loadSettings(properties, "h2autocommit2");
     dsConfig.setAutoCommit(true);
 
-    DataSourcePool pool = new ConnectionPool("h2autocommit", dsConfig);
+    DataSourcePool pool = new ConnectionPool("h2autocommit2", dsConfig);
 
     Connection connection = pool.getConnection();
     assertTrue(connection.getAutoCommit());
@@ -45,7 +45,7 @@ public class TestExplicitTransactionMode extends BaseTestCase {
     System.setProperty("ebean.ignoreExtraDdl", "true");
 
     ServerConfig config = new ServerConfig();
-    config.setName("h2autocommit");
+    config.setName("h2autocommit2");
     config.loadFromProperties();
     config.setDataSource(pool);
     config.setDefaultServer(false);
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 7f8ed9918..4b6fb04e4 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -19,7 +19,7 @@ ebean.ddl.generate=true
 ebean.ddl.run=true
 ebean.ddl.header=-- Generated by ebean ${version} at ${timestamp}
 ebean.packages=org.tests
-datasource.default=sqlserver
+datasource.default=h2
 
 ebean.autoReadOnlyDataSource=true
 
@@ -80,6 +80,12 @@ datasource.h2autocommit.password=
 datasource.h2autocommit.databaseUrl=jdbc:h2:mem:autocommittests
 datasource.h2autocommit.databaseDriver=org.h2.Driver
 
+datasource.h2autocommit2.autoCommit=true
+datasource.h2autocommit2.username=sa
+datasource.h2autocommit2.password=
+datasource.h2autocommit2.databaseUrl=jdbc:h2:mem:autocommit2tests
+datasource.h2autocommit2.databaseDriver=org.h2.Driver
+
 datasource.h2other.username=sa
 datasource.h2other.password=
 datasource.h2other.databaseUrl=jdbc:h2:mem:h2other

From ef58954af51ad608dbbd202e1564bc5703efc6da Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Mar 2018 18:31:12 +1300
Subject: [PATCH 0166/1036] Test only changes - related to #1336 - Change DDL
 generation such that it does create index before alter table add foreign key

---
 .../dbmigration/migrationtest/h2/1.0__initial.sql      |  6 +++---
 .../resources/dbmigration/migrationtest/h2/1.1.sql     | 10 +++++-----
 .../resources/dbmigration/migrationtest/h2/1.3.sql     |  2 +-
 .../dbmigration/migrationtest/hsqldb/1.0__initial.sql  |  6 +++---
 .../resources/dbmigration/migrationtest/hsqldb/1.1.sql | 10 +++++-----
 .../resources/dbmigration/migrationtest/hsqldb/1.3.sql |  2 +-
 .../dbmigration/migrationtest/mysql/1.0__initial.sql   |  6 +++---
 .../resources/dbmigration/migrationtest/mysql/1.1.sql  | 10 +++++-----
 .../resources/dbmigration/migrationtest/mysql/1.3.sql  |  2 +-
 .../dbmigration/migrationtest/oracle/1.0__initial.sql  |  6 +++---
 .../resources/dbmigration/migrationtest/oracle/1.1.sql | 10 +++++-----
 .../resources/dbmigration/migrationtest/oracle/1.3.sql |  2 +-
 .../migrationtest/postgres/1.0__initial.sql            |  6 +++---
 .../dbmigration/migrationtest/postgres/1.1.sql         | 10 +++++-----
 .../dbmigration/migrationtest/postgres/1.3.sql         |  2 +-
 15 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
index 4b6052a9a..9d4204f43 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
@@ -127,14 +127,14 @@ create table migtest_oto_master (
 
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
-alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
 create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
 
-alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
 create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
 
-alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
+alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
 alter table migtest_e_history2 add column sys_period_start datetime(6) default now(6);
 alter table migtest_e_history2 add column sys_period_end datetime(6);
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.1.sql b/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
index 126c0eb18..9f633b46c 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
@@ -81,20 +81,20 @@ create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 drop index if exists ix_migtest_e_basic_indextest1;
 drop index if exists ix_migtest_e_basic_indextest5;
-alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
 create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
 
-alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
 create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m on migtest_mtm_c_migtest_mtm_m (migtest_mtm_m_id);
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
 
-alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
 create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m on migtest_mtm_m_migtest_mtm_c (migtest_mtm_m_id);
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
 
-alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
 create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c on migtest_mtm_m_migtest_mtm_c (migtest_mtm_c_id);
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
 
-alter table migtest_ckey_parent add constraint fk_migtest_ckey_parent_assoc_id foreign key (assoc_id) references migtest_ckey_assoc (id) on delete restrict on update restrict;
 create index ix_migtest_ckey_parent_assoc_id on migtest_ckey_parent (assoc_id);
+alter table migtest_ckey_parent add constraint fk_migtest_ckey_parent_assoc_id foreign key (assoc_id) references migtest_ckey_assoc (id) on delete restrict on update restrict;
 
 alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict on update restrict;
 
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.3.sql b/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
index 233f0524b..4fc5732b4 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
@@ -44,6 +44,6 @@ create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 drop index if exists ix_migtest_e_basic_indextest3;
 drop index if exists ix_migtest_e_basic_indextest6;
-alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
+alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
index 390cf2fd3..6e8b39c42 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
@@ -127,12 +127,12 @@ create table migtest_oto_master (
 
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
-alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
 create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
 
-alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
 create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
 
-alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
+alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
index 02e5f135a..ec6506025 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
@@ -81,20 +81,20 @@ create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 drop index if exists ix_migtest_e_basic_indextest1;
 drop index if exists ix_migtest_e_basic_indextest5;
-alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
 create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
 
-alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
 create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m on migtest_mtm_c_migtest_mtm_m (migtest_mtm_m_id);
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
 
-alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
 create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m on migtest_mtm_m_migtest_mtm_c (migtest_mtm_m_id);
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
 
-alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
 create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c on migtest_mtm_m_migtest_mtm_c (migtest_mtm_c_id);
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
 
-alter table migtest_ckey_parent add constraint fk_migtest_ckey_parent_assoc_id foreign key (assoc_id) references migtest_ckey_assoc (id) on delete restrict on update restrict;
 create index ix_migtest_ckey_parent_assoc_id on migtest_ckey_parent (assoc_id);
+alter table migtest_ckey_parent add constraint fk_migtest_ckey_parent_assoc_id foreign key (assoc_id) references migtest_ckey_assoc (id) on delete restrict on update restrict;
 
 alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict on update restrict;
 
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
index 6d0ef4b55..bff47b901 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
@@ -44,6 +44,6 @@ create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 drop index if exists ix_migtest_e_basic_indextest3;
 drop index if exists ix_migtest_e_basic_indextest6;
-alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
+alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
index 0d8e39910..8e1c0557f 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
@@ -127,14 +127,14 @@ create table migtest_oto_master (
 
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
-alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
 create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
 
-alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
 create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
 
-alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
+alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
 alter table migtest_e_history2 add column sys_period_start datetime(6) default now(6);
 alter table migtest_e_history2 add column sys_period_end datetime(6);
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
index 9b9c7a41d..b7de26f72 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
@@ -79,20 +79,20 @@ create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 drop index ix_migtest_e_basic_indextest1 on migtest_e_basic;
 drop index ix_migtest_e_basic_indextest5 on migtest_e_basic;
-alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
 create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
 
-alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
 create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m on migtest_mtm_c_migtest_mtm_m (migtest_mtm_m_id);
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
 
-alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
 create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m on migtest_mtm_m_migtest_mtm_c (migtest_mtm_m_id);
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
 
-alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
 create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c on migtest_mtm_m_migtest_mtm_c (migtest_mtm_c_id);
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
 
-alter table migtest_ckey_parent add constraint fk_migtest_ckey_parent_assoc_id foreign key (assoc_id) references migtest_ckey_assoc (id) on delete restrict on update restrict;
 create index ix_migtest_ckey_parent_assoc_id on migtest_ckey_parent (assoc_id);
+alter table migtest_ckey_parent add constraint fk_migtest_ckey_parent_assoc_id foreign key (assoc_id) references migtest_ckey_assoc (id) on delete restrict on update restrict;
 
 alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict on update restrict;
 
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
index 804d8022f..4fb4d19f5 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
@@ -39,6 +39,6 @@ create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 drop index ix_migtest_e_basic_indextest3 on migtest_e_basic;
 drop index ix_migtest_e_basic_indextest6 on migtest_e_basic;
-alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
+alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
index c0ddc9b36..fb1f1e66e 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
@@ -144,12 +144,12 @@ create sequence migtest_oto_master_seq;
 
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
-alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
 create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
 
-alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null;
 create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null;
 
-alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id);
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
+alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id);
 
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
index 3d91c4a8c..8aea49e91 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
@@ -80,20 +80,20 @@ create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 drop index ix_migtest_e_basic_indextest1;
 drop index ix_migtest_e_basic_indextest5;
-alter table migtest_mtm_c_migtest_mtm_m add constraint fk_mgtst_mtm_c_mgtst_mt_93awga foreign key (migtest_mtm_c_id) references migtest_mtm_c (id);
 create index ix_mgtst_mtm_c_mgtst_mt_3ug4ok on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_mgtst_mtm_c_mgtst_mt_93awga foreign key (migtest_mtm_c_id) references migtest_mtm_c (id);
 
-alter table migtest_mtm_c_migtest_mtm_m add constraint fk_mgtst_mtm_c_mgtst_mt_93awgk foreign key (migtest_mtm_m_id) references migtest_mtm_m (id);
 create index ix_mgtst_mtm_c_mgtst_mt_3ug4ou on migtest_mtm_c_migtest_mtm_m (migtest_mtm_m_id);
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_mgtst_mtm_c_mgtst_mt_93awgk foreign key (migtest_mtm_m_id) references migtest_mtm_m (id);
 
-alter table migtest_mtm_m_migtest_mtm_c add constraint fk_mgtst_mtm_m_mgtst_mt_ggi34k foreign key (migtest_mtm_m_id) references migtest_mtm_m (id);
 create index ix_mgtst_mtm_m_mgtst_mt_b7nbcu on migtest_mtm_m_migtest_mtm_c (migtest_mtm_m_id);
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_mgtst_mtm_m_mgtst_mt_ggi34k foreign key (migtest_mtm_m_id) references migtest_mtm_m (id);
 
-alter table migtest_mtm_m_migtest_mtm_c add constraint fk_mgtst_mtm_m_mgtst_mt_ggi34a foreign key (migtest_mtm_c_id) references migtest_mtm_c (id);
 create index ix_mgtst_mtm_m_mgtst_mt_b7nbck on migtest_mtm_m_migtest_mtm_c (migtest_mtm_c_id);
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_mgtst_mtm_m_mgtst_mt_ggi34a foreign key (migtest_mtm_c_id) references migtest_mtm_c (id);
 
-alter table migtest_ckey_parent add constraint fk_mgtst_cky_prnt_ssc_d foreign key (assoc_id) references migtest_ckey_assoc (id);
 create index ix_mgtst_cky_prnt_ssc_d on migtest_ckey_parent (assoc_id);
+alter table migtest_ckey_parent add constraint fk_mgtst_cky_prnt_ssc_d foreign key (assoc_id) references migtest_ckey_assoc (id);
 
 alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id);
 
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
index 128d3badf..57fbfe9b7 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
@@ -45,6 +45,6 @@ create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 drop index ix_migtest_e_basic_indextest3;
 drop index ix_migtest_e_basic_indextest6;
-alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id);
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
+alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id);
 
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
index 83a1b08b5..b15609fdd 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
@@ -127,14 +127,14 @@ create table migtest_oto_master (
 
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
-alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
 create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
 
-alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
 create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
 
-alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
+alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
 alter table migtest_e_history2 add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
 create table migtest_e_history2_history(like migtest_e_history2);
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
index 86009299b..3b4d3e3b2 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
@@ -86,20 +86,20 @@ create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 drop index if exists ix_migtest_e_basic_indextest1;
 drop index if exists ix_migtest_e_basic_indextest5;
-alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
 create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
 
-alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
 create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m on migtest_mtm_c_migtest_mtm_m (migtest_mtm_m_id);
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
 
-alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
 create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m on migtest_mtm_m_migtest_mtm_c (migtest_mtm_m_id);
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
 
-alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
 create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c on migtest_mtm_m_migtest_mtm_c (migtest_mtm_c_id);
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
 
-alter table migtest_ckey_parent add constraint fk_migtest_ckey_parent_assoc_id foreign key (assoc_id) references migtest_ckey_assoc (id) on delete restrict on update restrict;
 create index ix_migtest_ckey_parent_assoc_id on migtest_ckey_parent (assoc_id);
+alter table migtest_ckey_parent add constraint fk_migtest_ckey_parent_assoc_id foreign key (assoc_id) references migtest_ckey_assoc (id) on delete restrict on update restrict;
 
 alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict on update restrict;
 
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
index 345be4828..3353df6fa 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
@@ -44,6 +44,6 @@ create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 drop index if exists ix_migtest_e_basic_indextest3;
 drop index if exists ix_migtest_e_basic_indextest6;
-alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
+alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 

From 0cc87009d0f2da83e2e3779a277699be80da724f Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Mar 2018 18:37:36 +1300
Subject: [PATCH 0167/1036] #1340 - (test only change) Split SQL Server
 Platform into SqlServer16 and SqlServer17 (where 2017 which uses UTF8 types
 nvarchar etc and prefers Sequences).

Update DbMigrationGenerateTest ... for SqlServer17 platform
---
 .../dbmigration/DbMigrationGenerateTest.java  |   9 +-
 .../migrationtest/sqlserver/1.0__initial.sql  | 160 ----------------
 .../migrationtest/sqlserver/1.1.sql           | 104 ----------
 .../sqlserver/1.2__dropsFor_1.1.sql           |  43 -----
 .../migrationtest/sqlserver/1.3.sql           |  62 ------
 .../sqlserver/1.4__dropsFor_1.3.sql           | 179 ------------------
 .../R__order_views_mssql.sql                  |   0
 7 files changed, 1 insertion(+), 556 deletions(-)
 delete mode 100644 src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql
 delete mode 100644 src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql
 delete mode 100644 src/test/resources/dbmigration/migrationtest/sqlserver/1.2__dropsFor_1.1.sql
 delete mode 100644 src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql
 delete mode 100644 src/test/resources/dbmigration/migrationtest/sqlserver/1.4__dropsFor_1.3.sql
 rename src/test/resources/dbmigration/migrationtest/{sqlserver => sqlserver17}/R__order_views_mssql.sql (100%)

diff --git a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
index 4966011b6..602cbb7c3 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
@@ -4,9 +4,6 @@ import io.ebean.EbeanServer;
 import io.ebean.EbeanServerFactory;
 import io.ebean.annotation.Platform;
 import io.ebean.config.ServerConfig;
-import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebean.config.dbplatform.IdType;
-import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -54,11 +51,7 @@ public class DbMigrationGenerateTest {
     migration.addPlatform(Platform.POSTGRES, "postgres");
     migration.addPlatform(Platform.ORACLE, "oracle");
     migration.addPlatform(Platform.SQLITE, "sqlite");
-
-    // we need sequence here, so that migration will work properly
-    DatabasePlatform sqlServer = new SqlServer17Platform();
-    sqlServer.getDbIdentity().setIdType(IdType.SEQUENCE);
-    migration.addDatabasePlatform(sqlServer, "sqlserver");
+    migration.addPlatform(Platform.SQLSERVER17, "sqlserver17");
 
     ServerConfig config = new ServerConfig();
     config.setName("migrationtest");
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql
deleted file mode 100644
index ea820be14..000000000
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql
+++ /dev/null
@@ -1,160 +0,0 @@
--- Migrationscripts for ebean unittest
--- apply changes
-create table migtest_ckey_assoc (
-  id                            integer not null,
-  assoc_one                     nvarchar(255),
-  constraint pk_migtest_ckey_assoc primary key (id)
-);
-create sequence migtest_ckey_assoc_seq as bigint  start with 1 ;
-
-create table migtest_ckey_detail (
-  id                            integer not null,
-  something                     nvarchar(255),
-  constraint pk_migtest_ckey_detail primary key (id)
-);
-create sequence migtest_ckey_detail_seq as bigint  start with 1 ;
-
-create table migtest_ckey_parent (
-  one_key                       integer not null,
-  two_key                       nvarchar(127) not null,
-  name                          nvarchar(255),
-  version                       integer not null,
-  constraint pk_migtest_ckey_parent primary key (one_key,two_key)
-);
-
-create table migtest_fk_cascade (
-  id                            numeric(19) not null,
-  one_id                        numeric(19),
-  constraint pk_migtest_fk_cascade primary key (id)
-);
-create sequence migtest_fk_cascade_seq as bigint  start with 1 ;
-
-create table migtest_fk_cascade_one (
-  id                            numeric(19) not null,
-  constraint pk_migtest_fk_cascade_one primary key (id)
-);
-create sequence migtest_fk_cascade_one_seq as bigint  start with 1 ;
-
-create table migtest_fk_none (
-  id                            numeric(19) not null,
-  one_id                        numeric(19),
-  constraint pk_migtest_fk_none primary key (id)
-);
-create sequence migtest_fk_none_seq as bigint  start with 1 ;
-
-create table migtest_fk_none_via_join (
-  id                            numeric(19) not null,
-  one_id                        numeric(19),
-  constraint pk_migtest_fk_none_via_join primary key (id)
-);
-create sequence migtest_fk_none_via_join_seq as bigint  start with 1 ;
-
-create table migtest_fk_one (
-  id                            numeric(19) not null,
-  constraint pk_migtest_fk_one primary key (id)
-);
-create sequence migtest_fk_one_seq as bigint  start with 1 ;
-
-create table migtest_fk_set_null (
-  id                            numeric(19) not null,
-  one_id                        numeric(19),
-  constraint pk_migtest_fk_set_null primary key (id)
-);
-create sequence migtest_fk_set_null_seq as bigint  start with 1 ;
-
-create table migtest_e_basic (
-  id                            integer not null,
-  status                        nvarchar(1),
-  name                          nvarchar(127),
-  description                   nvarchar(127),
-  some_date                     datetime2,
-  old_boolean                   bit default 0 not null,
-  old_boolean2                  bit,
-  eref_id                       integer,
-  indextest1                    nvarchar(127),
-  indextest2                    nvarchar(127),
-  indextest3                    nvarchar(127),
-  indextest4                    nvarchar(127),
-  indextest5                    nvarchar(127),
-  indextest6                    nvarchar(127),
-  user_id                       integer not null,
-  constraint ck_migtest_e_basic_status check ( status in ('N','A','I')),
-  constraint pk_migtest_e_basic primary key (id)
-);
-create unique nonclustered index uq_migtest_e_basic_indextest2 on migtest_e_basic(indextest2) where indextest2 is not null;
-create unique nonclustered index uq_migtest_e_basic_indextest6 on migtest_e_basic(indextest6) where indextest6 is not null;
-create sequence migtest_e_basic_seq as bigint  start with 1 ;
-
-create table migtest_e_history (
-  id                            integer not null,
-  test_string                   nvarchar(255),
-  constraint pk_migtest_e_history primary key (id)
-);
-create sequence migtest_e_history_seq as bigint  start with 1 ;
-
-create table migtest_e_history2 (
-  id                            integer not null,
-  test_string                   nvarchar(255),
-  constraint pk_migtest_e_history2 primary key (id)
-);
-create sequence migtest_e_history2_seq as bigint  start with 1 ;
-
-create table migtest_e_ref (
-  id                            integer not null,
-  name                          nvarchar(127) not null,
-  constraint pk_migtest_e_ref primary key (id)
-);
-alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique  (name);
-create sequence migtest_e_ref_seq as bigint  start with 1 ;
-
-create table migtest_e_softdelete (
-  id                            integer not null,
-  test_string                   nvarchar(255),
-  constraint pk_migtest_e_softdelete primary key (id)
-);
-create sequence migtest_e_softdelete_seq as bigint  start with 1 ;
-
-create table migtest_mtm_c (
-  id                            integer not null,
-  name                          nvarchar(255),
-  constraint pk_migtest_mtm_c primary key (id)
-);
-create sequence migtest_mtm_c_seq as bigint  start with 1 ;
-
-create table migtest_mtm_m (
-  id                            numeric(19) not null,
-  name                          nvarchar(255),
-  constraint pk_migtest_mtm_m primary key (id)
-);
-create sequence migtest_mtm_m_seq as bigint  start with 1 ;
-
-create table migtest_oto_child (
-  id                            integer not null,
-  name                          nvarchar(255),
-  constraint pk_migtest_oto_child primary key (id)
-);
-create sequence migtest_oto_child_seq as bigint  start with 1 ;
-
-create table migtest_oto_master (
-  id                            numeric(19) not null,
-  name                          nvarchar(255),
-  constraint pk_migtest_oto_master primary key (id)
-);
-create sequence migtest_oto_master_seq as bigint  start with 1 ;
-
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
-create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
-alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
-
-create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
-alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
-
-create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
-alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id);
-
-alter table migtest_e_history2
-    add sys_periodFrom datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(),
-        sys_periodTo   datetime2 GENERATED ALWAYS AS ROW END   NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',
-period for system_time (sys_periodFrom, sys_periodTo);
-alter table migtest_e_history2 set (system_versioning = on (history_table=dbo.migtest_e_history2_history));
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql
deleted file mode 100644
index 90c1f96bf..000000000
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql
+++ /dev/null
@@ -1,104 +0,0 @@
--- Migrationscripts for ebean unittest
--- apply changes
-create table migtest_e_user (
-  id                            integer not null,
-  constraint pk_migtest_e_user primary key (id)
-);
-create sequence migtest_e_user_seq as bigint  start with 1 ;
-
-create table migtest_mtm_c_migtest_mtm_m (
-  migtest_mtm_c_id              integer not null,
-  migtest_mtm_m_id              numeric(19) not null,
-  constraint pk_migtest_mtm_c_migtest_mtm_m primary key (migtest_mtm_c_id,migtest_mtm_m_id)
-);
-
-create table migtest_mtm_m_migtest_mtm_c (
-  migtest_mtm_m_id              numeric(19) not null,
-  migtest_mtm_c_id              integer not null,
-  constraint pk_migtest_mtm_m_migtest_mtm_c primary key (migtest_mtm_m_id,migtest_mtm_c_id)
-);
-
-alter table migtest_ckey_detail add one_key integer;
-alter table migtest_ckey_detail add two_key nvarchar(127);
-
-alter table migtest_ckey_detail add constraint fk_migtest_ckey_detail_parent foreign key (one_key,two_key) references migtest_ckey_parent (one_key,two_key);
-alter table migtest_ckey_parent add assoc_id integer;
-
-IF OBJECT_ID('fk_migtest_fk_cascade_one_id', 'F') IS NOT NULL alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
-alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id);
-alter table migtest_fk_none add constraint fk_migtest_fk_none_one_id foreign key (one_id) references migtest_fk_one (id);
-alter table migtest_fk_none_via_join add constraint fk_migtest_fk_none_via_join_one_id foreign key (one_id) references migtest_fk_one (id);
-IF OBJECT_ID('fk_migtest_fk_set_null_one_id', 'F') IS NOT NULL alter table migtest_fk_set_null drop constraint fk_migtest_fk_set_null_one_id;
-alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id);
-
-update migtest_e_basic set status = 'A' where status is null;
-IF (OBJECT_ID('ck_migtest_e_basic_status', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
-alter table migtest_e_basic add default 'A' for status;
-alter table migtest_e_basic alter column status nvarchar(1) not null;
-alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
-
--- rename all collisions;
-create unique nonclustered index uq_migtest_e_basic_description on migtest_e_basic(description) where description is not null;
-
-update migtest_e_basic set some_date = '2000-01-01T00:00:00' where some_date is null;
-alter table migtest_e_basic add default '2000-01-01T00:00:00' for some_date;
-alter table migtest_e_basic alter column some_date datetime2 not null;
-
-insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
-alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id);
-alter table migtest_e_basic alter column user_id integer;
-alter table migtest_e_basic add new_string_field nvarchar(255) default 'foo''bar' not null;
-alter table migtest_e_basic add new_boolean_field bit default 1 not null;
-update migtest_e_basic set new_boolean_field = old_boolean;
-
-alter table migtest_e_basic add new_boolean_field2 bit default 1 not null;
-alter table migtest_e_basic add progress integer default 0 not null;
-alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2));
-alter table migtest_e_basic add new_integer integer default 42 not null;
-
-IF (OBJECT_ID('uq_migtest_e_basic_indextest2', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_indextest2') drop index uq_migtest_e_basic_indextest2 ON migtest_e_basic;
-IF (OBJECT_ID('uq_migtest_e_basic_indextest6', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_indextest6') drop index uq_migtest_e_basic_indextest6 ON migtest_e_basic;
-create unique nonclustered index uq_migtest_e_basic_status_indextest1 on migtest_e_basic(status,indextest1) where indextest1 is not null;
-create unique nonclustered index uq_migtest_e_basic_name on migtest_e_basic(name) where name is not null;
-create unique nonclustered index uq_migtest_e_basic_indextest4 on migtest_e_basic(indextest4) where indextest4 is not null;
-create unique nonclustered index uq_migtest_e_basic_indextest5 on migtest_e_basic(indextest5) where indextest5 is not null;
-alter table migtest_e_history alter column test_string numeric(19);
-
-update migtest_e_history2 set test_string = 'unknown' where test_string is null;
-alter table migtest_e_history2 add default 'unknown' for test_string;
-alter table migtest_e_history2 alter column test_string nvarchar(255) not null;
-alter table migtest_e_history2 add test_string2 nvarchar(255);
-alter table migtest_e_history2 add test_string3 nvarchar(255) default 'unknown' not null;
-
-alter table migtest_e_softdelete add deleted bit default 0 not null;
-
-alter table migtest_oto_child add master_id numeric(19);
-
-create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
-create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest1') drop index ix_migtest_e_basic_indextest1 ON migtest_e_basic;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest5') drop index ix_migtest_e_basic_indextest5 ON migtest_e_basic;
-create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
-alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id);
-
-create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m on migtest_mtm_c_migtest_mtm_m (migtest_mtm_m_id);
-alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id);
-
-create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m on migtest_mtm_m_migtest_mtm_c (migtest_mtm_m_id);
-alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id);
-
-create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c on migtest_mtm_m_migtest_mtm_c (migtest_mtm_c_id);
-alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id);
-
-create index ix_migtest_ckey_parent_assoc_id on migtest_ckey_parent (assoc_id);
-alter table migtest_ckey_parent add constraint fk_migtest_ckey_parent_assoc_id foreign key (assoc_id) references migtest_ckey_assoc (id);
-
-alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id);
-
-alter table migtest_e_history
-    add sys_periodFrom datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(),
-        sys_periodTo   datetime2 GENERATED ALWAYS AS ROW END   NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',
-period for system_time (sys_periodFrom, sys_periodTo);
-alter table migtest_e_history set (system_versioning = on (history_table=dbo.migtest_e_history_history));
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.2__dropsFor_1.1.sql
deleted file mode 100644
index d3a7a9a24..000000000
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.2__dropsFor_1.1.sql
+++ /dev/null
@@ -1,43 +0,0 @@
--- Migrationscripts for ebean unittest
--- apply changes
--- drop column migtest_e_basic.old_boolean;
-IF (OBJECT_ID('uq_migtest_e_basic_old_boolean', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_old_boolean;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_old_boolean') drop index uq_migtest_e_basic_old_boolean ON migtest_e_basic;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'old_boolean';
-if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_e_basic_old_boolean', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_old_boolean;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_old_boolean') drop index ix_migtest_e_basic_old_boolean ON migtest_e_basic;
-IF OBJECT_ID('fk_migtest_e_basic_old_boolean', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_old_boolean;
-alter table migtest_e_basic drop column old_boolean;
-
--- drop column migtest_e_basic.old_boolean2;
-IF (OBJECT_ID('uq_migtest_e_basic_old_boolean2', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_old_boolean2;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_old_boolean2') drop index uq_migtest_e_basic_old_boolean2 ON migtest_e_basic;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'old_boolean2';
-if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_e_basic_old_boolean2', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_old_boolean2;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_old_boolean2') drop index ix_migtest_e_basic_old_boolean2 ON migtest_e_basic;
-IF OBJECT_ID('fk_migtest_e_basic_old_boolean2', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_old_boolean2;
-alter table migtest_e_basic drop column old_boolean2;
-
--- drop column migtest_e_basic.eref_id;
-IF (OBJECT_ID('uq_migtest_e_basic_eref_id', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_eref_id;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_eref_id') drop index uq_migtest_e_basic_eref_id ON migtest_e_basic;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'eref_id';
-if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_e_basic_eref_id', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_eref_id;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_eref_id') drop index ix_migtest_e_basic_eref_id ON migtest_e_basic;
-IF OBJECT_ID('fk_migtest_e_basic_eref_id', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_eref_id;
-alter table migtest_e_basic drop column eref_id;
-
-IF OBJECT_ID('migtest_e_ref', 'U') IS NOT NULL drop table migtest_e_ref;
-IF OBJECT_ID('migtest_e_ref_seq', 'SO') IS NOT NULL drop sequence migtest_e_ref_seq;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql
deleted file mode 100644
index 50c300716..000000000
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql
+++ /dev/null
@@ -1,62 +0,0 @@
--- Migrationscripts for ebean unittest
--- apply changes
-create table migtest_e_ref (
-  id                            integer not null,
-  name                          nvarchar(127) not null,
-  constraint pk_migtest_e_ref primary key (id)
-);
-alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique  (name);
-create sequence migtest_e_ref_seq as bigint  start with 1 ;
-
-IF OBJECT_ID('fk_migtest_ckey_detail_parent', 'F') IS NOT NULL alter table migtest_ckey_detail drop constraint fk_migtest_ckey_detail_parent;
-IF OBJECT_ID('fk_migtest_fk_cascade_one_id', 'F') IS NOT NULL alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;
-alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
-IF OBJECT_ID('fk_migtest_fk_none_one_id', 'F') IS NOT NULL alter table migtest_fk_none drop constraint fk_migtest_fk_none_one_id;
-IF OBJECT_ID('fk_migtest_fk_none_via_join_one_id', 'F') IS NOT NULL alter table migtest_fk_none_via_join drop constraint fk_migtest_fk_none_via_join_one_id;
-IF OBJECT_ID('fk_migtest_fk_set_null_one_id', 'F') IS NOT NULL alter table migtest_fk_set_null drop constraint fk_migtest_fk_set_null_one_id;
-alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
-IF (OBJECT_ID('ck_migtest_e_basic_status', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'status';
-if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
-alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I'));
-IF (OBJECT_ID('uq_migtest_e_basic_description', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_description;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_description') drop index uq_migtest_e_basic_description ON migtest_e_basic;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'some_date';
-if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
-
-update migtest_e_basic set user_id = 23 where user_id is null;
-IF OBJECT_ID('fk_migtest_e_basic_user_id', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_user_id;
-alter table migtest_e_basic add default 23 for user_id;
-alter table migtest_e_basic alter column user_id integer not null;
-alter table migtest_e_basic add old_boolean bit default 0 not null;
-alter table migtest_e_basic add old_boolean2 bit;
-alter table migtest_e_basic add eref_id integer;
-
-IF (OBJECT_ID('uq_migtest_e_basic_status_indextest1', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_status_indextest1;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_status_indextest1') drop index uq_migtest_e_basic_status_indextest1 ON migtest_e_basic;
-IF (OBJECT_ID('uq_migtest_e_basic_name', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_name') drop index uq_migtest_e_basic_name ON migtest_e_basic;
-IF (OBJECT_ID('uq_migtest_e_basic_indextest4', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_indextest4') drop index uq_migtest_e_basic_indextest4 ON migtest_e_basic;
-IF (OBJECT_ID('uq_migtest_e_basic_indextest5', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_indextest5') drop index uq_migtest_e_basic_indextest5 ON migtest_e_basic;
-create unique nonclustered index uq_migtest_e_basic_indextest2 on migtest_e_basic(indextest2) where indextest2 is not null;
-create unique nonclustered index uq_migtest_e_basic_indextest6 on migtest_e_basic(indextest6) where indextest6 is not null;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_history2') and t2.name = 'test_string';
-if @Tmp is not null EXEC('alter table migtest_e_history2 drop constraint ' + @Tmp)$$;
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest3') drop index ix_migtest_e_basic_indextest3 ON migtest_e_basic;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest6') drop index ix_migtest_e_basic_indextest6 ON migtest_e_basic;
-create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
-alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id);
-
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.4__dropsFor_1.3.sql
deleted file mode 100644
index 50be4368d..000000000
--- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.4__dropsFor_1.3.sql
+++ /dev/null
@@ -1,179 +0,0 @@
--- Migrationscripts for ebean unittest
--- apply changes
--- drop column migtest_ckey_detail.one_key;
-IF (OBJECT_ID('uq_migtest_ckey_detail_one_key', 'UQ') IS NOT NULL) alter table migtest_ckey_detail drop constraint uq_migtest_ckey_detail_one_key;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_ckey_detail','U') AND name = 'uq_migtest_ckey_detail_one_key') drop index uq_migtest_ckey_detail_one_key ON migtest_ckey_detail;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_ckey_detail') and t2.name = 'one_key';
-if @Tmp is not null EXEC('alter table migtest_ckey_detail drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_ckey_detail_one_key', 'C') IS NOT NULL) alter table migtest_ckey_detail drop constraint ck_migtest_ckey_detail_one_key;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_ckey_detail','U') AND name = 'ix_migtest_ckey_detail_one_key') drop index ix_migtest_ckey_detail_one_key ON migtest_ckey_detail;
-IF OBJECT_ID('fk_migtest_ckey_detail_one_key', 'F') IS NOT NULL alter table migtest_ckey_detail drop constraint fk_migtest_ckey_detail_one_key;
-alter table migtest_ckey_detail drop column one_key;
-
--- drop column migtest_ckey_detail.two_key;
-IF (OBJECT_ID('uq_migtest_ckey_detail_two_key', 'UQ') IS NOT NULL) alter table migtest_ckey_detail drop constraint uq_migtest_ckey_detail_two_key;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_ckey_detail','U') AND name = 'uq_migtest_ckey_detail_two_key') drop index uq_migtest_ckey_detail_two_key ON migtest_ckey_detail;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_ckey_detail') and t2.name = 'two_key';
-if @Tmp is not null EXEC('alter table migtest_ckey_detail drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_ckey_detail_two_key', 'C') IS NOT NULL) alter table migtest_ckey_detail drop constraint ck_migtest_ckey_detail_two_key;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_ckey_detail','U') AND name = 'ix_migtest_ckey_detail_two_key') drop index ix_migtest_ckey_detail_two_key ON migtest_ckey_detail;
-IF OBJECT_ID('fk_migtest_ckey_detail_two_key', 'F') IS NOT NULL alter table migtest_ckey_detail drop constraint fk_migtest_ckey_detail_two_key;
-alter table migtest_ckey_detail drop column two_key;
-
--- drop column migtest_ckey_parent.assoc_id;
-IF (OBJECT_ID('uq_migtest_ckey_parent_assoc_id', 'UQ') IS NOT NULL) alter table migtest_ckey_parent drop constraint uq_migtest_ckey_parent_assoc_id;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_ckey_parent','U') AND name = 'uq_migtest_ckey_parent_assoc_id') drop index uq_migtest_ckey_parent_assoc_id ON migtest_ckey_parent;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_ckey_parent') and t2.name = 'assoc_id';
-if @Tmp is not null EXEC('alter table migtest_ckey_parent drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_ckey_parent_assoc_id', 'C') IS NOT NULL) alter table migtest_ckey_parent drop constraint ck_migtest_ckey_parent_assoc_id;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_ckey_parent','U') AND name = 'ix_migtest_ckey_parent_assoc_id') drop index ix_migtest_ckey_parent_assoc_id ON migtest_ckey_parent;
-IF OBJECT_ID('fk_migtest_ckey_parent_assoc_id', 'F') IS NOT NULL alter table migtest_ckey_parent drop constraint fk_migtest_ckey_parent_assoc_id;
-alter table migtest_ckey_parent drop column assoc_id;
-
--- drop column migtest_e_basic.new_string_field;
-IF (OBJECT_ID('uq_migtest_e_basic_new_string_field', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_new_string_field;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_new_string_field') drop index uq_migtest_e_basic_new_string_field ON migtest_e_basic;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'new_string_field';
-if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_e_basic_new_string_field', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_new_string_field;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_new_string_field') drop index ix_migtest_e_basic_new_string_field ON migtest_e_basic;
-IF OBJECT_ID('fk_migtest_e_basic_new_string_field', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_new_string_field;
-alter table migtest_e_basic drop column new_string_field;
-
--- drop column migtest_e_basic.new_boolean_field;
-IF (OBJECT_ID('uq_migtest_e_basic_new_boolean_field', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_new_boolean_field;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_new_boolean_field') drop index uq_migtest_e_basic_new_boolean_field ON migtest_e_basic;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'new_boolean_field';
-if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_e_basic_new_boolean_field', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_new_boolean_field;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_new_boolean_field') drop index ix_migtest_e_basic_new_boolean_field ON migtest_e_basic;
-IF OBJECT_ID('fk_migtest_e_basic_new_boolean_field', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_new_boolean_field;
-alter table migtest_e_basic drop column new_boolean_field;
-
--- drop column migtest_e_basic.new_boolean_field2;
-IF (OBJECT_ID('uq_migtest_e_basic_new_boolean_field2', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_new_boolean_field2;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_new_boolean_field2') drop index uq_migtest_e_basic_new_boolean_field2 ON migtest_e_basic;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'new_boolean_field2';
-if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_e_basic_new_boolean_field2', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_new_boolean_field2;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_new_boolean_field2') drop index ix_migtest_e_basic_new_boolean_field2 ON migtest_e_basic;
-IF OBJECT_ID('fk_migtest_e_basic_new_boolean_field2', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_new_boolean_field2;
-alter table migtest_e_basic drop column new_boolean_field2;
-
--- drop column migtest_e_basic.progress;
-IF (OBJECT_ID('uq_migtest_e_basic_progress', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_progress;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_progress') drop index uq_migtest_e_basic_progress ON migtest_e_basic;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'progress';
-if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_e_basic_progress', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_progress;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_progress') drop index ix_migtest_e_basic_progress ON migtest_e_basic;
-IF OBJECT_ID('fk_migtest_e_basic_progress', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_progress;
-alter table migtest_e_basic drop column progress;
-
--- drop column migtest_e_basic.new_integer;
-IF (OBJECT_ID('uq_migtest_e_basic_new_integer', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_new_integer;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_new_integer') drop index uq_migtest_e_basic_new_integer ON migtest_e_basic;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'new_integer';
-if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_e_basic_new_integer', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_new_integer;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_new_integer') drop index ix_migtest_e_basic_new_integer ON migtest_e_basic;
-IF OBJECT_ID('fk_migtest_e_basic_new_integer', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_new_integer;
-alter table migtest_e_basic drop column new_integer;
-
--- drop column migtest_e_history2.test_string2;
-IF (OBJECT_ID('uq_migtest_e_history2_test_string2', 'UQ') IS NOT NULL) alter table migtest_e_history2 drop constraint uq_migtest_e_history2_test_string2;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history2','U') AND name = 'uq_migtest_e_history2_test_string2') drop index uq_migtest_e_history2_test_string2 ON migtest_e_history2;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_history2') and t2.name = 'test_string2';
-if @Tmp is not null EXEC('alter table migtest_e_history2 drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_e_history2_test_string2', 'C') IS NOT NULL) alter table migtest_e_history2 drop constraint ck_migtest_e_history2_test_string2;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history2','U') AND name = 'ix_migtest_e_history2_test_string2') drop index ix_migtest_e_history2_test_string2 ON migtest_e_history2;
-IF OBJECT_ID('fk_migtest_e_history2_test_string2', 'F') IS NOT NULL alter table migtest_e_history2 drop constraint fk_migtest_e_history2_test_string2;
-alter table migtest_e_history2 drop column test_string2;
-
--- drop column migtest_e_history2.test_string3;
-IF (OBJECT_ID('uq_migtest_e_history2_test_string3', 'UQ') IS NOT NULL) alter table migtest_e_history2 drop constraint uq_migtest_e_history2_test_string3;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history2','U') AND name = 'uq_migtest_e_history2_test_string3') drop index uq_migtest_e_history2_test_string3 ON migtest_e_history2;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_history2') and t2.name = 'test_string3';
-if @Tmp is not null EXEC('alter table migtest_e_history2 drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_e_history2_test_string3', 'C') IS NOT NULL) alter table migtest_e_history2 drop constraint ck_migtest_e_history2_test_string3;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history2','U') AND name = 'ix_migtest_e_history2_test_string3') drop index ix_migtest_e_history2_test_string3 ON migtest_e_history2;
-IF OBJECT_ID('fk_migtest_e_history2_test_string3', 'F') IS NOT NULL alter table migtest_e_history2 drop constraint fk_migtest_e_history2_test_string3;
-alter table migtest_e_history2 drop column test_string3;
-
--- drop column migtest_e_softdelete.deleted;
-IF (OBJECT_ID('uq_migtest_e_softdelete_deleted', 'UQ') IS NOT NULL) alter table migtest_e_softdelete drop constraint uq_migtest_e_softdelete_deleted;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_softdelete','U') AND name = 'uq_migtest_e_softdelete_deleted') drop index uq_migtest_e_softdelete_deleted ON migtest_e_softdelete;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_softdelete') and t2.name = 'deleted';
-if @Tmp is not null EXEC('alter table migtest_e_softdelete drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_e_softdelete_deleted', 'C') IS NOT NULL) alter table migtest_e_softdelete drop constraint ck_migtest_e_softdelete_deleted;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_softdelete','U') AND name = 'ix_migtest_e_softdelete_deleted') drop index ix_migtest_e_softdelete_deleted ON migtest_e_softdelete;
-IF OBJECT_ID('fk_migtest_e_softdelete_deleted', 'F') IS NOT NULL alter table migtest_e_softdelete drop constraint fk_migtest_e_softdelete_deleted;
-alter table migtest_e_softdelete drop column deleted;
-
--- drop column migtest_oto_child.master_id;
-IF (OBJECT_ID('uq_migtest_oto_child_master_id', 'UQ') IS NOT NULL) alter table migtest_oto_child drop constraint uq_migtest_oto_child_master_id;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_oto_child','U') AND name = 'uq_migtest_oto_child_master_id') drop index uq_migtest_oto_child_master_id ON migtest_oto_child;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_oto_child') and t2.name = 'master_id';
-if @Tmp is not null EXEC('alter table migtest_oto_child drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_oto_child_master_id', 'C') IS NOT NULL) alter table migtest_oto_child drop constraint ck_migtest_oto_child_master_id;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_oto_child','U') AND name = 'ix_migtest_oto_child_master_id') drop index ix_migtest_oto_child_master_id ON migtest_oto_child;
-IF OBJECT_ID('fk_migtest_oto_child_master_id', 'F') IS NOT NULL alter table migtest_oto_child drop constraint fk_migtest_oto_child_master_id;
-alter table migtest_oto_child drop column master_id;
-
-IF OBJECT_ID('migtest_e_user', 'U') IS NOT NULL drop table migtest_e_user;
-IF OBJECT_ID('migtest_e_user_seq', 'SO') IS NOT NULL drop sequence migtest_e_user_seq;
-IF OBJECT_ID('migtest_mtm_c_migtest_mtm_m', 'U') IS NOT NULL drop table migtest_mtm_c_migtest_mtm_m;
-IF OBJECT_ID('migtest_mtm_m_migtest_mtm_c', 'U') IS NOT NULL drop table migtest_mtm_m_migtest_mtm_c;
--- dropping history support for migtest_e_history;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_history') and t2.name = 'sys_periodFrom';
-if @Tmp is not null EXEC('alter table migtest_e_history drop constraint ' + @Tmp)$$;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_history') and t2.name = 'sys_periodTo';
-if @Tmp is not null EXEC('alter table migtest_e_history drop constraint ' + @Tmp)$$;
-alter table migtest_e_history set (system_versioning = off);
-alter table migtest_e_history drop period for system_time;
-alter table migtest_e_history drop column sys_periodFrom;
-alter table migtest_e_history drop column sys_periodTo;
-IF OBJECT_ID('migtest_e_history_history', 'U') IS NOT NULL drop table migtest_e_history_history;
-
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/R__order_views_mssql.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/R__order_views_mssql.sql
similarity index 100%
rename from src/test/resources/dbmigration/migrationtest/sqlserver/R__order_views_mssql.sql
rename to src/test/resources/dbmigration/migrationtest/sqlserver17/R__order_views_mssql.sql

From 5faec61cd2b90667226774fa86495d305f0d318f Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Mar 2018 19:34:36 +1300
Subject: [PATCH 0168/1036] #1318 - ENH: native UUID-support for SqlServer

Merge branch 'native-uuid-sqlserver' of https://github.com/FOCONIS/ebean into FOCONIS-native-uuid-sqlserver

# Conflicts:
#	src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java
---
 .../io/ebean/config/dbplatform/DbPlatformTypeMapping.java   | 6 +++---
 .../config/dbplatform/sqlserver/SqlServer17Platform.java    | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java b/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java
index b26576247..c1c4896e3 100644
--- a/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java
+++ b/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java
@@ -119,8 +119,8 @@ public class DbPlatformTypeMapping {
       put(DbType.JSONCLOB, JSON_CLOB_PLACEHOLDER);
       put(DbType.JSONBLOB, JSON_BLOB_PLACEHOLDER);
       put(DbType.JSONVARCHAR, JSON_VARCHAR_PLACEHOLDER);
-      // use reasonable default of varchar(40) - ideally set via DatabasePlatform.configure(DbTypeConfig)
-      put(DbType.UUID, get(DbType.VARCHAR).withLength(40));
+      // default to native UUID and override on platform configure()
+      put(DbType.UUID, UUID_NATIVE);
     }
   }
 
@@ -200,7 +200,7 @@ public class DbPlatformTypeMapping {
    */
   public void config(boolean nativeUuidType, ServerConfig.DbUuid dbUuid) {
     if (nativeUuidType && dbUuid.useNativeType()) {
-      put(DbType.UUID, UUID_NATIVE);
+      // native UUID already set by default
     } else if (dbUuid.useBinary()) {
       put(DbType.UUID, get(DbType.BINARY).withLength(16));
     } else {
diff --git a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer17Platform.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer17Platform.java
index fd17bbe9f..e08de85ab 100644
--- a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer17Platform.java
+++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer17Platform.java
@@ -1,6 +1,8 @@
 package io.ebean.config.dbplatform.sqlserver;
 
 import io.ebean.annotation.Platform;
+import io.ebean.config.dbplatform.DbPlatformType;
+import io.ebean.config.dbplatform.DbType;
 
 /**
  * Microsoft SQL Server platform - NVarchar UTF types and Sequence preference.
@@ -11,6 +13,8 @@ public class SqlServer17Platform extends SqlServerBasePlatform {
     super();
     this.platform = Platform.SQLSERVER17;
     this.columnAliasPrefix = null;
+    this.nativeUuidType = true;
+    this.dbTypeMap.put(DbType.UUID, new DbPlatformType("uniqueidentifier", false));
   }
 
 }

From 0aec597cf251d3ff3290f08d0b8fa30031643dac Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Mar 2018 19:35:48 +1300
Subject: [PATCH 0169/1036] #1318 No effective change - DDL review for ... ENH:
 native UUID-support for SqlServer

---
 src/test/ddl-review/sqlserver-create-all.sql | 3626 ++++++++++++++++++
 src/test/ddl-review/sqlserver-drop-all.sql   | 1549 ++++++++
 2 files changed, 5175 insertions(+)
 create mode 100644 src/test/ddl-review/sqlserver-create-all.sql
 create mode 100644 src/test/ddl-review/sqlserver-drop-all.sql

diff --git a/src/test/ddl-review/sqlserver-create-all.sql b/src/test/ddl-review/sqlserver-create-all.sql
new file mode 100644
index 000000000..de66ddd39
--- /dev/null
+++ b/src/test/ddl-review/sqlserver-create-all.sql
@@ -0,0 +1,3626 @@
+-- Generated by ebean unknown at 2018-03-08T04:43:42.126Z
+create table asimple_bean (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_asimple_bean primary key (id)
+);
+create sequence asimple_bean_seq as bigint  start with 1  increment by 50;
+
+create table bar (
+  bar_type                      nvarchar(31) not null,
+  bar_id                        integer not null,
+  foo_id                        integer not null,
+  version                       integer not null,
+  constraint pk_bar primary key (bar_id)
+);
+create sequence bar_seq as bigint  start with 1  increment by 50;
+
+create table oto_account (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_oto_account primary key (id)
+);
+create sequence oto_account_seq as bigint  start with 1  increment by 50;
+
+create table addr (
+  id                            numeric(19) not null,
+  employee_id                   numeric(19),
+  name                          nvarchar(255),
+  address_line1                 nvarchar(255),
+  address_line2                 nvarchar(255),
+  city                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_addr primary key (id)
+);
+create sequence addr_seq as bigint  start with 1  increment by 50;
+
+create table address (
+  oid                           numeric(19) not null,
+  street                        nvarchar(255),
+  version                       integer not null,
+  constraint pk_address primary key (oid)
+);
+create sequence address_seq as bigint  start with 1  increment by 50;
+
+create table o_address (
+  id                            smallint not null,
+  line_1                        nvarchar(100),
+  line_2                        nvarchar(100),
+  city                          nvarchar(100),
+  cretime                       datetime2,
+  country_code                  nvarchar(2),
+  updtime                       datetime2 not null,
+  constraint pk_o_address primary key (id)
+);
+create sequence o_address_seq as bigint  start with 1  increment by 50;
+
+create table album (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  cover_id                      numeric(19),
+  deleted                       integer default 0 not null,
+  created_at                    datetime2 not null,
+  last_update                   datetime2 not null,
+  constraint pk_album primary key (id)
+);
+create unique nonclustered index uq_album_cover_id on album(cover_id) where cover_id is not null;
+create sequence album_seq as bigint  start with 1  increment by 50;
+
+create table animal (
+  species                       nvarchar(255) not null,
+  id                            numeric(19) not null,
+  shelter_id                    numeric(19),
+  version                       numeric(19) not null,
+  name                          nvarchar(255),
+  registration_number           nvarchar(255),
+  date_of_birth                 date,
+  dog_size                      nvarchar(255),
+  constraint pk_animal primary key (id)
+);
+create sequence animal_seq as bigint  start with 1  increment by 50;
+
+create table animal_shelter (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_animal_shelter primary key (id)
+);
+create sequence animal_shelter_seq as bigint  start with 1  increment by 50;
+
+create table article (
+  id                            integer not null,
+  name                          nvarchar(255),
+  author                        nvarchar(255),
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  constraint pk_article primary key (id)
+);
+create sequence article_seq as bigint  start with 1  increment by 50;
+
+create table attribute (
+  option_type                   integer not null,
+  id                            integer not null,
+  attribute_holder_id           integer,
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  constraint pk_attribute primary key (id)
+);
+create sequence attribute_seq as bigint  start with 1  increment by 50;
+
+create table attribute_holder (
+  id                            integer not null,
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  constraint pk_attribute_holder primary key (id)
+);
+create sequence attribute_holder_seq as bigint  start with 1  increment by 50;
+
+create table audit_log (
+  id                            numeric(19) not null,
+  description                   nvarchar(255),
+  modified_description          nvarchar(255),
+  constraint pk_audit_log primary key (id)
+);
+create sequence audit_log_seq as bigint  start with 1  increment by 50;
+
+create table bbookmark (
+  id                            integer not null,
+  bookmark_reference            nvarchar(255),
+  user_id                       integer,
+  constraint pk_bbookmark primary key (id)
+);
+create sequence bbookmark_seq as bigint  start with 1  increment by 50;
+
+create table bbookmark_user (
+  id                            integer not null,
+  name                          nvarchar(255),
+  password                      nvarchar(255),
+  email_address                 nvarchar(255),
+  country                       nvarchar(255),
+  constraint pk_bbookmark_user primary key (id)
+);
+create sequence bbookmark_user_seq as bigint  start with 1  increment by 50;
+
+create table bsimple_with_gen (
+  id                            integer not null,
+  name                          nvarchar(255),
+  constraint pk_bsimple_with_gen primary key (id)
+);
+create sequence bsimple_with_gen_seq as bigint  start with 1  increment by 50;
+
+create table bsite (
+  id                            nvarchar(40) not null,
+  name                          nvarchar(255),
+  constraint pk_bsite primary key (id)
+);
+
+create table bsite_user (
+  site_id                       nvarchar(40) not null,
+  user_id                       nvarchar(40) not null,
+  access_level                  integer,
+  constraint ck_bsite_user_access_level check ( access_level in (0,1,2)),
+  constraint pk_bsite_user primary key (site_id,user_id)
+);
+
+create table bsite_user_b (
+  site                          nvarchar(40) not null,
+  usr                           nvarchar(40) not null,
+  access_level                  integer,
+  constraint ck_bsite_user_b_access_level check ( access_level in (0,1,2)),
+  constraint pk_bsite_user_b primary key (site,usr)
+);
+
+create table bsite_user_c (
+  site_uid                      nvarchar(40) not null,
+  user_uid                      nvarchar(40) not null,
+  access_level                  integer,
+  constraint ck_bsite_user_c_access_level check ( access_level in (0,1,2)),
+  constraint pk_bsite_user_c primary key (site_uid,user_uid)
+);
+
+create table buser (
+  id                            nvarchar(40) not null,
+  name                          nvarchar(255),
+  constraint pk_buser primary key (id)
+);
+
+create table bwith_qident (
+  id                            integer not null,
+  [Name]                        nvarchar(191),
+  last_updated                  datetime2 not null,
+  constraint pk_bwith_qident primary key (id)
+);
+create unique nonclustered index uq_bwith_qident_name on bwith_qident([Name]) where [Name] is not null;
+create sequence bwith_qident_seq as bigint  start with 1  increment by 50;
+
+create table basic_joda_entity (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  period                        nvarchar(50),
+  created                       datetime2 not null,
+  updated                       datetime2 not null,
+  version                       datetime2 not null,
+  constraint pk_basic_joda_entity primary key (id)
+);
+create sequence basic_joda_entity_seq as bigint  start with 1  increment by 50;
+
+create table bean_with_time_zone (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  timezone                      nvarchar(20),
+  constraint pk_bean_with_time_zone primary key (id)
+);
+create sequence bean_with_time_zone_seq as bigint  start with 1  increment by 50;
+
+create table drel_booking (
+  id                            numeric(19) not null,
+  booking_uid                   numeric(19),
+  agent_invoice                 numeric(19),
+  client_invoice                numeric(19),
+  version                       integer not null,
+  constraint pk_drel_booking primary key (id)
+);
+create unique nonclustered index uq_drel_booking_booking_uid on drel_booking(booking_uid) where booking_uid is not null;
+create unique nonclustered index uq_drel_booking_agent_invoice on drel_booking(agent_invoice) where agent_invoice is not null;
+create unique nonclustered index uq_drel_booking_client_invoice on drel_booking(client_invoice) where client_invoice is not null;
+create sequence drel_booking_seq as bigint  start with 1  increment by 50;
+
+create table cinh_root (
+  dtype                         nvarchar(3) not null,
+  id                            integer not null,
+  license_number                nvarchar(255),
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  driver                        nvarchar(255),
+  notes                         nvarchar(255),
+  action                        nvarchar(255),
+  constraint pk_cinh_root primary key (id)
+);
+create sequence cinh_root_seq as bigint  start with 1  increment by 50;
+
+create table ckey_assoc (
+  id                            integer not null,
+  assoc_one                     nvarchar(255),
+  constraint pk_ckey_assoc primary key (id)
+);
+create sequence ckey_assoc_seq as bigint  start with 1  increment by 50;
+
+create table ckey_detail (
+  id                            integer not null,
+  something                     nvarchar(255),
+  one_key                       integer,
+  two_key                       nvarchar(127),
+  constraint pk_ckey_detail primary key (id)
+);
+create sequence ckey_detail_seq as bigint  start with 1  increment by 50;
+
+create table ckey_parent (
+  one_key                       integer not null,
+  two_key                       nvarchar(127) not null,
+  name                          nvarchar(255),
+  assoc_id                      integer,
+  version                       integer not null,
+  constraint pk_ckey_parent primary key (one_key,two_key)
+);
+
+create table calculation_result (
+  id                            integer not null,
+  charge                        float(32) not null,
+  product_configuration_id      integer,
+  group_configuration_id        integer,
+  constraint pk_calculation_result primary key (id)
+);
+create sequence calculation_result_seq as bigint  start with 1  increment by 50;
+
+create table cao_bean (
+  x_cust_id                     integer not null,
+  x_type_id                     integer not null,
+  description                   nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_cao_bean primary key (x_cust_id,x_type_id)
+);
+
+create table sa_car (
+  id                            numeric(19) not null,
+  version                       integer not null,
+  constraint pk_sa_car primary key (id)
+);
+create sequence sa_car_seq as bigint  start with 1  increment by 50;
+
+create table sp_car_car (
+  id                            numeric(19) not null,
+  version                       integer not null,
+  constraint pk_sp_car_car primary key (id)
+);
+create sequence sp_car_car_seq as bigint  start with 1  increment by 50;
+
+create table sp_car_car_wheels (
+  car                           numeric(19) not null,
+  wheel                         numeric(19) not null,
+  constraint pk_sp_car_car_wheels primary key (car,wheel)
+);
+
+create table car_accessory (
+  id                            integer not null,
+  name                          nvarchar(255),
+  fuse_id                       numeric(19) not null,
+  car_id                        integer,
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  constraint pk_car_accessory primary key (id)
+);
+create sequence car_accessory_seq as bigint  start with 1  increment by 50;
+
+create table car_fuse (
+  id                            numeric(19) not null,
+  location_code                 nvarchar(255),
+  constraint pk_car_fuse primary key (id)
+);
+create sequence car_fuse_seq as bigint  start with 1  increment by 50;
+
+create table category (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  surveyobjectid                numeric(19),
+  sequence_number               integer not null,
+  constraint pk_category primary key (id)
+);
+create sequence category_seq as bigint  start with 1  increment by 50;
+
+create table child_person (
+  identifier                    integer not null,
+  name                          nvarchar(255),
+  age                           integer,
+  some_bean_id                  integer,
+  parent_identifier             integer,
+  family_name                   nvarchar(255),
+  address                       nvarchar(255),
+  constraint pk_child_person primary key (identifier)
+);
+create sequence child_person_seq as bigint  start with 1  increment by 50;
+
+create table configuration (
+  type                          nvarchar(21) not null,
+  id                            integer not null,
+  name                          nvarchar(255),
+  configurations_id             integer,
+  group_name                    nvarchar(255),
+  product_name                  nvarchar(255),
+  constraint pk_configuration primary key (id)
+);
+create sequence configuration_seq as bigint  start with 1  increment by 50;
+
+create table configurations (
+  id                            integer not null,
+  name                          nvarchar(255),
+  constraint pk_configurations primary key (id)
+);
+create sequence configurations_seq as bigint  start with 1  increment by 50;
+
+create table contact (
+  id                            integer not null,
+  first_name                    nvarchar(127),
+  last_name                     nvarchar(127),
+  phone                         nvarchar(255),
+  mobile                        nvarchar(255),
+  email                         nvarchar(255),
+  customer_id                   integer not null,
+  group_id                      integer,
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  constraint pk_contact primary key (id)
+);
+create sequence contact_seq as bigint  start with 1  increment by 50;
+
+create table contact_group (
+  id                            integer not null,
+  name                          nvarchar(255),
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  constraint pk_contact_group primary key (id)
+);
+create sequence contact_group_seq as bigint  start with 1  increment by 50;
+
+create table contact_note (
+  id                            integer not null,
+  contact_id                    integer,
+  title                         nvarchar(255),
+  note                          nvarchar(max),
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  constraint pk_contact_note primary key (id)
+);
+create sequence contact_note_seq as bigint  start with 1  increment by 50;
+
+create table c_conversation (
+  id                            numeric(19) not null,
+  title                         nvarchar(255),
+  isopen                        integer default 0 not null,
+  group_id                      numeric(19),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_c_conversation primary key (id)
+);
+create sequence c_conversation_seq as bigint  start with 1  increment by 50;
+
+create table o_country (
+  code                          nvarchar(2) not null,
+  name                          nvarchar(60),
+  constraint pk_o_country primary key (code)
+);
+
+create table cover (
+  id                            numeric(19) not null,
+  s3url                         nvarchar(255),
+  deleted                       integer default 0 not null,
+  constraint pk_cover primary key (id)
+);
+create sequence cover_seq as bigint  start with 1  increment by 50;
+
+create table o_customer (
+  id                            integer not null,
+  status                        nvarchar(1),
+  name                          nvarchar(40) not null,
+  smallnote                     nvarchar(100),
+  anniversary                   date,
+  billing_address_id            smallint,
+  shipping_address_id           smallint,
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  constraint ck_o_customer_status check ( status in ('N','A','I')),
+  constraint pk_o_customer primary key (id)
+);
+create sequence o_customer_seq as bigint  start with 1  increment by 50;
+
+create table dcredit (
+  id                            numeric(19) not null,
+  credit                        nvarchar(255),
+  constraint pk_dcredit primary key (id)
+);
+create sequence dcredit_seq as bigint  start with 1  increment by 50;
+
+create table dcredit_drol (
+  dcredit_id                    numeric(19) not null,
+  drol_id                       numeric(19) not null,
+  constraint pk_dcredit_drol primary key (dcredit_id,drol_id)
+);
+
+create table dexh_entity (
+  oid                           numeric(19) not null,
+  exhange                       nvarchar(255),
+  an_enum_type                  nvarchar(255),
+  last_updated                  datetime2 not null,
+  constraint pk_dexh_entity primary key (oid)
+);
+create sequence dexh_entity_seq as bigint  start with 1  increment by 50;
+
+create table dperson (
+  id                            numeric(19) not null,
+  first_name                    nvarchar(255),
+  last_name                     nvarchar(255),
+  salary                        numeric(28),
+  constraint pk_dperson primary key (id)
+);
+create sequence dperson_seq as bigint  start with 1  increment by 50;
+
+create table drol (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_drol primary key (id)
+);
+create sequence drol_seq as bigint  start with 1  increment by 50;
+
+create table drot (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_drot primary key (id)
+);
+create sequence drot_seq as bigint  start with 1  increment by 50;
+
+create table drot_drol (
+  drot_id                       numeric(19) not null,
+  drol_id                       numeric(19) not null,
+  constraint pk_drot_drol primary key (drot_id,drol_id)
+);
+
+create table rawinherit_data (
+  id                            numeric(19) not null,
+  val                           integer,
+  constraint pk_rawinherit_data primary key (id)
+);
+create sequence rawinherit_data_seq as bigint  start with 1  increment by 50;
+
+create table dfk_cascade (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  one_id                        numeric(19),
+  constraint pk_dfk_cascade primary key (id)
+);
+create sequence dfk_cascade_seq as bigint  start with 1  increment by 50;
+
+create table dfk_cascade_one (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_dfk_cascade_one primary key (id)
+);
+create sequence dfk_cascade_one_seq as bigint  start with 1  increment by 50;
+
+create table dfk_none (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  one_id                        numeric(19),
+  constraint pk_dfk_none primary key (id)
+);
+create sequence dfk_none_seq as bigint  start with 1  increment by 50;
+
+create table dfk_none_via_join (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  one_id                        numeric(19),
+  constraint pk_dfk_none_via_join primary key (id)
+);
+create sequence dfk_none_via_join_seq as bigint  start with 1  increment by 50;
+
+create table dfk_one (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_dfk_one primary key (id)
+);
+create sequence dfk_one_seq as bigint  start with 1  increment by 50;
+
+create table dfk_set_null (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  one_id                        numeric(19),
+  constraint pk_dfk_set_null primary key (id)
+);
+create sequence dfk_set_null_seq as bigint  start with 1  increment by 50;
+
+create table doc (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_doc primary key (id)
+);
+create sequence doc_seq as bigint  start with 1  increment by 50;
+
+create table doc_link (
+  doc_id                        numeric(19) not null,
+  link_id                       numeric(19) not null,
+  constraint pk_doc_link primary key (doc_id,link_id)
+);
+
+create table doc_link_draft (
+  doc_id                        numeric(19) not null,
+  link_id                       numeric(19) not null,
+  constraint pk_doc_link_draft primary key (doc_id,link_id)
+);
+
+create table doc_draft (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_doc_draft primary key (id)
+);
+create sequence doc_draft_seq as bigint  start with 1 ;
+
+create table document (
+  id                            numeric(19) not null,
+  title                         nvarchar(127),
+  body                          nvarchar(255),
+  organisation_id               numeric(19),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_document primary key (id)
+);
+create unique nonclustered index uq_document_title on document(title) where title is not null;
+create sequence document_seq as bigint  start with 1  increment by 50;
+
+create table document_draft (
+  id                            numeric(19) not null,
+  title                         nvarchar(127),
+  body                          nvarchar(255),
+  when_publish                  datetime2,
+  organisation_id               numeric(19),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_document_draft primary key (id)
+);
+create unique nonclustered index uq_document_draft_title on document_draft(title) where title is not null;
+create sequence document_draft_seq as bigint  start with 1 ;
+
+create table document_media (
+  id                            numeric(19) not null,
+  document_id                   numeric(19),
+  name                          nvarchar(255),
+  description                   nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_document_media primary key (id)
+);
+create sequence document_media_seq as bigint  start with 1  increment by 50;
+
+create table document_media_draft (
+  id                            numeric(19) not null,
+  document_id                   numeric(19),
+  name                          nvarchar(255),
+  description                   nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_document_media_draft primary key (id)
+);
+create sequence document_media_draft_seq as bigint  start with 1 ;
+
+create table earray_bean (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  phone_numbers                 varchar(300),
+  uids                          varchar(1000),
+  other_ids                     varchar(1000),
+  doubs                         varchar(1000),
+  statuses                      varchar(1000),
+  status2                       varchar(1000),
+  version                       numeric(19) not null,
+  constraint pk_earray_bean primary key (id)
+);
+create sequence earray_bean_seq as bigint  start with 1  increment by 50;
+
+create table earray_set_bean (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  phone_numbers                 varchar(300),
+  uids                          varchar(1000),
+  other_ids                     varchar(1000),
+  doubs                         varchar(1000),
+  version                       numeric(19) not null,
+  constraint pk_earray_set_bean primary key (id)
+);
+create sequence earray_set_bean_seq as bigint  start with 1  increment by 50;
+
+create table e_basic (
+  id                            integer not null,
+  status                        nvarchar(1),
+  name                          nvarchar(127),
+  description                   nvarchar(255),
+  some_date                     datetime2,
+  constraint ck_e_basic_status check ( status in ('N','A','I')),
+  constraint pk_e_basic primary key (id)
+);
+create sequence e_basic_seq as bigint  start with 1  increment by 50;
+
+create table ebasic_change_log (
+  id                            numeric(19) not null,
+  name                          nvarchar(20),
+  short_description             nvarchar(50),
+  long_description              nvarchar(100),
+  who_created                   nvarchar(255) not null,
+  who_modified                  nvarchar(255) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  version                       numeric(19) not null,
+  constraint pk_ebasic_change_log primary key (id)
+);
+create sequence ebasic_change_log_seq as bigint  start with 1  increment by 50;
+
+create table ebasic_clob (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  title                         nvarchar(255),
+  description                   nvarchar(max),
+  last_update                   datetime2 not null,
+  constraint pk_ebasic_clob primary key (id)
+);
+create sequence ebasic_clob_seq as bigint  start with 1  increment by 50;
+
+create table ebasic_clob_fetch_eager (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  title                         nvarchar(255),
+  description                   nvarchar(max),
+  last_update                   datetime2 not null,
+  constraint pk_ebasic_clob_fetch_eager primary key (id)
+);
+create sequence ebasic_clob_fetch_eager_seq as bigint  start with 1  increment by 50;
+
+create table ebasic_clob_no_ver (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  description                   nvarchar(max),
+  constraint pk_ebasic_clob_no_ver primary key (id)
+);
+create sequence ebasic_clob_no_ver_seq as bigint  start with 1  increment by 50;
+
+create table e_basicenc (
+  id                            integer not null,
+  name                          nvarchar(255),
+  description                   varbinary(80),
+  dob                           varbinary(20),
+  status                        varbinary(20),
+  last_update                   datetime2,
+  constraint pk_e_basicenc primary key (id)
+);
+create sequence e_basicenc_seq as bigint  start with 1  increment by 50;
+
+create table e_basicenc_bin (
+  id                            integer not null,
+  name                          nvarchar(255),
+  description                   nvarchar(255),
+  data                          image,
+  some_time                     varbinary(255),
+  last_update                   datetime2 not null,
+  constraint pk_e_basicenc_bin primary key (id)
+);
+create sequence e_basicenc_bin_seq as bigint  start with 1  increment by 50;
+
+create table e_basic_enum_id (
+  status                        nvarchar(1) not null,
+  name                          nvarchar(255),
+  description                   nvarchar(255),
+  constraint ck_e_basic_enum_id_status check ( status in ('N','A','I')),
+  constraint pk_e_basic_enum_id primary key (status)
+);
+
+create table e_basic_eni (
+  id                            integer not null,
+  status                        integer,
+  name                          nvarchar(255),
+  description                   nvarchar(255),
+  some_date                     datetime2,
+  constraint ck_e_basic_eni_status check ( status in (1,2,3)),
+  constraint pk_e_basic_eni primary key (id)
+);
+create sequence e_basic_eni_seq as bigint  start with 1  increment by 50;
+
+create table ebasic_hstore (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  map                           nvarchar(800),
+  version                       numeric(19) not null,
+  constraint pk_ebasic_hstore primary key (id)
+);
+create sequence ebasic_hstore_seq as bigint  start with 1  increment by 50;
+
+create table ebasic_json_list (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  bean_set                      nvarchar(700),
+  bean_list                     nvarchar(max),
+  bean_map                      nvarchar(700),
+  plain_bean                    nvarchar(500),
+  flags                         nvarchar(50),
+  tags                          nvarchar(100),
+  version                       numeric(19) not null,
+  constraint pk_ebasic_json_list primary key (id)
+);
+create sequence ebasic_json_list_seq as bigint  start with 1  increment by 50;
+
+create table ebasic_json_map (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  content                       nvarchar(max),
+  version                       numeric(19) not null,
+  constraint pk_ebasic_json_map primary key (id)
+);
+create sequence ebasic_json_map_seq as bigint  start with 1  increment by 50;
+
+create table ebasic_json_map_blob (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  content                       image,
+  version                       numeric(19) not null,
+  constraint pk_ebasic_json_map_blob primary key (id)
+);
+create sequence ebasic_json_map_blob_seq as bigint  start with 1  increment by 50;
+
+create table ebasic_json_map_clob (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  content                       nvarchar(max),
+  version                       numeric(19) not null,
+  constraint pk_ebasic_json_map_clob primary key (id)
+);
+create sequence ebasic_json_map_clob_seq as bigint  start with 1  increment by 50;
+
+create table ebasic_json_map_detail (
+  id                            numeric(19) not null,
+  owner_id                      numeric(19),
+  name                          nvarchar(255),
+  content                       nvarchar(max),
+  version                       numeric(19) not null,
+  constraint pk_ebasic_json_map_detail primary key (id)
+);
+create sequence ebasic_json_map_detail_seq as bigint  start with 1  increment by 50;
+
+create table ebasic_json_map_json_b (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  content                       nvarchar(max),
+  version                       numeric(19) not null,
+  constraint pk_ebasic_json_map_json_b primary key (id)
+);
+create sequence ebasic_json_map_json_b_seq as bigint  start with 1  increment by 50;
+
+create table ebasic_json_map_varchar (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  content                       nvarchar(3000),
+  version                       numeric(19) not null,
+  constraint pk_ebasic_json_map_varchar primary key (id)
+);
+create sequence ebasic_json_map_varchar_seq as bigint  start with 1  increment by 50;
+
+create table ebasic_json_node (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  content                       nvarchar(max),
+  version                       numeric(19) not null,
+  constraint pk_ebasic_json_node primary key (id)
+);
+create sequence ebasic_json_node_seq as bigint  start with 1  increment by 50;
+
+create table ebasic_json_node_blob (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  content                       image,
+  version                       numeric(19) not null,
+  constraint pk_ebasic_json_node_blob primary key (id)
+);
+create sequence ebasic_json_node_blob_seq as bigint  start with 1  increment by 50;
+
+create table ebasic_json_node_json_b (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  content                       nvarchar(max),
+  version                       numeric(19) not null,
+  constraint pk_ebasic_json_node_json_b primary key (id)
+);
+create sequence ebasic_json_node_json_b_seq as bigint  start with 1  increment by 50;
+
+create table ebasic_json_node_varchar (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  content                       nvarchar(1000),
+  version                       numeric(19) not null,
+  constraint pk_ebasic_json_node_varchar primary key (id)
+);
+create sequence ebasic_json_node_varchar_seq as bigint  start with 1  increment by 50;
+
+create table ebasic_json_unmapped (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_ebasic_json_unmapped primary key (id)
+);
+create sequence ebasic_json_unmapped_seq as bigint  start with 1  increment by 50;
+
+create table e_basic_ndc (
+  id                            integer not null,
+  name                          nvarchar(255),
+  constraint pk_e_basic_ndc primary key (id)
+);
+create sequence e_basic_ndc_seq as bigint  start with 1  increment by 50;
+
+create table ebasic_no_sdchild (
+  id                            numeric(19) not null,
+  owner_id                      numeric(19) not null,
+  child_name                    nvarchar(255),
+  amount                        numeric(19) not null,
+  version                       numeric(19) not null,
+  constraint pk_ebasic_no_sdchild primary key (id)
+);
+create sequence ebasic_no_sdchild_seq as bigint  start with 1  increment by 50;
+
+create table ebasic_sdchild (
+  id                            numeric(19) not null,
+  owner_id                      numeric(19) not null,
+  child_name                    nvarchar(255),
+  amount                        numeric(19) not null,
+  version                       numeric(19) not null,
+  deleted                       integer default 0 not null,
+  constraint pk_ebasic_sdchild primary key (id)
+);
+create sequence ebasic_sdchild_seq as bigint  start with 1  increment by 50;
+
+create table ebasic_soft_delete (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  description                   nvarchar(255),
+  version                       numeric(19) not null,
+  deleted                       integer default 0 not null,
+  constraint pk_ebasic_soft_delete primary key (id)
+);
+create sequence ebasic_soft_delete_seq as bigint  start with 1  increment by 50;
+
+create table e_basicver (
+  id                            integer not null,
+  name                          nvarchar(255),
+  description                   nvarchar(255),
+  other                         nvarchar(255),
+  last_update                   datetime2 not null,
+  constraint pk_e_basicver primary key (id)
+);
+create sequence e_basicver_seq as bigint  start with 1  increment by 50;
+
+create table e_basic_withlife (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  deleted                       integer default 0 not null,
+  version                       numeric(19) not null,
+  constraint pk_e_basic_withlife primary key (id)
+);
+create sequence e_basic_withlife_seq as bigint  start with 1  increment by 50;
+
+create table e_basicverucon (
+  id                            integer not null,
+  name                          nvarchar(127),
+  other                         nvarchar(127),
+  other_one                     nvarchar(127),
+  description                   nvarchar(255),
+  last_update                   datetime2 not null,
+  constraint pk_e_basicverucon primary key (id)
+);
+create unique nonclustered index uq_e_basicverucon_name on e_basicverucon(name) where name is not null;
+create unique nonclustered index uq_e_basicverucon_other_other_one on e_basicverucon(other,other_one) where other is not null and other_one is not null;
+create sequence e_basicverucon_seq as bigint  start with 1  increment by 50;
+
+create table e_col_ab (
+  id                            numeric(19) not null,
+  column_a                      nvarchar(255),
+  column_b                      nvarchar(255),
+  constraint pk_e_col_ab primary key (id)
+);
+create sequence e_col_ab_seq as bigint  start with 1  increment by 50;
+
+create table ecustom_id (
+  id                            nvarchar(127) not null,
+  name                          nvarchar(255),
+  constraint pk_ecustom_id primary key (id)
+);
+
+create table eemb_inner (
+  id                            integer not null,
+  nome_inner                    nvarchar(255),
+  outer_id                      integer,
+  update_count                  integer not null,
+  constraint pk_eemb_inner primary key (id)
+);
+create sequence eemb_inner_seq as bigint  start with 1  increment by 50;
+
+create table eemb_outer (
+  id                            integer not null,
+  nome_outer                    nvarchar(255),
+  date1                         datetime2,
+  date2                         datetime2,
+  update_count                  integer not null,
+  constraint pk_eemb_outer primary key (id)
+);
+create sequence eemb_outer_seq as bigint  start with 1  increment by 50;
+
+create table egen_props (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  ts_created                    datetime2 not null,
+  ts_updated                    datetime2 not null,
+  ldt_created                   datetime2 not null,
+  ldt_updated                   datetime2 not null,
+  odt_created                   datetime2 not null,
+  odt_updated                   datetime2 not null,
+  zdt_created                   datetime2 not null,
+  zdt_updated                   datetime2 not null,
+  instant_created               datetime2 not null,
+  instant_updated               datetime2 not null,
+  long_created                  numeric(19) not null,
+  long_updated                  numeric(19) not null,
+  constraint pk_egen_props primary key (id)
+);
+create sequence egen_props_seq as bigint  start with 1  increment by 50;
+
+create table einvoice (
+  id                            numeric(19) not null,
+  invoice_date                  datetime2,
+  state                         integer,
+  person_id                     numeric(19),
+  ship_street                   nvarchar(255),
+  ship_suburb                   nvarchar(255),
+  ship_city                     nvarchar(255),
+  ship_status                   nvarchar(3),
+  bill_street                   nvarchar(255),
+  bill_suburb                   nvarchar(255),
+  bill_city                     nvarchar(255),
+  bill_status                   nvarchar(3),
+  version                       numeric(19) not null,
+  constraint ck_einvoice_state check ( state in (0,1,2)),
+  constraint ck_einvoice_ship_status check ( ship_status in ('ONE','TWO')),
+  constraint ck_einvoice_bill_status check ( bill_status in ('ONE','TWO')),
+  constraint pk_einvoice primary key (id)
+);
+create sequence einvoice_seq as bigint  start with 1  increment by 50;
+
+create table e_main (
+  id                            integer not null,
+  name                          nvarchar(255),
+  description                   nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_e_main primary key (id)
+);
+create sequence e_main_seq as bigint  start with 1  increment by 50;
+
+create table enull_collection (
+  id                            integer not null,
+  name                          nvarchar(255),
+  constraint pk_enull_collection primary key (id)
+);
+create sequence enull_collection_seq as bigint  start with 1  increment by 50;
+
+create table enull_collection_detail (
+  id                            integer not null,
+  enull_collection_id           integer not null,
+  something                     nvarchar(255),
+  constraint pk_enull_collection_detail primary key (id)
+);
+create sequence enull_collection_detail_seq as bigint  start with 1  increment by 50;
+
+create table eopt_one_a (
+  id                            integer not null,
+  name_for_a                    nvarchar(255),
+  b_id                          integer,
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  constraint pk_eopt_one_a primary key (id)
+);
+create sequence eopt_one_a_seq as bigint  start with 1  increment by 50;
+
+create table eopt_one_b (
+  id                            integer not null,
+  name_for_b                    nvarchar(255),
+  c_id                          integer not null,
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  constraint pk_eopt_one_b primary key (id)
+);
+create sequence eopt_one_b_seq as bigint  start with 1  increment by 50;
+
+create table eopt_one_c (
+  id                            integer not null,
+  name_for_c                    nvarchar(255),
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  constraint pk_eopt_one_c primary key (id)
+);
+create sequence eopt_one_c_seq as bigint  start with 1  increment by 50;
+
+create table eperson (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  notes                         nvarchar(255),
+  street                        nvarchar(255),
+  suburb                        nvarchar(255),
+  addr_city                     nvarchar(255),
+  addr_status                   nvarchar(3),
+  version                       numeric(19) not null,
+  constraint ck_eperson_addr_status check ( addr_status in ('ONE','TWO')),
+  constraint pk_eperson primary key (id)
+);
+create sequence eperson_seq as bigint  start with 1  increment by 50;
+
+create table e_person_online (
+  id                            numeric(19) not null,
+  email                         nvarchar(127),
+  online_status                 integer default 0 not null,
+  when_updated                  datetime2 not null,
+  constraint pk_e_person_online primary key (id)
+);
+create unique nonclustered index uq_e_person_online_email on e_person_online(email) where email is not null;
+create sequence e_person_online_seq as bigint  start with 1  increment by 50;
+
+create table esimple (
+  usertypeid                    integer identity(1,1) not null,
+  name                          nvarchar(255),
+  constraint pk_esimple primary key (usertypeid)
+);
+
+create table esoft_del_book (
+  id                            numeric(19) not null,
+  book_title                    nvarchar(255),
+  lend_by_id                    numeric(19),
+  version                       numeric(19) not null,
+  deleted                       integer default 0 not null,
+  constraint pk_esoft_del_book primary key (id)
+);
+create sequence esoft_del_book_seq as bigint  start with 1  increment by 50;
+
+create table esoft_del_book_esoft_del_user (
+  esoft_del_book_id             numeric(19) not null,
+  esoft_del_user_id             numeric(19) not null,
+  constraint pk_esoft_del_book_esoft_del_user primary key (esoft_del_book_id,esoft_del_user_id)
+);
+
+create table esoft_del_down (
+  id                            numeric(19) not null,
+  esoft_del_mid_id              numeric(19) not null,
+  down                          nvarchar(255),
+  version                       numeric(19) not null,
+  deleted                       integer default 0 not null,
+  constraint pk_esoft_del_down primary key (id)
+);
+create sequence esoft_del_down_seq as bigint  start with 1  increment by 50;
+
+create table esoft_del_mid (
+  id                            numeric(19) not null,
+  top_id                        numeric(19),
+  mid                           nvarchar(255),
+  up_id                         numeric(19),
+  version                       numeric(19) not null,
+  deleted                       integer default 0 not null,
+  constraint pk_esoft_del_mid primary key (id)
+);
+create sequence esoft_del_mid_seq as bigint  start with 1  increment by 50;
+
+create table esoft_del_one_a (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  oneb_id                       numeric(19),
+  deleted                       integer default 0 not null,
+  version                       numeric(19) not null,
+  constraint pk_esoft_del_one_a primary key (id)
+);
+create unique nonclustered index uq_esoft_del_one_a_oneb_id on esoft_del_one_a(oneb_id) where oneb_id is not null;
+create sequence esoft_del_one_a_seq as bigint  start with 1  increment by 50;
+
+create table esoft_del_one_b (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_esoft_del_one_b primary key (id)
+);
+create sequence esoft_del_one_b_seq as bigint  start with 1  increment by 50;
+
+create table esoft_del_role (
+  id                            numeric(19) not null,
+  role_name                     nvarchar(255),
+  version                       numeric(19) not null,
+  deleted                       integer default 0 not null,
+  constraint pk_esoft_del_role primary key (id)
+);
+create sequence esoft_del_role_seq as bigint  start with 1  increment by 50;
+
+create table esoft_del_role_esoft_del_user (
+  esoft_del_role_id             numeric(19) not null,
+  esoft_del_user_id             numeric(19) not null,
+  constraint pk_esoft_del_role_esoft_del_user primary key (esoft_del_role_id,esoft_del_user_id)
+);
+
+create table esoft_del_top (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  deleted                       integer default 0 not null,
+  constraint pk_esoft_del_top primary key (id)
+);
+create sequence esoft_del_top_seq as bigint  start with 1  increment by 50;
+
+create table esoft_del_up (
+  id                            numeric(19) not null,
+  up                            nvarchar(255),
+  version                       numeric(19) not null,
+  deleted                       integer default 0 not null,
+  constraint pk_esoft_del_up primary key (id)
+);
+create sequence esoft_del_up_seq as bigint  start with 1  increment by 50;
+
+create table esoft_del_user (
+  id                            numeric(19) not null,
+  user_name                     nvarchar(255),
+  version                       numeric(19) not null,
+  deleted                       integer default 0 not null,
+  constraint pk_esoft_del_user primary key (id)
+);
+create sequence esoft_del_user_seq as bigint  start with 1  increment by 50;
+
+create table esoft_del_user_esoft_del_role (
+  esoft_del_user_id             numeric(19) not null,
+  esoft_del_role_id             numeric(19) not null,
+  constraint pk_esoft_del_user_esoft_del_role primary key (esoft_del_user_id,esoft_del_role_id)
+);
+
+create table esome_convert_type (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  money                         numeric(28),
+  constraint pk_esome_convert_type primary key (id)
+);
+create sequence esome_convert_type_seq as bigint  start with 1  increment by 50;
+
+create table esome_type (
+  id                            integer not null,
+  currency                      nvarchar(3),
+  locale                        nvarchar(20),
+  time_zone                     nvarchar(20),
+  constraint pk_esome_type primary key (id)
+);
+create sequence esome_type_seq as bigint  start with 1  increment by 50;
+
+create table etrans_many (
+  id                            integer not null,
+  name                          nvarchar(255),
+  constraint pk_etrans_many primary key (id)
+);
+create sequence etrans_many_seq as bigint  start with 1  increment by 50;
+
+create table rawinherit_uncle (
+  id                            integer not null,
+  name                          nvarchar(255),
+  parent_id                     numeric(19) not null,
+  version                       numeric(19) not null,
+  constraint pk_rawinherit_uncle primary key (id)
+);
+create sequence rawinherit_uncle_seq as bigint  start with 1  increment by 50;
+
+create table evanilla_collection (
+  id                            integer not null,
+  name                          nvarchar(255),
+  constraint pk_evanilla_collection primary key (id)
+);
+create sequence evanilla_collection_seq as bigint  start with 1  increment by 50;
+
+create table evanilla_collection_detail (
+  id                            integer not null,
+  evanilla_collection_id        integer not null,
+  something                     nvarchar(255),
+  constraint pk_evanilla_collection_detail primary key (id)
+);
+create sequence evanilla_collection_detail_seq as bigint  start with 1  increment by 50;
+
+create table ewho_props (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  who_created                   nvarchar(255) not null,
+  who_modified                  nvarchar(255) not null,
+  constraint pk_ewho_props primary key (id)
+);
+create sequence ewho_props_seq as bigint  start with 1  increment by 50;
+
+create table e_withinet (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  inet_address                  nvarchar(50),
+  version                       numeric(19) not null,
+  constraint pk_e_withinet primary key (id)
+);
+create sequence e_withinet_seq as bigint  start with 1  increment by 50;
+
+create table td_child (
+  child_id                      integer not null,
+  child_name                    nvarchar(255),
+  parent_id                     integer not null,
+  constraint pk_td_child primary key (child_id)
+);
+create sequence td_child_seq as bigint  start with 1  increment by 50;
+
+create table td_parent (
+  parent_type                   nvarchar(31) not null,
+  parent_id                     integer not null,
+  parent_name                   nvarchar(255),
+  extended_name                 nvarchar(255),
+  constraint pk_td_parent primary key (parent_id)
+);
+create sequence td_parent_seq as bigint  start with 1  increment by 50;
+
+create table empl (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  age                           integer,
+  default_address_id            numeric(19),
+  constraint pk_empl primary key (id)
+);
+create sequence empl_seq as bigint  start with 1  increment by 50;
+
+create table feature_desc (
+  id                            integer not null,
+  name                          nvarchar(255),
+  description                   nvarchar(255),
+  constraint pk_feature_desc primary key (id)
+);
+create sequence feature_desc_seq as bigint  start with 1  increment by 50;
+
+create table f_first (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_f_first primary key (id)
+);
+create sequence f_first_seq as bigint  start with 1  increment by 50;
+
+create table foo (
+  foo_id                        integer not null,
+  important_text                nvarchar(255),
+  version                       integer not null,
+  constraint pk_foo primary key (foo_id)
+);
+create sequence foo_seq as bigint  start with 1  increment by 50;
+
+create table gen_key_identity (
+  id                            numeric(19) identity(1,1) not null,
+  description                   nvarchar(255),
+  constraint pk_gen_key_identity primary key (id)
+);
+
+create table gen_key_sequence (
+  id                            numeric(19) not null,
+  description                   nvarchar(255),
+  constraint pk_gen_key_sequence primary key (id)
+);
+create sequence SEQ as bigint  start with 1  increment by 50;
+
+create table gen_key_table (
+  id                            numeric(19) not null,
+  description                   nvarchar(255),
+  constraint pk_gen_key_table primary key (id)
+);
+create sequence gen_key_table_seq as bigint  start with 1  increment by 50;
+
+create table grand_parent_person (
+  identifier                    integer not null,
+  name                          nvarchar(255),
+  age                           integer,
+  some_bean_id                  integer,
+  family_name                   nvarchar(255),
+  address                       nvarchar(255),
+  constraint pk_grand_parent_person primary key (identifier)
+);
+create sequence grand_parent_person_seq as bigint  start with 1  increment by 50;
+
+create table survey_group (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  categoryobjectid              numeric(19),
+  sequence_number               integer not null,
+  constraint pk_survey_group primary key (id)
+);
+create sequence survey_group_seq as bigint  start with 1  increment by 50;
+
+create table c_group (
+  id                            numeric(19) not null,
+  inactive                      integer default 0 not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_c_group primary key (id)
+);
+create sequence c_group_seq as bigint  start with 1  increment by 50;
+
+create table he_doc (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_he_doc primary key (id)
+);
+create sequence he_doc_seq as bigint  start with 1  increment by 50;
+
+create table hx_link (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  location                      nvarchar(255),
+  comments                      nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_hx_link primary key (id)
+);
+create sequence hx_link_seq as bigint  start with 1  increment by 50;
+
+create table hx_link_doc (
+  hx_link_id                    numeric(19) not null,
+  he_doc_id                     numeric(19) not null,
+  constraint pk_hx_link_doc primary key (hx_link_id,he_doc_id)
+);
+
+create table hi_doc (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_hi_doc primary key (id)
+);
+create sequence hi_doc_seq as bigint  start with 1  increment by 50;
+
+create table hi_link (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  location                      nvarchar(255),
+  comments                      nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_hi_link primary key (id)
+);
+create sequence hi_link_seq as bigint  start with 1  increment by 50;
+
+create table hi_link_doc (
+  hi_link_id                    numeric(19) not null,
+  hi_doc_id                     numeric(19) not null,
+  constraint pk_hi_link_doc primary key (hi_link_id,hi_doc_id)
+);
+
+create table imrelated (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  owner_id                      numeric(19) not null,
+  constraint pk_imrelated primary key (id)
+);
+create sequence imrelated_seq as bigint  start with 1  increment by 50;
+
+create table imroot (
+  dtype                         nvarchar(31) not null,
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  title                         nvarchar(255),
+  when_title                    datetime2,
+  constraint pk_imroot primary key (id)
+);
+create sequence imroot_seq as bigint  start with 1  increment by 50;
+
+create table ixresource (
+  dtype                         nvarchar(255),
+  id                            nvarchar(40) not null,
+  name                          nvarchar(255),
+  constraint pk_ixresource primary key (id)
+);
+
+create table info_company (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_info_company primary key (id)
+);
+create sequence info_company_seq as bigint  start with 1  increment by 50;
+
+create table info_contact (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  company_id                    numeric(19) not null,
+  version                       numeric(19) not null,
+  constraint pk_info_contact primary key (id)
+);
+create sequence info_contact_seq as bigint  start with 1  increment by 50;
+
+create table info_customer (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  company_id                    numeric(19),
+  version                       numeric(19) not null,
+  constraint pk_info_customer primary key (id)
+);
+create unique nonclustered index uq_info_customer_company_id on info_customer(company_id) where company_id is not null;
+create sequence info_customer_seq as bigint  start with 1  increment by 50;
+
+create table inner_report (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  forecast_id                   numeric(19),
+  constraint pk_inner_report primary key (id)
+);
+create unique nonclustered index uq_inner_report_forecast_id on inner_report(forecast_id) where forecast_id is not null;
+create sequence inner_report_seq as bigint  start with 1  increment by 50;
+
+create table drel_invoice (
+  id                            numeric(19) not null,
+  booking                       numeric(19),
+  version                       integer not null,
+  constraint pk_drel_invoice primary key (id)
+);
+create sequence drel_invoice_seq as bigint  start with 1  increment by 50;
+
+create table item (
+  customer                      integer not null,
+  itemnumber                    nvarchar(127) not null,
+  description                   nvarchar(255),
+  units                         nvarchar(255),
+  type                          integer not null,
+  region                        integer not null,
+  date_modified                 datetime2,
+  date_created                  datetime2,
+  modified_by                   nvarchar(255),
+  created_by                    nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_item primary key (customer,itemnumber)
+);
+
+create table monkey (
+  mid                           numeric(19) not null,
+  name                          nvarchar(255),
+  food_preference               nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_monkey primary key (mid)
+);
+create sequence monkey_seq as bigint  start with 1  increment by 50;
+
+create table trainer (
+  tid                           numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_trainer primary key (tid)
+);
+create sequence trainer_seq as bigint  start with 1  increment by 50;
+
+create table trainer_monkey (
+  trainer_tid                   numeric(19) not null,
+  monkey_mid                    numeric(19) not null,
+  constraint uq_trainer_monkey_mid unique (monkey_mid),
+  constraint pk_trainer_monkey primary key (trainer_tid,monkey_mid)
+);
+
+create table troop (
+  pid                           numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_troop primary key (pid)
+);
+create sequence troop_seq as bigint  start with 1  increment by 50;
+
+create table troop_monkey (
+  troop_pid                     numeric(19) not null,
+  monkey_mid                    numeric(19) not null,
+  constraint uq_troop_monkey_mid unique (monkey_mid),
+  constraint pk_troop_monkey primary key (troop_pid,monkey_mid)
+);
+
+create table l2_cldf_reset_bean (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_l2_cldf_reset_bean primary key (id)
+);
+create sequence l2_cldf_reset_bean_seq as bigint  start with 1  increment by 50;
+
+create table l2_cldf_reset_bean_child (
+  id                            numeric(19) not null,
+  parent_id                     numeric(19),
+  constraint pk_l2_cldf_reset_bean_child primary key (id)
+);
+create sequence l2_cldf_reset_bean_child_seq as bigint  start with 1  increment by 50;
+
+create table level1 (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_level1 primary key (id)
+);
+create sequence level1_seq as bigint  start with 1  increment by 50;
+
+create table level1_level4 (
+  level1_id                     numeric(19) not null,
+  level4_id                     numeric(19) not null,
+  constraint pk_level1_level4 primary key (level1_id,level4_id)
+);
+
+create table level1_level2 (
+  level1_id                     numeric(19) not null,
+  level2_id                     numeric(19) not null,
+  constraint pk_level1_level2 primary key (level1_id,level2_id)
+);
+
+create table level2 (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_level2 primary key (id)
+);
+create sequence level2_seq as bigint  start with 1  increment by 50;
+
+create table level2_level3 (
+  level2_id                     numeric(19) not null,
+  level3_id                     numeric(19) not null,
+  constraint pk_level2_level3 primary key (level2_id,level3_id)
+);
+
+create table level3 (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_level3 primary key (id)
+);
+create sequence level3_seq as bigint  start with 1  increment by 50;
+
+create table level4 (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_level4 primary key (id)
+);
+create sequence level4_seq as bigint  start with 1  increment by 50;
+
+create table link (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  location                      nvarchar(255),
+  when_publish                  datetime2,
+  link_comment                  nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  deleted                       integer default 0 not null,
+  constraint pk_link primary key (id)
+);
+create sequence link_seq as bigint  start with 1  increment by 50;
+
+create table link_draft (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  location                      nvarchar(255),
+  when_publish                  datetime2,
+  link_comment                  nvarchar(255),
+  dirty                         integer default 0 not null,
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  deleted                       integer default 0 not null,
+  constraint pk_link_draft primary key (id)
+);
+create sequence link_draft_seq as bigint  start with 1 ;
+
+create table la_attr_value (
+  id                            integer not null,
+  name                          nvarchar(255),
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  constraint pk_la_attr_value primary key (id)
+);
+create sequence la_attr_value_seq as bigint  start with 1  increment by 50;
+
+create table la_attr_value_attribute (
+  la_attr_value_id              integer not null,
+  attribute_id                  integer not null,
+  constraint pk_la_attr_value_attribute primary key (la_attr_value_id,attribute_id)
+);
+
+create table mmedia (
+  type                          nvarchar(31) not null,
+  id                            numeric(19) not null,
+  url                           nvarchar(255),
+  note                          nvarchar(255),
+  constraint pk_mmedia primary key (id)
+);
+create sequence mmedia_seq as bigint  start with 1  increment by 50;
+
+create table non_updateprop (
+  id                            integer not null,
+  non_enum                      nvarchar(5),
+  name                          nvarchar(255),
+  note                          nvarchar(255),
+  constraint ck_non_updateprop_non_enum check ( non_enum in ('BEGIN','END')),
+  constraint pk_non_updateprop primary key (id)
+);
+create sequence non_updateprop_seq as bigint  start with 1  increment by 50;
+
+create table mprinter (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  flags                         numeric(19) not null,
+  current_state_id              numeric(19),
+  last_swap_cyan_id             numeric(19),
+  last_swap_magenta_id          numeric(19),
+  last_swap_yellow_id           numeric(19),
+  last_swap_black_id            numeric(19),
+  version                       numeric(19) not null,
+  constraint pk_mprinter primary key (id)
+);
+create unique nonclustered index uq_mprinter_last_swap_cyan_id on mprinter(last_swap_cyan_id) where last_swap_cyan_id is not null;
+create unique nonclustered index uq_mprinter_last_swap_magenta_id on mprinter(last_swap_magenta_id) where last_swap_magenta_id is not null;
+create unique nonclustered index uq_mprinter_last_swap_yellow_id on mprinter(last_swap_yellow_id) where last_swap_yellow_id is not null;
+create unique nonclustered index uq_mprinter_last_swap_black_id on mprinter(last_swap_black_id) where last_swap_black_id is not null;
+create sequence mprinter_seq as bigint  start with 1  increment by 50;
+
+create table mprinter_state (
+  id                            numeric(19) not null,
+  flags                         numeric(19) not null,
+  printer_id                    numeric(19),
+  version                       numeric(19) not null,
+  constraint pk_mprinter_state primary key (id)
+);
+create sequence mprinter_state_seq as bigint  start with 1  increment by 50;
+
+create table mprofile (
+  id                            numeric(19) not null,
+  picture_id                    numeric(19),
+  name                          nvarchar(255),
+  constraint pk_mprofile primary key (id)
+);
+create sequence mprofile_seq as bigint  start with 1  increment by 50;
+
+create table mprotected_construct_bean (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_mprotected_construct_bean primary key (id)
+);
+create sequence mprotected_construct_bean_seq as bigint  start with 1  increment by 50;
+
+create table mrole (
+  roleid                        integer not null,
+  role_name                     nvarchar(255),
+  constraint pk_mrole primary key (roleid)
+);
+create sequence mrole_seq as bigint  start with 1  increment by 50;
+
+create table mrole_muser (
+  mrole_roleid                  integer not null,
+  muser_userid                  integer not null,
+  constraint pk_mrole_muser primary key (mrole_roleid,muser_userid)
+);
+
+create table msome_other (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_msome_other primary key (id)
+);
+create sequence msome_other_seq as bigint  start with 1  increment by 50;
+
+create table muser (
+  userid                        integer not null,
+  user_name                     nvarchar(255),
+  user_type_id                  integer,
+  constraint pk_muser primary key (userid)
+);
+create sequence muser_seq as bigint  start with 1  increment by 50;
+
+create table muser_type (
+  id                            integer not null,
+  name                          nvarchar(255),
+  constraint pk_muser_type primary key (id)
+);
+create sequence muser_type_seq as bigint  start with 1  increment by 50;
+
+create table mail_box (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_mail_box primary key (id)
+);
+create sequence mail_box_seq as bigint  start with 1  increment by 50;
+
+create table mail_user (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_mail_user primary key (id)
+);
+create sequence mail_user_seq as bigint  start with 1  increment by 50;
+
+create table mail_user_inbox (
+  mail_user_id                  numeric(19) not null,
+  mail_box_id                   numeric(19) not null,
+  constraint pk_mail_user_inbox primary key (mail_user_id,mail_box_id)
+);
+
+create table mail_user_outbox (
+  mail_user_id                  numeric(19) not null,
+  mail_box_id                   numeric(19) not null,
+  constraint pk_mail_user_outbox primary key (mail_user_id,mail_box_id)
+);
+
+create table map_super_actual (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  when_created                  datetime2 not null,
+  when_updated                  datetime2 not null,
+  constraint pk_map_super_actual primary key (id)
+);
+create sequence map_super_actual_seq as bigint  start with 1  increment by 50;
+
+create table c_message (
+  id                            numeric(19) not null,
+  title                         nvarchar(255),
+  body                          nvarchar(255),
+  conversation_id               numeric(19),
+  user_id                       numeric(19),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_c_message primary key (id)
+);
+create sequence c_message_seq as bigint  start with 1  increment by 50;
+
+create table mnoc_role (
+  role_id                       integer not null,
+  role_name                     nvarchar(255),
+  version                       integer not null,
+  constraint pk_mnoc_role primary key (role_id)
+);
+create sequence mnoc_role_seq as bigint  start with 1  increment by 50;
+
+create table mnoc_user (
+  user_id                       integer not null,
+  user_name                     nvarchar(255),
+  version                       integer not null,
+  constraint pk_mnoc_user primary key (user_id)
+);
+create sequence mnoc_user_seq as bigint  start with 1  increment by 50;
+
+create table mnoc_user_mnoc_role (
+  mnoc_user_user_id             integer not null,
+  mnoc_role_role_id             integer not null,
+  constraint pk_mnoc_user_mnoc_role primary key (mnoc_user_user_id,mnoc_role_role_id)
+);
+
+create table mny_a (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_mny_a primary key (id)
+);
+create sequence mny_a_seq as bigint  start with 1  increment by 50;
+
+create table mny_b (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  a_id                          numeric(19),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_mny_b primary key (id)
+);
+create sequence mny_b_seq as bigint  start with 1  increment by 50;
+
+create table mny_b_mny_c (
+  mny_b_id                      numeric(19) not null,
+  mny_c_id                      numeric(19) not null,
+  constraint pk_mny_b_mny_c primary key (mny_b_id,mny_c_id)
+);
+
+create table mny_c (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_mny_c primary key (id)
+);
+create sequence mny_c_seq as bigint  start with 1  increment by 50;
+
+create table mny_topic (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_mny_topic primary key (id)
+);
+create sequence mny_topic_seq as bigint  start with 1  increment by 50;
+
+create table subtopics (
+  topic                         numeric(19) not null,
+  subtopic                      numeric(19) not null,
+  constraint pk_subtopics primary key (topic,subtopic)
+);
+
+create table mp_role (
+  id                            numeric(19) not null,
+  mp_user_id                    numeric(19) not null,
+  code                          nvarchar(255),
+  organization_id               numeric(19),
+  constraint pk_mp_role primary key (id)
+);
+create sequence mp_role_seq as bigint  start with 1  increment by 50;
+
+create table mp_user (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_mp_user primary key (id)
+);
+create sequence mp_user_seq as bigint  start with 1  increment by 50;
+
+create table ms_many_a (
+  aid                           numeric(19) not null,
+  name                          nvarchar(255),
+  ms_many_a_many_b              integer default 0 not null,
+  ms_many_b                     integer default 0 not null,
+  deleted                       integer default 0 not null,
+  constraint pk_ms_many_a primary key (aid)
+);
+create sequence ms_many_a_seq as bigint  start with 1  increment by 50;
+
+create table ms_many_a_many_b (
+  ms_many_a_aid                 numeric(19) not null,
+  ms_many_b_bid                 numeric(19) not null,
+  constraint pk_ms_many_a_many_b primary key (ms_many_a_aid,ms_many_b_bid)
+);
+
+create table ms_many_b (
+  bid                           numeric(19) not null,
+  name                          nvarchar(255),
+  deleted                       integer default 0 not null,
+  constraint pk_ms_many_b primary key (bid)
+);
+create sequence ms_many_b_seq as bigint  start with 1  increment by 50;
+
+create table ms_many_b_many_a (
+  ms_many_b_bid                 numeric(19) not null,
+  ms_many_a_aid                 numeric(19) not null,
+  constraint pk_ms_many_b_many_a primary key (ms_many_b_bid,ms_many_a_aid)
+);
+
+create table my_lob_size (
+  id                            integer not null,
+  name                          nvarchar(255),
+  my_count                      integer not null,
+  my_lob                        nvarchar(max),
+  constraint pk_my_lob_size primary key (id)
+);
+create sequence my_lob_size_seq as bigint  start with 1  increment by 50;
+
+create table my_lob_size_join_many (
+  id                            integer not null,
+  something                     nvarchar(255),
+  other                         nvarchar(255),
+  parent_id                     integer,
+  constraint pk_my_lob_size_join_many primary key (id)
+);
+create sequence my_lob_size_join_many_seq as bigint  start with 1  increment by 50;
+
+create table noidbean (
+  name                          nvarchar(255),
+  subject                       nvarchar(255),
+  when_created                  datetime2 not null
+);
+
+create table o_cached_bean (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_o_cached_bean primary key (id)
+);
+create sequence o_cached_bean_seq as bigint  start with 1  increment by 50;
+
+create table o_cached_bean_country (
+  o_cached_bean_id              numeric(19) not null,
+  o_country_code                nvarchar(2) not null,
+  constraint pk_o_cached_bean_country primary key (o_cached_bean_id,o_country_code)
+);
+
+create table o_cached_bean_child (
+  id                            numeric(19) not null,
+  cached_bean_id                numeric(19),
+  constraint pk_o_cached_bean_child primary key (id)
+);
+create sequence o_cached_bean_child_seq as bigint  start with 1  increment by 50;
+
+create table o_cached_natkey (
+  id                            numeric(19) not null,
+  store                         nvarchar(255),
+  sku                           nvarchar(255),
+  description                   nvarchar(255),
+  constraint pk_o_cached_natkey primary key (id)
+);
+create sequence o_cached_natkey_seq as bigint  start with 1  increment by 50;
+
+create table o_cached_natkey3 (
+  id                            numeric(19) not null,
+  store                         nvarchar(255),
+  code                          integer not null,
+  sku                           nvarchar(255),
+  description                   nvarchar(255),
+  constraint pk_o_cached_natkey3 primary key (id)
+);
+create sequence o_cached_natkey3_seq as bigint  start with 1  increment by 50;
+
+create table ocar (
+  id                            integer not null,
+  vin                           nvarchar(255),
+  name                          nvarchar(255),
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  constraint pk_ocar primary key (id)
+);
+create sequence ocar_seq as bigint  start with 1  increment by 50;
+
+create table ocompany (
+  id                            integer not null,
+  corp_id                       nvarchar(50),
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  constraint pk_ocompany primary key (id)
+);
+create unique nonclustered index uq_ocompany_corp_id on ocompany(corp_id) where corp_id is not null;
+create sequence ocompany_seq as bigint  start with 1  increment by 50;
+
+create table oengine (
+  engine_id                     nvarchar(40) not null,
+  short_desc                    nvarchar(255),
+  car_id                        integer,
+  version                       integer not null,
+  constraint pk_oengine primary key (engine_id)
+);
+create unique nonclustered index uq_oengine_car_id on oengine(car_id) where car_id is not null;
+
+create table ogear_box (
+  id                            nvarchar(40) not null,
+  box_desc                      nvarchar(255),
+  box_size                      integer,
+  car_id                        integer,
+  version                       integer not null,
+  constraint pk_ogear_box primary key (id)
+);
+create unique nonclustered index uq_ogear_box_car_id on ogear_box(car_id) where car_id is not null;
+
+create table oroad_show_msg (
+  id                            integer not null,
+  company_id                    integer not null,
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  constraint uq_oroad_show_msg_company_id unique (company_id),
+  constraint pk_oroad_show_msg primary key (id)
+);
+create sequence oroad_show_msg_seq as bigint  start with 1  increment by 50;
+
+create table om_ordered_detail (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  master_id                     numeric(19),
+  version                       numeric(19) not null,
+  sort_order                    integer,
+  constraint pk_om_ordered_detail primary key (id)
+);
+create sequence om_ordered_detail_seq as bigint  start with 1  increment by 50;
+
+create table om_ordered_master (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_om_ordered_master primary key (id)
+);
+create sequence om_ordered_master_seq as bigint  start with 1  increment by 50;
+
+create table o_order (
+  id                            integer not null,
+  status                        integer,
+  order_date                    date,
+  ship_date                     date,
+  kcustomer_id                  integer not null,
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  constraint ck_o_order_status check ( status in (0,1,2,3)),
+  constraint pk_o_order primary key (id)
+);
+create sequence o_order_seq as bigint  start with 1  increment by 50;
+
+create table o_order_detail (
+  id                            integer not null,
+  order_id                      integer not null,
+  order_qty                     integer,
+  ship_qty                      integer,
+  unit_price                    float(32),
+  product_id                    integer,
+  cretime                       datetime2,
+  updtime                       datetime2 not null,
+  constraint pk_o_order_detail primary key (id)
+);
+create sequence o_order_detail_seq as bigint  start with 1  increment by 50;
+
+create table s_orders (
+  uuid                          nvarchar(40) not null,
+  constraint pk_s_orders primary key (uuid)
+);
+
+create table s_order_items (
+  uuid                          nvarchar(40) not null,
+  product_variant_uuid          nvarchar(255),
+  order_uuid                    nvarchar(40),
+  quantity                      integer not null,
+  amount                        numeric(28),
+  constraint pk_s_order_items primary key (uuid)
+);
+
+create table or_order_ship (
+  id                            integer not null,
+  order_id                      integer,
+  ship_time                     datetime2,
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  constraint pk_or_order_ship primary key (id)
+);
+create sequence or_order_ship_seq as bigint  start with 1  increment by 50;
+
+create table organisation (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_organisation primary key (id)
+);
+create sequence organisation_seq as bigint  start with 1  increment by 50;
+
+create table oto_bchild (
+  master_id                     numeric(19) not null,
+  child                         nvarchar(255),
+  constraint pk_oto_bchild primary key (master_id)
+);
+create sequence oto_bchild_seq as bigint  start with 1  increment by 50;
+
+create table oto_bmaster (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_oto_bmaster primary key (id)
+);
+create sequence oto_bmaster_seq as bigint  start with 1  increment by 50;
+
+create table oto_child (
+  id                            integer not null,
+  name                          nvarchar(255),
+  master_id                     numeric(19),
+  constraint pk_oto_child primary key (id)
+);
+create unique nonclustered index uq_oto_child_master_id on oto_child(master_id) where master_id is not null;
+create sequence oto_child_seq as bigint  start with 1  increment by 50;
+
+create table oto_cust (
+  cid                           numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_oto_cust primary key (cid)
+);
+create sequence oto_cust_seq as bigint  start with 1  increment by 50;
+
+create table oto_cust_address (
+  aid                           numeric(19) not null,
+  line1                         nvarchar(255),
+  line2                         nvarchar(255),
+  line3                         nvarchar(255),
+  customer_cid                  numeric(19),
+  version                       numeric(19) not null,
+  constraint pk_oto_cust_address primary key (aid)
+);
+create unique nonclustered index uq_oto_cust_address_customer_cid on oto_cust_address(customer_cid) where customer_cid is not null;
+create sequence oto_cust_address_seq as bigint  start with 1  increment by 50;
+
+create table oto_master (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_oto_master primary key (id)
+);
+create sequence oto_master_seq as bigint  start with 1  increment by 50;
+
+create table oto_prime (
+  pid                           numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_oto_prime primary key (pid)
+);
+create sequence oto_prime_seq as bigint  start with 1  increment by 50;
+
+create table oto_prime_extra (
+  eid                           numeric(19) not null,
+  extra                         nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_oto_prime_extra primary key (eid)
+);
+
+create table oto_th_many (
+  id                            numeric(19) not null,
+  oto_th_top_id                 numeric(19) not null,
+  many                          nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_oto_th_many primary key (id)
+);
+create sequence oto_th_many_seq as bigint  start with 1  increment by 50;
+
+create table oto_th_one (
+  id                            numeric(19) not null,
+  one                           integer default 0 not null,
+  many_id                       numeric(19),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_oto_th_one primary key (id)
+);
+create unique nonclustered index uq_oto_th_one_many_id on oto_th_one(many_id) where many_id is not null;
+create sequence oto_th_one_seq as bigint  start with 1  increment by 50;
+
+create table oto_th_top (
+  id                            numeric(19) not null,
+  topp                          nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_oto_th_top primary key (id)
+);
+create sequence oto_th_top_seq as bigint  start with 1  increment by 50;
+
+create table oto_ubprime (
+  pid                           nvarchar(40) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_oto_ubprime primary key (pid)
+);
+
+create table oto_ubprime_extra (
+  eid                           nvarchar(40) not null,
+  extra                         nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_oto_ubprime_extra primary key (eid)
+);
+
+create table oto_uprime (
+  pid                           nvarchar(40) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_oto_uprime primary key (pid)
+);
+
+create table oto_uprime_extra (
+  eid                           nvarchar(40) not null,
+  extra                         nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_oto_uprime_extra primary key (eid)
+);
+
+create table pfile (
+  id                            integer not null,
+  name                          nvarchar(255),
+  file_content_id               integer,
+  file_content2_id              integer,
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  constraint pk_pfile primary key (id)
+);
+create unique nonclustered index uq_pfile_file_content_id on pfile(file_content_id) where file_content_id is not null;
+create unique nonclustered index uq_pfile_file_content2_id on pfile(file_content2_id) where file_content2_id is not null;
+create sequence pfile_seq as bigint  start with 1  increment by 50;
+
+create table pfile_content (
+  id                            integer not null,
+  content                       image,
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  constraint pk_pfile_content primary key (id)
+);
+create sequence pfile_content_seq as bigint  start with 1  increment by 50;
+
+create table paggview (
+  pview_id                      nvarchar(40),
+  amount                        integer not null
+);
+create unique nonclustered index uq_paggview_pview_id on paggview(pview_id) where pview_id is not null;
+
+create table pallet_location (
+  type                          nvarchar(31) not null,
+  id                            integer not null,
+  zone_sid                      integer not null,
+  attribute                     nvarchar(255),
+  constraint pk_pallet_location primary key (id)
+);
+create sequence pallet_location_seq as bigint  start with 1  increment by 50;
+
+create table parcel (
+  parcelid                      numeric(19) not null,
+  description                   nvarchar(255),
+  constraint pk_parcel primary key (parcelid)
+);
+create sequence parcel_seq as bigint  start with 1  increment by 50;
+
+create table parcel_location (
+  parcellocid                   numeric(19) not null,
+  location                      nvarchar(255),
+  parcelid                      numeric(19),
+  constraint pk_parcel_location primary key (parcellocid)
+);
+create unique nonclustered index uq_parcel_location_parcelid on parcel_location(parcelId) where parcelId is not null;
+create sequence parcel_location_seq as bigint  start with 1  increment by 50;
+
+create table rawinherit_parent (
+  type                          nvarchar(31) not null,
+  id                            numeric(19) not null,
+  val                           integer,
+  more                          nvarchar(255),
+  constraint pk_rawinherit_parent primary key (id)
+);
+create sequence rawinherit_parent_seq as bigint  start with 1  increment by 50;
+
+create table rawinherit_parent_rawinherit_data (
+  rawinherit_parent_id          numeric(19) not null,
+  rawinherit_data_id            numeric(19) not null,
+  constraint pk_rawinherit_parent_rawinherit_data primary key (rawinherit_parent_id,rawinherit_data_id)
+);
+
+create table parent_person (
+  identifier                    integer not null,
+  name                          nvarchar(255),
+  age                           integer,
+  some_bean_id                  integer,
+  parent_identifier             integer,
+  family_name                   nvarchar(255),
+  address                       nvarchar(255),
+  constraint pk_parent_person primary key (identifier)
+);
+create sequence parent_person_seq as bigint  start with 1  increment by 50;
+
+create table c_participation (
+  id                            numeric(19) not null,
+  rating                        integer,
+  type                          integer,
+  conversation_id               numeric(19) not null,
+  user_id                       numeric(19) not null,
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint ck_c_participation_type check ( type in (0,1)),
+  constraint pk_c_participation primary key (id)
+);
+create sequence c_participation_seq as bigint  start with 1  increment by 50;
+
+create table mt_permission (
+  id                            nvarchar(40) not null,
+  name                          nvarchar(255),
+  constraint pk_mt_permission primary key (id)
+);
+
+create table persistent_file (
+  id                            integer not null,
+  name                          nvarchar(255),
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  constraint pk_persistent_file primary key (id)
+);
+create sequence persistent_file_seq as bigint  start with 1  increment by 50;
+
+create table persistent_file_content (
+  id                            integer not null,
+  persistent_file_id            integer,
+  content                       image,
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  constraint pk_persistent_file_content primary key (id)
+);
+create unique nonclustered index uq_persistent_file_content_persistent_file_id on persistent_file_content(persistent_file_id) where persistent_file_id is not null;
+create sequence persistent_file_content_seq as bigint  start with 1  increment by 50;
+
+create table persons (
+  id                            numeric(19) not null,
+  surname                       nvarchar(64) not null,
+  name                          nvarchar(64) not null,
+  constraint pk_persons primary key (id)
+);
+create sequence PERSONS_seq as bigint  start with 1000 increment by 40;
+
+create table person (
+  oid                           numeric(19) not null,
+  default_address_oid           numeric(19),
+  version                       integer not null,
+  constraint pk_person primary key (oid)
+);
+create sequence person_seq as bigint  start with 1  increment by 50;
+
+create table phones (
+  id                            numeric(19) not null,
+  phone_number                  nvarchar(7) not null,
+  person_id                     numeric(19) not null,
+  constraint uq_phones_phone_number unique (phone_number),
+  constraint pk_phones primary key (id)
+);
+create sequence PHONES_seq as bigint  start with 1  increment by 50;
+
+create table primary_revision (
+  id                            numeric(19) not null,
+  revision                      integer not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_primary_revision primary key (id,revision)
+);
+
+create table o_product (
+  id                            integer not null,
+  sku                           nvarchar(20),
+  name                          nvarchar(255),
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  constraint pk_o_product primary key (id)
+);
+create sequence o_product_seq as bigint  start with 1  increment by 50;
+
+create table pp (
+  id                            nvarchar(40) not null,
+  name                          nvarchar(255),
+  value                         nvarchar(100) not null,
+  constraint pk_pp primary key (id)
+);
+
+create table pp_to_ww (
+  pp_id                         nvarchar(40) not null,
+  ww_id                         nvarchar(40) not null,
+  constraint pk_pp_to_ww primary key (pp_id,ww_id)
+);
+
+create table question (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  groupobjectid                 numeric(19),
+  sequence_number               integer not null,
+  constraint pk_question primary key (id)
+);
+create sequence question_seq as bigint  start with 1  increment by 50;
+
+create table rcustomer (
+  company                       nvarchar(127) not null,
+  name                          nvarchar(127) not null,
+  description                   nvarchar(255),
+  constraint pk_rcustomer primary key (company,name)
+);
+
+create table r_orders (
+  company                       nvarchar(127) not null,
+  order_number                  integer not null,
+  customername                  nvarchar(127),
+  item                          nvarchar(255),
+  constraint pk_r_orders primary key (company,order_number)
+);
+
+create table region (
+  customer                      integer not null,
+  type                          integer not null,
+  description                   nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_region primary key (customer,type)
+);
+
+create table resourcefile (
+  id                            nvarchar(64) not null,
+  parentresourcefileid          nvarchar(64),
+  name                          nvarchar(128) not null,
+  constraint pk_resourcefile primary key (id)
+);
+
+create table em_role (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_em_role primary key (id)
+);
+create sequence em_role_seq as bigint  start with 1  increment by 50;
+
+create table mt_role (
+  id                            nvarchar(40) not null,
+  name                          nvarchar(50),
+  tenant_id                     nvarchar(40),
+  version                       numeric(19) not null,
+  constraint pk_mt_role primary key (id)
+);
+
+create table mt_role_permission (
+  mt_role_id                    nvarchar(40) not null,
+  mt_permission_id              nvarchar(40) not null,
+  constraint pk_mt_role_permission primary key (mt_role_id,mt_permission_id)
+);
+
+create table f_second (
+  id                            numeric(19) not null,
+  mod_name                      nvarchar(255),
+  first                         numeric(19),
+  title                         nvarchar(255),
+  constraint pk_f_second primary key (id)
+);
+create unique nonclustered index uq_f_second_first on f_second(first) where first is not null;
+create sequence f_second_seq as bigint  start with 1  increment by 50;
+
+create table section (
+  id                            integer not null,
+  article_id                    integer,
+  type                          integer,
+  content                       nvarchar(max),
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  constraint ck_section_type check ( type in (0,1)),
+  constraint pk_section primary key (id)
+);
+create sequence section_seq as bigint  start with 1  increment by 50;
+
+create table self_parent (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  parent_id                     numeric(19),
+  version                       numeric(19) not null,
+  constraint pk_self_parent primary key (id)
+);
+create sequence self_parent_seq as bigint  start with 1  increment by 50;
+
+create table self_ref_customer (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  referred_by_id                numeric(19),
+  constraint pk_self_ref_customer primary key (id)
+);
+create sequence self_ref_customer_seq as bigint  start with 1  increment by 50;
+
+create table self_ref_example (
+  id                            numeric(19) not null,
+  name                          nvarchar(255) not null,
+  parent_id                     numeric(19),
+  constraint pk_self_ref_example primary key (id)
+);
+create sequence self_ref_example_seq as bigint  start with 1  increment by 50;
+
+create table some_enum_bean (
+  id                            numeric(19) not null,
+  some_enum                     integer,
+  name                          nvarchar(255),
+  constraint ck_some_enum_bean_some_enum check ( some_enum in (0,1)),
+  constraint pk_some_enum_bean primary key (id)
+);
+create sequence some_enum_bean_seq as bigint  start with 1  increment by 50;
+
+create table some_file_bean (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  content                       image,
+  version                       numeric(19) not null,
+  constraint pk_some_file_bean primary key (id)
+);
+create sequence some_file_bean_seq as bigint  start with 1  increment by 50;
+
+create table some_new_types_bean (
+  id                            numeric(19) not null,
+  dow                           integer,
+  mth                           integer,
+  yr                            integer,
+  yr_mth                        date,
+  local_date                    date,
+  local_date_time               datetime2,
+  offset_date_time              datetime2,
+  zoned_date_time               datetime2,
+  instant                       datetime2,
+  zone_id                       nvarchar(60),
+  zone_offset                   nvarchar(60),
+  path                          nvarchar(255),
+  period                        nvarchar(20),
+  version                       numeric(19) not null,
+  constraint ck_some_new_types_bean_dow check ( dow in (1,2,3,4,5,6,7)),
+  constraint ck_some_new_types_bean_mth check ( mth in (1,2,3,4,5,6,7,8,9,10,11,12)),
+  constraint pk_some_new_types_bean primary key (id)
+);
+create sequence some_new_types_bean_seq as bigint  start with 1  increment by 50;
+
+create table some_period_bean (
+  id                            numeric(19) not null,
+  anniversary                   date,
+  version                       numeric(19) not null,
+  constraint pk_some_period_bean primary key (id)
+);
+create sequence some_period_bean_seq as bigint  start with 1  increment by 50;
+
+create table stockforecast (
+  type                          nvarchar(31) not null,
+  id                            numeric(19) not null,
+  inner_report_id               numeric(19),
+  constraint pk_stockforecast primary key (id)
+);
+create sequence stockforecast_seq as bigint  start with 1  increment by 50;
+
+create table sub_section (
+  id                            integer not null,
+  section_id                    integer,
+  title                         nvarchar(255),
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  constraint pk_sub_section primary key (id)
+);
+create sequence sub_section_seq as bigint  start with 1  increment by 50;
+
+create table sub_type (
+  sub_type_id                   integer not null,
+  description                   nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_sub_type primary key (sub_type_id)
+);
+create sequence sub_type_seq as bigint  start with 1  increment by 50;
+
+create table survey (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_survey primary key (id)
+);
+create sequence survey_seq as bigint  start with 1  increment by 50;
+
+create table tbytes_only (
+  id                            integer not null,
+  content                       image,
+  constraint pk_tbytes_only primary key (id)
+);
+create sequence tbytes_only_seq as bigint  start with 1  increment by 50;
+
+create table tcar (
+  type                          nvarchar(31) not null,
+  plate_no                      nvarchar(32) not null,
+  truckload                     numeric(19),
+  constraint pk_tcar primary key (plate_no)
+);
+
+create table tevent (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_tevent primary key (id)
+);
+create sequence tevent_seq as bigint  start with 1  increment by 50;
+
+create table tevent_many (
+  id                            numeric(19) not null,
+  description                   nvarchar(255),
+  event_id                      numeric(19),
+  units                         integer not null,
+  amount                        float(32) not null,
+  version                       numeric(19) not null,
+  constraint pk_tevent_many primary key (id)
+);
+create sequence tevent_many_seq as bigint  start with 1  increment by 50;
+
+create table tevent_one (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  status                        integer,
+  event_id                      numeric(19),
+  version                       numeric(19) not null,
+  constraint ck_tevent_one_status check ( status in (0,1)),
+  constraint pk_tevent_one primary key (id)
+);
+create unique nonclustered index uq_tevent_one_event_id on tevent_one(event_id) where event_id is not null;
+create sequence tevent_one_seq as bigint  start with 1  increment by 50;
+
+create table tint_root (
+  my_type                       integer not null,
+  id                            integer not null,
+  name                          nvarchar(255),
+  child_property                nvarchar(255),
+  constraint pk_tint_root primary key (id)
+);
+create sequence tint_root_seq as bigint  start with 1  increment by 50;
+
+create table tjoda_entity (
+  id                            integer not null,
+  local_time                    time,
+  constraint pk_tjoda_entity primary key (id)
+);
+create sequence tjoda_entity_seq as bigint  start with 1  increment by 50;
+
+create table t_mapsuper1 (
+  id                            integer not null,
+  something                     nvarchar(255),
+  name                          nvarchar(255),
+  version                       integer not null,
+  constraint pk_t_mapsuper1 primary key (id)
+);
+create sequence t_mapsuper1_seq as bigint  start with 1  increment by 50;
+
+create table t_oneb (
+  id                            integer not null,
+  name                          nvarchar(255),
+  description                   nvarchar(255),
+  active                        integer default 0 not null,
+  constraint pk_t_oneb primary key (id)
+);
+create sequence t_oneb_seq as bigint  start with 1  increment by 50;
+
+create table t_detail_with_other_namexxxyy (
+  id                            integer not null,
+  name                          nvarchar(255),
+  description                   nvarchar(255),
+  some_unique_value             nvarchar(127),
+  active                        integer default 0 not null,
+  master_id                     integer,
+  constraint pk_t_detail_with_other_namexxxyy primary key (id)
+);
+create unique nonclustered index uq_t_detail_with_other_namexxxyy_some_unique_value on t_detail_with_other_namexxxyy(some_unique_value) where some_unique_value is not null;
+create sequence t_atable_detail_seq as bigint  start with 1  increment by 50;
+
+create table ts_detail_two (
+  id                            integer not null,
+  name                          nvarchar(255),
+  description                   nvarchar(255),
+  active                        integer default 0 not null,
+  master_id                     integer,
+  constraint pk_ts_detail_two primary key (id)
+);
+create sequence ts_detail_two_seq as bigint  start with 1  increment by 50;
+
+create table t_atable_thatisrelatively (
+  id                            integer not null,
+  name                          nvarchar(255),
+  description                   nvarchar(255),
+  active                        integer default 0 not null,
+  constraint pk_t_atable_thatisrelatively primary key (id)
+);
+create sequence t_atable_master_seq as bigint  start with 1  increment by 50;
+
+create table ts_master_two (
+  id                            integer not null,
+  name                          nvarchar(255),
+  description                   nvarchar(255),
+  active                        integer default 0 not null,
+  constraint pk_ts_master_two primary key (id)
+);
+create sequence ts_master_two_seq as bigint  start with 1  increment by 50;
+
+create table tuuid_entity (
+  id                            nvarchar(40) not null,
+  name                          nvarchar(255),
+  constraint pk_tuuid_entity primary key (id)
+);
+
+create table twheel (
+  id                            numeric(19) not null,
+  owner_plate_no                nvarchar(32) not null,
+  constraint pk_twheel primary key (id)
+);
+create sequence twheel_seq as bigint  start with 1  increment by 50;
+
+create table twith_pre_insert (
+  id                            integer not null,
+  name                          nvarchar(255) not null,
+  title                         nvarchar(255),
+  constraint pk_twith_pre_insert primary key (id)
+);
+create sequence twith_pre_insert_seq as bigint  start with 1  increment by 50;
+
+create table mt_tenant (
+  id                            nvarchar(40) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_mt_tenant primary key (id)
+);
+
+create table test_annotation_base_entity (
+  direct                        nvarchar(255),
+  meta                          nvarchar(255),
+  mixed                         nvarchar(255),
+  constraint_annotation         nvarchar(40),
+  null1                         nvarchar(255) not null,
+  null2                         nvarchar(255),
+  null3                         nvarchar(255)
+);
+
+create table tire (
+  id                            numeric(19) not null,
+  wheel                         numeric(19),
+  version                       integer not null,
+  constraint pk_tire primary key (id)
+);
+create unique nonclustered index uq_tire_wheel on tire(wheel) where wheel is not null;
+create sequence tire_seq as bigint  start with 1  increment by 50;
+
+create table sa_tire (
+  id                            numeric(19) not null,
+  version                       integer not null,
+  constraint pk_sa_tire primary key (id)
+);
+create sequence sa_tire_seq as bigint  start with 1  increment by 50;
+
+create table trip (
+  id                            integer not null,
+  vehicle_driver_id             integer,
+  destination                   nvarchar(255),
+  address_id                    smallint,
+  star_date                     datetime2,
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  constraint pk_trip primary key (id)
+);
+create sequence trip_seq as bigint  start with 1  increment by 50;
+
+create table truck_ref (
+  id                            integer not null,
+  something                     nvarchar(255),
+  constraint pk_truck_ref primary key (id)
+);
+create sequence truck_ref_seq as bigint  start with 1  increment by 50;
+
+create table type (
+  customer                      integer not null,
+  type                          integer not null,
+  description                   nvarchar(255),
+  sub_type_id                   integer,
+  version                       numeric(19) not null,
+  constraint pk_type primary key (customer,type)
+);
+
+create table tz_bean (
+  id                            numeric(19) not null,
+  moda                          nvarchar(255),
+  ts                            datetime2,
+  tstz                          datetime2,
+  constraint pk_tz_bean primary key (id)
+);
+create sequence tz_bean_seq as bigint  start with 1  increment by 50;
+
+create table ut_detail (
+  id                            integer not null,
+  utmaster_id                   integer not null,
+  name                          nvarchar(255),
+  qty                           integer,
+  amount                        float(32),
+  version                       integer not null,
+  constraint pk_ut_detail primary key (id)
+);
+create sequence ut_detail_seq as bigint  start with 1  increment by 50;
+
+create table ut_master (
+  id                            integer not null,
+  name                          nvarchar(255),
+  description                   nvarchar(255),
+  version                       integer not null,
+  constraint pk_ut_master primary key (id)
+);
+create sequence ut_master_seq as bigint  start with 1  increment by 50;
+
+create table uuone (
+  id                            nvarchar(40) not null,
+  name                          nvarchar(255),
+  constraint pk_uuone primary key (id)
+);
+
+create table uutwo (
+  id                            nvarchar(40) not null,
+  name                          nvarchar(255),
+  master_id                     nvarchar(40),
+  constraint pk_uutwo primary key (id)
+);
+
+create table c_user (
+  id                            numeric(19) not null,
+  inactive                      integer default 0 not null,
+  name                          nvarchar(255),
+  email                         nvarchar(255),
+  password_hash                 nvarchar(255),
+  group_id                      numeric(19),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_c_user primary key (id)
+);
+create sequence c_user_seq as bigint  start with 1  increment by 50;
+
+create table tx_user (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_tx_user primary key (id)
+);
+create sequence tx_user_seq as bigint  start with 1  increment by 50;
+
+create table g_user (
+  id                            numeric(19) not null,
+  username                      nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_g_user primary key (id)
+);
+create sequence g_user_seq as bigint  start with 1  increment by 50;
+
+create table em_user (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_em_user primary key (id)
+);
+create sequence em_user_seq as bigint  start with 1  increment by 50;
+
+create table oto_user (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  account_id                    numeric(19) not null,
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint uq_oto_user_account_id unique (account_id),
+  constraint pk_oto_user primary key (id)
+);
+create sequence oto_user_seq as bigint  start with 1  increment by 50;
+
+create table em_user_role (
+  user_id                       numeric(19) not null,
+  role_id                       numeric(19) not null,
+  constraint pk_em_user_role primary key (user_id,role_id)
+);
+
+create table vehicle (
+  dtype                         nvarchar(3) not null,
+  id                            integer not null,
+  license_number                nvarchar(255),
+  registration_date             datetime2,
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  siz                           nvarchar(1),
+  driver                        nvarchar(255),
+  car_ref_id                    integer,
+  notes                         nvarchar(255),
+  truck_ref_id                  integer,
+  capacity                      float(32),
+  constraint ck_vehicle_siz check ( siz in ('S','M','L','H')),
+  constraint pk_vehicle primary key (id)
+);
+create sequence vehicle_seq as bigint  start with 1  increment by 50;
+
+create table vehicle_driver (
+  id                            integer not null,
+  name                          nvarchar(255),
+  vehicle_id                    integer,
+  address_id                    smallint,
+  license_issued_on             datetime2,
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  constraint pk_vehicle_driver primary key (id)
+);
+create sequence vehicle_driver_seq as bigint  start with 1  increment by 50;
+
+create table warehouses (
+  id                            integer not null,
+  officezoneid                  integer,
+  constraint pk_warehouses primary key (id)
+);
+create sequence warehouses_seq as bigint  start with 1  increment by 50;
+
+create table warehousesshippingzones (
+  warehouseid                   integer not null,
+  shippingzoneid                integer not null,
+  constraint pk_warehousesshippingzones primary key (warehouseid,shippingzoneid)
+);
+
+create table sa_wheel (
+  id                            numeric(19) not null,
+  tire                          numeric(19),
+  car                           numeric(19),
+  version                       integer not null,
+  constraint pk_sa_wheel primary key (id)
+);
+create sequence sa_wheel_seq as bigint  start with 1  increment by 50;
+
+create table wheel (
+  id                            numeric(19) not null,
+  version                       integer not null,
+  constraint pk_wheel primary key (id)
+);
+create sequence wheel_seq as bigint  start with 1  increment by 50;
+
+create table sp_car_wheel (
+  id                            numeric(19) not null,
+  version                       integer not null,
+  constraint pk_sp_car_wheel primary key (id)
+);
+create sequence sp_car_wheel_seq as bigint  start with 1  increment by 50;
+
+create table g_who_props_otm (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  who_created_id                numeric(19),
+  who_modified_id               numeric(19),
+  constraint pk_g_who_props_otm primary key (id)
+);
+create sequence g_who_props_otm_seq as bigint  start with 1  increment by 50;
+
+create table with_zero (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  parent_id                     integer,
+  lang                          nvarchar(2) default 'en' not null,
+  version                       numeric(19) not null,
+  constraint pk_with_zero primary key (id)
+);
+create sequence with_zero_seq as bigint  start with 1  increment by 50;
+
+create table parent (
+  id                            integer not null,
+  name                          nvarchar(255),
+  constraint pk_parent primary key (id)
+);
+create sequence parent_seq as bigint  start with 1  increment by 50;
+
+create table wview (
+  id                            nvarchar(40) not null,
+  name                          nvarchar(127) not null,
+  constraint uq_wview_name unique (name),
+  constraint pk_wview primary key (id)
+);
+
+create table zones (
+  type                          nvarchar(31) not null,
+  id                            integer not null,
+  attribute                     nvarchar(255),
+  constraint pk_zones primary key (id)
+);
+create sequence zones_seq as bigint  start with 1  increment by 50;
+
+create index ix_contact_last_name_first_name on contact (last_name,first_name);
+create index ix_e_basic_name on e_basic (name);
+create index ix_bar_foo_id on bar (foo_id);
+alter table bar add constraint fk_bar_foo_id foreign key (foo_id) references foo (foo_id);
+
+create index ix_addr_employee_id on addr (employee_id);
+alter table addr add constraint fk_addr_employee_id foreign key (employee_id) references empl (id);
+
+create index ix_o_address_country_code on o_address (country_code);
+alter table o_address add constraint fk_o_address_country_code foreign key (country_code) references o_country (code);
+
+alter table album add constraint fk_album_cover_id foreign key (cover_id) references cover (id);
+
+create index ix_animal_shelter_id on animal (shelter_id);
+alter table animal add constraint fk_animal_shelter_id foreign key (shelter_id) references animal_shelter (id);
+
+create index ix_attribute_attribute_holder_id on attribute (attribute_holder_id);
+alter table attribute add constraint fk_attribute_attribute_holder_id foreign key (attribute_holder_id) references attribute_holder (id);
+
+create index ix_bbookmark_user_id on bbookmark (user_id);
+alter table bbookmark add constraint fk_bbookmark_user_id foreign key (user_id) references bbookmark_user (id);
+
+create index ix_bsite_user_site_id on bsite_user (site_id);
+alter table bsite_user add constraint fk_bsite_user_site_id foreign key (site_id) references bsite (id);
+
+create index ix_bsite_user_user_id on bsite_user (user_id);
+alter table bsite_user add constraint fk_bsite_user_user_id foreign key (user_id) references buser (id);
+
+create index ix_bsite_user_b_site on bsite_user_b (site);
+alter table bsite_user_b add constraint fk_bsite_user_b_site foreign key (site) references bsite (id);
+
+create index ix_bsite_user_b_usr on bsite_user_b (usr);
+alter table bsite_user_b add constraint fk_bsite_user_b_usr foreign key (usr) references buser (id);
+
+create index ix_bsite_user_c_site_uid on bsite_user_c (site_uid);
+alter table bsite_user_c add constraint fk_bsite_user_c_site_uid foreign key (site_uid) references bsite (id);
+
+create index ix_bsite_user_c_user_uid on bsite_user_c (user_uid);
+alter table bsite_user_c add constraint fk_bsite_user_c_user_uid foreign key (user_uid) references buser (id);
+
+alter table drel_booking add constraint fk_drel_booking_agent_invoice foreign key (agent_invoice) references drel_invoice (id);
+
+alter table drel_booking add constraint fk_drel_booking_client_invoice foreign key (client_invoice) references drel_invoice (id);
+
+create index ix_ckey_detail_parent on ckey_detail (one_key,two_key);
+alter table ckey_detail add constraint fk_ckey_detail_parent foreign key (one_key,two_key) references ckey_parent (one_key,two_key);
+
+create index ix_ckey_parent_assoc_id on ckey_parent (assoc_id);
+alter table ckey_parent add constraint fk_ckey_parent_assoc_id foreign key (assoc_id) references ckey_assoc (id);
+
+create index ix_calculation_result_product_configuration_id on calculation_result (product_configuration_id);
+alter table calculation_result add constraint fk_calculation_result_product_configuration_id foreign key (product_configuration_id) references configuration (id);
+
+create index ix_calculation_result_group_configuration_id on calculation_result (group_configuration_id);
+alter table calculation_result add constraint fk_calculation_result_group_configuration_id foreign key (group_configuration_id) references configuration (id);
+
+create index ix_sp_car_car_wheels_sp_car_car on sp_car_car_wheels (car);
+alter table sp_car_car_wheels add constraint fk_sp_car_car_wheels_sp_car_car foreign key (car) references sp_car_car (id);
+
+create index ix_sp_car_car_wheels_sp_car_wheel on sp_car_car_wheels (wheel);
+alter table sp_car_car_wheels add constraint fk_sp_car_car_wheels_sp_car_wheel foreign key (wheel) references sp_car_wheel (id);
+
+create index ix_car_accessory_fuse_id on car_accessory (fuse_id);
+alter table car_accessory add constraint fk_car_accessory_fuse_id foreign key (fuse_id) references car_fuse (id);
+
+create index ix_car_accessory_car_id on car_accessory (car_id);
+alter table car_accessory add constraint fk_car_accessory_car_id foreign key (car_id) references vehicle (id);
+
+create index ix_category_surveyobjectid on category (surveyobjectid);
+alter table category add constraint fk_category_surveyobjectid foreign key (surveyobjectid) references survey (id);
+
+create index ix_child_person_some_bean_id on child_person (some_bean_id);
+alter table child_person add constraint fk_child_person_some_bean_id foreign key (some_bean_id) references e_basic (id);
+
+create index ix_child_person_parent_identifier on child_person (parent_identifier);
+alter table child_person add constraint fk_child_person_parent_identifier foreign key (parent_identifier) references parent_person (identifier);
+
+create index ix_configuration_configurations_id on configuration (configurations_id);
+alter table configuration add constraint fk_configuration_configurations_id foreign key (configurations_id) references configurations (id);
+
+create index ix_contact_customer_id on contact (customer_id);
+alter table contact add constraint fk_contact_customer_id foreign key (customer_id) references o_customer (id);
+
+create index ix_contact_group_id on contact (group_id);
+alter table contact add constraint fk_contact_group_id foreign key (group_id) references contact_group (id);
+
+create index ix_contact_note_contact_id on contact_note (contact_id);
+alter table contact_note add constraint fk_contact_note_contact_id foreign key (contact_id) references contact (id);
+
+create index ix_c_conversation_group_id on c_conversation (group_id);
+alter table c_conversation add constraint fk_c_conversation_group_id foreign key (group_id) references c_group (id);
+
+create index ix_o_customer_billing_address_id on o_customer (billing_address_id);
+alter table o_customer add constraint fk_o_customer_billing_address_id foreign key (billing_address_id) references o_address (id);
+
+create index ix_o_customer_shipping_address_id on o_customer (shipping_address_id);
+alter table o_customer add constraint fk_o_customer_shipping_address_id foreign key (shipping_address_id) references o_address (id);
+
+create index ix_dcredit_drol_dcredit on dcredit_drol (dcredit_id);
+alter table dcredit_drol add constraint fk_dcredit_drol_dcredit foreign key (dcredit_id) references dcredit (id);
+
+create index ix_dcredit_drol_drol on dcredit_drol (drol_id);
+alter table dcredit_drol add constraint fk_dcredit_drol_drol foreign key (drol_id) references drol (id);
+
+create index ix_drot_drol_drot on drot_drol (drot_id);
+alter table drot_drol add constraint fk_drot_drol_drot foreign key (drot_id) references drot (id);
+
+create index ix_drot_drol_drol on drot_drol (drol_id);
+alter table drot_drol add constraint fk_drot_drol_drol foreign key (drol_id) references drol (id);
+
+create index ix_dfk_cascade_one_id on dfk_cascade (one_id);
+alter table dfk_cascade add constraint fk_dfk_cascade_one_id foreign key (one_id) references dfk_cascade_one (id) on delete cascade on update cascade;
+
+create index ix_dfk_set_null_one_id on dfk_set_null (one_id);
+alter table dfk_set_null add constraint fk_dfk_set_null_one_id foreign key (one_id) references dfk_one (id) on delete set null on update set null;
+
+alter table doc add constraint fk_doc_id foreign key (id) references doc_draft (id);
+
+create index ix_doc_link_doc on doc_link (doc_id);
+alter table doc_link add constraint fk_doc_link_doc foreign key (doc_id) references doc (id);
+
+create index ix_doc_link_link on doc_link (link_id);
+alter table doc_link add constraint fk_doc_link_link foreign key (link_id) references link (id);
+
+alter table document add constraint fk_document_id foreign key (id) references document_draft (id);
+
+create index ix_document_organisation_id on document (organisation_id);
+alter table document add constraint fk_document_organisation_id foreign key (organisation_id) references organisation (id);
+
+create index ix_document_draft_organisation_id on document_draft (organisation_id);
+alter table document_draft add constraint fk_document_draft_organisation_id foreign key (organisation_id) references organisation (id);
+
+create index ix_document_media_document_id on document_media (document_id);
+alter table document_media add constraint fk_document_media_document_id foreign key (document_id) references document (id);
+
+create index ix_document_media_draft_document_id on document_media_draft (document_id);
+alter table document_media_draft add constraint fk_document_media_draft_document_id foreign key (document_id) references document_draft (id);
+
+create index ix_ebasic_json_map_detail_owner_id on ebasic_json_map_detail (owner_id);
+alter table ebasic_json_map_detail add constraint fk_ebasic_json_map_detail_owner_id foreign key (owner_id) references ebasic_json_map (id);
+
+create index ix_ebasic_no_sdchild_owner_id on ebasic_no_sdchild (owner_id);
+alter table ebasic_no_sdchild add constraint fk_ebasic_no_sdchild_owner_id foreign key (owner_id) references ebasic_soft_delete (id);
+
+create index ix_ebasic_sdchild_owner_id on ebasic_sdchild (owner_id);
+alter table ebasic_sdchild add constraint fk_ebasic_sdchild_owner_id foreign key (owner_id) references ebasic_soft_delete (id);
+
+create index ix_eemb_inner_outer_id on eemb_inner (outer_id);
+alter table eemb_inner add constraint fk_eemb_inner_outer_id foreign key (outer_id) references eemb_outer (id);
+
+create index ix_einvoice_person_id on einvoice (person_id);
+alter table einvoice add constraint fk_einvoice_person_id foreign key (person_id) references eperson (id);
+
+create index ix_enull_collection_detail_enull_collection_id on enull_collection_detail (enull_collection_id);
+alter table enull_collection_detail add constraint fk_enull_collection_detail_enull_collection_id foreign key (enull_collection_id) references enull_collection (id);
+
+create index ix_eopt_one_a_b_id on eopt_one_a (b_id);
+alter table eopt_one_a add constraint fk_eopt_one_a_b_id foreign key (b_id) references eopt_one_b (id);
+
+create index ix_eopt_one_b_c_id on eopt_one_b (c_id);
+alter table eopt_one_b add constraint fk_eopt_one_b_c_id foreign key (c_id) references eopt_one_c (id);
+
+create index ix_esoft_del_book_lend_by_id on esoft_del_book (lend_by_id);
+alter table esoft_del_book add constraint fk_esoft_del_book_lend_by_id foreign key (lend_by_id) references esoft_del_user (id);
+
+create index ix_esoft_del_book_esoft_del_user_esoft_del_book on esoft_del_book_esoft_del_user (esoft_del_book_id);
+alter table esoft_del_book_esoft_del_user add constraint fk_esoft_del_book_esoft_del_user_esoft_del_book foreign key (esoft_del_book_id) references esoft_del_book (id);
+
+create index ix_esoft_del_book_esoft_del_user_esoft_del_user on esoft_del_book_esoft_del_user (esoft_del_user_id);
+alter table esoft_del_book_esoft_del_user add constraint fk_esoft_del_book_esoft_del_user_esoft_del_user foreign key (esoft_del_user_id) references esoft_del_user (id);
+
+create index ix_esoft_del_down_esoft_del_mid_id on esoft_del_down (esoft_del_mid_id);
+alter table esoft_del_down add constraint fk_esoft_del_down_esoft_del_mid_id foreign key (esoft_del_mid_id) references esoft_del_mid (id);
+
+create index ix_esoft_del_mid_top_id on esoft_del_mid (top_id);
+alter table esoft_del_mid add constraint fk_esoft_del_mid_top_id foreign key (top_id) references esoft_del_top (id);
+
+create index ix_esoft_del_mid_up_id on esoft_del_mid (up_id);
+alter table esoft_del_mid add constraint fk_esoft_del_mid_up_id foreign key (up_id) references esoft_del_up (id);
+
+alter table esoft_del_one_a add constraint fk_esoft_del_one_a_oneb_id foreign key (oneb_id) references esoft_del_one_b (id);
+
+create index ix_esoft_del_role_esoft_del_user_esoft_del_role on esoft_del_role_esoft_del_user (esoft_del_role_id);
+alter table esoft_del_role_esoft_del_user add constraint fk_esoft_del_role_esoft_del_user_esoft_del_role foreign key (esoft_del_role_id) references esoft_del_role (id);
+
+create index ix_esoft_del_role_esoft_del_user_esoft_del_user on esoft_del_role_esoft_del_user (esoft_del_user_id);
+alter table esoft_del_role_esoft_del_user add constraint fk_esoft_del_role_esoft_del_user_esoft_del_user foreign key (esoft_del_user_id) references esoft_del_user (id);
+
+create index ix_esoft_del_user_esoft_del_role_esoft_del_user on esoft_del_user_esoft_del_role (esoft_del_user_id);
+alter table esoft_del_user_esoft_del_role add constraint fk_esoft_del_user_esoft_del_role_esoft_del_user foreign key (esoft_del_user_id) references esoft_del_user (id);
+
+create index ix_esoft_del_user_esoft_del_role_esoft_del_role on esoft_del_user_esoft_del_role (esoft_del_role_id);
+alter table esoft_del_user_esoft_del_role add constraint fk_esoft_del_user_esoft_del_role_esoft_del_role foreign key (esoft_del_role_id) references esoft_del_role (id);
+
+create index ix_rawinherit_uncle_parent_id on rawinherit_uncle (parent_id);
+alter table rawinherit_uncle add constraint fk_rawinherit_uncle_parent_id foreign key (parent_id) references rawinherit_parent (id);
+
+create index ix_evanilla_collection_detail_evanilla_collection_id on evanilla_collection_detail (evanilla_collection_id);
+alter table evanilla_collection_detail add constraint fk_evanilla_collection_detail_evanilla_collection_id foreign key (evanilla_collection_id) references evanilla_collection (id);
+
+create index ix_td_child_parent_id on td_child (parent_id);
+alter table td_child add constraint fk_td_child_parent_id foreign key (parent_id) references td_parent (parent_id);
+
+create index ix_empl_default_address_id on empl (default_address_id);
+alter table empl add constraint fk_empl_default_address_id foreign key (default_address_id) references addr (id);
+
+create index ix_grand_parent_person_some_bean_id on grand_parent_person (some_bean_id);
+alter table grand_parent_person add constraint fk_grand_parent_person_some_bean_id foreign key (some_bean_id) references e_basic (id);
+
+create index ix_survey_group_categoryobjectid on survey_group (categoryobjectid);
+alter table survey_group add constraint fk_survey_group_categoryobjectid foreign key (categoryobjectid) references category (id);
+
+create index ix_hx_link_doc_hx_link on hx_link_doc (hx_link_id);
+alter table hx_link_doc add constraint fk_hx_link_doc_hx_link foreign key (hx_link_id) references hx_link (id);
+
+create index ix_hx_link_doc_he_doc on hx_link_doc (he_doc_id);
+alter table hx_link_doc add constraint fk_hx_link_doc_he_doc foreign key (he_doc_id) references he_doc (id);
+
+create index ix_hi_link_doc_hi_link on hi_link_doc (hi_link_id);
+alter table hi_link_doc add constraint fk_hi_link_doc_hi_link foreign key (hi_link_id) references hi_link (id);
+
+create index ix_hi_link_doc_hi_doc on hi_link_doc (hi_doc_id);
+alter table hi_link_doc add constraint fk_hi_link_doc_hi_doc foreign key (hi_doc_id) references hi_doc (id);
+
+create index ix_imrelated_owner_id on imrelated (owner_id);
+alter table imrelated add constraint fk_imrelated_owner_id foreign key (owner_id) references imroot (id);
+
+create index ix_info_contact_company_id on info_contact (company_id);
+alter table info_contact add constraint fk_info_contact_company_id foreign key (company_id) references info_company (id);
+
+alter table info_customer add constraint fk_info_customer_company_id foreign key (company_id) references info_company (id);
+
+alter table inner_report add constraint fk_inner_report_forecast_id foreign key (forecast_id) references stockforecast (id);
+
+create index ix_drel_invoice_booking on drel_invoice (booking);
+alter table drel_invoice add constraint fk_drel_invoice_booking foreign key (booking) references drel_booking (id);
+
+create index ix_item_etype on item (customer,type);
+alter table item add constraint fk_item_etype foreign key (customer,type) references type (customer,type);
+
+create index ix_item_eregion on item (customer,region);
+alter table item add constraint fk_item_eregion foreign key (customer,region) references region (customer,type);
+
+alter table trainer_monkey add constraint fk_trainer_monkey_trainer foreign key (trainer_tid) references trainer (tid);
+
+alter table trainer_monkey add constraint fk_trainer_monkey_monkey foreign key (monkey_mid) references monkey (mid);
+
+alter table troop_monkey add constraint fk_troop_monkey_troop foreign key (troop_pid) references troop (pid);
+
+alter table troop_monkey add constraint fk_troop_monkey_monkey foreign key (monkey_mid) references monkey (mid);
+
+create index ix_l2_cldf_reset_bean_child_parent_id on l2_cldf_reset_bean_child (parent_id);
+alter table l2_cldf_reset_bean_child add constraint fk_l2_cldf_reset_bean_child_parent_id foreign key (parent_id) references l2_cldf_reset_bean (id);
+
+create index ix_level1_level4_level1 on level1_level4 (level1_id);
+alter table level1_level4 add constraint fk_level1_level4_level1 foreign key (level1_id) references level1 (id);
+
+create index ix_level1_level4_level4 on level1_level4 (level4_id);
+alter table level1_level4 add constraint fk_level1_level4_level4 foreign key (level4_id) references level4 (id);
+
+create index ix_level1_level2_level1 on level1_level2 (level1_id);
+alter table level1_level2 add constraint fk_level1_level2_level1 foreign key (level1_id) references level1 (id);
+
+create index ix_level1_level2_level2 on level1_level2 (level2_id);
+alter table level1_level2 add constraint fk_level1_level2_level2 foreign key (level2_id) references level2 (id);
+
+create index ix_level2_level3_level2 on level2_level3 (level2_id);
+alter table level2_level3 add constraint fk_level2_level3_level2 foreign key (level2_id) references level2 (id);
+
+create index ix_level2_level3_level3 on level2_level3 (level3_id);
+alter table level2_level3 add constraint fk_level2_level3_level3 foreign key (level3_id) references level3 (id);
+
+alter table link add constraint fk_link_id foreign key (id) references link_draft (id);
+
+create index ix_la_attr_value_attribute_la_attr_value on la_attr_value_attribute (la_attr_value_id);
+alter table la_attr_value_attribute add constraint fk_la_attr_value_attribute_la_attr_value foreign key (la_attr_value_id) references la_attr_value (id);
+
+create index ix_la_attr_value_attribute_attribute on la_attr_value_attribute (attribute_id);
+alter table la_attr_value_attribute add constraint fk_la_attr_value_attribute_attribute foreign key (attribute_id) references attribute (id);
+
+create index ix_mprinter_current_state_id on mprinter (current_state_id);
+alter table mprinter add constraint fk_mprinter_current_state_id foreign key (current_state_id) references mprinter_state (id);
+
+alter table mprinter add constraint fk_mprinter_last_swap_cyan_id foreign key (last_swap_cyan_id) references mprinter_state (id);
+
+alter table mprinter add constraint fk_mprinter_last_swap_magenta_id foreign key (last_swap_magenta_id) references mprinter_state (id);
+
+alter table mprinter add constraint fk_mprinter_last_swap_yellow_id foreign key (last_swap_yellow_id) references mprinter_state (id);
+
+alter table mprinter add constraint fk_mprinter_last_swap_black_id foreign key (last_swap_black_id) references mprinter_state (id);
+
+create index ix_mprinter_state_printer_id on mprinter_state (printer_id);
+alter table mprinter_state add constraint fk_mprinter_state_printer_id foreign key (printer_id) references mprinter (id);
+
+create index ix_mprofile_picture_id on mprofile (picture_id);
+alter table mprofile add constraint fk_mprofile_picture_id foreign key (picture_id) references mmedia (id);
+
+create index ix_mrole_muser_mrole on mrole_muser (mrole_roleid);
+alter table mrole_muser add constraint fk_mrole_muser_mrole foreign key (mrole_roleid) references mrole (roleid);
+
+create index ix_mrole_muser_muser on mrole_muser (muser_userid);
+alter table mrole_muser add constraint fk_mrole_muser_muser foreign key (muser_userid) references muser (userid);
+
+create index ix_muser_user_type_id on muser (user_type_id);
+alter table muser add constraint fk_muser_user_type_id foreign key (user_type_id) references muser_type (id);
+
+create index ix_mail_user_inbox_mail_user on mail_user_inbox (mail_user_id);
+alter table mail_user_inbox add constraint fk_mail_user_inbox_mail_user foreign key (mail_user_id) references mail_user (id);
+
+create index ix_mail_user_inbox_mail_box on mail_user_inbox (mail_box_id);
+alter table mail_user_inbox add constraint fk_mail_user_inbox_mail_box foreign key (mail_box_id) references mail_box (id);
+
+create index ix_mail_user_outbox_mail_user on mail_user_outbox (mail_user_id);
+alter table mail_user_outbox add constraint fk_mail_user_outbox_mail_user foreign key (mail_user_id) references mail_user (id);
+
+create index ix_mail_user_outbox_mail_box on mail_user_outbox (mail_box_id);
+alter table mail_user_outbox add constraint fk_mail_user_outbox_mail_box foreign key (mail_box_id) references mail_box (id);
+
+create index ix_c_message_conversation_id on c_message (conversation_id);
+alter table c_message add constraint fk_c_message_conversation_id foreign key (conversation_id) references c_conversation (id);
+
+create index ix_c_message_user_id on c_message (user_id);
+alter table c_message add constraint fk_c_message_user_id foreign key (user_id) references c_user (id);
+
+create index ix_mnoc_user_mnoc_role_mnoc_user on mnoc_user_mnoc_role (mnoc_user_user_id);
+alter table mnoc_user_mnoc_role add constraint fk_mnoc_user_mnoc_role_mnoc_user foreign key (mnoc_user_user_id) references mnoc_user (user_id);
+
+create index ix_mnoc_user_mnoc_role_mnoc_role on mnoc_user_mnoc_role (mnoc_role_role_id);
+alter table mnoc_user_mnoc_role add constraint fk_mnoc_user_mnoc_role_mnoc_role foreign key (mnoc_role_role_id) references mnoc_role (role_id);
+
+create index ix_mny_b_a_id on mny_b (a_id);
+alter table mny_b add constraint fk_mny_b_a_id foreign key (a_id) references mny_a (id);
+
+create index ix_mny_b_mny_c_mny_b on mny_b_mny_c (mny_b_id);
+alter table mny_b_mny_c add constraint fk_mny_b_mny_c_mny_b foreign key (mny_b_id) references mny_b (id);
+
+create index ix_mny_b_mny_c_mny_c on mny_b_mny_c (mny_c_id);
+alter table mny_b_mny_c add constraint fk_mny_b_mny_c_mny_c foreign key (mny_c_id) references mny_c (id);
+
+create index ix_subtopics_mny_topic_1 on subtopics (topic);
+alter table subtopics add constraint fk_subtopics_mny_topic_1 foreign key (topic) references mny_topic (id);
+
+create index ix_subtopics_mny_topic_2 on subtopics (subtopic);
+alter table subtopics add constraint fk_subtopics_mny_topic_2 foreign key (subtopic) references mny_topic (id);
+
+create index ix_mp_role_mp_user_id on mp_role (mp_user_id);
+alter table mp_role add constraint fk_mp_role_mp_user_id foreign key (mp_user_id) references mp_user (id);
+
+create index ix_ms_many_a_many_b_ms_many_a on ms_many_a_many_b (ms_many_a_aid);
+alter table ms_many_a_many_b add constraint fk_ms_many_a_many_b_ms_many_a foreign key (ms_many_a_aid) references ms_many_a (aid);
+
+create index ix_ms_many_a_many_b_ms_many_b on ms_many_a_many_b (ms_many_b_bid);
+alter table ms_many_a_many_b add constraint fk_ms_many_a_many_b_ms_many_b foreign key (ms_many_b_bid) references ms_many_b (bid);
+
+create index ix_ms_many_b_many_a_ms_many_b on ms_many_b_many_a (ms_many_b_bid);
+alter table ms_many_b_many_a add constraint fk_ms_many_b_many_a_ms_many_b foreign key (ms_many_b_bid) references ms_many_b (bid);
+
+create index ix_ms_many_b_many_a_ms_many_a on ms_many_b_many_a (ms_many_a_aid);
+alter table ms_many_b_many_a add constraint fk_ms_many_b_many_a_ms_many_a foreign key (ms_many_a_aid) references ms_many_a (aid);
+
+create index ix_my_lob_size_join_many_parent_id on my_lob_size_join_many (parent_id);
+alter table my_lob_size_join_many add constraint fk_my_lob_size_join_many_parent_id foreign key (parent_id) references my_lob_size (id);
+
+create index ix_o_cached_bean_country_o_cached_bean on o_cached_bean_country (o_cached_bean_id);
+alter table o_cached_bean_country add constraint fk_o_cached_bean_country_o_cached_bean foreign key (o_cached_bean_id) references o_cached_bean (id);
+
+create index ix_o_cached_bean_country_o_country on o_cached_bean_country (o_country_code);
+alter table o_cached_bean_country add constraint fk_o_cached_bean_country_o_country foreign key (o_country_code) references o_country (code);
+
+create index ix_o_cached_bean_child_cached_bean_id on o_cached_bean_child (cached_bean_id);
+alter table o_cached_bean_child add constraint fk_o_cached_bean_child_cached_bean_id foreign key (cached_bean_id) references o_cached_bean (id);
+
+alter table oengine add constraint fk_oengine_car_id foreign key (car_id) references ocar (id);
+
+alter table ogear_box add constraint fk_ogear_box_car_id foreign key (car_id) references ocar (id);
+
+alter table oroad_show_msg add constraint fk_oroad_show_msg_company_id foreign key (company_id) references ocompany (id);
+
+create index ix_om_ordered_detail_master_id on om_ordered_detail (master_id);
+alter table om_ordered_detail add constraint fk_om_ordered_detail_master_id foreign key (master_id) references om_ordered_master (id);
+
+create index ix_o_order_kcustomer_id on o_order (kcustomer_id);
+alter table o_order add constraint fk_o_order_kcustomer_id foreign key (kcustomer_id) references o_customer (id);
+
+create index ix_o_order_detail_order_id on o_order_detail (order_id);
+alter table o_order_detail add constraint fk_o_order_detail_order_id foreign key (order_id) references o_order (id);
+
+create index ix_o_order_detail_product_id on o_order_detail (product_id);
+alter table o_order_detail add constraint fk_o_order_detail_product_id foreign key (product_id) references o_product (id);
+
+create index ix_s_order_items_order_uuid on s_order_items (order_uuid);
+alter table s_order_items add constraint fk_s_order_items_order_uuid foreign key (order_uuid) references s_orders (uuid);
+
+create index ix_or_order_ship_order_id on or_order_ship (order_id);
+alter table or_order_ship add constraint fk_or_order_ship_order_id foreign key (order_id) references o_order (id);
+
+alter table oto_bchild add constraint fk_oto_bchild_master_id foreign key (master_id) references oto_bmaster (id);
+
+alter table oto_child add constraint fk_oto_child_master_id foreign key (master_id) references oto_master (id);
+
+alter table oto_cust_address add constraint fk_oto_cust_address_customer_cid foreign key (customer_cid) references oto_cust (cid);
+
+alter table oto_prime_extra add constraint fk_oto_prime_extra_eid foreign key (eid) references oto_prime (pid);
+
+create index ix_oto_th_many_oto_th_top_id on oto_th_many (oto_th_top_id);
+alter table oto_th_many add constraint fk_oto_th_many_oto_th_top_id foreign key (oto_th_top_id) references oto_th_top (id);
+
+alter table oto_th_one add constraint fk_oto_th_one_many_id foreign key (many_id) references oto_th_many (id);
+
+alter table oto_ubprime_extra add constraint fk_oto_ubprime_extra_eid foreign key (eid) references oto_ubprime (pid);
+
+alter table oto_uprime_extra add constraint fk_oto_uprime_extra_eid foreign key (eid) references oto_uprime (pid);
+
+alter table pfile add constraint fk_pfile_file_content_id foreign key (file_content_id) references pfile_content (id);
+
+alter table pfile add constraint fk_pfile_file_content2_id foreign key (file_content2_id) references pfile_content (id);
+
+alter table paggview add constraint fk_paggview_pview_id foreign key (pview_id) references pp (id);
+
+create index ix_pallet_location_zone_sid on pallet_location (zone_sid);
+alter table pallet_location add constraint fk_pallet_location_zone_sid foreign key (zone_sid) references zones (id);
+
+alter table parcel_location add constraint fk_parcel_location_parcelid foreign key (parcelid) references parcel (parcelid);
+
+create index ix_rawinherit_parent_rawinherit_data_rawinherit_parent on rawinherit_parent_rawinherit_data (rawinherit_parent_id);
+alter table rawinherit_parent_rawinherit_data add constraint fk_rawinherit_parent_rawinherit_data_rawinherit_parent foreign key (rawinherit_parent_id) references rawinherit_parent (id);
+
+create index ix_rawinherit_parent_rawinherit_data_rawinherit_data on rawinherit_parent_rawinherit_data (rawinherit_data_id);
+alter table rawinherit_parent_rawinherit_data add constraint fk_rawinherit_parent_rawinherit_data_rawinherit_data foreign key (rawinherit_data_id) references rawinherit_data (id);
+
+create index ix_parent_person_some_bean_id on parent_person (some_bean_id);
+alter table parent_person add constraint fk_parent_person_some_bean_id foreign key (some_bean_id) references e_basic (id);
+
+create index ix_parent_person_parent_identifier on parent_person (parent_identifier);
+alter table parent_person add constraint fk_parent_person_parent_identifier foreign key (parent_identifier) references grand_parent_person (identifier);
+
+create index ix_c_participation_conversation_id on c_participation (conversation_id);
+alter table c_participation add constraint fk_c_participation_conversation_id foreign key (conversation_id) references c_conversation (id);
+
+create index ix_c_participation_user_id on c_participation (user_id);
+alter table c_participation add constraint fk_c_participation_user_id foreign key (user_id) references c_user (id);
+
+alter table persistent_file_content add constraint fk_persistent_file_content_persistent_file_id foreign key (persistent_file_id) references persistent_file (id);
+
+create index ix_person_default_address_oid on person (default_address_oid);
+alter table person add constraint fk_person_default_address_oid foreign key (default_address_oid) references address (oid);
+
+create index ix_phones_person_id on phones (person_id);
+alter table phones add constraint fk_phones_person_id foreign key (person_id) references persons (id);
+
+create index ix_pp_to_ww_pp on pp_to_ww (pp_id);
+alter table pp_to_ww add constraint fk_pp_to_ww_pp foreign key (pp_id) references pp (id);
+
+create index ix_pp_to_ww_wview on pp_to_ww (ww_id);
+alter table pp_to_ww add constraint fk_pp_to_ww_wview foreign key (ww_id) references wview (id);
+
+create index ix_question_groupobjectid on question (groupobjectid);
+alter table question add constraint fk_question_groupobjectid foreign key (groupobjectid) references survey_group (id);
+
+create index ix_r_orders_customer on r_orders (company,customername);
+alter table r_orders add constraint fk_r_orders_customer foreign key (company,customername) references rcustomer (company,name);
+
+create index ix_resourcefile_parentresourcefileid on resourcefile (parentresourcefileid);
+alter table resourcefile add constraint fk_resourcefile_parentresourcefileid foreign key (parentresourcefileid) references resourcefile (id);
+
+create index ix_mt_role_tenant_id on mt_role (tenant_id);
+alter table mt_role add constraint fk_mt_role_tenant_id foreign key (tenant_id) references mt_tenant (id);
+
+create index ix_mt_role_permission_mt_role on mt_role_permission (mt_role_id);
+alter table mt_role_permission add constraint fk_mt_role_permission_mt_role foreign key (mt_role_id) references mt_role (id);
+
+create index ix_mt_role_permission_mt_permission on mt_role_permission (mt_permission_id);
+alter table mt_role_permission add constraint fk_mt_role_permission_mt_permission foreign key (mt_permission_id) references mt_permission (id);
+
+alter table f_second add constraint fk_f_second_first foreign key (first) references f_first (id);
+
+create index ix_section_article_id on section (article_id);
+alter table section add constraint fk_section_article_id foreign key (article_id) references article (id);
+
+create index ix_self_parent_parent_id on self_parent (parent_id);
+alter table self_parent add constraint fk_self_parent_parent_id foreign key (parent_id) references self_parent (id);
+
+create index ix_self_ref_customer_referred_by_id on self_ref_customer (referred_by_id);
+alter table self_ref_customer add constraint fk_self_ref_customer_referred_by_id foreign key (referred_by_id) references self_ref_customer (id);
+
+create index ix_self_ref_example_parent_id on self_ref_example (parent_id);
+alter table self_ref_example add constraint fk_self_ref_example_parent_id foreign key (parent_id) references self_ref_example (id);
+
+create index ix_stockforecast_inner_report_id on stockforecast (inner_report_id);
+alter table stockforecast add constraint fk_stockforecast_inner_report_id foreign key (inner_report_id) references inner_report (id);
+
+create index ix_sub_section_section_id on sub_section (section_id);
+alter table sub_section add constraint fk_sub_section_section_id foreign key (section_id) references section (id);
+
+create index ix_tevent_many_event_id on tevent_many (event_id);
+alter table tevent_many add constraint fk_tevent_many_event_id foreign key (event_id) references tevent_one (id);
+
+alter table tevent_one add constraint fk_tevent_one_event_id foreign key (event_id) references tevent (id);
+
+create index ix_t_detail_with_other_namexxxyy_master_id on t_detail_with_other_namexxxyy (master_id);
+alter table t_detail_with_other_namexxxyy add constraint fk_t_detail_with_other_namexxxyy_master_id foreign key (master_id) references t_atable_thatisrelatively (id);
+
+create index ix_ts_detail_two_master_id on ts_detail_two (master_id);
+alter table ts_detail_two add constraint fk_ts_detail_two_master_id foreign key (master_id) references ts_master_two (id);
+
+create index ix_twheel_owner_plate_no on twheel (owner_plate_no);
+alter table twheel add constraint fk_twheel_owner_plate_no foreign key (owner_plate_no) references tcar (plate_no);
+
+alter table tire add constraint fk_tire_wheel foreign key (wheel) references wheel (id);
+
+create index ix_trip_vehicle_driver_id on trip (vehicle_driver_id);
+alter table trip add constraint fk_trip_vehicle_driver_id foreign key (vehicle_driver_id) references vehicle_driver (id);
+
+create index ix_trip_address_id on trip (address_id);
+alter table trip add constraint fk_trip_address_id foreign key (address_id) references o_address (id);
+
+create index ix_type_sub_type_id on type (sub_type_id);
+alter table type add constraint fk_type_sub_type_id foreign key (sub_type_id) references sub_type (sub_type_id);
+
+create index ix_ut_detail_utmaster_id on ut_detail (utmaster_id);
+alter table ut_detail add constraint fk_ut_detail_utmaster_id foreign key (utmaster_id) references ut_master (id);
+
+create index ix_uutwo_master_id on uutwo (master_id);
+alter table uutwo add constraint fk_uutwo_master_id foreign key (master_id) references uuone (id);
+
+create index ix_c_user_group_id on c_user (group_id);
+alter table c_user add constraint fk_c_user_group_id foreign key (group_id) references c_group (id);
+
+alter table oto_user add constraint fk_oto_user_account_id foreign key (account_id) references oto_account (id);
+
+create index ix_em_user_role_user_id on em_user_role (user_id);
+alter table em_user_role add constraint fk_em_user_role_user_id foreign key (user_id) references em_user (id);
+
+create index ix_em_user_role_role_id on em_user_role (role_id);
+alter table em_user_role add constraint fk_em_user_role_role_id foreign key (role_id) references em_role (id);
+
+create index ix_vehicle_car_ref_id on vehicle (car_ref_id);
+alter table vehicle add constraint fk_vehicle_car_ref_id foreign key (car_ref_id) references truck_ref (id);
+
+create index ix_vehicle_truck_ref_id on vehicle (truck_ref_id);
+alter table vehicle add constraint fk_vehicle_truck_ref_id foreign key (truck_ref_id) references truck_ref (id);
+
+create index ix_vehicle_driver_vehicle_id on vehicle_driver (vehicle_id);
+alter table vehicle_driver add constraint fk_vehicle_driver_vehicle_id foreign key (vehicle_id) references vehicle (id);
+
+create index ix_vehicle_driver_address_id on vehicle_driver (address_id);
+alter table vehicle_driver add constraint fk_vehicle_driver_address_id foreign key (address_id) references o_address (id);
+
+create index ix_warehouses_officezoneid on warehouses (officezoneid);
+alter table warehouses add constraint fk_warehouses_officezoneid foreign key (officezoneid) references zones (id);
+
+create index ix_warehousesshippingzones_warehouses on warehousesshippingzones (warehouseid);
+alter table warehousesshippingzones add constraint fk_warehousesshippingzones_warehouses foreign key (warehouseid) references warehouses (id);
+
+create index ix_warehousesshippingzones_zones on warehousesshippingzones (shippingzoneid);
+alter table warehousesshippingzones add constraint fk_warehousesshippingzones_zones foreign key (shippingzoneid) references zones (id);
+
+create index ix_sa_wheel_tire on sa_wheel (tire);
+alter table sa_wheel add constraint fk_sa_wheel_tire foreign key (tire) references sa_tire (id);
+
+create index ix_sa_wheel_car on sa_wheel (car);
+alter table sa_wheel add constraint fk_sa_wheel_car foreign key (car) references sa_car (id);
+
+create index ix_g_who_props_otm_who_created_id on g_who_props_otm (who_created_id);
+alter table g_who_props_otm add constraint fk_g_who_props_otm_who_created_id foreign key (who_created_id) references g_user (id);
+
+create index ix_g_who_props_otm_who_modified_id on g_who_props_otm (who_modified_id);
+alter table g_who_props_otm add constraint fk_g_who_props_otm_who_modified_id foreign key (who_modified_id) references g_user (id);
+
+create index ix_with_zero_parent_id on with_zero (parent_id);
+alter table with_zero add constraint fk_with_zero_parent_id foreign key (parent_id) references parent (id);
+
+alter table hx_link
+    add sys_periodFrom datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(),
+        sys_periodTo   datetime2 GENERATED ALWAYS AS ROW END   NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',
+period for system_time (sys_periodFrom, sys_periodTo);
+alter table hx_link set (system_versioning = on (history_table=dbo.hx_link_history));
+alter table hi_link
+    add sys_periodFrom datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(),
+        sys_periodTo   datetime2 GENERATED ALWAYS AS ROW END   NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',
+period for system_time (sys_periodFrom, sys_periodTo);
+alter table hi_link set (system_versioning = on (history_table=dbo.hi_link_history));
+alter table hi_link_doc
+    add sys_periodFrom datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(),
+        sys_periodTo   datetime2 GENERATED ALWAYS AS ROW END   NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',
+period for system_time (sys_periodFrom, sys_periodTo);
+alter table hi_link_doc set (system_versioning = on (history_table=dbo.hi_link_doc_history));
+alter table link
+    add sys_periodFrom datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(),
+        sys_periodTo   datetime2 GENERATED ALWAYS AS ROW END   NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',
+period for system_time (sys_periodFrom, sys_periodTo);
+alter table link set (system_versioning = on (history_table=dbo.link_history));
+alter table c_user
+    add sys_periodFrom datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(),
+        sys_periodTo   datetime2 GENERATED ALWAYS AS ROW END   NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',
+period for system_time (sys_periodFrom, sys_periodTo);
+alter table c_user set (system_versioning = on (history_table=dbo.c_user_history));
diff --git a/src/test/ddl-review/sqlserver-drop-all.sql b/src/test/ddl-review/sqlserver-drop-all.sql
new file mode 100644
index 000000000..1669d09c8
--- /dev/null
+++ b/src/test/ddl-review/sqlserver-drop-all.sql
@@ -0,0 +1,1549 @@
+-- Generated by ebean unknown at 2018-03-08T04:43:42.126Z
+IF OBJECT_ID('fk_bar_foo_id', 'F') IS NOT NULL alter table bar drop constraint fk_bar_foo_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('bar','U') AND name = 'ix_bar_foo_id') drop index ix_bar_foo_id ON bar;
+
+IF OBJECT_ID('fk_addr_employee_id', 'F') IS NOT NULL alter table addr drop constraint fk_addr_employee_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('addr','U') AND name = 'ix_addr_employee_id') drop index ix_addr_employee_id ON addr;
+
+IF OBJECT_ID('fk_o_address_country_code', 'F') IS NOT NULL alter table o_address drop constraint fk_o_address_country_code;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('o_address','U') AND name = 'ix_o_address_country_code') drop index ix_o_address_country_code ON o_address;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('album','U') AND name = 'uq_album_cover_id') drop index uq_album_cover_id ON album;
+IF OBJECT_ID('fk_album_cover_id', 'F') IS NOT NULL alter table album drop constraint fk_album_cover_id;
+
+IF OBJECT_ID('fk_animal_shelter_id', 'F') IS NOT NULL alter table animal drop constraint fk_animal_shelter_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('animal','U') AND name = 'ix_animal_shelter_id') drop index ix_animal_shelter_id ON animal;
+
+IF OBJECT_ID('fk_attribute_attribute_holder_id', 'F') IS NOT NULL alter table attribute drop constraint fk_attribute_attribute_holder_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('attribute','U') AND name = 'ix_attribute_attribute_holder_id') drop index ix_attribute_attribute_holder_id ON attribute;
+
+IF OBJECT_ID('fk_bbookmark_user_id', 'F') IS NOT NULL alter table bbookmark drop constraint fk_bbookmark_user_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('bbookmark','U') AND name = 'ix_bbookmark_user_id') drop index ix_bbookmark_user_id ON bbookmark;
+
+IF OBJECT_ID('fk_bsite_user_site_id', 'F') IS NOT NULL alter table bsite_user drop constraint fk_bsite_user_site_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('bsite_user','U') AND name = 'ix_bsite_user_site_id') drop index ix_bsite_user_site_id ON bsite_user;
+
+IF OBJECT_ID('fk_bsite_user_user_id', 'F') IS NOT NULL alter table bsite_user drop constraint fk_bsite_user_user_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('bsite_user','U') AND name = 'ix_bsite_user_user_id') drop index ix_bsite_user_user_id ON bsite_user;
+
+IF OBJECT_ID('fk_bsite_user_b_site', 'F') IS NOT NULL alter table bsite_user_b drop constraint fk_bsite_user_b_site;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('bsite_user_b','U') AND name = 'ix_bsite_user_b_site') drop index ix_bsite_user_b_site ON bsite_user_b;
+
+IF OBJECT_ID('fk_bsite_user_b_usr', 'F') IS NOT NULL alter table bsite_user_b drop constraint fk_bsite_user_b_usr;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('bsite_user_b','U') AND name = 'ix_bsite_user_b_usr') drop index ix_bsite_user_b_usr ON bsite_user_b;
+
+IF OBJECT_ID('fk_bsite_user_c_site_uid', 'F') IS NOT NULL alter table bsite_user_c drop constraint fk_bsite_user_c_site_uid;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('bsite_user_c','U') AND name = 'ix_bsite_user_c_site_uid') drop index ix_bsite_user_c_site_uid ON bsite_user_c;
+
+IF OBJECT_ID('fk_bsite_user_c_user_uid', 'F') IS NOT NULL alter table bsite_user_c drop constraint fk_bsite_user_c_user_uid;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('bsite_user_c','U') AND name = 'ix_bsite_user_c_user_uid') drop index ix_bsite_user_c_user_uid ON bsite_user_c;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('bwith_qident','U') AND name = 'uq_bwith_qident_name') drop index uq_bwith_qident_name ON bwith_qident;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('drel_booking','U') AND name = 'uq_drel_booking_booking_uid') drop index uq_drel_booking_booking_uid ON drel_booking;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('drel_booking','U') AND name = 'uq_drel_booking_agent_invoice') drop index uq_drel_booking_agent_invoice ON drel_booking;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('drel_booking','U') AND name = 'uq_drel_booking_client_invoice') drop index uq_drel_booking_client_invoice ON drel_booking;
+IF OBJECT_ID('fk_drel_booking_agent_invoice', 'F') IS NOT NULL alter table drel_booking drop constraint fk_drel_booking_agent_invoice;
+
+IF OBJECT_ID('fk_drel_booking_client_invoice', 'F') IS NOT NULL alter table drel_booking drop constraint fk_drel_booking_client_invoice;
+
+IF OBJECT_ID('fk_ckey_detail_parent', 'F') IS NOT NULL alter table ckey_detail drop constraint fk_ckey_detail_parent;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ckey_detail','U') AND name = 'ix_ckey_detail_parent') drop index ix_ckey_detail_parent ON ckey_detail;
+
+IF OBJECT_ID('fk_ckey_parent_assoc_id', 'F') IS NOT NULL alter table ckey_parent drop constraint fk_ckey_parent_assoc_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ckey_parent','U') AND name = 'ix_ckey_parent_assoc_id') drop index ix_ckey_parent_assoc_id ON ckey_parent;
+
+IF OBJECT_ID('fk_calculation_result_product_configuration_id', 'F') IS NOT NULL alter table calculation_result drop constraint fk_calculation_result_product_configuration_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('calculation_result','U') AND name = 'ix_calculation_result_product_configuration_id') drop index ix_calculation_result_product_configuration_id ON calculation_result;
+
+IF OBJECT_ID('fk_calculation_result_group_configuration_id', 'F') IS NOT NULL alter table calculation_result drop constraint fk_calculation_result_group_configuration_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('calculation_result','U') AND name = 'ix_calculation_result_group_configuration_id') drop index ix_calculation_result_group_configuration_id ON calculation_result;
+
+IF OBJECT_ID('fk_sp_car_car_wheels_sp_car_car', 'F') IS NOT NULL alter table sp_car_car_wheels drop constraint fk_sp_car_car_wheels_sp_car_car;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('sp_car_car_wheels','U') AND name = 'ix_sp_car_car_wheels_sp_car_car') drop index ix_sp_car_car_wheels_sp_car_car ON sp_car_car_wheels;
+
+IF OBJECT_ID('fk_sp_car_car_wheels_sp_car_wheel', 'F') IS NOT NULL alter table sp_car_car_wheels drop constraint fk_sp_car_car_wheels_sp_car_wheel;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('sp_car_car_wheels','U') AND name = 'ix_sp_car_car_wheels_sp_car_wheel') drop index ix_sp_car_car_wheels_sp_car_wheel ON sp_car_car_wheels;
+
+IF OBJECT_ID('fk_car_accessory_fuse_id', 'F') IS NOT NULL alter table car_accessory drop constraint fk_car_accessory_fuse_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('car_accessory','U') AND name = 'ix_car_accessory_fuse_id') drop index ix_car_accessory_fuse_id ON car_accessory;
+
+IF OBJECT_ID('fk_car_accessory_car_id', 'F') IS NOT NULL alter table car_accessory drop constraint fk_car_accessory_car_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('car_accessory','U') AND name = 'ix_car_accessory_car_id') drop index ix_car_accessory_car_id ON car_accessory;
+
+IF OBJECT_ID('fk_category_surveyobjectid', 'F') IS NOT NULL alter table category drop constraint fk_category_surveyobjectid;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('category','U') AND name = 'ix_category_surveyobjectid') drop index ix_category_surveyobjectid ON category;
+
+IF OBJECT_ID('fk_child_person_some_bean_id', 'F') IS NOT NULL alter table child_person drop constraint fk_child_person_some_bean_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('child_person','U') AND name = 'ix_child_person_some_bean_id') drop index ix_child_person_some_bean_id ON child_person;
+
+IF OBJECT_ID('fk_child_person_parent_identifier', 'F') IS NOT NULL alter table child_person drop constraint fk_child_person_parent_identifier;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('child_person','U') AND name = 'ix_child_person_parent_identifier') drop index ix_child_person_parent_identifier ON child_person;
+
+IF OBJECT_ID('fk_configuration_configurations_id', 'F') IS NOT NULL alter table configuration drop constraint fk_configuration_configurations_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('configuration','U') AND name = 'ix_configuration_configurations_id') drop index ix_configuration_configurations_id ON configuration;
+
+IF OBJECT_ID('fk_contact_customer_id', 'F') IS NOT NULL alter table contact drop constraint fk_contact_customer_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('contact','U') AND name = 'ix_contact_customer_id') drop index ix_contact_customer_id ON contact;
+
+IF OBJECT_ID('fk_contact_group_id', 'F') IS NOT NULL alter table contact drop constraint fk_contact_group_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('contact','U') AND name = 'ix_contact_group_id') drop index ix_contact_group_id ON contact;
+
+IF OBJECT_ID('fk_contact_note_contact_id', 'F') IS NOT NULL alter table contact_note drop constraint fk_contact_note_contact_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('contact_note','U') AND name = 'ix_contact_note_contact_id') drop index ix_contact_note_contact_id ON contact_note;
+
+IF OBJECT_ID('fk_c_conversation_group_id', 'F') IS NOT NULL alter table c_conversation drop constraint fk_c_conversation_group_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('c_conversation','U') AND name = 'ix_c_conversation_group_id') drop index ix_c_conversation_group_id ON c_conversation;
+
+IF OBJECT_ID('fk_o_customer_billing_address_id', 'F') IS NOT NULL alter table o_customer drop constraint fk_o_customer_billing_address_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('o_customer','U') AND name = 'ix_o_customer_billing_address_id') drop index ix_o_customer_billing_address_id ON o_customer;
+
+IF OBJECT_ID('fk_o_customer_shipping_address_id', 'F') IS NOT NULL alter table o_customer drop constraint fk_o_customer_shipping_address_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('o_customer','U') AND name = 'ix_o_customer_shipping_address_id') drop index ix_o_customer_shipping_address_id ON o_customer;
+
+IF OBJECT_ID('fk_dcredit_drol_dcredit', 'F') IS NOT NULL alter table dcredit_drol drop constraint fk_dcredit_drol_dcredit;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('dcredit_drol','U') AND name = 'ix_dcredit_drol_dcredit') drop index ix_dcredit_drol_dcredit ON dcredit_drol;
+
+IF OBJECT_ID('fk_dcredit_drol_drol', 'F') IS NOT NULL alter table dcredit_drol drop constraint fk_dcredit_drol_drol;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('dcredit_drol','U') AND name = 'ix_dcredit_drol_drol') drop index ix_dcredit_drol_drol ON dcredit_drol;
+
+IF OBJECT_ID('fk_drot_drol_drot', 'F') IS NOT NULL alter table drot_drol drop constraint fk_drot_drol_drot;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('drot_drol','U') AND name = 'ix_drot_drol_drot') drop index ix_drot_drol_drot ON drot_drol;
+
+IF OBJECT_ID('fk_drot_drol_drol', 'F') IS NOT NULL alter table drot_drol drop constraint fk_drot_drol_drol;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('drot_drol','U') AND name = 'ix_drot_drol_drol') drop index ix_drot_drol_drol ON drot_drol;
+
+IF OBJECT_ID('fk_dfk_cascade_one_id', 'F') IS NOT NULL alter table dfk_cascade drop constraint fk_dfk_cascade_one_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('dfk_cascade','U') AND name = 'ix_dfk_cascade_one_id') drop index ix_dfk_cascade_one_id ON dfk_cascade;
+
+IF OBJECT_ID('fk_dfk_set_null_one_id', 'F') IS NOT NULL alter table dfk_set_null drop constraint fk_dfk_set_null_one_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('dfk_set_null','U') AND name = 'ix_dfk_set_null_one_id') drop index ix_dfk_set_null_one_id ON dfk_set_null;
+
+IF OBJECT_ID('fk_doc_id', 'F') IS NOT NULL alter table doc drop constraint fk_doc_id;
+
+IF OBJECT_ID('fk_doc_link_doc', 'F') IS NOT NULL alter table doc_link drop constraint fk_doc_link_doc;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('doc_link','U') AND name = 'ix_doc_link_doc') drop index ix_doc_link_doc ON doc_link;
+
+IF OBJECT_ID('fk_doc_link_link', 'F') IS NOT NULL alter table doc_link drop constraint fk_doc_link_link;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('doc_link','U') AND name = 'ix_doc_link_link') drop index ix_doc_link_link ON doc_link;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('document','U') AND name = 'uq_document_title') drop index uq_document_title ON document;
+IF OBJECT_ID('fk_document_id', 'F') IS NOT NULL alter table document drop constraint fk_document_id;
+
+IF OBJECT_ID('fk_document_organisation_id', 'F') IS NOT NULL alter table document drop constraint fk_document_organisation_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('document','U') AND name = 'ix_document_organisation_id') drop index ix_document_organisation_id ON document;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('document_draft','U') AND name = 'uq_document_draft_title') drop index uq_document_draft_title ON document_draft;
+IF OBJECT_ID('fk_document_draft_organisation_id', 'F') IS NOT NULL alter table document_draft drop constraint fk_document_draft_organisation_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('document_draft','U') AND name = 'ix_document_draft_organisation_id') drop index ix_document_draft_organisation_id ON document_draft;
+
+IF OBJECT_ID('fk_document_media_document_id', 'F') IS NOT NULL alter table document_media drop constraint fk_document_media_document_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('document_media','U') AND name = 'ix_document_media_document_id') drop index ix_document_media_document_id ON document_media;
+
+IF OBJECT_ID('fk_document_media_draft_document_id', 'F') IS NOT NULL alter table document_media_draft drop constraint fk_document_media_draft_document_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('document_media_draft','U') AND name = 'ix_document_media_draft_document_id') drop index ix_document_media_draft_document_id ON document_media_draft;
+
+IF OBJECT_ID('fk_ebasic_json_map_detail_owner_id', 'F') IS NOT NULL alter table ebasic_json_map_detail drop constraint fk_ebasic_json_map_detail_owner_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ebasic_json_map_detail','U') AND name = 'ix_ebasic_json_map_detail_owner_id') drop index ix_ebasic_json_map_detail_owner_id ON ebasic_json_map_detail;
+
+IF OBJECT_ID('fk_ebasic_no_sdchild_owner_id', 'F') IS NOT NULL alter table ebasic_no_sdchild drop constraint fk_ebasic_no_sdchild_owner_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ebasic_no_sdchild','U') AND name = 'ix_ebasic_no_sdchild_owner_id') drop index ix_ebasic_no_sdchild_owner_id ON ebasic_no_sdchild;
+
+IF OBJECT_ID('fk_ebasic_sdchild_owner_id', 'F') IS NOT NULL alter table ebasic_sdchild drop constraint fk_ebasic_sdchild_owner_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ebasic_sdchild','U') AND name = 'ix_ebasic_sdchild_owner_id') drop index ix_ebasic_sdchild_owner_id ON ebasic_sdchild;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('e_basicverucon','U') AND name = 'uq_e_basicverucon_name') drop index uq_e_basicverucon_name ON e_basicverucon;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('e_basicverucon','U') AND name = 'uq_e_basicverucon_other_other_one') drop index uq_e_basicverucon_other_other_one ON e_basicverucon;
+IF OBJECT_ID('fk_eemb_inner_outer_id', 'F') IS NOT NULL alter table eemb_inner drop constraint fk_eemb_inner_outer_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('eemb_inner','U') AND name = 'ix_eemb_inner_outer_id') drop index ix_eemb_inner_outer_id ON eemb_inner;
+
+IF OBJECT_ID('fk_einvoice_person_id', 'F') IS NOT NULL alter table einvoice drop constraint fk_einvoice_person_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('einvoice','U') AND name = 'ix_einvoice_person_id') drop index ix_einvoice_person_id ON einvoice;
+
+IF OBJECT_ID('fk_enull_collection_detail_enull_collection_id', 'F') IS NOT NULL alter table enull_collection_detail drop constraint fk_enull_collection_detail_enull_collection_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('enull_collection_detail','U') AND name = 'ix_enull_collection_detail_enull_collection_id') drop index ix_enull_collection_detail_enull_collection_id ON enull_collection_detail;
+
+IF OBJECT_ID('fk_eopt_one_a_b_id', 'F') IS NOT NULL alter table eopt_one_a drop constraint fk_eopt_one_a_b_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('eopt_one_a','U') AND name = 'ix_eopt_one_a_b_id') drop index ix_eopt_one_a_b_id ON eopt_one_a;
+
+IF OBJECT_ID('fk_eopt_one_b_c_id', 'F') IS NOT NULL alter table eopt_one_b drop constraint fk_eopt_one_b_c_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('eopt_one_b','U') AND name = 'ix_eopt_one_b_c_id') drop index ix_eopt_one_b_c_id ON eopt_one_b;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('e_person_online','U') AND name = 'uq_e_person_online_email') drop index uq_e_person_online_email ON e_person_online;
+IF OBJECT_ID('fk_esoft_del_book_lend_by_id', 'F') IS NOT NULL alter table esoft_del_book drop constraint fk_esoft_del_book_lend_by_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('esoft_del_book','U') AND name = 'ix_esoft_del_book_lend_by_id') drop index ix_esoft_del_book_lend_by_id ON esoft_del_book;
+
+IF OBJECT_ID('fk_esoft_del_book_esoft_del_user_esoft_del_book', 'F') IS NOT NULL alter table esoft_del_book_esoft_del_user drop constraint fk_esoft_del_book_esoft_del_user_esoft_del_book;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('esoft_del_book_esoft_del_user','U') AND name = 'ix_esoft_del_book_esoft_del_user_esoft_del_book') drop index ix_esoft_del_book_esoft_del_user_esoft_del_book ON esoft_del_book_esoft_del_user;
+
+IF OBJECT_ID('fk_esoft_del_book_esoft_del_user_esoft_del_user', 'F') IS NOT NULL alter table esoft_del_book_esoft_del_user drop constraint fk_esoft_del_book_esoft_del_user_esoft_del_user;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('esoft_del_book_esoft_del_user','U') AND name = 'ix_esoft_del_book_esoft_del_user_esoft_del_user') drop index ix_esoft_del_book_esoft_del_user_esoft_del_user ON esoft_del_book_esoft_del_user;
+
+IF OBJECT_ID('fk_esoft_del_down_esoft_del_mid_id', 'F') IS NOT NULL alter table esoft_del_down drop constraint fk_esoft_del_down_esoft_del_mid_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('esoft_del_down','U') AND name = 'ix_esoft_del_down_esoft_del_mid_id') drop index ix_esoft_del_down_esoft_del_mid_id ON esoft_del_down;
+
+IF OBJECT_ID('fk_esoft_del_mid_top_id', 'F') IS NOT NULL alter table esoft_del_mid drop constraint fk_esoft_del_mid_top_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('esoft_del_mid','U') AND name = 'ix_esoft_del_mid_top_id') drop index ix_esoft_del_mid_top_id ON esoft_del_mid;
+
+IF OBJECT_ID('fk_esoft_del_mid_up_id', 'F') IS NOT NULL alter table esoft_del_mid drop constraint fk_esoft_del_mid_up_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('esoft_del_mid','U') AND name = 'ix_esoft_del_mid_up_id') drop index ix_esoft_del_mid_up_id ON esoft_del_mid;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('esoft_del_one_a','U') AND name = 'uq_esoft_del_one_a_oneb_id') drop index uq_esoft_del_one_a_oneb_id ON esoft_del_one_a;
+IF OBJECT_ID('fk_esoft_del_one_a_oneb_id', 'F') IS NOT NULL alter table esoft_del_one_a drop constraint fk_esoft_del_one_a_oneb_id;
+
+IF OBJECT_ID('fk_esoft_del_role_esoft_del_user_esoft_del_role', 'F') IS NOT NULL alter table esoft_del_role_esoft_del_user drop constraint fk_esoft_del_role_esoft_del_user_esoft_del_role;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('esoft_del_role_esoft_del_user','U') AND name = 'ix_esoft_del_role_esoft_del_user_esoft_del_role') drop index ix_esoft_del_role_esoft_del_user_esoft_del_role ON esoft_del_role_esoft_del_user;
+
+IF OBJECT_ID('fk_esoft_del_role_esoft_del_user_esoft_del_user', 'F') IS NOT NULL alter table esoft_del_role_esoft_del_user drop constraint fk_esoft_del_role_esoft_del_user_esoft_del_user;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('esoft_del_role_esoft_del_user','U') AND name = 'ix_esoft_del_role_esoft_del_user_esoft_del_user') drop index ix_esoft_del_role_esoft_del_user_esoft_del_user ON esoft_del_role_esoft_del_user;
+
+IF OBJECT_ID('fk_esoft_del_user_esoft_del_role_esoft_del_user', 'F') IS NOT NULL alter table esoft_del_user_esoft_del_role drop constraint fk_esoft_del_user_esoft_del_role_esoft_del_user;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('esoft_del_user_esoft_del_role','U') AND name = 'ix_esoft_del_user_esoft_del_role_esoft_del_user') drop index ix_esoft_del_user_esoft_del_role_esoft_del_user ON esoft_del_user_esoft_del_role;
+
+IF OBJECT_ID('fk_esoft_del_user_esoft_del_role_esoft_del_role', 'F') IS NOT NULL alter table esoft_del_user_esoft_del_role drop constraint fk_esoft_del_user_esoft_del_role_esoft_del_role;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('esoft_del_user_esoft_del_role','U') AND name = 'ix_esoft_del_user_esoft_del_role_esoft_del_role') drop index ix_esoft_del_user_esoft_del_role_esoft_del_role ON esoft_del_user_esoft_del_role;
+
+IF OBJECT_ID('fk_rawinherit_uncle_parent_id', 'F') IS NOT NULL alter table rawinherit_uncle drop constraint fk_rawinherit_uncle_parent_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('rawinherit_uncle','U') AND name = 'ix_rawinherit_uncle_parent_id') drop index ix_rawinherit_uncle_parent_id ON rawinherit_uncle;
+
+IF OBJECT_ID('fk_evanilla_collection_detail_evanilla_collection_id', 'F') IS NOT NULL alter table evanilla_collection_detail drop constraint fk_evanilla_collection_detail_evanilla_collection_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('evanilla_collection_detail','U') AND name = 'ix_evanilla_collection_detail_evanilla_collection_id') drop index ix_evanilla_collection_detail_evanilla_collection_id ON evanilla_collection_detail;
+
+IF OBJECT_ID('fk_td_child_parent_id', 'F') IS NOT NULL alter table td_child drop constraint fk_td_child_parent_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('td_child','U') AND name = 'ix_td_child_parent_id') drop index ix_td_child_parent_id ON td_child;
+
+IF OBJECT_ID('fk_empl_default_address_id', 'F') IS NOT NULL alter table empl drop constraint fk_empl_default_address_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('empl','U') AND name = 'ix_empl_default_address_id') drop index ix_empl_default_address_id ON empl;
+
+IF OBJECT_ID('fk_grand_parent_person_some_bean_id', 'F') IS NOT NULL alter table grand_parent_person drop constraint fk_grand_parent_person_some_bean_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('grand_parent_person','U') AND name = 'ix_grand_parent_person_some_bean_id') drop index ix_grand_parent_person_some_bean_id ON grand_parent_person;
+
+IF OBJECT_ID('fk_survey_group_categoryobjectid', 'F') IS NOT NULL alter table survey_group drop constraint fk_survey_group_categoryobjectid;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('survey_group','U') AND name = 'ix_survey_group_categoryobjectid') drop index ix_survey_group_categoryobjectid ON survey_group;
+
+IF OBJECT_ID('fk_hx_link_doc_hx_link', 'F') IS NOT NULL alter table hx_link_doc drop constraint fk_hx_link_doc_hx_link;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('hx_link_doc','U') AND name = 'ix_hx_link_doc_hx_link') drop index ix_hx_link_doc_hx_link ON hx_link_doc;
+
+IF OBJECT_ID('fk_hx_link_doc_he_doc', 'F') IS NOT NULL alter table hx_link_doc drop constraint fk_hx_link_doc_he_doc;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('hx_link_doc','U') AND name = 'ix_hx_link_doc_he_doc') drop index ix_hx_link_doc_he_doc ON hx_link_doc;
+
+IF OBJECT_ID('fk_hi_link_doc_hi_link', 'F') IS NOT NULL alter table hi_link_doc drop constraint fk_hi_link_doc_hi_link;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('hi_link_doc','U') AND name = 'ix_hi_link_doc_hi_link') drop index ix_hi_link_doc_hi_link ON hi_link_doc;
+
+IF OBJECT_ID('fk_hi_link_doc_hi_doc', 'F') IS NOT NULL alter table hi_link_doc drop constraint fk_hi_link_doc_hi_doc;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('hi_link_doc','U') AND name = 'ix_hi_link_doc_hi_doc') drop index ix_hi_link_doc_hi_doc ON hi_link_doc;
+
+IF OBJECT_ID('fk_imrelated_owner_id', 'F') IS NOT NULL alter table imrelated drop constraint fk_imrelated_owner_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('imrelated','U') AND name = 'ix_imrelated_owner_id') drop index ix_imrelated_owner_id ON imrelated;
+
+IF OBJECT_ID('fk_info_contact_company_id', 'F') IS NOT NULL alter table info_contact drop constraint fk_info_contact_company_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('info_contact','U') AND name = 'ix_info_contact_company_id') drop index ix_info_contact_company_id ON info_contact;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('info_customer','U') AND name = 'uq_info_customer_company_id') drop index uq_info_customer_company_id ON info_customer;
+IF OBJECT_ID('fk_info_customer_company_id', 'F') IS NOT NULL alter table info_customer drop constraint fk_info_customer_company_id;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('inner_report','U') AND name = 'uq_inner_report_forecast_id') drop index uq_inner_report_forecast_id ON inner_report;
+IF OBJECT_ID('fk_inner_report_forecast_id', 'F') IS NOT NULL alter table inner_report drop constraint fk_inner_report_forecast_id;
+
+IF OBJECT_ID('fk_drel_invoice_booking', 'F') IS NOT NULL alter table drel_invoice drop constraint fk_drel_invoice_booking;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('drel_invoice','U') AND name = 'ix_drel_invoice_booking') drop index ix_drel_invoice_booking ON drel_invoice;
+
+IF OBJECT_ID('fk_item_etype', 'F') IS NOT NULL alter table item drop constraint fk_item_etype;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('item','U') AND name = 'ix_item_etype') drop index ix_item_etype ON item;
+
+IF OBJECT_ID('fk_item_eregion', 'F') IS NOT NULL alter table item drop constraint fk_item_eregion;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('item','U') AND name = 'ix_item_eregion') drop index ix_item_eregion ON item;
+
+IF OBJECT_ID('fk_trainer_monkey_trainer', 'F') IS NOT NULL alter table trainer_monkey drop constraint fk_trainer_monkey_trainer;
+
+IF OBJECT_ID('fk_trainer_monkey_monkey', 'F') IS NOT NULL alter table trainer_monkey drop constraint fk_trainer_monkey_monkey;
+
+IF OBJECT_ID('fk_troop_monkey_troop', 'F') IS NOT NULL alter table troop_monkey drop constraint fk_troop_monkey_troop;
+
+IF OBJECT_ID('fk_troop_monkey_monkey', 'F') IS NOT NULL alter table troop_monkey drop constraint fk_troop_monkey_monkey;
+
+IF OBJECT_ID('fk_l2_cldf_reset_bean_child_parent_id', 'F') IS NOT NULL alter table l2_cldf_reset_bean_child drop constraint fk_l2_cldf_reset_bean_child_parent_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('l2_cldf_reset_bean_child','U') AND name = 'ix_l2_cldf_reset_bean_child_parent_id') drop index ix_l2_cldf_reset_bean_child_parent_id ON l2_cldf_reset_bean_child;
+
+IF OBJECT_ID('fk_level1_level4_level1', 'F') IS NOT NULL alter table level1_level4 drop constraint fk_level1_level4_level1;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('level1_level4','U') AND name = 'ix_level1_level4_level1') drop index ix_level1_level4_level1 ON level1_level4;
+
+IF OBJECT_ID('fk_level1_level4_level4', 'F') IS NOT NULL alter table level1_level4 drop constraint fk_level1_level4_level4;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('level1_level4','U') AND name = 'ix_level1_level4_level4') drop index ix_level1_level4_level4 ON level1_level4;
+
+IF OBJECT_ID('fk_level1_level2_level1', 'F') IS NOT NULL alter table level1_level2 drop constraint fk_level1_level2_level1;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('level1_level2','U') AND name = 'ix_level1_level2_level1') drop index ix_level1_level2_level1 ON level1_level2;
+
+IF OBJECT_ID('fk_level1_level2_level2', 'F') IS NOT NULL alter table level1_level2 drop constraint fk_level1_level2_level2;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('level1_level2','U') AND name = 'ix_level1_level2_level2') drop index ix_level1_level2_level2 ON level1_level2;
+
+IF OBJECT_ID('fk_level2_level3_level2', 'F') IS NOT NULL alter table level2_level3 drop constraint fk_level2_level3_level2;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('level2_level3','U') AND name = 'ix_level2_level3_level2') drop index ix_level2_level3_level2 ON level2_level3;
+
+IF OBJECT_ID('fk_level2_level3_level3', 'F') IS NOT NULL alter table level2_level3 drop constraint fk_level2_level3_level3;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('level2_level3','U') AND name = 'ix_level2_level3_level3') drop index ix_level2_level3_level3 ON level2_level3;
+
+IF OBJECT_ID('fk_link_id', 'F') IS NOT NULL alter table link drop constraint fk_link_id;
+
+IF OBJECT_ID('fk_la_attr_value_attribute_la_attr_value', 'F') IS NOT NULL alter table la_attr_value_attribute drop constraint fk_la_attr_value_attribute_la_attr_value;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('la_attr_value_attribute','U') AND name = 'ix_la_attr_value_attribute_la_attr_value') drop index ix_la_attr_value_attribute_la_attr_value ON la_attr_value_attribute;
+
+IF OBJECT_ID('fk_la_attr_value_attribute_attribute', 'F') IS NOT NULL alter table la_attr_value_attribute drop constraint fk_la_attr_value_attribute_attribute;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('la_attr_value_attribute','U') AND name = 'ix_la_attr_value_attribute_attribute') drop index ix_la_attr_value_attribute_attribute ON la_attr_value_attribute;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mprinter','U') AND name = 'uq_mprinter_last_swap_cyan_id') drop index uq_mprinter_last_swap_cyan_id ON mprinter;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mprinter','U') AND name = 'uq_mprinter_last_swap_magenta_id') drop index uq_mprinter_last_swap_magenta_id ON mprinter;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mprinter','U') AND name = 'uq_mprinter_last_swap_yellow_id') drop index uq_mprinter_last_swap_yellow_id ON mprinter;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mprinter','U') AND name = 'uq_mprinter_last_swap_black_id') drop index uq_mprinter_last_swap_black_id ON mprinter;
+IF OBJECT_ID('fk_mprinter_current_state_id', 'F') IS NOT NULL alter table mprinter drop constraint fk_mprinter_current_state_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mprinter','U') AND name = 'ix_mprinter_current_state_id') drop index ix_mprinter_current_state_id ON mprinter;
+
+IF OBJECT_ID('fk_mprinter_last_swap_cyan_id', 'F') IS NOT NULL alter table mprinter drop constraint fk_mprinter_last_swap_cyan_id;
+
+IF OBJECT_ID('fk_mprinter_last_swap_magenta_id', 'F') IS NOT NULL alter table mprinter drop constraint fk_mprinter_last_swap_magenta_id;
+
+IF OBJECT_ID('fk_mprinter_last_swap_yellow_id', 'F') IS NOT NULL alter table mprinter drop constraint fk_mprinter_last_swap_yellow_id;
+
+IF OBJECT_ID('fk_mprinter_last_swap_black_id', 'F') IS NOT NULL alter table mprinter drop constraint fk_mprinter_last_swap_black_id;
+
+IF OBJECT_ID('fk_mprinter_state_printer_id', 'F') IS NOT NULL alter table mprinter_state drop constraint fk_mprinter_state_printer_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mprinter_state','U') AND name = 'ix_mprinter_state_printer_id') drop index ix_mprinter_state_printer_id ON mprinter_state;
+
+IF OBJECT_ID('fk_mprofile_picture_id', 'F') IS NOT NULL alter table mprofile drop constraint fk_mprofile_picture_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mprofile','U') AND name = 'ix_mprofile_picture_id') drop index ix_mprofile_picture_id ON mprofile;
+
+IF OBJECT_ID('fk_mrole_muser_mrole', 'F') IS NOT NULL alter table mrole_muser drop constraint fk_mrole_muser_mrole;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mrole_muser','U') AND name = 'ix_mrole_muser_mrole') drop index ix_mrole_muser_mrole ON mrole_muser;
+
+IF OBJECT_ID('fk_mrole_muser_muser', 'F') IS NOT NULL alter table mrole_muser drop constraint fk_mrole_muser_muser;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mrole_muser','U') AND name = 'ix_mrole_muser_muser') drop index ix_mrole_muser_muser ON mrole_muser;
+
+IF OBJECT_ID('fk_muser_user_type_id', 'F') IS NOT NULL alter table muser drop constraint fk_muser_user_type_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('muser','U') AND name = 'ix_muser_user_type_id') drop index ix_muser_user_type_id ON muser;
+
+IF OBJECT_ID('fk_mail_user_inbox_mail_user', 'F') IS NOT NULL alter table mail_user_inbox drop constraint fk_mail_user_inbox_mail_user;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mail_user_inbox','U') AND name = 'ix_mail_user_inbox_mail_user') drop index ix_mail_user_inbox_mail_user ON mail_user_inbox;
+
+IF OBJECT_ID('fk_mail_user_inbox_mail_box', 'F') IS NOT NULL alter table mail_user_inbox drop constraint fk_mail_user_inbox_mail_box;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mail_user_inbox','U') AND name = 'ix_mail_user_inbox_mail_box') drop index ix_mail_user_inbox_mail_box ON mail_user_inbox;
+
+IF OBJECT_ID('fk_mail_user_outbox_mail_user', 'F') IS NOT NULL alter table mail_user_outbox drop constraint fk_mail_user_outbox_mail_user;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mail_user_outbox','U') AND name = 'ix_mail_user_outbox_mail_user') drop index ix_mail_user_outbox_mail_user ON mail_user_outbox;
+
+IF OBJECT_ID('fk_mail_user_outbox_mail_box', 'F') IS NOT NULL alter table mail_user_outbox drop constraint fk_mail_user_outbox_mail_box;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mail_user_outbox','U') AND name = 'ix_mail_user_outbox_mail_box') drop index ix_mail_user_outbox_mail_box ON mail_user_outbox;
+
+IF OBJECT_ID('fk_c_message_conversation_id', 'F') IS NOT NULL alter table c_message drop constraint fk_c_message_conversation_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('c_message','U') AND name = 'ix_c_message_conversation_id') drop index ix_c_message_conversation_id ON c_message;
+
+IF OBJECT_ID('fk_c_message_user_id', 'F') IS NOT NULL alter table c_message drop constraint fk_c_message_user_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('c_message','U') AND name = 'ix_c_message_user_id') drop index ix_c_message_user_id ON c_message;
+
+IF OBJECT_ID('fk_mnoc_user_mnoc_role_mnoc_user', 'F') IS NOT NULL alter table mnoc_user_mnoc_role drop constraint fk_mnoc_user_mnoc_role_mnoc_user;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mnoc_user_mnoc_role','U') AND name = 'ix_mnoc_user_mnoc_role_mnoc_user') drop index ix_mnoc_user_mnoc_role_mnoc_user ON mnoc_user_mnoc_role;
+
+IF OBJECT_ID('fk_mnoc_user_mnoc_role_mnoc_role', 'F') IS NOT NULL alter table mnoc_user_mnoc_role drop constraint fk_mnoc_user_mnoc_role_mnoc_role;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mnoc_user_mnoc_role','U') AND name = 'ix_mnoc_user_mnoc_role_mnoc_role') drop index ix_mnoc_user_mnoc_role_mnoc_role ON mnoc_user_mnoc_role;
+
+IF OBJECT_ID('fk_mny_b_a_id', 'F') IS NOT NULL alter table mny_b drop constraint fk_mny_b_a_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mny_b','U') AND name = 'ix_mny_b_a_id') drop index ix_mny_b_a_id ON mny_b;
+
+IF OBJECT_ID('fk_mny_b_mny_c_mny_b', 'F') IS NOT NULL alter table mny_b_mny_c drop constraint fk_mny_b_mny_c_mny_b;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mny_b_mny_c','U') AND name = 'ix_mny_b_mny_c_mny_b') drop index ix_mny_b_mny_c_mny_b ON mny_b_mny_c;
+
+IF OBJECT_ID('fk_mny_b_mny_c_mny_c', 'F') IS NOT NULL alter table mny_b_mny_c drop constraint fk_mny_b_mny_c_mny_c;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mny_b_mny_c','U') AND name = 'ix_mny_b_mny_c_mny_c') drop index ix_mny_b_mny_c_mny_c ON mny_b_mny_c;
+
+IF OBJECT_ID('fk_subtopics_mny_topic_1', 'F') IS NOT NULL alter table subtopics drop constraint fk_subtopics_mny_topic_1;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('subtopics','U') AND name = 'ix_subtopics_mny_topic_1') drop index ix_subtopics_mny_topic_1 ON subtopics;
+
+IF OBJECT_ID('fk_subtopics_mny_topic_2', 'F') IS NOT NULL alter table subtopics drop constraint fk_subtopics_mny_topic_2;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('subtopics','U') AND name = 'ix_subtopics_mny_topic_2') drop index ix_subtopics_mny_topic_2 ON subtopics;
+
+IF OBJECT_ID('fk_mp_role_mp_user_id', 'F') IS NOT NULL alter table mp_role drop constraint fk_mp_role_mp_user_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mp_role','U') AND name = 'ix_mp_role_mp_user_id') drop index ix_mp_role_mp_user_id ON mp_role;
+
+IF OBJECT_ID('fk_ms_many_a_many_b_ms_many_a', 'F') IS NOT NULL alter table ms_many_a_many_b drop constraint fk_ms_many_a_many_b_ms_many_a;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ms_many_a_many_b','U') AND name = 'ix_ms_many_a_many_b_ms_many_a') drop index ix_ms_many_a_many_b_ms_many_a ON ms_many_a_many_b;
+
+IF OBJECT_ID('fk_ms_many_a_many_b_ms_many_b', 'F') IS NOT NULL alter table ms_many_a_many_b drop constraint fk_ms_many_a_many_b_ms_many_b;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ms_many_a_many_b','U') AND name = 'ix_ms_many_a_many_b_ms_many_b') drop index ix_ms_many_a_many_b_ms_many_b ON ms_many_a_many_b;
+
+IF OBJECT_ID('fk_ms_many_b_many_a_ms_many_b', 'F') IS NOT NULL alter table ms_many_b_many_a drop constraint fk_ms_many_b_many_a_ms_many_b;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ms_many_b_many_a','U') AND name = 'ix_ms_many_b_many_a_ms_many_b') drop index ix_ms_many_b_many_a_ms_many_b ON ms_many_b_many_a;
+
+IF OBJECT_ID('fk_ms_many_b_many_a_ms_many_a', 'F') IS NOT NULL alter table ms_many_b_many_a drop constraint fk_ms_many_b_many_a_ms_many_a;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ms_many_b_many_a','U') AND name = 'ix_ms_many_b_many_a_ms_many_a') drop index ix_ms_many_b_many_a_ms_many_a ON ms_many_b_many_a;
+
+IF OBJECT_ID('fk_my_lob_size_join_many_parent_id', 'F') IS NOT NULL alter table my_lob_size_join_many drop constraint fk_my_lob_size_join_many_parent_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('my_lob_size_join_many','U') AND name = 'ix_my_lob_size_join_many_parent_id') drop index ix_my_lob_size_join_many_parent_id ON my_lob_size_join_many;
+
+IF OBJECT_ID('fk_o_cached_bean_country_o_cached_bean', 'F') IS NOT NULL alter table o_cached_bean_country drop constraint fk_o_cached_bean_country_o_cached_bean;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('o_cached_bean_country','U') AND name = 'ix_o_cached_bean_country_o_cached_bean') drop index ix_o_cached_bean_country_o_cached_bean ON o_cached_bean_country;
+
+IF OBJECT_ID('fk_o_cached_bean_country_o_country', 'F') IS NOT NULL alter table o_cached_bean_country drop constraint fk_o_cached_bean_country_o_country;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('o_cached_bean_country','U') AND name = 'ix_o_cached_bean_country_o_country') drop index ix_o_cached_bean_country_o_country ON o_cached_bean_country;
+
+IF OBJECT_ID('fk_o_cached_bean_child_cached_bean_id', 'F') IS NOT NULL alter table o_cached_bean_child drop constraint fk_o_cached_bean_child_cached_bean_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('o_cached_bean_child','U') AND name = 'ix_o_cached_bean_child_cached_bean_id') drop index ix_o_cached_bean_child_cached_bean_id ON o_cached_bean_child;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ocompany','U') AND name = 'uq_ocompany_corp_id') drop index uq_ocompany_corp_id ON ocompany;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('oengine','U') AND name = 'uq_oengine_car_id') drop index uq_oengine_car_id ON oengine;
+IF OBJECT_ID('fk_oengine_car_id', 'F') IS NOT NULL alter table oengine drop constraint fk_oengine_car_id;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ogear_box','U') AND name = 'uq_ogear_box_car_id') drop index uq_ogear_box_car_id ON ogear_box;
+IF OBJECT_ID('fk_ogear_box_car_id', 'F') IS NOT NULL alter table ogear_box drop constraint fk_ogear_box_car_id;
+
+IF OBJECT_ID('fk_oroad_show_msg_company_id', 'F') IS NOT NULL alter table oroad_show_msg drop constraint fk_oroad_show_msg_company_id;
+
+IF OBJECT_ID('fk_om_ordered_detail_master_id', 'F') IS NOT NULL alter table om_ordered_detail drop constraint fk_om_ordered_detail_master_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('om_ordered_detail','U') AND name = 'ix_om_ordered_detail_master_id') drop index ix_om_ordered_detail_master_id ON om_ordered_detail;
+
+IF OBJECT_ID('fk_o_order_kcustomer_id', 'F') IS NOT NULL alter table o_order drop constraint fk_o_order_kcustomer_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('o_order','U') AND name = 'ix_o_order_kcustomer_id') drop index ix_o_order_kcustomer_id ON o_order;
+
+IF OBJECT_ID('fk_o_order_detail_order_id', 'F') IS NOT NULL alter table o_order_detail drop constraint fk_o_order_detail_order_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('o_order_detail','U') AND name = 'ix_o_order_detail_order_id') drop index ix_o_order_detail_order_id ON o_order_detail;
+
+IF OBJECT_ID('fk_o_order_detail_product_id', 'F') IS NOT NULL alter table o_order_detail drop constraint fk_o_order_detail_product_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('o_order_detail','U') AND name = 'ix_o_order_detail_product_id') drop index ix_o_order_detail_product_id ON o_order_detail;
+
+IF OBJECT_ID('fk_s_order_items_order_uuid', 'F') IS NOT NULL alter table s_order_items drop constraint fk_s_order_items_order_uuid;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('s_order_items','U') AND name = 'ix_s_order_items_order_uuid') drop index ix_s_order_items_order_uuid ON s_order_items;
+
+IF OBJECT_ID('fk_or_order_ship_order_id', 'F') IS NOT NULL alter table or_order_ship drop constraint fk_or_order_ship_order_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('or_order_ship','U') AND name = 'ix_or_order_ship_order_id') drop index ix_or_order_ship_order_id ON or_order_ship;
+
+IF OBJECT_ID('fk_oto_bchild_master_id', 'F') IS NOT NULL alter table oto_bchild drop constraint fk_oto_bchild_master_id;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('oto_child','U') AND name = 'uq_oto_child_master_id') drop index uq_oto_child_master_id ON oto_child;
+IF OBJECT_ID('fk_oto_child_master_id', 'F') IS NOT NULL alter table oto_child drop constraint fk_oto_child_master_id;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('oto_cust_address','U') AND name = 'uq_oto_cust_address_customer_cid') drop index uq_oto_cust_address_customer_cid ON oto_cust_address;
+IF OBJECT_ID('fk_oto_cust_address_customer_cid', 'F') IS NOT NULL alter table oto_cust_address drop constraint fk_oto_cust_address_customer_cid;
+
+IF OBJECT_ID('fk_oto_prime_extra_eid', 'F') IS NOT NULL alter table oto_prime_extra drop constraint fk_oto_prime_extra_eid;
+
+IF OBJECT_ID('fk_oto_th_many_oto_th_top_id', 'F') IS NOT NULL alter table oto_th_many drop constraint fk_oto_th_many_oto_th_top_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('oto_th_many','U') AND name = 'ix_oto_th_many_oto_th_top_id') drop index ix_oto_th_many_oto_th_top_id ON oto_th_many;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('oto_th_one','U') AND name = 'uq_oto_th_one_many_id') drop index uq_oto_th_one_many_id ON oto_th_one;
+IF OBJECT_ID('fk_oto_th_one_many_id', 'F') IS NOT NULL alter table oto_th_one drop constraint fk_oto_th_one_many_id;
+
+IF OBJECT_ID('fk_oto_ubprime_extra_eid', 'F') IS NOT NULL alter table oto_ubprime_extra drop constraint fk_oto_ubprime_extra_eid;
+
+IF OBJECT_ID('fk_oto_uprime_extra_eid', 'F') IS NOT NULL alter table oto_uprime_extra drop constraint fk_oto_uprime_extra_eid;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('pfile','U') AND name = 'uq_pfile_file_content_id') drop index uq_pfile_file_content_id ON pfile;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('pfile','U') AND name = 'uq_pfile_file_content2_id') drop index uq_pfile_file_content2_id ON pfile;
+IF OBJECT_ID('fk_pfile_file_content_id', 'F') IS NOT NULL alter table pfile drop constraint fk_pfile_file_content_id;
+
+IF OBJECT_ID('fk_pfile_file_content2_id', 'F') IS NOT NULL alter table pfile drop constraint fk_pfile_file_content2_id;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('paggview','U') AND name = 'uq_paggview_pview_id') drop index uq_paggview_pview_id ON paggview;
+IF OBJECT_ID('fk_paggview_pview_id', 'F') IS NOT NULL alter table paggview drop constraint fk_paggview_pview_id;
+
+IF OBJECT_ID('fk_pallet_location_zone_sid', 'F') IS NOT NULL alter table pallet_location drop constraint fk_pallet_location_zone_sid;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('pallet_location','U') AND name = 'ix_pallet_location_zone_sid') drop index ix_pallet_location_zone_sid ON pallet_location;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('parcel_location','U') AND name = 'uq_parcel_location_parcelid') drop index uq_parcel_location_parcelid ON parcel_location;
+IF OBJECT_ID('fk_parcel_location_parcelid', 'F') IS NOT NULL alter table parcel_location drop constraint fk_parcel_location_parcelid;
+
+IF OBJECT_ID('fk_rawinherit_parent_rawinherit_data_rawinherit_parent', 'F') IS NOT NULL alter table rawinherit_parent_rawinherit_data drop constraint fk_rawinherit_parent_rawinherit_data_rawinherit_parent;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('rawinherit_parent_rawinherit_data','U') AND name = 'ix_rawinherit_parent_rawinherit_data_rawinherit_parent') drop index ix_rawinherit_parent_rawinherit_data_rawinherit_parent ON rawinherit_parent_rawinherit_data;
+
+IF OBJECT_ID('fk_rawinherit_parent_rawinherit_data_rawinherit_data', 'F') IS NOT NULL alter table rawinherit_parent_rawinherit_data drop constraint fk_rawinherit_parent_rawinherit_data_rawinherit_data;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('rawinherit_parent_rawinherit_data','U') AND name = 'ix_rawinherit_parent_rawinherit_data_rawinherit_data') drop index ix_rawinherit_parent_rawinherit_data_rawinherit_data ON rawinherit_parent_rawinherit_data;
+
+IF OBJECT_ID('fk_parent_person_some_bean_id', 'F') IS NOT NULL alter table parent_person drop constraint fk_parent_person_some_bean_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('parent_person','U') AND name = 'ix_parent_person_some_bean_id') drop index ix_parent_person_some_bean_id ON parent_person;
+
+IF OBJECT_ID('fk_parent_person_parent_identifier', 'F') IS NOT NULL alter table parent_person drop constraint fk_parent_person_parent_identifier;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('parent_person','U') AND name = 'ix_parent_person_parent_identifier') drop index ix_parent_person_parent_identifier ON parent_person;
+
+IF OBJECT_ID('fk_c_participation_conversation_id', 'F') IS NOT NULL alter table c_participation drop constraint fk_c_participation_conversation_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('c_participation','U') AND name = 'ix_c_participation_conversation_id') drop index ix_c_participation_conversation_id ON c_participation;
+
+IF OBJECT_ID('fk_c_participation_user_id', 'F') IS NOT NULL alter table c_participation drop constraint fk_c_participation_user_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('c_participation','U') AND name = 'ix_c_participation_user_id') drop index ix_c_participation_user_id ON c_participation;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('persistent_file_content','U') AND name = 'uq_persistent_file_content_persistent_file_id') drop index uq_persistent_file_content_persistent_file_id ON persistent_file_content;
+IF OBJECT_ID('fk_persistent_file_content_persistent_file_id', 'F') IS NOT NULL alter table persistent_file_content drop constraint fk_persistent_file_content_persistent_file_id;
+
+IF OBJECT_ID('fk_person_default_address_oid', 'F') IS NOT NULL alter table person drop constraint fk_person_default_address_oid;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('person','U') AND name = 'ix_person_default_address_oid') drop index ix_person_default_address_oid ON person;
+
+IF OBJECT_ID('fk_phones_person_id', 'F') IS NOT NULL alter table phones drop constraint fk_phones_person_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('phones','U') AND name = 'ix_phones_person_id') drop index ix_phones_person_id ON phones;
+
+IF OBJECT_ID('fk_pp_to_ww_pp', 'F') IS NOT NULL alter table pp_to_ww drop constraint fk_pp_to_ww_pp;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('pp_to_ww','U') AND name = 'ix_pp_to_ww_pp') drop index ix_pp_to_ww_pp ON pp_to_ww;
+
+IF OBJECT_ID('fk_pp_to_ww_wview', 'F') IS NOT NULL alter table pp_to_ww drop constraint fk_pp_to_ww_wview;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('pp_to_ww','U') AND name = 'ix_pp_to_ww_wview') drop index ix_pp_to_ww_wview ON pp_to_ww;
+
+IF OBJECT_ID('fk_question_groupobjectid', 'F') IS NOT NULL alter table question drop constraint fk_question_groupobjectid;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('question','U') AND name = 'ix_question_groupobjectid') drop index ix_question_groupobjectid ON question;
+
+IF OBJECT_ID('fk_r_orders_customer', 'F') IS NOT NULL alter table r_orders drop constraint fk_r_orders_customer;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('r_orders','U') AND name = 'ix_r_orders_customer') drop index ix_r_orders_customer ON r_orders;
+
+IF OBJECT_ID('fk_resourcefile_parentresourcefileid', 'F') IS NOT NULL alter table resourcefile drop constraint fk_resourcefile_parentresourcefileid;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('resourcefile','U') AND name = 'ix_resourcefile_parentresourcefileid') drop index ix_resourcefile_parentresourcefileid ON resourcefile;
+
+IF OBJECT_ID('fk_mt_role_tenant_id', 'F') IS NOT NULL alter table mt_role drop constraint fk_mt_role_tenant_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mt_role','U') AND name = 'ix_mt_role_tenant_id') drop index ix_mt_role_tenant_id ON mt_role;
+
+IF OBJECT_ID('fk_mt_role_permission_mt_role', 'F') IS NOT NULL alter table mt_role_permission drop constraint fk_mt_role_permission_mt_role;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mt_role_permission','U') AND name = 'ix_mt_role_permission_mt_role') drop index ix_mt_role_permission_mt_role ON mt_role_permission;
+
+IF OBJECT_ID('fk_mt_role_permission_mt_permission', 'F') IS NOT NULL alter table mt_role_permission drop constraint fk_mt_role_permission_mt_permission;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mt_role_permission','U') AND name = 'ix_mt_role_permission_mt_permission') drop index ix_mt_role_permission_mt_permission ON mt_role_permission;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('f_second','U') AND name = 'uq_f_second_first') drop index uq_f_second_first ON f_second;
+IF OBJECT_ID('fk_f_second_first', 'F') IS NOT NULL alter table f_second drop constraint fk_f_second_first;
+
+IF OBJECT_ID('fk_section_article_id', 'F') IS NOT NULL alter table section drop constraint fk_section_article_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('section','U') AND name = 'ix_section_article_id') drop index ix_section_article_id ON section;
+
+IF OBJECT_ID('fk_self_parent_parent_id', 'F') IS NOT NULL alter table self_parent drop constraint fk_self_parent_parent_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('self_parent','U') AND name = 'ix_self_parent_parent_id') drop index ix_self_parent_parent_id ON self_parent;
+
+IF OBJECT_ID('fk_self_ref_customer_referred_by_id', 'F') IS NOT NULL alter table self_ref_customer drop constraint fk_self_ref_customer_referred_by_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('self_ref_customer','U') AND name = 'ix_self_ref_customer_referred_by_id') drop index ix_self_ref_customer_referred_by_id ON self_ref_customer;
+
+IF OBJECT_ID('fk_self_ref_example_parent_id', 'F') IS NOT NULL alter table self_ref_example drop constraint fk_self_ref_example_parent_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('self_ref_example','U') AND name = 'ix_self_ref_example_parent_id') drop index ix_self_ref_example_parent_id ON self_ref_example;
+
+IF OBJECT_ID('fk_stockforecast_inner_report_id', 'F') IS NOT NULL alter table stockforecast drop constraint fk_stockforecast_inner_report_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('stockforecast','U') AND name = 'ix_stockforecast_inner_report_id') drop index ix_stockforecast_inner_report_id ON stockforecast;
+
+IF OBJECT_ID('fk_sub_section_section_id', 'F') IS NOT NULL alter table sub_section drop constraint fk_sub_section_section_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('sub_section','U') AND name = 'ix_sub_section_section_id') drop index ix_sub_section_section_id ON sub_section;
+
+IF OBJECT_ID('fk_tevent_many_event_id', 'F') IS NOT NULL alter table tevent_many drop constraint fk_tevent_many_event_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('tevent_many','U') AND name = 'ix_tevent_many_event_id') drop index ix_tevent_many_event_id ON tevent_many;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('tevent_one','U') AND name = 'uq_tevent_one_event_id') drop index uq_tevent_one_event_id ON tevent_one;
+IF OBJECT_ID('fk_tevent_one_event_id', 'F') IS NOT NULL alter table tevent_one drop constraint fk_tevent_one_event_id;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('t_detail_with_other_namexxxyy','U') AND name = 'uq_t_detail_with_other_namexxxyy_some_unique_value') drop index uq_t_detail_with_other_namexxxyy_some_unique_value ON t_detail_with_other_namexxxyy;
+IF OBJECT_ID('fk_t_detail_with_other_namexxxyy_master_id', 'F') IS NOT NULL alter table t_detail_with_other_namexxxyy drop constraint fk_t_detail_with_other_namexxxyy_master_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('t_detail_with_other_namexxxyy','U') AND name = 'ix_t_detail_with_other_namexxxyy_master_id') drop index ix_t_detail_with_other_namexxxyy_master_id ON t_detail_with_other_namexxxyy;
+
+IF OBJECT_ID('fk_ts_detail_two_master_id', 'F') IS NOT NULL alter table ts_detail_two drop constraint fk_ts_detail_two_master_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ts_detail_two','U') AND name = 'ix_ts_detail_two_master_id') drop index ix_ts_detail_two_master_id ON ts_detail_two;
+
+IF OBJECT_ID('fk_twheel_owner_plate_no', 'F') IS NOT NULL alter table twheel drop constraint fk_twheel_owner_plate_no;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('twheel','U') AND name = 'ix_twheel_owner_plate_no') drop index ix_twheel_owner_plate_no ON twheel;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('tire','U') AND name = 'uq_tire_wheel') drop index uq_tire_wheel ON tire;
+IF OBJECT_ID('fk_tire_wheel', 'F') IS NOT NULL alter table tire drop constraint fk_tire_wheel;
+
+IF OBJECT_ID('fk_trip_vehicle_driver_id', 'F') IS NOT NULL alter table trip drop constraint fk_trip_vehicle_driver_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('trip','U') AND name = 'ix_trip_vehicle_driver_id') drop index ix_trip_vehicle_driver_id ON trip;
+
+IF OBJECT_ID('fk_trip_address_id', 'F') IS NOT NULL alter table trip drop constraint fk_trip_address_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('trip','U') AND name = 'ix_trip_address_id') drop index ix_trip_address_id ON trip;
+
+IF OBJECT_ID('fk_type_sub_type_id', 'F') IS NOT NULL alter table type drop constraint fk_type_sub_type_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('type','U') AND name = 'ix_type_sub_type_id') drop index ix_type_sub_type_id ON type;
+
+IF OBJECT_ID('fk_ut_detail_utmaster_id', 'F') IS NOT NULL alter table ut_detail drop constraint fk_ut_detail_utmaster_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ut_detail','U') AND name = 'ix_ut_detail_utmaster_id') drop index ix_ut_detail_utmaster_id ON ut_detail;
+
+IF OBJECT_ID('fk_uutwo_master_id', 'F') IS NOT NULL alter table uutwo drop constraint fk_uutwo_master_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('uutwo','U') AND name = 'ix_uutwo_master_id') drop index ix_uutwo_master_id ON uutwo;
+
+IF OBJECT_ID('fk_c_user_group_id', 'F') IS NOT NULL alter table c_user drop constraint fk_c_user_group_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('c_user','U') AND name = 'ix_c_user_group_id') drop index ix_c_user_group_id ON c_user;
+
+IF OBJECT_ID('fk_oto_user_account_id', 'F') IS NOT NULL alter table oto_user drop constraint fk_oto_user_account_id;
+
+IF OBJECT_ID('fk_em_user_role_user_id', 'F') IS NOT NULL alter table em_user_role drop constraint fk_em_user_role_user_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('em_user_role','U') AND name = 'ix_em_user_role_user_id') drop index ix_em_user_role_user_id ON em_user_role;
+
+IF OBJECT_ID('fk_em_user_role_role_id', 'F') IS NOT NULL alter table em_user_role drop constraint fk_em_user_role_role_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('em_user_role','U') AND name = 'ix_em_user_role_role_id') drop index ix_em_user_role_role_id ON em_user_role;
+
+IF OBJECT_ID('fk_vehicle_car_ref_id', 'F') IS NOT NULL alter table vehicle drop constraint fk_vehicle_car_ref_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('vehicle','U') AND name = 'ix_vehicle_car_ref_id') drop index ix_vehicle_car_ref_id ON vehicle;
+
+IF OBJECT_ID('fk_vehicle_truck_ref_id', 'F') IS NOT NULL alter table vehicle drop constraint fk_vehicle_truck_ref_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('vehicle','U') AND name = 'ix_vehicle_truck_ref_id') drop index ix_vehicle_truck_ref_id ON vehicle;
+
+IF OBJECT_ID('fk_vehicle_driver_vehicle_id', 'F') IS NOT NULL alter table vehicle_driver drop constraint fk_vehicle_driver_vehicle_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('vehicle_driver','U') AND name = 'ix_vehicle_driver_vehicle_id') drop index ix_vehicle_driver_vehicle_id ON vehicle_driver;
+
+IF OBJECT_ID('fk_vehicle_driver_address_id', 'F') IS NOT NULL alter table vehicle_driver drop constraint fk_vehicle_driver_address_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('vehicle_driver','U') AND name = 'ix_vehicle_driver_address_id') drop index ix_vehicle_driver_address_id ON vehicle_driver;
+
+IF OBJECT_ID('fk_warehouses_officezoneid', 'F') IS NOT NULL alter table warehouses drop constraint fk_warehouses_officezoneid;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('warehouses','U') AND name = 'ix_warehouses_officezoneid') drop index ix_warehouses_officezoneid ON warehouses;
+
+IF OBJECT_ID('fk_warehousesshippingzones_warehouses', 'F') IS NOT NULL alter table warehousesshippingzones drop constraint fk_warehousesshippingzones_warehouses;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('warehousesshippingzones','U') AND name = 'ix_warehousesshippingzones_warehouses') drop index ix_warehousesshippingzones_warehouses ON warehousesshippingzones;
+
+IF OBJECT_ID('fk_warehousesshippingzones_zones', 'F') IS NOT NULL alter table warehousesshippingzones drop constraint fk_warehousesshippingzones_zones;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('warehousesshippingzones','U') AND name = 'ix_warehousesshippingzones_zones') drop index ix_warehousesshippingzones_zones ON warehousesshippingzones;
+
+IF OBJECT_ID('fk_sa_wheel_tire', 'F') IS NOT NULL alter table sa_wheel drop constraint fk_sa_wheel_tire;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('sa_wheel','U') AND name = 'ix_sa_wheel_tire') drop index ix_sa_wheel_tire ON sa_wheel;
+
+IF OBJECT_ID('fk_sa_wheel_car', 'F') IS NOT NULL alter table sa_wheel drop constraint fk_sa_wheel_car;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('sa_wheel','U') AND name = 'ix_sa_wheel_car') drop index ix_sa_wheel_car ON sa_wheel;
+
+IF OBJECT_ID('fk_g_who_props_otm_who_created_id', 'F') IS NOT NULL alter table g_who_props_otm drop constraint fk_g_who_props_otm_who_created_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('g_who_props_otm','U') AND name = 'ix_g_who_props_otm_who_created_id') drop index ix_g_who_props_otm_who_created_id ON g_who_props_otm;
+
+IF OBJECT_ID('fk_g_who_props_otm_who_modified_id', 'F') IS NOT NULL alter table g_who_props_otm drop constraint fk_g_who_props_otm_who_modified_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('g_who_props_otm','U') AND name = 'ix_g_who_props_otm_who_modified_id') drop index ix_g_who_props_otm_who_modified_id ON g_who_props_otm;
+
+IF OBJECT_ID('fk_with_zero_parent_id', 'F') IS NOT NULL alter table with_zero drop constraint fk_with_zero_parent_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('with_zero','U') AND name = 'ix_with_zero_parent_id') drop index ix_with_zero_parent_id ON with_zero;
+
+IF OBJECT_ID('asimple_bean', 'U') IS NOT NULL drop table asimple_bean;
+IF OBJECT_ID('asimple_bean_seq', 'SO') IS NOT NULL drop sequence asimple_bean_seq;
+
+IF OBJECT_ID('bar', 'U') IS NOT NULL drop table bar;
+IF OBJECT_ID('bar_seq', 'SO') IS NOT NULL drop sequence bar_seq;
+
+IF OBJECT_ID('oto_account', 'U') IS NOT NULL drop table oto_account;
+IF OBJECT_ID('oto_account_seq', 'SO') IS NOT NULL drop sequence oto_account_seq;
+
+IF OBJECT_ID('addr', 'U') IS NOT NULL drop table addr;
+IF OBJECT_ID('addr_seq', 'SO') IS NOT NULL drop sequence addr_seq;
+
+IF OBJECT_ID('address', 'U') IS NOT NULL drop table address;
+IF OBJECT_ID('address_seq', 'SO') IS NOT NULL drop sequence address_seq;
+
+IF OBJECT_ID('o_address', 'U') IS NOT NULL drop table o_address;
+IF OBJECT_ID('o_address_seq', 'SO') IS NOT NULL drop sequence o_address_seq;
+
+IF OBJECT_ID('album', 'U') IS NOT NULL drop table album;
+IF OBJECT_ID('album_seq', 'SO') IS NOT NULL drop sequence album_seq;
+
+IF OBJECT_ID('animal', 'U') IS NOT NULL drop table animal;
+IF OBJECT_ID('animal_seq', 'SO') IS NOT NULL drop sequence animal_seq;
+
+IF OBJECT_ID('animal_shelter', 'U') IS NOT NULL drop table animal_shelter;
+IF OBJECT_ID('animal_shelter_seq', 'SO') IS NOT NULL drop sequence animal_shelter_seq;
+
+IF OBJECT_ID('article', 'U') IS NOT NULL drop table article;
+IF OBJECT_ID('article_seq', 'SO') IS NOT NULL drop sequence article_seq;
+
+IF OBJECT_ID('attribute', 'U') IS NOT NULL drop table attribute;
+IF OBJECT_ID('attribute_seq', 'SO') IS NOT NULL drop sequence attribute_seq;
+
+IF OBJECT_ID('attribute_holder', 'U') IS NOT NULL drop table attribute_holder;
+IF OBJECT_ID('attribute_holder_seq', 'SO') IS NOT NULL drop sequence attribute_holder_seq;
+
+IF OBJECT_ID('audit_log', 'U') IS NOT NULL drop table audit_log;
+IF OBJECT_ID('audit_log_seq', 'SO') IS NOT NULL drop sequence audit_log_seq;
+
+IF OBJECT_ID('bbookmark', 'U') IS NOT NULL drop table bbookmark;
+IF OBJECT_ID('bbookmark_seq', 'SO') IS NOT NULL drop sequence bbookmark_seq;
+
+IF OBJECT_ID('bbookmark_user', 'U') IS NOT NULL drop table bbookmark_user;
+IF OBJECT_ID('bbookmark_user_seq', 'SO') IS NOT NULL drop sequence bbookmark_user_seq;
+
+IF OBJECT_ID('bsimple_with_gen', 'U') IS NOT NULL drop table bsimple_with_gen;
+IF OBJECT_ID('bsimple_with_gen_seq', 'SO') IS NOT NULL drop sequence bsimple_with_gen_seq;
+
+IF OBJECT_ID('bsite', 'U') IS NOT NULL drop table bsite;
+
+IF OBJECT_ID('bsite_user', 'U') IS NOT NULL drop table bsite_user;
+
+IF OBJECT_ID('bsite_user_b', 'U') IS NOT NULL drop table bsite_user_b;
+
+IF OBJECT_ID('bsite_user_c', 'U') IS NOT NULL drop table bsite_user_c;
+
+IF OBJECT_ID('buser', 'U') IS NOT NULL drop table buser;
+
+IF OBJECT_ID('bwith_qident', 'U') IS NOT NULL drop table bwith_qident;
+IF OBJECT_ID('bwith_qident_seq', 'SO') IS NOT NULL drop sequence bwith_qident_seq;
+
+IF OBJECT_ID('basic_joda_entity', 'U') IS NOT NULL drop table basic_joda_entity;
+IF OBJECT_ID('basic_joda_entity_seq', 'SO') IS NOT NULL drop sequence basic_joda_entity_seq;
+
+IF OBJECT_ID('bean_with_time_zone', 'U') IS NOT NULL drop table bean_with_time_zone;
+IF OBJECT_ID('bean_with_time_zone_seq', 'SO') IS NOT NULL drop sequence bean_with_time_zone_seq;
+
+IF OBJECT_ID('drel_booking', 'U') IS NOT NULL drop table drel_booking;
+IF OBJECT_ID('drel_booking_seq', 'SO') IS NOT NULL drop sequence drel_booking_seq;
+
+IF OBJECT_ID('cinh_root', 'U') IS NOT NULL drop table cinh_root;
+IF OBJECT_ID('cinh_root_seq', 'SO') IS NOT NULL drop sequence cinh_root_seq;
+
+IF OBJECT_ID('ckey_assoc', 'U') IS NOT NULL drop table ckey_assoc;
+IF OBJECT_ID('ckey_assoc_seq', 'SO') IS NOT NULL drop sequence ckey_assoc_seq;
+
+IF OBJECT_ID('ckey_detail', 'U') IS NOT NULL drop table ckey_detail;
+IF OBJECT_ID('ckey_detail_seq', 'SO') IS NOT NULL drop sequence ckey_detail_seq;
+
+IF OBJECT_ID('ckey_parent', 'U') IS NOT NULL drop table ckey_parent;
+
+IF OBJECT_ID('calculation_result', 'U') IS NOT NULL drop table calculation_result;
+IF OBJECT_ID('calculation_result_seq', 'SO') IS NOT NULL drop sequence calculation_result_seq;
+
+IF OBJECT_ID('cao_bean', 'U') IS NOT NULL drop table cao_bean;
+
+IF OBJECT_ID('sa_car', 'U') IS NOT NULL drop table sa_car;
+IF OBJECT_ID('sa_car_seq', 'SO') IS NOT NULL drop sequence sa_car_seq;
+
+IF OBJECT_ID('sp_car_car', 'U') IS NOT NULL drop table sp_car_car;
+IF OBJECT_ID('sp_car_car_seq', 'SO') IS NOT NULL drop sequence sp_car_car_seq;
+
+IF OBJECT_ID('sp_car_car_wheels', 'U') IS NOT NULL drop table sp_car_car_wheels;
+
+IF OBJECT_ID('car_accessory', 'U') IS NOT NULL drop table car_accessory;
+IF OBJECT_ID('car_accessory_seq', 'SO') IS NOT NULL drop sequence car_accessory_seq;
+
+IF OBJECT_ID('car_fuse', 'U') IS NOT NULL drop table car_fuse;
+IF OBJECT_ID('car_fuse_seq', 'SO') IS NOT NULL drop sequence car_fuse_seq;
+
+IF OBJECT_ID('category', 'U') IS NOT NULL drop table category;
+IF OBJECT_ID('category_seq', 'SO') IS NOT NULL drop sequence category_seq;
+
+IF OBJECT_ID('child_person', 'U') IS NOT NULL drop table child_person;
+IF OBJECT_ID('child_person_seq', 'SO') IS NOT NULL drop sequence child_person_seq;
+
+IF OBJECT_ID('configuration', 'U') IS NOT NULL drop table configuration;
+IF OBJECT_ID('configuration_seq', 'SO') IS NOT NULL drop sequence configuration_seq;
+
+IF OBJECT_ID('configurations', 'U') IS NOT NULL drop table configurations;
+IF OBJECT_ID('configurations_seq', 'SO') IS NOT NULL drop sequence configurations_seq;
+
+IF OBJECT_ID('contact', 'U') IS NOT NULL drop table contact;
+IF OBJECT_ID('contact_seq', 'SO') IS NOT NULL drop sequence contact_seq;
+
+IF OBJECT_ID('contact_group', 'U') IS NOT NULL drop table contact_group;
+IF OBJECT_ID('contact_group_seq', 'SO') IS NOT NULL drop sequence contact_group_seq;
+
+IF OBJECT_ID('contact_note', 'U') IS NOT NULL drop table contact_note;
+IF OBJECT_ID('contact_note_seq', 'SO') IS NOT NULL drop sequence contact_note_seq;
+
+IF OBJECT_ID('c_conversation', 'U') IS NOT NULL drop table c_conversation;
+IF OBJECT_ID('c_conversation_seq', 'SO') IS NOT NULL drop sequence c_conversation_seq;
+
+IF OBJECT_ID('o_country', 'U') IS NOT NULL drop table o_country;
+
+IF OBJECT_ID('cover', 'U') IS NOT NULL drop table cover;
+IF OBJECT_ID('cover_seq', 'SO') IS NOT NULL drop sequence cover_seq;
+
+IF OBJECT_ID('o_customer', 'U') IS NOT NULL drop table o_customer;
+IF OBJECT_ID('o_customer_seq', 'SO') IS NOT NULL drop sequence o_customer_seq;
+
+IF OBJECT_ID('dcredit', 'U') IS NOT NULL drop table dcredit;
+IF OBJECT_ID('dcredit_seq', 'SO') IS NOT NULL drop sequence dcredit_seq;
+
+IF OBJECT_ID('dcredit_drol', 'U') IS NOT NULL drop table dcredit_drol;
+
+IF OBJECT_ID('dexh_entity', 'U') IS NOT NULL drop table dexh_entity;
+IF OBJECT_ID('dexh_entity_seq', 'SO') IS NOT NULL drop sequence dexh_entity_seq;
+
+IF OBJECT_ID('dperson', 'U') IS NOT NULL drop table dperson;
+IF OBJECT_ID('dperson_seq', 'SO') IS NOT NULL drop sequence dperson_seq;
+
+IF OBJECT_ID('drol', 'U') IS NOT NULL drop table drol;
+IF OBJECT_ID('drol_seq', 'SO') IS NOT NULL drop sequence drol_seq;
+
+IF OBJECT_ID('drot', 'U') IS NOT NULL drop table drot;
+IF OBJECT_ID('drot_seq', 'SO') IS NOT NULL drop sequence drot_seq;
+
+IF OBJECT_ID('drot_drol', 'U') IS NOT NULL drop table drot_drol;
+
+IF OBJECT_ID('rawinherit_data', 'U') IS NOT NULL drop table rawinherit_data;
+IF OBJECT_ID('rawinherit_data_seq', 'SO') IS NOT NULL drop sequence rawinherit_data_seq;
+
+IF OBJECT_ID('dfk_cascade', 'U') IS NOT NULL drop table dfk_cascade;
+IF OBJECT_ID('dfk_cascade_seq', 'SO') IS NOT NULL drop sequence dfk_cascade_seq;
+
+IF OBJECT_ID('dfk_cascade_one', 'U') IS NOT NULL drop table dfk_cascade_one;
+IF OBJECT_ID('dfk_cascade_one_seq', 'SO') IS NOT NULL drop sequence dfk_cascade_one_seq;
+
+IF OBJECT_ID('dfk_none', 'U') IS NOT NULL drop table dfk_none;
+IF OBJECT_ID('dfk_none_seq', 'SO') IS NOT NULL drop sequence dfk_none_seq;
+
+IF OBJECT_ID('dfk_none_via_join', 'U') IS NOT NULL drop table dfk_none_via_join;
+IF OBJECT_ID('dfk_none_via_join_seq', 'SO') IS NOT NULL drop sequence dfk_none_via_join_seq;
+
+IF OBJECT_ID('dfk_one', 'U') IS NOT NULL drop table dfk_one;
+IF OBJECT_ID('dfk_one_seq', 'SO') IS NOT NULL drop sequence dfk_one_seq;
+
+IF OBJECT_ID('dfk_set_null', 'U') IS NOT NULL drop table dfk_set_null;
+IF OBJECT_ID('dfk_set_null_seq', 'SO') IS NOT NULL drop sequence dfk_set_null_seq;
+
+IF OBJECT_ID('doc', 'U') IS NOT NULL drop table doc;
+IF OBJECT_ID('doc_seq', 'SO') IS NOT NULL drop sequence doc_seq;
+
+IF OBJECT_ID('doc_link', 'U') IS NOT NULL drop table doc_link;
+
+IF OBJECT_ID('doc_link_draft', 'U') IS NOT NULL drop table doc_link_draft;
+
+IF OBJECT_ID('doc_draft', 'U') IS NOT NULL drop table doc_draft;
+IF OBJECT_ID('doc_draft_seq', 'SO') IS NOT NULL drop sequence doc_draft_seq;
+
+IF OBJECT_ID('document', 'U') IS NOT NULL drop table document;
+IF OBJECT_ID('document_seq', 'SO') IS NOT NULL drop sequence document_seq;
+
+IF OBJECT_ID('document_draft', 'U') IS NOT NULL drop table document_draft;
+IF OBJECT_ID('document_draft_seq', 'SO') IS NOT NULL drop sequence document_draft_seq;
+
+IF OBJECT_ID('document_media', 'U') IS NOT NULL drop table document_media;
+IF OBJECT_ID('document_media_seq', 'SO') IS NOT NULL drop sequence document_media_seq;
+
+IF OBJECT_ID('document_media_draft', 'U') IS NOT NULL drop table document_media_draft;
+IF OBJECT_ID('document_media_draft_seq', 'SO') IS NOT NULL drop sequence document_media_draft_seq;
+
+IF OBJECT_ID('earray_bean', 'U') IS NOT NULL drop table earray_bean;
+IF OBJECT_ID('earray_bean_seq', 'SO') IS NOT NULL drop sequence earray_bean_seq;
+
+IF OBJECT_ID('earray_set_bean', 'U') IS NOT NULL drop table earray_set_bean;
+IF OBJECT_ID('earray_set_bean_seq', 'SO') IS NOT NULL drop sequence earray_set_bean_seq;
+
+IF OBJECT_ID('e_basic', 'U') IS NOT NULL drop table e_basic;
+IF OBJECT_ID('e_basic_seq', 'SO') IS NOT NULL drop sequence e_basic_seq;
+
+IF OBJECT_ID('ebasic_change_log', 'U') IS NOT NULL drop table ebasic_change_log;
+IF OBJECT_ID('ebasic_change_log_seq', 'SO') IS NOT NULL drop sequence ebasic_change_log_seq;
+
+IF OBJECT_ID('ebasic_clob', 'U') IS NOT NULL drop table ebasic_clob;
+IF OBJECT_ID('ebasic_clob_seq', 'SO') IS NOT NULL drop sequence ebasic_clob_seq;
+
+IF OBJECT_ID('ebasic_clob_fetch_eager', 'U') IS NOT NULL drop table ebasic_clob_fetch_eager;
+IF OBJECT_ID('ebasic_clob_fetch_eager_seq', 'SO') IS NOT NULL drop sequence ebasic_clob_fetch_eager_seq;
+
+IF OBJECT_ID('ebasic_clob_no_ver', 'U') IS NOT NULL drop table ebasic_clob_no_ver;
+IF OBJECT_ID('ebasic_clob_no_ver_seq', 'SO') IS NOT NULL drop sequence ebasic_clob_no_ver_seq;
+
+IF OBJECT_ID('e_basicenc', 'U') IS NOT NULL drop table e_basicenc;
+IF OBJECT_ID('e_basicenc_seq', 'SO') IS NOT NULL drop sequence e_basicenc_seq;
+
+IF OBJECT_ID('e_basicenc_bin', 'U') IS NOT NULL drop table e_basicenc_bin;
+IF OBJECT_ID('e_basicenc_bin_seq', 'SO') IS NOT NULL drop sequence e_basicenc_bin_seq;
+
+IF OBJECT_ID('e_basic_enum_id', 'U') IS NOT NULL drop table e_basic_enum_id;
+
+IF OBJECT_ID('e_basic_eni', 'U') IS NOT NULL drop table e_basic_eni;
+IF OBJECT_ID('e_basic_eni_seq', 'SO') IS NOT NULL drop sequence e_basic_eni_seq;
+
+IF OBJECT_ID('ebasic_hstore', 'U') IS NOT NULL drop table ebasic_hstore;
+IF OBJECT_ID('ebasic_hstore_seq', 'SO') IS NOT NULL drop sequence ebasic_hstore_seq;
+
+IF OBJECT_ID('ebasic_json_list', 'U') IS NOT NULL drop table ebasic_json_list;
+IF OBJECT_ID('ebasic_json_list_seq', 'SO') IS NOT NULL drop sequence ebasic_json_list_seq;
+
+IF OBJECT_ID('ebasic_json_map', 'U') IS NOT NULL drop table ebasic_json_map;
+IF OBJECT_ID('ebasic_json_map_seq', 'SO') IS NOT NULL drop sequence ebasic_json_map_seq;
+
+IF OBJECT_ID('ebasic_json_map_blob', 'U') IS NOT NULL drop table ebasic_json_map_blob;
+IF OBJECT_ID('ebasic_json_map_blob_seq', 'SO') IS NOT NULL drop sequence ebasic_json_map_blob_seq;
+
+IF OBJECT_ID('ebasic_json_map_clob', 'U') IS NOT NULL drop table ebasic_json_map_clob;
+IF OBJECT_ID('ebasic_json_map_clob_seq', 'SO') IS NOT NULL drop sequence ebasic_json_map_clob_seq;
+
+IF OBJECT_ID('ebasic_json_map_detail', 'U') IS NOT NULL drop table ebasic_json_map_detail;
+IF OBJECT_ID('ebasic_json_map_detail_seq', 'SO') IS NOT NULL drop sequence ebasic_json_map_detail_seq;
+
+IF OBJECT_ID('ebasic_json_map_json_b', 'U') IS NOT NULL drop table ebasic_json_map_json_b;
+IF OBJECT_ID('ebasic_json_map_json_b_seq', 'SO') IS NOT NULL drop sequence ebasic_json_map_json_b_seq;
+
+IF OBJECT_ID('ebasic_json_map_varchar', 'U') IS NOT NULL drop table ebasic_json_map_varchar;
+IF OBJECT_ID('ebasic_json_map_varchar_seq', 'SO') IS NOT NULL drop sequence ebasic_json_map_varchar_seq;
+
+IF OBJECT_ID('ebasic_json_node', 'U') IS NOT NULL drop table ebasic_json_node;
+IF OBJECT_ID('ebasic_json_node_seq', 'SO') IS NOT NULL drop sequence ebasic_json_node_seq;
+
+IF OBJECT_ID('ebasic_json_node_blob', 'U') IS NOT NULL drop table ebasic_json_node_blob;
+IF OBJECT_ID('ebasic_json_node_blob_seq', 'SO') IS NOT NULL drop sequence ebasic_json_node_blob_seq;
+
+IF OBJECT_ID('ebasic_json_node_json_b', 'U') IS NOT NULL drop table ebasic_json_node_json_b;
+IF OBJECT_ID('ebasic_json_node_json_b_seq', 'SO') IS NOT NULL drop sequence ebasic_json_node_json_b_seq;
+
+IF OBJECT_ID('ebasic_json_node_varchar', 'U') IS NOT NULL drop table ebasic_json_node_varchar;
+IF OBJECT_ID('ebasic_json_node_varchar_seq', 'SO') IS NOT NULL drop sequence ebasic_json_node_varchar_seq;
+
+IF OBJECT_ID('ebasic_json_unmapped', 'U') IS NOT NULL drop table ebasic_json_unmapped;
+IF OBJECT_ID('ebasic_json_unmapped_seq', 'SO') IS NOT NULL drop sequence ebasic_json_unmapped_seq;
+
+IF OBJECT_ID('e_basic_ndc', 'U') IS NOT NULL drop table e_basic_ndc;
+IF OBJECT_ID('e_basic_ndc_seq', 'SO') IS NOT NULL drop sequence e_basic_ndc_seq;
+
+IF OBJECT_ID('ebasic_no_sdchild', 'U') IS NOT NULL drop table ebasic_no_sdchild;
+IF OBJECT_ID('ebasic_no_sdchild_seq', 'SO') IS NOT NULL drop sequence ebasic_no_sdchild_seq;
+
+IF OBJECT_ID('ebasic_sdchild', 'U') IS NOT NULL drop table ebasic_sdchild;
+IF OBJECT_ID('ebasic_sdchild_seq', 'SO') IS NOT NULL drop sequence ebasic_sdchild_seq;
+
+IF OBJECT_ID('ebasic_soft_delete', 'U') IS NOT NULL drop table ebasic_soft_delete;
+IF OBJECT_ID('ebasic_soft_delete_seq', 'SO') IS NOT NULL drop sequence ebasic_soft_delete_seq;
+
+IF OBJECT_ID('e_basicver', 'U') IS NOT NULL drop table e_basicver;
+IF OBJECT_ID('e_basicver_seq', 'SO') IS NOT NULL drop sequence e_basicver_seq;
+
+IF OBJECT_ID('e_basic_withlife', 'U') IS NOT NULL drop table e_basic_withlife;
+IF OBJECT_ID('e_basic_withlife_seq', 'SO') IS NOT NULL drop sequence e_basic_withlife_seq;
+
+IF OBJECT_ID('e_basicverucon', 'U') IS NOT NULL drop table e_basicverucon;
+IF OBJECT_ID('e_basicverucon_seq', 'SO') IS NOT NULL drop sequence e_basicverucon_seq;
+
+IF OBJECT_ID('e_col_ab', 'U') IS NOT NULL drop table e_col_ab;
+IF OBJECT_ID('e_col_ab_seq', 'SO') IS NOT NULL drop sequence e_col_ab_seq;
+
+IF OBJECT_ID('ecustom_id', 'U') IS NOT NULL drop table ecustom_id;
+
+IF OBJECT_ID('eemb_inner', 'U') IS NOT NULL drop table eemb_inner;
+IF OBJECT_ID('eemb_inner_seq', 'SO') IS NOT NULL drop sequence eemb_inner_seq;
+
+IF OBJECT_ID('eemb_outer', 'U') IS NOT NULL drop table eemb_outer;
+IF OBJECT_ID('eemb_outer_seq', 'SO') IS NOT NULL drop sequence eemb_outer_seq;
+
+IF OBJECT_ID('egen_props', 'U') IS NOT NULL drop table egen_props;
+IF OBJECT_ID('egen_props_seq', 'SO') IS NOT NULL drop sequence egen_props_seq;
+
+IF OBJECT_ID('einvoice', 'U') IS NOT NULL drop table einvoice;
+IF OBJECT_ID('einvoice_seq', 'SO') IS NOT NULL drop sequence einvoice_seq;
+
+IF OBJECT_ID('e_main', 'U') IS NOT NULL drop table e_main;
+IF OBJECT_ID('e_main_seq', 'SO') IS NOT NULL drop sequence e_main_seq;
+
+IF OBJECT_ID('enull_collection', 'U') IS NOT NULL drop table enull_collection;
+IF OBJECT_ID('enull_collection_seq', 'SO') IS NOT NULL drop sequence enull_collection_seq;
+
+IF OBJECT_ID('enull_collection_detail', 'U') IS NOT NULL drop table enull_collection_detail;
+IF OBJECT_ID('enull_collection_detail_seq', 'SO') IS NOT NULL drop sequence enull_collection_detail_seq;
+
+IF OBJECT_ID('eopt_one_a', 'U') IS NOT NULL drop table eopt_one_a;
+IF OBJECT_ID('eopt_one_a_seq', 'SO') IS NOT NULL drop sequence eopt_one_a_seq;
+
+IF OBJECT_ID('eopt_one_b', 'U') IS NOT NULL drop table eopt_one_b;
+IF OBJECT_ID('eopt_one_b_seq', 'SO') IS NOT NULL drop sequence eopt_one_b_seq;
+
+IF OBJECT_ID('eopt_one_c', 'U') IS NOT NULL drop table eopt_one_c;
+IF OBJECT_ID('eopt_one_c_seq', 'SO') IS NOT NULL drop sequence eopt_one_c_seq;
+
+IF OBJECT_ID('eperson', 'U') IS NOT NULL drop table eperson;
+IF OBJECT_ID('eperson_seq', 'SO') IS NOT NULL drop sequence eperson_seq;
+
+IF OBJECT_ID('e_person_online', 'U') IS NOT NULL drop table e_person_online;
+IF OBJECT_ID('e_person_online_seq', 'SO') IS NOT NULL drop sequence e_person_online_seq;
+
+IF OBJECT_ID('esimple', 'U') IS NOT NULL drop table esimple;
+
+IF OBJECT_ID('esoft_del_book', 'U') IS NOT NULL drop table esoft_del_book;
+IF OBJECT_ID('esoft_del_book_seq', 'SO') IS NOT NULL drop sequence esoft_del_book_seq;
+
+IF OBJECT_ID('esoft_del_book_esoft_del_user', 'U') IS NOT NULL drop table esoft_del_book_esoft_del_user;
+
+IF OBJECT_ID('esoft_del_down', 'U') IS NOT NULL drop table esoft_del_down;
+IF OBJECT_ID('esoft_del_down_seq', 'SO') IS NOT NULL drop sequence esoft_del_down_seq;
+
+IF OBJECT_ID('esoft_del_mid', 'U') IS NOT NULL drop table esoft_del_mid;
+IF OBJECT_ID('esoft_del_mid_seq', 'SO') IS NOT NULL drop sequence esoft_del_mid_seq;
+
+IF OBJECT_ID('esoft_del_one_a', 'U') IS NOT NULL drop table esoft_del_one_a;
+IF OBJECT_ID('esoft_del_one_a_seq', 'SO') IS NOT NULL drop sequence esoft_del_one_a_seq;
+
+IF OBJECT_ID('esoft_del_one_b', 'U') IS NOT NULL drop table esoft_del_one_b;
+IF OBJECT_ID('esoft_del_one_b_seq', 'SO') IS NOT NULL drop sequence esoft_del_one_b_seq;
+
+IF OBJECT_ID('esoft_del_role', 'U') IS NOT NULL drop table esoft_del_role;
+IF OBJECT_ID('esoft_del_role_seq', 'SO') IS NOT NULL drop sequence esoft_del_role_seq;
+
+IF OBJECT_ID('esoft_del_role_esoft_del_user', 'U') IS NOT NULL drop table esoft_del_role_esoft_del_user;
+
+IF OBJECT_ID('esoft_del_top', 'U') IS NOT NULL drop table esoft_del_top;
+IF OBJECT_ID('esoft_del_top_seq', 'SO') IS NOT NULL drop sequence esoft_del_top_seq;
+
+IF OBJECT_ID('esoft_del_up', 'U') IS NOT NULL drop table esoft_del_up;
+IF OBJECT_ID('esoft_del_up_seq', 'SO') IS NOT NULL drop sequence esoft_del_up_seq;
+
+IF OBJECT_ID('esoft_del_user', 'U') IS NOT NULL drop table esoft_del_user;
+IF OBJECT_ID('esoft_del_user_seq', 'SO') IS NOT NULL drop sequence esoft_del_user_seq;
+
+IF OBJECT_ID('esoft_del_user_esoft_del_role', 'U') IS NOT NULL drop table esoft_del_user_esoft_del_role;
+
+IF OBJECT_ID('esome_convert_type', 'U') IS NOT NULL drop table esome_convert_type;
+IF OBJECT_ID('esome_convert_type_seq', 'SO') IS NOT NULL drop sequence esome_convert_type_seq;
+
+IF OBJECT_ID('esome_type', 'U') IS NOT NULL drop table esome_type;
+IF OBJECT_ID('esome_type_seq', 'SO') IS NOT NULL drop sequence esome_type_seq;
+
+IF OBJECT_ID('etrans_many', 'U') IS NOT NULL drop table etrans_many;
+IF OBJECT_ID('etrans_many_seq', 'SO') IS NOT NULL drop sequence etrans_many_seq;
+
+IF OBJECT_ID('rawinherit_uncle', 'U') IS NOT NULL drop table rawinherit_uncle;
+IF OBJECT_ID('rawinherit_uncle_seq', 'SO') IS NOT NULL drop sequence rawinherit_uncle_seq;
+
+IF OBJECT_ID('evanilla_collection', 'U') IS NOT NULL drop table evanilla_collection;
+IF OBJECT_ID('evanilla_collection_seq', 'SO') IS NOT NULL drop sequence evanilla_collection_seq;
+
+IF OBJECT_ID('evanilla_collection_detail', 'U') IS NOT NULL drop table evanilla_collection_detail;
+IF OBJECT_ID('evanilla_collection_detail_seq', 'SO') IS NOT NULL drop sequence evanilla_collection_detail_seq;
+
+IF OBJECT_ID('ewho_props', 'U') IS NOT NULL drop table ewho_props;
+IF OBJECT_ID('ewho_props_seq', 'SO') IS NOT NULL drop sequence ewho_props_seq;
+
+IF OBJECT_ID('e_withinet', 'U') IS NOT NULL drop table e_withinet;
+IF OBJECT_ID('e_withinet_seq', 'SO') IS NOT NULL drop sequence e_withinet_seq;
+
+IF OBJECT_ID('td_child', 'U') IS NOT NULL drop table td_child;
+IF OBJECT_ID('td_child_seq', 'SO') IS NOT NULL drop sequence td_child_seq;
+
+IF OBJECT_ID('td_parent', 'U') IS NOT NULL drop table td_parent;
+IF OBJECT_ID('td_parent_seq', 'SO') IS NOT NULL drop sequence td_parent_seq;
+
+IF OBJECT_ID('empl', 'U') IS NOT NULL drop table empl;
+IF OBJECT_ID('empl_seq', 'SO') IS NOT NULL drop sequence empl_seq;
+
+IF OBJECT_ID('feature_desc', 'U') IS NOT NULL drop table feature_desc;
+IF OBJECT_ID('feature_desc_seq', 'SO') IS NOT NULL drop sequence feature_desc_seq;
+
+IF OBJECT_ID('f_first', 'U') IS NOT NULL drop table f_first;
+IF OBJECT_ID('f_first_seq', 'SO') IS NOT NULL drop sequence f_first_seq;
+
+IF OBJECT_ID('foo', 'U') IS NOT NULL drop table foo;
+IF OBJECT_ID('foo_seq', 'SO') IS NOT NULL drop sequence foo_seq;
+
+IF OBJECT_ID('gen_key_identity', 'U') IS NOT NULL drop table gen_key_identity;
+
+IF OBJECT_ID('gen_key_sequence', 'U') IS NOT NULL drop table gen_key_sequence;
+IF OBJECT_ID('SEQ', 'SO') IS NOT NULL drop sequence SEQ;
+
+IF OBJECT_ID('gen_key_table', 'U') IS NOT NULL drop table gen_key_table;
+IF OBJECT_ID('gen_key_table_seq', 'SO') IS NOT NULL drop sequence gen_key_table_seq;
+
+IF OBJECT_ID('grand_parent_person', 'U') IS NOT NULL drop table grand_parent_person;
+IF OBJECT_ID('grand_parent_person_seq', 'SO') IS NOT NULL drop sequence grand_parent_person_seq;
+
+IF OBJECT_ID('survey_group', 'U') IS NOT NULL drop table survey_group;
+IF OBJECT_ID('survey_group_seq', 'SO') IS NOT NULL drop sequence survey_group_seq;
+
+IF OBJECT_ID('c_group', 'U') IS NOT NULL drop table c_group;
+IF OBJECT_ID('c_group_seq', 'SO') IS NOT NULL drop sequence c_group_seq;
+
+IF OBJECT_ID('he_doc', 'U') IS NOT NULL drop table he_doc;
+IF OBJECT_ID('he_doc_seq', 'SO') IS NOT NULL drop sequence he_doc_seq;
+
+IF OBJECT_ID('hx_link', 'U') IS NOT NULL alter table hx_link set (system_versioning = off);
+IF OBJECT_ID('hx_link_history', 'U') IS NOT NULL drop table hx_link_history;
+IF OBJECT_ID('hx_link', 'U') IS NOT NULL drop table hx_link;
+IF OBJECT_ID('hx_link_seq', 'SO') IS NOT NULL drop sequence hx_link_seq;
+
+IF OBJECT_ID('hx_link_doc', 'U') IS NOT NULL drop table hx_link_doc;
+
+IF OBJECT_ID('hi_doc', 'U') IS NOT NULL drop table hi_doc;
+IF OBJECT_ID('hi_doc_seq', 'SO') IS NOT NULL drop sequence hi_doc_seq;
+
+IF OBJECT_ID('hi_link', 'U') IS NOT NULL alter table hi_link set (system_versioning = off);
+IF OBJECT_ID('hi_link_history', 'U') IS NOT NULL drop table hi_link_history;
+IF OBJECT_ID('hi_link', 'U') IS NOT NULL drop table hi_link;
+IF OBJECT_ID('hi_link_seq', 'SO') IS NOT NULL drop sequence hi_link_seq;
+
+IF OBJECT_ID('hi_link_doc', 'U') IS NOT NULL alter table hi_link_doc set (system_versioning = off);
+IF OBJECT_ID('hi_link_doc_history', 'U') IS NOT NULL drop table hi_link_doc_history;
+IF OBJECT_ID('hi_link_doc', 'U') IS NOT NULL drop table hi_link_doc;
+
+IF OBJECT_ID('imrelated', 'U') IS NOT NULL drop table imrelated;
+IF OBJECT_ID('imrelated_seq', 'SO') IS NOT NULL drop sequence imrelated_seq;
+
+IF OBJECT_ID('imroot', 'U') IS NOT NULL drop table imroot;
+IF OBJECT_ID('imroot_seq', 'SO') IS NOT NULL drop sequence imroot_seq;
+
+IF OBJECT_ID('ixresource', 'U') IS NOT NULL drop table ixresource;
+
+IF OBJECT_ID('info_company', 'U') IS NOT NULL drop table info_company;
+IF OBJECT_ID('info_company_seq', 'SO') IS NOT NULL drop sequence info_company_seq;
+
+IF OBJECT_ID('info_contact', 'U') IS NOT NULL drop table info_contact;
+IF OBJECT_ID('info_contact_seq', 'SO') IS NOT NULL drop sequence info_contact_seq;
+
+IF OBJECT_ID('info_customer', 'U') IS NOT NULL drop table info_customer;
+IF OBJECT_ID('info_customer_seq', 'SO') IS NOT NULL drop sequence info_customer_seq;
+
+IF OBJECT_ID('inner_report', 'U') IS NOT NULL drop table inner_report;
+IF OBJECT_ID('inner_report_seq', 'SO') IS NOT NULL drop sequence inner_report_seq;
+
+IF OBJECT_ID('drel_invoice', 'U') IS NOT NULL drop table drel_invoice;
+IF OBJECT_ID('drel_invoice_seq', 'SO') IS NOT NULL drop sequence drel_invoice_seq;
+
+IF OBJECT_ID('item', 'U') IS NOT NULL drop table item;
+
+IF OBJECT_ID('monkey', 'U') IS NOT NULL drop table monkey;
+IF OBJECT_ID('monkey_seq', 'SO') IS NOT NULL drop sequence monkey_seq;
+
+IF OBJECT_ID('trainer', 'U') IS NOT NULL drop table trainer;
+IF OBJECT_ID('trainer_seq', 'SO') IS NOT NULL drop sequence trainer_seq;
+
+IF OBJECT_ID('trainer_monkey', 'U') IS NOT NULL drop table trainer_monkey;
+
+IF OBJECT_ID('troop', 'U') IS NOT NULL drop table troop;
+IF OBJECT_ID('troop_seq', 'SO') IS NOT NULL drop sequence troop_seq;
+
+IF OBJECT_ID('troop_monkey', 'U') IS NOT NULL drop table troop_monkey;
+
+IF OBJECT_ID('l2_cldf_reset_bean', 'U') IS NOT NULL drop table l2_cldf_reset_bean;
+IF OBJECT_ID('l2_cldf_reset_bean_seq', 'SO') IS NOT NULL drop sequence l2_cldf_reset_bean_seq;
+
+IF OBJECT_ID('l2_cldf_reset_bean_child', 'U') IS NOT NULL drop table l2_cldf_reset_bean_child;
+IF OBJECT_ID('l2_cldf_reset_bean_child_seq', 'SO') IS NOT NULL drop sequence l2_cldf_reset_bean_child_seq;
+
+IF OBJECT_ID('level1', 'U') IS NOT NULL drop table level1;
+IF OBJECT_ID('level1_seq', 'SO') IS NOT NULL drop sequence level1_seq;
+
+IF OBJECT_ID('level1_level4', 'U') IS NOT NULL drop table level1_level4;
+
+IF OBJECT_ID('level1_level2', 'U') IS NOT NULL drop table level1_level2;
+
+IF OBJECT_ID('level2', 'U') IS NOT NULL drop table level2;
+IF OBJECT_ID('level2_seq', 'SO') IS NOT NULL drop sequence level2_seq;
+
+IF OBJECT_ID('level2_level3', 'U') IS NOT NULL drop table level2_level3;
+
+IF OBJECT_ID('level3', 'U') IS NOT NULL drop table level3;
+IF OBJECT_ID('level3_seq', 'SO') IS NOT NULL drop sequence level3_seq;
+
+IF OBJECT_ID('level4', 'U') IS NOT NULL drop table level4;
+IF OBJECT_ID('level4_seq', 'SO') IS NOT NULL drop sequence level4_seq;
+
+IF OBJECT_ID('link', 'U') IS NOT NULL alter table link set (system_versioning = off);
+IF OBJECT_ID('link_history', 'U') IS NOT NULL drop table link_history;
+IF OBJECT_ID('link', 'U') IS NOT NULL drop table link;
+IF OBJECT_ID('link_seq', 'SO') IS NOT NULL drop sequence link_seq;
+
+IF OBJECT_ID('link_draft', 'U') IS NOT NULL drop table link_draft;
+IF OBJECT_ID('link_draft_seq', 'SO') IS NOT NULL drop sequence link_draft_seq;
+
+IF OBJECT_ID('la_attr_value', 'U') IS NOT NULL drop table la_attr_value;
+IF OBJECT_ID('la_attr_value_seq', 'SO') IS NOT NULL drop sequence la_attr_value_seq;
+
+IF OBJECT_ID('la_attr_value_attribute', 'U') IS NOT NULL drop table la_attr_value_attribute;
+
+IF OBJECT_ID('mmedia', 'U') IS NOT NULL drop table mmedia;
+IF OBJECT_ID('mmedia_seq', 'SO') IS NOT NULL drop sequence mmedia_seq;
+
+IF OBJECT_ID('non_updateprop', 'U') IS NOT NULL drop table non_updateprop;
+IF OBJECT_ID('non_updateprop_seq', 'SO') IS NOT NULL drop sequence non_updateprop_seq;
+
+IF OBJECT_ID('mprinter', 'U') IS NOT NULL drop table mprinter;
+IF OBJECT_ID('mprinter_seq', 'SO') IS NOT NULL drop sequence mprinter_seq;
+
+IF OBJECT_ID('mprinter_state', 'U') IS NOT NULL drop table mprinter_state;
+IF OBJECT_ID('mprinter_state_seq', 'SO') IS NOT NULL drop sequence mprinter_state_seq;
+
+IF OBJECT_ID('mprofile', 'U') IS NOT NULL drop table mprofile;
+IF OBJECT_ID('mprofile_seq', 'SO') IS NOT NULL drop sequence mprofile_seq;
+
+IF OBJECT_ID('mprotected_construct_bean', 'U') IS NOT NULL drop table mprotected_construct_bean;
+IF OBJECT_ID('mprotected_construct_bean_seq', 'SO') IS NOT NULL drop sequence mprotected_construct_bean_seq;
+
+IF OBJECT_ID('mrole', 'U') IS NOT NULL drop table mrole;
+IF OBJECT_ID('mrole_seq', 'SO') IS NOT NULL drop sequence mrole_seq;
+
+IF OBJECT_ID('mrole_muser', 'U') IS NOT NULL drop table mrole_muser;
+
+IF OBJECT_ID('msome_other', 'U') IS NOT NULL drop table msome_other;
+IF OBJECT_ID('msome_other_seq', 'SO') IS NOT NULL drop sequence msome_other_seq;
+
+IF OBJECT_ID('muser', 'U') IS NOT NULL drop table muser;
+IF OBJECT_ID('muser_seq', 'SO') IS NOT NULL drop sequence muser_seq;
+
+IF OBJECT_ID('muser_type', 'U') IS NOT NULL drop table muser_type;
+IF OBJECT_ID('muser_type_seq', 'SO') IS NOT NULL drop sequence muser_type_seq;
+
+IF OBJECT_ID('mail_box', 'U') IS NOT NULL drop table mail_box;
+IF OBJECT_ID('mail_box_seq', 'SO') IS NOT NULL drop sequence mail_box_seq;
+
+IF OBJECT_ID('mail_user', 'U') IS NOT NULL drop table mail_user;
+IF OBJECT_ID('mail_user_seq', 'SO') IS NOT NULL drop sequence mail_user_seq;
+
+IF OBJECT_ID('mail_user_inbox', 'U') IS NOT NULL drop table mail_user_inbox;
+
+IF OBJECT_ID('mail_user_outbox', 'U') IS NOT NULL drop table mail_user_outbox;
+
+IF OBJECT_ID('map_super_actual', 'U') IS NOT NULL drop table map_super_actual;
+IF OBJECT_ID('map_super_actual_seq', 'SO') IS NOT NULL drop sequence map_super_actual_seq;
+
+IF OBJECT_ID('c_message', 'U') IS NOT NULL drop table c_message;
+IF OBJECT_ID('c_message_seq', 'SO') IS NOT NULL drop sequence c_message_seq;
+
+IF OBJECT_ID('mnoc_role', 'U') IS NOT NULL drop table mnoc_role;
+IF OBJECT_ID('mnoc_role_seq', 'SO') IS NOT NULL drop sequence mnoc_role_seq;
+
+IF OBJECT_ID('mnoc_user', 'U') IS NOT NULL drop table mnoc_user;
+IF OBJECT_ID('mnoc_user_seq', 'SO') IS NOT NULL drop sequence mnoc_user_seq;
+
+IF OBJECT_ID('mnoc_user_mnoc_role', 'U') IS NOT NULL drop table mnoc_user_mnoc_role;
+
+IF OBJECT_ID('mny_a', 'U') IS NOT NULL drop table mny_a;
+IF OBJECT_ID('mny_a_seq', 'SO') IS NOT NULL drop sequence mny_a_seq;
+
+IF OBJECT_ID('mny_b', 'U') IS NOT NULL drop table mny_b;
+IF OBJECT_ID('mny_b_seq', 'SO') IS NOT NULL drop sequence mny_b_seq;
+
+IF OBJECT_ID('mny_b_mny_c', 'U') IS NOT NULL drop table mny_b_mny_c;
+
+IF OBJECT_ID('mny_c', 'U') IS NOT NULL drop table mny_c;
+IF OBJECT_ID('mny_c_seq', 'SO') IS NOT NULL drop sequence mny_c_seq;
+
+IF OBJECT_ID('mny_topic', 'U') IS NOT NULL drop table mny_topic;
+IF OBJECT_ID('mny_topic_seq', 'SO') IS NOT NULL drop sequence mny_topic_seq;
+
+IF OBJECT_ID('subtopics', 'U') IS NOT NULL drop table subtopics;
+
+IF OBJECT_ID('mp_role', 'U') IS NOT NULL drop table mp_role;
+IF OBJECT_ID('mp_role_seq', 'SO') IS NOT NULL drop sequence mp_role_seq;
+
+IF OBJECT_ID('mp_user', 'U') IS NOT NULL drop table mp_user;
+IF OBJECT_ID('mp_user_seq', 'SO') IS NOT NULL drop sequence mp_user_seq;
+
+IF OBJECT_ID('ms_many_a', 'U') IS NOT NULL drop table ms_many_a;
+IF OBJECT_ID('ms_many_a_seq', 'SO') IS NOT NULL drop sequence ms_many_a_seq;
+
+IF OBJECT_ID('ms_many_a_many_b', 'U') IS NOT NULL drop table ms_many_a_many_b;
+
+IF OBJECT_ID('ms_many_b', 'U') IS NOT NULL drop table ms_many_b;
+IF OBJECT_ID('ms_many_b_seq', 'SO') IS NOT NULL drop sequence ms_many_b_seq;
+
+IF OBJECT_ID('ms_many_b_many_a', 'U') IS NOT NULL drop table ms_many_b_many_a;
+
+IF OBJECT_ID('my_lob_size', 'U') IS NOT NULL drop table my_lob_size;
+IF OBJECT_ID('my_lob_size_seq', 'SO') IS NOT NULL drop sequence my_lob_size_seq;
+
+IF OBJECT_ID('my_lob_size_join_many', 'U') IS NOT NULL drop table my_lob_size_join_many;
+IF OBJECT_ID('my_lob_size_join_many_seq', 'SO') IS NOT NULL drop sequence my_lob_size_join_many_seq;
+
+IF OBJECT_ID('noidbean', 'U') IS NOT NULL drop table noidbean;
+
+IF OBJECT_ID('o_cached_bean', 'U') IS NOT NULL drop table o_cached_bean;
+IF OBJECT_ID('o_cached_bean_seq', 'SO') IS NOT NULL drop sequence o_cached_bean_seq;
+
+IF OBJECT_ID('o_cached_bean_country', 'U') IS NOT NULL drop table o_cached_bean_country;
+
+IF OBJECT_ID('o_cached_bean_child', 'U') IS NOT NULL drop table o_cached_bean_child;
+IF OBJECT_ID('o_cached_bean_child_seq', 'SO') IS NOT NULL drop sequence o_cached_bean_child_seq;
+
+IF OBJECT_ID('o_cached_natkey', 'U') IS NOT NULL drop table o_cached_natkey;
+IF OBJECT_ID('o_cached_natkey_seq', 'SO') IS NOT NULL drop sequence o_cached_natkey_seq;
+
+IF OBJECT_ID('o_cached_natkey3', 'U') IS NOT NULL drop table o_cached_natkey3;
+IF OBJECT_ID('o_cached_natkey3_seq', 'SO') IS NOT NULL drop sequence o_cached_natkey3_seq;
+
+IF OBJECT_ID('ocar', 'U') IS NOT NULL drop table ocar;
+IF OBJECT_ID('ocar_seq', 'SO') IS NOT NULL drop sequence ocar_seq;
+
+IF OBJECT_ID('ocompany', 'U') IS NOT NULL drop table ocompany;
+IF OBJECT_ID('ocompany_seq', 'SO') IS NOT NULL drop sequence ocompany_seq;
+
+IF OBJECT_ID('oengine', 'U') IS NOT NULL drop table oengine;
+
+IF OBJECT_ID('ogear_box', 'U') IS NOT NULL drop table ogear_box;
+
+IF OBJECT_ID('oroad_show_msg', 'U') IS NOT NULL drop table oroad_show_msg;
+IF OBJECT_ID('oroad_show_msg_seq', 'SO') IS NOT NULL drop sequence oroad_show_msg_seq;
+
+IF OBJECT_ID('om_ordered_detail', 'U') IS NOT NULL drop table om_ordered_detail;
+IF OBJECT_ID('om_ordered_detail_seq', 'SO') IS NOT NULL drop sequence om_ordered_detail_seq;
+
+IF OBJECT_ID('om_ordered_master', 'U') IS NOT NULL drop table om_ordered_master;
+IF OBJECT_ID('om_ordered_master_seq', 'SO') IS NOT NULL drop sequence om_ordered_master_seq;
+
+IF OBJECT_ID('o_order', 'U') IS NOT NULL drop table o_order;
+IF OBJECT_ID('o_order_seq', 'SO') IS NOT NULL drop sequence o_order_seq;
+
+IF OBJECT_ID('o_order_detail', 'U') IS NOT NULL drop table o_order_detail;
+IF OBJECT_ID('o_order_detail_seq', 'SO') IS NOT NULL drop sequence o_order_detail_seq;
+
+IF OBJECT_ID('s_orders', 'U') IS NOT NULL drop table s_orders;
+
+IF OBJECT_ID('s_order_items', 'U') IS NOT NULL drop table s_order_items;
+
+IF OBJECT_ID('or_order_ship', 'U') IS NOT NULL drop table or_order_ship;
+IF OBJECT_ID('or_order_ship_seq', 'SO') IS NOT NULL drop sequence or_order_ship_seq;
+
+IF OBJECT_ID('organisation', 'U') IS NOT NULL drop table organisation;
+IF OBJECT_ID('organisation_seq', 'SO') IS NOT NULL drop sequence organisation_seq;
+
+IF OBJECT_ID('oto_bchild', 'U') IS NOT NULL drop table oto_bchild;
+IF OBJECT_ID('oto_bchild_seq', 'SO') IS NOT NULL drop sequence oto_bchild_seq;
+
+IF OBJECT_ID('oto_bmaster', 'U') IS NOT NULL drop table oto_bmaster;
+IF OBJECT_ID('oto_bmaster_seq', 'SO') IS NOT NULL drop sequence oto_bmaster_seq;
+
+IF OBJECT_ID('oto_child', 'U') IS NOT NULL drop table oto_child;
+IF OBJECT_ID('oto_child_seq', 'SO') IS NOT NULL drop sequence oto_child_seq;
+
+IF OBJECT_ID('oto_cust', 'U') IS NOT NULL drop table oto_cust;
+IF OBJECT_ID('oto_cust_seq', 'SO') IS NOT NULL drop sequence oto_cust_seq;
+
+IF OBJECT_ID('oto_cust_address', 'U') IS NOT NULL drop table oto_cust_address;
+IF OBJECT_ID('oto_cust_address_seq', 'SO') IS NOT NULL drop sequence oto_cust_address_seq;
+
+IF OBJECT_ID('oto_master', 'U') IS NOT NULL drop table oto_master;
+IF OBJECT_ID('oto_master_seq', 'SO') IS NOT NULL drop sequence oto_master_seq;
+
+IF OBJECT_ID('oto_prime', 'U') IS NOT NULL drop table oto_prime;
+IF OBJECT_ID('oto_prime_seq', 'SO') IS NOT NULL drop sequence oto_prime_seq;
+
+IF OBJECT_ID('oto_prime_extra', 'U') IS NOT NULL drop table oto_prime_extra;
+
+IF OBJECT_ID('oto_th_many', 'U') IS NOT NULL drop table oto_th_many;
+IF OBJECT_ID('oto_th_many_seq', 'SO') IS NOT NULL drop sequence oto_th_many_seq;
+
+IF OBJECT_ID('oto_th_one', 'U') IS NOT NULL drop table oto_th_one;
+IF OBJECT_ID('oto_th_one_seq', 'SO') IS NOT NULL drop sequence oto_th_one_seq;
+
+IF OBJECT_ID('oto_th_top', 'U') IS NOT NULL drop table oto_th_top;
+IF OBJECT_ID('oto_th_top_seq', 'SO') IS NOT NULL drop sequence oto_th_top_seq;
+
+IF OBJECT_ID('oto_ubprime', 'U') IS NOT NULL drop table oto_ubprime;
+
+IF OBJECT_ID('oto_ubprime_extra', 'U') IS NOT NULL drop table oto_ubprime_extra;
+
+IF OBJECT_ID('oto_uprime', 'U') IS NOT NULL drop table oto_uprime;
+
+IF OBJECT_ID('oto_uprime_extra', 'U') IS NOT NULL drop table oto_uprime_extra;
+
+IF OBJECT_ID('pfile', 'U') IS NOT NULL drop table pfile;
+IF OBJECT_ID('pfile_seq', 'SO') IS NOT NULL drop sequence pfile_seq;
+
+IF OBJECT_ID('pfile_content', 'U') IS NOT NULL drop table pfile_content;
+IF OBJECT_ID('pfile_content_seq', 'SO') IS NOT NULL drop sequence pfile_content_seq;
+
+IF OBJECT_ID('paggview', 'U') IS NOT NULL drop table paggview;
+
+IF OBJECT_ID('pallet_location', 'U') IS NOT NULL drop table pallet_location;
+IF OBJECT_ID('pallet_location_seq', 'SO') IS NOT NULL drop sequence pallet_location_seq;
+
+IF OBJECT_ID('parcel', 'U') IS NOT NULL drop table parcel;
+IF OBJECT_ID('parcel_seq', 'SO') IS NOT NULL drop sequence parcel_seq;
+
+IF OBJECT_ID('parcel_location', 'U') IS NOT NULL drop table parcel_location;
+IF OBJECT_ID('parcel_location_seq', 'SO') IS NOT NULL drop sequence parcel_location_seq;
+
+IF OBJECT_ID('rawinherit_parent', 'U') IS NOT NULL drop table rawinherit_parent;
+IF OBJECT_ID('rawinherit_parent_seq', 'SO') IS NOT NULL drop sequence rawinherit_parent_seq;
+
+IF OBJECT_ID('rawinherit_parent_rawinherit_data', 'U') IS NOT NULL drop table rawinherit_parent_rawinherit_data;
+
+IF OBJECT_ID('parent_person', 'U') IS NOT NULL drop table parent_person;
+IF OBJECT_ID('parent_person_seq', 'SO') IS NOT NULL drop sequence parent_person_seq;
+
+IF OBJECT_ID('c_participation', 'U') IS NOT NULL drop table c_participation;
+IF OBJECT_ID('c_participation_seq', 'SO') IS NOT NULL drop sequence c_participation_seq;
+
+IF OBJECT_ID('mt_permission', 'U') IS NOT NULL drop table mt_permission;
+
+IF OBJECT_ID('persistent_file', 'U') IS NOT NULL drop table persistent_file;
+IF OBJECT_ID('persistent_file_seq', 'SO') IS NOT NULL drop sequence persistent_file_seq;
+
+IF OBJECT_ID('persistent_file_content', 'U') IS NOT NULL drop table persistent_file_content;
+IF OBJECT_ID('persistent_file_content_seq', 'SO') IS NOT NULL drop sequence persistent_file_content_seq;
+
+IF OBJECT_ID('persons', 'U') IS NOT NULL drop table persons;
+IF OBJECT_ID('PERSONS_seq', 'SO') IS NOT NULL drop sequence PERSONS_seq;
+
+IF OBJECT_ID('person', 'U') IS NOT NULL drop table person;
+IF OBJECT_ID('person_seq', 'SO') IS NOT NULL drop sequence person_seq;
+
+IF OBJECT_ID('phones', 'U') IS NOT NULL drop table phones;
+IF OBJECT_ID('PHONES_seq', 'SO') IS NOT NULL drop sequence PHONES_seq;
+
+IF OBJECT_ID('primary_revision', 'U') IS NOT NULL drop table primary_revision;
+
+IF OBJECT_ID('o_product', 'U') IS NOT NULL drop table o_product;
+IF OBJECT_ID('o_product_seq', 'SO') IS NOT NULL drop sequence o_product_seq;
+
+IF OBJECT_ID('pp', 'U') IS NOT NULL drop table pp;
+
+IF OBJECT_ID('pp_to_ww', 'U') IS NOT NULL drop table pp_to_ww;
+
+IF OBJECT_ID('question', 'U') IS NOT NULL drop table question;
+IF OBJECT_ID('question_seq', 'SO') IS NOT NULL drop sequence question_seq;
+
+IF OBJECT_ID('rcustomer', 'U') IS NOT NULL drop table rcustomer;
+
+IF OBJECT_ID('r_orders', 'U') IS NOT NULL drop table r_orders;
+
+IF OBJECT_ID('region', 'U') IS NOT NULL drop table region;
+
+IF OBJECT_ID('resourcefile', 'U') IS NOT NULL drop table resourcefile;
+
+IF OBJECT_ID('em_role', 'U') IS NOT NULL drop table em_role;
+IF OBJECT_ID('em_role_seq', 'SO') IS NOT NULL drop sequence em_role_seq;
+
+IF OBJECT_ID('mt_role', 'U') IS NOT NULL drop table mt_role;
+
+IF OBJECT_ID('mt_role_permission', 'U') IS NOT NULL drop table mt_role_permission;
+
+IF OBJECT_ID('f_second', 'U') IS NOT NULL drop table f_second;
+IF OBJECT_ID('f_second_seq', 'SO') IS NOT NULL drop sequence f_second_seq;
+
+IF OBJECT_ID('section', 'U') IS NOT NULL drop table section;
+IF OBJECT_ID('section_seq', 'SO') IS NOT NULL drop sequence section_seq;
+
+IF OBJECT_ID('self_parent', 'U') IS NOT NULL drop table self_parent;
+IF OBJECT_ID('self_parent_seq', 'SO') IS NOT NULL drop sequence self_parent_seq;
+
+IF OBJECT_ID('self_ref_customer', 'U') IS NOT NULL drop table self_ref_customer;
+IF OBJECT_ID('self_ref_customer_seq', 'SO') IS NOT NULL drop sequence self_ref_customer_seq;
+
+IF OBJECT_ID('self_ref_example', 'U') IS NOT NULL drop table self_ref_example;
+IF OBJECT_ID('self_ref_example_seq', 'SO') IS NOT NULL drop sequence self_ref_example_seq;
+
+IF OBJECT_ID('some_enum_bean', 'U') IS NOT NULL drop table some_enum_bean;
+IF OBJECT_ID('some_enum_bean_seq', 'SO') IS NOT NULL drop sequence some_enum_bean_seq;
+
+IF OBJECT_ID('some_file_bean', 'U') IS NOT NULL drop table some_file_bean;
+IF OBJECT_ID('some_file_bean_seq', 'SO') IS NOT NULL drop sequence some_file_bean_seq;
+
+IF OBJECT_ID('some_new_types_bean', 'U') IS NOT NULL drop table some_new_types_bean;
+IF OBJECT_ID('some_new_types_bean_seq', 'SO') IS NOT NULL drop sequence some_new_types_bean_seq;
+
+IF OBJECT_ID('some_period_bean', 'U') IS NOT NULL drop table some_period_bean;
+IF OBJECT_ID('some_period_bean_seq', 'SO') IS NOT NULL drop sequence some_period_bean_seq;
+
+IF OBJECT_ID('stockforecast', 'U') IS NOT NULL drop table stockforecast;
+IF OBJECT_ID('stockforecast_seq', 'SO') IS NOT NULL drop sequence stockforecast_seq;
+
+IF OBJECT_ID('sub_section', 'U') IS NOT NULL drop table sub_section;
+IF OBJECT_ID('sub_section_seq', 'SO') IS NOT NULL drop sequence sub_section_seq;
+
+IF OBJECT_ID('sub_type', 'U') IS NOT NULL drop table sub_type;
+IF OBJECT_ID('sub_type_seq', 'SO') IS NOT NULL drop sequence sub_type_seq;
+
+IF OBJECT_ID('survey', 'U') IS NOT NULL drop table survey;
+IF OBJECT_ID('survey_seq', 'SO') IS NOT NULL drop sequence survey_seq;
+
+IF OBJECT_ID('tbytes_only', 'U') IS NOT NULL drop table tbytes_only;
+IF OBJECT_ID('tbytes_only_seq', 'SO') IS NOT NULL drop sequence tbytes_only_seq;
+
+IF OBJECT_ID('tcar', 'U') IS NOT NULL drop table tcar;
+
+IF OBJECT_ID('tevent', 'U') IS NOT NULL drop table tevent;
+IF OBJECT_ID('tevent_seq', 'SO') IS NOT NULL drop sequence tevent_seq;
+
+IF OBJECT_ID('tevent_many', 'U') IS NOT NULL drop table tevent_many;
+IF OBJECT_ID('tevent_many_seq', 'SO') IS NOT NULL drop sequence tevent_many_seq;
+
+IF OBJECT_ID('tevent_one', 'U') IS NOT NULL drop table tevent_one;
+IF OBJECT_ID('tevent_one_seq', 'SO') IS NOT NULL drop sequence tevent_one_seq;
+
+IF OBJECT_ID('tint_root', 'U') IS NOT NULL drop table tint_root;
+IF OBJECT_ID('tint_root_seq', 'SO') IS NOT NULL drop sequence tint_root_seq;
+
+IF OBJECT_ID('tjoda_entity', 'U') IS NOT NULL drop table tjoda_entity;
+IF OBJECT_ID('tjoda_entity_seq', 'SO') IS NOT NULL drop sequence tjoda_entity_seq;
+
+IF OBJECT_ID('t_mapsuper1', 'U') IS NOT NULL drop table t_mapsuper1;
+IF OBJECT_ID('t_mapsuper1_seq', 'SO') IS NOT NULL drop sequence t_mapsuper1_seq;
+
+IF OBJECT_ID('t_oneb', 'U') IS NOT NULL drop table t_oneb;
+IF OBJECT_ID('t_oneb_seq', 'SO') IS NOT NULL drop sequence t_oneb_seq;
+
+IF OBJECT_ID('t_detail_with_other_namexxxyy', 'U') IS NOT NULL drop table t_detail_with_other_namexxxyy;
+IF OBJECT_ID('t_atable_detail_seq', 'SO') IS NOT NULL drop sequence t_atable_detail_seq;
+
+IF OBJECT_ID('ts_detail_two', 'U') IS NOT NULL drop table ts_detail_two;
+IF OBJECT_ID('ts_detail_two_seq', 'SO') IS NOT NULL drop sequence ts_detail_two_seq;
+
+IF OBJECT_ID('t_atable_thatisrelatively', 'U') IS NOT NULL drop table t_atable_thatisrelatively;
+IF OBJECT_ID('t_atable_master_seq', 'SO') IS NOT NULL drop sequence t_atable_master_seq;
+
+IF OBJECT_ID('ts_master_two', 'U') IS NOT NULL drop table ts_master_two;
+IF OBJECT_ID('ts_master_two_seq', 'SO') IS NOT NULL drop sequence ts_master_two_seq;
+
+IF OBJECT_ID('tuuid_entity', 'U') IS NOT NULL drop table tuuid_entity;
+
+IF OBJECT_ID('twheel', 'U') IS NOT NULL drop table twheel;
+IF OBJECT_ID('twheel_seq', 'SO') IS NOT NULL drop sequence twheel_seq;
+
+IF OBJECT_ID('twith_pre_insert', 'U') IS NOT NULL drop table twith_pre_insert;
+IF OBJECT_ID('twith_pre_insert_seq', 'SO') IS NOT NULL drop sequence twith_pre_insert_seq;
+
+IF OBJECT_ID('mt_tenant', 'U') IS NOT NULL drop table mt_tenant;
+
+IF OBJECT_ID('test_annotation_base_entity', 'U') IS NOT NULL drop table test_annotation_base_entity;
+
+IF OBJECT_ID('tire', 'U') IS NOT NULL drop table tire;
+IF OBJECT_ID('tire_seq', 'SO') IS NOT NULL drop sequence tire_seq;
+
+IF OBJECT_ID('sa_tire', 'U') IS NOT NULL drop table sa_tire;
+IF OBJECT_ID('sa_tire_seq', 'SO') IS NOT NULL drop sequence sa_tire_seq;
+
+IF OBJECT_ID('trip', 'U') IS NOT NULL drop table trip;
+IF OBJECT_ID('trip_seq', 'SO') IS NOT NULL drop sequence trip_seq;
+
+IF OBJECT_ID('truck_ref', 'U') IS NOT NULL drop table truck_ref;
+IF OBJECT_ID('truck_ref_seq', 'SO') IS NOT NULL drop sequence truck_ref_seq;
+
+IF OBJECT_ID('type', 'U') IS NOT NULL drop table type;
+
+IF OBJECT_ID('tz_bean', 'U') IS NOT NULL drop table tz_bean;
+IF OBJECT_ID('tz_bean_seq', 'SO') IS NOT NULL drop sequence tz_bean_seq;
+
+IF OBJECT_ID('ut_detail', 'U') IS NOT NULL drop table ut_detail;
+IF OBJECT_ID('ut_detail_seq', 'SO') IS NOT NULL drop sequence ut_detail_seq;
+
+IF OBJECT_ID('ut_master', 'U') IS NOT NULL drop table ut_master;
+IF OBJECT_ID('ut_master_seq', 'SO') IS NOT NULL drop sequence ut_master_seq;
+
+IF OBJECT_ID('uuone', 'U') IS NOT NULL drop table uuone;
+
+IF OBJECT_ID('uutwo', 'U') IS NOT NULL drop table uutwo;
+
+IF OBJECT_ID('c_user', 'U') IS NOT NULL alter table c_user set (system_versioning = off);
+IF OBJECT_ID('c_user_history', 'U') IS NOT NULL drop table c_user_history;
+IF OBJECT_ID('c_user', 'U') IS NOT NULL drop table c_user;
+IF OBJECT_ID('c_user_seq', 'SO') IS NOT NULL drop sequence c_user_seq;
+
+IF OBJECT_ID('tx_user', 'U') IS NOT NULL drop table tx_user;
+IF OBJECT_ID('tx_user_seq', 'SO') IS NOT NULL drop sequence tx_user_seq;
+
+IF OBJECT_ID('g_user', 'U') IS NOT NULL drop table g_user;
+IF OBJECT_ID('g_user_seq', 'SO') IS NOT NULL drop sequence g_user_seq;
+
+IF OBJECT_ID('em_user', 'U') IS NOT NULL drop table em_user;
+IF OBJECT_ID('em_user_seq', 'SO') IS NOT NULL drop sequence em_user_seq;
+
+IF OBJECT_ID('oto_user', 'U') IS NOT NULL drop table oto_user;
+IF OBJECT_ID('oto_user_seq', 'SO') IS NOT NULL drop sequence oto_user_seq;
+
+IF OBJECT_ID('em_user_role', 'U') IS NOT NULL drop table em_user_role;
+
+IF OBJECT_ID('vehicle', 'U') IS NOT NULL drop table vehicle;
+IF OBJECT_ID('vehicle_seq', 'SO') IS NOT NULL drop sequence vehicle_seq;
+
+IF OBJECT_ID('vehicle_driver', 'U') IS NOT NULL drop table vehicle_driver;
+IF OBJECT_ID('vehicle_driver_seq', 'SO') IS NOT NULL drop sequence vehicle_driver_seq;
+
+IF OBJECT_ID('warehouses', 'U') IS NOT NULL drop table warehouses;
+IF OBJECT_ID('warehouses_seq', 'SO') IS NOT NULL drop sequence warehouses_seq;
+
+IF OBJECT_ID('warehousesshippingzones', 'U') IS NOT NULL drop table warehousesshippingzones;
+
+IF OBJECT_ID('sa_wheel', 'U') IS NOT NULL drop table sa_wheel;
+IF OBJECT_ID('sa_wheel_seq', 'SO') IS NOT NULL drop sequence sa_wheel_seq;
+
+IF OBJECT_ID('wheel', 'U') IS NOT NULL drop table wheel;
+IF OBJECT_ID('wheel_seq', 'SO') IS NOT NULL drop sequence wheel_seq;
+
+IF OBJECT_ID('sp_car_wheel', 'U') IS NOT NULL drop table sp_car_wheel;
+IF OBJECT_ID('sp_car_wheel_seq', 'SO') IS NOT NULL drop sequence sp_car_wheel_seq;
+
+IF OBJECT_ID('g_who_props_otm', 'U') IS NOT NULL drop table g_who_props_otm;
+IF OBJECT_ID('g_who_props_otm_seq', 'SO') IS NOT NULL drop sequence g_who_props_otm_seq;
+
+IF OBJECT_ID('with_zero', 'U') IS NOT NULL drop table with_zero;
+IF OBJECT_ID('with_zero_seq', 'SO') IS NOT NULL drop sequence with_zero_seq;
+
+IF OBJECT_ID('parent', 'U') IS NOT NULL drop table parent;
+IF OBJECT_ID('parent_seq', 'SO') IS NOT NULL drop sequence parent_seq;
+
+IF OBJECT_ID('wview', 'U') IS NOT NULL drop table wview;
+
+IF OBJECT_ID('zones', 'U') IS NOT NULL drop table zones;
+IF OBJECT_ID('zones_seq', 'SO') IS NOT NULL drop sequence zones_seq;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('contact','U') AND name = 'ix_contact_last_name_first_name') drop index ix_contact_last_name_first_name ON contact;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('e_basic','U') AND name = 'ix_e_basic_name') drop index ix_e_basic_name ON e_basic;

From 2f349ff054cc85ed2f083cbc859abae88bd33160 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Mar 2018 19:37:30 +1300
Subject: [PATCH 0170/1036] #1318 No effective change - DDL review for ... ENH:
 native UUID-support for SqlServer

Shows the use of uniqueidentifier DB column type for UUID with sql server.
---
 src/test/ddl-review/sqlserver-create-all.sql | 62 ++++++++++----------
 src/test/ddl-review/sqlserver-drop-all.sql   |  2 +-
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/test/ddl-review/sqlserver-create-all.sql b/src/test/ddl-review/sqlserver-create-all.sql
index de66ddd39..166eb009d 100644
--- a/src/test/ddl-review/sqlserver-create-all.sql
+++ b/src/test/ddl-review/sqlserver-create-all.sql
@@ -1,4 +1,4 @@
--- Generated by ebean unknown at 2018-03-08T04:43:42.126Z
+-- Generated by ebean unknown at 2018-03-08T06:24:28.188Z
 create table asimple_bean (
   id                            numeric(19) not null,
   name                          nvarchar(255),
@@ -155,37 +155,37 @@ create table bsimple_with_gen (
 create sequence bsimple_with_gen_seq as bigint  start with 1  increment by 50;
 
 create table bsite (
-  id                            nvarchar(40) not null,
+  id                            uniqueidentifier not null,
   name                          nvarchar(255),
   constraint pk_bsite primary key (id)
 );
 
 create table bsite_user (
-  site_id                       nvarchar(40) not null,
-  user_id                       nvarchar(40) not null,
+  site_id                       uniqueidentifier not null,
+  user_id                       uniqueidentifier not null,
   access_level                  integer,
   constraint ck_bsite_user_access_level check ( access_level in (0,1,2)),
   constraint pk_bsite_user primary key (site_id,user_id)
 );
 
 create table bsite_user_b (
-  site                          nvarchar(40) not null,
-  usr                           nvarchar(40) not null,
+  site                          uniqueidentifier not null,
+  usr                           uniqueidentifier not null,
   access_level                  integer,
   constraint ck_bsite_user_b_access_level check ( access_level in (0,1,2)),
   constraint pk_bsite_user_b primary key (site,usr)
 );
 
 create table bsite_user_c (
-  site_uid                      nvarchar(40) not null,
-  user_uid                      nvarchar(40) not null,
+  site_uid                      uniqueidentifier not null,
+  user_uid                      uniqueidentifier not null,
   access_level                  integer,
   constraint ck_bsite_user_c_access_level check ( access_level in (0,1,2)),
   constraint pk_bsite_user_c primary key (site_uid,user_uid)
 );
 
 create table buser (
-  id                            nvarchar(40) not null,
+  id                            uniqueidentifier not null,
   name                          nvarchar(255),
   constraint pk_buser primary key (id)
 );
@@ -1454,7 +1454,7 @@ create sequence imroot_seq as bigint  start with 1  increment by 50;
 
 create table ixresource (
   dtype                         nvarchar(255),
-  id                            nvarchar(40) not null,
+  id                            uniqueidentifier not null,
   name                          nvarchar(255),
   constraint pk_ixresource primary key (id)
 );
@@ -2013,7 +2013,7 @@ create unique nonclustered index uq_ocompany_corp_id on ocompany(corp_id) where
 create sequence ocompany_seq as bigint  start with 1  increment by 50;
 
 create table oengine (
-  engine_id                     nvarchar(40) not null,
+  engine_id                     uniqueidentifier not null,
   short_desc                    nvarchar(255),
   car_id                        integer,
   version                       integer not null,
@@ -2022,7 +2022,7 @@ create table oengine (
 create unique nonclustered index uq_oengine_car_id on oengine(car_id) where car_id is not null;
 
 create table ogear_box (
-  id                            nvarchar(40) not null,
+  id                            uniqueidentifier not null,
   box_desc                      nvarchar(255),
   box_size                      integer,
   car_id                        integer,
@@ -2220,28 +2220,28 @@ create table oto_th_top (
 create sequence oto_th_top_seq as bigint  start with 1  increment by 50;
 
 create table oto_ubprime (
-  pid                           nvarchar(40) not null,
+  pid                           uniqueidentifier not null,
   name                          nvarchar(255),
   version                       numeric(19) not null,
   constraint pk_oto_ubprime primary key (pid)
 );
 
 create table oto_ubprime_extra (
-  eid                           nvarchar(40) not null,
+  eid                           uniqueidentifier not null,
   extra                         nvarchar(255),
   version                       numeric(19) not null,
   constraint pk_oto_ubprime_extra primary key (eid)
 );
 
 create table oto_uprime (
-  pid                           nvarchar(40) not null,
+  pid                           uniqueidentifier not null,
   name                          nvarchar(255),
   version                       numeric(19) not null,
   constraint pk_oto_uprime primary key (pid)
 );
 
 create table oto_uprime_extra (
-  eid                           nvarchar(40) not null,
+  eid                           uniqueidentifier not null,
   extra                         nvarchar(255),
   version                       numeric(19) not null,
   constraint pk_oto_uprime_extra primary key (eid)
@@ -2272,7 +2272,7 @@ create table pfile_content (
 create sequence pfile_content_seq as bigint  start with 1  increment by 50;
 
 create table paggview (
-  pview_id                      nvarchar(40),
+  pview_id                      uniqueidentifier,
   amount                        integer not null
 );
 create unique nonclustered index uq_paggview_pview_id on paggview(pview_id) where pview_id is not null;
@@ -2344,7 +2344,7 @@ create table c_participation (
 create sequence c_participation_seq as bigint  start with 1  increment by 50;
 
 create table mt_permission (
-  id                            nvarchar(40) not null,
+  id                            uniqueidentifier not null,
   name                          nvarchar(255),
   constraint pk_mt_permission primary key (id)
 );
@@ -2415,15 +2415,15 @@ create table o_product (
 create sequence o_product_seq as bigint  start with 1  increment by 50;
 
 create table pp (
-  id                            nvarchar(40) not null,
+  id                            uniqueidentifier not null,
   name                          nvarchar(255),
   value                         nvarchar(100) not null,
   constraint pk_pp primary key (id)
 );
 
 create table pp_to_ww (
-  pp_id                         nvarchar(40) not null,
-  ww_id                         nvarchar(40) not null,
+  pp_id                         uniqueidentifier not null,
+  ww_id                         uniqueidentifier not null,
   constraint pk_pp_to_ww primary key (pp_id,ww_id)
 );
 
@@ -2474,16 +2474,16 @@ create table em_role (
 create sequence em_role_seq as bigint  start with 1  increment by 50;
 
 create table mt_role (
-  id                            nvarchar(40) not null,
+  id                            uniqueidentifier not null,
   name                          nvarchar(50),
-  tenant_id                     nvarchar(40),
+  tenant_id                     uniqueidentifier,
   version                       numeric(19) not null,
   constraint pk_mt_role primary key (id)
 );
 
 create table mt_role_permission (
-  mt_role_id                    nvarchar(40) not null,
-  mt_permission_id              nvarchar(40) not null,
+  mt_role_id                    uniqueidentifier not null,
+  mt_permission_id              uniqueidentifier not null,
   constraint pk_mt_role_permission primary key (mt_role_id,mt_permission_id)
 );
 
@@ -2737,7 +2737,7 @@ create table ts_master_two (
 create sequence ts_master_two_seq as bigint  start with 1  increment by 50;
 
 create table tuuid_entity (
-  id                            nvarchar(40) not null,
+  id                            uniqueidentifier not null,
   name                          nvarchar(255),
   constraint pk_tuuid_entity primary key (id)
 );
@@ -2758,7 +2758,7 @@ create table twith_pre_insert (
 create sequence twith_pre_insert_seq as bigint  start with 1  increment by 50;
 
 create table mt_tenant (
-  id                            nvarchar(40) not null,
+  id                            uniqueidentifier not null,
   name                          nvarchar(255),
   version                       numeric(19) not null,
   constraint pk_mt_tenant primary key (id)
@@ -2849,15 +2849,15 @@ create table ut_master (
 create sequence ut_master_seq as bigint  start with 1  increment by 50;
 
 create table uuone (
-  id                            nvarchar(40) not null,
+  id                            uniqueidentifier not null,
   name                          nvarchar(255),
   constraint pk_uuone primary key (id)
 );
 
 create table uutwo (
-  id                            nvarchar(40) not null,
+  id                            uniqueidentifier not null,
   name                          nvarchar(255),
-  master_id                     nvarchar(40),
+  master_id                     uniqueidentifier,
   constraint pk_uutwo primary key (id)
 );
 
@@ -3013,7 +3013,7 @@ create table parent (
 create sequence parent_seq as bigint  start with 1  increment by 50;
 
 create table wview (
-  id                            nvarchar(40) not null,
+  id                            uniqueidentifier not null,
   name                          nvarchar(127) not null,
   constraint uq_wview_name unique (name),
   constraint pk_wview primary key (id)
diff --git a/src/test/ddl-review/sqlserver-drop-all.sql b/src/test/ddl-review/sqlserver-drop-all.sql
index 1669d09c8..15e5b3bf9 100644
--- a/src/test/ddl-review/sqlserver-drop-all.sql
+++ b/src/test/ddl-review/sqlserver-drop-all.sql
@@ -1,4 +1,4 @@
--- Generated by ebean unknown at 2018-03-08T04:43:42.126Z
+-- Generated by ebean unknown at 2018-03-08T06:24:28.188Z
 IF OBJECT_ID('fk_bar_foo_id', 'F') IS NOT NULL alter table bar drop constraint fk_bar_foo_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('bar','U') AND name = 'ix_bar_foo_id') drop index ix_bar_foo_id ON bar;
 

From 2520837f5e9e1e3c9f7c9d87f001b0f477039d46 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Mar 2018 20:42:36 +1300
Subject: [PATCH 0171/1036] No effective change - Test on rename of DDL review
 files for oracle

---
 src/test/ddl-review/{ora-create.sql => oracle-create.sql} | 0
 src/test/ddl-review/{ora-drop.sql => oracle-drop.sql}     | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename src/test/ddl-review/{ora-create.sql => oracle-create.sql} (100%)
 rename src/test/ddl-review/{ora-drop.sql => oracle-drop.sql} (100%)

diff --git a/src/test/ddl-review/ora-create.sql b/src/test/ddl-review/oracle-create.sql
similarity index 100%
rename from src/test/ddl-review/ora-create.sql
rename to src/test/ddl-review/oracle-create.sql
diff --git a/src/test/ddl-review/ora-drop.sql b/src/test/ddl-review/oracle-drop.sql
similarity index 100%
rename from src/test/ddl-review/ora-drop.sql
rename to src/test/ddl-review/oracle-drop.sql

From 93d659050b066c181ce35588a58407378affe56e Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Mar 2018 20:44:15 +1300
Subject: [PATCH 0172/1036] No effective change - Test on rename of DDL review
 files

---
 src/test/ddl-review/{h2-create.sql => h2-create-all.sql}         | 0
 src/test/ddl-review/{h2-drop.sql => h2-drop-all.sql}             | 0
 src/test/ddl-review/{mysql-create.sql => mysql-create-all.sql}   | 0
 src/test/ddl-review/{mysql-drop.sql => mysql-drop-all.sql}       | 0
 src/test/ddl-review/{oracle-create.sql => oracle-create-all.sql} | 0
 src/test/ddl-review/{oracle-drop.sql => oracle-drop-all.sql}     | 0
 src/test/ddl-review/{pg-create.sql => pg-create-all.sql}         | 0
 src/test/ddl-review/{pg-drop.sql => pg-drop-all.sql}             | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 rename src/test/ddl-review/{h2-create.sql => h2-create-all.sql} (100%)
 rename src/test/ddl-review/{h2-drop.sql => h2-drop-all.sql} (100%)
 rename src/test/ddl-review/{mysql-create.sql => mysql-create-all.sql} (100%)
 rename src/test/ddl-review/{mysql-drop.sql => mysql-drop-all.sql} (100%)
 rename src/test/ddl-review/{oracle-create.sql => oracle-create-all.sql} (100%)
 rename src/test/ddl-review/{oracle-drop.sql => oracle-drop-all.sql} (100%)
 rename src/test/ddl-review/{pg-create.sql => pg-create-all.sql} (100%)
 rename src/test/ddl-review/{pg-drop.sql => pg-drop-all.sql} (100%)

diff --git a/src/test/ddl-review/h2-create.sql b/src/test/ddl-review/h2-create-all.sql
similarity index 100%
rename from src/test/ddl-review/h2-create.sql
rename to src/test/ddl-review/h2-create-all.sql
diff --git a/src/test/ddl-review/h2-drop.sql b/src/test/ddl-review/h2-drop-all.sql
similarity index 100%
rename from src/test/ddl-review/h2-drop.sql
rename to src/test/ddl-review/h2-drop-all.sql
diff --git a/src/test/ddl-review/mysql-create.sql b/src/test/ddl-review/mysql-create-all.sql
similarity index 100%
rename from src/test/ddl-review/mysql-create.sql
rename to src/test/ddl-review/mysql-create-all.sql
diff --git a/src/test/ddl-review/mysql-drop.sql b/src/test/ddl-review/mysql-drop-all.sql
similarity index 100%
rename from src/test/ddl-review/mysql-drop.sql
rename to src/test/ddl-review/mysql-drop-all.sql
diff --git a/src/test/ddl-review/oracle-create.sql b/src/test/ddl-review/oracle-create-all.sql
similarity index 100%
rename from src/test/ddl-review/oracle-create.sql
rename to src/test/ddl-review/oracle-create-all.sql
diff --git a/src/test/ddl-review/oracle-drop.sql b/src/test/ddl-review/oracle-drop-all.sql
similarity index 100%
rename from src/test/ddl-review/oracle-drop.sql
rename to src/test/ddl-review/oracle-drop-all.sql
diff --git a/src/test/ddl-review/pg-create.sql b/src/test/ddl-review/pg-create-all.sql
similarity index 100%
rename from src/test/ddl-review/pg-create.sql
rename to src/test/ddl-review/pg-create-all.sql
diff --git a/src/test/ddl-review/pg-drop.sql b/src/test/ddl-review/pg-drop-all.sql
similarity index 100%
rename from src/test/ddl-review/pg-drop.sql
rename to src/test/ddl-review/pg-drop-all.sql

From fbc2ba3912f6ca1978c7d00d99670e179c94f840 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Mar 2018 20:47:28 +1300
Subject: [PATCH 0173/1036] No effective change - Test update DDL review files

---
 src/test/ddl-review/h2-create-all.sql     | 2672 +++++++++++++++------
 src/test/ddl-review/h2-drop-all.sql       | 1146 +++++----
 src/test/ddl-review/mysql-create-all.sql  | 1846 ++++++++++++--
 src/test/ddl-review/mysql-drop-all.sql    |  604 ++++-
 src/test/ddl-review/oracle-create-all.sql | 1780 ++++++++++++--
 src/test/ddl-review/oracle-drop-all.sql   |  770 +++++-
 src/test/ddl-review/pg-create-all.sql     | 2120 +++++++++++++---
 src/test/ddl-review/pg-drop-all.sql       |  976 ++++++--
 8 files changed, 9575 insertions(+), 2339 deletions(-)

diff --git a/src/test/ddl-review/h2-create-all.sql b/src/test/ddl-review/h2-create-all.sql
index af29ea19d..207d6b517 100644
--- a/src/test/ddl-review/h2-create-all.sql
+++ b/src/test/ddl-review/h2-create-all.sql
@@ -1,186 +1,242 @@
+-- Generated by ebean unknown at 2018-03-08T06:41:41.155Z
 create table asimple_bean (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   constraint pk_asimple_bean primary key (id)
 );
-create sequence asimple_bean_seq;
 
 create table bar (
   bar_type                      varchar(31) not null,
-  bar_id                        integer not null,
+  bar_id                        integer auto_increment not null,
   foo_id                        integer not null,
   version                       integer not null,
   constraint pk_bar primary key (bar_id)
 );
-create sequence bar_seq;
 
 create table oto_account (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   version                       bigint not null,
-  when_created                  timestamp not null,
-  when_modified                 timestamp not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
   constraint pk_oto_account primary key (id)
 );
-create sequence oto_account_seq;
 
-create table o_address (
-  id                            smallint not null,
-  line_1                        varchar(100),
-  line_2                        varchar(100),
-  city                          varchar(100),
-  cretime                       timestamp,
-  country_code                  varchar(2),
-  updtime                       timestamp not null,
-  constraint pk_o_address primary key (id)
+create table addr (
+  id                            bigint auto_increment not null,
+  employee_id                   bigint,
+  name                          varchar(255),
+  address_line1                 varchar(255),
+  address_line2                 varchar(255),
+  city                          varchar(255),
+  version                       bigint not null,
+  constraint pk_addr primary key (id)
 );
-create sequence o_address_seq;
 
 create table address (
-  oid                           bigint not null,
+  oid                           bigint auto_increment not null,
   street                        varchar(255),
   version                       integer not null,
   constraint pk_address primary key (oid)
 );
-create sequence address_seq;
 
-create table animals (
-  species                       varchar(31) not null,
-  id                            bigint not null,
+create table o_address (
+  id                            smallint auto_increment not null,
+  line_1                        varchar(100),
+  line_2                        varchar(100),
+  city                          varchar(100),
+  cretime                       datetime(6),
+  country_code                  varchar(2),
+  updtime                       datetime(6) not null,
+  constraint pk_o_address primary key (id)
+);
+
+create table album (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  cover_id                      bigint,
+  deleted                       tinyint(1) default 0 not null,
+  created_at                    datetime(6) not null,
+  last_update                   datetime(6) not null,
+  constraint uq_album_cover_id unique (cover_id),
+  constraint pk_album primary key (id)
+);
+
+create table animal (
+  species                       varchar(255) not null,
+  id                            bigint auto_increment not null,
   shelter_id                    bigint,
   version                       bigint not null,
   name                          varchar(255),
   registration_number           varchar(255),
   date_of_birth                 date,
-  constraint pk_animals primary key (id)
+  dog_size                      varchar(255),
+  constraint pk_animal primary key (id)
 );
-create sequence animals_seq;
 
 create table animal_shelter (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   version                       bigint not null,
   constraint pk_animal_shelter primary key (id)
 );
-create sequence animal_shelter_seq;
 
 create table article (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   author                        varchar(255),
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
   version                       bigint not null,
   constraint pk_article primary key (id)
 );
-create sequence article_seq;
 
 create table attribute (
   option_type                   integer(31) not null,
-  id                            integer not null,
+  id                            integer auto_increment not null,
   attribute_holder_id           integer,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
   version                       bigint not null,
   constraint pk_attribute primary key (id)
 );
-create sequence attribute_seq;
 
 create table attribute_holder (
-  id                            integer not null,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  id                            integer auto_increment not null,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
   version                       bigint not null,
   constraint pk_attribute_holder primary key (id)
 );
-create sequence attribute_holder_seq;
 
 create table audit_log (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   description                   varchar(255),
   modified_description          varchar(255),
   constraint pk_audit_log primary key (id)
 );
-create sequence audit_log_seq;
 
 create table bbookmark (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   bookmark_reference            varchar(255),
   user_id                       integer,
   constraint pk_bbookmark primary key (id)
 );
-create sequence bbookmark_seq;
 
 create table bbookmark_user (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   password                      varchar(255),
   email_address                 varchar(255),
   country                       varchar(255),
   constraint pk_bbookmark_user primary key (id)
 );
-create sequence bbookmark_user_seq;
 
 create table bsimple_with_gen (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   constraint pk_bsimple_with_gen primary key (id)
 );
-create sequence bsimple_with_gen_seq;
+
+create table bsite (
+  id                            varchar(40) not null,
+  name                          varchar(255),
+  constraint pk_bsite primary key (id)
+);
+
+create table bsite_user (
+  site_id                       varchar(40) not null,
+  user_id                       varchar(40) not null,
+  access_level                  integer,
+  constraint ck_bsite_user_access_level check ( access_level in (0,1,2)),
+  constraint pk_bsite_user primary key (site_id,user_id)
+);
+
+create table bsite_user_b (
+  site                          varchar(40) not null,
+  usr                           varchar(40) not null,
+  access_level                  integer,
+  constraint ck_bsite_user_b_access_level check ( access_level in (0,1,2)),
+  constraint pk_bsite_user_b primary key (site,usr)
+);
+
+create table bsite_user_c (
+  site_uid                      varchar(40) not null,
+  user_uid                      varchar(40) not null,
+  access_level                  integer,
+  constraint ck_bsite_user_c_access_level check ( access_level in (0,1,2)),
+  constraint pk_bsite_user_c primary key (site_uid,user_uid)
+);
+
+create table buser (
+  id                            varchar(40) not null,
+  name                          varchar(255),
+  constraint pk_buser primary key (id)
+);
 
 create table bwith_qident (
-  id                            integer not null,
-  "Name"                        varchar(255),
-  last_updated                  timestamp not null,
-  constraint uq_bwith_qident_name unique ("Name"),
+  id                            integer auto_increment not null,
+  `Name`                        varchar(191),
+  last_updated                  datetime(6) not null,
+  constraint uq_bwith_qident_name unique (`Name`),
   constraint pk_bwith_qident primary key (id)
 );
-create sequence bwith_qident_seq;
 
 create table basic_joda_entity (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
-  created                       timestamp not null,
-  updated                       timestamp not null,
-  version                       timestamp not null,
+  period                        varchar(50),
+  created                       datetime(6) not null,
+  updated                       datetime(6) not null,
+  version                       datetime(6) not null,
   constraint pk_basic_joda_entity primary key (id)
 );
-create sequence basic_joda_entity_seq;
 
 create table bean_with_time_zone (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   timezone                      varchar(20),
   constraint pk_bean_with_time_zone primary key (id)
 );
-create sequence bean_with_time_zone_seq;
 
 create table drel_booking (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
+  booking_uid                   bigint,
   agent_invoice                 bigint,
   client_invoice                bigint,
   version                       integer not null,
+  constraint uq_drel_booking_booking_uid unique (booking_uid),
   constraint uq_drel_booking_agent_invoice unique (agent_invoice),
   constraint uq_drel_booking_client_invoice unique (client_invoice),
   constraint pk_drel_booking primary key (id)
 );
-create sequence drel_booking_seq;
+
+create table cinh_root (
+  dtype                         varchar(3) not null,
+  id                            integer auto_increment not null,
+  license_number                varchar(255),
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  driver                        varchar(255),
+  notes                         varchar(255),
+  action                        varchar(255),
+  constraint pk_cinh_root primary key (id)
+);
 
 create table ckey_assoc (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   assoc_one                     varchar(255),
   constraint pk_ckey_assoc primary key (id)
 );
-create sequence ckey_assoc_seq;
 
 create table ckey_detail (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   something                     varchar(255),
   one_key                       integer,
   two_key                       varchar(127),
   constraint pk_ckey_detail primary key (id)
 );
-create sequence ckey_detail_seq;
 
 create table ckey_parent (
   one_key                       integer not null,
@@ -192,13 +248,12 @@ create table ckey_parent (
 );
 
 create table calculation_result (
-  id                            integer not null,
-  charge                        double,
+  id                            integer auto_increment not null,
+  charge                        double not null,
   product_configuration_id      integer,
   group_configuration_id        integer,
   constraint pk_calculation_result primary key (id)
 );
-create sequence calculation_result_seq;
 
 create table cao_bean (
   x_cust_id                     integer not null,
@@ -209,18 +264,16 @@ create table cao_bean (
 );
 
 create table sa_car (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   version                       integer not null,
   constraint pk_sa_car primary key (id)
 );
-create sequence sa_car_seq;
 
 create table sp_car_car (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   version                       integer not null,
   constraint pk_sp_car_car primary key (id)
 );
-create sequence sp_car_car_seq;
 
 create table sp_car_car_wheels (
   car                           bigint not null,
@@ -229,82 +282,101 @@ create table sp_car_car_wheels (
 );
 
 create table car_accessory (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
+  fuse_id                       bigint not null,
   car_id                        integer,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
   version                       bigint not null,
   constraint pk_car_accessory primary key (id)
 );
-create sequence car_accessory_seq;
+
+create table car_fuse (
+  id                            bigint auto_increment not null,
+  location_code                 varchar(255),
+  constraint pk_car_fuse primary key (id)
+);
+
+create table category (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  surveyobjectid                bigint,
+  sequence_number               integer not null,
+  constraint pk_category primary key (id)
+);
+
+create table child_person (
+  identifier                    integer auto_increment not null,
+  name                          varchar(255),
+  age                           integer,
+  some_bean_id                  integer,
+  parent_identifier             integer,
+  family_name                   varchar(255),
+  address                       varchar(255),
+  constraint pk_child_person primary key (identifier)
+);
 
 create table configuration (
-  type                          varchar(31) not null,
-  id                            integer not null,
+  type                          varchar(21) not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   configurations_id             integer,
   group_name                    varchar(255),
   product_name                  varchar(255),
   constraint pk_configuration primary key (id)
 );
-create sequence configuration_seq;
 
 create table configurations (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   constraint pk_configurations primary key (id)
 );
-create sequence configurations_seq;
 
 create table contact (
-  id                            integer not null,
-  first_name                    varchar(255),
-  last_name                     varchar(255),
+  id                            integer auto_increment not null,
+  first_name                    varchar(127),
+  last_name                     varchar(127),
   phone                         varchar(255),
   mobile                        varchar(255),
   email                         varchar(255),
   customer_id                   integer not null,
   group_id                      integer,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
   constraint pk_contact primary key (id)
 );
-create sequence contact_seq;
 
 create table contact_group (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
   version                       bigint not null,
   constraint pk_contact_group primary key (id)
 );
-create sequence contact_group_seq;
 
 create table contact_note (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   contact_id                    integer,
   title                         varchar(255),
-  note                          clob,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  note                          longtext,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
   version                       bigint not null,
   constraint pk_contact_note primary key (id)
 );
-create sequence contact_note_seq;
 
 create table c_conversation (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   title                         varchar(255),
-  isopen                        boolean,
+  isopen                        tinyint(1) default 0 not null,
   group_id                      bigint,
   version                       bigint not null,
-  when_created                  timestamp not null,
-  when_modified                 timestamp not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
   constraint pk_c_conversation primary key (id)
 );
-create sequence c_conversation_seq;
 
 create table o_country (
   code                          varchar(2) not null,
@@ -312,361 +384,621 @@ create table o_country (
   constraint pk_o_country primary key (code)
 );
 
+create table cover (
+  id                            bigint auto_increment not null,
+  s3url                         varchar(255),
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_cover primary key (id)
+);
+
 create table o_customer (
-  id                            integer not null,
-  status                        varchar(1),
+  id                            integer auto_increment not null,
+  status                        varchar(1) comment 'status of the customer',
   name                          varchar(40) not null,
-  smallnote                     varchar(100),
-  anniversary                   date,
+  smallnote                     varchar(100) comment 'Short notes regarding the customer',
+  anniversary                   date comment 'Join date of the customer',
   billing_address_id            smallint,
   shipping_address_id           smallint,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
   version                       bigint not null,
-  constraint ck_o_customer_status check (status in ('N','A','I')),
+  constraint ck_o_customer_status check ( status in ('N','A','I')),
   constraint pk_o_customer primary key (id)
+) comment='Holds external customers';
+
+create table dcredit (
+  id                            bigint auto_increment not null,
+  credit                        varchar(255),
+  constraint pk_dcredit primary key (id)
+);
+
+create table dcredit_drol (
+  dcredit_id                    bigint not null,
+  drol_id                       bigint not null,
+  constraint pk_dcredit_drol primary key (dcredit_id,drol_id)
 );
-create sequence o_customer_seq;
 
 create table dexh_entity (
-  oid                           bigint not null,
-  exhange_rate                  decimal(38),
-  exhange_cmoney_amount         decimal(38),
-  exhange_cmoney_currency       varchar(3),
-  last_updated                  timestamp not null,
+  oid                           bigint auto_increment not null,
+  exhange                       varchar(255),
+  an_enum_type                  varchar(255),
+  last_updated                  datetime(6) not null,
   constraint pk_dexh_entity primary key (oid)
 );
-create sequence dexh_entity_seq;
 
 create table dperson (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   first_name                    varchar(255),
   last_name                     varchar(255),
   salary                        decimal(38),
-  a_amt                         decimal(38),
-  a_curr                        varchar(3),
-  i_start                       timestamp,
-  i_end                         timestamp,
   constraint pk_dperson primary key (id)
 );
-create sequence dperson_seq;
+
+create table drol (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_drol primary key (id)
+);
+
+create table drot (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_drot primary key (id)
+);
+
+create table drot_drol (
+  drot_id                       bigint not null,
+  drol_id                       bigint not null,
+  constraint pk_drot_drol primary key (drot_id,drol_id)
+);
 
 create table rawinherit_data (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   val                           integer,
   constraint pk_rawinherit_data primary key (id)
 );
-create sequence rawinherit_data_seq;
 
-create table e_basic (
-  id                            integer not null,
-  status                        varchar(1),
+create table dfk_cascade (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  one_id                        bigint,
+  constraint pk_dfk_cascade primary key (id)
+);
+
+create table dfk_cascade_one (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_dfk_cascade_one primary key (id)
+);
+
+create table dfk_none (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  one_id                        bigint,
+  constraint pk_dfk_none primary key (id)
+);
+
+create table dfk_none_via_join (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  one_id                        bigint,
+  constraint pk_dfk_none_via_join primary key (id)
+);
+
+create table dfk_one (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_dfk_one primary key (id)
+);
+
+create table dfk_set_null (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  one_id                        bigint,
+  constraint pk_dfk_set_null primary key (id)
+);
+
+create table doc (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_doc primary key (id)
+);
+
+create table doc_link (
+  doc_id                        bigint not null,
+  link_id                       bigint not null,
+  constraint pk_doc_link primary key (doc_id,link_id)
+);
+
+create table doc_link_draft (
+  doc_id                        bigint not null,
+  link_id                       bigint not null,
+  constraint pk_doc_link_draft primary key (doc_id,link_id)
+);
+
+create table doc_draft (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_doc_draft primary key (id)
+);
+
+create table document (
+  id                            bigint auto_increment not null,
+  title                         varchar(127),
+  body                          varchar(255),
+  organisation_id               bigint,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint uq_document_title unique (title),
+  constraint pk_document primary key (id)
+);
+
+create table document_draft (
+  id                            bigint auto_increment not null,
+  title                         varchar(127),
+  body                          varchar(255),
+  when_publish                  datetime(6),
+  organisation_id               bigint,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint uq_document_draft_title unique (title),
+  constraint pk_document_draft primary key (id)
+);
+
+create table document_media (
+  id                            bigint auto_increment not null,
+  document_id                   bigint,
   name                          varchar(255),
   description                   varchar(255),
-  some_date                     timestamp,
-  constraint ck_e_basic_status check (status in ('N','A','I')),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_document_media primary key (id)
+);
+
+create table document_media_draft (
+  id                            bigint auto_increment not null,
+  document_id                   bigint,
+  name                          varchar(255),
+  description                   varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_document_media_draft primary key (id)
+);
+
+create table earray_bean (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  phone_numbers                 varchar(300),
+  uids                          varchar(1000),
+  other_ids                     varchar(1000),
+  doubs                         varchar(1000),
+  statuses                      varchar(1000),
+  status2                       varchar(1000),
+  version                       bigint not null,
+  constraint pk_earray_bean primary key (id)
+);
+
+create table earray_set_bean (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  phone_numbers                 varchar(300),
+  uids                          varchar(1000),
+  other_ids                     varchar(1000),
+  doubs                         varchar(1000),
+  version                       bigint not null,
+  constraint pk_earray_set_bean primary key (id)
+);
+
+create table e_basic (
+  id                            integer auto_increment not null,
+  status                        varchar(1),
+  name                          varchar(127),
+  description                   varchar(255),
+  some_date                     datetime(6),
+  constraint ck_e_basic_status check ( status in ('N','A','I')),
   constraint pk_e_basic primary key (id)
 );
-create sequence e_basic_seq;
+
+create table ebasic_change_log (
+  id                            bigint auto_increment not null,
+  name                          varchar(20),
+  short_description             varchar(50),
+  long_description              varchar(100),
+  who_created                   varchar(255) not null,
+  who_modified                  varchar(255) not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  version                       bigint not null,
+  constraint pk_ebasic_change_log primary key (id)
+);
 
 create table ebasic_clob (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   title                         varchar(255),
-  description                   clob,
-  last_update                   timestamp not null,
+  description                   longtext,
+  last_update                   datetime(6) not null,
   constraint pk_ebasic_clob primary key (id)
 );
-create sequence ebasic_clob_seq;
 
 create table ebasic_clob_fetch_eager (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   title                         varchar(255),
-  description                   clob,
-  last_update                   timestamp not null,
+  description                   longtext,
+  last_update                   datetime(6) not null,
   constraint pk_ebasic_clob_fetch_eager primary key (id)
 );
-create sequence ebasic_clob_fetch_eager_seq;
 
 create table ebasic_clob_no_ver (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
-  description                   clob,
+  description                   longtext,
   constraint pk_ebasic_clob_no_ver primary key (id)
 );
-create sequence ebasic_clob_no_ver_seq;
 
 create table e_basicenc (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   description                   varbinary(80),
   dob                           varbinary(20),
-  last_update                   timestamp,
+  status                        varbinary(20),
+  last_update                   datetime(6),
   constraint pk_e_basicenc primary key (id)
 );
-create sequence e_basicenc_seq;
 
 create table e_basicenc_bin (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   description                   varchar(255),
-  data                          blob,
+  data                          longblob,
   some_time                     varbinary(255),
-  last_update                   timestamp not null,
+  last_update                   datetime(6) not null,
   constraint pk_e_basicenc_bin primary key (id)
 );
-create sequence e_basicenc_bin_seq;
 
 create table e_basic_enum_id (
   status                        varchar(1) not null,
   name                          varchar(255),
   description                   varchar(255),
-  constraint ck_e_basic_enum_id_status check (status in ('N','A','I')),
+  constraint ck_e_basic_enum_id_status check ( status in ('N','A','I')),
   constraint pk_e_basic_enum_id primary key (status)
 );
 
-create table ebasic_json_map (
-  id                            bigint not null,
+create table e_basic_eni (
+  id                            integer auto_increment not null,
+  status                        integer,
   name                          varchar(255),
-  content                       clob,
+  description                   varchar(255),
+  some_date                     datetime(6),
+  constraint ck_e_basic_eni_status check ( status in (1,2,3)),
+  constraint pk_e_basic_eni primary key (id)
+);
+
+create table ebasic_hstore (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  map                           varchar(800),
+  version                       bigint not null,
+  constraint pk_ebasic_hstore primary key (id)
+);
+
+create table ebasic_json_list (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  bean_set                      varchar(700),
+  bean_list                     longtext,
+  bean_map                      varchar(700),
+  plain_bean                    varchar(500),
+  flags                         varchar(50),
+  tags                          varchar(100),
+  version                       bigint not null,
+  constraint pk_ebasic_json_list primary key (id)
+);
+
+create table ebasic_json_map (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  content                       longtext,
   version                       bigint not null,
   constraint pk_ebasic_json_map primary key (id)
 );
-create sequence ebasic_json_map_seq;
 
 create table ebasic_json_map_blob (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
-  content                       blob,
+  content                       longblob,
   version                       bigint not null,
   constraint pk_ebasic_json_map_blob primary key (id)
 );
-create sequence ebasic_json_map_blob_seq;
 
 create table ebasic_json_map_clob (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
-  content                       clob,
+  content                       longtext,
   version                       bigint not null,
   constraint pk_ebasic_json_map_clob primary key (id)
 );
-create sequence ebasic_json_map_clob_seq;
+
+create table ebasic_json_map_detail (
+  id                            bigint auto_increment not null,
+  owner_id                      bigint,
+  name                          varchar(255),
+  content                       longtext,
+  version                       bigint not null,
+  constraint pk_ebasic_json_map_detail primary key (id)
+);
 
 create table ebasic_json_map_json_b (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
-  content                       clob,
+  content                       longtext,
   version                       bigint not null,
   constraint pk_ebasic_json_map_json_b primary key (id)
 );
-create sequence ebasic_json_map_json_b_seq;
 
 create table ebasic_json_map_varchar (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   content                       varchar(3000),
   version                       bigint not null,
   constraint pk_ebasic_json_map_varchar primary key (id)
 );
-create sequence ebasic_json_map_varchar_seq;
 
 create table ebasic_json_node (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
-  content                       clob,
+  content                       longtext,
   version                       bigint not null,
   constraint pk_ebasic_json_node primary key (id)
 );
-create sequence ebasic_json_node_seq;
 
 create table ebasic_json_node_blob (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
-  content                       blob,
+  content                       longblob,
   version                       bigint not null,
   constraint pk_ebasic_json_node_blob primary key (id)
 );
-create sequence ebasic_json_node_blob_seq;
 
 create table ebasic_json_node_json_b (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
-  content                       clob,
+  content                       longtext,
   version                       bigint not null,
   constraint pk_ebasic_json_node_json_b primary key (id)
 );
-create sequence ebasic_json_node_json_b_seq;
 
 create table ebasic_json_node_varchar (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   content                       varchar(1000),
   version                       bigint not null,
   constraint pk_ebasic_json_node_varchar primary key (id)
 );
-create sequence ebasic_json_node_varchar_seq;
+
+create table ebasic_json_unmapped (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ebasic_json_unmapped primary key (id)
+);
 
 create table e_basic_ndc (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   constraint pk_e_basic_ndc primary key (id)
 );
-create sequence e_basic_ndc_seq;
+
+create table ebasic_no_sdchild (
+  id                            bigint auto_increment not null,
+  owner_id                      bigint not null,
+  child_name                    varchar(255),
+  amount                        bigint not null,
+  version                       bigint not null,
+  constraint pk_ebasic_no_sdchild primary key (id)
+);
+
+create table ebasic_sdchild (
+  id                            bigint auto_increment not null,
+  owner_id                      bigint not null,
+  child_name                    varchar(255),
+  amount                        bigint not null,
+  version                       bigint not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_ebasic_sdchild primary key (id)
+);
+
+create table ebasic_soft_delete (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  version                       bigint not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_ebasic_soft_delete primary key (id)
+);
 
 create table e_basicver (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   description                   varchar(255),
   other                         varchar(255),
-  last_update                   timestamp not null,
+  last_update                   datetime(6) not null,
   constraint pk_e_basicver primary key (id)
 );
-create sequence e_basicver_seq;
 
 create table e_basic_withlife (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
+  deleted                       tinyint(1) default 0 not null,
   version                       bigint not null,
   constraint pk_e_basic_withlife primary key (id)
 );
-create sequence e_basic_withlife_seq;
 
 create table e_basicverucon (
-  id                            integer not null,
-  name                          varchar(255),
-  other                         varchar(255),
-  other_one                     varchar(255),
+  id                            integer auto_increment not null,
+  name                          varchar(127),
+  other                         varchar(127),
+  other_one                     varchar(127),
   description                   varchar(255),
-  last_update                   timestamp not null,
+  last_update                   datetime(6) not null,
   constraint uq_e_basicverucon_name unique (name),
+  constraint uq_e_basicverucon_other_other_one unique (other,other_one),
   constraint pk_e_basicverucon primary key (id)
 );
-create sequence e_basicverucon_seq;
+
+create table e_col_ab (
+  id                            bigint auto_increment not null,
+  column_a                      varchar(255),
+  column_b                      varchar(255),
+  constraint pk_e_col_ab primary key (id)
+);
+
+create table ecustom_id (
+  id                            varchar(127) not null,
+  name                          varchar(255),
+  constraint pk_ecustom_id primary key (id)
+);
 
 create table eemb_inner (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   nome_inner                    varchar(255),
   outer_id                      integer,
   update_count                  integer not null,
   constraint pk_eemb_inner primary key (id)
 );
-create sequence eemb_inner_seq;
 
 create table eemb_outer (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   nome_outer                    varchar(255),
-  date1                         timestamp,
-  date2                         timestamp,
+  date1                         datetime(6),
+  date2                         datetime(6),
   update_count                  integer not null,
   constraint pk_eemb_outer primary key (id)
 );
-create sequence eemb_outer_seq;
 
 create table egen_props (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   version                       bigint not null,
-  when_created                  timestamp not null,
-  when_modified                 timestamp not null,
-  ts_created                    timestamp not null,
-  ts_updated                    timestamp not null,
-  ldt_created                   timestamp not null,
-  ldt_updated                   timestamp not null,
-  odt_created                   timestamp not null,
-  odt_updated                   timestamp not null,
-  zdt_created                   timestamp not null,
-  zdt_updated                   timestamp not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  ts_created                    datetime(6) not null,
+  ts_updated                    datetime(6) not null,
+  ldt_created                   datetime(6) not null,
+  ldt_updated                   datetime(6) not null,
+  odt_created                   datetime(6) not null,
+  odt_updated                   datetime(6) not null,
+  zdt_created                   datetime(6) not null,
+  zdt_updated                   datetime(6) not null,
+  instant_created               datetime(6) not null,
+  instant_updated               datetime(6) not null,
   long_created                  bigint not null,
   long_updated                  bigint not null,
   constraint pk_egen_props primary key (id)
 );
-create sequence egen_props_seq;
 
 create table einvoice (
-  id                            bigint not null,
-  invoice_date                  timestamp,
+  id                            bigint auto_increment not null,
+  invoice_date                  datetime(6),
   state                         integer,
   person_id                     bigint,
   ship_street                   varchar(255),
   ship_suburb                   varchar(255),
   ship_city                     varchar(255),
-  street                        varchar(255),
-  suburb                        varchar(255),
-  city                          varchar(255),
+  ship_status                   varchar(3),
+  bill_street                   varchar(255),
+  bill_suburb                   varchar(255),
+  bill_city                     varchar(255),
+  bill_status                   varchar(3),
   version                       bigint not null,
-  constraint ck_einvoice_state check (state in (0,1,2)),
+  constraint ck_einvoice_state check ( state in (0,1,2)),
+  constraint ck_einvoice_ship_status check ( ship_status in ('ONE','TWO')),
+  constraint ck_einvoice_bill_status check ( bill_status in ('ONE','TWO')),
   constraint pk_einvoice primary key (id)
 );
-create sequence einvoice_seq;
 
 create table e_main (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   description                   varchar(255),
   version                       bigint not null,
   constraint pk_e_main primary key (id)
 );
-create sequence e_main_seq;
 
 create table enull_collection (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   constraint pk_enull_collection primary key (id)
 );
-create sequence enull_collection_seq;
 
 create table enull_collection_detail (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   enull_collection_id           integer not null,
   something                     varchar(255),
   constraint pk_enull_collection_detail primary key (id)
 );
-create sequence enull_collection_detail_seq;
 
 create table eopt_one_a (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name_for_a                    varchar(255),
   b_id                          integer,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
   version                       bigint not null,
   constraint pk_eopt_one_a primary key (id)
 );
-create sequence eopt_one_a_seq;
 
 create table eopt_one_b (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name_for_b                    varchar(255),
   c_id                          integer not null,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
   version                       bigint not null,
   constraint pk_eopt_one_b primary key (id)
 );
-create sequence eopt_one_b_seq;
 
 create table eopt_one_c (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name_for_c                    varchar(255),
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
   version                       bigint not null,
   constraint pk_eopt_one_c primary key (id)
 );
-create sequence eopt_one_c_seq;
 
 create table eperson (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   notes                         varchar(255),
   street                        varchar(255),
   suburb                        varchar(255),
-  city                          varchar(255),
+  addr_city                     varchar(255),
+  addr_status                   varchar(3),
   version                       bigint not null,
+  constraint ck_eperson_addr_status check ( addr_status in ('ONE','TWO')),
   constraint pk_eperson primary key (id)
 );
-create sequence eperson_seq;
+
+create table e_person_online (
+  id                            bigint auto_increment not null,
+  email                         varchar(127),
+  online_status                 tinyint(1) default 0 not null,
+  when_updated                  datetime(6) not null,
+  constraint uq_e_person_online_email unique (email),
+  constraint pk_e_person_online primary key (id)
+);
 
 create table esimple (
   usertypeid                    integer auto_increment not null,
@@ -674,97 +1006,204 @@ create table esimple (
   constraint pk_esimple primary key (usertypeid)
 );
 
+create table esoft_del_book (
+  id                            bigint auto_increment not null,
+  book_title                    varchar(255),
+  lend_by_id                    bigint,
+  version                       bigint not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_esoft_del_book primary key (id)
+);
+
+create table esoft_del_book_esoft_del_user (
+  esoft_del_book_id             bigint not null,
+  esoft_del_user_id             bigint not null,
+  constraint pk_esoft_del_book_esoft_del_user primary key (esoft_del_book_id,esoft_del_user_id)
+);
+
+create table esoft_del_down (
+  id                            bigint auto_increment not null,
+  esoft_del_mid_id              bigint not null,
+  down                          varchar(255),
+  version                       bigint not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_esoft_del_down primary key (id)
+);
+
+create table esoft_del_mid (
+  id                            bigint auto_increment not null,
+  top_id                        bigint,
+  mid                           varchar(255),
+  up_id                         bigint,
+  version                       bigint not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_esoft_del_mid primary key (id)
+);
+
+create table esoft_del_one_a (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  oneb_id                       bigint,
+  deleted                       tinyint(1) default 0 not null,
+  version                       bigint not null,
+  constraint uq_esoft_del_one_a_oneb_id unique (oneb_id),
+  constraint pk_esoft_del_one_a primary key (id)
+);
+
+create table esoft_del_one_b (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_esoft_del_one_b primary key (id)
+);
+
+create table esoft_del_role (
+  id                            bigint auto_increment not null,
+  role_name                     varchar(255),
+  version                       bigint not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_esoft_del_role primary key (id)
+);
+
+create table esoft_del_role_esoft_del_user (
+  esoft_del_role_id             bigint not null,
+  esoft_del_user_id             bigint not null,
+  constraint pk_esoft_del_role_esoft_del_user primary key (esoft_del_role_id,esoft_del_user_id)
+);
+
+create table esoft_del_top (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_esoft_del_top primary key (id)
+);
+
+create table esoft_del_up (
+  id                            bigint auto_increment not null,
+  up                            varchar(255),
+  version                       bigint not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_esoft_del_up primary key (id)
+);
+
+create table esoft_del_user (
+  id                            bigint auto_increment not null,
+  user_name                     varchar(255),
+  version                       bigint not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_esoft_del_user primary key (id)
+);
+
+create table esoft_del_user_esoft_del_role (
+  esoft_del_user_id             bigint not null,
+  esoft_del_role_id             bigint not null,
+  constraint pk_esoft_del_user_esoft_del_role primary key (esoft_del_user_id,esoft_del_role_id)
+);
+
+create table esome_convert_type (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  money                         decimal(38),
+  constraint pk_esome_convert_type primary key (id)
+);
+
 create table esome_type (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   currency                      varchar(3),
   locale                        varchar(20),
   time_zone                     varchar(20),
   constraint pk_esome_type primary key (id)
 );
-create sequence esome_type_seq;
 
 create table etrans_many (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   constraint pk_etrans_many primary key (id)
 );
-create sequence etrans_many_seq;
+
+create table rawinherit_uncle (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  parent_id                     bigint not null,
+  version                       bigint not null,
+  constraint pk_rawinherit_uncle primary key (id)
+);
 
 create table evanilla_collection (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   constraint pk_evanilla_collection primary key (id)
 );
-create sequence evanilla_collection_seq;
 
 create table evanilla_collection_detail (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   evanilla_collection_id        integer not null,
   something                     varchar(255),
   constraint pk_evanilla_collection_detail primary key (id)
 );
-create sequence evanilla_collection_detail_seq;
 
 create table ewho_props (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
   who_created                   varchar(255) not null,
   who_modified                  varchar(255) not null,
-  version                       bigint not null,
-  when_created                  timestamp not null,
-  when_modified                 timestamp not null,
   constraint pk_ewho_props primary key (id)
 );
-create sequence ewho_props_seq;
 
 create table e_withinet (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   inet_address                  varchar(50),
   version                       bigint not null,
   constraint pk_e_withinet primary key (id)
 );
-create sequence e_withinet_seq;
 
 create table td_child (
-  child_id                      integer not null,
+  child_id                      integer auto_increment not null,
   child_name                    varchar(255),
   parent_id                     integer not null,
   constraint pk_td_child primary key (child_id)
 );
-create sequence td_child_seq;
 
 create table td_parent (
   parent_type                   varchar(31) not null,
-  parent_id                     integer not null,
+  parent_id                     integer auto_increment not null,
   parent_name                   varchar(255),
   extended_name                 varchar(255),
   constraint pk_td_parent primary key (parent_id)
 );
-create sequence td_parent_seq;
+
+create table empl (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  age                           integer,
+  default_address_id            bigint,
+  constraint pk_empl primary key (id)
+);
 
 create table feature_desc (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   description                   varchar(255),
   constraint pk_feature_desc primary key (id)
 );
-create sequence feature_desc_seq;
 
 create table f_first (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   constraint pk_f_first primary key (id)
 );
-create sequence f_first_seq;
 
 create table foo (
-  foo_id                        integer not null,
+  foo_id                        integer auto_increment not null,
   important_text                varchar(255),
   version                       integer not null,
   constraint pk_foo primary key (foo_id)
 );
-create sequence foo_seq;
 
 create table gen_key_identity (
   id                            bigint auto_increment not null,
@@ -773,120 +1212,227 @@ create table gen_key_identity (
 );
 
 create table gen_key_sequence (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   description                   varchar(255),
   constraint pk_gen_key_sequence primary key (id)
 );
-create sequence seq;
 
 create table gen_key_table (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   description                   varchar(255),
   constraint pk_gen_key_table primary key (id)
 );
-create sequence gen_key_table_seq;
+
+create table grand_parent_person (
+  identifier                    integer auto_increment not null,
+  name                          varchar(255),
+  age                           integer,
+  some_bean_id                  integer,
+  family_name                   varchar(255),
+  address                       varchar(255),
+  constraint pk_grand_parent_person primary key (identifier)
+);
+
+create table survey_group (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  categoryobjectid              bigint,
+  sequence_number               integer not null,
+  constraint pk_survey_group primary key (id)
+);
 
 create table c_group (
-  id                            bigint not null,
-  inactive                      boolean,
+  id                            bigint auto_increment not null,
+  inactive                      tinyint(1) default 0 not null,
   name                          varchar(255),
   version                       bigint not null,
-  when_created                  timestamp not null,
-  when_modified                 timestamp not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
   constraint pk_c_group primary key (id)
 );
-create sequence c_group_seq;
+
+create table he_doc (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_he_doc primary key (id)
+);
+
+create table hx_link (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  location                      varchar(255),
+  comments                      varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_hx_link primary key (id)
+);
+
+create table hx_link_doc (
+  hx_link_id                    bigint not null,
+  he_doc_id                     bigint not null,
+  constraint pk_hx_link_doc primary key (hx_link_id,he_doc_id)
+);
+
+create table hi_doc (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_hi_doc primary key (id)
+);
+
+create table hi_link (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  location                      varchar(255),
+  comments                      varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_hi_link primary key (id)
+);
+
+create table hi_link_doc (
+  hi_link_id                    bigint not null,
+  hi_doc_id                     bigint not null,
+  constraint pk_hi_link_doc primary key (hi_link_id,hi_doc_id)
+);
 
 create table imrelated (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   owner_id                      bigint not null,
   constraint pk_imrelated primary key (id)
 );
-create sequence imrelated_seq;
 
 create table imroot (
-  dtype                         varchar(10) not null,
-  id                            bigint not null,
-  title                         varchar(255),
-  when_title                    timestamp,
+  dtype                         varchar(31) not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
+  title                         varchar(255),
+  when_title                    datetime(6),
   constraint pk_imroot primary key (id)
 );
-create sequence imroot_seq;
 
 create table ixresource (
   dtype                         varchar(255),
-  id                            binary(16) not null,
+  id                            varchar(40) not null,
   name                          varchar(255),
   constraint pk_ixresource primary key (id)
 );
 
 create table info_company (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   version                       bigint not null,
   constraint pk_info_company primary key (id)
 );
-create sequence info_company_seq;
 
 create table info_contact (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   company_id                    bigint not null,
   version                       bigint not null,
   constraint pk_info_contact primary key (id)
 );
-create sequence info_contact_seq;
 
 create table info_customer (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   company_id                    bigint,
   version                       bigint not null,
   constraint uq_info_customer_company_id unique (company_id),
   constraint pk_info_customer primary key (id)
 );
-create sequence info_customer_seq;
 
 create table inner_report (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   forecast_id                   bigint,
   constraint uq_inner_report_forecast_id unique (forecast_id),
   constraint pk_inner_report primary key (id)
 );
-create sequence inner_report_seq;
 
 create table drel_invoice (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   booking                       bigint,
   version                       integer not null,
   constraint pk_drel_invoice primary key (id)
 );
-create sequence drel_invoice_seq;
 
 create table item (
   customer                      integer not null,
-  itemnumber                    varchar(255) not null,
+  itemnumber                    varchar(127) not null,
   description                   varchar(255),
   units                         varchar(255),
-  type                          integer,
-  region                        integer,
-  date_modified                 timestamp,
-  date_created                  timestamp,
+  type                          integer not null,
+  region                        integer not null,
+  date_modified                 datetime(6),
+  date_created                  datetime(6),
   modified_by                   varchar(255),
   created_by                    varchar(255),
   version                       bigint not null,
   constraint pk_item primary key (customer,itemnumber)
 );
 
+create table monkey (
+  mid                           bigint auto_increment not null,
+  name                          varchar(255),
+  food_preference               varchar(255),
+  version                       bigint not null,
+  constraint pk_monkey primary key (mid)
+);
+
+create table trainer (
+  tid                           bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_trainer primary key (tid)
+);
+
+create table trainer_monkey (
+  trainer_tid                   bigint not null,
+  monkey_mid                    bigint not null,
+  constraint uq_trainer_monkey_mid unique (monkey_mid),
+  constraint pk_trainer_monkey primary key (trainer_tid,monkey_mid)
+);
+
+create table troop (
+  pid                           bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_troop primary key (pid)
+);
+
+create table troop_monkey (
+  troop_pid                     bigint not null,
+  monkey_mid                    bigint not null,
+  constraint uq_troop_monkey_mid unique (monkey_mid),
+  constraint pk_troop_monkey primary key (troop_pid,monkey_mid)
+);
+
+create table l2_cldf_reset_bean (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_l2_cldf_reset_bean primary key (id)
+);
+
+create table l2_cldf_reset_bean_child (
+  id                            bigint auto_increment not null,
+  parent_id                     bigint,
+  constraint pk_l2_cldf_reset_bean_child primary key (id)
+);
+
 create table level1 (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   constraint pk_level1 primary key (id)
 );
-create sequence level1_seq;
 
 create table level1_level4 (
   level1_id                     bigint not null,
@@ -901,11 +1447,10 @@ create table level1_level2 (
 );
 
 create table level2 (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   constraint pk_level2 primary key (id)
 );
-create sequence level2_seq;
 
 create table level2_level3 (
   level2_id                     bigint not null,
@@ -914,28 +1459,52 @@ create table level2_level3 (
 );
 
 create table level3 (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   constraint pk_level3 primary key (id)
 );
-create sequence level3_seq;
 
 create table level4 (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   constraint pk_level4 primary key (id)
 );
-create sequence level4_seq;
+
+create table link (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  location                      varchar(255),
+  when_publish                  datetime(6),
+  link_comment                  varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_link primary key (id)
+);
+
+create table link_draft (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  location                      varchar(255),
+  when_publish                  datetime(6),
+  link_comment                  varchar(255),
+  dirty                         tinyint(1) default 0 not null,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_link_draft primary key (id)
+);
 
 create table la_attr_value (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
   version                       bigint not null,
   constraint pk_la_attr_value primary key (id)
 );
-create sequence la_attr_value_seq;
 
 create table la_attr_value_attribute (
   la_attr_value_id              integer not null,
@@ -945,25 +1514,23 @@ create table la_attr_value_attribute (
 
 create table mmedia (
   type                          varchar(31) not null,
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   url                           varchar(255),
   note                          varchar(255),
   constraint pk_mmedia primary key (id)
 );
-create sequence mmedia_seq;
 
 create table non_updateprop (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   non_enum                      varchar(5),
   name                          varchar(255),
   note                          varchar(255),
-  constraint ck_non_updateprop_non_enum check (non_enum in ('BEGIN','END')),
+  constraint ck_non_updateprop_non_enum check ( non_enum in ('BEGIN','END')),
   constraint pk_non_updateprop primary key (id)
 );
-create sequence non_updateprop_seq;
 
 create table mprinter (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   flags                         bigint not null,
   current_state_id              bigint,
@@ -973,43 +1540,38 @@ create table mprinter (
   last_swap_black_id            bigint,
   version                       bigint not null,
   constraint uq_mprinter_last_swap_cyan_id unique (last_swap_cyan_id),
-  constraint uq_mprinter_last_swap_magenta_2 unique (last_swap_magenta_id),
+  constraint uq_mprinter_last_swap_magenta_id unique (last_swap_magenta_id),
   constraint uq_mprinter_last_swap_yellow_id unique (last_swap_yellow_id),
   constraint uq_mprinter_last_swap_black_id unique (last_swap_black_id),
   constraint pk_mprinter primary key (id)
 );
-create sequence mprinter_seq;
 
 create table mprinter_state (
-  id                            bigint not null,
-  flags                         bigint,
+  id                            bigint auto_increment not null,
+  flags                         bigint not null,
   printer_id                    bigint,
   version                       bigint not null,
   constraint pk_mprinter_state primary key (id)
 );
-create sequence mprinter_state_seq;
 
 create table mprofile (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   picture_id                    bigint,
   name                          varchar(255),
   constraint pk_mprofile primary key (id)
 );
-create sequence mprofile_seq;
 
 create table mprotected_construct_bean (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   constraint pk_mprotected_construct_bean primary key (id)
 );
-create sequence mprotected_construct_bean_seq;
 
 create table mrole (
-  roleid                        integer not null,
+  roleid                        integer auto_increment not null,
   role_name                     varchar(255),
   constraint pk_mrole primary key (roleid)
 );
-create sequence mrole_seq;
 
 create table mrole_muser (
   mrole_roleid                  integer not null,
@@ -1018,64 +1580,83 @@ create table mrole_muser (
 );
 
 create table msome_other (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   constraint pk_msome_other primary key (id)
 );
-create sequence msome_other_seq;
 
 create table muser (
-  userid                        integer not null,
+  userid                        integer auto_increment not null,
   user_name                     varchar(255),
   user_type_id                  integer,
   constraint pk_muser primary key (userid)
 );
-create sequence muser_seq;
 
 create table muser_type (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   constraint pk_muser_type primary key (id)
 );
-create sequence muser_type_seq;
+
+create table mail_box (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_mail_box primary key (id)
+);
+
+create table mail_user (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_mail_user primary key (id)
+);
+
+create table mail_user_inbox (
+  mail_user_id                  bigint not null,
+  mail_box_id                   bigint not null,
+  constraint pk_mail_user_inbox primary key (mail_user_id,mail_box_id)
+);
+
+create table mail_user_outbox (
+  mail_user_id                  bigint not null,
+  mail_box_id                   bigint not null,
+  constraint pk_mail_user_outbox primary key (mail_user_id,mail_box_id)
+);
 
 create table map_super_actual (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
-  when_created                  timestamp not null,
-  when_updated                  timestamp not null,
+  when_created                  datetime(6) not null,
+  when_updated                  datetime(6) not null,
   constraint pk_map_super_actual primary key (id)
 );
-create sequence map_super_actual_seq;
 
 create table c_message (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   title                         varchar(255),
   body                          varchar(255),
   conversation_id               bigint,
   user_id                       bigint,
   version                       bigint not null,
-  when_created                  timestamp not null,
-  when_modified                 timestamp not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
   constraint pk_c_message primary key (id)
 );
-create sequence c_message_seq;
 
 create table mnoc_role (
-  role_id                       integer not null,
+  role_id                       integer auto_increment not null,
   role_name                     varchar(255),
   version                       integer not null,
   constraint pk_mnoc_role primary key (role_id)
 );
-create sequence mnoc_role_seq;
 
 create table mnoc_user (
-  user_id                       integer not null,
+  user_id                       integer auto_increment not null,
   user_name                     varchar(255),
   version                       integer not null,
   constraint pk_mnoc_user primary key (user_id)
 );
-create sequence mnoc_user_seq;
 
 create table mnoc_user_mnoc_role (
   mnoc_user_user_id             integer not null,
@@ -1083,52 +1664,122 @@ create table mnoc_user_mnoc_role (
   constraint pk_mnoc_user_mnoc_role primary key (mnoc_user_user_id,mnoc_role_role_id)
 );
 
+create table mny_a (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_mny_a primary key (id)
+);
+
+create table mny_b (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  a_id                          bigint,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_mny_b primary key (id)
+);
+
+create table mny_b_mny_c (
+  mny_b_id                      bigint not null,
+  mny_c_id                      bigint not null,
+  constraint pk_mny_b_mny_c primary key (mny_b_id,mny_c_id)
+);
+
+create table mny_c (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_mny_c primary key (id)
+);
+
+create table mny_topic (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_mny_topic primary key (id)
+);
+
+create table subtopics (
+  topic                         bigint not null,
+  subtopic                      bigint not null,
+  constraint pk_subtopics primary key (topic,subtopic)
+);
+
 create table mp_role (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   mp_user_id                    bigint not null,
   code                          varchar(255),
   organization_id               bigint,
   constraint pk_mp_role primary key (id)
 );
-create sequence mp_role_seq;
 
 create table mp_user (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   constraint pk_mp_user primary key (id)
 );
-create sequence mp_user_seq;
+
+create table ms_many_a (
+  aid                           bigint auto_increment not null,
+  name                          varchar(255),
+  ms_many_a_many_b              tinyint(1) default 0 not null,
+  ms_many_b                     tinyint(1) default 0 not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_ms_many_a primary key (aid)
+);
+
+create table ms_many_a_many_b (
+  ms_many_a_aid                 bigint not null,
+  ms_many_b_bid                 bigint not null,
+  constraint pk_ms_many_a_many_b primary key (ms_many_a_aid,ms_many_b_bid)
+);
+
+create table ms_many_b (
+  bid                           bigint auto_increment not null,
+  name                          varchar(255),
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_ms_many_b primary key (bid)
+);
+
+create table ms_many_b_many_a (
+  ms_many_b_bid                 bigint not null,
+  ms_many_a_aid                 bigint not null,
+  constraint pk_ms_many_b_many_a primary key (ms_many_b_bid,ms_many_a_aid)
+);
 
 create table my_lob_size (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
-  my_count                      integer,
-  my_lob                        clob,
+  my_count                      integer not null,
+  my_lob                        longtext,
   constraint pk_my_lob_size primary key (id)
 );
-create sequence my_lob_size_seq;
 
 create table my_lob_size_join_many (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   something                     varchar(255),
   other                         varchar(255),
   parent_id                     integer,
   constraint pk_my_lob_size_join_many primary key (id)
 );
-create sequence my_lob_size_join_many_seq;
 
 create table noidbean (
   name                          varchar(255),
   subject                       varchar(255),
-  when_created                  timestamp not null
+  when_created                  datetime(6) not null
 );
 
 create table o_cached_bean (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   constraint pk_o_cached_bean primary key (id)
 );
-create sequence o_cached_bean_seq;
 
 create table o_cached_bean_country (
   o_cached_bean_id              bigint not null,
@@ -1137,25 +1788,50 @@ create table o_cached_bean_country (
 );
 
 create table o_cached_bean_child (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   cached_bean_id                bigint,
   constraint pk_o_cached_bean_child primary key (id)
 );
-create sequence o_cached_bean_child_seq;
+
+create table o_cached_natkey (
+  id                            bigint auto_increment not null,
+  store                         varchar(255),
+  sku                           varchar(255),
+  description                   varchar(255),
+  constraint pk_o_cached_natkey primary key (id)
+);
+
+create table o_cached_natkey3 (
+  id                            bigint auto_increment not null,
+  store                         varchar(255),
+  code                          integer not null,
+  sku                           varchar(255),
+  description                   varchar(255),
+  constraint pk_o_cached_natkey3 primary key (id)
+);
 
 create table ocar (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   vin                           varchar(255),
   name                          varchar(255),
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
   version                       bigint not null,
   constraint pk_ocar primary key (id)
 );
-create sequence ocar_seq;
+
+create table ocompany (
+  id                            integer auto_increment not null,
+  corp_id                       varchar(50),
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  constraint uq_ocompany_corp_id unique (corp_id),
+  constraint pk_ocompany primary key (id)
+);
 
 create table oengine (
-  engine_id                     binary(16) not null,
+  engine_id                     varchar(40) not null,
   short_desc                    varchar(255),
   car_id                        integer,
   version                       integer not null,
@@ -1164,7 +1840,7 @@ create table oengine (
 );
 
 create table ogear_box (
-  id                            binary(16) not null,
+  id                            varchar(40) not null,
   box_desc                      varchar(255),
   box_size                      integer,
   car_id                        integer,
@@ -1173,243 +1849,390 @@ create table ogear_box (
   constraint pk_ogear_box primary key (id)
 );
 
+create table oroad_show_msg (
+  id                            integer auto_increment not null,
+  company_id                    integer not null,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  constraint uq_oroad_show_msg_company_id unique (company_id),
+  constraint pk_oroad_show_msg primary key (id)
+);
+
+create table om_ordered_detail (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  master_id                     bigint,
+  version                       bigint not null,
+  sort_order                    integer,
+  constraint pk_om_ordered_detail primary key (id)
+);
+
+create table om_ordered_master (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_om_ordered_master primary key (id)
+);
+
 create table o_order (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   status                        integer,
   order_date                    date,
   ship_date                     date,
   kcustomer_id                  integer not null,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
-  constraint ck_o_order_status check (status in (0,1,2,3)),
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  constraint ck_o_order_status check ( status in (0,1,2,3)),
   constraint pk_o_order primary key (id)
 );
-create sequence o_order_seq;
 
 create table o_order_detail (
-  id                            integer not null,
-  order_id                      integer,
+  id                            integer auto_increment not null,
+  order_id                      integer not null,
   order_qty                     integer,
   ship_qty                      integer,
   unit_price                    double,
   product_id                    integer,
-  cretime                       timestamp,
-  updtime                       timestamp not null,
+  cretime                       datetime(6),
+  updtime                       datetime(6) not null,
   constraint pk_o_order_detail primary key (id)
 );
-create sequence o_order_detail_seq;
 
 create table s_orders (
-  uuid                          varchar(255) not null,
+  uuid                          varchar(40) not null,
   constraint pk_s_orders primary key (uuid)
 );
 
 create table s_order_items (
-  uuid                          varchar(255) not null,
+  uuid                          varchar(40) not null,
   product_variant_uuid          varchar(255),
-  order_uuid                    varchar(255),
-  quantity                      integer,
+  order_uuid                    varchar(40),
+  quantity                      integer not null,
   amount                        decimal(38),
   constraint pk_s_order_items primary key (uuid)
 );
 
 create table or_order_ship (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   order_id                      integer,
-  ship_time                     timestamp,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  ship_time                     datetime(6),
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
   version                       bigint not null,
   constraint pk_or_order_ship primary key (id)
 );
-create sequence or_order_ship_seq;
+
+create table organisation (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_organisation primary key (id)
+);
+
+create table oto_bchild (
+  master_id                     bigint auto_increment not null,
+  child                         varchar(255),
+  constraint pk_oto_bchild primary key (master_id)
+);
+
+create table oto_bmaster (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_oto_bmaster primary key (id)
+);
 
 create table oto_child (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   master_id                     bigint,
   constraint uq_oto_child_master_id unique (master_id),
   constraint pk_oto_child primary key (id)
 );
-create sequence oto_child_seq;
+
+create table oto_cust (
+  cid                           bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_cust primary key (cid)
+);
+
+create table oto_cust_address (
+  aid                           bigint auto_increment not null,
+  line1                         varchar(255),
+  line2                         varchar(255),
+  line3                         varchar(255),
+  customer_cid                  bigint,
+  version                       bigint not null,
+  constraint uq_oto_cust_address_customer_cid unique (customer_cid),
+  constraint pk_oto_cust_address primary key (aid)
+);
 
 create table oto_master (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   constraint pk_oto_master primary key (id)
 );
-create sequence oto_master_seq;
+
+create table oto_prime (
+  pid                           bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_prime primary key (pid)
+);
+
+create table oto_prime_extra (
+  eid                           bigint not null,
+  extra                         varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_prime_extra primary key (eid)
+);
+
+create table oto_th_many (
+  id                            bigint auto_increment not null,
+  oto_th_top_id                 bigint not null,
+  many                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_oto_th_many primary key (id)
+);
+
+create table oto_th_one (
+  id                            bigint auto_increment not null,
+  one                           tinyint(1) default 0 not null,
+  many_id                       bigint,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint uq_oto_th_one_many_id unique (many_id),
+  constraint pk_oto_th_one primary key (id)
+);
+
+create table oto_th_top (
+  id                            bigint auto_increment not null,
+  topp                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_oto_th_top primary key (id)
+);
+
+create table oto_ubprime (
+  pid                           varchar(40) not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_ubprime primary key (pid)
+);
+
+create table oto_ubprime_extra (
+  eid                           varchar(40) not null,
+  extra                         varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_ubprime_extra primary key (eid)
+);
+
+create table oto_uprime (
+  pid                           varchar(40) not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_uprime primary key (pid)
+);
+
+create table oto_uprime_extra (
+  eid                           varchar(40) not null,
+  extra                         varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_uprime_extra primary key (eid)
+);
 
 create table pfile (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   file_content_id               integer,
   file_content2_id              integer,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
   version                       bigint not null,
   constraint uq_pfile_file_content_id unique (file_content_id),
   constraint uq_pfile_file_content2_id unique (file_content2_id),
   constraint pk_pfile primary key (id)
 );
-create sequence pfile_seq;
 
 create table pfile_content (
-  id                            integer not null,
-  content                       blob,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  id                            integer auto_increment not null,
+  content                       longblob,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
   version                       bigint not null,
   constraint pk_pfile_content primary key (id)
 );
-create sequence pfile_content_seq;
 
 create table paggview (
-  pview_id                      binary(16),
+  pview_id                      varchar(40),
   amount                        integer not null,
   constraint uq_paggview_pview_id unique (pview_id)
 );
 
 create table pallet_location (
   type                          varchar(31) not null,
-  id                            integer not null,
+  id                            integer auto_increment not null,
   zone_sid                      integer not null,
   attribute                     varchar(255),
   constraint pk_pallet_location primary key (id)
 );
-create sequence pallet_location_seq;
 
 create table parcel (
-  parcelid                      bigint not null,
+  parcelid                      bigint auto_increment not null,
   description                   varchar(255),
   constraint pk_parcel primary key (parcelid)
 );
-create sequence parcel_seq;
 
 create table parcel_location (
-  parcellocid                   bigint not null,
+  parcellocid                   bigint auto_increment not null,
   location                      varchar(255),
   parcelid                      bigint,
   constraint uq_parcel_location_parcelid unique (parcelid),
   constraint pk_parcel_location primary key (parcellocid)
 );
-create sequence parcel_location_seq;
 
 create table rawinherit_parent (
   type                          varchar(31) not null,
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   val                           integer,
+  more                          varchar(255),
   constraint pk_rawinherit_parent primary key (id)
 );
-create sequence rawinherit_parent_seq;
 
-create table rawinherit_parent_rawinherit_dat (
+create table rawinherit_parent_rawinherit_data (
   rawinherit_parent_id          bigint not null,
   rawinherit_data_id            bigint not null,
-  constraint pk_rawinherit_parent_rawinher_0 primary key (rawinherit_parent_id,rawinherit_data_id)
+  constraint pk_rawinherit_parent_rawinherit_data primary key (rawinherit_parent_id,rawinherit_data_id)
+);
+
+create table parent_person (
+  identifier                    integer auto_increment not null,
+  name                          varchar(255),
+  age                           integer,
+  some_bean_id                  integer,
+  parent_identifier             integer,
+  family_name                   varchar(255),
+  address                       varchar(255),
+  constraint pk_parent_person primary key (identifier)
 );
 
 create table c_participation (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   rating                        integer,
   type                          integer,
   conversation_id               bigint not null,
   user_id                       bigint not null,
   version                       bigint not null,
-  when_created                  timestamp not null,
-  when_modified                 timestamp not null,
-  constraint ck_c_participation_type check (type in (0,1)),
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint ck_c_participation_type check ( type in (0,1)),
   constraint pk_c_participation primary key (id)
 );
-create sequence c_participation_seq;
 
 create table mt_permission (
-  id                            binary(16) not null,
+  id                            varchar(40) not null,
   name                          varchar(255),
   constraint pk_mt_permission primary key (id)
 );
 
 create table persistent_file (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
   version                       bigint not null,
   constraint pk_persistent_file primary key (id)
 );
-create sequence persistent_file_seq;
 
 create table persistent_file_content (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   persistent_file_id            integer,
-  content                       blob,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  content                       longblob,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
   version                       bigint not null,
-  constraint uq_persistent_file_content_pe_1 unique (persistent_file_id),
+  constraint uq_persistent_file_content_persistent_file_id unique (persistent_file_id),
   constraint pk_persistent_file_content primary key (id)
 );
-create sequence persistent_file_content_seq;
 
 create table persons (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   surname                       varchar(64) not null,
   name                          varchar(64) not null,
   constraint pk_persons primary key (id)
 );
-create sequence persons_seq start with 1000 increment by 40;
 
 create table person (
-  oid                           bigint not null,
+  oid                           bigint auto_increment not null,
   default_address_oid           bigint,
   version                       integer not null,
   constraint pk_person primary key (oid)
 );
-create sequence person_seq;
 
 create table phones (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   phone_number                  varchar(7) not null,
   person_id                     bigint not null,
   constraint uq_phones_phone_number unique (phone_number),
   constraint pk_phones primary key (id)
 );
-create sequence phones_seq;
+
+create table primary_revision (
+  id                            bigint not null,
+  revision                      integer not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_primary_revision primary key (id,revision)
+);
 
 create table o_product (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   sku                           varchar(20),
   name                          varchar(255),
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
   constraint pk_o_product primary key (id)
 );
-create sequence o_product_seq;
 
 create table pp (
-  id                            binary(16) not null,
+  id                            varchar(40) not null,
   name                          varchar(255),
   value                         varchar(100) not null,
   constraint pk_pp primary key (id)
 );
 
 create table pp_to_ww (
-  pp_id                         binary(16) not null,
-  ww_id                         binary(16) not null,
+  pp_id                         varchar(40) not null,
+  ww_id                         varchar(40) not null,
   constraint pk_pp_to_ww primary key (pp_id,ww_id)
 );
 
+create table question (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  groupobjectid                 bigint,
+  sequence_number               integer not null,
+  constraint pk_question primary key (id)
+);
+
 create table rcustomer (
-  company                       varchar(255) not null,
-  name                          varchar(255) not null,
+  company                       varchar(127) not null,
+  name                          varchar(127) not null,
   description                   varchar(255),
   constraint pk_rcustomer primary key (company,name)
 );
 
 create table r_orders (
-  company                       varchar(255) not null,
+  company                       varchar(127) not null,
   order_number                  integer not null,
-  customername                  varchar(255),
+  customername                  varchar(127),
   item                          varchar(255),
   constraint pk_r_orders primary key (company,order_number)
 );
@@ -1429,299 +2252,317 @@ create table resourcefile (
   constraint pk_resourcefile primary key (id)
 );
 
+create table em_role (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_em_role primary key (id)
+);
+
 create table mt_role (
-  id                            binary(16) not null,
+  id                            varchar(40) not null,
   name                          varchar(50),
-  tenant_id                     binary(16),
+  tenant_id                     varchar(40),
   version                       bigint not null,
   constraint pk_mt_role primary key (id)
 );
 
 create table mt_role_permission (
-  mt_role_id                    binary(16) not null,
-  mt_permission_id              binary(16) not null,
+  mt_role_id                    varchar(40) not null,
+  mt_permission_id              varchar(40) not null,
   constraint pk_mt_role_permission primary key (mt_role_id,mt_permission_id)
 );
 
-create table em_role (
-  id                            bigint not null,
-  name                          varchar(255),
-  constraint pk_em_role primary key (id)
-);
-create sequence em_role_seq;
-
 create table f_second (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
+  mod_name                      varchar(255),
   first                         bigint,
   title                         varchar(255),
   constraint uq_f_second_first unique (first),
   constraint pk_f_second primary key (id)
 );
-create sequence f_second_seq;
 
 create table section (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   article_id                    integer,
   type                          integer,
-  content                       clob,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  content                       longtext,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
   version                       bigint not null,
-  constraint ck_section_type check (type in (0,1)),
+  constraint ck_section_type check ( type in (0,1)),
   constraint pk_section primary key (id)
 );
-create sequence section_seq;
 
 create table self_parent (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   parent_id                     bigint,
   version                       bigint not null,
   constraint pk_self_parent primary key (id)
 );
-create sequence self_parent_seq;
 
 create table self_ref_customer (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   referred_by_id                bigint,
   constraint pk_self_ref_customer primary key (id)
 );
-create sequence self_ref_customer_seq;
 
 create table self_ref_example (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255) not null,
   parent_id                     bigint,
   constraint pk_self_ref_example primary key (id)
 );
-create sequence self_ref_example_seq;
 
 create table some_enum_bean (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   some_enum                     integer,
   name                          varchar(255),
-  constraint ck_some_enum_bean_some_enum check (some_enum in (0,1)),
+  constraint ck_some_enum_bean_some_enum check ( some_enum in (0,1)),
   constraint pk_some_enum_bean primary key (id)
 );
-create sequence some_enum_bean_seq;
 
 create table some_file_bean (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
-  content                       blob,
+  content                       longblob,
   version                       bigint not null,
   constraint pk_some_file_bean primary key (id)
 );
-create sequence some_file_bean_seq;
 
 create table some_new_types_bean (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   dow                           integer(1),
   mth                           integer(1),
   yr                            integer,
   yr_mth                        date,
   local_date                    date,
-  local_date_time               timestamp,
-  offset_date_time              timestamp,
-  zoned_date_time               timestamp,
-  instant                       timestamp,
+  local_date_time               datetime(6),
+  offset_date_time              datetime(6),
+  zoned_date_time               datetime(6),
+  instant                       datetime(6),
   zone_id                       varchar(60),
   zone_offset                   varchar(60),
+  path                          varchar(255),
+  period                        varchar(20),
   version                       bigint not null,
-  constraint ck_some_new_types_bean_dow check (dow in ('1','2','3','4','5','6','7')),
-  constraint ck_some_new_types_bean_mth check (mth in ('1','2','3','4','5','6','7','8','9','10','11','12')),
+  constraint ck_some_new_types_bean_dow check ( dow in (1,2,3,4,5,6,7)),
+  constraint ck_some_new_types_bean_mth check ( mth in (1,2,3,4,5,6,7,8,9,10,11,12)),
   constraint pk_some_new_types_bean primary key (id)
 );
-create sequence some_new_types_bean_seq;
 
 create table some_period_bean (
-  id                            bigint not null,
-  period_years                  integer,
-  period_months                 integer,
-  period_days                   integer,
+  id                            bigint auto_increment not null,
   anniversary                   date,
   version                       bigint not null,
   constraint pk_some_period_bean primary key (id)
 );
-create sequence some_period_bean_seq;
 
 create table stockforecast (
   type                          varchar(31) not null,
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   inner_report_id               bigint,
   constraint pk_stockforecast primary key (id)
 );
-create sequence stockforecast_seq;
 
 create table sub_section (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   section_id                    integer,
   title                         varchar(255),
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
   version                       bigint not null,
   constraint pk_sub_section primary key (id)
 );
-create sequence sub_section_seq;
 
 create table sub_type (
-  sub_type_id                   integer not null,
+  sub_type_id                   integer auto_increment not null,
   description                   varchar(255),
   version                       bigint not null,
   constraint pk_sub_type primary key (sub_type_id)
 );
-create sequence sub_type_seq;
+
+create table survey (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_survey primary key (id)
+);
 
 create table tbytes_only (
-  id                            integer not null,
-  content                       blob,
+  id                            integer auto_increment not null,
+  content                       longblob,
   constraint pk_tbytes_only primary key (id)
 );
-create sequence tbytes_only_seq;
 
 create table tcar (
   type                          varchar(31) not null,
-  plate_no                      varchar(255) not null,
+  plate_no                      varchar(32) not null,
   truckload                     bigint,
   constraint pk_tcar primary key (plate_no)
 );
 
+create table tevent (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_tevent primary key (id)
+);
+
+create table tevent_many (
+  id                            bigint auto_increment not null,
+  description                   varchar(255),
+  event_id                      bigint,
+  units                         integer not null,
+  amount                        double not null,
+  version                       bigint not null,
+  constraint pk_tevent_many primary key (id)
+);
+
+create table tevent_one (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  status                        integer,
+  event_id                      bigint,
+  version                       bigint not null,
+  constraint ck_tevent_one_status check ( status in (0,1)),
+  constraint uq_tevent_one_event_id unique (event_id),
+  constraint pk_tevent_one primary key (id)
+);
+
 create table tint_root (
   my_type                       integer(3) not null,
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   child_property                varchar(255),
   constraint pk_tint_root primary key (id)
 );
-create sequence tint_root_seq;
 
 create table tjoda_entity (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   local_time                    time,
   constraint pk_tjoda_entity primary key (id)
 );
-create sequence tjoda_entity_seq;
 
 create table t_mapsuper1 (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   something                     varchar(255),
   name                          varchar(255),
   version                       integer not null,
   constraint pk_t_mapsuper1 primary key (id)
 );
-create sequence t_mapsuper1_seq;
 
 create table t_oneb (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   description                   varchar(255),
-  active                        boolean,
+  active                        tinyint(1) default 0 not null,
   constraint pk_t_oneb primary key (id)
 );
-create sequence t_oneb_seq;
 
 create table t_detail_with_other_namexxxyy (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   description                   varchar(255),
-  active                        boolean,
+  some_unique_value             varchar(127),
+  active                        tinyint(1) default 0 not null,
   master_id                     integer,
-  constraint pk_t_detail_with_other_namexx_0 primary key (id)
+  constraint uq_t_detail_with_other_namexxxyy_some_unique_value unique (some_unique_value),
+  constraint pk_t_detail_with_other_namexxxyy primary key (id)
 );
-create sequence t_atable_detail_seq;
 
 create table ts_detail_two (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   description                   varchar(255),
-  active                        boolean,
+  active                        tinyint(1) default 0 not null,
   master_id                     integer,
   constraint pk_ts_detail_two primary key (id)
 );
-create sequence ts_detail_two_seq;
 
 create table t_atable_thatisrelatively (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   description                   varchar(255),
-  active                        boolean,
+  active                        tinyint(1) default 0 not null,
   constraint pk_t_atable_thatisrelatively primary key (id)
 );
-create sequence t_atable_master_seq;
 
 create table ts_master_two (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   description                   varchar(255),
-  active                        boolean,
+  active                        tinyint(1) default 0 not null,
   constraint pk_ts_master_two primary key (id)
 );
-create sequence ts_master_two_seq;
 
 create table tuuid_entity (
-  id                            binary(16) not null,
+  id                            varchar(40) not null,
   name                          varchar(255),
   constraint pk_tuuid_entity primary key (id)
 );
 
 create table twheel (
-  id                            bigint not null,
-  owner_plate_no                varchar(255) not null,
+  id                            bigint auto_increment not null,
+  owner_plate_no                varchar(32) not null,
   constraint pk_twheel primary key (id)
 );
-create sequence twheel_seq;
 
 create table twith_pre_insert (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255) not null,
   title                         varchar(255),
   constraint pk_twith_pre_insert primary key (id)
 );
-create sequence twith_pre_insert_seq;
 
 create table mt_tenant (
-  id                            binary(16) not null,
+  id                            varchar(40) not null,
   name                          varchar(255),
   version                       bigint not null,
   constraint pk_mt_tenant primary key (id)
 );
 
-create table sa_tire (
-  id                            bigint not null,
-  version                       integer not null,
-  constraint pk_sa_tire primary key (id)
+create table test_annotation_base_entity (
+  direct                        varchar(255),
+  meta                          varchar(255),
+  mixed                         varchar(255),
+  constraint_annotation         varchar(40),
+  null1                         varchar(255) not null,
+  null2                         varchar(255),
+  null3                         varchar(255)
 );
-create sequence sa_tire_seq;
 
 create table tire (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   wheel                         bigint,
   version                       integer not null,
   constraint uq_tire_wheel unique (wheel),
   constraint pk_tire primary key (id)
 );
-create sequence tire_seq;
+
+create table sa_tire (
+  id                            bigint auto_increment not null,
+  version                       integer not null,
+  constraint pk_sa_tire primary key (id)
+);
 
 create table trip (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   vehicle_driver_id             integer,
   destination                   varchar(255),
   address_id                    smallint,
-  star_date                     timestamp,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  star_date                     datetime(6),
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
   version                       bigint not null,
   constraint pk_trip primary key (id)
 );
-create sequence trip_seq;
 
 create table truck_ref (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   something                     varchar(255),
   constraint pk_truck_ref primary key (id)
 );
-create sequence truck_ref_seq;
 
 create table type (
   customer                      integer not null,
@@ -1732,8 +2573,16 @@ create table type (
   constraint pk_type primary key (customer,type)
 );
 
+create table tz_bean (
+  id                            bigint auto_increment not null,
+  moda                          varchar(255),
+  ts                            datetime(6),
+  tstz                          datetime(6),
+  constraint pk_tz_bean primary key (id)
+);
+
 create table ut_detail (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   utmaster_id                   integer not null,
   name                          varchar(255),
   qty                           integer,
@@ -1741,68 +2590,70 @@ create table ut_detail (
   version                       integer not null,
   constraint pk_ut_detail primary key (id)
 );
-create sequence ut_detail_seq;
 
 create table ut_master (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   description                   varchar(255),
   version                       integer not null,
   constraint pk_ut_master primary key (id)
 );
-create sequence ut_master_seq;
 
 create table uuone (
-  id                            binary(16) not null,
+  id                            varchar(40) not null,
   name                          varchar(255),
   constraint pk_uuone primary key (id)
 );
 
 create table uutwo (
-  id                            binary(16) not null,
+  id                            varchar(40) not null,
   name                          varchar(255),
-  master_id                     binary(16),
+  master_id                     varchar(40),
   constraint pk_uutwo primary key (id)
 );
 
-create table em_user (
-  id                            bigint not null,
+create table c_user (
+  id                            bigint auto_increment not null,
+  inactive                      tinyint(1) default 0 not null,
   name                          varchar(255),
-  constraint pk_em_user primary key (id)
+  email                         varchar(255),
+  password_hash                 varchar(255),
+  group_id                      bigint,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_c_user primary key (id)
 );
-create sequence em_user_seq;
 
 create table tx_user (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   constraint pk_tx_user primary key (id)
 );
-create sequence tx_user_seq;
 
-create table c_user (
-  id                            bigint not null,
-  inactive                      boolean,
-  name                          varchar(255),
-  email                         varchar(255),
-  group_id                      bigint,
+create table g_user (
+  id                            bigint auto_increment not null,
+  username                      varchar(255),
   version                       bigint not null,
-  when_created                  timestamp not null,
-  when_modified                 timestamp not null,
-  constraint pk_c_user primary key (id)
+  constraint pk_g_user primary key (id)
+);
+
+create table em_user (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_em_user primary key (id)
 );
-create sequence c_user_seq;
 
 create table oto_user (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   account_id                    bigint not null,
   version                       bigint not null,
-  when_created                  timestamp not null,
-  when_modified                 timestamp not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
   constraint uq_oto_user_account_id unique (account_id),
   constraint pk_oto_user primary key (id)
 );
-create sequence oto_user_seq;
 
 create table em_user_role (
   user_id                       bigint not null,
@@ -1812,39 +2663,39 @@ create table em_user_role (
 
 create table vehicle (
   dtype                         varchar(3) not null,
-  id                            integer not null,
+  id                            integer auto_increment not null,
   license_number                varchar(255),
-  registration_date             timestamp,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  registration_date             datetime(6),
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
   version                       bigint not null,
-  truck_ref_id                  integer,
-  capacity                      double,
+  siz                           varchar(1),
   driver                        varchar(255),
   car_ref_id                    integer,
+  notes                         varchar(255),
+  truck_ref_id                  integer,
+  capacity                      double,
+  constraint ck_vehicle_siz check ( siz in ('S','M','L','H')),
   constraint pk_vehicle primary key (id)
 );
-create sequence vehicle_seq;
 
 create table vehicle_driver (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   vehicle_id                    integer,
   address_id                    smallint,
-  license_issued_on             timestamp,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  license_issued_on             datetime(6),
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
   version                       bigint not null,
   constraint pk_vehicle_driver primary key (id)
 );
-create sequence vehicle_driver_seq;
 
 create table warehouses (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   officezoneid                  integer,
   constraint pk_warehouses primary key (id)
 );
-create sequence warehouses_seq;
 
 create table warehousesshippingzones (
   warehouseid                   integer not null,
@@ -1853,394 +2704,757 @@ create table warehousesshippingzones (
 );
 
 create table sa_wheel (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   tire                          bigint,
   car                           bigint,
   version                       integer not null,
   constraint pk_sa_wheel primary key (id)
 );
-create sequence sa_wheel_seq;
-
-create table sp_car_wheel (
-  id                            bigint not null,
-  version                       integer not null,
-  constraint pk_sp_car_wheel primary key (id)
-);
-create sequence sp_car_wheel_seq;
 
 create table wheel (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   version                       integer not null,
   constraint pk_wheel primary key (id)
 );
-create sequence wheel_seq;
+
+create table sp_car_wheel (
+  id                            bigint auto_increment not null,
+  version                       integer not null,
+  constraint pk_sp_car_wheel primary key (id)
+);
+
+create table g_who_props_otm (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  who_created_id                bigint,
+  who_modified_id               bigint,
+  constraint pk_g_who_props_otm primary key (id)
+);
 
 create table with_zero (
-  id                            bigint not null,
+  id                            bigint auto_increment not null,
   name                          varchar(255),
   parent_id                     integer,
+  lang                          varchar(2) default 'en' not null,
   version                       bigint not null,
   constraint pk_with_zero primary key (id)
 );
-create sequence with_zero_seq;
 
 create table parent (
-  id                            integer not null,
+  id                            integer auto_increment not null,
   name                          varchar(255),
   constraint pk_parent primary key (id)
 );
-create sequence parent_seq;
 
 create table wview (
-  id                            binary(16) not null,
-  name                          varchar(255) not null,
+  id                            varchar(40) not null,
+  name                          varchar(127) not null,
   constraint uq_wview_name unique (name),
   constraint pk_wview primary key (id)
 );
 
 create table zones (
   type                          varchar(31) not null,
-  id                            integer not null,
+  id                            integer auto_increment not null,
   attribute                     varchar(255),
   constraint pk_zones primary key (id)
 );
-create sequence zones_seq;
 
-alter table bar add constraint fk_bar_foo_id foreign key (foo_id) references foo (foo_id) on delete restrict on update restrict;
+create index ix_contact_last_name_first_name on contact (last_name,first_name);
+create index ix_e_basic_name on e_basic (name);
 create index ix_bar_foo_id on bar (foo_id);
+alter table bar add constraint fk_bar_foo_id foreign key (foo_id) references foo (foo_id) on delete restrict on update restrict;
+
+create index ix_addr_employee_id on addr (employee_id);
+alter table addr add constraint fk_addr_employee_id foreign key (employee_id) references empl (id) on delete restrict on update restrict;
 
-alter table o_address add constraint fk_o_address_country_code foreign key (country_code) references o_country (code) on delete restrict on update restrict;
 create index ix_o_address_country_code on o_address (country_code);
+alter table o_address add constraint fk_o_address_country_code foreign key (country_code) references o_country (code) on delete restrict on update restrict;
 
-alter table animals add constraint fk_animals_shelter_id foreign key (shelter_id) references animal_shelter (id) on delete restrict on update restrict;
-create index ix_animals_shelter_id on animals (shelter_id);
+alter table album add constraint fk_album_cover_id foreign key (cover_id) references cover (id) on delete restrict on update restrict;
 
-alter table attribute add constraint fk_attribute_attribute_holder_1 foreign key (attribute_holder_id) references attribute_holder (id) on delete restrict on update restrict;
-create index ix_attribute_attribute_holder_1 on attribute (attribute_holder_id);
+create index ix_animal_shelter_id on animal (shelter_id);
+alter table animal add constraint fk_animal_shelter_id foreign key (shelter_id) references animal_shelter (id) on delete restrict on update restrict;
+
+create index ix_attribute_attribute_holder_id on attribute (attribute_holder_id);
+alter table attribute add constraint fk_attribute_attribute_holder_id foreign key (attribute_holder_id) references attribute_holder (id) on delete restrict on update restrict;
 
-alter table bbookmark add constraint fk_bbookmark_user_id foreign key (user_id) references bbookmark_user (id) on delete restrict on update restrict;
 create index ix_bbookmark_user_id on bbookmark (user_id);
+alter table bbookmark add constraint fk_bbookmark_user_id foreign key (user_id) references bbookmark_user (id) on delete restrict on update restrict;
+
+create index ix_bsite_user_site_id on bsite_user (site_id);
+alter table bsite_user add constraint fk_bsite_user_site_id foreign key (site_id) references bsite (id) on delete restrict on update restrict;
+
+create index ix_bsite_user_user_id on bsite_user (user_id);
+alter table bsite_user add constraint fk_bsite_user_user_id foreign key (user_id) references buser (id) on delete restrict on update restrict;
+
+create index ix_bsite_user_b_site on bsite_user_b (site);
+alter table bsite_user_b add constraint fk_bsite_user_b_site foreign key (site) references bsite (id) on delete restrict on update restrict;
+
+create index ix_bsite_user_b_usr on bsite_user_b (usr);
+alter table bsite_user_b add constraint fk_bsite_user_b_usr foreign key (usr) references buser (id) on delete restrict on update restrict;
+
+create index ix_bsite_user_c_site_uid on bsite_user_c (site_uid);
+alter table bsite_user_c add constraint fk_bsite_user_c_site_uid foreign key (site_uid) references bsite (id) on delete restrict on update restrict;
+
+create index ix_bsite_user_c_user_uid on bsite_user_c (user_uid);
+alter table bsite_user_c add constraint fk_bsite_user_c_user_uid foreign key (user_uid) references buser (id) on delete restrict on update restrict;
 
 alter table drel_booking add constraint fk_drel_booking_agent_invoice foreign key (agent_invoice) references drel_invoice (id) on delete restrict on update restrict;
 
 alter table drel_booking add constraint fk_drel_booking_client_invoice foreign key (client_invoice) references drel_invoice (id) on delete restrict on update restrict;
 
-alter table ckey_detail add constraint fk_ckey_detail_ckey_parent foreign key (one_key,two_key) references ckey_parent (one_key,two_key) on delete restrict on update restrict;
-create index ix_ckey_detail_one_key_two_key on ckey_detail (one_key,two_key);
+create index ix_ckey_detail_parent on ckey_detail (one_key,two_key);
+alter table ckey_detail add constraint fk_ckey_detail_parent foreign key (one_key,two_key) references ckey_parent (one_key,two_key) on delete restrict on update restrict;
 
-alter table ckey_parent add constraint fk_ckey_parent_assoc_id foreign key (assoc_id) references ckey_assoc (id) on delete restrict on update restrict;
 create index ix_ckey_parent_assoc_id on ckey_parent (assoc_id);
+alter table ckey_parent add constraint fk_ckey_parent_assoc_id foreign key (assoc_id) references ckey_assoc (id) on delete restrict on update restrict;
 
-alter table calculation_result add constraint fk_calculation_result_product_1 foreign key (product_configuration_id) references configuration (id) on delete restrict on update restrict;
-create index ix_calculation_result_product_1 on calculation_result (product_configuration_id);
+create index ix_calculation_result_product_configuration_id on calculation_result (product_configuration_id);
+alter table calculation_result add constraint fk_calculation_result_product_configuration_id foreign key (product_configuration_id) references configuration (id) on delete restrict on update restrict;
 
-alter table calculation_result add constraint fk_calculation_result_group_c_2 foreign key (group_configuration_id) references configuration (id) on delete restrict on update restrict;
-create index ix_calculation_result_group_c_2 on calculation_result (group_configuration_id);
+create index ix_calculation_result_group_configuration_id on calculation_result (group_configuration_id);
+alter table calculation_result add constraint fk_calculation_result_group_configuration_id foreign key (group_configuration_id) references configuration (id) on delete restrict on update restrict;
 
+create index ix_sp_car_car_wheels_sp_car_car on sp_car_car_wheels (car);
 alter table sp_car_car_wheels add constraint fk_sp_car_car_wheels_sp_car_car foreign key (car) references sp_car_car (id) on delete restrict on update restrict;
-create index ix_sp_car_car_wheels_car on sp_car_car_wheels (car);
 
-alter table sp_car_car_wheels add constraint fk_sp_car_car_wheels_sp_car_w_2 foreign key (wheel) references sp_car_wheel (id) on delete restrict on update restrict;
-create index ix_sp_car_car_wheels_wheel on sp_car_car_wheels (wheel);
+create index ix_sp_car_car_wheels_sp_car_wheel on sp_car_car_wheels (wheel);
+alter table sp_car_car_wheels add constraint fk_sp_car_car_wheels_sp_car_wheel foreign key (wheel) references sp_car_wheel (id) on delete restrict on update restrict;
+
+create index ix_car_accessory_fuse_id on car_accessory (fuse_id);
+alter table car_accessory add constraint fk_car_accessory_fuse_id foreign key (fuse_id) references car_fuse (id) on delete restrict on update restrict;
 
-alter table car_accessory add constraint fk_car_accessory_car_id foreign key (car_id) references vehicle (id) on delete restrict on update restrict;
 create index ix_car_accessory_car_id on car_accessory (car_id);
+alter table car_accessory add constraint fk_car_accessory_car_id foreign key (car_id) references vehicle (id) on delete restrict on update restrict;
 
-alter table configuration add constraint fk_configuration_configuratio_1 foreign key (configurations_id) references configurations (id) on delete restrict on update restrict;
-create index ix_configuration_configuratio_1 on configuration (configurations_id);
+create index ix_category_surveyobjectid on category (surveyobjectid);
+alter table category add constraint fk_category_surveyobjectid foreign key (surveyobjectid) references survey (id) on delete restrict on update restrict;
+
+create index ix_child_person_some_bean_id on child_person (some_bean_id);
+alter table child_person add constraint fk_child_person_some_bean_id foreign key (some_bean_id) references e_basic (id) on delete restrict on update restrict;
+
+create index ix_child_person_parent_identifier on child_person (parent_identifier);
+alter table child_person add constraint fk_child_person_parent_identifier foreign key (parent_identifier) references parent_person (identifier) on delete restrict on update restrict;
+
+create index ix_configuration_configurations_id on configuration (configurations_id);
+alter table configuration add constraint fk_configuration_configurations_id foreign key (configurations_id) references configurations (id) on delete restrict on update restrict;
 
-alter table contact add constraint fk_contact_customer_id foreign key (customer_id) references o_customer (id) on delete restrict on update restrict;
 create index ix_contact_customer_id on contact (customer_id);
+alter table contact add constraint fk_contact_customer_id foreign key (customer_id) references o_customer (id) on delete restrict on update restrict;
 
-alter table contact add constraint fk_contact_group_id foreign key (group_id) references contact_group (id) on delete restrict on update restrict;
 create index ix_contact_group_id on contact (group_id);
+alter table contact add constraint fk_contact_group_id foreign key (group_id) references contact_group (id) on delete restrict on update restrict;
 
-alter table contact_note add constraint fk_contact_note_contact_id foreign key (contact_id) references contact (id) on delete restrict on update restrict;
 create index ix_contact_note_contact_id on contact_note (contact_id);
+alter table contact_note add constraint fk_contact_note_contact_id foreign key (contact_id) references contact (id) on delete restrict on update restrict;
 
-alter table c_conversation add constraint fk_c_conversation_group_id foreign key (group_id) references c_group (id) on delete restrict on update restrict;
 create index ix_c_conversation_group_id on c_conversation (group_id);
+alter table c_conversation add constraint fk_c_conversation_group_id foreign key (group_id) references c_group (id) on delete restrict on update restrict;
 
-alter table o_customer add constraint fk_o_customer_billing_address_1 foreign key (billing_address_id) references o_address (id) on delete restrict on update restrict;
-create index ix_o_customer_billing_address_1 on o_customer (billing_address_id);
+create index ix_o_customer_billing_address_id on o_customer (billing_address_id);
+alter table o_customer add constraint fk_o_customer_billing_address_id foreign key (billing_address_id) references o_address (id) on delete restrict on update restrict;
 
-alter table o_customer add constraint fk_o_customer_shipping_addres_2 foreign key (shipping_address_id) references o_address (id) on delete restrict on update restrict;
-create index ix_o_customer_shipping_addres_2 on o_customer (shipping_address_id);
+create index ix_o_customer_shipping_address_id on o_customer (shipping_address_id);
+alter table o_customer add constraint fk_o_customer_shipping_address_id foreign key (shipping_address_id) references o_address (id) on delete restrict on update restrict;
+
+create index ix_dcredit_drol_dcredit on dcredit_drol (dcredit_id);
+alter table dcredit_drol add constraint fk_dcredit_drol_dcredit foreign key (dcredit_id) references dcredit (id) on delete restrict on update restrict;
+
+create index ix_dcredit_drol_drol on dcredit_drol (drol_id);
+alter table dcredit_drol add constraint fk_dcredit_drol_drol foreign key (drol_id) references drol (id) on delete restrict on update restrict;
+
+create index ix_drot_drol_drot on drot_drol (drot_id);
+alter table drot_drol add constraint fk_drot_drol_drot foreign key (drot_id) references drot (id) on delete restrict on update restrict;
+
+create index ix_drot_drol_drol on drot_drol (drol_id);
+alter table drot_drol add constraint fk_drot_drol_drol foreign key (drol_id) references drol (id) on delete restrict on update restrict;
+
+create index ix_dfk_cascade_one_id on dfk_cascade (one_id);
+alter table dfk_cascade add constraint fk_dfk_cascade_one_id foreign key (one_id) references dfk_cascade_one (id) on delete cascade on update cascade;
+
+create index ix_dfk_set_null_one_id on dfk_set_null (one_id);
+alter table dfk_set_null add constraint fk_dfk_set_null_one_id foreign key (one_id) references dfk_one (id) on delete set null on update set null;
+
+alter table doc add constraint fk_doc_id foreign key (id) references doc_draft (id) on delete restrict on update restrict;
+
+create index ix_doc_link_doc on doc_link (doc_id);
+alter table doc_link add constraint fk_doc_link_doc foreign key (doc_id) references doc (id) on delete restrict on update restrict;
+
+create index ix_doc_link_link on doc_link (link_id);
+alter table doc_link add constraint fk_doc_link_link foreign key (link_id) references link (id) on delete restrict on update restrict;
+
+alter table document add constraint fk_document_id foreign key (id) references document_draft (id) on delete restrict on update restrict;
+
+create index ix_document_organisation_id on document (organisation_id);
+alter table document add constraint fk_document_organisation_id foreign key (organisation_id) references organisation (id) on delete restrict on update restrict;
+
+create index ix_document_draft_organisation_id on document_draft (organisation_id);
+alter table document_draft add constraint fk_document_draft_organisation_id foreign key (organisation_id) references organisation (id) on delete restrict on update restrict;
+
+create index ix_document_media_document_id on document_media (document_id);
+alter table document_media add constraint fk_document_media_document_id foreign key (document_id) references document (id) on delete restrict on update restrict;
+
+create index ix_document_media_draft_document_id on document_media_draft (document_id);
+alter table document_media_draft add constraint fk_document_media_draft_document_id foreign key (document_id) references document_draft (id) on delete restrict on update restrict;
+
+create index ix_ebasic_json_map_detail_owner_id on ebasic_json_map_detail (owner_id);
+alter table ebasic_json_map_detail add constraint fk_ebasic_json_map_detail_owner_id foreign key (owner_id) references ebasic_json_map (id) on delete restrict on update restrict;
+
+create index ix_ebasic_no_sdchild_owner_id on ebasic_no_sdchild (owner_id);
+alter table ebasic_no_sdchild add constraint fk_ebasic_no_sdchild_owner_id foreign key (owner_id) references ebasic_soft_delete (id) on delete restrict on update restrict;
+
+create index ix_ebasic_sdchild_owner_id on ebasic_sdchild (owner_id);
+alter table ebasic_sdchild add constraint fk_ebasic_sdchild_owner_id foreign key (owner_id) references ebasic_soft_delete (id) on delete restrict on update restrict;
 
-alter table eemb_inner add constraint fk_eemb_inner_outer_id foreign key (outer_id) references eemb_outer (id) on delete restrict on update restrict;
 create index ix_eemb_inner_outer_id on eemb_inner (outer_id);
+alter table eemb_inner add constraint fk_eemb_inner_outer_id foreign key (outer_id) references eemb_outer (id) on delete restrict on update restrict;
 
-alter table einvoice add constraint fk_einvoice_person_id foreign key (person_id) references eperson (id) on delete restrict on update restrict;
 create index ix_einvoice_person_id on einvoice (person_id);
+alter table einvoice add constraint fk_einvoice_person_id foreign key (person_id) references eperson (id) on delete restrict on update restrict;
 
-alter table enull_collection_detail add constraint fk_enull_collection_detail_en_1 foreign key (enull_collection_id) references enull_collection (id) on delete restrict on update restrict;
-create index ix_enull_collection_detail_en_1 on enull_collection_detail (enull_collection_id);
+create index ix_enull_collection_detail_enull_collection_id on enull_collection_detail (enull_collection_id);
+alter table enull_collection_detail add constraint fk_enull_collection_detail_enull_collection_id foreign key (enull_collection_id) references enull_collection (id) on delete restrict on update restrict;
 
-alter table eopt_one_a add constraint fk_eopt_one_a_b_id foreign key (b_id) references eopt_one_b (id) on delete restrict on update restrict;
 create index ix_eopt_one_a_b_id on eopt_one_a (b_id);
+alter table eopt_one_a add constraint fk_eopt_one_a_b_id foreign key (b_id) references eopt_one_b (id) on delete restrict on update restrict;
 
-alter table eopt_one_b add constraint fk_eopt_one_b_c_id foreign key (c_id) references eopt_one_c (id) on delete restrict on update restrict;
 create index ix_eopt_one_b_c_id on eopt_one_b (c_id);
+alter table eopt_one_b add constraint fk_eopt_one_b_c_id foreign key (c_id) references eopt_one_c (id) on delete restrict on update restrict;
 
-alter table evanilla_collection_detail add constraint fk_evanilla_collection_detail_1 foreign key (evanilla_collection_id) references evanilla_collection (id) on delete restrict on update restrict;
-create index ix_evanilla_collection_detail_1 on evanilla_collection_detail (evanilla_collection_id);
+create index ix_esoft_del_book_lend_by_id on esoft_del_book (lend_by_id);
+alter table esoft_del_book add constraint fk_esoft_del_book_lend_by_id foreign key (lend_by_id) references esoft_del_user (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_book_esoft_del_user_esoft_del_book on esoft_del_book_esoft_del_user (esoft_del_book_id);
+alter table esoft_del_book_esoft_del_user add constraint fk_esoft_del_book_esoft_del_user_esoft_del_book foreign key (esoft_del_book_id) references esoft_del_book (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_book_esoft_del_user_esoft_del_user on esoft_del_book_esoft_del_user (esoft_del_user_id);
+alter table esoft_del_book_esoft_del_user add constraint fk_esoft_del_book_esoft_del_user_esoft_del_user foreign key (esoft_del_user_id) references esoft_del_user (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_down_esoft_del_mid_id on esoft_del_down (esoft_del_mid_id);
+alter table esoft_del_down add constraint fk_esoft_del_down_esoft_del_mid_id foreign key (esoft_del_mid_id) references esoft_del_mid (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_mid_top_id on esoft_del_mid (top_id);
+alter table esoft_del_mid add constraint fk_esoft_del_mid_top_id foreign key (top_id) references esoft_del_top (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_mid_up_id on esoft_del_mid (up_id);
+alter table esoft_del_mid add constraint fk_esoft_del_mid_up_id foreign key (up_id) references esoft_del_up (id) on delete restrict on update restrict;
+
+alter table esoft_del_one_a add constraint fk_esoft_del_one_a_oneb_id foreign key (oneb_id) references esoft_del_one_b (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_role_esoft_del_user_esoft_del_role on esoft_del_role_esoft_del_user (esoft_del_role_id);
+alter table esoft_del_role_esoft_del_user add constraint fk_esoft_del_role_esoft_del_user_esoft_del_role foreign key (esoft_del_role_id) references esoft_del_role (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_role_esoft_del_user_esoft_del_user on esoft_del_role_esoft_del_user (esoft_del_user_id);
+alter table esoft_del_role_esoft_del_user add constraint fk_esoft_del_role_esoft_del_user_esoft_del_user foreign key (esoft_del_user_id) references esoft_del_user (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_user_esoft_del_role_esoft_del_user on esoft_del_user_esoft_del_role (esoft_del_user_id);
+alter table esoft_del_user_esoft_del_role add constraint fk_esoft_del_user_esoft_del_role_esoft_del_user foreign key (esoft_del_user_id) references esoft_del_user (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_user_esoft_del_role_esoft_del_role on esoft_del_user_esoft_del_role (esoft_del_role_id);
+alter table esoft_del_user_esoft_del_role add constraint fk_esoft_del_user_esoft_del_role_esoft_del_role foreign key (esoft_del_role_id) references esoft_del_role (id) on delete restrict on update restrict;
+
+create index ix_rawinherit_uncle_parent_id on rawinherit_uncle (parent_id);
+alter table rawinherit_uncle add constraint fk_rawinherit_uncle_parent_id foreign key (parent_id) references rawinherit_parent (id) on delete restrict on update restrict;
+
+create index ix_evanilla_collection_detail_evanilla_collection_id on evanilla_collection_detail (evanilla_collection_id);
+alter table evanilla_collection_detail add constraint fk_evanilla_collection_detail_evanilla_collection_id foreign key (evanilla_collection_id) references evanilla_collection (id) on delete restrict on update restrict;
 
-alter table td_child add constraint fk_td_child_parent_id foreign key (parent_id) references td_parent (parent_id) on delete restrict on update restrict;
 create index ix_td_child_parent_id on td_child (parent_id);
+alter table td_child add constraint fk_td_child_parent_id foreign key (parent_id) references td_parent (parent_id) on delete restrict on update restrict;
+
+create index ix_empl_default_address_id on empl (default_address_id);
+alter table empl add constraint fk_empl_default_address_id foreign key (default_address_id) references addr (id) on delete restrict on update restrict;
+
+create index ix_grand_parent_person_some_bean_id on grand_parent_person (some_bean_id);
+alter table grand_parent_person add constraint fk_grand_parent_person_some_bean_id foreign key (some_bean_id) references e_basic (id) on delete restrict on update restrict;
+
+create index ix_survey_group_categoryobjectid on survey_group (categoryobjectid);
+alter table survey_group add constraint fk_survey_group_categoryobjectid foreign key (categoryobjectid) references category (id) on delete restrict on update restrict;
+
+create index ix_hx_link_doc_hx_link on hx_link_doc (hx_link_id);
+alter table hx_link_doc add constraint fk_hx_link_doc_hx_link foreign key (hx_link_id) references hx_link (id) on delete restrict on update restrict;
+
+create index ix_hx_link_doc_he_doc on hx_link_doc (he_doc_id);
+alter table hx_link_doc add constraint fk_hx_link_doc_he_doc foreign key (he_doc_id) references he_doc (id) on delete restrict on update restrict;
+
+create index ix_hi_link_doc_hi_link on hi_link_doc (hi_link_id);
+alter table hi_link_doc add constraint fk_hi_link_doc_hi_link foreign key (hi_link_id) references hi_link (id) on delete restrict on update restrict;
+
+create index ix_hi_link_doc_hi_doc on hi_link_doc (hi_doc_id);
+alter table hi_link_doc add constraint fk_hi_link_doc_hi_doc foreign key (hi_doc_id) references hi_doc (id) on delete restrict on update restrict;
 
-alter table imrelated add constraint fk_imrelated_owner_id foreign key (owner_id) references imroot (id) on delete restrict on update restrict;
 create index ix_imrelated_owner_id on imrelated (owner_id);
+alter table imrelated add constraint fk_imrelated_owner_id foreign key (owner_id) references imroot (id) on delete restrict on update restrict;
 
-alter table info_contact add constraint fk_info_contact_company_id foreign key (company_id) references info_company (id) on delete restrict on update restrict;
 create index ix_info_contact_company_id on info_contact (company_id);
+alter table info_contact add constraint fk_info_contact_company_id foreign key (company_id) references info_company (id) on delete restrict on update restrict;
 
 alter table info_customer add constraint fk_info_customer_company_id foreign key (company_id) references info_company (id) on delete restrict on update restrict;
 
 alter table inner_report add constraint fk_inner_report_forecast_id foreign key (forecast_id) references stockforecast (id) on delete restrict on update restrict;
 
-alter table drel_invoice add constraint fk_drel_invoice_booking foreign key (booking) references drel_booking (id) on delete restrict on update restrict;
 create index ix_drel_invoice_booking on drel_invoice (booking);
+alter table drel_invoice add constraint fk_drel_invoice_booking foreign key (booking) references drel_booking (id) on delete restrict on update restrict;
 
-alter table item add constraint fk_item_type foreign key (customer,type) references type (customer,type) on delete restrict on update restrict;
-create index ix_item_customer_type on item (customer,type);
+create index ix_item_etype on item (customer,type);
+alter table item add constraint fk_item_etype foreign key (customer,type) references type (customer,type) on delete restrict on update restrict;
 
-alter table item add constraint fk_item_region foreign key (customer,region) references region (customer,type) on delete restrict on update restrict;
-create index ix_item_customer_region on item (customer,region);
+create index ix_item_eregion on item (customer,region);
+alter table item add constraint fk_item_eregion foreign key (customer,region) references region (customer,type) on delete restrict on update restrict;
 
+alter table trainer_monkey add constraint fk_trainer_monkey_trainer foreign key (trainer_tid) references trainer (tid) on delete restrict on update restrict;
+
+alter table trainer_monkey add constraint fk_trainer_monkey_monkey foreign key (monkey_mid) references monkey (mid) on delete restrict on update restrict;
+
+alter table troop_monkey add constraint fk_troop_monkey_troop foreign key (troop_pid) references troop (pid) on delete restrict on update restrict;
+
+alter table troop_monkey add constraint fk_troop_monkey_monkey foreign key (monkey_mid) references monkey (mid) on delete restrict on update restrict;
+
+create index ix_l2_cldf_reset_bean_child_parent_id on l2_cldf_reset_bean_child (parent_id);
+alter table l2_cldf_reset_bean_child add constraint fk_l2_cldf_reset_bean_child_parent_id foreign key (parent_id) references l2_cldf_reset_bean (id) on delete restrict on update restrict;
+
+create index ix_level1_level4_level1 on level1_level4 (level1_id);
 alter table level1_level4 add constraint fk_level1_level4_level1 foreign key (level1_id) references level1 (id) on delete restrict on update restrict;
-create index ix_level1_level4_level1_id on level1_level4 (level1_id);
 
+create index ix_level1_level4_level4 on level1_level4 (level4_id);
 alter table level1_level4 add constraint fk_level1_level4_level4 foreign key (level4_id) references level4 (id) on delete restrict on update restrict;
-create index ix_level1_level4_level4_id on level1_level4 (level4_id);
 
+create index ix_level1_level2_level1 on level1_level2 (level1_id);
 alter table level1_level2 add constraint fk_level1_level2_level1 foreign key (level1_id) references level1 (id) on delete restrict on update restrict;
-create index ix_level1_level2_level1_id on level1_level2 (level1_id);
 
+create index ix_level1_level2_level2 on level1_level2 (level2_id);
 alter table level1_level2 add constraint fk_level1_level2_level2 foreign key (level2_id) references level2 (id) on delete restrict on update restrict;
-create index ix_level1_level2_level2_id on level1_level2 (level2_id);
 
+create index ix_level2_level3_level2 on level2_level3 (level2_id);
 alter table level2_level3 add constraint fk_level2_level3_level2 foreign key (level2_id) references level2 (id) on delete restrict on update restrict;
-create index ix_level2_level3_level2_id on level2_level3 (level2_id);
 
+create index ix_level2_level3_level3 on level2_level3 (level3_id);
 alter table level2_level3 add constraint fk_level2_level3_level3 foreign key (level3_id) references level3 (id) on delete restrict on update restrict;
-create index ix_level2_level3_level3_id on level2_level3 (level3_id);
 
-alter table la_attr_value_attribute add constraint fk_la_attr_value_attribute_la_1 foreign key (la_attr_value_id) references la_attr_value (id) on delete restrict on update restrict;
-create index ix_la_attr_value_attribute_la_1 on la_attr_value_attribute (la_attr_value_id);
+alter table link add constraint fk_link_id foreign key (id) references link_draft (id) on delete restrict on update restrict;
 
-alter table la_attr_value_attribute add constraint fk_la_attr_value_attribute_at_2 foreign key (attribute_id) references attribute (id) on delete restrict on update restrict;
-create index ix_la_attr_value_attribute_at_2 on la_attr_value_attribute (attribute_id);
+create index ix_la_attr_value_attribute_la_attr_value on la_attr_value_attribute (la_attr_value_id);
+alter table la_attr_value_attribute add constraint fk_la_attr_value_attribute_la_attr_value foreign key (la_attr_value_id) references la_attr_value (id) on delete restrict on update restrict;
+
+create index ix_la_attr_value_attribute_attribute on la_attr_value_attribute (attribute_id);
+alter table la_attr_value_attribute add constraint fk_la_attr_value_attribute_attribute foreign key (attribute_id) references attribute (id) on delete restrict on update restrict;
 
-alter table mprinter add constraint fk_mprinter_current_state_id foreign key (current_state_id) references mprinter_state (id) on delete restrict on update restrict;
 create index ix_mprinter_current_state_id on mprinter (current_state_id);
+alter table mprinter add constraint fk_mprinter_current_state_id foreign key (current_state_id) references mprinter_state (id) on delete restrict on update restrict;
 
 alter table mprinter add constraint fk_mprinter_last_swap_cyan_id foreign key (last_swap_cyan_id) references mprinter_state (id) on delete restrict on update restrict;
 
-alter table mprinter add constraint fk_mprinter_last_swap_magenta_3 foreign key (last_swap_magenta_id) references mprinter_state (id) on delete restrict on update restrict;
+alter table mprinter add constraint fk_mprinter_last_swap_magenta_id foreign key (last_swap_magenta_id) references mprinter_state (id) on delete restrict on update restrict;
 
 alter table mprinter add constraint fk_mprinter_last_swap_yellow_id foreign key (last_swap_yellow_id) references mprinter_state (id) on delete restrict on update restrict;
 
 alter table mprinter add constraint fk_mprinter_last_swap_black_id foreign key (last_swap_black_id) references mprinter_state (id) on delete restrict on update restrict;
 
-alter table mprinter_state add constraint fk_mprinter_state_printer_id foreign key (printer_id) references mprinter (id) on delete restrict on update restrict;
 create index ix_mprinter_state_printer_id on mprinter_state (printer_id);
+alter table mprinter_state add constraint fk_mprinter_state_printer_id foreign key (printer_id) references mprinter (id) on delete restrict on update restrict;
 
-alter table mprofile add constraint fk_mprofile_picture_id foreign key (picture_id) references mmedia (id) on delete restrict on update restrict;
 create index ix_mprofile_picture_id on mprofile (picture_id);
+alter table mprofile add constraint fk_mprofile_picture_id foreign key (picture_id) references mmedia (id) on delete restrict on update restrict;
 
+create index ix_mrole_muser_mrole on mrole_muser (mrole_roleid);
 alter table mrole_muser add constraint fk_mrole_muser_mrole foreign key (mrole_roleid) references mrole (roleid) on delete restrict on update restrict;
-create index ix_mrole_muser_mrole_roleid on mrole_muser (mrole_roleid);
 
+create index ix_mrole_muser_muser on mrole_muser (muser_userid);
 alter table mrole_muser add constraint fk_mrole_muser_muser foreign key (muser_userid) references muser (userid) on delete restrict on update restrict;
-create index ix_mrole_muser_muser_userid on mrole_muser (muser_userid);
 
-alter table muser add constraint fk_muser_user_type_id foreign key (user_type_id) references muser_type (id) on delete restrict on update restrict;
 create index ix_muser_user_type_id on muser (user_type_id);
+alter table muser add constraint fk_muser_user_type_id foreign key (user_type_id) references muser_type (id) on delete restrict on update restrict;
+
+create index ix_mail_user_inbox_mail_user on mail_user_inbox (mail_user_id);
+alter table mail_user_inbox add constraint fk_mail_user_inbox_mail_user foreign key (mail_user_id) references mail_user (id) on delete restrict on update restrict;
+
+create index ix_mail_user_inbox_mail_box on mail_user_inbox (mail_box_id);
+alter table mail_user_inbox add constraint fk_mail_user_inbox_mail_box foreign key (mail_box_id) references mail_box (id) on delete restrict on update restrict;
+
+create index ix_mail_user_outbox_mail_user on mail_user_outbox (mail_user_id);
+alter table mail_user_outbox add constraint fk_mail_user_outbox_mail_user foreign key (mail_user_id) references mail_user (id) on delete restrict on update restrict;
+
+create index ix_mail_user_outbox_mail_box on mail_user_outbox (mail_box_id);
+alter table mail_user_outbox add constraint fk_mail_user_outbox_mail_box foreign key (mail_box_id) references mail_box (id) on delete restrict on update restrict;
 
-alter table c_message add constraint fk_c_message_conversation_id foreign key (conversation_id) references c_conversation (id) on delete restrict on update restrict;
 create index ix_c_message_conversation_id on c_message (conversation_id);
+alter table c_message add constraint fk_c_message_conversation_id foreign key (conversation_id) references c_conversation (id) on delete restrict on update restrict;
 
-alter table c_message add constraint fk_c_message_user_id foreign key (user_id) references c_user (id) on delete restrict on update restrict;
 create index ix_c_message_user_id on c_message (user_id);
+alter table c_message add constraint fk_c_message_user_id foreign key (user_id) references c_user (id) on delete restrict on update restrict;
 
-alter table mnoc_user_mnoc_role add constraint fk_mnoc_user_mnoc_role_mnoc_u_1 foreign key (mnoc_user_user_id) references mnoc_user (user_id) on delete restrict on update restrict;
-create index ix_mnoc_user_mnoc_role_mnoc_u_1 on mnoc_user_mnoc_role (mnoc_user_user_id);
+create index ix_mnoc_user_mnoc_role_mnoc_user on mnoc_user_mnoc_role (mnoc_user_user_id);
+alter table mnoc_user_mnoc_role add constraint fk_mnoc_user_mnoc_role_mnoc_user foreign key (mnoc_user_user_id) references mnoc_user (user_id) on delete restrict on update restrict;
 
-alter table mnoc_user_mnoc_role add constraint fk_mnoc_user_mnoc_role_mnoc_r_2 foreign key (mnoc_role_role_id) references mnoc_role (role_id) on delete restrict on update restrict;
-create index ix_mnoc_user_mnoc_role_mnoc_r_2 on mnoc_user_mnoc_role (mnoc_role_role_id);
+create index ix_mnoc_user_mnoc_role_mnoc_role on mnoc_user_mnoc_role (mnoc_role_role_id);
+alter table mnoc_user_mnoc_role add constraint fk_mnoc_user_mnoc_role_mnoc_role foreign key (mnoc_role_role_id) references mnoc_role (role_id) on delete restrict on update restrict;
+
+create index ix_mny_b_a_id on mny_b (a_id);
+alter table mny_b add constraint fk_mny_b_a_id foreign key (a_id) references mny_a (id) on delete restrict on update restrict;
+
+create index ix_mny_b_mny_c_mny_b on mny_b_mny_c (mny_b_id);
+alter table mny_b_mny_c add constraint fk_mny_b_mny_c_mny_b foreign key (mny_b_id) references mny_b (id) on delete restrict on update restrict;
+
+create index ix_mny_b_mny_c_mny_c on mny_b_mny_c (mny_c_id);
+alter table mny_b_mny_c add constraint fk_mny_b_mny_c_mny_c foreign key (mny_c_id) references mny_c (id) on delete restrict on update restrict;
+
+create index ix_subtopics_mny_topic_1 on subtopics (topic);
+alter table subtopics add constraint fk_subtopics_mny_topic_1 foreign key (topic) references mny_topic (id) on delete restrict on update restrict;
+
+create index ix_subtopics_mny_topic_2 on subtopics (subtopic);
+alter table subtopics add constraint fk_subtopics_mny_topic_2 foreign key (subtopic) references mny_topic (id) on delete restrict on update restrict;
 
-alter table mp_role add constraint fk_mp_role_mp_user_id foreign key (mp_user_id) references mp_user (id) on delete restrict on update restrict;
 create index ix_mp_role_mp_user_id on mp_role (mp_user_id);
+alter table mp_role add constraint fk_mp_role_mp_user_id foreign key (mp_user_id) references mp_user (id) on delete restrict on update restrict;
 
-alter table my_lob_size_join_many add constraint fk_my_lob_size_join_many_pare_1 foreign key (parent_id) references my_lob_size (id) on delete restrict on update restrict;
-create index ix_my_lob_size_join_many_pare_1 on my_lob_size_join_many (parent_id);
+create index ix_ms_many_a_many_b_ms_many_a on ms_many_a_many_b (ms_many_a_aid);
+alter table ms_many_a_many_b add constraint fk_ms_many_a_many_b_ms_many_a foreign key (ms_many_a_aid) references ms_many_a (aid) on delete restrict on update restrict;
 
-alter table o_cached_bean_country add constraint fk_o_cached_bean_country_o_ca_1 foreign key (o_cached_bean_id) references o_cached_bean (id) on delete restrict on update restrict;
-create index ix_o_cached_bean_country_o_ca_1 on o_cached_bean_country (o_cached_bean_id);
+create index ix_ms_many_a_many_b_ms_many_b on ms_many_a_many_b (ms_many_b_bid);
+alter table ms_many_a_many_b add constraint fk_ms_many_a_many_b_ms_many_b foreign key (ms_many_b_bid) references ms_many_b (bid) on delete restrict on update restrict;
 
-alter table o_cached_bean_country add constraint fk_o_cached_bean_country_o_co_2 foreign key (o_country_code) references o_country (code) on delete restrict on update restrict;
-create index ix_o_cached_bean_country_o_co_2 on o_cached_bean_country (o_country_code);
+create index ix_ms_many_b_many_a_ms_many_b on ms_many_b_many_a (ms_many_b_bid);
+alter table ms_many_b_many_a add constraint fk_ms_many_b_many_a_ms_many_b foreign key (ms_many_b_bid) references ms_many_b (bid) on delete restrict on update restrict;
 
-alter table o_cached_bean_child add constraint fk_o_cached_bean_child_cached_1 foreign key (cached_bean_id) references o_cached_bean (id) on delete restrict on update restrict;
-create index ix_o_cached_bean_child_cached_1 on o_cached_bean_child (cached_bean_id);
+create index ix_ms_many_b_many_a_ms_many_a on ms_many_b_many_a (ms_many_a_aid);
+alter table ms_many_b_many_a add constraint fk_ms_many_b_many_a_ms_many_a foreign key (ms_many_a_aid) references ms_many_a (aid) on delete restrict on update restrict;
+
+create index ix_my_lob_size_join_many_parent_id on my_lob_size_join_many (parent_id);
+alter table my_lob_size_join_many add constraint fk_my_lob_size_join_many_parent_id foreign key (parent_id) references my_lob_size (id) on delete restrict on update restrict;
+
+create index ix_o_cached_bean_country_o_cached_bean on o_cached_bean_country (o_cached_bean_id);
+alter table o_cached_bean_country add constraint fk_o_cached_bean_country_o_cached_bean foreign key (o_cached_bean_id) references o_cached_bean (id) on delete restrict on update restrict;
+
+create index ix_o_cached_bean_country_o_country on o_cached_bean_country (o_country_code);
+alter table o_cached_bean_country add constraint fk_o_cached_bean_country_o_country foreign key (o_country_code) references o_country (code) on delete restrict on update restrict;
+
+create index ix_o_cached_bean_child_cached_bean_id on o_cached_bean_child (cached_bean_id);
+alter table o_cached_bean_child add constraint fk_o_cached_bean_child_cached_bean_id foreign key (cached_bean_id) references o_cached_bean (id) on delete restrict on update restrict;
 
 alter table oengine add constraint fk_oengine_car_id foreign key (car_id) references ocar (id) on delete restrict on update restrict;
 
 alter table ogear_box add constraint fk_ogear_box_car_id foreign key (car_id) references ocar (id) on delete restrict on update restrict;
 
-alter table o_order add constraint fk_o_order_kcustomer_id foreign key (kcustomer_id) references o_customer (id) on delete restrict on update restrict;
+alter table oroad_show_msg add constraint fk_oroad_show_msg_company_id foreign key (company_id) references ocompany (id) on delete restrict on update restrict;
+
+create index ix_om_ordered_detail_master_id on om_ordered_detail (master_id);
+alter table om_ordered_detail add constraint fk_om_ordered_detail_master_id foreign key (master_id) references om_ordered_master (id) on delete restrict on update restrict;
+
 create index ix_o_order_kcustomer_id on o_order (kcustomer_id);
+alter table o_order add constraint fk_o_order_kcustomer_id foreign key (kcustomer_id) references o_customer (id) on delete restrict on update restrict;
 
-alter table o_order_detail add constraint fk_o_order_detail_order_id foreign key (order_id) references o_order (id) on delete restrict on update restrict;
 create index ix_o_order_detail_order_id on o_order_detail (order_id);
+alter table o_order_detail add constraint fk_o_order_detail_order_id foreign key (order_id) references o_order (id) on delete restrict on update restrict;
 
-alter table o_order_detail add constraint fk_o_order_detail_product_id foreign key (product_id) references o_product (id) on delete restrict on update restrict;
 create index ix_o_order_detail_product_id on o_order_detail (product_id);
+alter table o_order_detail add constraint fk_o_order_detail_product_id foreign key (product_id) references o_product (id) on delete restrict on update restrict;
 
-alter table s_order_items add constraint fk_s_order_items_order_uuid foreign key (order_uuid) references s_orders (uuid) on delete restrict on update restrict;
 create index ix_s_order_items_order_uuid on s_order_items (order_uuid);
+alter table s_order_items add constraint fk_s_order_items_order_uuid foreign key (order_uuid) references s_orders (uuid) on delete restrict on update restrict;
 
-alter table or_order_ship add constraint fk_or_order_ship_order_id foreign key (order_id) references o_order (id) on delete restrict on update restrict;
 create index ix_or_order_ship_order_id on or_order_ship (order_id);
+alter table or_order_ship add constraint fk_or_order_ship_order_id foreign key (order_id) references o_order (id) on delete restrict on update restrict;
+
+alter table oto_bchild add constraint fk_oto_bchild_master_id foreign key (master_id) references oto_bmaster (id) on delete restrict on update restrict;
 
 alter table oto_child add constraint fk_oto_child_master_id foreign key (master_id) references oto_master (id) on delete restrict on update restrict;
 
+alter table oto_cust_address add constraint fk_oto_cust_address_customer_cid foreign key (customer_cid) references oto_cust (cid) on delete restrict on update restrict;
+
+alter table oto_prime_extra add constraint fk_oto_prime_extra_eid foreign key (eid) references oto_prime (pid) on delete restrict on update restrict;
+
+create index ix_oto_th_many_oto_th_top_id on oto_th_many (oto_th_top_id);
+alter table oto_th_many add constraint fk_oto_th_many_oto_th_top_id foreign key (oto_th_top_id) references oto_th_top (id) on delete restrict on update restrict;
+
+alter table oto_th_one add constraint fk_oto_th_one_many_id foreign key (many_id) references oto_th_many (id) on delete restrict on update restrict;
+
+alter table oto_ubprime_extra add constraint fk_oto_ubprime_extra_eid foreign key (eid) references oto_ubprime (pid) on delete restrict on update restrict;
+
+alter table oto_uprime_extra add constraint fk_oto_uprime_extra_eid foreign key (eid) references oto_uprime (pid) on delete restrict on update restrict;
+
 alter table pfile add constraint fk_pfile_file_content_id foreign key (file_content_id) references pfile_content (id) on delete restrict on update restrict;
 
 alter table pfile add constraint fk_pfile_file_content2_id foreign key (file_content2_id) references pfile_content (id) on delete restrict on update restrict;
 
 alter table paggview add constraint fk_paggview_pview_id foreign key (pview_id) references pp (id) on delete restrict on update restrict;
 
-alter table pallet_location add constraint fk_pallet_location_zone_sid foreign key (zone_sid) references zones (id) on delete restrict on update restrict;
 create index ix_pallet_location_zone_sid on pallet_location (zone_sid);
+alter table pallet_location add constraint fk_pallet_location_zone_sid foreign key (zone_sid) references zones (id) on delete restrict on update restrict;
 
 alter table parcel_location add constraint fk_parcel_location_parcelid foreign key (parcelid) references parcel (parcelid) on delete restrict on update restrict;
 
-alter table rawinherit_parent_rawinherit_dat add constraint fk_rawinherit_parent_rawinher_1 foreign key (rawinherit_parent_id) references rawinherit_parent (id) on delete restrict on update restrict;
-create index ix_rawinherit_parent_rawinher_1 on rawinherit_parent_rawinherit_dat (rawinherit_parent_id);
+create index ix_rawinherit_parent_rawinherit_data_rawinherit_parent on rawinherit_parent_rawinherit_data (rawinherit_parent_id);
+alter table rawinherit_parent_rawinherit_data add constraint fk_rawinherit_parent_rawinherit_data_rawinherit_parent foreign key (rawinherit_parent_id) references rawinherit_parent (id) on delete restrict on update restrict;
 
-alter table rawinherit_parent_rawinherit_dat add constraint fk_rawinherit_parent_rawinher_2 foreign key (rawinherit_data_id) references rawinherit_data (id) on delete restrict on update restrict;
-create index ix_rawinherit_parent_rawinher_2 on rawinherit_parent_rawinherit_dat (rawinherit_data_id);
+create index ix_rawinherit_parent_rawinherit_data_rawinherit_data on rawinherit_parent_rawinherit_data (rawinherit_data_id);
+alter table rawinherit_parent_rawinherit_data add constraint fk_rawinherit_parent_rawinherit_data_rawinherit_data foreign key (rawinherit_data_id) references rawinherit_data (id) on delete restrict on update restrict;
 
-alter table c_participation add constraint fk_c_participation_conversati_1 foreign key (conversation_id) references c_conversation (id) on delete restrict on update restrict;
-create index ix_c_participation_conversati_1 on c_participation (conversation_id);
+create index ix_parent_person_some_bean_id on parent_person (some_bean_id);
+alter table parent_person add constraint fk_parent_person_some_bean_id foreign key (some_bean_id) references e_basic (id) on delete restrict on update restrict;
+
+create index ix_parent_person_parent_identifier on parent_person (parent_identifier);
+alter table parent_person add constraint fk_parent_person_parent_identifier foreign key (parent_identifier) references grand_parent_person (identifier) on delete restrict on update restrict;
+
+create index ix_c_participation_conversation_id on c_participation (conversation_id);
+alter table c_participation add constraint fk_c_participation_conversation_id foreign key (conversation_id) references c_conversation (id) on delete restrict on update restrict;
 
-alter table c_participation add constraint fk_c_participation_user_id foreign key (user_id) references c_user (id) on delete restrict on update restrict;
 create index ix_c_participation_user_id on c_participation (user_id);
+alter table c_participation add constraint fk_c_participation_user_id foreign key (user_id) references c_user (id) on delete restrict on update restrict;
 
-alter table persistent_file_content add constraint fk_persistent_file_content_pe_1 foreign key (persistent_file_id) references persistent_file (id) on delete restrict on update restrict;
+alter table persistent_file_content add constraint fk_persistent_file_content_persistent_file_id foreign key (persistent_file_id) references persistent_file (id) on delete restrict on update restrict;
 
-alter table person add constraint fk_person_default_address_oid foreign key (default_address_oid) references address (oid) on delete restrict on update restrict;
 create index ix_person_default_address_oid on person (default_address_oid);
+alter table person add constraint fk_person_default_address_oid foreign key (default_address_oid) references address (oid) on delete restrict on update restrict;
 
-alter table phones add constraint fk_phones_person_id foreign key (person_id) references persons (id) on delete restrict on update restrict;
 create index ix_phones_person_id on phones (person_id);
+alter table phones add constraint fk_phones_person_id foreign key (person_id) references persons (id) on delete restrict on update restrict;
 
+create index ix_pp_to_ww_pp on pp_to_ww (pp_id);
 alter table pp_to_ww add constraint fk_pp_to_ww_pp foreign key (pp_id) references pp (id) on delete restrict on update restrict;
-create index ix_pp_to_ww_pp_id on pp_to_ww (pp_id);
 
+create index ix_pp_to_ww_wview on pp_to_ww (ww_id);
 alter table pp_to_ww add constraint fk_pp_to_ww_wview foreign key (ww_id) references wview (id) on delete restrict on update restrict;
-create index ix_pp_to_ww_ww_id on pp_to_ww (ww_id);
 
-alter table r_orders add constraint fk_r_orders_rcustomer foreign key (company,customername) references rcustomer (company,name) on delete restrict on update restrict;
-create index ix_r_orders_company_customern_1 on r_orders (company,customername);
+create index ix_question_groupobjectid on question (groupobjectid);
+alter table question add constraint fk_question_groupobjectid foreign key (groupobjectid) references survey_group (id) on delete restrict on update restrict;
 
-alter table resourcefile add constraint fk_resourcefile_parentresourc_1 foreign key (parentresourcefileid) references resourcefile (id) on delete restrict on update restrict;
-create index ix_resourcefile_parentresourc_1 on resourcefile (parentresourcefileid);
+create index ix_r_orders_customer on r_orders (company,customername);
+alter table r_orders add constraint fk_r_orders_customer foreign key (company,customername) references rcustomer (company,name) on delete restrict on update restrict;
+
+create index ix_resourcefile_parentresourcefileid on resourcefile (parentresourcefileid);
+alter table resourcefile add constraint fk_resourcefile_parentresourcefileid foreign key (parentresourcefileid) references resourcefile (id) on delete restrict on update restrict;
 
-alter table mt_role add constraint fk_mt_role_tenant_id foreign key (tenant_id) references mt_tenant (id) on delete restrict on update restrict;
 create index ix_mt_role_tenant_id on mt_role (tenant_id);
+alter table mt_role add constraint fk_mt_role_tenant_id foreign key (tenant_id) references mt_tenant (id) on delete restrict on update restrict;
 
+create index ix_mt_role_permission_mt_role on mt_role_permission (mt_role_id);
 alter table mt_role_permission add constraint fk_mt_role_permission_mt_role foreign key (mt_role_id) references mt_role (id) on delete restrict on update restrict;
-create index ix_mt_role_permission_mt_role_1 on mt_role_permission (mt_role_id);
 
-alter table mt_role_permission add constraint fk_mt_role_permission_mt_perm_2 foreign key (mt_permission_id) references mt_permission (id) on delete restrict on update restrict;
-create index ix_mt_role_permission_mt_perm_2 on mt_role_permission (mt_permission_id);
+create index ix_mt_role_permission_mt_permission on mt_role_permission (mt_permission_id);
+alter table mt_role_permission add constraint fk_mt_role_permission_mt_permission foreign key (mt_permission_id) references mt_permission (id) on delete restrict on update restrict;
 
 alter table f_second add constraint fk_f_second_first foreign key (first) references f_first (id) on delete restrict on update restrict;
 
-alter table section add constraint fk_section_article_id foreign key (article_id) references article (id) on delete restrict on update restrict;
 create index ix_section_article_id on section (article_id);
+alter table section add constraint fk_section_article_id foreign key (article_id) references article (id) on delete restrict on update restrict;
 
-alter table self_parent add constraint fk_self_parent_parent_id foreign key (parent_id) references self_parent (id) on delete restrict on update restrict;
 create index ix_self_parent_parent_id on self_parent (parent_id);
+alter table self_parent add constraint fk_self_parent_parent_id foreign key (parent_id) references self_parent (id) on delete restrict on update restrict;
 
-alter table self_ref_customer add constraint fk_self_ref_customer_referred_1 foreign key (referred_by_id) references self_ref_customer (id) on delete restrict on update restrict;
-create index ix_self_ref_customer_referred_1 on self_ref_customer (referred_by_id);
+create index ix_self_ref_customer_referred_by_id on self_ref_customer (referred_by_id);
+alter table self_ref_customer add constraint fk_self_ref_customer_referred_by_id foreign key (referred_by_id) references self_ref_customer (id) on delete restrict on update restrict;
 
-alter table self_ref_example add constraint fk_self_ref_example_parent_id foreign key (parent_id) references self_ref_example (id) on delete restrict on update restrict;
 create index ix_self_ref_example_parent_id on self_ref_example (parent_id);
+alter table self_ref_example add constraint fk_self_ref_example_parent_id foreign key (parent_id) references self_ref_example (id) on delete restrict on update restrict;
 
-alter table stockforecast add constraint fk_stockforecast_inner_report_1 foreign key (inner_report_id) references inner_report (id) on delete restrict on update restrict;
-create index ix_stockforecast_inner_report_1 on stockforecast (inner_report_id);
+create index ix_stockforecast_inner_report_id on stockforecast (inner_report_id);
+alter table stockforecast add constraint fk_stockforecast_inner_report_id foreign key (inner_report_id) references inner_report (id) on delete restrict on update restrict;
 
-alter table sub_section add constraint fk_sub_section_section_id foreign key (section_id) references section (id) on delete restrict on update restrict;
 create index ix_sub_section_section_id on sub_section (section_id);
+alter table sub_section add constraint fk_sub_section_section_id foreign key (section_id) references section (id) on delete restrict on update restrict;
 
-alter table t_detail_with_other_namexxxyy add constraint fk_t_detail_with_other_namexx_1 foreign key (master_id) references t_atable_thatisrelatively (id) on delete restrict on update restrict;
-create index ix_t_detail_with_other_namexx_1 on t_detail_with_other_namexxxyy (master_id);
+create index ix_tevent_many_event_id on tevent_many (event_id);
+alter table tevent_many add constraint fk_tevent_many_event_id foreign key (event_id) references tevent_one (id) on delete restrict on update restrict;
+
+alter table tevent_one add constraint fk_tevent_one_event_id foreign key (event_id) references tevent (id) on delete restrict on update restrict;
+
+create index ix_t_detail_with_other_namexxxyy_master_id on t_detail_with_other_namexxxyy (master_id);
+alter table t_detail_with_other_namexxxyy add constraint fk_t_detail_with_other_namexxxyy_master_id foreign key (master_id) references t_atable_thatisrelatively (id) on delete restrict on update restrict;
 
-alter table ts_detail_two add constraint fk_ts_detail_two_master_id foreign key (master_id) references ts_master_two (id) on delete restrict on update restrict;
 create index ix_ts_detail_two_master_id on ts_detail_two (master_id);
+alter table ts_detail_two add constraint fk_ts_detail_two_master_id foreign key (master_id) references ts_master_two (id) on delete restrict on update restrict;
 
-alter table twheel add constraint fk_twheel_owner_plate_no foreign key (owner_plate_no) references tcar (plate_no) on delete restrict on update restrict;
 create index ix_twheel_owner_plate_no on twheel (owner_plate_no);
+alter table twheel add constraint fk_twheel_owner_plate_no foreign key (owner_plate_no) references tcar (plate_no) on delete restrict on update restrict;
 
 alter table tire add constraint fk_tire_wheel foreign key (wheel) references wheel (id) on delete restrict on update restrict;
 
-alter table trip add constraint fk_trip_vehicle_driver_id foreign key (vehicle_driver_id) references vehicle_driver (id) on delete restrict on update restrict;
 create index ix_trip_vehicle_driver_id on trip (vehicle_driver_id);
+alter table trip add constraint fk_trip_vehicle_driver_id foreign key (vehicle_driver_id) references vehicle_driver (id) on delete restrict on update restrict;
 
-alter table trip add constraint fk_trip_address_id foreign key (address_id) references o_address (id) on delete restrict on update restrict;
 create index ix_trip_address_id on trip (address_id);
+alter table trip add constraint fk_trip_address_id foreign key (address_id) references o_address (id) on delete restrict on update restrict;
 
-alter table type add constraint fk_type_sub_type_id foreign key (sub_type_id) references sub_type (sub_type_id) on delete restrict on update restrict;
 create index ix_type_sub_type_id on type (sub_type_id);
+alter table type add constraint fk_type_sub_type_id foreign key (sub_type_id) references sub_type (sub_type_id) on delete restrict on update restrict;
 
-alter table ut_detail add constraint fk_ut_detail_utmaster_id foreign key (utmaster_id) references ut_master (id) on delete restrict on update restrict;
 create index ix_ut_detail_utmaster_id on ut_detail (utmaster_id);
+alter table ut_detail add constraint fk_ut_detail_utmaster_id foreign key (utmaster_id) references ut_master (id) on delete restrict on update restrict;
 
-alter table uutwo add constraint fk_uutwo_master_id foreign key (master_id) references uuone (id) on delete restrict on update restrict;
 create index ix_uutwo_master_id on uutwo (master_id);
+alter table uutwo add constraint fk_uutwo_master_id foreign key (master_id) references uuone (id) on delete restrict on update restrict;
 
-alter table c_user add constraint fk_c_user_group_id foreign key (group_id) references c_group (id) on delete restrict on update restrict;
 create index ix_c_user_group_id on c_user (group_id);
+alter table c_user add constraint fk_c_user_group_id foreign key (group_id) references c_group (id) on delete restrict on update restrict;
 
 alter table oto_user add constraint fk_oto_user_account_id foreign key (account_id) references oto_account (id) on delete restrict on update restrict;
 
-alter table em_user_role add constraint fk_em_user_role_user_id foreign key (user_id) references em_user (id) on delete restrict on update restrict;
 create index ix_em_user_role_user_id on em_user_role (user_id);
+alter table em_user_role add constraint fk_em_user_role_user_id foreign key (user_id) references em_user (id) on delete restrict on update restrict;
 
-alter table em_user_role add constraint fk_em_user_role_role_id foreign key (role_id) references em_role (id) on delete restrict on update restrict;
 create index ix_em_user_role_role_id on em_user_role (role_id);
+alter table em_user_role add constraint fk_em_user_role_role_id foreign key (role_id) references em_role (id) on delete restrict on update restrict;
 
-alter table vehicle add constraint fk_vehicle_truck_ref_id foreign key (truck_ref_id) references truck_ref (id) on delete restrict on update restrict;
-create index ix_vehicle_truck_ref_id on vehicle (truck_ref_id);
-
-alter table vehicle add constraint fk_vehicle_car_ref_id foreign key (car_ref_id) references truck_ref (id) on delete restrict on update restrict;
 create index ix_vehicle_car_ref_id on vehicle (car_ref_id);
+alter table vehicle add constraint fk_vehicle_car_ref_id foreign key (car_ref_id) references truck_ref (id) on delete restrict on update restrict;
+
+create index ix_vehicle_truck_ref_id on vehicle (truck_ref_id);
+alter table vehicle add constraint fk_vehicle_truck_ref_id foreign key (truck_ref_id) references truck_ref (id) on delete restrict on update restrict;
 
-alter table vehicle_driver add constraint fk_vehicle_driver_vehicle_id foreign key (vehicle_id) references vehicle (id) on delete restrict on update restrict;
 create index ix_vehicle_driver_vehicle_id on vehicle_driver (vehicle_id);
+alter table vehicle_driver add constraint fk_vehicle_driver_vehicle_id foreign key (vehicle_id) references vehicle (id) on delete restrict on update restrict;
 
-alter table vehicle_driver add constraint fk_vehicle_driver_address_id foreign key (address_id) references o_address (id) on delete restrict on update restrict;
 create index ix_vehicle_driver_address_id on vehicle_driver (address_id);
+alter table vehicle_driver add constraint fk_vehicle_driver_address_id foreign key (address_id) references o_address (id) on delete restrict on update restrict;
 
-alter table warehouses add constraint fk_warehouses_officezoneid foreign key (officezoneid) references zones (id) on delete restrict on update restrict;
 create index ix_warehouses_officezoneid on warehouses (officezoneid);
+alter table warehouses add constraint fk_warehouses_officezoneid foreign key (officezoneid) references zones (id) on delete restrict on update restrict;
 
-alter table warehousesshippingzones add constraint fk_warehousesshippingzones_wa_1 foreign key (warehouseid) references warehouses (id) on delete restrict on update restrict;
-create index ix_warehousesshippingzones_wa_1 on warehousesshippingzones (warehouseid);
+create index ix_warehousesshippingzones_warehouses on warehousesshippingzones (warehouseid);
+alter table warehousesshippingzones add constraint fk_warehousesshippingzones_warehouses foreign key (warehouseid) references warehouses (id) on delete restrict on update restrict;
 
-alter table warehousesshippingzones add constraint fk_warehousesshippingzones_zo_2 foreign key (shippingzoneid) references zones (id) on delete restrict on update restrict;
-create index ix_warehousesshippingzones_sh_2 on warehousesshippingzones (shippingzoneid);
+create index ix_warehousesshippingzones_zones on warehousesshippingzones (shippingzoneid);
+alter table warehousesshippingzones add constraint fk_warehousesshippingzones_zones foreign key (shippingzoneid) references zones (id) on delete restrict on update restrict;
 
-alter table sa_wheel add constraint fk_sa_wheel_tire foreign key (tire) references sa_tire (id) on delete restrict on update restrict;
 create index ix_sa_wheel_tire on sa_wheel (tire);
+alter table sa_wheel add constraint fk_sa_wheel_tire foreign key (tire) references sa_tire (id) on delete restrict on update restrict;
 
-alter table sa_wheel add constraint fk_sa_wheel_car foreign key (car) references sa_car (id) on delete restrict on update restrict;
 create index ix_sa_wheel_car on sa_wheel (car);
+alter table sa_wheel add constraint fk_sa_wheel_car foreign key (car) references sa_car (id) on delete restrict on update restrict;
+
+create index ix_g_who_props_otm_who_created_id on g_who_props_otm (who_created_id);
+alter table g_who_props_otm add constraint fk_g_who_props_otm_who_created_id foreign key (who_created_id) references g_user (id) on delete restrict on update restrict;
+
+create index ix_g_who_props_otm_who_modified_id on g_who_props_otm (who_modified_id);
+alter table g_who_props_otm add constraint fk_g_who_props_otm_who_modified_id foreign key (who_modified_id) references g_user (id) on delete restrict on update restrict;
 
-alter table with_zero add constraint fk_with_zero_parent_id foreign key (parent_id) references parent (id) on delete restrict on update restrict;
 create index ix_with_zero_parent_id on with_zero (parent_id);
+alter table with_zero add constraint fk_with_zero_parent_id foreign key (parent_id) references parent (id) on delete restrict on update restrict;
 
+alter table hx_link add column sys_period_start datetime(6) default now(6);
+alter table hx_link add column sys_period_end datetime(6);
+update hx_link set sys_period_start = when_created;
+create table hx_link_history(
+  id                            bigint,
+  name                          varchar(255),
+  location                      varchar(255),
+  comments                      varchar(255),
+  version                       bigint,
+  when_created                  datetime(6),
+  when_modified                 datetime(6),
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view hx_link_with_history as select * from hx_link union all select * from hx_link_history;
+
+delimiter $$
+create trigger hx_link_history_upd before update on hx_link for each row begin
+    insert into hx_link_history (sys_period_start,sys_period_end,id, name, location, comments, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger hx_link_history_del before delete on hx_link for each row begin
+    insert into hx_link_history (sys_period_start,sys_period_end,id, name, location, comments, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
+end$$
+alter table hi_link add column sys_period_start datetime(6) default now(6);
+alter table hi_link add column sys_period_end datetime(6);
+update hi_link set sys_period_start = when_created;
+create table hi_link_history(
+  id                            bigint,
+  name                          varchar(255),
+  location                      varchar(255),
+  comments                      varchar(255),
+  version                       bigint,
+  when_created                  datetime(6),
+  when_modified                 datetime(6),
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view hi_link_with_history as select * from hi_link union all select * from hi_link_history;
+
+delimiter $$
+create trigger hi_link_history_upd before update on hi_link for each row begin
+    insert into hi_link_history (sys_period_start,sys_period_end,id, name, location, comments, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger hi_link_history_del before delete on hi_link for each row begin
+    insert into hi_link_history (sys_period_start,sys_period_end,id, name, location, comments, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
+end$$
+alter table hi_link_doc add column sys_period_start datetime(6) default now(6);
+alter table hi_link_doc add column sys_period_end datetime(6);
+create table hi_link_doc_history(
+  hi_link_id                    bigint,
+  hi_doc_id                     bigint,
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view hi_link_doc_with_history as select * from hi_link_doc union all select * from hi_link_doc_history;
+
+delimiter $$
+create trigger hi_link_doc_history_upd before update on hi_link_doc for each row begin
+    insert into hi_link_doc_history (sys_period_start,sys_period_end,hi_link_id, hi_doc_id) values (OLD.sys_period_start, now(6),OLD.hi_link_id, OLD.hi_doc_id);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger hi_link_doc_history_del before delete on hi_link_doc for each row begin
+    insert into hi_link_doc_history (sys_period_start,sys_period_end,hi_link_id, hi_doc_id) values (OLD.sys_period_start, now(6),OLD.hi_link_id, OLD.hi_doc_id);
+end$$
+alter table link add column sys_period_start datetime(6) default now(6);
+alter table link add column sys_period_end datetime(6);
+update link set sys_period_start = when_created;
+create table link_history(
+  id                            bigint,
+  name                          varchar(255),
+  location                      varchar(255),
+  when_publish                  datetime(6),
+  link_comment                  varchar(255),
+  version                       bigint,
+  when_created                  datetime(6),
+  when_modified                 datetime(6),
+  deleted                       tinyint(1),
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view link_with_history as select * from link union all select * from link_history;
+
+delimiter $$
+create trigger link_history_upd before update on link for each row begin
+    insert into link_history (sys_period_start,sys_period_end,id, name, location, when_publish, link_comment, version, when_created, when_modified, deleted) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.when_publish, OLD.link_comment, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger link_history_del before delete on link for each row begin
+    insert into link_history (sys_period_start,sys_period_end,id, name, location, when_publish, link_comment, version, when_created, when_modified, deleted) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.when_publish, OLD.link_comment, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+end$$
+alter table c_user add column sys_period_start datetime(6) default now(6);
+alter table c_user add column sys_period_end datetime(6);
+update c_user set sys_period_start = when_created;
+create table c_user_history(
+  id                            bigint,
+  inactive                      tinyint(1),
+  name                          varchar(255),
+  email                         varchar(255),
+  password_hash                 varchar(255),
+  group_id                      bigint,
+  version                       bigint,
+  when_created                  datetime(6),
+  when_modified                 datetime(6),
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view c_user_with_history as select * from c_user union all select * from c_user_history;
+
+delimiter $$
+create trigger c_user_history_upd before update on c_user for each row begin
+    insert into c_user_history (sys_period_start,sys_period_end,id, inactive, name, email, group_id, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.inactive, OLD.name, OLD.email, OLD.group_id, OLD.version, OLD.when_created, OLD.when_modified);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger c_user_history_del before delete on c_user for each row begin
+    insert into c_user_history (sys_period_start,sys_period_end,id, inactive, name, email, group_id, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.inactive, OLD.name, OLD.email, OLD.group_id, OLD.version, OLD.when_created, OLD.when_modified);
+end$$
diff --git a/src/test/ddl-review/h2-drop-all.sql b/src/test/ddl-review/h2-drop-all.sql
index 080923655..1113deffc 100644
--- a/src/test/ddl-review/h2-drop-all.sql
+++ b/src/test/ddl-review/h2-drop-all.sql
@@ -1,780 +1,1140 @@
-alter table bar drop constraint fk_bar_foo_id;
-drop index ix_bar_foo_id;
+-- Generated by ebean unknown at 2018-03-08T06:41:41.155Z
+alter table bar drop foreign key fk_bar_foo_id;
+drop index ix_bar_foo_id on bar;
 
-alter table o_address drop constraint fk_o_address_country_code;
-drop index ix_o_address_country_code;
+alter table addr drop foreign key fk_addr_employee_id;
+drop index ix_addr_employee_id on addr;
 
-alter table animals drop constraint fk_animals_shelter_id;
-drop index ix_animals_shelter_id;
+alter table o_address drop foreign key fk_o_address_country_code;
+drop index ix_o_address_country_code on o_address;
 
-alter table attribute drop constraint fk_attribute_attribute_holder_1;
-drop index ix_attribute_attribute_holder_1;
+alter table album drop foreign key fk_album_cover_id;
 
-alter table bbookmark drop constraint fk_bbookmark_user_id;
-drop index ix_bbookmark_user_id;
+alter table animal drop foreign key fk_animal_shelter_id;
+drop index ix_animal_shelter_id on animal;
 
-alter table drel_booking drop constraint fk_drel_booking_agent_invoice;
+alter table attribute drop foreign key fk_attribute_attribute_holder_id;
+drop index ix_attribute_attribute_holder_id on attribute;
 
-alter table drel_booking drop constraint fk_drel_booking_client_invoice;
+alter table bbookmark drop foreign key fk_bbookmark_user_id;
+drop index ix_bbookmark_user_id on bbookmark;
 
-alter table ckey_detail drop constraint fk_ckey_detail_ckey_parent;
-drop index ix_ckey_detail_one_key_two_key;
+alter table bsite_user drop foreign key fk_bsite_user_site_id;
+drop index ix_bsite_user_site_id on bsite_user;
 
-alter table ckey_parent drop constraint fk_ckey_parent_assoc_id;
-drop index ix_ckey_parent_assoc_id;
+alter table bsite_user drop foreign key fk_bsite_user_user_id;
+drop index ix_bsite_user_user_id on bsite_user;
 
-alter table calculation_result drop constraint fk_calculation_result_product_1;
-drop index ix_calculation_result_product_1;
+alter table bsite_user_b drop foreign key fk_bsite_user_b_site;
+drop index ix_bsite_user_b_site on bsite_user_b;
 
-alter table calculation_result drop constraint fk_calculation_result_group_c_2;
-drop index ix_calculation_result_group_c_2;
+alter table bsite_user_b drop foreign key fk_bsite_user_b_usr;
+drop index ix_bsite_user_b_usr on bsite_user_b;
 
-alter table sp_car_car_wheels drop constraint fk_sp_car_car_wheels_sp_car_car;
-drop index ix_sp_car_car_wheels_car;
+alter table bsite_user_c drop foreign key fk_bsite_user_c_site_uid;
+drop index ix_bsite_user_c_site_uid on bsite_user_c;
 
-alter table sp_car_car_wheels drop constraint fk_sp_car_car_wheels_sp_car_w_2;
-drop index ix_sp_car_car_wheels_wheel;
+alter table bsite_user_c drop foreign key fk_bsite_user_c_user_uid;
+drop index ix_bsite_user_c_user_uid on bsite_user_c;
 
-alter table car_accessory drop constraint fk_car_accessory_car_id;
-drop index ix_car_accessory_car_id;
+alter table drel_booking drop foreign key fk_drel_booking_agent_invoice;
 
-alter table configuration drop constraint fk_configuration_configuratio_1;
-drop index ix_configuration_configuratio_1;
+alter table drel_booking drop foreign key fk_drel_booking_client_invoice;
 
-alter table contact drop constraint fk_contact_customer_id;
-drop index ix_contact_customer_id;
+alter table ckey_detail drop foreign key fk_ckey_detail_parent;
+drop index ix_ckey_detail_parent on ckey_detail;
 
-alter table contact drop constraint fk_contact_group_id;
-drop index ix_contact_group_id;
+alter table ckey_parent drop foreign key fk_ckey_parent_assoc_id;
+drop index ix_ckey_parent_assoc_id on ckey_parent;
 
-alter table contact_note drop constraint fk_contact_note_contact_id;
-drop index ix_contact_note_contact_id;
+alter table calculation_result drop foreign key fk_calculation_result_product_configuration_id;
+drop index ix_calculation_result_product_configuration_id on calculation_result;
 
-alter table c_conversation drop constraint fk_c_conversation_group_id;
-drop index ix_c_conversation_group_id;
+alter table calculation_result drop foreign key fk_calculation_result_group_configuration_id;
+drop index ix_calculation_result_group_configuration_id on calculation_result;
 
-alter table o_customer drop constraint fk_o_customer_billing_address_1;
-drop index ix_o_customer_billing_address_1;
+alter table sp_car_car_wheels drop foreign key fk_sp_car_car_wheels_sp_car_car;
+drop index ix_sp_car_car_wheels_sp_car_car on sp_car_car_wheels;
 
-alter table o_customer drop constraint fk_o_customer_shipping_addres_2;
-drop index ix_o_customer_shipping_addres_2;
+alter table sp_car_car_wheels drop foreign key fk_sp_car_car_wheels_sp_car_wheel;
+drop index ix_sp_car_car_wheels_sp_car_wheel on sp_car_car_wheels;
 
-alter table eemb_inner drop constraint fk_eemb_inner_outer_id;
-drop index ix_eemb_inner_outer_id;
+alter table car_accessory drop foreign key fk_car_accessory_fuse_id;
+drop index ix_car_accessory_fuse_id on car_accessory;
 
-alter table einvoice drop constraint fk_einvoice_person_id;
-drop index ix_einvoice_person_id;
+alter table car_accessory drop foreign key fk_car_accessory_car_id;
+drop index ix_car_accessory_car_id on car_accessory;
 
-alter table enull_collection_detail drop constraint fk_enull_collection_detail_en_1;
-drop index ix_enull_collection_detail_en_1;
+alter table category drop foreign key fk_category_surveyobjectid;
+drop index ix_category_surveyobjectid on category;
 
-alter table eopt_one_a drop constraint fk_eopt_one_a_b_id;
-drop index ix_eopt_one_a_b_id;
+alter table child_person drop foreign key fk_child_person_some_bean_id;
+drop index ix_child_person_some_bean_id on child_person;
 
-alter table eopt_one_b drop constraint fk_eopt_one_b_c_id;
-drop index ix_eopt_one_b_c_id;
+alter table child_person drop foreign key fk_child_person_parent_identifier;
+drop index ix_child_person_parent_identifier on child_person;
 
-alter table evanilla_collection_detail drop constraint fk_evanilla_collection_detail_1;
-drop index ix_evanilla_collection_detail_1;
+alter table configuration drop foreign key fk_configuration_configurations_id;
+drop index ix_configuration_configurations_id on configuration;
 
-alter table td_child drop constraint fk_td_child_parent_id;
-drop index ix_td_child_parent_id;
+alter table contact drop foreign key fk_contact_customer_id;
+drop index ix_contact_customer_id on contact;
 
-alter table imrelated drop constraint fk_imrelated_owner_id;
-drop index ix_imrelated_owner_id;
+alter table contact drop foreign key fk_contact_group_id;
+drop index ix_contact_group_id on contact;
 
-alter table info_contact drop constraint fk_info_contact_company_id;
-drop index ix_info_contact_company_id;
+alter table contact_note drop foreign key fk_contact_note_contact_id;
+drop index ix_contact_note_contact_id on contact_note;
 
-alter table info_customer drop constraint fk_info_customer_company_id;
+alter table c_conversation drop foreign key fk_c_conversation_group_id;
+drop index ix_c_conversation_group_id on c_conversation;
 
-alter table inner_report drop constraint fk_inner_report_forecast_id;
+alter table o_customer drop foreign key fk_o_customer_billing_address_id;
+drop index ix_o_customer_billing_address_id on o_customer;
 
-alter table drel_invoice drop constraint fk_drel_invoice_booking;
-drop index ix_drel_invoice_booking;
+alter table o_customer drop foreign key fk_o_customer_shipping_address_id;
+drop index ix_o_customer_shipping_address_id on o_customer;
 
-alter table item drop constraint fk_item_type;
-drop index ix_item_customer_type;
+alter table dcredit_drol drop foreign key fk_dcredit_drol_dcredit;
+drop index ix_dcredit_drol_dcredit on dcredit_drol;
 
-alter table item drop constraint fk_item_region;
-drop index ix_item_customer_region;
+alter table dcredit_drol drop foreign key fk_dcredit_drol_drol;
+drop index ix_dcredit_drol_drol on dcredit_drol;
 
-alter table level1_level4 drop constraint fk_level1_level4_level1;
-drop index ix_level1_level4_level1_id;
+alter table drot_drol drop foreign key fk_drot_drol_drot;
+drop index ix_drot_drol_drot on drot_drol;
 
-alter table level1_level4 drop constraint fk_level1_level4_level4;
-drop index ix_level1_level4_level4_id;
+alter table drot_drol drop foreign key fk_drot_drol_drol;
+drop index ix_drot_drol_drol on drot_drol;
 
-alter table level1_level2 drop constraint fk_level1_level2_level1;
-drop index ix_level1_level2_level1_id;
+alter table dfk_cascade drop foreign key fk_dfk_cascade_one_id;
+drop index ix_dfk_cascade_one_id on dfk_cascade;
 
-alter table level1_level2 drop constraint fk_level1_level2_level2;
-drop index ix_level1_level2_level2_id;
+alter table dfk_set_null drop foreign key fk_dfk_set_null_one_id;
+drop index ix_dfk_set_null_one_id on dfk_set_null;
 
-alter table level2_level3 drop constraint fk_level2_level3_level2;
-drop index ix_level2_level3_level2_id;
+alter table doc drop foreign key fk_doc_id;
 
-alter table level2_level3 drop constraint fk_level2_level3_level3;
-drop index ix_level2_level3_level3_id;
+alter table doc_link drop foreign key fk_doc_link_doc;
+drop index ix_doc_link_doc on doc_link;
 
-alter table la_attr_value_attribute drop constraint fk_la_attr_value_attribute_la_1;
-drop index ix_la_attr_value_attribute_la_1;
+alter table doc_link drop foreign key fk_doc_link_link;
+drop index ix_doc_link_link on doc_link;
 
-alter table la_attr_value_attribute drop constraint fk_la_attr_value_attribute_at_2;
-drop index ix_la_attr_value_attribute_at_2;
+alter table document drop foreign key fk_document_id;
 
-alter table mprinter drop constraint fk_mprinter_current_state_id;
-drop index ix_mprinter_current_state_id;
+alter table document drop foreign key fk_document_organisation_id;
+drop index ix_document_organisation_id on document;
 
-alter table mprinter drop constraint fk_mprinter_last_swap_cyan_id;
+alter table document_draft drop foreign key fk_document_draft_organisation_id;
+drop index ix_document_draft_organisation_id on document_draft;
 
-alter table mprinter drop constraint fk_mprinter_last_swap_magenta_3;
+alter table document_media drop foreign key fk_document_media_document_id;
+drop index ix_document_media_document_id on document_media;
 
-alter table mprinter drop constraint fk_mprinter_last_swap_yellow_id;
+alter table document_media_draft drop foreign key fk_document_media_draft_document_id;
+drop index ix_document_media_draft_document_id on document_media_draft;
 
-alter table mprinter drop constraint fk_mprinter_last_swap_black_id;
+alter table ebasic_json_map_detail drop foreign key fk_ebasic_json_map_detail_owner_id;
+drop index ix_ebasic_json_map_detail_owner_id on ebasic_json_map_detail;
 
-alter table mprinter_state drop constraint fk_mprinter_state_printer_id;
-drop index ix_mprinter_state_printer_id;
+alter table ebasic_no_sdchild drop foreign key fk_ebasic_no_sdchild_owner_id;
+drop index ix_ebasic_no_sdchild_owner_id on ebasic_no_sdchild;
 
-alter table mprofile drop constraint fk_mprofile_picture_id;
-drop index ix_mprofile_picture_id;
+alter table ebasic_sdchild drop foreign key fk_ebasic_sdchild_owner_id;
+drop index ix_ebasic_sdchild_owner_id on ebasic_sdchild;
 
-alter table mrole_muser drop constraint fk_mrole_muser_mrole;
-drop index ix_mrole_muser_mrole_roleid;
+alter table eemb_inner drop foreign key fk_eemb_inner_outer_id;
+drop index ix_eemb_inner_outer_id on eemb_inner;
 
-alter table mrole_muser drop constraint fk_mrole_muser_muser;
-drop index ix_mrole_muser_muser_userid;
+alter table einvoice drop foreign key fk_einvoice_person_id;
+drop index ix_einvoice_person_id on einvoice;
 
-alter table muser drop constraint fk_muser_user_type_id;
-drop index ix_muser_user_type_id;
+alter table enull_collection_detail drop foreign key fk_enull_collection_detail_enull_collection_id;
+drop index ix_enull_collection_detail_enull_collection_id on enull_collection_detail;
 
-alter table c_message drop constraint fk_c_message_conversation_id;
-drop index ix_c_message_conversation_id;
+alter table eopt_one_a drop foreign key fk_eopt_one_a_b_id;
+drop index ix_eopt_one_a_b_id on eopt_one_a;
 
-alter table c_message drop constraint fk_c_message_user_id;
-drop index ix_c_message_user_id;
+alter table eopt_one_b drop foreign key fk_eopt_one_b_c_id;
+drop index ix_eopt_one_b_c_id on eopt_one_b;
 
-alter table mnoc_user_mnoc_role drop constraint fk_mnoc_user_mnoc_role_mnoc_u_1;
-drop index ix_mnoc_user_mnoc_role_mnoc_u_1;
+alter table esoft_del_book drop foreign key fk_esoft_del_book_lend_by_id;
+drop index ix_esoft_del_book_lend_by_id on esoft_del_book;
 
-alter table mnoc_user_mnoc_role drop constraint fk_mnoc_user_mnoc_role_mnoc_r_2;
-drop index ix_mnoc_user_mnoc_role_mnoc_r_2;
+alter table esoft_del_book_esoft_del_user drop foreign key fk_esoft_del_book_esoft_del_user_esoft_del_book;
+drop index ix_esoft_del_book_esoft_del_user_esoft_del_book on esoft_del_book_esoft_del_user;
 
-alter table mp_role drop constraint fk_mp_role_mp_user_id;
-drop index ix_mp_role_mp_user_id;
+alter table esoft_del_book_esoft_del_user drop foreign key fk_esoft_del_book_esoft_del_user_esoft_del_user;
+drop index ix_esoft_del_book_esoft_del_user_esoft_del_user on esoft_del_book_esoft_del_user;
 
-alter table my_lob_size_join_many drop constraint fk_my_lob_size_join_many_pare_1;
-drop index ix_my_lob_size_join_many_pare_1;
+alter table esoft_del_down drop foreign key fk_esoft_del_down_esoft_del_mid_id;
+drop index ix_esoft_del_down_esoft_del_mid_id on esoft_del_down;
 
-alter table o_cached_bean_country drop constraint fk_o_cached_bean_country_o_ca_1;
-drop index ix_o_cached_bean_country_o_ca_1;
+alter table esoft_del_mid drop foreign key fk_esoft_del_mid_top_id;
+drop index ix_esoft_del_mid_top_id on esoft_del_mid;
 
-alter table o_cached_bean_country drop constraint fk_o_cached_bean_country_o_co_2;
-drop index ix_o_cached_bean_country_o_co_2;
+alter table esoft_del_mid drop foreign key fk_esoft_del_mid_up_id;
+drop index ix_esoft_del_mid_up_id on esoft_del_mid;
 
-alter table o_cached_bean_child drop constraint fk_o_cached_bean_child_cached_1;
-drop index ix_o_cached_bean_child_cached_1;
+alter table esoft_del_one_a drop foreign key fk_esoft_del_one_a_oneb_id;
 
-alter table oengine drop constraint fk_oengine_car_id;
+alter table esoft_del_role_esoft_del_user drop foreign key fk_esoft_del_role_esoft_del_user_esoft_del_role;
+drop index ix_esoft_del_role_esoft_del_user_esoft_del_role on esoft_del_role_esoft_del_user;
 
-alter table ogear_box drop constraint fk_ogear_box_car_id;
+alter table esoft_del_role_esoft_del_user drop foreign key fk_esoft_del_role_esoft_del_user_esoft_del_user;
+drop index ix_esoft_del_role_esoft_del_user_esoft_del_user on esoft_del_role_esoft_del_user;
 
-alter table o_order drop constraint fk_o_order_kcustomer_id;
-drop index ix_o_order_kcustomer_id;
+alter table esoft_del_user_esoft_del_role drop foreign key fk_esoft_del_user_esoft_del_role_esoft_del_user;
+drop index ix_esoft_del_user_esoft_del_role_esoft_del_user on esoft_del_user_esoft_del_role;
 
-alter table o_order_detail drop constraint fk_o_order_detail_order_id;
-drop index ix_o_order_detail_order_id;
+alter table esoft_del_user_esoft_del_role drop foreign key fk_esoft_del_user_esoft_del_role_esoft_del_role;
+drop index ix_esoft_del_user_esoft_del_role_esoft_del_role on esoft_del_user_esoft_del_role;
 
-alter table o_order_detail drop constraint fk_o_order_detail_product_id;
-drop index ix_o_order_detail_product_id;
+alter table rawinherit_uncle drop foreign key fk_rawinherit_uncle_parent_id;
+drop index ix_rawinherit_uncle_parent_id on rawinherit_uncle;
 
-alter table s_order_items drop constraint fk_s_order_items_order_uuid;
-drop index ix_s_order_items_order_uuid;
+alter table evanilla_collection_detail drop foreign key fk_evanilla_collection_detail_evanilla_collection_id;
+drop index ix_evanilla_collection_detail_evanilla_collection_id on evanilla_collection_detail;
 
-alter table or_order_ship drop constraint fk_or_order_ship_order_id;
-drop index ix_or_order_ship_order_id;
+alter table td_child drop foreign key fk_td_child_parent_id;
+drop index ix_td_child_parent_id on td_child;
 
-alter table oto_child drop constraint fk_oto_child_master_id;
+alter table empl drop foreign key fk_empl_default_address_id;
+drop index ix_empl_default_address_id on empl;
 
-alter table pfile drop constraint fk_pfile_file_content_id;
+alter table grand_parent_person drop foreign key fk_grand_parent_person_some_bean_id;
+drop index ix_grand_parent_person_some_bean_id on grand_parent_person;
 
-alter table pfile drop constraint fk_pfile_file_content2_id;
+alter table survey_group drop foreign key fk_survey_group_categoryobjectid;
+drop index ix_survey_group_categoryobjectid on survey_group;
 
-alter table paggview drop constraint fk_paggview_pview_id;
+alter table hx_link_doc drop foreign key fk_hx_link_doc_hx_link;
+drop index ix_hx_link_doc_hx_link on hx_link_doc;
 
-alter table pallet_location drop constraint fk_pallet_location_zone_sid;
-drop index ix_pallet_location_zone_sid;
+alter table hx_link_doc drop foreign key fk_hx_link_doc_he_doc;
+drop index ix_hx_link_doc_he_doc on hx_link_doc;
 
-alter table parcel_location drop constraint fk_parcel_location_parcelid;
+alter table hi_link_doc drop foreign key fk_hi_link_doc_hi_link;
+drop index ix_hi_link_doc_hi_link on hi_link_doc;
 
-alter table rawinherit_parent_rawinherit_dat drop constraint fk_rawinherit_parent_rawinher_1;
-drop index ix_rawinherit_parent_rawinher_1;
+alter table hi_link_doc drop foreign key fk_hi_link_doc_hi_doc;
+drop index ix_hi_link_doc_hi_doc on hi_link_doc;
 
-alter table rawinherit_parent_rawinherit_dat drop constraint fk_rawinherit_parent_rawinher_2;
-drop index ix_rawinherit_parent_rawinher_2;
+alter table imrelated drop foreign key fk_imrelated_owner_id;
+drop index ix_imrelated_owner_id on imrelated;
 
-alter table c_participation drop constraint fk_c_participation_conversati_1;
-drop index ix_c_participation_conversati_1;
+alter table info_contact drop foreign key fk_info_contact_company_id;
+drop index ix_info_contact_company_id on info_contact;
 
-alter table c_participation drop constraint fk_c_participation_user_id;
-drop index ix_c_participation_user_id;
+alter table info_customer drop foreign key fk_info_customer_company_id;
 
-alter table persistent_file_content drop constraint fk_persistent_file_content_pe_1;
+alter table inner_report drop foreign key fk_inner_report_forecast_id;
 
-alter table person drop constraint fk_person_default_address_oid;
-drop index ix_person_default_address_oid;
+alter table drel_invoice drop foreign key fk_drel_invoice_booking;
+drop index ix_drel_invoice_booking on drel_invoice;
 
-alter table phones drop constraint fk_phones_person_id;
-drop index ix_phones_person_id;
+alter table item drop foreign key fk_item_etype;
+drop index ix_item_etype on item;
 
-alter table pp_to_ww drop constraint fk_pp_to_ww_pp;
-drop index ix_pp_to_ww_pp_id;
+alter table item drop foreign key fk_item_eregion;
+drop index ix_item_eregion on item;
 
-alter table pp_to_ww drop constraint fk_pp_to_ww_wview;
-drop index ix_pp_to_ww_ww_id;
+alter table trainer_monkey drop foreign key fk_trainer_monkey_trainer;
 
-alter table r_orders drop constraint fk_r_orders_rcustomer;
-drop index ix_r_orders_company_customern_1;
+alter table trainer_monkey drop foreign key fk_trainer_monkey_monkey;
 
-alter table resourcefile drop constraint fk_resourcefile_parentresourc_1;
-drop index ix_resourcefile_parentresourc_1;
+alter table troop_monkey drop foreign key fk_troop_monkey_troop;
 
-alter table mt_role drop constraint fk_mt_role_tenant_id;
-drop index ix_mt_role_tenant_id;
+alter table troop_monkey drop foreign key fk_troop_monkey_monkey;
 
-alter table mt_role_permission drop constraint fk_mt_role_permission_mt_role;
-drop index ix_mt_role_permission_mt_role_1;
+alter table l2_cldf_reset_bean_child drop foreign key fk_l2_cldf_reset_bean_child_parent_id;
+drop index ix_l2_cldf_reset_bean_child_parent_id on l2_cldf_reset_bean_child;
 
-alter table mt_role_permission drop constraint fk_mt_role_permission_mt_perm_2;
-drop index ix_mt_role_permission_mt_perm_2;
+alter table level1_level4 drop foreign key fk_level1_level4_level1;
+drop index ix_level1_level4_level1 on level1_level4;
 
-alter table f_second drop constraint fk_f_second_first;
+alter table level1_level4 drop foreign key fk_level1_level4_level4;
+drop index ix_level1_level4_level4 on level1_level4;
 
-alter table section drop constraint fk_section_article_id;
-drop index ix_section_article_id;
+alter table level1_level2 drop foreign key fk_level1_level2_level1;
+drop index ix_level1_level2_level1 on level1_level2;
 
-alter table self_parent drop constraint fk_self_parent_parent_id;
-drop index ix_self_parent_parent_id;
+alter table level1_level2 drop foreign key fk_level1_level2_level2;
+drop index ix_level1_level2_level2 on level1_level2;
 
-alter table self_ref_customer drop constraint fk_self_ref_customer_referred_1;
-drop index ix_self_ref_customer_referred_1;
+alter table level2_level3 drop foreign key fk_level2_level3_level2;
+drop index ix_level2_level3_level2 on level2_level3;
 
-alter table self_ref_example drop constraint fk_self_ref_example_parent_id;
-drop index ix_self_ref_example_parent_id;
+alter table level2_level3 drop foreign key fk_level2_level3_level3;
+drop index ix_level2_level3_level3 on level2_level3;
 
-alter table stockforecast drop constraint fk_stockforecast_inner_report_1;
-drop index ix_stockforecast_inner_report_1;
+alter table link drop foreign key fk_link_id;
 
-alter table sub_section drop constraint fk_sub_section_section_id;
-drop index ix_sub_section_section_id;
+alter table la_attr_value_attribute drop foreign key fk_la_attr_value_attribute_la_attr_value;
+drop index ix_la_attr_value_attribute_la_attr_value on la_attr_value_attribute;
 
-alter table t_detail_with_other_namexxxyy drop constraint fk_t_detail_with_other_namexx_1;
-drop index ix_t_detail_with_other_namexx_1;
+alter table la_attr_value_attribute drop foreign key fk_la_attr_value_attribute_attribute;
+drop index ix_la_attr_value_attribute_attribute on la_attr_value_attribute;
 
-alter table ts_detail_two drop constraint fk_ts_detail_two_master_id;
-drop index ix_ts_detail_two_master_id;
+alter table mprinter drop foreign key fk_mprinter_current_state_id;
+drop index ix_mprinter_current_state_id on mprinter;
 
-alter table twheel drop constraint fk_twheel_owner_plate_no;
-drop index ix_twheel_owner_plate_no;
+alter table mprinter drop foreign key fk_mprinter_last_swap_cyan_id;
 
-alter table tire drop constraint fk_tire_wheel;
+alter table mprinter drop foreign key fk_mprinter_last_swap_magenta_id;
 
-alter table trip drop constraint fk_trip_vehicle_driver_id;
-drop index ix_trip_vehicle_driver_id;
+alter table mprinter drop foreign key fk_mprinter_last_swap_yellow_id;
 
-alter table trip drop constraint fk_trip_address_id;
-drop index ix_trip_address_id;
+alter table mprinter drop foreign key fk_mprinter_last_swap_black_id;
 
-alter table type drop constraint fk_type_sub_type_id;
-drop index ix_type_sub_type_id;
+alter table mprinter_state drop foreign key fk_mprinter_state_printer_id;
+drop index ix_mprinter_state_printer_id on mprinter_state;
 
-alter table ut_detail drop constraint fk_ut_detail_utmaster_id;
-drop index ix_ut_detail_utmaster_id;
+alter table mprofile drop foreign key fk_mprofile_picture_id;
+drop index ix_mprofile_picture_id on mprofile;
 
-alter table uutwo drop constraint fk_uutwo_master_id;
-drop index ix_uutwo_master_id;
+alter table mrole_muser drop foreign key fk_mrole_muser_mrole;
+drop index ix_mrole_muser_mrole on mrole_muser;
 
-alter table c_user drop constraint fk_c_user_group_id;
-drop index ix_c_user_group_id;
+alter table mrole_muser drop foreign key fk_mrole_muser_muser;
+drop index ix_mrole_muser_muser on mrole_muser;
 
-alter table oto_user drop constraint fk_oto_user_account_id;
+alter table muser drop foreign key fk_muser_user_type_id;
+drop index ix_muser_user_type_id on muser;
 
-alter table em_user_role drop constraint fk_em_user_role_user_id;
-drop index ix_em_user_role_user_id;
+alter table mail_user_inbox drop foreign key fk_mail_user_inbox_mail_user;
+drop index ix_mail_user_inbox_mail_user on mail_user_inbox;
 
-alter table em_user_role drop constraint fk_em_user_role_role_id;
-drop index ix_em_user_role_role_id;
+alter table mail_user_inbox drop foreign key fk_mail_user_inbox_mail_box;
+drop index ix_mail_user_inbox_mail_box on mail_user_inbox;
 
-alter table vehicle drop constraint fk_vehicle_truck_ref_id;
-drop index ix_vehicle_truck_ref_id;
+alter table mail_user_outbox drop foreign key fk_mail_user_outbox_mail_user;
+drop index ix_mail_user_outbox_mail_user on mail_user_outbox;
 
-alter table vehicle drop constraint fk_vehicle_car_ref_id;
-drop index ix_vehicle_car_ref_id;
+alter table mail_user_outbox drop foreign key fk_mail_user_outbox_mail_box;
+drop index ix_mail_user_outbox_mail_box on mail_user_outbox;
 
-alter table vehicle_driver drop constraint fk_vehicle_driver_vehicle_id;
-drop index ix_vehicle_driver_vehicle_id;
+alter table c_message drop foreign key fk_c_message_conversation_id;
+drop index ix_c_message_conversation_id on c_message;
 
-alter table vehicle_driver drop constraint fk_vehicle_driver_address_id;
-drop index ix_vehicle_driver_address_id;
+alter table c_message drop foreign key fk_c_message_user_id;
+drop index ix_c_message_user_id on c_message;
 
-alter table warehouses drop constraint fk_warehouses_officezoneid;
-drop index ix_warehouses_officezoneid;
+alter table mnoc_user_mnoc_role drop foreign key fk_mnoc_user_mnoc_role_mnoc_user;
+drop index ix_mnoc_user_mnoc_role_mnoc_user on mnoc_user_mnoc_role;
 
-alter table warehousesshippingzones drop constraint fk_warehousesshippingzones_wa_1;
-drop index ix_warehousesshippingzones_wa_1;
+alter table mnoc_user_mnoc_role drop foreign key fk_mnoc_user_mnoc_role_mnoc_role;
+drop index ix_mnoc_user_mnoc_role_mnoc_role on mnoc_user_mnoc_role;
 
-alter table warehousesshippingzones drop constraint fk_warehousesshippingzones_zo_2;
-drop index ix_warehousesshippingzones_sh_2;
+alter table mny_b drop foreign key fk_mny_b_a_id;
+drop index ix_mny_b_a_id on mny_b;
 
-alter table sa_wheel drop constraint fk_sa_wheel_tire;
-drop index ix_sa_wheel_tire;
+alter table mny_b_mny_c drop foreign key fk_mny_b_mny_c_mny_b;
+drop index ix_mny_b_mny_c_mny_b on mny_b_mny_c;
 
-alter table sa_wheel drop constraint fk_sa_wheel_car;
-drop index ix_sa_wheel_car;
+alter table mny_b_mny_c drop foreign key fk_mny_b_mny_c_mny_c;
+drop index ix_mny_b_mny_c_mny_c on mny_b_mny_c;
 
-alter table with_zero drop constraint fk_with_zero_parent_id;
-drop index ix_with_zero_parent_id;
+alter table subtopics drop foreign key fk_subtopics_mny_topic_1;
+drop index ix_subtopics_mny_topic_1 on subtopics;
+
+alter table subtopics drop foreign key fk_subtopics_mny_topic_2;
+drop index ix_subtopics_mny_topic_2 on subtopics;
+
+alter table mp_role drop foreign key fk_mp_role_mp_user_id;
+drop index ix_mp_role_mp_user_id on mp_role;
+
+alter table ms_many_a_many_b drop foreign key fk_ms_many_a_many_b_ms_many_a;
+drop index ix_ms_many_a_many_b_ms_many_a on ms_many_a_many_b;
+
+alter table ms_many_a_many_b drop foreign key fk_ms_many_a_many_b_ms_many_b;
+drop index ix_ms_many_a_many_b_ms_many_b on ms_many_a_many_b;
+
+alter table ms_many_b_many_a drop foreign key fk_ms_many_b_many_a_ms_many_b;
+drop index ix_ms_many_b_many_a_ms_many_b on ms_many_b_many_a;
+
+alter table ms_many_b_many_a drop foreign key fk_ms_many_b_many_a_ms_many_a;
+drop index ix_ms_many_b_many_a_ms_many_a on ms_many_b_many_a;
+
+alter table my_lob_size_join_many drop foreign key fk_my_lob_size_join_many_parent_id;
+drop index ix_my_lob_size_join_many_parent_id on my_lob_size_join_many;
+
+alter table o_cached_bean_country drop foreign key fk_o_cached_bean_country_o_cached_bean;
+drop index ix_o_cached_bean_country_o_cached_bean on o_cached_bean_country;
+
+alter table o_cached_bean_country drop foreign key fk_o_cached_bean_country_o_country;
+drop index ix_o_cached_bean_country_o_country on o_cached_bean_country;
+
+alter table o_cached_bean_child drop foreign key fk_o_cached_bean_child_cached_bean_id;
+drop index ix_o_cached_bean_child_cached_bean_id on o_cached_bean_child;
+
+alter table oengine drop foreign key fk_oengine_car_id;
+
+alter table ogear_box drop foreign key fk_ogear_box_car_id;
+
+alter table oroad_show_msg drop foreign key fk_oroad_show_msg_company_id;
+
+alter table om_ordered_detail drop foreign key fk_om_ordered_detail_master_id;
+drop index ix_om_ordered_detail_master_id on om_ordered_detail;
+
+alter table o_order drop foreign key fk_o_order_kcustomer_id;
+drop index ix_o_order_kcustomer_id on o_order;
+
+alter table o_order_detail drop foreign key fk_o_order_detail_order_id;
+drop index ix_o_order_detail_order_id on o_order_detail;
+
+alter table o_order_detail drop foreign key fk_o_order_detail_product_id;
+drop index ix_o_order_detail_product_id on o_order_detail;
+
+alter table s_order_items drop foreign key fk_s_order_items_order_uuid;
+drop index ix_s_order_items_order_uuid on s_order_items;
+
+alter table or_order_ship drop foreign key fk_or_order_ship_order_id;
+drop index ix_or_order_ship_order_id on or_order_ship;
+
+alter table oto_bchild drop foreign key fk_oto_bchild_master_id;
+
+alter table oto_child drop foreign key fk_oto_child_master_id;
+
+alter table oto_cust_address drop foreign key fk_oto_cust_address_customer_cid;
+
+alter table oto_prime_extra drop foreign key fk_oto_prime_extra_eid;
+
+alter table oto_th_many drop foreign key fk_oto_th_many_oto_th_top_id;
+drop index ix_oto_th_many_oto_th_top_id on oto_th_many;
+
+alter table oto_th_one drop foreign key fk_oto_th_one_many_id;
+
+alter table oto_ubprime_extra drop foreign key fk_oto_ubprime_extra_eid;
+
+alter table oto_uprime_extra drop foreign key fk_oto_uprime_extra_eid;
+
+alter table pfile drop foreign key fk_pfile_file_content_id;
+
+alter table pfile drop foreign key fk_pfile_file_content2_id;
+
+alter table paggview drop foreign key fk_paggview_pview_id;
+
+alter table pallet_location drop foreign key fk_pallet_location_zone_sid;
+drop index ix_pallet_location_zone_sid on pallet_location;
+
+alter table parcel_location drop foreign key fk_parcel_location_parcelid;
+
+alter table rawinherit_parent_rawinherit_data drop foreign key fk_rawinherit_parent_rawinherit_data_rawinherit_parent;
+drop index ix_rawinherit_parent_rawinherit_data_rawinherit_parent on rawinherit_parent_rawinherit_data;
+
+alter table rawinherit_parent_rawinherit_data drop foreign key fk_rawinherit_parent_rawinherit_data_rawinherit_data;
+drop index ix_rawinherit_parent_rawinherit_data_rawinherit_data on rawinherit_parent_rawinherit_data;
+
+alter table parent_person drop foreign key fk_parent_person_some_bean_id;
+drop index ix_parent_person_some_bean_id on parent_person;
+
+alter table parent_person drop foreign key fk_parent_person_parent_identifier;
+drop index ix_parent_person_parent_identifier on parent_person;
+
+alter table c_participation drop foreign key fk_c_participation_conversation_id;
+drop index ix_c_participation_conversation_id on c_participation;
+
+alter table c_participation drop foreign key fk_c_participation_user_id;
+drop index ix_c_participation_user_id on c_participation;
+
+alter table persistent_file_content drop foreign key fk_persistent_file_content_persistent_file_id;
+
+alter table person drop foreign key fk_person_default_address_oid;
+drop index ix_person_default_address_oid on person;
+
+alter table phones drop foreign key fk_phones_person_id;
+drop index ix_phones_person_id on phones;
+
+alter table pp_to_ww drop foreign key fk_pp_to_ww_pp;
+drop index ix_pp_to_ww_pp on pp_to_ww;
+
+alter table pp_to_ww drop foreign key fk_pp_to_ww_wview;
+drop index ix_pp_to_ww_wview on pp_to_ww;
+
+alter table question drop foreign key fk_question_groupobjectid;
+drop index ix_question_groupobjectid on question;
+
+alter table r_orders drop foreign key fk_r_orders_customer;
+drop index ix_r_orders_customer on r_orders;
+
+alter table resourcefile drop foreign key fk_resourcefile_parentresourcefileid;
+drop index ix_resourcefile_parentresourcefileid on resourcefile;
+
+alter table mt_role drop foreign key fk_mt_role_tenant_id;
+drop index ix_mt_role_tenant_id on mt_role;
+
+alter table mt_role_permission drop foreign key fk_mt_role_permission_mt_role;
+drop index ix_mt_role_permission_mt_role on mt_role_permission;
+
+alter table mt_role_permission drop foreign key fk_mt_role_permission_mt_permission;
+drop index ix_mt_role_permission_mt_permission on mt_role_permission;
+
+alter table f_second drop foreign key fk_f_second_first;
+
+alter table section drop foreign key fk_section_article_id;
+drop index ix_section_article_id on section;
+
+alter table self_parent drop foreign key fk_self_parent_parent_id;
+drop index ix_self_parent_parent_id on self_parent;
+
+alter table self_ref_customer drop foreign key fk_self_ref_customer_referred_by_id;
+drop index ix_self_ref_customer_referred_by_id on self_ref_customer;
+
+alter table self_ref_example drop foreign key fk_self_ref_example_parent_id;
+drop index ix_self_ref_example_parent_id on self_ref_example;
+
+alter table stockforecast drop foreign key fk_stockforecast_inner_report_id;
+drop index ix_stockforecast_inner_report_id on stockforecast;
+
+alter table sub_section drop foreign key fk_sub_section_section_id;
+drop index ix_sub_section_section_id on sub_section;
+
+alter table tevent_many drop foreign key fk_tevent_many_event_id;
+drop index ix_tevent_many_event_id on tevent_many;
+
+alter table tevent_one drop foreign key fk_tevent_one_event_id;
+
+alter table t_detail_with_other_namexxxyy drop foreign key fk_t_detail_with_other_namexxxyy_master_id;
+drop index ix_t_detail_with_other_namexxxyy_master_id on t_detail_with_other_namexxxyy;
+
+alter table ts_detail_two drop foreign key fk_ts_detail_two_master_id;
+drop index ix_ts_detail_two_master_id on ts_detail_two;
+
+alter table twheel drop foreign key fk_twheel_owner_plate_no;
+drop index ix_twheel_owner_plate_no on twheel;
+
+alter table tire drop foreign key fk_tire_wheel;
+
+alter table trip drop foreign key fk_trip_vehicle_driver_id;
+drop index ix_trip_vehicle_driver_id on trip;
+
+alter table trip drop foreign key fk_trip_address_id;
+drop index ix_trip_address_id on trip;
+
+alter table type drop foreign key fk_type_sub_type_id;
+drop index ix_type_sub_type_id on type;
+
+alter table ut_detail drop foreign key fk_ut_detail_utmaster_id;
+drop index ix_ut_detail_utmaster_id on ut_detail;
+
+alter table uutwo drop foreign key fk_uutwo_master_id;
+drop index ix_uutwo_master_id on uutwo;
+
+alter table c_user drop foreign key fk_c_user_group_id;
+drop index ix_c_user_group_id on c_user;
+
+alter table oto_user drop foreign key fk_oto_user_account_id;
+
+alter table em_user_role drop foreign key fk_em_user_role_user_id;
+drop index ix_em_user_role_user_id on em_user_role;
+
+alter table em_user_role drop foreign key fk_em_user_role_role_id;
+drop index ix_em_user_role_role_id on em_user_role;
+
+alter table vehicle drop foreign key fk_vehicle_car_ref_id;
+drop index ix_vehicle_car_ref_id on vehicle;
+
+alter table vehicle drop foreign key fk_vehicle_truck_ref_id;
+drop index ix_vehicle_truck_ref_id on vehicle;
+
+alter table vehicle_driver drop foreign key fk_vehicle_driver_vehicle_id;
+drop index ix_vehicle_driver_vehicle_id on vehicle_driver;
+
+alter table vehicle_driver drop foreign key fk_vehicle_driver_address_id;
+drop index ix_vehicle_driver_address_id on vehicle_driver;
+
+alter table warehouses drop foreign key fk_warehouses_officezoneid;
+drop index ix_warehouses_officezoneid on warehouses;
+
+alter table warehousesshippingzones drop foreign key fk_warehousesshippingzones_warehouses;
+drop index ix_warehousesshippingzones_warehouses on warehousesshippingzones;
+
+alter table warehousesshippingzones drop foreign key fk_warehousesshippingzones_zones;
+drop index ix_warehousesshippingzones_zones on warehousesshippingzones;
+
+alter table sa_wheel drop foreign key fk_sa_wheel_tire;
+drop index ix_sa_wheel_tire on sa_wheel;
+
+alter table sa_wheel drop foreign key fk_sa_wheel_car;
+drop index ix_sa_wheel_car on sa_wheel;
+
+alter table g_who_props_otm drop foreign key fk_g_who_props_otm_who_created_id;
+drop index ix_g_who_props_otm_who_created_id on g_who_props_otm;
+
+alter table g_who_props_otm drop foreign key fk_g_who_props_otm_who_modified_id;
+drop index ix_g_who_props_otm_who_modified_id on g_who_props_otm;
+
+alter table with_zero drop foreign key fk_with_zero_parent_id;
+drop index ix_with_zero_parent_id on with_zero;
 
 drop table if exists asimple_bean;
-drop sequence if exists asimple_bean_seq;
 
 drop table if exists bar;
-drop sequence if exists bar_seq;
 
 drop table if exists oto_account;
-drop sequence if exists oto_account_seq;
 
-drop table if exists o_address;
-drop sequence if exists o_address_seq;
+drop table if exists addr;
 
 drop table if exists address;
-drop sequence if exists address_seq;
 
-drop table if exists animals;
-drop sequence if exists animals_seq;
+drop table if exists o_address;
+
+drop table if exists album;
+
+drop table if exists animal;
 
 drop table if exists animal_shelter;
-drop sequence if exists animal_shelter_seq;
 
 drop table if exists article;
-drop sequence if exists article_seq;
 
 drop table if exists attribute;
-drop sequence if exists attribute_seq;
 
 drop table if exists attribute_holder;
-drop sequence if exists attribute_holder_seq;
 
 drop table if exists audit_log;
-drop sequence if exists audit_log_seq;
 
 drop table if exists bbookmark;
-drop sequence if exists bbookmark_seq;
 
 drop table if exists bbookmark_user;
-drop sequence if exists bbookmark_user_seq;
 
 drop table if exists bsimple_with_gen;
-drop sequence if exists bsimple_with_gen_seq;
+
+drop table if exists bsite;
+
+drop table if exists bsite_user;
+
+drop table if exists bsite_user_b;
+
+drop table if exists bsite_user_c;
+
+drop table if exists buser;
 
 drop table if exists bwith_qident;
-drop sequence if exists bwith_qident_seq;
 
 drop table if exists basic_joda_entity;
-drop sequence if exists basic_joda_entity_seq;
 
 drop table if exists bean_with_time_zone;
-drop sequence if exists bean_with_time_zone_seq;
 
 drop table if exists drel_booking;
-drop sequence if exists drel_booking_seq;
+
+drop table if exists cinh_root;
 
 drop table if exists ckey_assoc;
-drop sequence if exists ckey_assoc_seq;
 
 drop table if exists ckey_detail;
-drop sequence if exists ckey_detail_seq;
 
 drop table if exists ckey_parent;
 
 drop table if exists calculation_result;
-drop sequence if exists calculation_result_seq;
 
 drop table if exists cao_bean;
 
 drop table if exists sa_car;
-drop sequence if exists sa_car_seq;
 
 drop table if exists sp_car_car;
-drop sequence if exists sp_car_car_seq;
 
 drop table if exists sp_car_car_wheels;
 
 drop table if exists car_accessory;
-drop sequence if exists car_accessory_seq;
+
+drop table if exists car_fuse;
+
+drop table if exists category;
+
+drop table if exists child_person;
 
 drop table if exists configuration;
-drop sequence if exists configuration_seq;
 
 drop table if exists configurations;
-drop sequence if exists configurations_seq;
 
 drop table if exists contact;
-drop sequence if exists contact_seq;
 
 drop table if exists contact_group;
-drop sequence if exists contact_group_seq;
 
 drop table if exists contact_note;
-drop sequence if exists contact_note_seq;
 
 drop table if exists c_conversation;
-drop sequence if exists c_conversation_seq;
 
 drop table if exists o_country;
 
+drop table if exists cover;
+
 drop table if exists o_customer;
-drop sequence if exists o_customer_seq;
+
+drop table if exists dcredit;
+
+drop table if exists dcredit_drol;
 
 drop table if exists dexh_entity;
-drop sequence if exists dexh_entity_seq;
 
 drop table if exists dperson;
-drop sequence if exists dperson_seq;
+
+drop table if exists drol;
+
+drop table if exists drot;
+
+drop table if exists drot_drol;
 
 drop table if exists rawinherit_data;
-drop sequence if exists rawinherit_data_seq;
+
+drop table if exists dfk_cascade;
+
+drop table if exists dfk_cascade_one;
+
+drop table if exists dfk_none;
+
+drop table if exists dfk_none_via_join;
+
+drop table if exists dfk_one;
+
+drop table if exists dfk_set_null;
+
+drop table if exists doc;
+
+drop table if exists doc_link;
+
+drop table if exists doc_link_draft;
+
+drop table if exists doc_draft;
+
+drop table if exists document;
+
+drop table if exists document_draft;
+
+drop table if exists document_media;
+
+drop table if exists document_media_draft;
+
+drop table if exists earray_bean;
+
+drop table if exists earray_set_bean;
 
 drop table if exists e_basic;
-drop sequence if exists e_basic_seq;
+
+drop table if exists ebasic_change_log;
 
 drop table if exists ebasic_clob;
-drop sequence if exists ebasic_clob_seq;
 
 drop table if exists ebasic_clob_fetch_eager;
-drop sequence if exists ebasic_clob_fetch_eager_seq;
 
 drop table if exists ebasic_clob_no_ver;
-drop sequence if exists ebasic_clob_no_ver_seq;
 
 drop table if exists e_basicenc;
-drop sequence if exists e_basicenc_seq;
 
 drop table if exists e_basicenc_bin;
-drop sequence if exists e_basicenc_bin_seq;
 
 drop table if exists e_basic_enum_id;
 
+drop table if exists e_basic_eni;
+
+drop table if exists ebasic_hstore;
+
+drop table if exists ebasic_json_list;
+
 drop table if exists ebasic_json_map;
-drop sequence if exists ebasic_json_map_seq;
 
 drop table if exists ebasic_json_map_blob;
-drop sequence if exists ebasic_json_map_blob_seq;
 
 drop table if exists ebasic_json_map_clob;
-drop sequence if exists ebasic_json_map_clob_seq;
+
+drop table if exists ebasic_json_map_detail;
 
 drop table if exists ebasic_json_map_json_b;
-drop sequence if exists ebasic_json_map_json_b_seq;
 
 drop table if exists ebasic_json_map_varchar;
-drop sequence if exists ebasic_json_map_varchar_seq;
 
 drop table if exists ebasic_json_node;
-drop sequence if exists ebasic_json_node_seq;
 
 drop table if exists ebasic_json_node_blob;
-drop sequence if exists ebasic_json_node_blob_seq;
 
 drop table if exists ebasic_json_node_json_b;
-drop sequence if exists ebasic_json_node_json_b_seq;
 
 drop table if exists ebasic_json_node_varchar;
-drop sequence if exists ebasic_json_node_varchar_seq;
+
+drop table if exists ebasic_json_unmapped;
 
 drop table if exists e_basic_ndc;
-drop sequence if exists e_basic_ndc_seq;
+
+drop table if exists ebasic_no_sdchild;
+
+drop table if exists ebasic_sdchild;
+
+drop table if exists ebasic_soft_delete;
 
 drop table if exists e_basicver;
-drop sequence if exists e_basicver_seq;
 
 drop table if exists e_basic_withlife;
-drop sequence if exists e_basic_withlife_seq;
 
 drop table if exists e_basicverucon;
-drop sequence if exists e_basicverucon_seq;
+
+drop table if exists e_col_ab;
+
+drop table if exists ecustom_id;
 
 drop table if exists eemb_inner;
-drop sequence if exists eemb_inner_seq;
 
 drop table if exists eemb_outer;
-drop sequence if exists eemb_outer_seq;
 
 drop table if exists egen_props;
-drop sequence if exists egen_props_seq;
 
 drop table if exists einvoice;
-drop sequence if exists einvoice_seq;
 
 drop table if exists e_main;
-drop sequence if exists e_main_seq;
 
 drop table if exists enull_collection;
-drop sequence if exists enull_collection_seq;
 
 drop table if exists enull_collection_detail;
-drop sequence if exists enull_collection_detail_seq;
 
 drop table if exists eopt_one_a;
-drop sequence if exists eopt_one_a_seq;
 
 drop table if exists eopt_one_b;
-drop sequence if exists eopt_one_b_seq;
 
 drop table if exists eopt_one_c;
-drop sequence if exists eopt_one_c_seq;
 
 drop table if exists eperson;
-drop sequence if exists eperson_seq;
+
+drop table if exists e_person_online;
 
 drop table if exists esimple;
 
+drop table if exists esoft_del_book;
+
+drop table if exists esoft_del_book_esoft_del_user;
+
+drop table if exists esoft_del_down;
+
+drop table if exists esoft_del_mid;
+
+drop table if exists esoft_del_one_a;
+
+drop table if exists esoft_del_one_b;
+
+drop table if exists esoft_del_role;
+
+drop table if exists esoft_del_role_esoft_del_user;
+
+drop table if exists esoft_del_top;
+
+drop table if exists esoft_del_up;
+
+drop table if exists esoft_del_user;
+
+drop table if exists esoft_del_user_esoft_del_role;
+
+drop table if exists esome_convert_type;
+
 drop table if exists esome_type;
-drop sequence if exists esome_type_seq;
 
 drop table if exists etrans_many;
-drop sequence if exists etrans_many_seq;
+
+drop table if exists rawinherit_uncle;
 
 drop table if exists evanilla_collection;
-drop sequence if exists evanilla_collection_seq;
 
 drop table if exists evanilla_collection_detail;
-drop sequence if exists evanilla_collection_detail_seq;
 
 drop table if exists ewho_props;
-drop sequence if exists ewho_props_seq;
 
 drop table if exists e_withinet;
-drop sequence if exists e_withinet_seq;
 
 drop table if exists td_child;
-drop sequence if exists td_child_seq;
 
 drop table if exists td_parent;
-drop sequence if exists td_parent_seq;
+
+drop table if exists empl;
 
 drop table if exists feature_desc;
-drop sequence if exists feature_desc_seq;
 
 drop table if exists f_first;
-drop sequence if exists f_first_seq;
 
 drop table if exists foo;
-drop sequence if exists foo_seq;
 
 drop table if exists gen_key_identity;
 
 drop table if exists gen_key_sequence;
-drop sequence if exists seq;
 
 drop table if exists gen_key_table;
-drop sequence if exists gen_key_table_seq;
+
+drop table if exists grand_parent_person;
+
+drop table if exists survey_group;
 
 drop table if exists c_group;
-drop sequence if exists c_group_seq;
+
+drop table if exists he_doc;
+
+drop trigger hx_link_history_upd;
+drop trigger hx_link_history_del;
+drop view hx_link_with_history;
+alter table hx_link drop column sys_period_start;
+alter table hx_link drop column sys_period_end;
+drop table hx_link_history;
+
+drop table if exists hx_link;
+
+drop table if exists hx_link_doc;
+
+drop table if exists hi_doc;
+
+drop trigger hi_link_history_upd;
+drop trigger hi_link_history_del;
+drop view hi_link_with_history;
+alter table hi_link drop column sys_period_start;
+alter table hi_link drop column sys_period_end;
+drop table hi_link_history;
+
+drop table if exists hi_link;
+
+drop trigger hi_link_doc_history_upd;
+drop trigger hi_link_doc_history_del;
+drop view hi_link_doc_with_history;
+alter table hi_link_doc drop column sys_period_start;
+alter table hi_link_doc drop column sys_period_end;
+drop table hi_link_doc_history;
+
+drop table if exists hi_link_doc;
 
 drop table if exists imrelated;
-drop sequence if exists imrelated_seq;
 
 drop table if exists imroot;
-drop sequence if exists imroot_seq;
 
 drop table if exists ixresource;
 
 drop table if exists info_company;
-drop sequence if exists info_company_seq;
 
 drop table if exists info_contact;
-drop sequence if exists info_contact_seq;
 
 drop table if exists info_customer;
-drop sequence if exists info_customer_seq;
 
 drop table if exists inner_report;
-drop sequence if exists inner_report_seq;
 
 drop table if exists drel_invoice;
-drop sequence if exists drel_invoice_seq;
 
 drop table if exists item;
 
+drop table if exists monkey;
+
+drop table if exists trainer;
+
+drop table if exists trainer_monkey;
+
+drop table if exists troop;
+
+drop table if exists troop_monkey;
+
+drop table if exists l2_cldf_reset_bean;
+
+drop table if exists l2_cldf_reset_bean_child;
+
 drop table if exists level1;
-drop sequence if exists level1_seq;
 
 drop table if exists level1_level4;
 
 drop table if exists level1_level2;
 
 drop table if exists level2;
-drop sequence if exists level2_seq;
 
 drop table if exists level2_level3;
 
 drop table if exists level3;
-drop sequence if exists level3_seq;
 
 drop table if exists level4;
-drop sequence if exists level4_seq;
+
+drop trigger link_history_upd;
+drop trigger link_history_del;
+drop view link_with_history;
+alter table link drop column sys_period_start;
+alter table link drop column sys_period_end;
+drop table link_history;
+
+drop table if exists link;
+
+drop table if exists link_draft;
 
 drop table if exists la_attr_value;
-drop sequence if exists la_attr_value_seq;
 
 drop table if exists la_attr_value_attribute;
 
 drop table if exists mmedia;
-drop sequence if exists mmedia_seq;
 
 drop table if exists non_updateprop;
-drop sequence if exists non_updateprop_seq;
 
 drop table if exists mprinter;
-drop sequence if exists mprinter_seq;
 
 drop table if exists mprinter_state;
-drop sequence if exists mprinter_state_seq;
 
 drop table if exists mprofile;
-drop sequence if exists mprofile_seq;
 
 drop table if exists mprotected_construct_bean;
-drop sequence if exists mprotected_construct_bean_seq;
 
 drop table if exists mrole;
-drop sequence if exists mrole_seq;
 
 drop table if exists mrole_muser;
 
 drop table if exists msome_other;
-drop sequence if exists msome_other_seq;
 
 drop table if exists muser;
-drop sequence if exists muser_seq;
 
 drop table if exists muser_type;
-drop sequence if exists muser_type_seq;
+
+drop table if exists mail_box;
+
+drop table if exists mail_user;
+
+drop table if exists mail_user_inbox;
+
+drop table if exists mail_user_outbox;
 
 drop table if exists map_super_actual;
-drop sequence if exists map_super_actual_seq;
 
 drop table if exists c_message;
-drop sequence if exists c_message_seq;
 
 drop table if exists mnoc_role;
-drop sequence if exists mnoc_role_seq;
 
 drop table if exists mnoc_user;
-drop sequence if exists mnoc_user_seq;
 
 drop table if exists mnoc_user_mnoc_role;
 
+drop table if exists mny_a;
+
+drop table if exists mny_b;
+
+drop table if exists mny_b_mny_c;
+
+drop table if exists mny_c;
+
+drop table if exists mny_topic;
+
+drop table if exists subtopics;
+
 drop table if exists mp_role;
-drop sequence if exists mp_role_seq;
 
 drop table if exists mp_user;
-drop sequence if exists mp_user_seq;
+
+drop table if exists ms_many_a;
+
+drop table if exists ms_many_a_many_b;
+
+drop table if exists ms_many_b;
+
+drop table if exists ms_many_b_many_a;
 
 drop table if exists my_lob_size;
-drop sequence if exists my_lob_size_seq;
 
 drop table if exists my_lob_size_join_many;
-drop sequence if exists my_lob_size_join_many_seq;
 
 drop table if exists noidbean;
 
 drop table if exists o_cached_bean;
-drop sequence if exists o_cached_bean_seq;
 
 drop table if exists o_cached_bean_country;
 
 drop table if exists o_cached_bean_child;
-drop sequence if exists o_cached_bean_child_seq;
+
+drop table if exists o_cached_natkey;
+
+drop table if exists o_cached_natkey3;
 
 drop table if exists ocar;
-drop sequence if exists ocar_seq;
+
+drop table if exists ocompany;
 
 drop table if exists oengine;
 
 drop table if exists ogear_box;
 
+drop table if exists oroad_show_msg;
+
+drop table if exists om_ordered_detail;
+
+drop table if exists om_ordered_master;
+
 drop table if exists o_order;
-drop sequence if exists o_order_seq;
 
 drop table if exists o_order_detail;
-drop sequence if exists o_order_detail_seq;
 
 drop table if exists s_orders;
 
 drop table if exists s_order_items;
 
 drop table if exists or_order_ship;
-drop sequence if exists or_order_ship_seq;
+
+drop table if exists organisation;
+
+drop table if exists oto_bchild;
+
+drop table if exists oto_bmaster;
 
 drop table if exists oto_child;
-drop sequence if exists oto_child_seq;
+
+drop table if exists oto_cust;
+
+drop table if exists oto_cust_address;
 
 drop table if exists oto_master;
-drop sequence if exists oto_master_seq;
+
+drop table if exists oto_prime;
+
+drop table if exists oto_prime_extra;
+
+drop table if exists oto_th_many;
+
+drop table if exists oto_th_one;
+
+drop table if exists oto_th_top;
+
+drop table if exists oto_ubprime;
+
+drop table if exists oto_ubprime_extra;
+
+drop table if exists oto_uprime;
+
+drop table if exists oto_uprime_extra;
 
 drop table if exists pfile;
-drop sequence if exists pfile_seq;
 
 drop table if exists pfile_content;
-drop sequence if exists pfile_content_seq;
 
 drop table if exists paggview;
 
 drop table if exists pallet_location;
-drop sequence if exists pallet_location_seq;
 
 drop table if exists parcel;
-drop sequence if exists parcel_seq;
 
 drop table if exists parcel_location;
-drop sequence if exists parcel_location_seq;
 
 drop table if exists rawinherit_parent;
-drop sequence if exists rawinherit_parent_seq;
 
-drop table if exists rawinherit_parent_rawinherit_dat;
+drop table if exists rawinherit_parent_rawinherit_data;
+
+drop table if exists parent_person;
 
 drop table if exists c_participation;
-drop sequence if exists c_participation_seq;
 
 drop table if exists mt_permission;
 
 drop table if exists persistent_file;
-drop sequence if exists persistent_file_seq;
 
 drop table if exists persistent_file_content;
-drop sequence if exists persistent_file_content_seq;
 
 drop table if exists persons;
-drop sequence if exists persons_seq;
 
 drop table if exists person;
-drop sequence if exists person_seq;
 
 drop table if exists phones;
-drop sequence if exists phones_seq;
+
+drop table if exists primary_revision;
 
 drop table if exists o_product;
-drop sequence if exists o_product_seq;
 
 drop table if exists pp;
 
 drop table if exists pp_to_ww;
 
+drop table if exists question;
+
 drop table if exists rcustomer;
 
 drop table if exists r_orders;
@@ -783,154 +1143,136 @@ drop table if exists region;
 
 drop table if exists resourcefile;
 
+drop table if exists em_role;
+
 drop table if exists mt_role;
 
 drop table if exists mt_role_permission;
 
-drop table if exists em_role;
-drop sequence if exists em_role_seq;
-
 drop table if exists f_second;
-drop sequence if exists f_second_seq;
 
 drop table if exists section;
-drop sequence if exists section_seq;
 
 drop table if exists self_parent;
-drop sequence if exists self_parent_seq;
 
 drop table if exists self_ref_customer;
-drop sequence if exists self_ref_customer_seq;
 
 drop table if exists self_ref_example;
-drop sequence if exists self_ref_example_seq;
 
 drop table if exists some_enum_bean;
-drop sequence if exists some_enum_bean_seq;
 
 drop table if exists some_file_bean;
-drop sequence if exists some_file_bean_seq;
 
 drop table if exists some_new_types_bean;
-drop sequence if exists some_new_types_bean_seq;
 
 drop table if exists some_period_bean;
-drop sequence if exists some_period_bean_seq;
 
 drop table if exists stockforecast;
-drop sequence if exists stockforecast_seq;
 
 drop table if exists sub_section;
-drop sequence if exists sub_section_seq;
 
 drop table if exists sub_type;
-drop sequence if exists sub_type_seq;
+
+drop table if exists survey;
 
 drop table if exists tbytes_only;
-drop sequence if exists tbytes_only_seq;
 
 drop table if exists tcar;
 
+drop table if exists tevent;
+
+drop table if exists tevent_many;
+
+drop table if exists tevent_one;
+
 drop table if exists tint_root;
-drop sequence if exists tint_root_seq;
 
 drop table if exists tjoda_entity;
-drop sequence if exists tjoda_entity_seq;
 
 drop table if exists t_mapsuper1;
-drop sequence if exists t_mapsuper1_seq;
 
 drop table if exists t_oneb;
-drop sequence if exists t_oneb_seq;
 
 drop table if exists t_detail_with_other_namexxxyy;
-drop sequence if exists t_atable_detail_seq;
 
 drop table if exists ts_detail_two;
-drop sequence if exists ts_detail_two_seq;
 
 drop table if exists t_atable_thatisrelatively;
-drop sequence if exists t_atable_master_seq;
 
 drop table if exists ts_master_two;
-drop sequence if exists ts_master_two_seq;
 
 drop table if exists tuuid_entity;
 
 drop table if exists twheel;
-drop sequence if exists twheel_seq;
 
 drop table if exists twith_pre_insert;
-drop sequence if exists twith_pre_insert_seq;
 
 drop table if exists mt_tenant;
 
-drop table if exists sa_tire;
-drop sequence if exists sa_tire_seq;
+drop table if exists test_annotation_base_entity;
 
 drop table if exists tire;
-drop sequence if exists tire_seq;
+
+drop table if exists sa_tire;
 
 drop table if exists trip;
-drop sequence if exists trip_seq;
 
 drop table if exists truck_ref;
-drop sequence if exists truck_ref_seq;
 
 drop table if exists type;
 
+drop table if exists tz_bean;
+
 drop table if exists ut_detail;
-drop sequence if exists ut_detail_seq;
 
 drop table if exists ut_master;
-drop sequence if exists ut_master_seq;
 
 drop table if exists uuone;
 
 drop table if exists uutwo;
 
-drop table if exists em_user;
-drop sequence if exists em_user_seq;
-
-drop table if exists tx_user;
-drop sequence if exists tx_user_seq;
+drop trigger c_user_history_upd;
+drop trigger c_user_history_del;
+drop view c_user_with_history;
+alter table c_user drop column sys_period_start;
+alter table c_user drop column sys_period_end;
+drop table c_user_history;
 
 drop table if exists c_user;
-drop sequence if exists c_user_seq;
+
+drop table if exists tx_user;
+
+drop table if exists g_user;
+
+drop table if exists em_user;
 
 drop table if exists oto_user;
-drop sequence if exists oto_user_seq;
 
 drop table if exists em_user_role;
 
 drop table if exists vehicle;
-drop sequence if exists vehicle_seq;
 
 drop table if exists vehicle_driver;
-drop sequence if exists vehicle_driver_seq;
 
 drop table if exists warehouses;
-drop sequence if exists warehouses_seq;
 
 drop table if exists warehousesshippingzones;
 
 drop table if exists sa_wheel;
-drop sequence if exists sa_wheel_seq;
-
-drop table if exists sp_car_wheel;
-drop sequence if exists sp_car_wheel_seq;
 
 drop table if exists wheel;
-drop sequence if exists wheel_seq;
+
+drop table if exists sp_car_wheel;
+
+drop table if exists g_who_props_otm;
 
 drop table if exists with_zero;
-drop sequence if exists with_zero_seq;
 
 drop table if exists parent;
-drop sequence if exists parent_seq;
 
 drop table if exists wview;
 
 drop table if exists zones;
-drop sequence if exists zones_seq;
 
+drop index ix_contact_last_name_first_name on contact;
+drop index ix_e_basic_name on e_basic;
diff --git a/src/test/ddl-review/mysql-create-all.sql b/src/test/ddl-review/mysql-create-all.sql
index 974b5461d..67fd4e368 100644
--- a/src/test/ddl-review/mysql-create-all.sql
+++ b/src/test/ddl-review/mysql-create-all.sql
@@ -1,3 +1,4 @@
+-- Generated by ebean unknown at 2018-03-08T06:38:18.344Z
 create table asimple_bean (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -21,6 +22,24 @@ create table oto_account (
   constraint pk_oto_account primary key (id)
 );
 
+create table addr (
+  id                            bigint auto_increment not null,
+  employee_id                   bigint,
+  name                          varchar(255),
+  address_line1                 varchar(255),
+  address_line2                 varchar(255),
+  city                          varchar(255),
+  version                       bigint not null,
+  constraint pk_addr primary key (id)
+);
+
+create table address (
+  oid                           bigint auto_increment not null,
+  street                        varchar(255),
+  version                       integer not null,
+  constraint pk_address primary key (oid)
+);
+
 create table o_address (
   id                            smallint auto_increment not null,
   line_1                        varchar(100),
@@ -32,22 +51,27 @@ create table o_address (
   constraint pk_o_address primary key (id)
 );
 
-create table address (
-  oid                           bigint auto_increment not null,
-  street                        varchar(255),
-  version                       integer not null,
-  constraint pk_address primary key (oid)
+create table album (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  cover_id                      bigint,
+  deleted                       tinyint(1) default 0 not null,
+  created_at                    datetime(6) not null,
+  last_update                   datetime(6) not null,
+  constraint uq_album_cover_id unique (cover_id),
+  constraint pk_album primary key (id)
 );
 
-create table animals (
-  species                       varchar(31) not null,
+create table animal (
+  species                       varchar(255) not null,
   id                            bigint auto_increment not null,
   shelter_id                    bigint,
   version                       bigint not null,
   name                          varchar(255),
   registration_number           varchar(255),
   date_of_birth                 date,
-  constraint pk_animals primary key (id)
+  dog_size                      varchar(255),
+  constraint pk_animal primary key (id)
 );
 
 create table animal_shelter (
@@ -114,9 +138,45 @@ create table bsimple_with_gen (
   constraint pk_bsimple_with_gen primary key (id)
 );
 
+create table bsite (
+  id                            varchar(40) not null,
+  name                          varchar(255),
+  constraint pk_bsite primary key (id)
+);
+
+create table bsite_user (
+  site_id                       varchar(40) not null,
+  user_id                       varchar(40) not null,
+  access_level                  integer,
+  constraint ck_bsite_user_access_level check ( access_level in (0,1,2)),
+  constraint pk_bsite_user primary key (site_id,user_id)
+);
+
+create table bsite_user_b (
+  site                          varchar(40) not null,
+  usr                           varchar(40) not null,
+  access_level                  integer,
+  constraint ck_bsite_user_b_access_level check ( access_level in (0,1,2)),
+  constraint pk_bsite_user_b primary key (site,usr)
+);
+
+create table bsite_user_c (
+  site_uid                      varchar(40) not null,
+  user_uid                      varchar(40) not null,
+  access_level                  integer,
+  constraint ck_bsite_user_c_access_level check ( access_level in (0,1,2)),
+  constraint pk_bsite_user_c primary key (site_uid,user_uid)
+);
+
+create table buser (
+  id                            varchar(40) not null,
+  name                          varchar(255),
+  constraint pk_buser primary key (id)
+);
+
 create table bwith_qident (
   id                            integer auto_increment not null,
-  `Name`                        varchar(255),
+  `Name`                        varchar(191),
   last_updated                  datetime(6) not null,
   constraint uq_bwith_qident_name unique (`Name`),
   constraint pk_bwith_qident primary key (id)
@@ -125,6 +185,7 @@ create table bwith_qident (
 create table basic_joda_entity (
   id                            bigint auto_increment not null,
   name                          varchar(255),
+  period                        varchar(50),
   created                       datetime(6) not null,
   updated                       datetime(6) not null,
   version                       datetime(6) not null,
@@ -140,14 +201,29 @@ create table bean_with_time_zone (
 
 create table drel_booking (
   id                            bigint auto_increment not null,
+  booking_uid                   bigint,
   agent_invoice                 bigint,
   client_invoice                bigint,
   version                       integer not null,
+  constraint uq_drel_booking_booking_uid unique (booking_uid),
   constraint uq_drel_booking_agent_invoice unique (agent_invoice),
   constraint uq_drel_booking_client_invoice unique (client_invoice),
   constraint pk_drel_booking primary key (id)
 );
 
+create table cinh_root (
+  dtype                         varchar(3) not null,
+  id                            integer auto_increment not null,
+  license_number                varchar(255),
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  driver                        varchar(255),
+  notes                         varchar(255),
+  action                        varchar(255),
+  constraint pk_cinh_root primary key (id)
+);
+
 create table ckey_assoc (
   id                            integer auto_increment not null,
   assoc_one                     varchar(255),
@@ -173,7 +249,7 @@ create table ckey_parent (
 
 create table calculation_result (
   id                            integer auto_increment not null,
-  charge                        double,
+  charge                        double not null,
   product_configuration_id      integer,
   group_configuration_id        integer,
   constraint pk_calculation_result primary key (id)
@@ -208,6 +284,7 @@ create table sp_car_car_wheels (
 create table car_accessory (
   id                            integer auto_increment not null,
   name                          varchar(255),
+  fuse_id                       bigint not null,
   car_id                        integer,
   cretime                       datetime(6) not null,
   updtime                       datetime(6) not null,
@@ -215,8 +292,33 @@ create table car_accessory (
   constraint pk_car_accessory primary key (id)
 );
 
+create table car_fuse (
+  id                            bigint auto_increment not null,
+  location_code                 varchar(255),
+  constraint pk_car_fuse primary key (id)
+);
+
+create table category (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  surveyobjectid                bigint,
+  sequence_number               integer not null,
+  constraint pk_category primary key (id)
+);
+
+create table child_person (
+  identifier                    integer auto_increment not null,
+  name                          varchar(255),
+  age                           integer,
+  some_bean_id                  integer,
+  parent_identifier             integer,
+  family_name                   varchar(255),
+  address                       varchar(255),
+  constraint pk_child_person primary key (identifier)
+);
+
 create table configuration (
-  type                          varchar(31) not null,
+  type                          varchar(21) not null,
   id                            integer auto_increment not null,
   name                          varchar(255),
   configurations_id             integer,
@@ -233,8 +335,8 @@ create table configurations (
 
 create table contact (
   id                            integer auto_increment not null,
-  first_name                    varchar(255),
-  last_name                     varchar(255),
+  first_name                    varchar(127),
+  last_name                     varchar(127),
   phone                         varchar(255),
   mobile                        varchar(255),
   email                         varchar(255),
@@ -268,7 +370,7 @@ create table contact_note (
 create table c_conversation (
   id                            bigint auto_increment not null,
   title                         varchar(255),
-  isopen                        tinyint(1) default 0,
+  isopen                        tinyint(1) default 0 not null,
   group_id                      bigint,
   version                       bigint not null,
   when_created                  datetime(6) not null,
@@ -282,26 +384,44 @@ create table o_country (
   constraint pk_o_country primary key (code)
 );
 
+create table cover (
+  id                            bigint auto_increment not null,
+  s3url                         varchar(255),
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_cover primary key (id)
+);
+
 create table o_customer (
   id                            integer auto_increment not null,
-  status                        varchar(1),
+  status                        varchar(1) comment 'status of the customer',
   name                          varchar(40) not null,
-  smallnote                     varchar(100),
-  anniversary                   date,
+  smallnote                     varchar(100) comment 'Short notes regarding the customer',
+  anniversary                   date comment 'Join date of the customer',
   billing_address_id            smallint,
   shipping_address_id           smallint,
   cretime                       datetime(6) not null,
   updtime                       datetime(6) not null,
   version                       bigint not null,
-  constraint ck_o_customer_status check (status in ('N','A','I')),
+  constraint ck_o_customer_status check ( status in ('N','A','I')),
   constraint pk_o_customer primary key (id)
+) comment='Holds external customers';
+
+create table dcredit (
+  id                            bigint auto_increment not null,
+  credit                        varchar(255),
+  constraint pk_dcredit primary key (id)
+);
+
+create table dcredit_drol (
+  dcredit_id                    bigint not null,
+  drol_id                       bigint not null,
+  constraint pk_dcredit_drol primary key (dcredit_id,drol_id)
 );
 
 create table dexh_entity (
   oid                           bigint auto_increment not null,
-  exhange_rate                  decimal(38),
-  exhange_cmoney_amount         decimal(38),
-  exhange_cmoney_currency       varchar(3),
+  exhange                       varchar(255),
+  an_enum_type                  varchar(255),
   last_updated                  datetime(6) not null,
   constraint pk_dexh_entity primary key (oid)
 );
@@ -311,29 +431,197 @@ create table dperson (
   first_name                    varchar(255),
   last_name                     varchar(255),
   salary                        decimal(38),
-  a_amt                         decimal(38),
-  a_curr                        varchar(3),
-  i_start                       datetime(6),
-  i_end                         datetime(6),
   constraint pk_dperson primary key (id)
 );
 
+create table drol (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_drol primary key (id)
+);
+
+create table drot (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_drot primary key (id)
+);
+
+create table drot_drol (
+  drot_id                       bigint not null,
+  drol_id                       bigint not null,
+  constraint pk_drot_drol primary key (drot_id,drol_id)
+);
+
 create table rawinherit_data (
   id                            bigint auto_increment not null,
   val                           integer,
   constraint pk_rawinherit_data primary key (id)
 );
 
+create table dfk_cascade (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  one_id                        bigint,
+  constraint pk_dfk_cascade primary key (id)
+);
+
+create table dfk_cascade_one (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_dfk_cascade_one primary key (id)
+);
+
+create table dfk_none (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  one_id                        bigint,
+  constraint pk_dfk_none primary key (id)
+);
+
+create table dfk_none_via_join (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  one_id                        bigint,
+  constraint pk_dfk_none_via_join primary key (id)
+);
+
+create table dfk_one (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_dfk_one primary key (id)
+);
+
+create table dfk_set_null (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  one_id                        bigint,
+  constraint pk_dfk_set_null primary key (id)
+);
+
+create table doc (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_doc primary key (id)
+);
+
+create table doc_link (
+  doc_id                        bigint not null,
+  link_id                       bigint not null,
+  constraint pk_doc_link primary key (doc_id,link_id)
+);
+
+create table doc_link_draft (
+  doc_id                        bigint not null,
+  link_id                       bigint not null,
+  constraint pk_doc_link_draft primary key (doc_id,link_id)
+);
+
+create table doc_draft (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_doc_draft primary key (id)
+);
+
+create table document (
+  id                            bigint auto_increment not null,
+  title                         varchar(127),
+  body                          varchar(255),
+  organisation_id               bigint,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint uq_document_title unique (title),
+  constraint pk_document primary key (id)
+);
+
+create table document_draft (
+  id                            bigint auto_increment not null,
+  title                         varchar(127),
+  body                          varchar(255),
+  when_publish                  datetime(6),
+  organisation_id               bigint,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint uq_document_draft_title unique (title),
+  constraint pk_document_draft primary key (id)
+);
+
+create table document_media (
+  id                            bigint auto_increment not null,
+  document_id                   bigint,
+  name                          varchar(255),
+  description                   varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_document_media primary key (id)
+);
+
+create table document_media_draft (
+  id                            bigint auto_increment not null,
+  document_id                   bigint,
+  name                          varchar(255),
+  description                   varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_document_media_draft primary key (id)
+);
+
+create table earray_bean (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  phone_numbers                 varchar(300),
+  uids                          varchar(1000),
+  other_ids                     varchar(1000),
+  doubs                         varchar(1000),
+  statuses                      varchar(1000),
+  status2                       varchar(1000),
+  version                       bigint not null,
+  constraint pk_earray_bean primary key (id)
+);
+
+create table earray_set_bean (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  phone_numbers                 varchar(300),
+  uids                          varchar(1000),
+  other_ids                     varchar(1000),
+  doubs                         varchar(1000),
+  version                       bigint not null,
+  constraint pk_earray_set_bean primary key (id)
+);
+
 create table e_basic (
   id                            integer auto_increment not null,
   status                        varchar(1),
-  name                          varchar(255),
+  name                          varchar(127),
   description                   varchar(255),
   some_date                     datetime(6),
-  constraint ck_e_basic_status check (status in ('N','A','I')),
+  constraint ck_e_basic_status check ( status in ('N','A','I')),
   constraint pk_e_basic primary key (id)
 );
 
+create table ebasic_change_log (
+  id                            bigint auto_increment not null,
+  name                          varchar(20),
+  short_description             varchar(50),
+  long_description              varchar(100),
+  who_created                   varchar(255) not null,
+  who_modified                  varchar(255) not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  version                       bigint not null,
+  constraint pk_ebasic_change_log primary key (id)
+);
+
 create table ebasic_clob (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -364,6 +652,7 @@ create table e_basicenc (
   name                          varchar(255),
   description                   varbinary(80),
   dob                           varbinary(20),
+  status                        varbinary(20),
   last_update                   datetime(6),
   constraint pk_e_basicenc primary key (id)
 );
@@ -382,10 +671,41 @@ create table e_basic_enum_id (
   status                        varchar(1) not null,
   name                          varchar(255),
   description                   varchar(255),
-  constraint ck_e_basic_enum_id_status check (status in ('N','A','I')),
+  constraint ck_e_basic_enum_id_status check ( status in ('N','A','I')),
   constraint pk_e_basic_enum_id primary key (status)
 );
 
+create table e_basic_eni (
+  id                            integer auto_increment not null,
+  status                        integer,
+  name                          varchar(255),
+  description                   varchar(255),
+  some_date                     datetime(6),
+  constraint ck_e_basic_eni_status check ( status in (1,2,3)),
+  constraint pk_e_basic_eni primary key (id)
+);
+
+create table ebasic_hstore (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  map                           varchar(800),
+  version                       bigint not null,
+  constraint pk_ebasic_hstore primary key (id)
+);
+
+create table ebasic_json_list (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  bean_set                      varchar(700),
+  bean_list                     longtext,
+  bean_map                      varchar(700),
+  plain_bean                    varchar(500),
+  flags                         varchar(50),
+  tags                          varchar(100),
+  version                       bigint not null,
+  constraint pk_ebasic_json_list primary key (id)
+);
+
 create table ebasic_json_map (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -410,6 +730,15 @@ create table ebasic_json_map_clob (
   constraint pk_ebasic_json_map_clob primary key (id)
 );
 
+create table ebasic_json_map_detail (
+  id                            bigint auto_increment not null,
+  owner_id                      bigint,
+  name                          varchar(255),
+  content                       longtext,
+  version                       bigint not null,
+  constraint pk_ebasic_json_map_detail primary key (id)
+);
+
 create table ebasic_json_map_json_b (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -458,12 +787,47 @@ create table ebasic_json_node_varchar (
   constraint pk_ebasic_json_node_varchar primary key (id)
 );
 
+create table ebasic_json_unmapped (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ebasic_json_unmapped primary key (id)
+);
+
 create table e_basic_ndc (
   id                            integer auto_increment not null,
   name                          varchar(255),
   constraint pk_e_basic_ndc primary key (id)
 );
 
+create table ebasic_no_sdchild (
+  id                            bigint auto_increment not null,
+  owner_id                      bigint not null,
+  child_name                    varchar(255),
+  amount                        bigint not null,
+  version                       bigint not null,
+  constraint pk_ebasic_no_sdchild primary key (id)
+);
+
+create table ebasic_sdchild (
+  id                            bigint auto_increment not null,
+  owner_id                      bigint not null,
+  child_name                    varchar(255),
+  amount                        bigint not null,
+  version                       bigint not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_ebasic_sdchild primary key (id)
+);
+
+create table ebasic_soft_delete (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  version                       bigint not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_ebasic_soft_delete primary key (id)
+);
+
 create table e_basicver (
   id                            integer auto_increment not null,
   name                          varchar(255),
@@ -476,21 +840,36 @@ create table e_basicver (
 create table e_basic_withlife (
   id                            bigint auto_increment not null,
   name                          varchar(255),
+  deleted                       tinyint(1) default 0 not null,
   version                       bigint not null,
   constraint pk_e_basic_withlife primary key (id)
 );
 
 create table e_basicverucon (
   id                            integer auto_increment not null,
-  name                          varchar(255),
-  other                         varchar(255),
-  other_one                     varchar(255),
+  name                          varchar(127),
+  other                         varchar(127),
+  other_one                     varchar(127),
   description                   varchar(255),
   last_update                   datetime(6) not null,
   constraint uq_e_basicverucon_name unique (name),
+  constraint uq_e_basicverucon_other_other_one unique (other,other_one),
   constraint pk_e_basicverucon primary key (id)
 );
 
+create table e_col_ab (
+  id                            bigint auto_increment not null,
+  column_a                      varchar(255),
+  column_b                      varchar(255),
+  constraint pk_e_col_ab primary key (id)
+);
+
+create table ecustom_id (
+  id                            varchar(127) not null,
+  name                          varchar(255),
+  constraint pk_ecustom_id primary key (id)
+);
+
 create table eemb_inner (
   id                            integer auto_increment not null,
   nome_inner                    varchar(255),
@@ -522,6 +901,8 @@ create table egen_props (
   odt_updated                   datetime(6) not null,
   zdt_created                   datetime(6) not null,
   zdt_updated                   datetime(6) not null,
+  instant_created               datetime(6) not null,
+  instant_updated               datetime(6) not null,
   long_created                  bigint not null,
   long_updated                  bigint not null,
   constraint pk_egen_props primary key (id)
@@ -535,11 +916,15 @@ create table einvoice (
   ship_street                   varchar(255),
   ship_suburb                   varchar(255),
   ship_city                     varchar(255),
-  street                        varchar(255),
-  suburb                        varchar(255),
-  city                          varchar(255),
+  ship_status                   varchar(3),
+  bill_street                   varchar(255),
+  bill_suburb                   varchar(255),
+  bill_city                     varchar(255),
+  bill_status                   varchar(3),
   version                       bigint not null,
-  constraint ck_einvoice_state check (state in (0,1,2)),
+  constraint ck_einvoice_state check ( state in (0,1,2)),
+  constraint ck_einvoice_ship_status check ( ship_status in ('ONE','TWO')),
+  constraint ck_einvoice_bill_status check ( bill_status in ('ONE','TWO')),
   constraint pk_einvoice primary key (id)
 );
 
@@ -599,17 +984,130 @@ create table eperson (
   notes                         varchar(255),
   street                        varchar(255),
   suburb                        varchar(255),
-  city                          varchar(255),
+  addr_city                     varchar(255),
+  addr_status                   varchar(3),
   version                       bigint not null,
+  constraint ck_eperson_addr_status check ( addr_status in ('ONE','TWO')),
   constraint pk_eperson primary key (id)
 );
 
+create table e_person_online (
+  id                            bigint auto_increment not null,
+  email                         varchar(127),
+  online_status                 tinyint(1) default 0 not null,
+  when_updated                  datetime(6) not null,
+  constraint uq_e_person_online_email unique (email),
+  constraint pk_e_person_online primary key (id)
+);
+
 create table esimple (
   usertypeid                    integer auto_increment not null,
   name                          varchar(255),
   constraint pk_esimple primary key (usertypeid)
 );
 
+create table esoft_del_book (
+  id                            bigint auto_increment not null,
+  book_title                    varchar(255),
+  lend_by_id                    bigint,
+  version                       bigint not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_esoft_del_book primary key (id)
+);
+
+create table esoft_del_book_esoft_del_user (
+  esoft_del_book_id             bigint not null,
+  esoft_del_user_id             bigint not null,
+  constraint pk_esoft_del_book_esoft_del_user primary key (esoft_del_book_id,esoft_del_user_id)
+);
+
+create table esoft_del_down (
+  id                            bigint auto_increment not null,
+  esoft_del_mid_id              bigint not null,
+  down                          varchar(255),
+  version                       bigint not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_esoft_del_down primary key (id)
+);
+
+create table esoft_del_mid (
+  id                            bigint auto_increment not null,
+  top_id                        bigint,
+  mid                           varchar(255),
+  up_id                         bigint,
+  version                       bigint not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_esoft_del_mid primary key (id)
+);
+
+create table esoft_del_one_a (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  oneb_id                       bigint,
+  deleted                       tinyint(1) default 0 not null,
+  version                       bigint not null,
+  constraint uq_esoft_del_one_a_oneb_id unique (oneb_id),
+  constraint pk_esoft_del_one_a primary key (id)
+);
+
+create table esoft_del_one_b (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_esoft_del_one_b primary key (id)
+);
+
+create table esoft_del_role (
+  id                            bigint auto_increment not null,
+  role_name                     varchar(255),
+  version                       bigint not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_esoft_del_role primary key (id)
+);
+
+create table esoft_del_role_esoft_del_user (
+  esoft_del_role_id             bigint not null,
+  esoft_del_user_id             bigint not null,
+  constraint pk_esoft_del_role_esoft_del_user primary key (esoft_del_role_id,esoft_del_user_id)
+);
+
+create table esoft_del_top (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_esoft_del_top primary key (id)
+);
+
+create table esoft_del_up (
+  id                            bigint auto_increment not null,
+  up                            varchar(255),
+  version                       bigint not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_esoft_del_up primary key (id)
+);
+
+create table esoft_del_user (
+  id                            bigint auto_increment not null,
+  user_name                     varchar(255),
+  version                       bigint not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_esoft_del_user primary key (id)
+);
+
+create table esoft_del_user_esoft_del_role (
+  esoft_del_user_id             bigint not null,
+  esoft_del_role_id             bigint not null,
+  constraint pk_esoft_del_user_esoft_del_role primary key (esoft_del_user_id,esoft_del_role_id)
+);
+
+create table esome_convert_type (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  money                         decimal(38),
+  constraint pk_esome_convert_type primary key (id)
+);
+
 create table esome_type (
   id                            integer auto_increment not null,
   currency                      varchar(3),
@@ -624,6 +1122,14 @@ create table etrans_many (
   constraint pk_etrans_many primary key (id)
 );
 
+create table rawinherit_uncle (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  parent_id                     bigint not null,
+  version                       bigint not null,
+  constraint pk_rawinherit_uncle primary key (id)
+);
+
 create table evanilla_collection (
   id                            integer auto_increment not null,
   name                          varchar(255),
@@ -640,11 +1146,11 @@ create table evanilla_collection_detail (
 create table ewho_props (
   id                            bigint auto_increment not null,
   name                          varchar(255),
-  who_created                   varchar(255) not null,
-  who_modified                  varchar(255) not null,
   version                       bigint not null,
   when_created                  datetime(6) not null,
   when_modified                 datetime(6) not null,
+  who_created                   varchar(255) not null,
+  who_modified                  varchar(255) not null,
   constraint pk_ewho_props primary key (id)
 );
 
@@ -671,6 +1177,14 @@ create table td_parent (
   constraint pk_td_parent primary key (parent_id)
 );
 
+create table empl (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  age                           integer,
+  default_address_id            bigint,
+  constraint pk_empl primary key (id)
+);
+
 create table feature_desc (
   id                            integer auto_increment not null,
   name                          varchar(255),
@@ -709,9 +1223,27 @@ create table gen_key_table (
   constraint pk_gen_key_table primary key (id)
 );
 
+create table grand_parent_person (
+  identifier                    integer auto_increment not null,
+  name                          varchar(255),
+  age                           integer,
+  some_bean_id                  integer,
+  family_name                   varchar(255),
+  address                       varchar(255),
+  constraint pk_grand_parent_person primary key (identifier)
+);
+
+create table survey_group (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  categoryobjectid              bigint,
+  sequence_number               integer not null,
+  constraint pk_survey_group primary key (id)
+);
+
 create table c_group (
   id                            bigint auto_increment not null,
-  inactive                      tinyint(1) default 0,
+  inactive                      tinyint(1) default 0 not null,
   name                          varchar(255),
   version                       bigint not null,
   when_created                  datetime(6) not null,
@@ -719,6 +1251,58 @@ create table c_group (
   constraint pk_c_group primary key (id)
 );
 
+create table he_doc (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_he_doc primary key (id)
+);
+
+create table hx_link (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  location                      varchar(255),
+  comments                      varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_hx_link primary key (id)
+);
+
+create table hx_link_doc (
+  hx_link_id                    bigint not null,
+  he_doc_id                     bigint not null,
+  constraint pk_hx_link_doc primary key (hx_link_id,he_doc_id)
+);
+
+create table hi_doc (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_hi_doc primary key (id)
+);
+
+create table hi_link (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  location                      varchar(255),
+  comments                      varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_hi_link primary key (id)
+);
+
+create table hi_link_doc (
+  hi_link_id                    bigint not null,
+  hi_doc_id                     bigint not null,
+  constraint pk_hi_link_doc primary key (hi_link_id,hi_doc_id)
+);
+
 create table imrelated (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -727,17 +1311,17 @@ create table imrelated (
 );
 
 create table imroot (
-  dtype                         varchar(10) not null,
+  dtype                         varchar(31) not null,
   id                            bigint auto_increment not null,
+  name                          varchar(255),
   title                         varchar(255),
   when_title                    datetime(6),
-  name                          varchar(255),
   constraint pk_imroot primary key (id)
 );
 
 create table ixresource (
   dtype                         varchar(255),
-  id                            binary(16) not null,
+  id                            varchar(40) not null,
   name                          varchar(255),
   constraint pk_ixresource primary key (id)
 );
@@ -783,11 +1367,11 @@ create table drel_invoice (
 
 create table item (
   customer                      integer not null,
-  itemnumber                    varchar(255) not null,
+  itemnumber                    varchar(127) not null,
   description                   varchar(255),
   units                         varchar(255),
-  type                          integer,
-  region                        integer,
+  type                          integer not null,
+  region                        integer not null,
   date_modified                 datetime(6),
   date_created                  datetime(6),
   modified_by                   varchar(255),
@@ -796,6 +1380,54 @@ create table item (
   constraint pk_item primary key (customer,itemnumber)
 );
 
+create table monkey (
+  mid                           bigint auto_increment not null,
+  name                          varchar(255),
+  food_preference               varchar(255),
+  version                       bigint not null,
+  constraint pk_monkey primary key (mid)
+);
+
+create table trainer (
+  tid                           bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_trainer primary key (tid)
+);
+
+create table trainer_monkey (
+  trainer_tid                   bigint not null,
+  monkey_mid                    bigint not null,
+  constraint uq_trainer_monkey_mid unique (monkey_mid),
+  constraint pk_trainer_monkey primary key (trainer_tid,monkey_mid)
+);
+
+create table troop (
+  pid                           bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_troop primary key (pid)
+);
+
+create table troop_monkey (
+  troop_pid                     bigint not null,
+  monkey_mid                    bigint not null,
+  constraint uq_troop_monkey_mid unique (monkey_mid),
+  constraint pk_troop_monkey primary key (troop_pid,monkey_mid)
+);
+
+create table l2_cldf_reset_bean (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_l2_cldf_reset_bean primary key (id)
+);
+
+create table l2_cldf_reset_bean_child (
+  id                            bigint auto_increment not null,
+  parent_id                     bigint,
+  constraint pk_l2_cldf_reset_bean_child primary key (id)
+);
+
 create table level1 (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -838,6 +1470,33 @@ create table level4 (
   constraint pk_level4 primary key (id)
 );
 
+create table link (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  location                      varchar(255),
+  when_publish                  datetime(6),
+  link_comment                  varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_link primary key (id)
+);
+
+create table link_draft (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  location                      varchar(255),
+  when_publish                  datetime(6),
+  link_comment                  varchar(255),
+  dirty                         tinyint(1) default 0 not null,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_link_draft primary key (id)
+);
+
 create table la_attr_value (
   id                            integer auto_increment not null,
   name                          varchar(255),
@@ -866,7 +1525,7 @@ create table non_updateprop (
   non_enum                      varchar(5),
   name                          varchar(255),
   note                          varchar(255),
-  constraint ck_non_updateprop_non_enum check (non_enum in ('BEGIN','END')),
+  constraint ck_non_updateprop_non_enum check ( non_enum in ('BEGIN','END')),
   constraint pk_non_updateprop primary key (id)
 );
 
@@ -889,7 +1548,7 @@ create table mprinter (
 
 create table mprinter_state (
   id                            bigint auto_increment not null,
-  flags                         bigint,
+  flags                         bigint not null,
   printer_id                    bigint,
   version                       bigint not null,
   constraint pk_mprinter_state primary key (id)
@@ -939,6 +1598,32 @@ create table muser_type (
   constraint pk_muser_type primary key (id)
 );
 
+create table mail_box (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_mail_box primary key (id)
+);
+
+create table mail_user (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_mail_user primary key (id)
+);
+
+create table mail_user_inbox (
+  mail_user_id                  bigint not null,
+  mail_box_id                   bigint not null,
+  constraint pk_mail_user_inbox primary key (mail_user_id,mail_box_id)
+);
+
+create table mail_user_outbox (
+  mail_user_id                  bigint not null,
+  mail_box_id                   bigint not null,
+  constraint pk_mail_user_outbox primary key (mail_user_id,mail_box_id)
+);
+
 create table map_super_actual (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -979,6 +1664,53 @@ create table mnoc_user_mnoc_role (
   constraint pk_mnoc_user_mnoc_role primary key (mnoc_user_user_id,mnoc_role_role_id)
 );
 
+create table mny_a (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_mny_a primary key (id)
+);
+
+create table mny_b (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  a_id                          bigint,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_mny_b primary key (id)
+);
+
+create table mny_b_mny_c (
+  mny_b_id                      bigint not null,
+  mny_c_id                      bigint not null,
+  constraint pk_mny_b_mny_c primary key (mny_b_id,mny_c_id)
+);
+
+create table mny_c (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_mny_c primary key (id)
+);
+
+create table mny_topic (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_mny_topic primary key (id)
+);
+
+create table subtopics (
+  topic                         bigint not null,
+  subtopic                      bigint not null,
+  constraint pk_subtopics primary key (topic,subtopic)
+);
+
 create table mp_role (
   id                            bigint auto_increment not null,
   mp_user_id                    bigint not null,
@@ -993,10 +1725,38 @@ create table mp_user (
   constraint pk_mp_user primary key (id)
 );
 
+create table ms_many_a (
+  aid                           bigint auto_increment not null,
+  name                          varchar(255),
+  ms_many_a_many_b              tinyint(1) default 0 not null,
+  ms_many_b                     tinyint(1) default 0 not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_ms_many_a primary key (aid)
+);
+
+create table ms_many_a_many_b (
+  ms_many_a_aid                 bigint not null,
+  ms_many_b_bid                 bigint not null,
+  constraint pk_ms_many_a_many_b primary key (ms_many_a_aid,ms_many_b_bid)
+);
+
+create table ms_many_b (
+  bid                           bigint auto_increment not null,
+  name                          varchar(255),
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_ms_many_b primary key (bid)
+);
+
+create table ms_many_b_many_a (
+  ms_many_b_bid                 bigint not null,
+  ms_many_a_aid                 bigint not null,
+  constraint pk_ms_many_b_many_a primary key (ms_many_b_bid,ms_many_a_aid)
+);
+
 create table my_lob_size (
   id                            integer auto_increment not null,
   name                          varchar(255),
-  my_count                      integer,
+  my_count                      integer not null,
   my_lob                        longtext,
   constraint pk_my_lob_size primary key (id)
 );
@@ -1033,6 +1793,23 @@ create table o_cached_bean_child (
   constraint pk_o_cached_bean_child primary key (id)
 );
 
+create table o_cached_natkey (
+  id                            bigint auto_increment not null,
+  store                         varchar(255),
+  sku                           varchar(255),
+  description                   varchar(255),
+  constraint pk_o_cached_natkey primary key (id)
+);
+
+create table o_cached_natkey3 (
+  id                            bigint auto_increment not null,
+  store                         varchar(255),
+  code                          integer not null,
+  sku                           varchar(255),
+  description                   varchar(255),
+  constraint pk_o_cached_natkey3 primary key (id)
+);
+
 create table ocar (
   id                            integer auto_increment not null,
   vin                           varchar(255),
@@ -1043,8 +1820,18 @@ create table ocar (
   constraint pk_ocar primary key (id)
 );
 
+create table ocompany (
+  id                            integer auto_increment not null,
+  corp_id                       varchar(50),
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  constraint uq_ocompany_corp_id unique (corp_id),
+  constraint pk_ocompany primary key (id)
+);
+
 create table oengine (
-  engine_id                     binary(16) not null,
+  engine_id                     varchar(40) not null,
   short_desc                    varchar(255),
   car_id                        integer,
   version                       integer not null,
@@ -1053,7 +1840,7 @@ create table oengine (
 );
 
 create table ogear_box (
-  id                            binary(16) not null,
+  id                            varchar(40) not null,
   box_desc                      varchar(255),
   box_size                      integer,
   car_id                        integer,
@@ -1062,6 +1849,32 @@ create table ogear_box (
   constraint pk_ogear_box primary key (id)
 );
 
+create table oroad_show_msg (
+  id                            integer auto_increment not null,
+  company_id                    integer not null,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  constraint uq_oroad_show_msg_company_id unique (company_id),
+  constraint pk_oroad_show_msg primary key (id)
+);
+
+create table om_ordered_detail (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  master_id                     bigint,
+  version                       bigint not null,
+  sort_order                    integer,
+  constraint pk_om_ordered_detail primary key (id)
+);
+
+create table om_ordered_master (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_om_ordered_master primary key (id)
+);
+
 create table o_order (
   id                            integer auto_increment not null,
   status                        integer,
@@ -1070,13 +1883,13 @@ create table o_order (
   kcustomer_id                  integer not null,
   cretime                       datetime(6) not null,
   updtime                       datetime(6) not null,
-  constraint ck_o_order_status check (status in (0,1,2,3)),
+  constraint ck_o_order_status check ( status in (0,1,2,3)),
   constraint pk_o_order primary key (id)
 );
 
 create table o_order_detail (
   id                            integer auto_increment not null,
-  order_id                      integer,
+  order_id                      integer not null,
   order_qty                     integer,
   ship_qty                      integer,
   unit_price                    double,
@@ -1087,15 +1900,15 @@ create table o_order_detail (
 );
 
 create table s_orders (
-  uuid                          varchar(255) not null,
+  uuid                          varchar(40) not null,
   constraint pk_s_orders primary key (uuid)
 );
 
 create table s_order_items (
-  uuid                          varchar(255) not null,
+  uuid                          varchar(40) not null,
   product_variant_uuid          varchar(255),
-  order_uuid                    varchar(255),
-  quantity                      integer,
+  order_uuid                    varchar(40),
+  quantity                      integer not null,
   amount                        decimal(38),
   constraint pk_s_order_items primary key (uuid)
 );
@@ -1110,6 +1923,27 @@ create table or_order_ship (
   constraint pk_or_order_ship primary key (id)
 );
 
+create table organisation (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_organisation primary key (id)
+);
+
+create table oto_bchild (
+  master_id                     bigint auto_increment not null,
+  child                         varchar(255),
+  constraint pk_oto_bchild primary key (master_id)
+);
+
+create table oto_bmaster (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_oto_bmaster primary key (id)
+);
+
 create table oto_child (
   id                            integer auto_increment not null,
   name                          varchar(255),
@@ -1118,12 +1952,102 @@ create table oto_child (
   constraint pk_oto_child primary key (id)
 );
 
+create table oto_cust (
+  cid                           bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_cust primary key (cid)
+);
+
+create table oto_cust_address (
+  aid                           bigint auto_increment not null,
+  line1                         varchar(255),
+  line2                         varchar(255),
+  line3                         varchar(255),
+  customer_cid                  bigint,
+  version                       bigint not null,
+  constraint uq_oto_cust_address_customer_cid unique (customer_cid),
+  constraint pk_oto_cust_address primary key (aid)
+);
+
 create table oto_master (
   id                            bigint auto_increment not null,
   name                          varchar(255),
   constraint pk_oto_master primary key (id)
 );
 
+create table oto_prime (
+  pid                           bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_prime primary key (pid)
+);
+
+create table oto_prime_extra (
+  eid                           bigint not null,
+  extra                         varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_prime_extra primary key (eid)
+);
+
+create table oto_th_many (
+  id                            bigint auto_increment not null,
+  oto_th_top_id                 bigint not null,
+  many                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_oto_th_many primary key (id)
+);
+
+create table oto_th_one (
+  id                            bigint auto_increment not null,
+  one                           tinyint(1) default 0 not null,
+  many_id                       bigint,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint uq_oto_th_one_many_id unique (many_id),
+  constraint pk_oto_th_one primary key (id)
+);
+
+create table oto_th_top (
+  id                            bigint auto_increment not null,
+  topp                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_oto_th_top primary key (id)
+);
+
+create table oto_ubprime (
+  pid                           varchar(40) not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_ubprime primary key (pid)
+);
+
+create table oto_ubprime_extra (
+  eid                           varchar(40) not null,
+  extra                         varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_ubprime_extra primary key (eid)
+);
+
+create table oto_uprime (
+  pid                           varchar(40) not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_uprime primary key (pid)
+);
+
+create table oto_uprime_extra (
+  eid                           varchar(40) not null,
+  extra                         varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_uprime_extra primary key (eid)
+);
+
 create table pfile (
   id                            integer auto_increment not null,
   name                          varchar(255),
@@ -1147,7 +2071,7 @@ create table pfile_content (
 );
 
 create table paggview (
-  pview_id                      binary(16),
+  pview_id                      varchar(40),
   amount                        integer not null,
   constraint uq_paggview_pview_id unique (pview_id)
 );
@@ -1178,6 +2102,7 @@ create table rawinherit_parent (
   type                          varchar(31) not null,
   id                            bigint auto_increment not null,
   val                           integer,
+  more                          varchar(255),
   constraint pk_rawinherit_parent primary key (id)
 );
 
@@ -1187,6 +2112,17 @@ create table rawinherit_parent_rawinherit_data (
   constraint pk_rawinherit_parent_rawinherit_data primary key (rawinherit_parent_id,rawinherit_data_id)
 );
 
+create table parent_person (
+  identifier                    integer auto_increment not null,
+  name                          varchar(255),
+  age                           integer,
+  some_bean_id                  integer,
+  parent_identifier             integer,
+  family_name                   varchar(255),
+  address                       varchar(255),
+  constraint pk_parent_person primary key (identifier)
+);
+
 create table c_participation (
   id                            bigint auto_increment not null,
   rating                        integer,
@@ -1196,12 +2132,12 @@ create table c_participation (
   version                       bigint not null,
   when_created                  datetime(6) not null,
   when_modified                 datetime(6) not null,
-  constraint ck_c_participation_type check (type in (0,1)),
+  constraint ck_c_participation_type check ( type in (0,1)),
   constraint pk_c_participation primary key (id)
 );
 
 create table mt_permission (
-  id                            binary(16) not null,
+  id                            varchar(40) not null,
   name                          varchar(255),
   constraint pk_mt_permission primary key (id)
 );
@@ -1248,6 +2184,14 @@ create table phones (
   constraint pk_phones primary key (id)
 );
 
+create table primary_revision (
+  id                            bigint not null,
+  revision                      integer not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_primary_revision primary key (id,revision)
+);
+
 create table o_product (
   id                            integer auto_increment not null,
   sku                           varchar(20),
@@ -1258,29 +2202,37 @@ create table o_product (
 );
 
 create table pp (
-  id                            binary(16) not null,
+  id                            varchar(40) not null,
   name                          varchar(255),
   value                         varchar(100) not null,
   constraint pk_pp primary key (id)
 );
 
 create table pp_to_ww (
-  pp_id                         binary(16) not null,
-  ww_id                         binary(16) not null,
+  pp_id                         varchar(40) not null,
+  ww_id                         varchar(40) not null,
   constraint pk_pp_to_ww primary key (pp_id,ww_id)
 );
 
+create table question (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  groupobjectid                 bigint,
+  sequence_number               integer not null,
+  constraint pk_question primary key (id)
+);
+
 create table rcustomer (
-  company                       varchar(255) not null,
-  name                          varchar(255) not null,
+  company                       varchar(127) not null,
+  name                          varchar(127) not null,
   description                   varchar(255),
   constraint pk_rcustomer primary key (company,name)
 );
 
 create table r_orders (
-  company                       varchar(255) not null,
+  company                       varchar(127) not null,
   order_number                  integer not null,
-  customername                  varchar(255),
+  customername                  varchar(127),
   item                          varchar(255),
   constraint pk_r_orders primary key (company,order_number)
 );
@@ -1300,28 +2252,29 @@ create table resourcefile (
   constraint pk_resourcefile primary key (id)
 );
 
-create table mt_role (
-  id                            binary(16) not null,
-  name                          varchar(50),
-  tenant_id                     binary(16),
-  version                       bigint not null,
-  constraint pk_mt_role primary key (id)
-);
-
-create table mt_role_permission (
-  mt_role_id                    binary(16) not null,
-  mt_permission_id              binary(16) not null,
-  constraint pk_mt_role_permission primary key (mt_role_id,mt_permission_id)
-);
-
 create table em_role (
   id                            bigint auto_increment not null,
   name                          varchar(255),
   constraint pk_em_role primary key (id)
 );
 
+create table mt_role (
+  id                            varchar(40) not null,
+  name                          varchar(50),
+  tenant_id                     varchar(40),
+  version                       bigint not null,
+  constraint pk_mt_role primary key (id)
+);
+
+create table mt_role_permission (
+  mt_role_id                    varchar(40) not null,
+  mt_permission_id              varchar(40) not null,
+  constraint pk_mt_role_permission primary key (mt_role_id,mt_permission_id)
+);
+
 create table f_second (
   id                            bigint auto_increment not null,
+  mod_name                      varchar(255),
   first                         bigint,
   title                         varchar(255),
   constraint uq_f_second_first unique (first),
@@ -1336,7 +2289,7 @@ create table section (
   cretime                       datetime(6) not null,
   updtime                       datetime(6) not null,
   version                       bigint not null,
-  constraint ck_section_type check (type in (0,1)),
+  constraint ck_section_type check ( type in (0,1)),
   constraint pk_section primary key (id)
 );
 
@@ -1366,7 +2319,7 @@ create table some_enum_bean (
   id                            bigint auto_increment not null,
   some_enum                     integer,
   name                          varchar(255),
-  constraint ck_some_enum_bean_some_enum check (some_enum in (0,1)),
+  constraint ck_some_enum_bean_some_enum check ( some_enum in (0,1)),
   constraint pk_some_enum_bean primary key (id)
 );
 
@@ -1391,17 +2344,16 @@ create table some_new_types_bean (
   instant                       datetime(6),
   zone_id                       varchar(60),
   zone_offset                   varchar(60),
+  path                          varchar(255),
+  period                        varchar(20),
   version                       bigint not null,
-  constraint ck_some_new_types_bean_dow check (dow in ('1','2','3','4','5','6','7')),
-  constraint ck_some_new_types_bean_mth check (mth in ('1','2','3','4','5','6','7','8','9','10','11','12')),
+  constraint ck_some_new_types_bean_dow check ( dow in (1,2,3,4,5,6,7)),
+  constraint ck_some_new_types_bean_mth check ( mth in (1,2,3,4,5,6,7,8,9,10,11,12)),
   constraint pk_some_new_types_bean primary key (id)
 );
 
 create table some_period_bean (
   id                            bigint auto_increment not null,
-  period_years                  integer,
-  period_months                 integer,
-  period_days                   integer,
   anniversary                   date,
   version                       bigint not null,
   constraint pk_some_period_bean primary key (id)
@@ -1431,6 +2383,12 @@ create table sub_type (
   constraint pk_sub_type primary key (sub_type_id)
 );
 
+create table survey (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_survey primary key (id)
+);
+
 create table tbytes_only (
   id                            integer auto_increment not null,
   content                       longblob,
@@ -1439,11 +2397,39 @@ create table tbytes_only (
 
 create table tcar (
   type                          varchar(31) not null,
-  plate_no                      varchar(255) not null,
+  plate_no                      varchar(32) not null,
   truckload                     bigint,
   constraint pk_tcar primary key (plate_no)
 );
 
+create table tevent (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_tevent primary key (id)
+);
+
+create table tevent_many (
+  id                            bigint auto_increment not null,
+  description                   varchar(255),
+  event_id                      bigint,
+  units                         integer not null,
+  amount                        double not null,
+  version                       bigint not null,
+  constraint pk_tevent_many primary key (id)
+);
+
+create table tevent_one (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  status                        integer,
+  event_id                      bigint,
+  version                       bigint not null,
+  constraint ck_tevent_one_status check ( status in (0,1)),
+  constraint uq_tevent_one_event_id unique (event_id),
+  constraint pk_tevent_one primary key (id)
+);
+
 create table tint_root (
   my_type                       integer(3) not null,
   id                            integer auto_increment not null,
@@ -1470,7 +2456,7 @@ create table t_oneb (
   id                            integer auto_increment not null,
   name                          varchar(255),
   description                   varchar(255),
-  active                        tinyint(1) default 0,
+  active                        tinyint(1) default 0 not null,
   constraint pk_t_oneb primary key (id)
 );
 
@@ -1478,8 +2464,10 @@ create table t_detail_with_other_namexxxyy (
   id                            integer auto_increment not null,
   name                          varchar(255),
   description                   varchar(255),
-  active                        tinyint(1) default 0,
+  some_unique_value             varchar(127),
+  active                        tinyint(1) default 0 not null,
   master_id                     integer,
+  constraint uq_t_detail_with_other_namexxxyy_some_unique_value unique (some_unique_value),
   constraint pk_t_detail_with_other_namexxxyy primary key (id)
 );
 
@@ -1487,7 +2475,7 @@ create table ts_detail_two (
   id                            integer auto_increment not null,
   name                          varchar(255),
   description                   varchar(255),
-  active                        tinyint(1) default 0,
+  active                        tinyint(1) default 0 not null,
   master_id                     integer,
   constraint pk_ts_detail_two primary key (id)
 );
@@ -1496,7 +2484,7 @@ create table t_atable_thatisrelatively (
   id                            integer auto_increment not null,
   name                          varchar(255),
   description                   varchar(255),
-  active                        tinyint(1) default 0,
+  active                        tinyint(1) default 0 not null,
   constraint pk_t_atable_thatisrelatively primary key (id)
 );
 
@@ -1504,19 +2492,19 @@ create table ts_master_two (
   id                            integer auto_increment not null,
   name                          varchar(255),
   description                   varchar(255),
-  active                        tinyint(1) default 0,
+  active                        tinyint(1) default 0 not null,
   constraint pk_ts_master_two primary key (id)
 );
 
 create table tuuid_entity (
-  id                            binary(16) not null,
+  id                            varchar(40) not null,
   name                          varchar(255),
   constraint pk_tuuid_entity primary key (id)
 );
 
 create table twheel (
   id                            bigint auto_increment not null,
-  owner_plate_no                varchar(255) not null,
+  owner_plate_no                varchar(32) not null,
   constraint pk_twheel primary key (id)
 );
 
@@ -1528,16 +2516,20 @@ create table twith_pre_insert (
 );
 
 create table mt_tenant (
-  id                            binary(16) not null,
+  id                            varchar(40) not null,
   name                          varchar(255),
   version                       bigint not null,
   constraint pk_mt_tenant primary key (id)
 );
 
-create table sa_tire (
-  id                            bigint auto_increment not null,
-  version                       integer not null,
-  constraint pk_sa_tire primary key (id)
+create table test_annotation_base_entity (
+  direct                        varchar(255),
+  meta                          varchar(255),
+  mixed                         varchar(255),
+  constraint_annotation         varchar(40),
+  null1                         varchar(255) not null,
+  null2                         varchar(255),
+  null3                         varchar(255)
 );
 
 create table tire (
@@ -1548,6 +2540,12 @@ create table tire (
   constraint pk_tire primary key (id)
 );
 
+create table sa_tire (
+  id                            bigint auto_increment not null,
+  version                       integer not null,
+  constraint pk_sa_tire primary key (id)
+);
+
 create table trip (
   id                            integer auto_increment not null,
   vehicle_driver_id             integer,
@@ -1575,6 +2573,14 @@ create table type (
   constraint pk_type primary key (customer,type)
 );
 
+create table tz_bean (
+  id                            bigint auto_increment not null,
+  moda                          varchar(255),
+  ts                            datetime(6),
+  tstz                          datetime(6),
+  constraint pk_tz_bean primary key (id)
+);
+
 create table ut_detail (
   id                            integer auto_increment not null,
   utmaster_id                   integer not null,
@@ -1594,22 +2600,29 @@ create table ut_master (
 );
 
 create table uuone (
-  id                            binary(16) not null,
+  id                            varchar(40) not null,
   name                          varchar(255),
   constraint pk_uuone primary key (id)
 );
 
 create table uutwo (
-  id                            binary(16) not null,
+  id                            varchar(40) not null,
   name                          varchar(255),
-  master_id                     binary(16),
+  master_id                     varchar(40),
   constraint pk_uutwo primary key (id)
 );
 
-create table em_user (
+create table c_user (
   id                            bigint auto_increment not null,
+  inactive                      tinyint(1) default 0 not null,
   name                          varchar(255),
-  constraint pk_em_user primary key (id)
+  email                         varchar(255),
+  password_hash                 varchar(255),
+  group_id                      bigint,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_c_user primary key (id)
 );
 
 create table tx_user (
@@ -1618,16 +2631,17 @@ create table tx_user (
   constraint pk_tx_user primary key (id)
 );
 
-create table c_user (
+create table g_user (
   id                            bigint auto_increment not null,
-  inactive                      tinyint(1) default 0,
-  name                          varchar(255),
-  email                         varchar(255),
-  group_id                      bigint,
+  username                      varchar(255),
   version                       bigint not null,
-  when_created                  datetime(6) not null,
-  when_modified                 datetime(6) not null,
-  constraint pk_c_user primary key (id)
+  constraint pk_g_user primary key (id)
+);
+
+create table em_user (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_em_user primary key (id)
 );
 
 create table oto_user (
@@ -1655,10 +2669,13 @@ create table vehicle (
   cretime                       datetime(6) not null,
   updtime                       datetime(6) not null,
   version                       bigint not null,
-  truck_ref_id                  integer,
-  capacity                      double,
+  siz                           varchar(1),
   driver                        varchar(255),
   car_ref_id                    integer,
+  notes                         varchar(255),
+  truck_ref_id                  integer,
+  capacity                      double,
+  constraint ck_vehicle_siz check ( siz in ('S','M','L','H')),
   constraint pk_vehicle primary key (id)
 );
 
@@ -1694,22 +2711,34 @@ create table sa_wheel (
   constraint pk_sa_wheel primary key (id)
 );
 
-create table sp_car_wheel (
-  id                            bigint auto_increment not null,
-  version                       integer not null,
-  constraint pk_sp_car_wheel primary key (id)
-);
-
 create table wheel (
   id                            bigint auto_increment not null,
   version                       integer not null,
   constraint pk_wheel primary key (id)
 );
 
+create table sp_car_wheel (
+  id                            bigint auto_increment not null,
+  version                       integer not null,
+  constraint pk_sp_car_wheel primary key (id)
+);
+
+create table g_who_props_otm (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  who_created_id                bigint,
+  who_modified_id               bigint,
+  constraint pk_g_who_props_otm primary key (id)
+);
+
 create table with_zero (
   id                            bigint auto_increment not null,
   name                          varchar(255),
   parent_id                     integer,
+  lang                          varchar(2) default 'en' not null,
   version                       bigint not null,
   constraint pk_with_zero primary key (id)
 );
@@ -1721,8 +2750,8 @@ create table parent (
 );
 
 create table wview (
-  id                            binary(16) not null,
-  name                          varchar(255) not null,
+  id                            varchar(40) not null,
+  name                          varchar(127) not null,
   constraint uq_wview_name unique (name),
   constraint pk_wview primary key (id)
 );
@@ -1734,133 +2763,288 @@ create table zones (
   constraint pk_zones primary key (id)
 );
 
-alter table bar add constraint fk_bar_foo_id foreign key (foo_id) references foo (foo_id) on delete restrict on update restrict;
+create index ix_contact_last_name_first_name on contact (last_name,first_name);
+create index ix_e_basic_name on e_basic (name);
 create index ix_bar_foo_id on bar (foo_id);
+alter table bar add constraint fk_bar_foo_id foreign key (foo_id) references foo (foo_id) on delete restrict on update restrict;
+
+create index ix_addr_employee_id on addr (employee_id);
+alter table addr add constraint fk_addr_employee_id foreign key (employee_id) references empl (id) on delete restrict on update restrict;
 
-alter table o_address add constraint fk_o_address_country_code foreign key (country_code) references o_country (code) on delete restrict on update restrict;
 create index ix_o_address_country_code on o_address (country_code);
+alter table o_address add constraint fk_o_address_country_code foreign key (country_code) references o_country (code) on delete restrict on update restrict;
 
-alter table animals add constraint fk_animals_shelter_id foreign key (shelter_id) references animal_shelter (id) on delete restrict on update restrict;
-create index ix_animals_shelter_id on animals (shelter_id);
+alter table album add constraint fk_album_cover_id foreign key (cover_id) references cover (id) on delete restrict on update restrict;
+
+create index ix_animal_shelter_id on animal (shelter_id);
+alter table animal add constraint fk_animal_shelter_id foreign key (shelter_id) references animal_shelter (id) on delete restrict on update restrict;
 
-alter table attribute add constraint fk_attribute_attribute_holder_id foreign key (attribute_holder_id) references attribute_holder (id) on delete restrict on update restrict;
 create index ix_attribute_attribute_holder_id on attribute (attribute_holder_id);
+alter table attribute add constraint fk_attribute_attribute_holder_id foreign key (attribute_holder_id) references attribute_holder (id) on delete restrict on update restrict;
 
-alter table bbookmark add constraint fk_bbookmark_user_id foreign key (user_id) references bbookmark_user (id) on delete restrict on update restrict;
 create index ix_bbookmark_user_id on bbookmark (user_id);
+alter table bbookmark add constraint fk_bbookmark_user_id foreign key (user_id) references bbookmark_user (id) on delete restrict on update restrict;
+
+create index ix_bsite_user_site_id on bsite_user (site_id);
+alter table bsite_user add constraint fk_bsite_user_site_id foreign key (site_id) references bsite (id) on delete restrict on update restrict;
+
+create index ix_bsite_user_user_id on bsite_user (user_id);
+alter table bsite_user add constraint fk_bsite_user_user_id foreign key (user_id) references buser (id) on delete restrict on update restrict;
+
+create index ix_bsite_user_b_site on bsite_user_b (site);
+alter table bsite_user_b add constraint fk_bsite_user_b_site foreign key (site) references bsite (id) on delete restrict on update restrict;
+
+create index ix_bsite_user_b_usr on bsite_user_b (usr);
+alter table bsite_user_b add constraint fk_bsite_user_b_usr foreign key (usr) references buser (id) on delete restrict on update restrict;
+
+create index ix_bsite_user_c_site_uid on bsite_user_c (site_uid);
+alter table bsite_user_c add constraint fk_bsite_user_c_site_uid foreign key (site_uid) references bsite (id) on delete restrict on update restrict;
+
+create index ix_bsite_user_c_user_uid on bsite_user_c (user_uid);
+alter table bsite_user_c add constraint fk_bsite_user_c_user_uid foreign key (user_uid) references buser (id) on delete restrict on update restrict;
 
 alter table drel_booking add constraint fk_drel_booking_agent_invoice foreign key (agent_invoice) references drel_invoice (id) on delete restrict on update restrict;
 
 alter table drel_booking add constraint fk_drel_booking_client_invoice foreign key (client_invoice) references drel_invoice (id) on delete restrict on update restrict;
 
-alter table ckey_detail add constraint fk_ckey_detail_ckey_parent foreign key (one_key,two_key) references ckey_parent (one_key,two_key) on delete restrict on update restrict;
-create index ix_ckey_detail_one_key_two_key on ckey_detail (one_key,two_key);
+create index ix_ckey_detail_parent on ckey_detail (one_key,two_key);
+alter table ckey_detail add constraint fk_ckey_detail_parent foreign key (one_key,two_key) references ckey_parent (one_key,two_key) on delete restrict on update restrict;
 
-alter table ckey_parent add constraint fk_ckey_parent_assoc_id foreign key (assoc_id) references ckey_assoc (id) on delete restrict on update restrict;
 create index ix_ckey_parent_assoc_id on ckey_parent (assoc_id);
+alter table ckey_parent add constraint fk_ckey_parent_assoc_id foreign key (assoc_id) references ckey_assoc (id) on delete restrict on update restrict;
 
-alter table calculation_result add constraint fk_calculation_result_product_configuration_id foreign key (product_configuration_id) references configuration (id) on delete restrict on update restrict;
 create index ix_calculation_result_product_configuration_id on calculation_result (product_configuration_id);
+alter table calculation_result add constraint fk_calculation_result_product_configuration_id foreign key (product_configuration_id) references configuration (id) on delete restrict on update restrict;
 
-alter table calculation_result add constraint fk_calculation_result_group_configuration_id foreign key (group_configuration_id) references configuration (id) on delete restrict on update restrict;
 create index ix_calculation_result_group_configuration_id on calculation_result (group_configuration_id);
+alter table calculation_result add constraint fk_calculation_result_group_configuration_id foreign key (group_configuration_id) references configuration (id) on delete restrict on update restrict;
 
+create index ix_sp_car_car_wheels_sp_car_car on sp_car_car_wheels (car);
 alter table sp_car_car_wheels add constraint fk_sp_car_car_wheels_sp_car_car foreign key (car) references sp_car_car (id) on delete restrict on update restrict;
-create index ix_sp_car_car_wheels_car on sp_car_car_wheels (car);
 
+create index ix_sp_car_car_wheels_sp_car_wheel on sp_car_car_wheels (wheel);
 alter table sp_car_car_wheels add constraint fk_sp_car_car_wheels_sp_car_wheel foreign key (wheel) references sp_car_wheel (id) on delete restrict on update restrict;
-create index ix_sp_car_car_wheels_wheel on sp_car_car_wheels (wheel);
 
-alter table car_accessory add constraint fk_car_accessory_car_id foreign key (car_id) references vehicle (id) on delete restrict on update restrict;
+create index ix_car_accessory_fuse_id on car_accessory (fuse_id);
+alter table car_accessory add constraint fk_car_accessory_fuse_id foreign key (fuse_id) references car_fuse (id) on delete restrict on update restrict;
+
 create index ix_car_accessory_car_id on car_accessory (car_id);
+alter table car_accessory add constraint fk_car_accessory_car_id foreign key (car_id) references vehicle (id) on delete restrict on update restrict;
+
+create index ix_category_surveyobjectid on category (surveyobjectid);
+alter table category add constraint fk_category_surveyobjectid foreign key (surveyobjectid) references survey (id) on delete restrict on update restrict;
+
+create index ix_child_person_some_bean_id on child_person (some_bean_id);
+alter table child_person add constraint fk_child_person_some_bean_id foreign key (some_bean_id) references e_basic (id) on delete restrict on update restrict;
+
+create index ix_child_person_parent_identifier on child_person (parent_identifier);
+alter table child_person add constraint fk_child_person_parent_identifier foreign key (parent_identifier) references parent_person (identifier) on delete restrict on update restrict;
 
-alter table configuration add constraint fk_configuration_configurations_id foreign key (configurations_id) references configurations (id) on delete restrict on update restrict;
 create index ix_configuration_configurations_id on configuration (configurations_id);
+alter table configuration add constraint fk_configuration_configurations_id foreign key (configurations_id) references configurations (id) on delete restrict on update restrict;
 
-alter table contact add constraint fk_contact_customer_id foreign key (customer_id) references o_customer (id) on delete restrict on update restrict;
 create index ix_contact_customer_id on contact (customer_id);
+alter table contact add constraint fk_contact_customer_id foreign key (customer_id) references o_customer (id) on delete restrict on update restrict;
 
-alter table contact add constraint fk_contact_group_id foreign key (group_id) references contact_group (id) on delete restrict on update restrict;
 create index ix_contact_group_id on contact (group_id);
+alter table contact add constraint fk_contact_group_id foreign key (group_id) references contact_group (id) on delete restrict on update restrict;
 
-alter table contact_note add constraint fk_contact_note_contact_id foreign key (contact_id) references contact (id) on delete restrict on update restrict;
 create index ix_contact_note_contact_id on contact_note (contact_id);
+alter table contact_note add constraint fk_contact_note_contact_id foreign key (contact_id) references contact (id) on delete restrict on update restrict;
 
-alter table c_conversation add constraint fk_c_conversation_group_id foreign key (group_id) references c_group (id) on delete restrict on update restrict;
 create index ix_c_conversation_group_id on c_conversation (group_id);
+alter table c_conversation add constraint fk_c_conversation_group_id foreign key (group_id) references c_group (id) on delete restrict on update restrict;
 
-alter table o_customer add constraint fk_o_customer_billing_address_id foreign key (billing_address_id) references o_address (id) on delete restrict on update restrict;
 create index ix_o_customer_billing_address_id on o_customer (billing_address_id);
+alter table o_customer add constraint fk_o_customer_billing_address_id foreign key (billing_address_id) references o_address (id) on delete restrict on update restrict;
 
-alter table o_customer add constraint fk_o_customer_shipping_address_id foreign key (shipping_address_id) references o_address (id) on delete restrict on update restrict;
 create index ix_o_customer_shipping_address_id on o_customer (shipping_address_id);
+alter table o_customer add constraint fk_o_customer_shipping_address_id foreign key (shipping_address_id) references o_address (id) on delete restrict on update restrict;
+
+create index ix_dcredit_drol_dcredit on dcredit_drol (dcredit_id);
+alter table dcredit_drol add constraint fk_dcredit_drol_dcredit foreign key (dcredit_id) references dcredit (id) on delete restrict on update restrict;
+
+create index ix_dcredit_drol_drol on dcredit_drol (drol_id);
+alter table dcredit_drol add constraint fk_dcredit_drol_drol foreign key (drol_id) references drol (id) on delete restrict on update restrict;
+
+create index ix_drot_drol_drot on drot_drol (drot_id);
+alter table drot_drol add constraint fk_drot_drol_drot foreign key (drot_id) references drot (id) on delete restrict on update restrict;
+
+create index ix_drot_drol_drol on drot_drol (drol_id);
+alter table drot_drol add constraint fk_drot_drol_drol foreign key (drol_id) references drol (id) on delete restrict on update restrict;
+
+create index ix_dfk_cascade_one_id on dfk_cascade (one_id);
+alter table dfk_cascade add constraint fk_dfk_cascade_one_id foreign key (one_id) references dfk_cascade_one (id) on delete cascade on update cascade;
+
+create index ix_dfk_set_null_one_id on dfk_set_null (one_id);
+alter table dfk_set_null add constraint fk_dfk_set_null_one_id foreign key (one_id) references dfk_one (id) on delete set null on update set null;
+
+alter table doc add constraint fk_doc_id foreign key (id) references doc_draft (id) on delete restrict on update restrict;
+
+create index ix_doc_link_doc on doc_link (doc_id);
+alter table doc_link add constraint fk_doc_link_doc foreign key (doc_id) references doc (id) on delete restrict on update restrict;
+
+create index ix_doc_link_link on doc_link (link_id);
+alter table doc_link add constraint fk_doc_link_link foreign key (link_id) references link (id) on delete restrict on update restrict;
+
+alter table document add constraint fk_document_id foreign key (id) references document_draft (id) on delete restrict on update restrict;
+
+create index ix_document_organisation_id on document (organisation_id);
+alter table document add constraint fk_document_organisation_id foreign key (organisation_id) references organisation (id) on delete restrict on update restrict;
+
+create index ix_document_draft_organisation_id on document_draft (organisation_id);
+alter table document_draft add constraint fk_document_draft_organisation_id foreign key (organisation_id) references organisation (id) on delete restrict on update restrict;
+
+create index ix_document_media_document_id on document_media (document_id);
+alter table document_media add constraint fk_document_media_document_id foreign key (document_id) references document (id) on delete restrict on update restrict;
+
+create index ix_document_media_draft_document_id on document_media_draft (document_id);
+alter table document_media_draft add constraint fk_document_media_draft_document_id foreign key (document_id) references document_draft (id) on delete restrict on update restrict;
+
+create index ix_ebasic_json_map_detail_owner_id on ebasic_json_map_detail (owner_id);
+alter table ebasic_json_map_detail add constraint fk_ebasic_json_map_detail_owner_id foreign key (owner_id) references ebasic_json_map (id) on delete restrict on update restrict;
+
+create index ix_ebasic_no_sdchild_owner_id on ebasic_no_sdchild (owner_id);
+alter table ebasic_no_sdchild add constraint fk_ebasic_no_sdchild_owner_id foreign key (owner_id) references ebasic_soft_delete (id) on delete restrict on update restrict;
+
+create index ix_ebasic_sdchild_owner_id on ebasic_sdchild (owner_id);
+alter table ebasic_sdchild add constraint fk_ebasic_sdchild_owner_id foreign key (owner_id) references ebasic_soft_delete (id) on delete restrict on update restrict;
 
-alter table eemb_inner add constraint fk_eemb_inner_outer_id foreign key (outer_id) references eemb_outer (id) on delete restrict on update restrict;
 create index ix_eemb_inner_outer_id on eemb_inner (outer_id);
+alter table eemb_inner add constraint fk_eemb_inner_outer_id foreign key (outer_id) references eemb_outer (id) on delete restrict on update restrict;
 
-alter table einvoice add constraint fk_einvoice_person_id foreign key (person_id) references eperson (id) on delete restrict on update restrict;
 create index ix_einvoice_person_id on einvoice (person_id);
+alter table einvoice add constraint fk_einvoice_person_id foreign key (person_id) references eperson (id) on delete restrict on update restrict;
 
-alter table enull_collection_detail add constraint fk_enull_collection_detail_enull_collection_id foreign key (enull_collection_id) references enull_collection (id) on delete restrict on update restrict;
 create index ix_enull_collection_detail_enull_collection_id on enull_collection_detail (enull_collection_id);
+alter table enull_collection_detail add constraint fk_enull_collection_detail_enull_collection_id foreign key (enull_collection_id) references enull_collection (id) on delete restrict on update restrict;
 
-alter table eopt_one_a add constraint fk_eopt_one_a_b_id foreign key (b_id) references eopt_one_b (id) on delete restrict on update restrict;
 create index ix_eopt_one_a_b_id on eopt_one_a (b_id);
+alter table eopt_one_a add constraint fk_eopt_one_a_b_id foreign key (b_id) references eopt_one_b (id) on delete restrict on update restrict;
 
-alter table eopt_one_b add constraint fk_eopt_one_b_c_id foreign key (c_id) references eopt_one_c (id) on delete restrict on update restrict;
 create index ix_eopt_one_b_c_id on eopt_one_b (c_id);
+alter table eopt_one_b add constraint fk_eopt_one_b_c_id foreign key (c_id) references eopt_one_c (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_book_lend_by_id on esoft_del_book (lend_by_id);
+alter table esoft_del_book add constraint fk_esoft_del_book_lend_by_id foreign key (lend_by_id) references esoft_del_user (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_book_esoft_del_user_esoft_del_book on esoft_del_book_esoft_del_user (esoft_del_book_id);
+alter table esoft_del_book_esoft_del_user add constraint fk_esoft_del_book_esoft_del_user_esoft_del_book foreign key (esoft_del_book_id) references esoft_del_book (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_book_esoft_del_user_esoft_del_user on esoft_del_book_esoft_del_user (esoft_del_user_id);
+alter table esoft_del_book_esoft_del_user add constraint fk_esoft_del_book_esoft_del_user_esoft_del_user foreign key (esoft_del_user_id) references esoft_del_user (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_down_esoft_del_mid_id on esoft_del_down (esoft_del_mid_id);
+alter table esoft_del_down add constraint fk_esoft_del_down_esoft_del_mid_id foreign key (esoft_del_mid_id) references esoft_del_mid (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_mid_top_id on esoft_del_mid (top_id);
+alter table esoft_del_mid add constraint fk_esoft_del_mid_top_id foreign key (top_id) references esoft_del_top (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_mid_up_id on esoft_del_mid (up_id);
+alter table esoft_del_mid add constraint fk_esoft_del_mid_up_id foreign key (up_id) references esoft_del_up (id) on delete restrict on update restrict;
+
+alter table esoft_del_one_a add constraint fk_esoft_del_one_a_oneb_id foreign key (oneb_id) references esoft_del_one_b (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_role_esoft_del_user_esoft_del_role on esoft_del_role_esoft_del_user (esoft_del_role_id);
+alter table esoft_del_role_esoft_del_user add constraint fk_esoft_del_role_esoft_del_user_esoft_del_role foreign key (esoft_del_role_id) references esoft_del_role (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_role_esoft_del_user_esoft_del_user on esoft_del_role_esoft_del_user (esoft_del_user_id);
+alter table esoft_del_role_esoft_del_user add constraint fk_esoft_del_role_esoft_del_user_esoft_del_user foreign key (esoft_del_user_id) references esoft_del_user (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_user_esoft_del_role_esoft_del_user on esoft_del_user_esoft_del_role (esoft_del_user_id);
+alter table esoft_del_user_esoft_del_role add constraint fk_esoft_del_user_esoft_del_role_esoft_del_user foreign key (esoft_del_user_id) references esoft_del_user (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_user_esoft_del_role_esoft_del_role on esoft_del_user_esoft_del_role (esoft_del_role_id);
+alter table esoft_del_user_esoft_del_role add constraint fk_esoft_del_user_esoft_del_role_esoft_del_role foreign key (esoft_del_role_id) references esoft_del_role (id) on delete restrict on update restrict;
+
+create index ix_rawinherit_uncle_parent_id on rawinherit_uncle (parent_id);
+alter table rawinherit_uncle add constraint fk_rawinherit_uncle_parent_id foreign key (parent_id) references rawinherit_parent (id) on delete restrict on update restrict;
 
-alter table evanilla_collection_detail add constraint fk_evanilla_collection_detail_evanilla_collection_id foreign key (evanilla_collection_id) references evanilla_collection (id) on delete restrict on update restrict;
 create index ix_evanilla_collection_detail_evanilla_collection_id on evanilla_collection_detail (evanilla_collection_id);
+alter table evanilla_collection_detail add constraint fk_evanilla_collection_detail_evanilla_collection_id foreign key (evanilla_collection_id) references evanilla_collection (id) on delete restrict on update restrict;
 
-alter table td_child add constraint fk_td_child_parent_id foreign key (parent_id) references td_parent (parent_id) on delete restrict on update restrict;
 create index ix_td_child_parent_id on td_child (parent_id);
+alter table td_child add constraint fk_td_child_parent_id foreign key (parent_id) references td_parent (parent_id) on delete restrict on update restrict;
+
+create index ix_empl_default_address_id on empl (default_address_id);
+alter table empl add constraint fk_empl_default_address_id foreign key (default_address_id) references addr (id) on delete restrict on update restrict;
+
+create index ix_grand_parent_person_some_bean_id on grand_parent_person (some_bean_id);
+alter table grand_parent_person add constraint fk_grand_parent_person_some_bean_id foreign key (some_bean_id) references e_basic (id) on delete restrict on update restrict;
+
+create index ix_survey_group_categoryobjectid on survey_group (categoryobjectid);
+alter table survey_group add constraint fk_survey_group_categoryobjectid foreign key (categoryobjectid) references category (id) on delete restrict on update restrict;
+
+create index ix_hx_link_doc_hx_link on hx_link_doc (hx_link_id);
+alter table hx_link_doc add constraint fk_hx_link_doc_hx_link foreign key (hx_link_id) references hx_link (id) on delete restrict on update restrict;
+
+create index ix_hx_link_doc_he_doc on hx_link_doc (he_doc_id);
+alter table hx_link_doc add constraint fk_hx_link_doc_he_doc foreign key (he_doc_id) references he_doc (id) on delete restrict on update restrict;
+
+create index ix_hi_link_doc_hi_link on hi_link_doc (hi_link_id);
+alter table hi_link_doc add constraint fk_hi_link_doc_hi_link foreign key (hi_link_id) references hi_link (id) on delete restrict on update restrict;
+
+create index ix_hi_link_doc_hi_doc on hi_link_doc (hi_doc_id);
+alter table hi_link_doc add constraint fk_hi_link_doc_hi_doc foreign key (hi_doc_id) references hi_doc (id) on delete restrict on update restrict;
 
-alter table imrelated add constraint fk_imrelated_owner_id foreign key (owner_id) references imroot (id) on delete restrict on update restrict;
 create index ix_imrelated_owner_id on imrelated (owner_id);
+alter table imrelated add constraint fk_imrelated_owner_id foreign key (owner_id) references imroot (id) on delete restrict on update restrict;
 
-alter table info_contact add constraint fk_info_contact_company_id foreign key (company_id) references info_company (id) on delete restrict on update restrict;
 create index ix_info_contact_company_id on info_contact (company_id);
+alter table info_contact add constraint fk_info_contact_company_id foreign key (company_id) references info_company (id) on delete restrict on update restrict;
 
 alter table info_customer add constraint fk_info_customer_company_id foreign key (company_id) references info_company (id) on delete restrict on update restrict;
 
 alter table inner_report add constraint fk_inner_report_forecast_id foreign key (forecast_id) references stockforecast (id) on delete restrict on update restrict;
 
-alter table drel_invoice add constraint fk_drel_invoice_booking foreign key (booking) references drel_booking (id) on delete restrict on update restrict;
 create index ix_drel_invoice_booking on drel_invoice (booking);
+alter table drel_invoice add constraint fk_drel_invoice_booking foreign key (booking) references drel_booking (id) on delete restrict on update restrict;
 
-alter table item add constraint fk_item_type foreign key (customer,type) references type (customer,type) on delete restrict on update restrict;
-create index ix_item_customer_type on item (customer,type);
+create index ix_item_etype on item (customer,type);
+alter table item add constraint fk_item_etype foreign key (customer,type) references type (customer,type) on delete restrict on update restrict;
 
-alter table item add constraint fk_item_region foreign key (customer,region) references region (customer,type) on delete restrict on update restrict;
-create index ix_item_customer_region on item (customer,region);
+create index ix_item_eregion on item (customer,region);
+alter table item add constraint fk_item_eregion foreign key (customer,region) references region (customer,type) on delete restrict on update restrict;
 
+alter table trainer_monkey add constraint fk_trainer_monkey_trainer foreign key (trainer_tid) references trainer (tid) on delete restrict on update restrict;
+
+alter table trainer_monkey add constraint fk_trainer_monkey_monkey foreign key (monkey_mid) references monkey (mid) on delete restrict on update restrict;
+
+alter table troop_monkey add constraint fk_troop_monkey_troop foreign key (troop_pid) references troop (pid) on delete restrict on update restrict;
+
+alter table troop_monkey add constraint fk_troop_monkey_monkey foreign key (monkey_mid) references monkey (mid) on delete restrict on update restrict;
+
+create index ix_l2_cldf_reset_bean_child_parent_id on l2_cldf_reset_bean_child (parent_id);
+alter table l2_cldf_reset_bean_child add constraint fk_l2_cldf_reset_bean_child_parent_id foreign key (parent_id) references l2_cldf_reset_bean (id) on delete restrict on update restrict;
+
+create index ix_level1_level4_level1 on level1_level4 (level1_id);
 alter table level1_level4 add constraint fk_level1_level4_level1 foreign key (level1_id) references level1 (id) on delete restrict on update restrict;
-create index ix_level1_level4_level1_id on level1_level4 (level1_id);
 
+create index ix_level1_level4_level4 on level1_level4 (level4_id);
 alter table level1_level4 add constraint fk_level1_level4_level4 foreign key (level4_id) references level4 (id) on delete restrict on update restrict;
-create index ix_level1_level4_level4_id on level1_level4 (level4_id);
 
+create index ix_level1_level2_level1 on level1_level2 (level1_id);
 alter table level1_level2 add constraint fk_level1_level2_level1 foreign key (level1_id) references level1 (id) on delete restrict on update restrict;
-create index ix_level1_level2_level1_id on level1_level2 (level1_id);
 
+create index ix_level1_level2_level2 on level1_level2 (level2_id);
 alter table level1_level2 add constraint fk_level1_level2_level2 foreign key (level2_id) references level2 (id) on delete restrict on update restrict;
-create index ix_level1_level2_level2_id on level1_level2 (level2_id);
 
+create index ix_level2_level3_level2 on level2_level3 (level2_id);
 alter table level2_level3 add constraint fk_level2_level3_level2 foreign key (level2_id) references level2 (id) on delete restrict on update restrict;
-create index ix_level2_level3_level2_id on level2_level3 (level2_id);
 
+create index ix_level2_level3_level3 on level2_level3 (level3_id);
 alter table level2_level3 add constraint fk_level2_level3_level3 foreign key (level3_id) references level3 (id) on delete restrict on update restrict;
-create index ix_level2_level3_level3_id on level2_level3 (level3_id);
 
+alter table link add constraint fk_link_id foreign key (id) references link_draft (id) on delete restrict on update restrict;
+
+create index ix_la_attr_value_attribute_la_attr_value on la_attr_value_attribute (la_attr_value_id);
 alter table la_attr_value_attribute add constraint fk_la_attr_value_attribute_la_attr_value foreign key (la_attr_value_id) references la_attr_value (id) on delete restrict on update restrict;
-create index ix_la_attr_value_attribute_la_attr_value_id on la_attr_value_attribute (la_attr_value_id);
 
+create index ix_la_attr_value_attribute_attribute on la_attr_value_attribute (attribute_id);
 alter table la_attr_value_attribute add constraint fk_la_attr_value_attribute_attribute foreign key (attribute_id) references attribute (id) on delete restrict on update restrict;
-create index ix_la_attr_value_attribute_attribute_id on la_attr_value_attribute (attribute_id);
 
-alter table mprinter add constraint fk_mprinter_current_state_id foreign key (current_state_id) references mprinter_state (id) on delete restrict on update restrict;
 create index ix_mprinter_current_state_id on mprinter (current_state_id);
+alter table mprinter add constraint fk_mprinter_current_state_id foreign key (current_state_id) references mprinter_state (id) on delete restrict on update restrict;
 
 alter table mprinter add constraint fk_mprinter_last_swap_cyan_id foreign key (last_swap_cyan_id) references mprinter_state (id) on delete restrict on update restrict;
 
@@ -1870,205 +3054,407 @@ alter table mprinter add constraint fk_mprinter_last_swap_yellow_id foreign key
 
 alter table mprinter add constraint fk_mprinter_last_swap_black_id foreign key (last_swap_black_id) references mprinter_state (id) on delete restrict on update restrict;
 
-alter table mprinter_state add constraint fk_mprinter_state_printer_id foreign key (printer_id) references mprinter (id) on delete restrict on update restrict;
 create index ix_mprinter_state_printer_id on mprinter_state (printer_id);
+alter table mprinter_state add constraint fk_mprinter_state_printer_id foreign key (printer_id) references mprinter (id) on delete restrict on update restrict;
 
-alter table mprofile add constraint fk_mprofile_picture_id foreign key (picture_id) references mmedia (id) on delete restrict on update restrict;
 create index ix_mprofile_picture_id on mprofile (picture_id);
+alter table mprofile add constraint fk_mprofile_picture_id foreign key (picture_id) references mmedia (id) on delete restrict on update restrict;
 
+create index ix_mrole_muser_mrole on mrole_muser (mrole_roleid);
 alter table mrole_muser add constraint fk_mrole_muser_mrole foreign key (mrole_roleid) references mrole (roleid) on delete restrict on update restrict;
-create index ix_mrole_muser_mrole_roleid on mrole_muser (mrole_roleid);
 
+create index ix_mrole_muser_muser on mrole_muser (muser_userid);
 alter table mrole_muser add constraint fk_mrole_muser_muser foreign key (muser_userid) references muser (userid) on delete restrict on update restrict;
-create index ix_mrole_muser_muser_userid on mrole_muser (muser_userid);
 
-alter table muser add constraint fk_muser_user_type_id foreign key (user_type_id) references muser_type (id) on delete restrict on update restrict;
 create index ix_muser_user_type_id on muser (user_type_id);
+alter table muser add constraint fk_muser_user_type_id foreign key (user_type_id) references muser_type (id) on delete restrict on update restrict;
+
+create index ix_mail_user_inbox_mail_user on mail_user_inbox (mail_user_id);
+alter table mail_user_inbox add constraint fk_mail_user_inbox_mail_user foreign key (mail_user_id) references mail_user (id) on delete restrict on update restrict;
+
+create index ix_mail_user_inbox_mail_box on mail_user_inbox (mail_box_id);
+alter table mail_user_inbox add constraint fk_mail_user_inbox_mail_box foreign key (mail_box_id) references mail_box (id) on delete restrict on update restrict;
+
+create index ix_mail_user_outbox_mail_user on mail_user_outbox (mail_user_id);
+alter table mail_user_outbox add constraint fk_mail_user_outbox_mail_user foreign key (mail_user_id) references mail_user (id) on delete restrict on update restrict;
+
+create index ix_mail_user_outbox_mail_box on mail_user_outbox (mail_box_id);
+alter table mail_user_outbox add constraint fk_mail_user_outbox_mail_box foreign key (mail_box_id) references mail_box (id) on delete restrict on update restrict;
 
-alter table c_message add constraint fk_c_message_conversation_id foreign key (conversation_id) references c_conversation (id) on delete restrict on update restrict;
 create index ix_c_message_conversation_id on c_message (conversation_id);
+alter table c_message add constraint fk_c_message_conversation_id foreign key (conversation_id) references c_conversation (id) on delete restrict on update restrict;
 
-alter table c_message add constraint fk_c_message_user_id foreign key (user_id) references c_user (id) on delete restrict on update restrict;
 create index ix_c_message_user_id on c_message (user_id);
+alter table c_message add constraint fk_c_message_user_id foreign key (user_id) references c_user (id) on delete restrict on update restrict;
 
+create index ix_mnoc_user_mnoc_role_mnoc_user on mnoc_user_mnoc_role (mnoc_user_user_id);
 alter table mnoc_user_mnoc_role add constraint fk_mnoc_user_mnoc_role_mnoc_user foreign key (mnoc_user_user_id) references mnoc_user (user_id) on delete restrict on update restrict;
-create index ix_mnoc_user_mnoc_role_mnoc_user_user_id on mnoc_user_mnoc_role (mnoc_user_user_id);
 
+create index ix_mnoc_user_mnoc_role_mnoc_role on mnoc_user_mnoc_role (mnoc_role_role_id);
 alter table mnoc_user_mnoc_role add constraint fk_mnoc_user_mnoc_role_mnoc_role foreign key (mnoc_role_role_id) references mnoc_role (role_id) on delete restrict on update restrict;
-create index ix_mnoc_user_mnoc_role_mnoc_role_role_id on mnoc_user_mnoc_role (mnoc_role_role_id);
 
-alter table mp_role add constraint fk_mp_role_mp_user_id foreign key (mp_user_id) references mp_user (id) on delete restrict on update restrict;
+create index ix_mny_b_a_id on mny_b (a_id);
+alter table mny_b add constraint fk_mny_b_a_id foreign key (a_id) references mny_a (id) on delete restrict on update restrict;
+
+create index ix_mny_b_mny_c_mny_b on mny_b_mny_c (mny_b_id);
+alter table mny_b_mny_c add constraint fk_mny_b_mny_c_mny_b foreign key (mny_b_id) references mny_b (id) on delete restrict on update restrict;
+
+create index ix_mny_b_mny_c_mny_c on mny_b_mny_c (mny_c_id);
+alter table mny_b_mny_c add constraint fk_mny_b_mny_c_mny_c foreign key (mny_c_id) references mny_c (id) on delete restrict on update restrict;
+
+create index ix_subtopics_mny_topic_1 on subtopics (topic);
+alter table subtopics add constraint fk_subtopics_mny_topic_1 foreign key (topic) references mny_topic (id) on delete restrict on update restrict;
+
+create index ix_subtopics_mny_topic_2 on subtopics (subtopic);
+alter table subtopics add constraint fk_subtopics_mny_topic_2 foreign key (subtopic) references mny_topic (id) on delete restrict on update restrict;
+
 create index ix_mp_role_mp_user_id on mp_role (mp_user_id);
+alter table mp_role add constraint fk_mp_role_mp_user_id foreign key (mp_user_id) references mp_user (id) on delete restrict on update restrict;
+
+create index ix_ms_many_a_many_b_ms_many_a on ms_many_a_many_b (ms_many_a_aid);
+alter table ms_many_a_many_b add constraint fk_ms_many_a_many_b_ms_many_a foreign key (ms_many_a_aid) references ms_many_a (aid) on delete restrict on update restrict;
+
+create index ix_ms_many_a_many_b_ms_many_b on ms_many_a_many_b (ms_many_b_bid);
+alter table ms_many_a_many_b add constraint fk_ms_many_a_many_b_ms_many_b foreign key (ms_many_b_bid) references ms_many_b (bid) on delete restrict on update restrict;
+
+create index ix_ms_many_b_many_a_ms_many_b on ms_many_b_many_a (ms_many_b_bid);
+alter table ms_many_b_many_a add constraint fk_ms_many_b_many_a_ms_many_b foreign key (ms_many_b_bid) references ms_many_b (bid) on delete restrict on update restrict;
+
+create index ix_ms_many_b_many_a_ms_many_a on ms_many_b_many_a (ms_many_a_aid);
+alter table ms_many_b_many_a add constraint fk_ms_many_b_many_a_ms_many_a foreign key (ms_many_a_aid) references ms_many_a (aid) on delete restrict on update restrict;
 
-alter table my_lob_size_join_many add constraint fk_my_lob_size_join_many_parent_id foreign key (parent_id) references my_lob_size (id) on delete restrict on update restrict;
 create index ix_my_lob_size_join_many_parent_id on my_lob_size_join_many (parent_id);
+alter table my_lob_size_join_many add constraint fk_my_lob_size_join_many_parent_id foreign key (parent_id) references my_lob_size (id) on delete restrict on update restrict;
 
+create index ix_o_cached_bean_country_o_cached_bean on o_cached_bean_country (o_cached_bean_id);
 alter table o_cached_bean_country add constraint fk_o_cached_bean_country_o_cached_bean foreign key (o_cached_bean_id) references o_cached_bean (id) on delete restrict on update restrict;
-create index ix_o_cached_bean_country_o_cached_bean_id on o_cached_bean_country (o_cached_bean_id);
 
+create index ix_o_cached_bean_country_o_country on o_cached_bean_country (o_country_code);
 alter table o_cached_bean_country add constraint fk_o_cached_bean_country_o_country foreign key (o_country_code) references o_country (code) on delete restrict on update restrict;
-create index ix_o_cached_bean_country_o_country_code on o_cached_bean_country (o_country_code);
 
-alter table o_cached_bean_child add constraint fk_o_cached_bean_child_cached_bean_id foreign key (cached_bean_id) references o_cached_bean (id) on delete restrict on update restrict;
 create index ix_o_cached_bean_child_cached_bean_id on o_cached_bean_child (cached_bean_id);
+alter table o_cached_bean_child add constraint fk_o_cached_bean_child_cached_bean_id foreign key (cached_bean_id) references o_cached_bean (id) on delete restrict on update restrict;
 
 alter table oengine add constraint fk_oengine_car_id foreign key (car_id) references ocar (id) on delete restrict on update restrict;
 
 alter table ogear_box add constraint fk_ogear_box_car_id foreign key (car_id) references ocar (id) on delete restrict on update restrict;
 
-alter table o_order add constraint fk_o_order_kcustomer_id foreign key (kcustomer_id) references o_customer (id) on delete restrict on update restrict;
+alter table oroad_show_msg add constraint fk_oroad_show_msg_company_id foreign key (company_id) references ocompany (id) on delete restrict on update restrict;
+
+create index ix_om_ordered_detail_master_id on om_ordered_detail (master_id);
+alter table om_ordered_detail add constraint fk_om_ordered_detail_master_id foreign key (master_id) references om_ordered_master (id) on delete restrict on update restrict;
+
 create index ix_o_order_kcustomer_id on o_order (kcustomer_id);
+alter table o_order add constraint fk_o_order_kcustomer_id foreign key (kcustomer_id) references o_customer (id) on delete restrict on update restrict;
 
-alter table o_order_detail add constraint fk_o_order_detail_order_id foreign key (order_id) references o_order (id) on delete restrict on update restrict;
 create index ix_o_order_detail_order_id on o_order_detail (order_id);
+alter table o_order_detail add constraint fk_o_order_detail_order_id foreign key (order_id) references o_order (id) on delete restrict on update restrict;
 
-alter table o_order_detail add constraint fk_o_order_detail_product_id foreign key (product_id) references o_product (id) on delete restrict on update restrict;
 create index ix_o_order_detail_product_id on o_order_detail (product_id);
+alter table o_order_detail add constraint fk_o_order_detail_product_id foreign key (product_id) references o_product (id) on delete restrict on update restrict;
 
-alter table s_order_items add constraint fk_s_order_items_order_uuid foreign key (order_uuid) references s_orders (uuid) on delete restrict on update restrict;
 create index ix_s_order_items_order_uuid on s_order_items (order_uuid);
+alter table s_order_items add constraint fk_s_order_items_order_uuid foreign key (order_uuid) references s_orders (uuid) on delete restrict on update restrict;
 
-alter table or_order_ship add constraint fk_or_order_ship_order_id foreign key (order_id) references o_order (id) on delete restrict on update restrict;
 create index ix_or_order_ship_order_id on or_order_ship (order_id);
+alter table or_order_ship add constraint fk_or_order_ship_order_id foreign key (order_id) references o_order (id) on delete restrict on update restrict;
+
+alter table oto_bchild add constraint fk_oto_bchild_master_id foreign key (master_id) references oto_bmaster (id) on delete restrict on update restrict;
 
 alter table oto_child add constraint fk_oto_child_master_id foreign key (master_id) references oto_master (id) on delete restrict on update restrict;
 
+alter table oto_cust_address add constraint fk_oto_cust_address_customer_cid foreign key (customer_cid) references oto_cust (cid) on delete restrict on update restrict;
+
+alter table oto_prime_extra add constraint fk_oto_prime_extra_eid foreign key (eid) references oto_prime (pid) on delete restrict on update restrict;
+
+create index ix_oto_th_many_oto_th_top_id on oto_th_many (oto_th_top_id);
+alter table oto_th_many add constraint fk_oto_th_many_oto_th_top_id foreign key (oto_th_top_id) references oto_th_top (id) on delete restrict on update restrict;
+
+alter table oto_th_one add constraint fk_oto_th_one_many_id foreign key (many_id) references oto_th_many (id) on delete restrict on update restrict;
+
+alter table oto_ubprime_extra add constraint fk_oto_ubprime_extra_eid foreign key (eid) references oto_ubprime (pid) on delete restrict on update restrict;
+
+alter table oto_uprime_extra add constraint fk_oto_uprime_extra_eid foreign key (eid) references oto_uprime (pid) on delete restrict on update restrict;
+
 alter table pfile add constraint fk_pfile_file_content_id foreign key (file_content_id) references pfile_content (id) on delete restrict on update restrict;
 
 alter table pfile add constraint fk_pfile_file_content2_id foreign key (file_content2_id) references pfile_content (id) on delete restrict on update restrict;
 
 alter table paggview add constraint fk_paggview_pview_id foreign key (pview_id) references pp (id) on delete restrict on update restrict;
 
-alter table pallet_location add constraint fk_pallet_location_zone_sid foreign key (zone_sid) references zones (id) on delete restrict on update restrict;
 create index ix_pallet_location_zone_sid on pallet_location (zone_sid);
+alter table pallet_location add constraint fk_pallet_location_zone_sid foreign key (zone_sid) references zones (id) on delete restrict on update restrict;
 
 alter table parcel_location add constraint fk_parcel_location_parcelid foreign key (parcelid) references parcel (parcelid) on delete restrict on update restrict;
 
+create index ix_rawinherit_parent_rawinherit_data_rawinherit_parent on rawinherit_parent_rawinherit_data (rawinherit_parent_id);
 alter table rawinherit_parent_rawinherit_data add constraint fk_rawinherit_parent_rawinherit_data_rawinherit_parent foreign key (rawinherit_parent_id) references rawinherit_parent (id) on delete restrict on update restrict;
-create index ix_rawinherit_parent_rawinherit_data_rawinherit_parent_id on rawinherit_parent_rawinherit_data (rawinherit_parent_id);
 
+create index ix_rawinherit_parent_rawinherit_data_rawinherit_data on rawinherit_parent_rawinherit_data (rawinherit_data_id);
 alter table rawinherit_parent_rawinherit_data add constraint fk_rawinherit_parent_rawinherit_data_rawinherit_data foreign key (rawinherit_data_id) references rawinherit_data (id) on delete restrict on update restrict;
-create index ix_rawinherit_parent_rawinherit_data_rawinherit_data_id on rawinherit_parent_rawinherit_data (rawinherit_data_id);
 
-alter table c_participation add constraint fk_c_participation_conversation_id foreign key (conversation_id) references c_conversation (id) on delete restrict on update restrict;
+create index ix_parent_person_some_bean_id on parent_person (some_bean_id);
+alter table parent_person add constraint fk_parent_person_some_bean_id foreign key (some_bean_id) references e_basic (id) on delete restrict on update restrict;
+
+create index ix_parent_person_parent_identifier on parent_person (parent_identifier);
+alter table parent_person add constraint fk_parent_person_parent_identifier foreign key (parent_identifier) references grand_parent_person (identifier) on delete restrict on update restrict;
+
 create index ix_c_participation_conversation_id on c_participation (conversation_id);
+alter table c_participation add constraint fk_c_participation_conversation_id foreign key (conversation_id) references c_conversation (id) on delete restrict on update restrict;
 
-alter table c_participation add constraint fk_c_participation_user_id foreign key (user_id) references c_user (id) on delete restrict on update restrict;
 create index ix_c_participation_user_id on c_participation (user_id);
+alter table c_participation add constraint fk_c_participation_user_id foreign key (user_id) references c_user (id) on delete restrict on update restrict;
 
 alter table persistent_file_content add constraint fk_persistent_file_content_persistent_file_id foreign key (persistent_file_id) references persistent_file (id) on delete restrict on update restrict;
 
-alter table person add constraint fk_person_default_address_oid foreign key (default_address_oid) references address (oid) on delete restrict on update restrict;
 create index ix_person_default_address_oid on person (default_address_oid);
+alter table person add constraint fk_person_default_address_oid foreign key (default_address_oid) references address (oid) on delete restrict on update restrict;
 
-alter table phones add constraint fk_phones_person_id foreign key (person_id) references persons (id) on delete restrict on update restrict;
 create index ix_phones_person_id on phones (person_id);
+alter table phones add constraint fk_phones_person_id foreign key (person_id) references persons (id) on delete restrict on update restrict;
 
+create index ix_pp_to_ww_pp on pp_to_ww (pp_id);
 alter table pp_to_ww add constraint fk_pp_to_ww_pp foreign key (pp_id) references pp (id) on delete restrict on update restrict;
-create index ix_pp_to_ww_pp_id on pp_to_ww (pp_id);
 
+create index ix_pp_to_ww_wview on pp_to_ww (ww_id);
 alter table pp_to_ww add constraint fk_pp_to_ww_wview foreign key (ww_id) references wview (id) on delete restrict on update restrict;
-create index ix_pp_to_ww_ww_id on pp_to_ww (ww_id);
 
-alter table r_orders add constraint fk_r_orders_rcustomer foreign key (company,customername) references rcustomer (company,name) on delete restrict on update restrict;
-create index ix_r_orders_company_customername on r_orders (company,customername);
+create index ix_question_groupobjectid on question (groupobjectid);
+alter table question add constraint fk_question_groupobjectid foreign key (groupobjectid) references survey_group (id) on delete restrict on update restrict;
+
+create index ix_r_orders_customer on r_orders (company,customername);
+alter table r_orders add constraint fk_r_orders_customer foreign key (company,customername) references rcustomer (company,name) on delete restrict on update restrict;
 
-alter table resourcefile add constraint fk_resourcefile_parentresourcefileid foreign key (parentresourcefileid) references resourcefile (id) on delete restrict on update restrict;
 create index ix_resourcefile_parentresourcefileid on resourcefile (parentresourcefileid);
+alter table resourcefile add constraint fk_resourcefile_parentresourcefileid foreign key (parentresourcefileid) references resourcefile (id) on delete restrict on update restrict;
 
-alter table mt_role add constraint fk_mt_role_tenant_id foreign key (tenant_id) references mt_tenant (id) on delete restrict on update restrict;
 create index ix_mt_role_tenant_id on mt_role (tenant_id);
+alter table mt_role add constraint fk_mt_role_tenant_id foreign key (tenant_id) references mt_tenant (id) on delete restrict on update restrict;
 
+create index ix_mt_role_permission_mt_role on mt_role_permission (mt_role_id);
 alter table mt_role_permission add constraint fk_mt_role_permission_mt_role foreign key (mt_role_id) references mt_role (id) on delete restrict on update restrict;
-create index ix_mt_role_permission_mt_role_id on mt_role_permission (mt_role_id);
 
+create index ix_mt_role_permission_mt_permission on mt_role_permission (mt_permission_id);
 alter table mt_role_permission add constraint fk_mt_role_permission_mt_permission foreign key (mt_permission_id) references mt_permission (id) on delete restrict on update restrict;
-create index ix_mt_role_permission_mt_permission_id on mt_role_permission (mt_permission_id);
 
 alter table f_second add constraint fk_f_second_first foreign key (first) references f_first (id) on delete restrict on update restrict;
 
-alter table section add constraint fk_section_article_id foreign key (article_id) references article (id) on delete restrict on update restrict;
 create index ix_section_article_id on section (article_id);
+alter table section add constraint fk_section_article_id foreign key (article_id) references article (id) on delete restrict on update restrict;
 
-alter table self_parent add constraint fk_self_parent_parent_id foreign key (parent_id) references self_parent (id) on delete restrict on update restrict;
 create index ix_self_parent_parent_id on self_parent (parent_id);
+alter table self_parent add constraint fk_self_parent_parent_id foreign key (parent_id) references self_parent (id) on delete restrict on update restrict;
 
-alter table self_ref_customer add constraint fk_self_ref_customer_referred_by_id foreign key (referred_by_id) references self_ref_customer (id) on delete restrict on update restrict;
 create index ix_self_ref_customer_referred_by_id on self_ref_customer (referred_by_id);
+alter table self_ref_customer add constraint fk_self_ref_customer_referred_by_id foreign key (referred_by_id) references self_ref_customer (id) on delete restrict on update restrict;
 
-alter table self_ref_example add constraint fk_self_ref_example_parent_id foreign key (parent_id) references self_ref_example (id) on delete restrict on update restrict;
 create index ix_self_ref_example_parent_id on self_ref_example (parent_id);
+alter table self_ref_example add constraint fk_self_ref_example_parent_id foreign key (parent_id) references self_ref_example (id) on delete restrict on update restrict;
 
-alter table stockforecast add constraint fk_stockforecast_inner_report_id foreign key (inner_report_id) references inner_report (id) on delete restrict on update restrict;
 create index ix_stockforecast_inner_report_id on stockforecast (inner_report_id);
+alter table stockforecast add constraint fk_stockforecast_inner_report_id foreign key (inner_report_id) references inner_report (id) on delete restrict on update restrict;
 
-alter table sub_section add constraint fk_sub_section_section_id foreign key (section_id) references section (id) on delete restrict on update restrict;
 create index ix_sub_section_section_id on sub_section (section_id);
+alter table sub_section add constraint fk_sub_section_section_id foreign key (section_id) references section (id) on delete restrict on update restrict;
+
+create index ix_tevent_many_event_id on tevent_many (event_id);
+alter table tevent_many add constraint fk_tevent_many_event_id foreign key (event_id) references tevent_one (id) on delete restrict on update restrict;
+
+alter table tevent_one add constraint fk_tevent_one_event_id foreign key (event_id) references tevent (id) on delete restrict on update restrict;
 
-alter table t_detail_with_other_namexxxyy add constraint fk_t_detail_with_other_namexxxyy_master_id foreign key (master_id) references t_atable_thatisrelatively (id) on delete restrict on update restrict;
 create index ix_t_detail_with_other_namexxxyy_master_id on t_detail_with_other_namexxxyy (master_id);
+alter table t_detail_with_other_namexxxyy add constraint fk_t_detail_with_other_namexxxyy_master_id foreign key (master_id) references t_atable_thatisrelatively (id) on delete restrict on update restrict;
 
-alter table ts_detail_two add constraint fk_ts_detail_two_master_id foreign key (master_id) references ts_master_two (id) on delete restrict on update restrict;
 create index ix_ts_detail_two_master_id on ts_detail_two (master_id);
+alter table ts_detail_two add constraint fk_ts_detail_two_master_id foreign key (master_id) references ts_master_two (id) on delete restrict on update restrict;
 
-alter table twheel add constraint fk_twheel_owner_plate_no foreign key (owner_plate_no) references tcar (plate_no) on delete restrict on update restrict;
 create index ix_twheel_owner_plate_no on twheel (owner_plate_no);
+alter table twheel add constraint fk_twheel_owner_plate_no foreign key (owner_plate_no) references tcar (plate_no) on delete restrict on update restrict;
 
 alter table tire add constraint fk_tire_wheel foreign key (wheel) references wheel (id) on delete restrict on update restrict;
 
-alter table trip add constraint fk_trip_vehicle_driver_id foreign key (vehicle_driver_id) references vehicle_driver (id) on delete restrict on update restrict;
 create index ix_trip_vehicle_driver_id on trip (vehicle_driver_id);
+alter table trip add constraint fk_trip_vehicle_driver_id foreign key (vehicle_driver_id) references vehicle_driver (id) on delete restrict on update restrict;
 
-alter table trip add constraint fk_trip_address_id foreign key (address_id) references o_address (id) on delete restrict on update restrict;
 create index ix_trip_address_id on trip (address_id);
+alter table trip add constraint fk_trip_address_id foreign key (address_id) references o_address (id) on delete restrict on update restrict;
 
-alter table type add constraint fk_type_sub_type_id foreign key (sub_type_id) references sub_type (sub_type_id) on delete restrict on update restrict;
 create index ix_type_sub_type_id on type (sub_type_id);
+alter table type add constraint fk_type_sub_type_id foreign key (sub_type_id) references sub_type (sub_type_id) on delete restrict on update restrict;
 
-alter table ut_detail add constraint fk_ut_detail_utmaster_id foreign key (utmaster_id) references ut_master (id) on delete restrict on update restrict;
 create index ix_ut_detail_utmaster_id on ut_detail (utmaster_id);
+alter table ut_detail add constraint fk_ut_detail_utmaster_id foreign key (utmaster_id) references ut_master (id) on delete restrict on update restrict;
 
-alter table uutwo add constraint fk_uutwo_master_id foreign key (master_id) references uuone (id) on delete restrict on update restrict;
 create index ix_uutwo_master_id on uutwo (master_id);
+alter table uutwo add constraint fk_uutwo_master_id foreign key (master_id) references uuone (id) on delete restrict on update restrict;
 
-alter table c_user add constraint fk_c_user_group_id foreign key (group_id) references c_group (id) on delete restrict on update restrict;
 create index ix_c_user_group_id on c_user (group_id);
+alter table c_user add constraint fk_c_user_group_id foreign key (group_id) references c_group (id) on delete restrict on update restrict;
 
 alter table oto_user add constraint fk_oto_user_account_id foreign key (account_id) references oto_account (id) on delete restrict on update restrict;
 
-alter table em_user_role add constraint fk_em_user_role_user_id foreign key (user_id) references em_user (id) on delete restrict on update restrict;
 create index ix_em_user_role_user_id on em_user_role (user_id);
+alter table em_user_role add constraint fk_em_user_role_user_id foreign key (user_id) references em_user (id) on delete restrict on update restrict;
 
-alter table em_user_role add constraint fk_em_user_role_role_id foreign key (role_id) references em_role (id) on delete restrict on update restrict;
 create index ix_em_user_role_role_id on em_user_role (role_id);
+alter table em_user_role add constraint fk_em_user_role_role_id foreign key (role_id) references em_role (id) on delete restrict on update restrict;
 
-alter table vehicle add constraint fk_vehicle_truck_ref_id foreign key (truck_ref_id) references truck_ref (id) on delete restrict on update restrict;
-create index ix_vehicle_truck_ref_id on vehicle (truck_ref_id);
-
-alter table vehicle add constraint fk_vehicle_car_ref_id foreign key (car_ref_id) references truck_ref (id) on delete restrict on update restrict;
 create index ix_vehicle_car_ref_id on vehicle (car_ref_id);
+alter table vehicle add constraint fk_vehicle_car_ref_id foreign key (car_ref_id) references truck_ref (id) on delete restrict on update restrict;
+
+create index ix_vehicle_truck_ref_id on vehicle (truck_ref_id);
+alter table vehicle add constraint fk_vehicle_truck_ref_id foreign key (truck_ref_id) references truck_ref (id) on delete restrict on update restrict;
 
-alter table vehicle_driver add constraint fk_vehicle_driver_vehicle_id foreign key (vehicle_id) references vehicle (id) on delete restrict on update restrict;
 create index ix_vehicle_driver_vehicle_id on vehicle_driver (vehicle_id);
+alter table vehicle_driver add constraint fk_vehicle_driver_vehicle_id foreign key (vehicle_id) references vehicle (id) on delete restrict on update restrict;
 
-alter table vehicle_driver add constraint fk_vehicle_driver_address_id foreign key (address_id) references o_address (id) on delete restrict on update restrict;
 create index ix_vehicle_driver_address_id on vehicle_driver (address_id);
+alter table vehicle_driver add constraint fk_vehicle_driver_address_id foreign key (address_id) references o_address (id) on delete restrict on update restrict;
 
-alter table warehouses add constraint fk_warehouses_officezoneid foreign key (officezoneid) references zones (id) on delete restrict on update restrict;
 create index ix_warehouses_officezoneid on warehouses (officezoneid);
+alter table warehouses add constraint fk_warehouses_officezoneid foreign key (officezoneid) references zones (id) on delete restrict on update restrict;
 
+create index ix_warehousesshippingzones_warehouses on warehousesshippingzones (warehouseid);
 alter table warehousesshippingzones add constraint fk_warehousesshippingzones_warehouses foreign key (warehouseid) references warehouses (id) on delete restrict on update restrict;
-create index ix_warehousesshippingzones_warehouseid on warehousesshippingzones (warehouseid);
 
+create index ix_warehousesshippingzones_zones on warehousesshippingzones (shippingzoneid);
 alter table warehousesshippingzones add constraint fk_warehousesshippingzones_zones foreign key (shippingzoneid) references zones (id) on delete restrict on update restrict;
-create index ix_warehousesshippingzones_shippingzoneid on warehousesshippingzones (shippingzoneid);
 
-alter table sa_wheel add constraint fk_sa_wheel_tire foreign key (tire) references sa_tire (id) on delete restrict on update restrict;
 create index ix_sa_wheel_tire on sa_wheel (tire);
+alter table sa_wheel add constraint fk_sa_wheel_tire foreign key (tire) references sa_tire (id) on delete restrict on update restrict;
 
-alter table sa_wheel add constraint fk_sa_wheel_car foreign key (car) references sa_car (id) on delete restrict on update restrict;
 create index ix_sa_wheel_car on sa_wheel (car);
+alter table sa_wheel add constraint fk_sa_wheel_car foreign key (car) references sa_car (id) on delete restrict on update restrict;
+
+create index ix_g_who_props_otm_who_created_id on g_who_props_otm (who_created_id);
+alter table g_who_props_otm add constraint fk_g_who_props_otm_who_created_id foreign key (who_created_id) references g_user (id) on delete restrict on update restrict;
+
+create index ix_g_who_props_otm_who_modified_id on g_who_props_otm (who_modified_id);
+alter table g_who_props_otm add constraint fk_g_who_props_otm_who_modified_id foreign key (who_modified_id) references g_user (id) on delete restrict on update restrict;
 
-alter table with_zero add constraint fk_with_zero_parent_id foreign key (parent_id) references parent (id) on delete restrict on update restrict;
 create index ix_with_zero_parent_id on with_zero (parent_id);
+alter table with_zero add constraint fk_with_zero_parent_id foreign key (parent_id) references parent (id) on delete restrict on update restrict;
 
+alter table hx_link add column sys_period_start datetime(6) default now(6);
+alter table hx_link add column sys_period_end datetime(6);
+update hx_link set sys_period_start = when_created;
+create table hx_link_history(
+  id                            bigint,
+  name                          varchar(255),
+  location                      varchar(255),
+  comments                      varchar(255),
+  version                       bigint,
+  when_created                  datetime(6),
+  when_modified                 datetime(6),
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view hx_link_with_history as select * from hx_link union all select * from hx_link_history;
+
+delimiter $$
+create trigger hx_link_history_upd before update on hx_link for each row begin
+    insert into hx_link_history (sys_period_start,sys_period_end,id, name, location, comments, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger hx_link_history_del before delete on hx_link for each row begin
+    insert into hx_link_history (sys_period_start,sys_period_end,id, name, location, comments, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
+end$$
+alter table hi_link add column sys_period_start datetime(6) default now(6);
+alter table hi_link add column sys_period_end datetime(6);
+update hi_link set sys_period_start = when_created;
+create table hi_link_history(
+  id                            bigint,
+  name                          varchar(255),
+  location                      varchar(255),
+  comments                      varchar(255),
+  version                       bigint,
+  when_created                  datetime(6),
+  when_modified                 datetime(6),
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view hi_link_with_history as select * from hi_link union all select * from hi_link_history;
+
+delimiter $$
+create trigger hi_link_history_upd before update on hi_link for each row begin
+    insert into hi_link_history (sys_period_start,sys_period_end,id, name, location, comments, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger hi_link_history_del before delete on hi_link for each row begin
+    insert into hi_link_history (sys_period_start,sys_period_end,id, name, location, comments, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
+end$$
+alter table hi_link_doc add column sys_period_start datetime(6) default now(6);
+alter table hi_link_doc add column sys_period_end datetime(6);
+create table hi_link_doc_history(
+  hi_link_id                    bigint,
+  hi_doc_id                     bigint,
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view hi_link_doc_with_history as select * from hi_link_doc union all select * from hi_link_doc_history;
+
+delimiter $$
+create trigger hi_link_doc_history_upd before update on hi_link_doc for each row begin
+    insert into hi_link_doc_history (sys_period_start,sys_period_end,hi_link_id, hi_doc_id) values (OLD.sys_period_start, now(6),OLD.hi_link_id, OLD.hi_doc_id);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger hi_link_doc_history_del before delete on hi_link_doc for each row begin
+    insert into hi_link_doc_history (sys_period_start,sys_period_end,hi_link_id, hi_doc_id) values (OLD.sys_period_start, now(6),OLD.hi_link_id, OLD.hi_doc_id);
+end$$
+alter table link add column sys_period_start datetime(6) default now(6);
+alter table link add column sys_period_end datetime(6);
+update link set sys_period_start = when_created;
+create table link_history(
+  id                            bigint,
+  name                          varchar(255),
+  location                      varchar(255),
+  when_publish                  datetime(6),
+  link_comment                  varchar(255),
+  version                       bigint,
+  when_created                  datetime(6),
+  when_modified                 datetime(6),
+  deleted                       tinyint(1),
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view link_with_history as select * from link union all select * from link_history;
+
+delimiter $$
+create trigger link_history_upd before update on link for each row begin
+    insert into link_history (sys_period_start,sys_period_end,id, name, location, when_publish, link_comment, version, when_created, when_modified, deleted) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.when_publish, OLD.link_comment, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger link_history_del before delete on link for each row begin
+    insert into link_history (sys_period_start,sys_period_end,id, name, location, when_publish, link_comment, version, when_created, when_modified, deleted) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.when_publish, OLD.link_comment, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+end$$
+alter table c_user add column sys_period_start datetime(6) default now(6);
+alter table c_user add column sys_period_end datetime(6);
+update c_user set sys_period_start = when_created;
+create table c_user_history(
+  id                            bigint,
+  inactive                      tinyint(1),
+  name                          varchar(255),
+  email                         varchar(255),
+  password_hash                 varchar(255),
+  group_id                      bigint,
+  version                       bigint,
+  when_created                  datetime(6),
+  when_modified                 datetime(6),
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view c_user_with_history as select * from c_user union all select * from c_user_history;
+
+delimiter $$
+create trigger c_user_history_upd before update on c_user for each row begin
+    insert into c_user_history (sys_period_start,sys_period_end,id, inactive, name, email, group_id, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.inactive, OLD.name, OLD.email, OLD.group_id, OLD.version, OLD.when_created, OLD.when_modified);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger c_user_history_del before delete on c_user for each row begin
+    insert into c_user_history (sys_period_start,sys_period_end,id, inactive, name, email, group_id, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.inactive, OLD.name, OLD.email, OLD.group_id, OLD.version, OLD.when_created, OLD.when_modified);
+end$$
diff --git a/src/test/ddl-review/mysql-drop-all.sql b/src/test/ddl-review/mysql-drop-all.sql
index 592b8a5e6..5be3cc07a 100644
--- a/src/test/ddl-review/mysql-drop-all.sql
+++ b/src/test/ddl-review/mysql-drop-all.sql
@@ -1,11 +1,17 @@
+-- Generated by ebean unknown at 2018-03-08T06:38:18.344Z
 alter table bar drop foreign key fk_bar_foo_id;
 drop index ix_bar_foo_id on bar;
 
+alter table addr drop foreign key fk_addr_employee_id;
+drop index ix_addr_employee_id on addr;
+
 alter table o_address drop foreign key fk_o_address_country_code;
 drop index ix_o_address_country_code on o_address;
 
-alter table animals drop foreign key fk_animals_shelter_id;
-drop index ix_animals_shelter_id on animals;
+alter table album drop foreign key fk_album_cover_id;
+
+alter table animal drop foreign key fk_animal_shelter_id;
+drop index ix_animal_shelter_id on animal;
 
 alter table attribute drop foreign key fk_attribute_attribute_holder_id;
 drop index ix_attribute_attribute_holder_id on attribute;
@@ -13,12 +19,30 @@ drop index ix_attribute_attribute_holder_id on attribute;
 alter table bbookmark drop foreign key fk_bbookmark_user_id;
 drop index ix_bbookmark_user_id on bbookmark;
 
+alter table bsite_user drop foreign key fk_bsite_user_site_id;
+drop index ix_bsite_user_site_id on bsite_user;
+
+alter table bsite_user drop foreign key fk_bsite_user_user_id;
+drop index ix_bsite_user_user_id on bsite_user;
+
+alter table bsite_user_b drop foreign key fk_bsite_user_b_site;
+drop index ix_bsite_user_b_site on bsite_user_b;
+
+alter table bsite_user_b drop foreign key fk_bsite_user_b_usr;
+drop index ix_bsite_user_b_usr on bsite_user_b;
+
+alter table bsite_user_c drop foreign key fk_bsite_user_c_site_uid;
+drop index ix_bsite_user_c_site_uid on bsite_user_c;
+
+alter table bsite_user_c drop foreign key fk_bsite_user_c_user_uid;
+drop index ix_bsite_user_c_user_uid on bsite_user_c;
+
 alter table drel_booking drop foreign key fk_drel_booking_agent_invoice;
 
 alter table drel_booking drop foreign key fk_drel_booking_client_invoice;
 
-alter table ckey_detail drop foreign key fk_ckey_detail_ckey_parent;
-drop index ix_ckey_detail_one_key_two_key on ckey_detail;
+alter table ckey_detail drop foreign key fk_ckey_detail_parent;
+drop index ix_ckey_detail_parent on ckey_detail;
 
 alter table ckey_parent drop foreign key fk_ckey_parent_assoc_id;
 drop index ix_ckey_parent_assoc_id on ckey_parent;
@@ -30,14 +54,26 @@ alter table calculation_result drop foreign key fk_calculation_result_group_conf
 drop index ix_calculation_result_group_configuration_id on calculation_result;
 
 alter table sp_car_car_wheels drop foreign key fk_sp_car_car_wheels_sp_car_car;
-drop index ix_sp_car_car_wheels_car on sp_car_car_wheels;
+drop index ix_sp_car_car_wheels_sp_car_car on sp_car_car_wheels;
 
 alter table sp_car_car_wheels drop foreign key fk_sp_car_car_wheels_sp_car_wheel;
-drop index ix_sp_car_car_wheels_wheel on sp_car_car_wheels;
+drop index ix_sp_car_car_wheels_sp_car_wheel on sp_car_car_wheels;
+
+alter table car_accessory drop foreign key fk_car_accessory_fuse_id;
+drop index ix_car_accessory_fuse_id on car_accessory;
 
 alter table car_accessory drop foreign key fk_car_accessory_car_id;
 drop index ix_car_accessory_car_id on car_accessory;
 
+alter table category drop foreign key fk_category_surveyobjectid;
+drop index ix_category_surveyobjectid on category;
+
+alter table child_person drop foreign key fk_child_person_some_bean_id;
+drop index ix_child_person_some_bean_id on child_person;
+
+alter table child_person drop foreign key fk_child_person_parent_identifier;
+drop index ix_child_person_parent_identifier on child_person;
+
 alter table configuration drop foreign key fk_configuration_configurations_id;
 drop index ix_configuration_configurations_id on configuration;
 
@@ -59,6 +95,55 @@ drop index ix_o_customer_billing_address_id on o_customer;
 alter table o_customer drop foreign key fk_o_customer_shipping_address_id;
 drop index ix_o_customer_shipping_address_id on o_customer;
 
+alter table dcredit_drol drop foreign key fk_dcredit_drol_dcredit;
+drop index ix_dcredit_drol_dcredit on dcredit_drol;
+
+alter table dcredit_drol drop foreign key fk_dcredit_drol_drol;
+drop index ix_dcredit_drol_drol on dcredit_drol;
+
+alter table drot_drol drop foreign key fk_drot_drol_drot;
+drop index ix_drot_drol_drot on drot_drol;
+
+alter table drot_drol drop foreign key fk_drot_drol_drol;
+drop index ix_drot_drol_drol on drot_drol;
+
+alter table dfk_cascade drop foreign key fk_dfk_cascade_one_id;
+drop index ix_dfk_cascade_one_id on dfk_cascade;
+
+alter table dfk_set_null drop foreign key fk_dfk_set_null_one_id;
+drop index ix_dfk_set_null_one_id on dfk_set_null;
+
+alter table doc drop foreign key fk_doc_id;
+
+alter table doc_link drop foreign key fk_doc_link_doc;
+drop index ix_doc_link_doc on doc_link;
+
+alter table doc_link drop foreign key fk_doc_link_link;
+drop index ix_doc_link_link on doc_link;
+
+alter table document drop foreign key fk_document_id;
+
+alter table document drop foreign key fk_document_organisation_id;
+drop index ix_document_organisation_id on document;
+
+alter table document_draft drop foreign key fk_document_draft_organisation_id;
+drop index ix_document_draft_organisation_id on document_draft;
+
+alter table document_media drop foreign key fk_document_media_document_id;
+drop index ix_document_media_document_id on document_media;
+
+alter table document_media_draft drop foreign key fk_document_media_draft_document_id;
+drop index ix_document_media_draft_document_id on document_media_draft;
+
+alter table ebasic_json_map_detail drop foreign key fk_ebasic_json_map_detail_owner_id;
+drop index ix_ebasic_json_map_detail_owner_id on ebasic_json_map_detail;
+
+alter table ebasic_no_sdchild drop foreign key fk_ebasic_no_sdchild_owner_id;
+drop index ix_ebasic_no_sdchild_owner_id on ebasic_no_sdchild;
+
+alter table ebasic_sdchild drop foreign key fk_ebasic_sdchild_owner_id;
+drop index ix_ebasic_sdchild_owner_id on ebasic_sdchild;
+
 alter table eemb_inner drop foreign key fk_eemb_inner_outer_id;
 drop index ix_eemb_inner_outer_id on eemb_inner;
 
@@ -74,12 +159,68 @@ drop index ix_eopt_one_a_b_id on eopt_one_a;
 alter table eopt_one_b drop foreign key fk_eopt_one_b_c_id;
 drop index ix_eopt_one_b_c_id on eopt_one_b;
 
+alter table esoft_del_book drop foreign key fk_esoft_del_book_lend_by_id;
+drop index ix_esoft_del_book_lend_by_id on esoft_del_book;
+
+alter table esoft_del_book_esoft_del_user drop foreign key fk_esoft_del_book_esoft_del_user_esoft_del_book;
+drop index ix_esoft_del_book_esoft_del_user_esoft_del_book on esoft_del_book_esoft_del_user;
+
+alter table esoft_del_book_esoft_del_user drop foreign key fk_esoft_del_book_esoft_del_user_esoft_del_user;
+drop index ix_esoft_del_book_esoft_del_user_esoft_del_user on esoft_del_book_esoft_del_user;
+
+alter table esoft_del_down drop foreign key fk_esoft_del_down_esoft_del_mid_id;
+drop index ix_esoft_del_down_esoft_del_mid_id on esoft_del_down;
+
+alter table esoft_del_mid drop foreign key fk_esoft_del_mid_top_id;
+drop index ix_esoft_del_mid_top_id on esoft_del_mid;
+
+alter table esoft_del_mid drop foreign key fk_esoft_del_mid_up_id;
+drop index ix_esoft_del_mid_up_id on esoft_del_mid;
+
+alter table esoft_del_one_a drop foreign key fk_esoft_del_one_a_oneb_id;
+
+alter table esoft_del_role_esoft_del_user drop foreign key fk_esoft_del_role_esoft_del_user_esoft_del_role;
+drop index ix_esoft_del_role_esoft_del_user_esoft_del_role on esoft_del_role_esoft_del_user;
+
+alter table esoft_del_role_esoft_del_user drop foreign key fk_esoft_del_role_esoft_del_user_esoft_del_user;
+drop index ix_esoft_del_role_esoft_del_user_esoft_del_user on esoft_del_role_esoft_del_user;
+
+alter table esoft_del_user_esoft_del_role drop foreign key fk_esoft_del_user_esoft_del_role_esoft_del_user;
+drop index ix_esoft_del_user_esoft_del_role_esoft_del_user on esoft_del_user_esoft_del_role;
+
+alter table esoft_del_user_esoft_del_role drop foreign key fk_esoft_del_user_esoft_del_role_esoft_del_role;
+drop index ix_esoft_del_user_esoft_del_role_esoft_del_role on esoft_del_user_esoft_del_role;
+
+alter table rawinherit_uncle drop foreign key fk_rawinherit_uncle_parent_id;
+drop index ix_rawinherit_uncle_parent_id on rawinherit_uncle;
+
 alter table evanilla_collection_detail drop foreign key fk_evanilla_collection_detail_evanilla_collection_id;
 drop index ix_evanilla_collection_detail_evanilla_collection_id on evanilla_collection_detail;
 
 alter table td_child drop foreign key fk_td_child_parent_id;
 drop index ix_td_child_parent_id on td_child;
 
+alter table empl drop foreign key fk_empl_default_address_id;
+drop index ix_empl_default_address_id on empl;
+
+alter table grand_parent_person drop foreign key fk_grand_parent_person_some_bean_id;
+drop index ix_grand_parent_person_some_bean_id on grand_parent_person;
+
+alter table survey_group drop foreign key fk_survey_group_categoryobjectid;
+drop index ix_survey_group_categoryobjectid on survey_group;
+
+alter table hx_link_doc drop foreign key fk_hx_link_doc_hx_link;
+drop index ix_hx_link_doc_hx_link on hx_link_doc;
+
+alter table hx_link_doc drop foreign key fk_hx_link_doc_he_doc;
+drop index ix_hx_link_doc_he_doc on hx_link_doc;
+
+alter table hi_link_doc drop foreign key fk_hi_link_doc_hi_link;
+drop index ix_hi_link_doc_hi_link on hi_link_doc;
+
+alter table hi_link_doc drop foreign key fk_hi_link_doc_hi_doc;
+drop index ix_hi_link_doc_hi_doc on hi_link_doc;
+
 alter table imrelated drop foreign key fk_imrelated_owner_id;
 drop index ix_imrelated_owner_id on imrelated;
 
@@ -93,35 +234,48 @@ alter table inner_report drop foreign key fk_inner_report_forecast_id;
 alter table drel_invoice drop foreign key fk_drel_invoice_booking;
 drop index ix_drel_invoice_booking on drel_invoice;
 
-alter table item drop foreign key fk_item_type;
-drop index ix_item_customer_type on item;
+alter table item drop foreign key fk_item_etype;
+drop index ix_item_etype on item;
 
-alter table item drop foreign key fk_item_region;
-drop index ix_item_customer_region on item;
+alter table item drop foreign key fk_item_eregion;
+drop index ix_item_eregion on item;
+
+alter table trainer_monkey drop foreign key fk_trainer_monkey_trainer;
+
+alter table trainer_monkey drop foreign key fk_trainer_monkey_monkey;
+
+alter table troop_monkey drop foreign key fk_troop_monkey_troop;
+
+alter table troop_monkey drop foreign key fk_troop_monkey_monkey;
+
+alter table l2_cldf_reset_bean_child drop foreign key fk_l2_cldf_reset_bean_child_parent_id;
+drop index ix_l2_cldf_reset_bean_child_parent_id on l2_cldf_reset_bean_child;
 
 alter table level1_level4 drop foreign key fk_level1_level4_level1;
-drop index ix_level1_level4_level1_id on level1_level4;
+drop index ix_level1_level4_level1 on level1_level4;
 
 alter table level1_level4 drop foreign key fk_level1_level4_level4;
-drop index ix_level1_level4_level4_id on level1_level4;
+drop index ix_level1_level4_level4 on level1_level4;
 
 alter table level1_level2 drop foreign key fk_level1_level2_level1;
-drop index ix_level1_level2_level1_id on level1_level2;
+drop index ix_level1_level2_level1 on level1_level2;
 
 alter table level1_level2 drop foreign key fk_level1_level2_level2;
-drop index ix_level1_level2_level2_id on level1_level2;
+drop index ix_level1_level2_level2 on level1_level2;
 
 alter table level2_level3 drop foreign key fk_level2_level3_level2;
-drop index ix_level2_level3_level2_id on level2_level3;
+drop index ix_level2_level3_level2 on level2_level3;
 
 alter table level2_level3 drop foreign key fk_level2_level3_level3;
-drop index ix_level2_level3_level3_id on level2_level3;
+drop index ix_level2_level3_level3 on level2_level3;
+
+alter table link drop foreign key fk_link_id;
 
 alter table la_attr_value_attribute drop foreign key fk_la_attr_value_attribute_la_attr_value;
-drop index ix_la_attr_value_attribute_la_attr_value_id on la_attr_value_attribute;
+drop index ix_la_attr_value_attribute_la_attr_value on la_attr_value_attribute;
 
 alter table la_attr_value_attribute drop foreign key fk_la_attr_value_attribute_attribute;
-drop index ix_la_attr_value_attribute_attribute_id on la_attr_value_attribute;
+drop index ix_la_attr_value_attribute_attribute on la_attr_value_attribute;
 
 alter table mprinter drop foreign key fk_mprinter_current_state_id;
 drop index ix_mprinter_current_state_id on mprinter;
@@ -141,14 +295,26 @@ alter table mprofile drop foreign key fk_mprofile_picture_id;
 drop index ix_mprofile_picture_id on mprofile;
 
 alter table mrole_muser drop foreign key fk_mrole_muser_mrole;
-drop index ix_mrole_muser_mrole_roleid on mrole_muser;
+drop index ix_mrole_muser_mrole on mrole_muser;
 
 alter table mrole_muser drop foreign key fk_mrole_muser_muser;
-drop index ix_mrole_muser_muser_userid on mrole_muser;
+drop index ix_mrole_muser_muser on mrole_muser;
 
 alter table muser drop foreign key fk_muser_user_type_id;
 drop index ix_muser_user_type_id on muser;
 
+alter table mail_user_inbox drop foreign key fk_mail_user_inbox_mail_user;
+drop index ix_mail_user_inbox_mail_user on mail_user_inbox;
+
+alter table mail_user_inbox drop foreign key fk_mail_user_inbox_mail_box;
+drop index ix_mail_user_inbox_mail_box on mail_user_inbox;
+
+alter table mail_user_outbox drop foreign key fk_mail_user_outbox_mail_user;
+drop index ix_mail_user_outbox_mail_user on mail_user_outbox;
+
+alter table mail_user_outbox drop foreign key fk_mail_user_outbox_mail_box;
+drop index ix_mail_user_outbox_mail_box on mail_user_outbox;
+
 alter table c_message drop foreign key fk_c_message_conversation_id;
 drop index ix_c_message_conversation_id on c_message;
 
@@ -156,22 +322,49 @@ alter table c_message drop foreign key fk_c_message_user_id;
 drop index ix_c_message_user_id on c_message;
 
 alter table mnoc_user_mnoc_role drop foreign key fk_mnoc_user_mnoc_role_mnoc_user;
-drop index ix_mnoc_user_mnoc_role_mnoc_user_user_id on mnoc_user_mnoc_role;
+drop index ix_mnoc_user_mnoc_role_mnoc_user on mnoc_user_mnoc_role;
 
 alter table mnoc_user_mnoc_role drop foreign key fk_mnoc_user_mnoc_role_mnoc_role;
-drop index ix_mnoc_user_mnoc_role_mnoc_role_role_id on mnoc_user_mnoc_role;
+drop index ix_mnoc_user_mnoc_role_mnoc_role on mnoc_user_mnoc_role;
+
+alter table mny_b drop foreign key fk_mny_b_a_id;
+drop index ix_mny_b_a_id on mny_b;
+
+alter table mny_b_mny_c drop foreign key fk_mny_b_mny_c_mny_b;
+drop index ix_mny_b_mny_c_mny_b on mny_b_mny_c;
+
+alter table mny_b_mny_c drop foreign key fk_mny_b_mny_c_mny_c;
+drop index ix_mny_b_mny_c_mny_c on mny_b_mny_c;
+
+alter table subtopics drop foreign key fk_subtopics_mny_topic_1;
+drop index ix_subtopics_mny_topic_1 on subtopics;
+
+alter table subtopics drop foreign key fk_subtopics_mny_topic_2;
+drop index ix_subtopics_mny_topic_2 on subtopics;
 
 alter table mp_role drop foreign key fk_mp_role_mp_user_id;
 drop index ix_mp_role_mp_user_id on mp_role;
 
+alter table ms_many_a_many_b drop foreign key fk_ms_many_a_many_b_ms_many_a;
+drop index ix_ms_many_a_many_b_ms_many_a on ms_many_a_many_b;
+
+alter table ms_many_a_many_b drop foreign key fk_ms_many_a_many_b_ms_many_b;
+drop index ix_ms_many_a_many_b_ms_many_b on ms_many_a_many_b;
+
+alter table ms_many_b_many_a drop foreign key fk_ms_many_b_many_a_ms_many_b;
+drop index ix_ms_many_b_many_a_ms_many_b on ms_many_b_many_a;
+
+alter table ms_many_b_many_a drop foreign key fk_ms_many_b_many_a_ms_many_a;
+drop index ix_ms_many_b_many_a_ms_many_a on ms_many_b_many_a;
+
 alter table my_lob_size_join_many drop foreign key fk_my_lob_size_join_many_parent_id;
 drop index ix_my_lob_size_join_many_parent_id on my_lob_size_join_many;
 
 alter table o_cached_bean_country drop foreign key fk_o_cached_bean_country_o_cached_bean;
-drop index ix_o_cached_bean_country_o_cached_bean_id on o_cached_bean_country;
+drop index ix_o_cached_bean_country_o_cached_bean on o_cached_bean_country;
 
 alter table o_cached_bean_country drop foreign key fk_o_cached_bean_country_o_country;
-drop index ix_o_cached_bean_country_o_country_code on o_cached_bean_country;
+drop index ix_o_cached_bean_country_o_country on o_cached_bean_country;
 
 alter table o_cached_bean_child drop foreign key fk_o_cached_bean_child_cached_bean_id;
 drop index ix_o_cached_bean_child_cached_bean_id on o_cached_bean_child;
@@ -180,6 +373,11 @@ alter table oengine drop foreign key fk_oengine_car_id;
 
 alter table ogear_box drop foreign key fk_ogear_box_car_id;
 
+alter table oroad_show_msg drop foreign key fk_oroad_show_msg_company_id;
+
+alter table om_ordered_detail drop foreign key fk_om_ordered_detail_master_id;
+drop index ix_om_ordered_detail_master_id on om_ordered_detail;
+
 alter table o_order drop foreign key fk_o_order_kcustomer_id;
 drop index ix_o_order_kcustomer_id on o_order;
 
@@ -195,8 +393,23 @@ drop index ix_s_order_items_order_uuid on s_order_items;
 alter table or_order_ship drop foreign key fk_or_order_ship_order_id;
 drop index ix_or_order_ship_order_id on or_order_ship;
 
+alter table oto_bchild drop foreign key fk_oto_bchild_master_id;
+
 alter table oto_child drop foreign key fk_oto_child_master_id;
 
+alter table oto_cust_address drop foreign key fk_oto_cust_address_customer_cid;
+
+alter table oto_prime_extra drop foreign key fk_oto_prime_extra_eid;
+
+alter table oto_th_many drop foreign key fk_oto_th_many_oto_th_top_id;
+drop index ix_oto_th_many_oto_th_top_id on oto_th_many;
+
+alter table oto_th_one drop foreign key fk_oto_th_one_many_id;
+
+alter table oto_ubprime_extra drop foreign key fk_oto_ubprime_extra_eid;
+
+alter table oto_uprime_extra drop foreign key fk_oto_uprime_extra_eid;
+
 alter table pfile drop foreign key fk_pfile_file_content_id;
 
 alter table pfile drop foreign key fk_pfile_file_content2_id;
@@ -209,10 +422,16 @@ drop index ix_pallet_location_zone_sid on pallet_location;
 alter table parcel_location drop foreign key fk_parcel_location_parcelid;
 
 alter table rawinherit_parent_rawinherit_data drop foreign key fk_rawinherit_parent_rawinherit_data_rawinherit_parent;
-drop index ix_rawinherit_parent_rawinherit_data_rawinherit_parent_id on rawinherit_parent_rawinherit_data;
+drop index ix_rawinherit_parent_rawinherit_data_rawinherit_parent on rawinherit_parent_rawinherit_data;
 
 alter table rawinherit_parent_rawinherit_data drop foreign key fk_rawinherit_parent_rawinherit_data_rawinherit_data;
-drop index ix_rawinherit_parent_rawinherit_data_rawinherit_data_id on rawinherit_parent_rawinherit_data;
+drop index ix_rawinherit_parent_rawinherit_data_rawinherit_data on rawinherit_parent_rawinherit_data;
+
+alter table parent_person drop foreign key fk_parent_person_some_bean_id;
+drop index ix_parent_person_some_bean_id on parent_person;
+
+alter table parent_person drop foreign key fk_parent_person_parent_identifier;
+drop index ix_parent_person_parent_identifier on parent_person;
 
 alter table c_participation drop foreign key fk_c_participation_conversation_id;
 drop index ix_c_participation_conversation_id on c_participation;
@@ -229,13 +448,16 @@ alter table phones drop foreign key fk_phones_person_id;
 drop index ix_phones_person_id on phones;
 
 alter table pp_to_ww drop foreign key fk_pp_to_ww_pp;
-drop index ix_pp_to_ww_pp_id on pp_to_ww;
+drop index ix_pp_to_ww_pp on pp_to_ww;
 
 alter table pp_to_ww drop foreign key fk_pp_to_ww_wview;
-drop index ix_pp_to_ww_ww_id on pp_to_ww;
+drop index ix_pp_to_ww_wview on pp_to_ww;
 
-alter table r_orders drop foreign key fk_r_orders_rcustomer;
-drop index ix_r_orders_company_customername on r_orders;
+alter table question drop foreign key fk_question_groupobjectid;
+drop index ix_question_groupobjectid on question;
+
+alter table r_orders drop foreign key fk_r_orders_customer;
+drop index ix_r_orders_customer on r_orders;
 
 alter table resourcefile drop foreign key fk_resourcefile_parentresourcefileid;
 drop index ix_resourcefile_parentresourcefileid on resourcefile;
@@ -244,10 +466,10 @@ alter table mt_role drop foreign key fk_mt_role_tenant_id;
 drop index ix_mt_role_tenant_id on mt_role;
 
 alter table mt_role_permission drop foreign key fk_mt_role_permission_mt_role;
-drop index ix_mt_role_permission_mt_role_id on mt_role_permission;
+drop index ix_mt_role_permission_mt_role on mt_role_permission;
 
 alter table mt_role_permission drop foreign key fk_mt_role_permission_mt_permission;
-drop index ix_mt_role_permission_mt_permission_id on mt_role_permission;
+drop index ix_mt_role_permission_mt_permission on mt_role_permission;
 
 alter table f_second drop foreign key fk_f_second_first;
 
@@ -269,6 +491,11 @@ drop index ix_stockforecast_inner_report_id on stockforecast;
 alter table sub_section drop foreign key fk_sub_section_section_id;
 drop index ix_sub_section_section_id on sub_section;
 
+alter table tevent_many drop foreign key fk_tevent_many_event_id;
+drop index ix_tevent_many_event_id on tevent_many;
+
+alter table tevent_one drop foreign key fk_tevent_one_event_id;
+
 alter table t_detail_with_other_namexxxyy drop foreign key fk_t_detail_with_other_namexxxyy_master_id;
 drop index ix_t_detail_with_other_namexxxyy_master_id on t_detail_with_other_namexxxyy;
 
@@ -306,12 +533,12 @@ drop index ix_em_user_role_user_id on em_user_role;
 alter table em_user_role drop foreign key fk_em_user_role_role_id;
 drop index ix_em_user_role_role_id on em_user_role;
 
-alter table vehicle drop foreign key fk_vehicle_truck_ref_id;
-drop index ix_vehicle_truck_ref_id on vehicle;
-
 alter table vehicle drop foreign key fk_vehicle_car_ref_id;
 drop index ix_vehicle_car_ref_id on vehicle;
 
+alter table vehicle drop foreign key fk_vehicle_truck_ref_id;
+drop index ix_vehicle_truck_ref_id on vehicle;
+
 alter table vehicle_driver drop foreign key fk_vehicle_driver_vehicle_id;
 drop index ix_vehicle_driver_vehicle_id on vehicle_driver;
 
@@ -322,10 +549,10 @@ alter table warehouses drop foreign key fk_warehouses_officezoneid;
 drop index ix_warehouses_officezoneid on warehouses;
 
 alter table warehousesshippingzones drop foreign key fk_warehousesshippingzones_warehouses;
-drop index ix_warehousesshippingzones_warehouseid on warehousesshippingzones;
+drop index ix_warehousesshippingzones_warehouses on warehousesshippingzones;
 
 alter table warehousesshippingzones drop foreign key fk_warehousesshippingzones_zones;
-drop index ix_warehousesshippingzones_shippingzoneid on warehousesshippingzones;
+drop index ix_warehousesshippingzones_zones on warehousesshippingzones;
 
 alter table sa_wheel drop foreign key fk_sa_wheel_tire;
 drop index ix_sa_wheel_tire on sa_wheel;
@@ -333,6 +560,12 @@ drop index ix_sa_wheel_tire on sa_wheel;
 alter table sa_wheel drop foreign key fk_sa_wheel_car;
 drop index ix_sa_wheel_car on sa_wheel;
 
+alter table g_who_props_otm drop foreign key fk_g_who_props_otm_who_created_id;
+drop index ix_g_who_props_otm_who_created_id on g_who_props_otm;
+
+alter table g_who_props_otm drop foreign key fk_g_who_props_otm_who_modified_id;
+drop index ix_g_who_props_otm_who_modified_id on g_who_props_otm;
+
 alter table with_zero drop foreign key fk_with_zero_parent_id;
 drop index ix_with_zero_parent_id on with_zero;
 
@@ -342,11 +575,15 @@ drop table if exists bar;
 
 drop table if exists oto_account;
 
-drop table if exists o_address;
+drop table if exists addr;
 
 drop table if exists address;
 
-drop table if exists animals;
+drop table if exists o_address;
+
+drop table if exists album;
+
+drop table if exists animal;
 
 drop table if exists animal_shelter;
 
@@ -364,6 +601,16 @@ drop table if exists bbookmark_user;
 
 drop table if exists bsimple_with_gen;
 
+drop table if exists bsite;
+
+drop table if exists bsite_user;
+
+drop table if exists bsite_user_b;
+
+drop table if exists bsite_user_c;
+
+drop table if exists buser;
+
 drop table if exists bwith_qident;
 
 drop table if exists basic_joda_entity;
@@ -372,6 +619,8 @@ drop table if exists bean_with_time_zone;
 
 drop table if exists drel_booking;
 
+drop table if exists cinh_root;
+
 drop table if exists ckey_assoc;
 
 drop table if exists ckey_detail;
@@ -390,6 +639,12 @@ drop table if exists sp_car_car_wheels;
 
 drop table if exists car_accessory;
 
+drop table if exists car_fuse;
+
+drop table if exists category;
+
+drop table if exists child_person;
+
 drop table if exists configuration;
 
 drop table if exists configurations;
@@ -404,16 +659,62 @@ drop table if exists c_conversation;
 
 drop table if exists o_country;
 
+drop table if exists cover;
+
 drop table if exists o_customer;
 
+drop table if exists dcredit;
+
+drop table if exists dcredit_drol;
+
 drop table if exists dexh_entity;
 
 drop table if exists dperson;
 
+drop table if exists drol;
+
+drop table if exists drot;
+
+drop table if exists drot_drol;
+
 drop table if exists rawinherit_data;
 
+drop table if exists dfk_cascade;
+
+drop table if exists dfk_cascade_one;
+
+drop table if exists dfk_none;
+
+drop table if exists dfk_none_via_join;
+
+drop table if exists dfk_one;
+
+drop table if exists dfk_set_null;
+
+drop table if exists doc;
+
+drop table if exists doc_link;
+
+drop table if exists doc_link_draft;
+
+drop table if exists doc_draft;
+
+drop table if exists document;
+
+drop table if exists document_draft;
+
+drop table if exists document_media;
+
+drop table if exists document_media_draft;
+
+drop table if exists earray_bean;
+
+drop table if exists earray_set_bean;
+
 drop table if exists e_basic;
 
+drop table if exists ebasic_change_log;
+
 drop table if exists ebasic_clob;
 
 drop table if exists ebasic_clob_fetch_eager;
@@ -426,12 +727,20 @@ drop table if exists e_basicenc_bin;
 
 drop table if exists e_basic_enum_id;
 
+drop table if exists e_basic_eni;
+
+drop table if exists ebasic_hstore;
+
+drop table if exists ebasic_json_list;
+
 drop table if exists ebasic_json_map;
 
 drop table if exists ebasic_json_map_blob;
 
 drop table if exists ebasic_json_map_clob;
 
+drop table if exists ebasic_json_map_detail;
+
 drop table if exists ebasic_json_map_json_b;
 
 drop table if exists ebasic_json_map_varchar;
@@ -444,14 +753,26 @@ drop table if exists ebasic_json_node_json_b;
 
 drop table if exists ebasic_json_node_varchar;
 
+drop table if exists ebasic_json_unmapped;
+
 drop table if exists e_basic_ndc;
 
+drop table if exists ebasic_no_sdchild;
+
+drop table if exists ebasic_sdchild;
+
+drop table if exists ebasic_soft_delete;
+
 drop table if exists e_basicver;
 
 drop table if exists e_basic_withlife;
 
 drop table if exists e_basicverucon;
 
+drop table if exists e_col_ab;
+
+drop table if exists ecustom_id;
+
 drop table if exists eemb_inner;
 
 drop table if exists eemb_outer;
@@ -474,12 +795,42 @@ drop table if exists eopt_one_c;
 
 drop table if exists eperson;
 
+drop table if exists e_person_online;
+
 drop table if exists esimple;
 
+drop table if exists esoft_del_book;
+
+drop table if exists esoft_del_book_esoft_del_user;
+
+drop table if exists esoft_del_down;
+
+drop table if exists esoft_del_mid;
+
+drop table if exists esoft_del_one_a;
+
+drop table if exists esoft_del_one_b;
+
+drop table if exists esoft_del_role;
+
+drop table if exists esoft_del_role_esoft_del_user;
+
+drop table if exists esoft_del_top;
+
+drop table if exists esoft_del_up;
+
+drop table if exists esoft_del_user;
+
+drop table if exists esoft_del_user_esoft_del_role;
+
+drop table if exists esome_convert_type;
+
 drop table if exists esome_type;
 
 drop table if exists etrans_many;
 
+drop table if exists rawinherit_uncle;
+
 drop table if exists evanilla_collection;
 
 drop table if exists evanilla_collection_detail;
@@ -492,6 +843,8 @@ drop table if exists td_child;
 
 drop table if exists td_parent;
 
+drop table if exists empl;
+
 drop table if exists feature_desc;
 
 drop table if exists f_first;
@@ -504,8 +857,45 @@ drop table if exists gen_key_sequence;
 
 drop table if exists gen_key_table;
 
+drop table if exists grand_parent_person;
+
+drop table if exists survey_group;
+
 drop table if exists c_group;
 
+drop table if exists he_doc;
+
+drop trigger hx_link_history_upd;
+drop trigger hx_link_history_del;
+drop view hx_link_with_history;
+alter table hx_link drop column sys_period_start;
+alter table hx_link drop column sys_period_end;
+drop table hx_link_history;
+
+drop table if exists hx_link;
+
+drop table if exists hx_link_doc;
+
+drop table if exists hi_doc;
+
+drop trigger hi_link_history_upd;
+drop trigger hi_link_history_del;
+drop view hi_link_with_history;
+alter table hi_link drop column sys_period_start;
+alter table hi_link drop column sys_period_end;
+drop table hi_link_history;
+
+drop table if exists hi_link;
+
+drop trigger hi_link_doc_history_upd;
+drop trigger hi_link_doc_history_del;
+drop view hi_link_doc_with_history;
+alter table hi_link_doc drop column sys_period_start;
+alter table hi_link_doc drop column sys_period_end;
+drop table hi_link_doc_history;
+
+drop table if exists hi_link_doc;
+
 drop table if exists imrelated;
 
 drop table if exists imroot;
@@ -524,6 +914,20 @@ drop table if exists drel_invoice;
 
 drop table if exists item;
 
+drop table if exists monkey;
+
+drop table if exists trainer;
+
+drop table if exists trainer_monkey;
+
+drop table if exists troop;
+
+drop table if exists troop_monkey;
+
+drop table if exists l2_cldf_reset_bean;
+
+drop table if exists l2_cldf_reset_bean_child;
+
 drop table if exists level1;
 
 drop table if exists level1_level4;
@@ -538,6 +942,17 @@ drop table if exists level3;
 
 drop table if exists level4;
 
+drop trigger link_history_upd;
+drop trigger link_history_del;
+drop view link_with_history;
+alter table link drop column sys_period_start;
+alter table link drop column sys_period_end;
+drop table link_history;
+
+drop table if exists link;
+
+drop table if exists link_draft;
+
 drop table if exists la_attr_value;
 
 drop table if exists la_attr_value_attribute;
@@ -564,6 +979,14 @@ drop table if exists muser;
 
 drop table if exists muser_type;
 
+drop table if exists mail_box;
+
+drop table if exists mail_user;
+
+drop table if exists mail_user_inbox;
+
+drop table if exists mail_user_outbox;
+
 drop table if exists map_super_actual;
 
 drop table if exists c_message;
@@ -574,10 +997,30 @@ drop table if exists mnoc_user;
 
 drop table if exists mnoc_user_mnoc_role;
 
+drop table if exists mny_a;
+
+drop table if exists mny_b;
+
+drop table if exists mny_b_mny_c;
+
+drop table if exists mny_c;
+
+drop table if exists mny_topic;
+
+drop table if exists subtopics;
+
 drop table if exists mp_role;
 
 drop table if exists mp_user;
 
+drop table if exists ms_many_a;
+
+drop table if exists ms_many_a_many_b;
+
+drop table if exists ms_many_b;
+
+drop table if exists ms_many_b_many_a;
+
 drop table if exists my_lob_size;
 
 drop table if exists my_lob_size_join_many;
@@ -590,12 +1033,24 @@ drop table if exists o_cached_bean_country;
 
 drop table if exists o_cached_bean_child;
 
+drop table if exists o_cached_natkey;
+
+drop table if exists o_cached_natkey3;
+
 drop table if exists ocar;
 
+drop table if exists ocompany;
+
 drop table if exists oengine;
 
 drop table if exists ogear_box;
 
+drop table if exists oroad_show_msg;
+
+drop table if exists om_ordered_detail;
+
+drop table if exists om_ordered_master;
+
 drop table if exists o_order;
 
 drop table if exists o_order_detail;
@@ -606,10 +1061,38 @@ drop table if exists s_order_items;
 
 drop table if exists or_order_ship;
 
+drop table if exists organisation;
+
+drop table if exists oto_bchild;
+
+drop table if exists oto_bmaster;
+
 drop table if exists oto_child;
 
+drop table if exists oto_cust;
+
+drop table if exists oto_cust_address;
+
 drop table if exists oto_master;
 
+drop table if exists oto_prime;
+
+drop table if exists oto_prime_extra;
+
+drop table if exists oto_th_many;
+
+drop table if exists oto_th_one;
+
+drop table if exists oto_th_top;
+
+drop table if exists oto_ubprime;
+
+drop table if exists oto_ubprime_extra;
+
+drop table if exists oto_uprime;
+
+drop table if exists oto_uprime_extra;
+
 drop table if exists pfile;
 
 drop table if exists pfile_content;
@@ -626,6 +1109,8 @@ drop table if exists rawinherit_parent;
 
 drop table if exists rawinherit_parent_rawinherit_data;
 
+drop table if exists parent_person;
+
 drop table if exists c_participation;
 
 drop table if exists mt_permission;
@@ -640,12 +1125,16 @@ drop table if exists person;
 
 drop table if exists phones;
 
+drop table if exists primary_revision;
+
 drop table if exists o_product;
 
 drop table if exists pp;
 
 drop table if exists pp_to_ww;
 
+drop table if exists question;
+
 drop table if exists rcustomer;
 
 drop table if exists r_orders;
@@ -654,12 +1143,12 @@ drop table if exists region;
 
 drop table if exists resourcefile;
 
+drop table if exists em_role;
+
 drop table if exists mt_role;
 
 drop table if exists mt_role_permission;
 
-drop table if exists em_role;
-
 drop table if exists f_second;
 
 drop table if exists section;
@@ -684,10 +1173,18 @@ drop table if exists sub_section;
 
 drop table if exists sub_type;
 
+drop table if exists survey;
+
 drop table if exists tbytes_only;
 
 drop table if exists tcar;
 
+drop table if exists tevent;
+
+drop table if exists tevent_many;
+
+drop table if exists tevent_one;
+
 drop table if exists tint_root;
 
 drop table if exists tjoda_entity;
@@ -712,16 +1209,20 @@ drop table if exists twith_pre_insert;
 
 drop table if exists mt_tenant;
 
-drop table if exists sa_tire;
+drop table if exists test_annotation_base_entity;
 
 drop table if exists tire;
 
+drop table if exists sa_tire;
+
 drop table if exists trip;
 
 drop table if exists truck_ref;
 
 drop table if exists type;
 
+drop table if exists tz_bean;
+
 drop table if exists ut_detail;
 
 drop table if exists ut_master;
@@ -730,11 +1231,20 @@ drop table if exists uuone;
 
 drop table if exists uutwo;
 
-drop table if exists em_user;
+drop trigger c_user_history_upd;
+drop trigger c_user_history_del;
+drop view c_user_with_history;
+alter table c_user drop column sys_period_start;
+alter table c_user drop column sys_period_end;
+drop table c_user_history;
+
+drop table if exists c_user;
 
 drop table if exists tx_user;
 
-drop table if exists c_user;
+drop table if exists g_user;
+
+drop table if exists em_user;
 
 drop table if exists oto_user;
 
@@ -750,9 +1260,11 @@ drop table if exists warehousesshippingzones;
 
 drop table if exists sa_wheel;
 
+drop table if exists wheel;
+
 drop table if exists sp_car_wheel;
 
-drop table if exists wheel;
+drop table if exists g_who_props_otm;
 
 drop table if exists with_zero;
 
@@ -762,3 +1274,5 @@ drop table if exists wview;
 
 drop table if exists zones;
 
+drop index ix_contact_last_name_first_name on contact;
+drop index ix_e_basic_name on e_basic;
diff --git a/src/test/ddl-review/oracle-create-all.sql b/src/test/ddl-review/oracle-create-all.sql
index 5dc24914c..b5eee44f8 100644
--- a/src/test/ddl-review/oracle-create-all.sql
+++ b/src/test/ddl-review/oracle-create-all.sql
@@ -24,6 +24,26 @@ create table oto_account (
 );
 create sequence oto_account_seq;
 
+create table addr (
+  id                            number(19) not null,
+  employee_id                   number(19),
+  name                          varchar2(255),
+  address_line1                 varchar2(255),
+  address_line2                 varchar2(255),
+  city                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_addr primary key (id)
+);
+create sequence addr_seq;
+
+create table address (
+  oid                           number(19) not null,
+  street                        varchar2(255),
+  version                       number(10) not null,
+  constraint pk_address primary key (oid)
+);
+create sequence address_seq;
+
 create table o_address (
   id                            number(5) not null,
   line_1                        varchar2(100),
@@ -36,25 +56,30 @@ create table o_address (
 );
 create sequence o_address_seq;
 
-create table address (
-  oid                           number(19) not null,
-  street                        varchar2(255),
-  version                       number(10) not null,
-  constraint pk_address primary key (oid)
+create table album (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  cover_id                      number(19),
+  deleted                       number(1) default 0 not null,
+  created_at                    timestamp not null,
+  last_update                   timestamp not null,
+  constraint uq_album_cover_id unique (cover_id),
+  constraint pk_album primary key (id)
 );
-create sequence address_seq;
+create sequence album_seq;
 
-create table animals (
-  species                       varchar2(31) not null,
+create table animal (
+  species                       varchar2(255) not null,
   id                            number(19) not null,
   shelter_id                    number(19),
   version                       number(19) not null,
   name                          varchar2(255),
   registration_number           varchar2(255),
   date_of_birth                 date,
-  constraint pk_animals primary key (id)
+  dog_size                      varchar2(255),
+  constraint pk_animal primary key (id)
 );
-create sequence animals_seq;
+create sequence animal_seq;
 
 create table animal_shelter (
   id                            number(19) not null,
@@ -128,9 +153,45 @@ create table bsimple_with_gen (
 );
 create sequence bsimple_with_gen_seq;
 
+create table bsite (
+  id                            varchar2(40) not null,
+  name                          varchar2(255),
+  constraint pk_bsite primary key (id)
+);
+
+create table bsite_user (
+  site_id                       varchar2(40) not null,
+  user_id                       varchar2(40) not null,
+  access_level                  number(10),
+  constraint ck_bsite_user_access_level check ( access_level in (0,1,2)),
+  constraint pk_bsite_user primary key (site_id,user_id)
+);
+
+create table bsite_user_b (
+  site                          varchar2(40) not null,
+  usr                           varchar2(40) not null,
+  access_level                  number(10),
+  constraint ck_bsite_user_b_access_level check ( access_level in (0,1,2)),
+  constraint pk_bsite_user_b primary key (site,usr)
+);
+
+create table bsite_user_c (
+  site_uid                      varchar2(40) not null,
+  user_uid                      varchar2(40) not null,
+  access_level                  number(10),
+  constraint ck_bsite_user_c_access_level check ( access_level in (0,1,2)),
+  constraint pk_bsite_user_c primary key (site_uid,user_uid)
+);
+
+create table buser (
+  id                            varchar2(40) not null,
+  name                          varchar2(255),
+  constraint pk_buser primary key (id)
+);
+
 create table bwith_qident (
   id                            number(10) not null,
-  "Name"                        varchar2(255),
+  "Name"                        varchar2(191),
   last_updated                  timestamp not null,
   constraint uq_bwith_qident_name unique ("Name"),
   constraint pk_bwith_qident primary key (id)
@@ -157,15 +218,31 @@ create sequence bean_with_time_zone_seq;
 
 create table drel_booking (
   id                            number(19) not null,
+  booking_uid                   number(19),
   agent_invoice                 number(19),
   client_invoice                number(19),
   version                       number(10) not null,
+  constraint uq_drel_booking_booking_uid unique (booking_uid),
   constraint uq_drel_booking_agent_invoice unique (agent_invoice),
-  constraint uq_drel_booking_client_invo_2 unique (client_invoice),
+  constraint uq_drl_bkng_clnt_nvc unique (client_invoice),
   constraint pk_drel_booking primary key (id)
 );
 create sequence drel_booking_seq;
 
+create table cinh_root (
+  dtype                         varchar2(3) not null,
+  id                            number(10) not null,
+  license_number                varchar2(255),
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       number(19) not null,
+  driver                        varchar2(255),
+  notes                         varchar2(255),
+  action                        varchar2(255),
+  constraint pk_cinh_root primary key (id)
+);
+create sequence cinh_root_seq;
+
 create table ckey_assoc (
   id                            number(10) not null,
   assoc_one                     varchar2(255),
@@ -193,7 +270,7 @@ create table ckey_parent (
 
 create table calculation_result (
   id                            number(10) not null,
-  charge                        number(19,4),
+  charge                        number(19,4) not null,
   product_configuration_id      number(10),
   group_configuration_id        number(10),
   constraint pk_calculation_result primary key (id)
@@ -231,6 +308,7 @@ create table sp_car_car_wheels (
 create table car_accessory (
   id                            number(10) not null,
   name                          varchar2(255),
+  fuse_id                       number(19) not null,
   car_id                        number(10),
   cretime                       timestamp not null,
   updtime                       timestamp not null,
@@ -239,8 +317,36 @@ create table car_accessory (
 );
 create sequence car_accessory_seq;
 
+create table car_fuse (
+  id                            number(19) not null,
+  location_code                 varchar2(255),
+  constraint pk_car_fuse primary key (id)
+);
+create sequence car_fuse_seq;
+
+create table category (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  surveyobjectid                number(19),
+  sequence_number               number(10) not null,
+  constraint pk_category primary key (id)
+);
+create sequence category_seq;
+
+create table child_person (
+  identifier                    number(10) not null,
+  name                          varchar2(255),
+  age                           number(10),
+  some_bean_id                  number(10),
+  parent_identifier             number(10),
+  family_name                   varchar2(255),
+  address                       varchar2(255),
+  constraint pk_child_person primary key (identifier)
+);
+create sequence child_person_seq;
+
 create table configuration (
-  type                          varchar2(31) not null,
+  type                          varchar2(21) not null,
   id                            number(10) not null,
   name                          varchar2(255),
   configurations_id             number(10),
@@ -259,8 +365,8 @@ create sequence configurations_seq;
 
 create table contact (
   id                            number(10) not null,
-  first_name                    varchar2(255),
-  last_name                     varchar2(255),
+  first_name                    varchar2(127),
+  last_name                     varchar2(127),
   phone                         varchar2(255),
   mobile                        varchar2(255),
   email                         varchar2(255),
@@ -297,7 +403,7 @@ create sequence contact_note_seq;
 create table c_conversation (
   id                            number(19) not null,
   title                         varchar2(255),
-  isopen                        number(1),
+  isopen                        number(1) default 0 not null,
   group_id                      number(19),
   version                       number(19) not null,
   when_created                  timestamp not null,
@@ -312,6 +418,14 @@ create table o_country (
   constraint pk_o_country primary key (code)
 );
 
+create table cover (
+  id                            number(19) not null,
+  s3url                         varchar2(255),
+  deleted                       number(1) default 0 not null,
+  constraint pk_cover primary key (id)
+);
+create sequence cover_seq;
+
 create table o_customer (
   id                            number(10) not null,
   status                        varchar2(1),
@@ -323,16 +437,31 @@ create table o_customer (
   cretime                       timestamp not null,
   updtime                       timestamp not null,
   version                       number(19) not null,
-  constraint ck_o_customer_status check (status in ('N','A','I')),
+  constraint ck_o_customer_status check ( status in ('N','A','I')),
   constraint pk_o_customer primary key (id)
 );
+comment on table o_customer is 'Holds external customers';
+comment on column o_customer.status is 'status of the customer';
+comment on column o_customer.smallnote is 'Short notes regarding the customer';
+comment on column o_customer.anniversary is 'Join date of the customer';
 create sequence o_customer_seq;
 
+create table dcredit (
+  id                            number(19) not null,
+  credit                        varchar2(255),
+  constraint pk_dcredit primary key (id)
+);
+create sequence dcredit_seq;
+
+create table dcredit_drol (
+  dcredit_id                    number(19) not null,
+  drol_id                       number(19) not null,
+  constraint pk_dcredit_drol primary key (dcredit_id,drol_id)
+);
+
 create table dexh_entity (
   oid                           number(19) not null,
-  exhange_rate                  number(38),
-  exhange_cmoney_amount         number(38),
-  exhange_cmoney_currency       varchar2(3),
+  exhange                       varchar2(255),
   last_updated                  timestamp not null,
   constraint pk_dexh_entity primary key (oid)
 );
@@ -343,14 +472,30 @@ create table dperson (
   first_name                    varchar2(255),
   last_name                     varchar2(255),
   salary                        number(38),
-  a_amt                         number(38),
-  a_curr                        varchar2(3),
-  i_start                       timestamp,
-  i_end                         timestamp,
   constraint pk_dperson primary key (id)
 );
 create sequence dperson_seq;
 
+create table drol (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  constraint pk_drol primary key (id)
+);
+create sequence drol_seq;
+
+create table drot (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  constraint pk_drot primary key (id)
+);
+create sequence drot_seq;
+
+create table drot_drol (
+  drot_id                       number(19) not null,
+  drol_id                       number(19) not null,
+  constraint pk_drot_drol primary key (drot_id,drol_id)
+);
+
 create table rawinherit_data (
   id                            number(19) not null,
   val                           number(10),
@@ -358,17 +503,186 @@ create table rawinherit_data (
 );
 create sequence rawinherit_data_seq;
 
+create table dfk_cascade (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  one_id                        number(19),
+  constraint pk_dfk_cascade primary key (id)
+);
+create sequence dfk_cascade_seq;
+
+create table dfk_cascade_one (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  constraint pk_dfk_cascade_one primary key (id)
+);
+create sequence dfk_cascade_one_seq;
+
+create table dfk_none (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  one_id                        number(19),
+  constraint pk_dfk_none primary key (id)
+);
+create sequence dfk_none_seq;
+
+create table dfk_none_via_join (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  one_id                        number(19),
+  constraint pk_dfk_none_via_join primary key (id)
+);
+create sequence dfk_none_via_join_seq;
+
+create table dfk_one (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  constraint pk_dfk_one primary key (id)
+);
+create sequence dfk_one_seq;
+
+create table dfk_set_null (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  one_id                        number(19),
+  constraint pk_dfk_set_null primary key (id)
+);
+create sequence dfk_set_null_seq;
+
+create table doc (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_doc primary key (id)
+);
+create sequence doc_seq;
+
+create table doc_link (
+  doc_id                        number(19) not null,
+  link_id                       number(19) not null,
+  constraint pk_doc_link primary key (doc_id,link_id)
+);
+
+create table doc_link_draft (
+  doc_id                        number(19) not null,
+  link_id                       number(19) not null,
+  constraint pk_doc_link_draft primary key (doc_id,link_id)
+);
+
+create table doc_draft (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_doc_draft primary key (id)
+);
+create sequence doc_draft_seq;
+
+create table document (
+  id                            number(19) not null,
+  title                         varchar2(127),
+  body                          varchar2(255),
+  organisation_id               number(19),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint uq_document_title unique (title),
+  constraint pk_document primary key (id)
+);
+create sequence document_seq;
+
+create table document_draft (
+  id                            number(19) not null,
+  title                         varchar2(127),
+  body                          varchar2(255),
+  when_publish                  timestamp,
+  organisation_id               number(19),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint uq_document_draft_title unique (title),
+  constraint pk_document_draft primary key (id)
+);
+create sequence document_draft_seq;
+
+create table document_media (
+  id                            number(19) not null,
+  document_id                   number(19),
+  name                          varchar2(255),
+  description                   varchar2(255),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_document_media primary key (id)
+);
+create sequence document_media_seq;
+
+create table document_media_draft (
+  id                            number(19) not null,
+  document_id                   number(19),
+  name                          varchar2(255),
+  description                   varchar2(255),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_document_media_draft primary key (id)
+);
+create sequence document_media_draft_seq;
+
+create table earray_bean (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  phone_numbers                 varchar(300),
+  uids                          varchar(1000),
+  other_ids                     varchar(1000),
+  doubs                         varchar(1000),
+  statuses                      varchar(1000),
+  status2                       varchar(1000),
+  version                       number(19) not null,
+  constraint pk_earray_bean primary key (id)
+);
+create sequence earray_bean_seq;
+
+create table earray_set_bean (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  phone_numbers                 varchar(300),
+  uids                          varchar(1000),
+  other_ids                     varchar(1000),
+  doubs                         varchar(1000),
+  version                       number(19) not null,
+  constraint pk_earray_set_bean primary key (id)
+);
+create sequence earray_set_bean_seq;
+
 create table e_basic (
   id                            number(10) not null,
   status                        varchar2(1),
-  name                          varchar2(255),
+  name                          varchar2(127),
   description                   varchar2(255),
   some_date                     timestamp,
-  constraint ck_e_basic_status check (status in ('N','A','I')),
+  constraint ck_e_basic_status check ( status in ('N','A','I')),
   constraint pk_e_basic primary key (id)
 );
 create sequence e_basic_seq;
 
+create table ebasic_change_log (
+  id                            number(19) not null,
+  name                          varchar2(20),
+  short_description             varchar2(50),
+  long_description              varchar2(100),
+  who_created                   varchar2(255) not null,
+  who_modified                  varchar2(255) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  version                       number(19) not null,
+  constraint pk_ebasic_change_log primary key (id)
+);
+create sequence ebasic_change_log_seq;
+
 create table ebasic_clob (
   id                            number(19) not null,
   name                          varchar2(255),
@@ -402,6 +716,7 @@ create table e_basicenc (
   name                          varchar2(255),
   description                   raw(80),
   dob                           raw(20),
+  status                        raw(20),
   last_update                   timestamp,
   constraint pk_e_basicenc primary key (id)
 );
@@ -422,10 +737,44 @@ create table e_basic_enum_id (
   status                        varchar2(1) not null,
   name                          varchar2(255),
   description                   varchar2(255),
-  constraint ck_e_basic_enum_id_status check (status in ('N','A','I')),
+  constraint ck_e_basic_enum_id_status check ( status in ('N','A','I')),
   constraint pk_e_basic_enum_id primary key (status)
 );
 
+create table e_basic_eni (
+  id                            number(10) not null,
+  status                        number(10),
+  name                          varchar2(255),
+  description                   varchar2(255),
+  some_date                     timestamp,
+  constraint ck_e_basic_eni_status check ( status in (1,2,3)),
+  constraint pk_e_basic_eni primary key (id)
+);
+create sequence e_basic_eni_seq;
+
+create table ebasic_hstore (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  map                           varchar2(800),
+  version                       number(19) not null,
+  constraint pk_ebasic_hstore primary key (id)
+);
+create sequence ebasic_hstore_seq;
+
+create table ebasic_json_list (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  bean_set                      varchar2(700),
+  bean_list                     clob,
+  bean_map                      varchar2(700),
+  plain_bean                    varchar2(500),
+  flags                         varchar2(50),
+  tags                          varchar2(100),
+  version                       number(19) not null,
+  constraint pk_ebasic_json_list primary key (id)
+);
+create sequence ebasic_json_list_seq;
+
 create table ebasic_json_map (
   id                            number(19) not null,
   name                          varchar2(255),
@@ -453,6 +802,16 @@ create table ebasic_json_map_clob (
 );
 create sequence ebasic_json_map_clob_seq;
 
+create table ebasic_json_map_detail (
+  id                            number(19) not null,
+  owner_id                      number(19),
+  name                          varchar2(255),
+  content                       clob,
+  version                       number(19) not null,
+  constraint pk_ebasic_json_map_detail primary key (id)
+);
+create sequence ebasic_json_map_detail_seq;
+
 create table ebasic_json_map_json_b (
   id                            number(19) not null,
   name                          varchar2(255),
@@ -507,6 +866,14 @@ create table ebasic_json_node_varchar (
 );
 create sequence ebasic_json_node_varchar_seq;
 
+create table ebasic_json_unmapped (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_ebasic_json_unmapped primary key (id)
+);
+create sequence ebasic_json_unmapped_seq;
+
 create table e_basic_ndc (
   id                            number(10) not null,
   name                          varchar2(255),
@@ -514,6 +881,37 @@ create table e_basic_ndc (
 );
 create sequence e_basic_ndc_seq;
 
+create table ebasic_no_sdchild (
+  id                            number(19) not null,
+  owner_id                      number(19) not null,
+  child_name                    varchar2(255),
+  amount                        number(19) not null,
+  version                       number(19) not null,
+  constraint pk_ebasic_no_sdchild primary key (id)
+);
+create sequence ebasic_no_sdchild_seq;
+
+create table ebasic_sdchild (
+  id                            number(19) not null,
+  owner_id                      number(19) not null,
+  child_name                    varchar2(255),
+  amount                        number(19) not null,
+  version                       number(19) not null,
+  deleted                       number(1) default 0 not null,
+  constraint pk_ebasic_sdchild primary key (id)
+);
+create sequence ebasic_sdchild_seq;
+
+create table ebasic_soft_delete (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  description                   varchar2(255),
+  version                       number(19) not null,
+  deleted                       number(1) default 0 not null,
+  constraint pk_ebasic_soft_delete primary key (id)
+);
+create sequence ebasic_soft_delete_seq;
+
 create table e_basicver (
   id                            number(10) not null,
   name                          varchar2(255),
@@ -527,6 +925,7 @@ create sequence e_basicver_seq;
 create table e_basic_withlife (
   id                            number(19) not null,
   name                          varchar2(255),
+  deleted                       number(1) default 0 not null,
   version                       number(19) not null,
   constraint pk_e_basic_withlife primary key (id)
 );
@@ -534,16 +933,31 @@ create sequence e_basic_withlife_seq;
 
 create table e_basicverucon (
   id                            number(10) not null,
-  name                          varchar2(255),
-  other                         varchar2(255),
-  other_one                     varchar2(255),
+  name                          varchar2(127),
+  other                         varchar2(127),
+  other_one                     varchar2(127),
   description                   varchar2(255),
   last_update                   timestamp not null,
   constraint uq_e_basicverucon_name unique (name),
+  constraint uq_e_bscvrcn_thr_thr_n unique (other,other_one),
   constraint pk_e_basicverucon primary key (id)
 );
 create sequence e_basicverucon_seq;
 
+create table e_col_ab (
+  id                            number(19) not null,
+  column_a                      varchar2(255),
+  column_b                      varchar2(255),
+  constraint pk_e_col_ab primary key (id)
+);
+create sequence e_col_ab_seq;
+
+create table ecustom_id (
+  id                            varchar2(127) not null,
+  name                          varchar2(255),
+  constraint pk_ecustom_id primary key (id)
+);
+
 create table eemb_inner (
   id                            number(10) not null,
   nome_inner                    varchar2(255),
@@ -577,6 +991,8 @@ create table egen_props (
   odt_updated                   timestamp not null,
   zdt_created                   timestamp not null,
   zdt_updated                   timestamp not null,
+  instant_created               timestamp not null,
+  instant_updated               timestamp not null,
   long_created                  number(19) not null,
   long_updated                  number(19) not null,
   constraint pk_egen_props primary key (id)
@@ -591,11 +1007,15 @@ create table einvoice (
   ship_street                   varchar2(255),
   ship_suburb                   varchar2(255),
   ship_city                     varchar2(255),
-  street                        varchar2(255),
-  suburb                        varchar2(255),
-  city                          varchar2(255),
+  ship_status                   varchar2(3),
+  bill_street                   varchar2(255),
+  bill_suburb                   varchar2(255),
+  bill_city                     varchar2(255),
+  bill_status                   varchar2(3),
   version                       number(19) not null,
-  constraint ck_einvoice_state check (state in (0,1,2)),
+  constraint ck_einvoice_state check ( state in (0,1,2)),
+  constraint ck_einvoice_ship_status check ( ship_status in ('ONE','TWO')),
+  constraint ck_einvoice_bill_status check ( bill_status in ('ONE','TWO')),
   constraint pk_einvoice primary key (id)
 );
 create sequence einvoice_seq;
@@ -662,18 +1082,122 @@ create table eperson (
   notes                         varchar2(255),
   street                        varchar2(255),
   suburb                        varchar2(255),
-  city                          varchar2(255),
+  addr_city                     varchar2(255),
+  addr_status                   varchar2(3),
   version                       number(19) not null,
+  constraint ck_eperson_addr_status check ( addr_status in ('ONE','TWO')),
   constraint pk_eperson primary key (id)
 );
 create sequence eperson_seq;
 
+create table e_person_online (
+  id                            number(19) not null,
+  email                         varchar2(127),
+  online_status                 number(1) default 0 not null,
+  when_updated                  timestamp not null,
+  constraint uq_e_person_online_email unique (email),
+  constraint pk_e_person_online primary key (id)
+);
+create sequence e_person_online_seq;
+
 create table esimple (
-  usertypeid                    number(10) not null,
+  usertypeid                    number(10) generated always as identity not null,
   name                          varchar2(255),
   constraint pk_esimple primary key (usertypeid)
 );
-create sequence esimple_seq;
+
+create table esoft_del_book (
+  id                            number(19) not null,
+  book_title                    varchar2(255),
+  lend_by_id                    number(19),
+  version                       number(19) not null,
+  deleted                       number(1) default 0 not null,
+  constraint pk_esoft_del_book primary key (id)
+);
+create sequence esoft_del_book_seq;
+
+create table esoft_del_book_esoft_del_user (
+  esoft_del_book_id             number(19) not null,
+  esoft_del_user_id             number(19) not null,
+  constraint pk_esft_dl_bk_sft_dl_sr primary key (esoft_del_book_id,esoft_del_user_id)
+);
+
+create table esoft_del_down (
+  id                            number(19) not null,
+  esoft_del_mid_id              number(19) not null,
+  down                          varchar2(255),
+  version                       number(19) not null,
+  deleted                       number(1) default 0 not null,
+  constraint pk_esoft_del_down primary key (id)
+);
+create sequence esoft_del_down_seq;
+
+create table esoft_del_mid (
+  id                            number(19) not null,
+  top_id                        number(19),
+  mid                           varchar2(255),
+  up_id                         number(19),
+  version                       number(19) not null,
+  deleted                       number(1) default 0 not null,
+  constraint pk_esoft_del_mid primary key (id)
+);
+create sequence esoft_del_mid_seq;
+
+create table esoft_del_role (
+  id                            number(19) not null,
+  role_name                     varchar2(255),
+  version                       number(19) not null,
+  deleted                       number(1) default 0 not null,
+  constraint pk_esoft_del_role primary key (id)
+);
+create sequence esoft_del_role_seq;
+
+create table esoft_del_role_esoft_del_user (
+  esoft_del_role_id             number(19) not null,
+  esoft_del_user_id             number(19) not null,
+  constraint pk_esft_dl_rl_sft_dl_sr primary key (esoft_del_role_id,esoft_del_user_id)
+);
+
+create table esoft_del_top (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  deleted                       number(1) default 0 not null,
+  constraint pk_esoft_del_top primary key (id)
+);
+create sequence esoft_del_top_seq;
+
+create table esoft_del_up (
+  id                            number(19) not null,
+  up                            varchar2(255),
+  version                       number(19) not null,
+  deleted                       number(1) default 0 not null,
+  constraint pk_esoft_del_up primary key (id)
+);
+create sequence esoft_del_up_seq;
+
+create table esoft_del_user (
+  id                            number(19) not null,
+  user_name                     varchar2(255),
+  version                       number(19) not null,
+  deleted                       number(1) default 0 not null,
+  constraint pk_esoft_del_user primary key (id)
+);
+create sequence esoft_del_user_seq;
+
+create table esoft_del_user_esoft_del_role (
+  esoft_del_user_id             number(19) not null,
+  esoft_del_role_id             number(19) not null,
+  constraint pk_esft_dl_sr_sft_dl_rl primary key (esoft_del_user_id,esoft_del_role_id)
+);
+
+create table esome_convert_type (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  money                         number(38),
+  constraint pk_esome_convert_type primary key (id)
+);
+create sequence esome_convert_type_seq;
 
 create table esome_type (
   id                            number(10) not null,
@@ -691,6 +1215,15 @@ create table etrans_many (
 );
 create sequence etrans_many_seq;
 
+create table rawinherit_uncle (
+  id                            number(10) not null,
+  name                          varchar2(255),
+  parent_id                     number(19) not null,
+  version                       number(19) not null,
+  constraint pk_rawinherit_uncle primary key (id)
+);
+create sequence rawinherit_uncle_seq;
+
 create table evanilla_collection (
   id                            number(10) not null,
   name                          varchar2(255),
@@ -709,11 +1242,11 @@ create sequence evanilla_collection_detail_seq;
 create table ewho_props (
   id                            number(19) not null,
   name                          varchar2(255),
-  who_created                   varchar2(255) not null,
-  who_modified                  varchar2(255) not null,
   version                       number(19) not null,
   when_created                  timestamp not null,
   when_modified                 timestamp not null,
+  who_created                   varchar2(255) not null,
+  who_modified                  varchar2(255) not null,
   constraint pk_ewho_props primary key (id)
 );
 create sequence ewho_props_seq;
@@ -744,6 +1277,15 @@ create table td_parent (
 );
 create sequence td_parent_seq;
 
+create table empl (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  age                           number(10),
+  default_address_id            number(19),
+  constraint pk_empl primary key (id)
+);
+create sequence empl_seq;
+
 create table feature_desc (
   id                            number(10) not null,
   name                          varchar2(255),
@@ -768,18 +1310,17 @@ create table foo (
 create sequence foo_seq;
 
 create table gen_key_identity (
-  id                            number(19) not null,
+  id                            number(19) generated always as identity not null,
   description                   varchar2(255),
   constraint pk_gen_key_identity primary key (id)
 );
-create sequence gen_key_identity_seq;
 
 create table gen_key_sequence (
   id                            number(19) not null,
   description                   varchar2(255),
   constraint pk_gen_key_sequence primary key (id)
 );
-create sequence seq;
+create sequence SEQ;
 
 create table gen_key_table (
   id                            number(19) not null,
@@ -788,9 +1329,29 @@ create table gen_key_table (
 );
 create sequence gen_key_table_seq;
 
+create table grand_parent_person (
+  identifier                    number(10) not null,
+  name                          varchar2(255),
+  age                           number(10),
+  some_bean_id                  number(10),
+  family_name                   varchar2(255),
+  address                       varchar2(255),
+  constraint pk_grand_parent_person primary key (identifier)
+);
+create sequence grand_parent_person_seq;
+
+create table survey_group (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  categoryobjectid              number(19),
+  sequence_number               number(10) not null,
+  constraint pk_survey_group primary key (id)
+);
+create sequence survey_group_seq;
+
 create table c_group (
   id                            number(19) not null,
-  inactive                      number(1),
+  inactive                      number(1) default 0 not null,
   name                          varchar2(255),
   version                       number(19) not null,
   when_created                  timestamp not null,
@@ -799,6 +1360,62 @@ create table c_group (
 );
 create sequence c_group_seq;
 
+create table he_doc (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_he_doc primary key (id)
+);
+create sequence he_doc_seq;
+
+create table hx_link (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  location                      varchar2(255),
+  comments                      varchar2(255),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_hx_link primary key (id)
+);
+create sequence hx_link_seq;
+
+create table hx_link_doc (
+  hx_link_id                    number(19) not null,
+  he_doc_id                     number(19) not null,
+  constraint pk_hx_link_doc primary key (hx_link_id,he_doc_id)
+);
+
+create table hi_doc (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_hi_doc primary key (id)
+);
+create sequence hi_doc_seq;
+
+create table hi_link (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  location                      varchar2(255),
+  comments                      varchar2(255),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_hi_link primary key (id)
+);
+create sequence hi_link_seq;
+
+create table hi_link_doc (
+  hi_link_id                    number(19) not null,
+  hi_doc_id                     number(19) not null,
+  constraint pk_hi_link_doc primary key (hi_link_id,hi_doc_id)
+);
+
 create table imrelated (
   id                            number(19) not null,
   name                          varchar2(255),
@@ -808,18 +1425,18 @@ create table imrelated (
 create sequence imrelated_seq;
 
 create table imroot (
-  dtype                         varchar2(10) not null,
+  dtype                         varchar2(31) not null,
   id                            number(19) not null,
+  name                          varchar2(255),
   title                         varchar2(255),
   when_title                    timestamp,
-  name                          varchar2(255),
   constraint pk_imroot primary key (id)
 );
 create sequence imroot_seq;
 
 create table ixresource (
   dtype                         varchar2(255),
-  id                            raw(16) not null,
+  id                            varchar2(40) not null,
   name                          varchar2(255),
   constraint pk_ixresource primary key (id)
 );
@@ -870,11 +1487,11 @@ create sequence drel_invoice_seq;
 
 create table item (
   customer                      number(10) not null,
-  itemnumber                    varchar2(255) not null,
+  itemnumber                    varchar2(127) not null,
   description                   varchar2(255),
   units                         varchar2(255),
-  type                          number(10),
-  region                        number(10),
+  type                          number(10) not null,
+  region                        number(10) not null,
   date_modified                 timestamp,
   date_created                  timestamp,
   modified_by                   varchar2(255),
@@ -883,6 +1500,59 @@ create table item (
   constraint pk_item primary key (customer,itemnumber)
 );
 
+create table monkey (
+  mid                           number(19) not null,
+  name                          varchar2(255),
+  food_preference               varchar2(255),
+  version                       number(19) not null,
+  constraint pk_monkey primary key (mid)
+);
+create sequence monkey_seq;
+
+create table trainer (
+  tid                           number(19) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_trainer primary key (tid)
+);
+create sequence trainer_seq;
+
+create table trainer_monkey (
+  trainer_tid                   number(19) not null,
+  monkey_mid                    number(19) not null,
+  constraint uq_trainer_monkey_mid unique (monkey_mid),
+  constraint pk_trainer_monkey primary key (trainer_tid,monkey_mid)
+);
+
+create table troop (
+  pid                           number(19) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_troop primary key (pid)
+);
+create sequence troop_seq;
+
+create table troop_monkey (
+  troop_pid                     number(19) not null,
+  monkey_mid                    number(19) not null,
+  constraint uq_troop_monkey_mid unique (monkey_mid),
+  constraint pk_troop_monkey primary key (troop_pid,monkey_mid)
+);
+
+create table l2_cldf_reset_bean (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  constraint pk_l2_cldf_reset_bean primary key (id)
+);
+create sequence l2_cldf_reset_bean_seq;
+
+create table l2_cldf_reset_bean_child (
+  id                            number(19) not null,
+  parent_id                     number(19),
+  constraint pk_l2_cldf_reset_bean_child primary key (id)
+);
+create sequence l2_cldf_reset_bean_child_seq;
+
 create table level1 (
   id                            number(19) not null,
   name                          varchar2(255),
@@ -929,6 +1599,35 @@ create table level4 (
 );
 create sequence level4_seq;
 
+create table link (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  location                      varchar2(255),
+  when_publish                  timestamp,
+  link_comment                  varchar2(255),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  deleted                       number(1) default 0 not null,
+  constraint pk_link primary key (id)
+);
+create sequence link_seq;
+
+create table link_draft (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  location                      varchar2(255),
+  when_publish                  timestamp,
+  link_comment                  varchar2(255),
+  dirty                         number(1) default 0 not null,
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  deleted                       number(1) default 0 not null,
+  constraint pk_link_draft primary key (id)
+);
+create sequence link_draft_seq;
+
 create table la_attr_value (
   id                            number(10) not null,
   name                          varchar2(255),
@@ -959,7 +1658,7 @@ create table non_updateprop (
   non_enum                      varchar2(5),
   name                          varchar2(255),
   note                          varchar2(255),
-  constraint ck_non_updateprop_non_enum check (non_enum in ('BEGIN','END')),
+  constraint ck_non_updateprop_non_enum check ( non_enum in ('BEGIN','END')),
   constraint pk_non_updateprop primary key (id)
 );
 create sequence non_updateprop_seq;
@@ -975,16 +1674,16 @@ create table mprinter (
   last_swap_black_id            number(19),
   version                       number(19) not null,
   constraint uq_mprinter_last_swap_cyan_id unique (last_swap_cyan_id),
-  constraint uq_mprinter_last_swap_magen_2 unique (last_swap_magenta_id),
-  constraint uq_mprinter_last_swap_yello_3 unique (last_swap_yellow_id),
-  constraint uq_mprinter_last_swap_black_4 unique (last_swap_black_id),
+  constraint uq_mprntr_lst_swp_mgnt_d unique (last_swap_magenta_id),
+  constraint uq_mprntr_lst_swp_yllw_d unique (last_swap_yellow_id),
+  constraint uq_mprntr_lst_swp_blck_d unique (last_swap_black_id),
   constraint pk_mprinter primary key (id)
 );
 create sequence mprinter_seq;
 
 create table mprinter_state (
   id                            number(19) not null,
-  flags                         number(19),
+  flags                         number(19) not null,
   printer_id                    number(19),
   version                       number(19) not null,
   constraint pk_mprinter_state primary key (id)
@@ -1041,6 +1740,34 @@ create table muser_type (
 );
 create sequence muser_type_seq;
 
+create table mail_box (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_mail_box primary key (id)
+);
+create sequence mail_box_seq;
+
+create table mail_user (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_mail_user primary key (id)
+);
+create sequence mail_user_seq;
+
+create table mail_user_inbox (
+  mail_user_id                  number(19) not null,
+  mail_box_id                   number(19) not null,
+  constraint pk_mail_user_inbox primary key (mail_user_id,mail_box_id)
+);
+
+create table mail_user_outbox (
+  mail_user_id                  number(19) not null,
+  mail_box_id                   number(19) not null,
+  constraint pk_mail_user_outbox primary key (mail_user_id,mail_box_id)
+);
+
 create table map_super_actual (
   id                            number(19) not null,
   name                          varchar2(255),
@@ -1085,6 +1812,57 @@ create table mnoc_user_mnoc_role (
   constraint pk_mnoc_user_mnoc_role primary key (mnoc_user_user_id,mnoc_role_role_id)
 );
 
+create table mny_a (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_mny_a primary key (id)
+);
+create sequence mny_a_seq;
+
+create table mny_b (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  a_id                          number(19),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_mny_b primary key (id)
+);
+create sequence mny_b_seq;
+
+create table mny_b_mny_c (
+  mny_b_id                      number(19) not null,
+  mny_c_id                      number(19) not null,
+  constraint pk_mny_b_mny_c primary key (mny_b_id,mny_c_id)
+);
+
+create table mny_c (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_mny_c primary key (id)
+);
+create sequence mny_c_seq;
+
+create table mny_topic (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_mny_topic primary key (id)
+);
+create sequence mny_topic_seq;
+
+create table subtopics (
+  topic                         number(19) not null,
+  subtopic                      number(19) not null,
+  constraint pk_subtopics primary key (topic,subtopic)
+);
+
 create table mp_role (
   id                            number(19) not null,
   mp_user_id                    number(19) not null,
@@ -1101,10 +1879,40 @@ create table mp_user (
 );
 create sequence mp_user_seq;
 
+create table ms_many_a (
+  aid                           number(19) not null,
+  name                          varchar2(255),
+  ms_many_a_many_b              number(1) default 0 not null,
+  ms_many_b                     number(1) default 0 not null,
+  deleted                       number(1) default 0 not null,
+  constraint pk_ms_many_a primary key (aid)
+);
+create sequence ms_many_a_seq;
+
+create table ms_many_a_many_b (
+  ms_many_a_aid                 number(19) not null,
+  ms_many_b_bid                 number(19) not null,
+  constraint pk_ms_many_a_many_b primary key (ms_many_a_aid,ms_many_b_bid)
+);
+
+create table ms_many_b (
+  bid                           number(19) not null,
+  name                          varchar2(255),
+  deleted                       number(1) default 0 not null,
+  constraint pk_ms_many_b primary key (bid)
+);
+create sequence ms_many_b_seq;
+
+create table ms_many_b_many_a (
+  ms_many_b_bid                 number(19) not null,
+  ms_many_a_aid                 number(19) not null,
+  constraint pk_ms_many_b_many_a primary key (ms_many_b_bid,ms_many_a_aid)
+);
+
 create table my_lob_size (
   id                            number(10) not null,
   name                          varchar2(255),
-  my_count                      number(10),
+  my_count                      number(10) not null,
   my_lob                        clob,
   constraint pk_my_lob_size primary key (id)
 );
@@ -1145,6 +1953,25 @@ create table o_cached_bean_child (
 );
 create sequence o_cached_bean_child_seq;
 
+create table o_cached_natkey (
+  id                            number(19) not null,
+  store                         varchar2(255),
+  sku                           varchar2(255),
+  description                   varchar2(255),
+  constraint pk_o_cached_natkey primary key (id)
+);
+create sequence o_cached_natkey_seq;
+
+create table o_cached_natkey3 (
+  id                            number(19) not null,
+  store                         varchar2(255),
+  code                          number(10) not null,
+  sku                           varchar2(255),
+  description                   varchar2(255),
+  constraint pk_o_cached_natkey3 primary key (id)
+);
+create sequence o_cached_natkey3_seq;
+
 create table ocar (
   id                            number(10) not null,
   vin                           varchar2(255),
@@ -1156,8 +1983,19 @@ create table ocar (
 );
 create sequence ocar_seq;
 
+create table ocompany (
+  id                            number(10) not null,
+  corp_id                       varchar2(50),
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       number(19) not null,
+  constraint uq_ocompany_corp_id unique (corp_id),
+  constraint pk_ocompany primary key (id)
+);
+create sequence ocompany_seq;
+
 create table oengine (
-  engine_id                     raw(16) not null,
+  engine_id                     varchar2(40) not null,
   short_desc                    varchar2(255),
   car_id                        number(10),
   version                       number(10) not null,
@@ -1166,7 +2004,7 @@ create table oengine (
 );
 
 create table ogear_box (
-  id                            raw(16) not null,
+  id                            varchar2(40) not null,
   box_desc                      varchar2(255),
   box_size                      number(10),
   car_id                        number(10),
@@ -1175,6 +2013,35 @@ create table ogear_box (
   constraint pk_ogear_box primary key (id)
 );
 
+create table oroad_show_msg (
+  id                            number(10) not null,
+  company_id                    number(10) not null,
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       number(19) not null,
+  constraint uq_oroad_show_msg_company_id unique (company_id),
+  constraint pk_oroad_show_msg primary key (id)
+);
+create sequence oroad_show_msg_seq;
+
+create table om_ordered_detail (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  master_id                     number(19),
+  version                       number(19) not null,
+  sort_order                    number(10),
+  constraint pk_om_ordered_detail primary key (id)
+);
+create sequence om_ordered_detail_seq;
+
+create table om_ordered_master (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_om_ordered_master primary key (id)
+);
+create sequence om_ordered_master_seq;
+
 create table o_order (
   id                            number(10) not null,
   status                        number(10),
@@ -1183,14 +2050,14 @@ create table o_order (
   kcustomer_id                  number(10) not null,
   cretime                       timestamp not null,
   updtime                       timestamp not null,
-  constraint ck_o_order_status check (status in (0,1,2,3)),
+  constraint ck_o_order_status check ( status in (0,1,2,3)),
   constraint pk_o_order primary key (id)
 );
 create sequence o_order_seq;
 
 create table o_order_detail (
   id                            number(10) not null,
-  order_id                      number(10),
+  order_id                      number(10) not null,
   order_qty                     number(10),
   ship_qty                      number(10),
   unit_price                    number(19,4),
@@ -1202,15 +2069,15 @@ create table o_order_detail (
 create sequence o_order_detail_seq;
 
 create table s_orders (
-  uuid                          varchar2(255) not null,
+  uuid                          varchar2(40) not null,
   constraint pk_s_orders primary key (uuid)
 );
 
 create table s_order_items (
-  uuid                          varchar2(255) not null,
+  uuid                          varchar2(40) not null,
   product_variant_uuid          varchar2(255),
-  order_uuid                    varchar2(255),
-  quantity                      number(10),
+  order_uuid                    varchar2(40),
+  quantity                      number(10) not null,
   amount                        number(38),
   constraint pk_s_order_items primary key (uuid)
 );
@@ -1226,6 +2093,30 @@ create table or_order_ship (
 );
 create sequence or_order_ship_seq;
 
+create table organisation (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_organisation primary key (id)
+);
+create sequence organisation_seq;
+
+create table oto_bchild (
+  master_id                     number(19) not null,
+  child                         varchar2(255),
+  constraint pk_oto_bchild primary key (master_id)
+);
+create sequence oto_bchild_seq;
+
+create table oto_bmaster (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  constraint pk_oto_bmaster primary key (id)
+);
+create sequence oto_bmaster_seq;
+
 create table oto_child (
   id                            number(10) not null,
   name                          varchar2(255),
@@ -1235,6 +2126,26 @@ create table oto_child (
 );
 create sequence oto_child_seq;
 
+create table oto_cust (
+  cid                           number(19) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_oto_cust primary key (cid)
+);
+create sequence oto_cust_seq;
+
+create table oto_cust_address (
+  aid                           number(19) not null,
+  line1                         varchar2(255),
+  line2                         varchar2(255),
+  line3                         varchar2(255),
+  customer_cid                  number(19),
+  version                       number(19) not null,
+  constraint uq_ot_cst_ddrss_cstmr_cd unique (customer_cid),
+  constraint pk_oto_cust_address primary key (aid)
+);
+create sequence oto_cust_address_seq;
+
 create table oto_master (
   id                            number(19) not null,
   name                          varchar2(255),
@@ -1242,6 +2153,82 @@ create table oto_master (
 );
 create sequence oto_master_seq;
 
+create table oto_prime (
+  pid                           number(19) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_oto_prime primary key (pid)
+);
+create sequence oto_prime_seq;
+
+create table oto_prime_extra (
+  eid                           number(19) not null,
+  extra                         varchar2(255),
+  version                       number(19) not null,
+  constraint pk_oto_prime_extra primary key (eid)
+);
+
+create table oto_th_many (
+  id                            number(19) not null,
+  oto_th_top_id                 number(19) not null,
+  many                          varchar2(255),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_oto_th_many primary key (id)
+);
+create sequence oto_th_many_seq;
+
+create table oto_th_one (
+  id                            number(19) not null,
+  one                           number(1) default 0 not null,
+  many_id                       number(19),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint uq_oto_th_one_many_id unique (many_id),
+  constraint pk_oto_th_one primary key (id)
+);
+create sequence oto_th_one_seq;
+
+create table oto_th_top (
+  id                            number(19) not null,
+  topp                          varchar2(255),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_oto_th_top primary key (id)
+);
+create sequence oto_th_top_seq;
+
+create table oto_ubprime (
+  pid                           varchar2(40) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_oto_ubprime primary key (pid)
+);
+
+create table oto_ubprime_extra (
+  eid                           varchar2(40) not null,
+  extra                         varchar2(255),
+  version                       number(19) not null,
+  constraint pk_oto_ubprime_extra primary key (eid)
+);
+
+create table oto_uprime (
+  pid                           varchar2(40) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_oto_uprime primary key (pid)
+);
+
+create table oto_uprime_extra (
+  eid                           varchar2(40) not null,
+  extra                         varchar2(255),
+  version                       number(19) not null,
+  constraint pk_oto_uprime_extra primary key (eid)
+);
+
 create table pfile (
   id                            number(10) not null,
   name                          varchar2(255),
@@ -1267,7 +2254,7 @@ create table pfile_content (
 create sequence pfile_content_seq;
 
 create table paggview (
-  pview_id                      raw(16),
+  pview_id                      varchar2(40),
   amount                        number(10) not null,
   constraint uq_paggview_pview_id unique (pview_id)
 );
@@ -1301,6 +2288,7 @@ create table rawinherit_parent (
   type                          varchar2(31) not null,
   id                            number(19) not null,
   val                           number(10),
+  more                          varchar2(255),
   constraint pk_rawinherit_parent primary key (id)
 );
 create sequence rawinherit_parent_seq;
@@ -1308,9 +2296,21 @@ create sequence rawinherit_parent_seq;
 create table rawinherit_parent_rawinherit_d (
   rawinherit_parent_id          number(19) not null,
   rawinherit_data_id            number(19) not null,
-  constraint pk_rawinherit_parent_rawinh_0 primary key (rawinherit_parent_id,rawinherit_data_id)
+  constraint pk_rwnhrt_prnt_rwnhrt_d primary key (rawinherit_parent_id,rawinherit_data_id)
 );
 
+create table parent_person (
+  identifier                    number(10) not null,
+  name                          varchar2(255),
+  age                           number(10),
+  some_bean_id                  number(10),
+  parent_identifier             number(10),
+  family_name                   varchar2(255),
+  address                       varchar2(255),
+  constraint pk_parent_person primary key (identifier)
+);
+create sequence parent_person_seq;
+
 create table c_participation (
   id                            number(19) not null,
   rating                        number(10),
@@ -1320,13 +2320,13 @@ create table c_participation (
   version                       number(19) not null,
   when_created                  timestamp not null,
   when_modified                 timestamp not null,
-  constraint ck_c_participation_type check (type in (0,1)),
+  constraint ck_c_participation_type check ( type in (0,1)),
   constraint pk_c_participation primary key (id)
 );
 create sequence c_participation_seq;
 
 create table mt_permission (
-  id                            raw(16) not null,
+  id                            varchar2(40) not null,
   name                          varchar2(255),
   constraint pk_mt_permission primary key (id)
 );
@@ -1348,7 +2348,7 @@ create table persistent_file_content (
   cretime                       timestamp not null,
   updtime                       timestamp not null,
   version                       number(19) not null,
-  constraint uq_persistent_file_content__1 unique (persistent_file_id),
+  constraint uq_prsstnt_fl_cntnt_prsstnt_1 unique (persistent_file_id),
   constraint pk_persistent_file_content primary key (id)
 );
 create sequence persistent_file_content_seq;
@@ -1359,7 +2359,7 @@ create table persons (
   name                          varchar2(64) not null,
   constraint pk_persons primary key (id)
 );
-create sequence persons_seq start with 1000 increment by 40;
+create sequence PERSONS_seq start with 1000;
 
 create table person (
   oid                           number(19) not null,
@@ -1376,7 +2376,15 @@ create table phones (
   constraint uq_phones_phone_number unique (phone_number),
   constraint pk_phones primary key (id)
 );
-create sequence phones_seq;
+create sequence PHONES_seq;
+
+create table primary_revision (
+  id                            number(19) not null,
+  revision                      number(10) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_primary_revision primary key (id,revision)
+);
 
 create table o_product (
   id                            number(10) not null,
@@ -1389,29 +2397,38 @@ create table o_product (
 create sequence o_product_seq;
 
 create table pp (
-  id                            raw(16) not null,
+  id                            varchar2(40) not null,
   name                          varchar2(255),
   value                         varchar2(100) not null,
   constraint pk_pp primary key (id)
 );
 
 create table pp_to_ww (
-  pp_id                         raw(16) not null,
-  ww_id                         raw(16) not null,
+  pp_id                         varchar2(40) not null,
+  ww_id                         varchar2(40) not null,
   constraint pk_pp_to_ww primary key (pp_id,ww_id)
 );
 
+create table question (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  groupobjectid                 number(19),
+  sequence_number               number(10) not null,
+  constraint pk_question primary key (id)
+);
+create sequence question_seq;
+
 create table rcustomer (
-  company                       varchar2(255) not null,
-  name                          varchar2(255) not null,
+  company                       varchar2(127) not null,
+  name                          varchar2(127) not null,
   description                   varchar2(255),
   constraint pk_rcustomer primary key (company,name)
 );
 
 create table r_orders (
-  company                       varchar2(255) not null,
+  company                       varchar2(127) not null,
   order_number                  number(10) not null,
-  customername                  varchar2(255),
+  customername                  varchar2(127),
   item                          varchar2(255),
   constraint pk_r_orders primary key (company,order_number)
 );
@@ -1431,20 +2448,6 @@ create table resourcefile (
   constraint pk_resourcefile primary key (id)
 );
 
-create table mt_role (
-  id                            raw(16) not null,
-  name                          varchar2(50),
-  tenant_id                     raw(16),
-  version                       number(19) not null,
-  constraint pk_mt_role primary key (id)
-);
-
-create table mt_role_permission (
-  mt_role_id                    raw(16) not null,
-  mt_permission_id              raw(16) not null,
-  constraint pk_mt_role_permission primary key (mt_role_id,mt_permission_id)
-);
-
 create table em_role (
   id                            number(19) not null,
   name                          varchar2(255),
@@ -1452,8 +2455,23 @@ create table em_role (
 );
 create sequence em_role_seq;
 
+create table mt_role (
+  id                            varchar2(40) not null,
+  name                          varchar2(50),
+  tenant_id                     varchar2(40),
+  version                       number(19) not null,
+  constraint pk_mt_role primary key (id)
+);
+
+create table mt_role_permission (
+  mt_role_id                    varchar2(40) not null,
+  mt_permission_id              varchar2(40) not null,
+  constraint pk_mt_role_permission primary key (mt_role_id,mt_permission_id)
+);
+
 create table f_second (
   id                            number(19) not null,
+  mod_name                      varchar2(255),
   first                         number(19),
   title                         varchar2(255),
   constraint uq_f_second_first unique (first),
@@ -1469,7 +2487,7 @@ create table section (
   cretime                       timestamp not null,
   updtime                       timestamp not null,
   version                       number(19) not null,
-  constraint ck_section_type check (type in (0,1)),
+  constraint ck_section_type check ( type in (0,1)),
   constraint pk_section primary key (id)
 );
 create sequence section_seq;
@@ -1503,7 +2521,7 @@ create table some_enum_bean (
   id                            number(19) not null,
   some_enum                     number(10),
   name                          varchar2(255),
-  constraint ck_some_enum_bean_some_enum check (some_enum in (0,1)),
+  constraint ck_some_enum_bean_some_enum check ( some_enum in (0,1)),
   constraint pk_some_enum_bean primary key (id)
 );
 create sequence some_enum_bean_seq;
@@ -1530,18 +2548,16 @@ create table some_new_types_bean (
   instant                       timestamp,
   zone_id                       varchar2(60),
   zone_offset                   varchar2(60),
+  path                          varchar2(255),
   version                       number(19) not null,
-  constraint ck_some_new_types_bean_dow check (dow in ('1','2','3','4','5','6','7')),
-  constraint ck_some_new_types_bean_mth check (mth in ('1','2','3','4','5','6','7','8','9','10','11','12')),
+  constraint ck_some_new_types_bean_dow check ( dow in (1,2,3,4,5,6,7)),
+  constraint ck_some_new_types_bean_mth check ( mth in (1,2,3,4,5,6,7,8,9,10,11,12)),
   constraint pk_some_new_types_bean primary key (id)
 );
 create sequence some_new_types_bean_seq;
 
 create table some_period_bean (
   id                            number(19) not null,
-  period_years                  number(10),
-  period_months                 number(10),
-  period_days                   number(10),
   anniversary                   date,
   version                       number(19) not null,
   constraint pk_some_period_bean primary key (id)
@@ -1575,6 +2591,13 @@ create table sub_type (
 );
 create sequence sub_type_seq;
 
+create table survey (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  constraint pk_survey primary key (id)
+);
+create sequence survey_seq;
+
 create table tbytes_only (
   id                            number(10) not null,
   content                       blob,
@@ -1584,11 +2607,40 @@ create sequence tbytes_only_seq;
 
 create table tcar (
   type                          varchar2(31) not null,
-  plate_no                      varchar2(255) not null,
+  plate_no                      varchar2(32) not null,
   truckload                     number(19),
   constraint pk_tcar primary key (plate_no)
 );
 
+create table tevent (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_tevent primary key (id)
+);
+create sequence tevent_seq;
+
+create table tevent_many (
+  id                            number(19) not null,
+  description                   varchar2(255),
+  event_id                      number(19),
+  units                         number(10) not null,
+  amount                        number(19,4) not null,
+  version                       number(19) not null,
+  constraint pk_tevent_many primary key (id)
+);
+create sequence tevent_many_seq;
+
+create table tevent_one (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  event_id                      number(19),
+  version                       number(19) not null,
+  constraint uq_tevent_one_event_id unique (event_id),
+  constraint pk_tevent_one primary key (id)
+);
+create sequence tevent_one_seq;
+
 create table tint_root (
   my_type                       number(3) not null,
   id                            number(10) not null,
@@ -1618,7 +2670,7 @@ create table t_oneb (
   id                            number(10) not null,
   name                          varchar2(255),
   description                   varchar2(255),
-  active                        number(1),
+  active                        number(1) default 0 not null,
   constraint pk_t_oneb primary key (id)
 );
 create sequence t_oneb_seq;
@@ -1627,9 +2679,11 @@ create table t_detail_with_other_namexxxyy (
   id                            number(10) not null,
   name                          varchar2(255),
   description                   varchar2(255),
-  active                        number(1),
+  some_unique_value             varchar2(127),
+  active                        number(1) default 0 not null,
   master_id                     number(10),
-  constraint pk_t_detail_with_other_name_0 primary key (id)
+  constraint uq_t_dtl_wth_thr_nmxxxyy_sm_1 unique (some_unique_value),
+  constraint pk_t_dtl_wth_thr_nmxxxyy primary key (id)
 );
 create sequence t_atable_detail_seq;
 
@@ -1637,7 +2691,7 @@ create table ts_detail_two (
   id                            number(10) not null,
   name                          varchar2(255),
   description                   varchar2(255),
-  active                        number(1),
+  active                        number(1) default 0 not null,
   master_id                     number(10),
   constraint pk_ts_detail_two primary key (id)
 );
@@ -1647,7 +2701,7 @@ create table t_atable_thatisrelatively (
   id                            number(10) not null,
   name                          varchar2(255),
   description                   varchar2(255),
-  active                        number(1),
+  active                        number(1) default 0 not null,
   constraint pk_t_atable_thatisrelatively primary key (id)
 );
 create sequence t_atable_master_seq;
@@ -1656,20 +2710,20 @@ create table ts_master_two (
   id                            number(10) not null,
   name                          varchar2(255),
   description                   varchar2(255),
-  active                        number(1),
+  active                        number(1) default 0 not null,
   constraint pk_ts_master_two primary key (id)
 );
 create sequence ts_master_two_seq;
 
 create table tuuid_entity (
-  id                            raw(16) not null,
+  id                            varchar2(40) not null,
   name                          varchar2(255),
   constraint pk_tuuid_entity primary key (id)
 );
 
 create table twheel (
   id                            number(19) not null,
-  owner_plate_no                varchar2(255) not null,
+  owner_plate_no                varchar2(32) not null,
   constraint pk_twheel primary key (id)
 );
 create sequence twheel_seq;
@@ -1683,18 +2737,21 @@ create table twith_pre_insert (
 create sequence twith_pre_insert_seq;
 
 create table mt_tenant (
-  id                            raw(16) not null,
+  id                            varchar2(40) not null,
   name                          varchar2(255),
   version                       number(19) not null,
   constraint pk_mt_tenant primary key (id)
 );
 
-create table sa_tire (
-  id                            number(19) not null,
-  version                       number(10) not null,
-  constraint pk_sa_tire primary key (id)
+create table test_annotation_base_entity (
+  direct                        varchar2(255),
+  meta                          varchar2(255),
+  mixed                         varchar2(255),
+  constraint_annotation         varchar2(40),
+  null1                         varchar2(255) not null,
+  null2                         varchar2(255),
+  null3                         varchar2(255)
 );
-create sequence sa_tire_seq;
 
 create table tire (
   id                            number(19) not null,
@@ -1705,6 +2762,13 @@ create table tire (
 );
 create sequence tire_seq;
 
+create table sa_tire (
+  id                            number(19) not null,
+  version                       number(10) not null,
+  constraint pk_sa_tire primary key (id)
+);
+create sequence sa_tire_seq;
+
 create table trip (
   id                            number(10) not null,
   vehicle_driver_id             number(10),
@@ -1734,6 +2798,15 @@ create table type (
   constraint pk_type primary key (customer,type)
 );
 
+create table tz_bean (
+  id                            number(19) not null,
+  moda                          varchar2(255),
+  ts                            timestamp,
+  tstz                          timestamp,
+  constraint pk_tz_bean primary key (id)
+);
+create sequence tz_bean_seq;
+
 create table ut_detail (
   id                            number(10) not null,
   utmaster_id                   number(10) not null,
@@ -1755,24 +2828,31 @@ create table ut_master (
 create sequence ut_master_seq;
 
 create table uuone (
-  id                            raw(16) not null,
+  id                            varchar2(40) not null,
   name                          varchar2(255),
   constraint pk_uuone primary key (id)
 );
 
 create table uutwo (
-  id                            raw(16) not null,
+  id                            varchar2(40) not null,
   name                          varchar2(255),
-  master_id                     raw(16),
+  master_id                     varchar2(40),
   constraint pk_uutwo primary key (id)
 );
 
-create table em_user (
+create table c_user (
   id                            number(19) not null,
+  inactive                      number(1) default 0 not null,
   name                          varchar2(255),
-  constraint pk_em_user primary key (id)
+  email                         varchar2(255),
+  password_hash                 varchar2(255),
+  group_id                      number(19),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_c_user primary key (id)
 );
-create sequence em_user_seq;
+create sequence c_user_seq;
 
 create table tx_user (
   id                            number(19) not null,
@@ -1781,18 +2861,20 @@ create table tx_user (
 );
 create sequence tx_user_seq;
 
-create table c_user (
+create table g_user (
   id                            number(19) not null,
-  inactive                      number(1),
-  name                          varchar2(255),
-  email                         varchar2(255),
-  group_id                      number(19),
+  username                      varchar2(255),
   version                       number(19) not null,
-  when_created                  timestamp not null,
-  when_modified                 timestamp not null,
-  constraint pk_c_user primary key (id)
+  constraint pk_g_user primary key (id)
 );
-create sequence c_user_seq;
+create sequence g_user_seq;
+
+create table em_user (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  constraint pk_em_user primary key (id)
+);
+create sequence em_user_seq;
 
 create table oto_user (
   id                            number(19) not null,
@@ -1820,10 +2902,13 @@ create table vehicle (
   cretime                       timestamp not null,
   updtime                       timestamp not null,
   version                       number(19) not null,
-  truck_ref_id                  number(10),
-  capacity                      number(19,4),
+  siz                           varchar2(1),
   driver                        varchar2(255),
   car_ref_id                    number(10),
+  notes                         varchar2(255),
+  truck_ref_id                  number(10),
+  capacity                      number(19,4),
+  constraint ck_vehicle_siz check ( siz in ('S','M','L','H')),
   constraint pk_vehicle primary key (id)
 );
 create sequence vehicle_seq;
@@ -1863,13 +2948,6 @@ create table sa_wheel (
 );
 create sequence sa_wheel_seq;
 
-create table sp_car_wheel (
-  id                            number(19) not null,
-  version                       number(10) not null,
-  constraint pk_sp_car_wheel primary key (id)
-);
-create sequence sp_car_wheel_seq;
-
 create table wheel (
   id                            number(19) not null,
   version                       number(10) not null,
@@ -1877,10 +2955,30 @@ create table wheel (
 );
 create sequence wheel_seq;
 
+create table sp_car_wheel (
+  id                            number(19) not null,
+  version                       number(10) not null,
+  constraint pk_sp_car_wheel primary key (id)
+);
+create sequence sp_car_wheel_seq;
+
+create table g_who_props_otm (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  who_created_id                number(19),
+  who_modified_id               number(19),
+  constraint pk_g_who_props_otm primary key (id)
+);
+create sequence g_who_props_otm_seq;
+
 create table with_zero (
   id                            number(19) not null,
   name                          varchar2(255),
   parent_id                     number(10),
+  lang                          varchar2(2) default 'en' not null,
   version                       number(19) not null,
   constraint pk_with_zero primary key (id)
 );
@@ -1894,8 +2992,8 @@ create table parent (
 create sequence parent_seq;
 
 create table wview (
-  id                            raw(16) not null,
-  name                          varchar2(255) not null,
+  id                            varchar2(40) not null,
+  name                          varchar2(127) not null,
   constraint uq_wview_name unique (name),
   constraint pk_wview primary key (id)
 );
@@ -1908,48 +3006,85 @@ create table zones (
 );
 create sequence zones_seq;
 
+create index ix_cntct_lst_nm_frst_nm on contact (last_name,first_name);
+create index ix_e_basic_name on e_basic (name);
 alter table bar add constraint fk_bar_foo_id foreign key (foo_id) references foo (foo_id);
 create index ix_bar_foo_id on bar (foo_id);
 
+alter table addr add constraint fk_addr_employee_id foreign key (employee_id) references empl (id);
+create index ix_addr_employee_id on addr (employee_id);
+
 alter table o_address add constraint fk_o_address_country_code foreign key (country_code) references o_country (code);
 create index ix_o_address_country_code on o_address (country_code);
 
-alter table animals add constraint fk_animals_shelter_id foreign key (shelter_id) references animal_shelter (id);
-create index ix_animals_shelter_id on animals (shelter_id);
+alter table album add constraint fk_album_cover_id foreign key (cover_id) references cover (id);
 
-alter table attribute add constraint fk_attribute_attribute_hold_1 foreign key (attribute_holder_id) references attribute_holder (id);
-create index ix_attribute_attribute_hold_1 on attribute (attribute_holder_id);
+alter table animal add constraint fk_animal_shelter_id foreign key (shelter_id) references animal_shelter (id);
+create index ix_animal_shelter_id on animal (shelter_id);
+
+alter table attribute add constraint fk_attrbt_ttrbt_hldr_d foreign key (attribute_holder_id) references attribute_holder (id);
+create index ix_attrbt_ttrbt_hldr_d on attribute (attribute_holder_id);
 
 alter table bbookmark add constraint fk_bbookmark_user_id foreign key (user_id) references bbookmark_user (id);
 create index ix_bbookmark_user_id on bbookmark (user_id);
 
+alter table bsite_user add constraint fk_bsite_user_site_id foreign key (site_id) references bsite (id);
+create index ix_bsite_user_site_id on bsite_user (site_id);
+
+alter table bsite_user add constraint fk_bsite_user_user_id foreign key (user_id) references buser (id);
+create index ix_bsite_user_user_id on bsite_user (user_id);
+
+alter table bsite_user_b add constraint fk_bsite_user_b_site foreign key (site) references bsite (id);
+create index ix_bsite_user_b_site on bsite_user_b (site);
+
+alter table bsite_user_b add constraint fk_bsite_user_b_usr foreign key (usr) references buser (id);
+create index ix_bsite_user_b_usr on bsite_user_b (usr);
+
+alter table bsite_user_c add constraint fk_bsite_user_c_site_uid foreign key (site_uid) references bsite (id);
+create index ix_bsite_user_c_site_uid on bsite_user_c (site_uid);
+
+alter table bsite_user_c add constraint fk_bsite_user_c_user_uid foreign key (user_uid) references buser (id);
+create index ix_bsite_user_c_user_uid on bsite_user_c (user_uid);
+
 alter table drel_booking add constraint fk_drel_booking_agent_invoice foreign key (agent_invoice) references drel_invoice (id);
 
-alter table drel_booking add constraint fk_drel_booking_client_invo_2 foreign key (client_invoice) references drel_invoice (id);
+alter table drel_booking add constraint fk_drl_bkng_clnt_nvc foreign key (client_invoice) references drel_invoice (id);
 
-alter table ckey_detail add constraint fk_ckey_detail_ckey_parent foreign key (one_key,two_key) references ckey_parent (one_key,two_key);
-create index ix_ckey_detail_one_key_two__1 on ckey_detail (one_key,two_key);
+alter table ckey_detail add constraint fk_ckey_detail_parent foreign key (one_key,two_key) references ckey_parent (one_key,two_key);
+create index ix_ckey_detail_parent on ckey_detail (one_key,two_key);
 
 alter table ckey_parent add constraint fk_ckey_parent_assoc_id foreign key (assoc_id) references ckey_assoc (id);
 create index ix_ckey_parent_assoc_id on ckey_parent (assoc_id);
 
-alter table calculation_result add constraint fk_calculation_result_produ_1 foreign key (product_configuration_id) references configuration (id);
-create index ix_calculation_result_produ_1 on calculation_result (product_configuration_id);
+alter table calculation_result add constraint fk_clcltn_rslt_prdct_cnfgrt_1 foreign key (product_configuration_id) references configuration (id);
+create index ix_clcltn_rslt_prdct_cnfgrt_1 on calculation_result (product_configuration_id);
 
-alter table calculation_result add constraint fk_calculation_result_group_2 foreign key (group_configuration_id) references configuration (id);
-create index ix_calculation_result_group_2 on calculation_result (group_configuration_id);
+alter table calculation_result add constraint fk_clcltn_rslt_grp_cnfgrtn_d foreign key (group_configuration_id) references configuration (id);
+create index ix_clcltn_rslt_grp_cnfgrtn_d on calculation_result (group_configuration_id);
 
-alter table sp_car_car_wheels add constraint fk_sp_car_car_wheels_sp_car_1 foreign key (car) references sp_car_car (id);
-create index ix_sp_car_car_wheels_car on sp_car_car_wheels (car);
+alter table sp_car_car_wheels add constraint fk_sp_cr_cr_whls_sp_cr_cr foreign key (car) references sp_car_car (id);
+create index ix_sp_cr_cr_whls_sp_cr_cr on sp_car_car_wheels (car);
 
-alter table sp_car_car_wheels add constraint fk_sp_car_car_wheels_sp_car_2 foreign key (wheel) references sp_car_wheel (id);
-create index ix_sp_car_car_wheels_wheel on sp_car_car_wheels (wheel);
+alter table sp_car_car_wheels add constraint fk_sp_cr_cr_whls_sp_cr_whl foreign key (wheel) references sp_car_wheel (id);
+create index ix_sp_cr_cr_whls_sp_cr_whl on sp_car_car_wheels (wheel);
+
+alter table car_accessory add constraint fk_car_accessory_fuse_id foreign key (fuse_id) references car_fuse (id);
+create index ix_car_accessory_fuse_id on car_accessory (fuse_id);
 
 alter table car_accessory add constraint fk_car_accessory_car_id foreign key (car_id) references vehicle (id);
 create index ix_car_accessory_car_id on car_accessory (car_id);
 
-alter table configuration add constraint fk_configuration_configurat_1 foreign key (configurations_id) references configurations (id);
-create index ix_configuration_configurat_1 on configuration (configurations_id);
+alter table category add constraint fk_category_surveyobjectid foreign key (surveyobjectid) references survey (id);
+create index ix_category_surveyobjectid on category (surveyobjectid);
+
+alter table child_person add constraint fk_child_person_some_bean_id foreign key (some_bean_id) references e_basic (id);
+create index ix_child_person_some_bean_id on child_person (some_bean_id);
+
+alter table child_person add constraint fk_chld_prsn_prnt_dntfr foreign key (parent_identifier) references parent_person (identifier);
+create index ix_chld_prsn_prnt_dntfr on child_person (parent_identifier);
+
+alter table configuration add constraint fk_cnfgrtn_cnfgrtns_d foreign key (configurations_id) references configurations (id);
+create index ix_cnfgrtn_cnfgrtns_d on configuration (configurations_id);
 
 alter table contact add constraint fk_contact_customer_id foreign key (customer_id) references o_customer (id);
 create index ix_contact_customer_id on contact (customer_id);
@@ -1963,11 +3098,60 @@ create index ix_contact_note_contact_id on contact_note (contact_id);
 alter table c_conversation add constraint fk_c_conversation_group_id foreign key (group_id) references c_group (id);
 create index ix_c_conversation_group_id on c_conversation (group_id);
 
-alter table o_customer add constraint fk_o_customer_billing_addre_1 foreign key (billing_address_id) references o_address (id);
-create index ix_o_customer_billing_addre_1 on o_customer (billing_address_id);
+alter table o_customer add constraint fk_o_cstmr_bllng_ddrss_d foreign key (billing_address_id) references o_address (id);
+create index ix_o_cstmr_bllng_ddrss_d on o_customer (billing_address_id);
 
-alter table o_customer add constraint fk_o_customer_shipping_addr_2 foreign key (shipping_address_id) references o_address (id);
-create index ix_o_customer_shipping_addr_2 on o_customer (shipping_address_id);
+alter table o_customer add constraint fk_o_cstmr_shppng_ddrss_d foreign key (shipping_address_id) references o_address (id);
+create index ix_o_cstmr_shppng_ddrss_d on o_customer (shipping_address_id);
+
+alter table dcredit_drol add constraint fk_dcredit_drol_dcredit foreign key (dcredit_id) references dcredit (id);
+create index ix_dcredit_drol_dcredit on dcredit_drol (dcredit_id);
+
+alter table dcredit_drol add constraint fk_dcredit_drol_drol foreign key (drol_id) references drol (id);
+create index ix_dcredit_drol_drol on dcredit_drol (drol_id);
+
+alter table drot_drol add constraint fk_drot_drol_drot foreign key (drot_id) references drot (id);
+create index ix_drot_drol_drot on drot_drol (drot_id);
+
+alter table drot_drol add constraint fk_drot_drol_drol foreign key (drol_id) references drol (id);
+create index ix_drot_drol_drol on drot_drol (drol_id);
+
+alter table dfk_cascade add constraint fk_dfk_cascade_one_id foreign key (one_id) references dfk_cascade_one (id) on delete cascade;
+create index ix_dfk_cascade_one_id on dfk_cascade (one_id);
+
+alter table dfk_set_null add constraint fk_dfk_set_null_one_id foreign key (one_id) references dfk_one (id) on delete set null;
+create index ix_dfk_set_null_one_id on dfk_set_null (one_id);
+
+alter table doc add constraint fk_doc_id foreign key (id) references doc_draft (id);
+
+alter table doc_link add constraint fk_doc_link_doc foreign key (doc_id) references doc (id);
+create index ix_doc_link_doc on doc_link (doc_id);
+
+alter table doc_link add constraint fk_doc_link_link foreign key (link_id) references link (id);
+create index ix_doc_link_link on doc_link (link_id);
+
+alter table document add constraint fk_document_id foreign key (id) references document_draft (id);
+
+alter table document add constraint fk_document_organisation_id foreign key (organisation_id) references organisation (id);
+create index ix_document_organisation_id on document (organisation_id);
+
+alter table document_draft add constraint fk_dcmnt_drft_rgnstn_d foreign key (organisation_id) references organisation (id);
+create index ix_dcmnt_drft_rgnstn_d on document_draft (organisation_id);
+
+alter table document_media add constraint fk_document_media_document_id foreign key (document_id) references document (id);
+create index ix_document_media_document_id on document_media (document_id);
+
+alter table document_media_draft add constraint fk_dcmnt_md_drft_dcmnt_d foreign key (document_id) references document_draft (id);
+create index ix_dcmnt_md_drft_dcmnt_d on document_media_draft (document_id);
+
+alter table ebasic_json_map_detail add constraint fk_ebsc_jsn_mp_dtl_wnr_d foreign key (owner_id) references ebasic_json_map (id);
+create index ix_ebsc_jsn_mp_dtl_wnr_d on ebasic_json_map_detail (owner_id);
+
+alter table ebasic_no_sdchild add constraint fk_ebasic_no_sdchild_owner_id foreign key (owner_id) references ebasic_soft_delete (id);
+create index ix_ebasic_no_sdchild_owner_id on ebasic_no_sdchild (owner_id);
+
+alter table ebasic_sdchild add constraint fk_ebasic_sdchild_owner_id foreign key (owner_id) references ebasic_soft_delete (id);
+create index ix_ebasic_sdchild_owner_id on ebasic_sdchild (owner_id);
 
 alter table eemb_inner add constraint fk_eemb_inner_outer_id foreign key (outer_id) references eemb_outer (id);
 create index ix_eemb_inner_outer_id on eemb_inner (outer_id);
@@ -1975,8 +3159,8 @@ create index ix_eemb_inner_outer_id on eemb_inner (outer_id);
 alter table einvoice add constraint fk_einvoice_person_id foreign key (person_id) references eperson (id);
 create index ix_einvoice_person_id on einvoice (person_id);
 
-alter table enull_collection_detail add constraint fk_enull_collection_detail__1 foreign key (enull_collection_id) references enull_collection (id);
-create index ix_enull_collection_detail__1 on enull_collection_detail (enull_collection_id);
+alter table enull_collection_detail add constraint fk_enll_cllctn_dtl_nll_cllc_1 foreign key (enull_collection_id) references enull_collection (id);
+create index ix_enll_cllctn_dtl_nll_cllc_1 on enull_collection_detail (enull_collection_id);
 
 alter table eopt_one_a add constraint fk_eopt_one_a_b_id foreign key (b_id) references eopt_one_b (id);
 create index ix_eopt_one_a_b_id on eopt_one_a (b_id);
@@ -1984,12 +3168,66 @@ create index ix_eopt_one_a_b_id on eopt_one_a (b_id);
 alter table eopt_one_b add constraint fk_eopt_one_b_c_id foreign key (c_id) references eopt_one_c (id);
 create index ix_eopt_one_b_c_id on eopt_one_b (c_id);
 
-alter table evanilla_collection_detail add constraint fk_evanilla_collection_deta_1 foreign key (evanilla_collection_id) references evanilla_collection (id);
-create index ix_evanilla_collection_deta_1 on evanilla_collection_detail (evanilla_collection_id);
+alter table esoft_del_book add constraint fk_esoft_del_book_lend_by_id foreign key (lend_by_id) references esoft_del_user (id);
+create index ix_esoft_del_book_lend_by_id on esoft_del_book (lend_by_id);
+
+alter table esoft_del_book_esoft_del_user add constraint fk_esft_dl_bk_sft_dl_sr_sft_1 foreign key (esoft_del_book_id) references esoft_del_book (id);
+create index ix_esft_dl_bk_sft_dl_sr_sft_1 on esoft_del_book_esoft_del_user (esoft_del_book_id);
+
+alter table esoft_del_book_esoft_del_user add constraint fk_esft_dl_bk_sft_dl_sr_sft_2 foreign key (esoft_del_user_id) references esoft_del_user (id);
+create index ix_esft_dl_bk_sft_dl_sr_sft_2 on esoft_del_book_esoft_del_user (esoft_del_user_id);
+
+alter table esoft_del_down add constraint fk_esft_dl_dwn_sft_dl_md_d foreign key (esoft_del_mid_id) references esoft_del_mid (id);
+create index ix_esft_dl_dwn_sft_dl_md_d on esoft_del_down (esoft_del_mid_id);
+
+alter table esoft_del_mid add constraint fk_esoft_del_mid_top_id foreign key (top_id) references esoft_del_top (id);
+create index ix_esoft_del_mid_top_id on esoft_del_mid (top_id);
+
+alter table esoft_del_mid add constraint fk_esoft_del_mid_up_id foreign key (up_id) references esoft_del_up (id);
+create index ix_esoft_del_mid_up_id on esoft_del_mid (up_id);
+
+alter table esoft_del_role_esoft_del_user add constraint fk_esft_dl_rl_sft_dl_sr_sft_1 foreign key (esoft_del_role_id) references esoft_del_role (id);
+create index ix_esft_dl_rl_sft_dl_sr_sft_1 on esoft_del_role_esoft_del_user (esoft_del_role_id);
+
+alter table esoft_del_role_esoft_del_user add constraint fk_esft_dl_rl_sft_dl_sr_sft_2 foreign key (esoft_del_user_id) references esoft_del_user (id);
+create index ix_esft_dl_rl_sft_dl_sr_sft_2 on esoft_del_role_esoft_del_user (esoft_del_user_id);
+
+alter table esoft_del_user_esoft_del_role add constraint fk_esft_dl_sr_sft_dl_rl_sft_1 foreign key (esoft_del_user_id) references esoft_del_user (id);
+create index ix_esft_dl_sr_sft_dl_rl_sft_1 on esoft_del_user_esoft_del_role (esoft_del_user_id);
+
+alter table esoft_del_user_esoft_del_role add constraint fk_esft_dl_sr_sft_dl_rl_sft_2 foreign key (esoft_del_role_id) references esoft_del_role (id);
+create index ix_esft_dl_sr_sft_dl_rl_sft_2 on esoft_del_user_esoft_del_role (esoft_del_role_id);
+
+alter table rawinherit_uncle add constraint fk_rawinherit_uncle_parent_id foreign key (parent_id) references rawinherit_parent (id);
+create index ix_rawinherit_uncle_parent_id on rawinherit_uncle (parent_id);
+
+alter table evanilla_collection_detail add constraint fk_evnll_cllctn_dtl_vnll_cl_1 foreign key (evanilla_collection_id) references evanilla_collection (id);
+create index ix_evnll_cllctn_dtl_vnll_cl_1 on evanilla_collection_detail (evanilla_collection_id);
 
 alter table td_child add constraint fk_td_child_parent_id foreign key (parent_id) references td_parent (parent_id);
 create index ix_td_child_parent_id on td_child (parent_id);
 
+alter table empl add constraint fk_empl_default_address_id foreign key (default_address_id) references addr (id);
+create index ix_empl_default_address_id on empl (default_address_id);
+
+alter table grand_parent_person add constraint fk_grnd_prnt_prsn_sm_bn_d foreign key (some_bean_id) references e_basic (id);
+create index ix_grnd_prnt_prsn_sm_bn_d on grand_parent_person (some_bean_id);
+
+alter table survey_group add constraint fk_srvy_grp_ctgrybjctd foreign key (categoryobjectid) references category (id);
+create index ix_srvy_grp_ctgrybjctd on survey_group (categoryobjectid);
+
+alter table hx_link_doc add constraint fk_hx_link_doc_hx_link foreign key (hx_link_id) references hx_link (id);
+create index ix_hx_link_doc_hx_link on hx_link_doc (hx_link_id);
+
+alter table hx_link_doc add constraint fk_hx_link_doc_he_doc foreign key (he_doc_id) references he_doc (id);
+create index ix_hx_link_doc_he_doc on hx_link_doc (he_doc_id);
+
+alter table hi_link_doc add constraint fk_hi_link_doc_hi_link foreign key (hi_link_id) references hi_link (id);
+create index ix_hi_link_doc_hi_link on hi_link_doc (hi_link_id);
+
+alter table hi_link_doc add constraint fk_hi_link_doc_hi_doc foreign key (hi_doc_id) references hi_doc (id);
+create index ix_hi_link_doc_hi_doc on hi_link_doc (hi_doc_id);
+
 alter table imrelated add constraint fk_imrelated_owner_id foreign key (owner_id) references imroot (id);
 create index ix_imrelated_owner_id on imrelated (owner_id);
 
@@ -2003,46 +3241,59 @@ alter table inner_report add constraint fk_inner_report_forecast_id foreign key
 alter table drel_invoice add constraint fk_drel_invoice_booking foreign key (booking) references drel_booking (id);
 create index ix_drel_invoice_booking on drel_invoice (booking);
 
-alter table item add constraint fk_item_type foreign key (customer,type) references type (customer,type);
-create index ix_item_customer_type on item (customer,type);
+alter table item add constraint fk_item_etype foreign key (customer,type) references type (customer,type);
+create index ix_item_etype on item (customer,type);
 
-alter table item add constraint fk_item_region foreign key (customer,region) references region (customer,type);
-create index ix_item_customer_region on item (customer,region);
+alter table item add constraint fk_item_eregion foreign key (customer,region) references region (customer,type);
+create index ix_item_eregion on item (customer,region);
+
+alter table trainer_monkey add constraint fk_trainer_monkey_trainer foreign key (trainer_tid) references trainer (tid);
+
+alter table trainer_monkey add constraint fk_trainer_monkey_monkey foreign key (monkey_mid) references monkey (mid);
+
+alter table troop_monkey add constraint fk_troop_monkey_troop foreign key (troop_pid) references troop (pid);
+
+alter table troop_monkey add constraint fk_troop_monkey_monkey foreign key (monkey_mid) references monkey (mid);
+
+alter table l2_cldf_reset_bean_child add constraint fk_l2_cldf_rst_bn_chld_prnt_d foreign key (parent_id) references l2_cldf_reset_bean (id);
+create index ix_l2_cldf_rst_bn_chld_prnt_d on l2_cldf_reset_bean_child (parent_id);
 
 alter table level1_level4 add constraint fk_level1_level4_level1 foreign key (level1_id) references level1 (id);
-create index ix_level1_level4_level1_id on level1_level4 (level1_id);
+create index ix_level1_level4_level1 on level1_level4 (level1_id);
 
 alter table level1_level4 add constraint fk_level1_level4_level4 foreign key (level4_id) references level4 (id);
-create index ix_level1_level4_level4_id on level1_level4 (level4_id);
+create index ix_level1_level4_level4 on level1_level4 (level4_id);
 
 alter table level1_level2 add constraint fk_level1_level2_level1 foreign key (level1_id) references level1 (id);
-create index ix_level1_level2_level1_id on level1_level2 (level1_id);
+create index ix_level1_level2_level1 on level1_level2 (level1_id);
 
 alter table level1_level2 add constraint fk_level1_level2_level2 foreign key (level2_id) references level2 (id);
-create index ix_level1_level2_level2_id on level1_level2 (level2_id);
+create index ix_level1_level2_level2 on level1_level2 (level2_id);
 
 alter table level2_level3 add constraint fk_level2_level3_level2 foreign key (level2_id) references level2 (id);
-create index ix_level2_level3_level2_id on level2_level3 (level2_id);
+create index ix_level2_level3_level2 on level2_level3 (level2_id);
 
 alter table level2_level3 add constraint fk_level2_level3_level3 foreign key (level3_id) references level3 (id);
-create index ix_level2_level3_level3_id on level2_level3 (level3_id);
+create index ix_level2_level3_level3 on level2_level3 (level3_id);
 
-alter table la_attr_value_attribute add constraint fk_la_attr_value_attribute__1 foreign key (la_attr_value_id) references la_attr_value (id);
-create index ix_la_attr_value_attribute__1 on la_attr_value_attribute (la_attr_value_id);
+alter table link add constraint fk_link_id foreign key (id) references link_draft (id);
 
-alter table la_attr_value_attribute add constraint fk_la_attr_value_attribute__2 foreign key (attribute_id) references attribute (id);
-create index ix_la_attr_value_attribute__2 on la_attr_value_attribute (attribute_id);
+alter table la_attr_value_attribute add constraint fk_l_ttr_vl_ttrbt_l_ttr_vl foreign key (la_attr_value_id) references la_attr_value (id);
+create index ix_l_ttr_vl_ttrbt_l_ttr_vl on la_attr_value_attribute (la_attr_value_id);
+
+alter table la_attr_value_attribute add constraint fk_l_ttr_vl_ttrbt_ttrbt foreign key (attribute_id) references attribute (id);
+create index ix_l_ttr_vl_ttrbt_ttrbt on la_attr_value_attribute (attribute_id);
 
 alter table mprinter add constraint fk_mprinter_current_state_id foreign key (current_state_id) references mprinter_state (id);
 create index ix_mprinter_current_state_id on mprinter (current_state_id);
 
 alter table mprinter add constraint fk_mprinter_last_swap_cyan_id foreign key (last_swap_cyan_id) references mprinter_state (id);
 
-alter table mprinter add constraint fk_mprinter_last_swap_magen_3 foreign key (last_swap_magenta_id) references mprinter_state (id);
+alter table mprinter add constraint fk_mprntr_lst_swp_mgnt_d foreign key (last_swap_magenta_id) references mprinter_state (id);
 
-alter table mprinter add constraint fk_mprinter_last_swap_yello_4 foreign key (last_swap_yellow_id) references mprinter_state (id);
+alter table mprinter add constraint fk_mprntr_lst_swp_yllw_d foreign key (last_swap_yellow_id) references mprinter_state (id);
 
-alter table mprinter add constraint fk_mprinter_last_swap_black_5 foreign key (last_swap_black_id) references mprinter_state (id);
+alter table mprinter add constraint fk_mprntr_lst_swp_blck_d foreign key (last_swap_black_id) references mprinter_state (id);
 
 alter table mprinter_state add constraint fk_mprinter_state_printer_id foreign key (printer_id) references mprinter (id);
 create index ix_mprinter_state_printer_id on mprinter_state (printer_id);
@@ -2051,45 +3302,89 @@ alter table mprofile add constraint fk_mprofile_picture_id foreign key (picture_
 create index ix_mprofile_picture_id on mprofile (picture_id);
 
 alter table mrole_muser add constraint fk_mrole_muser_mrole foreign key (mrole_roleid) references mrole (roleid);
-create index ix_mrole_muser_mrole_roleid on mrole_muser (mrole_roleid);
+create index ix_mrole_muser_mrole on mrole_muser (mrole_roleid);
 
 alter table mrole_muser add constraint fk_mrole_muser_muser foreign key (muser_userid) references muser (userid);
-create index ix_mrole_muser_muser_userid on mrole_muser (muser_userid);
+create index ix_mrole_muser_muser on mrole_muser (muser_userid);
 
 alter table muser add constraint fk_muser_user_type_id foreign key (user_type_id) references muser_type (id);
 create index ix_muser_user_type_id on muser (user_type_id);
 
+alter table mail_user_inbox add constraint fk_mail_user_inbox_mail_user foreign key (mail_user_id) references mail_user (id);
+create index ix_mail_user_inbox_mail_user on mail_user_inbox (mail_user_id);
+
+alter table mail_user_inbox add constraint fk_mail_user_inbox_mail_box foreign key (mail_box_id) references mail_box (id);
+create index ix_mail_user_inbox_mail_box on mail_user_inbox (mail_box_id);
+
+alter table mail_user_outbox add constraint fk_mail_user_outbox_mail_user foreign key (mail_user_id) references mail_user (id);
+create index ix_mail_user_outbox_mail_user on mail_user_outbox (mail_user_id);
+
+alter table mail_user_outbox add constraint fk_mail_user_outbox_mail_box foreign key (mail_box_id) references mail_box (id);
+create index ix_mail_user_outbox_mail_box on mail_user_outbox (mail_box_id);
+
 alter table c_message add constraint fk_c_message_conversation_id foreign key (conversation_id) references c_conversation (id);
 create index ix_c_message_conversation_id on c_message (conversation_id);
 
 alter table c_message add constraint fk_c_message_user_id foreign key (user_id) references c_user (id);
 create index ix_c_message_user_id on c_message (user_id);
 
-alter table mnoc_user_mnoc_role add constraint fk_mnoc_user_mnoc_role_mnoc_1 foreign key (mnoc_user_user_id) references mnoc_user (user_id);
-create index ix_mnoc_user_mnoc_role_mnoc_1 on mnoc_user_mnoc_role (mnoc_user_user_id);
+alter table mnoc_user_mnoc_role add constraint fk_mnc_sr_mnc_rl_mnc_sr foreign key (mnoc_user_user_id) references mnoc_user (user_id);
+create index ix_mnc_sr_mnc_rl_mnc_sr on mnoc_user_mnoc_role (mnoc_user_user_id);
 
-alter table mnoc_user_mnoc_role add constraint fk_mnoc_user_mnoc_role_mnoc_2 foreign key (mnoc_role_role_id) references mnoc_role (role_id);
-create index ix_mnoc_user_mnoc_role_mnoc_2 on mnoc_user_mnoc_role (mnoc_role_role_id);
+alter table mnoc_user_mnoc_role add constraint fk_mnc_sr_mnc_rl_mnc_rl foreign key (mnoc_role_role_id) references mnoc_role (role_id);
+create index ix_mnc_sr_mnc_rl_mnc_rl on mnoc_user_mnoc_role (mnoc_role_role_id);
+
+alter table mny_b add constraint fk_mny_b_a_id foreign key (a_id) references mny_a (id);
+create index ix_mny_b_a_id on mny_b (a_id);
+
+alter table mny_b_mny_c add constraint fk_mny_b_mny_c_mny_b foreign key (mny_b_id) references mny_b (id);
+create index ix_mny_b_mny_c_mny_b on mny_b_mny_c (mny_b_id);
+
+alter table mny_b_mny_c add constraint fk_mny_b_mny_c_mny_c foreign key (mny_c_id) references mny_c (id);
+create index ix_mny_b_mny_c_mny_c on mny_b_mny_c (mny_c_id);
+
+alter table subtopics add constraint fk_subtopics_mny_topic_1 foreign key (topic) references mny_topic (id);
+create index ix_subtopics_mny_topic_1 on subtopics (topic);
+
+alter table subtopics add constraint fk_subtopics_mny_topic_2 foreign key (subtopic) references mny_topic (id);
+create index ix_subtopics_mny_topic_2 on subtopics (subtopic);
 
 alter table mp_role add constraint fk_mp_role_mp_user_id foreign key (mp_user_id) references mp_user (id);
 create index ix_mp_role_mp_user_id on mp_role (mp_user_id);
 
-alter table my_lob_size_join_many add constraint fk_my_lob_size_join_many_pa_1 foreign key (parent_id) references my_lob_size (id);
-create index ix_my_lob_size_join_many_pa_1 on my_lob_size_join_many (parent_id);
+alter table ms_many_a_many_b add constraint fk_ms_many_a_many_b_ms_many_a foreign key (ms_many_a_aid) references ms_many_a (aid);
+create index ix_ms_many_a_many_b_ms_many_a on ms_many_a_many_b (ms_many_a_aid);
 
-alter table o_cached_bean_country add constraint fk_o_cached_bean_country_o__1 foreign key (o_cached_bean_id) references o_cached_bean (id);
-create index ix_o_cached_bean_country_o__1 on o_cached_bean_country (o_cached_bean_id);
+alter table ms_many_a_many_b add constraint fk_ms_many_a_many_b_ms_many_b foreign key (ms_many_b_bid) references ms_many_b (bid);
+create index ix_ms_many_a_many_b_ms_many_b on ms_many_a_many_b (ms_many_b_bid);
 
-alter table o_cached_bean_country add constraint fk_o_cached_bean_country_o__2 foreign key (o_country_code) references o_country (code);
-create index ix_o_cached_bean_country_o__2 on o_cached_bean_country (o_country_code);
+alter table ms_many_b_many_a add constraint fk_ms_many_b_many_a_ms_many_b foreign key (ms_many_b_bid) references ms_many_b (bid);
+create index ix_ms_many_b_many_a_ms_many_b on ms_many_b_many_a (ms_many_b_bid);
 
-alter table o_cached_bean_child add constraint fk_o_cached_bean_child_cach_1 foreign key (cached_bean_id) references o_cached_bean (id);
-create index ix_o_cached_bean_child_cach_1 on o_cached_bean_child (cached_bean_id);
+alter table ms_many_b_many_a add constraint fk_ms_many_b_many_a_ms_many_a foreign key (ms_many_a_aid) references ms_many_a (aid);
+create index ix_ms_many_b_many_a_ms_many_a on ms_many_b_many_a (ms_many_a_aid);
+
+alter table my_lob_size_join_many add constraint fk_my_lb_sz_jn_mny_prnt_d foreign key (parent_id) references my_lob_size (id);
+create index ix_my_lb_sz_jn_mny_prnt_d on my_lob_size_join_many (parent_id);
+
+alter table o_cached_bean_country add constraint fk_o_cchd_bn_cntry__cchd_bn foreign key (o_cached_bean_id) references o_cached_bean (id);
+create index ix_o_cchd_bn_cntry__cchd_bn on o_cached_bean_country (o_cached_bean_id);
+
+alter table o_cached_bean_country add constraint fk_o_cchd_bn_cntry__cntry foreign key (o_country_code) references o_country (code);
+create index ix_o_cchd_bn_cntry__cntry on o_cached_bean_country (o_country_code);
+
+alter table o_cached_bean_child add constraint fk_o_cchd_bn_chld_cchd_bn_d foreign key (cached_bean_id) references o_cached_bean (id);
+create index ix_o_cchd_bn_chld_cchd_bn_d on o_cached_bean_child (cached_bean_id);
 
 alter table oengine add constraint fk_oengine_car_id foreign key (car_id) references ocar (id);
 
 alter table ogear_box add constraint fk_ogear_box_car_id foreign key (car_id) references ocar (id);
 
+alter table oroad_show_msg add constraint fk_oroad_show_msg_company_id foreign key (company_id) references ocompany (id);
+
+alter table om_ordered_detail add constraint fk_om_rdrd_dtl_mstr_d foreign key (master_id) references om_ordered_master (id);
+create index ix_om_rdrd_dtl_mstr_d on om_ordered_detail (master_id);
+
 alter table o_order add constraint fk_o_order_kcustomer_id foreign key (kcustomer_id) references o_customer (id);
 create index ix_o_order_kcustomer_id on o_order (kcustomer_id);
 
@@ -2105,8 +3400,23 @@ create index ix_s_order_items_order_uuid on s_order_items (order_uuid);
 alter table or_order_ship add constraint fk_or_order_ship_order_id foreign key (order_id) references o_order (id);
 create index ix_or_order_ship_order_id on or_order_ship (order_id);
 
+alter table oto_bchild add constraint fk_oto_bchild_master_id foreign key (master_id) references oto_bmaster (id);
+
 alter table oto_child add constraint fk_oto_child_master_id foreign key (master_id) references oto_master (id);
 
+alter table oto_cust_address add constraint fk_ot_cst_ddrss_cstmr_cd foreign key (customer_cid) references oto_cust (cid);
+
+alter table oto_prime_extra add constraint fk_oto_prime_extra_eid foreign key (eid) references oto_prime (pid);
+
+alter table oto_th_many add constraint fk_oto_th_many_oto_th_top_id foreign key (oto_th_top_id) references oto_th_top (id);
+create index ix_oto_th_many_oto_th_top_id on oto_th_many (oto_th_top_id);
+
+alter table oto_th_one add constraint fk_oto_th_one_many_id foreign key (many_id) references oto_th_many (id);
+
+alter table oto_ubprime_extra add constraint fk_oto_ubprime_extra_eid foreign key (eid) references oto_ubprime (pid);
+
+alter table oto_uprime_extra add constraint fk_oto_uprime_extra_eid foreign key (eid) references oto_uprime (pid);
+
 alter table pfile add constraint fk_pfile_file_content_id foreign key (file_content_id) references pfile_content (id);
 
 alter table pfile add constraint fk_pfile_file_content2_id foreign key (file_content2_id) references pfile_content (id);
@@ -2118,19 +3428,25 @@ create index ix_pallet_location_zone_sid on pallet_location (zone_sid);
 
 alter table parcel_location add constraint fk_parcel_location_parcelid foreign key (parcelid) references parcel (parcelid);
 
-alter table rawinherit_parent_rawinherit_d add constraint fk_rawinherit_parent_rawinh_1 foreign key (rawinherit_parent_id) references rawinherit_parent (id);
-create index ix_rawinherit_parent_rawinh_1 on rawinherit_parent_rawinherit_d (rawinherit_parent_id);
+alter table rawinherit_parent_rawinherit_d add constraint fk_rwnhrt_prnt_rwnhrt_d_rwn_1 foreign key (rawinherit_parent_id) references rawinherit_parent (id);
+create index ix_rwnhrt_prnt_rwnhrt_d_rwn_1 on rawinherit_parent_rawinherit_d (rawinherit_parent_id);
 
-alter table rawinherit_parent_rawinherit_d add constraint fk_rawinherit_parent_rawinh_2 foreign key (rawinherit_data_id) references rawinherit_data (id);
-create index ix_rawinherit_parent_rawinh_2 on rawinherit_parent_rawinherit_d (rawinherit_data_id);
+alter table rawinherit_parent_rawinherit_d add constraint fk_rwnhrt_prnt_rwnhrt_d_rwn_2 foreign key (rawinherit_data_id) references rawinherit_data (id);
+create index ix_rwnhrt_prnt_rwnhrt_d_rwn_2 on rawinherit_parent_rawinherit_d (rawinherit_data_id);
 
-alter table c_participation add constraint fk_c_participation_conversa_1 foreign key (conversation_id) references c_conversation (id);
-create index ix_c_participation_conversa_1 on c_participation (conversation_id);
+alter table parent_person add constraint fk_parent_person_some_bean_id foreign key (some_bean_id) references e_basic (id);
+create index ix_parent_person_some_bean_id on parent_person (some_bean_id);
+
+alter table parent_person add constraint fk_prnt_prsn_prnt_dntfr foreign key (parent_identifier) references grand_parent_person (identifier);
+create index ix_prnt_prsn_prnt_dntfr on parent_person (parent_identifier);
+
+alter table c_participation add constraint fk_c_prtcptn_cnvrstn_d foreign key (conversation_id) references c_conversation (id);
+create index ix_c_prtcptn_cnvrstn_d on c_participation (conversation_id);
 
 alter table c_participation add constraint fk_c_participation_user_id foreign key (user_id) references c_user (id);
 create index ix_c_participation_user_id on c_participation (user_id);
 
-alter table persistent_file_content add constraint fk_persistent_file_content__1 foreign key (persistent_file_id) references persistent_file (id);
+alter table persistent_file_content add constraint fk_prsstnt_fl_cntnt_prsstnt_1 foreign key (persistent_file_id) references persistent_file (id);
 
 alter table person add constraint fk_person_default_address_oid foreign key (default_address_oid) references address (oid);
 create index ix_person_default_address_oid on person (default_address_oid);
@@ -2139,25 +3455,28 @@ alter table phones add constraint fk_phones_person_id foreign key (person_id) re
 create index ix_phones_person_id on phones (person_id);
 
 alter table pp_to_ww add constraint fk_pp_to_ww_pp foreign key (pp_id) references pp (id);
-create index ix_pp_to_ww_pp_id on pp_to_ww (pp_id);
+create index ix_pp_to_ww_pp on pp_to_ww (pp_id);
 
 alter table pp_to_ww add constraint fk_pp_to_ww_wview foreign key (ww_id) references wview (id);
-create index ix_pp_to_ww_ww_id on pp_to_ww (ww_id);
+create index ix_pp_to_ww_wview on pp_to_ww (ww_id);
 
-alter table r_orders add constraint fk_r_orders_rcustomer foreign key (company,customername) references rcustomer (company,name);
-create index ix_r_orders_company_custome_1 on r_orders (company,customername);
+alter table question add constraint fk_question_groupobjectid foreign key (groupobjectid) references survey_group (id);
+create index ix_question_groupobjectid on question (groupobjectid);
 
-alter table resourcefile add constraint fk_resourcefile_parentresou_1 foreign key (parentresourcefileid) references resourcefile (id);
-create index ix_resourcefile_parentresou_1 on resourcefile (parentresourcefileid);
+alter table r_orders add constraint fk_r_orders_customer foreign key (company,customername) references rcustomer (company,name);
+create index ix_r_orders_customer on r_orders (company,customername);
+
+alter table resourcefile add constraint fk_rsrcfl_prntrsrcfld foreign key (parentresourcefileid) references resourcefile (id);
+create index ix_rsrcfl_prntrsrcfld on resourcefile (parentresourcefileid);
 
 alter table mt_role add constraint fk_mt_role_tenant_id foreign key (tenant_id) references mt_tenant (id);
 create index ix_mt_role_tenant_id on mt_role (tenant_id);
 
 alter table mt_role_permission add constraint fk_mt_role_permission_mt_role foreign key (mt_role_id) references mt_role (id);
-create index ix_mt_role_permission_mt_ro_1 on mt_role_permission (mt_role_id);
+create index ix_mt_role_permission_mt_role on mt_role_permission (mt_role_id);
 
-alter table mt_role_permission add constraint fk_mt_role_permission_mt_pe_2 foreign key (mt_permission_id) references mt_permission (id);
-create index ix_mt_role_permission_mt_pe_2 on mt_role_permission (mt_permission_id);
+alter table mt_role_permission add constraint fk_mt_rl_prmssn_mt_prmssn foreign key (mt_permission_id) references mt_permission (id);
+create index ix_mt_rl_prmssn_mt_prmssn on mt_role_permission (mt_permission_id);
 
 alter table f_second add constraint fk_f_second_first foreign key (first) references f_first (id);
 
@@ -2167,20 +3486,25 @@ create index ix_section_article_id on section (article_id);
 alter table self_parent add constraint fk_self_parent_parent_id foreign key (parent_id) references self_parent (id);
 create index ix_self_parent_parent_id on self_parent (parent_id);
 
-alter table self_ref_customer add constraint fk_self_ref_customer_referr_1 foreign key (referred_by_id) references self_ref_customer (id);
-create index ix_self_ref_customer_referr_1 on self_ref_customer (referred_by_id);
+alter table self_ref_customer add constraint fk_slf_rf_cstmr_rfrrd_by_d foreign key (referred_by_id) references self_ref_customer (id);
+create index ix_slf_rf_cstmr_rfrrd_by_d on self_ref_customer (referred_by_id);
 
 alter table self_ref_example add constraint fk_self_ref_example_parent_id foreign key (parent_id) references self_ref_example (id);
 create index ix_self_ref_example_parent_id on self_ref_example (parent_id);
 
-alter table stockforecast add constraint fk_stockforecast_inner_repo_1 foreign key (inner_report_id) references inner_report (id);
-create index ix_stockforecast_inner_repo_1 on stockforecast (inner_report_id);
+alter table stockforecast add constraint fk_stckfrcst_nnr_rprt_d foreign key (inner_report_id) references inner_report (id);
+create index ix_stckfrcst_nnr_rprt_d on stockforecast (inner_report_id);
 
 alter table sub_section add constraint fk_sub_section_section_id foreign key (section_id) references section (id);
 create index ix_sub_section_section_id on sub_section (section_id);
 
-alter table t_detail_with_other_namexxxyy add constraint fk_t_detail_with_other_name_1 foreign key (master_id) references t_atable_thatisrelatively (id);
-create index ix_t_detail_with_other_name_1 on t_detail_with_other_namexxxyy (master_id);
+alter table tevent_many add constraint fk_tevent_many_event_id foreign key (event_id) references tevent_one (id);
+create index ix_tevent_many_event_id on tevent_many (event_id);
+
+alter table tevent_one add constraint fk_tevent_one_event_id foreign key (event_id) references tevent (id);
+
+alter table t_detail_with_other_namexxxyy add constraint fk_t_dtl_wth_thr_nmxxxyy_ms_1 foreign key (master_id) references t_atable_thatisrelatively (id);
+create index ix_t_dtl_wth_thr_nmxxxyy_ms_1 on t_detail_with_other_namexxxyy (master_id);
 
 alter table ts_detail_two add constraint fk_ts_detail_two_master_id foreign key (master_id) references ts_master_two (id);
 create index ix_ts_detail_two_master_id on ts_detail_two (master_id);
@@ -2216,12 +3540,12 @@ create index ix_em_user_role_user_id on em_user_role (user_id);
 alter table em_user_role add constraint fk_em_user_role_role_id foreign key (role_id) references em_role (id);
 create index ix_em_user_role_role_id on em_user_role (role_id);
 
-alter table vehicle add constraint fk_vehicle_truck_ref_id foreign key (truck_ref_id) references truck_ref (id);
-create index ix_vehicle_truck_ref_id on vehicle (truck_ref_id);
-
 alter table vehicle add constraint fk_vehicle_car_ref_id foreign key (car_ref_id) references truck_ref (id);
 create index ix_vehicle_car_ref_id on vehicle (car_ref_id);
 
+alter table vehicle add constraint fk_vehicle_truck_ref_id foreign key (truck_ref_id) references truck_ref (id);
+create index ix_vehicle_truck_ref_id on vehicle (truck_ref_id);
+
 alter table vehicle_driver add constraint fk_vehicle_driver_vehicle_id foreign key (vehicle_id) references vehicle (id);
 create index ix_vehicle_driver_vehicle_id on vehicle_driver (vehicle_id);
 
@@ -2231,11 +3555,11 @@ create index ix_vehicle_driver_address_id on vehicle_driver (address_id);
 alter table warehouses add constraint fk_warehouses_officezoneid foreign key (officezoneid) references zones (id);
 create index ix_warehouses_officezoneid on warehouses (officezoneid);
 
-alter table warehousesshippingzones add constraint fk_warehousesshippingzones__1 foreign key (warehouseid) references warehouses (id);
-create index ix_warehousesshippingzones__1 on warehousesshippingzones (warehouseid);
+alter table warehousesshippingzones add constraint fk_wrhssshppngzns_wrhss foreign key (warehouseid) references warehouses (id);
+create index ix_wrhssshppngzns_wrhss on warehousesshippingzones (warehouseid);
 
-alter table warehousesshippingzones add constraint fk_warehousesshippingzones__2 foreign key (shippingzoneid) references zones (id);
-create index ix_warehousesshippingzones__2 on warehousesshippingzones (shippingzoneid);
+alter table warehousesshippingzones add constraint fk_wrhssshppngzns_zns foreign key (shippingzoneid) references zones (id);
+create index ix_wrhssshppngzns_zns on warehousesshippingzones (shippingzoneid);
 
 alter table sa_wheel add constraint fk_sa_wheel_tire foreign key (tire) references sa_tire (id);
 create index ix_sa_wheel_tire on sa_wheel (tire);
@@ -2243,6 +3567,12 @@ create index ix_sa_wheel_tire on sa_wheel (tire);
 alter table sa_wheel add constraint fk_sa_wheel_car foreign key (car) references sa_car (id);
 create index ix_sa_wheel_car on sa_wheel (car);
 
+alter table g_who_props_otm add constraint fk_g_wh_prps_tm_wh_crtd_d foreign key (who_created_id) references g_user (id);
+create index ix_g_wh_prps_tm_wh_crtd_d on g_who_props_otm (who_created_id);
+
+alter table g_who_props_otm add constraint fk_g_wh_prps_tm_wh_mdfd_d foreign key (who_modified_id) references g_user (id);
+create index ix_g_wh_prps_tm_wh_mdfd_d on g_who_props_otm (who_modified_id);
+
 alter table with_zero add constraint fk_with_zero_parent_id foreign key (parent_id) references parent (id);
 create index ix_with_zero_parent_id on with_zero (parent_id);
 
diff --git a/src/test/ddl-review/oracle-drop-all.sql b/src/test/ddl-review/oracle-drop-all.sql
index 1c863ed7b..b621e55a1 100644
--- a/src/test/ddl-review/oracle-drop-all.sql
+++ b/src/test/ddl-review/oracle-drop-all.sql
@@ -1,45 +1,80 @@
 alter table bar drop constraint fk_bar_foo_id;
 drop index ix_bar_foo_id;
 
+alter table addr drop constraint fk_addr_employee_id;
+drop index ix_addr_employee_id;
+
 alter table o_address drop constraint fk_o_address_country_code;
 drop index ix_o_address_country_code;
 
-alter table animals drop constraint fk_animals_shelter_id;
-drop index ix_animals_shelter_id;
+alter table album drop constraint fk_album_cover_id;
 
-alter table attribute drop constraint fk_attribute_attribute_hold_1;
-drop index ix_attribute_attribute_hold_1;
+alter table animal drop constraint fk_animal_shelter_id;
+drop index ix_animal_shelter_id;
+
+alter table attribute drop constraint fk_attrbt_ttrbt_hldr_d;
+drop index ix_attrbt_ttrbt_hldr_d;
 
 alter table bbookmark drop constraint fk_bbookmark_user_id;
 drop index ix_bbookmark_user_id;
 
+alter table bsite_user drop constraint fk_bsite_user_site_id;
+drop index ix_bsite_user_site_id;
+
+alter table bsite_user drop constraint fk_bsite_user_user_id;
+drop index ix_bsite_user_user_id;
+
+alter table bsite_user_b drop constraint fk_bsite_user_b_site;
+drop index ix_bsite_user_b_site;
+
+alter table bsite_user_b drop constraint fk_bsite_user_b_usr;
+drop index ix_bsite_user_b_usr;
+
+alter table bsite_user_c drop constraint fk_bsite_user_c_site_uid;
+drop index ix_bsite_user_c_site_uid;
+
+alter table bsite_user_c drop constraint fk_bsite_user_c_user_uid;
+drop index ix_bsite_user_c_user_uid;
+
 alter table drel_booking drop constraint fk_drel_booking_agent_invoice;
 
-alter table drel_booking drop constraint fk_drel_booking_client_invo_2;
+alter table drel_booking drop constraint fk_drl_bkng_clnt_nvc;
 
-alter table ckey_detail drop constraint fk_ckey_detail_ckey_parent;
-drop index ix_ckey_detail_one_key_two__1;
+alter table ckey_detail drop constraint fk_ckey_detail_parent;
+drop index ix_ckey_detail_parent;
 
 alter table ckey_parent drop constraint fk_ckey_parent_assoc_id;
 drop index ix_ckey_parent_assoc_id;
 
-alter table calculation_result drop constraint fk_calculation_result_produ_1;
-drop index ix_calculation_result_produ_1;
+alter table calculation_result drop constraint fk_clcltn_rslt_prdct_cnfgrt_1;
+drop index ix_clcltn_rslt_prdct_cnfgrt_1;
 
-alter table calculation_result drop constraint fk_calculation_result_group_2;
-drop index ix_calculation_result_group_2;
+alter table calculation_result drop constraint fk_clcltn_rslt_grp_cnfgrtn_d;
+drop index ix_clcltn_rslt_grp_cnfgrtn_d;
 
-alter table sp_car_car_wheels drop constraint fk_sp_car_car_wheels_sp_car_1;
-drop index ix_sp_car_car_wheels_car;
+alter table sp_car_car_wheels drop constraint fk_sp_cr_cr_whls_sp_cr_cr;
+drop index ix_sp_cr_cr_whls_sp_cr_cr;
 
-alter table sp_car_car_wheels drop constraint fk_sp_car_car_wheels_sp_car_2;
-drop index ix_sp_car_car_wheels_wheel;
+alter table sp_car_car_wheels drop constraint fk_sp_cr_cr_whls_sp_cr_whl;
+drop index ix_sp_cr_cr_whls_sp_cr_whl;
+
+alter table car_accessory drop constraint fk_car_accessory_fuse_id;
+drop index ix_car_accessory_fuse_id;
 
 alter table car_accessory drop constraint fk_car_accessory_car_id;
 drop index ix_car_accessory_car_id;
 
-alter table configuration drop constraint fk_configuration_configurat_1;
-drop index ix_configuration_configurat_1;
+alter table category drop constraint fk_category_surveyobjectid;
+drop index ix_category_surveyobjectid;
+
+alter table child_person drop constraint fk_child_person_some_bean_id;
+drop index ix_child_person_some_bean_id;
+
+alter table child_person drop constraint fk_chld_prsn_prnt_dntfr;
+drop index ix_chld_prsn_prnt_dntfr;
+
+alter table configuration drop constraint fk_cnfgrtn_cnfgrtns_d;
+drop index ix_cnfgrtn_cnfgrtns_d;
 
 alter table contact drop constraint fk_contact_customer_id;
 drop index ix_contact_customer_id;
@@ -53,11 +88,60 @@ drop index ix_contact_note_contact_id;
 alter table c_conversation drop constraint fk_c_conversation_group_id;
 drop index ix_c_conversation_group_id;
 
-alter table o_customer drop constraint fk_o_customer_billing_addre_1;
-drop index ix_o_customer_billing_addre_1;
+alter table o_customer drop constraint fk_o_cstmr_bllng_ddrss_d;
+drop index ix_o_cstmr_bllng_ddrss_d;
 
-alter table o_customer drop constraint fk_o_customer_shipping_addr_2;
-drop index ix_o_customer_shipping_addr_2;
+alter table o_customer drop constraint fk_o_cstmr_shppng_ddrss_d;
+drop index ix_o_cstmr_shppng_ddrss_d;
+
+alter table dcredit_drol drop constraint fk_dcredit_drol_dcredit;
+drop index ix_dcredit_drol_dcredit;
+
+alter table dcredit_drol drop constraint fk_dcredit_drol_drol;
+drop index ix_dcredit_drol_drol;
+
+alter table drot_drol drop constraint fk_drot_drol_drot;
+drop index ix_drot_drol_drot;
+
+alter table drot_drol drop constraint fk_drot_drol_drol;
+drop index ix_drot_drol_drol;
+
+alter table dfk_cascade drop constraint fk_dfk_cascade_one_id;
+drop index ix_dfk_cascade_one_id;
+
+alter table dfk_set_null drop constraint fk_dfk_set_null_one_id;
+drop index ix_dfk_set_null_one_id;
+
+alter table doc drop constraint fk_doc_id;
+
+alter table doc_link drop constraint fk_doc_link_doc;
+drop index ix_doc_link_doc;
+
+alter table doc_link drop constraint fk_doc_link_link;
+drop index ix_doc_link_link;
+
+alter table document drop constraint fk_document_id;
+
+alter table document drop constraint fk_document_organisation_id;
+drop index ix_document_organisation_id;
+
+alter table document_draft drop constraint fk_dcmnt_drft_rgnstn_d;
+drop index ix_dcmnt_drft_rgnstn_d;
+
+alter table document_media drop constraint fk_document_media_document_id;
+drop index ix_document_media_document_id;
+
+alter table document_media_draft drop constraint fk_dcmnt_md_drft_dcmnt_d;
+drop index ix_dcmnt_md_drft_dcmnt_d;
+
+alter table ebasic_json_map_detail drop constraint fk_ebsc_jsn_mp_dtl_wnr_d;
+drop index ix_ebsc_jsn_mp_dtl_wnr_d;
+
+alter table ebasic_no_sdchild drop constraint fk_ebasic_no_sdchild_owner_id;
+drop index ix_ebasic_no_sdchild_owner_id;
+
+alter table ebasic_sdchild drop constraint fk_ebasic_sdchild_owner_id;
+drop index ix_ebasic_sdchild_owner_id;
 
 alter table eemb_inner drop constraint fk_eemb_inner_outer_id;
 drop index ix_eemb_inner_outer_id;
@@ -65,8 +149,8 @@ drop index ix_eemb_inner_outer_id;
 alter table einvoice drop constraint fk_einvoice_person_id;
 drop index ix_einvoice_person_id;
 
-alter table enull_collection_detail drop constraint fk_enull_collection_detail__1;
-drop index ix_enull_collection_detail__1;
+alter table enull_collection_detail drop constraint fk_enll_cllctn_dtl_nll_cllc_1;
+drop index ix_enll_cllctn_dtl_nll_cllc_1;
 
 alter table eopt_one_a drop constraint fk_eopt_one_a_b_id;
 drop index ix_eopt_one_a_b_id;
@@ -74,12 +158,66 @@ drop index ix_eopt_one_a_b_id;
 alter table eopt_one_b drop constraint fk_eopt_one_b_c_id;
 drop index ix_eopt_one_b_c_id;
 
-alter table evanilla_collection_detail drop constraint fk_evanilla_collection_deta_1;
-drop index ix_evanilla_collection_deta_1;
+alter table esoft_del_book drop constraint fk_esoft_del_book_lend_by_id;
+drop index ix_esoft_del_book_lend_by_id;
+
+alter table esoft_del_book_esoft_del_user drop constraint fk_esft_dl_bk_sft_dl_sr_sft_1;
+drop index ix_esft_dl_bk_sft_dl_sr_sft_1;
+
+alter table esoft_del_book_esoft_del_user drop constraint fk_esft_dl_bk_sft_dl_sr_sft_2;
+drop index ix_esft_dl_bk_sft_dl_sr_sft_2;
+
+alter table esoft_del_down drop constraint fk_esft_dl_dwn_sft_dl_md_d;
+drop index ix_esft_dl_dwn_sft_dl_md_d;
+
+alter table esoft_del_mid drop constraint fk_esoft_del_mid_top_id;
+drop index ix_esoft_del_mid_top_id;
+
+alter table esoft_del_mid drop constraint fk_esoft_del_mid_up_id;
+drop index ix_esoft_del_mid_up_id;
+
+alter table esoft_del_role_esoft_del_user drop constraint fk_esft_dl_rl_sft_dl_sr_sft_1;
+drop index ix_esft_dl_rl_sft_dl_sr_sft_1;
+
+alter table esoft_del_role_esoft_del_user drop constraint fk_esft_dl_rl_sft_dl_sr_sft_2;
+drop index ix_esft_dl_rl_sft_dl_sr_sft_2;
+
+alter table esoft_del_user_esoft_del_role drop constraint fk_esft_dl_sr_sft_dl_rl_sft_1;
+drop index ix_esft_dl_sr_sft_dl_rl_sft_1;
+
+alter table esoft_del_user_esoft_del_role drop constraint fk_esft_dl_sr_sft_dl_rl_sft_2;
+drop index ix_esft_dl_sr_sft_dl_rl_sft_2;
+
+alter table rawinherit_uncle drop constraint fk_rawinherit_uncle_parent_id;
+drop index ix_rawinherit_uncle_parent_id;
+
+alter table evanilla_collection_detail drop constraint fk_evnll_cllctn_dtl_vnll_cl_1;
+drop index ix_evnll_cllctn_dtl_vnll_cl_1;
 
 alter table td_child drop constraint fk_td_child_parent_id;
 drop index ix_td_child_parent_id;
 
+alter table empl drop constraint fk_empl_default_address_id;
+drop index ix_empl_default_address_id;
+
+alter table grand_parent_person drop constraint fk_grnd_prnt_prsn_sm_bn_d;
+drop index ix_grnd_prnt_prsn_sm_bn_d;
+
+alter table survey_group drop constraint fk_srvy_grp_ctgrybjctd;
+drop index ix_srvy_grp_ctgrybjctd;
+
+alter table hx_link_doc drop constraint fk_hx_link_doc_hx_link;
+drop index ix_hx_link_doc_hx_link;
+
+alter table hx_link_doc drop constraint fk_hx_link_doc_he_doc;
+drop index ix_hx_link_doc_he_doc;
+
+alter table hi_link_doc drop constraint fk_hi_link_doc_hi_link;
+drop index ix_hi_link_doc_hi_link;
+
+alter table hi_link_doc drop constraint fk_hi_link_doc_hi_doc;
+drop index ix_hi_link_doc_hi_doc;
+
 alter table imrelated drop constraint fk_imrelated_owner_id;
 drop index ix_imrelated_owner_id;
 
@@ -93,46 +231,59 @@ alter table inner_report drop constraint fk_inner_report_forecast_id;
 alter table drel_invoice drop constraint fk_drel_invoice_booking;
 drop index ix_drel_invoice_booking;
 
-alter table item drop constraint fk_item_type;
-drop index ix_item_customer_type;
+alter table item drop constraint fk_item_etype;
+drop index ix_item_etype;
 
-alter table item drop constraint fk_item_region;
-drop index ix_item_customer_region;
+alter table item drop constraint fk_item_eregion;
+drop index ix_item_eregion;
+
+alter table trainer_monkey drop constraint fk_trainer_monkey_trainer;
+
+alter table trainer_monkey drop constraint fk_trainer_monkey_monkey;
+
+alter table troop_monkey drop constraint fk_troop_monkey_troop;
+
+alter table troop_monkey drop constraint fk_troop_monkey_monkey;
+
+alter table l2_cldf_reset_bean_child drop constraint fk_l2_cldf_rst_bn_chld_prnt_d;
+drop index ix_l2_cldf_rst_bn_chld_prnt_d;
 
 alter table level1_level4 drop constraint fk_level1_level4_level1;
-drop index ix_level1_level4_level1_id;
+drop index ix_level1_level4_level1;
 
 alter table level1_level4 drop constraint fk_level1_level4_level4;
-drop index ix_level1_level4_level4_id;
+drop index ix_level1_level4_level4;
 
 alter table level1_level2 drop constraint fk_level1_level2_level1;
-drop index ix_level1_level2_level1_id;
+drop index ix_level1_level2_level1;
 
 alter table level1_level2 drop constraint fk_level1_level2_level2;
-drop index ix_level1_level2_level2_id;
+drop index ix_level1_level2_level2;
 
 alter table level2_level3 drop constraint fk_level2_level3_level2;
-drop index ix_level2_level3_level2_id;
+drop index ix_level2_level3_level2;
 
 alter table level2_level3 drop constraint fk_level2_level3_level3;
-drop index ix_level2_level3_level3_id;
+drop index ix_level2_level3_level3;
 
-alter table la_attr_value_attribute drop constraint fk_la_attr_value_attribute__1;
-drop index ix_la_attr_value_attribute__1;
+alter table link drop constraint fk_link_id;
 
-alter table la_attr_value_attribute drop constraint fk_la_attr_value_attribute__2;
-drop index ix_la_attr_value_attribute__2;
+alter table la_attr_value_attribute drop constraint fk_l_ttr_vl_ttrbt_l_ttr_vl;
+drop index ix_l_ttr_vl_ttrbt_l_ttr_vl;
+
+alter table la_attr_value_attribute drop constraint fk_l_ttr_vl_ttrbt_ttrbt;
+drop index ix_l_ttr_vl_ttrbt_ttrbt;
 
 alter table mprinter drop constraint fk_mprinter_current_state_id;
 drop index ix_mprinter_current_state_id;
 
 alter table mprinter drop constraint fk_mprinter_last_swap_cyan_id;
 
-alter table mprinter drop constraint fk_mprinter_last_swap_magen_3;
+alter table mprinter drop constraint fk_mprntr_lst_swp_mgnt_d;
 
-alter table mprinter drop constraint fk_mprinter_last_swap_yello_4;
+alter table mprinter drop constraint fk_mprntr_lst_swp_yllw_d;
 
-alter table mprinter drop constraint fk_mprinter_last_swap_black_5;
+alter table mprinter drop constraint fk_mprntr_lst_swp_blck_d;
 
 alter table mprinter_state drop constraint fk_mprinter_state_printer_id;
 drop index ix_mprinter_state_printer_id;
@@ -141,45 +292,89 @@ alter table mprofile drop constraint fk_mprofile_picture_id;
 drop index ix_mprofile_picture_id;
 
 alter table mrole_muser drop constraint fk_mrole_muser_mrole;
-drop index ix_mrole_muser_mrole_roleid;
+drop index ix_mrole_muser_mrole;
 
 alter table mrole_muser drop constraint fk_mrole_muser_muser;
-drop index ix_mrole_muser_muser_userid;
+drop index ix_mrole_muser_muser;
 
 alter table muser drop constraint fk_muser_user_type_id;
 drop index ix_muser_user_type_id;
 
+alter table mail_user_inbox drop constraint fk_mail_user_inbox_mail_user;
+drop index ix_mail_user_inbox_mail_user;
+
+alter table mail_user_inbox drop constraint fk_mail_user_inbox_mail_box;
+drop index ix_mail_user_inbox_mail_box;
+
+alter table mail_user_outbox drop constraint fk_mail_user_outbox_mail_user;
+drop index ix_mail_user_outbox_mail_user;
+
+alter table mail_user_outbox drop constraint fk_mail_user_outbox_mail_box;
+drop index ix_mail_user_outbox_mail_box;
+
 alter table c_message drop constraint fk_c_message_conversation_id;
 drop index ix_c_message_conversation_id;
 
 alter table c_message drop constraint fk_c_message_user_id;
 drop index ix_c_message_user_id;
 
-alter table mnoc_user_mnoc_role drop constraint fk_mnoc_user_mnoc_role_mnoc_1;
-drop index ix_mnoc_user_mnoc_role_mnoc_1;
+alter table mnoc_user_mnoc_role drop constraint fk_mnc_sr_mnc_rl_mnc_sr;
+drop index ix_mnc_sr_mnc_rl_mnc_sr;
 
-alter table mnoc_user_mnoc_role drop constraint fk_mnoc_user_mnoc_role_mnoc_2;
-drop index ix_mnoc_user_mnoc_role_mnoc_2;
+alter table mnoc_user_mnoc_role drop constraint fk_mnc_sr_mnc_rl_mnc_rl;
+drop index ix_mnc_sr_mnc_rl_mnc_rl;
+
+alter table mny_b drop constraint fk_mny_b_a_id;
+drop index ix_mny_b_a_id;
+
+alter table mny_b_mny_c drop constraint fk_mny_b_mny_c_mny_b;
+drop index ix_mny_b_mny_c_mny_b;
+
+alter table mny_b_mny_c drop constraint fk_mny_b_mny_c_mny_c;
+drop index ix_mny_b_mny_c_mny_c;
+
+alter table subtopics drop constraint fk_subtopics_mny_topic_1;
+drop index ix_subtopics_mny_topic_1;
+
+alter table subtopics drop constraint fk_subtopics_mny_topic_2;
+drop index ix_subtopics_mny_topic_2;
 
 alter table mp_role drop constraint fk_mp_role_mp_user_id;
 drop index ix_mp_role_mp_user_id;
 
-alter table my_lob_size_join_many drop constraint fk_my_lob_size_join_many_pa_1;
-drop index ix_my_lob_size_join_many_pa_1;
+alter table ms_many_a_many_b drop constraint fk_ms_many_a_many_b_ms_many_a;
+drop index ix_ms_many_a_many_b_ms_many_a;
 
-alter table o_cached_bean_country drop constraint fk_o_cached_bean_country_o__1;
-drop index ix_o_cached_bean_country_o__1;
+alter table ms_many_a_many_b drop constraint fk_ms_many_a_many_b_ms_many_b;
+drop index ix_ms_many_a_many_b_ms_many_b;
 
-alter table o_cached_bean_country drop constraint fk_o_cached_bean_country_o__2;
-drop index ix_o_cached_bean_country_o__2;
+alter table ms_many_b_many_a drop constraint fk_ms_many_b_many_a_ms_many_b;
+drop index ix_ms_many_b_many_a_ms_many_b;
 
-alter table o_cached_bean_child drop constraint fk_o_cached_bean_child_cach_1;
-drop index ix_o_cached_bean_child_cach_1;
+alter table ms_many_b_many_a drop constraint fk_ms_many_b_many_a_ms_many_a;
+drop index ix_ms_many_b_many_a_ms_many_a;
+
+alter table my_lob_size_join_many drop constraint fk_my_lb_sz_jn_mny_prnt_d;
+drop index ix_my_lb_sz_jn_mny_prnt_d;
+
+alter table o_cached_bean_country drop constraint fk_o_cchd_bn_cntry__cchd_bn;
+drop index ix_o_cchd_bn_cntry__cchd_bn;
+
+alter table o_cached_bean_country drop constraint fk_o_cchd_bn_cntry__cntry;
+drop index ix_o_cchd_bn_cntry__cntry;
+
+alter table o_cached_bean_child drop constraint fk_o_cchd_bn_chld_cchd_bn_d;
+drop index ix_o_cchd_bn_chld_cchd_bn_d;
 
 alter table oengine drop constraint fk_oengine_car_id;
 
 alter table ogear_box drop constraint fk_ogear_box_car_id;
 
+alter table oroad_show_msg drop constraint fk_oroad_show_msg_company_id;
+
+alter table om_ordered_detail drop constraint fk_om_rdrd_dtl_mstr_d;
+drop index ix_om_rdrd_dtl_mstr_d;
+
 alter table o_order drop constraint fk_o_order_kcustomer_id;
 drop index ix_o_order_kcustomer_id;
 
@@ -195,8 +390,23 @@ drop index ix_s_order_items_order_uuid;
 alter table or_order_ship drop constraint fk_or_order_ship_order_id;
 drop index ix_or_order_ship_order_id;
 
+alter table oto_bchild drop constraint fk_oto_bchild_master_id;
+
 alter table oto_child drop constraint fk_oto_child_master_id;
 
+alter table oto_cust_address drop constraint fk_ot_cst_ddrss_cstmr_cd;
+
+alter table oto_prime_extra drop constraint fk_oto_prime_extra_eid;
+
+alter table oto_th_many drop constraint fk_oto_th_many_oto_th_top_id;
+drop index ix_oto_th_many_oto_th_top_id;
+
+alter table oto_th_one drop constraint fk_oto_th_one_many_id;
+
+alter table oto_ubprime_extra drop constraint fk_oto_ubprime_extra_eid;
+
+alter table oto_uprime_extra drop constraint fk_oto_uprime_extra_eid;
+
 alter table pfile drop constraint fk_pfile_file_content_id;
 
 alter table pfile drop constraint fk_pfile_file_content2_id;
@@ -208,19 +418,25 @@ drop index ix_pallet_location_zone_sid;
 
 alter table parcel_location drop constraint fk_parcel_location_parcelid;
 
-alter table rawinherit_parent_rawinherit_d drop constraint fk_rawinherit_parent_rawinh_1;
-drop index ix_rawinherit_parent_rawinh_1;
+alter table rawinherit_parent_rawinherit_d drop constraint fk_rwnhrt_prnt_rwnhrt_d_rwn_1;
+drop index ix_rwnhrt_prnt_rwnhrt_d_rwn_1;
 
-alter table rawinherit_parent_rawinherit_d drop constraint fk_rawinherit_parent_rawinh_2;
-drop index ix_rawinherit_parent_rawinh_2;
+alter table rawinherit_parent_rawinherit_d drop constraint fk_rwnhrt_prnt_rwnhrt_d_rwn_2;
+drop index ix_rwnhrt_prnt_rwnhrt_d_rwn_2;
 
-alter table c_participation drop constraint fk_c_participation_conversa_1;
-drop index ix_c_participation_conversa_1;
+alter table parent_person drop constraint fk_parent_person_some_bean_id;
+drop index ix_parent_person_some_bean_id;
+
+alter table parent_person drop constraint fk_prnt_prsn_prnt_dntfr;
+drop index ix_prnt_prsn_prnt_dntfr;
+
+alter table c_participation drop constraint fk_c_prtcptn_cnvrstn_d;
+drop index ix_c_prtcptn_cnvrstn_d;
 
 alter table c_participation drop constraint fk_c_participation_user_id;
 drop index ix_c_participation_user_id;
 
-alter table persistent_file_content drop constraint fk_persistent_file_content__1;
+alter table persistent_file_content drop constraint fk_prsstnt_fl_cntnt_prsstnt_1;
 
 alter table person drop constraint fk_person_default_address_oid;
 drop index ix_person_default_address_oid;
@@ -229,25 +445,28 @@ alter table phones drop constraint fk_phones_person_id;
 drop index ix_phones_person_id;
 
 alter table pp_to_ww drop constraint fk_pp_to_ww_pp;
-drop index ix_pp_to_ww_pp_id;
+drop index ix_pp_to_ww_pp;
 
 alter table pp_to_ww drop constraint fk_pp_to_ww_wview;
-drop index ix_pp_to_ww_ww_id;
+drop index ix_pp_to_ww_wview;
 
-alter table r_orders drop constraint fk_r_orders_rcustomer;
-drop index ix_r_orders_company_custome_1;
+alter table question drop constraint fk_question_groupobjectid;
+drop index ix_question_groupobjectid;
 
-alter table resourcefile drop constraint fk_resourcefile_parentresou_1;
-drop index ix_resourcefile_parentresou_1;
+alter table r_orders drop constraint fk_r_orders_customer;
+drop index ix_r_orders_customer;
+
+alter table resourcefile drop constraint fk_rsrcfl_prntrsrcfld;
+drop index ix_rsrcfl_prntrsrcfld;
 
 alter table mt_role drop constraint fk_mt_role_tenant_id;
 drop index ix_mt_role_tenant_id;
 
 alter table mt_role_permission drop constraint fk_mt_role_permission_mt_role;
-drop index ix_mt_role_permission_mt_ro_1;
+drop index ix_mt_role_permission_mt_role;
 
-alter table mt_role_permission drop constraint fk_mt_role_permission_mt_pe_2;
-drop index ix_mt_role_permission_mt_pe_2;
+alter table mt_role_permission drop constraint fk_mt_rl_prmssn_mt_prmssn;
+drop index ix_mt_rl_prmssn_mt_prmssn;
 
 alter table f_second drop constraint fk_f_second_first;
 
@@ -257,20 +476,25 @@ drop index ix_section_article_id;
 alter table self_parent drop constraint fk_self_parent_parent_id;
 drop index ix_self_parent_parent_id;
 
-alter table self_ref_customer drop constraint fk_self_ref_customer_referr_1;
-drop index ix_self_ref_customer_referr_1;
+alter table self_ref_customer drop constraint fk_slf_rf_cstmr_rfrrd_by_d;
+drop index ix_slf_rf_cstmr_rfrrd_by_d;
 
 alter table self_ref_example drop constraint fk_self_ref_example_parent_id;
 drop index ix_self_ref_example_parent_id;
 
-alter table stockforecast drop constraint fk_stockforecast_inner_repo_1;
-drop index ix_stockforecast_inner_repo_1;
+alter table stockforecast drop constraint fk_stckfrcst_nnr_rprt_d;
+drop index ix_stckfrcst_nnr_rprt_d;
 
 alter table sub_section drop constraint fk_sub_section_section_id;
 drop index ix_sub_section_section_id;
 
-alter table t_detail_with_other_namexxxyy drop constraint fk_t_detail_with_other_name_1;
-drop index ix_t_detail_with_other_name_1;
+alter table tevent_many drop constraint fk_tevent_many_event_id;
+drop index ix_tevent_many_event_id;
+
+alter table tevent_one drop constraint fk_tevent_one_event_id;
+
+alter table t_detail_with_other_namexxxyy drop constraint fk_t_dtl_wth_thr_nmxxxyy_ms_1;
+drop index ix_t_dtl_wth_thr_nmxxxyy_ms_1;
 
 alter table ts_detail_two drop constraint fk_ts_detail_two_master_id;
 drop index ix_ts_detail_two_master_id;
@@ -306,12 +530,12 @@ drop index ix_em_user_role_user_id;
 alter table em_user_role drop constraint fk_em_user_role_role_id;
 drop index ix_em_user_role_role_id;
 
-alter table vehicle drop constraint fk_vehicle_truck_ref_id;
-drop index ix_vehicle_truck_ref_id;
-
 alter table vehicle drop constraint fk_vehicle_car_ref_id;
 drop index ix_vehicle_car_ref_id;
 
+alter table vehicle drop constraint fk_vehicle_truck_ref_id;
+drop index ix_vehicle_truck_ref_id;
+
 alter table vehicle_driver drop constraint fk_vehicle_driver_vehicle_id;
 drop index ix_vehicle_driver_vehicle_id;
 
@@ -321,11 +545,11 @@ drop index ix_vehicle_driver_address_id;
 alter table warehouses drop constraint fk_warehouses_officezoneid;
 drop index ix_warehouses_officezoneid;
 
-alter table warehousesshippingzones drop constraint fk_warehousesshippingzones__1;
-drop index ix_warehousesshippingzones__1;
+alter table warehousesshippingzones drop constraint fk_wrhssshppngzns_wrhss;
+drop index ix_wrhssshppngzns_wrhss;
 
-alter table warehousesshippingzones drop constraint fk_warehousesshippingzones__2;
-drop index ix_warehousesshippingzones__2;
+alter table warehousesshippingzones drop constraint fk_wrhssshppngzns_zns;
+drop index ix_wrhssshppngzns_zns;
 
 alter table sa_wheel drop constraint fk_sa_wheel_tire;
 drop index ix_sa_wheel_tire;
@@ -333,6 +557,12 @@ drop index ix_sa_wheel_tire;
 alter table sa_wheel drop constraint fk_sa_wheel_car;
 drop index ix_sa_wheel_car;
 
+alter table g_who_props_otm drop constraint fk_g_wh_prps_tm_wh_crtd_d;
+drop index ix_g_wh_prps_tm_wh_crtd_d;
+
+alter table g_who_props_otm drop constraint fk_g_wh_prps_tm_wh_mdfd_d;
+drop index ix_g_wh_prps_tm_wh_mdfd_d;
+
 alter table with_zero drop constraint fk_with_zero_parent_id;
 drop index ix_with_zero_parent_id;
 
@@ -345,14 +575,20 @@ drop sequence bar_seq;
 drop table oto_account cascade constraints purge;
 drop sequence oto_account_seq;
 
-drop table o_address cascade constraints purge;
-drop sequence o_address_seq;
+drop table addr cascade constraints purge;
+drop sequence addr_seq;
 
 drop table address cascade constraints purge;
 drop sequence address_seq;
 
-drop table animals cascade constraints purge;
-drop sequence animals_seq;
+drop table o_address cascade constraints purge;
+drop sequence o_address_seq;
+
+drop table album cascade constraints purge;
+drop sequence album_seq;
+
+drop table animal cascade constraints purge;
+drop sequence animal_seq;
 
 drop table animal_shelter cascade constraints purge;
 drop sequence animal_shelter_seq;
@@ -378,6 +614,16 @@ drop sequence bbookmark_user_seq;
 drop table bsimple_with_gen cascade constraints purge;
 drop sequence bsimple_with_gen_seq;
 
+drop table bsite cascade constraints purge;
+
+drop table bsite_user cascade constraints purge;
+
+drop table bsite_user_b cascade constraints purge;
+
+drop table bsite_user_c cascade constraints purge;
+
+drop table buser cascade constraints purge;
+
 drop table bwith_qident cascade constraints purge;
 drop sequence bwith_qident_seq;
 
@@ -390,6 +636,9 @@ drop sequence bean_with_time_zone_seq;
 drop table drel_booking cascade constraints purge;
 drop sequence drel_booking_seq;
 
+drop table cinh_root cascade constraints purge;
+drop sequence cinh_root_seq;
+
 drop table ckey_assoc cascade constraints purge;
 drop sequence ckey_assoc_seq;
 
@@ -414,6 +663,15 @@ drop table sp_car_car_wheels cascade constraints purge;
 drop table car_accessory cascade constraints purge;
 drop sequence car_accessory_seq;
 
+drop table car_fuse cascade constraints purge;
+drop sequence car_fuse_seq;
+
+drop table category cascade constraints purge;
+drop sequence category_seq;
+
+drop table child_person cascade constraints purge;
+drop sequence child_person_seq;
+
 drop table configuration cascade constraints purge;
 drop sequence configuration_seq;
 
@@ -434,21 +692,86 @@ drop sequence c_conversation_seq;
 
 drop table o_country cascade constraints purge;
 
+drop table cover cascade constraints purge;
+drop sequence cover_seq;
+
 drop table o_customer cascade constraints purge;
 drop sequence o_customer_seq;
 
+drop table dcredit cascade constraints purge;
+drop sequence dcredit_seq;
+
+drop table dcredit_drol cascade constraints purge;
+
 drop table dexh_entity cascade constraints purge;
 drop sequence dexh_entity_seq;
 
 drop table dperson cascade constraints purge;
 drop sequence dperson_seq;
 
+drop table drol cascade constraints purge;
+drop sequence drol_seq;
+
+drop table drot cascade constraints purge;
+drop sequence drot_seq;
+
+drop table drot_drol cascade constraints purge;
+
 drop table rawinherit_data cascade constraints purge;
 drop sequence rawinherit_data_seq;
 
+drop table dfk_cascade cascade constraints purge;
+drop sequence dfk_cascade_seq;
+
+drop table dfk_cascade_one cascade constraints purge;
+drop sequence dfk_cascade_one_seq;
+
+drop table dfk_none cascade constraints purge;
+drop sequence dfk_none_seq;
+
+drop table dfk_none_via_join cascade constraints purge;
+drop sequence dfk_none_via_join_seq;
+
+drop table dfk_one cascade constraints purge;
+drop sequence dfk_one_seq;
+
+drop table dfk_set_null cascade constraints purge;
+drop sequence dfk_set_null_seq;
+
+drop table doc cascade constraints purge;
+drop sequence doc_seq;
+
+drop table doc_link cascade constraints purge;
+
+drop table doc_link_draft cascade constraints purge;
+
+drop table doc_draft cascade constraints purge;
+drop sequence doc_draft_seq;
+
+drop table document cascade constraints purge;
+drop sequence document_seq;
+
+drop table document_draft cascade constraints purge;
+drop sequence document_draft_seq;
+
+drop table document_media cascade constraints purge;
+drop sequence document_media_seq;
+
+drop table document_media_draft cascade constraints purge;
+drop sequence document_media_draft_seq;
+
+drop table earray_bean cascade constraints purge;
+drop sequence earray_bean_seq;
+
+drop table earray_set_bean cascade constraints purge;
+drop sequence earray_set_bean_seq;
+
 drop table e_basic cascade constraints purge;
 drop sequence e_basic_seq;
 
+drop table ebasic_change_log cascade constraints purge;
+drop sequence ebasic_change_log_seq;
+
 drop table ebasic_clob cascade constraints purge;
 drop sequence ebasic_clob_seq;
 
@@ -466,6 +789,15 @@ drop sequence e_basicenc_bin_seq;
 
 drop table e_basic_enum_id cascade constraints purge;
 
+drop table e_basic_eni cascade constraints purge;
+drop sequence e_basic_eni_seq;
+
+drop table ebasic_hstore cascade constraints purge;
+drop sequence ebasic_hstore_seq;
+
+drop table ebasic_json_list cascade constraints purge;
+drop sequence ebasic_json_list_seq;
+
 drop table ebasic_json_map cascade constraints purge;
 drop sequence ebasic_json_map_seq;
 
@@ -475,6 +807,9 @@ drop sequence ebasic_json_map_blob_seq;
 drop table ebasic_json_map_clob cascade constraints purge;
 drop sequence ebasic_json_map_clob_seq;
 
+drop table ebasic_json_map_detail cascade constraints purge;
+drop sequence ebasic_json_map_detail_seq;
+
 drop table ebasic_json_map_json_b cascade constraints purge;
 drop sequence ebasic_json_map_json_b_seq;
 
@@ -493,9 +828,21 @@ drop sequence ebasic_json_node_json_b_seq;
 drop table ebasic_json_node_varchar cascade constraints purge;
 drop sequence ebasic_json_node_varchar_seq;
 
+drop table ebasic_json_unmapped cascade constraints purge;
+drop sequence ebasic_json_unmapped_seq;
+
 drop table e_basic_ndc cascade constraints purge;
 drop sequence e_basic_ndc_seq;
 
+drop table ebasic_no_sdchild cascade constraints purge;
+drop sequence ebasic_no_sdchild_seq;
+
+drop table ebasic_sdchild cascade constraints purge;
+drop sequence ebasic_sdchild_seq;
+
+drop table ebasic_soft_delete cascade constraints purge;
+drop sequence ebasic_soft_delete_seq;
+
 drop table e_basicver cascade constraints purge;
 drop sequence e_basicver_seq;
 
@@ -505,6 +852,11 @@ drop sequence e_basic_withlife_seq;
 drop table e_basicverucon cascade constraints purge;
 drop sequence e_basicverucon_seq;
 
+drop table e_col_ab cascade constraints purge;
+drop sequence e_col_ab_seq;
+
+drop table ecustom_id cascade constraints purge;
+
 drop table eemb_inner cascade constraints purge;
 drop sequence eemb_inner_seq;
 
@@ -538,8 +890,40 @@ drop sequence eopt_one_c_seq;
 drop table eperson cascade constraints purge;
 drop sequence eperson_seq;
 
+drop table e_person_online cascade constraints purge;
+drop sequence e_person_online_seq;
+
 drop table esimple cascade constraints purge;
-drop sequence esimple_seq;
+
+drop table esoft_del_book cascade constraints purge;
+drop sequence esoft_del_book_seq;
+
+drop table esoft_del_book_esoft_del_user cascade constraints purge;
+
+drop table esoft_del_down cascade constraints purge;
+drop sequence esoft_del_down_seq;
+
+drop table esoft_del_mid cascade constraints purge;
+drop sequence esoft_del_mid_seq;
+
+drop table esoft_del_role cascade constraints purge;
+drop sequence esoft_del_role_seq;
+
+drop table esoft_del_role_esoft_del_user cascade constraints purge;
+
+drop table esoft_del_top cascade constraints purge;
+drop sequence esoft_del_top_seq;
+
+drop table esoft_del_up cascade constraints purge;
+drop sequence esoft_del_up_seq;
+
+drop table esoft_del_user cascade constraints purge;
+drop sequence esoft_del_user_seq;
+
+drop table esoft_del_user_esoft_del_role cascade constraints purge;
+
+drop table esome_convert_type cascade constraints purge;
+drop sequence esome_convert_type_seq;
 
 drop table esome_type cascade constraints purge;
 drop sequence esome_type_seq;
@@ -547,6 +931,9 @@ drop sequence esome_type_seq;
 drop table etrans_many cascade constraints purge;
 drop sequence etrans_many_seq;
 
+drop table rawinherit_uncle cascade constraints purge;
+drop sequence rawinherit_uncle_seq;
+
 drop table evanilla_collection cascade constraints purge;
 drop sequence evanilla_collection_seq;
 
@@ -565,6 +952,9 @@ drop sequence td_child_seq;
 drop table td_parent cascade constraints purge;
 drop sequence td_parent_seq;
 
+drop table empl cascade constraints purge;
+drop sequence empl_seq;
+
 drop table feature_desc cascade constraints purge;
 drop sequence feature_desc_seq;
 
@@ -575,17 +965,38 @@ drop table foo cascade constraints purge;
 drop sequence foo_seq;
 
 drop table gen_key_identity cascade constraints purge;
-drop sequence gen_key_identity_seq;
 
 drop table gen_key_sequence cascade constraints purge;
-drop sequence seq;
+drop sequence SEQ;
 
 drop table gen_key_table cascade constraints purge;
 drop sequence gen_key_table_seq;
 
+drop table grand_parent_person cascade constraints purge;
+drop sequence grand_parent_person_seq;
+
+drop table survey_group cascade constraints purge;
+drop sequence survey_group_seq;
+
 drop table c_group cascade constraints purge;
 drop sequence c_group_seq;
 
+drop table he_doc cascade constraints purge;
+drop sequence he_doc_seq;
+
+drop table hx_link cascade constraints purge;
+drop sequence hx_link_seq;
+
+drop table hx_link_doc cascade constraints purge;
+
+drop table hi_doc cascade constraints purge;
+drop sequence hi_doc_seq;
+
+drop table hi_link cascade constraints purge;
+drop sequence hi_link_seq;
+
+drop table hi_link_doc cascade constraints purge;
+
 drop table imrelated cascade constraints purge;
 drop sequence imrelated_seq;
 
@@ -611,6 +1022,25 @@ drop sequence drel_invoice_seq;
 
 drop table item cascade constraints purge;
 
+drop table monkey cascade constraints purge;
+drop sequence monkey_seq;
+
+drop table trainer cascade constraints purge;
+drop sequence trainer_seq;
+
+drop table trainer_monkey cascade constraints purge;
+
+drop table troop cascade constraints purge;
+drop sequence troop_seq;
+
+drop table troop_monkey cascade constraints purge;
+
+drop table l2_cldf_reset_bean cascade constraints purge;
+drop sequence l2_cldf_reset_bean_seq;
+
+drop table l2_cldf_reset_bean_child cascade constraints purge;
+drop sequence l2_cldf_reset_bean_child_seq;
+
 drop table level1 cascade constraints purge;
 drop sequence level1_seq;
 
@@ -629,6 +1059,12 @@ drop sequence level3_seq;
 drop table level4 cascade constraints purge;
 drop sequence level4_seq;
 
+drop table link cascade constraints purge;
+drop sequence link_seq;
+
+drop table link_draft cascade constraints purge;
+drop sequence link_draft_seq;
+
 drop table la_attr_value cascade constraints purge;
 drop sequence la_attr_value_seq;
 
@@ -666,6 +1102,16 @@ drop sequence muser_seq;
 drop table muser_type cascade constraints purge;
 drop sequence muser_type_seq;
 
+drop table mail_box cascade constraints purge;
+drop sequence mail_box_seq;
+
+drop table mail_user cascade constraints purge;
+drop sequence mail_user_seq;
+
+drop table mail_user_inbox cascade constraints purge;
+
+drop table mail_user_outbox cascade constraints purge;
+
 drop table map_super_actual cascade constraints purge;
 drop sequence map_super_actual_seq;
 
@@ -680,12 +1126,38 @@ drop sequence mnoc_user_seq;
 
 drop table mnoc_user_mnoc_role cascade constraints purge;
 
+drop table mny_a cascade constraints purge;
+drop sequence mny_a_seq;
+
+drop table mny_b cascade constraints purge;
+drop sequence mny_b_seq;
+
+drop table mny_b_mny_c cascade constraints purge;
+
+drop table mny_c cascade constraints purge;
+drop sequence mny_c_seq;
+
+drop table mny_topic cascade constraints purge;
+drop sequence mny_topic_seq;
+
+drop table subtopics cascade constraints purge;
+
 drop table mp_role cascade constraints purge;
 drop sequence mp_role_seq;
 
 drop table mp_user cascade constraints purge;
 drop sequence mp_user_seq;
 
+drop table ms_many_a cascade constraints purge;
+drop sequence ms_many_a_seq;
+
+drop table ms_many_a_many_b cascade constraints purge;
+
+drop table ms_many_b cascade constraints purge;
+drop sequence ms_many_b_seq;
+
+drop table ms_many_b_many_a cascade constraints purge;
+
 drop table my_lob_size cascade constraints purge;
 drop sequence my_lob_size_seq;
 
@@ -702,13 +1174,31 @@ drop table o_cached_bean_country cascade constraints purge;
 drop table o_cached_bean_child cascade constraints purge;
 drop sequence o_cached_bean_child_seq;
 
+drop table o_cached_natkey cascade constraints purge;
+drop sequence o_cached_natkey_seq;
+
+drop table o_cached_natkey3 cascade constraints purge;
+drop sequence o_cached_natkey3_seq;
+
 drop table ocar cascade constraints purge;
 drop sequence ocar_seq;
 
+drop table ocompany cascade constraints purge;
+drop sequence ocompany_seq;
+
 drop table oengine cascade constraints purge;
 
 drop table ogear_box cascade constraints purge;
 
+drop table oroad_show_msg cascade constraints purge;
+drop sequence oroad_show_msg_seq;
+
+drop table om_ordered_detail cascade constraints purge;
+drop sequence om_ordered_detail_seq;
+
+drop table om_ordered_master cascade constraints purge;
+drop sequence om_ordered_master_seq;
+
 drop table o_order cascade constraints purge;
 drop sequence o_order_seq;
 
@@ -722,12 +1212,49 @@ drop table s_order_items cascade constraints purge;
 drop table or_order_ship cascade constraints purge;
 drop sequence or_order_ship_seq;
 
+drop table organisation cascade constraints purge;
+drop sequence organisation_seq;
+
+drop table oto_bchild cascade constraints purge;
+drop sequence oto_bchild_seq;
+
+drop table oto_bmaster cascade constraints purge;
+drop sequence oto_bmaster_seq;
+
 drop table oto_child cascade constraints purge;
 drop sequence oto_child_seq;
 
+drop table oto_cust cascade constraints purge;
+drop sequence oto_cust_seq;
+
+drop table oto_cust_address cascade constraints purge;
+drop sequence oto_cust_address_seq;
+
 drop table oto_master cascade constraints purge;
 drop sequence oto_master_seq;
 
+drop table oto_prime cascade constraints purge;
+drop sequence oto_prime_seq;
+
+drop table oto_prime_extra cascade constraints purge;
+
+drop table oto_th_many cascade constraints purge;
+drop sequence oto_th_many_seq;
+
+drop table oto_th_one cascade constraints purge;
+drop sequence oto_th_one_seq;
+
+drop table oto_th_top cascade constraints purge;
+drop sequence oto_th_top_seq;
+
+drop table oto_ubprime cascade constraints purge;
+
+drop table oto_ubprime_extra cascade constraints purge;
+
+drop table oto_uprime cascade constraints purge;
+
+drop table oto_uprime_extra cascade constraints purge;
+
 drop table pfile cascade constraints purge;
 drop sequence pfile_seq;
 
@@ -750,6 +1277,9 @@ drop sequence rawinherit_parent_seq;
 
 drop table rawinherit_parent_rawinherit_d cascade constraints purge;
 
+drop table parent_person cascade constraints purge;
+drop sequence parent_person_seq;
+
 drop table c_participation cascade constraints purge;
 drop sequence c_participation_seq;
 
@@ -762,13 +1292,15 @@ drop table persistent_file_content cascade constraints purge;
 drop sequence persistent_file_content_seq;
 
 drop table persons cascade constraints purge;
-drop sequence persons_seq;
+drop sequence PERSONS_seq;
 
 drop table person cascade constraints purge;
 drop sequence person_seq;
 
 drop table phones cascade constraints purge;
-drop sequence phones_seq;
+drop sequence PHONES_seq;
+
+drop table primary_revision cascade constraints purge;
 
 drop table o_product cascade constraints purge;
 drop sequence o_product_seq;
@@ -777,6 +1309,9 @@ drop table pp cascade constraints purge;
 
 drop table pp_to_ww cascade constraints purge;
 
+drop table question cascade constraints purge;
+drop sequence question_seq;
+
 drop table rcustomer cascade constraints purge;
 
 drop table r_orders cascade constraints purge;
@@ -785,13 +1320,13 @@ drop table region cascade constraints purge;
 
 drop table resourcefile cascade constraints purge;
 
+drop table em_role cascade constraints purge;
+drop sequence em_role_seq;
+
 drop table mt_role cascade constraints purge;
 
 drop table mt_role_permission cascade constraints purge;
 
-drop table em_role cascade constraints purge;
-drop sequence em_role_seq;
-
 drop table f_second cascade constraints purge;
 drop sequence f_second_seq;
 
@@ -828,11 +1363,23 @@ drop sequence sub_section_seq;
 drop table sub_type cascade constraints purge;
 drop sequence sub_type_seq;
 
+drop table survey cascade constraints purge;
+drop sequence survey_seq;
+
 drop table tbytes_only cascade constraints purge;
 drop sequence tbytes_only_seq;
 
 drop table tcar cascade constraints purge;
 
+drop table tevent cascade constraints purge;
+drop sequence tevent_seq;
+
+drop table tevent_many cascade constraints purge;
+drop sequence tevent_many_seq;
+
+drop table tevent_one cascade constraints purge;
+drop sequence tevent_one_seq;
+
 drop table tint_root cascade constraints purge;
 drop sequence tint_root_seq;
 
@@ -867,12 +1414,14 @@ drop sequence twith_pre_insert_seq;
 
 drop table mt_tenant cascade constraints purge;
 
-drop table sa_tire cascade constraints purge;
-drop sequence sa_tire_seq;
+drop table test_annotation_base_entity cascade constraints purge;
 
 drop table tire cascade constraints purge;
 drop sequence tire_seq;
 
+drop table sa_tire cascade constraints purge;
+drop sequence sa_tire_seq;
+
 drop table trip cascade constraints purge;
 drop sequence trip_seq;
 
@@ -881,6 +1430,9 @@ drop sequence truck_ref_seq;
 
 drop table type cascade constraints purge;
 
+drop table tz_bean cascade constraints purge;
+drop sequence tz_bean_seq;
+
 drop table ut_detail cascade constraints purge;
 drop sequence ut_detail_seq;
 
@@ -891,14 +1443,17 @@ drop table uuone cascade constraints purge;
 
 drop table uutwo cascade constraints purge;
 
-drop table em_user cascade constraints purge;
-drop sequence em_user_seq;
+drop table c_user cascade constraints purge;
+drop sequence c_user_seq;
 
 drop table tx_user cascade constraints purge;
 drop sequence tx_user_seq;
 
-drop table c_user cascade constraints purge;
-drop sequence c_user_seq;
+drop table g_user cascade constraints purge;
+drop sequence g_user_seq;
+
+drop table em_user cascade constraints purge;
+drop sequence em_user_seq;
 
 drop table oto_user cascade constraints purge;
 drop sequence oto_user_seq;
@@ -919,11 +1474,14 @@ drop table warehousesshippingzones cascade constraints purge;
 drop table sa_wheel cascade constraints purge;
 drop sequence sa_wheel_seq;
 
+drop table wheel cascade constraints purge;
+drop sequence wheel_seq;
+
 drop table sp_car_wheel cascade constraints purge;
 drop sequence sp_car_wheel_seq;
 
-drop table wheel cascade constraints purge;
-drop sequence wheel_seq;
+drop table g_who_props_otm cascade constraints purge;
+drop sequence g_who_props_otm_seq;
 
 drop table with_zero cascade constraints purge;
 drop sequence with_zero_seq;
@@ -936,3 +1494,5 @@ drop table wview cascade constraints purge;
 drop table zones cascade constraints purge;
 drop sequence zones_seq;
 
+drop index ix_cntct_lst_nm_frst_nm;
+drop index ix_e_basic_name;
diff --git a/src/test/ddl-review/pg-create-all.sql b/src/test/ddl-review/pg-create-all.sql
index 4956fd1bb..d9f99e631 100644
--- a/src/test/ddl-review/pg-create-all.sql
+++ b/src/test/ddl-review/pg-create-all.sql
@@ -1,3 +1,4 @@
+-- Generated by ebean unknown at 2018-03-08T06:39:45.063Z
 create table asimple_bean (
   id                            bigserial not null,
   name                          varchar(255),
@@ -16,20 +17,20 @@ create table oto_account (
   id                            bigserial not null,
   name                          varchar(255),
   version                       bigint not null,
-  when_created                  timestamp not null,
-  when_modified                 timestamp not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
   constraint pk_oto_account primary key (id)
 );
 
-create table o_address (
-  id                            smallserial not null,
-  line_1                        varchar(100),
-  line_2                        varchar(100),
-  city                          varchar(100),
-  cretime                       timestamp,
-  country_code                  varchar(2),
-  updtime                       timestamp not null,
-  constraint pk_o_address primary key (id)
+create table addr (
+  id                            bigserial not null,
+  employee_id                   bigint,
+  name                          varchar(255),
+  address_line1                 varchar(255),
+  address_line2                 varchar(255),
+  city                          varchar(255),
+  version                       bigint not null,
+  constraint pk_addr primary key (id)
 );
 
 create table address (
@@ -39,15 +40,38 @@ create table address (
   constraint pk_address primary key (oid)
 );
 
-create table animals (
-  species                       varchar(31) not null,
+create table o_address (
+  id                            smallserial not null,
+  line_1                        varchar(100),
+  line_2                        varchar(100),
+  city                          varchar(100),
+  cretime                       timestamptz,
+  country_code                  varchar(2),
+  updtime                       timestamptz not null,
+  constraint pk_o_address primary key (id)
+);
+
+create table album (
+  id                            bigserial not null,
+  name                          varchar(255),
+  cover_id                      bigint,
+  deleted                       boolean default false not null,
+  created_at                    timestamptz not null,
+  last_update                   timestamptz not null,
+  constraint uq_album_cover_id unique (cover_id),
+  constraint pk_album primary key (id)
+);
+
+create table animal (
+  species                       varchar(255) not null,
   id                            bigserial not null,
   shelter_id                    bigint,
   version                       bigint not null,
   name                          varchar(255),
   registration_number           varchar(255),
   date_of_birth                 date,
-  constraint pk_animals primary key (id)
+  dog_size                      varchar(255),
+  constraint pk_animal primary key (id)
 );
 
 create table animal_shelter (
@@ -61,8 +85,8 @@ create table article (
   id                            serial not null,
   name                          varchar(255),
   author                        varchar(255),
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
   version                       bigint not null,
   constraint pk_article primary key (id)
 );
@@ -71,16 +95,16 @@ create table attribute (
   option_type                   integer not null,
   id                            serial not null,
   attribute_holder_id           integer,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
   version                       bigint not null,
   constraint pk_attribute primary key (id)
 );
 
 create table attribute_holder (
   id                            serial not null,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
   version                       bigint not null,
   constraint pk_attribute_holder primary key (id)
 );
@@ -114,10 +138,46 @@ create table bsimple_with_gen (
   constraint pk_bsimple_with_gen primary key (id)
 );
 
+create table bsite (
+  id                            uuid not null,
+  name                          varchar(255),
+  constraint pk_bsite primary key (id)
+);
+
+create table bsite_user (
+  site_id                       uuid not null,
+  user_id                       uuid not null,
+  access_level                  integer,
+  constraint ck_bsite_user_access_level check ( access_level in (0,1,2)),
+  constraint pk_bsite_user primary key (site_id,user_id)
+);
+
+create table bsite_user_b (
+  site                          uuid not null,
+  usr                           uuid not null,
+  access_level                  integer,
+  constraint ck_bsite_user_b_access_level check ( access_level in (0,1,2)),
+  constraint pk_bsite_user_b primary key (site,usr)
+);
+
+create table bsite_user_c (
+  site_uid                      uuid not null,
+  user_uid                      uuid not null,
+  access_level                  integer,
+  constraint ck_bsite_user_c_access_level check ( access_level in (0,1,2)),
+  constraint pk_bsite_user_c primary key (site_uid,user_uid)
+);
+
+create table buser (
+  id                            uuid not null,
+  name                          varchar(255),
+  constraint pk_buser primary key (id)
+);
+
 create table bwith_qident (
   id                            serial not null,
-  "Name"                        varchar(255),
-  last_updated                  timestamp not null,
+  "Name"                        varchar(191),
+  last_updated                  timestamptz not null,
   constraint uq_bwith_qident_name unique ("Name"),
   constraint pk_bwith_qident primary key (id)
 );
@@ -125,9 +185,10 @@ create table bwith_qident (
 create table basic_joda_entity (
   id                            bigserial not null,
   name                          varchar(255),
-  created                       timestamp not null,
-  updated                       timestamp not null,
-  version                       timestamp not null,
+  period                        varchar(50),
+  created                       timestamptz not null,
+  updated                       timestamptz not null,
+  version                       timestamptz not null,
   constraint pk_basic_joda_entity primary key (id)
 );
 
@@ -140,15 +201,30 @@ create table bean_with_time_zone (
 
 create table drel_booking (
   id                            bigint not null,
+  booking_uid                   bigint,
   agent_invoice                 bigint,
   client_invoice                bigint,
   version                       integer not null,
+  constraint uq_drel_booking_booking_uid unique (booking_uid),
   constraint uq_drel_booking_agent_invoice unique (agent_invoice),
   constraint uq_drel_booking_client_invoice unique (client_invoice),
   constraint pk_drel_booking primary key (id)
 );
 create sequence drel_booking_seq;
 
+create table cinh_root (
+  dtype                         varchar(3) not null,
+  id                            serial not null,
+  license_number                varchar(255),
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
+  version                       bigint not null,
+  driver                        varchar(255),
+  notes                         varchar(255),
+  action                        varchar(255),
+  constraint pk_cinh_root primary key (id)
+);
+
 create table ckey_assoc (
   id                            serial not null,
   assoc_one                     varchar(255),
@@ -174,7 +250,7 @@ create table ckey_parent (
 
 create table calculation_result (
   id                            serial not null,
-  charge                        float,
+  charge                        float not null,
   product_configuration_id      integer,
   group_configuration_id        integer,
   constraint pk_calculation_result primary key (id)
@@ -211,15 +287,41 @@ create table sp_car_car_wheels (
 create table car_accessory (
   id                            serial not null,
   name                          varchar(255),
+  fuse_id                       bigint not null,
   car_id                        integer,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
   version                       bigint not null,
   constraint pk_car_accessory primary key (id)
 );
 
+create table car_fuse (
+  id                            bigserial not null,
+  location_code                 varchar(255),
+  constraint pk_car_fuse primary key (id)
+);
+
+create table category (
+  id                            bigserial not null,
+  name                          varchar(255),
+  surveyobjectid                bigint,
+  sequence_number               integer not null,
+  constraint pk_category primary key (id)
+);
+
+create table child_person (
+  identifier                    serial not null,
+  name                          varchar(255),
+  age                           integer,
+  some_bean_id                  integer,
+  parent_identifier             integer,
+  family_name                   varchar(255),
+  address                       varchar(255),
+  constraint pk_child_person primary key (identifier)
+);
+
 create table configuration (
-  type                          varchar(31) not null,
+  type                          varchar(21) not null,
   id                            serial not null,
   name                          varchar(255),
   configurations_id             integer,
@@ -236,23 +338,23 @@ create table configurations (
 
 create table contact (
   id                            serial not null,
-  first_name                    varchar(255),
-  last_name                     varchar(255),
+  first_name                    varchar(127),
+  last_name                     varchar(127),
   phone                         varchar(255),
   mobile                        varchar(255),
   email                         varchar(255),
   customer_id                   integer not null,
   group_id                      integer,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
   constraint pk_contact primary key (id)
 );
 
 create table contact_group (
   id                            serial not null,
   name                          varchar(255),
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
   version                       bigint not null,
   constraint pk_contact_group primary key (id)
 );
@@ -262,8 +364,8 @@ create table contact_note (
   contact_id                    integer,
   title                         varchar(255),
   note                          text,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
   version                       bigint not null,
   constraint pk_contact_note primary key (id)
 );
@@ -271,11 +373,11 @@ create table contact_note (
 create table c_conversation (
   id                            bigserial not null,
   title                         varchar(255),
-  isopen                        boolean,
+  isopen                        boolean default false not null,
   group_id                      bigint,
   version                       bigint not null,
-  when_created                  timestamp not null,
-  when_modified                 timestamp not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
   constraint pk_c_conversation primary key (id)
 );
 
@@ -285,6 +387,13 @@ create table o_country (
   constraint pk_o_country primary key (code)
 );
 
+create table cover (
+  id                            bigserial not null,
+  s3url                         varchar(255),
+  deleted                       boolean default false not null,
+  constraint pk_cover primary key (id)
+);
+
 create table o_customer (
   id                            serial not null,
   status                        varchar(1),
@@ -293,19 +402,34 @@ create table o_customer (
   anniversary                   date,
   billing_address_id            smallint,
   shipping_address_id           smallint,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
   version                       bigint not null,
-  constraint ck_o_customer_status check (status in ('N','A','I')),
+  constraint ck_o_customer_status check ( status in ('N','A','I')),
   constraint pk_o_customer primary key (id)
 );
+comment on table o_customer is 'Holds external customers';
+comment on column o_customer.status is 'status of the customer';
+comment on column o_customer.smallnote is 'Short notes regarding the customer';
+comment on column o_customer.anniversary is 'Join date of the customer';
+
+create table dcredit (
+  id                            bigserial not null,
+  credit                        varchar(255),
+  constraint pk_dcredit primary key (id)
+);
+
+create table dcredit_drol (
+  dcredit_id                    bigint not null,
+  drol_id                       bigint not null,
+  constraint pk_dcredit_drol primary key (dcredit_id,drol_id)
+);
 
 create table dexh_entity (
   oid                           bigserial not null,
-  exhange_rate                  decimal(38),
-  exhange_cmoney_amount         decimal(38),
-  exhange_cmoney_currency       varchar(3),
-  last_updated                  timestamp not null,
+  exhange                       varchar(255),
+  an_enum_type                  varchar(255),
+  last_updated                  timestamptz not null,
   constraint pk_dexh_entity primary key (oid)
 );
 
@@ -314,35 +438,203 @@ create table dperson (
   first_name                    varchar(255),
   last_name                     varchar(255),
   salary                        decimal(38),
-  a_amt                         decimal(38),
-  a_curr                        varchar(3),
-  i_start                       timestamp,
-  i_end                         timestamp,
   constraint pk_dperson primary key (id)
 );
 
+create table drol (
+  id                            bigserial not null,
+  name                          varchar(255),
+  constraint pk_drol primary key (id)
+);
+
+create table drot (
+  id                            bigserial not null,
+  name                          varchar(255),
+  constraint pk_drot primary key (id)
+);
+
+create table drot_drol (
+  drot_id                       bigint not null,
+  drol_id                       bigint not null,
+  constraint pk_drot_drol primary key (drot_id,drol_id)
+);
+
 create table rawinherit_data (
   id                            bigserial not null,
   val                           integer,
   constraint pk_rawinherit_data primary key (id)
 );
 
+create table dfk_cascade (
+  id                            bigserial not null,
+  name                          varchar(255),
+  one_id                        bigint,
+  constraint pk_dfk_cascade primary key (id)
+);
+
+create table dfk_cascade_one (
+  id                            bigserial not null,
+  name                          varchar(255),
+  constraint pk_dfk_cascade_one primary key (id)
+);
+
+create table dfk_none (
+  id                            bigserial not null,
+  name                          varchar(255),
+  one_id                        bigint,
+  constraint pk_dfk_none primary key (id)
+);
+
+create table dfk_none_via_join (
+  id                            bigserial not null,
+  name                          varchar(255),
+  one_id                        bigint,
+  constraint pk_dfk_none_via_join primary key (id)
+);
+
+create table dfk_one (
+  id                            bigserial not null,
+  name                          varchar(255),
+  constraint pk_dfk_one primary key (id)
+);
+
+create table dfk_set_null (
+  id                            bigserial not null,
+  name                          varchar(255),
+  one_id                        bigint,
+  constraint pk_dfk_set_null primary key (id)
+);
+
+create table doc (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint pk_doc primary key (id)
+);
+
+create table doc_link (
+  doc_id                        bigint not null,
+  link_id                       bigint not null,
+  constraint pk_doc_link primary key (doc_id,link_id)
+);
+
+create table doc_link_draft (
+  doc_id                        bigint not null,
+  link_id                       bigint not null,
+  constraint pk_doc_link_draft primary key (doc_id,link_id)
+);
+
+create table doc_draft (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint pk_doc_draft primary key (id)
+);
+
+create table document (
+  id                            bigserial not null,
+  title                         varchar(127),
+  body                          varchar(255),
+  organisation_id               bigint,
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint uq_document_title unique (title),
+  constraint pk_document primary key (id)
+);
+
+create table document_draft (
+  id                            bigserial not null,
+  title                         varchar(127),
+  body                          varchar(255),
+  when_publish                  timestamptz,
+  organisation_id               bigint,
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint uq_document_draft_title unique (title),
+  constraint pk_document_draft primary key (id)
+);
+
+create table document_media (
+  id                            bigserial not null,
+  document_id                   bigint,
+  name                          varchar(255),
+  description                   varchar(255),
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint pk_document_media primary key (id)
+);
+
+create table document_media_draft (
+  id                            bigserial not null,
+  document_id                   bigint,
+  name                          varchar(255),
+  description                   varchar(255),
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint pk_document_media_draft primary key (id)
+);
+
+create table earray_bean (
+  id                            bigserial not null,
+  name                          varchar(255),
+  phone_numbers                 varchar[],
+  uids                          uuid[],
+  other_ids                     bigint[],
+  doubs                         float[],
+  statuses                      varchar[],
+  status2                       varchar[],
+  version                       bigint not null,
+  constraint pk_earray_bean primary key (id)
+);
+
+create table earray_set_bean (
+  id                            bigserial not null,
+  name                          varchar(255),
+  phone_numbers                 varchar[],
+  uids                          uuid[],
+  other_ids                     bigint[],
+  doubs                         float[],
+  version                       bigint not null,
+  constraint pk_earray_set_bean primary key (id)
+);
+
 create table e_basic (
   id                            serial not null,
   status                        varchar(1),
-  name                          varchar(255),
+  name                          varchar(127),
   description                   varchar(255),
-  some_date                     timestamp,
-  constraint ck_e_basic_status check (status in ('N','A','I')),
+  some_date                     timestamptz,
+  constraint ck_e_basic_status check ( status in ('N','A','I')),
   constraint pk_e_basic primary key (id)
 );
 
+create table ebasic_change_log (
+  id                            bigserial not null,
+  name                          varchar(20),
+  short_description             varchar(50),
+  long_description              varchar(100),
+  who_created                   varchar(255) not null,
+  who_modified                  varchar(255) not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  version                       bigint not null,
+  constraint pk_ebasic_change_log primary key (id)
+);
+
 create table ebasic_clob (
   id                            bigserial not null,
   name                          varchar(255),
   title                         varchar(255),
   description                   text,
-  last_update                   timestamp not null,
+  last_update                   timestamptz not null,
   constraint pk_ebasic_clob primary key (id)
 );
 
@@ -351,7 +643,7 @@ create table ebasic_clob_fetch_eager (
   name                          varchar(255),
   title                         varchar(255),
   description                   text,
-  last_update                   timestamp not null,
+  last_update                   timestamptz not null,
   constraint pk_ebasic_clob_fetch_eager primary key (id)
 );
 
@@ -367,7 +659,8 @@ create table e_basicenc (
   name                          varchar(255),
   description                   bytea,
   dob                           bytea,
-  last_update                   timestamp,
+  status                        bytea,
+  last_update                   timestamptz,
   constraint pk_e_basicenc primary key (id)
 );
 
@@ -377,7 +670,7 @@ create table e_basicenc_bin (
   description                   varchar(255),
   data                          bytea,
   some_time                     bytea,
-  last_update                   timestamp not null,
+  last_update                   timestamptz not null,
   constraint pk_e_basicenc_bin primary key (id)
 );
 
@@ -385,10 +678,41 @@ create table e_basic_enum_id (
   status                        varchar(1) not null,
   name                          varchar(255),
   description                   varchar(255),
-  constraint ck_e_basic_enum_id_status check (status in ('N','A','I')),
+  constraint ck_e_basic_enum_id_status check ( status in ('N','A','I')),
   constraint pk_e_basic_enum_id primary key (status)
 );
 
+create table e_basic_eni (
+  id                            serial not null,
+  status                        integer,
+  name                          varchar(255),
+  description                   varchar(255),
+  some_date                     timestamptz,
+  constraint ck_e_basic_eni_status check ( status in (1,2,3)),
+  constraint pk_e_basic_eni primary key (id)
+);
+
+create table ebasic_hstore (
+  id                            bigserial not null,
+  name                          varchar(255),
+  map                           hstore,
+  version                       bigint not null,
+  constraint pk_ebasic_hstore primary key (id)
+);
+
+create table ebasic_json_list (
+  id                            bigserial not null,
+  name                          varchar(255),
+  bean_set                      json,
+  bean_list                     jsonb,
+  bean_map                      json,
+  plain_bean                    json,
+  flags                         json,
+  tags                          varchar(100),
+  version                       bigint not null,
+  constraint pk_ebasic_json_list primary key (id)
+);
+
 create table ebasic_json_map (
   id                            bigserial not null,
   name                          varchar(255),
@@ -413,6 +737,15 @@ create table ebasic_json_map_clob (
   constraint pk_ebasic_json_map_clob primary key (id)
 );
 
+create table ebasic_json_map_detail (
+  id                            bigserial not null,
+  owner_id                      bigint,
+  name                          varchar(255),
+  content                       json,
+  version                       bigint not null,
+  constraint pk_ebasic_json_map_detail primary key (id)
+);
+
 create table ebasic_json_map_json_b (
   id                            bigserial not null,
   name                          varchar(255),
@@ -461,39 +794,89 @@ create table ebasic_json_node_varchar (
   constraint pk_ebasic_json_node_varchar primary key (id)
 );
 
+create table ebasic_json_unmapped (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ebasic_json_unmapped primary key (id)
+);
+
 create table e_basic_ndc (
   id                            serial not null,
   name                          varchar(255),
   constraint pk_e_basic_ndc primary key (id)
 );
 
+create table ebasic_no_sdchild (
+  id                            bigserial not null,
+  owner_id                      bigint not null,
+  child_name                    varchar(255),
+  amount                        bigint not null,
+  version                       bigint not null,
+  constraint pk_ebasic_no_sdchild primary key (id)
+);
+
+create table ebasic_sdchild (
+  id                            bigserial not null,
+  owner_id                      bigint not null,
+  child_name                    varchar(255),
+  amount                        bigint not null,
+  version                       bigint not null,
+  deleted                       boolean default false not null,
+  constraint pk_ebasic_sdchild primary key (id)
+);
+
+create table ebasic_soft_delete (
+  id                            bigserial not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  version                       bigint not null,
+  deleted                       boolean default false not null,
+  constraint pk_ebasic_soft_delete primary key (id)
+);
+
 create table e_basicver (
   id                            serial not null,
   name                          varchar(255),
   description                   varchar(255),
   other                         varchar(255),
-  last_update                   timestamp not null,
+  last_update                   timestamptz not null,
   constraint pk_e_basicver primary key (id)
 );
 
 create table e_basic_withlife (
   id                            bigserial not null,
   name                          varchar(255),
+  deleted                       boolean default false not null,
   version                       bigint not null,
   constraint pk_e_basic_withlife primary key (id)
 );
 
 create table e_basicverucon (
   id                            serial not null,
-  name                          varchar(255),
-  other                         varchar(255),
-  other_one                     varchar(255),
+  name                          varchar(127),
+  other                         varchar(127),
+  other_one                     varchar(127),
   description                   varchar(255),
-  last_update                   timestamp not null,
+  last_update                   timestamptz not null,
   constraint uq_e_basicverucon_name unique (name),
+  constraint uq_e_basicverucon_other_other_one unique (other,other_one),
   constraint pk_e_basicverucon primary key (id)
 );
 
+create table e_col_ab (
+  id                            bigserial not null,
+  column_a                      varchar(255),
+  column_b                      varchar(255),
+  constraint pk_e_col_ab primary key (id)
+);
+
+create table ecustom_id (
+  id                            varchar(127) not null,
+  name                          varchar(255),
+  constraint pk_ecustom_id primary key (id)
+);
+
 create table eemb_inner (
   id                            serial not null,
   nome_inner                    varchar(255),
@@ -505,8 +888,8 @@ create table eemb_inner (
 create table eemb_outer (
   id                            serial not null,
   nome_outer                    varchar(255),
-  date1                         timestamp,
-  date2                         timestamp,
+  date1                         timestamptz,
+  date2                         timestamptz,
   update_count                  integer not null,
   constraint pk_eemb_outer primary key (id)
 );
@@ -515,16 +898,18 @@ create table egen_props (
   id                            bigserial not null,
   name                          varchar(255),
   version                       bigint not null,
-  when_created                  timestamp not null,
-  when_modified                 timestamp not null,
-  ts_created                    timestamp not null,
-  ts_updated                    timestamp not null,
-  ldt_created                   timestamp not null,
-  ldt_updated                   timestamp not null,
-  odt_created                   timestamp not null,
-  odt_updated                   timestamp not null,
-  zdt_created                   timestamp not null,
-  zdt_updated                   timestamp not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  ts_created                    timestamptz not null,
+  ts_updated                    timestamptz not null,
+  ldt_created                   timestamptz not null,
+  ldt_updated                   timestamptz not null,
+  odt_created                   timestamptz not null,
+  odt_updated                   timestamptz not null,
+  zdt_created                   timestamptz not null,
+  zdt_updated                   timestamptz not null,
+  instant_created               timestamptz not null,
+  instant_updated               timestamptz not null,
   long_created                  bigint not null,
   long_updated                  bigint not null,
   constraint pk_egen_props primary key (id)
@@ -532,17 +917,21 @@ create table egen_props (
 
 create table einvoice (
   id                            bigserial not null,
-  invoice_date                  timestamp,
+  invoice_date                  timestamptz,
   state                         integer,
   person_id                     bigint,
   ship_street                   varchar(255),
   ship_suburb                   varchar(255),
   ship_city                     varchar(255),
-  street                        varchar(255),
-  suburb                        varchar(255),
-  city                          varchar(255),
+  ship_status                   varchar(3),
+  bill_street                   varchar(255),
+  bill_suburb                   varchar(255),
+  bill_city                     varchar(255),
+  bill_status                   varchar(3),
   version                       bigint not null,
-  constraint ck_einvoice_state check (state in (0,1,2)),
+  constraint ck_einvoice_state check ( state in (0,1,2)),
+  constraint ck_einvoice_ship_status check ( ship_status in ('ONE','TWO')),
+  constraint ck_einvoice_bill_status check ( bill_status in ('ONE','TWO')),
   constraint pk_einvoice primary key (id)
 );
 
@@ -571,8 +960,8 @@ create table eopt_one_a (
   id                            serial not null,
   name_for_a                    varchar(255),
   b_id                          integer,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
   version                       bigint not null,
   constraint pk_eopt_one_a primary key (id)
 );
@@ -581,8 +970,8 @@ create table eopt_one_b (
   id                            serial not null,
   name_for_b                    varchar(255),
   c_id                          integer not null,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
   version                       bigint not null,
   constraint pk_eopt_one_b primary key (id)
 );
@@ -590,8 +979,8 @@ create table eopt_one_b (
 create table eopt_one_c (
   id                            serial not null,
   name_for_c                    varchar(255),
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
   version                       bigint not null,
   constraint pk_eopt_one_c primary key (id)
 );
@@ -602,17 +991,130 @@ create table eperson (
   notes                         varchar(255),
   street                        varchar(255),
   suburb                        varchar(255),
-  city                          varchar(255),
+  addr_city                     varchar(255),
+  addr_status                   varchar(3),
   version                       bigint not null,
+  constraint ck_eperson_addr_status check ( addr_status in ('ONE','TWO')),
   constraint pk_eperson primary key (id)
 );
 
+create table e_person_online (
+  id                            bigserial not null,
+  email                         varchar(127),
+  online_status                 boolean default false not null,
+  when_updated                  timestamptz not null,
+  constraint uq_e_person_online_email unique (email),
+  constraint pk_e_person_online primary key (id)
+);
+
 create table esimple (
   usertypeid                    serial not null,
   name                          varchar(255),
   constraint pk_esimple primary key (usertypeid)
 );
 
+create table esoft_del_book (
+  id                            bigserial not null,
+  book_title                    varchar(255),
+  lend_by_id                    bigint,
+  version                       bigint not null,
+  deleted                       boolean default false not null,
+  constraint pk_esoft_del_book primary key (id)
+);
+
+create table esoft_del_book_esoft_del_user (
+  esoft_del_book_id             bigint not null,
+  esoft_del_user_id             bigint not null,
+  constraint pk_esoft_del_book_esoft_del_user primary key (esoft_del_book_id,esoft_del_user_id)
+);
+
+create table esoft_del_down (
+  id                            bigserial not null,
+  esoft_del_mid_id              bigint not null,
+  down                          varchar(255),
+  version                       bigint not null,
+  deleted                       boolean default false not null,
+  constraint pk_esoft_del_down primary key (id)
+);
+
+create table esoft_del_mid (
+  id                            bigserial not null,
+  top_id                        bigint,
+  mid                           varchar(255),
+  up_id                         bigint,
+  version                       bigint not null,
+  deleted                       boolean default false not null,
+  constraint pk_esoft_del_mid primary key (id)
+);
+
+create table esoft_del_one_a (
+  id                            bigserial not null,
+  name                          varchar(255),
+  oneb_id                       bigint,
+  deleted                       boolean default false not null,
+  version                       bigint not null,
+  constraint uq_esoft_del_one_a_oneb_id unique (oneb_id),
+  constraint pk_esoft_del_one_a primary key (id)
+);
+
+create table esoft_del_one_b (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_esoft_del_one_b primary key (id)
+);
+
+create table esoft_del_role (
+  id                            bigserial not null,
+  role_name                     varchar(255),
+  version                       bigint not null,
+  deleted                       boolean default false not null,
+  constraint pk_esoft_del_role primary key (id)
+);
+
+create table esoft_del_role_esoft_del_user (
+  esoft_del_role_id             bigint not null,
+  esoft_del_user_id             bigint not null,
+  constraint pk_esoft_del_role_esoft_del_user primary key (esoft_del_role_id,esoft_del_user_id)
+);
+
+create table esoft_del_top (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  deleted                       boolean default false not null,
+  constraint pk_esoft_del_top primary key (id)
+);
+
+create table esoft_del_up (
+  id                            bigserial not null,
+  up                            varchar(255),
+  version                       bigint not null,
+  deleted                       boolean default false not null,
+  constraint pk_esoft_del_up primary key (id)
+);
+
+create table esoft_del_user (
+  id                            bigserial not null,
+  user_name                     varchar(255),
+  version                       bigint not null,
+  deleted                       boolean default false not null,
+  constraint pk_esoft_del_user primary key (id)
+);
+
+create table esoft_del_user_esoft_del_role (
+  esoft_del_user_id             bigint not null,
+  esoft_del_role_id             bigint not null,
+  constraint pk_esoft_del_user_esoft_del_role primary key (esoft_del_user_id,esoft_del_role_id)
+);
+
+create table esome_convert_type (
+  id                            bigserial not null,
+  name                          varchar(255),
+  money                         decimal(38),
+  constraint pk_esome_convert_type primary key (id)
+);
+
 create table esome_type (
   id                            serial not null,
   currency                      varchar(3),
@@ -627,6 +1129,14 @@ create table etrans_many (
   constraint pk_etrans_many primary key (id)
 );
 
+create table rawinherit_uncle (
+  id                            serial not null,
+  name                          varchar(255),
+  parent_id                     bigint not null,
+  version                       bigint not null,
+  constraint pk_rawinherit_uncle primary key (id)
+);
+
 create table evanilla_collection (
   id                            serial not null,
   name                          varchar(255),
@@ -643,11 +1153,11 @@ create table evanilla_collection_detail (
 create table ewho_props (
   id                            bigserial not null,
   name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
   who_created                   varchar(255) not null,
   who_modified                  varchar(255) not null,
-  version                       bigint not null,
-  when_created                  timestamp not null,
-  when_modified                 timestamp not null,
   constraint pk_ewho_props primary key (id)
 );
 
@@ -674,6 +1184,14 @@ create table td_parent (
   constraint pk_td_parent primary key (parent_id)
 );
 
+create table empl (
+  id                            bigserial not null,
+  name                          varchar(255),
+  age                           integer,
+  default_address_id            bigint,
+  constraint pk_empl primary key (id)
+);
+
 create table feature_desc (
   id                            serial not null,
   name                          varchar(255),
@@ -705,7 +1223,7 @@ create table gen_key_sequence (
   description                   varchar(255),
   constraint pk_gen_key_sequence primary key (id)
 );
-create sequence seq;
+create sequence SEQ;
 
 create table gen_key_table (
   id                            bigserial not null,
@@ -713,16 +1231,86 @@ create table gen_key_table (
   constraint pk_gen_key_table primary key (id)
 );
 
+create table grand_parent_person (
+  identifier                    serial not null,
+  name                          varchar(255),
+  age                           integer,
+  some_bean_id                  integer,
+  family_name                   varchar(255),
+  address                       varchar(255),
+  constraint pk_grand_parent_person primary key (identifier)
+);
+
+create table survey_group (
+  id                            bigserial not null,
+  name                          varchar(255),
+  categoryobjectid              bigint,
+  sequence_number               integer not null,
+  constraint pk_survey_group primary key (id)
+);
+
 create table c_group (
   id                            bigserial not null,
-  inactive                      boolean,
+  inactive                      boolean default false not null,
   name                          varchar(255),
   version                       bigint not null,
-  when_created                  timestamp not null,
-  when_modified                 timestamp not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
   constraint pk_c_group primary key (id)
 );
 
+create table he_doc (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint pk_he_doc primary key (id)
+);
+
+create table hx_link (
+  id                            bigserial not null,
+  name                          varchar(255),
+  location                      varchar(255),
+  comments                      varchar(255),
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint pk_hx_link primary key (id)
+);
+
+create table hx_link_doc (
+  hx_link_id                    bigint not null,
+  he_doc_id                     bigint not null,
+  constraint pk_hx_link_doc primary key (hx_link_id,he_doc_id)
+);
+
+create table hi_doc (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint pk_hi_doc primary key (id)
+);
+
+create table hi_link (
+  id                            bigserial not null,
+  name                          varchar(255),
+  location                      varchar(255),
+  comments                      varchar(255),
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint pk_hi_link primary key (id)
+);
+
+create table hi_link_doc (
+  hi_link_id                    bigint not null,
+  hi_doc_id                     bigint not null,
+  constraint pk_hi_link_doc primary key (hi_link_id,hi_doc_id)
+);
+
 create table imrelated (
   id                            bigserial not null,
   name                          varchar(255),
@@ -731,17 +1319,17 @@ create table imrelated (
 );
 
 create table imroot (
-  dtype                         varchar(10) not null,
+  dtype                         varchar(31) not null,
   id                            bigserial not null,
-  title                         varchar(255),
-  when_title                    timestamp,
   name                          varchar(255),
+  title                         varchar(255),
+  when_title                    timestamptz,
   constraint pk_imroot primary key (id)
 );
 
 create table ixresource (
   dtype                         varchar(255),
-  id                            bytea not null,
+  id                            uuid not null,
   name                          varchar(255),
   constraint pk_ixresource primary key (id)
 );
@@ -788,19 +1376,67 @@ create sequence drel_invoice_seq;
 
 create table item (
   customer                      integer not null,
-  itemnumber                    varchar(255) not null,
+  itemnumber                    varchar(127) not null,
   description                   varchar(255),
   units                         varchar(255),
-  type                          integer,
-  region                        integer,
-  date_modified                 timestamp,
-  date_created                  timestamp,
+  type                          integer not null,
+  region                        integer not null,
+  date_modified                 timestamptz,
+  date_created                  timestamptz,
   modified_by                   varchar(255),
   created_by                    varchar(255),
   version                       bigint not null,
   constraint pk_item primary key (customer,itemnumber)
 );
 
+create table monkey (
+  mid                           bigserial not null,
+  name                          varchar(255),
+  food_preference               varchar(255),
+  version                       bigint not null,
+  constraint pk_monkey primary key (mid)
+);
+
+create table trainer (
+  tid                           bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_trainer primary key (tid)
+);
+
+create table trainer_monkey (
+  trainer_tid                   bigint not null,
+  monkey_mid                    bigint not null,
+  constraint uq_trainer_monkey_mid unique (monkey_mid),
+  constraint pk_trainer_monkey primary key (trainer_tid,monkey_mid)
+);
+
+create table troop (
+  pid                           bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_troop primary key (pid)
+);
+
+create table troop_monkey (
+  troop_pid                     bigint not null,
+  monkey_mid                    bigint not null,
+  constraint uq_troop_monkey_mid unique (monkey_mid),
+  constraint pk_troop_monkey primary key (troop_pid,monkey_mid)
+);
+
+create table l2_cldf_reset_bean (
+  id                            bigserial not null,
+  name                          varchar(255),
+  constraint pk_l2_cldf_reset_bean primary key (id)
+);
+
+create table l2_cldf_reset_bean_child (
+  id                            bigserial not null,
+  parent_id                     bigint,
+  constraint pk_l2_cldf_reset_bean_child primary key (id)
+);
+
 create table level1 (
   id                            bigserial not null,
   name                          varchar(255),
@@ -843,11 +1479,38 @@ create table level4 (
   constraint pk_level4 primary key (id)
 );
 
+create table link (
+  id                            bigserial not null,
+  name                          varchar(255),
+  location                      varchar(255),
+  when_publish                  timestamptz,
+  link_comment                  varchar(255),
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  deleted                       boolean default false not null,
+  constraint pk_link primary key (id)
+);
+
+create table link_draft (
+  id                            bigserial not null,
+  name                          varchar(255),
+  location                      varchar(255),
+  when_publish                  timestamptz,
+  link_comment                  varchar(255),
+  dirty                         boolean default false not null,
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  deleted                       boolean default false not null,
+  constraint pk_link_draft primary key (id)
+);
+
 create table la_attr_value (
   id                            serial not null,
   name                          varchar(255),
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
   version                       bigint not null,
   constraint pk_la_attr_value primary key (id)
 );
@@ -871,7 +1534,7 @@ create table non_updateprop (
   non_enum                      varchar(5),
   name                          varchar(255),
   note                          varchar(255),
-  constraint ck_non_updateprop_non_enum check (non_enum in ('BEGIN','END')),
+  constraint ck_non_updateprop_non_enum check ( non_enum in ('BEGIN','END')),
   constraint pk_non_updateprop primary key (id)
 );
 
@@ -886,7 +1549,7 @@ create table mprinter (
   last_swap_black_id            bigint,
   version                       bigint not null,
   constraint uq_mprinter_last_swap_cyan_id unique (last_swap_cyan_id),
-  constraint uq_mprinter_last_swap_magenta_2 unique (last_swap_magenta_id),
+  constraint uq_mprinter_last_swap_magenta_id unique (last_swap_magenta_id),
   constraint uq_mprinter_last_swap_yellow_id unique (last_swap_yellow_id),
   constraint uq_mprinter_last_swap_black_id unique (last_swap_black_id),
   constraint pk_mprinter primary key (id)
@@ -894,7 +1557,7 @@ create table mprinter (
 
 create table mprinter_state (
   id                            bigserial not null,
-  flags                         bigint,
+  flags                         bigint not null,
   printer_id                    bigint,
   version                       bigint not null,
   constraint pk_mprinter_state primary key (id)
@@ -944,11 +1607,37 @@ create table muser_type (
   constraint pk_muser_type primary key (id)
 );
 
+create table mail_box (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_mail_box primary key (id)
+);
+
+create table mail_user (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_mail_user primary key (id)
+);
+
+create table mail_user_inbox (
+  mail_user_id                  bigint not null,
+  mail_box_id                   bigint not null,
+  constraint pk_mail_user_inbox primary key (mail_user_id,mail_box_id)
+);
+
+create table mail_user_outbox (
+  mail_user_id                  bigint not null,
+  mail_box_id                   bigint not null,
+  constraint pk_mail_user_outbox primary key (mail_user_id,mail_box_id)
+);
+
 create table map_super_actual (
   id                            bigserial not null,
   name                          varchar(255),
-  when_created                  timestamp not null,
-  when_updated                  timestamp not null,
+  when_created                  timestamptz not null,
+  when_updated                  timestamptz not null,
   constraint pk_map_super_actual primary key (id)
 );
 
@@ -959,8 +1648,8 @@ create table c_message (
   conversation_id               bigint,
   user_id                       bigint,
   version                       bigint not null,
-  when_created                  timestamp not null,
-  when_modified                 timestamp not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
   constraint pk_c_message primary key (id)
 );
 
@@ -984,6 +1673,53 @@ create table mnoc_user_mnoc_role (
   constraint pk_mnoc_user_mnoc_role primary key (mnoc_user_user_id,mnoc_role_role_id)
 );
 
+create table mny_a (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint pk_mny_a primary key (id)
+);
+
+create table mny_b (
+  id                            bigserial not null,
+  name                          varchar(255),
+  a_id                          bigint,
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint pk_mny_b primary key (id)
+);
+
+create table mny_b_mny_c (
+  mny_b_id                      bigint not null,
+  mny_c_id                      bigint not null,
+  constraint pk_mny_b_mny_c primary key (mny_b_id,mny_c_id)
+);
+
+create table mny_c (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint pk_mny_c primary key (id)
+);
+
+create table mny_topic (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_mny_topic primary key (id)
+);
+
+create table subtopics (
+  topic                         bigint not null,
+  subtopic                      bigint not null,
+  constraint pk_subtopics primary key (topic,subtopic)
+);
+
 create table mp_role (
   id                            bigserial not null,
   mp_user_id                    bigint not null,
@@ -998,10 +1734,38 @@ create table mp_user (
   constraint pk_mp_user primary key (id)
 );
 
+create table ms_many_a (
+  aid                           bigserial not null,
+  name                          varchar(255),
+  ms_many_a_many_b              boolean default false not null,
+  ms_many_b                     boolean default false not null,
+  deleted                       boolean default false not null,
+  constraint pk_ms_many_a primary key (aid)
+);
+
+create table ms_many_a_many_b (
+  ms_many_a_aid                 bigint not null,
+  ms_many_b_bid                 bigint not null,
+  constraint pk_ms_many_a_many_b primary key (ms_many_a_aid,ms_many_b_bid)
+);
+
+create table ms_many_b (
+  bid                           bigserial not null,
+  name                          varchar(255),
+  deleted                       boolean default false not null,
+  constraint pk_ms_many_b primary key (bid)
+);
+
+create table ms_many_b_many_a (
+  ms_many_b_bid                 bigint not null,
+  ms_many_a_aid                 bigint not null,
+  constraint pk_ms_many_b_many_a primary key (ms_many_b_bid,ms_many_a_aid)
+);
+
 create table my_lob_size (
   id                            serial not null,
   name                          varchar(255),
-  my_count                      integer,
+  my_count                      integer not null,
   my_lob                        text,
   constraint pk_my_lob_size primary key (id)
 );
@@ -1017,7 +1781,7 @@ create table my_lob_size_join_many (
 create table noidbean (
   name                          varchar(255),
   subject                       varchar(255),
-  when_created                  timestamp not null
+  when_created                  timestamptz not null
 );
 
 create table o_cached_bean (
@@ -1038,18 +1802,45 @@ create table o_cached_bean_child (
   constraint pk_o_cached_bean_child primary key (id)
 );
 
+create table o_cached_natkey (
+  id                            bigserial not null,
+  store                         varchar(255),
+  sku                           varchar(255),
+  description                   varchar(255),
+  constraint pk_o_cached_natkey primary key (id)
+);
+
+create table o_cached_natkey3 (
+  id                            bigserial not null,
+  store                         varchar(255),
+  code                          integer not null,
+  sku                           varchar(255),
+  description                   varchar(255),
+  constraint pk_o_cached_natkey3 primary key (id)
+);
+
 create table ocar (
   id                            serial not null,
   vin                           varchar(255),
   name                          varchar(255),
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
   version                       bigint not null,
   constraint pk_ocar primary key (id)
 );
 
+create table ocompany (
+  id                            serial not null,
+  corp_id                       varchar(50),
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
+  version                       bigint not null,
+  constraint uq_ocompany_corp_id unique (corp_id),
+  constraint pk_ocompany primary key (id)
+);
+
 create table oengine (
-  engine_id                     bytea not null,
+  engine_id                     uuid not null,
   short_desc                    varchar(255),
   car_id                        integer,
   version                       integer not null,
@@ -1058,7 +1849,7 @@ create table oengine (
 );
 
 create table ogear_box (
-  id                            bytea not null,
+  id                            uuid not null,
   box_desc                      varchar(255),
   box_size                      integer,
   car_id                        integer,
@@ -1067,40 +1858,66 @@ create table ogear_box (
   constraint pk_ogear_box primary key (id)
 );
 
+create table oroad_show_msg (
+  id                            serial not null,
+  company_id                    integer not null,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
+  version                       bigint not null,
+  constraint uq_oroad_show_msg_company_id unique (company_id),
+  constraint pk_oroad_show_msg primary key (id)
+);
+
+create table om_ordered_detail (
+  id                            bigserial not null,
+  name                          varchar(255),
+  master_id                     bigint,
+  version                       bigint not null,
+  sort_order                    integer,
+  constraint pk_om_ordered_detail primary key (id)
+);
+
+create table om_ordered_master (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_om_ordered_master primary key (id)
+);
+
 create table o_order (
   id                            serial not null,
   status                        integer,
   order_date                    date,
   ship_date                     date,
   kcustomer_id                  integer not null,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
-  constraint ck_o_order_status check (status in (0,1,2,3)),
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
+  constraint ck_o_order_status check ( status in (0,1,2,3)),
   constraint pk_o_order primary key (id)
 );
 
 create table o_order_detail (
   id                            serial not null,
-  order_id                      integer,
+  order_id                      integer not null,
   order_qty                     integer,
   ship_qty                      integer,
   unit_price                    float,
   product_id                    integer,
-  cretime                       timestamp,
-  updtime                       timestamp not null,
+  cretime                       timestamptz,
+  updtime                       timestamptz not null,
   constraint pk_o_order_detail primary key (id)
 );
 
 create table s_orders (
-  uuid                          varchar(255) not null,
+  uuid                          varchar(40) not null,
   constraint pk_s_orders primary key (uuid)
 );
 
 create table s_order_items (
-  uuid                          varchar(255) not null,
+  uuid                          varchar(40) not null,
   product_variant_uuid          varchar(255),
-  order_uuid                    varchar(255),
-  quantity                      integer,
+  order_uuid                    varchar(40),
+  quantity                      integer not null,
   amount                        decimal(38),
   constraint pk_s_order_items primary key (uuid)
 );
@@ -1108,13 +1925,34 @@ create table s_order_items (
 create table or_order_ship (
   id                            serial not null,
   order_id                      integer,
-  ship_time                     timestamp,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  ship_time                     timestamptz,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
   version                       bigint not null,
   constraint pk_or_order_ship primary key (id)
 );
 
+create table organisation (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint pk_organisation primary key (id)
+);
+
+create table oto_bchild (
+  master_id                     bigserial not null,
+  child                         varchar(255),
+  constraint pk_oto_bchild primary key (master_id)
+);
+
+create table oto_bmaster (
+  id                            bigserial not null,
+  name                          varchar(255),
+  constraint pk_oto_bmaster primary key (id)
+);
+
 create table oto_child (
   id                            serial not null,
   name                          varchar(255),
@@ -1123,19 +1961,109 @@ create table oto_child (
   constraint pk_oto_child primary key (id)
 );
 
+create table oto_cust (
+  cid                           bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_cust primary key (cid)
+);
+
+create table oto_cust_address (
+  aid                           bigserial not null,
+  line1                         varchar(255),
+  line2                         varchar(255),
+  line3                         varchar(255),
+  customer_cid                  bigint,
+  version                       bigint not null,
+  constraint uq_oto_cust_address_customer_cid unique (customer_cid),
+  constraint pk_oto_cust_address primary key (aid)
+);
+
 create table oto_master (
   id                            bigserial not null,
   name                          varchar(255),
   constraint pk_oto_master primary key (id)
 );
 
+create table oto_prime (
+  pid                           bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_prime primary key (pid)
+);
+
+create table oto_prime_extra (
+  eid                           bigint not null,
+  extra                         varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_prime_extra primary key (eid)
+);
+
+create table oto_th_many (
+  id                            bigserial not null,
+  oto_th_top_id                 bigint not null,
+  many                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint pk_oto_th_many primary key (id)
+);
+
+create table oto_th_one (
+  id                            bigserial not null,
+  one                           boolean default false not null,
+  many_id                       bigint,
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint uq_oto_th_one_many_id unique (many_id),
+  constraint pk_oto_th_one primary key (id)
+);
+
+create table oto_th_top (
+  id                            bigserial not null,
+  topp                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint pk_oto_th_top primary key (id)
+);
+
+create table oto_ubprime (
+  pid                           uuid not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_ubprime primary key (pid)
+);
+
+create table oto_ubprime_extra (
+  eid                           uuid not null,
+  extra                         varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_ubprime_extra primary key (eid)
+);
+
+create table oto_uprime (
+  pid                           uuid not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_uprime primary key (pid)
+);
+
+create table oto_uprime_extra (
+  eid                           uuid not null,
+  extra                         varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_uprime_extra primary key (eid)
+);
+
 create table pfile (
   id                            serial not null,
   name                          varchar(255),
   file_content_id               integer,
   file_content2_id              integer,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
   version                       bigint not null,
   constraint uq_pfile_file_content_id unique (file_content_id),
   constraint uq_pfile_file_content2_id unique (file_content2_id),
@@ -1145,14 +2073,14 @@ create table pfile (
 create table pfile_content (
   id                            serial not null,
   content                       bytea,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
   version                       bigint not null,
   constraint pk_pfile_content primary key (id)
 );
 
 create table paggview (
-  pview_id                      bytea,
+  pview_id                      uuid,
   amount                        integer not null,
   constraint uq_paggview_pview_id unique (pview_id)
 );
@@ -1183,13 +2111,25 @@ create table rawinherit_parent (
   type                          varchar(31) not null,
   id                            bigserial not null,
   val                           integer,
+  more                          varchar(255),
   constraint pk_rawinherit_parent primary key (id)
 );
 
-create table rawinherit_parent_rawinherit_dat (
+create table rawinherit_parent_rawinherit_data (
   rawinherit_parent_id          bigint not null,
   rawinherit_data_id            bigint not null,
-  constraint pk_rawinherit_parent_rawinher_0 primary key (rawinherit_parent_id,rawinherit_data_id)
+  constraint pk_rawinherit_parent_rawinherit_data primary key (rawinherit_parent_id,rawinherit_data_id)
+);
+
+create table parent_person (
+  identifier                    serial not null,
+  name                          varchar(255),
+  age                           integer,
+  some_bean_id                  integer,
+  parent_identifier             integer,
+  family_name                   varchar(255),
+  address                       varchar(255),
+  constraint pk_parent_person primary key (identifier)
 );
 
 create table c_participation (
@@ -1199,14 +2139,14 @@ create table c_participation (
   conversation_id               bigint not null,
   user_id                       bigint not null,
   version                       bigint not null,
-  when_created                  timestamp not null,
-  when_modified                 timestamp not null,
-  constraint ck_c_participation_type check (type in (0,1)),
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint ck_c_participation_type check ( type in (0,1)),
   constraint pk_c_participation primary key (id)
 );
 
 create table mt_permission (
-  id                            bytea not null,
+  id                            uuid not null,
   name                          varchar(255),
   constraint pk_mt_permission primary key (id)
 );
@@ -1214,8 +2154,8 @@ create table mt_permission (
 create table persistent_file (
   id                            serial not null,
   name                          varchar(255),
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
   version                       bigint not null,
   constraint pk_persistent_file primary key (id)
 );
@@ -1224,10 +2164,10 @@ create table persistent_file_content (
   id                            serial not null,
   persistent_file_id            integer,
   content                       bytea,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
   version                       bigint not null,
-  constraint uq_persistent_file_content_pe_1 unique (persistent_file_id),
+  constraint uq_persistent_file_content_persistent_file_id unique (persistent_file_id),
   constraint pk_persistent_file_content primary key (id)
 );
 
@@ -1253,39 +2193,55 @@ create table phones (
   constraint pk_phones primary key (id)
 );
 
+create table primary_revision (
+  id                            bigint not null,
+  revision                      integer not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_primary_revision primary key (id,revision)
+);
+
 create table o_product (
   id                            serial not null,
   sku                           varchar(20),
   name                          varchar(255),
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
   constraint pk_o_product primary key (id)
 );
 
 create table pp (
-  id                            bytea not null,
+  id                            uuid not null,
   name                          varchar(255),
   value                         varchar(100) not null,
   constraint pk_pp primary key (id)
 );
 
 create table pp_to_ww (
-  pp_id                         bytea not null,
-  ww_id                         bytea not null,
+  pp_id                         uuid not null,
+  ww_id                         uuid not null,
   constraint pk_pp_to_ww primary key (pp_id,ww_id)
 );
 
+create table question (
+  id                            bigserial not null,
+  name                          varchar(255),
+  groupobjectid                 bigint,
+  sequence_number               integer not null,
+  constraint pk_question primary key (id)
+);
+
 create table rcustomer (
-  company                       varchar(255) not null,
-  name                          varchar(255) not null,
+  company                       varchar(127) not null,
+  name                          varchar(127) not null,
   description                   varchar(255),
   constraint pk_rcustomer primary key (company,name)
 );
 
 create table r_orders (
-  company                       varchar(255) not null,
+  company                       varchar(127) not null,
   order_number                  integer not null,
-  customername                  varchar(255),
+  customername                  varchar(127),
   item                          varchar(255),
   constraint pk_r_orders primary key (company,order_number)
 );
@@ -1305,28 +2261,29 @@ create table resourcefile (
   constraint pk_resourcefile primary key (id)
 );
 
-create table mt_role (
-  id                            bytea not null,
-  name                          varchar(50),
-  tenant_id                     bytea,
-  version                       bigint not null,
-  constraint pk_mt_role primary key (id)
-);
-
-create table mt_role_permission (
-  mt_role_id                    bytea not null,
-  mt_permission_id              bytea not null,
-  constraint pk_mt_role_permission primary key (mt_role_id,mt_permission_id)
-);
-
 create table em_role (
   id                            bigserial not null,
   name                          varchar(255),
   constraint pk_em_role primary key (id)
 );
 
+create table mt_role (
+  id                            uuid not null,
+  name                          varchar(50),
+  tenant_id                     uuid,
+  version                       bigint not null,
+  constraint pk_mt_role primary key (id)
+);
+
+create table mt_role_permission (
+  mt_role_id                    uuid not null,
+  mt_permission_id              uuid not null,
+  constraint pk_mt_role_permission primary key (mt_role_id,mt_permission_id)
+);
+
 create table f_second (
   id                            bigserial not null,
+  mod_name                      varchar(255),
   first                         bigint,
   title                         varchar(255),
   constraint uq_f_second_first unique (first),
@@ -1338,10 +2295,10 @@ create table section (
   article_id                    integer,
   type                          integer,
   content                       text,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
   version                       bigint not null,
-  constraint ck_section_type check (type in (0,1)),
+  constraint ck_section_type check ( type in (0,1)),
   constraint pk_section primary key (id)
 );
 
@@ -1371,7 +2328,7 @@ create table some_enum_bean (
   id                            bigserial not null,
   some_enum                     integer,
   name                          varchar(255),
-  constraint ck_some_enum_bean_some_enum check (some_enum in (0,1)),
+  constraint ck_some_enum_bean_some_enum check ( some_enum in (0,1)),
   constraint pk_some_enum_bean primary key (id)
 );
 
@@ -1390,23 +2347,22 @@ create table some_new_types_bean (
   yr                            integer,
   yr_mth                        date,
   local_date                    date,
-  local_date_time               timestamp,
-  offset_date_time              timestamp,
-  zoned_date_time               timestamp,
-  instant                       timestamp,
+  local_date_time               timestamptz,
+  offset_date_time              timestamptz,
+  zoned_date_time               timestamptz,
+  instant                       timestamptz,
   zone_id                       varchar(60),
   zone_offset                   varchar(60),
+  path                          varchar(255),
+  period                        varchar(20),
   version                       bigint not null,
-  constraint ck_some_new_types_bean_dow check (dow in ('1','2','3','4','5','6','7')),
-  constraint ck_some_new_types_bean_mth check (mth in ('1','2','3','4','5','6','7','8','9','10','11','12')),
+  constraint ck_some_new_types_bean_dow check ( dow in (1,2,3,4,5,6,7)),
+  constraint ck_some_new_types_bean_mth check ( mth in (1,2,3,4,5,6,7,8,9,10,11,12)),
   constraint pk_some_new_types_bean primary key (id)
 );
 
 create table some_period_bean (
   id                            bigserial not null,
-  period_years                  integer,
-  period_months                 integer,
-  period_days                   integer,
   anniversary                   date,
   version                       bigint not null,
   constraint pk_some_period_bean primary key (id)
@@ -1423,8 +2379,8 @@ create table sub_section (
   id                            serial not null,
   section_id                    integer,
   title                         varchar(255),
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
   version                       bigint not null,
   constraint pk_sub_section primary key (id)
 );
@@ -1436,6 +2392,12 @@ create table sub_type (
   constraint pk_sub_type primary key (sub_type_id)
 );
 
+create table survey (
+  id                            bigserial not null,
+  name                          varchar(255),
+  constraint pk_survey primary key (id)
+);
+
 create table tbytes_only (
   id                            serial not null,
   content                       bytea,
@@ -1444,11 +2406,39 @@ create table tbytes_only (
 
 create table tcar (
   type                          varchar(31) not null,
-  plate_no                      varchar(255) not null,
+  plate_no                      varchar(32) not null,
   truckload                     bigint,
   constraint pk_tcar primary key (plate_no)
 );
 
+create table tevent (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_tevent primary key (id)
+);
+
+create table tevent_many (
+  id                            bigserial not null,
+  description                   varchar(255),
+  event_id                      bigint,
+  units                         integer not null,
+  amount                        float not null,
+  version                       bigint not null,
+  constraint pk_tevent_many primary key (id)
+);
+
+create table tevent_one (
+  id                            bigserial not null,
+  name                          varchar(255),
+  status                        integer,
+  event_id                      bigint,
+  version                       bigint not null,
+  constraint ck_tevent_one_status check ( status in (0,1)),
+  constraint uq_tevent_one_event_id unique (event_id),
+  constraint pk_tevent_one primary key (id)
+);
+
 create table tint_root (
   my_type                       integer not null,
   id                            serial not null,
@@ -1475,7 +2465,7 @@ create table t_oneb (
   id                            serial not null,
   name                          varchar(255),
   description                   varchar(255),
-  active                        boolean,
+  active                        boolean default false not null,
   constraint pk_t_oneb primary key (id)
 );
 
@@ -1483,9 +2473,11 @@ create table t_detail_with_other_namexxxyy (
   id                            integer not null,
   name                          varchar(255),
   description                   varchar(255),
-  active                        boolean,
+  some_unique_value             varchar(127),
+  active                        boolean default false not null,
   master_id                     integer,
-  constraint pk_t_detail_with_other_namexx_0 primary key (id)
+  constraint uq_t_detail_with_other_namexxxyy_some_unique_value unique (some_unique_value),
+  constraint pk_t_detail_with_other_namexxxyy primary key (id)
 );
 create sequence t_atable_detail_seq;
 
@@ -1493,7 +2485,7 @@ create table ts_detail_two (
   id                            serial not null,
   name                          varchar(255),
   description                   varchar(255),
-  active                        boolean,
+  active                        boolean default false not null,
   master_id                     integer,
   constraint pk_ts_detail_two primary key (id)
 );
@@ -1502,7 +2494,7 @@ create table t_atable_thatisrelatively (
   id                            integer not null,
   name                          varchar(255),
   description                   varchar(255),
-  active                        boolean,
+  active                        boolean default false not null,
   constraint pk_t_atable_thatisrelatively primary key (id)
 );
 create sequence t_atable_master_seq;
@@ -1511,19 +2503,19 @@ create table ts_master_two (
   id                            serial not null,
   name                          varchar(255),
   description                   varchar(255),
-  active                        boolean,
+  active                        boolean default false not null,
   constraint pk_ts_master_two primary key (id)
 );
 
 create table tuuid_entity (
-  id                            bytea not null,
+  id                            uuid not null,
   name                          varchar(255),
   constraint pk_tuuid_entity primary key (id)
 );
 
 create table twheel (
   id                            bigserial not null,
-  owner_plate_no                varchar(255) not null,
+  owner_plate_no                varchar(32) not null,
   constraint pk_twheel primary key (id)
 );
 
@@ -1535,18 +2527,21 @@ create table twith_pre_insert (
 );
 
 create table mt_tenant (
-  id                            bytea not null,
+  id                            uuid not null,
   name                          varchar(255),
   version                       bigint not null,
   constraint pk_mt_tenant primary key (id)
 );
 
-create table sa_tire (
-  id                            bigint not null,
-  version                       integer not null,
-  constraint pk_sa_tire primary key (id)
+create table test_annotation_base_entity (
+  direct                        varchar(255),
+  meta                          varchar(255),
+  mixed                         varchar(255),
+  constraint_annotation         varchar(40),
+  null1                         varchar(255) not null,
+  null2                         varchar(255),
+  null3                         varchar(255)
 );
-create sequence sa_tire_seq;
 
 create table tire (
   id                            bigint not null,
@@ -1557,14 +2552,21 @@ create table tire (
 );
 create sequence tire_seq;
 
+create table sa_tire (
+  id                            bigint not null,
+  version                       integer not null,
+  constraint pk_sa_tire primary key (id)
+);
+create sequence sa_tire_seq;
+
 create table trip (
   id                            serial not null,
   vehicle_driver_id             integer,
   destination                   varchar(255),
   address_id                    smallint,
-  star_date                     timestamp,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  star_date                     timestamptz,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
   version                       bigint not null,
   constraint pk_trip primary key (id)
 );
@@ -1584,6 +2586,14 @@ create table type (
   constraint pk_type primary key (customer,type)
 );
 
+create table tz_bean (
+  id                            bigserial not null,
+  moda                          varchar(255),
+  ts                            timestamptz,
+  tstz                          timestamptz,
+  constraint pk_tz_bean primary key (id)
+);
+
 create table ut_detail (
   id                            serial not null,
   utmaster_id                   integer not null,
@@ -1603,22 +2613,29 @@ create table ut_master (
 );
 
 create table uuone (
-  id                            bytea not null,
+  id                            uuid not null,
   name                          varchar(255),
   constraint pk_uuone primary key (id)
 );
 
 create table uutwo (
-  id                            bytea not null,
+  id                            uuid not null,
   name                          varchar(255),
-  master_id                     bytea,
+  master_id                     uuid,
   constraint pk_uutwo primary key (id)
 );
 
-create table em_user (
+create table c_user (
   id                            bigserial not null,
+  inactive                      boolean default false not null,
   name                          varchar(255),
-  constraint pk_em_user primary key (id)
+  email                         varchar(255),
+  password_hash                 varchar(255),
+  group_id                      bigint,
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint pk_c_user primary key (id)
 );
 
 create table tx_user (
@@ -1627,16 +2644,17 @@ create table tx_user (
   constraint pk_tx_user primary key (id)
 );
 
-create table c_user (
+create table g_user (
   id                            bigserial not null,
-  inactive                      boolean,
-  name                          varchar(255),
-  email                         varchar(255),
-  group_id                      bigint,
+  username                      varchar(255),
   version                       bigint not null,
-  when_created                  timestamp not null,
-  when_modified                 timestamp not null,
-  constraint pk_c_user primary key (id)
+  constraint pk_g_user primary key (id)
+);
+
+create table em_user (
+  id                            bigserial not null,
+  name                          varchar(255),
+  constraint pk_em_user primary key (id)
 );
 
 create table oto_user (
@@ -1644,8 +2662,8 @@ create table oto_user (
   name                          varchar(255),
   account_id                    bigint not null,
   version                       bigint not null,
-  when_created                  timestamp not null,
-  when_modified                 timestamp not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
   constraint uq_oto_user_account_id unique (account_id),
   constraint pk_oto_user primary key (id)
 );
@@ -1660,14 +2678,17 @@ create table vehicle (
   dtype                         varchar(3) not null,
   id                            serial not null,
   license_number                varchar(255),
-  registration_date             timestamp,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  registration_date             timestamptz,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
   version                       bigint not null,
-  truck_ref_id                  integer,
-  capacity                      float,
+  siz                           varchar(1),
   driver                        varchar(255),
   car_ref_id                    integer,
+  notes                         varchar(255),
+  truck_ref_id                  integer,
+  capacity                      float,
+  constraint ck_vehicle_siz check ( siz in ('S','M','L','H')),
   constraint pk_vehicle primary key (id)
 );
 
@@ -1676,9 +2697,9 @@ create table vehicle_driver (
   name                          varchar(255),
   vehicle_id                    integer,
   address_id                    smallint,
-  license_issued_on             timestamp,
-  cretime                       timestamp not null,
-  updtime                       timestamp not null,
+  license_issued_on             timestamptz,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
   version                       bigint not null,
   constraint pk_vehicle_driver primary key (id)
 );
@@ -1704,13 +2725,6 @@ create table sa_wheel (
 );
 create sequence sa_wheel_seq;
 
-create table sp_car_wheel (
-  id                            bigint not null,
-  version                       integer not null,
-  constraint pk_sp_car_wheel primary key (id)
-);
-create sequence sp_car_wheel_seq;
-
 create table wheel (
   id                            bigint not null,
   version                       integer not null,
@@ -1718,10 +2732,29 @@ create table wheel (
 );
 create sequence wheel_seq;
 
+create table sp_car_wheel (
+  id                            bigint not null,
+  version                       integer not null,
+  constraint pk_sp_car_wheel primary key (id)
+);
+create sequence sp_car_wheel_seq;
+
+create table g_who_props_otm (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  who_created_id                bigint,
+  who_modified_id               bigint,
+  constraint pk_g_who_props_otm primary key (id)
+);
+
 create table with_zero (
   id                            bigserial not null,
   name                          varchar(255),
   parent_id                     integer,
+  lang                          varchar(2) default 'en' not null,
   version                       bigint not null,
   constraint pk_with_zero primary key (id)
 );
@@ -1733,8 +2766,8 @@ create table parent (
 );
 
 create table wview (
-  id                            bytea not null,
-  name                          varchar(255) not null,
+  id                            uuid not null,
+  name                          varchar(127) not null,
   constraint uq_wview_name unique (name),
   constraint pk_wview primary key (id)
 );
@@ -1746,341 +2779,684 @@ create table zones (
   constraint pk_zones primary key (id)
 );
 
-alter table bar add constraint fk_bar_foo_id foreign key (foo_id) references foo (foo_id) on delete restrict on update restrict;
+create index ix_contact_last_name_first_name on contact (last_name,first_name);
+create index ix_e_basic_name on e_basic (name);
 create index ix_bar_foo_id on bar (foo_id);
+alter table bar add constraint fk_bar_foo_id foreign key (foo_id) references foo (foo_id) on delete restrict on update restrict;
+
+create index ix_addr_employee_id on addr (employee_id);
+alter table addr add constraint fk_addr_employee_id foreign key (employee_id) references empl (id) on delete restrict on update restrict;
 
-alter table o_address add constraint fk_o_address_country_code foreign key (country_code) references o_country (code) on delete restrict on update restrict;
 create index ix_o_address_country_code on o_address (country_code);
+alter table o_address add constraint fk_o_address_country_code foreign key (country_code) references o_country (code) on delete restrict on update restrict;
 
-alter table animals add constraint fk_animals_shelter_id foreign key (shelter_id) references animal_shelter (id) on delete restrict on update restrict;
-create index ix_animals_shelter_id on animals (shelter_id);
+alter table album add constraint fk_album_cover_id foreign key (cover_id) references cover (id) on delete restrict on update restrict;
 
-alter table attribute add constraint fk_attribute_attribute_holder_1 foreign key (attribute_holder_id) references attribute_holder (id) on delete restrict on update restrict;
-create index ix_attribute_attribute_holder_1 on attribute (attribute_holder_id);
+create index ix_animal_shelter_id on animal (shelter_id);
+alter table animal add constraint fk_animal_shelter_id foreign key (shelter_id) references animal_shelter (id) on delete restrict on update restrict;
+
+create index ix_attribute_attribute_holder_id on attribute (attribute_holder_id);
+alter table attribute add constraint fk_attribute_attribute_holder_id foreign key (attribute_holder_id) references attribute_holder (id) on delete restrict on update restrict;
 
-alter table bbookmark add constraint fk_bbookmark_user_id foreign key (user_id) references bbookmark_user (id) on delete restrict on update restrict;
 create index ix_bbookmark_user_id on bbookmark (user_id);
+alter table bbookmark add constraint fk_bbookmark_user_id foreign key (user_id) references bbookmark_user (id) on delete restrict on update restrict;
+
+create index ix_bsite_user_site_id on bsite_user (site_id);
+alter table bsite_user add constraint fk_bsite_user_site_id foreign key (site_id) references bsite (id) on delete restrict on update restrict;
+
+create index ix_bsite_user_user_id on bsite_user (user_id);
+alter table bsite_user add constraint fk_bsite_user_user_id foreign key (user_id) references buser (id) on delete restrict on update restrict;
+
+create index ix_bsite_user_b_site on bsite_user_b (site);
+alter table bsite_user_b add constraint fk_bsite_user_b_site foreign key (site) references bsite (id) on delete restrict on update restrict;
+
+create index ix_bsite_user_b_usr on bsite_user_b (usr);
+alter table bsite_user_b add constraint fk_bsite_user_b_usr foreign key (usr) references buser (id) on delete restrict on update restrict;
+
+create index ix_bsite_user_c_site_uid on bsite_user_c (site_uid);
+alter table bsite_user_c add constraint fk_bsite_user_c_site_uid foreign key (site_uid) references bsite (id) on delete restrict on update restrict;
+
+create index ix_bsite_user_c_user_uid on bsite_user_c (user_uid);
+alter table bsite_user_c add constraint fk_bsite_user_c_user_uid foreign key (user_uid) references buser (id) on delete restrict on update restrict;
 
 alter table drel_booking add constraint fk_drel_booking_agent_invoice foreign key (agent_invoice) references drel_invoice (id) on delete restrict on update restrict;
 
 alter table drel_booking add constraint fk_drel_booking_client_invoice foreign key (client_invoice) references drel_invoice (id) on delete restrict on update restrict;
 
-alter table ckey_detail add constraint fk_ckey_detail_ckey_parent foreign key (one_key,two_key) references ckey_parent (one_key,two_key) on delete restrict on update restrict;
-create index ix_ckey_detail_one_key_two_key on ckey_detail (one_key,two_key);
+create index ix_ckey_detail_parent on ckey_detail (one_key,two_key);
+alter table ckey_detail add constraint fk_ckey_detail_parent foreign key (one_key,two_key) references ckey_parent (one_key,two_key) on delete restrict on update restrict;
 
-alter table ckey_parent add constraint fk_ckey_parent_assoc_id foreign key (assoc_id) references ckey_assoc (id) on delete restrict on update restrict;
 create index ix_ckey_parent_assoc_id on ckey_parent (assoc_id);
+alter table ckey_parent add constraint fk_ckey_parent_assoc_id foreign key (assoc_id) references ckey_assoc (id) on delete restrict on update restrict;
 
-alter table calculation_result add constraint fk_calculation_result_product_1 foreign key (product_configuration_id) references configuration (id) on delete restrict on update restrict;
-create index ix_calculation_result_product_1 on calculation_result (product_configuration_id);
+create index ix_calculation_result_product_configuration_id on calculation_result (product_configuration_id);
+alter table calculation_result add constraint fk_calculation_result_product_configuration_id foreign key (product_configuration_id) references configuration (id) on delete restrict on update restrict;
 
-alter table calculation_result add constraint fk_calculation_result_group_c_2 foreign key (group_configuration_id) references configuration (id) on delete restrict on update restrict;
-create index ix_calculation_result_group_c_2 on calculation_result (group_configuration_id);
+create index ix_calculation_result_group_configuration_id on calculation_result (group_configuration_id);
+alter table calculation_result add constraint fk_calculation_result_group_configuration_id foreign key (group_configuration_id) references configuration (id) on delete restrict on update restrict;
 
+create index ix_sp_car_car_wheels_sp_car_car on sp_car_car_wheels (car);
 alter table sp_car_car_wheels add constraint fk_sp_car_car_wheels_sp_car_car foreign key (car) references sp_car_car (id) on delete restrict on update restrict;
-create index ix_sp_car_car_wheels_car on sp_car_car_wheels (car);
 
-alter table sp_car_car_wheels add constraint fk_sp_car_car_wheels_sp_car_w_2 foreign key (wheel) references sp_car_wheel (id) on delete restrict on update restrict;
-create index ix_sp_car_car_wheels_wheel on sp_car_car_wheels (wheel);
+create index ix_sp_car_car_wheels_sp_car_wheel on sp_car_car_wheels (wheel);
+alter table sp_car_car_wheels add constraint fk_sp_car_car_wheels_sp_car_wheel foreign key (wheel) references sp_car_wheel (id) on delete restrict on update restrict;
+
+create index ix_car_accessory_fuse_id on car_accessory (fuse_id);
+alter table car_accessory add constraint fk_car_accessory_fuse_id foreign key (fuse_id) references car_fuse (id) on delete restrict on update restrict;
 
-alter table car_accessory add constraint fk_car_accessory_car_id foreign key (car_id) references vehicle (id) on delete restrict on update restrict;
 create index ix_car_accessory_car_id on car_accessory (car_id);
+alter table car_accessory add constraint fk_car_accessory_car_id foreign key (car_id) references vehicle (id) on delete restrict on update restrict;
 
-alter table configuration add constraint fk_configuration_configuratio_1 foreign key (configurations_id) references configurations (id) on delete restrict on update restrict;
-create index ix_configuration_configuratio_1 on configuration (configurations_id);
+create index ix_category_surveyobjectid on category (surveyobjectid);
+alter table category add constraint fk_category_surveyobjectid foreign key (surveyobjectid) references survey (id) on delete restrict on update restrict;
+
+create index ix_child_person_some_bean_id on child_person (some_bean_id);
+alter table child_person add constraint fk_child_person_some_bean_id foreign key (some_bean_id) references e_basic (id) on delete restrict on update restrict;
+
+create index ix_child_person_parent_identifier on child_person (parent_identifier);
+alter table child_person add constraint fk_child_person_parent_identifier foreign key (parent_identifier) references parent_person (identifier) on delete restrict on update restrict;
+
+create index ix_configuration_configurations_id on configuration (configurations_id);
+alter table configuration add constraint fk_configuration_configurations_id foreign key (configurations_id) references configurations (id) on delete restrict on update restrict;
 
-alter table contact add constraint fk_contact_customer_id foreign key (customer_id) references o_customer (id) on delete restrict on update restrict;
 create index ix_contact_customer_id on contact (customer_id);
+alter table contact add constraint fk_contact_customer_id foreign key (customer_id) references o_customer (id) on delete restrict on update restrict;
 
-alter table contact add constraint fk_contact_group_id foreign key (group_id) references contact_group (id) on delete restrict on update restrict;
 create index ix_contact_group_id on contact (group_id);
+alter table contact add constraint fk_contact_group_id foreign key (group_id) references contact_group (id) on delete restrict on update restrict;
 
-alter table contact_note add constraint fk_contact_note_contact_id foreign key (contact_id) references contact (id) on delete restrict on update restrict;
 create index ix_contact_note_contact_id on contact_note (contact_id);
+alter table contact_note add constraint fk_contact_note_contact_id foreign key (contact_id) references contact (id) on delete restrict on update restrict;
 
-alter table c_conversation add constraint fk_c_conversation_group_id foreign key (group_id) references c_group (id) on delete restrict on update restrict;
 create index ix_c_conversation_group_id on c_conversation (group_id);
+alter table c_conversation add constraint fk_c_conversation_group_id foreign key (group_id) references c_group (id) on delete restrict on update restrict;
 
-alter table o_customer add constraint fk_o_customer_billing_address_1 foreign key (billing_address_id) references o_address (id) on delete restrict on update restrict;
-create index ix_o_customer_billing_address_1 on o_customer (billing_address_id);
+create index ix_o_customer_billing_address_id on o_customer (billing_address_id);
+alter table o_customer add constraint fk_o_customer_billing_address_id foreign key (billing_address_id) references o_address (id) on delete restrict on update restrict;
 
-alter table o_customer add constraint fk_o_customer_shipping_addres_2 foreign key (shipping_address_id) references o_address (id) on delete restrict on update restrict;
-create index ix_o_customer_shipping_addres_2 on o_customer (shipping_address_id);
+create index ix_o_customer_shipping_address_id on o_customer (shipping_address_id);
+alter table o_customer add constraint fk_o_customer_shipping_address_id foreign key (shipping_address_id) references o_address (id) on delete restrict on update restrict;
+
+create index ix_dcredit_drol_dcredit on dcredit_drol (dcredit_id);
+alter table dcredit_drol add constraint fk_dcredit_drol_dcredit foreign key (dcredit_id) references dcredit (id) on delete restrict on update restrict;
+
+create index ix_dcredit_drol_drol on dcredit_drol (drol_id);
+alter table dcredit_drol add constraint fk_dcredit_drol_drol foreign key (drol_id) references drol (id) on delete restrict on update restrict;
+
+create index ix_drot_drol_drot on drot_drol (drot_id);
+alter table drot_drol add constraint fk_drot_drol_drot foreign key (drot_id) references drot (id) on delete restrict on update restrict;
+
+create index ix_drot_drol_drol on drot_drol (drol_id);
+alter table drot_drol add constraint fk_drot_drol_drol foreign key (drol_id) references drol (id) on delete restrict on update restrict;
+
+create index ix_dfk_cascade_one_id on dfk_cascade (one_id);
+alter table dfk_cascade add constraint fk_dfk_cascade_one_id foreign key (one_id) references dfk_cascade_one (id) on delete cascade on update cascade;
+
+create index ix_dfk_set_null_one_id on dfk_set_null (one_id);
+alter table dfk_set_null add constraint fk_dfk_set_null_one_id foreign key (one_id) references dfk_one (id) on delete set null on update set null;
+
+alter table doc add constraint fk_doc_id foreign key (id) references doc_draft (id) on delete restrict on update restrict;
+
+create index ix_doc_link_doc on doc_link (doc_id);
+alter table doc_link add constraint fk_doc_link_doc foreign key (doc_id) references doc (id) on delete restrict on update restrict;
+
+create index ix_doc_link_link on doc_link (link_id);
+alter table doc_link add constraint fk_doc_link_link foreign key (link_id) references link (id) on delete restrict on update restrict;
+
+alter table document add constraint fk_document_id foreign key (id) references document_draft (id) on delete restrict on update restrict;
+
+create index ix_document_organisation_id on document (organisation_id);
+alter table document add constraint fk_document_organisation_id foreign key (organisation_id) references organisation (id) on delete restrict on update restrict;
+
+create index ix_document_draft_organisation_id on document_draft (organisation_id);
+alter table document_draft add constraint fk_document_draft_organisation_id foreign key (organisation_id) references organisation (id) on delete restrict on update restrict;
+
+create index ix_document_media_document_id on document_media (document_id);
+alter table document_media add constraint fk_document_media_document_id foreign key (document_id) references document (id) on delete restrict on update restrict;
+
+create index ix_document_media_draft_document_id on document_media_draft (document_id);
+alter table document_media_draft add constraint fk_document_media_draft_document_id foreign key (document_id) references document_draft (id) on delete restrict on update restrict;
+
+create index ix_ebasic_json_map_detail_owner_id on ebasic_json_map_detail (owner_id);
+alter table ebasic_json_map_detail add constraint fk_ebasic_json_map_detail_owner_id foreign key (owner_id) references ebasic_json_map (id) on delete restrict on update restrict;
+
+create index ix_ebasic_no_sdchild_owner_id on ebasic_no_sdchild (owner_id);
+alter table ebasic_no_sdchild add constraint fk_ebasic_no_sdchild_owner_id foreign key (owner_id) references ebasic_soft_delete (id) on delete restrict on update restrict;
+
+create index ix_ebasic_sdchild_owner_id on ebasic_sdchild (owner_id);
+alter table ebasic_sdchild add constraint fk_ebasic_sdchild_owner_id foreign key (owner_id) references ebasic_soft_delete (id) on delete restrict on update restrict;
 
-alter table eemb_inner add constraint fk_eemb_inner_outer_id foreign key (outer_id) references eemb_outer (id) on delete restrict on update restrict;
 create index ix_eemb_inner_outer_id on eemb_inner (outer_id);
+alter table eemb_inner add constraint fk_eemb_inner_outer_id foreign key (outer_id) references eemb_outer (id) on delete restrict on update restrict;
 
-alter table einvoice add constraint fk_einvoice_person_id foreign key (person_id) references eperson (id) on delete restrict on update restrict;
 create index ix_einvoice_person_id on einvoice (person_id);
+alter table einvoice add constraint fk_einvoice_person_id foreign key (person_id) references eperson (id) on delete restrict on update restrict;
 
-alter table enull_collection_detail add constraint fk_enull_collection_detail_en_1 foreign key (enull_collection_id) references enull_collection (id) on delete restrict on update restrict;
-create index ix_enull_collection_detail_en_1 on enull_collection_detail (enull_collection_id);
+create index ix_enull_collection_detail_enull_collection_id on enull_collection_detail (enull_collection_id);
+alter table enull_collection_detail add constraint fk_enull_collection_detail_enull_collection_id foreign key (enull_collection_id) references enull_collection (id) on delete restrict on update restrict;
 
-alter table eopt_one_a add constraint fk_eopt_one_a_b_id foreign key (b_id) references eopt_one_b (id) on delete restrict on update restrict;
 create index ix_eopt_one_a_b_id on eopt_one_a (b_id);
+alter table eopt_one_a add constraint fk_eopt_one_a_b_id foreign key (b_id) references eopt_one_b (id) on delete restrict on update restrict;
 
-alter table eopt_one_b add constraint fk_eopt_one_b_c_id foreign key (c_id) references eopt_one_c (id) on delete restrict on update restrict;
 create index ix_eopt_one_b_c_id on eopt_one_b (c_id);
+alter table eopt_one_b add constraint fk_eopt_one_b_c_id foreign key (c_id) references eopt_one_c (id) on delete restrict on update restrict;
 
-alter table evanilla_collection_detail add constraint fk_evanilla_collection_detail_1 foreign key (evanilla_collection_id) references evanilla_collection (id) on delete restrict on update restrict;
-create index ix_evanilla_collection_detail_1 on evanilla_collection_detail (evanilla_collection_id);
+create index ix_esoft_del_book_lend_by_id on esoft_del_book (lend_by_id);
+alter table esoft_del_book add constraint fk_esoft_del_book_lend_by_id foreign key (lend_by_id) references esoft_del_user (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_book_esoft_del_user_esoft_del_book on esoft_del_book_esoft_del_user (esoft_del_book_id);
+alter table esoft_del_book_esoft_del_user add constraint fk_esoft_del_book_esoft_del_user_esoft_del_book foreign key (esoft_del_book_id) references esoft_del_book (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_book_esoft_del_user_esoft_del_user on esoft_del_book_esoft_del_user (esoft_del_user_id);
+alter table esoft_del_book_esoft_del_user add constraint fk_esoft_del_book_esoft_del_user_esoft_del_user foreign key (esoft_del_user_id) references esoft_del_user (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_down_esoft_del_mid_id on esoft_del_down (esoft_del_mid_id);
+alter table esoft_del_down add constraint fk_esoft_del_down_esoft_del_mid_id foreign key (esoft_del_mid_id) references esoft_del_mid (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_mid_top_id on esoft_del_mid (top_id);
+alter table esoft_del_mid add constraint fk_esoft_del_mid_top_id foreign key (top_id) references esoft_del_top (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_mid_up_id on esoft_del_mid (up_id);
+alter table esoft_del_mid add constraint fk_esoft_del_mid_up_id foreign key (up_id) references esoft_del_up (id) on delete restrict on update restrict;
+
+alter table esoft_del_one_a add constraint fk_esoft_del_one_a_oneb_id foreign key (oneb_id) references esoft_del_one_b (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_role_esoft_del_user_esoft_del_role on esoft_del_role_esoft_del_user (esoft_del_role_id);
+alter table esoft_del_role_esoft_del_user add constraint fk_esoft_del_role_esoft_del_user_esoft_del_role foreign key (esoft_del_role_id) references esoft_del_role (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_role_esoft_del_user_esoft_del_user on esoft_del_role_esoft_del_user (esoft_del_user_id);
+alter table esoft_del_role_esoft_del_user add constraint fk_esoft_del_role_esoft_del_user_esoft_del_user foreign key (esoft_del_user_id) references esoft_del_user (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_user_esoft_del_role_esoft_del_user on esoft_del_user_esoft_del_role (esoft_del_user_id);
+alter table esoft_del_user_esoft_del_role add constraint fk_esoft_del_user_esoft_del_role_esoft_del_user foreign key (esoft_del_user_id) references esoft_del_user (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_user_esoft_del_role_esoft_del_role on esoft_del_user_esoft_del_role (esoft_del_role_id);
+alter table esoft_del_user_esoft_del_role add constraint fk_esoft_del_user_esoft_del_role_esoft_del_role foreign key (esoft_del_role_id) references esoft_del_role (id) on delete restrict on update restrict;
+
+create index ix_rawinherit_uncle_parent_id on rawinherit_uncle (parent_id);
+alter table rawinherit_uncle add constraint fk_rawinherit_uncle_parent_id foreign key (parent_id) references rawinherit_parent (id) on delete restrict on update restrict;
+
+create index ix_evanilla_collection_detail_evanilla_collection_id on evanilla_collection_detail (evanilla_collection_id);
+alter table evanilla_collection_detail add constraint fk_evanilla_collection_detail_evanilla_collection_id foreign key (evanilla_collection_id) references evanilla_collection (id) on delete restrict on update restrict;
 
-alter table td_child add constraint fk_td_child_parent_id foreign key (parent_id) references td_parent (parent_id) on delete restrict on update restrict;
 create index ix_td_child_parent_id on td_child (parent_id);
+alter table td_child add constraint fk_td_child_parent_id foreign key (parent_id) references td_parent (parent_id) on delete restrict on update restrict;
+
+create index ix_empl_default_address_id on empl (default_address_id);
+alter table empl add constraint fk_empl_default_address_id foreign key (default_address_id) references addr (id) on delete restrict on update restrict;
+
+create index ix_grand_parent_person_some_bean_id on grand_parent_person (some_bean_id);
+alter table grand_parent_person add constraint fk_grand_parent_person_some_bean_id foreign key (some_bean_id) references e_basic (id) on delete restrict on update restrict;
+
+create index ix_survey_group_categoryobjectid on survey_group (categoryobjectid);
+alter table survey_group add constraint fk_survey_group_categoryobjectid foreign key (categoryobjectid) references category (id) on delete restrict on update restrict;
+
+create index ix_hx_link_doc_hx_link on hx_link_doc (hx_link_id);
+alter table hx_link_doc add constraint fk_hx_link_doc_hx_link foreign key (hx_link_id) references hx_link (id) on delete restrict on update restrict;
+
+create index ix_hx_link_doc_he_doc on hx_link_doc (he_doc_id);
+alter table hx_link_doc add constraint fk_hx_link_doc_he_doc foreign key (he_doc_id) references he_doc (id) on delete restrict on update restrict;
+
+create index ix_hi_link_doc_hi_link on hi_link_doc (hi_link_id);
+alter table hi_link_doc add constraint fk_hi_link_doc_hi_link foreign key (hi_link_id) references hi_link (id) on delete restrict on update restrict;
+
+create index ix_hi_link_doc_hi_doc on hi_link_doc (hi_doc_id);
+alter table hi_link_doc add constraint fk_hi_link_doc_hi_doc foreign key (hi_doc_id) references hi_doc (id) on delete restrict on update restrict;
 
-alter table imrelated add constraint fk_imrelated_owner_id foreign key (owner_id) references imroot (id) on delete restrict on update restrict;
 create index ix_imrelated_owner_id on imrelated (owner_id);
+alter table imrelated add constraint fk_imrelated_owner_id foreign key (owner_id) references imroot (id) on delete restrict on update restrict;
 
-alter table info_contact add constraint fk_info_contact_company_id foreign key (company_id) references info_company (id) on delete restrict on update restrict;
 create index ix_info_contact_company_id on info_contact (company_id);
+alter table info_contact add constraint fk_info_contact_company_id foreign key (company_id) references info_company (id) on delete restrict on update restrict;
 
 alter table info_customer add constraint fk_info_customer_company_id foreign key (company_id) references info_company (id) on delete restrict on update restrict;
 
 alter table inner_report add constraint fk_inner_report_forecast_id foreign key (forecast_id) references stockforecast (id) on delete restrict on update restrict;
 
-alter table drel_invoice add constraint fk_drel_invoice_booking foreign key (booking) references drel_booking (id) on delete restrict on update restrict;
 create index ix_drel_invoice_booking on drel_invoice (booking);
+alter table drel_invoice add constraint fk_drel_invoice_booking foreign key (booking) references drel_booking (id) on delete restrict on update restrict;
 
-alter table item add constraint fk_item_type foreign key (customer,type) references type (customer,type) on delete restrict on update restrict;
-create index ix_item_customer_type on item (customer,type);
+create index ix_item_etype on item (customer,type);
+alter table item add constraint fk_item_etype foreign key (customer,type) references type (customer,type) on delete restrict on update restrict;
 
-alter table item add constraint fk_item_region foreign key (customer,region) references region (customer,type) on delete restrict on update restrict;
-create index ix_item_customer_region on item (customer,region);
+create index ix_item_eregion on item (customer,region);
+alter table item add constraint fk_item_eregion foreign key (customer,region) references region (customer,type) on delete restrict on update restrict;
 
+alter table trainer_monkey add constraint fk_trainer_monkey_trainer foreign key (trainer_tid) references trainer (tid) on delete restrict on update restrict;
+
+alter table trainer_monkey add constraint fk_trainer_monkey_monkey foreign key (monkey_mid) references monkey (mid) on delete restrict on update restrict;
+
+alter table troop_monkey add constraint fk_troop_monkey_troop foreign key (troop_pid) references troop (pid) on delete restrict on update restrict;
+
+alter table troop_monkey add constraint fk_troop_monkey_monkey foreign key (monkey_mid) references monkey (mid) on delete restrict on update restrict;
+
+create index ix_l2_cldf_reset_bean_child_parent_id on l2_cldf_reset_bean_child (parent_id);
+alter table l2_cldf_reset_bean_child add constraint fk_l2_cldf_reset_bean_child_parent_id foreign key (parent_id) references l2_cldf_reset_bean (id) on delete restrict on update restrict;
+
+create index ix_level1_level4_level1 on level1_level4 (level1_id);
 alter table level1_level4 add constraint fk_level1_level4_level1 foreign key (level1_id) references level1 (id) on delete restrict on update restrict;
-create index ix_level1_level4_level1_id on level1_level4 (level1_id);
 
+create index ix_level1_level4_level4 on level1_level4 (level4_id);
 alter table level1_level4 add constraint fk_level1_level4_level4 foreign key (level4_id) references level4 (id) on delete restrict on update restrict;
-create index ix_level1_level4_level4_id on level1_level4 (level4_id);
 
+create index ix_level1_level2_level1 on level1_level2 (level1_id);
 alter table level1_level2 add constraint fk_level1_level2_level1 foreign key (level1_id) references level1 (id) on delete restrict on update restrict;
-create index ix_level1_level2_level1_id on level1_level2 (level1_id);
 
+create index ix_level1_level2_level2 on level1_level2 (level2_id);
 alter table level1_level2 add constraint fk_level1_level2_level2 foreign key (level2_id) references level2 (id) on delete restrict on update restrict;
-create index ix_level1_level2_level2_id on level1_level2 (level2_id);
 
+create index ix_level2_level3_level2 on level2_level3 (level2_id);
 alter table level2_level3 add constraint fk_level2_level3_level2 foreign key (level2_id) references level2 (id) on delete restrict on update restrict;
-create index ix_level2_level3_level2_id on level2_level3 (level2_id);
 
+create index ix_level2_level3_level3 on level2_level3 (level3_id);
 alter table level2_level3 add constraint fk_level2_level3_level3 foreign key (level3_id) references level3 (id) on delete restrict on update restrict;
-create index ix_level2_level3_level3_id on level2_level3 (level3_id);
 
-alter table la_attr_value_attribute add constraint fk_la_attr_value_attribute_la_1 foreign key (la_attr_value_id) references la_attr_value (id) on delete restrict on update restrict;
-create index ix_la_attr_value_attribute_la_1 on la_attr_value_attribute (la_attr_value_id);
+alter table link add constraint fk_link_id foreign key (id) references link_draft (id) on delete restrict on update restrict;
 
-alter table la_attr_value_attribute add constraint fk_la_attr_value_attribute_at_2 foreign key (attribute_id) references attribute (id) on delete restrict on update restrict;
-create index ix_la_attr_value_attribute_at_2 on la_attr_value_attribute (attribute_id);
+create index ix_la_attr_value_attribute_la_attr_value on la_attr_value_attribute (la_attr_value_id);
+alter table la_attr_value_attribute add constraint fk_la_attr_value_attribute_la_attr_value foreign key (la_attr_value_id) references la_attr_value (id) on delete restrict on update restrict;
+
+create index ix_la_attr_value_attribute_attribute on la_attr_value_attribute (attribute_id);
+alter table la_attr_value_attribute add constraint fk_la_attr_value_attribute_attribute foreign key (attribute_id) references attribute (id) on delete restrict on update restrict;
 
-alter table mprinter add constraint fk_mprinter_current_state_id foreign key (current_state_id) references mprinter_state (id) on delete restrict on update restrict;
 create index ix_mprinter_current_state_id on mprinter (current_state_id);
+alter table mprinter add constraint fk_mprinter_current_state_id foreign key (current_state_id) references mprinter_state (id) on delete restrict on update restrict;
 
 alter table mprinter add constraint fk_mprinter_last_swap_cyan_id foreign key (last_swap_cyan_id) references mprinter_state (id) on delete restrict on update restrict;
 
-alter table mprinter add constraint fk_mprinter_last_swap_magenta_3 foreign key (last_swap_magenta_id) references mprinter_state (id) on delete restrict on update restrict;
+alter table mprinter add constraint fk_mprinter_last_swap_magenta_id foreign key (last_swap_magenta_id) references mprinter_state (id) on delete restrict on update restrict;
 
 alter table mprinter add constraint fk_mprinter_last_swap_yellow_id foreign key (last_swap_yellow_id) references mprinter_state (id) on delete restrict on update restrict;
 
 alter table mprinter add constraint fk_mprinter_last_swap_black_id foreign key (last_swap_black_id) references mprinter_state (id) on delete restrict on update restrict;
 
-alter table mprinter_state add constraint fk_mprinter_state_printer_id foreign key (printer_id) references mprinter (id) on delete restrict on update restrict;
 create index ix_mprinter_state_printer_id on mprinter_state (printer_id);
+alter table mprinter_state add constraint fk_mprinter_state_printer_id foreign key (printer_id) references mprinter (id) on delete restrict on update restrict;
 
-alter table mprofile add constraint fk_mprofile_picture_id foreign key (picture_id) references mmedia (id) on delete restrict on update restrict;
 create index ix_mprofile_picture_id on mprofile (picture_id);
+alter table mprofile add constraint fk_mprofile_picture_id foreign key (picture_id) references mmedia (id) on delete restrict on update restrict;
 
+create index ix_mrole_muser_mrole on mrole_muser (mrole_roleid);
 alter table mrole_muser add constraint fk_mrole_muser_mrole foreign key (mrole_roleid) references mrole (roleid) on delete restrict on update restrict;
-create index ix_mrole_muser_mrole_roleid on mrole_muser (mrole_roleid);
 
+create index ix_mrole_muser_muser on mrole_muser (muser_userid);
 alter table mrole_muser add constraint fk_mrole_muser_muser foreign key (muser_userid) references muser (userid) on delete restrict on update restrict;
-create index ix_mrole_muser_muser_userid on mrole_muser (muser_userid);
 
-alter table muser add constraint fk_muser_user_type_id foreign key (user_type_id) references muser_type (id) on delete restrict on update restrict;
 create index ix_muser_user_type_id on muser (user_type_id);
+alter table muser add constraint fk_muser_user_type_id foreign key (user_type_id) references muser_type (id) on delete restrict on update restrict;
+
+create index ix_mail_user_inbox_mail_user on mail_user_inbox (mail_user_id);
+alter table mail_user_inbox add constraint fk_mail_user_inbox_mail_user foreign key (mail_user_id) references mail_user (id) on delete restrict on update restrict;
+
+create index ix_mail_user_inbox_mail_box on mail_user_inbox (mail_box_id);
+alter table mail_user_inbox add constraint fk_mail_user_inbox_mail_box foreign key (mail_box_id) references mail_box (id) on delete restrict on update restrict;
+
+create index ix_mail_user_outbox_mail_user on mail_user_outbox (mail_user_id);
+alter table mail_user_outbox add constraint fk_mail_user_outbox_mail_user foreign key (mail_user_id) references mail_user (id) on delete restrict on update restrict;
+
+create index ix_mail_user_outbox_mail_box on mail_user_outbox (mail_box_id);
+alter table mail_user_outbox add constraint fk_mail_user_outbox_mail_box foreign key (mail_box_id) references mail_box (id) on delete restrict on update restrict;
 
-alter table c_message add constraint fk_c_message_conversation_id foreign key (conversation_id) references c_conversation (id) on delete restrict on update restrict;
 create index ix_c_message_conversation_id on c_message (conversation_id);
+alter table c_message add constraint fk_c_message_conversation_id foreign key (conversation_id) references c_conversation (id) on delete restrict on update restrict;
 
-alter table c_message add constraint fk_c_message_user_id foreign key (user_id) references c_user (id) on delete restrict on update restrict;
 create index ix_c_message_user_id on c_message (user_id);
+alter table c_message add constraint fk_c_message_user_id foreign key (user_id) references c_user (id) on delete restrict on update restrict;
 
-alter table mnoc_user_mnoc_role add constraint fk_mnoc_user_mnoc_role_mnoc_u_1 foreign key (mnoc_user_user_id) references mnoc_user (user_id) on delete restrict on update restrict;
-create index ix_mnoc_user_mnoc_role_mnoc_u_1 on mnoc_user_mnoc_role (mnoc_user_user_id);
+create index ix_mnoc_user_mnoc_role_mnoc_user on mnoc_user_mnoc_role (mnoc_user_user_id);
+alter table mnoc_user_mnoc_role add constraint fk_mnoc_user_mnoc_role_mnoc_user foreign key (mnoc_user_user_id) references mnoc_user (user_id) on delete restrict on update restrict;
 
-alter table mnoc_user_mnoc_role add constraint fk_mnoc_user_mnoc_role_mnoc_r_2 foreign key (mnoc_role_role_id) references mnoc_role (role_id) on delete restrict on update restrict;
-create index ix_mnoc_user_mnoc_role_mnoc_r_2 on mnoc_user_mnoc_role (mnoc_role_role_id);
+create index ix_mnoc_user_mnoc_role_mnoc_role on mnoc_user_mnoc_role (mnoc_role_role_id);
+alter table mnoc_user_mnoc_role add constraint fk_mnoc_user_mnoc_role_mnoc_role foreign key (mnoc_role_role_id) references mnoc_role (role_id) on delete restrict on update restrict;
+
+create index ix_mny_b_a_id on mny_b (a_id);
+alter table mny_b add constraint fk_mny_b_a_id foreign key (a_id) references mny_a (id) on delete restrict on update restrict;
+
+create index ix_mny_b_mny_c_mny_b on mny_b_mny_c (mny_b_id);
+alter table mny_b_mny_c add constraint fk_mny_b_mny_c_mny_b foreign key (mny_b_id) references mny_b (id) on delete restrict on update restrict;
+
+create index ix_mny_b_mny_c_mny_c on mny_b_mny_c (mny_c_id);
+alter table mny_b_mny_c add constraint fk_mny_b_mny_c_mny_c foreign key (mny_c_id) references mny_c (id) on delete restrict on update restrict;
+
+create index ix_subtopics_mny_topic_1 on subtopics (topic);
+alter table subtopics add constraint fk_subtopics_mny_topic_1 foreign key (topic) references mny_topic (id) on delete restrict on update restrict;
+
+create index ix_subtopics_mny_topic_2 on subtopics (subtopic);
+alter table subtopics add constraint fk_subtopics_mny_topic_2 foreign key (subtopic) references mny_topic (id) on delete restrict on update restrict;
 
-alter table mp_role add constraint fk_mp_role_mp_user_id foreign key (mp_user_id) references mp_user (id) on delete restrict on update restrict;
 create index ix_mp_role_mp_user_id on mp_role (mp_user_id);
+alter table mp_role add constraint fk_mp_role_mp_user_id foreign key (mp_user_id) references mp_user (id) on delete restrict on update restrict;
 
-alter table my_lob_size_join_many add constraint fk_my_lob_size_join_many_pare_1 foreign key (parent_id) references my_lob_size (id) on delete restrict on update restrict;
-create index ix_my_lob_size_join_many_pare_1 on my_lob_size_join_many (parent_id);
+create index ix_ms_many_a_many_b_ms_many_a on ms_many_a_many_b (ms_many_a_aid);
+alter table ms_many_a_many_b add constraint fk_ms_many_a_many_b_ms_many_a foreign key (ms_many_a_aid) references ms_many_a (aid) on delete restrict on update restrict;
 
-alter table o_cached_bean_country add constraint fk_o_cached_bean_country_o_ca_1 foreign key (o_cached_bean_id) references o_cached_bean (id) on delete restrict on update restrict;
-create index ix_o_cached_bean_country_o_ca_1 on o_cached_bean_country (o_cached_bean_id);
+create index ix_ms_many_a_many_b_ms_many_b on ms_many_a_many_b (ms_many_b_bid);
+alter table ms_many_a_many_b add constraint fk_ms_many_a_many_b_ms_many_b foreign key (ms_many_b_bid) references ms_many_b (bid) on delete restrict on update restrict;
 
-alter table o_cached_bean_country add constraint fk_o_cached_bean_country_o_co_2 foreign key (o_country_code) references o_country (code) on delete restrict on update restrict;
-create index ix_o_cached_bean_country_o_co_2 on o_cached_bean_country (o_country_code);
+create index ix_ms_many_b_many_a_ms_many_b on ms_many_b_many_a (ms_many_b_bid);
+alter table ms_many_b_many_a add constraint fk_ms_many_b_many_a_ms_many_b foreign key (ms_many_b_bid) references ms_many_b (bid) on delete restrict on update restrict;
 
-alter table o_cached_bean_child add constraint fk_o_cached_bean_child_cached_1 foreign key (cached_bean_id) references o_cached_bean (id) on delete restrict on update restrict;
-create index ix_o_cached_bean_child_cached_1 on o_cached_bean_child (cached_bean_id);
+create index ix_ms_many_b_many_a_ms_many_a on ms_many_b_many_a (ms_many_a_aid);
+alter table ms_many_b_many_a add constraint fk_ms_many_b_many_a_ms_many_a foreign key (ms_many_a_aid) references ms_many_a (aid) on delete restrict on update restrict;
+
+create index ix_my_lob_size_join_many_parent_id on my_lob_size_join_many (parent_id);
+alter table my_lob_size_join_many add constraint fk_my_lob_size_join_many_parent_id foreign key (parent_id) references my_lob_size (id) on delete restrict on update restrict;
+
+create index ix_o_cached_bean_country_o_cached_bean on o_cached_bean_country (o_cached_bean_id);
+alter table o_cached_bean_country add constraint fk_o_cached_bean_country_o_cached_bean foreign key (o_cached_bean_id) references o_cached_bean (id) on delete restrict on update restrict;
+
+create index ix_o_cached_bean_country_o_country on o_cached_bean_country (o_country_code);
+alter table o_cached_bean_country add constraint fk_o_cached_bean_country_o_country foreign key (o_country_code) references o_country (code) on delete restrict on update restrict;
+
+create index ix_o_cached_bean_child_cached_bean_id on o_cached_bean_child (cached_bean_id);
+alter table o_cached_bean_child add constraint fk_o_cached_bean_child_cached_bean_id foreign key (cached_bean_id) references o_cached_bean (id) on delete restrict on update restrict;
 
 alter table oengine add constraint fk_oengine_car_id foreign key (car_id) references ocar (id) on delete restrict on update restrict;
 
 alter table ogear_box add constraint fk_ogear_box_car_id foreign key (car_id) references ocar (id) on delete restrict on update restrict;
 
-alter table o_order add constraint fk_o_order_kcustomer_id foreign key (kcustomer_id) references o_customer (id) on delete restrict on update restrict;
+alter table oroad_show_msg add constraint fk_oroad_show_msg_company_id foreign key (company_id) references ocompany (id) on delete restrict on update restrict;
+
+create index ix_om_ordered_detail_master_id on om_ordered_detail (master_id);
+alter table om_ordered_detail add constraint fk_om_ordered_detail_master_id foreign key (master_id) references om_ordered_master (id) on delete restrict on update restrict;
+
 create index ix_o_order_kcustomer_id on o_order (kcustomer_id);
+alter table o_order add constraint fk_o_order_kcustomer_id foreign key (kcustomer_id) references o_customer (id) on delete restrict on update restrict;
 
-alter table o_order_detail add constraint fk_o_order_detail_order_id foreign key (order_id) references o_order (id) on delete restrict on update restrict;
 create index ix_o_order_detail_order_id on o_order_detail (order_id);
+alter table o_order_detail add constraint fk_o_order_detail_order_id foreign key (order_id) references o_order (id) on delete restrict on update restrict;
 
-alter table o_order_detail add constraint fk_o_order_detail_product_id foreign key (product_id) references o_product (id) on delete restrict on update restrict;
 create index ix_o_order_detail_product_id on o_order_detail (product_id);
+alter table o_order_detail add constraint fk_o_order_detail_product_id foreign key (product_id) references o_product (id) on delete restrict on update restrict;
 
-alter table s_order_items add constraint fk_s_order_items_order_uuid foreign key (order_uuid) references s_orders (uuid) on delete restrict on update restrict;
 create index ix_s_order_items_order_uuid on s_order_items (order_uuid);
+alter table s_order_items add constraint fk_s_order_items_order_uuid foreign key (order_uuid) references s_orders (uuid) on delete restrict on update restrict;
 
-alter table or_order_ship add constraint fk_or_order_ship_order_id foreign key (order_id) references o_order (id) on delete restrict on update restrict;
 create index ix_or_order_ship_order_id on or_order_ship (order_id);
+alter table or_order_ship add constraint fk_or_order_ship_order_id foreign key (order_id) references o_order (id) on delete restrict on update restrict;
+
+alter table oto_bchild add constraint fk_oto_bchild_master_id foreign key (master_id) references oto_bmaster (id) on delete restrict on update restrict;
 
 alter table oto_child add constraint fk_oto_child_master_id foreign key (master_id) references oto_master (id) on delete restrict on update restrict;
 
+alter table oto_cust_address add constraint fk_oto_cust_address_customer_cid foreign key (customer_cid) references oto_cust (cid) on delete restrict on update restrict;
+
+alter table oto_prime_extra add constraint fk_oto_prime_extra_eid foreign key (eid) references oto_prime (pid) on delete restrict on update restrict;
+
+create index ix_oto_th_many_oto_th_top_id on oto_th_many (oto_th_top_id);
+alter table oto_th_many add constraint fk_oto_th_many_oto_th_top_id foreign key (oto_th_top_id) references oto_th_top (id) on delete restrict on update restrict;
+
+alter table oto_th_one add constraint fk_oto_th_one_many_id foreign key (many_id) references oto_th_many (id) on delete restrict on update restrict;
+
+alter table oto_ubprime_extra add constraint fk_oto_ubprime_extra_eid foreign key (eid) references oto_ubprime (pid) on delete restrict on update restrict;
+
+alter table oto_uprime_extra add constraint fk_oto_uprime_extra_eid foreign key (eid) references oto_uprime (pid) on delete restrict on update restrict;
+
 alter table pfile add constraint fk_pfile_file_content_id foreign key (file_content_id) references pfile_content (id) on delete restrict on update restrict;
 
 alter table pfile add constraint fk_pfile_file_content2_id foreign key (file_content2_id) references pfile_content (id) on delete restrict on update restrict;
 
 alter table paggview add constraint fk_paggview_pview_id foreign key (pview_id) references pp (id) on delete restrict on update restrict;
 
-alter table pallet_location add constraint fk_pallet_location_zone_sid foreign key (zone_sid) references zones (id) on delete restrict on update restrict;
 create index ix_pallet_location_zone_sid on pallet_location (zone_sid);
+alter table pallet_location add constraint fk_pallet_location_zone_sid foreign key (zone_sid) references zones (id) on delete restrict on update restrict;
 
 alter table parcel_location add constraint fk_parcel_location_parcelid foreign key (parcelid) references parcel (parcelid) on delete restrict on update restrict;
 
-alter table rawinherit_parent_rawinherit_dat add constraint fk_rawinherit_parent_rawinher_1 foreign key (rawinherit_parent_id) references rawinherit_parent (id) on delete restrict on update restrict;
-create index ix_rawinherit_parent_rawinher_1 on rawinherit_parent_rawinherit_dat (rawinherit_parent_id);
+create index ix_rawinherit_parent_rawinherit_data_rawinherit_parent on rawinherit_parent_rawinherit_data (rawinherit_parent_id);
+alter table rawinherit_parent_rawinherit_data add constraint fk_rawinherit_parent_rawinherit_data_rawinherit_parent foreign key (rawinherit_parent_id) references rawinherit_parent (id) on delete restrict on update restrict;
 
-alter table rawinherit_parent_rawinherit_dat add constraint fk_rawinherit_parent_rawinher_2 foreign key (rawinherit_data_id) references rawinherit_data (id) on delete restrict on update restrict;
-create index ix_rawinherit_parent_rawinher_2 on rawinherit_parent_rawinherit_dat (rawinherit_data_id);
+create index ix_rawinherit_parent_rawinherit_data_rawinherit_data on rawinherit_parent_rawinherit_data (rawinherit_data_id);
+alter table rawinherit_parent_rawinherit_data add constraint fk_rawinherit_parent_rawinherit_data_rawinherit_data foreign key (rawinherit_data_id) references rawinherit_data (id) on delete restrict on update restrict;
 
-alter table c_participation add constraint fk_c_participation_conversati_1 foreign key (conversation_id) references c_conversation (id) on delete restrict on update restrict;
-create index ix_c_participation_conversati_1 on c_participation (conversation_id);
+create index ix_parent_person_some_bean_id on parent_person (some_bean_id);
+alter table parent_person add constraint fk_parent_person_some_bean_id foreign key (some_bean_id) references e_basic (id) on delete restrict on update restrict;
+
+create index ix_parent_person_parent_identifier on parent_person (parent_identifier);
+alter table parent_person add constraint fk_parent_person_parent_identifier foreign key (parent_identifier) references grand_parent_person (identifier) on delete restrict on update restrict;
+
+create index ix_c_participation_conversation_id on c_participation (conversation_id);
+alter table c_participation add constraint fk_c_participation_conversation_id foreign key (conversation_id) references c_conversation (id) on delete restrict on update restrict;
 
-alter table c_participation add constraint fk_c_participation_user_id foreign key (user_id) references c_user (id) on delete restrict on update restrict;
 create index ix_c_participation_user_id on c_participation (user_id);
+alter table c_participation add constraint fk_c_participation_user_id foreign key (user_id) references c_user (id) on delete restrict on update restrict;
 
-alter table persistent_file_content add constraint fk_persistent_file_content_pe_1 foreign key (persistent_file_id) references persistent_file (id) on delete restrict on update restrict;
+alter table persistent_file_content add constraint fk_persistent_file_content_persistent_file_id foreign key (persistent_file_id) references persistent_file (id) on delete restrict on update restrict;
 
-alter table person add constraint fk_person_default_address_oid foreign key (default_address_oid) references address (oid) on delete restrict on update restrict;
 create index ix_person_default_address_oid on person (default_address_oid);
+alter table person add constraint fk_person_default_address_oid foreign key (default_address_oid) references address (oid) on delete restrict on update restrict;
 
-alter table phones add constraint fk_phones_person_id foreign key (person_id) references persons (id) on delete restrict on update restrict;
 create index ix_phones_person_id on phones (person_id);
+alter table phones add constraint fk_phones_person_id foreign key (person_id) references persons (id) on delete restrict on update restrict;
 
+create index ix_pp_to_ww_pp on pp_to_ww (pp_id);
 alter table pp_to_ww add constraint fk_pp_to_ww_pp foreign key (pp_id) references pp (id) on delete restrict on update restrict;
-create index ix_pp_to_ww_pp_id on pp_to_ww (pp_id);
 
+create index ix_pp_to_ww_wview on pp_to_ww (ww_id);
 alter table pp_to_ww add constraint fk_pp_to_ww_wview foreign key (ww_id) references wview (id) on delete restrict on update restrict;
-create index ix_pp_to_ww_ww_id on pp_to_ww (ww_id);
 
-alter table r_orders add constraint fk_r_orders_rcustomer foreign key (company,customername) references rcustomer (company,name) on delete restrict on update restrict;
-create index ix_r_orders_company_customern_1 on r_orders (company,customername);
+create index ix_question_groupobjectid on question (groupobjectid);
+alter table question add constraint fk_question_groupobjectid foreign key (groupobjectid) references survey_group (id) on delete restrict on update restrict;
 
-alter table resourcefile add constraint fk_resourcefile_parentresourc_1 foreign key (parentresourcefileid) references resourcefile (id) on delete restrict on update restrict;
-create index ix_resourcefile_parentresourc_1 on resourcefile (parentresourcefileid);
+create index ix_r_orders_customer on r_orders (company,customername);
+alter table r_orders add constraint fk_r_orders_customer foreign key (company,customername) references rcustomer (company,name) on delete restrict on update restrict;
+
+create index ix_resourcefile_parentresourcefileid on resourcefile (parentresourcefileid);
+alter table resourcefile add constraint fk_resourcefile_parentresourcefileid foreign key (parentresourcefileid) references resourcefile (id) on delete restrict on update restrict;
 
-alter table mt_role add constraint fk_mt_role_tenant_id foreign key (tenant_id) references mt_tenant (id) on delete restrict on update restrict;
 create index ix_mt_role_tenant_id on mt_role (tenant_id);
+alter table mt_role add constraint fk_mt_role_tenant_id foreign key (tenant_id) references mt_tenant (id) on delete restrict on update restrict;
 
+create index ix_mt_role_permission_mt_role on mt_role_permission (mt_role_id);
 alter table mt_role_permission add constraint fk_mt_role_permission_mt_role foreign key (mt_role_id) references mt_role (id) on delete restrict on update restrict;
-create index ix_mt_role_permission_mt_role_1 on mt_role_permission (mt_role_id);
 
-alter table mt_role_permission add constraint fk_mt_role_permission_mt_perm_2 foreign key (mt_permission_id) references mt_permission (id) on delete restrict on update restrict;
-create index ix_mt_role_permission_mt_perm_2 on mt_role_permission (mt_permission_id);
+create index ix_mt_role_permission_mt_permission on mt_role_permission (mt_permission_id);
+alter table mt_role_permission add constraint fk_mt_role_permission_mt_permission foreign key (mt_permission_id) references mt_permission (id) on delete restrict on update restrict;
 
 alter table f_second add constraint fk_f_second_first foreign key (first) references f_first (id) on delete restrict on update restrict;
 
-alter table section add constraint fk_section_article_id foreign key (article_id) references article (id) on delete restrict on update restrict;
 create index ix_section_article_id on section (article_id);
+alter table section add constraint fk_section_article_id foreign key (article_id) references article (id) on delete restrict on update restrict;
 
-alter table self_parent add constraint fk_self_parent_parent_id foreign key (parent_id) references self_parent (id) on delete restrict on update restrict;
 create index ix_self_parent_parent_id on self_parent (parent_id);
+alter table self_parent add constraint fk_self_parent_parent_id foreign key (parent_id) references self_parent (id) on delete restrict on update restrict;
 
-alter table self_ref_customer add constraint fk_self_ref_customer_referred_1 foreign key (referred_by_id) references self_ref_customer (id) on delete restrict on update restrict;
-create index ix_self_ref_customer_referred_1 on self_ref_customer (referred_by_id);
+create index ix_self_ref_customer_referred_by_id on self_ref_customer (referred_by_id);
+alter table self_ref_customer add constraint fk_self_ref_customer_referred_by_id foreign key (referred_by_id) references self_ref_customer (id) on delete restrict on update restrict;
 
-alter table self_ref_example add constraint fk_self_ref_example_parent_id foreign key (parent_id) references self_ref_example (id) on delete restrict on update restrict;
 create index ix_self_ref_example_parent_id on self_ref_example (parent_id);
+alter table self_ref_example add constraint fk_self_ref_example_parent_id foreign key (parent_id) references self_ref_example (id) on delete restrict on update restrict;
 
-alter table stockforecast add constraint fk_stockforecast_inner_report_1 foreign key (inner_report_id) references inner_report (id) on delete restrict on update restrict;
-create index ix_stockforecast_inner_report_1 on stockforecast (inner_report_id);
+create index ix_stockforecast_inner_report_id on stockforecast (inner_report_id);
+alter table stockforecast add constraint fk_stockforecast_inner_report_id foreign key (inner_report_id) references inner_report (id) on delete restrict on update restrict;
 
-alter table sub_section add constraint fk_sub_section_section_id foreign key (section_id) references section (id) on delete restrict on update restrict;
 create index ix_sub_section_section_id on sub_section (section_id);
+alter table sub_section add constraint fk_sub_section_section_id foreign key (section_id) references section (id) on delete restrict on update restrict;
 
-alter table t_detail_with_other_namexxxyy add constraint fk_t_detail_with_other_namexx_1 foreign key (master_id) references t_atable_thatisrelatively (id) on delete restrict on update restrict;
-create index ix_t_detail_with_other_namexx_1 on t_detail_with_other_namexxxyy (master_id);
+create index ix_tevent_many_event_id on tevent_many (event_id);
+alter table tevent_many add constraint fk_tevent_many_event_id foreign key (event_id) references tevent_one (id) on delete restrict on update restrict;
+
+alter table tevent_one add constraint fk_tevent_one_event_id foreign key (event_id) references tevent (id) on delete restrict on update restrict;
+
+create index ix_t_detail_with_other_namexxxyy_master_id on t_detail_with_other_namexxxyy (master_id);
+alter table t_detail_with_other_namexxxyy add constraint fk_t_detail_with_other_namexxxyy_master_id foreign key (master_id) references t_atable_thatisrelatively (id) on delete restrict on update restrict;
 
-alter table ts_detail_two add constraint fk_ts_detail_two_master_id foreign key (master_id) references ts_master_two (id) on delete restrict on update restrict;
 create index ix_ts_detail_two_master_id on ts_detail_two (master_id);
+alter table ts_detail_two add constraint fk_ts_detail_two_master_id foreign key (master_id) references ts_master_two (id) on delete restrict on update restrict;
 
-alter table twheel add constraint fk_twheel_owner_plate_no foreign key (owner_plate_no) references tcar (plate_no) on delete restrict on update restrict;
 create index ix_twheel_owner_plate_no on twheel (owner_plate_no);
+alter table twheel add constraint fk_twheel_owner_plate_no foreign key (owner_plate_no) references tcar (plate_no) on delete restrict on update restrict;
 
 alter table tire add constraint fk_tire_wheel foreign key (wheel) references wheel (id) on delete restrict on update restrict;
 
-alter table trip add constraint fk_trip_vehicle_driver_id foreign key (vehicle_driver_id) references vehicle_driver (id) on delete restrict on update restrict;
 create index ix_trip_vehicle_driver_id on trip (vehicle_driver_id);
+alter table trip add constraint fk_trip_vehicle_driver_id foreign key (vehicle_driver_id) references vehicle_driver (id) on delete restrict on update restrict;
 
-alter table trip add constraint fk_trip_address_id foreign key (address_id) references o_address (id) on delete restrict on update restrict;
 create index ix_trip_address_id on trip (address_id);
+alter table trip add constraint fk_trip_address_id foreign key (address_id) references o_address (id) on delete restrict on update restrict;
 
-alter table type add constraint fk_type_sub_type_id foreign key (sub_type_id) references sub_type (sub_type_id) on delete restrict on update restrict;
 create index ix_type_sub_type_id on type (sub_type_id);
+alter table type add constraint fk_type_sub_type_id foreign key (sub_type_id) references sub_type (sub_type_id) on delete restrict on update restrict;
 
-alter table ut_detail add constraint fk_ut_detail_utmaster_id foreign key (utmaster_id) references ut_master (id) on delete restrict on update restrict;
 create index ix_ut_detail_utmaster_id on ut_detail (utmaster_id);
+alter table ut_detail add constraint fk_ut_detail_utmaster_id foreign key (utmaster_id) references ut_master (id) on delete restrict on update restrict;
 
-alter table uutwo add constraint fk_uutwo_master_id foreign key (master_id) references uuone (id) on delete restrict on update restrict;
 create index ix_uutwo_master_id on uutwo (master_id);
+alter table uutwo add constraint fk_uutwo_master_id foreign key (master_id) references uuone (id) on delete restrict on update restrict;
 
-alter table c_user add constraint fk_c_user_group_id foreign key (group_id) references c_group (id) on delete restrict on update restrict;
 create index ix_c_user_group_id on c_user (group_id);
+alter table c_user add constraint fk_c_user_group_id foreign key (group_id) references c_group (id) on delete restrict on update restrict;
 
 alter table oto_user add constraint fk_oto_user_account_id foreign key (account_id) references oto_account (id) on delete restrict on update restrict;
 
-alter table em_user_role add constraint fk_em_user_role_user_id foreign key (user_id) references em_user (id) on delete restrict on update restrict;
 create index ix_em_user_role_user_id on em_user_role (user_id);
+alter table em_user_role add constraint fk_em_user_role_user_id foreign key (user_id) references em_user (id) on delete restrict on update restrict;
 
-alter table em_user_role add constraint fk_em_user_role_role_id foreign key (role_id) references em_role (id) on delete restrict on update restrict;
 create index ix_em_user_role_role_id on em_user_role (role_id);
+alter table em_user_role add constraint fk_em_user_role_role_id foreign key (role_id) references em_role (id) on delete restrict on update restrict;
 
-alter table vehicle add constraint fk_vehicle_truck_ref_id foreign key (truck_ref_id) references truck_ref (id) on delete restrict on update restrict;
-create index ix_vehicle_truck_ref_id on vehicle (truck_ref_id);
-
-alter table vehicle add constraint fk_vehicle_car_ref_id foreign key (car_ref_id) references truck_ref (id) on delete restrict on update restrict;
 create index ix_vehicle_car_ref_id on vehicle (car_ref_id);
+alter table vehicle add constraint fk_vehicle_car_ref_id foreign key (car_ref_id) references truck_ref (id) on delete restrict on update restrict;
+
+create index ix_vehicle_truck_ref_id on vehicle (truck_ref_id);
+alter table vehicle add constraint fk_vehicle_truck_ref_id foreign key (truck_ref_id) references truck_ref (id) on delete restrict on update restrict;
 
-alter table vehicle_driver add constraint fk_vehicle_driver_vehicle_id foreign key (vehicle_id) references vehicle (id) on delete restrict on update restrict;
 create index ix_vehicle_driver_vehicle_id on vehicle_driver (vehicle_id);
+alter table vehicle_driver add constraint fk_vehicle_driver_vehicle_id foreign key (vehicle_id) references vehicle (id) on delete restrict on update restrict;
 
-alter table vehicle_driver add constraint fk_vehicle_driver_address_id foreign key (address_id) references o_address (id) on delete restrict on update restrict;
 create index ix_vehicle_driver_address_id on vehicle_driver (address_id);
+alter table vehicle_driver add constraint fk_vehicle_driver_address_id foreign key (address_id) references o_address (id) on delete restrict on update restrict;
 
-alter table warehouses add constraint fk_warehouses_officezoneid foreign key (officezoneid) references zones (id) on delete restrict on update restrict;
 create index ix_warehouses_officezoneid on warehouses (officezoneid);
+alter table warehouses add constraint fk_warehouses_officezoneid foreign key (officezoneid) references zones (id) on delete restrict on update restrict;
 
-alter table warehousesshippingzones add constraint fk_warehousesshippingzones_wa_1 foreign key (warehouseid) references warehouses (id) on delete restrict on update restrict;
-create index ix_warehousesshippingzones_wa_1 on warehousesshippingzones (warehouseid);
+create index ix_warehousesshippingzones_warehouses on warehousesshippingzones (warehouseid);
+alter table warehousesshippingzones add constraint fk_warehousesshippingzones_warehouses foreign key (warehouseid) references warehouses (id) on delete restrict on update restrict;
 
-alter table warehousesshippingzones add constraint fk_warehousesshippingzones_zo_2 foreign key (shippingzoneid) references zones (id) on delete restrict on update restrict;
-create index ix_warehousesshippingzones_sh_2 on warehousesshippingzones (shippingzoneid);
+create index ix_warehousesshippingzones_zones on warehousesshippingzones (shippingzoneid);
+alter table warehousesshippingzones add constraint fk_warehousesshippingzones_zones foreign key (shippingzoneid) references zones (id) on delete restrict on update restrict;
 
-alter table sa_wheel add constraint fk_sa_wheel_tire foreign key (tire) references sa_tire (id) on delete restrict on update restrict;
 create index ix_sa_wheel_tire on sa_wheel (tire);
+alter table sa_wheel add constraint fk_sa_wheel_tire foreign key (tire) references sa_tire (id) on delete restrict on update restrict;
 
-alter table sa_wheel add constraint fk_sa_wheel_car foreign key (car) references sa_car (id) on delete restrict on update restrict;
 create index ix_sa_wheel_car on sa_wheel (car);
+alter table sa_wheel add constraint fk_sa_wheel_car foreign key (car) references sa_car (id) on delete restrict on update restrict;
+
+create index ix_g_who_props_otm_who_created_id on g_who_props_otm (who_created_id);
+alter table g_who_props_otm add constraint fk_g_who_props_otm_who_created_id foreign key (who_created_id) references g_user (id) on delete restrict on update restrict;
+
+create index ix_g_who_props_otm_who_modified_id on g_who_props_otm (who_modified_id);
+alter table g_who_props_otm add constraint fk_g_who_props_otm_who_modified_id foreign key (who_modified_id) references g_user (id) on delete restrict on update restrict;
 
-alter table with_zero add constraint fk_with_zero_parent_id foreign key (parent_id) references parent (id) on delete restrict on update restrict;
 create index ix_with_zero_parent_id on with_zero (parent_id);
+alter table with_zero add constraint fk_with_zero_parent_id foreign key (parent_id) references parent (id) on delete restrict on update restrict;
+
+alter table hx_link add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+update hx_link set sys_period = tstzrange(when_created, null);
+create table hx_link_history(like hx_link);
+create view hx_link_with_history as select * from hx_link union all select * from hx_link_history;
+
+create or replace function hx_link_history_version() returns trigger as $$
+begin
+  if (TG_OP = 'UPDATE') then
+    insert into hx_link_history (sys_period,id, name, location, comments, version, when_created, when_modified) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
+    NEW.sys_period = tstzrange(current_timestamp,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into hx_link_history (sys_period,id, name, location, comments, version, when_created, when_modified) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
+create trigger hx_link_history_upd
+  before update or delete on hx_link
+  for each row execute procedure hx_link_history_version();
+
+alter table hi_link add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+update hi_link set sys_period = tstzrange(when_created, null);
+create table hi_link_history(like hi_link);
+create view hi_link_with_history as select * from hi_link union all select * from hi_link_history;
+
+create or replace function hi_link_history_version() returns trigger as $$
+begin
+  if (TG_OP = 'UPDATE') then
+    insert into hi_link_history (sys_period,id, name, location, comments, version, when_created, when_modified) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
+    NEW.sys_period = tstzrange(current_timestamp,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into hi_link_history (sys_period,id, name, location, comments, version, when_created, when_modified) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
+create trigger hi_link_history_upd
+  before update or delete on hi_link
+  for each row execute procedure hi_link_history_version();
+
+alter table hi_link_doc add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+create table hi_link_doc_history(like hi_link_doc);
+create view hi_link_doc_with_history as select * from hi_link_doc union all select * from hi_link_doc_history;
+
+create or replace function hi_link_doc_history_version() returns trigger as $$
+begin
+  if (TG_OP = 'UPDATE') then
+    insert into hi_link_doc_history (sys_period,hi_link_id, hi_doc_id) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.hi_link_id, OLD.hi_doc_id);
+    NEW.sys_period = tstzrange(current_timestamp,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into hi_link_doc_history (sys_period,hi_link_id, hi_doc_id) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.hi_link_id, OLD.hi_doc_id);
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
+create trigger hi_link_doc_history_upd
+  before update or delete on hi_link_doc
+  for each row execute procedure hi_link_doc_history_version();
+
+alter table link add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+update link set sys_period = tstzrange(when_created, null);
+create table link_history(like link);
+create view link_with_history as select * from link union all select * from link_history;
+
+create or replace function link_history_version() returns trigger as $$
+begin
+  if (TG_OP = 'UPDATE') then
+    insert into link_history (sys_period,id, name, location, when_publish, link_comment, version, when_created, when_modified, deleted) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.name, OLD.location, OLD.when_publish, OLD.link_comment, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+    NEW.sys_period = tstzrange(current_timestamp,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into link_history (sys_period,id, name, location, when_publish, link_comment, version, when_created, when_modified, deleted) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.name, OLD.location, OLD.when_publish, OLD.link_comment, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
+create trigger link_history_upd
+  before update or delete on link
+  for each row execute procedure link_history_version();
+
+alter table c_user add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+update c_user set sys_period = tstzrange(when_created, null);
+create table c_user_history(like c_user);
+create view c_user_with_history as select * from c_user union all select * from c_user_history;
+
+create or replace function c_user_history_version() returns trigger as $$
+begin
+  if (TG_OP = 'UPDATE') then
+    insert into c_user_history (sys_period,id, inactive, name, email, group_id, version, when_created, when_modified) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.inactive, OLD.name, OLD.email, OLD.group_id, OLD.version, OLD.when_created, OLD.when_modified);
+    NEW.sys_period = tstzrange(current_timestamp,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into c_user_history (sys_period,id, inactive, name, email, group_id, version, when_created, when_modified) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.inactive, OLD.name, OLD.email, OLD.group_id, OLD.version, OLD.when_created, OLD.when_modified);
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
+create trigger c_user_history_upd
+  before update or delete on c_user
+  for each row execute procedure c_user_history_version();
 
diff --git a/src/test/ddl-review/pg-drop-all.sql b/src/test/ddl-review/pg-drop-all.sql
index cf7ea95f8..e02947028 100644
--- a/src/test/ddl-review/pg-drop-all.sql
+++ b/src/test/ddl-review/pg-drop-all.sql
@@ -1,340 +1,573 @@
-alter table bar drop constraint fk_bar_foo_id;
-drop index ix_bar_foo_id;
+-- Generated by ebean unknown at 2018-03-08T06:39:45.063Z
+alter table if exists bar drop constraint if exists fk_bar_foo_id;
+drop index if exists ix_bar_foo_id;
 
-alter table o_address drop constraint fk_o_address_country_code;
-drop index ix_o_address_country_code;
+alter table if exists addr drop constraint if exists fk_addr_employee_id;
+drop index if exists ix_addr_employee_id;
 
-alter table animals drop constraint fk_animals_shelter_id;
-drop index ix_animals_shelter_id;
+alter table if exists o_address drop constraint if exists fk_o_address_country_code;
+drop index if exists ix_o_address_country_code;
 
-alter table attribute drop constraint fk_attribute_attribute_holder_1;
-drop index ix_attribute_attribute_holder_1;
+alter table if exists album drop constraint if exists fk_album_cover_id;
 
-alter table bbookmark drop constraint fk_bbookmark_user_id;
-drop index ix_bbookmark_user_id;
+alter table if exists animal drop constraint if exists fk_animal_shelter_id;
+drop index if exists ix_animal_shelter_id;
 
-alter table drel_booking drop constraint fk_drel_booking_agent_invoice;
+alter table if exists attribute drop constraint if exists fk_attribute_attribute_holder_id;
+drop index if exists ix_attribute_attribute_holder_id;
 
-alter table drel_booking drop constraint fk_drel_booking_client_invoice;
+alter table if exists bbookmark drop constraint if exists fk_bbookmark_user_id;
+drop index if exists ix_bbookmark_user_id;
 
-alter table ckey_detail drop constraint fk_ckey_detail_ckey_parent;
-drop index ix_ckey_detail_one_key_two_key;
+alter table if exists bsite_user drop constraint if exists fk_bsite_user_site_id;
+drop index if exists ix_bsite_user_site_id;
 
-alter table ckey_parent drop constraint fk_ckey_parent_assoc_id;
-drop index ix_ckey_parent_assoc_id;
+alter table if exists bsite_user drop constraint if exists fk_bsite_user_user_id;
+drop index if exists ix_bsite_user_user_id;
 
-alter table calculation_result drop constraint fk_calculation_result_product_1;
-drop index ix_calculation_result_product_1;
+alter table if exists bsite_user_b drop constraint if exists fk_bsite_user_b_site;
+drop index if exists ix_bsite_user_b_site;
 
-alter table calculation_result drop constraint fk_calculation_result_group_c_2;
-drop index ix_calculation_result_group_c_2;
+alter table if exists bsite_user_b drop constraint if exists fk_bsite_user_b_usr;
+drop index if exists ix_bsite_user_b_usr;
 
-alter table sp_car_car_wheels drop constraint fk_sp_car_car_wheels_sp_car_car;
-drop index ix_sp_car_car_wheels_car;
+alter table if exists bsite_user_c drop constraint if exists fk_bsite_user_c_site_uid;
+drop index if exists ix_bsite_user_c_site_uid;
 
-alter table sp_car_car_wheels drop constraint fk_sp_car_car_wheels_sp_car_w_2;
-drop index ix_sp_car_car_wheels_wheel;
+alter table if exists bsite_user_c drop constraint if exists fk_bsite_user_c_user_uid;
+drop index if exists ix_bsite_user_c_user_uid;
 
-alter table car_accessory drop constraint fk_car_accessory_car_id;
-drop index ix_car_accessory_car_id;
+alter table if exists drel_booking drop constraint if exists fk_drel_booking_agent_invoice;
 
-alter table configuration drop constraint fk_configuration_configuratio_1;
-drop index ix_configuration_configuratio_1;
+alter table if exists drel_booking drop constraint if exists fk_drel_booking_client_invoice;
 
-alter table contact drop constraint fk_contact_customer_id;
-drop index ix_contact_customer_id;
+alter table if exists ckey_detail drop constraint if exists fk_ckey_detail_parent;
+drop index if exists ix_ckey_detail_parent;
 
-alter table contact drop constraint fk_contact_group_id;
-drop index ix_contact_group_id;
+alter table if exists ckey_parent drop constraint if exists fk_ckey_parent_assoc_id;
+drop index if exists ix_ckey_parent_assoc_id;
 
-alter table contact_note drop constraint fk_contact_note_contact_id;
-drop index ix_contact_note_contact_id;
+alter table if exists calculation_result drop constraint if exists fk_calculation_result_product_configuration_id;
+drop index if exists ix_calculation_result_product_configuration_id;
 
-alter table c_conversation drop constraint fk_c_conversation_group_id;
-drop index ix_c_conversation_group_id;
+alter table if exists calculation_result drop constraint if exists fk_calculation_result_group_configuration_id;
+drop index if exists ix_calculation_result_group_configuration_id;
 
-alter table o_customer drop constraint fk_o_customer_billing_address_1;
-drop index ix_o_customer_billing_address_1;
+alter table if exists sp_car_car_wheels drop constraint if exists fk_sp_car_car_wheels_sp_car_car;
+drop index if exists ix_sp_car_car_wheels_sp_car_car;
 
-alter table o_customer drop constraint fk_o_customer_shipping_addres_2;
-drop index ix_o_customer_shipping_addres_2;
+alter table if exists sp_car_car_wheels drop constraint if exists fk_sp_car_car_wheels_sp_car_wheel;
+drop index if exists ix_sp_car_car_wheels_sp_car_wheel;
 
-alter table eemb_inner drop constraint fk_eemb_inner_outer_id;
-drop index ix_eemb_inner_outer_id;
+alter table if exists car_accessory drop constraint if exists fk_car_accessory_fuse_id;
+drop index if exists ix_car_accessory_fuse_id;
 
-alter table einvoice drop constraint fk_einvoice_person_id;
-drop index ix_einvoice_person_id;
+alter table if exists car_accessory drop constraint if exists fk_car_accessory_car_id;
+drop index if exists ix_car_accessory_car_id;
 
-alter table enull_collection_detail drop constraint fk_enull_collection_detail_en_1;
-drop index ix_enull_collection_detail_en_1;
+alter table if exists category drop constraint if exists fk_category_surveyobjectid;
+drop index if exists ix_category_surveyobjectid;
 
-alter table eopt_one_a drop constraint fk_eopt_one_a_b_id;
-drop index ix_eopt_one_a_b_id;
+alter table if exists child_person drop constraint if exists fk_child_person_some_bean_id;
+drop index if exists ix_child_person_some_bean_id;
 
-alter table eopt_one_b drop constraint fk_eopt_one_b_c_id;
-drop index ix_eopt_one_b_c_id;
+alter table if exists child_person drop constraint if exists fk_child_person_parent_identifier;
+drop index if exists ix_child_person_parent_identifier;
 
-alter table evanilla_collection_detail drop constraint fk_evanilla_collection_detail_1;
-drop index ix_evanilla_collection_detail_1;
+alter table if exists configuration drop constraint if exists fk_configuration_configurations_id;
+drop index if exists ix_configuration_configurations_id;
 
-alter table td_child drop constraint fk_td_child_parent_id;
-drop index ix_td_child_parent_id;
+alter table if exists contact drop constraint if exists fk_contact_customer_id;
+drop index if exists ix_contact_customer_id;
 
-alter table imrelated drop constraint fk_imrelated_owner_id;
-drop index ix_imrelated_owner_id;
+alter table if exists contact drop constraint if exists fk_contact_group_id;
+drop index if exists ix_contact_group_id;
 
-alter table info_contact drop constraint fk_info_contact_company_id;
-drop index ix_info_contact_company_id;
+alter table if exists contact_note drop constraint if exists fk_contact_note_contact_id;
+drop index if exists ix_contact_note_contact_id;
 
-alter table info_customer drop constraint fk_info_customer_company_id;
+alter table if exists c_conversation drop constraint if exists fk_c_conversation_group_id;
+drop index if exists ix_c_conversation_group_id;
 
-alter table inner_report drop constraint fk_inner_report_forecast_id;
+alter table if exists o_customer drop constraint if exists fk_o_customer_billing_address_id;
+drop index if exists ix_o_customer_billing_address_id;
 
-alter table drel_invoice drop constraint fk_drel_invoice_booking;
-drop index ix_drel_invoice_booking;
+alter table if exists o_customer drop constraint if exists fk_o_customer_shipping_address_id;
+drop index if exists ix_o_customer_shipping_address_id;
 
-alter table item drop constraint fk_item_type;
-drop index ix_item_customer_type;
+alter table if exists dcredit_drol drop constraint if exists fk_dcredit_drol_dcredit;
+drop index if exists ix_dcredit_drol_dcredit;
 
-alter table item drop constraint fk_item_region;
-drop index ix_item_customer_region;
+alter table if exists dcredit_drol drop constraint if exists fk_dcredit_drol_drol;
+drop index if exists ix_dcredit_drol_drol;
 
-alter table level1_level4 drop constraint fk_level1_level4_level1;
-drop index ix_level1_level4_level1_id;
+alter table if exists drot_drol drop constraint if exists fk_drot_drol_drot;
+drop index if exists ix_drot_drol_drot;
 
-alter table level1_level4 drop constraint fk_level1_level4_level4;
-drop index ix_level1_level4_level4_id;
+alter table if exists drot_drol drop constraint if exists fk_drot_drol_drol;
+drop index if exists ix_drot_drol_drol;
 
-alter table level1_level2 drop constraint fk_level1_level2_level1;
-drop index ix_level1_level2_level1_id;
+alter table if exists dfk_cascade drop constraint if exists fk_dfk_cascade_one_id;
+drop index if exists ix_dfk_cascade_one_id;
 
-alter table level1_level2 drop constraint fk_level1_level2_level2;
-drop index ix_level1_level2_level2_id;
+alter table if exists dfk_set_null drop constraint if exists fk_dfk_set_null_one_id;
+drop index if exists ix_dfk_set_null_one_id;
 
-alter table level2_level3 drop constraint fk_level2_level3_level2;
-drop index ix_level2_level3_level2_id;
+alter table if exists doc drop constraint if exists fk_doc_id;
 
-alter table level2_level3 drop constraint fk_level2_level3_level3;
-drop index ix_level2_level3_level3_id;
+alter table if exists doc_link drop constraint if exists fk_doc_link_doc;
+drop index if exists ix_doc_link_doc;
 
-alter table la_attr_value_attribute drop constraint fk_la_attr_value_attribute_la_1;
-drop index ix_la_attr_value_attribute_la_1;
+alter table if exists doc_link drop constraint if exists fk_doc_link_link;
+drop index if exists ix_doc_link_link;
 
-alter table la_attr_value_attribute drop constraint fk_la_attr_value_attribute_at_2;
-drop index ix_la_attr_value_attribute_at_2;
+alter table if exists document drop constraint if exists fk_document_id;
 
-alter table mprinter drop constraint fk_mprinter_current_state_id;
-drop index ix_mprinter_current_state_id;
+alter table if exists document drop constraint if exists fk_document_organisation_id;
+drop index if exists ix_document_organisation_id;
 
-alter table mprinter drop constraint fk_mprinter_last_swap_cyan_id;
+alter table if exists document_draft drop constraint if exists fk_document_draft_organisation_id;
+drop index if exists ix_document_draft_organisation_id;
 
-alter table mprinter drop constraint fk_mprinter_last_swap_magenta_3;
+alter table if exists document_media drop constraint if exists fk_document_media_document_id;
+drop index if exists ix_document_media_document_id;
 
-alter table mprinter drop constraint fk_mprinter_last_swap_yellow_id;
+alter table if exists document_media_draft drop constraint if exists fk_document_media_draft_document_id;
+drop index if exists ix_document_media_draft_document_id;
 
-alter table mprinter drop constraint fk_mprinter_last_swap_black_id;
+alter table if exists ebasic_json_map_detail drop constraint if exists fk_ebasic_json_map_detail_owner_id;
+drop index if exists ix_ebasic_json_map_detail_owner_id;
 
-alter table mprinter_state drop constraint fk_mprinter_state_printer_id;
-drop index ix_mprinter_state_printer_id;
+alter table if exists ebasic_no_sdchild drop constraint if exists fk_ebasic_no_sdchild_owner_id;
+drop index if exists ix_ebasic_no_sdchild_owner_id;
 
-alter table mprofile drop constraint fk_mprofile_picture_id;
-drop index ix_mprofile_picture_id;
+alter table if exists ebasic_sdchild drop constraint if exists fk_ebasic_sdchild_owner_id;
+drop index if exists ix_ebasic_sdchild_owner_id;
 
-alter table mrole_muser drop constraint fk_mrole_muser_mrole;
-drop index ix_mrole_muser_mrole_roleid;
+alter table if exists eemb_inner drop constraint if exists fk_eemb_inner_outer_id;
+drop index if exists ix_eemb_inner_outer_id;
 
-alter table mrole_muser drop constraint fk_mrole_muser_muser;
-drop index ix_mrole_muser_muser_userid;
+alter table if exists einvoice drop constraint if exists fk_einvoice_person_id;
+drop index if exists ix_einvoice_person_id;
 
-alter table muser drop constraint fk_muser_user_type_id;
-drop index ix_muser_user_type_id;
+alter table if exists enull_collection_detail drop constraint if exists fk_enull_collection_detail_enull_collection_id;
+drop index if exists ix_enull_collection_detail_enull_collection_id;
 
-alter table c_message drop constraint fk_c_message_conversation_id;
-drop index ix_c_message_conversation_id;
+alter table if exists eopt_one_a drop constraint if exists fk_eopt_one_a_b_id;
+drop index if exists ix_eopt_one_a_b_id;
 
-alter table c_message drop constraint fk_c_message_user_id;
-drop index ix_c_message_user_id;
+alter table if exists eopt_one_b drop constraint if exists fk_eopt_one_b_c_id;
+drop index if exists ix_eopt_one_b_c_id;
 
-alter table mnoc_user_mnoc_role drop constraint fk_mnoc_user_mnoc_role_mnoc_u_1;
-drop index ix_mnoc_user_mnoc_role_mnoc_u_1;
+alter table if exists esoft_del_book drop constraint if exists fk_esoft_del_book_lend_by_id;
+drop index if exists ix_esoft_del_book_lend_by_id;
 
-alter table mnoc_user_mnoc_role drop constraint fk_mnoc_user_mnoc_role_mnoc_r_2;
-drop index ix_mnoc_user_mnoc_role_mnoc_r_2;
+alter table if exists esoft_del_book_esoft_del_user drop constraint if exists fk_esoft_del_book_esoft_del_user_esoft_del_book;
+drop index if exists ix_esoft_del_book_esoft_del_user_esoft_del_book;
 
-alter table mp_role drop constraint fk_mp_role_mp_user_id;
-drop index ix_mp_role_mp_user_id;
+alter table if exists esoft_del_book_esoft_del_user drop constraint if exists fk_esoft_del_book_esoft_del_user_esoft_del_user;
+drop index if exists ix_esoft_del_book_esoft_del_user_esoft_del_user;
 
-alter table my_lob_size_join_many drop constraint fk_my_lob_size_join_many_pare_1;
-drop index ix_my_lob_size_join_many_pare_1;
+alter table if exists esoft_del_down drop constraint if exists fk_esoft_del_down_esoft_del_mid_id;
+drop index if exists ix_esoft_del_down_esoft_del_mid_id;
 
-alter table o_cached_bean_country drop constraint fk_o_cached_bean_country_o_ca_1;
-drop index ix_o_cached_bean_country_o_ca_1;
+alter table if exists esoft_del_mid drop constraint if exists fk_esoft_del_mid_top_id;
+drop index if exists ix_esoft_del_mid_top_id;
 
-alter table o_cached_bean_country drop constraint fk_o_cached_bean_country_o_co_2;
-drop index ix_o_cached_bean_country_o_co_2;
+alter table if exists esoft_del_mid drop constraint if exists fk_esoft_del_mid_up_id;
+drop index if exists ix_esoft_del_mid_up_id;
 
-alter table o_cached_bean_child drop constraint fk_o_cached_bean_child_cached_1;
-drop index ix_o_cached_bean_child_cached_1;
+alter table if exists esoft_del_one_a drop constraint if exists fk_esoft_del_one_a_oneb_id;
 
-alter table oengine drop constraint fk_oengine_car_id;
+alter table if exists esoft_del_role_esoft_del_user drop constraint if exists fk_esoft_del_role_esoft_del_user_esoft_del_role;
+drop index if exists ix_esoft_del_role_esoft_del_user_esoft_del_role;
 
-alter table ogear_box drop constraint fk_ogear_box_car_id;
+alter table if exists esoft_del_role_esoft_del_user drop constraint if exists fk_esoft_del_role_esoft_del_user_esoft_del_user;
+drop index if exists ix_esoft_del_role_esoft_del_user_esoft_del_user;
 
-alter table o_order drop constraint fk_o_order_kcustomer_id;
-drop index ix_o_order_kcustomer_id;
+alter table if exists esoft_del_user_esoft_del_role drop constraint if exists fk_esoft_del_user_esoft_del_role_esoft_del_user;
+drop index if exists ix_esoft_del_user_esoft_del_role_esoft_del_user;
 
-alter table o_order_detail drop constraint fk_o_order_detail_order_id;
-drop index ix_o_order_detail_order_id;
+alter table if exists esoft_del_user_esoft_del_role drop constraint if exists fk_esoft_del_user_esoft_del_role_esoft_del_role;
+drop index if exists ix_esoft_del_user_esoft_del_role_esoft_del_role;
 
-alter table o_order_detail drop constraint fk_o_order_detail_product_id;
-drop index ix_o_order_detail_product_id;
+alter table if exists rawinherit_uncle drop constraint if exists fk_rawinherit_uncle_parent_id;
+drop index if exists ix_rawinherit_uncle_parent_id;
 
-alter table s_order_items drop constraint fk_s_order_items_order_uuid;
-drop index ix_s_order_items_order_uuid;
+alter table if exists evanilla_collection_detail drop constraint if exists fk_evanilla_collection_detail_evanilla_collection_id;
+drop index if exists ix_evanilla_collection_detail_evanilla_collection_id;
 
-alter table or_order_ship drop constraint fk_or_order_ship_order_id;
-drop index ix_or_order_ship_order_id;
+alter table if exists td_child drop constraint if exists fk_td_child_parent_id;
+drop index if exists ix_td_child_parent_id;
 
-alter table oto_child drop constraint fk_oto_child_master_id;
+alter table if exists empl drop constraint if exists fk_empl_default_address_id;
+drop index if exists ix_empl_default_address_id;
 
-alter table pfile drop constraint fk_pfile_file_content_id;
+alter table if exists grand_parent_person drop constraint if exists fk_grand_parent_person_some_bean_id;
+drop index if exists ix_grand_parent_person_some_bean_id;
 
-alter table pfile drop constraint fk_pfile_file_content2_id;
+alter table if exists survey_group drop constraint if exists fk_survey_group_categoryobjectid;
+drop index if exists ix_survey_group_categoryobjectid;
 
-alter table paggview drop constraint fk_paggview_pview_id;
+alter table if exists hx_link_doc drop constraint if exists fk_hx_link_doc_hx_link;
+drop index if exists ix_hx_link_doc_hx_link;
 
-alter table pallet_location drop constraint fk_pallet_location_zone_sid;
-drop index ix_pallet_location_zone_sid;
+alter table if exists hx_link_doc drop constraint if exists fk_hx_link_doc_he_doc;
+drop index if exists ix_hx_link_doc_he_doc;
 
-alter table parcel_location drop constraint fk_parcel_location_parcelid;
+alter table if exists hi_link_doc drop constraint if exists fk_hi_link_doc_hi_link;
+drop index if exists ix_hi_link_doc_hi_link;
 
-alter table rawinherit_parent_rawinherit_dat drop constraint fk_rawinherit_parent_rawinher_1;
-drop index ix_rawinherit_parent_rawinher_1;
+alter table if exists hi_link_doc drop constraint if exists fk_hi_link_doc_hi_doc;
+drop index if exists ix_hi_link_doc_hi_doc;
 
-alter table rawinherit_parent_rawinherit_dat drop constraint fk_rawinherit_parent_rawinher_2;
-drop index ix_rawinherit_parent_rawinher_2;
+alter table if exists imrelated drop constraint if exists fk_imrelated_owner_id;
+drop index if exists ix_imrelated_owner_id;
 
-alter table c_participation drop constraint fk_c_participation_conversati_1;
-drop index ix_c_participation_conversati_1;
+alter table if exists info_contact drop constraint if exists fk_info_contact_company_id;
+drop index if exists ix_info_contact_company_id;
 
-alter table c_participation drop constraint fk_c_participation_user_id;
-drop index ix_c_participation_user_id;
+alter table if exists info_customer drop constraint if exists fk_info_customer_company_id;
 
-alter table persistent_file_content drop constraint fk_persistent_file_content_pe_1;
+alter table if exists inner_report drop constraint if exists fk_inner_report_forecast_id;
 
-alter table person drop constraint fk_person_default_address_oid;
-drop index ix_person_default_address_oid;
+alter table if exists drel_invoice drop constraint if exists fk_drel_invoice_booking;
+drop index if exists ix_drel_invoice_booking;
 
-alter table phones drop constraint fk_phones_person_id;
-drop index ix_phones_person_id;
+alter table if exists item drop constraint if exists fk_item_etype;
+drop index if exists ix_item_etype;
 
-alter table pp_to_ww drop constraint fk_pp_to_ww_pp;
-drop index ix_pp_to_ww_pp_id;
+alter table if exists item drop constraint if exists fk_item_eregion;
+drop index if exists ix_item_eregion;
 
-alter table pp_to_ww drop constraint fk_pp_to_ww_wview;
-drop index ix_pp_to_ww_ww_id;
+alter table if exists trainer_monkey drop constraint if exists fk_trainer_monkey_trainer;
 
-alter table r_orders drop constraint fk_r_orders_rcustomer;
-drop index ix_r_orders_company_customern_1;
+alter table if exists trainer_monkey drop constraint if exists fk_trainer_monkey_monkey;
 
-alter table resourcefile drop constraint fk_resourcefile_parentresourc_1;
-drop index ix_resourcefile_parentresourc_1;
+alter table if exists troop_monkey drop constraint if exists fk_troop_monkey_troop;
 
-alter table mt_role drop constraint fk_mt_role_tenant_id;
-drop index ix_mt_role_tenant_id;
+alter table if exists troop_monkey drop constraint if exists fk_troop_monkey_monkey;
 
-alter table mt_role_permission drop constraint fk_mt_role_permission_mt_role;
-drop index ix_mt_role_permission_mt_role_1;
+alter table if exists l2_cldf_reset_bean_child drop constraint if exists fk_l2_cldf_reset_bean_child_parent_id;
+drop index if exists ix_l2_cldf_reset_bean_child_parent_id;
 
-alter table mt_role_permission drop constraint fk_mt_role_permission_mt_perm_2;
-drop index ix_mt_role_permission_mt_perm_2;
+alter table if exists level1_level4 drop constraint if exists fk_level1_level4_level1;
+drop index if exists ix_level1_level4_level1;
 
-alter table f_second drop constraint fk_f_second_first;
+alter table if exists level1_level4 drop constraint if exists fk_level1_level4_level4;
+drop index if exists ix_level1_level4_level4;
 
-alter table section drop constraint fk_section_article_id;
-drop index ix_section_article_id;
+alter table if exists level1_level2 drop constraint if exists fk_level1_level2_level1;
+drop index if exists ix_level1_level2_level1;
 
-alter table self_parent drop constraint fk_self_parent_parent_id;
-drop index ix_self_parent_parent_id;
+alter table if exists level1_level2 drop constraint if exists fk_level1_level2_level2;
+drop index if exists ix_level1_level2_level2;
 
-alter table self_ref_customer drop constraint fk_self_ref_customer_referred_1;
-drop index ix_self_ref_customer_referred_1;
+alter table if exists level2_level3 drop constraint if exists fk_level2_level3_level2;
+drop index if exists ix_level2_level3_level2;
 
-alter table self_ref_example drop constraint fk_self_ref_example_parent_id;
-drop index ix_self_ref_example_parent_id;
+alter table if exists level2_level3 drop constraint if exists fk_level2_level3_level3;
+drop index if exists ix_level2_level3_level3;
 
-alter table stockforecast drop constraint fk_stockforecast_inner_report_1;
-drop index ix_stockforecast_inner_report_1;
+alter table if exists link drop constraint if exists fk_link_id;
 
-alter table sub_section drop constraint fk_sub_section_section_id;
-drop index ix_sub_section_section_id;
+alter table if exists la_attr_value_attribute drop constraint if exists fk_la_attr_value_attribute_la_attr_value;
+drop index if exists ix_la_attr_value_attribute_la_attr_value;
 
-alter table t_detail_with_other_namexxxyy drop constraint fk_t_detail_with_other_namexx_1;
-drop index ix_t_detail_with_other_namexx_1;
+alter table if exists la_attr_value_attribute drop constraint if exists fk_la_attr_value_attribute_attribute;
+drop index if exists ix_la_attr_value_attribute_attribute;
 
-alter table ts_detail_two drop constraint fk_ts_detail_two_master_id;
-drop index ix_ts_detail_two_master_id;
+alter table if exists mprinter drop constraint if exists fk_mprinter_current_state_id;
+drop index if exists ix_mprinter_current_state_id;
 
-alter table twheel drop constraint fk_twheel_owner_plate_no;
-drop index ix_twheel_owner_plate_no;
+alter table if exists mprinter drop constraint if exists fk_mprinter_last_swap_cyan_id;
 
-alter table tire drop constraint fk_tire_wheel;
+alter table if exists mprinter drop constraint if exists fk_mprinter_last_swap_magenta_id;
 
-alter table trip drop constraint fk_trip_vehicle_driver_id;
-drop index ix_trip_vehicle_driver_id;
+alter table if exists mprinter drop constraint if exists fk_mprinter_last_swap_yellow_id;
 
-alter table trip drop constraint fk_trip_address_id;
-drop index ix_trip_address_id;
+alter table if exists mprinter drop constraint if exists fk_mprinter_last_swap_black_id;
 
-alter table type drop constraint fk_type_sub_type_id;
-drop index ix_type_sub_type_id;
+alter table if exists mprinter_state drop constraint if exists fk_mprinter_state_printer_id;
+drop index if exists ix_mprinter_state_printer_id;
 
-alter table ut_detail drop constraint fk_ut_detail_utmaster_id;
-drop index ix_ut_detail_utmaster_id;
+alter table if exists mprofile drop constraint if exists fk_mprofile_picture_id;
+drop index if exists ix_mprofile_picture_id;
 
-alter table uutwo drop constraint fk_uutwo_master_id;
-drop index ix_uutwo_master_id;
+alter table if exists mrole_muser drop constraint if exists fk_mrole_muser_mrole;
+drop index if exists ix_mrole_muser_mrole;
 
-alter table c_user drop constraint fk_c_user_group_id;
-drop index ix_c_user_group_id;
+alter table if exists mrole_muser drop constraint if exists fk_mrole_muser_muser;
+drop index if exists ix_mrole_muser_muser;
 
-alter table oto_user drop constraint fk_oto_user_account_id;
+alter table if exists muser drop constraint if exists fk_muser_user_type_id;
+drop index if exists ix_muser_user_type_id;
 
-alter table em_user_role drop constraint fk_em_user_role_user_id;
-drop index ix_em_user_role_user_id;
+alter table if exists mail_user_inbox drop constraint if exists fk_mail_user_inbox_mail_user;
+drop index if exists ix_mail_user_inbox_mail_user;
 
-alter table em_user_role drop constraint fk_em_user_role_role_id;
-drop index ix_em_user_role_role_id;
+alter table if exists mail_user_inbox drop constraint if exists fk_mail_user_inbox_mail_box;
+drop index if exists ix_mail_user_inbox_mail_box;
 
-alter table vehicle drop constraint fk_vehicle_truck_ref_id;
-drop index ix_vehicle_truck_ref_id;
+alter table if exists mail_user_outbox drop constraint if exists fk_mail_user_outbox_mail_user;
+drop index if exists ix_mail_user_outbox_mail_user;
 
-alter table vehicle drop constraint fk_vehicle_car_ref_id;
-drop index ix_vehicle_car_ref_id;
+alter table if exists mail_user_outbox drop constraint if exists fk_mail_user_outbox_mail_box;
+drop index if exists ix_mail_user_outbox_mail_box;
 
-alter table vehicle_driver drop constraint fk_vehicle_driver_vehicle_id;
-drop index ix_vehicle_driver_vehicle_id;
+alter table if exists c_message drop constraint if exists fk_c_message_conversation_id;
+drop index if exists ix_c_message_conversation_id;
 
-alter table vehicle_driver drop constraint fk_vehicle_driver_address_id;
-drop index ix_vehicle_driver_address_id;
+alter table if exists c_message drop constraint if exists fk_c_message_user_id;
+drop index if exists ix_c_message_user_id;
 
-alter table warehouses drop constraint fk_warehouses_officezoneid;
-drop index ix_warehouses_officezoneid;
+alter table if exists mnoc_user_mnoc_role drop constraint if exists fk_mnoc_user_mnoc_role_mnoc_user;
+drop index if exists ix_mnoc_user_mnoc_role_mnoc_user;
 
-alter table warehousesshippingzones drop constraint fk_warehousesshippingzones_wa_1;
-drop index ix_warehousesshippingzones_wa_1;
+alter table if exists mnoc_user_mnoc_role drop constraint if exists fk_mnoc_user_mnoc_role_mnoc_role;
+drop index if exists ix_mnoc_user_mnoc_role_mnoc_role;
 
-alter table warehousesshippingzones drop constraint fk_warehousesshippingzones_zo_2;
-drop index ix_warehousesshippingzones_sh_2;
+alter table if exists mny_b drop constraint if exists fk_mny_b_a_id;
+drop index if exists ix_mny_b_a_id;
 
-alter table sa_wheel drop constraint fk_sa_wheel_tire;
-drop index ix_sa_wheel_tire;
+alter table if exists mny_b_mny_c drop constraint if exists fk_mny_b_mny_c_mny_b;
+drop index if exists ix_mny_b_mny_c_mny_b;
 
-alter table sa_wheel drop constraint fk_sa_wheel_car;
-drop index ix_sa_wheel_car;
+alter table if exists mny_b_mny_c drop constraint if exists fk_mny_b_mny_c_mny_c;
+drop index if exists ix_mny_b_mny_c_mny_c;
 
-alter table with_zero drop constraint fk_with_zero_parent_id;
-drop index ix_with_zero_parent_id;
+alter table if exists subtopics drop constraint if exists fk_subtopics_mny_topic_1;
+drop index if exists ix_subtopics_mny_topic_1;
+
+alter table if exists subtopics drop constraint if exists fk_subtopics_mny_topic_2;
+drop index if exists ix_subtopics_mny_topic_2;
+
+alter table if exists mp_role drop constraint if exists fk_mp_role_mp_user_id;
+drop index if exists ix_mp_role_mp_user_id;
+
+alter table if exists ms_many_a_many_b drop constraint if exists fk_ms_many_a_many_b_ms_many_a;
+drop index if exists ix_ms_many_a_many_b_ms_many_a;
+
+alter table if exists ms_many_a_many_b drop constraint if exists fk_ms_many_a_many_b_ms_many_b;
+drop index if exists ix_ms_many_a_many_b_ms_many_b;
+
+alter table if exists ms_many_b_many_a drop constraint if exists fk_ms_many_b_many_a_ms_many_b;
+drop index if exists ix_ms_many_b_many_a_ms_many_b;
+
+alter table if exists ms_many_b_many_a drop constraint if exists fk_ms_many_b_many_a_ms_many_a;
+drop index if exists ix_ms_many_b_many_a_ms_many_a;
+
+alter table if exists my_lob_size_join_many drop constraint if exists fk_my_lob_size_join_many_parent_id;
+drop index if exists ix_my_lob_size_join_many_parent_id;
+
+alter table if exists o_cached_bean_country drop constraint if exists fk_o_cached_bean_country_o_cached_bean;
+drop index if exists ix_o_cached_bean_country_o_cached_bean;
+
+alter table if exists o_cached_bean_country drop constraint if exists fk_o_cached_bean_country_o_country;
+drop index if exists ix_o_cached_bean_country_o_country;
+
+alter table if exists o_cached_bean_child drop constraint if exists fk_o_cached_bean_child_cached_bean_id;
+drop index if exists ix_o_cached_bean_child_cached_bean_id;
+
+alter table if exists oengine drop constraint if exists fk_oengine_car_id;
+
+alter table if exists ogear_box drop constraint if exists fk_ogear_box_car_id;
+
+alter table if exists oroad_show_msg drop constraint if exists fk_oroad_show_msg_company_id;
+
+alter table if exists om_ordered_detail drop constraint if exists fk_om_ordered_detail_master_id;
+drop index if exists ix_om_ordered_detail_master_id;
+
+alter table if exists o_order drop constraint if exists fk_o_order_kcustomer_id;
+drop index if exists ix_o_order_kcustomer_id;
+
+alter table if exists o_order_detail drop constraint if exists fk_o_order_detail_order_id;
+drop index if exists ix_o_order_detail_order_id;
+
+alter table if exists o_order_detail drop constraint if exists fk_o_order_detail_product_id;
+drop index if exists ix_o_order_detail_product_id;
+
+alter table if exists s_order_items drop constraint if exists fk_s_order_items_order_uuid;
+drop index if exists ix_s_order_items_order_uuid;
+
+alter table if exists or_order_ship drop constraint if exists fk_or_order_ship_order_id;
+drop index if exists ix_or_order_ship_order_id;
+
+alter table if exists oto_bchild drop constraint if exists fk_oto_bchild_master_id;
+
+alter table if exists oto_child drop constraint if exists fk_oto_child_master_id;
+
+alter table if exists oto_cust_address drop constraint if exists fk_oto_cust_address_customer_cid;
+
+alter table if exists oto_prime_extra drop constraint if exists fk_oto_prime_extra_eid;
+
+alter table if exists oto_th_many drop constraint if exists fk_oto_th_many_oto_th_top_id;
+drop index if exists ix_oto_th_many_oto_th_top_id;
+
+alter table if exists oto_th_one drop constraint if exists fk_oto_th_one_many_id;
+
+alter table if exists oto_ubprime_extra drop constraint if exists fk_oto_ubprime_extra_eid;
+
+alter table if exists oto_uprime_extra drop constraint if exists fk_oto_uprime_extra_eid;
+
+alter table if exists pfile drop constraint if exists fk_pfile_file_content_id;
+
+alter table if exists pfile drop constraint if exists fk_pfile_file_content2_id;
+
+alter table if exists paggview drop constraint if exists fk_paggview_pview_id;
+
+alter table if exists pallet_location drop constraint if exists fk_pallet_location_zone_sid;
+drop index if exists ix_pallet_location_zone_sid;
+
+alter table if exists parcel_location drop constraint if exists fk_parcel_location_parcelid;
+
+alter table if exists rawinherit_parent_rawinherit_data drop constraint if exists fk_rawinherit_parent_rawinherit_data_rawinherit_parent;
+drop index if exists ix_rawinherit_parent_rawinherit_data_rawinherit_parent;
+
+alter table if exists rawinherit_parent_rawinherit_data drop constraint if exists fk_rawinherit_parent_rawinherit_data_rawinherit_data;
+drop index if exists ix_rawinherit_parent_rawinherit_data_rawinherit_data;
+
+alter table if exists parent_person drop constraint if exists fk_parent_person_some_bean_id;
+drop index if exists ix_parent_person_some_bean_id;
+
+alter table if exists parent_person drop constraint if exists fk_parent_person_parent_identifier;
+drop index if exists ix_parent_person_parent_identifier;
+
+alter table if exists c_participation drop constraint if exists fk_c_participation_conversation_id;
+drop index if exists ix_c_participation_conversation_id;
+
+alter table if exists c_participation drop constraint if exists fk_c_participation_user_id;
+drop index if exists ix_c_participation_user_id;
+
+alter table if exists persistent_file_content drop constraint if exists fk_persistent_file_content_persistent_file_id;
+
+alter table if exists person drop constraint if exists fk_person_default_address_oid;
+drop index if exists ix_person_default_address_oid;
+
+alter table if exists phones drop constraint if exists fk_phones_person_id;
+drop index if exists ix_phones_person_id;
+
+alter table if exists pp_to_ww drop constraint if exists fk_pp_to_ww_pp;
+drop index if exists ix_pp_to_ww_pp;
+
+alter table if exists pp_to_ww drop constraint if exists fk_pp_to_ww_wview;
+drop index if exists ix_pp_to_ww_wview;
+
+alter table if exists question drop constraint if exists fk_question_groupobjectid;
+drop index if exists ix_question_groupobjectid;
+
+alter table if exists r_orders drop constraint if exists fk_r_orders_customer;
+drop index if exists ix_r_orders_customer;
+
+alter table if exists resourcefile drop constraint if exists fk_resourcefile_parentresourcefileid;
+drop index if exists ix_resourcefile_parentresourcefileid;
+
+alter table if exists mt_role drop constraint if exists fk_mt_role_tenant_id;
+drop index if exists ix_mt_role_tenant_id;
+
+alter table if exists mt_role_permission drop constraint if exists fk_mt_role_permission_mt_role;
+drop index if exists ix_mt_role_permission_mt_role;
+
+alter table if exists mt_role_permission drop constraint if exists fk_mt_role_permission_mt_permission;
+drop index if exists ix_mt_role_permission_mt_permission;
+
+alter table if exists f_second drop constraint if exists fk_f_second_first;
+
+alter table if exists section drop constraint if exists fk_section_article_id;
+drop index if exists ix_section_article_id;
+
+alter table if exists self_parent drop constraint if exists fk_self_parent_parent_id;
+drop index if exists ix_self_parent_parent_id;
+
+alter table if exists self_ref_customer drop constraint if exists fk_self_ref_customer_referred_by_id;
+drop index if exists ix_self_ref_customer_referred_by_id;
+
+alter table if exists self_ref_example drop constraint if exists fk_self_ref_example_parent_id;
+drop index if exists ix_self_ref_example_parent_id;
+
+alter table if exists stockforecast drop constraint if exists fk_stockforecast_inner_report_id;
+drop index if exists ix_stockforecast_inner_report_id;
+
+alter table if exists sub_section drop constraint if exists fk_sub_section_section_id;
+drop index if exists ix_sub_section_section_id;
+
+alter table if exists tevent_many drop constraint if exists fk_tevent_many_event_id;
+drop index if exists ix_tevent_many_event_id;
+
+alter table if exists tevent_one drop constraint if exists fk_tevent_one_event_id;
+
+alter table if exists t_detail_with_other_namexxxyy drop constraint if exists fk_t_detail_with_other_namexxxyy_master_id;
+drop index if exists ix_t_detail_with_other_namexxxyy_master_id;
+
+alter table if exists ts_detail_two drop constraint if exists fk_ts_detail_two_master_id;
+drop index if exists ix_ts_detail_two_master_id;
+
+alter table if exists twheel drop constraint if exists fk_twheel_owner_plate_no;
+drop index if exists ix_twheel_owner_plate_no;
+
+alter table if exists tire drop constraint if exists fk_tire_wheel;
+
+alter table if exists trip drop constraint if exists fk_trip_vehicle_driver_id;
+drop index if exists ix_trip_vehicle_driver_id;
+
+alter table if exists trip drop constraint if exists fk_trip_address_id;
+drop index if exists ix_trip_address_id;
+
+alter table if exists type drop constraint if exists fk_type_sub_type_id;
+drop index if exists ix_type_sub_type_id;
+
+alter table if exists ut_detail drop constraint if exists fk_ut_detail_utmaster_id;
+drop index if exists ix_ut_detail_utmaster_id;
+
+alter table if exists uutwo drop constraint if exists fk_uutwo_master_id;
+drop index if exists ix_uutwo_master_id;
+
+alter table if exists c_user drop constraint if exists fk_c_user_group_id;
+drop index if exists ix_c_user_group_id;
+
+alter table if exists oto_user drop constraint if exists fk_oto_user_account_id;
+
+alter table if exists em_user_role drop constraint if exists fk_em_user_role_user_id;
+drop index if exists ix_em_user_role_user_id;
+
+alter table if exists em_user_role drop constraint if exists fk_em_user_role_role_id;
+drop index if exists ix_em_user_role_role_id;
+
+alter table if exists vehicle drop constraint if exists fk_vehicle_car_ref_id;
+drop index if exists ix_vehicle_car_ref_id;
+
+alter table if exists vehicle drop constraint if exists fk_vehicle_truck_ref_id;
+drop index if exists ix_vehicle_truck_ref_id;
+
+alter table if exists vehicle_driver drop constraint if exists fk_vehicle_driver_vehicle_id;
+drop index if exists ix_vehicle_driver_vehicle_id;
+
+alter table if exists vehicle_driver drop constraint if exists fk_vehicle_driver_address_id;
+drop index if exists ix_vehicle_driver_address_id;
+
+alter table if exists warehouses drop constraint if exists fk_warehouses_officezoneid;
+drop index if exists ix_warehouses_officezoneid;
+
+alter table if exists warehousesshippingzones drop constraint if exists fk_warehousesshippingzones_warehouses;
+drop index if exists ix_warehousesshippingzones_warehouses;
+
+alter table if exists warehousesshippingzones drop constraint if exists fk_warehousesshippingzones_zones;
+drop index if exists ix_warehousesshippingzones_zones;
+
+alter table if exists sa_wheel drop constraint if exists fk_sa_wheel_tire;
+drop index if exists ix_sa_wheel_tire;
+
+alter table if exists sa_wheel drop constraint if exists fk_sa_wheel_car;
+drop index if exists ix_sa_wheel_car;
+
+alter table if exists g_who_props_otm drop constraint if exists fk_g_who_props_otm_who_created_id;
+drop index if exists ix_g_who_props_otm_who_created_id;
+
+alter table if exists g_who_props_otm drop constraint if exists fk_g_who_props_otm_who_modified_id;
+drop index if exists ix_g_who_props_otm_who_modified_id;
+
+alter table if exists with_zero drop constraint if exists fk_with_zero_parent_id;
+drop index if exists ix_with_zero_parent_id;
 
 drop table if exists asimple_bean cascade;
 
@@ -342,11 +575,15 @@ drop table if exists bar cascade;
 
 drop table if exists oto_account cascade;
 
-drop table if exists o_address cascade;
+drop table if exists addr cascade;
 
 drop table if exists address cascade;
 
-drop table if exists animals cascade;
+drop table if exists o_address cascade;
+
+drop table if exists album cascade;
+
+drop table if exists animal cascade;
 
 drop table if exists animal_shelter cascade;
 
@@ -364,6 +601,16 @@ drop table if exists bbookmark_user cascade;
 
 drop table if exists bsimple_with_gen cascade;
 
+drop table if exists bsite cascade;
+
+drop table if exists bsite_user cascade;
+
+drop table if exists bsite_user_b cascade;
+
+drop table if exists bsite_user_c cascade;
+
+drop table if exists buser cascade;
+
 drop table if exists bwith_qident cascade;
 
 drop table if exists basic_joda_entity cascade;
@@ -373,6 +620,8 @@ drop table if exists bean_with_time_zone cascade;
 drop table if exists drel_booking cascade;
 drop sequence if exists drel_booking_seq;
 
+drop table if exists cinh_root cascade;
+
 drop table if exists ckey_assoc cascade;
 
 drop table if exists ckey_detail cascade;
@@ -393,6 +642,12 @@ drop table if exists sp_car_car_wheels cascade;
 
 drop table if exists car_accessory cascade;
 
+drop table if exists car_fuse cascade;
+
+drop table if exists category cascade;
+
+drop table if exists child_person cascade;
+
 drop table if exists configuration cascade;
 
 drop table if exists configurations cascade;
@@ -407,16 +662,62 @@ drop table if exists c_conversation cascade;
 
 drop table if exists o_country cascade;
 
+drop table if exists cover cascade;
+
 drop table if exists o_customer cascade;
 
+drop table if exists dcredit cascade;
+
+drop table if exists dcredit_drol cascade;
+
 drop table if exists dexh_entity cascade;
 
 drop table if exists dperson cascade;
 
+drop table if exists drol cascade;
+
+drop table if exists drot cascade;
+
+drop table if exists drot_drol cascade;
+
 drop table if exists rawinherit_data cascade;
 
+drop table if exists dfk_cascade cascade;
+
+drop table if exists dfk_cascade_one cascade;
+
+drop table if exists dfk_none cascade;
+
+drop table if exists dfk_none_via_join cascade;
+
+drop table if exists dfk_one cascade;
+
+drop table if exists dfk_set_null cascade;
+
+drop table if exists doc cascade;
+
+drop table if exists doc_link cascade;
+
+drop table if exists doc_link_draft cascade;
+
+drop table if exists doc_draft cascade;
+
+drop table if exists document cascade;
+
+drop table if exists document_draft cascade;
+
+drop table if exists document_media cascade;
+
+drop table if exists document_media_draft cascade;
+
+drop table if exists earray_bean cascade;
+
+drop table if exists earray_set_bean cascade;
+
 drop table if exists e_basic cascade;
 
+drop table if exists ebasic_change_log cascade;
+
 drop table if exists ebasic_clob cascade;
 
 drop table if exists ebasic_clob_fetch_eager cascade;
@@ -429,12 +730,20 @@ drop table if exists e_basicenc_bin cascade;
 
 drop table if exists e_basic_enum_id cascade;
 
+drop table if exists e_basic_eni cascade;
+
+drop table if exists ebasic_hstore cascade;
+
+drop table if exists ebasic_json_list cascade;
+
 drop table if exists ebasic_json_map cascade;
 
 drop table if exists ebasic_json_map_blob cascade;
 
 drop table if exists ebasic_json_map_clob cascade;
 
+drop table if exists ebasic_json_map_detail cascade;
+
 drop table if exists ebasic_json_map_json_b cascade;
 
 drop table if exists ebasic_json_map_varchar cascade;
@@ -447,14 +756,26 @@ drop table if exists ebasic_json_node_json_b cascade;
 
 drop table if exists ebasic_json_node_varchar cascade;
 
+drop table if exists ebasic_json_unmapped cascade;
+
 drop table if exists e_basic_ndc cascade;
 
+drop table if exists ebasic_no_sdchild cascade;
+
+drop table if exists ebasic_sdchild cascade;
+
+drop table if exists ebasic_soft_delete cascade;
+
 drop table if exists e_basicver cascade;
 
 drop table if exists e_basic_withlife cascade;
 
 drop table if exists e_basicverucon cascade;
 
+drop table if exists e_col_ab cascade;
+
+drop table if exists ecustom_id cascade;
+
 drop table if exists eemb_inner cascade;
 
 drop table if exists eemb_outer cascade;
@@ -477,12 +798,42 @@ drop table if exists eopt_one_c cascade;
 
 drop table if exists eperson cascade;
 
+drop table if exists e_person_online cascade;
+
 drop table if exists esimple cascade;
 
+drop table if exists esoft_del_book cascade;
+
+drop table if exists esoft_del_book_esoft_del_user cascade;
+
+drop table if exists esoft_del_down cascade;
+
+drop table if exists esoft_del_mid cascade;
+
+drop table if exists esoft_del_one_a cascade;
+
+drop table if exists esoft_del_one_b cascade;
+
+drop table if exists esoft_del_role cascade;
+
+drop table if exists esoft_del_role_esoft_del_user cascade;
+
+drop table if exists esoft_del_top cascade;
+
+drop table if exists esoft_del_up cascade;
+
+drop table if exists esoft_del_user cascade;
+
+drop table if exists esoft_del_user_esoft_del_role cascade;
+
+drop table if exists esome_convert_type cascade;
+
 drop table if exists esome_type cascade;
 
 drop table if exists etrans_many cascade;
 
+drop table if exists rawinherit_uncle cascade;
+
 drop table if exists evanilla_collection cascade;
 
 drop table if exists evanilla_collection_detail cascade;
@@ -495,6 +846,8 @@ drop table if exists td_child cascade;
 
 drop table if exists td_parent cascade;
 
+drop table if exists empl cascade;
+
 drop table if exists feature_desc cascade;
 
 drop table if exists f_first cascade;
@@ -504,12 +857,49 @@ drop table if exists foo cascade;
 drop table if exists gen_key_identity cascade;
 
 drop table if exists gen_key_sequence cascade;
-drop sequence if exists seq;
+drop sequence if exists SEQ;
 
 drop table if exists gen_key_table cascade;
 
+drop table if exists grand_parent_person cascade;
+
+drop table if exists survey_group cascade;
+
 drop table if exists c_group cascade;
 
+drop table if exists he_doc cascade;
+
+drop trigger if exists hx_link_history_upd on hx_link cascade;
+drop function if exists hx_link_history_version();
+
+drop view hx_link_with_history;
+alter table hx_link drop column sys_period;
+drop table hx_link_history;
+
+drop table if exists hx_link cascade;
+
+drop table if exists hx_link_doc cascade;
+
+drop table if exists hi_doc cascade;
+
+drop trigger if exists hi_link_history_upd on hi_link cascade;
+drop function if exists hi_link_history_version();
+
+drop view hi_link_with_history;
+alter table hi_link drop column sys_period;
+drop table hi_link_history;
+
+drop table if exists hi_link cascade;
+
+drop trigger if exists hi_link_doc_history_upd on hi_link_doc cascade;
+drop function if exists hi_link_doc_history_version();
+
+drop view hi_link_doc_with_history;
+alter table hi_link_doc drop column sys_period;
+drop table hi_link_doc_history;
+
+drop table if exists hi_link_doc cascade;
+
 drop table if exists imrelated cascade;
 
 drop table if exists imroot cascade;
@@ -529,6 +919,20 @@ drop sequence if exists drel_invoice_seq;
 
 drop table if exists item cascade;
 
+drop table if exists monkey cascade;
+
+drop table if exists trainer cascade;
+
+drop table if exists trainer_monkey cascade;
+
+drop table if exists troop cascade;
+
+drop table if exists troop_monkey cascade;
+
+drop table if exists l2_cldf_reset_bean cascade;
+
+drop table if exists l2_cldf_reset_bean_child cascade;
+
 drop table if exists level1 cascade;
 
 drop table if exists level1_level4 cascade;
@@ -543,6 +947,17 @@ drop table if exists level3 cascade;
 
 drop table if exists level4 cascade;
 
+drop trigger if exists link_history_upd on link cascade;
+drop function if exists link_history_version();
+
+drop view link_with_history;
+alter table link drop column sys_period;
+drop table link_history;
+
+drop table if exists link cascade;
+
+drop table if exists link_draft cascade;
+
 drop table if exists la_attr_value cascade;
 
 drop table if exists la_attr_value_attribute cascade;
@@ -569,6 +984,14 @@ drop table if exists muser cascade;
 
 drop table if exists muser_type cascade;
 
+drop table if exists mail_box cascade;
+
+drop table if exists mail_user cascade;
+
+drop table if exists mail_user_inbox cascade;
+
+drop table if exists mail_user_outbox cascade;
+
 drop table if exists map_super_actual cascade;
 
 drop table if exists c_message cascade;
@@ -579,10 +1002,30 @@ drop table if exists mnoc_user cascade;
 
 drop table if exists mnoc_user_mnoc_role cascade;
 
+drop table if exists mny_a cascade;
+
+drop table if exists mny_b cascade;
+
+drop table if exists mny_b_mny_c cascade;
+
+drop table if exists mny_c cascade;
+
+drop table if exists mny_topic cascade;
+
+drop table if exists subtopics cascade;
+
 drop table if exists mp_role cascade;
 
 drop table if exists mp_user cascade;
 
+drop table if exists ms_many_a cascade;
+
+drop table if exists ms_many_a_many_b cascade;
+
+drop table if exists ms_many_b cascade;
+
+drop table if exists ms_many_b_many_a cascade;
+
 drop table if exists my_lob_size cascade;
 
 drop table if exists my_lob_size_join_many cascade;
@@ -595,12 +1038,24 @@ drop table if exists o_cached_bean_country cascade;
 
 drop table if exists o_cached_bean_child cascade;
 
+drop table if exists o_cached_natkey cascade;
+
+drop table if exists o_cached_natkey3 cascade;
+
 drop table if exists ocar cascade;
 
+drop table if exists ocompany cascade;
+
 drop table if exists oengine cascade;
 
 drop table if exists ogear_box cascade;
 
+drop table if exists oroad_show_msg cascade;
+
+drop table if exists om_ordered_detail cascade;
+
+drop table if exists om_ordered_master cascade;
+
 drop table if exists o_order cascade;
 
 drop table if exists o_order_detail cascade;
@@ -611,10 +1066,38 @@ drop table if exists s_order_items cascade;
 
 drop table if exists or_order_ship cascade;
 
+drop table if exists organisation cascade;
+
+drop table if exists oto_bchild cascade;
+
+drop table if exists oto_bmaster cascade;
+
 drop table if exists oto_child cascade;
 
+drop table if exists oto_cust cascade;
+
+drop table if exists oto_cust_address cascade;
+
 drop table if exists oto_master cascade;
 
+drop table if exists oto_prime cascade;
+
+drop table if exists oto_prime_extra cascade;
+
+drop table if exists oto_th_many cascade;
+
+drop table if exists oto_th_one cascade;
+
+drop table if exists oto_th_top cascade;
+
+drop table if exists oto_ubprime cascade;
+
+drop table if exists oto_ubprime_extra cascade;
+
+drop table if exists oto_uprime cascade;
+
+drop table if exists oto_uprime_extra cascade;
+
 drop table if exists pfile cascade;
 
 drop table if exists pfile_content cascade;
@@ -629,7 +1112,9 @@ drop table if exists parcel_location cascade;
 
 drop table if exists rawinherit_parent cascade;
 
-drop table if exists rawinherit_parent_rawinherit_dat cascade;
+drop table if exists rawinherit_parent_rawinherit_data cascade;
+
+drop table if exists parent_person cascade;
 
 drop table if exists c_participation cascade;
 
@@ -645,12 +1130,16 @@ drop table if exists person cascade;
 
 drop table if exists phones cascade;
 
+drop table if exists primary_revision cascade;
+
 drop table if exists o_product cascade;
 
 drop table if exists pp cascade;
 
 drop table if exists pp_to_ww cascade;
 
+drop table if exists question cascade;
+
 drop table if exists rcustomer cascade;
 
 drop table if exists r_orders cascade;
@@ -659,12 +1148,12 @@ drop table if exists region cascade;
 
 drop table if exists resourcefile cascade;
 
+drop table if exists em_role cascade;
+
 drop table if exists mt_role cascade;
 
 drop table if exists mt_role_permission cascade;
 
-drop table if exists em_role cascade;
-
 drop table if exists f_second cascade;
 
 drop table if exists section cascade;
@@ -689,10 +1178,18 @@ drop table if exists sub_section cascade;
 
 drop table if exists sub_type cascade;
 
+drop table if exists survey cascade;
+
 drop table if exists tbytes_only cascade;
 
 drop table if exists tcar cascade;
 
+drop table if exists tevent cascade;
+
+drop table if exists tevent_many cascade;
+
+drop table if exists tevent_one cascade;
+
 drop table if exists tint_root cascade;
 
 drop table if exists tjoda_entity cascade;
@@ -719,18 +1216,22 @@ drop table if exists twith_pre_insert cascade;
 
 drop table if exists mt_tenant cascade;
 
-drop table if exists sa_tire cascade;
-drop sequence if exists sa_tire_seq;
+drop table if exists test_annotation_base_entity cascade;
 
 drop table if exists tire cascade;
 drop sequence if exists tire_seq;
 
+drop table if exists sa_tire cascade;
+drop sequence if exists sa_tire_seq;
+
 drop table if exists trip cascade;
 
 drop table if exists truck_ref cascade;
 
 drop table if exists type cascade;
 
+drop table if exists tz_bean cascade;
+
 drop table if exists ut_detail cascade;
 
 drop table if exists ut_master cascade;
@@ -739,11 +1240,20 @@ drop table if exists uuone cascade;
 
 drop table if exists uutwo cascade;
 
-drop table if exists em_user cascade;
+drop trigger if exists c_user_history_upd on c_user cascade;
+drop function if exists c_user_history_version();
+
+drop view c_user_with_history;
+alter table c_user drop column sys_period;
+drop table c_user_history;
+
+drop table if exists c_user cascade;
 
 drop table if exists tx_user cascade;
 
-drop table if exists c_user cascade;
+drop table if exists g_user cascade;
+
+drop table if exists em_user cascade;
 
 drop table if exists oto_user cascade;
 
@@ -760,11 +1270,13 @@ drop table if exists warehousesshippingzones cascade;
 drop table if exists sa_wheel cascade;
 drop sequence if exists sa_wheel_seq;
 
+drop table if exists wheel cascade;
+drop sequence if exists wheel_seq;
+
 drop table if exists sp_car_wheel cascade;
 drop sequence if exists sp_car_wheel_seq;
 
-drop table if exists wheel cascade;
-drop sequence if exists wheel_seq;
+drop table if exists g_who_props_otm cascade;
 
 drop table if exists with_zero cascade;
 
@@ -774,3 +1286,5 @@ drop table if exists wview cascade;
 
 drop table if exists zones cascade;
 
+drop index if exists ix_contact_last_name_first_name;
+drop index if exists ix_e_basic_name;

From 4f327c27519a04b5731b3b19be653cd2ef597ed5 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Mar 2018 20:47:48 +1300
Subject: [PATCH 0174/1036] No effective change - default h2 platform for
 testing

---
 src/test/resources/ebean.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 86880510b..3b048c4c2 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -19,7 +19,7 @@ ebean.ddl.generate=true
 ebean.ddl.run=true
 ebean.ddl.header=-- Generated by ebean ${version} at ${timestamp}
 ebean.packages=org.tests
-datasource.default=mysql
+datasource.default=h2
 
 ebean.autoReadOnlyDataSource=true
 

From 2042bdf29a78597900015f852ac360a3f54fc73d Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Mar 2018 23:23:50 +1300
Subject: [PATCH 0175/1036] #1342 - Refactor and rename DbTypeConfig to
 Platform config to support multi-platform db migration

---
 pom.xml                                       |   2 +-
 .../java/io/ebean/config/DbTypeConfig.java    | 124 -------
 .../java/io/ebean/config/PlatformConfig.java  | 335 ++++++++++++++++++
 .../io/ebean/config/PropertiesWrapper.java    |  35 +-
 .../java/io/ebean/config/ServerConfig.java    | 234 ++++--------
 .../config/dbplatform/DatabasePlatform.java   |   9 +-
 .../dbplatform/DbPlatformTypeMapping.java     |   4 +-
 .../sqlserver/SqlServerBasePlatform.java      |   4 +-
 .../dbmigration/DefaultDbMigration.java       |  19 +-
 .../server/core/DefaultContainer.java         |   2 +-
 .../server/core/InternalConfiguration.java    |   2 +-
 .../server/type/DefaultTypeManager.java       |   3 +-
 .../ebean/config/DbMigrationConfigTest.java   |   6 +-
 .../io/ebean/config/DocStoreConfigTest.java   |  10 +-
 .../config/MatchingNamingConventionTest.java  |   2 +-
 .../ebean/config/PropertiesWrapperTest.java   |  10 +-
 .../io/ebean/config/ServerConfigTest.java     |   2 +-
 .../dbplatform/DatabasePlatformTest.java      |   8 +-
 .../config/dbplatform/MySqlPlatformTest.java  |   9 +-
 .../config/dbplatform/OraclePlatformTest.java |   9 +-
 .../dbplatform/PostgresPlatformTest.java      |   4 +-
 21 files changed, 491 insertions(+), 342 deletions(-)
 delete mode 100644 src/main/java/io/ebean/config/DbTypeConfig.java
 create mode 100644 src/main/java/io/ebean/config/PlatformConfig.java

diff --git a/pom.xml b/pom.xml
index 9d9eee542..f5e65dff5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.14.4-SNAPSHOT</version>
+  <version>11.15.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
diff --git a/src/main/java/io/ebean/config/DbTypeConfig.java b/src/main/java/io/ebean/config/DbTypeConfig.java
deleted file mode 100644
index 3a48dbd32..000000000
--- a/src/main/java/io/ebean/config/DbTypeConfig.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package io.ebean.config;
-
-import io.ebean.config.dbplatform.DbType;
-import io.ebean.config.dbplatform.IdType;
-import io.ebean.annotation.Platform;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Configuration for DB types such as UUID, Geometry etc.
- */
-public class DbTypeConfig {
-
-  /**
-   * The Geometry SRID value (default 4326).
-   */
-  private int geometrySRID = 4326;
-
-  /**
-   * Set for DB's that support both Sequence and Identity (and the default choice is not desired).
-   */
-  private IdType idType;
-
-  /**
-   * Setting to indicate if UUID should be stored as binary(16) or varchar(40) or native DB type (for H2 and Postgres).
-   */
-  private ServerConfig.DbUuid dbUuid = ServerConfig.DbUuid.AUTO_VARCHAR;
-
-  /**
-   * Modify the default mapping of standard types such as default precision for DECIMAL etc.
-   */
-  private List<CustomDbTypeMapping> customDbTypeMappings = new ArrayList<>();
-
-  /**
-   * Return the Geometry SRID.
-   */
-  public int getGeometrySRID() {
-    return geometrySRID;
-  }
-
-  /**
-   * Set the Geometry SRID.
-   */
-  public void setGeometrySRID(int geometrySRID) {
-    this.geometrySRID = geometrySRID;
-  }
-
-  /**
-   * Return the DB type used to store UUID.
-   */
-  public ServerConfig.DbUuid getDbUuid() {
-    return dbUuid;
-  }
-
-  /**
-   * Set the DB type used to store UUID.
-   */
-  public void setDbUuid(ServerConfig.DbUuid dbUuid) {
-    this.dbUuid = dbUuid;
-  }
-
-  /**
-   * Return the IdType to use (or null for the default choice).
-   */
-  public IdType getIdType() {
-    return idType;
-  }
-
-  /**
-   * Set the IdType to use (when the DB supports both SEQUENCE and IDENTITY and the default is not desired).
-   */
-  public void setIdType(IdType idType) {
-    this.idType = idType;
-  }
-
-  /**
-   * Add a custom type mapping.
-   * <p>
-   * <pre>{@code
-   *
-   *   // set the default mapping for BigDecimal.class/decimal
-   *   serverConfig.addCustomMapping(DbType.DECIMAL, "decimal(18,6)");
-   *
-   *   // set the default mapping for String.class/varchar but only for Postgres
-   *   serverConfig.addCustomMapping(DbType.VARCHAR, "text", Platform.POSTGRES);
-   *
-   * }</pre>
-   *
-   * @param type             The DB type this mapping should apply to
-   * @param columnDefinition The column definition that should be used
-   * @param platform         Optionally specify the platform this mapping should apply to.
-   */
-  public void addCustomMapping(DbType type, String columnDefinition, Platform platform) {
-    customDbTypeMappings.add(new CustomDbTypeMapping(type, columnDefinition, platform));
-  }
-
-  /**
-   * Add a custom type mapping that applies to all platforms.
-   * <p>
-   * <pre>{@code
-   *
-   *   // set the default mapping for BigDecimal/decimal
-   *   serverConfig.addCustomMapping(DbType.DECIMAL, "decimal(18,6)");
-   *
-   *   // set the default mapping for String/varchar
-   *   serverConfig.addCustomMapping(DbType.VARCHAR, "text");
-   *
-   * }</pre>
-   *
-   * @param type             The DB type this mapping should apply to
-   * @param columnDefinition The column definition that should be used
-   */
-  public void addCustomMapping(DbType type, String columnDefinition) {
-    customDbTypeMappings.add(new CustomDbTypeMapping(type, columnDefinition));
-  }
-
-  /**
-   * Return the list of custom type mappings.
-   */
-  public List<CustomDbTypeMapping> getCustomTypeMappings() {
-    return customDbTypeMappings;
-  }
-}
diff --git a/src/main/java/io/ebean/config/PlatformConfig.java b/src/main/java/io/ebean/config/PlatformConfig.java
new file mode 100644
index 000000000..9a0ada54b
--- /dev/null
+++ b/src/main/java/io/ebean/config/PlatformConfig.java
@@ -0,0 +1,335 @@
+package io.ebean.config;
+
+import io.ebean.annotation.Platform;
+import io.ebean.config.dbplatform.DbType;
+import io.ebean.config.dbplatform.IdType;
+import io.ebean.util.StringHelper;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+/**
+ * Configuration for DB types such as UUID, Geometry etc.
+ */
+public class PlatformConfig {
+
+  private boolean allQuotedIdentifiers;
+
+  /**
+   * The database boolean true value (typically either 1, T, or Y).
+   */
+  private String databaseBooleanTrue;
+
+  /**
+   * The database boolean false value (typically either 0, F or N).
+   */
+  private String databaseBooleanFalse;
+
+  /**
+   * For DB's using sequences this is the number of sequence values prefetched.
+   */
+  private int databaseSequenceBatchSize = 20;
+
+  /**
+   * Set for DB's that support both Sequence and Identity (and the default choice is not desired).
+   */
+  private IdType idType;
+
+  /**
+   * The Geometry SRID value (default 4326).
+   */
+  private int geometrySRID = 4326;
+
+  /**
+   * Setting to indicate if UUID should be stored as binary(16) or varchar(40) or native DB type (for H2 and Postgres).
+   */
+  private DbUuid dbUuid = DbUuid.AUTO_VARCHAR;
+
+  /**
+   * Modify the default mapping of standard types such as default precision for DECIMAL etc.
+   */
+  private List<CustomDbTypeMapping> customDbTypeMappings = new ArrayList<>();
+
+  /**
+   * Construct with defaults.
+   */
+  public PlatformConfig() {
+
+  }
+
+  /**
+   * Construct based on given config - typically for DbMigration generation with many platforms.
+   */
+  public PlatformConfig(PlatformConfig platformConfig) {
+    this.databaseBooleanFalse = platformConfig.databaseBooleanFalse;
+    this.databaseBooleanTrue = platformConfig.databaseBooleanTrue;
+    this.databaseSequenceBatchSize = platformConfig.databaseSequenceBatchSize;
+    this.idType = platformConfig.idType;
+    this.geometrySRID = platformConfig.geometrySRID;
+    this.dbUuid = platformConfig.dbUuid;
+  }
+
+  /**
+   * Return true if all DB column and table names should use quoted identifiers.
+   */
+  public boolean isAllQuotedIdentifiers() {
+    return allQuotedIdentifiers;
+  }
+
+  /**
+   * Set to true if all DB column and table names should use quoted identifiers.
+   */
+  public void setAllQuotedIdentifiers(boolean allQuotedIdentifiers) {
+    this.allQuotedIdentifiers = allQuotedIdentifiers;
+  }
+
+  /**
+   * Return a value used to represent TRUE in the database.
+   * <p>
+   * This is used for databases that do not support boolean natively.
+   * </p>
+   * <p>
+   * The value returned is either a Integer or a String (e.g. "1", or "T").
+   * </p>
+   */
+  public String getDatabaseBooleanTrue() {
+    return databaseBooleanTrue;
+  }
+
+  /**
+   * Set the value to represent TRUE in the database.
+   * <p>
+   * This is used for databases that do not support boolean natively.
+   * </p>
+   * <p>
+   * The value set is either a Integer or a String (e.g. "1", or "T").
+   * </p>
+   */
+  public void setDatabaseBooleanTrue(String databaseBooleanTrue) {
+    this.databaseBooleanTrue = databaseBooleanTrue;
+  }
+
+  /**
+   * Return a value used to represent FALSE in the database.
+   */
+  public String getDatabaseBooleanFalse() {
+    return databaseBooleanFalse;
+  }
+
+  /**
+   * Set the value used to represent FALSE in the database.
+   */
+  public void setDatabaseBooleanFalse(String databaseBooleanFalse) {
+    this.databaseBooleanFalse = databaseBooleanFalse;
+  }
+
+  /**
+   * Return the number of DB sequence values that should be preallocated.
+   */
+  public int getDatabaseSequenceBatchSize() {
+    return databaseSequenceBatchSize;
+  }
+
+  /**
+   * Set the number of DB sequence values that should be preallocated.
+   */
+  public void setDatabaseSequenceBatchSize(int databaseSequenceBatchSize) {
+    this.databaseSequenceBatchSize = databaseSequenceBatchSize;
+  }
+
+  /**
+   * Return the Geometry SRID.
+   */
+  public int getGeometrySRID() {
+    return geometrySRID;
+  }
+
+  /**
+   * Set the Geometry SRID.
+   */
+  public void setGeometrySRID(int geometrySRID) {
+    this.geometrySRID = geometrySRID;
+  }
+
+  /**
+   * Return the DB type used to store UUID.
+   */
+  public DbUuid getDbUuid() {
+    return dbUuid;
+  }
+
+  /**
+   * Set the DB type used to store UUID.
+   */
+  public void setDbUuid(DbUuid dbUuid) {
+    this.dbUuid = dbUuid;
+  }
+
+  /**
+   * Return the IdType to use (or null for the default choice).
+   */
+  public IdType getIdType() {
+    return idType;
+  }
+
+  /**
+   * Set the IdType to use (when the DB supports both SEQUENCE and IDENTITY and the default is not desired).
+   */
+  public void setIdType(IdType idType) {
+    this.idType = idType;
+  }
+
+  /**
+   * Add a custom type mapping.
+   * <p>
+   * <pre>{@code
+   *
+   *   // set the default mapping for BigDecimal.class/decimal
+   *   serverConfig.addCustomMapping(DbType.DECIMAL, "decimal(18,6)");
+   *
+   *   // set the default mapping for String.class/varchar but only for Postgres
+   *   serverConfig.addCustomMapping(DbType.VARCHAR, "text", Platform.POSTGRES);
+   *
+   * }</pre>
+   *
+   * @param type             The DB type this mapping should apply to
+   * @param columnDefinition The column definition that should be used
+   * @param platform         Optionally specify the platform this mapping should apply to.
+   */
+  public void addCustomMapping(DbType type, String columnDefinition, Platform platform) {
+    customDbTypeMappings.add(new CustomDbTypeMapping(type, columnDefinition, platform));
+  }
+
+  /**
+   * Add a custom type mapping that applies to all platforms.
+   * <p>
+   * <pre>{@code
+   *
+   *   // set the default mapping for BigDecimal/decimal
+   *   serverConfig.addCustomMapping(DbType.DECIMAL, "decimal(18,6)");
+   *
+   *   // set the default mapping for String/varchar
+   *   serverConfig.addCustomMapping(DbType.VARCHAR, "text");
+   *
+   * }</pre>
+   *
+   * @param type             The DB type this mapping should apply to
+   * @param columnDefinition The column definition that should be used
+   */
+  public void addCustomMapping(DbType type, String columnDefinition) {
+    customDbTypeMappings.add(new CustomDbTypeMapping(type, columnDefinition));
+  }
+
+  /**
+   * Return the list of custom type mappings.
+   */
+  public List<CustomDbTypeMapping> getCustomTypeMappings() {
+    return customDbTypeMappings;
+  }
+
+  public void loadSettings(PropertiesWrapper p) {
+
+    idType = p.getEnum(IdType.class, "idType", idType);
+    databaseSequenceBatchSize = p.getInt("databaseSequenceBatchSize", databaseSequenceBatchSize);
+    databaseBooleanTrue = p.get("databaseBooleanTrue", databaseBooleanTrue);
+    databaseBooleanFalse = p.get("databaseBooleanFalse", databaseBooleanFalse);
+
+    DbUuid dbUuid = p.getEnum(DbUuid.class, "dbuuid", null);
+    if (dbUuid != null) {
+      setDbUuid(dbUuid);
+    }
+    if (p.getBoolean("uuidStoreAsBinary", false)) {
+      setDbUuid(DbUuid.BINARY);
+    }
+
+    int srid = p.getInt("geometrySRID", 0);
+    if (srid > 0) {
+      setGeometrySRID(srid);
+    }
+
+    // Mapping is specified in the form: BOOLEAN=int(1);BIT=int(1);
+    String mapping = p.get("mapping");
+    if (mapping != null && !mapping.isEmpty()) {
+      Map<String, String> map = StringHelper.delimitedToMap(mapping, ";", "=");
+      for (Entry<String, String> entry : map.entrySet()) {
+        addCustomMapping(DbType.valueOf(entry.getKey()), entry.getValue());
+      }
+    }
+
+    boolean quotedIdentifiers = p.getBoolean("allQuotedIdentifiers", allQuotedIdentifiers);
+    if (quotedIdentifiers != allQuotedIdentifiers) {
+      // potentially also set to use matching naming convention
+      setAllQuotedIdentifiers(quotedIdentifiers);
+    }
+  }
+
+  /**
+   * Specify how UUID is stored.
+   */
+  public enum DbUuid {
+
+
+    /**
+     * Store using native UUID in H2 and Postgres and otherwise fallback to VARCHAR(40).
+     */
+    AUTO_VARCHAR(true, false, false),
+
+    /**
+     * Store using native UUID in H2 and Postgres and otherwise fallback to BINARY(16).
+     */
+    AUTO_BINARY(true, true, false),
+
+    /**
+     * Store using native UUID in H2 and Postgres and otherwise fallback to BINARY(16) with optimized packing.
+     */
+    AUTO_BINARY_OPTIMIZED(true, true, true),
+
+    /**
+     * Store using DB VARCHAR(40).
+     */
+    VARCHAR(false, false, false),
+
+    /**
+     * Store using DB BINARY(16).
+     */
+    BINARY(false, true, false),
+
+    /**
+     * Store using DB BINARY(16).
+     */
+    BINARY_OPTIMIZED(false, true, true);
+
+    boolean nativeType;
+    boolean binary;
+    boolean binaryOptimized;
+
+    DbUuid(boolean nativeType, boolean binary, boolean binaryOptimized) {
+      this.nativeType = nativeType;
+      this.binary = binary;
+      this.binaryOptimized = binaryOptimized;
+    }
+
+    /**
+     * Return true if native UUID type is preferred.
+     */
+    public boolean useNativeType() {
+      return nativeType;
+    }
+
+    /**
+     * Return true if BINARY(16) storage is preferred over VARCHAR(40).
+     */
+    public boolean useBinary() {
+      return binary;
+    }
+
+    /**
+     * Return true, if optimized packing should be used.
+     */
+    public boolean useBinaryOptimized() {
+      return binaryOptimized;
+    }
+  }
+}
diff --git a/src/main/java/io/ebean/config/PropertiesWrapper.java b/src/main/java/io/ebean/config/PropertiesWrapper.java
index a3d9f0364..c739a8dda 100644
--- a/src/main/java/io/ebean/config/PropertiesWrapper.java
+++ b/src/main/java/io/ebean/config/PropertiesWrapper.java
@@ -10,20 +10,23 @@ public class PropertiesWrapper {
 
   protected final String serverName;
 
+  private final ClassLoadConfig classLoadConfig;
+
   /**
    * Construct with a prefix, serverName and properties.
    */
-  public PropertiesWrapper(String prefix, String serverName, Properties properties) {
+  public PropertiesWrapper(String prefix, String serverName, Properties properties, ClassLoadConfig classLoadConfig) {
     this.serverName = serverName;
     this.prefix = prefix;
     this.properties = properties;
+    this.classLoadConfig = classLoadConfig;
   }
 
   /**
    * Construct without prefix of serverName.
    */
-  public PropertiesWrapper(Properties properties) {
-    this(null, null, properties);
+  public PropertiesWrapper(Properties properties, ClassLoadConfig classLoadConfig) {
+    this(null, null, properties, classLoadConfig);
   }
 
   /**
@@ -115,4 +118,30 @@ public class PropertiesWrapper {
     return (level == null) ? defaultValue : Enum.valueOf(enumType, level.toUpperCase());
   }
 
+  /**
+   * Return the instance to use (can be null) for the given plugin.
+   *
+   * @param pluginType the type of plugin
+   * @param key        properties key
+   * @param instance   existing instance
+   */
+  public <T> T createInstance(Class<T> pluginType, String key, T instance) {
+
+    if (instance != null) {
+      return instance;
+    }
+    String classname = get(key, null);
+    return createInstance(pluginType, classname);
+  }
+
+  /**
+   * Return the instance to use (can be null) for the given plugin.
+   *
+   * @param pluginType the type of plugin
+   * @param classname  the implementation class as per properties
+   */
+  @SuppressWarnings("unchecked")
+  public <T> T createInstance(Class<T> pluginType, String classname) {
+    return classname == null ? null : (T) classLoadConfig.newInstance(classname);
+  }
 }
diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index f32473ec6..f4b59039c 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -183,16 +183,6 @@ public class ServerConfig {
    */
   private DatabasePlatform databasePlatform;
 
-  /**
-   * The preferred IdType (to override the default Platform type).
-   */
-  private IdType idType;
-
-  /**
-   * For DB's using sequences this is the number of sequence values prefetched.
-   */
-  private int databaseSequenceBatchSize = 20;
-
   /**
    * JDBC fetchSize hint when using findList.  Defaults to 0 leaving it up to the JDBC driver.
    */
@@ -330,18 +320,6 @@ public class ServerConfig {
    */
   private String dataSourceJndiName;
 
-  /**
-   * The database boolean true value (typically either 1, T, or Y).
-   */
-  private String databaseBooleanTrue;
-
-  /**
-   * The database boolean false value (typically either 0, F or N).
-   */
-  private String databaseBooleanFalse;
-
-  private boolean allQuotedIdentifiers;
-
   /**
    * The naming convention.
    */
@@ -368,9 +346,9 @@ public class ServerConfig {
   private boolean updatesDeleteMissingChildren = true;
 
   /**
-   * Database type configuration.
+   * Database platform configuration.
    */
-  private DbTypeConfig dbTypeConfig = new DbTypeConfig();
+  private PlatformConfig platformConfig = new PlatformConfig();
 
   /**
    * The UUID version to use.
@@ -946,7 +924,7 @@ public class ServerConfig {
    * </p>
    */
   public void setDatabaseSequenceBatchSize(int databaseSequenceBatchSize) {
-    this.databaseSequenceBatchSize = databaseSequenceBatchSize;
+    platformConfig.setDatabaseSequenceBatchSize(databaseSequenceBatchSize);
   }
 
   /**
@@ -1128,14 +1106,14 @@ public class ServerConfig {
    * Return the Geometry SRID.
    */
   public int getGeometrySRID() {
-    return dbTypeConfig.getGeometrySRID();
+    return platformConfig.getGeometrySRID();
   }
 
   /**
    * Set the Geometry SRID.
    */
   public void setGeometrySRID(int geometrySRID) {
-    dbTypeConfig.setGeometrySRID(geometrySRID);
+    platformConfig.setGeometrySRID(geometrySRID);
   }
 
   /**
@@ -1425,15 +1403,21 @@ public class ServerConfig {
    * Return true if all DB column and table names should use quoted identifiers.
    */
   public boolean isAllQuotedIdentifiers() {
-    return allQuotedIdentifiers;
+    return platformConfig.isAllQuotedIdentifiers();
   }
 
   /**
    * Set to true if all DB column and table names should use quoted identifiers.
    */
   public void setAllQuotedIdentifiers(boolean allQuotedIdentifiers) {
-    this.allQuotedIdentifiers = allQuotedIdentifiers;
-    if (allQuotedIdentifiers && namingConvention instanceof UnderscoreNamingConvention) {
+    platformConfig.setAllQuotedIdentifiers(allQuotedIdentifiers);
+    if (allQuotedIdentifiers) {
+      adjustNamingConventionForAllQuoted();
+    }
+  }
+
+  private void adjustNamingConventionForAllQuoted() {
+    if (namingConvention instanceof UnderscoreNamingConvention) {
       // we need to use matching naming convention
       this.namingConvention = new MatchingNamingConvention();
     }
@@ -1648,7 +1632,7 @@ public class ServerConfig {
    * </p>
    */
   public String getDatabaseBooleanTrue() {
-    return databaseBooleanTrue;
+    return platformConfig.getDatabaseBooleanTrue();
   }
 
   /**
@@ -1661,7 +1645,7 @@ public class ServerConfig {
    * </p>
    */
   public void setDatabaseBooleanTrue(String databaseTrue) {
-    this.databaseBooleanTrue = databaseTrue;
+    platformConfig.setDatabaseBooleanTrue(databaseTrue);
   }
 
   /**
@@ -1674,7 +1658,7 @@ public class ServerConfig {
    * </p>
    */
   public String getDatabaseBooleanFalse() {
-    return databaseBooleanFalse;
+    return platformConfig.getDatabaseBooleanFalse();
   }
 
   /**
@@ -1687,14 +1671,14 @@ public class ServerConfig {
    * </p>
    */
   public void setDatabaseBooleanFalse(String databaseFalse) {
-    this.databaseBooleanFalse = databaseFalse;
+    this.platformConfig.setDatabaseBooleanFalse(databaseFalse);
   }
 
   /**
    * Return the number of DB sequence values that should be preallocated.
    */
   public int getDatabaseSequenceBatchSize() {
-    return databaseSequenceBatchSize;
+    return platformConfig.getDatabaseSequenceBatchSize();
   }
 
   /**
@@ -1713,7 +1697,7 @@ public class ServerConfig {
    * </p>
    */
   public void setDatabaseSequenceBatch(int databaseSequenceBatchSize) {
-    this.databaseSequenceBatchSize = databaseSequenceBatchSize;
+    this.platformConfig.setDatabaseSequenceBatchSize(databaseSequenceBatchSize);
   }
 
   /**
@@ -1769,14 +1753,14 @@ public class ServerConfig {
    * Return the preferred DB platform IdType.
    */
   public IdType getIdType() {
-    return idType;
+    return platformConfig.getIdType();
   }
 
   /**
    * Set the preferred DB platform IdType.
    */
   public void setIdType(IdType idType) {
-    this.idType = idType;
+    this.platformConfig.setIdType(idType);
   }
 
   /**
@@ -1889,15 +1873,22 @@ public class ServerConfig {
   /**
    * Return the configuration for DB types (such as UUID and custom mappings).
    */
-  public DbTypeConfig getDbTypeConfig() {
-    return dbTypeConfig;
+  public PlatformConfig getPlatformConfig() {
+    return platformConfig;
+  }
+
+  /**
+   * Set the configuration for DB platform (such as UUID and custom mappings).
+   */
+  public void setPlatformConfig(PlatformConfig platformConfig) {
+    this.platformConfig = platformConfig;
   }
 
   /**
    * Set the DB type used to store UUID.
    */
-  public void setDbUuid(DbUuid dbUuid) {
-    this.dbTypeConfig.setDbUuid(dbUuid);
+  public void setDbUuid(PlatformConfig.DbUuid dbUuid) {
+    this.platformConfig.setDbUuid(dbUuid);
   }
 
   /**
@@ -2353,7 +2344,7 @@ public class ServerConfig {
    * @param platform         Optionally specify the platform this mapping should apply to.
    */
   public void addCustomMapping(DbType type, String columnDefinition, Platform platform) {
-    dbTypeConfig.addCustomMapping(type, columnDefinition, platform);
+    platformConfig.addCustomMapping(type, columnDefinition, platform);
   }
 
   /**
@@ -2373,7 +2364,7 @@ public class ServerConfig {
    * @param columnDefinition The column definition that should be used
    */
   public void addCustomMapping(DbType type, String columnDefinition) {
-    dbTypeConfig.addCustomMapping(type, columnDefinition);
+    platformConfig.addCustomMapping(type, columnDefinition);
   }
 
   /**
@@ -2660,7 +2651,7 @@ public class ServerConfig {
    */
   private void configureFromProperties() {
     autoConfiguration();
-    PropertiesWrapper p = new PropertiesWrapper("ebean", name, properties);
+    PropertiesWrapper p = new PropertiesWrapper("ebean", name, properties, classLoadConfig);
     loadSettings(p);
   }
 
@@ -2695,34 +2686,6 @@ public class ServerConfig {
     return properties;
   }
 
-  /**
-   * Return the instance to use (can be null) for the given plugin.
-   *
-   * @param properties the properties
-   * @param pluginType the type of plugin
-   * @param key        properties key
-   * @param instance   existing instance
-   */
-  protected <T> T createInstance(PropertiesWrapper properties, Class<T> pluginType, String key, T instance) {
-
-    if (instance != null) {
-      return instance;
-    }
-    String classname = properties.get(key, null);
-    return createInstance(pluginType, classname);
-  }
-
-  /**
-   * Return the instance to use (can be null) for the given plugin.
-   *
-   * @param pluginType the type of plugin
-   * @param classname  the implementation class as per properties
-   */
-  @SuppressWarnings("unchecked")
-  protected <T> T createInstance(Class<T> pluginType, String classname) {
-    return classname == null ? null : (T) classLoadConfig.newInstance(classname);
-  }
-
   /**
    * loads the data source settings to preserve existing behaviour. IMHO, if someone has set the datasource config already,
    * they don't want the settings to be reloaded and reset. This allows a descending class to override this behaviour and prevent it
@@ -2756,11 +2719,9 @@ public class ServerConfig {
 
     profilingConfig.loadSettings(p, name);
     migrationConfig.loadSettings(p, name);
-
-    boolean quotedIdentifiers = p.getBoolean("allQuotedIdentifiers", allQuotedIdentifiers);
-    if (quotedIdentifiers != allQuotedIdentifiers) {
-      // potentially also set to use matching naming convention
-      setAllQuotedIdentifiers(quotedIdentifiers);
+    platformConfig.loadSettings(p);
+    if (platformConfig.isAllQuotedIdentifiers()) {
+      adjustNamingConventionForAllQuoted();
     }
     namingConvention = createNamingConvention(p, namingConvention);
     if (namingConvention != null) {
@@ -2781,11 +2742,6 @@ public class ServerConfig {
     }
     loadDocStoreSettings(p);
 
-    int srid = p.getInt("geometrySRID", 0);
-    if (srid > 0) {
-      dbTypeConfig.setGeometrySRID(srid);
-    }
-
     queryPlanTTLSeconds = p.getInt("queryPlanTTLSeconds", queryPlanTTLSeconds);
     slowQueryMillis = p.getLong("slowQueryMillis", slowQueryMillis);
     docStoreOnly = p.getBoolean("docStoreOnly", docStoreOnly);
@@ -2800,14 +2756,14 @@ public class ServerConfig {
     backgroundExecutorSchedulePoolSize = p.getInt("backgroundExecutorSchedulePoolSize", backgroundExecutorSchedulePoolSize);
     backgroundExecutorShutdownSecs = p.getInt("backgroundExecutorShutdownSecs", backgroundExecutorShutdownSecs);
     disableClasspathSearch = p.getBoolean("disableClasspathSearch", disableClasspathSearch);
-    currentUserProvider = createInstance(p, CurrentUserProvider.class, "currentUserProvider", currentUserProvider);
-    databasePlatform = createInstance(p, DatabasePlatform.class, "databasePlatform", databasePlatform);
-    encryptKeyManager = createInstance(p, EncryptKeyManager.class, "encryptKeyManager", encryptKeyManager);
-    encryptDeployManager = createInstance(p, EncryptDeployManager.class, "encryptDeployManager", encryptDeployManager);
-    encryptor = createInstance(p, Encryptor.class, "encryptor", encryptor);
-    dbEncrypt = createInstance(p, DbEncrypt.class, "dbEncrypt", dbEncrypt);
+    currentUserProvider = p.createInstance(CurrentUserProvider.class, "currentUserProvider", currentUserProvider);
+    databasePlatform = p.createInstance(DatabasePlatform.class, "databasePlatform", databasePlatform);
+    encryptKeyManager = p.createInstance(EncryptKeyManager.class, "encryptKeyManager", encryptKeyManager);
+    encryptDeployManager = p.createInstance(EncryptDeployManager.class, "encryptDeployManager", encryptDeployManager);
+    encryptor = p.createInstance(Encryptor.class, "encryptor", encryptor);
+    dbEncrypt = p.createInstance(DbEncrypt.class, "dbEncrypt", dbEncrypt);
     dbOffline = p.getBoolean("dbOffline", dbOffline);
-    serverCachePlugin = createInstance(p, ServerCachePlugin.class, "serverCachePlugin", serverCachePlugin);
+    serverCachePlugin = p.createInstance(ServerCachePlugin.class, "serverCachePlugin", serverCachePlugin);
 
     if (packages != null) {
       String packagesProp = p.get("search.packages", p.get("packages", null));
@@ -2828,7 +2784,6 @@ public class ServerConfig {
       throw new IllegalArgumentException("Property 'batch.mode' or 'persistBatching' is being set but no longer used. Please change to use 'persistBatchMode'");
     }
 
-    idType = p.getEnum(IdType.class, "idType", idType);
     persistBatch = p.getEnum(PersistBatch.class, "persistBatch", persistBatch);
     persistBatchOnCascade = p.getEnum(PersistBatch.class, "persistBatchOnCascade", persistBatchOnCascade);
 
@@ -2849,20 +2804,9 @@ public class ServerConfig {
     dataSourceJndiName = p.get("dataSourceJndiName", dataSourceJndiName);
     jdbcFetchSizeFindEach = p.getInt("jdbcFetchSizeFindEach", jdbcFetchSizeFindEach);
     jdbcFetchSizeFindList = p.getInt("jdbcFetchSizeFindList", jdbcFetchSizeFindList);
-    databaseSequenceBatchSize = p.getInt("databaseSequenceBatchSize", databaseSequenceBatchSize);
-    databaseBooleanTrue = p.get("databaseBooleanTrue", databaseBooleanTrue);
-    databaseBooleanFalse = p.get("databaseBooleanFalse", databaseBooleanFalse);
     databasePlatformName = p.get("databasePlatformName", databasePlatformName);
     defaultOrderById = p.getBoolean("defaultOrderById", defaultOrderById);
 
-    DbUuid dbUuid = p.getEnum(DbUuid.class, "dbuuid", null);
-    if (dbUuid != null) {
-      dbTypeConfig.setDbUuid(dbUuid);
-    }
-    if (p.getBoolean("uuidStoreAsBinary", false)) {
-      dbTypeConfig.setDbUuid(DbUuid.BINARY);
-    }
-
     uuidVersion = p.getEnum(UuidVersion.class, "uuidVersion", uuidVersion);
     uuidStateFile = p.get("uuidStateFile", uuidStateFile);
 
@@ -2898,16 +2842,15 @@ public class ServerConfig {
       }
     }
 
-    currentTenantProvider = createInstance(p, CurrentTenantProvider.class, "tenant.currentTenantProvider", currentTenantProvider);
-    tenantCatalogProvider = createInstance(p, TenantCatalogProvider.class, "tenant.catalogProvider", tenantCatalogProvider);
-    tenantSchemaProvider = createInstance(p, TenantSchemaProvider.class, "tenant.schemaProvider", tenantSchemaProvider);
+    currentTenantProvider = p.createInstance(CurrentTenantProvider.class, "tenant.currentTenantProvider", currentTenantProvider);
+    tenantCatalogProvider = p.createInstance(TenantCatalogProvider.class, "tenant.catalogProvider", tenantCatalogProvider);
+    tenantSchemaProvider = p.createInstance(TenantSchemaProvider.class, "tenant.schemaProvider", tenantSchemaProvider);
     tenantPartitionColumn = p.get("tenant.partitionColumn", tenantPartitionColumn);
     classes = getClasses(p);
   }
 
   private NamingConvention createNamingConvention(PropertiesWrapper properties, NamingConvention namingConvention) {
-
-    NamingConvention nc = createInstance(properties, NamingConvention.class, "namingconvention", null);
+    NamingConvention nc = properties.createInstance(NamingConvention.class, "namingconvention", null);
     return (nc != null) ? nc : namingConvention;
   }
 
@@ -3098,71 +3041,24 @@ public class ServerConfig {
   }
 
   /**
-   * Specify how UUID is stored.
+   * Create a new PlatformConfig based of the one held but with overridden properties by reading
+   * properties with the given path and prefix.
+   * <p>
+   * Typically used in Db Migration generation for many platform targets that might have different
+   * configuration for IdType, UUID, quoted identifiers etc.
+   * </p>
+   *
+   * @param propertiesPath The properties path used for loading and setting properties
+   * @param platformPrefix The prefix used for loading and setting properties
+   * @return A copy of the PlatformConfig with overridden properties
    */
-  public enum DbUuid {
+  public PlatformConfig newPlatformConfig(String propertiesPath, String platformPrefix) {
 
+    PropertiesWrapper p = new PropertiesWrapper(propertiesPath, platformPrefix, properties, classLoadConfig);
 
-    /**
-     * Store using native UUID in H2 and Postgres and otherwise fallback to VARCHAR(40).
-     */
-    AUTO_VARCHAR(true, false, false),
-
-    /**
-     * Store using native UUID in H2 and Postgres and otherwise fallback to BINARY(16).
-     */
-    AUTO_BINARY(true, true, false),
-
-    /**
-     * Store using native UUID in H2 and Postgres and otherwise fallback to BINARY(16) with optimized packing.
-     */
-    AUTO_BINARY_OPTIMIZED(true, true, true),
-
-    /**
-     * Store using DB VARCHAR(40).
-     */
-    VARCHAR(false, false, false),
-
-    /**
-     * Store using DB BINARY(16).
-     */
-    BINARY(false, true, false),
-
-    /**
-     * Store using DB BINARY(16).
-     */
-    BINARY_OPTIMIZED(false, true, true);
-
-    boolean nativeType;
-    boolean binary;
-    boolean binaryOptimized;
-
-    DbUuid(boolean nativeType, boolean binary, boolean binaryOptimized) {
-      this.nativeType = nativeType;
-      this.binary = binary;
-      this.binaryOptimized = binaryOptimized;
-    }
-
-    /**
-     * Return true if native UUID type is preferred.
-     */
-    public boolean useNativeType() {
-      return nativeType;
-    }
-
-    /**
-     * Return true if BINARY(16) storage is preferred over VARCHAR(40).
-     */
-    public boolean useBinary() {
-      return binary;
-    }
-
-    /**
-     * Return true, if optimized packing should be used.
-     */
-    public boolean useBinaryOptimized() {
-      return binaryOptimized;
-    }
+    PlatformConfig config = new PlatformConfig(platformConfig);
+    config.loadSettings(p);
+    return config;
   }
 
   public enum UuidVersion {
diff --git a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
index 166a9b5df..c1a014095 100644
--- a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
@@ -5,8 +5,7 @@ import io.ebean.Query;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
 import io.ebean.config.CustomDbTypeMapping;
-import io.ebean.config.DbTypeConfig;
-import io.ebean.config.ServerConfig;
+import io.ebean.config.PlatformConfig;
 import io.ebean.util.JdbcClose;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -215,16 +214,16 @@ public class DatabasePlatform {
   /**
    * Configure the platform given the server configuration.
    */
-  public void configure(ServerConfig config) {
+  public void configure(PlatformConfig config) {
     this.sequenceBatchSize = config.getDatabaseSequenceBatchSize();
     configureIdType(config.getIdType());
-    configure(config.getDbTypeConfig(), config.isAllQuotedIdentifiers());
+    configure(config, config.isAllQuotedIdentifiers());
   }
 
   /**
    * Configure UUID Storage etc based on ServerConfig settings.
    */
-  protected void configure(DbTypeConfig config, boolean allQuotedIdentifiers) {
+  protected void configure(PlatformConfig config, boolean allQuotedIdentifiers) {
     this.allQuotedIdentifiers = allQuotedIdentifiers;
     addGeoTypes(config.getGeometrySRID());
     configureIdType(config.getIdType());
diff --git a/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java b/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java
index c1c4896e3..3376f617c 100644
--- a/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java
+++ b/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java
@@ -1,6 +1,6 @@
 package io.ebean.config.dbplatform;
 
-import io.ebean.config.ServerConfig;
+import io.ebean.config.PlatformConfig;
 
 import java.util.EnumMap;
 import java.util.Map;
@@ -198,7 +198,7 @@ public class DbPlatformTypeMapping {
   /**
    * Map the UUID appropriately based on native DB support and ServerConfig.DbUuid.
    */
-  public void config(boolean nativeUuidType, ServerConfig.DbUuid dbUuid) {
+  public void config(boolean nativeUuidType, PlatformConfig.DbUuid dbUuid) {
     if (nativeUuidType && dbUuid.useNativeType()) {
       // native UUID already set by default
     } else if (dbUuid.useBinary()) {
diff --git a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java
index 39727c7b2..75591f2ad 100644
--- a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java
@@ -4,7 +4,7 @@ import io.ebean.BackgroundExecutor;
 import io.ebean.Query;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
-import io.ebean.config.ServerConfig;
+import io.ebean.config.PlatformConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.DbType;
@@ -82,7 +82,7 @@ abstract class SqlServerBasePlatform extends DatabasePlatform {
   }
 
   @Override
-  public void configure(ServerConfig config) {
+  public void configure(PlatformConfig config) {
     super.configure(config);
     if (dbIdentity.getIdType() == IdType.SEQUENCE) {
       this.persistBatchOnCascade = PersistBatch.ALL;
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index c548bbc64..fe698ffba 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -5,6 +5,7 @@ import io.ebean.EbeanServer;
 import io.ebean.annotation.Platform;
 import io.ebean.config.DbConstraintNaming;
 import io.ebean.config.DbMigrationConfig;
+import io.ebean.config.PlatformConfig;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.db2.DB2Platform;
@@ -227,15 +228,17 @@ public class DefaultDbMigration implements DbMigration {
     if (!online) {
       DbOffline.setGenerateMigration();
       if (databasePlatform == null && !platforms.isEmpty()) {
-        // for multiple platform generation set the general platform
-        // to H2 so that it runs offline without DB connection
+        // for multiple platform generation the first platform
+        // is used to generate the "logical" model diff
         setPlatform(platforms.get(0).platform);
       }
     }
     setDefaults();
+    if (!platforms.isEmpty()) {
+      configurePlatforms();
+    }
     try {
       Request request = createRequest();
-
       if (platforms.isEmpty()) {
         generateExtraDdl(request.migrationDir, databasePlatform);
       }
@@ -254,6 +257,16 @@ public class DefaultDbMigration implements DbMigration {
     }
   }
 
+  /**
+   * Load the configuration for each of the target platforms.
+   */
+  private void configurePlatforms() {
+    for (Pair pair : platforms) {
+      PlatformConfig config = serverConfig.newPlatformConfig("dbmigration.platform", pair.prefix);
+      pair.platform.configure(config);
+    }
+  }
+
   /**
    * Generate "repeatable" migration scripts.
    * <p>
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index 63536ee51..7f4d94422 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -267,7 +267,7 @@ public class DefaultContainer implements SpiContainer {
       config.setDatabasePlatform(platform);
     }
     logger.info("DatabasePlatform name:{} platform:{}", config.getName(), platform.getName());
-    platform.configure(config);
+    platform.configure(config.getPlatformConfig());
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index dc835fb6c..e9b423ece 100644
--- a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -304,7 +304,7 @@ public class InternalConfiguration {
   }
 
   public RelationalQueryEngine createRelationalQueryEngine() {
-    return new DefaultRelationalQueryEngine(binder, serverConfig.getDatabaseBooleanTrue(), serverConfig.getDbTypeConfig().getDbUuid().useBinaryOptimized());
+    return new DefaultRelationalQueryEngine(binder, serverConfig.getDatabaseBooleanTrue(), serverConfig.getPlatformConfig().getDbUuid().useBinaryOptimized());
   }
 
   public OrmQueryEngine createOrmQueryEngine() {
diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index ef11a43c5..e474ac482 100644
--- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -8,6 +8,7 @@ import io.ebean.annotation.DbEnumValue;
 import io.ebean.annotation.EnumValue;
 import io.ebean.annotation.Platform;
 import io.ebean.config.JsonConfig;
+import io.ebean.config.PlatformConfig;
 import io.ebean.config.ScalarTypeConverter;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
@@ -944,7 +945,7 @@ public final class DefaultTypeManager implements TypeManager {
       nativeMap.put(Types.BIT, booleanType);
     }
 
-    ServerConfig.DbUuid dbUuid = config.getDbTypeConfig().getDbUuid();
+    PlatformConfig.DbUuid dbUuid = config.getPlatformConfig().getDbUuid();
 
     if (offlineMigrationGeneration || (databasePlatform.isNativeUuidType() && dbUuid.useNativeType())) {
       addType(UUID.class, new ScalarTypeUUIDNative());
diff --git a/src/test/java/io/ebean/config/DbMigrationConfigTest.java b/src/test/java/io/ebean/config/DbMigrationConfigTest.java
index 0bc2ab692..95464ec72 100644
--- a/src/test/java/io/ebean/config/DbMigrationConfigTest.java
+++ b/src/test/java/io/ebean/config/DbMigrationConfigTest.java
@@ -32,7 +32,7 @@ public class DbMigrationConfigTest {
     properties.setProperty("ebean.migration.patchInsertOn", "1.3,my_views");
     properties.setProperty("ebean.migration.patchResetChecksumOn", "foo");
 
-    PropertiesWrapper wrapper = new PropertiesWrapper("ebean", "db", properties);
+    PropertiesWrapper wrapper = new PropertiesWrapper("ebean", "db", properties, null);
 
     DbMigrationConfig migrationConfig = new DbMigrationConfig();
     migrationConfig.loadSettings(wrapper, "db");
@@ -50,7 +50,7 @@ public class DbMigrationConfigTest {
     properties.setProperty("datasource.db.username", "banana");
     properties.setProperty("datasource.db.password", "apple");
 
-    PropertiesWrapper wrapper = new PropertiesWrapper("ebean", "db", properties);
+    PropertiesWrapper wrapper = new PropertiesWrapper("ebean", "db", properties, null);
 
     DbMigrationConfig migrationConfig = new DbMigrationConfig();
     migrationConfig.loadSettings(wrapper, "db");
@@ -67,7 +67,7 @@ public class DbMigrationConfigTest {
     properties.setProperty("datasource.db.adminusername", "banana");
     properties.setProperty("datasource.db.adminpassword", "apple");
 
-    PropertiesWrapper wrapper = new PropertiesWrapper("ebean", "db", properties);
+    PropertiesWrapper wrapper = new PropertiesWrapper("ebean", "db", properties, null);
 
     DbMigrationConfig migrationConfig = new DbMigrationConfig();
     migrationConfig.loadSettings(wrapper, "db");
diff --git a/src/test/java/io/ebean/config/DocStoreConfigTest.java b/src/test/java/io/ebean/config/DocStoreConfigTest.java
index 295d6948d..8919fab4a 100644
--- a/src/test/java/io/ebean/config/DocStoreConfigTest.java
+++ b/src/test/java/io/ebean/config/DocStoreConfigTest.java
@@ -5,7 +5,9 @@ import org.junit.Test;
 
 import java.util.Properties;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 public class DocStoreConfigTest {
 
@@ -23,7 +25,7 @@ public class DocStoreConfigTest {
     properties.setProperty("ebean.docstore.username", "fred");
     properties.setProperty("ebean.docstore.password", "rock");
 
-    PropertiesWrapper wrapper = new PropertiesWrapper("ebean", null, properties);
+    PropertiesWrapper wrapper = new PropertiesWrapper("ebean", null, properties, null);
 
     config.loadSettings(wrapper);
 
@@ -47,7 +49,7 @@ public class DocStoreConfigTest {
     properties.setProperty("ebean.docstore.generateMapping", "true");
     properties.setProperty("ebean.docstore.dropCreate", "true");
 
-    PropertiesWrapper wrapper = new PropertiesWrapper("ebean", null, properties);
+    PropertiesWrapper wrapper = new PropertiesWrapper("ebean", null, properties, null);
     config.loadSettings(wrapper);
 
     assertTrue(config.isGenerateMapping());
@@ -64,7 +66,7 @@ public class DocStoreConfigTest {
     properties.setProperty("ebean.docstore.generateMapping", "true");
     properties.setProperty("ebean.docstore.create", "true");
 
-    PropertiesWrapper wrapper = new PropertiesWrapper("ebean", null, properties);
+    PropertiesWrapper wrapper = new PropertiesWrapper("ebean", null, properties, null);
     config.loadSettings(wrapper);
 
     assertTrue(config.isGenerateMapping());
diff --git a/src/test/java/io/ebean/config/MatchingNamingConventionTest.java b/src/test/java/io/ebean/config/MatchingNamingConventionTest.java
index 677b572e7..9cd9317b7 100644
--- a/src/test/java/io/ebean/config/MatchingNamingConventionTest.java
+++ b/src/test/java/io/ebean/config/MatchingNamingConventionTest.java
@@ -20,7 +20,7 @@ public class MatchingNamingConventionTest {
 
     SqlServer17Platform platform = new SqlServer17Platform();
 
-    ServerConfig config = new ServerConfig();
+    PlatformConfig config = new PlatformConfig();
     config.setAllQuotedIdentifiers(true);
     platform.configure(config);
 
diff --git a/src/test/java/io/ebean/config/PropertiesWrapperTest.java b/src/test/java/io/ebean/config/PropertiesWrapperTest.java
index 016af03c6..180156040 100644
--- a/src/test/java/io/ebean/config/PropertiesWrapperTest.java
+++ b/src/test/java/io/ebean/config/PropertiesWrapperTest.java
@@ -15,7 +15,7 @@ public class PropertiesWrapperTest {
   @Test
   public void testGetServerName() {
 
-    PropertiesWrapper pw = new PropertiesWrapper(null, "myserver", new Properties());
+    PropertiesWrapper pw = new PropertiesWrapper(null, "myserver", new Properties(), null);
     assertEquals("myserver", pw.getServerName());
   }
 
@@ -25,7 +25,7 @@ public class PropertiesWrapperTest {
     Properties properties = new Properties();
     properties.put("platform", "postgres");
 
-    PropertiesWrapper pw = new PropertiesWrapper("pref", "myserver", properties);
+    PropertiesWrapper pw = new PropertiesWrapper("pref", "myserver", properties, null);
     assertEquals(Platform.POSTGRES, pw.getEnum(Platform.class, "platform", Platform.H2));
     assertEquals(Platform.H2, pw.getEnum(Platform.class, "junk", Platform.H2));
     assertNull(pw.getEnum(Platform.class, "junk", null));
@@ -40,7 +40,7 @@ public class PropertiesWrapperTest {
     properties.put("noTrimReqr", "jim");
     properties.put("includeSpaces", " jim bob ");
 
-    PropertiesWrapper pw = new PropertiesWrapper("pref", "myserver", properties);
+    PropertiesWrapper pw = new PropertiesWrapper("pref", "myserver", properties, null);
     assertEquals(" hello ", pw.get("someBasic"));
     assertEquals(42, pw.getInt("someInt", 1));
     assertNull(pw.get("doesNotExist", null));
@@ -62,14 +62,14 @@ public class PropertiesWrapperTest {
     properties.put("someSystemProp", "/aaa/${java.io.tmpdir}/bbb");
 
     Properties evalCopy = PropertiesLoader.eval(properties);
-    PropertiesWrapper pw = new PropertiesWrapper("pref", "myserver", evalCopy);
+    PropertiesWrapper pw = new PropertiesWrapper("pref", "myserver", evalCopy, null);
 
     assertEquals(42, pw.getInt("someInt", 99));
     assertEquals(Double.valueOf(5.5D), (Double.valueOf(pw.getDouble("someDouble", 99.9D))));
     assertEquals(home + "/hello", pw.get("somePath", null));
     assertEquals(tmpDir, "/aaa/" + tmpDir + "/bbb", pw.get("someSystemProp"));
 
-    pw = new PropertiesWrapper(evalCopy);
+    pw = new PropertiesWrapper(evalCopy, null);
 
     assertEquals(42, pw.getInt("someInt", 99));
     assertEquals(Double.valueOf(5.5D), (Double.valueOf(pw.getDouble("someDouble", 99.9D))));
diff --git a/src/test/java/io/ebean/config/ServerConfigTest.java b/src/test/java/io/ebean/config/ServerConfigTest.java
index 8ee588ad3..6aa9f64c9 100644
--- a/src/test/java/io/ebean/config/ServerConfigTest.java
+++ b/src/test/java/io/ebean/config/ServerConfigTest.java
@@ -75,7 +75,7 @@ public class ServerConfigTest {
     assertEquals(IdType.SEQUENCE, serverConfig.getIdType());
     assertEquals(PersistBatch.INSERT, serverConfig.getPersistBatch());
     assertEquals(PersistBatch.INSERT, serverConfig.getPersistBatchOnCascade());
-    assertEquals(ServerConfig.DbUuid.BINARY, serverConfig.getDbTypeConfig().getDbUuid());
+    assertEquals(PlatformConfig.DbUuid.BINARY, serverConfig.getPlatformConfig().getDbUuid());
     assertEquals(JsonConfig.DateTime.ISO8601, serverConfig.getJsonDateTime());
 
     assertEquals(42, serverConfig.getJdbcFetchSizeFindEach());
diff --git a/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java b/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java
index a1e9de455..ddfd991a9 100644
--- a/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java
+++ b/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java
@@ -1,8 +1,8 @@
 package io.ebean.config.dbplatform;
 
 import io.ebean.annotation.Platform;
-import io.ebean.config.DbTypeConfig;
 import io.ebean.config.MatchingNamingConvention;
+import io.ebean.config.PlatformConfig;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.h2.H2Platform;
 import io.ebean.config.dbplatform.postgres.PostgresPlatform;
@@ -21,7 +21,7 @@ public class DatabasePlatformTest {
     config.setNamingConvention(new MatchingNamingConvention());
 
     DatabasePlatform dbPlatform = new SqlServer17Platform();
-    dbPlatform.configure(config.getDbTypeConfig(), config.isAllQuotedIdentifiers());
+    dbPlatform.configure(config.getPlatformConfig(), config.isAllQuotedIdentifiers());
 
     assertEquals(dbPlatform.convertQuotedIdentifiers("order"),"[order]");
     assertEquals(dbPlatform.convertQuotedIdentifiers("`order`"),"[order]");
@@ -34,7 +34,7 @@ public class DatabasePlatformTest {
     ServerConfig config = new ServerConfig();
 
     DatabasePlatform dbPlatform = new SqlServer17Platform();
-    dbPlatform.configure(config.getDbTypeConfig(), config.isAllQuotedIdentifiers());
+    dbPlatform.configure(config.getPlatformConfig(), config.isAllQuotedIdentifiers());
 
     assertEquals(dbPlatform.convertQuotedIdentifiers("order"),"order");
     assertEquals(dbPlatform.convertQuotedIdentifiers("`order`"),"[order]");
@@ -56,7 +56,7 @@ public class DatabasePlatformTest {
   @Test
   public void configure_customType() throws Exception {
 
-    DbTypeConfig config = new DbTypeConfig();
+    PlatformConfig config = new PlatformConfig();
     config.addCustomMapping(DbType.VARCHAR, "text", Platform.POSTGRES);
     config.addCustomMapping(DbType.DECIMAL, "decimal(24,4)");
 
diff --git a/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java b/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java
index ed0fc2bf9..ca0eff20a 100644
--- a/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java
+++ b/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java
@@ -1,7 +1,6 @@
 package io.ebean.config.dbplatform;
 
-import io.ebean.config.DbTypeConfig;
-import io.ebean.config.ServerConfig;
+import io.ebean.config.PlatformConfig;
 import io.ebean.config.dbplatform.mysql.MySqlPlatform;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl;
 import io.ebeaninternal.server.core.PlatformDdlBuilder;
@@ -28,7 +27,7 @@ public class MySqlPlatformTest {
   public void uuid_default() {
 
     MySqlPlatform platform = new MySqlPlatform();
-    platform.configure(new DbTypeConfig(), false);
+    platform.configure(new PlatformConfig(), false);
 
     DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
     assertThat(dbType.renderType(0, 0)).isEqualTo("varchar(40)");
@@ -39,8 +38,8 @@ public class MySqlPlatformTest {
   public void uuid_as_binary() {
 
     MySqlPlatform platform = new MySqlPlatform();
-    DbTypeConfig config = new DbTypeConfig();
-    config.setDbUuid(ServerConfig.DbUuid.AUTO_BINARY);
+    PlatformConfig config = new PlatformConfig();
+    config.setDbUuid(PlatformConfig.DbUuid.AUTO_BINARY);
     platform.configure(config, false);
 
     DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
diff --git a/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java b/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java
index 11da787e2..119d58ff1 100644
--- a/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java
+++ b/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java
@@ -1,7 +1,6 @@
 package io.ebean.config.dbplatform;
 
-import io.ebean.config.DbTypeConfig;
-import io.ebean.config.ServerConfig;
+import io.ebean.config.PlatformConfig;
 import io.ebean.config.dbplatform.oracle.OraclePlatform;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl;
 import io.ebeaninternal.server.core.PlatformDdlBuilder;
@@ -37,7 +36,7 @@ public class OraclePlatformTest {
   public void uuid_default() {
 
     OraclePlatform platform = new OraclePlatform();
-    platform.configure(new DbTypeConfig(), false);
+    platform.configure(new PlatformConfig(), false);
     DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
 
     assertThat(dbType.renderType(0, 0)).isEqualTo("varchar2(40)");
@@ -48,8 +47,8 @@ public class OraclePlatformTest {
   public void uuid_as_binary() {
 
     OraclePlatform platform = new OraclePlatform();
-    DbTypeConfig config = new DbTypeConfig();
-    config.setDbUuid(ServerConfig.DbUuid.AUTO_BINARY);
+    PlatformConfig config = new PlatformConfig();
+    config.setDbUuid(PlatformConfig.DbUuid.AUTO_BINARY);
 
     platform.configure(config, false);
 
diff --git a/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java b/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java
index f23370a43..b992e2fa4 100644
--- a/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java
+++ b/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java
@@ -1,6 +1,6 @@
 package io.ebean.config.dbplatform;
 
-import io.ebean.config.DbTypeConfig;
+import io.ebean.config.PlatformConfig;
 import io.ebean.config.dbplatform.postgres.PostgresPlatform;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl;
 import io.ebeaninternal.server.core.PlatformDdlBuilder;
@@ -37,7 +37,7 @@ public class PostgresPlatformTest {
   public void testUuidType() {
 
     PostgresPlatform platform = new PostgresPlatform();
-    platform.configure(new DbTypeConfig(), false);
+    platform.configure(new PlatformConfig(), false);
 
     DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
     String columnDefn = dbType.renderType(0, 0);

From d0b24dc3404fb917b85f60b6da0cc09dbe399142 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 9 Mar 2018 00:44:04 +1300
Subject: [PATCH 0176/1036] #1343 - Update the #1283 ENH: Support simplified
 test configuration (with docker setup typically via application-test.yml)

---
 src/main/java/io/ebean/config/AutoConfigure.java | 11 +++++++----
 src/main/java/io/ebean/config/ServerConfig.java  | 15 ++++++++++-----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/ebean/config/AutoConfigure.java b/src/main/java/io/ebean/config/AutoConfigure.java
index 5c0ef18af..879338ce5 100644
--- a/src/main/java/io/ebean/config/AutoConfigure.java
+++ b/src/main/java/io/ebean/config/AutoConfigure.java
@@ -6,10 +6,13 @@ package io.ebean.config;
 public interface AutoConfigure {
 
   /**
-   * Provide some configuration the ServerConfig prior to server creation.
-   * <p>
-   * Return true if the autoConfiguration applies to this ServerConfig.
+   * Perform configuration for the ServerConfig prior to properties load.
    */
-  void configure(ServerConfig serverConfig);
+  void preConfigure(ServerConfig serverConfig);
+
+  /**
+   * Provide some configuration the ServerConfig prior to server creation but after properties have been applied.
+   */
+  void postConfigure(ServerConfig serverConfig);
 
 }
diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index f4b59039c..28728cd22 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -2650,19 +2650,24 @@ public class ServerConfig {
    * Load the settings from the given properties
    */
   private void configureFromProperties() {
-    autoConfiguration();
-    PropertiesWrapper p = new PropertiesWrapper("ebean", name, properties, classLoadConfig);
-    loadSettings(p);
+    List<AutoConfigure> autoConfigures = autoConfiguration();
+    loadSettings(new PropertiesWrapper("ebean", name, properties, classLoadConfig));
+    for (AutoConfigure autoConfigure : autoConfigures) {
+      autoConfigure.postConfigure(this);
+    }
   }
 
   /**
    * Use a 'plugin' to provide automatic configuration. Intended for automatic testing
    * configuration with Docker containers via ebean-test-config.
    */
-  private void autoConfiguration() {
+  private List<AutoConfigure> autoConfiguration() {
+    List<AutoConfigure> list = new ArrayList<>();
     for (AutoConfigure autoConfigure : serviceLoad(AutoConfigure.class)) {
-      autoConfigure.configure(this);
+      autoConfigure.preConfigure(this);
+      list.add(autoConfigure);
     }
+    return list;
   }
 
   /**

From 6c8cf0c5b78c2402ed796c8aafb9cb0100449bf7 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 9 Mar 2018 10:34:25 +1300
Subject: [PATCH 0177/1036] #1343 - Update for ... #1283 ENH: Support
 simplified test configuration (with docker setup typically via
 application-test.yml)

DefaultContainer with config.loadFromProperties(PropertiesLoader.load()); effectively runs eval twice on properties which is unnecessary.

Additionally add ServerConfig.setRunMigration() because I think it makes more sense / easier to find.

Remote PropertiesLoader.setProperty() as it is no longer required for the ebean-test-config plugin.
---
 src/main/java/io/ebean/config/ServerConfig.java       | 10 ++++++++++
 .../io/ebean/config/properties/PropertiesLoader.java  | 11 -----------
 .../ebeaninternal/server/core/DefaultContainer.java   |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 28728cd22..51221e96f 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -1956,6 +1956,16 @@ public class ServerConfig {
     this.durationWithNanos = durationWithNanos;
   }
 
+  /**
+   * Set to true to run DB migrations on server start.
+   * <p>
+   * This is the same as serverConfig.getMigrationConfig().setRunMigration(). We have added this method here
+   * as it is often the only thing we need to configure for migrations.
+   */
+  public void setRunMigration(boolean runMigration){
+    migrationConfig.setRunMigration(runMigration);
+  }
+
   /**
    * Set to true to generate the "create all" DDL on startup.
    * <p>
diff --git a/src/main/java/io/ebean/config/properties/PropertiesLoader.java b/src/main/java/io/ebean/config/properties/PropertiesLoader.java
index 560d255e5..3df479919 100644
--- a/src/main/java/io/ebean/config/properties/PropertiesLoader.java
+++ b/src/main/java/io/ebean/config/properties/PropertiesLoader.java
@@ -56,17 +56,6 @@ public class PropertiesLoader {
     return properties;
   }
 
-  /**
-   * Set (override) a configuration property.
-   *
-   * This is expected to be only called by test configuration logic
-   * (ala automatic test configuration via ebean-test-config).
-   */
-  public static synchronized void setProperty(String key, String value) {
-    load();
-    properties.setProperty(key, value);
-  }
-
   /**
    * Return a copy of the properties with 'eval' run on all the values.
    * This resolves expressions like ${HOME} etc.
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index 7f4d94422..e1e923dea 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -83,7 +83,7 @@ public class DefaultContainer implements SpiContainer {
 
     ServerConfig config = new ServerConfig();
     config.setName(name);
-    config.loadFromProperties(PropertiesLoader.load());
+    config.loadFromProperties();
 
     return createServer(config);
   }

From 8ac1b745df1cb27d2f5dec6be9bdd373628156c7 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 9 Mar 2018 16:54:38 +1300
Subject: [PATCH 0178/1036] #1344 - ENH: Add initial Cockroach DB support ...
 need to review JSON and DB ARRAY support

---
 pom.xml                                       |  2 +-
 .../config/dbplatform/DatabasePlatform.java   |  7 +++
 .../cockroach/CockroachPlatform.java          | 28 +++++++++
 .../dbmigration/DdlGenerator.java             |  5 ++
 .../ddlgeneration/platform/CockroachDdl.java  | 57 +++++++++++++++++++
 .../server/core/DatabasePlatformFactory.java  | 48 +++++++++++++---
 .../server/core/PlatformDdlBuilder.java       |  3 +
 7 files changed, 141 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/io/ebean/config/dbplatform/cockroach/CockroachPlatform.java
 create mode 100644 src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/CockroachDdl.java

diff --git a/pom.xml b/pom.xml
index f5e65dff5..bfc7d5897 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,7 +130,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>11.3.1</version>
+      <version>11.5.1</version>
     </dependency>
 
     <dependency>
diff --git a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
index c1a014095..b1ddadc2c 100644
--- a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
@@ -517,6 +517,13 @@ public class DatabasePlatform {
     this.forwardOnlyHintOnFindIterate = forwardOnlyHintOnFindIterate;
   }
 
+  /**
+   * Normally not needed - overridden in CockroachPlatform.
+   */
+  public boolean isDdlCommitOnCreateIndex() {
+    return false;
+  }
+
   /**
    * Return the DB identity/sequence features for this platform.
    *
diff --git a/src/main/java/io/ebean/config/dbplatform/cockroach/CockroachPlatform.java b/src/main/java/io/ebean/config/dbplatform/cockroach/CockroachPlatform.java
new file mode 100644
index 000000000..502e33cf6
--- /dev/null
+++ b/src/main/java/io/ebean/config/dbplatform/cockroach/CockroachPlatform.java
@@ -0,0 +1,28 @@
+package io.ebean.config.dbplatform.cockroach;
+
+import io.ebean.annotation.Platform;
+import io.ebean.config.dbplatform.postgres.PostgresPlatform;
+
+/**
+ * CockroachDB based platform.
+ */
+public class CockroachPlatform extends PostgresPlatform {
+
+  public CockroachPlatform() {
+    super();
+    this.platform = Platform.COCKROACH;
+    // no like escape clause supported
+    this.likeSpecialCharacters = new char[]{'%', '_'};
+    this.likeClauseRaw = "like ?";
+    this.likeClauseEscaped = "like ?";
+  }
+
+  /**
+   * Needs a commit after create index such that alter table add foreign key ... succeeds.
+   */
+  @Override
+  public boolean isDdlCommitOnCreateIndex() {
+    return true;
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
index ae1ef4d08..68455dd89 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
@@ -37,6 +37,7 @@ public class DdlGenerator {
   private final boolean runDdl;
   private final boolean createOnly;
   private final boolean jaxbPresent;
+  private final boolean ddlCommitOnCreateIndex;
 
   private CurrentModel currentModel;
   private String dropAllContent;
@@ -50,8 +51,10 @@ public class DdlGenerator {
     if (!serverConfig.getTenantMode().isDdlEnabled() && serverConfig.isDdlRun()) {
       log.warn("DDL can't be run on startup with TenantMode " + serverConfig.getTenantMode());
       this.runDdl = false;
+      this.ddlCommitOnCreateIndex = false;
     } else {
       this.runDdl = serverConfig.isDdlRun();
+      this.ddlCommitOnCreateIndex = server.getDatabasePlatform().isDdlCommitOnCreateIndex();
     }
   }
 
@@ -109,6 +112,8 @@ public class DdlGenerator {
     try {
       if (expectErrors) {
         connection.setAutoCommit(true);
+      } else if (ddlCommitOnCreateIndex) {
+        runner.setCommitOnCreateIndex();
       }
       int count = runner.runAll(content, connection);
       if (expectErrors) {
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/CockroachDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/CockroachDdl.java
new file mode 100644
index 000000000..303c887bd
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/CockroachDdl.java
@@ -0,0 +1,57 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+
+/**
+ * CockroachDB specific DDL handling.
+ */
+public class CockroachDdl extends PlatformDdl {
+
+  public CockroachDdl(DatabasePlatform platform) {
+    super(platform);
+    this.historyDdl = new PostgresHistoryDdl();
+    this.dropTableCascade = " cascade";
+    this.columnSetType = "type ";
+    this.alterTableIfExists = "if exists ";
+    this.columnSetNull = "drop not null";
+  }
+
+//  @Override
+//  protected String convertArrayType(String logicalArrayType) {
+//    TODO: Need to look at DB Array support ...
+//  }
+
+  /**
+   * Map bigint, integer and smallint all into serial.
+   */
+  @Override
+  public String asIdentityColumn(String columnDefn) {
+
+    if ("bigint".equalsIgnoreCase(columnDefn)) {
+      return "serial";
+    }
+    if ("integer".equalsIgnoreCase(columnDefn)) {
+      return "serial";
+    }
+    if ("smallint".equalsIgnoreCase(columnDefn)) {
+      return "serial";
+    }
+    return columnDefn;
+  }
+
+  @Override
+  public void addTableComment(DdlBuffer apply, String tableName, String tableComment) {
+    // do nothing
+  }
+
+  @Override
+  public void addColumnComment(DdlBuffer apply, String table, String column, String comment) {
+    // do nothing
+  }
+
+  @Override
+  public boolean isInlineComments() {
+    return false;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java b/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
index 3f98a1c6d..75db54f34 100644
--- a/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
+++ b/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.core;
 
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebean.config.dbplatform.cockroach.CockroachPlatform;
 import io.ebean.config.dbplatform.db2.DB2Platform;
 import io.ebean.config.dbplatform.h2.H2Platform;
 import io.ebean.config.dbplatform.hsqldb.HsqldbPlatform;
@@ -13,6 +14,7 @@ import io.ebean.config.dbplatform.sqlanywhere.SqlAnywherePlatform;
 import io.ebean.config.dbplatform.sqlite.SQLitePlatform;
 import io.ebean.config.dbplatform.sqlserver.SqlServer16Platform;
 import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
+import io.ebean.migration.util.JdbcClose;
 import io.ebeaninternal.dbmigration.DbOffline;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,6 +23,8 @@ import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import java.sql.SQLException;
 
 /**
@@ -111,20 +115,20 @@ public class DatabasePlatformFactory {
    */
   private DatabasePlatform byDataSource(DataSource dataSource) {
 
-    Connection conn = null;
+    Connection connection = null;
     try {
-      conn = dataSource.getConnection();
-      DatabaseMetaData metaData = conn.getMetaData();
+      connection = dataSource.getConnection();
+      DatabaseMetaData metaData = connection.getMetaData();
 
-      return byDatabaseMeta(metaData);
+      return byDatabaseMeta(metaData, connection);
 
     } catch (SQLException ex) {
       throw new PersistenceException(ex);
 
     } finally {
       try {
-        if (conn != null) {
-          conn.close();
+        if (connection != null) {
+          connection.close();
         }
       } catch (SQLException ex) {
         logger.error(null, ex);
@@ -135,7 +139,7 @@ public class DatabasePlatformFactory {
   /**
    * Find the platform by the metaData.getDatabaseProductName().
    */
-  private DatabasePlatform byDatabaseMeta(DatabaseMetaData metaData) throws SQLException {
+  private DatabasePlatform byDatabaseMeta(DatabaseMetaData metaData, Connection connection) throws SQLException {
 
     String dbProductName = metaData.getDatabaseProductName();
     dbProductName = dbProductName.toLowerCase();
@@ -151,7 +155,7 @@ public class DatabasePlatformFactory {
     } else if (dbProductName.contains("hsql database engine")) {
       return new HsqldbPlatform();
     } else if (dbProductName.contains("postgres")) {
-      return new PostgresPlatform();
+      return readPostgres(connection);
     } else if (dbProductName.contains("sqlite")) {
       return new SQLitePlatform();
     } else if (dbProductName.contains("db2")) {
@@ -163,4 +167,32 @@ public class DatabasePlatformFactory {
     // use the standard one
     return new DatabasePlatform();
   }
+
+  /**
+   * Use a select version() query as it could be Postgres or CockroachDB.
+   */
+  private static PostgresPlatform readPostgres(Connection connection) {
+    // Postgres driver uses a hardcoded product name so use version() query
+    PreparedStatement statement = null;
+    ResultSet resultSet = null;
+    try {
+      statement = connection.prepareStatement("SELECT version() AS \"version\"");
+      resultSet = statement.executeQuery();
+      if (resultSet.next()) {
+        String productVersion = resultSet.getString("version").toLowerCase();
+        if (productVersion.contains("cockroach")) {
+          return new CockroachPlatform();
+        }
+      }
+    } catch (SQLException e) {
+      logger.warn("Error running detection query on Postgres", e);
+
+    } finally {
+      JdbcClose.close(resultSet);
+      JdbcClose.close(statement);
+    }
+
+    // Real Postgres
+    return new PostgresPlatform();
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java b/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java
index efd69538e..bf901ed50 100644
--- a/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.core;
 
 import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.CockroachDdl;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.DB2Ddl;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.H2Ddl;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.HsqldbDdl;
@@ -38,6 +39,8 @@ public class PlatformDdlBuilder {
         return new PlatformDdl(platform);
       case POSTGRES:
         return new PostgresDdl(platform);
+      case COCKROACH:
+        return new CockroachDdl(platform);
       case SQLANYWHERE:
         return new PlatformDdl(platform);
       case SQLSERVER16:

From eda6350d8960bfb8f741c309ce89751d63a237cc Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 9 Mar 2018 17:40:34 +1300
Subject: [PATCH 0179/1036] #1344 - ENH: Add initial Cockroach DB support ...
 need to review JSON

Adds in the DB ARRAY support (exactly the same as Postgres)
---
 .../config/dbplatform/DatabasePlatform.java   |  7 +++++++
 .../dbplatform/postgres/PostgresPlatform.java |  8 +++++++
 .../ddlgeneration/platform/CockroachDdl.java  |  8 +++----
 .../ddlgeneration/platform/NativeDbArray.java | 20 ++++++++++++++++++
 .../ddlgeneration/platform/PostgresDdl.java   |  8 +------
 .../server/type/DefaultTypeManager.java       | 12 +++++------
 .../platform/NativeDbArrayTest.java           | 21 +++++++++++++++++++
 src/test/resources/ebean.properties           |  2 +-
 8 files changed, 68 insertions(+), 18 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NativeDbArray.java
 create mode 100644 src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NativeDbArrayTest.java

diff --git a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
index b1ddadc2c..ced70893c 100644
--- a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
@@ -381,6 +381,13 @@ public class DatabasePlatform {
     this.historySupport = historySupport;
   }
 
+  /**
+   * So no except for Postgres and CockroachDB.
+   */
+  public boolean isNativeArrayType() {
+    return false;
+  }
+
   /**
    * Return true if the DB supports native UUID.
    */
diff --git a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
index 9a9b584fd..75a395568 100644
--- a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
@@ -88,6 +88,14 @@ public class PostgresPlatform extends DatabasePlatform {
     return new DbPlatformType("geometry(" + type + "," + srid + ")");
   }
 
+  /**
+   * So we can generate varchar[], int[], uuid[] column definitions and use the associated scalar types.
+   */
+  @Override
+  public boolean isNativeArrayType() {
+    return true;
+  }
+
   /**
    * Create a Postgres specific sequence IdGenerator.
    */
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/CockroachDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/CockroachDdl.java
index 303c887bd..f1fa243ef 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/CockroachDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/CockroachDdl.java
@@ -17,10 +17,10 @@ public class CockroachDdl extends PlatformDdl {
     this.columnSetNull = "drop not null";
   }
 
-//  @Override
-//  protected String convertArrayType(String logicalArrayType) {
-//    TODO: Need to look at DB Array support ...
-//  }
+  @Override
+  protected String convertArrayType(String logicalArrayType) {
+    return NativeDbArray.logicalToNative(logicalArrayType);
+  }
 
   /**
    * Map bigint, integer and smallint all into serial.
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NativeDbArray.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NativeDbArray.java
new file mode 100644
index 000000000..8b6723e29
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NativeDbArray.java
@@ -0,0 +1,20 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+/**
+ * Helper for logical type conversion.
+ */
+class NativeDbArray {
+
+  /**
+   * Covert the 'logical' array type to a native one (for Postgres and Cockroach).
+   */
+  static String logicalToNative(String logicalArrayType) {
+    int colonPos = logicalArrayType.lastIndexOf(']');
+    if (colonPos == -1) {
+      return logicalArrayType;
+    } else {
+      // trim of the fallback varchar length
+      return logicalArrayType.substring(0, colonPos + 1);
+    }
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java
index 774ce97d3..709e6f026 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java
@@ -18,13 +18,7 @@ public class PostgresDdl extends PlatformDdl {
 
   @Override
   protected String convertArrayType(String logicalArrayType) {
-    int colonPos = logicalArrayType.lastIndexOf(']');
-    if (colonPos == -1) {
-      return logicalArrayType;
-    } else {
-      // trim of the fallback varchar length
-      return logicalArrayType.substring(0, colonPos + 1);
-    }
+    return NativeDbArray.logicalToNative(logicalArrayType);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index e474ac482..ddd4c31f4 100644
--- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -189,8 +189,8 @@ public final class DefaultTypeManager implements TypeManager {
 
     this.extraTypeFactory = new DefaultTypeFactory(config);
     this.postgres = isPostgres(config.getDatabasePlatform());
-    this.arrayTypeListFactory = arrayTypeListFactory(postgres, config.getDatabasePlatform());
-    this.arrayTypeSetFactory = arrayTypeSetFactory(postgres, config.getDatabasePlatform());
+    this.arrayTypeListFactory = arrayTypeListFactory(config.getDatabasePlatform());
+    this.arrayTypeSetFactory = arrayTypeSetFactory(config.getDatabasePlatform());
 
     this.offlineMigrationGeneration = DbOffline.isGenerateMigration();
 
@@ -211,8 +211,8 @@ public final class DefaultTypeManager implements TypeManager {
   /**
    * Return the factory to use to support DB ARRAY types.
    */
-  private PlatformArrayTypeFactory arrayTypeListFactory(boolean postgres, DatabasePlatform databasePlatform) {
-    if (postgres) {
+  private PlatformArrayTypeFactory arrayTypeListFactory(DatabasePlatform databasePlatform) {
+    if (databasePlatform.isNativeArrayType()) {
       return ScalarTypeArrayList.factory();
     } else if (databasePlatform.isPlatform(Platform.H2)) {
       return ScalarTypeArrayListH2.factory();
@@ -224,8 +224,8 @@ public final class DefaultTypeManager implements TypeManager {
   /**
    * Return the factory to use to support DB ARRAY types.
    */
-  private PlatformArrayTypeFactory arrayTypeSetFactory(boolean postgres, DatabasePlatform databasePlatform) {
-    if (postgres) {
+  private PlatformArrayTypeFactory arrayTypeSetFactory(DatabasePlatform databasePlatform) {
+    if (databasePlatform.isNativeArrayType()) {
       return ScalarTypeArraySet.factory();
     } else if (databasePlatform.isPlatform(Platform.H2)) {
       return ScalarTypeArraySetH2.factory();
diff --git a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NativeDbArrayTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NativeDbArrayTest.java
new file mode 100644
index 000000000..7d37363e4
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NativeDbArrayTest.java
@@ -0,0 +1,21 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class NativeDbArrayTest {
+
+  @Test
+  public void logicalToNative() {
+
+    assertThat(NativeDbArray.logicalToNative("uuid[]")).isEqualTo("uuid[]");
+    assertThat(NativeDbArray.logicalToNative("varchar[]")).isEqualTo("varchar[]");
+  }
+
+  @Test
+  public void logicalToNative_withFallbackDefined() {
+
+    assertThat(NativeDbArray.logicalToNative("uuid[]:(1000)")).isEqualTo("uuid[]");
+  }
+}
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 3b048c4c2..b33a6e823 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -19,7 +19,7 @@ ebean.ddl.generate=true
 ebean.ddl.run=true
 ebean.ddl.header=-- Generated by ebean ${version} at ${timestamp}
 ebean.packages=org.tests
-datasource.default=h2
+datasource.default=pg
 
 ebean.autoReadOnlyDataSource=true
 

From 85bfe3d03e856367a018bc6a718b011a4340df90 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sat, 10 Mar 2018 02:51:51 +1300
Subject: [PATCH 0180/1036] #1345 - Refactor io.ebean.meta.MetaInfoManager API
 (query execution metrics). Breaking change for people collecting query
 execution metrics.

---
 src/main/java/io/ebean/ExpressionList.java    |   5 +
 src/main/java/io/ebean/Query.java             |   9 ++
 src/main/java/io/ebean/SqlQuery.java          |   5 +
 src/main/java/io/ebean/Update.java            |   5 +
 .../io/ebean/meta/AbstractMetricVisitor.java  |  43 ++++++
 .../io/ebean/meta/BasicMetricVisitor.java     |  64 ++++++++
 .../java/io/ebean/meta/MetaInfoManager.java   |  19 +--
 .../io/ebean/meta/MetaOrmQueryMetric.java     |  42 ++++++
 ...phNodeStats.java => MetaOrmQueryNode.java} |   4 +-
 ...iginCount.java => MetaOrmQueryOrigin.java} |   5 +-
 .../io/ebean/meta/MetaQueryPlanStatistic.java |  98 -------------
 .../java/io/ebean/meta/MetaTimedMetric.java   |   5 +
 src/main/java/io/ebean/meta/MetricType.java   |  30 ++++
 .../java/io/ebean/meta/MetricVisitor.java     |  48 ++++++
 .../io/ebeaninternal/api/SpiEbeanServer.java  |   6 +
 .../java/io/ebeaninternal/api/SpiQuery.java   |   5 +
 .../io/ebeaninternal/api/SpiSqlBinding.java   |   5 +
 .../java/io/ebeaninternal/api/SpiUpdate.java  |   5 +
 .../ebeaninternal/metric/MetricFactory.java   |  12 +-
 .../ebeaninternal/metric/QueryPlanMetric.java |   6 +-
 .../io/ebeaninternal/metric/TimedMetric.java  |  15 +-
 .../ebeaninternal/metric/TimedMetricMap.java  |  13 +-
 .../server/core/AbstractSqlQueryRequest.java  |   2 +-
 .../core/CObjectGraphNodeStatistics.java      |   6 +-
 .../server/core/DefaultMetaInfoManager.java   |  57 +++++---
 .../server/core/DefaultServer.java            |  29 ++--
 .../server/core/PersistRequest.java           |  25 +++-
 .../core/PersistRequestCallableSql.java       |   9 +-
 .../server/core/PersistRequestOrmUpdate.java  |   6 +-
 .../server/core/PersistRequestUpdateSql.java  |   6 +-
 .../ebeaninternal/server/core/Persister.java  |   5 +
 .../server/core/RelationalQueryEngine.java    |  10 ++
 .../server/core/RelationalQueryRequest.java   |   6 +-
 .../server/deploy/BeanDescriptor.java         |   9 +-
 .../server/deploy/BeanDescriptorManager.java  |   7 +
 .../server/dto/DtoBeanDescriptor.java         |   6 +-
 .../server/dto/DtoBeanManager.java            |  13 +-
 .../server/dto/DtoMappingRequest.java         |   3 +-
 .../server/dto/DtoQueryPlan.java              |   6 +-
 .../server/dto/DtoQueryPlanBase.java          |   7 +-
 .../expression/DefaultExpressionList.java     |   5 +
 .../server/expression/JunctionExpression.java |   5 +
 .../server/persist/DefaultPersistExecute.java |  39 ++++-
 .../server/persist/DefaultPersister.java      |   6 +
 .../server/persist/ExeCallableSql.java        |   1 +
 .../server/persist/ExeOrmUpdate.java          |   1 +
 .../server/persist/ExeUpdateSql.java          |   1 +
 .../server/persist/PersistExecute.java        |  20 +++
 .../server/profile/DMetricFactory.java        |  18 +--
 .../profile/DProfileLocationFactory.java      |   3 +-
 .../server/profile/DQueryPlanMetric.java      |  18 ++-
 .../server/profile/DTimeMetricStats.java      |  11 +-
 .../server/profile/DTimedMetric.java          |  43 +++---
 .../server/profile/DTimedMetricMap.java       |  20 ++-
 .../server/profile/DTimedProfileLocation.java |  12 +-
 .../server/profile/TimedProfileLocation.java  |   8 +-
 .../server/query/CQueryPlan.java              |  50 +++++--
 .../server/query/CQueryPlanStats.java         | 137 ++++++++----------
 .../query/CQueryPlanStatsCollector.java       |  32 ----
 .../query/DefaultRelationalQueryEngine.java   |  17 +++
 .../server/querydefn/DefaultDtoQuery.java     |   3 +-
 .../server/querydefn/DefaultOrmQuery.java     |  13 ++
 .../server/querydefn/DefaultOrmUpdate.java    |  14 ++
 .../querydefn/DefaultRelationalQuery.java     |  13 ++
 .../transaction/TransactionManager.java       |  30 ++--
 src/test/java/io/ebean/BaseTestCase.java      |  25 ++++
 .../java/io/ebean/DtoQueryFromOrmTest.java    |  44 ++++--
 src/test/java/io/ebean/DtoQueryTest.java      |  14 +-
 src/test/java/io/ebean/UpdateQueryTest.java   |  13 +-
 .../ebeaninternal/api/TDSpiEbeanServer.java   |   6 +
 .../profile/BasicProfileLocationTest.java     |   3 +-
 .../batchinsert/TestBatchInsertFlush.java     |   8 +-
 .../org/tests/m2m/TestM2mDeleteObject.java    |  15 +-
 .../query/finder/TestCustomerFinder.java      |  16 +-
 .../TestObjectGraphNodeStatsCollection.java   |  23 +--
 .../tests/query/sqlquery/SqlQueryTests.java   |  24 ++-
 .../transaction/TestNestedMandatory.java      |   8 +-
 .../org/tests/update/TestSqlUpdateInTxn.java  |  12 +-
 src/test/resources/ebean.properties           |   2 +-
 79 files changed, 928 insertions(+), 466 deletions(-)
 create mode 100644 src/main/java/io/ebean/meta/AbstractMetricVisitor.java
 create mode 100644 src/main/java/io/ebean/meta/BasicMetricVisitor.java
 create mode 100644 src/main/java/io/ebean/meta/MetaOrmQueryMetric.java
 rename src/main/java/io/ebean/meta/{MetaObjectGraphNodeStats.java => MetaOrmQueryNode.java} (88%)
 rename src/main/java/io/ebean/meta/{MetaQueryPlanOriginCount.java => MetaOrmQueryOrigin.java} (83%)
 delete mode 100644 src/main/java/io/ebean/meta/MetaQueryPlanStatistic.java
 create mode 100644 src/main/java/io/ebean/meta/MetricType.java
 create mode 100644 src/main/java/io/ebean/meta/MetricVisitor.java
 delete mode 100644 src/main/java/io/ebeaninternal/server/query/CQueryPlanStatsCollector.java

diff --git a/src/main/java/io/ebean/ExpressionList.java b/src/main/java/io/ebean/ExpressionList.java
index 588a6f7c0..4723ab212 100644
--- a/src/main/java/io/ebean/ExpressionList.java
+++ b/src/main/java/io/ebean/ExpressionList.java
@@ -545,6 +545,11 @@ public interface ExpressionList<T> {
    */
   Query<T> setDisableReadAuditing();
 
+  /**
+   * Set a label on the query (to help identify query execution statistics).
+   */
+  Query<T> setLabel(String label);
+
   /**
    * Add expressions to the having clause.
    * <p>
diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index c5a5f425e..4d18a580d 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -1419,6 +1419,15 @@ public interface Query<T> {
    */
   Query<T> setProfileLocation(ProfileLocation profileLocation);
 
+  /**
+   * Set a label on the query.
+   * <p>
+   * This label can be used to help identify query performance metrics but we can also use
+   * profile location enhancement on Finders so for some that would be a better option.
+   * </p>
+   */
+  Query<T> setLabel(String label);
+
   /**
    * Set to true if this query should execute against the doc store.
    * <p>
diff --git a/src/main/java/io/ebean/SqlQuery.java b/src/main/java/io/ebean/SqlQuery.java
index a83aa9319..6c1bcf00b 100644
--- a/src/main/java/io/ebean/SqlQuery.java
+++ b/src/main/java/io/ebean/SqlQuery.java
@@ -115,6 +115,11 @@ public interface SqlQuery extends Serializable {
    */
   SqlQuery setTimeout(int secs);
 
+  /**
+   * Set a label that can be put on performance metrics that are collected.
+   */
+  SqlQuery setLabel(String label);
+
   /**
    * A hint which for JDBC translates to the Statement.fetchSize().
    * <p>
diff --git a/src/main/java/io/ebean/Update.java b/src/main/java/io/ebean/Update.java
index 637fb2c8c..70c225ce3 100644
--- a/src/main/java/io/ebean/Update.java
+++ b/src/main/java/io/ebean/Update.java
@@ -152,6 +152,11 @@ public interface Update<T> {
    */
   Update<T> setNullParameter(String name, int jdbcType);
 
+  /**
+   * Set a label meaning performance metrics will be collected for the execution of this update.
+   */
+  Update<T> setLabel(String label);
+
   /**
    * Return the sql that is actually executed.
    */
diff --git a/src/main/java/io/ebean/meta/AbstractMetricVisitor.java b/src/main/java/io/ebean/meta/AbstractMetricVisitor.java
new file mode 100644
index 000000000..c2eb25b99
--- /dev/null
+++ b/src/main/java/io/ebean/meta/AbstractMetricVisitor.java
@@ -0,0 +1,43 @@
+package io.ebean.meta;
+
+/**
+ * An abstract MetricVisitor that handles the boolean flags - reset, collectTransactionMetrics and collectQueryMetrics.
+ */
+public abstract class AbstractMetricVisitor implements MetricVisitor {
+
+  private final boolean reset;
+  private final boolean collectTransactionMetrics;
+  private final boolean collectQueryMetrics;
+
+  public AbstractMetricVisitor(boolean reset, boolean collectTransactionMetrics, boolean collectQueryMetrics) {
+    this.reset = reset;
+    this.collectTransactionMetrics = collectTransactionMetrics;
+    this.collectQueryMetrics = collectQueryMetrics;
+  }
+
+  @Override
+  public boolean isReset() {
+    return reset;
+  }
+
+  @Override
+  public boolean isCollectTransactionMetrics() {
+    return collectTransactionMetrics;
+  }
+
+  @Override
+  public boolean isCollectQueryMetrics() {
+    return collectQueryMetrics;
+  }
+
+  @Override
+  public void visitStart() {
+    // do nothing by default
+  }
+
+  @Override
+  public void visitEnd() {
+    // do nothing by default
+  }
+}
+
diff --git a/src/main/java/io/ebean/meta/BasicMetricVisitor.java b/src/main/java/io/ebean/meta/BasicMetricVisitor.java
new file mode 100644
index 000000000..bef165ed9
--- /dev/null
+++ b/src/main/java/io/ebean/meta/BasicMetricVisitor.java
@@ -0,0 +1,64 @@
+package io.ebean.meta;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A simple MetricVisitor that can collect the desired metrics into lists.
+ */
+public class BasicMetricVisitor extends AbstractMetricVisitor {
+
+  private final List<MetaTimedMetric> timed = new ArrayList<>();
+  private final List<MetaQueryMetric> dtoQuery = new ArrayList<>();
+  private final List<MetaOrmQueryMetric> ormQuery = new ArrayList<>();
+
+  /**
+   * Construct to reset and collect everything.
+   */
+  public BasicMetricVisitor() {
+    super(true, true, true);
+  }
+
+  /**
+   * Construct specifying reset and what to collect.
+   */
+  public BasicMetricVisitor(boolean reset, boolean collectTransactionMetrics, boolean collectQueryMetrics) {
+    super(reset, collectTransactionMetrics, collectQueryMetrics);
+  }
+
+  /**
+   * Return timed metrics for Transactions, labelled SqlQuery, labelled SqlUpdate.
+   */
+  public List<MetaTimedMetric> getTimedMetrics() {
+    return timed;
+  }
+
+  /**
+   * Return the DTO query metrics.
+   */
+  public List<MetaQueryMetric> getDtoQueryMetrics() {
+    return dtoQuery;
+  }
+
+  /**
+   * Return the ORM query metrics.
+   */
+  public List<MetaOrmQueryMetric> getOrmQueryMetrics() {
+    return ormQuery;
+  }
+
+  @Override
+  public void visitTimed(MetaTimedMetric metric) {
+    timed.add(metric);
+  }
+
+  @Override
+  public void visitQuery(MetaQueryMetric metric) {
+    dtoQuery.add(metric);
+  }
+
+  @Override
+  public void visitOrmQuery(MetaOrmQueryMetric metric) {
+    ormQuery.add(metric);
+  }
+}
diff --git a/src/main/java/io/ebean/meta/MetaInfoManager.java b/src/main/java/io/ebean/meta/MetaInfoManager.java
index c8d88cf83..9535de536 100644
--- a/src/main/java/io/ebean/meta/MetaInfoManager.java
+++ b/src/main/java/io/ebean/meta/MetaInfoManager.java
@@ -8,23 +8,20 @@ import java.util.List;
 public interface MetaInfoManager {
 
   /**
-   * Collect and return the transaction execution metrics.
+   * Visit the metrics resetting and collecting/reporting as desired.
    */
-  List<MetaTimedMetric> collectTransactionStatistics(boolean reset);
+  void visitMetrics(MetricVisitor visitor);
 
   /**
-   * Collect query plan statistics (new, will migrate ORM query stats over to this).
+   * Run a visit collecting all the metrics and returning BasicMetricVisitor
+   * which holds all the metrics in simple lists.
    */
-  List<MetaQueryMetric> collectQueryStatistics(boolean reset);
+  BasicMetricVisitor visitBasic();
 
   /**
-   * Collect and return the non-empty query plan statistics for all the beans.
-   * <p>
-   * Note that this excludes the query plan statistics where there has been no
-   * executions (since the last collection with reset).
-   * </p>
+   * Just reset all the metrics. Maybe only useful for testing purposes.
    */
-  List<MetaQueryPlanStatistic> collectQueryPlanStatistics(boolean reset);
+  void resetAllMetrics();
 
   /**
    * Collect and return the ObjectGraphNode statistics.
@@ -36,6 +33,6 @@ public interface MetaInfoManager {
    *
    * @param reset Set to true to reset the underlying statistics after collection.
    */
-  List<MetaObjectGraphNodeStats> collectNodeStatistics(boolean reset);
+  List<MetaOrmQueryNode> collectNodeStatistics(boolean reset);
 
 }
diff --git a/src/main/java/io/ebean/meta/MetaOrmQueryMetric.java b/src/main/java/io/ebean/meta/MetaOrmQueryMetric.java
new file mode 100644
index 000000000..7a74409f2
--- /dev/null
+++ b/src/main/java/io/ebean/meta/MetaOrmQueryMetric.java
@@ -0,0 +1,42 @@
+package io.ebean.meta;
+
+import io.ebean.ProfileLocation;
+
+import java.util.List;
+
+/**
+ * Query execution statistics for Orm queries.
+ */
+public interface MetaOrmQueryMetric extends MetaQueryMetric {
+
+  /**
+   * Return the profile location.
+   */
+  ProfileLocation getProfileLocation();
+
+  /**
+   * Return true if this query plan was tuned by AutoTune.
+   */
+  boolean isAutoTuned();
+
+  /**
+   * Return a string representation of the query plan hash.
+   */
+  String getQueryPlanHash();
+
+  /**
+   * Return the time of the last query executed using this plan.
+   */
+  long getLastQueryTime();
+
+  /**
+   * Return the 'origin' points and paths that resulted in the query being
+   * executed and the associated number of times the query was executed via that
+   * path.
+   * <p>
+   * This includes direct and lazy loading paths.
+   * </p>
+   */
+  List<MetaOrmQueryOrigin> getOrigins();
+
+}
diff --git a/src/main/java/io/ebean/meta/MetaObjectGraphNodeStats.java b/src/main/java/io/ebean/meta/MetaOrmQueryNode.java
similarity index 88%
rename from src/main/java/io/ebean/meta/MetaObjectGraphNodeStats.java
rename to src/main/java/io/ebean/meta/MetaOrmQueryNode.java
index 81421978b..0f1d6bd24 100644
--- a/src/main/java/io/ebean/meta/MetaObjectGraphNodeStats.java
+++ b/src/main/java/io/ebean/meta/MetaOrmQueryNode.java
@@ -8,10 +8,8 @@ import io.ebean.bean.ObjectGraphNode;
  * These statistics can be used to identify origin queries that result in lots
  * of lazy loading.
  * </p>
- *
- * @see MetaInfoManager#collectNodeStatistics(boolean)
  */
-public interface MetaObjectGraphNodeStats {
+public interface MetaOrmQueryNode {
 
   /**
    * Return the ObjectGraphNode which has the origin point and relative path.
diff --git a/src/main/java/io/ebean/meta/MetaQueryPlanOriginCount.java b/src/main/java/io/ebean/meta/MetaOrmQueryOrigin.java
similarity index 83%
rename from src/main/java/io/ebean/meta/MetaQueryPlanOriginCount.java
rename to src/main/java/io/ebean/meta/MetaOrmQueryOrigin.java
index 6ca5b3827..9f4d2f096 100644
--- a/src/main/java/io/ebean/meta/MetaQueryPlanOriginCount.java
+++ b/src/main/java/io/ebean/meta/MetaOrmQueryOrigin.java
@@ -9,11 +9,8 @@ import io.ebean.bean.ObjectGraphNode;
  * This basically points to the bit of original code and query that results in
  * this query directly or via lazy loading.
  * </p>
- *
- * @see MetaQueryPlanStatistic
- * @see MetaInfoManager#collectQueryPlanStatistics(boolean)
  */
-public interface MetaQueryPlanOriginCount {
+public interface MetaOrmQueryOrigin {
 
   /**
    * The 'origin' and path which this query belongs to.
diff --git a/src/main/java/io/ebean/meta/MetaQueryPlanStatistic.java b/src/main/java/io/ebean/meta/MetaQueryPlanStatistic.java
deleted file mode 100644
index fc01a0e7e..000000000
--- a/src/main/java/io/ebean/meta/MetaQueryPlanStatistic.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package io.ebean.meta;
-
-import io.ebean.ProfileLocation;
-
-import java.util.List;
-
-/**
- * Query execution statistics Meta data.
- *
- * @see MetaInfoManager#collectQueryPlanStatistics(boolean)
- */
-public interface MetaQueryPlanStatistic {
-
-  /**
-   * Return the bean type this query plan is for.
-   */
-  Class<?> getBeanType();
-
-  /**
-   * Return the profile location.
-   */
-  ProfileLocation getProfileLocation();
-
-  /**
-   * Return true if this query plan was tuned by AutoTune.
-   */
-  boolean isAutoTuned();
-
-  /**
-   * Return a string representation of the query plan hash.
-   */
-  String getQueryPlanHash();
-
-  /**
-   * Return the sql executed.
-   */
-  String getSql();
-
-  /**
-   * Return the total number of queries executed.
-   */
-  long getExecutionCount();
-
-  /**
-   * Return the total number of beans loaded by the queries.
-   * <p>
-   * This excludes background fetching.
-   * </p>
-   */
-  long getTotalLoadedBeans();
-
-  /**
-   * Return the total time taken by executions of this query.
-   */
-  long getTotalTimeMicros();
-
-  /**
-   * Return the max execution time for this query.
-   */
-  long getMaxTimeMicros();
-
-  /**
-   * Return the time collection started (or was last reset).
-   */
-  long getCollectionStart();
-
-  /**
-   * Return the time of the last query executed using this plan.
-   */
-  long getLastQueryTime();
-
-  /**
-   * Return the average query execution time in microseconds.
-   * <p>
-   * This excludes background fetching.
-   * </p>
-   */
-  long getAvgTimeMicros();
-
-  /**
-   * Return the average number of bean loaded per query.
-   * <p>
-   * This excludes background fetching.
-   * </p>
-   */
-  long getAvgLoadedBeans();
-
-  /**
-   * Return the 'origin' points and paths that resulted in the query being
-   * executed and the associated number of times the query was executed via that
-   * path.
-   * <p>
-   * This includes direct and lazy loading paths.
-   * </p>
-   */
-  List<MetaQueryPlanOriginCount> getOrigins();
-
-}
diff --git a/src/main/java/io/ebean/meta/MetaTimedMetric.java b/src/main/java/io/ebean/meta/MetaTimedMetric.java
index ada73a66f..53f67109d 100644
--- a/src/main/java/io/ebean/meta/MetaTimedMetric.java
+++ b/src/main/java/io/ebean/meta/MetaTimedMetric.java
@@ -6,6 +6,11 @@ package io.ebean.meta;
  */
 public interface MetaTimedMetric {
 
+  /**
+   * Return the metric type.
+   */
+  MetricType getMetricType();
+
   /**
    * Return the metric name.
    */
diff --git a/src/main/java/io/ebean/meta/MetricType.java b/src/main/java/io/ebean/meta/MetricType.java
new file mode 100644
index 000000000..6b39cbc47
--- /dev/null
+++ b/src/main/java/io/ebean/meta/MetricType.java
@@ -0,0 +1,30 @@
+package io.ebean.meta;
+
+/**
+ * The type of Metric.
+ */
+public enum MetricType {
+
+  /**
+   * Transactions.
+   */
+  TXN,
+
+  /**
+   * ORM queries.
+   */
+  ORM,
+
+  /**
+   * DTO queries.
+   */
+  DTO,
+
+  /**
+   * SQL queries with a label will have metrics collected.
+   * <p>
+   * SqlQuery and SqlUpdate without a label have no metrics collected.
+   */
+  SQL
+
+}
diff --git a/src/main/java/io/ebean/meta/MetricVisitor.java b/src/main/java/io/ebean/meta/MetricVisitor.java
new file mode 100644
index 000000000..8b39e6499
--- /dev/null
+++ b/src/main/java/io/ebean/meta/MetricVisitor.java
@@ -0,0 +1,48 @@
+package io.ebean.meta;
+
+/**
+ * Defines visitor to read and report the transaction and query metrics.
+ */
+public interface MetricVisitor {
+
+  /**
+   * Return true if the metrics should be reset.
+   */
+  boolean isReset();
+
+  /**
+   * Return true if we should visit the transaction metrics.
+   */
+  boolean isCollectTransactionMetrics();
+
+  /**
+   * Return true if we should visit the ORM and SQL query metrics.
+   */
+  boolean isCollectQueryMetrics();
+
+  /**
+   * Visit has started.
+   */
+  void visitStart();
+
+  /**
+   * Visit transaction metrics (and L2 cache metrics in future).
+   */
+  void visitTimed(MetaTimedMetric metric);
+
+  /**
+   * Visit DTO and SQL query metrics.
+   */
+  void visitQuery(MetaQueryMetric metric);
+
+  /**
+   * Visit ORM query metrics.
+   */
+  void visitOrmQuery(MetaOrmQueryMetric metric);
+
+  /**
+   * Visit has completed.
+   */
+  void visitEnd();
+
+}
diff --git a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
index 305672805..eb449157f 100644
--- a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
+++ b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
@@ -14,6 +14,7 @@ import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
+import io.ebean.meta.MetricVisitor;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler;
 import io.ebeaninternal.server.core.SpiResultSet;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
@@ -257,4 +258,9 @@ public interface SpiEbeanServer extends EbeanServer, BeanLoader, BeanCollectionL
    * Execute the underlying ORM query returning as a JDBC ResultSet to map to DTO beans.
    */
   SpiResultSet findResultSet(SpiQuery<?> ormQuery, SpiTransaction transaction);
+
+  /**
+   * Visit all the metrics (typically reporting them).
+   */
+  void visitMetrics(MetricVisitor visitor);
 }
diff --git a/src/main/java/io/ebeaninternal/api/SpiQuery.java b/src/main/java/io/ebeaninternal/api/SpiQuery.java
index adaa9f422..4f7184830 100644
--- a/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -179,6 +179,11 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
    */
   ProfileLocation getProfileLocation();
 
+  /**
+   * Return the label set on the query.
+   */
+  String getLabel();
+
   /**
    * Return true if this is a "find by id" query. This includes a check for a single "equal to" expression for the Id.
    */
diff --git a/src/main/java/io/ebeaninternal/api/SpiSqlBinding.java b/src/main/java/io/ebeaninternal/api/SpiSqlBinding.java
index 6da641dea..849ad0cb0 100644
--- a/src/main/java/io/ebeaninternal/api/SpiSqlBinding.java
+++ b/src/main/java/io/ebeaninternal/api/SpiSqlBinding.java
@@ -15,6 +15,11 @@ public interface SpiSqlBinding {
    */
   String getQuery();
 
+  /**
+   * Return the label (to collect metrics on when set).
+   */
+  String getLabel();
+
   /**
    * Return the first row to fetch.
    */
diff --git a/src/main/java/io/ebeaninternal/api/SpiUpdate.java b/src/main/java/io/ebeaninternal/api/SpiUpdate.java
index ebe8e5ab8..2e2ed8531 100644
--- a/src/main/java/io/ebeaninternal/api/SpiUpdate.java
+++ b/src/main/java/io/ebeaninternal/api/SpiUpdate.java
@@ -43,6 +43,11 @@ public interface SpiUpdate<T> extends Update<T> {
    */
   Class<?> getBeanType();
 
+  /**
+   * Return the label (for metrics collection).
+   */
+  String getLabel();
+
   /**
    * Return the type of this - insert, update or delete.
    */
diff --git a/src/main/java/io/ebeaninternal/metric/MetricFactory.java b/src/main/java/io/ebeaninternal/metric/MetricFactory.java
index 6f83c3e89..72ccbb3ad 100644
--- a/src/main/java/io/ebeaninternal/metric/MetricFactory.java
+++ b/src/main/java/io/ebeaninternal/metric/MetricFactory.java
@@ -1,5 +1,7 @@
 package io.ebeaninternal.metric;
 
+import io.ebean.meta.MetricType;
+
 /**
  * Factory to create timed metric counters.
  */
@@ -15,20 +17,16 @@ public interface MetricFactory {
   /**
    * Create a timed metric group.
    */
-  TimedMetricMap createTimedMetricMap(String name);
+  TimedMetricMap createTimedMetricMap(MetricType metricType, String name);
 
   /**
    * Create a Timed metric.
    */
-  TimedMetric createTimedMetric(String name);
+  TimedMetric createTimedMetric(MetricType metricType, String name);
 
   /**
    * Create a Timed metric.
    */
-  QueryPlanMetric createQueryPlanMetric(Class<?> type, String label, String sql);
+  QueryPlanMetric createQueryPlanMetric(MetricType metricType, Class<?> type, String label, String sql);
 
-  /**
-   * Return a instance used to collect Query plan metrics.
-   */
-  QueryPlanCollector createCollector(boolean reset);
 }
diff --git a/src/main/java/io/ebeaninternal/metric/QueryPlanMetric.java b/src/main/java/io/ebeaninternal/metric/QueryPlanMetric.java
index 893a97593..f0d5e31db 100644
--- a/src/main/java/io/ebeaninternal/metric/QueryPlanMetric.java
+++ b/src/main/java/io/ebeaninternal/metric/QueryPlanMetric.java
@@ -1,5 +1,7 @@
 package io.ebeaninternal.metric;
 
+import io.ebean.meta.MetricVisitor;
+
 /**
  * Internal Query plan metric holder.
  */
@@ -11,7 +13,7 @@ public interface QueryPlanMetric {
   TimedMetric getMetric();
 
   /**
-   * Collect the non-empty query plan metrics.
+   * Visit the underlying metric.
    */
-  void collect(QueryPlanCollector collector);
+  void visit(MetricVisitor visitor);
 }
diff --git a/src/main/java/io/ebeaninternal/metric/TimedMetric.java b/src/main/java/io/ebeaninternal/metric/TimedMetric.java
index a2a29e030..1bba42bb0 100644
--- a/src/main/java/io/ebeaninternal/metric/TimedMetric.java
+++ b/src/main/java/io/ebeaninternal/metric/TimedMetric.java
@@ -1,8 +1,6 @@
 package io.ebeaninternal.metric;
 
-import io.ebean.meta.MetaTimedMetric;
-
-import java.util.List;
+import io.ebean.meta.MetricVisitor;
 
 /**
  * Metric for timed events like transaction execution times.
@@ -25,12 +23,17 @@ public interface TimedMetric {
   boolean isEmpty();
 
   /**
-   * Collect the timed metric statistics.
+   * Reset the statistics.
+   */
+  void reset();
+
+  /**
+   * Collect and return a snapshot of the metrics.
    */
   TimedMetricStats collect(boolean reset);
 
   /**
-   * Add non empty metrics to the result.
+   * Visit non empty metrics.
    */
-  void collect(boolean reset, List<MetaTimedMetric> result);
+  void visit(MetricVisitor visitor);
 }
diff --git a/src/main/java/io/ebeaninternal/metric/TimedMetricMap.java b/src/main/java/io/ebeaninternal/metric/TimedMetricMap.java
index 3976b5121..801bc74c1 100644
--- a/src/main/java/io/ebeaninternal/metric/TimedMetricMap.java
+++ b/src/main/java/io/ebeaninternal/metric/TimedMetricMap.java
@@ -1,8 +1,6 @@
 package io.ebeaninternal.metric;
 
-import io.ebean.meta.MetaTimedMetric;
-
-import java.util.List;
+import io.ebean.meta.MetricVisitor;
 
 /**
  * A map of timed metrics keyed by a string.
@@ -15,7 +13,12 @@ public interface TimedMetricMap {
   void add(String key, long exeMicros);
 
   /**
-   * Add non empty metrics to the given result.
+   * Add an execution for the given key including row/bean count.
    */
-  void collect(boolean reset, List<MetaTimedMetric> result);
+  void add(String key, long exeMicros, int rows);
+
+  /**
+   * Visit the metric.
+   */
+  void visit(MetricVisitor visitor);
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
index 03feedaf4..41371c912 100644
--- a/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
@@ -24,7 +24,7 @@ import java.sql.SQLException;
  */
 public abstract class AbstractSqlQueryRequest {
 
-  private final SpiSqlBinding query;
+  protected final SpiSqlBinding query;
 
   protected final SpiEbeanServer server;
 
diff --git a/src/main/java/io/ebeaninternal/server/core/CObjectGraphNodeStatistics.java b/src/main/java/io/ebeaninternal/server/core/CObjectGraphNodeStatistics.java
index 754c0a990..8b53a86aa 100644
--- a/src/main/java/io/ebeaninternal/server/core/CObjectGraphNodeStatistics.java
+++ b/src/main/java/io/ebeaninternal/server/core/CObjectGraphNodeStatistics.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.core;
 
 import io.ebean.bean.ObjectGraphNode;
-import io.ebean.meta.MetaObjectGraphNodeStats;
+import io.ebean.meta.MetaOrmQueryNode;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.LongAdder;
@@ -35,7 +35,7 @@ public class CObjectGraphNodeStatistics {
     totalBeans.add(beanCount);
   }
 
-  public MetaObjectGraphNodeStats get(boolean reset) {
+  public MetaOrmQueryNode get(boolean reset) {
     if (reset) {
       return new Snapshot(node, startTime.getAndSet(System.currentTimeMillis()), count.sumThenReset(),
         totalTime.sumThenReset(), totalBeans.sumThenReset());
@@ -44,7 +44,7 @@ public class CObjectGraphNodeStatistics {
     }
   }
 
-  private static class Snapshot implements MetaObjectGraphNodeStats {
+  private static class Snapshot implements MetaOrmQueryNode {
 
     private final ObjectGraphNode node;
     private final long startTime;
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java b/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java
index b52c66390..6ebc4152d 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java
@@ -1,12 +1,13 @@
 package io.ebeaninternal.server.core;
 
+import io.ebean.meta.AbstractMetricVisitor;
+import io.ebean.meta.BasicMetricVisitor;
 import io.ebean.meta.MetaInfoManager;
-import io.ebean.meta.MetaObjectGraphNodeStats;
+import io.ebean.meta.MetaOrmQueryMetric;
+import io.ebean.meta.MetaOrmQueryNode;
 import io.ebean.meta.MetaQueryMetric;
-import io.ebean.meta.MetaQueryPlanStatistic;
 import io.ebean.meta.MetaTimedMetric;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.query.CQueryPlanStatsCollector;
+import io.ebean.meta.MetricVisitor;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,29 +24,26 @@ public class DefaultMetaInfoManager implements MetaInfoManager {
   }
 
   @Override
-  public List<MetaTimedMetric> collectTransactionStatistics(boolean reset) {
-    return server.collectTransactionStatistics(reset);
+  public void visitMetrics(MetricVisitor visitor) {
+    server.visitMetrics(visitor);
   }
 
   @Override
-  public List<MetaQueryMetric> collectQueryStatistics(boolean reset) {
-    return server.collectQueryStatistics(reset);
+  public BasicMetricVisitor visitBasic() {
+    BasicMetricVisitor basic = new BasicMetricVisitor();
+    visitMetrics(basic);
+    return basic;
   }
 
   @Override
-  public List<MetaQueryPlanStatistic> collectQueryPlanStatistics(boolean reset) {
-
-    CQueryPlanStatsCollector collector = new CQueryPlanStatsCollector(reset);
-    for (BeanDescriptor<?> desc : server.getBeanDescriptors()) {
-      desc.collectQueryPlanStatistics(collector);
-    }
-    return collector.getList();
+  public void resetAllMetrics() {
+    server.visitMetrics(new ResetVisitor());
   }
 
   @Override
-  public List<MetaObjectGraphNodeStats> collectNodeStatistics(boolean reset) {
+  public List<MetaOrmQueryNode> collectNodeStatistics(boolean reset) {
 
-    List<MetaObjectGraphNodeStats> list = new ArrayList<>();
+    List<MetaOrmQueryNode> list = new ArrayList<>();
     for (CObjectGraphNodeStatistics nodeStatistics : server.objectGraphStats.values()) {
       if (!nodeStatistics.isEmpty()) {
         list.add(nodeStatistics.get(reset));
@@ -54,4 +52,29 @@ public class DefaultMetaInfoManager implements MetaInfoManager {
     return list;
   }
 
+  /**
+   * Visitor that resets the statistics but doesn't collect them.
+   */
+  private static class ResetVisitor extends AbstractMetricVisitor {
+
+    ResetVisitor() {
+      super(true, true, true);
+    }
+
+    @Override
+    public void visitTimed(MetaTimedMetric metric) {
+      // ignore
+    }
+
+    @Override
+    public void visitQuery(MetaQueryMetric metric) {
+      // ignore
+    }
+
+    @Override
+    public void visitOrmQuery(MetaOrmQueryMetric metric) {
+      // ignore
+    }
+  }
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 6629aee54..700f10439 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -48,8 +48,7 @@ import io.ebean.event.BeanPersistController;
 import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.meta.MetaInfoManager;
-import io.ebean.meta.MetaQueryMetric;
-import io.ebean.meta.MetaTimedMetric;
+import io.ebean.meta.MetricVisitor;
 import io.ebean.plugin.BeanType;
 import io.ebean.plugin.Plugin;
 import io.ebean.plugin.Property;
@@ -2192,10 +2191,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
-  public List<MetaTimedMetric> collectTransactionStatistics(boolean reset) {
-    return transactionManager.collectTransactionStatistics(reset);
-  }
-
   @Override
   public Set<Property> checkUniqueness(Object bean) {
     return checkUniqueness(bean, null);
@@ -2237,8 +2232,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
 
   /**
-   * Returns a set of properties if saving the bean will violate the unique constraints
-   * (definded by given properties).
+   * Returns a set of properties if saving the bean will violate the unique constraints (defined by given properties).
    */
   private Set<Property> checkUniqueness(EntityBean entityBean, BeanDescriptor<?> beanDesc, BeanProperty[] props,
       Transaction transaction) {
@@ -2261,15 +2255,24 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
     if (findCount(query, transaction) > 0) {
       Set<Property> ret = new LinkedHashSet<>();
-      for (Property prop : props) {
-        ret.add(prop);
-      }
+      Collections.addAll(ret, props);
       return ret;
     }
     return null;
   }
 
-  public List<MetaQueryMetric> collectQueryStatistics(boolean reset) {
-    return dtoBeanManager.collectStats(reset);
+  @Override
+  public void visitMetrics(MetricVisitor visitor) {
+    visitor.visitStart();
+    if (visitor.isCollectTransactionMetrics()) {
+      transactionManager.visitMetrics(visitor);
+    }
+    if (visitor.isCollectQueryMetrics()) {
+      beanDescriptorManager.visitMetrics(visitor);
+      dtoBeanManager.visitMetrics(visitor);
+      relationalQueryEngine.visitMetrics(visitor);
+      persister.visitMetrics(visitor);
+    }
+    visitor.visitEnd();
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequest.java b/src/main/java/io/ebeaninternal/server/core/PersistRequest.java
index c74515a7c..46e7aa605 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequest.java
@@ -22,6 +22,7 @@ public abstract class PersistRequest extends BeanRequest implements BatchPostExe
     UPDATESQL(EVT_UPDATESQL),
     CALLABLESQL(EVT_CALLABLESQL);
     String profileEventId;
+
     Type(String profileEventId) {
       this.profileEventId = profileEventId;
     }
@@ -36,12 +37,30 @@ public abstract class PersistRequest extends BeanRequest implements BatchPostExe
 
   final PersistExecute persistExecute;
 
+  protected String label;
+
+  protected long startNanos;
+
+  PersistRequest(SpiEbeanServer server, SpiTransaction t, PersistExecute persistExecute) {
+    super(server, t);
+    this.persistExecute = persistExecute;
+  }
+
   /**
    * Used by CallableSqlRequest and UpdateSqlRequest.
    */
-  public PersistRequest(SpiEbeanServer server, SpiTransaction t, PersistExecute persistExecute) {
-    super(server, t);
-    this.persistExecute = persistExecute;
+  PersistRequest(SpiEbeanServer server, SpiTransaction t, PersistExecute persistExecute, String label) {
+    this(server, t, persistExecute);
+    this.label = label;
+  }
+
+  /**
+   * Effectively set start nanos if we are collecting metrics on a label.
+   */
+  public void startBind(boolean batchThisRequest) {
+    if (!batchThisRequest && label != null) {
+      startNanos = System.nanoTime();
+    }
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java
index 7f203678e..432a4eb49 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java
@@ -31,10 +31,9 @@ public final class PersistRequestCallableSql extends PersistRequest {
   /**
    * Create.
    */
-  public PersistRequestCallableSql(SpiEbeanServer server,
-                                   CallableSql cs, SpiTransaction t, PersistExecute persistExecute) {
+  public PersistRequestCallableSql(SpiEbeanServer server, CallableSql cs, SpiTransaction t, PersistExecute persistExecute) {
 
-    super(server, t, persistExecute);
+    super(server, t, persistExecute, cs.getLabel());
     this.type = PersistRequest.Type.CALLABLESQL;
     this.callableSql = (SpiCallableSql) cs;
   }
@@ -88,7 +87,9 @@ public final class PersistRequestCallableSql extends PersistRequest {
    */
   @Override
   public void postExecute() {
-
+    if (startNanos > 0) {
+      persistExecute.collectSqlCall(label, startNanos, rowCount);
+    }
     if (transaction.isLogSummary()) {
       String m = "CallableSql label[" + callableSql.getLabel() + "]" + " rows[" + rowCount + "]" + " bind[" + bindLog + "]";
       transaction.logSummary(m);
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java
index 4a55f9db6..aa2f3092e 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java
@@ -27,7 +27,7 @@ public final class PersistRequestOrmUpdate extends PersistRequest {
   public PersistRequestOrmUpdate(SpiEbeanServer server, BeanManager<?> mgr, SpiUpdate<?> ormUpdate,
                                  SpiTransaction t, PersistExecute persistExecute) {
 
-    super(server, t, persistExecute);
+    super(server, t, persistExecute, ormUpdate.getLabel());
     this.beanDescriptor = mgr.getBeanDescriptor();
     this.ormUpdate = ormUpdate;
   }
@@ -86,7 +86,9 @@ public final class PersistRequestOrmUpdate extends PersistRequest {
    */
   @Override
   public void postExecute() {
-
+    if (startNanos > 0) {
+      persistExecute.collectOrmUpdate(label, startNanos, rowCount);
+    }
     OrmUpdateType ormUpdateType = ormUpdate.getOrmUpdateType();
     String tableName = ormUpdate.getBaseTable();
 
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
index 05fd26cd6..5261de3f9 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
@@ -33,7 +33,7 @@ public final class PersistRequestUpdateSql extends PersistRequest {
   public PersistRequestUpdateSql(SpiEbeanServer server, SqlUpdate updateSql,
                                  SpiTransaction t, PersistExecute persistExecute) {
 
-    super(server, t, persistExecute);
+    super(server, t, persistExecute, updateSql.getLabel());
     this.type = Type.UPDATESQL;
     this.updateSql = (SpiSqlUpdate) updateSql;
   }
@@ -102,7 +102,9 @@ public final class PersistRequestUpdateSql extends PersistRequest {
    */
   @Override
   public void postExecute() {
-
+    if (startNanos > 0) {
+      persistExecute.collectSqlUpdate(label, startNanos, rowCount);
+    }
     if (transaction.isLogSummary()) {
       String m = description + " table[" + tableName + "] rows[" + rowCount + "] bind[" + bindLog + "]";
       transaction.logSummary(m);
diff --git a/src/main/java/io/ebeaninternal/server/core/Persister.java b/src/main/java/io/ebeaninternal/server/core/Persister.java
index f6044d040..981032053 100644
--- a/src/main/java/io/ebeaninternal/server/core/Persister.java
+++ b/src/main/java/io/ebeaninternal/server/core/Persister.java
@@ -6,6 +6,7 @@ import io.ebean.SqlUpdate;
 import io.ebean.Transaction;
 import io.ebean.Update;
 import io.ebean.bean.EntityBean;
+import io.ebean.meta.MetricVisitor;
 
 import java.util.Collection;
 import java.util.List;
@@ -78,4 +79,8 @@ public interface Persister {
    */
   <T> List<T> draftRestore(Query<T> query, Transaction transaction);
 
+  /**
+   * Visit the metrics.
+   */
+  void visitMetrics(MetricVisitor visitor);
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java b/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java
index ae4dde8f1..fa2a13b93 100644
--- a/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.core;
 
 
 import io.ebean.SqlRow;
+import io.ebean.meta.MetricVisitor;
 
 import java.util.List;
 import java.util.function.Consumer;
@@ -29,4 +30,13 @@ public interface RelationalQueryEngine {
    */
   void findEach(RelationalQueryRequest request, Predicate<SqlRow> consumer);
 
+  /**
+   * Collect SQL query execution statistics.
+   */
+  void collect(String label, long exeMicros, int rows);
+
+  /**
+   * Visit the metrics.
+   */
+  void visitMetrics(MetricVisitor visitor);
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
index dace84109..24278ea11 100644
--- a/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
@@ -46,7 +46,11 @@ public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
 
   @Override
   protected void requestComplete() {
-
+    String label = query.getLabel();
+    if (label != null) {
+      long exeMicros = (System.nanoTime() - startNano) / 1000L;
+      queryEngine.collect(label, exeMicros, rows);
+    }
   }
 
   public void findEach(Consumer<SqlRow> consumer) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 06810d7e0..8ba1b5ae6 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -27,6 +27,7 @@ import io.ebean.event.changelog.ChangeType;
 import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.event.readaudit.ReadEvent;
+import io.ebean.meta.MetricVisitor;
 import io.ebean.plugin.BeanDocType;
 import io.ebean.plugin.BeanType;
 import io.ebean.plugin.ExpressionPath;
@@ -61,7 +62,6 @@ import io.ebeaninternal.server.el.ElPropertyDeploy;
 import io.ebeaninternal.server.el.ElPropertyValue;
 import io.ebeaninternal.server.persist.DmlUtil;
 import io.ebeaninternal.server.query.CQueryPlan;
-import io.ebeaninternal.server.query.CQueryPlanStatsCollector;
 import io.ebeaninternal.server.query.SqlTreeProperty;
 import io.ebeaninternal.server.querydefn.OrmQueryDetail;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
@@ -1598,10 +1598,13 @@ public class BeanDescriptor<T> implements BeanType<T> {
     return new DeployUpdateParser(this).parse(ormUpdateStatement);
   }
 
-  public void collectQueryPlanStatistics(CQueryPlanStatsCollector collector) {
+  /**
+   * Visit all the ORM query plan metrics (includes UpdateQuery with updates and deletes).
+   */
+  public void visitMetrics(MetricVisitor visitor) {
     for (CQueryPlan queryPlan : queryPlanCache.values()) {
       if (!queryPlan.isEmptyStats()) {
-        collector.add(queryPlan.getSnapshot(collector.isReset()));
+        visitor.visitOrmQuery(queryPlan.getSnapshot(visitor.isReset()));
       }
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index b0044d91a..d1d449120 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -19,6 +19,7 @@ import io.ebean.event.changelog.ChangeLogFilter;
 import io.ebean.event.changelog.ChangeLogListener;
 import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeLogRegister;
+import io.ebean.meta.MetricVisitor;
 import io.ebean.plugin.BeanType;
 import io.ebean.util.AnnotationUtil;
 import io.ebeaninternal.api.ConcurrencyMode;
@@ -1632,6 +1633,12 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     target.setPrimaryKeyJoin(inverseJoin);
   }
 
+  public void visitMetrics(MetricVisitor visitor) {
+    for (BeanDescriptor<?> desc : immutableDescriptorList) {
+      desc.visitMetrics(visitor);
+    }
+  }
+
   /**
    * Comparator to sort the BeanDescriptors by name.
    */
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java
index 81920e858..04060e8a4 100644
--- a/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.dto;
 
-import io.ebeaninternal.metric.QueryPlanCollector;
+import io.ebean.meta.MetricVisitor;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -37,9 +37,9 @@ public class DtoBeanDescriptor<T> {
     plans.put(planKey, plan);
   }
 
-  public void collectStats(QueryPlanCollector collector) {
+  public void visit(MetricVisitor visitor) {
     for (DtoQueryPlan plan : plans.values()) {
-      plan.collectStats(collector);
+      plan.visit(visitor);
     }
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoBeanManager.java b/src/main/java/io/ebeaninternal/server/dto/DtoBeanManager.java
index 87e58a453..7cbd9488d 100644
--- a/src/main/java/io/ebeaninternal/server/dto/DtoBeanManager.java
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoBeanManager.java
@@ -1,11 +1,8 @@
 package io.ebeaninternal.server.dto;
 
-import io.ebean.meta.MetaQueryMetric;
-import io.ebeaninternal.metric.MetricFactory;
-import io.ebeaninternal.metric.QueryPlanCollector;
+import io.ebean.meta.MetricVisitor;
 import io.ebeaninternal.server.type.TypeManager;
 
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -41,13 +38,9 @@ public class DtoBeanManager {
     }
   }
 
-  public List<MetaQueryMetric> collectStats(boolean reset) {
-
-    QueryPlanCollector collector = MetricFactory.get().createCollector(reset);
-
+  public void visitMetrics(MetricVisitor visitor) {
     for (DtoBeanDescriptor value : descriptorMap.values()) {
-      value.collectStats(collector);
+      value.visit(visitor);
     }
-    return collector.complete();
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java b/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java
index d781e35c0..c7ab221ef 100644
--- a/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.dto;
 
+import io.ebean.meta.MetricType;
 import io.ebeaninternal.api.SpiDtoQuery;
 import io.ebeaninternal.metric.MetricFactory;
 import io.ebeaninternal.metric.QueryPlanMetric;
@@ -44,6 +45,6 @@ public class DtoMappingRequest {
   }
 
   public QueryPlanMetric createMetric() {
-    return MetricFactory.get().createQueryPlanMetric(type, label, sql);
+    return MetricFactory.get().createQueryPlanMetric(MetricType.DTO, type, label, sql);
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlan.java b/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlan.java
index 36d49c351..897e8cc5e 100644
--- a/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlan.java
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlan.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.dto;
 
-import io.ebeaninternal.metric.QueryPlanCollector;
+import io.ebean.meta.MetricVisitor;
 import io.ebeaninternal.server.type.DataReader;
 
 import java.sql.SQLException;
@@ -21,7 +21,7 @@ public interface DtoQueryPlan {
   void collect(long exeMicros, int rows);
 
   /**
-   * Collect the query plan statistics.
+   * Visit the metric (if not empty).
    */
-  void collectStats(QueryPlanCollector collector);
+  void visit(MetricVisitor visitor);
 }
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanBase.java b/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanBase.java
index b4a867a50..b6218cbcd 100644
--- a/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanBase.java
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanBase.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.dto;
 
-import io.ebeaninternal.metric.QueryPlanCollector;
+import io.ebean.meta.MetricVisitor;
 import io.ebeaninternal.metric.QueryPlanMetric;
 import io.ebeaninternal.metric.TimedMetric;
 
@@ -21,8 +21,7 @@ abstract class DtoQueryPlanBase implements DtoQueryPlan {
   }
 
   @Override
-  public void collectStats(QueryPlanCollector collector) {
-    planMetric.collect(collector);
+  public void visit(MetricVisitor visitor) {
+    planMetric.visit(visitor);
   }
-
 }
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index ec0e9b738..29747b439 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -513,6 +513,11 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return query.setDisableReadAuditing();
   }
 
+  @Override
+  public Query<T> setLabel(String label) {
+    return query.setLabel(label);
+  }
+
   @Override
   public ExpressionList<T> having() {
     return query.having();
diff --git a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index 6b54867ff..4d4c3a53c 100644
--- a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -798,6 +798,11 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.setCountDistinct(orderBy);
   }
 
+  @Override
+  public Query<T> setLabel(String label) {
+    return exprList.setLabel(label);
+  }
+
   @Override
   public ExpressionList<T> startsWith(String propertyName, String value) {
     return exprList.startsWith(propertyName, value);
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersistExecute.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersistExecute.java
index edaee965d..621f8338a 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersistExecute.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersistExecute.java
@@ -1,6 +1,10 @@
 package io.ebeaninternal.server.persist;
 
+import io.ebean.meta.MetricType;
+import io.ebean.meta.MetricVisitor;
 import io.ebeaninternal.api.SpiTransaction;
+import io.ebeaninternal.metric.MetricFactory;
+import io.ebeaninternal.metric.TimedMetricMap;
 import io.ebeaninternal.server.core.PersistRequestCallableSql;
 import io.ebeaninternal.server.core.PersistRequestOrmUpdate;
 import io.ebeaninternal.server.core.PersistRequestUpdateSql;
@@ -24,15 +28,48 @@ final class DefaultPersistExecute implements PersistExecute {
    */
   private final int defaultBatchSize;
 
+  private final TimedMetricMap ormUpdateMetric;
+
+  private final TimedMetricMap sqlUpdateMetric;
+
+  private final TimedMetricMap sqlCallMetric;
+
   /**
    * Construct this DmlPersistExecute.
    */
   DefaultPersistExecute(Binder binder, int defaultBatchSize) {
-
     this.exeOrmUpdate = new ExeOrmUpdate(binder);
     this.exeUpdateSql = new ExeUpdateSql(binder);
     this.exeCallableSql = new ExeCallableSql(binder);
     this.defaultBatchSize = defaultBatchSize;
+    this.ormUpdateMetric = MetricFactory.get().createTimedMetricMap(MetricType.SQL, "orm.update.");
+    this.sqlUpdateMetric = MetricFactory.get().createTimedMetricMap(MetricType.SQL, "sql.update.");
+    this.sqlCallMetric = MetricFactory.get().createTimedMetricMap(MetricType.SQL, "sql.call.");
+  }
+
+  @Override
+  public void visitMetrics(MetricVisitor visitor) {
+    ormUpdateMetric.visit(visitor);
+    sqlUpdateMetric.visit(visitor);
+    sqlCallMetric.visit(visitor);
+  }
+
+  @Override
+  public void collectOrmUpdate(String label, long startNanos, int rowCount) {
+    long exeMicros = (System.nanoTime() - startNanos) / 1000L;
+    ormUpdateMetric.add(label, exeMicros, rowCount);
+  }
+
+  @Override
+  public void collectSqlUpdate(String label, long startNanos, int rowCount) {
+    long exeMicros = (System.nanoTime() - startNanos) / 1000L;
+    sqlUpdateMetric.add(label, exeMicros, rowCount);
+  }
+
+  @Override
+  public void collectSqlCall(String label, long startNanos, int rowCount) {
+    long exeMicros = (System.nanoTime() - startNanos) / 1000L;
+    sqlCallMetric.add(label, exeMicros, rowCount);
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index a825c1653..0be2f64ae 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -10,6 +10,7 @@ import io.ebean.bean.BeanCollection.ModifyListenMode;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.PersistenceContext;
 import io.ebean.event.BeanPersistController;
+import io.ebean.meta.MetricVisitor;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.api.SpiUpdate;
@@ -79,6 +80,11 @@ public final class DefaultPersister implements Persister {
     this.persistExecute = new DefaultPersistExecute(binder, server.getServerConfig().getPersistBatchSize());
   }
 
+  @Override
+  public void visitMetrics(MetricVisitor visitor) {
+    persistExecute.visitMetrics(visitor);
+  }
+
   /**
    * Execute the CallableSql.
    */
diff --git a/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java b/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java
index a1e8daa4e..3bc2dc3d2 100644
--- a/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java
+++ b/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java
@@ -60,6 +60,7 @@ class ExeCallableSql {
 
   private CallableStatement bindStmt(PersistRequestCallableSql request, boolean batchThisRequest) throws SQLException {
 
+    request.startBind(batchThisRequest);
     SpiCallableSql callableSql = request.getCallableSql();
     SpiTransaction t = request.getTransaction();
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java b/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java
index 32faa0924..42cc54a98 100644
--- a/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java
+++ b/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java
@@ -75,6 +75,7 @@ class ExeOrmUpdate {
 
   private PreparedStatement bindStmt(PersistRequestOrmUpdate request, boolean batchThisRequest) throws SQLException {
 
+    request.startBind(batchThisRequest);
     SpiUpdate<?> ormUpdate = request.getOrmUpdate();
     SpiTransaction t = request.getTransaction();
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java b/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java
index fd1f0c7d4..88879458d 100644
--- a/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java
+++ b/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java
@@ -83,6 +83,7 @@ class ExeUpdateSql {
 
   private PreparedStatement bindStmt(PersistRequestUpdateSql request, boolean batchThisRequest) throws SQLException {
 
+    request.startBind(batchThisRequest);
     SpiSqlUpdate updateSql = request.getUpdateSql();
     SpiTransaction t = request.getTransaction();
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/PersistExecute.java b/src/main/java/io/ebeaninternal/server/persist/PersistExecute.java
index 04ce2db7c..283923fa8 100644
--- a/src/main/java/io/ebeaninternal/server/persist/PersistExecute.java
+++ b/src/main/java/io/ebeaninternal/server/persist/PersistExecute.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.persist;
 
+import io.ebean.meta.MetricVisitor;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.core.PersistRequestCallableSql;
 import io.ebeaninternal.server.core.PersistRequestOrmUpdate;
@@ -34,4 +35,23 @@ public interface PersistExecute {
    */
   int executeSqlUpdate(PersistRequestUpdateSql request);
 
+  /**
+   * Collect execution metrics for sql update.
+   */
+  void collectOrmUpdate(String label, long startNanos, int rowCount);
+
+  /**
+   * Collect execution metrics for sql update.
+   */
+  void collectSqlUpdate(String label, long startNanos, int rowCount);
+
+  /**
+   * Collect execution metrics for sql callable.
+   */
+  void collectSqlCall(String label, long startNanos, int rowCount);
+
+  /**
+   * Visit the metrics.
+   */
+  void visitMetrics(MetricVisitor visitor);
 }
diff --git a/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java b/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java
index 8eae9626c..40cd2b36a 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.profile;
 
+import io.ebean.meta.MetricType;
 import io.ebeaninternal.metric.MetricFactory;
-import io.ebeaninternal.metric.QueryPlanCollector;
 import io.ebeaninternal.metric.QueryPlanMetric;
 import io.ebeaninternal.metric.TimedMetric;
 import io.ebeaninternal.metric.TimedMetricMap;
@@ -12,22 +12,18 @@ import io.ebeaninternal.metric.TimedMetricMap;
 public class DMetricFactory implements MetricFactory {
 
   @Override
-  public TimedMetricMap createTimedMetricMap(String name) {
-    return new DTimedMetricMap(name);
+  public TimedMetricMap createTimedMetricMap(MetricType metricType, String name) {
+    return new DTimedMetricMap(metricType, name);
   }
 
   @Override
-  public TimedMetric createTimedMetric(String name) {
-    return new DTimedMetric(name);
+  public TimedMetric createTimedMetric(MetricType metricType, String name) {
+    return new DTimedMetric(metricType, name);
   }
 
   @Override
-  public QueryPlanMetric createQueryPlanMetric(Class<?> type, String label, String sql) {
-    return new DQueryPlanMetric(new DQueryPlanMeta(type, label, sql), createTimedMetric(label));
+  public QueryPlanMetric createQueryPlanMetric(MetricType metricType, Class<?> type, String label, String sql) {
+    return new DQueryPlanMetric(new DQueryPlanMeta(type, label, sql), new DTimedMetric(metricType, label));
   }
 
-  @Override
-  public QueryPlanCollector createCollector(boolean reset) {
-    return new DQueryPlanCollector(reset);
-  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/profile/DProfileLocationFactory.java b/src/main/java/io/ebeaninternal/server/profile/DProfileLocationFactory.java
index 241c2a0ac..950e10740 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DProfileLocationFactory.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DProfileLocationFactory.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.profile;
 
 import io.ebean.ProfileLocation;
+import io.ebean.meta.MetricType;
 import io.ebean.service.SpiProfileLocationFactory;
 import io.ebeaninternal.metric.MetricFactory;
 import io.ebeaninternal.metric.TimedMetric;
@@ -18,7 +19,7 @@ public class DProfileLocationFactory implements SpiProfileLocationFactory {
   @Override
   public ProfileLocation create(int lineNumber, String label) {
 
-    TimedMetric timedMetric = MetricFactory.get().createTimedMetric("txn.named." + label);
+    TimedMetric timedMetric = MetricFactory.get().createTimedMetric(MetricType.TXN, "txn.named." + label);
 
     DTimedProfileLocation loc = new DTimedProfileLocation(lineNumber, label, timedMetric);
     TimedProfileLocationRegistry.register(loc);
diff --git a/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
index b358a5584..1d7dff3e9 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
@@ -1,7 +1,8 @@
 package io.ebeaninternal.server.profile;
 
 import io.ebean.meta.MetaQueryMetric;
-import io.ebeaninternal.metric.QueryPlanCollector;
+import io.ebean.meta.MetricType;
+import io.ebean.meta.MetricVisitor;
 import io.ebeaninternal.metric.QueryPlanMetric;
 import io.ebeaninternal.metric.TimedMetric;
 import io.ebeaninternal.metric.TimedMetricStats;
@@ -9,18 +10,18 @@ import io.ebeaninternal.metric.TimedMetricStats;
 class DQueryPlanMetric implements QueryPlanMetric {
 
   private final DQueryPlanMeta meta;
-  private final TimedMetric metric;
+  private final DTimedMetric metric;
 
-  DQueryPlanMetric(DQueryPlanMeta meta, TimedMetric metric) {
+  DQueryPlanMetric(DQueryPlanMeta meta, DTimedMetric metric) {
     this.meta = meta;
     this.metric = metric;
   }
 
   @Override
-  public void collect(QueryPlanCollector collector) {
-    TimedMetricStats stats = metric.collect(collector.isReset());
+  public void visit(MetricVisitor visitor) {
+    TimedMetricStats stats = metric.collect(visitor.isReset());
     if (stats != null) {
-      collector.add(new Stats(meta, stats));
+      visitor.visitQuery(new Stats(meta, stats));
     }
   }
 
@@ -44,6 +45,11 @@ class DQueryPlanMetric implements QueryPlanMetric {
       return meta + " " + stats + " sql:" + getSql();
     }
 
+    @Override
+    public MetricType getMetricType() {
+      return stats.getMetricType();
+    }
+
     @Override
     public Class<?> getType() {
       return meta.getType();
diff --git a/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java b/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
index 1a9d61f8f..dc446b4a6 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.profile;
 
+import io.ebean.meta.MetricType;
 import io.ebeaninternal.metric.TimedMetricStats;
 
 /**
@@ -7,6 +8,8 @@ import io.ebeaninternal.metric.TimedMetricStats;
  */
 class DTimeMetricStats implements TimedMetricStats {
 
+  private final MetricType metricType;
+
   private final String name;
 
   private String location;
@@ -21,7 +24,8 @@ class DTimeMetricStats implements TimedMetricStats {
 
   private final long beanCount;
 
-  DTimeMetricStats(String name, long collectionStart, long count, long total, long max, long beanCount) {
+  DTimeMetricStats(MetricType metricType, String name, long collectionStart, long count, long total, long max, long beanCount) {
+    this.metricType = metricType;
     this.name = name;
     this.startTime = collectionStart;
     this.count = count;
@@ -53,6 +57,11 @@ class DTimeMetricStats implements TimedMetricStats {
     this.location = location;
   }
 
+  @Override
+  public MetricType getMetricType() {
+    return metricType;
+  }
+
   @Override
   public String getName() {
     return name;
diff --git a/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java b/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
index 42a7f682c..bb7ee0b6f 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
@@ -1,9 +1,9 @@
 package io.ebeaninternal.server.profile;
 
-import io.ebean.meta.MetaTimedMetric;
+import io.ebean.meta.MetricType;
+import io.ebean.meta.MetricVisitor;
 import io.ebeaninternal.metric.TimedMetric;
 
-import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.LongAccumulator;
 import java.util.concurrent.atomic.LongAdder;
@@ -16,6 +16,8 @@ import java.util.concurrent.atomic.LongAdder;
  */
 class DTimedMetric implements TimedMetric {
 
+  private final MetricType metricType;
+
   private final String name;
 
   private final LongAdder beanCount = new LongAdder();
@@ -28,7 +30,8 @@ class DTimedMetric implements TimedMetric {
 
   private final AtomicLong startTime = new AtomicLong(System.currentTimeMillis());
 
-  DTimedMetric(String name) {
+  DTimedMetric(MetricType metricType, String name) {
+    this.metricType = metricType;
     this.name = name;
   }
 
@@ -54,11 +57,23 @@ class DTimedMetric implements TimedMetric {
     return count.sum() == 0;
   }
 
+  /**
+   * Reset all the internal counters and start time.
+   */
   @Override
-  public void collect(boolean reset, List<MetaTimedMetric> result) {
-    DTimeMetricStats metric = collect(reset);
+  public void reset() {
+    startTime.set(System.currentTimeMillis());
+    max.reset();
+    count.reset();
+    total.reset();
+    beanCount.reset();
+  }
+
+  @Override
+  public void visit(MetricVisitor visitor) {
+    DTimeMetricStats metric = collect(visitor.isReset());
     if (metric != null) {
-      result.add(metric);
+      visitor.visitTimed(metric);
     }
   }
 
@@ -78,7 +93,7 @@ class DTimedMetric implements TimedMetric {
   /**
    * Return the current statistics resetting the internal values if reset is true.
    */
-  public DTimeMetricStats getStatistics(boolean reset) {
+  private DTimeMetricStats getStatistics(boolean reset) {
 
     if (reset) {
       // Note these values are not guaranteed to be consistent wrt each other
@@ -88,21 +103,11 @@ class DTimedMetric implements TimedMetric {
       final long totalVal = total.sumThenReset();
       final long countVal = count.sumThenReset();
       final long startTimeVal = startTime.getAndSet(System.currentTimeMillis());
-      return new DTimeMetricStats(name, startTimeVal, countVal, totalVal, maxVal, beans);
+      return new DTimeMetricStats(metricType, name, startTimeVal, countVal, totalVal, maxVal, beans);
 
     } else {
-      return new DTimeMetricStats(name, startTime.get(), count.sum(), total.sum(), max.get(), beanCount.sum());
+      return new DTimeMetricStats(metricType, name, startTime.get(), count.sum(), total.sum(), max.get(), beanCount.sum());
     }
   }
 
-  /**
-   * Reset all the internal counters and start time.
-   */
-  public void reset() {
-    startTime.set(System.currentTimeMillis());
-    max.reset();
-    count.reset();
-    total.reset();
-  }
-
 }
diff --git a/src/main/java/io/ebeaninternal/server/profile/DTimedMetricMap.java b/src/main/java/io/ebeaninternal/server/profile/DTimedMetricMap.java
index d077e7aea..37f1b7632 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DTimedMetricMap.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DTimedMetricMap.java
@@ -1,30 +1,38 @@
 package io.ebeaninternal.server.profile;
 
-import io.ebean.meta.MetaTimedMetric;
+import io.ebean.meta.MetricType;
+import io.ebean.meta.MetricVisitor;
 import io.ebeaninternal.metric.TimedMetricMap;
 
-import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 
 class DTimedMetricMap implements TimedMetricMap {
 
+  private final MetricType metricType;
+
   private final String name;
 
   private final ConcurrentHashMap<String, DTimedMetric> map = new ConcurrentHashMap<>();
 
-  DTimedMetricMap(String name) {
+  DTimedMetricMap(MetricType metricType, String name) {
+    this.metricType = metricType;
     this.name = name;
   }
 
   @Override
   public void add(String key, long exeMicros) {
-    map.computeIfAbsent(key, (k)-> new DTimedMetric(name + key)).add(exeMicros);
+    map.computeIfAbsent(key, (k) -> new DTimedMetric(metricType, name + key)).add(exeMicros);
   }
 
   @Override
-  public void collect(boolean reset, List<MetaTimedMetric> list) {
+  public void add(String key, long exeMicros, int rows) {
+    map.computeIfAbsent(key, (k) -> new DTimedMetric(metricType, name + key)).add(exeMicros, rows);
+  }
+
+  @Override
+  public void visit(MetricVisitor visitor) {
     for (DTimedMetric value : map.values()) {
-      value.collect(reset, list);
+      value.visit(visitor);
     }
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/profile/DTimedProfileLocation.java b/src/main/java/io/ebeaninternal/server/profile/DTimedProfileLocation.java
index ea62a335b..5479bc686 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DTimedProfileLocation.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DTimedProfileLocation.java
@@ -1,11 +1,9 @@
 package io.ebeaninternal.server.profile;
 
-import io.ebean.meta.MetaTimedMetric;
+import io.ebean.meta.MetricVisitor;
 import io.ebeaninternal.metric.TimedMetric;
 import io.ebeaninternal.metric.TimedMetricStats;
 
-import java.util.List;
-
 /**
  * Default profile location that uses stack trace.
  */
@@ -37,13 +35,11 @@ class DTimedProfileLocation extends DProfileLocation implements TimedProfileLoca
   }
 
   @Override
-  public void collect(boolean reset, List<MetaTimedMetric> list) {
-
-    TimedMetricStats collect = timedMetric.collect(reset);
+  public void visit(MetricVisitor visitor) {
+    TimedMetricStats collect = timedMetric.collect(visitor.isReset());
     if (collect != null) {
       collect.setLocation(obtain());
-      list.add(collect);
+      visitor.visitTimed(collect);
     }
   }
-
 }
diff --git a/src/main/java/io/ebeaninternal/server/profile/TimedProfileLocation.java b/src/main/java/io/ebeaninternal/server/profile/TimedProfileLocation.java
index 36f702ecd..6402993ce 100644
--- a/src/main/java/io/ebeaninternal/server/profile/TimedProfileLocation.java
+++ b/src/main/java/io/ebeaninternal/server/profile/TimedProfileLocation.java
@@ -1,11 +1,9 @@
 package io.ebeaninternal.server.profile;
 
 import io.ebean.ProfileLocation;
-import io.ebean.meta.MetaTimedMetric;
+import io.ebean.meta.MetricVisitor;
 import io.ebeaninternal.metric.TimedMetric;
 
-import java.util.List;
-
 /**
  * ProfileLocation that collects timing metrics.
  */
@@ -22,7 +20,7 @@ public interface TimedProfileLocation extends ProfileLocation {
   TimedMetric getMetric();
 
   /**
-   * Collect the metrics adding to the given list if the metrics are non empty.
+   * Visit the non empty metrics.
    */
-  void collect(boolean reset, List<MetaTimedMetric> list);
+  void visit(MetricVisitor visitor);
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
index 670098f5b..a9f7921cd 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
@@ -3,8 +3,12 @@ package io.ebeaninternal.server.query;
 import io.ebean.ProfileLocation;
 import io.ebean.bean.ObjectGraphNode;
 import io.ebean.config.dbplatform.SqlLimitResponse;
+import io.ebean.meta.MetricType;
 import io.ebeaninternal.api.CQueryPlanKey;
 import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.api.SpiQuery;
+import io.ebeaninternal.metric.MetricFactory;
+import io.ebeaninternal.metric.TimedMetric;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
 import io.ebeaninternal.server.deploy.BeanProperty;
@@ -51,6 +55,10 @@ public class CQueryPlan {
 
   private final ProfileLocation profileLocation;
 
+  private final String location;
+
+  private final String label;
+
   private final CQueryPlanKey planKey;
 
   private final boolean rawSql;
@@ -90,9 +98,12 @@ public class CQueryPlan {
     this.dataTimeZone = server.getDataTimeZone();
     this.beanType = request.getBeanDescriptor().getBeanType();
     this.planKey = request.getQueryPlanKey();
-    this.profileLocation = request.getQuery().getProfileLocation();
-    this.autoTuned = request.getQuery().isAutoTuned();
-    this.asOfTableCount = request.getQuery().getAsOfTableCount();
+    SpiQuery<?> query = request.getQuery();
+    this.profileLocation = query.getProfileLocation();
+    this.label = query.getLabel();
+    this.location = location();
+    this.autoTuned = query.isAutoTuned();
+    this.asOfTableCount = query.getAsOfTableCount();
     this.sql = sqlRes.getSql();
     this.rowNumberIncluded = sqlRes.isIncludesRowNumberColumn();
     this.sqlTree = sqlTree;
@@ -105,13 +116,15 @@ public class CQueryPlan {
   /**
    * Create a query plan for a raw sql query.
    */
-  CQueryPlan(OrmQueryRequest<?> request, String sql, SqlTree sqlTree,
-             boolean rawSql, boolean rowNumberIncluded, String logWhereSql) {
+  CQueryPlan(OrmQueryRequest<?> request, String sql, SqlTree sqlTree, boolean rawSql, boolean rowNumberIncluded, String logWhereSql) {
 
     this.server = request.getServer();
     this.dataTimeZone = server.getDataTimeZone();
     this.beanType = request.getBeanDescriptor().getBeanType();
-    this.profileLocation = request.getQuery().getProfileLocation();
+    SpiQuery<?> query = request.getQuery();
+    this.profileLocation = query.getProfileLocation();
+    this.label = query.getLabel();
+    this.location = location();
     this.planKey = buildPlanKey(sql, rawSql, rowNumberIncluded, logWhereSql);
     this.autoTuned = false;
     this.asOfTableCount = 0;
@@ -124,6 +137,9 @@ public class CQueryPlan {
     this.stats = new CQueryPlanStats(this, server.isCollectQueryOrigins());
   }
 
+  private String location() {
+    return (profileLocation == null) ? "" : profileLocation.shortDescription();
+  }
 
   private CQueryPlanKey buildPlanKey(String sql, boolean rawSql, boolean rowNumberIncluded, String logWhereSql) {
 
@@ -143,6 +159,14 @@ public class CQueryPlan {
     return profileLocation;
   }
 
+  public String getLabel() {
+    return label;
+  }
+
+  public String getLocation() {
+    return location;
+  }
+
   public DataReader createDataReader(ResultSet rset) {
     return new RsetDataReader(dataTimeZone, rset);
   }
@@ -240,17 +264,13 @@ public class CQueryPlan {
     }
   }
 
+  /**
+   * Return a copy of the current query statistics.
+   */
   public Snapshot getSnapshot(boolean reset) {
     return stats.getSnapshot(reset);
   }
 
-  /**
-   * Return the current query statistics.
-   */
-  public CQueryPlanStats getQueryStats() {
-    return stats;
-  }
-
   /**
    * Return the time this query plan was last used.
    */
@@ -268,4 +288,8 @@ public class CQueryPlan {
   public boolean isEmptyStats() {
     return stats.isEmpty();
   }
+
+  public TimedMetric createTimedMetric() {
+    return MetricFactory.get().createTimedMetric(MetricType.ORM, label);
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
index 371801037..83defb38a 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
@@ -2,16 +2,17 @@ package io.ebeaninternal.server.query;
 
 import io.ebean.ProfileLocation;
 import io.ebean.bean.ObjectGraphNode;
-import io.ebean.meta.MetaQueryPlanOriginCount;
-import io.ebean.meta.MetaQueryPlanStatistic;
+import io.ebean.meta.MetaOrmQueryMetric;
+import io.ebean.meta.MetaOrmQueryOrigin;
+import io.ebean.meta.MetricType;
+import io.ebeaninternal.metric.TimedMetric;
+import io.ebeaninternal.metric.TimedMetricStats;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.LongAccumulator;
 import java.util.concurrent.atomic.LongAdder;
 
 /**
@@ -21,15 +22,7 @@ public final class CQueryPlanStats {
 
   private final CQueryPlan queryPlan;
 
-  private final LongAdder count = new LongAdder();
-
-  private final LongAdder totalTime = new LongAdder();
-
-  private final LongAdder totalBeans = new LongAdder();
-
-  private final LongAccumulator maxTime = new LongAccumulator(Math::max, Long.MIN_VALUE);
-
-  private final AtomicLong startTime = new AtomicLong(System.currentTimeMillis());
+  private final TimedMetric timedMetric;
 
   private long lastQueryTime;
 
@@ -39,16 +32,16 @@ public final class CQueryPlanStats {
    * Construct for a given query plan.
    */
   CQueryPlanStats(CQueryPlan queryPlan, boolean collectQueryOrigins) {
-
     this.queryPlan = queryPlan;
     this.origins = !collectQueryOrigins ? null : new ConcurrentHashMap<>();
+    this.timedMetric = queryPlan.createTimedMetric();
   }
 
   /**
    * Return true if there are no statistics collected since the last reset.
    */
   public boolean isEmpty() {
-    return count.sum() == 0;
+    return timedMetric.isEmpty();
   }
 
   /**
@@ -56,10 +49,7 @@ public final class CQueryPlanStats {
    */
   public void add(long loadedBeanCount, long timeMicros, ObjectGraphNode objectGraphNode) {
 
-    count.increment();
-    totalBeans.add(loadedBeanCount);
-    totalTime.add(timeMicros);
-    maxTime.accumulate(timeMicros);
+    timedMetric.add(timeMicros, loadedBeanCount);
 
     // not safe but should be atomic
     lastQueryTime = System.currentTimeMillis();
@@ -82,14 +72,7 @@ public final class CQueryPlanStats {
    * Reset the internal statistics counters.
    */
   public void reset() {
-
-    // Racey but near enough for our purposes as we don't want locks
-    count.reset();
-    totalBeans.reset();
-    totalTime.reset();
-    maxTime.reset();
-    startTime.set(System.currentTimeMillis());
-
+    timedMetric.reset();
     if (origins != null) {
       for (LongAdder counter : origins.values()) {
         counter.reset();
@@ -109,25 +92,20 @@ public final class CQueryPlanStats {
    */
   Snapshot getSnapshot(boolean reset) {
 
-    List<MetaQueryPlanOriginCount> origins = getOrigins(reset);
-
-    // not guaranteed to be consistent due to time gaps between getting each value out of LongAdders but can live with that
-    // relative to the cost of making sure count and totalTime etc are all guaranteed to be consistent
-    if (reset) {
-      return new Snapshot(queryPlan, count.sumThenReset(), totalTime.sumThenReset(), totalBeans.sumThenReset(), maxTime.getThenReset(), startTime.getAndSet(System.currentTimeMillis()), lastQueryTime, origins);
-    }
-    return new Snapshot(queryPlan, count.sum(), totalTime.sum(), totalBeans.sum(), maxTime.get(), startTime.get(), lastQueryTime, origins);
+    TimedMetricStats collect = timedMetric.collect(reset);
+    List<MetaOrmQueryOrigin> origins = getOrigins(reset);
+    return new Snapshot(queryPlan, collect, lastQueryTime, origins);
   }
 
   /**
    * Return the list/snapshot of the origins and their counter value.
    */
-  private List<MetaQueryPlanOriginCount> getOrigins(boolean reset) {
+  private List<MetaOrmQueryOrigin> getOrigins(boolean reset) {
     if (origins == null) {
       return Collections.emptyList();
     }
 
-    List<MetaQueryPlanOriginCount> list = new ArrayList<>(origins.size());
+    List<MetaOrmQueryOrigin> list = new ArrayList<>(origins.size());
 
     for (Entry<ObjectGraphNode, LongAdder> entry : origins.entrySet()) {
       if (reset) {
@@ -142,7 +120,7 @@ public final class CQueryPlanStats {
   /**
    * Snapshot of the origin ObjectGraphNode and counter value.
    */
-  private static class OriginSnapshot implements MetaQueryPlanOriginCount {
+  private static class OriginSnapshot implements MetaOrmQueryOrigin {
     private final ObjectGraphNode objectGraphNode;
     private final long count;
 
@@ -170,70 +148,83 @@ public final class CQueryPlanStats {
   /**
    * A snapshot of the current statistics for a query plan.
    */
-  public static class Snapshot implements MetaQueryPlanStatistic {
+  static class Snapshot implements MetaOrmQueryMetric {
 
     private final CQueryPlan queryPlan;
-    private final long count;
-    private final long totalTime;
-    private final long totalBeans;
-    private final long maxTime;
-    private final long startTime;
+    private final TimedMetricStats metrics;
     private final long lastQueryTime;
-    private final List<MetaQueryPlanOriginCount> origins;
-
-    Snapshot(CQueryPlan queryPlan, long count, long totalTime, long totalBeans, long maxTime, long startTime, long lastQueryTime,
-             List<MetaQueryPlanOriginCount> origins) {
+    private final List<MetaOrmQueryOrigin> origins;
 
+    Snapshot(CQueryPlan queryPlan, TimedMetricStats metrics, long lastQueryTime, List<MetaOrmQueryOrigin> origins) {
       this.queryPlan = queryPlan;
-      this.count = count;
-      this.totalTime = totalTime;
-      this.totalBeans = totalBeans;
-      this.maxTime = maxTime;
-      this.startTime = startTime;
+      this.metrics = metrics;
       this.lastQueryTime = lastQueryTime;
       this.origins = origins;
     }
 
     @Override
     public String toString() {
-      ProfileLocation profileLocation = queryPlan.getProfileLocation();
-      String loc = (profileLocation == null) ? "" : profileLocation.shortDescription();
-      return "location:" + loc + " count:" + count + " time:" + totalTime  + " maxTime:" + maxTime + " beans:" + totalBeans + " sql:" + getSql();
+      return "location:" + getLocation() + " metrics:" + metrics + " sql:" + getSql();
     }
 
     @Override
-    public Class<?> getBeanType() {
+    public MetricType getMetricType() {
+      return MetricType.ORM;
+    }
+
+    @Override
+    public Class<?> getType() {
       return queryPlan.getBeanType();
     }
 
+    @Override
+    public String getLabel() {
+      return queryPlan.getLabel();
+    }
+
+    @Override
+    public String getName() {
+      return queryPlan.getLabel();
+    }
+
+    @Override
+    public String getLocation() {
+      return queryPlan.getLocation();
+    }
+
     @Override
     public ProfileLocation getProfileLocation() {
       return queryPlan.getProfileLocation();
     }
 
     @Override
-    public long getExecutionCount() {
-      return count;
+    public long getBeanCount() {
+      return metrics.getBeanCount();
     }
 
     @Override
-    public long getTotalTimeMicros() {
-      return totalTime;
+    public long getCount() {
+      return metrics.getCount();
     }
 
     @Override
-    public long getTotalLoadedBeans() {
-      return totalBeans;
+    public long getTotal() {
+      return metrics.getTotal();
     }
 
     @Override
-    public long getMaxTimeMicros() {
-      return maxTime;
+    public long getMax() {
+      return metrics.getMax();
     }
 
     @Override
-    public long getCollectionStart() {
-      return startTime;
+    public long getMean() {
+      return metrics.getMean();
+    }
+
+    @Override
+    public long getStartTime() {
+      return metrics.getStartTime();
     }
 
     @Override
@@ -257,17 +248,7 @@ public final class CQueryPlanStats {
     }
 
     @Override
-    public long getAvgTimeMicros() {
-      return count < 1 ? 0 : totalTime / count;
-    }
-
-    @Override
-    public long getAvgLoadedBeans() {
-      return count < 1 ? 0 : totalBeans / count;
-    }
-
-    @Override
-    public List<MetaQueryPlanOriginCount> getOrigins() {
+    public List<MetaOrmQueryOrigin> getOrigins() {
       return origins;
     }
 
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlanStatsCollector.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlanStatsCollector.java
deleted file mode 100644
index cb458e3c9..000000000
--- a/src/main/java/io/ebeaninternal/server/query/CQueryPlanStatsCollector.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.ebeaninternal.server.query;
-
-import io.ebean.meta.MetaQueryPlanStatistic;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Helper to collect query plan execution statistics.
- */
-public class CQueryPlanStatsCollector {
-
-  private final boolean reset;
-
-  List<MetaQueryPlanStatistic> list = new ArrayList<>();
-
-  public CQueryPlanStatsCollector(boolean reset) {
-    this.reset = reset;
-  }
-
-  public boolean isReset() {
-    return reset;
-  }
-
-  public void add(MetaQueryPlanStatistic planStatistic) {
-    list.add(planStatistic);
-  }
-
-  public List<MetaQueryPlanStatistic> getList() {
-    return list;
-  }
-}
diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
index 4be7bec7b..f1282f9d2 100644
--- a/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
@@ -1,7 +1,11 @@
 package io.ebeaninternal.server.query;
 
 import io.ebean.SqlRow;
+import io.ebean.meta.MetricType;
+import io.ebean.meta.MetricVisitor;
 import io.ebeaninternal.api.SpiQuery;
+import io.ebeaninternal.metric.MetricFactory;
+import io.ebeaninternal.metric.TimedMetricMap;
 import io.ebeaninternal.server.core.Message;
 import io.ebeaninternal.server.core.RelationalQueryEngine;
 import io.ebeaninternal.server.core.RelationalQueryRequest;
@@ -25,10 +29,23 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
 
   private final boolean binaryOptimizedUUID;
 
+  private final TimedMetricMap timedMetricMap;
+
   public DefaultRelationalQueryEngine(Binder binder, String dbTrueValue, boolean binaryOptimizedUUID) {
     this.binder = binder;
     this.dbTrueValue = dbTrueValue == null ? "true" : dbTrueValue;
     this.binaryOptimizedUUID = binaryOptimizedUUID;
+    this.timedMetricMap = MetricFactory.get().createTimedMetricMap(MetricType.SQL, "sql.query.");
+  }
+
+  @Override
+  public void collect(String label, long exeMicros, int rows) {
+    timedMetricMap.add(label, exeMicros, rows);
+  }
+
+  @Override
+  public void visitMetrics(MetricVisitor visitor) {
+    timedMetricMap.visit(visitor);
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
index cf3158974..3c7049fe2 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
@@ -51,6 +51,7 @@ public class DefaultDtoQuery<T> implements SpiDtoQuery<T> {
     this.server = server;
     this.descriptor = descriptor;
     this.ormQuery = ormQuery;
+    this.label = ormQuery.getLabel();
   }
 
   /**
@@ -65,7 +66,7 @@ public class DefaultDtoQuery<T> implements SpiDtoQuery<T> {
 
   @Override
   public String planKey() {
-    return sql+":first"+firstRow+":max"+maxRows;
+    return sql + ":first" + firstRow + ":max" + maxRows;
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 7a908b410..0359e97c2 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -96,6 +96,8 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   private Type type;
 
+  private String label;
+
   private Mode mode = Mode.NORMAL;
 
   private Object tenantId;
@@ -340,6 +342,17 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return this;
   }
 
+  @Override
+  public String getLabel() {
+    return label;
+  }
+
+  @Override
+  public Query<T> setLabel(String label) {
+    this.label = label;
+    return this;
+  }
+
   @Override
   public boolean isAutoTunable() {
     return nativeSql == null && beanDescriptor.isAutoTunable();
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmUpdate.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmUpdate.java
index 0e232909f..0381df322 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmUpdate.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmUpdate.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.querydefn;
 
 import io.ebean.EbeanServer;
+import io.ebean.Update;
 import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.SpiUpdate;
 
@@ -23,6 +24,8 @@ public final class DefaultOrmUpdate<T> implements SpiUpdate<T>, Serializable {
    */
   private final String name;
 
+  private String label;
+
   /**
    * The parameters used to bind to the sql.
    */
@@ -137,6 +140,17 @@ public final class DefaultOrmUpdate<T> implements SpiUpdate<T>, Serializable {
     return name;
   }
 
+  @Override
+  public Update<T> setLabel(String label) {
+    this.label = label;
+    return this;
+  }
+
+  @Override
+  public String getLabel() {
+    return label;
+  }
+
   @Override
   public String getUpdateStatement() {
     return updateStatement;
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
index d2c9dfa6b..eb344b003 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
@@ -19,6 +19,8 @@ public class DefaultRelationalQuery implements SpiSqlQuery {
 
   private final transient EbeanServer server;
 
+  private String label;
+
   private String query;
 
   private int firstRow;
@@ -122,6 +124,17 @@ public class DefaultRelationalQuery implements SpiSqlQuery {
     return this;
   }
 
+  @Override
+  public String getLabel() {
+    return label;
+  }
+
+  @Override
+  public DefaultRelationalQuery setLabel(String label) {
+    this.label = label;
+    return this;
+  }
+
   @Override
   public BindParams getBindParams() {
     return bindParams;
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index 2a8bf37cc..c76358829 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -11,7 +11,8 @@ import io.ebean.config.dbplatform.DatabasePlatform.OnQueryOnly;
 import io.ebean.event.changelog.ChangeLogListener;
 import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeSet;
-import io.ebean.meta.MetaTimedMetric;
+import io.ebean.meta.MetricType;
+import io.ebean.meta.MetricVisitor;
 import io.ebeaninternal.api.ScopeTrans;
 import io.ebeaninternal.api.ScopedTransaction;
 import io.ebeaninternal.api.SpiProfileHandler;
@@ -37,7 +38,6 @@ import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
@@ -170,9 +170,9 @@ public class TransactionManager implements SpiTransactionManager {
     this.transactionFactory = TransactionFactoryBuilder.build(this, dataSourceSupplier, tenantProvider);
 
     MetricFactory metricFactory = MetricFactory.get();
-    this.txnMain = metricFactory.createTimedMetric("txn.main");
-    this.txnReadOnly = metricFactory.createTimedMetric("txn.readonly");
-    this.txnNamed = metricFactory.createTimedMetricMap("txn.named.");
+    this.txnMain = metricFactory.createTimedMetric(MetricType.TXN, "txn.main");
+    this.txnReadOnly = metricFactory.createTimedMetric(MetricType.TXN, "txn.readonly");
+    this.txnNamed = metricFactory.createTimedMetricMap(MetricType.TXN, "txn.named.");
 
     scopeManager.register(this);
   }
@@ -528,21 +528,13 @@ public class TransactionManager implements SpiTransactionManager {
     txnNamed.add(label, exeMicros);
   }
 
-  /**
-   * Collect the transaction execution statistics since the last reset.
-   */
-  public List<MetaTimedMetric> collectTransactionStatistics(boolean reset) {
-
-    List<MetaTimedMetric> list = new ArrayList<>();
-
-    txnMain.collect(reset, list);
-    txnReadOnly.collect(reset, list);
+  public void visitMetrics(MetricVisitor visitor) {
+    txnMain.visit(visitor);
+    txnReadOnly.visit(visitor);
+    txnNamed.visit(visitor);
     for (TimedProfileLocation timedLocation : TimedProfileLocationRegistry.registered()) {
-      timedLocation.collect(reset, list);
+      timedLocation.visit(visitor);
     }
-    txnNamed.collect(reset, list);
-
-    return list;
   }
 
   /**
@@ -562,7 +554,7 @@ public class TransactionManager implements SpiTransactionManager {
     if (st instanceof ScopedTransaction) {
       // can be null for Supports as that can start as a 'No Transaction' and then
       // effectively be replaced by transactions inside the scope
-      ((ScopedTransaction)st).complete(returnOrThrowable, opCode);
+      ((ScopedTransaction) st).complete(returnOrThrowable, opCode);
     }
   }
 
diff --git a/src/test/java/io/ebean/BaseTestCase.java b/src/test/java/io/ebean/BaseTestCase.java
index 16e4ef45d..cee47bcaf 100644
--- a/src/test/java/io/ebean/BaseTestCase.java
+++ b/src/test/java/io/ebean/BaseTestCase.java
@@ -1,6 +1,9 @@
 package io.ebean;
 
 import io.ebean.annotation.Platform;
+import io.ebean.meta.BasicMetricVisitor;
+import io.ebean.meta.MetaTimedMetric;
+import io.ebean.meta.MetricType;
 import io.ebean.util.StringHelper;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiQuery;
@@ -14,6 +17,8 @@ import org.slf4j.LoggerFactory;
 import org.tests.model.basic.Country;
 
 import java.sql.Types;
+import java.util.List;
+import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -52,6 +57,26 @@ public abstract class BaseTestCase {
     }
   }
 
+  protected void resetAllMetrics() {
+    server().getMetaInfoManager().resetAllMetrics();
+  }
+
+  protected BasicMetricVisitor visitMetricsBasic() {
+     return server().getMetaInfoManager().visitBasic();
+  }
+
+  protected List<MetaTimedMetric> visitTimedMetrics() {
+    return visitMetricsBasic().getTimedMetrics();
+  }
+
+  protected List<MetaTimedMetric> sqlMetrics() {
+    List<MetaTimedMetric> timedMetrics = visitTimedMetrics();
+
+    return timedMetrics.stream()
+      .filter((it) -> it.getMetricType() == MetricType.SQL)
+      .collect(Collectors.toList());
+  }
+
   /**
    * Return the generated sql trimming column alias if required.
    */
diff --git a/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
index c72cfa330..0278a51c8 100644
--- a/src/test/java/io/ebean/DtoQueryFromOrmTest.java
+++ b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
@@ -1,7 +1,11 @@
 package io.ebean;
 
+import io.ebean.meta.BasicMetricVisitor;
 import io.ebean.meta.MetaQueryMetric;
+import io.ebean.meta.MetaTimedMetric;
 import org.ebeantest.LoggedSqlCollector;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.tests.model.basic.Contact;
@@ -13,18 +17,23 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class DtoQueryFromOrmTest extends BaseTestCase {
 
-//  @BeforeClass
-//  public static void resetStats() {
-//    Ebean.getDefaultServer().getMetaInfoManager().collectQueryStatistics(true);
-//  }
-//
-//  @AfterClass
-//  public static void reportStats() {
-//    List<MetaQueryMetric> stats = Ebean.getDefaultServer().getMetaInfoManager().collectQueryStatistics(false);
-//    for (MetaQueryMetric stat : stats) {
-//      System.out.println(stat);
-//    }
-//  }
+  @BeforeClass
+  public static void resetStats() {
+    Ebean.getDefaultServer().getMetaInfoManager().resetAllMetrics();
+  }
+
+  @AfterClass
+  public static void reportStats() {
+    BasicMetricVisitor basic = Ebean.getDefaultServer().getMetaInfoManager().visitBasic();
+    for (MetaQueryMetric metric : basic.getDtoQueryMetrics()) {
+      System.out.println(metric);
+    }
+
+    System.out.println("-- transaction metrics --");
+    for (MetaTimedMetric metric : basic.getTimedMetrics()) {
+      System.out.println(metric);
+    }
+  }
 
   @Ignore
   @Test
@@ -32,9 +41,9 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Ebean.getDefaultServer().getMetaInfoManager().collectQueryStatistics(true);
+    resetAllMetrics();
 
-    String[] prefix = {"Bl", "B", "Red"};
+    String[] prefix = {"Bl", "B", "Red", "jim"};
 
     for (String val : prefix) {
       List<ContactDto> list = Ebean.find(Contact.class)
@@ -43,12 +52,15 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
         .orderBy().asc("lastName")
         .setMaxRows(10)
         .asDto(ContactDto.class)
+        .setLabel("prefixLoop")
         .findList();
 
       System.out.println("List:" + list);
     }
 
-    List<MetaQueryMetric> stats = Ebean.getDefaultServer().getMetaInfoManager().collectQueryStatistics(true);
+    BasicMetricVisitor basic = visitMetricsBasic();
+
+    List<MetaQueryMetric> stats = basic.getDtoQueryMetrics();
     for (MetaQueryMetric stat : stats) {
       System.out.println(stat);
     }
@@ -72,6 +84,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
         .where().isNotNull("email").isNotNull("lastName")
         .orderBy().asc("lastName")
         .asDto(ContactDto.class)
+        .setLabel("explicitId")
         .setRelaxedMode();
 
     List<ContactDto> dtos = query.findList();
@@ -126,6 +139,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     List<ContactDto> contactDtos
       = Ebean.find(Contact.class)
+      .setLabel("emailFullName")
       .select("email, concat(lastName,', ',firstName) as fullName")
       .where().isNotNull("email").isNotNull("lastName")
       .orderBy().asc("lastName")
diff --git a/src/test/java/io/ebean/DtoQueryTest.java b/src/test/java/io/ebean/DtoQueryTest.java
index 53bf02730..7957559dc 100644
--- a/src/test/java/io/ebean/DtoQueryTest.java
+++ b/src/test/java/io/ebean/DtoQueryTest.java
@@ -1,5 +1,6 @@
 package io.ebean;
 
+import io.ebean.meta.BasicMetricVisitor;
 import io.ebean.meta.MetaQueryMetric;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
@@ -102,7 +103,7 @@ public class DtoQueryTest extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    server().getMetaInfoManager().collectQueryStatistics(true);
+    resetAllMetrics();
 
     String[] names = {"Rob", "Fiona", "Shrek"};
 
@@ -116,14 +117,17 @@ public class DtoQueryTest extends BaseTestCase {
       log.info("Found " + custs);
     }
 
-    List<MetaQueryMetric> stats = server().getMetaInfoManager().collectQueryStatistics(false);
+    // collect without reset
+    BasicMetricVisitor basic = new BasicMetricVisitor(false, true, true);
+    server().getMetaInfoManager().visitMetrics(basic);
 
+    List<MetaQueryMetric> stats = basic.getDtoQueryMetrics();
     assertThat(stats).hasSize(1);
 
     MetaQueryMetric queryMetric = stats.get(0);
-
     assertThat(queryMetric.getLabel()).isEqualTo("basic");
     assertThat(queryMetric.getCount()).isEqualTo(3);
+    assertThat(queryMetric.getName()).isEqualTo("basic");
 
 
     server().findDto(DCust.class, "select c4.id, c4.name from o_customer c4 where lower(c4.name) = :name")
@@ -131,7 +135,9 @@ public class DtoQueryTest extends BaseTestCase {
       .setParameter("name", "rob")
       .findList();
 
-    stats = server().getMetaInfoManager().collectQueryStatistics(true);
+    BasicMetricVisitor metric2 = server().getMetaInfoManager().visitBasic();
+
+    stats = metric2.getDtoQueryMetrics();
     assertThat(stats).hasSize(2);
 
     log.info("stats " + stats);
diff --git a/src/test/java/io/ebean/UpdateQueryTest.java b/src/test/java/io/ebean/UpdateQueryTest.java
index 0a8e81fbc..00498227d 100644
--- a/src/test/java/io/ebean/UpdateQueryTest.java
+++ b/src/test/java/io/ebean/UpdateQueryTest.java
@@ -2,11 +2,14 @@ package io.ebean;
 
 import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.Platform;
+import io.ebean.meta.BasicMetricVisitor;
+import io.ebean.meta.MetaOrmQueryMetric;
 import org.junit.Test;
 import org.tests.model.basic.Country;
 import org.tests.model.basic.Customer;
 
 import java.sql.Timestamp;
+import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -16,6 +19,8 @@ public class UpdateQueryTest extends BaseTestCase {
   @Test
   public void basic() {
 
+    resetAllMetrics();
+
     EbeanServer server = server();
     UpdateQuery<Customer> update = server.update(Customer.class);
     Query<Customer> query = update
@@ -24,11 +29,17 @@ public class UpdateQueryTest extends BaseTestCase {
       .where()
       .eq("status", Customer.Status.NEW)
       .gt("id", 1000)
-      .query();
+      .setLabel("updateActive");
 
     query.update();
 
     assertThat(query.getGeneratedSql()).contains("update o_customer set status=?, updtime=? where status = ?  and id > ?");
+
+    BasicMetricVisitor basic = visitMetricsBasic();
+    List<MetaOrmQueryMetric> ormQueryMetrics = basic.getOrmQueryMetrics();
+    assertThat(ormQueryMetrics).hasSize(1);
+    assertThat(ormQueryMetrics.get(0).getType()).isEqualTo(Customer.class);
+    assertThat(ormQueryMetrics.get(0).getLabel()).isEqualTo("updateActive");
   }
 
   @Test
diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index 349767266..62265c0fb 100644
--- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -36,6 +36,7 @@ import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.meta.MetaInfoManager;
+import io.ebean.meta.MetricVisitor;
 import io.ebean.plugin.Property;
 import io.ebean.plugin.SpiServer;
 import io.ebean.text.csv.CsvReader;
@@ -275,6 +276,11 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
 
   }
 
+  @Override
+  public void visitMetrics(MetricVisitor visitor) {
+
+  }
+
   @Override
   public void loadMany(BeanCollection<?> collection, boolean onlyIds) {
 
diff --git a/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java b/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java
index a6295b842..457bfad89 100644
--- a/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java
+++ b/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.profile;
 
+import io.ebean.meta.MetricType;
 import io.ebeaninternal.metric.MetricFactory;
 import org.junit.Test;
 
@@ -10,7 +11,7 @@ public class BasicProfileLocationTest {
   @Test
   public void obtain() {
 
-    DProfileLocation loc = new DTimedProfileLocation(12, "foo", MetricFactory.get().createTimedMetric("junk"));
+    DProfileLocation loc = new DTimedProfileLocation(12, "foo", MetricFactory.get().createTimedMetric(MetricType.TXN, "junk"));
 
     assertThat(loc.obtain()).endsWith(":12)");
     assertThat(loc.shortDescription()).isEqualTo("NativeMethodAccessorImpl.invoke0(Native Method:12)");
diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
index 7046d8c64..37998bfdc 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
@@ -6,7 +6,7 @@ import io.ebean.EbeanServer;
 import io.ebean.Transaction;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Transactional;
-import io.ebean.meta.MetaInfoManager;
+import io.ebean.meta.BasicMetricVisitor;
 import io.ebean.meta.MetaTimedMetric;
 import io.ebeaninternal.api.SpiTransaction;
 import org.ebeantest.LoggedSqlCollector;
@@ -29,8 +29,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
 
     EbeanServer server = Ebean.getDefaultServer();
 
-    MetaInfoManager metaInfoManager = server.getMetaInfoManager();
-    metaInfoManager.collectTransactionStatistics(true);
+    resetAllMetrics();
 
     Transaction transaction = server.beginTransaction();
     try {
@@ -76,7 +75,8 @@ public class TestBatchInsertFlush extends BaseTestCase {
       transaction.end();
     }
 
-    List<MetaTimedMetric> txnStats = metaInfoManager.collectTransactionStatistics(true);
+    BasicMetricVisitor basic = visitMetricsBasic();
+    List<MetaTimedMetric> txnStats = basic.getTimedMetrics();
     for (MetaTimedMetric txnMetric : txnStats) {
       System.out.println(txnMetric);
     }
diff --git a/src/test/java/org/tests/m2m/TestM2mDeleteObject.java b/src/test/java/org/tests/m2m/TestM2mDeleteObject.java
index 9fed238ca..3ba05ee68 100644
--- a/src/test/java/org/tests/m2m/TestM2mDeleteObject.java
+++ b/src/test/java/org/tests/m2m/TestM2mDeleteObject.java
@@ -2,25 +2,34 @@ package org.tests.m2m;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.meta.MetaTimedMetric;
+import org.junit.Assert;
+import org.junit.Test;
 import org.tests.model.m2m.Permission;
 import org.tests.model.m2m.Role;
 import org.tests.model.m2m.Tenant;
-import org.junit.Assert;
-import org.junit.Test;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class TestM2mDeleteObject extends BaseTestCase {
 
   @Test
   public void test() {
 
-    Ebean.createUpdate(Permission.class, "delete from Permission").execute();
+    resetAllMetrics();
+
+    Ebean.createUpdate(Permission.class, "delete from Permission").setLabel("deleteAllPermissions").execute();
     Ebean.createUpdate(Tenant.class, "delete from Tenant").execute();
     Ebean.createUpdate(Role.class, "delete from Role").execute();
 
+    List<MetaTimedMetric> sqlMetrics = sqlMetrics();
+    assertThat(sqlMetrics).hasSize(1);
+    assertThat(sqlMetrics.get(0).getName()).isEqualTo("orm.update.deleteAllPermissions");
+
     Tenant t = new Tenant("tenant");
 
     Ebean.save(t);
diff --git a/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/src/test/java/org/tests/query/finder/TestCustomerFinder.java
index bfd51e476..63e41a954 100644
--- a/src/test/java/org/tests/query/finder/TestCustomerFinder.java
+++ b/src/test/java/org/tests/query/finder/TestCustomerFinder.java
@@ -3,8 +3,8 @@ package org.tests.query.finder;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Transaction;
-import io.ebean.meta.MetaInfoManager;
-import io.ebean.meta.MetaQueryPlanStatistic;
+import io.ebean.meta.BasicMetricVisitor;
+import io.ebean.meta.MetaOrmQueryMetric;
 import io.ebean.meta.MetaTimedMetric;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
@@ -136,9 +136,7 @@ public class TestCustomerFinder extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    MetaInfoManager metaInfoManager = Ebean.getDefaultServer().getMetaInfoManager();
-    metaInfoManager.collectQueryPlanStatistics(true);
-    metaInfoManager.collectTransactionStatistics(true);
+    resetAllMetrics();
 
     List<Customer> customers = Customer.find.all();
     assertThat(customers).isNotEmpty();
@@ -153,14 +151,16 @@ public class TestCustomerFinder extends BaseTestCase {
     Customer.find.updateNames("Junk", 2000);
     Customer.find.byId(3);
 
-    List<MetaQueryPlanStatistic> planStats = metaInfoManager.collectQueryPlanStatistics(true);
+    BasicMetricVisitor basic = server().getMetaInfoManager().visitBasic();
+
+    List<MetaOrmQueryMetric> planStats = basic.getOrmQueryMetrics();
     assertThat(planStats.size()).isGreaterThan(4);
 
-    for (MetaQueryPlanStatistic planStat : planStats) {
+    for (MetaOrmQueryMetric planStat : planStats) {
       System.out.println(planStat);
     }
 
-    for (MetaTimedMetric txnTimed : metaInfoManager.collectTransactionStatistics(true)) {
+    for (MetaTimedMetric txnTimed : basic.getTimedMetrics()) {
       System.out.println(txnTimed);
     }
   }
diff --git a/src/test/java/org/tests/query/other/TestObjectGraphNodeStatsCollection.java b/src/test/java/org/tests/query/other/TestObjectGraphNodeStatsCollection.java
index 228568a8e..a7c26b691 100644
--- a/src/test/java/org/tests/query/other/TestObjectGraphNodeStatsCollection.java
+++ b/src/test/java/org/tests/query/other/TestObjectGraphNodeStatsCollection.java
@@ -3,16 +3,17 @@ package org.tests.query.other;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.EbeanServer;
+import io.ebean.meta.BasicMetricVisitor;
 import io.ebean.meta.MetaInfoManager;
-import io.ebean.meta.MetaObjectGraphNodeStats;
-import io.ebean.meta.MetaQueryPlanStatistic;
+import io.ebean.meta.MetaOrmQueryMetric;
+import io.ebean.meta.MetaOrmQueryNode;
+import org.junit.Assert;
+import org.junit.Test;
 import org.tests.model.basic.Address;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.OrderDetail;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Assert;
-import org.junit.Test;
 
 import java.util.List;
 
@@ -30,19 +31,19 @@ public class TestObjectGraphNodeStatsCollection extends BaseTestCase {
     server.find(Order.class).findCount();
 
     infoManager.collectNodeStatistics(true);
-    infoManager.collectQueryPlanStatistics(true);
+    infoManager.resetAllMetrics();
 
     runFindOrderQuery(server);
     runFindCustomerQuery(server);
 
-    List<MetaObjectGraphNodeStats> nodeStatistics = infoManager.collectNodeStatistics(true);
-    for (MetaObjectGraphNodeStats stat : nodeStatistics) {
-      stat.toString();
+    List<MetaOrmQueryNode> nodeStatistics = infoManager.collectNodeStatistics(true);
+    for (MetaOrmQueryNode stat : nodeStatistics) {
+      System.out.println(stat);
     }
 
-    List<MetaQueryPlanStatistic> planStatistics = infoManager.collectQueryPlanStatistics(true);
-    for (MetaQueryPlanStatistic planStatistic : planStatistics) {
-      planStatistic.getSql();
+    BasicMetricVisitor basic = infoManager.visitBasic();
+    for (MetaOrmQueryMetric queryMetric : basic.getOrmQueryMetrics()) {
+      System.out.println(queryMetric);
     }
 
   }
diff --git a/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java b/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
index 39d71a2d3..1e0a5e830 100644
--- a/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
+++ b/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
@@ -4,6 +4,7 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
+import io.ebean.meta.MetaTimedMetric;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.model.basic.Order;
@@ -114,9 +115,13 @@ public class SqlQueryTests extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    SqlQuery sqlQuery = Ebean.createSqlQuery("select * from o_order where o_order.id > :id order by id");
-    sqlQuery.setParameter("id", 3);
-    sqlQuery.setMaxRows(10);
+    resetAllMetrics();
+
+    SqlQuery sqlQuery = Ebean.createSqlQuery("select * from o_order where o_order.id > :id order by id")
+      .setParameter("id", 3)
+      .setMaxRows(10)
+      .setLabel("findList-3-10");
+
 
     LoggedSqlCollector.start();
     sqlQuery.findList();
@@ -129,6 +134,8 @@ public class SqlQueryTests extends BaseTestCase {
     } else {
       assertThat(sql.get(0)).contains("select * from o_order where o_order.id > ? order by id limit 10;");
     }
+
+    assertThat(sqlMetrics()).isNotEmpty();
   }
 
   @Test
@@ -136,8 +143,11 @@ public class SqlQueryTests extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    SqlQuery sqlQuery = Ebean.createSqlQuery("Select * from o_order");
-    sqlQuery.setMaxRows(10);
+    resetAllMetrics();
+
+    SqlQuery sqlQuery = Ebean.createSqlQuery("Select * from o_order")
+      .setMaxRows(10)
+      .setLabel("findEach-Max10Rows");
 
     LoggedSqlCollector.start();
     sqlQuery.findEach(bean -> bean.get("id"));
@@ -150,6 +160,10 @@ public class SqlQueryTests extends BaseTestCase {
     } else {
       assertThat(sql.get(0)).contains("limit 10");
     }
+
+    List<MetaTimedMetric> sqlMetrics = sqlMetrics();
+    assertThat(sqlMetrics).hasSize(1);
+    assertThat(sqlMetrics.get(0).getName()).isEqualTo("sql.query.findEach-Max10Rows");
   }
 
   @Test
diff --git a/src/test/java/org/tests/transaction/TestNestedMandatory.java b/src/test/java/org/tests/transaction/TestNestedMandatory.java
index 97578d46b..91eb4e14f 100644
--- a/src/test/java/org/tests/transaction/TestNestedMandatory.java
+++ b/src/test/java/org/tests/transaction/TestNestedMandatory.java
@@ -5,7 +5,6 @@ import io.ebean.Ebean;
 import io.ebean.Transaction;
 import io.ebean.annotation.Transactional;
 import io.ebean.annotation.TxType;
-import io.ebean.meta.MetaInfoManager;
 import io.ebean.meta.MetaTimedMetric;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -19,17 +18,16 @@ public class TestNestedMandatory extends BaseTestCase {
 
   private static final Logger log = LoggerFactory.getLogger(TestNestedMandatory.class);
 
-  static Transaction outerTxn;
+  private static Transaction outerTxn;
 
   @Test
   public void test() {
 
-    MetaInfoManager metaInfoManager = Ebean.getDefaultServer().getMetaInfoManager();
-    metaInfoManager.collectTransactionStatistics(true);
+    resetAllMetrics();
 
     new Outer().doOuter();
 
-    List<MetaTimedMetric> txnMetrics = metaInfoManager.collectTransactionStatistics(true);
+    List<MetaTimedMetric> txnMetrics = visitTimedMetrics();
     for (MetaTimedMetric txnTimed : txnMetrics) {
       System.out.println(txnTimed);
     }
diff --git a/src/test/java/org/tests/update/TestSqlUpdateInTxn.java b/src/test/java/org/tests/update/TestSqlUpdateInTxn.java
index 3b167abc1..e306e477d 100644
--- a/src/test/java/org/tests/update/TestSqlUpdateInTxn.java
+++ b/src/test/java/org/tests/update/TestSqlUpdateInTxn.java
@@ -3,10 +3,13 @@ package org.tests.update;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.SqlUpdate;
+import io.ebean.meta.MetaTimedMetric;
 import org.junit.Assert;
 import org.junit.Test;
 import org.tests.idkeys.db.AuditLog;
 
+import java.util.List;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestSqlUpdateInTxn extends BaseTestCase {
@@ -40,11 +43,18 @@ public class TestSqlUpdateInTxn extends BaseTestCase {
 
     String sql = "   \nupdate audit_log \nset description = description \nwhere id = id";
 
-    SqlUpdate sqlUpdate = Ebean.createSqlUpdate(sql);
+    resetAllMetrics();
+
+    SqlUpdate sqlUpdate = Ebean.createSqlUpdate(sql).setLabel("auditLargeUpdate");
     sqlUpdate.execute();
 
     assertThat(sqlUpdate.getSql()).isEqualTo(sql.trim());
     assertThat(sqlUpdate.getGeneratedSql()).isEqualTo(sql.trim());
+
+    List<MetaTimedMetric> sqlMetrics = sqlMetrics();
+    assertThat(sqlMetrics).hasSize(1);
+    assertThat(sqlMetrics.get(0).getName()).isEqualTo("sql.update.auditLargeUpdate");
+    assertThat(sqlMetrics.get(0).getCount()).isEqualTo(1);
   }
 
   @Test
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index b33a6e823..3b048c4c2 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -19,7 +19,7 @@ ebean.ddl.generate=true
 ebean.ddl.run=true
 ebean.ddl.header=-- Generated by ebean ${version} at ${timestamp}
 ebean.packages=org.tests
-datasource.default=pg
+datasource.default=h2
 
 ebean.autoReadOnlyDataSource=true
 

From af2b8976fa72f03e4a7325b23f58191aa371aae6 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 12 Mar 2018 18:28:17 +1300
Subject: [PATCH 0181/1036] #1346 - Since ebean version 11.12.1 executing
 docStore query with findPagedList fails with error (due to order by id)

---
 .../server/deploy/BeanPropertyAssocMany.java  |  12 +
 .../server/querydefn/DefaultOrmQuery.java     |  91 ++++-
 .../server/querydefn/OrmQueryPlanKey.java     |  85 +----
 .../deploy/BeanPropertyAssocManyTest.java     |  26 +-
 .../server/querydefn/OrmQueryPlanKeyTest.java | 353 +++++++++---------
 5 files changed, 288 insertions(+), 279 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index c58c658db..9f52a6a33 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -335,6 +335,18 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
     return false;
   }
 
+  /**
+   * Add the loaded current bean to its associated parent.
+   *
+   * Helper method used by Elastic integration when loading with a persistence context.
+   */
+  public void lazyLoadMany(EntityBean current) {
+    EntityBean parentBean = childMasterProperty.getValueAsEntityBean(current);
+    if (parentBean != null) {
+      addBeanToCollectionWithCreate(parentBean, current, true);
+    }
+  }
+
   public void addWhereParentIdIn(SpiQuery<?> query, List<Object> parentIds, boolean useDocStore) {
     if (useDocStore) {
       // assumes the ManyToOne property is included
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 0359e97c2..50683c1dc 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -359,7 +359,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public Query<T> setUseDocStore(boolean useDocStore) {
+  public DefaultOrmQuery<T> setUseDocStore(boolean useDocStore) {
     this.useDocStore = useDocStore;
     return this;
   }
@@ -428,7 +428,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public Query<T> setIncludeSoftDeletes() {
+  public DefaultOrmQuery<T> setIncludeSoftDeletes() {
     this.temporalMode = TemporalMode.SOFT_DELETED;
     return this;
   }
@@ -1050,14 +1050,87 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     if (isNativeSql()) {
       queryPlanKey = new NativeSqlQueryPlanKey(nativeSql + "-" + firstRow + "-" + maxRows);
     } else {
-      queryPlanKey = new OrmQueryPlanKey(beanDescriptor.getDiscValue(), m2mIncludeJoin, type, detail, maxRows, firstRow,
-        disableLazyLoading, manualId, orderBy,
-        distinct, sqlDistinct, mapKey, id, bindParams, whereExpressions, havingExpressions,
-        temporalMode, forUpdate, rootTableAlias, rawSql, updateProperties, countDistinctOrder);
+      queryPlanKey = new OrmQueryPlanKey(planDescription(), maxRows, firstRow, rawSql);
     }
     return queryPlanKey;
   }
 
+  private String planDescription() {
+
+    StringBuilder sb = new StringBuilder(300);
+    if (type != null) {
+      sb.append("t:").append(type.ordinal());
+    }
+    if (useDocStore) {
+      sb.append(",ds:");
+    }
+    if (beanDescriptor.getDiscValue() != null) {
+      sb.append(",disc:").append(beanDescriptor.getDiscValue());
+    }
+    if (temporalMode != SpiQuery.TemporalMode.CURRENT) {
+      sb.append(",temp:").append(temporalMode.ordinal());
+    }
+    if (forUpdate != null) {
+      sb.append(",forUpd:").append(forUpdate.ordinal());
+    }
+    if (id != null) {
+      sb.append(",id:");
+    }
+    if (manualId) {
+      sb.append(",manId:");
+    }
+    if (distinct) {
+      sb.append(",dist:");
+    }
+    if (sqlDistinct) {
+      sb.append(",sqlD:");
+    }
+    if (disableLazyLoading) {
+      sb.append(",disLazy:");
+    }
+    if (rootTableAlias != null) {
+      sb.append(",root:").append(rootTableAlias);
+    }
+    if (orderBy != null) {
+      sb.append(",orderBy:").append(orderBy.toStringFormat());
+    }
+    if (m2mIncludeJoin != null) {
+      sb.append(",m2m:").append(m2mIncludeJoin.getTable());
+    }
+    if (mapKey != null) {
+      sb.append(",mapKey:").append(mapKey);
+    }
+    if (countDistinctOrder != null) {
+      sb.append(",countDistOrd:").append(countDistinctOrder.name());
+    }
+    if (detail != null) {
+      sb.append(" detail[");
+      detail.queryPlanHash(sb);
+      sb.append("]");
+    }
+    if (bindParams != null) {
+      sb.append(" bindParams[");
+      bindParams.buildQueryPlanHash(sb);
+      sb.append("]");
+    }
+    if (whereExpressions != null) {
+      sb.append(" where[");
+      whereExpressions.queryPlanHash(sb);
+      sb.append("]");
+    }
+    if (havingExpressions != null) {
+      sb.append(" having[");
+      havingExpressions.queryPlanHash(sb);
+      sb.append("]");
+    }
+    if (updateProperties != null) {
+      sb.append(" update[");
+      updateProperties.buildQueryPlanHash(sb);
+      sb.append("]");
+    }
+    return sb.toString();
+  }
+
   @Override
   public boolean isNativeSql() {
     return nativeSql != null;
@@ -1449,7 +1522,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   @Override
   public boolean checkPagingOrderBy() {
-    return (maxRows > 1 || firstRow > 0) && !distinct && (orderByIsEmpty() || isOrderById());
+    return !useDocStore && (maxRows > 1 || firstRow > 0) && !distinct && (orderByIsEmpty() || isOrderById());
   }
 
   @Override
@@ -1585,7 +1658,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public Query<T> setDisableLazyLoading(boolean disableLazyLoading) {
+  public DefaultOrmQuery<T> setDisableLazyLoading(boolean disableLazyLoading) {
     this.disableLazyLoading = disableLazyLoading;
     return this;
   }
@@ -1793,7 +1866,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public Query<T> alias(String alias) {
+  public DefaultOrmQuery<T> alias(String alias) {
     this.rootTableAlias = alias;
     return this;
   }
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
index da91f6ea2..2286f3ae2 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
@@ -1,13 +1,6 @@
 package io.ebeaninternal.server.querydefn;
 
-import io.ebean.CountDistinctOrder;
-import io.ebean.OrderBy;
-import io.ebean.Query;
-import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.CQueryPlanKey;
-import io.ebeaninternal.api.SpiExpression;
-import io.ebeaninternal.api.SpiQuery;
-import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
 
 /**
@@ -21,85 +14,11 @@ class OrmQueryPlanKey implements CQueryPlanKey {
   private final int planHash;
   private final String description;
 
-  OrmQueryPlanKey(String discValue, TableJoin m2mIncludeTable, SpiQuery.Type type, OrmQueryDetail detail, int maxRows, int firstRow, boolean disableLazyLoading,
-                  boolean manualId, OrderBy<?> orderBy, boolean distinct, boolean sqlDistinct, String mapKey, Object id, BindParams bindParams,
-                  SpiExpression whereExpressions, SpiExpression havingExpressions, SpiQuery.TemporalMode temporalMode,
-                  Query.ForUpdate forUpdate, String rootTableAlias, SpiRawSql rawSql, OrmUpdateProperties updateProperties, CountDistinctOrder countDistinctOrder) {
-
-    StringBuilder sb = new StringBuilder(300);
-    if (type != null) {
-      sb.append("t:").append(type.ordinal());
-    }
-    if (discValue != null) {
-      sb.append("disc:").append(discValue);
-    }
-    if (temporalMode != SpiQuery.TemporalMode.CURRENT) {
-      sb.append(",temp:").append(temporalMode.ordinal());
-    }
-    if (forUpdate != null) {
-      sb.append(",forUpd:").append(forUpdate.ordinal());
-    }
-    if (id != null) {
-      sb.append(",id:");
-    }
-    if (manualId) {
-      sb.append(",manId:");
-    }
-    if (distinct) {
-      sb.append(",dist:");
-    }
-    if (sqlDistinct) {
-      sb.append(",sqlD:");
-    }
-    if (disableLazyLoading) {
-      sb.append(",disLazy:");
-    }
-    if (rootTableAlias != null) {
-      sb.append(",root:").append(rootTableAlias);
-    }
-    if (orderBy != null) {
-      sb.append(",orderBy:").append(orderBy.toStringFormat());
-    }
-    if (m2mIncludeTable != null) {
-      sb.append(",m2m:").append(m2mIncludeTable.getTable());
-    }
-    if (mapKey != null) {
-      sb.append(",mapKey:").append(mapKey);
-    }
-    if (countDistinctOrder != null) {
-      sb.append(",countdistinctoder:").append(countDistinctOrder.name());
-    }
+  OrmQueryPlanKey(String description, int maxRows, int firstRow, SpiRawSql rawSql) {
+    this.description = description;
     this.maxRows = maxRows;
     this.firstRow = firstRow;
     this.rawSqlKey = (rawSql == null) ? null : rawSql.getKey();
-
-    if (detail != null) {
-      sb.append(" detail[");
-      detail.queryPlanHash(sb);
-      sb.append("]");
-    }
-    if (bindParams != null) {
-      sb.append(" bindParams[");
-      bindParams.buildQueryPlanHash(sb);
-      sb.append("]");
-    }
-    if (whereExpressions != null) {
-      sb.append(" where[");
-      whereExpressions.queryPlanHash(sb);
-      sb.append("]");
-    }
-    if (havingExpressions != null) {
-      sb.append(" having[");
-      havingExpressions.queryPlanHash(sb);
-      sb.append("]");
-    }
-    if (updateProperties != null) {
-      sb.append(" update[");
-      updateProperties.buildQueryPlanHash(sb);
-      sb.append("]");
-    }
-
-    this.description = sb.toString();
     int hc = description.hashCode();
     hc = hc * 92821 + (maxRows);
     hc = hc * 92821 + (firstRow);
diff --git a/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java b/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java
index 881614304..162832e76 100644
--- a/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java
+++ b/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java
@@ -3,23 +3,27 @@ package io.ebeaninternal.server.deploy;
 import io.ebean.BaseTestCase;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
+import io.ebean.common.BeanList;
+import org.junit.Test;
+import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 
 public class BeanPropertyAssocManyTest extends BaseTestCase {
 
-  BeanDescriptor<Customer> customerDesc = spiEbeanServer().getBeanDescriptor(Customer.class);
+  private BeanDescriptor<Customer> customerDesc = spiEbeanServer().getBeanDescriptor(Customer.class);
 
   @SuppressWarnings("unchecked")
-  BeanPropertyAssocMany<Customer> contacts() {
+  private BeanPropertyAssocMany<Customer> contacts() {
     return (BeanPropertyAssocMany<Customer>) customerDesc.getBeanProperty("contacts");
   }
 
@@ -44,6 +48,20 @@ public class BeanPropertyAssocManyTest extends BaseTestCase {
     assertTrue(ref.isReference());
   }
 
+  @Test
+  public void lazyLoadMany_addsToParentCollection() {
+
+    Customer customer = new Customer();
+    customer.setContacts(new BeanList<>());
+
+    Contact contact = new Contact();
+    contact.setCustomer(customer);
+
+    contacts().lazyLoadMany((EntityBean) contact);
+
+    assertThat(customer.getContacts()).hasSize(1);
+    assertThat(customer.getContacts().get(0)).isSameAs(contact);
+  }
 
   @Test
   public void findIdsByParentId() {
diff --git a/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java b/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java
index 7df67e9a7..043ecf6f0 100644
--- a/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java
+++ b/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java
@@ -1,10 +1,9 @@
 package io.ebeaninternal.server.querydefn;
 
 
-import io.ebean.OrderBy;
+import io.ebean.ExpressionList;
 import io.ebean.Query;
-import io.ebeaninternal.api.SpiExpression;
-import io.ebeaninternal.api.SpiExpressionList;
+import io.ebeaninternal.api.CQueryPlanKey;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoin;
@@ -13,63 +12,55 @@ import io.ebeaninternal.server.expression.BaseExpressionTest;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
 
+import java.sql.Timestamp;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class OrmQueryPlanKeyTest extends BaseExpressionTest {
 
 
-  @Test
-  public void equals_when_defaults() {
-
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-
-    assertSame(key1, key2);
+  @SuppressWarnings("unchecked")
+  private DefaultOrmQuery<Customer> query() {
+    return (DefaultOrmQuery) server().find(Customer.class);
   }
 
   @Test
-  public void equals_when_diffDiscValue() {
+  public void equals_when_defaults() {
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey("A", null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key3 = new OrmQueryPlanKey("B", null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    assertDifferent(key1, key2);
-    assertDifferent(key2, key3);
+    assertSame(query().createQueryPlanKey(), query().createQueryPlanKey());
   }
 
   @Test
   public void equals_when_diffTableJoinNull() {
 
-    TableJoin tableJoin = tableJoin("table", "id", "customer_id");
+    DefaultOrmQuery<Customer> q1 = query();
+    q1.setM2MIncludeJoin(tableJoin("table", "id", "customer_id"));
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, tableJoin, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-
-    assertDifferent(key1, key2);
+    assertDifferent(q1, query());
   }
 
   @Test
   public void equals_when_diffTableJoin() {
 
-    TableJoin tableJoin1 = tableJoin("one", "id", "customer_id");
-    TableJoin tableJoin2 = tableJoin("two", "id", "customer_id");
+    DefaultOrmQuery<Customer> q1 = query();
+    q1.setM2MIncludeJoin(tableJoin("one", "cid", "customer_id"));
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, tableJoin1, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, tableJoin2, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    DefaultOrmQuery<Customer> q2 = query();
+    q2.setM2MIncludeJoin(tableJoin("two", "cid", "customer_id"));
 
-    assertDifferent(key1, key2);
+    assertDifferent(q1, q2);
   }
 
   @Test
   public void equals_when_sameTableJoin() {
 
-    TableJoin tableJoin1 = tableJoin("one", "id", "customer_id");
-    TableJoin tableJoin2 = tableJoin("one", "id", "customer_id");
+    DefaultOrmQuery<Customer> q1 = query();
+    q1.setM2MIncludeJoin(tableJoin("one", "id", "cust_id"));
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, tableJoin1, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, tableJoin2, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    DefaultOrmQuery<Customer> q2 = query();
+    q2.setM2MIncludeJoin(tableJoin("one", "id", "cust_id"));
 
-    assertSame(key1, key2);
+    assertSame(q1, q2);
   }
 
   private TableJoin tableJoin(String table, String col1, String col2) {
@@ -82,297 +73,293 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
   @Test
   public void equals_when_diffQueryType() {
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.LIST, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    DefaultOrmQuery<Customer> q1 = query();
+    q1.setType(SpiQuery.Type.BEAN);
 
-    assertDifferent(key1, key2);
+    DefaultOrmQuery<Customer> q2 = query();
+    q2.setType(SpiQuery.Type.LIST);
+
+    assertDifferent(q1, q2);
   }
 
   @Test
   public void equals_when_firstRowsDifferent() {
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 10, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    CQueryPlanKey key1 = query().setFirstRow(10).createQueryPlanKey();
+    CQueryPlanKey key2 = query().createQueryPlanKey();
+    assertDifferent(key1, key2);
 
+    key1 = query().setFirstRow(10).createQueryPlanKey();
+    key2 = query().setFirstRow(9).createQueryPlanKey();
+    assertDifferent(key1, key2);
+
+    key1 = query().createQueryPlanKey();
+    key2 = query().setFirstRow(9).createQueryPlanKey();
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_maxRowsDifferent() {
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 10, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-
+    CQueryPlanKey key1 = query().setMaxRows(10).createQueryPlanKey();
+    CQueryPlanKey key2 = query().createQueryPlanKey();
     assertDifferent(key1, key2);
+
+    key1 = query().setMaxRows(10).createQueryPlanKey();
+    key2 = query().setMaxRows(9).createQueryPlanKey();
+    assertDifferent(key1, key2);
+
+    key1 = query().createQueryPlanKey();
+    key2 = query().setMaxRows(9).createQueryPlanKey();
+    assertDifferent(key1, key2);
+
   }
 
   @Test
   public void equals_when_firstRowsMaxRowsSame() {
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 10, 20, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 10, 20, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-
+    CQueryPlanKey key1 = query().setMaxRows(10).setFirstRow(20).createQueryPlanKey();
+    CQueryPlanKey key2 = query().setFirstRow(20).setMaxRows(10).createQueryPlanKey();
     assertSame(key1, key2);
   }
 
   @Test
   public void equals_when_diffDisableLazyLoading() {
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, true, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-
-    assertDifferent(key1, key2);
+    assertDifferent(query().setDisableLazyLoading(true), query());
   }
 
   @Test
   public void equals_when_diffOrderByNull() {
 
-    OrderBy<Object> o1 = new OrderBy<>("id");
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, o1, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    CQueryPlanKey key1 = query().order("id").createQueryPlanKey();
+    CQueryPlanKey key2 = query().createQueryPlanKey();
+    assertDifferent(key1, key2);
 
+    key1 = ((DefaultOrmQuery) query().order().asc("id")).createQueryPlanKey();
+    key2 = query().createQueryPlanKey();
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_orderBySame() {
 
-    OrderBy<Object> o1 = new OrderBy<>("id, name");
-    OrderBy<Object> o2 = new OrderBy<>("id, name");
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, o1, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, o2, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-
+    CQueryPlanKey key1 = query().order("id, name").createQueryPlanKey();
+    CQueryPlanKey key2 = query().order("id, name").createQueryPlanKey();
     assertSame(key1, key2);
   }
 
   @Test
   public void equals_when_diffDistinct() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, true, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+
+    CQueryPlanKey key1 = query().setDistinct(true).createQueryPlanKey();
+    CQueryPlanKey key2 = query().createQueryPlanKey();
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_sameDistinct() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, true, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, true, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+
+    CQueryPlanKey key1 = query().setDistinct(true).createQueryPlanKey();
+    CQueryPlanKey key2 = query().setDistinct(true).createQueryPlanKey();
     assertSame(key1, key2);
   }
 
   @Test
   public void equals_when_diffSqlDistinct() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, true, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    DefaultOrmQuery<Customer> q1 = query();
+    q1.setSqlDistinct(true);
+    CQueryPlanKey key1 = q1.createQueryPlanKey();
+    CQueryPlanKey key2 = query().createQueryPlanKey();
+
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_sameSqlDistinct() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, true, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, true, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    assertSame(key1, key2);
+
+    DefaultOrmQuery<Customer> q1 = query();
+    q1.setSqlDistinct(true);
+
+    DefaultOrmQuery<Customer> q2 = query();
+    q2.setSqlDistinct(true);
+
+    assertSame(q1, q2);
   }
 
   @Test
-  public void equals_when_diffMapKeyNull() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, "mapKey", null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+  public void equals_when_useDocStore() {
+    CQueryPlanKey key1 = query().setUseDocStore(true).createQueryPlanKey();
+    CQueryPlanKey key2 = query().createQueryPlanKey();
+
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_diffMapKey() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, "mapKey", null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, "diff", null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    assertDifferent(key1, key2);
-  }
 
-  @Test
-  public void equals_when_sameMapKey() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, "mapKey", null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, "mapKey", null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    assertSame(key1, key2);
+    CQueryPlanKey key1 = query().setMapKey("name").createQueryPlanKey();
+    CQueryPlanKey key2 = query().createQueryPlanKey();
+    assertDifferent(key1, key2);
+
+    CQueryPlanKey key3 = query().setMapKey("email").createQueryPlanKey();
+    assertDifferent(key1, key3);
+
+    CQueryPlanKey key4 = query().setMapKey("name").createQueryPlanKey();
+    assertSame(key1, key4);
   }
 
   @Test
   public void equals_when_diffIdNull() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, 42, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+
+    CQueryPlanKey key1 = query().setId(42).createQueryPlanKey();
+    CQueryPlanKey key2 = query().createQueryPlanKey();
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_idBothGiven() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, 42, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, 23, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+
+    CQueryPlanKey key1 = query().setId(42).createQueryPlanKey();
+    CQueryPlanKey key2 = query().setId(23).createQueryPlanKey();
     assertSame(key1, key2);
   }
 
   @Test
   public void equals_when_diffTemporalMode() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.DRAFT, null, null, null, null, null);
+
+    CQueryPlanKey key1 = query().createQueryPlanKey();
+    CQueryPlanKey key2 = query().asDraft().createQueryPlanKey();
     assertDifferent(key1, key2);
+
+    CQueryPlanKey key3 = query().asOf(new Timestamp(System.currentTimeMillis())).createQueryPlanKey();
+    assertDifferent(key1, key3);
+
+    CQueryPlanKey key4 = query().setIncludeSoftDeletes().createQueryPlanKey();
+    assertDifferent(key1, key4);
   }
 
   @Test
   public void equals_when_diffForUpdate() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, Query.ForUpdate.BASE, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    assertDifferent(key1, key2);
-  }
 
-  @Test
-  public void equals_when_diffForUpdate_NoWait() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, Query.ForUpdate.BASE, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, Query.ForUpdate.NOWAIT, null, null, null, null);
+    CQueryPlanKey key1 = query().forUpdate().createQueryPlanKey();
+    CQueryPlanKey key2 = query().createQueryPlanKey();
     assertDifferent(key1, key2);
-  }
 
-  @Test
-  public void equals_when_diffForUpdate_SkipLocked() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, Query.ForUpdate.BASE, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, Query.ForUpdate.SKIPLOCKED, null, null, null, null);
-    assertDifferent(key1, key2);
+    CQueryPlanKey key3 = query().forUpdateNoWait().createQueryPlanKey();
+    assertDifferent(key1, key3);
+
+    CQueryPlanKey key4 = query().forUpdateSkipLocked().createQueryPlanKey();
+    assertDifferent(key1, key4);
+
+    CQueryPlanKey key5 = query().forUpdate().createQueryPlanKey();
+    assertSame(key1, key5);
   }
 
   @Test
   public void equals_when_diffRootAliasNull() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, "rootAlias", null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+
+    CQueryPlanKey key1 = query().alias("alias").createQueryPlanKey();
+    CQueryPlanKey key2 = query().createQueryPlanKey();
     assertDifferent(key1, key2);
+
+    CQueryPlanKey key3 = query().alias("diff").createQueryPlanKey();
+    assertDifferent(key1, key3);
+
+    CQueryPlanKey key4 = query().alias("alias").createQueryPlanKey();
+    assertSame(key1, key4);
   }
 
-  @Test
-  public void equals_when_diffRootAlias() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, "rootAlias", null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, "diff", null, null, null);
-    assertDifferent(key1, key2);
+
+  private DefaultOrmQuery<Customer> list_id_eq_42() {
+    return (DefaultOrmQuery<Customer>) server().find(Customer.class)
+      .where().eq("id", 42).query();
   }
 
-  @Test
-  public void equals_when_sameRootAlias() {
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, "rootAlias", null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, "rootAlias", null, null, null);
-    assertSame(key1, key2);
+  private DefaultOrmQuery<Customer> list_id_eq_43() {
+    return (DefaultOrmQuery<Customer>) server().find(Customer.class)
+      .where().eq("id", 43).query();
   }
 
-  SpiExpressionList<Customer> list_id_eq_42() {
-    return (SpiExpressionList<Customer>) server().find(Customer.class)
-      .where().eq("id", 42);
-  }
-
-  SpiExpressionList<Customer> list_id_eq_43() {
-    return (SpiExpressionList<Customer>) server().find(Customer.class)
-      .where().eq("id", 43);
-  }
-
-  SpiExpressionList<Customer> list_id_eq_42_and_name_eq_rob() {
-    return (SpiExpressionList<Customer>) server().find(Customer.class)
-      .where().eq("id", 43).eq("name", "rob");
+  private DefaultOrmQuery<Customer> list_id_eq_42_and_name_eq_rob() {
+    return (DefaultOrmQuery<Customer>) server().find(Customer.class)
+      .where().eq("id", 43).eq("name", "rob").query();
   }
 
 
   @Test
   public void equals_when_sameWhere() {
 
-
-    SpiExpressionList<Customer> list1 = list_id_eq_42();
-    SpiExpressionList<Customer> list2 = list_id_eq_43();
-
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, list1, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, list2, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    assertSame(key1, key2);
+    assertSame(list_id_eq_42(), list_id_eq_43());
   }
 
 
   @Test
   public void equals_when_diffWhere() {
 
-    SpiExpressionList<Customer> where1 = list_id_eq_42();
-    SpiExpressionList<Customer> where2 = list_id_eq_42_and_name_eq_rob();
-
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, where1, null, SpiQuery.TemporalMode.DRAFT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, where2, null, SpiQuery.TemporalMode.DRAFT, null, null, null, null, null);
-    assertDifferent(key1, key2);
+    assertDifferent(list_id_eq_42(), list_id_eq_42_and_name_eq_rob());
   }
 
   @Test
   public void equals_when_diffWhereNullLast() {
 
-    SpiExpressionList<Customer> list1 = list_id_eq_42();
-
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, list1, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    assertDifferent(key1, key2);
-  }
-
-  @Test
-  public void equals_when_diffWhereNullFirst() {
-
-    SpiExpressionList<Customer> list1 = list_id_eq_42();
-
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, list1, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    assertDifferent(key1, key2);
+    assertDifferent(list_id_eq_42(), query());
   }
 
   @Test
   public void equals_when_diffHaving() {
 
-    SpiExpression having1 = list_id_eq_42().copyForPlanKey();
-    SpiExpression having2 = list_id_eq_42_and_name_eq_rob().copyForPlanKey();
-
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, having1, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, having2, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    CQueryPlanKey key1 = planKey(query().having().eq("id", 42));
+    CQueryPlanKey key2 = planKey(query().having().eq("id", 42).eq("name", "Rob"));
     assertDifferent(key1, key2);
+
+    CQueryPlanKey key3 = planKey(query().where().eq("id", 42));
+    assertDifferent(key1, key3);
+
+    CQueryPlanKey key4 = planKey(query().having().eq("name", "Rob"));
+    assertDifferent(key1, key4);
   }
 
+
   @Test
   public void equals_when_sameHaving() {
 
-    SpiExpression having1 = list_id_eq_42().copyForPlanKey();
-    SpiExpression having2 = list_id_eq_42().copyForPlanKey();
-
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, having1, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, having2, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
+    CQueryPlanKey key1 = planKey(query().having().eq("id", 42));
+    CQueryPlanKey key2 = planKey(query().having().eq("id", 43));
     assertSame(key1, key2);
   }
 
-  @Test
-  public void equals_when_havingNullLast() {
-
-    SpiExpression having1 = list_id_eq_42().copyForPlanKey();
-
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, having1, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    assertDifferent(key1, key2);
-  }
-
-  @Test
-  public void equals_when_havingNullFirst() {
-
-    SpiExpression having1 = list_id_eq_42().copyForPlanKey();
-
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, having1, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    assertDifferent(key1, key2);
-  }
-
   @Test
   public void equals_when_manualId() {
 
-    OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, null, SpiQuery.Type.BEAN, null, 0, 0, false, true, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, null, null, null, null, null);
-    assertDifferent(key1, key2);
+    DefaultOrmQuery<Customer> q1 = query();
+    q1.setManualId(true);
+
+    assertDifferent(q1, query());
   }
 
-  private void assertDifferent(OrmQueryPlanKey key1, OrmQueryPlanKey key2) {
+  private CQueryPlanKey planKey(ExpressionList<Customer> id) {
+    return planKey(id.query());
+  }
+
+  private CQueryPlanKey planKey(Query<Customer> query) {
+    return ((DefaultOrmQuery) query).createQueryPlanKey();
+  }
+
+  private void assertDifferent(DefaultOrmQuery q1, DefaultOrmQuery q2) {
+    assertDifferent(q1.createQueryPlanKey(), q2.createQueryPlanKey());
+  }
+
+  private void assertSame(DefaultOrmQuery q1, DefaultOrmQuery q2) {
+    assertSame(q1.createQueryPlanKey(), q2.createQueryPlanKey());
+  }
+
+  private void assertDifferent(CQueryPlanKey key1, CQueryPlanKey key2) {
     assertThat(key1).isNotEqualTo(key2);
     assertThat(key1.hashCode()).isNotEqualTo(key2.hashCode());
   }
 
-  private void assertSame(OrmQueryPlanKey key1, OrmQueryPlanKey key2) {
+  private void assertSame(CQueryPlanKey key1, CQueryPlanKey key2) {
     assertThat(key1).isEqualTo(key2);
     assertThat(key1.hashCode()).isEqualTo(key2.hashCode());
   }

From 607cf3156c472a294799d4ea8496277d55bc23d8 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 13 Mar 2018 00:15:42 +1300
Subject: [PATCH 0182/1036] #1347 - Improve cleanup of inactive transactions
 from threadLocal when no end() used

---
 .../ebeaninternal/api/ScopedTransaction.java  |  60 ++++++--
 .../TestDuplicateKeyException.java            |   4 +-
 .../transaction/TestExecuteComplete.java      | 132 ++++++++++++++++++
 3 files changed, 183 insertions(+), 13 deletions(-)
 create mode 100644 src/test/java/org/tests/transaction/TestExecuteComplete.java

diff --git a/src/main/java/io/ebeaninternal/api/ScopedTransaction.java b/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
index 833a3d7b6..a8d38b03f 100644
--- a/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
+++ b/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
@@ -21,6 +21,11 @@ public class ScopedTransaction extends SpiTransactionProxy {
 
   private ScopeTrans current;
 
+  /**
+   * Flag set when we clear the thread scope (on commit/rollback or end).
+   */
+  private boolean scopeCleared;
+
   public ScopedTransaction(TransactionScopeManager manager) {
     this.manager = manager;
   }
@@ -47,30 +52,51 @@ public class ScopedTransaction extends SpiTransactionProxy {
    */
   public void complete(Object returnOrThrowable, int opCode) {
     current.complete(returnOrThrowable, opCode);
+    // no finally here for pop() as we come in here twice if an
+    // error is thrown on commit (due to enhancement finally block)
     pop();
   }
 
   /**
-   * Programmatic complete - finally block, try to commit.
+   * Internal programmatic complete - finally block, try to commit.
    */
   public void complete() {
-    current.complete();
-    pop();
+    try {
+      current.complete();
+    } finally {
+      pop();
+    }
+  }
+
+  private void clearScopeOnce() {
+    if (!scopeCleared) {
+      manager.set(null);
+      scopeCleared = true;
+    }
+  }
+
+  private boolean clearScope() {
+    if (stack.isEmpty()) {
+      clearScopeOnce();
+      return true;
+    }
+    return false;
   }
 
   private void pop() {
-    if (!stack.isEmpty()) {
+    if (!clearScope()) {
       current = stack.pop();
       transaction = current.getTransaction();
-    } else {
-      manager.set(null);
     }
   }
 
   @Override
   public void end() throws PersistenceException {
-    current.end();
-    pop();
+    try {
+      current.end();
+    } finally {
+      pop();
+    }
   }
 
   @Override
@@ -80,17 +106,29 @@ public class ScopedTransaction extends SpiTransactionProxy {
 
   @Override
   public void commit() {
-    current.commitTransaction();
+    try {
+      current.commitTransaction();
+    } finally {
+      clearScope();
+    }
   }
 
   @Override
   public void rollback() throws PersistenceException {
-    current.rollback(null);
+    try {
+      current.rollback(null);
+    } finally {
+      clearScope();
+    }
   }
 
   @Override
   public void rollback(Throwable e) throws PersistenceException {
-    current.rollback(e);
+    try {
+      current.rollback(e);
+    } finally {
+      clearScope();
+    }
   }
 
   @Override
diff --git a/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java b/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java
index 987cb5043..2b53a3d4a 100644
--- a/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java
+++ b/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java
@@ -3,11 +3,11 @@ package org.tests.inheritance;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import org.junit.Assert;
+import org.junit.Test;
 import org.tests.model.basic.AttributeHolder;
 import org.tests.model.basic.ListAttribute;
 import org.tests.model.basic.ListAttributeValue;
-import org.junit.Assert;
-import org.junit.Test;
 
 public class TestDuplicateKeyException extends BaseTestCase {
 
diff --git a/src/test/java/org/tests/transaction/TestExecuteComplete.java b/src/test/java/org/tests/transaction/TestExecuteComplete.java
new file mode 100644
index 000000000..a8ec5f8c3
--- /dev/null
+++ b/src/test/java/org/tests/transaction/TestExecuteComplete.java
@@ -0,0 +1,132 @@
+package org.tests.transaction;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DataIntegrityException;
+import io.ebean.Ebean;
+import io.ebean.Transaction;
+import io.ebean.TxScope;
+import io.ebean.annotation.ForPlatform;
+import io.ebean.annotation.PersistBatch;
+import io.ebean.annotation.Platform;
+import io.ebean.annotation.Transactional;
+import io.ebeaninternal.api.SpiTransaction;
+import io.ebeaninternal.server.transaction.DefaultTransactionThreadLocal;
+import org.junit.Test;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.Order;
+
+import static org.assertj.core.api.StrictAssertions.assertThat;
+
+public class TestExecuteComplete extends BaseTestCase {
+
+
+  @ForPlatform(Platform.H2)
+  @Test
+  public void execute_when_errorOnCommit_threadLocalIsCleared() {
+
+    try {
+      Ebean.execute(TxScope.required().setBatch(PersistBatch.ALL), () -> {
+
+        Customer customer = Ebean.getReference(Customer.class, 42424242L);
+        Order order = new Order();
+        order.setCustomer(customer);
+
+        Ebean.save(customer);
+      });
+    } catch (DataIntegrityException e) {
+      // assert the thread local has been cleaned up
+      SpiTransaction txn = DefaultTransactionThreadLocal.get("h2");
+      assertThat(txn).isNull();
+    }
+  }
+
+  @ForPlatform(Platform.H2)
+  @Test
+  public void nestedExecute_when_errorOnCommit_threadLocalIsCleared() {
+
+    try {
+      Ebean.execute(TxScope.required().setBatch(PersistBatch.ALL), () ->
+        Ebean.execute(() -> {
+
+          Customer customer = Ebean.getReference(Customer.class, 42424242L);
+          Order order = new Order();
+          order.setCustomer(customer);
+
+          Ebean.save(customer);
+        }));
+    } catch (DataIntegrityException e) {
+      // assert the thread local has been cleaned up
+      SpiTransaction txn = DefaultTransactionThreadLocal.get("h2");
+      assertThat(txn).isNull();
+    }
+  }
+
+  @ForPlatform(Platform.H2)
+  @Test
+  public void transactional_errorOnCommit_expect_threadScopeCleanup() {
+
+    try {
+      errorOnCommit();
+    } catch (DataIntegrityException e) {
+      SpiTransaction txn = DefaultTransactionThreadLocal.get("h2");
+      assertThat(txn).isNull();
+    }
+  }
+
+  @Transactional(batchSize = 10)
+  private void errorOnCommit() {
+    Customer customer = Ebean.getReference(Customer.class, 42424242L);
+    Order order = new Order();
+    order.setCustomer(customer);
+
+    Ebean.save(customer);
+  }
+
+  @ForPlatform(Platform.H2)
+  @Test
+  public void normal_expect_threadScopeCleanup() {
+
+    Transaction txn1 = server().beginTransaction();
+    try {
+      txn1.commit();
+    } finally {
+      txn1.end();
+    }
+
+    SpiTransaction txn2 = DefaultTransactionThreadLocal.get("h2");
+    assertThat(txn2).isNull();
+  }
+
+  @ForPlatform(Platform.H2)
+  @Test
+  public void missingEnd_expect_threadScopeCleanup() {
+
+    Transaction txn1 = server().beginTransaction();
+    try {
+      txn1.commit();
+    } finally {
+      // accidentally omit end()
+      //txn1.end();
+    }
+
+    SpiTransaction txn2 = DefaultTransactionThreadLocal.get("h2");
+    assertThat(txn2).isNull();
+  }
+
+  @ForPlatform(Platform.H2)
+  @Test
+  public void missingEnd_withRollbackOnly_expect_threadScopeCleanup() {
+
+    Transaction txn1 = server().beginTransaction();
+    try {
+      txn1.rollback();
+    } finally {
+      // accidentally omit end()
+      //txn1.end();
+    }
+
+    SpiTransaction txn2 = DefaultTransactionThreadLocal.get("h2");
+    assertThat(txn2).isNull();
+  }
+
+}

From afead2da41143b4cb6e6c682007c6faa1b233944 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 13 Mar 2018 23:55:47 +1300
Subject: [PATCH 0183/1036] #1221 - ENH: Add a merge(bean) and merge(bean,
 paths)

---
 src/main/java/io/ebean/Ebean.java             |  10 +
 src/main/java/io/ebean/EbeanServer.java       |  16 +
 src/main/java/io/ebean/MergeOptions.java      |  29 ++
 .../java/io/ebean/MergeOptionsBuilder.java    |  80 ++++
 .../io/ebean/bean/EntityBeanIntercept.java    |  16 +
 .../io/ebeaninternal/api/SpiEbeanServer.java  |   5 +
 .../server/core/DefaultServer.java            |  24 +-
 .../server/core/PersistRequestBean.java       |  45 ++-
 .../ebeaninternal/server/core/Persister.java  |   8 +
 .../server/deploy/BaseCollectionHelp.java     |  17 +
 .../server/deploy/BeanCollectionHelp.java     |   6 +
 .../server/deploy/BeanListHelp.java           |   2 +-
 .../server/deploy/BeanMapHelp.java            |   2 +-
 .../server/deploy/BeanPropertyAssocMany.java  |   7 +
 .../server/deploy/BeanSetHelp.java            |   2 +-
 .../server/persist/DefaultPersister.java      | 115 +++---
 .../ebeaninternal/server/persist/Flags.java   | 135 +++++++
 .../server/persist/MergeContext.java          |  56 +++
 .../server/persist/MergeHandler.java          | 147 +++++++
 .../server/persist/MergeNode.java             |  74 ++++
 .../server/persist/MergeNodeAssocMany.java    |  57 +++
 .../server/persist/MergeNodeAssocOne.java     |  60 +++
 .../server/persist/MergeRequest.java          |  64 +++
 .../server/persist/SaveManyPropRequest.java   |  12 +-
 .../ebeaninternal/api/TDSpiEbeanServer.java   |  16 +
 .../server/persist/BatchedBeanHolderTest.java |   9 +-
 .../server/persist/FlagsTest.java             |  44 ++
 src/test/java/org/tests/merge/MAddress.java   |  33 ++
 src/test/java/org/tests/merge/MBase.java      |  32 ++
 src/test/java/org/tests/merge/MContact.java   |  67 ++++
 .../java/org/tests/merge/MContactMessage.java |  54 +++
 src/test/java/org/tests/merge/MCustomer.java  |  68 ++++
 .../java/org/tests/merge/TestMergeBasic.java  | 117 ++++++
 .../org/tests/merge/TestMergeCustomer.java    | 376 ++++++++++++++++++
 .../java/org/tests/model/basic/UUOne.java     |  28 ++
 .../java/org/tests/model/basic/UUTwo.java     |  29 ++
 .../joins/TestDisjunctWhereOuterOnMany.java   |   8 +-
 37 files changed, 1804 insertions(+), 66 deletions(-)
 create mode 100644 src/main/java/io/ebean/MergeOptions.java
 create mode 100644 src/main/java/io/ebean/MergeOptionsBuilder.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java
 create mode 100644 src/main/java/io/ebeaninternal/server/persist/Flags.java
 create mode 100644 src/main/java/io/ebeaninternal/server/persist/MergeContext.java
 create mode 100644 src/main/java/io/ebeaninternal/server/persist/MergeHandler.java
 create mode 100644 src/main/java/io/ebeaninternal/server/persist/MergeNode.java
 create mode 100644 src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocMany.java
 create mode 100644 src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOne.java
 create mode 100644 src/main/java/io/ebeaninternal/server/persist/MergeRequest.java
 create mode 100644 src/test/java/io/ebeaninternal/server/persist/FlagsTest.java
 create mode 100644 src/test/java/org/tests/merge/MAddress.java
 create mode 100644 src/test/java/org/tests/merge/MBase.java
 create mode 100644 src/test/java/org/tests/merge/MContact.java
 create mode 100644 src/test/java/org/tests/merge/MContactMessage.java
 create mode 100644 src/test/java/org/tests/merge/MCustomer.java
 create mode 100644 src/test/java/org/tests/merge/TestMergeBasic.java
 create mode 100644 src/test/java/org/tests/merge/TestMergeCustomer.java

diff --git a/src/main/java/io/ebean/Ebean.java b/src/main/java/io/ebean/Ebean.java
index 2f0031fd1..97f895921 100644
--- a/src/main/java/io/ebean/Ebean.java
+++ b/src/main/java/io/ebean/Ebean.java
@@ -638,6 +638,16 @@ public final class Ebean {
     serverMgr.getDefaultServer().updateAll(beans);
   }
 
+  /**
+   * Merge the bean using the given merge options.
+   *
+   * @param bean    The bean to merge
+   * @param options The options to control the merge
+   */
+  public static void merge(Object bean, MergeOptions options) {
+    serverMgr.getDefaultServer().merge(bean, options);
+  }
+
   /**
    * Save all the beans from a Collection.
    */
diff --git a/src/main/java/io/ebean/EbeanServer.java b/src/main/java/io/ebean/EbeanServer.java
index eab9ee668..f13cb86e7 100644
--- a/src/main/java/io/ebean/EbeanServer.java
+++ b/src/main/java/io/ebean/EbeanServer.java
@@ -1615,6 +1615,22 @@ public interface EbeanServer {
    */
   void updateAll(Collection<?> beans, Transaction transaction) throws OptimisticLockException;
 
+  /**
+   * Merge the bean using the given merge options.
+   *
+   * @param bean    The bean to merge
+   * @param options The options to control the merge
+   */
+  void merge(Object bean, MergeOptions options);
+
+  /**
+   * Merge the bean using the given merge options and a transaction.
+   *
+   * @param bean    The bean to merge
+   * @param options The options to control the merge
+   */
+  void merge(Object bean, MergeOptions options, Transaction transaction);
+
   /**
    * Insert the bean.
    * <p>
diff --git a/src/main/java/io/ebean/MergeOptions.java b/src/main/java/io/ebean/MergeOptions.java
new file mode 100644
index 000000000..0d1fae70b
--- /dev/null
+++ b/src/main/java/io/ebean/MergeOptions.java
@@ -0,0 +1,29 @@
+package io.ebean;
+
+import java.util.Set;
+
+/**
+ * Options used to control a merge. Use MergeOptionsBuilder to create an instance.
+ * <p>
+ * Instances of MergeOptions are thread safe and safe to share across threads.
+ */
+public interface MergeOptions {
+
+  /**
+   * Returns true if Id values are supplied by the client.
+   * <p>
+   * This would be the case when for example a mobile creates data in it's own local database
+   * and then sync's. In this case often the id values are UUID.
+   */
+  boolean isClientGeneratedIds();
+
+  /**
+   * Return true if delete permanent should be used and false for 'normal' delete that allows soft deletes.
+   */
+  boolean isDeletePermanent();
+
+  /**
+   * Return the paths included in the merge.
+   */
+  Set<String> paths();
+}
diff --git a/src/main/java/io/ebean/MergeOptionsBuilder.java b/src/main/java/io/ebean/MergeOptionsBuilder.java
new file mode 100644
index 000000000..c17b2d88d
--- /dev/null
+++ b/src/main/java/io/ebean/MergeOptionsBuilder.java
@@ -0,0 +1,80 @@
+package io.ebean;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+/**
+ * Builds a MergeOptions which is immutable and thread safe.
+ */
+public class MergeOptionsBuilder {
+
+  private Set<String> paths = new LinkedHashSet<>();
+
+  private boolean clientGeneratedIds;
+
+  private boolean deletePermanent = true;
+
+  /**
+   * Add a path that will included in the merge.
+   *
+   * @param path The path relative to the root type.
+   * @return The builder to chain another addPath() or build().
+   */
+  public MergeOptionsBuilder addPath(String path) {
+    paths.add(path);
+    return this;
+  }
+
+  /**
+   * Set to true if Id values are supplied by the client.
+   * <p>
+   * This would be the case when for example a mobile creates data in it's own local database
+   * and then sync's. In this case often the id values are UUID.
+   */
+  public MergeOptionsBuilder setClientGeneratedIds() {
+    this.clientGeneratedIds = true;
+    return this;
+  }
+
+  /**
+   * Set that deletions should use delete permanent (rather than default which allows soft deletes).
+   */
+  public MergeOptionsBuilder setDeletePermanent() {
+    this.deletePermanent = true;
+    return this;
+  }
+
+  /**
+   * Build and return the MergeOptions instance.
+   */
+  public MOptions build() {
+    return new MOptions(paths, clientGeneratedIds, deletePermanent);
+  }
+
+  private static class MOptions implements MergeOptions {
+
+    private final boolean clientGeneratedIds;
+    private final boolean deletePermanent;
+    private final Set<String> paths;
+
+    private MOptions(Set<String> paths, boolean clientGeneratedIds, boolean deletePermanent) {
+      this.paths = paths;
+      this.clientGeneratedIds = clientGeneratedIds;
+      this.deletePermanent = deletePermanent;
+    }
+
+    public Set<String> paths() {
+      return paths;
+    }
+
+    @Override
+    public boolean isClientGeneratedIds() {
+      return clientGeneratedIds;
+    }
+
+    @Override
+    public boolean isDeletePermanent() {
+      return deletePermanent;
+    }
+  }
+}
diff --git a/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/src/main/java/io/ebean/bean/EntityBeanIntercept.java
index de6c82456..cde09876f 100644
--- a/src/main/java/io/ebean/bean/EntityBeanIntercept.java
+++ b/src/main/java/io/ebean/bean/EntityBeanIntercept.java
@@ -52,6 +52,8 @@ public final class EntityBeanIntercept implements Serializable {
    */
   private int state;
 
+  private boolean forceUpdate;
+
   private boolean readOnly;
 
   private boolean dirty;
@@ -292,6 +294,20 @@ public final class EntityBeanIntercept implements Serializable {
     this.readOnly = readOnly;
   }
 
+  /**
+   * Set the bean to be updated when persisted (for merge).
+   */
+  public void setForceUpdate(boolean forceUpdate) {
+    this.forceUpdate = forceUpdate;
+  }
+
+  /**
+   * Return true if the entity should be updated.
+   */
+  public boolean isUpdate() {
+    return forceUpdate || state == STATE_LOADED;
+  }
+
   /**
    * Return true if the entity has been loaded.
    */
diff --git a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
index eb449157f..8232773fc 100644
--- a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
+++ b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
@@ -263,4 +263,9 @@ public interface SpiEbeanServer extends EbeanServer, BeanLoader, BeanCollectionL
    * Visit all the metrics (typically reporting them).
    */
   void visitMetrics(MetricVisitor visitor);
+
+  /**
+   * Return true if a row for the bean type and id exists.
+   */
+  boolean exists(Class<?> beanType, Object beanId, Transaction transaction);
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 700f10439..7a75abd5f 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -12,6 +12,7 @@ import io.ebean.Filter;
 import io.ebean.FutureIds;
 import io.ebean.FutureList;
 import io.ebean.FutureRowCount;
+import io.ebean.MergeOptions;
 import io.ebean.PagedList;
 import io.ebean.PersistenceContextScope;
 import io.ebean.ProfileLocation;
@@ -915,6 +916,20 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return new DefaultUpdateQuery<>(createQuery(beanType));
   }
 
+  @Override
+  public void merge(Object bean, MergeOptions options) {
+    merge(bean, options, null);
+  }
+
+  @Override
+  public void merge(Object bean, MergeOptions options, Transaction transaction) {
+    BeanDescriptor<?> desc = getBeanDescriptor(bean.getClass());
+    if (desc == null) {
+      throw new PersistenceException(bean.getClass().getName() + " is NOT an Entity Bean registered with this server?");
+    }
+    executeInTrans((txn) -> persister.merge(desc, checkEntityBean(bean), options, txn), transaction);
+  }
+
   @Override
   public <T> Query<T> find(Class<T> beanType) {
     return createQuery(beanType);
@@ -1271,6 +1286,12 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Override
+  public boolean exists(Class<?> beanType, Object beanId, Transaction transaction) {
+    List<Object> ids = findIds(find(beanType).setId(beanId), transaction);
+    return !ids.isEmpty();
+  }
+
   @Override
   public <A, T> List<A> findIds(Query<T> query, Transaction t) {
 
@@ -2234,8 +2255,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Returns a set of properties if saving the bean will violate the unique constraints (defined by given properties).
    */
-  private Set<Property> checkUniqueness(EntityBean entityBean, BeanDescriptor<?> beanDesc, BeanProperty[] props,
-      Transaction transaction) {
+  private Set<Property> checkUniqueness(EntityBean entityBean, BeanDescriptor<?> beanDesc, BeanProperty[] props, Transaction transaction) {
     BeanProperty idProperty = beanDesc.getIdProperty();
     Query<?> query = new DefaultOrmQuery<>(beanDesc, this, expressionFactory);
     ExpressionList<?> exprList = query.where();
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index 8c0113b1e..33f72c636 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -23,6 +23,7 @@ import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty;
 import io.ebeaninternal.server.deploy.id.ImportedId;
 import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeaninternal.server.persist.BatchedSqlException;
+import io.ebeaninternal.server.persist.Flags;
 import io.ebeaninternal.server.persist.PersistExecute;
 import io.ebeaninternal.server.transaction.BeanPersistIdMap;
 import io.ebeanservice.docstore.api.DocStoreUpdate;
@@ -75,6 +76,8 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
 
   private final boolean publish;
 
+  private int flags;
+
   private DocStoreMode docStoreMode;
 
   private ConcurrencyMode concurrencyMode;
@@ -152,7 +155,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   private boolean getterCallback;
 
   public PersistRequestBean(SpiEbeanServer server, T bean, Object parentBean, BeanManager<T> mgr, SpiTransaction t,
-                            PersistExecute persistExecute, PersistRequest.Type type, boolean saveRecurse, boolean publish) {
+                            PersistExecute persistExecute, PersistRequest.Type type, int flags) {
 
     super(server, t, persistExecute);
     this.entityBean = (EntityBean) bean;
@@ -165,7 +168,8 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
     this.controller = beanDescriptor.getPersistController();
     this.type = type;
     this.docStoreMode = calcDocStoreMode(transaction, type);
-    if (saveRecurse) {
+    this.flags = flags;
+    if (Flags.isRecurse(flags)) {
       this.persistCascade = t.isPersistCascade();
     }
 
@@ -179,7 +183,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
       beanDescriptor.checkMutableProperties(intercept);
     }
     this.concurrencyMode = beanDescriptor.getConcurrencyMode(intercept);
-    this.publish = publish;
+    this.publish = Flags.isPublish(flags);
     if (isMarkDraftDirty(publish)) {
       beanDescriptor.setDraftDirty(entityBean, true);
     }
@@ -231,6 +235,13 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
     if (createImplicitTransIfRequired()) {
       docStoreMode = calcDocStoreMode(transaction, type);
     }
+    checkBatchEscalationOnCascade();
+  }
+
+  /**
+   * Check for batch escalation on cascade.
+   */
+  public void checkBatchEscalationOnCascade() {
     if (transaction.checkBatchEscalationOnCascade(this)) {
       // we escalated to use batch mode so flush when done
       // but if createdTransaction then commit will flush it
@@ -1076,6 +1087,13 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
     return requestUpdateAllLoadedProps;
   }
 
+  /**
+   * Return the flags set on this persist request.
+   */
+  public int getFlags() {
+    return flags;
+  }
+
   /**
    * Return true if this request is a 'publish' action.
    */
@@ -1226,4 +1244,25 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   public void profile() {
     profileBase(type.profileEventId, profileOffset, beanDescriptor.getProfileId(), 1);
   }
+
+  /**
+   * Set the request flags indicating this is an insert.
+   */
+  public void flagInsert() {
+    flags = Flags.setInsert(flags);
+  }
+
+  /**
+   * Unset the request insert flag indicating this is an update.
+   */
+  public void flagUpdate() {
+    flags = Flags.unsetInsert(flags);
+  }
+
+  /**
+   * Return true if this request is an insert.
+   */
+  public boolean isInsertedParent() {
+    return Flags.isInsert(flags);
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/Persister.java b/src/main/java/io/ebeaninternal/server/core/Persister.java
index 981032053..82e46b856 100644
--- a/src/main/java/io/ebeaninternal/server/core/Persister.java
+++ b/src/main/java/io/ebeaninternal/server/core/Persister.java
@@ -1,12 +1,15 @@
 package io.ebeaninternal.server.core;
 
 import io.ebean.CallableSql;
+import io.ebean.MergeOptions;
 import io.ebean.Query;
 import io.ebean.SqlUpdate;
 import io.ebean.Transaction;
 import io.ebean.Update;
 import io.ebean.bean.EntityBean;
 import io.ebean.meta.MetricVisitor;
+import io.ebeaninternal.api.SpiTransaction;
+import io.ebeaninternal.server.deploy.BeanDescriptor;
 
 import java.util.Collection;
 import java.util.List;
@@ -16,6 +19,11 @@ import java.util.List;
  */
 public interface Persister {
 
+  /**
+   * Merge the bean.
+   */
+  int merge(BeanDescriptor<?> desc, EntityBean entityBean, MergeOptions options, SpiTransaction transaction);
+
   /**
    * Update the bean.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java
new file mode 100644
index 000000000..5e50e9700
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java
@@ -0,0 +1,17 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebean.bean.BeanCollection;
+
+import java.util.Collection;
+
+abstract class BaseCollectionHelp<T> implements BeanCollectionHelp<T> {
+
+  @Override
+  public Collection underlying(Object value) {
+    if (value instanceof BeanCollection) {
+      return ((BeanCollection)value).getActualDetails();
+    } else {
+      return (Collection)value;
+    }
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java
index 1de0e6d24..8891048bb 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java
@@ -10,6 +10,7 @@ import io.ebean.bean.EntityBean;
 import io.ebeaninternal.server.text.json.SpiJsonWriter;
 
 import java.io.IOException;
+import java.util.Collection;
 
 /**
  * Helper functions for performing tasks on Lists Sets or Maps.
@@ -21,6 +22,11 @@ public interface BeanCollectionHelp<T> {
    */
   void setLoader(BeanCollectionLoader loader);
 
+  /**
+   * Return the underlying collection of beans.
+   */
+  Collection underlying(Object value);
+
   /**
    * Return the mechanism to add beans to the underlying collection.
    * <p>
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java
index 1f5bde3c8..df5429233 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java
@@ -17,7 +17,7 @@ import java.util.List;
 /**
  * Helper object for dealing with Lists.
  */
-public final class BeanListHelp<T> implements BeanCollectionHelp<T> {
+public final class BeanListHelp<T> extends BaseCollectionHelp<T> {
 
   private final BeanPropertyAssocMany<T> many;
   private final BeanDescriptor<T> targetDescriptor;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java
index c91b4d22e..e3b42bea7 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java
@@ -18,7 +18,7 @@ import java.util.Map.Entry;
 /**
  * Helper specifically for dealing with Maps.
  */
-public final class BeanMapHelp<T> implements BeanCollectionHelp<T> {
+public final class BeanMapHelp<T> extends BaseCollectionHelp<T> {
 
   private final BeanPropertyAssocMany<T> many;
   private final BeanDescriptor<T> targetDescriptor;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index 9f52a6a33..f193624b0 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -205,6 +205,13 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
     // by default not including "Many" properties in document store
   }
 
+  /**
+   * Return the underlying collection of beans.
+   */
+  public Collection getRawCollection(EntityBean bean) {
+    return help.underlying(getVal(bean));
+  }
+
   /**
    * Copy collection value if existing is empty.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java
index f191b919f..0dfdf40af 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java
@@ -17,7 +17,7 @@ import java.util.Set;
 /**
  * Helper specifically for dealing with Sets.
  */
-public final class BeanSetHelp<T> implements BeanCollectionHelp<T> {
+public final class BeanSetHelp<T> extends BaseCollectionHelp<T> {
 
   private final BeanPropertyAssocMany<T> many;
   private final BeanDescriptor<T> targetDescriptor;
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 0be2f64ae..0b3d20e1a 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.persist;
 
 import io.ebean.CallableSql;
+import io.ebean.MergeOptions;
 import io.ebean.Query;
 import io.ebean.SqlUpdate;
 import io.ebean.Transaction;
@@ -53,8 +54,6 @@ import java.util.Set;
  * <li>Handles cascading of save and delete</li>
  * <li>Handles the batching and queueing</li>
  * </p>
- *
- * @see io.ebeaninternal.server.persist.DefaultPersistExecute
  */
 public final class DefaultPersister implements Persister {
 
@@ -161,7 +160,7 @@ public final class DefaultPersister implements Persister {
       draftHandler.resetDraft(draftBean);
 
       PUB.trace("draftRestore bean [{}] id[{}]", desc.getName(), draftHandler.getId());
-      update(createRequest(draftBean, transaction, null, mgr, Type.UPDATE, true, false));
+      update(createRequest(draftBean, transaction, null, mgr, Type.UPDATE, Flags.RECURSE));
     }
 
     PUB.debug("draftRestore - complete for [{}]", desc.getName());
@@ -211,7 +210,7 @@ public final class DefaultPersister implements Persister {
       Type persistType = draftHandler.isInsert() ? Type.INSERT : Type.UPDATE;
       PUB.trace("publish bean [{}] id[{}] type[{}]", desc.getName(), draftHandler.getId(), persistType);
 
-      PersistRequestBean<T> request = createRequest(liveBean, transaction, null, mgr, persistType, true, true);
+      PersistRequestBean<T> request = createRequest(liveBean, transaction, null, mgr, persistType, Flags.PUBLISH_RECURSE);
       if (persistType == Type.INSERT) {
         insert(request);
       } else {
@@ -281,7 +280,7 @@ public final class DefaultPersister implements Persister {
         // update the dirty status on the drafts that have been published
         PUB.debug("publish - update dirty status on [{}] drafts", draftUpdates.size());
         for (T draftUpdate : draftUpdates) {
-          update(createRequest(draftUpdate, transaction, null, mgr, Type.UPDATE, false, false));
+          update(createRequest(draftUpdate, transaction, null, mgr, Type.UPDATE, Flags.ZERO));
         }
       }
     }
@@ -346,6 +345,28 @@ public final class DefaultPersister implements Persister {
     return deleteRequest(createRequest(detailBean, t, deleteType));
   }
 
+  @Override
+  public int merge(BeanDescriptor<?> desc, EntityBean bean, MergeOptions options, SpiTransaction transaction) {
+
+    MergeHandler merge = new MergeHandler(server, desc, bean, options, transaction);
+    List<EntityBean> deleteBeans = merge.merge();
+    if (!deleteBeans.isEmpty()) {
+      // all detected deletes for the merge paths
+      for (EntityBean deleteBean : deleteBeans) {
+        delete(deleteBean, transaction, options.isDeletePermanent());
+      }
+    }
+
+    // cascade save as normal with forceUpdate flags set
+    PersistRequestBean<?> request = createRequestRecurse(bean, transaction, null, Flags.MERGE);
+    request.checkBatchEscalationOnCascade();
+    saveRecurse(request);
+    request.flushBatchOnCascade();
+
+    // lambda expects a return
+    return 0;
+  }
+
   /**
    * Update the bean.
    */
@@ -368,7 +389,7 @@ public final class DefaultPersister implements Persister {
       if (req.isReference()) {
         // its a reference so see if there are manys to save...
         if (req.isPersistCascade()) {
-          saveAssocMany(false, req, false);
+          saveAssocMany(req);
         }
         req.checkUpdatedManysOnly();
       } else {
@@ -389,7 +410,7 @@ public final class DefaultPersister implements Persister {
    */
   @Override
   public void save(EntityBean bean, Transaction t) {
-    if (bean._ebean_getIntercept().isLoaded()) {
+    if (bean._ebean_getIntercept().isUpdate()) {
       // deleteMissingChildren is false when using 'save' on 'loaded' beans
       update(bean, t, false);
     } else {
@@ -416,19 +437,22 @@ public final class DefaultPersister implements Persister {
     }
   }
 
-  void saveRecurse(EntityBean bean, Transaction t, Object parentBean, boolean insertMode, boolean publish) {
+  void saveRecurse(EntityBean bean, Transaction t, Object parentBean, int flags) {
 
     // determine insert or update taking into account stateless updates
-    PersistRequestBean<?> request = createRequestRecurse(bean, t, parentBean, insertMode, publish);
+    PersistRequestBean<?> request = createRequestRecurse(bean, t, parentBean, flags);
+    saveRecurse(request);
+  }
 
+  private void saveRecurse(PersistRequestBean<?> request) {
     if (request.isReference()) {
       // its a reference...
       if (request.isPersistCascade()) {
         // save any associated List held beans
-        saveAssocMany(false, request, insertMode);
+        request.flagUpdate();
+        saveAssocMany(request);
       }
       request.checkUpdatedManysOnly();
-
     } else {
       if (request.isInsert()) {
         insert(request);
@@ -447,11 +471,11 @@ public final class DefaultPersister implements Persister {
       // skip as already inserted/updated in this request (recursive cascading)
       return;
     }
-
+    request.flagInsert();
     try {
       if (request.isPersistCascade()) {
         // save associated One beans recursively first
-        saveAssocOne(request, true);
+        saveAssocOne(request);
       }
 
       // set the IDGenerated value if required
@@ -460,7 +484,7 @@ public final class DefaultPersister implements Persister {
 
       if (request.isPersistCascade()) {
         // save any associated List held beans
-        saveAssocMany(true, request, true);
+        saveAssocMany(request);
       }
     } finally {
       request.unRegisterBean();
@@ -476,11 +500,11 @@ public final class DefaultPersister implements Persister {
       // skip as already inserted/updated in this request (recursive cascading)
       return;
     }
-
+    request.flagUpdate();
     try {
       if (request.isPersistCascade()) {
         // save associated One beans recursively first
-        saveAssocOne(request, false);
+        saveAssocOne(request);
       }
 
       if (request.isDirty()) {
@@ -495,7 +519,7 @@ public final class DefaultPersister implements Persister {
 
       if (request.isPersistCascade()) {
         // save all the beans in assocMany's after
-        saveAssocMany(false, request, false);
+        saveAssocMany(request);
       }
 
       request.checkUpdatedManysOnly();
@@ -518,7 +542,7 @@ public final class DefaultPersister implements Persister {
     if (originalRequest.isHardDeleteDraft()) {
       // a hard delete of a draftable bean so first we need to  delete the associated 'live' bean
       // due to FK constraint and then after that execute the original delete of the draft bean
-      return deleteRequest(createPublishRequest(originalRequest.createReference(), t, Type.DELETE_PERMANENT, true), originalRequest);
+      return deleteRequest(createPublishRequest(originalRequest.createReference(), t, Type.DELETE_PERMANENT, Flags.PUBLISH), originalRequest);
 
     } else {
       // normal delete or soft delete
@@ -610,7 +634,7 @@ public final class DefaultPersister implements Persister {
       int rowCount = deleteRecurse(bean, transaction, permanent);
       if (rowCount == -1) {
         total = -1;
-      } else if (total != -1){
+      } else if (total != -1) {
         total += rowCount;
       }
     }
@@ -838,7 +862,7 @@ public final class DefaultPersister implements Persister {
    * bean to the child beans.
    * </p>
    */
-  private void saveAssocMany(boolean insertedParent, PersistRequestBean<?> request, boolean insertMode) {
+  private void saveAssocMany(PersistRequestBean<?> request) {
 
     EntityBean parentBean = request.getEntityBean();
     BeanDescriptor<?> desc = request.getBeanDescriptor();
@@ -854,7 +878,7 @@ public final class DefaultPersister implements Persister {
           if (!prop.isSaveRecurseSkippable(detailBean)) {
             t.depth(+1);
             prop.setParentBeanToChild(parentBean, detailBean);
-            saveRecurse(detailBean, t, parentBean, insertMode, request.isPublish());
+            saveRecurse(detailBean, t, parentBean, request.getFlags());
             t.depth(-1);
           }
         }
@@ -863,10 +887,11 @@ public final class DefaultPersister implements Persister {
 
     // many's with cascade save
     BeanPropertyAssocMany<?>[] manys = desc.propertiesManySave();
+    boolean insertedParent = request.isInsertedParent();
     for (BeanPropertyAssocMany<?> many : manys) {
       // check that property is loaded and collection should be cascaded to
       if (request.isLoadedProperty(many) && !many.isSkipSaveBeanCollection(parentBean, insertedParent)) {
-        saveMany(new SaveManyPropRequest(insertedParent, many, parentBean, request), insertMode);
+        saveMany(new SaveManyPropRequest(insertedParent, many, parentBean, request));
         if (!insertedParent) {
           request.addUpdatedManyProperty(many);
         }
@@ -874,7 +899,7 @@ public final class DefaultPersister implements Persister {
     }
   }
 
-  private void saveMany(SaveManyPropRequest saveMany, boolean insertMode) {
+  private void saveMany(SaveManyPropRequest saveMany) {
 
     if (saveMany.getMany().hasJoinTable()) {
 
@@ -882,7 +907,7 @@ public final class DefaultPersister implements Persister {
       // we only allow one direction based on first traversed basis
       boolean saveIntersectionFromThisDirection = saveMany.isSaveIntersection();
       if (saveMany.isCascade()) {
-        saveAssocManyDetails(saveMany, false, insertMode);
+        saveAssocManyDetails(saveMany, false);
       }
       // for ManyToMany save the 'relationship' via inserts/deletes
       // into/from the intersection table
@@ -900,7 +925,7 @@ public final class DefaultPersister implements Persister {
       }
       if (saveMany.isCascade()) {
         // potentially deletes 'missing children' for 'stateless update'
-        saveAssocManyDetails(saveMany, saveMany.isDeleteMissingChildren(), insertMode);
+        saveAssocManyDetails(saveMany, saveMany.isDeleteMissingChildren());
       }
     }
   }
@@ -922,7 +947,7 @@ public final class DefaultPersister implements Persister {
             EntityBean eb = (EntityBean) removedBean;
             if (eb._ebean_getIntercept().isLoaded()) {
               // only delete if the bean was loaded meaning that it is known to exist in the DB
-              deleteRequest(createPublishRequest(removedBean, saveMany.getTransaction(), PersistRequest.Type.DELETE, saveMany.isPublish()));
+              deleteRequest(createPublishRequest(removedBean, saveMany.getTransaction(), PersistRequest.Type.DELETE, saveMany.getFlags()));
             }
           }
         }
@@ -933,9 +958,9 @@ public final class DefaultPersister implements Persister {
   /**
    * Save the details from a OneToMany collection.
    */
-  private void saveAssocManyDetails(SaveManyPropRequest saveMany, boolean deleteMissingChildren, boolean insertMode) {
+  private void saveAssocManyDetails(SaveManyPropRequest saveMany, boolean deleteMissingChildren) {
 
-    saveMany.saveDetails(this, deleteMissingChildren, insertMode);
+    saveMany.saveDetails(this, deleteMissingChildren);
   }
 
   /**
@@ -1056,13 +1081,12 @@ public final class DefaultPersister implements Persister {
     return false;
   }
 
-  private int deleteAssocManyIntersection(EntityBean bean, BeanPropertyAssocMany<?> many, Transaction t, boolean publish) {
+  private void deleteAssocManyIntersection(EntityBean bean, BeanPropertyAssocMany<?> many, Transaction t, boolean publish) {
 
     // delete all intersection rows for this bean
     IntersectionRow intRow = many.buildManyToManyDeleteChildren(bean, publish);
     SqlUpdate sqlDelete = intRow.createDeleteChildren(server);
-
-    return executeSqlUpdate(sqlDelete, t);
+    executeSqlUpdate(sqlDelete, t);
   }
 
   /**
@@ -1154,7 +1178,7 @@ public final class DefaultPersister implements Persister {
    * </p>
    */
   void deleteManyDetails(SpiTransaction t, BeanDescriptor<?> desc, EntityBean parentBean,
-                                 BeanPropertyAssocMany<?> many, List<Object> excludeDetailIds, boolean softDelete) {
+                         BeanPropertyAssocMany<?> many, List<Object> excludeDetailIds, boolean softDelete) {
 
     if (many.getCascadeInfo().isDelete()) {
       // cascade delete the beans in the collection
@@ -1202,7 +1226,7 @@ public final class DefaultPersister implements Persister {
   /**
    * Save any associated one beans.
    */
-  private void saveAssocOne(PersistRequestBean<?> request, boolean insertMode) {
+  private void saveAssocOne(PersistRequestBean<?> request) {
 
     BeanDescriptor<?> desc = request.getBeanDescriptor();
 
@@ -1219,7 +1243,7 @@ public final class DefaultPersister implements Persister {
           && !request.isParent(detailBean)) {
           SpiTransaction t = request.getTransaction();
           t.depth(-1);
-          saveRecurse(detailBean, t, null, insertMode, request.isPublish());
+          saveRecurse(detailBean, t, null, request.getFlags());
           t.depth(+1);
         }
       }
@@ -1315,25 +1339,25 @@ public final class DefaultPersister implements Persister {
    * perform an insert, update or delete.
    */
   private <T> PersistRequestBean<T> createRequest(T bean, Transaction t, PersistRequest.Type type) {
-    return createRequestInternal(bean, t, type, false, false);
+    return createRequestInternal(bean, t, type, Flags.ZERO);
   }
 
   /**
    * Create the Persist Request Object additionally specifying the publish status.
    */
-  private <T> PersistRequestBean<T> createPublishRequest(T bean, Transaction t, PersistRequest.Type type, boolean publish) {
-    return createRequestInternal(bean, t, type, false, publish);
+  private <T> PersistRequestBean<T> createPublishRequest(T bean, Transaction t, PersistRequest.Type type, int flags) {
+    return createRequestInternal(bean, t, type, Flags.unsetRecuse(flags));
   }
 
   /**
    * Create the Persist Request Object additionally specifying the publish status.
    */
-  private <T> PersistRequestBean<T> createRequestInternal(T bean, Transaction t, PersistRequest.Type type, boolean saveRecurse, boolean publish) {
+  private <T> PersistRequestBean<T> createRequestInternal(T bean, Transaction t, PersistRequest.Type type, int flags) {
     BeanManager<T> mgr = getBeanManager(bean);
     if (mgr == null) {
       throw new PersistenceException(errNotRegistered(bean.getClass()));
     }
-    return createRequest(bean, t, null, mgr, type, saveRecurse, publish);
+    return createRequest(bean, t, null, mgr, type, flags);
   }
 
   /**
@@ -1341,7 +1365,7 @@ public final class DefaultPersister implements Persister {
    * <p>
    * This call determines the PersistRequest.Type based on bean state and the insert flag (root persist type).
    */
-  private <T> PersistRequestBean<T> createRequestRecurse(T bean, Transaction t, Object parentBean, boolean insertMode, boolean publish) {
+  private <T> PersistRequestBean<T> createRequestRecurse(T bean, Transaction t, Object parentBean, int flags) {
     BeanManager<T> mgr = getBeanManager(bean);
     if (mgr == null) {
       throw new PersistenceException(errNotRegistered(bean.getClass()));
@@ -1349,14 +1373,15 @@ public final class DefaultPersister implements Persister {
     BeanDescriptor<T> desc = mgr.getBeanDescriptor();
     EntityBean entityBean = (EntityBean) bean;
     PersistRequest.Type type;
-    if (publish) {
+    if (Flags.isPublishOrMerge(flags)) {
       // insert if it is a new bean (as publish created it)
-      type = entityBean._ebean_getIntercept().isNew() ? Type.INSERT : Type.UPDATE;
+      type = entityBean._ebean_getIntercept().isUpdate() ? Type.UPDATE : Type.INSERT;
     } else {
       // determine Insert or Update based on bean state and insert flag
+      boolean insertMode = Flags.isInsert(flags);
       type = desc.isInsertMode(entityBean._ebean_getIntercept(), insertMode) ? Type.INSERT : Type.UPDATE;
     }
-    return createRequest(bean, t, parentBean, mgr, type, true, publish);
+    return createRequest(bean, t, parentBean, mgr, type, Flags.setRecurse(flags));
   }
 
   /**
@@ -1365,7 +1390,7 @@ public final class DefaultPersister implements Persister {
    */
   @SuppressWarnings({"unchecked", "rawtypes"})
   private <T> PersistRequestBean<T> createRequest(T bean, Transaction t, Object parentBean, BeanManager<?> mgr,
-                                                  PersistRequest.Type type, boolean saveRecurse, boolean publish) {
+                                                  PersistRequest.Type type, int flags) {
 
     if (type == Type.DELETE_PERMANENT) {
       type = Type.DELETE;
@@ -1374,7 +1399,7 @@ public final class DefaultPersister implements Persister {
       type = Type.SOFT_DELETE;
     }
 
-    return new PersistRequestBean(server, bean, parentBean, mgr, (SpiTransaction) t, persistExecute, type, saveRecurse, publish);
+    return new PersistRequestBean(server, bean, parentBean, mgr, (SpiTransaction) t, persistExecute, type, flags);
   }
 
   private String errNotRegistered(Class<?> beanClass) {
diff --git a/src/main/java/io/ebeaninternal/server/persist/Flags.java b/src/main/java/io/ebeaninternal/server/persist/Flags.java
new file mode 100644
index 000000000..ffde410c5
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/persist/Flags.java
@@ -0,0 +1,135 @@
+package io.ebeaninternal.server.persist;
+
+/**
+ * Flags used in persistence.
+ * <p>
+ * Allows passing of flag state when recursively persisting.
+ */
+public class Flags {
+
+  /**
+   * Indicates the bean is being inserted.
+   */
+  public static final int INSERT = 0x00000001;
+
+  /**
+   * Indicates persist cascade.
+   */
+  public static final int RECURSE = 0x00000002;
+
+  /**
+   * Indicates Publish mode.
+   */
+  public static final int PUBLISH = 0x00000004;
+
+  /**
+   * Indicates Merge mode.
+   */
+  public static final int MERGE = 0x00000008;
+
+  /**
+   * No flags set.
+   */
+  public static final int ZERO = 0;
+
+  public static final int PUBLISH_RECURSE = PUBLISH + RECURSE;
+
+  private static final int PUBLISH_MERGE = PUBLISH + MERGE;
+
+  /**
+   * Return true if the bean is being inserted.
+   */
+  public static boolean isInsert(int state) {
+    return isSet(state, INSERT);
+  }
+
+  /**
+   * Return true if persist cascading.
+   */
+  public static boolean isRecurse(int state) {
+    return isSet(state, RECURSE);
+  }
+
+  /**
+   * Return true if part of a Publish.
+   */
+  public static boolean isPublish(int state) {
+    return isSet(state, PUBLISH);
+  }
+
+  /**
+   * Return true if part of a Merge.
+   */
+  public static boolean isMerge(int state) {
+    return isSet(state, PUBLISH);
+  }
+
+  /**
+   * Return true if part of a Merge or Publish.
+   */
+  public static boolean isPublishOrMerge(long state) {
+    return (state & PUBLISH_MERGE) != 0;
+  }
+
+  /**
+   * Return true if the given flag is set.
+   */
+  public static boolean isSet(int state, int flag) {
+    return (state & flag) == flag;
+  }
+
+  /**
+   * Set Insert flag.
+   */
+  public static int setInsert(int state) {
+    return set(state, INSERT, true);
+  }
+
+  /**
+   * Parent was not inserted.
+   */
+  public static int unsetInsert(int state) {
+    return set(state, INSERT, false);
+  }
+
+  /**
+   * Set Recurse flag.
+   */
+  public static int setRecurse(int state) {
+    return set(state, RECURSE, true);
+  }
+
+  public static int unsetRecuse(int state) {
+    return set(state, RECURSE, false);
+  }
+
+  /**
+   * Set Publish flag.
+   */
+  public static int setPublish(int state) {
+    return set(state, PUBLISH, true);
+  }
+
+  public static int unsetPublish(int state) {
+    return set(state, PUBLISH, false);
+  }
+
+  /**
+   * Set Merge flag.
+   */
+  public static int setMerge(int state) {
+    return set(state, MERGE, true);
+  }
+
+  public static int unsetMerge(int state) {
+    return set(state, MERGE, false);
+  }
+
+  private static int set(int state, int flag, boolean setFlag) {
+    if (setFlag) {
+      return (state |= flag);
+    } else {
+      return state &= ~flag;
+    }
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeContext.java b/src/main/java/io/ebeaninternal/server/persist/MergeContext.java
new file mode 100644
index 000000000..8de5b7ee4
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/persist/MergeContext.java
@@ -0,0 +1,56 @@
+package io.ebeaninternal.server.persist;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.api.SpiTransaction;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Context used for merge processing.
+ */
+class MergeContext {
+
+  private final SpiEbeanServer server;
+
+  private final SpiTransaction transaction;
+
+  private final List<EntityBean> deleteBeans = new ArrayList<>();
+
+  private boolean clientGeneratedIds;
+
+  MergeContext(SpiEbeanServer server, SpiTransaction transaction, boolean clientGeneratedIds) {
+    this.server = server;
+    this.transaction = transaction;
+    this.clientGeneratedIds = clientGeneratedIds;
+  }
+
+  /**
+   * Add to the list of beans to delete.
+   */
+  void addDelete(EntityBean deleteBean) {
+    deleteBeans.add(deleteBean);
+  }
+
+  /**
+   * Return true if Ids must be checked against the DB.
+   */
+  boolean isClientGeneratedIds() {
+    return clientGeneratedIds;
+  }
+
+  /**
+   * Check if the Id / bean exists in the database.
+   */
+  boolean idExists(Class<?> beanType, Object beanId) {
+    return server.exists(beanType, beanId, transaction);
+  }
+
+  /**
+   * Return the list of beans to delete.
+   */
+  List<EntityBean> getDeletedBeans() {
+    return deleteBeans;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java b/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java
new file mode 100644
index 000000000..c82febba7
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java
@@ -0,0 +1,147 @@
+package io.ebeaninternal.server.persist;
+
+import io.ebean.CacheMode;
+import io.ebean.MergeOptions;
+import io.ebean.PersistenceContextScope;
+import io.ebean.Query;
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.api.SpiTransaction;
+import io.ebeaninternal.server.deploy.BeanDescriptor;
+import io.ebeaninternal.server.deploy.BeanProperty;
+import io.ebeaninternal.server.deploy.BeanPropertyAssoc;
+import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
+import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
+
+import javax.persistence.PersistenceException;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+/**
+ * Drives the merge processing.
+ */
+class MergeHandler {
+
+  private final Pattern PATH_SPLIT = Pattern.compile("\\.");
+
+  private final SpiEbeanServer server;
+  private final BeanDescriptor<?> desc;
+  private final EntityBean bean;
+  private final MergeOptions options;
+  private final SpiTransaction transaction;
+
+  private final Map<String, MergeNode> nodes = new LinkedHashMap<>();
+
+
+  MergeHandler(SpiEbeanServer server, BeanDescriptor<?> desc, EntityBean bean, MergeOptions options, SpiTransaction transaction) {
+    this.server = server;
+    this.desc = desc;
+    this.bean = bean;
+    this.options = options;
+    this.transaction = transaction;
+  }
+
+  /**
+   * Fetch the Ids for the graph and use them to determine inserts, updates and deletes for the merge paths.
+   */
+  List<EntityBean> merge() {
+
+    Set<String> paths = options.paths();
+    if (paths.isEmpty() && !options.isClientGeneratedIds()) {
+      // just do a single insert or update based on Id value present
+      Object id = desc.getId(bean);
+      if (id != null) {
+        bean._ebean_getIntercept().setForceUpdate(true);
+      }
+      return Collections.emptyList();
+    }
+
+    EntityBean outline = fetchOutline(paths);
+    if (outline == null) {
+      // considered an insert ...
+      return Collections.emptyList();
+    }
+
+    // the top level bean is an update
+    bean._ebean_getIntercept().setForceUpdate(true);
+
+    // detect what beans are updates and recursively set forceUpdate as needed
+    // and outline beans not in the merge graph are generally considered as deletes
+    MergeContext context = new MergeContext(server, transaction, options.isClientGeneratedIds());
+    MergeRequest request = new MergeRequest(context, bean, outline);
+    for (MergeNode value : nodes.values()) {
+      value.merge(request);
+    }
+
+    return context.getDeletedBeans();
+  }
+
+  /**
+   * Fetch the outline bean with associated one and associated many beans loaded with Id values only.
+   * <p>
+   * We use the Id values to determine what are inserts, updates and deletes as part of the merge.
+   */
+  private EntityBean fetchOutline(Set<String> paths) {
+
+    Query<?> query = server.find(desc.getBeanType());
+
+    query.setBeanCacheMode(CacheMode.OFF);
+    query.setPersistenceContextScope(PersistenceContextScope.QUERY);
+    query.setId(desc.getId(bean));
+    query.select(desc.getIdProperty().getName());
+
+    for (String path : paths) {
+      MergeNode node = buildNode(path);
+      node.addSelectId(query);
+    }
+    return (EntityBean) server.findOne(query, transaction);
+  }
+
+  private MergeNode buildNode(String path) {
+    String[] split = PATH_SPLIT.split(path);
+    if (split.length == 1) {
+      return addRootLevelNode(split[0]);
+    } else {
+      return addSubNode(path, split);
+    }
+  }
+
+  private MergeNode addSubNode(String fullPath, String[] split) {
+    MergeNode parent = nodes.get(split[0]);
+    if (parent == null) {
+      throw new PersistenceException("Unable to find parent path " + split[0] + " in merge paths?");
+    }
+
+    for (int i = 1; i < split.length - 1; i++) {
+      parent = parent.get(split[i]);
+      if (parent == null) {
+        throw new PersistenceException("Unable to find parent path " + split[0] + " in merge paths?");
+      }
+    }
+    return parent.addChild(fullPath, split[split.length - 1]);
+  }
+
+  private MergeNode addRootLevelNode(String rootPath) {
+
+    MergeNode node = createMergeNode(rootPath, desc, rootPath);
+    nodes.put(rootPath, node);
+    return node;
+  }
+
+  static MergeNode createMergeNode(String fullPath, BeanDescriptor<?> targetDesc, String path) {
+
+    BeanProperty prop = targetDesc.getBeanProperty(path);
+    if (prop == null || !(prop instanceof BeanPropertyAssoc)) {
+      throw new PersistenceException("merge path [" + path + "] is not a ToMany or ToOne property of " + targetDesc.getFullName());
+    }
+    if (prop instanceof BeanPropertyAssocMany<?>) {
+      return new MergeNodeAssocMany(fullPath, (BeanPropertyAssocMany<?>) prop);
+    } else {
+      return new MergeNodeAssocOne(fullPath, (BeanPropertyAssocOne<?>) prop);
+    }
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeNode.java b/src/main/java/io/ebeaninternal/server/persist/MergeNode.java
new file mode 100644
index 000000000..0f7e47a48
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/persist/MergeNode.java
@@ -0,0 +1,74 @@
+package io.ebeaninternal.server.persist;
+
+import io.ebean.Query;
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.BeanDescriptor;
+import io.ebeaninternal.server.deploy.BeanProperty;
+import io.ebeaninternal.server.deploy.BeanPropertyAssoc;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * Base class for merge nodes.
+ */
+abstract class MergeNode {
+
+  protected final String fullPath;
+  protected final BeanDescriptor<?> targetDescriptor;
+  protected Map<String,MergeNode> children;
+
+  MergeNode(String fullPath, BeanPropertyAssoc<?> property) {
+    this.fullPath = fullPath;
+    this.targetDescriptor = property.getTargetDescriptor();
+  }
+
+  /**
+   * Perform the merge processing.
+   */
+  abstract void merge(MergeRequest request);
+
+  /**
+   * Add a child node given the fullPath and relative path.
+   */
+  MergeNode addChild(String fullPath, String path) {
+    MergeNode childNode = MergeHandler.createMergeNode(fullPath, targetDescriptor, path);
+    if (children == null) {
+      children = new LinkedHashMap<>();
+    }
+    children.put(path, childNode);
+    return childNode;
+  }
+
+  /**
+   * Return the node given the relative path.
+   */
+  MergeNode get(String path) {
+    if (children != null) {
+      return children.get(path);
+    }
+    return null;
+  }
+
+  /**
+   * Add to the query to fetch the Ids values for the foreign keys basically.
+   */
+  void addSelectId(Query<?> query) {
+
+    BeanProperty idProperty = targetDescriptor.getIdProperty();
+    query.fetch(fullPath, idProperty.getName());
+  }
+
+  /**
+   * Cascade the merge processing if this has child nodes.
+   */
+  protected void cascade(EntityBean entityBean, EntityBean outlineBean, MergeRequest request) {
+
+    if (children != null && !children.isEmpty()) {
+      MergeRequest sub = request.sub(entityBean, outlineBean);
+      for (MergeNode node : children.values()) {
+        node.merge(sub);
+      }
+    }
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocMany.java b/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocMany.java
new file mode 100644
index 000000000..d6e1a8e8f
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocMany.java
@@ -0,0 +1,57 @@
+package io.ebeaninternal.server.persist;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Node for processing merge on ToMany properties.
+ */
+class MergeNodeAssocMany extends MergeNode {
+
+  private final BeanPropertyAssocMany<?> many;
+
+  MergeNodeAssocMany(String fullPath, BeanPropertyAssocMany<?> property) {
+    super(fullPath, property);
+    this.many = property;
+  }
+
+  public void merge(MergeRequest request) {
+
+    Collection beans = many.getRawCollection(request.getBean());
+    Collection outlines = many.getRawCollection(request.getOutline());
+
+    Map<Object, EntityBean> outlineIds = new HashMap<>();
+    if (outlines != null) {
+      for (Object outline : outlines) {
+        EntityBean outlineBean = (EntityBean) outline;
+        Object outlineId = targetDescriptor.getId(outlineBean);
+        outlineIds.put(outlineId, outlineBean);
+      }
+    }
+
+    if (beans != null) {
+      for (Object bean : beans) {
+        EntityBean entityBean = (EntityBean) bean;
+        Object beanId = targetDescriptor.getId(entityBean);
+        if (beanId != null) {
+          EntityBean outlineBean = outlineIds.remove(beanId);
+          if (outlineBean != null) {
+            // must be an update
+            entityBean._ebean_getIntercept().setForceUpdate(true);
+            cascade(entityBean, outlineBean, request);
+          }
+        }
+      }
+    }
+
+    // any remaining are considered deletes
+    for (EntityBean outlineBean : outlineIds.values()) {
+      request.addDelete(outlineBean);
+    }
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOne.java b/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOne.java
new file mode 100644
index 000000000..b33c393c5
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOne.java
@@ -0,0 +1,60 @@
+package io.ebeaninternal.server.persist;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
+
+import java.util.Objects;
+
+/**
+ * Node for processing merge on ToOne properties.
+ */
+class MergeNodeAssocOne extends MergeNode {
+
+  private final BeanPropertyAssocOne<?> one;
+
+  MergeNodeAssocOne(String fullPath, BeanPropertyAssocOne<?> property) {
+    super(fullPath, property);
+    this.one = property;
+  }
+
+  public void merge(MergeRequest request) {
+
+    EntityBean entityBean = getEntityBean(request.getBean());
+    if (entityBean == null) {
+      checkOrphanRemoval(request);
+
+    } else {
+      Object beanId = targetDescriptor.getId(entityBean);
+      if (beanId == null) {
+        checkOrphanRemoval(request);
+
+      } else {
+        EntityBean outlineBean = getEntityBean(request.getOutline());
+        Object outlineId = (outlineBean == null) ? null : targetDescriptor.getId(outlineBean);
+        if (isUpdate(beanId, outlineId, request)) {
+          entityBean._ebean_getIntercept().setForceUpdate(true);
+          cascade(entityBean, outlineBean, request);
+        }
+      }
+    }
+  }
+
+  private void checkOrphanRemoval(MergeRequest request) {
+    if (one.isOrphanRemoval()) {
+      EntityBean outlineBean = getEntityBean(request.getOutline());
+      if (outlineBean != null) {
+        request.addDelete(outlineBean);
+      }
+    }
+  }
+
+  private boolean isUpdate(Object beanId, Object outlineId, MergeRequest request) {
+    return Objects.equals(beanId, outlineId)
+      || !request.isClientGeneratedIds()
+      || request.idExists(targetDescriptor.getBeanType(), beanId);
+  }
+
+  private EntityBean getEntityBean(Object bean) {
+    return (EntityBean) one.getVal(bean);
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeRequest.java b/src/main/java/io/ebeaninternal/server/persist/MergeRequest.java
new file mode 100644
index 000000000..303ccb382
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/persist/MergeRequest.java
@@ -0,0 +1,64 @@
+package io.ebeaninternal.server.persist;
+
+import io.ebean.bean.EntityBean;
+
+/**
+ * Request object used for processing the merge.
+ */
+class MergeRequest {
+
+  private final EntityBean bean;
+  private final EntityBean outline;
+
+  private final MergeContext context;
+
+  MergeRequest(MergeContext context, EntityBean bean, EntityBean outline) {
+    this.context = context;
+    this.bean = bean;
+    this.outline = outline;
+  }
+
+  /**
+   * Create a sub request with the given beans (to cascade the processing).
+   */
+  public MergeRequest sub(EntityBean entityBean, EntityBean outlineBean) {
+    return new MergeRequest(context, entityBean, outlineBean);
+  }
+
+  /**
+   * Return the entity bean being merged.
+   */
+  public EntityBean getBean() {
+    return bean;
+  }
+
+  /**
+   * Return the outline bean (only has Id property).
+   */
+  public EntityBean getOutline() {
+    return outline;
+  }
+
+  /**
+   * Add a bean to the deletion list.
+   */
+  public void addDelete(EntityBean deleteRemain) {
+    context.addDelete(deleteRemain);
+  }
+
+  /**
+   * Return true if the Ids are generated by the client. This means we can't know if a bean
+   * should be inserted or updated based on having an Id value.
+   */
+  public boolean isClientGeneratedIds() {
+    return context.isClientGeneratedIds();
+  }
+
+  /**
+   * Return true if a bean of the type with the given Id exists in the database.
+   */
+  public boolean idExists(Class<?> beanType, Object beanId) {
+    return context.idExists(beanType, beanId);
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyPropRequest.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyPropRequest.java
index 4556edcd2..97f9d1131 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyPropRequest.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyPropRequest.java
@@ -21,6 +21,7 @@ import java.util.Map;
  */
 class SaveManyPropRequest {
 
+  private final PersistRequestBean<?> request;
   private final boolean insertedParent;
   private final BeanPropertyAssocMany<?> many;
   private final EntityBean parentBean;
@@ -37,10 +38,10 @@ class SaveManyPropRequest {
   private Collection<?> collection;
   private DefaultPersister persister;
   private boolean deleteMissing;
-  private boolean insertMode;
   private int sortOrder;
 
   SaveManyPropRequest(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
+    this.request = request;
     this.insertedParent = insertedParent;
     this.many = many;
     this.cascade = many.getCascadeInfo().isSave();
@@ -70,6 +71,10 @@ class SaveManyPropRequest {
     return deleteMissingChildren;
   }
 
+  public int getFlags() {
+    return request.getFlags();
+  }
+
   boolean isInsertedParent() {
     return insertedParent;
   }
@@ -108,11 +113,10 @@ class SaveManyPropRequest {
     }
   }
 
-  void saveDetails(DefaultPersister persister, boolean deleteMissing, boolean insertMode) {
+  void saveDetails(DefaultPersister persister, boolean deleteMissing) {
 
     this.persister = persister;
     this.deleteMissing = deleteMissing;
-    this.insertMode = insertMode;
 
     // check that the list is not null and if it is a BeanCollection
     // check that is has been populated (don't trigger lazy loading)
@@ -198,7 +202,7 @@ class SaveManyPropRequest {
         }
 
         if (!skipSavingThisBean) {
-          persister.saveRecurse(detail, transaction, parentBean, insertMode, publish);
+          persister.saveRecurse(detail, transaction, parentBean, request.getFlags());
         }
       }
     }
diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index 62265c0fb..5755f6ed5 100644
--- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -11,6 +11,7 @@ import io.ebean.Filter;
 import io.ebean.FutureIds;
 import io.ebean.FutureList;
 import io.ebean.FutureRowCount;
+import io.ebean.MergeOptions;
 import io.ebean.PagedList;
 import io.ebean.PersistenceContextScope;
 import io.ebean.Query;
@@ -236,6 +237,16 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
     return 0;
   }
 
+  @Override
+  public void merge(Object bean, MergeOptions options) {
+
+  }
+
+  @Override
+  public void merge(Object bean, MergeOptions options, Transaction transaction) {
+
+  }
+
   @Override
   public <T> List<Version<T>> findVersions(Query<T> query, Transaction transaction) {
     return null;
@@ -551,6 +562,11 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
 
   }
 
+  @Override
+  public boolean exists(Class<?> beanType, Object beanId, Transaction transaction) {
+    return false;
+  }
+
   @Override
   public <T> T find(Class<T> beanType, Object uid) {
     return null;
diff --git a/src/test/java/io/ebeaninternal/server/persist/BatchedBeanHolderTest.java b/src/test/java/io/ebeaninternal/server/persist/BatchedBeanHolderTest.java
index 2e200abd1..12a7acef0 100644
--- a/src/test/java/io/ebeaninternal/server/persist/BatchedBeanHolderTest.java
+++ b/src/test/java/io/ebeaninternal/server/persist/BatchedBeanHolderTest.java
@@ -6,8 +6,8 @@ import io.ebeaninternal.server.core.PersistRequest;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanManager;
-import org.tests.model.basic.Customer;
 import org.junit.Test;
+import org.tests.model.basic.Customer;
 
 import java.sql.Timestamp;
 
@@ -17,8 +17,7 @@ public class BatchedBeanHolderTest extends BaseTestCase {
 
   @SuppressWarnings({ "rawtypes", "unchecked" })
   @Test
-  public void testAppend() throws Exception {
-
+  public void testAppend() {
 
     TDSpiEbeanServer server = new TDSpiEbeanServer("foo");
 
@@ -32,13 +31,13 @@ public class BatchedBeanHolderTest extends BaseTestCase {
 
     Customer customer = new Customer();
     customer.setUpdtime(new Timestamp(System.currentTimeMillis()));
-    PersistRequestBean req1 = new PersistRequestBean(server, customer, null, beanManager, null, null, PersistRequest.Type.INSERT, false, false);
+    PersistRequestBean req1 = new PersistRequestBean(server, customer, null, beanManager, null, null, PersistRequest.Type.INSERT, 0);
 
 
     int size = holder.append(req1);
     assertEquals(1, size);
 
-    PersistRequestBean req2 = new PersistRequestBean(server, customer, null, beanManager, null, null, PersistRequest.Type.INSERT, false, false);
+    PersistRequestBean req2 = new PersistRequestBean(server, customer, null, beanManager, null, null, PersistRequest.Type.INSERT, 0);
     size = holder.append(req2);
     assertEquals(0, size);
 
diff --git a/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java b/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java
new file mode 100644
index 000000000..4e4d947c4
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java
@@ -0,0 +1,44 @@
+package io.ebeaninternal.server.persist;
+
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class FlagsTest {
+
+
+  @Test
+  public void test() {
+
+    int state = 0;
+
+    state = Flags.setPublish(state);
+    assertThat(Flags.isSet(state, Flags.PUBLISH)).isTrue();
+
+    state = Flags.setMerge(state);
+    state = Flags.setInsert(state);
+    assertThat(Flags.isSet(state, Flags.PUBLISH)).isTrue();
+    assertThat(Flags.isSet(state, Flags.MERGE)).isTrue();
+    assertThat(Flags.isSet(state, Flags.INSERT)).isTrue();
+
+    state = Flags.unsetPublish(state);
+    assertThat(Flags.isSet(state, Flags.PUBLISH)).isFalse();
+    assertThat(Flags.isSet(state, Flags.MERGE)).isTrue();
+    assertThat(Flags.isSet(state, Flags.INSERT)).isTrue();
+
+  }
+
+  @Test
+  public void isPublishOrMerge() {
+
+    assertThat(Flags.isPublishOrMerge(0)).isFalse();
+    assertThat(Flags.isPublishOrMerge(Flags.INSERT)).isFalse();
+
+    assertThat(Flags.isPublishOrMerge(Flags.PUBLISH)).isTrue();
+    assertThat(Flags.isPublishOrMerge(Flags.MERGE)).isTrue();
+
+    int mergePublish = Flags.setMerge(Flags.setPublish(0));
+    assertThat(Flags.isPublishOrMerge(mergePublish)).isTrue();
+  }
+}
diff --git a/src/test/java/org/tests/merge/MAddress.java b/src/test/java/org/tests/merge/MAddress.java
new file mode 100644
index 000000000..cfeb31bb6
--- /dev/null
+++ b/src/test/java/org/tests/merge/MAddress.java
@@ -0,0 +1,33 @@
+package org.tests.merge;
+
+import javax.persistence.Entity;
+
+@Entity
+public class MAddress extends MBase {
+
+  private String street;
+
+  private String city;
+
+  public MAddress(String street, String city) {
+    this.street = street;
+    this.city = city;
+  }
+
+  public String getStreet() {
+    return street;
+  }
+
+  public void setStreet(String street) {
+    this.street = street;
+  }
+
+  public String getCity() {
+    return city;
+  }
+
+  public void setCity(String city) {
+    this.city = city;
+  }
+
+}
diff --git a/src/test/java/org/tests/merge/MBase.java b/src/test/java/org/tests/merge/MBase.java
new file mode 100644
index 000000000..0172e9893
--- /dev/null
+++ b/src/test/java/org/tests/merge/MBase.java
@@ -0,0 +1,32 @@
+package org.tests.merge;
+
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Version;
+import java.util.UUID;
+
+@MappedSuperclass
+public class MBase {
+
+  @Id
+  private UUID id;
+
+  @Version
+  private long version;
+
+  public UUID getId() {
+    return id;
+  }
+
+  public void setId(UUID id) {
+    this.id = id;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/merge/MContact.java b/src/test/java/org/tests/merge/MContact.java
new file mode 100644
index 000000000..9331bbb43
--- /dev/null
+++ b/src/test/java/org/tests/merge/MContact.java
@@ -0,0 +1,67 @@
+package org.tests.merge;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import java.util.List;
+
+@Entity
+public class MContact extends MBase {
+
+  String email;
+  String firstName;
+  String lastName;
+
+  @ManyToOne
+  MCustomer customer;
+
+  @OneToMany(cascade = CascadeType.ALL, mappedBy = "contact")
+  List<MContactMessage> messages;
+
+  public MContact(String email, String firstName, String lastName) {
+    this.email = email;
+    this.firstName = firstName;
+    this.lastName = lastName;
+  }
+
+  public MCustomer getCustomer() {
+    return customer;
+  }
+
+  public void setCustomer(MCustomer customer) {
+    this.customer = customer;
+  }
+
+  public String getEmail() {
+    return email;
+  }
+
+  public void setEmail(String email) {
+    this.email = email;
+  }
+
+  public String getFirstName() {
+    return firstName;
+  }
+
+  public void setFirstName(String firstName) {
+    this.firstName = firstName;
+  }
+
+  public String getLastName() {
+    return lastName;
+  }
+
+  public void setLastName(String lastName) {
+    this.lastName = lastName;
+  }
+
+  public List<MContactMessage> getMessages() {
+    return messages;
+  }
+
+  public void setMessages(List<MContactMessage> messages) {
+    this.messages = messages;
+  }
+}
diff --git a/src/test/java/org/tests/merge/MContactMessage.java b/src/test/java/org/tests/merge/MContactMessage.java
new file mode 100644
index 000000000..95d22026f
--- /dev/null
+++ b/src/test/java/org/tests/merge/MContactMessage.java
@@ -0,0 +1,54 @@
+package org.tests.merge;
+
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+
+@Entity
+public class MContactMessage extends MBase {
+
+  private String title;
+
+  private String subject;
+
+  private String notes;
+
+  @ManyToOne(optional = false)
+  private MContact contact;
+
+  public MContactMessage(String title, String subject) {
+    this.title = title;
+    this.subject = subject;
+  }
+
+  public String getTitle() {
+    return title;
+  }
+
+  public void setTitle(String title) {
+    this.title = title;
+  }
+
+  public String getNotes() {
+    return notes;
+  }
+
+  public void setNotes(String notes) {
+    this.notes = notes;
+  }
+
+  public String getSubject() {
+    return subject;
+  }
+
+  public void setSubject(String subject) {
+    this.subject = subject;
+  }
+
+  public MContact getContact() {
+    return contact;
+  }
+
+  public void setContact(MContact contact) {
+    this.contact = contact;
+  }
+}
diff --git a/src/test/java/org/tests/merge/MCustomer.java b/src/test/java/org/tests/merge/MCustomer.java
new file mode 100644
index 000000000..802f8000b
--- /dev/null
+++ b/src/test/java/org/tests/merge/MCustomer.java
@@ -0,0 +1,68 @@
+package org.tests.merge;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import java.util.List;
+
+@Entity
+public class MCustomer extends MBase {
+
+  private String name;
+
+  private String notes;
+
+  @OneToMany(cascade = CascadeType.ALL, mappedBy = "customer")
+  private List<MContact> contacts;
+
+  @ManyToOne(cascade = CascadeType.ALL)
+  private MAddress shippingAddress;
+
+  @ManyToOne(cascade = CascadeType.ALL)
+  private MAddress billingAddress;
+
+  public MCustomer(String name) {
+    this.name = name;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getNotes() {
+    return notes;
+  }
+
+  public void setNotes(String notes) {
+    this.notes = notes;
+  }
+
+  public List<MContact> getContacts() {
+    return contacts;
+  }
+
+  public void setContacts(List<MContact> contacts) {
+    this.contacts = contacts;
+  }
+
+  public MAddress getShippingAddress() {
+    return shippingAddress;
+  }
+
+  public void setShippingAddress(MAddress shippingAddress) {
+    this.shippingAddress = shippingAddress;
+  }
+
+  public MAddress getBillingAddress() {
+    return billingAddress;
+  }
+
+  public void setBillingAddress(MAddress billingAddress) {
+    this.billingAddress = billingAddress;
+  }
+}
diff --git a/src/test/java/org/tests/merge/TestMergeBasic.java b/src/test/java/org/tests/merge/TestMergeBasic.java
new file mode 100644
index 000000000..03938fa71
--- /dev/null
+++ b/src/test/java/org/tests/merge/TestMergeBasic.java
@@ -0,0 +1,117 @@
+package org.tests.merge;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.MergeOptions;
+import io.ebean.MergeOptionsBuilder;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+import org.tests.model.basic.UUOne;
+import org.tests.model.basic.UUTwo;
+
+import java.util.List;
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestMergeBasic extends BaseTestCase {
+
+
+  private UUOne rebuildViaJson(UUOne input) {
+    String asJson = Ebean.json().toJson(input);
+    return Ebean.json().toBean(UUOne.class, asJson);
+  }
+
+  private UUOne build() {
+    UUOne uuOne = buildGraph();
+    Ebean.save(uuOne);
+    return rebuildViaJson(uuOne);
+  }
+
+  @Test
+  public void with_setClientGeneratedIds_expect_noDifferenceWithToMany() {
+
+    UUOne one = build();
+
+    one.setDescription("mod");
+    List<UUTwo> comments = one.getComments();
+    comments.remove(0);
+    comments.add(0, new UUTwo("twoMore", UUID.randomUUID()));
+    comments.add(new UUTwo("twoExtra", UUID.randomUUID()));
+
+    MergeOptions options = new MergeOptionsBuilder()
+      .addPath("comments")
+      .setClientGeneratedIds()
+      .build();
+
+    LoggedSqlCollector.start();
+    Ebean.merge(one, options);
+
+
+    List<String> sql = LoggedSqlCollector.stop();
+    // fetch the Ids ... used to identity inserts, updates and deletes
+    assertThat(sql.get(0)).contains("select t0.id, t1.id from uuone t0 left join uutwo t1 on t1.master_id = t0.id  where t0.id = ?");
+
+    // deletes of Ids that are no longer in the graph
+    assertThat(sql.get(1)).contains("delete from uutwo where id=?");
+
+    // cascade persist ... master
+    assertThat(sql.get(2)).contains("update uuone set name=?, description=?, version=? where id=? and version=?");
+
+    // persist children ...
+    assertThat(sql.get(3)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);");
+    assertThat(sql.get(4)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);");
+
+    assertThat(sql.get(5)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
+    assertThat(sql.get(6)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
+    assertThat(sql.get(7)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
+  }
+
+  @Test
+  public void test() {
+
+    UUOne one = build();
+    one.setDescription("mod");
+
+    List<UUTwo> comments = one.getComments();
+    comments.remove(0);
+    comments.add(0, new UUTwo("twoMore", UUID.randomUUID()));
+    comments.add(new UUTwo("twoExtra", UUID.randomUUID()));
+
+    MergeOptions options = new MergeOptionsBuilder()
+      .addPath("comments")
+      .build();
+
+    LoggedSqlCollector.start();
+    Ebean.merge(one, options);
+
+
+    List<String> sql = LoggedSqlCollector.stop();
+    // fetch the Ids ... used to identity inserts, updates and deletes
+    assertThat(sql.get(0)).contains("select t0.id, t1.id from uuone t0 left join uutwo t1 on t1.master_id = t0.id  where t0.id = ?");
+
+    // deletes of Ids that are no longer in the graph
+    assertThat(sql.get(1)).contains("delete from uutwo where id=?");
+
+    // cascade persist ... master
+    assertThat(sql.get(2)).contains("update uuone set name=?, description=?, version=? where id=? and version=?");
+
+    // persist children ...
+    assertThat(sql.get(3)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);");
+    assertThat(sql.get(4)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);");
+
+    assertThat(sql.get(5)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
+    assertThat(sql.get(6)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
+    assertThat(sql.get(7)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
+
+  }
+
+  private UUOne buildGraph() {
+    UUOne one = new UUOne("one1", UUID.randomUUID());
+    for (int i = 1; i < 5; i++) {
+      UUTwo two = new UUTwo("two" + i, UUID.randomUUID());
+      one.getComments().add(two);
+    }
+    return one;
+  }
+}
diff --git a/src/test/java/org/tests/merge/TestMergeCustomer.java b/src/test/java/org/tests/merge/TestMergeCustomer.java
new file mode 100644
index 000000000..8f314cac5
--- /dev/null
+++ b/src/test/java/org/tests/merge/TestMergeCustomer.java
@@ -0,0 +1,376 @@
+package org.tests.merge;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.FetchPath;
+import io.ebean.MergeOptions;
+import io.ebean.MergeOptionsBuilder;
+import io.ebean.text.PathProperties;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestMergeCustomer extends BaseTestCase {
+
+  private Random random = new Random();
+
+  /**
+   * So this is effectively the same as a stateless update.
+   */
+  @Test
+  public void customerOnly_expect_updateOnly() {
+
+
+    MCustomer mCustomer = partial("cust1", "(id,name,version)");
+    mCustomer.setName("NotCust1");
+
+    MergeOptions options = new MergeOptionsBuilder().build();
+
+
+    LoggedSqlCollector.start();
+
+    Ebean.merge(mCustomer, options);
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("update mcustomer set name=?, version=? where id=? and version=?");
+  }
+
+  @Test
+  public void customerOnly_setClientGeneratedIds_expect_selectAndUpdate() {
+
+
+    MCustomer mCustomer = partial("cust2", "(id,name,version)");
+    mCustomer.setName("NotCust2");
+
+    MergeOptions options = new MergeOptionsBuilder().setClientGeneratedIds().build();
+
+    LoggedSqlCollector.start();
+
+    server().merge(mCustomer, options);
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("select t0.id from mcustomer t0 where t0.id = ?");
+    assertThat(sql.get(1)).contains("update mcustomer set name=?, version=? where id=? and version=?");
+  }
+
+  @Test
+  public void customerWithAddresses_setClientGeneratedIds_expect_selectAndUpdate() {
+
+
+    MCustomer mCustomer = partial("cust3", "(id,name,version,shippingAddress(*),billingAddress(*))");
+    mCustomer.setName("NotCust3");
+    mCustomer.getBillingAddress().setStreet("modBillStreet");
+    mCustomer.getShippingAddress().setCity("modShipCity");
+
+    MergeOptions options = new MergeOptionsBuilder()
+      .addPath("shippingAddress")
+      .addPath("billingAddress")
+      .setClientGeneratedIds()
+      .build();
+
+    LoggedSqlCollector.start();
+
+    server().merge(mCustomer, options);
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(4);
+    assertThat(sql.get(0)).contains("select t0.id, t2.id, t1.id from mcustomer t0 left join maddress t2 on t2.id = t0.shipping_address_id  left join maddress t1 on t1.id = t0.billing_address_id  where t0.id = ?");
+    assertThat(sql.get(1)).contains("update maddress set street=?, city=?, version=? where id=? and version=?");
+    assertThat(sql.get(2)).contains("update maddress set street=?, city=?, version=? where id=? and version=?");
+    assertThat(sql.get(3)).contains("update mcustomer set name=?, version=?, shipping_address_id=?, billing_address_id=? where id=? and version=?");
+  }
+
+  @Test
+  public void customerWithAddresses_newAddress_setClientGeneratedIds_expect_insertAddress() {
+
+
+    MCustomer mCustomer = partial("cust3", "(id,name,version,shippingAddress(*),billingAddress(*))");
+    mCustomer.setName("NotCust3");
+
+    // new billing address - no Id value so must be insert
+    mCustomer.setBillingAddress(new MAddress("Short", "Mid Wicket"));
+    mCustomer.getShippingAddress().setCity("modShipCity");
+
+    MergeOptions options = new MergeOptionsBuilder()
+      .addPath("shippingAddress")
+      .addPath("billingAddress")
+      .setClientGeneratedIds()
+      .build();
+
+    LoggedSqlCollector.start();
+
+    server().merge(mCustomer, options);
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(4);
+    assertThat(sql.get(0)).contains("select t0.id, t2.id, t1.id from mcustomer t0 left join maddress t2 on t2.id = t0.shipping_address_id  left join maddress t1 on t1.id = t0.billing_address_id  where t0.id = ?");
+    assertThat(sql.get(1)).contains("update maddress set street=?, city=?, version=? where id=? and version=?");
+    assertThat(sql.get(2)).contains("insert into maddress (id, street, city, version) values (?,?,?,?);");
+    assertThat(sql.get(3)).contains("update mcustomer set name=?, version=?, shipping_address_id=?, billing_address_id=? where id=? and version=?");
+  }
+
+  @Test
+  public void customerWithAddresses_newAddressWithId_setClientGeneratedIds_expect_additionalCheckForAddressInsert() {
+
+
+    MCustomer mCustomer = partial("cust3", "(id,name,version,shippingAddress(*),billingAddress(*))");
+    mCustomer.setName("NotCust3");
+
+    // new billing address - has Id value + setClientGeneratedIds ... so extra query to check
+    MAddress mAddress = new MAddress("Short", "Mid Wicket");
+    mAddress.setId(UUID.randomUUID());
+    mCustomer.setBillingAddress(mAddress);
+    mCustomer.getShippingAddress().setCity("modShipCity");
+
+    MergeOptions options = new MergeOptionsBuilder()
+      .addPath("shippingAddress")
+      .addPath("billingAddress")
+      .setClientGeneratedIds() // As we are using clientIds ... we don't know if the new UUID is an insert or update without checking
+      .build();
+
+    LoggedSqlCollector.start();
+
+    server().merge(mCustomer, options);
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(5);
+    assertThat(sql.get(0)).contains("select t0.id, t2.id, t1.id from mcustomer t0 left join maddress t2 on t2.id = t0.shipping_address_id  left join maddress t1 on t1.id = t0.billing_address_id  where t0.id = ?");
+
+    // Additional check to see if the address with the unknown UUID is 'insert' or 'update'
+    assertThat(sql.get(1)).contains("select t0.id from maddress t0 where t0.id = ?");
+
+    assertThat(sql.get(2)).contains("update maddress set street=?, city=?, version=? where id=? and version=?");
+    assertThat(sql.get(3)).contains("insert into maddress (id, street, city, version) values (?,?,?,?);");
+    assertThat(sql.get(4)).contains("update mcustomer set name=?, version=?, shipping_address_id=?, billing_address_id=? where id=? and version=?");
+  }
+
+  @Test
+  public void assocOne_onlineIsNull() {
+
+    MCustomer c = new MCustomer("Null Address");
+    c.setBillingAddress(new MAddress("Cow corner", "Mid Wicket"));
+
+    Ebean.save(c);
+
+    MCustomer mCustomer = rebuildViaJson(c);
+
+    MAddress mAddress = new MAddress("Silly", "Mid Wicket");
+    mAddress.setId(UUID.randomUUID());
+    mCustomer.setShippingAddress(mAddress);
+
+    MergeOptions options = new MergeOptionsBuilder()
+      .addPath("shippingAddress")
+      .addPath("billingAddress")
+      .setClientGeneratedIds()
+      .build();
+
+    Ebean.merge(mCustomer, options);
+
+  }
+
+  private MCustomer rebuildViaJson(MCustomer input) {
+    String asJson = Ebean.json().toJson(input);
+    return Ebean.json().toBean(MCustomer.class, asJson);
+  }
+
+  @Test
+  public void whenContacts_isNull_expect_deleteContacts() {
+
+    MCustomer mCustomer = partial("cust6", "(id,name,version,shippingAddress(id),billingAddress(id),contacts(*))");
+
+    // null contacts ... but in path so this means - delete all contacts
+    mCustomer.setContacts(null);
+
+    MergeOptions options = new MergeOptionsBuilder()
+      .addPath("contacts")
+      .build();
+
+    LoggedSqlCollector.start();
+    server().merge(mCustomer, options);
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select t0.id, t1.id from mcustomer t0 left join mcontact t1 on t1.customer_id = t0.id  where t0.id = ?");
+    assertThat(sql.get(1)).contains("delete from mcontact_message where contact_id = ?");
+    assertThat(sql.get(2)).contains("delete from mcontact where id=?");
+
+    assertThat(sql.get(13)).contains("update mcustomer set name=?, version=?, shipping_address_id=?, billing_address_id=? where id=? and version=?");
+  }
+
+
+  @Test
+  public void whenContacts_isEmpty_expect_deleteContacts() {
+
+    MCustomer mCustomer = partial("cust6", "(id,name,version,shippingAddress(id),billingAddress(id),contacts(*))");
+
+    // empty contacts ... but in path so this means - delete all contacts
+    mCustomer.setContacts(new ArrayList<>());
+
+    MergeOptions options = new MergeOptionsBuilder()
+      .addPath("contacts")
+      .build();
+
+    LoggedSqlCollector.start();
+    server().merge(mCustomer, options);
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select t0.id, t1.id from mcustomer t0 left join mcontact t1 on t1.customer_id = t0.id  where t0.id = ?");
+    assertThat(sql.get(1)).contains("delete from mcontact_message where contact_id = ?");
+    assertThat(sql.get(2)).contains("delete from mcontact where id=?");
+
+    assertThat(sql.get(13)).contains("update mcustomer set name=?, version=?, shipping_address_id=?, billing_address_id=? where id=? and version=?");
+  }
+
+  @Test
+  public void whenContacts_mixed_expect_deleteInsertUpdateContacts() {
+
+    MCustomer mCustomer = partial("cust6", "(id,name,version,shippingAddress(id),billingAddress(id),contacts(*))");
+    List<MContact> contacts = mCustomer.getContacts();
+
+    MContact mContact = new MContact("z@a.com", "z", "zed");
+    mContact.setId(UUID.randomUUID());
+
+    contacts.add(mContact);
+
+    contacts.get(0).setEmail("a@beta.com");
+    contacts.get(1).setEmail("b@beta.com");
+    contacts.remove(4);
+    contacts.remove(2);
+
+    MContact mContactEnd = new MContact("z@z.com", "zx", "zedXtra");
+    mContactEnd.setId(UUID.randomUUID());
+    contacts.add(mContactEnd);
+
+
+    MergeOptions options = new MergeOptionsBuilder()
+      .addPath("contacts")
+      .build();
+
+    LoggedSqlCollector.start();
+    server().merge(mCustomer, options);
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select t0.id, t1.id from mcustomer t0 left join mcontact t1 on t1.customer_id = t0.id  where t0.id = ?");
+    assertThat(sql.get(1)).contains("delete from mcontact_message where contact_id = ?");
+    assertThat(sql.get(2)).contains("delete from mcontact where id=?");
+
+    assertThat(sql.get(5)).contains("update mcustomer set name=?, version=?, shipping_address_id=?, billing_address_id=? where id=? and version=?");
+    assertThat(sql.get(6)).contains("insert into mcontact");
+    assertThat(sql.get(7)).contains("insert into mcontact");
+    assertThat(sql.get(8)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?");
+    assertThat(sql.get(11)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?");
+  }
+
+  @Test
+  public void fullMonty() {
+
+    MCustomer cust1 = customer("monty1");
+
+    modify(cust1);
+
+    MergeOptions options = new MergeOptionsBuilder()
+      .addPath("billingAddress")
+      .addPath("shippingAddress")
+      .addPath("contacts")
+      .addPath("contacts.messages")
+      .setClientGeneratedIds()
+      .setDeletePermanent()
+      .build();
+
+
+    LoggedSqlCollector.start();
+    server().merge(cust1, options);
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select t0.id, t3.id, t1.id, t2.id from mcustomer t0 left join maddress t3 on t3.id = t0.shipping_address_id  left join maddress t1 on t1.id = t0.billing_address_id  left join mcontact t2 on t2.customer_id = t0.id  where t0.id = ?");
+    if (isH2()) {
+      // with nested OneToMany .. we need a second query to read the contact message ids
+      assertThat(sql.get(1)).contains("select t0.contact_id, t0.id from mcontact_message t0 where (t0.contact_id) in (?, ?, ?, ?, ?, ?, ?, ?, ?, ? )");
+    }
+    assertThat(sql.get(2)).contains("delete from mcontact_message where contact_id = ?");
+    assertThat(sql.get(3)).contains("delete from mcontact where id=?");
+    assertThat(sql.get(4)).contains("delete from mcontact_message where contact_id = ?");
+    assertThat(sql.get(5)).contains("delete from mcontact where id=?");
+
+    assertThat(sql.get(6)).contains("update maddress set street=?, city=?, version=? where id=? and version=?");
+    assertThat(sql.get(7)).contains("update mcustomer set name=?, notes=?, version=?, shipping_address_id=?, billing_address_id=? where id=? and version=?");
+
+    assertThat(sql.get(8)).contains("insert into mcontact");
+    assertThat(sql.get(9)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?");
+
+    assertThat(sql.get(13)).contains("update mcontact_message set title=?, subject=?, notes=?, version=?, contact_id=? where id=? and version=?");
+
+  }
+
+  private void modify(MCustomer cust) {
+
+    List<MContact> contacts = cust.getContacts();
+    MContact mContact = new MContact("z@a.com", "z", "zed");
+    mContact.setId(UUID.randomUUID());
+
+    contacts.add(mContact);
+
+    contacts.get(0).setEmail("a@beta.com");
+    contacts.get(1).setEmail("b@beta.com");
+    contacts.remove(4);
+    contacts.remove(2);
+
+    cust.setName(cust.getName()+" modified");
+    cust.getBillingAddress().setStreet("Short");
+
+    MAddress mAddress = new MAddress("Broken", "Dreams");
+    mAddress.setId(UUID.randomUUID());
+    cust.setShippingAddress(null);
+  }
+
+  private MCustomer partial(String name, String fetchGraph) {
+    MCustomer cust1 = buildCustomer(name);
+    Ebean.save(cust1);
+
+    FetchPath fetchPath = PathProperties.parse(fetchGraph);
+    String asJson = Ebean.json().toJson(cust1, fetchPath);
+    return Ebean.json().toBean(MCustomer.class, asJson);
+  }
+
+  private MCustomer customer(String name) {
+
+    MCustomer cust1 = buildCustomer(name);
+    Ebean.save(cust1);
+
+    String asJson = Ebean.json().toJson(cust1);
+
+    return Ebean.json().toBean(MCustomer.class, asJson);
+  }
+
+  private MCustomer buildCustomer(String name) {
+
+    MCustomer c = new MCustomer(name);
+    c.setShippingAddress(new MAddress("Fleet st", "London"));
+    c.setBillingAddress(new MAddress("Cow corner", "Mid Wicket"));
+
+    c.getContacts().add(addContact("a@a.com", "a", "alligator"));
+    c.getContacts().add(addContact("b@a.com", "b", "beaver"));
+    c.getContacts().add(addContact("c@a.com", "c", "crow"));
+    c.getContacts().add(addContact("d@a.com", "d", "dog"));
+    c.getContacts().add(addContact("e@a.com", "e", "ent"));
+    c.getContacts().add(addContact("f@a.com", "f", "frog"));
+
+    return c;
+  }
+
+  private MContact addContact(String email, String first, String last) {
+    MContact mContact = new MContact(email, first, last);
+    int i = random.nextInt(2);
+    for (int j = 0; j < i; j++) {
+      mContact.getMessages().add(new MContactMessage(first+" "+i, last+" "+i));
+    }
+    return mContact;
+  }
+}
diff --git a/src/test/java/org/tests/model/basic/UUOne.java b/src/test/java/org/tests/model/basic/UUOne.java
index 8efe6da67..53c88446a 100644
--- a/src/test/java/org/tests/model/basic/UUOne.java
+++ b/src/test/java/org/tests/model/basic/UUOne.java
@@ -6,6 +6,7 @@ import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
+import javax.persistence.Version;
 import java.util.List;
 import java.util.UUID;
 
@@ -18,10 +19,22 @@ public class UUOne {
 
   String name;
 
+  String description;
 
   @OneToMany(cascade = CascadeType.ALL, mappedBy = "master")
   List<UUTwo> comments;
 
+  @Version
+  long version;
+
+  public UUOne() {
+  }
+
+  public UUOne(String name, UUID id) {
+    this.name = name;
+    this.id = id;
+  }
+
   public UUID getId() {
     return id;
   }
@@ -38,6 +51,14 @@ public class UUOne {
     this.name = name;
   }
 
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
   public List<UUTwo> getComments() {
     return comments;
   }
@@ -46,4 +67,11 @@ public class UUOne {
     this.comments = comments;
   }
 
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
 }
diff --git a/src/test/java/org/tests/model/basic/UUTwo.java b/src/test/java/org/tests/model/basic/UUTwo.java
index cea9a9efd..f446fe397 100644
--- a/src/test/java/org/tests/model/basic/UUTwo.java
+++ b/src/test/java/org/tests/model/basic/UUTwo.java
@@ -4,6 +4,7 @@ import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
+import javax.persistence.Version;
 import java.util.UUID;
 
 @Entity
@@ -14,9 +15,22 @@ public class UUTwo {
 
   String name;
 
+  String notes;
+
   @ManyToOne(cascade = CascadeType.PERSIST)
   UUOne master;
 
+  @Version
+  long version;
+
+  public UUTwo() {
+  }
+
+  public UUTwo(String name, UUID id) {
+    this.name = name;
+    this.id = id;
+  }
+
   public UUID getId() {
     return id;
   }
@@ -33,6 +47,14 @@ public class UUTwo {
     this.name = name;
   }
 
+  public String getNotes() {
+    return notes;
+  }
+
+  public void setNotes(String notes) {
+    this.notes = notes;
+  }
+
   public UUOne getMaster() {
     return master;
   }
@@ -41,4 +63,11 @@ public class UUTwo {
     this.master = master;
   }
 
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
 }
diff --git a/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java b/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java
index 1cdd79c0d..cb7c6522d 100644
--- a/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java
+++ b/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java
@@ -3,10 +3,10 @@ package org.tests.query.joins;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
-import org.tests.model.basic.UUOne;
-import org.tests.model.basic.UUTwo;
 import org.junit.Assert;
 import org.junit.Test;
+import org.tests.model.basic.UUOne;
+import org.tests.model.basic.UUTwo;
 
 import java.util.List;
 
@@ -58,11 +58,11 @@ public class TestDisjunctWhereOuterOnMany extends BaseTestCase {
     Assert.assertEquals(2, rowCount);
 
     if (isPostgres()) {
-      String expectedSql = "select distinct on (t0.id) t0.id, t0.name from uuone t0 left join uutwo u1 on u1.master_id = t0.id  where (t0.name = ?  or u1.name = ? ) ";
+      String expectedSql = "select distinct on (t0.id) t0.id, t0.name, t0.description, t0.version from uuone t0 left join uutwo u1 on u1.master_id = t0.id  where (t0.name = ?  or u1.name = ? ) ";
       assertThat(sqlOf(query, 1)).contains(expectedSql);
 
     } else {
-      String expectedSql = "select distinct t0.id, t0.name from uuone t0 left join uutwo u1 on u1.master_id = t0.id  where (t0.name = ?  or u1.name = ? ) ";
+      String expectedSql = "select distinct t0.id, t0.name, t0.description, t0.version from uuone t0 left join uutwo u1 on u1.master_id = t0.id  where (t0.name = ?  or u1.name = ? ) ";
       assertThat(sqlOf(query, 1)).contains(expectedSql);
     }
 

From 674617eb9e882dd0ec34bedbdd367d3180df84fa Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 14 Mar 2018 00:02:58 +1300
Subject: [PATCH 0184/1036] [maven-release-plugin] prepare release
 ebean-11.15.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index bfc7d5897..d2be4b31a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.1-SNAPSHOT</version>
+  <version>11.15.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.15.1</tag>
   </scm>
 
   <profiles>

From 4bc1f2ede4ecd4e9b8d440f21535085479ec49e7 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 14 Mar 2018 00:03:11 +1300
Subject: [PATCH 0185/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d2be4b31a..37d6b08ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.1</version>
+  <version>11.15.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.15.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 602a35d0b67975f9cef91ffe9f921e7d89d86c84 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 14 Mar 2018 16:23:16 +1300
Subject: [PATCH 0186/1036] #1348 - ENH: Add support for bitwiseAnd /
 bitwiseAny / bitwiseAll .. expressions for use with integer/long "Flags"
 properties

---
 pom.xml                                       |   2 +-
 src/main/java/io/ebean/ExpressionFactory.java |  24 +++
 src/main/java/io/ebean/ExpressionList.java    |  55 ++++++-
 .../api/SpiExpressionRequest.java             |   2 +-
 .../server/core/BaseDbExpression.java         |  19 ---
 .../server/core/InternalConfiguration.java    |  15 +-
 .../server/expression/BitwiseExpression.java  |  63 ++++++++
 .../server/expression/BitwiseOp.java          |  22 +++
 .../expression/DefaultExpressionFactory.java  |  15 ++
 .../expression/DefaultExpressionList.java     |  18 +++
 .../expression/DefaultExpressionRequest.java  |   2 +-
 .../server/expression/JunctionExpression.java |  15 ++
 .../expression/platform/BaseDbExpression.java |  60 ++++++++
 .../platform}/BasicDbExpression.java          |   2 +-
 .../platform}/DbExpressionHandler.java        |   7 +-
 .../platform/DbExpressionHandlerFactory.java  |  31 ++++
 .../expression/platform/H2DbExpression.java   |  20 +++
 .../platform/MySqlDbExpression.java           |  12 ++
 .../platform}/OracleDbExpression.java         |  10 +-
 .../platform}/PostgresCast.java               |   2 +-
 .../platform}/PostgresDbExpression.java       |   2 +-
 .../platform}/SqlServerDbExpression.java      |   2 +-
 .../ebeaninternal/server/persist/Binder.java  |   2 +-
 .../expression/TDSpiExpressionRequest.java    |   2 +-
 .../platform}/PostgresCastTest.java           |   6 +-
 .../org/tests/expression/bitwise/BwBean.java  |  70 +++++++++
 .../org/tests/expression/bitwise/BwFlags.java |  78 ++++++++++
 .../bitwise/TestBitwiseExpressions.java       | 141 ++++++++++++++++++
 .../tests/repository/CustomerRepository.java  |   5 +-
 29 files changed, 652 insertions(+), 52 deletions(-)
 delete mode 100644 src/main/java/io/ebeaninternal/server/core/BaseDbExpression.java
 create mode 100644 src/main/java/io/ebeaninternal/server/expression/BitwiseExpression.java
 create mode 100644 src/main/java/io/ebeaninternal/server/expression/BitwiseOp.java
 create mode 100644 src/main/java/io/ebeaninternal/server/expression/platform/BaseDbExpression.java
 rename src/main/java/io/ebeaninternal/server/{core => expression/platform}/BasicDbExpression.java (94%)
 rename src/main/java/io/ebeaninternal/server/{core => expression/platform}/DbExpressionHandler.java (73%)
 create mode 100644 src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java
 create mode 100644 src/main/java/io/ebeaninternal/server/expression/platform/H2DbExpression.java
 create mode 100644 src/main/java/io/ebeaninternal/server/expression/platform/MySqlDbExpression.java
 rename src/main/java/io/ebeaninternal/server/{core => expression/platform}/OracleDbExpression.java (75%)
 rename src/main/java/io/ebeaninternal/server/{core => expression/platform}/PostgresCast.java (95%)
 rename src/main/java/io/ebeaninternal/server/{core => expression/platform}/PostgresDbExpression.java (97%)
 rename src/main/java/io/ebeaninternal/server/{core => expression/platform}/SqlServerDbExpression.java (95%)
 rename src/test/java/io/ebeaninternal/server/{core => expression/platform}/PostgresCastTest.java (84%)
 create mode 100644 src/test/java/org/tests/expression/bitwise/BwBean.java
 create mode 100644 src/test/java/org/tests/expression/bitwise/BwFlags.java
 create mode 100644 src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java

diff --git a/pom.xml b/pom.xml
index 37d6b08ad..85d2ecd68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,7 +254,7 @@
     <dependency>
       <groupId>com.microsoft.sqlserver</groupId>
       <artifactId>mssql-jdbc</artifactId>
-      <version>6.1.3.jre8-preview</version>
+      <version>6.4.0.jre8</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/src/main/java/io/ebean/ExpressionFactory.java b/src/main/java/io/ebean/ExpressionFactory.java
index a2c44cffb..0c81a32e3 100644
--- a/src/main/java/io/ebean/ExpressionFactory.java
+++ b/src/main/java/io/ebean/ExpressionFactory.java
@@ -327,6 +327,30 @@ public interface ExpressionFactory {
    */
   Expression allEq(Map<String, Object> propertyMap);
 
+  /**
+   * Add expression for ANY of the given bit flags to be set.
+   *
+   * @param propertyName The property that holds the flags value
+   * @param flags        The flags we are looking for
+   */
+  Expression bitwiseAny(String propertyName, long flags);
+
+  /**
+   * Add expression for ALL of the given bit flags to be set.
+   *
+   * @param propertyName The property that holds the flags value
+   * @param flags        The flags we are looking for
+   */
+  Expression bitwiseAll(String propertyName, long flags);
+
+  /**
+   * Add bitwise AND expression of the given bit flags to compare with the match/mask.
+   *
+   * @param propertyName The property that holds the flags value
+   * @param flags        The flags we are looking for
+   */
+  Expression bitwiseAnd(String propertyName, long flags, long match);
+
   /**
    * Add raw expression with a single parameter.
    * <p>
diff --git a/src/main/java/io/ebean/ExpressionList.java b/src/main/java/io/ebean/ExpressionList.java
index 4723ab212..711d23906 100644
--- a/src/main/java/io/ebean/ExpressionList.java
+++ b/src/main/java/io/ebean/ExpressionList.java
@@ -482,7 +482,7 @@ public interface ExpressionList<T> {
 
   /**
    * Extended version for setDistinct in conjunction with "findSingleAttributeList";
-   *
+   * <p>
    * <pre>{@code
    *
    *  List<CountedValue<Order.Status>> orderStatusCount =
@@ -878,7 +878,7 @@ public interface ExpressionList<T> {
 
   /**
    * In - using a subQuery.
-   *
+   * <p>
    * This is exactly the same as in() and provided due to "in" being a Kotlin keyword
    * (and hence to avoid the slightly ugly escaping when using in() in Kotlin)
    */
@@ -888,7 +888,7 @@ public interface ExpressionList<T> {
 
   /**
    * In - property has a value in the array of values.
-   *
+   * <p>
    * This is exactly the same as in() and provided due to "in" being a Kotlin keyword
    * (and hence to avoid the slightly ugly escaping when using in() in Kotlin)
    */
@@ -898,7 +898,7 @@ public interface ExpressionList<T> {
 
   /**
    * In - property has a value in the collection of values.
-   *
+   * <p>
    * This is exactly the same as in() and provided due to "in" being a Kotlin keyword
    * (and hence to avoid the slightly ugly escaping when using in() in Kotlin)
    */
@@ -996,6 +996,53 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> arrayIsNotEmpty(String propertyName);
 
+  /**
+   * Add expression for ANY of the given bit flags to be set.
+   * <pre>{@code
+   *
+   * where().bitwiseAny("flags", BwFlags.HAS_BULK + BwFlags.HAS_COLOUR)
+   *
+   * }</pre>
+   *
+   * @param propertyName The property that holds the flags value
+   * @param flags        The flags we are looking for
+   */
+  ExpressionList<T> bitwiseAny(String propertyName, long flags);
+
+  /**
+   * Add expression for ALL of the given bit flags to be set.
+   * <p>
+   * <pre>{@code
+   *
+   * where().bitwiseAll("flags", BwFlags.HAS_BULK + BwFlags.HAS_COLOUR)
+   *
+   * }</pre>
+   *
+   * @param propertyName The property that holds the flags value
+   * @param flags        The flags we are looking for
+   */
+  ExpressionList<T> bitwiseAll(String propertyName, long flags);
+
+  /**
+   * Add bitwise AND expression of the given bit flags to compare with the match/mask.
+   * <p>
+   * <pre>{@code
+   *
+   * // Flags Bulk + Size = Size
+   * // ... meaning Bulk is not set and Size is set
+   *
+   * long selectedFlags = BwFlags.HAS_BULK + BwFlags.HAS_SIZE;
+   * long mask = BwFlags.HAS_SIZE; // Only Size flag set
+   *
+   * where().bitwiseAnd("flags", selectedFlags, mask)
+   *
+   * }</pre>
+   *
+   * @param propertyName The property that holds the flags value
+   * @param flags        The flags we are looking for
+   */
+  ExpressionList<T> bitwiseAnd(String propertyName, long flags, long match);
+
   /**
    * Add raw expression with a single parameter.
    * <p>
diff --git a/src/main/java/io/ebeaninternal/api/SpiExpressionRequest.java b/src/main/java/io/ebeaninternal/api/SpiExpressionRequest.java
index 49bb47bf9..e61c9479e 100644
--- a/src/main/java/io/ebeaninternal/api/SpiExpressionRequest.java
+++ b/src/main/java/io/ebeaninternal/api/SpiExpressionRequest.java
@@ -1,8 +1,8 @@
 package io.ebeaninternal.api;
 
-import io.ebeaninternal.server.core.DbExpressionHandler;
 import io.ebeaninternal.server.core.SpiOrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
+import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
 
 import java.util.List;
 
diff --git a/src/main/java/io/ebeaninternal/server/core/BaseDbExpression.java b/src/main/java/io/ebeaninternal/server/core/BaseDbExpression.java
deleted file mode 100644
index fe2c97893..000000000
--- a/src/main/java/io/ebeaninternal/server/core/BaseDbExpression.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.ebeaninternal.server.core;
-
-/**
- * Not supported JSON or ARRAY expression handler.
- */
-abstract class BaseDbExpression implements DbExpressionHandler {
-
-  private final String concatOperator;
-
-  BaseDbExpression(String concatOperator) {
-    this.concatOperator = concatOperator;
-  }
-
-  @Override
-  public String getConcatOperator() {
-    return concatOperator;
-  }
-
-}
diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index e9b423ece..ab0587d94 100644
--- a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -42,6 +42,8 @@ import io.ebeaninternal.server.deploy.parse.DeployInherit;
 import io.ebeaninternal.server.deploy.parse.DeployUtil;
 import io.ebeaninternal.server.dto.DtoBeanManager;
 import io.ebeaninternal.server.expression.DefaultExpressionFactory;
+import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
+import io.ebeaninternal.server.expression.platform.DbExpressionHandlerFactory;
 import io.ebeaninternal.server.persist.Binder;
 import io.ebeaninternal.server.persist.DefaultPersister;
 import io.ebeaninternal.server.persist.platform.MultiValueBind;
@@ -267,18 +269,7 @@ public class InternalConfiguration {
    * Return the JSON expression handler for the given database platform.
    */
   private DbExpressionHandler getDbExpressionHandler(DatabasePlatform databasePlatform) {
-    Platform platform = databasePlatform.getPlatform();
-    String concatOperator = databasePlatform.getConcatOperator();
-    switch (platform) {
-      case POSTGRES:
-        return new PostgresDbExpression(concatOperator);
-      case ORACLE:
-        return new OracleDbExpression(concatOperator);
-      case SQLSERVER:
-        return new SqlServerDbExpression(concatOperator);
-      default:
-        return new BasicDbExpression(concatOperator);
-    }
+    return DbExpressionHandlerFactory.from(databasePlatform);
   }
 
   private MultiValueBind createMultiValueBind(Platform platform) {
diff --git a/src/main/java/io/ebeaninternal/server/expression/BitwiseExpression.java b/src/main/java/io/ebeaninternal/server/expression/BitwiseExpression.java
new file mode 100644
index 000000000..073ee51df
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/expression/BitwiseExpression.java
@@ -0,0 +1,63 @@
+package io.ebeaninternal.server.expression;
+
+import io.ebeaninternal.api.SpiExpression;
+import io.ebeaninternal.api.SpiExpressionRequest;
+
+import java.io.IOException;
+
+/**
+ * Bitwise expression.
+ */
+class BitwiseExpression extends AbstractExpression {
+
+  protected final BitwiseOp operator;
+
+  private final String compare;
+
+  protected final long flags;
+
+  private final long match;
+
+  BitwiseExpression(String propertyName, BitwiseOp operator, long flags, String compare, long match) {
+    super(propertyName);
+    this.operator = operator;
+    this.flags = flags;
+    this.compare = compare;
+    this.match = match;
+  }
+
+  @Override
+  public void writeDocQuery(DocQueryContext context) throws IOException {
+    throw new IllegalStateException("Not supported for document queries");
+  }
+
+  @Override
+  public void queryPlanHash(StringBuilder builder) {
+    builder.append("Bitwise[");
+    builder.append(propName).append(" op:").append(operator).append(" cp:").append(compare);
+    builder.append(" ?2]");
+  }
+
+  @Override
+  public int queryBindHash() {
+    return Long.hashCode(flags);
+  }
+
+  @Override
+  public boolean isSameByBind(SpiExpression other) {
+    BitwiseExpression that = (BitwiseExpression) other;
+    return operator == that.operator && compare.equals(that.compare) && flags == that.flags && match == that.match;
+  }
+
+  @Override
+  public void addSql(SpiExpressionRequest request) {
+    // Use DB specific expression handling
+    request.getDbPlatformHandler().bitwise(request, propName, operator, flags, compare, match);
+  }
+
+  @Override
+  public void addBindValues(SpiExpressionRequest request) {
+    request.addBindValue(flags);
+    request.addBindValue(match);
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/expression/BitwiseOp.java b/src/main/java/io/ebeaninternal/server/expression/BitwiseOp.java
new file mode 100644
index 000000000..c7a063f54
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/expression/BitwiseOp.java
@@ -0,0 +1,22 @@
+package io.ebeaninternal.server.expression;
+
+/**
+ * Bitwise expression operator.
+ */
+public enum BitwiseOp {
+
+  /**
+   * All flags are set (derived expression BITAND flags == flags).
+   */
+  ALL,
+
+  /**
+   * Any flags are set (derived expression BITAND flags != 0).
+   */
+  ANY,
+
+  /**
+   * BITAND flags == match.
+   */
+  AND
+}
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
index 4725d41e5..14ab457c8 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
@@ -136,6 +136,21 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
     return new ArrayIsEmptyExpression(propertyName, false);
   }
 
+  @Override
+  public Expression bitwiseAny(String propertyName, long flags) {
+    return new BitwiseExpression(propertyName, BitwiseOp.ANY, flags, "!=", 0L);
+  }
+
+  @Override
+  public Expression bitwiseAll(String propertyName, long flags) {
+    return new BitwiseExpression(propertyName, BitwiseOp.ALL, flags, "=", flags);
+  }
+
+  @Override
+  public Expression bitwiseAnd(String propertyName, long flags, long match) {
+    return new BitwiseExpression(propertyName, BitwiseOp.AND, flags, "=", match);
+  }
+
   /**
    * Equal To - property equal to the given value.
    */
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 29747b439..ef2e8c89c 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -699,6 +699,24 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return this;
   }
 
+  @Override
+  public ExpressionList<T> bitwiseAny(String propertyName, long flags) {
+    add(expr.bitwiseAny(propertyName, flags));
+    return this;
+  }
+
+  @Override
+  public ExpressionList<T> bitwiseAll(String propertyName, long flags) {
+    add(expr.bitwiseAll(propertyName, flags));
+    return this;
+  }
+
+  @Override
+  public ExpressionList<T> bitwiseAnd(String propertyName, long flags, long match) {
+    add(expr.bitwiseAnd(propertyName, flags, match));
+    return this;
+  }
+
   @Override
   public ExpressionList<T> eq(String propertyName, Object value) {
     add(expr.eq(propertyName, value));
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java
index a1cc868f0..557c53996 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java
@@ -2,10 +2,10 @@ package io.ebeaninternal.server.expression;
 
 import io.ebeaninternal.api.SpiExpressionList;
 import io.ebeaninternal.api.SpiExpressionRequest;
-import io.ebeaninternal.server.core.DbExpressionHandler;
 import io.ebeaninternal.server.core.SpiOrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.DeployParser;
+import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
 import io.ebeaninternal.server.persist.Binder;
 import io.ebeaninternal.server.type.DataBind;
 
diff --git a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index 4d4c3a53c..d7d6c0c7a 100644
--- a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -533,6 +533,21 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.arrayIsNotEmpty(propertyName);
   }
 
+  @Override
+  public ExpressionList<T> bitwiseAny(String propertyName, long flags) {
+    return exprList.bitwiseAny(propertyName, flags);
+  }
+
+  @Override
+  public ExpressionList<T> bitwiseAll(String propertyName, long flags) {
+    return exprList.bitwiseAll(propertyName, flags);
+  }
+
+  @Override
+  public ExpressionList<T> bitwiseAnd(String propertyName, long flags, long match) {
+    return exprList.bitwiseAnd(propertyName, flags, match);
+  }
+
   @Override
   public ExpressionList<T> ge(String propertyName, Object value) {
     return exprList.ge(propertyName, value);
diff --git a/src/main/java/io/ebeaninternal/server/expression/platform/BaseDbExpression.java b/src/main/java/io/ebeaninternal/server/expression/platform/BaseDbExpression.java
new file mode 100644
index 000000000..584215d4c
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/expression/platform/BaseDbExpression.java
@@ -0,0 +1,60 @@
+package io.ebeaninternal.server.expression.platform;
+
+import io.ebeaninternal.api.SpiExpressionRequest;
+import io.ebeaninternal.server.expression.BitwiseOp;
+
+/**
+ * Not supported JSON or ARRAY expression handler.
+ */
+abstract class BaseDbExpression implements DbExpressionHandler {
+
+  private final String concatOperator;
+
+  BaseDbExpression(String concatOperator) {
+    this.concatOperator = concatOperator;
+  }
+
+  @Override
+  public String getConcatOperator() {
+    return concatOperator;
+  }
+
+  @Override
+  public void bitwise(SpiExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare, long match) {
+
+    String bitOp = bitOp(operator);
+    request.append("(").append(propName).append(" ").append(bitOp).append(" ? ").append(compare).append(" ?)");
+  }
+
+  private String bitOp(BitwiseOp operator) {
+    switch (operator) {
+      case ANY:
+      case AND:
+      case ALL:
+        return "&";
+      default:
+        throw new IllegalArgumentException("Unknown Bitwise operator " + operator + " not handled?");
+    }
+  }
+
+  /**
+   * Common alternative where the bitwise operation is a function (specifically bitand is used - H2 and Oracle).
+   */
+  protected void bitwiseFunction(SpiExpressionRequest request, String propName, BitwiseOp operator, String compare) {
+
+    String funcName = functionName(operator);
+    request.append(funcName).append("(").append(propName).append(", ?) ").append(compare).append(" ?");
+  }
+
+  protected String functionName(BitwiseOp operator) {
+    switch (operator) {
+      case AND:
+      case ANY:
+      case ALL:
+        return "bitand";
+      default:
+        throw new IllegalArgumentException("Unknown Bitwise operator " + operator + " not handled?");
+    }
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/core/BasicDbExpression.java b/src/main/java/io/ebeaninternal/server/expression/platform/BasicDbExpression.java
similarity index 94%
rename from src/main/java/io/ebeaninternal/server/core/BasicDbExpression.java
rename to src/main/java/io/ebeaninternal/server/expression/platform/BasicDbExpression.java
index ef8ad5b4a..adacca04d 100644
--- a/src/main/java/io/ebeaninternal/server/core/BasicDbExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/platform/BasicDbExpression.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.core;
+package io.ebeaninternal.server.expression.platform;
 
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.expression.Op;
diff --git a/src/main/java/io/ebeaninternal/server/core/DbExpressionHandler.java b/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandler.java
similarity index 73%
rename from src/main/java/io/ebeaninternal/server/core/DbExpressionHandler.java
rename to src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandler.java
index 7ce5a4074..7cf6d696a 100644
--- a/src/main/java/io/ebeaninternal/server/core/DbExpressionHandler.java
+++ b/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandler.java
@@ -1,6 +1,7 @@
-package io.ebeaninternal.server.core;
+package io.ebeaninternal.server.expression.platform;
 
 import io.ebeaninternal.api.SpiExpressionRequest;
+import io.ebeaninternal.server.expression.BitwiseOp;
 import io.ebeaninternal.server.expression.Op;
 
 /**
@@ -28,4 +29,8 @@ public interface DbExpressionHandler {
    */
   void arrayIsEmpty(SpiExpressionRequest request, String propName, boolean empty);
 
+  /**
+   * Add the bitwise expression.
+   */
+  void bitwise(SpiExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare, long match);
 }
diff --git a/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java b/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java
new file mode 100644
index 000000000..b7b62eb71
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java
@@ -0,0 +1,31 @@
+package io.ebeaninternal.server.expression.platform;
+
+import io.ebean.annotation.Platform;
+import io.ebean.config.dbplatform.DatabasePlatform;
+
+
+public class DbExpressionHandlerFactory {
+
+  /**
+   * Create and return the appropriate platform specific handing of expressions.
+   */
+  public static DbExpressionHandler from(DatabasePlatform databasePlatform) {
+
+    Platform platform = databasePlatform.getPlatform();
+    String concatOperator = databasePlatform.getConcatOperator();
+    switch (platform) {
+      case H2:
+        return new H2DbExpression(concatOperator);
+      case POSTGRES:
+        return new PostgresDbExpression(concatOperator);
+      case MYSQL:
+        return new MySqlDbExpression(concatOperator);
+      case ORACLE:
+        return new OracleDbExpression(concatOperator);
+      case SQLSERVER:
+        return new SqlServerDbExpression(concatOperator);
+      default:
+        return new BasicDbExpression(concatOperator);
+    }
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/expression/platform/H2DbExpression.java b/src/main/java/io/ebeaninternal/server/expression/platform/H2DbExpression.java
new file mode 100644
index 000000000..4e0b544f2
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/expression/platform/H2DbExpression.java
@@ -0,0 +1,20 @@
+package io.ebeaninternal.server.expression.platform;
+
+import io.ebeaninternal.api.SpiExpressionRequest;
+import io.ebeaninternal.server.expression.BitwiseOp;
+
+/**
+ * H2 handling of platform specific expressions.
+ */
+class H2DbExpression extends BasicDbExpression {
+
+  H2DbExpression(String concatOperator) {
+    super(concatOperator);
+  }
+
+  @Override
+  public void bitwise(SpiExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare, long match) {
+
+    bitwiseFunction(request, propName, operator, compare);
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/expression/platform/MySqlDbExpression.java b/src/main/java/io/ebeaninternal/server/expression/platform/MySqlDbExpression.java
new file mode 100644
index 000000000..e0e04ad1f
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/expression/platform/MySqlDbExpression.java
@@ -0,0 +1,12 @@
+package io.ebeaninternal.server.expression.platform;
+
+/**
+ * MySql specific handling of platform specific expressions.
+ */
+class MySqlDbExpression extends BasicDbExpression {
+
+  MySqlDbExpression(String concatOperator) {
+    super(concatOperator);
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/core/OracleDbExpression.java b/src/main/java/io/ebeaninternal/server/expression/platform/OracleDbExpression.java
similarity index 75%
rename from src/main/java/io/ebeaninternal/server/core/OracleDbExpression.java
rename to src/main/java/io/ebeaninternal/server/expression/platform/OracleDbExpression.java
index 82480723d..4347d2e80 100644
--- a/src/main/java/io/ebeaninternal/server/core/OracleDbExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/platform/OracleDbExpression.java
@@ -1,10 +1,11 @@
-package io.ebeaninternal.server.core;
+package io.ebeaninternal.server.expression.platform;
 
 import io.ebeaninternal.api.SpiExpressionRequest;
+import io.ebeaninternal.server.expression.BitwiseOp;
 import io.ebeaninternal.server.expression.Op;
 
 /**
- * Oracle JSON expression handler, ARRAY expressions not supported.
+ * Oracle handling of platform specific expressions. ARRAY expressions not supported.
  */
 public class OracleDbExpression extends BaseDbExpression {
 
@@ -25,6 +26,11 @@ public class OracleDbExpression extends BaseDbExpression {
     }
   }
 
+  @Override
+  public void bitwise(SpiExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare, long match) {
+    bitwiseFunction(request, propName, operator, compare);
+  }
+
   @Override
   public void arrayContains(SpiExpressionRequest request, String propName, boolean contains, Object... values) {
     throw new IllegalStateException("ARRAY expressions not supported on Oracle");
diff --git a/src/main/java/io/ebeaninternal/server/core/PostgresCast.java b/src/main/java/io/ebeaninternal/server/expression/platform/PostgresCast.java
similarity index 95%
rename from src/main/java/io/ebeaninternal/server/core/PostgresCast.java
rename to src/main/java/io/ebeaninternal/server/expression/platform/PostgresCast.java
index 47dbb3f74..3e833cb12 100644
--- a/src/main/java/io/ebeaninternal/server/core/PostgresCast.java
+++ b/src/main/java/io/ebeaninternal/server/expression/platform/PostgresCast.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.core;
+package io.ebeaninternal.server.expression.platform;
 
 /**
  * Helper for determining type casting for JSON and ARRAY expressions.
diff --git a/src/main/java/io/ebeaninternal/server/core/PostgresDbExpression.java b/src/main/java/io/ebeaninternal/server/expression/platform/PostgresDbExpression.java
similarity index 97%
rename from src/main/java/io/ebeaninternal/server/core/PostgresDbExpression.java
rename to src/main/java/io/ebeaninternal/server/expression/platform/PostgresDbExpression.java
index a6f42bc68..4af9aa2f7 100644
--- a/src/main/java/io/ebeaninternal/server/core/PostgresDbExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/platform/PostgresDbExpression.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.core;
+package io.ebeaninternal.server.expression.platform;
 
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.expression.Op;
diff --git a/src/main/java/io/ebeaninternal/server/core/SqlServerDbExpression.java b/src/main/java/io/ebeaninternal/server/expression/platform/SqlServerDbExpression.java
similarity index 95%
rename from src/main/java/io/ebeaninternal/server/core/SqlServerDbExpression.java
rename to src/main/java/io/ebeaninternal/server/expression/platform/SqlServerDbExpression.java
index 06a7824a1..dc52066e3 100644
--- a/src/main/java/io/ebeaninternal/server/core/SqlServerDbExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/platform/SqlServerDbExpression.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.core;
+package io.ebeaninternal.server.expression.platform;
 
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.expression.Op;
diff --git a/src/main/java/io/ebeaninternal/server/persist/Binder.java b/src/main/java/io/ebeaninternal/server/persist/Binder.java
index 7a69ee7eb..55833eae5 100644
--- a/src/main/java/io/ebeaninternal/server/persist/Binder.java
+++ b/src/main/java/io/ebeaninternal/server/persist/Binder.java
@@ -2,9 +2,9 @@ package io.ebeaninternal.server.persist;
 
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebeaninternal.api.BindParams;
-import io.ebeaninternal.server.core.DbExpressionHandler;
 import io.ebeaninternal.server.core.Message;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
+import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
 import io.ebeaninternal.server.persist.platform.MultiValueBind;
 import io.ebeaninternal.server.transaction.TransactionManager;
 import io.ebeaninternal.server.type.DataBind;
diff --git a/src/test/java/io/ebeaninternal/server/expression/TDSpiExpressionRequest.java b/src/test/java/io/ebeaninternal/server/expression/TDSpiExpressionRequest.java
index f0179ea0a..5bd44e3de 100644
--- a/src/test/java/io/ebeaninternal/server/expression/TDSpiExpressionRequest.java
+++ b/src/test/java/io/ebeaninternal/server/expression/TDSpiExpressionRequest.java
@@ -1,9 +1,9 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebeaninternal.api.SpiExpressionRequest;
-import io.ebeaninternal.server.core.DbExpressionHandler;
 import io.ebeaninternal.server.core.SpiOrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
+import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/test/java/io/ebeaninternal/server/core/PostgresCastTest.java b/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java
similarity index 84%
rename from src/test/java/io/ebeaninternal/server/core/PostgresCastTest.java
rename to src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java
index f8e43263f..526ca3353 100644
--- a/src/test/java/io/ebeaninternal/server/core/PostgresCastTest.java
+++ b/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.core;
+package io.ebeaninternal.server.expression.platform;
 
 import org.junit.Test;
 
@@ -8,7 +8,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class PostgresCastTest {
 
   @Test
-  public void cast() throws Exception {
+  public void cast() {
 
     assertThat(PostgresCast.cast(1)).isEqualTo("::integer");
     assertThat(PostgresCast.cast(1L)).isEqualTo("::bigint");
@@ -17,7 +17,7 @@ public class PostgresCastTest {
   }
 
   @Test
-  public void cast1() throws Exception {
+  public void cast1() {
 
     assertThat(PostgresCast.cast(1, true)).isEqualTo("::integer[]");
     assertThat(PostgresCast.cast(1L, true)).isEqualTo("::bigint[]");
diff --git a/src/test/java/org/tests/expression/bitwise/BwBean.java b/src/test/java/org/tests/expression/bitwise/BwBean.java
new file mode 100644
index 000000000..5c7fab206
--- /dev/null
+++ b/src/test/java/org/tests/expression/bitwise/BwBean.java
@@ -0,0 +1,70 @@
+package org.tests.expression.bitwise;
+
+import io.ebean.Model;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Version;
+
+@Entity
+public class BwBean extends Model {
+
+  @Id
+  long id;
+
+  String name;
+
+  // sqlserver wants integer type for bitwise AND operator
+  @Column(columnDefinition = "integer")
+  long flags;
+
+  @Version
+  long version;
+
+  public BwBean(String name) {
+    this.name = name;
+  }
+
+  public BwBean(String name, long flags) {
+    this.name = name;
+    this.flags = flags;
+  }
+
+  @Override
+  public String toString() {
+    return "nm:" + name;
+  }
+
+  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 long getFlags() {
+    return flags;
+  }
+
+  public void setFlags(long flags) {
+    this.flags = flags;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/expression/bitwise/BwFlags.java b/src/test/java/org/tests/expression/bitwise/BwFlags.java
new file mode 100644
index 000000000..41944659d
--- /dev/null
+++ b/src/test/java/org/tests/expression/bitwise/BwFlags.java
@@ -0,0 +1,78 @@
+package org.tests.expression.bitwise;
+
+public class BwFlags {
+
+  public static final int NOTHING = 0;
+
+  /**
+   * Indicates the bean is being inserted.
+   */
+  public static final int HAS_COLOUR = 0x00000001;
+
+  /**
+   * Indicates persist cascade.
+   */
+  public static final int HAS_SIZE = 0x00000002;
+
+  /**
+   * Indicates Publish mode.
+   */
+  public static final int HAS_BULK = 0x00000004;
+
+  /**
+   * Return true if part of a Merge or Publish.
+   */
+  public static boolean isColour(long state) {
+    return (state & HAS_COLOUR) != 0;
+  }
+
+  /**
+   * Return true if the given flag is set.
+   */
+  public static boolean isSet(int state, int flag) {
+    return (state & flag) == flag;
+  }
+
+  public static int setHasColour(int state) {
+    return set(state, HAS_COLOUR, true);
+  }
+
+  /**
+   * Parent was not inserted.
+   */
+  public static int unsetHasColour(int state) {
+    return set(state, HAS_COLOUR, false);
+  }
+
+  /**
+   * Set Recurse flag.
+   */
+  public static int setHasSize(int state) {
+    return set(state, HAS_SIZE, true);
+  }
+
+  public static int unsetHasSize(int state) {
+    return set(state, HAS_SIZE, false);
+  }
+
+  /**
+   * Set Publish flag.
+   */
+  public static int setHasBulk(int state) {
+    return set(state, HAS_BULK, true);
+  }
+
+  public static int unsetHasBulk(int state) {
+    return set(state, HAS_BULK, false);
+  }
+
+
+  private static int set(int state, int flag, boolean setFlag) {
+    if (setFlag) {
+      return (state |= flag);
+    } else {
+      return state &= ~flag;
+    }
+  }
+
+}
diff --git a/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java b/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java
new file mode 100644
index 000000000..05be5d1ae
--- /dev/null
+++ b/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java
@@ -0,0 +1,141 @@
+package org.tests.expression.bitwise;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestBitwiseExpressions extends BaseTestCase {
+
+  @Test
+  public void where() {
+
+    setup();
+    bitwiseAnd();
+    bitwiseAny();
+    bitwiseAll();
+  }
+
+  private void bitwiseAnd() {
+
+    List<BwBean> list = Ebean.find(BwBean.class)
+      // not bulk set AND size set
+      .where().bitwiseAnd("flags", BwFlags.HAS_BULK + BwFlags.HAS_SIZE, BwFlags.HAS_SIZE)
+      .findList();
+
+    assertThat(list).hasSize(1);
+    assertThat(list.get(0).getName()).isEqualTo("SizeOnly");
+
+    list = Ebean.find(BwBean.class)
+      // bulk set AND not size set
+      .where().bitwiseAnd("flags", BwFlags.HAS_BULK + BwFlags.HAS_SIZE, BwFlags.HAS_BULK)
+      .findList();
+
+    assertThat(list).hasSize(1);
+    assertThat(list.get(0).getName()).isEqualTo("ColourAndBulk");
+
+    list = Ebean.find(BwBean.class)
+      // bulk set AND not size set
+      .where().bitwiseAnd("flags", BwFlags.HAS_BULK + BwFlags.HAS_COLOUR, BwFlags.HAS_COLOUR)
+      .findList();
+
+    assertThat(list).hasSize(1);
+    assertThat(list.get(0).getName()).isEqualTo("ColourOnly");
+  }
+
+  private void bitwiseAny() {
+
+    List<BwBean> list = Ebean.find(BwBean.class)
+      .where().bitwiseAny("flags", BwFlags.HAS_BULK + BwFlags.HAS_SIZE)
+      .findList();
+
+    assertThat(list).hasSize(3);
+    assertThat(list.get(0).getName()).isEqualTo("SizeOnly");
+    assertThat(list.get(1).getName()).isEqualTo("ColourAndBulk");
+    assertThat(list.get(2).getName()).isEqualTo("Everything");
+
+
+    list = Ebean.find(BwBean.class)
+      .where().bitwiseAny("flags", BwFlags.HAS_BULK + BwFlags.HAS_SIZE + BwFlags.HAS_COLOUR)
+      .findList();
+
+    assertThat(list).hasSize(4);
+
+    list = Ebean.find(BwBean.class)
+      .where().bitwiseAny("flags", BwFlags.HAS_SIZE + BwFlags.HAS_COLOUR)
+      .findList();
+
+    assertThat(list).hasSize(4);
+
+    list = Ebean.find(BwBean.class)
+      .where().bitwiseAny("flags", BwFlags.HAS_SIZE)
+      .findList();
+
+    assertThat(list).hasSize(2);
+    assertThat(list.get(0).getName()).isEqualTo("SizeOnly");
+    assertThat(list.get(1).getName()).isEqualTo("Everything");
+
+    list = Ebean.find(BwBean.class)
+      .where().bitwiseAny("flags", BwFlags.HAS_COLOUR)
+      .findList();
+
+    assertThat(list).hasSize(3);
+    assertThat(list.get(0).getName()).isEqualTo("ColourOnly");
+    assertThat(list.get(1).getName()).isEqualTo("ColourAndBulk");
+    assertThat(list.get(2).getName()).isEqualTo("Everything");
+  }
+
+  private void bitwiseAll() {
+
+    List<BwBean> list = Ebean.find(BwBean.class)
+      .where().bitwiseAll("flags", BwFlags.HAS_BULK + BwFlags.HAS_SIZE)
+      .findList();
+
+    assertThat(list).hasSize(1);
+    assertThat(list.get(0).getName()).isEqualTo("Everything");
+
+    list = Ebean.find(BwBean.class)
+      .where().bitwiseAll("flags", BwFlags.HAS_BULK + BwFlags.HAS_COLOUR)
+      .orderBy().asc("id")
+      .findList();
+
+    assertThat(list).hasSize(2);
+    assertThat(list.get(0).getName()).isEqualTo("ColourAndBulk");
+    assertThat(list.get(1).getName()).isEqualTo("Everything");
+
+    list = Ebean.find(BwBean.class)
+      .where().bitwiseAll("flags", BwFlags.HAS_SIZE)
+      .orderBy().asc("id")
+      .findList();
+
+    assertThat(list).hasSize(2);
+    assertThat(list.get(0).getName()).isEqualTo("SizeOnly");
+    assertThat(list.get(1).getName()).isEqualTo("Everything");
+
+    list = Ebean.find(BwBean.class)
+      .where().bitwiseAll("flags", BwFlags.HAS_COLOUR)
+      .orderBy().asc("id")
+      .findList();
+
+    assertThat(list).hasSize(3);
+    assertThat(list.get(0).getName()).isEqualTo("ColourOnly");
+    assertThat(list.get(1).getName()).isEqualTo("ColourAndBulk");
+    assertThat(list.get(2).getName()).isEqualTo("Everything");
+
+  }
+
+  private void setup() {
+
+    Ebean.find(BwBean.class).delete();
+
+    new BwBean("Nothing", BwFlags.NOTHING).save();
+    new BwBean("ColourOnly", BwFlags.HAS_COLOUR).save();
+    new BwBean("SizeOnly", BwFlags.HAS_SIZE).save();
+    new BwBean("ColourAndBulk", BwFlags.HAS_COLOUR + BwFlags.HAS_BULK).save();
+    new BwBean("Everything", BwFlags.HAS_COLOUR + BwFlags.HAS_BULK + BwFlags.HAS_SIZE).save();
+
+  }
+}
diff --git a/src/test/java/org/tests/repository/CustomerRepository.java b/src/test/java/org/tests/repository/CustomerRepository.java
index 31d18ef96..1dfdb51b1 100644
--- a/src/test/java/org/tests/repository/CustomerRepository.java
+++ b/src/test/java/org/tests/repository/CustomerRepository.java
@@ -4,12 +4,13 @@ import io.ebean.BeanRepository;
 import io.ebean.EbeanServer;
 import org.tests.model.basic.Customer;
 
-import javax.inject.Inject;
 import java.util.List;
 
+//import javax.inject.Inject;
+
 public class CustomerRepository extends BeanRepository<Integer, Customer> {
 
-  @Inject
+  //@Inject
   public CustomerRepository(EbeanServer server) {
     super(Customer.class, server);
   }

From 4799c56e25b3c0870ca63d542c1eea4dc5d94ff6 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 15 Mar 2018 18:19:17 +1300
Subject: [PATCH 0187/1036] #225 - Mapping - Add / review support for @IdClass

---
 .../io/ebean/bean/EntityBeanIntercept.java    |  14 ++
 .../server/deploy/BeanDescriptorManager.java  |   5 +-
 .../server/deploy/BeanProperty.java           |  16 +-
 .../server/deploy/BeanPropertyAssocOne.java   |  32 ++--
 .../server/deploy/BeanPropertyIdClass.java    |  35 +++++
 .../server/deploy/BeanTable.java              |  77 +++++-----
 .../deploy/meta/DeployBeanDescriptor.java     | 111 +++++++-------
 .../deploy/meta/DeployBeanProperty.java       |  24 +++
 .../meta/DeployBeanPropertyAssocOne.java      |  12 +-
 .../deploy/meta/DeployBeanPropertyLists.java  |  74 +++++----
 .../server/deploy/meta/DeployBeanTable.java   |  20 +--
 .../deploy/meta/DeployTableJoinColumn.java    |   6 +-
 .../deploy/parse/AnnotationAssocManys.java    |   8 +-
 .../deploy/parse/AnnotationAssocOnes.java     |   4 +-
 .../server/deploy/parse/AnnotationClass.java  |   6 +
 .../server/deploy/parse/AnnotationFields.java |  19 +--
 .../server/deploy/parse/AnnotationParser.java |  32 ++++
 .../server/deploy/parse/ReadAnnotations.java  |   1 +
 .../server/persist/dml/InsertHandler.java     |   1 -
 .../persist/dmlbind/BindableIdEmbedded.java   |  16 +-
 .../dmlbind/FactoryBaseProperties.java        |   8 +-
 .../persist/dmlbind/FactoryEmbedded.java      |   4 -
 .../server/persist/dmlbind/FactoryId.java     |   4 +-
 .../dmlbind/MatchedImportedEmbedded.java      |  35 +++++
 .../dmlbind/MatchedImportedFactory.java       |  54 +++++++
 .../dmlbind/MatchedImportedProperty.java      |  81 +---------
 .../dmlbind/MatchedImportedScalar.java        |  27 ++++
 .../org/tests/merge/TestMergeCustomer.java    |   2 +-
 .../java/org/tests/model/bridge/BEmbId.java   |  53 +++++++
 .../{BSiteUser.java => BSiteUserA.java}       |  30 +++-
 .../org/tests/model/bridge/BSiteUserD.java    |  61 ++++++++
 .../org/tests/model/bridge/BSiteUserE.java    |  44 ++++++
 .../bridge/TestExplicitM2MBridgeTable.java    |  15 +-
 .../tests/model/bridge/TestIdClassScalar.java | 143 ++++++++++++++++++
 34 files changed, 765 insertions(+), 309 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/BeanPropertyIdClass.java
 create mode 100644 src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedEmbedded.java
 create mode 100644 src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java
 create mode 100644 src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedScalar.java
 create mode 100644 src/test/java/org/tests/model/bridge/BEmbId.java
 rename src/test/java/org/tests/model/bridge/{BSiteUser.java => BSiteUserA.java} (67%)
 create mode 100644 src/test/java/org/tests/model/bridge/BSiteUserD.java
 create mode 100644 src/test/java/org/tests/model/bridge/BSiteUserE.java
 create mode 100644 src/test/java/org/tests/model/bridge/TestIdClassScalar.java

diff --git a/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/src/main/java/io/ebean/bean/EntityBeanIntercept.java
index cde09876f..e35384ad4 100644
--- a/src/main/java/io/ebean/bean/EntityBeanIntercept.java
+++ b/src/main/java/io/ebean/bean/EntityBeanIntercept.java
@@ -133,6 +133,20 @@ public final class EntityBeanIntercept implements Serializable {
     this.nodeUsageCollector = usageCollector;
   }
 
+  /**
+   * Return the ownerId (IdClass).
+   */
+  public Object getOwnerId() {
+    return ownerId;
+  }
+
+  /**
+   * Set the ownerId (IdClass).
+   */
+  public void setOwnerId(Object ownerId) {
+    this.ownerId = ownerId;
+  }
+
   /**
    * Return the owning bean for an embedded bean.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index d1d449120..6bd12fda2 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -1350,7 +1350,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
       // already assigned (So custom or UUID)
       return;
     }
-    if (desc.propertiesId().isEmpty()) {
+    if (desc.idProperty() == null) {
       // bean doesn't have an Id property
       if (desc.isBaseTableType() && desc.getBeanFinder() == null) {
         // expecting an id property
@@ -1491,6 +1491,9 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   private boolean isPersistentField(DeployBeanProperty prop) {
 
     Field field = prop.getField();
+    if (field == null) {
+      return false;
+    }
     int modifiers = field.getModifiers();
     return !(Modifier.isStatic(modifiers) || Modifier.isTransient(modifiers)) && !field.isAnnotationPresent(Transient.class);
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 85f66e177..a7260f269 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -61,10 +61,12 @@ public class BeanProperty implements ElPropertyValue, Property, SqlTreeProperty
   private static final Logger logger = LoggerFactory.getLogger(BeanProperty.class);
 
   /**
-   * Flag to mark this at part of the unique id.
+   * Flag to mark this is the id property.
    */
   final boolean id;
 
+  final boolean importedPrimaryKey;
+
   /**
    * Flag to make this as a dummy property for unidirecitonal relationships.
    */
@@ -274,6 +276,7 @@ public class BeanProperty implements ElPropertyValue, Property, SqlTreeProperty
     this.name = InternString.intern(deploy.getName());
     this.propertyIndex = deploy.getPropertyIndex();
     this.unidirectionalShadow = deploy.isUndirectionalShadow();
+    this.importedPrimaryKey = deploy.isImportedPrimaryKey();
     this.discriminator = deploy.isDiscriminator();
     this.localEncrypted = deploy.isLocalEncrypted();
     this.dbEncrypted = deploy.isDbEncrypted();
@@ -395,6 +398,7 @@ public class BeanProperty implements ElPropertyValue, Property, SqlTreeProperty
     this.softDeleteDbSet = source.softDeleteDbSet;
     this.softDeleteDbPredicate = source.softDeleteDbPredicate;
     this.fetchEager = source.fetchEager;
+    this.importedPrimaryKey = source.importedPrimaryKey;
     this.unidirectionalShadow = source.unidirectionalShadow;
     this.discriminator = source.discriminator;
     this.localEncrypted = source.isLocalEncrypted();
@@ -473,8 +477,7 @@ public class BeanProperty implements ElPropertyValue, Property, SqlTreeProperty
     this.deployOrder = deployOrder;
   }
 
-  public ElPropertyValue buildElPropertyValue(String propName, String remainder, ElPropertyChainBuilder chain,
-                                              boolean propertyDeploy) {
+  public ElPropertyValue buildElPropertyValue(String propName, String remainder, ElPropertyChainBuilder chain, boolean propertyDeploy) {
     return null;
   }
 
@@ -935,6 +938,13 @@ public class BeanProperty implements ElPropertyValue, Property, SqlTreeProperty
     return null;
   }
 
+  /**
+   * If true this bean maps to the primary key.
+   */
+  public boolean isImportedPrimaryKey() {
+    return importedPrimaryKey;
+  }
+
   @Override
   public boolean isAssocMany() {
     // Returns false - override in BeanPropertyAssocMany.
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index 305ea9aa4..2d34242b1 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -40,8 +40,6 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
 
   private final boolean orphanRemoval;
 
-  private final boolean importedPrimaryKey;
-
   private final boolean primaryKeyExport;
 
   private final PropertyForeignKey foreignKey;
@@ -76,7 +74,6 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
 
     foreignKey = deploy.getForeignKey();
     primaryKeyExport = deploy.isPrimaryKeyExport();
-    importedPrimaryKey = deploy.isImportedPrimaryKey();
     oneToOne = deploy.isOneToOne();
     oneToOneExported = deploy.isOneToOneExported();
     orphanRemoval = deploy.isOrphanRemoval();
@@ -346,13 +343,6 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
     return orphanRemoval;
   }
 
-  /**
-   * If true this bean maps to the primary key.
-   */
-  public boolean isImportedPrimaryKey() {
-    return importedPrimaryKey;
-  }
-
   @Override
   public void diff(String prefix, Map<String, ValuePair> map, EntityBean newBean, EntityBean oldBean) {
 
@@ -626,6 +616,14 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
     }
   }
 
+  @Override
+  public void setValueIntercept(EntityBean bean, Object value) {
+    super.setValueIntercept(bean, value);
+    if (embedded && value instanceof EntityBean) {
+      setEmbeddedOwner(bean, value);
+    }
+  }
+
   /**
    * For embedded bean set the owner and all properties to be loaded (recursively).
    */
@@ -638,18 +636,10 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
     }
   }
 
-  private void setEmbeddedOwner(EntityBean bean, Object value) {
+  void setEmbeddedOwner(EntityBean bean, Object value) {
     ((EntityBean) value)._ebean_getIntercept().setEmbeddedOwner(bean, propertyIndex);
   }
 
-  @Override
-  public void setValueIntercept(EntityBean bean, Object value) {
-    super.setValueIntercept(bean, value);
-    if (embedded && value instanceof EntityBean) {
-      setEmbeddedOwner(bean, value);
-    }
-  }
-
   @Override
   public void loadIgnore(DbReadContext ctx) {
     localHelp.loadIgnore(ctx);
@@ -708,10 +698,10 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
       if (embedded) {
         writeJson.writeFieldName(name);
         BeanDescriptor<?> refDesc = descriptor.getBeanDescriptor(value.getClass());
-        refDesc.jsonWriteForInsert(writeJson, (EntityBean)value);
+        refDesc.jsonWriteForInsert(writeJson, (EntityBean) value);
 
       } else {
-        jsonWriteTargetId(writeJson, (EntityBean)value);
+        jsonWriteTargetId(writeJson, (EntityBean) value);
       }
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyIdClass.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyIdClass.java
new file mode 100644
index 000000000..bd8486b39
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyIdClass.java
@@ -0,0 +1,35 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
+
+/**
+ * Bean property for an IdClass embeddedId.
+ */
+public class BeanPropertyIdClass extends BeanPropertyAssocOne {
+
+  public BeanPropertyIdClass(BeanDescriptorMap owner, BeanDescriptor descriptor, DeployBeanPropertyAssocOne deploy) {
+    super(owner, descriptor, deploy);
+  }
+
+  @Override
+  public void setValue(EntityBean bean, Object value) {
+    bean._ebean_getIntercept().setOwnerId(value);
+  }
+
+  @Override
+  public void setValueIntercept(EntityBean bean, Object value) {
+    bean._ebean_getIntercept().setOwnerId(value);
+  }
+
+  @Override
+  public Object getValue(EntityBean bean) {
+    return bean._ebean_getIntercept().getOwnerId();
+  }
+
+  @Override
+  public Object getValueIntercept(EntityBean bean) {
+    return bean._ebean_getIntercept().getOwnerId();
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java b/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java
index d9e3e1413..c481660e8 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java
@@ -30,7 +30,7 @@ public class BeanTable {
    */
   private final String baseTable;
 
-  private final BeanProperty[] idProperties;
+  private final BeanProperty idProperty;
 
   /**
    * Create the BeanTable.
@@ -39,7 +39,7 @@ public class BeanTable {
     this.owner = owner;
     this.beanType = mutable.getBeanType();
     this.baseTable = InternString.intern(mutable.getBaseTable());
-    this.idProperties = mutable.createIdProperties(owner);
+    this.idProperty = mutable.createIdProperty(owner);
   }
 
   @Override
@@ -69,8 +69,8 @@ public class BeanTable {
   /**
    * Return the Id properties.
    */
-  public BeanProperty[] getIdProperties() {
-    return idProperties;
+  public BeanProperty getIdProperty() {
+    return idProperty;
   }
 
   /**
@@ -82,52 +82,51 @@ public class BeanTable {
 
   public void createJoinColumn(String foreignKeyPrefix, DeployTableJoin join, boolean reverse, String sqlFormulaSelect) {
 
-    boolean complexKey = false;
-    BeanProperty[] props = idProperties;
-
-    if (idProperties.length == 1) {
-      if (idProperties[0] instanceof BeanPropertyAssocOne<?>) {
-        BeanPropertyAssocOne<?> assocOne = (BeanPropertyAssocOne<?>) idProperties[0];
-        props = assocOne.getProperties();
-        complexKey = true;
-      }
+    if (idProperty == null) {
+      return;
     }
 
-    for (BeanProperty prop : props) {
+    if (idProperty instanceof BeanPropertyAssocOne<?>) {
+      BeanPropertyAssocOne<?> assocOne = (BeanPropertyAssocOne<?>) idProperty;
+      BeanProperty[] props = assocOne.getProperties();
+      for (BeanProperty prop : props) {
+        addToJoin(foreignKeyPrefix, join, reverse, sqlFormulaSelect, true, prop);
+      }
+    } else {
+      addToJoin(foreignKeyPrefix, join, reverse, sqlFormulaSelect, false, idProperty);
+    }
+  }
 
-      String lc = prop.getDbColumn();
-      String fk = lc;
-      if (foreignKeyPrefix != null) {
-        fk = owner.getNamingConvention().getForeignKey(foreignKeyPrefix, fk);
-      }
+  private void addToJoin(String foreignKeyPrefix, DeployTableJoin join, boolean reverse, String sqlFormulaSelect, boolean complexKey, BeanProperty prop) {
 
-      if (complexKey) {
-        // just to copy the column name rather than prefix with the foreignKeyPrefix.
-        // I think that with complex keys this is the more common approach.
-        logger.debug("On table[{}] foreign key column [{}]", baseTable, lc);
-        fk = lc;
-      }
-      if (sqlFormulaSelect != null) {
-        fk = sqlFormulaSelect;
-      }
-
-      DeployTableJoinColumn joinCol = new DeployTableJoinColumn(lc, fk);
-      joinCol.setForeignSqlFormula(sqlFormulaSelect);
-      if (reverse) {
-        joinCol = joinCol.reverse();
-      }
-      join.addJoinColumn(joinCol);
+    String lc = prop.getDbColumn();
+    String fk = lc;
+    if (foreignKeyPrefix != null) {
+      fk = owner.getNamingConvention().getForeignKey(foreignKeyPrefix, fk);
     }
 
+    if (complexKey) {
+      // just to copy the column name rather than prefix with the foreignKeyPrefix.
+      // I think that with complex keys this is the more common approach.
+      logger.debug("On table[{}] foreign key column [{}]", baseTable, lc);
+      fk = lc;
+    }
+    if (sqlFormulaSelect != null) {
+      fk = sqlFormulaSelect;
+    }
+
+    DeployTableJoinColumn joinCol = new DeployTableJoinColumn(lc, fk);
+    joinCol.setForeignSqlFormula(sqlFormulaSelect);
+    if (reverse) {
+      joinCol = joinCol.reverse();
+    }
+    join.addJoinColumn(joinCol);
   }
 
   /**
    * Return the primary key DB column.
    */
   public String getIdColumn() {
-    if (idProperties.length != 1) {
-      throw new IllegalStateException("Expecting only one Id column to join to on "+beanType);
-    }
-    return idProperties[0].dbColumn;
+    return idProperty.dbColumn;
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index 1df0d8ffd..1855dee14 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -15,7 +15,6 @@ import io.ebean.event.BeanPostLoad;
 import io.ebean.event.BeanQueryAdapter;
 import io.ebean.event.changelog.ChangeLogFilter;
 import io.ebean.text.PathProperties;
-import io.ebean.util.CamelCaseHelper;
 import io.ebeaninternal.api.ConcurrencyMode;
 import io.ebeaninternal.server.core.CacheOptions;
 import io.ebeaninternal.server.deploy.BeanDescriptor.EntityType;
@@ -91,6 +90,10 @@ public class DeployBeanDescriptor<T> {
    */
   private IdType idType;
 
+  private Class<?> idClass;
+
+  private DeployBeanPropertyAssocOne<?> idClassProperty;
+
   /**
    * Set to true if the identity is default for the platform.
    */
@@ -205,7 +208,7 @@ public class DeployBeanDescriptor<T> {
   private DocStoreMode docStoreUpdate;
   private DocStoreMode docStoreDelete;
 
-  private List<DeployBeanProperty> idProperties;
+  private DeployBeanProperty idProperty;
   private TableJoin primaryKeyJoin;
 
   private short profileId;
@@ -219,6 +222,20 @@ public class DeployBeanDescriptor<T> {
     this.beanType = beanType;
   }
 
+  /**
+   * Set the IdClass to use.
+   */
+  public void setIdClass(Class idClass) {
+    this.idClass = idClass;
+  }
+
+  /**
+   * Return true if there is a IdClass set.
+   */
+  public boolean isIdClass() {
+    return idClass != null;
+  }
+
   /**
    * PK is also a FK.
    */
@@ -335,7 +352,7 @@ public class DeployBeanDescriptor<T> {
 
     DeployBeanTable beanTable = new DeployBeanTable(getBeanType());
     beanTable.setBaseTable(baseTable);
-    beanTable.setIdProperties(propertiesId());
+    beanTable.setIdProperty(idProperty());
 
     return beanTable;
   }
@@ -443,6 +460,10 @@ public class DeployBeanDescriptor<T> {
     return cacheOptions;
   }
 
+  public DeployBeanPropertyAssocOne<?> getIdClassProperty() {
+    return idClassProperty;
+  }
+
   public DeployBeanPropertyAssocOne<?> getUnidirectional() {
     return unidirectional;
   }
@@ -684,6 +705,15 @@ public class DeployBeanDescriptor<T> {
     }
   }
 
+  public void postAnnotations() {
+    if (idClass != null) {
+      idClassProperty = new DeployBeanPropertyAssocOne<>(this, idClass);
+      idClassProperty.setName("_idClass");
+      idClassProperty.setEmbedded();
+      idClassProperty.setNullable(false);
+    }
+  }
+
   /**
    * Add a bean property.
    */
@@ -691,32 +721,8 @@ public class DeployBeanDescriptor<T> {
     return propMap.put(prop.getName(), prop);
   }
 
-  /**
-   * Find the matching property for a given property name or dbColumn.
-   * <p>
-   * This is primarily to find imported primary key columns (ManyToOne that also match the PK).
-   * </p>
-   */
-  DeployBeanProperty findMatch(String propertyName, String dbColumn) {
-
-    DeployBeanProperty prop = propMap.get(propertyName);
-    if (prop != null) {
-      return prop;
-    }
-    if (dbColumn != null) {
-      String asCamel = CamelCaseHelper.toCamelFromUnderscore(dbColumn);
-      prop = propMap.get(asCamel);
-      if (prop != null) {
-        return prop;
-      }
-      // scan looking for dbColumn match
-      for (DeployBeanProperty property : propMap.values()) {
-        if (dbColumn.equals(property.getDbColumn())) {
-          return property;
-        }
-      }
-    }
-    return null;
+  public Collection<DeployBeanProperty> properties() {
+    return propMap.values();
   }
 
   /**
@@ -935,16 +941,14 @@ public class DeployBeanDescriptor<T> {
    */
   public boolean isPrimaryKeyCompoundOrNonNumeric() {
 
-    List<DeployBeanProperty> ids = propertiesId();
-    if (ids.size() != 1) {
-      // compound key
-      return true;
+    DeployBeanProperty id = idProperty();
+    if (id == null) {
+      return false;
     }
-    DeployBeanProperty p = ids.get(0);
-    if (p instanceof DeployBeanPropertyAssocOne<?>) {
-      return ((DeployBeanPropertyAssocOne<?>) p).isCompound();
+    if (id instanceof DeployBeanPropertyAssocOne<?>) {
+      return ((DeployBeanPropertyAssocOne<?>) id).isCompound();
     } else {
-      return !p.isDbNumberType();
+      return !id.isDbNumberType();
     }
   }
 
@@ -953,37 +957,32 @@ public class DeployBeanDescriptor<T> {
    * compound). This is for the purpose of defining a sequence name.
    */
   public String getSinglePrimaryKeyColumn() {
-    List<DeployBeanProperty> ids = propertiesId();
-    if (ids.size() == 1) {
-      DeployBeanProperty p = ids.get(0);
-      if (p instanceof DeployBeanPropertyAssoc<?>) {
+    DeployBeanProperty id = idProperty();
+    if (id != null) {
+      if (id instanceof DeployBeanPropertyAssoc<?>) {
         // its a compound primary key
         return null;
       } else {
-        return p.getDbColumn();
+        return id.getDbColumn();
       }
     }
     return null;
   }
 
   /**
-   * Return the BeanProperty that make up the unique id.
-   * <p>
-   * The order of these properties can be relied on to be consistent if the bean
-   * itself doesn't change or the xml deployment order does not change.
-   * </p>
+   * Return the BeanProperty that is the Id.
    */
-  public List<DeployBeanProperty> propertiesId() {
-
-    if (idProperties == null) {
-      idProperties = new ArrayList<>(2);
-      for (DeployBeanProperty prop : propMap.values()) {
-        if (prop.isId()) {
-          idProperties.add(prop);
-        }
+  public DeployBeanProperty idProperty() {
+    if (idProperty != null) {
+      return idProperty;
+    }
+    for (DeployBeanProperty prop : propMap.values()) {
+      if (prop.isId()) {
+        idProperty = prop;
+        return idProperty;
       }
     }
-    return idProperties;
+    return null;
   }
 
   public DeployBeanPropertyAssocOne<?> findJoinToTable(String tableName) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
index a363fdbdd..ce091b2ec 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
@@ -51,6 +51,7 @@ public class DeployBeanProperty {
   private static final int AUDITCOLUMN_ORDER = -1000000;
   private static final int VERSIONCOLUMN_ORDER = -1000000;
   private static final Set<Class<?>> PRIMITIVE_NUMBER_TYPES = new HashSet<>();
+
   static {
     PRIMITIVE_NUMBER_TYPES.add(float.class);
     PRIMITIVE_NUMBER_TYPES.add(double.class);
@@ -64,6 +65,8 @@ public class DeployBeanProperty {
    */
   private boolean id;
 
+  boolean importedPrimaryKey;
+
   /**
    * Flag to mark the property as embedded. This could be on
    * BeanPropertyAssocOne rather than here. Put it here for checking Id type
@@ -611,6 +614,16 @@ public class DeployBeanProperty {
     this.dbUpdateable = false;
   }
 
+  public void setImportedPrimaryKey() {
+    this.importedPrimaryKey = true;
+  }
+
+  /**
+   * Set to true if this is part of the primary key.
+   */
+  public void setImportedPrimaryKeyColumn(DeployBeanProperty primaryKey) {
+    this.importedPrimaryKey = true;
+  }
 
   public boolean isAggregation() {
     return aggregation != null;
@@ -889,6 +902,13 @@ public class DeployBeanProperty {
     return genericType;
   }
 
+  /**
+   * Return true if this is part of the primary key.
+   */
+  public boolean isImportedPrimaryKey() {
+    return importedPrimaryKey;
+  }
+
   /**
    * Return true if this is included in the unique id.
    */
@@ -1046,6 +1066,10 @@ public class DeployBeanProperty {
     return tenantId;
   }
 
+  public boolean isIdClass() {
+    return desc.isIdClass();
+  }
+
   public void addDbMigrationInfo(DbMigrationInfo info) {
     if (dbMigrationInfos == null) {
       dbMigrationInfos = new ArrayList<>();
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
index 021f5e2f8..ed26cc045 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
@@ -17,8 +17,6 @@ public class DeployBeanPropertyAssocOne<T> extends DeployBeanPropertyAssoc<T> {
 
   private boolean primaryKeyExport;
 
-  private boolean importedPrimaryKey;
-
   private DeployBeanEmbedded deployEmbedded;
 
   private String columnPrefix;
@@ -92,17 +90,11 @@ public class DeployBeanPropertyAssocOne<T> extends DeployBeanPropertyAssoc<T> {
     this.oneToOneExported = true;
   }
 
-  /**
-   * Return true if this is part of the primary key.
-   */
-  public boolean isImportedPrimaryKey() {
-    return importedPrimaryKey;
-  }
-
   /**
    * Set to true if this is part of the primary key.
    */
-  void setImportedPrimaryKey(DeployBeanProperty primaryKey) {
+  @Override
+  public void setImportedPrimaryKeyColumn(DeployBeanProperty primaryKey) {
     this.importedPrimaryKey = true;
     String dbColumn = primaryKey.getDbColumn();
     if (dbColumn != null) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
index 8c849e76b..241c56484 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
@@ -5,6 +5,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptorMap;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
+import io.ebeaninternal.server.deploy.BeanPropertyIdClass;
 import io.ebeaninternal.server.deploy.BeanPropertyOrderColumn;
 import io.ebeaninternal.server.deploy.BeanPropertySimpleCollection;
 import io.ebeaninternal.server.deploy.InheritInfo;
@@ -39,7 +40,7 @@ public class DeployBeanPropertyLists {
 
   private final LinkedHashMap<String, BeanProperty> propertyMap;
 
-  private final List<BeanProperty> ids = new ArrayList<>();
+  private BeanProperty id;
 
   private final List<BeanProperty> local = new ArrayList<>();
 
@@ -70,7 +71,13 @@ public class DeployBeanPropertyLists {
   public DeployBeanPropertyLists(BeanDescriptorMap owner, BeanDescriptor<?> desc, DeployBeanDescriptor<?> deploy) {
     this.desc = desc;
 
-    setImportedPrimaryKeys(deploy);
+    DeployBeanPropertyAssocOne<?> deployId = deploy.getIdClassProperty();
+    if (deployId != null) {
+      this.id = new BeanPropertyIdClass(owner, desc, deployId);
+      setImportedPrimaryKeysFor(deploy, deployId);
+    } else {
+      setImportedPrimaryKeys(deploy);
+    }
 
     DeployBeanProperty deployOrderColumn = deploy.getOrderColumn();
     this.orderColumn = deployOrderColumn != null ? new BeanPropertyOrderColumn(desc, deployOrderColumn) : null;
@@ -142,23 +149,43 @@ public class DeployBeanPropertyLists {
    * </p>
    */
   private void setImportedPrimaryKeys(DeployBeanDescriptor<?> deploy) {
+    DeployBeanProperty id = deploy.idProperty();
+    if (id instanceof DeployBeanPropertyAssocOne<?>) {
+      setImportedPrimaryKeysFor(deploy, (DeployBeanPropertyAssocOne<?>) id);
+    }
+  }
 
-    List<DeployBeanProperty> ids = deploy.propertiesId();
-    if (ids.size() == 1) {
-      DeployBeanProperty id = ids.get(0);
-      if (id instanceof DeployBeanPropertyAssocOne<?>) {
-        // only interested if the primary key is a compound key
-        DeployBeanDescriptor<?> targetDeploy = ((DeployBeanPropertyAssocOne<?>) id).getTargetDeploy();
-        for (DeployBeanPropertyAssocOne<?> assoc : deploy.propertiesAssocOne()) {
-          DeployBeanProperty pkMatch = targetDeploy.findMatch(assoc.getName(), assoc.getDbColumn());
-          if (pkMatch != null) {
-            assoc.setImportedPrimaryKey(pkMatch);
-          }
-        }
+  private void setImportedPrimaryKeysFor(DeployBeanDescriptor<?> deploy, DeployBeanPropertyAssocOne<?> id) {
+
+    for (DeployBeanProperty prop : id.getTargetDeploy().properties()) {
+      DeployBeanProperty match = findImported(deploy, prop);
+      if (match != null) {
+        match.setImportedPrimaryKeyColumn(prop);
       }
     }
   }
 
+  private DeployBeanProperty findImported(DeployBeanDescriptor<?> deploy, DeployBeanProperty embeddedScalar) {
+
+    // the logical name and db column we are looking for a match on
+    String name = embeddedScalar.getName();
+    String dbColumn = embeddedScalar.getDbColumn();
+
+    DeployBeanProperty match = deploy.getBeanProperty(name);
+    if (match != null) {
+      return match;
+    }
+    // could look to match more by dbColumn
+
+    for (DeployBeanPropertyAssocOne<?> assocOne : deploy.propertiesAssocOne()) {
+      if (name.equals(assocOne.getName()) || (dbColumn != null && dbColumn.equals(assocOne.getDbColumn()))) {
+        return assocOne;
+      }
+    }
+
+    return null;
+  }
+
   /**
    * Return the unidirectional.
    */
@@ -188,12 +215,13 @@ public class DeployBeanPropertyLists {
       return;
     }
     if (prop.isId()) {
-      ids.add(prop);
+      if (id != null) {
+        throw new IllegalStateException("More that one @Id property on " + desc.getFullName() + " ?");
+      }
+      id = prop;
       return;
-    } else {
-      nonTransients.add(prop);
     }
-
+    nonTransients.add(prop);
     if (prop.isMutableScalarType()) {
       mutable.add(prop);
     }
@@ -255,15 +283,7 @@ public class DeployBeanPropertyLists {
   }
 
   public BeanProperty getId() {
-    if (ids.size() > 1) {
-      String msg = "Issue with bean " + desc + ". Ebean does not support multiple @Id properties. You need to convert to using an @EmbeddedId."
-        + " Please email the ebean google group if you need further clarification.";
-      throw new IllegalStateException(msg);
-    }
-    if (ids.isEmpty()) {
-      return null;
-    }
-    return ids.get(0);
+    return id;
   }
 
   public BeanProperty[] getNonTransients() {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanTable.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanTable.java
index d37b4a6e8..0693210dc 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanTable.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanTable.java
@@ -4,9 +4,6 @@ import io.ebeaninternal.server.deploy.BeanDescriptorMap;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 
-import java.util.List;
-
-
 /**
  * Used for associated beans in place of a BeanDescriptor. This is done to avoid
  * recursion issues due to the potentially bi-directional and circular
@@ -25,12 +22,12 @@ public class DeployBeanTable {
    */
   private String baseTable;
 
-  private List<DeployBeanProperty> idProperties;
+  private DeployBeanProperty idProperty;
 
   /**
    * Create the BeanTable.
    */
-  public DeployBeanTable(Class<?> beanType) {
+  DeployBeanTable(Class<?> beanType) {
     this.beanType = beanType;
   }
 
@@ -53,12 +50,8 @@ public class DeployBeanTable {
   /**
    * Return the id properties.
    */
-  public BeanProperty[] createIdProperties(BeanDescriptorMap owner) {
-    BeanProperty[] props = new BeanProperty[idProperties.size()];
-    for (int i = 0; i < idProperties.size(); i++) {
-      props[i] = createProperty(owner, idProperties.get(i));
-    }
-    return props;
+  public BeanProperty createIdProperty(BeanDescriptorMap owner) {
+    return idProperty == null ? null : createProperty(owner, idProperty);
   }
 
   @SuppressWarnings({"unchecked", "rawtypes"})
@@ -70,14 +63,13 @@ public class DeployBeanTable {
     } else {
       return new BeanProperty(prop);
     }
-
   }
 
   /**
    * Set the Id properties.
    */
-  public void setIdProperties(List<DeployBeanProperty> idProperties) {
-    this.idProperties = idProperties;
+  public void setIdProperty(DeployBeanProperty idProperty) {
+    this.idProperty = idProperty;
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java
index 2df36a716..c45de396f 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java
@@ -92,9 +92,9 @@ public class DeployTableJoinColumn {
 
   private void setReferencedColumn(BeanTable beanTable) {
     if (localDbColumn == null) {
-      BeanProperty[] idProperties = beanTable.getIdProperties();
-      if (idProperties.length == 1) {
-        localDbColumn = idProperties[0].getDbColumn();
+      BeanProperty idProperty = beanTable.getIdProperty();
+      if (idProperty != null) {
+        localDbColumn = idProperty.getDbColumn();
       }
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index df4edb1d6..dce5962c1 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -247,8 +247,8 @@ class AnnotationAssocManys extends AnnotationParser {
     }
     if (!intJoin.hasJoinColumns()) {
       // define foreign key columns
-      BeanProperty[] localIds = localTable.getIdProperties();
-      for (BeanProperty localId : localIds) {
+      BeanProperty localId = localTable.getIdProperty();
+      if (localId != null) {
         // add the source to intersection join columns
         String fkCol = localTableName + "_" + localId.getDbColumn();
         intJoin.addJoinColumn(new DeployTableJoinColumn(localId.getDbColumn(), namingConvention.getColumnFromProperty(null, fkCol)));
@@ -257,8 +257,8 @@ class AnnotationAssocManys extends AnnotationParser {
 
     if (!destJoin.hasJoinColumns()) {
       // define inverse foreign key columns
-      BeanProperty[] otherIds = otherTable.getIdProperties();
-      for (BeanProperty otherId : otherIds) {
+      BeanProperty otherId = otherTable.getIdProperty();
+      if (otherId != null) {
         // set the intersection to dest table join columns
         final String fkCol = otherTableName + "_" + otherId.getDbColumn();
         destJoin.addJoinColumn(new DeployTableJoinColumn(namingConvention.getColumnFromProperty(null, fkCol), otherId.getDbColumn()));
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index 7c614dee6..cd53cd350 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -92,9 +92,7 @@ public class AnnotationAssocOnes extends AnnotationParser {
     // May as well check for Id. Makes sense to me.
     Id id = get(prop, Id.class);
     if (id != null) {
-      prop.setEmbedded();
-      prop.setId();
-      prop.setNullable(false);
+      readIdAssocOne(prop);
     }
 
     DbForeignKey dbForeignKey = get(prop, DbForeignKey.class);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
index aa4902a9b..c5cb0b810 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
@@ -23,6 +23,7 @@ import javax.persistence.AttributeOverride;
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
 import javax.persistence.Entity;
+import javax.persistence.IdClass;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
@@ -127,6 +128,11 @@ public class AnnotationClass extends AnnotationParser {
       }
     }
 
+    IdClass idClass = AnnotationUtil.findAnnotationRecursive(cls, IdClass.class);
+    if (idClass != null) {
+      descriptor.setIdClass(idClass.value());
+    }
+
     Embeddable embeddable = AnnotationUtil.findAnnotationRecursive(cls, Embeddable.class);
     if (embeddable != null) {
       descriptor.setEntityType(EntityType.EMBEDDED);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
index eecdaeda0..a84af1f0c 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
@@ -91,7 +91,7 @@ public class AnnotationFields extends AnnotationParser {
    */
   private FetchType defaultLobFetchType = FetchType.LAZY;
 
-  public AnnotationFields(GeneratedPropertyFactory generatedPropFactory, DeployBeanInfo<?> info,
+  AnnotationFields(GeneratedPropertyFactory generatedPropFactory, DeployBeanInfo<?> info,
                           boolean javaxValidationAnnotations, boolean jacksonAnnotationsPresent, boolean eagerFetchLobs) {
 
     super(info, javaxValidationAnnotations);
@@ -127,8 +127,7 @@ public class AnnotationFields extends AnnotationParser {
 
     Id id = get(prop, Id.class);
     if (id != null) {
-      prop.setId();
-      prop.setNullable(false);
+      readIdAssocOne(prop);
     }
 
     EmbeddedId embeddedId = get(prop, EmbeddedId.class);
@@ -211,7 +210,7 @@ public class AnnotationFields extends AnnotationParser {
 
     Id id = get(prop, Id.class);
     if (id != null) {
-      readId(prop);
+      readIdScalar(prop);
     }
 
     // determine the JDBC type using Lob/Temporal
@@ -517,18 +516,6 @@ public class AnnotationFields extends AnnotationParser {
     return util.createDataEncryptSupport(table, column);
   }
 
-  private void readId(DeployBeanProperty prop) {
-
-    prop.setId();
-    prop.setNullable(false);
-
-    if (prop.getPropertyType().equals(UUID.class)) {
-      if (descriptor.getIdGeneratorName() == null) {
-        descriptor.setUuidGenerator();
-      }
-    }
-  }
-
   private void readGenValue(GeneratedValue gen, DeployBeanProperty prop) {
 
     String genName = gen.generator();
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
index 838f9308d..034caa595 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.deploy.parse;
 import io.ebeaninternal.server.deploy.BeanCascadeInfo;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
+import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
 
 import javax.persistence.AttributeOverride;
@@ -11,6 +12,7 @@ import javax.persistence.Column;
 import javax.validation.groups.Default;
 import java.util.HashMap;
 import java.util.Set;
+import java.util.UUID;
 
 /**
  * Base class for reading deployment annotations.
@@ -39,6 +41,36 @@ public abstract class AnnotationParser extends AnnotationBase {
   @Override
   public abstract void parse();
 
+  /**
+   * Read the Id annotation on an embeddedId.
+   */
+  protected void readIdAssocOne(DeployBeanPropertyAssoc<?> prop) {
+    prop.setNullable(false);
+    if (prop.isIdClass()) {
+      prop.setImportedPrimaryKey();
+    } else {
+      prop.setId();
+      prop.setEmbedded();
+    }
+  }
+
+  /**
+   * Read the Id annotation on scalar property.
+   */
+  protected void readIdScalar(DeployBeanProperty prop) {
+    prop.setNullable(false);
+    if (prop.isIdClass()) {
+      prop.setImportedPrimaryKey();
+    } else {
+      prop.setId();
+      if (prop.getPropertyType().equals(UUID.class)) {
+        if (descriptor.getIdGeneratorName() == null) {
+          descriptor.setUuidGenerator();
+        }
+      }
+    }
+  }
+
   /**
    * Helper method to set cascade types to the CascadeInfo on BeanProperty.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java b/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java
index 41f065a9a..6af425828 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java
@@ -83,6 +83,7 @@ public class ReadAnnotations {
       new AnnotationSql(info, javaxValidationAnnotations).parse();
 
       new AnnotationClass(info).parseAttributeOverride();
+      info.getDescriptor().postAnnotations();
 
     } catch (RuntimeException e) {
       throw new RuntimeException("Error reading annotations for " + info, e);
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
index ec8cdd7df..7887c4b5a 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
@@ -69,7 +69,6 @@ public class InsertHandler extends DmlHandler {
         // expecting a concatenated key that can
         // be built from supplied AssocOne beans
         withId = meta.deriveConcatenatedId(persistRequest);
-
       } else if (meta.supportsGetGeneratedKeys()) {
         // Identity with getGeneratedKeys
         useGeneratedKeys = true;
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java
index c415eb943..1f094b0c5 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java
@@ -2,7 +2,6 @@ package io.ebeaninternal.server.persist.dmlbind;
 
 import io.ebean.bean.EntityBean;
 import io.ebeaninternal.server.core.PersistRequestBean;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 import io.ebeaninternal.server.persist.dml.GenerateDmlRequest;
@@ -15,7 +14,7 @@ import java.util.List;
 /**
  * Bindable for a EmbeddedId.
  */
-public final class BindableIdEmbedded implements BindableId {
+final class BindableIdEmbedded implements BindableId {
 
   private final BeanPropertyAssocOne<?> embId;
 
@@ -23,10 +22,10 @@ public final class BindableIdEmbedded implements BindableId {
 
   private final MatchedImportedProperty[] matches;
 
-  public BindableIdEmbedded(BeanPropertyAssocOne<?> embId, BeanDescriptor<?> desc) {
+  BindableIdEmbedded(BeanPropertyAssocOne<?> embId, MatchedImportedProperty[] matches) {
     this.embId = embId;
     this.props = embId.getProperties();
-    matches = MatchedImportedProperty.build(props, desc);
+    this.matches = matches;
   }
 
   @Override
@@ -67,13 +66,10 @@ public final class BindableIdEmbedded implements BindableId {
   public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException {
 
     EntityBean idValue = (EntityBean) embId.getValue(bean);
-
     for (BeanProperty prop : props) {
-
       Object value = prop.getValue(idValue);
       request.bind(value, prop);
     }
-
     request.setIdValue(idValue);
   }
 
@@ -88,7 +84,7 @@ public final class BindableIdEmbedded implements BindableId {
   public boolean deriveConcatenatedId(PersistRequestBean<?> persist) {
 
     if (matches == null) {
-      String m = "Matches for the concatenated key columns where not found?"
+      String m = "No matches for " + embId.getFullBeanName() + " the concatenated key columns where not found?"
         + " I expect that the concatenated key was null, and this bean does"
         + " not have ManyToOne assoc beans matching the primary key columns?";
       throw new PersistenceException(m);
@@ -100,8 +96,8 @@ public final class BindableIdEmbedded implements BindableId {
     EntityBean newId = (EntityBean) embId.createEmbeddedId();
 
     // populate it from the assoc one id values...
-    for (MatchedImportedProperty matche : matches) {
-      matche.populate(bean, newId);
+    for (MatchedImportedProperty match : matches) {
+      match.populate(bean, newId);
     }
 
     // support PropertyChangeSupport
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java
index 48ac8ad1f..36c0998b8 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java
@@ -27,9 +27,11 @@ public class FactoryBaseProperties {
   public void create(List<Bindable> list, BeanDescriptor<?> desc, DmlMode mode, boolean withLobs) {
 
     for (BeanProperty prop : desc.propertiesBaseScalar()) {
-      Bindable item = factoryProperty.create(prop, mode, withLobs);
-      if (item != null) {
-        list.add(item);
+      if (!prop.isImportedPrimaryKey()) {
+        Bindable item = factoryProperty.create(prop, mode, withLobs);
+        if (item != null) {
+          list.add(item);
+        }
       }
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java
index b568d72d5..585bf1292 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java
@@ -27,18 +27,14 @@ public class FactoryEmbedded {
     BeanPropertyAssocOne<?>[] embedded = desc.propertiesEmbedded();
 
     for (BeanPropertyAssocOne<?> anEmbedded : embedded) {
-
       BeanProperty[] props = anEmbedded.getProperties();
-
       List<Bindable> bindList = new ArrayList<>(props.length);
-
       for (BeanProperty prop : props) {
         Bindable item = factoryProperty.create(prop, mode, withLobs);
         if (item != null) {
           bindList.add(item);
         }
       }
-
       list.add(new BindableEmbedded(anEmbedded, bindList));
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryId.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryId.java
index bc67aa4c8..d517e051b 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryId.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryId.java
@@ -20,14 +20,14 @@ public class FactoryId {
     BeanProperty id = desc.getIdProperty();
     if (id == null) {
       return new BindableIdEmpty();
-
     }
     if (!id.isEmbedded()) {
       return new BindableIdScalar(id);
 
     } else {
       BeanPropertyAssocOne<?> embId = (BeanPropertyAssocOne<?>) id;
-      return new BindableIdEmbedded(embId, desc);
+      MatchedImportedProperty[] matches = MatchedImportedFactory.build(embId.getProperties(), desc);
+      return new BindableIdEmbedded(embId, matches);
     }
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedEmbedded.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedEmbedded.java
new file mode 100644
index 000000000..4ce1bb63d
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedEmbedded.java
@@ -0,0 +1,35 @@
+package io.ebeaninternal.server.persist.dmlbind;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.BeanProperty;
+import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
+
+/**
+ * Matches local embedded id properties to 'matching' properties from a
+ * ManyToOne associated bean that is a 'imported primary key'.
+ */
+class MatchedImportedEmbedded implements MatchedImportedProperty {
+
+  private final BeanProperty localProp;
+
+  private final BeanPropertyAssocOne<?> assocOne;
+
+  private final BeanProperty foreignProp;
+
+  MatchedImportedEmbedded(BeanProperty localProp, BeanPropertyAssocOne<?> assocOne, BeanProperty foreignProp) {
+    this.localProp = localProp;
+    this.assocOne = assocOne;
+    this.foreignProp = foreignProp;
+  }
+
+  @Override
+  public void populate(EntityBean sourceBean, EntityBean embeddedId) {
+    Object assocBean = assocOne.getValue(sourceBean);
+    if (assocBean == null) {
+      throw new NullPointerException("The assoc bean for " + assocOne + " is null?");
+    }
+    Object value = foreignProp.getValue((EntityBean) assocBean);
+    localProp.setValue(embeddedId, value);
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java
new file mode 100644
index 000000000..f1ba04d9b
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java
@@ -0,0 +1,54 @@
+package io.ebeaninternal.server.persist.dmlbind;
+
+import io.ebeaninternal.server.deploy.BeanDescriptor;
+import io.ebeaninternal.server.deploy.BeanProperty;
+import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
+
+class MatchedImportedFactory {
+
+  /**
+   * Create the array of matchedImportedProperty based on the properties and descriptor.
+   */
+  protected static MatchedImportedProperty[] build(BeanProperty[] props, BeanDescriptor<?> desc) {
+
+    MatchedImportedProperty[] matches = new MatchedImportedProperty[props.length];
+
+    for (int i = 0; i < props.length; i++) {
+      // find matching assoc one property for dbColumn
+      matches[i] = findMatch(props[i], desc);
+      if (matches[i] == null) {
+        // ok, the assoc ones are not on the bean?
+        return null;
+      }
+    }
+    return matches;
+  }
+
+  private static MatchedImportedProperty findMatch(BeanProperty prop, BeanDescriptor<?> desc) {
+
+    // find matching against the local database column
+    String dbColumn = prop.getDbColumn();
+
+    BeanPropertyAssocOne<?>[] assocOnes = desc.propertiesOne();
+    for (BeanPropertyAssocOne<?> assocOne1 : assocOnes) {
+      if (assocOne1.isImportedPrimaryKey()) {
+        // search using the ImportedId from the assoc one
+        BeanProperty foreignMatch = assocOne1.getImportedId().findMatchImport(dbColumn);
+        if (foreignMatch != null) {
+          return new MatchedImportedEmbedded(prop, assocOne1, foreignMatch);
+        }
+      }
+    }
+
+    BeanProperty[] scalar = desc.propertiesBaseScalar();
+    for (BeanProperty beanProperty : scalar) {
+      if (dbColumn.equals(beanProperty.getDbColumn())) {
+        return new MatchedImportedScalar(prop, beanProperty);
+      }
+    }
+
+    // there was no matching assoc one property.
+    // example UserRole bean missing assoc one to User?
+    return null;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedProperty.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedProperty.java
index d6b128d6d..cf0a37869 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedProperty.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedProperty.java
@@ -1,86 +1,11 @@
 package io.ebeaninternal.server.persist.dmlbind;
 
 import io.ebean.bean.EntityBean;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.deploy.BeanProperty;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 
-/**
- * Matches local embedded id properties to 'matching' properties from a
- * ManyToOne associated bean that is a 'imported primary key'.
- * <p>
- * This object is designed to help BindableIdEmbedded and BindableIdMap to
- * create a concatenated id from the id values from ManyToOne associated beans.
- * This can be done when those ManyToOne associated beans make up the primary
- * key. This typically means the BindableIdEmbedded is for a intersection table
- * of a Many to Many relationship.
- * </p>
- */
-class MatchedImportedProperty {
-
-  private final BeanPropertyAssocOne<?> assocOne;
-
-  private final BeanProperty foreignProp;
-
-  private final BeanProperty localProp;
-
-  protected MatchedImportedProperty(BeanPropertyAssocOne<?> assocOne, BeanProperty foreignProp,
-                                    BeanProperty localProp) {
-    this.assocOne = assocOne;
-    this.foreignProp = foreignProp;
-    this.localProp = localProp;
-  }
-
-  protected void populate(EntityBean sourceBean, EntityBean destBean) {
-    Object assocBean = assocOne.getValue(sourceBean);
-    if (assocBean == null) {
-      String msg = "The assoc bean for " + assocOne + " is null?";
-      throw new NullPointerException(msg);
-    }
-
-    Object value = foreignProp.getValue((EntityBean) assocBean);
-    localProp.setValue(destBean, value);
-  }
+public interface MatchedImportedProperty {
 
   /**
-   * Create the array of matchedImportedProperty based on the properties and descriptor.
+   * Populate the embeddedId bean from the source entity.
    */
-  protected static MatchedImportedProperty[] build(BeanProperty[] props, BeanDescriptor<?> desc) {
-
-    MatchedImportedProperty[] matches = new MatchedImportedProperty[props.length];
-
-    for (int i = 0; i < props.length; i++) {
-      // find matching assoc one property for dbColumn
-      matches[i] = MatchedImportedProperty.findMatch(props[i], desc);
-      if (matches[i] == null) {
-        // ok, the assoc ones are not on the bean?
-        return null;
-      }
-    }
-    return matches;
-  }
-
-  private static MatchedImportedProperty findMatch(BeanProperty prop, BeanDescriptor<?> desc) {
-
-    // find matching against the local database column
-    String dbColumn = prop.getDbColumn();
-
-    BeanPropertyAssocOne<?>[] assocOnes = desc.propertiesOne();
-    for (BeanPropertyAssocOne<?> assocOne1 : assocOnes) {
-      if (assocOne1.isImportedPrimaryKey()) {
-
-        // search using the ImportedId from the assoc one
-        BeanProperty foreignMatch = assocOne1.getImportedId().findMatchImport(dbColumn);
-
-        if (foreignMatch != null) {
-          return new MatchedImportedProperty(assocOne1, foreignMatch, prop);
-        }
-      }
-    }
-
-    // there was no matching assoc one property.
-    // example UserRole bean missing assoc one to User?
-    return null;
-  }
-
+  void populate(EntityBean sourceBean, EntityBean embeddedId);
 }
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedScalar.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedScalar.java
new file mode 100644
index 000000000..436ef69a5
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedScalar.java
@@ -0,0 +1,27 @@
+package io.ebeaninternal.server.persist.dmlbind;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.BeanProperty;
+
+/**
+ * Matches local embedded id properties to 'matching' imported primary key scalar properties.
+ */
+class MatchedImportedScalar implements MatchedImportedProperty {
+
+  private final BeanProperty localProp;
+
+  private final BeanProperty foreignProp;
+
+  MatchedImportedScalar(BeanProperty localProp, BeanProperty foreignProp) {
+    this.localProp = localProp;
+    this.foreignProp = foreignProp;
+  }
+
+  @Override
+  public void populate(EntityBean sourceBean, EntityBean embeddedId) {
+
+    Object value = foreignProp.getValue(sourceBean);
+    localProp.setValue(embeddedId, value);
+  }
+
+}
diff --git a/src/test/java/org/tests/merge/TestMergeCustomer.java b/src/test/java/org/tests/merge/TestMergeCustomer.java
index 8f314cac5..7bf86d1d8 100644
--- a/src/test/java/org/tests/merge/TestMergeCustomer.java
+++ b/src/test/java/org/tests/merge/TestMergeCustomer.java
@@ -367,7 +367,7 @@ public class TestMergeCustomer extends BaseTestCase {
 
   private MContact addContact(String email, String first, String last) {
     MContact mContact = new MContact(email, first, last);
-    int i = random.nextInt(2);
+    int i = 1 + random.nextInt(2);
     for (int j = 0; j < i; j++) {
       mContact.getMessages().add(new MContactMessage(first+" "+i, last+" "+i));
     }
diff --git a/src/test/java/org/tests/model/bridge/BEmbId.java b/src/test/java/org/tests/model/bridge/BEmbId.java
new file mode 100644
index 000000000..ad99b4a2d
--- /dev/null
+++ b/src/test/java/org/tests/model/bridge/BEmbId.java
@@ -0,0 +1,53 @@
+package org.tests.model.bridge;
+
+import javax.persistence.Embeddable;
+import java.util.Objects;
+import java.util.UUID;
+
+@Embeddable
+public class BEmbId {
+
+  private UUID siteId;
+  private UUID userId;
+
+  public BEmbId(UUID siteId, UUID userId) {
+    this.siteId = siteId;
+    this.userId = userId;
+  }
+
+  public UUID getSiteId() {
+    return siteId;
+  }
+
+  public UUID getUserId() {
+    return userId;
+  }
+
+  @Override
+  public String toString() {
+    return "st:" + siteId + " ui:" + userId;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+
+    BEmbId that = (BEmbId) o;
+    return Objects.equals(siteId, that.siteId) && Objects.equals(userId, that.userId);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(siteId, userId);
+  }
+
+  /**
+   * Just simulating the hash from Objects.hash(...)
+   */
+  int otherHash() {
+    int result = 31 + siteId.hashCode();
+    result = 31 * result + userId.hashCode();
+    return result;
+  }
+}
diff --git a/src/test/java/org/tests/model/bridge/BSiteUser.java b/src/test/java/org/tests/model/bridge/BSiteUserA.java
similarity index 67%
rename from src/test/java/org/tests/model/bridge/BSiteUser.java
rename to src/test/java/org/tests/model/bridge/BSiteUserA.java
index b4ff1724e..e3c57c10d 100644
--- a/src/test/java/org/tests/model/bridge/BSiteUser.java
+++ b/src/test/java/org/tests/model/bridge/BSiteUserA.java
@@ -4,10 +4,12 @@ import javax.persistence.Embeddable;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
 import javax.persistence.ManyToOne;
+import javax.persistence.Version;
+import java.util.Objects;
 import java.util.UUID;
 
 @Entity
-public class BSiteUser {
+public class BSiteUserA {
 
   @Embeddable
   public static class Id {
@@ -16,21 +18,23 @@ public class BSiteUser {
     public UUID siteId;
     public UUID userId;
 
+    public Id(UUID siteId, UUID userId) {
+      this.siteId = siteId;
+      this.userId = userId;
+    }
+
     @Override
     public boolean equals(Object o) {
       if (this == o) return true;
       if (o == null || getClass() != o.getClass()) return false;
 
-      Id id = (Id) o;
-      if (!siteId.equals(id.siteId)) return false;
-      return userId.equals(id.userId);
+      Id that = (Id) o;
+      return Objects.equals(siteId, that.siteId) && Objects.equals(userId, that.userId);
     }
 
     @Override
     public int hashCode() {
-      int result = siteId.hashCode();
-      result = 31 * result + userId.hashCode();
-      return result;
+      return Objects.hash(siteId, userId);
     }
   }
 
@@ -45,8 +49,10 @@ public class BSiteUser {
   @ManyToOne(optional = false)
   private final BUser user;
 
+  @Version
+  private long version;
 
-  public BSiteUser(BAccessLevel accessLevel, BSite site, BUser user) {
+  public BSiteUserA(BAccessLevel accessLevel, BSite site, BUser user) {
     this.accessLevel = accessLevel;
     this.site = site;
     this.user = user;
@@ -75,4 +81,12 @@ public class BSiteUser {
   public void setAccessLevel(BAccessLevel accessLevel) {
     this.accessLevel = accessLevel;
   }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
 }
diff --git a/src/test/java/org/tests/model/bridge/BSiteUserD.java b/src/test/java/org/tests/model/bridge/BSiteUserD.java
new file mode 100644
index 000000000..4ff4513f4
--- /dev/null
+++ b/src/test/java/org/tests/model/bridge/BSiteUserD.java
@@ -0,0 +1,61 @@
+package org.tests.model.bridge;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.Version;
+import java.util.UUID;
+
+@Entity
+@IdClass(BEmbId.class)
+public class BSiteUserD {
+
+  @Id
+  private UUID siteId;
+
+  @Id
+  private UUID userId;
+
+  private BAccessLevel accessLevel;
+
+  @Version
+  private long version;
+
+  public BSiteUserD(BAccessLevel accessLevel, UUID siteId, UUID userId) {
+    this.accessLevel = accessLevel;
+    this.siteId = siteId;
+    this.userId = userId;
+  }
+
+  public UUID getSiteId() {
+    return siteId;
+  }
+
+  public void setSiteId(UUID siteId) {
+    this.siteId = siteId;
+  }
+
+  public UUID getUserId() {
+    return userId;
+  }
+
+  public void setUserId(UUID userId) {
+    this.userId = userId;
+  }
+
+  public BAccessLevel getAccessLevel() {
+    return accessLevel;
+  }
+
+  public void setAccessLevel(BAccessLevel accessLevel) {
+    this.accessLevel = accessLevel;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/bridge/BSiteUserE.java b/src/test/java/org/tests/model/bridge/BSiteUserE.java
new file mode 100644
index 000000000..a6795de77
--- /dev/null
+++ b/src/test/java/org/tests/model/bridge/BSiteUserE.java
@@ -0,0 +1,44 @@
+package org.tests.model.bridge;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.ManyToOne;
+
+@Entity
+@IdClass(BEmbId.class)
+public class BSiteUserE {
+
+  @Id
+  @ManyToOne
+  private final BSite site;
+
+  @Id
+  @ManyToOne
+  private final BUser user;
+
+  private BAccessLevel accessLevel;
+
+
+  public BSiteUserE(BAccessLevel accessLevel, BSite site, BUser user) {
+    this.accessLevel = accessLevel;
+    this.site = site;
+    this.user = user;
+  }
+
+  public BAccessLevel getAccessLevel() {
+    return accessLevel;
+  }
+
+  public BSite getSite() {
+    return site;
+  }
+
+  public BUser getUser() {
+    return user;
+  }
+
+  public void setAccessLevel(BAccessLevel accessLevel) {
+    this.accessLevel = accessLevel;
+  }
+}
diff --git a/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java b/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java
index 142f9aee5..ed22ae4c4 100644
--- a/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java
+++ b/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java
@@ -19,7 +19,7 @@ public class TestExplicitM2MBridgeTable extends BaseTestCase {
     Ebean.save(user);
     Ebean.save(site);
 
-    insertUpdateBridge(user, site);
+    insertUpdateBridgeA(user, site);
     insertUpdateBridgeB(user, site);
     insertUpdateBridgeC(user, site);
   }
@@ -27,21 +27,26 @@ public class TestExplicitM2MBridgeTable extends BaseTestCase {
   /**
    * Test where matching by db column naming convention.
    */
-  private void insertUpdateBridge(BUser user, BSite site) {
+  private void insertUpdateBridgeA(BUser user, BSite site) {
 
-    BSiteUser access = new BSiteUser(BAccessLevel.ONE, site, user);
+    BSiteUserA access = new BSiteUserA(BAccessLevel.ONE, site, user);
     Ebean.save(access);
 
     access.setAccessLevel(BAccessLevel.TWO);
     Ebean.save(access);
 
-    List<BSiteUser> list = Ebean.find(BSiteUser.class).findList();
+    List<BSiteUserA> list = Ebean.find(BSiteUserA.class).findList();
     assertThat(list).isNotEmpty();
 
-    for (BSiteUser bridge : list) {
+    for (BSiteUserA bridge : list) {
       assertThat(bridge.getId().siteId).isEqualTo(bridge.getSite().id);
       assertThat(bridge.getId().userId).isEqualTo(bridge.getUser().id);
     }
+
+    BSiteUserA found = Ebean.find(BSiteUserA.class, new BSiteUserA.Id(site.id, user.id));
+    found.setAccessLevel(BAccessLevel.THREE);
+
+    Ebean.save(found);
   }
 
   /**
diff --git a/src/test/java/org/tests/model/bridge/TestIdClassScalar.java b/src/test/java/org/tests/model/bridge/TestIdClassScalar.java
new file mode 100644
index 000000000..5ad291d0d
--- /dev/null
+++ b/src/test/java/org/tests/model/bridge/TestIdClassScalar.java
@@ -0,0 +1,143 @@
+package org.tests.model.bridge;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestIdClassScalar extends BaseTestCase {
+
+  private BUser user = new BUser("Fiona");
+  private BSite site = new BSite("avaje.io");
+
+  @Test
+  public void testBEmbId_equalsHashcode() {
+
+    BEmbId a = new BEmbId(UUID.randomUUID(), UUID.randomUUID());
+    BEmbId b = new BEmbId(a.getSiteId(), a.getUserId());
+
+    BEmbId c = new BEmbId(UUID.randomUUID(), UUID.randomUUID());
+
+    BEmbId d = new BEmbId(a.getSiteId(), UUID.randomUUID());
+
+    assertThat(a).isEqualTo(b);
+    assertThat(a.hashCode()).isEqualTo(b.hashCode());
+
+    assertThat(a).isNotEqualTo(c);
+    assertThat(a.hashCode()).isNotEqualTo(c.hashCode());
+
+    assertThat(a).isNotEqualTo(d);
+    assertThat(a.hashCode()).isNotEqualTo(d.hashCode());
+
+
+    assertThat(a.hashCode()).isEqualTo(a.otherHash());
+
+  }
+
+  @Test
+  public void test() {
+
+    Ebean.save(user);
+    Ebean.save(site);
+
+    insertUpdateBridgeD(user, site);
+    insertUpdateBridgeE(user, site);
+  }
+
+  /**
+   * Test where matching by db column naming convention.
+   */
+  private void insertUpdateBridgeD(BUser user, BSite site) {
+
+    LoggedSqlCollector.start();
+
+    BSiteUserD access = new BSiteUserD(BAccessLevel.ONE, site.id, user.id);
+    Ebean.save(access);
+
+    access.setAccessLevel(BAccessLevel.TWO);
+    Ebean.save(access);
+
+    List<BSiteUserD> list = Ebean.find(BSiteUserD.class).findList();
+    assertThat(list).isNotEmpty();
+
+    for (BSiteUserD bridge : list) {
+      assertThat(bridge.getSiteId()).isEqualTo(site.id);
+      assertThat(bridge.getUserId()).isEqualTo(user.id);
+    }
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(3);
+    assertThat(sql.get(0)).contains("insert into bsite_user_d (site_id, user_id, access_level, version) values (?,?,?,?)");
+    assertThat(sql.get(1)).contains("update bsite_user_d set access_level=?, version=? where site_id=? and user_id=? and version=?");
+    assertThat(trimSql(sql.get(2))).contains("select t0.site_id, t0.user_id, t0.site_id, t0.user_id, t0.access_level, t0.version from bsite_user_d t0");
+
+
+    BEmbId id = new BEmbId(site.id, user.id);
+    BSiteUserD one = Ebean.find(BSiteUserD.class, id);
+
+    assertThat(one).isNotNull();
+    assertThat(one.getSiteId()).isEqualTo(site.id);
+    assertThat(one.getUserId()).isEqualTo(user.id);
+
+    one.setAccessLevel(BAccessLevel.THREE);
+    Ebean.save(one);
+
+    sql = LoggedSqlCollector.stop();
+
+    assertThat(sql).hasSize(2);
+    assertThat(trimSql(sql.get(0))).contains("select t0.site_id, t0.user_id, t0.site_id, t0.user_id, t0.access_level, t0.version from bsite_user_d t0 where t0.site_id = ?  and t0.user_id = ?");
+    assertThat(sql.get(1)).contains("update bsite_user_d set access_level=?, version=? where site_id=? and user_id=? and version=?");
+  }
+
+  /**
+   * Test where matching by db column naming convention.
+   */
+  private void insertUpdateBridgeE(BUser user, BSite site) {
+
+    LoggedSqlCollector.start();
+
+    BSiteUserE access = new BSiteUserE(BAccessLevel.ONE, site, user);
+    Ebean.save(access);
+
+    access.setAccessLevel(BAccessLevel.TWO);
+    Ebean.save(access);
+
+    List<BSiteUserE> list = Ebean.find(BSiteUserE.class).findList();
+    assertThat(list).isNotEmpty();
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(3);
+    assertThat(sql.get(0)).contains("insert into bsite_user_e (site_id, user_id, access_level)");
+    assertThat(sql.get(1)).contains("update bsite_user_e set access_level=? where site_id=? and user_id=?");
+    assertThat(trimSql(sql.get(2))).contains("select t0.site_id, t0.user_id, t0.access_level, t0.site_id, t0.user_id from bsite_user_e t0");
+
+
+    for (BSiteUserE bridge : list) {
+      assertThat(bridge.getSite().id).isEqualTo(site.id);
+      assertThat(bridge.getUser().id).isEqualTo(user.id);
+    }
+
+    BEmbId id = new BEmbId(site.id, user.id);
+
+    BSiteUserE one = Ebean.find(BSiteUserE.class, id);
+
+    assertThat(one).isNotNull();
+    assertThat(one.getSite().id).isEqualTo(site.id);
+    assertThat(one.getUser().id).isEqualTo(user.id);
+
+    one.setAccessLevel(BAccessLevel.THREE);
+    Ebean.save(one);
+
+    sql = LoggedSqlCollector.stop();
+
+    assertThat(sql).hasSize(2);
+    assertThat(trimSql(sql.get(0))).contains("select t0.site_id, t0.user_id, t0.access_level, t0.site_id, t0.user_id from bsite_user_e t0 where t0.site_id = ?  and t0.user_id = ?");
+    assertThat(sql.get(1)).contains("update bsite_user_e set access_level=? where site_id=? and user_id=?");
+
+  }
+}

From 9895e48485685b7c6bbe6986c3a11e97e80468b2 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 15 Mar 2018 22:47:37 +1300
Subject: [PATCH 0188/1036] #1349 - Example passing test for - RawSql fetch
 object with inheritance / 2

---
 .../inheritance/TestInheritanceRawSql.java    | 68 ++++++++++++++++++-
 .../java/org/tests/model/basic/Vehicle.java   | 12 ++++
 .../org/tests/model/basic/VehicleLease.java   | 64 +++++++++++++++++
 .../tests/model/basic/VehicleLeaseLong.java   | 32 +++++++++
 .../tests/model/basic/VehicleLeaseShort.java  | 33 +++++++++
 5 files changed, 207 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/org/tests/model/basic/VehicleLease.java
 create mode 100644 src/test/java/org/tests/model/basic/VehicleLeaseLong.java
 create mode 100644 src/test/java/org/tests/model/basic/VehicleLeaseShort.java

diff --git a/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java b/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java
index 5b7d88620..a7cd1a4ab 100644
--- a/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java
+++ b/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java
@@ -4,13 +4,18 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.RawSql;
 import io.ebean.RawSqlBuilder;
-import org.tests.model.basic.Truck;
-import org.tests.model.basic.Vehicle;
 import org.junit.Assert;
 import org.junit.Test;
+import org.tests.model.basic.Truck;
+import org.tests.model.basic.Vehicle;
+import org.tests.model.basic.VehicleLeaseLong;
 
+import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.List;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class TestInheritanceRawSql extends BaseTestCase {
 
   @Test
@@ -48,4 +53,63 @@ public class TestInheritanceRawSql extends BaseTestCase {
     Ebean.save(truck2);
   }
 
+  @Test
+  public void testJoinToInheritance() {
+
+    VehicleLeaseLong longLease = new VehicleLeaseLong();
+    longLease.setName("Long one");
+    longLease.setBond(new BigDecimal("1000"));
+    longLease.setMinDuration(100);
+    longLease.setActiveEnd(LocalDate.now());
+
+    Ebean.save(longLease);
+
+
+    Truck truck = new Truck();
+    truck.setCapacity(100D);
+    truck.setLicenseNumber("ZK1");
+    truck.setLease(longLease);
+
+    Ebean.save(truck);
+
+
+    String sql = "select v.dtype, v.id, v.license_number, l.dtype, l.id, l.name " +
+      "from vehicle v " +
+      "join vehicle_lease l on l.id = v.lease_id " +
+      "where v.id = ?";
+
+    RawSql rawSql = RawSqlBuilder.parse(sql)
+      .tableAliasMapping("v", null)
+      .tableAliasMapping("l", "lease")
+      .create();
+
+    Vehicle veh = Ebean.find(Vehicle.class)
+      .setRawSql(rawSql)
+      .setParameter(1, truck.getId())
+      .findOne();
+
+    assertThat(veh).isNotNull();
+    assertThat(veh.getLicenseNumber()).isEqualTo("ZK1");
+    assertThat(veh.getLease().getName()).isEqualTo("Long one");
+
+
+    RawSql rawSql2 = RawSqlBuilder.parse(sql)
+      .columnMappingIgnore("v.dtype")
+      .columnMapping("v.id", "id")
+      .columnMapping("v.license_number", "licenseNumber")
+      .columnMappingIgnore("l.dtype")
+      .columnMapping("l.id", "lease.id")
+      .columnMapping("l.name", "lease.name")
+      .create();
+
+    Vehicle veh2 = Ebean.find(Vehicle.class)
+      .setRawSql(rawSql2)
+      .setParameter(1, truck.getId())
+      .findOne();
+
+    assertThat(veh2).isNotNull();
+    assertThat(veh2.getLicenseNumber()).isEqualTo("ZK1");
+    assertThat(veh2.getLease().getName()).isEqualTo("Long one");
+  }
+
 }
diff --git a/src/test/java/org/tests/model/basic/Vehicle.java b/src/test/java/org/tests/model/basic/Vehicle.java
index 4da993c42..cab8c4dde 100644
--- a/src/test/java/org/tests/model/basic/Vehicle.java
+++ b/src/test/java/org/tests/model/basic/Vehicle.java
@@ -3,6 +3,7 @@ package org.tests.model.basic;
 import javax.persistence.DiscriminatorColumn;
 import javax.persistence.Entity;
 import javax.persistence.Inheritance;
+import javax.persistence.ManyToOne;
 import java.util.Date;
 
 @Entity
@@ -19,6 +20,9 @@ public abstract class Vehicle extends BasicDomain {
   // @Transient
   private transient String testTransient;
 
+  @ManyToOne
+  private VehicleLease lease;
+
   public String getLicenseNumber() {
     return licenseNumber;
   }
@@ -42,4 +46,12 @@ public abstract class Vehicle extends BasicDomain {
   public void setTestTransient(String testTransient) {
     this.testTransient = testTransient;
   }
+
+  public VehicleLease getLease() {
+    return lease;
+  }
+
+  public void setLease(VehicleLease lease) {
+    this.lease = lease;
+  }
 }
diff --git a/src/test/java/org/tests/model/basic/VehicleLease.java b/src/test/java/org/tests/model/basic/VehicleLease.java
new file mode 100644
index 000000000..1aa7b703d
--- /dev/null
+++ b/src/test/java/org/tests/model/basic/VehicleLease.java
@@ -0,0 +1,64 @@
+package org.tests.model.basic;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.Version;
+import java.time.LocalDate;
+
+@Entity
+@Inheritance
+public abstract class VehicleLease {
+
+  @Id
+  long id;
+
+  String name;
+
+  LocalDate activeStart;
+
+  LocalDate activeEnd;
+
+  @Version
+  long version;
+
+  public long getId() {
+    return id;
+  }
+
+  public void setId(long id) {
+    this.id = id;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public LocalDate getActiveStart() {
+    return activeStart;
+  }
+
+  public void setActiveStart(LocalDate activeStart) {
+    this.activeStart = activeStart;
+  }
+
+  public LocalDate getActiveEnd() {
+    return activeEnd;
+  }
+
+  public void setActiveEnd(LocalDate activeEnd) {
+    this.activeEnd = activeEnd;
+  }
+}
diff --git a/src/test/java/org/tests/model/basic/VehicleLeaseLong.java b/src/test/java/org/tests/model/basic/VehicleLeaseLong.java
new file mode 100644
index 000000000..4af74793f
--- /dev/null
+++ b/src/test/java/org/tests/model/basic/VehicleLeaseLong.java
@@ -0,0 +1,32 @@
+package org.tests.model.basic;
+
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import java.math.BigDecimal;
+
+@Entity
+@Inheritance
+@DiscriminatorValue("LONG")
+public class VehicleLeaseLong extends VehicleLease {
+
+  BigDecimal bond;
+
+  int minDuration;
+
+  public BigDecimal getBond() {
+    return bond;
+  }
+
+  public void setBond(BigDecimal bond) {
+    this.bond = bond;
+  }
+
+  public int getMinDuration() {
+    return minDuration;
+  }
+
+  public void setMinDuration(int minDuration) {
+    this.minDuration = minDuration;
+  }
+}
diff --git a/src/test/java/org/tests/model/basic/VehicleLeaseShort.java b/src/test/java/org/tests/model/basic/VehicleLeaseShort.java
new file mode 100644
index 000000000..6e5ccbee5
--- /dev/null
+++ b/src/test/java/org/tests/model/basic/VehicleLeaseShort.java
@@ -0,0 +1,33 @@
+package org.tests.model.basic;
+
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import java.math.BigDecimal;
+
+@Entity
+@Inheritance
+@DiscriminatorValue("SHORT")
+public class VehicleLeaseShort extends VehicleLease {
+
+
+  BigDecimal dayRate;
+
+  Integer maxDays;
+
+  public BigDecimal getDayRate() {
+    return dayRate;
+  }
+
+  public void setDayRate(BigDecimal dayRate) {
+    this.dayRate = dayRate;
+  }
+
+  public Integer getMaxDays() {
+    return maxDays;
+  }
+
+  public void setMaxDays(Integer maxDays) {
+    this.maxDays = maxDays;
+  }
+}

From 9d336cb20b33e551b5a0dd6e816a672030429cb0 Mon Sep 17 00:00:00 2001
From: yuanxuegui <yuanxuegui@163.com>
Date: Sat, 17 Mar 2018 13:13:39 +0800
Subject: [PATCH 0189/1036] ENH: Add mappingsLocation config to search xml
 mapping files.

ENH: Add mappingsLocation config to search xml mapping files.

ENH: Add mappingsLocation config to search xml mapping files.

ENH: Add mappingsLocation config to search xml mapping files.

ENH: Add mappingsLocation config to search xml mapping files.

ENH: Add mappingsLocation config to search xml mapping files.

remove unused import.

ENH: Add mappingsLocation config and search xml mapping files feature.
---
 .../java/io/ebean/config/ServerConfig.java    | 65 +++++++++++++------
 .../server/deploy/BeanDescriptorManager.java  | 39 ++++++++++-
 .../java/io/ebean/EbeanServer_eqlTest.java    | 15 +++++
 .../org/tests/rawsql/TestRawSqlOrmQuery.java  | 26 ++++++++
 .../ebean-xml-mappings/CustomerMapping.xml    | 14 ++++
 .../ebean-xml-mappings/OrderMapping.xml       | 19 ++++++
 src/test/resources/ebean.properties           |  2 +
 7 files changed, 159 insertions(+), 21 deletions(-)
 create mode 100644 src/test/resources/ebean-xml-mappings/CustomerMapping.xml
 create mode 100644 src/test/resources/ebean-xml-mappings/OrderMapping.xml

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 51221e96f..8d0d6f797 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -14,14 +14,7 @@ import io.ebean.config.dbplatform.DbEncrypt;
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.properties.PropertiesLoader;
-import io.ebean.event.BeanFindController;
-import io.ebean.event.BeanPersistController;
-import io.ebean.event.BeanPersistListener;
-import io.ebean.event.BeanPostConstructListener;
-import io.ebean.event.BeanPostLoad;
-import io.ebean.event.BeanQueryAdapter;
-import io.ebean.event.BulkTableEventListener;
-import io.ebean.event.ServerConfigStartup;
+import io.ebean.event.*;
 import io.ebean.event.changelog.ChangeLogListener;
 import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeLogRegister;
@@ -33,14 +26,7 @@ import io.ebean.util.StringHelper;
 import org.avaje.datasource.DataSourceConfig;
 
 import javax.sql.DataSource;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.ServiceLoader;
+import java.util.*;
 
 /**
  * The configuration used for creating a EbeanServer.
@@ -488,6 +474,12 @@ public class ServerConfig {
    */
   private boolean defaultOrderById = false;
 
+  /**
+   * The mappingLocations for searching xml mapping. Only used when
+   * mappingLocations is empty/not explicitly specified.
+   */
+  private List<String> mappingLocations = new ArrayList<>();
+
   /**
    * Construct a Server Configuration for programmatically creating an EbeanServer.
    */
@@ -2782,7 +2774,7 @@ public class ServerConfig {
 
     if (packages != null) {
       String packagesProp = p.get("search.packages", p.get("packages", null));
-      packages = getSearchJarsPackages(packagesProp);
+      packages = getSearchList(packagesProp);
     }
 
     collectQueryStatsByNode = p.getBoolean("collectQueryStatsByNode", collectQueryStatsByNode);
@@ -2862,6 +2854,12 @@ public class ServerConfig {
     tenantSchemaProvider = p.createInstance(TenantSchemaProvider.class, "tenant.schemaProvider", tenantSchemaProvider);
     tenantPartitionColumn = p.get("tenant.partitionColumn", tenantPartitionColumn);
     classes = getClasses(p);
+
+
+    if (mappingLocations != null) {
+      String mappingsProp = p.get("search.mappingsLocations", p.get("mappingsLocations", null));
+      mappingLocations = getSearchList(mappingsProp);
+    }
   }
 
   private NamingConvention createNamingConvention(PropertiesWrapper properties, NamingConvention namingConvention) {
@@ -2898,10 +2896,10 @@ public class ServerConfig {
     return classes;
   }
 
-  private List<String> getSearchJarsPackages(String searchPackages) {
+  private List<String> getSearchList(String searchNames) {
 
-    if (searchPackages != null) {
-      String[] entries = StringHelper.splitNames(searchPackages);
+    if (searchNames != null) {
+      String[] entries = StringHelper.splitNames(searchNames);
 
       List<String> hitList = new ArrayList<>(entries.length);
       Collections.addAll(hitList, entries);
@@ -3076,6 +3074,33 @@ public class ServerConfig {
     return config;
   }
 
+  /**
+   * Add a mapping location to search for xml mapping via class path search.
+   */
+  public void addMappingLocation(String mappingLocation) {
+    if (mappingLocations == null) {
+      mappingLocations = new ArrayList<>();
+    }
+    mappingLocations.add(mappingLocation);
+  }
+
+  /**
+   * Return mapping locations to search for xml mapping via class path search.
+   */
+  public List<String> getMappingLocations() {
+    return mappingLocations;
+  }
+
+  /**
+   * Set mapping locations to search for xml mapping via class path search.
+   * <p>
+   * This is only used if classes have not been explicitly specified.
+   * </p>
+   */
+  public void setMappingLocations(List<String> mappingLocations) {
+    this.mappingLocations = mappingLocations;
+  }
+
   public enum UuidVersion {
     VERSION4,
     VERSION1,
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 6bd12fda2..1f37d27b3 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -26,6 +26,7 @@ import io.ebeaninternal.api.ConcurrencyMode;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.TransactionEventTable;
 import io.ebeaninternal.server.cache.SpiCacheManager;
+import io.ebeaninternal.server.core.ClassPathScanners;
 import io.ebeaninternal.server.core.InternString;
 import io.ebeaninternal.server.core.InternalConfiguration;
 import io.ebeaninternal.server.core.Message;
@@ -65,6 +66,9 @@ import io.ebeaninternal.xmlmapping.model.XmNamedQuery;
 import io.ebeaninternal.xmlmapping.model.XmRawSql;
 import io.ebeanservice.docstore.api.DocStoreBeanAdapter;
 import io.ebeanservice.docstore.api.DocStoreFactory;
+import org.avaje.classpath.scanner.ClassPathScanner;
+import org.avaje.classpath.scanner.Resource;
+import org.avaje.classpath.scanner.ResourceFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -72,6 +76,7 @@ import javax.persistence.MappedSuperclass;
 import javax.persistence.PersistenceException;
 import javax.persistence.Transient;
 import javax.sql.DataSource;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
@@ -416,6 +421,13 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
         }
       }
 
+      List<Resource> xmlMappingResources = searchXmlMapping();
+      for (Resource xmlMappingRes : xmlMappingResources) {
+        try (InputStream is = new FileInputStream(xmlMappingRes.getLocationOnDisk())) {
+          mappings.add(XmlMappingReader.read(is));
+        }
+      }
+
       for (XmEbean mapping : mappings) {
         List<XmEntity> entityDeploy = mapping.getEntity();
         for (XmEntity deploy : entityDeploy) {
@@ -424,10 +436,35 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
       }
 
     } catch (IOException e) {
-      throw new RuntimeException("Error reading ebean.xml", e);
+      throw new RuntimeException("Error reading ebean xml mapping", e);
     }
   }
 
+  private List<Resource> searchXmlMapping() {
+    List<ClassPathScanner> scanners = ClassPathScanners.find(serverConfig);
+    List<String> mappingLocations = serverConfig.getMappingLocations();
+    List<Resource> resourceList = new ArrayList<>();
+
+    long st = System.currentTimeMillis();
+    if (mappingLocations != null && !mappingLocations.isEmpty()) {
+      for (ClassPathScanner finder : scanners) {
+        for (String mappingLocation : mappingLocations) {
+          resourceList.addAll(finder.scanForResources(mappingLocation, new ResourceFilter() {
+
+            @Override
+            public boolean isMatch(String resourceName) {
+              return resourceName.endsWith(".xml");
+            }
+          }));
+        }
+      }
+    }
+
+    long searchTime = System.currentTimeMillis() - st;
+    logger.debug("Classpath search mappings[{}] searchTime[{}]", resourceList.size(), searchTime);
+    return resourceList;
+  }
+
   private void readEntityMapping(ClassLoader classLoader, XmEntity entityDeploy) {
 
     String entityClassName = entityDeploy.getClazz();
diff --git a/src/test/java/io/ebean/EbeanServer_eqlTest.java b/src/test/java/io/ebean/EbeanServer_eqlTest.java
index a29e00bad..75c0c1f4f 100644
--- a/src/test/java/io/ebean/EbeanServer_eqlTest.java
+++ b/src/test/java/io/ebean/EbeanServer_eqlTest.java
@@ -250,4 +250,19 @@ public class EbeanServer_eqlTest extends BaseTestCase {
 
     assertThat(query.getGeneratedSql()).contains("from o_customer t0 left join contact t1 on t1.customer_id = t0.id ");
   }
+
+  @Test
+  public void namedQuery_fromCustomXmlLocations() {
+
+    ResetBasicData.reset();
+
+    Query<Customer> query = server()
+      .createNamedQuery(Customer.class, "withContactsById2")
+      .setParameter("id", 1);
+
+    query.setUseCache(false);
+    query.findOne();
+
+    assertThat(query.getGeneratedSql()).contains("from o_customer t0 left join contact t1 on t1.customer_id = t0.id ");
+  }
 }
diff --git a/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java b/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
index 51e3d53c5..cabde9917 100644
--- a/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
+++ b/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
@@ -51,6 +51,32 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
     assertThat(sql).contains("where o.status = ?  order by c.name, c.id");
   }
 
+  @IgnorePlatform(Platform.ORACLE)
+  @Test
+  public void testNamed_fromCustomXmlLocations() {
+
+    ResetBasicData.reset();
+
+    Query<Order> query = Ebean.createNamedQuery(Order.class, "myRawTest2");
+    query.setParameter("orderStatus", Order.Status.NEW);
+    query.setMaxRows(10);
+    List<Order> list = query.findList();
+    for (Order order : list) {
+      order.getCretime();
+    }
+
+    String sql = query.getGeneratedSql();
+    if (isSqlServer()) {
+      assertThat(sql).contains("select top 10 o.id,");
+    } else {
+      assertThat(sql).contains("select o.id,");
+      assertThat(sql).contains("limit 10");
+    }
+    assertThat(sql).contains("o.id, o.status, o.ship_date, c.id, c.name, a.id, a.line_1, a.line_2, a.city from o_order o");
+    assertThat(sql).contains("join o_customer c on o.kcustomer_id = c.id ");
+    assertThat(sql).contains("where o.status = ?  order by c.name, c.id");
+  }
+
   @Test
   public void test() {
 
diff --git a/src/test/resources/ebean-xml-mappings/CustomerMapping.xml b/src/test/resources/ebean-xml-mappings/CustomerMapping.xml
new file mode 100644
index 000000000..b55626fbf
--- /dev/null
+++ b/src/test/resources/ebean-xml-mappings/CustomerMapping.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ebean xmlns="http://ebean-orm.github.io/xml/ns/ebean">
+
+  <entity class="org.tests.model.basic.Customer">
+    <named-query name="withContactsById2">
+      <query>
+        select (name, version)
+        fetch contacts (firstName, lastName, email)
+        where id = :id
+      </query>
+    </named-query>
+  </entity>
+
+</ebean>
diff --git a/src/test/resources/ebean-xml-mappings/OrderMapping.xml b/src/test/resources/ebean-xml-mappings/OrderMapping.xml
new file mode 100644
index 000000000..cd35e81a9
--- /dev/null
+++ b/src/test/resources/ebean-xml-mappings/OrderMapping.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ebean xmlns="http://ebean-orm.github.io/xml/ns/ebean">
+
+  <entity class="org.tests.model.basic.Order">
+    <raw-sql name="myRawTest2">
+      <alias-mapping alias="c" property="customer"/>
+      <alias-mapping alias="a" property="customer.billingAddress"/>
+      <query>
+        select o.id, o.status, o.ship_date, c.id, c.name, a.id, a.line_1, a.line_2, a.city
+        from o_order o
+        join o_customer c on o.kcustomer_id = c.id
+        join o_address a on c.billing_address_id = a.id
+        where o.status = :orderStatus
+        order by c.name, c.id
+      </query>
+    </raw-sql>
+  </entity>
+
+</ebean>
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 3b048c4c2..3616698d1 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -168,3 +168,5 @@ ebean.migrationtest.ddl.header=-- Migrationscripts for ebean unittest
 ebean.migrationtest.migration.appName=migrationtest
 ebean.migrationtest.migration.migrationPath=dbmigration/migrationtest
 ebean.migrationtest.migration.strict=true
+
+ebean.mappingsLocations=classpath:/ebean-xml-mappings

From f3251691e2e3e8ef658ee8dd9be2b94ccdae5f00 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 19 Mar 2018 09:18:00 +1300
Subject: [PATCH 0190/1036] Test only change - Add test for SavePoint and
 compare to transaction.setRollbackOnly()

---
 .../org/tests/transaction/TestSavepoint.java  | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 src/test/java/org/tests/transaction/TestSavepoint.java

diff --git a/src/test/java/org/tests/transaction/TestSavepoint.java b/src/test/java/org/tests/transaction/TestSavepoint.java
new file mode 100644
index 000000000..5a159b333
--- /dev/null
+++ b/src/test/java/org/tests/transaction/TestSavepoint.java
@@ -0,0 +1,65 @@
+package org.tests.transaction;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.Transaction;
+import io.ebean.annotation.ForPlatform;
+import io.ebean.annotation.Platform;
+import org.junit.Test;
+import org.tests.model.basic.EBasicVer;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Savepoint;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestSavepoint extends BaseTestCase {
+
+  @ForPlatform({Platform.POSTGRES, Platform.H2})
+  @Test
+  public void test() throws SQLException {
+
+    EBasicVer basicVer = new EBasicVer("save1");
+    basicVer.setOther("other1");
+    Ebean.save(basicVer);
+
+    try (Transaction transaction = Ebean.beginTransaction()) {
+
+      Connection connection = transaction.getConnection();
+      Savepoint savepoint = connection.setSavepoint();
+
+      basicVer.setOther("changeOther");
+      Ebean.save(basicVer);
+
+      connection.rollback(savepoint);
+      transaction.commit();
+    }
+
+    EBasicVer found = Ebean.find(EBasicVer.class, basicVer.getId());
+    assertThat(found.getOther()).isEqualTo("other1");
+
+  }
+
+  @ForPlatform({Platform.POSTGRES, Platform.H2})
+  @Test
+  public void rollbackOnly_expect_similarResult() {
+
+    EBasicVer basicVer = new EBasicVer("save2");
+    basicVer.setOther("other2");
+    Ebean.save(basicVer);
+
+    try (Transaction transaction = Ebean.beginTransaction()) {
+      transaction.setRollbackOnly();
+
+      basicVer.setOther("changeOther");
+      Ebean.save(basicVer);
+
+      transaction.commit();
+    }
+
+    EBasicVer found = Ebean.find(EBasicVer.class, basicVer.getId());
+    assertThat(found.getOther()).isEqualTo("other2");
+
+  }
+}

From 5575273c96fd3b49f876814045a0fabf8e467f23 Mon Sep 17 00:00:00 2001
From: yuanxuegui <yuanxuegui@163.com>
Date: Mon, 19 Mar 2018 18:04:49 +0800
Subject: [PATCH 0191/1036] ENH: Add named DtoQuery, such that we can define
 native SQL queries in ebean mapping xml for DtoQuery.

---
 src/main/java/io/ebean/EbeanServer.java       |  25 +-
 .../server/core/DefaultServer.java            |  25 +-
 .../server/core/InternalConfiguration.java    |  51 ++-
 .../server/deploy/BeanDescriptorManager.java  |  87 +----
 .../server/dto/DtoBeanDescriptor.java         |  62 +++-
 .../server/dto/DtoBeanManager.java            |  55 ++-
 .../xmlmapping/XmlMappingReader.java          |  40 ++-
 .../ebeaninternal/xmlmapping/model/XmDto.java | 121 +++++++
 .../xmlmapping/model/XmEbean.java             |  19 +-
 src/main/resources/ebean-1.0.xsd              |  11 +
 src/test/java/io/ebean/NamedDtoQueryTest.java | 335 ++++++++++++++++++
 .../ebeaninternal/api/TDSpiEbeanServer.java   |  10 +-
 .../ebean-xml-mappings/DCustMapping.xml       |  77 ++++
 13 files changed, 814 insertions(+), 104 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/xmlmapping/model/XmDto.java
 create mode 100644 src/test/java/io/ebean/NamedDtoQueryTest.java
 create mode 100644 src/test/resources/ebean-xml-mappings/DCustMapping.xml

diff --git a/src/main/java/io/ebean/EbeanServer.java b/src/main/java/io/ebean/EbeanServer.java
index f13cb86e7..78619886b 100644
--- a/src/main/java/io/ebean/EbeanServer.java
+++ b/src/main/java/io/ebean/EbeanServer.java
@@ -8,12 +8,6 @@ import io.ebean.plugin.Property;
 import io.ebean.plugin.SpiServer;
 import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.OptimisticLockException;
-import javax.persistence.PersistenceException;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -22,6 +16,11 @@ import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.persistence.NonUniqueResultException;
+import javax.persistence.OptimisticLockException;
+import javax.persistence.PersistenceException;
 
 /**
  * Provides the API for fetching and saving beans to a particular DataSource.
@@ -105,6 +104,7 @@ public interface EbeanServer {
    *
    * @param shutdownDataSource if true then shutdown the underlying DataSource if it is the EbeanORM
    *                           DataSource implementation.
+   *                           DataSource implementation.
    * @param deregisterDriver   if true then deregister the JDBC driver if it is the EbeanORM
    *                           DataSource implementation.
    */
@@ -437,6 +437,19 @@ public interface EbeanServer {
    */
   <T> DtoQuery<T> findDto(Class<T> dtoType, String sql);
 
+  /**
+   * Create a named Query for DTO beans.
+   * <p>
+   * DTO beans are just normal bean like classes with public constructor(s) and setters.
+   * They do not need to be registered with Ebean before use.
+   * </p>
+   *
+   * @param dtoType The type of the DTO bean the rows will be mapped into.
+   * @param namedQuery     The name of the query
+   * @param <T>     The type of the DTO bean.
+   */
+  <T> DtoQuery<T> createNamedDtoQuery(Class<T> dtoType, String namedQuery);
+
   /**
    * Create a SqlQuery for executing native sql
    * query statements.
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 7a75abd5f..da3d5af00 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -105,13 +105,6 @@ import io.ebeaninternal.server.transaction.TransactionManager;
 import io.ebeaninternal.util.ParamTypeHelper;
 import io.ebeaninternal.util.ParamTypeHelper.TypeInfo;
 import io.ebeanservice.docstore.api.DocStoreIntegration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.OptimisticLockException;
-import javax.persistence.PersistenceException;
-import javax.sql.DataSource;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -126,6 +119,12 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
+import javax.persistence.NonUniqueResultException;
+import javax.persistence.OptimisticLockException;
+import javax.persistence.PersistenceException;
+import javax.sql.DataSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The default server side implementation of EbeanServer.
@@ -966,7 +965,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   }
 
   @Override
-  public <T> Query<T> createQuery(Class<T> beanType, String eql) {
+  public <T> DefaultOrmQuery<T> createQuery(Class<T> beanType, String eql) {
     DefaultOrmQuery<T> query = createQuery(beanType);
     EqlParser.parse(eql, query);
     return query;
@@ -999,6 +998,16 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return new DefaultDtoQuery<>(this, descriptor, sql.trim());
   }
 
+  @Override
+  public <T> DtoQuery<T> createNamedDtoQuery(Class<T> dtoType, String namedQuery) {
+    DtoBeanDescriptor<T> descriptor = dtoBeanManager.getDescriptor(dtoType);
+    SpiRawSql rawSql = descriptor.getNamedRawSql(namedQuery);
+    if (rawSql != null) {
+      return new DefaultDtoQuery<>(this, descriptor, rawSql.getSql().getUnparsedSql());
+    }
+    throw new PersistenceException("No named query called " + namedQuery + " for bean:" + dtoType.getName());
+  }
+
   @Override
   public <T> DtoQuery<T> findDto(Class<T> dtoType, SpiQuery<?> ormQuery) {
 
diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index ab0587d94..82d395aed 100644
--- a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -69,19 +69,23 @@ import io.ebeaninternal.server.transaction.TransactionManagerOptions;
 import io.ebeaninternal.server.transaction.TransactionScopeManager;
 import io.ebeaninternal.server.type.DefaultTypeManager;
 import io.ebeaninternal.server.type.TypeManager;
+import io.ebeaninternal.xmlmapping.XmlMappingReader;
+import io.ebeaninternal.xmlmapping.model.XmEbean;
 import io.ebeanservice.docstore.api.DocStoreFactory;
 import io.ebeanservice.docstore.api.DocStoreIntegration;
 import io.ebeanservice.docstore.api.DocStoreUpdateProcessor;
 import io.ebeanservice.docstore.none.NoneDocStoreFactory;
-import org.avaje.datasource.DataSourcePool;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.sql.DataSource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.ServiceLoader;
+import javax.sql.DataSource;
+import org.avaje.classpath.scanner.ClassPathScanner;
+import org.avaje.classpath.scanner.Resource;
+import org.avaje.classpath.scanner.ResourceFilter;
+import org.avaje.datasource.DataSourcePool;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Used to extend the ServerConfig with additional objects used to configure and
@@ -134,6 +138,8 @@ public class InternalConfiguration {
 
   private final MultiValueBind multiValueBind;
 
+  private List<XmEbean> xmlEbeanList = new ArrayList<>();
+
   public InternalConfiguration(ClusterManager clusterManager,
                                SpiCacheManager cacheManager, SpiBackgroundExecutor backgroundExecutor,
                                ServerConfig serverConfig, BootupClasses bootupClasses) {
@@ -153,12 +159,20 @@ public class InternalConfiguration {
     this.multiValueBind = createMultiValueBind(databasePlatform.getPlatform());
     this.deployInherit = new DeployInherit(bootupClasses);
 
+    xmlEbeanList = XmlMappingReader.readByResourceName(serverConfig.getClassLoadConfig().getClassLoader(),
+      "ebean.xml");
+    List<Resource> searchXmlMapping = searchXmlMapping();
+    xmlEbeanList.addAll(XmlMappingReader.readByResourceList(serverConfig.getClassLoadConfig().getClassLoader(),
+      searchXmlMapping));
+
     this.deployCreateProperties = new DeployCreateProperties(typeManager);
     this.deployUtil = new DeployUtil(typeManager, serverConfig);
     this.dtoBeanManager = new DtoBeanManager(typeManager);
+    dtoBeanManager.readXmlMapping(serverConfig.getClassLoadConfig().getClassLoader(),
+      xmlEbeanList);
 
     this.beanDescriptorManager = new BeanDescriptorManager(this);
-    Map<String, String> asOfTableMapping = beanDescriptorManager.deploy();
+    Map<String, String> asOfTableMapping = beanDescriptorManager.deploy(xmlEbeanList);
     Map<String, String> draftTableMap = beanDescriptorManager.getDraftTableMap();
     beanDescriptorManager.scheduleBackgroundTrim();
 
@@ -167,6 +181,31 @@ public class InternalConfiguration {
     this.cQueryEngine = new CQueryEngine(serverConfig, databasePlatform, binder, asOfTableMapping, draftTableMap);
   }
 
+  private List<Resource> searchXmlMapping() {
+    List<ClassPathScanner> scanners = ClassPathScanners.find(serverConfig);
+    List<String> mappingLocations = serverConfig.getMappingLocations();
+    List<Resource> resourceList = new ArrayList<>();
+
+    long st = System.currentTimeMillis();
+    if (mappingLocations != null && !mappingLocations.isEmpty()) {
+      for (ClassPathScanner finder : scanners) {
+        for (String mappingLocation : mappingLocations) {
+          resourceList.addAll(finder.scanForResources(mappingLocation, new ResourceFilter() {
+
+            @Override
+            public boolean isMatch(String resourceName) {
+              return resourceName.endsWith(".xml");
+            }
+          }));
+        }
+      }
+    }
+
+    long searchTime = System.currentTimeMillis() - st;
+    logger.debug("Classpath search mappings[{}] searchTime[{}]", resourceList.size(), searchTime);
+    return resourceList;
+  }
+
   /**
    * Create and return the ExpressionFactory based on configuration and database platform.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 1f37d27b3..0aba19bb6 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -26,7 +26,6 @@ import io.ebeaninternal.api.ConcurrencyMode;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.TransactionEventTable;
 import io.ebeaninternal.server.cache.SpiCacheManager;
-import io.ebeaninternal.server.core.ClassPathScanners;
 import io.ebeaninternal.server.core.InternString;
 import io.ebeaninternal.server.core.InternalConfiguration;
 import io.ebeaninternal.server.core.Message;
@@ -57,7 +56,6 @@ import io.ebeaninternal.server.query.CQueryPlan;
 import io.ebeaninternal.server.type.ScalarType;
 import io.ebeaninternal.server.type.ScalarTypeInteger;
 import io.ebeaninternal.server.type.TypeManager;
-import io.ebeaninternal.xmlmapping.XmlMappingReader;
 import io.ebeaninternal.xmlmapping.model.XmAliasMapping;
 import io.ebeaninternal.xmlmapping.model.XmColumnMapping;
 import io.ebeaninternal.xmlmapping.model.XmEbean;
@@ -66,27 +64,12 @@ import io.ebeaninternal.xmlmapping.model.XmNamedQuery;
 import io.ebeaninternal.xmlmapping.model.XmRawSql;
 import io.ebeanservice.docstore.api.DocStoreBeanAdapter;
 import io.ebeanservice.docstore.api.DocStoreFactory;
-import org.avaje.classpath.scanner.ClassPathScanner;
-import org.avaje.classpath.scanner.Resource;
-import org.avaje.classpath.scanner.ResourceFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.persistence.MappedSuperclass;
-import javax.persistence.PersistenceException;
-import javax.persistence.Transient;
-import javax.sql.DataSource;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -94,6 +77,12 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.PersistenceException;
+import javax.persistence.Transient;
+import javax.sql.DataSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Creates BeanDescriptors.
@@ -370,12 +359,12 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   /**
    * Deploy returning the asOfTableMap (which is required by the SQL builders).
    */
-  public Map<String, String> deploy() {
+  public Map<String, String> deploy(List<XmEbean> mappings) {
 
     try {
       createListeners();
       readEntityDeploymentInitial();
-      readXmlMapping();
+      readXmlMapping(mappings);
       readEmbeddedDeployment();
       readEntityBeanTable();
       readEntityDeploymentAssociations();
@@ -406,63 +395,15 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     }
   }
 
-  private void readXmlMapping() {
+  private void readXmlMapping(List<XmEbean> mappings) {
+    ClassLoader classLoader = serverConfig.getClassLoadConfig().getClassLoader();
 
-    try {
-      ClassLoader classLoader = serverConfig.getClassLoadConfig().getClassLoader();
-
-      Enumeration<URL> resources = classLoader.getResources("ebean.xml");
-
-      List<XmEbean> mappings = new ArrayList<>();
-      while (resources.hasMoreElements()) {
-        URL url = resources.nextElement();
-        try (InputStream is = url.openStream()) {
-          mappings.add(XmlMappingReader.read(is));
-        }
-      }
-
-      List<Resource> xmlMappingResources = searchXmlMapping();
-      for (Resource xmlMappingRes : xmlMappingResources) {
-        try (InputStream is = new FileInputStream(xmlMappingRes.getLocationOnDisk())) {
-          mappings.add(XmlMappingReader.read(is));
-        }
-      }
-
-      for (XmEbean mapping : mappings) {
-        List<XmEntity> entityDeploy = mapping.getEntity();
-        for (XmEntity deploy : entityDeploy) {
-          readEntityMapping(classLoader, deploy);
-        }
-      }
-
-    } catch (IOException e) {
-      throw new RuntimeException("Error reading ebean xml mapping", e);
-    }
-  }
-
-  private List<Resource> searchXmlMapping() {
-    List<ClassPathScanner> scanners = ClassPathScanners.find(serverConfig);
-    List<String> mappingLocations = serverConfig.getMappingLocations();
-    List<Resource> resourceList = new ArrayList<>();
-
-    long st = System.currentTimeMillis();
-    if (mappingLocations != null && !mappingLocations.isEmpty()) {
-      for (ClassPathScanner finder : scanners) {
-        for (String mappingLocation : mappingLocations) {
-          resourceList.addAll(finder.scanForResources(mappingLocation, new ResourceFilter() {
-
-            @Override
-            public boolean isMatch(String resourceName) {
-              return resourceName.endsWith(".xml");
-            }
-          }));
-        }
+    for (XmEbean mapping : mappings) {
+      List<XmEntity> entityDeploy = mapping.getEntity();
+      for (XmEntity deploy : entityDeploy) {
+        readEntityMapping(classLoader, deploy);
       }
     }
-
-    long searchTime = System.currentTimeMillis() - st;
-    logger.debug("Classpath search mappings[{}] searchTime[{}]", resourceList.size(), searchTime);
-    return resourceList;
   }
 
   private void readEntityMapping(ClassLoader classLoader, XmEntity entityDeploy) {
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java
index 04060e8a4..0e8f4b42f 100644
--- a/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java
@@ -1,7 +1,9 @@
 package io.ebeaninternal.server.dto;
 
 import io.ebean.meta.MetricVisitor;
-
+import io.ebeaninternal.server.rawsql.SpiRawSql;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -10,15 +12,25 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public class DtoBeanDescriptor<T> {
 
+  private static final Map<String, String> EMPTY_NAMED_QUERY = new HashMap<>();
+
+  private static final Map<String, SpiRawSql> EMPTY_RAW_MAP = new HashMap<>();
+
   private final Map<Object, DtoQueryPlan> plans = new ConcurrentHashMap<>();
 
   private final Class<T> dtoType;
 
   private final DtoMeta meta;
 
+  private Map<String, SpiRawSql> namedRawSql;
+
+  private Map<String, String> namedQuery;
+
   DtoBeanDescriptor(Class<T> dtoType, DtoMeta meta) {
     this.dtoType = dtoType;
     this.meta = meta;
+    this.namedQuery = getNamedQuery();
+    this.namedRawSql = getNamedRawSql();
   }
 
   public Class<T> getType() {
@@ -42,4 +54,52 @@ public class DtoBeanDescriptor<T> {
       plan.visit(visitor);
     }
   }
+
+  /**
+   * Return the named ORM query.
+   */
+  public String getNamedQuery(String name) {
+    return namedQuery.get(name);
+  }
+
+  /**
+   * Return the named RawSql query.
+   */
+  public SpiRawSql getNamedRawSql(String named) {
+    return namedRawSql.get(named);
+  }
+
+  /**
+   * Return the named ORM queries.
+   */
+  public Map<String, String> getNamedQuery() {
+    return (namedQuery != null) ? namedQuery : EMPTY_NAMED_QUERY;
+  }
+
+  /**
+   * Add a named query.
+   */
+  public void addNamedQuery(String name, String query) {
+    if (namedQuery == null) {
+      namedQuery = new LinkedHashMap<>();
+    }
+    namedQuery.put(name, query);
+  }
+
+  /**
+   * Return the named RawSql queries.
+   */
+  public Map<String, SpiRawSql> getNamedRawSql() {
+    return (namedRawSql != null) ? namedRawSql : EMPTY_RAW_MAP;
+  }
+
+  /**
+   * Add a named RawSql from ebean.xml file.
+   */
+  public void addRawSql(String name, SpiRawSql rawSql) {
+    if (namedRawSql == null) {
+      namedRawSql = new HashMap<>();
+    }
+    namedRawSql.put(name, rawSql);
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoBeanManager.java b/src/main/java/io/ebeaninternal/server/dto/DtoBeanManager.java
index 7cbd9488d..2871b6192 100644
--- a/src/main/java/io/ebeaninternal/server/dto/DtoBeanManager.java
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoBeanManager.java
@@ -1,16 +1,28 @@
 package io.ebeaninternal.server.dto;
 
+import io.ebean.RawSqlBuilder;
 import io.ebean.meta.MetricVisitor;
+import io.ebeaninternal.server.rawsql.SpiRawSql;
 import io.ebeaninternal.server.type.TypeManager;
-
+import io.ebeaninternal.xmlmapping.model.XmAliasMapping;
+import io.ebeaninternal.xmlmapping.model.XmColumnMapping;
+import io.ebeaninternal.xmlmapping.model.XmDto;
+import io.ebeaninternal.xmlmapping.model.XmEbean;
+import io.ebeaninternal.xmlmapping.model.XmNamedQuery;
+import io.ebeaninternal.xmlmapping.model.XmRawSql;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Manages all the DTO bean descriptors.
  */
 public class DtoBeanManager {
 
+  private static final Logger logger = LoggerFactory.getLogger(DtoBeanManager.class);
+
   private final TypeManager typeManager;
 
   private final Map<Class, DtoBeanDescriptor> descriptorMap = new ConcurrentHashMap<>();
@@ -43,4 +55,45 @@ public class DtoBeanManager {
       value.visit(visitor);
     }
   }
+
+  public void readXmlMapping(ClassLoader classLoader, List<XmEbean> mappings) {
+    for (XmEbean mapping : mappings) {
+      List<XmDto> dtoList = mapping.getDto();
+      for (XmDto dto : dtoList) {
+        readDtoMapping(classLoader, dto);
+      }
+    }
+  }
+
+  private void readDtoMapping(ClassLoader classLoader, XmDto dto) {
+    String dtoClassName = dto.getClazz();
+    Class<?> dtoClass;
+    try {
+      dtoClass = Class.forName(dtoClassName, false, classLoader);
+    } catch (Exception e) {
+      logger.error("Could not load dto bean class " + dtoClassName + " for ebean xml entry");
+      return;
+    }
+
+    DtoBeanDescriptor<?> dtoBeanDescriptor = getDescriptor(dtoClass);
+    if (dtoBeanDescriptor == null) {
+      logger.error("No dto bean for ebean xml entry " + dtoClass);
+
+    } else {
+      for (XmRawSql sql : dto.getRawSql()) {
+        RawSqlBuilder builder = RawSqlBuilder.parse(sql.getQuery().getValue());
+        for (XmColumnMapping columnMapping : sql.getColumnMapping()) {
+          builder.columnMapping(columnMapping.getColumn(), columnMapping.getProperty());
+        }
+        for (XmAliasMapping aliasMapping : sql.getAliasMapping()) {
+          builder.tableAliasMapping(aliasMapping.getAlias(), aliasMapping.getProperty());
+        }
+        dtoBeanDescriptor.addRawSql(sql.getName(), (SpiRawSql)builder.create());
+      }
+
+      for (XmNamedQuery namedQuery : dto.getNamedQuery()) {
+        dtoBeanDescriptor.addNamedQuery(namedQuery.getName(), namedQuery.getQuery().getValue());
+      }
+    }
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java b/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java
index e9e598e42..3e267349b 100644
--- a/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java
+++ b/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java
@@ -1,11 +1,17 @@
 package io.ebeaninternal.xmlmapping;
 
 import io.ebeaninternal.xmlmapping.model.XmEbean;
-
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
-import java.io.InputStream;
+import org.avaje.classpath.scanner.Resource;
 
 public class XmlMappingReader {
 
@@ -24,4 +30,34 @@ public class XmlMappingReader {
       throw new RuntimeException(e);
     }
   }
+
+  public static List<XmEbean> readByResourceName(ClassLoader classLoader, String resourceName){
+    try {
+      Enumeration<URL> resources = classLoader.getResources(resourceName);
+      List<XmEbean> mappings = new ArrayList<>();
+      while (resources.hasMoreElements()) {
+        URL url = resources.nextElement();
+        try (InputStream is = url.openStream()) {
+          mappings.add(XmlMappingReader.read(is));
+        }
+      }
+      return mappings;
+    } catch (IOException e) {
+      throw new RuntimeException("Error reading ebean xml mapping", e);
+    }
+  }
+
+  public static List<XmEbean> readByResourceList(ClassLoader classLoader, List<Resource> resourceList){
+    try {
+      List<XmEbean> mappings = new ArrayList<>();
+      for (Resource xmlMappingRes : resourceList) {
+        try (InputStream is = new FileInputStream(xmlMappingRes.getLocationOnDisk())) {
+          mappings.add(XmlMappingReader.read(is));
+        }
+      }
+      return mappings;
+    } catch (IOException e) {
+      throw new RuntimeException("Error reading ebean xml mapping", e);
+    }
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/xmlmapping/model/XmDto.java b/src/main/java/io/ebeaninternal/xmlmapping/model/XmDto.java
new file mode 100644
index 000000000..cb64fbfa6
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/xmlmapping/model/XmDto.java
@@ -0,0 +1,121 @@
+package io.ebeaninternal.xmlmapping.model;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * <p>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://ebean-orm.github.io/xml/ns/ebean}named-query" maxOccurs="unbounded"/>
+ *         &lt;element ref="{http://ebean-orm.github.io/xml/ns/ebean}raw-sql" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="class" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+  "namedQuery",
+  "rawSql"
+})
+@XmlRootElement(name = "dto")
+public class XmDto {
+
+  @XmlElement(name = "named-query", required = true)
+  protected List<XmNamedQuery> namedQuery;
+  @XmlElement(name = "raw-sql", required = true)
+  protected List<XmRawSql> rawSql;
+  @XmlAttribute(name = "class", required = true)
+  protected String clazz;
+
+  /**
+   * Gets the value of the namedQuery property.
+   * <p>
+   * <p>
+   * This accessor method returns a reference to the live list,
+   * not a snapshot. Therefore any modification you make to the
+   * returned list will be present inside the JAXB object.
+   * This is why there is not a <CODE>set</CODE> method for the namedQuery property.
+   * <p>
+   * <p>
+   * For example, to add a new item, do as follows:
+   * <pre>
+   *    getNamedQuery().add(newItem);
+   * </pre>
+   * <p>
+   * <p>
+   * <p>
+   * Objects of the following type(s) are allowed in the list
+   * {@link XmNamedQuery }
+   */
+  public List<XmNamedQuery> getNamedQuery() {
+    if (namedQuery == null) {
+      namedQuery = new ArrayList<>();
+    }
+    return this.namedQuery;
+  }
+
+  /**
+   * Gets the value of the rawSql property.
+   * <p>
+   * <p>
+   * This accessor method returns a reference to the live list,
+   * not a snapshot. Therefore any modification you make to the
+   * returned list will be present inside the JAXB object.
+   * This is why there is not a <CODE>set</CODE> method for the rawSql property.
+   * <p>
+   * <p>
+   * For example, to add a new item, do as follows:
+   * <pre>
+   *    getRawSql().add(newItem);
+   * </pre>
+   * <p>
+   * <p>
+   * <p>
+   * Objects of the following type(s) are allowed in the list
+   * {@link XmRawSql }
+   */
+  public List<XmRawSql> getRawSql() {
+    if (rawSql == null) {
+      rawSql = new ArrayList<>();
+    }
+    return this.rawSql;
+  }
+
+  /**
+   * Gets the value of the clazz property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getClazz() {
+    return clazz;
+  }
+
+  /**
+   * Sets the value of the clazz property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setClazz(String value) {
+    this.clazz = value;
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/xmlmapping/model/XmEbean.java b/src/main/java/io/ebeaninternal/xmlmapping/model/XmEbean.java
index d1bc12236..4979fc865 100644
--- a/src/main/java/io/ebeaninternal/xmlmapping/model/XmEbean.java
+++ b/src/main/java/io/ebeaninternal/xmlmapping/model/XmEbean.java
@@ -1,12 +1,12 @@
 package io.ebeaninternal.xmlmapping.model;
 
+import java.util.ArrayList;
+import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import java.util.ArrayList;
-import java.util.List;
 
 
 /**
@@ -28,14 +28,18 @@ import java.util.List;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-  "entity"
+  "entity",
+  "dto"
 })
 @XmlRootElement(name = "ebean")
 public class XmEbean {
 
-  @XmlElement(required = true)
+  @XmlElement(required = false)
   protected List<XmEntity> entity;
 
+  @XmlElement(required = false)
+  protected List<XmDto> dto;
+
   /**
    * Gets the value of the entity property.
    * <p>
@@ -63,4 +67,11 @@ public class XmEbean {
     return this.entity;
   }
 
+  public List<XmDto> getDto() {
+    if (dto == null) {
+      dto = new ArrayList<>();
+    }
+    return this.dto;
+  }
+
 }
diff --git a/src/main/resources/ebean-1.0.xsd b/src/main/resources/ebean-1.0.xsd
index c830f851f..4a79daecb 100644
--- a/src/main/resources/ebean-1.0.xsd
+++ b/src/main/resources/ebean-1.0.xsd
@@ -8,6 +8,7 @@
     <xsd:complexType>
       <xsd:sequence>
         <xsd:element ref="entity" minOccurs="1" maxOccurs="unbounded"/>
+        <xsd:element ref="dto" minOccurs="1" maxOccurs="unbounded"/>
       </xsd:sequence>
     </xsd:complexType>
   </xsd:element>
@@ -22,6 +23,16 @@
     </xsd:complexType>
   </xsd:element>
 
+  <xsd:element name="dto">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element ref="named-query" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element ref="raw-sql" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:attribute name="class" type="xsd:string" use="required"/>
+    </xsd:complexType>
+  </xsd:element>
+
   <xsd:element name="named-query">
     <xsd:complexType>
       <xsd:sequence>
diff --git a/src/test/java/io/ebean/NamedDtoQueryTest.java b/src/test/java/io/ebean/NamedDtoQueryTest.java
new file mode 100644
index 000000000..ec3b810e4
--- /dev/null
+++ b/src/test/java/io/ebean/NamedDtoQueryTest.java
@@ -0,0 +1,335 @@
+package io.ebean;
+
+import io.ebean.meta.BasicMetricVisitor;
+import io.ebean.meta.MetaQueryMetric;
+import java.util.List;
+import java.util.Optional;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.tests.model.basic.ResetBasicData;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class NamedDtoQueryTest extends BaseTestCase {
+
+  private static final Logger log = LoggerFactory.getLogger(NamedDtoQueryTest.class);
+
+  @Test
+  public void dto_findList_constructorMatch() {
+
+    ResetBasicData.reset();
+
+    DtoQuery<DCust> dtoQuery = server().createNamedDtoQuery(DCust.class, "findList");
+
+    List<DCust> list = dtoQuery.findList();
+
+    log.info(list.toString());
+    assertThat(list).isNotEmpty();
+  }
+
+  @Test
+  public void dto_findEach_constructorMatch() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+    server().createNamedDtoQuery(DCust.class, "findGtId")
+      .setParameter("id", 0)
+      .findEach(it -> log.info("got " + it.getId() + " " + it.getName()));
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select id, name from o_customer where id > ?");
+  }
+
+  @Test
+  public void dto_findEachWhile_constructorMatch() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+    server().createNamedDtoQuery(DCust.class, "findGtIdDesc")
+      .setParameter("id", 0)
+      .findEachWhile(customer -> {
+        log.info("got " + customer.getId() + " " + customer.getName());
+        return customer.getId() > 3;
+      });
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select id, name from o_customer where id > ?");
+  }
+
+  @Test
+  public void dto_findOneEmpty() {
+
+    ResetBasicData.reset();
+
+    Optional<DCust> rob = server().createNamedDtoQuery(DCust.class, "findByName")
+      .setParameter("name", "Fiona")
+      .findOneOrEmpty();
+
+    assertThat(rob.isPresent()).isTrue();
+
+    Optional<DCust> oneOrEmpty = server().createNamedDtoQuery(DCust.class, "findByName")
+      .setParameter("name", "DoesNotExistMyFriend")
+      .findOneOrEmpty();
+
+    assertThat(oneOrEmpty.isPresent()).isFalse();
+  }
+
+  @Test
+  public void dto_findOne() {
+
+    ResetBasicData.reset();
+
+    DCust fiona = server().createNamedDtoQuery(DCust.class, "findByName")
+      .setParameter("name", "Fiona")
+      .findOne();
+
+    assertThat(fiona.getName()).isEqualTo("Fiona");
+
+    DCust empty = server().createNamedDtoQuery(DCust.class, "findByName")
+      .setParameter("name", "DoesNotExistMyFriend")
+      .findOne();
+
+    assertThat(empty).isNull();
+  }
+
+
+  @Test
+  public void dto_queryPlanHits() {
+
+    ResetBasicData.reset();
+
+    resetAllMetrics();
+
+    String[] names = {"Rob", "Fiona", "Shrek"};
+
+    for (String name : names) {
+
+      List<DCust> custs = server().createNamedDtoQuery(DCust.class, "findByName_c3")
+        .setLabel("basic")
+        .setParameter("name", name)
+        .findList();
+
+      log.info("Found " + custs);
+    }
+
+    // collect without reset
+    BasicMetricVisitor basic = new BasicMetricVisitor(false, true, true);
+    server().getMetaInfoManager().visitMetrics(basic);
+
+    List<MetaQueryMetric> stats = basic.getDtoQueryMetrics();
+    assertThat(stats).hasSize(1);
+
+    MetaQueryMetric queryMetric = stats.get(0);
+    assertThat(queryMetric.getLabel()).isEqualTo("basic");
+    assertThat(queryMetric.getCount()).isEqualTo(3);
+    assertThat(queryMetric.getName()).isEqualTo("basic");
+
+
+    server().createNamedDtoQuery(DCust.class, "findByName_c4")
+      .setLabel("basic2")
+      .setParameter("name", "rob")
+      .findList();
+
+    BasicMetricVisitor metric2 = server().getMetaInfoManager().visitBasic();
+
+    stats = metric2.getDtoQueryMetrics();
+    assertThat(stats).hasSize(2);
+
+    log.info("stats " + stats);
+
+  }
+
+  @Test
+  public void dto_findList_relaxedMode() {
+
+    ResetBasicData.reset();
+
+    List<DCust3> list = server().createNamedDtoQuery(DCust3.class, "findByName_relaxedMode")
+      .setRelaxedMode()
+      .findList();
+
+    log.info(list.toString());
+    assertThat(list).isNotEmpty();
+  }
+
+  @Test
+  public void dto_findList_relaxedMode_defaultConstructor() {
+
+    ResetBasicData.reset();
+
+    List<DCust2> list = server().createNamedDtoQuery(DCust2.class, "findByName_relaxedMode")
+      .setRelaxedMode()
+      .findList();
+
+    log.info(list.toString());
+    assertThat(list).isNotEmpty();
+  }
+
+  @Test
+  public void dto_findList_constructorPlusMatch() {
+
+    ResetBasicData.reset();
+
+    List<DCust> dtos = server().createNamedDtoQuery(DCust.class, "findListByName")
+      .setParameter("name", "Rob")
+      .findList();
+
+    log.info(dtos.toString());
+    assertThat(dtos).isNotEmpty();
+  }
+
+  @Test
+  public void dto_findList_setters() {
+
+    ResetBasicData.reset();
+
+    DtoQuery<DCust2> dtoQuery = server().createNamedDtoQuery(DCust2.class, "findList");
+
+    List<DCust2> list = dtoQuery.findList();
+
+    assertThat(list).isNotEmpty();
+  }
+
+  @Test
+  public void dto3_findList_constructorMatch() {
+
+    ResetBasicData.reset();
+
+    List<DCust3> robs = server().createNamedDtoQuery(DCust3.class, "findByNameLike")
+      .setParameter(1, "Rob")
+      .setMaxRows(10)
+      .findList();
+
+
+    log.info(robs.toString());
+    assertThat(robs).isNotEmpty();
+  }
+
+  @Test
+  public void dto3_findList_settersMatch() {
+
+    ResetBasicData.reset();
+
+    List<DCust3> robs = server().createNamedDtoQuery(DCust3.class, "findByName")
+      .setParameter("name", "Rob")
+      .findList();
+
+
+    log.info(robs.toString());
+    assertThat(robs).isNotEmpty();
+  }
+
+  public static class DCust {
+
+    final Integer id;
+
+    final String name;
+
+    int totalOrders;
+
+    public DCust(Integer id, String name) {
+      this.id = id;
+      this.name = name;
+    }
+
+    @Override
+    public String toString() {
+      return "id:" + id + " name:" + name + " totalOrders:" + totalOrders;
+    }
+
+    public Integer getId() {
+      return id;
+    }
+
+    public String getName() {
+      return name;
+    }
+
+    public int getTotalOrders() {
+      return totalOrders;
+    }
+
+    public void setTotalOrders(int totalOrders) {
+      this.totalOrders = totalOrders;
+    }
+  }
+
+  public static class DCust2 {
+
+    Integer id;
+
+    String name;
+
+    @Override
+    public String toString() {
+      return "id:" + id + " name:" + name;
+    }
+
+    public Integer getId() {
+      return id;
+    }
+
+    public void setId(Integer id) {
+      this.id = id;
+    }
+
+    public String getName() {
+      return name;
+    }
+
+    public void setName(String name) {
+      this.name = name;
+    }
+  }
+
+  public static class DCust3 {
+
+    Integer id;
+
+    String name;
+
+    int totalOrders;
+
+    public DCust3() {
+    }
+
+    public DCust3(Integer id, String name, int totalOrders) {
+      this.id = id;
+      this.name = name;
+      this.totalOrders = totalOrders;
+    }
+
+    @Override
+    public String toString() {
+      return "id:" + id + " name:" + name + " totalOrders:" + totalOrders;
+    }
+
+    public Integer getId() {
+      return id;
+    }
+
+    public String getName() {
+      return name;
+    }
+
+    public int getTotalOrders() {
+      return totalOrders;
+    }
+
+    public void setTotalOrders(int totalOrders) {
+      this.totalOrders = totalOrders;
+    }
+
+    public void setId(Integer id) {
+      this.id = id;
+    }
+
+    public void setName(String name) {
+      this.name = name;
+    }
+  }
+}
diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index 5755f6ed5..5f538f9d5 100644
--- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -48,9 +48,6 @@ import io.ebeaninternal.server.core.timezone.DataTimeZone;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.query.CQuery;
 import io.ebeaninternal.server.transaction.RemoteTransactionEvent;
-
-import javax.persistence.OptimisticLockException;
-import javax.persistence.PersistenceException;
 import java.lang.reflect.Type;
 import java.util.Collection;
 import java.util.Collections;
@@ -61,6 +58,8 @@ import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+import javax.persistence.OptimisticLockException;
+import javax.persistence.PersistenceException;
 
 
 /**
@@ -432,6 +431,11 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
     return null;
   }
 
+  @Override
+  public <T> DtoQuery<T> createNamedDtoQuery(Class<T> dtoType, String namedQuery) {
+    return null;
+  }
+
   @Override
   public <D> DtoQuery<D> findDto(Class<D> dtoType, SpiQuery<?> ormQuery) {
     return null;
diff --git a/src/test/resources/ebean-xml-mappings/DCustMapping.xml b/src/test/resources/ebean-xml-mappings/DCustMapping.xml
new file mode 100644
index 000000000..c104f4cd5
--- /dev/null
+++ b/src/test/resources/ebean-xml-mappings/DCustMapping.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ebean xmlns="http://ebean-orm.github.io/xml/ns/ebean">
+
+  <dto class="io.ebean.NamedDtoQueryTest$DCust">
+    <raw-sql name="findList">
+      <query>
+        select id, name from o_customer
+      </query>
+    </raw-sql>
+    <raw-sql name="findGtId">
+      <query>
+        select id, name from o_customer where id > :id
+      </query>
+    </raw-sql>
+    <raw-sql name="findGtIdDesc">
+      <query>
+        select id, name from o_customer where id > :id order by id desc
+      </query>
+    </raw-sql>
+    <raw-sql name="findByName">
+      <query>
+        select id, name from o_customer where name = :name
+      </query>
+    </raw-sql>
+    <raw-sql name="findByName_c3">
+      <query>
+        select c3.id, c3.name from o_customer c3 where c3.name = :name
+      </query>
+    </raw-sql>
+    <raw-sql name="findByName_c4">
+      <query>
+        select c4.id, c4.name from o_customer c4 where lower(c4.name) = :name
+      </query>
+    </raw-sql>
+    <raw-sql name="findListByName">
+      <query>
+        select c.id, c.name, count(o.id) as totalOrders
+        from o_customer c
+        join o_order o on o.kcustomer_id = c.id
+        where c.name like :name
+        group by c.id, c.name
+      </query>
+    </raw-sql>
+  </dto>
+
+  <dto class="io.ebean.NamedDtoQueryTest$DCust2">
+    <raw-sql name="findByName_relaxedMode">
+      <query>
+        select id, '42' as something_we_cannot_map, name from o_customer
+      </query>
+    </raw-sql>
+    <raw-sql name="findList">
+      <query>
+        select id, name from o_customer
+      </query>
+    </raw-sql>
+  </dto>
+
+  <dto class="io.ebean.NamedDtoQueryTest$DCust3">
+    <raw-sql name="findByName_relaxedMode">
+      <query>
+        select id, name, 42 as total, '42' as something_we_cannot_map from o_customer
+      </query>
+    </raw-sql>
+    <raw-sql name="findByNameLike">
+      <query>
+        select id, name, 42 as totalOrders from o_customer where name like ?
+      </query>
+    </raw-sql>
+    <raw-sql name="findByName">
+      <query>
+        select id, name from o_customer where name = :name
+      </query>
+    </raw-sql>
+  </dto>
+
+</ebean>

From 012322503f05adf86ee9a20d432a925d2bb7ddd3 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 20 Mar 2018 09:03:16 +1300
Subject: [PATCH 0192/1036] #115 - Supporting changes for Element collection
 support

---
 .../ebean/common/AbstractBeanCollection.java  |  8 ----
 .../config/UnderscoreNamingConvention.java    | 34 +-------------
 .../java/io/ebean/util/CamelCaseHelper.java   | 46 +++++++++++++++++++
 3 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/src/main/java/io/ebean/common/AbstractBeanCollection.java b/src/main/java/io/ebean/common/AbstractBeanCollection.java
index 866d8d0c0..e4641814a 100644
--- a/src/main/java/io/ebean/common/AbstractBeanCollection.java
+++ b/src/main/java/io/ebean/common/AbstractBeanCollection.java
@@ -6,7 +6,6 @@ import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanCollectionLoader;
 import io.ebean.bean.EntityBean;
 
-import javax.persistence.PersistenceException;
 import java.util.Set;
 
 /**
@@ -96,13 +95,6 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
     if (loader == null) {
       loader = (BeanCollectionLoader) Ebean.getServer(ebeanServerName);
     }
-    if (loader == null) {
-      String msg = "Lazy loading but LazyLoadEbeanServer is null?"
-        + " The LazyLoadEbeanServer needs to be set after deserialization"
-        + " to support lazy loading.";
-      throw new PersistenceException(msg);
-    }
-
     loader.loadMany(this, onlyIds);
     checkEmptyLazyLoad();
   }
diff --git a/src/main/java/io/ebean/config/UnderscoreNamingConvention.java b/src/main/java/io/ebean/config/UnderscoreNamingConvention.java
index 8fffed5fb..16b685227 100644
--- a/src/main/java/io/ebean/config/UnderscoreNamingConvention.java
+++ b/src/main/java/io/ebean/config/UnderscoreNamingConvention.java
@@ -112,39 +112,7 @@ public class UnderscoreNamingConvention extends AbstractNamingConvention {
    * Convert and return the string to underscore from camel case.
    */
   protected String toUnderscoreFromCamel(String camelCase) {
-
-    int lastUpper = -1;
-    StringBuilder sb = new StringBuilder(camelCase.length() + 4);
-    for (int i = 0; i < camelCase.length(); i++) {
-      char c = camelCase.charAt(i);
-
-      if ('_' == c) {
-        // Underscores should just be passed through
-        sb.append(c);
-        lastUpper = i;
-      } else if (Character.isDigit(c)) {
-        if (i > lastUpper + 1 && !digitsCompressed) {
-          sb.append("_");
-        }
-        sb.append(c);
-        lastUpper = i;
-
-      } else if (Character.isUpperCase(c)) {
-        if (i > lastUpper + 1) {
-          sb.append("_");
-        }
-        sb.append(Character.toLowerCase(c));
-        lastUpper = i;
-
-      } else {
-        sb.append(c);
-      }
-    }
-    String ret = sb.toString();
-    if (forceUpperCase) {
-      ret = ret.toUpperCase();
-    }
-    return ret;
+    return CamelCaseHelper.toUnderscoreFromCamel(camelCase, digitsCompressed, forceUpperCase);
   }
 
   /**
diff --git a/src/main/java/io/ebean/util/CamelCaseHelper.java b/src/main/java/io/ebean/util/CamelCaseHelper.java
index 9ef24656a..d3573309e 100644
--- a/src/main/java/io/ebean/util/CamelCaseHelper.java
+++ b/src/main/java/io/ebean/util/CamelCaseHelper.java
@@ -2,6 +2,52 @@ package io.ebean.util;
 
 public class CamelCaseHelper {
 
+  /**
+   * To underscore from camel case using digits compressed true and force upper case false.
+   */
+  public static String toUnderscoreFromCamel(String camelCase) {
+    return toUnderscoreFromCamel(camelCase, true, false);
+  }
+
+  /**
+   * Convert and return the string to underscore from camel case.
+   */
+  public static String toUnderscoreFromCamel(String camelCase, boolean digitsCompressed, boolean forceUpperCase) {
+
+    int lastUpper = -1;
+    StringBuilder sb = new StringBuilder(camelCase.length() + 4);
+    for (int i = 0; i < camelCase.length(); i++) {
+      char c = camelCase.charAt(i);
+
+      if ('_' == c) {
+        // Underscores should just be passed through
+        sb.append(c);
+        lastUpper = i;
+      } else if (Character.isDigit(c)) {
+        if (i > lastUpper + 1 && !digitsCompressed) {
+          sb.append("_");
+        }
+        sb.append(c);
+        lastUpper = i;
+
+      } else if (Character.isUpperCase(c)) {
+        if (i > lastUpper + 1) {
+          sb.append("_");
+        }
+        sb.append(Character.toLowerCase(c));
+        lastUpper = i;
+
+      } else {
+        sb.append(c);
+      }
+    }
+    String ret = sb.toString();
+    if (forceUpperCase) {
+      ret = ret.toUpperCase();
+    }
+    return ret;
+  }
+
   /**
    * To camel from underscore.
    *

From c44931ea25fadd6762da81943bef880a5914e967 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 20 Mar 2018 09:04:58 +1300
Subject: [PATCH 0193/1036] #115 - Supporting changes for Element collection
 support

---
 .../model/visitor/VisitAllUsing.java          | 56 ++++++++++++-------
 1 file changed, 36 insertions(+), 20 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java b/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java
index e0d13ec04..2ce73123a 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java
@@ -16,6 +16,14 @@ import java.util.List;
  */
 public class VisitAllUsing {
 
+  /**
+   * Visit a single Descriptor using the given visitor.
+   */
+  public static void visitOne(BeanDescriptor<?> descriptor, BeanPropertyVisitor visitor) {
+
+    new VisitAllUsing().visitProperties(descriptor, visitor);
+  }
+
   protected final BeanVisitor visitor;
 
   protected final List<BeanDescriptor<?>> descriptors;
@@ -36,6 +44,11 @@ public class VisitAllUsing {
     this.descriptors = descriptors;
   }
 
+  private VisitAllUsing() {
+    this.visitor = null;
+    this.descriptors = null;
+  }
+
   public void visitAllBeans() {
     for (BeanDescriptor<?> desc : descriptors) {
       if (desc.isBaseTable()) {
@@ -51,29 +64,32 @@ public class VisitAllUsing {
 
     BeanPropertyVisitor propertyVisitor = visitor.visitBean(desc);
     if (propertyVisitor != null) {
-
-      BeanProperty idProp = desc.getIdProperty();
-      if (idProp != null) {
-        visit(propertyVisitor, idProp);
-      }
-
-      BeanPropertyAssocOne<?> unidirectional = desc.getUnidirectional();
-      if (unidirectional != null) {
-        visit(propertyVisitor, unidirectional);
-      }
-
-      BeanProperty[] propertiesNonTransient = desc.propertiesNonTransient();
-      for (BeanProperty p : propertiesNonTransient) {
-        if (p.isDDLColumn()) {
-          visit(propertyVisitor, p);
-        }
-      }
-
-      visitInheritanceProperties(desc, propertyVisitor);
-      propertyVisitor.visitEnd();
+      visitProperties(desc, propertyVisitor);
     }
   }
 
+  private void visitProperties(BeanDescriptor<?> desc, BeanPropertyVisitor propertyVisitor) {
+    BeanProperty idProp = desc.getIdProperty();
+    if (idProp != null) {
+      visit(propertyVisitor, idProp);
+    }
+
+    BeanPropertyAssocOne<?> unidirectional = desc.getUnidirectional();
+    if (unidirectional != null) {
+      visit(propertyVisitor, unidirectional);
+    }
+
+    BeanProperty[] propertiesNonTransient = desc.propertiesNonTransient();
+    for (BeanProperty p : propertiesNonTransient) {
+      if (p.isDDLColumn()) {
+        visit(propertyVisitor, p);
+      }
+    }
+
+    visitInheritanceProperties(desc, propertyVisitor);
+    propertyVisitor.visitEnd();
+  }
+
   /**
    * Visit the property.
    */

From 74a9019535d0f0355babaac15fb42f7dfc810745 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 20 Mar 2018 14:22:29 +1300
Subject: [PATCH 0194/1036] #115 - Mapping - Add support for @ElementCollection
 enhancement

Initial support - simple List.
---
 .../io/ebeaninternal/api/LoadManyRequest.java |   5 +-
 .../model/build/ModelBuildContext.java        |  50 ++++
 .../model/build/ModelBuildElementTable.java   |  34 +++
 .../build/ModelBuildIntersectionTable.java    |  33 +--
 .../build/ModelBuildPropertyVisitor.java      |  33 +--
 .../service/ProfileOriginNodeUsage.java       |   4 +-
 .../server/core/OrmQueryRequest.java          |  15 +-
 .../server/deploy/BaseCollectionHelp.java     |  50 ++++
 .../server/deploy/BeanCollectionHelp.java     |   3 +-
 .../deploy/BeanCollectionHelpFactory.java     |   8 +-
 .../server/deploy/BeanDescriptor.java         | 137 +++++++---
 .../server/deploy/BeanDescriptorElement.java  |  24 ++
 .../deploy/BeanDescriptorInitContext.java     |  32 +++
 .../server/deploy/BeanDescriptorManager.java  |  80 ++++--
 .../server/deploy/BeanListHelp.java           |  47 +---
 .../server/deploy/BeanListHelpElement.java    |  37 +++
 .../server/deploy/BeanMapHelp.java            |  11 +-
 .../server/deploy/BeanProperty.java           |  32 ++-
 .../server/deploy/BeanPropertyAssoc.java      |  73 ++++-
 .../server/deploy/BeanPropertyAssocMany.java  | 251 ++++-------------
 .../deploy/BeanPropertyAssocManyJsonHelp.java |   4 +-
 .../BeanPropertyAssocManyJsonTransient.java   |   4 +-
 .../deploy/BeanPropertyAssocManySqlHelp.java  | 258 ++++++++++++++++++
 .../server/deploy/BeanPropertyAssocOne.java   |  36 +--
 .../deploy/BeanPropertySimpleCollection.java  |  19 ++
 .../server/deploy/BeanSetHelp.java            |  41 +--
 .../server/deploy/BeanTable.java              |  10 +
 .../server/deploy/DbReadContext.java          |   3 +-
 .../server/deploy/DynamicPropertyBase.java    |  16 +-
 .../server/deploy/ElementEntityBean.java      |  81 ++++++
 .../server/deploy/FormulaPropertyPath.java    |   4 +-
 .../server/deploy/InheritInfo.java            |   2 +-
 .../server/deploy/id/IdBinder.java            |   3 +-
 .../meta/BeanPropertyElementSetter.java       |  26 ++
 .../deploy/meta/DeployBeanProperty.java       |  14 +-
 .../meta/DeployBeanPropertyAssocMany.java     |  27 ++
 .../meta/DeployBeanPropertyAssocOne.java      |   9 +
 .../deploy/parse/AnnotationAssocManys.java    |  85 +++++-
 .../deploy/parse/AnnotationAssocOnes.java     |   6 +-
 .../server/deploy/parse/AnnotationClass.java  |  20 +-
 .../server/deploy/parse/AnnotationFields.java |  13 +-
 .../server/deploy/parse/AnnotationParser.java |   7 +-
 .../server/deploy/parse/AnnotationSql.java    |   6 +-
 .../server/deploy/parse/DeployBeanInfo.java   |  10 -
 .../deploy/parse/ReadAnnotationConfig.java    |  58 ++++
 .../server/deploy/parse/ReadAnnotations.java  |  51 +---
 .../deploy/parse/TransientProperties.java     |  25 +-
 .../server/loadcontext/DLoadContext.java      |   2 +-
 .../server/loadcontext/DLoadManyContext.java  |   2 +-
 .../server/persist/DefaultPersister.java      |  24 +-
 .../server/persist/SaveManyPropRequest.java   |  14 +-
 .../persist/SaveManySimpleCollection.java     |  39 +++
 .../io/ebeaninternal/server/query/CQuery.java |  60 ++--
 .../server/query/CQueryBuilder.java           |  10 +-
 .../server/query/CQueryCollectionAdd.java     |  21 ++
 .../server/query/CQueryCollectionAddNoop.java |  27 ++
 .../server/query/CQueryPlan.java              |   8 +-
 .../server/query/CQueryPredicates.java        |   2 +-
 .../ebeaninternal/server/query/ExtraJoin.java |  20 ++
 ...qlTreeProperty.java => STreeProperty.java} |  14 +-
 .../server/query/STreePropertyAssoc.java      |  39 +++
 .../server/query/STreePropertyAssocMany.java  |  45 +++
 .../server/query/STreePropertyAssocOne.java   |  16 ++
 .../ebeaninternal/server/query/STreeType.java | 136 +++++++++
 .../ebeaninternal/server/query/SqlTree.java   |  12 +-
 .../server/query/SqlTreeAlias.java            |  16 +-
 .../server/query/SqlTreeBuilder.java          | 102 +++----
 .../server/query/SqlTreeNodeBean.java         |  83 +++---
 .../server/query/SqlTreeNodeExtraJoin.java    |  19 +-
 .../server/query/SqlTreeNodeManyRoot.java     |   5 +-
 .../query/SqlTreeNodeManyWhereJoin.java       |  19 +-
 .../server/query/SqlTreeNodeRoot.java         |   6 +-
 .../server/query/SqlTreeProperties.java       |  12 +-
 .../server/querydefn/OrmQueryDetail.java      |   4 +-
 .../docstore/api/support/DocStructure.java    |   2 +-
 .../deploy/FormulaPropertyPathTest.java       |   4 +-
 .../org/tests/basic/TestAnnotationBase.java   |  16 +-
 .../model/elementcollection/EcPerson.java     |  69 +++++
 .../TestElementCollectionBasic.java           |  51 ++++
 79 files changed, 1891 insertions(+), 805 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildElementTable.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorInitContext.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/BeanListHelpElement.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/ElementEntityBean.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/meta/BeanPropertyElementSetter.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java
 create mode 100644 src/main/java/io/ebeaninternal/server/persist/SaveManySimpleCollection.java
 create mode 100644 src/main/java/io/ebeaninternal/server/query/CQueryCollectionAdd.java
 create mode 100644 src/main/java/io/ebeaninternal/server/query/CQueryCollectionAddNoop.java
 create mode 100644 src/main/java/io/ebeaninternal/server/query/ExtraJoin.java
 rename src/main/java/io/ebeaninternal/server/query/{SqlTreeProperty.java => STreeProperty.java} (85%)
 create mode 100644 src/main/java/io/ebeaninternal/server/query/STreePropertyAssoc.java
 create mode 100644 src/main/java/io/ebeaninternal/server/query/STreePropertyAssocMany.java
 create mode 100644 src/main/java/io/ebeaninternal/server/query/STreePropertyAssocOne.java
 create mode 100644 src/main/java/io/ebeaninternal/server/query/STreeType.java
 create mode 100644 src/test/java/org/tests/model/elementcollection/EcPerson.java
 create mode 100644 src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java

diff --git a/src/main/java/io/ebeaninternal/api/LoadManyRequest.java b/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
index d92ce3222..1b28ed2c3 100644
--- a/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
+++ b/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.api;
 
-import io.ebean.EbeanServer;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebean.util.StringHelper;
@@ -124,11 +123,11 @@ public class LoadManyRequest extends LoadRequest {
     return loadContext.getBeanProperty();
   }
 
-  public SpiQuery<?> createQuery(EbeanServer server, int batchSize) {
+  public SpiQuery<?> createQuery(SpiEbeanServer server, int batchSize) {
 
     BeanPropertyAssocMany<?> many = getMany();
 
-    SpiQuery<?> query = (SpiQuery<?>) server.createQuery(many.getTargetType());
+    SpiQuery<?> query = many.newQuery(server);
     String orderBy = many.getLazyFetchOrderBy();
     if (orderBy != null) {
       query.orderBy(orderBy);
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java
index c897617a9..9fc213faa 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java
@@ -4,13 +4,18 @@ import io.ebean.config.DbConstraintNaming;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.DbPlatformTypeMapping;
 import io.ebeaninternal.dbmigration.model.MColumn;
+import io.ebeaninternal.dbmigration.model.MCompoundForeignKey;
 import io.ebeaninternal.dbmigration.model.MTable;
 import io.ebeaninternal.dbmigration.model.ModelContainer;
+import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanProperty;
+import io.ebeaninternal.server.deploy.TableJoin;
+import io.ebeaninternal.server.deploy.TableJoinColumn;
 import io.ebeaninternal.server.type.ScalarType;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * The context used during DDL generation.
@@ -187,4 +192,49 @@ public class ModelBuildContext {
     addTable(draftTable);
   }
 
+  /**
+   * Return a builder to add foreign keys.
+   */
+  public FkeyBuilder fkeyBuilder(MTable destTable) {
+    return new FkeyBuilder(this, destTable);
+  }
+
+  public static class FkeyBuilder {
+
+    private final AtomicInteger count = new AtomicInteger();
+
+    private final ModelBuildContext ctx;
+
+    private final MTable destTable;
+
+    private final String tableName;
+
+    FkeyBuilder(ModelBuildContext ctx, MTable destTable) {
+      this.ctx = ctx;
+      this.destTable = destTable;
+      this.tableName = destTable.getName();
+    }
+
+    /**
+     * Add a foreign key based on the table join.
+     */
+    public FkeyBuilder addForeignKey(BeanDescriptor<?> desc, TableJoin tableJoin, boolean direction) {
+
+      String baseTable = ctx.normaliseTable(desc.getBaseTable());
+      String fkName = ctx.foreignKeyConstraintName(tableName, baseTable, count.incrementAndGet());
+      String fkIndex = ctx.foreignKeyIndexName(tableName, baseTable, count.get());
+
+      MCompoundForeignKey foreignKey = new MCompoundForeignKey(fkName, desc.getBaseTable(), fkIndex);
+
+      for (TableJoinColumn column : tableJoin.columns()) {
+        String localCol = direction ? column.getForeignDbColumn() : column.getLocalDbColumn();
+        String refCol = !direction ? column.getForeignDbColumn() : column.getLocalDbColumn();
+        foreignKey.addColumnPair(localCol, refCol);
+      }
+
+      destTable.addForeignKey(foreignKey);
+      return this;
+    }
+
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildElementTable.java b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildElementTable.java
new file mode 100644
index 000000000..94a2526a8
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildElementTable.java
@@ -0,0 +1,34 @@
+package io.ebeaninternal.dbmigration.model.build;
+
+import io.ebeaninternal.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.model.visitor.VisitAllUsing;
+import io.ebeaninternal.server.deploy.BeanDescriptor;
+import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
+import io.ebeaninternal.server.deploy.BeanTable;
+
+/**
+ * Add the element collection table to the model.
+ */
+public class ModelBuildElementTable {
+
+  /**
+   * Build and add the MTable model for the ElementCollection property.
+   */
+  public static void build(ModelBuildContext ctx, BeanPropertyAssocMany<?> manyProp) {
+
+    BeanTable beanTable = manyProp.getBeanTable();
+
+    BeanDescriptor<?> targetDescriptor = manyProp.getTargetDescriptor();
+
+    MTable table = new MTable(beanTable.getBaseTable());
+
+    VisitAllUsing.visitOne(targetDescriptor, new ModelBuildPropertyVisitor(ctx, table, targetDescriptor));
+
+    ctx.fkeyBuilder(table)
+      .addForeignKey(manyProp.getBeanDescriptor(), manyProp.getTableJoin(), true);
+
+    ctx.addTable(table);
+  }
+
+
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java
index 9bf4d50c0..6772e57d6 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java
@@ -1,7 +1,6 @@
 package io.ebeaninternal.dbmigration.model.build;
 
 import io.ebeaninternal.dbmigration.model.MColumn;
-import io.ebeaninternal.dbmigration.model.MCompoundForeignKey;
 import io.ebeaninternal.dbmigration.model.MTable;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanProperty;
@@ -12,7 +11,7 @@ import io.ebeaninternal.server.deploy.TableJoinColumn;
 /**
  * Add the intersection table to the model.
  */
-public class ModelBuildIntersectionTable {
+class ModelBuildIntersectionTable {
 
   private final ModelBuildContext ctx;
 
@@ -22,9 +21,7 @@ public class ModelBuildIntersectionTable {
 
   private MTable intersectionTable;
 
-  private int countForeignKey;
-
-  public ModelBuildIntersectionTable(ModelBuildContext ctx, BeanPropertyAssocMany<?> manyProp) {
+  ModelBuildIntersectionTable(ModelBuildContext ctx, BeanPropertyAssocMany<?> manyProp) {
     this.ctx = ctx;
     this.manyProp = manyProp;
     this.intersectionTableJoin = manyProp.getIntersectionTableJoin();
@@ -51,33 +48,13 @@ public class ModelBuildIntersectionTable {
 
   private void buildFkConstraints() {
 
-    BeanDescriptor<?> localDesc = manyProp.getBeanDescriptor();
-    buildFkConstraints(localDesc, intersectionTableJoin.columns(), true);
-
-    BeanDescriptor<?> targetDesc = manyProp.getTargetDescriptor();
-    buildFkConstraints(targetDesc, tableJoin.columns(), false);
+    ctx.fkeyBuilder(intersectionTable)
+      .addForeignKey(manyProp.getBeanDescriptor(), intersectionTableJoin, true)
+      .addForeignKey(manyProp.getTargetDescriptor(), tableJoin, false);
 
     intersectionTable.checkDuplicateForeignKeys();
   }
 
-
-  private void buildFkConstraints(BeanDescriptor<?> desc, TableJoinColumn[] columns, boolean direction) {
-
-    String tableName = intersectionTableJoin.getTable();
-    String baseTable = ctx.normaliseTable(desc.getBaseTable());
-    String fkName = ctx.foreignKeyConstraintName(tableName, baseTable, ++countForeignKey);
-    String fkIndex = ctx.foreignKeyIndexName(tableName, baseTable, countForeignKey);
-
-    MCompoundForeignKey foreignKey = new MCompoundForeignKey(fkName, desc.getBaseTable(), fkIndex);
-    intersectionTable.addForeignKey(foreignKey);
-
-    for (TableJoinColumn column : columns) {
-      String localCol = direction ? column.getForeignDbColumn() : column.getLocalDbColumn();
-      String refCol = !direction ? column.getForeignDbColumn() : column.getLocalDbColumn();
-      foreignKey.addColumnPair(localCol, refCol);
-    }
-  }
-
   private MTable createTable() {
 
     BeanDescriptor<?> localDesc = manyProp.getBeanDescriptor();
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
index dc9bc4692..c1ad11197 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
@@ -123,27 +123,24 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
 
   @Override
   public void visitMany(BeanPropertyAssocMany<?> p) {
-    if (p.hasJoinTable()) {
-      if (p.getMappedBy() == null) {
-        // only create on other 'owning' side
+    if (p.hasJoinTable() && p.getMappedBy() == null) {
+      // only create on other 'owning' side
 
-        //TableJoin intersectionTableJoin = p.getIntersectionTableJoin();
-        // check if the intersection table has already been created
-
-        // build the create table and fkey constraints
-        // putting the DDL into ctx for later output as we are
-        // in the middle of rendering the create table DDL
-        MTable intersectionTable = new ModelBuildIntersectionTable(ctx, p).build();
-        if (p.isO2mJoinTable()) {
-          intersectionTable.clearForeignKeyIndexes();
-          Collection<MColumn> cols = intersectionTable.allColumns();
-          if (cols.size() == 2) {
-            // always the second column that we put the unique constraint on
-            MColumn col = new ArrayList<>(cols).get(1);
-            col.setUnique(determineUniqueConstraintName(col.getName()));
-          }
+      // build the create table and fkey constraints
+      // putting the DDL into ctx for later output as we are
+      // in the middle of rendering the create table DDL
+      MTable intersectionTable = new ModelBuildIntersectionTable(ctx, p).build();
+      if (p.isO2mJoinTable()) {
+        intersectionTable.clearForeignKeyIndexes();
+        Collection<MColumn> cols = intersectionTable.allColumns();
+        if (cols.size() == 2) {
+          // always the second column that we put the unique constraint on
+          MColumn col = new ArrayList<>(cols).get(1);
+          col.setUnique(determineUniqueConstraintName(col.getName()));
         }
       }
+    } else if (p.isElementCollection()) {
+      ModelBuildElementTable.build(ctx, p);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java b/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java
index 391db0366..9b9ebc50c 100644
--- a/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java
+++ b/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java
@@ -2,11 +2,11 @@ package io.ebeaninternal.server.autotune.service;
 
 import io.ebean.bean.NodeUsageCollector;
 import io.ebean.text.PathProperties;
+import io.ebean.util.SplitName;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssoc;
 import io.ebeaninternal.server.el.ElPropertyValue;
-import io.ebean.util.SplitName;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -56,7 +56,7 @@ public class ProfileOriginNodeUsage {
       }
 
       for (String propName : aggregateUsed) {
-        BeanProperty beanProp = desc.getBeanPropertyFromPath(propName);
+        BeanProperty beanProp = desc.findPropertyFromPath(propName);
         if (beanProp == null) {
           logger.warn("AutoTune: Can't find property[" + propName + "] for " + desc.getName());
 
diff --git a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index 5a9e3f6a8..ed09fdb20 100644
--- a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -79,6 +79,8 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
 
   private List<T> cacheBeans;
 
+  private BeanPropertyAssocMany<?> manyProperty;
+
   /**
    * Create the InternalQueryRequest.
    */
@@ -496,11 +498,18 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
   }
 
   /**
-   * Return the many property that is fetched in the query or null if there is
-   * not one.
+   * Determine and return the ToMany property that is included in the query.
+   */
+  public BeanPropertyAssocMany<?> determineMany() {
+    manyProperty = beanDescriptor.getManyProperty(query);
+    return manyProperty;
+  }
+
+  /**
+   * Return the many property that is fetched in the query or null if there is not one.
    */
   public BeanPropertyAssocMany<?> getManyProperty() {
-    return beanDescriptor.getManyProperty(query);
+    return manyProperty;
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java
index 5e50e9700..4d8dbda97 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java
@@ -1,11 +1,47 @@
 package io.ebeaninternal.server.deploy;
 
 import io.ebean.bean.BeanCollection;
+import io.ebean.bean.BeanCollectionLoader;
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.text.json.SpiJsonWriter;
 
+import java.io.IOException;
 import java.util.Collection;
 
 abstract class BaseCollectionHelp<T> implements BeanCollectionHelp<T> {
 
+  final BeanPropertyAssocMany<T> many;
+  final BeanDescriptor<T> targetDescriptor;
+  final String propertyName;
+
+  BeanCollectionLoader loader;
+
+  BaseCollectionHelp(BeanPropertyAssocMany<T> many) {
+    this.many = many;
+    this.targetDescriptor = many.getTargetDescriptor();
+    this.propertyName = many.getName();
+  }
+
+   BaseCollectionHelp() {
+    this.many = null;
+    this.targetDescriptor = null;
+    this.propertyName = null;
+  }
+
+  @Override
+  public void setLoader(BeanCollectionLoader loader) {
+    this.loader = loader;
+  }
+
+  @Override
+  public void add(BeanCollection<?> collection, EntityBean bean, boolean withCheck) {
+    if (withCheck) {
+      collection.internalAddWithCheck(bean);
+    } else {
+      collection.internalAdd(bean);
+    }
+  }
+
   @Override
   public Collection underlying(Object value) {
     if (value instanceof BeanCollection) {
@@ -14,4 +50,18 @@ abstract class BaseCollectionHelp<T> implements BeanCollectionHelp<T> {
       return (Collection)value;
     }
   }
+
+  void jsonWriteCollection(SpiJsonWriter ctx, String name, Collection<?> list) throws IOException {
+    if (!list.isEmpty() || ctx.isIncludeEmpty()) {
+      ctx.beginAssocMany(name);
+      for (Object bean : list) {
+        jsonWriteElement(ctx, bean);
+      }
+      ctx.endAssocMany();
+    }
+  }
+
+  void jsonWriteElement(SpiJsonWriter ctx, Object bean) throws IOException {
+    targetDescriptor.jsonWrite(ctx, (EntityBean) bean);
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java
index 8891048bb..569e22403 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java
@@ -7,6 +7,7 @@ import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanCollectionAdd;
 import io.ebean.bean.BeanCollectionLoader;
 import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.query.CQueryCollectionAdd;
 import io.ebeaninternal.server.text.json.SpiJsonWriter;
 
 import java.io.IOException;
@@ -15,7 +16,7 @@ import java.util.Collection;
 /**
  * Helper functions for performing tasks on Lists Sets or Maps.
  */
-public interface BeanCollectionHelp<T> {
+public interface BeanCollectionHelp<T> extends CQueryCollectionAdd<T> {
 
   /**
    * Set the EbeanServer that owns the configuration.
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java
index 2ba289d75..f74a67243 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java
@@ -20,10 +20,12 @@ public class BeanCollectionHelpFactory {
    */
   public static <T> BeanCollectionHelp<T> create(BeanPropertyAssocMany<T> manyProperty) {
 
+    boolean elementCollection = manyProperty.isElementCollection();
+
     ManyType manyType = manyProperty.getManyType();
     switch (manyType) {
       case LIST:
-        return new BeanListHelp<>(manyProperty);
+        return elementCollection ? new BeanListHelpElement<>(manyProperty) : new BeanListHelp<>(manyProperty);
       case SET:
         return new BeanSetHelp<>(manyProperty);
       case MAP:
@@ -35,9 +37,7 @@ public class BeanCollectionHelpFactory {
   }
 
   @SuppressWarnings("unchecked")
-  public static <T> BeanCollectionHelp<T> create(OrmQueryRequest<T> request) {
-
-    SpiQuery.Type manyType = request.getQuery().getType();
+  public static <T> BeanCollectionHelp<T> create(SpiQuery.Type manyType, OrmQueryRequest<T> request) {
 
     if (manyType == SpiQuery.Type.LIST) {
       return LIST_HELP;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 8ba1b5ae6..a7614cbba 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -62,7 +62,13 @@ import io.ebeaninternal.server.el.ElPropertyDeploy;
 import io.ebeaninternal.server.el.ElPropertyValue;
 import io.ebeaninternal.server.persist.DmlUtil;
 import io.ebeaninternal.server.query.CQueryPlan;
-import io.ebeaninternal.server.query.SqlTreeProperty;
+import io.ebeaninternal.server.query.ExtraJoin;
+import io.ebeaninternal.server.query.STreeProperty;
+import io.ebeaninternal.server.query.STreePropertyAssoc;
+import io.ebeaninternal.server.query.STreePropertyAssocMany;
+import io.ebeaninternal.server.query.STreePropertyAssocOne;
+import io.ebeaninternal.server.query.STreeType;
+import io.ebeaninternal.server.query.SqlBeanLoad;
 import io.ebeaninternal.server.querydefn.OrmQueryDetail;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
 import io.ebeaninternal.server.text.json.ReadJson;
@@ -100,7 +106,7 @@ import java.util.concurrent.ConcurrentHashMap;
 /**
  * Describes Beans including their deployment information.
  */
-public class BeanDescriptor<T> implements BeanType<T> {
+public class BeanDescriptor<T> implements BeanType<T>, STreeType {
 
   private static final Logger logger = LoggerFactory.getLogger(BeanDescriptor.class);
 
@@ -114,7 +120,7 @@ public class BeanDescriptor<T> implements BeanType<T> {
 
   private final ConcurrentHashMap<String, ElComparator<T>> comparatorCache = new ConcurrentHashMap<>();
 
-  private final ConcurrentHashMap<String, SqlTreeProperty> dynamicProperty = new ConcurrentHashMap<>();
+  private final ConcurrentHashMap<String, STreeProperty> dynamicProperty = new ConcurrentHashMap<>();
 
   private final Map<String, SpiRawSql> namedRawSql;
 
@@ -239,7 +245,7 @@ public class BeanDescriptor<T> implements BeanType<T> {
   private final BeanDescriptorMap owner;
 
 
-  private final String[] properties;
+  final String[] properties;
 
   /**
    * Intercept pre post on insert,update, and delete .
@@ -601,7 +607,7 @@ public class BeanDescriptor<T> implements BeanType<T> {
   /**
    * Create an entity bean that is used as a prototype/factory to create new instances.
    */
-  private EntityBean createPrototypeEntityBean(Class<T> beanType) {
+  protected EntityBean createPrototypeEntityBean(Class<T> beanType) {
     if (Modifier.isAbstract(beanType.getModifiers())) {
       return null;
     }
@@ -662,21 +668,19 @@ public class BeanDescriptor<T> implements BeanType<T> {
    * These properties need to be initialised prior to the association properties
    * as they are used to get the imported and exported properties.
    * </p>
-   *
-   * @param withHistoryTables map populated if @History is supported on this entity bean
    */
-  public void initialiseId(Map<String, String> withHistoryTables, Map<String, String> draftTables) {
+  public void initialiseId(BeanDescriptorInitContext initContext) {
 
     if (logger.isTraceEnabled()) {
       logger.trace("BeanDescriptor initialise " + fullName);
     }
 
     if (draftable) {
-      draftTables.put(baseTable, draftTable);
+      initContext.addDraft(baseTable, draftTable);
     }
     if (historySupport) {
       // add mapping (used to swap out baseTable for asOf queries)
-      withHistoryTables.put(baseTable, baseTableAsOf);
+      initContext.addHistory(baseTable, baseTableAsOf);
     }
 
     if (inheritInfo != null) {
@@ -686,28 +690,24 @@ public class BeanDescriptor<T> implements BeanType<T> {
     if (isEmbedded()) {
       // initialise all the properties
       for (BeanProperty prop : propertiesAll()) {
-        prop.initialise();
+        prop.initialise(initContext);
       }
     } else {
       // initialise just the Id properties
       if (idProperty != null) {
-        idProperty.initialise();
+        idProperty.initialise(initContext);
       }
     }
   }
 
   /**
    * Initialise the exported and imported parts for associated properties.
-   *
-   * @param asOfTableMap   the map of base tables to associated 'with history' tables
-   * @param asOfViewSuffix the suffix added to the table name to derive the 'with history' view name
-   * @param draftTableMap  the map of base tables to associated 'draft' tables.
    */
-  public void initialiseOther(Map<String, String> asOfTableMap, String asOfViewSuffix, Map<String, String> draftTableMap) {
+  public void initialiseOther(BeanDescriptorInitContext initContext) {
 
-    for (BeanPropertyAssocMany<?> aPropertiesManyToMany1 : propertiesManyToMany) {
+    for (BeanPropertyAssocMany<?> many : propertiesManyToMany) {
       // register associated draft table for M2M intersection
-      aPropertiesManyToMany1.registerDraftIntersectionTable(draftTableMap);
+      many.registerDraftIntersectionTable(initContext);
     }
 
     if (historySupport) {
@@ -717,8 +717,7 @@ public class BeanDescriptor<T> implements BeanType<T> {
         // register associated history table for M2M intersection
         if (!aPropertiesManyToMany.isExcludedFromHistory()) {
           TableJoin intersectionTableJoin = aPropertiesManyToMany.getIntersectionTableJoin();
-          String intersectionTableName = intersectionTableJoin.getTable();
-          asOfTableMap.put(intersectionTableName, intersectionTableName + asOfViewSuffix);
+          initContext.addHistoryIntersection(intersectionTableJoin.getTable());
         }
       }
     }
@@ -727,14 +726,14 @@ public class BeanDescriptor<T> implements BeanType<T> {
       // initialise all the non-id properties
       for (BeanProperty prop : propertiesAll()) {
         if (!prop.isId()) {
-          prop.initialise();
+          prop.initialise(initContext);
         }
         prop.registerColumn(this, null);
       }
     }
 
     if (unidirectional != null) {
-      unidirectional.initialise();
+      unidirectional.initialise(initContext);
     }
 
     idBinder.initialise();
@@ -799,7 +798,7 @@ public class BeanDescriptor<T> implements BeanType<T> {
       if (propName == null) {
         return;
       }
-      props[i] = findBeanProperty(propName);
+      props[i] = findProperty(propName);
     }
     if (props.length == 1) {
       for (BeanProperty[] inserted : propertiesUnique) {
@@ -1639,6 +1638,7 @@ public class BeanDescriptor<T> implements BeanType<T> {
   /**
    * Execute the postLoad if a BeanPostLoad exists for this bean.
    */
+  @Override
   public void postLoad(Object bean) {
     if (beanPostLoad != null) {
       beanPostLoad.postLoad(bean);
@@ -1787,6 +1787,11 @@ public class BeanDescriptor<T> implements BeanType<T> {
     return idBinder instanceof IdBinderSimple;
   }
 
+  @Override
+  public boolean hasId() {
+    return idProperty != null;
+  }
+
   /**
    * Return true if this type has a simple Id and the platform supports mutli-value binding.
    */
@@ -1951,7 +1956,8 @@ public class BeanDescriptor<T> implements BeanType<T> {
    * Return the bean property traversing the object graph and taking into
    * account inheritance.
    */
-  public BeanProperty getBeanPropertyFromPath(String path) {
+  @Override
+  public BeanProperty findPropertyFromPath(String path) {
     BeanDescriptor<?> other = this;
     while (true) {
 
@@ -1983,7 +1989,7 @@ public class BeanDescriptor<T> implements BeanType<T> {
       }
       String[] splitBegin = SplitName.splitBegin(path);
 
-      BeanProperty beanProperty = result.findBeanProperty(splitBegin[0]);
+      BeanProperty beanProperty = result.findProperty(splitBegin[0]);
       if (beanProperty instanceof BeanPropertyAssoc<?>) {
         BeanPropertyAssoc<?> assocProp = (BeanPropertyAssoc<?>) beanProperty;
         path = splitBegin[1];
@@ -2224,7 +2230,7 @@ public class BeanDescriptor<T> implements BeanType<T> {
 
   @Override
   public Property getProperty(String propName) {
-    return findBeanProperty(propName);
+    return findProperty(propName);
   }
 
   /**
@@ -2458,7 +2464,7 @@ public class BeanDescriptor<T> implements BeanType<T> {
   /**
    * Return a 'dynamic property' used to read a formula.
    */
-  private SqlTreeProperty findSqlTreeFormula(String formulaExpression) {
+  private STreeProperty findSqlTreeFormula(String formulaExpression) {
 
     return dynamicProperty.computeIfAbsent(formulaExpression, (formula) -> new FormulaPropertyPath(this, formula).build());
   }
@@ -2468,7 +2474,8 @@ public class BeanDescriptor<T> implements BeanType<T> {
    *
    * The property can be a dynamic formula or a well known bean property.
    */
-  public SqlTreeProperty findSqlTreeProperty(String propName) {
+  @Override
+  public STreeProperty findPropertyWithDynamic(String propName) {
     if (propName.indexOf('(') > -1) {
       return findSqlTreeFormula(propName);
     }
@@ -2482,7 +2489,8 @@ public class BeanDescriptor<T> implements BeanType<T> {
    * inheritance tree (not up).
    * </p>
    */
-  public BeanProperty findBeanProperty(String propName) {
+  @Override
+  public BeanProperty findProperty(String propName) {
     int basePos = propName.indexOf('.');
     if (basePos > -1) {
       // embedded property
@@ -2540,6 +2548,10 @@ public class BeanDescriptor<T> implements BeanType<T> {
     return autoTunable;
   }
 
+  public boolean isElementType() {
+    return false;
+  }
+
   /**
    * Returns the Inheritance mapping information. This will be null if this type
    * of bean is not involved in any ORM inheritance mapping.
@@ -2809,6 +2821,41 @@ public class BeanDescriptor<T> implements BeanType<T> {
     return draftableElement;
   }
 
+  @Override
+  public boolean isEmbeddedPath(String propertyPath) {
+    ElPropertyDeploy elProp = getElPropertyDeploy(propertyPath);
+    if (elProp == null) {
+      throw new PersistenceException("Invalid path " + propertyPath + " from " + getFullName());
+    }
+    return elProp.getBeanProperty().isEmbedded();
+  }
+
+  @Override
+  public ExtraJoin extraJoin(String propertyPath) {
+
+    ElPropertyValue elGetValue = getElGetValue(propertyPath);
+    if (elGetValue != null) {
+      BeanProperty beanProperty = elGetValue.getBeanProperty();
+      if (beanProperty instanceof BeanPropertyAssoc<?>) {
+        BeanPropertyAssoc<?> assocProp = (BeanPropertyAssoc<?>) beanProperty;
+        if (!assocProp.isEmbedded()) {
+          return new ExtraJoin(assocProp, elGetValue.containsMany());
+        }
+      }
+    }
+    return null;
+  }
+
+  @Override
+  public void inheritanceLoad(SqlBeanLoad sqlBeanLoad, STreeProperty property, DbReadContext ctx) {
+    BeanProperty p = getBeanProperty(property.getName());
+    if (p != null) {
+      p.load(sqlBeanLoad);
+    } else {
+      property.loadIgnore(ctx);
+    }
+  }
+
   public void setUnmappedJson(EntityBean bean, Map<String, Object> unmappedProperties) {
     if (unmappedJson != null) {
       unmappedJson.setValueIntercept(bean, unmappedProperties);
@@ -2933,16 +2980,6 @@ public class BeanDescriptor<T> implements BeanType<T> {
     return selectLastInsertedId;
   }
 
-  /**
-   * Return the TableJoins.
-   * <p>
-   * For properties mapped to secondary tables rather than the base table.
-   * </p>
-   */
-  public TableJoin[] tableJoins() {
-    return derivedTableJoins;
-  }
-
   @Override
   public Collection<? extends Property> allProperties() {
     return propertiesAll();
@@ -3131,6 +3168,26 @@ public class BeanDescriptor<T> implements BeanType<T> {
     }
   }
 
+  @Override
+  public STreeProperty[] propsBaseScalar() {
+    return propertiesBaseScalar;
+  }
+
+  @Override
+  public STreePropertyAssoc[] propsEmbedded() {
+    return propertiesEmbedded;
+  }
+
+  @Override
+  public STreePropertyAssocOne[] propsOne() {
+    return propertiesOne;
+  }
+
+  @Override
+  public STreePropertyAssocMany[] propsMany() {
+    return propertiesMany;
+  }
+
   /**
    * All the BeanPropertyAssocOne that are not embedded. These are effectively
    * joined beans. For ManyToOne and OneToOne associations.
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java
new file mode 100644
index 000000000..dd793505c
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java
@@ -0,0 +1,24 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
+
+/**
+ * Bean descriptor used with ElementCollection (where we don't have a mapped type/class).
+ */
+public class BeanDescriptorElement<T> extends BeanDescriptor<T> {
+
+  public BeanDescriptorElement(BeanDescriptorMap owner, DeployBeanDescriptor<T> deploy) {
+    super(owner, deploy);
+  }
+
+  public boolean isElementType() {
+    return true;
+  }
+
+  @Override
+  protected EntityBean createPrototypeEntityBean(Class<T> beanType) {
+    return new ElementEntityBean(properties);
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorInitContext.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorInitContext.java
new file mode 100644
index 000000000..ef367199d
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorInitContext.java
@@ -0,0 +1,32 @@
+package io.ebeaninternal.server.deploy;
+
+import java.util.Map;
+
+class BeanDescriptorInitContext {
+
+  private final Map<String, String> withHistoryTables;
+  private final Map<String, String> draftTables;
+  private final String asOfViewSuffix;
+
+  BeanDescriptorInitContext(Map<String, String> withHistoryTables, Map<String, String> draftTables, String asOfViewSuffix) {
+    this.withHistoryTables = withHistoryTables;
+    this.draftTables = draftTables;
+    this.asOfViewSuffix = asOfViewSuffix;
+  }
+
+  void addDraft(String baseTable, String draftTable) {
+    draftTables.put(baseTable, draftTable);
+  }
+
+  void addHistory(String baseTable, String baseTableAsOf) {
+    withHistoryTables.put(baseTable, baseTableAsOf);
+  }
+
+  void addHistoryIntersection(String intersectionTableName) {
+    withHistoryTables.put(intersectionTableName, intersectionTableName + asOfViewSuffix);
+  }
+
+  void addDraftIntersection(String intersectionPublishTable, String intersectionDraftTable) {
+    draftTables.put(intersectionPublishTable, intersectionDraftTable);
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 6bd12fda2..5824612bd 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -184,8 +184,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
   private final BeanLifecycleAdapterFactory beanLifecycleAdapterFactory;
 
-  private final boolean eagerFetchLobs;
-
   private final String asOfViewSuffix;
 
   /**
@@ -215,12 +213,11 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     this.databasePlatform = serverConfig.getDatabasePlatform();
     this.multiValueBind = config.getMultiValueBind();
     this.idBinderFactory = new IdBinderFactory(databasePlatform.isIdInExpandedForm(), multiValueBind);
-    this.eagerFetchLobs = serverConfig.isEagerFetchLobs();
     this.queryPlanTTLSeconds = serverConfig.getQueryPlanTTLSeconds();
 
     this.asOfViewSuffix = getAsOfViewSuffix(databasePlatform, serverConfig);
     String versionsBetweenSuffix = getVersionsBetweenSuffix(databasePlatform, serverConfig);
-    this.readAnnotations = new ReadAnnotations(config.getGeneratedPropertyFactory(), asOfViewSuffix, versionsBetweenSuffix, serverConfig.isDisableL2Cache());
+    this.readAnnotations = new ReadAnnotations(config.getGeneratedPropertyFactory(), asOfViewSuffix, versionsBetweenSuffix, serverConfig);
     this.bootupClasses = config.getBootupClasses();
     this.createProperties = config.getDeployCreateProperties();
     this.namingConvention = serverConfig.getNamingConvention();
@@ -575,12 +572,14 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     // we can initialise them which sorts out circular
     // dependencies for OneToMany and ManyToOne etc
 
+    BeanDescriptorInitContext initContext = new BeanDescriptorInitContext(asOfTableMap, draftTableMap, asOfViewSuffix);
+
     // PASS 1:
     // initialise the ID properties of all the beans
     // first (as they are needed to initialise the
     // associated properties in the second pass).
     for (BeanDescriptor<?> d : descMap.values()) {
-      d.initialiseId(asOfTableMap, draftTableMap);
+      d.initialiseId(initContext);
     }
 
     // PASS 2:
@@ -595,7 +594,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
       // also look for intersection tables with
       // associated history support and register them
       // into the asOfTableMap
-      d.initialiseOther(asOfTableMap, asOfViewSuffix, draftTableMap);
+      d.initialiseOther(initContext);
     }
 
     // PASS 4:
@@ -656,6 +655,13 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     return beanTableMap.get(type);
   }
 
+  /**
+   * Return a BeanTable for an ElementCollection.
+   */
+  public BeanTable getCollectionBeanTable(String fullTableName, Class<?> targetType) {
+    return new BeanTable(this, fullTableName, targetType);
+  }
+
   @SuppressWarnings("unchecked")
   public <T> BeanManager<T> getBeanManager(Class<T> entityType) {
 
@@ -1025,7 +1031,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * </p>
    */
   @SuppressWarnings({"unchecked", "rawtypes"})
-  private void makeUnidirectional(DeployBeanInfo<?> info, DeployBeanPropertyAssocMany<?> oneToMany) {
+  private void makeUnidirectional(DeployBeanPropertyAssocMany<?> oneToMany) {
 
     DeployBeanDescriptor<?> targetDesc = getTargetDescriptor(oneToMany);
 
@@ -1045,34 +1051,36 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     // mark this property as unidirectional
     oneToMany.setUnidirectional();
 
-    // create the 'shadow' unidirectional property
-    // which is put on the target descriptor
-    DeployBeanPropertyAssocOne<?> unidirectional = new DeployBeanPropertyAssocOne(targetDesc, owningType);
-    unidirectional.setUndirectionalShadow();
-    unidirectional.setNullable(false);
-    unidirectional.setDbRead(true);
-    unidirectional.setDbInsertable(true);
-    unidirectional.setDbUpdateable(false);
-
-    targetDesc.setUnidirectional(unidirectional);
-
     // specify table and table alias...
     BeanTable beanTable = getBeanTable(owningType);
-    unidirectional.setBeanTable(beanTable);
-    unidirectional.setName(beanTable.getBaseTable());
-
-    info.setBeanJoinType(unidirectional, true);
 
     // define the TableJoin
     DeployTableJoin oneToManyJoin = oneToMany.getTableJoin();
     if (!oneToManyJoin.hasJoinColumns()) {
       throw new RuntimeException("No join columns");
     }
+    createUnidirectional(targetDesc, owningType, beanTable, oneToManyJoin);
+  }
 
-    // inverse of the oneToManyJoin
-    DeployTableJoin unidirectionalJoin = unidirectional.getTableJoin();
-    unidirectionalJoin.setColumns(oneToManyJoin.columns(), true);
+  /**
+   * Create and add a Unidirectional property (for ElementCollection) which maps to the foreign key.
+   */
+  public <A> void createUnidirectional(DeployBeanDescriptor<?> targetDesc, Class<A> targetType, BeanTable beanTable, DeployTableJoin oneToManyJoin) {
 
+    // create the 'shadow' unidirectional property
+    // which is put on the target descriptor
+    DeployBeanPropertyAssocOne<A> unidirectional = new DeployBeanPropertyAssocOne<>(targetDesc, targetType);
+    unidirectional.setUndirectionalShadow();
+    unidirectional.setNullable(false);
+    unidirectional.setDbRead(true);
+    unidirectional.setDbInsertable(true);
+    unidirectional.setDbUpdateable(false);
+    unidirectional.setBeanTable(beanTable);
+    unidirectional.setName(beanTable.getBaseTable());
+    unidirectional.setJoinType(true);
+    unidirectional.setJoinColumns(oneToManyJoin.columns(), true);
+
+    targetDesc.setUnidirectional(unidirectional);
   }
 
   private void checkMappedByOneToOne(DeployBeanPropertyAssocOne<?> prop) {
@@ -1137,6 +1145,10 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    */
   private void checkMappedByOneToMany(DeployBeanInfo<?> info, DeployBeanPropertyAssocMany<?> prop) {
 
+    if (prop.isElementCollection()) {
+      // skip mapping check
+      return;
+    }
     DeployBeanDescriptor<?> targetDesc = getTargetDescriptor(prop);
 
     if (targetDesc.isDraftableElement()) {
@@ -1159,7 +1171,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
       if (!findMappedBy(prop)) {
         if (!prop.isO2mJoinTable()) {
-          makeUnidirectional(info, prop);
+          makeUnidirectional(prop);
         }
         return;
       }
@@ -1311,7 +1323,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
     DeployBeanInfo<T> info = new DeployBeanInfo<>(deployUtil, desc);
 
-    readAnnotations.readInitial(info, eagerFetchLobs);
+    readAnnotations.readInitial(info);
     return info;
   }
 
@@ -1636,6 +1648,20 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     target.setPrimaryKeyJoin(inverseJoin);
   }
 
+  /**
+   * Create a DeployBeanDescriptor for an ElementCollection target.
+   */
+  public <A> DeployBeanDescriptor<A> createDeployDescriptor(Class<A> targetType) {
+    return new DeployBeanDescriptor<>(this, targetType, serverConfig);
+  }
+
+  /**
+   * Create a BeanDescriptor for an ElementCollection target.
+   */
+  public <A> BeanDescriptor<A> createElementDescriptor(DeployBeanDescriptor<A> elementDescriptor) {
+    return new BeanDescriptorElement<>(this, elementDescriptor);
+  }
+
   public void visitMetrics(MetricVisitor visitor) {
     for (BeanDescriptor<?> desc : immutableDescriptorList) {
       desc.visitMetrics(visitor);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java
index df5429233..338bfb5a9 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java
@@ -5,7 +5,6 @@ import io.ebean.Query;
 import io.ebean.Transaction;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanCollectionAdd;
-import io.ebean.bean.BeanCollectionLoader;
 import io.ebean.bean.EntityBean;
 import io.ebean.common.BeanList;
 import io.ebeaninternal.server.text.json.SpiJsonWriter;
@@ -17,48 +16,20 @@ import java.util.List;
 /**
  * Helper object for dealing with Lists.
  */
-public final class BeanListHelp<T> extends BaseCollectionHelp<T> {
+public class BeanListHelp<T> extends BaseCollectionHelp<T> {
 
-  private final BeanPropertyAssocMany<T> many;
-  private final BeanDescriptor<T> targetDescriptor;
-  private final String propertyName;
-
-  private BeanCollectionLoader loader;
-
-  public BeanListHelp(BeanPropertyAssocMany<T> many) {
-    this.many = many;
-    this.targetDescriptor = many.getTargetDescriptor();
-    this.propertyName = many.getName();
+  BeanListHelp(BeanPropertyAssocMany<T> many) {
+    super(many);
   }
 
-  public BeanListHelp() {
-    this.many = null;
-    this.targetDescriptor = null;
-    this.propertyName = null;
-  }
-
-  @Override
-  public void setLoader(BeanCollectionLoader loader) {
-    this.loader = loader;
-  }
-
-  /**
-   * Internal add bypassing any modify listening.
-   */
-  @Override
-  public void add(BeanCollection<?> collection, EntityBean bean, boolean withCheck) {
-    if (withCheck) {
-      collection.internalAddWithCheck(bean);
-    } else {
-      collection.internalAdd(bean);
-    }
+  BeanListHelp() {
+    super();
   }
 
   @Override
   public BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey) {
 
     if (bc instanceof BeanList<?>) {
-
       BeanList<?> bl = (BeanList<?>) bc;
       if (bl.getActualList() == null) {
         bl.setActualList(new ArrayList<>());
@@ -144,13 +115,7 @@ public final class BeanListHelp<T> extends BaseCollectionHelp<T> {
       list = (List<?>) collection;
     }
 
-    if (!list.isEmpty() || ctx.isIncludeEmpty()) {
-      ctx.beginAssocMany(name);
-      for (Object aList : list) {
-        targetDescriptor.jsonWrite(ctx, (EntityBean) aList);
-      }
-      ctx.endAssocMany();
-    }
+    jsonWriteCollection(ctx, name, list);
   }
 
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanListHelpElement.java b/src/main/java/io/ebeaninternal/server/deploy/BeanListHelpElement.java
new file mode 100644
index 000000000..2a0b4de96
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanListHelpElement.java
@@ -0,0 +1,37 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebean.bean.BeanCollection;
+import io.ebean.bean.BeanCollectionAdd;
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.text.json.SpiJsonWriter;
+
+/**
+ * Helper for element collection List.
+ */
+public class BeanListHelpElement<T> extends BeanListHelp<T> {
+
+  BeanListHelpElement(BeanPropertyAssocMany<T> many) {
+    super(many);
+  }
+
+  @Override
+  public void add(BeanCollection<?> collection, EntityBean bean, boolean withCheck) {
+    Object elementValue = bean._ebean_getField(0);
+    if (withCheck) {
+      collection.internalAddWithCheck(elementValue);
+    } else {
+      collection.internalAdd(elementValue);
+    }
+  }
+
+  @Override
+  public BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey) {
+    return super.getBeanCollectionAdd(bc, mapKey);
+  }
+
+  @Override
+  void jsonWriteElement(SpiJsonWriter ctx, Object element) {
+    many.jsonWriteValue(ctx, element);
+    //targetDescriptor.jsonWrite(ctx, (EntityBean) element);
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java
index e3b42bea7..4c4e76190 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java
@@ -5,7 +5,6 @@ import io.ebean.Query;
 import io.ebean.Transaction;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanCollectionAdd;
-import io.ebean.bean.BeanCollectionLoader;
 import io.ebean.bean.EntityBean;
 import io.ebean.common.BeanMap;
 import io.ebeaninternal.server.text.json.SpiJsonWriter;
@@ -24,12 +23,11 @@ public final class BeanMapHelp<T> extends BaseCollectionHelp<T> {
   private final BeanDescriptor<T> targetDescriptor;
   private final String propertyName;
   private final BeanProperty beanProperty;
-  private BeanCollectionLoader loader;
 
   /**
    * When created for a given query that will return a map.
    */
-  public BeanMapHelp(BeanDescriptor<T> targetDescriptor, String mapKey) {
+  BeanMapHelp(BeanDescriptor<T> targetDescriptor, String mapKey) {
     this.targetDescriptor = targetDescriptor;
     this.beanProperty = targetDescriptor.getBeanProperty(mapKey);
     this.many = null;
@@ -39,18 +37,13 @@ public final class BeanMapHelp<T> extends BaseCollectionHelp<T> {
   /**
    * When help is attached to a specific many property.
    */
-  public BeanMapHelp(BeanPropertyAssocMany<T> many) {
+  BeanMapHelp(BeanPropertyAssocMany<T> many) {
     this.many = many;
     this.targetDescriptor = many.getTargetDescriptor();
     this.propertyName = many.getName();
     this.beanProperty = targetDescriptor.getBeanProperty(many.getMapKey());
   }
 
-  @Override
-  public void setLoader(BeanCollectionLoader loader) {
-    this.loader = loader;
-  }
-
   @Override
   @SuppressWarnings("unchecked")
   public BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index a7260f269..5ea987763 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -22,9 +22,9 @@ import io.ebeaninternal.server.el.ElPropertyChainBuilder;
 import io.ebeaninternal.server.el.ElPropertyValue;
 import io.ebeaninternal.server.properties.BeanPropertyGetter;
 import io.ebeaninternal.server.properties.BeanPropertySetter;
+import io.ebeaninternal.server.query.STreeProperty;
 import io.ebeaninternal.server.query.SqlBeanLoad;
 import io.ebeaninternal.server.query.SqlJoinType;
-import io.ebeaninternal.server.query.SqlTreeProperty;
 import io.ebeaninternal.server.text.json.ReadJson;
 import io.ebeaninternal.server.text.json.SpiJsonWriter;
 import io.ebeaninternal.server.type.DataBind;
@@ -56,7 +56,7 @@ import java.util.Set;
  * Description of a property of a bean. Includes its deployment information such
  * as database column mapping information.
  */
-public class BeanProperty implements ElPropertyValue, Property, SqlTreeProperty {
+public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
 
   private static final Logger logger = LoggerFactory.getLogger(BeanProperty.class);
 
@@ -455,11 +455,10 @@ public class BeanProperty implements ElPropertyValue, Property, SqlTreeProperty
    * initialise variables that can't be done in construction due to recursive
    * issues.
    */
-  public void initialise() {
+  public void initialise(BeanDescriptorInitContext initContext) {
     // do nothing for normal BeanProperty
     if (!isTransient && scalarType == null) {
-      String msg = "No ScalarType assigned to " + descriptor.getFullName() + "." + getName();
-      throw new RuntimeException(msg);
+      throw new RuntimeException("No ScalarType assigned to " + descriptor.getFullName() + "." + getName());
     }
   }
 
@@ -505,6 +504,7 @@ public class BeanProperty implements ElPropertyValue, Property, SqlTreeProperty
   /**
    * Return true if this property is based on a formula.
    */
+  @Override
   public boolean isFormula() {
     return formula;
   }
@@ -530,6 +530,11 @@ public class BeanProperty implements ElPropertyValue, Property, SqlTreeProperty
     return descriptor.getEncryptKey(this);
   }
 
+  @Override
+  public String getEncryptKeyAsString() {
+    return getEncryptKey().getStringValue();
+  }
+
   public String getDecryptProperty(String propertyName) {
     return dbEncryptFunction.getDecryptSql(propertyName);
   }
@@ -552,6 +557,7 @@ public class BeanProperty implements ElPropertyValue, Property, SqlTreeProperty
    * Add any extra joins required to support this property. Generally a no
    * operation except for a OneToOne exported.
    */
+  @Override
   public void appendFrom(DbSqlContext ctx, SqlJoinType joinType) {
     if (formula && sqlFormulaJoin != null) {
       ctx.appendFormulaJoin(sqlFormulaJoin, joinType);
@@ -576,6 +582,7 @@ public class BeanProperty implements ElPropertyValue, Property, SqlTreeProperty
     return aggregation != null;
   }
 
+  @Override
   public void appendSelect(DbSqlContext ctx, boolean subQuery) {
 
     if (aggregation != null) {
@@ -586,8 +593,7 @@ public class BeanProperty implements ElPropertyValue, Property, SqlTreeProperty
     } else if (!isTransient && !ignoreDraftOnlyProperty(ctx.isDraftQuery())) {
 
       if (secondaryTableJoin != null) {
-        String relativePrefix = ctx.getRelativePrefix(secondaryTableJoinPrefix);
-        ctx.pushTableAlias(relativePrefix);
+        ctx.pushTableAlias(ctx.getRelativePrefix(secondaryTableJoinPrefix));
       }
 
       if (dbEncrypted) {
@@ -614,14 +620,17 @@ public class BeanProperty implements ElPropertyValue, Property, SqlTreeProperty
     return owningType.isAssignableFrom(type);
   }
 
+  @Override
   public void loadIgnore(DbReadContext ctx) {
     scalarType.loadIgnore(ctx.getDataReader());
   }
 
+  @Override
   public void load(SqlBeanLoad sqlBeanLoad) {
     sqlBeanLoad.load(this);
   }
 
+  @Override
   public void buildRawSqlSelectChain(String prefix, List<String> selectChain) {
     if (prefix == null) {
       selectChain.add(name);
@@ -808,13 +817,6 @@ public class BeanProperty implements ElPropertyValue, Property, SqlTreeProperty
     setValue(bean, cacheData);
   }
 
-  /**
-   * Get the property value from a compound value type.
-   */
-  public Object getValueObject(Object bean) {
-    throw new RuntimeException("Expected to be called only on BeanPropertyCompoundScalar");
-  }
-
   @Override
   public Object getVal(Object bean) {
     return getValue((EntityBean) bean);
@@ -1368,6 +1370,7 @@ public class BeanProperty implements ElPropertyValue, Property, SqlTreeProperty
   /**
    * Return true if this is included in the unique id.
    */
+  @Override
   public boolean isId() {
     return id;
   }
@@ -1376,6 +1379,7 @@ public class BeanProperty implements ElPropertyValue, Property, SqlTreeProperty
    * Return true if this is an Embedded property. In this case it shares the
    * table and primary key of its owner object.
    */
+  @Override
   public boolean isEmbedded() {
     return embedded;
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
index 656f5d0bc..cbe81bcbb 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
@@ -1,10 +1,11 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.EbeanServer;
 import io.ebean.Query;
 import io.ebean.bean.EntityBean;
 import io.ebean.text.PathProperties;
 import io.ebean.util.SplitName;
+import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.core.DefaultSqlUpdate;
 import io.ebeaninternal.server.core.InternString;
 import io.ebeaninternal.server.deploy.id.IdBinder;
@@ -15,7 +16,10 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc;
 import io.ebeaninternal.server.el.ElPropertyChainBuilder;
 import io.ebeaninternal.server.el.ElPropertyValue;
 import io.ebeaninternal.server.persist.MultiValueWrapper;
+import io.ebeaninternal.server.query.STreePropertyAssoc;
+import io.ebeaninternal.server.query.STreeType;
 import io.ebeaninternal.server.query.SqlJoinType;
+import io.ebeaninternal.server.querydefn.DefaultOrmQuery;
 import io.ebeanservice.docstore.api.mapping.DocMappingBuilder;
 import io.ebeanservice.docstore.api.mapping.DocPropertyMapping;
 import io.ebeanservice.docstore.api.mapping.DocPropertyType;
@@ -30,7 +34,7 @@ import java.util.List;
 /**
  * Abstract base for properties mapped to an associated bean, list, set or map.
  */
-public abstract class BeanPropertyAssoc<T> extends BeanProperty {
+public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STreePropertyAssoc {
 
   private static final Logger logger = LoggerFactory.getLogger(BeanPropertyAssoc.class);
 
@@ -101,15 +105,18 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty {
    * Initialise post construction.
    */
   @Override
-  public void initialise() {
+  public void initialise(BeanDescriptorInitContext initContext) {
     // this *MUST* execute after the BeanDescriptor is
     // put into the map to stop infinite recursion
+    initialiseTargetDescriptor(initContext);
+  }
+
+  void initialiseTargetDescriptor(BeanDescriptorInitContext initContext) {
     targetDescriptor = descriptor.getBeanDescriptor(targetType);
     if (!isTransient) {
       targetIdBinder = targetDescriptor.getIdBinder();
       targetInheritInfo = targetDescriptor.getInheritInfo();
       saveRecurseSkippable = targetDescriptor.isSaveRecurseSkippable();
-
       if (!targetIdBinder.isComplexId()) {
         targetIdProperty = targetIdBinder.getIdProperty();
       }
@@ -142,6 +149,7 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty {
   /**
    * Add table join with table alias based on prefix.
    */
+  @Override
   public SqlJoinType addJoin(SqlJoinType joinType, String prefix, DbSqlContext ctx) {
     return tableJoin.addJoin(joinType, prefix, ctx);
   }
@@ -149,6 +157,7 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty {
   /**
    * Add table join with explicit table alias.
    */
+  @Override
   public SqlJoinType addJoin(SqlJoinType joinType, String a1, String a2, DbSqlContext ctx) {
     return tableJoin.addJoin(joinType, a1, a2, ctx);
   }
@@ -186,6 +195,29 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty {
     return targetDescriptor;
   }
 
+  SpiEbeanServer server() {
+    return descriptor.getEbeanServer();
+  }
+
+  /**
+   * Create a new query for the target type.
+   *
+   * We use target descriptor rather than target property type to support ElementCollection.
+   */
+  public SpiQuery<T> newQuery(SpiEbeanServer server) {
+    return new DefaultOrmQuery<>(targetDescriptor, server, server.getExpressionFactory());
+  }
+
+  @Override
+  public IdBinder getIdBinder() {
+    return descriptor.getIdBinder();
+  }
+
+  @Override
+  public STreeType target() {
+    return targetDescriptor;
+  }
+
   /**
    * Return true if the target side has soft delete.
    */
@@ -325,6 +357,13 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty {
     return tableJoin.columns().length <= 0 || tableJoin.columns()[0].isInsertable();
   }
 
+  /**
+   * Return the underlying BeanTable for this property.
+   */
+  public BeanTable getBeanTable() {
+    return beanTable;
+  }
+
   /**
    * return the join to use for the bean.
    */
@@ -440,10 +479,6 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty {
     }
   }
 
-  EbeanServer server() {
-    return getBeanDescriptor().getEbeanServer();
-  }
-
   void bindParentIds(DefaultSqlUpdate delete, List<Object> parentIds) {
 
     if (isExportedSimple()) {
@@ -492,4 +527,26 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty {
   private boolean isExportedSimple() {
     return exportedProperties.length == 1;
   }
+
+  /**
+   * Find and return the exported property matching to this property.
+   */
+  ExportedProperty findMatch(boolean embedded, BeanProperty prop, String matchColumn, TableJoin tableJoin) {
+
+    String searchTable = tableJoin.getTable();
+
+    for (TableJoinColumn column : tableJoin.columns()) {
+      String matchTo = column.getLocalDbColumn();
+
+      if (matchColumn.equalsIgnoreCase(matchTo)) {
+        String foreignCol = column.getForeignDbColumn();
+        return new ExportedProperty(embedded, foreignCol, prop);
+      }
+    }
+
+    String msg = "Error with the Join on [" + getFullBeanName()
+      + "]. Could not find the matching foreign key for [" + matchColumn + "] in table[" + searchTable + "]?"
+      + " Perhaps using a @JoinColumn with the name/referencedColumnName attributes swapped?";
+    throw new PersistenceException(msg);
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index f193624b0..42d3e0667 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -1,7 +1,5 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.EbeanServer;
-import io.ebean.Query;
 import io.ebean.SqlUpdate;
 import io.ebean.Transaction;
 import io.ebean.bean.BeanCollection;
@@ -12,11 +10,11 @@ import io.ebean.bean.EntityBean;
 import io.ebean.text.PathProperties;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.api.SpiQuery;
-import io.ebeaninternal.server.core.DefaultSqlUpdate;
 import io.ebeaninternal.server.deploy.id.ImportedId;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany;
 import io.ebeaninternal.server.el.ElPropertyChainBuilder;
 import io.ebeaninternal.server.el.ElPropertyValue;
+import io.ebeaninternal.server.query.STreePropertyAssocMany;
 import io.ebeaninternal.server.query.SqlBeanLoad;
 import io.ebeaninternal.server.text.json.ReadJson;
 import io.ebeaninternal.server.text.json.SpiJsonWriter;
@@ -35,7 +33,7 @@ import java.util.Map;
 /**
  * Property mapped to a List Set or Map.
  */
-public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
+public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements STreePropertyAssocMany {
 
   private static final Logger logger = LoggerFactory.getLogger(BeanPropertyAssocMany.class);
 
@@ -51,7 +49,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
   /**
    * For ManyToMany this is the Inverse join used to build reference queries.
    */
-  private final TableJoin inverseJoin;
+  final TableJoin inverseJoin;
 
   /**
    * Flag to indicate that this is a unidirectional relationship.
@@ -70,6 +68,8 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
    */
   private final boolean manyToMany;
 
+  private final boolean elementCollection;
+
   /**
    * Order by used when fetch joining the associated many.
    */
@@ -91,8 +91,6 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
 
   private BeanProperty mapKeyProperty;
 
-  private String exportedPropertyBindProto = "?";
-
   /**
    * Property on the 'child' bean that links back to the 'master'.
    */
@@ -106,9 +104,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
 
   private ImportedId importedId;
 
-  private String deleteByParentIdSql;
-
-  private String deleteByParentIdInSql;
+  private BeanPropertyAssocManySqlHelp<T> sqlHelp;
 
   /**
    * Create this property.
@@ -119,6 +115,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
     this.o2mJoinTable = deploy.isO2mJoinTable();
     this.hasOrderColumn = deploy.hasOrderColumn();
     this.manyToMany = deploy.isManyToMany();
+    this.elementCollection = deploy.isElementCollection();
     this.manyType = deploy.getManyType();
     this.mapKey = deploy.getMapKey();
     this.fetchOrderBy = deploy.getFetchOrderBy();
@@ -136,13 +133,15 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
   }
 
   @Override
-  public void initialise() {
-    super.initialise();
+  public void initialise(BeanDescriptorInitContext initContext) {
+    super.initialise(initContext);
+    initialiseAssocMany();
+  }
 
+  private void initialiseAssocMany() {
     if (!isTransient) {
       this.help = BeanCollectionHelpFactory.create(this);
-
-      if (hasJoinTable()) {
+      if (hasJoinTable() || elementCollection) {
         importedId = createImportedId(this, targetDescriptor, tableJoin);
 
       } else {
@@ -159,37 +158,21 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
       }
 
       exportedProperties = createExported();
+      this.sqlHelp = new BeanPropertyAssocManySqlHelp<>(this, exportedProperties);
+
       if (exportedProperties.length > 0) {
         embeddedExportedProperties = exportedProperties[0].isEmbedded();
-        exportedPropertyBindProto = deriveExportedPropertyBindProto();
-
         if (fetchOrderBy != null) {
-          // derive lazyFetchOrderBy
-          StringBuilder sb = new StringBuilder(50);
-          for (int i = 0; i < exportedProperties.length; i++) {
-            if (i > 0) {
-              sb.append(", ");
-            }
-            // these fk columns are either on the intersection (int_) or base table (t0)
-            String fkTableAlias = hasJoinTable() ? "int_" : "t0";
-            sb.append(fkTableAlias).append(".").append(exportedProperties[i].getForeignDbColumn());
-          }
-          sb.append(", ").append(fetchOrderBy);
-          lazyFetchOrderBy = sb.toString().trim();
+          lazyFetchOrderBy = sqlHelp.lazyFetchOrderBy(fetchOrderBy);
         }
       }
-
-      String delStmt;
-      if (hasJoinTable()) {
-        delStmt = "delete from " + inverseJoin.getTable() + " where ";
-      } else {
-        delStmt = "delete from " + targetDescriptor.getBaseTable() + " where ";
-      }
-      deleteByParentIdSql = delStmt + deriveWhereParentIdSql(false, "");
-      deleteByParentIdInSql = delStmt + deriveWhereParentIdSql(true, "");
     }
   }
 
+  String targetTable() {
+    return targetDescriptor.getBaseTable();
+  }
+
   /**
    * Initialise after the target bean descriptors have been all set.
    */
@@ -295,44 +278,23 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
 
   public SqlUpdate deleteByParentId(Object parentId, List<Object> parentIdist) {
     if (parentId != null) {
-      return deleteByParentId(parentId);
+      return sqlHelp.deleteByParentId(parentId);
     } else {
-      return deleteByParentIdList(parentIdist);
+      return sqlHelp.deleteByParentIdList(parentIdist);
     }
   }
 
-  private SqlUpdate deleteByParentId(Object parentId) {
-    DefaultSqlUpdate sqlDelete = new DefaultSqlUpdate(deleteByParentIdSql);
-    bindParentId(sqlDelete, parentId);
-    return sqlDelete;
-  }
-
   /**
    * Find the Id's of detail beans given a parent Id or list of parent Id's.
    */
   public List<Object> findIdsByParentId(Object parentId, List<Object> parentIdList, Transaction t, List<Object> excludeDetailIds) {
     if (parentId != null) {
-      return findIdsByParentId(parentId, t, excludeDetailIds);
+      return sqlHelp.findIdsByParentId(parentId, t, excludeDetailIds);
     } else {
-      return findIdsByParentIdList(parentIdList, t, excludeDetailIds);
+      return sqlHelp.findIdsByParentIdList(parentIdList, t, excludeDetailIds);
     }
   }
 
-  private List<Object> findIdsByParentId(Object parentId, Transaction t, List<Object> excludeDetailIds) {
-
-    String rawWhere = deriveWhereParentIdSql(false, "");
-
-    EbeanServer server = server();
-    Query<?> q = server.find(getPropertyType());
-    bindParentIdEq(rawWhere, parentId, q);
-
-    if (excludeDetailIds != null && !excludeDetailIds.isEmpty()) {
-      q.where().not(q.getExpressionFactory().idIn(excludeDetailIds));
-    }
-
-    return server.findIds(q, t);
-  }
-
   /**
    * Exclude many properties from bean cache data.
    */
@@ -359,88 +321,10 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
       // assumes the ManyToOne property is included
       query.where().in(childMasterIdProperty, parentIds);
     } else {
-      addWhereParentIdIn(query, parentIds);
+      sqlHelp.addWhereParentIdIn(query, parentIds);
     }
   }
 
-  /**
-   * Add a where clause to the query for a given list of parent Id's.
-   */
-  private void addWhereParentIdIn(SpiQuery<?> query, List<Object> parentIds) {
-
-    String tableAlias = hasJoinTable() ? "int_." : "t0.";
-    if (hasJoinTable()) {
-      query.setM2MIncludeJoin(inverseJoin);
-    }
-    String rawWhere = deriveWhereParentIdSql(true, tableAlias);
-    String expr = descriptor.getParentIdInExpr(parentIds.size(), rawWhere);
-
-    bindParentIdsIn(expr, parentIds, query);
-  }
-
-  private List<Object> findIdsByParentIdList(List<Object> parentIds, Transaction t, List<Object> excludeDetailIds) {
-
-    String rawWhere = deriveWhereParentIdSql(true, "");
-    String inClause = buildInClauseBinding(parentIds.size(), exportedPropertyBindProto);
-
-    String expr = rawWhere + inClause;
-
-    EbeanServer server = descriptor.getEbeanServer();
-    Query<?> q = server.find(propertyType);
-    bindParentIdsIn(expr, parentIds, q);
-
-    if (excludeDetailIds != null && !excludeDetailIds.isEmpty()) {
-      q.where().not(q.getExpressionFactory().idIn(excludeDetailIds));
-    }
-
-    return server.findIds(q, t);
-  }
-
-  private SqlUpdate deleteByParentIdList(List<Object> parentIds) {
-
-    StringBuilder sb = new StringBuilder(100);
-    sb.append(deleteByParentIdInSql);
-    sb.append(buildInClauseBinding(parentIds.size(), exportedPropertyBindProto));
-
-    DefaultSqlUpdate delete = new DefaultSqlUpdate(sb.toString());
-    bindParentIds(delete, parentIds);
-    return delete;
-  }
-
-  private String deriveExportedPropertyBindProto() {
-    if (exportedProperties.length == 1) {
-      return "?";
-    }
-    StringBuilder sb = new StringBuilder();
-    sb.append("(");
-    for (int i = 0; i < exportedProperties.length; i++) {
-      if (i > 0) {
-        sb.append(",");
-      }
-      sb.append("?");
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  private String buildInClauseBinding(int size, String bindProto) {
-
-    if (descriptor.isSimpleId()) {
-      return descriptor.getIdBinder().getIdInValueExpr(false, size);
-    }
-    StringBuilder sb = new StringBuilder(10 + (size * (bindProto.length() + 1)));
-    sb.append(" in");
-    sb.append(" (");
-    for (int i = 0; i < size; i++) {
-      if (i > 0) {
-        sb.append(",");
-      }
-      sb.append(bindProto);
-    }
-    sb.append(") ");
-    return sb.toString();
-  }
-
   /**
    * Set the lazy load server to help create reference collections (that lazy
    * load on demand).
@@ -476,7 +360,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
   }
 
   @Override
-  public Object readSet(DbReadContext ctx, EntityBean bean) throws SQLException {
+  public Object readSet(DbReadContext ctx, EntityBean bean) {
     return null;
   }
 
@@ -616,6 +500,10 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
     return manyToMany;
   }
 
+  public boolean isElementCollection() {
+    return elementCollection;
+  }
+
   /**
    * ManyToMany only, join from local table to intersection table.
    */
@@ -705,30 +593,6 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
     }
   }
 
-  private String deriveWhereParentIdSql(boolean inClause, String tableAlias) {
-
-    StringBuilder sb = new StringBuilder();
-
-    if (inClause) {
-      sb.append("(");
-    }
-    for (int i = 0; i < exportedProperties.length; i++) {
-      String fkColumn = exportedProperties[i].getForeignDbColumn();
-      if (i > 0) {
-        String s = inClause ? "," : " and ";
-        sb.append(s);
-      }
-      sb.append(tableAlias).append(fkColumn);
-      if (!inClause) {
-        sb.append("=? ");
-      }
-    }
-    if (inClause) {
-      sb.append(")");
-    }
-    return sb.toString();
-  }
-
   /**
    * Create the array of ExportedProperty used to build reference objects.
    */
@@ -741,12 +605,9 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
     if (idProp != null && idProp.isEmbedded()) {
 
       BeanPropertyAssocOne<?> one = (BeanPropertyAssocOne<?>) idProp;
-      BeanDescriptor<?> targetDesc = one.getTargetDescriptor();
-      BeanProperty[] emIds = targetDesc.propertiesBaseScalar();
       try {
-        for (BeanProperty emId : emIds) {
-          ExportedProperty expProp = findMatch(true, emId);
-          list.add(expProp);
+        for (BeanProperty emId : one.getTargetDescriptor().propertiesBaseScalar()) {
+          list.add(findMatch(true, emId));
         }
       } catch (PersistenceException e) {
         // not found as individual scalar properties
@@ -755,8 +616,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
 
     } else {
       if (idProp != null) {
-        ExportedProperty expProp = findMatch(false, idProp);
-        list.add(expProp);
+        list.add(findMatch(false, idProp));
       }
     }
 
@@ -768,32 +628,12 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
    */
   private ExportedProperty findMatch(boolean embedded, BeanProperty prop) {
 
-    String matchColumn = prop.getDbColumn();
-
-    String searchTable;
-    TableJoinColumn[] columns;
     if (hasJoinTable()) {
       // look for column going to intersection
-      columns = intersectionJoin.columns();
-      searchTable = intersectionJoin.getTable();
-
+      return findMatch(embedded, prop, prop.getDbColumn(), intersectionJoin);
     } else {
-      columns = tableJoin.columns();
-      searchTable = tableJoin.getTable();
+      return findMatch(embedded, prop, prop.getDbColumn(), tableJoin);
     }
-    for (TableJoinColumn column : columns) {
-      String matchTo = column.getLocalDbColumn();
-
-      if (matchColumn.equalsIgnoreCase(matchTo)) {
-        String foreignCol = column.getForeignDbColumn();
-        return new ExportedProperty(embedded, foreignCol, prop);
-      }
-    }
-
-    String msg = "Error with the Join on [" + getFullBeanName()
-      + "]. Could not find the matching foreign key for [" + matchColumn + "] in table[" + searchTable + "]?"
-      + " Perhaps using a @JoinColumn with the name/referencedColumnName attributes swapped?";
-    throw new PersistenceException(msg);
   }
 
   /**
@@ -813,8 +653,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
     Class<?> beanType = descriptor.getBeanType();
     BeanDescriptor<?> targetDesc = getTargetDescriptor();
 
-    BeanPropertyAssocOne<?>[] ones = targetDesc.propertiesOne();
-    for (BeanPropertyAssocOne<?> prop : ones) {
+    for (BeanPropertyAssocOne<?> prop : targetDesc.propertiesOne()) {
       if (mappedBy != null) {
         // match using mappedBy as property name
         if (mappedBy.equalsIgnoreCase(prop.getName())) {
@@ -880,9 +719,9 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
   /**
    * Register the mapping of intersection table to associated draft table.
    */
-  public void registerDraftIntersectionTable(Map<String, String> draftTableMap) {
+  public void registerDraftIntersectionTable(BeanDescriptorInitContext initContext) {
     if (hasDraftIntersection()) {
-      draftTableMap.put(intersectionPublishTable, intersectionDraftTable);
+      initContext.addDraftIntersection(intersectionPublishTable, intersectionDraftTable);
     }
   }
 
@@ -928,7 +767,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
    * Skip JSON write value for ToMany property.
    */
   @Override
-  public void jsonWriteValue(SpiJsonWriter writeJson, Object value) throws IOException {
+  public void jsonWriteValue(SpiJsonWriter writeJson, Object value) {
     // do nothing, exclude ToMany properties
   }
 
@@ -1030,4 +869,16 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
   public boolean isIncludeCascadeDelete() {
     return cascadeInfo.isDelete() || o2mJoinTable || ModifyListenMode.REMOVALS == modifyListenMode;
   }
+
+  public String insertElementCollection() {
+    return sqlHelp.insertElementCollection();
+  }
+
+  public boolean isTargetDocStoreMapped() {
+    return targetDescriptor.isDocStoreMapped();
+  }
+
+  public BeanCollectionHelp<T> getHelp() {
+    return help;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java
index 258f74ae5..faa77fb49 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java
@@ -13,7 +13,7 @@ import java.io.IOException;
 /**
  * Help BeanPropertyAssocMany with JSON processing.
  */
-public class BeanPropertyAssocManyJsonHelp {
+class BeanPropertyAssocManyJsonHelp {
 
   /**
    * The associated many property.
@@ -28,7 +28,7 @@ public class BeanPropertyAssocManyJsonHelp {
   /**
    * Construct for the owning many property.
    */
-  public BeanPropertyAssocManyJsonHelp(BeanPropertyAssocMany<?> many) {
+  BeanPropertyAssocManyJsonHelp(BeanPropertyAssocMany<?> many) {
     this.many = many;
     boolean objectMapperPresent = many.getBeanDescriptor().getServerConfig().getClassLoadConfig().isJacksonObjectMapperPresent();
     this.jsonTransient = !objectMapperPresent ? null : new BeanPropertyAssocManyJsonTransient();
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java
index e00215e6c..fd1b9fe1d 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java
@@ -14,12 +14,12 @@ import java.util.LinkedHashMap;
 /**
  * Helper used to read transient many properties using Jackson ObjectMapper.
  */
-public class BeanPropertyAssocManyJsonTransient {
+class BeanPropertyAssocManyJsonTransient {
 
   /**
    * Use Jackson ObjectMapper to read the transient 'many' property.
    */
-  public void jsonReadUsingObjectMapper(BeanPropertyAssocMany<?> many, ReadJson readJson, EntityBean parentBean) throws IOException {
+  void jsonReadUsingObjectMapper(BeanPropertyAssocMany<?> many, ReadJson readJson, EntityBean parentBean) throws IOException {
 
     ObjectMapper mapper = readJson.getObjectMapper();
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java
new file mode 100644
index 000000000..3b3426aa3
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java
@@ -0,0 +1,258 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebean.SqlUpdate;
+import io.ebean.Transaction;
+import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.api.SpiQuery;
+import io.ebeaninternal.dbmigration.model.visitor.BaseTablePropertyVisitor;
+import io.ebeaninternal.dbmigration.model.visitor.VisitAllUsing;
+import io.ebeaninternal.server.core.DefaultSqlUpdate;
+
+import java.util.List;
+
+class BeanPropertyAssocManySqlHelp<T> {
+
+  private final BeanPropertyAssocMany<T> many;
+  private final ExportedProperty[] exportedProperties;
+  private final boolean hasJoinTable;
+  private final BeanDescriptor<?> descriptor;
+  private final String exportedPropertyBindProto;
+  private final String deleteByParentIdSql;
+  private final String deleteByParentIdInSql;
+  private final String elementCollectionInsertSql;
+
+  BeanPropertyAssocManySqlHelp(BeanPropertyAssocMany<T> many, ExportedProperty[] exportedProperties) {
+    this.many = many;
+    this.exportedProperties = exportedProperties;
+    this.hasJoinTable = many.hasJoinTable();
+    this.descriptor = many.getBeanDescriptor();
+    this.exportedPropertyBindProto = deriveExportedPropertyBindProto();
+
+    String delStmt;
+    if (hasJoinTable) {
+      delStmt = "delete from " + many.inverseJoin.getTable() + " where ";
+    } else {
+      delStmt = "delete from " + many.targetTable() + " where ";
+    }
+    deleteByParentIdSql = delStmt + deriveWhereParentIdSql(false, "");
+    deleteByParentIdInSql = delStmt + deriveWhereParentIdSql(true, "");
+    if (many.isElementCollection()) {
+      elementCollectionInsertSql = elementCollectionInsert();
+    } else {
+      elementCollectionInsertSql = null;
+    }
+  }
+
+  private String elementCollectionInsert() {
+
+    StringBuilder sb = new StringBuilder(200);
+    sb.append("insert into ").append(many.targetTable()).append(" (");
+    append(sb, "", ",", "");
+
+    Cols cols = new Cols(sb);
+    VisitAllUsing.visitOne(many.targetDescriptor, cols);
+    sb.append(") values (");
+    appendBind(sb, exportedProperties.length, true);
+    appendBind(sb, cols.colCount, false);
+    sb.append(")");
+
+    return sb.toString();
+  }
+
+  public String insertElementCollection() {
+    return elementCollectionInsertSql;
+  }
+
+  private static class Cols extends BaseTablePropertyVisitor {
+
+    int colCount;
+
+    private final StringBuilder sb;
+
+    private Cols(StringBuilder sb) {
+      this.sb = sb;
+    }
+
+    @Override
+    public void visitEmbeddedScalar(BeanProperty p, BeanPropertyAssocOne<?> embedded) {
+      sb.append(",").append(p.getDbColumn());
+      colCount++;
+    }
+
+    @Override
+    public void visitOneImported(BeanPropertyAssocOne<?> p) {
+
+    }
+
+    @Override
+    public void visitScalar(BeanProperty p) {
+      sb.append(",").append(p.getDbColumn());
+      colCount++;
+    }
+
+    @Override
+    public void visitEnd() {
+
+    }
+  }
+
+  String lazyFetchOrderBy(String fetchOrderBy) {
+
+    // derive lazyFetchOrderBy
+    StringBuilder sb = new StringBuilder(50);
+    for (int i = 0; i < exportedProperties.length; i++) {
+      if (i > 0) {
+        sb.append(", ");
+      }
+      // these fk columns are either on the intersection (int_) or base table (t0)
+      String fkTableAlias = hasJoinTable ? "int_" : "t0";
+      sb.append(fkTableAlias).append(".").append(exportedProperties[i].getForeignDbColumn());
+    }
+    sb.append(", ").append(fetchOrderBy);
+    return sb.toString().trim();
+  }
+
+  /**
+   * Add a where clause to the query for a given list of parent Id's.
+   */
+  void addWhereParentIdIn(SpiQuery<?> query, List<Object> parentIds) {
+
+    String tableAlias = hasJoinTable ? "int_." : "t0.";
+    if (hasJoinTable) {
+      query.setM2MIncludeJoin(many.inverseJoin);
+    }
+    String rawWhere = deriveWhereParentIdSql(true, tableAlias);
+    String expr = descriptor.getParentIdInExpr(parentIds.size(), rawWhere);
+
+    many.bindParentIdsIn(expr, parentIds, query);
+  }
+
+  List<Object> findIdsByParentId(Object parentId, Transaction t, List<Object> excludeDetailIds) {
+
+    String rawWhere = deriveWhereParentIdSql(false, "");
+
+    SpiEbeanServer server = descriptor.getEbeanServer();
+    SpiQuery<?> q = many.newQuery(server);
+    many.bindParentIdEq(rawWhere, parentId, q);
+
+    if (excludeDetailIds != null && !excludeDetailIds.isEmpty()) {
+      q.where().not(q.getExpressionFactory().idIn(excludeDetailIds));
+    }
+
+    return server.findIds(q, t);
+  }
+
+  List<Object> findIdsByParentIdList(List<Object> parentIds, Transaction t, List<Object> excludeDetailIds) {
+
+    String rawWhere = deriveWhereParentIdSql(true, "");
+    String inClause = buildInClauseBinding(parentIds.size(), exportedPropertyBindProto);
+
+    String expr = rawWhere + inClause;
+
+    SpiEbeanServer server = descriptor.getEbeanServer();
+    SpiQuery<?> q = many.newQuery(server);
+    //Query<?> q = server.find(propertyType);
+    many.bindParentIdsIn(expr, parentIds, q);
+
+    if (excludeDetailIds != null && !excludeDetailIds.isEmpty()) {
+      q.where().not(q.getExpressionFactory().idIn(excludeDetailIds));
+    }
+
+    return server.findIds(q, t);
+  }
+
+  SqlUpdate deleteByParentId(Object parentId) {
+    DefaultSqlUpdate sqlDelete = new DefaultSqlUpdate(deleteByParentIdSql);
+    many.bindParentId(sqlDelete, parentId);
+    return sqlDelete;
+  }
+
+  SqlUpdate deleteByParentIdList(List<Object> parentIds) {
+
+    StringBuilder sb = new StringBuilder(100);
+    sb.append(deleteByParentIdInSql);
+    sb.append(buildInClauseBinding(parentIds.size(), exportedPropertyBindProto));
+
+    DefaultSqlUpdate delete = new DefaultSqlUpdate(sb.toString());
+    many.bindParentIds(delete, parentIds);
+    return delete;
+  }
+
+  private void appendBind(StringBuilder sb, int count, boolean skipComma) {
+    for (int i = 0; i < count; i++) {
+      if (!skipComma || i > 0) {
+        sb.append(",");
+      }
+      sb.append("?");
+    }
+  }
+
+  private void append(StringBuilder sb, String tableAlias, String prefix, String suffix) {
+    for (int i = 0; i < exportedProperties.length; i++) {
+      String fkColumn = exportedProperties[i].getForeignDbColumn();
+      if (i > 0) {
+        sb.append(prefix);
+      }
+      sb.append(tableAlias).append(fkColumn);
+      sb.append(suffix);
+    }
+  }
+  private String deriveWhereParentIdSql(boolean inClause, String tableAlias) {
+
+    StringBuilder sb = new StringBuilder();
+
+    if (inClause) {
+      sb.append("(");
+    }
+    for (int i = 0; i < exportedProperties.length; i++) {
+      String fkColumn = exportedProperties[i].getForeignDbColumn();
+      if (i > 0) {
+        String s = inClause ? "," : " and ";
+        sb.append(s);
+      }
+      sb.append(tableAlias).append(fkColumn);
+      if (!inClause) {
+        sb.append("=? ");
+      }
+    }
+    if (inClause) {
+      sb.append(")");
+    }
+    return sb.toString();
+  }
+
+  private String buildInClauseBinding(int size, String bindProto) {
+
+    if (descriptor.isSimpleId()) {
+      return descriptor.getIdBinder().getIdInValueExpr(false, size);
+    }
+    StringBuilder sb = new StringBuilder(10 + (size * (bindProto.length() + 1)));
+    sb.append(" in");
+    sb.append(" (");
+    for (int i = 0; i < size; i++) {
+      if (i > 0) {
+        sb.append(",");
+      }
+      sb.append(bindProto);
+    }
+    sb.append(") ");
+    return sb.toString();
+  }
+
+  private String deriveExportedPropertyBindProto() {
+    if (exportedProperties.length == 1) {
+      return "?";
+    }
+    StringBuilder sb = new StringBuilder();
+    sb.append("(");
+    for (int i = 0; i < exportedProperties.length; i++) {
+      if (i > 0) {
+        sb.append(",");
+      }
+      sb.append("?");
+    }
+    sb.append(")");
+    return sb.toString();
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index 2d34242b1..c4f28fd60 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -16,10 +16,12 @@ import io.ebeaninternal.server.deploy.id.ImportedId;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
 import io.ebeaninternal.server.el.ElPropertyChainBuilder;
 import io.ebeaninternal.server.el.ElPropertyValue;
+import io.ebeaninternal.server.query.STreePropertyAssocOne;
 import io.ebeaninternal.server.query.SqlBeanLoad;
 import io.ebeaninternal.server.query.SqlJoinType;
 import io.ebeaninternal.server.text.json.ReadJson;
 import io.ebeaninternal.server.text.json.SpiJsonWriter;
+import io.ebeaninternal.server.type.ScalarType;
 
 import javax.persistence.PersistenceException;
 import java.io.IOException;
@@ -32,7 +34,7 @@ import java.util.Map;
 /**
  * Property mapped to a joined bean.
  */
-public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
+public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STreePropertyAssocOne {
 
   private final boolean oneToOne;
 
@@ -94,8 +96,12 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
   }
 
   @Override
-  public void initialise() {
-    super.initialise();
+  public void initialise(BeanDescriptorInitContext initContext) {
+    super.initialise(initContext);
+    initialiseAssocOne();
+  }
+
+  private void initialiseAssocOne() {
     localHelp = createHelp(embedded, oneToOneExported);
 
     if (!isTransient) {
@@ -417,6 +423,11 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
     }
   }
 
+  @Override
+  public ScalarType<?> getIdScalarType() {
+    return targetDescriptor.getIdProperty().getScalarType();
+  }
+
   /**
    * Return the Id values from the given bean.
    */
@@ -539,24 +550,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
    */
   private ExportedProperty findMatch(boolean embeddedProp, BeanProperty prop) {
 
-    String matchColumn = prop.getDbColumn();
-
-    String searchTable = tableJoin.getTable();
-    TableJoinColumn[] columns = tableJoin.columns();
-
-    for (TableJoinColumn column : columns) {
-      String matchTo = column.getLocalDbColumn();
-
-      if (matchColumn.equalsIgnoreCase(matchTo)) {
-        String foreignCol = column.getForeignDbColumn();
-        return new ExportedProperty(embeddedProp, foreignCol, prop);
-      }
-    }
-
-    String msg = "Error with the Join on [" + getFullBeanName()
-      + "]. Could not find the matching foreign key for [" + matchColumn + "] in table[" + searchTable + "]?"
-      + " Perhaps using a @JoinColumn with the name/referencedColumnName attributes swapped?";
-    throw new PersistenceException(msg);
+    return findMatch(embeddedProp, prop, prop.getDbColumn(), tableJoin);
   }
 
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java
index c3d7fc6a2..69f79bd1c 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java
@@ -4,8 +4,27 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanPropertySimpleCollection;
 
 public class BeanPropertySimpleCollection<T> extends BeanPropertyAssocMany<T> {
 
+  private BeanDescriptor<T> elementDescriptor;
+
   public BeanPropertySimpleCollection(BeanDescriptor<?> descriptor, DeployBeanPropertySimpleCollection<T> deploy) {
     super(descriptor, deploy);
+    this.elementDescriptor = deploy.getElementDescriptor();
   }
 
+  @Override
+  public void initialise(BeanDescriptorInitContext initContext) {
+    super.initialise(initContext);
+    if (isElementCollection()) {
+      // initialise all non-id properties (we don't have an Id property)
+      elementDescriptor.initialiseOther(initContext);
+    }
+  }
+
+  void initialiseTargetDescriptor(BeanDescriptorInitContext initContext) {
+    if (isElementCollection()) {
+      targetDescriptor = elementDescriptor;
+    } else {
+      targetDescriptor = descriptor.getBeanDescriptor(targetType);
+    }
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java
index 0dfdf40af..450ed659a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java
@@ -5,7 +5,6 @@ import io.ebean.Query;
 import io.ebean.Transaction;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanCollectionAdd;
-import io.ebean.bean.BeanCollectionLoader;
 import io.ebean.bean.EntityBean;
 import io.ebean.common.BeanSet;
 import io.ebeaninternal.server.text.json.SpiJsonWriter;
@@ -19,32 +18,18 @@ import java.util.Set;
  */
 public final class BeanSetHelp<T> extends BaseCollectionHelp<T> {
 
-  private final BeanPropertyAssocMany<T> many;
-  private final BeanDescriptor<T> targetDescriptor;
-  private final String propertyName;
-  private BeanCollectionLoader loader;
-
   /**
    * When attached to a specific many property.
    */
-  public BeanSetHelp(BeanPropertyAssocMany<T> many) {
-    this.many = many;
-    this.targetDescriptor = many.getTargetDescriptor();
-    this.propertyName = many.getName();
+  BeanSetHelp(BeanPropertyAssocMany<T> many) {
+    super(many);
   }
 
   /**
    * For a query that returns a set.
    */
-  public BeanSetHelp() {
-    this.many = null;
-    this.targetDescriptor = null;
-    this.propertyName = null;
-  }
-
-  @Override
-  public void setLoader(BeanCollectionLoader loader) {
-    this.loader = loader;
+  BeanSetHelp() {
+    super();
   }
 
   @Override
@@ -61,15 +46,6 @@ public final class BeanSetHelp<T> extends BaseCollectionHelp<T> {
     }
   }
 
-  @Override
-  public void add(BeanCollection<?> collection, EntityBean bean, boolean withCheck) {
-    if (withCheck) {
-      collection.internalAddWithCheck(bean);
-    } else {
-      collection.internalAdd(bean);
-    }
-  }
-
   @Override
   public BeanCollection<T> createEmptyNoParent() {
     return new BeanSet<>();
@@ -142,13 +118,6 @@ public final class BeanSetHelp<T> extends BaseCollectionHelp<T> {
     } else {
       set = (Set<?>) collection;
     }
-
-    if (!set.isEmpty() || ctx.isIncludeEmpty()) {
-      ctx.beginAssocMany(name);
-      for (Object bean : set) {
-        targetDescriptor.jsonWrite(ctx, (EntityBean) bean);
-      }
-      ctx.endAssocMany();
-    }
+    jsonWriteCollection(ctx, name, set);
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java b/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java
index c481660e8..f2cc09e78 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java
@@ -42,6 +42,16 @@ public class BeanTable {
     this.idProperty = mutable.createIdProperty(owner);
   }
 
+  /**
+   * Construct for element collection.
+   */
+  public BeanTable(BeanDescriptorMap owner, String tableName, Class<?> beanType) {
+    this.owner = owner;
+    this.beanType = beanType;
+    this.baseTable = tableName;
+    this.idProperty = null;
+  }
+
   @Override
   public String toString() {
     return baseTable;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DbReadContext.java b/src/main/java/io/ebeaninternal/server/deploy/DbReadContext.java
index b7f346313..c282eca47 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DbReadContext.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DbReadContext.java
@@ -5,6 +5,7 @@ import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.bean.PersistenceContext;
 import io.ebeaninternal.api.SpiQuery;
+import io.ebeaninternal.server.query.STreePropertyAssocMany;
 import io.ebeaninternal.server.type.DataReader;
 
 import java.util.Map;
@@ -68,7 +69,7 @@ public interface DbReadContext {
    * Return the property that is associated with the many. There can only be
    * one. This can be null.
    */
-  BeanPropertyAssocMany<?> getManyProperty();
+  STreePropertyAssocMany getManyProperty();
 
   /**
    * Set back the bean that has just been loaded with its id.
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java
index e0fae9d19..194f4eb47 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.deploy;
 
+import io.ebeaninternal.server.query.STreeProperty;
 import io.ebeaninternal.server.query.SqlJoinType;
-import io.ebeaninternal.server.query.SqlTreeProperty;
 import io.ebeaninternal.server.type.ScalarType;
 
 import java.util.List;
@@ -9,14 +9,14 @@ import java.util.List;
 /**
  * Abstract base for dynamic properties.
  */
-abstract class DynamicPropertyBase implements SqlTreeProperty {
+abstract class DynamicPropertyBase implements STreeProperty {
 
   final String name;
   final String fullName;
   final String elPrefix;
   final ScalarType<?> scalarType;
 
-  public DynamicPropertyBase(String name, String fullName, String elPrefix, ScalarType<?> scalarType) {
+  DynamicPropertyBase(String name, String fullName, String elPrefix, ScalarType<?> scalarType) {
     this.name = name;
     this.fullName = fullName;
     this.elPrefix = elPrefix;
@@ -43,6 +43,11 @@ abstract class DynamicPropertyBase implements SqlTreeProperty {
     return false;
   }
 
+  @Override
+  public boolean isFormula() {
+    return false;
+  }
+
   @Override
   public String getElPrefix() {
     return elPrefix;
@@ -67,4 +72,9 @@ abstract class DynamicPropertyBase implements SqlTreeProperty {
   public void appendFrom(DbSqlContext ctx, SqlJoinType joinType) {
     // do not add to from usually
   }
+
+  @Override
+  public String getEncryptKeyAsString() {
+    return null;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ElementEntityBean.java b/src/main/java/io/ebeaninternal/server/deploy/ElementEntityBean.java
new file mode 100644
index 000000000..3724cac99
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/ElementEntityBean.java
@@ -0,0 +1,81 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebean.bean.EntityBean;
+import io.ebean.bean.EntityBeanIntercept;
+
+class ElementEntityBean implements EntityBean {
+
+  private final String[] properties;
+
+  private Object[] data;
+
+  private EntityBeanIntercept intercept;
+
+  ElementEntityBean(String[] properties) {
+    this.properties = properties;
+    this.intercept = new EntityBeanIntercept(this);
+  }
+
+  @Override
+  public String[] _ebean_getPropertyNames() {
+    return properties;
+  }
+
+  @Override
+  public String _ebean_getPropertyName(int pos) {
+    return properties[pos];
+  }
+
+  @Override
+  public String _ebean_getMarker() {
+    return null;
+  }
+
+  @Override
+  public Object _ebean_newInstance() {
+    return new ElementEntityBean(properties);
+  }
+
+  @Override
+  public void _ebean_setEmbeddedLoaded() {
+
+  }
+
+  @Override
+  public boolean _ebean_isEmbeddedNewOrDirty() {
+    return false;
+  }
+
+  @Override
+  public EntityBeanIntercept _ebean_getIntercept() {
+    return intercept;
+  }
+
+  @Override
+  public EntityBeanIntercept _ebean_intercept() {
+    return intercept;
+  }
+
+  @Override
+  public void _ebean_setField(int fieldIndex, Object value) {
+    if (data == null) {
+      data = new Object[properties.length];
+    }
+    data[fieldIndex] = value;
+  }
+
+  @Override
+  public void _ebean_setFieldIntercept(int fieldIndex, Object value) {
+    _ebean_setField(fieldIndex, value);
+  }
+
+  @Override
+  public Object _ebean_getField(int fieldIndex) {
+    return data == null ? null : data[fieldIndex];
+  }
+
+  @Override
+  public Object _ebean_getFieldIntercept(int fieldIndex) {
+    return _ebean_getField(fieldIndex);
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java b/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
index 817868cd5..c63d39b3e 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.deploy;
 
 import io.ebeaninternal.server.el.ElPropertyDeploy;
-import io.ebeaninternal.server.query.SqlTreeProperty;
+import io.ebeaninternal.server.query.STreeProperty;
 import io.ebeaninternal.server.type.ScalarType;
 
 import java.sql.Types;
@@ -89,7 +89,7 @@ class FormulaPropertyPath {
     return alias;
   }
 
-  SqlTreeProperty build() {
+  STreeProperty build() {
 
     DeployPropertyParser parser = descriptor.parser().setCatchFirst(true);
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java b/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
index 0e045c4e2..d93d74fdc 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
@@ -184,7 +184,7 @@ public class InheritInfo {
 
     for (InheritInfo childInfo : children) {
       // recursively search this child bean descriptor
-      prop = childInfo.desc().findBeanProperty(propertyName);
+      prop = childInfo.desc().findProperty(propertyName);
       if (prop != null) {
         return prop;
       }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java
index 766f9eb60..d3a018e10 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java
@@ -6,6 +6,7 @@ import io.ebeaninternal.server.core.DefaultSqlUpdate;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.DbReadContext;
 import io.ebeaninternal.server.deploy.DbSqlContext;
+import io.ebeaninternal.server.query.STreeProperty;
 import io.ebeaninternal.server.type.DataBind;
 
 import java.io.DataInput;
@@ -52,7 +53,7 @@ public interface IdBinder {
   /**
    * Return the Id BeanProperty.
    */
-  BeanProperty getBeanProperty();
+  STreeProperty getBeanProperty();
 
   /**
    * Find a BeanProperty that is mapped to the database column.
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/BeanPropertyElementSetter.java b/src/main/java/io/ebeaninternal/server/deploy/meta/BeanPropertyElementSetter.java
new file mode 100644
index 000000000..f20ee47cf
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/BeanPropertyElementSetter.java
@@ -0,0 +1,26 @@
+package io.ebeaninternal.server.deploy.meta;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.properties.BeanPropertySetter;
+
+/**
+ * Setter used for "element beans" with ElementCollection.
+ */
+class BeanPropertyElementSetter implements BeanPropertySetter {
+
+  private final int pos;
+
+  BeanPropertyElementSetter(int pos) {
+    this.pos = pos;
+  }
+
+  @Override
+  public void set(EntityBean bean, Object value) {
+    bean._ebean_setField(pos, value);
+  }
+
+  @Override
+  public void setIntercept(EntityBean bean, Object value) {
+    set(bean, value);
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
index ce091b2ec..f2ae582ee 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
@@ -210,6 +210,8 @@ public class DeployBeanProperty {
 
   private boolean undirectionalShadow;
 
+  private boolean elementProperty;
+
   private int sortOrder;
 
   private boolean excludedFromHistory;
@@ -444,7 +446,11 @@ public class DeployBeanProperty {
   }
 
   public BeanPropertySetter getSetter() {
-    return setter;
+    if (elementProperty) {
+      return new BeanPropertyElementSetter(sortOrder);
+    } else {
+      return setter;
+    }
   }
 
   /**
@@ -1081,4 +1087,10 @@ public class DeployBeanProperty {
     return dbMigrationInfos;
   }
 
+  /**
+   * Set when this property is part of a 'element bean' used with ElementCollection.
+   */
+  public void setElementProperty() {
+    this.elementProperty = true;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java
index 112223110..4e6d7d7d8 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.deploy.meta;
 
 import io.ebean.bean.BeanCollection.ModifyListenMode;
+import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.ManyType;
 import io.ebeaninternal.server.deploy.TableJoin;
 
@@ -23,6 +24,8 @@ public class DeployBeanPropertyAssocMany<T> extends DeployBeanPropertyAssoc<T> {
 
   private boolean o2mJoinTable;
 
+  private boolean elementCollection;
+
   /**
    * Flag to indicate this is a unidirectional relationship.
    */
@@ -46,6 +49,11 @@ public class DeployBeanPropertyAssocMany<T> extends DeployBeanPropertyAssoc<T> {
 
   private DeployOrderColumn orderColumn;
 
+  /**
+   * Effectively the dynamically created target descriptor (that doesn't have a mapped type/class per say).
+   */
+  private BeanDescriptor<?> elementDescriptor;
+
   /**
    * Create this property.
    */
@@ -231,5 +239,24 @@ public class DeployBeanPropertyAssocMany<T> extends DeployBeanPropertyAssoc<T> {
     this.o2mJoinTable = true;
     setModifyListenMode(ModifyListenMode.ALL);
   }
+
+  public void setElementCollection() {
+    elementCollection = true;
+    cascadeInfo.setSaveDelete(true, true);
+    setModifyListenMode(ModifyListenMode.ALL);
+  }
+
+  public boolean isElementCollection() {
+    return elementCollection;
+  }
+
+  public void setElementDescriptor(BeanDescriptor<?> elementDescriptor) {
+    this.elementDescriptor = elementDescriptor;
+  }
+
+  @SuppressWarnings("unchecked")
+  public <A> BeanDescriptor<A> getElementDescriptor() {
+    return (BeanDescriptor<A>)elementDescriptor;
+  }
 }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
index ed26cc045..920d0141e 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.deploy.meta;
 
 import io.ebeaninternal.server.deploy.PropertyForeignKey;
+import io.ebeaninternal.server.query.SqlJoinType;
 
 import javax.persistence.CascadeType;
 
@@ -162,4 +163,12 @@ public class DeployBeanPropertyAssocOne<T> extends DeployBeanPropertyAssoc<T> {
   public boolean isOrphanRemoval() {
     return orphanRemoval;
   }
+
+  public void setJoinType(boolean outerJoin) {
+    tableJoin.setType(outerJoin ? SqlJoinType.OUTER : SqlJoinType.INNER);
+  }
+
+  public void setJoinColumns(DeployTableJoinColumn[] columns, boolean reverse) {
+    tableJoin.setColumns(columns, reverse);
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index dce5962c1..460901474 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -7,18 +7,24 @@ import io.ebean.annotation.Where;
 import io.ebean.bean.BeanCollection.ModifyListenMode;
 import io.ebean.config.NamingConvention;
 import io.ebean.config.TableName;
+import io.ebean.util.CamelCaseHelper;
 import io.ebean.util.StringHelper;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanTable;
+import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.meta.DeployOrderColumn;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoin;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn;
 import io.ebeaninternal.server.query.SqlJoinType;
+import io.ebeaninternal.server.type.ScalarType;
 
 import javax.persistence.CascadeType;
+import javax.persistence.CollectionTable;
+import javax.persistence.Column;
+import javax.persistence.ElementCollection;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
@@ -38,8 +44,8 @@ class AnnotationAssocManys extends AnnotationParser {
   /**
    * Create with the DeployInfo.
    */
-  AnnotationAssocManys(DeployBeanInfo<?> info, boolean javaxValidationAnnotations, BeanDescriptorManager factory) {
-    super(info, javaxValidationAnnotations);
+  AnnotationAssocManys(DeployBeanInfo<?> info, ReadAnnotationConfig readConfig, BeanDescriptorManager factory) {
+    super(info, readConfig);
     this.factory = factory;
   }
 
@@ -82,6 +88,10 @@ class AnnotationAssocManys extends AnnotationParser {
     if (manyToMany != null) {
       readToMany(manyToMany, prop);
     }
+    ElementCollection elementCollection = get(prop, ElementCollection.class);
+    if (elementCollection != null) {
+      readElementCollection(prop, elementCollection);
+    }
 
     if (get(prop, HistoryExclude.class) != null) {
       prop.setExcludedFromHistory();
@@ -160,6 +170,59 @@ class AnnotationAssocManys extends AnnotationParser {
     }
   }
 
+  private void readElementCollection(DeployBeanPropertyAssocMany<?> prop, ElementCollection elementCollection) {
+
+    prop.setElementCollection();
+    if (!elementCollection.targetClass().equals(void.class)) {
+      prop.setTargetType(elementCollection.targetClass());
+    }
+    Column column = get(prop, Column.class);
+    if (column != null) {
+      prop.setDbColumn(column.name());
+      prop.setDbLength(column.length());
+      prop.setDbScale(column.scale());
+    }
+
+    CollectionTable collectionTable = get(prop, CollectionTable.class);
+
+    String fullTableName = getFullTableName(collectionTable);
+    if (fullTableName == null) {
+      fullTableName = descriptor.getBaseTable()+"_"+ CamelCaseHelper.toUnderscoreFromCamel(prop.getName());
+    }
+    //namingConvention.
+    BeanTable beanTable = factory.getCollectionBeanTable(fullTableName, prop.getTargetType());
+    prop.setBeanTable(beanTable);
+
+    if (collectionTable != null) {
+      prop.getTableJoin().addJoinColumn(true, collectionTable.joinColumns(), beanTable);
+    }
+
+    Class<?> elementType = prop.getTargetType();
+
+    DeployBeanDescriptor<?> elementDescriptor = factory.createDeployDescriptor(elementType);
+    elementDescriptor.setBaseTable(new TableName(fullTableName), readConfig.getAsOfViewSuffix(), readConfig.getVersionsBetweenSuffix());
+
+    ScalarType<?> scalarType = util.getTypeManager().getScalarType(elementType);
+    DeployBeanProperty elementProp = new DeployBeanProperty(elementDescriptor, elementType, scalarType, null);
+
+    elementProp.setName("value");
+    elementProp.setDbColumn(prop.getDbColumn());
+    elementProp.setNullable(false);
+    elementProp.setDbInsertable(true);
+    elementProp.setDbUpdateable(true);
+    elementProp.setDbRead(true);
+    elementProp.setElementProperty();
+
+    elementDescriptor.addBeanProperty(elementProp);
+    elementDescriptor.setProperties(new String[]{"value"});
+    elementDescriptor.setName(prop.getFullBeanName());
+
+    Class<?> owningType = prop.getOwningType();
+
+    factory.createUnidirectional(elementDescriptor, owningType, beanTable, prop.getTableJoin());
+    prop.setElementDescriptor(factory.createElementDescriptor(elementDescriptor));
+  }
+
   /**
    * Define the joins for a ManyToMany relationship.
    * <p>
@@ -204,6 +267,24 @@ class AnnotationAssocManys extends AnnotationParser {
     return sb.toString();
   }
 
+  /**
+   * Return the full table name
+   */
+  private String getFullTableName(CollectionTable collectionTable) {
+    if (collectionTable == null) {
+      return null;
+    }
+    StringBuilder sb = new StringBuilder();
+    if (!StringHelper.isNull(collectionTable.catalog())) {
+      sb.append(collectionTable.catalog()).append(".");
+    }
+    if (!StringHelper.isNull(collectionTable.schema())) {
+      sb.append(collectionTable.schema()).append(".");
+    }
+    sb.append(collectionTable.name());
+    return sb.toString();
+  }
+
   /**
    * Define intersection table and foreign key columns for ManyToMany.
    * <p>
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index cd53cd350..4be0a3ad1 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -41,8 +41,8 @@ public class AnnotationAssocOnes extends AnnotationParser {
   /**
    * Create with the deploy Info.
    */
-  AnnotationAssocOnes(DeployBeanInfo<?> info, boolean javaxValidationAnnotations, BeanDescriptorManager factory) {
-    super(info, javaxValidationAnnotations);
+  AnnotationAssocOnes(DeployBeanInfo<?> info, ReadAnnotationConfig readConfig, BeanDescriptorManager factory) {
+    super(info, readConfig);
     this.factory = factory;
   }
 
@@ -152,7 +152,7 @@ public class AnnotationAssocOnes extends AnnotationParser {
       }
     }
 
-    info.setBeanJoinType(prop, prop.isNullable());
+    prop.setJoinType(prop.isNullable());
 
     if (!prop.getTableJoin().hasJoinColumns() && beanTable != null) {
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
index c5cb0b810..208b0bdf3 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
@@ -42,25 +42,15 @@ public class AnnotationClass extends AnnotationParser {
 
   private final boolean disableL2Cache;
 
-  /**
-   * Create for normal early parse of class level annotations.
-   */
-  public AnnotationClass(DeployBeanInfo<?> info, boolean validationAnnotations, String asOfViewSuffix, String versionsBetweenSuffix, boolean disableL2Cache) {
-    super(info, validationAnnotations);
-    this.asOfViewSuffix = asOfViewSuffix;
-    this.versionsBetweenSuffix = versionsBetweenSuffix;
-    this.disableL2Cache = disableL2Cache;
-  }
-
   /**
    * Create to parse AttributeOverride annotations which is run last
    * after all the properties/fields have been parsed fully.
    */
-  public AnnotationClass(DeployBeanInfo<?> info) {
-    super(info, false);
-    this.asOfViewSuffix = null;
-    this.versionsBetweenSuffix = null;
-    this.disableL2Cache = false;
+  public AnnotationClass(DeployBeanInfo<?> info, ReadAnnotationConfig readConfig) {
+    super(info, readConfig);
+    this.asOfViewSuffix = readConfig.getAsOfViewSuffix();
+    this.versionsBetweenSuffix = readConfig.getVersionsBetweenSuffix();
+    this.disableL2Cache = readConfig.isDisableL2Cache();
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
index a84af1f0c..4be082b93 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
@@ -91,14 +91,11 @@ public class AnnotationFields extends AnnotationParser {
    */
   private FetchType defaultLobFetchType = FetchType.LAZY;
 
-  AnnotationFields(GeneratedPropertyFactory generatedPropFactory, DeployBeanInfo<?> info,
-                          boolean javaxValidationAnnotations, boolean jacksonAnnotationsPresent, boolean eagerFetchLobs) {
-
-    super(info, javaxValidationAnnotations);
-    this.jacksonAnnotationsPresent = jacksonAnnotationsPresent;
-    this.generatedPropFactory = generatedPropFactory;
-
-    if (eagerFetchLobs) {
+  AnnotationFields(DeployBeanInfo<?> info, ReadAnnotationConfig readConfig) {
+    super(info, readConfig);
+    this.jacksonAnnotationsPresent = readConfig.isJacksonAnnotations();
+    this.generatedPropFactory = readConfig.getGeneratedPropFactory();
+    if (readConfig.isEagerFetchLobs()) {
       defaultLobFetchType = FetchType.EAGER;
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
index 034caa595..1bcb1faf3 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
@@ -27,9 +27,12 @@ public abstract class AnnotationParser extends AnnotationBase {
 
   protected final boolean validationAnnotations;
 
-  public AnnotationParser(DeployBeanInfo<?> info, boolean validationAnnotations) {
+  protected final ReadAnnotationConfig readConfig;
+
+  public AnnotationParser(DeployBeanInfo<?> info, ReadAnnotationConfig readConfig) {
     super(info.getUtil());
-    this.validationAnnotations = validationAnnotations;
+    this.readConfig = readConfig;
+    this.validationAnnotations = readConfig.isJavaxValidationAnnotations();
     this.info = info;
     this.beanType = info.getDescriptor().getBeanType();
     this.descriptor = info.getDescriptor();
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationSql.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationSql.java
index d488e933c..df9622b02 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationSql.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationSql.java
@@ -7,10 +7,10 @@ import io.ebeaninternal.server.deploy.BeanDescriptor;
 /**
  * Read the class level deployment annotations.
  */
-public class AnnotationSql extends AnnotationParser {
+class AnnotationSql extends AnnotationParser {
 
-  public AnnotationSql(DeployBeanInfo<?> info, boolean javaxValidationAnnotations) {
-    super(info, javaxValidationAnnotations);
+  AnnotationSql(DeployBeanInfo<?> info, ReadAnnotationConfig readConfig) {
+    super(info, readConfig);
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java
index 553e263c8..d683578bc 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java
@@ -3,7 +3,6 @@ package io.ebeaninternal.server.deploy.parse;
 import io.ebean.RawSql;
 import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
-import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoin;
 import io.ebeaninternal.server.query.SqlJoinType;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
@@ -70,15 +69,6 @@ public class DeployBeanInfo<T> {
     return tableJoin;
   }
 
-  /**
-   * Set a the join alias for a assoc one property.
-   */
-  public void setBeanJoinType(DeployBeanPropertyAssocOne<?> beanProp, boolean outerJoin) {
-
-    DeployTableJoin tableJoin = beanProp.getTableJoin();
-    tableJoin.setType(outerJoin ? SqlJoinType.OUTER : SqlJoinType.INNER);
-  }
-
   /**
    * Add named RawSql from ebean.xml.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java b/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java
new file mode 100644
index 000000000..4b3bf96d0
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java
@@ -0,0 +1,58 @@
+package io.ebeaninternal.server.deploy.parse;
+
+import io.ebean.config.ServerConfig;
+import io.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory;
+
+/**
+ * Configuration used when reading the deployment annotations.
+ */
+class ReadAnnotationConfig {
+
+  private final GeneratedPropertyFactory generatedPropFactory;
+  private final String asOfViewSuffix;
+  private final String versionsBetweenSuffix;
+  private final boolean disableL2Cache;
+  private final boolean eagerFetchLobs;
+  private final boolean javaxValidationAnnotations;
+  private final boolean jacksonAnnotations;
+
+  ReadAnnotationConfig(GeneratedPropertyFactory generatedPropFactory, String asOfViewSuffix, String versionsBetweenSuffix, ServerConfig serverConfig) {
+
+    this.generatedPropFactory = generatedPropFactory;
+    this.asOfViewSuffix = asOfViewSuffix;
+    this.versionsBetweenSuffix = versionsBetweenSuffix;
+    this.disableL2Cache = serverConfig.isDisableL2Cache();
+    this.eagerFetchLobs = serverConfig.isEagerFetchLobs();
+
+    this.javaxValidationAnnotations = generatedPropFactory.getClassLoadConfig().isJavaxValidationAnnotationsPresent();
+    this.jacksonAnnotations = generatedPropFactory.getClassLoadConfig().isJacksonAnnotationsPresent();
+  }
+
+  GeneratedPropertyFactory getGeneratedPropFactory() {
+    return generatedPropFactory;
+  }
+
+  String getAsOfViewSuffix() {
+    return asOfViewSuffix;
+  }
+
+  String getVersionsBetweenSuffix() {
+    return versionsBetweenSuffix;
+  }
+
+  boolean isDisableL2Cache() {
+    return disableL2Cache;
+  }
+
+  boolean isEagerFetchLobs() {
+    return eagerFetchLobs;
+  }
+
+  boolean isJavaxValidationAnnotations() {
+    return javaxValidationAnnotations;
+  }
+
+  boolean isJacksonAnnotations() {
+    return jacksonAnnotations;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java b/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java
index 6af425828..534e9cb82 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.deploy.parse;
 
+import io.ebean.config.ServerConfig;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
 import io.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory;
 
@@ -9,38 +10,10 @@ import io.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory
  */
 public class ReadAnnotations {
 
-  /**
-   * Creates appropriate generated properties - WhenXXX, WhoXXX, Version etc.
-   */
-  private final GeneratedPropertyFactory generatedPropFactory;
+  private final ReadAnnotationConfig readConfig;
 
-  /**
-   * Typically _with_history and when appended to the base table derives the name of
-   * the view that unions the base table with the history table to support asOf queries.
-   */
-  private final String asOfViewSuffix;
-
-  private final String versionsBetweenSuffix;
-
-  /**
-   * True if the javax validation annotations are present in the classpath.
-   */
-  private final boolean javaxValidationAnnotations;
-
-  /**
-   * True if the jackson annotations are present in the classpath.
-   */
-  private final boolean jacksonAnnotations;
-
-  private final boolean disableL2Cache;
-
-  public ReadAnnotations(GeneratedPropertyFactory generatedPropFactory, String asOfViewSuffix, String versionsBetweenSuffix, boolean disableL2Cache) {
-    this.generatedPropFactory = generatedPropFactory;
-    this.asOfViewSuffix = asOfViewSuffix;
-    this.versionsBetweenSuffix = versionsBetweenSuffix;
-    this.javaxValidationAnnotations = generatedPropFactory.getClassLoadConfig().isJavaxValidationAnnotationsPresent();
-    this.jacksonAnnotations = generatedPropFactory.getClassLoadConfig().isJacksonAnnotationsPresent();
-    this.disableL2Cache = disableL2Cache;
+  public ReadAnnotations(GeneratedPropertyFactory generatedPropFactory, String asOfViewSuffix, String versionsBetweenSuffix, ServerConfig serverConfig) {
+    this.readConfig = new ReadAnnotationConfig(generatedPropFactory, asOfViewSuffix, versionsBetweenSuffix, serverConfig);
   }
 
   /**
@@ -50,12 +23,10 @@ public class ReadAnnotations {
    * to resolve the relationships etc.
    * </p>
    */
-  public void readInitial(DeployBeanInfo<?> info, boolean eagerFetchLobs) {
-
+  public void readInitial(DeployBeanInfo<?> info) {
     try {
-      new AnnotationClass(info, javaxValidationAnnotations, asOfViewSuffix, versionsBetweenSuffix, disableL2Cache).parse();
-      new AnnotationFields(generatedPropFactory, info, javaxValidationAnnotations, jacksonAnnotations, eagerFetchLobs).parse();
-
+      new AnnotationClass(info, readConfig).parse();
+      new AnnotationFields(info, readConfig).parse();
     } catch (RuntimeException e) {
       throw new RuntimeException("Error reading annotations for " + info, e);
     }
@@ -75,14 +46,14 @@ public class ReadAnnotations {
 
     try {
 
-      new AnnotationAssocOnes(info, javaxValidationAnnotations, factory).parse();
-      new AnnotationAssocManys(info, javaxValidationAnnotations, factory).parse();
+      new AnnotationAssocOnes(info, readConfig, factory).parse();
+      new AnnotationAssocManys(info, readConfig, factory).parse();
 
       // read the Sql annotations last because they may be
       // dependent on field level annotations
-      new AnnotationSql(info, javaxValidationAnnotations).parse();
+      new AnnotationSql(info, readConfig).parse();
 
-      new AnnotationClass(info).parseAttributeOverride();
+      new AnnotationClass(info, readConfig).parseAttributeOverride();
       info.getDescriptor().postAnnotations();
 
     } catch (RuntimeException e) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/TransientProperties.java b/src/main/java/io/ebeaninternal/server/deploy/parse/TransientProperties.java
index 4be75b3b3..e7896b96a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/TransientProperties.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/TransientProperties.java
@@ -5,8 +5,6 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
 
-import java.util.List;
-
 /**
  * Mark transient properties.
  */
@@ -20,29 +18,22 @@ public class TransientProperties {
    */
   public void process(DeployBeanDescriptor<?> desc) {
 
-    List<DeployBeanProperty> props = desc.propertiesBase();
-    for (DeployBeanProperty prop : props) {
+    for (DeployBeanProperty prop : desc.propertiesBase()) {
       if (!prop.isDbRead() && !prop.isDbInsertable() && !prop.isDbUpdateable()) {
-        // non-transient...
         prop.setTransient();
       }
     }
 
-    List<DeployBeanPropertyAssocOne<?>> ones = desc.propertiesAssocOne();
-    for (DeployBeanPropertyAssocOne<?> prop : ones) {
-      if (prop.getBeanTable() == null) {
-        if (!prop.isEmbedded()) {
-          prop.setTransient();
-        }
-      }
-    }
-
-    List<DeployBeanPropertyAssocMany<?>> manys = desc.propertiesAssocMany();
-    for (DeployBeanPropertyAssocMany<?> prop : manys) {
-      if (prop.getBeanTable() == null) {
+    for (DeployBeanPropertyAssocOne<?> prop : desc.propertiesAssocOne()) {
+      if (prop.getBeanTable() == null && !prop.isEmbedded()) {
         prop.setTransient();
       }
     }
 
+    for (DeployBeanPropertyAssocMany<?> prop : desc.propertiesAssocMany()) {
+      if (prop.getBeanTable() == null) {
+        prop.setTransient();
+      }
+    }
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
index 5300979ac..7a04f3bb7 100644
--- a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
+++ b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
@@ -327,7 +327,7 @@ public class DLoadContext implements LoadContext {
   }
 
   private BeanProperty getBeanProperty(BeanDescriptor<?> desc, String path) {
-    return desc.getBeanPropertyFromPath(path);
+    return desc.findPropertyFromPath(path);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java
index a1fb38a39..d98a62039 100644
--- a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java
+++ b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java
@@ -33,7 +33,7 @@ public class DLoadManyContext extends DLoadBaseContext implements LoadManyContex
     super(parent, property.getBeanDescriptor(), path, defaultBatchSize, queryProps);
 
     this.property = property;
-    this.docStoreMapped = property.getTargetDescriptor().isDocStoreMapped();
+    this.docStoreMapped = property.isTargetDocStoreMapped();
     // bufferList only required when using query joins (queryFetch)
     this.bufferList = (!queryFetch) ? null : new ArrayList<>();
     this.currentBuffer = createBuffer(firstBatchSize);
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 0b3d20e1a..7a9748649 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -29,6 +29,7 @@ import io.ebeaninternal.server.deploy.BeanManager;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
+import io.ebeaninternal.server.deploy.BeanPropertySimpleCollection;
 import io.ebeaninternal.server.deploy.IntersectionRow;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -869,8 +870,7 @@ public final class DefaultPersister implements Persister {
     SpiTransaction t = request.getTransaction();
 
     // exported ones with cascade save
-    BeanPropertyAssocOne<?>[] expOnes = desc.propertiesOneExportedSave();
-    for (BeanPropertyAssocOne<?> prop : expOnes) {
+    for (BeanPropertyAssocOne<?> prop : desc.propertiesOneExportedSave()) {
       // check for partial beans
       if (request.isLoadedProperty(prop)) {
         EntityBean detailBean = prop.getValueAsEntityBean(parentBean);
@@ -886,12 +886,11 @@ public final class DefaultPersister implements Persister {
     }
 
     // many's with cascade save
-    BeanPropertyAssocMany<?>[] manys = desc.propertiesManySave();
     boolean insertedParent = request.isInsertedParent();
-    for (BeanPropertyAssocMany<?> many : manys) {
+    for (BeanPropertyAssocMany<?> many : desc.propertiesManySave()) {
       // check that property is loaded and collection should be cascaded to
       if (request.isLoadedProperty(many) && !many.isSkipSaveBeanCollection(parentBean, insertedParent)) {
-        saveMany(new SaveManyPropRequest(insertedParent, many, parentBean, request));
+        saveMany2(insertedParent, many, parentBean, request);
         if (!insertedParent) {
           request.addUpdatedManyProperty(many);
         }
@@ -899,6 +898,18 @@ public final class DefaultPersister implements Persister {
     }
   }
 
+  private void saveMany2(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
+    saveMany(saveManyRequest(insertedParent, many, parentBean, request));
+  }
+
+  private SaveManyPropRequest saveManyRequest(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
+    if (many instanceof BeanPropertySimpleCollection) {
+      return new SaveManySimpleCollection(insertedParent, many, parentBean, request);
+    } else {
+      return new SaveManyPropRequest(insertedParent, many, parentBean, request);
+    }
+  }
+
   private void saveMany(SaveManyPropRequest saveMany) {
 
     if (saveMany.getMany().hasJoinTable()) {
@@ -1131,8 +1142,7 @@ public final class DefaultPersister implements Persister {
     }
 
     // Many's with delete cascade
-    BeanPropertyAssocMany<?>[] manys = desc.propertiesManyDelete();
-    for (BeanPropertyAssocMany<?> many : manys) {
+    for (BeanPropertyAssocMany<?> many : desc.propertiesManyDelete()) {
       if (many.hasJoinTable()) {
         if (!softDelete) {
           // delete associated rows from intersection table (but not during soft delete)
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyPropRequest.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyPropRequest.java
index 97f9d1131..dbd643d2f 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyPropRequest.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyPropRequest.java
@@ -21,11 +21,11 @@ import java.util.Map;
  */
 class SaveManyPropRequest {
 
-  private final PersistRequestBean<?> request;
+  final PersistRequestBean<?> request;
   private final boolean insertedParent;
-  private final BeanPropertyAssocMany<?> many;
-  private final EntityBean parentBean;
-  private final SpiTransaction transaction;
+  final BeanPropertyAssocMany<?> many;
+  final EntityBean parentBean;
+  final SpiTransaction transaction;
   private final boolean cascade;
   private final boolean deleteMissingChildren;
   private final boolean publish;
@@ -35,8 +35,8 @@ class SaveManyPropRequest {
   private final boolean isMap;
   private final boolean saveRecurseSkippable;
 
-  private Collection<?> collection;
-  private DefaultPersister persister;
+  Collection<?> collection;
+  DefaultPersister persister;
   private boolean deleteMissing;
   private int sortOrder;
 
@@ -127,7 +127,7 @@ class SaveManyPropRequest {
     }
   }
 
-  private void processDetails() {
+  void processDetails() {
 
     BeanProperty orderColumn = null;
     boolean hasOrderColumn = many.hasOrderColumn();
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManySimpleCollection.java b/src/main/java/io/ebeaninternal/server/persist/SaveManySimpleCollection.java
new file mode 100644
index 000000000..62faf73e3
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManySimpleCollection.java
@@ -0,0 +1,39 @@
+package io.ebeaninternal.server.persist;
+
+import io.ebean.SqlUpdate;
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.server.core.PersistRequestBean;
+import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
+
+class SaveManySimpleCollection extends SaveManyPropRequest {
+
+  SaveManySimpleCollection(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
+    super(insertedParent, many, parentBean, request);
+  }
+
+  @Override
+  void processDetails() {
+
+    Object parentId = request.getBeanId();
+
+    SqlUpdate sqlDelete = many.deleteByParentId(parentId, null);
+
+    SpiEbeanServer server = request.getServer();
+    server.execute(sqlDelete, transaction);
+
+    transaction.depth(+1);
+
+    String insert = many.insertElementCollection();
+    SqlUpdate sqlInsert = server.createSqlUpdate(insert);
+
+    for (Object value : collection) {
+
+      sqlInsert.setParameter(1, parentId);
+      sqlInsert.setParameter(2, value);
+      server.execute(sqlInsert, transaction);
+    }
+
+    transaction.depth(-1);
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/query/CQuery.java b/src/main/java/io/ebeaninternal/server/query/CQuery.java
index da7bdd090..9a40afaaf 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQuery.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQuery.java
@@ -35,7 +35,6 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
@@ -56,6 +55,8 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
 
   private static final Logger logger = LoggerFactory.getLogger(CQuery.class);
 
+  private static final CQueryCollectionAddNoop NOOP_ADD = new CQueryCollectionAddNoop();
+
   /**
    * The resultSet rows read.
    */
@@ -99,7 +100,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
   /**
    * The help for the 'master' collection.
    */
-  private final BeanCollectionHelp<T> help;
+  private final CQueryCollectionAdd help;
 
   /**
    * The overall find request wrapper object.
@@ -147,7 +148,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
   /**
    * For master detail query.
    */
-  private final BeanPropertyAssocMany<?> manyProperty;
+  private final STreePropertyAssocMany manyProperty;
 
   private DataReader dataReader;
 
@@ -180,20 +181,26 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
   private long executionTimeMicros;
 
   /**
-   * Flag set when findIterate is being read audited.
+   * Flag set when read auditing.
+   */
+  private boolean audit;
+
+  /**
+   * Flag set when findIterate is being read audited meaning we log in batches.
    */
   private boolean auditFindIterate;
 
   /**
    * A buffer of Ids collected for findIterate auditing.
    */
-  private List<Object> auditFindIterateIds;
+  private List<Object> auditIds;
 
   /**
    * Create the Sql select based on the request.
    */
   public CQuery(OrmQueryRequest<T> request, CQueryPredicates predicates, CQueryPlan queryPlan) {
     this.request = request;
+    this.audit = request.isAuditReads();
     this.queryPlan = queryPlan;
     this.query = request.getQuery();
     this.queryMode = query.getMode();
@@ -220,7 +227,11 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
     this.logWhereSql = queryPlan.getLogWhereSql();
     this.desc = request.getBeanDescriptor();
     this.predicates = predicates;
-    this.help = createHelp(request);
+    if (lazyLoadManyProperty != null) {
+      this.help = NOOP_ADD;
+    } else {
+      this.help = createHelp(request);
+    }
     this.collection = (help != null ? help.createEmptyNoParent() : null);
   }
 
@@ -233,7 +244,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
         // subQuery compiled for InQueryExpression
         return null;
       }
-      return BeanCollectionHelpFactory.create(request);
+      return BeanCollectionHelpFactory.create(manyType, request);
     }
   }
 
@@ -374,7 +385,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
    */
   public void close() {
     try {
-      if (auditFindIterateIds != null && !auditFindIterateIds.isEmpty()) {
+      if (auditFindIterate && auditIds != null && !auditIds.isEmpty()) {
         auditIterateLogMessage();
       }
     } catch (Throwable e) {
@@ -510,8 +521,8 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
   }
 
   protected EntityBean next() {
-    if (auditFindIterate) {
-      auditIterateNextBean();
+    if (audit) {
+      auditNextBean();
     }
     hasNextCache = false;
     if (nextBean == null) {
@@ -656,7 +667,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
    * per SqlSelect. This can be null.
    */
   @Override
-  public BeanPropertyAssocMany<?> getManyProperty() {
+  public STreePropertyAssocMany getManyProperty() {
     return manyProperty;
   }
 
@@ -747,30 +758,25 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
    */
   void auditFindMany() {
 
-    if (!collection.isEmpty()) {
+    if (auditIds != null && !auditIds.isEmpty()) {
       // get the id values of the underlying collection
-      List<Object> ids = new ArrayList<>(collection.size());
-      Collection<T> underlyingBeans = collection.getActualDetails();
-      for (T underlyingBean : underlyingBeans) {
-        ids.add(desc.getIdForJson(underlyingBean));
-      }
       ReadEvent futureReadEvent = query.getFutureFetchAudit();
       if (futureReadEvent == null) {
         // normal query execution
-        desc.readAuditMany(queryPlan.getAuditQueryKey(), bindLog, ids);
+        desc.readAuditMany(queryPlan.getAuditQueryKey(), bindLog, auditIds);
       } else {
         // this query was executed via findFutureList() and the prepare()
         // has already been called so set the details and log
         futureReadEvent.setQueryKey(queryPlan.getAuditQueryKey());
         futureReadEvent.setBindLog(bindLog);
-        futureReadEvent.setIds(ids);
+        futureReadEvent.setIds(auditIds);
         desc.readAuditFutureMany(futureReadEvent);
       }
     }
   }
 
   /**
-   * Indicate that read auditing is occurring on a this findIterate query.
+   * Indicate that read auditing is occurring on this findIterate query.
    */
   void auditFindIterate() {
     auditFindIterate = true;
@@ -780,21 +786,21 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
    * Send the current buffer of findIterate collected ids to the audit log.
    */
   private void auditIterateLogMessage() {
-    desc.readAuditMany(queryPlan.getAuditQueryKey(), bindLog, auditFindIterateIds);
+    desc.readAuditMany(queryPlan.getAuditQueryKey(), bindLog, auditIds);
     // create a new list on demand with the next bean/id
-    auditFindIterateIds = null;
+    auditIds = null;
   }
 
   /**
    * Add the id to the audit id buffer and flush if needed in batches of 100.
    */
-  private void auditIterateNextBean() {
+  private void auditNextBean() {
 
-    if (auditFindIterateIds == null) {
-      auditFindIterateIds = new ArrayList<>(100);
+    if (auditIds == null) {
+      auditIds = new ArrayList<>(100);
     }
-    auditFindIterateIds.add(desc.getIdForJson(nextBean));
-    if (auditFindIterateIds.size() >= 100) {
+    auditIds.add(desc.getIdForJson(nextBean));
+    if (auditFindIterate && auditIds.size() >= 100) {
       auditIterateLogMessage();
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 1d95f7517..43706cd79 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -18,7 +18,6 @@ import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanProperty;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 import io.ebeaninternal.server.el.ElPropertyValue;
 import io.ebeaninternal.server.persist.Binder;
@@ -524,20 +523,15 @@ class CQueryBuilder {
       return rawSqlHandler.buildSql(request, predicates, query.getRawSql().getSql());
     }
 
-    BeanPropertyAssocMany<?> manyProp = select.getManyProperty();
-
     boolean useSqlLimiter = false;
-
     StringBuilder sb = new StringBuilder(500);
-
     String dbOrderBy = predicates.getDbOrderBy();
 
     if (selectClause != null) {
       sb.append(selectClause);
 
     } else {
-
-      useSqlLimiter = (query.hasMaxRowsOrFirstRow() && manyProp == null);
+      useSqlLimiter = (query.hasMaxRowsOrFirstRow() && select.getManyProperty() == null);
 
       if (!useSqlLimiter) {
         sb.append("select ");
@@ -686,7 +680,7 @@ class CQueryBuilder {
       throw new IllegalArgumentException("Illegal enum: "+ orderBy);
     }
   }
-  
+
   /**
    * Append where or and based on the hasWhere flag.
    */
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryCollectionAdd.java b/src/main/java/io/ebeaninternal/server/query/CQueryCollectionAdd.java
new file mode 100644
index 000000000..85079b309
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryCollectionAdd.java
@@ -0,0 +1,21 @@
+package io.ebeaninternal.server.query;
+
+import io.ebean.bean.BeanCollection;
+import io.ebean.bean.EntityBean;
+
+/**
+ * Defines interface for adding beans to the collection which might be a List, Set or Map.
+ */
+public interface CQueryCollectionAdd<T> {
+
+  /**
+   * Create an empty collection.
+   */
+  BeanCollection<T> createEmptyNoParent();
+
+  /**
+   * Add a bean to the List Set or Map.
+   */
+  void add(BeanCollection<?> collection, EntityBean bean, boolean withCheck);
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryCollectionAddNoop.java b/src/main/java/io/ebeaninternal/server/query/CQueryCollectionAddNoop.java
new file mode 100644
index 000000000..ac4230999
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryCollectionAddNoop.java
@@ -0,0 +1,27 @@
+package io.ebeaninternal.server.query;
+
+import io.ebean.bean.BeanCollection;
+import io.ebean.bean.EntityBean;
+
+/**
+ * A NOOP based CQueryCollectionAdd for use with lazy loading many queries where the
+ * beans loaded into the collection are added to the collection(s) of the parent(s).
+ */
+class CQueryCollectionAddNoop<T> implements CQueryCollectionAdd<T> {
+
+  /**
+   * Return null as we are not collecting the beans.
+   */
+  @Override
+  public BeanCollection<T> createEmptyNoParent() {
+    return null;
+  }
+
+  /**
+   * Do nothing for this case.
+   */
+  @Override
+  public void add(BeanCollection<?> collection, EntityBean bean, boolean withCheck) {
+    // do nothing
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
index a9f7921cd..a0d9a46b1 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
@@ -11,7 +11,6 @@ import io.ebeaninternal.metric.MetricFactory;
 import io.ebeaninternal.metric.TimedMetric;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
-import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.query.CQueryPlanStats.Snapshot;
 import io.ebeaninternal.server.type.DataBind;
 import io.ebeaninternal.server.type.DataReader;
@@ -74,7 +73,7 @@ public class CQueryPlan {
   /**
    * Encrypted properties required additional binding.
    */
-  private final BeanProperty[] encryptedProps;
+  private final STreeProperty[] encryptedProps;
 
   private final CQueryPlanStats stats;
 
@@ -177,9 +176,8 @@ public class CQueryPlan {
   DataBind bindEncryptedProperties(PreparedStatement stmt, Connection conn) throws SQLException {
     DataBind dataBind = new DataBind(dataTimeZone, stmt, conn);
     if (encryptedProps != null) {
-      for (BeanProperty encryptedProp : encryptedProps) {
-        String key = encryptedProp.getEncryptKey().getStringValue();
-        dataBind.setString(key);
+      for (STreeProperty encryptedProp : encryptedProps) {
+        dataBind.setString(encryptedProp.getEncryptKeyAsString());
       }
     }
     return dataBind;
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java b/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
index 98fe40941..5df1633c0 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
@@ -231,7 +231,7 @@ public class CQueryPredicates {
       }
     }
 
-    BeanPropertyAssocMany<?> manyProperty = request.getManyProperty();
+    BeanPropertyAssocMany<?> manyProperty = request.determineMany();
     if (manyProperty != null) {
       OrmQueryProperties chunk = query.getDetail().getChunk(manyProperty.getName(), false);
       SpiExpressionList<?> filterManyExpr = chunk.getFilterMany();
diff --git a/src/main/java/io/ebeaninternal/server/query/ExtraJoin.java b/src/main/java/io/ebeaninternal/server/query/ExtraJoin.java
new file mode 100644
index 000000000..c246c651d
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/query/ExtraJoin.java
@@ -0,0 +1,20 @@
+package io.ebeaninternal.server.query;
+
+public class ExtraJoin {
+
+  private final STreePropertyAssoc property;
+  private final boolean containsMany;
+
+  public ExtraJoin(STreePropertyAssoc property, boolean containsMany) {
+    this.property = property;
+    this.containsMany = containsMany;
+  }
+
+  public STreePropertyAssoc getProperty() {
+    return property;
+  }
+
+  public boolean isContainsMany() {
+    return containsMany;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeProperty.java b/src/main/java/io/ebeaninternal/server/query/STreeProperty.java
similarity index 85%
rename from src/main/java/io/ebeaninternal/server/query/SqlTreeProperty.java
rename to src/main/java/io/ebeaninternal/server/query/STreeProperty.java
index 2543cc825..340766e9a 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeProperty.java
+++ b/src/main/java/io/ebeaninternal/server/query/STreeProperty.java
@@ -8,10 +8,10 @@ import java.util.List;
 
 /**
  * A property in the SQL Tree.
- *
+ * <p>
  * A BeanProperty or a dynamically created property based on formula.
  */
-public interface SqlTreeProperty {
+public interface STreeProperty {
 
   /**
    * Return the property name.
@@ -38,6 +38,16 @@ public interface SqlTreeProperty {
    */
   boolean isAggregation();
 
+  /**
+   * Return true if the property is a formula.
+   */
+  boolean isFormula();
+
+  /**
+   * Return the encryption key as a string value (when the property is encrypted).
+   */
+  String getEncryptKeyAsString();
+
   /**
    * Return the Expression language prefix (join path).
    */
diff --git a/src/main/java/io/ebeaninternal/server/query/STreePropertyAssoc.java b/src/main/java/io/ebeaninternal/server/query/STreePropertyAssoc.java
new file mode 100644
index 000000000..1213d0b55
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/query/STreePropertyAssoc.java
@@ -0,0 +1,39 @@
+package io.ebeaninternal.server.query;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.DbSqlContext;
+import io.ebeaninternal.server.deploy.id.IdBinder;
+
+public interface STreePropertyAssoc extends STreeProperty {
+
+  /**
+   * Return the extra where clause if set.
+   */
+  String getExtraWhere();
+
+  /**
+   * Return the type of the target (other side).
+   */
+  STreeType target();
+
+  /**
+   * Return the IdBinder of the underlying type.
+   */
+  IdBinder getIdBinder();
+
+  /**
+   * Add a Join with the given alias.
+   */
+  SqlJoinType addJoin(SqlJoinType joinType, String alias2, String alias, DbSqlContext ctx);
+
+  /**
+   * Add a Join with the given prefix (determining the alias).
+   */
+  SqlJoinType addJoin(SqlJoinType joinType, String prefix, DbSqlContext ctx);
+
+  /**
+   * Add a bean to the parent.
+   */
+  void setValue(EntityBean parentBean, Object contextBean);
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocMany.java
new file mode 100644
index 000000000..9b6791e2f
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocMany.java
@@ -0,0 +1,45 @@
+package io.ebeaninternal.server.query;
+
+import io.ebean.bean.BeanCollection;
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.DbSqlContext;
+import io.ebeaninternal.server.deploy.TableJoin;
+
+public interface STreePropertyAssocMany extends STreePropertyAssoc {
+
+  /**
+   * Append exported columns to the select.
+   */
+  void addSelectExported(DbSqlContext ctx, String prefix);
+
+  /**
+   * Return true if this is a ManyToMany with history.
+   */
+  boolean isManyToManyWithHistory();
+
+  /**
+   * Return a reference collection.
+   */
+  BeanCollection<?> createReferenceIfNull(EntityBean localBean);
+
+  /**
+   * Return true if the property has a join table.
+   */
+  boolean hasJoinTable();
+
+  /**
+   * Return the intersection table join.
+   */
+  TableJoin getIntersectionTableJoin();
+
+  /**
+   * Add a bean to the collection.
+   */
+  void addBeanToCollectionWithCreate(EntityBean contextParent, EntityBean detailBean, boolean withCheck);
+
+  /**
+   * Return true if the property is excluded from history.
+   */
+  boolean isExcludedFromHistory();
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocOne.java
new file mode 100644
index 000000000..722a43a02
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocOne.java
@@ -0,0 +1,16 @@
+package io.ebeaninternal.server.query;
+
+import io.ebeaninternal.server.type.ScalarType;
+
+public interface STreePropertyAssocOne extends STreePropertyAssoc {
+
+  /**
+   * Return true if the property is an Id.
+   */
+  boolean isAssocId();
+
+  /**
+   * Return the scalar type of the associated id property.
+   */
+  ScalarType<?> getIdScalarType();
+}
diff --git a/src/main/java/io/ebeaninternal/server/query/STreeType.java b/src/main/java/io/ebeaninternal/server/query/STreeType.java
new file mode 100644
index 000000000..e824272c0
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/query/STreeType.java
@@ -0,0 +1,136 @@
+package io.ebeaninternal.server.query;
+
+import io.ebean.bean.EntityBean;
+import io.ebean.bean.PersistenceContext;
+import io.ebeaninternal.api.SpiQuery;
+import io.ebeaninternal.server.deploy.DbReadContext;
+import io.ebeaninternal.server.deploy.InheritInfo;
+import io.ebeaninternal.server.deploy.id.IdBinder;
+
+/**
+ * Bean type interface for Sql query tree.
+ */
+public interface STreeType {
+
+  /**
+   * Return the bean short name.
+   */
+  String getName();
+
+  /**
+   * Return true if the underlying type has an Id property.
+   */
+  boolean hasId();
+
+  /**
+   * Return true if the type is for ElementCollection (not mapped to an entity type/class).
+   */
+  boolean isElementType();
+
+  /**
+   * Return true if the type uses soft delete.
+   */
+  boolean isSoftDelete();
+
+  /**
+   * Return true if the type uses history.
+   */
+  boolean isHistorySupport();
+
+  /**
+   * Return true if the type is RawSql based.
+   */
+  boolean isRawSqlBased();
+
+  /**
+   * Return the soft delete predicate using the given table alias.
+   */
+  String getSoftDeletePredicate(String baseTableAlias);
+
+  /**
+   * Return the scalar properties.
+   */
+  STreeProperty[] propsBaseScalar();
+
+  /**
+   * Return the embedded bean properties.
+   */
+  STreePropertyAssoc[] propsEmbedded();
+
+  /**
+   * Return the associated one properties.
+   */
+  STreePropertyAssocOne[] propsOne();
+
+  /**
+   * Return the associated many properties.
+   */
+  STreePropertyAssocMany[] propsMany();
+
+  /**
+   * Return the inheritance information for this type.
+   */
+  InheritInfo getInheritInfo();
+
+  /**
+   * Return the IdBinder for this type.
+   */
+  IdBinder getIdBinder();
+
+  /**
+   * Create a new entity bean instance.
+   */
+  EntityBean createEntityBean();
+
+  /**
+   * Put the entity bean into the persistence context.
+   */
+  Object contextPutIfAbsent(PersistenceContext persistenceContext, Object id, EntityBean localBean);
+
+  /**
+   * Set draft status on the entity bean.
+   */
+  void setDraft(EntityBean localBean);
+
+  /**
+   * Invoke any post load listeners.
+   */
+  void postLoad(Object localBean);
+
+  /**
+   * Return the base table to use given the temporalMode.
+   */
+  String getBaseTable(SpiQuery.TemporalMode temporalMode);
+
+  /**
+   * Return true if the given path is an embedded bean.
+   */
+  boolean isEmbeddedPath(String propertyPath);
+
+  /**
+   * Return the bean property traversing the object graph and taking into account inheritance.
+   */
+  STreeProperty findPropertyFromPath(String property);
+
+  /**
+   * Find a known property.
+   */
+  STreeProperty findProperty(String propName);
+
+  /**
+   * Find and return property allowing for dynamic formula properties.
+   */
+  STreeProperty findPropertyWithDynamic(String baseName);
+
+  /**
+   * Return an extra join if the property path requires it.
+   */
+  ExtraJoin extraJoin(String propertyPath);
+
+  /**
+   * Load the property taking into account inheritance.
+   */
+  void inheritanceLoad(SqlBeanLoad sqlBeanLoad, STreeProperty property, DbReadContext ctx);
+
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTree.java b/src/main/java/io/ebeaninternal/server/query/SqlTree.java
index 8e7d1a2ee..d4207a9e8 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTree.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTree.java
@@ -1,8 +1,6 @@
 package io.ebeaninternal.server.query;
 
 import io.ebeaninternal.api.SpiQuery;
-import io.ebeaninternal.server.deploy.BeanProperty;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,7 +16,7 @@ class SqlTree {
   /**
    * Property if resultSet contains master and detail rows.
    */
-  private final BeanPropertyAssocMany<?> manyProperty;
+  private final STreePropertyAssocMany manyProperty;
 
   private final Set<String> includes;
 
@@ -38,7 +36,7 @@ class SqlTree {
   /**
    * Encrypted Properties require additional binding.
    */
-  private final BeanProperty[] encryptedProps;
+  private final STreeProperty[] encryptedProps;
 
   /**
    * Where clause for inheritance.
@@ -51,7 +49,7 @@ class SqlTree {
    * Create the SqlSelectClause.
    */
   SqlTree(String summary, SqlTreeNode rootNode, String distinctOn, String selectSql, String fromSql, String groupBy, String inheritanceWhereSql,
-          BeanProperty[] encryptedProps, BeanPropertyAssocMany<?> manyProperty, Set<String> includes, boolean includeJoins) {
+          STreeProperty[] encryptedProps, STreePropertyAssocMany manyProperty, Set<String> includes, boolean includeJoins) {
 
     this.summary = summary;
     this.rootNode = rootNode;
@@ -147,11 +145,11 @@ class SqlTree {
    * Return the property that is associated with the many. There can only be one
    * per SqlSelect. This can be null.
    */
-  BeanPropertyAssocMany<?> getManyProperty() {
+  STreePropertyAssocMany getManyProperty() {
     return manyProperty;
   }
 
-  BeanProperty[] getEncryptedProps() {
+  STreeProperty[] getEncryptedProps() {
     return encryptedProps;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java
index 5e8319a1e..ea583c833 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java
@@ -1,17 +1,14 @@
 package io.ebeaninternal.server.query;
 
 import io.ebean.util.SplitName;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.el.ElPropertyDeploy;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import javax.persistence.PersistenceException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Special Map of the logical property joins to table alias.
@@ -61,16 +58,11 @@ class SqlTreeAlias {
   /**
    * Add joins.
    */
-  public void addJoin(Set<String> propJoins, BeanDescriptor<?> desc) {
+  public void addJoin(Set<String> propJoins, STreeType desc) {
     if (propJoins != null) {
       for (String propJoin : propJoins) {
-        ElPropertyDeploy elProp = desc.getElPropertyDeploy(propJoin);
-        if (elProp == null) {
-          throw new PersistenceException("Invalid path " + propJoin + " from " + desc.getFullName());
-
-        } else if (elProp.getBeanProperty().isEmbedded()) {
+        if (desc.isEmbeddedPath(propJoin)) {
           addEmbeddedPropertyJoin(propJoin);
-
         } else {
           addPropertyJoin(propJoin, joinProps);
         }
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 8811096eb..9cfaad7e8 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -6,14 +6,8 @@ import io.ebeaninternal.api.PropertyJoin;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.SpiQuery.Type;
 import io.ebeaninternal.server.core.OrmQueryRequest;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.deploy.BeanProperty;
-import io.ebeaninternal.server.deploy.BeanPropertyAssoc;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 import io.ebeaninternal.server.deploy.InheritInfo;
 import io.ebeaninternal.server.deploy.TableJoin;
-import io.ebeaninternal.server.el.ElPropertyValue;
 import io.ebeaninternal.server.querydefn.OrmQueryDetail;
 import io.ebeaninternal.server.querydefn.OrmQueryProperties;
 import org.slf4j.Logger;
@@ -37,7 +31,7 @@ public final class SqlTreeBuilder {
 
   private final SpiQuery<?> query;
 
-  private final BeanDescriptor<?> desc;
+  private final STreeType desc;
 
   private final OrmQueryDetail queryDetail;
 
@@ -51,7 +45,7 @@ public final class SqlTreeBuilder {
   /**
    * Property if resultSet contains master and detail rows.
    */
-  private BeanPropertyAssocMany<?> manyProperty;
+  private STreePropertyAssocMany manyProperty;
 
   private final SqlTreeAlias alias;
 
@@ -141,7 +135,7 @@ public final class SqlTreeBuilder {
     String fromSql = null;
     String inheritanceWhereSql = null;
     String groupBy = null;
-    BeanProperty[] encryptedProps = null;
+    STreeProperty[] encryptedProps = null;
     if (!rawSql) {
       selectSql = buildSelectClause();
       fromSql = buildFromClause();
@@ -233,7 +227,7 @@ public final class SqlTreeBuilder {
     return ctx.getContent();
   }
 
-  private void buildRoot(BeanDescriptor<?> desc) {
+  private void buildRoot(STreeType desc) {
 
     rootNode = buildSelectChain(null, null, desc, null);
 
@@ -253,26 +247,24 @@ public final class SqlTreeBuilder {
    * Recursively build the query tree depending on what leaves in the tree
    * should be included.
    */
-  private SqlTreeNode buildSelectChain(String prefix, BeanPropertyAssoc<?> prop,
-                                       BeanDescriptor<?> desc, List<SqlTreeNode> joinList) {
+  private SqlTreeNode buildSelectChain(String prefix, STreePropertyAssoc prop,
+                                       STreeType desc, List<SqlTreeNode> joinList) {
 
     List<SqlTreeNode> myJoinList = new ArrayList<>();
 
-    BeanPropertyAssocOne<?>[] ones = desc.propertiesOne();
-    for (BeanPropertyAssocOne<?> one : ones) {
+    for (STreePropertyAssocOne one : desc.propsOne()) {
       String propPrefix = SplitName.add(prefix, one.getName());
       if (isIncludeBean(propPrefix)) {
         selectIncludes.add(propPrefix);
-        buildSelectChain(propPrefix, one, one.getTargetDescriptor(), myJoinList);
+        buildSelectChain(propPrefix, one, one.target(), myJoinList);
       }
     }
 
-    BeanPropertyAssocMany<?>[] manys = desc.propertiesMany();
-    for (BeanPropertyAssocMany<?> many : manys) {
+    for (STreePropertyAssocMany many : desc.propsMany()) {
       String propPrefix = SplitName.add(prefix, many.getName());
       if (isIncludeMany(propPrefix, many)) {
         selectIncludes.add(propPrefix);
-        buildSelectChain(propPrefix, many, many.getTargetDescriptor(), myJoinList);
+        buildSelectChain(propPrefix, many, many.target(), myJoinList);
       }
     }
 
@@ -304,24 +296,24 @@ public final class SqlTreeBuilder {
 
     Collection<PropertyJoin> includes = manyWhereJoins.getPropertyJoins();
     for (PropertyJoin joinProp : includes) {
-      BeanPropertyAssoc<?> beanProperty = (BeanPropertyAssoc<?>) desc.getBeanPropertyFromPath(joinProp.getProperty());
+      STreePropertyAssoc beanProperty = (STreePropertyAssoc) desc.findPropertyFromPath(joinProp.getProperty());
       SqlTreeNodeManyWhereJoin nodeJoin = new SqlTreeNodeManyWhereJoin(joinProp.getProperty(), beanProperty, joinProp.getSqlJoinType());
       myJoinList.add(nodeJoin);
     }
   }
 
-  private SqlTreeNode buildNode(String prefix, BeanPropertyAssoc<?> prop, BeanDescriptor<?> desc, List<SqlTreeNode> myList, SqlTreeProperties props) {
+  private SqlTreeNode buildNode(String prefix, STreePropertyAssoc prop, STreeType desc, List<SqlTreeNode> myList, SqlTreeProperties props) {
 
     if (prefix == null) {
       buildExtraJoins(desc, myList);
 
       // Optional many property for lazy loading query
-      BeanPropertyAssocMany<?> lazyLoadMany = (query == null) ? null : query.getLazyLoadMany();
+      STreePropertyAssocMany lazyLoadMany = (query == null) ? null : query.getLazyLoadMany();
       boolean withId = !rawNoId && !subQuery && (query == null || query.isWithId());
       return new SqlTreeNodeRoot(desc, props, myList, withId, includeJoin, lazyLoadMany, temporalMode, disableLazyLoad);
 
-    } else if (prop instanceof BeanPropertyAssocMany<?>) {
-      return new SqlTreeNodeManyRoot(prefix, (BeanPropertyAssocMany<?>) prop, props, myList, temporalMode, disableLazyLoad);
+    } else if (prop instanceof STreePropertyAssocMany) {
+      return new SqlTreeNodeManyRoot(prefix, (STreePropertyAssocMany) prop, props, myList, temporalMode, disableLazyLoad);
 
     } else {
       // do not read Id on child beans (e.g. when used with fetch())
@@ -334,7 +326,7 @@ public final class SqlTreeBuilder {
    * Build extra joins to support properties used in where clause but not
    * already in select clause.
    */
-  private void buildExtraJoins(BeanDescriptor<?> desc, List<SqlTreeNode> myList) {
+  private void buildExtraJoins(STreeType desc, List<SqlTreeNode> myList) {
 
     if (rawSql) {
       return;
@@ -383,25 +375,25 @@ public final class SqlTreeBuilder {
    * This means it can included individual properties of an embedded bean.
    * </p>
    */
-  private void addPropertyToSubQuery(SqlTreeProperties selectProps, BeanDescriptor<?> desc, String propName) {
+  private void addPropertyToSubQuery(SqlTreeProperties selectProps, STreeType desc, String propName) {
 
-    BeanProperty p = desc.findBeanProperty(propName);
+    STreeProperty p = desc.findProperty(propName);
     if (p == null) {
       logger.error("property [" + propName + "]not found on " + desc + " for query - excluding it.");
 
-    } else if (p instanceof BeanPropertyAssoc<?> && p.isEmbedded()) {
+    } else if (p instanceof STreePropertyAssoc && p.isEmbedded()) {
       // if the property is embedded we need to lookup the real column name
       int pos = propName.indexOf('.');
       if (pos > -1) {
         String name = propName.substring(pos + 1);
-        p = ((BeanPropertyAssoc<?>) p).getTargetDescriptor().findBeanProperty(name);
+        p = ((STreePropertyAssoc) p).target().findProperty(name);
       }
     }
 
     selectProps.add(p);
   }
 
-  private void addProperty(SqlTreeProperties selectProps, BeanDescriptor<?> desc,
+  private void addProperty(SqlTreeProperties selectProps, STreeType desc,
                            OrmQueryProperties queryProps, String propName) {
 
     if (subQuery) {
@@ -418,7 +410,7 @@ public final class SqlTreeBuilder {
 
       // make sure we only included the base/embedded bean once
       if (!selectProps.containsProperty(baseName)) {
-        SqlTreeProperty p = desc.findSqlTreeProperty(baseName);
+        STreeProperty p = desc.findPropertyWithDynamic(baseName);
         if (p == null) {
           logger.error("property [" + propName + "] not found on " + desc + " for query - excluding it.");
 
@@ -436,17 +428,17 @@ public final class SqlTreeBuilder {
     } else {
       // find the property including searching the
       // sub class hierarchy if required
-      SqlTreeProperty p = desc.findSqlTreeProperty(propName);
+      STreeProperty p = desc.findPropertyWithDynamic(propName);
       if (p == null) {
         logger.error("property [" + propName + "] not found on " + desc + " for query - excluding it.");
-        p = desc.findBeanProperty("id");
+        p = desc.findProperty("id");
         selectProps.add(p);
 
       } else if (p.isId() && excludeIdProperty()) {
         // do not bother to include id for normal queries as the
         // id is always added (except for subQueries)
 
-      } else if (p instanceof BeanPropertyAssoc<?>) {
+      } else if (p instanceof STreePropertyAssoc) {
         // need to check if this property should be
         // excluded. This occurs when this property is
         // included as a bean join. With a bean join
@@ -463,7 +455,7 @@ public final class SqlTreeBuilder {
     }
   }
 
-  private SqlTreeProperties getBaseSelectPartial(BeanDescriptor<?> desc, OrmQueryProperties queryProps) {
+  private SqlTreeProperties getBaseSelectPartial(STreeType desc, OrmQueryProperties queryProps) {
 
     SqlTreeProperties selectProps = new SqlTreeProperties();
     selectProps.setReadOnly(queryProps.isReadOnly());
@@ -484,7 +476,7 @@ public final class SqlTreeBuilder {
     return selectProps;
   }
 
-  private SqlTreeProperties getBaseSelect(BeanDescriptor<?> desc, OrmQueryProperties queryProps) {
+  private SqlTreeProperties getBaseSelect(STreeType desc, OrmQueryProperties queryProps) {
 
     boolean partial = queryProps != null && !queryProps.allProperties();
     if (partial) {
@@ -495,17 +487,16 @@ public final class SqlTreeBuilder {
     selectProps.setAllProperties();
 
     // normal simple properties of the bean
-    selectProps.add(desc.propertiesBaseScalar());
-    selectProps.add(desc.propertiesEmbedded());
+    selectProps.add(desc.propsBaseScalar());
+    selectProps.add(desc.propsEmbedded());
 
-    BeanPropertyAssocOne<?>[] propertiesOne = desc.propertiesOne();
-    for (BeanPropertyAssocOne<?> aPropertiesOne : propertiesOne) {
+    for (STreePropertyAssocOne propertyAssocOne : desc.propsOne()) {
       //noinspection StatementWithEmptyBody
-      if (queryProps != null && queryProps.isIncludedBeanJoin(aPropertiesOne.getName())) {
+      if (queryProps != null && queryProps.isIncludedBeanJoin(propertyAssocOne.getName())) {
         // if it is a joined bean... then don't add the property
         // as it will have its own entire Node in the SqlTree
       } else {
-        selectProps.add(aPropertiesOne);
+        selectProps.add(propertyAssocOne);
       }
     }
 
@@ -521,7 +512,7 @@ public final class SqlTreeBuilder {
   /**
    * Return true if this many node should be included in the query.
    */
-  private boolean isIncludeMany(String propName, BeanPropertyAssocMany<?> manyProp) {
+  private boolean isIncludeMany(String propName, STreePropertyAssocMany manyProp) {
 
     if (queryDetail.isJoinsEmpty()) {
       return false;
@@ -588,9 +579,9 @@ public final class SqlTreeBuilder {
      */
     private final Map<String, SqlTreeNodeExtraJoin> rootRegister = new HashMap<>();
 
-    private final BeanDescriptor<?> desc;
+    private final STreeType desc;
 
-    private IncludesDistiller(BeanDescriptor<?> desc, Set<String> selectIncludes,
+    private IncludesDistiller(STreeType desc, Set<String> selectIncludes,
                               Set<String> predicateIncludes) {
       this.desc = desc;
       this.selectIncludes = selectIncludes;
@@ -645,25 +636,14 @@ public final class SqlTreeBuilder {
      */
     private SqlTreeNodeExtraJoin createJoinLeaf(String propertyName) {
 
-      ElPropertyValue elGetValue = desc.getElGetValue(propertyName);
-
-      if (elGetValue == null) {
-        // this can occur for master detail queries
-        // with concatenated keys (so not an error now)
+      ExtraJoin extra = desc.extraJoin(propertyName);
+      if (extra == null) {
         return null;
-      }
-      BeanProperty beanProperty = elGetValue.getBeanProperty();
-      if (beanProperty instanceof BeanPropertyAssoc<?>) {
-        BeanPropertyAssoc<?> assocProp = (BeanPropertyAssoc<?>) beanProperty;
-        if (assocProp.isEmbedded()) {
-          // no extra join required for embedded beans
-          return null;
-        }
-        SqlTreeNodeExtraJoin extraJoin = new SqlTreeNodeExtraJoin(propertyName, assocProp, elGetValue.containsMany());
+      } else {
+        SqlTreeNodeExtraJoin extraJoin = new SqlTreeNodeExtraJoin(propertyName, extra.getProperty(), extra.isContainsMany());
         joinRegister.put(propertyName, extraJoin);
         return extraJoin;
       }
-      return null;
     }
 
     /**
@@ -674,10 +654,8 @@ public final class SqlTreeBuilder {
      * not specified and is implicitly created.
      * </p>
      */
-    private SqlTreeNodeExtraJoin findExtraJoinRoot(String includeProp,
-                                                   SqlTreeNodeExtraJoin childJoin) {
+    private SqlTreeNodeExtraJoin findExtraJoinRoot(String includeProp, SqlTreeNodeExtraJoin childJoin) {
       while (true) {
-
         int dotPos = includeProp.lastIndexOf('.');
         if (dotPos == -1) {
           // no parent possible(parent is root)
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
index 806e64adb..96fd09d05 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
@@ -9,11 +9,6 @@ import io.ebean.util.SplitName;
 import io.ebean.util.StringHelper;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.SpiQuery.Mode;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.deploy.BeanProperty;
-import io.ebeaninternal.server.deploy.BeanPropertyAssoc;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 import io.ebeaninternal.server.deploy.DbReadContext;
 import io.ebeaninternal.server.deploy.DbSqlContext;
 import io.ebeaninternal.server.deploy.InheritInfo;
@@ -34,7 +29,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
 
   private static final SqlTreeNode[] NO_CHILDREN = new SqlTreeNode[0];
 
-  protected final BeanDescriptor<?> desc;
+  protected final STreeType desc;
 
   protected final IdBinder idBinder;
 
@@ -48,14 +43,14 @@ class SqlTreeNodeBean implements SqlTreeNode {
    */
   private final boolean partialObject;
 
-  protected final SqlTreeProperty[] properties;
+  protected final STreeProperty[] properties;
 
   /**
    * Extra where clause added by Where annotation on associated many.
    */
   private final String extraWhere;
 
-  private final BeanPropertyAssoc<?> nodeBeanProp;
+  private final STreePropertyAssoc nodeBeanProp;
 
   /**
    * False if report bean and has no id property.
@@ -70,7 +65,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
 
   private final Map<String, String> pathMap;
 
-  final BeanPropertyAssocMany<?> lazyLoadParent;
+  final STreePropertyAssocMany lazyLoadParent;
 
   final SpiQuery.TemporalMode temporalMode;
 
@@ -92,29 +87,29 @@ class SqlTreeNodeBean implements SqlTreeNode {
   /**
    * Construct for leaf node.
    */
-  SqlTreeNodeBean(String prefix, BeanPropertyAssoc<?> beanProp, SqlTreeProperties props,
+  SqlTreeNodeBean(String prefix, STreePropertyAssoc beanProp, SqlTreeProperties props,
                   List<SqlTreeNode> myChildren, boolean withId, SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad) {
 
-    this(prefix, beanProp, beanProp.getTargetDescriptor(), props, myChildren, withId, null, temporalMode, disableLazyLoad);
+    this(prefix, beanProp, beanProp.target(), props, myChildren, withId, null, temporalMode, disableLazyLoad);
   }
 
   /**
    * Construct for root node.
    */
-  SqlTreeNodeBean(BeanDescriptor<?> desc, SqlTreeProperties props, List<SqlTreeNode> myList, boolean withId,
-                  BeanPropertyAssocMany<?> many, SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad) {
+  SqlTreeNodeBean(STreeType desc, SqlTreeProperties props, List<SqlTreeNode> myList, boolean withId,
+                  STreePropertyAssocMany many, SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad) {
     this(null, null, desc, props, myList, withId, many, temporalMode, disableLazyLoad);
   }
 
   /**
    * Create with the appropriate node.
    */
-  private SqlTreeNodeBean(String prefix, BeanPropertyAssoc<?> beanProp, BeanDescriptor<?> desc, SqlTreeProperties props,
-                          List<SqlTreeNode> myChildren, boolean withId, BeanPropertyAssocMany<?> lazyLoadParent,
+  private SqlTreeNodeBean(String prefix, STreePropertyAssoc beanProp, STreeType desc, SqlTreeProperties props,
+                          List<SqlTreeNode> myChildren, boolean withId, STreePropertyAssocMany lazyLoadParent,
                           SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad) {
 
     this.lazyLoadParent = lazyLoadParent;
-    this.lazyLoadParentIdBinder = (lazyLoadParent == null) ? null : lazyLoadParent.getBeanDescriptor().getIdBinder();
+    this.lazyLoadParentIdBinder = (lazyLoadParent == null) ? null : lazyLoadParent.getIdBinder();
     this.prefix = prefix;
     this.desc = desc;
     this.inheritInfo = desc.getInheritInfo();
@@ -129,7 +124,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
     this.aggregationRoot = props.isAggregationRoot();
 
     // the bean has an Id property and we want to use it
-    this.readId = !aggregationRoot && withId && (desc.getIdProperty() != null);
+    this.readId = !aggregationRoot && withId && desc.hasId();
     this.disableLazyLoad = disableLazyLoad || !readId || desc.isRawSqlBased() || temporalVersions;
 
     this.partialObject = props.isPartialObject();
@@ -150,25 +145,22 @@ class SqlTreeNodeBean implements SqlTreeNode {
       // if we have also no children, NPE happens anyway.
       return children[0].getSingleAttributeScalarType();
     }
-    if (properties[0] instanceof BeanPropertyAssocOne<?>) {
-      BeanPropertyAssocOne<?> assocOne = (BeanPropertyAssocOne<?>)properties[0];
+    if (properties[0] instanceof STreePropertyAssocOne) {
+      STreePropertyAssocOne assocOne = (STreePropertyAssocOne)properties[0];
       if (assocOne.isAssocId()) {
-        return assocOne.getTargetDescriptor().getIdProperty().getScalarType();
+        return assocOne.getIdScalarType();
       }
     }
     return properties[0].getScalarType();
   }
 
-  private Map<String, String> createPathMap(String prefix, BeanDescriptor<?> desc) {
-
-    BeanPropertyAssocMany<?>[] manys = desc.propertiesMany();
+  private Map<String, String> createPathMap(String prefix, STreeType desc) {
 
     HashMap<String, String> m = new HashMap<>();
-    for (BeanPropertyAssocMany<?> many : manys) {
+    for (STreePropertyAssocMany many : desc.propsMany()) {
       String name = many.getName();
       m.put(name, getPath(prefix, name));
     }
-
     return m;
   }
 
@@ -189,7 +181,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
       }
       idBinder.buildRawSqlSelectChain(prefix, selectChain);
     }
-    for (SqlTreeProperty property : properties) {
+    for (STreeProperty property : properties) {
       property.buildRawSqlSelectChain(prefix, selectChain);
     }
     // recursively continue reading...
@@ -228,7 +220,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
     }
 
     Class<?> localType;
-    BeanDescriptor<?> localDesc;
+    STreeType localDesc;
     IdBinder localIdBinder;
     EntityBean localBean;
 
@@ -292,21 +284,16 @@ class SqlTreeNodeBean implements SqlTreeNode {
 
     if (inheritInfo == null) {
       // normal behavior with no inheritance
-      for (SqlTreeProperty property : properties) {
+      for (STreeProperty property : properties) {
         property.load(sqlBeanLoad);
       }
 
     } else {
       // take account of inheritance and due to subclassing approach
       // need to get a 'local' version of the property
-      for (SqlTreeProperty property : properties) {
+      for (STreeProperty property : properties) {
         // get a local version of the BeanProperty
-        BeanProperty p = localDesc.getBeanProperty(property.getName());
-        if (p != null) {
-          p.load(sqlBeanLoad);
-        } else {
-          property.loadIgnore(ctx);
-        }
+        localDesc.inheritanceLoad(sqlBeanLoad, property, ctx);
       }
     }
 
@@ -374,6 +361,9 @@ class SqlTreeNodeBean implements SqlTreeNode {
 
     if (!readId || temporalVersions) {
       // a bean with no Id (never found in context)
+      if (lazyLoadParentId != null && desc.isElementType()) {
+        ctx.setLazyLoadedChildBean(localBean, lazyLoadParentId);
+      }
       return localBean;
 
     } else {
@@ -388,13 +378,12 @@ class SqlTreeNodeBean implements SqlTreeNode {
    * Create lazy loading proxies for the Many's except for the one that is
    * included in the actual query.
    */
-  private void createListProxies(BeanDescriptor<?> localDesc, DbReadContext ctx, EntityBean localBean, boolean disableLazyLoad) {
+  private void createListProxies(STreeType localDesc, DbReadContext ctx, EntityBean localBean, boolean disableLazyLoad) {
 
-    BeanPropertyAssocMany<?> fetchedMany = ctx.getManyProperty();
+    STreePropertyAssocMany fetchedMany = ctx.getManyProperty();
 
     // load the List/Set/Map proxy objects (deferred fetching of lists)
-    BeanPropertyAssocMany<?>[] manys = localDesc.propertiesMany();
-    for (BeanPropertyAssocMany<?> many : manys) {
+    for (STreePropertyAssocMany many : localDesc.propsMany()) {
 
       if (fetchedMany == null || !fetchedMany.equals(many)) {
         // create a proxy for the many (deferred fetching)
@@ -419,7 +408,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
     if (readId) {
       appendSelectId(ctx, idBinder.getBeanProperty());
     }
-    for (SqlTreeProperty property : properties) {
+    for (STreeProperty property : properties) {
       if (!property.isAggregation()) {
         property.appendSelect(ctx, subQuery);
       }
@@ -486,14 +475,13 @@ class SqlTreeNodeBean implements SqlTreeNode {
   /**
    * Append the properties to the buffer.
    */
-  private void appendSelect(DbSqlContext ctx, boolean subQuery, SqlTreeProperty[] props) {
-
-    for (SqlTreeProperty prop : props) {
+  private void appendSelect(DbSqlContext ctx, boolean subQuery, STreeProperty[] props) {
+    for (STreeProperty prop : props) {
       prop.appendSelect(ctx, subQuery);
     }
   }
 
-  protected void appendSelectId(DbSqlContext ctx, BeanProperty prop) {
+  protected void appendSelectId(DbSqlContext ctx, STreeProperty prop) {
     if (prop != null) {
       prop.appendSelect(ctx, false);
     }
@@ -546,7 +534,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
     // join and return SqlJoinType to use for child joins
     joinType = appendFromBaseTable(ctx, joinType);
 
-    for (SqlTreeProperty property : properties) {
+    for (STreeProperty property : properties) {
       // usually nothing... except for 1-1 Exported
       property.appendFrom(ctx, joinType);
     }
@@ -601,8 +589,8 @@ class SqlTreeNodeBean implements SqlTreeNode {
 
   private SqlJoinType appendFromAsJoin(DbSqlContext ctx, SqlJoinType joinType) {
 
-    if (nodeBeanProp instanceof BeanPropertyAssocMany<?>) {
-      BeanPropertyAssocMany<?> manyProp = (BeanPropertyAssocMany<?>) nodeBeanProp;
+    if (nodeBeanProp instanceof STreePropertyAssocMany) {
+      STreePropertyAssocMany manyProp = (STreePropertyAssocMany) nodeBeanProp;
       if (manyProp.hasJoinTable()) {
 
         String alias = ctx.getTableAlias(prefix);
@@ -619,7 +607,6 @@ class SqlTreeNodeBean implements SqlTreeNode {
 
         return nodeBeanProp.addJoin(joinType, alias2, alias, ctx);
       }
-
     }
 
     return nodeBeanProp.addJoin(joinType, prefix, ctx);
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
index ba83d4ced..17943ddd1 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
@@ -4,14 +4,11 @@ import io.ebean.Version;
 import io.ebean.bean.EntityBean;
 import io.ebean.util.SplitName;
 import io.ebeaninternal.api.SpiQuery;
-import io.ebeaninternal.server.deploy.BeanPropertyAssoc;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.DbReadContext;
 import io.ebeaninternal.server.deploy.DbSqlContext;
 import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.type.ScalarType;
 
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -25,7 +22,7 @@ import java.util.List;
  */
 class SqlTreeNodeExtraJoin implements SqlTreeNode {
 
-  private final BeanPropertyAssoc<?> assocBeanProperty;
+  private final STreePropertyAssoc assocBeanProperty;
 
   private final String prefix;
 
@@ -35,11 +32,11 @@ class SqlTreeNodeExtraJoin implements SqlTreeNode {
 
   private List<SqlTreeNodeExtraJoin> children;
 
-  SqlTreeNodeExtraJoin(String prefix, BeanPropertyAssoc<?> assocBeanProperty, boolean pathContainsMany) {
+  SqlTreeNodeExtraJoin(String prefix, STreePropertyAssoc assocBeanProperty, boolean pathContainsMany) {
     this.prefix = prefix;
     this.assocBeanProperty = assocBeanProperty;
     this.pathContainsMany = pathContainsMany;
-    this.manyJoin = assocBeanProperty instanceof BeanPropertyAssocMany<?>;
+    this.manyJoin = assocBeanProperty instanceof STreePropertyAssocMany;
   }
 
   @Override
@@ -103,8 +100,8 @@ class SqlTreeNodeExtraJoin implements SqlTreeNode {
 
     boolean manyToMany = false;
 
-    if (assocBeanProperty instanceof BeanPropertyAssocMany<?>) {
-      BeanPropertyAssocMany<?> manyProp = (BeanPropertyAssocMany<?>) assocBeanProperty;
+    if (assocBeanProperty instanceof STreePropertyAssocMany) {
+      STreePropertyAssocMany manyProp = (STreePropertyAssocMany) assocBeanProperty;
       if (manyProp.hasJoinTable()) {
 
         manyToMany = true;
@@ -127,7 +124,7 @@ class SqlTreeNodeExtraJoin implements SqlTreeNode {
     }
     if (!manyToMany) {
       if (assocBeanProperty.isFormula()) {
-        // add joins for formula beans 
+        // add joins for formula beans
         assocBeanProperty.appendFrom(ctx, joinType);
       }
       joinType = assocBeanProperty.addJoin(joinType, prefix, ctx);
@@ -164,7 +161,7 @@ class SqlTreeNodeExtraJoin implements SqlTreeNode {
    * Does nothing.
    */
   @Override
-  public EntityBean load(DbReadContext ctx, EntityBean localBean, EntityBean parentBean) throws SQLException {
+  public EntityBean load(DbReadContext ctx, EntityBean localBean, EntityBean parentBean) {
     return null;
   }
 
@@ -172,7 +169,7 @@ class SqlTreeNodeExtraJoin implements SqlTreeNode {
    * Does nothing.
    */
   @Override
-  public <T> Version<T> loadVersion(DbReadContext ctx) throws SQLException {
+  public <T> Version<T> loadVersion(DbReadContext ctx) {
     return null;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
index 835d201b3..edeff9fce 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
@@ -2,7 +2,6 @@ package io.ebeaninternal.server.query;
 
 import io.ebean.bean.EntityBean;
 import io.ebeaninternal.api.SpiQuery;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.DbReadContext;
 import io.ebeaninternal.server.deploy.DbSqlContext;
 
@@ -11,9 +10,9 @@ import java.util.List;
 
 final class SqlTreeNodeManyRoot extends SqlTreeNodeBean {
 
-  private final BeanPropertyAssocMany<?> manyProp;
+  private final STreePropertyAssocMany manyProp;
 
-  SqlTreeNodeManyRoot(String prefix, BeanPropertyAssocMany<?> prop, SqlTreeProperties props, List<SqlTreeNode> myList,
+  SqlTreeNodeManyRoot(String prefix, STreePropertyAssocMany prop, SqlTreeProperties props, List<SqlTreeNode> myList,
                       SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad) {
     super(prefix, prop, props, myList, true, temporalMode, disableLazyLoad);
     this.manyProp = prop;
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java
index 07ab86398..ae0a810ab 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java
@@ -4,15 +4,11 @@ import io.ebean.Version;
 import io.ebean.bean.EntityBean;
 import io.ebean.util.SplitName;
 import io.ebeaninternal.api.SpiQuery;
-import io.ebeaninternal.server.deploy.BeanPropertyAssoc;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 import io.ebeaninternal.server.deploy.DbReadContext;
 import io.ebeaninternal.server.deploy.DbSqlContext;
 import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.type.ScalarType;
 
-import java.sql.SQLException;
 import java.util.List;
 
 /**
@@ -24,15 +20,14 @@ class SqlTreeNodeManyWhereJoin implements SqlTreeNode {
 
   private final String prefix;
 
-  private final BeanPropertyAssoc<?> nodeBeanProp;
+  private final STreePropertyAssoc nodeBeanProp;
 
   /**
    * The many where join which is either INNER or OUTER.
    */
   private final SqlJoinType manyJoinType;
 
-  SqlTreeNodeManyWhereJoin(String prefix, BeanPropertyAssoc<?> prop, SqlJoinType manyJoinType) {
-
+  SqlTreeNodeManyWhereJoin(String prefix, STreePropertyAssoc prop, SqlJoinType manyJoinType) {
     this.nodeBeanProp = prop;
     this.prefix = prefix;
     this.manyJoinType = manyJoinType;
@@ -86,16 +81,16 @@ class SqlTreeNodeManyWhereJoin implements SqlTreeNode {
    * Join to base table for this node. This includes a join to the
    * intersection table if this is a ManyToMany node.
    */
-  void appendFromBaseTable(DbSqlContext ctx, SqlJoinType joinType) {
+  private void appendFromBaseTable(DbSqlContext ctx, SqlJoinType joinType) {
 
     String alias = ctx.getTableAliasManyWhere(prefix);
     String parentAlias = ctx.getTableAliasManyWhere(parentPrefix);
 
-    if (nodeBeanProp instanceof BeanPropertyAssocOne<?>) {
+    if (nodeBeanProp instanceof STreePropertyAssocOne) {
       nodeBeanProp.addJoin(joinType, parentAlias, alias, ctx);
 
     } else {
-      BeanPropertyAssocMany<?> manyProp = (BeanPropertyAssocMany<?>) nodeBeanProp;
+      STreePropertyAssocMany manyProp = (STreePropertyAssocMany) nodeBeanProp;
       if (!manyProp.hasJoinTable()) {
         manyProp.addJoin(joinType, parentAlias, alias, ctx);
 
@@ -125,13 +120,13 @@ class SqlTreeNodeManyWhereJoin implements SqlTreeNode {
   }
 
   @Override
-  public EntityBean load(DbReadContext ctx, EntityBean localBean, EntityBean parentBean) throws SQLException {
+  public EntityBean load(DbReadContext ctx, EntityBean localBean, EntityBean parentBean) {
     // nothing to do here
     return null;
   }
 
   @Override
-  public <T> Version<T> loadVersion(DbReadContext ctx) throws SQLException {
+  public <T> Version<T> loadVersion(DbReadContext ctx) {
     // nothing to do here
     return null;
   }
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java
index bb93b25e1..74be7c415 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java
@@ -1,8 +1,6 @@
 package io.ebeaninternal.server.query;
 
 import io.ebeaninternal.api.SpiQuery;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.DbSqlContext;
 import io.ebeaninternal.server.deploy.TableJoin;
 
@@ -18,8 +16,8 @@ final class SqlTreeNodeRoot extends SqlTreeNodeBean {
   /**
    * Specify for SqlSelect to include an Id property or not.
    */
-  SqlTreeNodeRoot(BeanDescriptor<?> desc, SqlTreeProperties props, List<SqlTreeNode> myList, boolean withId,
-                  TableJoin includeJoin, BeanPropertyAssocMany<?> many, SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad) {
+  SqlTreeNodeRoot(STreeType desc, SqlTreeProperties props, List<SqlTreeNode> myList, boolean withId,
+                  TableJoin includeJoin, STreePropertyAssocMany many, SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad) {
 
     super(desc, props, myList, withId, many, temporalMode, disableLazyLoad);
     this.includeJoin = includeJoin;
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
index 9c717173e..5ec9b286d 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
@@ -20,7 +20,7 @@ public class SqlTreeProperties {
   /**
    * The bean properties in order.
    */
-  private final List<SqlTreeProperty> propsList = new ArrayList<>();
+  private final List<STreeProperty> propsList = new ArrayList<>();
 
   /**
    * Maintain a list of property names to detect embedded bean additions.
@@ -40,17 +40,17 @@ public class SqlTreeProperties {
     return propNames.contains(propName);
   }
 
-  public void add(SqlTreeProperty[] props) {
+  public void add(STreeProperty[] props) {
     propsList.addAll(Arrays.asList(props));
   }
 
-  public void add(SqlTreeProperty prop) {
+  public void add(STreeProperty prop) {
     propsList.add(prop);
     propNames.add(prop.getName());
   }
 
-  public SqlTreeProperty[] getProps() {
-    return propsList.toArray(new SqlTreeProperty[propsList.size()]);
+  public STreeProperty[] getProps() {
+    return propsList.toArray(new STreeProperty[propsList.size()]);
   }
 
   boolean isPartialObject() {
@@ -97,7 +97,7 @@ public class SqlTreeProperties {
    */
   private String aggregationJoin() {
     if (!allProperties) {
-      for (SqlTreeProperty beanProperty : propsList) {
+      for (STreeProperty beanProperty : propsList) {
         if (beanProperty.isAggregation()) {
           aggregation = true;
           aggregationPath = beanProperty.getElPrefix();
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
index 6bdc89fd2..e7fa731b3 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
@@ -1,11 +1,11 @@
 package io.ebeaninternal.server.querydefn;
 
 import io.ebean.FetchConfig;
+import io.ebean.util.SplitName;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanPropertyAssoc;
 import io.ebeaninternal.server.el.ElPropertyDeploy;
 import io.ebeaninternal.server.el.ElPropertyValue;
-import io.ebean.util.SplitName;
 
 import javax.persistence.PersistenceException;
 import java.io.Serializable;
@@ -427,7 +427,7 @@ public class OrmQueryDetail implements Serializable {
     for (OrmQueryProperties joinProps : fetchPaths.values()) {
       if (!joinProps.hasSelectClause()) {
         BeanDescriptor<?> assocDesc = desc.getBeanDescriptor(joinProps.getPath());
-        if (assocDesc.hasDefaultSelectClause()) {
+        if (assocDesc != null && assocDesc.hasDefaultSelectClause()) {
           fetch(joinProps.getPath(), assocDesc.getDefaultSelectClause(), joinProps.getFetchConfig());
         }
       }
diff --git a/src/main/java/io/ebeanservice/docstore/api/support/DocStructure.java b/src/main/java/io/ebeanservice/docstore/api/support/DocStructure.java
index cad53baf2..e67e473f3 100644
--- a/src/main/java/io/ebeanservice/docstore/api/support/DocStructure.java
+++ b/src/main/java/io/ebeanservice/docstore/api/support/DocStructure.java
@@ -72,7 +72,7 @@ public class DocStructure {
   public <T> void prepareMany(BeanDescriptor<T> desc) {
     Set<String> strings = embedded.keySet();
     for (String prop : strings) {
-      BeanPropertyAssoc<?> embProp = (BeanPropertyAssoc<?>) desc.findBeanProperty(prop);
+      BeanPropertyAssoc<?> embProp = (BeanPropertyAssoc<?>) desc.findProperty(prop);
       if (embProp.isMany()) {
         prepare(prop, embProp);
       }
diff --git a/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java b/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java
index 9526619c9..d20581c0b 100644
--- a/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java
+++ b/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.deploy;
 
 import io.ebean.BaseTestCase;
-import io.ebeaninternal.server.query.SqlTreeProperty;
+import io.ebeaninternal.server.query.STreeProperty;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
 
@@ -76,7 +76,7 @@ public class FormulaPropertyPathTest extends BaseTestCase {
       assertThat(propertyPath.alias()).isNull();
     }
 
-    SqlTreeProperty treeProperty = propertyPath.build();
+    STreeProperty treeProperty = propertyPath.build();
 
     assertThat(treeProperty).isNotNull();
   }
diff --git a/src/test/java/org/tests/basic/TestAnnotationBase.java b/src/test/java/org/tests/basic/TestAnnotationBase.java
index e40c36cd9..f84ec99ab 100644
--- a/src/test/java/org/tests/basic/TestAnnotationBase.java
+++ b/src/test/java/org/tests/basic/TestAnnotationBase.java
@@ -1,13 +1,13 @@
 package org.tests.basic;
 
 import io.ebean.BaseTestCase;
+import io.ebean.annotation.Platform;
 import io.ebean.annotation.Where;
 import io.ebean.util.AnnotationUtil;
-import io.ebean.annotation.Platform;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanProperty;
-import org.tests.model.basic.ValidationGroupSomething;
 import org.junit.Test;
+import org.tests.model.basic.ValidationGroupSomething;
 
 import javax.persistence.Entity;
 import javax.validation.constraints.NotNull;
@@ -125,23 +125,23 @@ public class TestAnnotationBase extends BaseTestCase {
 
 
   @Test
-  public void testFindMaxSize() throws NoSuchFieldException, SecurityException {
+  public void testFindMaxSize() throws SecurityException {
     BeanDescriptor<TestAnnotationBaseEntity> descriptor = spiEbeanServer().getBeanDescriptor(TestAnnotationBaseEntity.class);
-    BeanProperty bp = descriptor.findBeanProperty("constraintAnnotation");
+    BeanProperty bp = descriptor.findProperty("constraintAnnotation");
     assertEquals(40, bp.getDbLength());
   }
 
   @Test
-  public void testNotNullWithGroup() throws NoSuchFieldException, SecurityException {
+  public void testNotNullWithGroup() throws SecurityException {
     BeanDescriptor<TestAnnotationBaseEntity> descriptor = spiEbeanServer().getBeanDescriptor(TestAnnotationBaseEntity.class);
 
-    BeanProperty bp = descriptor.findBeanProperty("null1");
+    BeanProperty bp = descriptor.findProperty("null1");
     assertFalse(bp.isNullable());
 
-    bp = descriptor.findBeanProperty("null2");
+    bp = descriptor.findProperty("null2");
     assertTrue(bp.isNullable());
 
-    bp = descriptor.findBeanProperty("null3");
+    bp = descriptor.findProperty("null3");
     assertTrue(bp.isNullable());
   }
 
diff --git a/src/test/java/org/tests/model/elementcollection/EcPerson.java b/src/test/java/org/tests/model/elementcollection/EcPerson.java
new file mode 100644
index 000000000..00550b5c6
--- /dev/null
+++ b/src/test/java/org/tests/model/elementcollection/EcPerson.java
@@ -0,0 +1,69 @@
+package org.tests.model.elementcollection;
+
+import javax.persistence.CollectionTable;
+import javax.persistence.Column;
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.Version;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+public class EcPerson {
+
+  @Id
+  long id;
+
+  String name;
+
+  @ElementCollection
+  @CollectionTable(name = "ec_person_phone", joinColumns = @JoinColumn(name = "owner_id", referencedColumnName = "id"))
+  @Column(name = "phone")
+  List<String> phoneNumbers = new ArrayList<>();
+
+  @Version
+  long version;
+
+  public EcPerson(String name) {
+    this.name = name;
+  }
+
+  @Override
+  public String toString() {
+    return "person id:" + id + " name:" + name + " phs:" + phoneNumbers;
+  }
+
+  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 List<String> getPhoneNumbers() {
+    return phoneNumbers;
+  }
+
+  public void setPhoneNumbers(List<String> phoneNumbers) {
+    this.phoneNumbers = phoneNumbers;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
new file mode 100644
index 000000000..dd5ea2bc3
--- /dev/null
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
@@ -0,0 +1,51 @@
+package org.tests.model.elementcollection;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestElementCollectionBasic extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    EcPerson person = new EcPerson("Fiona021");
+    person.getPhoneNumbers().add("021 1234");
+    person.getPhoneNumbers().add("021 4321");
+    Ebean.save(person);
+
+
+    EcPerson person1 = new EcPerson("Fiona09");
+    person1.getPhoneNumbers().add("09 1234");
+    person1.getPhoneNumbers().add("09 4321");
+    Ebean.save(person1);
+
+    List<EcPerson> found =
+      Ebean.find(EcPerson.class).where()
+        .startsWith("name", "Fiona0")
+        .order().asc("id")
+      .findList();
+
+    List<String> phoneNumbers0 = found.get(0).getPhoneNumbers();
+    List<String> phoneNumbers1 = found.get(1).getPhoneNumbers();
+    phoneNumbers0.size();
+
+    assertThat(phoneNumbers0).containsExactly("021 1234", "021 4321");
+    assertThat(phoneNumbers1).containsExactly("09 1234", "09 4321");
+
+
+    List<EcPerson> found2 =
+      Ebean.find(EcPerson.class)
+        .fetch("phoneNumbers")
+        .where()
+        .startsWith("name", "Fiona0")
+        .order().asc("id")
+        .findList();
+
+    System.out.println(found2);
+  }
+}

From 85c43854985c1ec3e4b4e5526e58506f696a52c5 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 20 Mar 2018 17:24:35 +1300
Subject: [PATCH 0195/1036] #115 - Mapping - Add support for @ElementCollection
 enhancement

Initial support - add simple Set support and Json support for simple List and Set.
---
 .../deploy/BeanCollectionHelpFactory.java     | 13 ++--
 .../server/deploy/BeanDescriptor.java         | 10 ++-
 .../server/deploy/BeanDescriptorElement.java  | 47 ++++++++++++-
 .../server/deploy/BeanDescriptorManager.java  | 15 +++-
 .../server/deploy/BeanListHelpElement.java    |  9 +--
 .../server/deploy/BeanPropertyAssocMany.java  | 27 ++++++++
 .../deploy/BeanPropertyAssocManyJsonHelp.java | 20 +-----
 .../deploy/BeanPropertySimpleCollection.java  | 27 ++++++++
 .../server/deploy/BeanSetHelp.java            |  2 +-
 .../server/deploy/BeanSetHelpElement.java     | 30 ++++++++
 .../server/deploy/ElementCollector.java       | 17 +++++
 .../server/deploy/ElementHelp.java            | 13 ++++
 .../server/deploy/ElementHelpList.java        | 27 ++++++++
 .../server/deploy/ElementHelpMap.java         | 28 ++++++++
 .../server/deploy/ElementHelpSet.java         | 27 ++++++++
 .../deploy/parse/AnnotationAssocManys.java    | 21 ++++--
 .../model/elementcollection/EcsPerson.java    | 68 +++++++++++++++++++
 .../TestElementCollectionBasic.java           | 10 ++-
 .../TestElementCollectionBasicSet.java        | 59 ++++++++++++++++
 19 files changed, 422 insertions(+), 48 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/BeanSetHelpElement.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/ElementCollector.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/ElementHelp.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/ElementHelpList.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/ElementHelpMap.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/ElementHelpSet.java
 create mode 100644 src/test/java/org/tests/model/elementcollection/EcsPerson.java
 create mode 100644 src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java
index f74a67243..86dd30126 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java
@@ -18,18 +18,17 @@ public class BeanCollectionHelpFactory {
   /**
    * Create the helper based on the many property.
    */
-  public static <T> BeanCollectionHelp<T> create(BeanPropertyAssocMany<T> manyProperty) {
+  public static <T> BeanCollectionHelp<T> create(BeanPropertyAssocMany<T> many) {
 
-    boolean elementCollection = manyProperty.isElementCollection();
-
-    ManyType manyType = manyProperty.getManyType();
+    boolean elementCollection = many.isElementCollection();
+    ManyType manyType = many.getManyType();
     switch (manyType) {
       case LIST:
-        return elementCollection ? new BeanListHelpElement<>(manyProperty) : new BeanListHelp<>(manyProperty);
+        return elementCollection ? new BeanListHelpElement<>(many) : new BeanListHelp<>(many);
       case SET:
-        return new BeanSetHelp<>(manyProperty);
+        return elementCollection ? new BeanSetHelpElement<>(many) : new BeanSetHelp<>(many);
       case MAP:
-        return new BeanMapHelp<>(manyProperty);
+        return new BeanMapHelp<>(many);
       default:
         throw new RuntimeException("Invalid type " + manyType);
     }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index a7614cbba..6f31713a0 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -406,7 +406,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
 
   private final BeanDescriptorDraftHelp<T> draftHelp;
   private final BeanDescriptorCacheHelp<T> cacheHelp;
-  private final BeanDescriptorJsonHelp<T> jsonHelp;
+  final BeanDescriptorJsonHelp<T> jsonHelp;
   private DocStoreBeanAdapter<T> docStoreAdapter;
   private DocumentMapping docMapping;
   private boolean docStoreEmbeddedInvalidation;
@@ -3330,6 +3330,14 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     jsonHelp.jsonWriteDirtyProperties(writeJson, bean, dirtyProps);
   }
 
+  public void jsonWriteElement(SpiJsonWriter ctx, Object element) {
+    throw new IllegalStateException("Unexpected - expect Element override");
+  }
+
+  public Object jsonReadCollection(ReadJson readJson, EntityBean parentBean) throws IOException {
+    throw new IllegalStateException("Unexpected - expect Element override");
+  }
+
   public void jsonWrite(SpiJsonWriter writeJson, EntityBean bean) throws IOException {
     jsonHelp.jsonWrite(writeJson, bean, null);
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java
index dd793505c..a9c6fa057 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java
@@ -1,15 +1,34 @@
 package io.ebeaninternal.server.deploy;
 
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import io.ebean.PersistenceIOException;
 import io.ebean.bean.EntityBean;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
+import io.ebeaninternal.server.text.json.ReadJson;
+import io.ebeaninternal.server.text.json.SpiJsonWriter;
+import io.ebeaninternal.server.type.ScalarType;
+
+import java.io.IOException;
 
 /**
  * Bean descriptor used with ElementCollection (where we don't have a mapped type/class).
  */
-public class BeanDescriptorElement<T> extends BeanDescriptor<T> {
+class BeanDescriptorElement<T> extends BeanDescriptor<T> {
 
-  public BeanDescriptorElement(BeanDescriptorMap owner, DeployBeanDescriptor<T> deploy) {
+  private final ScalarType<Object> scalarType;
+  private final ElementHelp elementHelp;
+
+  BeanDescriptorElement(BeanDescriptorMap owner, DeployBeanDescriptor<T> deploy, ElementHelp elementHelp) {
     super(owner, deploy);
+    this.elementHelp = elementHelp;
+
+    BeanProperty[] props = propertiesNonTransient();
+    if (props.length == 1) {
+      this.scalarType = props[0].getScalarType();
+    } else {
+      this.scalarType = null;
+    }
   }
 
   public boolean isElementType() {
@@ -21,4 +40,28 @@ public class BeanDescriptorElement<T> extends BeanDescriptor<T> {
     return new ElementEntityBean(properties);
   }
 
+  public void jsonWriteElement(SpiJsonWriter ctx, Object element) {
+    try {
+      scalarType.jsonWrite(ctx.gen(), element);
+    } catch (IOException e) {
+      throw new PersistenceIOException(e);
+    }
+  }
+
+  public Object jsonReadCollection(ReadJson readJson, EntityBean parentBean) throws IOException {
+
+    JsonParser parser = readJson.getParser();
+    ElementCollector add = elementHelp.createCollector();
+    do {
+      JsonToken token = parser.nextToken();
+      if (JsonToken.VALUE_NULL == token || JsonToken.END_ARRAY == token) {
+        break;
+      }
+      Object element = scalarType.jsonRead(parser);
+      add.addElement(element);
+    } while (true);
+
+    return add.collection();
+  }
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 5824612bd..1fbb6a15c 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -1658,8 +1658,19 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   /**
    * Create a BeanDescriptor for an ElementCollection target.
    */
-  public <A> BeanDescriptor<A> createElementDescriptor(DeployBeanDescriptor<A> elementDescriptor) {
-    return new BeanDescriptorElement<>(this, elementDescriptor);
+  public <A> BeanDescriptor<A> createElementDescriptor(DeployBeanDescriptor<A> elementDescriptor, ManyType manyType) {
+
+    return new BeanDescriptorElement<>(this, elementDescriptor, elementHelper(manyType));
+  }
+
+  private ElementHelp elementHelper(ManyType manyType) {
+    switch (manyType) {
+      case LIST: return new ElementHelpList();
+      case SET: return new ElementHelpSet();
+      case MAP: return new ElementHelpMap();
+      default:
+        throw new IllegalStateException("manyType unexpected "+manyType);
+    }
   }
 
   public void visitMetrics(MetricVisitor visitor) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanListHelpElement.java b/src/main/java/io/ebeaninternal/server/deploy/BeanListHelpElement.java
index 2a0b4de96..8191bd0c6 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanListHelpElement.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanListHelpElement.java
@@ -1,7 +1,6 @@
 package io.ebeaninternal.server.deploy;
 
 import io.ebean.bean.BeanCollection;
-import io.ebean.bean.BeanCollectionAdd;
 import io.ebean.bean.EntityBean;
 import io.ebeaninternal.server.text.json.SpiJsonWriter;
 
@@ -24,14 +23,8 @@ public class BeanListHelpElement<T> extends BeanListHelp<T> {
     }
   }
 
-  @Override
-  public BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey) {
-    return super.getBeanCollectionAdd(bc, mapKey);
-  }
-
   @Override
   void jsonWriteElement(SpiJsonWriter ctx, Object element) {
-    many.jsonWriteValue(ctx, element);
-    //targetDescriptor.jsonWrite(ctx, (EntityBean) element);
+    many.jsonWriteElementValue(ctx, element);
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index 42d3e0667..392e24e33 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -881,4 +881,31 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   public BeanCollectionHelp<T> getHelp() {
     return help;
   }
+
+  public void jsonWriteElementValue(SpiJsonWriter ctx, Object element) {
+    throw new IllegalStateException("Never Expected");
+  }
+
+  /**
+   * Read the collection (JSON Array) containing entity beans.
+   */
+  public Object jsonReadCollection(ReadJson readJson, EntityBean parentBean) throws IOException {
+    BeanCollection<?> collection = createEmpty(parentBean);
+    BeanCollectionAdd add = getBeanCollectionAdd(collection, null);
+    do {
+      EntityBean detailBean = (EntityBean) targetDescriptor.jsonRead(readJson, name);
+      if (detailBean == null) {
+        // read the entire array
+        break;
+      }
+      add.addEntityBean(detailBean);
+
+      if (parentBean != null && childMasterProperty != null) {
+        // bind detail bean back to master via mappedBy property
+        childMasterProperty.setValue(detailBean, parentBean);
+      }
+    } while (true);
+
+    return collection;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java
index faa77fb49..b4962a9e6 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java
@@ -3,8 +3,6 @@ package io.ebeaninternal.server.deploy;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
-import io.ebean.bean.BeanCollection;
-import io.ebean.bean.BeanCollectionAdd;
 import io.ebean.bean.EntityBean;
 import io.ebeaninternal.server.text.json.ReadJson;
 
@@ -57,23 +55,7 @@ class BeanPropertyAssocManyJsonHelp {
       return;
     }
 
-    BeanCollection<?> collection = many.createEmpty(parentBean);
-    BeanCollectionAdd add = many.getBeanCollectionAdd(collection, null);
-    do {
-      EntityBean detailBean = (EntityBean) many.targetDescriptor.jsonRead(readJson, many.name);
-      if (detailBean == null) {
-        // read the entire array
-        break;
-      }
-      add.addEntityBean(detailBean);
-
-      if (parentBean != null && many.childMasterProperty != null) {
-        // bind detail bean back to master via mappedBy property
-        many.childMasterProperty.setValue(detailBean, parentBean);
-      }
-    } while (true);
-
-    many.setValue(parentBean, collection);
+    many.setValue(parentBean, many.jsonReadCollection(readJson, parentBean));
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java
index 69f79bd1c..639f6782a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java
@@ -1,6 +1,12 @@
 package io.ebeaninternal.server.deploy;
 
+import io.ebean.PersistenceIOException;
+import io.ebean.bean.EntityBean;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertySimpleCollection;
+import io.ebeaninternal.server.text.json.ReadJson;
+import io.ebeaninternal.server.text.json.SpiJsonWriter;
+
+import java.io.IOException;
 
 public class BeanPropertySimpleCollection<T> extends BeanPropertyAssocMany<T> {
 
@@ -27,4 +33,25 @@ public class BeanPropertySimpleCollection<T> extends BeanPropertyAssocMany<T> {
       targetDescriptor = descriptor.getBeanDescriptor(targetType);
     }
   }
+
+  /**
+   * Json write scalar value.
+   */
+  @Override
+  public void jsonWriteValue(SpiJsonWriter writeJson, Object value) {
+    try {
+      scalarType.jsonWrite(writeJson.gen(), value);
+    } catch (IOException e) {
+      throw new PersistenceIOException(e);
+    }
+  }
+
+  public void jsonWriteElementValue(SpiJsonWriter ctx, Object element) {
+    elementDescriptor.jsonWriteElement(ctx, element);
+  }
+
+  @Override
+  public Object jsonReadCollection(ReadJson readJson, EntityBean parentBean) throws IOException {
+    return elementDescriptor.jsonReadCollection(readJson, parentBean);
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java
index 450ed659a..197cbae0a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java
@@ -16,7 +16,7 @@ import java.util.Set;
 /**
  * Helper specifically for dealing with Sets.
  */
-public final class BeanSetHelp<T> extends BaseCollectionHelp<T> {
+public class BeanSetHelp<T> extends BaseCollectionHelp<T> {
 
   /**
    * When attached to a specific many property.
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelpElement.java b/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelpElement.java
new file mode 100644
index 000000000..c490c76e1
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelpElement.java
@@ -0,0 +1,30 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebean.bean.BeanCollection;
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.text.json.SpiJsonWriter;
+
+/**
+ * Helper for element collection List.
+ */
+public class BeanSetHelpElement<T> extends BeanSetHelp<T> {
+
+  BeanSetHelpElement(BeanPropertyAssocMany<T> many) {
+    super(many);
+  }
+
+  @Override
+  public void add(BeanCollection<?> collection, EntityBean bean, boolean withCheck) {
+    Object elementValue = bean._ebean_getField(0);
+    if (withCheck) {
+      collection.internalAddWithCheck(elementValue);
+    } else {
+      collection.internalAdd(elementValue);
+    }
+  }
+
+  @Override
+  void jsonWriteElement(SpiJsonWriter ctx, Object element) {
+    many.jsonWriteElementValue(ctx, element);
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ElementCollector.java b/src/main/java/io/ebeaninternal/server/deploy/ElementCollector.java
new file mode 100644
index 000000000..c75cfff80
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/ElementCollector.java
@@ -0,0 +1,17 @@
+package io.ebeaninternal.server.deploy;
+
+/**
+ * Collects (List/Set/Map) of elements.
+ */
+public interface ElementCollector {
+
+  /**
+   * Add an element.
+   */
+  void addElement(Object element);
+
+  /**
+   * Return the populated collection/map.
+   */
+  Object collection();
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ElementHelp.java b/src/main/java/io/ebeaninternal/server/deploy/ElementHelp.java
new file mode 100644
index 000000000..e73a2eb89
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/ElementHelp.java
@@ -0,0 +1,13 @@
+package io.ebeaninternal.server.deploy;
+
+/**
+ * Helper for handling ElementCollection.
+ */
+interface ElementHelp {
+
+  /**
+   * Return a new collector.
+   */
+  ElementCollector createCollector();
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ElementHelpList.java b/src/main/java/io/ebeaninternal/server/deploy/ElementHelpList.java
new file mode 100644
index 000000000..6e3f46c34
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/ElementHelpList.java
@@ -0,0 +1,27 @@
+package io.ebeaninternal.server.deploy;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class ElementHelpList implements ElementHelp {
+
+  @Override
+  public ElementCollector createCollector() {
+    return new Collector();
+  }
+
+  private static class Collector implements ElementCollector {
+
+    private List<Object> list = new ArrayList<>();
+
+    @Override
+    public void addElement(Object element) {
+      list.add(element);
+    }
+
+    @Override
+    public Object collection() {
+      return list;
+    }
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ElementHelpMap.java b/src/main/java/io/ebeaninternal/server/deploy/ElementHelpMap.java
new file mode 100644
index 000000000..1d8869cfd
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/ElementHelpMap.java
@@ -0,0 +1,28 @@
+package io.ebeaninternal.server.deploy;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+class ElementHelpMap implements ElementHelp {
+
+  @Override
+  public ElementCollector createCollector() {
+    return new Collector();
+  }
+
+  private static class Collector implements ElementCollector {
+
+    private Map<Object, Object> map = new LinkedHashMap<>();
+
+    @Override
+    public void addElement(Object element) {
+      throw new RuntimeException("asd");
+      //map.put()
+    }
+
+    @Override
+    public Object collection() {
+      return map;
+    }
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ElementHelpSet.java b/src/main/java/io/ebeaninternal/server/deploy/ElementHelpSet.java
new file mode 100644
index 000000000..d104b1d31
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/ElementHelpSet.java
@@ -0,0 +1,27 @@
+package io.ebeaninternal.server.deploy;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+class ElementHelpSet implements ElementHelp {
+
+  @Override
+  public ElementCollector createCollector() {
+    return new Collector();
+  }
+
+  private static class Collector implements ElementCollector {
+
+    private Set<Object> set = new LinkedHashSet<>();
+
+    @Override
+    public void addElement(Object element) {
+      set.add(element);
+    }
+
+    @Override
+    public Object collection() {
+      return set;
+    }
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index 460901474..eba9a4fbb 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -189,14 +189,23 @@ class AnnotationAssocManys extends AnnotationParser {
     if (fullTableName == null) {
       fullTableName = descriptor.getBaseTable()+"_"+ CamelCaseHelper.toUnderscoreFromCamel(prop.getName());
     }
-    //namingConvention.
+
+    BeanTable localTable = factory.getBeanTable(descriptor.getBeanType());
+    if (collectionTable != null) {
+      prop.getTableJoin().addJoinColumn(true, collectionTable.joinColumns(), localTable);
+    }
+    if (!prop.getTableJoin().hasJoinColumns()) {
+      BeanProperty localId = localTable.getIdProperty();
+      if (localId != null) {
+        // add foreign key based on convention
+        String fkColName = namingConvention.getForeignKey(descriptor.getBaseTable(), localId.getName());
+        prop.getTableJoin().addJoinColumn(new DeployTableJoinColumn(localId.getDbColumn(), fkColName));
+      }
+    }
+
     BeanTable beanTable = factory.getCollectionBeanTable(fullTableName, prop.getTargetType());
     prop.setBeanTable(beanTable);
 
-    if (collectionTable != null) {
-      prop.getTableJoin().addJoinColumn(true, collectionTable.joinColumns(), beanTable);
-    }
-
     Class<?> elementType = prop.getTargetType();
 
     DeployBeanDescriptor<?> elementDescriptor = factory.createDeployDescriptor(elementType);
@@ -220,7 +229,7 @@ class AnnotationAssocManys extends AnnotationParser {
     Class<?> owningType = prop.getOwningType();
 
     factory.createUnidirectional(elementDescriptor, owningType, beanTable, prop.getTableJoin());
-    prop.setElementDescriptor(factory.createElementDescriptor(elementDescriptor));
+    prop.setElementDescriptor(factory.createElementDescriptor(elementDescriptor, prop.getManyType()));
   }
 
   /**
diff --git a/src/test/java/org/tests/model/elementcollection/EcsPerson.java b/src/test/java/org/tests/model/elementcollection/EcsPerson.java
new file mode 100644
index 000000000..f0c854db7
--- /dev/null
+++ b/src/test/java/org/tests/model/elementcollection/EcsPerson.java
@@ -0,0 +1,68 @@
+package org.tests.model.elementcollection;
+
+import javax.persistence.CollectionTable;
+import javax.persistence.Column;
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Version;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+@Entity
+public class EcsPerson {
+
+  @Id
+  long id;
+
+  String name;
+
+  @ElementCollection
+  @CollectionTable(name = "ecs_person_phone")
+  @Column(name = "phone")
+  Set<String> phoneNumbers = new LinkedHashSet<>();
+
+  @Version
+  long version;
+
+  public EcsPerson(String name) {
+    this.name = name;
+  }
+
+  @Override
+  public String toString() {
+    return "person id:" + id + " name:" + name + " phs:" + phoneNumbers;
+  }
+
+  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 Set<String> getPhoneNumbers() {
+    return phoneNumbers;
+  }
+
+  public void setPhoneNumbers(Set<String> phoneNumbers) {
+    this.phoneNumbers = phoneNumbers;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
index dd5ea2bc3..54ef094cb 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
@@ -28,7 +28,7 @@ public class TestElementCollectionBasic extends BaseTestCase {
       Ebean.find(EcPerson.class).where()
         .startsWith("name", "Fiona0")
         .order().asc("id")
-      .findList();
+        .findList();
 
     List<String> phoneNumbers0 = found.get(0).getPhoneNumbers();
     List<String> phoneNumbers1 = found.get(1).getPhoneNumbers();
@@ -46,6 +46,12 @@ public class TestElementCollectionBasic extends BaseTestCase {
         .order().asc("id")
         .findList();
 
-    System.out.println(found2);
+    assertThat(found2).hasSize(2);
+    EcPerson foundFirst = found2.get(0);
+    String asJson = Ebean.json().toJson(foundFirst);
+
+    EcPerson fromJson = Ebean.json().toBean(EcPerson.class, asJson);
+
+    assertThat(fromJson.getPhoneNumbers()).containsAll(foundFirst.getPhoneNumbers());
   }
 }
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java
new file mode 100644
index 000000000..946e273f7
--- /dev/null
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java
@@ -0,0 +1,59 @@
+package org.tests.model.elementcollection;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.junit.Test;
+
+import java.util.List;
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestElementCollectionBasicSet extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    EcsPerson person = new EcsPerson("Fiona021");
+    person.getPhoneNumbers().add("021 1234");
+    person.getPhoneNumbers().add("021 4321");
+    Ebean.save(person);
+
+
+    EcsPerson person1 = new EcsPerson("Fiona09");
+    person1.getPhoneNumbers().add("09 1234");
+    person1.getPhoneNumbers().add("09 4321");
+    person1.getPhoneNumbers().add("09 9876");
+    Ebean.save(person1);
+
+    List<EcsPerson> found =
+      Ebean.find(EcsPerson.class).where()
+        .startsWith("name", "Fiona0")
+        .order().asc("id")
+        .findList();
+
+    Set<String> phoneNumbers0 = found.get(0).getPhoneNumbers();
+    Set<String> phoneNumbers1 = found.get(1).getPhoneNumbers();
+    phoneNumbers0.size();
+
+    assertThat(phoneNumbers0).containsExactly("021 1234", "021 4321");
+    assertThat(phoneNumbers1).containsExactly("09 1234", "09 4321", "09 9876");
+
+
+    List<EcsPerson> found2 =
+      Ebean.find(EcsPerson.class)
+        .fetch("phoneNumbers")
+        .where()
+        .startsWith("name", "Fiona0")
+        .order().asc("id")
+        .findList();
+
+    assertThat(found2).hasSize(2);
+    EcsPerson foundFirst = found2.get(0);
+    String asJson = Ebean.json().toJson(foundFirst);
+
+    EcsPerson fromJson = Ebean.json().toBean(EcsPerson.class, asJson);
+
+    assertThat(fromJson.getPhoneNumbers()).containsAll(foundFirst.getPhoneNumbers());
+  }
+}

From 057d7480b0bff080b15ae41f788b590da68ee7d2 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 21 Mar 2018 00:15:40 +1300
Subject: [PATCH 0196/1036] #115 - Mapping - Add support for @ElementCollection
 enhancement

Add simple Map support with Json
---
 .../deploy/BeanCollectionHelpFactory.java     |   2 +-
 .../server/deploy/BeanDescriptor.java         |   4 +
 .../server/deploy/BeanDescriptorElement.java  |   3 +
 .../deploy/BeanDescriptorElementMap.java      |  97 +++++
 .../server/deploy/BeanDescriptorManager.java  |   6 +-
 .../server/deploy/BeanMapHelp.java            |   5 +-
 .../server/deploy/BeanMapHelpElement.java     |  31 ++
 .../server/deploy/BeanPropertyAssocMany.java  |   7 +-
 .../deploy/BeanPropertySimpleCollection.java  |  14 +-
 .../server/deploy/ElementCollector.java       |   5 +
 .../server/deploy/ElementHelpList.java        |   5 +
 .../server/deploy/ElementHelpMap.java         |   8 +-
 .../server/deploy/ElementHelpSet.java         |   5 +
 .../deploy/parse/AnnotationAssocManys.java    |  51 ++-
 .../deploy/parse/DeployCreateProperties.java  |   1 -
 .../server/persist/DefaultPersister.java      | 217 +---------
 .../server/persist/SaveManyBase.java          |  37 ++
 .../server/persist/SaveManyBeans.java         | 381 ++++++++++++++++++
 .../server/persist/SaveManyPropRequest.java   | 251 ------------
 .../persist/SaveManySimpleCollection.java     |  15 +-
 .../server/persist/SaveManySimpleMap.java     |  52 +++
 .../model/elementcollection/EcmPerson.java    |  68 ++++
 .../TestElementCollectionBasicMap.java        |  63 +++
 23 files changed, 844 insertions(+), 484 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementMap.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/BeanMapHelpElement.java
 create mode 100644 src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java
 create mode 100644 src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
 delete mode 100644 src/main/java/io/ebeaninternal/server/persist/SaveManyPropRequest.java
 create mode 100644 src/main/java/io/ebeaninternal/server/persist/SaveManySimpleMap.java
 create mode 100644 src/test/java/org/tests/model/elementcollection/EcmPerson.java
 create mode 100644 src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java
index 86dd30126..d57b622b1 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java
@@ -28,7 +28,7 @@ public class BeanCollectionHelpFactory {
       case SET:
         return elementCollection ? new BeanSetHelpElement<>(many) : new BeanSetHelp<>(many);
       case MAP:
-        return new BeanMapHelp<>(many);
+        return elementCollection ? new BeanMapHelpElement<>(many) :new BeanMapHelp<>(many);
       default:
         throw new RuntimeException("Invalid type " + manyType);
     }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 6f31713a0..8a9d0fa4b 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -3330,6 +3330,10 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     jsonHelp.jsonWriteDirtyProperties(writeJson, bean, dirtyProps);
   }
 
+  public void jsonWriteMapEntry(SpiJsonWriter ctx, Map.Entry<?, ?> entry) throws IOException {
+    throw new IllegalStateException("Unexpected - expect Element override");
+  }
+
   public void jsonWriteElement(SpiJsonWriter ctx, Object element) {
     throw new IllegalStateException("Unexpected - expect Element override");
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java
index a9c6fa057..a1c23603a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java
@@ -31,6 +31,7 @@ class BeanDescriptorElement<T> extends BeanDescriptor<T> {
     }
   }
 
+  @Override
   public boolean isElementType() {
     return true;
   }
@@ -40,6 +41,7 @@ class BeanDescriptorElement<T> extends BeanDescriptor<T> {
     return new ElementEntityBean(properties);
   }
 
+  @Override
   public void jsonWriteElement(SpiJsonWriter ctx, Object element) {
     try {
       scalarType.jsonWrite(ctx.gen(), element);
@@ -48,6 +50,7 @@ class BeanDescriptorElement<T> extends BeanDescriptor<T> {
     }
   }
 
+  @Override
   public Object jsonReadCollection(ReadJson readJson, EntityBean parentBean) throws IOException {
 
     JsonParser parser = readJson.getParser();
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementMap.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementMap.java
new file mode 100644
index 000000000..3319ba8fc
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementMap.java
@@ -0,0 +1,97 @@
+package io.ebeaninternal.server.deploy;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
+import io.ebeaninternal.server.text.json.ReadJson;
+import io.ebeaninternal.server.text.json.SpiJsonWriter;
+import io.ebeaninternal.server.type.ScalarType;
+
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * Bean descriptor used with ElementCollection (where we don't have a mapped type/class).
+ */
+class BeanDescriptorElementMap<T> extends BeanDescriptor<T> {
+
+  private final ScalarType[] scalarTypes;
+  private final ElementHelp elementHelp;
+  private final boolean stringKey;
+
+  BeanDescriptorElementMap(BeanDescriptorMap owner, DeployBeanDescriptor<T> deploy, ElementHelp elementHelp) {
+    super(owner, deploy);
+    this.elementHelp = elementHelp;
+    BeanProperty[] props = propertiesNonTransient();
+    this.scalarTypes = new ScalarType[props.length];
+    for (int i = 0; i < props.length; i++) {
+      scalarTypes[i] = props[i].getScalarType();
+    }
+    this.stringKey = String.class.equals(scalarTypes[0].getType());
+  }
+
+  @Override
+  public boolean isElementType() {
+    return true;
+  }
+
+  @Override
+  protected EntityBean createPrototypeEntityBean(Class<T> beanType) {
+    return new ElementEntityBean(properties);
+  }
+
+  @Override
+  @SuppressWarnings("unchecked")
+  public void jsonWriteMapEntry(SpiJsonWriter ctx, Map.Entry<?, ?> entry) throws IOException {
+      ctx.writeStartObject();
+      if (stringKey) {
+        Object key = entry.getKey();
+        String keyName = (key == null) ? "null" : key.toString();
+        ctx.writeFieldName(keyName);
+        scalarTypes[1].jsonWrite(ctx.gen(), entry.getValue());
+      } else {
+        ctx.writeFieldName("key");
+        scalarTypes[0].jsonWrite(ctx.gen(), entry.getKey());
+        ctx.writeFieldName("value");
+        scalarTypes[1].jsonWrite(ctx.gen(), entry.getValue());
+      }
+      ctx.writeEndObject();
+  }
+
+  @Override
+  public Object jsonReadCollection(ReadJson readJson, EntityBean parentBean) throws IOException {
+
+    JsonParser parser = readJson.getParser();
+    ElementCollector add = elementHelp.createCollector();
+    do {
+      JsonToken token = parser.nextToken();
+      if (token != JsonToken.START_OBJECT) {
+        break;
+      }
+      if (stringKey) {
+        String key = parser.nextFieldName();
+        parser.nextToken();
+        Object val = scalarTypes[0].jsonRead(parser);
+        add.addKeyValue(key, val);
+
+      } else {
+        parser.nextFieldName();
+        Object key= scalarTypes[0].jsonRead(parser);
+
+        parser.nextFieldName();
+        Object val = scalarTypes[0].jsonRead(parser);
+        add.addKeyValue(key, val);
+      }
+
+      token = parser.nextToken();
+      if (token != JsonToken.END_OBJECT) {
+        break;
+      }
+
+    } while (true);
+
+    return add.collection();
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 1fbb6a15c..190322d07 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -1660,7 +1660,11 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    */
   public <A> BeanDescriptor<A> createElementDescriptor(DeployBeanDescriptor<A> elementDescriptor, ManyType manyType) {
 
-    return new BeanDescriptorElement<>(this, elementDescriptor, elementHelper(manyType));
+    ElementHelp elementHelp = elementHelper(manyType);
+    if (manyType.isMap()) {
+      return new BeanDescriptorElementMap<>(this, elementDescriptor, elementHelp);
+    }
+    return new BeanDescriptorElement<>(this, elementDescriptor, elementHelp);
   }
 
   private ElementHelp elementHelper(ManyType manyType) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java
index 4c4e76190..b45bbc98b 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java
@@ -17,7 +17,7 @@ import java.util.Map.Entry;
 /**
  * Helper specifically for dealing with Maps.
  */
-public final class BeanMapHelp<T> extends BaseCollectionHelp<T> {
+public class BeanMapHelp<T> extends BaseCollectionHelp<T> {
 
   private final BeanPropertyAssocMany<T> many;
   private final BeanDescriptor<T> targetDescriptor;
@@ -175,8 +175,7 @@ public final class BeanMapHelp<T> extends BaseCollectionHelp<T> {
     if (!map.isEmpty() || ctx.isIncludeEmpty()) {
       ctx.beginAssocMany(name);
       for (Entry<?, ?> entry : map.entrySet()) {
-        //FIXME: json write map key ...
-        targetDescriptor.jsonWrite(ctx, (EntityBean) entry.getValue());
+        many.jsonWriteMapEntry(ctx, entry);
       }
       ctx.endAssocMany();
     }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelpElement.java b/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelpElement.java
new file mode 100644
index 000000000..0531839e0
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelpElement.java
@@ -0,0 +1,31 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebean.bean.BeanCollection;
+import io.ebean.bean.EntityBean;
+import io.ebean.common.BeanMap;
+import io.ebeaninternal.server.text.json.SpiJsonWriter;
+
+public class BeanMapHelpElement<T> extends BeanMapHelp<T> {
+
+  BeanMapHelpElement(BeanPropertyAssocMany<T> many) {
+    super(many);
+  }
+
+  @Override
+  public void add(BeanCollection<?> collection, EntityBean bean, boolean withCheck) {
+    Object key = bean._ebean_getField(0);
+    Object val = bean._ebean_getField(1);
+
+    BeanMap<?, ?> map = ((BeanMap<?, ?>) collection);
+    if (withCheck) {
+      map.internalPutWithCheck(key, val);
+    } else {
+      map.internalPut(key, val);
+    }
+  }
+
+  @Override
+  void jsonWriteElement(SpiJsonWriter ctx, Object element) {
+    throw new IllegalStateException("not called");
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index 392e24e33..0072949a6 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -882,8 +882,13 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     return help;
   }
 
+  public void jsonWriteMapEntry(SpiJsonWriter ctx, Map.Entry<?, ?> entry) throws IOException {
+    // Writing as json array rather than object ...
+    targetDescriptor.jsonWrite(ctx, (EntityBean) entry.getValue());
+  }
+
   public void jsonWriteElementValue(SpiJsonWriter ctx, Object element) {
-    throw new IllegalStateException("Never Expected");
+    throw new IllegalStateException("Unexpected - expect Element override");
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java
index 639f6782a..6b9d1602e 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java
@@ -1,12 +1,12 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.PersistenceIOException;
 import io.ebean.bean.EntityBean;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertySimpleCollection;
 import io.ebeaninternal.server.text.json.ReadJson;
 import io.ebeaninternal.server.text.json.SpiJsonWriter;
 
 import java.io.IOException;
+import java.util.Map;
 
 public class BeanPropertySimpleCollection<T> extends BeanPropertyAssocMany<T> {
 
@@ -34,18 +34,12 @@ public class BeanPropertySimpleCollection<T> extends BeanPropertyAssocMany<T> {
     }
   }
 
-  /**
-   * Json write scalar value.
-   */
   @Override
-  public void jsonWriteValue(SpiJsonWriter writeJson, Object value) {
-    try {
-      scalarType.jsonWrite(writeJson.gen(), value);
-    } catch (IOException e) {
-      throw new PersistenceIOException(e);
-    }
+  public void jsonWriteMapEntry(SpiJsonWriter ctx, Map.Entry<?, ?> entry) throws IOException {
+    elementDescriptor.jsonWriteMapEntry(ctx, entry);
   }
 
+  @Override
   public void jsonWriteElementValue(SpiJsonWriter ctx, Object element) {
     elementDescriptor.jsonWriteElement(ctx, element);
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ElementCollector.java b/src/main/java/io/ebeaninternal/server/deploy/ElementCollector.java
index c75cfff80..d5b97bfdd 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ElementCollector.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ElementCollector.java
@@ -10,6 +10,11 @@ public interface ElementCollector {
    */
   void addElement(Object element);
 
+  /**
+   * Add an element.
+   */
+  void addKeyValue(Object key, Object element);
+
   /**
    * Return the populated collection/map.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ElementHelpList.java b/src/main/java/io/ebeaninternal/server/deploy/ElementHelpList.java
index 6e3f46c34..6c95550da 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ElementHelpList.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ElementHelpList.java
@@ -19,6 +19,11 @@ class ElementHelpList implements ElementHelp {
       list.add(element);
     }
 
+    @Override
+    public void addKeyValue(Object key, Object element) {
+      throw new IllegalStateException("never called");
+    }
+
     @Override
     public Object collection() {
       return list;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ElementHelpMap.java b/src/main/java/io/ebeaninternal/server/deploy/ElementHelpMap.java
index 1d8869cfd..2d970a48f 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ElementHelpMap.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ElementHelpMap.java
@@ -16,8 +16,12 @@ class ElementHelpMap implements ElementHelp {
 
     @Override
     public void addElement(Object element) {
-      throw new RuntimeException("asd");
-      //map.put()
+      throw new IllegalStateException("never called");
+    }
+
+    @Override
+    public void addKeyValue(Object key, Object element) {
+      map.put(key, element);
     }
 
     @Override
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ElementHelpSet.java b/src/main/java/io/ebeaninternal/server/deploy/ElementHelpSet.java
index d104b1d31..53a47de89 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ElementHelpSet.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ElementHelpSet.java
@@ -19,6 +19,11 @@ class ElementHelpSet implements ElementHelp {
       set.add(element);
     }
 
+    @Override
+    public void addKeyValue(Object key, Object element) {
+      throw new IllegalStateException("never called");
+    }
+
     @Override
     public Object collection() {
       return set;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index eba9a4fbb..7c98d20c4 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -29,6 +29,7 @@ import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.MapKey;
+import javax.persistence.MapKeyColumn;
 import javax.persistence.OneToMany;
 import javax.persistence.OrderBy;
 import javax.persistence.OrderColumn;
@@ -212,24 +213,50 @@ class AnnotationAssocManys extends AnnotationParser {
     elementDescriptor.setBaseTable(new TableName(fullTableName), readConfig.getAsOfViewSuffix(), readConfig.getVersionsBetweenSuffix());
 
     ScalarType<?> scalarType = util.getTypeManager().getScalarType(elementType);
-    DeployBeanProperty elementProp = new DeployBeanProperty(elementDescriptor, elementType, scalarType, null);
 
-    elementProp.setName("value");
-    elementProp.setDbColumn(prop.getDbColumn());
+    int sortOrder = 0;
+    if (!prop.getManyType().isMap()) {
+      elementDescriptor.setProperties(new String[]{"value"});
+    } else {
+      elementDescriptor.setProperties(new String[]{"key", "value"});
+      String dbKeyColumn = "key";
+      MapKeyColumn mapKeyColumn = get(prop, MapKeyColumn.class);
+      if (mapKeyColumn != null) {
+        dbKeyColumn = mapKeyColumn.name();
+      }
+
+      DeployBeanProperty keyProp = new DeployBeanProperty(elementDescriptor, elementType, scalarType, null);
+      setElementProperty(keyProp, "key", dbKeyColumn, sortOrder++);
+      elementDescriptor.addBeanProperty(keyProp);
+      if (mapKeyColumn != null) {
+        keyProp.setDbLength(mapKeyColumn.length());
+        keyProp.setDbScale(mapKeyColumn.scale());
+      }
+    }
+
+    DeployBeanProperty valueProp = new DeployBeanProperty(elementDescriptor, elementType, scalarType, null);
+    setElementProperty(valueProp, "value", prop.getDbColumn(), sortOrder++);
+    if (column != null) {
+      valueProp.setDbLength(column.length());
+      valueProp.setDbScale(column.scale());
+    }
+
+    elementDescriptor.addBeanProperty(valueProp);
+    elementDescriptor.setName(prop.getFullBeanName());
+
+    factory.createUnidirectional(elementDescriptor, prop.getOwningType(), beanTable, prop.getTableJoin());
+    prop.setElementDescriptor(factory.createElementDescriptor(elementDescriptor, prop.getManyType()));
+  }
+
+  private void setElementProperty(DeployBeanProperty elementProp, String name, String dbColumn, int sortOrder) {
+    elementProp.setName(name);
+    elementProp.setDbColumn(dbColumn);
     elementProp.setNullable(false);
     elementProp.setDbInsertable(true);
     elementProp.setDbUpdateable(true);
     elementProp.setDbRead(true);
+    elementProp.setSortOrder(sortOrder);
     elementProp.setElementProperty();
-
-    elementDescriptor.addBeanProperty(elementProp);
-    elementDescriptor.setProperties(new String[]{"value"});
-    elementDescriptor.setName(prop.getFullBeanName());
-
-    Class<?> owningType = prop.getOwningType();
-
-    factory.createUnidirectional(elementDescriptor, owningType, beanTable, prop.getTableJoin());
-    prop.setElementDescriptor(factory.createElementDescriptor(elementDescriptor, prop.getManyType()));
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
index e1a96c042..29c64d4d1 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
@@ -213,7 +213,6 @@ public class DeployCreateProperties {
     } catch (NullPointerException e) {
       logger.debug("expected non-scalar type {}", e.getMessage());
     }
-    // TODO: Handle Collection of CompoundType and Embedded Type
     return new DeployBeanPropertyAssocMany(desc, targetType, manyType);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 7a9748649..f02969461 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -29,7 +29,6 @@ import io.ebeaninternal.server.deploy.BeanManager;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
-import io.ebeaninternal.server.deploy.BeanPropertySimpleCollection;
 import io.ebeaninternal.server.deploy.IntersectionRow;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -554,7 +553,7 @@ public final class DefaultPersister implements Persister {
   /**
    * Execute the delete request returning true if a delete occurred.
    */
-  private int deleteRequest(PersistRequestBean<?> req) {
+  int deleteRequest(PersistRequestBean<?> req) {
     return deleteRequest(req, null);
   }
 
@@ -890,7 +889,7 @@ public final class DefaultPersister implements Persister {
     for (BeanPropertyAssocMany<?> many : desc.propertiesManySave()) {
       // check that property is loaded and collection should be cascaded to
       if (request.isLoadedProperty(many) && !many.isSkipSaveBeanCollection(parentBean, insertedParent)) {
-        saveMany2(insertedParent, many, parentBean, request);
+        saveMany(insertedParent, many, parentBean, request);
         if (!insertedParent) {
           request.addUpdatedManyProperty(many);
         }
@@ -898,201 +897,23 @@ public final class DefaultPersister implements Persister {
     }
   }
 
-  private void saveMany2(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
-    saveMany(saveManyRequest(insertedParent, many, parentBean, request));
+  private void saveMany(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
+    saveManyRequest(insertedParent, many, parentBean, request).save();
   }
 
-  private SaveManyPropRequest saveManyRequest(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
-    if (many instanceof BeanPropertySimpleCollection) {
+  private SaveManyBase saveManyRequest(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
+    if (!many.isElementCollection()) {
+      return new SaveManyBeans(insertedParent, many, parentBean, request, this);
+
+    } else if (many.getManyType().isMap()) {
+      return new SaveManySimpleMap(insertedParent, many, parentBean, request);
+
+    } else {
       return new SaveManySimpleCollection(insertedParent, many, parentBean, request);
-    } else {
-      return new SaveManyPropRequest(insertedParent, many, parentBean, request);
     }
   }
 
-  private void saveMany(SaveManyPropRequest saveMany) {
-
-    if (saveMany.getMany().hasJoinTable()) {
-
-      // check if we can save the m2m intersection in this direction
-      // we only allow one direction based on first traversed basis
-      boolean saveIntersectionFromThisDirection = saveMany.isSaveIntersection();
-      if (saveMany.isCascade()) {
-        saveAssocManyDetails(saveMany, false);
-      }
-      // for ManyToMany save the 'relationship' via inserts/deletes
-      // into/from the intersection table
-      if (saveIntersectionFromThisDirection) {
-        // only allowed on one direction of a m2m based on beanName
-        saveAssocManyIntersection(saveMany, saveMany.isDeleteMissingChildren());
-      } else {
-        saveMany.resetModifyState();
-      }
-    } else {
-      if (saveMany.isModifyListenMode()) {
-        // delete any removed beans via private owned. Needs to occur before
-        // a 'deleteMissingChildren' statement occurs
-        removeAssocManyPrivateOwned(saveMany);
-      }
-      if (saveMany.isCascade()) {
-        // potentially deletes 'missing children' for 'stateless update'
-        saveAssocManyDetails(saveMany, saveMany.isDeleteMissingChildren());
-      }
-    }
-  }
-
-  private void removeAssocManyPrivateOwned(SaveManyPropRequest saveMany) {
-
-    Object details = saveMany.getValue();
-
-    // check that the list is not null and if it is a BeanCollection
-    // check that is has been populated (don't trigger lazy loading)
-    if (details instanceof BeanCollection<?>) {
-
-      BeanCollection<?> c = (BeanCollection<?>) details;
-      Set<?> modifyRemovals = c.getModifyRemovals();
-      saveMany.modifyListenReset(c);
-      if (modifyRemovals != null && !modifyRemovals.isEmpty()) {
-        for (Object removedBean : modifyRemovals) {
-          if (removedBean instanceof EntityBean) {
-            EntityBean eb = (EntityBean) removedBean;
-            if (eb._ebean_getIntercept().isLoaded()) {
-              // only delete if the bean was loaded meaning that it is known to exist in the DB
-              deleteRequest(createPublishRequest(removedBean, saveMany.getTransaction(), PersistRequest.Type.DELETE, saveMany.getFlags()));
-            }
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * Save the details from a OneToMany collection.
-   */
-  private void saveAssocManyDetails(SaveManyPropRequest saveMany, boolean deleteMissingChildren) {
-
-    saveMany.saveDetails(this, deleteMissingChildren);
-  }
-
-  /**
-   * Save the additions and removals from a ManyToMany collection as inserts
-   * and deletes from the intersection table.
-   * <p>
-   * This is done via MapBeans.
-   * </p>
-   */
-  private void saveAssocManyIntersection(SaveManyPropRequest saveManyPropRequest, boolean deleteMissingChildren) {
-
-    BeanPropertyAssocMany<?> prop = saveManyPropRequest.getMany();
-    Object value = prop.getValue(saveManyPropRequest.getParentBean());
-    if (value == null) {
-      return;
-    }
-
-    SpiTransaction t = saveManyPropRequest.getTransaction();
-    boolean vanillaCollection = !(value instanceof BeanCollection<?>);
-
-    if (vanillaCollection || deleteMissingChildren) {
-      // delete all intersection rows and then treat all
-      // beans in the collection as additions
-      deleteAssocManyIntersection(saveManyPropRequest.getParentBean(), prop, t, saveManyPropRequest.isPublish());
-    }
-
-    Collection<?> deletions = null;
-    Collection<?> additions;
-
-    if (saveManyPropRequest.isInsertedParent() || vanillaCollection || deleteMissingChildren) {
-      // treat everything in the list/set/map as an intersection addition
-      if (value instanceof Map<?, ?>) {
-        additions = ((Map<?, ?>) value).values();
-      } else if (value instanceof Collection<?>) {
-        additions = (Collection<?>) value;
-      } else {
-        String msg = "Unhandled ManyToMany type " + value.getClass().getName() + " for " + prop.getFullBeanName();
-        throw new PersistenceException(msg);
-      }
-      if (!vanillaCollection) {
-        BeanCollection<?> manyValue = (BeanCollection<?>) value;
-        setListenMode(manyValue, prop);
-        manyValue.modifyReset();
-      }
-    } else {
-      // BeanCollection so get the additions/deletions
-      BeanCollection<?> manyValue = (BeanCollection<?>) value;
-      if (setListenMode(manyValue, prop)) {
-        additions = manyValue.getActualDetails();
-      } else {
-        additions = manyValue.getModifyAdditions();
-        deletions = manyValue.getModifyRemovals();
-      }
-      // reset so the changes are only processed once
-      manyValue.modifyReset();
-    }
-
-    t.depth(+1);
-
-    if (additions != null && !additions.isEmpty()) {
-      // ensure any cascade batch has been flushed prior
-      // to inserting into the intersection table
-      t.flushBatch();
-
-      for (Object other : additions) {
-        EntityBean otherBean = (EntityBean) other;
-        // the object from the 'other' side of the ManyToMany
-        if (deletions != null && deletions.remove(otherBean)) {
-          String m = "Inserting and Deleting same object? " + otherBean;
-          if (t.isLogSummary()) {
-            t.logSummary(m);
-          }
-          logger.warn(m);
-
-        } else {
-          if (!prop.hasImportedId(otherBean)) {
-            String msg = "ManyToMany bean " + otherBean + " does not have an Id value.";
-            throw new PersistenceException(msg);
-
-          } else {
-            // build a intersection row for 'insert'
-            IntersectionRow intRow = prop.buildManyToManyMapBean(saveManyPropRequest.getParentBean(), otherBean, saveManyPropRequest.isPublish());
-            SqlUpdate sqlInsert = intRow.createInsert(server);
-            executeSqlUpdate(sqlInsert, t);
-          }
-        }
-      }
-    }
-    if (deletions != null && !deletions.isEmpty()) {
-      // ensure any cascade batch has been flushed prior
-      // to inserting into the intersection table
-      t.flushBatch();
-
-      for (Object other : deletions) {
-        EntityBean otherDelete = (EntityBean) other;
-        // the object from the 'other' side of the ManyToMany
-        // build a intersection row for 'delete'
-        IntersectionRow intRow = prop.buildManyToManyMapBean(saveManyPropRequest.getParentBean(), otherDelete, saveManyPropRequest.isPublish());
-        SqlUpdate sqlDelete = intRow.createDelete(server, false);
-        executeSqlUpdate(sqlDelete, t);
-      }
-    }
-
-    // decrease the depth back to what it was
-    t.depth(-1);
-  }
-
-  /**
-   * Check if we need to set the listen mode (on new collections persisted for the first time).
-   */
-  private boolean setListenMode(BeanCollection<?> manyValue, BeanPropertyAssocMany<?> prop) {
-    ModifyListenMode mode = manyValue.getModifyListening();
-    if (mode == null) {
-      // new collection persisted for the first time
-      manyValue.setModifyListening(prop.getModifyListenMode());
-      return true;
-    }
-    return false;
-  }
-
-  private void deleteAssocManyIntersection(EntityBean bean, BeanPropertyAssocMany<?> many, Transaction t, boolean publish) {
+  void deleteAssocManyIntersection(EntityBean bean, BeanPropertyAssocMany<?> many, Transaction t, boolean publish) {
 
     // delete all intersection rows for this bean
     IntersectionRow intRow = many.buildManyToManyDeleteChildren(bean, publish);
@@ -1241,9 +1062,7 @@ public final class DefaultPersister implements Persister {
     BeanDescriptor<?> desc = request.getBeanDescriptor();
 
     // imported ones with save cascade
-    BeanPropertyAssocOne<?>[] ones = desc.propertiesOneImportedSave();
-
-    for (BeanPropertyAssocOne<?> prop : ones) {
+    for (BeanPropertyAssocOne<?> prop : desc.propertiesOneImportedSave()) {
       // check for partial objects
       if (request.isLoadedProperty(prop)) {
         EntityBean detailBean = prop.getValueAsEntityBean(request.getEntityBean());
@@ -1277,8 +1096,7 @@ public final class DefaultPersister implements Persister {
 
     DeleteUnloadedForeignKeys fkeys = null;
 
-    BeanPropertyAssocOne<?>[] ones = request.getBeanDescriptor().propertiesOneImportedDelete();
-    for (BeanPropertyAssocOne<?> one : ones) {
+    for (BeanPropertyAssocOne<?> one : request.getBeanDescriptor().propertiesOneImportedDelete()) {
       if (!request.isLoadedProperty(one)) {
         // we have cascade Delete on a partially populated bean and
         // this property was not loaded (so we are going to have to fetch it)
@@ -1299,8 +1117,7 @@ public final class DefaultPersister implements Persister {
 
     boolean softDelete = request.isSoftDelete();
 
-    BeanPropertyAssocOne<?>[] ones = request.getBeanDescriptor().propertiesOneImportedDelete();
-    for (BeanPropertyAssocOne<?> prop : ones) {
+    for (BeanPropertyAssocOne<?> prop : request.getBeanDescriptor().propertiesOneImportedDelete()) {
       if (!softDelete || prop.isTargetSoftDelete()) {
         if (request.isLoadedProperty(prop)) {
           Object detailBean = prop.getValue(request.getEntityBean());
@@ -1355,7 +1172,7 @@ public final class DefaultPersister implements Persister {
   /**
    * Create the Persist Request Object additionally specifying the publish status.
    */
-  private <T> PersistRequestBean<T> createPublishRequest(T bean, Transaction t, PersistRequest.Type type, int flags) {
+  <T> PersistRequestBean<T> createPublishRequest(T bean, Transaction t, PersistRequest.Type type, int flags) {
     return createRequestInternal(bean, t, type, Flags.unsetRecuse(flags));
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java
new file mode 100644
index 000000000..61a080188
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java
@@ -0,0 +1,37 @@
+package io.ebeaninternal.server.persist;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.api.SpiTransaction;
+import io.ebeaninternal.server.core.PersistRequestBean;
+import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
+
+/**
+ * Base for saving entity bean collections and element collections.
+ */
+abstract class SaveManyBase {
+
+  final PersistRequestBean<?> request;
+  final SpiEbeanServer server;
+  final boolean insertedParent;
+  final BeanPropertyAssocMany<?> many;
+  final SpiTransaction transaction;
+  final EntityBean parentBean;
+  final Object value;
+
+  SaveManyBase(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
+    this.request = request;
+    this.server = request.getServer();
+    this.insertedParent = insertedParent;
+    this.many = many;
+    this.parentBean = parentBean;
+    this.transaction = request.getTransaction();
+    this.value = many.getValue(parentBean);
+  }
+
+  /**
+   * Save the collection.
+   */
+  abstract void save();
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
new file mode 100644
index 000000000..cdd84d158
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
@@ -0,0 +1,381 @@
+package io.ebeaninternal.server.persist;
+
+import io.ebean.SqlUpdate;
+import io.ebean.bean.BeanCollection;
+import io.ebean.bean.EntityBean;
+import io.ebean.bean.EntityBeanIntercept;
+import io.ebeaninternal.server.core.PersistRequest;
+import io.ebeaninternal.server.core.PersistRequestBean;
+import io.ebeaninternal.server.deploy.BeanCollectionUtil;
+import io.ebeaninternal.server.deploy.BeanDescriptor;
+import io.ebeaninternal.server.deploy.BeanProperty;
+import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
+import io.ebeaninternal.server.deploy.IntersectionRow;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.PersistenceException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Saves the details for a OneToMany or ManyToMany relationship (entity beans).
+ */
+class SaveManyBeans extends SaveManyBase {
+
+  private static final Logger log = LoggerFactory.getLogger(SaveManyBeans.class);
+
+  private final boolean cascade;
+  private final boolean publish;
+  private final BeanDescriptor<?> targetDescriptor;
+  private final boolean isMap;
+  private final boolean saveRecurseSkippable;
+
+  private Collection<?> collection;
+  private DefaultPersister persister;
+  private boolean deleteMissing;
+  private int sortOrder;
+
+  SaveManyBeans(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request, DefaultPersister persister) {
+    super(insertedParent, many, parentBean, request);
+    this.persister = persister;
+    this.cascade = many.getCascadeInfo().isSave();
+    this.publish = request.isPublish();
+    this.targetDescriptor = many.getTargetDescriptor();
+    this.isMap = many.getManyType().isMap();
+    this.saveRecurseSkippable = many.isSaveRecurseSkippable();
+  }
+
+  @Override
+  void save() {
+
+    if (many.hasJoinTable()) {
+
+      // check if we can save the m2m intersection in this direction
+      // we only allow one direction based on first traversed basis
+      boolean saveIntersectionFromThisDirection = isSaveIntersection();
+      if (cascade) {
+        saveAssocManyDetails( false);
+      }
+      // for ManyToMany save the 'relationship' via inserts/deletes
+      // into/from the intersection table
+      if (saveIntersectionFromThisDirection) {
+        // only allowed on one direction of a m2m based on beanName
+        saveAssocManyIntersection(request.isDeleteMissingChildren());
+      } else {
+        resetModifyState();
+      }
+    } else {
+      if (isModifyListenMode()) {
+        // delete any removed beans via private owned. Needs to occur before
+        // a 'deleteMissingChildren' statement occurs
+        removeAssocManyPrivateOwned();
+      }
+      if (cascade) {
+        // potentially deletes 'missing children' for 'stateless update'
+        saveAssocManyDetails(request.isDeleteMissingChildren());
+      }
+    }
+  }
+
+  private boolean isSaveIntersection() {
+    return transaction.isSaveAssocManyIntersection(many.getIntersectionTableJoin().getTable(), many.getBeanDescriptor().getName());
+  }
+
+  private boolean isModifyListenMode() {
+    return BeanCollection.ModifyListenMode.REMOVALS == many.getModifyListenMode();
+  }
+
+  private void modifyListenReset(BeanCollection<?> c) {
+    if (insertedParent) {
+      // after insert set the modify listening mode for private owned etc
+      c.setModifyListening(many.getModifyListenMode());
+    }
+    c.modifyReset();
+  }
+
+  private void resetModifyState() {
+    if (value instanceof BeanCollection<?>) {
+      modifyListenReset((BeanCollection<?>) value);
+    }
+  }
+
+  /**
+   * Save the details from a OneToMany collection.
+   */
+  private void saveAssocManyDetails(boolean deleteMissingChildren) {
+
+    this.deleteMissing = deleteMissingChildren;
+
+    // check that the list is not null and if it is a BeanCollection
+    // check that is has been populated (don't trigger lazy loading)
+
+    collection = BeanCollectionUtil.getActualEntries(value);
+    if (collection != null) {
+      processDetails();
+    }
+  }
+
+  private void processDetails() {
+
+    BeanProperty orderColumn = null;
+    boolean hasOrderColumn = many.hasOrderColumn();
+    if (hasOrderColumn) {
+      if (!insertedParent && canSkipForOrderColumn()) {
+        return;
+      }
+      orderColumn = targetDescriptor.getOrderColumn();
+    }
+
+    if (insertedParent) {
+      // performance optimisation for large collections
+      targetDescriptor.preAllocateIds(collection.size());
+    }
+
+    if (deleteMissing) {
+      // collect the Id's (to exclude from deleteManyDetails)
+      List<Object> detailIds = collectIds(collection, targetDescriptor, isMap);
+      // deleting missing children - children not in our collected detailIds
+      persister.deleteManyDetails(transaction, many.getBeanDescriptor(), parentBean, many, detailIds, false);
+    }
+
+    transaction.depth(+1);
+    saveAllBeans(orderColumn);
+    if (hasOrderColumn) {
+      resetModifyState();
+    }
+    transaction.depth(-1);
+  }
+
+
+  private void saveAllBeans(BeanProperty orderColumn) {
+
+    // if a map, then we get the key value and
+    // set it to the appropriate property on the
+    // detail bean before we save it
+    Object mapKeyValue = null;
+    boolean skipSavingThisBean;
+
+    for (Object detailBean : collection) {
+      sortOrder++;
+      if (isMap) {
+        // its a map so need the key and value
+        Map.Entry<?, ?> entry = (Map.Entry<?, ?>) detailBean;
+        mapKeyValue = entry.getKey();
+        detailBean = entry.getValue();
+      }
+
+      if (detailBean instanceof EntityBean) {
+        EntityBean detail = (EntityBean) detailBean;
+        EntityBeanIntercept ebi = detail._ebean_getIntercept();
+        if (many.hasJoinTable()) {
+          skipSavingThisBean = targetDescriptor.isReference(ebi);
+        } else {
+          if (orderColumn != null) {
+            orderColumn.setValue(detail, sortOrder);
+            ebi.setDirty(true);
+          }
+          if (targetDescriptor.isReference(ebi)) {
+            // we can skip this one
+            skipSavingThisBean = true;
+
+          } else if (ebi.isNewOrDirty()) {
+            skipSavingThisBean = false;
+            // set the parent bean to detailBean
+            many.setJoinValuesToChild(parentBean, detail, mapKeyValue);
+
+          } else {
+            // unmodified so skip depending on prop.isSaveRecurseSkippable();
+            skipSavingThisBean = saveRecurseSkippable;
+          }
+        }
+
+        if (!skipSavingThisBean) {
+          persister.saveRecurse(detail, transaction, parentBean, request.getFlags());
+        }
+      }
+    }
+  }
+
+  /**
+   * Return true if we can skip based on .. no modifications to the collection and no beans are dirty.
+   */
+  private boolean canSkipForOrderColumn() {
+    return value instanceof BeanCollection
+      && !((BeanCollection<?>) value).wasTouched()
+      && noDirtyBeans();
+  }
+
+  private boolean noDirtyBeans() {
+    for (Object bean : collection) {
+      if (bean instanceof EntityBean && ((EntityBean) bean)._ebean_getIntercept().isDirty()) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  /**
+   * Collect the Id values of the details to remove 'missing children' for stateless updates.
+   */
+  private List<Object> collectIds(Collection<?> collection, BeanDescriptor<?> targetDescriptor, boolean isMap) {
+
+    List<Object> detailIds = new ArrayList<>();
+    // stateless update with deleteMissingChildren so first
+    // collect the Id values to remove the 'missing children'
+    for (Object detailBean : collection) {
+      if (isMap) {
+        detailBean = ((Map.Entry<?, ?>) detailBean).getValue();
+      }
+      if (detailBean instanceof EntityBean) {
+        Object id = targetDescriptor.getId((EntityBean) detailBean);
+        if (!DmlUtil.isNullOrZero(id)) {
+          // remember the Id (other details not in the collection) will be removed
+          detailIds.add(id);
+        }
+      }
+    }
+    return detailIds;
+  }
+
+  /**
+   * Save the additions and removals from a ManyToMany collection as inserts
+   * and deletes from the intersection table.
+   * <p>
+   * This is done via MapBeans.
+   * </p>
+   */
+  private void saveAssocManyIntersection(boolean deleteMissingChildren) {
+
+    if (value == null) {
+      return;
+    }
+
+    //SpiTransaction t = saveManyPropRequest.getTransaction();
+    boolean vanillaCollection = !(value instanceof BeanCollection<?>);
+
+    if (vanillaCollection || deleteMissingChildren) {
+      // delete all intersection rows and then treat all
+      // beans in the collection as additions
+      persister.deleteAssocManyIntersection(parentBean, many, transaction, publish);
+    }
+
+    Collection<?> deletions = null;
+    Collection<?> additions;
+
+    if (insertedParent || vanillaCollection || deleteMissingChildren) {
+      // treat everything in the list/set/map as an intersection addition
+      if (value instanceof Map<?, ?>) {
+        additions = ((Map<?, ?>) value).values();
+      } else if (value instanceof Collection<?>) {
+        additions = (Collection<?>) value;
+      } else {
+        throw new PersistenceException("Unhandled ManyToMany type " + value.getClass().getName() + " for " + many.getFullBeanName());
+      }
+      if (!vanillaCollection) {
+        BeanCollection<?> manyValue = (BeanCollection<?>) value;
+        setListenMode(manyValue, many);
+        manyValue.modifyReset();
+      }
+    } else {
+      // BeanCollection so get the additions/deletions
+      BeanCollection<?> manyValue = (BeanCollection<?>) value;
+      if (setListenMode(manyValue, many)) {
+        additions = manyValue.getActualDetails();
+      } else {
+        additions = manyValue.getModifyAdditions();
+        deletions = manyValue.getModifyRemovals();
+      }
+      // reset so the changes are only processed once
+      manyValue.modifyReset();
+    }
+
+    transaction.depth(+1);
+
+    if (additions != null && !additions.isEmpty()) {
+      // ensure any cascade batch has been flushed prior
+      // to inserting into the intersection table
+      transaction.flushBatch();
+
+      for (Object other : additions) {
+        EntityBean otherBean = (EntityBean) other;
+        // the object from the 'other' side of the ManyToMany
+        if (deletions != null && deletions.remove(otherBean)) {
+          String m = "Inserting and Deleting same object? " + otherBean;
+          if (transaction.isLogSummary()) {
+            transaction.logSummary(m);
+          }
+          log.warn(m);
+
+        } else {
+          if (!many.hasImportedId(otherBean)) {
+            String msg = "ManyToMany bean " + otherBean + " does not have an Id value.";
+            throw new PersistenceException(msg);
+
+          } else {
+            // build a intersection row for 'insert'
+            IntersectionRow intRow = many.buildManyToManyMapBean(parentBean, otherBean, publish);
+            SqlUpdate sqlInsert = intRow.createInsert(server);
+            persister.executeSqlUpdate(sqlInsert, transaction);
+          }
+        }
+      }
+    }
+    if (deletions != null && !deletions.isEmpty()) {
+      // ensure any cascade batch has been flushed prior
+      // to inserting into the intersection table
+      transaction.flushBatch();
+
+      for (Object other : deletions) {
+        EntityBean otherDelete = (EntityBean) other;
+        // the object from the 'other' side of the ManyToMany
+        // build a intersection row for 'delete'
+        IntersectionRow intRow = many.buildManyToManyMapBean(parentBean, otherDelete, publish);
+        SqlUpdate sqlDelete = intRow.createDelete(server, false);
+        persister.executeSqlUpdate(sqlDelete, transaction);
+      }
+    }
+
+    // decrease the depth back to what it was
+    transaction.depth(-1);
+  }
+
+  private void removeAssocManyPrivateOwned() {
+
+    // check that the list is not null and if it is a BeanCollection
+    // check that is has been populated (don't trigger lazy loading)
+    if (value instanceof BeanCollection<?>) {
+
+      BeanCollection<?> c = (BeanCollection<?>) value;
+      Set<?> modifyRemovals = c.getModifyRemovals();
+      modifyListenReset(c);
+      if (modifyRemovals != null && !modifyRemovals.isEmpty()) {
+        for (Object removedBean : modifyRemovals) {
+          if (removedBean instanceof EntityBean) {
+            EntityBean eb = (EntityBean) removedBean;
+            if (eb._ebean_getIntercept().isLoaded()) {
+              // only delete if the bean was loaded meaning that it is known to exist in the DB
+              persister.deleteRequest(persister.createPublishRequest(removedBean, transaction, PersistRequest.Type.DELETE, request.getFlags()));
+            }
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Check if we need to set the listen mode (on new collections persisted for the first time).
+   */
+  private boolean setListenMode(BeanCollection<?> manyValue, BeanPropertyAssocMany<?> prop) {
+    BeanCollection.ModifyListenMode mode = manyValue.getModifyListening();
+    if (mode == null) {
+      // new collection persisted for the first time
+      manyValue.setModifyListening(prop.getModifyListenMode());
+      return true;
+    }
+    return false;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyPropRequest.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyPropRequest.java
deleted file mode 100644
index dbd643d2f..000000000
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyPropRequest.java
+++ /dev/null
@@ -1,251 +0,0 @@
-package io.ebeaninternal.server.persist;
-
-import io.ebean.bean.BeanCollection;
-import io.ebean.bean.EntityBean;
-import io.ebean.bean.EntityBeanIntercept;
-import io.ebeaninternal.api.SpiTransaction;
-import io.ebeaninternal.server.core.PersistRequestBean;
-import io.ebeaninternal.server.deploy.BeanCollectionUtil;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.deploy.BeanProperty;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
-import io.ebeaninternal.server.deploy.ManyType;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Helper to wrap the details when saving a OneToMany or ManyToMany relationship.
- */
-class SaveManyPropRequest {
-
-  final PersistRequestBean<?> request;
-  private final boolean insertedParent;
-  final BeanPropertyAssocMany<?> many;
-  final EntityBean parentBean;
-  final SpiTransaction transaction;
-  private final boolean cascade;
-  private final boolean deleteMissingChildren;
-  private final boolean publish;
-
-  private final Object value;
-  private final BeanDescriptor<?> targetDescriptor;
-  private final boolean isMap;
-  private final boolean saveRecurseSkippable;
-
-  Collection<?> collection;
-  DefaultPersister persister;
-  private boolean deleteMissing;
-  private int sortOrder;
-
-  SaveManyPropRequest(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
-    this.request = request;
-    this.insertedParent = insertedParent;
-    this.many = many;
-    this.cascade = many.getCascadeInfo().isSave();
-    this.parentBean = parentBean;
-    this.transaction = request.getTransaction();
-    this.deleteMissingChildren = request.isDeleteMissingChildren();
-    this.publish = request.isPublish();
-    this.value = many.getValue(parentBean);
-    this.targetDescriptor = many.getTargetDescriptor();
-    this.isMap = ManyType.MAP == many.getManyType();
-    this.saveRecurseSkippable = many.isSaveRecurseSkippable();
-  }
-
-  public boolean isSaveIntersection() {
-    return transaction.isSaveAssocManyIntersection(many.getIntersectionTableJoin().getTable(), many.getBeanDescriptor().getName());
-  }
-
-  Object getValue() {
-    return value;
-  }
-
-  boolean isModifyListenMode() {
-    return BeanCollection.ModifyListenMode.REMOVALS == many.getModifyListenMode();
-  }
-
-  boolean isDeleteMissingChildren() {
-    return deleteMissingChildren;
-  }
-
-  public int getFlags() {
-    return request.getFlags();
-  }
-
-  boolean isInsertedParent() {
-    return insertedParent;
-  }
-
-  BeanPropertyAssocMany<?> getMany() {
-    return many;
-  }
-
-  EntityBean getParentBean() {
-    return parentBean;
-  }
-
-  SpiTransaction getTransaction() {
-    return transaction;
-  }
-
-  boolean isCascade() {
-    return cascade;
-  }
-
-  boolean isPublish() {
-    return publish;
-  }
-
-  void modifyListenReset(BeanCollection<?> c) {
-    if (insertedParent) {
-      // after insert set the modify listening mode for private owned etc
-      c.setModifyListening(many.getModifyListenMode());
-    }
-    c.modifyReset();
-  }
-
-  void resetModifyState() {
-    if (value instanceof BeanCollection<?>) {
-      modifyListenReset((BeanCollection<?>) value);
-    }
-  }
-
-  void saveDetails(DefaultPersister persister, boolean deleteMissing) {
-
-    this.persister = persister;
-    this.deleteMissing = deleteMissing;
-
-    // check that the list is not null and if it is a BeanCollection
-    // check that is has been populated (don't trigger lazy loading)
-    // For a Map this is a collection of Map.Entry objects and not beans
-    collection = BeanCollectionUtil.getActualEntries(value);
-    if (collection != null) {
-      processDetails();
-    }
-  }
-
-  void processDetails() {
-
-    BeanProperty orderColumn = null;
-    boolean hasOrderColumn = many.hasOrderColumn();
-    if (hasOrderColumn) {
-      if (!insertedParent && canSkipForOrderColumn()) {
-        return;
-      }
-      orderColumn = targetDescriptor.getOrderColumn();
-    }
-
-    if (insertedParent) {
-      // performance optimisation for large collections
-      targetDescriptor.preAllocateIds(collection.size());
-    }
-
-    if (deleteMissing) {
-      // collect the Id's (to exclude from deleteManyDetails)
-      List<Object> detailIds = collectIds(collection, targetDescriptor, isMap);
-      // deleting missing children - children not in our collected detailIds
-      persister.deleteManyDetails(transaction, many.getBeanDescriptor(), parentBean, many, detailIds, false);
-    }
-
-    transaction.depth(+1);
-    saveAllBeans(orderColumn);
-    if (hasOrderColumn) {
-      resetModifyState();
-    }
-    transaction.depth(-1);
-  }
-
-
-  private void saveAllBeans(BeanProperty orderColumn) {
-
-    // if a map, then we get the key value and
-    // set it to the appropriate property on the
-    // detail bean before we save it
-    Object mapKeyValue = null;
-    boolean skipSavingThisBean;
-
-    for (Object detailBean : collection) {
-      sortOrder++;
-      if (isMap) {
-        // its a map so need the key and value
-        Map.Entry<?, ?> entry = (Map.Entry<?, ?>) detailBean;
-        mapKeyValue = entry.getKey();
-        detailBean = entry.getValue();
-      }
-
-      if (detailBean instanceof EntityBean) {
-        EntityBean detail = (EntityBean) detailBean;
-        EntityBeanIntercept ebi = detail._ebean_getIntercept();
-        if (many.hasJoinTable()) {
-          skipSavingThisBean = targetDescriptor.isReference(ebi);
-        } else {
-          if (orderColumn != null) {
-            orderColumn.setValue(detail, sortOrder);
-            ebi.setDirty(true);
-          }
-          if (targetDescriptor.isReference(ebi)) {
-            // we can skip this one
-            skipSavingThisBean = true;
-
-          } else if (ebi.isNewOrDirty()) {
-            skipSavingThisBean = false;
-            // set the parent bean to detailBean
-            many.setJoinValuesToChild(parentBean, detail, mapKeyValue);
-
-          } else {
-            // unmodified so skip depending on prop.isSaveRecurseSkippable();
-            skipSavingThisBean = saveRecurseSkippable;
-          }
-        }
-
-        if (!skipSavingThisBean) {
-          persister.saveRecurse(detail, transaction, parentBean, request.getFlags());
-        }
-      }
-    }
-  }
-
-  /**
-   * Return true if we can skip based on .. no modifications to the collection and no beans are dirty.
-   */
-  private boolean canSkipForOrderColumn() {
-    return value instanceof BeanCollection
-      && !((BeanCollection<?>) value).wasTouched()
-      && noDirtyBeans();
-  }
-
-  private boolean noDirtyBeans() {
-    for (Object bean : collection) {
-      if (bean instanceof EntityBean && ((EntityBean) bean)._ebean_getIntercept().isDirty()) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Collect the Id values of the details to remove 'missing children' for stateless updates.
-   */
-  private List<Object> collectIds(Collection<?> collection, BeanDescriptor<?> targetDescriptor, boolean isMap) {
-
-    List<Object> detailIds = new ArrayList<>();
-    // stateless update with deleteMissingChildren so first
-    // collect the Id values to remove the 'missing children'
-    for (Object detailBean : collection) {
-      if (isMap) {
-        detailBean = ((Map.Entry<?, ?>) detailBean).getValue();
-      }
-      if (detailBean instanceof EntityBean) {
-        Object id = targetDescriptor.getId((EntityBean) detailBean);
-        if (!DmlUtil.isNullOrZero(id)) {
-          // remember the Id (other details not in the collection) will be removed
-          detailIds.add(id);
-        }
-      }
-    }
-    return detailIds;
-  }
-}
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManySimpleCollection.java b/src/main/java/io/ebeaninternal/server/persist/SaveManySimpleCollection.java
index 62faf73e3..49a4f09e9 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManySimpleCollection.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManySimpleCollection.java
@@ -4,16 +4,27 @@ import io.ebean.SqlUpdate;
 import io.ebean.bean.EntityBean;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.server.core.PersistRequestBean;
+import io.ebeaninternal.server.deploy.BeanCollectionUtil;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 
-class SaveManySimpleCollection extends SaveManyPropRequest {
+import java.util.Collection;
+
+/**
+ * Save details for a simple scalar element collection.
+ */
+class SaveManySimpleCollection extends SaveManyBase {
 
   SaveManySimpleCollection(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
     super(insertedParent, many, parentBean, request);
   }
 
   @Override
-  void processDetails() {
+  void save() {
+
+    Collection<?> collection = BeanCollectionUtil.getActualEntries(value);
+    if (collection == null) {
+      return;
+    }
 
     Object parentId = request.getBeanId();
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManySimpleMap.java b/src/main/java/io/ebeaninternal/server/persist/SaveManySimpleMap.java
new file mode 100644
index 000000000..84d57c222
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManySimpleMap.java
@@ -0,0 +1,52 @@
+package io.ebeaninternal.server.persist;
+
+import io.ebean.SqlUpdate;
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.server.core.PersistRequestBean;
+import io.ebeaninternal.server.deploy.BeanCollectionUtil;
+import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
+
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Save details for a simple scalar map element collection.
+ */
+class SaveManySimpleMap extends SaveManyBase {
+
+  SaveManySimpleMap(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
+    super(insertedParent, many, parentBean, request);
+  }
+
+  @SuppressWarnings("unchecked")
+  @Override
+  void save() {
+
+    Set<Map.Entry<?, ?>> entries = (Set<Map.Entry<?, ?>>)BeanCollectionUtil.getActualEntries(value);
+    if (entries == null) {
+      return;
+    }
+
+    Object parentId = request.getBeanId();
+
+    SqlUpdate sqlDelete = many.deleteByParentId(parentId, null);
+
+    SpiEbeanServer server = request.getServer();
+    server.execute(sqlDelete, transaction);
+
+    transaction.depth(+1);
+
+    String insert = many.insertElementCollection();
+    SqlUpdate sqlInsert = server.createSqlUpdate(insert);
+
+    for (Map.Entry<?, ?> entry : entries) {
+      sqlInsert.setParameter(1, parentId);
+      sqlInsert.setParameter(2, entry.getKey());
+      sqlInsert.setParameter(3, entry.getValue());
+      server.execute(sqlInsert, transaction);
+    }
+
+    transaction.depth(-1);
+  }
+}
diff --git a/src/test/java/org/tests/model/elementcollection/EcmPerson.java b/src/test/java/org/tests/model/elementcollection/EcmPerson.java
new file mode 100644
index 000000000..8be26fa50
--- /dev/null
+++ b/src/test/java/org/tests/model/elementcollection/EcmPerson.java
@@ -0,0 +1,68 @@
+package org.tests.model.elementcollection;
+
+import javax.persistence.Column;
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.MapKeyColumn;
+import javax.persistence.Version;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+@Entity
+public class EcmPerson {
+
+  @Id
+  long id;
+
+  String name;
+
+  @ElementCollection
+  @MapKeyColumn(name = "type", length = 4)
+  @Column(name = "number", length = 10)
+  Map<String, String> phoneNumbers = new LinkedHashMap<>();
+
+  @Version
+  long version;
+
+  public EcmPerson(String name) {
+    this.name = name;
+  }
+
+  @Override
+  public String toString() {
+    return "person id:" + id + " name:" + name + " phs:" + phoneNumbers;
+  }
+
+  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 Map<String, String> getPhoneNumbers() {
+    return phoneNumbers;
+  }
+
+  public void setPhoneNumbers(Map<String, String> phoneNumbers) {
+    this.phoneNumbers = phoneNumbers;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
new file mode 100644
index 000000000..83bbb7561
--- /dev/null
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
@@ -0,0 +1,63 @@
+package org.tests.model.elementcollection;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.junit.Test;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestElementCollectionBasicMap extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    EcmPerson person = new EcmPerson("Fiona021");
+    person.getPhoneNumbers().put("home","021 1234");
+    person.getPhoneNumbers().put("work","021 4321");
+    Ebean.save(person);
+
+
+    EcmPerson person1 = new EcmPerson("Fiona09");
+    person1.getPhoneNumbers().put("home","09 1234");
+    person1.getPhoneNumbers().put("work","09 4321");
+    person1.getPhoneNumbers().put("mob","09 9876");
+    Ebean.save(person1);
+
+    List<EcmPerson> found =
+      Ebean.find(EcmPerson.class).where()
+        .startsWith("name", "Fiona0")
+        .order().asc("id")
+        .findList();
+
+    Map<String,String> phoneNumbers0 = found.get(0).getPhoneNumbers();
+    Map<String,String> phoneNumbers1 = found.get(1).getPhoneNumbers();
+    phoneNumbers0.size();
+
+    assertThat(phoneNumbers0).containsValues("021 1234", "021 4321");
+    assertThat(phoneNumbers0.get("work")).isEqualTo("021 4321");
+    assertThat(phoneNumbers1).containsValues("09 1234", "09 4321", "09 9876");
+    assertThat(phoneNumbers1.get("mob")).isEqualTo("09 9876");
+
+
+    List<EcmPerson> found2 =
+      Ebean.find(EcmPerson.class)
+        .fetch("phoneNumbers")
+        .where()
+        .startsWith("name", "Fiona0")
+        .order().asc("id")
+        .findList();
+
+    assertThat(found2).hasSize(2);
+    EcmPerson foundFirst = found2.get(0);
+    String asJson = Ebean.json().toJson(foundFirst);
+
+    EcmPerson fromJson = Ebean.json().toBean(EcmPerson.class, asJson);
+
+    assertThat(fromJson.getPhoneNumbers()).containsValues("021 1234", "021 4321");
+    assertThat(fromJson.getPhoneNumbers().get("home")).isEqualTo("021 1234");
+
+  }
+}

From 765125608398f60eac474fe6c932f043ebe8634d Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 26 Mar 2018 15:47:20 +1300
Subject: [PATCH 0197/1036] #1352 - Bump default datasource - with better
 defaults for Idle connection cleanup (5 mins)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 85d2ecd68..0005b29df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
     <dependency>
       <groupId>org.avaje</groupId>
       <artifactId>avaje-datasource</artifactId>
-      <version>3.1.1</version>
+      <version>3.2.2</version>
     </dependency>
 
     <dependency>

From 6cf5e3386de9d12b9e8f0a9519f95495cfd20ed9 Mon Sep 17 00:00:00 2001
From: Yuan Xuegui <yuanxuegui@163.com>
Date: Mon, 26 Mar 2018 11:37:25 +0800
Subject: [PATCH 0198/1036] ENH: Add mappingsLocation config to search xml
 mapping files. (#1350)

ENH: Add mappingsLocation config and search xml mapping files feature.
---
 .../java/io/ebean/config/ServerConfig.java    | 65 +++++++++++++------
 .../server/deploy/BeanDescriptorManager.java  | 39 ++++++++++-
 .../java/io/ebean/EbeanServer_eqlTest.java    | 15 +++++
 .../org/tests/rawsql/TestRawSqlOrmQuery.java  | 26 ++++++++
 .../ebean-xml-mappings/CustomerMapping.xml    | 14 ++++
 .../ebean-xml-mappings/OrderMapping.xml       | 19 ++++++
 src/test/resources/ebean.properties           |  2 +
 7 files changed, 159 insertions(+), 21 deletions(-)
 create mode 100644 src/test/resources/ebean-xml-mappings/CustomerMapping.xml
 create mode 100644 src/test/resources/ebean-xml-mappings/OrderMapping.xml

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 51221e96f..8d0d6f797 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -14,14 +14,7 @@ import io.ebean.config.dbplatform.DbEncrypt;
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.properties.PropertiesLoader;
-import io.ebean.event.BeanFindController;
-import io.ebean.event.BeanPersistController;
-import io.ebean.event.BeanPersistListener;
-import io.ebean.event.BeanPostConstructListener;
-import io.ebean.event.BeanPostLoad;
-import io.ebean.event.BeanQueryAdapter;
-import io.ebean.event.BulkTableEventListener;
-import io.ebean.event.ServerConfigStartup;
+import io.ebean.event.*;
 import io.ebean.event.changelog.ChangeLogListener;
 import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeLogRegister;
@@ -33,14 +26,7 @@ import io.ebean.util.StringHelper;
 import org.avaje.datasource.DataSourceConfig;
 
 import javax.sql.DataSource;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.ServiceLoader;
+import java.util.*;
 
 /**
  * The configuration used for creating a EbeanServer.
@@ -488,6 +474,12 @@ public class ServerConfig {
    */
   private boolean defaultOrderById = false;
 
+  /**
+   * The mappingLocations for searching xml mapping. Only used when
+   * mappingLocations is empty/not explicitly specified.
+   */
+  private List<String> mappingLocations = new ArrayList<>();
+
   /**
    * Construct a Server Configuration for programmatically creating an EbeanServer.
    */
@@ -2782,7 +2774,7 @@ public class ServerConfig {
 
     if (packages != null) {
       String packagesProp = p.get("search.packages", p.get("packages", null));
-      packages = getSearchJarsPackages(packagesProp);
+      packages = getSearchList(packagesProp);
     }
 
     collectQueryStatsByNode = p.getBoolean("collectQueryStatsByNode", collectQueryStatsByNode);
@@ -2862,6 +2854,12 @@ public class ServerConfig {
     tenantSchemaProvider = p.createInstance(TenantSchemaProvider.class, "tenant.schemaProvider", tenantSchemaProvider);
     tenantPartitionColumn = p.get("tenant.partitionColumn", tenantPartitionColumn);
     classes = getClasses(p);
+
+
+    if (mappingLocations != null) {
+      String mappingsProp = p.get("search.mappingsLocations", p.get("mappingsLocations", null));
+      mappingLocations = getSearchList(mappingsProp);
+    }
   }
 
   private NamingConvention createNamingConvention(PropertiesWrapper properties, NamingConvention namingConvention) {
@@ -2898,10 +2896,10 @@ public class ServerConfig {
     return classes;
   }
 
-  private List<String> getSearchJarsPackages(String searchPackages) {
+  private List<String> getSearchList(String searchNames) {
 
-    if (searchPackages != null) {
-      String[] entries = StringHelper.splitNames(searchPackages);
+    if (searchNames != null) {
+      String[] entries = StringHelper.splitNames(searchNames);
 
       List<String> hitList = new ArrayList<>(entries.length);
       Collections.addAll(hitList, entries);
@@ -3076,6 +3074,33 @@ public class ServerConfig {
     return config;
   }
 
+  /**
+   * Add a mapping location to search for xml mapping via class path search.
+   */
+  public void addMappingLocation(String mappingLocation) {
+    if (mappingLocations == null) {
+      mappingLocations = new ArrayList<>();
+    }
+    mappingLocations.add(mappingLocation);
+  }
+
+  /**
+   * Return mapping locations to search for xml mapping via class path search.
+   */
+  public List<String> getMappingLocations() {
+    return mappingLocations;
+  }
+
+  /**
+   * Set mapping locations to search for xml mapping via class path search.
+   * <p>
+   * This is only used if classes have not been explicitly specified.
+   * </p>
+   */
+  public void setMappingLocations(List<String> mappingLocations) {
+    this.mappingLocations = mappingLocations;
+  }
+
   public enum UuidVersion {
     VERSION4,
     VERSION1,
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 190322d07..62dae4b39 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -26,6 +26,7 @@ import io.ebeaninternal.api.ConcurrencyMode;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.TransactionEventTable;
 import io.ebeaninternal.server.cache.SpiCacheManager;
+import io.ebeaninternal.server.core.ClassPathScanners;
 import io.ebeaninternal.server.core.InternString;
 import io.ebeaninternal.server.core.InternalConfiguration;
 import io.ebeaninternal.server.core.Message;
@@ -65,6 +66,9 @@ import io.ebeaninternal.xmlmapping.model.XmNamedQuery;
 import io.ebeaninternal.xmlmapping.model.XmRawSql;
 import io.ebeanservice.docstore.api.DocStoreBeanAdapter;
 import io.ebeanservice.docstore.api.DocStoreFactory;
+import org.avaje.classpath.scanner.ClassPathScanner;
+import org.avaje.classpath.scanner.Resource;
+import org.avaje.classpath.scanner.ResourceFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -72,6 +76,7 @@ import javax.persistence.MappedSuperclass;
 import javax.persistence.PersistenceException;
 import javax.persistence.Transient;
 import javax.sql.DataSource;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
@@ -413,6 +418,13 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
         }
       }
 
+      List<Resource> xmlMappingResources = searchXmlMapping();
+      for (Resource xmlMappingRes : xmlMappingResources) {
+        try (InputStream is = new FileInputStream(xmlMappingRes.getLocationOnDisk())) {
+          mappings.add(XmlMappingReader.read(is));
+        }
+      }
+
       for (XmEbean mapping : mappings) {
         List<XmEntity> entityDeploy = mapping.getEntity();
         for (XmEntity deploy : entityDeploy) {
@@ -421,10 +433,35 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
       }
 
     } catch (IOException e) {
-      throw new RuntimeException("Error reading ebean.xml", e);
+      throw new RuntimeException("Error reading ebean xml mapping", e);
     }
   }
 
+  private List<Resource> searchXmlMapping() {
+    List<ClassPathScanner> scanners = ClassPathScanners.find(serverConfig);
+    List<String> mappingLocations = serverConfig.getMappingLocations();
+    List<Resource> resourceList = new ArrayList<>();
+
+    long st = System.currentTimeMillis();
+    if (mappingLocations != null && !mappingLocations.isEmpty()) {
+      for (ClassPathScanner finder : scanners) {
+        for (String mappingLocation : mappingLocations) {
+          resourceList.addAll(finder.scanForResources(mappingLocation, new ResourceFilter() {
+
+            @Override
+            public boolean isMatch(String resourceName) {
+              return resourceName.endsWith(".xml");
+            }
+          }));
+        }
+      }
+    }
+
+    long searchTime = System.currentTimeMillis() - st;
+    logger.debug("Classpath search mappings[{}] searchTime[{}]", resourceList.size(), searchTime);
+    return resourceList;
+  }
+
   private void readEntityMapping(ClassLoader classLoader, XmEntity entityDeploy) {
 
     String entityClassName = entityDeploy.getClazz();
diff --git a/src/test/java/io/ebean/EbeanServer_eqlTest.java b/src/test/java/io/ebean/EbeanServer_eqlTest.java
index a29e00bad..75c0c1f4f 100644
--- a/src/test/java/io/ebean/EbeanServer_eqlTest.java
+++ b/src/test/java/io/ebean/EbeanServer_eqlTest.java
@@ -250,4 +250,19 @@ public class EbeanServer_eqlTest extends BaseTestCase {
 
     assertThat(query.getGeneratedSql()).contains("from o_customer t0 left join contact t1 on t1.customer_id = t0.id ");
   }
+
+  @Test
+  public void namedQuery_fromCustomXmlLocations() {
+
+    ResetBasicData.reset();
+
+    Query<Customer> query = server()
+      .createNamedQuery(Customer.class, "withContactsById2")
+      .setParameter("id", 1);
+
+    query.setUseCache(false);
+    query.findOne();
+
+    assertThat(query.getGeneratedSql()).contains("from o_customer t0 left join contact t1 on t1.customer_id = t0.id ");
+  }
 }
diff --git a/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java b/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
index 51e3d53c5..cabde9917 100644
--- a/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
+++ b/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
@@ -51,6 +51,32 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
     assertThat(sql).contains("where o.status = ?  order by c.name, c.id");
   }
 
+  @IgnorePlatform(Platform.ORACLE)
+  @Test
+  public void testNamed_fromCustomXmlLocations() {
+
+    ResetBasicData.reset();
+
+    Query<Order> query = Ebean.createNamedQuery(Order.class, "myRawTest2");
+    query.setParameter("orderStatus", Order.Status.NEW);
+    query.setMaxRows(10);
+    List<Order> list = query.findList();
+    for (Order order : list) {
+      order.getCretime();
+    }
+
+    String sql = query.getGeneratedSql();
+    if (isSqlServer()) {
+      assertThat(sql).contains("select top 10 o.id,");
+    } else {
+      assertThat(sql).contains("select o.id,");
+      assertThat(sql).contains("limit 10");
+    }
+    assertThat(sql).contains("o.id, o.status, o.ship_date, c.id, c.name, a.id, a.line_1, a.line_2, a.city from o_order o");
+    assertThat(sql).contains("join o_customer c on o.kcustomer_id = c.id ");
+    assertThat(sql).contains("where o.status = ?  order by c.name, c.id");
+  }
+
   @Test
   public void test() {
 
diff --git a/src/test/resources/ebean-xml-mappings/CustomerMapping.xml b/src/test/resources/ebean-xml-mappings/CustomerMapping.xml
new file mode 100644
index 000000000..b55626fbf
--- /dev/null
+++ b/src/test/resources/ebean-xml-mappings/CustomerMapping.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ebean xmlns="http://ebean-orm.github.io/xml/ns/ebean">
+
+  <entity class="org.tests.model.basic.Customer">
+    <named-query name="withContactsById2">
+      <query>
+        select (name, version)
+        fetch contacts (firstName, lastName, email)
+        where id = :id
+      </query>
+    </named-query>
+  </entity>
+
+</ebean>
diff --git a/src/test/resources/ebean-xml-mappings/OrderMapping.xml b/src/test/resources/ebean-xml-mappings/OrderMapping.xml
new file mode 100644
index 000000000..cd35e81a9
--- /dev/null
+++ b/src/test/resources/ebean-xml-mappings/OrderMapping.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ebean xmlns="http://ebean-orm.github.io/xml/ns/ebean">
+
+  <entity class="org.tests.model.basic.Order">
+    <raw-sql name="myRawTest2">
+      <alias-mapping alias="c" property="customer"/>
+      <alias-mapping alias="a" property="customer.billingAddress"/>
+      <query>
+        select o.id, o.status, o.ship_date, c.id, c.name, a.id, a.line_1, a.line_2, a.city
+        from o_order o
+        join o_customer c on o.kcustomer_id = c.id
+        join o_address a on c.billing_address_id = a.id
+        where o.status = :orderStatus
+        order by c.name, c.id
+      </query>
+    </raw-sql>
+  </entity>
+
+</ebean>
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 3b048c4c2..3616698d1 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -168,3 +168,5 @@ ebean.migrationtest.ddl.header=-- Migrationscripts for ebean unittest
 ebean.migrationtest.migration.appName=migrationtest
 ebean.migrationtest.migration.migrationPath=dbmigration/migrationtest
 ebean.migrationtest.migration.strict=true
+
+ebean.mappingsLocations=classpath:/ebean-xml-mappings

From 6534feb5dab2e9663b7ea512a8a508011c1ef9ca Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 26 Mar 2018 16:55:25 +1300
Subject: [PATCH 0199/1036] #1350 - ENH: Add mappingsLocation config to search
 xml mapping files.

Minor adjustments - read "mappingLocations" only etc.
---
 .../java/io/ebean/config/ServerConfig.java    | 35 ++++++++++++-------
 .../io/ebean/config/ServerConfigTest.java     |  3 ++
 src/test/resources/ebean.properties           |  2 +-
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 8d0d6f797..c0b8a5ffe 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -14,7 +14,14 @@ import io.ebean.config.dbplatform.DbEncrypt;
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.properties.PropertiesLoader;
-import io.ebean.event.*;
+import io.ebean.event.BeanFindController;
+import io.ebean.event.BeanPersistController;
+import io.ebean.event.BeanPersistListener;
+import io.ebean.event.BeanPostConstructListener;
+import io.ebean.event.BeanPostLoad;
+import io.ebean.event.BeanQueryAdapter;
+import io.ebean.event.BulkTableEventListener;
+import io.ebean.event.ServerConfigStartup;
 import io.ebean.event.changelog.ChangeLogListener;
 import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeLogRegister;
@@ -26,7 +33,14 @@ import io.ebean.util.StringHelper;
 import org.avaje.datasource.DataSourceConfig;
 
 import javax.sql.DataSource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.ServiceLoader;
 
 /**
  * The configuration used for creating a EbeanServer.
@@ -2772,10 +2786,8 @@ public class ServerConfig {
     dbOffline = p.getBoolean("dbOffline", dbOffline);
     serverCachePlugin = p.createInstance(ServerCachePlugin.class, "serverCachePlugin", serverCachePlugin);
 
-    if (packages != null) {
-      String packagesProp = p.get("search.packages", p.get("packages", null));
-      packages = getSearchList(packagesProp);
-    }
+    String packagesProp = p.get("search.packages", p.get("packages", null));
+    packages = getSearchList(packagesProp, packages);
 
     collectQueryStatsByNode = p.getBoolean("collectQueryStatsByNode", collectQueryStatsByNode);
     collectQueryOrigins = p.getBoolean("collectQueryOrigins", collectQueryOrigins);
@@ -2855,11 +2867,8 @@ public class ServerConfig {
     tenantPartitionColumn = p.get("tenant.partitionColumn", tenantPartitionColumn);
     classes = getClasses(p);
 
-
-    if (mappingLocations != null) {
-      String mappingsProp = p.get("search.mappingsLocations", p.get("mappingsLocations", null));
-      mappingLocations = getSearchList(mappingsProp);
-    }
+    String mappingsProp = p.get("mappingLocations", null);
+    mappingLocations = getSearchList(mappingsProp, mappingLocations);
   }
 
   private NamingConvention createNamingConvention(PropertiesWrapper properties, NamingConvention namingConvention) {
@@ -2896,7 +2905,7 @@ public class ServerConfig {
     return classes;
   }
 
-  private List<String> getSearchList(String searchNames) {
+  private List<String> getSearchList(String searchNames, List<String> defaultValue) {
 
     if (searchNames != null) {
       String[] entries = StringHelper.splitNames(searchNames);
@@ -2906,7 +2915,7 @@ public class ServerConfig {
 
       return hitList;
     } else {
-      return new ArrayList<>();
+      return defaultValue;
     }
   }
 
diff --git a/src/test/java/io/ebean/config/ServerConfigTest.java b/src/test/java/io/ebean/config/ServerConfigTest.java
index 6aa9f64c9..03c86481d 100644
--- a/src/test/java/io/ebean/config/ServerConfigTest.java
+++ b/src/test/java/io/ebean/config/ServerConfigTest.java
@@ -64,6 +64,7 @@ public class ServerConfigTest {
     props.setProperty("disableL2Cache", "true");
     props.setProperty("notifyL2CacheInForeground", "true");
     props.setProperty("idType", "SEQUENCE");
+    props.setProperty("mappingLocations", "classpath:/foo;bar");
 
     serverConfig.loadFromProperties(props);
 
@@ -83,6 +84,8 @@ public class ServerConfigTest {
     assertEquals(4, serverConfig.getBackgroundExecutorSchedulePoolSize());
     assertEquals(98, serverConfig.getBackgroundExecutorShutdownSecs());
 
+    assertThat(serverConfig.getMappingLocations()).containsExactly("classpath:/foo","bar");
+
     serverConfig.setPersistBatch(PersistBatch.NONE);
     serverConfig.setPersistBatchOnCascade(PersistBatch.NONE);
 
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 3616698d1..33121aa37 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -27,6 +27,7 @@ ebean.autoReadOnlyDataSource=true
 
 #ebean.h2.idType=SEQUENCE
 
+ebean.mappingLocations=classpath:/ebean-xml-mappings
 ebean.currentUserProvider=io.ebean.MyCurrentUserProvider
 #ebean.expressionNativeIlike=true
 #ebean.jsonInclude=NON_NULL
@@ -169,4 +170,3 @@ ebean.migrationtest.migration.appName=migrationtest
 ebean.migrationtest.migration.migrationPath=dbmigration/migrationtest
 ebean.migrationtest.migration.strict=true
 
-ebean.mappingsLocations=classpath:/ebean-xml-mappings

From 74e0a16531862eaa5f2d88b1c38f5e73a40322c1 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 26 Mar 2018 20:45:39 +1300
Subject: [PATCH 0200/1036] #1351 - ENH: Add named DtoQuery

Merge branch 'feature/namedDtoQuery' of https://github.com/hexagonframework/ebean into hexagonframework-feature/namedDtoQuery
---
 src/main/java/io/ebean/EbeanServer.java       | 18 ++---
 .../server/core/DefaultServer.java            | 21 +++---
 .../server/core/InternalConfigXmlRead.java    | 74 ++++++++++++++++---
 .../server/core/InternalConfiguration.java    | 55 +++-----------
 .../server/deploy/BeanDescriptorManager.java  | 15 ----
 .../server/dto/DtoBeanDescriptor.java         | 61 ++-------------
 .../server/dto/DtoBeanManager.java            | 68 ++++-------------
 .../xmlmapping/XmlMappingReader.java          | 17 +++--
 .../ebeaninternal/xmlmapping/model/XmDto.java |  4 +-
 .../xmlmapping/model/XmEbean.java             |  7 +-
 src/main/resources/ebean-1.0.xsd              |  4 +-
 src/test/java/io/ebean/NamedDtoQueryTest.java |  5 +-
 .../ebeaninternal/api/TDSpiEbeanServer.java   |  5 +-
 src/test/resources/ebean.properties           |  1 +
 14 files changed, 139 insertions(+), 216 deletions(-)

diff --git a/src/main/java/io/ebean/EbeanServer.java b/src/main/java/io/ebean/EbeanServer.java
index 78619886b..6fbc54b24 100644
--- a/src/main/java/io/ebean/EbeanServer.java
+++ b/src/main/java/io/ebean/EbeanServer.java
@@ -8,6 +8,12 @@ import io.ebean.plugin.Property;
 import io.ebean.plugin.SpiServer;
 import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.persistence.NonUniqueResultException;
+import javax.persistence.OptimisticLockException;
+import javax.persistence.PersistenceException;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -16,11 +22,6 @@ import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.OptimisticLockException;
-import javax.persistence.PersistenceException;
 
 /**
  * Provides the API for fetching and saving beans to a particular DataSource.
@@ -104,7 +105,6 @@ public interface EbeanServer {
    *
    * @param shutdownDataSource if true then shutdown the underlying DataSource if it is the EbeanORM
    *                           DataSource implementation.
-   *                           DataSource implementation.
    * @param deregisterDriver   if true then deregister the JDBC driver if it is the EbeanORM
    *                           DataSource implementation.
    */
@@ -444,9 +444,9 @@ public interface EbeanServer {
    * They do not need to be registered with Ebean before use.
    * </p>
    *
-   * @param dtoType The type of the DTO bean the rows will be mapped into.
-   * @param namedQuery     The name of the query
-   * @param <T>     The type of the DTO bean.
+   * @param dtoType    The type of the DTO bean the rows will be mapped into.
+   * @param namedQuery The name of the query
+   * @param <T>        The type of the DTO bean.
    */
   <T> DtoQuery<T> createNamedDtoQuery(Class<T> dtoType, String namedQuery);
 
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index da3d5af00..b4827d155 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -105,6 +105,13 @@ import io.ebeaninternal.server.transaction.TransactionManager;
 import io.ebeaninternal.util.ParamTypeHelper;
 import io.ebeaninternal.util.ParamTypeHelper.TypeInfo;
 import io.ebeanservice.docstore.api.DocStoreIntegration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.NonUniqueResultException;
+import javax.persistence.OptimisticLockException;
+import javax.persistence.PersistenceException;
+import javax.sql.DataSource;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -119,12 +126,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.OptimisticLockException;
-import javax.persistence.PersistenceException;
-import javax.sql.DataSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * The default server side implementation of EbeanServer.
@@ -1001,11 +1002,11 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   @Override
   public <T> DtoQuery<T> createNamedDtoQuery(Class<T> dtoType, String namedQuery) {
     DtoBeanDescriptor<T> descriptor = dtoBeanManager.getDescriptor(dtoType);
-    SpiRawSql rawSql = descriptor.getNamedRawSql(namedQuery);
-    if (rawSql != null) {
-      return new DefaultDtoQuery<>(this, descriptor, rawSql.getSql().getUnparsedSql());
+    String sql = descriptor.getNamedRawSql(namedQuery);
+    if (sql == null) {
+      throw new PersistenceException("No named query called " + namedQuery + " for bean:" + dtoType.getName());
     }
-    throw new PersistenceException("No named query called " + namedQuery + " for bean:" + dtoType.getName());
+    return new DefaultDtoQuery<>(this, descriptor, sql);
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlRead.java b/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlRead.java
index 401dbcd17..8bb1b9be7 100644
--- a/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlRead.java
+++ b/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlRead.java
@@ -1,39 +1,49 @@
 package io.ebeaninternal.server.core;
 
 import io.ebean.config.ServerConfig;
+import io.ebeaninternal.server.dto.DtoNamedQueries;
 import io.ebeaninternal.xmlmapping.XmlMappingReader;
+import io.ebeaninternal.xmlmapping.model.XmDto;
 import io.ebeaninternal.xmlmapping.model.XmEbean;
+import io.ebeaninternal.xmlmapping.model.XmRawSql;
 import org.avaje.classpath.scanner.ClassPathScanner;
 import org.avaje.classpath.scanner.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
+/**
+ * Reads the Xml deployment information.
+ */
 class InternalConfigXmlRead {
 
   private static final Logger log = LoggerFactory.getLogger(InternalConfigXmlRead.class);
 
   private final ServerConfig serverConfig;
 
+  private final ClassLoader classLoader;
+
+  private final Map<Class<?>, DtoNamedQueries> dtoNamedQueries = new HashMap<>();
+
+  private List<XmEbean> xmlEbeanList;
+
   InternalConfigXmlRead(ServerConfig serverConfig) {
     this.serverConfig = serverConfig;
+    this.classLoader = serverConfig.getClassLoadConfig().getClassLoader();
+
+    init();
   }
 
-  List<XmEbean> build() {
-
-    ClassLoader classLoader = serverConfig.getClassLoadConfig().getClassLoader();
-    List<XmEbean> xmlEbeanList = XmlMappingReader.readByResourceName(classLoader, "ebean.xml");
-
-    List<Resource> resources = searchXmlMapping();
-    xmlEbeanList.addAll(XmlMappingReader.readByResourceList(resources));
-
-    return xmlEbeanList;
+  private void init() {
+    this.xmlEbeanList = XmlMappingReader.readByResourceName(classLoader, "ebean.xml");
+    xmlEbeanList.addAll(XmlMappingReader.readByResourceList(xmlMappingResources()));
   }
 
-
-  private List<Resource> searchXmlMapping() {
+  private List<Resource> xmlMappingResources() {
     List<ClassPathScanner> scanners = ClassPathScanners.find(serverConfig);
     List<String> mappingLocations = serverConfig.getMappingLocations();
     List<Resource> resourceList = new ArrayList<>();
@@ -52,5 +62,47 @@ class InternalConfigXmlRead {
     return resourceList;
   }
 
+  /**
+   * Return the XML deployment information for entity beans.
+   */
+  List<XmEbean> xmlDeployment() {
+    return xmlEbeanList;
+  }
+
+  /**
+   * Return the named queries for Dto beans.
+   */
+  Map<Class<?>, DtoNamedQueries> readDtoMapping() {
+    for (XmEbean mapping : xmlEbeanList) {
+      List<XmDto> dtoList = mapping.getDto();
+      for (XmDto dto : dtoList) {
+        readDtoMapping(dto);
+      }
+    }
+
+    return dtoNamedQueries;
+  }
+
+  private void readDtoMapping(XmDto dto) {
+
+    String dtoClassName = dto.getClazz();
+    Class<?> dtoClass;
+    try {
+      dtoClass = Class.forName(dtoClassName, false, classLoader);
+    } catch (Exception e) {
+      log.error("Could not load dto bean class " + dtoClassName + " for ebean xml entry");
+      return;
+    }
+
+    DtoNamedQueries namedQueries = dtoNamedQueries.computeIfAbsent(dtoClass, aClass -> new DtoNamedQueries());
+
+    for (XmRawSql sql : dto.getRawSql()) {
+      namedQueries.addRawSql(sql.getName(), sql.getQuery().getValue());
+    }
+
+    if (!dto.getNamedQuery().isEmpty()) {
+      log.error("Only raw-sql named queries supported for DTO beans - bean:" + dtoClass);
+    }
+  }
 
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index 82d395aed..31aea3889 100644
--- a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -69,23 +69,19 @@ import io.ebeaninternal.server.transaction.TransactionManagerOptions;
 import io.ebeaninternal.server.transaction.TransactionScopeManager;
 import io.ebeaninternal.server.type.DefaultTypeManager;
 import io.ebeaninternal.server.type.TypeManager;
-import io.ebeaninternal.xmlmapping.XmlMappingReader;
-import io.ebeaninternal.xmlmapping.model.XmEbean;
 import io.ebeanservice.docstore.api.DocStoreFactory;
 import io.ebeanservice.docstore.api.DocStoreIntegration;
 import io.ebeanservice.docstore.api.DocStoreUpdateProcessor;
 import io.ebeanservice.docstore.none.NoneDocStoreFactory;
+import org.avaje.datasource.DataSourcePool;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.sql.DataSource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.ServiceLoader;
-import javax.sql.DataSource;
-import org.avaje.classpath.scanner.ClassPathScanner;
-import org.avaje.classpath.scanner.Resource;
-import org.avaje.classpath.scanner.ResourceFilter;
-import org.avaje.datasource.DataSourcePool;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Used to extend the ServerConfig with additional objects used to configure and
@@ -138,8 +134,6 @@ public class InternalConfiguration {
 
   private final MultiValueBind multiValueBind;
 
-  private List<XmEbean> xmlEbeanList = new ArrayList<>();
-
   public InternalConfiguration(ClusterManager clusterManager,
                                SpiCacheManager cacheManager, SpiBackgroundExecutor backgroundExecutor,
                                ServerConfig serverConfig, BootupClasses bootupClasses) {
@@ -159,20 +153,14 @@ public class InternalConfiguration {
     this.multiValueBind = createMultiValueBind(databasePlatform.getPlatform());
     this.deployInherit = new DeployInherit(bootupClasses);
 
-    xmlEbeanList = XmlMappingReader.readByResourceName(serverConfig.getClassLoadConfig().getClassLoader(),
-      "ebean.xml");
-    List<Resource> searchXmlMapping = searchXmlMapping();
-    xmlEbeanList.addAll(XmlMappingReader.readByResourceList(serverConfig.getClassLoadConfig().getClassLoader(),
-      searchXmlMapping));
-
     this.deployCreateProperties = new DeployCreateProperties(typeManager);
     this.deployUtil = new DeployUtil(typeManager, serverConfig);
-    this.dtoBeanManager = new DtoBeanManager(typeManager);
-    dtoBeanManager.readXmlMapping(serverConfig.getClassLoadConfig().getClassLoader(),
-      xmlEbeanList);
 
+    InternalConfigXmlRead xmlRead = new InternalConfigXmlRead(serverConfig);
+
+    this.dtoBeanManager = new DtoBeanManager(typeManager, xmlRead.readDtoMapping());
     this.beanDescriptorManager = new BeanDescriptorManager(this);
-    Map<String, String> asOfTableMapping = beanDescriptorManager.deploy(xmlEbeanList);
+    Map<String, String> asOfTableMapping = beanDescriptorManager.deploy(xmlRead.xmlDeployment());
     Map<String, String> draftTableMap = beanDescriptorManager.getDraftTableMap();
     beanDescriptorManager.scheduleBackgroundTrim();
 
@@ -181,31 +169,6 @@ public class InternalConfiguration {
     this.cQueryEngine = new CQueryEngine(serverConfig, databasePlatform, binder, asOfTableMapping, draftTableMap);
   }
 
-  private List<Resource> searchXmlMapping() {
-    List<ClassPathScanner> scanners = ClassPathScanners.find(serverConfig);
-    List<String> mappingLocations = serverConfig.getMappingLocations();
-    List<Resource> resourceList = new ArrayList<>();
-
-    long st = System.currentTimeMillis();
-    if (mappingLocations != null && !mappingLocations.isEmpty()) {
-      for (ClassPathScanner finder : scanners) {
-        for (String mappingLocation : mappingLocations) {
-          resourceList.addAll(finder.scanForResources(mappingLocation, new ResourceFilter() {
-
-            @Override
-            public boolean isMatch(String resourceName) {
-              return resourceName.endsWith(".xml");
-            }
-          }));
-        }
-      }
-    }
-
-    long searchTime = System.currentTimeMillis() - st;
-    logger.debug("Classpath search mappings[{}] searchTime[{}]", resourceList.size(), searchTime);
-    return resourceList;
-  }
-
   /**
    * Create and return the ExpressionFactory based on configuration and database platform.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 6be9dd585..0e6814365 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -26,7 +26,6 @@ import io.ebeaninternal.api.ConcurrencyMode;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.TransactionEventTable;
 import io.ebeaninternal.server.cache.SpiCacheManager;
-import io.ebeaninternal.server.core.ClassPathScanners;
 import io.ebeaninternal.server.core.InternString;
 import io.ebeaninternal.server.core.InternalConfiguration;
 import io.ebeaninternal.server.core.Message;
@@ -57,7 +56,6 @@ import io.ebeaninternal.server.query.CQueryPlan;
 import io.ebeaninternal.server.type.ScalarType;
 import io.ebeaninternal.server.type.ScalarTypeInteger;
 import io.ebeaninternal.server.type.TypeManager;
-import io.ebeaninternal.xmlmapping.XmlMappingReader;
 import io.ebeaninternal.xmlmapping.model.XmAliasMapping;
 import io.ebeaninternal.xmlmapping.model.XmColumnMapping;
 import io.ebeaninternal.xmlmapping.model.XmEbean;
@@ -66,9 +64,6 @@ import io.ebeaninternal.xmlmapping.model.XmNamedQuery;
 import io.ebeaninternal.xmlmapping.model.XmRawSql;
 import io.ebeanservice.docstore.api.DocStoreBeanAdapter;
 import io.ebeanservice.docstore.api.DocStoreFactory;
-import org.avaje.classpath.scanner.ClassPathScanner;
-import org.avaje.classpath.scanner.Resource;
-import org.avaje.classpath.scanner.ResourceFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -76,17 +71,12 @@ import javax.persistence.MappedSuperclass;
 import javax.persistence.PersistenceException;
 import javax.persistence.Transient;
 import javax.sql.DataSource;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -1064,11 +1054,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     unidirectional.setDbRead(true);
     unidirectional.setDbInsertable(true);
     unidirectional.setDbUpdateable(false);
-
-    targetDesc.setUnidirectional(unidirectional);
-
-    // specify table and table alias...
-    BeanTable beanTable = getBeanTable(owningType);
     unidirectional.setBeanTable(beanTable);
     unidirectional.setName(beanTable.getBaseTable());
     unidirectional.setJoinType(true);
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java
index 0e8f4b42f..10f2a2cdc 100644
--- a/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java
@@ -1,9 +1,7 @@
 package io.ebeaninternal.server.dto;
 
 import io.ebean.meta.MetricVisitor;
-import io.ebeaninternal.server.rawsql.SpiRawSql;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
+
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -12,25 +10,18 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public class DtoBeanDescriptor<T> {
 
-  private static final Map<String, String> EMPTY_NAMED_QUERY = new HashMap<>();
-
-  private static final Map<String, SpiRawSql> EMPTY_RAW_MAP = new HashMap<>();
-
   private final Map<Object, DtoQueryPlan> plans = new ConcurrentHashMap<>();
 
   private final Class<T> dtoType;
 
   private final DtoMeta meta;
 
-  private Map<String, SpiRawSql> namedRawSql;
+  private final Map<String, String> namedQueries;
 
-  private Map<String, String> namedQuery;
-
-  DtoBeanDescriptor(Class<T> dtoType, DtoMeta meta) {
+  DtoBeanDescriptor(Class<T> dtoType, DtoMeta meta, Map<String, String> namedQueries) {
     this.dtoType = dtoType;
     this.meta = meta;
-    this.namedQuery = getNamedQuery();
-    this.namedRawSql = getNamedRawSql();
+    this.namedQueries = namedQueries;
   }
 
   public Class<T> getType() {
@@ -55,51 +46,11 @@ public class DtoBeanDescriptor<T> {
     }
   }
 
-  /**
-   * Return the named ORM query.
-   */
-  public String getNamedQuery(String name) {
-    return namedQuery.get(name);
-  }
-
   /**
    * Return the named RawSql query.
    */
-  public SpiRawSql getNamedRawSql(String named) {
-    return namedRawSql.get(named);
+  public String getNamedRawSql(String name) {
+    return namedQueries.get(name);
   }
 
-  /**
-   * Return the named ORM queries.
-   */
-  public Map<String, String> getNamedQuery() {
-    return (namedQuery != null) ? namedQuery : EMPTY_NAMED_QUERY;
-  }
-
-  /**
-   * Add a named query.
-   */
-  public void addNamedQuery(String name, String query) {
-    if (namedQuery == null) {
-      namedQuery = new LinkedHashMap<>();
-    }
-    namedQuery.put(name, query);
-  }
-
-  /**
-   * Return the named RawSql queries.
-   */
-  public Map<String, SpiRawSql> getNamedRawSql() {
-    return (namedRawSql != null) ? namedRawSql : EMPTY_RAW_MAP;
-  }
-
-  /**
-   * Add a named RawSql from ebean.xml file.
-   */
-  public void addRawSql(String name, SpiRawSql rawSql) {
-    if (namedRawSql == null) {
-      namedRawSql = new HashMap<>();
-    }
-    namedRawSql.put(name, rawSql);
-  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoBeanManager.java b/src/main/java/io/ebeaninternal/server/dto/DtoBeanManager.java
index 2871b6192..4388a180d 100644
--- a/src/main/java/io/ebeaninternal/server/dto/DtoBeanManager.java
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoBeanManager.java
@@ -1,34 +1,28 @@
 package io.ebeaninternal.server.dto;
 
-import io.ebean.RawSqlBuilder;
 import io.ebean.meta.MetricVisitor;
-import io.ebeaninternal.server.rawsql.SpiRawSql;
 import io.ebeaninternal.server.type.TypeManager;
-import io.ebeaninternal.xmlmapping.model.XmAliasMapping;
-import io.ebeaninternal.xmlmapping.model.XmColumnMapping;
-import io.ebeaninternal.xmlmapping.model.XmDto;
-import io.ebeaninternal.xmlmapping.model.XmEbean;
-import io.ebeaninternal.xmlmapping.model.XmNamedQuery;
-import io.ebeaninternal.xmlmapping.model.XmRawSql;
-import java.util.List;
+
+import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Manages all the DTO bean descriptors.
  */
 public class DtoBeanManager {
 
-  private static final Logger logger = LoggerFactory.getLogger(DtoBeanManager.class);
+  private static final Map<String,String> EMPTY_NAMED_QUERIES = new HashMap<>();
 
   private final TypeManager typeManager;
 
+  private final Map<Class<?>, DtoNamedQueries> namedQueries;
+
   private final Map<Class, DtoBeanDescriptor> descriptorMap = new ConcurrentHashMap<>();
 
-  public DtoBeanManager(TypeManager typeManager) {
+  public DtoBeanManager(TypeManager typeManager, Map<Class<?>, DtoNamedQueries> namedQueries) {
     this.typeManager = typeManager;
+    this.namedQueries = namedQueries;
   }
 
   /**
@@ -44,56 +38,20 @@ public class DtoBeanManager {
 
     try {
       DtoMeta meta = new DtoMetaBuilder(dtoType, typeManager).build();
-      return new DtoBeanDescriptor<>(dtoType, meta);
+      return new DtoBeanDescriptor<>(dtoType, meta, namedQueries(dtoType));
     } catch (Exception e) {
       throw new IllegalStateException(e);
     }
   }
 
+  private <T> Map<String, String> namedQueries(Class<T> dtoType) {
+    DtoNamedQueries namedQueries = this.namedQueries.get(dtoType);
+    return (namedQueries == null) ? EMPTY_NAMED_QUERIES : namedQueries.map();
+  }
+
   public void visitMetrics(MetricVisitor visitor) {
     for (DtoBeanDescriptor value : descriptorMap.values()) {
       value.visit(visitor);
     }
   }
-
-  public void readXmlMapping(ClassLoader classLoader, List<XmEbean> mappings) {
-    for (XmEbean mapping : mappings) {
-      List<XmDto> dtoList = mapping.getDto();
-      for (XmDto dto : dtoList) {
-        readDtoMapping(classLoader, dto);
-      }
-    }
-  }
-
-  private void readDtoMapping(ClassLoader classLoader, XmDto dto) {
-    String dtoClassName = dto.getClazz();
-    Class<?> dtoClass;
-    try {
-      dtoClass = Class.forName(dtoClassName, false, classLoader);
-    } catch (Exception e) {
-      logger.error("Could not load dto bean class " + dtoClassName + " for ebean xml entry");
-      return;
-    }
-
-    DtoBeanDescriptor<?> dtoBeanDescriptor = getDescriptor(dtoClass);
-    if (dtoBeanDescriptor == null) {
-      logger.error("No dto bean for ebean xml entry " + dtoClass);
-
-    } else {
-      for (XmRawSql sql : dto.getRawSql()) {
-        RawSqlBuilder builder = RawSqlBuilder.parse(sql.getQuery().getValue());
-        for (XmColumnMapping columnMapping : sql.getColumnMapping()) {
-          builder.columnMapping(columnMapping.getColumn(), columnMapping.getProperty());
-        }
-        for (XmAliasMapping aliasMapping : sql.getAliasMapping()) {
-          builder.tableAliasMapping(aliasMapping.getAlias(), aliasMapping.getProperty());
-        }
-        dtoBeanDescriptor.addRawSql(sql.getName(), (SpiRawSql)builder.create());
-      }
-
-      for (XmNamedQuery namedQuery : dto.getNamedQuery()) {
-        dtoBeanDescriptor.addNamedQuery(namedQuery.getName(), namedQuery.getQuery().getValue());
-      }
-    }
-  }
 }
diff --git a/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java b/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java
index 3e267349b..79a275e60 100644
--- a/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java
+++ b/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java
@@ -1,6 +1,11 @@
 package io.ebeaninternal.xmlmapping;
 
 import io.ebeaninternal.xmlmapping.model.XmEbean;
+import org.avaje.classpath.scanner.Resource;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -8,10 +13,6 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-import org.avaje.classpath.scanner.Resource;
 
 public class XmlMappingReader {
 
@@ -31,6 +32,9 @@ public class XmlMappingReader {
     }
   }
 
+  /**
+   * Read the deployment XML for the given resource name.
+   */
   public static List<XmEbean> readByResourceName(ClassLoader classLoader, String resourceName){
     try {
       Enumeration<URL> resources = classLoader.getResources(resourceName);
@@ -47,7 +51,10 @@ public class XmlMappingReader {
     }
   }
 
-  public static List<XmEbean> readByResourceList(ClassLoader classLoader, List<Resource> resourceList){
+  /**
+   * Read the deployment XML for the given resources.
+   */
+  public static List<XmEbean> readByResourceList(List<Resource> resourceList){
     try {
       List<XmEbean> mappings = new ArrayList<>();
       for (Resource xmlMappingRes : resourceList) {
diff --git a/src/main/java/io/ebeaninternal/xmlmapping/model/XmDto.java b/src/main/java/io/ebeaninternal/xmlmapping/model/XmDto.java
index cb64fbfa6..57e431322 100644
--- a/src/main/java/io/ebeaninternal/xmlmapping/model/XmDto.java
+++ b/src/main/java/io/ebeaninternal/xmlmapping/model/XmDto.java
@@ -1,13 +1,13 @@
 package io.ebeaninternal.xmlmapping.model;
 
-import java.util.ArrayList;
-import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
 
 
 /**
diff --git a/src/main/java/io/ebeaninternal/xmlmapping/model/XmEbean.java b/src/main/java/io/ebeaninternal/xmlmapping/model/XmEbean.java
index 4979fc865..35ba42d58 100644
--- a/src/main/java/io/ebeaninternal/xmlmapping/model/XmEbean.java
+++ b/src/main/java/io/ebeaninternal/xmlmapping/model/XmEbean.java
@@ -1,12 +1,12 @@
 package io.ebeaninternal.xmlmapping.model;
 
-import java.util.ArrayList;
-import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
 
 
 /**
@@ -67,6 +67,9 @@ public class XmEbean {
     return this.entity;
   }
 
+  /**
+   * Returns the List of XmDto beans.
+   */
   public List<XmDto> getDto() {
     if (dto == null) {
       dto = new ArrayList<>();
diff --git a/src/main/resources/ebean-1.0.xsd b/src/main/resources/ebean-1.0.xsd
index 4a79daecb..63de5f96b 100644
--- a/src/main/resources/ebean-1.0.xsd
+++ b/src/main/resources/ebean-1.0.xsd
@@ -7,8 +7,8 @@
   <xsd:element name="ebean">
     <xsd:complexType>
       <xsd:sequence>
-        <xsd:element ref="entity" minOccurs="1" maxOccurs="unbounded"/>
-        <xsd:element ref="dto" minOccurs="1" maxOccurs="unbounded"/>
+        <xsd:element ref="entity" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element ref="dto" minOccurs="0" maxOccurs="unbounded"/>
       </xsd:sequence>
     </xsd:complexType>
   </xsd:element>
diff --git a/src/test/java/io/ebean/NamedDtoQueryTest.java b/src/test/java/io/ebean/NamedDtoQueryTest.java
index ec3b810e4..510aa709f 100644
--- a/src/test/java/io/ebean/NamedDtoQueryTest.java
+++ b/src/test/java/io/ebean/NamedDtoQueryTest.java
@@ -2,14 +2,15 @@ package io.ebean;
 
 import io.ebean.meta.BasicMetricVisitor;
 import io.ebean.meta.MetaQueryMetric;
-import java.util.List;
-import java.util.Optional;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tests.model.basic.ResetBasicData;
 
+import java.util.List;
+import java.util.Optional;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class NamedDtoQueryTest extends BaseTestCase {
diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index 5f538f9d5..c5c916039 100644
--- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -48,6 +48,9 @@ import io.ebeaninternal.server.core.timezone.DataTimeZone;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.query.CQuery;
 import io.ebeaninternal.server.transaction.RemoteTransactionEvent;
+
+import javax.persistence.OptimisticLockException;
+import javax.persistence.PersistenceException;
 import java.lang.reflect.Type;
 import java.util.Collection;
 import java.util.Collections;
@@ -58,8 +61,6 @@ import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
-import javax.persistence.OptimisticLockException;
-import javax.persistence.PersistenceException;
 
 
 /**
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 3ed29771d..33121aa37 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -169,3 +169,4 @@ ebean.migrationtest.ddl.header=-- Migrationscripts for ebean unittest
 ebean.migrationtest.migration.appName=migrationtest
 ebean.migrationtest.migration.migrationPath=dbmigration/migrationtest
 ebean.migrationtest.migration.strict=true
+

From db5a2b194d6519feb7ba43f4afb725dc8967309c Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 26 Mar 2018 23:31:31 +1300
Subject: [PATCH 0201/1036] No effective change - add extra test coverage on
 DefaultTransactionThreadLocal

---
 .../DefaultTransactionThreadLocalTest.java    | 68 +++++++++++++++++--
 1 file changed, 61 insertions(+), 7 deletions(-)

diff --git a/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java b/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java
index 2480e6ef8..b235b56a6 100644
--- a/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java
+++ b/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java
@@ -2,26 +2,80 @@ package io.ebeaninternal.server.transaction;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.Transaction;
+import io.ebean.annotation.ForPlatform;
+import io.ebean.annotation.Platform;
 import io.ebeaninternal.api.SpiTransaction;
 import org.junit.Test;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
 
 public class DefaultTransactionThreadLocalTest extends BaseTestCase {
 
+  @ForPlatform({Platform.H2})
   @Test
-  public void get() throws Exception {
+  public void get() {
+    Ebean.execute(() -> {
+      SpiTransaction txn = DefaultTransactionThreadLocal.get("h2");
+      assertNotNull(txn);
+    });
 
-    if (isH2()) {
-      Ebean.execute(() -> {
-        SpiTransaction txn = DefaultTransactionThreadLocal.get("h2");
-        assertNotNull(txn);
-      });
+    // thread local should be set to null
+    assertNull(DefaultTransactionThreadLocal.get("h2"));
+  }
 
-      // thread local should be set to null
+  @ForPlatform({Platform.H2})
+  @Test
+  public void tryWithResources_expect_scopeCleanup() {
+
+    try (Transaction transaction = Ebean.beginTransaction()) {
+      assertNotNull(transaction);
+      SpiTransaction txn = DefaultTransactionThreadLocal.get("h2");
+      assertSame(txn, transaction);
+
+      try (Transaction nested = Ebean.beginTransaction()) {
+        assertNotNull(nested);
+        SpiTransaction txnNested = DefaultTransactionThreadLocal.get("h2");
+        assertSame(txnNested, nested);
+      }
+
+      assertNotNull(DefaultTransactionThreadLocal.get("h2"));
+    }
+
+    assertNull(DefaultTransactionThreadLocal.get("h2"));
+  }
+
+  @ForPlatform({Platform.H2})
+  @Test
+  public void afterCommit_expect_scopeCleanup() {
+
+    try (Transaction transaction = Ebean.beginTransaction()) {
+      transaction.commit();
       assertNull(DefaultTransactionThreadLocal.get("h2"));
     }
+    assertNull(DefaultTransactionThreadLocal.get("h2"));
+  }
+
+  @ForPlatform({Platform.H2})
+  @Test
+  public void afterRollback_expect_scopeCleanup() {
+
+    try (Transaction transaction = Ebean.beginTransaction()) {
+
+      transaction.rollback();
+      assertNull(DefaultTransactionThreadLocal.get("h2"));
+    }
+    assertNull(DefaultTransactionThreadLocal.get("h2"));
+  }
+
+  @ForPlatform({Platform.H2})
+  @Test
+  public void end_withoutActiveTransaction_isFine() {
+
+    assertNull(Ebean.currentTransaction());
+    Ebean.endTransaction();
   }
 
 }

From abbcd35ee648833473cc3d58d8252ecab5b2cea0 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 27 Mar 2018 09:14:45 +1300
Subject: [PATCH 0202/1036] #1353 - Use of ebeanServer.commitTransaction() in
 nested transaction doesn't match transction.commit() and closes parent scope

---
 src/main/java/io/ebean/EbeanServer.java       | 52 ++++++++--------
 .../server/core/DefaultServer.java            |  9 ++-
 .../DefaultTransactionScopeManager.java       | 15 -----
 .../transaction/TransactionScopeManager.java  | 16 -----
 .../transaction/TestNestedSubTransaction.java | 62 +++++++++++++++++++
 5 files changed, 94 insertions(+), 60 deletions(-)
 create mode 100644 src/test/java/org/tests/transaction/TestNestedSubTransaction.java

diff --git a/src/main/java/io/ebean/EbeanServer.java b/src/main/java/io/ebean/EbeanServer.java
index 6fbc54b24..1b9157c1f 100644
--- a/src/main/java/io/ebean/EbeanServer.java
+++ b/src/main/java/io/ebean/EbeanServer.java
@@ -521,30 +521,44 @@ public interface EbeanServer {
    * etc.
    * </p>
    * <p>
+   * <h3>Using try with resources</h3>
    * <pre>{@code
    *
    *    // start a transaction (stored in a ThreadLocal)
-   *    ebeanServer.beginTransaction();
+   *
+   *    try (Transaction txn = ebeanServer.beginTransaction()) {
+   *
+   * 	    Order order = ebeanServer.find(Order.class,10);
+   * 	    ...
+   * 	    ebeanServer.save(order);
+   *
+   * 	    txn.commit();
+   *    }
+   *
+   * }</pre>
+   * <p>
+   * <h3>Using try finally block</h3>
+   * <pre>{@code
+   *
+   *    // start a transaction (stored in a ThreadLocal)
+   *    Transaction txn = ebeanServer.beginTransaction();
    *    try {
    * 	    Order order = ebeanServer.find(Order.class,10);
    *
    * 	    ebeanServer.save(order);
    *
-   * 	    ebeanServer.commitTransaction();
+   * 	    txn.commit();
    *
    *    } finally {
-   * 	    // rollback if we didn't commit
-   * 	    // i.e. an exception occurred before commitTransaction().
-   * 	    ebeanServer.endTransaction();
+   * 	    txn.end();
    *    }
    *
    * }</pre>
    * <p>
-   * <h3>Transaction options:</h3>
+   * <h3>Transaction options</h3>
    * <pre>{@code
    *
-   *     Transaction txn = ebeanServer.beginTransaction();
-   *     try {
+   *     try (Transaction txn = ebeanServer.beginTransaction()) {
    *       // explicitly turn on/off JDBC batch use
    *       txn.setBatchMode(true);
    *       txn.setBatchSize(50);
@@ -565,10 +579,6 @@ public interface EbeanServer {
    *       ...
    *
    *       txn.commit();
-   *
-   *    } finally {
-   *       // rollback if necessary
-   *       txn.end();
    *    }
    *
    * }</pre>
@@ -598,19 +608,16 @@ public interface EbeanServer {
    * <pre>{@code
    * // Start a new transaction. If there is a current transaction
    * // suspend it until this transaction ends
-   * Transaction txn = server.beginTransaction(TxScope.requiresNew());
-   * try {
+   * try (Transaction txn = server.beginTransaction(TxScope.requiresNew())) {
    *
    *   ...
    *
    *   // commit the transaction
    *   txn.commit();
    *
-   * } finally {
-   *   // end this transaction which:
-   *   //  A) will rollback transaction if it has not been committed already
+   *   // At end this transaction will:
+   *   //  A) will rollback transaction if it has not been committed
    *   //  B) will restore a previously suspended transaction
-   *   txn.end();
    * }
    *
    * }</pre>
@@ -619,20 +626,13 @@ public interface EbeanServer {
    * <pre>{@code
    *
    * // start a new transaction if there is not a current transaction
-   * Transaction txn = server.beginTransaction(TxScope.required());
-   * try {
+   * try (Transaction txn = server.beginTransaction(TxScope.required())) {
    *
    *   ...
    *
    *   // commit the transaction if it was created or
    *   // do nothing if there was already a current transaction
    *   txn.commit();
-   *
-   * } finally {
-   *   // end this transaction which will rollback the transaction
-   *   // if it was created for this try finally scope and has not
-   *   // already been committed
-   *   txn.end();
    * }
    *
    * }</pre>
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index b4827d155..c131f6722 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -802,7 +802,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    */
   @Override
   public void commitTransaction() {
-    transactionManager.scope().commit();
+    currentTransaction().commit();
   }
 
   /**
@@ -810,7 +810,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    */
   @Override
   public void rollbackTransaction() {
-    transactionManager.scope().rollback();
+    currentTransaction().rollback();
   }
 
   /**
@@ -843,7 +843,10 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    */
   @Override
   public void endTransaction() {
-    transactionManager.scope().end();
+    Transaction transaction = currentTransaction();
+    if (transaction != null) {
+      transaction.end();
+    }
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java
index 0f376b3cb..bf949c231 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java
@@ -17,16 +17,6 @@ public class DefaultTransactionScopeManager extends TransactionScopeManager {
     // do nothing
   }
 
-  @Override
-  public void commit() {
-    DefaultTransactionThreadLocal.commit(serverName);
-  }
-
-  @Override
-  public void end() {
-    DefaultTransactionThreadLocal.end(serverName);
-  }
-
   @Override
   public SpiTransaction getInScope() {
     return DefaultTransactionThreadLocal.get(serverName);
@@ -47,11 +37,6 @@ public class DefaultTransactionScopeManager extends TransactionScopeManager {
     DefaultTransactionThreadLocal.replace(serverName, trans);
   }
 
-  @Override
-  public void rollback() {
-    DefaultTransactionThreadLocal.rollback(serverName);
-  }
-
   @Override
   public void set(SpiTransaction trans) {
     DefaultTransactionThreadLocal.set(serverName, trans);
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java
index 541b07b1d..61f2b8050 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java
@@ -34,22 +34,6 @@ public abstract class TransactionScopeManager implements SpiTransactionScopeMana
    */
   public abstract void set(SpiTransaction trans);
 
-  /**
-   * Commit the current transaction.
-   */
-  public abstract void commit();
-
-  /**
-   * Rollback the current transaction.
-   */
-  public abstract void rollback();
-
-
-  /**
-   * Rollback if required.
-   */
-  public abstract void end();
-
   /**
    * Replace the current transaction with this one.
    * <p>
diff --git a/src/test/java/org/tests/transaction/TestNestedSubTransaction.java b/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
new file mode 100644
index 000000000..f7e9e62e2
--- /dev/null
+++ b/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
@@ -0,0 +1,62 @@
+package org.tests.transaction;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.EbeanServer;
+import io.ebean.PersistenceContextScope;
+import io.ebean.Transaction;
+import org.junit.Test;
+import org.tests.model.basic.EBasic;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertNotNull;
+
+public class TestNestedSubTransaction extends BaseTestCase {
+
+  @Test
+  public void ebeanServer_commitTransaction_expect_sameAsTransactionCommit() {
+
+    EbeanServer server = server();
+
+    EBasic bean = new EBasic("x1");
+
+    try (Transaction txn0 = server.beginTransaction()) {
+      txn0.setRollbackOnly();
+
+      server.save(bean);
+
+      try (Transaction txn1 = server.beginTransaction()) {
+        bean.setName("x2");
+        server.save(bean);
+        //txn1.commit();
+        server.commitTransaction();
+      }
+
+      EBasic fresh = server.find(EBasic.class, bean.getId());
+      assertNotNull(fresh); // FAILS
+      assertThat(fresh.getName()).isEqualTo("x2");
+
+      try (Transaction txn2 = server.beginTransaction()) {
+        bean.setName("barney");
+        Ebean.save(bean);
+        //txn2.commit();
+        server.commitTransaction();
+      }
+
+      fresh = server.find(EBasic.class)
+        .setId(bean.getId())
+        .setPersistenceContextScope(PersistenceContextScope.QUERY)
+        .findOne();
+
+      assertNotNull(fresh);
+      assertThat(fresh.getName()).isEqualTo("barney");
+
+    } finally {
+      cleanup(bean);
+    }
+  }
+
+  private void cleanup(EBasic bean) {
+    Ebean.delete(EBasic.class, bean.getId());
+  }
+}

From eb96c726fd0260c0688f8e4e18f8084d0fb320ef Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 27 Mar 2018 10:47:24 +1300
Subject: [PATCH 0203/1036] No effective change - Modify some tests to use
 transaction try with resources

---
 .../java/io/ebean/TransactionalTestCase.java  |  2 +-
 .../core/DefaultServer_getReferenceTest.java  | 26 ++---
 .../tests/basic/TestLogTransLogOnError.java   | 20 ++--
 .../tests/basic/TestMultipleOneToOneIUD.java  | 14 +--
 .../org/tests/basic/TestQueryForUpdate.java   | 98 ++++++++-----------
 .../tests/cache/TestCacheCollectionIds.java   | 10 +-
 .../org/tests/iud/TestInsertUpdateTrans.java  | 12 +--
 .../xtra/TestDeleteUnloadedChildren.java      | 15 +--
 8 files changed, 78 insertions(+), 119 deletions(-)

diff --git a/src/test/java/io/ebean/TransactionalTestCase.java b/src/test/java/io/ebean/TransactionalTestCase.java
index 64093c213..3fcbb34bc 100644
--- a/src/test/java/io/ebean/TransactionalTestCase.java
+++ b/src/test/java/io/ebean/TransactionalTestCase.java
@@ -5,7 +5,7 @@ import org.junit.Before;
 import org.tests.model.basic.ResetBasicData;
 
 /**
- * Transactional test case. Every test is coverered by a transaction, which is roll backed.
+ * Transactional test case. Every test is covered by a transaction, which is roll backed.
  * So no changes will persist to database.
  *
  * Use this test case if you modify data in your test case, so that the test does not interfere
diff --git a/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java b/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java
index 4ee4d6012..78cea8327 100644
--- a/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java
+++ b/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java
@@ -3,11 +3,11 @@ package io.ebeaninternal.server.core;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import org.junit.Test;
 import org.tests.model.basic.Car;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
 import org.tests.model.basic.Vehicle;
-import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -23,15 +23,11 @@ public class DefaultServer_getReferenceTest extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Ebean.beginTransaction();
-    try {
+    Ebean.execute(() -> {
       Customer loaded = Ebean.find(Customer.class, 1);
       Customer reference = Ebean.getReference(Customer.class, 1);
       assertThat(loaded).isSameAs(reference);
-
-    } finally {
-      Ebean.endTransaction();
-    }
+    });
   }
 
 
@@ -58,16 +54,12 @@ public class DefaultServer_getReferenceTest extends BaseTestCase {
     car.setDriver("TestForRef");
     Ebean.save(car);
 
-    Ebean.beginTransaction();
-    try {
-      Vehicle loaded = Ebean.find(Vehicle.class, car.getId());
-      Vehicle reference = Ebean.getReference(Vehicle.class, car.getId());
-      assertThat(reference).isSameAs(loaded);
-
-    } finally {
-      Ebean.endTransaction();
-    }
-
+    Ebean.execute(() -> {
+        Vehicle loaded = Ebean.find(Vehicle.class, car.getId());
+        Vehicle reference = Ebean.getReference(Vehicle.class, car.getId());
+        assertThat(reference).isSameAs(loaded);
+      }
+    );
     Ebean.delete(car);
   }
 }
diff --git a/src/test/java/org/tests/basic/TestLogTransLogOnError.java b/src/test/java/org/tests/basic/TestLogTransLogOnError.java
index 785d51e68..2c9b4b8cd 100644
--- a/src/test/java/org/tests/basic/TestLogTransLogOnError.java
+++ b/src/test/java/org/tests/basic/TestLogTransLogOnError.java
@@ -2,12 +2,13 @@ package org.tests.basic;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.Transaction;
+import org.junit.Assert;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.EBasicVer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Assert;
-import org.junit.Test;
 
 import java.util.List;
 
@@ -18,8 +19,7 @@ public class TestLogTransLogOnError extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Ebean.beginTransaction();
-    try {
+    try (Transaction txn = Ebean.beginTransaction()) {
 
       Ebean.find(Customer.class).findList();
       Ebean.find(Order.class).where().gt("id", 1).findList();
@@ -35,13 +35,11 @@ public class TestLogTransLogOnError extends BaseTestCase {
       Assert.assertEquals(0, list.size());
       // Get here with mysql?
       // Assert.assertTrue(false);
+      txn.commit();
 
     } catch (RuntimeException e) {
       // e.printStackTrace();
       Assert.assertTrue(true);
-
-    } finally {
-      Ebean.endTransaction();
     }
   }
 
@@ -49,8 +47,7 @@ public class TestLogTransLogOnError extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Ebean.beginTransaction();
-    try {
+    try (Transaction txn = Ebean.beginTransaction()) {
       Ebean.find(Customer.class).findList();
 
       EBasicVer newBean = new EBasicVer("aName");
@@ -65,14 +62,11 @@ public class TestLogTransLogOnError extends BaseTestCase {
 
       // never get here
       Assert.assertTrue(false);
+      txn.commit();
 
     } catch (RuntimeException e) {
       // e.printStackTrace();
       Assert.assertTrue(true);
-
-    } finally {
-      Ebean.endTransaction();
     }
-
   }
 }
diff --git a/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java b/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java
index 64e913279..57a0a8fc2 100644
--- a/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java
+++ b/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java
@@ -2,11 +2,12 @@ package org.tests.basic;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.Transaction;
+import org.junit.Assert;
+import org.junit.Test;
 import org.tests.model.basic.OCar;
 import org.tests.model.basic.OEngine;
 import org.tests.model.basic.OGearBox;
-import org.junit.Assert;
-import org.junit.Test;
 
 public class TestMultipleOneToOneIUD extends BaseTestCase {
 
@@ -25,19 +26,14 @@ public class TestMultipleOneToOneIUD extends BaseTestCase {
     car.setName("test car");
     car.setEngine(engine);
 
-    Ebean.beginTransaction();
-    try {
+    try (Transaction txn = Ebean.beginTransaction()) {
       Ebean.save(gearBox);
       Ebean.save(car);
 
       Assert.assertNotNull(car.getId());
       Assert.assertNotNull(engine.getEngineId());
       Assert.assertNotNull(gearBox.getId());
-
-      Ebean.commitTransaction();
-
-    } finally {
-      Ebean.endTransaction();
+      txn.commit();
     }
 
     OCar c2 = Ebean.find(OCar.class, car.getId());
diff --git a/src/test/java/org/tests/basic/TestQueryForUpdate.java b/src/test/java/org/tests/basic/TestQueryForUpdate.java
index c78aaebaa..c72884b89 100644
--- a/src/test/java/org/tests/basic/TestQueryForUpdate.java
+++ b/src/test/java/org/tests/basic/TestQueryForUpdate.java
@@ -29,10 +29,10 @@ public class TestQueryForUpdate extends BaseTestCase {
     ResetBasicData.reset();
 
     Query<Customer> query = Ebean.find(Customer.class)
-        .forUpdate()
-        .order().desc("id");
+      .forUpdate()
+      .order().desc("id");
 
-      query.findList();
+    query.findList();
     if (isSqlServer()) {
       assertThat(sqlOf(query)).contains("with (updlock)");
     } else {
@@ -48,25 +48,19 @@ public class TestQueryForUpdate extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Ebean.beginTransaction();
-    try {
-      Query<Customer> query = Ebean.find(Customer.class)
-        .forUpdateNoWait()
-        .order().desc("id");
+    Query<Customer> query = Ebean.find(Customer.class)
+      .forUpdateNoWait()
+      .order().desc("id");
 
-      query.findList();
-      if (isOracle()) {
-        assertThat(sqlOf(query)).contains("for update nowait");
-      } else if (isH2()) {
-        assertThat(sqlOf(query)).contains("for update");
-      } else if (isSqlServer()) {
-        assertThat(sqlOf(query)).contains("with (updlock,nowait)");
-      } else {
-        assertThat(sqlOf(query)).contains("for update nowait");
-      }
-
-    } finally {
-      Ebean.endTransaction();
+    query.findList();
+    if (isOracle()) {
+      assertThat(sqlOf(query)).contains("for update nowait");
+    } else if (isH2()) {
+      assertThat(sqlOf(query)).contains("for update");
+    } else if (isSqlServer()) {
+      assertThat(sqlOf(query)).contains("with (updlock,nowait)");
+    } else {
+      assertThat(sqlOf(query)).contains("for update nowait");
     }
   }
 
@@ -80,42 +74,36 @@ public class TestQueryForUpdate extends BaseTestCase {
 
     EbeanServer server = Ebean.getDefaultServer();
 
-      Ebean.beginTransaction();
-      try {
-        Query<Customer> query = Ebean.find(Customer.class)
-          .forUpdateNoWait()
-          .setMaxRows(1)
-          .order().desc("id");
+    try (Transaction txn = Ebean.beginTransaction()) {
+      Query<Customer> query = Ebean.find(Customer.class)
+        .forUpdateNoWait()
+        .setMaxRows(1)
+        .order().desc("id");
 
-        List<Customer> list = query.findList();
-        Customer first = list.get(0);
-        if (isSqlServer()) {
-          assertThat(sqlOf(query)).contains("with (updlock,nowait)");
-        } else if (isH2()){
-          assertThat(sqlOf(query)).contains("for update");
-        } else {
-          assertThat(sqlOf(query)).contains("for update nowait");
-        }
-        // create a 2nd transaction to test that the
-        // row is locked and we can't acquire it
-        Transaction txn2 = server.createTransaction();
-        try {
-          logger.info("... attempt another acquire using 2nd transaction");
-          Query<Customer> query2 =
-            server.find(Customer.class)
-              .where().idEq(first.getId())
-              .forUpdateNoWait();
+      List<Customer> list = query.findList();
+      Customer first = list.get(0);
+      if (isSqlServer()) {
+        assertThat(sqlOf(query)).contains("with (updlock,nowait)");
+      } else if (isH2()) {
+        assertThat(sqlOf(query)).contains("for update");
+      } else {
+        assertThat(sqlOf(query)).contains("for update nowait");
+      }
+      // create a 2nd transaction to test that the
+      // row is locked and we can't acquire it
+      try (Transaction txn2 = server.createTransaction()) {
+        logger.info("... attempt another acquire using 2nd transaction");
+        Query<Customer> query2 =
+          server.find(Customer.class)
+            .where().idEq(first.getId())
+            .forUpdateNoWait();
 
-          server.findOne(query2, txn2);
-          assertTrue(false); // never get here
-        } catch (AcquireLockException e) {
-          logger.info("... got AcquireLockException " + e);
-        } finally {
-          txn2.end();
-        }
-
-    } finally {
-      Ebean.endTransaction();
+        server.findOne(query2, txn2);
+        assertTrue(false); // never get here
+      } catch (AcquireLockException e) {
+        logger.info("... got AcquireLockException " + e);
+      }
+      txn.commit();
     }
   }
 }
diff --git a/src/test/java/org/tests/cache/TestCacheCollectionIds.java b/src/test/java/org/tests/cache/TestCacheCollectionIds.java
index b3e231195..515fb901f 100644
--- a/src/test/java/org/tests/cache/TestCacheCollectionIds.java
+++ b/src/test/java/org/tests/cache/TestCacheCollectionIds.java
@@ -4,6 +4,7 @@ import io.ebean.BaseTestCase;
 import io.ebean.CacheMode;
 import io.ebean.Ebean;
 import io.ebean.SqlUpdate;
+import io.ebean.Transaction;
 import io.ebean.Update;
 import io.ebean.cache.ServerCache;
 import io.ebean.cache.ServerCacheManager;
@@ -253,8 +254,7 @@ public class TestCacheCollectionIds extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Ebean.beginTransaction();
-    try {
+    try (Transaction txn = Ebean.beginTransaction()) {
 
       OCachedBean cachedBean = new OCachedBean();
       cachedBean.setName("helloForUpdate");
@@ -272,9 +272,7 @@ public class TestCacheCollectionIds extends BaseTestCase {
       cachedBean.setName("mod2");
       Ebean.save(cachedBean);
 
-      Ebean.commitTransaction();
-    } finally {
-      Ebean.endTransaction();
+      txn.commit();
     }
 
 
@@ -340,7 +338,7 @@ public class TestCacheCollectionIds extends BaseTestCase {
     Assert.assertEquals(1, rows);
 
     // We need to notify the cache manually
-    Ebean.externalModification("o_order_detail",false, false, true);
+    Ebean.externalModification("o_order_detail", false, false, true);
 
     // read the order from cache
     Order orderFromCache = Ebean.find(Order.class, 1L);
diff --git a/src/test/java/org/tests/iud/TestInsertUpdateTrans.java b/src/test/java/org/tests/iud/TestInsertUpdateTrans.java
index 01f79b933..32dc30f16 100644
--- a/src/test/java/org/tests/iud/TestInsertUpdateTrans.java
+++ b/src/test/java/org/tests/iud/TestInsertUpdateTrans.java
@@ -2,17 +2,17 @@ package org.tests.iud;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
-import org.tests.model.basic.EBasicVer;
+import io.ebean.Transaction;
 import org.junit.Assert;
 import org.junit.Test;
+import org.tests.model.basic.EBasicVer;
 
 public class TestInsertUpdateTrans extends BaseTestCase {
 
   @Test
   public void test() {
 
-    Ebean.beginTransaction();
-    try {
+    try (Transaction txn = Ebean.beginTransaction()) {
 
       EBasicVer e0 = new EBasicVer("onInsert");
       e0.setDescription("something");
@@ -34,11 +34,7 @@ public class TestInsertUpdateTrans extends BaseTestCase {
       Assert.assertEquals("onUpdate", e1.getName());
       Assert.assertEquals("differentFromInsert", e1.getDescription());
 
-
-      Ebean.commitTransaction();
-
-    } finally {
-      Ebean.endTransaction();
+      txn.commit();
     }
   }
 }
diff --git a/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java b/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java
index edc220a13..2291bd0b7 100644
--- a/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java
+++ b/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java
@@ -3,6 +3,7 @@ package org.tests.model.basic.xtra;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.SqlUpdate;
+import io.ebean.Transaction;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -11,8 +12,7 @@ public class TestDeleteUnloadedChildren extends BaseTestCase {
 
   private void init() {
 
-    Ebean.beginTransaction();
-    try {
+    try (Transaction txn = Ebean.beginTransaction()) {
       String sql;
       SqlUpdate delete;
 
@@ -48,9 +48,7 @@ public class TestDeleteUnloadedChildren extends BaseTestCase {
 
       Ebean.save(extendedParent);
 
-      Ebean.commitTransaction();
-    } finally {
-      Ebean.endTransaction();
+      txn.commit();
     }
   }
 
@@ -59,15 +57,12 @@ public class TestDeleteUnloadedChildren extends BaseTestCase {
 
     init();
 
-    Ebean.beginTransaction();
-    try {
+    try (Transaction txn = Ebean.beginTransaction()) {
       EdParent parent = Ebean.find(EdParent.class).where().eq("name", "MyComputer").findOne();
       // // Works only if the following statement is included
       // int x = parent.getChildren().size();
       Ebean.delete(parent);
-      Ebean.commitTransaction();
-    } finally {
-      Ebean.endTransaction();
+      txn.commit();
     }
   }
 

From 4ef581f87c585d5d5e484f2af597cfed9e9351df Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 27 Mar 2018 17:16:35 +1300
Subject: [PATCH 0204/1036] No effective change - Update agent in pom to
 11.11.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0005b29df..abf1a3e82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -224,7 +224,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-agent</artifactId>
-      <version>11.10.1</version>
+      <version>11.11.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -297,7 +297,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>11.10.1</version>
+        <version>11.11.1</version>
         <executions>
           <execution>
             <id>test</id>

From dfa7b765f972cb1b33849edd99bcff9cd72e039d Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 27 Mar 2018 22:58:19 +1300
Subject: [PATCH 0205/1036] #1354 - ENH: Add SqlUpdate setNextParameter() ...
 as alternative for positioned parameters

---
 src/main/java/io/ebean/SqlUpdate.java         | 38 ++++++++++++++++++-
 .../server/core/DefaultSqlUpdate.java         |  4 +-
 .../TestPersistenceContextQueryScope.java     |  6 +--
 .../tests/rawsql/TestInsertSqlLogging.java    | 32 ++++++++++++----
 4 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/src/main/java/io/ebean/SqlUpdate.java b/src/main/java/io/ebean/SqlUpdate.java
index 59865f815..87364334d 100644
--- a/src/main/java/io/ebean/SqlUpdate.java
+++ b/src/main/java/io/ebean/SqlUpdate.java
@@ -30,6 +30,35 @@ package io.ebean;
  * String msg = "There were " + modifiedCount + " rows updated";
  *
  * }</pre>
+ * <p>
+ * <h3>Example: Using setNextParameter()</h3>
+ * <pre>{@code
+ *
+ *  String sql = "insert into audit_log (id, description, modified_description) values (?,?,?)";
+ *  SqlUpdate insert = Ebean.createSqlUpdate(sql);
+ *
+ *  try (Transaction txn = Ebean.beginTransaction()) {
+ *    txn.setBatchMode(true);
+ *
+ *    insert.setNextParameter(10000);
+ *    insert.setNextParameter("hello");
+ *    insert.setNextParameter("rob");
+ *    insert.execute();
+ *
+ *    insert.setNextParameter(10001);
+ *    insert.setNextParameter("goodbye");
+ *    insert.setNextParameter("rob");
+ *    insert.execute();
+ *
+ *    insert.setNextParameter(10002);
+ *    insert.setNextParameter("chow");
+ *    insert.setNextParameter("bob");
+ *    insert.execute();
+ *
+ *    txn.commit();
+ *  }
+ *
+ * }</pre>
  *
  * @see Update
  * @see SqlQuery
@@ -61,7 +90,7 @@ public interface SqlUpdate {
 
   /**
    * Execute and return the generated key. This is effectively a short cut for:
-   *
+   * <p>
    * <pre>{@code
    *
    *   sqlUpdate.execute();
@@ -137,6 +166,13 @@ public interface SqlUpdate {
    */
   SqlUpdate setTimeout(int secs);
 
+  /**
+   * Set the next positioned parameter.
+   *
+   * @param value The value to bind
+   */
+  SqlUpdate setNextParameter(Object value);
+
   /**
    * Set a parameter via its index position.
    */
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java b/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
index c65b6c269..28869a8c3 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
@@ -105,6 +105,7 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
 
   @Override
   public int execute() {
+    addPos = 0;
     if (server != null) {
       return server.execute(this);
     } else {
@@ -182,8 +183,9 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
     return this;
   }
 
-  public void addParameter(Object value) {
+  public SqlUpdate setNextParameter(Object value) {
     setParameter(++addPos, value);
+    return this;
   }
 
   @Override
diff --git a/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java b/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java
index 367ec77ac..2221a7424 100644
--- a/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java
+++ b/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java
@@ -3,8 +3,8 @@ package org.tests.persistencecontext;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.SqlUpdate;
-import org.tests.model.basic.EBasicVer;
 import org.junit.Test;
+import org.tests.model.basic.EBasicVer;
 
 import static io.ebean.PersistenceContextScope.QUERY;
 import static io.ebean.PersistenceContextScope.TRANSACTION;
@@ -28,8 +28,8 @@ public class TestPersistenceContextQueryScope extends BaseTestCase {
 
       // do an update of the name in the DB
       SqlUpdate sqlUpdate = Ebean.createSqlUpdate("update e_basicver set name=? where id=?");
-      sqlUpdate.setParameter(1, "second");
-      sqlUpdate.setParameter(2, bean.getId());
+      sqlUpdate.setNextParameter("second");
+      sqlUpdate.setNextParameter(bean.getId());
       int rowCount = sqlUpdate.execute();
       assertEquals(1, rowCount);
 
diff --git a/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java b/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java
index 0d0c1824b..44e7ceef3 100644
--- a/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java
+++ b/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java
@@ -5,8 +5,8 @@ import io.ebean.Ebean;
 import io.ebean.SqlUpdate;
 import io.ebean.Transaction;
 import io.ebeaninternal.api.SpiTransaction;
-import org.tests.idkeys.db.AuditLog;
 import org.junit.Test;
+import org.tests.idkeys.db.AuditLog;
 
 import static org.junit.Assert.assertFalse;
 
@@ -15,15 +15,33 @@ public class TestInsertSqlLogging extends BaseTestCase {
   @Test
   public void test() {
 
-    Ebean.delete(AuditLog.class, 10000);
+    Ebean.find(AuditLog.class).where().ge("id", 10000).delete();
 
     String sql = "insert into audit_log (id, description, modified_description) values (?,?,?)";
-    SqlUpdate sqlUpdate = Ebean.createSqlUpdate(sql);
-    sqlUpdate.setParameter(1, 10000);
-    sqlUpdate.setParameter(2, "hello");
-    sqlUpdate.setParameter(3, "rob");
+    SqlUpdate insert = Ebean.createSqlUpdate(sql);
+
+    try (Transaction txn = Ebean.beginTransaction()) {
+      txn.setBatchMode(true);
+      txn.setBatchSize(2);
+
+      insert.setNextParameter(10000);
+      insert.setNextParameter("hello");
+      insert.setNextParameter("rob");
+      insert.execute();
+
+      insert.setNextParameter(10001);
+      insert.setNextParameter("goodbye");
+      insert.setNextParameter("rob");
+      insert.execute();
+
+      insert.setNextParameter(10002);
+      insert.setNextParameter("chow");
+      insert.setNextParameter("bob");
+      insert.execute();
+
+      txn.commit();
+    }
 
-    sqlUpdate.execute();
   }
 
   @Test

From 534eb2f0e2f224b22f96f054037184eb5a1528fe Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 27 Mar 2018 23:24:30 +1300
Subject: [PATCH 0206/1036] #1354 - ENH: Add SqlUpdate setNextParameter() ...
 as alternative for positioned parameters

---
 src/main/java/io/ebeaninternal/api/SpiSqlUpdate.java       | 5 +++++
 .../io/ebeaninternal/server/core/DefaultSqlUpdate.java     | 6 +++++-
 .../ebeaninternal/server/core/PersistRequestUpdateSql.java | 7 ++++---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/api/SpiSqlUpdate.java b/src/main/java/io/ebeaninternal/api/SpiSqlUpdate.java
index 10c7ccad7..a7c8c6e7f 100644
--- a/src/main/java/io/ebeaninternal/api/SpiSqlUpdate.java
+++ b/src/main/java/io/ebeaninternal/api/SpiSqlUpdate.java
@@ -23,4 +23,9 @@ public interface SpiSqlUpdate extends SqlUpdate {
    * Set the generated key value.
    */
   void setGeneratedKey(Object idValue);
+
+  /**
+   * Reset bind position to be ready for another bind execute.
+   */
+  void reset();
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java b/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
index 28869a8c3..92e40b48b 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
@@ -97,6 +97,11 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
     this(null, sql, new BindParams());
   }
 
+  @Override
+  public void reset() {
+    addPos = 0;
+  }
+
   @Override
   public Object executeGetKey() {
     execute();
@@ -105,7 +110,6 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
 
   @Override
   public int execute() {
-    addPos = 0;
     if (server != null) {
       return server.execute(this);
     } else {
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
index 5261de3f9..202eb5141 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
@@ -30,12 +30,13 @@ public final class PersistRequestUpdateSql extends PersistRequest {
   /**
    * Create.
    */
-  public PersistRequestUpdateSql(SpiEbeanServer server, SqlUpdate updateSql,
+  public PersistRequestUpdateSql(SpiEbeanServer server, SqlUpdate sqlUpdate,
                                  SpiTransaction t, PersistExecute persistExecute) {
 
-    super(server, t, persistExecute, updateSql.getLabel());
+    super(server, t, persistExecute, sqlUpdate.getLabel());
     this.type = Type.UPDATESQL;
-    this.updateSql = (SpiSqlUpdate) updateSql;
+    this.updateSql = (SpiSqlUpdate) sqlUpdate;
+    updateSql.reset();
   }
 
   @Override

From cca837bcfa43a666c1f03e9d95d4aeb7b6d17121 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 28 Mar 2018 00:45:12 +1300
Subject: [PATCH 0207/1036] #1354 - ENH: Add SqlUpdate setNextParameter() ...
 as alternative for positioned parameters

---
 .../io/ebeaninternal/server/deploy/BeanDescriptor.java    | 2 +-
 .../io/ebeaninternal/server/deploy/BeanPropertyAssoc.java | 8 ++++----
 .../ebeaninternal/server/deploy/id/IdBinderEmbedded.java  | 2 +-
 .../io/ebeaninternal/server/deploy/id/IdBinderSimple.java | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 8a9d0fa4b..5bbd28ee8 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -1015,7 +1015,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
 
     Object[] bindValues = idBinder.getBindValues(id);
     for (Object bindValue : bindValues) {
-      sqlDelete.addParameter(bindValue);
+      sqlDelete.setNextParameter(bindValue);
     }
 
     return sqlDelete;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
index cbe81bcbb..7fa20d8d6 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
@@ -482,12 +482,12 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
   void bindParentIds(DefaultSqlUpdate delete, List<Object> parentIds) {
 
     if (isExportedSimple()) {
-      delete.addParameter(new MultiValueWrapper(parentIds));
+      delete.setNextParameter(new MultiValueWrapper(parentIds));
     } else {
       // embedded ids etc
       List<Object> bindValues = flattenParentIds(parentIds);
       for (Object bindValue : bindValues) {
-        delete.addParameter(bindValue);
+        delete.setNextParameter(bindValue);
       }
     }
   }
@@ -495,12 +495,12 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
   void bindParentId(DefaultSqlUpdate sqlUpd, Object parentId) {
 
     if (isExportedSimple()) {
-      sqlUpd.addParameter(parentId);
+      sqlUpd.setNextParameter(parentId);
       return;
     }
     EntityBean parent = (EntityBean) parentId;
     for (ExportedProperty exportedProperty : exportedProperties) {
-      sqlUpd.addParameter(exportedProperty.getValue(parent));
+      sqlUpd.setNextParameter(exportedProperty.getValue(parent));
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java
index 5013b2d9e..c78e9ba25 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java
@@ -277,7 +277,7 @@ public final class IdBinderEmbedded implements IdBinder {
   public void bindId(DefaultSqlUpdate sqlUpdate, Object value) {
     for (BeanProperty prop : props) {
       Object embFieldValue = prop.getValue((EntityBean) value);
-      sqlUpdate.addParameter(embFieldValue);
+      sqlUpdate.setNextParameter(embFieldValue);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
index a4da8e3f2..f424f4662 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
@@ -146,7 +146,7 @@ public final class IdBinderSimple implements IdBinder {
 
   @Override
   public void addIdInBindValues(DefaultSqlUpdate sqlUpdate, Collection<?> ids) {
-    sqlUpdate.addParameter(new MultiValueWrapper(ids));
+    sqlUpdate.setNextParameter(new MultiValueWrapper(ids));
   }
 
   @Override
@@ -171,7 +171,7 @@ public final class IdBinderSimple implements IdBinder {
 
   @Override
   public void bindId(DefaultSqlUpdate sqlUpdate, Object value) {
-    sqlUpdate.addParameter(value);
+    sqlUpdate.setNextParameter(value);
   }
 
   @Override

From 57870aaa058966f73efb3078edaeccac75ad6841 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 28 Mar 2018 13:22:46 +1300
Subject: [PATCH 0208/1036] #115 - Mapping - Add support for @ElementCollection
 enhancement

Add embedded bean support
---
 .../java/io/ebean/bean/BeanCollection.java    |   5 +
 .../ebean/common/AbstractBeanCollection.java  |   3 +-
 .../server/deploy/BeanCollectionUtil.java     |  10 ++
 .../server/deploy/BeanDescriptor.java         |  31 +++-
 .../server/deploy/BeanDescriptorElement.java  |  59 +++----
 .../deploy/BeanDescriptorElementEmbedded.java |  79 ++++++++++
 .../BeanDescriptorElementEmbeddedMap.java     |  84 ++++++++++
 .../deploy/BeanDescriptorElementMap.java      |  97 ------------
 .../deploy/BeanDescriptorElementScalar.java   |  56 +++++++
 .../BeanDescriptorElementScalarMap.java       |  88 +++++++++++
 .../server/deploy/BeanDescriptorJsonHelp.java |   2 +-
 .../server/deploy/BeanDescriptorManager.java  |  16 +-
 .../server/deploy/BeanPropertyAssocMany.java  |  38 ++++-
 .../deploy/BeanPropertySimpleCollection.java  |  32 +---
 .../meta/DeployBeanPropertyAssocMany.java     |  11 ++
 .../deploy/parse/AnnotationAssocManys.java    |  42 +++--
 .../server/persist/DefaultPersister.java      |   4 +-
 .../server/persist/SaveManyBase.java          |  14 ++
 .../server/persist/SaveManyBeans.java         |  14 --
 ...on.java => SaveManyElementCollection.java} |  19 ++-
 ...java => SaveManyElementCollectionMap.java} |  23 +--
 .../server/type/TypeReflectHelper.java        |   7 +
 .../model/elementcollection/EcPhone.java      |  52 ++++++
 .../model/elementcollection/EcblPerson.java   |  67 ++++++++
 .../model/elementcollection/EcbmPerson.java   |  68 ++++++++
 .../TestElementCollectionBasic.java           |  89 ++++++++++-
 .../TestElementCollectionBasicMap.java        | 103 ++++++++++--
 .../TestElementCollectionBasicSet.java        |  88 ++++++++++-
 .../TestElementCollectionEmbeddedList.java    | 148 ++++++++++++++++++
 .../TestElementCollectionEmbeddedMap.java     | 141 +++++++++++++++++
 30 files changed, 1247 insertions(+), 243 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java
 delete mode 100644 src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementMap.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalar.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java
 rename src/main/java/io/ebeaninternal/server/persist/{SaveManySimpleCollection.java => SaveManyElementCollection.java} (64%)
 rename src/main/java/io/ebeaninternal/server/persist/{SaveManySimpleMap.java => SaveManyElementCollectionMap.java} (57%)
 create mode 100644 src/test/java/org/tests/model/elementcollection/EcPhone.java
 create mode 100644 src/test/java/org/tests/model/elementcollection/EcblPerson.java
 create mode 100644 src/test/java/org/tests/model/elementcollection/EcbmPerson.java
 create mode 100644 src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java
 create mode 100644 src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java

diff --git a/src/main/java/io/ebean/bean/BeanCollection.java b/src/main/java/io/ebean/bean/BeanCollection.java
index 8c3b95b08..3ec5163e3 100644
--- a/src/main/java/io/ebean/bean/BeanCollection.java
+++ b/src/main/java/io/ebean/bean/BeanCollection.java
@@ -72,6 +72,11 @@ public interface BeanCollection<E> extends Serializable {
    */
   boolean isSkipSave();
 
+  /**
+   * Return true if the collection holds modifications.
+   */
+  boolean holdsModifications();
+
   /**
    * Return the bean that owns this collection.
    */
diff --git a/src/main/java/io/ebean/common/AbstractBeanCollection.java b/src/main/java/io/ebean/common/AbstractBeanCollection.java
index e4641814a..ca5493d2a 100644
--- a/src/main/java/io/ebean/common/AbstractBeanCollection.java
+++ b/src/main/java/io/ebean/common/AbstractBeanCollection.java
@@ -207,7 +207,8 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
   /**
    * Return true if there are underlying additions or removals.
    */
-  boolean holdsModifications() {
+  @Override
+  public boolean holdsModifications() {
     return modifyHolder != null && modifyHolder.hasModifications();
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java
index 40171b0da..0b8d46dcf 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java
@@ -11,6 +11,16 @@ import java.util.Map;
  */
 public class BeanCollectionUtil {
 
+  /**
+   * Return true if this is a bean collection and not considered dirty.
+   */
+  public static boolean isModified(Object collection) {
+    if ((collection instanceof BeanCollection<?>)) {
+      return ((BeanCollection<?>) collection).holdsModifications();
+    }
+    return true;
+  }
+
   /**
    * Return the details of the collection or map taking care to avoid
    * unnecessary fetching of the data.
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 5bbd28ee8..620b6e1fd 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -235,7 +235,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * The type of bean this describes.
    */
-  private final Class<T> beanType;
+  final Class<T> beanType;
 
   protected final Class<?> rootBeanType;
 
@@ -428,8 +428,8 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     this.name = InternString.intern(deploy.getName());
     this.baseTableAlias = "t0";
     this.fullName = InternString.intern(deploy.getFullName());
-    this.locationById = ProfileLocation.createAt(fullName+".byId");
-    this.locationAll = ProfileLocation.createAt(fullName+".all");
+    this.locationById = ProfileLocation.createAt(fullName + ".byId");
+    this.locationAll = ProfileLocation.createAt(fullName + ".all");
     this.profileBeanId = deploy.getProfileId();
     this.beanType = deploy.getBeanType();
     this.rootBeanType = PersistenceContextUtil.root(beanType);
@@ -776,7 +776,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
 
     for (BeanProperty prop : propertiesNonTransient) {
       if (prop.isUnique()) {
-        propertiesUnique.add(new BeanProperty[] { prop });
+        propertiesUnique.add(new BeanProperty[]{prop});
       }
     }
     // convert unique columns to properties
@@ -860,6 +860,16 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     }
   }
 
+  /**
+   * Bind all the property values to the SqlUpdate.
+   */
+  public void bindElementValue(SqlUpdate insert, Object value) {
+    EntityBean bean = (EntityBean) value;
+    for (BeanProperty property : propertiesBaseScalar) {
+      insert.setNextParameter(property.getValue(bean));
+    }
+  }
+
   /**
    * Return the ReadAuditLogger for logging read audit events.
    */
@@ -1420,7 +1430,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   @SuppressWarnings("unchecked")
   public void cacheBeanPutAll(Collection<?> beans) {
     if (!beans.isEmpty()) {
-      cacheHelp.beanPutAll((Collection<EntityBean>)beans);
+      cacheHelp.beanPutAll((Collection<EntityBean>) beans);
     }
   }
 
@@ -1879,12 +1889,19 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   }
 
   /**
-   * Creates a new entitybean without invoking {@link BeanPostConstructListener#postCreate(Object)}
+   * Creates a new entity bean without invoking {@link BeanPostConstructListener#postCreate(Object)}
    */
   public EntityBean createEntityBean() {
     return createEntityBean(false);
   }
 
+  /**
+   * Create an entity bean for JSON marshalling (which differs for the element collection case).
+   */
+  public EntityBean createEntityBeanForJson() {
+    return createEntityBean();
+  }
+
   /**
    * Create a reference bean based on the id.
    */
@@ -2471,7 +2488,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
 
   /**
    * Return a property that is part of the SQL tree.
-   *
+   * <p>
    * The property can be a dynamic formula or a well known bean property.
    */
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java
index a1c23603a..0790ba10e 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java
@@ -1,34 +1,35 @@
 package io.ebeaninternal.server.deploy;
 
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
-import io.ebean.PersistenceIOException;
 import io.ebean.bean.EntityBean;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
-import io.ebeaninternal.server.text.json.ReadJson;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
 import io.ebeaninternal.server.type.ScalarType;
 
-import java.io.IOException;
+import java.util.Arrays;
 
 /**
  * Bean descriptor used with ElementCollection (where we don't have a mapped type/class).
+ * <p>
+ * This is somewhat a BeanDescriptor created 'on the fly' for a specific element collection property
+ * with a unidirectional property and mapping etc specific to the property (and not the type if embedded).
  */
-class BeanDescriptorElement<T> extends BeanDescriptor<T> {
+abstract class BeanDescriptorElement<T> extends BeanDescriptor<T> {
 
-  private final ScalarType<Object> scalarType;
-  private final ElementHelp elementHelp;
+  final ElementHelp elementHelp;
 
   BeanDescriptorElement(BeanDescriptorMap owner, DeployBeanDescriptor<T> deploy, ElementHelp elementHelp) {
     super(owner, deploy);
     this.elementHelp = elementHelp;
+  }
 
-    BeanProperty[] props = propertiesNonTransient();
-    if (props.length == 1) {
-      this.scalarType = props[0].getScalarType();
-    } else {
-      this.scalarType = null;
+  /**
+   * Find and return the first base scalar type (and we expect only 1).
+   */
+  ScalarType<Object> firstBaseScalarType() {
+    BeanProperty[] props = propertiesBaseScalar();
+    if (props.length != 1) {
+      throw new IllegalStateException("Expecting 1 property for element scalar but got " + Arrays.toString(props));
     }
+    return props[0].getScalarType();
   }
 
   @Override
@@ -36,35 +37,13 @@ class BeanDescriptorElement<T> extends BeanDescriptor<T> {
     return true;
   }
 
+  /**
+   * Our entity beans used are somewhat fake ones (ElementEntityBean) such that we hold the unidirectional property
+   * value (foreign key) and the actual element collection value (scalar or embedded plus map key).
+   */
   @Override
   protected EntityBean createPrototypeEntityBean(Class<T> beanType) {
     return new ElementEntityBean(properties);
   }
 
-  @Override
-  public void jsonWriteElement(SpiJsonWriter ctx, Object element) {
-    try {
-      scalarType.jsonWrite(ctx.gen(), element);
-    } catch (IOException e) {
-      throw new PersistenceIOException(e);
-    }
-  }
-
-  @Override
-  public Object jsonReadCollection(ReadJson readJson, EntityBean parentBean) throws IOException {
-
-    JsonParser parser = readJson.getParser();
-    ElementCollector add = elementHelp.createCollector();
-    do {
-      JsonToken token = parser.nextToken();
-      if (JsonToken.VALUE_NULL == token || JsonToken.END_ARRAY == token) {
-        break;
-      }
-      Object element = scalarType.jsonRead(parser);
-      add.addElement(element);
-    } while (true);
-
-    return add.collection();
-  }
-
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java
new file mode 100644
index 000000000..cb17a9492
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java
@@ -0,0 +1,79 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebean.PersistenceIOException;
+import io.ebean.SqlUpdate;
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
+import io.ebeaninternal.server.text.json.ReadJson;
+import io.ebeaninternal.server.text.json.SpiJsonWriter;
+
+import java.io.IOException;
+
+/**
+ * Bean descriptor used with element collection of list/set of embeddable.
+ */
+class BeanDescriptorElementEmbedded<T> extends BeanDescriptorElement<T> {
+
+  private final BeanPropertyAssocOne embeddedProperty;
+
+  private final EntityBean prototype;
+
+  private BeanDescriptor targetDescriptor;
+
+  BeanDescriptorElementEmbedded(BeanDescriptorMap owner, DeployBeanDescriptor<T> deploy, ElementHelp elementHelp) {
+    super(owner, deploy, elementHelp);
+    try {
+      this.prototype = (EntityBean) beanType.newInstance();
+    } catch (Exception e) {
+      throw new IllegalStateException("Unable to create entity bean prototype for "+beanType);
+    }
+    BeanPropertyAssocOne<?>[] embedded = propertiesEmbedded();
+    if (embedded.length == 1) {
+      embeddedProperty = embedded[0];
+    } else {
+      embeddedProperty = null;
+    }
+  }
+
+  @Override
+  public void initialiseOther(BeanDescriptorInitContext initContext) {
+    super.initialiseOther(initContext);
+    this.targetDescriptor = embeddedProperty.getTargetDescriptor();
+  }
+
+  @Override
+  public EntityBean createEntityBeanForJson() {
+    return (EntityBean)prototype._ebean_newInstance();
+  }
+
+  public void bindElementValue(SqlUpdate insert, Object value) {
+    targetDescriptor.bindElementValue(insert, value);
+  }
+
+  @Override
+  public void jsonWriteElement(SpiJsonWriter ctx, Object element) {
+    writeJsonElement(ctx, element);
+  }
+
+  @Override
+  public T jsonRead(ReadJson jsonRead, String path) throws IOException {
+    return readJsonElement(jsonRead, path);
+  }
+
+  @SuppressWarnings("unchecked")
+  T readJsonElement(ReadJson jsonRead, String path) throws IOException {
+    return (T)targetDescriptor.jsonRead(jsonRead, path);
+  }
+
+  void writeJsonElement(SpiJsonWriter ctx, Object element) {
+    try {
+      if (element == null) {
+        ctx.writeNull();
+      } else {
+        targetDescriptor.jsonWrite(ctx, (EntityBean)element);
+      }
+    } catch (IOException e) {
+      throw new PersistenceIOException(e);
+    }
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java
new file mode 100644
index 000000000..49b85d699
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java
@@ -0,0 +1,84 @@
+package io.ebeaninternal.server.deploy;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
+import io.ebeaninternal.server.text.json.ReadJson;
+import io.ebeaninternal.server.text.json.SpiJsonWriter;
+import io.ebeaninternal.server.type.ScalarType;
+
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * Descriptor for element collection using Map with the value holding an embedded bean.
+ * <p>
+ * The expected limitation is that the key is a scalar type.
+ */
+class BeanDescriptorElementEmbeddedMap<T> extends BeanDescriptorElementEmbedded<T> {
+
+  private final ScalarType scalarTypeKey;
+
+  private final boolean stringKey;
+
+  BeanDescriptorElementEmbeddedMap(BeanDescriptorMap owner, DeployBeanDescriptor<T> deploy, ElementHelp elementHelp) {
+    super(owner, deploy, elementHelp);
+    this.scalarTypeKey = firstBaseScalarType();
+    this.stringKey = String.class.equals(scalarTypeKey.getType());
+  }
+
+  @Override
+  @SuppressWarnings("unchecked")
+  public void jsonWriteMapEntry(SpiJsonWriter ctx, Map.Entry<?, ?> entry) throws IOException {
+    ctx.writeStartObject();
+    if (stringKey) {
+      Object key = entry.getKey();
+      String keyName = (key == null) ? "null" : key.toString();
+      ctx.writeFieldName(keyName);
+      writeJsonElement(ctx, entry.getValue());
+    } else {
+      ctx.writeFieldName("key");
+      scalarTypeKey.jsonWrite(ctx.gen(), entry.getKey());
+      ctx.writeFieldName("value");
+      writeJsonElement(ctx, entry.getValue());
+    }
+    ctx.writeEndObject();
+  }
+
+  @Override
+  public Object jsonReadCollection(ReadJson readJson, EntityBean parentBean) throws IOException {
+
+    JsonParser parser = readJson.getParser();
+    ElementCollector add = elementHelp.createCollector();
+    do {
+      JsonToken token = parser.nextToken();
+      if (token != JsonToken.START_OBJECT) {
+        break;
+      }
+      if (stringKey) {
+        String key = parser.nextFieldName();
+        parser.nextToken();
+        Object val = readJsonElement(readJson, null);
+        add.addKeyValue(key, val);
+
+      } else {
+        parser.nextFieldName();
+        Object key = scalarTypeKey.jsonRead(parser);
+
+        parser.nextFieldName();
+        Object val = readJsonElement(readJson, null);
+        add.addKeyValue(key, val);
+      }
+
+      token = parser.nextToken();
+      if (token != JsonToken.END_OBJECT) {
+        break;
+      }
+
+    } while (true);
+
+    return add.collection();
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementMap.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementMap.java
deleted file mode 100644
index 3319ba8fc..000000000
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementMap.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package io.ebeaninternal.server.deploy;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
-import io.ebean.bean.EntityBean;
-import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
-import io.ebeaninternal.server.text.json.ReadJson;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
-import io.ebeaninternal.server.type.ScalarType;
-
-import java.io.IOException;
-import java.util.Map;
-
-/**
- * Bean descriptor used with ElementCollection (where we don't have a mapped type/class).
- */
-class BeanDescriptorElementMap<T> extends BeanDescriptor<T> {
-
-  private final ScalarType[] scalarTypes;
-  private final ElementHelp elementHelp;
-  private final boolean stringKey;
-
-  BeanDescriptorElementMap(BeanDescriptorMap owner, DeployBeanDescriptor<T> deploy, ElementHelp elementHelp) {
-    super(owner, deploy);
-    this.elementHelp = elementHelp;
-    BeanProperty[] props = propertiesNonTransient();
-    this.scalarTypes = new ScalarType[props.length];
-    for (int i = 0; i < props.length; i++) {
-      scalarTypes[i] = props[i].getScalarType();
-    }
-    this.stringKey = String.class.equals(scalarTypes[0].getType());
-  }
-
-  @Override
-  public boolean isElementType() {
-    return true;
-  }
-
-  @Override
-  protected EntityBean createPrototypeEntityBean(Class<T> beanType) {
-    return new ElementEntityBean(properties);
-  }
-
-  @Override
-  @SuppressWarnings("unchecked")
-  public void jsonWriteMapEntry(SpiJsonWriter ctx, Map.Entry<?, ?> entry) throws IOException {
-      ctx.writeStartObject();
-      if (stringKey) {
-        Object key = entry.getKey();
-        String keyName = (key == null) ? "null" : key.toString();
-        ctx.writeFieldName(keyName);
-        scalarTypes[1].jsonWrite(ctx.gen(), entry.getValue());
-      } else {
-        ctx.writeFieldName("key");
-        scalarTypes[0].jsonWrite(ctx.gen(), entry.getKey());
-        ctx.writeFieldName("value");
-        scalarTypes[1].jsonWrite(ctx.gen(), entry.getValue());
-      }
-      ctx.writeEndObject();
-  }
-
-  @Override
-  public Object jsonReadCollection(ReadJson readJson, EntityBean parentBean) throws IOException {
-
-    JsonParser parser = readJson.getParser();
-    ElementCollector add = elementHelp.createCollector();
-    do {
-      JsonToken token = parser.nextToken();
-      if (token != JsonToken.START_OBJECT) {
-        break;
-      }
-      if (stringKey) {
-        String key = parser.nextFieldName();
-        parser.nextToken();
-        Object val = scalarTypes[0].jsonRead(parser);
-        add.addKeyValue(key, val);
-
-      } else {
-        parser.nextFieldName();
-        Object key= scalarTypes[0].jsonRead(parser);
-
-        parser.nextFieldName();
-        Object val = scalarTypes[0].jsonRead(parser);
-        add.addKeyValue(key, val);
-      }
-
-      token = parser.nextToken();
-      if (token != JsonToken.END_OBJECT) {
-        break;
-      }
-
-    } while (true);
-
-    return add.collection();
-  }
-
-}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalar.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalar.java
new file mode 100644
index 000000000..1b7ac70ea
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalar.java
@@ -0,0 +1,56 @@
+package io.ebeaninternal.server.deploy;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import io.ebean.PersistenceIOException;
+import io.ebean.SqlUpdate;
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
+import io.ebeaninternal.server.text.json.ReadJson;
+import io.ebeaninternal.server.text.json.SpiJsonWriter;
+import io.ebeaninternal.server.type.ScalarType;
+
+import java.io.IOException;
+
+/**
+ * Bean descriptor used with element collection mapped to a list or set of scalar values.
+ */
+class BeanDescriptorElementScalar<T> extends BeanDescriptorElement<T> {
+
+  private final ScalarType<Object> scalarType;
+
+  BeanDescriptorElementScalar(BeanDescriptorMap owner, DeployBeanDescriptor<T> deploy, ElementHelp elementHelp) {
+    super(owner, deploy, elementHelp);
+    this.scalarType = firstBaseScalarType();
+  }
+
+  public void bindElementValue(SqlUpdate insert, Object value) {
+    insert.setNextParameter(value);
+  }
+
+  @Override
+  public void jsonWriteElement(SpiJsonWriter ctx, Object element) {
+    try {
+      scalarType.jsonWrite(ctx.gen(), element);
+    } catch (IOException e) {
+      throw new PersistenceIOException(e);
+    }
+  }
+
+  @Override
+  public Object jsonReadCollection(ReadJson readJson, EntityBean parentBean) throws IOException {
+
+    JsonParser parser = readJson.getParser();
+    ElementCollector add = elementHelp.createCollector();
+    do {
+      JsonToken token = parser.nextToken();
+      if (JsonToken.VALUE_NULL == token || JsonToken.END_ARRAY == token) {
+        break;
+      }
+      add.addElement(scalarType.jsonRead(parser));
+    } while (true);
+
+    return add.collection();
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java
new file mode 100644
index 000000000..9eb87ba0b
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java
@@ -0,0 +1,88 @@
+package io.ebeaninternal.server.deploy;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
+import io.ebeaninternal.server.text.json.ReadJson;
+import io.ebeaninternal.server.text.json.SpiJsonWriter;
+import io.ebeaninternal.server.type.ScalarType;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Map;
+
+/**
+ * Bean descriptor used with element collection mapped to Map where key and value are scalar types.
+ */
+class BeanDescriptorElementScalarMap<T> extends BeanDescriptorElement<T> {
+
+  private final ScalarType scalarTypeKey;
+  private final ScalarType scalarTypeVal;
+  private final boolean stringKey;
+
+  BeanDescriptorElementScalarMap(BeanDescriptorMap owner, DeployBeanDescriptor<T> deploy, ElementHelp elementHelp) {
+    super(owner, deploy, elementHelp);
+    BeanProperty[] props = propertiesNonTransient();
+    if (props.length != 2) {
+      throw new IllegalStateException("Expecting 2 properties for key and value but got " + Arrays.toString(props));
+    }
+    this.scalarTypeKey = props[0].getScalarType();
+    this.scalarTypeVal = props[1].getScalarType();
+    this.stringKey = String.class.equals(scalarTypeKey.getType());
+  }
+
+  @Override
+  @SuppressWarnings("unchecked")
+  public void jsonWriteMapEntry(SpiJsonWriter ctx, Map.Entry<?, ?> entry) throws IOException {
+    ctx.writeStartObject();
+    if (stringKey) {
+      Object key = entry.getKey();
+      String keyName = (key == null) ? "null" : key.toString();
+      ctx.writeFieldName(keyName);
+      scalarTypeVal.jsonWrite(ctx.gen(), entry.getValue());
+    } else {
+      ctx.writeFieldName("key");
+      scalarTypeKey.jsonWrite(ctx.gen(), entry.getKey());
+      ctx.writeFieldName("value");
+      scalarTypeVal.jsonWrite(ctx.gen(), entry.getValue());
+    }
+    ctx.writeEndObject();
+  }
+
+  @Override
+  public Object jsonReadCollection(ReadJson readJson, EntityBean parentBean) throws IOException {
+
+    JsonParser parser = readJson.getParser();
+    ElementCollector add = elementHelp.createCollector();
+    do {
+      JsonToken token = parser.nextToken();
+      if (token != JsonToken.START_OBJECT) {
+        break;
+      }
+      if (stringKey) {
+        String key = parser.nextFieldName();
+        parser.nextToken();
+        Object val = scalarTypeVal.jsonRead(parser);
+        add.addKeyValue(key, val);
+
+      } else {
+        parser.nextFieldName();
+        Object key = scalarTypeKey.jsonRead(parser);
+
+        parser.nextFieldName();
+        Object val = scalarTypeVal.jsonRead(parser);
+        add.addKeyValue(key, val);
+      }
+
+      token = parser.nextToken();
+      if (token != JsonToken.END_OBJECT) {
+        break;
+      }
+
+    } while (true);
+
+    return add.collection();
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java
index ad9d640a3..8d90a3af5 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java
@@ -118,7 +118,7 @@ public class BeanDescriptorJsonHelp<T> {
 
   protected T jsonReadObject(ReadJson readJson, String path) throws IOException {
 
-    EntityBean bean = desc.createEntityBean();
+    EntityBean bean = desc.createEntityBeanForJson();
     return jsonReadProperties(readJson, bean, path);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 0e6814365..3c95f9515 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -637,7 +637,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   /**
    * Return a BeanTable for an ElementCollection.
    */
-  public BeanTable getCollectionBeanTable(String fullTableName, Class<?> targetType) {
+  public BeanTable createCollectionBeanTable(String fullTableName, Class<?> targetType) {
     return new BeanTable(this, fullTableName, targetType);
   }
 
@@ -1637,13 +1637,21 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   /**
    * Create a BeanDescriptor for an ElementCollection target.
    */
-  public <A> BeanDescriptor<A> createElementDescriptor(DeployBeanDescriptor<A> elementDescriptor, ManyType manyType) {
+  public <A> BeanDescriptor<A> createElementDescriptor(DeployBeanDescriptor<A> elementDescriptor, ManyType manyType, boolean scalar) {
 
     ElementHelp elementHelp = elementHelper(manyType);
     if (manyType.isMap()) {
-      return new BeanDescriptorElementMap<>(this, elementDescriptor, elementHelp);
+      if (scalar) {
+        return new BeanDescriptorElementScalarMap<>(this, elementDescriptor, elementHelp);
+      } else {
+        return new BeanDescriptorElementEmbeddedMap<>(this, elementDescriptor, elementHelp);
+      }
+    }
+    if (scalar) {
+      return new BeanDescriptorElementScalar<>(this, elementDescriptor, elementHelp);
+    } else {
+      return new BeanDescriptorElementEmbedded<>(this, elementDescriptor, elementHelp);
     }
-    return new BeanDescriptorElement<>(this, elementDescriptor, elementHelp);
   }
 
   private ElementHelp elementHelper(ManyType manyType) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index 0072949a6..2ef769116 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -70,6 +70,11 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
 
   private final boolean elementCollection;
 
+  /**
+   * Descriptor for the 'target' when the property maps to an element collection.
+   */
+  BeanDescriptor<T> elementDescriptor;
+
   /**
    * Order by used when fetch joining the associated many.
    */
@@ -116,6 +121,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     this.hasOrderColumn = deploy.hasOrderColumn();
     this.manyToMany = deploy.isManyToMany();
     this.elementCollection = deploy.isElementCollection();
+    this.elementDescriptor = deploy.getElementDescriptor();
     this.manyType = deploy.getManyType();
     this.mapKey = deploy.getMapKey();
     this.fetchOrderBy = deploy.getFetchOrderBy();
@@ -136,6 +142,19 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   public void initialise(BeanDescriptorInitContext initContext) {
     super.initialise(initContext);
     initialiseAssocMany();
+    if (elementCollection) {
+      // initialise all non-id properties (we don't have an Id property)
+      elementDescriptor.initialiseOther(initContext);
+    }
+  }
+
+  @Override
+  void initialiseTargetDescriptor(BeanDescriptorInitContext initContext) {
+    if (elementCollection) {
+      targetDescriptor = elementDescriptor;
+    } else {
+      targetDescriptor = descriptor.getBeanDescriptor(targetType);
+    }
   }
 
   private void initialiseAssocMany() {
@@ -170,7 +189,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   }
 
   String targetTable() {
-    return targetDescriptor.getBaseTable();
+    return beanTable.getBaseTable();
   }
 
   /**
@@ -883,18 +902,22 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   }
 
   public void jsonWriteMapEntry(SpiJsonWriter ctx, Map.Entry<?, ?> entry) throws IOException {
-    // Writing as json array rather than object ...
-    targetDescriptor.jsonWrite(ctx, (EntityBean) entry.getValue());
+    elementDescriptor.jsonWriteMapEntry(ctx, entry);
   }
 
   public void jsonWriteElementValue(SpiJsonWriter ctx, Object element) {
-    throw new IllegalStateException("Unexpected - expect Element override");
+    elementDescriptor.jsonWriteElement(ctx, element);
   }
 
   /**
    * Read the collection (JSON Array) containing entity beans.
    */
   public Object jsonReadCollection(ReadJson readJson, EntityBean parentBean) throws IOException {
+
+    if (elementDescriptor != null && manyType.isMap()) {
+      return elementDescriptor.jsonReadCollection(readJson, parentBean);
+    }
+
     BeanCollection<?> collection = createEmpty(parentBean);
     BeanCollectionAdd add = getBeanCollectionAdd(collection, null);
     do {
@@ -913,4 +936,11 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
 
     return collection;
   }
+
+  /**
+   * Bind all the property values to the SqlUpdate.
+   */
+  public void bindElementValue(SqlUpdate insert, Object value) {
+    targetDescriptor.bindElementValue(insert, value);
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java
index 6b9d1602e..f00b401cd 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java
@@ -1,47 +1,21 @@
 package io.ebeaninternal.server.deploy;
 
+import io.ebean.SqlUpdate;
 import io.ebean.bean.EntityBean;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertySimpleCollection;
 import io.ebeaninternal.server.text.json.ReadJson;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
 
 import java.io.IOException;
-import java.util.Map;
 
 public class BeanPropertySimpleCollection<T> extends BeanPropertyAssocMany<T> {
 
-  private BeanDescriptor<T> elementDescriptor;
-
   public BeanPropertySimpleCollection(BeanDescriptor<?> descriptor, DeployBeanPropertySimpleCollection<T> deploy) {
     super(descriptor, deploy);
-    this.elementDescriptor = deploy.getElementDescriptor();
   }
 
   @Override
-  public void initialise(BeanDescriptorInitContext initContext) {
-    super.initialise(initContext);
-    if (isElementCollection()) {
-      // initialise all non-id properties (we don't have an Id property)
-      elementDescriptor.initialiseOther(initContext);
-    }
-  }
-
-  void initialiseTargetDescriptor(BeanDescriptorInitContext initContext) {
-    if (isElementCollection()) {
-      targetDescriptor = elementDescriptor;
-    } else {
-      targetDescriptor = descriptor.getBeanDescriptor(targetType);
-    }
-  }
-
-  @Override
-  public void jsonWriteMapEntry(SpiJsonWriter ctx, Map.Entry<?, ?> entry) throws IOException {
-    elementDescriptor.jsonWriteMapEntry(ctx, entry);
-  }
-
-  @Override
-  public void jsonWriteElementValue(SpiJsonWriter ctx, Object element) {
-    elementDescriptor.jsonWriteElement(ctx, element);
+  public void bindElementValue(SqlUpdate insert, Object value) {
+    insert.setNextParameter(value);
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java
index 4e6d7d7d8..6e0394273 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java
@@ -4,6 +4,9 @@ import io.ebean.bean.BeanCollection.ModifyListenMode;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.ManyType;
 import io.ebeaninternal.server.deploy.TableJoin;
+import io.ebeaninternal.server.type.TypeReflectHelper;
+
+import java.lang.reflect.Type;
 
 /**
  * Property mapped to a List Set or Map.
@@ -179,6 +182,14 @@ public class DeployBeanPropertyAssocMany<T> extends DeployBeanPropertyAssoc<T> {
     return fetchOrderBy;
   }
 
+  /**
+   * Return the type of the map key (valid only when this property is a Map).
+   */
+  public Class<?> getMapKeyType() {
+    Type genericType = getField().getGenericType();
+    return TypeReflectHelper.getMapKeyType(genericType);
+  }
+
   /**
    * Return the default mapKey when returning a Map.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index 7c98d20c4..24f3c96aa 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -15,6 +15,7 @@ import io.ebeaninternal.server.deploy.BeanTable;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany;
+import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
 import io.ebeaninternal.server.deploy.meta.DeployOrderColumn;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoin;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn;
@@ -204,7 +205,7 @@ class AnnotationAssocManys extends AnnotationParser {
       }
     }
 
-    BeanTable beanTable = factory.getCollectionBeanTable(fullTableName, prop.getTargetType());
+    BeanTable beanTable = factory.createCollectionBeanTable(fullTableName, prop.getTargetType());
     prop.setBeanTable(beanTable);
 
     Class<?> elementType = prop.getTargetType();
@@ -212,8 +213,6 @@ class AnnotationAssocManys extends AnnotationParser {
     DeployBeanDescriptor<?> elementDescriptor = factory.createDeployDescriptor(elementType);
     elementDescriptor.setBaseTable(new TableName(fullTableName), readConfig.getAsOfViewSuffix(), readConfig.getVersionsBetweenSuffix());
 
-    ScalarType<?> scalarType = util.getTypeManager().getScalarType(elementType);
-
     int sortOrder = 0;
     if (!prop.getManyType().isMap()) {
       elementDescriptor.setProperties(new String[]{"value"});
@@ -225,27 +224,46 @@ class AnnotationAssocManys extends AnnotationParser {
         dbKeyColumn = mapKeyColumn.name();
       }
 
-      DeployBeanProperty keyProp = new DeployBeanProperty(elementDescriptor, elementType, scalarType, null);
+      ScalarType<?> keyScalarType = util.getTypeManager().getScalarType(prop.getMapKeyType());
+
+      DeployBeanProperty keyProp = new DeployBeanProperty(elementDescriptor, elementType, keyScalarType, null);
       setElementProperty(keyProp, "key", dbKeyColumn, sortOrder++);
       elementDescriptor.addBeanProperty(keyProp);
       if (mapKeyColumn != null) {
         keyProp.setDbLength(mapKeyColumn.length());
         keyProp.setDbScale(mapKeyColumn.scale());
+        keyProp.setUnique(mapKeyColumn.unique());
       }
     }
 
-    DeployBeanProperty valueProp = new DeployBeanProperty(elementDescriptor, elementType, scalarType, null);
-    setElementProperty(valueProp, "value", prop.getDbColumn(), sortOrder++);
-    if (column != null) {
-      valueProp.setDbLength(column.length());
-      valueProp.setDbScale(column.scale());
+    ScalarType<?> valueScalarType = util.getTypeManager().getScalarType(elementType);
+
+    boolean scalar = true;
+    if (valueScalarType == null) {
+      // embedded value type
+      scalar = false;
+      DeployBeanPropertyAssocOne valueProp = new DeployBeanPropertyAssocOne<>(elementDescriptor, elementType);
+      valueProp.setName("value");
+      valueProp.setEmbedded();
+      valueProp.setElementProperty();
+      valueProp.setSortOrder(sortOrder++);
+      elementDescriptor.addBeanProperty(valueProp);
+
+    } else {
+      // scalar value type
+      DeployBeanProperty valueProp = new DeployBeanProperty(elementDescriptor, elementType, valueScalarType, null);
+      setElementProperty(valueProp, "value", prop.getDbColumn(), sortOrder++);
+      if (column != null) {
+        valueProp.setDbLength(column.length());
+        valueProp.setDbScale(column.scale());
+      }
+      elementDescriptor.addBeanProperty(valueProp);
     }
 
-    elementDescriptor.addBeanProperty(valueProp);
     elementDescriptor.setName(prop.getFullBeanName());
 
     factory.createUnidirectional(elementDescriptor, prop.getOwningType(), beanTable, prop.getTableJoin());
-    prop.setElementDescriptor(factory.createElementDescriptor(elementDescriptor, prop.getManyType()));
+    prop.setElementDescriptor(factory.createElementDescriptor(elementDescriptor, prop.getManyType(), scalar));
   }
 
   private void setElementProperty(DeployBeanProperty elementProp, String name, String dbColumn, int sortOrder) {
@@ -307,7 +325,7 @@ class AnnotationAssocManys extends AnnotationParser {
    * Return the full table name
    */
   private String getFullTableName(CollectionTable collectionTable) {
-    if (collectionTable == null) {
+    if (collectionTable == null || collectionTable.name().isEmpty()) {
       return null;
     }
     StringBuilder sb = new StringBuilder();
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index f02969461..b16a0ced8 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -906,10 +906,10 @@ public final class DefaultPersister implements Persister {
       return new SaveManyBeans(insertedParent, many, parentBean, request, this);
 
     } else if (many.getManyType().isMap()) {
-      return new SaveManySimpleMap(insertedParent, many, parentBean, request);
+      return new SaveManyElementCollectionMap(insertedParent, many, parentBean, request);
 
     } else {
-      return new SaveManySimpleCollection(insertedParent, many, parentBean, request);
+      return new SaveManyElementCollection(insertedParent, many, parentBean, request);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java
index 61a080188..9f892c5e8 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.persist;
 
+import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiTransaction;
@@ -34,4 +35,17 @@ abstract class SaveManyBase {
    */
   abstract void save();
 
+  void resetModifyState() {
+    if (value instanceof BeanCollection<?>) {
+      modifyListenReset((BeanCollection<?>) value);
+    }
+  }
+
+  void modifyListenReset(BeanCollection<?> c) {
+    if (insertedParent) {
+      // after insert set the modify listening mode for private owned etc
+      c.setModifyListening(many.getModifyListenMode());
+    }
+    c.modifyReset();
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
index cdd84d158..063862967 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
@@ -89,20 +89,6 @@ class SaveManyBeans extends SaveManyBase {
     return BeanCollection.ModifyListenMode.REMOVALS == many.getModifyListenMode();
   }
 
-  private void modifyListenReset(BeanCollection<?> c) {
-    if (insertedParent) {
-      // after insert set the modify listening mode for private owned etc
-      c.setModifyListening(many.getModifyListenMode());
-    }
-    c.modifyReset();
-  }
-
-  private void resetModifyState() {
-    if (value instanceof BeanCollection<?>) {
-      modifyListenReset((BeanCollection<?>) value);
-    }
-  }
-
   /**
    * Save the details from a OneToMany collection.
    */
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManySimpleCollection.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java
similarity index 64%
rename from src/main/java/io/ebeaninternal/server/persist/SaveManySimpleCollection.java
rename to src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java
index 49a4f09e9..1867421fa 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManySimpleCollection.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java
@@ -12,9 +12,9 @@ import java.util.Collection;
 /**
  * Save details for a simple scalar element collection.
  */
-class SaveManySimpleCollection extends SaveManyBase {
+class SaveManyElementCollection extends SaveManyBase {
 
-  SaveManySimpleCollection(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
+  SaveManyElementCollection(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
     super(insertedParent, many, parentBean, request);
   }
 
@@ -22,16 +22,18 @@ class SaveManySimpleCollection extends SaveManyBase {
   void save() {
 
     Collection<?> collection = BeanCollectionUtil.getActualEntries(value);
-    if (collection == null) {
+    if (collection == null || !BeanCollectionUtil.isModified(value)) {
       return;
     }
 
     Object parentId = request.getBeanId();
 
-    SqlUpdate sqlDelete = many.deleteByParentId(parentId, null);
-
     SpiEbeanServer server = request.getServer();
-    server.execute(sqlDelete, transaction);
+
+    if (!insertedParent) {
+      SqlUpdate sqlDelete = many.deleteByParentId(parentId, null);
+      server.execute(sqlDelete, transaction);
+    }
 
     transaction.depth(+1);
 
@@ -40,11 +42,12 @@ class SaveManySimpleCollection extends SaveManyBase {
 
     for (Object value : collection) {
 
-      sqlInsert.setParameter(1, parentId);
-      sqlInsert.setParameter(2, value);
+      sqlInsert.setNextParameter(parentId);
+      many.bindElementValue(sqlInsert, value);
       server.execute(sqlInsert, transaction);
     }
 
     transaction.depth(-1);
+    resetModifyState();
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManySimpleMap.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java
similarity index 57%
rename from src/main/java/io/ebeaninternal/server/persist/SaveManySimpleMap.java
rename to src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java
index 84d57c222..3ba94d781 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManySimpleMap.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java
@@ -13,9 +13,9 @@ import java.util.Set;
 /**
  * Save details for a simple scalar map element collection.
  */
-class SaveManySimpleMap extends SaveManyBase {
+class SaveManyElementCollectionMap extends SaveManyBase {
 
-  SaveManySimpleMap(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
+  SaveManyElementCollectionMap(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
     super(insertedParent, many, parentBean, request);
   }
 
@@ -23,17 +23,19 @@ class SaveManySimpleMap extends SaveManyBase {
   @Override
   void save() {
 
-    Set<Map.Entry<?, ?>> entries = (Set<Map.Entry<?, ?>>)BeanCollectionUtil.getActualEntries(value);
-    if (entries == null) {
+    Set<Map.Entry<?, ?>> entries = (Set<Map.Entry<?, ?>>) BeanCollectionUtil.getActualEntries(value);
+    if (entries == null || !BeanCollectionUtil.isModified(value)) {
       return;
     }
 
     Object parentId = request.getBeanId();
 
-    SqlUpdate sqlDelete = many.deleteByParentId(parentId, null);
-
     SpiEbeanServer server = request.getServer();
-    server.execute(sqlDelete, transaction);
+
+    if (!insertedParent) {
+      SqlUpdate sqlDelete = many.deleteByParentId(parentId, null);
+      server.execute(sqlDelete, transaction);
+    }
 
     transaction.depth(+1);
 
@@ -41,12 +43,13 @@ class SaveManySimpleMap extends SaveManyBase {
     SqlUpdate sqlInsert = server.createSqlUpdate(insert);
 
     for (Map.Entry<?, ?> entry : entries) {
-      sqlInsert.setParameter(1, parentId);
-      sqlInsert.setParameter(2, entry.getKey());
-      sqlInsert.setParameter(3, entry.getValue());
+      sqlInsert.setNextParameter(parentId);
+      sqlInsert.setNextParameter(entry.getKey());
+      many.bindElementValue(sqlInsert, entry.getValue());
       server.execute(sqlInsert, transaction);
     }
 
     transaction.depth(-1);
+    resetModifyState();
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java b/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java
index 392c0829b..663d18f00 100644
--- a/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java
+++ b/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java
@@ -30,6 +30,13 @@ public class TypeReflectHelper {
     }
   }
 
+  /**
+   * Return the type of the map key.
+   */
+  public static Class<?> getMapKeyType(Type genericType) {
+    return getClass(getValueType(genericType));
+  }
+
   /**
    * Return the value type of a collection type (list, set, map values).
    */
diff --git a/src/test/java/org/tests/model/elementcollection/EcPhone.java b/src/test/java/org/tests/model/elementcollection/EcPhone.java
new file mode 100644
index 000000000..24f71559f
--- /dev/null
+++ b/src/test/java/org/tests/model/elementcollection/EcPhone.java
@@ -0,0 +1,52 @@
+package org.tests.model.elementcollection;
+
+import javax.persistence.Embeddable;
+import javax.validation.constraints.Size;
+
+@Embeddable
+public class EcPhone {
+
+  @Size(max = 2)
+  String countryCode;
+
+  @Size(max = 6)
+  String area;
+
+  @Size(max = 20)
+  String number;
+
+  public EcPhone(String countryCode, String area, String number) {
+    this.countryCode = countryCode;
+    this.area = area;
+    this.number = number;
+  }
+
+  @Override
+  public String toString() {
+    return countryCode + "-" + area + "-" + number;
+  }
+
+  public String getCountryCode() {
+    return countryCode;
+  }
+
+  public void setCountryCode(String countryCode) {
+    this.countryCode = countryCode;
+  }
+
+  public String getArea() {
+    return area;
+  }
+
+  public void setArea(String area) {
+    this.area = area;
+  }
+
+  public String getNumber() {
+    return number;
+  }
+
+  public void setNumber(String number) {
+    this.number = number;
+  }
+}
diff --git a/src/test/java/org/tests/model/elementcollection/EcblPerson.java b/src/test/java/org/tests/model/elementcollection/EcblPerson.java
new file mode 100644
index 000000000..982071e13
--- /dev/null
+++ b/src/test/java/org/tests/model/elementcollection/EcblPerson.java
@@ -0,0 +1,67 @@
+package org.tests.model.elementcollection;
+
+import javax.persistence.CollectionTable;
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.Version;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+public class EcblPerson {
+
+  @Id
+  long id;
+
+  String name;
+
+  @ElementCollection
+  @CollectionTable(joinColumns = @JoinColumn(name = "person_id"))
+  List<EcPhone> phoneNumbers = new ArrayList<>();
+
+  @Version
+  long version;
+
+  public EcblPerson(String name) {
+    this.name = name;
+  }
+
+  @Override
+  public String toString() {
+    return "person id:" + id + " name:" + name + " phs:" + phoneNumbers;
+  }
+
+  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 List<EcPhone> getPhoneNumbers() {
+    return phoneNumbers;
+  }
+
+  public void setPhoneNumbers(List<EcPhone> phoneNumbers) {
+    this.phoneNumbers = phoneNumbers;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/elementcollection/EcbmPerson.java b/src/test/java/org/tests/model/elementcollection/EcbmPerson.java
new file mode 100644
index 000000000..7a236bb85
--- /dev/null
+++ b/src/test/java/org/tests/model/elementcollection/EcbmPerson.java
@@ -0,0 +1,68 @@
+package org.tests.model.elementcollection;
+
+import javax.persistence.CollectionTable;
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.Version;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+
+@Entity
+public class EcbmPerson {
+
+  @Id
+  long id;
+
+  String name;
+
+  @ElementCollection
+  @CollectionTable(joinColumns = @JoinColumn(name = "person_id"))
+  Map<String,EcPhone> phoneNumbers = new LinkedHashMap<>();
+
+  @Version
+  long version;
+
+  public EcbmPerson(String name) {
+    this.name = name;
+  }
+
+  @Override
+  public String toString() {
+    return "person id:" + id + " name:" + name + " phs:" + phoneNumbers;
+  }
+
+  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 Map<String,EcPhone> getPhoneNumbers() {
+    return phoneNumbers;
+  }
+
+  public void setPhoneNumbers(Map<String,EcPhone> phoneNumbers) {
+    this.phoneNumbers = phoneNumbers;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
index 54ef094cb..b55b3dba2 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
@@ -2,6 +2,7 @@ package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
 import java.util.List;
@@ -13,17 +14,25 @@ public class TestElementCollectionBasic extends BaseTestCase {
   @Test
   public void test() {
 
+    LoggedSqlCollector.start();
+
     EcPerson person = new EcPerson("Fiona021");
     person.getPhoneNumbers().add("021 1234");
     person.getPhoneNumbers().add("021 4321");
     Ebean.save(person);
 
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("insert into ec_person");
+    assertThat(sql.get(1)).contains("insert into ec_person_phone");
 
     EcPerson person1 = new EcPerson("Fiona09");
     person1.getPhoneNumbers().add("09 1234");
     person1.getPhoneNumbers().add("09 4321");
     Ebean.save(person1);
 
+    LoggedSqlCollector.current();
+
     List<EcPerson> found =
       Ebean.find(EcPerson.class).where()
         .startsWith("name", "Fiona0")
@@ -37,6 +46,10 @@ public class TestElementCollectionBasic extends BaseTestCase {
     assertThat(phoneNumbers0).containsExactly("021 1234", "021 4321");
     assertThat(phoneNumbers1).containsExactly("09 1234", "09 4321");
 
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2);
+    assertThat(trimSql(sql.get(0))).contains("select t0.id, t0.name, t0.version from ec_person t0 where");
+    assertThat(trimSql(sql.get(1))).contains("select t0.owner_id, t0.phone from ec_person_phone t0 where");
 
     List<EcPerson> found2 =
       Ebean.find(EcPerson.class)
@@ -47,11 +60,83 @@ public class TestElementCollectionBasic extends BaseTestCase {
         .findList();
 
     assertThat(found2).hasSize(2);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(1);
+    assertThat(trimSql(sql.get(0))).contains("select t0.id, t0.name, t0.version, t1.phone from ec_person t0 left join ec_person_phone t1");
+
     EcPerson foundFirst = found2.get(0);
+
+    jsonToFrom(foundFirst);
+    updateBasic(foundFirst);
+
+    LoggedSqlCollector.stop();
+  }
+
+  private void updateBasic(EcPerson bean) {
+
+    bean.setName("Fiona021-mod-0");
+    Ebean.save(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("update ec_person");
+
+    updateBoth(bean);
+  }
+
+  private void updateBoth(EcPerson bean) {
+
+    bean.setName("Fiona021-mod-both");
+    bean.getPhoneNumbers().add("01-22123");
+    Ebean.save(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(3);
+    assertThat(sql.get(0)).contains("update ec_person set name=?, version=? where id=? and version=?");
+    assertThat(sql.get(1)).contains("delete from ec_person_phone where owner_id=?");
+    assertThat(sql.get(2)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
+
+    updateNothing(bean);
+  }
+
+  private void updateNothing(EcPerson bean) {
+
+    Ebean.save(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(0);
+
+    updateOnlyCollection(bean);
+  }
+
+  private void updateOnlyCollection(EcPerson bean) {
+
+    bean.getPhoneNumbers().add("01-4321");
+    Ebean.save(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("delete from ec_person_phone where owner_id=?");
+    assertThat(sql.get(1)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
+
+    delete(bean);
+  }
+
+  private void delete(EcPerson bean) {
+
+    Ebean.delete(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("delete from ec_person_phone where owner_id = ?");
+    assertThat(sql.get(1)).contains("delete from ec_person where id=? and version=?");
+  }
+
+  private void jsonToFrom(EcPerson foundFirst) {
+
     String asJson = Ebean.json().toJson(foundFirst);
-
     EcPerson fromJson = Ebean.json().toBean(EcPerson.class, asJson);
-
     assertThat(fromJson.getPhoneNumbers()).containsAll(foundFirst.getPhoneNumbers());
   }
 }
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
index 83bbb7561..f03bf1933 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
@@ -2,6 +2,7 @@ package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
 import java.util.List;
@@ -14,26 +15,34 @@ public class TestElementCollectionBasicMap extends BaseTestCase {
   @Test
   public void test() {
 
+    LoggedSqlCollector.start();
+
     EcmPerson person = new EcmPerson("Fiona021");
-    person.getPhoneNumbers().put("home","021 1234");
-    person.getPhoneNumbers().put("work","021 4321");
+    person.getPhoneNumbers().put("home", "021 1234");
+    person.getPhoneNumbers().put("work", "021 4321");
     Ebean.save(person);
 
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("insert into ecm_person");
+    assertThat(sql.get(1)).contains("insert into ecm_person_phone");
 
     EcmPerson person1 = new EcmPerson("Fiona09");
-    person1.getPhoneNumbers().put("home","09 1234");
-    person1.getPhoneNumbers().put("work","09 4321");
-    person1.getPhoneNumbers().put("mob","09 9876");
+    person1.getPhoneNumbers().put("home", "09 1234");
+    person1.getPhoneNumbers().put("work", "09 4321");
+    person1.getPhoneNumbers().put("mob", "09 9876");
     Ebean.save(person1);
 
+    LoggedSqlCollector.current();
+
     List<EcmPerson> found =
       Ebean.find(EcmPerson.class).where()
         .startsWith("name", "Fiona0")
         .order().asc("id")
         .findList();
 
-    Map<String,String> phoneNumbers0 = found.get(0).getPhoneNumbers();
-    Map<String,String> phoneNumbers1 = found.get(1).getPhoneNumbers();
+    Map<String, String> phoneNumbers0 = found.get(0).getPhoneNumbers();
+    Map<String, String> phoneNumbers1 = found.get(1).getPhoneNumbers();
     phoneNumbers0.size();
 
     assertThat(phoneNumbers0).containsValues("021 1234", "021 4321");
@@ -41,6 +50,10 @@ public class TestElementCollectionBasicMap extends BaseTestCase {
     assertThat(phoneNumbers1).containsValues("09 1234", "09 4321", "09 9876");
     assertThat(phoneNumbers1.get("mob")).isEqualTo("09 9876");
 
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2);
+    assertThat(trimSql(sql.get(0))).contains("select t0.id, t0.name, t0.version from ecm_person t0 where");
+    assertThat(trimSql(sql.get(1))).contains("select t0.ecm_person_id, t0.type, t0.number from ecm_person_phone_numbers t0 where");
 
     List<EcmPerson> found2 =
       Ebean.find(EcmPerson.class)
@@ -51,13 +64,83 @@ public class TestElementCollectionBasicMap extends BaseTestCase {
         .findList();
 
     assertThat(found2).hasSize(2);
-    EcmPerson foundFirst = found2.get(0);
-    String asJson = Ebean.json().toJson(foundFirst);
 
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(1);
+    assertThat(trimSql(sql.get(0))).contains("select t0.id, t0.name, t0.version, t1.type, t1.number from ecm_person t0 left join ecm_person_phone_numbers t1");
+
+    EcmPerson foundFirst = found2.get(0);
+    jsonToFrom(foundFirst);
+    updateBasic(foundFirst);
+
+    LoggedSqlCollector.stop();
+  }
+
+  private void updateBasic(EcmPerson bean) {
+
+    bean.setName("Fiona021-mod-0");
+    Ebean.save(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("update ecm_person");
+
+    updateBoth(bean);
+  }
+
+  private void updateBoth(EcmPerson bean) {
+
+    bean.setName("Fiona021-mod-both");
+    bean.getPhoneNumbers().put("one", "01-22123");
+    Ebean.save(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(3);
+    assertThat(sql.get(0)).contains("update ecm_person set name=?, version=? where id=? and version=?");
+    assertThat(sql.get(1)).contains("delete from ecm_person_phone_numbers where ecm_person_id=?");
+    assertThat(sql.get(2)).contains("insert into ecm_person_phone_numbers (ecm_person_id,type,number) values (?,?,?)");
+
+    updateNothing(bean);
+  }
+
+  private void updateNothing(EcmPerson bean) {
+
+    Ebean.save(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(0);
+
+    updateOnlyCollection(bean);
+  }
+
+  private void updateOnlyCollection(EcmPerson bean) {
+
+    bean.getPhoneNumbers().put("two", "01-4321");
+    Ebean.save(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("delete from ecm_person_phone_numbers where ecm_person_id=?");
+    assertThat(sql.get(1)).contains("insert into ecm_person_phone_numbers (ecm_person_id,type,number) values (?,?,?)");
+
+    delete(bean);
+  }
+
+  private void delete(EcmPerson bean) {
+
+    Ebean.delete(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("delete from ecm_person_phone_numbers where ecm_person_id = ?");
+    assertThat(sql.get(1)).contains("delete from ecm_person where id=? and version=?");
+  }
+
+  private void jsonToFrom(EcmPerson foundFirst) {
+    String asJson = Ebean.json().toJson(foundFirst);
     EcmPerson fromJson = Ebean.json().toBean(EcmPerson.class, asJson);
 
     assertThat(fromJson.getPhoneNumbers()).containsValues("021 1234", "021 4321");
     assertThat(fromJson.getPhoneNumbers().get("home")).isEqualTo("021 1234");
-
   }
 }
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java
index 946e273f7..2d3124351 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java
@@ -2,6 +2,7 @@ package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
 import java.util.List;
@@ -14,11 +15,17 @@ public class TestElementCollectionBasicSet extends BaseTestCase {
   @Test
   public void test() {
 
+    LoggedSqlCollector.start();
+
     EcsPerson person = new EcsPerson("Fiona021");
     person.getPhoneNumbers().add("021 1234");
     person.getPhoneNumbers().add("021 4321");
     Ebean.save(person);
 
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("insert into ecs_person");
+    assertThat(sql.get(1)).contains("insert into ecs_person_phone");
 
     EcsPerson person1 = new EcsPerson("Fiona09");
     person1.getPhoneNumbers().add("09 1234");
@@ -26,6 +33,8 @@ public class TestElementCollectionBasicSet extends BaseTestCase {
     person1.getPhoneNumbers().add("09 9876");
     Ebean.save(person1);
 
+    LoggedSqlCollector.current();
+
     List<EcsPerson> found =
       Ebean.find(EcsPerson.class).where()
         .startsWith("name", "Fiona0")
@@ -39,6 +48,10 @@ public class TestElementCollectionBasicSet extends BaseTestCase {
     assertThat(phoneNumbers0).containsExactly("021 1234", "021 4321");
     assertThat(phoneNumbers1).containsExactly("09 1234", "09 4321", "09 9876");
 
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2);
+    assertThat(trimSql(sql.get(0))).contains("select t0.id, t0.name, t0.version from ecs_person t0 where");
+    assertThat(trimSql(sql.get(1))).contains("select t0.ecs_person_id, t0.phone from ecs_person_phone t0 where");
 
     List<EcsPerson> found2 =
       Ebean.find(EcsPerson.class)
@@ -49,11 +62,82 @@ public class TestElementCollectionBasicSet extends BaseTestCase {
         .findList();
 
     assertThat(found2).hasSize(2);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(1);
+    assertThat(trimSql(sql.get(0))).contains("select t0.id, t0.name, t0.version, t1.phone from ecs_person t0 left join ecs_person_phone t1");
+
     EcsPerson foundFirst = found2.get(0);
+    jsonToFrom(foundFirst);
+
+    updateBasic(foundFirst);
+
+    LoggedSqlCollector.stop();
+  }
+
+  private void updateBasic(EcsPerson bean) {
+
+    bean.setName("Fiona021-mod-0");
+    Ebean.save(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("update ecs_person");
+
+    updateBoth(bean);
+  }
+
+  private void updateBoth(EcsPerson bean) {
+
+    bean.setName("Fiona021-mod-both");
+    bean.getPhoneNumbers().add("01-22123");
+    Ebean.save(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(3);
+    assertThat(sql.get(0)).contains("update ecs_person set name=?, version=? where id=? and version=?");
+    assertThat(sql.get(1)).contains("delete from ecs_person_phone where ecs_person_id=?");
+    assertThat(sql.get(2)).contains("insert into ecs_person_phone (ecs_person_id,phone) values (?,?)");
+
+    updateNothing(bean);
+  }
+
+  private void updateNothing(EcsPerson bean) {
+
+    Ebean.save(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(0);
+
+    updateOnlyCollection(bean);
+  }
+
+  private void updateOnlyCollection(EcsPerson bean) {
+
+    bean.getPhoneNumbers().add("01-4321");
+    Ebean.save(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("delete from ecs_person_phone where ecs_person_id=?");
+    assertThat(sql.get(1)).contains("insert into ecs_person_phone (ecs_person_id,phone) values (?,?)");
+
+    delete(bean);
+  }
+
+  private void delete(EcsPerson bean) {
+
+    Ebean.delete(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("delete from ecs_person_phone where ecs_person_id = ?");
+    assertThat(sql.get(1)).contains("delete from ecs_person where id=? and version=?");
+  }
+
+  private void jsonToFrom(EcsPerson foundFirst) {
     String asJson = Ebean.json().toJson(foundFirst);
-
     EcsPerson fromJson = Ebean.json().toBean(EcsPerson.class, asJson);
-
     assertThat(fromJson.getPhoneNumbers()).containsAll(foundFirst.getPhoneNumbers());
   }
 }
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java
new file mode 100644
index 000000000..8b86e6477
--- /dev/null
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java
@@ -0,0 +1,148 @@
+package org.tests.model.elementcollection;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestElementCollectionEmbeddedList extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    LoggedSqlCollector.start();
+
+    EcblPerson person = new EcblPerson("Fiona64021");
+    person.getPhoneNumbers().add(new EcPhone("64", "021","1234"));
+    person.getPhoneNumbers().add(new EcPhone("64","021","4321"));
+    Ebean.save(person);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("insert into ecbl_person");
+    assertThat(sql.get(1)).contains("insert into ecbl_person_phone_numbers");
+
+    EcblPerson person1 = new EcblPerson("Fiona6409");
+    person1.getPhoneNumbers().add(new EcPhone("61","09","1234"));
+    person1.getPhoneNumbers().add(new EcPhone("64","09","4321"));
+    Ebean.save(person1);
+
+    LoggedSqlCollector.current();
+
+    List<EcblPerson> found =
+      Ebean.find(EcblPerson.class).where()
+        .startsWith("name", "Fiona640")
+        .order().asc("id")
+        .findList();
+
+    List<EcPhone> phoneNumbers0 = found.get(0).getPhoneNumbers();
+    List<EcPhone> phoneNumbers1 = found.get(1).getPhoneNumbers();
+    phoneNumbers0.size();
+
+    assertThat(phoneNumbers0.toString()).contains("64-021-1234", "64-021-4321");
+    assertThat(phoneNumbers1.toString()).contains("61-09-1234", "64-09-4321");
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2);
+    assertThat(trimSql(sql.get(0))).contains("select t0.id, t0.name, t0.version from ecbl_person");
+    assertThat(trimSql(sql.get(1))).contains("select t0.person_id, t0.country_code, t0.area, t0.number from ecbl_person_phone_numbers");
+
+    List<EcblPerson> found2 =
+      Ebean.find(EcblPerson.class)
+        .fetch("phoneNumbers")
+        .where()
+        .startsWith("name", "Fiona640")
+        .order().asc("id")
+        .findList();
+
+    assertThat(found2).hasSize(2);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(1);
+    String trimmedSql = trimSql(sql.get(0));
+    assertThat(trimmedSql).contains("select t0.id, t0.name, t0.version, t1.country_code, t1.area, t1.number from ecbl_person t0 left join ecbl_person_phone_numbers t1");
+
+
+    EcblPerson foundFirst = found2.get(0);
+    jsonToFrom(foundFirst);
+
+    updateBasic(foundFirst);
+
+    LoggedSqlCollector.stop();
+  }
+
+  private void updateBasic(EcblPerson bean) {
+
+    bean.setName("Fiona64-mod-0");
+    Ebean.save(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("update ecbl_person");
+
+    updateBoth(bean);
+  }
+
+  private void updateBoth(EcblPerson bean) {
+
+    bean.setName("Fiona64-mod-both");
+    bean.getPhoneNumbers().add(new EcPhone("01", "234", "123"));
+    Ebean.save(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(3);
+    assertThat(sql.get(0)).contains("update ecbl_person set name=?, version=? where id=? and version=?");
+    assertThat(sql.get(1)).contains("delete from ecbl_person_phone_numbers where person_id=?");
+    assertThat(sql.get(2)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,number) values (?,?,?,?)");
+
+    updateNothing(bean);
+  }
+
+  private void updateNothing(EcblPerson bean) {
+
+    Ebean.save(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(0);
+
+    updateOnlyCollection(bean);
+  }
+
+  private void updateOnlyCollection(EcblPerson bean) {
+
+    bean.getPhoneNumbers().add(new EcPhone("01", "12", "4321"));
+    Ebean.save(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id=?");
+    assertThat(sql.get(1)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,number) values (?,?,?,?)");
+
+    delete(bean);
+  }
+
+  private void delete(EcblPerson bean) {
+
+    Ebean.delete(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id = ?");
+    assertThat(sql.get(1)).contains("delete from ecbl_person where id=? and version=?");
+  }
+
+  private void jsonToFrom(EcblPerson foundFirst) {
+
+    String asJson = Ebean.json().toJson(foundFirst);
+
+    EcblPerson fromJson = Ebean.json().toBean(EcblPerson.class, asJson);
+
+    String phoneString = fromJson.getPhoneNumbers().toString();
+    assertThat(phoneString).contains("64-021-1234");
+    assertThat(phoneString).contains("64-021-4321");
+  }
+}
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java
new file mode 100644
index 000000000..ca342342c
--- /dev/null
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java
@@ -0,0 +1,141 @@
+package org.tests.model.elementcollection;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestElementCollectionEmbeddedMap extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    LoggedSqlCollector.start();
+
+    EcbmPerson person = new EcbmPerson("Fiona64021");
+    person.getPhoneNumbers().put("home", new EcPhone("64", "021","1234"));
+    person.getPhoneNumbers().put("work", new EcPhone("64","021","4321"));
+    Ebean.save(person);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("insert into ecbm_person");
+    assertThat(sql.get(1)).contains("insert into ecbm_person_phone_numbers");
+
+    EcbmPerson person1 = new EcbmPerson("Fiona6409");
+    person1.getPhoneNumbers().put("home",new EcPhone("64","09","1234"));
+    person1.getPhoneNumbers().put("mob",new EcPhone("61","09","4321"));
+
+    Ebean.save(person1);
+
+    LoggedSqlCollector.current();
+
+    List<EcbmPerson> found =
+      Ebean.find(EcbmPerson.class).where()
+        .startsWith("name", "Fiona640")
+        .order().asc("id")
+        .findList();
+
+    Map<String,EcPhone> phoneNumbers0 = found.get(0).getPhoneNumbers();
+    Map<String,EcPhone> phoneNumbers1 = found.get(1).getPhoneNumbers();
+    phoneNumbers0.size();
+
+    assertThat(phoneNumbers0.toString()).contains("64-021-1234", "64-021-4321");
+    assertThat(phoneNumbers1.toString()).contains("64-09-1234", "61-09-4321");
+
+    List<EcbmPerson> found2 =
+      Ebean.find(EcbmPerson.class)
+        .fetch("phoneNumbers")
+        .where()
+        .startsWith("name", "Fiona640")
+        .order().asc("id")
+        .findList();
+
+    assertThat(found2).hasSize(2);
+    EcbmPerson foundFirst = found2.get(0);
+
+    LoggedSqlCollector.current();
+
+    jsonToFrom(foundFirst);
+
+    updateBasic(foundFirst);
+
+    LoggedSqlCollector.stop();
+  }
+
+  private void updateBasic(EcbmPerson bean) {
+
+    bean.setName("Fiona64-mod-0");
+    Ebean.save(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("update ecbm_person");
+
+    updateBoth(bean);
+  }
+
+  private void updateBoth(EcbmPerson bean) {
+
+    bean.setName("Fiona64-mod-both");
+    bean.getPhoneNumbers().put("more", new EcPhone("01", "234", "123"));
+    Ebean.save(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(3);
+    assertThat(sql.get(0)).contains("update ecbm_person set name=?, version=? where id=? and version=?");
+    assertThat(sql.get(1)).contains("delete from ecbm_person_phone_numbers where person_id=?");
+    assertThat(sql.get(2)).contains("insert into ecbm_person_phone_numbers (person_id,key,country_code,area,number)");
+
+    updateNothing(bean);
+  }
+
+  private void updateNothing(EcbmPerson bean) {
+
+    Ebean.save(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(0);
+
+    updateOnlyCollection(bean);
+  }
+
+  private void updateOnlyCollection(EcbmPerson bean) {
+
+    bean.getPhoneNumbers().put("other", new EcPhone("01", "12", "4321"));
+    Ebean.save(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id=?");
+    assertThat(sql.get(1)).contains("insert into ecbm_person_phone_numbers (person_id,key,country_code,area,number) values (?,?,?,?,?)");
+
+    delete(bean);
+  }
+
+  private void delete(EcbmPerson bean) {
+
+    Ebean.delete(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id = ?");
+    assertThat(sql.get(1)).contains("delete from ecbm_person where id=? and version=?");
+  }
+
+  private void jsonToFrom(EcbmPerson foundFirst) {
+    String asJson = Ebean.json().toJson(foundFirst);
+
+    EcbmPerson fromJson = Ebean.json().toBean(EcbmPerson.class, asJson);
+
+    String phoneString = fromJson.getPhoneNumbers().toString();
+    assertThat(phoneString).contains("64-021-1234");
+    assertThat(phoneString).contains("64-021-4321");
+  }
+
+}

From 07946cd5051508022e5b6b040b785a0690637cbe Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 28 Mar 2018 17:31:53 +1300
Subject: [PATCH 0209/1036] #115 - Mapping - Add support for @ElementCollection
 enhancement

Add element collection notification - combine into preUpdate/postUpdate of the bean
---
 .../server/core/PersistRequestBean.java       | 50 +++++++++++-
 .../deploy/BeanLifecycleAdapterFactory.java   |  3 -
 .../server/persist/DefaultPersister.java      |  7 +-
 .../persist/SaveManyElementCollection.java    |  5 +-
 .../persist/SaveManyElementCollectionMap.java |  6 +-
 .../EcPersonPersistAdapter.java               | 58 ++++++++++++++
 .../TestElementCollectionBasic.java           | 77 +++++++++++++++++++
 7 files changed, 193 insertions(+), 13 deletions(-)
 create mode 100644 src/test/java/org/tests/model/elementcollection/EcPersonPersistAdapter.java

diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index 33f72c636..283d426bd 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -154,6 +154,11 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    */
   private boolean getterCallback;
 
+  /**
+   * postUpdate notifications. Used to combine bean and element update updates into single postUpdate event.
+   */
+  private int pendingPostUpdateNotify;
+
   public PersistRequestBean(SpiEbeanServer server, T bean, Object parentBean, BeanManager<T> mgr, SpiTransaction t,
                             PersistExecute persistExecute, PersistRequest.Type type, int flags) {
 
@@ -337,11 +342,16 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
 
   @Override
   public void preGetterTrigger(int propertyIndex) {
-    if (propertyIndex < 0 || beanDescriptor.isGeneratedProperty(propertyIndex)) {
+    if (flushBatchOnGetter(propertyIndex)) {
       transaction.flushBatch();
     }
   }
 
+  private boolean flushBatchOnGetter(int propertyIndex) {
+    // propertyIndex of -1 the Id property, no flush for get Id on UPDATE
+    return propertyIndex == -1 ? type == Type.INSERT : beanDescriptor.isGeneratedProperty(propertyIndex);
+  }
+
   public void setSkipBatchForTopLevel() {
     skipBatchForTopLevel = true;
   }
@@ -858,6 +868,16 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
     }
   }
 
+  private void postUpdateNotify() {
+    if (pendingPostUpdateNotify > 0) {
+      // invoke the delayed postUpdate notification (combined with element collection update)
+      controller.postUpdate(this);
+    } else {
+      // batched update with no element collection, send postUpdate notification once it executes
+      pendingPostUpdateNotify = -1;
+    }
+  }
+
   /**
    * Aggressive L1 and L2 cache cleanup for deletes.
    */
@@ -905,13 +925,38 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
     }
   }
 
+  /**
+   * Ensure the preUpdate event fires (for case where only element collection has changed).
+   */
+  public void preElementCollectionUpdate() {
+    if (controller != null && !dirty) {
+      // fire preUpdate notification when only element collection updated
+      controller.preUpdate(this);
+    }
+  }
+
+  /**
+   * Combine with the beans postUpdate event notification.
+   */
+  public void postElementCollectionUpdate() {
+    if (controller != null) {
+      pendingPostUpdateNotify += 2;
+    }
+  }
+
   private void controllerPost() {
     switch (type) {
       case INSERT:
         controller.postInsert(this);
         break;
       case UPDATE:
-        controller.postUpdate(this);
+        if (pendingPostUpdateNotify == -1) {
+          // notify now - batched bean update with no element collection
+          controller.postUpdate(this);
+        } else {
+          // delay notify to combine with element collection update
+          pendingPostUpdateNotify++;
+        }
         break;
       case SOFT_DELETE:
         controller.postSoftDelete(this);
@@ -1031,6 +1076,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
       setNotifyCache();
       addEvent();
     }
+    postUpdateNotify();
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java b/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java
index ae6e670f0..f9bdcd224 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java
@@ -102,7 +102,6 @@ class BeanLifecycleAdapterFactory {
         postInserts.add(method);
         hasPersistMethods = true;
       }
-
       if (method.isAnnotationPresent(PreUpdate.class)) {
         preUpdates.add(method);
         hasPersistMethods = true;
@@ -111,7 +110,6 @@ class BeanLifecycleAdapterFactory {
         postUpdates.add(method);
         hasPersistMethods = true;
       }
-
       if (method.isAnnotationPresent(PreRemove.class)) {
         preDeletes.add(method);
         hasPersistMethods = true;
@@ -128,7 +126,6 @@ class BeanLifecycleAdapterFactory {
         postSoftDeletes.add(method);
         hasPersistMethods = true;
       }
-
       if (method.isAnnotationPresent(PostLoad.class)) {
         postLoads.add(method);
       }
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index b16a0ced8..c3cb2dcda 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -510,11 +510,8 @@ public final class DefaultPersister implements Persister {
       if (request.isDirty()) {
         request.executeOrQueue();
 
-      } else {
-        // skip validation on unchanged bean
-        if (logger.isDebugEnabled()) {
-          logger.debug(Message.msg("persist.update.skipped", request.getBean()));
-        }
+      } else if (logger.isDebugEnabled()) {
+        logger.debug(Message.msg("persist.update.skipped", request.getBean()));
       }
 
       if (request.isPersistCascade()) {
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java
index 1867421fa..402a5e80a 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java
@@ -27,10 +27,10 @@ class SaveManyElementCollection extends SaveManyBase {
     }
 
     Object parentId = request.getBeanId();
-
     SpiEbeanServer server = request.getServer();
 
     if (!insertedParent) {
+      request.preElementCollectionUpdate();
       SqlUpdate sqlDelete = many.deleteByParentId(parentId, null);
       server.execute(sqlDelete, transaction);
     }
@@ -49,5 +49,8 @@ class SaveManyElementCollection extends SaveManyBase {
 
     transaction.depth(-1);
     resetModifyState();
+    if (!insertedParent) {
+      request.postElementCollectionUpdate();
+    }
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java
index 3ba94d781..e19b7e314 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java
@@ -29,10 +29,9 @@ class SaveManyElementCollectionMap extends SaveManyBase {
     }
 
     Object parentId = request.getBeanId();
-
     SpiEbeanServer server = request.getServer();
-
     if (!insertedParent) {
+      request.preElementCollectionUpdate();
       SqlUpdate sqlDelete = many.deleteByParentId(parentId, null);
       server.execute(sqlDelete, transaction);
     }
@@ -51,5 +50,8 @@ class SaveManyElementCollectionMap extends SaveManyBase {
 
     transaction.depth(-1);
     resetModifyState();
+    if (!insertedParent) {
+      request.postElementCollectionUpdate();
+    }
   }
 }
diff --git a/src/test/java/org/tests/model/elementcollection/EcPersonPersistAdapter.java b/src/test/java/org/tests/model/elementcollection/EcPersonPersistAdapter.java
new file mode 100644
index 000000000..02dd4c191
--- /dev/null
+++ b/src/test/java/org/tests/model/elementcollection/EcPersonPersistAdapter.java
@@ -0,0 +1,58 @@
+package org.tests.model.elementcollection;
+
+import io.ebean.event.BeanPersistAdapter;
+import io.ebean.event.BeanPersistRequest;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class EcPersonPersistAdapter extends BeanPersistAdapter {
+
+  private static List<String> LOG = new ArrayList<>();
+
+  static List<String> eventLog() {
+    List copy = new ArrayList(LOG);
+    LOG.clear();
+    return copy;
+  }
+
+  @Override
+  public boolean isRegisterFor(Class<?> cls) {
+    return cls.equals(EcPerson.class);
+  }
+
+
+  @Override
+  public boolean preInsert(BeanPersistRequest<?> request) {
+    LOG.add("preInsert");
+    return true;
+  }
+
+  @Override
+  public void postInsert(BeanPersistRequest<?> request) {
+    LOG.add("postInsert");
+  }
+
+  @Override
+  public boolean preUpdate(BeanPersistRequest<?> request) {
+    LOG.add("preUpdate");
+    return true;
+  }
+
+  @Override
+  public void postUpdate(BeanPersistRequest<?> request) {
+    LOG.add("postUpdate");
+  }
+
+  @Override
+  public boolean preDelete(BeanPersistRequest<?> request) {
+    LOG.add("preDelete");
+    return true;
+  }
+
+  @Override
+  public void postDelete(BeanPersistRequest<?> request) {
+    LOG.add("postDelete");
+  }
+
+}
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
index b55b3dba2..0dea97952 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
@@ -2,6 +2,7 @@ package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.Transaction;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -11,6 +12,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestElementCollectionBasic extends BaseTestCase {
 
+  private List<String> eventLog() {
+    return EcPersonPersistAdapter.eventLog();
+  }
+
   @Test
   public void test() {
 
@@ -21,6 +26,8 @@ public class TestElementCollectionBasic extends BaseTestCase {
     person.getPhoneNumbers().add("021 4321");
     Ebean.save(person);
 
+    assertThat(eventLog()).containsExactly("preInsert", "postInsert");
+
     List<String> sql = LoggedSqlCollector.current();
     assertThat(sql).hasSize(2);
     assertThat(sql.get(0)).contains("insert into ec_person");
@@ -31,6 +38,8 @@ public class TestElementCollectionBasic extends BaseTestCase {
     person1.getPhoneNumbers().add("09 4321");
     Ebean.save(person1);
 
+    assertThat(eventLog()).containsExactly("preInsert", "postInsert");
+
     LoggedSqlCollector.current();
 
     List<EcPerson> found =
@@ -82,6 +91,26 @@ public class TestElementCollectionBasic extends BaseTestCase {
     assertThat(sql).hasSize(1);
     assertThat(sql.get(0)).contains("update ec_person");
 
+    assertThat(eventLog()).containsExactly("preUpdate", "postUpdate");
+
+    updateBasicInBatch(bean);
+  }
+
+  private void updateBasicInBatch(EcPerson bean) {
+
+    try (Transaction txn = Ebean.beginTransaction()) {
+      txn.setBatchMode(true);
+      bean.setName("Fiona021-mod-0-batch");
+      Ebean.save(bean);
+      txn.commit();
+    }
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("update ec_person");
+
+    assertThat(eventLog()).containsExactly("preUpdate", "postUpdate");
+
     updateBoth(bean);
   }
 
@@ -97,6 +126,29 @@ public class TestElementCollectionBasic extends BaseTestCase {
     assertThat(sql.get(1)).contains("delete from ec_person_phone where owner_id=?");
     assertThat(sql.get(2)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
 
+    assertThat(eventLog()).containsExactly("preUpdate", "postUpdate");
+
+    updateBothInBatch(bean);
+  }
+
+  private void updateBothInBatch(EcPerson bean) {
+
+    try (Transaction txn = Ebean.beginTransaction()) {
+      txn.setBatchMode(true);
+      bean.setName("Fiona021-mod-both-batch");
+      bean.getPhoneNumbers().add("01-22123");
+      Ebean.save(bean);
+      txn.commit();
+    }
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(3);
+    assertThat(sql.get(0)).contains("update ec_person set name=?, version=? where id=? and version=?");
+    assertThat(sql.get(1)).contains("delete from ec_person_phone where owner_id=?");
+    assertThat(sql.get(2)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
+
+    assertThat(eventLog()).containsExactly("preUpdate", "postUpdate");
+
     updateNothing(bean);
   }
 
@@ -107,6 +159,27 @@ public class TestElementCollectionBasic extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.current();
     assertThat(sql).hasSize(0);
 
+    assertThat(eventLog()).isEmpty();
+
+    updateOnlyCollectionInBatch(bean);
+  }
+
+  private void updateOnlyCollectionInBatch(EcPerson bean) {
+
+    try (Transaction txn = Ebean.beginTransaction()) {
+      txn.setBatchMode(true);
+      bean.getPhoneNumbers().add("01-4321");
+      Ebean.save(bean);
+      txn.commit();
+    }
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("delete from ec_person_phone where owner_id=?");
+    assertThat(sql.get(1)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
+
+    assertThat(eventLog()).containsExactly("preUpdate", "postUpdate");
+
     updateOnlyCollection(bean);
   }
 
@@ -120,6 +193,8 @@ public class TestElementCollectionBasic extends BaseTestCase {
     assertThat(sql.get(0)).contains("delete from ec_person_phone where owner_id=?");
     assertThat(sql.get(1)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
 
+    assertThat(eventLog()).containsExactly("preUpdate", "postUpdate");
+
     delete(bean);
   }
 
@@ -131,6 +206,8 @@ public class TestElementCollectionBasic extends BaseTestCase {
     assertThat(sql).hasSize(2);
     assertThat(sql.get(0)).contains("delete from ec_person_phone where owner_id = ?");
     assertThat(sql.get(1)).contains("delete from ec_person where id=? and version=?");
+
+    assertThat(eventLog()).containsExactly("preDelete", "postDelete");
   }
 
   private void jsonToFrom(EcPerson foundFirst) {

From acd5578d8a980e6d661c5cbabd7d1aa5ffbac700 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 29 Mar 2018 01:15:58 +1300
Subject: [PATCH 0210/1036] #115 - Mapping - Add support for @ElementCollection
 enhancement

Add element collection L2 cache support
---
 .../ebean/common/AbstractBeanCollection.java  |  2 +-
 .../io/ebeaninternal/api/SpiJsonContext.java  | 10 ++-
 .../ebeaninternal/api/json/SpiJsonReader.java | 36 ++++++++
 .../text => api}/json/SpiJsonWriter.java      | 10 ++-
 .../server/cache/CachedBeanDataFromBean.java  |  7 ++
 .../server/cache/CachedBeanDataToBean.java    | 12 +--
 .../server/core/PersistRequestBean.java       | 65 ++++++++++++--
 .../server/deploy/BaseCollectionHelp.java     |  2 +-
 .../server/deploy/BeanChangeJson.java         |  6 +-
 .../server/deploy/BeanCollectionHelp.java     |  2 +-
 .../server/deploy/BeanDescriptor.java         | 20 +++--
 .../deploy/BeanDescriptorCacheHelp.java       | 67 +++++++-------
 .../deploy/BeanDescriptorElementEmbedded.java |  8 +-
 .../BeanDescriptorElementEmbeddedMap.java     |  6 +-
 .../deploy/BeanDescriptorElementScalar.java   |  6 +-
 .../BeanDescriptorElementScalarMap.java       |  6 +-
 .../server/deploy/BeanDescriptorJsonHelp.java | 10 +--
 .../server/deploy/BeanListHelp.java           |  2 +-
 .../server/deploy/BeanListHelpElement.java    |  2 +-
 .../server/deploy/BeanMapHelp.java            |  2 +-
 .../server/deploy/BeanMapHelpElement.java     |  2 +-
 .../server/deploy/BeanProperty.java           |  6 +-
 .../server/deploy/BeanPropertyAssocMany.java  | 73 +++++++++++++--
 .../deploy/BeanPropertyAssocManyJsonHelp.java |  6 +-
 .../BeanPropertyAssocManyJsonTransient.java   |  4 +-
 .../server/deploy/BeanPropertyAssocOne.java   |  6 +-
 .../deploy/BeanPropertySimpleCollection.java  |  4 +-
 .../server/deploy/BeanSetHelp.java            |  2 +-
 .../server/deploy/BeanSetHelpElement.java     |  2 +-
 .../server/deploy/ElementHelpList.java        |  7 +-
 .../server/deploy/ElementHelpMap.java         |  7 +-
 .../server/deploy/ElementHelpSet.java         |  7 +-
 .../deploy/parse/AnnotationAssocManys.java    |  2 +-
 .../server/persist/SaveManyBase.java          | 19 ++++
 .../persist/SaveManyElementCollection.java    |  4 +-
 .../persist/SaveManyElementCollectionMap.java |  4 +-
 .../server/text/json/DJsonBeanReader.java     |  7 +-
 .../server/text/json/DJsonContext.java        | 20 +++--
 .../server/text/json/ReadJson.java            | 22 +++--
 .../server/text/json/WriteJson.java           | 10 ++-
 .../deploy/TestDiffHelpInsertSimple.java      |  4 +-
 .../TestDiffHelpInsertWithEmbedded.java       |  4 +-
 .../model/elementcollection/EcPerson.java     |  3 +
 .../model/elementcollection/EcblPerson.java   |  3 +
 .../model/elementcollection/EcbmPerson.java   |  4 +-
 .../model/elementcollection/EcmPerson.java    |  3 +
 .../TestElementCollectionBasicCache.java      | 80 +++++++++++++++++
 .../TestElementCollectionBasicMapCache.java   | 85 ++++++++++++++++++
 ...estElementCollectionEmbeddedListCache.java | 88 ++++++++++++++++++
 .../TestElementCollectionEmbeddedMap.java     |  4 +-
 ...TestElementCollectionEmbeddedMapCache.java | 89 +++++++++++++++++++
 .../json/TestJsonBeanDescriptorParse.java     |  7 +-
 52 files changed, 734 insertions(+), 135 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/api/json/SpiJsonReader.java
 rename src/main/java/io/ebeaninternal/{server/text => api}/json/SpiJsonWriter.java (90%)
 create mode 100644 src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java
 create mode 100644 src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java
 create mode 100644 src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java
 create mode 100644 src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java

diff --git a/src/main/java/io/ebean/common/AbstractBeanCollection.java b/src/main/java/io/ebean/common/AbstractBeanCollection.java
index ca5493d2a..33b30f3ac 100644
--- a/src/main/java/io/ebean/common/AbstractBeanCollection.java
+++ b/src/main/java/io/ebean/common/AbstractBeanCollection.java
@@ -63,7 +63,7 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
     this.ebeanServerName = loader.getName();
     this.ownerBean = ownerBean;
     this.propertyName = propertyName;
-    this.readOnly = ownerBean._ebean_getIntercept().isReadOnly();
+    this.readOnly = ownerBean != null && ownerBean._ebean_getIntercept().isReadOnly();
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/api/SpiJsonContext.java b/src/main/java/io/ebeaninternal/api/SpiJsonContext.java
index 4be1a3034..2700ed60e 100644
--- a/src/main/java/io/ebeaninternal/api/SpiJsonContext.java
+++ b/src/main/java/io/ebeaninternal/api/SpiJsonContext.java
@@ -1,9 +1,11 @@
 package io.ebeaninternal.api;
 
 import com.fasterxml.jackson.core.JsonGenerator;
+import io.ebean.plugin.BeanType;
 import io.ebean.text.json.JsonContext;
 import io.ebean.text.json.JsonWriteOptions;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
+import io.ebeaninternal.api.json.SpiJsonReader;
+import io.ebeaninternal.api.json.SpiJsonWriter;
 
 import java.io.Writer;
 
@@ -21,4 +23,10 @@ public interface SpiJsonContext extends JsonContext {
    * Create a Json Writer for writing beans as JSON supplying a writer.
    */
   SpiJsonWriter createJsonWriter(Writer writer);
+
+  /**
+   * Create a Json Reader for reading the JSON content.
+   */
+  SpiJsonReader createJsonRead(BeanType<?> beanType, String json);
+
 }
diff --git a/src/main/java/io/ebeaninternal/api/json/SpiJsonReader.java b/src/main/java/io/ebeaninternal/api/json/SpiJsonReader.java
new file mode 100644
index 000000000..aaf4e2ce8
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/api/json/SpiJsonReader.java
@@ -0,0 +1,36 @@
+package io.ebeaninternal.api.json;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.ebean.bean.EntityBean;
+import io.ebean.bean.PersistenceContext;
+import io.ebeaninternal.server.deploy.BeanDescriptor;
+
+import java.io.IOException;
+import java.util.Map;
+
+public interface SpiJsonReader {
+
+  PersistenceContext getPersistenceContext();
+
+  SpiJsonReader forJson(JsonParser moreJson, boolean resetContext);
+
+  <T> void persistenceContextPut(Object beanId, T currentBean);
+
+  Object persistenceContextPutIfAbsent(Object id, EntityBean bean, BeanDescriptor<?> beanDesc);
+
+  ObjectMapper getObjectMapper();
+
+  JsonParser getParser();
+
+  JsonToken nextToken() throws IOException;
+
+  void pushPath(String path);
+
+  void popPath();
+
+  void beanVisitor(Object bean, Map<String, Object> unmappedProperties);
+
+  Object readValueUsingObjectMapper(Class<?> propertyType) throws IOException;
+}
diff --git a/src/main/java/io/ebeaninternal/server/text/json/SpiJsonWriter.java b/src/main/java/io/ebeaninternal/api/json/SpiJsonWriter.java
similarity index 90%
rename from src/main/java/io/ebeaninternal/server/text/json/SpiJsonWriter.java
rename to src/main/java/io/ebeaninternal/api/json/SpiJsonWriter.java
index ebcb88379..4fd44f183 100644
--- a/src/main/java/io/ebeaninternal/server/text/json/SpiJsonWriter.java
+++ b/src/main/java/io/ebeaninternal/api/json/SpiJsonWriter.java
@@ -1,9 +1,10 @@
-package io.ebeaninternal.server.text.json;
+package io.ebeaninternal.api.json;
 
 import io.ebean.bean.EntityBean;
 import io.ebean.text.json.JsonWriter;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 
+import java.io.IOException;
 import java.util.Collection;
 
 /**
@@ -11,6 +12,11 @@ import java.util.Collection;
  */
 public interface SpiJsonWriter extends JsonWriter {
 
+  /**
+   * Flush the buffer.
+   */
+  void flush() throws IOException;
+
   /**
    * Return true if the value is a parent bean.
    */
@@ -60,7 +66,7 @@ public interface SpiJsonWriter extends JsonWriter {
    * Write value using underlying Jaskson object mapper if available.
    */
   void writeValueUsingObjectMapper(String name, Object value);
-  
+
   /**
    * Write the bean properties.
    */
diff --git a/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java b/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java
index 1de76f18a..e894a8710 100644
--- a/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java
+++ b/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java
@@ -4,6 +4,7 @@ import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanProperty;
+import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -33,6 +34,12 @@ public class CachedBeanDataFromBean {
       }
     }
 
+    for (BeanPropertyAssocMany<?> prop : desc.propertiesMany()) {
+      if (prop.isElementCollection()) {
+        data.put(prop.getName(), prop.getCacheDataValue(bean));
+      }
+    }
+
     long version = desc.getVersion(bean);
     EntityBean sharableBean = createSharableBean(desc, bean, ebi);
     return new CachedBeanData(sharableBean, desc.getDiscValue(), data, version);
diff --git a/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java b/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java
index beee32400..05b2a0d1f 100644
--- a/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java
+++ b/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java
@@ -21,14 +21,16 @@ public class CachedBeanDataToBean {
     }
 
     // load the non-many properties
-    BeanProperty[] props = desc.propertiesNonMany();
-    for (BeanProperty prop : props) {
+    for (BeanProperty prop : desc.propertiesNonMany()) {
       loadProperty(bean, cacheBeanData, ebi, prop, context);
     }
 
-    BeanPropertyAssocMany<?>[] many = desc.propertiesMany();
-    for (BeanPropertyAssocMany<?> aMany : many) {
-      aMany.createReferenceIfNull(bean);
+    for (BeanPropertyAssocMany<?> prop : desc.propertiesMany()) {
+      if (prop.isElementCollection()) {
+        loadProperty(bean, cacheBeanData, ebi, prop, context);
+      } else {
+        prop.createReferenceIfNull(bean);
+      }
     }
 
     ebi.setLoadedLazy();
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index 283d426bd..07618f6b9 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -35,6 +35,7 @@ import javax.persistence.PersistenceException;
 import java.io.IOException;
 import java.sql.Statement;
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -107,6 +108,11 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    */
   private boolean updatedManysOnly;
 
+  /**
+   * Element collection change as part of bean cache.
+   */
+  private Map<String, Object> collectionChanges;
+
   /**
    * Many properties that were cascade saved (and hence might need caches updated later).
    */
@@ -938,10 +944,14 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   /**
    * Combine with the beans postUpdate event notification.
    */
-  public void postElementCollectionUpdate() {
+  public boolean postElementCollectionUpdate() {
     if (controller != null) {
       pendingPostUpdateNotify += 2;
     }
+    if (!dirty) {
+      setNotifyCache();
+    }
+    return notifyCache;
   }
 
   private void controllerPost() {
@@ -1079,13 +1089,6 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
     postUpdateNotify();
   }
 
-  /**
-   * Return true if only many properties where updated.
-   */
-  public boolean isUpdatedManysOnly() {
-    return updatedManysOnly;
-  }
-
   /**
    * For requests that update document store add this event to either the list
    * of queue events or list of update events.
@@ -1311,4 +1314,50 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   public boolean isInsertedParent() {
     return Flags.isInsert(flags);
   }
+
+  /**
+   * Add an element collection change to L2 bean cache update.
+   */
+  public void addCollectionChange(String name, Object value) {
+    if (collectionChanges == null) {
+      collectionChanges = new LinkedHashMap<>();
+    }
+    collectionChanges.put(name, value);
+  }
+
+  /**
+   * Build the bean update for the L2 cache.
+   */
+  public void addBeanUpdate(CacheChangeSet changeSet) {
+
+    if (!updatedManysOnly || collectionChanges != null) {
+
+      boolean updateNaturalKey = false;
+
+      Map<String, Object> changes = new LinkedHashMap<>();
+      EntityBean bean = getEntityBean();
+      boolean[] dirtyProperties = getDirtyProperties();
+      if (dirtyProperties != null) {
+        for (int i = 0; i < dirtyProperties.length; i++) {
+          if (dirtyProperties[i]) {
+            BeanProperty property = beanDescriptor.propertyByIndex(i);
+            if (property.isCacheDataInclude()) {
+              Object val = property.getCacheDataValue(bean);
+              changes.put(property.getName(), val);
+              if (property.isNaturalKey()) {
+                updateNaturalKey = true;
+                changeSet.addNaturalKeyPut(beanDescriptor, idValue, val);
+              }
+            }
+          }
+        }
+      }
+      if (collectionChanges != null) {
+        // add element collection update
+        changes.putAll(collectionChanges);
+      }
+
+      changeSet.addBeanUpdate(beanDescriptor, idValue, changes, updateNaturalKey, getVersion());
+    }
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java
index 4d8dbda97..576d9a12b 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.deploy;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanCollectionLoader;
 import io.ebean.bean.EntityBean;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
+import io.ebeaninternal.api.json.SpiJsonWriter;
 
 import java.io.IOException;
 import java.util.Collection;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanChangeJson.java b/src/main/java/io/ebeaninternal/server/deploy/BeanChangeJson.java
index ae77429a0..e2a6938ff 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanChangeJson.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanChangeJson.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.deploy;
 
 import io.ebean.PersistenceIOException;
 import io.ebean.bean.BeanDiffVisitor;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
+import io.ebeaninternal.api.json.SpiJsonWriter;
 import io.ebeaninternal.server.util.ArrayStack;
 
 import java.io.IOException;
@@ -82,10 +82,10 @@ class BeanChangeJson implements BeanDiffVisitor {
   void flush() {
     try {
       newJson.writeEndObject();
-      newJson.gen().flush();
+      newJson.flush();
       if (oldJson != null) {
         oldJson.writeEndObject();
-        oldJson.gen().flush();
+        oldJson.flush();
       }
     } catch (IOException e) {
       throw new PersistenceIOException(e);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java
index 569e22403..ede034939 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java
@@ -7,8 +7,8 @@ import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanCollectionAdd;
 import io.ebean.bean.BeanCollectionLoader;
 import io.ebean.bean.EntityBean;
+import io.ebeaninternal.api.json.SpiJsonWriter;
 import io.ebeaninternal.server.query.CQueryCollectionAdd;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
 
 import java.io.IOException;
 import java.util.Collection;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 620b6e1fd..1bc379e7e 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -41,6 +41,8 @@ import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.SpiUpdatePlan;
 import io.ebeaninternal.api.TransactionEventTable.TableIUD;
+import io.ebeaninternal.api.json.SpiJsonReader;
+import io.ebeaninternal.api.json.SpiJsonWriter;
 import io.ebeaninternal.server.cache.CacheChangeSet;
 import io.ebeaninternal.server.cache.CachedBeanData;
 import io.ebeaninternal.server.cache.CachedManyIds;
@@ -71,8 +73,6 @@ import io.ebeaninternal.server.query.STreeType;
 import io.ebeaninternal.server.query.SqlBeanLoad;
 import io.ebeaninternal.server.querydefn.OrmQueryDetail;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
-import io.ebeaninternal.server.text.json.ReadJson;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
 import io.ebeaninternal.server.type.DataBind;
 import io.ebeaninternal.server.type.ScalarType;
 import io.ebeaninternal.util.SortByClause;
@@ -662,6 +662,10 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return properties;
   }
 
+  public BeanProperty propertyByIndex(int pos) {
+    return propertiesIndex[pos];
+  }
+
   /**
    * Initialise the Id properties first.
    * <p>
@@ -945,7 +949,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
       SpiJsonWriter jsonWriter = createJsonWriter(writer);
 
       jsonWriteForInsert(jsonWriter, request.getEntityBean());
-      jsonWriter.gen().flush();
+      jsonWriter.flush();
 
       return beanChange(ChangeType.INSERT, request.getBeanId(), writer.toString(), null);
 
@@ -959,6 +963,10 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return ebeanServer.jsonExtended().createJsonWriter(writer);
   }
 
+  SpiJsonReader createJsonReader(String json) {
+    return ebeanServer.jsonExtended().createJsonRead(this, json);
+  }
+
   /**
    * Populate the diff for inserts with flattened non-null property values.
    */
@@ -3355,7 +3363,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     throw new IllegalStateException("Unexpected - expect Element override");
   }
 
-  public Object jsonReadCollection(ReadJson readJson, EntityBean parentBean) throws IOException {
+  public Object jsonReadCollection(SpiJsonReader readJson, EntityBean parentBean) throws IOException {
     throw new IllegalStateException("Unexpected - expect Element override");
   }
 
@@ -3371,11 +3379,11 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     jsonHelp.jsonWriteProperties(writeJson, bean);
   }
 
-  public T jsonRead(ReadJson jsonRead, String path) throws IOException {
+  public T jsonRead(SpiJsonReader jsonRead, String path) throws IOException {
     return jsonHelp.jsonRead(jsonRead, path);
   }
 
-  protected T jsonReadObject(ReadJson jsonRead, String path) throws IOException {
+  protected T jsonReadObject(SpiJsonReader jsonRead, String path) throws IOException {
     return jsonHelp.jsonReadObject(jsonRead, path);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index ac131a884..51d6b9fbf 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -20,6 +20,7 @@ import io.ebeaninternal.server.transaction.DefaultPersistenceContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -272,6 +273,11 @@ final class BeanDescriptorCacheHelp<T> {
    */
   boolean manyPropLoad(BeanPropertyAssocMany<?> many, BeanCollection<?> bc, Object parentId, Boolean readOnly) {
 
+    if (many.isElementCollection()) {
+      // held as part of the bean cache so skip
+			return false;
+    }
+
     CachedManyIds entry = manyPropGet(parentId, many.getName());
     if (entry == null) {
       // not in cache so return unsuccessful
@@ -298,9 +304,29 @@ final class BeanDescriptorCacheHelp<T> {
    */
   void manyPropPut(BeanPropertyAssocMany<?> many, Object details, Object parentId) {
 
-    CachedManyIds entry = createManyIds(many, details);
-    if (entry != null) {
-      cachePutManyIds(parentId, many.getName(), entry);
+    if (many.isElementCollection()) {
+      CachedBeanData data = (CachedBeanData) beanCache.get(parentId);
+      if (data != null) {
+        try {
+          // add as JSON to bean cache
+          String asJson = many.jsonWriteCollection(details);
+          Map<String,Object> changes = new HashMap<>();
+          changes.put(many.getName(), asJson);
+
+          CachedBeanData newData = data.update(changes, data.getVersion());
+          if (beanLog.isDebugEnabled()) {
+            beanLog.debug("   UPDATE {}({})  changes:{}", cacheName, parentId, changes);
+          }
+          beanCache.put(parentId, newData);
+        } catch (IOException e) {
+          logger.error("Error updating L2 cache", e);
+        }
+      }
+    } else {
+      CachedManyIds entry = createManyIds(many, details);
+      if (entry != null) {
+        cachePutManyIds(parentId, many.getName(), entry);
+      }
     }
   }
 
@@ -730,38 +756,17 @@ final class BeanDescriptorCacheHelp<T> {
     List<BeanPropertyAssocMany<?>> manyCollections = updateRequest.getUpdatedManyCollections();
     if (manyCollections != null) {
       for (BeanPropertyAssocMany<?> many : manyCollections) {
-        Object details = many.getValue(updateRequest.getEntityBean());
-        CachedManyIds entry = createManyIds(many, details);
-        if (entry != null) {
-          changeSet.addManyPut(desc, many.getName(), id, entry);
-        }
-      }
-    }
-
-    // check if the bean itself was updated
-    if (!updateRequest.isUpdatedManysOnly()) {
-
-      boolean updateNaturalKey = false;
-
-      Map<String, Object> changes = new LinkedHashMap<>();
-      EntityBean bean = updateRequest.getEntityBean();
-      boolean[] dirtyProperties = updateRequest.getDirtyProperties();
-      for (int i = 0; i < dirtyProperties.length; i++) {
-        if (dirtyProperties[i]) {
-          BeanProperty property = desc.propertiesIndex[i];
-          if (property.isCacheDataInclude()) {
-            Object val = property.getCacheDataValue(bean);
-            changes.put(property.getName(), val);
-            if (property.isNaturalKey()) {
-              updateNaturalKey = true;
-              changeSet.addNaturalKeyPut(desc, id, val);
-            }
+        if (!many.isElementCollection()) {
+          Object details = many.getValue(updateRequest.getEntityBean());
+          CachedManyIds entry = createManyIds(many, details);
+          if (entry != null) {
+            changeSet.addManyPut(desc, many.getName(), id, entry);
           }
         }
       }
-
-      changeSet.addBeanUpdate(desc, id, changes, updateNaturalKey, updateRequest.getVersion());
     }
+
+    updateRequest.addBeanUpdate(changeSet);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java
index cb17a9492..6d24e4569 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java
@@ -3,9 +3,9 @@ package io.ebeaninternal.server.deploy;
 import io.ebean.PersistenceIOException;
 import io.ebean.SqlUpdate;
 import io.ebean.bean.EntityBean;
+import io.ebeaninternal.api.json.SpiJsonReader;
+import io.ebeaninternal.api.json.SpiJsonWriter;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
-import io.ebeaninternal.server.text.json.ReadJson;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
 
 import java.io.IOException;
 
@@ -56,12 +56,12 @@ class BeanDescriptorElementEmbedded<T> extends BeanDescriptorElement<T> {
   }
 
   @Override
-  public T jsonRead(ReadJson jsonRead, String path) throws IOException {
+  public T jsonRead(SpiJsonReader jsonRead, String path) throws IOException {
     return readJsonElement(jsonRead, path);
   }
 
   @SuppressWarnings("unchecked")
-  T readJsonElement(ReadJson jsonRead, String path) throws IOException {
+  T readJsonElement(SpiJsonReader jsonRead, String path) throws IOException {
     return (T)targetDescriptor.jsonRead(jsonRead, path);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java
index 49b85d699..c30ff9a33 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java
@@ -3,9 +3,9 @@ package io.ebeaninternal.server.deploy;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import io.ebean.bean.EntityBean;
+import io.ebeaninternal.api.json.SpiJsonReader;
+import io.ebeaninternal.api.json.SpiJsonWriter;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
-import io.ebeaninternal.server.text.json.ReadJson;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
 import io.ebeaninternal.server.type.ScalarType;
 
 import java.io.IOException;
@@ -47,7 +47,7 @@ class BeanDescriptorElementEmbeddedMap<T> extends BeanDescriptorElementEmbedded<
   }
 
   @Override
-  public Object jsonReadCollection(ReadJson readJson, EntityBean parentBean) throws IOException {
+  public Object jsonReadCollection(SpiJsonReader readJson, EntityBean parentBean) throws IOException {
 
     JsonParser parser = readJson.getParser();
     ElementCollector add = elementHelp.createCollector();
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalar.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalar.java
index 1b7ac70ea..236d664d3 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalar.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalar.java
@@ -5,9 +5,9 @@ import com.fasterxml.jackson.core.JsonToken;
 import io.ebean.PersistenceIOException;
 import io.ebean.SqlUpdate;
 import io.ebean.bean.EntityBean;
+import io.ebeaninternal.api.json.SpiJsonReader;
+import io.ebeaninternal.api.json.SpiJsonWriter;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
-import io.ebeaninternal.server.text.json.ReadJson;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
 import io.ebeaninternal.server.type.ScalarType;
 
 import java.io.IOException;
@@ -38,7 +38,7 @@ class BeanDescriptorElementScalar<T> extends BeanDescriptorElement<T> {
   }
 
   @Override
-  public Object jsonReadCollection(ReadJson readJson, EntityBean parentBean) throws IOException {
+  public Object jsonReadCollection(SpiJsonReader readJson, EntityBean parentBean) throws IOException {
 
     JsonParser parser = readJson.getParser();
     ElementCollector add = elementHelp.createCollector();
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java
index 9eb87ba0b..96cb172f0 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java
@@ -3,9 +3,9 @@ package io.ebeaninternal.server.deploy;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import io.ebean.bean.EntityBean;
+import io.ebeaninternal.api.json.SpiJsonReader;
+import io.ebeaninternal.api.json.SpiJsonWriter;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
-import io.ebeaninternal.server.text.json.ReadJson;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
 import io.ebeaninternal.server.type.ScalarType;
 
 import java.io.IOException;
@@ -51,7 +51,7 @@ class BeanDescriptorElementScalarMap<T> extends BeanDescriptorElement<T> {
   }
 
   @Override
-  public Object jsonReadCollection(ReadJson readJson, EntityBean parentBean) throws IOException {
+  public Object jsonReadCollection(SpiJsonReader readJson, EntityBean parentBean) throws IOException {
 
     JsonParser parser = readJson.getParser();
     ElementCollector add = elementHelp.createCollector();
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java
index 8d90a3af5..ca895e92a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java
@@ -5,8 +5,8 @@ import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import io.ebean.bean.EntityBean;
 import io.ebean.text.json.EJson;
-import io.ebeaninternal.server.text.json.ReadJson;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
+import io.ebeaninternal.api.json.SpiJsonReader;
+import io.ebeaninternal.api.json.SpiJsonWriter;
 
 import java.io.IOException;
 import java.util.LinkedHashMap;
@@ -70,7 +70,7 @@ public class BeanDescriptorJsonHelp<T> {
   }
 
   @SuppressWarnings("unchecked")
-  public T jsonRead(ReadJson jsonRead, String path) throws IOException {
+  public T jsonRead(SpiJsonReader jsonRead, String path) throws IOException {
 
     JsonParser parser = jsonRead.getParser();
     //noinspection StatementWithEmptyBody
@@ -116,14 +116,14 @@ public class BeanDescriptorJsonHelp<T> {
     return (T) inheritInfo.readType(discValue).desc().jsonReadObject(jsonRead, path);
   }
 
-  protected T jsonReadObject(ReadJson readJson, String path) throws IOException {
+  protected T jsonReadObject(SpiJsonReader readJson, String path) throws IOException {
 
     EntityBean bean = desc.createEntityBeanForJson();
     return jsonReadProperties(readJson, bean, path);
   }
 
   @SuppressWarnings("unchecked")
-  protected T jsonReadProperties(ReadJson readJson, EntityBean bean, String path) throws IOException {
+  protected T jsonReadProperties(SpiJsonReader readJson, EntityBean bean, String path) throws IOException {
 
     if (path != null) {
       readJson.pushPath(path);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java
index 338bfb5a9..9b751a16e 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java
@@ -7,7 +7,7 @@ import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanCollectionAdd;
 import io.ebean.bean.EntityBean;
 import io.ebean.common.BeanList;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
+import io.ebeaninternal.api.json.SpiJsonWriter;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanListHelpElement.java b/src/main/java/io/ebeaninternal/server/deploy/BeanListHelpElement.java
index 8191bd0c6..0e473e4eb 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanListHelpElement.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanListHelpElement.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.deploy;
 
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
+import io.ebeaninternal.api.json.SpiJsonWriter;
 
 /**
  * Helper for element collection List.
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java
index b45bbc98b..72feb6d80 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java
@@ -7,7 +7,7 @@ import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanCollectionAdd;
 import io.ebean.bean.EntityBean;
 import io.ebean.common.BeanMap;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
+import io.ebeaninternal.api.json.SpiJsonWriter;
 
 import java.io.IOException;
 import java.util.LinkedHashMap;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelpElement.java b/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelpElement.java
index 0531839e0..71cdfb3fa 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelpElement.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelpElement.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.deploy;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebean.common.BeanMap;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
+import io.ebeaninternal.api.json.SpiJsonWriter;
 
 public class BeanMapHelpElement<T> extends BeanMapHelp<T> {
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 5ea987763..8fa2b9af8 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -13,6 +13,8 @@ import io.ebean.util.SplitName;
 import io.ebean.util.StringHelper;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.api.SpiQuery;
+import io.ebeaninternal.api.json.SpiJsonReader;
+import io.ebeaninternal.api.json.SpiJsonWriter;
 import io.ebeaninternal.server.core.InternString;
 import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty;
 import io.ebeaninternal.server.deploy.generatedproperty.GeneratedWhenCreated;
@@ -25,8 +27,6 @@ import io.ebeaninternal.server.properties.BeanPropertySetter;
 import io.ebeaninternal.server.query.STreeProperty;
 import io.ebeaninternal.server.query.SqlBeanLoad;
 import io.ebeaninternal.server.query.SqlJoinType;
-import io.ebeaninternal.server.text.json.ReadJson;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
 import io.ebeaninternal.server.type.DataBind;
 import io.ebeaninternal.server.type.ScalarType;
 import io.ebeaninternal.server.type.ScalarTypeBoolean;
@@ -1453,7 +1453,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     }
   }
 
-  public void jsonRead(ReadJson ctx, EntityBean bean) throws IOException {
+  public void jsonRead(SpiJsonReader ctx, EntityBean bean) throws IOException {
 
     JsonToken event = ctx.nextToken();
     if (JsonToken.VALUE_NULL == event) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index 2ef769116..d3c3e8e8f 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.deploy;
 
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
 import io.ebean.SqlUpdate;
 import io.ebean.Transaction;
 import io.ebean.bean.BeanCollection;
@@ -7,22 +9,24 @@ import io.ebean.bean.BeanCollection.ModifyListenMode;
 import io.ebean.bean.BeanCollectionAdd;
 import io.ebean.bean.BeanCollectionLoader;
 import io.ebean.bean.EntityBean;
+import io.ebean.bean.PersistenceContext;
 import io.ebean.text.PathProperties;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.api.SpiQuery;
+import io.ebeaninternal.api.json.SpiJsonReader;
+import io.ebeaninternal.api.json.SpiJsonWriter;
 import io.ebeaninternal.server.deploy.id.ImportedId;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany;
 import io.ebeaninternal.server.el.ElPropertyChainBuilder;
 import io.ebeaninternal.server.el.ElPropertyValue;
 import io.ebeaninternal.server.query.STreePropertyAssocMany;
 import io.ebeaninternal.server.query.SqlBeanLoad;
-import io.ebeaninternal.server.text.json.ReadJson;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.persistence.PersistenceException;
 import java.io.IOException;
+import java.io.StringWriter;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -804,7 +808,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     if (value != null) {
       ctx.pushParentBeanMany(bean);
       if (help != null) {
-        help.jsonWrite(ctx, name, value, include != null);
+        jsonWriteCollection(ctx, name, value, include != null);
       } else {
         if (isTransient && targetDescriptor == null) {
           ctx.writeValueUsingObjectMapper(name, value);
@@ -820,7 +824,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   }
 
   @Override
-  public void jsonRead(ReadJson readJson, EntityBean parentBean) throws IOException {
+  public void jsonRead(SpiJsonReader readJson, EntityBean parentBean) throws IOException {
     jsonHelp.jsonRead(readJson, parentBean);
   }
 
@@ -909,10 +913,69 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     elementDescriptor.jsonWriteElement(ctx, element);
   }
 
+  /**
+   * A Many (element collection) property in bean cache to held as JSON.
+   */
+  @Override
+  public void setCacheDataValue(EntityBean bean, Object cacheData, PersistenceContext context) {
+    try {
+      String asJson = (String) cacheData;
+      Object collection = jsonReadCollection(asJson);
+      setValue(bean, collection);
+    } catch (Exception e) {
+      logger.error("Error setting value from L2 cache", e);
+    }
+  }
+
+  @Override
+  public Object getCacheDataValue(EntityBean bean) {
+    try {
+      Object collection = getValue(bean);
+      if (collection == null) {
+        return null;
+      }
+      return jsonWriteCollection(collection);
+    } catch (Exception e) {
+      logger.error("Error building value element collection json for L2 cache", e);
+      return null;
+    }
+  }
+
+  /**
+   * Write the collection to JSON.
+   */
+  public String jsonWriteCollection(Object value) throws IOException {
+    StringWriter writer = new StringWriter(300);
+    SpiJsonWriter ctx = descriptor.createJsonWriter(writer);
+    help.jsonWrite(ctx, null, value, false);
+    ctx.flush();
+    return writer.toString();
+  }
+
+  /**
+   * Read the collection as JSON.
+   */
+  public Object jsonReadCollection(String json) throws IOException {
+    SpiJsonReader ctx = descriptor.createJsonReader(json);
+    JsonParser parser = ctx.getParser();
+    JsonToken event = parser.nextToken();
+    if (JsonToken.VALUE_NULL == event) {
+      return null;
+    }
+    return jsonReadCollection(ctx, null);
+  }
+
+  /**
+   * Write the collection to JSON.
+   */
+  public void jsonWriteCollection(SpiJsonWriter ctx, String name, Object value, boolean explicitInclude) throws IOException {
+    help.jsonWrite(ctx, name, value, explicitInclude);
+  }
+
   /**
    * Read the collection (JSON Array) containing entity beans.
    */
-  public Object jsonReadCollection(ReadJson readJson, EntityBean parentBean) throws IOException {
+  public Object jsonReadCollection(SpiJsonReader readJson, EntityBean parentBean) throws IOException {
 
     if (elementDescriptor != null && manyType.isMap()) {
       return elementDescriptor.jsonReadCollection(readJson, parentBean);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java
index b4962a9e6..11b3f74bc 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import io.ebean.bean.EntityBean;
-import io.ebeaninternal.server.text.json.ReadJson;
+import io.ebeaninternal.api.json.SpiJsonReader;
 
 import java.io.IOException;
 
@@ -35,7 +35,7 @@ class BeanPropertyAssocManyJsonHelp {
   /**
    * Read the JSON for this property.
    */
-  public void jsonRead(ReadJson readJson, EntityBean parentBean) throws IOException {
+  public void jsonRead(SpiJsonReader readJson, EntityBean parentBean) throws IOException {
 
     if (!this.many.jsonDeserialize) {
       return;
@@ -61,7 +61,7 @@ class BeanPropertyAssocManyJsonHelp {
   /**
    * Read a Transient property using Jackson ObjectMapper.
    */
-  private void jsonReadTransientUsingObjectMapper(ReadJson readJson, EntityBean parentBean) throws IOException {
+  private void jsonReadTransientUsingObjectMapper(SpiJsonReader readJson, EntityBean parentBean) throws IOException {
 
     if (jsonTransient == null) {
       throw new IllegalStateException("Jackson ObjectMapper is required to read this Transient property " + many.getFullBeanName());
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java
index fd1b9fe1d..5b05b3261 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.type.CollectionType;
 import com.fasterxml.jackson.databind.type.MapType;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 import io.ebean.bean.EntityBean;
-import io.ebeaninternal.server.text.json.ReadJson;
+import io.ebeaninternal.api.json.SpiJsonReader;
 
 import java.io.IOException;
 import java.util.LinkedHashMap;
@@ -19,7 +19,7 @@ class BeanPropertyAssocManyJsonTransient {
   /**
    * Use Jackson ObjectMapper to read the transient 'many' property.
    */
-  void jsonReadUsingObjectMapper(BeanPropertyAssocMany<?> many, ReadJson readJson, EntityBean parentBean) throws IOException {
+  void jsonReadUsingObjectMapper(BeanPropertyAssocMany<?> many, SpiJsonReader readJson, EntityBean parentBean) throws IOException {
 
     ObjectMapper mapper = readJson.getObjectMapper();
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index c4f28fd60..4cea3315a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -9,6 +9,8 @@ import io.ebean.bean.EntityBean;
 import io.ebean.bean.PersistenceContext;
 import io.ebean.util.SplitName;
 import io.ebeaninternal.api.SpiQuery;
+import io.ebeaninternal.api.json.SpiJsonReader;
+import io.ebeaninternal.api.json.SpiJsonWriter;
 import io.ebeaninternal.server.cache.CacheChangeSet;
 import io.ebeaninternal.server.cache.CachedBeanData;
 import io.ebeaninternal.server.core.DefaultSqlUpdate;
@@ -19,8 +21,6 @@ import io.ebeaninternal.server.el.ElPropertyValue;
 import io.ebeaninternal.server.query.STreePropertyAssocOne;
 import io.ebeaninternal.server.query.SqlBeanLoad;
 import io.ebeaninternal.server.query.SqlJoinType;
-import io.ebeaninternal.server.text.json.ReadJson;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
 import io.ebeaninternal.server.type.ScalarType;
 
 import javax.persistence.PersistenceException;
@@ -740,7 +740,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
   }
 
   @Override
-  public void jsonRead(ReadJson readJson, EntityBean bean) throws IOException {
+  public void jsonRead(SpiJsonReader readJson, EntityBean bean) throws IOException {
     if (jsonDeserialize && targetDescriptor != null) {
       T assocBean = targetDescriptor.jsonRead(readJson, name);
       setValue(bean, assocBean);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java
index f00b401cd..a66d996b1 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java
@@ -2,8 +2,8 @@ package io.ebeaninternal.server.deploy;
 
 import io.ebean.SqlUpdate;
 import io.ebean.bean.EntityBean;
+import io.ebeaninternal.api.json.SpiJsonReader;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertySimpleCollection;
-import io.ebeaninternal.server.text.json.ReadJson;
 
 import java.io.IOException;
 
@@ -19,7 +19,7 @@ public class BeanPropertySimpleCollection<T> extends BeanPropertyAssocMany<T> {
   }
 
   @Override
-  public Object jsonReadCollection(ReadJson readJson, EntityBean parentBean) throws IOException {
+  public Object jsonReadCollection(SpiJsonReader readJson, EntityBean parentBean) throws IOException {
     return elementDescriptor.jsonReadCollection(readJson, parentBean);
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java
index 197cbae0a..482ccce62 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java
@@ -7,7 +7,7 @@ import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanCollectionAdd;
 import io.ebean.bean.EntityBean;
 import io.ebean.common.BeanSet;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
+import io.ebeaninternal.api.json.SpiJsonWriter;
 
 import java.io.IOException;
 import java.util.LinkedHashSet;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelpElement.java b/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelpElement.java
index c490c76e1..94ac9e5a5 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelpElement.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelpElement.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.deploy;
 
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
+import io.ebeaninternal.api.json.SpiJsonWriter;
 
 /**
  * Helper for element collection List.
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ElementHelpList.java b/src/main/java/io/ebeaninternal/server/deploy/ElementHelpList.java
index 6c95550da..8d23b23de 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ElementHelpList.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ElementHelpList.java
@@ -1,5 +1,8 @@
 package io.ebeaninternal.server.deploy;
 
+import io.ebean.bean.BeanCollection;
+import io.ebean.common.BeanList;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -26,7 +29,9 @@ class ElementHelpList implements ElementHelp {
 
     @Override
     public Object collection() {
-      return list;
+      BeanList<Object> beanList = new BeanList<>(list);
+      beanList.setModifyListening(BeanCollection.ModifyListenMode.ALL);
+      return beanList;
     }
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ElementHelpMap.java b/src/main/java/io/ebeaninternal/server/deploy/ElementHelpMap.java
index 2d970a48f..6436f6d53 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ElementHelpMap.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ElementHelpMap.java
@@ -1,5 +1,8 @@
 package io.ebeaninternal.server.deploy;
 
+import io.ebean.bean.BeanCollection;
+import io.ebean.common.BeanMap;
+
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -26,7 +29,9 @@ class ElementHelpMap implements ElementHelp {
 
     @Override
     public Object collection() {
-      return map;
+      BeanMap<Object, Object> beanMap = new BeanMap<>(map);
+      beanMap.setModifyListening(BeanCollection.ModifyListenMode.ALL);
+      return beanMap;
     }
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ElementHelpSet.java b/src/main/java/io/ebeaninternal/server/deploy/ElementHelpSet.java
index 53a47de89..9f0e7602d 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ElementHelpSet.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ElementHelpSet.java
@@ -1,5 +1,8 @@
 package io.ebeaninternal.server.deploy;
 
+import io.ebean.bean.BeanCollection;
+import io.ebean.common.BeanSet;
+
 import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -26,7 +29,9 @@ class ElementHelpSet implements ElementHelp {
 
     @Override
     public Object collection() {
-      return set;
+      BeanSet<Object> beanSet = new BeanSet<>(set);
+      beanSet.setModifyListening(BeanCollection.ModifyListenMode.ALL);
+      return beanSet;
     }
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index 24f3c96aa..68d3171d4 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -218,7 +218,7 @@ class AnnotationAssocManys extends AnnotationParser {
       elementDescriptor.setProperties(new String[]{"value"});
     } else {
       elementDescriptor.setProperties(new String[]{"key", "value"});
-      String dbKeyColumn = "key";
+      String dbKeyColumn = "mkey";
       MapKeyColumn mapKeyColumn = get(prop, MapKeyColumn.class);
       if (mapKeyColumn != null) {
         dbKeyColumn = mapKeyColumn.name();
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java
index 9f892c5e8..2c7bde442 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java
@@ -6,12 +6,18 @@ import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
 
 /**
  * Base for saving entity bean collections and element collections.
  */
 abstract class SaveManyBase {
 
+  private static final Logger log = LoggerFactory.getLogger(SaveManyBase.class);
+
   final PersistRequestBean<?> request;
   final SpiEbeanServer server;
   final boolean insertedParent;
@@ -48,4 +54,17 @@ abstract class SaveManyBase {
     }
     c.modifyReset();
   }
+
+  void postElementCollectionUpdate() {
+    if (!insertedParent) {
+      if (request.postElementCollectionUpdate()) {
+        try {
+          String asJson = many.jsonWriteCollection(value);
+          request.addCollectionChange(many.getName(), asJson);
+        } catch (IOException e) {
+          log.error("Error build element collection entry for L2 cache", e);
+        }
+      }
+    }
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java
index 402a5e80a..94097fd81 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java
@@ -49,8 +49,6 @@ class SaveManyElementCollection extends SaveManyBase {
 
     transaction.depth(-1);
     resetModifyState();
-    if (!insertedParent) {
-      request.postElementCollectionUpdate();
-    }
+    postElementCollectionUpdate();
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java
index e19b7e314..f61ac4e0f 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java
@@ -50,8 +50,6 @@ class SaveManyElementCollectionMap extends SaveManyBase {
 
     transaction.depth(-1);
     resetModifyState();
-    if (!insertedParent) {
-      request.postElementCollectionUpdate();
-    }
+    postElementCollectionUpdate();
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/text/json/DJsonBeanReader.java b/src/main/java/io/ebeaninternal/server/text/json/DJsonBeanReader.java
index 23511f17d..ecfa3af8c 100644
--- a/src/main/java/io/ebeaninternal/server/text/json/DJsonBeanReader.java
+++ b/src/main/java/io/ebeaninternal/server/text/json/DJsonBeanReader.java
@@ -1,10 +1,11 @@
 package io.ebeaninternal.server.text.json;
 
+import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.PersistenceIOException;
 import io.ebean.bean.PersistenceContext;
 import io.ebean.text.json.JsonBeanReader;
+import io.ebeaninternal.api.json.SpiJsonReader;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
-import com.fasterxml.jackson.core.JsonParser;
 
 import java.io.IOException;
 
@@ -18,9 +19,9 @@ public class DJsonBeanReader<T> implements JsonBeanReader<T> {
 
   private final BeanDescriptor<T> desc;
 
-  private final ReadJson readJson;
+  private final SpiJsonReader readJson;
 
-  public DJsonBeanReader(BeanDescriptor<T> desc, ReadJson readJson) {
+  public DJsonBeanReader(BeanDescriptor<T> desc, SpiJsonReader readJson) {
     this.desc = desc;
     this.readJson = readJson;
   }
diff --git a/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java b/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java
index cc4302d20..dec96b5df 100644
--- a/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java
+++ b/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java
@@ -16,6 +16,8 @@ import io.ebean.text.json.JsonWriteBeanVisitor;
 import io.ebean.text.json.JsonWriteOptions;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiJsonContext;
+import io.ebeaninternal.api.json.SpiJsonReader;
+import io.ebeaninternal.api.json.SpiJsonWriter;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.type.TypeManager;
 import io.ebeaninternal.util.ParamTypeHelper;
@@ -119,7 +121,7 @@ public class DJsonContext implements SpiJsonContext {
   public <T> T toBean(Class<T> cls, JsonParser parser, JsonReadOptions options) throws JsonIOException {
 
     BeanDescriptor<T> desc = getDescriptor(cls);
-    ReadJson readJson = new ReadJson(desc, parser, options, determineObjectMapper(options));
+    SpiJsonReader readJson = new ReadJson(desc, parser, options, determineObjectMapper(options));
     try {
       return desc.jsonRead(readJson, null);
     } catch (IOException e) {
@@ -131,7 +133,7 @@ public class DJsonContext implements SpiJsonContext {
   public <T> DJsonBeanReader<T> createBeanReader(Class<T> cls, JsonParser parser, JsonReadOptions options) throws JsonIOException {
 
     BeanDescriptor<T> desc = getDescriptor(cls);
-    ReadJson readJson = new ReadJson(desc, parser, options, determineObjectMapper(options));
+    SpiJsonReader readJson = new ReadJson(desc, parser, options, determineObjectMapper(options));
     return new DJsonBeanReader<>(desc, readJson);
   }
 
@@ -139,7 +141,7 @@ public class DJsonContext implements SpiJsonContext {
   public <T> DJsonBeanReader<T> createBeanReader(BeanType<T> beanType, JsonParser parser, JsonReadOptions options) throws JsonIOException {
 
     BeanDescriptor<T> desc = (BeanDescriptor<T>) beanType;
-    ReadJson readJson = new ReadJson(desc, parser, options, determineObjectMapper(options));
+    SpiJsonReader readJson = new ReadJson(desc, parser, options, determineObjectMapper(options));
     return new DJsonBeanReader<>(desc, readJson);
   }
 
@@ -172,7 +174,7 @@ public class DJsonContext implements SpiJsonContext {
   public <T> List<T> toList(Class<T> cls, JsonParser src, JsonReadOptions options) throws JsonIOException {
 
     BeanDescriptor<T> desc = getDescriptor(cls);
-    ReadJson readJson = new ReadJson(desc, src, options, determineObjectMapper(options));
+    SpiJsonReader readJson = new ReadJson(desc, src, options, determineObjectMapper(options));
     try {
 
       JsonToken currentToken = src.getCurrentToken();
@@ -304,7 +306,7 @@ public class DJsonContext implements SpiJsonContext {
 
   private String toJsonString(Object value, JsonWriteOptions options) throws JsonIOException {
     StringWriter writer = new StringWriter(500);
-    try (JsonGenerator gen = createGenerator(writer)){
+    try (JsonGenerator gen = createGenerator(writer)) {
       toJsonInternal(value, gen, options);
     } catch (IOException e) {
       throw new JsonIOException(e);
@@ -342,6 +344,14 @@ public class DJsonContext implements SpiJsonContext {
     }
   }
 
+  @Override
+  public SpiJsonReader createJsonRead(BeanType<?> beanType, String json) {
+
+    BeanDescriptor<?> desc = (BeanDescriptor<?>) beanType;
+    JsonParser parser = createParser(new StringReader(json));
+    return new ReadJson(desc, parser, null, defaultObjectMapper);
+  }
+
   @Override
   public SpiJsonWriter createJsonWriter(Writer writer) {
     JsonGenerator generator = createGenerator(writer);
diff --git a/src/main/java/io/ebeaninternal/server/text/json/ReadJson.java b/src/main/java/io/ebeaninternal/server/text/json/ReadJson.java
index a495ed3ba..8b91c86b5 100644
--- a/src/main/java/io/ebeaninternal/server/text/json/ReadJson.java
+++ b/src/main/java/io/ebeaninternal/server/text/json/ReadJson.java
@@ -1,17 +1,18 @@
 package io.ebeaninternal.server.text.json;
 
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.bean.PersistenceContext;
 import io.ebean.text.json.JsonReadBeanVisitor;
 import io.ebean.text.json.JsonReadOptions;
 import io.ebeaninternal.api.LoadContext;
+import io.ebeaninternal.api.json.SpiJsonReader;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.loadcontext.DLoadContext;
 import io.ebeaninternal.server.transaction.DefaultPersistenceContext;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.io.IOException;
 import java.util.Map;
@@ -19,7 +20,7 @@ import java.util.Map;
 /**
  * Context for JSON read processing.
  */
-public class ReadJson {
+public class ReadJson implements SpiJsonReader {
 
   private final BeanDescriptor<?> rootDesc;
 
@@ -100,6 +101,7 @@ public class ReadJson {
   /**
    * Return the persistence context being used if any.
    */
+  @Override
   public PersistenceContext getPersistenceContext() {
     return persistenceContext;
   }
@@ -107,13 +109,15 @@ public class ReadJson {
   /**
    * Return a new instance of ReadJson using the existing context but with a new JsonParser.
    */
-  public ReadJson forJson(JsonParser moreJson, boolean resetContext) {
+  @Override
+  public SpiJsonReader forJson(JsonParser moreJson, boolean resetContext) {
     return new ReadJson(moreJson, this, resetContext);
   }
 
   /**
    * Add the bean to the persistence context.
    */
+  @Override
   public <T> void persistenceContextPut(Object beanId, T currentBean) {
 
     persistenceContextPutIfAbsent(beanId, (EntityBean) currentBean, rootDesc);
@@ -123,6 +127,7 @@ public class ReadJson {
    * Put the bean into the persistence context. If there is already a matching bean in the
    * persistence context then return that instance else return null.
    */
+  @Override
   public Object persistenceContextPutIfAbsent(Object id, EntityBean bean, BeanDescriptor<?> beanDesc) {
 
     if (persistenceContext == null) {
@@ -153,6 +158,7 @@ public class ReadJson {
   /**
    * Return the objectMapper used for this request.
    */
+  @Override
   public ObjectMapper getObjectMapper() {
     if (objectMapper == null) {
       throw new IllegalStateException(
@@ -165,6 +171,7 @@ public class ReadJson {
   /**
    * Return the JsonParser.
    */
+  @Override
   public JsonParser getParser() {
     return parser;
   }
@@ -172,6 +179,7 @@ public class ReadJson {
   /**
    * Return the next JsonToken from the underlying parser.
    */
+  @Override
   public JsonToken nextToken() throws IOException {
     return parser.nextToken();
   }
@@ -179,6 +187,7 @@ public class ReadJson {
   /**
    * Push the path onto the stack (traversing a 1-M or M-1 etc)
    */
+  @Override
   public void pushPath(String path) {
     if (pathStack != null) {
       pathStack.pushPathKey(path);
@@ -188,6 +197,7 @@ public class ReadJson {
   /**
    * Pop the path stack.
    */
+  @Override
   public void popPath() {
     if (pathStack != null) {
       pathStack.pop();
@@ -198,6 +208,7 @@ public class ReadJson {
    * If there is a JsonReadBeanVisitor registered to the current path then
    * call it's visit method with the bean and unmappedProperties.
    */
+  @Override
   @SuppressWarnings({ "unchecked", "rawtypes" })
   public void beanVisitor(Object bean, Map<String, Object> unmappedProperties) {
     if (visitorMap != null) {
@@ -213,6 +224,7 @@ public class ReadJson {
    * <p/>
    * Typically this is used to read Transient properties where the type is unknown to Ebean.
    */
+  @Override
   public Object readValueUsingObjectMapper(Class<?> propertyType) throws IOException {
     return getObjectMapper().readValue(parser, propertyType);
   }
diff --git a/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java b/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java
index 20c7d3f28..2607974fa 100644
--- a/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java
+++ b/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java
@@ -9,6 +9,7 @@ import io.ebean.text.json.EJson;
 import io.ebean.text.json.JsonIOException;
 import io.ebean.text.json.JsonWriteBeanVisitor;
 import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.api.json.SpiJsonWriter;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.util.ArrayStack;
@@ -89,6 +90,11 @@ public class WriteJson implements SpiJsonWriter {
     return generator;
   }
 
+  @Override
+  public void flush() throws IOException {
+    generator.flush();
+  }
+
   @Override
   public void writeStartObject(String key) {
     try {
@@ -373,7 +379,9 @@ public class WriteJson implements SpiJsonWriter {
   public void beginAssocMany(String key) {
     try {
       pathStack.pushPathKey(key);
-      generator.writeFieldName(key);
+      if (key != null) {
+        generator.writeFieldName(key);
+      }
       generator.writeStartArray();
     } catch (IOException e) {
       throw new JsonIOException(e);
diff --git a/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java b/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java
index 92618f94f..cd48d4247 100644
--- a/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java
+++ b/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java
@@ -5,7 +5,7 @@ import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import io.ebean.bean.EntityBean;
 import io.ebeaninternal.api.SpiEbeanServer;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
+import io.ebeaninternal.api.json.SpiJsonWriter;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
@@ -57,7 +57,7 @@ public class TestDiffHelpInsertSimple extends BaseTestCase {
     SpiJsonWriter jsonWriter = spiEbeanServer().jsonExtended().createJsonWriter(buffer);
 
     orderDesc.jsonWriteForInsert(jsonWriter, (EntityBean) order1);
-    jsonWriter.gen().flush();
+    jsonWriter.flush();
 
     String asJson = buffer.toString();
 
diff --git a/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java b/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java
index 7e04187dd..f2a03c63d 100644
--- a/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java
+++ b/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java
@@ -5,7 +5,7 @@ import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import io.ebean.bean.EntityBean;
 import io.ebeaninternal.api.SpiEbeanServer;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
+import io.ebeaninternal.api.json.SpiJsonWriter;
 import org.junit.Test;
 import org.tests.model.embedded.EMain;
 import org.tests.model.embedded.Eembeddable;
@@ -44,7 +44,7 @@ public class TestDiffHelpInsertWithEmbedded extends BaseTestCase {
     SpiJsonWriter jsonWriter = spiEbeanServer().jsonExtended().createJsonWriter(buffer);
 
     emainDesc.jsonWriteForInsert(jsonWriter, emain1);
-    jsonWriter.gen().flush();
+    jsonWriter.flush();
 
     return buffer.toString();
   }
diff --git a/src/test/java/org/tests/model/elementcollection/EcPerson.java b/src/test/java/org/tests/model/elementcollection/EcPerson.java
index 00550b5c6..763b137ab 100644
--- a/src/test/java/org/tests/model/elementcollection/EcPerson.java
+++ b/src/test/java/org/tests/model/elementcollection/EcPerson.java
@@ -1,5 +1,7 @@
 package org.tests.model.elementcollection;
 
+import io.ebean.annotation.Cache;
+
 import javax.persistence.CollectionTable;
 import javax.persistence.Column;
 import javax.persistence.ElementCollection;
@@ -10,6 +12,7 @@ import javax.persistence.Version;
 import java.util.ArrayList;
 import java.util.List;
 
+@Cache
 @Entity
 public class EcPerson {
 
diff --git a/src/test/java/org/tests/model/elementcollection/EcblPerson.java b/src/test/java/org/tests/model/elementcollection/EcblPerson.java
index 982071e13..c4998d855 100644
--- a/src/test/java/org/tests/model/elementcollection/EcblPerson.java
+++ b/src/test/java/org/tests/model/elementcollection/EcblPerson.java
@@ -1,5 +1,7 @@
 package org.tests.model.elementcollection;
 
+import io.ebean.annotation.Cache;
+
 import javax.persistence.CollectionTable;
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
@@ -9,6 +11,7 @@ import javax.persistence.Version;
 import java.util.ArrayList;
 import java.util.List;
 
+@Cache
 @Entity
 public class EcblPerson {
 
diff --git a/src/test/java/org/tests/model/elementcollection/EcbmPerson.java b/src/test/java/org/tests/model/elementcollection/EcbmPerson.java
index 7a236bb85..992178c54 100644
--- a/src/test/java/org/tests/model/elementcollection/EcbmPerson.java
+++ b/src/test/java/org/tests/model/elementcollection/EcbmPerson.java
@@ -1,5 +1,7 @@
 package org.tests.model.elementcollection;
 
+import io.ebean.annotation.Cache;
+
 import javax.persistence.CollectionTable;
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
@@ -9,7 +11,7 @@ import javax.persistence.Version;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-
+@Cache
 @Entity
 public class EcbmPerson {
 
diff --git a/src/test/java/org/tests/model/elementcollection/EcmPerson.java b/src/test/java/org/tests/model/elementcollection/EcmPerson.java
index 8be26fa50..fafb073e1 100644
--- a/src/test/java/org/tests/model/elementcollection/EcmPerson.java
+++ b/src/test/java/org/tests/model/elementcollection/EcmPerson.java
@@ -1,5 +1,7 @@
 package org.tests.model.elementcollection;
 
+import io.ebean.annotation.Cache;
+
 import javax.persistence.Column;
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
@@ -9,6 +11,7 @@ import javax.persistence.Version;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+@Cache
 @Entity
 public class EcmPerson {
 
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java
new file mode 100644
index 000000000..a73220ce1
--- /dev/null
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java
@@ -0,0 +1,80 @@
+package org.tests.model.elementcollection;
+
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestElementCollectionBasicCache {
+
+  @Test
+  public void test() {
+
+    EcPerson person = new EcPerson("Cache1");
+    person.getPhoneNumbers().add("021 1234");
+    person.getPhoneNumbers().add("021 4321");
+    Ebean.save(person);
+
+    EcPerson one = Ebean.find(EcPerson.class)
+      .setId(person.getId())
+      .findOne();
+
+    one.getPhoneNumbers().size();
+
+    LoggedSqlCollector.start();
+
+    EcPerson two = Ebean.find(EcPerson.class)
+      .setId(person.getId())
+      .findOne();
+
+    two.setName("CacheMod");
+    two.getPhoneNumbers().add("027 234234");
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty(); // cache hit containing phone numbers
+
+    Ebean.save(two);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(3);
+
+    Ebean.save(two);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty(); // no change
+
+    EcPerson three = Ebean.find(EcPerson.class)
+      .setId(person.getId())
+      .findOne();
+
+    assertThat(three.getName()).isEqualTo("CacheMod");
+    assertThat(three.getPhoneNumbers()).contains("021 1234", "021 4321", "027 234234");
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty(); // cache hit
+
+    three.getPhoneNumbers().add("09 6534");
+    Ebean.save(three);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2); // cache hit
+
+    EcPerson four = Ebean.find(EcPerson.class)
+      .setId(person.getId())
+      .fetch("phoneNumbers")
+      .findOne();
+
+    assertThat(four.getName()).isEqualTo("CacheMod");
+    assertThat(four.getPhoneNumbers()).contains("021 1234", "021 4321", "027 234234", "09 6534");
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty(); // cache hit
+
+    Ebean.delete(four);
+
+    LoggedSqlCollector.stop();
+  }
+}
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java
new file mode 100644
index 000000000..137e8e495
--- /dev/null
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java
@@ -0,0 +1,85 @@
+package org.tests.model.elementcollection;
+
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestElementCollectionBasicMapCache {
+
+  @Test
+  public void test() {
+
+    EcmPerson person = new EcmPerson("CacheMap");
+    person.getPhoneNumbers().put("home", "021 1234");
+    person.getPhoneNumbers().put("work", "021 4321");
+    Ebean.save(person);
+
+
+    EcmPerson one = Ebean.find(EcmPerson.class)
+      .setId(person.getId())
+      .fetch("phoneNumbers")
+      .findOne();
+
+    one.getPhoneNumbers().size();
+
+    LoggedSqlCollector.start();
+
+    EcmPerson two = Ebean.find(EcmPerson.class)
+      .setId(person.getId())
+      .findOne();
+
+    two.setName("CacheMod");
+    two.getPhoneNumbers().put("mob", "027 234234");
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty(); // cache hit containing phone numbers
+
+    Ebean.save(two);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(3);
+
+    Ebean.save(two);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty(); // no change
+
+    EcmPerson three = Ebean.find(EcmPerson.class)
+      .setId(person.getId())
+      .findOne();
+
+    assertThat(three.getName()).isEqualTo("CacheMod");
+    assertThat(three.getPhoneNumbers().toString()).contains("021 1234", "021 4321", "027 234234");
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty(); // cache hit
+
+    three.getPhoneNumbers().put("oth", "09 6534");
+    three.getPhoneNumbers().remove("home");
+    three.getPhoneNumbers().remove("work");
+    Ebean.save(three);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2); // cache hit
+
+    EcmPerson four = Ebean.find(EcmPerson.class)
+      .setId(person.getId())
+      .fetch("phoneNumbers")
+      .findOne();
+
+    assertThat(four.getName()).isEqualTo("CacheMod");
+    assertThat(four.getPhoneNumbers().toString()).contains("027 234234", "09 6534");
+    assertThat(four.getPhoneNumbers()).hasSize(2);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty(); // cache hit
+
+    Ebean.delete(four);
+
+    LoggedSqlCollector.stop();
+  }
+}
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java
new file mode 100644
index 000000000..c9cbaf4d4
--- /dev/null
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java
@@ -0,0 +1,88 @@
+package org.tests.model.elementcollection;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestElementCollectionEmbeddedListCache extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    EcblPerson person = new EcblPerson("CacheL");
+    person.getPhoneNumbers().add(new EcPhone("64", "021","1234"));
+    person.getPhoneNumbers().add(new EcPhone("64","021","4321"));
+    Ebean.save(person);
+
+    EcblPerson one = Ebean.find(EcblPerson.class)
+      .setId(person.getId())
+      .fetch("phoneNumbers")
+      .findOne();
+
+    LoggedSqlCollector.start();
+
+    one.getPhoneNumbers().size();
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty();
+
+    EcblPerson two = Ebean.find(EcblPerson.class)
+      .setId(person.getId())
+      .findOne();
+
+    two.getPhoneNumbers().size();
+    assertThat(two.getPhoneNumbers().toString()).contains("64-021-1234", "64-021-4321");
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty(); // cache hit
+
+    two.getPhoneNumbers().add(new EcPhone("61", "07", "11"));
+    two.getPhoneNumbers().remove(1);
+
+    Ebean.save(two);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2); // update of collection only
+    assertThat(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id=?");
+    assertThat(sql.get(1)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,number) values (?,?,?,?)");
+
+    EcblPerson three = Ebean.find(EcblPerson.class)
+      .setId(person.getId())
+      .findOne();
+
+    assertThat(three.getPhoneNumbers().toString()).contains("61-07-11", "64-021-1234");
+    assertThat(three.getPhoneNumbers()).hasSize(2);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty(); // cache hit
+
+
+    three.setName("mod-3");
+    three.getPhoneNumbers().remove(0);
+
+    Ebean.save(three);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(3);
+
+    EcblPerson four = Ebean.find(EcblPerson.class)
+      .setId(person.getId())
+      .findOne();
+
+    assertThat(four.getPhoneNumbers().toString()).contains("61-07-11");
+    assertThat(four.getPhoneNumbers()).hasSize(1);
+
+
+    Ebean.delete(four);
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2);
+
+
+    LoggedSqlCollector.stop();
+  }
+}
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java
index ca342342c..50b37480c 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java
@@ -90,7 +90,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase {
     assertThat(sql).hasSize(3);
     assertThat(sql.get(0)).contains("update ecbm_person set name=?, version=? where id=? and version=?");
     assertThat(sql.get(1)).contains("delete from ecbm_person_phone_numbers where person_id=?");
-    assertThat(sql.get(2)).contains("insert into ecbm_person_phone_numbers (person_id,key,country_code,area,number)");
+    assertThat(sql.get(2)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number)");
 
     updateNothing(bean);
   }
@@ -113,7 +113,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.current();
     assertThat(sql).hasSize(2);
     assertThat(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id=?");
-    assertThat(sql.get(1)).contains("insert into ecbm_person_phone_numbers (person_id,key,country_code,area,number) values (?,?,?,?,?)");
+    assertThat(sql.get(1)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number) values (?,?,?,?,?)");
 
     delete(bean);
   }
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java
new file mode 100644
index 000000000..1c29bfc55
--- /dev/null
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java
@@ -0,0 +1,89 @@
+package org.tests.model.elementcollection;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestElementCollectionEmbeddedMapCache extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    EcbmPerson person = new EcbmPerson("Cache1");
+    person.getPhoneNumbers().put("home", new EcPhone("64", "021", "1234"));
+    person.getPhoneNumbers().put("work", new EcPhone("64", "021", "4321"));
+    Ebean.save(person);
+
+
+    EcbmPerson one = Ebean.find(EcbmPerson.class)
+      .setId(person.getId())
+      .fetch("phoneNumbers")
+      .findOne();
+
+    LoggedSqlCollector.start();
+
+    one.getPhoneNumbers().size();
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty();
+
+    EcbmPerson two = Ebean.find(EcbmPerson.class)
+      .setId(person.getId())
+      .findOne();
+
+    two.getPhoneNumbers().size();
+    assertThat(two.getPhoneNumbers().toString()).contains("64-021-1234", "64-021-4321");
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty(); // cache hit
+
+    two.getPhoneNumbers().put("mob", new EcPhone("61", "07", "11"));
+    two.getPhoneNumbers().remove("home");
+
+    Ebean.save(two);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2); // update of collection only
+    assertThat(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id=?");
+    assertThat(sql.get(1)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number) values (?,?,?,?,?)");
+
+    EcbmPerson three = Ebean.find(EcbmPerson.class)
+      .setId(person.getId())
+      .findOne();
+
+    assertThat(three.getPhoneNumbers().toString()).contains("61-07-11", "64-021-4321");
+    assertThat(three.getPhoneNumbers()).hasSize(2);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty(); // cache hit
+
+
+    three.setName("mod-3");
+    three.getPhoneNumbers().remove("work");
+
+    Ebean.save(three);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(3);
+
+    EcbmPerson four = Ebean.find(EcbmPerson.class)
+      .setId(person.getId())
+      .findOne();
+
+    assertThat(four.getPhoneNumbers().toString()).contains("61-07-11");
+    assertThat(four.getPhoneNumbers()).hasSize(1);
+
+
+    Ebean.delete(four);
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2);
+
+
+    LoggedSqlCollector.stop();
+  }
+}
diff --git a/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java b/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java
index ebce7d3a2..eaf1825fc 100644
--- a/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java
+++ b/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java
@@ -1,15 +1,16 @@
 package org.tests.text.json;
 
+import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.BaseTestCase;
 import io.ebean.BeanState;
 import io.ebean.Ebean;
 import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.api.json.SpiJsonReader;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.text.json.ReadJson;
-import org.tests.model.basic.Customer;
-import com.fasterxml.jackson.core.JsonParser;
 import org.junit.Assert;
 import org.junit.Test;
+import org.tests.model.basic.Customer;
 
 import java.io.IOException;
 import java.io.StringReader;
@@ -28,7 +29,7 @@ public class TestJsonBeanDescriptorParse extends BaseTestCase {
     StringReader reader = new StringReader("{\"id\":123,\"name\":\"Hello rob\"}");
     JsonParser parser = server.json().createParser(reader);
 
-    ReadJson readJson = new ReadJson(descriptor, parser, null, null);
+    SpiJsonReader readJson = new ReadJson(descriptor, parser, null, null);
 
     Customer customer = descriptor.jsonRead(readJson, null);
 

From aa004f11af735b5ccb51ca33cfd4ca1fc807d42b Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 29 Mar 2018 01:49:28 +1300
Subject: [PATCH 0211/1036] [maven-release-plugin] prepare release
 ebean-11.15.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index abf1a3e82..21b0f6984 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.2-SNAPSHOT</version>
+  <version>11.15.2</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.15.2</tag>
   </scm>
 
   <profiles>

From 6b136248fa2c6366c47350471a265276a4b0b6ae Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 29 Mar 2018 01:49:43 +1300
Subject: [PATCH 0212/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 21b0f6984..e12095e0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.2</version>
+  <version>11.15.3-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.15.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From b8c4e1c3d3bcbebbb9abfd98f23f79631c4437da Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 29 Mar 2018 10:22:12 +1300
Subject: [PATCH 0213/1036] #1357 -  Regression in 11.15.2 - for nested
 Ebean.beginTransaction(TxScope.requiresNew()); ... where closed via
 ebeanServer.endTransaction(); rather than transaction.end()

---
 .../server/core/DefaultServer.java            |  2 +-
 .../TestTransactionalRequiresNew.java         | 62 +++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index c131f6722..1a904843b 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -843,7 +843,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    */
   @Override
   public void endTransaction() {
-    Transaction transaction = currentTransaction();
+    Transaction transaction = transactionManager.getInScope();
     if (transaction != null) {
       transaction.end();
     }
diff --git a/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java b/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java
index 03e353f39..7e0415575 100644
--- a/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java
+++ b/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java
@@ -2,7 +2,9 @@ package org.tests.transaction;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.EbeanServer;
 import io.ebean.Transaction;
+import io.ebean.TxScope;
 import io.ebean.annotation.Transactional;
 import io.ebean.annotation.TxType;
 import org.junit.Test;
@@ -11,6 +13,7 @@ import org.slf4j.LoggerFactory;
 
 import java.sql.Connection;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
@@ -66,5 +69,64 @@ public class TestTransactionalRequiresNew extends BaseTestCase {
     }
   }
 
+  @Test
+  public void testDifferentCreation1() {
+    EbeanServer server = server();
+    try(Transaction txn = server.beginTransaction()) {
+      String txnName = txn.toString();
+      Ebean.beginTransaction(TxScope.requiresNew());
+      try {
+        Ebean.commitTransaction();
+      } finally {
+        Ebean.endTransaction();
+      }
+      assertThat(txn.toString()).isEqualTo(txnName);
+    }
+  }
+
+  @Test
+  public void testDifferentCreation2() {
+    EbeanServer server = server();
+    try (Transaction txn = server.beginTransaction()) {
+      String txnName = txn.toString();
+      server.beginTransaction(TxScope.requiresNew());
+      try {
+        server.commitTransaction();
+      } finally {
+        server.endTransaction();
+      }
+      assertThat(txn.toString()).isEqualTo(txnName);
+    }
+  }
+
+  @Test
+  public void testDifferentCreation3() {
+    EbeanServer server = server();
+    try (Transaction txn = server.beginTransaction()) {
+      String txnName = txn.toString();
+      Transaction txn2 = Ebean.beginTransaction(TxScope.requiresNew());
+      try {
+        txn2.commit();
+      } finally {
+        txn2.end();
+      }
+      assertThat(txn.toString()).isEqualTo(txnName);
+    }
+  }
+
+  @Test
+  public void testDifferentCreation4() {
+    EbeanServer server = server();
+    try (Transaction txn = server.beginTransaction()) {
+      String txnName = txn.toString();
+      server.beginTransaction(TxScope.requiresNew());
+      try {
+        Transaction.current().commitAndContinue();
+      } finally {
+        Transaction.current().end();
+      }
+      assertThat(txn.toString()).isEqualTo(txnName);
+    }
+  }
 
 }

From 04e0069eb39584c16726c6f6cd1d571fdc2f1011 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 29 Mar 2018 14:35:25 +1300
Subject: [PATCH 0214/1036] [maven-release-plugin] prepare release
 ebean-11.15.3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e12095e0b..f7fbed665 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.3-SNAPSHOT</version>
+  <version>11.15.3</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.15.3</tag>
   </scm>
 
   <profiles>

From 9a3362e84226ce1d15cbbc5fda589e1af6b4fd1c Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 29 Mar 2018 14:35:40 +1300
Subject: [PATCH 0215/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f7fbed665..6e233810e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.3</version>
+  <version>11.15.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.15.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 05aff53241a91400b79d441846d2ce06ca3281e6 Mon Sep 17 00:00:00 2001
From: Roman Parshikov <promansew@gmail.com>
Date: Tue, 3 Apr 2018 17:17:46 +0800
Subject: [PATCH 0216/1036] Fix Maven links in README (#1358)

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index db3cf331e..65f85b8e7 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Goto [https://ebean-orm.github.io/](http://ebean-orm.github.io/ "Ebean ORM's Web
 [Maven central - all related projects](http://search.maven.org/#search%7Cga%7C1%7Cebean "maven central all related projects")
 
 ## Current versions
-* [![Maven Central : ebean](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.avaje.ebean/ebean) - ebean
-* [![Maven Central : ebean-agent](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean-agent/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.avaje.ebean/ebean-agent) - ebean-agent
-* [![Maven Central : ebean-maven-plugin](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean-maven-plugin/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.avaje.ebean/ebean-maven-plugin) - ebean-maven-plugin
+* [![Maven Central : ebean](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean) - ebean
+* [![Maven Central : ebean-agent](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean-agent/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean-agent) - ebean-agent
+* [![Maven Central : ebean-maven-plugin](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean-maven-plugin/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean-maven-plugin) - ebean-maven-plugin
 

From dd6f223ae11fd14474dd1abad85b7c9ce8212049 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 5 Apr 2018 21:35:29 +1200
Subject: [PATCH 0217/1036] #1360 - ENH: Add
 transaction.setNestedUseSavepoint() ... such that nested transactions are
 actually Savepoints

---
 src/main/java/io/ebean/Transaction.java       |  18 ++-
 .../io/ebeaninternal/api/SpiTransaction.java  |   5 +
 .../api/SpiTransactionProxy.java              |  12 +-
 .../ImplicitReadOnlyTransaction.java          |  10 ++
 .../server/transaction/JdbcTransaction.java   |  12 ++
 .../server/transaction/NoTransaction.java     |  10 ++
 .../transaction/SavepointTransaction.java     | 107 ++++++++++++++++++
 .../transaction/TransactionManager.java       |  53 ++++++---
 .../transaction/TestNestedSubTransaction.java |  42 +++++++
 9 files changed, 250 insertions(+), 19 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java

diff --git a/src/main/java/io/ebean/Transaction.java b/src/main/java/io/ebean/Transaction.java
index 743fcc138..cd4a4bbc5 100644
--- a/src/main/java/io/ebean/Transaction.java
+++ b/src/main/java/io/ebean/Transaction.java
@@ -23,6 +23,7 @@ public interface Transaction extends AutoCloseable {
    * This returns the current transaction for the 'default server'.  If you are using
    * multiple EbeanServer's then use {@link EbeanServer#currentTransaction()}.
    * </p>
+   *
    * @see Ebean#currentTransaction()
    * @see EbeanServer#currentTransaction()
    */
@@ -136,6 +137,18 @@ public interface Transaction extends AutoCloseable {
    */
   void rollback(Throwable e) throws PersistenceException;
 
+  /**
+   * Set when we want nested transactions to use Savepoint's.
+   * <p>
+   * This means that for a nested transaction:
+   * <ul>
+   * <li>begin transaction maps to creating a savepoint</li>
+   * <li>commit transaction maps to releasing a savepoint</li>
+   * <li>rollback transaction maps to rollback a savepoint</li>
+   * </ul>
+   */
+  void setNestedUseSavepoint();
+
   /**
    * Mark the transaction for rollback only.
    */
@@ -151,7 +164,6 @@ public interface Transaction extends AutoCloseable {
    */
   void end();
 
-
   /**
    * Synonym for end() to support AutoClosable.
    */
@@ -227,7 +239,7 @@ public interface Transaction extends AutoCloseable {
    * Refer to {@link ServerConfig#setSkipCacheAfterWrite(boolean)} for configuring the default behavior
    * for using the L2 bean cache in transactions spanning multiple query/persist requests.
    * </p>
-   * <p>
+   *
    * <pre>{@code
    *
    *   // assume Customer has L2 bean caching enabled ...
@@ -309,7 +321,7 @@ public interface Transaction extends AutoCloseable {
    * <p>
    * Example: batch processing executing every 3 rows
    * </p>
-   * <p>
+   *
    * <pre>{@code
    *
    * String data = "This is a simple test of the batch processing"
diff --git a/src/main/java/io/ebeaninternal/api/SpiTransaction.java b/src/main/java/io/ebeaninternal/api/SpiTransaction.java
index 715b9387f..e134986c5 100644
--- a/src/main/java/io/ebeaninternal/api/SpiTransaction.java
+++ b/src/main/java/io/ebeaninternal/api/SpiTransaction.java
@@ -319,4 +319,9 @@ public interface SpiTransaction extends Transaction {
    * Return the profile location for this transaction.
    */
   ProfileLocation getProfileLocation();
+
+  /**
+   * Return true when nested transactions should create Savepoints.
+   */
+  boolean isNestedUseSavepoint();
 }
diff --git a/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java b/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
index b9907aa3a..02057236c 100644
--- a/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
+++ b/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
@@ -21,7 +21,7 @@ import java.sql.SQLException;
 /**
  * Proxy for an underlying SpiTransaction (most of the API).
  */
-abstract class SpiTransactionProxy implements SpiTransaction {
+public abstract class SpiTransactionProxy implements SpiTransaction {
 
   protected SpiTransaction transaction;
 
@@ -50,6 +50,16 @@ abstract class SpiTransactionProxy implements SpiTransaction {
     return transaction.isRollbackOnly();
   }
 
+  @Override
+  public void setNestedUseSavepoint() {
+    transaction.setNestedUseSavepoint();
+  }
+
+  @Override
+  public boolean isNestedUseSavepoint() {
+    return transaction.isNestedUseSavepoint();
+  }
+
   @Override
   public long profileOffset() {
     return transaction.profileOffset();
diff --git a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
index 0e95880cb..d23fde6d5 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
@@ -231,6 +231,16 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   public void markNotQueryOnly() {
   }
 
+  @Override
+  public boolean isNestedUseSavepoint() {
+    return false;
+  }
+
+  @Override
+  public void setNestedUseSavepoint() {
+
+  }
+
   @Override
   public boolean isReadOnly() {
     if (!isActive()) {
diff --git a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index 322f70725..57c546bdc 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -77,6 +77,8 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
 
   protected boolean rollbackOnly;
 
+  protected boolean nestedUseSavepoint;
+
   /**
    * The underlying Connection.
    */
@@ -1117,6 +1119,16 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
     this.rollbackOnly = true;
   }
 
+  @Override
+  public boolean isNestedUseSavepoint() {
+    return nestedUseSavepoint;
+  }
+
+  @Override
+  public void setNestedUseSavepoint() {
+    this.nestedUseSavepoint = true;
+  }
+
   /**
    * Rollback the transaction.
    */
diff --git a/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
index 9ee156066..62ace0ede 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
@@ -37,6 +37,16 @@ class NoTransaction implements SpiTransaction {
     return null;
   }
 
+  @Override
+  public boolean isNestedUseSavepoint() {
+    return false;
+  }
+
+  @Override
+  public void setNestedUseSavepoint() {
+
+  }
+
   @Override
   public boolean isActive() {
     // always false
diff --git a/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
new file mode 100644
index 000000000..4d6525c55
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
@@ -0,0 +1,107 @@
+package io.ebeaninternal.server.transaction;
+
+import io.ebeaninternal.api.SpiTransaction;
+import io.ebeaninternal.api.SpiTransactionProxy;
+import io.ebeaninternal.server.lib.util.Str;
+
+import javax.persistence.PersistenceException;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Savepoint;
+
+/**
+ * A nested transaction that represents a Savepoint.
+ */
+class SavepointTransaction extends SpiTransactionProxy {
+
+  private static final int STATE_COMMITTED = 1;
+  private static final int STATE_ROLLED_BACK = 2;
+
+  private final TransactionManager manager;
+  private final Savepoint savepoint;
+  private final Connection connection;
+  private final String logPrefix;
+
+  private boolean rollbackOnly;
+  private int state;
+
+  SavepointTransaction(SpiTransaction transaction, TransactionManager manager) throws SQLException {
+    this.manager = manager;
+    this.transaction = transaction;
+    this.connection = transaction.getInternalConnection();
+    this.savepoint = connection.setSavepoint();
+    int savepointId = savepoint.getSavepointId();
+    this.logPrefix = "txn[" + transaction.getId() + "-sp" + savepointId + "] ";
+  }
+
+  @Override
+  public String getLogPrefix() {
+    return logPrefix;
+  }
+
+  @Override
+  public void logSql(String msg) {
+    TransactionManager.SQL_LOGGER.debug(Str.add(logPrefix, msg));
+  }
+
+  @Override
+  public void logSummary(String msg) {
+    TransactionManager.SUM_LOGGER.debug(Str.add(logPrefix, msg));
+  }
+
+  @Override
+  public void setRollbackOnly() {
+    this.rollbackOnly = true;
+  }
+
+  @Override
+  public void commit() {
+    if (rollbackOnly) {
+      rollbackSavepoint(null);
+    } else {
+      commitSavepoint();
+    }
+  }
+
+  @Override
+  public void rollback() throws PersistenceException {
+    rollbackSavepoint(null);
+  }
+
+  @Override
+  public void rollback(Throwable e) throws PersistenceException {
+    rollbackSavepoint(e);
+  }
+
+  private void commitSavepoint() {
+    try {
+      connection.releaseSavepoint(savepoint);
+      state = STATE_COMMITTED;
+      manager.notifyOfCommit(this);
+    } catch (SQLException e) {
+      throw new PersistenceException("Error trying to commit/release Savepoint", e);
+    }
+  }
+
+  private void rollbackSavepoint(Throwable cause) throws PersistenceException {
+    try {
+      connection.rollback(savepoint);
+      state = STATE_ROLLED_BACK;
+      manager.notifyOfRollback(this, cause);
+    } catch (SQLException e) {
+      throw new PersistenceException("Error trying to rollback Savepoint", e);
+    }
+  }
+
+  @Override
+  public void end() {
+    if (state == 0) {
+      rollback();
+    }
+  }
+
+  @Override
+  public void close() {
+    end();
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index c76358829..0f5e26086 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -582,27 +582,42 @@ public class TransactionManager implements SpiTransactionManager {
 
     txScope = initTxScope(txScope);
 
-    boolean setToScope = false;
     ScopedTransaction txnContainer = getActiveScoped();
+
+    boolean setToScope;
+    boolean nestedSavepoint;
+    SpiTransaction transaction;
     if (txnContainer == null) {
-      setToScope = true;
       txnContainer = createScopedTransaction();
+      setToScope = true;
+      transaction = null;
+      nestedSavepoint = false;
+    } else {
+      setToScope = false;
+      transaction = txnContainer.current();
+      nestedSavepoint = transaction.isNestedUseSavepoint();
     }
 
-    SpiTransaction transaction = txnContainer.current();
-
     TxType type = txScope.getType();
-    boolean createTransaction = isCreateNewTransaction(transaction, type);
-    if (createTransaction) {
-      switch (type) {
-        case SUPPORTS:
-        case NOT_SUPPORTED:
-        case NEVER:
-          transaction = NoTransaction.INSTANCE;
-          break;
-        default:
-          transaction = createTransaction(true, txScope.getIsolationLevel());
-          initNewTransaction(transaction, txScope);
+
+    boolean createTransaction;
+    if (nestedSavepoint && (type == TxType.REQUIRED || type == TxType.REQUIRES_NEW)) {
+      createTransaction = true;
+      transaction = createSavepoint(transaction, this);
+
+    } else {
+      createTransaction = isCreateNewTransaction(transaction, type);
+      if (createTransaction) {
+        switch (type) {
+          case SUPPORTS:
+          case NOT_SUPPORTED:
+          case NEVER:
+            transaction = NoTransaction.INSTANCE;
+            break;
+          default:
+            transaction = createTransaction(true, txScope.getIsolationLevel());
+            initNewTransaction(transaction, txScope);
+        }
       }
     }
 
@@ -613,6 +628,14 @@ public class TransactionManager implements SpiTransactionManager {
     return txnContainer;
   }
 
+  private SpiTransaction createSavepoint(SpiTransaction transaction, TransactionManager manager) {
+    try {
+      return new SavepointTransaction(transaction, manager);
+    } catch (SQLException e) {
+      throw new PersistenceException("Error creating nested Savepoint Transaction", e);
+    }
+  }
+
   private void initNewTransaction(SpiTransaction transaction, TxScope txScope) {
 
     if (txScope.isSkipCache()) {
diff --git a/src/test/java/org/tests/transaction/TestNestedSubTransaction.java b/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
index f7e9e62e2..9b58bd07b 100644
--- a/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
+++ b/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
@@ -56,6 +56,48 @@ public class TestNestedSubTransaction extends BaseTestCase {
     }
   }
 
+  @Test
+  public void nestedUseSavepoint() {
+
+    EbeanServer server = server();
+
+    EBasic bean = new EBasic("start1");
+
+    try (Transaction txn0 = server.beginTransaction()) {
+      txn0.setRollbackOnly();
+      txn0.setNestedUseSavepoint();
+
+      server.save(bean);
+
+      try (Transaction txn1 = server.beginTransaction()) {
+        bean.setName("updateNested");
+        server.save(bean);
+        txn1.commit();
+      }
+
+      EBasic fresh = server.find(EBasic.class, bean.getId());
+      assertNotNull(fresh);
+      assertThat(fresh.getName()).isEqualTo("updateNested");
+
+      try (Transaction txn2 = server.beginTransaction()) {
+        bean.setName("barney");
+        Ebean.save(bean);
+        txn2.rollback();
+      }
+
+      fresh = server.find(EBasic.class)
+        .setId(bean.getId())
+        .setPersistenceContextScope(PersistenceContextScope.QUERY)
+        .findOne();
+
+      assertNotNull(fresh);
+      assertThat(fresh.getName()).isEqualTo("updateNested");
+
+    } finally {
+      cleanup(bean);
+    }
+  }
+
   private void cleanup(EBasic bean) {
     Ebean.delete(EBasic.class, bean.getId());
   }

From e49a0c9ffb7463b9704058b34d7f1876c7a7ee02 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 5 Apr 2018 21:48:54 +1200
Subject: [PATCH 0218/1036] #1360 - ENH: Add
 transaction.setNestedUseSavepoint() ... such that nested transactions are
 actually Savepoints

Additional tests
---
 .../transaction/TestNestedSubTransaction.java | 110 ++++++++++++++++++
 1 file changed, 110 insertions(+)

diff --git a/src/test/java/org/tests/transaction/TestNestedSubTransaction.java b/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
index 9b58bd07b..9c99b5f86 100644
--- a/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
+++ b/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
@@ -5,11 +5,13 @@ import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import io.ebean.PersistenceContextScope;
 import io.ebean.Transaction;
+import io.ebean.TxScope;
 import org.junit.Test;
 import org.tests.model.basic.EBasic;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 public class TestNestedSubTransaction extends BaseTestCase {
 
@@ -56,6 +58,114 @@ public class TestNestedSubTransaction extends BaseTestCase {
     }
   }
 
+
+  @Test
+  public void nestedUseSavepoint_doubleNested_rollbackCommit() {
+
+    EbeanServer server = server();
+
+    EBasic bean = new EBasic("start2");
+
+    try (Transaction txn0 = server.beginTransaction()) {
+      txn0.setRollbackOnly();
+      txn0.setNestedUseSavepoint();
+
+      server.save(bean);
+
+      try (Transaction txn1 = server.beginTransaction()) {
+        bean.setName("updateNested");
+        server.save(bean);
+
+        try (Transaction txn2 = server.beginTransaction()) {
+          bean.setName("barney");
+          Ebean.save(bean);
+          txn2.commit();
+        }
+
+        txn1.rollback();
+      }
+
+      EBasic fresh = server.find(EBasic.class)
+        .setId(bean.getId())
+        .setPersistenceContextScope(PersistenceContextScope.QUERY)
+        .findOne();
+
+      assertNotNull(fresh);
+      assertThat(fresh.getName()).isEqualTo("start2");
+    }
+  }
+
+  @Test
+  public void nestedUseSavepoint_doubleNested_commitRollback() {
+
+    EbeanServer server = server();
+
+    EBasic bean = new EBasic("start3");
+
+    try (Transaction txn0 = server.beginTransaction()) {
+      txn0.setRollbackOnly();
+      txn0.setNestedUseSavepoint();
+
+      server.save(bean);
+
+      try (Transaction txn1 = server.beginTransaction()) {
+        bean.setName("updateNested3");
+        server.save(bean);
+
+        try (Transaction txn2 = server.beginTransaction()) {
+          bean.setName("barney3");
+          Ebean.save(bean);
+          txn2.rollback();
+        }
+
+        txn1.commit();
+      }
+
+      EBasic fresh = server.find(EBasic.class)
+        .setId(bean.getId())
+        .setPersistenceContextScope(PersistenceContextScope.QUERY)
+        .findOne();
+
+      assertNotNull(fresh);
+      assertThat(fresh.getName()).isEqualTo("updateNested3");
+    }
+  }
+
+  @Test
+  public void nestedUseSavepoint_nested_RequiresNew() {
+
+    EbeanServer server = server();
+
+    EBasic bean = new EBasic("start4");
+
+    try (Transaction txn0 = server.beginTransaction()) {
+      txn0.setRollbackOnly();
+      txn0.setNestedUseSavepoint();
+
+      server.save(bean);
+
+      try (Transaction txn1 = server.beginTransaction(TxScope.requiresNew())) {
+        bean.setName("updateNested4");
+        server.save(bean);
+        txn1.commit();
+      }
+
+      EBasic fresh = server.find(EBasic.class)
+        .setId(bean.getId())
+        .setPersistenceContextScope(PersistenceContextScope.QUERY)
+        .findOne();
+
+      assertNotNull(fresh);
+      assertThat(fresh.getName()).isEqualTo("updateNested4");
+    }
+
+    EBasic after = server.find(EBasic.class)
+      .setId(bean.getId())
+      .findOne();
+
+    assertNull(after);
+  }
+
   @Test
   public void nestedUseSavepoint() {
 

From 4167dfc4af5a16fa79a92e7b91f2ad53be87838e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 5 Apr 2018 22:23:03 +1200
Subject: [PATCH 0219/1036] [maven-release-plugin] prepare release
 ebean-11.15.4

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6e233810e..b7b5b3e57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.4-SNAPSHOT</version>
+  <version>11.15.4</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.15.4</tag>
   </scm>
 
   <profiles>

From b0d3921264cdeb79d5570d170820465ee296325c Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 5 Apr 2018 22:23:18 +1200
Subject: [PATCH 0220/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b7b5b3e57..1b3964328 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.4</version>
+  <version>11.15.5-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.15.4</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From a8434f22fff40e3563c5551540973cc6369b7925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Camilo?= <ajcamilo@users.noreply.github.com>
Date: Thu, 12 Apr 2018 09:38:09 +0100
Subject: [PATCH 0221/1036] Inheritance - Add support for @DiscriminatorValue
 to be optional (#1361)

---
 .../java/io/ebeaninternal/server/deploy/InheritInfo.java     | 3 ++-
 .../io/ebeaninternal/server/deploy/parse/DeployInherit.java  | 2 ++
 .../ebeaninternal/server/deploy/parse/DeployInheritInfo.java | 5 +++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java b/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
index d93d74fdc..8c536d6ca 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
@@ -6,6 +6,7 @@ import io.ebeaninternal.server.deploy.id.IdBinder;
 import io.ebeaninternal.server.deploy.parse.DeployInheritInfo;
 import io.ebeaninternal.server.query.SqlTreeProperties;
 
+import java.lang.reflect.Modifier;
 import javax.persistence.PersistenceException;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -291,7 +292,7 @@ public class InheritInfo {
    * Return true if this is considered a concrete type in the inheritance hierarchy.
    */
   public boolean isConcrete() {
-    return discriminatorValue != null;
+    return !Modifier.isAbstract(type.getModifiers());
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java
index f7fe0d56c..ce6bc1853 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java
@@ -126,6 +126,8 @@ public class DeployInherit {
     DiscriminatorValue dv = AnnotationUtil.findAnnotation(cls, DiscriminatorValue.class); // do not search recursive
     if (dv != null) {
       info.setDiscriminatorValue(dv.value());
+    } else {
+      info.setDiscriminatorValue(cls.getSimpleName());
     }
 
     return info;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
index a62d84692..4c645457d 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.deploy.parse;
 
 import io.ebeaninternal.server.deploy.InheritInfo;
 
+import java.lang.reflect.Modifier;
 import javax.persistence.DiscriminatorType;
 import java.sql.Types;
 import java.util.ArrayList;
@@ -64,7 +65,7 @@ public class DeployInheritInfo {
    * Return true if this is abstract node.
    */
   public boolean isAbstract() {
-    return (discriminatorObjectValue == null);
+    return Modifier.isAbstract(type.getModifiers());
   }
 
   /**
@@ -205,7 +206,7 @@ public class DeployInheritInfo {
   }
 
   private void appendDiscriminator(List<Object> list) {
-    if (discriminatorObjectValue != null) {
+    if (!isAbstract()) {
       list.add(discriminatorObjectValue);
     }
     for (DeployInheritInfo child : children) {

From d570971fd17b418e92eefbaa23cb2993ccaa7067 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 12 Apr 2018 20:44:39 +1200
Subject: [PATCH 0222/1036] #1363 - Update ebean-migration to 11.5.2

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1b3964328..c30af3e07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,7 +130,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>11.5.1</version>
+      <version>11.5.2</version>
     </dependency>
 
     <dependency>

From 12108ada38e45851cb5945d584d5f6affcc6bd83 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 18 Apr 2018 20:47:59 +1200
Subject: [PATCH 0223/1036] #1363 - Update ebean-migration to 11.5.4

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c30af3e07..3be1f405c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,7 +130,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>11.5.2</version>
+      <version>11.5.4</version>
     </dependency>
 
     <dependency>

From 756f867ed2ddb80a7785abe3985a82545b4f560b Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 18 Apr 2018 21:24:37 +1200
Subject: [PATCH 0224/1036] #1365 - Regression: property
 ebean.namingConvention=io.ebean.config.MatchingNamingConvention ... no longer
 works

---
 src/main/java/io/ebean/config/ServerConfig.java     | 2 +-
 src/test/java/io/ebean/config/ServerConfigTest.java | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 8ef5bf831..5b14d2bfc 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -2871,7 +2871,7 @@ public class ServerConfig {
   }
 
   private NamingConvention createNamingConvention(PropertiesWrapper properties, NamingConvention namingConvention) {
-    NamingConvention nc = properties.createInstance(NamingConvention.class, "namingconvention", null);
+    NamingConvention nc = properties.createInstance(NamingConvention.class, "namingConvention", null);
     return (nc != null) ? nc : namingConvention;
   }
 
diff --git a/src/test/java/io/ebean/config/ServerConfigTest.java b/src/test/java/io/ebean/config/ServerConfigTest.java
index 03c86481d..b404b7451 100644
--- a/src/test/java/io/ebean/config/ServerConfigTest.java
+++ b/src/test/java/io/ebean/config/ServerConfigTest.java
@@ -65,6 +65,8 @@ public class ServerConfigTest {
     props.setProperty("notifyL2CacheInForeground", "true");
     props.setProperty("idType", "SEQUENCE");
     props.setProperty("mappingLocations", "classpath:/foo;bar");
+    props.setProperty("namingConvention", "io.ebean.config.MatchingNamingConvention");
+
 
     serverConfig.loadFromProperties(props);
 
@@ -72,6 +74,7 @@ public class ServerConfigTest {
     assertTrue(serverConfig.isNotifyL2CacheInForeground());
     assertTrue(serverConfig.isDbOffline());
     assertTrue(serverConfig.isAutoReadOnlyDataSource());
+    assertThat(serverConfig.getNamingConvention()).isInstanceOf(MatchingNamingConvention.class);
 
     assertEquals(IdType.SEQUENCE, serverConfig.getIdType());
     assertEquals(PersistBatch.INSERT, serverConfig.getPersistBatch());

From 49d9d88fbe790c62da19ad431fd4cdfbd3ac6e61 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Fri, 27 Apr 2018 04:44:18 +0200
Subject: [PATCH 0225/1036] FIX: load all props from cache when inheritance is
 involved (#1366)

---
 .../server/cache/CachedBeanDataToBean.java    |  4 ++
 .../org/tests/cache/TestCacheManyToOne.java   | 39 ++++++++++++++++
 .../tests/model/basic/OCachedInhChildA.java   | 30 +++++++++++++
 .../tests/model/basic/OCachedInhChildB.java   | 29 ++++++++++++
 .../org/tests/model/basic/OCachedInhRoot.java | 44 +++++++++++++++++++
 5 files changed, 146 insertions(+)
 create mode 100644 src/test/java/org/tests/cache/TestCacheManyToOne.java
 create mode 100644 src/test/java/org/tests/model/basic/OCachedInhChildA.java
 create mode 100644 src/test/java/org/tests/model/basic/OCachedInhChildB.java
 create mode 100644 src/test/java/org/tests/model/basic/OCachedInhRoot.java

diff --git a/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java b/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java
index 05b2a0d1f..bb3bc4b75 100644
--- a/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java
+++ b/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java
@@ -15,6 +15,10 @@ public class CachedBeanDataToBean {
     EntityBeanIntercept ebi = bean._ebean_getIntercept();
 
     BeanProperty idProperty = desc.getIdProperty();
+    if (desc.getInheritInfo() != null) {
+        desc = desc.getInheritInfo().readType(bean.getClass()).desc();
+    }
+
     if (idProperty != null) {
       // load the id property
       loadProperty(bean, cacheBeanData, ebi, idProperty, context);
diff --git a/src/test/java/org/tests/cache/TestCacheManyToOne.java b/src/test/java/org/tests/cache/TestCacheManyToOne.java
new file mode 100644
index 000000000..fd6e209b0
--- /dev/null
+++ b/src/test/java/org/tests/cache/TestCacheManyToOne.java
@@ -0,0 +1,39 @@
+package org.tests.cache;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.tests.model.basic.OCachedInhChildA;
+import org.tests.model.basic.OCachedInhRoot;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * Test class testing deleting/invalidating of cached beans
+ */
+public class TestCacheManyToOne extends BaseTestCase {
+
+  @Test
+  public void crudInvoice() {
+
+    OCachedInhChildA bean = new OCachedInhChildA();
+    bean.setName("Roland");
+    bean.setChildAData("ChildData");
+    Ebean.save(bean);
+
+    Ebean.find(OCachedInhRoot.class).select("id").where().idIn(bean.getId()).findEach(bean0 -> {
+      assertNotNull(bean0);
+      assertThat(bean0.getName()).isEqualTo("Roland");
+      assertThat(((OCachedInhChildA)bean0).getChildAData()).isEqualTo("ChildData");
+    });
+
+    Ebean.find(OCachedInhRoot.class).select("id").where().idIn(bean.getId()).findEach(bean1 -> {
+      assertNotNull(bean1);
+      assertThat(bean1.getName()).isEqualTo("Roland");
+      // this will fail if the bean is loaded from cache and the wrong discriminator is used.
+      assertThat(((OCachedInhChildA)bean1).getChildAData()).isEqualTo("ChildData");
+    });
+
+  }
+}
diff --git a/src/test/java/org/tests/model/basic/OCachedInhChildA.java b/src/test/java/org/tests/model/basic/OCachedInhChildA.java
new file mode 100644
index 000000000..8ec183379
--- /dev/null
+++ b/src/test/java/org/tests/model/basic/OCachedInhChildA.java
@@ -0,0 +1,30 @@
+package org.tests.model.basic;
+
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+
+
+/**
+ * Child bean A
+ */
+@Entity
+@DiscriminatorValue("childA")
+public class OCachedInhChildA extends OCachedInhRoot {
+
+  String childAData;
+
+  /**
+   * @return the childAData
+   */
+  public String getChildAData() {
+    return childAData;
+  }
+
+  /**
+   * @param childAData
+   *          the childAData to set
+   */
+  public void setChildAData(String childAData) {
+    this.childAData = childAData;
+  }
+}
diff --git a/src/test/java/org/tests/model/basic/OCachedInhChildB.java b/src/test/java/org/tests/model/basic/OCachedInhChildB.java
new file mode 100644
index 000000000..1ef25a2ca
--- /dev/null
+++ b/src/test/java/org/tests/model/basic/OCachedInhChildB.java
@@ -0,0 +1,29 @@
+package org.tests.model.basic;
+
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+
+
+/**
+ * Child bean B
+ */
+@Entity
+@DiscriminatorValue("childB")
+public class OCachedInhChildB extends OCachedInhRoot {
+  String childBData;
+
+  /**
+   * @return the childBData
+   */
+  public String getChildBData() {
+    return childBData;
+  }
+
+  /**
+   * @param childBData
+   *          the childBData to set
+   */
+  public void setChildBData(String childBData) {
+    this.childBData = childBData;
+  }
+}
diff --git a/src/test/java/org/tests/model/basic/OCachedInhRoot.java b/src/test/java/org/tests/model/basic/OCachedInhRoot.java
new file mode 100644
index 000000000..1027070cc
--- /dev/null
+++ b/src/test/java/org/tests/model/basic/OCachedInhRoot.java
@@ -0,0 +1,44 @@
+package org.tests.model.basic;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.Table;
+
+import io.ebean.annotation.Cache;
+
+/**
+ * Cached entity for inheritance.
+ *
+ * @author Roland Praml, FOCONIS AG
+ */
+@Entity
+@Table(name = "o_cached_inherit")
+@Inheritance
+@Cache
+public abstract class OCachedInhRoot {
+
+  @Id
+  Long id;
+
+  String name;
+
+  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;
+  }
+
+
+
+}

From 33031d1c698e8a81d1e7a9b5cd66d22fd62778ad Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 6 May 2018 20:21:10 +1200
Subject: [PATCH 0226/1036] #1369 - BeanListener and/or BeanPersistAdapter not
 fired on delete of children when cascaded

---
 .../server/deploy/BeanDescriptor.java         | 10 +++-
 .../server/persist/DefaultPersister.java      | 18 ++++--
 src/test/java/org/tests/delete/DcDetail.java  | 51 ++++++++++++++++
 .../java/org/tests/delete/DcListener.java     | 28 +++++++++
 src/test/java/org/tests/delete/DcMaster.java  | 59 +++++++++++++++++++
 .../delete/TestDeleteCascadeWithListener.java | 51 ++++++++++++++++
 6 files changed, 211 insertions(+), 6 deletions(-)
 create mode 100644 src/test/java/org/tests/delete/DcDetail.java
 create mode 100644 src/test/java/org/tests/delete/DcListener.java
 create mode 100644 src/test/java/org/tests/delete/DcMaster.java
 create mode 100644 src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 1bc379e7e..e34020a10 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -1723,7 +1723,15 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * associated L2 bean caching.
    */
   public boolean isDeleteByStatement() {
-    return deleteRecurseSkippable && !isBeanCaching();
+    return persistListener == null
+      && persistController == null
+      && deleteRecurseSkippable && !isBeanCaching();
+  }
+
+  public boolean isDeleteByBulk() {
+    return persistListener == null
+      && persistController == null
+      && propertiesManyToMany.length == 0;
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index c3cb2dcda..f7688d7a5 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -588,10 +588,18 @@ public final class DefaultPersister implements Persister {
     }
   }
 
-  private void deleteList(List<?> beanList, Transaction t, boolean softDelete) {
+  private void deleteList(List<?> beanList, SpiTransaction t, boolean softDelete, boolean children) {
+    if (children) {
+      t.depth(-1);
+      t.checkBatchEscalationOnCollection();
+    }
     for (Object aBeanList : beanList) {
       deleteRecurse((EntityBean) aBeanList, t, softDelete);
     }
+    if (children) {
+      t.flushBatchOnCollection();
+      t.depth(+1);
+    }
   }
 
   /**
@@ -675,7 +683,7 @@ public final class DefaultPersister implements Persister {
             t.logSummary("-- DeleteById of " + descriptor.getName() + " ids[" + idList + "] requires fetch of foreign key values");
           }
           List<?> beanList = server.findList(q, t);
-          deleteList(beanList, t, softDelete);
+          deleteList(beanList, t, softDelete, false);
           return beanList.size();
 
         } else {
@@ -1012,7 +1020,7 @@ public final class DefaultPersister implements Persister {
       // cascade delete the beans in the collection
       BeanDescriptor<?> targetDesc = many.getTargetDescriptor();
       if (!softDelete || targetDesc.isSoftDelete()) {
-        if (targetDesc.isDeleteRecurseSkippable() && !targetDesc.isBeanCaching()) {
+        if (targetDesc.isDeleteByStatement()) {
           // Just delete all the children with one statement
           IntersectionRow intRow = many.buildManyDeleteChildren(parentBean, excludeDetailIds);
           SqlUpdate sqlDelete = intRow.createDelete(server, softDelete);
@@ -1037,13 +1045,13 @@ public final class DefaultPersister implements Persister {
    */
   private void deleteChildrenById(SpiTransaction t, BeanDescriptor<?> targetDesc, List<Object> childIds, boolean softDelete) {
 
-    if (targetDesc.propertiesManyToMany().length > 0) {
+    if (!targetDesc.isDeleteByBulk()) {
       // convert into a list of reference objects and perform delete by object
       List<Object> refList = new ArrayList<>(childIds.size());
       for (Object id : childIds) {
         refList.add(targetDesc.createReference(id, null));
       }
-      deleteList(refList, t, softDelete);
+      deleteList(refList, t, softDelete, true);
 
     } else {
       // perform delete by statement if possible
diff --git a/src/test/java/org/tests/delete/DcDetail.java b/src/test/java/org/tests/delete/DcDetail.java
new file mode 100644
index 000000000..e49cc58bc
--- /dev/null
+++ b/src/test/java/org/tests/delete/DcDetail.java
@@ -0,0 +1,51 @@
+package org.tests.delete;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+@Entity
+public class DcDetail {
+
+  @Id
+  long id;
+
+  @ManyToOne
+  DcMaster master;
+
+  String description;
+
+  long version;
+
+  public long getId() {
+    return id;
+  }
+
+  public void setId(long id) {
+    this.id = id;
+  }
+
+  public DcMaster getMaster() {
+    return master;
+  }
+
+  public void setMaster(DcMaster master) {
+    this.master = master;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/delete/DcListener.java b/src/test/java/org/tests/delete/DcListener.java
new file mode 100644
index 000000000..5e4191ab0
--- /dev/null
+++ b/src/test/java/org/tests/delete/DcListener.java
@@ -0,0 +1,28 @@
+package org.tests.delete;
+
+import io.ebean.event.AbstractBeanPersistListener;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class DcListener extends AbstractBeanPersistListener {
+
+  static List<Object> deleted = Collections.synchronizedList(new ArrayList<>());
+
+  @Override
+  public boolean isRegisterFor(Class<?> cls) {
+    return cls.equals(DcDetail.class);
+  }
+
+  @Override
+  public void deleted(Object bean) {
+    deleted.add(bean);
+  }
+
+  static List<Object> deletedBeans() {
+    List<Object> copy = new ArrayList<>(deleted);
+    deleted.clear();
+    return copy;
+  }
+}
diff --git a/src/test/java/org/tests/delete/DcMaster.java b/src/test/java/org/tests/delete/DcMaster.java
new file mode 100644
index 000000000..e1c8d0144
--- /dev/null
+++ b/src/test/java/org/tests/delete/DcMaster.java
@@ -0,0 +1,59 @@
+package org.tests.delete;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Version;
+import java.util.List;
+
+@Entity
+public class DcMaster {
+
+  @Id
+  long id;
+
+  String name;
+
+  @OneToMany(mappedBy = "master", cascade = CascadeType.ALL)
+  List<DcDetail> details;
+
+  @Version
+  long version;
+
+  public DcMaster(String name) {
+    this.name = name;
+  }
+
+  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 List<DcDetail> getDetails() {
+    return details;
+  }
+
+  public void setDetails(List<DcDetail> details) {
+    this.details = details;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java b/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java
new file mode 100644
index 000000000..56d47e5ea
--- /dev/null
+++ b/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java
@@ -0,0 +1,51 @@
+package org.tests.delete;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestDeleteCascadeWithListener extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    DcMaster m0 = new DcMaster("m0");
+    m0.getDetails().add(new DcDetail());
+    m0.getDetails().add(new DcDetail());
+    m0.getDetails().add(new DcDetail());
+
+    Ebean.save(m0);
+
+    DcMaster found = Ebean.find(DcMaster.class, m0.getId());
+
+    LoggedSqlCollector.start();
+    Ebean.delete(found);
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(5);
+
+    assertThat(sql.get(0)).contains("select t0.id from dc_detail t0 where master_id=?");
+    assertThat(sql.get(1)).contains("delete from dc_detail where id=?");
+    assertThat(sql.get(3)).contains("delete from dc_detail where id=?");
+    assertThat(sql.get(4)).contains("delete from dc_master where id=? and version=?");
+
+    awaitListenerPropagation();
+
+    List<Object> beans = DcListener.deletedBeans();
+    assertThat(beans).hasSize(3);
+  }
+
+  private void awaitListenerPropagation() {
+    try {
+      Thread.sleep(200);
+    } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw new RuntimeException(e);
+    }
+  }
+}

From 1a2ca63d65c70e4a06c47f7b65f4a2e5f3954569 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 6 May 2018 20:50:40 +1200
Subject: [PATCH 0227/1036] [maven-release-plugin] prepare release
 ebean-11.15.5

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3be1f405c..ba7bc573b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.5-SNAPSHOT</version>
+  <version>11.15.5</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.15.5</tag>
   </scm>
 
   <profiles>

From 111bac751460b02520bb2f25919ebf8af4ed3445 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 6 May 2018 20:50:56 +1200
Subject: [PATCH 0228/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ba7bc573b..82420d5e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.5</version>
+  <version>11.15.6-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.15.5</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From cfaedcdbc50a63001f9ba3330b9cb4136c5169af Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 10 May 2018 17:20:09 +1200
Subject: [PATCH 0229/1036] #1371 - Regression in 11.15.5 with @Inheritance on
 abstract class with discriminatorType = INTEGER

---
 .../server/deploy/parse/DeployInherit.java    | 13 ++---
 .../abstrakt/AbstractBaseBlock.java           | 48 +++++++++++++++++++
 .../org/tests/inheritance/abstrakt/Block.java | 19 ++++++++
 .../abstrakt/TestInheritanceNum.java          | 18 +++++++
 4 files changed, 92 insertions(+), 6 deletions(-)
 create mode 100644 src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java
 create mode 100644 src/test/java/org/tests/inheritance/abstrakt/Block.java
 create mode 100644 src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java
index ce6bc1853..749d597f1 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java
@@ -123,13 +123,14 @@ public class DeployInherit {
       info.setColumnDefn(da.columnDefinition());
     }
 
-    DiscriminatorValue dv = AnnotationUtil.findAnnotation(cls, DiscriminatorValue.class); // do not search recursive
-    if (dv != null) {
-      info.setDiscriminatorValue(dv.value());
-    } else {
-      info.setDiscriminatorValue(cls.getSimpleName());
+    if (!info.isAbstract()) {
+      DiscriminatorValue dv = AnnotationUtil.findAnnotation(cls, DiscriminatorValue.class); // do not search recursive
+      if (dv != null) {
+        info.setDiscriminatorValue(dv.value());
+      } else {
+        info.setDiscriminatorValue(cls.getSimpleName());
+      }
     }
-
     return info;
   }
 
diff --git a/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java b/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java
new file mode 100644
index 000000000..334752405
--- /dev/null
+++ b/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java
@@ -0,0 +1,48 @@
+package org.tests.inheritance.abstrakt;
+
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.DiscriminatorType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name = "block")
+@Inheritance
+@DiscriminatorColumn(name = "case_type", discriminatorType = DiscriminatorType.INTEGER)
+public abstract class AbstractBaseBlock {
+
+  @Id
+  long id;
+
+  String name;
+
+  @Version
+  long version;
+
+  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 long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/inheritance/abstrakt/Block.java b/src/test/java/org/tests/inheritance/abstrakt/Block.java
new file mode 100644
index 000000000..ea0297de1
--- /dev/null
+++ b/src/test/java/org/tests/inheritance/abstrakt/Block.java
@@ -0,0 +1,19 @@
+package org.tests.inheritance.abstrakt;
+
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+
+@Entity
+@DiscriminatorValue(value = "2")
+public class Block extends AbstractBaseBlock {
+
+  String notes;
+
+  public String getNotes() {
+    return notes;
+  }
+
+  public void setNotes(String notes) {
+    this.notes = notes;
+  }
+}
diff --git a/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java b/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java
new file mode 100644
index 000000000..42f36d263
--- /dev/null
+++ b/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java
@@ -0,0 +1,18 @@
+package org.tests.inheritance.abstrakt;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.junit.Test;
+
+public class TestInheritanceNum extends BaseTestCase {
+
+  @Test
+  public void basicIUD() {
+
+    Block block = new Block();
+    block.setName("ibe");
+    block.setNotes("try it");
+
+    Ebean.save(block);
+  }
+}

From fc837b6472f885151b024b10b9711b309f945c4b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 10 May 2018 17:22:04 +1200
Subject: [PATCH 0230/1036] [maven-release-plugin] prepare release
 ebean-11.15.6

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 82420d5e4..7d9f96601 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.6-SNAPSHOT</version>
+  <version>11.15.6</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.15.6</tag>
   </scm>
 
   <profiles>

From f8c80c7fd219f12f1dda9a79ee8f75542396e474 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 10 May 2018 17:22:18 +1200
Subject: [PATCH 0231/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7d9f96601..1d881bfc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.6</version>
+  <version>11.15.7-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.15.6</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 0a49fc9b6299545947b759e67fc23973d541dc64 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 14 May 2018 11:12:42 +0200
Subject: [PATCH 0232/1036] FIX: NPE when fetching inherited beans from cache
 (#1373)

---
 .../server/deploy/BeanDescriptor.java         | 11 ++++
 .../cache/TestInheritanceRefCache.java        | 64 +++++++++++++++++++
 .../org/tests/model/basic/cache/CInhRef.java  | 25 ++++++++
 3 files changed, 100 insertions(+)
 create mode 100644 src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java
 create mode 100644 src/test/java/org/tests/model/basic/cache/CInhRef.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index e34020a10..0a75df76c 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -71,6 +71,7 @@ import io.ebeaninternal.server.query.STreePropertyAssocMany;
 import io.ebeaninternal.server.query.STreePropertyAssocOne;
 import io.ebeaninternal.server.query.STreeType;
 import io.ebeaninternal.server.query.SqlBeanLoad;
+import io.ebeaninternal.server.querydefn.DefaultOrmQuery;
 import io.ebeaninternal.server.querydefn.OrmQueryDetail;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
 import io.ebeaninternal.server.type.DataBind;
@@ -1878,6 +1879,9 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * on first access (lazy load) or immediately (eager load)
    */
   public EntityBean createEntityBean(boolean isNew) {
+    if (prototypeEntityBean == null) {
+      throw new UnsupportedOperationException("cannot create entity bean for abstract entity " + getName());
+    }
     try {
       EntityBean bean = (EntityBean) prototypeEntityBean._ebean_newInstance();
 
@@ -1969,6 +1973,13 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   public T createReference(Object id, PersistenceContext pc) {
 
     try {
+      if (inheritInfo != null && !inheritInfo.isConcrete()) {
+        // we actually need to do a query because we don't know the type without the discriminator
+        // value, just select the id property and discriminator column (auto added)
+        DefaultOrmQuery<T> query = new DefaultOrmQuery<>(this, ebeanServer, ebeanServer.getExpressionFactory());
+        return query.select(getIdProperty().getName()).setId(id).findOne();
+      }
+
       EntityBean eb = createEntityBean();
       id = convertSetId(id, eb);
       EntityBeanIntercept ebi = eb._ebean_getIntercept();
diff --git a/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java b/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java
new file mode 100644
index 000000000..1f45212eb
--- /dev/null
+++ b/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java
@@ -0,0 +1,64 @@
+package org.tests.inheritance.cache;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.tests.model.basic.cache.CInhOne;
+import org.tests.model.basic.cache.CInhRef;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+
+import org.ebeantest.LoggedSqlCollector;
+
+public class TestInheritanceRefCache extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    CInhOne one = new CInhOne();
+    one.setLicenseNumber("O12");
+    one.setDriver("Jimmy");
+    one.setNotes("Hello");
+
+    Ebean.save(one);
+
+    CInhRef ref = new CInhRef();
+    ref.setRef(one);
+
+    Ebean.save(ref);
+
+    Integer id = ref.getId();
+
+    LoggedSqlCollector.start();
+    CInhRef gotRef = Ebean.find(CInhRef.class).setId(id).findOne();
+
+    assertThat(gotRef).isInstanceOf(CInhRef.class);
+    assertThat(gotRef.getRef()).isInstanceOf(CInhOne.class);
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("from cinh_ref").contains("left join cinh_root");
+
+    // fetch again - from cache (but fetch second bean from cache)
+    LoggedSqlCollector.start();
+    gotRef = Ebean.find(CInhRef.class).setId(id).findOne();
+
+    assertThat(gotRef).isInstanceOf(CInhRef.class);
+    assertThat(gotRef.getRef()).isInstanceOf(CInhOne.class);
+    sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("from cinh_root");
+
+
+    // fetch again - both from cache
+    LoggedSqlCollector.start();
+    gotRef = Ebean.find(CInhRef.class).setId(id).findOne();
+
+    assertThat(gotRef).isInstanceOf(CInhRef.class);
+    assertThat(gotRef.getRef()).isInstanceOf(CInhOne.class);
+    sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(0);
+
+  }
+}
diff --git a/src/test/java/org/tests/model/basic/cache/CInhRef.java b/src/test/java/org/tests/model/basic/cache/CInhRef.java
new file mode 100644
index 000000000..63e918724
--- /dev/null
+++ b/src/test/java/org/tests/model/basic/cache/CInhRef.java
@@ -0,0 +1,25 @@
+package org.tests.model.basic.cache;
+
+import org.tests.model.basic.BasicDomain;
+
+import io.ebean.annotation.Cache;
+
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+
+@Entity
+@Cache(enableQueryCache = true)
+public class CInhRef extends BasicDomain {
+  private static final long serialVersionUID = -4673953370819311120L;
+
+  @ManyToOne(cascade = {})
+  private CInhRoot ref;
+
+  public CInhRoot getRef() {
+    return ref;
+  }
+
+  public void setRef(CInhRoot ref) {
+    this.ref = ref;
+  }
+}

From 95737cd3c56f9adab311510fab0b4e3bac020a7d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 14 May 2018 21:23:13 +1200
Subject: [PATCH 0233/1036] #1374 - Remove
 io.ebeaninternal.server.core.ServletContextListener - should be unused

---
 pom.xml                                       |  7 ----
 .../server/core/ServletContextListener.java   | 32 -------------------
 2 files changed, 39 deletions(-)
 delete mode 100644 src/main/java/io/ebeaninternal/server/core/ServletContextListener.java

diff --git a/pom.xml b/pom.xml
index 1d881bfc1..353b0f6c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -169,13 +169,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
-      <scope>provided</scope>
-    </dependency>
-
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
diff --git a/src/main/java/io/ebeaninternal/server/core/ServletContextListener.java b/src/main/java/io/ebeaninternal/server/core/ServletContextListener.java
deleted file mode 100644
index e77aa24f2..000000000
--- a/src/main/java/io/ebeaninternal/server/core/ServletContextListener.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.ebeaninternal.server.core;
-
-import io.ebeaninternal.server.lib.ShutdownManager;
-
-import javax.servlet.ServletContextEvent;
-
-/**
- * Listens for webserver server starting and stopping events.
- * <p>
- * Register this listener in the web.xml configuration file. This will listen
- * for startup and shutdown events.
- * </p>
- */
-public class ServletContextListener implements javax.servlet.ServletContextListener {
-
-  /**
-   * The servlet container is stopping.
-   */
-  @Override
-  public void contextDestroyed(ServletContextEvent event) {
-    ShutdownManager.shutdown();
-  }
-
-  /**
-   * Do nothing on startup.
-   */
-  @Override
-  public void contextInitialized(ServletContextEvent event) {
-
-  }
-
-}

From 9dc5ca602c8a657bdd4872871038c7b90307cc9b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 14 May 2018 21:32:48 +1200
Subject: [PATCH 0234/1036] #1372 - Missing @OneToOne mapping yields unusable
 error messages.

---
 .../io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java  | 4 ++++
 src/test/java/org/tests/model/basic/OrderAggregate.java       | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index 4cea3315a..25f84abe1 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -310,6 +310,10 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
         String discProperty = prefix + "." + discriminatorColumn;
         selectChain.add(discProperty);
       }
+      if (targetIdBinder == null) {
+        throw new IllegalStateException("No Id binding property for " + getFullBeanName()
+          + ". Probably a missing @OneToOne mapping annotation on this relationship?");
+      }
       targetIdBinder.buildRawSqlSelectChain(prefix, selectChain);
 
     } else {
diff --git a/src/test/java/org/tests/model/basic/OrderAggregate.java b/src/test/java/org/tests/model/basic/OrderAggregate.java
index 364d94f2f..f67614b35 100644
--- a/src/test/java/org/tests/model/basic/OrderAggregate.java
+++ b/src/test/java/org/tests/model/basic/OrderAggregate.java
@@ -16,7 +16,7 @@ import javax.persistence.OneToOne;
 @Sql
 public class OrderAggregate {
 
-  @OneToOne
+  //@OneToOne
   Order order;
 
   Double maxAmount;

From 89789f3347ce528ef2fb27ddba1d299474aa14ea Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 14 May 2018 21:33:11 +1200
Subject: [PATCH 0235/1036] #1372 - Missing @OneToOne mapping yields unusable
 error messages.

Restore mapping.
---
 src/test/java/org/tests/model/basic/OrderAggregate.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/tests/model/basic/OrderAggregate.java b/src/test/java/org/tests/model/basic/OrderAggregate.java
index f67614b35..364d94f2f 100644
--- a/src/test/java/org/tests/model/basic/OrderAggregate.java
+++ b/src/test/java/org/tests/model/basic/OrderAggregate.java
@@ -16,7 +16,7 @@ import javax.persistence.OneToOne;
 @Sql
 public class OrderAggregate {
 
-  //@OneToOne
+  @OneToOne
   Order order;
 
   Double maxAmount;

From 53a80c7dd15713c18f9be007869e39a651f4025d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 14 May 2018 22:10:18 +1200
Subject: [PATCH 0236/1036] [maven-release-plugin] prepare release
 ebean-11.15.7

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 353b0f6c7..9dfe4b51a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.7-SNAPSHOT</version>
+  <version>11.15.7</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.15.7</tag>
   </scm>
 
   <profiles>

From 927fa5f7d31d6268c9b78ec9601f48bdf0871359 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 14 May 2018 22:10:34 +1200
Subject: [PATCH 0237/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9dfe4b51a..8e656ace1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.7</version>
+  <version>11.15.8-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.15.7</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 0e9782e6b32cf971ba2cee54903d0297603d0f18 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 14 May 2018 22:15:58 +1200
Subject: [PATCH 0238/1036] #1376 - Bump dependency - jackson-core from 2.9.0
 to 2.9.5

---
 pom.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8e656ace1..0cbd3d6b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,6 +15,10 @@
   <name>ebean</name>
   <url>http://ebean-orm.github.io/</url>
 
+  <properties>
+    <jackson-core.version>2.9.5</jackson-core.version>
+  </properties>
+
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
     <tag>HEAD</tag>
@@ -143,14 +147,14 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.9.0</version>
+      <version>${jackson-core.version}</version>
     </dependency>
 
     <!-- provided scope for JsonNode support -->
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.9.0</version>
+      <version>${jackson-core.version}</version>
       <scope>provided</scope>
     </dependency>
 

From cdfcbeec43eee129d93e729792ba331a1d70103b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 14 May 2018 22:17:27 +1200
Subject: [PATCH 0239/1036] #1377 - Bump dependency - jsnakeyaml 1.19 to 1.21

---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0cbd3d6b1..f2e3c6e4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,7 @@
 
   <properties>
     <jackson-core.version>2.9.5</jackson-core.version>
+    <snakeyaml.version>1.21</snakeyaml.version>
   </properties>
 
   <scm>
@@ -93,7 +94,7 @@
     <dependency>
       <groupId>org.yaml</groupId>
       <artifactId>snakeyaml</artifactId>
-      <version>1.19</version>
+      <version>${snakeyaml.version}</version>
     </dependency>
 
     <!--

From 508f2129f51701a811e26d88a08ae017a77ed40d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 14 May 2018 22:19:21 +1200
Subject: [PATCH 0240/1036] [maven-release-plugin] prepare release
 ebean-11.15.8

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f2e3c6e4d..9955c42f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.8-SNAPSHOT</version>
+  <version>11.15.8</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.15.8</tag>
   </scm>
 
   <profiles>

From 574d5e215b426683e4405b4af9724e671a117638 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 14 May 2018 22:19:37 +1200
Subject: [PATCH 0241/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9955c42f8..af2b5e751 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.8</version>
+  <version>11.15.9-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.15.8</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 53b606289da983d460c00c7e4ca5b036c74f99d0 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Thu, 17 May 2018 02:26:37 +0200
Subject: [PATCH 0242/1036] FIX: use LinkedHashMap in enum types to get
 deterministic ordering (#1378)

---
 .../io/ebeaninternal/server/type/DefaultTypeManager.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index ddd4c31f4..036c9eea8 100644
--- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -58,9 +58,9 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Currency;
 import java.util.EnumSet;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -564,7 +564,7 @@ public final class DefaultTypeManager implements TypeManager {
 
     boolean integerType = true;
 
-    Map<String, String> nameValueMap = new HashMap<>();
+    Map<String, String> nameValueMap = new LinkedHashMap<>();
 
     Field[] fields = enumType.getDeclaredFields();
     for (Field field : fields) {
@@ -657,7 +657,7 @@ public final class DefaultTypeManager implements TypeManager {
    */
   private ScalarTypeEnum<?> createEnumScalarTypeDbValue(Class<? extends Enum<?>> enumType, Method method, boolean integerType) {
 
-    Map<String, String> nameValueMap = new HashMap<>();
+    Map<String, String> nameValueMap = new LinkedHashMap<>();
 
     Enum<?>[] enumConstants = enumType.getEnumConstants();
     for (Enum<?> enumConstant : enumConstants) {

From cb0dee998b27202ac9e16ca43acb4349a01b0d38 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 17 May 2018 12:48:08 +1200
Subject: [PATCH 0243/1036] #1375 - Bug: RawSql parsing fails when using
 placeholders

---
 .../server/rawsql/DRawSqlParser.java              |  8 ++------
 .../server/rawsql/TestRawSqlParsing.java          | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlParser.java b/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlParser.java
index a653a074e..0d8552307 100644
--- a/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlParser.java
+++ b/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlParser.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.rawsql;
 
-import io.ebeaninternal.server.rawsql.SpiRawSql.Sql;
 import io.ebeaninternal.server.querydefn.SimpleTextParser;
+import io.ebeaninternal.server.rawsql.SpiRawSql.Sql;
 
 /**
  * Parses sql-select queries to try and determine the location where WHERE and
@@ -55,11 +55,7 @@ class DRawSqlParser {
 
   private Sql parse() {
 
-    if (!hasPlaceHolders()) {
-      // parse the sql for the keywords...
-      // select, from, where, having, group by, order by
-      parseSqlFindKeywords(true);
-    }
+    parseSqlFindKeywords(true);
 
     whereExprPos = findWhereExprPosition();
     havingExprPos = findHavingExprPosition();
diff --git a/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java b/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java
index 570509646..e868cb9bd 100644
--- a/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java
+++ b/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java
@@ -57,4 +57,19 @@ public class TestRawSqlParsing extends BaseTestCase {
 
     assertThat(list).isNotEmpty();
   }
+
+  @Test
+  public void testWhere() {
+
+    ResetBasicData.reset();
+
+    RawSql sql = RawSqlBuilder.parse("SELECT id, name FROM o_customer ${where}").create();
+
+    List<Customer> customers = Ebean.createQuery(Customer.class)
+      .setRawSql(sql)
+      .where().gt("id", 1)
+      .findList();
+
+    assertThat(customers).isNotEmpty();
+  }
 }

From 5fb3a1e019deb37d95f2a5f19b20368940fffea9 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 17 May 2018 12:50:12 +1200
Subject: [PATCH 0244/1036] [maven-release-plugin] prepare release
 ebean-11.15.9

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index af2b5e751..03f5674a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.9-SNAPSHOT</version>
+  <version>11.15.9</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.15.9</tag>
   </scm>
 
   <profiles>

From d1b7b082a2b9d85d840940819859888bcc099d50 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 17 May 2018 12:50:26 +1200
Subject: [PATCH 0245/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 03f5674a2..650e31711 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.9</version>
+  <version>11.15.10-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.15.9</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From ab301f970ccbe0ba5019de25b58bc2a6ff0c8ff5 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Sun, 20 May 2018 06:53:56 +0200
Subject: [PATCH 0246/1036] FIX: correct caching when collection with different
 inherited beans is put to the cache (#1379)

* FIX: correct cahcing when collection with different inherited beans is put to the cache

* removed some sysouts
---
 .../deploy/BeanDescriptorCacheHelp.java       | 16 ++++++-
 .../cache/TestInheritanceRefCache.java        | 47 +++++++++++++++++++
 .../org/tests/model/basic/cache/CInhRoot.java |  2 +-
 3 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index 51d6b9fbf..1d11da087 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -447,7 +447,21 @@ final class BeanDescriptorCacheHelp<T> {
   void beanPutAll(Collection<EntityBean> beans) {
     if (desc.inheritInfo != null) {
       Class<?> aClass = theClassOf(beans);
-      desc.descOf(aClass).cacheBeanPutAllDirect(beans);
+      // check if all beans have the same class
+      for (EntityBean bean : beans) {
+        if (!bean.getClass().equals(aClass)) {
+          aClass = null;
+          break;
+        }
+      }
+      if (aClass == null) {
+        // there are different bean types in the collection, so we add one by one to the cache
+        for (EntityBean bean : beans) {
+          desc.descOf(bean.getClass()).cacheBeanPutDirect(bean);
+        }
+      } else {
+        desc.descOf(aClass).cacheBeanPutAllDirect(beans);
+      }
     } else {
       beanCachePutAllDirect(beans);
     }
diff --git a/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java b/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java
index 1f45212eb..3314a5dde 100644
--- a/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java
+++ b/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java
@@ -4,10 +4,14 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import org.tests.model.basic.cache.CInhOne;
 import org.tests.model.basic.cache.CInhRef;
+import org.tests.model.basic.cache.CInhRoot;
+import org.tests.model.basic.cache.CInhTwo;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.ebeantest.LoggedSqlCollector;
@@ -61,4 +65,47 @@ public class TestInheritanceRefCache extends BaseTestCase {
     assertThat(sql).hasSize(0);
 
   }
+
+  @Test
+  public void testMap() {
+
+    List<Integer> ids = new ArrayList<>();
+
+    CInhOne one = new CInhOne();
+    one.setLicenseNumber("O19");
+    one.setDriver("Foo");
+    one.setNotes("Hello");
+    Ebean.save(one);
+
+    ids.add(one.getId());
+
+    CInhTwo two = new CInhTwo();
+    two.setLicenseNumber("T23");
+    two.setAction("Test");
+    Ebean.save(two);
+
+    ids.add(two.getId());
+
+
+    LoggedSqlCollector.start();
+
+    Ebean.find(CInhRoot.class).setUseQueryCache(true).where().idIn(ids).setMapKey("licenseNumber").findMap();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("from cinh_root");
+
+    // try some cache finds
+    Ebean.find(CInhRoot.class).setUseQueryCache(true).findList();
+    Ebean.find(CInhRoot.class).setUseQueryCache(true).findList();
+    Ebean.find(CInhRoot.class).setUseQueryCache(true).findList();
+
+    LoggedSqlCollector.start();
+
+    Ebean.find(CInhRoot.class).setUseQueryCache(true).where().idIn(ids).setMapKey("licenseNumber").findMap();
+
+    sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(0);
+  }
+
 }
diff --git a/src/test/java/org/tests/model/basic/cache/CInhRoot.java b/src/test/java/org/tests/model/basic/cache/CInhRoot.java
index 94b631159..548ee094c 100644
--- a/src/test/java/org/tests/model/basic/cache/CInhRoot.java
+++ b/src/test/java/org/tests/model/basic/cache/CInhRoot.java
@@ -7,7 +7,7 @@ import javax.persistence.DiscriminatorColumn;
 import javax.persistence.Entity;
 import javax.persistence.Inheritance;
 
-@Cache
+@Cache(enableQueryCache = true)
 @Entity
 @Inheritance
 @DiscriminatorColumn(length = 3)

From 41a31c1aa086972a7a02e2e961f338ab0b3a7d9f Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Sun, 20 May 2018 07:19:10 +0200
Subject: [PATCH 0247/1036] =?UTF-8?q?trigger=20based=20history=20will=20re?=
 =?UTF-8?q?create=20view=20properly=20and=20handle=20default=20=E2=80=A6?=
 =?UTF-8?q?=20(#1370)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* trigger based history will recreate view properly and handle default value also for history view

* HistoryTriggers are generated at the end

* Reference Script

* MYSQL: lock all tables at once
---
 .../dbmigration/ddlgeneration/DdlWrite.java   |  23 +++-
 .../ddlgeneration/platform/BaseTableDdl.java  |  65 +++++++---
 .../platform/DbTriggerBasedHistoryDdl.java    |  28 ++---
 .../platform/DbTriggerUpdate.java             |  12 +-
 .../ddlgeneration/platform/H2HistoryDdl.java  |   6 +-
 .../platform/HistoryTableUpdate.java          |   3 +-
 .../ddlgeneration/platform/MySqlDdl.java      |  34 +++++-
 .../platform/MySqlHistoryDdl.java             |  10 +-
 .../ddlgeneration/platform/PlatformDdl.java   |  26 +++-
 .../platform/PostgresHistoryDdl.java          |  20 +--
 .../platform/SqlServerHistoryDdl.java         |  33 +++--
 .../dbmigration/model/CurrentModel.java       |   3 +-
 .../dbmigration/model/MColumn.java            |   3 +
 .../dbmigration/model/MTable.java             |   2 +-
 .../dbmigration/model/PlatformDdlWriter.java  |   3 +-
 .../dbmigration/DbMigrationTest.java          |  42 +++++++
 .../platform/BaseTableDdlTest.java            |   2 +-
 .../platform/H2HistoryDdlTest.java            |  11 +-
 .../java/misc/migration/v1_0/EHistory2.java   |  12 +-
 .../java/misc/migration/v1_0/EHistory3.java   |  21 ++++
 .../java/misc/migration/v1_0/EHistory4.java   |  21 ++++
 .../java/misc/migration/v1_0/EHistory5.java   |  21 ++++
 .../java/misc/migration/v1_0/EHistory6.java   |  24 ++++
 .../java/misc/migration/v1_1/EHistory2.java   |   4 +-
 .../java/misc/migration/v1_1/EHistory3.java   |  23 ++++
 .../java/misc/migration/v1_1/EHistory4.java   |  21 ++++
 .../java/misc/migration/v1_1/EHistory5.java   |  27 ++++
 .../java/misc/migration/v1_1/EHistory6.java   |  27 ++++
 .../java/misc/migration/v1_2/EHistory2.java   |  12 +-
 .../java/misc/migration/v1_2/EHistory3.java   |  21 ++++
 .../java/misc/migration/v1_2/EHistory4.java   |  21 ++++
 .../java/misc/migration/v1_2/EHistory5.java   |  21 ++++
 .../java/misc/migration/v1_2/EHistory6.java   |  26 ++++
 .../migrationtest/db2/1.0__initial.sql        |  27 ++++
 .../dbmigration/migrationtest/db2/1.1.sql     |  12 +-
 .../migrationtest/db2/1.2__dropsFor_1.1.sql   |   4 +
 .../dbmigration/migrationtest/db2/1.3.sql     |  11 ++
 .../migrationtest/db2/1.4__dropsFor_1.3.sql   |   4 +-
 .../migrationtest/h2/1.0__initial.sql         |  74 +++++++++++
 .../dbmigration/migrationtest/h2/1.1.sql      |  37 +++++-
 .../migrationtest/h2/1.2__dropsFor_1.1.sql    |  14 +++
 .../dbmigration/migrationtest/h2/1.3.sql      |  34 ++++++
 .../migrationtest/h2/1.4__dropsFor_1.3.sql    |  12 ++
 .../migrationtest/hsqldb/1.0__initial.sql     |  27 ++++
 .../dbmigration/migrationtest/hsqldb/1.1.sql  |  12 +-
 .../hsqldb/1.2__dropsFor_1.1.sql              |   4 +
 .../dbmigration/migrationtest/hsqldb/1.3.sql  |  11 ++
 .../hsqldb/1.4__dropsFor_1.3.sql              |   4 +-
 .../model/1.0__initial.model.xml              |  19 +++
 .../migrationtest/model/1.1.model.xml         |  11 +-
 .../model/1.2__dropsFor_1.1.model.xml         |   2 +
 .../migrationtest/model/1.3.model.xml         |   9 ++
 .../model/1.4__dropsFor_1.3.model.xml         |   1 +
 .../migrationtest/mysql/1.0__initial.sql      | 110 ++++++++++++++++-
 .../dbmigration/migrationtest/mysql/1.1.sql   |  70 ++++++++++-
 .../migrationtest/mysql/1.2__dropsFor_1.1.sql |  25 ++++
 .../dbmigration/migrationtest/mysql/1.3.sql   |  62 ++++++++++
 .../migrationtest/mysql/1.4__dropsFor_1.3.sql |  27 +++-
 .../migrationtest/oracle/1.0__initial.sql     |  31 +++++
 .../dbmigration/migrationtest/oracle/1.1.sql  |  10 ++
 .../oracle/1.2__dropsFor_1.1.sql              |   4 +
 .../dbmigration/migrationtest/oracle/1.3.sql  |  11 ++
 .../oracle/1.4__dropsFor_1.3.sql              |   2 +
 .../migrationtest/postgres/1.0__initial.sql   | 115 +++++++++++++++++-
 .../migrationtest/postgres/1.1.sql            |  73 ++++++++++-
 .../postgres/1.2__dropsFor_1.1.sql            |  25 ++++
 .../migrationtest/postgres/1.3.sql            |  67 ++++++++++
 .../postgres/1.4__dropsFor_1.3.sql            |  28 ++++-
 .../migrationtest/sqlite/1.0__initial.sql     |  27 ++++
 .../dbmigration/migrationtest/sqlite/1.1.sql  |  12 +-
 .../sqlite/1.2__dropsFor_1.1.sql              |   4 +
 .../dbmigration/migrationtest/sqlite/1.3.sql  |  11 ++
 .../sqlite/1.4__dropsFor_1.3.sql              |   4 +-
 .../sqlserver17/1.0__initial.sql              |  51 ++++++++
 .../migrationtest/sqlserver17/1.1.sql         |  13 ++
 .../sqlserver17/1.2__dropsFor_1.1.sql         |  26 ++++
 .../migrationtest/sqlserver17/1.3.sql         |  17 +++
 .../sqlserver17/1.4__dropsFor_1.3.sql         |  13 ++
 78 files changed, 1668 insertions(+), 127 deletions(-)
 create mode 100644 src/test/java/misc/migration/v1_0/EHistory3.java
 create mode 100644 src/test/java/misc/migration/v1_0/EHistory4.java
 create mode 100644 src/test/java/misc/migration/v1_0/EHistory5.java
 create mode 100644 src/test/java/misc/migration/v1_0/EHistory6.java
 create mode 100644 src/test/java/misc/migration/v1_1/EHistory3.java
 create mode 100644 src/test/java/misc/migration/v1_1/EHistory4.java
 create mode 100644 src/test/java/misc/migration/v1_1/EHistory5.java
 create mode 100644 src/test/java/misc/migration/v1_1/EHistory6.java
 create mode 100644 src/test/java/misc/migration/v1_2/EHistory3.java
 create mode 100644 src/test/java/misc/migration/v1_2/EHistory4.java
 create mode 100644 src/test/java/misc/migration/v1_2/EHistory5.java
 create mode 100644 src/test/java/misc/migration/v1_2/EHistory6.java

diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlWrite.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlWrite.java
index 699f1324d..163323fbb 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlWrite.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlWrite.java
@@ -18,7 +18,9 @@ public class DdlWrite {
 
   private final DdlBuffer applyForeignKeys;
 
-  private final DdlBuffer applyHistory;
+  private final DdlBuffer applyHistoryView;
+
+  private final DdlBuffer applyHistoryTrigger;
 
   private final DdlBuffer dropAllForeignKeys;
 
@@ -39,7 +41,8 @@ public class DdlWrite {
     this.applyDropDependencies = new BaseDdlBuffer(configuration);
     this.apply = new BaseDdlBuffer(configuration);
     this.applyForeignKeys = new BaseDdlBuffer(configuration);
-    this.applyHistory = new BaseDdlBuffer(configuration);
+    this.applyHistoryView = new BaseDdlBuffer(configuration);
+    this.applyHistoryTrigger = new BaseDdlBuffer(configuration);
     this.dropAllForeignKeys = new BaseDdlBuffer(configuration);
     this.dropAll = new BaseDdlBuffer(configuration);
   }
@@ -61,7 +64,8 @@ public class DdlWrite {
   public boolean isApplyEmpty() {
     return apply.getBuffer().isEmpty()
       && applyForeignKeys.getBuffer().isEmpty()
-      && applyHistory.getBuffer().isEmpty()
+      && applyHistoryView.getBuffer().isEmpty()
+      && applyHistoryTrigger.getBuffer().isEmpty()
       && applyDropDependencies.getBuffer().isEmpty();
   }
 
@@ -90,10 +94,17 @@ public class DdlWrite {
   }
 
   /**
-   * Return the buffer that apply history DDL is written to.
+   * Return the buffer that apply history-view DDL is written to.
    */
-  public DdlBuffer applyHistory() {
-    return applyHistory;
+  public DdlBuffer applyHistoryView() {
+    return applyHistoryView;
+  }
+
+  /**
+   * Return the buffer that apply history-trigger DDL is written to.
+   */
+  public DdlBuffer applyHistoryTrigger() {
+    return applyHistoryTrigger;
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
index f396312f2..1e68124d6 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
@@ -42,6 +42,12 @@ import java.util.Map;
  */
 public class BaseTableDdl implements TableDdl {
 
+  enum HistorySupport {
+    NONE,
+    SQL2011,
+    TRIGGER_BASED
+  }
+
   protected final DbConstraintNaming naming;
 
   protected final NamingConvention namingConvention;
@@ -78,22 +84,23 @@ public class BaseTableDdl implements TableDdl {
 
   private boolean strictMode;
 
-  private final boolean sql2011History;
+  private final HistorySupport historySupport;
 
   /**
    * Helper class that is used to execute the migration ddl before and after the migration action.
    */
   private class DdlMigrationHelp {
-    private List<String> before;
-    private List<String> after;
-    private String tableName;
-    private String columnName;
-    private String defaultValue;
+    private final List<String> before;
+    private final List<String> after;
+    private final String tableName;
+    private final String columnName;
+    private final String defaultValue;
+    private final boolean withHistory;
 
     /**
      * Constructor for DdlMigrationHelp when adding a NEW column.
      */
-    DdlMigrationHelp(String tableName, Column column) {
+    DdlMigrationHelp(String tableName, Column column, boolean withHistory) {
       this.tableName = tableName;
       this.columnName = column.getName();
       this.defaultValue = platformDdl.convertDefaultValue(column.getDefaultValue());
@@ -105,6 +112,7 @@ public class BaseTableDdl implements TableDdl {
 
       before = getScriptsForPlatform(column.getBefore(), platformDdl.getPlatform().getName());
       after = getScriptsForPlatform(column.getAfter(), platformDdl.getPlatform().getName());
+      this.withHistory = withHistory;
     }
 
     /**
@@ -119,6 +127,7 @@ public class BaseTableDdl implements TableDdl {
 
       boolean alterNotNull = Boolean.TRUE.equals(alter.isNotnull());
       // here we add the platform's default update script
+      withHistory = isTrue(alter.isWithHistory());
       if (alter.getBefore().isEmpty() && alterNotNull) {
         if (defaultValue == null) {
           handleStrictError(tableName, columnName);
@@ -134,6 +143,10 @@ public class BaseTableDdl implements TableDdl {
       if (!before.isEmpty()) {
         buffer.end();
       }
+
+      if (!before.isEmpty() && withHistory) {
+        buffer.append("-- NOTE: table has @History - special migration may be necessary").newLine();
+      }
       for (String ddlScript : before) {
         buffer.append(translate(ddlScript, tableName, columnName, this.defaultValue));
         buffer.endOfStatement();
@@ -141,6 +154,9 @@ public class BaseTableDdl implements TableDdl {
     }
 
     void writeAfter(DdlBuffer buffer) throws IOException {
+      if (!after.isEmpty() && withHistory) {
+        buffer.append("-- NOTE: table has @History - special migration may be necessary").newLine();
+      }
       // here we run post migration scripts
       for (String ddlScript : after) {
         buffer.append(translate(ddlScript, tableName, columnName, defaultValue));
@@ -198,7 +214,11 @@ public class BaseTableDdl implements TableDdl {
     this.platformDdl.configure(serverConfig);
     this.strictMode = serverConfig.getMigrationConfig().isStrictMode();
     DbHistorySupport hist = platformDdl.getPlatform().getHistorySupport();
-    this.sql2011History = hist != null && hist.isStandardsBased();
+    if (hist == null) {
+      this.historySupport = HistorySupport.NONE;
+    } else {
+      this.historySupport = hist.isStandardsBased() ? HistorySupport.SQL2011 : HistorySupport.TRIGGER_BASED;
+    }
   }
 
   /**
@@ -700,8 +720,14 @@ public class BaseTableDdl implements TableDdl {
    */
   @Override
   public void generateEpilog(DdlWrite write) throws IOException {
-    for (HistoryTableUpdate update : this.regenerateHistoryTriggers.values()) {
-      platformDdl.regenerateHistoryTriggers(write, update);
+    if (!regenerateHistoryTriggers.isEmpty()) {
+      platformDdl.lockTables(write.applyHistoryTrigger(), regenerateHistoryTriggers.keySet());
+
+      for (HistoryTableUpdate update : this.regenerateHistoryTriggers.values()) {
+        platformDdl.regenerateHistoryTriggers(write, update);
+      }
+
+      platformDdl.unlockTables(write.applyHistoryTrigger(), regenerateHistoryTriggers.keySet());
     }
     platformDdl.generateEpilog(write);
   }
@@ -722,15 +748,15 @@ public class BaseTableDdl implements TableDdl {
     String tableName = addColumn.getTableName();
     List<Column> columns = addColumn.getColumn();
     for (Column column : columns) {
-      alterTableAddColumn(writer.apply(), tableName, column, false);
+      alterTableAddColumn(writer.apply(), tableName, column, false, isTrue(addColumn.isWithHistory()));
     }
 
-    if (isTrue(addColumn.isWithHistory()) && !sql2011History) {
+    if (isTrue(addColumn.isWithHistory()) && historySupport == HistorySupport.TRIGGER_BASED) {
       // make same changes to the history table
       String historyTable = historyTable(tableName);
       for (Column column : columns) {
         regenerateHistoryTriggers(tableName, HistoryTableUpdate.Change.ADD, column.getName());
-        alterTableAddColumn(writer.apply(), historyTable, column, true);
+        alterTableAddColumn(writer.apply(), historyTable, column, true, true);
       }
     }
 
@@ -771,7 +797,8 @@ public class BaseTableDdl implements TableDdl {
     String tableName = dropColumn.getTableName();
 
     alterTableDropColumn(writer.apply(), tableName, dropColumn.getColumnName());
-    if (isTrue(dropColumn.isWithHistory()) && !sql2011History) {
+
+    if (isTrue(dropColumn.isWithHistory())  && historySupport == HistorySupport.TRIGGER_BASED) {
       // also drop from the history table
       regenerateHistoryTriggers(tableName, HistoryTableUpdate.Change.DROP, dropColumn.getColumnName());
       alterTableDropColumn(writer.apply(), historyTable(tableName), dropColumn.getColumnName());
@@ -872,8 +899,9 @@ public class BaseTableDdl implements TableDdl {
     if (hasValue(ddl)) {
       writer.apply().append(ddl).endOfStatement();
 
-      if (isTrue(alter.isWithHistory()) && alter.getType() != null && !sql2011History) {
+      if (isTrue(alter.isWithHistory()) && alter.getType() != null && historySupport == historySupport.TRIGGER_BASED) {
         // mysql and sql server column type change allowing nulls in the history table column
+        regenerateHistoryTriggers(alter.getTableName(), HistoryTableUpdate.Change.ALTER, alter.getColumnName());
         AlterColumn alterHistoryColumn = new AlterColumn();
         alterHistoryColumn.setTableName(historyTable(alter.getTableName()));
         alterHistoryColumn.setColumnName(alter.getColumnName());
@@ -923,7 +951,8 @@ public class BaseTableDdl implements TableDdl {
     String ddl = platformDdl.alterColumnType(alter.getTableName(), alter.getColumnName(), alter.getType());
     if (hasValue(ddl)) {
       writer.apply().append(ddl).endOfStatement();
-      if (isTrue(alter.isWithHistory()) && !sql2011History) {
+      if (isTrue(alter.isWithHistory()) && historySupport == HistorySupport.TRIGGER_BASED) {
+        regenerateHistoryTriggers(alter.getTableName(), HistoryTableUpdate.Change.ALTER, alter.getColumnName());
         // apply same type change to matching column in the history table
         ddl = platformDdl.alterColumnType(historyTable(alter.getTableName()), alter.getColumnName(), alter.getType());
         writer.apply().append(ddl).endOfStatement();
@@ -979,8 +1008,8 @@ public class BaseTableDdl implements TableDdl {
     platformDdl.alterTableDropColumn(buffer, tableName, columnName);
   }
 
-  protected void alterTableAddColumn(DdlBuffer buffer, String tableName, Column column, boolean onHistoryTable) throws IOException {
-    DdlMigrationHelp help = new DdlMigrationHelp(tableName, column);
+  protected void alterTableAddColumn(DdlBuffer buffer, String tableName, Column column, boolean onHistoryTable, boolean withHistory) throws IOException {
+    DdlMigrationHelp help = new DdlMigrationHelp(tableName, column, withHistory);
     if (!onHistoryTable) {
       help.writeBefore(buffer);
     }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
index baceee338..5eb3d6978 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
@@ -69,7 +69,7 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl {
    */
   protected void updateTriggers(DdlWrite writer, MTable table, HistoryTableUpdate update) throws IOException {
 
-    writer.applyHistory().append("-- changes: ").append(update.description()).newLine();
+    writer.applyHistoryTrigger().append("-- changes: ").append(update.description()).newLine();
 
     updateHistoryTriggers(createDbTriggerUpdate(writer, table));
   }
@@ -154,7 +154,7 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl {
 
     String baseTableName = table.getName();
 
-    DdlBuffer apply = writer.applyHistory();
+    DdlBuffer apply = writer.applyHistoryView();
 
     addSysPeriodColumns(apply, baseTableName, whenCreatedColumn);
     createHistoryTable(apply, table);
@@ -210,19 +210,19 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl {
       .endOfStatement().end();
   }
 
-  /**
-   * Create or replace the with_history view with explicit columns.
-   */
-  protected void createWithHistoryView(DbTriggerUpdate update) throws IOException {
 
-    DdlBuffer apply = update.historyBuffer();
-    apply.append("create or replace view ").append(update.getBaseTable()).append(viewSuffix).append(" as select ");
-    appendColumnNames(apply, update.getColumns(), "");
-    appendSysPeriodColumns(apply, ", ");
-    apply.append(" from ").append(update.getBaseTable()).append(" union all select ");
-    appendColumnNames(apply, update.getColumns(), "");
-    appendSysPeriodColumns(apply, ", ");
-    apply.append(" from ").append(update.getHistoryTable()).endOfStatement().end();
+  /**
+   * For postgres/h2/mysql we need to drop and recreate the view. Well, we could add columns to the end of the view
+   * but otherwise we need to drop and create it.
+   */
+  protected void recreateHistoryView(DbTriggerUpdate update) throws IOException {
+
+    DdlBuffer buffer = update.dropDependencyBuffer();
+    // we need to drop the view early/first before any changes to the tables etc
+    buffer.append("drop view if exists ").append(update.getBaseTable()).append(viewSuffix).endOfStatement();
+
+    // recreate the view after all ddl modifications - the view requires ALL columns, also the historyExclude ones.
+    createWithHistoryView(update.historyViewBuffer(), update.getBaseTable());
   }
 
   protected void appendSysPeriodColumns(DdlBuffer apply, String prefix) throws IOException {
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerUpdate.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerUpdate.java
index d36de350c..fa90a233e 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerUpdate.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerUpdate.java
@@ -28,10 +28,18 @@ public class DbTriggerUpdate {
   /**
    * Return the appropriate buffer for the current mode.
    */
-  public DdlBuffer historyBuffer() {
-    return writer.applyHistory();
+  public DdlBuffer historyViewBuffer() {
+    return writer.applyHistoryView();
   }
 
+  /**
+   * Return the appropriate buffer for the current mode.
+   */
+  public DdlBuffer historyTriggerBuffer() {
+    return writer.applyHistoryTrigger();
+  }
+
+
   /**
    * Return the appropriate drop dependency buffer for the current mode.
    */
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
index 24463d3ee..4240c30d9 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
@@ -27,7 +27,7 @@ public class H2HistoryDdl extends DbTriggerBasedHistoryDdl {
   protected void createTriggers(DdlWrite writer, MTable table) throws IOException {
 
     String baseTableName = table.getName();
-    DdlBuffer apply = writer.applyHistory();
+    DdlBuffer apply = writer.applyHistoryTrigger();
 
     addCreateTrigger(apply, updateTriggerName(baseTableName), baseTableName);
   }
@@ -35,7 +35,9 @@ public class H2HistoryDdl extends DbTriggerBasedHistoryDdl {
   @Override
   protected void updateHistoryTriggers(DbTriggerUpdate update) throws IOException {
 
-    DdlBuffer buffer = update.historyBuffer();
+    recreateHistoryView(update);
+
+    DdlBuffer buffer = update.historyTriggerBuffer();
     dropTriggers(buffer, update.getBaseTable());
     addCreateTrigger(buffer, updateTriggerName(update.getBaseTable()), update.getBaseTable());
   }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java
index b308c85a2..a72350a1f 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java
@@ -17,7 +17,8 @@ public class HistoryTableUpdate {
     ADD,
     DROP,
     INCLUDE,
-    EXCLUDE
+    EXCLUDE,
+    ALTER
   }
 
   private static class Column {
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
index 8aec85abc..7c2507873 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
@@ -7,6 +7,7 @@ import io.ebeaninternal.dbmigration.migration.AlterColumn;
 import io.ebeaninternal.dbmigration.migration.Column;
 
 import java.io.IOException;
+import java.util.Collection;
 
 /**
  * MySql specific DDL.
@@ -113,10 +114,39 @@ public class MySqlDdl extends PlatformDdl {
     }
     apply.append(String.format("alter table %s comment = '%s'", tableName, tableComment)).endOfStatement();
   }
-  
+
   @Override
   public void addColumnComment(DdlBuffer apply, String table, String column, String comment) throws IOException {
     // alter comment currently not supported as it requires to repeat whole column definition
   }
-  
+
+
+  /**
+   * Locks all tables for triggers that have to be updated.
+   */
+  @Override
+  public void lockTables(DdlBuffer buffer, Collection<String> tables) throws IOException {
+    if (!tables.isEmpty()) {
+      buffer.append("lock tables ");
+      int i = 0;
+      for (String table : tables) {
+        if (i > 0) {
+          buffer.append(", ");
+        }
+        buffer.append(table).append(" write");
+        i++;
+      }
+      buffer.endOfStatement();
+
+    }
+  }
+
+  /**
+   * Unlocks all tables for triggers that have to be updated.
+   */
+  @Override
+  public void unlockTables(DdlBuffer buffer, Collection<String> tables) throws IOException {
+    buffer.append("unlock tables").endOfStatement();
+  }
+
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java
index d41fa23e4..d67e1c08a 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java
@@ -34,19 +34,19 @@ public class MySqlHistoryDdl extends DbTriggerBasedHistoryDdl {
   @Override
   protected void updateHistoryTriggers(DbTriggerUpdate update) throws IOException {
 
-    DdlBuffer buffer = update.historyBuffer();
+    recreateHistoryView(update);
+
+    DdlBuffer buffer = update.historyTriggerBuffer();
     String baseTable = update.getBaseTable();
 
-    buffer.append("lock tables ").append(baseTable).append(" write").endOfStatement();
     dropTriggers(buffer, baseTable);
     addBeforeUpdate(updateTriggerName(baseTable), update);
     addBeforeDelete(deleteTriggerName(baseTable), update);
-    buffer.append("unlock tables").endOfStatement();
   }
 
   private void addBeforeUpdate(String triggerName, DbTriggerUpdate update) throws IOException {
 
-    DdlBuffer apply = update.historyBuffer();
+    DdlBuffer apply = update.historyTriggerBuffer();
     apply
       .append("delimiter $$").newLine()
       .append("create trigger ").append(triggerName).append(" before update on ").append(update.getBaseTable())
@@ -59,7 +59,7 @@ public class MySqlHistoryDdl extends DbTriggerBasedHistoryDdl {
 
   private void addBeforeDelete(String triggerName, DbTriggerUpdate update) throws IOException {
 
-    DdlBuffer apply = update.historyBuffer();
+    DdlBuffer apply = update.historyTriggerBuffer();
     apply
       .append("delimiter $$").newLine()
       .append("create trigger ").append(triggerName).append(" before delete on ").append(update.getBaseTable())
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
index 35dc8f28c..f0c33c5a4 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -20,10 +20,12 @@ import io.ebeaninternal.dbmigration.migration.Column;
 import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
 import io.ebeaninternal.dbmigration.migration.IdentityType;
 import io.ebeaninternal.dbmigration.model.MTable;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -442,13 +444,16 @@ public class PlatformDdl {
       .append(" ").append(addColumn).append(" ").append(column.getName())
       .append(" ").append(convertedType);
 
-    if (!onHistoryTable) {
 
-      if (defaultValue != null) {
+    // Add default value also to history table if it is not excluded
+    if (defaultValue != null) {
+      if (!onHistoryTable || !isTrue(column.isHistoryExclude())) {
         buffer.append(" default ");
         buffer.append(defaultValue);
       }
+    }
 
+    if (!onHistoryTable) {
       if (isTrue(column.isNotnull())) {
         buffer.append(" not null");
       }
@@ -456,7 +461,8 @@ public class PlatformDdl {
 
       // check constraints cannot be added in one statement for h2
       if (!StringHelper.isNull(column.getCheckConstraint())) {
-        String ddl = alterTableAddCheckConstraint(tableName, column.getCheckConstraintName(), column.getCheckConstraint());
+        String ddl = alterTableAddCheckConstraint(tableName, column.getCheckConstraintName(),
+            column.getCheckConstraint());
         buffer.append(ddl).endOfStatement();
       }
     } else {
@@ -641,4 +647,18 @@ public class PlatformDdl {
     }
     return name;
   }
+
+  /**
+   * Mysql-specific: Locks all tables for triggers that have to be updated.
+   */
+  public void lockTables(DdlBuffer buffer, Collection<String> tables) throws IOException {
+
+  }
+
+  /**
+   * Mysql-specific: Unlocks all tables for triggers that have to be updated.
+   */
+  public void unlockTables(DdlBuffer buffer, Collection<String> tables) throws IOException {
+
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java
index 0abc4a710..fc79ff5ca 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java
@@ -62,7 +62,7 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl {
     String procedureName = procedureName(baseTableName);
     String triggerName = triggerName(baseTableName);
 
-    DdlBuffer apply = writer.applyHistory();
+    DdlBuffer apply = writer.applyHistoryTrigger();
     apply
       .append("create trigger ").append(triggerName).newLine()
       .append("  before update or delete on ").append(baseTableName).newLine()
@@ -107,7 +107,7 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl {
     String historyTable = historyTableName(table.getName());
 
     List<String> columnNames = columnNamesForApply(table);
-    createOrReplaceFunction(writer.applyHistory(), procedureName, historyTable, columnNames);
+    createOrReplaceFunction(writer.applyHistoryTrigger(), procedureName, historyTable, columnNames);
   }
 
   @Override
@@ -116,21 +116,7 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl {
     String procedureName = procedureName(update.getBaseTable());
 
     recreateHistoryView(update);
-    createOrReplaceFunction(update.historyBuffer(), procedureName, update.getHistoryTable(), update.getColumns());
-  }
-
-  /**
-   * For postgres we need to drop and recreate the view. Well, we could add columns to the end of the view
-   * but otherwise we need to drop and create it.
-   */
-  private void recreateHistoryView(DbTriggerUpdate update) throws IOException {
-
-    DdlBuffer buffer = update.dropDependencyBuffer();
-    // we need to drop the view early/first before any changes to the tables etc
-    buffer.append("drop view if exists ").append(update.getBaseTable()).append(viewSuffix).endOfStatement();
-
-    // recreate the view with specific columns specified (the columns generally are not dropped until later)
-    createWithHistoryView(update);
+    createOrReplaceFunction(update.historyTriggerBuffer(), procedureName, update.getHistoryTable(), update.getColumns());
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java
index 6848b66d8..9f28a88c9 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java
@@ -31,19 +31,24 @@ public class SqlServerHistoryDdl implements PlatformHistoryDdl {
     enableSystemVersioning(writer, baseTable);
   }
 
-  private void enableSystemVersioning(DdlWrite writer, String baseTable) throws IOException {
-    DdlBuffer apply = writer.applyHistory();
-    apply.append("alter table ").append(baseTable).newLine()
-      .append("    add ").append(systemPeriodStart).append(" datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(),").newLine()
-      .append("        ").append(systemPeriodEnd).append("   datetime2 GENERATED ALWAYS AS ROW END   NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',").newLine()
-      .append("period for system_time (").append(systemPeriodStart).append(", ").append(systemPeriodEnd).append(")").endOfStatement();
-
+  private String getHistoryTable(String baseTable) {
     String historyTable = baseTable + "_history"; // history must contain schema, otherwise you'll get
     // Setting SYSTEM_VERSIONING to ON failed because history table 'xxx_history' is not specified in two-part name format.
     if (historyTable.indexOf('.') == -1) {
       historyTable = "dbo." +historyTable; // so add the default schema, if none was specified.
     }
-    apply.append("alter table ").append(baseTable).append(" set (system_versioning = on (history_table=").append(historyTable).append("))").endOfStatement();
+    return historyTable;
+  }
+
+  private void enableSystemVersioning(DdlWrite writer, String baseTable) throws IOException {
+    DdlBuffer apply = writer.applyHistoryView();
+    apply.append("alter table ").append(baseTable).newLine()
+      .append("    add ").append(systemPeriodStart).append(" datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(),").newLine()
+      .append("        ").append(systemPeriodEnd).append("   datetime2 GENERATED ALWAYS AS ROW END   NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',").newLine()
+      .append("period for system_time (").append(systemPeriodStart).append(", ").append(systemPeriodEnd).append(")").endOfStatement();
+
+    apply.append("alter table ").append(baseTable).append(" set (system_versioning = on (history_table=")
+      .append(getHistoryTable(baseTable)).append("))").endOfStatement();
 
     DdlBuffer drop = writer.dropAll();
     drop.append("IF OBJECT_ID('").append(baseTable).append("', 'U') IS NOT NULL alter table ").append(baseTable).append(" set (system_versioning = off)").endOfStatement();
@@ -53,7 +58,7 @@ public class SqlServerHistoryDdl implements PlatformHistoryDdl {
   @Override
   public void dropHistoryTable(DdlWrite writer, DropHistoryTable dropHistoryTable) throws IOException {
     String baseTable = dropHistoryTable.getBaseTable();
-    DdlBuffer apply = writer.applyHistory();
+    DdlBuffer apply = writer.applyHistoryView();
     apply.append("-- dropping history support for ").append(baseTable).endOfStatement();
     // drop default constraints
 
@@ -76,7 +81,15 @@ public class SqlServerHistoryDdl implements PlatformHistoryDdl {
   }
 
   @Override
-  public void updateTriggers(DdlWrite write, HistoryTableUpdate baseTable) throws IOException {
+  public void updateTriggers(DdlWrite writer, HistoryTableUpdate baseTable) throws IOException {
     // SQL Server 2016 does not need triggers
+    DdlBuffer apply = writer.applyHistoryView();
+    String baseTableName = baseTable.getBaseTable();
+    apply.append("-- alter table ").append(baseTableName).append(" set (system_versioning = off (history_table=")
+    .append(getHistoryTable(baseTableName)).append("))").endOfStatement();
+    apply.append("-- history migration goes here").newLine();
+    apply.append("-- alter table ").append(baseTableName).append(" set (system_versioning = on (history_table=")
+    .append(getHistoryTable(baseTableName)).append("))").endOfStatement();
+
   }
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java b/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
index a90a56fb7..14aba6833 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
@@ -113,7 +113,8 @@ public class CurrentModel {
     }
     ddl.append(write.apply().getBuffer());
     ddl.append(write.applyForeignKeys().getBuffer());
-    ddl.append(write.applyHistory().getBuffer());
+    ddl.append(write.applyHistoryView().getBuffer());
+    ddl.append(write.applyHistoryTrigger().getBuffer());
 
     return ddl.toString();
   }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java b/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java
index 1aa3722e5..895613471 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java
@@ -527,5 +527,8 @@ public class MColumn {
     if (hasValue(alterColumn.getForeignKeyOnUpdate())) {
       fkeyOnUpdate = fkeyMode(alterColumn.getForeignKeyOnUpdate());
     }
+    if (hasValue(alterColumn.isHistoryExclude())) {
+      historyExclude = alterColumn.isHistoryExclude();
+    }
   }
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
index cf5c64aff..c53e3aad7 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
@@ -621,7 +621,7 @@ public class MTable {
     DropColumn dropColumn = new DropColumn();
     dropColumn.setTableName(name);
     dropColumn.setColumnName(existingColumn.getName());
-    if (withHistory && !existingColumn.isHistoryExclude()) {
+    if (withHistory) {
       // These dropColumns should occur on the history
       // table as well as the base table
       dropColumn.setWithHistory(Boolean.TRUE);
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java b/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java
index 4529e0975..8b2bd71ab 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java
@@ -97,7 +97,8 @@ public class PlatformDdlWriter {
     writer.append("-- apply changes\n");
     writer.append(write.apply().getBuffer());
     writer.append(write.applyForeignKeys().getBuffer());
-    writer.append(write.applyHistory().getBuffer());
+    writer.append(write.applyHistoryView().getBuffer());
+    writer.append(write.applyHistoryTrigger().getBuffer());
   }
 
   private void prependDropDependencies(Writer writer, DdlBuffer buffer) throws IOException {
diff --git a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
index 569f63311..bf2d10bdd 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
@@ -63,6 +63,10 @@ public class DbMigrationTest extends BaseTestCase {
         "migtest_e_basic",
         "migtest_e_history",
         "migtest_e_history2",
+        "migtest_e_history3",
+        "migtest_e_history4",
+        "migtest_e_history5",
+        "migtest_e_history6",
         "migtest_e_ref",
         "migtest_e_softdelete",
         "migtest_e_user",
@@ -98,6 +102,9 @@ public class DbMigrationTest extends BaseTestCase {
       assertThat(server().execute(update)).isEqualTo(2);
     }
 
+
+    createHistoryEntities();
+
     // Run migration
     runScript(false, "1.1.sql");
     SqlQuery select = server().createSqlQuery("select * from migtest_e_basic order by id");
@@ -154,6 +161,41 @@ public class DbMigrationTest extends BaseTestCase {
     assertThat(row.keySet()).contains("old_boolean", "old_boolean2");
   }
 
+  /**
+   *
+   */
+  private void createHistoryEntities() {
+    SqlUpdate update = server().createSqlUpdate("insert into migtest_e_history (id, test_string) values (1, '42')");
+    assertThat(server().execute(update)).isEqualTo(1);
+    update = server().createSqlUpdate("update migtest_e_history set test_string = '45' where id = 1");
+    assertThat(server().execute(update)).isEqualTo(1);
+
+    update = server().createSqlUpdate("insert into migtest_e_history2 (id, test_string, obsolete_string1, obsolete_string2) values (1, 'foo', 'bar', null)");
+    assertThat(server().execute(update)).isEqualTo(1);
+    update = server().createSqlUpdate("update migtest_e_history2 set test_string = 'baz' where id = 1");
+    assertThat(server().execute(update)).isEqualTo(1);
+
+    update = server().createSqlUpdate("insert into migtest_e_history3 (id, test_string) values (1, '42')");
+    assertThat(server().execute(update)).isEqualTo(1);
+    update = server().createSqlUpdate("update migtest_e_history3 set test_string = '45' where id = 1");
+    assertThat(server().execute(update)).isEqualTo(1);
+
+    update = server().createSqlUpdate("insert into migtest_e_history4 (id, test_number) values (1, 42)");
+    assertThat(server().execute(update)).isEqualTo(1);
+    update = server().createSqlUpdate("update migtest_e_history4 set test_number = 45 where id = 1");
+    assertThat(server().execute(update)).isEqualTo(1);
+
+    update = server().createSqlUpdate("insert into migtest_e_history5 (id, test_number) values (1, 42)");
+    assertThat(server().execute(update)).isEqualTo(1);
+    update = server().createSqlUpdate("update migtest_e_history5 set test_number = 45 where id = 1");
+    assertThat(server().execute(update)).isEqualTo(1);
+
+    update = server().createSqlUpdate("insert into migtest_e_history6 (id, test_number2) values (1, 7)");
+    assertThat(server().execute(update)).isEqualTo(1);
+    update = server().createSqlUpdate("update migtest_e_history6 set test_number2 = 45 where id = 1");
+    assertThat(server().execute(update)).isEqualTo(1);
+  }
+
   private void cleanup(String ... tables) {
     StringBuilder sb = new StringBuilder();
     for (String table : tables) {
diff --git a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java
index 961207797..f23dafb49 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java
@@ -56,7 +56,7 @@ public class BaseTableDdlTest {
     column.setName("col_name");
     column.setType("varchar(20)");
 
-    ddlGen.alterTableAddColumn(write.apply(), "mytable", column, false);
+    ddlGen.alterTableAddColumn(write.apply(), "mytable", column, false, false);
 
     String ddl = write.apply().getBuffer();
     assertThat(ddl).contains("alter table mytable add column col_name varchar2(20)");
diff --git a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java
index 2eb35187d..ce7e11d59 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java
@@ -34,8 +34,15 @@ public class H2HistoryDdlTest {
     h2Ddl.configure(ebeanServer.getServerConfig());
     h2Ddl.regenerateHistoryTriggers(write, update);
 
-    assertThat(write.applyHistory().isEmpty()).isFalse();
-    assertThat(write.applyHistory().getBuffer()).contains("add one");
+    assertThat(write.applyHistoryView().isEmpty()).isFalse();
+    assertThat(write.applyHistoryTrigger().isEmpty()).isFalse();
+    assertThat(write.applyHistoryView().getBuffer())
+      .contains("create view")
+      .doesNotContain("create trigger");
+    assertThat(write.applyHistoryTrigger().getBuffer())
+      .contains("add one")
+      .contains("create trigger")
+      .doesNotContain("create view");
     assertThat(write.dropAll().isEmpty()).isTrue();
 
   }
diff --git a/src/test/java/misc/migration/v1_0/EHistory2.java b/src/test/java/misc/migration/v1_0/EHistory2.java
index 1cdf859c3..d8c76df75 100644
--- a/src/test/java/misc/migration/v1_0/EHistory2.java
+++ b/src/test/java/misc/migration/v1_0/EHistory2.java
@@ -6,15 +6,21 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 
 import io.ebean.annotation.History;
+import io.ebean.annotation.HistoryExclude;
 
 @Entity
 @Table(name = "migtest_e_history2")
 @History
 public class EHistory2 {
-  
+
   @Id
   Integer id;
-  
-  
+
+
   String testString;
+
+  @HistoryExclude
+  String obsoleteString1;
+
+  String obsoleteString2;
 }
diff --git a/src/test/java/misc/migration/v1_0/EHistory3.java b/src/test/java/misc/migration/v1_0/EHistory3.java
new file mode 100644
index 000000000..b5e41db5d
--- /dev/null
+++ b/src/test/java/misc/migration/v1_0/EHistory3.java
@@ -0,0 +1,21 @@
+package misc.migration.v1_0;
+
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.ebean.annotation.History;
+
+
+@Entity
+@Table(name = "migtest_e_history3")
+@History
+public class EHistory3 {
+
+  @Id
+  Integer id;
+
+  String testString;
+
+}
diff --git a/src/test/java/misc/migration/v1_0/EHistory4.java b/src/test/java/misc/migration/v1_0/EHistory4.java
new file mode 100644
index 000000000..aba167995
--- /dev/null
+++ b/src/test/java/misc/migration/v1_0/EHistory4.java
@@ -0,0 +1,21 @@
+package misc.migration.v1_0;
+
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.ebean.annotation.History;
+
+
+@Entity
+@Table(name = "migtest_e_history4")
+@History
+public class EHistory4 {
+
+  @Id
+  Integer id;
+
+  Integer testNumber;
+
+}
diff --git a/src/test/java/misc/migration/v1_0/EHistory5.java b/src/test/java/misc/migration/v1_0/EHistory5.java
new file mode 100644
index 000000000..133a00c3d
--- /dev/null
+++ b/src/test/java/misc/migration/v1_0/EHistory5.java
@@ -0,0 +1,21 @@
+package misc.migration.v1_0;
+
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.ebean.annotation.History;
+
+
+@Entity
+@Table(name = "migtest_e_history5")
+@History
+public class EHistory5 {
+
+  @Id
+  Integer id;
+
+  Integer testNumber;
+
+}
diff --git a/src/test/java/misc/migration/v1_0/EHistory6.java b/src/test/java/misc/migration/v1_0/EHistory6.java
new file mode 100644
index 000000000..c95eb7796
--- /dev/null
+++ b/src/test/java/misc/migration/v1_0/EHistory6.java
@@ -0,0 +1,24 @@
+package misc.migration.v1_0;
+
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.ebean.annotation.History;
+import io.ebean.annotation.NotNull;
+
+
+@Entity
+@Table(name = "migtest_e_history6")
+@History
+public class EHistory6 {
+
+  @Id
+  Integer id;
+
+  Integer testNumber1;
+
+  @NotNull
+  Integer testNumber2;
+}
diff --git a/src/test/java/misc/migration/v1_1/EHistory2.java b/src/test/java/misc/migration/v1_1/EHistory2.java
index 1e1fe4ebe..54c2f3d68 100644
--- a/src/test/java/misc/migration/v1_1/EHistory2.java
+++ b/src/test/java/misc/migration/v1_1/EHistory2.java
@@ -7,6 +7,7 @@ import javax.persistence.Table;
 
 import io.ebean.annotation.DbDefault;
 import io.ebean.annotation.History;
+import io.ebean.annotation.HistoryExclude;
 import io.ebean.annotation.NotNull;
 
 @Entity
@@ -20,7 +21,8 @@ public class EHistory2 {
   @NotNull
   @DbDefault("unknown")
   String testString;
-  
+
+  @HistoryExclude
   String testString2;
   
   @NotNull
diff --git a/src/test/java/misc/migration/v1_1/EHistory3.java b/src/test/java/misc/migration/v1_1/EHistory3.java
new file mode 100644
index 000000000..a3756572a
--- /dev/null
+++ b/src/test/java/misc/migration/v1_1/EHistory3.java
@@ -0,0 +1,23 @@
+package misc.migration.v1_1;
+
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.ebean.annotation.History;
+import io.ebean.annotation.HistoryExclude;
+
+
+@Entity
+@Table(name = "migtest_e_history3")
+@History
+public class EHistory3 {
+
+  @Id
+  Integer id;
+
+  @HistoryExclude
+  String testString;
+
+}
diff --git a/src/test/java/misc/migration/v1_1/EHistory4.java b/src/test/java/misc/migration/v1_1/EHistory4.java
new file mode 100644
index 000000000..ba5628390
--- /dev/null
+++ b/src/test/java/misc/migration/v1_1/EHistory4.java
@@ -0,0 +1,21 @@
+package misc.migration.v1_1;
+
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.ebean.annotation.History;
+
+
+@Entity
+@Table(name = "migtest_e_history4")
+@History
+public class EHistory4 {
+
+  @Id
+  Integer id;
+
+  Long testNumber;
+
+}
diff --git a/src/test/java/misc/migration/v1_1/EHistory5.java b/src/test/java/misc/migration/v1_1/EHistory5.java
new file mode 100644
index 000000000..9bb9aba0b
--- /dev/null
+++ b/src/test/java/misc/migration/v1_1/EHistory5.java
@@ -0,0 +1,27 @@
+package misc.migration.v1_1;
+
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.ebean.annotation.DbDefault;
+import io.ebean.annotation.History;
+import io.ebean.annotation.NotNull;
+
+
+@Entity
+@Table(name = "migtest_e_history5")
+@History
+public class EHistory5 {
+
+  @Id
+  Integer id;
+
+  Integer testNumber;
+
+  @NotNull
+  @DbDefault("false")
+  Boolean testBoolean;
+
+}
diff --git a/src/test/java/misc/migration/v1_1/EHistory6.java b/src/test/java/misc/migration/v1_1/EHistory6.java
new file mode 100644
index 000000000..c05f51a15
--- /dev/null
+++ b/src/test/java/misc/migration/v1_1/EHistory6.java
@@ -0,0 +1,27 @@
+package misc.migration.v1_1;
+
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.ebean.annotation.DbDefault;
+import io.ebean.annotation.History;
+import io.ebean.annotation.NotNull;
+
+
+@Entity
+@Table(name = "migtest_e_history6")
+@History
+public class EHistory6 {
+
+  @Id
+  Integer id;
+
+  @NotNull
+  @DbDefault("42")
+  Integer testNumber1;
+
+
+  Integer testNumber2;
+}
diff --git a/src/test/java/misc/migration/v1_2/EHistory2.java b/src/test/java/misc/migration/v1_2/EHistory2.java
index d5b64ae70..18a2c17fe 100644
--- a/src/test/java/misc/migration/v1_2/EHistory2.java
+++ b/src/test/java/misc/migration/v1_2/EHistory2.java
@@ -6,15 +6,21 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 
 import io.ebean.annotation.History;
+import io.ebean.annotation.HistoryExclude;
 
 @Entity
 @Table(name = "migtest_e_history2")
 @History
 public class EHistory2 {
-  
+
   @Id
   Integer id;
-  
-  
+
+
   String testString;
+
+  @HistoryExclude
+  String obsoleteString1;
+
+  String obsoleteString2;
 }
diff --git a/src/test/java/misc/migration/v1_2/EHistory3.java b/src/test/java/misc/migration/v1_2/EHistory3.java
new file mode 100644
index 000000000..f945e6e7b
--- /dev/null
+++ b/src/test/java/misc/migration/v1_2/EHistory3.java
@@ -0,0 +1,21 @@
+package misc.migration.v1_2;
+
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.ebean.annotation.History;
+
+
+@Entity
+@Table(name = "migtest_e_history3")
+@History
+public class EHistory3 {
+
+  @Id
+  Integer id;
+
+  String testString;
+
+}
diff --git a/src/test/java/misc/migration/v1_2/EHistory4.java b/src/test/java/misc/migration/v1_2/EHistory4.java
new file mode 100644
index 000000000..083928e5c
--- /dev/null
+++ b/src/test/java/misc/migration/v1_2/EHistory4.java
@@ -0,0 +1,21 @@
+package misc.migration.v1_2;
+
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.ebean.annotation.History;
+
+
+@Entity
+@Table(name = "migtest_e_history4")
+@History
+public class EHistory4 {
+
+  @Id
+  Integer id;
+
+  Integer testNumber;
+
+}
diff --git a/src/test/java/misc/migration/v1_2/EHistory5.java b/src/test/java/misc/migration/v1_2/EHistory5.java
new file mode 100644
index 000000000..9de9206a0
--- /dev/null
+++ b/src/test/java/misc/migration/v1_2/EHistory5.java
@@ -0,0 +1,21 @@
+package misc.migration.v1_2;
+
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.ebean.annotation.History;
+
+
+@Entity
+@Table(name = "migtest_e_history5")
+@History
+public class EHistory5 {
+
+  @Id
+  Integer id;
+
+  Integer testNumber;
+
+}
diff --git a/src/test/java/misc/migration/v1_2/EHistory6.java b/src/test/java/misc/migration/v1_2/EHistory6.java
new file mode 100644
index 000000000..1d886ccb2
--- /dev/null
+++ b/src/test/java/misc/migration/v1_2/EHistory6.java
@@ -0,0 +1,26 @@
+package misc.migration.v1_2;
+
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.ebean.annotation.DbDefault;
+import io.ebean.annotation.History;
+import io.ebean.annotation.NotNull;
+
+
+@Entity
+@Table(name = "migtest_e_history6")
+@History
+public class EHistory6 {
+
+  @Id
+  Integer id;
+
+  Integer testNumber1;
+
+  @NotNull
+  @DbDefault("7")
+  Integer testNumber2;
+}
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
index 2a123be20..386774eb5 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
@@ -85,9 +85,36 @@ create table migtest_e_history (
 create table migtest_e_history2 (
   id                            integer generated by default as identity not null,
   test_string                   varchar(255),
+  obsolete_string1              varchar(255),
+  obsolete_string2              varchar(255),
   constraint pk_migtest_e_history2 primary key (id)
 );
 
+create table migtest_e_history3 (
+  id                            integer generated by default as identity not null,
+  test_string                   varchar(255),
+  constraint pk_migtest_e_history3 primary key (id)
+);
+
+create table migtest_e_history4 (
+  id                            integer generated by default as identity not null,
+  test_number                   integer,
+  constraint pk_migtest_e_history4 primary key (id)
+);
+
+create table migtest_e_history5 (
+  id                            integer generated by default as identity not null,
+  test_number                   integer,
+  constraint pk_migtest_e_history5 primary key (id)
+);
+
+create table migtest_e_history6 (
+  id                            integer generated by default as identity not null,
+  test_number1                  integer,
+  test_number2                  integer not null,
+  constraint pk_migtest_e_history6 primary key (id)
+);
+
 create table migtest_e_ref (
   id                            integer generated by default as identity not null,
   name                          varchar(127) not null,
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.1.sql b/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
index 776e7945f..cf2b1e276 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
@@ -65,14 +65,22 @@ comment on column migtest_e_history.test_string is 'Column altered to long now';
 alter table migtest_e_history alter column test_string bigint;
 comment on table migtest_e_history is 'We have history now';
 
+-- NOTE: table has @History - special migration may be necessary
 update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 alter table migtest_e_history2 alter column test_string set default 'unknown';
 alter table migtest_e_history2 alter column test_string set not null;
 alter table migtest_e_history2 add column test_string2 varchar(255);
 alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null;
-alter table migtest_e_history2_history add column test_string2 varchar(255);
-alter table migtest_e_history2_history add column test_string3 varchar(255);
 
+alter table migtest_e_history4 alter column test_number bigint;
+alter table migtest_e_history5 add column test_boolean boolean default false not null;
+
+
+-- NOTE: table has @History - special migration may be necessary
+update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
+alter table migtest_e_history6 alter column test_number1 set default 42;
+alter table migtest_e_history6 alter column test_number1 set not null;
+alter table migtest_e_history6 alter column test_number2 set null;
 alter table migtest_e_softdelete add column deleted boolean default false not null;
 
 alter table migtest_oto_child add column master_id bigint;
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/db2/1.2__dropsFor_1.1.sql
index 602c2d381..f7ff8b135 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.2__dropsFor_1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.2__dropsFor_1.1.sql
@@ -6,5 +6,9 @@ alter table migtest_e_basic drop column old_boolean2;
 
 alter table migtest_e_basic drop column eref_id;
 
+alter table migtest_e_history2 drop column obsolete_string1;
+
+alter table migtest_e_history2 drop column obsolete_string2;
+
 drop table migtest_e_ref;
 drop sequence migtest_e_ref_seq;
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.3.sql b/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
index a9e2d7622..4b08010eb 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
@@ -40,6 +40,17 @@ comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
 alter table migtest_e_history2 alter column test_string drop default;
 alter table migtest_e_history2 alter column test_string set null;
+alter table migtest_e_history2 add column obsolete_string1 varchar(255);
+alter table migtest_e_history2 add column obsolete_string2 varchar(255);
+
+alter table migtest_e_history4 alter column test_number integer;
+alter table migtest_e_history6 alter column test_number1 drop default;
+alter table migtest_e_history6 alter column test_number1 set null;
+
+-- NOTE: table has @History - special migration may be necessary
+update migtest_e_history6 set test_number2 = 7 where test_number2 is null;
+alter table migtest_e_history6 alter column test_number2 set default 7;
+alter table migtest_e_history6 alter column test_number2 set not null;
 create index ix_mgtst__b_eu8csq on migtest_e_basic (indextest1);
 create index ix_mgtst__b_eu8csu on migtest_e_basic (indextest5);
 drop index ix_mgtst__b_eu8css;
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql
index 0ae87600a..cf681d5d1 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql
@@ -17,10 +17,10 @@ alter table migtest_e_basic drop column progress;
 alter table migtest_e_basic drop column new_integer;
 
 alter table migtest_e_history2 drop column test_string2;
-alter table migtest_e_history2_history drop column test_string2;
 
 alter table migtest_e_history2 drop column test_string3;
-alter table migtest_e_history2_history drop column test_string3;
+
+alter table migtest_e_history5 drop column test_boolean;
 
 alter table migtest_e_softdelete drop column deleted;
 
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
index 9d4204f43..38edf4d47 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
@@ -85,9 +85,36 @@ create table migtest_e_history (
 create table migtest_e_history2 (
   id                            integer auto_increment not null,
   test_string                   varchar(255),
+  obsolete_string1              varchar(255),
+  obsolete_string2              varchar(255),
   constraint pk_migtest_e_history2 primary key (id)
 );
 
+create table migtest_e_history3 (
+  id                            integer auto_increment not null,
+  test_string                   varchar(255),
+  constraint pk_migtest_e_history3 primary key (id)
+);
+
+create table migtest_e_history4 (
+  id                            integer auto_increment not null,
+  test_number                   integer,
+  constraint pk_migtest_e_history4 primary key (id)
+);
+
+create table migtest_e_history5 (
+  id                            integer auto_increment not null,
+  test_number                   integer,
+  constraint pk_migtest_e_history5 primary key (id)
+);
+
+create table migtest_e_history6 (
+  id                            integer auto_increment not null,
+  test_number1                  integer,
+  test_number2                  integer not null,
+  constraint pk_migtest_e_history6 primary key (id)
+);
+
 create table migtest_e_ref (
   id                            integer auto_increment not null,
   name                          varchar(127) not null,
@@ -141,9 +168,56 @@ alter table migtest_e_history2 add column sys_period_end datetime(6);
 create table migtest_e_history2_history(
   id                            integer,
   test_string                   varchar(255),
+  obsolete_string1              varchar(255),
+  obsolete_string2              varchar(255),
   sys_period_start              datetime(6),
   sys_period_end                datetime(6)
 );
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 
+alter table migtest_e_history3 add column sys_period_start datetime(6) default now(6);
+alter table migtest_e_history3 add column sys_period_end datetime(6);
+create table migtest_e_history3_history(
+  id                            integer,
+  test_string                   varchar(255),
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view migtest_e_history3_with_history as select * from migtest_e_history3 union all select * from migtest_e_history3_history;
+
+alter table migtest_e_history4 add column sys_period_start datetime(6) default now(6);
+alter table migtest_e_history4 add column sys_period_end datetime(6);
+create table migtest_e_history4_history(
+  id                            integer,
+  test_number                   integer,
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view migtest_e_history4_with_history as select * from migtest_e_history4 union all select * from migtest_e_history4_history;
+
+alter table migtest_e_history5 add column sys_period_start datetime(6) default now(6);
+alter table migtest_e_history5 add column sys_period_end datetime(6);
+create table migtest_e_history5_history(
+  id                            integer,
+  test_number                   integer,
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history;
+
+alter table migtest_e_history6 add column sys_period_start datetime(6) default now(6);
+alter table migtest_e_history6 add column sys_period_end datetime(6);
+create table migtest_e_history6_history(
+  id                            integer,
+  test_number1                  integer,
+  test_number2                  integer,
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view migtest_e_history6_with_history as select * from migtest_e_history6 union all select * from migtest_e_history6_history;
+
 create trigger migtest_e_history2_history_upd before update,delete on migtest_e_history2 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
+create trigger migtest_e_history3_history_upd before update,delete on migtest_e_history3 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
+create trigger migtest_e_history4_history_upd before update,delete on migtest_e_history4 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
+create trigger migtest_e_history5_history_upd before update,delete on migtest_e_history5 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
+create trigger migtest_e_history6_history_upd before update,delete on migtest_e_history6 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.1.sql b/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
index 9f633b46c..d6f916d89 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
@@ -1,4 +1,10 @@
 -- Migrationscripts for ebean unittest
+-- drop dependencies
+drop view if exists migtest_e_history2_with_history;
+drop view if exists migtest_e_history3_with_history;
+drop view if exists migtest_e_history4_with_history;
+drop view if exists migtest_e_history5_with_history;
+
 -- apply changes
 create table migtest_e_user (
   id                            integer auto_increment not null,
@@ -65,14 +71,26 @@ comment on column migtest_e_history.test_string is 'Column altered to long now';
 alter table migtest_e_history alter column test_string bigint;
 comment on table migtest_e_history is 'We have history now';
 
+-- NOTE: table has @History - special migration may be necessary
 update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 alter table migtest_e_history2 alter column test_string set default 'unknown';
 alter table migtest_e_history2 alter column test_string set not null;
 alter table migtest_e_history2 add column test_string2 varchar(255);
 alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null;
 alter table migtest_e_history2_history add column test_string2 varchar(255);
-alter table migtest_e_history2_history add column test_string3 varchar(255);
+alter table migtest_e_history2_history add column test_string3 varchar(255) default 'unknown';
 
+alter table migtest_e_history4 alter column test_number bigint;
+alter table migtest_e_history4_history alter column test_number bigint;
+alter table migtest_e_history5 add column test_boolean boolean default false not null;
+alter table migtest_e_history5_history add column test_boolean boolean default false;
+
+
+-- NOTE: table has @History - special migration may be necessary
+update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
+alter table migtest_e_history6 alter column test_number1 set default 42;
+alter table migtest_e_history6 alter column test_number1 set not null;
+alter table migtest_e_history6 alter column test_number2 set null;
 alter table migtest_e_softdelete add column deleted boolean default false not null;
 
 alter table migtest_oto_child add column master_id bigint;
@@ -108,7 +126,24 @@ create table migtest_e_history_history(
 );
 create view migtest_e_history_with_history as select * from migtest_e_history union all select * from migtest_e_history_history;
 
+create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
+
+create view migtest_e_history3_with_history as select * from migtest_e_history3 union all select * from migtest_e_history3_history;
+
+create view migtest_e_history4_with_history as select * from migtest_e_history4 union all select * from migtest_e_history4_history;
+
+create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history;
+
 create trigger migtest_e_history_history_upd before update,delete on migtest_e_history for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
 -- changes: [add test_string2, add test_string3]
 drop trigger migtest_e_history2_history_upd;
 create trigger migtest_e_history2_history_upd before update,delete on migtest_e_history2 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
+-- changes: [exclude test_string]
+drop trigger migtest_e_history3_history_upd;
+create trigger migtest_e_history3_history_upd before update,delete on migtest_e_history3 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
+-- changes: [alter test_number]
+drop trigger migtest_e_history4_history_upd;
+create trigger migtest_e_history4_history_upd before update,delete on migtest_e_history4 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
+-- changes: [add test_boolean]
+drop trigger migtest_e_history5_history_upd;
+create trigger migtest_e_history5_history_upd before update,delete on migtest_e_history5 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/h2/1.2__dropsFor_1.1.sql
index 057cfb3f3..dea5dde03 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.2__dropsFor_1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.2__dropsFor_1.1.sql
@@ -1,4 +1,7 @@
 -- Migrationscripts for ebean unittest
+-- drop dependencies
+drop view if exists migtest_e_history2_with_history;
+
 -- apply changes
 alter table migtest_e_basic drop column old_boolean;
 
@@ -6,5 +9,16 @@ alter table migtest_e_basic drop column old_boolean2;
 
 alter table migtest_e_basic drop column eref_id;
 
+alter table migtest_e_history2 drop column obsolete_string1;
+alter table migtest_e_history2_history drop column obsolete_string1;
+
+alter table migtest_e_history2 drop column obsolete_string2;
+alter table migtest_e_history2_history drop column obsolete_string2;
+
 drop table if exists migtest_e_ref;
 drop sequence if exists migtest_e_ref_seq;
+create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
+
+-- changes: [drop obsolete_string1, drop obsolete_string2]
+drop trigger migtest_e_history2_history_upd;
+create trigger migtest_e_history2_history_upd before update,delete on migtest_e_history2 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.3.sql b/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
index 4fc5732b4..e8a90cb8f 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
@@ -1,4 +1,9 @@
 -- Migrationscripts for ebean unittest
+-- drop dependencies
+drop view if exists migtest_e_history2_with_history;
+drop view if exists migtest_e_history3_with_history;
+drop view if exists migtest_e_history4_with_history;
+
 -- apply changes
 create table migtest_e_ref (
   id                            integer auto_increment not null,
@@ -40,6 +45,20 @@ comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
 alter table migtest_e_history2 alter column test_string drop default;
 alter table migtest_e_history2 alter column test_string set null;
+alter table migtest_e_history2 add column obsolete_string1 varchar(255);
+alter table migtest_e_history2 add column obsolete_string2 varchar(255);
+alter table migtest_e_history2_history add column obsolete_string1 varchar(255);
+alter table migtest_e_history2_history add column obsolete_string2 varchar(255);
+
+alter table migtest_e_history4 alter column test_number integer;
+alter table migtest_e_history4_history alter column test_number integer;
+alter table migtest_e_history6 alter column test_number1 drop default;
+alter table migtest_e_history6 alter column test_number1 set null;
+
+-- NOTE: table has @History - special migration may be necessary
+update migtest_e_history6 set test_number2 = 7 where test_number2 is null;
+alter table migtest_e_history6 alter column test_number2 set default 7;
+alter table migtest_e_history6 alter column test_number2 set not null;
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 drop index if exists ix_migtest_e_basic_indextest3;
@@ -47,3 +66,18 @@ drop index if exists ix_migtest_e_basic_indextest6;
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
+create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
+
+create view migtest_e_history3_with_history as select * from migtest_e_history3 union all select * from migtest_e_history3_history;
+
+create view migtest_e_history4_with_history as select * from migtest_e_history4 union all select * from migtest_e_history4_history;
+
+-- changes: [add obsolete_string1, add obsolete_string2]
+drop trigger migtest_e_history2_history_upd;
+create trigger migtest_e_history2_history_upd before update,delete on migtest_e_history2 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
+-- changes: [include test_string]
+drop trigger migtest_e_history3_history_upd;
+create trigger migtest_e_history3_history_upd before update,delete on migtest_e_history3 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
+-- changes: [alter test_number]
+drop trigger migtest_e_history4_history_upd;
+create trigger migtest_e_history4_history_upd before update,delete on migtest_e_history4 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql
index a644d1461..fd0fb772f 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql
@@ -6,6 +6,8 @@ alter table migtest_e_history drop column sys_period_start;
 alter table migtest_e_history drop column sys_period_end;
 drop table migtest_e_history_history;
 
+drop view if exists migtest_e_history2_with_history;
+drop view if exists migtest_e_history5_with_history;
 
 -- apply changes
 alter table migtest_ckey_detail drop column one_key;
@@ -30,6 +32,9 @@ alter table migtest_e_history2_history drop column test_string2;
 alter table migtest_e_history2 drop column test_string3;
 alter table migtest_e_history2_history drop column test_string3;
 
+alter table migtest_e_history5 drop column test_boolean;
+alter table migtest_e_history5_history drop column test_boolean;
+
 alter table migtest_e_softdelete drop column deleted;
 
 alter table migtest_oto_child drop column master_id;
@@ -38,6 +43,13 @@ drop table if exists migtest_e_user;
 drop sequence if exists migtest_e_user_seq;
 drop table if exists migtest_mtm_c_migtest_mtm_m;
 drop table if exists migtest_mtm_m_migtest_mtm_c;
+create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
+
+create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history;
+
 -- changes: [drop test_string2, drop test_string3]
 drop trigger migtest_e_history2_history_upd;
 create trigger migtest_e_history2_history_upd before update,delete on migtest_e_history2 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
+-- changes: [drop test_boolean]
+drop trigger migtest_e_history5_history_upd;
+create trigger migtest_e_history5_history_upd before update,delete on migtest_e_history5 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
index 6e8b39c42..a8af75d02 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
@@ -85,9 +85,36 @@ create table migtest_e_history (
 create table migtest_e_history2 (
   id                            integer generated by default as identity (start with 1)  not null,
   test_string                   varchar(255),
+  obsolete_string1              varchar(255),
+  obsolete_string2              varchar(255),
   constraint pk_migtest_e_history2 primary key (id)
 );
 
+create table migtest_e_history3 (
+  id                            integer generated by default as identity (start with 1)  not null,
+  test_string                   varchar(255),
+  constraint pk_migtest_e_history3 primary key (id)
+);
+
+create table migtest_e_history4 (
+  id                            integer generated by default as identity (start with 1)  not null,
+  test_number                   integer,
+  constraint pk_migtest_e_history4 primary key (id)
+);
+
+create table migtest_e_history5 (
+  id                            integer generated by default as identity (start with 1)  not null,
+  test_number                   integer,
+  constraint pk_migtest_e_history5 primary key (id)
+);
+
+create table migtest_e_history6 (
+  id                            integer generated by default as identity (start with 1)  not null,
+  test_number1                  integer,
+  test_number2                  integer not null,
+  constraint pk_migtest_e_history6 primary key (id)
+);
+
 create table migtest_e_ref (
   id                            integer generated by default as identity (start with 1)  not null,
   name                          varchar(127) not null,
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
index ec6506025..b1e21443c 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
@@ -65,14 +65,22 @@ comment on column migtest_e_history.test_string is 'Column altered to long now';
 alter table migtest_e_history alter column test_string bigint;
 comment on table migtest_e_history is 'We have history now';
 
+-- NOTE: table has @History - special migration may be necessary
 update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 alter table migtest_e_history2 alter column test_string set default 'unknown';
 alter table migtest_e_history2 alter column test_string set not null;
 alter table migtest_e_history2 add column test_string2 varchar(255);
 alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null;
-alter table migtest_e_history2_history add column test_string2 varchar(255);
-alter table migtest_e_history2_history add column test_string3 varchar(255);
 
+alter table migtest_e_history4 alter column test_number bigint;
+alter table migtest_e_history5 add column test_boolean boolean default false not null;
+
+
+-- NOTE: table has @History - special migration may be necessary
+update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
+alter table migtest_e_history6 alter column test_number1 set default 42;
+alter table migtest_e_history6 alter column test_number1 set not null;
+alter table migtest_e_history6 alter column test_number2 set null;
 alter table migtest_e_softdelete add column deleted boolean default false not null;
 
 alter table migtest_oto_child add column master_id bigint;
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.2__dropsFor_1.1.sql
index 057cfb3f3..6fb11c3a4 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.2__dropsFor_1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.2__dropsFor_1.1.sql
@@ -6,5 +6,9 @@ alter table migtest_e_basic drop column old_boolean2;
 
 alter table migtest_e_basic drop column eref_id;
 
+alter table migtest_e_history2 drop column obsolete_string1;
+
+alter table migtest_e_history2 drop column obsolete_string2;
+
 drop table if exists migtest_e_ref;
 drop sequence if exists migtest_e_ref_seq;
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
index bff47b901..9ec91f4f2 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
@@ -40,6 +40,17 @@ comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
 alter table migtest_e_history2 alter column test_string drop default;
 alter table migtest_e_history2 alter column test_string set null;
+alter table migtest_e_history2 add column obsolete_string1 varchar(255);
+alter table migtest_e_history2 add column obsolete_string2 varchar(255);
+
+alter table migtest_e_history4 alter column test_number integer;
+alter table migtest_e_history6 alter column test_number1 drop default;
+alter table migtest_e_history6 alter column test_number1 set null;
+
+-- NOTE: table has @History - special migration may be necessary
+update migtest_e_history6 set test_number2 = 7 where test_number2 is null;
+alter table migtest_e_history6 alter column test_number2 set default 7;
+alter table migtest_e_history6 alter column test_number2 set not null;
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 drop index if exists ix_migtest_e_basic_indextest3;
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql
index 95542680e..413f33e82 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql
@@ -17,10 +17,10 @@ alter table migtest_e_basic drop column progress;
 alter table migtest_e_basic drop column new_integer;
 
 alter table migtest_e_history2 drop column test_string2;
-alter table migtest_e_history2_history drop column test_string2;
 
 alter table migtest_e_history2 drop column test_string3;
-alter table migtest_e_history2_history drop column test_string3;
+
+alter table migtest_e_history5 drop column test_boolean;
 
 alter table migtest_e_softdelete drop column deleted;
 
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
index 1e951234e..386d4410c 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
@@ -64,6 +64,25 @@
         <createTable name="migtest_e_history2" withHistory="true" pkName="pk_migtest_e_history2">
             <column name="id" type="integer" primaryKey="true"/>
             <column name="test_string" type="varchar"/>
+            <column name="obsolete_string1" type="varchar" historyExclude="true"/>
+            <column name="obsolete_string2" type="varchar"/>
+        </createTable>
+        <createTable name="migtest_e_history3" withHistory="true" pkName="pk_migtest_e_history3">
+            <column name="id" type="integer" primaryKey="true"/>
+            <column name="test_string" type="varchar"/>
+        </createTable>
+        <createTable name="migtest_e_history4" withHistory="true" pkName="pk_migtest_e_history4">
+            <column name="id" type="integer" primaryKey="true"/>
+            <column name="test_number" type="integer"/>
+        </createTable>
+        <createTable name="migtest_e_history5" withHistory="true" pkName="pk_migtest_e_history5">
+            <column name="id" type="integer" primaryKey="true"/>
+            <column name="test_number" type="integer"/>
+        </createTable>
+        <createTable name="migtest_e_history6" withHistory="true" pkName="pk_migtest_e_history6">
+            <column name="id" type="integer" primaryKey="true"/>
+            <column name="test_number1" type="integer"/>
+            <column name="test_number2" type="integer" notnull="true"/>
         </createTable>
         <createTable name="migtest_e_ref" pkName="pk_migtest_e_ref">
             <column name="id" type="integer" primaryKey="true"/>
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
index d1c893673..86eff4a3a 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
@@ -44,9 +44,16 @@
         <addTableComment name="migtest_e_history" comment="We have history now"/>
         <alterColumn columnName="test_string" tableName="migtest_e_history2" withHistory="true" currentType="varchar" defaultValue="'unknown'" notnull="true" currentNotnull="false"/>
         <addColumn tableName="migtest_e_history2" withHistory="true">
-            <column name="test_string2" type="varchar"/>
+            <column name="test_string2" type="varchar" historyExclude="true"/>
             <column name="test_string3" type="varchar" defaultValue="'unknown'" notnull="true"/>
         </addColumn>
+        <alterColumn columnName="test_string" tableName="migtest_e_history3" withHistory="true" historyExclude="true"/>
+        <alterColumn columnName="test_number" tableName="migtest_e_history4" withHistory="true" type="bigint" currentType="integer" currentNotnull="false"/>
+        <addColumn tableName="migtest_e_history5" withHistory="true">
+            <column name="test_boolean" type="boolean" defaultValue="false" notnull="true"/>
+        </addColumn>
+        <alterColumn columnName="test_number1" tableName="migtest_e_history6" withHistory="true" currentType="integer" defaultValue="42" notnull="true" currentNotnull="false"/>
+        <alterColumn columnName="test_number2" tableName="migtest_e_history6" withHistory="true" currentType="integer" notnull="false" currentNotnull="true"/>
         <addColumn tableName="migtest_e_softdelete">
             <column name="deleted" type="boolean" defaultValue="false" notnull="true"/>
         </addColumn>
@@ -77,6 +84,8 @@
         <dropColumn columnName="old_boolean" tableName="migtest_e_basic"/>
         <dropColumn columnName="old_boolean2" tableName="migtest_e_basic"/>
         <dropColumn columnName="eref_id" tableName="migtest_e_basic"/>
+        <dropColumn columnName="obsolete_string1" tableName="migtest_e_history2" withHistory="true"/>
+        <dropColumn columnName="obsolete_string2" tableName="migtest_e_history2" withHistory="true"/>
         <dropTable name="migtest_e_ref" sequenceCol="id"/>
     </changeSet>
 </migration>
\ No newline at end of file
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.2__dropsFor_1.1.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.2__dropsFor_1.1.model.xml
index aff7eb878..e60796068 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.2__dropsFor_1.1.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.2__dropsFor_1.1.model.xml
@@ -5,6 +5,8 @@
         <dropColumn columnName="old_boolean" tableName="migtest_e_basic"/>
         <dropColumn columnName="old_boolean2" tableName="migtest_e_basic"/>
         <dropColumn columnName="eref_id" tableName="migtest_e_basic"/>
+        <dropColumn columnName="obsolete_string1" tableName="migtest_e_history2" withHistory="true"/>
+        <dropColumn columnName="obsolete_string2" tableName="migtest_e_history2" withHistory="true"/>
         <dropTable name="migtest_e_ref" sequenceCol="id"/>
     </changeSet>
 </migration>
\ No newline at end of file
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
index f9b23929f..89fbcd07a 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
@@ -25,6 +25,14 @@
         <alterColumn columnName="test_string" tableName="migtest_e_history" withHistory="true" comment="DROP COMMENT"/>
         <addTableComment name="migtest_e_history" comment="DROP COMMENT"/>
         <alterColumn columnName="test_string" tableName="migtest_e_history2" withHistory="true" currentType="varchar" defaultValue="DROP DEFAULT" notnull="false" currentNotnull="true"/>
+        <addColumn tableName="migtest_e_history2" withHistory="true">
+            <column name="obsolete_string1" type="varchar" historyExclude="true"/>
+            <column name="obsolete_string2" type="varchar"/>
+        </addColumn>
+        <alterColumn columnName="test_string" tableName="migtest_e_history3" withHistory="true" historyExclude="false"/>
+        <alterColumn columnName="test_number" tableName="migtest_e_history4" withHistory="true" type="integer" currentType="bigint" currentNotnull="false"/>
+        <alterColumn columnName="test_number1" tableName="migtest_e_history6" withHistory="true" currentType="integer" defaultValue="DROP DEFAULT" notnull="false" currentNotnull="true"/>
+        <alterColumn columnName="test_number2" tableName="migtest_e_history6" withHistory="true" currentType="integer" defaultValue="7" notnull="true" currentNotnull="false"/>
         <createTable name="migtest_e_ref" pkName="pk_migtest_e_ref">
             <column name="id" type="integer" primaryKey="true"/>
             <column name="name" type="varchar(127)" notnull="true"/>
@@ -47,6 +55,7 @@
         <dropHistoryTable baseTable="migtest_e_history"/>
         <dropColumn columnName="test_string2" tableName="migtest_e_history2" withHistory="true"/>
         <dropColumn columnName="test_string3" tableName="migtest_e_history2" withHistory="true"/>
+        <dropColumn columnName="test_boolean" tableName="migtest_e_history5" withHistory="true"/>
         <dropColumn columnName="deleted" tableName="migtest_e_softdelete"/>
         <dropColumn columnName="master_id" tableName="migtest_oto_child"/>
         <dropTable name="migtest_e_user" sequenceCol="id"/>
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml
index 6d17f89f2..506444d0b 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml
@@ -13,6 +13,7 @@
         <dropHistoryTable baseTable="migtest_e_history"/>
         <dropColumn columnName="test_string2" tableName="migtest_e_history2" withHistory="true"/>
         <dropColumn columnName="test_string3" tableName="migtest_e_history2" withHistory="true"/>
+        <dropColumn columnName="test_boolean" tableName="migtest_e_history5" withHistory="true"/>
         <dropColumn columnName="deleted" tableName="migtest_e_softdelete"/>
         <dropColumn columnName="master_id" tableName="migtest_oto_child"/>
         <dropTable name="migtest_e_user" sequenceCol="id"/>
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
index 8e1c0557f..ae4936281 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
@@ -85,9 +85,36 @@ create table migtest_e_history (
 create table migtest_e_history2 (
   id                            integer auto_increment not null,
   test_string                   varchar(255),
+  obsolete_string1              varchar(255),
+  obsolete_string2              varchar(255),
   constraint pk_migtest_e_history2 primary key (id)
 );
 
+create table migtest_e_history3 (
+  id                            integer auto_increment not null,
+  test_string                   varchar(255),
+  constraint pk_migtest_e_history3 primary key (id)
+);
+
+create table migtest_e_history4 (
+  id                            integer auto_increment not null,
+  test_number                   integer,
+  constraint pk_migtest_e_history4 primary key (id)
+);
+
+create table migtest_e_history5 (
+  id                            integer auto_increment not null,
+  test_number                   integer,
+  constraint pk_migtest_e_history5 primary key (id)
+);
+
+create table migtest_e_history6 (
+  id                            integer auto_increment not null,
+  test_number1                  integer,
+  test_number2                  integer not null,
+  constraint pk_migtest_e_history6 primary key (id)
+);
+
 create table migtest_e_ref (
   id                            integer auto_increment not null,
   name                          varchar(127) not null,
@@ -141,17 +168,96 @@ alter table migtest_e_history2 add column sys_period_end datetime(6);
 create table migtest_e_history2_history(
   id                            integer,
   test_string                   varchar(255),
+  obsolete_string1              varchar(255),
+  obsolete_string2              varchar(255),
   sys_period_start              datetime(6),
   sys_period_end                datetime(6)
 );
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 
+alter table migtest_e_history3 add column sys_period_start datetime(6) default now(6);
+alter table migtest_e_history3 add column sys_period_end datetime(6);
+create table migtest_e_history3_history(
+  id                            integer,
+  test_string                   varchar(255),
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view migtest_e_history3_with_history as select * from migtest_e_history3 union all select * from migtest_e_history3_history;
+
+alter table migtest_e_history4 add column sys_period_start datetime(6) default now(6);
+alter table migtest_e_history4 add column sys_period_end datetime(6);
+create table migtest_e_history4_history(
+  id                            integer,
+  test_number                   integer,
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view migtest_e_history4_with_history as select * from migtest_e_history4 union all select * from migtest_e_history4_history;
+
+alter table migtest_e_history5 add column sys_period_start datetime(6) default now(6);
+alter table migtest_e_history5 add column sys_period_end datetime(6);
+create table migtest_e_history5_history(
+  id                            integer,
+  test_number                   integer,
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history;
+
+alter table migtest_e_history6 add column sys_period_start datetime(6) default now(6);
+alter table migtest_e_history6 add column sys_period_end datetime(6);
+create table migtest_e_history6_history(
+  id                            integer,
+  test_number1                  integer,
+  test_number2                  integer,
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view migtest_e_history6_with_history as select * from migtest_e_history6 union all select * from migtest_e_history6_history;
+
 delimiter $$
 create trigger migtest_e_history2_history_upd before update on migtest_e_history2 for each row begin
-    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string);
+    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, obsolete_string2) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.obsolete_string2);
     set NEW.sys_period_start = now(6);
 end$$
 delimiter $$
 create trigger migtest_e_history2_history_del before delete on migtest_e_history2 for each row begin
-    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string);
+    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, obsolete_string2) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.obsolete_string2);
+end$$
+delimiter $$
+create trigger migtest_e_history3_history_upd before update on migtest_e_history3 for each row begin
+    insert into migtest_e_history3_history (sys_period_start,sys_period_end,id, test_string) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger migtest_e_history3_history_del before delete on migtest_e_history3 for each row begin
+    insert into migtest_e_history3_history (sys_period_start,sys_period_end,id, test_string) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string);
+end$$
+delimiter $$
+create trigger migtest_e_history4_history_upd before update on migtest_e_history4 for each row begin
+    insert into migtest_e_history4_history (sys_period_start,sys_period_end,id, test_number) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger migtest_e_history4_history_del before delete on migtest_e_history4 for each row begin
+    insert into migtest_e_history4_history (sys_period_start,sys_period_end,id, test_number) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number);
+end$$
+delimiter $$
+create trigger migtest_e_history5_history_upd before update on migtest_e_history5 for each row begin
+    insert into migtest_e_history5_history (sys_period_start,sys_period_end,id, test_number) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger migtest_e_history5_history_del before delete on migtest_e_history5 for each row begin
+    insert into migtest_e_history5_history (sys_period_start,sys_period_end,id, test_number) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number);
+end$$
+delimiter $$
+create trigger migtest_e_history6_history_upd before update on migtest_e_history6 for each row begin
+    insert into migtest_e_history6_history (sys_period_start,sys_period_end,id, test_number1, test_number2) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number1, OLD.test_number2);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger migtest_e_history6_history_del before delete on migtest_e_history6 for each row begin
+    insert into migtest_e_history6_history (sys_period_start,sys_period_end,id, test_number1, test_number2) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number1, OLD.test_number2);
 end$$
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
index b7de26f72..738778578 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
@@ -1,4 +1,10 @@
 -- Migrationscripts for ebean unittest
+-- drop dependencies
+drop view if exists migtest_e_history2_with_history;
+drop view if exists migtest_e_history3_with_history;
+drop view if exists migtest_e_history4_with_history;
+drop view if exists migtest_e_history5_with_history;
+
 -- apply changes
 create table migtest_e_user (
   id                            integer auto_increment not null,
@@ -63,14 +69,26 @@ alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique
 alter table migtest_e_history modify test_string bigint;
 alter table migtest_e_history comment = 'We have history now';
 
+-- NOTE: table has @History - special migration may be necessary
 update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 alter table migtest_e_history2 alter test_string set default 'unknown';
 alter table migtest_e_history2 modify test_string varchar(255) not null;
 alter table migtest_e_history2 add column test_string2 varchar(255);
 alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null;
 alter table migtest_e_history2_history add column test_string2 varchar(255);
-alter table migtest_e_history2_history add column test_string3 varchar(255);
+alter table migtest_e_history2_history add column test_string3 varchar(255) default 'unknown';
 
+alter table migtest_e_history4 modify test_number bigint;
+alter table migtest_e_history4_history modify test_number bigint;
+alter table migtest_e_history5 add column test_boolean tinyint(1) default 0 not null;
+alter table migtest_e_history5_history add column test_boolean tinyint(1) default 0;
+
+
+-- NOTE: table has @History - special migration may be necessary
+update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
+alter table migtest_e_history6 alter test_number1 set default 42;
+alter table migtest_e_history6 modify test_number1 integer not null;
+alter table migtest_e_history6 modify test_number2 integer;
 alter table migtest_e_softdelete add column deleted tinyint(1) default 0 not null;
 
 alter table migtest_oto_child add column master_id bigint;
@@ -106,6 +124,14 @@ create table migtest_e_history_history(
 );
 create view migtest_e_history_with_history as select * from migtest_e_history union all select * from migtest_e_history_history;
 
+create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
+
+create view migtest_e_history3_with_history as select * from migtest_e_history3 union all select * from migtest_e_history3_history;
+
+create view migtest_e_history4_with_history as select * from migtest_e_history4 union all select * from migtest_e_history4_history;
+
+create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history;
+
 delimiter $$
 create trigger migtest_e_history_history_upd before update on migtest_e_history for each row begin
     insert into migtest_e_history_history (sys_period_start,sys_period_end,id, test_string) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string);
@@ -115,17 +141,53 @@ delimiter $$
 create trigger migtest_e_history_history_del before delete on migtest_e_history for each row begin
     insert into migtest_e_history_history (sys_period_start,sys_period_end,id, test_string) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string);
 end$$
+lock tables migtest_e_history2 write, migtest_e_history3 write, migtest_e_history4 write, migtest_e_history5 write;
 -- changes: [add test_string2, add test_string3]
-lock tables migtest_e_history2 write;
 drop trigger migtest_e_history2_history_upd;
 drop trigger migtest_e_history2_history_del;
 delimiter $$
 create trigger migtest_e_history2_history_upd before update on migtest_e_history2 for each row begin
-    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, test_string2, test_string3) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.test_string2, OLD.test_string3);
+    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, test_string3, obsolete_string1, obsolete_string2) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.test_string3, OLD.obsolete_string1, OLD.obsolete_string2);
     set NEW.sys_period_start = now(6);
 end$$
 delimiter $$
 create trigger migtest_e_history2_history_del before delete on migtest_e_history2 for each row begin
-    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, test_string2, test_string3) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.test_string2, OLD.test_string3);
+    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, test_string3, obsolete_string1, obsolete_string2) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.test_string3, OLD.obsolete_string1, OLD.obsolete_string2);
+end$$
+-- changes: [exclude test_string]
+drop trigger migtest_e_history3_history_upd;
+drop trigger migtest_e_history3_history_del;
+delimiter $$
+create trigger migtest_e_history3_history_upd before update on migtest_e_history3 for each row begin
+    insert into migtest_e_history3_history (sys_period_start,sys_period_end,id) values (OLD.sys_period_start, now(6),OLD.id);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger migtest_e_history3_history_del before delete on migtest_e_history3 for each row begin
+    insert into migtest_e_history3_history (sys_period_start,sys_period_end,id) values (OLD.sys_period_start, now(6),OLD.id);
+end$$
+-- changes: [alter test_number]
+drop trigger migtest_e_history4_history_upd;
+drop trigger migtest_e_history4_history_del;
+delimiter $$
+create trigger migtest_e_history4_history_upd before update on migtest_e_history4 for each row begin
+    insert into migtest_e_history4_history (sys_period_start,sys_period_end,id, test_number) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger migtest_e_history4_history_del before delete on migtest_e_history4 for each row begin
+    insert into migtest_e_history4_history (sys_period_start,sys_period_end,id, test_number) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number);
+end$$
+-- changes: [add test_boolean]
+drop trigger migtest_e_history5_history_upd;
+drop trigger migtest_e_history5_history_del;
+delimiter $$
+create trigger migtest_e_history5_history_upd before update on migtest_e_history5 for each row begin
+    insert into migtest_e_history5_history (sys_period_start,sys_period_end,id, test_number, test_boolean) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number, OLD.test_boolean);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger migtest_e_history5_history_del before delete on migtest_e_history5 for each row begin
+    insert into migtest_e_history5_history (sys_period_start,sys_period_end,id, test_number, test_boolean) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number, OLD.test_boolean);
 end$$
 unlock tables;
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.2__dropsFor_1.1.sql
index 0c6ddbf56..cab80c68a 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.2__dropsFor_1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.2__dropsFor_1.1.sql
@@ -1,4 +1,7 @@
 -- Migrationscripts for ebean unittest
+-- drop dependencies
+drop view if exists migtest_e_history2_with_history;
+
 -- apply changes
 alter table migtest_e_basic drop column old_boolean;
 
@@ -6,4 +9,26 @@ alter table migtest_e_basic drop column old_boolean2;
 
 alter table migtest_e_basic drop column eref_id;
 
+alter table migtest_e_history2 drop column obsolete_string1;
+alter table migtest_e_history2_history drop column obsolete_string1;
+
+alter table migtest_e_history2 drop column obsolete_string2;
+alter table migtest_e_history2_history drop column obsolete_string2;
+
 drop table if exists migtest_e_ref;
+create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
+
+lock tables migtest_e_history2 write;
+-- changes: [drop obsolete_string1, drop obsolete_string2]
+drop trigger migtest_e_history2_history_upd;
+drop trigger migtest_e_history2_history_del;
+delimiter $$
+create trigger migtest_e_history2_history_upd before update on migtest_e_history2 for each row begin
+    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, test_string3) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.test_string3);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger migtest_e_history2_history_del before delete on migtest_e_history2 for each row begin
+    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, test_string3) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.test_string3);
+end$$
+unlock tables;
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
index 4fb4d19f5..e0a81437d 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
@@ -1,4 +1,9 @@
 -- Migrationscripts for ebean unittest
+-- drop dependencies
+drop view if exists migtest_e_history2_with_history;
+drop view if exists migtest_e_history3_with_history;
+drop view if exists migtest_e_history4_with_history;
+
 -- apply changes
 create table migtest_e_ref (
   id                            integer auto_increment not null,
@@ -35,6 +40,19 @@ alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique  (indextest6);
 alter table migtest_e_history comment = '';
 alter table migtest_e_history2 alter test_string drop default;
+alter table migtest_e_history2 add column obsolete_string1 varchar(255);
+alter table migtest_e_history2 add column obsolete_string2 varchar(255);
+alter table migtest_e_history2_history add column obsolete_string1 varchar(255);
+alter table migtest_e_history2_history add column obsolete_string2 varchar(255);
+
+alter table migtest_e_history4 modify test_number integer;
+alter table migtest_e_history4_history modify test_number integer;
+alter table migtest_e_history6 alter test_number1 drop default;
+
+-- NOTE: table has @History - special migration may be necessary
+update migtest_e_history6 set test_number2 = 7 where test_number2 is null;
+alter table migtest_e_history6 alter test_number2 set default 7;
+alter table migtest_e_history6 modify test_number2 integer not null;
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 drop index ix_migtest_e_basic_indextest3 on migtest_e_basic;
@@ -42,3 +60,47 @@ drop index ix_migtest_e_basic_indextest6 on migtest_e_basic;
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
+create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
+
+create view migtest_e_history3_with_history as select * from migtest_e_history3 union all select * from migtest_e_history3_history;
+
+create view migtest_e_history4_with_history as select * from migtest_e_history4 union all select * from migtest_e_history4_history;
+
+lock tables migtest_e_history2 write, migtest_e_history3 write, migtest_e_history4 write;
+-- changes: [add obsolete_string1, add obsolete_string2]
+drop trigger migtest_e_history2_history_upd;
+drop trigger migtest_e_history2_history_del;
+delimiter $$
+create trigger migtest_e_history2_history_upd before update on migtest_e_history2 for each row begin
+    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, obsolete_string2, test_string2, test_string3) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.obsolete_string2, OLD.test_string2, OLD.test_string3);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger migtest_e_history2_history_del before delete on migtest_e_history2 for each row begin
+    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, obsolete_string2, test_string2, test_string3) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.obsolete_string2, OLD.test_string2, OLD.test_string3);
+end$$
+-- changes: [include test_string]
+drop trigger migtest_e_history3_history_upd;
+drop trigger migtest_e_history3_history_del;
+delimiter $$
+create trigger migtest_e_history3_history_upd before update on migtest_e_history3 for each row begin
+    insert into migtest_e_history3_history (sys_period_start,sys_period_end,id, test_string) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger migtest_e_history3_history_del before delete on migtest_e_history3 for each row begin
+    insert into migtest_e_history3_history (sys_period_start,sys_period_end,id, test_string) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string);
+end$$
+-- changes: [alter test_number]
+drop trigger migtest_e_history4_history_upd;
+drop trigger migtest_e_history4_history_del;
+delimiter $$
+create trigger migtest_e_history4_history_upd before update on migtest_e_history4 for each row begin
+    insert into migtest_e_history4_history (sys_period_start,sys_period_end,id, test_number) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger migtest_e_history4_history_del before delete on migtest_e_history4 for each row begin
+    insert into migtest_e_history4_history (sys_period_start,sys_period_end,id, test_number) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number);
+end$$
+unlock tables;
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql
index 93f1fecae..548aec6b8 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql
@@ -7,6 +7,8 @@ alter table migtest_e_history drop column sys_period_start;
 alter table migtest_e_history drop column sys_period_end;
 drop table migtest_e_history_history;
 
+drop view if exists migtest_e_history2_with_history;
+drop view if exists migtest_e_history5_with_history;
 
 -- apply changes
 alter table migtest_ckey_detail drop column one_key;
@@ -31,6 +33,9 @@ alter table migtest_e_history2_history drop column test_string2;
 alter table migtest_e_history2 drop column test_string3;
 alter table migtest_e_history2_history drop column test_string3;
 
+alter table migtest_e_history5 drop column test_boolean;
+alter table migtest_e_history5_history drop column test_boolean;
+
 alter table migtest_e_softdelete drop column deleted;
 
 alter table migtest_oto_child drop column master_id;
@@ -38,17 +43,33 @@ alter table migtest_oto_child drop column master_id;
 drop table if exists migtest_e_user;
 drop table if exists migtest_mtm_c_migtest_mtm_m;
 drop table if exists migtest_mtm_m_migtest_mtm_c;
+create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
+
+create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history;
+
+lock tables migtest_e_history2 write, migtest_e_history5 write;
 -- changes: [drop test_string2, drop test_string3]
-lock tables migtest_e_history2 write;
 drop trigger migtest_e_history2_history_upd;
 drop trigger migtest_e_history2_history_del;
 delimiter $$
 create trigger migtest_e_history2_history_upd before update on migtest_e_history2 for each row begin
-    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string);
+    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, obsolete_string2) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.obsolete_string2);
     set NEW.sys_period_start = now(6);
 end$$
 delimiter $$
 create trigger migtest_e_history2_history_del before delete on migtest_e_history2 for each row begin
-    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string);
+    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, obsolete_string2) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.obsolete_string2);
+end$$
+-- changes: [drop test_boolean]
+drop trigger migtest_e_history5_history_upd;
+drop trigger migtest_e_history5_history_del;
+delimiter $$
+create trigger migtest_e_history5_history_upd before update on migtest_e_history5 for each row begin
+    insert into migtest_e_history5_history (sys_period_start,sys_period_end,id, test_number) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger migtest_e_history5_history_del before delete on migtest_e_history5 for each row begin
+    insert into migtest_e_history5_history (sys_period_start,sys_period_end,id, test_number) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number);
 end$$
 unlock tables;
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
index fb1f1e66e..0a2bbb648 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
@@ -95,10 +95,41 @@ create sequence migtest_e_history_seq;
 create table migtest_e_history2 (
   id                            number(10) not null,
   test_string                   varchar2(255),
+  obsolete_string1              varchar2(255),
+  obsolete_string2              varchar2(255),
   constraint pk_migtest_e_history2 primary key (id)
 );
 create sequence migtest_e_history2_seq;
 
+create table migtest_e_history3 (
+  id                            number(10) not null,
+  test_string                   varchar2(255),
+  constraint pk_migtest_e_history3 primary key (id)
+);
+create sequence migtest_e_history3_seq;
+
+create table migtest_e_history4 (
+  id                            number(10) not null,
+  test_number                   number(10),
+  constraint pk_migtest_e_history4 primary key (id)
+);
+create sequence migtest_e_history4_seq;
+
+create table migtest_e_history5 (
+  id                            number(10) not null,
+  test_number                   number(10),
+  constraint pk_migtest_e_history5 primary key (id)
+);
+create sequence migtest_e_history5_seq;
+
+create table migtest_e_history6 (
+  id                            number(10) not null,
+  test_number1                  number(10),
+  test_number2                  number(10) not null,
+  constraint pk_migtest_e_history6 primary key (id)
+);
+create sequence migtest_e_history6_seq;
+
 create table migtest_e_ref (
   id                            number(10) not null,
   name                          varchar2(127) not null,
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
index 8aea49e91..63adc8dbf 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
@@ -66,12 +66,22 @@ comment on column migtest_e_history.test_string is 'Column altered to long now';
 alter table migtest_e_history modify test_string number(19);
 comment on table migtest_e_history is 'We have history now';
 
+-- NOTE: table has @History - special migration may be necessary
 update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 alter table migtest_e_history2 modify test_string default 'unknown';
 alter table migtest_e_history2 modify test_string not null;
 alter table migtest_e_history2 add column test_string2 varchar2(255);
 alter table migtest_e_history2 add column test_string3 varchar2(255) default 'unknown' not null;
 
+alter table migtest_e_history4 modify test_number number(19);
+alter table migtest_e_history5 add column test_boolean number(1) default 0 not null;
+
+
+-- NOTE: table has @History - special migration may be necessary
+update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
+alter table migtest_e_history6 modify test_number1 default 42;
+alter table migtest_e_history6 modify test_number1 not null;
+alter table migtest_e_history6 modify test_number2 null;
 alter table migtest_e_softdelete add column deleted number(1) default 0 not null;
 
 alter table migtest_oto_child add column master_id number(19);
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.2__dropsFor_1.1.sql
index 9851e7f65..4f2337db3 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.2__dropsFor_1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.2__dropsFor_1.1.sql
@@ -6,5 +6,9 @@ alter table migtest_e_basic drop column old_boolean2;
 
 alter table migtest_e_basic drop column eref_id;
 
+alter table migtest_e_history2 drop column obsolete_string1;
+
+alter table migtest_e_history2 drop column obsolete_string2;
+
 drop table migtest_e_ref cascade constraints purge;
 drop sequence migtest_e_ref_seq;
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
index 57fbfe9b7..4ba0b1242 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
@@ -41,6 +41,17 @@ comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
 alter table migtest_e_history2 modify test_string drop default;
 alter table migtest_e_history2 modify test_string null;
+alter table migtest_e_history2 add column obsolete_string1 varchar2(255);
+alter table migtest_e_history2 add column obsolete_string2 varchar2(255);
+
+alter table migtest_e_history4 modify test_number number(10);
+alter table migtest_e_history6 modify test_number1 drop default;
+alter table migtest_e_history6 modify test_number1 null;
+
+-- NOTE: table has @History - special migration may be necessary
+update migtest_e_history6 set test_number2 = 7 where test_number2 is null;
+alter table migtest_e_history6 modify test_number2 default 7;
+alter table migtest_e_history6 modify test_number2 not null;
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 drop index ix_migtest_e_basic_indextest3;
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql
index cf48c760e..b370f746a 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql
@@ -20,6 +20,8 @@ alter table migtest_e_history2 drop column test_string2;
 
 alter table migtest_e_history2 drop column test_string3;
 
+alter table migtest_e_history5 drop column test_boolean;
+
 alter table migtest_e_softdelete drop column deleted;
 
 alter table migtest_oto_child drop column master_id;
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
index b15609fdd..0ad03898d 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
@@ -85,9 +85,36 @@ create table migtest_e_history (
 create table migtest_e_history2 (
   id                            serial not null,
   test_string                   varchar(255),
+  obsolete_string1              varchar(255),
+  obsolete_string2              varchar(255),
   constraint pk_migtest_e_history2 primary key (id)
 );
 
+create table migtest_e_history3 (
+  id                            serial not null,
+  test_string                   varchar(255),
+  constraint pk_migtest_e_history3 primary key (id)
+);
+
+create table migtest_e_history4 (
+  id                            serial not null,
+  test_number                   integer,
+  constraint pk_migtest_e_history4 primary key (id)
+);
+
+create table migtest_e_history5 (
+  id                            serial not null,
+  test_number                   integer,
+  constraint pk_migtest_e_history5 primary key (id)
+);
+
+create table migtest_e_history6 (
+  id                            serial not null,
+  test_number1                  integer,
+  test_number2                  integer not null,
+  constraint pk_migtest_e_history6 primary key (id)
+);
+
 create table migtest_e_ref (
   id                            serial not null,
   name                          varchar(127) not null,
@@ -140,14 +167,30 @@ alter table migtest_e_history2 add column sys_period tstzrange not null default
 create table migtest_e_history2_history(like migtest_e_history2);
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 
+alter table migtest_e_history3 add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+create table migtest_e_history3_history(like migtest_e_history3);
+create view migtest_e_history3_with_history as select * from migtest_e_history3 union all select * from migtest_e_history3_history;
+
+alter table migtest_e_history4 add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+create table migtest_e_history4_history(like migtest_e_history4);
+create view migtest_e_history4_with_history as select * from migtest_e_history4 union all select * from migtest_e_history4_history;
+
+alter table migtest_e_history5 add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+create table migtest_e_history5_history(like migtest_e_history5);
+create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history;
+
+alter table migtest_e_history6 add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+create table migtest_e_history6_history(like migtest_e_history6);
+create view migtest_e_history6_with_history as select * from migtest_e_history6 union all select * from migtest_e_history6_history;
+
 create or replace function migtest_e_history2_history_version() returns trigger as $$
 begin
   if (TG_OP = 'UPDATE') then
-    insert into migtest_e_history2_history (sys_period,id, test_string) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string);
+    insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.obsolete_string2);
     NEW.sys_period = tstzrange(current_timestamp,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into migtest_e_history2_history (sys_period,id, test_string) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string);
+    insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.obsolete_string2);
     return old;
   end if;
 end;
@@ -157,3 +200,71 @@ create trigger migtest_e_history2_history_upd
   before update or delete on migtest_e_history2
   for each row execute procedure migtest_e_history2_history_version();
 
+create or replace function migtest_e_history3_history_version() returns trigger as $$
+begin
+  if (TG_OP = 'UPDATE') then
+    insert into migtest_e_history3_history (sys_period,id, test_string) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string);
+    NEW.sys_period = tstzrange(current_timestamp,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into migtest_e_history3_history (sys_period,id, test_string) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string);
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
+create trigger migtest_e_history3_history_upd
+  before update or delete on migtest_e_history3
+  for each row execute procedure migtest_e_history3_history_version();
+
+create or replace function migtest_e_history4_history_version() returns trigger as $$
+begin
+  if (TG_OP = 'UPDATE') then
+    insert into migtest_e_history4_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number);
+    NEW.sys_period = tstzrange(current_timestamp,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into migtest_e_history4_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number);
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
+create trigger migtest_e_history4_history_upd
+  before update or delete on migtest_e_history4
+  for each row execute procedure migtest_e_history4_history_version();
+
+create or replace function migtest_e_history5_history_version() returns trigger as $$
+begin
+  if (TG_OP = 'UPDATE') then
+    insert into migtest_e_history5_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number);
+    NEW.sys_period = tstzrange(current_timestamp,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into migtest_e_history5_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number);
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
+create trigger migtest_e_history5_history_upd
+  before update or delete on migtest_e_history5
+  for each row execute procedure migtest_e_history5_history_version();
+
+create or replace function migtest_e_history6_history_version() returns trigger as $$
+begin
+  if (TG_OP = 'UPDATE') then
+    insert into migtest_e_history6_history (sys_period,id, test_number1, test_number2) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number1, OLD.test_number2);
+    NEW.sys_period = tstzrange(current_timestamp,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into migtest_e_history6_history (sys_period,id, test_number1, test_number2) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number1, OLD.test_number2);
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
+create trigger migtest_e_history6_history_upd
+  before update or delete on migtest_e_history6
+  for each row execute procedure migtest_e_history6_history_version();
+
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
index 3b4d3e3b2..40c16d978 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
@@ -1,6 +1,9 @@
 -- Migrationscripts for ebean unittest
 -- drop dependencies
 drop view if exists migtest_e_history2_with_history;
+drop view if exists migtest_e_history3_with_history;
+drop view if exists migtest_e_history4_with_history;
+drop view if exists migtest_e_history5_with_history;
 
 -- apply changes
 create table migtest_e_user (
@@ -70,14 +73,26 @@ comment on column migtest_e_history.test_string is 'Column altered to long now';
 alter table migtest_e_history alter column test_string type bigint;
 comment on table migtest_e_history is 'We have history now';
 
+-- NOTE: table has @History - special migration may be necessary
 update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 alter table migtest_e_history2 alter column test_string set default 'unknown';
 alter table migtest_e_history2 alter column test_string set not null;
 alter table migtest_e_history2 add column test_string2 varchar(255);
 alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null;
 alter table migtest_e_history2_history add column test_string2 varchar(255);
-alter table migtest_e_history2_history add column test_string3 varchar(255);
+alter table migtest_e_history2_history add column test_string3 varchar(255) default 'unknown';
 
+alter table migtest_e_history4 alter column test_number type bigint;
+alter table migtest_e_history4_history alter column test_number type bigint;
+alter table migtest_e_history5 add column test_boolean boolean default false not null;
+alter table migtest_e_history5_history add column test_boolean boolean default false;
+
+
+-- NOTE: table has @History - special migration may be necessary
+update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
+alter table migtest_e_history6 alter column test_number1 set default 42;
+alter table migtest_e_history6 alter column test_number1 set not null;
+alter table migtest_e_history6 alter column test_number2 drop not null;
 alter table migtest_e_softdelete add column deleted boolean default false not null;
 
 alter table migtest_oto_child add column master_id bigint;
@@ -107,6 +122,14 @@ alter table migtest_e_history add column sys_period tstzrange not null default t
 create table migtest_e_history_history(like migtest_e_history);
 create view migtest_e_history_with_history as select * from migtest_e_history union all select * from migtest_e_history_history;
 
+create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
+
+create view migtest_e_history3_with_history as select * from migtest_e_history3 union all select * from migtest_e_history3_history;
+
+create view migtest_e_history4_with_history as select * from migtest_e_history4 union all select * from migtest_e_history4_history;
+
+create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history;
+
 create or replace function migtest_e_history_history_version() returns trigger as $$
 begin
   if (TG_OP = 'UPDATE') then
@@ -125,16 +148,56 @@ create trigger migtest_e_history_history_upd
   for each row execute procedure migtest_e_history_history_version();
 
 -- changes: [add test_string2, add test_string3]
-create or replace view migtest_e_history2_with_history as select id, test_string, test_string2, test_string3, sys_period from migtest_e_history2 union all select id, test_string, test_string2, test_string3, sys_period from migtest_e_history2_history;
-
 create or replace function migtest_e_history2_history_version() returns trigger as $$
 begin
   if (TG_OP = 'UPDATE') then
-    insert into migtest_e_history2_history (sys_period,id, test_string, test_string2, test_string3) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.test_string2, OLD.test_string3);
+    insert into migtest_e_history2_history (sys_period,id, test_string, test_string3, obsolete_string1, obsolete_string2) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.test_string3, OLD.obsolete_string1, OLD.obsolete_string2);
     NEW.sys_period = tstzrange(current_timestamp,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into migtest_e_history2_history (sys_period,id, test_string, test_string2, test_string3) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.test_string2, OLD.test_string3);
+    insert into migtest_e_history2_history (sys_period,id, test_string, test_string3, obsolete_string1, obsolete_string2) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.test_string3, OLD.obsolete_string1, OLD.obsolete_string2);
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
+-- changes: [exclude test_string]
+create or replace function migtest_e_history3_history_version() returns trigger as $$
+begin
+  if (TG_OP = 'UPDATE') then
+    insert into migtest_e_history3_history (sys_period,id) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id);
+    NEW.sys_period = tstzrange(current_timestamp,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into migtest_e_history3_history (sys_period,id) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id);
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
+-- changes: [alter test_number]
+create or replace function migtest_e_history4_history_version() returns trigger as $$
+begin
+  if (TG_OP = 'UPDATE') then
+    insert into migtest_e_history4_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number);
+    NEW.sys_period = tstzrange(current_timestamp,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into migtest_e_history4_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number);
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
+-- changes: [add test_boolean]
+create or replace function migtest_e_history5_history_version() returns trigger as $$
+begin
+  if (TG_OP = 'UPDATE') then
+    insert into migtest_e_history5_history (sys_period,id, test_number, test_boolean) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number, OLD.test_boolean);
+    NEW.sys_period = tstzrange(current_timestamp,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into migtest_e_history5_history (sys_period,id, test_number, test_boolean) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number, OLD.test_boolean);
     return old;
   end if;
 end;
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql
index 7917b78da..67f252e11 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql
@@ -1,4 +1,7 @@
 -- Migrationscripts for ebean unittest
+-- drop dependencies
+drop view if exists migtest_e_history2_with_history;
+
 -- apply changes
 alter table migtest_e_basic drop column old_boolean;
 
@@ -6,5 +9,27 @@ alter table migtest_e_basic drop column old_boolean2;
 
 alter table migtest_e_basic drop column eref_id;
 
+alter table migtest_e_history2 drop column obsolete_string1;
+alter table migtest_e_history2_history drop column obsolete_string1;
+
+alter table migtest_e_history2 drop column obsolete_string2;
+alter table migtest_e_history2_history drop column obsolete_string2;
+
 drop table if exists migtest_e_ref cascade;
 drop sequence if exists migtest_e_ref_seq;
+create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
+
+-- changes: [drop obsolete_string1, drop obsolete_string2]
+create or replace function migtest_e_history2_history_version() returns trigger as $$
+begin
+  if (TG_OP = 'UPDATE') then
+    insert into migtest_e_history2_history (sys_period,id, test_string, test_string3) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.test_string3);
+    NEW.sys_period = tstzrange(current_timestamp,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into migtest_e_history2_history (sys_period,id, test_string, test_string3) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.test_string3);
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
index 3353df6fa..89e93220f 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
@@ -1,4 +1,9 @@
 -- Migrationscripts for ebean unittest
+-- drop dependencies
+drop view if exists migtest_e_history2_with_history;
+drop view if exists migtest_e_history3_with_history;
+drop view if exists migtest_e_history4_with_history;
+
 -- apply changes
 create table migtest_e_ref (
   id                            serial not null,
@@ -40,6 +45,20 @@ comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
 alter table migtest_e_history2 alter column test_string drop default;
 alter table migtest_e_history2 alter column test_string drop not null;
+alter table migtest_e_history2 add column obsolete_string1 varchar(255);
+alter table migtest_e_history2 add column obsolete_string2 varchar(255);
+alter table migtest_e_history2_history add column obsolete_string1 varchar(255);
+alter table migtest_e_history2_history add column obsolete_string2 varchar(255);
+
+alter table migtest_e_history4 alter column test_number type integer;
+alter table migtest_e_history4_history alter column test_number type integer;
+alter table migtest_e_history6 alter column test_number1 drop default;
+alter table migtest_e_history6 alter column test_number1 drop not null;
+
+-- NOTE: table has @History - special migration may be necessary
+update migtest_e_history6 set test_number2 = 7 where test_number2 is null;
+alter table migtest_e_history6 alter column test_number2 set default 7;
+alter table migtest_e_history6 alter column test_number2 set not null;
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 drop index if exists ix_migtest_e_basic_indextest3;
@@ -47,3 +66,51 @@ drop index if exists ix_migtest_e_basic_indextest6;
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
+create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
+
+create view migtest_e_history3_with_history as select * from migtest_e_history3 union all select * from migtest_e_history3_history;
+
+create view migtest_e_history4_with_history as select * from migtest_e_history4 union all select * from migtest_e_history4_history;
+
+-- changes: [add obsolete_string1, add obsolete_string2]
+create or replace function migtest_e_history2_history_version() returns trigger as $$
+begin
+  if (TG_OP = 'UPDATE') then
+    insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2, test_string2, test_string3) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.obsolete_string2, OLD.test_string2, OLD.test_string3);
+    NEW.sys_period = tstzrange(current_timestamp,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2, test_string2, test_string3) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.obsolete_string2, OLD.test_string2, OLD.test_string3);
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
+-- changes: [include test_string]
+create or replace function migtest_e_history3_history_version() returns trigger as $$
+begin
+  if (TG_OP = 'UPDATE') then
+    insert into migtest_e_history3_history (sys_period,id, test_string) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string);
+    NEW.sys_period = tstzrange(current_timestamp,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into migtest_e_history3_history (sys_period,id, test_string) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string);
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
+-- changes: [alter test_number]
+create or replace function migtest_e_history4_history_version() returns trigger as $$
+begin
+  if (TG_OP = 'UPDATE') then
+    insert into migtest_e_history4_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number);
+    NEW.sys_period = tstzrange(current_timestamp,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into migtest_e_history4_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number);
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql
index e877b64da..af25ac556 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql
@@ -8,6 +8,7 @@ alter table migtest_e_history drop column sys_period;
 drop table migtest_e_history_history;
 
 drop view if exists migtest_e_history2_with_history;
+drop view if exists migtest_e_history5_with_history;
 
 -- apply changes
 alter table migtest_ckey_detail drop column one_key;
@@ -32,6 +33,9 @@ alter table migtest_e_history2_history drop column test_string2;
 alter table migtest_e_history2 drop column test_string3;
 alter table migtest_e_history2_history drop column test_string3;
 
+alter table migtest_e_history5 drop column test_boolean;
+alter table migtest_e_history5_history drop column test_boolean;
+
 alter table migtest_e_softdelete drop column deleted;
 
 alter table migtest_oto_child drop column master_id;
@@ -40,17 +44,33 @@ drop table if exists migtest_e_user cascade;
 drop sequence if exists migtest_e_user_seq;
 drop table if exists migtest_mtm_c_migtest_mtm_m cascade;
 drop table if exists migtest_mtm_m_migtest_mtm_c cascade;
--- changes: [drop test_string2, drop test_string3]
-create or replace view migtest_e_history2_with_history as select id, test_string, sys_period from migtest_e_history2 union all select id, test_string, sys_period from migtest_e_history2_history;
+create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 
+create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history;
+
+-- changes: [drop test_string2, drop test_string3]
 create or replace function migtest_e_history2_history_version() returns trigger as $$
 begin
   if (TG_OP = 'UPDATE') then
-    insert into migtest_e_history2_history (sys_period,id, test_string) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string);
+    insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.obsolete_string2);
     NEW.sys_period = tstzrange(current_timestamp,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into migtest_e_history2_history (sys_period,id, test_string) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string);
+    insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.obsolete_string2);
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
+-- changes: [drop test_boolean]
+create or replace function migtest_e_history5_history_version() returns trigger as $$
+begin
+  if (TG_OP = 'UPDATE') then
+    insert into migtest_e_history5_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number);
+    NEW.sys_period = tstzrange(current_timestamp,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into migtest_e_history5_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number);
     return old;
   end if;
 end;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
index 5720ef6ab..40b1d0dcc 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
@@ -88,9 +88,36 @@ create table migtest_e_history (
 create table migtest_e_history2 (
   id                            integer not null,
   test_string                   varchar(255),
+  obsolete_string1              varchar(255),
+  obsolete_string2              varchar(255),
   constraint pk_migtest_e_history2 primary key (id)
 );
 
+create table migtest_e_history3 (
+  id                            integer not null,
+  test_string                   varchar(255),
+  constraint pk_migtest_e_history3 primary key (id)
+);
+
+create table migtest_e_history4 (
+  id                            integer not null,
+  test_number                   integer,
+  constraint pk_migtest_e_history4 primary key (id)
+);
+
+create table migtest_e_history5 (
+  id                            integer not null,
+  test_number                   integer,
+  constraint pk_migtest_e_history5 primary key (id)
+);
+
+create table migtest_e_history6 (
+  id                            integer not null,
+  test_number1                  integer,
+  test_number2                  integer not null,
+  constraint pk_migtest_e_history6 primary key (id)
+);
+
 create table migtest_e_ref (
   id                            integer not null,
   name                          varchar(127) not null,
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
index d5e7c150e..950e740da 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
@@ -61,14 +61,22 @@ alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
 alter table migtest_e_history alter column test_string integer;
 
+-- NOTE: table has @History - special migration may be necessary
 update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 alter table migtest_e_history2 alter column test_string set default 'unknown';
 alter table migtest_e_history2 alter column test_string set not null;
 alter table migtest_e_history2 add column test_string2 varchar(255);
 alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null;
-alter table migtest_e_history2_history add column test_string2 varchar(255);
-alter table migtest_e_history2_history add column test_string3 varchar(255);
 
+alter table migtest_e_history4 alter column test_number integer;
+alter table migtest_e_history5 add column test_boolean int default 0 not null;
+
+
+-- NOTE: table has @History - special migration may be necessary
+update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
+alter table migtest_e_history6 alter column test_number1 set default 42;
+alter table migtest_e_history6 alter column test_number1 set not null;
+alter table migtest_e_history6 alter column test_number2 set null;
 alter table migtest_e_softdelete add column deleted int default 0 not null;
 
 alter table migtest_oto_child add column master_id integer;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.2__dropsFor_1.1.sql
index 0c6ddbf56..3f8f468ba 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.2__dropsFor_1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.2__dropsFor_1.1.sql
@@ -6,4 +6,8 @@ alter table migtest_e_basic drop column old_boolean2;
 
 alter table migtest_e_basic drop column eref_id;
 
+alter table migtest_e_history2 drop column obsolete_string1;
+
+alter table migtest_e_history2 drop column obsolete_string2;
+
 drop table if exists migtest_e_ref;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
index f06daf11d..77d4552b6 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
@@ -36,6 +36,17 @@ alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique  (indextest6);
 alter table migtest_e_history2 alter column test_string drop default;
 alter table migtest_e_history2 alter column test_string set null;
+alter table migtest_e_history2 add column obsolete_string1 varchar(255);
+alter table migtest_e_history2 add column obsolete_string2 varchar(255);
+
+alter table migtest_e_history4 alter column test_number integer;
+alter table migtest_e_history6 alter column test_number1 drop default;
+alter table migtest_e_history6 alter column test_number1 set null;
+
+-- NOTE: table has @History - special migration may be necessary
+update migtest_e_history6 set test_number2 = 7 where test_number2 is null;
+alter table migtest_e_history6 alter column test_number2 set default 7;
+alter table migtest_e_history6 alter column test_number2 set not null;
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 drop index if exists ix_migtest_e_basic_indextest3;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql
index 0d3d24380..cb6dfa7c1 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql
@@ -17,10 +17,10 @@ alter table migtest_e_basic drop column progress;
 alter table migtest_e_basic drop column new_integer;
 
 alter table migtest_e_history2 drop column test_string2;
-alter table migtest_e_history2_history drop column test_string2;
 
 alter table migtest_e_history2 drop column test_string3;
-alter table migtest_e_history2_history drop column test_string3;
+
+alter table migtest_e_history5 drop column test_boolean;
 
 alter table migtest_e_softdelete drop column deleted;
 
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql
index ea820be14..3c6ebff79 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql
@@ -95,10 +95,41 @@ create sequence migtest_e_history_seq as bigint  start with 1 ;
 create table migtest_e_history2 (
   id                            integer not null,
   test_string                   nvarchar(255),
+  obsolete_string1              nvarchar(255),
+  obsolete_string2              nvarchar(255),
   constraint pk_migtest_e_history2 primary key (id)
 );
 create sequence migtest_e_history2_seq as bigint  start with 1 ;
 
+create table migtest_e_history3 (
+  id                            integer not null,
+  test_string                   nvarchar(255),
+  constraint pk_migtest_e_history3 primary key (id)
+);
+create sequence migtest_e_history3_seq as bigint  start with 1 ;
+
+create table migtest_e_history4 (
+  id                            integer not null,
+  test_number                   integer,
+  constraint pk_migtest_e_history4 primary key (id)
+);
+create sequence migtest_e_history4_seq as bigint  start with 1 ;
+
+create table migtest_e_history5 (
+  id                            integer not null,
+  test_number                   integer,
+  constraint pk_migtest_e_history5 primary key (id)
+);
+create sequence migtest_e_history5_seq as bigint  start with 1 ;
+
+create table migtest_e_history6 (
+  id                            integer not null,
+  test_number1                  integer,
+  test_number2                  integer not null,
+  constraint pk_migtest_e_history6 primary key (id)
+);
+create sequence migtest_e_history6_seq as bigint  start with 1 ;
+
 create table migtest_e_ref (
   id                            integer not null,
   name                          nvarchar(127) not null,
@@ -158,3 +189,23 @@ alter table migtest_e_history2
         sys_periodTo   datetime2 GENERATED ALWAYS AS ROW END   NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',
 period for system_time (sys_periodFrom, sys_periodTo);
 alter table migtest_e_history2 set (system_versioning = on (history_table=dbo.migtest_e_history2_history));
+alter table migtest_e_history3
+    add sys_periodFrom datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(),
+        sys_periodTo   datetime2 GENERATED ALWAYS AS ROW END   NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',
+period for system_time (sys_periodFrom, sys_periodTo);
+alter table migtest_e_history3 set (system_versioning = on (history_table=dbo.migtest_e_history3_history));
+alter table migtest_e_history4
+    add sys_periodFrom datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(),
+        sys_periodTo   datetime2 GENERATED ALWAYS AS ROW END   NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',
+period for system_time (sys_periodFrom, sys_periodTo);
+alter table migtest_e_history4 set (system_versioning = on (history_table=dbo.migtest_e_history4_history));
+alter table migtest_e_history5
+    add sys_periodFrom datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(),
+        sys_periodTo   datetime2 GENERATED ALWAYS AS ROW END   NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',
+period for system_time (sys_periodFrom, sys_periodTo);
+alter table migtest_e_history5 set (system_versioning = on (history_table=dbo.migtest_e_history5_history));
+alter table migtest_e_history6
+    add sys_periodFrom datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(),
+        sys_periodTo   datetime2 GENERATED ALWAYS AS ROW END   NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',
+period for system_time (sys_periodFrom, sys_periodTo);
+alter table migtest_e_history6 set (system_versioning = on (history_table=dbo.migtest_e_history6_history));
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql
index 90c1f96bf..447a80dfc 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql
@@ -66,12 +66,22 @@ create unique nonclustered index uq_migtest_e_basic_indextest4 on migtest_e_basi
 create unique nonclustered index uq_migtest_e_basic_indextest5 on migtest_e_basic(indextest5) where indextest5 is not null;
 alter table migtest_e_history alter column test_string numeric(19);
 
+-- NOTE: table has @History - special migration may be necessary
 update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 alter table migtest_e_history2 add default 'unknown' for test_string;
 alter table migtest_e_history2 alter column test_string nvarchar(255) not null;
 alter table migtest_e_history2 add test_string2 nvarchar(255);
 alter table migtest_e_history2 add test_string3 nvarchar(255) default 'unknown' not null;
 
+alter table migtest_e_history4 alter column test_number numeric(19);
+alter table migtest_e_history5 add test_boolean bit default 0 not null;
+
+
+-- NOTE: table has @History - special migration may be necessary
+update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
+alter table migtest_e_history6 add default 42 for test_number1;
+alter table migtest_e_history6 alter column test_number1 integer not null;
+alter table migtest_e_history6 alter column test_number2 integer;
 alter table migtest_e_softdelete add deleted bit default 0 not null;
 
 alter table migtest_oto_child add master_id numeric(19);
@@ -102,3 +112,6 @@ alter table migtest_e_history
         sys_periodTo   datetime2 GENERATED ALWAYS AS ROW END   NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',
 period for system_time (sys_periodFrom, sys_periodTo);
 alter table migtest_e_history set (system_versioning = on (history_table=dbo.migtest_e_history_history));
+-- alter table migtest_e_history3 set (system_versioning = off (history_table=dbo.migtest_e_history3_history));
+-- history migration goes here
+-- alter table migtest_e_history3 set (system_versioning = on (history_table=dbo.migtest_e_history3_history));
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.2__dropsFor_1.1.sql
index d3a7a9a24..981cfe94a 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.2__dropsFor_1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.2__dropsFor_1.1.sql
@@ -39,5 +39,31 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_b
 IF OBJECT_ID('fk_migtest_e_basic_eref_id', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_eref_id;
 alter table migtest_e_basic drop column eref_id;
 
+-- drop column migtest_e_history2.obsolete_string1;
+IF (OBJECT_ID('uq_migtest_e_history2_obsolete_string1', 'UQ') IS NOT NULL) alter table migtest_e_history2 drop constraint uq_migtest_e_history2_obsolete_string1;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history2','U') AND name = 'uq_migtest_e_history2_obsolete_string1') drop index uq_migtest_e_history2_obsolete_string1 ON migtest_e_history2;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_e_history2') and t2.name = 'obsolete_string1';
+if @Tmp is not null EXEC('alter table migtest_e_history2 drop constraint ' + @Tmp)$$;
+IF (OBJECT_ID('ck_migtest_e_history2_obsolete_string1', 'C') IS NOT NULL) alter table migtest_e_history2 drop constraint ck_migtest_e_history2_obsolete_string1;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history2','U') AND name = 'ix_migtest_e_history2_obsolete_string1') drop index ix_migtest_e_history2_obsolete_string1 ON migtest_e_history2;
+IF OBJECT_ID('fk_migtest_e_history2_obsolete_string1', 'F') IS NOT NULL alter table migtest_e_history2 drop constraint fk_migtest_e_history2_obsolete_string1;
+alter table migtest_e_history2 drop column obsolete_string1;
+
+-- drop column migtest_e_history2.obsolete_string2;
+IF (OBJECT_ID('uq_migtest_e_history2_obsolete_string2', 'UQ') IS NOT NULL) alter table migtest_e_history2 drop constraint uq_migtest_e_history2_obsolete_string2;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history2','U') AND name = 'uq_migtest_e_history2_obsolete_string2') drop index uq_migtest_e_history2_obsolete_string2 ON migtest_e_history2;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_e_history2') and t2.name = 'obsolete_string2';
+if @Tmp is not null EXEC('alter table migtest_e_history2 drop constraint ' + @Tmp)$$;
+IF (OBJECT_ID('ck_migtest_e_history2_obsolete_string2', 'C') IS NOT NULL) alter table migtest_e_history2 drop constraint ck_migtest_e_history2_obsolete_string2;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history2','U') AND name = 'ix_migtest_e_history2_obsolete_string2') drop index ix_migtest_e_history2_obsolete_string2 ON migtest_e_history2;
+IF OBJECT_ID('fk_migtest_e_history2_obsolete_string2', 'F') IS NOT NULL alter table migtest_e_history2 drop constraint fk_migtest_e_history2_obsolete_string2;
+alter table migtest_e_history2 drop column obsolete_string2;
+
 IF OBJECT_ID('migtest_e_ref', 'U') IS NOT NULL drop table migtest_e_ref;
 IF OBJECT_ID('migtest_e_ref_seq', 'SO') IS NOT NULL drop sequence migtest_e_ref_seq;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql
index 50c300716..2294b9c01 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql
@@ -53,6 +53,20 @@ DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t
   join sys.columns t2 on t1.object_id = t2.default_object_id
   where t1.parent_object_id = OBJECT_ID('migtest_e_history2') and t2.name = 'test_string';
 if @Tmp is not null EXEC('alter table migtest_e_history2 drop constraint ' + @Tmp)$$;
+alter table migtest_e_history2 add obsolete_string1 nvarchar(255);
+alter table migtest_e_history2 add obsolete_string2 nvarchar(255);
+
+alter table migtest_e_history4 alter column test_number integer;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_e_history6') and t2.name = 'test_number1';
+if @Tmp is not null EXEC('alter table migtest_e_history6 drop constraint ' + @Tmp)$$;
+
+-- NOTE: table has @History - special migration may be necessary
+update migtest_e_history6 set test_number2 = 7 where test_number2 is null;
+alter table migtest_e_history6 add default 7 for test_number2;
+alter table migtest_e_history6 alter column test_number2 integer not null;
 create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
 create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest3') drop index ix_migtest_e_basic_indextest3 ON migtest_e_basic;
@@ -60,3 +74,6 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_b
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id);
 
+-- alter table migtest_e_history3 set (system_versioning = off (history_table=dbo.migtest_e_history3_history));
+-- history migration goes here
+-- alter table migtest_e_history3 set (system_versioning = on (history_table=dbo.migtest_e_history3_history));
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.4__dropsFor_1.3.sql
index 50be4368d..96a6e677e 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.4__dropsFor_1.3.sql
@@ -130,6 +130,19 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_h
 IF OBJECT_ID('fk_migtest_e_history2_test_string3', 'F') IS NOT NULL alter table migtest_e_history2 drop constraint fk_migtest_e_history2_test_string3;
 alter table migtest_e_history2 drop column test_string3;
 
+-- drop column migtest_e_history5.test_boolean;
+IF (OBJECT_ID('uq_migtest_e_history5_test_boolean', 'UQ') IS NOT NULL) alter table migtest_e_history5 drop constraint uq_migtest_e_history5_test_boolean;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history5','U') AND name = 'uq_migtest_e_history5_test_boolean') drop index uq_migtest_e_history5_test_boolean ON migtest_e_history5;
+delimiter $$
+DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
+  join sys.columns t2 on t1.object_id = t2.default_object_id
+  where t1.parent_object_id = OBJECT_ID('migtest_e_history5') and t2.name = 'test_boolean';
+if @Tmp is not null EXEC('alter table migtest_e_history5 drop constraint ' + @Tmp)$$;
+IF (OBJECT_ID('ck_migtest_e_history5_test_boolean', 'C') IS NOT NULL) alter table migtest_e_history5 drop constraint ck_migtest_e_history5_test_boolean;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history5','U') AND name = 'ix_migtest_e_history5_test_boolean') drop index ix_migtest_e_history5_test_boolean ON migtest_e_history5;
+IF OBJECT_ID('fk_migtest_e_history5_test_boolean', 'F') IS NOT NULL alter table migtest_e_history5 drop constraint fk_migtest_e_history5_test_boolean;
+alter table migtest_e_history5 drop column test_boolean;
+
 -- drop column migtest_e_softdelete.deleted;
 IF (OBJECT_ID('uq_migtest_e_softdelete_deleted', 'UQ') IS NOT NULL) alter table migtest_e_softdelete drop constraint uq_migtest_e_softdelete_deleted;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_softdelete','U') AND name = 'uq_migtest_e_softdelete_deleted') drop index uq_migtest_e_softdelete_deleted ON migtest_e_softdelete;

From d0fa3f0cb1c903fe186912750e428610b7ad885e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 21 May 2018 00:13:43 +1200
Subject: [PATCH 0248/1036] [maven-release-plugin] prepare release
 ebean-11.15.10

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 650e31711..f91253f9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.10-SNAPSHOT</version>
+  <version>11.15.10</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.15.10</tag>
   </scm>
 
   <profiles>

From f6d8c8b618d9d8cd7865a65dbd3a4fc477fe18b1 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 21 May 2018 00:13:59 +1200
Subject: [PATCH 0249/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f91253f9f..f78949cfa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.10</version>
+  <version>11.15.11-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.15.10</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 85d3caf07960957a2cef7596a713443087ea5bff Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 21 May 2018 00:29:04 +1200
Subject: [PATCH 0250/1036] #1367 - Modularized project cannot locate
 ebean.properties file on Java 10

---
 .../java/io/ebean/config/properties/LoadContext.java  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebean/config/properties/LoadContext.java b/src/main/java/io/ebean/config/properties/LoadContext.java
index 7ec6a8f38..e8a5fc729 100644
--- a/src/main/java/io/ebean/config/properties/LoadContext.java
+++ b/src/main/java/io/ebean/config/properties/LoadContext.java
@@ -37,7 +37,7 @@ class LoadContext {
 
     InputStream is = null;
     if (source == Loader.Source.RESOURCE) {
-      is = getClass().getResourceAsStream("/" + resourcePath);
+      is = resourceStream(resourcePath);
       if (is != null) {
         loadedResources.add(resourcePath);
       }
@@ -56,6 +56,15 @@ class LoadContext {
 		return is;
 	}
 
+  private InputStream resourceStream(String resourcePath) {
+    InputStream is = getClass().getResourceAsStream("/" + resourcePath);
+    if (is == null) {
+      // search the module path for top level resource
+      is =  ClassLoader.getSystemResourceAsStream(resourcePath);
+    }
+    return is;
+  }
+
   /**
    * Add a property entry.
    */

From 4b91f5fe0b9a76ec51f63a7d64943a04341fa08b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 21 May 2018 01:06:26 +1200
Subject: [PATCH 0251/1036] #1380 - Make javax.xml an optional dependency (as
 it is not part of JDK from 9 onwards)

---
 .../server/core/InternalConfigXmlRead.java    | 15 ++++----
 .../server/deploy/BeanDescriptorManager.java  | 13 +++----
 .../server/type/DefaultTypeManager.java       | 34 +++++++++++--------
 3 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlRead.java b/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlRead.java
index 8bb1b9be7..6bec6dc65 100644
--- a/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlRead.java
+++ b/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlRead.java
@@ -34,8 +34,9 @@ class InternalConfigXmlRead {
   InternalConfigXmlRead(ServerConfig serverConfig) {
     this.serverConfig = serverConfig;
     this.classLoader = serverConfig.getClassLoadConfig().getClassLoader();
-
-    init();
+    if (serverConfig.getClassLoadConfig().isJavaxJAXBPresent()) {
+      init();
+    }
   }
 
   private void init() {
@@ -73,10 +74,12 @@ class InternalConfigXmlRead {
    * Return the named queries for Dto beans.
    */
   Map<Class<?>, DtoNamedQueries> readDtoMapping() {
-    for (XmEbean mapping : xmlEbeanList) {
-      List<XmDto> dtoList = mapping.getDto();
-      for (XmDto dto : dtoList) {
-        readDtoMapping(dto);
+    if (xmlEbeanList != null) {
+      for (XmEbean mapping : xmlEbeanList) {
+        List<XmDto> dtoList = mapping.getDto();
+        for (XmDto dto : dtoList) {
+          readDtoMapping(dto);
+        }
       }
     }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 3c95f9515..91738c3ab 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -394,12 +394,13 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   }
 
   private void readXmlMapping(List<XmEbean> mappings) {
-    ClassLoader classLoader = serverConfig.getClassLoadConfig().getClassLoader();
-
-    for (XmEbean mapping : mappings) {
-      List<XmEntity> entityDeploy = mapping.getEntity();
-      for (XmEntity deploy : entityDeploy) {
-        readEntityMapping(classLoader, deploy);
+    if (mappings != null) {
+      ClassLoader classLoader = serverConfig.getClassLoadConfig().getClassLoader();
+      for (XmEbean mapping : mappings) {
+        List<XmEntity> entityDeploy = mapping.getEntity();
+        for (XmEntity deploy : entityDeploy) {
+          readEntityMapping(classLoader, deploy);
+        }
       }
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 036c9eea8..eebf80aca 100644
--- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -143,6 +143,8 @@ public final class DefaultTypeManager implements TypeManager {
 
   private final boolean java7Present;
 
+  private final boolean objectMapperPresent;
+
   private final boolean postgres;
 
   private final boolean offlineMigrationGeneration;
@@ -184,7 +186,7 @@ public final class DefaultTypeManager implements TypeManager {
     this.nativeMap = new ConcurrentHashMap<>();
     this.logicalMap = new ConcurrentHashMap<>();
 
-    boolean objectMapperPresent = config.getClassLoadConfig().isJacksonObjectMapperPresent();
+    this.objectMapperPresent = config.getClassLoadConfig().isJacksonObjectMapperPresent();
     this.objectMapper = (objectMapperPresent) ? initObjectMapper(config) : null;
 
     this.extraTypeFactory = new DefaultTypeFactory(config);
@@ -405,20 +407,22 @@ public final class DefaultTypeManager implements TypeManager {
       }
     }
 
-    if (type.equals(JsonNode.class)) {
-      switch (dbType) {
-        case Types.VARCHAR:
-          return jsonNodeVarchar;
-        case Types.BLOB:
-          return jsonNodeBlob;
-        case Types.CLOB:
-          return jsonNodeClob;
-        case DbPlatformType.JSONB:
-          return jsonNodeJsonb;
-        case DbPlatformType.JSON:
-          return jsonNodeJson;
-        default:
-          return jsonNodeJson;
+    if (objectMapperPresent) {
+      if (type.equals(JsonNode.class)) {
+        switch (dbType) {
+          case Types.VARCHAR:
+            return jsonNodeVarchar;
+          case Types.BLOB:
+            return jsonNodeBlob;
+          case Types.CLOB:
+            return jsonNodeClob;
+          case DbPlatformType.JSONB:
+            return jsonNodeJsonb;
+          case DbPlatformType.JSON:
+            return jsonNodeJson;
+          default:
+            return jsonNodeJson;
+        }
       }
     }
 

From a9a89938f94bf76480142b17981dacb8cdf7332f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 24 May 2018 00:06:18 +1200
Subject: [PATCH 0252/1036] #1368 - Remove unused resource -
 default-create-table.sql ... which is in ebean-migration

---
 .../migration-support/default-create-table.sql      | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 src/main/resources/migration-support/default-create-table.sql

diff --git a/src/main/resources/migration-support/default-create-table.sql b/src/main/resources/migration-support/default-create-table.sql
deleted file mode 100644
index ee399473a..000000000
--- a/src/main/resources/migration-support/default-create-table.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-create table ${table} (
-  id                           integer not null,
-  mtype                        varchar(1) not null,
-  mstatus                      varchar(10) not null,
-  mversion                     varchar(150) not null,
-  mcomment                     varchar(150) not null,
-  mchecksum                    integer not null,
-  run_on                       timestamp not null,
-  run_by                       varchar(30) not null,
-  run_time                     integer not null,
-  constraint pk_${table} primary key (id)
-);
-

From ae58d9223ac1e83357ee13e10f468f564e4f66c0 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 24 May 2018 00:07:30 +1200
Subject: [PATCH 0253/1036] No effective change - add test for
 PrimaryKeyJoinColumn - insertWithoutExtra

---
 .../TestOneToOnePrimaryKeyJoinOptional.java   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java b/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java
index 259991b85..38307fca0 100644
--- a/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java
+++ b/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java
@@ -21,6 +21,25 @@ public class TestOneToOnePrimaryKeyJoinOptional extends BaseTestCase {
     return prime;
   }
 
+  @Test
+  public void insertWithoutExtra() {
+
+    String desc = "" + System.currentTimeMillis();
+    OtoUPrime p1 = new OtoUPrime("u" + desc);
+    Ebean.save(p1);
+
+    Query<OtoUPrime> query = Ebean.find(OtoUPrime.class)
+      .setId(p1.getPid())
+      .fetch("extra", "eid");
+
+    OtoUPrime found = query.findOne();
+
+    if (found.getExtra() != null) {
+      found.getExtra().getExtra(); // fails here, because getExtra should be null
+    }
+    assertThat(found.getExtra()).isNull();
+  }
+
   @Test
   public void insertUpdateDelete() {
 

From 42d83705b79e31f24d2f6facd9f37ec06a23f746 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 24 May 2018 00:15:25 +1200
Subject: [PATCH 0254/1036] #1384 - Change MigrationXmlWriter to not write
 <!DOCTYPE xml> (as it is not needed/expected now)

---
 .../dbmigration/migrationreader/MigrationXmlWriter.java          | 1 -
 .../dbmigration/migrationtest/model/1.0__initial.model.xml       | 1 -
 src/test/resources/dbmigration/migrationtest/model/1.1.model.xml | 1 -
 .../dbmigration/migrationtest/model/1.2__dropsFor_1.1.model.xml  | 1 -
 src/test/resources/dbmigration/migrationtest/model/1.3.model.xml | 1 -
 .../dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml  | 1 -
 6 files changed, 6 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java b/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java
index 9b1152709..43d389b56 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java
@@ -29,7 +29,6 @@ public class MigrationXmlWriter {
     try (FileWriter writer = new FileWriter(file)) {
 
       writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n");
-      writer.write("<!DOCTYPE xml>\n");
       if (comment != null) {
         writer.write("<!-- ");
         writer.write(comment);
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
index 386d4410c..a41e37358 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!DOCTYPE xml>
 <migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
     <changeSet type="apply">
         <createTable name="migtest_ckey_assoc" pkName="pk_migtest_ckey_assoc">
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
index 86eff4a3a..1f437cb14 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!DOCTYPE xml>
 <migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
     <changeSet type="apply">
         <addColumn tableName="migtest_ckey_detail">
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.2__dropsFor_1.1.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.2__dropsFor_1.1.model.xml
index e60796068..59bf48a8f 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.2__dropsFor_1.1.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.2__dropsFor_1.1.model.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!DOCTYPE xml>
 <migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
     <changeSet type="apply" dropsFor="1.1">
         <dropColumn columnName="old_boolean" tableName="migtest_e_basic"/>
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
index 89fbcd07a..96cde72c8 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!DOCTYPE xml>
 <migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
     <changeSet type="apply">
         <alterForeignKey name="fk_migtest_ckey_detail_parent" columnNames="DROP FOREIGN KEY" indexName="ix_migtest_ckey_detail_parent" tableName="migtest_ckey_detail"/>
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml
index 506444d0b..d46dc6825 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!DOCTYPE xml>
 <migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
     <changeSet type="apply" dropsFor="1.3">
         <dropColumn columnName="one_key" tableName="migtest_ckey_detail"/>

From ed6a9e2dbbc82dd4f6f81fd9552ca06e1e6e6d61 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 27 May 2018 15:37:45 +1200
Subject: [PATCH 0255/1036] #1386 - ENH: For DbMigration generation - add
 support for setting version, name, generatePendingDrop, applyPrefix, ddl
 header

---
 .../io/ebean/config/DbMigrationConfig.java    | 15 +++--
 .../io/ebean/dbmigration/DbMigration.java     | 32 ++++++++++
 .../dbmigration/DefaultDbMigration.java       | 60 ++++++++++++++++++-
 3 files changed, 101 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/ebean/config/DbMigrationConfig.java b/src/main/java/io/ebean/config/DbMigrationConfig.java
index 3f6656768..7e47156b3 100644
--- a/src/main/java/io/ebean/config/DbMigrationConfig.java
+++ b/src/main/java/io/ebean/config/DbMigrationConfig.java
@@ -402,9 +402,20 @@ public class DbMigrationConfig {
    * You can use placeholders like ${version} or ${timestamp} in properties file.
    */
   public String getDdlHeader() {
+    if (ddlHeader != null && !ddlHeader.isEmpty()) {
+      ddlHeader = StringHelper.replaceString(ddlHeader, "${version}", EbeanVersion.getVersion());
+      ddlHeader = StringHelper.replaceString(ddlHeader, "${timestamp}", ZonedDateTime.now().format( DateTimeFormatter.ISO_INSTANT ));
+    }
     return ddlHeader;
   }
 
+  /**
+   * Set the header prepended to the DDL.
+   */
+  public void setDdlHeader(String ddlHeader) {
+    this.ddlHeader = ddlHeader;
+  }
+
   /**
    * Set migration versions that should have their checksum reset and not run.
    * <p>
@@ -475,10 +486,6 @@ public class DbMigrationConfig {
     String adminPwd = properties.get("datasource." + serverName + ".adminpassword", dbPassword);
     dbPassword = properties.get("migration.dbpassword", adminPwd);
     ddlHeader = properties.get("ddl.header", ddlHeader);
-    if (ddlHeader != null && !ddlHeader.isEmpty()) {
-      ddlHeader = StringHelper.replaceString(ddlHeader, "${version}", EbeanVersion.getVersion());
-      ddlHeader = StringHelper.replaceString(ddlHeader, "${timestamp}", ZonedDateTime.now().format( DateTimeFormatter.ISO_INSTANT ));
-    }
   }
 
   /**
diff --git a/src/main/java/io/ebean/dbmigration/DbMigration.java b/src/main/java/io/ebean/dbmigration/DbMigration.java
index cd9c122a0..582838e79 100644
--- a/src/main/java/io/ebean/dbmigration/DbMigration.java
+++ b/src/main/java/io/ebean/dbmigration/DbMigration.java
@@ -93,6 +93,38 @@ public interface DbMigration {
    */
   void setStrictMode(boolean strictMode);
 
+  /**
+   * Set to true to include a generated header comment in the DDL script.
+   */
+  void setIncludeGeneratedFileComment(boolean includeGeneratedFileComment);
+
+  /**
+   * Set the header that is included in the generated DDL script.
+   */
+  void setHeader(String header);
+
+  /**
+   * Set the prefix for the version. Set this to "V" for use with Flyway.
+   */
+  void setApplyPrefix(String applyPrefix);
+
+  /**
+   * Set the version of the migration to be generated.
+   */
+  void setVersion(String version);
+
+  /**
+   * Set the name of the migration to be generated.
+   */
+  void setName(String name);
+
+  /**
+   * Generate a migration for the version specified that contains pending drops.
+   *
+   * @param generatePendingDrop The version of a prior migration that holds pending drops.
+   */
+  void setGeneratePendingDrop(String generatePendingDrop);
+
   /**
    * Add an additional platform to write the migration DDL.
    * <p>
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index fe698ffba..bc81db030 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -91,6 +91,12 @@ public class DefaultDbMigration implements DbMigration {
   protected DbConstraintNaming constraintNaming;
 
   protected Boolean strictMode;
+  protected Boolean includeGeneratedFileComment;
+  protected String header;
+  protected String applyPrefix;
+  protected String version;
+  protected String name;
+  protected String generatePendingDrop;
 
   /**
    * Create for offline migration generation.
@@ -148,6 +154,36 @@ public class DefaultDbMigration implements DbMigration {
     this.strictMode = strictMode;
   }
 
+  @Override
+  public void setApplyPrefix(String applyPrefix) {
+    this.applyPrefix = applyPrefix;
+  }
+
+  @Override
+  public void setVersion(String version) {
+    this.version = version;
+  }
+
+  @Override
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  @Override
+  public void setGeneratePendingDrop(String generatePendingDrop) {
+    this.generatePendingDrop = generatePendingDrop;
+  }
+
+  @Override
+  public void setIncludeGeneratedFileComment(boolean includeGeneratedFileComment) {
+    this.includeGeneratedFileComment = includeGeneratedFileComment;
+  }
+
+  @Override
+  public void setHeader(String header) {
+    this.header = header;
+  }
+
   /**
    * Set the specific platform to generate DDL for.
    * <p>
@@ -512,8 +548,28 @@ public class DefaultDbMigration implements DbMigration {
       databasePlatform = server.getDatabasePlatform();
       logger.debug("set platform to {}", databasePlatform.getName());
     }
-    if (strictMode != null && migrationConfig != null) {
-      migrationConfig.setStrictMode(strictMode);
+    if (migrationConfig != null) {
+      if (strictMode != null) {
+        migrationConfig.setStrictMode(strictMode);
+      }
+      if (applyPrefix != null) {
+        migrationConfig.setApplyPrefix(applyPrefix);
+      }
+      if (header != null) {
+        migrationConfig.setDdlHeader(header);
+      }
+      if (includeGeneratedFileComment != null) {
+        migrationConfig.setIncludeGeneratedFileComment(includeGeneratedFileComment);
+      }
+      if (version != null) {
+        migrationConfig.setVersion(version);
+      }
+      if (name != null) {
+        migrationConfig.setName(name);
+      }
+      if (generatePendingDrop != null) {
+        migrationConfig.setGeneratePendingDrop(generatePendingDrop);
+      }
     }
   }
 

From fa4af4ef98ffbea716a3ce906065f7f36a8b80d9 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 27 May 2018 15:41:51 +1200
Subject: [PATCH 0256/1036] Revert "#1374 - Remove
 io.ebeaninternal.server.core.ServletContextListener - should be unused"

This reverts commit 95737cd3c56f9adab311510fab0b4e3bac020a7d.
---
 pom.xml                                       |  7 ++++
 .../server/core/ServletContextListener.java   | 32 +++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 src/main/java/io/ebeaninternal/server/core/ServletContextListener.java

diff --git a/pom.xml b/pom.xml
index f78949cfa..d4504864d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,6 +174,13 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
+      <scope>provided</scope>
+    </dependency>
+
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
diff --git a/src/main/java/io/ebeaninternal/server/core/ServletContextListener.java b/src/main/java/io/ebeaninternal/server/core/ServletContextListener.java
new file mode 100644
index 000000000..e77aa24f2
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/core/ServletContextListener.java
@@ -0,0 +1,32 @@
+package io.ebeaninternal.server.core;
+
+import io.ebeaninternal.server.lib.ShutdownManager;
+
+import javax.servlet.ServletContextEvent;
+
+/**
+ * Listens for webserver server starting and stopping events.
+ * <p>
+ * Register this listener in the web.xml configuration file. This will listen
+ * for startup and shutdown events.
+ * </p>
+ */
+public class ServletContextListener implements javax.servlet.ServletContextListener {
+
+  /**
+   * The servlet container is stopping.
+   */
+  @Override
+  public void contextDestroyed(ServletContextEvent event) {
+    ShutdownManager.shutdown();
+  }
+
+  /**
+   * Do nothing on startup.
+   */
+  @Override
+  public void contextInitialized(ServletContextEvent event) {
+
+  }
+
+}

From 2e36402a762193a9e2fd3b85ccda30429c09b5df Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 27 May 2018 15:54:32 +1200
Subject: [PATCH 0257/1036] #1387 - Revert #1374 and expose
 io.ebean.event.ServletContextListener (as public API)

---
 .../ebean/event/ServletContextListener.java   | 38 +++++++++++++++++++
 .../server/core/ServletContextListener.java   |  3 ++
 2 files changed, 41 insertions(+)
 create mode 100644 src/main/java/io/ebean/event/ServletContextListener.java

diff --git a/src/main/java/io/ebean/event/ServletContextListener.java b/src/main/java/io/ebean/event/ServletContextListener.java
new file mode 100644
index 000000000..d0b8b2222
--- /dev/null
+++ b/src/main/java/io/ebean/event/ServletContextListener.java
@@ -0,0 +1,38 @@
+package io.ebean.event;
+
+import io.ebeaninternal.server.lib.ShutdownManager;
+
+import javax.servlet.ServletContextEvent;
+
+/**
+ * Listens for webserver server starting and stopping events.
+ * <p>
+ * This should be used when the deployment is into a servlet container where the webapp
+ * can be shutdown or redeployed without the JVM stopping.
+ * </p>
+ * <p>
+ * If deployment is into a container where the JVM is completely shutdown (like spring boot,
+ * runnable war or when using a servlet container that only contains the single webapp and
+ * the JVM is shutdown then this isn't required. Instead we can just rely on the JVM shutdown
+ * hook that Ebean registers.
+ * </p>
+ */
+public class ServletContextListener implements javax.servlet.ServletContextListener {
+
+  /**
+   * The servlet container is stopping.
+   */
+  @Override
+  public void contextDestroyed(ServletContextEvent event) {
+    ShutdownManager.shutdown();
+  }
+
+  /**
+   * Do nothing on startup.
+   */
+  @Override
+  public void contextInitialized(ServletContextEvent event) {
+
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/core/ServletContextListener.java b/src/main/java/io/ebeaninternal/server/core/ServletContextListener.java
index e77aa24f2..260cfa296 100644
--- a/src/main/java/io/ebeaninternal/server/core/ServletContextListener.java
+++ b/src/main/java/io/ebeaninternal/server/core/ServletContextListener.java
@@ -5,12 +5,15 @@ import io.ebeaninternal.server.lib.ShutdownManager;
 import javax.servlet.ServletContextEvent;
 
 /**
+ * Deprecated - migrate to io.ebean.event.ServletContextListener.
+ * <p>
  * Listens for webserver server starting and stopping events.
  * <p>
  * Register this listener in the web.xml configuration file. This will listen
  * for startup and shutdown events.
  * </p>
  */
+@Deprecated
 public class ServletContextListener implements javax.servlet.ServletContextListener {
 
   /**

From bbd7baf1be6598fec400fa6a0b05f0a00938cf05 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 27 May 2018 17:33:26 +1200
Subject: [PATCH 0258/1036] #1388 - AutoTune - tuned query includes "null" as
 fetched property

---
 src/main/java/io/ebean/text/PathProperties.java            | 3 +--
 .../ebeaninternal/server/deploy/BeanPropertyAssocMany.java | 2 +-
 src/test/resources/ebean.properties                        | 7 ++++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/ebean/text/PathProperties.java b/src/main/java/io/ebean/text/PathProperties.java
index 174fe016b..116468d00 100644
--- a/src/main/java/io/ebean/text/PathProperties.java
+++ b/src/main/java/io/ebean/text/PathProperties.java
@@ -89,8 +89,7 @@ public class PathProperties implements FetchPath {
   }
 
   Props getProps(String path) {
-    Props props = pathMap.computeIfAbsent(path, p -> new Props(this, null, p));
-    return props;
+    return pathMap.computeIfAbsent(path, p -> new Props(this, null, p));
   }
 
   public Collection<Props> getPathProps() {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index d3c3e8e8f..f3bf893bc 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -157,7 +157,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     if (elementCollection) {
       targetDescriptor = elementDescriptor;
     } else {
-      targetDescriptor = descriptor.getBeanDescriptor(targetType);
+      super.initialiseTargetDescriptor(initContext);
     }
   }
 
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 33121aa37..40d0c41db 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -11,9 +11,10 @@
 
 ebean.encryptKeyManager=org.tests.basic.encrypt.BasicEncyptKeyManager
 
-#ebean.autotune.querytuning=true
-#ebean.autotune.profiling=true
-#ebean.autotune.profilingUpdateFrequency=5
+#ebean.disableL2Cache=true
+#ebean.autoTune.queryTuning=true
+#ebean.autoTune.profiling=true
+#ebean.autoTune.profilingUpdateFrequency=5
 
 ebean.ddl.generate=true
 ebean.ddl.run=true

From 33ec8abb9de172e91de219491358009dd4225883 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 27 May 2018 17:38:33 +1200
Subject: [PATCH 0259/1036] No effective change - update test remove unused
 exception

---
 .../java/org/tests/query/autotune/TestAutoTuneProfiling.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java b/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java
index d260b9582..4b4c7005c 100644
--- a/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java
+++ b/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java
@@ -17,7 +17,7 @@ public class TestAutoTuneProfiling extends BaseTestCase {
 
   @Ignore
   @Test
-  public void test() throws InterruptedException {
+  public void test() {
 
     ResetBasicData.reset();
 

From fb5eeb60b1e646f3815b8120dba0937c7b3f63d8 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 27 May 2018 19:19:37 +1200
Subject: [PATCH 0260/1036] [maven-release-plugin] prepare release
 ebean-11.15.11

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d4504864d..169a5a213 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.11-SNAPSHOT</version>
+  <version>11.15.11</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.15.11</tag>
   </scm>
 
   <profiles>

From 8ea86d6c6d6c8aa8c25bfa6ec79109192ba1484a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 27 May 2018 19:19:52 +1200
Subject: [PATCH 0261/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 169a5a213..2f47741d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.11</version>
+  <version>11.15.12-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.15.11</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 5a7f24da5dd92a5498b5edb491fb47dc1d69193a Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 28 May 2018 13:06:45 +0200
Subject: [PATCH 0262/1036] FIX: jsonRead of transient maps (#1389)

FIX: jsonRead of transient maps - to skip the read of start_array - Avoid error "Unexpected token start_object - expecting start_array "
---
 .../server/deploy/BeanPropertyAssocManyJsonHelp.java       | 7 ++++---
 .../java/org/tests/model/elementcollection/EcmPerson.java  | 5 +++++
 .../elementcollection/TestElementCollectionBasicMap.java   | 2 ++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java
index 11b3f74bc..247e113df 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java
@@ -46,15 +46,16 @@ class BeanPropertyAssocManyJsonHelp {
     if (JsonToken.VALUE_NULL == event) {
       return;
     }
-    if (JsonToken.START_ARRAY != event) {
-      throw new JsonParseException(parser, "Unexpected token " + event + " - expecting start_array ");
-    }
 
     if (many.isTransient()) {
       jsonReadTransientUsingObjectMapper(readJson, parentBean);
       return;
     }
 
+    if (JsonToken.START_ARRAY != event) {
+      throw new JsonParseException(parser, "Unexpected token " + event + " - expecting start_array");
+    }
+
     many.setValue(parentBean, many.jsonReadCollection(readJson, parentBean));
   }
 
diff --git a/src/test/java/org/tests/model/elementcollection/EcmPerson.java b/src/test/java/org/tests/model/elementcollection/EcmPerson.java
index fafb073e1..ec686d028 100644
--- a/src/test/java/org/tests/model/elementcollection/EcmPerson.java
+++ b/src/test/java/org/tests/model/elementcollection/EcmPerson.java
@@ -7,7 +7,9 @@ import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.MapKeyColumn;
+import javax.persistence.Transient;
 import javax.persistence.Version;
+
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -25,6 +27,9 @@ public class EcmPerson {
   @Column(name = "number", length = 10)
   Map<String, String> phoneNumbers = new LinkedHashMap<>();
 
+  @Transient
+  Map<String, String> transientPhoneNumbers;
+
   @Version
   long version;
 
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
index f03bf1933..a2e181892 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
@@ -5,6 +5,7 @@ import io.ebean.Ebean;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -137,6 +138,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase {
   }
 
   private void jsonToFrom(EcmPerson foundFirst) {
+    foundFirst.transientPhoneNumbers = new HashMap<>();
     String asJson = Ebean.json().toJson(foundFirst);
     EcmPerson fromJson = Ebean.json().toBean(EcmPerson.class, asJson);
 

From 141a0d9358d60a2b670a63510dc6ddf5f7b0433c Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 29 May 2018 00:35:31 +1200
Subject: [PATCH 0263/1036] #1390 - ENH: Support explicit @Id @GeneratedValue
 ... mapping (where absence of @GeneratedValue means externally supplied id
 values)

---
 .../java/io/ebean/config/ServerConfig.java    | 25 +++++++++++-
 .../server/deploy/BeanDescriptorManager.java  | 40 +++++++++++--------
 .../deploy/meta/DeployBeanDescriptor.java     | 19 +++++++++
 .../server/deploy/parse/AnnotationFields.java |  2 +
 .../io/ebean/config/ServerConfigTest.java     | 13 ++++++
 5 files changed, 82 insertions(+), 17 deletions(-)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 5b14d2bfc..222129a65 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -493,6 +493,11 @@ public class ServerConfig {
    */
   private List<String> mappingLocations = new ArrayList<>();
 
+  /**
+   * When true we do not need explicit GeneratedValue mapping.
+   */
+  private boolean idGeneratorAutomatic = true;
+
   /**
    * Construct a Server Configuration for programmatically creating an EbeanServer.
    */
@@ -1967,7 +1972,7 @@ public class ServerConfig {
    * This is the same as serverConfig.getMigrationConfig().setRunMigration(). We have added this method here
    * as it is often the only thing we need to configure for migrations.
    */
-  public void setRunMigration(boolean runMigration){
+  public void setRunMigration(boolean runMigration) {
     migrationConfig.setRunMigration(runMigration);
   }
 
@@ -2772,6 +2777,7 @@ public class ServerConfig {
     useJtaTransactionManager = p.getBoolean("useJtaTransactionManager", useJtaTransactionManager);
     useJavaxValidationNotNull = p.getBoolean("useJavaxValidationNotNull", useJavaxValidationNotNull);
     autoReadOnlyDataSource = p.getBoolean("autoReadOnlyDataSource", autoReadOnlyDataSource);
+    idGeneratorAutomatic = p.getBoolean("idGeneratorAutomatic", idGeneratorAutomatic);
 
     backgroundExecutorSchedulePoolSize = p.getInt("backgroundExecutorSchedulePoolSize", backgroundExecutorSchedulePoolSize);
     backgroundExecutorShutdownSecs = p.getInt("backgroundExecutorShutdownSecs", backgroundExecutorShutdownSecs);
@@ -3109,6 +3115,23 @@ public class ServerConfig {
     this.mappingLocations = mappingLocations;
   }
 
+  /**
+   * When false we need explicit <code>@GeneratedValue</code> mapping to assign
+   * Identity or Sequence generated values. When true Id properties are automatically
+   * assigned Identity or Sequence without the GeneratedValue mapping.
+   */
+  public boolean isIdGeneratorAutomatic() {
+    return idGeneratorAutomatic;
+  }
+
+  /**
+   * Set to false such that Id properties require explicit <code>@GeneratedValue</code>
+   * mapping before they are assigned Identity or Sequence generation based on platform.
+   */
+  public void setIdGeneratorAutomatic(boolean idGeneratorAutomatic) {
+    this.idGeneratorAutomatic = idGeneratorAutomatic;
+  }
+
   public enum UuidVersion {
     VERSION4,
     VERSION1,
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 91738c3ab..22dcf6ad5 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -1369,9 +1369,15 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
         desc.setIdType(IdType.EXTERNAL);
         return;
       }
-      // use the default. IDENTITY or SEQUENCE.
-      desc.setIdType(dbIdentity.getIdType());
-      desc.setIdTypePlatformDefault();
+      if (desc.isIdGeneratorAuto() || serverConfig.isIdGeneratorAutomatic()) {
+        // use IDENTITY or SEQUENCE based on platform
+        desc.setIdType(dbIdentity.getIdType());
+        desc.setIdTypePlatformDefault();
+      } else {
+        // externally/application supplied Id values
+        desc.setIdType(IdType.EXTERNAL);
+        return;
+      }
     }
 
     if (desc.getBaseTable() == null) {
@@ -1387,21 +1393,23 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
       return;
     }
 
-    String seqName = desc.getIdGeneratorName();
-    if (seqName != null) {
-      logger.debug("explicit sequence {} on {}", seqName, desc.getFullName());
-    } else {
-      String primaryKeyColumn = desc.getSinglePrimaryKeyColumn();
-      // use namingConvention to define sequence name
-      seqName = namingConvention.getSequenceName(desc.getBaseTable(), primaryKeyColumn);
-    }
+    if (IdType.SEQUENCE == desc.getIdType()) {
+      String seqName = desc.getIdGeneratorName();
+      if (seqName != null) {
+        logger.debug("explicit sequence {} on {}", seqName, desc.getFullName());
+      } else {
+        String primaryKeyColumn = desc.getSinglePrimaryKeyColumn();
+        // use namingConvention to define sequence name
+        seqName = namingConvention.getSequenceName(desc.getBaseTable(), primaryKeyColumn);
+      }
 
-    if (databasePlatform.isSequenceBatchMode()) {
-      // use sequence next step 1 as we are going to batch fetch them instead
-      desc.setSequenceAllocationSize(1);
+      if (databasePlatform.isSequenceBatchMode()) {
+        // use sequence next step 1 as we are going to batch fetch them instead
+        desc.setSequenceAllocationSize(1);
+      }
+      int stepSize = desc.getSequenceAllocationSize();
+      desc.setIdGenerator(createSequenceIdGenerator(seqName, stepSize));
     }
-    int stepSize = desc.getSequenceAllocationSize();
-    desc.setIdGenerator(createSequenceIdGenerator(seqName, stepSize));
   }
 
   private PlatformIdGenerator createSequenceIdGenerator(String seqName, int stepSize) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index 1855dee14..98d878a56 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -106,6 +106,11 @@ public class DeployBeanDescriptor<T> {
 
   private PlatformIdGenerator idGenerator;
 
+  /**
+   * Set true when explicit auto generated Id.
+   */
+  private boolean idGeneratorAuto;
+
   /**
    * The database sequence name (optional).
    */
@@ -848,6 +853,20 @@ public class DeployBeanDescriptor<T> {
     }
   }
 
+  /**
+   * Return true for automatic Id generation strategy.
+   */
+  public boolean isIdGeneratorAuto() {
+    return idGeneratorAuto;
+  }
+
+  /**
+   * Set when GeneratedValue explicitly mapped on Id property.
+   */
+  public void setGeneratedAuto() {
+    this.idGeneratorAuto = true;
+  }
+
   /**
    * Assign the standard UUID generator.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
index 4be082b93..c1e3ca89b 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
@@ -547,6 +547,8 @@ public class AnnotationFields extends AnnotationParser {
         descriptor.setCustomIdGenerator(idGenerator);
       } else if (prop.getPropertyType().equals(UUID.class)) {
         descriptor.setUuidGenerator();
+      } else {
+        descriptor.setGeneratedAuto();
       }
     }
   }
diff --git a/src/test/java/io/ebean/config/ServerConfigTest.java b/src/test/java/io/ebean/config/ServerConfigTest.java
index b404b7451..fc24bc40c 100644
--- a/src/test/java/io/ebean/config/ServerConfigTest.java
+++ b/src/test/java/io/ebean/config/ServerConfigTest.java
@@ -66,6 +66,7 @@ public class ServerConfigTest {
     props.setProperty("idType", "SEQUENCE");
     props.setProperty("mappingLocations", "classpath:/foo;bar");
     props.setProperty("namingConvention", "io.ebean.config.MatchingNamingConvention");
+    props.setProperty("idGeneratorAutomatic", "true");
 
 
     serverConfig.loadFromProperties(props);
@@ -74,6 +75,8 @@ public class ServerConfigTest {
     assertTrue(serverConfig.isNotifyL2CacheInForeground());
     assertTrue(serverConfig.isDbOffline());
     assertTrue(serverConfig.isAutoReadOnlyDataSource());
+    assertTrue(serverConfig.isIdGeneratorAutomatic());
+
     assertThat(serverConfig.getNamingConvention()).isInstanceOf(MatchingNamingConvention.class);
 
     assertEquals(IdType.SEQUENCE, serverConfig.getIdType());
@@ -108,4 +111,14 @@ public class ServerConfigTest {
     assertEquals(PersistBatch.ALL, serverConfig.getPersistBatch());
     assertEquals(PersistBatch.ALL, serverConfig.getPersistBatchOnCascade());
   }
+
+  @Test
+  public void test_defaults() {
+
+    ServerConfig serverConfig = new ServerConfig();
+    assertTrue(serverConfig.isIdGeneratorAutomatic());
+
+    serverConfig.setIdGeneratorAutomatic(false);
+    assertFalse(serverConfig.isIdGeneratorAutomatic());
+  }
 }

From 896f7d9ea83d83b3db07d600a987418c00bab5f0 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 29 May 2018 00:38:41 +1200
Subject: [PATCH 0264/1036] No effective change - improve error message when
 entity not registered to include entity annotation question

---
 .../ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index 4be0a3ad1..5f792e670 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -184,7 +184,7 @@ public class AnnotationAssocOnes extends AnnotationParser {
   }
 
   private String errorMsgMissingBeanTable(Class<?> type, String from) {
-    return "Error with association to [" + type + "] from [" + from + "]. Is " + type + " registered?";
+    return "Error with association to [" + type + "] from [" + from + "]. Is " + type + " registered? Does it have the @Entity annotation?";
   }
 
   private BeanTable beanTable(DeployBeanPropertyAssoc<?> prop) {

From 37b6a321ab88ce7f1a00515651fbc44daabab35c Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 29 May 2018 00:44:22 +1200
Subject: [PATCH 0265/1036] [maven-release-plugin] prepare release
 ebean-11.15.12

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2f47741d4..a57750def 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.12-SNAPSHOT</version>
+  <version>11.15.12</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.15.12</tag>
   </scm>
 
   <profiles>

From c57af29fcaa1f17116a3dcb5f22071900c135251 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 29 May 2018 00:44:36 +1200
Subject: [PATCH 0266/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a57750def..d32f7c64f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.12</version>
+  <version>11.15.13-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.15.12</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From bccb9f8ddb8f4c0c89f8c05012cc9d4d825c4a9d Mon Sep 17 00:00:00 2001
From: chrishartl <christian.ch@gmx.de>
Date: Mon, 28 May 2018 16:25:39 +0200
Subject: [PATCH 0267/1036] Fix/create reference with descriptor using
 inheritance (#13)

* FIXED: Discriminator must be ask for inherited classes

* Fixed: Compile

* Refactoring and Testing
---
 .../server/deploy/BeanDescriptor.java         | 20 ++++++--
 .../server/deploy/BeanDescriptorTest.java     | 28 +++++++++++
 .../tests/inheritance/OrganizationNode.java   | 49 +++++++++++++++++++
 .../inheritance/OrganizationTreeNode.java     | 45 +++++++++++++++++
 .../tests/inheritance/OrganizationUnit.java   | 20 ++++++++
 .../inheritance/TestTreeOrganisations.java    | 25 ++++++++++
 6 files changed, 183 insertions(+), 4 deletions(-)
 create mode 100644 src/test/java/org/tests/inheritance/OrganizationNode.java
 create mode 100644 src/test/java/org/tests/inheritance/OrganizationTreeNode.java
 create mode 100644 src/test/java/org/tests/inheritance/OrganizationUnit.java
 create mode 100644 src/test/java/org/tests/inheritance/TestTreeOrganisations.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 0a75df76c..610b63c03 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -1922,6 +1922,17 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return createEntityBean();
   }
 
+  /**
+   * We actually need to do a query because we don't know the type without the discriminator
+   * value, just select the id property and discriminator column (auto added)
+   */
+  private T findReferenceBean(Object id) {
+      DefaultOrmQuery<T> query = new DefaultOrmQuery<>(this, ebeanServer, ebeanServer.getExpressionFactory());
+      return query
+    		  //.select(getIdProperty().getName()) we do not select the id because we probably have to load the entire bean
+    		  .setId(id).findOne();
+  }
+  
   /**
    * Create a reference bean based on the id.
    */
@@ -1941,6 +1952,10 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
       }
     }
     try {
+     if (inheritInfo != null && !inheritInfo.isConcrete()) {
+    	return findReferenceBean(id);
+      }
+      
       EntityBean eb = createEntityBean();
       id = convertSetId(id, eb);
 
@@ -1974,10 +1989,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
 
     try {
       if (inheritInfo != null && !inheritInfo.isConcrete()) {
-        // we actually need to do a query because we don't know the type without the discriminator
-        // value, just select the id property and discriminator column (auto added)
-        DefaultOrmQuery<T> query = new DefaultOrmQuery<>(this, ebeanServer, ebeanServer.getExpressionFactory());
-        return query.select(getIdProperty().getName()).setId(id).findOne();
+      	return findReferenceBean(id);
       }
 
       EntityBean eb = createEntityBean();
diff --git a/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java b/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java
index fa9762127..daf8c7544 100644
--- a/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java
+++ b/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java
@@ -1,10 +1,15 @@
 package io.ebeaninternal.server.deploy;
 
 import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
 import io.ebean.bean.EntityBean;
 import io.ebean.plugin.Property;
 import org.junit.Test;
+import org.tests.model.basic.Animal;
+import org.tests.model.basic.AnimalShelter;
+import org.tests.model.basic.Cat;
 import org.tests.model.basic.Customer;
+import org.tests.model.basic.Dog;
 import org.tests.model.basic.Order;
 
 import java.util.Collection;
@@ -46,6 +51,29 @@ public class BeanDescriptorTest extends BaseTestCase {
     Customer bean = customerDesc.createReference(Boolean.FALSE, true, 42, null);
     assertThat(server().getBeanState(bean).isDisableLazyLoad()).isTrue();
   }
+  
+  @Test
+  public void createReference_with_inheritance() {
+    Cat cat = new Cat();
+    cat.setName("Puss");
+    Ebean.save(cat);
+
+    Dog dog = new Dog();
+    dog.setRegistrationNumber("DOGGIE");
+    Ebean.save(dog);
+
+    AnimalShelter shelter = new AnimalShelter();
+    shelter.setName("My Animal Shelter");
+    shelter.getAnimals().add(cat);
+    shelter.getAnimals().add(dog);
+
+    Ebean.save(shelter);
+
+    BeanDescriptor<Animal> animalDesc = spiEbeanServer().getBeanDescriptor(Animal.class);
+
+    Animal bean = animalDesc.createReference(Boolean.FALSE, false, dog.getId(), null);
+    assertThat(bean.getId()).isEqualTo(dog.getId());
+  }
 
   @Test
   public void allProperties() {
diff --git a/src/test/java/org/tests/inheritance/OrganizationNode.java b/src/test/java/org/tests/inheritance/OrganizationNode.java
new file mode 100644
index 000000000..3582a7b7d
--- /dev/null
+++ b/src/test/java/org/tests/inheritance/OrganizationNode.java
@@ -0,0 +1,49 @@
+package org.tests.inheritance;
+
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.OneToOne;
+import javax.validation.constraints.NotNull;
+
+import io.ebean.annotation.Index;
+
+/**
+ * Model class to reference an organization node.
+ *
+ * @author Christian Hartl, FOCONIS AG
+ */
+@Entity
+@MappedSuperclass
+@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
+@DiscriminatorColumn(name = "kind")
+@Index(unique = false, columnNames = "kind")
+public abstract class OrganizationNode {
+
+	@Id
+	private Long id;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	@OneToOne(cascade = {})
+	@NotNull
+	private OrganizationTreeNode parentTreeNode;
+
+	public OrganizationTreeNode getParentTreeNode() {
+		return parentTreeNode;
+	}
+
+	public void setParentTreeNode(OrganizationTreeNode parentTreeNode) {
+		this.parentTreeNode = parentTreeNode;
+	}
+
+}
diff --git a/src/test/java/org/tests/inheritance/OrganizationTreeNode.java b/src/test/java/org/tests/inheritance/OrganizationTreeNode.java
new file mode 100644
index 000000000..ebcac89ea
--- /dev/null
+++ b/src/test/java/org/tests/inheritance/OrganizationTreeNode.java
@@ -0,0 +1,45 @@
+package org.tests.inheritance;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.validation.constraints.NotNull;
+
+import io.ebean.annotation.PrivateOwned;
+
+/**
+ * Model class to reference an organization tree node.
+ *
+ * @author Christian Hartl, FOCONIS AG
+ */
+@Entity
+public class OrganizationTreeNode {
+
+	@Id
+	private Long id;
+
+	@OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "parentTreeNode")
+	@NotNull
+	@PrivateOwned
+	private OrganizationNode organizationNode;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public OrganizationNode getOrganizationNode() {
+		return organizationNode;
+	}
+
+	public void setOrganizationNode(OrganizationNode organizationNode) {
+		this.organizationNode = organizationNode;
+	}
+
+
+}
diff --git a/src/test/java/org/tests/inheritance/OrganizationUnit.java b/src/test/java/org/tests/inheritance/OrganizationUnit.java
new file mode 100644
index 000000000..19814855f
--- /dev/null
+++ b/src/test/java/org/tests/inheritance/OrganizationUnit.java
@@ -0,0 +1,20 @@
+package org.tests.inheritance;
+
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+
+@Entity
+@DiscriminatorValue("Unit")
+public class OrganizationUnit extends OrganizationNode {
+	
+	private String title;
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/tests/inheritance/TestTreeOrganisations.java b/src/test/java/org/tests/inheritance/TestTreeOrganisations.java
new file mode 100644
index 000000000..2875a9634
--- /dev/null
+++ b/src/test/java/org/tests/inheritance/TestTreeOrganisations.java
@@ -0,0 +1,25 @@
+package org.tests.inheritance;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class TestTreeOrganisations extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    OrganizationTreeNode treeNode = new  OrganizationTreeNode();
+    OrganizationNode node = new OrganizationUnit();
+    
+    treeNode.setOrganizationNode(node);
+    Ebean.save(treeNode);
+
+    treeNode = Ebean.find(OrganizationTreeNode.class, treeNode.getId());
+    assertEquals(node, treeNode.getOrganizationNode());
+
+  }
+}

From c5329e9db0c27d34ef4ec3784dd2d9b1f237ecc6 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 28 May 2018 17:05:52 +0200
Subject: [PATCH 0268/1036] reformatting

---
 .../server/deploy/BeanDescriptor.java         | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 610b63c03..f0a5d6a9f 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -1926,11 +1926,14 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * We actually need to do a query because we don't know the type without the discriminator
    * value, just select the id property and discriminator column (auto added)
    */
-  private T findReferenceBean(Object id) {
-      DefaultOrmQuery<T> query = new DefaultOrmQuery<>(this, ebeanServer, ebeanServer.getExpressionFactory());
-      return query
-    		  //.select(getIdProperty().getName()) we do not select the id because we probably have to load the entire bean
-    		  .setId(id).findOne();
+  private T findReferenceBean(Object id, PersistenceContext pc) {
+    DefaultOrmQuery<T> query = new DefaultOrmQuery<>(this, ebeanServer, ebeanServer.getExpressionFactory());
+    query.setPersistenceContext(pc);
+    return query
+        // .select(getIdProperty().getName())
+        // we do not select the id because we
+        // probably have to load the entire bean
+        .setId(id).findOne();
   }
   
   /**
@@ -1952,10 +1955,10 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
       }
     }
     try {
-     if (inheritInfo != null && !inheritInfo.isConcrete()) {
-    	return findReferenceBean(id);
+      if (inheritInfo != null && !inheritInfo.isConcrete()) {
+        return findReferenceBean(id, pc);
       }
-      
+
       EntityBean eb = createEntityBean();
       id = convertSetId(id, eb);
 
@@ -1989,7 +1992,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
 
     try {
       if (inheritInfo != null && !inheritInfo.isConcrete()) {
-      	return findReferenceBean(id);
+        return findReferenceBean(id, pc);
       }
 
       EntityBean eb = createEntityBean();

From 21e87e12cbdda454fee328d91b5de20671a3ca32 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 29 May 2018 13:38:17 +1200
Subject: [PATCH 0269/1036] Adjust test for #1391 ... such that
 OrganizationTreeNode has at least one db column as part of insert (for PG)

---
 .../org/tests/inheritance/OrganizationTreeNode.java  | 12 +++++++++++-
 .../org/tests/inheritance/TestTreeOrganisations.java |  7 +++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/tests/inheritance/OrganizationTreeNode.java b/src/test/java/org/tests/inheritance/OrganizationTreeNode.java
index ebcac89ea..ae8d4b4a6 100644
--- a/src/test/java/org/tests/inheritance/OrganizationTreeNode.java
+++ b/src/test/java/org/tests/inheritance/OrganizationTreeNode.java
@@ -20,6 +20,8 @@ public class OrganizationTreeNode {
 	@Id
 	private Long id;
 
+	private String name;
+
 	@OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "parentTreeNode")
 	@NotNull
 	@PrivateOwned
@@ -33,7 +35,15 @@ public class OrganizationTreeNode {
 		this.id = id;
 	}
 
-	public OrganizationNode getOrganizationNode() {
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public OrganizationNode getOrganizationNode() {
 		return organizationNode;
 	}
 
diff --git a/src/test/java/org/tests/inheritance/TestTreeOrganisations.java b/src/test/java/org/tests/inheritance/TestTreeOrganisations.java
index 2875a9634..3bdc08d8a 100644
--- a/src/test/java/org/tests/inheritance/TestTreeOrganisations.java
+++ b/src/test/java/org/tests/inheritance/TestTreeOrganisations.java
@@ -13,8 +13,11 @@ public class TestTreeOrganisations extends BaseTestCase {
   public void test() {
 
     OrganizationTreeNode treeNode = new  OrganizationTreeNode();
-    OrganizationNode node = new OrganizationUnit();
-    
+    treeNode.setName("tree");
+
+    OrganizationUnit node = new OrganizationUnit();
+    node.setTitle("node");
+
     treeNode.setOrganizationNode(node);
     Ebean.save(treeNode);
 

From 9a096e272e62aad3a1a417058b628127d1800356 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 29 May 2018 15:24:32 +1200
Subject: [PATCH 0270/1036] #1392 - MergeOptionsBuilder setClientGeneratedIds()
 ... should not be required if the Id property does not have Identity/Sequence
 generator assigned

---
 .../server/deploy/BeanDescriptor.java         | 15 ++++++-
 .../server/deploy/BeanDescriptorManager.java  |  2 +-
 .../deploy/meta/DeployBeanDescriptor.java     | 10 ++---
 .../server/deploy/parse/AnnotationFields.java |  7 ++--
 .../server/persist/MergeHandler.java          |  2 +-
 .../server/deploy/BeanDescriptorTest.java     | 41 ++++++++++++++++++-
 src/test/java/org/tests/merge/MBase.java      |  3 +-
 .../java/org/tests/model/basic/Contact.java   |  3 +-
 .../java/org/tests/model/bridge/BSite.java    |  3 +-
 9 files changed, 69 insertions(+), 17 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index f0a5d6a9f..807fbf16b 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -152,6 +152,11 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    */
   private final IdType idType;
 
+  /**
+   * Set when Id property is marked with GeneratedValue annotation.
+   */
+  private final boolean idGeneratedValue;
+
   private final boolean idTypePlatformDefault;
 
   private final PlatformIdGenerator idGenerator;
@@ -450,6 +455,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
 
     this.defaultSelectClause = deploy.getDefaultSelectClause();
     this.idType = deploy.getIdType();
+    this.idGeneratedValue = deploy.isIdGeneratedValue();
     this.idTypePlatformDefault = deploy.isIdTypePlatformDefault();
     this.idGenerator = deploy.getIdGenerator();
     this.sequenceName = deploy.getSequenceName();
@@ -1935,7 +1941,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
         // probably have to load the entire bean
         .setId(id).findOne();
   }
-  
+
   /**
    * Create a reference bean based on the id.
    */
@@ -2999,6 +3005,13 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return idType;
   }
 
+  /**
+   * Return true if the Id value is marked as a <code>@GeneratedValue</code>.
+   */
+  public boolean isIdGeneratedValue() {
+    return idGeneratedValue;
+  }
+
   /**
    * Return true if the identity is the platform default (not explicitly set).
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 22dcf6ad5..a82974fa4 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -1369,7 +1369,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
         desc.setIdType(IdType.EXTERNAL);
         return;
       }
-      if (desc.isIdGeneratorAuto() || serverConfig.isIdGeneratorAutomatic()) {
+      if (desc.isIdGeneratedValue() || serverConfig.isIdGeneratorAutomatic()) {
         // use IDENTITY or SEQUENCE based on platform
         desc.setIdType(dbIdentity.getIdType());
         desc.setIdTypePlatformDefault();
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index 98d878a56..199b7a90b 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -109,7 +109,7 @@ public class DeployBeanDescriptor<T> {
   /**
    * Set true when explicit auto generated Id.
    */
-  private boolean idGeneratorAuto;
+  private boolean idGeneratedValue;
 
   /**
    * The database sequence name (optional).
@@ -856,15 +856,15 @@ public class DeployBeanDescriptor<T> {
   /**
    * Return true for automatic Id generation strategy.
    */
-  public boolean isIdGeneratorAuto() {
-    return idGeneratorAuto;
+  public boolean isIdGeneratedValue() {
+    return idGeneratedValue;
   }
 
   /**
    * Set when GeneratedValue explicitly mapped on Id property.
    */
-  public void setGeneratedAuto() {
-    this.idGeneratorAuto = true;
+  public void setIdGeneratedValue() {
+    this.idGeneratedValue = true;
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
index c1e3ca89b..4b1b28b69 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
@@ -322,7 +322,7 @@ public class AnnotationFields extends AnnotationParser {
       prop.setDbLength(length.value());
     }
 
-    io.ebean.annotation.NotNull nonNull  = get(prop, io.ebean.annotation.NotNull.class);
+    io.ebean.annotation.NotNull nonNull = get(prop, io.ebean.annotation.NotNull.class);
     if (nonNull != null) {
       prop.setNullable(false);
     }
@@ -389,7 +389,7 @@ public class AnnotationFields extends AnnotationParser {
 
     Set<DbMigration> dbMigration = getAll(prop, DbMigration.class);
     dbMigration.forEach(ann -> prop.addDbMigrationInfo(
-       new DbMigrationInfo(ann.preAdd(), ann.postAdd(), ann.preAlter(), ann.postAlter(), ann.platforms())));
+      new DbMigrationInfo(ann.preAdd(), ann.postAdd(), ann.preAlter(), ann.postAlter(), ann.platforms())));
   }
 
   private void addIndex(DeployBeanProperty prop, Index index) {
@@ -515,6 +515,7 @@ public class AnnotationFields extends AnnotationParser {
 
   private void readGenValue(GeneratedValue gen, DeployBeanProperty prop) {
 
+    descriptor.setIdGeneratedValue();
     String genName = gen.generator();
 
     SequenceGenerator sequenceGenerator = find(prop, SequenceGenerator.class);
@@ -547,8 +548,6 @@ public class AnnotationFields extends AnnotationParser {
         descriptor.setCustomIdGenerator(idGenerator);
       } else if (prop.getPropertyType().equals(UUID.class)) {
         descriptor.setUuidGenerator();
-      } else {
-        descriptor.setGeneratedAuto();
       }
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java b/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java
index c82febba7..ddd34e527 100644
--- a/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java
@@ -51,7 +51,7 @@ class MergeHandler {
   List<EntityBean> merge() {
 
     Set<String> paths = options.paths();
-    if (paths.isEmpty() && !options.isClientGeneratedIds()) {
+    if (desc.isIdGeneratedValue() && paths.isEmpty() && !options.isClientGeneratedIds()) {
       // just do a single insert or update based on Id value present
       Object id = desc.getId(bean);
       if (id != null) {
diff --git a/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java b/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java
index daf8c7544..d4cbcbfbf 100644
--- a/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java
+++ b/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java
@@ -8,9 +8,13 @@ import org.junit.Test;
 import org.tests.model.basic.Animal;
 import org.tests.model.basic.AnimalShelter;
 import org.tests.model.basic.Cat;
+import org.tests.model.basic.Contact;
+import org.tests.model.basic.Country;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Dog;
 import org.tests.model.basic.Order;
+import org.tests.model.bridge.BSite;
+import org.tests.model.bridge.BUser;
 
 import java.util.Collection;
 
@@ -18,7 +22,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class BeanDescriptorTest extends BaseTestCase {
 
-  BeanDescriptor<Customer> customerDesc = spiEbeanServer().getBeanDescriptor(Customer.class);
+  private BeanDescriptor<Customer> customerDesc = spiEbeanServer().getBeanDescriptor(Customer.class);
 
   @Test
   public void createReference() {
@@ -51,7 +55,7 @@ public class BeanDescriptorTest extends BaseTestCase {
     Customer bean = customerDesc.createReference(Boolean.FALSE, true, 42, null);
     assertThat(server().getBeanState(bean).isDisableLazyLoad()).isTrue();
   }
-  
+
   @Test
   public void createReference_with_inheritance() {
     Cat cat = new Cat();
@@ -98,4 +102,37 @@ public class BeanDescriptorTest extends BaseTestCase {
     assertThat(to.getName()).isEqualTo("rob");
   }
 
+  @Test
+  public void isIdTypeExternal_when_externalId() {
+
+    BeanDescriptor<Country> countryDesc = spiEbeanServer().getBeanDescriptor(Country.class);
+    assertThat(countryDesc.isIdGeneratedValue()).isFalse();
+  }
+
+  @Test
+  public void isIdTypeExternal_when_platformGenerator_noGeneratedValueAnnotation() {
+
+    assertThat(customerDesc.isIdGeneratedValue()).isFalse();
+  }
+
+  @Test
+  public void isIdTypeExternal_when_explicitGeneratedValue() {
+
+    BeanDescriptor<Contact> desc = spiEbeanServer().getBeanDescriptor(Contact.class);
+    assertThat(desc.isIdGeneratedValue()).isTrue();
+  }
+
+  @Test
+  public void isIdTypeExternal_when_uuidGenerator_and_generatedValue() {
+
+    BeanDescriptor<BSite> desc = spiEbeanServer().getBeanDescriptor(BSite.class);
+    assertThat(desc.isIdGeneratedValue()).isTrue();
+  }
+
+  @Test
+  public void isIdTypeExternal_when_uuidGenerator_and_noGeneratedValue() {
+
+    BeanDescriptor<BUser> desc = spiEbeanServer().getBeanDescriptor(BUser.class);
+    assertThat(desc.isIdGeneratedValue()).isFalse();
+  }
 }
diff --git a/src/test/java/org/tests/merge/MBase.java b/src/test/java/org/tests/merge/MBase.java
index 0172e9893..c0daf222e 100644
--- a/src/test/java/org/tests/merge/MBase.java
+++ b/src/test/java/org/tests/merge/MBase.java
@@ -1,5 +1,6 @@
 package org.tests.merge;
 
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.MappedSuperclass;
 import javax.persistence.Version;
@@ -8,7 +9,7 @@ import java.util.UUID;
 @MappedSuperclass
 public class MBase {
 
-  @Id
+  @Id @GeneratedValue
   private UUID id;
 
   @Version
diff --git a/src/test/java/org/tests/model/basic/Contact.java b/src/test/java/org/tests/model/basic/Contact.java
index 402a4fc2a..be3c82f97 100644
--- a/src/test/java/org/tests/model/basic/Contact.java
+++ b/src/test/java/org/tests/model/basic/Contact.java
@@ -9,6 +9,7 @@ import io.ebean.annotation.Index;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
@@ -25,7 +26,7 @@ import java.util.List;
 @Cache(naturalKey = "email")
 public class Contact {
 
-  @Id
+  @Id @GeneratedValue
   int id;
 
   @Size(max=127)
diff --git a/src/test/java/org/tests/model/bridge/BSite.java b/src/test/java/org/tests/model/bridge/BSite.java
index 9e61f255b..2023a8c4b 100644
--- a/src/test/java/org/tests/model/bridge/BSite.java
+++ b/src/test/java/org/tests/model/bridge/BSite.java
@@ -1,13 +1,14 @@
 package org.tests.model.bridge;
 
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import java.util.UUID;
 
 @Entity
 public class BSite {
 
-  @Id
+  @Id @GeneratedValue
   UUID id;
 
   String name;

From 66c08e663eaee182e5d37ec5235e4210030cf5b5 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 29 May 2018 15:25:38 +1200
Subject: [PATCH 0271/1036] #1392 - MergeHandler, change regex Pattern to be
 static

---
 src/main/java/io/ebeaninternal/server/persist/MergeHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java b/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java
index ddd34e527..d8bcba0ee 100644
--- a/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java
@@ -26,7 +26,7 @@ import java.util.regex.Pattern;
  */
 class MergeHandler {
 
-  private final Pattern PATH_SPLIT = Pattern.compile("\\.");
+  private static final Pattern PATH_SPLIT = Pattern.compile("\\.");
 
   private final SpiEbeanServer server;
   private final BeanDescriptor<?> desc;

From d8e67d09a9a3f8ca4580f45627108a6f32340572 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 29 May 2018 15:30:39 +1200
Subject: [PATCH 0272/1036] #1393 - MergeOptionsBuilder build() return
 MergeOptions interface type

---
 src/main/java/io/ebean/MergeOptionsBuilder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/ebean/MergeOptionsBuilder.java b/src/main/java/io/ebean/MergeOptionsBuilder.java
index c17b2d88d..10365346c 100644
--- a/src/main/java/io/ebean/MergeOptionsBuilder.java
+++ b/src/main/java/io/ebean/MergeOptionsBuilder.java
@@ -47,7 +47,7 @@ public class MergeOptionsBuilder {
   /**
    * Build and return the MergeOptions instance.
    */
-  public MOptions build() {
+  public MergeOptions build() {
     return new MOptions(paths, clientGeneratedIds, deletePermanent);
   }
 

From af030e3da409df5640d117a6a063c04df81c4f6c Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 30 May 2018 03:31:32 +1200
Subject: [PATCH 0273/1036] #1394 #1395 - ENH: Add addBatch() and
 executeBatch() to SqlUpdate ... alternative to changing transaction batch
 mode enhancement

ENH: Add merge() API (using default merge options) to EbeanServer, Ebean and BeanRepository enhancement
---
 src/main/java/io/ebean/BeanRepository.java    | 24 ++++++
 src/main/java/io/ebean/Ebean.java             |  9 ++
 src/main/java/io/ebean/EbeanServer.java       |  7 ++
 .../java/io/ebean/MergeOptionsBuilder.java    | 17 +++-
 src/main/java/io/ebean/SqlUpdate.java         | 55 ++++++++++--
 .../io/ebeaninternal/api/SpiEbeanServer.java  | 11 +++
 .../server/core/DefaultServer.java            | 17 ++++
 .../server/core/DefaultSqlUpdate.java         | 51 ++++++++++-
 .../server/core/PersistRequestUpdateSql.java  | 20 ++++-
 .../ebeaninternal/server/core/Persister.java  | 11 +++
 .../server/deploy/BeanDescriptor.java         |  4 +-
 .../server/deploy/BeanPropertyAssocMany.java  | 42 ++++++++-
 .../server/deploy/IntersectionBuilder.java    | 85 +++++++++++++++++++
 .../server/deploy/IntersectionRow.java        | 14 +--
 .../server/deploy/IntersectionTable.java      | 34 ++++++++
 .../server/deploy/id/ImportedId.java          | 11 +++
 .../server/deploy/id/ImportedIdEmbedded.java  | 23 ++++-
 .../server/deploy/id/ImportedIdSimple.java    | 15 ++++
 .../server/persist/BatchControl.java          |  8 ++
 .../server/persist/BatchedPstmt.java          | 10 ++-
 .../server/persist/BatchedPstmtHolder.java    | 14 +++
 .../server/persist/DefaultPersister.java      | 19 ++++-
 .../ebeaninternal/api/TDSpiEbeanServer.java   | 15 ++++
 23 files changed, 484 insertions(+), 32 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/IntersectionBuilder.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/IntersectionTable.java

diff --git a/src/main/java/io/ebean/BeanRepository.java b/src/main/java/io/ebean/BeanRepository.java
index 3c588b65c..b926ea8a0 100644
--- a/src/main/java/io/ebean/BeanRepository.java
+++ b/src/main/java/io/ebean/BeanRepository.java
@@ -167,6 +167,30 @@ public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
     return db().deletePermanent(bean);
   }
 
+  /**
+   * Merge this entity using the default merge options.
+   * <p>
+   * Ebean will detect if this is a new bean or a previously fetched bean and perform either an
+   * insert or an update based on that.
+   *
+   * @see EbeanServer#merge(Object)
+   */
+  public void merge(T bean) {
+    db().merge(bean);
+  }
+
+  /**
+   * Merge this entity using the specified merge options.
+   * <p>
+   * Ebean will detect if this is a new bean or a previously fetched bean and perform either an
+   * insert or an update based on that.
+   *
+   * @see EbeanServer#merge(Object, MergeOptions)
+   */
+  public void merge(T bean, MergeOptions options) {
+    db().merge(bean, options);
+  }
+
   /**
    * Refreshes this entity from the database.
    *
diff --git a/src/main/java/io/ebean/Ebean.java b/src/main/java/io/ebean/Ebean.java
index 97f895921..09d2d738b 100644
--- a/src/main/java/io/ebean/Ebean.java
+++ b/src/main/java/io/ebean/Ebean.java
@@ -638,6 +638,15 @@ public final class Ebean {
     serverMgr.getDefaultServer().updateAll(beans);
   }
 
+  /**
+   * Merge the bean using the default merge options.
+   *
+   * @param bean The bean to merge
+   */
+  public static void merge(Object bean) {
+    serverMgr.getDefaultServer().merge(bean);
+  }
+
   /**
    * Merge the bean using the given merge options.
    *
diff --git a/src/main/java/io/ebean/EbeanServer.java b/src/main/java/io/ebean/EbeanServer.java
index 1b9157c1f..23b974591 100644
--- a/src/main/java/io/ebean/EbeanServer.java
+++ b/src/main/java/io/ebean/EbeanServer.java
@@ -1628,6 +1628,13 @@ public interface EbeanServer {
    */
   void updateAll(Collection<?> beans, Transaction transaction) throws OptimisticLockException;
 
+  /**
+   * Merge the bean using the default merge options (no paths specified, default delete).
+   *
+   * @param bean The bean to merge
+   */
+  void merge(Object bean);
+
   /**
    * Merge the bean using the given merge options.
    *
diff --git a/src/main/java/io/ebean/MergeOptionsBuilder.java b/src/main/java/io/ebean/MergeOptionsBuilder.java
index 10365346c..7193c681c 100644
--- a/src/main/java/io/ebean/MergeOptionsBuilder.java
+++ b/src/main/java/io/ebean/MergeOptionsBuilder.java
@@ -8,11 +8,20 @@ import java.util.Set;
  */
 public class MergeOptionsBuilder {
 
+  private static final MOptions DEFAULT_OPTIONS = new MOptions();
+
   private Set<String> paths = new LinkedHashSet<>();
 
   private boolean clientGeneratedIds;
 
-  private boolean deletePermanent = true;
+  private boolean deletePermanent;
+
+  /**
+   * Return the default options.
+   */
+  public static MergeOptions defaultOptions() {
+    return DEFAULT_OPTIONS;
+  }
 
   /**
    * Add a path that will included in the merge.
@@ -57,6 +66,12 @@ public class MergeOptionsBuilder {
     private final boolean deletePermanent;
     private final Set<String> paths;
 
+    private MOptions(){
+      this.clientGeneratedIds = false;
+      this.paths = new LinkedHashSet<>();
+      this.deletePermanent = false;
+    }
+
     private MOptions(Set<String> paths, boolean clientGeneratedIds, boolean deletePermanent) {
       this.paths = paths;
       this.clientGeneratedIds = clientGeneratedIds;
diff --git a/src/main/java/io/ebean/SqlUpdate.java b/src/main/java/io/ebean/SqlUpdate.java
index 87364334d..9884c095c 100644
--- a/src/main/java/io/ebean/SqlUpdate.java
+++ b/src/main/java/io/ebean/SqlUpdate.java
@@ -19,15 +19,17 @@ package io.ebean;
  * <p>
  * <pre>{@code
  *
- * // example that uses 'named' parameters
- * String s = "UPDATE f_topic set post_count = :count where id = :id";
- * SqlUpdate update = Ebean.createSqlUpdate(s);
- * update.setParameter("id", 1);
- * update.setParameter("count", 50);
+ *   // example that uses 'named' parameters
  *
- * int modifiedCount = Ebean.execute(update);
+ *   String s = "UPDATE f_topic set post_count = :count where id = :id";
  *
- * String msg = "There were " + modifiedCount + " rows updated";
+ *   SqlUpdate update = Ebean.createSqlUpdate(s);
+ *   update.setParameter("id", 1);
+ *   update.setParameter("count", 50);
+ *
+ *   int modifiedCount = update.execute();
+ *
+ *   String msg = "There were " + modifiedCount + " rows updated";
  *
  * }</pre>
  * <p>
@@ -57,6 +59,33 @@ package io.ebean;
  *
  *    txn.commit();
  *  }
+ * }</pre>
+ * <p>
+ * An alternative to the batch mode on the transaction is to use addBatch() and executeBatch() like:
+ * </p>
+ * <pre>{@code
+ *
+ *   try (Transaction txn = Ebean.beginTransaction()) {
+ *
+ *     insert.setNextParameter(10000);
+ *     insert.setNextParameter("hello");
+ *     insert.setNextParameter("rob");
+ *     insert.addBatch();
+ *
+ *     insert.setNextParameter(10001);
+ *     insert.setNextParameter("goodbye");
+ *     insert.setNextParameter("rob");
+ *     insert.addBatch();
+ *
+ *     insert.setNextParameter(10002);
+ *     insert.setNextParameter("chow");
+ *     insert.setNextParameter("bob");
+ *     insert.addBatch();
+ *
+ *     int[] rows = insert.executeBatch();
+ *
+ *     txn.commit();
+ *   }
  *
  * }</pre>
  *
@@ -83,6 +112,18 @@ public interface SqlUpdate {
    */
   int execute();
 
+  /**
+   * Execute when addBatch() has been used to batch multiple bind executions.
+   *
+   * @return The row counts for each of the batched statements.
+   */
+  int[] executeBatch();
+
+  /**
+   * Add the statement to batch processing to then later execute via executeBatch().
+   */
+  void addBatch();
+
   /**
    * Return the generated key value.
    */
diff --git a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
index 8232773fc..a4d887365 100644
--- a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
+++ b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
@@ -268,4 +268,15 @@ public interface SpiEbeanServer extends EbeanServer, BeanLoader, BeanCollectionL
    * Return true if a row for the bean type and id exists.
    */
   boolean exists(Class<?> beanType, Object beanId, Transaction transaction);
+
+  /**
+   * Add to JDBC batch for later execution.
+   */
+  void addBatch(SpiSqlUpdate defaultSqlUpdate, SpiTransaction transaction);
+
+  /**
+   * Execute the batched statement.
+   */
+  int[] executeBatch(SpiSqlUpdate defaultSqlUpdate, SpiTransaction transaction);
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 1a904843b..c63638240 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -13,6 +13,7 @@ import io.ebean.FutureIds;
 import io.ebean.FutureList;
 import io.ebean.FutureRowCount;
 import io.ebean.MergeOptions;
+import io.ebean.MergeOptionsBuilder;
 import io.ebean.PagedList;
 import io.ebean.PersistenceContextScope;
 import io.ebean.ProfileLocation;
@@ -65,6 +66,7 @@ import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiJsonContext;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.SpiQuery.Type;
+import io.ebeaninternal.api.SpiSqlUpdate;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.api.SpiTransactionManager;
 import io.ebeaninternal.api.TransactionEventTable;
@@ -919,6 +921,11 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return new DefaultUpdateQuery<>(createQuery(beanType));
   }
 
+  @Override
+  public void merge(Object bean) {
+    merge(bean, MergeOptionsBuilder.defaultOptions(), null);
+  }
+
   @Override
   public void merge(Object bean, MergeOptions options) {
     merge(bean, options, null);
@@ -1961,6 +1968,16 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return persister.executeSqlUpdate(updSql, t);
   }
 
+  @Override
+  public void addBatch(SpiSqlUpdate sqlUpdate, SpiTransaction transaction) {
+    persister.addBatch(sqlUpdate, transaction);
+  }
+
+  @Override
+  public int[] executeBatch(SpiSqlUpdate sqlUpdate, SpiTransaction transaction) {
+    return persister.executeBatch(sqlUpdate, transaction);
+  }
+
   /**
    * Execute the updateSql.
    */
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java b/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
index 92e40b48b..d9d4e6500 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
@@ -1,11 +1,12 @@
 package io.ebeaninternal.server.core;
 
 import io.ebean.Ebean;
-import io.ebean.EbeanServer;
 import io.ebean.SqlUpdate;
 import io.ebean.Update;
 import io.ebeaninternal.api.BindParams;
+import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiSqlUpdate;
+import io.ebeaninternal.api.SpiTransaction;
 
 import java.io.Serializable;
 
@@ -26,7 +27,7 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
 
   private static final long serialVersionUID = -6493829438421253102L;
 
-  private transient final EbeanServer server;
+  private transient final SpiEbeanServer server;
 
   /**
    * The parameters used to bind to the sql.
@@ -69,6 +70,16 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
 
   private Object generatedKey;
 
+  /**
+   * Set when batching explicitly used.
+   */
+  private boolean batched;
+
+  /**
+   * Transaction used for addBatch() executeBatch() processing.
+   */
+  private transient SpiTransaction transaction;
+
   /**
    * Create with server sql and bindParams object.
    * <p>
@@ -76,7 +87,7 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
    * same time.
    * </p>
    */
-  public DefaultSqlUpdate(EbeanServer server, String sql, BindParams bindParams) {
+  public DefaultSqlUpdate(SpiEbeanServer server, String sql, BindParams bindParams) {
     this.server = server;
     this.sql = sql;
     this.bindParams = bindParams;
@@ -86,7 +97,7 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
    * Create with a specific server. This means you can use the
    * SqlUpdate.execute() method.
    */
-  public DefaultSqlUpdate(EbeanServer server, String sql) {
+  public DefaultSqlUpdate(SpiEbeanServer server, String sql) {
     this(server, sql, new BindParams());
   }
 
@@ -111,6 +122,10 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
   @Override
   public int execute() {
     if (server != null) {
+      if (batched) {
+        server.executeBatch(this, transaction);
+        return -1;
+      }
       return server.execute(this);
     } else {
       // Hopefully this doesn't catch anyone out...
@@ -118,6 +133,34 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
     }
   }
 
+  @Override
+  public int[] executeBatch() {
+    if (server == null) {
+      throw new IllegalStateException("No EbeanServer set?");
+    }
+    if (!batched) {
+      throw new IllegalStateException("No prior addBatch() called?");
+    }
+    return server.executeBatch(this, transaction);
+  }
+
+
+  @Override
+  public void addBatch() {
+    if (server == null) {
+      throw new IllegalStateException("No EbeanServer set?");
+    }
+    if (transaction == null) {
+      transaction = server.currentServerTransaction();
+      if (transaction == null) {
+        throw new IllegalStateException("No current transaction? Must have a transaction to use addBatch()");
+      }
+    }
+
+    batched = true;
+    server.addBatch(this, transaction);
+  }
+
   @Override
   public Object getGeneratedKey() {
     return generatedKey;
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
index 202eb5141..6aa17970c 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.core;
 
-import io.ebean.SqlUpdate;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiSqlUpdate;
 import io.ebeaninternal.api.SpiTransaction;
@@ -27,15 +26,17 @@ public final class PersistRequestUpdateSql extends PersistRequest {
 
   private String description;
 
+  private boolean addBatch;
+
   /**
    * Create.
    */
-  public PersistRequestUpdateSql(SpiEbeanServer server, SqlUpdate sqlUpdate,
+  public PersistRequestUpdateSql(SpiEbeanServer server, SpiSqlUpdate sqlUpdate,
                                  SpiTransaction t, PersistExecute persistExecute) {
 
     super(server, t, persistExecute, sqlUpdate.getLabel());
     this.type = Type.UPDATESQL;
-    this.updateSql = (SpiSqlUpdate) sqlUpdate;
+    this.updateSql = sqlUpdate;
     updateSql.reset();
   }
 
@@ -44,11 +45,24 @@ public final class PersistRequestUpdateSql extends PersistRequest {
     profileBase(EVT_UPDATESQL, offset, (short)0, flushCount);
   }
 
+  /**
+   * Add this statement to JDBC batch for later execution.
+   */
+  public int addBatch() {
+    this.addBatch = true;
+    return executeOrQueue();
+  }
+
   @Override
   public int executeNow() {
     return persistExecute.executeSqlUpdate(this);
   }
 
+  @Override
+  public boolean isBatchThisRequest() {
+    return addBatch || super.isBatchThisRequest();
+  }
+
   @Override
   public int executeOrQueue() {
     return executeStatement();
diff --git a/src/main/java/io/ebeaninternal/server/core/Persister.java b/src/main/java/io/ebeaninternal/server/core/Persister.java
index 82e46b856..20cbfcce4 100644
--- a/src/main/java/io/ebeaninternal/server/core/Persister.java
+++ b/src/main/java/io/ebeaninternal/server/core/Persister.java
@@ -8,6 +8,7 @@ import io.ebean.Transaction;
 import io.ebean.Update;
 import io.ebean.bean.EntityBean;
 import io.ebean.meta.MetricVisitor;
+import io.ebeaninternal.api.SpiSqlUpdate;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 
@@ -91,4 +92,14 @@ public interface Persister {
    * Visit the metrics.
    */
   void visitMetrics(MetricVisitor visitor);
+
+  /**
+   * Add the statement to JDBC batch for later execution via executeBatch.
+   */
+  void addBatch(SpiSqlUpdate sqlUpdate, SpiTransaction transaction);
+
+  /**
+   * Execute the associated batched statement.
+   */
+  int[] executeBatch(SpiSqlUpdate sqlUpdate, SpiTransaction transaction);
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 807fbf16b..ee277666b 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -637,9 +637,9 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    */
   public void setEbeanServer(SpiEbeanServer ebeanServer) {
     this.ebeanServer = ebeanServer;
-    for (BeanPropertyAssocMany<?> aPropertiesMany : propertiesMany) {
+    for (BeanPropertyAssocMany<?> assocMany : propertiesMany) {
       // used for creating lazy loading lists etc
-      aPropertiesMany.setLoader(ebeanServer);
+      assocMany.setEbeanServer(ebeanServer);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index f3bf893bc..687cc9d84 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -7,10 +7,10 @@ import io.ebean.Transaction;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanCollection.ModifyListenMode;
 import io.ebean.bean.BeanCollectionAdd;
-import io.ebean.bean.BeanCollectionLoader;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.PersistenceContext;
 import io.ebean.text.PathProperties;
+import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.json.SpiJsonReader;
@@ -50,6 +50,8 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   private final String intersectionPublishTable;
   private final String intersectionDraftTable;
 
+  private IntersectionTable intersectionTable;
+
   /**
    * For ManyToMany this is the Inverse join used to build reference queries.
    */
@@ -352,10 +354,30 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
    * Set the lazy load server to help create reference collections (that lazy
    * load on demand).
    */
-  public void setLoader(BeanCollectionLoader loader) {
+  public void setEbeanServer(SpiEbeanServer server) {
     if (help != null) {
-      help.setLoader(loader);
+      help.setLoader(server);
     }
+    if (manyToMany) {
+      intersectionTable = initIntersectionTable();
+    }
+  }
+
+  private IntersectionTable initIntersectionTable() {
+
+    IntersectionBuilder row = new IntersectionBuilder(intersectionPublishTable, intersectionDraftTable);
+    for (ExportedProperty exportedProperty : exportedProperties) {
+      row.addColumn(exportedProperty.getForeignDbColumn());
+    }
+    importedId.buildImport(row);
+    return row.build();
+  }
+
+  /**
+   * Return the intersection table helper.
+   */
+  public IntersectionTable intersectionTable() {
+    return intersectionTable;
   }
 
   /**
@@ -755,6 +777,20 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     return intersectionDraftTable != null && !intersectionDraftTable.equals(intersectionPublishTable);
   }
 
+  /**
+   * Bind the two side of a many to many to the given SqlUpdate.
+   */
+  public void intersectionBind(SqlUpdate sql, EntityBean parentBean, EntityBean other) {
+    if (embeddedExportedProperties) {
+      BeanProperty idProp = descriptor.getIdProperty();
+      parentBean = (EntityBean) idProp.getValue(parentBean);
+    }
+    for (ExportedProperty exportedProperty : exportedProperties) {
+      sql.setNextParameter(exportedProperty.getValue(parentBean));
+    }
+    importedId.bindImport(sql, other);
+  }
+
   private void buildExport(IntersectionRow row, EntityBean parentBean) {
 
     if (embeddedExportedProperties) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/IntersectionBuilder.java b/src/main/java/io/ebeaninternal/server/deploy/IntersectionBuilder.java
new file mode 100644
index 000000000..d5658bf14
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/IntersectionBuilder.java
@@ -0,0 +1,85 @@
+package io.ebeaninternal.server.deploy;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Helper to build IntersectionTable.
+ */
+public class IntersectionBuilder {
+
+  private final String publishTable;
+  private final String draftTable;
+
+  private final List<String> columns = new ArrayList<>();
+
+  IntersectionBuilder(String publishTable, String draftTable) {
+    this.publishTable = publishTable;
+    this.draftTable = draftTable;
+  }
+
+  public void addColumn(String column) {
+    columns.add(column);
+  }
+
+  public IntersectionTable build() {
+
+    String insertSql = insertSql(publishTable);
+    String deleteSql = deleteSql(publishTable);
+
+    String draftInsertSql;
+    String draftDeleteSql;
+    if (publishTable.equals(draftTable)) {
+      draftInsertSql = insertSql;
+      draftDeleteSql = deleteSql;
+    } else {
+      draftInsertSql = insertSql(draftTable);
+      draftDeleteSql = deleteSql(draftTable);
+    }
+
+    return new IntersectionTable(insertSql, deleteSql, draftInsertSql, draftDeleteSql);
+  }
+
+  private String insertSql(String tableName) {
+
+    StringBuilder sb = new StringBuilder();
+    sb.append("insert into ").append(tableName).append(" (");
+
+    int count = 0;
+    for (String column : columns) {
+      if (count++ > 0) {
+        sb.append(", ");
+      }
+      sb.append(column);
+    }
+    sb.append(") values (");
+    for (int i = 0; i < count; i++) {
+      if (i > 0) {
+        sb.append(", ");
+      }
+      sb.append("?");
+    }
+    sb.append(")");
+
+    return sb.toString();
+  }
+
+  private String deleteSql(String tableName) {
+
+    StringBuilder sb = new StringBuilder();
+    sb.append("delete from ").append(tableName);
+    sb.append(" where ");
+
+    int count = 0;
+    for (String column : columns) {
+      if (count++ > 0) {
+        sb.append(" and ");
+      }
+      sb.append(column);
+      sb.append(" = ?");
+    }
+
+    return sb.toString();
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java b/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java
index a0d6f3beb..59c13838a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java
@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.EbeanServer;
 import io.ebean.SqlUpdate;
 import io.ebeaninternal.api.BindParams;
+import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.server.core.DefaultSqlUpdate;
 import io.ebeaninternal.server.expression.DefaultExpressionRequest;
 import io.ebeaninternal.server.expression.IdInExpression;
@@ -22,12 +22,12 @@ public class IntersectionRow {
   private List<Object> excludeIds;
   private BeanDescriptor<?> excludeDescriptor;
 
-  public IntersectionRow(String tableName, BeanDescriptor<?> targetDescriptor) {
+  IntersectionRow(String tableName, BeanDescriptor<?> targetDescriptor) {
     this.tableName = tableName;
     this.targetDescriptor = targetDescriptor;
   }
 
-  public IntersectionRow(String tableName) {
+  IntersectionRow(String tableName) {
     this.tableName = tableName;
     this.targetDescriptor = null;
   }
@@ -35,7 +35,7 @@ public class IntersectionRow {
   /**
    * Set Id's to exclude. This is for deleting non-attached detail Id's.
    */
-  public void setExcludeIds(List<Object> excludeIds, BeanDescriptor<?> excludeDescriptor) {
+  void setExcludeIds(List<Object> excludeIds, BeanDescriptor<?> excludeDescriptor) {
     this.excludeIds = excludeIds;
     this.excludeDescriptor = excludeDescriptor;
   }
@@ -44,7 +44,7 @@ public class IntersectionRow {
     values.put(key, value);
   }
 
-  public SqlUpdate createInsert(EbeanServer server) {
+  public SqlUpdate createInsert(SpiEbeanServer server) {
 
     BindParams bindParams = new BindParams();
 
@@ -72,7 +72,7 @@ public class IntersectionRow {
     return new DefaultSqlUpdate(server, sb.toString(), bindParams);
   }
 
-  public SqlUpdate createDelete(EbeanServer server, boolean softDelete) {
+  public SqlUpdate createDelete(SpiEbeanServer server, boolean softDelete) {
 
     BindParams bindParams = new BindParams();
 
@@ -107,7 +107,7 @@ public class IntersectionRow {
     return new DefaultSqlUpdate(server, sb.toString(), bindParams);
   }
 
-  public SqlUpdate createDeleteChildren(EbeanServer server) {
+  public SqlUpdate createDeleteChildren(SpiEbeanServer server) {
 
     BindParams bindParams = new BindParams();
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/IntersectionTable.java b/src/main/java/io/ebeaninternal/server/deploy/IntersectionTable.java
new file mode 100644
index 000000000..785c2be4c
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/IntersectionTable.java
@@ -0,0 +1,34 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebean.EbeanServer;
+import io.ebean.SqlUpdate;
+
+public class IntersectionTable {
+
+  private final String insertSql;
+  private final String deleteSql;
+  private final String draftInsertSql;
+  private final String draftDeleteSql;
+
+  IntersectionTable(String insertSql, String deleteSql, String draftInsertSql, String draftDeleteSql) {
+    this.insertSql = insertSql;
+    this.deleteSql = deleteSql;
+    this.draftInsertSql = draftInsertSql;
+    this.draftDeleteSql = draftDeleteSql;
+  }
+
+  /**
+   * Return a SqlUpdate for inserting into the intersection table.
+   */
+  public SqlUpdate insert(EbeanServer server, boolean draft) {
+    return server.createSqlUpdate(draft ? draftInsertSql : insertSql);
+  }
+
+  /**
+   * Return a SqlUpdate for deleting from the intersection table.
+   */
+  public SqlUpdate delete(EbeanServer server, boolean draft) {
+    return server.createSqlUpdate(draft ? draftDeleteSql : deleteSql);
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedId.java b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedId.java
index 422b0c41f..24b7c1bfe 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedId.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedId.java
@@ -4,6 +4,7 @@ import io.ebean.SqlUpdate;
 import io.ebean.bean.EntityBean;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.DbSqlContext;
+import io.ebeaninternal.server.deploy.IntersectionBuilder;
 import io.ebeaninternal.server.deploy.IntersectionRow;
 import io.ebeaninternal.server.persist.dml.GenerateDmlRequest;
 import io.ebeaninternal.server.persist.dmlbind.BindableRequest;
@@ -66,4 +67,14 @@ public interface ImportedId {
    * Return the set importedId clause.
    */
   String importedIdClause();
+
+  /**
+   * Add DB columns to the intersection builder.
+   */
+  void buildImport(IntersectionBuilder row);
+
+  /**
+   * Bind values to the intersection SqlUpdate.
+   */
+  void bindImport(SqlUpdate sql, EntityBean other);
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java
index 1a37c7f52..22c80dfc9 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java
@@ -7,6 +7,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssoc;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 import io.ebeaninternal.server.deploy.DbSqlContext;
+import io.ebeaninternal.server.deploy.IntersectionBuilder;
 import io.ebeaninternal.server.deploy.IntersectionRow;
 import io.ebeaninternal.server.persist.dml.GenerateDmlRequest;
 import io.ebeaninternal.server.persist.dmlbind.BindableRequest;
@@ -130,15 +131,31 @@ public class ImportedIdEmbedded implements ImportedId {
 
     EntityBean embeddedId = (EntityBean) foreignAssocOne.getValue(other);
     if (embeddedId == null) {
-      String msg = "Foreign Key value null?";
-      throw new PersistenceException(msg);
+      throw new PersistenceException("Foreign Key value null?");
     }
-
     for (ImportedIdSimple anImported : imported) {
       Object scalarValue = anImported.foreignProperty.getValue(embeddedId);
       row.put(anImported.localDbColumn, scalarValue);
     }
+  }
 
+  @Override
+  public void buildImport(IntersectionBuilder row) {
+    for (ImportedIdSimple importedScalar : imported) {
+      row.addColumn(importedScalar.localDbColumn);
+    }
+  }
+
+  @Override
+  public void bindImport(SqlUpdate sql, EntityBean other) {
+    EntityBean embeddedId = (EntityBean) foreignAssocOne.getValue(other);
+    if (embeddedId == null) {
+      throw new PersistenceException("Foreign Key value null?");
+    }
+    for (ImportedIdSimple anImported : imported) {
+      Object scalarValue = anImported.foreignProperty.getValue(embeddedId);
+      sql.setNextParameter(scalarValue);
+    }
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
index 803ff4b56..e84b07e49 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
@@ -7,6 +7,7 @@ import io.ebeaninternal.server.deploy.BeanFkeyProperty;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssoc;
 import io.ebeaninternal.server.deploy.DbSqlContext;
+import io.ebeaninternal.server.deploy.IntersectionBuilder;
 import io.ebeaninternal.server.deploy.IntersectionRow;
 import io.ebeaninternal.server.persist.dml.GenerateDmlRequest;
 import io.ebeaninternal.server.persist.dmlbind.BindableRequest;
@@ -98,6 +99,20 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
     return foreignProperty.getValue(bean);
   }
 
+  @Override
+  public void buildImport(IntersectionBuilder row) {
+    row.addColumn(localDbColumn);
+  }
+
+  @Override
+  public void bindImport(SqlUpdate sql, EntityBean other) {
+    Object value = getIdValue(other);
+    if (value == null) {
+      throw new PersistenceException("Foreign Key value null?");
+    }
+    sql.setNextParameter(value);
+  }
+
   @Override
   public void buildImport(IntersectionRow row, EntityBean other) {
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchControl.java b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
index 4c533a0b0..319db4302 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
@@ -6,6 +6,7 @@ import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -357,4 +358,11 @@ public final class BatchControl {
   private BatchedBeanHolder[] getBeanHolderArray() {
     return beanHoldMap.values().toArray(new BatchedBeanHolder[beanHoldMap.size()]);
   }
+
+  /**
+   * Execute a batched statement.
+   */
+  public int[] execute(String key, boolean getGeneratedKeys) throws SQLException {
+    return pstmtHolder.execute(key, getGeneratedKeys);
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java b/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java
index c15742ce2..501a44de0 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java
@@ -38,6 +38,8 @@ public class BatchedPstmt implements SpiProfileTransactionEvent {
 
   private long profileStart;
 
+  private int[] results;
+
   /**
    * Create with a given statement.
    */
@@ -116,7 +118,7 @@ public class BatchedPstmt implements SpiProfileTransactionEvent {
 
   private void executeAndCheckRowCounts() throws SQLException {
 
-    int[] results = pstmt.executeBatch();
+    results = pstmt.executeBatch();
     if (results.length != list.size()) {
       String s = "results array error " + results.length + " " + list.size();
       throw new SQLException(s);
@@ -140,4 +142,10 @@ public class BatchedPstmt implements SpiProfileTransactionEvent {
     }
   }
 
+  /**
+   * Return the execution results (row counts).
+   */
+  public int[] getResults() {
+    return results;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java b/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java
index b981614ed..ffb0e6d71 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.persist;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.persistence.PersistenceException;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.LinkedHashMap;
@@ -73,6 +74,19 @@ public class BatchedPstmtHolder {
     return stmtMap.isEmpty();
   }
 
+  /**
+   * Execute one of the batched statements returning the row counts.
+   */
+  public int[] execute(String key, boolean getGeneratedKeys) throws SQLException {
+
+    BatchedPstmt batchedPstmt = stmtMap.remove(key);
+    if (batchedPstmt == null) {
+      throw new PersistenceException("No batched statement found for key " + key);
+    }
+    batchedPstmt.executeBatch(getGeneratedKeys);
+    return batchedPstmt.getResults();
+  }
+
   /**
    * Execute all batched PreparedStatements.
    *
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index f7688d7a5..415738cec 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -13,6 +13,7 @@ import io.ebean.bean.PersistenceContext;
 import io.ebean.event.BeanPersistController;
 import io.ebean.meta.MetricVisitor;
 import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.api.SpiSqlUpdate;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.api.SpiUpdate;
 import io.ebeaninternal.server.core.Message;
@@ -34,6 +35,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.persistence.PersistenceException;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -124,13 +126,28 @@ public final class DefaultPersister implements Persister {
     }
   }
 
+  @Override
+  public void addBatch(SpiSqlUpdate sqlUpdate, SpiTransaction transaction) {
+    new PersistRequestUpdateSql(server, sqlUpdate, transaction, persistExecute).addBatch();
+  }
+
+  @Override
+  public int[] executeBatch(SpiSqlUpdate sqlUpdate, SpiTransaction transaction) {
+    BatchControl batchControl = transaction.getBatchControl();
+    try {
+      return batchControl.execute(sqlUpdate.getSql(), sqlUpdate.isGetGeneratedKeys());
+    } catch (SQLException e) {
+      throw new PersistenceException(e);
+    }
+  }
+
   /**
    * Execute the updateSql.
    */
   @Override
   public int executeSqlUpdate(SqlUpdate updSql, Transaction t) {
 
-    return executeOrQueue(new PersistRequestUpdateSql(server, updSql, (SpiTransaction) t, persistExecute));
+    return executeOrQueue(new PersistRequestUpdateSql(server, (SpiSqlUpdate) updSql, (SpiTransaction) t, persistExecute));
   }
 
   /**
diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index c5c916039..4465cb69c 100644
--- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -237,6 +237,11 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
     return 0;
   }
 
+  @Override
+  public void merge(Object bean) {
+
+  }
+
   @Override
   public void merge(Object bean, MergeOptions options) {
 
@@ -800,6 +805,16 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
     return 0;
   }
 
+  @Override
+  public void addBatch(SpiSqlUpdate sqlUpdate, SpiTransaction transaction) {
+
+  }
+
+  @Override
+  public int[] executeBatch(SpiSqlUpdate defaultSqlUpdate, SpiTransaction transaction) {
+    return new int[0];
+  }
+
   @Override
   public int execute(CallableSql callableSql, Transaction t) {
     return 0;

From c23508819f646f497e4279a0efecd868681290c7 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 30 May 2018 03:32:00 +1200
Subject: [PATCH 0274/1036] #1396 merge() with ManyToMany throwing error
 Referential integrity constraint violation

---
 .../server/persist/MergeContext.java          |  8 ++
 .../server/persist/MergeHandler.java          |  7 +-
 .../server/persist/MergeNode.java             | 18 ++++
 .../persist/MergeNodeAssocManyToMany.java     | 82 +++++++++++++++++++
 ...Many.java => MergeNodeAssocOneToMany.java} | 13 +--
 .../server/persist/MergeRequest.java          | 16 ++++
 6 files changed, 133 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java
 rename src/main/java/io/ebeaninternal/server/persist/{MergeNodeAssocMany.java => MergeNodeAssocOneToMany.java} (73%)

diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeContext.java b/src/main/java/io/ebeaninternal/server/persist/MergeContext.java
index 8de5b7ee4..d02a0944b 100644
--- a/src/main/java/io/ebeaninternal/server/persist/MergeContext.java
+++ b/src/main/java/io/ebeaninternal/server/persist/MergeContext.java
@@ -26,6 +26,14 @@ class MergeContext {
     this.clientGeneratedIds = clientGeneratedIds;
   }
 
+  public SpiEbeanServer getServer() {
+    return server;
+  }
+
+  public SpiTransaction getTransaction() {
+    return transaction;
+  }
+
   /**
    * Add to the list of beans to delete.
    */
diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java b/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java
index d8bcba0ee..5c7f74876 100644
--- a/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java
@@ -139,7 +139,12 @@ class MergeHandler {
       throw new PersistenceException("merge path [" + path + "] is not a ToMany or ToOne property of " + targetDesc.getFullName());
     }
     if (prop instanceof BeanPropertyAssocMany<?>) {
-      return new MergeNodeAssocMany(fullPath, (BeanPropertyAssocMany<?>) prop);
+      BeanPropertyAssocMany<?> assocMany = (BeanPropertyAssocMany<?>) prop;
+      if (assocMany.isManyToMany()) {
+        return new MergeNodeAssocManyToMany(fullPath, assocMany);
+      } else {
+        return new MergeNodeAssocOneToMany(fullPath, assocMany);
+      }
     } else {
       return new MergeNodeAssocOne(fullPath, (BeanPropertyAssocOne<?>) prop);
     }
diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeNode.java b/src/main/java/io/ebeaninternal/server/persist/MergeNode.java
index 0f7e47a48..1bcede098 100644
--- a/src/main/java/io/ebeaninternal/server/persist/MergeNode.java
+++ b/src/main/java/io/ebeaninternal/server/persist/MergeNode.java
@@ -6,6 +6,8 @@ import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssoc;
 
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -50,6 +52,22 @@ abstract class MergeNode {
     return null;
   }
 
+  /**
+   * Return the outline beans as a map keyed by Id values.
+   */
+  Map<Object, EntityBean> toMap(Collection outlines) {
+
+    Map<Object, EntityBean> outlineMap = new HashMap<>();
+    if (outlines != null) {
+      for (Object out : outlines) {
+        EntityBean outlineBean = (EntityBean) out;
+        Object outlineId = targetDescriptor.getId(outlineBean);
+        outlineMap.put(outlineId, outlineBean);
+      }
+    }
+    return outlineMap;
+  }
+
   /**
    * Add to the query to fetch the Ids values for the foreign keys basically.
    */
diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java b/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java
new file mode 100644
index 000000000..043b735cc
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java
@@ -0,0 +1,82 @@
+package io.ebeaninternal.server.persist;
+
+import io.ebean.SqlUpdate;
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.api.SpiTransaction;
+import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
+import io.ebeaninternal.server.deploy.IntersectionTable;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Node for processing merge on ManyToMany properties.
+ */
+class MergeNodeAssocManyToMany extends MergeNode {
+
+  private final BeanPropertyAssocMany<?> many;
+
+  MergeNodeAssocManyToMany(String fullPath, BeanPropertyAssocMany<?> property) {
+    super(fullPath, property);
+    this.many = property;
+  }
+
+  public void merge(MergeRequest request) {
+
+    EntityBean parentBean = request.getBean();
+
+    Collection beans = many.getRawCollection(parentBean);
+    Collection outlines = many.getRawCollection(request.getOutline());
+
+    Map<Object, EntityBean> outlineIds = toMap(outlines);
+
+    List<EntityBean> additions = new ArrayList<>();
+    if (beans != null) {
+      for (Object bean : beans) {
+        EntityBean entityBean = (EntityBean) bean;
+        Object beanId = targetDescriptor.getId(entityBean);
+        if (beanId != null) {
+          if (outlineIds.remove(beanId) == null) {
+            additions.add(entityBean);
+          }
+        }
+      }
+    }
+
+    // any remaining are considered deletes
+    List<EntityBean> deletions = new ArrayList<>(outlineIds.values());
+
+    SpiEbeanServer server = request.getServer();
+    SpiTransaction transaction = request.getTransaction();
+
+    IntersectionTable intersectionTable = many.intersectionTable();
+
+    if (!deletions.isEmpty()) {
+      transaction.flushBatch();
+
+      SqlUpdate delete = intersectionTable.delete(server, false);
+      for (EntityBean deletion : deletions) {
+        many.intersectionBind(delete, parentBean, deletion);
+        delete.addBatch();
+      }
+      delete.execute();
+    }
+
+    if (!additions.isEmpty()) {
+      transaction.flushBatch();
+
+      SqlUpdate insert = intersectionTable.insert(server, false);
+      for (EntityBean addition : additions) {
+        many.intersectionBind(insert, parentBean, addition);
+        insert.addBatch();
+      }
+      insert.execute();
+    }
+
+    many.resetMany(parentBean);
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocMany.java b/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOneToMany.java
similarity index 73%
rename from src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocMany.java
rename to src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOneToMany.java
index d6e1a8e8f..4c894cd0f 100644
--- a/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOneToMany.java
@@ -10,11 +10,11 @@ import java.util.Map;
 /**
  * Node for processing merge on ToMany properties.
  */
-class MergeNodeAssocMany extends MergeNode {
+class MergeNodeAssocOneToMany extends MergeNode {
 
   private final BeanPropertyAssocMany<?> many;
 
-  MergeNodeAssocMany(String fullPath, BeanPropertyAssocMany<?> property) {
+  MergeNodeAssocOneToMany(String fullPath, BeanPropertyAssocMany<?> property) {
     super(fullPath, property);
     this.many = property;
   }
@@ -24,14 +24,7 @@ class MergeNodeAssocMany extends MergeNode {
     Collection beans = many.getRawCollection(request.getBean());
     Collection outlines = many.getRawCollection(request.getOutline());
 
-    Map<Object, EntityBean> outlineIds = new HashMap<>();
-    if (outlines != null) {
-      for (Object outline : outlines) {
-        EntityBean outlineBean = (EntityBean) outline;
-        Object outlineId = targetDescriptor.getId(outlineBean);
-        outlineIds.put(outlineId, outlineBean);
-      }
-    }
+    Map<Object, EntityBean> outlineIds = toMap(outlines);
 
     if (beans != null) {
       for (Object bean : beans) {
diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeRequest.java b/src/main/java/io/ebeaninternal/server/persist/MergeRequest.java
index 303ccb382..1826e749e 100644
--- a/src/main/java/io/ebeaninternal/server/persist/MergeRequest.java
+++ b/src/main/java/io/ebeaninternal/server/persist/MergeRequest.java
@@ -1,6 +1,8 @@
 package io.ebeaninternal.server.persist;
 
 import io.ebean.bean.EntityBean;
+import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.api.SpiTransaction;
 
 /**
  * Request object used for processing the merge.
@@ -18,6 +20,20 @@ class MergeRequest {
     this.outline = outline;
   }
 
+  /**
+   * Return the associated server.
+   */
+  SpiEbeanServer getServer() {
+    return context.getServer();
+  }
+
+  /**
+   * Return the associated transaction.
+   */
+  public SpiTransaction getTransaction() {
+    return context.getTransaction();
+  }
+
   /**
    * Create a sub request with the given beans (to cascade the processing).
    */

From 23e5de0819801ebd52b332b46e49cede92378008 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 30 May 2018 03:32:23 +1200
Subject: [PATCH 0275/1036] #1394 #1395 - ENH: Add addBatch() and
 executeBatch() to SqlUpdate ... alternative to changing transaction batch
 mode enhancement

---
 .../tests/rawsql/TestInsertSqlLogging.java    | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java b/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java
index 44e7ceef3..4ff697eae 100644
--- a/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java
+++ b/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java
@@ -8,6 +8,8 @@ import io.ebeaninternal.api.SpiTransaction;
 import org.junit.Test;
 import org.tests.idkeys.db.AuditLog;
 
+import java.util.Arrays;
+
 import static org.junit.Assert.assertFalse;
 
 public class TestInsertSqlLogging extends BaseTestCase {
@@ -39,6 +41,38 @@ public class TestInsertSqlLogging extends BaseTestCase {
       insert.setNextParameter("bob");
       insert.execute();
 
+      txn.commit();
+    }
+  }
+
+  @Test
+  public void addBatch_executeBatch() {
+
+    Ebean.find(AuditLog.class).where().ge("id", 10000).delete();
+
+    String sql = "insert into audit_log (id, description, modified_description) values (?,?,?)";
+    SqlUpdate insert = Ebean.createSqlUpdate(sql);
+
+    try (Transaction txn = Ebean.beginTransaction()) {
+
+      insert.setNextParameter(10000);
+      insert.setNextParameter("hello");
+      insert.setNextParameter("rob");
+      insert.addBatch();
+
+      insert.setNextParameter(10001);
+      insert.setNextParameter("goodbye");
+      insert.setNextParameter("rob");
+      insert.addBatch();
+
+      insert.setNextParameter(10002);
+      insert.setNextParameter("chow");
+      insert.setNextParameter("bob");
+      insert.addBatch();
+
+      int[] rows = insert.executeBatch();
+      System.out.println("Rows was " + Arrays.toString(rows));
+
       txn.commit();
     }
 

From 7f9ce5bdd4c20b2dfd0b69c78b9a34436f87b2e4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 30 May 2018 03:32:38 +1200
Subject: [PATCH 0276/1036] #1396 merge() with ManyToMany throwing error
 Referential integrity constraint violation

---
 src/test/java/org/tests/merge/MGroup.java     | 34 ++++++++++
 src/test/java/org/tests/merge/MMachine.java   | 59 +++++++++++++++++
 .../org/tests/merge/TestMergeCustomer.java    | 15 +++++
 .../java/org/tests/merge/TestMergeM2M.java    | 64 +++++++++++++++++++
 4 files changed, 172 insertions(+)
 create mode 100644 src/test/java/org/tests/merge/MGroup.java
 create mode 100644 src/test/java/org/tests/merge/MMachine.java
 create mode 100644 src/test/java/org/tests/merge/TestMergeM2M.java

diff --git a/src/test/java/org/tests/merge/MGroup.java b/src/test/java/org/tests/merge/MGroup.java
new file mode 100644
index 000000000..06b7cb601
--- /dev/null
+++ b/src/test/java/org/tests/merge/MGroup.java
@@ -0,0 +1,34 @@
+package org.tests.merge;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class MGroup {
+
+  @Id
+  private long id;
+
+  private String name;
+
+  public MGroup(long id, String name) {
+    this.id = id;
+    this.name = name;
+  }
+
+  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;
+  }
+}
diff --git a/src/test/java/org/tests/merge/MMachine.java b/src/test/java/org/tests/merge/MMachine.java
new file mode 100644
index 000000000..896da51a1
--- /dev/null
+++ b/src/test/java/org/tests/merge/MMachine.java
@@ -0,0 +1,59 @@
+package org.tests.merge;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Version;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+public class MMachine {
+
+  @Id
+  private long id;
+
+  private String name;
+
+  @ManyToMany
+  private List<MGroup> groups = new ArrayList<>();
+
+  @Version
+  private long version;
+
+  public MMachine(String name) {
+    this.name = name;
+  }
+
+  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 long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+
+  public List<MGroup> getGroups() {
+    return groups;
+  }
+
+  public void setGroups(List<MGroup> groups) {
+    this.groups = groups;
+  }
+}
diff --git a/src/test/java/org/tests/merge/TestMergeCustomer.java b/src/test/java/org/tests/merge/TestMergeCustomer.java
index 7bf86d1d8..c796d702b 100644
--- a/src/test/java/org/tests/merge/TestMergeCustomer.java
+++ b/src/test/java/org/tests/merge/TestMergeCustomer.java
@@ -20,6 +20,21 @@ public class TestMergeCustomer extends BaseTestCase {
 
   private Random random = new Random();
 
+  @Test
+  public void customerOnly_defaultOptions_expect_updateOnly() {
+
+    MCustomer mCustomer = partial("cust1", "(id,name,version)");
+    mCustomer.setName("NotCust0");
+
+    LoggedSqlCollector.start();
+
+    Ebean.merge(mCustomer);
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("update mcustomer set name=?, version=? where id=? and version=?");
+  }
+
   /**
    * So this is effectively the same as a stateless update.
    */
diff --git a/src/test/java/org/tests/merge/TestMergeM2M.java b/src/test/java/org/tests/merge/TestMergeM2M.java
new file mode 100644
index 000000000..930d2def1
--- /dev/null
+++ b/src/test/java/org/tests/merge/TestMergeM2M.java
@@ -0,0 +1,64 @@
+package org.tests.merge;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.MergeOptions;
+import io.ebean.MergeOptionsBuilder;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestMergeM2M extends BaseTestCase {
+
+  @Test
+  public void m2mMerge() {
+
+    MGroup group1 = new MGroup(1, "gone");
+    MGroup group2 = new MGroup(2, "gtwo");
+    MGroup group3 = new MGroup(3, "gthree");
+    MGroup group4 = new MGroup(4, "gfour");
+    MGroup group5 = new MGroup(5, "gfive");
+
+    Ebean.save(group1);
+    Ebean.save(group2);
+    Ebean.save(group3);
+    Ebean.save(group4);
+    Ebean.save(group5);
+
+    MMachine machine = new MMachine("mac1");
+    machine.getGroups().add(group1);
+    machine.getGroups().add(group2);
+    machine.getGroups().add(group3);
+
+    MergeOptions options = new MergeOptionsBuilder().addPath("groups").build();
+
+    LoggedSqlCollector.start();
+
+    Ebean.merge(machine, options);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(3);
+    assertThat(sql.get(0)).contains("select");
+    assertThat(sql.get(1)).contains("insert into mmachine");
+    assertThat(sql.get(2)).contains("insert into mmachine_mgroup");
+
+    machine.setName("mac1-mod");
+    machine.getGroups().remove(group2);
+    machine.getGroups().remove(group3);
+    machine.getGroups().add(group4);
+    machine.getGroups().add(group5);
+
+    Ebean.merge(machine, options);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(4);
+    assertThat(sql.get(0)).contains("select");
+    assertThat(sql.get(1)).contains("delete from mmachine_mgroup");
+    assertThat(sql.get(2)).contains("insert into mmachine_mgroup");
+    assertThat(sql.get(3)).contains("update mmachine");
+
+  }
+}

From 24ca744e06239a2764b8952bbf0d3fa9dc887d92 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 30 May 2018 03:35:13 +1200
Subject: [PATCH 0277/1036] Bump version to 11.16.1-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d32f7c64f..78a1cecb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.13-SNAPSHOT</version>
+  <version>11.16.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>

From e3b1996dc9effe8aaa42bc3e6de24c956a47e188 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 30 May 2018 03:36:24 +1200
Subject: [PATCH 0278/1036] [maven-release-plugin] prepare release
 ebean-11.16.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 78a1cecb5..ca8166740 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.16.1-SNAPSHOT</version>
+  <version>11.16.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.16.1</tag>
   </scm>
 
   <profiles>

From 0aa9208dcc1e6a0e919da24b473547d21c22f502 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 30 May 2018 03:36:38 +1200
Subject: [PATCH 0279/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ca8166740..c52d1e1fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.16.1</version>
+  <version>11.16.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.16.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From ddc00fedb60f1ddfeedd2e147f3bfef258e89e74 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 31 May 2018 10:55:58 +1200
Subject: [PATCH 0280/1036] #1397 - @DbForeignKey(noConstraint = true) is
 ignored on @ManyToMany ... foreign constraints still added

---
 .../build/ModelBuildIntersectionTable.java    | 11 ++--
 .../server/deploy/BeanPropertyAssoc.java      | 10 ++++
 .../server/deploy/BeanPropertyAssocOne.java   |  8 ---
 .../deploy/meta/DeployBeanPropertyAssoc.java  | 12 ++++-
 .../meta/DeployBeanPropertyAssocOne.java      | 11 ----
 .../deploy/parse/AnnotationAssocManys.java    |  8 +++
 .../java/org/tests/ddl/DfkNoneViaMtoM.java    | 54 +++++++++++++++++++
 .../org/tests/ddl/TestForeignKeyModes.java    | 35 +++++++++++-
 8 files changed, 124 insertions(+), 25 deletions(-)
 create mode 100644 src/test/java/org/tests/ddl/DfkNoneViaMtoM.java

diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java
index 6772e57d6..9c2cf29ec 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java
@@ -5,6 +5,7 @@ import io.ebeaninternal.dbmigration.model.MTable;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
+import io.ebeaninternal.server.deploy.PropertyForeignKey;
 import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.deploy.TableJoinColumn;
 
@@ -48,10 +49,12 @@ class ModelBuildIntersectionTable {
 
   private void buildFkConstraints() {
 
-    ctx.fkeyBuilder(intersectionTable)
-      .addForeignKey(manyProp.getBeanDescriptor(), intersectionTableJoin, true)
-      .addForeignKey(manyProp.getTargetDescriptor(), tableJoin, false);
-
+    PropertyForeignKey foreignKey = manyProp.getForeignKey();
+    if (foreignKey == null || !foreignKey.isNoConstraint()) {
+      ctx.fkeyBuilder(intersectionTable)
+        .addForeignKey(manyProp.getBeanDescriptor(), intersectionTableJoin, true)
+        .addForeignKey(manyProp.getTargetDescriptor(), tableJoin, false);
+    }
     intersectionTable.checkDuplicateForeignKeys();
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
index 7fa20d8d6..bb4fab41b 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
@@ -65,6 +65,8 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
    */
   final TableJoin tableJoin;
 
+  final PropertyForeignKey foreignKey;
+
   /**
    * The type of the joined bean.
    */
@@ -90,6 +92,7 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
    */
   public BeanPropertyAssoc(BeanDescriptor<?> descriptor, DeployBeanPropertyAssoc<T> deploy) {
     super(descriptor, deploy);
+    this.foreignKey = deploy.getForeignKey();
     this.extraWhere = InternString.intern(deploy.getExtraWhere());
     this.beanTable = deploy.getBeanTable();
     this.mappedBy = InternString.intern(deploy.getMappedBy());
@@ -128,6 +131,13 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
     return fetchPreference;
   }
 
+  /**
+   * Return the extra configuration for the foreign key.
+   */
+  public PropertyForeignKey getForeignKey() {
+    return foreignKey;
+  }
+
   /**
    * Create a ElPropertyValue for a *ToOne or *ToMany.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index 25f84abe1..d29e12946 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -44,8 +44,6 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
 
   private final boolean primaryKeyExport;
 
-  private final PropertyForeignKey foreignKey;
-
   private AssocOneHelp localHelp;
 
   protected final BeanProperty[] embeddedProps;
@@ -73,8 +71,6 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
                               DeployBeanPropertyAssocOne<T> deploy) {
 
     super(descriptor, deploy);
-
-    foreignKey = deploy.getForeignKey();
     primaryKeyExport = deploy.isPrimaryKeyExport();
     oneToOne = deploy.isOneToOne();
     oneToOneExported = deploy.isOneToOneExported();
@@ -323,10 +319,6 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     }
   }
 
-  public PropertyForeignKey getForeignKey() {
-    return foreignKey;
-  }
-
   public boolean hasForeignKey() {
     return foreignKey == null || !foreignKey.isNoConstraint();
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java
index cbe3dc48f..69d9dc747 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.deploy.meta;
 
 import io.ebeaninternal.server.deploy.BeanCascadeInfo;
 import io.ebeaninternal.server.deploy.BeanTable;
+import io.ebeaninternal.server.deploy.PropertyForeignKey;
 
 /**
  * Abstract base for properties mapped to an associated bean, list, set or map.
@@ -16,7 +17,7 @@ public abstract class DeployBeanPropertyAssoc<T> extends DeployBeanProperty {
   /**
    * Persist settings.
    */
-  protected final BeanCascadeInfo cascadeInfo = new BeanCascadeInfo();
+  final BeanCascadeInfo cascadeInfo = new BeanCascadeInfo();
 
   /**
    * The join table information.
@@ -42,6 +43,8 @@ public abstract class DeployBeanPropertyAssoc<T> extends DeployBeanProperty {
 
   private int fetchPreference = 1000;
 
+  private PropertyForeignKey foreignKey;
+
   /**
    * Construct the property.
    */
@@ -117,6 +120,13 @@ public abstract class DeployBeanPropertyAssoc<T> extends DeployBeanProperty {
     return cascadeInfo;
   }
 
+  public void setForeignKey(PropertyForeignKey foreignKey) {
+    this.foreignKey = foreignKey;
+  }
+
+  public PropertyForeignKey getForeignKey() {
+    return foreignKey;
+  }
 
   /**
    * Return the mappedBy deployment attribute.
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
index 920d0141e..4dd42a503 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.deploy.meta;
 
-import io.ebeaninternal.server.deploy.PropertyForeignKey;
 import io.ebeaninternal.server.query.SqlJoinType;
 
 import javax.persistence.CascadeType;
@@ -22,8 +21,6 @@ public class DeployBeanPropertyAssocOne<T> extends DeployBeanPropertyAssoc<T> {
 
   private String columnPrefix;
 
-  private PropertyForeignKey foreignKey;
-
   private boolean orphanRemoval;
 
   /**
@@ -148,14 +145,6 @@ public class DeployBeanPropertyAssocOne<T> extends DeployBeanPropertyAssoc<T> {
     }
   }
 
-  public void setForeignKey(PropertyForeignKey foreignKey) {
-    this.foreignKey = foreignKey;
-  }
-
-  public PropertyForeignKey getForeignKey() {
-    return foreignKey;
-  }
-
   public void setOrphanRemoval(boolean orphanRemoval) {
     this.orphanRemoval = orphanRemoval;
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index 68d3171d4..b628c290b 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.deploy.parse;
 
+import io.ebean.annotation.DbForeignKey;
 import io.ebean.annotation.FetchPreference;
 import io.ebean.annotation.HistoryExclude;
 import io.ebean.annotation.PrivateOwned;
@@ -12,6 +13,7 @@ import io.ebean.util.StringHelper;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanTable;
+import io.ebeaninternal.server.deploy.PropertyForeignKey;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany;
@@ -95,6 +97,12 @@ class AnnotationAssocManys extends AnnotationParser {
       readElementCollection(prop, elementCollection);
     }
 
+    // for ManyToMany typically to disable foreign keys from intersection table
+    DbForeignKey dbForeignKey = get(prop, DbForeignKey.class);
+    if (dbForeignKey != null){
+      prop.setForeignKey(new PropertyForeignKey(dbForeignKey));
+    }
+
     if (get(prop, HistoryExclude.class) != null) {
       prop.setExcludedFromHistory();
     }
diff --git a/src/test/java/org/tests/ddl/DfkNoneViaMtoM.java b/src/test/java/org/tests/ddl/DfkNoneViaMtoM.java
new file mode 100644
index 000000000..9b781e3c8
--- /dev/null
+++ b/src/test/java/org/tests/ddl/DfkNoneViaMtoM.java
@@ -0,0 +1,54 @@
+package org.tests.ddl;
+
+import io.ebean.annotation.DbForeignKey;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+public class DfkNoneViaMtoM {
+
+  @Id
+  long id;
+
+  String name;
+
+  /**
+   * Have no Foreign key constraints on the intersection table.
+   */
+  @ManyToMany(cascade = CascadeType.ALL)
+  @DbForeignKey(noConstraint = true)
+  List<DfkOne> ones = new ArrayList<>();
+
+  public DfkNoneViaMtoM(String name) {
+    this.name = name;
+  }
+
+  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 List<DfkOne> getOnes() {
+    return ones;
+  }
+
+  public void setOnes(List<DfkOne> ones) {
+    this.ones = ones;
+  }
+}
diff --git a/src/test/java/org/tests/ddl/TestForeignKeyModes.java b/src/test/java/org/tests/ddl/TestForeignKeyModes.java
index a9b1216b2..113c72e16 100644
--- a/src/test/java/org/tests/ddl/TestForeignKeyModes.java
+++ b/src/test/java/org/tests/ddl/TestForeignKeyModes.java
@@ -48,6 +48,40 @@ public class TestForeignKeyModes extends BaseTestCase {
     assertThat(found.getOne()).isNotNull();
   }
 
+  @Test
+  public void noneViaManyToMany() {
+
+    DfkOne one = Ebean.getReference(DfkOne.class, 999L);
+
+    DfkNoneViaMtoM none = new DfkNoneViaMtoM("none2");
+    none.getOnes().add(one);
+
+    // Would normally fail as DfkOne id:999 is not actually in Database
+    // and with the foreign key constraint on the intersection table the
+    // insert into the intersection table would fail
+    Ebean.save(none);
+
+    DfkNoneViaMtoM found = Ebean.find(DfkNoneViaMtoM.class)
+      .setId(none.getId())
+      .fetch("ones", "id")
+      .findOne();
+
+    assertThat(found).isNotNull();
+
+    // but we can't actually fetch it via ORM M2M ... as it joins across
+    // to DfkOne and that doesn't exist
+    assertThat(found.getOnes()).isNotNull();
+    assertThat(found.getOnes()).hasSize(0);
+
+    LoggedSqlCollector.start();
+    Ebean.delete(none);
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("delete from dfk_none_via_mto_m_dfk_one where dfk_none_via_mto_m_id = ?");
+    assertThat(sql.get(1)).contains("delete from dfk_none_via_mto_m where id=?");
+  }
+
   @Test
   public void setNullOnDelete() {
 
@@ -63,7 +97,6 @@ public class TestForeignKeyModes extends BaseTestCase {
     DfkSetNull found = Ebean.find(DfkSetNull.class, other.getId());
     assertThat(found).isNotNull();
     assertThat(found.getOne()).isNull();
-
   }
 
   @Test

From 11e3649b854ff2badcedd04a15eea6174043ccfe Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 31 May 2018 16:02:49 +1200
Subject: [PATCH 0281/1036] #1398 - Support EQ / "Equal to" predicate on client
 side encrypted entity property - @Encrypted(dbEncryption = false)

---
 .../server/deploy/BeanFkeyProperty.java       |  5 ++
 .../server/deploy/BeanProperty.java           |  6 ++
 .../server/el/ElPropertyChain.java            |  5 ++
 .../server/el/ElPropertyValue.java            |  5 ++
 .../server/expression/SimpleExpression.java   |  7 +-
 .../server/type/LocalEncryptedType.java       | 12 +++
 .../type/ScalarTypeEncryptedWrapper.java      |  8 +-
 .../basic/encrypt/TestEncryptClientSide.java  | 55 ++++++++++++
 .../model/basic/EBasicEncryptClient.java      | 87 +++++++++++++++++++
 9 files changed, 186 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/type/LocalEncryptedType.java
 create mode 100644 src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java
 create mode 100644 src/test/java/org/tests/model/basic/EBasicEncryptClient.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java b/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java
index 52bb3b4d4..a6908d315 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java
@@ -78,6 +78,11 @@ public final class BeanFkeyProperty implements ElPropertyValue {
     return false;
   }
 
+  @Override
+  public Object localEncrypt(Object value) {
+    throw new IllegalArgumentException("Should not get here?");
+  }
+
   @Override
   public boolean containsFormulaWithJoin() {
     return false;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 8fa2b9af8..7473e01aa 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -28,6 +28,7 @@ import io.ebeaninternal.server.query.STreeProperty;
 import io.ebeaninternal.server.query.SqlBeanLoad;
 import io.ebeaninternal.server.query.SqlJoinType;
 import io.ebeaninternal.server.type.DataBind;
+import io.ebeaninternal.server.type.LocalEncryptedType;
 import io.ebeaninternal.server.type.ScalarType;
 import io.ebeaninternal.server.type.ScalarTypeBoolean;
 import io.ebeaninternal.server.type.ScalarTypeEnum;
@@ -1246,6 +1247,11 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     return dbBind;
   }
 
+  @Override
+  public Object localEncrypt(Object value) {
+    return ((LocalEncryptedType)scalarType).localEncrypt(value);
+  }
+
   /**
    * Returns true if DB encrypted.
    */
diff --git a/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java b/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
index 5d441391c..7afd21a1f 100644
--- a/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
+++ b/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
@@ -174,6 +174,11 @@ public class ElPropertyChain implements ElPropertyValue {
     return lastElPropertyValue.isLocalEncrypted();
   }
 
+  @Override
+  public Object localEncrypt(Object value) {
+    return lastElPropertyValue.localEncrypt(value);
+  }
+
   @Override
   public String getAssocIsEmpty(SpiExpressionRequest request, String path) {
     return lastElPropertyValue.getAssocIsEmpty(request, path);
diff --git a/src/main/java/io/ebeaninternal/server/el/ElPropertyValue.java b/src/main/java/io/ebeaninternal/server/el/ElPropertyValue.java
index bbae84850..f69b33040 100644
--- a/src/main/java/io/ebeaninternal/server/el/ElPropertyValue.java
+++ b/src/main/java/io/ebeaninternal/server/el/ElPropertyValue.java
@@ -52,6 +52,11 @@ public interface ElPropertyValue extends ElPropertyDeploy, ExpressionPath {
    */
   boolean isDbEncrypted();
 
+  /**
+   * Encrypt the input value return the encrypted value.
+   */
+  Object localEncrypt(Object value);
+
   /**
    * Return the value ensuring objects prior to the top scalar property are
    * automatically populated.
diff --git a/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java b/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java
index 4069999c3..f694c78d0 100644
--- a/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java
@@ -84,10 +84,11 @@ public class SimpleExpression extends AbstractValueExpression {
         // bind the key as well as the value
         String encryptKey = prop.getBeanProperty().getEncryptKey().getStringValue();
         request.addBindEncryptKey(encryptKey);
+      } else if (prop.isLocalEncrypted()) {
+        Object bindVal = prop.localEncrypt(value());
+        request.addBindEncryptKey(bindVal);
+        return;
       }
-      //else if (prop.isLocalEncrypted()) {
-      // not supporting this for equals (but probably could)
-      // prop.getBeanProperty().getScalarType();
     }
 
     request.addBindValue(value());
diff --git a/src/main/java/io/ebeaninternal/server/type/LocalEncryptedType.java b/src/main/java/io/ebeaninternal/server/type/LocalEncryptedType.java
new file mode 100644
index 000000000..950bb10a1
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/type/LocalEncryptedType.java
@@ -0,0 +1,12 @@
+package io.ebeaninternal.server.type;
+
+/**
+ * Scalar type that wraps a local/client side encrypted value.
+ */
+public interface LocalEncryptedType {
+
+  /**
+   * Encrypt and return the un-encrypted value.
+   */
+  Object localEncrypt(Object value);
+}
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
index 1b15dbc11..ae0b75be3 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
@@ -9,7 +9,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.sql.SQLException;
 
-public class ScalarTypeEncryptedWrapper<T> implements ScalarType<T> {
+public class ScalarTypeEncryptedWrapper<T> implements ScalarType<T>, LocalEncryptedType {
 
   private final ScalarType<T> wrapped;
 
@@ -23,6 +23,12 @@ public class ScalarTypeEncryptedWrapper<T> implements ScalarType<T> {
     this.dataEncryptSupport = dataEncryptSupport;
   }
 
+  @Override
+  public Object localEncrypt(Object value) {
+    String formatValue = wrapped.format(value);
+    return dataEncryptSupport.encryptObject(formatValue);
+  }
+
   @Override
   public long asVersion(T value) {
     throw new RuntimeException("not supported");
diff --git a/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java b/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java
new file mode 100644
index 000000000..e5d59a07b
--- /dev/null
+++ b/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java
@@ -0,0 +1,55 @@
+package org.tests.basic.encrypt;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.junit.Test;
+import org.tests.model.basic.EBasicEncryptClient;
+
+import java.time.LocalDate;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestEncryptClientSide extends BaseTestCase {
+
+  @Test
+  public void insertUpdate() {
+
+    LocalDate today = LocalDate.now();
+
+    EBasicEncryptClient bean = new EBasicEncryptClient();
+    bean.setDescription("hello");
+    bean.setStatus(EBasicEncryptClient.Status.ONE);
+    bean.setDob(today);
+
+    Ebean.save(bean);
+
+    EBasicEncryptClient found = Ebean.find(EBasicEncryptClient.class)
+      .where()
+      .eq("description", "hello")
+      .eq("status", EBasicEncryptClient.Status.ONE)
+      .eq("dob", today)
+      .findOne();
+
+    assertThat(found).isNotNull();
+    assertThat(found.getDescription()).isEqualTo("hello");
+    assertThat(found.getStatus()).isEqualTo(EBasicEncryptClient.Status.ONE);
+    assertThat(found.getDob()).isEqualTo(today);
+
+
+    found.setDescription("goodbye");
+    found.setStatus(EBasicEncryptClient.Status.TWO);
+    Ebean.save(found);
+
+    found = Ebean.find(EBasicEncryptClient.class)
+      .where()
+      .eq("description", "goodbye")
+      .eq("status", EBasicEncryptClient.Status.TWO)
+      .eq("dob", today)
+      .findOne();
+
+    assertThat(found).isNotNull();
+    assertThat(found.getDescription()).isEqualTo("goodbye");
+
+    Ebean.delete(found);
+  }
+}
diff --git a/src/test/java/org/tests/model/basic/EBasicEncryptClient.java b/src/test/java/org/tests/model/basic/EBasicEncryptClient.java
new file mode 100644
index 000000000..64426c075
--- /dev/null
+++ b/src/test/java/org/tests/model/basic/EBasicEncryptClient.java
@@ -0,0 +1,87 @@
+package org.tests.model.basic;
+
+import io.ebean.annotation.Encrypted;
+
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Version;
+import java.time.LocalDate;
+
+@Entity
+@Table(name = "e_basicenc_client")
+public class EBasicEncryptClient {
+
+  public enum Status {
+    ONE,
+    TWO
+  }
+
+  @Id
+  long id;
+
+  String name;
+
+  @Encrypted(dbLength = 80, dbEncryption = false)
+  String description;
+
+  @Encrypted(dbLength = 20, dbEncryption = false)
+  LocalDate dob;
+
+  @Enumerated(EnumType.ORDINAL)
+  @Encrypted(dbLength = 20, dbEncryption = false)
+  Status status;
+
+  @Version
+  long version;
+
+  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 LocalDate getDob() {
+    return dob;
+  }
+
+  public void setDob(LocalDate dob) {
+    this.dob = dob;
+  }
+
+  public Status getStatus() {
+    return status;
+  }
+
+  public void setStatus(Status status) {
+    this.status = status;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}

From 10ad9ef09600b040de5ab72f4c3efe58e9962a0d Mon Sep 17 00:00:00 2001
From: ooknight <ooknight@163.com>
Date: Thu, 31 May 2018 16:23:52 +0800
Subject: [PATCH 0282/1036] beautify bindNoLog format (#1399)

---
 .../java/io/ebeaninternal/server/persist/dml/DmlHandler.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
index 3b7d0e857..4ad8089af 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
@@ -187,7 +187,10 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
   @Override
   public void bindNoLog(Object value, int sqlType, String logPlaceHolder) throws SQLException {
     if (logLevelSql) {
-      bindLog.append(logPlaceHolder).append(" ");
+      if (bindLog.length() > 0) {
+        bindLog.append(",");
+      }
+      bindLog.append(logPlaceHolder);
     }
     dataBind.setObject(value, sqlType);
   }

From d459807af725dd14804e9de8acbbb7015bffb074 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 1 Jun 2018 09:19:26 +1200
Subject: [PATCH 0283/1036] #1402 - Refactor SQL Logging internals
 (io.ebean.SQL) such that it is easier to capture for testing/asserts

---
 .../io/ebeaninternal/api/SpiEbeanServer.java  |  5 +++
 .../io/ebeaninternal/api/SpiLogManager.java   | 27 ++++++++++++++
 .../java/io/ebeaninternal/api/SpiLogger.java  | 31 ++++++++++++++++
 .../server/core/AbstractSqlQueryRequest.java  |  6 +--
 .../server/core/DefaultServer.java            |  9 +++++
 .../server/core/InternalConfiguration.java    | 29 +++++++++++++--
 .../ebeaninternal/server/persist/Binder.java  | 11 ++----
 .../server/persist/dml/DmlHandler.java        |  4 +-
 .../server/query/CQueryEngine.java            | 14 ++-----
 .../ImplicitReadOnlyTransaction.java          | 13 +++++--
 .../server/transaction/JdbcTransaction.java   | 15 ++++++--
 .../transaction/SavepointTransaction.java     |  8 ++--
 .../transaction/TransactionFactory.java       |  7 +---
 .../transaction/TransactionManager.java       | 37 +++++++++++++------
 .../TransactionManagerOptions.java            |  5 ++-
 .../ebeaninternal/api/TDSpiEbeanServer.java   |  5 +++
 16 files changed, 167 insertions(+), 59 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/api/SpiLogManager.java
 create mode 100644 src/main/java/io/ebeaninternal/api/SpiLogger.java

diff --git a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
index a4d887365..b8c9e8e02 100644
--- a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
+++ b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
@@ -31,6 +31,11 @@ import java.util.function.Predicate;
  */
 public interface SpiEbeanServer extends EbeanServer, BeanLoader, BeanCollectionLoader {
 
+  /**
+   * Return the log manager.
+   */
+  SpiLogManager log();
+
   /**
    * Return the server extended Json context.
    */
diff --git a/src/main/java/io/ebeaninternal/api/SpiLogManager.java b/src/main/java/io/ebeaninternal/api/SpiLogManager.java
new file mode 100644
index 000000000..ed8f0a3ff
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/api/SpiLogManager.java
@@ -0,0 +1,27 @@
+package io.ebeaninternal.api;
+
+/**
+ * Log manager for SQL, TXN and Summary logging.
+ * <p>
+ * In general at runtime this uses SLF4J Logger but this abstraction allows us to capture
+ * the logged SQL during testing such that we can assert against the executed sql if desired.
+ * </p>
+ */
+public interface SpiLogManager {
+
+  /**
+   * Return the SQL logger.
+   */
+  SpiLogger sql();
+
+  /**
+   * Return the TXN logger.
+   */
+  SpiLogger txn();
+
+  /**
+   * Return the Summary logger.
+   */
+  SpiLogger sum();
+
+}
diff --git a/src/main/java/io/ebeaninternal/api/SpiLogger.java b/src/main/java/io/ebeaninternal/api/SpiLogger.java
new file mode 100644
index 000000000..8e6d5e71c
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/api/SpiLogger.java
@@ -0,0 +1,31 @@
+package io.ebeaninternal.api;
+
+/**
+ * Logger for SQL, TXN and Summary logging.
+ * <p>
+ * In general at runtime this uses SLF4J Logger but this abstraction allows us to capture
+ * the logged SQL during testing such that we can assert against the executed sql if desired.
+ * </p>
+ */
+public interface SpiLogger {
+
+  /**
+   * Is debug logging enabled.
+   */
+  boolean isDebug();
+
+  /**
+   * Is trace logging enabled.
+   */
+  boolean isTrace();
+
+  /**
+   * Log a debug level message.
+   */
+  void debug(String msg);
+
+  /**
+   * Log a trace level message.
+   */
+  void trace(String msg);
+}
diff --git a/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
index 41371c912..d827d5dcf 100644
--- a/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
@@ -170,11 +170,7 @@ public abstract class AbstractSqlQueryRequest {
     }
 
     if (isLogSql()) {
-      String logSql = TrimLogSql.trim(sql);
-      if (TransactionManager.SQL_LOGGER.isTraceEnabled()) {
-        logSql = Str.add(logSql, "; --bind(", bindLog, ")");
-      }
-      trans.logSql(logSql);
+      trans.logSql(Str.add(TrimLogSql.trim(sql), "; --bind(", bindLog, ")"));
     }
 
     setResultSet(pstmt.executeQuery(), null);
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index c63638240..217d163f7 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -64,6 +64,7 @@ import io.ebeaninternal.api.SpiBackgroundExecutor;
 import io.ebeaninternal.api.SpiDtoQuery;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiJsonContext;
+import io.ebeaninternal.api.SpiLogManager;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.SpiQuery.Type;
 import io.ebeaninternal.api.SpiSqlUpdate;
@@ -191,6 +192,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   private final CurrentTenantProvider currentTenantProvider;
 
+  private final SpiLogManager logManager;
+
   /**
    * The default PersistenceContextScope used if it is not explicitly set on a query.
    */
@@ -231,6 +234,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    */
   public DefaultServer(InternalConfiguration config, ServerCacheManager cache) {
 
+    this.logManager = config.getLogManager();
     this.dtoBeanManager = config.getDtoBeanManager();
     this.serverConfig = config.getServerConfig();
     this.objectGraphStats = new ConcurrentHashMap<>();
@@ -317,6 +321,11 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Override
+  public SpiLogManager log() {
+    return logManager;
+  }
+
   @Override
   public boolean isCollectQueryOrigins() {
     return collectQueryOrigins;
diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index 31aea3889..948223dd6 100644
--- a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -20,6 +20,8 @@ import io.ebean.plugin.SpiServer;
 import io.ebeaninternal.api.SpiBackgroundExecutor;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiJsonContext;
+import io.ebeaninternal.api.SpiLogManager;
+import io.ebeaninternal.api.SpiLogger;
 import io.ebeaninternal.api.SpiProfileHandler;
 import io.ebeaninternal.dbmigration.DbOffline;
 import io.ebeaninternal.server.autotune.AutoTuneService;
@@ -44,6 +46,8 @@ import io.ebeaninternal.server.dto.DtoBeanManager;
 import io.ebeaninternal.server.expression.DefaultExpressionFactory;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandlerFactory;
+import io.ebeaninternal.server.log.DLogManager;
+import io.ebeaninternal.server.log.DSpiLogger;
 import io.ebeaninternal.server.persist.Binder;
 import io.ebeaninternal.server.persist.DefaultPersister;
 import io.ebeaninternal.server.persist.platform.MultiValueBind;
@@ -134,10 +138,13 @@ public class InternalConfiguration {
 
   private final MultiValueBind multiValueBind;
 
+  private final SpiLogManager logManager;
+
   public InternalConfiguration(ClusterManager clusterManager,
                                SpiCacheManager cacheManager, SpiBackgroundExecutor backgroundExecutor,
                                ServerConfig serverConfig, BootupClasses bootupClasses) {
 
+    this.logManager = initLogManager();
     this.docStoreFactory = initDocStoreFactory(serverConfig.service(DocStoreFactory.class));
     this.jsonFactory = serverConfig.getJsonFactory();
     this.clusterManager = clusterManager;
@@ -169,6 +176,18 @@ public class InternalConfiguration {
     this.cQueryEngine = new CQueryEngine(serverConfig, databasePlatform, binder, asOfTableMapping, draftTableMap);
   }
 
+  private SpiLogManager initLogManager() {
+
+    SpiLogger sql = logger("io.ebean.SQL");
+    SpiLogger sum = logger("io.ebean.SUM");
+    SpiLogger txn = logger("io.ebean.TXN");
+    return new DLogManager(sql, sum, txn);
+  }
+
+  private DSpiLogger logger(String name) {
+    return new DSpiLogger(LoggerFactory.getLogger(name));
+  }
+
   /**
    * Create and return the ExpressionFactory based on configuration and database platform.
    */
@@ -262,9 +281,9 @@ public class InternalConfiguration {
 
     DbHistorySupport historySupport = databasePlatform.getHistorySupport();
     if (historySupport == null) {
-      return new Binder(typeManager, 0, false, jsonHandler, dataTimeZone, multiValueBind);
+      return new Binder(typeManager, logManager, 0, false, jsonHandler, dataTimeZone, multiValueBind);
     }
-    return new Binder(typeManager, historySupport.getBindCount(), historySupport.isStandardsBased(), jsonHandler, dataTimeZone, multiValueBind);
+    return new Binder(typeManager, logManager, historySupport.getBindCount(), historySupport.isStandardsBased(), jsonHandler, dataTimeZone, multiValueBind);
   }
 
   /**
@@ -378,7 +397,7 @@ public class InternalConfiguration {
 
     TransactionManagerOptions options =
       new TransactionManagerOptions(notifyL2CacheInForeground, serverConfig, scopeManager, clusterManager, backgroundExecutor,
-                                    indexUpdateProcessor, beanDescriptorManager, dataSource(), profileHandler());
+                                    indexUpdateProcessor, beanDescriptorManager, dataSource(), profileHandler(), logManager);
 
     if (serverConfig.isExplicitTransactionBeginMode()) {
       return new ExplicitTransactionManager(options);
@@ -511,4 +530,8 @@ public class InternalConfiguration {
   public DtoBeanManager getDtoBeanManager() {
     return dtoBeanManager;
   }
+
+  public SpiLogManager getLogManager() {
+    return logManager;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/persist/Binder.java b/src/main/java/io/ebeaninternal/server/persist/Binder.java
index 55833eae5..3ab04e410 100644
--- a/src/main/java/io/ebeaninternal/server/persist/Binder.java
+++ b/src/main/java/io/ebeaninternal/server/persist/Binder.java
@@ -2,11 +2,11 @@ package io.ebeaninternal.server.persist;
 
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebeaninternal.api.BindParams;
+import io.ebeaninternal.api.SpiLogManager;
 import io.ebeaninternal.server.core.Message;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
 import io.ebeaninternal.server.persist.platform.MultiValueBind;
-import io.ebeaninternal.server.transaction.TransactionManager;
 import io.ebeaninternal.server.type.DataBind;
 import io.ebeaninternal.server.type.ScalarType;
 import io.ebeaninternal.server.type.TypeManager;
@@ -48,7 +48,7 @@ public class Binder {
   /**
    * Set the PreparedStatement with which to bind variables to.
    */
-  public Binder(TypeManager typeManager, int asOfBindCount, boolean asOfStandardsBased,
+  public Binder(TypeManager typeManager, SpiLogManager logManager, int asOfBindCount, boolean asOfStandardsBased,
                 DbExpressionHandler dbExpressionHandler, DataTimeZone dataTimeZone, MultiValueBind multiValueBind) {
 
     this.typeManager = typeManager;
@@ -57,12 +57,7 @@ public class Binder {
     this.dbExpressionHandler = dbExpressionHandler;
     this.dataTimeZone = dataTimeZone;
     this.multiValueBind = multiValueBind;
-    this.enableBindLog = enableBindLog();
-  }
-
-  private boolean enableBindLog() {
-    return TransactionManager.SQL_LOGGER.isDebugEnabled()
-      || TransactionManager.SUM_LOGGER.isDebugEnabled();
+    this.enableBindLog = logManager.sql().isDebug();
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
index 3b7d0e857..cf44531a7 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
@@ -154,9 +154,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
    */
   protected void logSql(String sql) {
     if (logLevelSql) {
-      if (TransactionManager.SQL_LOGGER.isTraceEnabled()) {
-        sql = Str.add(sql, "; --bind(", bindLog.toString(), ")");
-      }
+      sql = Str.add(sql, "; --bind(", bindLog.toString(), ")");
       transaction.logSql(sql);
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
index d4a3bd6ba..27fd490e5 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
@@ -82,9 +82,7 @@ public class CQueryEngine {
 
       if (request.isLogSql()) {
         String logSql = query.getGeneratedSql();
-        if (TransactionManager.SQL_LOGGER.isTraceEnabled()) {
-          logSql = Str.add(logSql, "; --bind(", query.getBindLog(), ") rows:", String.valueOf(rows));
-        }
+        logSql = Str.add(logSql, "; --bind(", query.getBindLog(), ") rows:", String.valueOf(rows));
         request.logSql(logSql);
       }
 
@@ -151,11 +149,7 @@ public class CQueryEngine {
   }
 
   private <T> void logGeneratedSql(OrmQueryRequest<T> request, String sql, String bindLog) {
-    String logSql = sql;
-    if (TransactionManager.SQL_LOGGER.isTraceEnabled()) {
-      logSql = Str.add(logSql, "; --bind(", bindLog, ")");
-    }
-    request.logSql(logSql);
+    request.logSql(Str.add(sql, "; --bind(", bindLog, ")"));
   }
 
   /**
@@ -458,9 +452,7 @@ public class CQueryEngine {
   private void logSql(CQuery<?> query) {
 
     String sql = query.getGeneratedSql();
-    if (TransactionManager.SQL_LOGGER.isTraceEnabled()) {
-      sql = Str.add(sql, "; --bind(", query.getBindLog(), ")");
-    }
+    sql = Str.add(sql, "; --bind(", query.getBindLog(), ")");
     query.getTransaction().logSql(sql);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
index d23fde6d5..066a7504e 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
@@ -43,6 +43,9 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
 
   private final TransactionManager manager;
 
+  private final boolean logSql;
+  private final boolean logSummary;
+
   /**
    * The status of the transaction.
    */
@@ -70,6 +73,8 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
    */
   ImplicitReadOnlyTransaction(TransactionManager manager, Connection connection) {
     this.manager = manager;
+    this.logSql = manager.isLogSql();
+    this.logSummary = manager.isLogSummary();
     this.active = true;
     this.connection = connection;
     this.persistenceContext = new DefaultPersistenceContext();
@@ -441,22 +446,22 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
 
   @Override
   public boolean isLogSql() {
-    return TransactionManager.SQL_LOGGER.isDebugEnabled();
+    return logSql;
   }
 
   @Override
   public boolean isLogSummary() {
-    return TransactionManager.SUM_LOGGER.isDebugEnabled();
+    return logSummary;
   }
 
   @Override
   public void logSql(String msg) {
-    TransactionManager.SQL_LOGGER.debug(msg);
+    manager.log().sql().debug(msg);
   }
 
   @Override
   public void logSummary(String msg) {
-    TransactionManager.SUM_LOGGER.debug(msg);
+    manager.log().sum().debug(msg);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index 57c546bdc..4f6ec5bd1 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -55,6 +55,9 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    */
   protected final String id;
 
+  private final boolean logSql;
+  private final boolean logSummary;
+
   /**
    * The user defined label to group execution statistics.
    */
@@ -200,11 +203,15 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
       this.startNanos = System.nanoTime();
 
       if (manager == null) {
+        this.logSql = false;
+        this.logSummary = false;
         this.skipCacheAfterWrite = true;
         this.batchMode = PersistBatch.NONE;
         this.batchOnCascadeMode = PersistBatch.NONE;
         this.onQueryOnly = OnQueryOnly.ROLLBACK;
       } else {
+        this.logSql = manager.isLogSql();
+        this.logSummary = manager.isLogSummary();
         this.skipCacheAfterWrite = manager.isSkipCacheAfterWrite();
         this.batchMode = manager.getPersistBatch();
         this.batchOnCascadeMode = manager.getPersistBatchOnCascade();
@@ -861,22 +868,22 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
 
   @Override
   public boolean isLogSql() {
-    return TransactionManager.SQL_LOGGER.isDebugEnabled();
+    return logSql;
   }
 
   @Override
   public boolean isLogSummary() {
-    return TransactionManager.SUM_LOGGER.isDebugEnabled();
+    return logSummary;
   }
 
   @Override
   public void logSql(String msg) {
-    TransactionManager.SQL_LOGGER.debug(Str.add(logPrefix, msg));
+    manager.log().sql().debug(Str.add(logPrefix, msg));
   }
 
   @Override
   public void logSummary(String msg) {
-    TransactionManager.SUM_LOGGER.debug(Str.add(logPrefix, msg));
+    manager.log().sum().debug(Str.add(logPrefix, msg));
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
index 4d6525c55..7987201e2 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
@@ -21,6 +21,7 @@ class SavepointTransaction extends SpiTransactionProxy {
   private final Savepoint savepoint;
   private final Connection connection;
   private final String logPrefix;
+  private final String spPrefix;
 
   private boolean rollbackOnly;
   private int state;
@@ -31,7 +32,8 @@ class SavepointTransaction extends SpiTransactionProxy {
     this.connection = transaction.getInternalConnection();
     this.savepoint = connection.setSavepoint();
     int savepointId = savepoint.getSavepointId();
-    this.logPrefix = "txn[" + transaction.getId() + "-sp" + savepointId + "] ";
+    this.spPrefix = "sp[" + savepointId + "] ";
+    this.logPrefix = transaction.getLogPrefix() + spPrefix;
   }
 
   @Override
@@ -41,12 +43,12 @@ class SavepointTransaction extends SpiTransactionProxy {
 
   @Override
   public void logSql(String msg) {
-    TransactionManager.SQL_LOGGER.debug(Str.add(logPrefix, msg));
+    transaction.logSql(Str.add(spPrefix, msg));
   }
 
   @Override
   public void logSummary(String msg) {
-    TransactionManager.SUM_LOGGER.debug(Str.add(logPrefix, msg));
+    transaction.logSummary(Str.add(spPrefix, msg));
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java
index c30a430ba..fedcd5f3a 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java
@@ -2,7 +2,6 @@ package io.ebeaninternal.server.transaction;
 
 import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.SpiTransaction;
-import org.slf4j.Logger;
 
 import javax.persistence.PersistenceException;
 import java.sql.Connection;
@@ -14,8 +13,6 @@ import java.util.concurrent.atomic.AtomicLong;
  */
 abstract class TransactionFactory {
 
-  static final Logger TXN_LOGGER = TransactionManager.TXN_LOGGER;
-
   final AtomicLong counter = new AtomicLong(1000);
 
   final TransactionManager manager;
@@ -51,8 +48,8 @@ abstract class TransactionFactory {
       }
     }
 
-    if (explicit && TXN_LOGGER.isTraceEnabled()) {
-      TXN_LOGGER.trace(t.getLogPrefix() + "Begin");
+    if (explicit && manager.log().txn().isTrace()) {
+      manager.log().txn().trace(t.getLogPrefix() + "Begin");
     }
 
     return t;
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index 0f5e26086..0e9c91d62 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -15,6 +15,8 @@ import io.ebean.meta.MetricType;
 import io.ebean.meta.MetricVisitor;
 import io.ebeaninternal.api.ScopeTrans;
 import io.ebeaninternal.api.ScopedTransaction;
+import io.ebeaninternal.api.SpiLogManager;
+import io.ebeaninternal.api.SpiLogger;
 import io.ebeaninternal.api.SpiProfileHandler;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.api.SpiTransactionManager;
@@ -53,12 +55,6 @@ public class TransactionManager implements SpiTransactionManager {
 
   public static final Logger clusterLogger = LoggerFactory.getLogger("io.ebean.Cluster");
 
-  public static final Logger SQL_LOGGER = LoggerFactory.getLogger("io.ebean.SQL");
-
-  public static final Logger SUM_LOGGER = LoggerFactory.getLogger("io.ebean.SUM");
-
-  public static final Logger TXN_LOGGER = LoggerFactory.getLogger("io.ebean.TXN");
-
   protected final BeanDescriptorManager beanDescriptorManager;
 
   /**
@@ -128,6 +124,9 @@ public class TransactionManager implements SpiTransactionManager {
 
   private final TransactionFactory transactionFactory;
 
+  private final SpiLogManager logManager;
+  private final SpiLogger txnLogger;
+
   private final DatabasePlatform databasePlatform;
 
   private final SpiProfileHandler profileHandler;
@@ -142,6 +141,8 @@ public class TransactionManager implements SpiTransactionManager {
    */
   public TransactionManager(TransactionManagerOptions options) {
 
+    this.logManager = options.logManager;
+    this.txnLogger = logManager.txn();
     this.databasePlatform = options.config.getDatabasePlatform();
     this.skipCacheAfterWrite = options.config.isSkipCacheAfterWrite();
     this.notifyL2CacheInForeground = options.notifyL2CacheInForeground;
@@ -355,12 +356,12 @@ public class TransactionManager implements SpiTransactionManager {
   public void notifyOfRollback(SpiTransaction transaction, Throwable cause) {
 
     try {
-      if (TXN_LOGGER.isDebugEnabled()) {
+      if (txnLogger.isDebug()) {
         String msg = transaction.getLogPrefix() + "Rollback";
         if (cause != null) {
           msg += " error: " + formatThrowable(cause);
         }
-        TXN_LOGGER.debug(msg);
+        txnLogger.debug(msg);
       }
 
     } catch (Exception ex) {
@@ -374,8 +375,8 @@ public class TransactionManager implements SpiTransactionManager {
   public void notifyOfQueryOnly(SpiTransaction transaction) {
 
     // Nothing that interesting here
-    if (TXN_LOGGER.isTraceEnabled()) {
-      TXN_LOGGER.trace(transaction.getLogPrefix() + "Commit - query only");
+    if (txnLogger.isTrace()) {
+      txnLogger.trace(transaction.getLogPrefix() + "Commit - query only");
     }
   }
 
@@ -409,8 +410,8 @@ public class TransactionManager implements SpiTransactionManager {
   public void notifyOfCommit(SpiTransaction transaction) {
 
     try {
-      if (TXN_LOGGER.isDebugEnabled()) {
-        TXN_LOGGER.debug(transaction.getLogPrefix() + "Commit");
+      if (txnLogger.isDebug()) {
+        txnLogger.debug(transaction.getLogPrefix() + "Commit");
       }
 
       PostCommitProcessing postCommit = new PostCommitProcessing(clusterManager, this, transaction);
@@ -702,4 +703,16 @@ public class TransactionManager implements SpiTransactionManager {
         throw new RuntimeException("Should never get here?");
     }
   }
+
+  public SpiLogManager log() {
+    return logManager;
+  }
+
+  public boolean isLogSql() {
+    return logManager.sql().isDebug();
+  }
+
+  public boolean isLogSummary() {
+    return logManager.sum().isDebug();
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java
index 6c8c40d47..fe8b8d217 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.transaction;
 
 import io.ebean.BackgroundExecutor;
 import io.ebean.config.ServerConfig;
+import io.ebeaninternal.api.SpiLogManager;
 import io.ebeaninternal.api.SpiProfileHandler;
 import io.ebeaninternal.server.cluster.ClusterManager;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
@@ -22,10 +23,11 @@ public class TransactionManagerOptions {
   final DataSourceSupplier dataSourceSupplier;
   final SpiProfileHandler profileHandler;
   final TransactionScopeManager scopeManager;
+  final SpiLogManager logManager;
 
   public TransactionManagerOptions(boolean notifyL2CacheInForeground, ServerConfig config, TransactionScopeManager scopeManager, ClusterManager clusterManager,
                                    BackgroundExecutor backgroundExecutor, DocStoreUpdateProcessor docStoreUpdateProcessor,
-                                   BeanDescriptorManager descMgr, DataSourceSupplier dataSourceSupplier, SpiProfileHandler profileHandler) {
+                                   BeanDescriptorManager descMgr, DataSourceSupplier dataSourceSupplier, SpiProfileHandler profileHandler, SpiLogManager logManager) {
 
     this.notifyL2CacheInForeground = notifyL2CacheInForeground;
     this.config = config;
@@ -36,6 +38,7 @@ public class TransactionManagerOptions {
     this.descMgr = descMgr;
     this.dataSourceSupplier = dataSourceSupplier;
     this.profileHandler = profileHandler;
+    this.logManager = logManager;
   }
 
 }
diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index 4465cb69c..fcab9b1a9 100644
--- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -77,6 +77,11 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
     this.name = name;
   }
 
+  @Override
+  public SpiLogManager log() {
+    return null;
+  }
+
   @Override
   public void shutdownManaged() {
 

From e9faef26924b0a82096c71aa27433b851baf39ff Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 1 Jun 2018 11:33:41 +1200
Subject: [PATCH 0284/1036] #1401 - FOR UPDATE queries inside a transaction are
 not honored when beans are already cached (in the persistence context)

---
 .../java/io/ebeaninternal/api/SpiQuery.java   |  4 +-
 .../autotune/service/BaseQueryTuner.java      |  2 +-
 .../server/core/DefaultServer.java            |  2 +-
 .../server/querydefn/DefaultOrmQuery.java     |  4 +-
 .../org/tests/basic/TestQueryForUpdate.java   | 38 +++++++++++++++++++
 5 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/api/SpiQuery.java b/src/main/java/io/ebeaninternal/api/SpiQuery.java
index 4f7184830..ae8b83805 100644
--- a/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -644,9 +644,9 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
   boolean isBeanCachePut();
 
   /**
-   * Return true if the bean cache is being explicitly loaded via RECACHE mode.
+   * Return true if we must hit the DB (Cache reload or select for update).
    */
-  boolean isBeanCacheReload();
+  boolean isForceHitDatabase();
 
   /**
    * Return the cache mode for using the bean cache (Get and Put).
diff --git a/src/main/java/io/ebeaninternal/server/autotune/service/BaseQueryTuner.java b/src/main/java/io/ebeaninternal/server/autotune/service/BaseQueryTuner.java
index 1014219e6..1c4d82e66 100644
--- a/src/main/java/io/ebeaninternal/server/autotune/service/BaseQueryTuner.java
+++ b/src/main/java/io/ebeaninternal/server/autotune/service/BaseQueryTuner.java
@@ -144,7 +144,7 @@ public class BaseQueryTuner {
       default:
         // not using autoTune when explicitly loading the l2 bean cache
         // or when using Versions query
-        return !query.isBeanCacheReload() && SpiQuery.TemporalMode.VERSIONS != query.getTemporalMode();
+        return !query.isForceHitDatabase() && SpiQuery.TemporalMode.VERSIONS != query.getTemporalMode();
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index c63638240..2e2d2082c 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -1166,7 +1166,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
     SpiQuery<T> spiQuery = (SpiQuery<T>) query;
     spiQuery.setType(Type.BEAN);
-    if (SpiQuery.Mode.NORMAL == spiQuery.getMode() && !spiQuery.isBeanCacheReload()) {
+    if (SpiQuery.Mode.NORMAL == spiQuery.getMode() && !spiQuery.isForceHitDatabase()) {
       // See if we can skip doing the fetch completely by getting the bean from the
       // persistence context or the bean cache
       T bean = findIdCheckPersistenceContextAndCache(t, spiQuery, spiQuery.getId());
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 50683c1dc..be5b769c5 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1276,8 +1276,8 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public boolean isBeanCacheReload() {
-    return CacheMode.PUT == useBeanCache;
+  public boolean isForceHitDatabase() {
+    return forUpdate != null || CacheMode.PUT == useBeanCache;
   }
 
   @Override
diff --git a/src/test/java/org/tests/basic/TestQueryForUpdate.java b/src/test/java/org/tests/basic/TestQueryForUpdate.java
index c72884b89..54f339ffc 100644
--- a/src/test/java/org/tests/basic/TestQueryForUpdate.java
+++ b/src/test/java/org/tests/basic/TestQueryForUpdate.java
@@ -8,8 +8,10 @@ import io.ebean.Query;
 import io.ebean.Transaction;
 import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
+import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
+import org.tests.model.basic.EBasic;
 import org.tests.model.basic.ResetBasicData;
 
 import java.util.List;
@@ -40,6 +42,42 @@ public class TestQueryForUpdate extends BaseTestCase {
     }
   }
 
+  @Test
+  @ForPlatform({
+    Platform.H2, Platform.ORACLE, Platform.POSTGRES, Platform.SQLSERVER, Platform.MYSQL
+  })
+  public void testForUpdate_when_alreadyInPC() {
+
+    EBasic basic = new EBasic("test PC cache");
+    Ebean.save(basic);
+
+    try (Transaction transaction = Ebean.beginTransaction()) {
+
+      LoggedSqlCollector.start();
+
+      EBasic basic0 = Ebean.find(EBasic.class, basic.getId());
+      assertThat(basic0).isNotNull();
+
+      EBasic basic1 = Ebean.find(EBasic.class)
+        .setId( basic.getId())
+        .forUpdate()
+        .findOne();
+
+      assertThat(basic1).isNotNull();
+      assertThat(basic1).isSameAs(basic0);
+
+      List<String> sql = LoggedSqlCollector.stop();
+      assertThat(sql).hasSize(2);
+      if (isH2() || isPostgres()) {
+        assertThat(sql.get(0)).contains("from e_basic t0 where t0.id =");
+        assertThat(sql.get(1)).contains("from e_basic t0 where t0.id =");
+        assertThat(sql.get(1)).contains("for update");
+      }
+
+      transaction.end();
+    }
+  }
+
   @Test
   @ForPlatform({
     Platform.H2, Platform.POSTGRES, Platform.SQLSERVER, Platform.ORACLE

From 2817875706265c04028c0b731f31bd263f1af01b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 1 Jun 2018 14:15:05 +1200
Subject: [PATCH 0285/1036] #1402 - Refactor SQL Logging internals
 (io.ebean.SQL) such that it is easier to capture for testing/asserts

---
 .../server/core/InternalConfiguration.java    |  4 +--
 .../server/logger/DLogManager.java            | 33 +++++++++++++++++++
 .../server/logger/DLoggerFactory.java         | 19 +++++++++++
 .../server/logger/DSpiLogger.java             | 33 +++++++++++++++++++
 .../io/ebeantest/CapturingLoggerFactory.java  |  2 +-
 src/test/java/io/ebeantest/LoggedSql.java     |  2 +-
 6 files changed, 89 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/logger/DLogManager.java
 create mode 100644 src/main/java/io/ebeaninternal/server/logger/DLoggerFactory.java
 create mode 100644 src/main/java/io/ebeaninternal/server/logger/DSpiLogger.java

diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index 8d9b477c4..4ea1988a1 100644
--- a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -47,8 +47,8 @@ import io.ebeaninternal.server.dto.DtoBeanManager;
 import io.ebeaninternal.server.expression.DefaultExpressionFactory;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandlerFactory;
-import io.ebeaninternal.server.log.DLogManager;
-import io.ebeaninternal.server.log.DLoggerFactory;
+import io.ebeaninternal.server.logger.DLogManager;
+import io.ebeaninternal.server.logger.DLoggerFactory;
 import io.ebeaninternal.server.persist.Binder;
 import io.ebeaninternal.server.persist.DefaultPersister;
 import io.ebeaninternal.server.persist.platform.MultiValueBind;
diff --git a/src/main/java/io/ebeaninternal/server/logger/DLogManager.java b/src/main/java/io/ebeaninternal/server/logger/DLogManager.java
new file mode 100644
index 000000000..79ece19fc
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/logger/DLogManager.java
@@ -0,0 +1,33 @@
+package io.ebeaninternal.server.logger;
+
+import io.ebeaninternal.api.SpiLogManager;
+import io.ebeaninternal.api.SpiLogger;
+
+public class DLogManager implements SpiLogManager {
+
+  private final SpiLogger sql;
+  private final SpiLogger summary;
+  private final SpiLogger txn;
+
+  public DLogManager(SpiLogger sql, SpiLogger summary, SpiLogger txn) {
+    this.sql = sql;
+    this.summary = summary;
+    this.txn = txn;
+  }
+
+  @Override
+  public SpiLogger txn() {
+    return txn;
+  }
+
+  @Override
+  public SpiLogger sql() {
+    return sql;
+  }
+
+  @Override
+  public SpiLogger sum() {
+    return summary;
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/logger/DLoggerFactory.java b/src/main/java/io/ebeaninternal/server/logger/DLoggerFactory.java
new file mode 100644
index 000000000..65dbef013
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/logger/DLoggerFactory.java
@@ -0,0 +1,19 @@
+package io.ebeaninternal.server.logger;
+
+import io.ebeaninternal.api.SpiLogger;
+import io.ebeaninternal.api.SpiLoggerFactory;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Default SpiLoggerFactory implementation.
+ */
+public class DLoggerFactory implements SpiLoggerFactory {
+
+  /**
+   * Just use a standard slf4j Logger.
+   */
+  @Override
+  public SpiLogger create(String name) {
+    return new DSpiLogger(LoggerFactory.getLogger(name));
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/logger/DSpiLogger.java b/src/main/java/io/ebeaninternal/server/logger/DSpiLogger.java
new file mode 100644
index 000000000..87b78052f
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/logger/DSpiLogger.java
@@ -0,0 +1,33 @@
+package io.ebeaninternal.server.logger;
+
+import io.ebeaninternal.api.SpiLogger;
+import org.slf4j.Logger;
+
+public class DSpiLogger implements SpiLogger {
+
+  private final Logger logger;
+
+  public DSpiLogger(Logger logger) {
+    this.logger = logger;
+  }
+
+  @Override
+  public boolean isDebug() {
+    return logger.isDebugEnabled();
+  }
+
+  @Override
+  public boolean isTrace() {
+    return logger.isTraceEnabled();
+  }
+
+  @Override
+  public void debug(String msg) {
+    logger.debug(msg);
+  }
+
+  @Override
+  public void trace(String msg) {
+    logger.trace(msg);
+  }
+}
diff --git a/src/test/java/io/ebeantest/CapturingLoggerFactory.java b/src/test/java/io/ebeantest/CapturingLoggerFactory.java
index 25738356a..ebbebd2fe 100644
--- a/src/test/java/io/ebeantest/CapturingLoggerFactory.java
+++ b/src/test/java/io/ebeantest/CapturingLoggerFactory.java
@@ -2,7 +2,7 @@ package io.ebeantest;
 
 import io.ebeaninternal.api.SpiLogger;
 import io.ebeaninternal.api.SpiLoggerFactory;
-import io.ebeaninternal.server.log.DSpiLogger;
+import io.ebeaninternal.server.logger.DSpiLogger;
 import org.slf4j.LoggerFactory;
 
 /**
diff --git a/src/test/java/io/ebeantest/LoggedSql.java b/src/test/java/io/ebeantest/LoggedSql.java
index f0df43294..db7cac92c 100644
--- a/src/test/java/io/ebeantest/LoggedSql.java
+++ b/src/test/java/io/ebeantest/LoggedSql.java
@@ -1,7 +1,7 @@
 package io.ebeantest;
 
 import io.ebeaninternal.api.SpiLogger;
-import io.ebeaninternal.server.log.DSpiLogger;
+import io.ebeaninternal.server.logger.DSpiLogger;
 
 import java.util.List;
 

From 14749daf9bf4f022143060d5fe3dbbb4f8b1a761 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 1 Jun 2018 15:42:24 +1200
Subject: [PATCH 0286/1036] Bump to 11.17.1-SNAPSHOT ... as we added a SPI for
 io.ebeaninternal.api.SpiLogManager (for capturing the io.ebean.SQL log for
 testing purposes)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c52d1e1fe..47dbbb875 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.16.2-SNAPSHOT</version>
+  <version>11.17.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>

From 624d08f46c0e67d2dcf0267aa0cdcb11328f61a3 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 1 Jun 2018 15:43:50 +1200
Subject: [PATCH 0287/1036] [maven-release-plugin] prepare release
 ebean-11.17.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 47dbbb875..d51227309 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.17.1-SNAPSHOT</version>
+  <version>11.17.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.17.1</tag>
   </scm>
 
   <profiles>

From eca6383dba54b2635749c56c39e5b794a0f629d8 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 1 Jun 2018 15:44:03 +1200
Subject: [PATCH 0288/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d51227309..da4068e4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.17.1</version>
+  <version>11.17.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.17.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From eba1003c19b151ea39bc5b01564adf21c47da963 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 7 Jun 2018 00:32:39 +1200
Subject: [PATCH 0289/1036] #1404 - Query.findCount() with
 query.setDistinct(true) ... doesn't give count distinct SQL query

---
 .../server/core/DefaultServer.java            |  7 +-
 .../server/core/OrmQueryRequest.java          | 10 +++
 .../server/query/CQueryBuilder.java           | 64 ++++++++++++++-----
 .../ebeaninternal/server/query/SqlTree.java   |  4 ++
 .../server/query/SqlTreeNode.java             |  4 ++
 .../server/query/SqlTreeNodeBean.java         |  5 ++
 .../server/query/SqlTreeNodeExtraJoin.java    |  5 ++
 .../query/SqlTreeNodeManyWhereJoin.java       |  5 ++
 .../java/org/tests/query/TestRowCount.java    | 51 +++++++++++++--
 9 files changed, 130 insertions(+), 25 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 9ad5f07ef..245673619 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -1294,8 +1294,11 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   @Override
   public <T> int findCount(Query<T> query, Transaction t) {
 
-    SpiQuery<T> copy = ((SpiQuery<T>) query).copy();
-    return findCountWithCopy(copy, t);
+    SpiQuery<T> spiQuery = ((SpiQuery<T>) query);
+    if (!spiQuery.isDistinct()) {
+      spiQuery = spiQuery.copy();
+    }
+    return findCountWithCopy(spiQuery, t);
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index ed09fdb20..799c5b9d2 100644
--- a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -81,6 +81,8 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
 
   private BeanPropertyAssocMany<?> manyProperty;
 
+  private boolean inlineCountDistinct;
+
   /**
    * Create the InternalQueryRequest.
    */
@@ -742,4 +744,12 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
   public void slowQueryCheck(long executionTimeMicros, int rowCount) {
     ebeanServer.slowQueryCheck(executionTimeMicros, rowCount, query);
   }
+
+  public void setInlineCountDistinct() {
+    inlineCountDistinct = true;
+  }
+
+  public boolean isInlineCountDistinct() {
+    return inlineCountDistinct;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 43706cd79..cd1dc413c 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -241,10 +241,14 @@ class CQueryBuilder {
 
     ManyWhereJoins manyWhereJoins = query.getManyWhereJoins();
 
-    if (manyWhereJoins.isFormulaWithJoin()) {
-      query.select(manyWhereJoins.getFormulaProperties());
-    } else {
-      query.setSelectId();
+    boolean countDistinct = query.isDistinct();
+    if (!countDistinct) {
+      // minimise select clause for standard count
+      if (manyWhereJoins.isFormulaWithJoin()) {
+        query.select(manyWhereJoins.getFormulaProperties());
+      } else {
+        query.setSelectId();
+      }
     }
 
     CQueryPredicates predicates = new CQueryPredicates(binder, request);
@@ -263,23 +267,35 @@ class CQueryBuilder {
     }
 
     boolean hasMany = sqlTree.hasMany();
-    String sqlSelect = "select count(*)";
-    if (hasMany) {
-      // need to count distinct id's ...
-      query.setSqlDistinct(true);
-      sqlSelect = null;
+
+    String sqlSelect = null;
+    if (countDistinct) {
+      if (sqlTree.isSingleProperty()) {
+        request.setInlineCountDistinct();
+      }
+    } else {
+      if (hasMany) {
+        // need to count distinct id's ...
+        query.setSqlDistinct(true);
+      } else {
+        sqlSelect = "select count(*)";
+      }
     }
 
     SqlLimitResponse s = buildSql(sqlSelect, request, predicates, sqlTree);
     String sql = s.getSql();
-    if (hasMany || query.isRawSql()) {
-      int pos = sql.lastIndexOf(" order by "); // remove order by - mssql does not accept order by in subqueries
-      if (pos != -1) {
-        sql = sql.substring(0, pos);
-      }
-      sql = "select count(*) from ( " + sql + ")";
-      if (selectCountWithAlias) {
-        sql += " as c";
+
+    if (!request.isInlineCountDistinct()) {
+      if (countDistinct) {
+        sql = wrapSelectCount(sql);
+
+      } else if (hasMany || query.isRawSql()) {
+        // remove order by - mssql does not accept order by in subqueries
+        int pos = sql.lastIndexOf(" order by ");
+        if (pos != -1) {
+          sql = sql.substring(0, pos);
+        }
+        sql = wrapSelectCount(sql);
       }
     }
 
@@ -290,6 +306,14 @@ class CQueryBuilder {
     return new CQueryRowCount(queryPlan, request, predicates);
   }
 
+  private String wrapSelectCount(String sql) {
+    sql = "select count(*) from ( " + sql + ")";
+    if (selectCountWithAlias) {
+      sql += " as c";
+    }
+    return sql;
+  }
+
   /**
    * Return the SQL Select statement as a String. Converts logical property
    * names to physical deployment column names.
@@ -536,6 +560,9 @@ class CQueryBuilder {
       if (!useSqlLimiter) {
         sb.append("select ");
         if (query.isDistinctQuery()) {
+          if (request.isInlineCountDistinct()) {
+            sb.append("count(");
+          }
           sb.append("distinct ");
           String distinctOn = select.getDistinctOn();
           if (distinctOn != null) {
@@ -551,6 +578,9 @@ class CQueryBuilder {
       } else {
         sb.append(select.getSelectSql());
       }
+      if (request.isInlineCountDistinct()) {
+        sb.append(")");
+      }
       if (query.isDistinctQuery() && dbOrderBy != null && !query.isSingleAttribute()) {
         // add the orderBy columns to the select clause (due to distinct)
         sb.append(", ").append(DbOrderByTrim.trim(dbOrderBy));
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTree.java b/src/main/java/io/ebeaninternal/server/query/SqlTree.java
index d4207a9e8..b6ee3c980 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTree.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTree.java
@@ -159,4 +159,8 @@ class SqlTree {
   boolean hasMany() {
     return manyProperty != null || rootNode.hasMany();
   }
+
+  boolean isSingleProperty() {
+    return rootNode.isSingleProperty();
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java
index 8406d1fe2..c503581d8 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java
@@ -83,4 +83,8 @@ interface SqlTreeNode {
    */
   ScalarType<?> getSingleAttributeScalarType();
 
+  /**
+   * Return true if the query is known to only have a single property selected.
+   */
+  boolean isSingleProperty();
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
index 96fd09d05..339b08a95 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
@@ -138,6 +138,11 @@ class SqlTreeNodeBean implements SqlTreeNode {
     return false;
   }
 
+  @Override
+  public boolean isSingleProperty() {
+    return properties != null && properties.length == 1 && children.length == 0;
+  }
+
   @Override
   public ScalarType<?> getSingleAttributeScalarType() {
     if (properties == null || properties.length == 0) {
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
index 17943ddd1..b517965e4 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
@@ -39,6 +39,11 @@ class SqlTreeNodeExtraJoin implements SqlTreeNode {
     this.manyJoin = assocBeanProperty instanceof STreePropertyAssocMany;
   }
 
+  @Override
+  public boolean isSingleProperty() {
+    return false;
+  }
+
   @Override
   public void buildRawSqlSelectChain(List<String> selectChain) {
     // nothing to add
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java
index ae0a810ab..c31ea619c 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java
@@ -36,6 +36,11 @@ class SqlTreeNodeManyWhereJoin implements SqlTreeNode {
     this.parentPrefix = split[0];
   }
 
+  @Override
+  public boolean isSingleProperty() {
+    return false;
+  }
+
   @Override
   public ScalarType<?> getSingleAttributeScalarType() {
     throw new IllegalStateException("No expected");
diff --git a/src/test/java/org/tests/query/TestRowCount.java b/src/test/java/org/tests/query/TestRowCount.java
index f75e5dc6b..ba27f2b5e 100644
--- a/src/test/java/org/tests/query/TestRowCount.java
+++ b/src/test/java/org/tests/query/TestRowCount.java
@@ -3,13 +3,16 @@ package org.tests.query;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import org.junit.Test;
+import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Assert;
-import org.junit.Test;
 
 import java.util.List;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+
 public class TestRowCount extends BaseTestCase {
 
   @Test
@@ -17,8 +20,12 @@ public class TestRowCount extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Query<Order> query = Ebean.find(Order.class).fetch("details").where().gt("id", 1)
-      .gt("details.id", 1).order("id desc");
+    Query<Order> query = Ebean.find(Order.class)
+      .fetch("details")
+      .where()
+      .gt("id", 1)
+      .gt("details.id", 1)
+      .order("id desc");
 
     int rc = query.findCount();
 
@@ -30,8 +37,40 @@ public class TestRowCount extends BaseTestCase {
       order.getStatus();
     }
 
-    Assert.assertEquals("same rc to ids.size() ", rc, ids.size());
-    Assert.assertEquals("same rc to list.size()", rc, list.size());
+    assertEquals("same rc to ids.size() ", rc, ids.size());
+    assertEquals("same rc to list.size()", rc, list.size());
+  }
+
+  @Test
+  public void find_count_distinct_singleProperty() {
+
+    ResetBasicData.reset();
+
+    Query<Customer> query = Ebean.find(Customer.class)
+      .setDistinct(true)
+      .select("anniversary")
+      .where().eq("status", Customer.Status.NEW)
+      .query();
+
+    int count = query.findCount();
+
+    assertThat(sqlOf(query)).contains("select count(distinct t0.anniversary) from o_customer t0 where t0.status = ?");
+    assertThat(count).isGreaterThan(0);
+  }
+
+  @Test
+  public void find_count_distinct_multipleProperties() {
+
+    ResetBasicData.reset();
+
+    Query<Customer> query = Ebean.find(Customer.class)
+      .setDistinct(true)
+      .select("anniversary, status");
+
+    int count = query.findCount();
+
+    assertThat(sqlOf(query)).contains("select count(*) from ( select distinct t0.anniversary, t0.status from o_customer t0)");
+    assertThat(count).isGreaterThan(0);
   }
 
 }

From ffa82681253f29eb0d20efeba3a06ba2ef63a3d9 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 7 Jun 2018 22:17:01 +1200
Subject: [PATCH 0290/1036] #1405 - ENH: Add SqlQuery.findSingleAttribute() ...
 for returning single scalar values via SqlQuery

---
 src/main/java/io/ebean/SqlQuery.java          | 17 +++++++
 .../io/ebeaninternal/api/SpiEbeanServer.java  |  5 +++
 .../server/core/DefaultServer.java            | 14 ++++++
 .../server/core/RelationalQueryEngine.java    |  5 +++
 .../server/core/RelationalQueryRequest.java   | 11 +++++
 .../ebeaninternal/server/persist/Binder.java  |  9 +++-
 .../query/DefaultRelationalQueryEngine.java   | 30 +++++++++++++
 .../querydefn/DefaultRelationalQuery.java     | 16 +++----
 .../server/type/ScalarTypeBigDecimal.java     |  1 -
 .../ebeaninternal/api/TDSpiEbeanServer.java   |  5 +++
 .../org/tests/basic/type/TestSqlRowUUID.java  | 17 +++++--
 .../tests/query/sqlquery/SqlQueryTests.java   | 45 +++++++++++++++++++
 12 files changed, 162 insertions(+), 13 deletions(-)

diff --git a/src/main/java/io/ebean/SqlQuery.java b/src/main/java/io/ebean/SqlQuery.java
index 6c1bcf00b..1e6ec1edf 100644
--- a/src/main/java/io/ebean/SqlQuery.java
+++ b/src/main/java/io/ebean/SqlQuery.java
@@ -83,6 +83,23 @@ public interface SqlQuery extends Serializable {
   @Nonnull
   Optional<SqlRow> findOneOrEmpty();
 
+  /**
+   * Execute the query returning a single scalar attribute.
+   * <pre>@{code
+   *
+   *   String sql = "select max(unit_price) from o_order_detail where order_qty > ?";
+   *
+   *   BigDecimal maxPrice = Ebean.createSqlQuery(sql)
+   *     .setParameter(1, 2)
+   *     .findSingleAttribute(BigDecimal.class);
+   *
+   *
+   * }</pre>
+   *
+   * @param attributeType The type of the returned value
+   */
+  <T> T findSingleAttribute(Class<T> attributeType);
+
   /**
    * The same as bind for named parameters.
    */
diff --git a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
index b8c9e8e02..4de6f02e2 100644
--- a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
+++ b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
@@ -234,6 +234,11 @@ public interface SpiEbeanServer extends EbeanServer, BeanLoader, BeanCollectionL
    */
   void scopedTransactionExit(Object returnOrThrowable, int opCode);
 
+  /**
+   * SqlQuery find single attribute.
+   */
+  <T> T findSingleAttribute(SpiSqlQuery query, Class<T> cls);
+
   /**
    * DTO findList query.
    */
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 245673619..b2f75985b 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -67,6 +67,7 @@ import io.ebeaninternal.api.SpiJsonContext;
 import io.ebeaninternal.api.SpiLogManager;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.SpiQuery.Type;
+import io.ebeaninternal.api.SpiSqlQuery;
 import io.ebeaninternal.api.SpiSqlUpdate;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.api.SpiTransactionManager;
@@ -1585,6 +1586,19 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Override
+  public <T> T findSingleAttribute(SpiSqlQuery query, Class<T> cls) {
+
+    RelationalQueryRequest request = new RelationalQueryRequest(this, relationalQueryEngine, query, null);
+    try {
+      request.initTransIfRequired();
+      return request.findSingleAttribute(cls);
+
+    } finally {
+      request.endTransIfRequired();
+    }
+  }
+
   @Override
   public <T> void findDtoEach(SpiDtoQuery<T> query, Consumer<T> consumer) {
     DtoQueryRequest<T> request = new DtoQueryRequest<>(this, dtoQueryEngine, query);
diff --git a/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java b/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java
index fa2a13b93..038f3842a 100644
--- a/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java
@@ -30,6 +30,11 @@ public interface RelationalQueryEngine {
    */
   void findEach(RelationalQueryRequest request, Predicate<SqlRow> consumer);
 
+  /**
+   * Find single attribute.
+   */
+  <T> T findSingleAttribute(RelationalQueryRequest request, Class<T> cls);
+
   /**
    * Collect SQL query execution statistics.
    */
diff --git a/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
index 24278ea11..221a3d36e 100644
--- a/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
@@ -53,6 +53,10 @@ public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
     }
   }
 
+  public <T> T findSingleAttribute(Class<T> cls) {
+    return queryEngine.findSingleAttribute(this, cls);
+  }
+
   public void findEach(Consumer<SqlRow> consumer) {
     queryEngine.findEach(this, consumer);
   }
@@ -104,4 +108,11 @@ public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
     }
   }
 
+  public ResultSet getResultSet() {
+    return resultSet;
+  }
+
+  public void incrementRows() {
+    rows++;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/persist/Binder.java b/src/main/java/io/ebeaninternal/server/persist/Binder.java
index 3ab04e410..a45aa27f0 100644
--- a/src/main/java/io/ebeaninternal/server/persist/Binder.java
+++ b/src/main/java/io/ebeaninternal/server/persist/Binder.java
@@ -8,6 +8,8 @@ import io.ebeaninternal.server.core.timezone.DataTimeZone;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
 import io.ebeaninternal.server.persist.platform.MultiValueBind;
 import io.ebeaninternal.server.type.DataBind;
+import io.ebeaninternal.server.type.DataReader;
+import io.ebeaninternal.server.type.RsetDataReader;
 import io.ebeaninternal.server.type.ScalarType;
 import io.ebeaninternal.server.type.TypeManager;
 import org.slf4j.Logger;
@@ -18,6 +20,7 @@ import java.math.BigDecimal;
 import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
 import java.util.ArrayList;
@@ -196,7 +199,7 @@ public class Binder {
     }
   }
 
-  private ScalarType<?> getScalarType(Class<?> clazz) {
+  public ScalarType<?> getScalarType(Class<?> clazz) {
     ScalarType<?> type = typeManager.getScalarType(clazz);
     if (type == null) {
       throw new PersistenceException("No ScalarType registered for " + clazz);
@@ -457,4 +460,8 @@ public class Binder {
   public DataBind dataBind(PreparedStatement stmt, Connection connection) {
     return new DataBind(dataTimeZone, stmt, connection);
   }
+
+  public DataReader createDataReader(ResultSet resultSet) {
+    return new RsetDataReader(dataTimeZone, resultSet);
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
index f1282f9d2..9271ae624 100644
--- a/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
@@ -10,6 +10,7 @@ import io.ebeaninternal.server.core.Message;
 import io.ebeaninternal.server.core.RelationalQueryEngine;
 import io.ebeaninternal.server.core.RelationalQueryRequest;
 import io.ebeaninternal.server.persist.Binder;
+import io.ebeaninternal.server.type.ScalarType;
 
 import javax.persistence.PersistenceException;
 import java.sql.SQLException;
@@ -91,6 +92,35 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
     }
   }
 
+  @SuppressWarnings("unchecked")
+  @Override
+  public <T> T findSingleAttribute(RelationalQueryRequest request, Class<T> cls) {
+
+    ScalarType<T> scalarType = (ScalarType<T>) binder.getScalarType(cls);
+    return findScalar(request, scalarType);
+  }
+
+  private <T> T findScalar(RelationalQueryRequest request, ScalarType<T> scalarType) {
+    try {
+      request.executeSql(binder, SpiQuery.Type.ATTRIBUTE);
+
+      T value = null;
+      if (request.next()) {
+        request.incrementRows();
+        value = scalarType.read(binder.createDataReader(request.getResultSet()));
+      }
+
+      request.logSummary();
+      return value;
+
+    } catch (Exception e) {
+      throw new PersistenceException(Message.msg("fetch.error", e.getMessage(), request.getSql()), e);
+
+    } finally {
+      request.close();
+    }
+  }
+
   @Override
   public List<SqlRow> findList(RelationalQueryRequest request) {
 
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
index eb344b003..e5f81c2bf 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.querydefn;
 
-import io.ebean.EbeanServer;
 import io.ebean.SqlRow;
 import io.ebeaninternal.api.BindParams;
+import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiSqlQuery;
 
 import java.util.List;
@@ -17,7 +17,7 @@ public class DefaultRelationalQuery implements SpiSqlQuery {
 
   private static final long serialVersionUID = -1098305779779591068L;
 
-  private final transient EbeanServer server;
+  private final transient SpiEbeanServer server;
 
   private String label;
 
@@ -39,16 +39,11 @@ public class DefaultRelationalQuery implements SpiSqlQuery {
   /**
    * Additional supply a query detail object.
    */
-  public DefaultRelationalQuery(EbeanServer server, String query) {
+  public DefaultRelationalQuery(SpiEbeanServer server, String query) {
     this.server = server;
     this.query = query;
   }
 
-  public DefaultRelationalQuery setQuery(String query) {
-    this.query = query;
-    return this;
-  }
-
   @Override
   public void findEach(Consumer<SqlRow> consumer) {
     server.findEach(this, consumer, null);
@@ -64,6 +59,11 @@ public class DefaultRelationalQuery implements SpiSqlQuery {
     return server.findList(this, null);
   }
 
+  @Override
+  public <T> T findSingleAttribute(Class<T> cls) {
+    return server.findSingleAttribute(this, cls);
+  }
+
   @Override
   public SqlRow findOne() {
     return server.findOne(this, null);
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
index f66149ad0..526f0b4db 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
@@ -32,7 +32,6 @@ public class ScalarTypeBigDecimal extends ScalarTypeBase<BigDecimal> {
 
   @Override
   public BigDecimal read(DataReader dataReader) throws SQLException {
-
     return dataReader.getBigDecimal();
   }
 
diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index fcab9b1a9..ab117a62d 100644
--- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -457,6 +457,11 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
     return null;
   }
 
+  @Override
+  public <T> T findSingleAttribute(SpiSqlQuery query, Class<T> cls) {
+    return null;
+  }
+
   @Override
   public SqlQuery createSqlQuery(String sql) {
     return null;
diff --git a/src/test/java/org/tests/basic/type/TestSqlRowUUID.java b/src/test/java/org/tests/basic/type/TestSqlRowUUID.java
index 9a6161b5b..2ebcb4db0 100644
--- a/src/test/java/org/tests/basic/type/TestSqlRowUUID.java
+++ b/src/test/java/org/tests/basic/type/TestSqlRowUUID.java
@@ -5,11 +5,14 @@ import io.ebean.Ebean;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
 import org.tests.model.basic.TUuidEntity;
-import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.UUID;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+
 public class TestSqlRowUUID extends BaseTestCase {
 
   @Test
@@ -26,9 +29,17 @@ public class TestSqlRowUUID extends BaseTestCase {
 
     UUID id = sqlRow.getUUID("id");
 
-    Assert.assertNotNull(id);
+    assertNotNull(id);
 
     Boolean b = sqlRow.getBoolean("name");
-    Assert.assertFalse(b);
+    assertFalse(b);
+
+
+    SqlQuery q2 = Ebean.createSqlQuery("select id from tuuid_entity where id = :id");
+    q2.setParameter("id", e.getId());
+    UUID value = q2.findSingleAttribute(UUID.class);
+
+    assertThat(value).isEqualTo(e.getId());
+
   }
 }
diff --git a/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java b/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
index 1e0a5e830..bd9b80191 100644
--- a/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
+++ b/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
@@ -10,6 +10,8 @@ import org.junit.Test;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
 
+import java.math.BigDecimal;
+import java.time.OffsetDateTime;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -18,6 +20,49 @@ import static org.junit.Assert.assertEquals;
 
 public class SqlQueryTests extends BaseTestCase {
 
+  @Test
+  public void findSingleAttribute_decimal() {
+
+    ResetBasicData.reset();
+
+    String sql = "select max(unit_price) from o_order_detail where order_qty > ?";
+
+    BigDecimal maxPrice = Ebean.createSqlQuery(sql)
+      .setParameter(1, 2)
+      .findSingleAttribute(BigDecimal.class);
+
+    assertThat(maxPrice).isNotNull();
+  }
+
+  @Test
+  public void findSingleAttribute_long() {
+
+    ResetBasicData.reset();
+
+    String sql = "select count(order_qty) from o_order_detail where unit_price > ?";
+
+    long count = Ebean.createSqlQuery(sql)
+      .setParameter(1, 2)
+      .findSingleAttribute(Long.class);
+
+    assertThat(count).isGreaterThan(0);
+  }
+
+  @Test
+  public void findSingleAttribute_OffsetDateTime() {
+
+    ResetBasicData.reset();
+
+    String sql = "select min(updtime) from o_order_detail where unit_price > ? and updtime is not null";
+
+    OffsetDateTime minCreated = Ebean.createSqlQuery(sql)
+      .setParameter(1, 2)
+      .findSingleAttribute(OffsetDateTime.class);
+
+    assertThat(minCreated).isBefore(OffsetDateTime.now());
+  }
+
+
   @Test
   public void newline_replacedInLogsOnly() {
 

From fb32cfa170529d8013cc7bf5da826c059224b2e5 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 7 Jun 2018 22:39:19 +1200
Subject: [PATCH 0291/1036] #1406 - ENH: Add SqlQuery.findSingleAttributeList()
 ... for returning lists of scalar values via SqlQuery

---
 src/main/java/io/ebean/SqlQuery.java          | 31 ++++++++++++++++++-
 .../io/ebeaninternal/api/SpiEbeanServer.java  |  5 +++
 .../server/core/DefaultServer.java            | 12 +++++++
 .../server/core/RelationalQueryEngine.java    |  5 +++
 .../server/core/RelationalQueryRequest.java   |  4 +++
 .../query/DefaultRelationalQueryEngine.java   | 27 ++++++++++++++++
 .../querydefn/DefaultRelationalQuery.java     |  5 +++
 .../ebeaninternal/api/TDSpiEbeanServer.java   |  5 +++
 .../tests/query/sqlquery/SqlQueryTests.java   | 14 +++++++++
 9 files changed, 107 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebean/SqlQuery.java b/src/main/java/io/ebean/SqlQuery.java
index 1e6ec1edf..8f8b9ed01 100644
--- a/src/main/java/io/ebean/SqlQuery.java
+++ b/src/main/java/io/ebean/SqlQuery.java
@@ -93,13 +93,42 @@ public interface SqlQuery extends Serializable {
    *     .setParameter(1, 2)
    *     .findSingleAttribute(BigDecimal.class);
    *
-   *
    * }</pre>
    *
+   * <p>
+   * The attributeType can be any scalar type that Ebean supports (includes javax time types, Joda types etc).
+   * </p>
+   *
    * @param attributeType The type of the returned value
    */
   <T> T findSingleAttribute(Class<T> attributeType);
 
+  /**
+   * Execute the query returning a list of scalar attribute values.
+   *
+   * <pre>{@code
+   *
+   *   String sql =
+   *   " select (unit_price * order_qty) " +
+   *   " from o_order_detail " +
+   *   " where unit_price > ? " +
+   *   " order by (unit_price * order_qty) desc";
+   *
+   *   //
+   *   List<BigDecimal> lineAmounts = Ebean.createSqlQuery(sql)
+   *     .setParameter(1, 3)
+   *     .findSingleAttributeList(BigDecimal.class);
+   *
+   * }</pre>
+   *
+   * <p>
+   * The attributeType can be any scalar type that Ebean supports (includes javax time types, Joda types etc).
+   * </p>
+   *
+   * @param attributeType The type of the returned value
+   */
+  <T> List<T> findSingleAttributeList(Class<T> attributeType);
+
   /**
    * The same as bind for named parameters.
    */
diff --git a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
index 4de6f02e2..ed6fac793 100644
--- a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
+++ b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
@@ -239,6 +239,11 @@ public interface SpiEbeanServer extends EbeanServer, BeanLoader, BeanCollectionL
    */
   <T> T findSingleAttribute(SpiSqlQuery query, Class<T> cls);
 
+  /**
+   * SqlQuery find single attribute list.
+   */
+  <T> List<T> findSingleAttributeList(SpiSqlQuery query, Class<T> cls);
+
   /**
    * DTO findList query.
    */
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index b2f75985b..14bb12e0f 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -1586,6 +1586,18 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Override
+  public <T> List<T> findSingleAttributeList(SpiSqlQuery query, Class<T> cls) {
+    RelationalQueryRequest request = new RelationalQueryRequest(this, relationalQueryEngine, query, null);
+    try {
+      request.initTransIfRequired();
+      return request.findSingleAttributeList(cls);
+
+    } finally {
+      request.endTransIfRequired();
+    }
+  }
+
   @Override
   public <T> T findSingleAttribute(SpiSqlQuery query, Class<T> cls) {
 
diff --git a/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java b/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java
index 038f3842a..f6405aaa8 100644
--- a/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java
@@ -35,6 +35,11 @@ public interface RelationalQueryEngine {
    */
   <T> T findSingleAttribute(RelationalQueryRequest request, Class<T> cls);
 
+  /**
+   * Find single attribute list.
+   */
+  <T> List<T> findSingleAttributeList(RelationalQueryRequest request, Class<T> cls);
+
   /**
    * Collect SQL query execution statistics.
    */
diff --git a/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
index 221a3d36e..6324ffdfc 100644
--- a/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
@@ -53,6 +53,10 @@ public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
     }
   }
 
+  public <T> List<T> findSingleAttributeList(Class<T> cls) {
+    return queryEngine.findSingleAttributeList(this, cls);
+  }
+
   public <T> T findSingleAttribute(Class<T> cls) {
     return queryEngine.findSingleAttribute(this, cls);
   }
diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
index 9271ae624..b2fe0466e 100644
--- a/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
@@ -92,6 +92,33 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
     }
   }
 
+  @SuppressWarnings("unchecked")
+  @Override
+  public <T> List<T> findSingleAttributeList(RelationalQueryRequest request, Class<T> cls) {
+    ScalarType<T> scalarType = (ScalarType<T>) binder.getScalarType(cls);
+    return findScalarList(request, scalarType);
+  }
+
+  private <T> List<T> findScalarList(RelationalQueryRequest request, ScalarType<T> scalarType) {
+    try {
+      request.executeSql(binder, SpiQuery.Type.ATTRIBUTE);
+      List<T> list = new ArrayList<>();
+      while (request.next()) {
+        request.incrementRows();
+        list.add(scalarType.read(binder.createDataReader(request.getResultSet())));
+      }
+
+      request.logSummary();
+      return list;
+
+    } catch (Exception e) {
+      throw new PersistenceException(Message.msg("fetch.error", e.getMessage(), request.getSql()), e);
+
+    } finally {
+      request.close();
+    }
+  }
+
   @SuppressWarnings("unchecked")
   @Override
   public <T> T findSingleAttribute(RelationalQueryRequest request, Class<T> cls) {
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
index e5f81c2bf..ef58e2804 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
@@ -64,6 +64,11 @@ public class DefaultRelationalQuery implements SpiSqlQuery {
     return server.findSingleAttribute(this, cls);
   }
 
+  @Override
+  public <T> List<T> findSingleAttributeList(Class<T> cls) {
+    return server.findSingleAttributeList(this, cls);
+  }
+
   @Override
   public SqlRow findOne() {
     return server.findOne(this, null);
diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index ab117a62d..1661403b9 100644
--- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -462,6 +462,11 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
     return null;
   }
 
+  @Override
+  public <T> List<T> findSingleAttributeList(SpiSqlQuery query, Class<T> cls) {
+    return null;
+  }
+
   @Override
   public SqlQuery createSqlQuery(String sql) {
     return null;
diff --git a/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java b/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
index bd9b80191..2d4251db7 100644
--- a/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
+++ b/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
@@ -20,6 +20,20 @@ import static org.junit.Assert.assertEquals;
 
 public class SqlQueryTests extends BaseTestCase {
 
+  @Test
+  public void findSingleAttributeList_decimal() {
+
+    ResetBasicData.reset();
+
+    String sql = "select (unit_price * order_qty) from o_order_detail where unit_price > ? order by (unit_price * order_qty) desc";
+
+    List<BigDecimal> lineAmounts = Ebean.createSqlQuery(sql)
+      .setParameter(1, 3)
+      .findSingleAttributeList(BigDecimal.class);
+
+    assertThat(lineAmounts).isNotEmpty();
+  }
+
   @Test
   public void findSingleAttribute_decimal() {
 

From 7cbae758fcefe98b0aa27c88981841deecc9625b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 8 Jun 2018 02:04:38 +1200
Subject: [PATCH 0292/1036] #1407 - ENH: Add SqlQuery RowMapper and RowConsumer
 ... for raw JDBC ResultSet mapping and consuming

---
 src/main/java/io/ebean/RowConsumer.java       | 40 ++++++++
 src/main/java/io/ebean/RowMapper.java         | 62 ++++++++++++
 src/main/java/io/ebean/SqlQuery.java          | 44 +++++++++
 .../io/ebeaninternal/api/SpiEbeanServer.java  | 17 ++++
 .../server/core/DefaultServer.java            | 38 +++++---
 .../server/core/RelationalQueryEngine.java    | 17 ++++
 .../server/core/RelationalQueryRequest.java   | 39 ++++++++
 .../query/DefaultRelationalQueryEngine.java   | 49 ++++++++++
 .../querydefn/DefaultRelationalQuery.java     | 17 ++++
 .../ebeaninternal/api/TDSpiEbeanServer.java   | 17 ++++
 .../tests/query/sqlquery/SqlQueryTests.java   | 94 +++++++++++++++++++
 11 files changed, 421 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/io/ebean/RowConsumer.java
 create mode 100644 src/main/java/io/ebean/RowMapper.java

diff --git a/src/main/java/io/ebean/RowConsumer.java b/src/main/java/io/ebean/RowConsumer.java
new file mode 100644
index 000000000..4845f18ea
--- /dev/null
+++ b/src/main/java/io/ebean/RowConsumer.java
@@ -0,0 +1,40 @@
+package io.ebean;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * Used with SqlQuery to process potentially large queries reading directly from the JDBC ResultSet.
+ * <p>
+ * This provides a low level option that reads directly from the JDBC ResultSet.
+ * </p>
+ *
+ * <pre>{@code
+ *
+ *  String sql = "select id, name, status from o_customer order by name desc";
+ *
+ *  Ebean.createSqlQuery(sql)
+ *    .findEachRow((resultSet, rowNum) -> {
+ *
+ *      // read directly from ResultSet
+ *
+ *      long id = resultSet.getLong(1);
+ *      String name = resultSet.getString(2);
+ *
+ *      // do something interesting with the data
+ *
+ *    });
+ *
+ * }</pre>
+ */
+@FunctionalInterface
+public interface RowConsumer {
+
+  /**
+   * Read the data from the ResultSet and process it.
+   *
+   * @param resultSet The JDBC ResultSet positioned to the current row
+   * @param rowNum    The number of the current row being mapped.
+   */
+  void accept(ResultSet resultSet, int rowNum) throws SQLException;
+}
diff --git a/src/main/java/io/ebean/RowMapper.java b/src/main/java/io/ebean/RowMapper.java
new file mode 100644
index 000000000..1cc067372
--- /dev/null
+++ b/src/main/java/io/ebean/RowMapper.java
@@ -0,0 +1,62 @@
+package io.ebean;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * Used with SqlQuery to map raw JDBC ResultSet to objects.
+ * <p>
+ * This provides a low level mapping option with direct use of JDBC ResultSet
+ * with the option of having logic in the mapping. For example, only map some
+ * columns depending on the values read from other columns.
+ * </p>
+ * <p>
+ * For straight mapping into beans then DtoQuery would be the first choice as
+ * it can automatically map the ResultSet into beans.
+ * </p>
+ *
+ * <pre>{@code
+ *
+ *    //
+ *    // A mapper from ResultSet into our CustomerDto bean
+ *    //
+ *    class CustomerMapper implements RowMapper<CustomerDto> {
+ *
+ *     @Override
+ *     public CustomerDto map(ResultSet rset, int rowNum) throws SQLException {
+ *
+ *       long id = rset.getLong(1);
+ *       String name = rset.getString(2);
+ *       String status = rset.getString(3);
+ *
+ *       return new CustomerDto(id, name, status);
+ *     }
+ *   }
+ *
+ *
+ *   //
+ *   // Then use the mapper
+ *   //
+ *
+ *   String sql = "select id, name, status from o_customer where name = ?";
+ *
+ *  CustomerDto rob = Ebean.createSqlQuery(sql)
+ *    .setParameter(1, "Rob")
+ *    .findOne(CUSTOMER_MAPPER);
+ *
+ *
+ * }</pre>
+ *
+ * @param <T> The type the row data is mapped into.
+ */
+@FunctionalInterface
+public interface RowMapper<T> {
+
+  /**
+   * Read the data from the ResultSet and map to the return type.
+   *
+   * @param resultSet The JDBC ResultSet positioned to the current row
+   * @param rowNum    The number of the current row being mapped.
+   */
+  T map(ResultSet resultSet, int rowNum) throws SQLException;
+}
diff --git a/src/main/java/io/ebean/SqlQuery.java b/src/main/java/io/ebean/SqlQuery.java
index 8f8b9ed01..2adbd67b2 100644
--- a/src/main/java/io/ebean/SqlQuery.java
+++ b/src/main/java/io/ebean/SqlQuery.java
@@ -77,6 +77,50 @@ public interface SqlQuery extends Serializable {
   @Nullable
   SqlRow findOne();
 
+  /**
+   * Execute the query returning a single result using the mapper.
+   *
+   * @param mapper Used to map each ResultSet row into the result object.
+   */
+  <T> T findOne(RowMapper<T> mapper);
+
+  /**
+   * Execute the query returning a list using the mapper.
+   *
+   * @param mapper Used to map each ResultSet row into the result object.
+   */
+  <T> List<T> findList(RowMapper<T> mapper);
+
+  /**
+   * Execute the query reading each row from ResultSet using the RowConsumer.
+   * <p>
+   * This provides a low level option that reads directly from the JDBC ResultSet
+   * and is good for processing very large results where (unlike findList) we don't
+   * hold all the results in memory but instead can process row by row.
+   * </p>
+   *
+   * <pre>{@code
+   *
+   *  String sql = "select id, name, status from customer order by name desc";
+   *
+   *  Ebean.createSqlQuery(sql)
+   *    .findEachRow((resultSet, rowNum) -> {
+   *
+   *      // read directly from ResultSet
+   *
+   *      long id = resultSet.getLong(1);
+   *      String name = resultSet.getString(2);
+   *
+   *      // do something interesting with the data
+   *
+   *    });
+   *
+   * }</pre>
+   *
+   * @param consumer Used to read and process each ResultSet row.
+   */
+  void findEachRow(RowConsumer consumer);
+
   /**
    * Execute the query returning an optional row.
    */
diff --git a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
index ed6fac793..af0154a8e 100644
--- a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
+++ b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
@@ -4,6 +4,8 @@ import io.ebean.DtoQuery;
 import io.ebean.EbeanServer;
 import io.ebean.PersistenceContextScope;
 import io.ebean.Query;
+import io.ebean.RowConsumer;
+import io.ebean.RowMapper;
 import io.ebean.Transaction;
 import io.ebean.TxScope;
 import io.ebean.bean.BeanCollectionLoader;
@@ -244,6 +246,21 @@ public interface SpiEbeanServer extends EbeanServer, BeanLoader, BeanCollectionL
    */
   <T> List<T> findSingleAttributeList(SpiSqlQuery query, Class<T> cls);
 
+  /**
+   * SqlQuery find one with mapper.
+   */
+  <T> T findOneMapper(SpiSqlQuery query, RowMapper<T> mapper);
+
+  /**
+   * SqlQuery find list with mapper.
+   */
+  <T> List<T> findListMapper(SpiSqlQuery query, RowMapper<T> mapper);
+
+  /**
+   * SqlQuery find each with consumer.
+   */
+  void findEachRow(SpiSqlQuery query, RowConsumer consumer);
+
   /**
    * DTO findList query.
    */
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 14bb12e0f..779cb3982 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -19,6 +19,8 @@ import io.ebean.PersistenceContextScope;
 import io.ebean.ProfileLocation;
 import io.ebean.Query;
 import io.ebean.QueryIterator;
+import io.ebean.RowConsumer;
+import io.ebean.RowMapper;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
 import io.ebean.SqlUpdate;
@@ -1586,29 +1588,39 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
-  @Override
-  public <T> List<T> findSingleAttributeList(SpiSqlQuery query, Class<T> cls) {
+  private <P> P executeSqlQuery(Function<RelationalQueryRequest, P> fun, SpiSqlQuery query) {
     RelationalQueryRequest request = new RelationalQueryRequest(this, relationalQueryEngine, query, null);
     try {
       request.initTransIfRequired();
-      return request.findSingleAttributeList(cls);
-
+      return fun.apply(request);
     } finally {
       request.endTransIfRequired();
     }
   }
 
+  @Override
+  public void findEachRow(SpiSqlQuery query, RowConsumer consumer) {
+    executeSqlQuery((req) -> req.findEachRow(consumer), query);
+  }
+
+  @Override
+  public <T> List<T> findListMapper(SpiSqlQuery query, RowMapper<T> mapper) {
+    return executeSqlQuery((req) -> req.findListMapper(mapper), query);
+  }
+
+  @Override
+  public <T> T findOneMapper(SpiSqlQuery query, RowMapper<T> mapper) {
+    return executeSqlQuery((req) -> req.findOneMapper(mapper), query);
+  }
+
+  @Override
+  public <T> List<T> findSingleAttributeList(SpiSqlQuery query, Class<T> cls) {
+    return executeSqlQuery((req) -> req.findSingleAttributeList(cls), query);
+  }
+
   @Override
   public <T> T findSingleAttribute(SpiSqlQuery query, Class<T> cls) {
-
-    RelationalQueryRequest request = new RelationalQueryRequest(this, relationalQueryEngine, query, null);
-    try {
-      request.initTransIfRequired();
-      return request.findSingleAttribute(cls);
-
-    } finally {
-      request.endTransIfRequired();
-    }
+    return executeSqlQuery((req) -> req.findSingleAttribute(cls), query);
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java b/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java
index f6405aaa8..718a2873a 100644
--- a/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java
@@ -1,6 +1,8 @@
 package io.ebeaninternal.server.core;
 
 
+import io.ebean.RowConsumer;
+import io.ebean.RowMapper;
 import io.ebean.SqlRow;
 import io.ebean.meta.MetricVisitor;
 
@@ -40,6 +42,21 @@ public interface RelationalQueryEngine {
    */
   <T> List<T> findSingleAttributeList(RelationalQueryRequest request, Class<T> cls);
 
+  /**
+   * Find one via mapper.
+   */
+  <T> T findOneMapper(RelationalQueryRequest request, RowMapper<T> mapper);
+
+  /**
+   * Find list via mapper.
+   */
+  <T> List<T> findListMapper(RelationalQueryRequest request, RowMapper<T> mapper);
+
+  /**
+   * Find each via raw consumer.
+   */
+  void findEachRow(RelationalQueryRequest request, RowConsumer mapper);
+
   /**
    * Collect SQL query execution statistics.
    */
diff --git a/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
index 6324ffdfc..c9a47fb90 100644
--- a/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.core;
 
+import io.ebean.RowConsumer;
+import io.ebean.RowMapper;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
 import io.ebean.Transaction;
@@ -53,6 +55,19 @@ public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
     }
   }
 
+  boolean findEachRow(RowConsumer mapper) {
+    queryEngine.findEachRow(this, mapper);
+    return true;
+  }
+
+  <T> List<T> findListMapper(RowMapper<T> mapper) {
+    return queryEngine.findListMapper(this, mapper);
+  }
+
+  <T> T findOneMapper(RowMapper<T> mapper) {
+    return queryEngine.findOneMapper(this, mapper);
+  }
+
   public <T> List<T> findSingleAttributeList(Class<T> cls) {
     return queryEngine.findSingleAttributeList(this, cls);
   }
@@ -119,4 +134,28 @@ public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
   public void incrementRows() {
     rows++;
   }
+
+  public <T> List<T> mapList(RowMapper<T> mapper) throws SQLException {
+
+    List<T> list = new ArrayList<>();
+    while (next()) {
+      list.add(mapper.map(resultSet, rows++));
+    }
+    return list;
+  }
+
+  public <T> T mapOne(RowMapper<T> mapper) throws SQLException {
+    if (!next()) {
+      return null;
+    } else {
+      return mapper.map(resultSet, rows++);
+    }
+  }
+
+  public void mapEach(RowConsumer consumer) throws SQLException {
+    while (next()) {
+      consumer.accept(resultSet, rows++);
+    }
+  }
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
index b2fe0466e..d46aaf0a3 100644
--- a/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.query;
 
+import io.ebean.RowConsumer;
+import io.ebean.RowMapper;
 import io.ebean.SqlRow;
 import io.ebean.meta.MetricType;
 import io.ebean.meta.MetricVisitor;
@@ -92,6 +94,53 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
     }
   }
 
+  @Override
+  public <T> T findOneMapper(RelationalQueryRequest request, RowMapper<T> mapper) {
+    try {
+      request.executeSql(binder, SpiQuery.Type.BEAN);
+      T value = request.mapOne(mapper);
+      request.logSummary();
+      return value;
+
+    } catch (Exception e) {
+      throw new PersistenceException(Message.msg("fetch.error", e.getMessage(), request.getSql()), e);
+
+    } finally {
+      request.close();
+    }
+  }
+
+  @Override
+  public <T> List<T> findListMapper(RelationalQueryRequest request, RowMapper<T> mapper) {
+    try {
+      request.executeSql(binder, SpiQuery.Type.LIST);
+      List<T> list = request.mapList(mapper);
+      request.logSummary();
+      return list;
+
+    } catch (Exception e) {
+      throw new PersistenceException(Message.msg("fetch.error", e.getMessage(), request.getSql()), e);
+
+    } finally {
+      request.close();
+    }
+  }
+
+  @Override
+  public void findEachRow(RelationalQueryRequest request, RowConsumer consumer) {
+    try {
+      request.executeSql(binder, SpiQuery.Type.LIST);
+      request.mapEach(consumer);
+      request.logSummary();
+
+    } catch (Exception e) {
+      throw new PersistenceException(Message.msg("fetch.error", e.getMessage(), request.getSql()), e);
+
+    } finally {
+      request.close();
+    }
+  }
+
   @SuppressWarnings("unchecked")
   @Override
   public <T> List<T> findSingleAttributeList(RelationalQueryRequest request, Class<T> cls) {
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
index ef58e2804..5ca2e1075 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.querydefn;
 
+import io.ebean.RowConsumer;
+import io.ebean.RowMapper;
 import io.ebean.SqlRow;
 import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.SpiEbeanServer;
@@ -69,6 +71,21 @@ public class DefaultRelationalQuery implements SpiSqlQuery {
     return server.findSingleAttributeList(this, cls);
   }
 
+  @Override
+  public <T> T findOne(RowMapper<T> mapper) {
+    return server.findOneMapper(this, mapper);
+  }
+
+  @Override
+  public <T> List<T> findList(RowMapper<T> mapper) {
+    return server.findListMapper(this, mapper);
+  }
+
+  @Override
+  public void findEachRow(RowConsumer consumer) {
+    server.findEachRow(this, consumer);
+  }
+
   @Override
   public SqlRow findOne() {
     return server.findOne(this, null);
diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index 1661403b9..64bff0d26 100644
--- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -16,6 +16,8 @@ import io.ebean.PagedList;
 import io.ebean.PersistenceContextScope;
 import io.ebean.Query;
 import io.ebean.QueryIterator;
+import io.ebean.RowConsumer;
+import io.ebean.RowMapper;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
 import io.ebean.SqlUpdate;
@@ -467,6 +469,21 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
     return null;
   }
 
+  @Override
+  public <T> T findOneMapper(SpiSqlQuery query, RowMapper<T> mapper) {
+    return null;
+  }
+
+  @Override
+  public <T> List<T> findListMapper(SpiSqlQuery query, RowMapper<T> mapper) {
+    return null;
+  }
+
+  @Override
+  public void findEachRow(SpiSqlQuery query, RowConsumer consumer) {
+
+  }
+
   @Override
   public SqlQuery createSqlQuery(String sql) {
     return null;
diff --git a/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java b/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
index 2d4251db7..3cf065b4b 100644
--- a/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
+++ b/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
@@ -2,6 +2,7 @@ package org.tests.query.sqlquery;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.RowMapper;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
 import io.ebean.meta.MetaTimedMetric;
@@ -11,9 +12,12 @@ import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
 
 import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.time.OffsetDateTime;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
@@ -76,6 +80,96 @@ public class SqlQueryTests extends BaseTestCase {
     assertThat(minCreated).isBefore(OffsetDateTime.now());
   }
 
+  static class CustDto {
+
+    long id;
+    String name;
+    String status;
+
+    public CustDto(long id, String name, String status) {
+      this.id = id;
+      this.name = name;
+      this.status = status;
+    }
+  }
+
+  static class CustMapper implements RowMapper<CustDto> {
+
+    @Override
+    public CustDto map(ResultSet rset, int rowNum) throws SQLException {
+
+      long id = rset.getLong(1);
+      String name = rset.getString(2);
+      String status = rset.getString(3);
+
+      return new CustDto(id, name, status);
+    }
+  }
+
+  private static final CustMapper CUST_MAPPER = new CustMapper();
+
+  @Test
+  public void findOne_mapper() {
+
+    ResetBasicData.reset();
+
+    String sql = "select id, name, status from o_customer where name = ?";
+
+    CustDto rob = Ebean.createSqlQuery(sql)
+      .setParameter(1, "Rob")
+      .findOne(CUST_MAPPER);
+
+    assertThat(rob.name).isEqualTo("Rob");
+  }
+
+  @Test
+  public void findList_mapper() {
+
+    ResetBasicData.reset();
+
+    String sql = "select id, name, status from o_customer order by name desc";
+
+    List<CustDto> dtos = Ebean.createSqlQuery(sql)
+      .findList(CUST_MAPPER);
+
+    assertThat(dtos).isNotEmpty();
+  }
+
+  @Test
+  public void findEachRow() {
+
+    ResetBasicData.reset();
+
+    String sql = "select id, name, status from o_customer order by name desc";
+
+    AtomicLong count = new AtomicLong();
+
+    Ebean.createSqlQuery(sql)
+      .findEachRow((resultSet, rowNum) -> {
+        count.incrementAndGet();
+
+        long id = resultSet.getLong(1);
+        String name = resultSet.getString(2);
+
+        System.out.println("rowNum:" + rowNum + " id:" + id + " name:" + name);
+      });
+
+    assertThat(count.get()).isGreaterThan(0);
+  }
+
+  @Test
+  public void findOne_mapper_lambda() {
+
+    ResetBasicData.reset();
+
+    String sql = "select max(id) from o_customer where name != ?";
+
+    long maxId = Ebean.createSqlQuery(sql)
+      .setParameter(1, "Rob")
+      .findOne((resultSet, rowNum) -> resultSet.getLong(1));
+
+    assertThat(maxId).isGreaterThan(0);
+  }
 
   @Test
   public void newline_replacedInLogsOnly() {

From 42f0b419e896a130090b904aa9ea3c8dcd1683fc Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 8 Jun 2018 02:19:36 +1200
Subject: [PATCH 0293/1036] #1405 - ENH: add findSingleDecimal() and
 findSingleLong() alias methods for SqlQuery.findSingleAttribute() ...

---
 src/main/java/io/ebean/SqlQuery.java          | 17 ++++++++++
 .../querydefn/DefaultRelationalQuery.java     | 11 +++++++
 .../tests/query/sqlquery/SqlQueryTests.java   | 31 ++++++++++++++++++-
 3 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebean/SqlQuery.java b/src/main/java/io/ebean/SqlQuery.java
index 2adbd67b2..d5a71f232 100644
--- a/src/main/java/io/ebean/SqlQuery.java
+++ b/src/main/java/io/ebean/SqlQuery.java
@@ -3,6 +3,7 @@ package io.ebean;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
@@ -147,6 +148,22 @@ public interface SqlQuery extends Serializable {
    */
   <T> T findSingleAttribute(Class<T> attributeType);
 
+  /**
+   * Execute the query returning a single BigDecimal value.
+   * <p>
+   * This is an alias for <code>findSingleAttribute(BigDecimal.class)</code>
+   * </p>
+   */
+  BigDecimal findSingleDecimal();
+
+  /**
+   * Execute the query returning a single Long value.
+   * <p>
+   * This is an alias for <code>findSingleAttribute(Long.class)</code>
+   * </p>
+   */
+  Long findSingleLong();
+
   /**
    * Execute the query returning a list of scalar attribute values.
    *
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
index 5ca2e1075..db4948bcb 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
@@ -7,6 +7,7 @@ import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiSqlQuery;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
@@ -61,6 +62,16 @@ public class DefaultRelationalQuery implements SpiSqlQuery {
     return server.findList(this, null);
   }
 
+  @Override
+  public BigDecimal findSingleDecimal() {
+    return server.findSingleAttribute(this, BigDecimal.class);
+  }
+
+  @Override
+  public Long findSingleLong() {
+    return server.findSingleAttribute(this, Long.class);
+  }
+
   @Override
   public <T> T findSingleAttribute(Class<T> cls) {
     return server.findSingleAttribute(this, cls);
diff --git a/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java b/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
index 3cf065b4b..305cf5a33 100644
--- a/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
+++ b/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
@@ -39,7 +39,21 @@ public class SqlQueryTests extends BaseTestCase {
   }
 
   @Test
-  public void findSingleAttribute_decimal() {
+  public void findSingleDecimal() {
+
+    ResetBasicData.reset();
+
+    String sql = "select max(unit_price) from o_order_detail where order_qty > ?";
+
+    BigDecimal maxPrice = Ebean.createSqlQuery(sql)
+      .setParameter(1, 2)
+      .findSingleDecimal();
+
+    assertThat(maxPrice).isNotNull();
+  }
+
+  @Test
+  public void findSingleAttribute_BigDecimal() {
 
     ResetBasicData.reset();
 
@@ -52,6 +66,21 @@ public class SqlQueryTests extends BaseTestCase {
     assertThat(maxPrice).isNotNull();
   }
 
+  @Test
+  public void findSingleLong() {
+
+    ResetBasicData.reset();
+
+    String sql = "select count(order_qty) from o_order_detail where unit_price > ?";
+
+    long count = Ebean.createSqlQuery(sql)
+      .setParameter(1, 2)
+      .findSingleLong();
+
+    assertThat(count).isGreaterThan(0);
+  }
+
+
   @Test
   public void findSingleAttribute_long() {
 

From f031bb72b62453dc7c9b327a1ff3d26d115e1df0 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 8 Jun 2018 17:38:15 +1200
Subject: [PATCH 0294/1036] #1408 - Incorrect SQL when @Aggregation formula
 matches the property - sum(t0.sum(totalKms))

---
 .../deploy/meta/DeployBeanProperty.java       |  31 +++++
 .../org/tests/model/aggregation/DMachine.java |  47 ++++++++
 .../model/aggregation/DMachineStats.java      | 102 +++++++++++++++++
 .../model/aggregation/DMachineStatsAgg.java   | 102 +++++++++++++++++
 .../aggregation/TestAggregationTopLevel.java  | 107 ++++++++++++++++++
 5 files changed, 389 insertions(+)
 create mode 100644 src/test/java/org/tests/model/aggregation/DMachine.java
 create mode 100644 src/test/java/org/tests/model/aggregation/DMachineStats.java
 create mode 100644 src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java
 create mode 100644 src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
index f2ae582ee..0bfa5b328 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
@@ -647,11 +647,35 @@ public class DeployBeanProperty {
    */
   public String parseAggregation() {
     if (aggregation != null) {
+      int pos = aggregation.indexOf('(');
+      if (pos > -1) {
+        // check for recursive property name and formula
+        String maybePropertyName = aggregation.substring(pos + 1, aggregation.length() - 1);
+        if (name.equals(maybePropertyName)) {
+          // e.g. bean property cost mapped to sum(cost)
+          return aggregationJoin(pos, dbColumn);
+        } else {
+          DeployBeanProperty other = desc.getBeanProperty(maybePropertyName);
+          if (other != null) {
+            // e.g. bean property maxKms mapped to sum(totalKms) where totalKms is another property
+            return aggregationJoin(pos, other.getDbColumnRaw());
+          }
+        }
+      }
       aggregationParsed = desc.parse(aggregation);
     }
     return aggregationParsed;
   }
 
+  /**
+   * Simple aggregation parsing like sum(someProperty)
+   */
+  private String aggregationJoin(int pos, String dbColumn) {
+    String p0 = aggregation.substring(0, pos + 1);
+    aggregationParsed =  p0 + "${ta}." + dbColumn + aggregation.substring(aggregation.length() - 1);
+    return aggregationParsed;
+  }
+
   public void setAggregation(String aggregation) {
     this.aggregation = aggregation;
     this.dbRead = true;
@@ -702,6 +726,13 @@ public class DeployBeanProperty {
     return dbColumn;
   }
 
+  /**
+   * Return the DB column without any aggregation parsing.
+   */
+  private String getDbColumnRaw() {
+    return dbColumn;
+  }
+
   /**
    * Set the database column name this is mapped to.
    */
diff --git a/src/test/java/org/tests/model/aggregation/DMachine.java b/src/test/java/org/tests/model/aggregation/DMachine.java
new file mode 100644
index 000000000..d45a00a11
--- /dev/null
+++ b/src/test/java/org/tests/model/aggregation/DMachine.java
@@ -0,0 +1,47 @@
+package org.tests.model.aggregation;
+
+import io.ebean.Model;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Version;
+
+@Entity
+public class DMachine extends Model {
+
+  @Id
+  long id;
+
+  String name;
+
+  @Version
+  long version;
+
+  public DMachine(String name) {
+    this.name = name;
+  }
+
+  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 long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/aggregation/DMachineStats.java b/src/test/java/org/tests/model/aggregation/DMachineStats.java
new file mode 100644
index 000000000..642946b30
--- /dev/null
+++ b/src/test/java/org/tests/model/aggregation/DMachineStats.java
@@ -0,0 +1,102 @@
+package org.tests.model.aggregation;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.Version;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@Entity
+@Table(name = "d_machine_stats")
+public class DMachineStats {
+
+  @Id
+  long id;
+
+  @ManyToOne
+  DMachine machine;
+
+  LocalDate date;
+
+  long totalKms;
+
+  long hours;
+
+  BigDecimal rate;
+
+  BigDecimal cost;
+
+  @Version
+  long version;
+
+  public DMachineStats(DMachine machine, LocalDate date) {
+    this.machine = machine;
+    this.date = date;
+  }
+
+  public long getId() {
+    return id;
+  }
+
+  public void setId(long id) {
+    this.id = id;
+  }
+
+  public DMachine getMachine() {
+    return machine;
+  }
+
+  public void setMachine(DMachine machine) {
+    this.machine = machine;
+  }
+
+  public LocalDate getDate() {
+    return date;
+  }
+
+  public void setDate(LocalDate date) {
+    this.date = date;
+  }
+
+  public long getTotalKms() {
+    return totalKms;
+  }
+
+  public void setTotalKms(long totalKms) {
+    this.totalKms = totalKms;
+  }
+
+  public long getHours() {
+    return hours;
+  }
+
+  public void setHours(long hours) {
+    this.hours = hours;
+  }
+
+  public BigDecimal getRate() {
+    return rate;
+  }
+
+  public void setRate(BigDecimal rate) {
+    this.rate = rate;
+  }
+
+  public BigDecimal getCost() {
+    return cost;
+  }
+
+  public void setCost(BigDecimal cost) {
+    this.cost = cost;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java b/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java
new file mode 100644
index 000000000..94f642d9c
--- /dev/null
+++ b/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java
@@ -0,0 +1,102 @@
+package org.tests.model.aggregation;
+
+import io.ebean.annotation.Aggregation;
+import io.ebean.annotation.View;
+
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@Entity
+@View(name = "d_machine_stats", dependentTables = "d_machine_stats")
+public class DMachineStatsAgg {
+
+  @ManyToOne
+  DMachine machine;
+
+  LocalDate date;
+
+  /**
+   * Matching with column underscore.
+   */
+  @Aggregation("sum(totalKms)")
+  long totalKms;
+
+  /**
+   * Matching with no underscore.
+   */
+  @Aggregation("sum(hours)")
+  long hours;
+
+  @Aggregation("max(rate)")
+  BigDecimal rate;
+
+  /**
+   * Not matching.
+   */
+  @Aggregation("sum(cost)")
+  BigDecimal totalCost;
+
+  /**
+   * Not matching.
+   */
+  @Aggregation("max(totalKms)")
+  BigDecimal maxKms;
+
+  public DMachine getMachine() {
+    return machine;
+  }
+
+  public void setMachine(DMachine machine) {
+    this.machine = machine;
+  }
+
+  public LocalDate getDate() {
+    return date;
+  }
+
+  public void setDate(LocalDate date) {
+    this.date = date;
+  }
+
+  public long getTotalKms() {
+    return totalKms;
+  }
+
+  public void setTotalKms(long totalKms) {
+    this.totalKms = totalKms;
+  }
+
+  public long getHours() {
+    return hours;
+  }
+
+  public void setHours(long hours) {
+    this.hours = hours;
+  }
+
+  public BigDecimal getRate() {
+    return rate;
+  }
+
+  public void setRate(BigDecimal rate) {
+    this.rate = rate;
+  }
+
+  public BigDecimal getTotalCost() {
+    return totalCost;
+  }
+
+  public void setTotalCost(BigDecimal totalCost) {
+    this.totalCost = totalCost;
+  }
+
+  public BigDecimal getMaxKms() {
+    return maxKms;
+  }
+
+  public void setMaxKms(BigDecimal maxKms) {
+    this.maxKms = maxKms;
+  }
+}
diff --git a/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java b/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java
new file mode 100644
index 000000000..73f693fda
--- /dev/null
+++ b/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java
@@ -0,0 +1,107 @@
+package org.tests.model.aggregation;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.Query;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestAggregationTopLevel extends BaseTestCase {
+
+  @BeforeClass
+  public static void setup() {
+    loadData();
+  }
+
+  @Test
+  public void query_noSelect() {
+
+    Query<DMachineStatsAgg> query = Ebean.find(DMachineStatsAgg.class)
+      .where().gt("date", LocalDate.now().minusDays(10))
+      .query();
+
+    List<DMachineStatsAgg> result = query.findList();
+    assertThat(sqlOf(query)).contains("select t0.date, t0.machine_id from d_machine_stats t0 where t0.date > ?");
+    assertThat(result).isNotEmpty();
+  }
+
+  @Test
+  public void query_machineTotalKms_withHaving() {
+
+    Query<DMachineStatsAgg> query = Ebean.find(DMachineStatsAgg.class)
+      .select("machine, date, totalKms, totalCost")
+      .where().gt("date", LocalDate.now().minusDays(10))
+      .having().gt("totalCost", 10)
+      .query();
+
+    List<DMachineStatsAgg> result = query.findList();
+    assertThat(sqlOf(query)).contains("select t0.machine_id, t0.date, sum(t0.total_kms), sum(cost) from d_machine_stats t0 where t0.date > ?  group by t0.machine_id, t0.date having sum(cost) > ?");
+    assertThat(result).isNotEmpty();
+  }
+
+  @Test
+  public void query_machineTotalKms() {
+
+    Query<DMachineStatsAgg> query = Ebean.find(DMachineStatsAgg.class)
+      .select("machine, totalKms, totalCost")
+      .where().gt("date", LocalDate.now().minusDays(10))
+      .query();
+
+    List<DMachineStatsAgg> result = query.findList();
+    assertThat(sqlOf(query)).contains("select t0.machine_id, sum(t0.total_kms), sum(cost) from d_machine_stats t0 where t0.date > ?  group by t0.machine_id");
+    assertThat(result).isNotEmpty();
+  }
+
+  @Test
+  public void query_byDate() {
+
+    Query<DMachineStatsAgg> query = Ebean.find(DMachineStatsAgg.class)
+      .select("date, totalKms, hours, rate, totalCost, maxKms")
+      .where().gt("date", LocalDate.now().minusDays(10))
+      .having().gt("hours", 2)
+      .query();
+
+    List<DMachineStatsAgg> result = query.findList();
+    assertThat(sqlOf(query)).contains("select t0.date, sum(t0.total_kms), sum(t0.hours), max(t0.rate), sum(cost), max(t0.total_kms) from d_machine_stats t0 where t0.date > ?  group by t0.date having sum(t0.hours) > ?");
+    assertThat(result).isNotEmpty();
+  }
+
+  private static void loadData() {
+
+    List<DMachine> machines = new ArrayList<>();
+
+    for (int i = 0; i < 5; i++) {
+      machines.add(new DMachine("Machine"+i));
+    }
+
+    Ebean.saveAll(machines);
+
+    List<DMachineStats> allStats = new ArrayList<>();
+
+    LocalDate date = LocalDate.now();
+    for (int i = 0; i < 8; i++) {
+      for (DMachine machine : machines) {
+
+        DMachineStats stats = new DMachineStats(machine, date);
+
+        stats.setHours(i * 4);
+        stats.setTotalKms(i * 100);
+        stats.setCost(BigDecimal.valueOf(i * 50));
+        stats.setRate(BigDecimal.valueOf(i * 2));
+
+        allStats.add(stats);
+      }
+
+      date = date.minusDays(1);
+    }
+
+    Ebean.saveAll(allStats);
+  }
+}

From 8fc6abd4808ac4f56c912938271dc0a73eb4bbd1 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Sun, 10 Jun 2018 12:30:47 +0200
Subject: [PATCH 0295/1036] IOUtils is no longer used, using java 1.7
 StandardCharsets makes EncodeUtil also obsolete (#1410)

---
 .../server/type/ScalarTypeJsonMap.java        |  4 +-
 .../server/type/ScalarTypeJsonNode.java       |  4 +-
 .../server/type/SimpleAesEncryptor.java       | 31 ++----
 .../io/ebeaninternal/server/util/Md5.java     |  3 +-
 .../io/ebeaninternal/util/EncodeUtil.java     | 98 ------------------
 .../java/io/ebeaninternal/util/IOUtils.java   | 99 -------------------
 6 files changed, 12 insertions(+), 227 deletions(-)
 delete mode 100644 src/main/java/io/ebeaninternal/util/EncodeUtil.java
 delete mode 100644 src/main/java/io/ebeaninternal/util/IOUtils.java

diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java
index d67faa659..84146d218 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java
@@ -4,7 +4,6 @@ import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.text.TextException;
 import io.ebean.text.json.EJson;
 import io.ebeaninternal.json.ModifyAwareOwner;
-import io.ebeaninternal.util.EncodeUtil;
 import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
@@ -15,6 +14,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.nio.charset.StandardCharsets;
 import java.sql.SQLException;
 import java.sql.Types;
 import java.util.Map;
@@ -104,7 +104,7 @@ public abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
         b.setNull(Types.BLOB);
       } else {
         String rawJson = formatValue(value);
-        b.setBytes(EncodeUtil.utf8ToBytes(rawJson));
+        b.setBytes(rawJson.getBytes(StandardCharsets.UTF_8));
       }
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java
index 309dbb786..4c5c42dfe 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java
@@ -1,7 +1,6 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.text.TextException;
-import io.ebeaninternal.util.EncodeUtil;
 import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
@@ -14,6 +13,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.nio.charset.StandardCharsets;
 import java.sql.SQLException;
 import java.sql.Types;
 
@@ -82,7 +82,7 @@ public abstract class ScalarTypeJsonNode extends ScalarTypeBase<JsonNode> {
         dataBind.setNull(Types.BLOB);
       } else {
         String rawJson = formatValue(value);
-        dataBind.setBlob(EncodeUtil.utf8ToBytes(rawJson));
+        dataBind.setBlob(rawJson.getBytes(StandardCharsets.UTF_8));
       }
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/type/SimpleAesEncryptor.java b/src/main/java/io/ebeaninternal/server/type/SimpleAesEncryptor.java
index 4b9c92d35..28d661591 100644
--- a/src/main/java/io/ebeaninternal/server/type/SimpleAesEncryptor.java
+++ b/src/main/java/io/ebeaninternal/server/type/SimpleAesEncryptor.java
@@ -6,7 +6,7 @@ import io.ebean.config.Encryptor;
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 
 /**
  * Simple AES based encryption and decryption.
@@ -32,15 +32,6 @@ public class SimpleAesEncryptor implements Encryptor {
     return key;
   }
 
-  private byte[] getKeyBytes(String skey) {
-
-    try {
-      return skey.getBytes("UTF-8");
-    } catch (UnsupportedEncodingException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
   private IvParameterSpec getIvParameterSpec(String initialVector) {
     return new IvParameterSpec(initialVector.getBytes());
   }
@@ -56,7 +47,7 @@ public class SimpleAesEncryptor implements Encryptor {
 
     try {
 
-      byte[] keyBytes = getKeyBytes(key);
+      byte[] keyBytes = key.getBytes(StandardCharsets.UTF_8);
       IvParameterSpec iv = getIvParameterSpec(key);
 
       SecretKeySpec sks = new SecretKeySpec(keyBytes, "AES");
@@ -81,7 +72,7 @@ public class SimpleAesEncryptor implements Encryptor {
     String key = paddKey(encryptKey);
 
     try {
-      byte[] keyBytes = getKeyBytes(key);
+      byte[] keyBytes = key.getBytes(StandardCharsets.UTF_8);
       IvParameterSpec iv = getIvParameterSpec(key);
 
       SecretKeySpec sks = new SecretKeySpec(keyBytes, "AES");
@@ -103,12 +94,7 @@ public class SimpleAesEncryptor implements Encryptor {
     }
 
     byte[] bytes = decrypt(data, key);
-    try {
-      return new String(bytes, "UTF-8");
-
-    } catch (UnsupportedEncodingException e) {
-      throw new RuntimeException(e);
-    }
+    return new String(bytes, StandardCharsets.UTF_8);
   }
 
   @Override
@@ -117,13 +103,8 @@ public class SimpleAesEncryptor implements Encryptor {
     if (valueFormatValue == null) {
       return null;
     }
-    try {
-      byte[] d = valueFormatValue.getBytes("UTF-8");
-      return encrypt(d, key);
-
-    } catch (UnsupportedEncodingException e) {
-      throw new RuntimeException(e);
-    }
+    byte[] d = valueFormatValue.getBytes(StandardCharsets.UTF_8);
+    return encrypt(d, key);
   }
 
 }
diff --git a/src/main/java/io/ebeaninternal/server/util/Md5.java b/src/main/java/io/ebeaninternal/server/util/Md5.java
index 7e17d65b6..3ddddb681 100644
--- a/src/main/java/io/ebeaninternal/server/util/Md5.java
+++ b/src/main/java/io/ebeaninternal/server/util/Md5.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.util;
 
+import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 
 public class Md5 {
@@ -11,7 +12,7 @@ public class Md5 {
 
     try {
       MessageDigest md = MessageDigest.getInstance("MD5");
-      byte[] digest = md.digest(content.getBytes("UTF-8"));
+      byte[] digest = md.digest(content.getBytes(StandardCharsets.UTF_8));
       return digestToHex(digest);
     } catch (Exception e) {
       throw new RuntimeException("MD5 hashing failed", e);
diff --git a/src/main/java/io/ebeaninternal/util/EncodeUtil.java b/src/main/java/io/ebeaninternal/util/EncodeUtil.java
deleted file mode 100644
index 2fd4fc5b1..000000000
--- a/src/main/java/io/ebeaninternal/util/EncodeUtil.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package io.ebeaninternal.util;
-
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-
-
-/**
- * Utilities for encoding and decoding strings.
- */
-public final class EncodeUtil {
-
-  private EncodeUtil() {
-    /* no instances */
-  }
-
-  /**
-   * URL-encodes the specified UTF-8 string.
-   */
-  public static String urlEncode(String string) {
-    if (string == null) return null;
-    try {
-      return URLEncoder.encode(string, "UTF-8");
-    } catch (UnsupportedEncodingException e) {
-      throw new IllegalStateException("Support for UTF-8 is mandated by the Java spec", e);
-    }
-  }
-
-  /**
-   * URL-decodes the specified string as a UTF-8 string.
-   */
-  public static String urlDecode(String string) {
-    if (string == null) return null;
-    try {
-      return URLDecoder.decode(string, "UTF-8");
-    } catch (UnsupportedEncodingException e) {
-      throw new IllegalStateException("Support for UTF-8 is mandated by the Java spec", e);
-    }
-  }
-
-  /**
-   * Returns the bytes corresponding to the specified ASCII string.
-   */
-  public static byte[] asciiToBytes(String string) {
-    if (string == null) return null;
-    try {
-      return string.getBytes("US-ASCII");
-    } catch (UnsupportedEncodingException e) {
-      throw new IllegalStateException("Support for US-ASCII is mandated by the Java spec", e);
-    }
-  }
-
-  /**
-   * Returns the ASCII string corresponding to the specified bytes.
-   */
-  public static String bytesToAscii(byte[] data) {
-    try {
-      return new String(data, "US-ASCII");
-    } catch (UnsupportedEncodingException e) {
-      throw new IllegalStateException("Support for US-ASCII is mandated by the Java spec", e);
-    }
-  }
-
-  /**
-   * Returns the bytes corresponding to the specified UTF-8 string.
-   */
-  public static byte[] utf8ToBytes(String string) {
-    if (string == null) return null;
-    try {
-      return string.getBytes("UTF-8");
-    } catch (UnsupportedEncodingException e) {
-      throw new IllegalStateException("Support for UTF-8 is mandated by the Java spec", e);
-    }
-  }
-
-  /**
-   * Returns the UTF-8 string corresponding to the specified bytes.
-   */
-  public static String bytesToUtf8(byte[] data) {
-    try {
-      return new String(data, "UTF-8");
-    } catch (UnsupportedEncodingException e) {
-      throw new IllegalStateException("Support for UTF-8 is mandated by the Java spec", e);
-    }
-  }
-
-  /**
-   * Returns the UTF-8 string corresponding to the specified bytes.
-   */
-  public static String decodeBytes(byte[] data, String encoding) {
-    try {
-      return new String(data, encoding);
-    } catch (UnsupportedEncodingException e) {
-      throw new RuntimeException("Error decoding bytes with " + encoding, e);
-    }
-  }
-}
diff --git a/src/main/java/io/ebeaninternal/util/IOUtils.java b/src/main/java/io/ebeaninternal/util/IOUtils.java
deleted file mode 100644
index 44e34cca4..000000000
--- a/src/main/java/io/ebeaninternal/util/IOUtils.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package io.ebeaninternal.util;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-
-/**
- * Utilities for IO.
- */
-public class IOUtils {
-
-  /**
-   * Reads the entire contents of the specified input stream and returns them
-   * as a byte array.
-   */
-  public static byte[] read(InputStream in) throws IOException {
-    ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-    pump(in, buffer);
-    return buffer.toByteArray();
-  }
-
-  /**
-   * Reads the entire contents of the specified input stream and returns them
-   * as an ASCII string.
-   */
-  public static String readAscii(InputStream in) throws IOException {
-    return EncodeUtil.bytesToAscii(read(in));
-  }
-
-  /**
-   * Reads the entire contents of the specified input stream and returns them
-   * as UTF-8 string.
-   */
-  public static String readUtf8(InputStream in) throws IOException {
-    return EncodeUtil.bytesToUtf8(read(in));
-  }
-
-  /**
-   * Reads the entire contents of the specified input stream and returns them
-   * as a string using the encoding supplied.
-   */
-  public static String readEncoded(InputStream in, String encoding) throws IOException {
-    return EncodeUtil.decodeBytes(read(in), encoding);
-  }
-
-  /**
-   * Read the entire contents from the reader returning as a String.
-   */
-  public static String read(Reader reader) throws IOException {
-
-    StringBuilder sb = new StringBuilder();
-    try {
-      char[] buffer = new char[4096];
-      for (; ; ) {
-        int len = reader.read(buffer);
-        if (len < 0) {
-          break;
-        }
-        sb.append(buffer, 0, len);
-      }
-    } finally {
-      reader.close();
-    }
-
-    return sb.toString();
-  }
-
-  /**
-   * Reads data from the specified input stream and copies it to the specified
-   * output stream, until the input stream is at EOF. Both streams are then
-   * closed.
-   *
-   * @throws IOException if the input or output stream is <code>null</code>
-   */
-  public static void pump(InputStream in, OutputStream out) throws IOException {
-
-    if (in == null) throw new IOException("Input stream is null");
-    if (out == null) throw new IOException("Output stream is null");
-
-    try {
-      try {
-        byte[] buffer = new byte[4096];
-        for (; ; ) {
-          int bytes = in.read(buffer);
-          if (bytes < 0) {
-            break;
-          }
-          out.write(buffer, 0, bytes);
-        }
-      } finally {
-        in.close();
-      }
-    } finally {
-      out.close();
-    }
-  }
-}

From 3134dd3165913f85882e90bbad3005fd4a4bc485 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sun, 10 Jun 2018 23:23:48 +1200
Subject: [PATCH 0296/1036] No effective change - reformat only

---
 .../io/ebean/config/properties/Loader.java    | 112 +++++++++---------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/src/main/java/io/ebean/config/properties/Loader.java b/src/main/java/io/ebean/config/properties/Loader.java
index 283b2c6e2..b188f9b05 100644
--- a/src/main/java/io/ebean/config/properties/Loader.java
+++ b/src/main/java/io/ebean/config/properties/Loader.java
@@ -16,10 +16,10 @@ import java.util.Properties;
  */
 class Loader {
 
-	private static final Logger log = LoggerFactory.getLogger(Loader.class);
+  private static final Logger log = LoggerFactory.getLogger(Loader.class);
 
-	enum Source {
-	  RESOURCE,
+  enum Source {
+    RESOURCE,
     FILE
   }
 
@@ -27,7 +27,7 @@ class Loader {
 
   private YamlLoader yamlLoader;
 
-	Loader() {
+  Loader() {
     String skipYaml = System.getProperty("ebeanSkipYaml");
     if (!"true".equals(skipYaml)) {
       try {
@@ -44,19 +44,19 @@ class Loader {
   /**
    * Load the configuration with the expected ordering.
    */
-	void load() {
+  void load() {
 
     loadMain(Source.RESOURCE);
     // external file configuration overrides the resources configuration
     loadMain(Source.FILE);
 
-		loadViaSystemProperty();
-		loadViaIndirection();
+    loadViaSystemProperty();
+    loadViaIndirection();
 
-		// test configuration (if found) overrides main configuration
+    // test configuration (if found) overrides main configuration
     // we should only find these resources when running tests
-		loadTest();
-	}
+    loadTest();
+  }
 
   /**
    * Load test configuration.
@@ -89,7 +89,7 @@ class Loader {
   }
 
   private void loadViaSystemProperty() {
-	  String fileName = System.getenv("EBEAN_PROPS_FILE");
+    String fileName = System.getenv("EBEAN_PROPS_FILE");
     if (fileName == null) {
       fileName = System.getProperty("ebean.props.file");
       if (fileName != null) {
@@ -112,59 +112,59 @@ class Loader {
    * Evaluate all the configuration entries and return as properties.
    */
   Properties eval() {
-		return loadContext.eval();
-	}
+    return loadContext.eval();
+  }
 
-	void loadYaml(String resourcePath, Source source) {
-		if (yamlLoader != null) {
-		  try {
-			  yamlLoader.load(resource(resourcePath, source));
+  void loadYaml(String resourcePath, Source source) {
+    if (yamlLoader != null) {
+      try {
+        yamlLoader.load(resource(resourcePath, source));
       } catch (Exception e) {
         log.warn("Failed to read yml from:" + resourcePath, e);
       }
-		}
-	}
+    }
+  }
 
-	void loadProperties(String resourcePath, Source source) {
-		InputStream is = resource(resourcePath, source);
-		if (is != null) {
-			loadProperties(is);
-		}
-	}
+  void loadProperties(String resourcePath, Source source) {
+    InputStream is = resource(resourcePath, source);
+    if (is != null) {
+      loadProperties(is);
+    }
+  }
 
-	private InputStream resource(String resourcePath, Source source) {
-		return loadContext.resource(resourcePath, source);
-	}
+  private InputStream resource(String resourcePath, Source source) {
+    return loadContext.resource(resourcePath, source);
+  }
 
-	private void loadProperties(InputStream is) {
+  private void loadProperties(InputStream is) {
 
-		if (is != null) {
-			try {
-				Properties properties = new Properties();
-				properties.load(is);
-				put(properties);
-			} catch (IOException e) {
-				throw new RuntimeException("Failed to load properties?", e);
-			} finally {
-				close(is);
-			}
-		}
-	}
+    if (is != null) {
+      try {
+        Properties properties = new Properties();
+        properties.load(is);
+        put(properties);
+      } catch (IOException e) {
+        throw new RuntimeException("Failed to load properties?", e);
+      } finally {
+        close(is);
+      }
+    }
+  }
 
-	private void put(Properties properties) {
-		Enumeration<?> enumeration = properties.propertyNames();
-		while (enumeration.hasMoreElements()) {
-			String key = (String) enumeration.nextElement();
-			String property = properties.getProperty(key);
-			loadContext.put(key, property);
-		}
-	}
+  private void put(Properties properties) {
+    Enumeration<?> enumeration = properties.propertyNames();
+    while (enumeration.hasMoreElements()) {
+      String key = (String) enumeration.nextElement();
+      String property = properties.getProperty(key);
+      loadContext.put(key, property);
+    }
+  }
 
-	private void close(InputStream is) {
-		try {
-			is.close();
-		} catch (IOException e) {
-			log.warn("Error closing input stream for properties", e);
-		}
-	}
+  private void close(InputStream is) {
+    try {
+      is.close();
+    } catch (IOException e) {
+      log.warn("Error closing input stream for properties", e);
+    }
+  }
 }

From 54eaf561f4bdb3012409765a5f10070667f11373 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sun, 10 Jun 2018 23:31:16 +1200
Subject: [PATCH 0297/1036] #1412 - Fix Resource leaks for properties & yaml
 files etc - Loader

---
 .../java/io/ebean/config/properties/Loader.java   | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/ebean/config/properties/Loader.java b/src/main/java/io/ebean/config/properties/Loader.java
index b188f9b05..4c0d07443 100644
--- a/src/main/java/io/ebean/config/properties/Loader.java
+++ b/src/main/java/io/ebean/config/properties/Loader.java
@@ -118,7 +118,9 @@ class Loader {
   void loadYaml(String resourcePath, Source source) {
     if (yamlLoader != null) {
       try {
-        yamlLoader.load(resource(resourcePath, source));
+        try (InputStream is = resource(resourcePath, source)) {
+          yamlLoader.load(is);
+        }
       } catch (Exception e) {
         log.warn("Failed to read yml from:" + resourcePath, e);
       }
@@ -126,9 +128,14 @@ class Loader {
   }
 
   void loadProperties(String resourcePath, Source source) {
-    InputStream is = resource(resourcePath, source);
-    if (is != null) {
-      loadProperties(is);
+    try {
+      try (InputStream is = resource(resourcePath, source)) {
+        if (is != null) {
+          loadProperties(is);
+        }
+      }
+    } catch (Exception e) {
+      log.warn("Failed to read properties from:" + resourcePath, e);
     }
   }
 

From a2972abe3e2b530f796bc56e69b556658a7adcbd Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sun, 10 Jun 2018 23:33:21 +1200
Subject: [PATCH 0298/1036] #1412 - Fix Resource leaks for properties & yaml
 files etc - DdlGenerator

---
 .../ebeaninternal/dbmigration/DdlGenerator.java   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
index 68455dd89..40614c8b8 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
@@ -2,10 +2,10 @@ package io.ebeaninternal.dbmigration;
 
 import io.ebean.Transaction;
 import io.ebean.config.ServerConfig;
-import io.ebeaninternal.dbmigration.model.CurrentModel;
-import io.ebeaninternal.api.SpiEbeanServer;
-import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader;
 import io.ebean.migration.ddl.DdlRunner;
+import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.dbmigration.model.CurrentModel;
+import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -173,10 +173,11 @@ public class DdlGenerator {
   protected void runResourceScript(String sqlScript) throws IOException {
 
     if (sqlScript != null) {
-      InputStream is = getClassLoader().getResourceAsStream(sqlScript);
-      if (is != null) {
-        String content = readContent(new InputStreamReader(is));
-        runScript(false, content, sqlScript);
+      try (InputStream is = getClassLoader().getResourceAsStream(sqlScript)) {
+        if (is != null) {
+          String content = readContent(new InputStreamReader(is));
+          runScript(false, content, sqlScript);
+        }
       }
     }
   }

From 4bc80cc724bac44ea36bf11fd09d1702c7a4687e Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sun, 10 Jun 2018 23:36:12 +1200
Subject: [PATCH 0299/1036] #1412 - Fix Resource leaks for properties & yaml
 files etc - EbeanVersion

---
 src/main/java/io/ebean/EbeanVersion.java | 25 ++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/main/java/io/ebean/EbeanVersion.java b/src/main/java/io/ebean/EbeanVersion.java
index caf1fc9eb..c9ca35b77 100644
--- a/src/main/java/io/ebean/EbeanVersion.java
+++ b/src/main/java/io/ebean/EbeanVersion.java
@@ -1,11 +1,11 @@
 package io.ebean;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 /**
  * Class to determine the ebean version. (
  * @author Roland Praml, FOCONIS AG
@@ -13,31 +13,32 @@ import org.slf4j.LoggerFactory;
  */
 public class EbeanVersion {
   private EbeanVersion() {
-    
+
   }
   private static final Logger logger = LoggerFactory.getLogger(EbeanVersion.class);
-  
+
   private static String version = "unknown";
   static {
     try {
       Properties prop = new Properties();
-      InputStream in = Ebean.class.getResourceAsStream("/META-INF/maven/io.ebean/ebean/pom.properties");
-      if (in != null) {
-        prop.load(in);
-        in.close();
-        version = prop.getProperty("version");
+      try (InputStream in = Ebean.class.getResourceAsStream("/META-INF/maven/io.ebean/ebean/pom.properties")) {
+        if (in != null) {
+          prop.load(in);
+          in.close();
+          version = prop.getProperty("version");
+        }
       }
       logger.info("ebean version: {}", version);
     } catch (IOException e) {
       logger.warn("Could not determine ebean version: {}", e.getMessage());
     }
   }
-  
+
   /**
    * Returns the ebean version (read from /META-INF/maven/io.ebean/ebean/pom.properties)
    */
   public static String getVersion() {
     return version;
   }
-  
+
 }

From 4573a995f11df50bf1d671e468bc34335a32baff Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sun, 10 Jun 2018 23:37:28 +1200
Subject: [PATCH 0300/1036] #1412 - Fix Resource leaks for properties & yaml
 files etc

No effective change - reformat only
---
 .../ebean/config/properties/LoadContext.java  | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/main/java/io/ebean/config/properties/LoadContext.java b/src/main/java/io/ebean/config/properties/LoadContext.java
index e8a5fc729..5c5b156c9 100644
--- a/src/main/java/io/ebean/config/properties/LoadContext.java
+++ b/src/main/java/io/ebean/config/properties/LoadContext.java
@@ -18,22 +18,22 @@ import java.util.Set;
  */
 class LoadContext {
 
-	private static final Logger log = LoggerFactory.getLogger(LoadContext.class);
+  private static final Logger log = LoggerFactory.getLogger(LoadContext.class);
 
   /**
    * Map we are loading the properties into.
    */
-	private final Map<String, String> map = new LinkedHashMap<>();
+  private final Map<String, String> map = new LinkedHashMap<>();
 
   /**
    * Names of resources/files that were loaded.
    */
-	private final Set<String> loadedResources = new LinkedHashSet<>();
+  private final Set<String> loadedResources = new LinkedHashSet<>();
 
   /**
    * Return the input stream (maybe null) for the given source.
    */
-	InputStream resource(String resourcePath, Loader.Source source) {
+  InputStream resource(String resourcePath, Loader.Source source) {
 
     InputStream is = null;
     if (source == Loader.Source.RESOURCE) {
@@ -46,21 +46,21 @@ class LoadContext {
       if (file.exists()) {
         try {
           is = new FileInputStream(file);
-          loadedResources.add("file:"+resourcePath);
+          loadedResources.add("file:" + resourcePath);
         } catch (FileNotFoundException e) {
           throw new IllegalStateException(e);
         }
       }
     }
 
-		return is;
-	}
+    return is;
+  }
 
   private InputStream resourceStream(String resourcePath) {
     InputStream is = getClass().getResourceAsStream("/" + resourcePath);
     if (is == null) {
       // search the module path for top level resource
-      is =  ClassLoader.getSystemResourceAsStream(resourcePath);
+      is = ClassLoader.getSystemResourceAsStream(resourcePath);
     }
     return is;
   }
@@ -68,30 +68,30 @@ class LoadContext {
   /**
    * Add a property entry.
    */
-	void put(String key, String val) {
-	  if (val != null) {
-	    val = val.trim();
+  void put(String key, String val) {
+    if (val != null) {
+      val = val.trim();
     }
-		map.put(key, val);
-	}
+    map.put(key, val);
+  }
 
   /**
    * Evaluate all the expressions and return as a Properties object.
    */
-	Properties eval() {
+  Properties eval() {
 
-		log.info("loaded properties from {}", loadedResources);
+    log.info("loaded properties from {}", loadedResources);
 
-		Properties properties = new Properties();
+    Properties properties = new Properties();
 
-		for (Map.Entry<String, String> entry : map.entrySet()) {
-			String key = entry.getKey();
-			String value = PropertyEval.eval(entry.getValue());
-			properties.setProperty(key, value);
-		}
+    for (Map.Entry<String, String> entry : map.entrySet()) {
+      String key = entry.getKey();
+      String value = PropertyEval.eval(entry.getValue());
+      properties.setProperty(key, value);
+    }
 
-		return properties;
-	}
+    return properties;
+  }
 
   /**
    * Read the special properties that can point to an external properties source.

From 98964638bac4377a9a403c1aadefb12dc356545f Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sun, 10 Jun 2018 23:43:41 +1200
Subject: [PATCH 0301/1036] #1412 - Fix Resource leaks for properties & yaml
 files etc - MigrationXmlReader

---
 .../migrationreader/MigrationXmlReader.java          | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java b/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java
index a5b534298..e93260ba9 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java
@@ -24,12 +24,14 @@ public class MigrationXmlReader {
    */
   public static Migration read(String resourcePath) {
 
-    InputStream is = MigrationXmlReader.class.getResourceAsStream(resourcePath);
-    if (is == null) {
-      throw new IllegalArgumentException("No resource found for path [" + resourcePath + "]");
+    try (InputStream is = MigrationXmlReader.class.getResourceAsStream(resourcePath)) {
+      if (is == null) {
+        throw new IllegalArgumentException("No resource found for path [" + resourcePath + "]");
+      }
+      return read(is);
+    } catch (IOException e) {
+      throw new IllegalArgumentException("Failed to auto close resource " + resourcePath, e);
     }
-
-    return read(is);
   }
 
   /**

From 0069d2fabc9fa5e56319bbcc7bf2cc92768a5ae3 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sun, 10 Jun 2018 23:46:55 +1200
Subject: [PATCH 0302/1036] #1412 - Fix Resource leaks for properties & yaml
 files etc - ExtraDdlXmlReader

---
 .../extraddl/model/ExtraDdlXmlReader.java          | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java b/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
index a478a1ac7..1cb735073 100644
--- a/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
+++ b/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
@@ -8,6 +8,7 @@ import org.slf4j.LoggerFactory;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
+import java.io.IOException;
 import java.io.InputStream;
 
 /**
@@ -87,12 +88,15 @@ public class ExtraDdlXmlReader {
    */
   public static ExtraDdl read(String resourcePath) {
 
-    InputStream is = ExtraDdlXmlReader.class.getResourceAsStream(resourcePath);
-    if (is == null) {
-      // we expect this and check for null
-      return null;
+    try (InputStream is = ExtraDdlXmlReader.class.getResourceAsStream(resourcePath)) {
+      if (is == null) {
+        // we expect this and check for null
+        return null;
+      }
+      return read(is);
+    } catch (IOException e) {
+      throw new IllegalStateException("Error on auto close of " + resourcePath, e);
     }
-    return read(is);
   }
 
   /**

From 25dea0b5b05a93aaf8348cb8295ae699aebb4359 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sun, 10 Jun 2018 23:48:49 +1200
Subject: [PATCH 0303/1036] #1412 - Fix Resource leaks for properties & yaml
 files etc - DefaultAutoTuneService

---
 .../autotune/service/DefaultAutoTuneService.java   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java b/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java
index a9c49bcb3..da7c98322 100644
--- a/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java
+++ b/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java
@@ -12,6 +12,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.concurrent.TimeUnit;
 
@@ -106,11 +107,14 @@ public class DefaultAutoTuneService implements AutoTuneService {
       loadAutoTuneProfiling(AutoTuneXmlReader.read(file));
     } else {
       // look for autotune as a resource
-      InputStream stream = getClass().getResourceAsStream("/" + tuningFile);
-      if (stream != null) {
-        loadAutoTuneProfiling(AutoTuneXmlReader.read(stream));
-      } else {
-        logger.warn("AutoTune file {} not found - no initial automatic query tuning", tuningFile);
+      try (InputStream stream = getClass().getResourceAsStream("/" + tuningFile)) {
+        if (stream != null) {
+          loadAutoTuneProfiling(AutoTuneXmlReader.read(stream));
+        } else {
+          logger.warn("AutoTune file {} not found - no initial automatic query tuning", tuningFile);
+        }
+      } catch (IOException e) {
+        throw new IllegalStateException("Error on auto close of " + tuningFile, e);
       }
     }
   }

From 6b39bad4dae03cd3017865a0871b3e267b888f4c Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sun, 10 Jun 2018 23:55:45 +1200
Subject: [PATCH 0304/1036] No effective change - use JdbcClose for
 DatabasePlatformFactory

---
 .../server/core/DatabasePlatformFactory.java           | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java b/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
index 75db54f34..efeb3d9e0 100644
--- a/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
+++ b/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
@@ -14,7 +14,7 @@ import io.ebean.config.dbplatform.sqlanywhere.SqlAnywherePlatform;
 import io.ebean.config.dbplatform.sqlite.SQLitePlatform;
 import io.ebean.config.dbplatform.sqlserver.SqlServer16Platform;
 import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
-import io.ebean.migration.util.JdbcClose;
+import io.ebean.util.JdbcClose;
 import io.ebeaninternal.dbmigration.DbOffline;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -126,13 +126,7 @@ public class DatabasePlatformFactory {
       throw new PersistenceException(ex);
 
     } finally {
-      try {
-        if (connection != null) {
-          connection.close();
-        }
-      } catch (SQLException ex) {
-        logger.error(null, ex);
-      }
+      JdbcClose.close(connection);
     }
   }
 

From 90dfbcd7b3ea65c941564952f551030e1b2a67b2 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 11 Jun 2018 00:02:14 +1200
Subject: [PATCH 0305/1036] #1412 - Fix Resource leaks for properties & yaml
 files etc - DefaultContainer.checkDataSource()

The resource was already being closed properly, changing to use try with resources and note that this now throws PersistenceException if we fail to close() on the connection (which I think is an ok change).
---
 .../server/core/DefaultContainer.java            | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index e1e923dea..09ce89349 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -10,7 +10,6 @@ import io.ebean.config.TenantMode;
 import io.ebean.config.UnderscoreNamingConvention;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.h2.H2Platform;
-import io.ebean.config.properties.PropertiesLoader;
 import io.ebean.service.SpiContainer;
 import io.ebeaninternal.api.SpiBackgroundExecutor;
 import io.ebeaninternal.api.SpiContainerBootup;
@@ -374,25 +373,14 @@ public class DefaultContainer implements SpiContainer {
       throw new RuntimeException("DataSource not set?");
     }
 
-    Connection c = null;
-    try {
-      c = serverConfig.getDataSource().getConnection();
-      if (!serverConfig.isAutoCommitMode() && c.getAutoCommit()) {
+    try (Connection connection = serverConfig.getDataSource().getConnection()) {
+      if (!serverConfig.isAutoCommitMode() && connection.getAutoCommit()) {
         logger.warn("DataSource [{}] has autoCommit defaulting to true!", serverConfig.getName());
       }
       return true;
 
     } catch (SQLException ex) {
       throw new PersistenceException(ex);
-
-    } finally {
-      if (c != null) {
-        try {
-          c.close();
-        } catch (SQLException ex) {
-          logger.error("Error closing connection", ex);
-        }
-      }
     }
   }
 

From ca7e5b79b8e0f00f07d4da19fd8bfe0a307a24e4 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 11 Jun 2018 00:04:58 +1200
Subject: [PATCH 0306/1036] #1412 - Fix Resource leaks for properties & yaml
 files etc - ManifestReader

Not fixing a leak but just changing to use try with resources
---
 .../server/core/bootup/ManifestReader.java          | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java b/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java
index c4c1982b0..1a1e89f36 100644
--- a/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java
+++ b/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java
@@ -59,11 +59,8 @@ class ManifestReader {
     try {
       Enumeration<URL> resources = classLoader.getResources(resourcePath);
       while (resources.hasMoreElements()) {
-        InputStream is = resources.nextElement().openStream();
-        try {
+        try (InputStream is = resources.nextElement().openStream()) {
           read(new Manifest(is));
-        } finally {
-          close(is);
         }
       }
     } catch (IOException e) {
@@ -72,14 +69,6 @@ class ManifestReader {
     return packageSet;
   }
 
-  private void close(InputStream is) {
-    try {
-      is.close();
-    } catch (IOException e) {
-      logger.warn("Error closing manifest InputStream", e);
-    }
-  }
-
   /**
    * Read the entity packages from the manifest.
    */

From 4788dd4ec9cfb0271bca275faea8940057e67819 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 11 Jun 2018 00:12:30 +1200
Subject: [PATCH 0307/1036] [maven-release-plugin] prepare release
 ebean-11.17.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index da4068e4a..2ef42fb00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.17.2-SNAPSHOT</version>
+  <version>11.17.2</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.17.2</tag>
   </scm>
 
   <profiles>

From 57759854686fad9f0b840a0d6e3214e306ad4113 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 11 Jun 2018 00:12:45 +1200
Subject: [PATCH 0308/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2ef42fb00..5883632e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.17.2</version>
+  <version>11.17.3-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.17.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From ec2f1f724304dcfebd521a873934f56dc43d3a65 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 11 Jun 2018 13:20:39 +1200
Subject: [PATCH 0309/1036] #1414 - Support dynamic aggregate formula without
 alias e.g. query.select("date, sum(totalKms), sum(hours)")

---
 .../server/deploy/FormulaPropertyPath.java    | 10 +-
 .../TestAggregateFormula.java                 | 94 +++++++++++++++++++
 .../aggregation/TestAggregationTopLevel.java  | 55 +++++++++++
 3 files changed, 152 insertions(+), 7 deletions(-)
 create mode 100644 src/test/java/org/tests/aggregateformula/TestAggregateFormula.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java b/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
index c63d39b3e..df7333c01 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
@@ -8,7 +8,7 @@ import java.sql.Types;
 
 class FormulaPropertyPath {
 
-  private static final String[] AGG_FUNCTIONS = {"count", "max", "min", "avg"};
+  private static final String[] AGG_FUNCTIONS = {"count", "max", "min", "avg", "sum"};
 
   private static final String DISTINCT_ = "distinct ";
 
@@ -118,12 +118,8 @@ class FormulaPropertyPath {
       }
     }
 
-    String logicalName = (alias == null) ? formula : alias;
-    BeanProperty targetProperty = null;
-    if (alias != null) {
-      targetProperty = descriptor._findBeanProperty(alias);
-    }
-
+    String logicalName = (alias == null) ? internalExpression : alias;
+    BeanProperty targetProperty = descriptor._findBeanProperty(logicalName);
     String parsedAggregation = buildFormula(parsed);
     return new DynamicPropertyAggregationFormula(logicalName, scalarType, parsedAggregation, isAggregate(), targetProperty, alias);
   }
diff --git a/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java b/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java
new file mode 100644
index 000000000..4605e283e
--- /dev/null
+++ b/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java
@@ -0,0 +1,94 @@
+package org.tests.aggregateformula;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+import org.tests.model.basic.Contact;
+import org.tests.model.basic.Order;
+import org.tests.model.basic.ResetBasicData;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestAggregateFormula extends BaseTestCase {
+
+  @Test
+  public void sum_withoutAlias() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    List<Order> orders = Ebean.find(Order.class)
+      .select("status, sum(id)")
+      .findList();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select t0.status, sum(t0.id) from o_order t0 group by t0.status");
+
+    assertThat(orders).isNotEmpty();
+    for (Order order : orders) {
+      assertThat(order.getStatus()).isNotNull();
+      assertThat(order.getId()).isNotNull();
+    }
+  }
+
+  @Test
+  public void sum_withAlias() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    List<Order> orders = Ebean.find(Order.class)
+      .select("status, sum(id) as id")
+      .findList();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select t0.status, sum(t0.id) id from o_order t0 group by t0.status");
+
+    assertThat(orders).isNotEmpty();
+    for (Order order : orders) {
+      assertThat(order.getStatus()).isNotNull();
+      assertThat(order.getId()).isNotNull();
+    }
+  }
+
+  @Test
+  public void sumWithManyToOne_min() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    List<Contact> contacts = Ebean.find(Contact.class)
+      .select("customer, min(cretime)")
+      .findList();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select t0.customer_id, min(t0.cretime) from contact t0 group by t0.customer_id");
+
+    assertThat(contacts).isNotEmpty();
+  }
+
+  @Test
+  public void sumWithManyToOne_minMax() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    List<Contact> contacts = Ebean.find(Contact.class)
+      .select("customer, min(cretime), max(updtime)")
+      .findList();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select t0.customer_id, min(t0.cretime), max(t0.updtime) from contact t0 group by t0.customer_id");
+
+    assertThat(contacts).isNotEmpty();
+  }
+
+
+}
diff --git a/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java b/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java
index 73f693fda..72ace657a 100644
--- a/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java
+++ b/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java
@@ -73,6 +73,61 @@ public class TestAggregationTopLevel extends BaseTestCase {
     assertThat(result).isNotEmpty();
   }
 
+  @Test
+  public void groupBy_date_dynamicFormula() {
+
+    Query<DMachineStats> query = Ebean.find(DMachineStats.class)
+      .select("date, sum(totalKms), sum(hours)")
+      .where().gt("date", LocalDate.now().minusDays(10))
+      .having().gt("hours", 2)
+      .query();
+
+    List<DMachineStats> result = query.findList();
+    assertThat(sqlOf(query)).contains("select t0.date, sum(t0.total_kms), sum(t0.hours) from d_machine_stats t0 where t0.date > ?  group by t0.date having t0.hours > ?");
+    assertThat(result).isNotEmpty();
+  }
+
+  @Test
+  public void groupBy_MachineAndDate_dynamicFormula() {
+
+    Query<DMachineStats> query = Ebean.find(DMachineStats.class)
+      .select("machine, date, max(rate)")
+      .where().gt("date", LocalDate.now().minusDays(10))
+      .query();
+
+    List<DMachineStats> result = query.findList();
+    assertThat(sqlOf(query)).contains("select t0.machine_id, t0.date, max(t0.rate) from d_machine_stats t0 where t0.date > ?  group by t0.machine_id, t0.date");
+    assertThat(result).isNotEmpty();
+  }
+
+  @Test
+  public void groupBy_MachineWithJoin_dynamicFormula() {
+
+    Query<DMachineStats> query = Ebean.find(DMachineStats.class)
+      .select("max(rate), sum(totalKms)")
+      .fetch("machine", "name")
+      .where().gt("date", LocalDate.now().minusDays(10))
+      .query();
+
+    List<DMachineStats> result = query.findList();
+    assertThat(sqlOf(query)).contains("select max(t0.rate), sum(t0.total_kms), t1.id, t1.name from d_machine_stats t0 left join dmachine t1 on t1.id = t0.machine_id  where t0.date > ?  group by t1.id, t1.name");
+    assertThat(result).isNotEmpty();
+  }
+
+  @Test
+  public void groupBy_MachineDateWithJoin_dynamicFormula() {
+
+    Query<DMachineStats> query = Ebean.find(DMachineStats.class)
+      .select("machine, date, max(rate), sum(totalKms)")
+      .fetch("machine", "name")
+      .where().gt("date", LocalDate.now().minusDays(10))
+      .query();
+
+    List<DMachineStats> result = query.findList();
+    assertThat(sqlOf(query)).contains("select t0.date, max(t0.rate), sum(t0.total_kms), t1.id, t1.name from d_machine_stats t0 left join dmachine t1 on t1.id = t0.machine_id  where t0.date > ?  group by t0.date, t1.id, t1.name");
+    assertThat(result).isNotEmpty();
+  }
+
   private static void loadData() {
 
     List<DMachine> machines = new ArrayList<>();

From 258e29d2f04179ed1309e43f01b3d7b854266e78 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 11 Jun 2018 13:29:13 +1200
Subject: [PATCH 0310/1036] #1415 - Add asDto(Class<D> dtoClass) ... to
 ExpressionList to support fluid style

---
 src/main/java/io/ebean/ExpressionList.java        |  8 ++++++++
 .../server/expression/DefaultExpressionList.java  |  6 ++++++
 .../server/expression/JunctionExpression.java     |  6 ++++++
 src/test/java/io/ebean/DtoQueryFromOrmTest.java   | 15 +++++++++++++++
 4 files changed, 35 insertions(+)

diff --git a/src/main/java/io/ebean/ExpressionList.java b/src/main/java/io/ebean/ExpressionList.java
index 711d23906..efdec6e7b 100644
--- a/src/main/java/io/ebean/ExpressionList.java
+++ b/src/main/java/io/ebean/ExpressionList.java
@@ -120,6 +120,14 @@ public interface ExpressionList<T> {
    */
   Query<T> asDraft();
 
+  /**
+   * Convert the query to a DTO bean query.
+   * <p>
+   * We effectively use the underlying ORM query to build the SQL and then execute
+   * and map it into DTO beans.
+   */
+  <D> DtoQuery<D> asDto(Class<D> dtoClass);
+
   /**
    * Execute using "for update" clause which results in the DB locking the record.
    */
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index ef2e8c89c..69796ef43 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.expression;
 
 import io.ebean.CacheMode;
 import io.ebean.CountDistinctOrder;
+import io.ebean.DtoQuery;
 import io.ebean.Expression;
 import io.ebean.ExpressionFactory;
 import io.ebean.ExpressionList;
@@ -294,6 +295,11 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return query.asDraft();
   }
 
+  @Override
+  public <D> DtoQuery<D> asDto(Class<D> dtoClass) {
+    return query.asDto(dtoClass);
+  }
+
   @Override
   public Query<T> setIncludeSoftDeletes() {
     return query.setIncludeSoftDeletes();
diff --git a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index d7d6c0c7a..b1fc7b4cc 100644
--- a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.expression;
 
 import io.ebean.CacheMode;
 import io.ebean.CountDistinctOrder;
+import io.ebean.DtoQuery;
 import io.ebean.Expression;
 import io.ebean.ExpressionList;
 import io.ebean.FetchPath;
@@ -331,6 +332,11 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.asDraft();
   }
 
+  @Override
+  public <D> DtoQuery<D> asDto(Class<D> dtoClass) {
+    return exprList.asDto(dtoClass);
+  }
+
   @Override
   public Query<T> setIncludeSoftDeletes() {
     return exprList.setIncludeSoftDeletes();
diff --git a/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
index 0278a51c8..07e8b3122 100644
--- a/src/test/java/io/ebean/DtoQueryFromOrmTest.java
+++ b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
@@ -256,6 +256,21 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     assertThat(sql.get(0)).contains("select t0.last_name, count(*) totalCount from contact t0 where t0.last_name is not null  group by t0.last_name having count(*) > ?");
   }
 
+  @Test
+  public void toDto_fromExpressionList() {
+
+    ResetBasicData.reset();
+
+    List<ContactTotals> contactDtos
+      = Ebean.find(Contact.class)
+      .select("lastName, count(*) as totalCount")
+      .where().isNotNull("lastName")
+      .asDto(ContactTotals.class)
+      .findList();
+
+    assertThat(contactDtos).isNotEmpty();
+  }
+
   public static class ContactTotals {
 
     String lastName;

From 32e9b48359c0e7bfa25f35781145d6b3ee09ce9a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 11 Jun 2018 14:13:13 +1200
Subject: [PATCH 0311/1036] #1414 - Support dynamic aggregate formula without
 alias e.g. query.select("date, sum(totalKms), sum(hours)")

---
 .../org/tests/model/aggregation/TestAggregationTopLevel.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java b/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java
index 72ace657a..1ee04a974 100644
--- a/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java
+++ b/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java
@@ -79,11 +79,11 @@ public class TestAggregationTopLevel extends BaseTestCase {
     Query<DMachineStats> query = Ebean.find(DMachineStats.class)
       .select("date, sum(totalKms), sum(hours)")
       .where().gt("date", LocalDate.now().minusDays(10))
-      .having().gt("hours", 2)
+      .having().gt("sum(hours)", 2)
       .query();
 
     List<DMachineStats> result = query.findList();
-    assertThat(sqlOf(query)).contains("select t0.date, sum(t0.total_kms), sum(t0.hours) from d_machine_stats t0 where t0.date > ?  group by t0.date having t0.hours > ?");
+    assertThat(sqlOf(query)).contains("select t0.date, sum(t0.total_kms), sum(t0.hours) from d_machine_stats t0 where t0.date > ?  group by t0.date having sum(t0.hours) > ?");
     assertThat(result).isNotEmpty();
   }
 

From 93f75151f09c83a4d2dbaa87d1bb82a54c2c81c4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 11 Jun 2018 14:27:40 +1200
Subject: [PATCH 0312/1036] [maven-release-plugin] prepare release
 ebean-11.17.3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5883632e1..7f14840af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.17.3-SNAPSHOT</version>
+  <version>11.17.3</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.17.3</tag>
   </scm>
 
   <profiles>

From 3238c0def497f22b3f4cc6eb2e02fe57462a74d2 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 11 Jun 2018 14:27:53 +1200
Subject: [PATCH 0313/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7f14840af..345ad31d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.17.3</version>
+  <version>11.17.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.17.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 2427630c07ae0295a5193e9b2dc8c8ad6e1a275b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 11 Jun 2018 22:10:43 +1200
Subject: [PATCH 0314/1036] #1400 - Postgres @History table sys_period empty
 with multiple updates

---
 .../platform/PostgresHistoryDdl.java          | 16 ++++--
 .../org/tests/history/TestHistoryInsert.java  | 47 ++++++++++++++++
 .../migrationtest/postgres/1.0__initial.sql   | 55 ++++++++++++++-----
 .../migrationtest/postgres/1.1.sql            | 55 ++++++++++++++-----
 .../postgres/1.2__dropsFor_1.1.sql            | 11 +++-
 .../migrationtest/postgres/1.3.sql            | 33 ++++++++---
 .../postgres/1.4__dropsFor_1.3.sql            | 22 ++++++--
 7 files changed, 187 insertions(+), 52 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java
index fc79ff5ca..d1b34b976 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java
@@ -79,13 +79,21 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl {
 
   protected void createOrReplaceFunction(DdlBuffer apply, String procedureName, String historyTable, List<String> includedColumns) throws IOException {
     apply
-      .append("create or replace function ").append(procedureName).append("() returns trigger as $$").newLine()
-      .append("begin").newLine();
+      .append("create or replace function ").append(procedureName).append("() returns trigger as $$").newLine();
+
+    apply.append("declare").newLine()
+      .append("  lowerTs timestamptz;").newLine()
+      .append("  upperTs timestamptz;").newLine();
+
+    apply.append("begin").newLine()
+      .append("  lowerTs = lower(OLD.sys_period);").newLine()
+      .append("  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);").newLine();
+
     apply
       .append("  if (TG_OP = 'UPDATE') then").newLine();
     appendInsertIntoHistory(apply, historyTable, includedColumns);
     apply
-      .append("    NEW.").append(sysPeriod).append(" = tstzrange(").append(currentTimestamp).append(",null);").newLine()
+      .append("    NEW.").append(sysPeriod).append(" = tstzrange(upperTs,null);").newLine()
       .append("    return new;").newLine();
     apply
       .append("  elsif (TG_OP = 'DELETE') then").newLine();
@@ -124,7 +132,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("), ").append(currentTimestamp).append("), ");
+    buffer.append(") values (tstzrange(lowerTs,upperTs), ");
     appendColumnNames(buffer, columns, "OLD.");
     buffer.append(");").newLine();
   }
diff --git a/src/test/java/org/tests/history/TestHistoryInsert.java b/src/test/java/org/tests/history/TestHistoryInsert.java
index 67a1e93e4..40f95ce69 100644
--- a/src/test/java/org/tests/history/TestHistoryInsert.java
+++ b/src/test/java/org/tests/history/TestHistoryInsert.java
@@ -4,6 +4,7 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
+import io.ebean.Transaction;
 import io.ebean.Version;
 import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
@@ -93,6 +94,52 @@ public class TestHistoryInsert extends BaseTestCase {
     assertThat(versions).hasSize(3);
   }
 
+  @Test
+  @ForPlatform({Platform.POSTGRES})
+  public void test_singleTransaction_multipleHistory() {
+
+    User user = new User();
+    user.setName("First");
+    user.setEmail("first@email.com");
+    user.setPasswordHash("someHash");
+
+    try (Transaction transaction = Ebean.beginTransaction()) {
+      // insert and many updates inside transaction
+      Ebean.save(user);
+      user.setEmail("first2@email.com");
+      Ebean.save(user);
+      user.setEmail("first3@email.com");
+      Ebean.save(user);
+      user.setEmail("first4@email.com");
+      Ebean.save(user);
+
+      transaction.commit();
+    }
+
+    // a couple more updates outside of the first transaction
+    user.setEmail("first5@email.com");
+    Ebean.save(user);
+
+    user.setEmail("first6@email.com");
+    Ebean.save(user);
+
+    List<SqlRow> sqlRows =
+      Ebean.createSqlQuery("select lower(sys_period) lowerBound, upper(sys_period) upperBound from c_user_history where id = :id order by when_modified")
+        .setParameter("id", user.getId())
+        .findList();
+
+    Timestamp previousUpper = null;
+
+    for (SqlRow sqlRow : sqlRows) {
+      Timestamp nextLower = sqlRow.getTimestamp("lowerBound");
+      Timestamp nextUpper = sqlRow.getTimestamp("upperBound");
+      if (previousUpper != null) {
+        assertThat(previousUpper).isEqualTo(nextLower);
+      }
+      previousUpper = nextUpper;
+    }
+  }
+
   /**
    * Use SqlQuery to query the history table directly.
    */
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
index 0ad03898d..92439eac6 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
@@ -184,13 +184,18 @@ create table migtest_e_history6_history(like migtest_e_history6);
 create view migtest_e_history6_with_history as select * from migtest_e_history6 union all select * from migtest_e_history6_history;
 
 create or replace function migtest_e_history2_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
 begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.obsolete_string2);
-    NEW.sys_period = tstzrange(current_timestamp,null);
+    insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string, OLD.obsolete_string2);
+    NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.obsolete_string2);
+    insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string, OLD.obsolete_string2);
     return old;
   end if;
 end;
@@ -201,13 +206,18 @@ create trigger migtest_e_history2_history_upd
   for each row execute procedure migtest_e_history2_history_version();
 
 create or replace function migtest_e_history3_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
 begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into migtest_e_history3_history (sys_period,id, test_string) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string);
-    NEW.sys_period = tstzrange(current_timestamp,null);
+    insert into migtest_e_history3_history (sys_period,id, test_string) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string);
+    NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into migtest_e_history3_history (sys_period,id, test_string) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string);
+    insert into migtest_e_history3_history (sys_period,id, test_string) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string);
     return old;
   end if;
 end;
@@ -218,13 +228,18 @@ create trigger migtest_e_history3_history_upd
   for each row execute procedure migtest_e_history3_history_version();
 
 create or replace function migtest_e_history4_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
 begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into migtest_e_history4_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number);
-    NEW.sys_period = tstzrange(current_timestamp,null);
+    insert into migtest_e_history4_history (sys_period,id, test_number) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_number);
+    NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into migtest_e_history4_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number);
+    insert into migtest_e_history4_history (sys_period,id, test_number) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_number);
     return old;
   end if;
 end;
@@ -235,13 +250,18 @@ create trigger migtest_e_history4_history_upd
   for each row execute procedure migtest_e_history4_history_version();
 
 create or replace function migtest_e_history5_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
 begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into migtest_e_history5_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number);
-    NEW.sys_period = tstzrange(current_timestamp,null);
+    insert into migtest_e_history5_history (sys_period,id, test_number) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_number);
+    NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into migtest_e_history5_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number);
+    insert into migtest_e_history5_history (sys_period,id, test_number) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_number);
     return old;
   end if;
 end;
@@ -252,13 +272,18 @@ create trigger migtest_e_history5_history_upd
   for each row execute procedure migtest_e_history5_history_version();
 
 create or replace function migtest_e_history6_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
 begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into migtest_e_history6_history (sys_period,id, test_number1, test_number2) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number1, OLD.test_number2);
-    NEW.sys_period = tstzrange(current_timestamp,null);
+    insert into migtest_e_history6_history (sys_period,id, test_number1, test_number2) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_number1, OLD.test_number2);
+    NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into migtest_e_history6_history (sys_period,id, test_number1, test_number2) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number1, OLD.test_number2);
+    insert into migtest_e_history6_history (sys_period,id, test_number1, test_number2) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_number1, OLD.test_number2);
     return old;
   end if;
 end;
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
index 40c16d978..7e13e6924 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
@@ -131,13 +131,18 @@ create view migtest_e_history4_with_history as select * from migtest_e_history4
 create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history;
 
 create or replace function migtest_e_history_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
 begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into migtest_e_history_history (sys_period,id, test_string) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string);
-    NEW.sys_period = tstzrange(current_timestamp,null);
+    insert into migtest_e_history_history (sys_period,id, test_string) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string);
+    NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into migtest_e_history_history (sys_period,id, test_string) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string);
+    insert into migtest_e_history_history (sys_period,id, test_string) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string);
     return old;
   end if;
 end;
@@ -149,13 +154,18 @@ create trigger migtest_e_history_history_upd
 
 -- changes: [add test_string2, add test_string3]
 create or replace function migtest_e_history2_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
 begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into migtest_e_history2_history (sys_period,id, test_string, test_string3, obsolete_string1, obsolete_string2) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.test_string3, OLD.obsolete_string1, OLD.obsolete_string2);
-    NEW.sys_period = tstzrange(current_timestamp,null);
+    insert into migtest_e_history2_history (sys_period,id, test_string, test_string3, obsolete_string1, obsolete_string2) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string, OLD.test_string3, OLD.obsolete_string1, OLD.obsolete_string2);
+    NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into migtest_e_history2_history (sys_period,id, test_string, test_string3, obsolete_string1, obsolete_string2) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.test_string3, OLD.obsolete_string1, OLD.obsolete_string2);
+    insert into migtest_e_history2_history (sys_period,id, test_string, test_string3, obsolete_string1, obsolete_string2) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string, OLD.test_string3, OLD.obsolete_string1, OLD.obsolete_string2);
     return old;
   end if;
 end;
@@ -163,13 +173,18 @@ $$ LANGUAGE plpgsql;
 
 -- changes: [exclude test_string]
 create or replace function migtest_e_history3_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
 begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into migtest_e_history3_history (sys_period,id) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id);
-    NEW.sys_period = tstzrange(current_timestamp,null);
+    insert into migtest_e_history3_history (sys_period,id) values (tstzrange(lowerTs,upperTs), OLD.id);
+    NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into migtest_e_history3_history (sys_period,id) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id);
+    insert into migtest_e_history3_history (sys_period,id) values (tstzrange(lowerTs,upperTs), OLD.id);
     return old;
   end if;
 end;
@@ -177,13 +192,18 @@ $$ LANGUAGE plpgsql;
 
 -- changes: [alter test_number]
 create or replace function migtest_e_history4_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
 begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into migtest_e_history4_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number);
-    NEW.sys_period = tstzrange(current_timestamp,null);
+    insert into migtest_e_history4_history (sys_period,id, test_number) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_number);
+    NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into migtest_e_history4_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number);
+    insert into migtest_e_history4_history (sys_period,id, test_number) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_number);
     return old;
   end if;
 end;
@@ -191,13 +211,18 @@ $$ LANGUAGE plpgsql;
 
 -- changes: [add test_boolean]
 create or replace function migtest_e_history5_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
 begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into migtest_e_history5_history (sys_period,id, test_number, test_boolean) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number, OLD.test_boolean);
-    NEW.sys_period = tstzrange(current_timestamp,null);
+    insert into migtest_e_history5_history (sys_period,id, test_number, test_boolean) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_number, OLD.test_boolean);
+    NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into migtest_e_history5_history (sys_period,id, test_number, test_boolean) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number, OLD.test_boolean);
+    insert into migtest_e_history5_history (sys_period,id, test_number, test_boolean) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_number, OLD.test_boolean);
     return old;
   end if;
 end;
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql
index 67f252e11..83c88afd6 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql
@@ -21,13 +21,18 @@ create view migtest_e_history2_with_history as select * from migtest_e_history2
 
 -- changes: [drop obsolete_string1, drop obsolete_string2]
 create or replace function migtest_e_history2_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
 begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into migtest_e_history2_history (sys_period,id, test_string, test_string3) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.test_string3);
-    NEW.sys_period = tstzrange(current_timestamp,null);
+    insert into migtest_e_history2_history (sys_period,id, test_string, test_string3) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string, OLD.test_string3);
+    NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into migtest_e_history2_history (sys_period,id, test_string, test_string3) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.test_string3);
+    insert into migtest_e_history2_history (sys_period,id, test_string, test_string3) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string, OLD.test_string3);
     return old;
   end if;
 end;
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
index 89e93220f..cdd4d2bd6 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
@@ -74,13 +74,18 @@ create view migtest_e_history4_with_history as select * from migtest_e_history4
 
 -- changes: [add obsolete_string1, add obsolete_string2]
 create or replace function migtest_e_history2_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
 begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2, test_string2, test_string3) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.obsolete_string2, OLD.test_string2, OLD.test_string3);
-    NEW.sys_period = tstzrange(current_timestamp,null);
+    insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2, test_string2, test_string3) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string, OLD.obsolete_string2, OLD.test_string2, OLD.test_string3);
+    NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2, test_string2, test_string3) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.obsolete_string2, OLD.test_string2, OLD.test_string3);
+    insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2, test_string2, test_string3) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string, OLD.obsolete_string2, OLD.test_string2, OLD.test_string3);
     return old;
   end if;
 end;
@@ -88,13 +93,18 @@ $$ LANGUAGE plpgsql;
 
 -- changes: [include test_string]
 create or replace function migtest_e_history3_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
 begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into migtest_e_history3_history (sys_period,id, test_string) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string);
-    NEW.sys_period = tstzrange(current_timestamp,null);
+    insert into migtest_e_history3_history (sys_period,id, test_string) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string);
+    NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into migtest_e_history3_history (sys_period,id, test_string) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string);
+    insert into migtest_e_history3_history (sys_period,id, test_string) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string);
     return old;
   end if;
 end;
@@ -102,13 +112,18 @@ $$ LANGUAGE plpgsql;
 
 -- changes: [alter test_number]
 create or replace function migtest_e_history4_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
 begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into migtest_e_history4_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number);
-    NEW.sys_period = tstzrange(current_timestamp,null);
+    insert into migtest_e_history4_history (sys_period,id, test_number) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_number);
+    NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into migtest_e_history4_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number);
+    insert into migtest_e_history4_history (sys_period,id, test_number) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_number);
     return old;
   end if;
 end;
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql
index af25ac556..6530a3b97 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql
@@ -50,13 +50,18 @@ create view migtest_e_history5_with_history as select * from migtest_e_history5
 
 -- changes: [drop test_string2, drop test_string3]
 create or replace function migtest_e_history2_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
 begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.obsolete_string2);
-    NEW.sys_period = tstzrange(current_timestamp,null);
+    insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string, OLD.obsolete_string2);
+    NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.obsolete_string2);
+    insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string, OLD.obsolete_string2);
     return old;
   end if;
 end;
@@ -64,13 +69,18 @@ $$ LANGUAGE plpgsql;
 
 -- changes: [drop test_boolean]
 create or replace function migtest_e_history5_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
 begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into migtest_e_history5_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number);
-    NEW.sys_period = tstzrange(current_timestamp,null);
+    insert into migtest_e_history5_history (sys_period,id, test_number) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_number);
+    NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into migtest_e_history5_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number);
+    insert into migtest_e_history5_history (sys_period,id, test_number) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_number);
     return old;
   end if;
 end;

From 81897bd54dff573cca4618f98af63d7057173b84 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 12 Jun 2018 21:40:39 +1200
Subject: [PATCH 0315/1036] #1418 - Add saveAll() and deleteAll() to
 io.ebean.BeanRepository

---
 src/main/java/io/ebean/BeanRepository.java      | 16 ++++++++++++++++
 .../tests/repository/TestBeanRepository.java    | 17 +++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/src/main/java/io/ebean/BeanRepository.java b/src/main/java/io/ebean/BeanRepository.java
index b926ea8a0..4fd46bcba 100644
--- a/src/main/java/io/ebean/BeanRepository.java
+++ b/src/main/java/io/ebean/BeanRepository.java
@@ -2,6 +2,8 @@ package io.ebean;
 
 import io.ebean.bean.EntityBean;
 
+import java.util.Collection;
+
 /**
  * Provides finder functionality for use with "Dependency Injection style" use of Ebean.
  * <p>
@@ -115,6 +117,13 @@ public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
     db().save(bean);
   }
 
+  /**
+   * Save all the beans in the collection.
+   */
+  public int saveAll(Collection<T> bean) {
+    return db().saveAll(bean);
+  }
+
   /**
    * Update this entity.
    *
@@ -154,6 +163,13 @@ public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
     return db().delete(bean);
   }
 
+  /**
+   * Delete all the beans in the collection.
+   */
+  public int deleteAll(Collection<T> beans) {
+    return db().deleteAll(beans);
+  }
+
   /**
    * Delete a bean permanently without soft delete.
    * <p>
diff --git a/src/test/java/org/tests/repository/TestBeanRepository.java b/src/test/java/org/tests/repository/TestBeanRepository.java
index cd2f7f666..3bc791aac 100644
--- a/src/test/java/org/tests/repository/TestBeanRepository.java
+++ b/src/test/java/org/tests/repository/TestBeanRepository.java
@@ -4,6 +4,7 @@ import io.ebean.BaseTestCase;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -26,6 +27,22 @@ public class TestBeanRepository extends BaseTestCase {
 
     repository.update(fetchCustomer);
     repository.delete(fetchCustomer);
+
+    List<Customer> custs = new ArrayList<>();
+    custs.add(newCustomer("c0"));
+    custs.add(newCustomer("c1"));
+
+    int count = repository.saveAll(custs);
+    assertThat(count).isEqualTo(2);
+
+    count = repository.deleteAll(custs);
+    assertThat(count).isEqualTo(2);
+  }
+
+  private Customer newCustomer(String name) {
+    Customer customer = new Customer();
+    customer.setName(name);
+    return customer;
   }
 
   @Test

From 91c4eca528dafddcbc26175c0319b614952ae0fd Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 12 Jun 2018 22:08:17 +1200
Subject: [PATCH 0316/1036] #1419 - Refactor - saveAll() and deleteAll() ...
 when collections are empty skip transaction init check

---
 .../server/core/DefaultServer.java            | 33 ++++++++++---------
 .../io/ebean/EbeanServer_saveAllTest.java     | 20 +++++++++++
 2 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 779cb3982..3032a343d 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -1734,7 +1734,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     if (beans == null || beans.isEmpty()) {
       return;
     }
-
     executeInTrans((txn) -> {
       for (Object bean : beans) {
         update(checkEntityBean(bean), txn);
@@ -1776,7 +1775,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     if (beans == null || beans.isEmpty()) {
       return;
     }
-
     executeInTrans((txn) -> {
       for (Object bean : beans) {
         persister.insert(checkEntityBean(bean), txn);
@@ -1845,24 +1843,27 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   @Override
   public int saveAll(Collection<?> beans, Transaction transaction) throws OptimisticLockException {
-    return saveAllInternal(beans.iterator(), transaction);
+    return saveAllInternal(beans, transaction);
   }
 
   @Override
   public int saveAll(Collection<?> beans) throws OptimisticLockException {
-    return saveAllInternal(beans.iterator(), null);
+    return saveAllInternal(beans, null);
   }
 
   /**
    * Save all beans in the iterator with an explicit transaction.
    */
-  private int saveAllInternal(Iterator<?> it, Transaction transaction) {
+  private int saveAllInternal(Collection<?> beans, Transaction transaction) {
 
+    if (beans == null || beans.isEmpty()) {
+      return 0;
+    }
     return executeInTrans((txn) -> {
       txn.checkBatchEscalationOnCollection();
       int saveCount = 0;
-      while (it.hasNext()) {
-        persister.save(checkEntityBean(it.next()), txn);
+      for (Object bean : beans) {
+        persister.save(checkEntityBean(bean), txn);
         saveCount++;
       }
 
@@ -1950,12 +1951,12 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   @Override
   public int deleteAllPermanent(Collection<?> beans) {
-    return deleteAllInternal(beans.iterator(), null, true);
+    return deleteAllInternal(beans, null, true);
   }
 
   @Override
   public int deleteAllPermanent(Collection<?> beans, Transaction t) {
-    return deleteAllInternal(beans.iterator(), t, true);
+    return deleteAllInternal(beans, t, true);
   }
 
   /**
@@ -1963,7 +1964,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    */
   @Override
   public int deleteAll(Collection<?> beans) {
-    return deleteAllInternal(beans.iterator(), null, false);
+    return deleteAllInternal(beans, null, false);
   }
 
   /**
@@ -1971,21 +1972,23 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    */
   @Override
   public int deleteAll(Collection<?> beans, Transaction t) {
-    return deleteAllInternal(beans.iterator(), t, false);
+    return deleteAllInternal(beans, t, false);
   }
 
   /**
    * Delete all the beans in the iterator with an explicit transaction.
    */
-  private int deleteAllInternal(Iterator<?> it, Transaction transaction, boolean permanent) {
+  private int deleteAllInternal(Collection<?> beans, Transaction transaction, boolean permanent) {
 
+    if (beans == null || beans.isEmpty()) {
+      return 0;
+    }
     return executeInTrans((txn) -> {
 
       txn.checkBatchEscalationOnCollection();
       int deleteCount = 0;
-      while (it.hasNext()) {
-        EntityBean bean = checkEntityBean(it.next());
-        persister.delete(bean, txn, permanent);
+      for (Object bean : beans) {
+        persister.delete(checkEntityBean(bean), txn, permanent);
         deleteCount++;
       }
 
diff --git a/src/test/java/io/ebean/EbeanServer_saveAllTest.java b/src/test/java/io/ebean/EbeanServer_saveAllTest.java
index 69bc95753..53a3b4ccb 100644
--- a/src/test/java/io/ebean/EbeanServer_saveAllTest.java
+++ b/src/test/java/io/ebean/EbeanServer_saveAllTest.java
@@ -94,6 +94,26 @@ public class EbeanServer_saveAllTest extends BaseTestCase {
 
   }
 
+  @Test
+  public void deleteAll_withNull() {
+    Ebean.deleteAll(null);
+  }
+
+  @Test
+  public void deleteAll_withEmpty() {
+    Ebean.saveAll(beans(0));
+  }
+
+  @Test
+  public void saveAll_withNull() {
+    Ebean.saveAll(null);
+  }
+
+  @Test
+  public void saveAll_withEmpty() {
+    Ebean.saveAll(beans(0));
+  }
+
   @Test
   public void saveAll_withTransaction() {
 

From 698ee2198d39a0097a33c5c4d0eb8f7cb3f5999b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 12 Jun 2018 22:14:33 +1200
Subject: [PATCH 0317/1036] No effective change - refactor DefaultContainer
 from iterator to forEach

---
 .../java/io/ebeaninternal/server/core/DefaultContainer.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index 09ce89349..01cc62637 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -62,9 +62,8 @@ public class DefaultContainer implements SpiContainer {
   }
 
   private void invokeBootupPlugin() {
-    Iterator<SpiContainerBootup> it = ServiceLoader.load(SpiContainerBootup.class).iterator();
-    while (it.hasNext()) {
-      it.next().bootup();
+    for (SpiContainerBootup boot : ServiceLoader.load(SpiContainerBootup.class)) {
+      boot.bootup();
     }
   }
 

From c7052c5bfa9f3430c6007dd77dfe46b48d58c9e7 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 13 Jun 2018 21:30:41 +1200
Subject: [PATCH 0318/1036] #1420 - ENH: Add a ServiceLoader mechanism to
 configure ServerConfig - io.ebean.config.ServerConfigProvider

---
 .../io/ebean/config/ServerConfigProvider.java | 39 +++++++++++++++++++
 .../server/core/DefaultContainer.java         |  8 +++-
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/io/ebean/config/ServerConfigProvider.java

diff --git a/src/main/java/io/ebean/config/ServerConfigProvider.java b/src/main/java/io/ebean/config/ServerConfigProvider.java
new file mode 100644
index 000000000..b6ba8571a
--- /dev/null
+++ b/src/main/java/io/ebean/config/ServerConfigProvider.java
@@ -0,0 +1,39 @@
+package io.ebean.config;
+
+/**
+ * Provides a ServiceLoader based mechanism to configure a ServerConfig.
+ * <p>
+ * Provide an implementation and register it via the standard Java ServiceLoader mechanism
+ * via a file at <code>META-INF/services/io.ebean.config.ServerConfigProvider</code>.
+ * </p>
+ * <p>
+ * If you are using a DI container like Spring or Guice you are unlikely to use this but instead use a
+ * spring specific configuration.  When we are not using a DI container we may use this mechanism to
+ * explicitly register the entity beans and avoid classpath scanning.
+ * </p>
+ * <pre>{@code
+ *
+ * public class EbeanConfigProvider implements ServerConfigProvider {
+ *
+ *   @Override
+ *   public void apply(ServerConfig config) {
+ *
+ *     // register the entity bean classes explicitly
+ *     config.addClass(Customer.class);
+ *     config.addClass(User.class);
+ *     ...
+ *   }
+ * }
+ *
+ * }</pre>
+ */
+public interface ServerConfigProvider {
+
+  /**
+   * Apply the configuration to the ServerConfig.
+   * <p>
+   * Typically we explicitly register entity bean classes and thus avoid classpath scanning.
+   * </p>
+   */
+  void apply(ServerConfig config);
+}
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index 01cc62637..a8cf20c08 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -6,6 +6,7 @@ import io.ebean.cache.ServerCacheOptions;
 import io.ebean.cache.ServerCachePlugin;
 import io.ebean.config.ContainerConfig;
 import io.ebean.config.ServerConfig;
+import io.ebean.config.ServerConfigProvider;
 import io.ebean.config.TenantMode;
 import io.ebean.config.UnderscoreNamingConvention;
 import io.ebean.config.dbplatform.DatabasePlatform;
@@ -102,8 +103,13 @@ public class DefaultContainer implements SpiContainer {
   public SpiEbeanServer createServer(ServerConfig serverConfig) {
 
     synchronized (this) {
-      setNamingConvention(serverConfig);
+      if (serverConfig.isDefaultServer()) {
+        for (ServerConfigProvider configProvider : ServiceLoader.load(ServerConfigProvider.class)) {
+          configProvider.apply(serverConfig);
+        }
+      }
 
+      setNamingConvention(serverConfig);
       BootupClasses bootupClasses = getBootupClasses(serverConfig);
 
       boolean online = true;

From e683e25a95e288b39d0fa3a95cd7834693fb2395 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 13 Jun 2018 21:35:26 +1200
Subject: [PATCH 0319/1036] #1420 - ENH: Add a ServiceLoader mechanism to
 configure ServerConfig - io.ebean.config.ServerConfigProvider

---
 src/main/java/io/ebean/config/ServerConfig.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 222129a65..bfb0b3999 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -57,22 +57,24 @@ import java.util.ServiceLoader;
  * <pre>{@code
  *
  * ServerConfig c = new ServerConfig();
- * c.setName("db");
  *
  * // read the ebean.properties and load
  * // those settings into this serverConfig object
  * c.loadFromProperties();
  *
- * // add any classes found in the app.data package
- * c.addPackage("com.myapp.domain");
- *
- * // register as the 'Default' server
- * c.setDefaultServer(true);
+ * // explicitly register the entity beans to avoid classpath scanning
+ * c.addClass(Customer.class);
+ * c.addClass(User.class);
  *
  * EbeanServer server = EbeanServerFactory.create(c);
  *
  * }</pre>
  *
+ * <p>
+ * Note that ServerConfigProvider provides a standard Java ServiceLoader mechanism that can
+ * be used to apply configuration to the ServerConfig.
+ * </p>
+ *
  * @author emcgreal
  * @author rbygrave
  * @see EbeanServerFactory

From c088cfa33972232242f1c84b24ff8e75f3eda87f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 13 Jun 2018 22:22:29 +1200
Subject: [PATCH 0320/1036] #1421 - Nested programatic transaction using auto
 close / try with resources ... does not end/rollback the parent/outer
 transaction

---
 .../java/io/ebeaninternal/api/ScopeTrans.java |   8 +-
 .../transaction/TestNestedTransaction.java    | 238 ++++++++++++++++++
 2 files changed, 244 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/org/tests/transaction/TestNestedTransaction.java

diff --git a/src/main/java/io/ebeaninternal/api/ScopeTrans.java b/src/main/java/io/ebeaninternal/api/ScopeTrans.java
index 27c0430c9..275f6c09a 100644
--- a/src/main/java/io/ebeaninternal/api/ScopeTrans.java
+++ b/src/main/java/io/ebeaninternal/api/ScopeTrans.java
@@ -53,6 +53,10 @@ public class ScopeTrans {
    */
   private boolean rolledBack;
 
+  /**
+   * Flag set when nested commit has occurred.
+   */
+  private boolean nestedCommit;
 
   public ScopeTrans(boolean rollbackOnChecked, boolean created, SpiTransaction transaction, TxScope txScope) {
 
@@ -113,7 +117,6 @@ public class ScopeTrans {
     complete();
   }
 
-
   /**
    * Complete the transaction programmatically. Try to commit.
    */
@@ -124,7 +127,7 @@ public class ScopeTrans {
   }
 
   public void end() {
-    if (created) {
+    if (created || !nestedCommit) {
       transaction.end();
     }
   }
@@ -133,6 +136,7 @@ public class ScopeTrans {
     if (created) {
       transaction.commit();
     } else {
+      nestedCommit = true;
       transaction.setBatchFlushOnQuery(restoreBatchFlushOnQuery);
       if (restoreBatch != null) {
         transaction.setBatch(restoreBatch);
diff --git a/src/test/java/org/tests/transaction/TestNestedTransaction.java b/src/test/java/org/tests/transaction/TestNestedTransaction.java
new file mode 100644
index 000000000..57d61c82d
--- /dev/null
+++ b/src/test/java/org/tests/transaction/TestNestedTransaction.java
@@ -0,0 +1,238 @@
+package org.tests.transaction;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.Transaction;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.tests.model.basic.EBasic;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestNestedTransaction extends BaseTestCase {
+
+  private static final Logger log = LoggerFactory.getLogger(TestNestedTransaction.class);
+
+  private EBasic bean;
+
+  @Before
+  public void init() {
+    bean = new EBasic("new");
+    Ebean.save(bean);
+  }
+
+  private void assertClean() {
+    EBasic myBean = Ebean.find(EBasic.class, bean.getId());
+    assertThat(myBean.getName()).isEqualTo("new");
+  }
+
+  private void assertModified() {
+    EBasic myBean = Ebean.find(EBasic.class, bean.getId());
+    assertThat(myBean.getName()).isEqualTo("modified");
+  }
+
+  private void modify() {
+    bean.setName("modified");
+    Ebean.save(bean);
+  }
+
+  // ===== level 0 =======
+  @Test
+  public void testNested_0() {
+    try (Transaction txn0 = Ebean.beginTransaction()) {
+      modify();
+      // no commit
+    }
+    assertClean();
+  }
+
+  @Test
+  public void testNested_1() {
+    try (Transaction txn0 = Ebean.beginTransaction()) {
+      modify();
+      txn0.commit();
+    }
+    assertModified();
+  }
+
+  // ===== level 1 =======
+  @Test
+  public void testNested_00() {
+    try (Transaction txn0 = Ebean.beginTransaction()) {
+      try (Transaction txn1 = Ebean.beginTransaction()) {
+        modify();
+        // no commit
+      }
+      // no commit
+    }
+    assertClean();
+  }
+
+  @Test
+  public void testNested_01() {
+    try (Transaction txn0 = Ebean.beginTransaction()) {
+      try (Transaction txn1 = Ebean.beginTransaction()) {
+        modify();
+        // no commit
+      }
+      attemptCommit(txn0);
+    }
+    assertClean();
+  }
+
+  private void attemptCommit(Transaction txn) {
+    try {
+      txn.commit();
+    } catch (IllegalStateException e) {
+      // expected
+      log.info("Expected IllegalStateException as transaction already rolled back " + e.getMessage());
+    }
+  }
+
+  @Test
+  public void testNested_10() {
+    try (Transaction txn0 = Ebean.beginTransaction()) {
+      try (Transaction txn1 = Ebean.beginTransaction()) {
+        modify();
+        txn1.commit();
+      }
+      // no commit
+    }
+    assertClean();
+  }
+
+  @Test
+  public void testNested_11() {
+    try (Transaction txn0 = Ebean.beginTransaction()) {
+      try (Transaction txn1 = Ebean.beginTransaction()) {
+        modify();
+        txn1.commit();
+      }
+      txn0.commit();
+    }
+    assertModified();
+  }
+
+  // ===== level 2 =======
+  @Test
+  public void testNested_000() {
+    try (Transaction txn0 = Ebean.beginTransaction()) {
+      try (Transaction txn1 = Ebean.beginTransaction()) {
+        try (Transaction txn2 = Ebean.beginTransaction()) {
+          modify();
+          // no commit
+        }
+        // no commit
+      }
+      // no commit
+    }
+    assertClean();
+  }
+
+  @Test
+  public void testNested_001() {
+    try (Transaction txn0 = Ebean.beginTransaction()) {
+      try (Transaction txn1 = Ebean.beginTransaction()) {
+        try (Transaction txn2 = Ebean.beginTransaction()) {
+          modify();
+          // no commit
+        }
+        // no commit
+      }
+      attemptCommit(txn0);
+    }
+    assertClean();
+  }
+
+  @Test
+  public void testNested_010() {
+    try (Transaction txn0 = Ebean.beginTransaction()) {
+      try (Transaction txn1 = Ebean.beginTransaction()) {
+        try (Transaction txn2 = Ebean.beginTransaction()) {
+          modify();
+          // no commit
+        }
+        txn1.commit();
+      }
+      // no commit
+    }
+    assertClean();
+  }
+
+  @Test
+  public void testNested_011() {
+    try (Transaction txn0 = Ebean.beginTransaction()) {
+      try (Transaction txn1 = Ebean.beginTransaction()) {
+        try (Transaction txn2 = Ebean.beginTransaction()) {
+          modify();
+          // no commit
+        }
+        txn1.commit();
+      }
+      attemptCommit(txn0);
+    }
+    assertClean();
+  }
+
+  @Test
+  public void testNested_100() {
+    try (Transaction txn0 = Ebean.beginTransaction()) {
+      try (Transaction txn1 = Ebean.beginTransaction()) {
+        try (Transaction txn2 = Ebean.beginTransaction()) {
+          modify();
+          txn2.commit();
+        }
+        // no commit
+      }
+      // no commit
+    }
+    assertClean();
+  }
+
+  @Test
+  public void testNested_101() {
+    try (Transaction txn0 = Ebean.beginTransaction()) {
+      try (Transaction txn1 = Ebean.beginTransaction()) {
+        try (Transaction txn2 = Ebean.beginTransaction()) {
+          modify();
+          txn2.commit();
+        }
+        // no commit
+      }
+      attemptCommit(txn0);
+    }
+    assertClean();
+  }
+
+  @Test
+  public void testNested_110() {
+    try (Transaction txn0 = Ebean.beginTransaction()) {
+      try (Transaction txn1 = Ebean.beginTransaction()) {
+        try (Transaction txn2 = Ebean.beginTransaction()) {
+          modify();
+          txn2.commit();
+        }
+        txn1.commit();
+      }
+      // no commit
+    }
+    assertClean();
+  }
+
+  @Test
+  public void testNested_111() {
+    try (Transaction txn0 = Ebean.beginTransaction()) {
+      try (Transaction txn1 = Ebean.beginTransaction()) {
+        try (Transaction txn2 = Ebean.beginTransaction()) {
+          modify();
+          txn2.commit();
+        }
+        txn1.commit();
+      }
+      txn0.commit();
+    }
+    assertModified();
+  }
+}

From 50593a7f9dafd6fd69618103b0382535f991b185 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 14 Jun 2018 00:04:43 +1200
Subject: [PATCH 0321/1036] #1423 - Close resources - InputStream of entity
 bean properties of File type

---
 .../server/persist/BatchedPstmt.java          | 49 ++++++++--
 .../server/persist/BatchedPstmtHolder.java    | 11 ++-
 .../server/persist/dml/DmlHandler.java        | 18 ++--
 .../server/persist/dml/InsertHandler.java     |  4 +-
 .../server/persist/dml/UpdateHandler.java     |  4 +-
 .../ebeaninternal/server/type/DataBind.java   | 40 +++++++-
 .../java/org/tests/types/TestFileType.java    | 97 ++++++++++++++++++-
 7 files changed, 197 insertions(+), 26 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java b/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java
index 501a44de0..bbe834a8c 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java
@@ -2,11 +2,16 @@ package io.ebeaninternal.server.persist;
 
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.api.SpiProfileTransactionEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * A batched statement that is held in BatchedPstmtHolder. It has a list of
@@ -17,6 +22,8 @@ import java.util.ArrayList;
  */
 public class BatchedPstmt implements SpiProfileTransactionEvent {
 
+  private static final Logger log = LoggerFactory.getLogger(BatchedPstmt.class);
+
   /**
    * The underlying statement.
    */
@@ -40,6 +47,8 @@ public class BatchedPstmt implements SpiProfileTransactionEvent {
 
   private int[] results;
 
+  private List<InputStream> inputStreams;
+
   /**
    * Create with a given statement.
    */
@@ -117,16 +126,19 @@ public class BatchedPstmt implements SpiProfileTransactionEvent {
   }
 
   private void executeAndCheckRowCounts() throws SQLException {
+    try {
+      results = pstmt.executeBatch();
+      if (results.length != list.size()) {
+        String s = "results array error " + results.length + " " + list.size();
+        throw new SQLException(s);
+      }
 
-    results = pstmt.executeBatch();
-    if (results.length != list.size()) {
-      String s = "results array error " + results.length + " " + list.size();
-      throw new SQLException(s);
-    }
-
-    // check for concurrency exceptions...
-    for (int i = 0; i < results.length; i++) {
-      list.get(i).checkRowCount(results[i]);
+      // check for concurrency exceptions...
+      for (int i = 0; i < results.length; i++) {
+        list.get(i).checkRowCount(results[i]);
+      }
+    } finally {
+      closeInputStreams();
     }
   }
 
@@ -148,4 +160,23 @@ public class BatchedPstmt implements SpiProfileTransactionEvent {
   public int[] getResults() {
     return results;
   }
+
+  /**
+   * Register any inputStreams that should be closed after execution.
+   */
+  public void registerInputStreams(List<InputStream> inputStreams) {
+    this.inputStreams = inputStreams;
+  }
+
+  private void closeInputStreams() {
+    if (inputStreams != null) {
+      for (InputStream inputStream : inputStreams) {
+        try {
+          inputStream.close();
+        } catch (IOException e) {
+          log.warn("Error closing inputStream ", e);
+        }
+      }
+    }
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java b/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java
index ffb0e6d71..100b2ff21 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java
@@ -39,6 +39,15 @@ public class BatchedPstmtHolder {
    * This will return null if no matching PreparedStatement is found.
    */
   public PreparedStatement getStmt(String stmtKey, BatchPostExecute postExecute) {
+    BatchedPstmt batchedPstmt = getBatchedPstmt(stmtKey, postExecute);
+    return (batchedPstmt == null) ? null : batchedPstmt.getStatement();
+  }
+
+  /**
+   * Return the BatchedPstmt that holds the batched statement.
+   */
+  public BatchedPstmt getBatchedPstmt(String stmtKey, BatchPostExecute postExecute) {
+
     BatchedPstmt bs = stmtMap.get(stmtKey);
     if (bs == null) {
       // the PreparedStatement has need been created
@@ -53,7 +62,7 @@ public class BatchedPstmtHolder {
     if (bsSize > maxSize) {
       maxSize = bsSize;
     }
-    return bs.getStatement();
+    return bs;
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
index d74977850..a861385dc 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
@@ -46,6 +46,8 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
    */
   protected DataBind dataBind;
 
+  protected BatchedPstmt batchedPstmt;
+
   protected String sql;
 
   /**
@@ -273,20 +275,18 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
   /**
    * Return a prepared statement taking into account batch requirements.
    */
-  protected PreparedStatement getPstmt(SpiTransaction t, String sql, PersistRequestBean<?> request,
-                                       boolean genKeys) throws SQLException {
+  protected PreparedStatement getPstmt(SpiTransaction t, String sql, PersistRequestBean<?> request, boolean genKeys) throws SQLException {
 
     BatchedPstmtHolder batch = t.getBatchControl().getPstmtHolder();
-    PreparedStatement stmt = batch.getStmt(sql, request);
-
-    if (stmt != null) {
-      return stmt;
+    batchedPstmt = batch.getBatchedPstmt(sql, request);
+    if (batchedPstmt != null) {
+      return batchedPstmt.getStatement();
     }
 
-    stmt = getPstmt(t, sql, genKeys);
+    PreparedStatement stmt = getPstmt(t, sql, genKeys);
 
-    BatchedPstmt bs = new BatchedPstmt(stmt, genKeys, sql, t);
-    batch.addStmt(bs, request);
+    batchedPstmt = new BatchedPstmt(stmt, genKeys, sql, t);
+    batch.addStmt(batchedPstmt, request);
     return stmt;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
index 7887c4b5a..babc0ab39 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
@@ -91,7 +91,9 @@ public class InsertHandler extends DmlHandler {
     }
     dataBind = bind(pstmt);
     meta.bind(this, bean, withId, persistRequest.isPublish());
-
+    if (persistRequest.isBatched()) {
+      batchedPstmt.registerInputStreams(dataBind.getInputStreams());
+    }
     logSql(sql);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java
index 5e4860111..2f1082046 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java
@@ -47,7 +47,9 @@ public class UpdateHandler extends DmlHandler {
     }
     dataBind = bind(pstmt);
     meta.bind(persistRequest, this, updatePlan);
-
+    if (persistRequest.isBatched()) {
+      batchedPstmt.registerInputStreams(dataBind.getInputStreams());
+    }
     setUpdateGenValues();
 
     logSql(sql);
diff --git a/src/main/java/io/ebeaninternal/server/type/DataBind.java b/src/main/java/io/ebeaninternal/server/type/DataBind.java
index e408bc588..b28be14b7 100644
--- a/src/main/java/io/ebeaninternal/server/type/DataBind.java
+++ b/src/main/java/io/ebeaninternal/server/type/DataBind.java
@@ -1,8 +1,11 @@
 package io.ebeaninternal.server.type;
 
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
 import java.io.StringReader;
@@ -13,10 +16,14 @@ import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Time;
 import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.List;
 
 public class DataBind {
 
+  private static final Logger log = LoggerFactory.getLogger(DataBind.class);
+
   private final DataTimeZone dataTimeZone;
 
   private final PreparedStatement pstmt;
@@ -25,6 +32,8 @@ public class DataBind {
 
   private final StringBuilder bindLog = new StringBuilder();
 
+  private List<InputStream> inputStreams;
+
   private int pos;
 
   public DataBind(DataTimeZone dataTimeZone, PreparedStatement pstmt, Connection connection) {
@@ -79,7 +88,24 @@ public class DataBind {
   }
 
   public int executeUpdate() throws SQLException {
-    return pstmt.executeUpdate();
+    try {
+      return pstmt.executeUpdate();
+    } finally {
+      closeInputStreams();
+    }
+  }
+
+  private void closeInputStreams() {
+    if (inputStreams != null) {
+      for (InputStream inputStream : inputStreams) {
+        try {
+          inputStream.close();
+        } catch (IOException e) {
+          log.warn("Error closing InputStream that was bound to PreparedStatement", e);
+        }
+      }
+      inputStreams = null;
+    }
   }
 
   public PreparedStatement getPstmt() {
@@ -147,7 +173,19 @@ public class DataBind {
     pstmt.setString(++pos, String.valueOf(v));
   }
 
+  /**
+   * Return any inputStreams that have been bound (and should be closed).
+   * This is used for batched statement execution only.
+   */
+  public List<InputStream> getInputStreams() {
+    return inputStreams;
+  }
+
   public void setBinaryStream(InputStream inputStream, long length) throws SQLException {
+    if (inputStreams == null) {
+      inputStreams = new ArrayList<>();
+    }
+    inputStreams.add(inputStream);
     pstmt.setBinaryStream(++pos, inputStream, length);
   }
 
diff --git a/src/test/java/org/tests/types/TestFileType.java b/src/test/java/org/tests/types/TestFileType.java
index 762536198..85d3d2173 100644
--- a/src/test/java/org/tests/types/TestFileType.java
+++ b/src/test/java/org/tests/types/TestFileType.java
@@ -2,18 +2,107 @@ package org.tests.types;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
-import org.tests.model.types.SomeFileBean;
+import io.ebean.Transaction;
 import org.junit.Test;
+import org.tests.model.types.SomeFileBean;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.PrintStream;
 import java.net.URL;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 public class TestFileType extends BaseTestCase {
 
-  File file = getFile("/profile-image.jpg");
-  File file2 = getFile("/java-64.png");
+  private File file = getFile("/profile-image.jpg");
+  private File file2 = getFile("/java-64.png");
+
+  private File newTempFile() throws IOException {
+    File tempFile = File.createTempFile("testfile", "txt");
+    try (PrintStream ps = new PrintStream(tempFile)) {
+      ps.println("Hello World!");
+    }
+    return tempFile;
+  }
+
+  @Test
+  public void test_closeFileStreamUnbatched() throws IOException {
+
+    File tempFile = newTempFile();
+
+    SomeFileBean bean0 = new SomeFileBean();
+    bean0.setName("tempBeanUnbatched");
+    bean0.setContent(tempFile);
+    Ebean.save(bean0);
+
+    assertTrue(tempFile.delete());
+  }
+
+  @Test
+  public void test_closeFileStreamUnbatched_onUpdate() throws IOException {
+
+    SomeFileBean bean0 = new SomeFileBean();
+    bean0.setName("tempBeanUnbatched");
+    bean0.setContent(newTempFile());
+    Ebean.save(bean0);
+
+
+    File updateFile = newTempFile();
+    bean0.setName("tempBeanModified");
+    bean0.setContent(updateFile);
+    Ebean.save(bean0);
+
+    assertTrue(updateFile.delete());
+  }
+
+  @Test
+  public void test_closeFileStreamBatched() throws IOException {
+
+    SomeFileBean bean0 = new SomeFileBean();
+    bean0.setName("tempBeanUnbatched");
+    bean0.setContent(newTempFile());
+    Ebean.save(bean0);
+
+
+    File tempFile = newTempFile();
+
+    try (Transaction txn = Ebean.beginTransaction()) {
+      txn.setBatchSize(30);
+      txn.setBatchMode(true);
+
+      bean0.setName("tempBeanBatchedModified");
+      bean0.setContent(tempFile);
+      Ebean.save(bean0);
+
+      txn.commit();
+    }
+
+    assertTrue(tempFile.delete());
+  }
+
+  @Test
+  public void test_closeFileStreamBatched_update() throws IOException {
+
+    File tempFile = newTempFile();
+
+    try (Transaction txn = Ebean.beginTransaction()) {
+      txn.setBatchSize(30);
+      txn.setBatchMode(true);
+
+      SomeFileBean bean0 = new SomeFileBean();
+      bean0.setName("tempBeanBatched");
+      bean0.setContent(tempFile);
+      Ebean.save(bean0);
+
+      txn.commit();
+    }
+
+    assertTrue(tempFile.delete());
+  }
 
   @Test
   public void test_insertNullFile() {

From 9ad460ecd85d22505d9a51033d90835dad939c88 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Wed, 13 Jun 2018 14:07:14 +0200
Subject: [PATCH 0322/1036] FIX: applied history drops were not recognized
 (#1422)

---
 .../dbmigration/model/PendingDrops.java       | 24 ++++++
 .../DbMigrationDropHistoryTest.java           | 85 +++++++++++++++++++
 .../dbmigration/DbMigrationGenerateTest.java  | 10 +++
 .../migration/history/v1_0/EHistory7.java     | 24 ++++++
 .../migration/history/v1_1/EHistory7.java     | 21 +++++
 .../migrationtest-history/1.0__initial.sql    | 17 ++++
 .../1.2__dropsFor_1.1.sql                     | 10 +++
 .../R__multi_comments.sql                     |  3 +
 .../migrationtest-history/R__order_views.sql  |  8 ++
 .../model/1.0__initial.model.xml              |  8 ++
 .../migrationtest-history/model/1.1.model.xml |  6 ++
 .../model/1.2__dropsFor_1.1.model.xml         |  6 ++
 src/test/resources/ebean.properties           | 12 +++
 13 files changed, 234 insertions(+)
 create mode 100644 src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java
 create mode 100644 src/test/java/misc/migration/history/v1_0/EHistory7.java
 create mode 100644 src/test/java/misc/migration/history/v1_1/EHistory7.java
 create mode 100644 src/test/resources/dbmigration/migrationtest-history/1.0__initial.sql
 create mode 100644 src/test/resources/dbmigration/migrationtest-history/1.2__dropsFor_1.1.sql
 create mode 100644 src/test/resources/dbmigration/migrationtest-history/R__multi_comments.sql
 create mode 100644 src/test/resources/dbmigration/migrationtest-history/R__order_views.sql
 create mode 100644 src/test/resources/dbmigration/migrationtest-history/model/1.0__initial.model.xml
 create mode 100644 src/test/resources/dbmigration/migrationtest-history/model/1.1.model.xml
 create mode 100644 src/test/resources/dbmigration/migrationtest-history/model/1.2__dropsFor_1.1.model.xml

diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/PendingDrops.java b/src/main/java/io/ebeaninternal/dbmigration/model/PendingDrops.java
index 65b9f0cca..44905aa02 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/PendingDrops.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/PendingDrops.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.dbmigration.model;
 import io.ebeaninternal.dbmigration.migration.ChangeSet;
 import io.ebeaninternal.dbmigration.migration.ChangeSetType;
 import io.ebeaninternal.dbmigration.migration.DropColumn;
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
 import io.ebeaninternal.dbmigration.migration.DropTable;
 import io.ebeaninternal.dbmigration.migration.Migration;
 
@@ -207,10 +208,26 @@ public class PendingDrops {
 
         } else if (pendingDrop instanceof DropTable && dropTableIn((DropTable) pendingDrop, appliedDrops)) {
           iterator.remove();
+
+        } else if (pendingDrop instanceof DropHistoryTable && dropHistoryTableIn((DropHistoryTable) pendingDrop, appliedDrops)) {
+          iterator.remove();
+
         }
       }
     }
 
+    /**
+     * Return true if the pendingDrop is contained in the appliedDrops.
+     */
+    private boolean dropHistoryTableIn(DropHistoryTable pendingDrop, ChangeSet appliedDrops) {
+      for (Object o : appliedDrops.getChangeSetChildren()) {
+        if (o instanceof DropHistoryTable && sameHistoryTable(pendingDrop, (DropHistoryTable) o)) {
+          return true;
+        }
+      }
+      return false;
+    }
+
     /**
      * Return true if the pendingDrop is contained in the appliedDrops.
      */
@@ -235,6 +252,13 @@ public class PendingDrops {
       return false;
     }
 
+    /**
+     * Return true if the DropHistoryTable match by base-table name.
+     */
+    private boolean sameHistoryTable(DropHistoryTable pendingDrop, DropHistoryTable o) {
+      return pendingDrop.getBaseTable().equals(o.getBaseTable());
+    }
+
     /**
      * Return true if the DropTable match by table name.
      */
diff --git a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java
new file mode 100644
index 000000000..10fd869d6
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java
@@ -0,0 +1,85 @@
+package io.ebeaninternal.dbmigration;
+
+import io.ebean.EbeanServer;
+import io.ebean.EbeanServerFactory;
+import io.ebean.annotation.Platform;
+import io.ebean.config.ServerConfig;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.StrictAssertions.assertThatThrownBy;
+
+
+/**
+ * This is the Migrationscript generator. It generates 3 migrationscript for the models
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+public class DbMigrationDropHistoryTest {
+
+  private static final Logger logger = LoggerFactory.getLogger(DbMigrationDropHistoryTest.class);
+
+  @Test
+  public void invokeTest() throws IOException {
+    main(null);
+  }
+
+  public static void main(String[] args) throws IOException {
+
+    logger.info("start");
+
+    DefaultDbMigration migration = new DefaultDbMigration();
+
+    // We use src/test/resources as output directory (so we see in GIT if files will change)
+
+    migration.setPathToResources("src/test/resources");
+
+    ServerConfig config = new ServerConfig();
+    config.setName("migrationtest-history");
+    config.loadFromProperties();
+    config.setRegister(false);
+    config.setDefaultServer(false);
+
+
+    config.setPackages(Arrays.asList("misc.migration.history.v1_0"));
+    EbeanServer server = EbeanServerFactory.create(config);
+    migration.setServer(server);
+
+    // First, we clean up the output-directory
+    assertThat(migration.getMigrationDirectory().getAbsolutePath()).contains("migrationtest-history");
+    Files.walk(migration.getMigrationDirectory().toPath())
+      .filter(Files::isRegularFile).map(Path::toFile).forEach(File::delete);
+
+    // then we generate migration scripts for v1_0
+    assertThat(migration.generateMigration()).isEqualTo("1.0__initial");
+    // and we check repeatative calls
+    assertThat(migration.generateMigration()).isNull();
+
+    // and now for v1_1
+    config.setPackages(Arrays.asList("misc.migration.history.v1_1"));
+    server = EbeanServerFactory.create(config);
+    migration.setServer(server);
+    assertThat(migration.generateMigration()).isEqualTo("1.1");
+    assertThat(migration.generateMigration()).isNull(); // subsequent call
+
+
+
+    System.setProperty("ddl.migration.pendingDropsFor", "1.1");
+    assertThat(migration.generateMigration()).isEqualTo("1.2__dropsFor_1.1");
+    assertThatThrownBy(()->migration.generateMigration())
+      .isInstanceOf(IllegalArgumentException.class)
+      .hasMessageContaining("No 'pendingDrops'"); // subsequent call
+    System.clearProperty("ddl.migration.pendingDropsFor");
+
+    logger.info("end");
+  }
+
+}
diff --git a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
index 602cbb7c3..635a9b9ac 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
@@ -15,6 +15,7 @@ import java.nio.file.Path;
 import java.util.Arrays;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 
 /**
@@ -85,6 +86,11 @@ public class DbMigrationGenerateTest {
 
     System.setProperty("ddl.migration.pendingDropsFor", "1.1");
     assertThat(migration.generateMigration()).isEqualTo("1.2__dropsFor_1.1");
+
+    assertThatThrownBy(()->migration.generateMigration())
+      .isInstanceOf(IllegalArgumentException.class)
+      .hasMessageContaining("No 'pendingDrops'"); // subsequent call
+
     System.clearProperty("ddl.migration.pendingDropsFor");
     assertThat(migration.generateMigration()).isNull(); // subsequent call
 
@@ -98,6 +104,10 @@ public class DbMigrationGenerateTest {
 
     System.setProperty("ddl.migration.pendingDropsFor", "1.3");
     assertThat(migration.generateMigration()).isEqualTo("1.4__dropsFor_1.3");
+    assertThatThrownBy(()->migration.generateMigration())
+      .isInstanceOf(IllegalArgumentException.class)
+      .hasMessageContaining("No 'pendingDrops'"); // subsequent call
+
     System.clearProperty("ddl.migration.pendingDropsFor");
     assertThat(migration.generateMigration()).isNull(); // subsequent call
 
diff --git a/src/test/java/misc/migration/history/v1_0/EHistory7.java b/src/test/java/misc/migration/history/v1_0/EHistory7.java
new file mode 100644
index 000000000..28ca8c5de
--- /dev/null
+++ b/src/test/java/misc/migration/history/v1_0/EHistory7.java
@@ -0,0 +1,24 @@
+package misc.migration.history.v1_0;
+
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.ebean.annotation.History;
+
+/**
+ * detects a bug where dropHistoryTable is not applied correctly
+ *
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+@Entity
+@Table(name = "migtest_e_history7")
+@History
+public class EHistory7 {
+
+  @Id
+  Integer id;
+
+}
diff --git a/src/test/java/misc/migration/history/v1_1/EHistory7.java b/src/test/java/misc/migration/history/v1_1/EHistory7.java
new file mode 100644
index 000000000..7b658368c
--- /dev/null
+++ b/src/test/java/misc/migration/history/v1_1/EHistory7.java
@@ -0,0 +1,21 @@
+package misc.migration.history.v1_1;
+
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * detects a bug where dropHistoryTable is not applied correctly
+ *
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+@Entity
+@Table(name = "migtest_e_history7")
+public class EHistory7 {
+
+  @Id
+  Integer id;
+
+}
diff --git a/src/test/resources/dbmigration/migrationtest-history/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest-history/1.0__initial.sql
new file mode 100644
index 000000000..16fa48f95
--- /dev/null
+++ b/src/test/resources/dbmigration/migrationtest-history/1.0__initial.sql
@@ -0,0 +1,17 @@
+-- Migrationscripts for ebean unittest DbMigrationDropHistoryTest
+-- apply changes
+create table migtest_e_history7 (
+  id                            integer auto_increment not null,
+  constraint pk_migtest_e_history7 primary key (id)
+);
+
+alter table migtest_e_history7 add column sys_period_start datetime(6) default now(6);
+alter table migtest_e_history7 add column sys_period_end datetime(6);
+create table migtest_e_history7_history(
+  id                            integer,
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view migtest_e_history7_with_history as select * from migtest_e_history7 union all select * from migtest_e_history7_history;
+
+create trigger migtest_e_history7_history_upd before update,delete on migtest_e_history7 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
diff --git a/src/test/resources/dbmigration/migrationtest-history/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest-history/1.2__dropsFor_1.1.sql
new file mode 100644
index 000000000..692d93f76
--- /dev/null
+++ b/src/test/resources/dbmigration/migrationtest-history/1.2__dropsFor_1.1.sql
@@ -0,0 +1,10 @@
+-- Migrationscripts for ebean unittest DbMigrationDropHistoryTest
+-- drop dependencies
+drop trigger migtest_e_history7_history_upd;
+drop view migtest_e_history7_with_history;
+alter table migtest_e_history7 drop column sys_period_start;
+alter table migtest_e_history7 drop column sys_period_end;
+drop table migtest_e_history7_history;
+
+
+-- apply changes
diff --git a/src/test/resources/dbmigration/migrationtest-history/R__multi_comments.sql b/src/test/resources/dbmigration/migrationtest-history/R__multi_comments.sql
new file mode 100644
index 000000000..0ede0c9eb
--- /dev/null
+++ b/src/test/resources/dbmigration/migrationtest-history/R__multi_comments.sql
@@ -0,0 +1,3 @@
+
+    -- h2 and postgres script
+  
\ No newline at end of file
diff --git a/src/test/resources/dbmigration/migrationtest-history/R__order_views.sql b/src/test/resources/dbmigration/migrationtest-history/R__order_views.sql
new file mode 100644
index 000000000..2872cc37e
--- /dev/null
+++ b/src/test/resources/dbmigration/migrationtest-history/R__order_views.sql
@@ -0,0 +1,8 @@
+
+
+    create or replace view order_agg_vw as
+    select d.order_id, sum(d.order_qty * d.unit_price) as order_total,
+           sum(d.ship_qty * d.unit_price) as ship_total
+    from o_order_detail d
+    group by d.order_id
+  
\ No newline at end of file
diff --git a/src/test/resources/dbmigration/migrationtest-history/model/1.0__initial.model.xml b/src/test/resources/dbmigration/migrationtest-history/model/1.0__initial.model.xml
new file mode 100644
index 000000000..52d70c793
--- /dev/null
+++ b/src/test/resources/dbmigration/migrationtest-history/model/1.0__initial.model.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
+    <changeSet type="apply">
+        <createTable name="migtest_e_history7" withHistory="true" pkName="pk_migtest_e_history7">
+            <column name="id" type="integer" primaryKey="true"/>
+        </createTable>
+    </changeSet>
+</migration>
\ No newline at end of file
diff --git a/src/test/resources/dbmigration/migrationtest-history/model/1.1.model.xml b/src/test/resources/dbmigration/migrationtest-history/model/1.1.model.xml
new file mode 100644
index 000000000..8c0a04b2b
--- /dev/null
+++ b/src/test/resources/dbmigration/migrationtest-history/model/1.1.model.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
+    <changeSet type="pendingDrops">
+        <dropHistoryTable baseTable="migtest_e_history7"/>
+    </changeSet>
+</migration>
\ No newline at end of file
diff --git a/src/test/resources/dbmigration/migrationtest-history/model/1.2__dropsFor_1.1.model.xml b/src/test/resources/dbmigration/migrationtest-history/model/1.2__dropsFor_1.1.model.xml
new file mode 100644
index 000000000..4cfc4672f
--- /dev/null
+++ b/src/test/resources/dbmigration/migrationtest-history/model/1.2__dropsFor_1.1.model.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
+    <changeSet type="apply" dropsFor="1.1">
+        <dropHistoryTable baseTable="migtest_e_history7"/>
+    </changeSet>
+</migration>
\ No newline at end of file
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 40d0c41db..5080db655 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -171,3 +171,15 @@ ebean.migrationtest.migration.appName=migrationtest
 ebean.migrationtest.migration.migrationPath=dbmigration/migrationtest
 ebean.migrationtest.migration.strict=true
 
+# parameters for migration test
+datasource.migrationtest-history.username=SA
+datasource.migrationtest-history.password=SA
+datasource.migrationtest-history.databaseUrl=jdbc:h2:mem:migration
+datasource.migrationtest-history.databaseDriver=org.h2.Driver
+ebean.migrationtest-history.applyPrefix=V
+ebean.migrationtest-history.ddl.generate=false
+ebean.migrationtest-history.ddl.run=false
+ebean.migrationtest-history.ddl.header=-- Migrationscripts for ebean unittest DbMigrationDropHistoryTest
+ebean.migrationtest-history.migration.appName=migrationtest-history
+ebean.migrationtest-history.migration.migrationPath=dbmigration/migrationtest-history
+ebean.migrationtest-history.migration.strict=true

From bddfa3bc5f5ed5772873bfd95ad87096373e760f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 14 Jun 2018 00:18:00 +1200
Subject: [PATCH 0323/1036] [maven-release-plugin] prepare release
 ebean-11.17.4

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 345ad31d1..59567dad4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.17.4-SNAPSHOT</version>
+  <version>11.17.4</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.17.4</tag>
   </scm>
 
   <profiles>

From a61db2ab3501eadbcbeebb41c2791845eea0a88f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 14 Jun 2018 00:18:14 +1200
Subject: [PATCH 0324/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 59567dad4..c67edab03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.17.4</version>
+  <version>11.17.5-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.17.4</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From e21839de91bef3f085e63dccc80f9bfd7f356bed Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 14 Jun 2018 11:03:29 +1200
Subject: [PATCH 0325/1036] #1424 - Deprecate / Move ... finder methods that
 take explicit transaction to ExtendedServer API

---
 src/main/java/io/ebean/EbeanServer.java       |  58 +++
 src/main/java/io/ebean/ExtendedServer.java    | 438 ++++++++++++++++++
 .../io/ebeaninternal/api/SpiEbeanServer.java  |   3 +-
 .../server/core/DefaultServer.java            |   6 +
 .../server/query/LimitOffsetPagedList.java    |   6 +-
 .../java/io/ebean/ExtendedServerTest.java     |  41 ++
 .../ebeaninternal/api/TDSpiEbeanServer.java   |   6 +
 .../query/LimitOffsetPagedListTest.java       |  16 +-
 8 files changed, 562 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/io/ebean/ExtendedServer.java
 create mode 100644 src/test/java/io/ebean/ExtendedServerTest.java

diff --git a/src/main/java/io/ebean/EbeanServer.java b/src/main/java/io/ebean/EbeanServer.java
index 23b974591..36e2612b4 100644
--- a/src/main/java/io/ebean/EbeanServer.java
+++ b/src/main/java/io/ebean/EbeanServer.java
@@ -808,22 +808,41 @@ public interface EbeanServer {
   <T> T getReference(Class<T> beanType, Object id);
 
   /**
+   * Return the extended API for EbeanServer.
+   * <p>
+   * The extended API has the options for executing queries that take an explicit
+   * transaction as an argument.
+   * </p>
+   * <p>
+   * Typically we only need to use the extended API when we do NOT want to use the
+   * usual ThreadLocal based mechanism to obtain the current transaction but instead
+   * supply the transaction explicitly.
+   * </p>
+   */
+  ExtendedServer extended();
+
+  /**
+   * Deprecated - Moved to the ExtendedServer API, please use via extended().
    * Return the number of 'top level' or 'root' entities this query should return.
    *
    * @see Query#findCount()
    * @see Query#findFutureCount()
    */
+  @Deprecated
   <T> int findCount(Query<T> query, Transaction transaction);
 
   /**
+   * Deprecated - Moved to the ExtendedServer API, please use via extended().
    * Return the Id values of the query as a List.
    *
    * @see Query#findIds()
    */
   @Nonnull
+  @Deprecated
   <A, T> List<A> findIds(Query<T> query, Transaction transaction);
 
   /**
+   * Deprecated - Moved to the ExtendedServer API, please use via extended().
    * Return a QueryIterator for the query.
    * <p>
    * Generally using {@link #findEach(Query, Consumer, Transaction)} or
@@ -841,9 +860,11 @@ public interface EbeanServer {
    * @see Query#findEachWhile(Predicate)
    */
   @Nonnull
+  @Deprecated
   <T> QueryIterator<T> findIterate(Query<T> query, Transaction transaction);
 
   /**
+   * Deprecated - Moved to the ExtendedServer API, please use via extended().
    * Execute the query visiting the each bean one at a time.
    * <p>
    * Unlike findList() this is suitable for processing a query that will return
@@ -871,9 +892,11 @@ public interface EbeanServer {
    * @see Query#findEach(Consumer)
    * @see Query#findEachWhile(Predicate)
    */
+  @Deprecated
   <T> void findEach(Query<T> query, Consumer<T> consumer, Transaction transaction);
 
   /**
+   * Deprecated - Moved to the ExtendedServer API, please use via extended().
    * Execute the query visiting the each bean one at a time.
    * <p>
    * Compared to findEach() this provides the ability to stop processing the query
@@ -908,9 +931,11 @@ public interface EbeanServer {
    * @see Query#findEach(Consumer)
    * @see Query#findEachWhile(Predicate)
    */
+  @Deprecated
   <T> void findEachWhile(Query<T> query, Predicate<T> consumer, Transaction transaction);
 
   /**
+   * Deprecated - Moved to the ExtendedServer API, please use via extended().
    * Return versions of a @History entity bean.
    * <p>
    * Generally this query is expected to be a find by id or unique predicates query.
@@ -918,9 +943,11 @@ public interface EbeanServer {
    * </p>
    */
   @Nonnull
+  @Deprecated
   <T> List<Version<T>> findVersions(Query<T> query, Transaction transaction);
 
   /**
+   * Deprecated - Moved to the ExtendedServer API, please use via extended().
    * Execute a query returning a list of beans.
    * <p>
    * Generally you are able to use {@link Query#findList()} rather than
@@ -944,9 +971,11 @@ public interface EbeanServer {
    * @see Query#findList()
    */
   @Nonnull
+  @Deprecated
   <T> List<T> findList(Query<T> query, Transaction transaction);
 
   /**
+   * Deprecated - Moved to the ExtendedServer API, please use via extended().
    * Execute find row count query in a background thread.
    * <p>
    * This returns a Future object which can be used to cancel, check the
@@ -960,9 +989,11 @@ public interface EbeanServer {
    * @see Query#findFutureCount()
    */
   @Nonnull
+  @Deprecated
   <T> FutureRowCount<T> findFutureCount(Query<T> query, Transaction transaction);
 
   /**
+   * Deprecated - Moved to the ExtendedServer API, please use via extended().
    * Execute find Id's query in a background thread.
    * <p>
    * This returns a Future object which can be used to cancel, check the
@@ -976,9 +1007,11 @@ public interface EbeanServer {
    * @see Query#findFutureIds()
    */
   @Nonnull
+  @Deprecated
   <T> FutureIds<T> findFutureIds(Query<T> query, Transaction transaction);
 
   /**
+   * Deprecated - Moved to the ExtendedServer API, please use via extended().
    * Execute find list query in a background thread returning a FutureList object.
    * <p>
    * This returns a Future object which can be used to cancel, check the
@@ -993,9 +1026,11 @@ public interface EbeanServer {
    * @see Query#findFutureList()
    */
   @Nonnull
+  @Deprecated
   <T> FutureList<T> findFutureList(Query<T> query, Transaction transaction);
 
   /**
+   * Deprecated - Moved to the ExtendedServer API, please use via extended().
    * Return a PagedList for this query using firstRow and maxRows.
    * <p>
    * The benefit of using this over findList() is that it provides functionality to get the
@@ -1025,9 +1060,11 @@ public interface EbeanServer {
    * @see Query#findPagedList()
    */
   @Nonnull
+  @Deprecated
   <T> PagedList<T> findPagedList(Query<T> query, Transaction transaction);
 
   /**
+   * Deprecated - Moved to the ExtendedServer API, please use via extended().
    * Execute the query returning a set of entity beans.
    * <p>
    * Generally you are able to use {@link Query#findSet()} rather than
@@ -1051,9 +1088,11 @@ public interface EbeanServer {
    * @see Query#findSet()
    */
   @Nonnull
+  @Deprecated
   <T> Set<T> findSet(Query<T> query, Transaction transaction);
 
   /**
+   * Deprecated - Moved to the ExtendedServer API, please use via extended().
    * Execute the query returning the entity beans in a Map.
    * <p>
    * Generally you are able to use {@link Query#findMap()} rather than
@@ -1068,9 +1107,11 @@ public interface EbeanServer {
    * @see Query#findMap()
    */
   @Nonnull
+  @Deprecated
   <K, T> Map<K, T> findMap(Query<T> query, Transaction transaction);
 
   /**
+   * Deprecated - Moved to the ExtendedServer API, please use via extended().
    * Execute the query returning a list of values for a single property.
    * <p>
    * <h3>Example 1:</h3>
@@ -1101,9 +1142,11 @@ public interface EbeanServer {
    * @see Query#findSingleAttributeList()
    */
   @Nonnull
+  @Deprecated
   <A, T> List<A> findSingleAttributeList(Query<T> query, Transaction transaction);
 
   /**
+   * Deprecated - Moved to the ExtendedServer API, please use via extended().
    * Execute the query returning at most one entity bean or null (if no matching
    * bean is found).
    * <p>
@@ -1123,15 +1166,19 @@ public interface EbeanServer {
    * @see Query#findOne()
    */
   @Nullable
+  @Deprecated
   <T> T findOne(Query<T> query, Transaction transaction);
 
   /**
+   * Deprecated - Moved to the ExtendedServer API, please use via extended().
    * Similar to findOne() but returns an Optional (rather than nullable).
    */
   @Nonnull
+  @Deprecated
   <T> Optional<T> findOneOrEmpty(Query<T> query, Transaction transaction);
 
   /**
+   * Deprecated - Moved to the ExtendedServer API, please use via extended().
    * Execute as a delete query deleting the 'root level' beans that match the predicates
    * in the query.
    * <p>
@@ -1144,9 +1191,11 @@ public interface EbeanServer {
    * @param <T>         the type of entity bean to fetch.
    * @return the number of beans/rows that were deleted
    */
+  @Deprecated
   <T> int delete(Query<T> query, Transaction transaction);
 
   /**
+   * Deprecated - Moved to the ExtendedServer API, please use via extended().
    * Execute the update query returning the number of rows updated.
    * <p>
    * The update query must be created using {@link #update(Class)}.
@@ -1157,9 +1206,11 @@ public interface EbeanServer {
    * @param <T>         the type of entity bean
    * @return The number of rows updated
    */
+  @Deprecated
   <T> int update(Query<T> query, Transaction transaction);
 
   /**
+   * Deprecated - Moved to the ExtendedServer API, please use via extended().
    * Execute the sql query returning a list of MapBean.
    * <p>
    * Generally you are able to use {@link SqlQuery#findList()} rather than
@@ -1173,17 +1224,21 @@ public interface EbeanServer {
    * @see SqlQuery#findList()
    */
   @Nonnull
+  @Deprecated
   List<SqlRow> findList(SqlQuery query, Transaction transaction);
 
   /**
+   * Deprecated - Moved to the ExtendedServer API, please use via extended().
    * Execute the SqlQuery iterating a row at a time.
    * <p>
    * This streaming type query is useful for large query execution as only 1 row needs to be held in memory.
    * </p>
    */
+  @Deprecated
   void findEach(SqlQuery query, Consumer<SqlRow> consumer, Transaction transaction);
 
   /**
+   * Deprecated - Moved to the ExtendedServer API, please use via extended().
    * Execute the SqlQuery iterating a row at a time with the ability to stop consuming part way through.
    * <p>
    * Returning false after processing a row stops the iteration through the query results.
@@ -1192,9 +1247,11 @@ public interface EbeanServer {
    * This streaming type query is useful for large query execution as only 1 row needs to be held in memory.
    * </p>
    */
+  @Deprecated
   void findEachWhile(SqlQuery query, Predicate<SqlRow> consumer, Transaction transaction);
 
   /**
+   * Deprecated - Moved to the ExtendedServer API, please use via extended().
    * Execute the sql query returning a single MapBean or null.
    * <p>
    * This will throw a PersistenceException if the query found more than one
@@ -1212,6 +1269,7 @@ public interface EbeanServer {
    * @see SqlQuery#findOne()
    */
   @Nullable
+  @Deprecated
   SqlRow findOne(SqlQuery query, Transaction transaction);
 
   /**
diff --git a/src/main/java/io/ebean/ExtendedServer.java b/src/main/java/io/ebean/ExtendedServer.java
new file mode 100644
index 000000000..1d3d6264f
--- /dev/null
+++ b/src/main/java/io/ebean/ExtendedServer.java
@@ -0,0 +1,438 @@
+package io.ebean;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.persistence.NonUniqueResultException;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+/**
+ * The extended API for EbeanServer.
+ * <p>
+ * This provides the finder methods that take an explicit transaction rather than obtaining
+ * the transaction from the usual mechanism (which is ThreadLocal based).
+ * </p>
+ * <p>
+ * In general we only want to use this ExtendedServer API when we want to avoid / bypass
+ * the use of the mechanism to get the current transaction and instead explicitly supply
+ * the transaction to use.
+ * </p>
+ * <p>
+ * Note that in all cases the transaction supplied can be null and in this case the EbeanServer
+ * will use the normal mechanism to obtain the transaction to use.
+ * </p>
+ */
+public interface ExtendedServer {
+
+  /**
+   * Return the number of 'top level' or 'root' entities this query should return.
+   *
+   * @see Query#findCount()
+   * @see Query#findFutureCount()
+   */
+  <T> int findCount(Query<T> query, Transaction transaction);
+
+  /**
+   * Return the Id values of the query as a List.
+   *
+   * @see Query#findIds()
+   */
+  @Nonnull
+  <A, T> List<A> findIds(Query<T> query, Transaction transaction);
+
+  /**
+   * Return a QueryIterator for the query.
+   * <p>
+   * Generally using {@link #findEach(Query, Consumer, Transaction)} or
+   * {@link #findEachWhile(Query, Predicate, Transaction)} is preferred
+   * to findIterate(). The reason is that those methods automatically take care of
+   * closing the queryIterator (and the underlying jdbc statement and resultSet).
+   * </p>
+   * <p>
+   * This is similar to findEach in that not all the result beans need to be held
+   * in memory at the same time and as such is good for processing large queries.
+   * </p>
+   *
+   * @see Query#findIterate()
+   * @see Query#findEach(Consumer)
+   * @see Query#findEachWhile(Predicate)
+   */
+  @Nonnull
+  <T> QueryIterator<T> findIterate(Query<T> query, Transaction transaction);
+
+  /**
+   * Execute the query visiting the each bean one at a time.
+   * <p>
+   * Unlike findList() this is suitable for processing a query that will return
+   * a very large resultSet. The reason is that not all the result beans need to be
+   * held in memory at the same time and instead processed one at a time.
+   * </p>
+   * <p>
+   * Internally this query using a PersistenceContext scoped to each bean (and the
+   * beans associated object graph).
+   * </p>
+   * <p>
+   * <pre>{@code
+   *
+   *     ebeanServer.find(Order.class)
+   *       .where().eq("status", Order.Status.NEW)
+   *       .order().asc("id")
+   *       .findEach((Order order) -> {
+   *
+   *         // do something with the order bean
+   *         System.out.println(" -- processing order ... " + order);
+   *       });
+   *
+   * }</pre>
+   *
+   * @see Query#findEach(Consumer)
+   * @see Query#findEachWhile(Predicate)
+   */
+  <T> void findEach(Query<T> query, Consumer<T> consumer, Transaction transaction);
+
+  /**
+   * Execute the query visiting the each bean one at a time.
+   * <p>
+   * Compared to findEach() this provides the ability to stop processing the query
+   * results early by returning false for the Predicate.
+   * </p>
+   * <p>
+   * Unlike findList() this is suitable for processing a query that will return
+   * a very large resultSet. The reason is that not all the result beans need to be
+   * held in memory at the same time and instead processed one at a time.
+   * </p>
+   * <p>
+   * Internally this query using a PersistenceContext scoped to each bean (and the
+   * beans associated object graph).
+   * </p>
+   * <p>
+   * <pre>{@code
+   *
+   *     ebeanServer.find(Order.class)
+   *       .where().eq("status", Order.Status.NEW)
+   *       .order().asc("id")
+   *       .findEachWhile((Order order) -> {
+   *
+   *         // do something with the order bean
+   *         System.out.println(" -- processing order ... " + order);
+   *
+   *         boolean carryOnProcessing = ...
+   *         return carryOnProcessing;
+   *       });
+   *
+   * }</pre>
+   *
+   * @see Query#findEach(Consumer)
+   * @see Query#findEachWhile(Predicate)
+   */
+  <T> void findEachWhile(Query<T> query, Predicate<T> consumer, Transaction transaction);
+
+  /**
+   * Return versions of a @History entity bean.
+   * <p>
+   * Generally this query is expected to be a find by id or unique predicates query.
+   * It will execute the query against the history returning the versions of the bean.
+   * </p>
+   */
+  @Nonnull
+  <T> List<Version<T>> findVersions(Query<T> query, Transaction transaction);
+
+  /**
+   * Execute a query returning a list of beans.
+   * <p>
+   * Generally you are able to use {@link Query#findList()} rather than
+   * explicitly calling this method. You could use this method if you wish to
+   * explicitly control the transaction used for the query.
+   * </p>
+   * <p>
+   * <pre>{@code
+   *
+   * List<Customer> customers =
+   *     ebeanServer.find(Customer.class)
+   *     .where().ilike("name", "rob%")
+   *     .findList();
+   *
+   * }</pre>
+   *
+   * @param <T>         the type of entity bean to fetch.
+   * @param query       the query to execute.
+   * @param transaction the transaction to use (can be null).
+   * @return the list of fetched beans.
+   * @see Query#findList()
+   */
+  @Nonnull
+  <T> List<T> findList(Query<T> query, Transaction transaction);
+
+  /**
+   * Execute find row count query in a background thread.
+   * <p>
+   * This returns a Future object which can be used to cancel, check the
+   * execution status (isDone etc) and get the value (with or without a
+   * timeout).
+   * </p>
+   *
+   * @param query       the query to execute the row count on
+   * @param transaction the transaction (can be null).
+   * @return a Future object for the row count query
+   * @see Query#findFutureCount()
+   */
+  @Nonnull
+  <T> FutureRowCount<T> findFutureCount(Query<T> query, Transaction transaction);
+
+  /**
+   * Execute find Id's query in a background thread.
+   * <p>
+   * This returns a Future object which can be used to cancel, check the
+   * execution status (isDone etc) and get the value (with or without a
+   * timeout).
+   * </p>
+   *
+   * @param query       the query to execute the fetch Id's on
+   * @param transaction the transaction (can be null).
+   * @return a Future object for the list of Id's
+   * @see Query#findFutureIds()
+   */
+  @Nonnull
+  <T> FutureIds<T> findFutureIds(Query<T> query, Transaction transaction);
+
+  /**
+   * Execute find list query in a background thread returning a FutureList object.
+   * <p>
+   * This returns a Future object which can be used to cancel, check the
+   * execution status (isDone etc) and get the value (with or without a timeout).
+   * <p>
+   * This query will execute in it's own PersistenceContext and using its own transaction.
+   * What that means is that it will not share any bean instances with other queries.
+   *
+   * @param query       the query to execute in the background
+   * @param transaction the transaction (can be null).
+   * @return a Future object for the list result of the query
+   * @see Query#findFutureList()
+   */
+  @Nonnull
+  <T> FutureList<T> findFutureList(Query<T> query, Transaction transaction);
+
+  /**
+   * Return a PagedList for this query using firstRow and maxRows.
+   * <p>
+   * The benefit of using this over findList() is that it provides functionality to get the
+   * total row count etc.
+   * </p>
+   * <p>
+   * If maxRows is not set on the query prior to calling findPagedList() then a
+   * PersistenceException is thrown.
+   * </p>
+   * <p>
+   * <pre>{@code
+   *
+   *  PagedList<Order> pagedList = Ebean.find(Order.class)
+   *       .setFirstRow(50)
+   *       .setMaxRows(20)
+   *       .findPagedList();
+   *
+   *       // fetch the total row count in the background
+   *       pagedList.loadRowCount();
+   *
+   *       List<Order> orders = pagedList.getList();
+   *       int totalRowCount = pagedList.getTotalRowCount();
+   *
+   * }</pre>
+   *
+   * @return The PagedList
+   * @see Query#findPagedList()
+   */
+  @Nonnull
+  <T> PagedList<T> findPagedList(Query<T> query, Transaction transaction);
+
+  /**
+   * Execute the query returning a set of entity beans.
+   * <p>
+   * Generally you are able to use {@link Query#findSet()} rather than
+   * explicitly calling this method. You could use this method if you wish to
+   * explicitly control the transaction used for the query.
+   * </p>
+   * <p>
+   * <pre>{@code
+   *
+   * Set<Customer> customers =
+   *     ebeanServer.find(Customer.class)
+   *     .where().ilike("name", "rob%")
+   *     .findSet();
+   *
+   * }</pre>
+   *
+   * @param <T>         the type of entity bean to fetch.
+   * @param query       the query to execute
+   * @param transaction the transaction to use (can be null).
+   * @return the set of fetched beans.
+   * @see Query#findSet()
+   */
+  @Nonnull
+  <T> Set<T> findSet(Query<T> query, Transaction transaction);
+
+  /**
+   * Execute the query returning the entity beans in a Map.
+   * <p>
+   * Generally you are able to use {@link Query#findMap()} rather than
+   * explicitly calling this method. You could use this method if you wish to
+   * explicitly control the transaction used for the query.
+   * </p>
+   *
+   * @param <T>         the type of entity bean to fetch.
+   * @param query       the query to execute.
+   * @param transaction the transaction to use (can be null).
+   * @return the map of fetched beans.
+   * @see Query#findMap()
+   */
+  @Nonnull
+  <K, T> Map<K, T> findMap(Query<T> query, Transaction transaction);
+
+  /**
+   * Execute the query returning a list of values for a single property.
+   * <p>
+   * <h3>Example 1:</h3>
+   * <pre>{@code
+   *
+   *  List<String> names =
+   *    Ebean.find(Customer.class)
+   *      .select("name")
+   *      .orderBy().asc("name")
+   *      .findSingleAttributeList();
+   *
+   * }</pre>
+   * <h3>Example 2:</h3>
+   * <pre>{@code
+   *
+   *  List<String> names =
+   *    Ebean.find(Customer.class)
+   *      .setDistinct(true)
+   *      .select("name")
+   *      .where().eq("status", Customer.Status.NEW)
+   *      .orderBy().asc("name")
+   *      .setMaxRows(100)
+   *      .findSingleAttributeList();
+   *
+   * }</pre>
+   *
+   * @return the list of values for the selected property
+   * @see Query#findSingleAttributeList()
+   */
+  @Nonnull
+  <A, T> List<A> findSingleAttributeList(Query<T> query, Transaction transaction);
+
+  /**
+   * Execute the query returning at most one entity bean or null (if no matching
+   * bean is found).
+   * <p>
+   * This will throw a NonUniqueResultException if the query finds more than one result.
+   * </p>
+   * <p>
+   * Generally you are able to use {@link Query#findOne()} rather than
+   * explicitly calling this method. You could use this method if you wish to
+   * explicitly control the transaction used for the query.
+   * </p>
+   *
+   * @param <T>         the type of entity bean to fetch.
+   * @param query       the query to execute.
+   * @param transaction the transaction to use (can be null).
+   * @return the list of fetched beans.
+   * @throws NonUniqueResultException if more than one result was found
+   * @see Query#findOne()
+   */
+  @Nullable
+  <T> T findOne(Query<T> query, Transaction transaction);
+
+  /**
+   * Similar to findOne() but returns an Optional (rather than nullable).
+   */
+  @Nonnull
+  <T> Optional<T> findOneOrEmpty(Query<T> query, Transaction transaction);
+
+  /**
+   * Execute as a delete query deleting the 'root level' beans that match the predicates
+   * in the query.
+   * <p>
+   * Note that if the query includes joins then the generated delete statement may not be
+   * optimal depending on the database platform.
+   * </p>
+   *
+   * @param query       the query used for the delete
+   * @param transaction the transaction to use (can be null)
+   * @param <T>         the type of entity bean to fetch.
+   * @return the number of beans/rows that were deleted
+   */
+  <T> int delete(Query<T> query, Transaction transaction);
+
+  /**
+   * Execute the update query returning the number of rows updated.
+   * <p>
+   * The update query must be created using {@link #update(Class)}.
+   * </p>
+   *
+   * @param query       the update query to execute
+   * @param transaction the optional transaction to use for the update (can be null)
+   * @param <T>         the type of entity bean
+   * @return The number of rows updated
+   */
+  <T> int update(Query<T> query, Transaction transaction);
+
+  /**
+   * Execute the sql query returning a list of MapBean.
+   * <p>
+   * Generally you are able to use {@link SqlQuery#findList()} rather than
+   * explicitly calling this method. You could use this method if you wish to
+   * explicitly control the transaction used for the query.
+   * </p>
+   *
+   * @param query       the query to execute.
+   * @param transaction the transaction to use (can be null).
+   * @return the list of fetched MapBean.
+   * @see SqlQuery#findList()
+   */
+  @Nonnull
+  List<SqlRow> findList(SqlQuery query, Transaction transaction);
+
+  /**
+   * Execute the SqlQuery iterating a row at a time.
+   * <p>
+   * This streaming type query is useful for large query execution as only 1 row needs to be held in memory.
+   * </p>
+   */
+  void findEach(SqlQuery query, Consumer<SqlRow> consumer, Transaction transaction);
+
+  /**
+   * Execute the SqlQuery iterating a row at a time with the ability to stop consuming part way through.
+   * <p>
+   * Returning false after processing a row stops the iteration through the query results.
+   * </p>
+   * <p>
+   * This streaming type query is useful for large query execution as only 1 row needs to be held in memory.
+   * </p>
+   */
+  void findEachWhile(SqlQuery query, Predicate<SqlRow> consumer, Transaction transaction);
+
+  /**
+   * Execute the sql query returning a single MapBean or null.
+   * <p>
+   * This will throw a PersistenceException if the query found more than one
+   * result.
+   * </p>
+   * <p>
+   * Generally you are able to use {@link SqlQuery#findOne()} rather than
+   * explicitly calling this method. You could use this method if you wish to
+   * explicitly control the transaction used for the query.
+   * </p>
+   *
+   * @param query       the query to execute.
+   * @param transaction the transaction to use (can be null).
+   * @return the fetched MapBean or null if none was found.
+   * @see SqlQuery#findOne()
+   */
+  @Nullable
+  SqlRow findOne(SqlQuery query, Transaction transaction);
+
+}
diff --git a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
index af0154a8e..1971b4b24 100644
--- a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
+++ b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.api;
 
 import io.ebean.DtoQuery;
 import io.ebean.EbeanServer;
+import io.ebean.ExtendedServer;
 import io.ebean.PersistenceContextScope;
 import io.ebean.Query;
 import io.ebean.RowConsumer;
@@ -31,7 +32,7 @@ import java.util.function.Predicate;
 /**
  * Service Provider extension to EbeanServer.
  */
-public interface SpiEbeanServer extends EbeanServer, BeanLoader, BeanCollectionLoader {
+public interface SpiEbeanServer extends ExtendedServer, EbeanServer, BeanLoader, BeanCollectionLoader {
 
   /**
    * Return the log manager.
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 3032a343d..307cc3d44 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -8,6 +8,7 @@ import io.ebean.DocumentStore;
 import io.ebean.DtoQuery;
 import io.ebean.ExpressionFactory;
 import io.ebean.ExpressionList;
+import io.ebean.ExtendedServer;
 import io.ebean.Filter;
 import io.ebean.FutureIds;
 import io.ebean.FutureList;
@@ -501,6 +502,11 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return serverName;
   }
 
+  @Override
+  public ExtendedServer extended() {
+    return this;
+  }
+
   @Override
   public BeanState getBeanState(Object bean) {
     if (bean instanceof EntityBean) {
diff --git a/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java b/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java
index 4b4f34c09..b4496a56e 100644
--- a/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java
+++ b/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java
@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.query;
 
-import io.ebean.EbeanServer;
 import io.ebean.PagedList;
 import io.ebeaninternal.api.Monitor;
+import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiQuery;
 
 import javax.persistence.PersistenceException;
@@ -16,7 +16,7 @@ import java.util.concurrent.Future;
  */
 public class LimitOffsetPagedList<T> implements PagedList<T> {
 
-  private final transient EbeanServer server;
+  private final transient SpiEbeanServer server;
 
   private final SpiQuery<T> query;
 
@@ -35,7 +35,7 @@ public class LimitOffsetPagedList<T> implements PagedList<T> {
   /**
    * Construct with firstRow/maxRows.
    */
-  public LimitOffsetPagedList(EbeanServer server, SpiQuery<T> query) {
+  public LimitOffsetPagedList(SpiEbeanServer server, SpiQuery<T> query) {
     this.server = server;
     this.query = query;
     this.maxRows = query.getMaxRows();
diff --git a/src/test/java/io/ebean/ExtendedServerTest.java b/src/test/java/io/ebean/ExtendedServerTest.java
new file mode 100644
index 000000000..aef467e69
--- /dev/null
+++ b/src/test/java/io/ebean/ExtendedServerTest.java
@@ -0,0 +1,41 @@
+package io.ebean;
+
+import org.junit.Test;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ExtendedServerTest extends BaseTestCase {
+
+  @Test
+  public void findList() {
+
+    ResetBasicData.reset();
+
+    EbeanServer server = Ebean.getDefaultServer();
+
+    Query<Customer> query = server.find(Customer.class)
+      .where().startsWith("name", "Rob")
+      .query();
+
+    // rather than use .findList() return the query
+    // when we use findList() .. it obtains a transaction using
+    // the normal mechanism
+
+    // obtain a transaction somehow ...
+    // for this test/example we just begin one
+    try (Transaction transaction = server.beginTransaction()) {
+
+      // obtain extended API ... such that we can execute the
+      // query using an explicit transaction
+      List<Customer> customers = server.extended().findList(query, transaction);
+
+      assertThat(customers).isNotEmpty();
+      transaction.commit();
+    }
+  }
+
+}
diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index 64bff0d26..c83e84eb8 100644
--- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -7,6 +7,7 @@ import io.ebean.CallableSql;
 import io.ebean.DocumentStore;
 import io.ebean.DtoQuery;
 import io.ebean.ExpressionFactory;
+import io.ebean.ExtendedServer;
 import io.ebean.Filter;
 import io.ebean.FutureIds;
 import io.ebean.FutureList;
@@ -79,6 +80,11 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
     this.name = name;
   }
 
+  @Override
+  public ExtendedServer extended() {
+    return this;
+  }
+
   @Override
   public SpiLogManager log() {
     return null;
diff --git a/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java b/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java
index f2f5d4a53..d7de421c7 100644
--- a/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java
+++ b/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java
@@ -1,19 +1,19 @@
 package io.ebeaninternal.server.query;
 
-import io.ebean.Ebean;
-import io.ebean.EbeanServer;
+import io.ebean.BaseTestCase;
+import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiQuery;
-import org.tests.model.basic.Order;
 import org.junit.Test;
+import org.tests.model.basic.Order;
 
 import static org.junit.Assert.assertEquals;
 
-public class LimitOffsetPagedListTest {
+public class LimitOffsetPagedListTest extends BaseTestCase {
 
-  private EbeanServer server = Ebean.getDefaultServer();
+  private SpiEbeanServer server = spiEbeanServer();
 
   @Test
-  public void getPageIndex_when_firstRowsZero() throws Exception {
+  public void getPageIndex_when_firstRowsZero() {
     assertEquals(limit(0, 10).getPageIndex(), 0);
   }
 
@@ -28,12 +28,12 @@ public class LimitOffsetPagedListTest {
   }
 
   @Test
-  public void getPageIndex_when_1_10() throws Exception {
+  public void getPageIndex_when_1_10() {
     assertEquals(limit(1, 10).getPageIndex(), 1);
   }
 
   @Test
-  public void getPageIndex_when_9_10() throws Exception {
+  public void getPageIndex_when_9_10() {
     assertEquals(limit(1, 10).getPageIndex(), 1);
   }
 

From 81c6d4601dd06f9bf0d3d010079daacb367df269 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 14 Jun 2018 16:09:45 +1200
Subject: [PATCH 0326/1036] #1425 - Stateless update with OneToMany with
 SoftDelete and deleteMissingChildren = true ... does a hard delete

---
 .../api/TxnProfileEventCodes.java             |  2 +-
 .../server/core/PersistRequest.java           |  2 +-
 .../server/core/PersistRequestBean.java       | 25 +++---
 .../server/deploy/BeanDescriptor.java         | 17 ++--
 .../server/deploy/IntersectionRow.java        |  9 +-
 .../server/persist/BatchedBeanHolder.java     |  2 +-
 .../server/persist/DefaultPersister.java      | 87 +++++++++----------
 .../server/persist/DeleteMode.java            | 38 ++++++++
 .../server/persist/SaveManyBeans.java         |  8 +-
 .../server/transaction/BeanPersistIds.java    |  2 +-
 .../org/tests/model/softdelete/EsdDetail.java | 33 +++++++
 .../org/tests/model/softdelete/EsdMaster.java | 35 ++++++++
 .../TestSoftDeleteStatelessUpdate.java        | 74 ++++++++++++++++
 13 files changed, 259 insertions(+), 75 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/persist/DeleteMode.java
 create mode 100644 src/test/java/org/tests/model/softdelete/EsdDetail.java
 create mode 100644 src/test/java/org/tests/model/softdelete/EsdMaster.java
 create mode 100644 src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java

diff --git a/src/main/java/io/ebeaninternal/api/TxnProfileEventCodes.java b/src/main/java/io/ebeaninternal/api/TxnProfileEventCodes.java
index 0c17ad833..231d38296 100644
--- a/src/main/java/io/ebeaninternal/api/TxnProfileEventCodes.java
+++ b/src/main/java/io/ebeaninternal/api/TxnProfileEventCodes.java
@@ -13,7 +13,7 @@ public interface TxnProfileEventCodes {
   String EVT_INSERT = "i";
   String EVT_UPDATE = "u";
   String EVT_DELETE = "d";
-  String EVT_SOFT_DELETE = "ds";
+  String EVT_DELETE_SOFT = "ds";
   String EVT_DELETE_PERMANENT = "dp";
   String EVT_ORMUPDATE = "uo";
   String FIND_UPDATE = "uq";
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequest.java b/src/main/java/io/ebeaninternal/server/core/PersistRequest.java
index 46e7aa605..a031ae2fb 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequest.java
@@ -17,7 +17,7 @@ public abstract class PersistRequest extends BeanRequest implements BatchPostExe
     INSERT(EVT_INSERT),
     UPDATE(EVT_UPDATE),
     DELETE(EVT_DELETE),
-    SOFT_DELETE(EVT_SOFT_DELETE),
+    DELETE_SOFT(EVT_DELETE_SOFT),
     DELETE_PERMANENT(EVT_DELETE_PERMANENT),
     UPDATESQL(EVT_UPDATESQL),
     CALLABLESQL(EVT_CALLABLESQL);
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index 07618f6b9..20c6e04b7 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -23,6 +23,7 @@ import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty;
 import io.ebeaninternal.server.deploy.id.ImportedId;
 import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeaninternal.server.persist.BatchedSqlException;
+import io.ebeaninternal.server.persist.DeleteMode;
 import io.ebeaninternal.server.persist.Flags;
 import io.ebeaninternal.server.persist.PersistExecute;
 import io.ebeaninternal.server.transaction.BeanPersistIdMap;
@@ -271,7 +272,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
           onUpdateGeneratedProperties();
         }
         break;
-      case SOFT_DELETE:
+      case DELETE_SOFT:
         onUpdateGeneratedProperties();
         break;
     }
@@ -455,7 +456,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
           beanDescriptor.cacheHandleUpdate(idValue, this, changeSet);
           break;
         case DELETE:
-        case SOFT_DELETE:
+        case DELETE_SOFT:
           beanDescriptor.cacheHandleDelete(idValue, this, changeSet);
           break;
         default:
@@ -475,7 +476,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
         beanDescriptor.docStoreInsert(idValue, this, txn);
         break;
       case UPDATE:
-      case SOFT_DELETE:
+      case DELETE_SOFT:
         beanDescriptor.docStoreUpdate(idValue, this, txn);
         break;
       case DELETE:
@@ -496,7 +497,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
         docStoreUpdates.queueIndex(beanDescriptor.getDocStoreQueueId(), idValue);
         break;
       case UPDATE:
-      case SOFT_DELETE:
+      case DELETE_SOFT:
         docStoreUpdates.queueIndex(beanDescriptor.getDocStoreQueueId(), idValue);
         break;
       case DELETE:
@@ -527,7 +528,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
           beanPersistListener.deleted(bean);
           break;
 
-        case SOFT_DELETE:
+        case DELETE_SOFT:
           beanPersistListener.softDeleted(bean);
           break;
 
@@ -772,7 +773,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
         executeUpdate();
         return -1;
 
-      case SOFT_DELETE:
+      case DELETE_SOFT:
         prepareForSoftDelete();
         executeSoftDelete();
         return -1;
@@ -855,7 +856,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
     }
     switch (type) {
       case DELETE:
-      case SOFT_DELETE:
+      case DELETE_SOFT:
         postDelete();
         break;
       case UPDATE:
@@ -968,7 +969,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
           pendingPostUpdateNotify++;
         }
         break;
-      case SOFT_DELETE:
+      case DELETE_SOFT:
         controller.postSoftDelete(this);
         break;
       case DELETE:
@@ -993,7 +994,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
       case DELETE:
         transaction.logSummary("Deleted [" + name + "] [" + idValue + "]" + draft);
         break;
-      case SOFT_DELETE:
+      case DELETE_SOFT:
         transaction.logSummary("SoftDelete [" + name + "] [" + idValue + "]" + draft);
         break;
       default:
@@ -1184,10 +1185,10 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   }
 
   /**
-   * Return true if this is a soft delete request.
+   * Return the delete mode - Soft or Hard.
    */
-  public boolean isSoftDelete() {
-    return Type.SOFT_DELETE == type;
+  public DeleteMode deleteMode() {
+    return Type.DELETE_SOFT == type ? DeleteMode.SOFT : DeleteMode.HARD;
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index ee277666b..ba0ecc52d 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -62,6 +62,7 @@ import io.ebeaninternal.server.el.ElComparatorProperty;
 import io.ebeaninternal.server.el.ElPropertyChainBuilder;
 import io.ebeaninternal.server.el.ElPropertyDeploy;
 import io.ebeaninternal.server.el.ElPropertyValue;
+import io.ebeaninternal.server.persist.DeleteMode;
 import io.ebeaninternal.server.persist.DmlUtil;
 import io.ebeaninternal.server.query.CQueryPlan;
 import io.ebeaninternal.server.query.ExtraJoin;
@@ -907,7 +908,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
       case INSERT:
         return changeLogFilter.includeInsert(request) ? insertBeanChange(request) : null;
       case UPDATE:
-      case SOFT_DELETE:
+      case DELETE_SOFT:
         return changeLogFilter.includeUpdate(request) ? updateBeanChange(request) : null;
       case DELETE:
         return changeLogFilter.includeDelete(request) ? deleteBeanChange(request) : null;
@@ -991,11 +992,11 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     jsonWriter.writeEndObject();
   }
 
-  public SqlUpdate deleteById(Object id, List<Object> idList, boolean softDelete) {
+  public SqlUpdate deleteById(Object id, List<Object> idList, DeleteMode mode) {
     if (id != null) {
-      return deleteById(id, softDelete);
+      return deleteById(id, mode);
     } else {
-      return deleteByIdList(idList, softDelete);
+      return deleteByIdList(idList, mode);
     }
   }
 
@@ -1017,9 +1018,9 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * Return SQL that can be used to delete a list of Id's without any optimistic
    * concurrency checking.
    */
-  private SqlUpdate deleteByIdList(List<Object> idList, boolean softDelete) {
+  private SqlUpdate deleteByIdList(List<Object> idList, DeleteMode mode) {
 
-    String baseSql = softDelete ? softDeleteByIdInSql : deleteByIdInSql;
+    String baseSql = mode.isHard() ? deleteByIdInSql : softDeleteByIdInSql;
     StringBuilder sb = new StringBuilder(baseSql);
     String inClause = idBinder.getIdInValueExprDelete(idList.size());
     sb.append(inClause);
@@ -1033,9 +1034,9 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * Return SQL that can be used to delete by Id without any optimistic
    * concurrency checking.
    */
-  private SqlUpdate deleteById(Object id, boolean softDelete) {
+  private SqlUpdate deleteById(Object id, DeleteMode mode) {
 
-    String baseSql = softDelete ? softDeleteByIdSql : deleteByIdSql;
+    String baseSql = mode.isHard() ? deleteByIdSql : softDeleteByIdSql;
     DefaultSqlUpdate sqlDelete = new DefaultSqlUpdate(baseSql);
 
     Object[] bindValues = idBinder.getBindValues(id);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java b/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java
index 59c13838a..305469af2 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java
@@ -6,6 +6,7 @@ import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.server.core.DefaultSqlUpdate;
 import io.ebeaninternal.server.expression.DefaultExpressionRequest;
 import io.ebeaninternal.server.expression.IdInExpression;
+import io.ebeaninternal.server.persist.DeleteMode;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -72,16 +73,16 @@ public class IntersectionRow {
     return new DefaultSqlUpdate(server, sb.toString(), bindParams);
   }
 
-  public SqlUpdate createDelete(SpiEbeanServer server, boolean softDelete) {
+  public SqlUpdate createDelete(SpiEbeanServer server, DeleteMode deleteMode) {
 
     BindParams bindParams = new BindParams();
 
     StringBuilder sb = new StringBuilder();
-    if (softDelete) {
+    if (deleteMode.isHard()) {
+      sb.append("delete from ").append(tableName);
+    } else {
       sb.append("update ").append(tableName).append(" set ");
       sb.append(targetDescriptor.getSoftDeleteDbSet());
-    } else {
-      sb.append("delete from ").append(tableName);
     }
     sb.append(" where ");
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java b/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java
index 6c974cc56..61c46ef0c 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java
@@ -142,7 +142,7 @@ public class BatchedBeanHolder {
         return inserts.size();
 
       case UPDATE:
-      case SOFT_DELETE:
+      case DELETE_SOFT:
         if (updates == null) {
           updates = new ArrayList<>();
         }
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 415738cec..a259f8b84 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -357,9 +357,8 @@ public final class DefaultPersister implements Persister {
   /**
    * Recursively delete the bean. This calls back to the EbeanServer.
    */
-  private int deleteRecurse(EntityBean detailBean, Transaction t, boolean softDelete) {
-    Type deleteType = softDelete ? Type.SOFT_DELETE : Type.DELETE_PERMANENT;
-    return deleteRequest(createRequest(detailBean, t, deleteType));
+  private int deleteRecurse(EntityBean detailBean, Transaction t, DeleteMode deleteMode) {
+    return deleteRequest(createRequest(detailBean, t, deleteMode.persistType()));
   }
 
   @Override
@@ -605,13 +604,13 @@ public final class DefaultPersister implements Persister {
     }
   }
 
-  private void deleteList(List<?> beanList, SpiTransaction t, boolean softDelete, boolean children) {
+  private void deleteList(List<?> beanList, SpiTransaction t, DeleteMode deleteMode, boolean children) {
     if (children) {
       t.depth(-1);
       t.checkBatchEscalationOnCollection();
     }
     for (Object aBeanList : beanList) {
-      deleteRecurse((EntityBean) aBeanList, t, softDelete);
+      deleteRecurse((EntityBean) aBeanList, t, deleteMode);
     }
     if (children) {
       t.flushBatchOnCollection();
@@ -630,9 +629,9 @@ public final class DefaultPersister implements Persister {
     }
 
     BeanDescriptor<?> descriptor = beanDescriptorManager.getBeanDescriptor(beanType);
-    boolean softDelete = !permanent && descriptor.isSoftDelete();
+    DeleteMode deleteMode = (permanent || !descriptor.isSoftDelete()) ? DeleteMode.HARD : DeleteMode.SOFT;
     if (descriptor.isMultiTenant()) {
-      return deleteAsBeans(ids, transaction, permanent, descriptor);
+      return deleteAsBeans(ids, transaction, deleteMode, descriptor);
     }
 
     ArrayList<Object> idList = new ArrayList<>(ids.size());
@@ -641,19 +640,19 @@ public final class DefaultPersister implements Persister {
       idList.add(descriptor.convertId(id));
     }
 
-    return delete(descriptor, null, idList, transaction, softDelete);
+    return delete(descriptor, null, idList, transaction, deleteMode);
   }
 
   /**
    * Convert delete by Ids into delete many beans.
    */
-  private int deleteAsBeans(Collection<?> ids, Transaction transaction, boolean permanent, BeanDescriptor<?> descriptor) {
+  private int deleteAsBeans(Collection<?> ids, Transaction transaction, DeleteMode deleteMode, BeanDescriptor<?> descriptor) {
     // convert to a delete by bean
     int total = 0;
     for (Object id : ids) {
       EntityBean bean = descriptor.createEntityBean();
       descriptor.convertSetId(id, bean);
-      int rowCount = deleteRecurse(bean, transaction, permanent);
+      int rowCount = deleteRecurse(bean, transaction, deleteMode);
       if (rowCount == -1) {
         total = -1;
       } else if (total != -1) {
@@ -677,14 +676,14 @@ public final class DefaultPersister implements Persister {
     }
 
     id = descriptor.convertId(id);
-    boolean softDelete = !permanent && descriptor.isSoftDelete();
-    return delete(descriptor, id, null, transaction, softDelete);
+    DeleteMode deleteMode = (permanent || !descriptor.isSoftDelete()) ? DeleteMode.HARD : DeleteMode.SOFT;
+    return delete(descriptor, id, null, transaction, deleteMode);
   }
 
   /**
    * Delete by Id or a List of Id's.
    */
-  private int delete(BeanDescriptor<?> descriptor, Object id, List<Object> idList, Transaction transaction, boolean softDelete) {
+  private int delete(BeanDescriptor<?> descriptor, Object id, List<Object> idList, Transaction transaction, DeleteMode deleteMode) {
 
     SpiTransaction t = (SpiTransaction) transaction;
     if (t.isPersistCascade()) {
@@ -693,14 +692,14 @@ public final class DefaultPersister implements Persister {
         // We actually need to execute a query to get the foreign key values
         // as they are required for the delete cascade. Query back just the
         // Id and the appropriate foreign key values
-        Query<?> q = deleteRequiresQuery(descriptor, propImportDelete, softDelete);
+        Query<?> q = deleteRequiresQuery(descriptor, propImportDelete, deleteMode);
         if (idList != null) {
           q.where().idIn(idList);
           if (t.isLogSummary()) {
             t.logSummary("-- DeleteById of " + descriptor.getName() + " ids[" + idList + "] requires fetch of foreign key values");
           }
           List<?> beanList = server.findList(q, t);
-          deleteList(beanList, t, softDelete, false);
+          deleteList(beanList, t, deleteMode, false);
           return beanList.size();
 
         } else {
@@ -712,7 +711,7 @@ public final class DefaultPersister implements Persister {
           if (bean == null) {
             return 0;
           } else {
-            return deleteRecurse(bean, t, softDelete);
+            return deleteRecurse(bean, t, deleteMode);
           }
         }
       }
@@ -724,14 +723,14 @@ public final class DefaultPersister implements Persister {
       for (BeanPropertyAssocOne<?> expOne : expOnes) {
         BeanDescriptor<?> targetDesc = expOne.getTargetDescriptor();
         // only cascade soft deletes when supported by target
-        if (!softDelete || targetDesc.isSoftDelete()) {
-          if (!softDelete && targetDesc.isDeleteByStatement()) {
+        if (deleteMode.isHard() || targetDesc.isSoftDelete()) {
+          if (deleteMode.isHard() && targetDesc.isDeleteByStatement()) {
             SqlUpdate sqlDelete = expOne.deleteByParentId(id, idList);
             executeSqlUpdate(sqlDelete, t);
           } else {
             List<Object> childIds = expOne.findIdsByParentId(id, idList, t);
             if (childIds != null && !childIds.isEmpty()) {
-              deleteChildrenById(t, targetDesc, childIds, softDelete);
+              deleteChildrenById(t, targetDesc, childIds, deleteMode);
             }
           }
         }
@@ -742,8 +741,8 @@ public final class DefaultPersister implements Persister {
       for (BeanPropertyAssocMany<?> many : manys) {
         BeanDescriptor<?> targetDesc = many.getTargetDescriptor();
         // only cascade soft deletes when supported by target
-        if (!softDelete || targetDesc.isSoftDelete()) {
-          if (!softDelete && targetDesc.isDeleteByStatement()) {
+        if (deleteMode.isHard() || targetDesc.isSoftDelete()) {
+          if (deleteMode.isHard() && targetDesc.isDeleteByStatement()) {
             // we can just delete children with a single statement
             SqlUpdate sqlDelete = many.deleteByParentId(id, idList);
             executeSqlUpdate(sqlDelete, t);
@@ -751,14 +750,14 @@ public final class DefaultPersister implements Persister {
             // we need to fetch the Id's to delete (recurse or notify L2 cache)
             List<Object> childIds = many.findIdsByParentId(id, idList, t, null);
             if (!childIds.isEmpty()) {
-              delete(targetDesc, null, childIds, t, softDelete);
+              delete(targetDesc, null, childIds, t, deleteMode);
             }
           }
         }
       }
     }
 
-    if (!softDelete) {
+    if (deleteMode.isHard()) {
       // ManyToMany's ... delete from intersection table
       BeanPropertyAssocMany<?>[] manys = descriptor.propertiesManyToMany();
       for (BeanPropertyAssocMany<?> many : manys) {
@@ -771,7 +770,7 @@ public final class DefaultPersister implements Persister {
     }
 
     // delete the bean(s)
-    SqlUpdate deleteById = descriptor.deleteById(id, idList, softDelete);
+    SqlUpdate deleteById = descriptor.deleteById(id, idList, deleteMode);
     if (t.isLogSummary()) {
       if (idList != null) {
         t.logSummary("-- Deleting " + descriptor.getName() + " Ids: " + idList);
@@ -822,7 +821,7 @@ public final class DefaultPersister implements Persister {
    * We need to create and execute a query to get the foreign key values as
    * the delete cascades to them (foreign keys).
    */
-  private Query<?> deleteRequiresQuery(BeanDescriptor<?> desc, BeanPropertyAssocOne<?>[] propImportDelete, boolean softDelete) {
+  private Query<?> deleteRequiresQuery(BeanDescriptor<?> desc, BeanPropertyAssocOne<?>[] propImportDelete, DeleteMode deleteMode) {
 
     Query<?> q = server.createQuery(desc.getBeanType());
     StringBuilder sb = new StringBuilder(30);
@@ -831,7 +830,7 @@ public final class DefaultPersister implements Persister {
     }
     q.setAutoTune(false);
     q.select(sb.toString());
-    if (!softDelete) {
+    if (deleteMode.isHard() && desc.isSoftDelete()) {
       // hard delete so we want this query to include logically deleted rows (if any)
       q.setIncludeSoftDeletes();
     }
@@ -956,7 +955,7 @@ public final class DefaultPersister implements Persister {
 
     BeanDescriptor<?> desc = request.getBeanDescriptor();
     EntityBean parentBean = request.getEntityBean();
-    boolean softDelete = request.isSoftDelete();
+    DeleteMode deleteMode = request.deleteMode();
 
     BeanPropertyAssocOne<?>[] expOnes = desc.propertiesOneExportedDelete();
     if (expOnes.length > 0) {
@@ -964,11 +963,11 @@ public final class DefaultPersister implements Persister {
       DeleteUnloadedForeignKeys unloaded = null;
       for (BeanPropertyAssocOne<?> prop : expOnes) {
         // for soft delete check cascade type also supports soft delete
-        if (!softDelete || prop.isTargetSoftDelete()) {
+        if (deleteMode.isHard() || prop.isTargetSoftDelete()) {
           if (request.isLoadedProperty(prop)) {
             Object detailBean = prop.getValue(parentBean);
             if (detailBean != null) {
-              deleteRecurse((EntityBean) detailBean, t, softDelete);
+              deleteRecurse((EntityBean) detailBean, t, deleteMode);
             }
           } else {
             if (unloaded == null) {
@@ -987,7 +986,7 @@ public final class DefaultPersister implements Persister {
     // Many's with delete cascade
     for (BeanPropertyAssocMany<?> many : desc.propertiesManyDelete()) {
       if (many.hasJoinTable()) {
-        if (!softDelete) {
+        if (deleteMode.isHard()) {
           // delete associated rows from intersection table (but not during soft delete)
           deleteAssocManyIntersection(parentBean, many, t, request.isPublish());
         }
@@ -996,7 +995,7 @@ public final class DefaultPersister implements Persister {
         if (ModifyListenMode.REMOVALS == many.getModifyListenMode()) {
           // PrivateOwned ...
           // if soft delete then check target also supports soft delete
-          if (!softDelete || many.isTargetSoftDelete()) {
+          if (deleteMode.isHard() || many.isTargetSoftDelete()) {
             Object details = many.getValue(parentBean);
             if (details instanceof BeanCollection<?>) {
               Set<?> modifyRemovals = ((BeanCollection<?>) details).getModifyRemovals();
@@ -1006,7 +1005,7 @@ public final class DefaultPersister implements Persister {
                 for (Object detail : modifyRemovals) {
                   EntityBean detailBean = (EntityBean) detail;
                   if (many.hasId(detailBean)) {
-                    deleteRecurse(detailBean, t, softDelete);
+                    deleteRecurse(detailBean, t, deleteMode);
                   }
                 }
               }
@@ -1014,7 +1013,7 @@ public final class DefaultPersister implements Persister {
           }
         }
 
-        deleteManyDetails(t, desc, parentBean, many, null, softDelete);
+        deleteManyDetails(t, desc, parentBean, many, null, deleteMode);
       }
     }
 
@@ -1031,16 +1030,16 @@ public final class DefaultPersister implements Persister {
    * </p>
    */
   void deleteManyDetails(SpiTransaction t, BeanDescriptor<?> desc, EntityBean parentBean,
-                         BeanPropertyAssocMany<?> many, List<Object> excludeDetailIds, boolean softDelete) {
+                         BeanPropertyAssocMany<?> many, List<Object> excludeDetailIds, DeleteMode deleteMode) {
 
     if (many.getCascadeInfo().isDelete()) {
       // cascade delete the beans in the collection
       BeanDescriptor<?> targetDesc = many.getTargetDescriptor();
-      if (!softDelete || targetDesc.isSoftDelete()) {
+      if (deleteMode.isHard() || targetDesc.isSoftDelete()) {
         if (targetDesc.isDeleteByStatement()) {
           // Just delete all the children with one statement
           IntersectionRow intRow = many.buildManyDeleteChildren(parentBean, excludeDetailIds);
-          SqlUpdate sqlDelete = intRow.createDelete(server, softDelete);
+          SqlUpdate sqlDelete = intRow.createDelete(server, deleteMode);
           executeSqlUpdate(sqlDelete, t);
 
         } else {
@@ -1048,7 +1047,7 @@ public final class DefaultPersister implements Persister {
           Object parentId = desc.getId(parentBean);
           List<Object> idsByParentId = many.findIdsByParentId(parentId, null, t, excludeDetailIds);
           if (!idsByParentId.isEmpty()) {
-            deleteChildrenById(t, targetDesc, idsByParentId, softDelete);
+            deleteChildrenById(t, targetDesc, idsByParentId, deleteMode);
           }
         }
       }
@@ -1060,7 +1059,7 @@ public final class DefaultPersister implements Persister {
    * <p>
    * Will use delete by object if the child entity has manyToMany relationships.
    */
-  private void deleteChildrenById(SpiTransaction t, BeanDescriptor<?> targetDesc, List<Object> childIds, boolean softDelete) {
+  private void deleteChildrenById(SpiTransaction t, BeanDescriptor<?> targetDesc, List<Object> childIds, DeleteMode deleteMode) {
 
     if (!targetDesc.isDeleteByBulk()) {
       // convert into a list of reference objects and perform delete by object
@@ -1068,11 +1067,11 @@ public final class DefaultPersister implements Persister {
       for (Object id : childIds) {
         refList.add(targetDesc.createReference(id, null));
       }
-      deleteList(refList, t, softDelete, true);
+      deleteList(refList, t, deleteMode, true);
 
     } else {
       // perform delete by statement if possible
-      delete(targetDesc, null, childIds, t, softDelete);
+      delete(targetDesc, null, childIds, t, deleteMode);
     }
   }
 
@@ -1137,16 +1136,16 @@ public final class DefaultPersister implements Persister {
    */
   private void deleteAssocOne(PersistRequestBean<?> request) {
 
-    boolean softDelete = request.isSoftDelete();
+    DeleteMode deleteMode = request.deleteMode();
 
     for (BeanPropertyAssocOne<?> prop : request.getBeanDescriptor().propertiesOneImportedDelete()) {
-      if (!softDelete || prop.isTargetSoftDelete()) {
+      if (deleteMode.isHard() || prop.isTargetSoftDelete()) {
         if (request.isLoadedProperty(prop)) {
           Object detailBean = prop.getValue(request.getEntityBean());
           if (detailBean != null) {
             EntityBean detail = (EntityBean) detailBean;
             if (prop.hasId(detail)) {
-              deleteRecurse(detail, request.getTransaction(), request.isSoftDelete());
+              deleteRecurse(detail, request.getTransaction(), deleteMode);
             }
           }
         }
@@ -1245,7 +1244,7 @@ public final class DefaultPersister implements Persister {
       type = Type.DELETE;
     } else if (type == Type.DELETE && mgr.getBeanDescriptor().isSoftDelete()) {
       // automatically convert to soft delete for types that support it
-      type = Type.SOFT_DELETE;
+      type = Type.DELETE_SOFT;
     }
 
     return new PersistRequestBean(server, bean, parentBean, mgr, (SpiTransaction) t, persistExecute, type, flags);
diff --git a/src/main/java/io/ebeaninternal/server/persist/DeleteMode.java b/src/main/java/io/ebeaninternal/server/persist/DeleteMode.java
new file mode 100644
index 000000000..9961a8bfc
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/persist/DeleteMode.java
@@ -0,0 +1,38 @@
+package io.ebeaninternal.server.persist;
+
+import io.ebeaninternal.server.core.PersistRequest;
+
+/**
+ * The delete mode of the persistence request. The mode is determined at the beginning of the request
+ * as being a Hard or Soft delete based and then the mode is used for that request and any cascading.
+ */
+public enum DeleteMode {
+
+  /**
+   * Soft/logical delete.
+   */
+  SOFT(PersistRequest.Type.DELETE_SOFT, false),
+
+  /**
+   * Hard/permanent delete.
+   */
+  HARD(PersistRequest.Type.DELETE_PERMANENT, true);
+
+  private boolean hard;
+
+  private PersistRequest.Type persistType;
+
+  DeleteMode(PersistRequest.Type persistType, boolean hard) {
+    this.persistType = persistType;
+    this.hard = hard;
+  }
+
+  public PersistRequest.Type persistType() {
+    return persistType;
+  }
+
+  public boolean isHard() {
+    return hard;
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
index 063862967..52d75b4fd 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
@@ -33,6 +33,7 @@ class SaveManyBeans extends SaveManyBase {
   private final BeanDescriptor<?> targetDescriptor;
   private final boolean isMap;
   private final boolean saveRecurseSkippable;
+  private final DeleteMode deleteMode;
 
   private Collection<?> collection;
   private DefaultPersister persister;
@@ -47,6 +48,7 @@ class SaveManyBeans extends SaveManyBase {
     this.targetDescriptor = many.getTargetDescriptor();
     this.isMap = many.getManyType().isMap();
     this.saveRecurseSkippable = many.isSaveRecurseSkippable();
+    this.deleteMode = targetDescriptor.isSoftDelete() ? DeleteMode.SOFT : DeleteMode.HARD;
   }
 
   @Override
@@ -58,7 +60,7 @@ class SaveManyBeans extends SaveManyBase {
       // we only allow one direction based on first traversed basis
       boolean saveIntersectionFromThisDirection = isSaveIntersection();
       if (cascade) {
-        saveAssocManyDetails( false);
+        saveAssocManyDetails(false);
       }
       // for ManyToMany save the 'relationship' via inserts/deletes
       // into/from the intersection table
@@ -125,7 +127,7 @@ class SaveManyBeans extends SaveManyBase {
       // collect the Id's (to exclude from deleteManyDetails)
       List<Object> detailIds = collectIds(collection, targetDescriptor, isMap);
       // deleting missing children - children not in our collected detailIds
-      persister.deleteManyDetails(transaction, many.getBeanDescriptor(), parentBean, many, detailIds, false);
+      persister.deleteManyDetails(transaction, many.getBeanDescriptor(), parentBean, many, detailIds, deleteMode);
     }
 
     transaction.depth(+1);
@@ -320,7 +322,7 @@ class SaveManyBeans extends SaveManyBase {
         // the object from the 'other' side of the ManyToMany
         // build a intersection row for 'delete'
         IntersectionRow intRow = many.buildManyToManyMapBean(parentBean, otherDelete, publish);
-        SqlUpdate sqlDelete = intRow.createDelete(server, false);
+        SqlUpdate sqlDelete = intRow.createDelete(server, DeleteMode.HARD);
         persister.executeSqlUpdate(sqlDelete, transaction);
       }
     }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
index 6bc530e9e..cf77829ee 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
@@ -176,7 +176,7 @@ public class BeanPersistIds {
         addUpdateId(id);
         break;
       case DELETE:
-      case SOFT_DELETE:
+      case DELETE_SOFT:
         addDeleteId(id);
         break;
 
diff --git a/src/test/java/org/tests/model/softdelete/EsdDetail.java b/src/test/java/org/tests/model/softdelete/EsdDetail.java
new file mode 100644
index 000000000..ec96fa3e9
--- /dev/null
+++ b/src/test/java/org/tests/model/softdelete/EsdDetail.java
@@ -0,0 +1,33 @@
+package org.tests.model.softdelete;
+
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+
+@Entity
+public class EsdDetail extends BaseSoftDelete {
+
+  String name;
+
+  @ManyToOne(optional = false)
+  EsdMaster master;
+
+  public EsdDetail(String name) {
+    this.name = name;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public EsdMaster getMaster() {
+    return master;
+  }
+
+  public void setMaster(EsdMaster master) {
+    this.master = master;
+  }
+}
diff --git a/src/test/java/org/tests/model/softdelete/EsdMaster.java b/src/test/java/org/tests/model/softdelete/EsdMaster.java
new file mode 100644
index 000000000..23bb3d33a
--- /dev/null
+++ b/src/test/java/org/tests/model/softdelete/EsdMaster.java
@@ -0,0 +1,35 @@
+package org.tests.model.softdelete;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.OneToMany;
+import java.util.List;
+
+@Entity
+public class EsdMaster extends BaseSoftDelete {
+
+  String name;
+
+  @OneToMany(mappedBy = "master", cascade = CascadeType.ALL)
+  List<EsdDetail> details;
+
+  public EsdMaster(String name) {
+    this.name = name;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public List<EsdDetail> getDetails() {
+    return details;
+  }
+
+  public void setDetails(List<EsdDetail> details) {
+    this.details = details;
+  }
+}
diff --git a/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java b/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java
new file mode 100644
index 000000000..85901d391
--- /dev/null
+++ b/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java
@@ -0,0 +1,74 @@
+package org.tests.softdelete;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebeantest.LoggedSql;
+import org.junit.Test;
+import org.tests.model.softdelete.EsdDetail;
+import org.tests.model.softdelete.EsdMaster;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestSoftDeleteStatelessUpdate extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    EsdMaster master = new EsdMaster("m1");
+    master.getDetails().add(new EsdDetail("d1"));
+    master.getDetails().add(new EsdDetail("d2"));
+    master.getDetails().add(new EsdDetail("d3"));
+
+
+    Ebean.save(master);
+
+    EsdMaster upd = new EsdMaster("m1-modified");
+    upd.setId(master.getId());
+
+    EsdDetail d1 = new EsdDetail("d1");
+    d1.setId(master.getDetails().get(0).getId());
+    upd.getDetails().add(d1);
+
+    EsdDetail d3 = new EsdDetail("d3-mod");
+    d3.setId(master.getDetails().get(2).getId());
+    upd.getDetails().add(d3);
+
+
+    LoggedSql.start();
+
+    Ebean.getDefaultServer().update(upd, null, true);
+
+    List<String> sql = LoggedSql.collect();
+    assertThat(sql).hasSize(4);
+    assertThat(sql.get(0)).contains("update esd_master set name=? where id=?");
+    assertThat(sql.get(1)).contains("update esd_detail set deleted=true where master_id = ? and not");
+
+
+    EsdMaster fetchedWithSoftDeletes = Ebean.find(EsdMaster.class)
+      .setId(master.getId())
+      .setIncludeSoftDeletes()
+      .fetch("details")
+      .findOne();
+
+    assertThat(fetchedWithSoftDeletes.getDetails()).hasSize(3);
+
+    sql = LoggedSql.collect();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("left join esd_detail t1 on t1.master_id = t0.id  where t0.id = ?");
+
+    EsdMaster fetchedWithOutSoftDeletes = Ebean.find(EsdMaster.class)
+      .setId(master.getId())
+      .fetch("details")
+      .findOne();
+
+    assertThat(fetchedWithOutSoftDeletes.getDetails()).hasSize(2);
+
+    sql = LoggedSql.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("left join esd_detail t1 on t1.master_id = t0.id and t1.deleted = false  where t0.id = ?");
+
+
+  }
+}

From 59537227b6e8072bcf41eb8b3e2258efe7fb308a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 14 Jun 2018 23:28:30 +1200
Subject: [PATCH 0327/1036] #1426 - ENH: Add bitwiseNot expression ... e.g.
 bitwiseNot("flags", BwFlags.HAS_COLOUR)

---
 src/main/java/io/ebean/ExpressionList.java         | 14 ++++++++++++++
 .../server/expression/DefaultExpressionList.java   |  6 ++++++
 .../server/expression/JunctionExpression.java      |  5 +++++
 .../expression/bitwise/TestBitwiseExpressions.java | 13 +++++++++++++
 4 files changed, 38 insertions(+)

diff --git a/src/main/java/io/ebean/ExpressionList.java b/src/main/java/io/ebean/ExpressionList.java
index efdec6e7b..280a6356b 100644
--- a/src/main/java/io/ebean/ExpressionList.java
+++ b/src/main/java/io/ebean/ExpressionList.java
@@ -1031,6 +1031,20 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> bitwiseAll(String propertyName, long flags);
 
+  /**
+   * Add expression for the given bit flags to be NOT set.
+   * <p>
+   * <pre>{@code
+   *
+   * where().bitwiseNot("flags", BwFlags.HAS_COLOUR)
+   *
+   * }</pre>
+   *
+   * @param propertyName The property that holds the flags value
+   * @param flags        The flags we are looking for
+   */
+  ExpressionList<T> bitwiseNot(String propertyName, long flags);
+
   /**
    * Add bitwise AND expression of the given bit flags to compare with the match/mask.
    * <p>
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 69796ef43..45324d954 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -711,6 +711,12 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return this;
   }
 
+  @Override
+  public ExpressionList<T> bitwiseNot(String propertyName, long flags) {
+    add(expr.bitwiseAnd(propertyName, flags, 0));
+    return this;
+  }
+
   @Override
   public ExpressionList<T> bitwiseAll(String propertyName, long flags) {
     add(expr.bitwiseAll(propertyName, flags));
diff --git a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index b1fc7b4cc..d927bb22f 100644
--- a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -554,6 +554,11 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.bitwiseAnd(propertyName, flags, match);
   }
 
+  @Override
+  public ExpressionList<T> bitwiseNot(String propertyName, long flags) {
+    return exprList.bitwiseNot(propertyName, flags);
+  }
+
   @Override
   public ExpressionList<T> ge(String propertyName, Object value) {
     return exprList.ge(propertyName, value);
diff --git a/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java b/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java
index 05be5d1ae..54c673b6f 100644
--- a/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java
+++ b/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java
@@ -14,11 +14,24 @@ public class TestBitwiseExpressions extends BaseTestCase {
   public void where() {
 
     setup();
+    bitwiseNot();
     bitwiseAnd();
     bitwiseAny();
     bitwiseAll();
   }
 
+  private void bitwiseNot() {
+
+    List<BwBean> notColour = Ebean.find(BwBean.class)
+      // HAS_COLOUR not set ...
+      .where().bitwiseNot("flags", BwFlags.HAS_COLOUR)
+      .findList();
+
+    assertThat(notColour).hasSize(2);
+    assertThat(notColour.get(0).getName()).isEqualTo("Nothing");
+    assertThat(notColour.get(1).getName()).isEqualTo("SizeOnly");
+  }
+
   private void bitwiseAnd() {
 
     List<BwBean> list = Ebean.find(BwBean.class)

From 96cc8d760591fc153a8398f2d26e29e4eab4f7fe Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 15 Jun 2018 17:36:23 +1200
Subject: [PATCH 0328/1036] #1427 - QueryCache should be cleared, if one of a
 dependent bean is updated

Initial work, does not include propagation across cluster.
---
 pom.xml                                       |  2 +-
 .../java/io/ebean/cache/QueryCacheEntry.java  | 54 +++++++++++++
 .../ebean/cache/QueryCacheEntryValidate.java  | 12 +++
 .../io/ebean/cache/ServerCacheConfig.java     | 65 +++++++++++++++
 .../io/ebean/cache/ServerCacheFactory.java    |  4 +-
 .../io/ebeaninternal/api/SpiTransaction.java  |  5 ++
 .../api/SpiTransactionProxy.java              |  5 ++
 .../ebeaninternal/api/TransactionEvent.java   |  9 ++-
 .../server/cache/CacheChangeSet.java          | 49 +++++++-----
 .../server/cache/CacheManagerOptions.java     | 10 ++-
 .../server/cache/DefaultCacheHolder.java      | 26 +++---
 .../server/cache/DefaultServerCache.java      | 72 ++++++-----------
 .../cache/DefaultServerCacheConfig.java       | 80 +++++++++++++++++++
 .../cache/DefaultServerCacheFactory.java      | 14 ++--
 .../server/cache/DefaultServerQueryCache.java | 41 ++++++++++
 .../server/core/CacheOptions.java             | 24 ++++++
 .../server/core/DefaultContainer.java         | 51 +-----------
 .../server/core/InternalConfiguration.java    | 78 ++++++++++++++++--
 .../server/core/OrmQueryRequest.java          | 20 ++++-
 .../server/deploy/BeanDescriptor.java         |  5 +-
 .../deploy/BeanDescriptorCacheHelp.java       | 75 ++++++++++-------
 .../deploy/meta/DeployBeanDescriptor.java     |  7 ++
 .../server/deploy/parse/AnnotationClass.java  | 14 +++-
 .../io/ebeaninternal/server/query/CQuery.java |  5 ++
 .../server/query/CQueryEngine.java            | 19 +++++
 .../query/CQueryFetchSingleAttribute.java     |  5 ++
 .../server/query/CQueryPlan.java              | 10 +++
 .../server/query/CQueryRowCount.java          |  5 ++
 .../server/query/DefaultOrmQueryEngine.java   | 27 +------
 .../ebeaninternal/server/query/SqlTree.java   | 10 +++
 .../server/query/SqlTreeNode.java             |  6 ++
 .../server/query/SqlTreeNodeBean.java         |  9 +++
 .../server/query/SqlTreeNodeExtraJoin.java    | 11 +++
 .../server/query/SqlTreeNodeManyRoot.java     |  1 +
 .../query/SqlTreeNodeManyWhereJoin.java       |  6 ++
 .../server/query/SqlTreeNodeRoot.java         |  7 ++
 .../ImplicitReadOnlyTransaction.java          |  8 ++
 .../server/transaction/JdbcTransaction.java   | 12 ++-
 .../server/transaction/NoTransaction.java     |  6 ++
 .../transaction/PostCommitProcessing.java     | 12 ++-
 .../server/transaction/TableModState.java     | 51 ++++++++++++
 .../transaction/TransactionManager.java       | 21 +++--
 .../TransactionManagerOptions.java            |  6 +-
 .../server/cache/DefaultCacheHolderTest.java  | 60 ++++++++------
 ...faultCacheHolder_getCacheOptions_Test.java |  6 +-
 .../cache/DefaultServerCacheConfigTest.java   | 52 ++++++++++++
 .../server/cache/DefaultServerCacheTest.java  | 44 ++--------
 .../DefaultServerCache_RunEvictionTest.java   |  5 +-
 .../server/transaction/TableModStateTest.java | 44 ++++++++++
 .../cache/TestQueryCacheTableDependency.java  | 59 ++++++++++++++
 .../java/org/tests/model/basic/Address.java   |  6 ++
 51 files changed, 952 insertions(+), 283 deletions(-)
 create mode 100644 src/main/java/io/ebean/cache/QueryCacheEntry.java
 create mode 100644 src/main/java/io/ebean/cache/QueryCacheEntryValidate.java
 create mode 100644 src/main/java/io/ebean/cache/ServerCacheConfig.java
 create mode 100644 src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheConfig.java
 create mode 100644 src/main/java/io/ebeaninternal/server/cache/DefaultServerQueryCache.java
 create mode 100644 src/main/java/io/ebeaninternal/server/transaction/TableModState.java
 create mode 100644 src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java
 create mode 100644 src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java
 create mode 100644 src/test/java/org/tests/cache/TestQueryCacheTableDependency.java

diff --git a/pom.xml b/pom.xml
index c67edab03..4e54f6d66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>3.11</version>
+      <version>3.12</version>
     </dependency>
 
     <dependency>
diff --git a/src/main/java/io/ebean/cache/QueryCacheEntry.java b/src/main/java/io/ebean/cache/QueryCacheEntry.java
new file mode 100644
index 000000000..31f1134d9
--- /dev/null
+++ b/src/main/java/io/ebean/cache/QueryCacheEntry.java
@@ -0,0 +1,54 @@
+package io.ebean.cache;
+
+import java.util.Set;
+
+/**
+ * For query cache entries we additionally hold the dependent tables and timestamp for the query result.
+ * <p>
+ * We use the dependent tables and timestamp to validate that tables the query joins to have not been
+ * modified since the query cache entry was cached. If any dependent tables have since been modified
+ * the query cache entry is treated as invalid.
+ * </p>
+ */
+public class QueryCacheEntry {
+
+  private final Object value;
+
+  private final Set<String> dependentTables;
+
+  private final long timestamp;
+
+  /**
+   * Create with dependent tables and timestamp.
+   *
+   * @param value           The query result being cached
+   * @param dependentTables The extra tables the query is dependent on (joins to)
+   * @param timestamp       The timestamp that the query uses to check for modifications
+   */
+  public QueryCacheEntry(Object value, Set<String> dependentTables, long timestamp) {
+    this.value = value;
+    this.dependentTables = dependentTables;
+    this.timestamp = timestamp;
+  }
+
+  /**
+   * Return the actual query result.
+   */
+  public Object getValue() {
+    return value;
+  }
+
+  /**
+   * Return the tables the query result is dependent on.
+   */
+  public Set<String> getDependentTables() {
+    return dependentTables;
+  }
+
+  /**
+   * Return the timestamp used to check for modifications on the dependent tables.
+   */
+  public long getTimestamp() {
+    return timestamp;
+  }
+}
diff --git a/src/main/java/io/ebean/cache/QueryCacheEntryValidate.java b/src/main/java/io/ebean/cache/QueryCacheEntryValidate.java
new file mode 100644
index 000000000..f94c07a7d
--- /dev/null
+++ b/src/main/java/io/ebean/cache/QueryCacheEntryValidate.java
@@ -0,0 +1,12 @@
+package io.ebean.cache;
+
+/**
+ * Used to validate that a query cache entry is still valid based on dependent tables.
+ */
+public interface QueryCacheEntryValidate {
+
+  /**
+   * Return true if the entry is still valid based on dependent tables.
+   */
+  boolean isValid(QueryCacheEntry queryCacheEntry);
+}
diff --git a/src/main/java/io/ebean/cache/ServerCacheConfig.java b/src/main/java/io/ebean/cache/ServerCacheConfig.java
new file mode 100644
index 000000000..a2a6d5c52
--- /dev/null
+++ b/src/main/java/io/ebean/cache/ServerCacheConfig.java
@@ -0,0 +1,65 @@
+package io.ebean.cache;
+
+import io.ebean.config.CurrentTenantProvider;
+
+/**
+ * Configuration used to create ServerCache instances.
+ */
+public class ServerCacheConfig {
+
+  private final ServerCacheType type;
+  private final String cacheKey;
+  private final ServerCacheOptions cacheOptions;
+  private final CurrentTenantProvider tenantProvider;
+  private final QueryCacheEntryValidate queryCacheEntryValidate;
+
+  public ServerCacheConfig(ServerCacheType type, String cacheKey, ServerCacheOptions cacheOptions, CurrentTenantProvider tenantProvider, QueryCacheEntryValidate queryCacheEntryValidate) {
+    this.type = type;
+    this.cacheKey = cacheKey;
+    this.cacheOptions = cacheOptions;
+    this.tenantProvider = tenantProvider;
+    this.queryCacheEntryValidate = queryCacheEntryValidate;
+  }
+
+  /**
+   * Return the cache type.
+   */
+  public ServerCacheType getType() {
+    return type;
+  }
+
+  /**
+   * Return the name of the cache.
+   */
+  public String getCacheKey() {
+    return cacheKey;
+  }
+
+  /**
+   * Return the tuning options.
+   */
+  public ServerCacheOptions getCacheOptions() {
+    return cacheOptions;
+  }
+
+  /**
+   * Return the current tenant provider.
+   */
+  public CurrentTenantProvider getTenantProvider() {
+    return tenantProvider;
+  }
+
+  /**
+   * Return the service that provides validation for query cache entries.
+   */
+  public QueryCacheEntryValidate getQueryCacheEntryValidate() {
+    return queryCacheEntryValidate;
+  }
+
+  /**
+   * Return true if the cache is a query cache.
+   */
+  public boolean isQueryCache() {
+    return type == ServerCacheType.QUERY;
+  }
+}
diff --git a/src/main/java/io/ebean/cache/ServerCacheFactory.java b/src/main/java/io/ebean/cache/ServerCacheFactory.java
index 269cb9ae1..d59bfd3c4 100644
--- a/src/main/java/io/ebean/cache/ServerCacheFactory.java
+++ b/src/main/java/io/ebean/cache/ServerCacheFactory.java
@@ -1,7 +1,5 @@
 package io.ebean.cache;
 
-import io.ebean.config.CurrentTenantProvider;
-
 /**
  * Defines method for constructing caches for beans and queries.
  */
@@ -10,6 +8,6 @@ public interface ServerCacheFactory {
   /**
    * Create the cache for the given type with options.
    */
-  ServerCache createCache(ServerCacheType type, String cacheKey, CurrentTenantProvider tenantProvider, ServerCacheOptions cacheOptions);
+  ServerCache createCache(ServerCacheConfig config);
 
 }
diff --git a/src/main/java/io/ebeaninternal/api/SpiTransaction.java b/src/main/java/io/ebeaninternal/api/SpiTransaction.java
index e134986c5..0054757da 100644
--- a/src/main/java/io/ebeaninternal/api/SpiTransaction.java
+++ b/src/main/java/io/ebeaninternal/api/SpiTransaction.java
@@ -101,6 +101,11 @@ public interface SpiTransaction extends Transaction {
    */
   String getId();
 
+  /**
+   * Return the start timestamp for the transaction (JVM side).
+   */
+  long getStartMillis();
+
   /**
    * Return true if this transaction has updateAllLoadedProperties set.
    * If null is returned the server default is used (set on ServerConfig).
diff --git a/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java b/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
index 02057236c..ffbb3c727 100644
--- a/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
+++ b/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
@@ -30,6 +30,11 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
     return transaction.translate(message, cause);
   }
 
+  @Override
+  public long getStartMillis() {
+    return transaction.getStartMillis();
+  }
+
   @Override
   public void setLabel(String label) {
     transaction.setLabel(label);
diff --git a/src/main/java/io/ebeaninternal/api/TransactionEvent.java b/src/main/java/io/ebeaninternal/api/TransactionEvent.java
index 44ba7cf4d..711fa49dd 100644
--- a/src/main/java/io/ebeaninternal/api/TransactionEvent.java
+++ b/src/main/java/io/ebeaninternal/api/TransactionEvent.java
@@ -27,6 +27,8 @@ public class TransactionEvent implements Serializable {
    */
   private final transient boolean local;
 
+  private final long modificationTimestamp;
+
   private TransactionEventTable eventTables;
 
   private transient TransactionEventBeans eventBeans;
@@ -36,8 +38,9 @@ public class TransactionEvent implements Serializable {
   /**
    * Create the TransactionEvent, one per Transaction.
    */
-  public TransactionEvent() {
+  public TransactionEvent(long modificationTimestamp) {
     this.local = true;
+    this.modificationTimestamp = modificationTimestamp;
   }
 
   public void addDeleteById(BeanDescriptor<?> desc, Object id) {
@@ -108,8 +111,8 @@ public class TransactionEvent implements Serializable {
   /**
    * Build and return the cache changeSet.
    */
-  public CacheChangeSet buildCacheChanges(boolean viewInvalidation) {
-    CacheChangeSet changeSet = new CacheChangeSet(viewInvalidation);
+  public CacheChangeSet buildCacheChanges() {
+    CacheChangeSet changeSet = new CacheChangeSet(modificationTimestamp);
     if (eventBeans != null) {
       eventBeans.notifyCache(changeSet);
     }
diff --git a/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java b/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
index f0c09f6cb..45956d181 100644
--- a/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
+++ b/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
@@ -17,22 +17,26 @@ public class CacheChangeSet {
 
   private final List<CacheChange> entries = new ArrayList<>();
 
+  private final Set<String> touchedTables = new HashSet<>();
+
   private final Set<BeanDescriptor<?>> queryCaches = new HashSet<>();
 
   private final Map<ManyKey, ManyChange> manyChangeMap = new HashMap<>();
 
-  /**
-   * Set of "base tables" modified used to invalidate entities based on views.
-   */
-  private final Set<String> viewInvalidation = new HashSet<>();
-
-  private final boolean viewEntityInvalidation;
+  private final long modificationTimestamp;
 
   /**
    * Construct specifying if we also need to process invalidation for entities based on views.
    */
-  public CacheChangeSet(boolean viewEntityInvalidation) {
-    this.viewEntityInvalidation = viewEntityInvalidation;
+  public CacheChangeSet(long modificationTimestamp) {
+    this.modificationTimestamp = modificationTimestamp;
+  }
+
+  /**
+   * Return the touched tables.
+   */
+  public Set<String> touchedTables() {
+    return touchedTables;
   }
 
   /**
@@ -40,7 +44,7 @@ public class CacheChangeSet {
    * <p>
    * Return the set of table changes to process invalidation for entities based on views.
    */
-  public Set<String> apply() {
+  public void apply() {
     for (BeanDescriptor<?> entry : queryCaches) {
       entry.clearQueryCache();
     }
@@ -50,7 +54,13 @@ public class CacheChangeSet {
     for (CacheChange entry : manyChangeMap.values()) {
       entry.apply();
     }
-    return viewInvalidation;
+  }
+
+  /**
+   * Add an entry to clear a query cache.
+   */
+  public void addInvalidate(BeanDescriptor<?> descriptor) {
+    touchedTables.add(descriptor.getBaseTable());
   }
 
   /**
@@ -85,29 +95,23 @@ public class CacheChangeSet {
    * On bean insert register table for view based entity invalidation.
    */
   public void addBeanInsert(String baseTable) {
-    if (viewEntityInvalidation) {
-      viewInvalidation.add(baseTable);
-    }
+    touchedTables.add(baseTable);
   }
 
   /**
    * Remove a bean from the cache.
    */
   public <T> void addBeanRemove(BeanDescriptor<T> desc, Object id) {
+    touchedTables.add(desc.getBaseTable());
     entries.add(new CacheChangeBeanRemove(desc, id));
-    if (viewEntityInvalidation) {
-      viewInvalidation.add(desc.getBaseTable());
-    }
   }
 
   /**
    * Update a bean entry.
    */
   public <T> void addBeanUpdate(BeanDescriptor<T> desc, Object id, Map<String, Object> changes, boolean updateNaturalKey, long version) {
+    touchedTables.add(desc.getBaseTable());
     entries.add(new CacheChangeBeanUpdate(desc, id, changes, updateNaturalKey, version));
-    if (viewEntityInvalidation) {
-      viewInvalidation.add(desc.getBaseTable());
-    }
   }
 
   /**
@@ -125,6 +129,13 @@ public class CacheChangeSet {
     return manyChangeMap.computeIfAbsent(key, ManyChange::new);
   }
 
+  /**
+   * Return the modification timestamp for these changes.
+   */
+  public long modificationTimestamp() {
+    return modificationTimestamp;
+  }
+
   /**
    * Changes for a specific many property.
    */
diff --git a/src/main/java/io/ebeaninternal/server/cache/CacheManagerOptions.java b/src/main/java/io/ebeaninternal/server/cache/CacheManagerOptions.java
index b61b48080..36a7ed571 100644
--- a/src/main/java/io/ebeaninternal/server/cache/CacheManagerOptions.java
+++ b/src/main/java/io/ebeaninternal/server/cache/CacheManagerOptions.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.cache;
 
+import io.ebean.cache.QueryCacheEntryValidate;
 import io.ebean.cache.ServerCacheFactory;
 import io.ebean.cache.ServerCacheOptions;
 import io.ebean.config.CurrentTenantProvider;
@@ -19,6 +20,8 @@ public class CacheManagerOptions {
 
   private CurrentTenantProvider currentTenantProvider;
 
+  private QueryCacheEntryValidate queryCacheEntryValidate;
+
   private ServerCacheFactory cacheFactory = new DefaultServerCacheFactory();
   private ServerCacheOptions beanDefault = new ServerCacheOptions();
   private ServerCacheOptions queryDefault = new ServerCacheOptions();
@@ -45,8 +48,9 @@ public class CacheManagerOptions {
     return this;
   }
 
-  public CacheManagerOptions with(ServerCacheFactory cacheFactory) {
+  public CacheManagerOptions with(ServerCacheFactory cacheFactory, QueryCacheEntryValidate queryCacheEntryValidate) {
     this.cacheFactory = cacheFactory;
+    this.queryCacheEntryValidate = queryCacheEntryValidate;
     return this;
   }
 
@@ -82,4 +86,8 @@ public class CacheManagerOptions {
   public ClusterManager getClusterManager() {
     return clusterManager;
   }
+
+  public QueryCacheEntryValidate getQueryCacheEntryValidate() {
+    return queryCacheEntryValidate;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java b/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
index 092fe7b9a..20e966f6e 100644
--- a/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
+++ b/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
@@ -2,7 +2,9 @@ package io.ebeaninternal.server.cache;
 
 import io.ebean.annotation.CacheBeanTuning;
 import io.ebean.annotation.CacheQueryTuning;
+import io.ebean.cache.QueryCacheEntryValidate;
 import io.ebean.cache.ServerCache;
+import io.ebean.cache.ServerCacheConfig;
 import io.ebean.cache.ServerCacheFactory;
 import io.ebean.cache.ServerCacheOptions;
 import io.ebean.cache.ServerCacheType;
@@ -33,22 +35,14 @@ class DefaultCacheHolder {
 
   private final CurrentTenantProvider tenantProvider;
 
-  DefaultCacheHolder(CacheManagerOptions builder) {
-    this(builder.getCacheFactory(), builder.getBeanDefault(), builder.getQueryDefault(), builder.getCurrentTenantProvider());
-  }
+  private final QueryCacheEntryValidate queryCacheEntryValidate;
 
-  /**
-   * Create with a cache factory and default cache options.
-   *
-   * @param cacheFactory the factory for creating the cache
-   * @param beanDefault  the default options for tuning bean caches
-   * @param queryDefault the default options for tuning query caches
-   */
-  DefaultCacheHolder(ServerCacheFactory cacheFactory, ServerCacheOptions beanDefault, ServerCacheOptions queryDefault, CurrentTenantProvider tenantProvider) {
-    this.cacheFactory = cacheFactory;
-    this.beanDefault = beanDefault;
-    this.queryDefault = queryDefault;
-    this.tenantProvider = tenantProvider;
+  DefaultCacheHolder(CacheManagerOptions builder) {
+    this.cacheFactory = builder.getCacheFactory();
+    this.beanDefault = builder.getBeanDefault();
+    this.queryDefault = builder.getQueryDefault();
+    this.tenantProvider = builder.getCurrentTenantProvider();
+    this.queryCacheEntryValidate = builder.getQueryCacheEntryValidate();
   }
 
   ServerCache getCache(Class<?> beanType, String cacheKey, ServerCacheType type) {
@@ -76,7 +70,7 @@ class DefaultCacheHolder {
         collectIdCaches.computeIfAbsent(beanType.getName(), s -> new ConcurrentSkipListSet<>()).add(key);
       }
     }
-    return cacheFactory.createCache(type, key, tenantProvider, options);
+    return cacheFactory.createCache(new ServerCacheConfig(type, key, options, tenantProvider, queryCacheEntryValidate));
   }
 
   void clearAll() {
diff --git a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
index b8bee5cc4..33e85f34b 100644
--- a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
+++ b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
@@ -2,10 +2,8 @@ package io.ebeaninternal.server.cache;
 
 import io.ebean.BackgroundExecutor;
 import io.ebean.cache.ServerCache;
-import io.ebean.cache.ServerCacheOptions;
 import io.ebean.cache.ServerCacheStatistics;
 import io.ebean.cache.TenantAwareKey;
-import io.ebean.config.CurrentTenantProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -15,7 +13,6 @@ import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.LongAdder;
 
@@ -65,47 +62,14 @@ public class DefaultServerCache implements ServerCache {
 
   protected TenantAwareKey tenantAwareKey;
 
-  /**
-   * Construct using a ConcurrentHashMap and cache options.
-   */
-  public DefaultServerCache(String name, CurrentTenantProvider tenantProvider, ServerCacheOptions options) {
-    this(name, new ConcurrentHashMap<>(), tenantProvider, options);
-  }
-
-  /**
-   * Construct passing in name, map and base eviction controls as ServerCacheOptions.
-   */
-  public DefaultServerCache(String name, Map<Object, CacheEntry> map, CurrentTenantProvider tenantProvider, ServerCacheOptions options) {
-    this(name, map, tenantProvider, options.getMaxSize(), options.getMaxIdleSecs(), options.getMaxSecsToLive(), options.getTrimFrequency());
-  }
-
-  /**
-   * Construct passing in name, map and base eviction controls.
-   */
-  public DefaultServerCache(String name, Map<Object, CacheEntry> map, CurrentTenantProvider tenantProvider, int maxSize, int maxIdleSecs, int maxSecsToLive, int trimFrequency) {
-    this.name = name;
-    this.map = map;
-    this.maxSize = maxSize;
-    this.tenantAwareKey = new TenantAwareKey(tenantProvider);
-    this.maxIdleSecs = maxIdleSecs;
-    this.maxSecsToLive = maxSecsToLive;
-    this.trimFrequency = determineTrim(maxIdleSecs, maxSecsToLive, trimFrequency);
-  }
-
-  /**
-   * Determine a good trimFrequency as half of maxIdleSecs (or maxSecsToLive).
-   */
-  int determineTrim(int maxIdleSecs, int maxSecsToLive, int trimFrequency) {
-    if (trimFrequency > 0) {
-      return trimFrequency;
-    }
-    if (maxIdleSecs > 0) {
-      return maxIdleSecs / 2 - 1;
-    }
-    if (maxSecsToLive > 0) {
-      return maxSecsToLive / 2 - 1;
-    }
-    return 0;
+  public DefaultServerCache(DefaultServerCacheConfig config) {
+    this.name = config.getName();
+    this.map = config.getMap();
+    this.maxSize = config.getMaxSize();
+    this.tenantAwareKey = new TenantAwareKey(config.getTenantProvider());
+    this.maxIdleSecs = config.getMaxIdleSecs();
+    this.maxSecsToLive = config.getMaxSecsToLive();
+    this.trimFrequency = config.determineTrimFrequency();
   }
 
   public void periodicTrim(BackgroundExecutor executor) {
@@ -193,7 +157,7 @@ public class DefaultServerCache implements ServerCache {
   /**
    * Return the tenant aware key.
    */
-  private Object key(Object id) {
+  protected Object key(Object id) {
     return tenantAwareKey.key(id);
   }
 
@@ -203,7 +167,7 @@ public class DefaultServerCache implements ServerCache {
   @Override
   public Object get(Object id) {
 
-    CacheEntry entry = map.get(key(id));
+    CacheEntry entry = getCacheEntry(id);
     if (entry == null) {
       missCount.increment();
       return null;
@@ -212,10 +176,24 @@ public class DefaultServerCache implements ServerCache {
       // Important that hitCount.increment() MUST be low latency under concurrent
       // use hence must use LongAdder or better here
       hitCount.increment();
-      return entry.getValue();
+      return unwrapEntry(entry);
     }
   }
 
+  /**
+   * Unwrap the cache entry - override for query cache to unwrap to the query result.
+   */
+  protected Object unwrapEntry(CacheEntry entry) {
+    return entry.getValue();
+  }
+
+  /**
+   * Get the cache entry - override for query cache to validate dependent tables.
+   */
+  protected CacheEntry getCacheEntry(Object id) {
+    return map.get(key(id));
+  }
+
   @Override
   public void putAll(Map<Object, Object> keyValues) {
     keyValues.forEach(this::put);
diff --git a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheConfig.java b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheConfig.java
new file mode 100644
index 000000000..44538beed
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheConfig.java
@@ -0,0 +1,80 @@
+package io.ebeaninternal.server.cache;
+
+import io.ebean.cache.QueryCacheEntryValidate;
+import io.ebean.cache.ServerCacheConfig;
+import io.ebean.cache.ServerCacheOptions;
+import io.ebean.config.CurrentTenantProvider;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class DefaultServerCacheConfig {
+
+  private final ServerCacheConfig config;
+
+  private int maxSize;
+  private int maxIdleSecs;
+  private int maxSecsToLive;
+  private int trimFrequency;
+
+  private Map<Object, DefaultServerCache.CacheEntry> map;
+
+  public DefaultServerCacheConfig(ServerCacheConfig config) {
+    this(config,  new ConcurrentHashMap<>());
+  }
+
+  public DefaultServerCacheConfig(ServerCacheConfig config, Map<Object, DefaultServerCache.CacheEntry> map) {
+    this.config = config;
+    this.map = map;
+
+    ServerCacheOptions options = config.getCacheOptions();
+    this.maxIdleSecs = options.getMaxIdleSecs();
+    this.maxSecsToLive = options.getMaxSecsToLive();
+    this.trimFrequency = options.getTrimFrequency();
+    this.maxSize = options.getMaxSize();
+  }
+
+  public CurrentTenantProvider getTenantProvider() {
+    return config.getTenantProvider();
+  }
+
+  public QueryCacheEntryValidate getQueryCacheEntryValidate() {
+    return config.getQueryCacheEntryValidate();
+  }
+
+  public String getName() {
+    return config.getCacheKey();
+  }
+
+  public Map<Object, DefaultServerCache.CacheEntry> getMap() {
+    return map;
+  }
+
+  public int getMaxSize() {
+    return maxSize;
+  }
+
+  public int getMaxIdleSecs() {
+    return maxIdleSecs;
+  }
+
+  public int getMaxSecsToLive() {
+    return maxSecsToLive;
+  }
+
+  /**
+   * Determine a good trimFrequency as half of maxIdleSecs (or maxSecsToLive).
+   */
+  public int determineTrimFrequency() {
+    if (trimFrequency > 0) {
+      return trimFrequency;
+    }
+    if (maxIdleSecs > 0) {
+      return maxIdleSecs / 2 - 1;
+    }
+    if (maxSecsToLive > 0) {
+      return maxSecsToLive / 2 - 1;
+    }
+    return 0;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheFactory.java b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheFactory.java
index 197052dcb..a519ea469 100644
--- a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheFactory.java
+++ b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheFactory.java
@@ -2,10 +2,8 @@ package io.ebeaninternal.server.cache;
 
 import io.ebean.BackgroundExecutor;
 import io.ebean.cache.ServerCache;
+import io.ebean.cache.ServerCacheConfig;
 import io.ebean.cache.ServerCacheFactory;
-import io.ebean.cache.ServerCacheOptions;
-import io.ebean.cache.ServerCacheType;
-import io.ebean.config.CurrentTenantProvider;
 
 
 /**
@@ -30,9 +28,15 @@ class DefaultServerCacheFactory implements ServerCacheFactory {
   }
 
   @Override
-  public ServerCache createCache(ServerCacheType type, String cacheKey, CurrentTenantProvider tenantProvider, ServerCacheOptions cacheOptions) {
+  public ServerCache createCache(ServerCacheConfig config) {
 
-    DefaultServerCache cache = new DefaultServerCache(cacheKey, tenantProvider, cacheOptions);
+    DefaultServerCache cache;
+    if (config.isQueryCache()) {
+      // use a server cache aware of extra validation and QueryCacheEntry
+      cache = new DefaultServerQueryCache(new DefaultServerCacheConfig(config));
+    } else {
+      cache = new DefaultServerCache(new DefaultServerCacheConfig(config));
+    }
     if (executor != null) {
       cache.periodicTrim(executor);
     }
diff --git a/src/main/java/io/ebeaninternal/server/cache/DefaultServerQueryCache.java b/src/main/java/io/ebeaninternal/server/cache/DefaultServerQueryCache.java
new file mode 100644
index 000000000..85f4b22ca
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/cache/DefaultServerQueryCache.java
@@ -0,0 +1,41 @@
+package io.ebeaninternal.server.cache;
+
+import io.ebean.cache.QueryCacheEntry;
+import io.ebean.cache.QueryCacheEntryValidate;
+
+/**
+ * Server cache for query caching.
+ * <p>
+ * Entries in this cache contain QueryCacheEntry and we need to additionally
+ * validate the entries when hit for changes to dependent tables.
+ * </p>
+ */
+public class DefaultServerQueryCache extends DefaultServerCache {
+
+  private final QueryCacheEntryValidate queryCacheEntryValidate;
+
+  public DefaultServerQueryCache(DefaultServerCacheConfig config) {
+    super(config);
+    this.queryCacheEntryValidate = config.getQueryCacheEntryValidate();
+  }
+
+  protected Object unwrapEntry(CacheEntry entry) {
+    return ((QueryCacheEntry) entry.getValue()).getValue();
+  }
+
+  @Override
+  protected CacheEntry getCacheEntry(Object id) {
+    Object key = key(id);
+    CacheEntry entry = map.get(key);
+    if (entry == null) {
+      return null;
+    }
+    QueryCacheEntry value = (QueryCacheEntry) entry.getValue();
+    if (!queryCacheEntryValidate.isValid(value)) {
+      map.remove(key);
+      removeCount.increment();
+      return null;
+    }
+    return entry;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/core/CacheOptions.java b/src/main/java/io/ebeaninternal/server/core/CacheOptions.java
index 5cb7741a2..24d441828 100644
--- a/src/main/java/io/ebeaninternal/server/core/CacheOptions.java
+++ b/src/main/java/io/ebeaninternal/server/core/CacheOptions.java
@@ -12,6 +12,9 @@ public class CacheOptions {
    */
   public static final CacheOptions NO_CACHING = new CacheOptions();
 
+  public static final CacheOptions INVALIDATE_QUERY_CACHE = new CacheOptions(true);
+
+  private final boolean invalidateQueryCache;
   private final boolean enableBeanCache;
   private final boolean enableQueryCache;
   private final boolean readOnly;
@@ -21,6 +24,18 @@ public class CacheOptions {
    * Construct for no caching.
    */
   private CacheOptions() {
+    invalidateQueryCache = false;
+    enableBeanCache = false;
+    enableQueryCache = false;
+    readOnly = false;
+    naturalKey = null;
+  }
+
+  /**
+   * Construct for invalidateQueryCache.
+   */
+  private CacheOptions(boolean invalidateQueryCache) {
+    this.invalidateQueryCache = invalidateQueryCache;
     enableBeanCache = false;
     enableQueryCache = false;
     readOnly = false;
@@ -31,12 +46,21 @@ public class CacheOptions {
    * Construct with cache annotation.
    */
   public CacheOptions(Cache cache, String[] naturalKey) {
+    invalidateQueryCache = false;
     enableBeanCache = cache.enableBeanCache();
     enableQueryCache = cache.enableQueryCache();
     readOnly = cache.readOnly();
     this.naturalKey = naturalKey;
   }
 
+  /**
+   * Return true if this is InvalidateQueryCache. A Bean that itself isn't L2
+   * cached but invalidates query cache entries that join to it.
+   */
+  public boolean isInvalidateQueryCache() {
+    return invalidateQueryCache;
+  }
+
   /**
    * Return true if bean caching is enabled.
    */
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index a8cf20c08..0428a8893 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -138,11 +138,10 @@ public class DefaultContainer implements SpiContainer {
 
       // executor and l2 caching service setup early (used during server construction)
       SpiBackgroundExecutor executor = createBackgroundExecutor(serverConfig);
-      SpiCacheManager cacheManager = getCacheManager(online, serverConfig, executor);
 
-      InternalConfiguration c = new InternalConfiguration(clusterManager, cacheManager, executor, serverConfig, bootupClasses);
+      InternalConfiguration c = new InternalConfiguration(online, clusterManager, executor, serverConfig, bootupClasses);
 
-      DefaultServer server = new DefaultServer(c, c.cache());
+      DefaultServer server = new DefaultServer(c, c.cacheManager());
 
       // generate and run DDL if required
       // if there are any other tasks requiring action in their plugins, do them as well
@@ -165,52 +164,6 @@ public class DefaultContainer implements SpiContainer {
     }
   }
 
-  /**
-   * Create and return the CacheManager.
-   */
-  private SpiCacheManager getCacheManager(boolean online, ServerConfig serverConfig, BackgroundExecutor executor) {
-
-    if (!online || serverConfig.isDisableL2Cache()) {
-      // use local only L2 cache implementation as placeholder
-      return new DefaultServerCacheManager();
-    }
-
-    // reasonable default settings are for a cache per bean type
-    ServerCacheOptions beanOptions = new ServerCacheOptions();
-    beanOptions.setMaxSize(serverConfig.getCacheMaxSize());
-    beanOptions.setMaxIdleSecs(serverConfig.getCacheMaxIdleTime());
-    beanOptions.setMaxSecsToLive(serverConfig.getCacheMaxTimeToLive());
-
-    // reasonable default settings for the query cache per bean type
-    ServerCacheOptions queryOptions = new ServerCacheOptions();
-    queryOptions.setMaxSize(serverConfig.getQueryCacheMaxSize());
-    queryOptions.setMaxIdleSecs(serverConfig.getQueryCacheMaxIdleTime());
-    queryOptions.setMaxSecsToLive(serverConfig.getQueryCacheMaxTimeToLive());
-
-    boolean localL2Caching = false;
-    ServerCachePlugin plugin = serverConfig.getServerCachePlugin();
-    if (plugin == null) {
-      ServiceLoader<ServerCachePlugin> cacheFactories = ServiceLoader.load(ServerCachePlugin.class);
-      Iterator<ServerCachePlugin> iterator = cacheFactories.iterator();
-      if (iterator.hasNext()) {
-        // use the cacheFactory (via classpath service loader)
-        plugin = iterator.next();
-        logger.debug("using ServerCacheFactory {}", plugin.getClass());
-      } else {
-        // use the built in default l2 caching which is local cache based
-        localL2Caching = true;
-        plugin = new DefaultServerCachePlugin();
-      }
-    }
-
-    ServerCacheFactory factory = plugin.create(serverConfig, executor);
-
-    CacheManagerOptions builder = new CacheManagerOptions(clusterManager, serverConfig, localL2Caching)
-      .with(beanOptions, queryOptions)
-      .with(factory);
-    return new DefaultServerCacheManager(builder);
-  }
-
   /**
    * Get the entities, scalarTypes, Listeners etc combining the class registered
    * ones with the already created instances.
diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index 4ea1988a1..8d201d9c9 100644
--- a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -3,7 +3,10 @@ package io.ebeaninternal.server.core;
 import com.fasterxml.jackson.core.JsonFactory;
 import io.ebean.ExpressionFactory;
 import io.ebean.annotation.Platform;
+import io.ebean.cache.ServerCacheFactory;
 import io.ebean.cache.ServerCacheManager;
+import io.ebean.cache.ServerCacheOptions;
+import io.ebean.cache.ServerCachePlugin;
 import io.ebean.config.ExternalTransactionManager;
 import io.ebean.config.ProfilingConfig;
 import io.ebean.config.ServerConfig;
@@ -27,7 +30,10 @@ import io.ebeaninternal.api.SpiProfileHandler;
 import io.ebeaninternal.dbmigration.DbOffline;
 import io.ebeaninternal.server.autotune.AutoTuneService;
 import io.ebeaninternal.server.autotune.service.AutoTuneServiceFactory;
+import io.ebeaninternal.server.cache.CacheManagerOptions;
 import io.ebeaninternal.server.cache.DefaultCacheAdapter;
+import io.ebeaninternal.server.cache.DefaultServerCacheManager;
+import io.ebeaninternal.server.cache.DefaultServerCachePlugin;
 import io.ebeaninternal.server.cache.SpiCacheManager;
 import io.ebeaninternal.server.changelog.DefaultChangeLogListener;
 import io.ebeaninternal.server.changelog.DefaultChangeLogPrepare;
@@ -69,6 +75,7 @@ import io.ebeaninternal.server.transaction.ExplicitTransactionManager;
 import io.ebeaninternal.server.transaction.ExternalTransactionScopeManager;
 import io.ebeaninternal.server.transaction.JtaTransactionManager;
 import io.ebeaninternal.server.transaction.NoopProfileHandler;
+import io.ebeaninternal.server.transaction.TableModState;
 import io.ebeaninternal.server.transaction.TransactionManager;
 import io.ebeaninternal.server.transaction.TransactionManagerOptions;
 import io.ebeaninternal.server.transaction.TransactionScopeManager;
@@ -84,6 +91,7 @@ import org.slf4j.LoggerFactory;
 
 import javax.sql.DataSource;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.ServiceLoader;
@@ -96,6 +104,10 @@ public class InternalConfiguration {
 
   private static final Logger logger = LoggerFactory.getLogger(InternalConfiguration.class);
 
+  private final TableModState tableModState = new TableModState();
+
+  private final boolean online;
+
   private final ServerConfig serverConfig;
 
   private final BootupClasses bootupClasses;
@@ -124,6 +136,10 @@ public class InternalConfiguration {
 
   private final SpiCacheManager cacheManager;
 
+  private final ServerCachePlugin serverCachePlugin;
+
+  private boolean localL2Caching;
+
   private final ExpressionFactory expressionFactory;
 
   private final SpiBackgroundExecutor backgroundExecutor;
@@ -141,17 +157,16 @@ public class InternalConfiguration {
 
   private final SpiLogManager logManager;
 
-  public InternalConfiguration(ClusterManager clusterManager,
-                               SpiCacheManager cacheManager, SpiBackgroundExecutor backgroundExecutor,
+  public InternalConfiguration(boolean online, ClusterManager clusterManager, SpiBackgroundExecutor backgroundExecutor,
                                ServerConfig serverConfig, BootupClasses bootupClasses) {
 
+    this.online = online;
     this.serverConfig = serverConfig;
     this.logManager = initLogManager();
     this.docStoreFactory = initDocStoreFactory(serverConfig.service(DocStoreFactory.class));
     this.jsonFactory = serverConfig.getJsonFactory();
     this.clusterManager = clusterManager;
     this.backgroundExecutor = backgroundExecutor;
-    this.cacheManager = cacheManager;
     this.bootupClasses = bootupClasses;
 
     this.databasePlatform = serverConfig.getDatabasePlatform();
@@ -164,6 +179,9 @@ public class InternalConfiguration {
     this.deployCreateProperties = new DeployCreateProperties(typeManager);
     this.deployUtil = new DeployUtil(typeManager, serverConfig);
 
+    this.serverCachePlugin = initServerCachePlugin();
+    this.cacheManager = initCacheManager();
+
     InternalConfigXmlRead xmlRead = new InternalConfigXmlRead(serverConfig);
 
     this.dtoBeanManager = new DtoBeanManager(typeManager, xmlRead.readDtoMapping());
@@ -400,7 +418,7 @@ public class InternalConfiguration {
 
     TransactionManagerOptions options =
       new TransactionManagerOptions(notifyL2CacheInForeground, serverConfig, scopeManager, clusterManager, backgroundExecutor,
-                                    indexUpdateProcessor, beanDescriptorManager, dataSource(), profileHandler(), logManager);
+                                    indexUpdateProcessor, beanDescriptorManager, dataSource(), profileHandler(), logManager, tableModState);
 
     if (serverConfig.isExplicitTransactionBeginMode()) {
       return new ExplicitTransactionManager(options);
@@ -493,7 +511,7 @@ public class InternalConfiguration {
     return dataTimeZone;
   }
 
-  public ServerCacheManager cache() {
+  public ServerCacheManager cacheManager() {
     return new DefaultCacheAdapter(cacheManager);
   }
 
@@ -537,4 +555,54 @@ public class InternalConfiguration {
   public SpiLogManager getLogManager() {
     return logManager;
   }
+
+  private ServerCachePlugin initServerCachePlugin() {
+
+    ServerCachePlugin plugin = serverConfig.getServerCachePlugin();
+    if (plugin == null) {
+      ServiceLoader<ServerCachePlugin> cacheFactories = ServiceLoader.load(ServerCachePlugin.class);
+      Iterator<ServerCachePlugin> iterator = cacheFactories.iterator();
+      if (iterator.hasNext()) {
+        // use the cacheFactory (via classpath service loader)
+        plugin = iterator.next();
+        logger.debug("using ServerCacheFactory {}", serverCachePlugin.getClass());
+      } else {
+        // use the built in default l2 caching which is local cache based
+        localL2Caching = true;
+        plugin = new DefaultServerCachePlugin();
+      }
+    }
+    return plugin;
+  }
+
+  /**
+   * Create and return the CacheManager.
+   */
+  private SpiCacheManager initCacheManager() {
+
+    if (!online || serverConfig.isDisableL2Cache()) {
+      // use local only L2 cache implementation as placeholder
+      return new DefaultServerCacheManager();
+    }
+
+    ServerCacheFactory factory = serverCachePlugin.create(serverConfig, backgroundExecutor);
+
+    // reasonable default settings are for a cache per bean type
+    ServerCacheOptions beanOptions = new ServerCacheOptions();
+    beanOptions.setMaxSize(serverConfig.getCacheMaxSize());
+    beanOptions.setMaxIdleSecs(serverConfig.getCacheMaxIdleTime());
+    beanOptions.setMaxSecsToLive(serverConfig.getCacheMaxTimeToLive());
+
+    // reasonable default settings for the query cache per bean type
+    ServerCacheOptions queryOptions = new ServerCacheOptions();
+    queryOptions.setMaxSize(serverConfig.getQueryCacheMaxSize());
+    queryOptions.setMaxIdleSecs(serverConfig.getQueryCacheMaxIdleTime());
+    queryOptions.setMaxSecsToLive(serverConfig.getQueryCacheMaxTimeToLive());
+
+    CacheManagerOptions builder = new CacheManagerOptions(clusterManager, serverConfig, localL2Caching)
+      .with(beanOptions, queryOptions)
+      .with(factory, tableModState);
+
+    return new DefaultServerCacheManager(builder);
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index 799c5b9d2..264af7bc8 100644
--- a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -8,6 +8,7 @@ import io.ebean.Version;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.PersistenceContext;
+import io.ebean.cache.QueryCacheEntry;
 import io.ebean.common.BeanList;
 import io.ebean.common.CopyOnFirstWriteList;
 import io.ebean.event.BeanFindController;
@@ -83,6 +84,8 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
 
   private boolean inlineCountDistinct;
 
+  private Set<String> dependentTables;
+
   /**
    * Create the InternalQueryRequest.
    */
@@ -207,7 +210,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
   /**
    * Prepare the query and calculate the query plan key.
    */
-  public void prepareQuery() {
+  void prepareQuery() {
     beanDescriptor.prepareQuery(query);
     adapterPreQuery();
     this.secondaryQueries = query.convertJoins();
@@ -680,8 +683,10 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
     }
   }
 
-  public void putToQueryCache(Object queryResult) {
-    beanDescriptor.queryCachePut(cacheKey, queryResult);
+  public void putToQueryCache(Object result) {
+    // use transaction start where as query statement start would be better at READ_COMMITTED
+    long asOfTimestamp = transaction.getStartMillis();
+    beanDescriptor.queryCachePut(cacheKey, new QueryCacheEntry(result, dependentTables, asOfTimestamp));
   }
 
   /**
@@ -752,4 +757,13 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
   public boolean isInlineCountDistinct() {
     return inlineCountDistinct;
   }
+
+  public void addDependentTables(Set<String> tables) {
+    if (tables != null && !tables.isEmpty()) {
+      if (dependentTables == null) {
+        dependentTables = new LinkedHashSet<>();
+      }
+      dependentTables.addAll(tables);
+    }
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index ba0ecc52d..60b5ed482 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -11,6 +11,7 @@ import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.bean.PersistenceContext;
+import io.ebean.cache.QueryCacheEntry;
 import io.ebean.config.EncryptKey;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.IdType;
@@ -1361,8 +1362,8 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Put a query result into the query cache.
    */
-  public void queryCachePut(Object id, Object queryResult) {
-    cacheHelp.queryCachePut(id, queryResult);
+  public void queryCachePut(Object id, QueryCacheEntry entry) {
+    cacheHelp.queryCachePut(id, entry);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index 1d11da087..07f326e6c 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -4,6 +4,7 @@ import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.bean.PersistenceContext;
+import io.ebean.cache.QueryCacheEntry;
 import io.ebean.cache.ServerCache;
 import io.ebeaninternal.api.BeanCacheResult;
 import io.ebeaninternal.api.TransactionEventTable.TableIUD;
@@ -54,6 +55,7 @@ final class BeanDescriptorCacheHelp<T> {
    * Flag indicating this bean has no relationships.
    */
   private final boolean cacheSharableBeans;
+  private final boolean invalidateQueryCache;
 
   private final Class<?> beanType;
 
@@ -84,6 +86,7 @@ final class BeanDescriptorCacheHelp<T> {
     this.cacheName = beanType.getSimpleName();
     this.cacheManager = cacheManager;
     this.cacheOptions = cacheOptions;
+    this.invalidateQueryCache = cacheOptions.isInvalidateQueryCache();
     this.cacheSharableBeans = cacheSharableBeans;
     this.propertiesOneImported = propertiesOneImported;
     this.naturalKey = cacheOptions.getNaturalKey();
@@ -111,7 +114,7 @@ final class BeanDescriptorCacheHelp<T> {
    * Derive the cache notify flags.
    */
   void deriveNotifyFlags() {
-    cacheNotifyOnAll = (beanCache != null || queryCache != null);
+    cacheNotifyOnAll = (invalidateQueryCache || beanCache != null || queryCache != null);
     cacheNotifyOnDelete = !cacheNotifyOnAll && isNotifyOnDeletes();
 
     if (logger.isDebugEnabled()) {
@@ -225,14 +228,14 @@ final class BeanDescriptorCacheHelp<T> {
   /**
    * Put a query result into the query cache.
    */
-  void queryCachePut(Object id, Object queryResult) {
+  void queryCachePut(Object id, QueryCacheEntry entry) {
     if (queryCache == null) {
       throw new IllegalStateException("No query cache enabled on " + desc + ". Need explicit @Cache(enableQueryCache=true)");
     }
     if (queryLog.isDebugEnabled()) {
       queryLog.debug("   PUT {}({})", cacheName, id);
     }
-    queryCache.put(id, queryResult);
+    queryCache.put(id, entry);
   }
 
 
@@ -723,30 +726,42 @@ final class BeanDescriptorCacheHelp<T> {
    * Add appropriate cache changes to support delete by id.
    */
   void handleDelete(Object id, CacheChangeSet changeSet) {
-    if (beanCache != null) {
-      changeSet.addBeanRemove(desc, id);
+    if (invalidateQueryCache) {
+     changeSet.addInvalidate(desc);
+    } else {
+      if (beanCache != null) {
+        changeSet.addBeanRemove(desc, id);
+      }
+      cacheDeleteImported(true, null, changeSet);
     }
-    cacheDeleteImported(true, null, changeSet);
   }
 
   /**
    * Add appropriate cache changes to support delete bean.
    */
   void handleDelete(Object id, PersistRequestBean<T> deleteRequest, CacheChangeSet changeSet) {
-    queryCacheClear(changeSet);
-    if (beanCache != null) {
-      changeSet.addBeanRemove(desc, id);
+    if (invalidateQueryCache) {
+      changeSet.addInvalidate(desc);
+    } else {
+      queryCacheClear(changeSet);
+      if (beanCache != null) {
+        changeSet.addBeanRemove(desc, id);
+      }
+      cacheDeleteImported(true, deleteRequest.getEntityBean(), changeSet);
     }
-    cacheDeleteImported(true, deleteRequest.getEntityBean(), changeSet);
   }
 
   /**
    * Add appropriate cache changes to support insert.
    */
   void handleInsert(PersistRequestBean<T> insertRequest, CacheChangeSet changeSet) {
-    queryCacheClear(changeSet);
-    cacheDeleteImported(false, insertRequest.getEntityBean(), changeSet);
-    changeSet.addBeanInsert(desc.getBaseTable());
+    if (invalidateQueryCache) {
+      changeSet.addInvalidate(desc);
+    } else {
+      queryCacheClear(changeSet);
+      cacheDeleteImported(false, insertRequest.getEntityBean(), changeSet);
+      changeSet.addBeanInsert(desc.getBaseTable());
+    }
   }
 
   private void cacheDeleteImported(boolean clear, EntityBean entityBean, CacheChangeSet changeSet) {
@@ -759,28 +774,30 @@ final class BeanDescriptorCacheHelp<T> {
    * Add appropriate changes to support update.
    */
   void handleUpdate(Object id, PersistRequestBean<T> updateRequest, CacheChangeSet changeSet) {
+    if (invalidateQueryCache) {
+      changeSet.addInvalidate(desc);
 
-    queryCacheClear(changeSet);
+    } else {
+      queryCacheClear(changeSet);
+      if (beanCache == null) {
+        // query caching only
+        return;
+      }
 
-    if (beanCache == null) {
-      // query caching only
-      return;
-    }
-
-    List<BeanPropertyAssocMany<?>> manyCollections = updateRequest.getUpdatedManyCollections();
-    if (manyCollections != null) {
-      for (BeanPropertyAssocMany<?> many : manyCollections) {
-        if (!many.isElementCollection()) {
-          Object details = many.getValue(updateRequest.getEntityBean());
-          CachedManyIds entry = createManyIds(many, details);
-          if (entry != null) {
-            changeSet.addManyPut(desc, many.getName(), id, entry);
+      List<BeanPropertyAssocMany<?>> manyCollections = updateRequest.getUpdatedManyCollections();
+      if (manyCollections != null) {
+        for (BeanPropertyAssocMany<?> many : manyCollections) {
+          if (!many.isElementCollection()) {
+            Object details = many.getValue(updateRequest.getEntityBean());
+            CachedManyIds entry = createManyIds(many, details);
+            if (entry != null) {
+              changeSet.addManyPut(desc, many.getName(), id, entry);
+            }
           }
         }
       }
+      updateRequest.addBeanUpdate(changeSet);
     }
-
-    updateRequest.addBeanUpdate(changeSet);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index 199b7a90b..24eca35eb 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -440,6 +440,13 @@ public class DeployBeanDescriptor<T> {
     this.inheritInfo = inheritInfo;
   }
 
+  /**
+   * Set that this type invalidates query caches.
+   */
+  public void setInvalidateQueryCache() {
+    this.cacheOptions = CacheOptions.INVALIDATE_QUERY_CACHE;
+  }
+
   /**
    * Enable L2 bean and query caching based on Cache annotation.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
index 208b0bdf3..f28f5e303 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
@@ -7,6 +7,7 @@ import io.ebean.annotation.Draftable;
 import io.ebean.annotation.DraftableElement;
 import io.ebean.annotation.History;
 import io.ebean.annotation.Index;
+import io.ebean.annotation.InvalidateQueryCache;
 import io.ebean.annotation.ReadAudit;
 import io.ebean.annotation.UpdateMode;
 import io.ebean.annotation.View;
@@ -181,9 +182,16 @@ public class AnnotationClass extends AnnotationParser {
       descriptor.setUpdateChangesOnly(updateMode.updateChangesOnly());
     }
 
-    Cache cache = AnnotationUtil.findAnnotationRecursive(cls, Cache.class);
-    if (cache != null && !disableL2Cache) {
-      descriptor.setCache(cache);
+    if (!disableL2Cache) {
+      Cache cache = AnnotationUtil.findAnnotationRecursive(cls, Cache.class);
+      if (cache != null) {
+        descriptor.setCache(cache);
+      } else {
+        InvalidateQueryCache invalidateQueryCache = AnnotationUtil.findAnnotationRecursive(cls, InvalidateQueryCache.class);
+        if (invalidateQueryCache != null) {
+          descriptor.setInvalidateQueryCache();
+        }
+      }
     }
 
     Set<NamedQuery> namedQueries = AnnotationUtil.findAnnotationsRecursive(cls, NamedQuery.class);
diff --git a/src/main/java/io/ebeaninternal/server/query/CQuery.java b/src/main/java/io/ebeaninternal/server/query/CQuery.java
index 9a40afaaf..cdc0a7138 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQuery.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQuery.java
@@ -38,6 +38,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
+import java.util.Set;
 
 /**
  * An object that represents a SqlSelect statement.
@@ -811,4 +812,8 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
   PreparedStatement getPstmt() {
     return pstmt;
   }
+
+  public Set<String> getDependentTables() {
+    return queryPlan.getDependentTables();
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
index a38a9e61a..05e64658a 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
@@ -25,6 +25,8 @@ import org.slf4j.LoggerFactory;
 import javax.persistence.PersistenceException;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -111,6 +113,15 @@ public class CQueryEngine {
       if (request.isLogSummary()) {
         request.getTransaction().logSummary(rcQuery.getSummary());
       }
+      if (request.isQueryCachePut() && !list.isEmpty()) {
+        request.addDependentTables(rcQuery.getDependentTables());
+
+        list = Collections.unmodifiableList(list);
+        request.putToQueryCache(list);
+        if (Boolean.FALSE.equals(request.getQuery().isReadOnly())) {
+          list = new ArrayList<>(list);
+        }
+      }
       return list;
 
     } catch (SQLException e) {
@@ -173,6 +184,11 @@ public class CQueryEngine {
         request.getTransaction().end();
       }
 
+      if (request.isQueryCachePut()) {
+        request.addDependentTables(rcQuery.getDependentTables());
+        request.putToQueryCache(count);
+      }
+
       return count;
 
     } catch (SQLException e) {
@@ -385,6 +401,9 @@ public class CQueryEngine {
       }
 
       request.executeSecondaryQueries(false);
+      if (request.isQueryCachePut()) {
+        request.addDependentTables(cquery.getDependentTables());
+      }
 
       return beanCollection;
 
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java b/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
index b5d2d05b1..3b8b8ef01 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
@@ -17,6 +17,7 @@ import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Base compiled query request for single attribute queries.
@@ -188,4 +189,8 @@ class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent {
       .profileStream()
       .addQueryEvent(query.profileEventId(), profileOffset, desc.getProfileId(), rowCount, query.getProfileId());
   }
+
+  Set<String> getDependentTables() {
+    return queryPlan.getDependentTables();
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
index a0d9a46b1..7b4b27e18 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
@@ -24,6 +24,8 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.Collections;
+import java.util.Set;
 
 /**
  * Represents a query for a given SQL statement.
@@ -88,6 +90,8 @@ public class CQueryPlan {
    */
   private volatile String auditQueryHash;
 
+  private final Set<String> dependentTables;
+
   /**
    * Create a query plan based on a OrmQueryRequest.
    */
@@ -110,6 +114,7 @@ public class CQueryPlan {
     this.logWhereSql = logWhereSql;
     this.encryptedProps = sqlTree.getEncryptedProps();
     this.stats = new CQueryPlanStats(this, server.isCollectQueryOrigins());
+    this.dependentTables = sqlTree.dependentTables();
   }
 
   /**
@@ -134,6 +139,7 @@ public class CQueryPlan {
     this.logWhereSql = logWhereSql;
     this.encryptedProps = sqlTree.getEncryptedProps();
     this.stats = new CQueryPlanStats(this, server.isCollectQueryOrigins());
+    this.dependentTables = (rawSql) ? Collections.emptySet() : sqlTree.dependentTables();
   }
 
   private String location() {
@@ -154,6 +160,10 @@ public class CQueryPlan {
     return beanType;
   }
 
+  public Set<String> getDependentTables() {
+    return dependentTables;
+  }
+
   public ProfileLocation getProfileLocation() {
     return profileLocation;
   }
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java b/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java
index 5ddfe7b02..e0f9c1dbb 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java
@@ -12,6 +12,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.Set;
 
 /**
  * Executes the select row count query.
@@ -154,4 +155,8 @@ class CQueryRowCount implements SpiProfileTransactionEvent {
       .profileStream()
       .addQueryEvent(query.profileEventId(), profileOffset, desc.getProfileId(), rowCount, query.getProfileId());
   }
+
+  Set<String> getDependentTables() {
+    return queryPlan.getDependentTables();
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java
index c6c042c92..d72a2f688 100644
--- a/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java
@@ -88,41 +88,20 @@ public class DefaultOrmQueryEngine implements OrmQueryEngine {
   public <T> int findCount(OrmQueryRequest<T> request) {
 
     flushJdbcBatchOnQuery(request);
-    int result = queryEngine.findCount(request);
-    if (request.getQuery().getUseQueryCache().isPut()) {
-      request.putToQueryCache(result);
-    }
-    return result;
+    return queryEngine.findCount(request);
   }
 
   @Override
   public <A> List<A> findIds(OrmQueryRequest<?> request) {
 
     flushJdbcBatchOnQuery(request);
-    List<A> result = queryEngine.findIds(request);
-    if (request.getQuery().getUseQueryCache().isPut()) {
-      result = Collections.unmodifiableList(result);
-      request.putToQueryCache(result);
-      if (Boolean.FALSE.equals(request.getQuery().isReadOnly())) {
-        result = new ArrayList<>(result);
-      }
-    }
-    return result;
+    return queryEngine.findIds(request);
   }
 
   @Override
   public <A> List<A> findSingleAttributeList(OrmQueryRequest<?> request) {
     flushJdbcBatchOnQuery(request);
-    List<A> result = queryEngine.findSingleAttributeList(request);
-    if (!result.isEmpty() && request.getQuery().getUseQueryCache().isPut()) {
-      // load the query result into the query cache
-      result = Collections.unmodifiableList(result);
-      request.putToQueryCache(result);
-      if (Boolean.FALSE.equals(request.getQuery().isReadOnly())) {
-        result = new ArrayList<>(result);
-      }
-    }
-    return result;
+    return queryEngine.findSingleAttributeList(request);
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTree.java b/src/main/java/io/ebeaninternal/server/query/SqlTree.java
index b6ee3c980..91e71fb0d 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTree.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTree.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.query;
 import io.ebeaninternal.api.SpiQuery;
 
 import java.util.ArrayList;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -163,4 +164,13 @@ class SqlTree {
   boolean isSingleProperty() {
     return rootNode.isSingleProperty();
   }
+
+  /**
+   * Return the tables that are joined in this query.
+   */
+  Set<String> dependentTables() {
+    Set<String> tables = new LinkedHashSet<>();
+    rootNode.dependentTables(tables);
+    return tables;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java
index c503581d8..39e0bff28 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java
@@ -9,6 +9,7 @@ import io.ebeaninternal.server.type.ScalarType;
 
 import java.sql.SQLException;
 import java.util.List;
+import java.util.Set;
 
 interface SqlTreeNode {
 
@@ -87,4 +88,9 @@ interface SqlTreeNode {
    * Return true if the query is known to only have a single property selected.
    */
   boolean isSingleProperty();
+
+  /**
+   * Add dependent tables to the given set.
+   */
+  void dependentTables(Set<String> tables);
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
index 339b08a95..9bafd1317 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
@@ -21,6 +21,7 @@ import java.sql.Timestamp;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * Normal bean included in the query.
@@ -578,6 +579,14 @@ class SqlTreeNodeBean implements SqlTreeNode {
     }
   }
 
+  @Override
+  public void dependentTables(Set<String> tables) {
+    tables.add(nodeBeanProp.target().getBaseTable(temporalMode));
+    for (SqlTreeNode child : children) {
+      child.dependentTables(tables);
+    }
+  }
+
   /**
    * Join to base table for this node. This includes a join to the intersection
    * table if this is a ManyToMany node.
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
index b517965e4..6dfd1fd7b 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
@@ -11,6 +11,7 @@ import io.ebeaninternal.server.type.ScalarType;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 /**
  * The purpose is to add an extra join to the query.
@@ -100,6 +101,16 @@ class SqlTreeNodeExtraJoin implements SqlTreeNode {
     children.add(child);
   }
 
+  @Override
+  public void dependentTables(Set<String> tables) {
+    tables.add(assocBeanProperty.target().getBaseTable(SpiQuery.TemporalMode.CURRENT));
+    if (children != null) {
+      for (SqlTreeNode child : children) {
+        child.dependentTables(tables);
+      }
+    }
+  }
+
   @Override
   public void appendFrom(DbSqlContext ctx, SqlJoinType joinType) {
 
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
index edeff9fce..ec8f6aa47 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
@@ -7,6 +7,7 @@ import io.ebeaninternal.server.deploy.DbSqlContext;
 
 import java.sql.SQLException;
 import java.util.List;
+import java.util.Set;
 
 final class SqlTreeNodeManyRoot extends SqlTreeNodeBean {
 
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java
index c31ea619c..a5cd0e232 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java
@@ -10,6 +10,7 @@ import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.type.ScalarType;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * Join to Many (or child of a many) to support where clause predicates on many properties.
@@ -109,6 +110,11 @@ class SqlTreeNodeManyWhereJoin implements SqlTreeNode {
     }
   }
 
+  @Override
+  public void dependentTables(Set<String> tables) {
+    tables.add(nodeBeanProp.target().getBaseTable(SpiQuery.TemporalMode.CURRENT));
+  }
+
   @Override
   public void buildRawSqlSelectChain(List<String> selectChain) {
     // nothing to add
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java
index 74be7c415..2a69a0c16 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java
@@ -5,6 +5,7 @@ import io.ebeaninternal.server.deploy.DbSqlContext;
 import io.ebeaninternal.server.deploy.TableJoin;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * Represents the root node of the Sql Tree.
@@ -77,4 +78,10 @@ final class SqlTreeNodeRoot extends SqlTreeNodeBean {
     return joinType;
   }
 
+  @Override
+  public void dependentTables(Set<String> tables) {
+    for (SqlTreeNode child : children) {
+      child.dependentTables(tables);
+    }
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
index 066a7504e..1ccc44dbd 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
@@ -67,6 +67,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   private Map<String, Object> userObjects;
 
   private long startNanos;
+  private long startMillis;
 
   /**
    * Create without a tenantId.
@@ -79,6 +80,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
     this.connection = connection;
     this.persistenceContext = new DefaultPersistenceContext();
     this.startNanos = System.nanoTime();
+    this.startMillis = manager.clockNowEpoch();
   }
 
   /**
@@ -89,6 +91,12 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
     this.tenantId = tenantId;
   }
 
+  @Override
+  public long getStartMillis() {
+    // not used on read only transaction
+    return startMillis;
+  }
+
   @Override
   public void setLabel(String label) {
     // do nothing
diff --git a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index 4f6ec5bd1..da8e53781 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -187,6 +187,7 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   protected ProfileLocation profileLocation;
 
   protected final long startNanos;
+  private final long startMillis;
 
   /**
    * Create a new JdbcTransaction.
@@ -203,6 +204,7 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
       this.startNanos = System.nanoTime();
 
       if (manager == null) {
+        this.startMillis = System.currentTimeMillis();
         this.logSql = false;
         this.logSummary = false;
         this.skipCacheAfterWrite = true;
@@ -210,6 +212,7 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
         this.batchOnCascadeMode = PersistBatch.NONE;
         this.onQueryOnly = OnQueryOnly.ROLLBACK;
       } else {
+        this.startMillis = manager.clockNowEpoch();
         this.logSql = manager.isLogSql();
         this.logSummary = manager.isLogSummary();
         this.skipCacheAfterWrite = manager.isSkipCacheAfterWrite();
@@ -235,6 +238,11 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
     return label;
   }
 
+  @Override
+  public long getStartMillis() {
+    return startMillis;
+  }
+
   @Override
   public long profileOffset() {
     return (profileStream == null) ? 0 : profileStream.offset();
@@ -853,7 +861,7 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   public TransactionEvent getEvent() {
     queryOnly = false;
     if (event == null) {
-      event = new TransactionEvent();
+      event = new TransactionEvent(startMillis);
     }
     return event;
   }
@@ -1050,7 +1058,7 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
       // the event has been sent to the transaction manager
       // for postCommit processing (l2 cache updates etc)
       // start a new transaction event
-      event = new TransactionEvent();
+      event = new TransactionEvent(startMillis);
 
     } catch (Exception e) {
       doRollback(e);
diff --git a/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
index 62ace0ede..bd2b20c35 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
@@ -47,6 +47,12 @@ class NoTransaction implements SpiTransaction {
 
   }
 
+  @Override
+  public long getStartMillis() {
+    // not used
+    return System.currentTimeMillis();
+  }
+
   @Override
   public boolean isActive() {
     // always false
diff --git a/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java b/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
index ac3a57560..b715d2ee3 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
@@ -14,6 +14,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * Performs post commit processing using a background thread.
@@ -88,10 +89,10 @@ public final class PostCommitProcessing {
     processTableEvents(event.getEventTables());
     if (manager.notifyL2CacheInForeground) {
       // process l2 cache changes in foreground
-      processCacheChanges(event.buildCacheChanges(manager.viewInvalidation));
+      processCacheChanges(event.buildCacheChanges());
     } else {
       // collect l2 cache changes for delayed background processing
-      cacheChanges = event.buildCacheChanges(manager.viewInvalidation);
+      cacheChanges = event.buildCacheChanges();
     }
   }
 
@@ -165,7 +166,12 @@ public final class PostCommitProcessing {
    */
   private void processCacheChanges(CacheChangeSet cacheChanges) {
     if (cacheChanges != null) {
-      manager.processViewInvalidation(cacheChanges.apply());
+      Set<String> touched = cacheChanges.touchedTables();
+      if (touched != null && !touched.isEmpty()) {
+        manager.processTouchedTables(touched, cacheChanges.modificationTimestamp());
+        // TODO: Propagate touched tables to other cluster members
+      }
+      cacheChanges.apply();
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TableModState.java b/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
new file mode 100644
index 000000000..d2aa4143a
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
@@ -0,0 +1,51 @@
+package io.ebeaninternal.server.transaction;
+
+import io.ebean.cache.QueryCacheEntry;
+import io.ebean.cache.QueryCacheEntryValidate;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Holds timestamp of last modification per table.
+ * <p>
+ * This information is used to validate entries in the L2 query caches.
+ * </p>
+ */
+public class TableModState implements QueryCacheEntryValidate {
+
+  private Map<String,Long> tableModStamp = new ConcurrentHashMap<>();
+
+  /**
+   * Set the modified timestamp on the tables that have been touched.
+   */
+  public void touch(Set<String> touchedTables, long modTimestamp) {
+
+    for (String tableName : touchedTables) {
+      tableModStamp.put(tableName, modTimestamp);
+    }
+  }
+
+  /**
+   * Return true if all the tables are valid based on timestamp comparison.
+   */
+  public boolean isValid(Set<String> tables, long sinceTimestamp) {
+    for (String tableName : tables) {
+      Long modTime = tableModStamp.get(tableName);
+      if (modTime != null && modTime > sinceTimestamp ) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  @Override
+  public boolean isValid(QueryCacheEntry entry) {
+    Set<String> dependentTables = entry.getDependentTables();
+    if (dependentTables != null && !dependentTables.isEmpty()) {
+      return isValid(dependentTables, entry.getTimestamp());
+    }
+    return true;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index 0e9c91d62..0ff2894d6 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -46,7 +46,7 @@ import java.util.Set;
 /**
  * Manages transactions.
  * <p>
- * Keeps the Cache and Cluster in synch when transactions are committed.
+ * Keeps the Cache and Cluster in sync when transactions are committed.
  * </p>
  */
 public class TransactionManager implements SpiTransactionManager {
@@ -136,6 +136,8 @@ public class TransactionManager implements SpiTransactionManager {
   private final TimedMetricMap txnNamed;
   private final TransactionScopeManager scopeManager;
 
+  private final TableModState tableModState;
+
   /**
    * Create the TransactionManager
    */
@@ -157,6 +159,7 @@ public class TransactionManager implements SpiTransactionManager {
     this.clusterManager = options.clusterManager;
     this.serverName = options.config.getName();
     this.scopeManager = options.scopeManager;
+    this.tableModState = options.tableModState;
     this.backgroundExecutor = options.backgroundExecutor;
     this.dataSourceSupplier = options.dataSourceSupplier;
     this.docStoreActive = options.config.getDocStoreConfig().isActive();
@@ -178,6 +181,13 @@ public class TransactionManager implements SpiTransactionManager {
     scopeManager.register(this);
   }
 
+  /**
+   * Return the NOW timestamp in epoch millis.
+   */
+  public long clockNowEpoch() {
+    return System.currentTimeMillis(); // TODO: Review when we supply a Clock via ServerConfig.
+  }
+
   /**
    * Create a new scoped transaction.
    */
@@ -434,7 +444,7 @@ public class TransactionManager implements SpiTransactionManager {
 
   private void externalModificationEvent(TransactionEventTable tableEvents) {
 
-    TransactionEvent event = new TransactionEvent();
+    TransactionEvent event = new TransactionEvent(clockNowEpoch());
     event.add(tableEvents);
 
     PostCommitProcessing postCommit = new PostCommitProcessing(clusterManager, this, event);
@@ -495,9 +505,10 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Invalidate the query caches for entities based on views.
    */
-  public void processViewInvalidation(Set<String> viewInvalidation) {
-    if (!viewInvalidation.isEmpty()) {
-      beanDescriptorManager.processViewInvalidation(viewInvalidation);
+  public void processTouchedTables(Set<String> touchedTables, long modTimestamp) {
+    tableModState.touch(touchedTables, modTimestamp);
+    if (viewInvalidation) {
+      beanDescriptorManager.processViewInvalidation(touchedTables);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java
index fe8b8d217..16f5dafe9 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java
@@ -24,10 +24,13 @@ public class TransactionManagerOptions {
   final SpiProfileHandler profileHandler;
   final TransactionScopeManager scopeManager;
   final SpiLogManager logManager;
+  final TableModState tableModState;
+
 
   public TransactionManagerOptions(boolean notifyL2CacheInForeground, ServerConfig config, TransactionScopeManager scopeManager, ClusterManager clusterManager,
                                    BackgroundExecutor backgroundExecutor, DocStoreUpdateProcessor docStoreUpdateProcessor,
-                                   BeanDescriptorManager descMgr, DataSourceSupplier dataSourceSupplier, SpiProfileHandler profileHandler, SpiLogManager logManager) {
+                                   BeanDescriptorManager descMgr, DataSourceSupplier dataSourceSupplier, SpiProfileHandler profileHandler,
+                                   SpiLogManager logManager, TableModState tableModState) {
 
     this.notifyL2CacheInForeground = notifyL2CacheInForeground;
     this.config = config;
@@ -39,6 +42,7 @@ public class TransactionManagerOptions {
     this.dataSourceSupplier = dataSourceSupplier;
     this.profileHandler = profileHandler;
     this.logManager = logManager;
+    this.tableModState = tableModState;
   }
 
 }
diff --git a/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java b/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java
index 3094c9ad5..046ae15d6 100644
--- a/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java
+++ b/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java
@@ -3,6 +3,8 @@ package io.ebeaninternal.server.cache;
 import io.ebean.cache.ServerCacheFactory;
 import io.ebean.cache.ServerCacheOptions;
 import io.ebean.cache.ServerCacheType;
+import io.ebean.config.ServerConfig;
+import io.ebeaninternal.server.transaction.TableModState;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
 import org.junit.Test;
@@ -17,10 +19,17 @@ public class DefaultCacheHolderTest {
   private final ServerCacheFactory cacheFactory = new DefaultServerCacheFactory();
   private final ServerCacheOptions defaultOptions = new ServerCacheOptions();
 
-  @Test
-  public void getCache_normal() throws Exception {
+  private CacheManagerOptions options() {
+    return new CacheManagerOptions(null, new ServerConfig(), true)
+      .with(defaultOptions, defaultOptions)
+      .with(cacheFactory, new TableModState());
+  }
 
-    DefaultCacheHolder holder = new DefaultCacheHolder(cacheFactory, defaultOptions, defaultOptions, null);
+
+  @Test
+  public void getCache_normal() {
+
+    DefaultCacheHolder holder = new DefaultCacheHolder(options());
 
     DefaultServerCache cache = cache(holder, Customer.class, "customer");
     assertThat(cache.getName()).isEqualTo("customer_B");
@@ -40,7 +49,9 @@ public class DefaultCacheHolderTest {
   @Test
   public void getCache_multiTenant() throws Exception {
 
-    DefaultCacheHolder holder = new DefaultCacheHolder(cacheFactory, defaultOptions, defaultOptions, tenantId::get);
+    CacheManagerOptions builder = options().with(tenantId::get);
+
+    DefaultCacheHolder holder = new DefaultCacheHolder(builder);
 
     tenantId.set("ten_1");
     DefaultServerCache cache = cache(holder, Customer.class, "customer");
@@ -48,26 +59,26 @@ public class DefaultCacheHolderTest {
 
     cache.put("1", "value-for-tenant1");
     cache.put("2", "an other value-for-tenant1");
-    
+
     assertThat(cache.size()).isEqualTo(2);
-    
+
     tenantId.set("ten_2");
 
     cache.put("1", "value-for-tenant2");
     cache.put("2", "an other value-for-tenant2");
-    
+
     assertThat(cache.size()).isEqualTo(4);
-        
+
     assertThat(cache.get("1")).isEqualTo("value-for-tenant2");
     assertThat(cache.get("2")).isEqualTo("an other value-for-tenant2");
-    
-    
+
+
     tenantId.set("ten_1");
-    
+
     assertThat(cache.get("1")).isEqualTo("value-for-tenant1");
     assertThat(cache.get("2")).isEqualTo("an other value-for-tenant1");
-    
-    Exception exInThread[] = new Exception[1]; 
+
+    Exception exInThread[] = new Exception[1];
     Thread t = new Thread() {
       @Override
       public void run() {
@@ -77,29 +88,29 @@ public class DefaultCacheHolderTest {
 
           cache.put("1", "value-for-tenant2");
           cache.put("2", "an other value-for-tenant2");
-          
+
           tenantId.set(null);
-          
+
           cache.clear();
         } catch (Exception e) {
           exInThread[0] = e;
         }
       };
     };
-    
+
     // do some async work
     t.start();
     t.join();
-    if (exInThread[0] != null) { 
+    if (exInThread[0] != null) {
       throw exInThread[0];
     }
     assertThat(cache.size()).isEqualTo(0);
   }
 
-
   @Test
-  public void clearAll() throws Exception {
-    DefaultCacheHolder holder = new DefaultCacheHolder(cacheFactory, defaultOptions, defaultOptions, null);
+  public void clearAll() {
+
+    DefaultCacheHolder holder = new DefaultCacheHolder(options());
     DefaultServerCache cache = cache(holder, Customer.class, "customer");
     cache.put("foo", "foo");
     assertThat(cache.size()).isEqualTo(1);
@@ -109,8 +120,11 @@ public class DefaultCacheHolderTest {
   }
 
   @Test
-  public void clearAll_multiTenant() throws Exception {
-    DefaultCacheHolder holder = new DefaultCacheHolder(cacheFactory, defaultOptions, defaultOptions, tenantId::get);
+  public void clearAll_multiTenant() {
+
+    CacheManagerOptions options = options().with(tenantId::get);
+
+    DefaultCacheHolder holder = new DefaultCacheHolder(options);
     DefaultServerCache cache = cache(holder, Customer.class, "customer");
     cache.put("foo", "foo");
     assertThat(cache.size()).isEqualTo(1);
@@ -118,5 +132,5 @@ public class DefaultCacheHolderTest {
     holder.clearAll();
     assertThat(cache.size()).isEqualTo(0);
   }
- 
+
 }
diff --git a/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java b/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java
index beefe1f47..6cbc82c8f 100644
--- a/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java
+++ b/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.cache;
 
 import io.ebean.cache.ServerCacheOptions;
 import io.ebean.cache.ServerCacheType;
+import io.ebean.config.ServerConfig;
 import org.tests.model.basic.Article;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.Product;
@@ -19,7 +20,10 @@ public class DefaultCacheHolder_getCacheOptions_Test {
     defaultOptions.setMaxSize(10000);
     defaultOptions.setMaxSecsToLive(120);
 
-    this.cacheHolder = new DefaultCacheHolder(null, defaultOptions, defaultOptions, null);
+    CacheManagerOptions builder = new CacheManagerOptions(null, new ServerConfig(), true)
+      .with(defaultOptions, defaultOptions);
+
+    this.cacheHolder = new DefaultCacheHolder(builder);
   }
 
   @Test
diff --git a/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java b/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java
new file mode 100644
index 000000000..bb03cce18
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java
@@ -0,0 +1,52 @@
+package io.ebeaninternal.server.cache;
+
+import io.ebean.cache.ServerCacheConfig;
+import io.ebean.cache.ServerCacheOptions;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class DefaultServerCacheConfigTest {
+
+
+  private DefaultServerCacheConfig create(int maxSize, int maxIdleSecs, int maxSecsToLive, int trimFreq) {
+    ServerCacheOptions options = new ServerCacheOptions();
+    options.setMaxSize(maxSize);
+    options.setMaxIdleSecs(maxIdleSecs);
+    options.setMaxSecsToLive(maxSecsToLive);
+    options.setTrimFrequency(trimFreq);
+
+    return new DefaultServerCacheConfig(new ServerCacheConfig(null, null, options, null, null));
+  }
+
+  @Test
+  public void trimFreq_halfIdle() {
+
+    assertEquals(create(10000,10,20, 0).determineTrimFrequency(), 4);
+  }
+
+
+  @Test
+  public void trimFreq_halfIdle_withRounding() {
+
+    assertEquals(create(10000,11,20, 0).determineTrimFrequency(), 4);
+  }
+
+  @Test
+  public void trimFreq_halfTTL() {
+
+    assertEquals(create(10000,0,20, 0).determineTrimFrequency(), 9);
+  }
+
+  @Test
+  public void trimFreq_halfTTL_withRounding() {
+
+    assertEquals(create(10000,0,21, 0).determineTrimFrequency(), 9);
+  }
+
+  @Test
+  public void trimFreq_explicit() {
+
+    assertEquals(create(10000,10,20, 42).determineTrimFrequency(), 42);
+  }
+}
diff --git a/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java b/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java
index 00ff68631..ead5158ff 100644
--- a/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java
+++ b/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java
@@ -1,6 +1,8 @@
 package io.ebeaninternal.server.cache;
 
+import io.ebean.cache.ServerCacheConfig;
 import io.ebean.cache.ServerCacheOptions;
+import io.ebean.cache.ServerCacheType;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -15,11 +17,13 @@ public class DefaultServerCacheTest {
     cacheOptions.setMaxSecsToLive(600);
     cacheOptions.setTrimFrequency(60);
 
-    return new DefaultServerCache("foo", null, cacheOptions);
+    ServerCacheConfig con = new ServerCacheConfig(ServerCacheType.BEAN, "foo", cacheOptions, null, null);
+    DefaultServerCacheConfig config = new DefaultServerCacheConfig(con);
+    return new DefaultServerCache(config);
   }
 
   @Test
-  public void testGetHitRatio() throws Exception {
+  public void testGetHitRatio() {
 
     DefaultServerCache cache = createCache();
     assertEquals(0, cache.getHitRatio());
@@ -34,7 +38,7 @@ public class DefaultServerCacheTest {
   }
 
   @Test
-  public void testSize() throws Exception {
+  public void testSize() {
 
     DefaultServerCache cache = createCache();
     assertEquals(0, cache.size());
@@ -50,39 +54,5 @@ public class DefaultServerCacheTest {
     assertEquals(0, cache.size());
   }
 
-  @Test
-  public void trimFreq_halfIdle() throws Exception {
-
-    DefaultServerCache cache = new DefaultServerCache("", null, null, 10000, 10, 20, 0);
-    assertEquals(cache.trimFrequency, 4);
-  }
-
-  @Test
-  public void trimFreq_halfIdle_withRounding() throws Exception {
-
-    DefaultServerCache cache = new DefaultServerCache("", null, null, 10000, 11, 20, 0);
-    assertEquals(cache.trimFrequency, 4);
-  }
-
-  @Test
-  public void trimFreq_halfTTL() throws Exception {
-
-    DefaultServerCache cache = new DefaultServerCache("", null, null, 10000, 0, 20, 0);
-    assertEquals(cache.trimFrequency, 9);
-  }
-
-  @Test
-  public void trimFreq_halfTTL_withRounding() throws Exception {
-
-    DefaultServerCache cache = new DefaultServerCache("", null, null, 10000, 0, 21, 0);
-    assertEquals(cache.trimFrequency, 9);
-  }
-
-  @Test
-  public void trimFreq_explicit() throws Exception {
-
-    DefaultServerCache cache = new DefaultServerCache("", null, null, 10000, 10, 20, 42);
-    assertEquals(cache.trimFrequency, 42);
-  }
 
 }
diff --git a/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java b/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java
index 4ba1d82a4..a2d630c98 100644
--- a/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java
+++ b/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java
@@ -1,7 +1,9 @@
 package io.ebeaninternal.server.cache;
 
+import io.ebean.cache.ServerCacheConfig;
 import io.ebean.cache.ServerCacheOptions;
 import io.ebean.cache.ServerCacheStatistics;
+import io.ebean.cache.ServerCacheType;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -19,7 +21,8 @@ public class DefaultServerCache_RunEvictionTest {
     cacheOptions.setMaxSecsToLive(2);
     cacheOptions.setTrimFrequency(1);
 
-    return new DefaultServerCache("foo", null, cacheOptions);
+    ServerCacheConfig con = new ServerCacheConfig(ServerCacheType.BEAN, "foo", cacheOptions, null, null);
+    return new DefaultServerCache(new DefaultServerCacheConfig(con));
   }
 
   private final DefaultServerCache cache;
diff --git a/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java b/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java
new file mode 100644
index 000000000..5abcb1820
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java
@@ -0,0 +1,44 @@
+package io.ebeaninternal.server.transaction;
+
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.junit.Assert.*;
+
+public class TableModStateTest {
+
+  private TableModState tableModState = new TableModState();
+
+  @Test
+  public void isValid() {
+
+    long now = System.currentTimeMillis();
+
+    tableModState.touch(setOf("one", "two", "three"), now);
+
+    // empty
+    assertTrue(tableModState.isValid(Collections.emptySet(), 12L));
+
+    // no entry
+    assertTrue(tableModState.isValid(setOf("noEntry"), 12L));
+
+    // later timestamp
+    assertTrue(tableModState.isValid(setOf("one"), now + 1));
+    assertTrue(tableModState.isValid(setOf("one", "two", "noEntry"), now + 1));
+
+    // invalid
+    assertFalse(tableModState.isValid(setOf("one"), now - 1));
+    assertFalse(tableModState.isValid(setOf("one", "two"), now - 1));
+    assertFalse(tableModState.isValid(setOf("three", "two"), now - 1));
+
+  }
+
+  private Set<String> setOf(String... tables) {
+    Set<String> touched = new HashSet<>();
+    Collections.addAll(touched, tables);
+    return touched;
+  }
+}
diff --git a/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java b/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java
new file mode 100644
index 000000000..f578fdfdf
--- /dev/null
+++ b/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java
@@ -0,0 +1,59 @@
+package org.tests.cache;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.cache.ServerCache;
+import org.junit.Test;
+import org.tests.model.basic.Address;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestQueryCacheTableDependency extends BaseTestCase {
+
+  @Test
+  public void testFindCountOnDependent() {
+
+    ResetBasicData.reset();
+
+    ServerCache customerCache = Ebean.getServerCacheManager().getQueryCache(Customer.class);
+    customerCache.clear();
+
+    List<Address> addrs = Ebean.find(Address.class)
+      .where().eq("line2", "St Lukes")
+      .findList();
+
+    int custs = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true)
+      .where().eq("billingAddress.line2", "St Lukes")
+      .findCount();
+
+    assertThat(custs).isEqualTo(3);
+
+    custs = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true)
+      .where().eq("billingAddress.line2", "St Lukes")
+      .findCount();
+
+    assertThat(custs).isEqualTo(3);
+
+    Address a1 = addrs.get(0);
+    a1.setLine2("St Lucky");
+    Ebean.save(a1);
+
+    custs = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true)
+      .where().eq("billingAddress.line2", "St Lukes")
+      .findCount();
+
+    assertThat(custs).isEqualTo(2); // cache says 3
+
+
+    custs = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true)
+      .where().eq("billingAddress.line2", "St Lucky")
+      .findCount();
+
+    assertThat(custs).isEqualTo(1);
+
+  }
+}
diff --git a/src/test/java/org/tests/model/basic/Address.java b/src/test/java/org/tests/model/basic/Address.java
index 83d1b5c18..a11d38a0d 100644
--- a/src/test/java/org/tests/model/basic/Address.java
+++ b/src/test/java/org/tests/model/basic/Address.java
@@ -1,5 +1,6 @@
 package org.tests.model.basic;
 
+import io.ebean.annotation.InvalidateQueryCache;
 import org.tests.model.basic.metaannotation.SizeMedium;
 
 import javax.persistence.Column;
@@ -14,6 +15,11 @@ import java.sql.Timestamp;
 /**
  * Address entity bean.
  */
+// Address is not L2 cached directly but it is joined to queries that are cached
+// What InvalidateQueryCache means is that we propagate a table modification event
+// when address is changed ... and cached queries that join to address will be
+// invalidated accordingly.
+@InvalidateQueryCache
 @Entity
 @Table(name = "o_address")
 public class Address {

From f86f1b2647e6a22f3262ef6b3e795967289fee7e Mon Sep 17 00:00:00 2001
From: tobias- <tobias@olsson.be>
Date: Fri, 15 Jun 2018 10:34:11 +0200
Subject: [PATCH 0329/1036] Replaceable clock (#1428)

ENH: Use java.time.Clock for @WhenModified and @WhenCreated and allow it to be Replaceable for testing
---
 .../java/io/ebean/config/ServerConfig.java    | 20 +++++++
 .../server/core/PersistRequestBean.java       |  2 +-
 .../java/io/ebean/ExtendedServerTest.java     | 53 +++++++++++++++++++
 3 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index bfb0b3999..0d0bbd70e 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -33,6 +33,7 @@ import io.ebean.util.StringHelper;
 import org.avaje.datasource.DataSourceConfig;
 
 import javax.sql.DataSource;
+import java.time.Clock;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -362,6 +363,11 @@ public class ServerConfig {
    */
   private String uuidStateFile = "ebean-uuid.state";
 
+  /**
+   * The clock used for setting the timestamps (e.g. @UpdatedTimestamp) on objects.
+   */
+  private Clock clock = Clock.systemUTC();
+
   private List<IdGenerator> idGenerators = new ArrayList<>();
   private List<BeanFindController> findControllers = new ArrayList<>();
   private List<BeanPersistController> persistControllers = new ArrayList<>();
@@ -507,6 +513,20 @@ public class ServerConfig {
 
   }
 
+  /**
+   * Get the clock used for setting the timestamps (e.g. @UpdatedTimestamp) on objects.
+   */
+  public Clock getClock() {
+    return clock;
+  }
+
+  /**
+   * Set the clock used for setting the timestamps (e.g. @UpdatedTimestamp) on objects.
+   */
+  public void setClock(final Clock clock) {
+    this.clock = clock;
+  }
+
   /**
    * Return the slow query time in millis.
    */
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index 20c6e04b7..6fd15caf0 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -1275,7 +1275,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    */
   public long now() {
     if (now == 0) {
-      now = System.currentTimeMillis();
+      now = ebeanServer.getServerConfig().getClock().millis();
     }
     return now;
   }
diff --git a/src/test/java/io/ebean/ExtendedServerTest.java b/src/test/java/io/ebean/ExtendedServerTest.java
index aef467e69..ec76ee80d 100644
--- a/src/test/java/io/ebean/ExtendedServerTest.java
+++ b/src/test/java/io/ebean/ExtendedServerTest.java
@@ -1,15 +1,27 @@
 package io.ebean;
 
+import io.ebeaninternal.api.SpiEbeanServer;
+import org.junit.After;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
 
+import java.time.Clock;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class ExtendedServerTest extends BaseTestCase {
 
+  @After
+  public void cleanup() {
+    ((SpiEbeanServer) Ebean.getDefaultServer())
+      .getServerConfig()
+      .setClock(Clock.systemUTC());
+  }
+
   @Test
   public void findList() {
 
@@ -38,4 +50,45 @@ public class ExtendedServerTest extends BaseTestCase {
     }
   }
 
+  @Test
+  public void mockClock() {
+    SpiEbeanServer server = (SpiEbeanServer) Ebean.getDefaultServer();
+    final Instant snapshot = Instant.now();
+    Instant backedSnapshot = snapshot.minus(1, ChronoUnit.DAYS);
+    Clock snapshotClock = Clock.fixed(backedSnapshot, Clock.systemUTC().getZone());
+    server.getServerConfig().setClock(snapshotClock);
+
+    ResetBasicData.reset();
+
+    int count = server
+      .find(Customer.class)
+      .where()
+      .gt("cretime", snapshot)
+      .findCount();
+    assertThat(count).isEqualTo(0);
+
+    int count2 = server
+      .find(Customer.class)
+      .where()
+      .ge("cretime", backedSnapshot)
+      .findCount();
+    assertThat(count2).isGreaterThan(0);
+
+    int count3 = server
+      .find(Customer.class)
+      .where()
+      .gt("updtime", snapshot)
+      .findCount();
+    assertThat(count3).isEqualTo(0);
+
+    int count4 = server
+      .find(Customer.class)
+      .where()
+      .ge("updtime", backedSnapshot)
+      .findCount();
+    assertThat(count4).isGreaterThan(0);
+
+
+  }
+
 }

From 4308a98a0a49b86d899d13690123d81e1ec1fb63 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 15 Jun 2018 20:49:14 +1200
Subject: [PATCH 0330/1036] #1428 - ENH: Use java.time.Clock for @WhenModified
 and @WhenCreated and allow it to be Replaceable for testing

Adjust such that Clock is on DefaultServer and can be set via ExtendedServer interface
---
 src/main/java/io/ebean/ExtendedServer.java     | 16 +++++++++++++++-
 .../server/core/DefaultServer.java             | 18 +++++++++++++++++-
 .../server/core/PersistRequestBean.java        |  2 +-
 src/test/java/io/ebean/ExtendedServerTest.java | 11 ++++++-----
 .../io/ebeaninternal/api/TDSpiEbeanServer.java | 11 +++++++++++
 5 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/ebean/ExtendedServer.java b/src/main/java/io/ebean/ExtendedServer.java
index 1d3d6264f..0b159f877 100644
--- a/src/main/java/io/ebean/ExtendedServer.java
+++ b/src/main/java/io/ebean/ExtendedServer.java
@@ -3,6 +3,7 @@ package io.ebean;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.persistence.NonUniqueResultException;
+import java.time.Clock;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -28,6 +29,19 @@ import java.util.function.Predicate;
  */
 public interface ExtendedServer {
 
+  /**
+   * Return the NOW time from the Clock.
+   */
+  long clockNow();
+
+  /**
+   * Set the Clock to use for <code>@WhenCreated</code> and <code>@WhenModified</code>.
+   * <p>
+   * Note that we only expect to change the Clock for testing purposes.
+   * </p>
+   */
+  void setClock(Clock clock);
+
   /**
    * Return the number of 'top level' or 'root' entities this query should return.
    *
@@ -370,7 +384,7 @@ public interface ExtendedServer {
   /**
    * Execute the update query returning the number of rows updated.
    * <p>
-   * The update query must be created using {@link #update(Class)}.
+   * The update query must be created using {@link EbeanServer#update(Class)}.
    * </p>
    *
    * @param query       the update query to execute
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 307cc3d44..89fe28b6b 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -119,10 +119,10 @@ import javax.persistence.NonUniqueResultException;
 import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
+import java.time.Clock;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -151,6 +151,11 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   private final DataTimeZone dataTimeZone;
 
+  /**
+   * Clock to use for WhenModified and WhenCreated.
+   */
+  private Clock clock;
+
   private final CallStackFactory callStackFactory;
 
   /**
@@ -278,6 +283,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     this.beanLoader = new DefaultBeanLoader(this);
     this.jsonContext = config.createJsonContext(this);
     this.dataTimeZone = config.getDataTimeZone();
+    this.clock = config.getServerConfig().getClock();
 
     DocStoreIntegration docStoreComponents = config.createDocStoreIntegration(this);
     this.transactionManager = config.createTransactionManager(docStoreComponents.updateProcessor());
@@ -507,6 +513,16 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return this;
   }
 
+  @Override
+  public long clockNow() {
+    return clock.millis();
+  }
+
+  @Override
+  public void setClock(Clock clock) {
+    this.clock = clock;
+  }
+
   @Override
   public BeanState getBeanState(Object bean) {
     if (bean instanceof EntityBean) {
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index 6fd15caf0..3c658f34d 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -1275,7 +1275,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    */
   public long now() {
     if (now == 0) {
-      now = ebeanServer.getServerConfig().getClock().millis();
+      now = ebeanServer.clockNow();
     }
     return now;
   }
diff --git a/src/test/java/io/ebean/ExtendedServerTest.java b/src/test/java/io/ebean/ExtendedServerTest.java
index ec76ee80d..5f756e9ad 100644
--- a/src/test/java/io/ebean/ExtendedServerTest.java
+++ b/src/test/java/io/ebean/ExtendedServerTest.java
@@ -1,6 +1,5 @@
 package io.ebean;
 
-import io.ebeaninternal.api.SpiEbeanServer;
 import org.junit.After;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
@@ -17,8 +16,8 @@ public class ExtendedServerTest extends BaseTestCase {
 
   @After
   public void cleanup() {
-    ((SpiEbeanServer) Ebean.getDefaultServer())
-      .getServerConfig()
+    Ebean.getDefaultServer()
+      .extended()
       .setClock(Clock.systemUTC());
   }
 
@@ -52,11 +51,13 @@ public class ExtendedServerTest extends BaseTestCase {
 
   @Test
   public void mockClock() {
-    SpiEbeanServer server = (SpiEbeanServer) Ebean.getDefaultServer();
+
+    EbeanServer server = Ebean.getDefaultServer();
     final Instant snapshot = Instant.now();
     Instant backedSnapshot = snapshot.minus(1, ChronoUnit.DAYS);
     Clock snapshotClock = Clock.fixed(backedSnapshot, Clock.systemUTC().getZone());
-    server.getServerConfig().setClock(snapshotClock);
+
+    server.extended().setClock(snapshotClock);
 
     ResetBasicData.reset();
 
diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index c83e84eb8..d52327463 100644
--- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -55,6 +55,7 @@ import io.ebeaninternal.server.transaction.RemoteTransactionEvent;
 import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
 import java.lang.reflect.Type;
+import java.time.Clock;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -85,6 +86,16 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
     return this;
   }
 
+  @Override
+  public long clockNow() {
+    return System.currentTimeMillis();
+  }
+
+  @Override
+  public void setClock(Clock clock) {
+
+  }
+
   @Override
   public SpiLogManager log() {
     return null;

From 6a9ab49ef046915c710d9e887702999265c5af86 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 16 Jun 2018 00:09:03 +1200
Subject: [PATCH 0331/1036] #1427 - QueryCache should be cleared, if one of a
 dependent bean is updated

Propagation across cluster.
---
 .../io/ebean/cache/ServerCacheFactory.java    |  9 ++++++
 .../ebean/cache/ServerCacheNotification.java  | 29 +++++++++++++++++++
 .../io/ebean/cache/ServerCacheNotify.java     | 12 ++++++++
 .../ebean/cache/ServerCacheNotifyPlugin.java  | 17 +++++++++++
 .../cache/DefaultServerCacheFactory.java      | 18 ++++++++++--
 .../server/core/InternalConfiguration.java    | 17 +++++++++--
 .../transaction/PostCommitProcessing.java     |  6 ++--
 .../server/transaction/TableModState.java     | 27 ++++++++++++++---
 .../transaction/TransactionManager.java       |  5 ++++
 .../TransactionManagerOptions.java            |  5 +++-
 10 files changed, 133 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/io/ebean/cache/ServerCacheNotification.java
 create mode 100644 src/main/java/io/ebean/cache/ServerCacheNotify.java
 create mode 100644 src/main/java/io/ebean/cache/ServerCacheNotifyPlugin.java

diff --git a/src/main/java/io/ebean/cache/ServerCacheFactory.java b/src/main/java/io/ebean/cache/ServerCacheFactory.java
index d59bfd3c4..54c71e7d1 100644
--- a/src/main/java/io/ebean/cache/ServerCacheFactory.java
+++ b/src/main/java/io/ebean/cache/ServerCacheFactory.java
@@ -10,4 +10,13 @@ public interface ServerCacheFactory {
    */
   ServerCache createCache(ServerCacheConfig config);
 
+  /**
+   * Return a ServerCacheNotify that we will send ServerCacheNotification events to.
+   * <p>
+   * This is used if a ServerCacheNotifyPlugin is not supplied.
+   * </p>
+   *
+   * @param listener The listener that should be used to process the notification events.
+   */
+  ServerCacheNotify createCacheNotify(ServerCacheNotify listener);
 }
diff --git a/src/main/java/io/ebean/cache/ServerCacheNotification.java b/src/main/java/io/ebean/cache/ServerCacheNotification.java
new file mode 100644
index 000000000..4b5b08a6f
--- /dev/null
+++ b/src/main/java/io/ebean/cache/ServerCacheNotification.java
@@ -0,0 +1,29 @@
+package io.ebean.cache;
+
+import java.util.Set;
+
+/**
+ * Notification event that dependent tables have been modified.
+ * <p>
+ * This is sent to other interested servers (in the cluster).
+ * </p>
+ */
+public class ServerCacheNotification {
+
+  private final long modifyTimestamp;
+
+  private final Set<String> dependentTables;
+
+  public ServerCacheNotification(long modifyTimestamp, Set<String> dependentTables) {
+    this.modifyTimestamp = modifyTimestamp;
+    this.dependentTables = dependentTables;
+  }
+
+  public long getModifyTimestamp() {
+    return modifyTimestamp;
+  }
+
+  public Set<String> getDependentTables() {
+    return dependentTables;
+  }
+}
diff --git a/src/main/java/io/ebean/cache/ServerCacheNotify.java b/src/main/java/io/ebean/cache/ServerCacheNotify.java
new file mode 100644
index 000000000..3e9f30a56
--- /dev/null
+++ b/src/main/java/io/ebean/cache/ServerCacheNotify.java
@@ -0,0 +1,12 @@
+package io.ebean.cache;
+
+/**
+ * Interface for both listening to notification changes and sending them to other members of the cluster.
+ */
+public interface ServerCacheNotify {
+
+  /**
+   * Notify other server cache members of the table modifications or process the notifications.
+   */
+  void notify(ServerCacheNotification notification);
+}
diff --git a/src/main/java/io/ebean/cache/ServerCacheNotifyPlugin.java b/src/main/java/io/ebean/cache/ServerCacheNotifyPlugin.java
new file mode 100644
index 000000000..2e87a067c
--- /dev/null
+++ b/src/main/java/io/ebean/cache/ServerCacheNotifyPlugin.java
@@ -0,0 +1,17 @@
+package io.ebean.cache;
+
+import io.ebean.config.ServerConfig;
+
+/**
+ * Plugin that provides a ServerCacheNotify implementation.
+ * <p>
+ * Is supplied this will be used to send the ServerCacheNotification event to other cluster members.
+ * </p>
+ */
+public interface ServerCacheNotifyPlugin {
+
+  /**
+   * Create a ServerCacheNotify implementation given the server configuration.
+   */
+  ServerCacheNotify create(ServerConfig serverConfig);
+}
diff --git a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheFactory.java b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheFactory.java
index a519ea469..1b0476f3c 100644
--- a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheFactory.java
+++ b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheFactory.java
@@ -4,6 +4,8 @@ import io.ebean.BackgroundExecutor;
 import io.ebean.cache.ServerCache;
 import io.ebean.cache.ServerCacheConfig;
 import io.ebean.cache.ServerCacheFactory;
+import io.ebean.cache.ServerCacheNotification;
+import io.ebean.cache.ServerCacheNotify;
 
 
 /**
@@ -16,14 +18,14 @@ class DefaultServerCacheFactory implements ServerCacheFactory {
   /**
    * Construct when l2 cache is disabled.
    */
-  public DefaultServerCacheFactory() {
+  DefaultServerCacheFactory() {
     this.executor = null;
   }
 
   /**
    * Construct with executor service.
    */
-  public DefaultServerCacheFactory(BackgroundExecutor executor) {
+  DefaultServerCacheFactory(BackgroundExecutor executor) {
     this.executor = executor;
   }
 
@@ -43,4 +45,16 @@ class DefaultServerCacheFactory implements ServerCacheFactory {
     return cache;
   }
 
+  @Override
+  public ServerCacheNotify createCacheNotify(ServerCacheNotify listener) {
+    return new NoopServerCacheNotify();
+  }
+
+  private static class NoopServerCacheNotify implements ServerCacheNotify {
+
+    @Override
+    public void notify(ServerCacheNotification notification) {
+      // do nothing
+    }
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index 8d201d9c9..4beb65c58 100644
--- a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -5,6 +5,8 @@ import io.ebean.ExpressionFactory;
 import io.ebean.annotation.Platform;
 import io.ebean.cache.ServerCacheFactory;
 import io.ebean.cache.ServerCacheManager;
+import io.ebean.cache.ServerCacheNotify;
+import io.ebean.cache.ServerCacheNotifyPlugin;
 import io.ebean.cache.ServerCacheOptions;
 import io.ebean.cache.ServerCachePlugin;
 import io.ebean.config.ExternalTransactionManager;
@@ -138,6 +140,8 @@ public class InternalConfiguration {
 
   private final ServerCachePlugin serverCachePlugin;
 
+  private ServerCacheNotify cacheNotify;
+
   private boolean localL2Caching;
 
   private final ExpressionFactory expressionFactory;
@@ -418,7 +422,8 @@ public class InternalConfiguration {
 
     TransactionManagerOptions options =
       new TransactionManagerOptions(notifyL2CacheInForeground, serverConfig, scopeManager, clusterManager, backgroundExecutor,
-                                    indexUpdateProcessor, beanDescriptorManager, dataSource(), profileHandler(), logManager, tableModState);
+                                    indexUpdateProcessor, beanDescriptorManager, dataSource(), profileHandler(), logManager,
+                                    tableModState, cacheNotify);
 
     if (serverConfig.isExplicitTransactionBeginMode()) {
       return new ExplicitTransactionManager(options);
@@ -565,7 +570,7 @@ public class InternalConfiguration {
       if (iterator.hasNext()) {
         // use the cacheFactory (via classpath service loader)
         plugin = iterator.next();
-        logger.debug("using ServerCacheFactory {}", serverCachePlugin.getClass());
+        logger.debug("using ServerCacheFactory {}", plugin.getClass());
       } else {
         // use the built in default l2 caching which is local cache based
         localL2Caching = true;
@@ -587,6 +592,14 @@ public class InternalConfiguration {
 
     ServerCacheFactory factory = serverCachePlugin.create(serverConfig, backgroundExecutor);
 
+    ServerCacheNotifyPlugin notifyPlugin = serverConfig.service(ServerCacheNotifyPlugin.class);
+    if (notifyPlugin != null) {
+      // plugin supplied so use that to send notifications
+      cacheNotify = notifyPlugin.create(serverConfig);
+    } else {
+      cacheNotify = factory.createCacheNotify(tableModState);
+    }
+
     // reasonable default settings are for a cache per bean type
     ServerCacheOptions beanOptions = new ServerCacheOptions();
     beanOptions.setMaxSize(serverConfig.getCacheMaxSize());
diff --git a/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java b/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
index b715d2ee3..08a85fd7d 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
@@ -22,7 +22,7 @@ import java.util.Set;
  * This includes Cluster notification, and BeanPersistListeners.
  * </p>
  */
-public final class PostCommitProcessing {
+final class PostCommitProcessing {
 
   private static final Logger logger = LoggerFactory.getLogger(PostCommitProcessing.class);
 
@@ -51,7 +51,7 @@ public final class PostCommitProcessing {
   /**
    * Create for an external modification.
    */
-  public PostCommitProcessing(ClusterManager clusterManager, TransactionManager manager, TransactionEvent event) {
+  PostCommitProcessing(ClusterManager clusterManager, TransactionManager manager, TransactionEvent event) {
 
     this.clusterManager = clusterManager;
     this.manager = manager;
@@ -68,7 +68,7 @@ public final class PostCommitProcessing {
   /**
    * Create for a transaction.
    */
-  public PostCommitProcessing(ClusterManager clusterManager, TransactionManager manager, SpiTransaction transaction) {
+  PostCommitProcessing(ClusterManager clusterManager, TransactionManager manager, SpiTransaction transaction) {
 
     this.clusterManager = clusterManager;
     this.manager = manager;
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TableModState.java b/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
index d2aa4143a..b876a4ed0 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
@@ -2,6 +2,10 @@ package io.ebeaninternal.server.transaction;
 
 import io.ebean.cache.QueryCacheEntry;
 import io.ebean.cache.QueryCacheEntryValidate;
+import io.ebean.cache.ServerCacheNotification;
+import io.ebean.cache.ServerCacheNotify;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Map;
 import java.util.Set;
@@ -13,24 +17,28 @@ import java.util.concurrent.ConcurrentHashMap;
  * This information is used to validate entries in the L2 query caches.
  * </p>
  */
-public class TableModState implements QueryCacheEntryValidate {
+public class TableModState implements QueryCacheEntryValidate, ServerCacheNotify {
+
+  private static final Logger log = LoggerFactory.getLogger("io.ebean.cache.TABLEMOD");
 
   private Map<String,Long> tableModStamp = new ConcurrentHashMap<>();
 
   /**
    * Set the modified timestamp on the tables that have been touched.
    */
-  public void touch(Set<String> touchedTables, long modTimestamp) {
-
+  void touch(Set<String> touchedTables, long modTimestamp) {
     for (String tableName : touchedTables) {
       tableModStamp.put(tableName, modTimestamp);
     }
+    if (log.isDebugEnabled()) {
+      log.debug("TableModState updated - " + tableModStamp);
+    }
   }
 
   /**
    * Return true if all the tables are valid based on timestamp comparison.
    */
-  public boolean isValid(Set<String> tables, long sinceTimestamp) {
+  boolean isValid(Set<String> tables, long sinceTimestamp) {
     for (String tableName : tables) {
       Long modTime = tableModStamp.get(tableName);
       if (modTime != null && modTime > sinceTimestamp ) {
@@ -48,4 +56,15 @@ public class TableModState implements QueryCacheEntryValidate {
     }
     return true;
   }
+
+  /**
+   * Update the table modification timestamps based on remote table modification events.
+   */
+  @Override
+  public void notify(ServerCacheNotification notification) {
+
+    // TODO: Change to use ClockService ...
+    long modifyTimestamp = notification.getModifyTimestamp();
+    touch(notification.getDependentTables(), modifyTimestamp);
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index 0ff2894d6..b462b970b 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -5,6 +5,8 @@ import io.ebean.ProfileLocation;
 import io.ebean.TxScope;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.TxType;
+import io.ebean.cache.ServerCacheNotification;
+import io.ebean.cache.ServerCacheNotify;
 import io.ebean.config.CurrentTenantProvider;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DatabasePlatform.OnQueryOnly;
@@ -137,6 +139,7 @@ public class TransactionManager implements SpiTransactionManager {
   private final TransactionScopeManager scopeManager;
 
   private final TableModState tableModState;
+  private final ServerCacheNotify cacheNotify;
 
   /**
    * Create the TransactionManager
@@ -160,6 +163,7 @@ public class TransactionManager implements SpiTransactionManager {
     this.serverName = options.config.getName();
     this.scopeManager = options.scopeManager;
     this.tableModState = options.tableModState;
+    this.cacheNotify = options.cacheNotify;
     this.backgroundExecutor = options.backgroundExecutor;
     this.dataSourceSupplier = options.dataSourceSupplier;
     this.docStoreActive = options.config.getDocStoreConfig().isActive();
@@ -510,6 +514,7 @@ public class TransactionManager implements SpiTransactionManager {
     if (viewInvalidation) {
       beanDescriptorManager.processViewInvalidation(touchedTables);
     }
+    cacheNotify.notify(new ServerCacheNotification(modTimestamp, touchedTables));
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java
index 16f5dafe9..1b8ce39a8 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.transaction;
 
 import io.ebean.BackgroundExecutor;
+import io.ebean.cache.ServerCacheNotify;
 import io.ebean.config.ServerConfig;
 import io.ebeaninternal.api.SpiLogManager;
 import io.ebeaninternal.api.SpiProfileHandler;
@@ -25,12 +26,13 @@ public class TransactionManagerOptions {
   final TransactionScopeManager scopeManager;
   final SpiLogManager logManager;
   final TableModState tableModState;
+  final ServerCacheNotify cacheNotify;
 
 
   public TransactionManagerOptions(boolean notifyL2CacheInForeground, ServerConfig config, TransactionScopeManager scopeManager, ClusterManager clusterManager,
                                    BackgroundExecutor backgroundExecutor, DocStoreUpdateProcessor docStoreUpdateProcessor,
                                    BeanDescriptorManager descMgr, DataSourceSupplier dataSourceSupplier, SpiProfileHandler profileHandler,
-                                   SpiLogManager logManager, TableModState tableModState) {
+                                   SpiLogManager logManager, TableModState tableModState, ServerCacheNotify cacheNotify) {
 
     this.notifyL2CacheInForeground = notifyL2CacheInForeground;
     this.config = config;
@@ -43,6 +45,7 @@ public class TransactionManagerOptions {
     this.profileHandler = profileHandler;
     this.logManager = logManager;
     this.tableModState = tableModState;
+    this.cacheNotify = cacheNotify;
   }
 
 }

From bd3c99e67f79ef588fa0b8e58f7790aa97143046 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 16 Jun 2018 00:22:44 +1200
Subject: [PATCH 0332/1036] #1427 - QueryCache should be cleared, if one of a
 dependent bean is updated

Wrap Clock as ClockService to use in TransactionManager and DefaultServer (and allow for changing the Clock implementation for testing).
---
 .../server/core/ClockService.java             | 29 +++++++++++++++++++
 .../server/core/DefaultServer.java            |  8 ++---
 .../server/core/InternalConfiguration.java    |  9 +++++-
 .../ImplicitReadOnlyTransaction.java          |  2 +-
 .../server/transaction/JdbcTransaction.java   |  2 +-
 .../transaction/TransactionManager.java       |  9 ++++--
 .../TransactionManagerOptions.java            |  5 +++-
 7 files changed, 53 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/core/ClockService.java

diff --git a/src/main/java/io/ebeaninternal/server/core/ClockService.java b/src/main/java/io/ebeaninternal/server/core/ClockService.java
new file mode 100644
index 000000000..227a7b1cf
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/core/ClockService.java
@@ -0,0 +1,29 @@
+package io.ebeaninternal.server.core;
+
+import java.time.Clock;
+
+/**
+ * Wraps the Clock such that we can change the Clock for testing purposes.
+ */
+public class ClockService {
+
+  private Clock clock;
+
+  public ClockService(Clock clock) {
+    this.clock = clock;
+  }
+
+  /**
+   * Change the clock for testing purposes.
+   */
+  public void setClock(Clock clock) {
+    this.clock = clock;
+  }
+
+  /**
+   * Return the Clock current timestamp in millis.
+   */
+  public long nowMillis() {
+    return clock.millis();
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 89fe28b6b..a540ecb1b 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -154,7 +154,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Clock to use for WhenModified and WhenCreated.
    */
-  private Clock clock;
+  private ClockService clockService;
 
   private final CallStackFactory callStackFactory;
 
@@ -283,7 +283,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     this.beanLoader = new DefaultBeanLoader(this);
     this.jsonContext = config.createJsonContext(this);
     this.dataTimeZone = config.getDataTimeZone();
-    this.clock = config.getServerConfig().getClock();
+    this.clockService = config.getClockService();
 
     DocStoreIntegration docStoreComponents = config.createDocStoreIntegration(this);
     this.transactionManager = config.createTransactionManager(docStoreComponents.updateProcessor());
@@ -515,12 +515,12 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   @Override
   public long clockNow() {
-    return clock.millis();
+    return clockService.nowMillis();
   }
 
   @Override
   public void setClock(Clock clock) {
-    this.clock = clock;
+    this.clockService.setClock(clock);
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index 4beb65c58..f3b537217 100644
--- a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -122,6 +122,8 @@ public class InternalConfiguration {
 
   private final DtoBeanManager dtoBeanManager;
 
+  private final ClockService clockService;
+
   private final DataTimeZone dataTimeZone;
 
   private final Binder binder;
@@ -166,6 +168,7 @@ public class InternalConfiguration {
 
     this.online = online;
     this.serverConfig = serverConfig;
+    this.clockService = new ClockService(serverConfig.getClock());
     this.logManager = initLogManager();
     this.docStoreFactory = initDocStoreFactory(serverConfig.service(DocStoreFactory.class));
     this.jsonFactory = serverConfig.getJsonFactory();
@@ -233,6 +236,10 @@ public class InternalConfiguration {
     return docStoreFactory;
   }
 
+  public ClockService getClockService() {
+    return clockService;
+  }
+
   /**
    * Check if this is a SpiServerPlugin and if so 'collect' it to give the complete list
    * later on the DefaultServer for late call to configure().
@@ -423,7 +430,7 @@ public class InternalConfiguration {
     TransactionManagerOptions options =
       new TransactionManagerOptions(notifyL2CacheInForeground, serverConfig, scopeManager, clusterManager, backgroundExecutor,
                                     indexUpdateProcessor, beanDescriptorManager, dataSource(), profileHandler(), logManager,
-                                    tableModState, cacheNotify);
+                                    tableModState, cacheNotify, clockService);
 
     if (serverConfig.isExplicitTransactionBeginMode()) {
       return new ExplicitTransactionManager(options);
diff --git a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
index 1ccc44dbd..44e5b4bd1 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
@@ -80,7 +80,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
     this.connection = connection;
     this.persistenceContext = new DefaultPersistenceContext();
     this.startNanos = System.nanoTime();
-    this.startMillis = manager.clockNowEpoch();
+    this.startMillis = manager.clockNowMillis();
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index da8e53781..2fbaab79a 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -212,7 +212,7 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
         this.batchOnCascadeMode = PersistBatch.NONE;
         this.onQueryOnly = OnQueryOnly.ROLLBACK;
       } else {
-        this.startMillis = manager.clockNowEpoch();
+        this.startMillis = manager.clockNowMillis();
         this.logSql = manager.isLogSql();
         this.logSummary = manager.isLogSummary();
         this.skipCacheAfterWrite = manager.isSkipCacheAfterWrite();
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index b462b970b..4a007a9b3 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -29,6 +29,7 @@ import io.ebeaninternal.metric.MetricFactory;
 import io.ebeaninternal.metric.TimedMetric;
 import io.ebeaninternal.metric.TimedMetricMap;
 import io.ebeaninternal.server.cluster.ClusterManager;
+import io.ebeaninternal.server.core.ClockService;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
 import io.ebeaninternal.server.profile.TimedProfileLocation;
 import io.ebeaninternal.server.profile.TimedProfileLocationRegistry;
@@ -140,6 +141,7 @@ public class TransactionManager implements SpiTransactionManager {
 
   private final TableModState tableModState;
   private final ServerCacheNotify cacheNotify;
+  private final ClockService clockService;
 
   /**
    * Create the TransactionManager
@@ -164,6 +166,7 @@ public class TransactionManager implements SpiTransactionManager {
     this.scopeManager = options.scopeManager;
     this.tableModState = options.tableModState;
     this.cacheNotify = options.cacheNotify;
+    this.clockService = options.clockService;
     this.backgroundExecutor = options.backgroundExecutor;
     this.dataSourceSupplier = options.dataSourceSupplier;
     this.docStoreActive = options.config.getDocStoreConfig().isActive();
@@ -188,8 +191,8 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Return the NOW timestamp in epoch millis.
    */
-  public long clockNowEpoch() {
-    return System.currentTimeMillis(); // TODO: Review when we supply a Clock via ServerConfig.
+  public long clockNowMillis() {
+    return clockService.nowMillis();
   }
 
   /**
@@ -448,7 +451,7 @@ public class TransactionManager implements SpiTransactionManager {
 
   private void externalModificationEvent(TransactionEventTable tableEvents) {
 
-    TransactionEvent event = new TransactionEvent(clockNowEpoch());
+    TransactionEvent event = new TransactionEvent(clockNowMillis());
     event.add(tableEvents);
 
     PostCommitProcessing postCommit = new PostCommitProcessing(clusterManager, this, event);
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java
index 1b8ce39a8..f55389a19 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java
@@ -6,6 +6,7 @@ import io.ebean.config.ServerConfig;
 import io.ebeaninternal.api.SpiLogManager;
 import io.ebeaninternal.api.SpiProfileHandler;
 import io.ebeaninternal.server.cluster.ClusterManager;
+import io.ebeaninternal.server.core.ClockService;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
 import io.ebeanservice.docstore.api.DocStoreUpdateProcessor;
 
@@ -27,12 +28,13 @@ public class TransactionManagerOptions {
   final SpiLogManager logManager;
   final TableModState tableModState;
   final ServerCacheNotify cacheNotify;
+  final ClockService clockService;
 
 
   public TransactionManagerOptions(boolean notifyL2CacheInForeground, ServerConfig config, TransactionScopeManager scopeManager, ClusterManager clusterManager,
                                    BackgroundExecutor backgroundExecutor, DocStoreUpdateProcessor docStoreUpdateProcessor,
                                    BeanDescriptorManager descMgr, DataSourceSupplier dataSourceSupplier, SpiProfileHandler profileHandler,
-                                   SpiLogManager logManager, TableModState tableModState, ServerCacheNotify cacheNotify) {
+                                   SpiLogManager logManager, TableModState tableModState, ServerCacheNotify cacheNotify, ClockService clockService) {
 
     this.notifyL2CacheInForeground = notifyL2CacheInForeground;
     this.config = config;
@@ -46,6 +48,7 @@ public class TransactionManagerOptions {
     this.logManager = logManager;
     this.tableModState = tableModState;
     this.cacheNotify = cacheNotify;
+    this.clockService = clockService;
   }
 
 }

From 9c73309dfd0bfe935202183e228a9b0282262fb9 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 16 Jun 2018 15:15:54 +1200
Subject: [PATCH 0333/1036] #1427 - QueryCache should be cleared, if one of a
 dependent bean is updated

Update RemoteTransactionEvent, add (back) common binary message handling (Common to TCP, K8s and upcoming binary pubsub)
---
 .../api/TransactionEventTable.java            |   6 +-
 .../server/cache/RemoteCacheEvent.java        |   4 +-
 .../server/cluster/ClusterManager.java        |   2 +-
 .../server/cluster/MessageServerProvider.java |  14 ++
 .../binarymessage/BinaryDataReader.java       |  75 +++++++++
 .../binarymessage/BinaryDataWriter.java       |  49 ++++++
 .../{ => binarymessage}/BinaryMessage.java    |   3 +-
 .../BinaryMessageList.java                    |   2 +-
 .../cluster/binarymessage/ClusterMessage.java | 147 ++++++++++++++++++
 .../InvalidMessageException.java              |   8 +
 .../binarymessage/MessageReadWrite.java       |  37 +++++
 .../server/cluster/binarymessage/MsgKeys.java |  19 +++
 .../server/transaction/BeanPersistIds.java    |  18 ++-
 .../transaction/PostCommitProcessing.java     |   4 +
 .../server/transaction/RemoteTableMod.java    |  55 +++++++
 .../transaction/RemoteTransactionEvent.java   |  16 +-
 .../binarymessage/MessageReadWriteTest.java   | 118 ++++++++++++++
 17 files changed, 563 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/cluster/MessageServerProvider.java
 create mode 100644 src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryDataReader.java
 create mode 100644 src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryDataWriter.java
 rename src/main/java/io/ebeaninternal/server/cluster/{ => binarymessage}/BinaryMessage.java (94%)
 rename src/main/java/io/ebeaninternal/server/cluster/{ => binarymessage}/BinaryMessageList.java (85%)
 create mode 100644 src/main/java/io/ebeaninternal/server/cluster/binarymessage/ClusterMessage.java
 create mode 100644 src/main/java/io/ebeaninternal/server/cluster/binarymessage/InvalidMessageException.java
 create mode 100644 src/main/java/io/ebeaninternal/server/cluster/binarymessage/MessageReadWrite.java
 create mode 100644 src/main/java/io/ebeaninternal/server/cluster/binarymessage/MsgKeys.java
 create mode 100644 src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java
 create mode 100644 src/test/java/io/ebeaninternal/server/cluster/binarymessage/MessageReadWriteTest.java

diff --git a/src/main/java/io/ebeaninternal/api/TransactionEventTable.java b/src/main/java/io/ebeaninternal/api/TransactionEventTable.java
index cde507c1a..fe5338cf4 100644
--- a/src/main/java/io/ebeaninternal/api/TransactionEventTable.java
+++ b/src/main/java/io/ebeaninternal/api/TransactionEventTable.java
@@ -1,8 +1,8 @@
 package io.ebeaninternal.api;
 
 import io.ebean.event.BulkTableEvent;
-import io.ebeaninternal.server.cluster.BinaryMessage;
-import io.ebeaninternal.server.cluster.BinaryMessageList;
+import io.ebeaninternal.server.cluster.binarymessage.BinaryMessage;
+import io.ebeaninternal.server.cluster.binarymessage.BinaryMessageList;
 
 import java.io.DataInput;
 import java.io.DataOutputStream;
@@ -102,7 +102,7 @@ public final class TransactionEventTable implements Serializable {
       os.writeBoolean(insert);
       os.writeBoolean(update);
       os.writeBoolean(delete);
-
+      os.close();
       msgList.add(msg);
     }
 
diff --git a/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java b/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java
index e0def309f..2d04df0f5 100644
--- a/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java
+++ b/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.cache;
 
-import io.ebeaninternal.server.cluster.BinaryMessage;
-import io.ebeaninternal.server.cluster.BinaryMessageList;
+import io.ebeaninternal.server.cluster.binarymessage.BinaryMessage;
+import io.ebeaninternal.server.cluster.binarymessage.BinaryMessageList;
 
 import java.io.DataInput;
 import java.io.DataOutputStream;
diff --git a/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java b/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java
index 6fd56c713..6f02f5b50 100644
--- a/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java
+++ b/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java
@@ -13,7 +13,7 @@ import java.util.concurrent.ConcurrentHashMap;
 /**
  * Manages the cluster service.
  */
-public class ClusterManager {
+public class ClusterManager implements MessageServerProvider {
 
   private static final Logger clusterLogger = LoggerFactory.getLogger("io.ebean.Cluster");
 
diff --git a/src/main/java/io/ebeaninternal/server/cluster/MessageServerProvider.java b/src/main/java/io/ebeaninternal/server/cluster/MessageServerProvider.java
new file mode 100644
index 000000000..f3c388d2b
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/cluster/MessageServerProvider.java
@@ -0,0 +1,14 @@
+package io.ebeaninternal.server.cluster;
+
+import io.ebean.EbeanServer;
+
+/**
+ * Returns EbeanServer instances for remote message reading.
+ */
+public interface MessageServerProvider {
+
+  /**
+   * Return the EbeanServer instance by name.
+   */
+  EbeanServer getServer(String name);
+}
diff --git a/src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryDataReader.java b/src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryDataReader.java
new file mode 100644
index 000000000..f097172f4
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryDataReader.java
@@ -0,0 +1,75 @@
+package io.ebeaninternal.server.cluster.binarymessage;
+
+import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.api.TransactionEventTable;
+import io.ebeaninternal.server.cache.RemoteCacheEvent;
+import io.ebeaninternal.server.cluster.MessageServerProvider;
+import io.ebeaninternal.server.transaction.BeanPersistIds;
+import io.ebeaninternal.server.transaction.RemoteTableMod;
+import io.ebeaninternal.server.transaction.RemoteTransactionEvent;
+
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+
+/**
+ * Reads the binary message returning RemoteTransactionEvent.
+ */
+class BinaryDataReader {
+
+  private final MessageServerProvider serverProvider;
+  private final DataInputStream dataInput;
+
+  private SpiEbeanServer server;
+  private RemoteTransactionEvent event;
+
+  BinaryDataReader(MessageServerProvider serverProvider, byte[] data) {
+    this.serverProvider = serverProvider;
+    this.dataInput = new DataInputStream(new ByteArrayInputStream(data));
+  }
+
+  /**
+   * Read the binary message returning a RemoteTransactionEvent.
+   */
+  RemoteTransactionEvent read() throws IOException {
+
+    String serverName = dataInput.readUTF();
+
+    this.server = (SpiEbeanServer) serverProvider.getServer(serverName);
+    if (server == null) {
+      throw new IllegalStateException("EbeanServer not found for name [" + serverName + "]");
+    }
+    this.event = new RemoteTransactionEvent(server);
+    boolean more = dataInput.readBoolean();
+    while (more) {
+      readMessage();
+      more = dataInput.readBoolean();
+    }
+    return event;
+  }
+
+  private void readMessage() throws IOException {
+
+    int msgType = dataInput.readInt();
+    switch (msgType) {
+      case BinaryMessage.TYPE_BEANIUD:
+        event.addBeanPersistIds(BeanPersistIds.readBinaryMessage(server, dataInput));
+        break;
+
+      case BinaryMessage.TYPE_TABLEIUD:
+        event.addTableIUD(TransactionEventTable.TableIUD.readBinaryMessage(dataInput));
+        break;
+
+      case BinaryMessage.TYPE_CACHE:
+        event.addRemoteCacheEvent(RemoteCacheEvent.readBinaryMessage(dataInput));
+        break;
+
+      case BinaryMessage.TYPE_TABLEMOD:
+        event.addRemoteTableMod(RemoteTableMod.readBinaryMessage(dataInput));
+        break;
+
+      default:
+        throw new RuntimeException("Invalid Transaction msgType " + msgType);
+    }
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryDataWriter.java b/src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryDataWriter.java
new file mode 100644
index 000000000..8f08bba56
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryDataWriter.java
@@ -0,0 +1,49 @@
+package io.ebeaninternal.server.cluster.binarymessage;
+
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+/**
+ * Writes BinaryMessageList to DataHolder raw byte[].
+ */
+class BinaryDataWriter {
+
+  private final BinaryMessageList messageList;
+
+  private final ByteArrayOutputStream buffer;
+
+  private final DataOutputStream dataOut;
+
+  private final String serverName;
+
+  BinaryDataWriter(String serverName, BinaryMessageList messageList) {
+    this.serverName = serverName;
+    this.messageList = messageList;
+    this.buffer = new ByteArrayOutputStream(256);
+    this.dataOut = new DataOutputStream(buffer);
+  }
+
+  /**
+   * Write the message as raw byte[].
+   */
+  byte[] write() throws IOException {
+
+    //TODO: Add Protocol version and "podId" to support pubsub cluster
+    //dataOut.writeInt(MsgKeys.MESSAGE_KEY);
+    dataOut.writeUTF(serverName);
+    for (BinaryMessage msg : messageList.getList()) {
+      write(msg);
+    }
+    dataOut.writeBoolean(false);
+    dataOut.flush();
+    return buffer.toByteArray();
+  }
+
+  private void write(BinaryMessage msg) throws IOException {
+
+    dataOut.writeBoolean(true);
+    dataOut.write(msg.getByteArray());
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/cluster/BinaryMessage.java b/src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryMessage.java
similarity index 94%
rename from src/main/java/io/ebeaninternal/server/cluster/BinaryMessage.java
rename to src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryMessage.java
index b78b3f7eb..158df57da 100644
--- a/src/main/java/io/ebeaninternal/server/cluster/BinaryMessage.java
+++ b/src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryMessage.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.cluster;
+package io.ebeaninternal.server.cluster.binarymessage;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
@@ -24,6 +24,7 @@ public class BinaryMessage {
   public static final int TYPE_BEANIUD = 1;
   public static final int TYPE_TABLEIUD = 2;
   public static final int TYPE_CACHE = 3;
+  public static final int TYPE_TABLEMOD = 4;
 
   public static final int TYPE_MSGACK = 8;
   public static final int TYPE_MSGRESEND = 9;
diff --git a/src/main/java/io/ebeaninternal/server/cluster/BinaryMessageList.java b/src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryMessageList.java
similarity index 85%
rename from src/main/java/io/ebeaninternal/server/cluster/BinaryMessageList.java
rename to src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryMessageList.java
index f84b7995c..fd057fd03 100644
--- a/src/main/java/io/ebeaninternal/server/cluster/BinaryMessageList.java
+++ b/src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryMessageList.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.cluster;
+package io.ebeaninternal.server.cluster.binarymessage;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/io/ebeaninternal/server/cluster/binarymessage/ClusterMessage.java b/src/main/java/io/ebeaninternal/server/cluster/binarymessage/ClusterMessage.java
new file mode 100644
index 000000000..2e6b189ea
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/cluster/binarymessage/ClusterMessage.java
@@ -0,0 +1,147 @@
+package io.ebeaninternal.server.cluster.binarymessage;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+/**
+ * The message broadcast around the cluster.
+ */
+public class ClusterMessage {
+
+  private static final int MAX_LENGTH = 10 * 1024 * 1024;
+
+  private final String registerIp;
+
+  private final String podName;
+
+  private final boolean register;
+
+  private final byte[] data;
+
+  /**
+   * Create a register message.
+   */
+  public static ClusterMessage register(String registerIp, boolean register, String podName) {
+    return new ClusterMessage(registerIp, register, podName);
+  }
+
+  /**
+   * Create a transaction message.
+   */
+  public static ClusterMessage transEvent(byte[] data) {
+    return new ClusterMessage(data);
+  }
+
+  /**
+   * Create for register online/offline message.
+   */
+  private ClusterMessage(String registerIp, boolean register, String podName) {
+    this.registerIp = registerIp;
+    this.register = register;
+    this.podName = podName;
+    this.data = null;
+  }
+
+  /**
+   * Create for a transaction message.
+   */
+  private ClusterMessage(byte[] data) {
+    this.data = data;
+    this.registerIp = null;
+    this.podName = null;
+    this.register = false;
+  }
+
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    if (registerIp != null) {
+      sb.append("register ");
+      sb.append(register);
+      sb.append(" ");
+      sb.append(registerIp);
+    } else {
+      sb.append("[data]");
+    }
+    return sb.toString();
+  }
+
+  /**
+   * Return true if this is a register event as opposed to a transaction message.
+   */
+  public boolean isRegisterEvent() {
+    return registerIp != null;
+  }
+
+  /**
+   * Return the register host for online/offline message.
+   */
+  public String getRegisterIp() {
+    return registerIp;
+  }
+
+  public String getPodName() {
+    return podName;
+  }
+
+  /**
+   * Return true if register is true for a online/offline message.
+   */
+  public boolean isRegister() {
+    return register;
+  }
+
+  /**
+   * Return the raw message data.
+   */
+  public byte[] getData() {
+    return data;
+  }
+
+  /**
+   * Write the message in binary form.
+   */
+  public void write(DataOutputStream dataOutput) throws IOException {
+
+    if (data != null) {
+      // write data message
+      dataOutput.writeInt(MsgKeys.DATA);
+      dataOutput.writeInt(data.length);
+      dataOutput.write(data);
+    } else {
+      // write header message
+      dataOutput.writeInt(MsgKeys.HEADER);
+      dataOutput.writeUTF(getRegisterIp());
+      dataOutput.writeBoolean(register);
+      dataOutput.writeUTF(getPodName());
+    }
+    dataOutput.flush();
+  }
+
+  /**
+   * Read the message from binary form.
+   */
+  public static ClusterMessage read(DataInputStream dataInput) throws IOException, InvalidMessageException {
+
+    int key = dataInput.readInt();
+    if (key == MsgKeys.DATA) {
+      int length = dataInput.readInt();
+      if (length > MAX_LENGTH) {
+        throw new IOException("Message data too large length:"+length);
+      }
+      byte[] data = new byte[length];
+      dataInput.readFully(data);
+      return new ClusterMessage(data);
+
+    } else if (key == MsgKeys.HEADER) {
+      String host = dataInput.readUTF();
+      boolean registered = dataInput.readBoolean();
+      String podName = dataInput.readUTF();
+      return new ClusterMessage(host, registered, podName);
+
+    } else {
+      throw new InvalidMessageException("Invalid message key:" + key);
+    }
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/cluster/binarymessage/InvalidMessageException.java b/src/main/java/io/ebeaninternal/server/cluster/binarymessage/InvalidMessageException.java
new file mode 100644
index 000000000..d05d0b3c2
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/cluster/binarymessage/InvalidMessageException.java
@@ -0,0 +1,8 @@
+package io.ebeaninternal.server.cluster.binarymessage;
+
+public class InvalidMessageException extends Exception {
+
+	public InvalidMessageException(String message) {
+		super(message);
+	}
+}
diff --git a/src/main/java/io/ebeaninternal/server/cluster/binarymessage/MessageReadWrite.java b/src/main/java/io/ebeaninternal/server/cluster/binarymessage/MessageReadWrite.java
new file mode 100644
index 000000000..fe7cab1c2
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/cluster/binarymessage/MessageReadWrite.java
@@ -0,0 +1,37 @@
+package io.ebeaninternal.server.cluster.binarymessage;
+
+import io.ebeaninternal.server.cluster.MessageServerProvider;
+import io.ebeaninternal.server.transaction.RemoteTransactionEvent;
+
+import java.io.IOException;
+
+/**
+ * Mechanism to convert RemoteTransactionEvent to/from byte[] content.
+ */
+public class MessageReadWrite {
+
+  private final MessageServerProvider serverProvider;
+
+  public MessageReadWrite(MessageServerProvider serverProvider) {
+    this.serverProvider = serverProvider;
+  }
+
+  /**
+   * Convert the RemoteTransactionEvent to raw byte[] content.
+   */
+  public byte[] write(RemoteTransactionEvent transEvent) throws IOException {
+
+    BinaryMessageList messageList = new BinaryMessageList();
+    transEvent.writeBinaryMessage(messageList);
+
+    return new BinaryDataWriter(transEvent.getServerName(), messageList).write();
+  }
+
+  /**
+   * Convert the byte[] content to RemoteTransactionEvent.
+   */
+  public RemoteTransactionEvent read(byte[] data) throws IOException {
+
+    return new BinaryDataReader(serverProvider, data).read();
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/cluster/binarymessage/MsgKeys.java b/src/main/java/io/ebeaninternal/server/cluster/binarymessage/MsgKeys.java
new file mode 100644
index 000000000..9daeaa9bd
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/cluster/binarymessage/MsgKeys.java
@@ -0,0 +1,19 @@
+package io.ebeaninternal.server.cluster.binarymessage;
+
+public interface MsgKeys {
+
+	/**
+	 * Used to identify client on connection initiation.
+	 */
+	int HELLO = 182;
+
+	/**
+	 * Used to confirm protocol on reading messages.
+	 */
+	int HEADER = 11;
+
+	/**
+	 * Used to confirm protocol on reading messages.
+	 */
+	int DATA = 12;
+}
diff --git a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
index cf77829ee..934877759 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.transaction;
 
 import io.ebeaninternal.api.SpiEbeanServer;
-import io.ebeaninternal.server.cluster.BinaryMessage;
-import io.ebeaninternal.server.cluster.BinaryMessageList;
+import io.ebeaninternal.server.cluster.binarymessage.BinaryMessage;
+import io.ebeaninternal.server.cluster.binarymessage.BinaryMessageList;
 import io.ebeaninternal.server.core.PersistRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.id.IdBinder;
@@ -140,7 +140,7 @@ public class BeanPersistIds {
           idBinder.writeData(os, idList.get(i));
         }
 
-        os.flush();
+        os.close();
         msgList.add(m);
 
       } while (i < eof);
@@ -167,7 +167,7 @@ public class BeanPersistIds {
     return sb.toString();
   }
 
-  void addId(PersistRequest.Type type, Serializable id) {
+  public void addId(PersistRequest.Type type, Serializable id) {
     switch (type) {
       case INSERT:
         addInsertId(id);
@@ -210,10 +210,18 @@ public class BeanPersistIds {
     return beanDescriptor;
   }
 
-  List<Object> getDeleteIds() {
+  public List<Object> getDeleteIds() {
     return deleteIds;
   }
 
+  public List<Object> getInsertIds() {
+    return insertIds;
+  }
+
+  public List<Object> getUpdateIds() {
+    return updateIds;
+  }
+
   /**
    * Notify the cache of this event that came from another server in the cluster.
    */
diff --git a/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java b/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
index 08a85fd7d..c84593646 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
@@ -211,6 +211,10 @@ final class PostCommitProcessing {
 
     RemoteTransactionEvent remoteTransactionEvent = new RemoteTransactionEvent(serverName);
 
+    Set<String> touched = cacheChanges.touchedTables();
+    if (touched != null && !touched.isEmpty()) {
+      remoteTransactionEvent.addRemoteTableMod(new RemoteTableMod(cacheChanges.modificationTimestamp(), touched));
+    }
     if (beanPersistIdMap != null) {
       for (BeanPersistIds beanPersist : beanPersistIdMap.values()) {
         remoteTransactionEvent.addBeanPersistIds(beanPersist);
diff --git a/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java b/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java
new file mode 100644
index 000000000..1c6eda418
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java
@@ -0,0 +1,55 @@
+package io.ebeaninternal.server.transaction;
+
+import io.ebeaninternal.server.cluster.binarymessage.BinaryMessage;
+import io.ebeaninternal.server.cluster.binarymessage.BinaryMessageList;
+
+import java.io.DataInput;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+public class RemoteTableMod {
+
+  private final long timestamp;
+
+  private final Set<String> tables;
+
+  public RemoteTableMod(long timestamp, Set<String> tables) {
+    this.timestamp = timestamp;
+    this.tables = tables;
+  }
+
+  public long getTimestamp() {
+    return timestamp;
+  }
+
+  public Set<String> getTables() {
+    return tables;
+  }
+
+  public static RemoteTableMod readBinaryMessage(DataInput dataInput) throws IOException {
+
+    long timestamp = dataInput.readLong();
+    int count = dataInput.readInt();
+
+    Set<String> tables = new LinkedHashSet<>();
+    for (int i = 0; i < count; i++) {
+      tables.add(dataInput.readUTF());
+    }
+    return new RemoteTableMod(timestamp, tables);
+  }
+
+  public void writeBinary(BinaryMessageList msgList) throws IOException {
+    BinaryMessage msg = new BinaryMessage(tables.size() * 20  + 30);
+    DataOutputStream os = msg.getOs();
+    os.writeInt(BinaryMessage.TYPE_TABLEMOD);
+    os.writeLong(timestamp);
+    os.writeInt(tables.size());
+    for (String table : tables) {
+      os.writeUTF(table);
+    }
+    os.close();
+    msgList.add(msg);
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java b/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java
index f6047d209..54112ca66 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.transaction;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.TransactionEventTable.TableIUD;
 import io.ebeaninternal.server.cache.RemoteCacheEvent;
-import io.ebeaninternal.server.cluster.BinaryMessageList;
+import io.ebeaninternal.server.cluster.binarymessage.BinaryMessageList;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -19,6 +19,8 @@ public class RemoteTransactionEvent implements Runnable {
 
   private RemoteCacheEvent remoteCacheEvent;
 
+  private RemoteTableMod remoteTableMod;
+
   private String serverName;
 
   private transient SpiEbeanServer server;
@@ -53,6 +55,10 @@ public class RemoteTransactionEvent implements Runnable {
 
   public void writeBinaryMessage(BinaryMessageList msgList) throws IOException {
 
+    if (remoteTableMod != null) {
+      remoteTableMod.writeBinary(msgList);
+    }
+
     if (tableList != null) {
       for (TableIUD aTableList : tableList) {
         aTableList.writeBinaryMessage(msgList);
@@ -113,6 +119,10 @@ public class RemoteTransactionEvent implements Runnable {
     tableList.add(tableIud);
   }
 
+  public void addRemoteTableMod(RemoteTableMod remoteTableMod) {
+    this.remoteTableMod = remoteTableMod;
+  }
+
   public String getServerName() {
     return serverName;
   }
@@ -141,4 +151,8 @@ public class RemoteTransactionEvent implements Runnable {
     return remoteCacheEvent;
   }
 
+  public RemoteTableMod getRemoteTableMod() {
+    return remoteTableMod;
+  }
+
 }
diff --git a/src/test/java/io/ebeaninternal/server/cluster/binarymessage/MessageReadWriteTest.java b/src/test/java/io/ebeaninternal/server/cluster/binarymessage/MessageReadWriteTest.java
new file mode 100644
index 000000000..cf5eeee87
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/cluster/binarymessage/MessageReadWriteTest.java
@@ -0,0 +1,118 @@
+package io.ebeaninternal.server.cluster.binarymessage;
+
+import io.ebean.BaseTestCase;
+import io.ebean.EbeanServer;
+import io.ebeaninternal.api.TDSpiEbeanServer;
+import io.ebeaninternal.api.TransactionEventTable;
+import io.ebeaninternal.server.cache.RemoteCacheEvent;
+import io.ebeaninternal.server.cluster.MessageServerProvider;
+import io.ebeaninternal.server.core.PersistRequest;
+import io.ebeaninternal.server.deploy.BeanDescriptor;
+import io.ebeaninternal.server.transaction.BeanPersistIds;
+import io.ebeaninternal.server.transaction.RemoteTableMod;
+import io.ebeaninternal.server.transaction.RemoteTransactionEvent;
+import org.junit.Test;
+import org.tests.model.basic.Customer;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class MessageReadWriteTest extends BaseTestCase {
+
+  private BeanDescriptor<Customer> customerBeanDescriptor = getBeanDescriptor(Customer.class);
+
+  private TDEbeanServer mockEbeanServer = new TDEbeanServer();
+
+  private MessageReadWrite readWrite = new MessageReadWrite(new TDMessageServerProvider());
+
+  @Override
+  protected <T> BeanDescriptor<T> getBeanDescriptor(Class<T> cls) {
+    return super.getBeanDescriptor(cls);
+  }
+
+  @Test
+  public void readWrite() throws IOException {
+
+    RemoteTransactionEvent event = new RemoteTransactionEvent("db");
+
+    long timestamp = System.currentTimeMillis();
+    Set<String> tables = new HashSet<>();
+    Collections.addAll(tables, "one", "two", "three");
+
+    event.addRemoteTableMod(new RemoteTableMod(timestamp, tables));
+    event.addRemoteCacheEvent(new RemoteCacheEvent(Customer.class));
+
+    event.addTableIUD(new TransactionEventTable.TableIUD("foo", true, false, true));
+    event.addTableIUD(new TransactionEventTable.TableIUD("bar", false, true, false));
+
+
+    BeanPersistIds beanPersistIds = new BeanPersistIds(customerBeanDescriptor);
+    beanPersistIds.addId(PersistRequest.Type.INSERT, 42);
+    beanPersistIds.addId(PersistRequest.Type.INSERT, 43);
+    beanPersistIds.addId(PersistRequest.Type.UPDATE, 55);
+    beanPersistIds.addId(PersistRequest.Type.DELETE, 66);
+
+    event.addBeanPersistIds(beanPersistIds);
+
+    byte[] binaryMessage = readWrite.write(event);
+
+    RemoteTransactionEvent read = readWrite.read(binaryMessage);
+
+    // cache event
+    RemoteCacheEvent remoteCacheEvent = read.getRemoteCacheEvent();
+    assertThat(remoteCacheEvent.getClearCaches()).containsOnly(Customer.class.getName());
+
+    // table mod
+    RemoteTableMod remoteTableMod = read.getRemoteTableMod();
+    assertThat(remoteTableMod.getTimestamp()).isEqualTo(timestamp);
+    assertThat(remoteTableMod.getTables()).isEqualTo(tables);
+
+    // Bean persist ids
+    List<BeanPersistIds> beanPersistList = read.getBeanPersistList();
+    assertThat(beanPersistList).hasSize(3);
+    assertThat(beanPersistList.get(0).getInsertIds()).containsOnly(42, 43);
+    assertThat(beanPersistList.get(1).getUpdateIds()).containsOnly(55);
+    assertThat(beanPersistList.get(2).getDeleteIds()).containsOnly(66);
+  }
+
+  @Test
+  public void readWrite_RemoteTableMod() throws IOException {
+
+    RemoteTransactionEvent event = new RemoteTransactionEvent("db");
+
+    long timestamp = System.currentTimeMillis();
+    Set<String> tables = new HashSet<>();
+    Collections.addAll(tables, "one", "two", "three");
+
+    event.addRemoteTableMod(new RemoteTableMod(timestamp, tables));
+
+    byte[] binaryMessage = readWrite.write(event);
+
+    RemoteTransactionEvent read = readWrite.read(binaryMessage);
+
+    RemoteTableMod remoteTableMod = read.getRemoteTableMod();
+
+    assertThat(remoteTableMod.getTimestamp()).isEqualTo(timestamp);
+    assertThat(remoteTableMod.getTables()).isEqualTo(tables);
+  }
+
+  class TDMessageServerProvider implements MessageServerProvider {
+
+    @Override
+    public EbeanServer getServer(String name) {
+      return mockEbeanServer;
+    }
+  }
+
+  class TDEbeanServer extends TDSpiEbeanServer {
+    @Override
+    public BeanDescriptor<?> getBeanDescriptorById(String descriptorId) {
+      return customerBeanDescriptor;
+    }
+  }
+}

From 47ac4c5c5bd82ae87f00d0bf848c296a4f8d71c8 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 16 Jun 2018 15:23:41 +1200
Subject: [PATCH 0334/1036] #1430 - Regression (from 11.10.1) - DataSource user
 not set ... due to PrimaryServer System.setProperty("ebean_db",
 defaultServerName);

---
 src/main/java/io/ebean/PrimaryServer.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/io/ebean/PrimaryServer.java b/src/main/java/io/ebean/PrimaryServer.java
index d2f46f180..eb4204a1b 100644
--- a/src/main/java/io/ebean/PrimaryServer.java
+++ b/src/main/java/io/ebean/PrimaryServer.java
@@ -76,7 +76,6 @@ class PrimaryServer {
     if (defaultServerName == null) {
       defaultServerName = "db";
     }
-    System.setProperty("ebean_db", defaultServerName);
     return defaultServerName;
   }
 

From 3a75e1f66cfae774ef5559262fcd9842c4fc89b4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 16 Jun 2018 15:25:56 +1200
Subject: [PATCH 0335/1036] [maven-release-plugin] prepare release
 ebean-11.17.5

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c67edab03..ca56ae7c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.17.5-SNAPSHOT</version>
+  <version>11.17.5</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.17.5</tag>
   </scm>
 
   <profiles>

From 01e1a4642b840b3ac55eeeb4c3a38f18eafaa0c1 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 16 Jun 2018 15:26:11 +1200
Subject: [PATCH 0336/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ca56ae7c0..a75900802 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.17.5</version>
+  <version>11.17.6-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.17.5</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From e1d4159453a50cf757e6c13387437278a0899a55 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 17 Jun 2018 22:25:45 +1200
Subject: [PATCH 0337/1036] #1431 - Refactor internals for
 RemoteTransactionEvent binary serialisation

---
 pom.xml                                       |   2 +-
 .../ebeaninternal/api/BinaryReadContext.java  |  47 ++++++
 .../io/ebeaninternal/api/BinaryWritable.java  |  23 +++
 .../ebeaninternal/api/BinaryWriteContext.java |  49 ++++++
 .../api/TransactionEventTable.java            |  33 ++--
 .../server/cache/RemoteCacheEvent.java        |  22 +--
 .../cluster/BinaryTransactionEventReader.java |  41 +++++
 .../server/cluster/ClusterManager.java        |   2 +-
 ...eServerProvider.java => ServerLookup.java} |   2 +-
 .../binarymessage/BinaryDataReader.java       |  75 ---------
 .../binarymessage/BinaryDataWriter.java       |  49 ------
 .../cluster/binarymessage/BinaryMessage.java  |  60 -------
 .../binarymessage/BinaryMessageList.java      |  21 ---
 .../cluster/binarymessage/ClusterMessage.java | 147 ------------------
 .../InvalidMessageException.java              |   8 -
 .../binarymessage/MessageReadWrite.java       |  37 -----
 .../server/cluster/binarymessage/MsgKeys.java |  19 ---
 .../server/transaction/BeanPersistIds.java    |  94 ++++-------
 .../server/transaction/RemoteTableMod.java    |  20 ++-
 .../transaction/RemoteTransactionEvent.java   |  89 +++++++++--
 ... BinaryTransactionEventReadWriteTest.java} |  19 ++-
 21 files changed, 306 insertions(+), 553 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/api/BinaryReadContext.java
 create mode 100644 src/main/java/io/ebeaninternal/api/BinaryWritable.java
 create mode 100644 src/main/java/io/ebeaninternal/api/BinaryWriteContext.java
 create mode 100644 src/main/java/io/ebeaninternal/server/cluster/BinaryTransactionEventReader.java
 rename src/main/java/io/ebeaninternal/server/cluster/{MessageServerProvider.java => ServerLookup.java} (85%)
 delete mode 100644 src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryDataReader.java
 delete mode 100644 src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryDataWriter.java
 delete mode 100644 src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryMessage.java
 delete mode 100644 src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryMessageList.java
 delete mode 100644 src/main/java/io/ebeaninternal/server/cluster/binarymessage/ClusterMessage.java
 delete mode 100644 src/main/java/io/ebeaninternal/server/cluster/binarymessage/InvalidMessageException.java
 delete mode 100644 src/main/java/io/ebeaninternal/server/cluster/binarymessage/MessageReadWrite.java
 delete mode 100644 src/main/java/io/ebeaninternal/server/cluster/binarymessage/MsgKeys.java
 rename src/test/java/io/ebeaninternal/server/cluster/binarymessage/{MessageReadWriteTest.java => BinaryTransactionEventReadWriteTest.java} (86%)

diff --git a/pom.xml b/pom.xml
index 4cfee2676..6791ed678 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.17.6-SNAPSHOT</version>
+  <version>11.18.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
diff --git a/src/main/java/io/ebeaninternal/api/BinaryReadContext.java b/src/main/java/io/ebeaninternal/api/BinaryReadContext.java
new file mode 100644
index 000000000..105a9b81b
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/api/BinaryReadContext.java
@@ -0,0 +1,47 @@
+package io.ebeaninternal.api;
+
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+
+/**
+ * Context used to read binary format messages.
+ */
+public class BinaryReadContext {
+
+  private final DataInputStream in;
+
+  /**
+   * Create with protocol 0 and byte data.
+   */
+  public BinaryReadContext(byte[] byteData) {
+    this(new DataInputStream(new ByteArrayInputStream(byteData)));
+  }
+
+  /**
+   * Create with protocol version and DataInputStream data.
+   */
+  public BinaryReadContext(DataInputStream in) {
+    this.in = in;
+  }
+
+  public DataInputStream in() {
+    return in;
+  }
+
+  public boolean readBoolean() throws IOException {
+    return in.readBoolean();
+  }
+
+  public int readInt() throws IOException {
+    return in.readInt();
+  }
+
+  public String readUTF() throws IOException {
+    return in.readUTF();
+  }
+
+  public long readLong() throws IOException {
+    return in.readLong();
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/api/BinaryWritable.java b/src/main/java/io/ebeaninternal/api/BinaryWritable.java
new file mode 100644
index 000000000..9fbc92ad4
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/api/BinaryWritable.java
@@ -0,0 +1,23 @@
+package io.ebeaninternal.api;
+
+import java.io.IOException;
+
+/**
+ * Messages that can be sent in binary form.
+ * <p>
+ * Mainly RemoteTransactionEvent which is sent to cluster members.
+ * </p>
+ */
+public interface BinaryWritable {
+
+  int TYPE_BEANIUD = 1;
+  int TYPE_TABLEIUD = 2;
+  int TYPE_CACHE = 3;
+  int TYPE_TABLEMOD = 4;
+
+  /**
+   * Write message in binary format.
+   */
+  void writeBinary(BinaryWriteContext out) throws IOException;
+
+}
diff --git a/src/main/java/io/ebeaninternal/api/BinaryWriteContext.java b/src/main/java/io/ebeaninternal/api/BinaryWriteContext.java
new file mode 100644
index 000000000..c36bfebc8
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/api/BinaryWriteContext.java
@@ -0,0 +1,49 @@
+package io.ebeaninternal.api;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+/**
+ * Context used to write binary message (like RemoteTransactionEvent).
+ */
+public class BinaryWriteContext {
+
+  private final DataOutputStream out;
+
+  private long counter;
+
+  public BinaryWriteContext(DataOutputStream out) {
+    this.out = out;
+  }
+
+  /**
+   * Return the number of message parts that have been written.
+   */
+  public long counter() {
+    return counter;
+  }
+
+  /**
+   * Return the output stream to write to.
+   */
+  public DataOutputStream os() {
+    return out;
+  }
+
+  /**
+   * Start a message part with a given type code.
+   */
+  public DataOutputStream start(int type) throws IOException {
+    counter++;
+    out.writeBoolean(true);
+    out.writeInt(type);
+    return out;
+  }
+
+  /**
+   * End of message parts.
+   */
+  public void end() throws IOException {
+    out.writeBoolean(false);
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/api/TransactionEventTable.java b/src/main/java/io/ebeaninternal/api/TransactionEventTable.java
index fe5338cf4..18ea4f5a3 100644
--- a/src/main/java/io/ebeaninternal/api/TransactionEventTable.java
+++ b/src/main/java/io/ebeaninternal/api/TransactionEventTable.java
@@ -1,10 +1,7 @@
 package io.ebeaninternal.api;
 
 import io.ebean.event.BulkTableEvent;
-import io.ebeaninternal.server.cluster.binarymessage.BinaryMessage;
-import io.ebeaninternal.server.cluster.binarymessage.BinaryMessageList;
 
-import java.io.DataInput;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.Serializable;
@@ -12,7 +9,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-public final class TransactionEventTable implements Serializable {
+public final class TransactionEventTable implements Serializable, BinaryWritable {
 
   private static final long serialVersionUID = 2236555729767483264L;
 
@@ -23,20 +20,13 @@ public final class TransactionEventTable implements Serializable {
     return "TransactionEventTable " + map.values();
   }
 
-  public void writeBinaryMessage(BinaryMessageList msgList) throws IOException {
-
+  @Override
+  public void writeBinary(BinaryWriteContext out) throws IOException {
     for (TableIUD tableIud : map.values()) {
-      tableIud.writeBinaryMessage(msgList);
+      tableIud.writeBinary(out);
     }
   }
 
-  public void readBinaryMessage(DataInput dataInput) throws IOException {
-
-    TableIUD tableIud = TableIUD.readBinaryMessage(dataInput);
-    map.put(tableIud.getTableName(), tableIud);
-  }
-
-
   public void add(TransactionEventTable table) {
 
     for (TableIUD iud : table.values()) {
@@ -47,7 +37,6 @@ public final class TransactionEventTable implements Serializable {
   public void add(String table, boolean insert, boolean update, boolean delete) {
 
     table = table.toUpperCase();
-
     add(new TableIUD(table, insert, update, delete));
   }
 
@@ -67,7 +56,7 @@ public final class TransactionEventTable implements Serializable {
     return map.values();
   }
 
-  public static class TableIUD implements Serializable, BulkTableEvent {
+  public static class TableIUD implements Serializable, BulkTableEvent, BinaryWritable {
 
     private static final long serialVersionUID = -1958317571064162089L;
 
@@ -83,7 +72,7 @@ public final class TransactionEventTable implements Serializable {
       this.delete = delete;
     }
 
-    public static TableIUD readBinaryMessage(DataInput dataInput) throws IOException {
+    public static TableIUD readBinaryMessage(BinaryReadContext dataInput) throws IOException {
 
       String table = dataInput.readUTF();
       boolean insert = dataInput.readBoolean();
@@ -93,17 +82,13 @@ public final class TransactionEventTable implements Serializable {
       return new TableIUD(table, insert, update, delete);
     }
 
-    public void writeBinaryMessage(BinaryMessageList msgList) throws IOException {
-
-      BinaryMessage msg = new BinaryMessage(table.length() + 10);
-      DataOutputStream os = msg.getOs();
-      os.writeInt(BinaryMessage.TYPE_TABLEIUD);
+    @Override
+    public void writeBinary(BinaryWriteContext out) throws IOException {
+      DataOutputStream os = out.start(TYPE_TABLEIUD);
       os.writeUTF(table);
       os.writeBoolean(insert);
       os.writeBoolean(update);
       os.writeBoolean(delete);
-      os.close();
-      msgList.add(msg);
     }
 
     @Override
diff --git a/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java b/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java
index 2d04df0f5..8024087de 100644
--- a/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java
+++ b/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java
@@ -1,9 +1,9 @@
 package io.ebeaninternal.server.cache;
 
-import io.ebeaninternal.server.cluster.binarymessage.BinaryMessage;
-import io.ebeaninternal.server.cluster.binarymessage.BinaryMessageList;
+import io.ebeaninternal.api.BinaryReadContext;
+import io.ebeaninternal.api.BinaryWritable;
+import io.ebeaninternal.api.BinaryWriteContext;
 
-import java.io.DataInput;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * Cache events broadcast across the cluster.
  */
-public class RemoteCacheEvent {
+public class RemoteCacheEvent implements BinaryWritable {
 
   private boolean clearAll;
 
@@ -56,7 +56,7 @@ public class RemoteCacheEvent {
     return "clearAll:" + clearAll + " caches:" + clearCaches;
   }
 
-  public static RemoteCacheEvent readBinaryMessage(DataInput dataInput) throws IOException {
+  public static RemoteCacheEvent readBinaryMessage(BinaryReadContext dataInput) throws IOException {
 
     boolean clearAll = dataInput.readBoolean();
     int size = dataInput.readInt();
@@ -72,13 +72,9 @@ public class RemoteCacheEvent {
     return new RemoteCacheEvent(clearAll, clearCache);
   }
 
-  public void writeBinaryMessage(BinaryMessageList msgList) throws IOException {
-
-    int bufferSize = (clearCaches == null) ? 0 : clearCaches.size() * 30;
-
-    BinaryMessage msg = new BinaryMessage(bufferSize + 10);
-    DataOutputStream os = msg.getOs();
-    os.writeInt(BinaryMessage.TYPE_CACHE);
+  @Override
+  public void writeBinary(BinaryWriteContext out) throws IOException {
+    DataOutputStream os = out.start(TYPE_CACHE);
     os.writeBoolean(clearAll);
     if (clearCaches == null) {
       os.writeInt(0);
@@ -88,7 +84,5 @@ public class RemoteCacheEvent {
         os.writeUTF(cacheName);
       }
     }
-    msgList.add(msg);
-
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/cluster/BinaryTransactionEventReader.java b/src/main/java/io/ebeaninternal/server/cluster/BinaryTransactionEventReader.java
new file mode 100644
index 000000000..aebf45ea4
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/cluster/BinaryTransactionEventReader.java
@@ -0,0 +1,41 @@
+package io.ebeaninternal.server.cluster;
+
+import io.ebeaninternal.api.BinaryReadContext;
+import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.server.transaction.RemoteTransactionEvent;
+
+import java.io.IOException;
+
+/**
+ * Mechanism to convert RemoteTransactionEvent to/from byte[] content.
+ */
+public class BinaryTransactionEventReader {
+
+  private final ServerLookup serverLookup;
+
+  public BinaryTransactionEventReader(ServerLookup serverLookup) {
+    this.serverLookup = serverLookup;
+  }
+
+  /**
+   * Read Transaction from bytes.
+   */
+  public RemoteTransactionEvent read(byte[] byteData) throws IOException {
+    return read(new BinaryReadContext(byteData));
+  }
+
+  /**
+   * Read Transaction using BinaryReadContext.
+   */
+  public RemoteTransactionEvent read(BinaryReadContext dataInput) throws IOException {
+
+    String serverName = dataInput.readUTF();
+    SpiEbeanServer server = (SpiEbeanServer) serverLookup.getServer(serverName);
+    if (server == null) {
+      throw new IllegalStateException("EbeanServer not found for name [" + serverName + "]");
+    }
+    RemoteTransactionEvent event =  new RemoteTransactionEvent(server);
+    event.readBinary(dataInput);
+    return event;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java b/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java
index 6f02f5b50..bffc93a10 100644
--- a/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java
+++ b/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java
@@ -13,7 +13,7 @@ import java.util.concurrent.ConcurrentHashMap;
 /**
  * Manages the cluster service.
  */
-public class ClusterManager implements MessageServerProvider {
+public class ClusterManager implements ServerLookup {
 
   private static final Logger clusterLogger = LoggerFactory.getLogger("io.ebean.Cluster");
 
diff --git a/src/main/java/io/ebeaninternal/server/cluster/MessageServerProvider.java b/src/main/java/io/ebeaninternal/server/cluster/ServerLookup.java
similarity index 85%
rename from src/main/java/io/ebeaninternal/server/cluster/MessageServerProvider.java
rename to src/main/java/io/ebeaninternal/server/cluster/ServerLookup.java
index f3c388d2b..abf835371 100644
--- a/src/main/java/io/ebeaninternal/server/cluster/MessageServerProvider.java
+++ b/src/main/java/io/ebeaninternal/server/cluster/ServerLookup.java
@@ -5,7 +5,7 @@ import io.ebean.EbeanServer;
 /**
  * Returns EbeanServer instances for remote message reading.
  */
-public interface MessageServerProvider {
+public interface ServerLookup {
 
   /**
    * Return the EbeanServer instance by name.
diff --git a/src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryDataReader.java b/src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryDataReader.java
deleted file mode 100644
index f097172f4..000000000
--- a/src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryDataReader.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package io.ebeaninternal.server.cluster.binarymessage;
-
-import io.ebeaninternal.api.SpiEbeanServer;
-import io.ebeaninternal.api.TransactionEventTable;
-import io.ebeaninternal.server.cache.RemoteCacheEvent;
-import io.ebeaninternal.server.cluster.MessageServerProvider;
-import io.ebeaninternal.server.transaction.BeanPersistIds;
-import io.ebeaninternal.server.transaction.RemoteTableMod;
-import io.ebeaninternal.server.transaction.RemoteTransactionEvent;
-
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-
-/**
- * Reads the binary message returning RemoteTransactionEvent.
- */
-class BinaryDataReader {
-
-  private final MessageServerProvider serverProvider;
-  private final DataInputStream dataInput;
-
-  private SpiEbeanServer server;
-  private RemoteTransactionEvent event;
-
-  BinaryDataReader(MessageServerProvider serverProvider, byte[] data) {
-    this.serverProvider = serverProvider;
-    this.dataInput = new DataInputStream(new ByteArrayInputStream(data));
-  }
-
-  /**
-   * Read the binary message returning a RemoteTransactionEvent.
-   */
-  RemoteTransactionEvent read() throws IOException {
-
-    String serverName = dataInput.readUTF();
-
-    this.server = (SpiEbeanServer) serverProvider.getServer(serverName);
-    if (server == null) {
-      throw new IllegalStateException("EbeanServer not found for name [" + serverName + "]");
-    }
-    this.event = new RemoteTransactionEvent(server);
-    boolean more = dataInput.readBoolean();
-    while (more) {
-      readMessage();
-      more = dataInput.readBoolean();
-    }
-    return event;
-  }
-
-  private void readMessage() throws IOException {
-
-    int msgType = dataInput.readInt();
-    switch (msgType) {
-      case BinaryMessage.TYPE_BEANIUD:
-        event.addBeanPersistIds(BeanPersistIds.readBinaryMessage(server, dataInput));
-        break;
-
-      case BinaryMessage.TYPE_TABLEIUD:
-        event.addTableIUD(TransactionEventTable.TableIUD.readBinaryMessage(dataInput));
-        break;
-
-      case BinaryMessage.TYPE_CACHE:
-        event.addRemoteCacheEvent(RemoteCacheEvent.readBinaryMessage(dataInput));
-        break;
-
-      case BinaryMessage.TYPE_TABLEMOD:
-        event.addRemoteTableMod(RemoteTableMod.readBinaryMessage(dataInput));
-        break;
-
-      default:
-        throw new RuntimeException("Invalid Transaction msgType " + msgType);
-    }
-  }
-}
diff --git a/src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryDataWriter.java b/src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryDataWriter.java
deleted file mode 100644
index 8f08bba56..000000000
--- a/src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryDataWriter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package io.ebeaninternal.server.cluster.binarymessage;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-/**
- * Writes BinaryMessageList to DataHolder raw byte[].
- */
-class BinaryDataWriter {
-
-  private final BinaryMessageList messageList;
-
-  private final ByteArrayOutputStream buffer;
-
-  private final DataOutputStream dataOut;
-
-  private final String serverName;
-
-  BinaryDataWriter(String serverName, BinaryMessageList messageList) {
-    this.serverName = serverName;
-    this.messageList = messageList;
-    this.buffer = new ByteArrayOutputStream(256);
-    this.dataOut = new DataOutputStream(buffer);
-  }
-
-  /**
-   * Write the message as raw byte[].
-   */
-  byte[] write() throws IOException {
-
-    //TODO: Add Protocol version and "podId" to support pubsub cluster
-    //dataOut.writeInt(MsgKeys.MESSAGE_KEY);
-    dataOut.writeUTF(serverName);
-    for (BinaryMessage msg : messageList.getList()) {
-      write(msg);
-    }
-    dataOut.writeBoolean(false);
-    dataOut.flush();
-    return buffer.toByteArray();
-  }
-
-  private void write(BinaryMessage msg) throws IOException {
-
-    dataOut.writeBoolean(true);
-    dataOut.write(msg.getByteArray());
-  }
-
-}
diff --git a/src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryMessage.java b/src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryMessage.java
deleted file mode 100644
index 158df57da..000000000
--- a/src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryMessage.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.ebeaninternal.server.cluster.binarymessage;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-
-/**
- * Represents a relatively small independent message.
- * <p>
- * In general terms we break up a potentially large object like
- * RemoteTransactionEvent into many smaller BinaryMessages. This is so that if
- * they don't all fit on a single Packet we can easily break them up and put
- * them on multiple packets.
- * </p>
- * <p>
- * Also note that for the Multicast approach a Packet will generally contain
- * many messages each directed to different members of the cluster. So it would
- * be common for many Ack, Resend and Control messages to all be contained in a
- * single packet.
- * </p>
- */
-public class BinaryMessage {
-
-  public static final int TYPE_MSGCONTROL = 0;
-  public static final int TYPE_BEANIUD = 1;
-  public static final int TYPE_TABLEIUD = 2;
-  public static final int TYPE_CACHE = 3;
-  public static final int TYPE_TABLEMOD = 4;
-
-  public static final int TYPE_MSGACK = 8;
-  public static final int TYPE_MSGRESEND = 9;
-
-  private final ByteArrayOutputStream buffer;
-  private final DataOutputStream os;
-  private byte[] bytes;
-
-  /**
-   * Create with an estimated buffer size.
-   */
-  public BinaryMessage(int bufSize) {
-    this.buffer = new ByteArrayOutputStream(bufSize);
-    this.os = new DataOutputStream(buffer);
-  }
-
-  /**
-   * Return the DataOutputStream to write content to.
-   */
-  public DataOutputStream getOs() {
-    return os;
-  }
-
-  /**
-   * Return all the content as a byte array.
-   */
-  public byte[] getByteArray() {
-    if (bytes == null) {
-      bytes = buffer.toByteArray();
-    }
-    return bytes;
-  }
-}
diff --git a/src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryMessageList.java b/src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryMessageList.java
deleted file mode 100644
index fd057fd03..000000000
--- a/src/main/java/io/ebeaninternal/server/cluster/binarymessage/BinaryMessageList.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.ebeaninternal.server.cluster.binarymessage;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Holds a List of BinaryMessage's.
- */
-public class BinaryMessageList {
-
-  final List<BinaryMessage> list = new ArrayList<>();
-
-  public void add(BinaryMessage msg) {
-    list.add(msg);
-  }
-
-  public List<BinaryMessage> getList() {
-    return list;
-  }
-
-}
diff --git a/src/main/java/io/ebeaninternal/server/cluster/binarymessage/ClusterMessage.java b/src/main/java/io/ebeaninternal/server/cluster/binarymessage/ClusterMessage.java
deleted file mode 100644
index 2e6b189ea..000000000
--- a/src/main/java/io/ebeaninternal/server/cluster/binarymessage/ClusterMessage.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package io.ebeaninternal.server.cluster.binarymessage;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-/**
- * The message broadcast around the cluster.
- */
-public class ClusterMessage {
-
-  private static final int MAX_LENGTH = 10 * 1024 * 1024;
-
-  private final String registerIp;
-
-  private final String podName;
-
-  private final boolean register;
-
-  private final byte[] data;
-
-  /**
-   * Create a register message.
-   */
-  public static ClusterMessage register(String registerIp, boolean register, String podName) {
-    return new ClusterMessage(registerIp, register, podName);
-  }
-
-  /**
-   * Create a transaction message.
-   */
-  public static ClusterMessage transEvent(byte[] data) {
-    return new ClusterMessage(data);
-  }
-
-  /**
-   * Create for register online/offline message.
-   */
-  private ClusterMessage(String registerIp, boolean register, String podName) {
-    this.registerIp = registerIp;
-    this.register = register;
-    this.podName = podName;
-    this.data = null;
-  }
-
-  /**
-   * Create for a transaction message.
-   */
-  private ClusterMessage(byte[] data) {
-    this.data = data;
-    this.registerIp = null;
-    this.podName = null;
-    this.register = false;
-  }
-
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    if (registerIp != null) {
-      sb.append("register ");
-      sb.append(register);
-      sb.append(" ");
-      sb.append(registerIp);
-    } else {
-      sb.append("[data]");
-    }
-    return sb.toString();
-  }
-
-  /**
-   * Return true if this is a register event as opposed to a transaction message.
-   */
-  public boolean isRegisterEvent() {
-    return registerIp != null;
-  }
-
-  /**
-   * Return the register host for online/offline message.
-   */
-  public String getRegisterIp() {
-    return registerIp;
-  }
-
-  public String getPodName() {
-    return podName;
-  }
-
-  /**
-   * Return true if register is true for a online/offline message.
-   */
-  public boolean isRegister() {
-    return register;
-  }
-
-  /**
-   * Return the raw message data.
-   */
-  public byte[] getData() {
-    return data;
-  }
-
-  /**
-   * Write the message in binary form.
-   */
-  public void write(DataOutputStream dataOutput) throws IOException {
-
-    if (data != null) {
-      // write data message
-      dataOutput.writeInt(MsgKeys.DATA);
-      dataOutput.writeInt(data.length);
-      dataOutput.write(data);
-    } else {
-      // write header message
-      dataOutput.writeInt(MsgKeys.HEADER);
-      dataOutput.writeUTF(getRegisterIp());
-      dataOutput.writeBoolean(register);
-      dataOutput.writeUTF(getPodName());
-    }
-    dataOutput.flush();
-  }
-
-  /**
-   * Read the message from binary form.
-   */
-  public static ClusterMessage read(DataInputStream dataInput) throws IOException, InvalidMessageException {
-
-    int key = dataInput.readInt();
-    if (key == MsgKeys.DATA) {
-      int length = dataInput.readInt();
-      if (length > MAX_LENGTH) {
-        throw new IOException("Message data too large length:"+length);
-      }
-      byte[] data = new byte[length];
-      dataInput.readFully(data);
-      return new ClusterMessage(data);
-
-    } else if (key == MsgKeys.HEADER) {
-      String host = dataInput.readUTF();
-      boolean registered = dataInput.readBoolean();
-      String podName = dataInput.readUTF();
-      return new ClusterMessage(host, registered, podName);
-
-    } else {
-      throw new InvalidMessageException("Invalid message key:" + key);
-    }
-  }
-
-}
diff --git a/src/main/java/io/ebeaninternal/server/cluster/binarymessage/InvalidMessageException.java b/src/main/java/io/ebeaninternal/server/cluster/binarymessage/InvalidMessageException.java
deleted file mode 100644
index d05d0b3c2..000000000
--- a/src/main/java/io/ebeaninternal/server/cluster/binarymessage/InvalidMessageException.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.ebeaninternal.server.cluster.binarymessage;
-
-public class InvalidMessageException extends Exception {
-
-	public InvalidMessageException(String message) {
-		super(message);
-	}
-}
diff --git a/src/main/java/io/ebeaninternal/server/cluster/binarymessage/MessageReadWrite.java b/src/main/java/io/ebeaninternal/server/cluster/binarymessage/MessageReadWrite.java
deleted file mode 100644
index fe7cab1c2..000000000
--- a/src/main/java/io/ebeaninternal/server/cluster/binarymessage/MessageReadWrite.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package io.ebeaninternal.server.cluster.binarymessage;
-
-import io.ebeaninternal.server.cluster.MessageServerProvider;
-import io.ebeaninternal.server.transaction.RemoteTransactionEvent;
-
-import java.io.IOException;
-
-/**
- * Mechanism to convert RemoteTransactionEvent to/from byte[] content.
- */
-public class MessageReadWrite {
-
-  private final MessageServerProvider serverProvider;
-
-  public MessageReadWrite(MessageServerProvider serverProvider) {
-    this.serverProvider = serverProvider;
-  }
-
-  /**
-   * Convert the RemoteTransactionEvent to raw byte[] content.
-   */
-  public byte[] write(RemoteTransactionEvent transEvent) throws IOException {
-
-    BinaryMessageList messageList = new BinaryMessageList();
-    transEvent.writeBinaryMessage(messageList);
-
-    return new BinaryDataWriter(transEvent.getServerName(), messageList).write();
-  }
-
-  /**
-   * Convert the byte[] content to RemoteTransactionEvent.
-   */
-  public RemoteTransactionEvent read(byte[] data) throws IOException {
-
-    return new BinaryDataReader(serverProvider, data).read();
-  }
-}
diff --git a/src/main/java/io/ebeaninternal/server/cluster/binarymessage/MsgKeys.java b/src/main/java/io/ebeaninternal/server/cluster/binarymessage/MsgKeys.java
deleted file mode 100644
index 9daeaa9bd..000000000
--- a/src/main/java/io/ebeaninternal/server/cluster/binarymessage/MsgKeys.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.ebeaninternal.server.cluster.binarymessage;
-
-public interface MsgKeys {
-
-	/**
-	 * Used to identify client on connection initiation.
-	 */
-	int HELLO = 182;
-
-	/**
-	 * Used to confirm protocol on reading messages.
-	 */
-	int HEADER = 11;
-
-	/**
-	 * Used to confirm protocol on reading messages.
-	 */
-	int DATA = 12;
-}
diff --git a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
index 934877759..25ebea220 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
@@ -1,8 +1,9 @@
 package io.ebeaninternal.server.transaction;
 
+import io.ebeaninternal.api.BinaryReadContext;
+import io.ebeaninternal.api.BinaryWritable;
+import io.ebeaninternal.api.BinaryWriteContext;
 import io.ebeaninternal.api.SpiEbeanServer;
-import io.ebeaninternal.server.cluster.binarymessage.BinaryMessage;
-import io.ebeaninternal.server.cluster.binarymessage.BinaryMessageList;
 import io.ebeaninternal.server.core.PersistRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.id.IdBinder;
@@ -27,7 +28,7 @@ import java.util.List;
  * size of data sent around the network.
  * </p>
  */
-public class BeanPersistIds {
+public class BeanPersistIds implements BinaryWritable {
 
   private final BeanDescriptor<?> beanDescriptor;
 
@@ -45,21 +46,20 @@ public class BeanPersistIds {
     this.descriptorId = desc.getDescriptorId();
   }
 
-  public static BeanPersistIds readBinaryMessage(SpiEbeanServer server, DataInput dataInput) throws IOException {
+  public static BeanPersistIds readBinaryMessage(SpiEbeanServer server, BinaryReadContext input) throws IOException {
 
-    String descriptorId = dataInput.readUTF();
-    BeanDescriptor<?> desc = server.getBeanDescriptorById(descriptorId);
+    BeanDescriptor<?> desc = server.getBeanDescriptorById(input.readUTF());
     BeanPersistIds bp = new BeanPersistIds(desc);
-    bp.read(dataInput);
+    bp.read(input);
     return bp;
   }
 
-  private void read(DataInput dataInput) throws IOException {
+  private void read(BinaryReadContext dataInput) throws IOException {
 
     IdBinder idBinder = beanDescriptor.getIdBinder();
 
     int iudType = dataInput.readInt();
-    List<Object> idList = readIdList(dataInput, idBinder);
+    List<Object> idList = readIdList(dataInput.in(), idBinder);
     switch (iudType) {
       case 0:
         insertIds = idList;
@@ -76,20 +76,28 @@ public class BeanPersistIds {
     }
   }
 
-  /**
-   * Write the contents into a BinaryMessage form.
-   * <p>
-   * For a RemoteBeanPersist with a large number of id's note that this is
-   * broken up into many BinaryMessages each with a maximum of 100 ids. This
-   * enables the contents of a large RemoteTransactionEvent to be split up
-   * across multiple Packets.
-   * </p>
-   */
-  void writeBinaryMessage(BinaryMessageList msgList) throws IOException {
+  @Override
+  public void writeBinary(BinaryWriteContext out) throws IOException {
+    writeBinaryList(out, 0, insertIds);
+    writeBinaryList(out, 1, updateIds);
+    writeBinaryList(out, 2, deleteIds);
+  }
 
-    writeIdList(beanDescriptor, 0, insertIds, msgList);
-    writeIdList(beanDescriptor, 1, updateIds, msgList);
-    writeIdList(beanDescriptor, 2, deleteIds, msgList);
+  private void writeBinaryList(BinaryWriteContext out, int type, List<Object> ids) throws IOException {
+
+    if (ids != null) {
+      IdBinder idBinder = beanDescriptor.getIdBinder();
+      int count = ids.size();
+
+      DataOutputStream os = out.start(TYPE_BEANIUD);
+      os.writeUTF(descriptorId);
+      os.writeInt(type);
+      os.writeInt(count);
+      for (Object insertId : ids) {
+        idBinder.writeData(os, insertId);
+      }
+      os.flush();
+    }
   }
 
   private List<Object> readIdList(DataInput dataInput, IdBinder idBinder) throws IOException {
@@ -105,48 +113,6 @@ public class BeanPersistIds {
     return idList;
   }
 
-  /**
-   * Write a BinaryMessage containing the descriptorId, iudType and list of Id
-   * values.
-   * <p>
-   * Note that a given BinaryMessage has a maximum of 100 Ids. This is due to
-   * the limit of UDP packet sizes. We break up the RemoteBeanPersist into
-   * potentially many smaller BinaryMessages which may be put into multiple
-   * Packets.
-   * </p>
-   */
-  private void writeIdList(BeanDescriptor<?> desc, int iudType, List<Object> idList, BinaryMessageList msgList) throws IOException {
-
-    IdBinder idBinder = desc.getIdBinder();
-
-    int count = idList == null ? 0 : idList.size();
-    if (count > 0) {
-      int loop = 0;
-      int i = 0;
-      int eof = idList.size();
-      do {
-        ++loop;
-        int endOfLoop = Math.min(eof, loop * 100);
-
-        BinaryMessage m = new BinaryMessage(endOfLoop * 4 + 20);
-
-        DataOutputStream os = m.getOs();
-        os.writeInt(BinaryMessage.TYPE_BEANIUD);
-        os.writeUTF(descriptorId);
-        os.writeInt(iudType);
-        os.writeInt(count);
-
-        for (; i < endOfLoop; i++) {
-          idBinder.writeData(os, idList.get(i));
-        }
-
-        os.close();
-        msgList.add(m);
-
-      } while (i < eof);
-    }
-  }
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java b/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java
index 1c6eda418..0234a6aba 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java
@@ -1,15 +1,15 @@
 package io.ebeaninternal.server.transaction;
 
-import io.ebeaninternal.server.cluster.binarymessage.BinaryMessage;
-import io.ebeaninternal.server.cluster.binarymessage.BinaryMessageList;
+import io.ebeaninternal.api.BinaryReadContext;
+import io.ebeaninternal.api.BinaryWritable;
+import io.ebeaninternal.api.BinaryWriteContext;
 
-import java.io.DataInput;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-public class RemoteTableMod {
+public class RemoteTableMod implements BinaryWritable {
 
   private final long timestamp;
 
@@ -28,7 +28,7 @@ public class RemoteTableMod {
     return tables;
   }
 
-  public static RemoteTableMod readBinaryMessage(DataInput dataInput) throws IOException {
+  public static RemoteTableMod readBinaryMessage(BinaryReadContext dataInput) throws IOException {
 
     long timestamp = dataInput.readLong();
     int count = dataInput.readInt();
@@ -40,16 +40,14 @@ public class RemoteTableMod {
     return new RemoteTableMod(timestamp, tables);
   }
 
-  public void writeBinary(BinaryMessageList msgList) throws IOException {
-    BinaryMessage msg = new BinaryMessage(tables.size() * 20  + 30);
-    DataOutputStream os = msg.getOs();
-    os.writeInt(BinaryMessage.TYPE_TABLEMOD);
+  @Override
+  public void writeBinary(BinaryWriteContext out) throws IOException {
+    DataOutputStream os = out.start(TYPE_TABLEMOD);
     os.writeLong(timestamp);
     os.writeInt(tables.size());
     for (String table : tables) {
       os.writeUTF(table);
     }
-    os.close();
-    msgList.add(msg);
   }
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java b/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java
index 54112ca66..17004bf34 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java
@@ -1,15 +1,20 @@
 package io.ebeaninternal.server.transaction;
 
+import io.ebeaninternal.api.BinaryReadContext;
+import io.ebeaninternal.api.BinaryWritable;
+import io.ebeaninternal.api.BinaryWriteContext;
 import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.api.TransactionEventTable;
 import io.ebeaninternal.api.TransactionEventTable.TableIUD;
 import io.ebeaninternal.server.cache.RemoteCacheEvent;
-import io.ebeaninternal.server.cluster.binarymessage.BinaryMessageList;
 
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-public class RemoteTransactionEvent implements Runnable {
+public class RemoteTransactionEvent implements Runnable, BinaryWritable {
 
   private final List<BeanPersistIds> beanPersistList = new ArrayList<>();
 
@@ -25,10 +30,16 @@ public class RemoteTransactionEvent implements Runnable {
 
   private transient SpiEbeanServer server;
 
+  /**
+   * Create for sending to other servers in the cluster.
+   */
   public RemoteTransactionEvent(String serverName) {
     this.serverName = serverName;
   }
 
+  /**
+   * Create from Reading and processing from remote server.
+   */
   public RemoteTransactionEvent(SpiEbeanServer server) {
     this.server = server;
   }
@@ -53,30 +64,86 @@ public class RemoteTransactionEvent implements Runnable {
     return sb.toString();
   }
 
-  public void writeBinaryMessage(BinaryMessageList msgList) throws IOException {
+  /**
+   * Read the binary message.
+   */
+  public void readBinary(BinaryReadContext dataInput) throws IOException {
+
+    boolean more = dataInput.readBoolean();
+    while (more) {
+      int msgType = dataInput.readInt();
+      readBinaryMessage(msgType, dataInput);
+      more = dataInput.readBoolean();
+    }
+  }
+
+  private void readBinaryMessage(int msgType, BinaryReadContext dataInput) throws IOException {
+
+    switch (msgType) {
+      case BinaryWritable.TYPE_BEANIUD:
+        addBeanPersistIds(BeanPersistIds.readBinaryMessage(server, dataInput));
+        break;
+
+      case BinaryWritable.TYPE_TABLEIUD:
+        addTableIUD(TransactionEventTable.TableIUD.readBinaryMessage(dataInput));
+        break;
+
+      case BinaryWritable.TYPE_CACHE:
+        addRemoteCacheEvent(RemoteCacheEvent.readBinaryMessage(dataInput));
+        break;
+
+      case BinaryWritable.TYPE_TABLEMOD:
+        addRemoteTableMod(RemoteTableMod.readBinaryMessage(dataInput));
+        break;
+
+      default:
+        throw new RuntimeException("Invalid Transaction msgType " + msgType);
+    }
+  }
+
+  /**
+   * Write a binary message to byte array given an initial buffer size.
+   */
+  public byte[] writeBinaryAsBytes(int bufferSize) throws IOException {
+
+    ByteArrayOutputStream buffer = new ByteArrayOutputStream(bufferSize);
+    DataOutputStream out = new DataOutputStream(buffer);
+    BinaryWriteContext context = new BinaryWriteContext(out);
+
+    writeBinary(context);
+    out.close();
+
+    return buffer.toByteArray();
+  }
+
+  @Override
+  public void writeBinary(BinaryWriteContext out) throws IOException {
+
+    DataOutputStream os = out.os();
+    //os.writeInt(TRANSACTION_EVENT);
+    os.writeUTF(serverName);
 
     if (remoteTableMod != null) {
-      remoteTableMod.writeBinary(msgList);
+      remoteTableMod.writeBinary(out);
     }
-
     if (tableList != null) {
       for (TableIUD aTableList : tableList) {
-        aTableList.writeBinaryMessage(msgList);
+        aTableList.writeBinary(out);
       }
     }
-
     if (deleteByIdMap != null) {
       for (BeanPersistIds deleteIds : deleteByIdMap.values()) {
-        deleteIds.writeBinaryMessage(msgList);
+        deleteIds.writeBinary(out);
       }
     }
-
     for (BeanPersistIds aBeanPersistList : beanPersistList) {
-      aBeanPersistList.writeBinaryMessage(msgList);
+      aBeanPersistList.writeBinary(out);
     }
     if (remoteCacheEvent != null) {
-      remoteCacheEvent.writeBinaryMessage(msgList);
+      remoteCacheEvent.writeBinary(out);
     }
+    out.end();
+    os.flush();
   }
 
   public boolean isEmpty() {
diff --git a/src/test/java/io/ebeaninternal/server/cluster/binarymessage/MessageReadWriteTest.java b/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java
similarity index 86%
rename from src/test/java/io/ebeaninternal/server/cluster/binarymessage/MessageReadWriteTest.java
rename to src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java
index cf5eeee87..d696aa096 100644
--- a/src/test/java/io/ebeaninternal/server/cluster/binarymessage/MessageReadWriteTest.java
+++ b/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java
@@ -5,7 +5,8 @@ import io.ebean.EbeanServer;
 import io.ebeaninternal.api.TDSpiEbeanServer;
 import io.ebeaninternal.api.TransactionEventTable;
 import io.ebeaninternal.server.cache.RemoteCacheEvent;
-import io.ebeaninternal.server.cluster.MessageServerProvider;
+import io.ebeaninternal.server.cluster.BinaryTransactionEventReader;
+import io.ebeaninternal.server.cluster.ServerLookup;
 import io.ebeaninternal.server.core.PersistRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.transaction.BeanPersistIds;
@@ -22,13 +23,13 @@ import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class MessageReadWriteTest extends BaseTestCase {
+public class BinaryTransactionEventReadWriteTest extends BaseTestCase {
 
   private BeanDescriptor<Customer> customerBeanDescriptor = getBeanDescriptor(Customer.class);
 
   private TDEbeanServer mockEbeanServer = new TDEbeanServer();
 
-  private MessageReadWrite readWrite = new MessageReadWrite(new TDMessageServerProvider());
+  private BinaryTransactionEventReader reader = new BinaryTransactionEventReader(new TDServerLookup());
 
   @Override
   protected <T> BeanDescriptor<T> getBeanDescriptor(Class<T> cls) {
@@ -59,9 +60,8 @@ public class MessageReadWriteTest extends BaseTestCase {
 
     event.addBeanPersistIds(beanPersistIds);
 
-    byte[] binaryMessage = readWrite.write(event);
-
-    RemoteTransactionEvent read = readWrite.read(binaryMessage);
+    byte[] binaryMessage = event.writeBinaryAsBytes(256);
+    RemoteTransactionEvent read = reader.read(binaryMessage);
 
     // cache event
     RemoteCacheEvent remoteCacheEvent = read.getRemoteCacheEvent();
@@ -91,9 +91,8 @@ public class MessageReadWriteTest extends BaseTestCase {
 
     event.addRemoteTableMod(new RemoteTableMod(timestamp, tables));
 
-    byte[] binaryMessage = readWrite.write(event);
-
-    RemoteTransactionEvent read = readWrite.read(binaryMessage);
+    byte[] binaryMessage = event.writeBinaryAsBytes(256);
+    RemoteTransactionEvent read = reader.read(binaryMessage);
 
     RemoteTableMod remoteTableMod = read.getRemoteTableMod();
 
@@ -101,7 +100,7 @@ public class MessageReadWriteTest extends BaseTestCase {
     assertThat(remoteTableMod.getTables()).isEqualTo(tables);
   }
 
-  class TDMessageServerProvider implements MessageServerProvider {
+  class TDServerLookup implements ServerLookup {
 
     @Override
     public EbeanServer getServer(String name) {

From bf33b3f96f6206750fa9b3b560f9a7942e4b4d27 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 17 Jun 2018 23:29:11 +1200
Subject: [PATCH 0338/1036] #1431 - Refactor internals for
 RemoteTransactionEvent binary serialisation

---
 .../server/transaction/PostCommitProcessing.java         | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java b/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
index c84593646..9797693fb 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
@@ -169,7 +169,9 @@ final class PostCommitProcessing {
       Set<String> touched = cacheChanges.touchedTables();
       if (touched != null && !touched.isEmpty()) {
         manager.processTouchedTables(touched, cacheChanges.modificationTimestamp());
-        // TODO: Propagate touched tables to other cluster members
+        if (remoteTransactionEvent != null) {
+          remoteTransactionEvent.addRemoteTableMod(new RemoteTableMod(cacheChanges.modificationTimestamp(), touched));
+        }
       }
       cacheChanges.apply();
     }
@@ -210,11 +212,6 @@ final class PostCommitProcessing {
     }
 
     RemoteTransactionEvent remoteTransactionEvent = new RemoteTransactionEvent(serverName);
-
-    Set<String> touched = cacheChanges.touchedTables();
-    if (touched != null && !touched.isEmpty()) {
-      remoteTransactionEvent.addRemoteTableMod(new RemoteTableMod(cacheChanges.modificationTimestamp(), touched));
-    }
     if (beanPersistIdMap != null) {
       for (BeanPersistIds beanPersist : beanPersistIdMap.values()) {
         remoteTransactionEvent.addBeanPersistIds(beanPersist);

From 085843339f787342c9c13eb7ac5fde52dd3884a1 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 17 Jun 2018 23:34:27 +1200
Subject: [PATCH 0339/1036] #1432 - Refactor internals for
 RemoteTransactionEvent / BeanPersistIds ... to not send inserted ids

---
 .../server/deploy/BeanDescriptor.java         |   7 +
 .../deploy/BeanDescriptorCacheHelp.java       |  15 ++
 .../server/transaction/BeanPersistIdMap.java  |   6 +-
 .../server/transaction/BeanPersistIds.java    | 129 ++++--------------
 .../server/transaction/DeleteByIdMap.java     |  17 +--
 .../transaction/RemoteTransactionEvent.java   |   2 -
 .../BinaryTransactionEventReadWriteTest.java  |   7 +-
 7 files changed, 61 insertions(+), 122 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 60b5ed482..12ffbcb19 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -1476,6 +1476,13 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     cacheHelp.beanCacheRemove(id);
   }
 
+  /**
+   * Remove a collection of beans from the cache given the ids.
+   */
+  public void cacheHandleInvalidate(Collection<Object> ids) {
+    cacheHelp.beanCacheInvalidate(ids);
+  }
+
   /**
    * Returns true if it managed to populate/load the bean from the cache.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index 07f326e6c..d10bd85a6 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -680,6 +680,21 @@ final class BeanDescriptorCacheHelp<T> {
     return bean;
   }
 
+  /**
+   * Remove a bean from the cache given its Id.
+   */
+  void beanCacheInvalidate(Collection<Object> ids) {
+    if (beanCache != null) {
+      if (beanLog.isDebugEnabled()) {
+        beanLog.debug("   REMOVE {}({})", cacheName, ids);
+      }
+      beanCache.removeAll(new HashSet<>(ids));
+    }
+    for (BeanPropertyAssocOne<?> imported : propertiesOneImported) {
+      imported.cacheClear();
+    }
+  }
+
   /**
    * Remove a bean from the cache given its Id.
    */
diff --git a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIdMap.java b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIdMap.java
index a292edf01..0bcbcb381 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIdMap.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIdMap.java
@@ -34,14 +34,12 @@ public final class BeanPersistIdMap {
   public void add(BeanDescriptor<?> desc, PersistRequest.Type type, Object id) {
 
     BeanPersistIds r = getPersistIds(desc);
-    r.addId(type, (Serializable) id);
+    r.addId(type, id);
   }
 
   private BeanPersistIds getPersistIds(BeanDescriptor<?> desc) {
     String beanType = desc.getFullName();
-    BeanPersistIds r = beanMap.computeIfAbsent(beanType, k -> new BeanPersistIds(desc));
-    return r;
+    return beanMap.computeIfAbsent(beanType, k -> new BeanPersistIds(desc));
   }
 
-
 }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
index 25ebea220..13810e4fe 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
@@ -34,9 +34,10 @@ public class BeanPersistIds implements BinaryWritable {
 
   private final String descriptorId;
 
-  private List<Object> insertIds;
-  private List<Object> updateIds;
-  private List<Object> deleteIds;
+  /**
+   * The ids to invalidate from the cache (updates and deletes).
+   */
+  private List<Object> ids;
 
   /**
    * Create the payload.
@@ -56,47 +57,24 @@ public class BeanPersistIds implements BinaryWritable {
 
   private void read(BinaryReadContext dataInput) throws IOException {
 
-    IdBinder idBinder = beanDescriptor.getIdBinder();
-
-    int iudType = dataInput.readInt();
-    List<Object> idList = readIdList(dataInput.in(), idBinder);
-    switch (iudType) {
-      case 0:
-        insertIds = idList;
-        break;
-      case 1:
-        updateIds = idList;
-        break;
-      case 2:
-        deleteIds = idList;
-        break;
-
-      default:
-        throw new RuntimeException("Invalid iudType " + iudType);
-    }
+    dataInput.readInt(); // legacy read type
+    ids = readIdList(dataInput.in(), beanDescriptor.getIdBinder());
   }
 
   @Override
   public void writeBinary(BinaryWriteContext out) throws IOException {
-    writeBinaryList(out, 0, insertIds);
-    writeBinaryList(out, 1, updateIds);
-    writeBinaryList(out, 2, deleteIds);
-  }
 
-  private void writeBinaryList(BinaryWriteContext out, int type, List<Object> ids) throws IOException {
-
-    if (ids != null) {
+    DataOutputStream os = out.start(TYPE_BEANIUD);
+    os.writeUTF(descriptorId);
+    os.writeInt(1); // legacy marker for update
+    if (ids == null) {
+      os.writeInt(0);
+    } else {
+      os.writeInt(ids.size());
       IdBinder idBinder = beanDescriptor.getIdBinder();
-      int count = ids.size();
-
-      DataOutputStream os = out.start(TYPE_BEANIUD);
-      os.writeUTF(descriptorId);
-      os.writeInt(type);
-      os.writeInt(count);
-      for (Object insertId : ids) {
-        idBinder.writeData(os, insertId);
+      for (Object idValue : ids) {
+        idBinder.writeData(os, idValue);
       }
-      os.flush();
     }
   }
 
@@ -121,90 +99,37 @@ public class BeanPersistIds implements BinaryWritable {
     } else {
       sb.append("descId:").append(descriptorId);
     }
-    if (insertIds != null) {
-      sb.append(" insertIds:").append(insertIds);
-    }
-    if (updateIds != null) {
-      sb.append(" updateIds:").append(updateIds);
-    }
-    if (deleteIds != null) {
-      sb.append(" deleteIds:").append(deleteIds);
+    if (ids != null) {
+      sb.append(" ids:").append(ids);
     }
     return sb.toString();
   }
 
-  public void addId(PersistRequest.Type type, Serializable id) {
-    switch (type) {
-      case INSERT:
-        addInsertId(id);
-        break;
-      case UPDATE:
-        addUpdateId(id);
-        break;
-      case DELETE:
-      case DELETE_SOFT:
-        addDeleteId(id);
-        break;
-
-      default:
-        break;
+  public void addId(PersistRequest.Type type, Object id) {
+    if (type != PersistRequest.Type.INSERT) {
+      if (ids == null) {
+        ids = new ArrayList<>();
+      }
+      ids.add(id);
     }
   }
 
-  private void addInsertId(Serializable id) {
-    if (insertIds == null) {
-      insertIds = new ArrayList<>();
-    }
-    insertIds.add(id);
-  }
-
-  private void addUpdateId(Serializable id) {
-    if (updateIds == null) {
-      updateIds = new ArrayList<>();
-    }
-    updateIds.add(id);
-  }
-
-  private void addDeleteId(Serializable id) {
-    if (deleteIds == null) {
-      deleteIds = new ArrayList<>();
-    }
-    deleteIds.add(id);
-  }
-
   public BeanDescriptor<?> getBeanDescriptor() {
     return beanDescriptor;
   }
 
-  public List<Object> getDeleteIds() {
-    return deleteIds;
-  }
-
-  public List<Object> getInsertIds() {
-    return insertIds;
-  }
-
-  public List<Object> getUpdateIds() {
-    return updateIds;
+  public List<Object> getIds() {
+    return ids;
   }
 
   /**
    * Notify the cache of this event that came from another server in the cluster.
    */
   void notifyCacheAndListener() {
-
     // any change invalidates the query cache
     beanDescriptor.clearQueryCache();
-
-    if (updateIds != null) {
-      for (Object id : updateIds) {
-        beanDescriptor.cacheHandleDeleteById(id);
-      }
-    }
-    if (deleteIds != null) {
-      for (Object id : deleteIds) {
-        beanDescriptor.cacheHandleDeleteById(id);
-      }
+    if (ids != null) {
+      beanDescriptor.cacheHandleInvalidate(ids);
     }
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java b/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java
index f92691cde..1bf84c0c2 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java
@@ -28,12 +28,10 @@ public final class DeleteByIdMap {
   public void notifyCache(CacheChangeSet changeSet) {
     for (BeanPersistIds deleteIds : beanMap.values()) {
       BeanDescriptor<?> d = deleteIds.getBeanDescriptor();
-      List<Object> idValues = deleteIds.getDeleteIds();
+      List<Object> idValues = deleteIds.getIds();
       if (idValues != null) {
         d.queryCacheClear(changeSet);
-        for (Object idValue : idValues) {
-          d.cacheHandleDeleteById(idValue, changeSet);
-        }
+        d.cacheHandleInvalidate(idValues);
       }
     }
   }
@@ -52,7 +50,7 @@ public final class DeleteByIdMap {
   public void add(BeanDescriptor<?> desc, Object id) {
 
     BeanPersistIds r = getPersistIds(desc);
-    r.addId(PersistRequest.Type.DELETE, (Serializable) id);
+    r.addId(PersistRequest.Type.DELETE, id);
   }
 
   /**
@@ -61,15 +59,14 @@ public final class DeleteByIdMap {
   public void addList(BeanDescriptor<?> desc, List<Object> idList) {
 
     BeanPersistIds r = getPersistIds(desc);
-    for (Object anIdList : idList) {
-      r.addId(PersistRequest.Type.DELETE, (Serializable) anIdList);
+    for (Object idValue : idList) {
+      r.addId(PersistRequest.Type.DELETE, idValue);
     }
   }
 
   private BeanPersistIds getPersistIds(BeanDescriptor<?> desc) {
     String beanType = desc.getFullName();
-    BeanPersistIds r = beanMap.computeIfAbsent(beanType, k -> new BeanPersistIds(desc));
-    return r;
+    return beanMap.computeIfAbsent(beanType, k -> new BeanPersistIds(desc));
   }
 
   /**
@@ -83,7 +80,7 @@ public final class DeleteByIdMap {
         // Add to queue or bulk update entries
         boolean queue = (DocStoreMode.QUEUE == mode);
         String queueId = desc.getDocStoreQueueId();
-        List<Object> idValues = deleteIds.getDeleteIds();
+        List<Object> idValues = deleteIds.getIds();
         if (idValues != null) {
           for (Object idValue : idValues) {
             if (queue) {
diff --git a/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java b/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java
index 17004bf34..c89a255d1 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java
@@ -120,9 +120,7 @@ public class RemoteTransactionEvent implements Runnable, BinaryWritable {
   public void writeBinary(BinaryWriteContext out) throws IOException {
 
     DataOutputStream os = out.os();
-    //os.writeInt(TRANSACTION_EVENT);
     os.writeUTF(serverName);
-
     if (remoteTableMod != null) {
       remoteTableMod.writeBinary(out);
     }
diff --git a/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java b/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java
index d696aa096..afeff01d3 100644
--- a/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java
+++ b/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java
@@ -57,6 +57,7 @@ public class BinaryTransactionEventReadWriteTest extends BaseTestCase {
     beanPersistIds.addId(PersistRequest.Type.INSERT, 43);
     beanPersistIds.addId(PersistRequest.Type.UPDATE, 55);
     beanPersistIds.addId(PersistRequest.Type.DELETE, 66);
+    beanPersistIds.addId(PersistRequest.Type.UPDATE, 92);
 
     event.addBeanPersistIds(beanPersistIds);
 
@@ -74,10 +75,8 @@ public class BinaryTransactionEventReadWriteTest extends BaseTestCase {
 
     // Bean persist ids
     List<BeanPersistIds> beanPersistList = read.getBeanPersistList();
-    assertThat(beanPersistList).hasSize(3);
-    assertThat(beanPersistList.get(0).getInsertIds()).containsOnly(42, 43);
-    assertThat(beanPersistList.get(1).getUpdateIds()).containsOnly(55);
-    assertThat(beanPersistList.get(2).getDeleteIds()).containsOnly(66);
+    assertThat(beanPersistList).hasSize(1);
+    assertThat(beanPersistList.get(0).getIds()).containsOnly(55, 66, 92);
   }
 
   @Test

From 117737c790605ba9403ddfe9eaec583948d2ef06 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 18 Jun 2018 20:02:14 +1200
Subject: [PATCH 0340/1036] #1433 - Remove
 io.ebeaninternal.api.SpiContainerBootup ... which was replaced by
 io.ebean.config.AutoConfigure

---
 .../ebeaninternal/api/SpiContainerBootup.java  | 18 ------------------
 .../server/core/DefaultContainer.java          | 18 ------------------
 2 files changed, 36 deletions(-)
 delete mode 100644 src/main/java/io/ebeaninternal/api/SpiContainerBootup.java

diff --git a/src/main/java/io/ebeaninternal/api/SpiContainerBootup.java b/src/main/java/io/ebeaninternal/api/SpiContainerBootup.java
deleted file mode 100644
index 324da0e60..000000000
--- a/src/main/java/io/ebeaninternal/api/SpiContainerBootup.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.ebeaninternal.api;
-
-/**
- * Plugin API available to invoke something prior to container bootup.
- * <p>
- * The initial intent is to provide a hook for 'docker-run' such that we can automatically ensure
- * we have a test DB docker container running and setup ready to go.
- * </p>
- */
-public interface SpiContainerBootup {
-
-  /**
-   * Run something at bootup prior to the container starting.
-   *
-   * For example, start DB docker container(s).
-   */
-  void bootup();
-}
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index 0428a8893..5b9f111d7 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -1,9 +1,5 @@
 package io.ebeaninternal.server.core;
 
-import io.ebean.BackgroundExecutor;
-import io.ebean.cache.ServerCacheFactory;
-import io.ebean.cache.ServerCacheOptions;
-import io.ebean.cache.ServerCachePlugin;
 import io.ebean.config.ContainerConfig;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.ServerConfigProvider;
@@ -13,13 +9,8 @@ import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.h2.H2Platform;
 import io.ebean.service.SpiContainer;
 import io.ebeaninternal.api.SpiBackgroundExecutor;
-import io.ebeaninternal.api.SpiContainerBootup;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.dbmigration.DbOffline;
-import io.ebeaninternal.server.cache.CacheManagerOptions;
-import io.ebeaninternal.server.cache.DefaultServerCacheManager;
-import io.ebeaninternal.server.cache.DefaultServerCachePlugin;
-import io.ebeaninternal.server.cache.SpiCacheManager;
 import io.ebeaninternal.server.cluster.ClusterManager;
 import io.ebeaninternal.server.core.bootup.BootupClassPathSearch;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
@@ -35,7 +26,6 @@ import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.Iterator;
 import java.util.List;
 import java.util.ServiceLoader;
 
@@ -52,8 +42,6 @@ public class DefaultContainer implements SpiContainer {
 
   public DefaultContainer(ContainerConfig containerConfig) {
 
-    invokeBootupPlugin();
-
     this.clusterManager = new ClusterManager(containerConfig);
     this.jndiDataSourceFactory = new JndiDataSourceLookup();
 
@@ -62,12 +50,6 @@ public class DefaultContainer implements SpiContainer {
     ShutdownManager.registerContainer(this);
   }
 
-  private void invokeBootupPlugin() {
-    for (SpiContainerBootup boot : ServiceLoader.load(SpiContainerBootup.class)) {
-      boot.bootup();
-    }
-  }
-
   @Override
   public void shutdown() {
     clusterManager.shutdown();

From 8d976f83a97c93c45a1f603474e230e57d905494 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 18 Jun 2018 21:15:10 +1200
Subject: [PATCH 0341/1036] #1417 - Breaking API - Remove PersistBatch.INSERT
 ... migrate to PersistBatch.ALL

---
 pom.xml                                       |  2 +-
 src/main/java/io/ebean/Transaction.java       | 38 ++++++++-
 .../io/ebeaninternal/api/SpiTransaction.java  |  2 +-
 .../api/SpiTransactionProxy.java              | 19 ++++-
 .../server/core/PersistRequest.java           |  2 +-
 .../ImplicitReadOnlyTransaction.java          | 16 +++-
 .../server/transaction/JdbcTransaction.java   | 80 +++++++++----------
 .../server/transaction/NoTransaction.java     | 16 +++-
 .../transaction/TransactionManager.java       | 14 ++--
 src/test/java/io/ebean/TxScopeTest.java       |  2 +-
 .../io/ebean/config/ServerConfigTest.java     |  8 +-
 .../batchinsert/TestBatchInsertSimple.java    |  4 +-
 .../org/tests/model/basic/xtra/DummyDao.java  |  6 +-
 .../transaction/TestBatchPersistCascade.java  |  4 +-
 14 files changed, 140 insertions(+), 73 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6791ed678..ff6b3b7a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>3.12</version>
+      <version>4.1</version>
     </dependency>
 
     <dependency>
diff --git a/src/main/java/io/ebean/Transaction.java b/src/main/java/io/ebean/Transaction.java
index cd4a4bbc5..df79941e7 100644
--- a/src/main/java/io/ebean/Transaction.java
+++ b/src/main/java/io/ebean/Transaction.java
@@ -359,7 +359,10 @@ public interface Transaction extends AutoCloseable {
   void setBatchMode(boolean useBatch);
 
   /**
-   * The JDBC batch mode to use for this transaction.
+   * Deprecated - migrate to {@link #setBatchMode(boolean)}.
+   * <p>
+   * Set the JDBC batch mode to use for this transaction.
+   * </p>
    * <p>
    * If this is NONE then JDBC batch can still be used for each request - save(), insert(), update() or delete()
    * and this would be useful if the request cascades to detail beans.
@@ -368,15 +371,23 @@ public interface Transaction extends AutoCloseable {
    * @param persistBatchMode the batch mode to use for this transaction
    * @see io.ebean.config.ServerConfig#setPersistBatch(PersistBatch)
    */
+  @Deprecated
   void setBatch(PersistBatch persistBatchMode);
 
+  /**
+   * Deprecated - migrate to {@link #isBatchMode()}.
+   * Return the batch mode at the transaction level.
+   */
+  @Deprecated
+  PersistBatch getBatch();
+
   /**
    * Return the batch mode at the transaction level.
    */
-  PersistBatch getBatch();
+  boolean isBatchMode();
 
   /**
-   * Set the JDBC batch mode to use for a save() or delete() request.
+   * Set the JDBC batch mode to use for a save() or delete() when cascading to children.
    * <p>
    * This only takes effect when batch mode on the transaction has not already meant that
    * JDBC batch mode is being used.
@@ -385,17 +396,36 @@ public interface Transaction extends AutoCloseable {
    * This is useful when the single save() or delete() cascades. For example, inserting a 'master' cascades
    * and inserts a collection of 'detail' beans. The detail beans can be inserted using JDBC batch.
    * </p>
+   * <p>
+   * This is effectively already turned on for all platforms apart from older Sql Server.
+   * </p>
    *
-   * @param batchOnCascadeMode the batch mode to use per save(), insert(), update() or delete()
+   * @param batchMode the batch mode to use per save(), insert(), update() or delete()
    * @see io.ebean.config.ServerConfig#setPersistBatchOnCascade(PersistBatch)
    */
+  void setBatchOnCascade(boolean batchMode);
+
+  /**
+   * Set the batch mode when cascading.
+   * <p>
+   * Deprecated in favour of {@link #setBatchOnCascade(boolean)}
+   * </p>
+   */
+  @Deprecated
   void setBatchOnCascade(PersistBatch batchOnCascadeMode);
 
   /**
+   * Deprecated - migrate to {@link #isBatchMode()}.
    * Return the batch mode at the request level (for each save(), insert(), update() or delete()).
    */
+  @Deprecated
   PersistBatch getBatchOnCascade();
 
+  /**
+   * Return the batch mode at the request level.
+   */
+  boolean isBatchOnCascade();
+
   /**
    * Specify the number of statements before a batch is flushed automatically.
    */
diff --git a/src/main/java/io/ebeaninternal/api/SpiTransaction.java b/src/main/java/io/ebeaninternal/api/SpiTransaction.java
index 0054757da..e362e1e9e 100644
--- a/src/main/java/io/ebeaninternal/api/SpiTransaction.java
+++ b/src/main/java/io/ebeaninternal/api/SpiTransaction.java
@@ -184,7 +184,7 @@ public interface SpiTransaction extends Transaction {
    * Return true if this request should be batched. Conversely returns false
    * if this request should be executed immediately.
    */
-  boolean isBatchThisRequest(PersistRequest.Type type);
+  boolean isBatchThisRequest();
 
   /**
    * Return the BatchControl used to batch up persist requests.
diff --git a/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java b/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
index ffbb3c727..c84f7bc2e 100644
--- a/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
+++ b/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
@@ -250,6 +250,11 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
     transaction.setBatchMode(useBatch);
   }
 
+  @Override
+  public boolean isBatchMode() {
+    return transaction.isBatchMode();
+  }
+
   @Override
   public void setBatch(PersistBatch persistBatchMode) {
     transaction.setBatch(persistBatchMode);
@@ -260,11 +265,21 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
     return transaction.getBatch();
   }
 
+  @Override
+  public void setBatchOnCascade(boolean batchMode) {
+    transaction.setBatchOnCascade(batchMode);
+  }
+
   @Override
   public void setBatchOnCascade(PersistBatch batchOnCascadeMode) {
     transaction.setBatchOnCascade(batchOnCascadeMode);
   }
 
+  @Override
+  public boolean isBatchOnCascade() {
+    return transaction.isBatchOnCascade();
+  }
+
   @Override
   public PersistBatch getBatchOnCascade() {
     return transaction.getBatchOnCascade();
@@ -361,8 +376,8 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public boolean isBatchThisRequest(PersistRequest.Type type) {
-    return transaction.isBatchThisRequest(type);
+  public boolean isBatchThisRequest() {
+    return transaction.isBatchThisRequest();
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequest.java b/src/main/java/io/ebeaninternal/server/core/PersistRequest.java
index a031ae2fb..102bfa07d 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequest.java
@@ -92,7 +92,7 @@ public abstract class PersistRequest extends BeanRequest implements BatchPostExe
    * Return true if this persist request should use JDBC batch.
    */
   public boolean isBatchThisRequest() {
-    return transaction.isBatchThisRequest(type);
+    return transaction.isBatchThisRequest();
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
index 44e5b4bd1..8bca03fc9 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
@@ -297,11 +297,25 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
 
   }
 
+  @Override
+  public boolean isBatchMode() {
+    return false;
+  }
+
+  @Override
+  public boolean isBatchOnCascade() {
+    return false;
+  }
+
   @Override
   public PersistBatch getBatch() {
     return null;
   }
 
+  @Override
+  public void setBatchOnCascade(boolean batchMode) {
+  }
+
   @Override
   public void setBatchOnCascade(PersistBatch batchOnCascadeMode) {
   }
@@ -353,7 +367,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
    * this request should be executed immediately.
    */
   @Override
-  public boolean isBatchThisRequest(PersistRequest.Type type) {
+  public boolean isBatchThisRequest() {
     return false;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index 2fbaab79a..7fe53c827 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -118,11 +118,11 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
 
   protected Boolean updateAllLoadedProperties;
 
-  protected PersistBatch oldBatchMode;
+  protected boolean oldBatchMode;
 
-  protected PersistBatch batchMode;
+  protected boolean batchMode;
 
-  protected PersistBatch batchOnCascadeMode;
+  protected boolean batchOnCascadeMode;
 
   protected int batchSize = -1;
 
@@ -208,8 +208,8 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
         this.logSql = false;
         this.logSummary = false;
         this.skipCacheAfterWrite = true;
-        this.batchMode = PersistBatch.NONE;
-        this.batchOnCascadeMode = PersistBatch.NONE;
+        this.batchMode = false;
+        this.batchOnCascadeMode = false;
         this.onQueryOnly = OnQueryOnly.ROLLBACK;
       } else {
         this.startMillis = manager.clockNowMillis();
@@ -570,14 +570,6 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
 
   @Override
   public void setBatchMode(boolean batchMode) {
-    if (!isActive()) {
-      throw new IllegalStateException(illegalStateMessage);
-    }
-    this.batchMode = (batchMode) ? PersistBatch.ALL : PersistBatch.NONE;
-  }
-
-  @Override
-  public void setBatch(PersistBatch batchMode) {
     if (!isActive()) {
       throw new IllegalStateException(illegalStateMessage);
     }
@@ -585,20 +577,40 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public PersistBatch getBatch() {
+  public void setBatch(PersistBatch batchMode) {
+    setBatchMode(PersistBatch.ALL == batchMode);
+  }
+
+  @Override
+  public boolean isBatchMode() {
     return batchMode;
   }
 
   @Override
-  public void setBatchOnCascade(PersistBatch batchOnCascadeMode) {
+  public PersistBatch getBatch() {
+    return batchMode  ? PersistBatch.ALL : PersistBatch.NONE;
+  }
+
+  @Override
+  public void setBatchOnCascade(boolean batchMode) {
     if (!isActive()) {
       throw new IllegalStateException(illegalStateMessage);
     }
-    this.batchOnCascadeMode = batchOnCascadeMode;
+    this.batchOnCascadeMode = batchMode;
+  }
+
+  @Override
+  public void setBatchOnCascade(PersistBatch batchMode) {
+    setBatchOnCascade(PersistBatch.ALL == batchMode);
   }
 
   @Override
   public PersistBatch getBatchOnCascade() {
+    return batchOnCascadeMode ? PersistBatch.ALL : PersistBatch.NONE;
+  }
+
+  @Override
+  public boolean isBatchOnCascade() {
     return batchOnCascadeMode;
   }
 
@@ -657,36 +669,18 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * this request should be executed immediately.
    */
   @Override
-  public boolean isBatchThisRequest(PersistRequest.Type type) {
+  public boolean isBatchThisRequest() {
     if (!batchOnCascadeSet && !explicit && depth <= 0) {
       // implicit transaction, no gain by batching where depth <= 0
       return false;
     }
-    return isBatch(batchMode, type);
-  }
-
-  /**
-   * Return true if JDBC batch should be used on cascade persist.
-   */
-  private boolean isBatchOnCascade(PersistRequest.Type type) {
-    return isBatch(batchOnCascadeMode, type);
-  }
-
-  private boolean isBatch(PersistBatch batch, PersistRequest.Type type) {
-    switch (batch) {
-      case ALL:
-        return true;
-      case INSERT:
-        return type == PersistRequest.Type.INSERT;
-      default:
-        return false;
-    }
+    return batchMode;
   }
 
   @Override
   public void checkBatchEscalationOnCollection() {
-    if (batchMode == PersistBatch.NONE && batchOnCascadeMode != PersistBatch.NONE) {
-      batchMode = batchOnCascadeMode;
+    if (!batchMode && batchOnCascadeMode) {
+      batchMode = true;
       batchOnCascadeSet = true;
     }
   }
@@ -696,7 +690,7 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
     if (batchOnCascadeSet) {
       batchFlushReset();
       // restore the previous batch mode of NONE
-      batchMode = PersistBatch.NONE;
+      batchMode = false;
     }
   }
 
@@ -753,15 +747,15 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   @Override
   public boolean checkBatchEscalationOnCascade(PersistRequestBean<?> request) {
 
-    if (isBatch(batchMode, request.getType())) {
+    if (batchMode) {
       // already batching (at top level)
       return false;
     }
 
-    if (isBatchOnCascade(request.getType())) {
+    if (batchOnCascadeMode) {
       // escalate up to batch mode for this request (and cascade)
-      oldBatchMode = batchMode;
-      batchMode = PersistBatch.ALL;
+      oldBatchMode = false;
+      batchMode = true;
       batchFlushReset();
       // skip using jdbc batch for the top level bean (no gain there)
       request.setSkipBatchForTopLevel();
diff --git a/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
index bd2b20c35..31bf1ca30 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
@@ -236,6 +236,15 @@ class NoTransaction implements SpiTransaction {
     return null;
   }
 
+  @Override
+  public boolean isBatchMode() {
+    return false;
+  }
+
+  @Override
+  public void setBatchOnCascade(boolean batchMode) {
+  }
+
   @Override
   public void setBatchOnCascade(PersistBatch batchOnCascadeMode) {
 
@@ -246,6 +255,11 @@ class NoTransaction implements SpiTransaction {
     return null;
   }
 
+  @Override
+  public boolean isBatchOnCascade() {
+    return false;
+  }
+
   @Override
   public void setBatchSize(int batchSize) {
 
@@ -337,7 +351,7 @@ class NoTransaction implements SpiTransaction {
   }
 
   @Override
-  public boolean isBatchThisRequest(PersistRequest.Type type) {
+  public boolean isBatchThisRequest() {
     return false;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index 4a007a9b3..09f24c867 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -97,9 +97,9 @@ public class TransactionManager implements SpiTransactionManager {
    */
   protected final DocStoreUpdateProcessor docStoreUpdateProcessor;
 
-  protected final PersistBatch persistBatch;
+  protected final boolean persistBatch;
 
-  protected final PersistBatch persistBatchOnCascade;
+  protected final boolean persistBatchOnCascade;
 
   protected final BulkEventListenerMap bulkEventListenerMap;
 
@@ -153,8 +153,8 @@ public class TransactionManager implements SpiTransactionManager {
     this.databasePlatform = options.config.getDatabasePlatform();
     this.skipCacheAfterWrite = options.config.isSkipCacheAfterWrite();
     this.notifyL2CacheInForeground = options.notifyL2CacheInForeground;
-    this.persistBatch = options.config.getPersistBatch();
-    this.persistBatchOnCascade = options.config.appliedPersistBatchOnCascade();
+    this.persistBatch = PersistBatch.ALL == options.config.getPersistBatch();
+    this.persistBatchOnCascade = PersistBatch.ALL == options.config.appliedPersistBatchOnCascade();
     this.rollbackOnChecked = options.config.isTransactionRollbackOnChecked();
     this.beanDescriptorManager = options.descMgr;
     this.viewInvalidation = options.descMgr.requiresViewEntityCacheInvalidation();
@@ -271,11 +271,11 @@ public class TransactionManager implements SpiTransactionManager {
     return bulkEventListenerMap;
   }
 
-  public PersistBatch getPersistBatch() {
+  public boolean getPersistBatch() {
     return persistBatch;
   }
 
-  public PersistBatch getPersistBatchOnCascade() {
+  public boolean getPersistBatchOnCascade() {
     return persistBatchOnCascade;
   }
 
@@ -340,7 +340,7 @@ public class TransactionManager implements SpiTransactionManager {
     ExternalJdbcTransaction t = new ExternalJdbcTransaction(id, true, c, this);
 
     // set the default batch mode
-    t.setBatch(persistBatch);
+    t.setBatchMode(persistBatch);
     t.setBatchOnCascade(persistBatchOnCascade);
     return t;
   }
diff --git a/src/test/java/io/ebean/TxScopeTest.java b/src/test/java/io/ebean/TxScopeTest.java
index fefbd1434..55524e4f0 100644
--- a/src/test/java/io/ebean/TxScopeTest.java
+++ b/src/test/java/io/ebean/TxScopeTest.java
@@ -59,7 +59,7 @@ public class TxScopeTest {
 
     TxScope scope = new TxScope();
     scope.setBatchSize(100);
-    scope.setBatchOnCascade(PersistBatch.INSERT);
+    scope.setBatchOnCascade(PersistBatch.ALL);
 
     scope.checkBatchMode();
     assertNull(scope.getBatch());
diff --git a/src/test/java/io/ebean/config/ServerConfigTest.java b/src/test/java/io/ebean/config/ServerConfigTest.java
index fc24bc40c..b0ff31457 100644
--- a/src/test/java/io/ebean/config/ServerConfigTest.java
+++ b/src/test/java/io/ebean/config/ServerConfigTest.java
@@ -51,8 +51,8 @@ public class ServerConfigTest {
     serverConfig.setReadOnlyDataSourceConfig(new DataSourceConfig());
 
     Properties props = new Properties();
-    props.setProperty("persistBatch", "INSERT");
-    props.setProperty("persistBatchOnCascade", "INSERT");
+    props.setProperty("persistBatch", "ALL");
+    props.setProperty("persistBatchOnCascade", "ALL");
     props.setProperty("dbuuid", "binary");
     props.setProperty("jdbcFetchSizeFindEach", "42");
     props.setProperty("jdbcFetchSizeFindList", "43");
@@ -80,8 +80,8 @@ public class ServerConfigTest {
     assertThat(serverConfig.getNamingConvention()).isInstanceOf(MatchingNamingConvention.class);
 
     assertEquals(IdType.SEQUENCE, serverConfig.getIdType());
-    assertEquals(PersistBatch.INSERT, serverConfig.getPersistBatch());
-    assertEquals(PersistBatch.INSERT, serverConfig.getPersistBatchOnCascade());
+    assertEquals(PersistBatch.ALL, serverConfig.getPersistBatch());
+    assertEquals(PersistBatch.ALL, serverConfig.getPersistBatchOnCascade());
     assertEquals(PlatformConfig.DbUuid.BINARY, serverConfig.getPlatformConfig().getDbUuid());
     assertEquals(JsonConfig.DateTime.ISO8601, serverConfig.getJsonDateTime());
 
diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java b/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java
index 0b90b4ffa..8245f31ea 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java
@@ -28,7 +28,7 @@ public class TestBatchInsertSimple extends BaseTestCase {
     Transaction transaction = Ebean.beginTransaction();
     try {
       transaction.setBatch(PersistBatch.NONE);
-      transaction.setBatchOnCascade(PersistBatch.INSERT);
+      transaction.setBatchOnCascade(PersistBatch.ALL);
       transaction.setBatchSize(30);
       // setBatchGetGeneratedKeys MUST be turned off for MS SQL Server because :(
       transaction.setBatchGetGeneratedKeys(false);
@@ -101,7 +101,7 @@ public class TestBatchInsertSimple extends BaseTestCase {
     Transaction transaction = Ebean.beginTransaction();
     try {
       transaction.setBatch(PersistBatch.NONE);
-      transaction.setBatchOnCascade(PersistBatch.INSERT);
+      transaction.setBatchOnCascade(PersistBatch.ALL);
       transaction.setBatchSize(30);
       // setBatchGetGeneratedKeys MUST be turned off for MS SQL Server because :(
       transaction.setBatchGetGeneratedKeys(false);
diff --git a/src/test/java/org/tests/model/basic/xtra/DummyDao.java b/src/test/java/org/tests/model/basic/xtra/DummyDao.java
index b49996c5a..470af46e0 100644
--- a/src/test/java/org/tests/model/basic/xtra/DummyDao.java
+++ b/src/test/java/org/tests/model/basic/xtra/DummyDao.java
@@ -46,19 +46,19 @@ public class DummyDao {
   }
 
 
-  @Transactional(batch = PersistBatch.INSERT, batchOnCascade = PersistBatch.NONE, batchSize = 77)
+  @Transactional(batch = PersistBatch.ALL, batchOnCascade = PersistBatch.NONE, batchSize = 77)
   public void doOuterWithBatchOptionsSet() {
 
     Transaction txn = Ebean.currentTransaction();
 
-    assertEquals(PersistBatch.INSERT, txn.getBatch());
+    assertEquals(PersistBatch.ALL, txn.getBatch());
     assertEquals(PersistBatch.NONE, txn.getBatchOnCascade());
     assertEquals(77, txn.getBatchSize());
 
     doWithBatchOptionsSet();
 
     // batch options set back
-    assertEquals(PersistBatch.INSERT, txn.getBatch());
+    assertEquals(PersistBatch.ALL, txn.getBatch());
     assertEquals(PersistBatch.NONE, txn.getBatchOnCascade());
     assertEquals(77, txn.getBatchSize());
 
diff --git a/src/test/java/org/tests/transaction/TestBatchPersistCascade.java b/src/test/java/org/tests/transaction/TestBatchPersistCascade.java
index 62dabc031..5c35a381d 100644
--- a/src/test/java/org/tests/transaction/TestBatchPersistCascade.java
+++ b/src/test/java/org/tests/transaction/TestBatchPersistCascade.java
@@ -29,7 +29,7 @@ public class TestBatchPersistCascade extends BaseTestCase {
 
     Transaction txn = ebeanServer.beginTransaction();
     try {
-      txn.setBatch(PersistBatch.INSERT);
+      txn.setBatch(PersistBatch.ALL);
       logger.info("start ------------");
 
       for (int i = 0; i < 3; i++) {
@@ -62,7 +62,7 @@ public class TestBatchPersistCascade extends BaseTestCase {
 
     Transaction txn = server.beginTransaction();
     try {
-      txn.setBatch(PersistBatch.INSERT);
+      txn.setBatch(PersistBatch.ALL);
       txn.setBatchOnCascade(PersistBatch.ALL);
 
       for (int i = 0; i < 3; i++) {

From 3a64cf69522bfa5c4d5e2e40638c5b4cb85d241b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 18 Jun 2018 21:34:51 +1200
Subject: [PATCH 0342/1036] #1434 - Remove deprecated API from EbeanServer -
 finder methods that take explicit transaction. Migrate to use
 ebeanServer.extended()

---
 src/main/java/io/ebean/EbeanServer.java       | 451 ------------------
 .../server/deploy/BeanCollectionHelp.java     |   4 +-
 .../server/deploy/BeanListHelp.java           |   4 +-
 .../server/deploy/BeanMapHelp.java            |   4 +-
 .../server/deploy/BeanPropertyAssocOne.java   |   6 +-
 .../server/deploy/BeanSetHelp.java            |   4 +-
 .../TestFutureRowCountErrorHandling.java      |  12 +-
 .../java/org/tests/basic/TestFetchId.java     |   4 +-
 .../org/tests/basic/TestQueryForUpdate.java   |   2 +-
 .../org/tests/delete/TestDeleteByQuery.java   |   6 +-
 .../query/other/TestQuerySingleAttribute.java |   2 +-
 .../transaction/TestAutoCommitDataSource.java |   6 +-
 .../TestExplicitTransactionMode.java          |   6 +-
 13 files changed, 30 insertions(+), 481 deletions(-)

diff --git a/src/main/java/io/ebean/EbeanServer.java b/src/main/java/io/ebean/EbeanServer.java
index 36e2612b4..e8d252ec0 100644
--- a/src/main/java/io/ebean/EbeanServer.java
+++ b/src/main/java/io/ebean/EbeanServer.java
@@ -821,457 +821,6 @@ public interface EbeanServer {
    */
   ExtendedServer extended();
 
-  /**
-   * Deprecated - Moved to the ExtendedServer API, please use via extended().
-   * Return the number of 'top level' or 'root' entities this query should return.
-   *
-   * @see Query#findCount()
-   * @see Query#findFutureCount()
-   */
-  @Deprecated
-  <T> int findCount(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated - Moved to the ExtendedServer API, please use via extended().
-   * Return the Id values of the query as a List.
-   *
-   * @see Query#findIds()
-   */
-  @Nonnull
-  @Deprecated
-  <A, T> List<A> findIds(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated - Moved to the ExtendedServer API, please use via extended().
-   * Return a QueryIterator for the query.
-   * <p>
-   * Generally using {@link #findEach(Query, Consumer, Transaction)} or
-   * {@link #findEachWhile(Query, Predicate, Transaction)} is preferred
-   * to findIterate(). The reason is that those methods automatically take care of
-   * closing the queryIterator (and the underlying jdbc statement and resultSet).
-   * </p>
-   * <p>
-   * This is similar to findEach in that not all the result beans need to be held
-   * in memory at the same time and as such is good for processing large queries.
-   * </p>
-   *
-   * @see Query#findIterate()
-   * @see Query#findEach(Consumer)
-   * @see Query#findEachWhile(Predicate)
-   */
-  @Nonnull
-  @Deprecated
-  <T> QueryIterator<T> findIterate(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated - Moved to the ExtendedServer API, please use via extended().
-   * Execute the query visiting the each bean one at a time.
-   * <p>
-   * Unlike findList() this is suitable for processing a query that will return
-   * a very large resultSet. The reason is that not all the result beans need to be
-   * held in memory at the same time and instead processed one at a time.
-   * </p>
-   * <p>
-   * Internally this query using a PersistenceContext scoped to each bean (and the
-   * beans associated object graph).
-   * </p>
-   * <p>
-   * <pre>{@code
-   *
-   *     ebeanServer.find(Order.class)
-   *       .where().eq("status", Order.Status.NEW)
-   *       .order().asc("id")
-   *       .findEach((Order order) -> {
-   *
-   *         // do something with the order bean
-   *         System.out.println(" -- processing order ... " + order);
-   *       });
-   *
-   * }</pre>
-   *
-   * @see Query#findEach(Consumer)
-   * @see Query#findEachWhile(Predicate)
-   */
-  @Deprecated
-  <T> void findEach(Query<T> query, Consumer<T> consumer, Transaction transaction);
-
-  /**
-   * Deprecated - Moved to the ExtendedServer API, please use via extended().
-   * Execute the query visiting the each bean one at a time.
-   * <p>
-   * Compared to findEach() this provides the ability to stop processing the query
-   * results early by returning false for the Predicate.
-   * </p>
-   * <p>
-   * Unlike findList() this is suitable for processing a query that will return
-   * a very large resultSet. The reason is that not all the result beans need to be
-   * held in memory at the same time and instead processed one at a time.
-   * </p>
-   * <p>
-   * Internally this query using a PersistenceContext scoped to each bean (and the
-   * beans associated object graph).
-   * </p>
-   * <p>
-   * <pre>{@code
-   *
-   *     ebeanServer.find(Order.class)
-   *       .where().eq("status", Order.Status.NEW)
-   *       .order().asc("id")
-   *       .findEachWhile((Order order) -> {
-   *
-   *         // do something with the order bean
-   *         System.out.println(" -- processing order ... " + order);
-   *
-   *         boolean carryOnProcessing = ...
-   *         return carryOnProcessing;
-   *       });
-   *
-   * }</pre>
-   *
-   * @see Query#findEach(Consumer)
-   * @see Query#findEachWhile(Predicate)
-   */
-  @Deprecated
-  <T> void findEachWhile(Query<T> query, Predicate<T> consumer, Transaction transaction);
-
-  /**
-   * Deprecated - Moved to the ExtendedServer API, please use via extended().
-   * Return versions of a @History entity bean.
-   * <p>
-   * Generally this query is expected to be a find by id or unique predicates query.
-   * It will execute the query against the history returning the versions of the bean.
-   * </p>
-   */
-  @Nonnull
-  @Deprecated
-  <T> List<Version<T>> findVersions(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated - Moved to the ExtendedServer API, please use via extended().
-   * Execute a query returning a list of beans.
-   * <p>
-   * Generally you are able to use {@link Query#findList()} rather than
-   * explicitly calling this method. You could use this method if you wish to
-   * explicitly control the transaction used for the query.
-   * </p>
-   * <p>
-   * <pre>{@code
-   *
-   * List<Customer> customers =
-   *     ebeanServer.find(Customer.class)
-   *     .where().ilike("name", "rob%")
-   *     .findList();
-   *
-   * }</pre>
-   *
-   * @param <T>         the type of entity bean to fetch.
-   * @param query       the query to execute.
-   * @param transaction the transaction to use (can be null).
-   * @return the list of fetched beans.
-   * @see Query#findList()
-   */
-  @Nonnull
-  @Deprecated
-  <T> List<T> findList(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated - Moved to the ExtendedServer API, please use via extended().
-   * Execute find row count query in a background thread.
-   * <p>
-   * This returns a Future object which can be used to cancel, check the
-   * execution status (isDone etc) and get the value (with or without a
-   * timeout).
-   * </p>
-   *
-   * @param query       the query to execute the row count on
-   * @param transaction the transaction (can be null).
-   * @return a Future object for the row count query
-   * @see Query#findFutureCount()
-   */
-  @Nonnull
-  @Deprecated
-  <T> FutureRowCount<T> findFutureCount(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated - Moved to the ExtendedServer API, please use via extended().
-   * Execute find Id's query in a background thread.
-   * <p>
-   * This returns a Future object which can be used to cancel, check the
-   * execution status (isDone etc) and get the value (with or without a
-   * timeout).
-   * </p>
-   *
-   * @param query       the query to execute the fetch Id's on
-   * @param transaction the transaction (can be null).
-   * @return a Future object for the list of Id's
-   * @see Query#findFutureIds()
-   */
-  @Nonnull
-  @Deprecated
-  <T> FutureIds<T> findFutureIds(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated - Moved to the ExtendedServer API, please use via extended().
-   * Execute find list query in a background thread returning a FutureList object.
-   * <p>
-   * This returns a Future object which can be used to cancel, check the
-   * execution status (isDone etc) and get the value (with or without a timeout).
-   * <p>
-   * This query will execute in it's own PersistenceContext and using its own transaction.
-   * What that means is that it will not share any bean instances with other queries.
-   *
-   * @param query       the query to execute in the background
-   * @param transaction the transaction (can be null).
-   * @return a Future object for the list result of the query
-   * @see Query#findFutureList()
-   */
-  @Nonnull
-  @Deprecated
-  <T> FutureList<T> findFutureList(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated - Moved to the ExtendedServer API, please use via extended().
-   * Return a PagedList for this query using firstRow and maxRows.
-   * <p>
-   * The benefit of using this over findList() is that it provides functionality to get the
-   * total row count etc.
-   * </p>
-   * <p>
-   * If maxRows is not set on the query prior to calling findPagedList() then a
-   * PersistenceException is thrown.
-   * </p>
-   * <p>
-   * <pre>{@code
-   *
-   *  PagedList<Order> pagedList = Ebean.find(Order.class)
-   *       .setFirstRow(50)
-   *       .setMaxRows(20)
-   *       .findPagedList();
-   *
-   *       // fetch the total row count in the background
-   *       pagedList.loadRowCount();
-   *
-   *       List<Order> orders = pagedList.getList();
-   *       int totalRowCount = pagedList.getTotalRowCount();
-   *
-   * }</pre>
-   *
-   * @return The PagedList
-   * @see Query#findPagedList()
-   */
-  @Nonnull
-  @Deprecated
-  <T> PagedList<T> findPagedList(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated - Moved to the ExtendedServer API, please use via extended().
-   * Execute the query returning a set of entity beans.
-   * <p>
-   * Generally you are able to use {@link Query#findSet()} rather than
-   * explicitly calling this method. You could use this method if you wish to
-   * explicitly control the transaction used for the query.
-   * </p>
-   * <p>
-   * <pre>{@code
-   *
-   * Set<Customer> customers =
-   *     ebeanServer.find(Customer.class)
-   *     .where().ilike("name", "rob%")
-   *     .findSet();
-   *
-   * }</pre>
-   *
-   * @param <T>         the type of entity bean to fetch.
-   * @param query       the query to execute
-   * @param transaction the transaction to use (can be null).
-   * @return the set of fetched beans.
-   * @see Query#findSet()
-   */
-  @Nonnull
-  @Deprecated
-  <T> Set<T> findSet(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated - Moved to the ExtendedServer API, please use via extended().
-   * Execute the query returning the entity beans in a Map.
-   * <p>
-   * Generally you are able to use {@link Query#findMap()} rather than
-   * explicitly calling this method. You could use this method if you wish to
-   * explicitly control the transaction used for the query.
-   * </p>
-   *
-   * @param <T>         the type of entity bean to fetch.
-   * @param query       the query to execute.
-   * @param transaction the transaction to use (can be null).
-   * @return the map of fetched beans.
-   * @see Query#findMap()
-   */
-  @Nonnull
-  @Deprecated
-  <K, T> Map<K, T> findMap(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated - Moved to the ExtendedServer API, please use via extended().
-   * Execute the query returning a list of values for a single property.
-   * <p>
-   * <h3>Example 1:</h3>
-   * <pre>{@code
-   *
-   *  List<String> names =
-   *    Ebean.find(Customer.class)
-   *      .select("name")
-   *      .orderBy().asc("name")
-   *      .findSingleAttributeList();
-   *
-   * }</pre>
-   * <h3>Example 2:</h3>
-   * <pre>{@code
-   *
-   *  List<String> names =
-   *    Ebean.find(Customer.class)
-   *      .setDistinct(true)
-   *      .select("name")
-   *      .where().eq("status", Customer.Status.NEW)
-   *      .orderBy().asc("name")
-   *      .setMaxRows(100)
-   *      .findSingleAttributeList();
-   *
-   * }</pre>
-   *
-   * @return the list of values for the selected property
-   * @see Query#findSingleAttributeList()
-   */
-  @Nonnull
-  @Deprecated
-  <A, T> List<A> findSingleAttributeList(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated - Moved to the ExtendedServer API, please use via extended().
-   * Execute the query returning at most one entity bean or null (if no matching
-   * bean is found).
-   * <p>
-   * This will throw a NonUniqueResultException if the query finds more than one result.
-   * </p>
-   * <p>
-   * Generally you are able to use {@link Query#findOne()} rather than
-   * explicitly calling this method. You could use this method if you wish to
-   * explicitly control the transaction used for the query.
-   * </p>
-   *
-   * @param <T>         the type of entity bean to fetch.
-   * @param query       the query to execute.
-   * @param transaction the transaction to use (can be null).
-   * @return the list of fetched beans.
-   * @throws NonUniqueResultException if more than one result was found
-   * @see Query#findOne()
-   */
-  @Nullable
-  @Deprecated
-  <T> T findOne(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated - Moved to the ExtendedServer API, please use via extended().
-   * Similar to findOne() but returns an Optional (rather than nullable).
-   */
-  @Nonnull
-  @Deprecated
-  <T> Optional<T> findOneOrEmpty(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated - Moved to the ExtendedServer API, please use via extended().
-   * Execute as a delete query deleting the 'root level' beans that match the predicates
-   * in the query.
-   * <p>
-   * Note that if the query includes joins then the generated delete statement may not be
-   * optimal depending on the database platform.
-   * </p>
-   *
-   * @param query       the query used for the delete
-   * @param transaction the transaction to use (can be null)
-   * @param <T>         the type of entity bean to fetch.
-   * @return the number of beans/rows that were deleted
-   */
-  @Deprecated
-  <T> int delete(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated - Moved to the ExtendedServer API, please use via extended().
-   * Execute the update query returning the number of rows updated.
-   * <p>
-   * The update query must be created using {@link #update(Class)}.
-   * </p>
-   *
-   * @param query       the update query to execute
-   * @param transaction the optional transaction to use for the update (can be null)
-   * @param <T>         the type of entity bean
-   * @return The number of rows updated
-   */
-  @Deprecated
-  <T> int update(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated - Moved to the ExtendedServer API, please use via extended().
-   * Execute the sql query returning a list of MapBean.
-   * <p>
-   * Generally you are able to use {@link SqlQuery#findList()} rather than
-   * explicitly calling this method. You could use this method if you wish to
-   * explicitly control the transaction used for the query.
-   * </p>
-   *
-   * @param query       the query to execute.
-   * @param transaction the transaction to use (can be null).
-   * @return the list of fetched MapBean.
-   * @see SqlQuery#findList()
-   */
-  @Nonnull
-  @Deprecated
-  List<SqlRow> findList(SqlQuery query, Transaction transaction);
-
-  /**
-   * Deprecated - Moved to the ExtendedServer API, please use via extended().
-   * Execute the SqlQuery iterating a row at a time.
-   * <p>
-   * This streaming type query is useful for large query execution as only 1 row needs to be held in memory.
-   * </p>
-   */
-  @Deprecated
-  void findEach(SqlQuery query, Consumer<SqlRow> consumer, Transaction transaction);
-
-  /**
-   * Deprecated - Moved to the ExtendedServer API, please use via extended().
-   * Execute the SqlQuery iterating a row at a time with the ability to stop consuming part way through.
-   * <p>
-   * Returning false after processing a row stops the iteration through the query results.
-   * </p>
-   * <p>
-   * This streaming type query is useful for large query execution as only 1 row needs to be held in memory.
-   * </p>
-   */
-  @Deprecated
-  void findEachWhile(SqlQuery query, Predicate<SqlRow> consumer, Transaction transaction);
-
-  /**
-   * Deprecated - Moved to the ExtendedServer API, please use via extended().
-   * Execute the sql query returning a single MapBean or null.
-   * <p>
-   * This will throw a PersistenceException if the query found more than one
-   * result.
-   * </p>
-   * <p>
-   * Generally you are able to use {@link SqlQuery#findOne()} rather than
-   * explicitly calling this method. You could use this method if you wish to
-   * explicitly control the transaction used for the query.
-   * </p>
-   *
-   * @param query       the query to execute.
-   * @param transaction the transaction to use (can be null).
-   * @return the fetched MapBean or null if none was found.
-   * @see SqlQuery#findOne()
-   */
-  @Nullable
-  @Deprecated
-  SqlRow findOne(SqlQuery query, Transaction transaction);
-
   /**
    * Either Insert or Update the bean depending on its state.
    * <p>
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java
index ede034939..308284040 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java
@@ -1,12 +1,12 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.EbeanServer;
 import io.ebean.Query;
 import io.ebean.Transaction;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanCollectionAdd;
 import io.ebean.bean.BeanCollectionLoader;
 import io.ebean.bean.EntityBean;
+import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.json.SpiJsonWriter;
 import io.ebeaninternal.server.query.CQueryCollectionAdd;
 
@@ -59,7 +59,7 @@ public interface BeanCollectionHelp<T> extends CQueryCollectionAdd<T> {
   /**
    * Refresh the List Set or Map.
    */
-  void refresh(EbeanServer server, Query<?> query, Transaction t, EntityBean parentBean);
+  void refresh(SpiEbeanServer server, Query<?> query, Transaction t, EntityBean parentBean);
 
   /**
    * Apply the new refreshed BeanCollection to the appropriate property of the parent bean.
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java
index 9b751a16e..64cd91494 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java
@@ -1,12 +1,12 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.EbeanServer;
 import io.ebean.Query;
 import io.ebean.Transaction;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanCollectionAdd;
 import io.ebean.bean.EntityBean;
 import io.ebean.common.BeanList;
+import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.json.SpiJsonWriter;
 
 import java.io.IOException;
@@ -64,7 +64,7 @@ public class BeanListHelp<T> extends BaseCollectionHelp<T> {
   }
 
   @Override
-  public void refresh(EbeanServer server, Query<?> query, Transaction t, EntityBean parentBean) {
+  public void refresh(SpiEbeanServer server, Query<?> query, Transaction t, EntityBean parentBean) {
 
     BeanList<?> newBeanList = (BeanList<?>) server.findList(query, t);
     refresh(newBeanList, parentBean);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java
index 72feb6d80..14440a26f 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java
@@ -1,12 +1,12 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.EbeanServer;
 import io.ebean.Query;
 import io.ebean.Transaction;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanCollectionAdd;
 import io.ebean.bean.EntityBean;
 import io.ebean.common.BeanMap;
+import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.json.SpiJsonWriter;
 
 import java.io.IOException;
@@ -124,7 +124,7 @@ public class BeanMapHelp<T> extends BaseCollectionHelp<T> {
   }
 
   @Override
-  public void refresh(EbeanServer server, Query<?> query, Transaction t, EntityBean parentBean) {
+  public void refresh(SpiEbeanServer server, Query<?> query, Transaction t, EntityBean parentBean) {
     BeanMap<?, ?> newBeanMap = (BeanMap<?, ?>) server.findMap(query, t);
     refresh(newBeanMap, parentBean);
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index d29e12946..502a4bab1 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.EbeanServer;
 import io.ebean.Query;
 import io.ebean.SqlUpdate;
 import io.ebean.Transaction;
@@ -8,6 +7,7 @@ import io.ebean.ValuePair;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.PersistenceContext;
 import io.ebean.util.SplitName;
+import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.json.SpiJsonReader;
 import io.ebeaninternal.api.json.SpiJsonWriter;
@@ -238,7 +238,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
 
     String rawWhere = deriveWhereParentIdSql(false);
 
-    EbeanServer server = server();
+    SpiEbeanServer server = server();
     Query<?> q = server.find(getPropertyType());
     bindParentIdEq(rawWhere, parentId, q);
     return server.findIds(q, t);
@@ -250,7 +250,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     String inClause = targetIdBinder.getIdInValueExpr(false, parentIds.size());
     String expr = rawWhere + inClause;
 
-    EbeanServer server = server();
+    SpiEbeanServer server = server();
     Query<?> q = server.find(getPropertyType());
     bindParentIdsIn(expr, parentIds, q);
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java
index 482ccce62..4acc23347 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java
@@ -1,12 +1,12 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.EbeanServer;
 import io.ebean.Query;
 import io.ebean.Transaction;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanCollectionAdd;
 import io.ebean.bean.EntityBean;
 import io.ebean.common.BeanSet;
+import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.json.SpiJsonWriter;
 
 import java.io.IOException;
@@ -69,7 +69,7 @@ public class BeanSetHelp<T> extends BaseCollectionHelp<T> {
   }
 
   @Override
-  public void refresh(EbeanServer server, Query<?> query, Transaction t, EntityBean parentBean) {
+  public void refresh(SpiEbeanServer server, Query<?> query, Transaction t, EntityBean parentBean) {
 
     BeanSet<?> newBeanSet = (BeanSet<?>) server.findSet(query, t);
     refresh(newBeanSet, parentBean);
diff --git a/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java b/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java
index d95e46fca..1e9bf307d 100644
--- a/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java
+++ b/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java
@@ -22,13 +22,13 @@ public class TestFutureRowCountErrorHandling extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    EbeanServer server = Ebean.getServer(null);
+    EbeanServer server = Ebean.getDefaultServer();
 
     Query<Customer> query = server.createQuery(Customer.class)
       .where().eq("doesNotExist", "this will fail")
       .query();
 
-    FutureRowCount<Customer> futureRowCount = server.findFutureCount(query, null);
+    FutureRowCount<Customer> futureRowCount = query.findFutureCount();
 
     QueryFutureRowCount<Customer> internalRowCount = (QueryFutureRowCount<Customer>) futureRowCount;
     Transaction t = internalRowCount.getTransaction();
@@ -49,13 +49,13 @@ public class TestFutureRowCountErrorHandling extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    EbeanServer server = Ebean.getServer(null);
+    EbeanServer server = Ebean.getDefaultServer();
 
     Query<Customer> query = server.createQuery(Customer.class)
       .where().eq("doesNotExist", "this will fail")
       .query();
 
-    FutureIds<Customer> futureIds = server.findFutureIds(query, null);
+    FutureIds<Customer> futureIds = query.findFutureIds();
 
     QueryFutureIds<Customer> internalFuture = (QueryFutureIds<Customer>) futureIds;
     Transaction t = internalFuture.getTransaction();
@@ -77,13 +77,13 @@ public class TestFutureRowCountErrorHandling extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    EbeanServer server = Ebean.getServer(null);
+    EbeanServer server = Ebean.getDefaultServer();
 
     Query<Customer> query = server.createQuery(Customer.class)
       .where().eq("doesNotExist", "this will fail")
       .query();
 
-    FutureList<Customer> futureList = server.findFutureList(query, null);
+    FutureList<Customer> futureList = query.findFutureList();
 
     QueryFutureList<Customer> internalFuture = (QueryFutureList<Customer>) futureList;
     Transaction t = internalFuture.getTransaction();
diff --git a/src/test/java/org/tests/basic/TestFetchId.java b/src/test/java/org/tests/basic/TestFetchId.java
index 68993e7d1..cf207995c 100644
--- a/src/test/java/org/tests/basic/TestFetchId.java
+++ b/src/test/java/org/tests/basic/TestFetchId.java
@@ -27,10 +27,10 @@ public class TestFetchId extends BaseTestCase {
       .gt("details.id", 0)
       .query();
 
-    List<Object> ids = Ebean.getServer(null).findIds(query, null);
+    List<Object> ids = query.findIds();
     assertThat(ids).isNotEmpty();
 
-    FutureIds<Order> futureIds = Ebean.getServer(null).findFutureIds(query, null);
+    FutureIds<Order> futureIds = query.findFutureIds();
 
     // wait for all the id's to be fetched
     List<Object> idList = futureIds.get();
diff --git a/src/test/java/org/tests/basic/TestQueryForUpdate.java b/src/test/java/org/tests/basic/TestQueryForUpdate.java
index 54f339ffc..f5013e77e 100644
--- a/src/test/java/org/tests/basic/TestQueryForUpdate.java
+++ b/src/test/java/org/tests/basic/TestQueryForUpdate.java
@@ -136,7 +136,7 @@ public class TestQueryForUpdate extends BaseTestCase {
             .where().idEq(first.getId())
             .forUpdateNoWait();
 
-        server.findOne(query2, txn2);
+        server.extended().findOne(query2, txn2);
         assertTrue(false); // never get here
       } catch (AcquireLockException e) {
         logger.info("... got AcquireLockException " + e);
diff --git a/src/test/java/org/tests/delete/TestDeleteByQuery.java b/src/test/java/org/tests/delete/TestDeleteByQuery.java
index 89dd04c72..a4b7ce989 100644
--- a/src/test/java/org/tests/delete/TestDeleteByQuery.java
+++ b/src/test/java/org/tests/delete/TestDeleteByQuery.java
@@ -29,7 +29,7 @@ public class TestDeleteByQuery extends BaseTestCase {
     Query<Contact> query = server.find(Contact.class).where().eq("group.name", "NahYeahMaybe").query();
 
     LoggedSqlCollector.start();
-    server.delete(query, null);
+    query.delete();
 
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertThat(loggedSql).hasSize(1);
@@ -38,7 +38,7 @@ public class TestDeleteByQuery extends BaseTestCase {
     Query<Contact> query2 = server.find(Contact.class).where().eq("firstName", "NotARealFirstName").query();
 
     LoggedSqlCollector.start();
-    server.delete(query2, null);
+    query2.delete();
 
     loggedSql = LoggedSqlCollector.stop();
     assertThat(loggedSql).hasSize(1);
@@ -75,7 +75,7 @@ public class TestDeleteByQuery extends BaseTestCase {
 
     Ebean.find(Customer.class)
       .where().eq("name", "Don Roberto")
-      .query().setForUpdate(true)
+      .query().forUpdate()
       .delete();
 
     List<String> sql = LoggedSqlCollector.stop();
diff --git a/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
index ff482a03e..b985a2a0a 100644
--- a/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
+++ b/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
@@ -321,7 +321,7 @@ public class TestQuerySingleAttribute extends BaseTestCase {
     Query<EUncle> query = Ebean.find(EUncle.class)
       .fetch("parent", "more");
 
-    Ebean.getDefaultServer().findSingleAttributeList(query, null);
+    query.findSingleAttributeList();
 
     assertThat(sqlOf(query)).contains("select t1.more from rawinherit_uncle t0 join rawinherit_parent t1 on t1.id = t0.parent_id");
   }
diff --git a/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java b/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java
index 19db621d5..554b2efd7 100644
--- a/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java
+++ b/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java
@@ -60,7 +60,7 @@ public class TestAutoCommitDataSource extends BaseTestCase {
     EbeanServer ebeanServer = EbeanServerFactory.create(config);
 
     Query<UTMaster> query = ebeanServer.find(UTMaster.class);
-    List<UTMaster> details = ebeanServer.findList(query, null);
+    List<UTMaster> details = query.findList();
     assertEquals(0, details.size());
 
     UTMaster bean1 = new UTMaster("one1");
@@ -77,7 +77,7 @@ public class TestAutoCommitDataSource extends BaseTestCase {
         ebeanServer.save(bean2);
 
         Query<UTMaster> query2 = ebeanServer.find(UTMaster.class);
-        details = ebeanServer.findList(query2, otherTxn);
+        details = ebeanServer.extended().findList(query2, otherTxn);
         assertEquals(2, details.size());
 
         ebeanServer.save(bean3);
@@ -89,7 +89,7 @@ public class TestAutoCommitDataSource extends BaseTestCase {
       }
 
       Query<UTMaster> query3 = ebeanServer.find(UTMaster.class);
-      details = ebeanServer.findList(query3, otherTxn);
+      details = ebeanServer.extended().findList(query3, otherTxn);
       assertEquals(3, details.size());
     }
 
diff --git a/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
index e7614619b..0809baa9c 100644
--- a/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
+++ b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
@@ -62,7 +62,7 @@ public class TestExplicitTransactionMode extends BaseTestCase {
     System.clearProperty("ebean.ignoreExtraDdl");
 
     Query<UTMaster> query = ebeanServer.find(UTMaster.class);
-    List<UTMaster> details = ebeanServer.findList(query, null);
+    List<UTMaster> details = query.findList();
     assertEquals(0, details.size());
 
     UTMaster bean0 = new UTMaster("one0");
@@ -91,7 +91,7 @@ public class TestExplicitTransactionMode extends BaseTestCase {
 
         // not visible in other transaction
         Query<UTMaster> query2 = ebeanServer.find(UTMaster.class);
-        details = ebeanServer.findList(query2, otherTxn);
+        details = ebeanServer.extended().findList(query2, otherTxn);
         assertEquals(0, details.size());
 
         ebeanServer.save(bean3);
@@ -104,7 +104,7 @@ public class TestExplicitTransactionMode extends BaseTestCase {
 
       // commit as expected
       Query<UTMaster> query3 = ebeanServer.find(UTMaster.class);
-      details = ebeanServer.findList(query3, otherTxn);
+      details = ebeanServer.extended().findList(query3, otherTxn);
       assertEquals(3, details.size());
     }
   }

From 43e95d81f642aef5eab67d52f2739915bc79e760 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 19 Jun 2018 00:50:14 +1200
Subject: [PATCH 0343/1036] #1427 - RemoteTransactionEvent process dependent
 tables

---
 .../server/cache/RemoteCacheEvent.java        |  2 +-
 .../server/core/InternalConfiguration.java    |  3 +-
 .../server/deploy/BeanDescriptor.java         |  7 -----
 .../server/deploy/BeanDescriptorManager.java  |  3 +-
 .../server/transaction/BeanPersistIds.java    |  2 ++
 .../server/transaction/DeleteByIdMap.java     |  3 +-
 .../server/transaction/RemoteTableMod.java    |  5 ++++
 .../transaction/RemoteTransactionEvent.java   |  7 ++++-
 .../server/transaction/TableModState.java     | 29 +++++++++++++++++--
 .../transaction/TransactionManager.java       |  5 ++++
 .../server/cache/DefaultCacheHolderTest.java  |  5 +++-
 .../server/transaction/TableModStateTest.java |  4 ++-
 12 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java b/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java
index 8024087de..ef327d69e 100644
--- a/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java
+++ b/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java
@@ -53,7 +53,7 @@ public class RemoteCacheEvent implements BinaryWritable {
 
   @Override
   public String toString() {
-    return "clearAll:" + clearAll + " caches:" + clearCaches;
+    return "CacheEvent[ clearAll:" + clearAll + " caches:" + clearCaches + "]";
   }
 
   public static RemoteCacheEvent readBinaryMessage(BinaryReadContext dataInput) throws IOException {
diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index f3b537217..a2090e2e0 100644
--- a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -106,7 +106,7 @@ public class InternalConfiguration {
 
   private static final Logger logger = LoggerFactory.getLogger(InternalConfiguration.class);
 
-  private final TableModState tableModState = new TableModState();
+  private final TableModState tableModState;
 
   private final boolean online;
 
@@ -169,6 +169,7 @@ public class InternalConfiguration {
     this.online = online;
     this.serverConfig = serverConfig;
     this.clockService = new ClockService(serverConfig.getClock());
+    this.tableModState = new TableModState(clockService);
     this.logManager = initLogManager();
     this.docStoreFactory = initDocStoreFactory(serverConfig.service(DocStoreFactory.class));
     this.jsonFactory = serverConfig.getJsonFactory();
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 12ffbcb19..2cf11026b 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -1517,13 +1517,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     cacheHelp.handleBulkUpdate(tableIUD);
   }
 
-  /**
-   * Handle a delete by id request adding an cache change into the changeSet.
-   */
-  public void cacheHandleDeleteById(Object id, CacheChangeSet changeSet) {
-    cacheHelp.handleDelete(id, changeSet);
-  }
-
   /**
    * Remove a bean from the cache given its Id.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index a82974fa4..a517dd25c 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -447,8 +447,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   }
 
   /**
-   * For SQL based modifications we need to invalidate appropriate parts of the
-   * cache.
+   * For SQL based modifications we need to invalidate appropriate parts of the cache.
    */
   public void cacheNotify(TransactionEventTable.TableIUD tableIUD) {
 
diff --git a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
index 13810e4fe..b4da3e13d 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
@@ -94,6 +94,7 @@ public class BeanPersistIds implements BinaryWritable {
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
+    sb.append("BeanIds[");
     if (beanDescriptor != null) {
       sb.append(beanDescriptor.getFullName());
     } else {
@@ -102,6 +103,7 @@ public class BeanPersistIds implements BinaryWritable {
     if (ids != null) {
       sb.append(" ids:").append(ids);
     }
+    sb.append("]");
     return sb.toString();
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java b/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java
index 1bf84c0c2..edbe8a2c9 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java
@@ -7,7 +7,6 @@ import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeanservice.docstore.api.DocStoreUpdates;
 import io.ebeanservice.docstore.api.support.DocStoreDeleteEvent;
 
-import java.io.Serializable;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -22,7 +21,7 @@ public final class DeleteByIdMap {
 
   @Override
   public String toString() {
-    return beanMap.toString();
+    return "DeleteById[" + beanMap.values() + "]";
   }
 
   public void notifyCache(CacheChangeSet changeSet) {
diff --git a/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java b/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java
index 0234a6aba..8e6316a58 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java
@@ -20,6 +20,11 @@ public class RemoteTableMod implements BinaryWritable {
     this.tables = tables;
   }
 
+  @Override
+  public String toString() {
+    return "TableMod[" + timestamp + "; " + tables + "]";
+  }
+
   public long getTimestamp() {
     return timestamp;
   }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java b/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java
index c89a255d1..8e328e2a2 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java
@@ -52,6 +52,10 @@ public class RemoteTransactionEvent implements Runnable, BinaryWritable {
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder(100);
+    sb.append("TransEvent[");
+    if (remoteTableMod != null) {
+      sb.append(remoteTableMod);
+    }
     if (!beanPersistList.isEmpty()) {
       sb.append(beanPersistList);
     }
@@ -59,8 +63,9 @@ public class RemoteTransactionEvent implements Runnable, BinaryWritable {
       sb.append(tableList);
     }
     if (deleteByIdMap != null) {
-      sb.append(deleteByIdMap.values());
+      sb.append(deleteByIdMap);
     }
+    sb.append("]");
     return sb.toString();
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TableModState.java b/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
index b876a4ed0..443d35fd1 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
@@ -4,6 +4,7 @@ import io.ebean.cache.QueryCacheEntry;
 import io.ebean.cache.QueryCacheEntryValidate;
 import io.ebean.cache.ServerCacheNotification;
 import io.ebean.cache.ServerCacheNotify;
+import io.ebeaninternal.server.core.ClockService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -21,8 +22,14 @@ public class TableModState implements QueryCacheEntryValidate, ServerCacheNotify
 
   private static final Logger log = LoggerFactory.getLogger("io.ebean.cache.TABLEMOD");
 
+  private final ClockService clockService;
+
   private Map<String,Long> tableModStamp = new ConcurrentHashMap<>();
 
+  public TableModState(ClockService clockService) {
+    this.clockService = clockService;
+  }
+
   /**
    * Set the modified timestamp on the tables that have been touched.
    */
@@ -59,12 +66,28 @@ public class TableModState implements QueryCacheEntryValidate, ServerCacheNotify
 
   /**
    * Update the table modification timestamps based on remote table modification events.
+   * <p>
+   * Generally this is used with distributed caches (Hazelcast, Ignite etc) via topic.
+   * </p>
    */
   @Override
   public void notify(ServerCacheNotification notification) {
 
-    // TODO: Change to use ClockService ...
-    long modifyTimestamp = notification.getModifyTimestamp();
-    touch(notification.getDependentTables(), modifyTimestamp);
+    // use local clock - for slightly more aggressive invalidation (as later)
+    // that removes any concern regarding clock syncing across cluster
+    touch(notification.getDependentTables(), clockService.nowMillis());
+  }
+
+  /**
+   * Update from Remote transaction event.
+   * <p>
+   * Generally this is used with Clustering (ebean-cluster, k8scache).
+   * </p>
+   */
+  public void notify(RemoteTableMod tableMod) {
+
+    // use local clock - for slightly more aggressive invalidation (as later)
+    // that removes any concern regarding clock syncing across cluster
+    touch(tableMod.getTables(), clockService.nowMillis());
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index 09f24c867..f330e8cce 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -468,6 +468,11 @@ public class TransactionManager implements SpiTransactionManager {
       clusterLogger.debug("processing {}", remoteEvent);
     }
 
+    RemoteTableMod tableMod = remoteEvent.getRemoteTableMod();
+    if (tableMod != null) {
+      tableModState.notify(tableMod);
+    }
+
     List<TableIUD> tableIUDList = remoteEvent.getTableIUDList();
     if (tableIUDList != null) {
       for (TableIUD tableIUD : tableIUDList) {
diff --git a/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java b/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java
index 046ae15d6..e7a7966b7 100644
--- a/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java
+++ b/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java
@@ -4,11 +4,14 @@ import io.ebean.cache.ServerCacheFactory;
 import io.ebean.cache.ServerCacheOptions;
 import io.ebean.cache.ServerCacheType;
 import io.ebean.config.ServerConfig;
+import io.ebeaninternal.server.core.ClockService;
 import io.ebeaninternal.server.transaction.TableModState;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
 import org.junit.Test;
 
+import java.time.Clock;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 
@@ -22,7 +25,7 @@ public class DefaultCacheHolderTest {
   private CacheManagerOptions options() {
     return new CacheManagerOptions(null, new ServerConfig(), true)
       .with(defaultOptions, defaultOptions)
-      .with(cacheFactory, new TableModState());
+      .with(cacheFactory, new TableModState(new ClockService(Clock.systemUTC())));
   }
 
 
diff --git a/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java b/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java
index 5abcb1820..1fb80996c 100644
--- a/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java
+++ b/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java
@@ -1,7 +1,9 @@
 package io.ebeaninternal.server.transaction;
 
+import io.ebeaninternal.server.core.ClockService;
 import org.junit.Test;
 
+import java.time.Clock;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
@@ -10,7 +12,7 @@ import static org.junit.Assert.*;
 
 public class TableModStateTest {
 
-  private TableModState tableModState = new TableModState();
+  private TableModState tableModState = new TableModState(new ClockService(Clock.systemUTC()));
 
   @Test
   public void isValid() {

From 671d082ad338470a4e6e28b587eaca615e8cbe40 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 19 Jun 2018 01:34:28 +1200
Subject: [PATCH 0344/1036] #1427 - Map all deleteByIds into a single
 CacheChangeBeanRemove and use bulk removeAll api to remove from cache

---
 .../server/cache/CacheChangeBeanRemove.java   | 31 ++++++++++++++++---
 .../server/cache/CacheChangeSet.java          | 28 +++++++++++++++--
 .../server/deploy/BeanDescriptor.java         |  8 ++---
 .../deploy/BeanDescriptorCacheHelp.java       | 21 ++-----------
 .../server/transaction/BeanPersistIds.java    |  2 +-
 .../server/transaction/DeleteByIdMap.java     |  3 +-
 6 files changed, 62 insertions(+), 31 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanRemove.java b/src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanRemove.java
index 82e45fdd7..c6f99f194 100644
--- a/src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanRemove.java
+++ b/src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanRemove.java
@@ -2,6 +2,9 @@ package io.ebeaninternal.server.cache;
 
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
 /**
  * Change to remove bean from L2 cache.
  */
@@ -9,15 +12,35 @@ class CacheChangeBeanRemove implements CacheChange {
 
   private final BeanDescriptor<?> descriptor;
 
-  private final Object id;
+  private final Collection<Object> ids;
 
-  CacheChangeBeanRemove(BeanDescriptor<?> descriptor, Object id) {
+  CacheChangeBeanRemove(Object id, BeanDescriptor<?> descriptor) {
     this.descriptor = descriptor;
-    this.id = id;
+    this.ids = new ArrayList<>();
+    ids.add(id);
+  }
+
+  CacheChangeBeanRemove(BeanDescriptor<?> descriptor, Collection<Object> ids) {
+    this.descriptor = descriptor;
+    this.ids = ids;
   }
 
   @Override
   public void apply() {
-    descriptor.cacheHandleDeleteById(id);
+    descriptor.cacheApplyInvalidate(ids);
+  }
+
+  /**
+   * Add more id values.
+   */
+  public void addIds(Collection<Object> moreIds) {
+    ids.addAll(moreIds);
+  }
+
+  /**
+   * Add another id value.
+   */
+  public void addId(Object id) {
+    ids.add(id);
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java b/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
index 45956d181..d917756d1 100644
--- a/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
+++ b/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.cache;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -21,6 +22,8 @@ public class CacheChangeSet {
 
   private final Set<BeanDescriptor<?>> queryCaches = new HashSet<>();
 
+  private final Map<BeanDescriptor<?>, CacheChangeBeanRemove> beanRemoveMap = new HashMap<>();
+
   private final Map<ManyKey, ManyChange> manyChangeMap = new HashMap<>();
 
   private final long modificationTimestamp;
@@ -54,6 +57,9 @@ public class CacheChangeSet {
     for (CacheChange entry : manyChangeMap.values()) {
       entry.apply();
     }
+    for (CacheChange entry : beanRemoveMap.values()) {
+      entry.apply();
+    }
   }
 
   /**
@@ -102,8 +108,26 @@ public class CacheChangeSet {
    * Remove a bean from the cache.
    */
   public <T> void addBeanRemove(BeanDescriptor<T> desc, Object id) {
-    touchedTables.add(desc.getBaseTable());
-    entries.add(new CacheChangeBeanRemove(desc, id));
+    CacheChangeBeanRemove entry = beanRemoveMap.get(desc);
+    if (entry != null) {
+      entry.addId(id);
+    } else {
+      beanRemoveMap.put(desc, new CacheChangeBeanRemove(id, desc));
+      touchedTables.add(desc.getBaseTable());
+    }
+  }
+
+  /**
+   * Remove a bean from the cache.
+   */
+  public <T> void addBeanRemoveMany(BeanDescriptor<T> desc, Collection<Object> ids) {
+    CacheChangeBeanRemove entry = beanRemoveMap.get(desc);
+    if (entry != null) {
+      entry.addIds(ids);
+    } else {
+      beanRemoveMap.put(desc, new CacheChangeBeanRemove(desc, ids));
+      touchedTables.add(desc.getBaseTable());
+    }
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 2cf11026b..96285d3f9 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -1472,15 +1472,15 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Remove a bean from the cache given its Id.
    */
-  public void cacheHandleDeleteById(Object id) {
-    cacheHelp.beanCacheRemove(id);
+  public void cacheHandleDeleteByIds(Collection<Object> ids, CacheChangeSet changeSet) {
+    cacheHelp.handleDeleteIds(ids, changeSet);
   }
 
   /**
    * Remove a collection of beans from the cache given the ids.
    */
-  public void cacheHandleInvalidate(Collection<Object> ids) {
-    cacheHelp.beanCacheInvalidate(ids);
+  public void cacheApplyInvalidate(Collection<Object> ids) {
+    cacheHelp.beanCacheApplyInvalidate(ids);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index d10bd85a6..79cdf45e7 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -683,7 +683,7 @@ final class BeanDescriptorCacheHelp<T> {
   /**
    * Remove a bean from the cache given its Id.
    */
-  void beanCacheInvalidate(Collection<Object> ids) {
+  void beanCacheApplyInvalidate(Collection<Object> ids) {
     if (beanCache != null) {
       if (beanLog.isDebugEnabled()) {
         beanLog.debug("   REMOVE {}({})", cacheName, ids);
@@ -695,21 +695,6 @@ final class BeanDescriptorCacheHelp<T> {
     }
   }
 
-  /**
-   * Remove a bean from the cache given its Id.
-   */
-  void beanCacheRemove(Object id) {
-    if (beanCache != null) {
-      if (beanLog.isDebugEnabled()) {
-        beanLog.debug("   REMOVE {}({})", cacheName, id);
-      }
-      beanCache.remove(id);
-    }
-    for (BeanPropertyAssocOne<?> imported : propertiesOneImported) {
-      imported.cacheClear();
-    }
-  }
-
   /**
    * Returns true if it managed to populate/load the bean from the cache.
    */
@@ -740,12 +725,12 @@ final class BeanDescriptorCacheHelp<T> {
   /**
    * Add appropriate cache changes to support delete by id.
    */
-  void handleDelete(Object id, CacheChangeSet changeSet) {
+  void handleDeleteIds(Collection<Object> ids, CacheChangeSet changeSet) {
     if (invalidateQueryCache) {
      changeSet.addInvalidate(desc);
     } else {
       if (beanCache != null) {
-        changeSet.addBeanRemove(desc, id);
+        changeSet.addBeanRemoveMany(desc, ids);
       }
       cacheDeleteImported(true, null, changeSet);
     }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
index b4da3e13d..1fe930fc6 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
@@ -131,7 +131,7 @@ public class BeanPersistIds implements BinaryWritable {
     // any change invalidates the query cache
     beanDescriptor.clearQueryCache();
     if (ids != null) {
-      beanDescriptor.cacheHandleInvalidate(ids);
+      beanDescriptor.cacheApplyInvalidate(ids);
     }
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java b/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java
index edbe8a2c9..5f76c4b03 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java
@@ -29,8 +29,7 @@ public final class DeleteByIdMap {
       BeanDescriptor<?> d = deleteIds.getBeanDescriptor();
       List<Object> idValues = deleteIds.getIds();
       if (idValues != null) {
-        d.queryCacheClear(changeSet);
-        d.cacheHandleInvalidate(idValues);
+        d.cacheHandleDeleteByIds(idValues, changeSet);
       }
     }
   }

From ae55b584380804722b096f5b2707b2a70c7e9037 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 19 Jun 2018 01:48:45 +1200
Subject: [PATCH 0345/1036] No effective change - remove unused imports

---
 .../java/io/ebeaninternal/server/transaction/BeanPersistIds.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
index 1fe930fc6..a1b63873a 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
@@ -11,7 +11,6 @@ import io.ebeaninternal.server.deploy.id.IdBinder;
 import java.io.DataInput;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 

From a5a8765bd0150102f21223fd356cb774c8dd72fe Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 19 Jun 2018 15:24:35 +1200
Subject: [PATCH 0346/1036] Update tests only - non native boolean (MySql) and
 ignore non-named savepoint nested transaction tests with MySql.

---
 .../softdelete/TestSoftDeleteStatelessUpdate.java     | 11 ++++++-----
 .../tests/transaction/TestNestedSubTransaction.java   | 10 ++++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java b/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java
index 85901d391..3e2875c2b 100644
--- a/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java
+++ b/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java
@@ -43,8 +43,9 @@ public class TestSoftDeleteStatelessUpdate extends BaseTestCase {
     List<String> sql = LoggedSql.collect();
     assertThat(sql).hasSize(4);
     assertThat(sql.get(0)).contains("update esd_master set name=? where id=?");
-    assertThat(sql.get(1)).contains("update esd_detail set deleted=true where master_id = ? and not");
-
+    if (isPlatformBooleanNative()) {
+      assertThat(sql.get(1)).contains("update esd_detail set deleted=true where master_id = ? and not");
+    }
 
     EsdMaster fetchedWithSoftDeletes = Ebean.find(EsdMaster.class)
       .setId(master.getId())
@@ -67,8 +68,8 @@ public class TestSoftDeleteStatelessUpdate extends BaseTestCase {
 
     sql = LoggedSql.stop();
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("left join esd_detail t1 on t1.master_id = t0.id and t1.deleted = false  where t0.id = ?");
-
-
+    if (isPlatformBooleanNative()) {
+      assertThat(sql.get(0)).contains("left join esd_detail t1 on t1.master_id = t0.id and t1.deleted = false  where t0.id = ?");
+    }
   }
 }
diff --git a/src/test/java/org/tests/transaction/TestNestedSubTransaction.java b/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
index 9c99b5f86..05eeed4d8 100644
--- a/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
+++ b/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
@@ -6,6 +6,8 @@ import io.ebean.EbeanServer;
 import io.ebean.PersistenceContextScope;
 import io.ebean.Transaction;
 import io.ebean.TxScope;
+import io.ebean.annotation.IgnorePlatform;
+import io.ebean.annotation.Platform;
 import org.junit.Test;
 import org.tests.model.basic.EBasic;
 
@@ -15,6 +17,10 @@ import static org.junit.Assert.assertNull;
 
 public class TestNestedSubTransaction extends BaseTestCase {
 
+  /**
+   * MySql only supports named savepoints - review.
+   */
+  @IgnorePlatform(Platform.MYSQL)
   @Test
   public void ebeanServer_commitTransaction_expect_sameAsTransactionCommit() {
 
@@ -59,6 +65,7 @@ public class TestNestedSubTransaction extends BaseTestCase {
   }
 
 
+  @IgnorePlatform(Platform.MYSQL)
   @Test
   public void nestedUseSavepoint_doubleNested_rollbackCommit() {
 
@@ -95,6 +102,7 @@ public class TestNestedSubTransaction extends BaseTestCase {
     }
   }
 
+  @IgnorePlatform(Platform.MYSQL)
   @Test
   public void nestedUseSavepoint_doubleNested_commitRollback() {
 
@@ -131,6 +139,7 @@ public class TestNestedSubTransaction extends BaseTestCase {
     }
   }
 
+  @IgnorePlatform(Platform.MYSQL)
   @Test
   public void nestedUseSavepoint_nested_RequiresNew() {
 
@@ -166,6 +175,7 @@ public class TestNestedSubTransaction extends BaseTestCase {
     assertNull(after);
   }
 
+  @IgnorePlatform(Platform.MYSQL)
   @Test
   public void nestedUseSavepoint() {
 

From dd8607b072b1e65f3e6c743dc371969bb6dacc06 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 19 Jun 2018 15:30:19 +1200
Subject: [PATCH 0347/1036] #1436 - PersistenceException: Query threw
 SQLException:No ScalarType registered for class java.util.Arrays$ArrayList
 Query was:select id, name from o_customer where id = any(?)

---
 .../java/io/ebeaninternal/api/BindParams.java |  5 +++
 src/test/java/io/ebean/DtoQueryTest.java      | 45 +++++++++++++++++++
 .../org/tests/basic/type/TestSqlRowUUID.java  | 18 +++++++-
 3 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/api/BindParams.java b/src/main/java/io/ebeaninternal/api/BindParams.java
index b034fb2b1..53ea7dcf9 100644
--- a/src/main/java/io/ebeaninternal/api/BindParams.java
+++ b/src/main/java/io/ebeaninternal/api/BindParams.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.api;
 
+import io.ebeaninternal.server.persist.MultiValueWrapper;
 import io.ebeaninternal.server.querydefn.NaturalKeyBindParam;
 
 import java.io.Serializable;
@@ -154,6 +155,10 @@ public class BindParams implements Serializable {
   public void setParameter(int position, Object value) {
 
     Param p = getParam(position);
+    if (value instanceof Collection) {
+      // use of postgres ANY with positioned parameter
+      value = new MultiValueWrapper((Collection)value);
+    }
     p.setInValue(value);
   }
 
diff --git a/src/test/java/io/ebean/DtoQueryTest.java b/src/test/java/io/ebean/DtoQueryTest.java
index 7957559dc..f31350b30 100644
--- a/src/test/java/io/ebean/DtoQueryTest.java
+++ b/src/test/java/io/ebean/DtoQueryTest.java
@@ -1,5 +1,7 @@
 package io.ebean;
 
+import io.ebean.annotation.ForPlatform;
+import io.ebean.annotation.Platform;
 import io.ebean.meta.BasicMetricVisitor;
 import io.ebean.meta.MetaQueryMetric;
 import org.ebeantest.LoggedSqlCollector;
@@ -8,6 +10,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tests.model.basic.ResetBasicData;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
@@ -98,6 +101,48 @@ public class DtoQueryTest extends BaseTestCase {
   }
 
 
+  @ForPlatform(Platform.POSTGRES)
+  @Test
+  public void dto_bindList_usingPostrgesAnyWithPositionedParameter() {
+
+    ResetBasicData.reset();
+
+    List<Integer> ids = Arrays.asList(1, 2);
+
+    List<DCust> list = server().findDto(DCust.class, "select id, name from o_customer where id = any(?)")
+      .setParameter(1, ids)
+      .findList();
+
+    assertThat(list).isNotEmpty();
+
+    list = server().findDto(DCust.class, "select id, name from o_customer where id in (:idList)")
+      .setParameter("idList", ids)
+      .findList();
+
+    assertThat(list).isNotEmpty();
+  }
+
+  @ForPlatform(Platform.POSTGRES)
+  @Test
+  public void sql_bindListParam_usingPostrgesAnyWithPositionedParameter() {
+
+    ResetBasicData.reset();
+
+    List<Integer> ids = Arrays.asList(1, 2);
+
+    List<SqlRow> list = server().createSqlQuery("select id, name from o_customer where id = any(?)")
+      .setParameter(1, ids)
+      .findList();
+
+    assertThat(list).isNotEmpty();
+
+    list = server().createSqlQuery("select id, name from o_customer where id in (:idList)")
+      .setParameter("idList", ids)
+      .findList();
+
+    assertThat(list).isNotEmpty();
+  }
+
   @Test
   public void dto_queryPlanHits() {
 
diff --git a/src/test/java/org/tests/basic/type/TestSqlRowUUID.java b/src/test/java/org/tests/basic/type/TestSqlRowUUID.java
index 2ebcb4db0..1997af5d2 100644
--- a/src/test/java/org/tests/basic/type/TestSqlRowUUID.java
+++ b/src/test/java/org/tests/basic/type/TestSqlRowUUID.java
@@ -4,9 +4,11 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
-import org.tests.model.basic.TUuidEntity;
 import org.junit.Test;
+import org.tests.model.basic.TUuidEntity;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -41,5 +43,19 @@ public class TestSqlRowUUID extends BaseTestCase {
 
     assertThat(value).isEqualTo(e.getId());
 
+    if (isPostgres()) {
+      usingPostrgesAnyWithPositionedParameter_needsExplicitCast(e);
+    }
+  }
+
+  private void usingPostrgesAnyWithPositionedParameter_needsExplicitCast(TUuidEntity e) {
+
+    List<UUID> ids = Arrays.asList(e.getId(), UUID.randomUUID());
+
+    List<SqlRow> result = Ebean.createSqlQuery("select id from tuuid_entity where id = any(?::uuid[])")
+      .setParameter(1, ids)
+      .findList();
+
+    assertThat(result).hasSize(1);
   }
 }

From b58fc2df04f26ff111e0e9e43c9b20ca4f399eb8 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 19 Jun 2018 16:30:21 +1200
Subject: [PATCH 0348/1036] #1436 - PersistenceException: Query threw
 SQLException:No ScalarType registered for class java.util.Arrays$ArrayList
 Query was:select id, name from o_customer where id = any(?)

Add test for SqlUpdate
---
 src/test/java/io/ebean/DtoQueryTest.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/test/java/io/ebean/DtoQueryTest.java b/src/test/java/io/ebean/DtoQueryTest.java
index f31350b30..5f693cab4 100644
--- a/src/test/java/io/ebean/DtoQueryTest.java
+++ b/src/test/java/io/ebean/DtoQueryTest.java
@@ -143,6 +143,22 @@ public class DtoQueryTest extends BaseTestCase {
     assertThat(list).isNotEmpty();
   }
 
+  @ForPlatform(Platform.POSTGRES)
+  @Test
+  public void sqlUpdate_bindListParam_usingPostrgesAnyWithPositionedParameter() {
+
+    ResetBasicData.reset();
+
+    List<Integer> ids = Arrays.asList(999999999, 999999998);
+
+    int rows = server().createSqlUpdate("update o_customer set name = ? where id = any(?)")
+      .setParameter(1, "Junk")
+      .setParameter(2, ids)
+      .execute();
+
+    assertThat(rows).isEqualTo(0);
+  }
+
   @Test
   public void dto_queryPlanHits() {
 

From 9159cec36c4abbc5038bdcc740569865479b42a8 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 19 Jun 2018 16:35:42 +1200
Subject: [PATCH 0349/1036] No effective change - remove invalid javadoc on
 Query due to #1434

---
 src/main/java/io/ebean/Query.java | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index 4d18a580d..3fb48c1eb 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -602,8 +602,6 @@ public interface Query<T> {
    * <p>
    * This query will execute against the EbeanServer that was used to create it.
    * </p>
-   *
-   * @see EbeanServer#findIds(Query, Transaction)
    */
   @Nonnull
   <A> List<A> findIds();
@@ -740,8 +738,6 @@ public interface Query<T> {
    *     .findList();
    *
    * }</pre>
-   *
-   * @see EbeanServer#findList(Query, Transaction)
    */
   @Nonnull
   List<T> findList();
@@ -759,8 +755,6 @@ public interface Query<T> {
    *     .findSet();
    *
    * }</pre>
-   *
-   * @see EbeanServer#findSet(Query, Transaction)
    */
   @Nonnull
   Set<T> findSet();
@@ -782,8 +776,6 @@ public interface Query<T> {
    *     .findMap();
    *
    * }</pre>
-   *
-   * @see EbeanServer#findMap(Query, Transaction)
    */
   @Nonnull
   <K> Map<K, T> findMap();

From ed566ca153984b523e75c14b713f0067d7e46ea9 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 26 Jun 2018 00:25:33 +1200
Subject: [PATCH 0350/1036] #1427 - QueryCache should be cleared, if one of a
 dependent bean is updated

Refactor on PostCommitProcessing with fixes for dependent table invalidation
---
 .../ebeaninternal/api/TransactionEvent.java   | 23 +++++--
 .../server/cache/CacheChangeBeanUpdate.java   |  2 +-
 .../server/cache/CacheChangeSet.java          | 19 ++++++
 .../server/core/OrmQueryRequest.java          |  4 +-
 .../server/core/PersistRequestBean.java       |  6 +-
 .../server/deploy/BeanDescriptor.java         | 54 ++++++++-------
 .../deploy/BeanDescriptorCacheHelp.java       | 36 +++++++---
 .../server/deploy/BeanDescriptorManager.java  |  7 +-
 .../server/deploy/BeanPropertyAssocOne.java   | 22 ++++--
 .../server/transaction/BeanPersistIds.java    |  8 +--
 .../server/transaction/DeleteByIdMap.java     |  2 +-
 .../server/transaction/JdbcTransaction.java   |  4 +-
 .../transaction/PostCommitProcessing.java     | 33 ++-------
 .../server/transaction/TableModState.java     | 13 +++-
 .../transaction/TransactionManager.java       | 15 ++--
 .../tests/cache/TestCacheCollectionIds.java   | 62 +++++++++--------
 .../java/org/tests/cache/TestCacheDelete.java |  9 +--
 .../cache/TestQueryCacheTableDependency.java  | 68 ++++++++++++++++++-
 src/test/resources/logback-test.xml           |  2 +
 19 files changed, 262 insertions(+), 127 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/api/TransactionEvent.java b/src/main/java/io/ebeaninternal/api/TransactionEvent.java
index 711fa49dd..d8b25c113 100644
--- a/src/main/java/io/ebeaninternal/api/TransactionEvent.java
+++ b/src/main/java/io/ebeaninternal/api/TransactionEvent.java
@@ -3,7 +3,9 @@ package io.ebeaninternal.api;
 import io.ebeaninternal.server.cache.CacheChangeSet;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
+import io.ebeaninternal.server.deploy.BeanDescriptorManager;
 import io.ebeaninternal.server.transaction.DeleteByIdMap;
+import io.ebeaninternal.server.transaction.TransactionManager;
 import io.ebeanservice.docstore.api.DocStoreUpdates;
 
 import java.io.Serializable;
@@ -27,8 +29,6 @@ public class TransactionEvent implements Serializable {
    */
   private final transient boolean local;
 
-  private final long modificationTimestamp;
-
   private TransactionEventTable eventTables;
 
   private transient TransactionEventBeans eventBeans;
@@ -38,9 +38,8 @@ public class TransactionEvent implements Serializable {
   /**
    * Create the TransactionEvent, one per Transaction.
    */
-  public TransactionEvent(long modificationTimestamp) {
+  public TransactionEvent() {
     this.local = true;
-    this.modificationTimestamp = modificationTimestamp;
   }
 
   public void addDeleteById(BeanDescriptor<?> desc, Object id) {
@@ -111,8 +110,20 @@ public class TransactionEvent implements Serializable {
   /**
    * Build and return the cache changeSet.
    */
-  public CacheChangeSet buildCacheChanges() {
-    CacheChangeSet changeSet = new CacheChangeSet(modificationTimestamp);
+  public CacheChangeSet buildCacheChanges(TransactionManager manager) {
+
+    if (eventBeans == null && deleteByIdMap == null && eventTables == null) {
+      return null;
+    }
+
+    CacheChangeSet changeSet = new CacheChangeSet(manager.clockNowMillis());
+    if (eventTables != null && !eventTables.isEmpty()) {
+      // notify cache with table based changes
+      BeanDescriptorManager dm = manager.getBeanDescriptorManager();
+      for (TransactionEventTable.TableIUD tableIUD : eventTables.values()) {
+        dm.cacheNotify(tableIUD, changeSet);
+      }
+    }
     if (eventBeans != null) {
       eventBeans.notifyCache(changeSet);
     }
diff --git a/src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanUpdate.java b/src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanUpdate.java
index cce2a4f9b..5463eab5e 100644
--- a/src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanUpdate.java
+++ b/src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanUpdate.java
@@ -25,6 +25,6 @@ class CacheChangeBeanUpdate implements CacheChange {
 
   @Override
   public void apply() {
-    desc.cacheBeanUpdate(id, changes, updateNaturalKey, version);
+    desc.cacheApplyBeanUpdate(id, changes, updateNaturalKey, version);
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java b/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
index d917756d1..5865d2bbc 100644
--- a/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
+++ b/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
@@ -22,6 +22,8 @@ public class CacheChangeSet {
 
   private final Set<BeanDescriptor<?>> queryCaches = new HashSet<>();
 
+  private final Set<BeanDescriptor<?>> beanCaches = new HashSet<>();
+
   private final Map<BeanDescriptor<?>, CacheChangeBeanRemove> beanRemoveMap = new HashMap<>();
 
   private final Map<ManyKey, ManyChange> manyChangeMap = new HashMap<>();
@@ -51,6 +53,9 @@ public class CacheChangeSet {
     for (BeanDescriptor<?> entry : queryCaches) {
       entry.clearQueryCache();
     }
+    for (BeanDescriptor<?> entry : beanCaches) {
+      entry.clearBeanCache();
+    }
     for (CacheChange entry : entries) {
       entry.apply();
     }
@@ -69,6 +74,13 @@ public class CacheChangeSet {
     touchedTables.add(descriptor.getBaseTable());
   }
 
+  /**
+   * Add invalidation on a set of tables.
+   */
+  public void addInvalidate(Set<String> tables) {
+    touchedTables.addAll(tables);
+  }
+
   /**
    * Add an entry to clear a query cache.
    */
@@ -76,6 +88,13 @@ public class CacheChangeSet {
     queryCaches.add(descriptor);
   }
 
+  /**
+   * Add an entry to clear a bean cache.
+   */
+  public void addClearBean(BeanDescriptor<?> descriptor) {
+    beanCaches.add(descriptor);
+  }
+
   /**
    * Add many property clear.
    */
diff --git a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index 264af7bc8..8c9420911 100644
--- a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -384,8 +384,8 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
   }
 
   private int notifyCache(int rows, boolean update) {
-    if (rows > 0 && beanDescriptor.isCaching()) {
-      transaction.getEvent().add(beanDescriptor.getBaseTable(), false, update, !update);
+    if (rows > 0) {
+      beanDescriptor.cacheUpdateQuery(update, transaction);
     }
     return rows;
   }
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index 3c658f34d..4839790ec 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -450,14 +450,14 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
     if (notifyCache) {
       switch (type) {
         case INSERT:
-          beanDescriptor.cacheHandleInsert(this, changeSet);
+          beanDescriptor.cachePersistInsert(this, changeSet);
           break;
         case UPDATE:
-          beanDescriptor.cacheHandleUpdate(idValue, this, changeSet);
+          beanDescriptor.cachePersistUpdate(idValue, this, changeSet);
           break;
         case DELETE:
         case DELETE_SOFT:
-          beanDescriptor.cacheHandleDelete(idValue, this, changeSet);
+          beanDescriptor.cachePersistDelete(idValue, this, changeSet);
           break;
         default:
           throw new IllegalStateException("Invalid type " + type);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 96285d3f9..3edb14519 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -40,6 +40,7 @@ import io.ebeaninternal.api.ConcurrencyMode;
 import io.ebeaninternal.api.LoadContext;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiQuery;
+import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.api.SpiUpdatePlan;
 import io.ebeaninternal.api.TransactionEventTable.TableIUD;
 import io.ebeaninternal.api.json.SpiJsonReader;
@@ -828,8 +829,11 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    */
   @SuppressWarnings("unchecked")
   public void initialiseDocMapping() {
-    for (BeanPropertyAssocMany<?> aPropertiesMany : propertiesMany) {
-      aPropertiesMany.initialisePostTarget();
+    for (BeanPropertyAssocMany<?> many : propertiesMany) {
+      many.initialisePostTarget();
+    }
+    for (BeanPropertyAssocOne<?> one : propertiesOne) {
+      one.initialisePostTarget();
     }
     if (inheritInfo != null && !inheritInfo.isRoot()) {
       docStoreAdapter = (DocStoreBeanAdapter<T>) inheritInfo.getRoot().desc().docStoreAdapter();
@@ -1366,13 +1370,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     cacheHelp.queryCachePut(id, entry);
   }
 
-  /**
-   * Add a query cache clear into the changeSet.
-   */
-  public void queryCacheClear(CacheChangeSet changeSet) {
-    cacheHelp.queryCacheClear(changeSet);
-  }
-
   /**
    * Try to load the beanCollection from cache return true if successful.
    */
@@ -1469,13 +1466,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return cacheHelp.beanCacheGet(id, readOnly, context);
   }
 
-  /**
-   * Remove a bean from the cache given its Id.
-   */
-  public void cacheHandleDeleteByIds(Collection<Object> ids, CacheChangeSet changeSet) {
-    cacheHelp.handleDeleteIds(ids, changeSet);
-  }
-
   /**
    * Remove a collection of beans from the cache given the ids.
    */
@@ -1510,38 +1500,52 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     cacheHelp.cacheNaturalKeyPut(id, newKey);
   }
 
+  /**
+   * Check if bulk update or delete query has a cache impact.
+   */
+  public void cacheUpdateQuery(boolean update, SpiTransaction transaction) {
+    cacheHelp.cacheUpdateQuery(update, transaction);
+  }
+
   /**
    * Invalidate parts of cache due to SqlUpdate or external modification etc.
    */
-  public void cacheHandleBulkUpdate(TableIUD tableIUD) {
-    cacheHelp.handleBulkUpdate(tableIUD);
+  public void cachePersistTableIUD(TableIUD tableIUD, CacheChangeSet changeSet) {
+    cacheHelp.persistTableIUD(tableIUD, changeSet);
   }
 
   /**
    * Remove a bean from the cache given its Id.
    */
-  public void cacheHandleDelete(Object id, PersistRequestBean<T> deleteRequest, CacheChangeSet changeSet) {
-    cacheHelp.handleDelete(id, deleteRequest, changeSet);
+  public void cachePersistDeleteByIds(Collection<Object> ids, CacheChangeSet changeSet) {
+    cacheHelp.persistDeleteIds(ids, changeSet);
+  }
+
+  /**
+   * Remove a bean from the cache given its Id.
+   */
+  public void cachePersistDelete(Object id, PersistRequestBean<T> deleteRequest, CacheChangeSet changeSet) {
+    cacheHelp.persistDelete(id, deleteRequest, changeSet);
   }
 
   /**
    * Add the insert changes to the changeSet.
    */
-  public void cacheHandleInsert(PersistRequestBean<T> insertRequest, CacheChangeSet changeSet) {
-    cacheHelp.handleInsert(insertRequest, changeSet);
+  public void cachePersistInsert(PersistRequestBean<T> insertRequest, CacheChangeSet changeSet) {
+    cacheHelp.persistInsert(insertRequest, changeSet);
   }
 
   /**
    * Add the update to the changeSet.
    */
-  public void cacheHandleUpdate(Object id, PersistRequestBean<T> updateRequest, CacheChangeSet changeSet) {
-    cacheHelp.handleUpdate(id, updateRequest, changeSet);
+  public void cachePersistUpdate(Object id, PersistRequestBean<T> updateRequest, CacheChangeSet changeSet) {
+    cacheHelp.persistUpdate(id, updateRequest, changeSet);
   }
 
   /**
    * Apply the update to the cache.
    */
-  public void cacheBeanUpdate(Object id, Map<String, Object> changes, boolean updateNaturalKey, long version) {
+  public void cacheApplyBeanUpdate(Object id, Map<String, Object> changes, boolean updateNaturalKey, long version) {
     cacheHelp.cacheBeanUpdate(id, changes, updateNaturalKey, version);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index 79cdf45e7..3066e14b4 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -7,6 +7,7 @@ import io.ebean.bean.PersistenceContext;
 import io.ebean.cache.QueryCacheEntry;
 import io.ebean.cache.ServerCache;
 import io.ebeaninternal.api.BeanCacheResult;
+import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.api.TransactionEventTable.TableIUD;
 import io.ebeaninternal.server.cache.CacheChangeSet;
 import io.ebeaninternal.server.cache.CachedBeanData;
@@ -68,6 +69,8 @@ final class BeanDescriptorCacheHelp<T> {
   private final ServerCache naturalKeyCache;
   private final ServerCache queryCache;
 
+  private final boolean noCaching;
+
   /**
    * Set to true if all persist changes need to notify the cache.
    */
@@ -108,6 +111,7 @@ final class BeanDescriptorCacheHelp<T> {
       this.beanCache = null;
       this.naturalKeyCache = null;
     }
+    this.noCaching = (beanCache == null && queryCache == null);
   }
 
   /**
@@ -132,7 +136,7 @@ final class BeanDescriptorCacheHelp<T> {
    */
   private boolean isNotifyOnDeletes() {
     for (BeanPropertyAssocOne<?> imported : propertiesOneImported) {
-      if (imported.isCacheNotify()) {
+      if (imported.isCacheNotifyRelationship()) {
         return true;
       }
     }
@@ -722,10 +726,16 @@ final class BeanDescriptorCacheHelp<T> {
     return true;
   }
 
+  void cacheUpdateQuery(boolean update, SpiTransaction transaction) {
+    if (invalidateQueryCache || cacheNotifyOnAll || (!update && cacheNotifyOnDelete)) {
+      transaction.getEvent().add(desc.getBaseTable(), false, update, !update);
+    }
+  }
+
   /**
    * Add appropriate cache changes to support delete by id.
    */
-  void handleDeleteIds(Collection<Object> ids, CacheChangeSet changeSet) {
+  void persistDeleteIds(Collection<Object> ids, CacheChangeSet changeSet) {
     if (invalidateQueryCache) {
      changeSet.addInvalidate(desc);
     } else {
@@ -739,7 +749,7 @@ final class BeanDescriptorCacheHelp<T> {
   /**
    * Add appropriate cache changes to support delete bean.
    */
-  void handleDelete(Object id, PersistRequestBean<T> deleteRequest, CacheChangeSet changeSet) {
+  void persistDelete(Object id, PersistRequestBean<T> deleteRequest, CacheChangeSet changeSet) {
     if (invalidateQueryCache) {
       changeSet.addInvalidate(desc);
     } else {
@@ -754,7 +764,7 @@ final class BeanDescriptorCacheHelp<T> {
   /**
    * Add appropriate cache changes to support insert.
    */
-  void handleInsert(PersistRequestBean<T> insertRequest, CacheChangeSet changeSet) {
+  void persistInsert(PersistRequestBean<T> insertRequest, CacheChangeSet changeSet) {
     if (invalidateQueryCache) {
       changeSet.addInvalidate(desc);
     } else {
@@ -773,7 +783,7 @@ final class BeanDescriptorCacheHelp<T> {
   /**
    * Add appropriate changes to support update.
    */
-  void handleUpdate(Object id, PersistRequestBean<T> updateRequest, CacheChangeSet changeSet) {
+  void persistUpdate(Object id, PersistRequestBean<T> updateRequest, CacheChangeSet changeSet) {
     if (invalidateQueryCache) {
       changeSet.addInvalidate(desc);
 
@@ -803,16 +813,24 @@ final class BeanDescriptorCacheHelp<T> {
   /**
    * Invalidate parts of cache due to SqlUpdate or external modification etc.
    */
-  void handleBulkUpdate(TableIUD tableIUD) {
+  void persistTableIUD(TableIUD tableIUD, CacheChangeSet changeSet) {
+    if (invalidateQueryCache) {
+      changeSet.addInvalidate(desc);
+      return;
+    }
+    if (noCaching) {
+      return;
+    }
+    changeSet.addInvalidate(desc);
     // inserts don't invalidate the bean cache
     if (tableIUD.isUpdateOrDelete()) {
-      beanCacheClear();
+      changeSet.addClearBean(desc);
     }
     // any change invalidates the query cache
-    queryCacheClear();
+    changeSet.addClearQuery(desc);
     // any change invalidates the collection IDs cache
     for (BeanPropertyAssocOne<?> imported : propertiesOneImported) {
-      imported.cacheClear();
+      imported.cacheClear(changeSet);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index a517dd25c..470df5ac8 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -25,6 +25,7 @@ import io.ebean.util.AnnotationUtil;
 import io.ebeaninternal.api.ConcurrencyMode;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.TransactionEventTable;
+import io.ebeaninternal.server.cache.CacheChangeSet;
 import io.ebeaninternal.server.cache.SpiCacheManager;
 import io.ebeaninternal.server.core.InternString;
 import io.ebeaninternal.server.core.InternalConfiguration;
@@ -449,21 +450,21 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   /**
    * For SQL based modifications we need to invalidate appropriate parts of the cache.
    */
-  public void cacheNotify(TransactionEventTable.TableIUD tableIUD) {
+  public void cacheNotify(TransactionEventTable.TableIUD tableIUD, CacheChangeSet changeSet) {
 
     String tableName = tableIUD.getTableName().toLowerCase();
     List<BeanDescriptor<?>> normalBeanTypes = tableToDescMap.get(tableName);
     if (normalBeanTypes != null) {
       // 'normal' entity beans based on a "base table"
       for (BeanDescriptor<?> normalBeanType : normalBeanTypes) {
-        normalBeanType.cacheHandleBulkUpdate(tableIUD);
+        normalBeanType.cachePersistTableIUD(tableIUD, changeSet);
       }
     }
     List<BeanDescriptor<?>> viewBeans = tableToViewDescMap.get(tableName);
     if (viewBeans != null) {
       // entity beans based on a "view"
       for (BeanDescriptor<?> viewBean : viewBeans) {
-        viewBean.cacheHandleBulkUpdate(tableIUD);
+        viewBean.cachePersistTableIUD(tableIUD, changeSet);
       }
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index 502a4bab1..8f8e3b66e 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -56,6 +56,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
   private String deleteByParentIdInSql;
 
   private BeanPropertyAssocMany<?> relationshipProperty;
+  private boolean cacheNotifyRelationship;
 
   /**
    * Create based on deploy information of an EmbeddedId.
@@ -127,6 +128,13 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     }
   }
 
+  /**
+   * Derive late in lifecycle cache notification on this relationship.
+   */
+  public void initialisePostTarget() {
+    this.cacheNotifyRelationship = isCacheNotifyRelationship();
+  }
+
   /**
    * Return the property value as an entity bean.
    */
@@ -141,25 +149,31 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
   /**
    * Return true if this relationship needs to maintain/update L2 cache.
    */
-  boolean isCacheNotify() {
-    return targetDescriptor.isBeanCaching() && relationshipProperty != null;
+  boolean isCacheNotifyRelationship() {
+    return relationshipProperty != null && targetDescriptor.isBeanCaching();
   }
 
   /**
    * Clear the L2 relationship cache for this property.
    */
   void cacheClear() {
-    if (isCacheNotify()) {
+    if (cacheNotifyRelationship) {
       targetDescriptor.cacheManyPropClear(relationshipProperty.getName());
     }
   }
 
+  void cacheClear(CacheChangeSet changeSet) {
+    if (cacheNotifyRelationship) {
+      changeSet.addManyClear(targetDescriptor, relationshipProperty.getName());
+    }
+  }
+
   /**
    * Clear part of the L2 relationship cache for this property.
    */
   void cacheDelete(boolean clear, EntityBean bean, CacheChangeSet changeSet) {
 
-    if (isCacheNotify()) {
+    if (cacheNotifyRelationship) {
       if (clear) {
         changeSet.addManyClear(targetDescriptor, relationshipProperty.getName());
       } else {
diff --git a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
index a1b63873a..bb1690bfe 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
@@ -4,6 +4,7 @@ import io.ebeaninternal.api.BinaryReadContext;
 import io.ebeaninternal.api.BinaryWritable;
 import io.ebeaninternal.api.BinaryWriteContext;
 import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.server.cache.CacheChangeSet;
 import io.ebeaninternal.server.core.PersistRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.id.IdBinder;
@@ -126,11 +127,10 @@ public class BeanPersistIds implements BinaryWritable {
   /**
    * Notify the cache of this event that came from another server in the cluster.
    */
-  void notifyCacheAndListener() {
-    // any change invalidates the query cache
-    beanDescriptor.clearQueryCache();
+  public void notifyCache(CacheChangeSet changeSet) {
+    changeSet.addClearQuery(beanDescriptor);
     if (ids != null) {
-      beanDescriptor.cacheApplyInvalidate(ids);
+      changeSet.addBeanRemoveMany(beanDescriptor, ids);
     }
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java b/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java
index 5f76c4b03..ca2cc1f27 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java
@@ -29,7 +29,7 @@ public final class DeleteByIdMap {
       BeanDescriptor<?> d = deleteIds.getBeanDescriptor();
       List<Object> idValues = deleteIds.getIds();
       if (idValues != null) {
-        d.cacheHandleDeleteByIds(idValues, changeSet);
+        d.cachePersistDeleteByIds(idValues, changeSet);
       }
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index 7fe53c827..bafd7a57f 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -855,7 +855,7 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   public TransactionEvent getEvent() {
     queryOnly = false;
     if (event == null) {
-      event = new TransactionEvent(startMillis);
+      event = new TransactionEvent();
     }
     return event;
   }
@@ -1052,7 +1052,7 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
       // the event has been sent to the transaction manager
       // for postCommit processing (l2 cache updates etc)
       // start a new transaction event
-      event = new TransactionEvent(startMillis);
+      event = new TransactionEvent();
 
     } catch (Exception e) {
       doRollback(e);
diff --git a/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java b/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
index 9797693fb..550bb8be4 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
@@ -8,7 +8,6 @@ import io.ebeaninternal.api.TransactionEventTable.TableIUD;
 import io.ebeaninternal.server.cache.CacheChangeSet;
 import io.ebeaninternal.server.cluster.ClusterManager;
 import io.ebeaninternal.server.core.PersistRequestBean;
-import io.ebeaninternal.server.deploy.BeanDescriptorManager;
 import io.ebeanservice.docstore.api.DocStoreUpdates;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -46,8 +45,6 @@ final class PostCommitProcessing {
 
   private final int txnDocStoreBatchSize;
 
-  private CacheChangeSet cacheChanges;
-
   /**
    * Create for an external modification.
    */
@@ -83,31 +80,12 @@ final class PostCommitProcessing {
   }
 
   /**
-   * Notify the local part of L2 cache.
+   * Perform foreground cache notification if desired.
    */
   void notifyLocalCache() {
-    processTableEvents(event.getEventTables());
     if (manager.notifyL2CacheInForeground) {
       // process l2 cache changes in foreground
-      processCacheChanges(event.buildCacheChanges());
-    } else {
-      // collect l2 cache changes for delayed background processing
-      cacheChanges = event.buildCacheChanges();
-    }
-  }
-
-  /**
-   * Table events are where SQL or external tools are used. In this case the
-   * cache is notified based on the table name (rather than bean type).
-   */
-  private void processTableEvents(TransactionEventTable tableEvents) {
-
-    if (tableEvents != null && !tableEvents.isEmpty()) {
-      // notify cache with table based changes
-      BeanDescriptorManager dm = manager.getBeanDescriptorManager();
-      for (TableIUD tableIUD : tableEvents.values()) {
-        dm.cacheNotify(tableIUD);
-      }
+      processCacheChanges();
     }
   }
 
@@ -154,7 +132,9 @@ final class PostCommitProcessing {
    */
   Runnable backgroundNotify() {
     return () -> {
-      processCacheChanges(cacheChanges);
+      if (!manager.notifyL2CacheInForeground) {
+        processCacheChanges();
+      }
       localPersistListenersNotify();
       notifyCluster();
       processDocStoreUpdates();
@@ -164,7 +144,8 @@ final class PostCommitProcessing {
   /**
    * Apply the changes to the L2 caches.
    */
-  private void processCacheChanges(CacheChangeSet cacheChanges) {
+  private void processCacheChanges() {
+    CacheChangeSet cacheChanges = event.buildCacheChanges(manager);
     if (cacheChanges != null) {
       Set<String> touched = cacheChanges.touchedTables();
       if (touched != null && !touched.isEmpty()) {
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TableModState.java b/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
index 443d35fd1..29b116aee 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
@@ -38,7 +38,7 @@ public class TableModState implements QueryCacheEntryValidate, ServerCacheNotify
       tableModStamp.put(tableName, modTimestamp);
     }
     if (log.isDebugEnabled()) {
-      log.debug("TableModState updated - " + tableModStamp);
+      log.debug("TableModState updated - touched:{} modTimestamp:{}", touchedTables, modTimestamp);
     }
   }
 
@@ -48,7 +48,10 @@ public class TableModState implements QueryCacheEntryValidate, ServerCacheNotify
   boolean isValid(Set<String> tables, long sinceTimestamp) {
     for (String tableName : tables) {
       Long modTime = tableModStamp.get(tableName);
-      if (modTime != null && modTime > sinceTimestamp ) {
+      if (modTime != null && modTime >= sinceTimestamp ) {
+        if (log.isTraceEnabled()) {
+          log.trace("Invalidate on table:{}", tableName);
+        }
         return false;
       }
     }
@@ -75,6 +78,9 @@ public class TableModState implements QueryCacheEntryValidate, ServerCacheNotify
 
     // use local clock - for slightly more aggressive invalidation (as later)
     // that removes any concern regarding clock syncing across cluster
+    if (log.isDebugEnabled()) {
+      log.debug("ServerCacheNotification:{}", notification);
+    }
     touch(notification.getDependentTables(), clockService.nowMillis());
   }
 
@@ -88,6 +94,9 @@ public class TableModState implements QueryCacheEntryValidate, ServerCacheNotify
 
     // use local clock - for slightly more aggressive invalidation (as later)
     // that removes any concern regarding clock syncing across cluster
+    if (log.isDebugEnabled()) {
+      log.debug("RemoteTableMod:{}", tableMod);
+    }
     touch(tableMod.getTables(), clockService.nowMillis());
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index f330e8cce..147839461 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -28,6 +28,7 @@ import io.ebeaninternal.api.TransactionEventTable.TableIUD;
 import io.ebeaninternal.metric.MetricFactory;
 import io.ebeaninternal.metric.TimedMetric;
 import io.ebeaninternal.metric.TimedMetricMap;
+import io.ebeaninternal.server.cache.CacheChangeSet;
 import io.ebeaninternal.server.cluster.ClusterManager;
 import io.ebeaninternal.server.core.ClockService;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
@@ -451,7 +452,7 @@ public class TransactionManager implements SpiTransactionManager {
 
   private void externalModificationEvent(TransactionEventTable tableEvents) {
 
-    TransactionEvent event = new TransactionEvent(clockNowMillis());
+    TransactionEvent event = new TransactionEvent();
     event.add(tableEvents);
 
     PostCommitProcessing postCommit = new PostCommitProcessing(clusterManager, this, event);
@@ -468,15 +469,17 @@ public class TransactionManager implements SpiTransactionManager {
       clusterLogger.debug("processing {}", remoteEvent);
     }
 
+    CacheChangeSet changeSet = new CacheChangeSet(clockNowMillis());
+
     RemoteTableMod tableMod = remoteEvent.getRemoteTableMod();
     if (tableMod != null) {
-      tableModState.notify(tableMod);
+      changeSet.addInvalidate(tableMod.getTables());
     }
 
     List<TableIUD> tableIUDList = remoteEvent.getTableIUDList();
     if (tableIUDList != null) {
       for (TableIUD tableIUD : tableIUDList) {
-        beanDescriptorManager.cacheNotify(tableIUD);
+        beanDescriptorManager.cacheNotify(tableIUD, changeSet);
       }
     }
 
@@ -484,10 +487,12 @@ public class TransactionManager implements SpiTransactionManager {
     // processes both Bean IUD and DeleteById
     List<BeanPersistIds> beanPersistList = remoteEvent.getBeanPersistList();
     if (beanPersistList != null) {
-      for (BeanPersistIds aBeanPersistList : beanPersistList) {
-        aBeanPersistList.notifyCacheAndListener();
+      for (BeanPersistIds persistIds : beanPersistList) {
+        persistIds.notifyCache(changeSet);
       }
     }
+
+    changeSet.apply();
   }
 
   /**
diff --git a/src/test/java/org/tests/cache/TestCacheCollectionIds.java b/src/test/java/org/tests/cache/TestCacheCollectionIds.java
index 515fb901f..bb09dd70e 100644
--- a/src/test/java/org/tests/cache/TestCacheCollectionIds.java
+++ b/src/test/java/org/tests/cache/TestCacheCollectionIds.java
@@ -23,9 +23,13 @@ import org.tests.model.basic.ResetBasicData;
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 public class TestCacheCollectionIds extends BaseTestCase {
 
-  ServerCacheManager cacheManager = Ebean.getServerCacheManager();
+  private ServerCacheManager cacheManager = Ebean.getServerCacheManager();
 
   @Test
   public void test() {
@@ -45,7 +49,7 @@ public class TestCacheCollectionIds extends BaseTestCase {
     List<Customer> list = Ebean.find(Customer.class).setAutoTune(false).setBeanCacheMode(CacheMode.PUT)
       .order().asc("id").findList();
 
-    Assert.assertTrue(list.size() > 1);
+    assertTrue(list.size() > 1);
     // Assert.assertEquals(list.size(),
     // custCache.getStatistics(false).getSize());
 
@@ -53,7 +57,7 @@ public class TestCacheCollectionIds extends BaseTestCase {
     List<Contact> contacts = customer.getContacts();
     // Assert.assertEquals(0, custManyIdsCache.getStatistics(false).getSize());
     contacts.size();
-    Assert.assertTrue(contacts.size() > 1);
+    assertTrue(contacts.size() > 1);
     // Assert.assertEquals(1, custManyIdsCache.getStatistics(false).getSize());
     // Assert.assertEquals(0,
     // custManyIdsCache.getStatistics(false).getHitCount());
@@ -77,7 +81,7 @@ public class TestCacheCollectionIds extends BaseTestCase {
     awaitL2Cache();
 
     int currentNumContacts2 = fetchCustomer(customer.getId());
-    Assert.assertEquals(currentNumContacts + 1, currentNumContacts2);
+    assertEquals(currentNumContacts + 1, currentNumContacts2);
 
     // cleanup
     Ebean.delete(newContact);
@@ -119,8 +123,8 @@ public class TestCacheCollectionIds extends BaseTestCase {
     CachedManyIds cachedManyIds = (CachedManyIds) cachedBeanCountriesCache.get(cachedBean.getId());
 
     // confirm the starting data and cache entry
-    Assert.assertEquals(2, dummyToLoad.getCountries().size());
-    Assert.assertEquals(2, cachedManyIds.getIdList().size());
+    assertEquals(2, dummyToLoad.getCountries().size());
+    assertEquals(2, cachedManyIds.getIdList().size());
 
 
     // act
@@ -136,10 +140,10 @@ public class TestCacheCollectionIds extends BaseTestCase {
     cachedManyIds = (CachedManyIds) cachedBeanCountriesCache.get(result.getId());
 
     // assert that data and cache both show correct data
-    Assert.assertEquals(1, result.getCountries().size());
-    Assert.assertEquals(1, cachedManyIds.getIdList().size());
-    Assert.assertFalse(cachedManyIds.getIdList().contains("NZ"));
-    Assert.assertTrue(cachedManyIds.getIdList().contains("AU"));
+    assertEquals(1, result.getCountries().size());
+    assertEquals(1, cachedManyIds.getIdList().size());
+    assertFalse(cachedManyIds.getIdList().contains("NZ"));
+    assertTrue(cachedManyIds.getIdList().contains("AU"));
   }
 
 
@@ -167,8 +171,8 @@ public class TestCacheCollectionIds extends BaseTestCase {
     CachedManyIds cachedManyIds = (CachedManyIds) cachedBeanCountriesCache.get(cachedBean.getId());
 
     // confirm the starting data and cache entry
-    Assert.assertEquals(2, dummyToLoad.getCountries().size());
-    Assert.assertEquals(2, cachedManyIds.getIdList().size());
+    assertEquals(2, dummyToLoad.getCountries().size());
+    assertEquals(2, cachedManyIds.getIdList().size());
 
 
     // act - this time update the name property so the bean is dirty
@@ -185,10 +189,10 @@ public class TestCacheCollectionIds extends BaseTestCase {
     cachedManyIds = (CachedManyIds) cachedBeanCountriesCache.get(result.getId());
 
     // assert that data and cache both show correct data
-    Assert.assertEquals(1, result.getCountries().size());
-    Assert.assertEquals(1, cachedManyIds.getIdList().size());
-    Assert.assertFalse(cachedManyIds.getIdList().contains("NZ"));
-    Assert.assertTrue(cachedManyIds.getIdList().contains("AU"));
+    assertEquals(1, result.getCountries().size());
+    assertEquals(1, cachedManyIds.getIdList().size());
+    assertFalse(cachedManyIds.getIdList().contains("NZ"));
+    assertTrue(cachedManyIds.getIdList().contains("AU"));
   }
 
   /**
@@ -209,20 +213,20 @@ public class TestCacheCollectionIds extends BaseTestCase {
     // clear the cache
     ServerCache cachedBeanCountriesCache = cacheManager.getCollectionIdsCache(OCachedBean.class, "countries");
     cachedBeanCountriesCache.clear();
-    Assert.assertEquals(0, cachedBeanCountriesCache.size());
+    assertEquals(0, cachedBeanCountriesCache.size());
 
     // load the cache
     OCachedBean dummyLoad = Ebean.find(OCachedBean.class, cachedBean.getId());
     List<Country> dummyCountries = dummyLoad.getCountries();
-    Assert.assertEquals(2, dummyCountries.size());
+    assertEquals(2, dummyCountries.size());
 
     // assert that the cache contains the expected entry
-    Assert.assertEquals("countries cache now loaded with 1 entry", 1, cachedBeanCountriesCache.size());
+    assertEquals("countries cache now loaded with 1 entry", 1, cachedBeanCountriesCache.size());
     CachedManyIds dummyEntry = (CachedManyIds) cachedBeanCountriesCache.get(dummyLoad.getId());
     Assert.assertNotNull(dummyEntry);
-    Assert.assertEquals("2 ids in the entry", 2, dummyEntry.getIdList().size());
-    Assert.assertTrue(dummyEntry.getIdList().contains("NZ"));
-    Assert.assertTrue(dummyEntry.getIdList().contains("AU"));
+    assertEquals("2 ids in the entry", 2, dummyEntry.getIdList().size());
+    assertTrue(dummyEntry.getIdList().contains("NZ"));
+    assertTrue(dummyEntry.getIdList().contains("AU"));
 
 
     // act - this should invalidate our cache entry
@@ -234,18 +238,18 @@ public class TestCacheCollectionIds extends BaseTestCase {
     Ebean.update(update);
     awaitL2Cache();
 
-    Assert.assertEquals("countries entry still there (but updated)", 1, cachedBeanCountriesCache.size());
+    assertEquals("countries entry still there (but updated)", 1, cachedBeanCountriesCache.size());
 
     CachedManyIds cachedManyIds = (CachedManyIds) cachedBeanCountriesCache.get(update.getId());
 
     // assert cache updated
-    Assert.assertEquals(1, cachedManyIds.getIdList().size());
-    Assert.assertFalse(cachedManyIds.getIdList().contains("NZ"));
-    Assert.assertTrue(cachedManyIds.getIdList().contains("AU"));
+    assertEquals(1, cachedManyIds.getIdList().size());
+    assertFalse(cachedManyIds.getIdList().contains("NZ"));
+    assertTrue(cachedManyIds.getIdList().contains("AU"));
 
     // assert countries good
     OCachedBean result = Ebean.find(OCachedBean.class, cachedBean.getId());
-    Assert.assertEquals(1, result.getCountries().size());
+    assertEquals(1, result.getCountries().size());
 
   }
 
@@ -300,7 +304,7 @@ public class TestCacheCollectionIds extends BaseTestCase {
     Update<OrderDetail> update = Ebean.createUpdate(OrderDetail.class, updStatement);
     update.set("id", orderDetail1.getId());
     int rows = update.execute();
-    Assert.assertEquals(1, rows);
+    assertEquals(1, rows);
 
     // read the order from cache
     Order orderFromCache = Ebean.find(Order.class, 1L);
@@ -335,7 +339,7 @@ public class TestCacheCollectionIds extends BaseTestCase {
     SqlUpdate update = Ebean.createSqlUpdate(updStatement);
     update.setParameter("id", orderDetail1.getId());
     int rows = update.execute();
-    Assert.assertEquals(1, rows);
+    assertEquals(1, rows);
 
     // We need to notify the cache manually
     Ebean.externalModification("o_order_detail", false, false, true);
diff --git a/src/test/java/org/tests/cache/TestCacheDelete.java b/src/test/java/org/tests/cache/TestCacheDelete.java
index 9af7aeae4..a5f5e111e 100644
--- a/src/test/java/org/tests/cache/TestCacheDelete.java
+++ b/src/test/java/org/tests/cache/TestCacheDelete.java
@@ -2,10 +2,11 @@ package org.tests.cache;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import org.junit.Test;
 import org.tests.model.basic.OCachedBean;
 import org.tests.model.basic.OCachedBeanChild;
-import org.junit.Assert;
-import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
 
 /**
  * Test class testing deleting/invalidating of cached beans
@@ -27,7 +28,7 @@ public class TestCacheDelete extends BaseTestCase {
     Ebean.save(parentBean);
 
     // confirm there are 2 children loaded from the parent
-    Assert.assertEquals(2, Ebean.find(OCachedBean.class, parentBean.getId()).getChildren().size());
+    assertEquals(2, Ebean.find(OCachedBean.class, parentBean.getId()).getChildren().size());
 
     // ensure cache has been populated
     Ebean.find(OCachedBeanChild.class, child.getId());
@@ -39,6 +40,6 @@ public class TestCacheDelete extends BaseTestCase {
     awaitL2Cache();
 
     OCachedBean beanFromCache = Ebean.find(OCachedBean.class, parentBean.getId());
-    Assert.assertEquals(1, beanFromCache.getChildren().size());
+    assertEquals(1, beanFromCache.getChildren().size());
   }
 }
diff --git a/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java b/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java
index f578fdfdf..494d5c377 100644
--- a/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java
+++ b/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java
@@ -5,6 +5,7 @@ import io.ebean.Ebean;
 import io.ebean.cache.ServerCache;
 import org.junit.Test;
 import org.tests.model.basic.Address;
+import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
 
@@ -46,7 +47,7 @@ public class TestQueryCacheTableDependency extends BaseTestCase {
       .where().eq("billingAddress.line2", "St Lukes")
       .findCount();
 
-    assertThat(custs).isEqualTo(2); // cache says 3
+    assertThat(custs).isEqualTo(2);
 
 
     custs = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true)
@@ -55,5 +56,70 @@ public class TestQueryCacheTableDependency extends BaseTestCase {
 
     assertThat(custs).isEqualTo(1);
 
+    Ebean.update(Address.class)
+      .set("line2", "St Lucky2")
+      .where().eq("line2", "St Lucky")
+      .update();
+
+    custs = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true)
+      .where().eq("billingAddress.line2", "St Lucky")
+      .findCount();
+
+    assertThat(custs).isEqualTo(0);
+
+    custs = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true)
+      .where().eq("billingAddress.line2", "St Lucky2")
+      .findCount();
+    assertThat(custs).isEqualTo(1);
+
+    Ebean.createSqlUpdate("update O_ADDRESS set line_2=? where line_2=?")
+      .setNextParameter("St Lucky3")
+      .setNextParameter("St Lucky2")
+      .execute();
+
+    custs = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true)
+      .where().eq("billingAddress.line2", "St Lucky2")
+      .findCount();
+    assertThat(custs).isEqualTo(0);
+
+    custs = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true)
+      .where().eq("billingAddress.line2", "St Lucky3")
+      .findCount();
+
+    assertThat(custs).isEqualTo(1);
+
+  }
+
+  @Test
+  public void testFindCountOnOtherL2Cached() {
+
+    ResetBasicData.reset();
+
+    Customer fi = Ebean.find(Customer.class).where().eq("name", "Fiona").findOne();
+
+    int custCount0 = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true)
+      .where()
+      .eq("name", "Fiona")
+      .isNull("contacts.phone")
+      .findCount();
+
+    assertThat(custCount0).isEqualTo(1);
+
+    int updateRows = Ebean.update(Contact.class)
+      .set("phone", "1234")
+      .where()
+      .eq("customer.id", fi.getId())
+      .update();
+
+    assertThat(updateRows).isGreaterThan(0);
+
+    int custCount1 = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true)
+      .where()
+      .eq("name", "Fiona")
+      .isNull("contacts.phone")
+      .findCount();
+
+    assertThat(custCount1).isEqualTo(0);
+
   }
 }
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
index 7ab47450e..214c25900 100644
--- a/src/test/resources/logback-test.xml
+++ b/src/test/resources/logback-test.xml
@@ -86,6 +86,8 @@
   <logger name="io.ebean.TXN" level="TRACE"/>
   <logger name="io.ebean.SUM" level="TRACE"/>
 
+  <logger name="io.ebean.cache.TABLEMOD" level="TRACE"/>
+
   <logger name="io.ebean.cache.QUERY" level="TRACE"/>
   <logger name="io.ebean.cache.BEAN" level="TRACE"/>
   <logger name="io.ebean.cache.NATKEY" level="TRACE"/>

From 9cd189034caab5bb6292442bd06774e3d753b3b5 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 26 Jun 2018 21:33:44 +1200
Subject: [PATCH 0351/1036] #1437 - or(expr, expr) ... where expr has a ToMany
 should produce a LEFT JOIN (and instead we only get JOIN)

---
 .../server/expression/LogicExpression.java    | 30 ++++++----
 .../joins/TestDisjunctWhereOuterJoin.java     | 55 ++++++++++++++++---
 2 files changed, 67 insertions(+), 18 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java b/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java
index 363b40aab..2dd7a4882 100644
--- a/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java
@@ -23,7 +23,7 @@ abstract class LogicExpression implements SpiExpression {
   static class And extends LogicExpression {
 
     And(Expression expOne, Expression expTwo) {
-      super(AND, expOne, expTwo);
+      super(true, expOne, expTwo);
     }
 
     @Override
@@ -36,7 +36,7 @@ abstract class LogicExpression implements SpiExpression {
   static class Or extends LogicExpression {
 
     Or(Expression expOne, Expression expTwo) {
-      super(OR, expOne, expTwo);
+      super(false, expOne, expTwo);
     }
 
     @Override
@@ -45,14 +45,14 @@ abstract class LogicExpression implements SpiExpression {
     }
   }
 
-  protected SpiExpression expOne;
+  SpiExpression expOne;
 
-  protected SpiExpression expTwo;
+  SpiExpression expTwo;
 
-  private final String joinType;
+  private final boolean conjunction;
 
-  LogicExpression(String joinType, Expression expOne, Expression expTwo) {
-    this.joinType = joinType;
+  LogicExpression(boolean conjunction, Expression expOne, Expression expTwo) {
+    this.conjunction = conjunction;
     this.expOne = (SpiExpression) expOne;
     this.expTwo = (SpiExpression) expTwo;
   }
@@ -71,7 +71,6 @@ abstract class LogicExpression implements SpiExpression {
   @Override
   public void writeDocQuery(DocQueryContext context) throws IOException {
 
-    boolean conjunction = joinType.equals(AND);
     context.startBool(conjunction ? Junction.Type.AND : Junction.Type.OR);
     expOne.writeDocQuery(context);
     expTwo.writeDocQuery(context);
@@ -107,8 +106,19 @@ abstract class LogicExpression implements SpiExpression {
 
   @Override
   public void containsMany(BeanDescriptor<?> desc, ManyWhereJoins manyWhereJoin) {
+
+    // get the current state for 'require outer joins'
+    boolean parentOuterJoins = manyWhereJoin.isRequireOuterJoins();
+    if (!conjunction) {
+      // turn on outer joins required for disjunction expressions
+      manyWhereJoin.setRequireOuterJoins(true);
+    }
     expOne.containsMany(desc, manyWhereJoin);
     expTwo.containsMany(desc, manyWhereJoin);
+    if (!conjunction && !parentOuterJoins) {
+      // restore state to not forcing outer joins
+      manyWhereJoin.setRequireOuterJoins(false);
+    }
   }
 
   @Override
@@ -128,7 +138,7 @@ abstract class LogicExpression implements SpiExpression {
 
     request.append("(");
     expOne.addSql(request);
-    request.append(joinType);
+    request.append(conjunction ? AND : OR);
     expTwo.addSql(request);
     request.append(") ");
   }
@@ -144,7 +154,7 @@ abstract class LogicExpression implements SpiExpression {
    */
   @Override
   public void queryPlanHash(StringBuilder builder) {
-    builder.append("Logic").append(joinType).append("[");
+    builder.append("Logic").append(conjunction ? AND : OR).append("[");
     expOne.queryPlanHash(builder);
     builder.append(",");
     expTwo.queryPlanHash(builder);
diff --git a/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java b/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java
index 1c6fdc9a5..0610c7fa6 100644
--- a/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java
+++ b/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java
@@ -2,14 +2,16 @@ package org.tests.query.joins;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.Expr;
 import io.ebean.Query;
+import org.junit.Test;
 import org.tests.model.basic.MRole;
 import org.tests.model.basic.MUser;
-import org.junit.Assert;
-import org.junit.Test;
 
 import java.util.List;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class TestDisjunctWhereOuterJoin extends BaseTestCase {
 
   @Test
@@ -43,6 +45,9 @@ public class TestDisjunctWhereOuterJoin extends BaseTestCase {
 
       Ebean.save(u1);
 
+      queryOrExpression(r2.getRoleid());
+
+      queryDisjunction(r2.getRoleid());
 
       Query<MUser> query = Ebean.find(MUser.class)
         .where().disjunction()
@@ -51,17 +56,51 @@ public class TestDisjunctWhereOuterJoin extends BaseTestCase {
         .endJunction().query();
 
       List<MUser> list = query.findList();
-      Assert.assertSame(1, list.size()); // list should contain user0
-      System.out.println(list);
+      assertThat(list).hasSize(1); // list should contain user0
 
-      String sql = query.getGeneratedSql();
-      Assert.assertTrue(sql.contains("select distinct"));
-      Assert.assertTrue(sql.contains("left join mrole "));
-      Assert.assertTrue(sql.contains(".role_name = ?"));
+      String sql = sqlOf(query);
+      assertSqlOuterJoins(sql);
+      assertThat(sql).contains(".role_name = ?");
 
     } finally {
       Ebean.rollbackTransaction();
     }
+  }
 
+  private void queryDisjunction(Integer roleid) {
+
+    Query<MUser> query = Ebean.find(MUser.class)
+      .where().or()
+      .eq("userName", "user0B")
+      .eq("roles.roleid", roleid)
+      .endOr().query();
+
+      query.findList();
+
+    String sql = sqlOf(query);
+    assertSqlOuterJoins(sql);
+    assertThat(sql).contains("where (t0.user_name = ?  or u1.roleid = ? )");
+  }
+
+  private void queryOrExpression(Integer roleid) {
+
+    Query<MUser> query = Ebean.find(MUser.class)
+      .where().or(
+        Expr.eq("userName", "user0B"),
+        Expr.eq("roles.roleid", roleid)
+      )
+      .query();
+
+    query.findList();
+
+    String sql = sqlOf(query);
+    assertSqlOuterJoins(sql);
+    assertThat(sql).contains("where (t0.user_name = ?  or u1.roleid = ? )");
+  }
+
+  private void assertSqlOuterJoins(String sql) {
+    assertThat(sql).contains("select distinct");
+    assertThat(sql).contains("left join mrole_muser u1z_ on u1z_.muser_userid = t0.userid");
+    assertThat(sql).contains("left join mrole u1 on u1.roleid = u1z_.mrole_roleid");
   }
 }

From 49ab17cd345416abc54c3005104c2867cc700ef7 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 26 Jun 2018 22:11:40 +1200
Subject: [PATCH 0352/1036] #1438 - Mapping of @ElementCollection with an Enum
 that is otherwise not used produces error

---
 .../deploy/parse/AnnotationAssocManys.java    |  9 +++
 .../model/elementcollection/EcEnumPerson.java | 70 +++++++++++++++++++
 .../TestElementCollectionEnumSet.java         | 33 +++++++++
 3 files changed, 112 insertions(+)
 create mode 100644 src/test/java/org/tests/model/elementcollection/EcEnumPerson.java
 create mode 100644 src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index b628c290b..a5e317ea3 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -28,6 +28,7 @@ import javax.persistence.CascadeType;
 import javax.persistence.CollectionTable;
 import javax.persistence.Column;
 import javax.persistence.ElementCollection;
+import javax.persistence.EnumType;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
@@ -245,6 +246,10 @@ class AnnotationAssocManys extends AnnotationParser {
     }
 
     ScalarType<?> valueScalarType = util.getTypeManager().getScalarType(elementType);
+    if (valueScalarType == null && elementType.isEnum()) {
+      Class<? extends Enum<?>> enumClass = (Class<? extends Enum<?>>)elementType;
+      valueScalarType = util.getTypeManager().createEnumScalarType(enumClass, EnumType.STRING);
+    }
 
     boolean scalar = true;
     if (valueScalarType == null) {
@@ -275,6 +280,10 @@ class AnnotationAssocManys extends AnnotationParser {
   }
 
   private void setElementProperty(DeployBeanProperty elementProp, String name, String dbColumn, int sortOrder) {
+
+    if (dbColumn == null) {
+      dbColumn = "value";
+    }
     elementProp.setName(name);
     elementProp.setDbColumn(dbColumn);
     elementProp.setNullable(false);
diff --git a/src/test/java/org/tests/model/elementcollection/EcEnumPerson.java b/src/test/java/org/tests/model/elementcollection/EcEnumPerson.java
new file mode 100644
index 000000000..96805eef7
--- /dev/null
+++ b/src/test/java/org/tests/model/elementcollection/EcEnumPerson.java
@@ -0,0 +1,70 @@
+package org.tests.model.elementcollection;
+
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Version;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+@Entity
+public class EcEnumPerson {
+
+  enum Tags {
+    RED,
+    BLUE,
+    GREEN
+  }
+
+  @Id
+  long id;
+
+  String name;
+
+  @ElementCollection
+  Set<Tags> tags = new LinkedHashSet<>();
+
+  @Version
+  long version;
+
+  public EcEnumPerson(String name) {
+    this.name = name;
+  }
+
+  @Override
+  public String toString() {
+    return "person id:" + id + " name:" + name + " tags:" + tags;
+  }
+
+  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 Set<Tags> getTags() {
+    return tags;
+  }
+
+  public void setTags(Set<Tags> tags) {
+    this.tags = tags;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java
new file mode 100644
index 000000000..988097da5
--- /dev/null
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java
@@ -0,0 +1,33 @@
+package org.tests.model.elementcollection;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestElementCollectionEnumSet extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    EcEnumPerson person = new EcEnumPerson("Enum Person");
+    person.getTags().add(EcEnumPerson.Tags.BLUE);
+    person.getTags().add(EcEnumPerson.Tags.RED);
+
+    Ebean.save(person);
+
+
+    EcEnumPerson one = Ebean.find(EcEnumPerson.class)
+      .setId(person.getId())
+      .fetch("tags")
+      .findOne();
+
+    assertThat(one.getTags()).hasSize(2);
+
+    one.getTags().add(EcEnumPerson.Tags.GREEN);
+    one.getTags().remove(EcEnumPerson.Tags.BLUE);
+
+    Ebean.save(one);
+  }
+}

From 1a03e84f0ea6779cee1919312b48dd752432b9a8 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 26 Jun 2018 22:40:08 +1200
Subject: [PATCH 0353/1036] #1439 - IllegalArgumentException: No rule for
 io.ebeaninternal.dbmigration.migration.Sql@315df4bb

---
 .../dbmigration/model/ModelContainer.java        |  3 +++
 .../model/ModelContainerApplyTest.java           |  2 +-
 .../dbmigration/model/ModelContainerTest.java    | 16 +++++++++++-----
 .../dbmigration/model/3.0__rawSql.model.xml      |  9 +++++++++
 4 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 src/test/resources/io/ebeaninternal/dbmigration/model/3.0__rawSql.model.xml

diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java b/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
index 6f4abfe51..15009f5b1 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
@@ -17,6 +17,7 @@ import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
 import io.ebeaninternal.dbmigration.migration.DropIndex;
 import io.ebeaninternal.dbmigration.migration.DropTable;
 import io.ebeaninternal.dbmigration.migration.Migration;
+import io.ebeaninternal.dbmigration.migration.Sql;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -143,6 +144,8 @@ public class ModelContainer {
         applyChange((AlterForeignKey) change);
       } else if (change instanceof AddTableComment) {
         applyChange((AddTableComment) change);
+      } else if (change instanceof Sql) {
+        // do nothing
       } else {
         throw new IllegalArgumentException("No rule for " + change);
       }
diff --git a/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java
index bbaedc147..7f797c376 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java
@@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class ModelContainerApplyTest {
 
   @Test
-  public void testApply() throws Exception {
+  public void testApply() {
 
     Migration migration = MigrationXmlReader.read("/container/test-create-table.xml");
 
diff --git a/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java
index aa988b187..fc37f02da 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java
@@ -12,17 +12,16 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class ModelContainerTest {
 
   @Test
-  public void apply_when_noPendingDrops_then_emptyPending() throws Exception {
+  public void apply_when_noPendingDrops_then_emptyPending() {
 
     ModelContainer container = new ModelContainer();
     container.apply(mig("1.0.model.xml"), ver("1.1"));
-
     assertThat(container.getPendingDrops()).isEmpty();
   }
 
 
   @Test
-  public void apply_when_pendingDrops_then_registeredHistoryTable() throws Exception {
+  public void apply_when_pendingDrops_then_registeredHistoryTable() {
 
     ModelContainer base = container_1_1();
 
@@ -36,7 +35,7 @@ public class ModelContainerTest {
 
 
   @Test
-  public void apply_when_pendingDropsApplied_then_droppedTableNotInHistory() throws Exception {
+  public void apply_when_pendingDropsApplied_then_droppedTableNotInHistory() {
 
     ModelContainer container = container_1_1();
     container.apply(mig("1.1_2__drops.model.xml"), ver("1.1_2"));
@@ -50,7 +49,7 @@ public class ModelContainerTest {
   }
 
   @Test
-  public void apply_when_apply_partial_pendingDrops_then_some_remainder() throws Exception {
+  public void apply_when_apply_partial_pendingDrops_then_some_remainder() {
 
     ModelContainer container = container_2_1();
     container.apply(mig("2.2__drops.model.xml"), ver("2.2"));
@@ -66,6 +65,13 @@ public class ModelContainerTest {
     assertThat(normalColumns).doesNotContain("zing", "zong", "boom", "baz", "bar");
   }
 
+  @Test
+  public void apply_sql() {
+    ModelContainer container = new ModelContainer();
+    container.apply(mig("3.0__rawSql.model.xml"), ver("3.0"));
+    assertThat(container.getPendingDrops()).isEmpty();
+  }
+
   private ModelContainer container_2_1() {
     ModelContainer container = new ModelContainer();
     container.apply(mig("2.0.model.xml"), ver("2.0"));
diff --git a/src/test/resources/io/ebeaninternal/dbmigration/model/3.0__rawSql.model.xml b/src/test/resources/io/ebeaninternal/dbmigration/model/3.0__rawSql.model.xml
new file mode 100644
index 000000000..c9472f9b0
--- /dev/null
+++ b/src/test/resources/io/ebeaninternal/dbmigration/model/3.0__rawSql.model.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
+  <changeSet type="apply">
+    <sql>
+      <apply>something</apply>
+      <rollback>other thing</rollback>
+    </sql>
+  </changeSet>
+</migration>

From ff3c5b3d8282436195b02d66ffdb89a2f0050116 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 27 Jun 2018 00:23:36 +1200
Subject: [PATCH 0354/1036] #1441 - Update ebean-dbmigration.xsd adding missing
 alterForeignKey element

---
 .../dbmigration/migration/AlterForeignKey.java   |  4 ++--
 src/main/resources/ebean-dbmigration-1.0.xsd     | 14 ++++++++++++++
 .../dbmigration/model/ModelContainerTest.java    |  7 +++++++
 .../model/4.0__alterForeignKey.model.xml         | 16 ++++++++++++++++
 4 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 src/test/resources/io/ebeaninternal/dbmigration/model/4.0__alterForeignKey.model.xml

diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java b/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java
index 4286b3132..ed0ccf000 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java
@@ -25,9 +25,9 @@ public class AlterForeignKey {
   protected String name;
   @XmlAttribute(name = "columnNames", required = true)
   protected String columnNames;
-  @XmlAttribute(name = "refColumnNames", required = true)
+  @XmlAttribute(name = "refColumnNames")
   protected String refColumnNames;
-  @XmlAttribute(name = "refTableName", required = true)
+  @XmlAttribute(name = "refTableName")
   protected String refTableName;
   @XmlAttribute(name = "indexName")
   protected String indexName;
diff --git a/src/main/resources/ebean-dbmigration-1.0.xsd b/src/main/resources/ebean-dbmigration-1.0.xsd
index ade3fc9a7..58959aa46 100644
--- a/src/main/resources/ebean-dbmigration-1.0.xsd
+++ b/src/main/resources/ebean-dbmigration-1.0.xsd
@@ -141,6 +141,19 @@
     </xsd:complexType>
   </xsd:element>
 
+  <xsd:element name="alterForeignKey">
+    <xsd:complexType>
+      <xsd:attribute name="name" type="xsd:string" use="required"/>
+      <xsd:attribute name="columnNames" type="xsd:string"/>
+      <xsd:attribute name="refColumnNames" type="xsd:string"/>
+      <xsd:attribute name="refTableName" type="xsd:string"/>
+      <xsd:attribute name="indexName" type="xsd:string"/>
+      <xsd:attribute name="tableName" type="xsd:string" use="required"/>
+      <xsd:attribute name="onDelete" type="xsd:string"/>
+      <xsd:attribute name="onUpdate" type="xsd:string"/>
+    </xsd:complexType>
+  </xsd:element>
+
   <xsd:element name="dropTable">
     <xsd:complexType>
       <xsd:attribute name="name" type="xsd:string" use="required"/>
@@ -300,6 +313,7 @@
 
       <xsd:element ref="addHistoryTable" maxOccurs="unbounded"/>
       <xsd:element ref="dropHistoryTable" maxOccurs="unbounded"/>
+      <xsd:element ref="alterForeignKey" maxOccurs="unbounded"/>
 
       <xsd:element ref="addColumn" maxOccurs="unbounded"/>
       <xsd:element ref="dropColumn" maxOccurs="unbounded"/>
diff --git a/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java
index fc37f02da..ae05f368b 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java
@@ -72,6 +72,13 @@ public class ModelContainerTest {
     assertThat(container.getPendingDrops()).isEmpty();
   }
 
+  @Test
+  public void apply_alterForeignKey() {
+    ModelContainer container = new ModelContainer();
+    container.apply(mig("4.0__alterForeignKey.model.xml"), ver("4.0"));
+    assertThat(container.getPendingDrops()).isEmpty();
+  }
+
   private ModelContainer container_2_1() {
     ModelContainer container = new ModelContainer();
     container.apply(mig("2.0.model.xml"), ver("2.0"));
diff --git a/src/test/resources/io/ebeaninternal/dbmigration/model/4.0__alterForeignKey.model.xml b/src/test/resources/io/ebeaninternal/dbmigration/model/4.0__alterForeignKey.model.xml
new file mode 100644
index 000000000..2581ec698
--- /dev/null
+++ b/src/test/resources/io/ebeaninternal/dbmigration/model/4.0__alterForeignKey.model.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
+  <changeSet type="apply">
+    <createTable name="document" withHistory="true" pkName="pk_document">
+      <column name="id" type="bigint" primaryKey="true" references="document_draft.id" foreignKeyName="fk_document_id"/>
+      <column name="title" type="varchar(255)" unique="uq_document_title"/>
+      <column name="body" type="varchar(255)"/>
+      <column name="zing" type="varchar(255)"/>
+      <column name="zong" type="varchar(255)"/>
+      <column name="version" type="bigint" notnull="true"/>
+      <column name="when_created" type="timestamp" notnull="true"/>
+      <column name="when_modified" type="timestamp" notnull="true"/>
+    </createTable>
+    <alterForeignKey name="fk_document_id" columnNames="DROP FOREIGN KEY" tableName="document"/>
+  </changeSet>
+</migration>

From df585644e9e886b8455232a3825b35c69d9c4e12 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 27 Jun 2018 00:30:23 +1200
Subject: [PATCH 0355/1036] [maven-release-plugin] prepare release
 ebean-11.18.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ff6b3b7a4..7fe4bdfd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.18.1-SNAPSHOT</version>
+  <version>11.18.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.18.1</tag>
   </scm>
 
   <profiles>

From 0796fc0d887ae2433fe26d085446a98f5d72ae52 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 27 Jun 2018 00:30:37 +1200
Subject: [PATCH 0356/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7fe4bdfd1..a82aec239 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.18.1</version>
+  <version>11.18.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.18.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 48b05eb35843b84f8bce63e95b53a91648f62f8e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 27 Jun 2018 10:37:00 +1200
Subject: [PATCH 0357/1036] No effective change - modify logback-test.xml to
 put the test example logging files into target directory

---
 src/test/resources/logback-test.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
index 214c25900..ce6598fd2 100644
--- a/src/test/resources/logback-test.xml
+++ b/src/test/resources/logback-test.xml
@@ -9,7 +9,7 @@
   </appender>
 
   <appender name="APPLICATION" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <File>log/application.log</File>
+    <File>target/log/application.log</File>
     <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
       <level>TRACE</level>
     </filter>
@@ -23,7 +23,7 @@
   </appender>
 
   <appender name="READAUDIT_QUERY_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <File>log/readAuditQuery.log</File>
+    <File>target/log/readAuditQuery.log</File>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
       <FileNamePattern>log/readAuditQuery.log.%d{yyyy-MM-dd}</FileNamePattern>
       <MaxHistory>90</MaxHistory>
@@ -34,7 +34,7 @@
   </appender>
 
   <appender name="READAUDIT_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <File>log/readAudit.log</File>
+    <File>target/log/readAudit.log</File>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
       <FileNamePattern>log/readAudit.log.%d{yyyy-MM-dd}</FileNamePattern>
       <MaxHistory>90</MaxHistory>
@@ -45,7 +45,7 @@
   </appender>
 
   <appender name="CHANGE_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <File>log/change-log.log</File>
+    <File>target/log/change-log.log</File>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
       <FileNamePattern>log/changeLog.log.%d{yyyy-MM-dd}</FileNamePattern>
       <MaxHistory>90</MaxHistory>

From cf2d9df25668fe2a981b1781f2f31d9135df831c Mon Sep 17 00:00:00 2001
From: Michael Benz <michael.benz@foconis.de>
Date: Wed, 27 Jun 2018 00:38:56 +0200
Subject: [PATCH 0358/1036] Migration enum drop check constraints (#1435)

* Fix: apply drop checkConstraints properly which were not applied for Enum to String

* Use IF EXISTS to drop constraints

* added TODO and comment about MariaDB supporting CHECK constraints from version 10.2.1 forward compared to MySQL 5.7/8.0 parsing but ignoring CHECK constraints

* updated reference scripts for dropping constraints on enums
---
 .../ddlgeneration/platform/BaseTableDdl.java  |  9 ++++--
 .../ddlgeneration/platform/MySqlDdl.java      |  3 +-
 .../ddlgeneration/platform/PlatformDdl.java   |  4 +--
 .../dbmigration/DbMigrationTest.java          |  1 +
 .../platform/BaseTableDdlTest.java            |  2 +-
 src/test/java/misc/migration/v1_0/EEnum.java  | 29 +++++++++++++++++++
 src/test/java/misc/migration/v1_1/EEnum.java  | 18 ++++++++++++
 src/test/java/misc/migration/v1_2/EEnum.java  | 29 +++++++++++++++++++
 .../migrationtest/db2/1.0__initial.sql        |  7 +++++
 .../dbmigration/migrationtest/db2/1.1.sql     |  1 +
 .../dbmigration/migrationtest/db2/1.3.sql     |  2 ++
 .../migrationtest/h2/1.0__initial.sql         |  7 +++++
 .../dbmigration/migrationtest/h2/1.1.sql      |  3 +-
 .../dbmigration/migrationtest/h2/1.3.sql      |  4 ++-
 .../migrationtest/hsqldb/1.0__initial.sql     |  7 +++++
 .../dbmigration/migrationtest/hsqldb/1.1.sql  |  3 +-
 .../dbmigration/migrationtest/hsqldb/1.3.sql  |  4 ++-
 .../model/1.0__initial.model.xml              |  4 +++
 .../migrationtest/model/1.1.model.xml         |  1 +
 .../migrationtest/model/1.3.model.xml         |  1 +
 .../migrationtest/mysql/1.0__initial.sql      |  7 +++++
 .../dbmigration/migrationtest/mysql/1.3.sql   |  1 +
 .../migrationtest/oracle/1.0__initial.sql     |  8 +++++
 .../dbmigration/migrationtest/oracle/1.1.sql  |  1 +
 .../dbmigration/migrationtest/oracle/1.3.sql  |  2 ++
 .../migrationtest/postgres/1.0__initial.sql   |  7 +++++
 .../migrationtest/postgres/1.1.sql            |  3 +-
 .../migrationtest/postgres/1.3.sql            |  4 ++-
 .../migrationtest/sqlite/1.0__initial.sql     |  7 +++++
 .../dbmigration/migrationtest/sqlite/1.1.sql  |  3 +-
 .../dbmigration/migrationtest/sqlite/1.3.sql  |  4 ++-
 .../sqlserver17/1.0__initial.sql              |  8 +++++
 .../migrationtest/sqlserver17/1.1.sql         |  1 +
 .../migrationtest/sqlserver17/1.3.sql         |  2 ++
 34 files changed, 181 insertions(+), 16 deletions(-)
 create mode 100644 src/test/java/misc/migration/v1_0/EEnum.java
 create mode 100644 src/test/java/misc/migration/v1_1/EEnum.java
 create mode 100644 src/test/java/misc/migration/v1_2/EEnum.java

diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
index 1e68124d6..47930bce1 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
@@ -840,12 +840,15 @@ public class BaseTableDdl implements TableDdl {
     if (hasValue(alterColumn.getComment())) {
       alterColumnComment(writer, alterColumn);
     }
+    if (hasValue(alterColumn.getDropCheckConstraint())) {
+      dropCheckConstraint(writer, alterColumn, alterColumn.getDropCheckConstraint());
+    }
 
     boolean alterCheckConstraint = hasValue(alterColumn.getCheckConstraint());
 
     if (alterCheckConstraint) {
       // drop constraint before altering type etc
-      dropCheckConstraint(writer, alterColumn);
+      dropCheckConstraint(writer, alterColumn, alterColumn.getCheckConstraintName());
     }
     boolean alterBaseAttributes = false;
     if (hasValue(alterColumn.getType())) {
@@ -922,9 +925,9 @@ public class BaseTableDdl implements TableDdl {
     }
   }
 
-  protected void dropCheckConstraint(DdlWrite writer, AlterColumn alter) throws IOException {
+  protected void dropCheckConstraint(DdlWrite writer, AlterColumn alter, String constraintName) throws IOException {
 
-    String ddl = platformDdl.alterTableDropConstraint(alter.getTableName(), alter.getCheckConstraintName());
+    String ddl = platformDdl.alterTableDropConstraint(alter.getTableName(), constraintName);
     if (hasValue(ddl)) {
       writer.apply().append(ddl).endOfStatement();
     }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
index 7c2507873..dd6fc1ae8 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
@@ -40,7 +40,8 @@ public class MySqlDdl extends PlatformDdl {
 
   @Override
   public String alterTableDropConstraint(String tableName, String constraintName) {
-    // drop constraint not supported
+    // drop constraint not supported in MySQL 5.7 and 8.0 but starting with MariaDB 10.2.1 CHECK is evaluated
+    // TODO: Implement for MariaDB >= 10.2.1
     return null;
   }
 
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
index f0c33c5a4..8edd3b990 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -79,8 +79,6 @@ public class PlatformDdl {
 
   protected String alterColumn = "alter column";
 
-  protected String dropConstraint = "drop constraint";
-
   protected String dropUniqueConstraint = "drop constraint";
 
   protected String addConstraint = "add constraint";
@@ -420,7 +418,7 @@ public class PlatformDdl {
    * Drop a unique constraint from the table.
    */
   public String alterTableDropConstraint(String tableName, String constraintName) {
-    return "alter table " + tableName + " " + dropConstraint + " " + maxConstraintName(constraintName);
+    return "alter table " + tableName + " " + dropConstraintIfExists + " " + maxConstraintName(constraintName);
   }
 
   /**
diff --git a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
index bf2d10bdd..4a50d6f34 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
@@ -61,6 +61,7 @@ public class DbMigrationTest extends BaseTestCase {
         "migtest_ckey_detail",
         "migtest_ckey_parent",
         "migtest_e_basic",
+        "migtest_e_enum",
         "migtest_e_history",
         "migtest_e_history2",
         "migtest_e_history3",
diff --git a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java
index f23dafb49..d36abb449 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java
@@ -41,7 +41,7 @@ public class BaseTableDdlTest {
     ddlGen.generate(write, alterColumn);
 
     String ddl = write.apply().getBuffer();
-    assertThat(ddl).contains("alter table mytab drop constraint ck_mytab_acol");
+    assertThat(ddl).contains("alter table mytab drop constraint if exists ck_mytab_acol");
     assertThat(ddl).contains("alter table mytab add constraint ck_mytab_acol check (acol in ('A','B'))");
   }
 
diff --git a/src/test/java/misc/migration/v1_0/EEnum.java b/src/test/java/misc/migration/v1_0/EEnum.java
new file mode 100644
index 000000000..f2db733e7
--- /dev/null
+++ b/src/test/java/misc/migration/v1_0/EEnum.java
@@ -0,0 +1,29 @@
+package misc.migration.v1_0;
+
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.ebean.annotation.EnumValue;
+
+@Entity
+@Table(name = "migtest_e_enum")
+public class EEnum {
+  
+  public enum Status {
+    @EnumValue("N")
+    NEW,
+
+    @EnumValue("A")
+    ACTIVE,
+
+    @EnumValue("I")
+    INACTIVE,
+  }
+  
+  @Id
+  Integer id;
+  
+  Status testStatus;
+}
diff --git a/src/test/java/misc/migration/v1_1/EEnum.java b/src/test/java/misc/migration/v1_1/EEnum.java
new file mode 100644
index 000000000..577ede01d
--- /dev/null
+++ b/src/test/java/misc/migration/v1_1/EEnum.java
@@ -0,0 +1,18 @@
+package misc.migration.v1_1;
+
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.validation.constraints.Size;
+
+@Entity
+@Table(name = "migtest_e_enum")
+public class EEnum {
+  
+  @Id
+  Integer id;
+  
+  @Size (max = 1)
+  String testStatus; // change to String from Enum Status
+}
diff --git a/src/test/java/misc/migration/v1_2/EEnum.java b/src/test/java/misc/migration/v1_2/EEnum.java
new file mode 100644
index 000000000..26f2a5d31
--- /dev/null
+++ b/src/test/java/misc/migration/v1_2/EEnum.java
@@ -0,0 +1,29 @@
+package misc.migration.v1_2;
+
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.ebean.annotation.EnumValue;
+
+@Entity
+@Table(name = "migtest_e_enum")
+public class EEnum {
+  
+  public enum Status {
+    @EnumValue("N")
+    NEW,
+
+    @EnumValue("A")
+    ACTIVE,
+
+    @EnumValue("I")
+    INACTIVE,
+  }
+  
+  @Id
+  Integer id;
+  
+  Status testStatus;
+}
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
index 386774eb5..b1046c7bf 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
@@ -76,6 +76,13 @@ create table migtest_e_basic (
 -- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__b_4aybzy unique  (indextest2);
 -- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__b_4ayc02 unique  (indextest6);
 
+create table migtest_e_enum (
+  id                            integer generated by default as identity not null,
+  test_status                   varchar(1),
+  constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I')),
+  constraint pk_migtest_e_enum primary key (id)
+);
+
 create table migtest_e_history (
   id                            integer generated by default as identity not null,
   test_string                   varchar(255),
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.1.sql b/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
index cf2b1e276..685773be7 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
@@ -61,6 +61,7 @@ alter table migtest_e_basic drop constraint uq_mgtst__b_4ayc02;
 -- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__bsc_nm unique  (name);
 -- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__b_4ayc00 unique  (indextest4);
 -- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__b_4ayc01 unique  (indextest5);
+alter table migtest_e_enum drop constraint ck_mgtst__n_773sok;
 comment on column migtest_e_history.test_string is 'Column altered to long now';
 alter table migtest_e_history alter column test_string bigint;
 comment on table migtest_e_history is 'We have history now';
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.3.sql b/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
index 4b08010eb..13005cf1f 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
@@ -36,6 +36,8 @@ alter table migtest_e_basic drop constraint uq_mgtst__b_4ayc00;
 alter table migtest_e_basic drop constraint uq_mgtst__b_4ayc01;
 -- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__b_4aybzy unique  (indextest2);
 -- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__b_4ayc02 unique  (indextest6);
+alter table migtest_e_enum drop constraint ck_mgtst__n_773sok;
+alter table migtest_e_enum add constraint ck_mgtst__n_773sok check ( test_status in ('N','A','I'));
 comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
 alter table migtest_e_history2 alter column test_string drop default;
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
index 38edf4d47..63543a2d2 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
@@ -76,6 +76,13 @@ create table migtest_e_basic (
   constraint pk_migtest_e_basic primary key (id)
 );
 
+create table migtest_e_enum (
+  id                            integer auto_increment not null,
+  test_status                   varchar(1),
+  constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I')),
+  constraint pk_migtest_e_enum primary key (id)
+);
+
 create table migtest_e_history (
   id                            integer auto_increment not null,
   test_string                   varchar(255),
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.1.sql b/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
index d6f916d89..c3e1a6313 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
@@ -37,7 +37,7 @@ alter table migtest_fk_set_null drop constraint if exists fk_migtest_fk_set_null
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
 
 update migtest_e_basic set status = 'A' where status is null;
-alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
+alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status;
 alter table migtest_e_basic alter column status set default 'A';
 alter table migtest_e_basic alter column status set not null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
@@ -67,6 +67,7 @@ alter table migtest_e_basic add constraint uq_migtest_e_basic_status_indextest1
 alter table migtest_e_basic add constraint uq_migtest_e_basic_name unique  (name);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique  (indextest4);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
+alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
 comment on column migtest_e_history.test_string is 'Column altered to long now';
 alter table migtest_e_history alter column test_string bigint;
 comment on table migtest_e_history is 'We have history now';
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.3.sql b/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
index e8a90cb8f..0bf536155 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
@@ -19,7 +19,7 @@ alter table migtest_fk_none drop constraint if exists fk_migtest_fk_none_one_id;
 alter table migtest_fk_none_via_join drop constraint if exists fk_migtest_fk_none_via_join_one_id;
 alter table migtest_fk_set_null drop constraint if exists fk_migtest_fk_set_null_one_id;
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
-alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
+alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status;
 alter table migtest_e_basic alter column status drop default;
 alter table migtest_e_basic alter column status set null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I'));
@@ -41,6 +41,8 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique  (indextest2);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique  (indextest6);
+alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
+alter table migtest_e_enum add constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I'));
 comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
 alter table migtest_e_history2 alter column test_string drop default;
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
index a8af75d02..1de75c5eb 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
@@ -76,6 +76,13 @@ create table migtest_e_basic (
   constraint pk_migtest_e_basic primary key (id)
 );
 
+create table migtest_e_enum (
+  id                            integer generated by default as identity (start with 1)  not null,
+  test_status                   varchar(1),
+  constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I')),
+  constraint pk_migtest_e_enum primary key (id)
+);
+
 create table migtest_e_history (
   id                            integer generated by default as identity (start with 1)  not null,
   test_string                   varchar(255),
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
index b1e21443c..75e7798b7 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
@@ -31,7 +31,7 @@ alter table migtest_fk_set_null drop constraint if exists fk_migtest_fk_set_null
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
 
 update migtest_e_basic set status = 'A' where status is null;
-alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
+alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status;
 alter table migtest_e_basic alter column status set default 'A';
 alter table migtest_e_basic alter column status set not null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
@@ -61,6 +61,7 @@ alter table migtest_e_basic add constraint uq_migtest_e_basic_status_indextest1
 alter table migtest_e_basic add constraint uq_migtest_e_basic_name unique  (name);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique  (indextest4);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
+alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
 comment on column migtest_e_history.test_string is 'Column altered to long now';
 alter table migtest_e_history alter column test_string bigint;
 comment on table migtest_e_history is 'We have history now';
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
index 9ec91f4f2..57f0c0341 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
@@ -14,7 +14,7 @@ alter table migtest_fk_none drop constraint if exists fk_migtest_fk_none_one_id;
 alter table migtest_fk_none_via_join drop constraint if exists fk_migtest_fk_none_via_join_one_id;
 alter table migtest_fk_set_null drop constraint if exists fk_migtest_fk_set_null_one_id;
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
-alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
+alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status;
 alter table migtest_e_basic alter column status drop default;
 alter table migtest_e_basic alter column status set null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I'));
@@ -36,6 +36,8 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique  (indextest2);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique  (indextest6);
+alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
+alter table migtest_e_enum add constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I'));
 comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
 alter table migtest_e_history2 alter column test_string drop default;
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
index a41e37358..1d6458497 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
@@ -56,6 +56,10 @@
             <uniqueConstraint name="uq_migtest_e_basic_indextest2" columnNames="indextest2" oneToOne="false" nullableColumns="indextest2"/>
             <uniqueConstraint name="uq_migtest_e_basic_indextest6" columnNames="indextest6" oneToOne="false" nullableColumns="indextest6"/>
         </createTable>
+        <createTable name="migtest_e_enum" pkName="pk_migtest_e_enum">
+            <column name="id" type="integer" primaryKey="true"/>
+            <column name="test_status" type="varchar(1)" checkConstraint="check ( test_status in ('N','A','I'))" checkConstraintName="ck_migtest_e_enum_test_status"/>
+        </createTable>
         <createTable name="migtest_e_history" pkName="pk_migtest_e_history">
             <column name="id" type="integer" primaryKey="true"/>
             <column name="test_string" type="varchar"/>
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
index 1f437cb14..3e5d0c1af 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
@@ -36,6 +36,7 @@
         <addUniqueConstraint constraintName="uq_migtest_e_basic_name" tableName="migtest_e_basic" columnNames="name" nullableColumns="name" oneToOne="false"/>
         <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest4" tableName="migtest_e_basic" columnNames="indextest4" nullableColumns="indextest4" oneToOne="false"/>
         <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest5" tableName="migtest_e_basic" columnNames="indextest5" nullableColumns="indextest5" oneToOne="false"/>
+        <alterColumn columnName="test_status" tableName="migtest_e_enum" dropCheckConstraint="ck_migtest_e_enum_test_status"/>
         <addHistoryTable baseTable="migtest_e_history"/>
         <alterColumn columnName="test_string" tableName="migtest_e_history" type="bigint" currentType="varchar" currentNotnull="false" comment="Column altered to long now">
             <before platforms="postgres">alter table ${table} alter column ${column} TYPE bigint USING (${column}::integer)</before>
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
index 96cde72c8..5713508cc 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
@@ -21,6 +21,7 @@
         <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest5" tableName="migtest_e_basic" columnNames="DROP CONSTRAINT" nullableColumns="indextest5"/>
         <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest2" tableName="migtest_e_basic" columnNames="indextest2" nullableColumns="indextest2" oneToOne="false"/>
         <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest6" tableName="migtest_e_basic" columnNames="indextest6" nullableColumns="indextest6" oneToOne="false"/>
+        <alterColumn columnName="test_status" tableName="migtest_e_enum" checkConstraint="check ( test_status in ('N','A','I'))" checkConstraintName="ck_migtest_e_enum_test_status"/>
         <alterColumn columnName="test_string" tableName="migtest_e_history" withHistory="true" comment="DROP COMMENT"/>
         <addTableComment name="migtest_e_history" comment="DROP COMMENT"/>
         <alterColumn columnName="test_string" tableName="migtest_e_history2" withHistory="true" currentType="varchar" defaultValue="DROP DEFAULT" notnull="false" currentNotnull="true"/>
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
index ae4936281..97cf5f7d2 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
@@ -76,6 +76,13 @@ create table migtest_e_basic (
   constraint pk_migtest_e_basic primary key (id)
 );
 
+create table migtest_e_enum (
+  id                            integer auto_increment not null,
+  test_status                   varchar(1),
+  constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I')),
+  constraint pk_migtest_e_enum primary key (id)
+);
+
 create table migtest_e_history (
   id                            integer auto_increment not null,
   test_string                   varchar(255),
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
index e0a81437d..71cf77c91 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
@@ -38,6 +38,7 @@ alter table migtest_e_basic drop index uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest5;
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique  (indextest2);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique  (indextest6);
+alter table migtest_e_enum add constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I'));
 alter table migtest_e_history comment = '';
 alter table migtest_e_history2 alter test_string drop default;
 alter table migtest_e_history2 add column obsolete_string1 varchar(255);
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
index 0a2bbb648..e215dc485 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
@@ -85,6 +85,14 @@ create table migtest_e_basic (
 );
 create sequence migtest_e_basic_seq;
 
+create table migtest_e_enum (
+  id                            number(10) not null,
+  test_status                   varchar2(1),
+  constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I')),
+  constraint pk_migtest_e_enum primary key (id)
+);
+create sequence migtest_e_enum_seq;
+
 create table migtest_e_history (
   id                            number(10) not null,
   test_string                   varchar2(255),
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
index 63adc8dbf..9786d2401 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
@@ -62,6 +62,7 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
 -- NOT YET IMPLEMENTED: alter table migtest_e_basic add constraint uq_migtest_e_basic_name unique  (name);
 -- NOT YET IMPLEMENTED: alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique  (indextest4);
 -- NOT YET IMPLEMENTED: alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
+alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status;
 comment on column migtest_e_history.test_string is 'Column altered to long now';
 alter table migtest_e_history modify test_string number(19);
 comment on table migtest_e_history is 'We have history now';
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
index 4ba0b1242..e4f5064cd 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
@@ -37,6 +37,8 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
 -- NOT YET IMPLEMENTED: alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique  (indextest2);
 -- NOT YET IMPLEMENTED: alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique  (indextest6);
+alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status;
+alter table migtest_e_enum add constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I'));
 comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
 alter table migtest_e_history2 modify test_string drop default;
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
index 92439eac6..ea3b65d03 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
@@ -76,6 +76,13 @@ create table migtest_e_basic (
   constraint pk_migtest_e_basic primary key (id)
 );
 
+create table migtest_e_enum (
+  id                            serial not null,
+  test_status                   varchar(1),
+  constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I')),
+  constraint pk_migtest_e_enum primary key (id)
+);
+
 create table migtest_e_history (
   id                            serial not null,
   test_string                   varchar(255),
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
index 7e13e6924..80e049568 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
@@ -37,7 +37,7 @@ alter table if exists migtest_fk_set_null drop constraint if exists fk_migtest_f
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
 
 update migtest_e_basic set status = 'A' where status is null;
-alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
+alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status;
 alter table migtest_e_basic alter column status set default 'A';
 alter table migtest_e_basic alter column status set not null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
@@ -67,6 +67,7 @@ alter table migtest_e_basic add constraint uq_migtest_e_basic_status_indextest1
 alter table migtest_e_basic add constraint uq_migtest_e_basic_name unique  (name);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique  (indextest4);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
+alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
 
 alter table migtest_e_history alter column test_string TYPE bigint USING (test_string::integer);
 comment on column migtest_e_history.test_string is 'Column altered to long now';
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
index cdd4d2bd6..406991599 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
@@ -19,7 +19,7 @@ alter table if exists migtest_fk_none drop constraint if exists fk_migtest_fk_no
 alter table if exists migtest_fk_none_via_join drop constraint if exists fk_migtest_fk_none_via_join_one_id;
 alter table if exists migtest_fk_set_null drop constraint if exists fk_migtest_fk_set_null_one_id;
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
-alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
+alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status;
 alter table migtest_e_basic alter column status drop default;
 alter table migtest_e_basic alter column status drop not null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I'));
@@ -41,6 +41,8 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique  (indextest2);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique  (indextest6);
+alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
+alter table migtest_e_enum add constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I'));
 comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
 alter table migtest_e_history2 alter column test_string drop default;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
index 40b1d0dcc..897032ac5 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
@@ -79,6 +79,13 @@ create table migtest_e_basic (
   foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict
 );
 
+create table migtest_e_enum (
+  id                            integer not null,
+  test_status                   varchar(1),
+  constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I')),
+  constraint pk_migtest_e_enum primary key (id)
+);
+
 create table migtest_e_history (
   id                            integer not null,
   test_string                   varchar(255),
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
index 950e740da..6c32de45d 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
@@ -30,7 +30,7 @@ alter table migtest_fk_cascade drop constraint if exists fk_migtest_fk_cascade_o
 alter table migtest_fk_set_null drop constraint if exists fk_migtest_fk_set_null_one_id;
 
 update migtest_e_basic set status = 'A' where status is null;
-alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
+alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status;
 alter table migtest_e_basic alter column status set default 'A';
 alter table migtest_e_basic alter column status set not null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
@@ -59,6 +59,7 @@ alter table migtest_e_basic add constraint uq_migtest_e_basic_status_indextest1
 alter table migtest_e_basic add constraint uq_migtest_e_basic_name unique  (name);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique  (indextest4);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
+alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
 alter table migtest_e_history alter column test_string integer;
 
 -- NOTE: table has @History - special migration may be necessary
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
index 77d4552b6..b8da78f83 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
@@ -12,7 +12,7 @@ alter table migtest_fk_cascade drop constraint if exists fk_migtest_fk_cascade_o
 alter table migtest_fk_none drop constraint if exists fk_migtest_fk_none_one_id;
 alter table migtest_fk_none_via_join drop constraint if exists fk_migtest_fk_none_via_join_one_id;
 alter table migtest_fk_set_null drop constraint if exists fk_migtest_fk_set_null_one_id;
-alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
+alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status;
 alter table migtest_e_basic alter column status drop default;
 alter table migtest_e_basic alter column status set null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I'));
@@ -34,6 +34,8 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique  (indextest2);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique  (indextest6);
+alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
+alter table migtest_e_enum add constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I'));
 alter table migtest_e_history2 alter column test_string drop default;
 alter table migtest_e_history2 alter column test_string set null;
 alter table migtest_e_history2 add column obsolete_string1 varchar(255);
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql
index 3c6ebff79..99a41e4a5 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql
@@ -85,6 +85,14 @@ create unique nonclustered index uq_migtest_e_basic_indextest2 on migtest_e_basi
 create unique nonclustered index uq_migtest_e_basic_indextest6 on migtest_e_basic(indextest6) where indextest6 is not null;
 create sequence migtest_e_basic_seq as bigint  start with 1 ;
 
+create table migtest_e_enum (
+  id                            integer not null,
+  test_status                   nvarchar(1),
+  constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I')),
+  constraint pk_migtest_e_enum primary key (id)
+);
+create sequence migtest_e_enum_seq as bigint  start with 1 ;
+
 create table migtest_e_history (
   id                            integer not null,
   test_string                   nvarchar(255),
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql
index 447a80dfc..ad3a60c73 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql
@@ -64,6 +64,7 @@ create unique nonclustered index uq_migtest_e_basic_status_indextest1 on migtest
 create unique nonclustered index uq_migtest_e_basic_name on migtest_e_basic(name) where name is not null;
 create unique nonclustered index uq_migtest_e_basic_indextest4 on migtest_e_basic(indextest4) where indextest4 is not null;
 create unique nonclustered index uq_migtest_e_basic_indextest5 on migtest_e_basic(indextest5) where indextest5 is not null;
+IF (OBJECT_ID('ck_migtest_e_enum_test_status', 'C') IS NOT NULL) alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status;
 alter table migtest_e_history alter column test_string numeric(19);
 
 -- NOTE: table has @History - special migration may be necessary
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql
index 2294b9c01..473805780 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql
@@ -48,6 +48,8 @@ IF (OBJECT_ID('uq_migtest_e_basic_indextest5', 'UQ') IS NOT NULL) alter table mi
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_indextest5') drop index uq_migtest_e_basic_indextest5 ON migtest_e_basic;
 create unique nonclustered index uq_migtest_e_basic_indextest2 on migtest_e_basic(indextest2) where indextest2 is not null;
 create unique nonclustered index uq_migtest_e_basic_indextest6 on migtest_e_basic(indextest6) where indextest6 is not null;
+IF (OBJECT_ID('ck_migtest_e_enum_test_status', 'C') IS NOT NULL) alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status;
+alter table migtest_e_enum add constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I'));
 delimiter $$
 DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
   join sys.columns t2 on t1.object_id = t2.default_object_id

From 8b7d882b8aa9ae9b10c042d7abd9f1c0dc5a95b1 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 28 Jun 2018 10:23:34 +1200
Subject: [PATCH 0359/1036] #1442 - Add support to set ebean.dbSchema ... (~
 default DB schema) with create-all.sql and DB migrations (so it all just
 works)

---
 pom.xml                                       |  4 +-
 .../io/ebean/config/DbMigrationConfig.java    | 34 ++++++++
 .../java/io/ebean/config/ServerConfig.java    | 28 +++++++
 .../config/dbplatform/DatabasePlatform.java   | 34 ++++++++
 .../dbmigration/DdlGenerator.java             | 83 ++++++++++++-------
 5 files changed, 152 insertions(+), 31 deletions(-)

diff --git a/pom.xml b/pom.xml
index a82aec239..e6b9650f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>11.5.4</version>
+      <version>11.6.1</version>
     </dependency>
 
     <dependency>
@@ -192,7 +192,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>9.4.1212</version>
+      <version>42.2.2</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/src/main/java/io/ebean/config/DbMigrationConfig.java b/src/main/java/io/ebean/config/DbMigrationConfig.java
index 7e47156b3..f40f6f58d 100644
--- a/src/main/java/io/ebean/config/DbMigrationConfig.java
+++ b/src/main/java/io/ebean/config/DbMigrationConfig.java
@@ -102,6 +102,11 @@ public class DbMigrationConfig {
    */
   protected Map<String, String> runPlaceholderMap;
 
+  /**
+   * DB schema used for the migration (and testing).
+   */
+  protected String dbSchema;
+
   /**
    * DB user used to run the DB migration.
    */
@@ -373,6 +378,33 @@ public class DbMigrationConfig {
     this.dbPassword = dbPassword;
   }
 
+  /**
+   * Return the DB schema to use (for migration, testing etc).
+   */
+  public String getDbSchema() {
+    String schema = readEnvironment("ddl.migration.schema");
+    if (schema != null) {
+      return schema;
+    }
+    return dbSchema;
+  }
+
+  /**
+   * Set the Db schema to use.
+   */
+  public void setDbSchema(String dbSchema) {
+    this.dbSchema = dbSchema;
+  }
+
+  /**
+   * Set the Db schema if it hasn't already been defined.
+   */
+  public void setDefaultDbSchema(String dbSchema) {
+    if (this.dbSchema == null) {
+      this.dbSchema = dbSchema;
+    }
+  }
+
   /**
    * Return migration versions that should be added to history without running.
    */
@@ -475,6 +507,7 @@ public class DbMigrationConfig {
     runMigration = properties.getBoolean("migration.run", runMigration);
     metaTable = properties.get("migration.metaTable", metaTable);
     runPlaceholders = properties.get("migration.placeholders", runPlaceholders);
+    dbSchema = properties.get("migration.dbSchema", dbSchema);
 
     //Do not set user and pass from "datasource.db.username"
     //There is a null test in MigrationRunner::getConnection to handle this
@@ -557,6 +590,7 @@ public class DbMigrationConfig {
     runnerConfig.setRunPlaceholders(runPlaceholders);
     runnerConfig.setDbUsername(getDbUsername());
     runnerConfig.setDbPassword(getDbPassword());
+    runnerConfig.setDbSchema(getDbSchema());
     runnerConfig.setClassLoader(classLoader);
     if (patchInsertOn != null) {
       runnerConfig.setPatchInsertOn(patchInsertOn);
diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 0d0bbd70e..088ec3663 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -296,6 +296,11 @@ public class ServerConfig {
    */
   private DataSourceConfig readOnlyDataSourceConfig = new DataSourceConfig();
 
+  /**
+   * Optional - the database schema that should be used to own the tables etc.
+   */
+  private String dbSchema;
+
   /**
    * The db migration config (migration resource path etc).
    */
@@ -1120,6 +1125,25 @@ public class ServerConfig {
     this.profilingConfig = profilingConfig;
   }
 
+  /**
+   * Return the DB schema to use.
+   */
+  public String getDbSchema() {
+    return dbSchema;
+  }
+
+  /**
+   * Set the DB schema to use. This specifies to use this schema for:
+   * <ul>
+   * <li>Running Database migrations - Create and use the DB schema</li>
+   * <li>Testing DDL - Create-all.sql DDL execution creates and uses schema</li>
+   * <li>Testing Docker - Set default schema on connection URL</li>
+   * </ul>
+   */
+  public void setDbSchema(String dbSchema) {
+    this.dbSchema = dbSchema;
+  }
+
   /**
    * Return the DB migration configuration.
    */
@@ -2764,6 +2788,10 @@ public class ServerConfig {
    */
   protected void loadSettings(PropertiesWrapper p) {
 
+    dbSchema = p.get("dbSchema", dbSchema);
+    if (dbSchema != null) {
+      migrationConfig.setDefaultDbSchema(dbSchema);
+    }
     profilingConfig.loadSettings(p, name);
     migrationConfig.loadSettings(p, name);
     platformConfig.loadSettings(p);
diff --git a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
index ced70893c..ecc211289 100644
--- a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
@@ -16,6 +16,7 @@ import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.sql.Types;
 
 /**
@@ -658,6 +659,39 @@ public class DatabasePlatform {
     return persistBatchOnCascade;
   }
 
+  /**
+   * Create the DB schema if it does not exist.
+   */
+  public void createSchemaIfNotExists(String dbSchema, Connection connection) throws SQLException {
+    if (!schemaExists(dbSchema, connection)) {
+      Statement query = connection.createStatement();
+      try {
+        logger.info("create schema:{}", dbSchema);
+        query.executeUpdate("create schema " + dbSchema);
+      } finally {
+        JdbcClose.close(query);
+      }
+    }
+  }
+
+  /**
+   * Return true if the schema exists.
+   */
+  public boolean schemaExists(String dbSchema, Connection connection) throws SQLException {
+    ResultSet schemas = connection.getMetaData().getSchemas();
+    try {
+      while (schemas.next()) {
+        String schema = schemas.getString(1);
+        if (schema.equalsIgnoreCase(dbSchema)) {
+          return true;
+        }
+      }
+    } finally {
+      JdbcClose.close(schemas);
+    }
+    return false;
+  }
+
   /**
    * Return true if the table exists.
    */
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
index 40614c8b8..e8edf79dc 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
@@ -1,8 +1,8 @@
 package io.ebeaninternal.dbmigration;
 
-import io.ebean.Transaction;
 import io.ebean.config.ServerConfig;
 import io.ebean.migration.ddl.DdlRunner;
+import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.dbmigration.model.CurrentModel;
 import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader;
@@ -38,6 +38,7 @@ public class DdlGenerator {
   private final boolean createOnly;
   private final boolean jaxbPresent;
   private final boolean ddlCommitOnCreateIndex;
+  private final String dbSchema;
 
   private CurrentModel currentModel;
   private String dropAllContent;
@@ -48,6 +49,7 @@ public class DdlGenerator {
     this.jaxbPresent = serverConfig.getClassLoadConfig().isJavaxJAXBPresent();
     this.generateDdl = serverConfig.isDdlGenerate();
     this.createOnly = serverConfig.isDdlCreateOnly();
+    this.dbSchema = serverConfig.getDbSchema();
     if (!serverConfig.getTenantMode().isDdlEnabled() && serverConfig.isDdlRun()) {
       log.warn("DDL can't be run on startup with TenantMode " + serverConfig.getTenantMode());
       this.runDdl = false;
@@ -85,30 +87,54 @@ public class DdlGenerator {
    * Run the DDL drop and DDL create scripts if properties have been set.
    */
   protected void runDdl() {
-
     if (runDdl) {
+      Connection connection = null;
       try {
-        runInitSql();
-        runDropSql();
-        runCreateSql();
-        runSeedSql();
-
-      } catch (IOException e) {
-        String msg = "Error reading drop/create script from file system";
-        throw new RuntimeException(msg, e);
+        connection = obtainConnection();
+        runDdlWith(connection);
+      } finally {
+        JdbcClose.rollback(connection);
+        JdbcClose.close(connection);
       }
     }
   }
 
+  private void runDdlWith(Connection connection) {
+    try {
+      if (dbSchema != null) {
+        createSchemaIfRequired(connection);
+      }
+      runInitSql(connection);
+      runDropSql(connection);
+      runCreateSql(connection);
+      runSeedSql(connection);
+    } catch (IOException e) {
+      throw new RuntimeException("Error reading drop/create script from file system", e);
+    }
+  }
+
+  private Connection obtainConnection() {
+    try {
+      return server.getPluginApi().getDataSource().getConnection();
+    } catch (SQLException e) {
+      throw new PersistenceException("Failed to obtain connection to run DDL", e);
+    }
+  }
+
+  private void createSchemaIfRequired(Connection connection) {
+    try {
+      server.getDatabasePlatform().createSchemaIfNotExists(dbSchema, connection);
+    } catch (SQLException e) {
+      throw new PersistenceException("Failed to create DB Schema", e);
+    }
+  }
+
   /**
    * Execute all the DDL statements in the script.
    */
-  public int runScript(boolean expectErrors, String content, String scriptName) {
+  public int runScript(Connection connection, boolean expectErrors, String content, String scriptName) {
 
     DdlRunner runner = new DdlRunner(expectErrors, scriptName);
-
-    Transaction transaction = server.createTransaction();
-    Connection connection = transaction.getConnection();
     try {
       if (expectErrors) {
         connection.setAutoCommit(true);
@@ -119,64 +145,63 @@ public class DdlGenerator {
       if (expectErrors) {
         connection.setAutoCommit(false);
       }
-      transaction.commit();
+      connection.commit();
       return count;
 
     } catch (SQLException e) {
       throw new PersistenceException("Failed to run script", e);
-
     } finally {
-      transaction.end();
+      JdbcClose.rollback(connection);
     }
   }
 
-  protected void runDropSql() throws IOException {
+  protected void runDropSql(Connection connection) throws IOException {
     if (!createOnly) {
       String ignoreExtraDdl = System.getProperty("ebean.ignoreExtraDdl");
       if (!"true".equalsIgnoreCase(ignoreExtraDdl) && jaxbPresent) {
         String extraApply = ExtraDdlXmlReader.buildExtra(server.getDatabasePlatform().getName(), true);
         if (extraApply != null) {
-          runScript(false, extraApply, "extra-dll");
+          runScript(connection, false, extraApply, "extra-dll");
         }
       }
 
       if (dropAllContent == null) {
         dropAllContent = readFile(getDropFileName());
       }
-      runScript(true, dropAllContent, getDropFileName());
+      runScript(connection, true, dropAllContent, getDropFileName());
     }
   }
 
-  protected void runCreateSql() throws IOException {
+  protected void runCreateSql(Connection connection) throws IOException {
     if (createAllContent == null) {
       createAllContent = readFile(getCreateFileName());
     }
-    runScript(false, createAllContent, getCreateFileName());
+    runScript(connection, false, createAllContent, getCreateFileName());
 
     String ignoreExtraDdl = System.getProperty("ebean.ignoreExtraDdl");
     if (!"true".equalsIgnoreCase(ignoreExtraDdl) && jaxbPresent) {
       String extraApply = ExtraDdlXmlReader.buildExtra(server.getDatabasePlatform().getName(), false);
       if (extraApply != null) {
-        runScript(false, extraApply, "extra-dll");
+        runScript(connection, false, extraApply, "extra-dll");
       }
     }
   }
 
-  protected void runInitSql() throws IOException {
-    runResourceScript(server.getServerConfig().getDdlInitSql());
+  protected void runInitSql(Connection connection) throws IOException {
+    runResourceScript(connection, server.getServerConfig().getDdlInitSql());
   }
 
-  protected void runSeedSql() throws IOException {
-    runResourceScript(server.getServerConfig().getDdlSeedSql());
+  protected void runSeedSql(Connection connection) throws IOException {
+    runResourceScript(connection, server.getServerConfig().getDdlSeedSql());
   }
 
-  protected void runResourceScript(String sqlScript) throws IOException {
+  protected void runResourceScript(Connection connection, String sqlScript) throws IOException {
 
     if (sqlScript != null) {
       try (InputStream is = getClassLoader().getResourceAsStream(sqlScript)) {
         if (is != null) {
           String content = readContent(new InputStreamReader(is));
-          runScript(false, content, sqlScript);
+          runScript(connection,  false, content, sqlScript);
         }
       }
     }

From ada21729ecc21d19eb8f57863be7ab28b75c6dc3 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 28 Jun 2018 10:26:53 +1200
Subject: [PATCH 0360/1036] [maven-release-plugin] prepare release
 ebean-11.18.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e6b9650f0..1a85f058f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.18.2-SNAPSHOT</version>
+  <version>11.18.2</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.18.2</tag>
   </scm>
 
   <profiles>

From 9e42f98902f15e7f1cb96ae18b078e3ec99f2e12 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 28 Jun 2018 10:27:06 +1200
Subject: [PATCH 0361/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1a85f058f..ca16f3469 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.18.2</version>
+  <version>11.18.3-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.18.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From ae81ce5f47a5e5408f808795755b99d024bcb407 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 1 Jul 2018 20:30:54 +1200
Subject: [PATCH 0362/1036] #1443 - Bump ebean-migration to 11.7.1 (which adds
 JdbcMigration support and "I" run first repeatable migrations)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ca16f3469..211e52fb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>11.6.1</version>
+      <version>11.7.1</version>
     </dependency>
 
     <dependency>

From 1d9a2ed43a9d591c090bac47a1a76fec4f5f29d7 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 2 Jul 2018 21:33:59 +1200
Subject: [PATCH 0363/1036] No effective change - tidy DJsonContext

---
 .../server/text/json/DJsonContext.java           | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java b/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java
index dec96b5df..ec674cac8 100644
--- a/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java
+++ b/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java
@@ -47,8 +47,6 @@ public class DJsonContext implements SpiJsonContext {
 
   private final JsonFactory jsonFactory;
 
-  private final TypeManager typeManager;
-
   private final Object defaultObjectMapper;
 
   private final JsonConfig.Include defaultInclude;
@@ -57,11 +55,10 @@ public class DJsonContext implements SpiJsonContext {
 
   public DJsonContext(SpiEbeanServer server, JsonFactory jsonFactory, TypeManager typeManager) {
     this.server = server;
-    this.typeManager = typeManager;
     this.jsonFactory = (jsonFactory != null) ? jsonFactory : new JsonFactory();
     this.defaultObjectMapper = this.server.getServerConfig().getObjectMapper();
     this.defaultInclude = this.server.getServerConfig().getJsonInclude();
-    this.jsonScalar = new DJsonScalar(this.typeManager);
+    this.jsonScalar = new DJsonScalar(typeManager);
   }
 
   @Override
@@ -121,9 +118,8 @@ public class DJsonContext implements SpiJsonContext {
   public <T> T toBean(Class<T> cls, JsonParser parser, JsonReadOptions options) throws JsonIOException {
 
     BeanDescriptor<T> desc = getDescriptor(cls);
-    SpiJsonReader readJson = new ReadJson(desc, parser, options, determineObjectMapper(options));
     try {
-      return desc.jsonRead(readJson, null);
+      return desc.jsonRead(new ReadJson(desc, parser, options, determineObjectMapper(options)), null);
     } catch (IOException e) {
       throw new JsonIOException(e);
     }
@@ -133,8 +129,7 @@ public class DJsonContext implements SpiJsonContext {
   public <T> DJsonBeanReader<T> createBeanReader(Class<T> cls, JsonParser parser, JsonReadOptions options) throws JsonIOException {
 
     BeanDescriptor<T> desc = getDescriptor(cls);
-    SpiJsonReader readJson = new ReadJson(desc, parser, options, determineObjectMapper(options));
-    return new DJsonBeanReader<>(desc, readJson);
+    return new DJsonBeanReader<>(desc, new ReadJson(desc, parser, options, determineObjectMapper(options)));
   }
 
   @Override
@@ -354,8 +349,7 @@ public class DJsonContext implements SpiJsonContext {
 
   @Override
   public SpiJsonWriter createJsonWriter(Writer writer) {
-    JsonGenerator generator = createGenerator(writer);
-    return createJsonWriter(generator, null);
+    return createJsonWriter(createGenerator(writer), null);
   }
 
   @Override
@@ -375,9 +369,7 @@ public class DJsonContext implements SpiJsonContext {
       gen.writeFieldName(key);
     }
     gen.writeStartArray();
-
     WriteJson writeJson = createWriteJson(gen, options);
-
     for (T bean : collection) {
       BeanDescriptor<?> d = getDescriptor(bean.getClass());
       d.jsonWrite(writeJson, (EntityBean) bean, null);

From ce02e7ce70d9c2212290005015c6b05d7e70ca16 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 4 Jul 2018 21:25:10 +1200
Subject: [PATCH 0364/1036] No effective change - tidy tests

---
 .../org/tests/model/basic/xtra/DummyDao.java  | 27 +++++++------------
 .../TestJsonInheritanceDiscriminator.java     | 24 ++++++++---------
 2 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/src/test/java/org/tests/model/basic/xtra/DummyDao.java b/src/test/java/org/tests/model/basic/xtra/DummyDao.java
index 470af46e0..29caa03a4 100644
--- a/src/test/java/org/tests/model/basic/xtra/DummyDao.java
+++ b/src/test/java/org/tests/model/basic/xtra/DummyDao.java
@@ -8,14 +8,13 @@ import io.ebean.annotation.TxType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.persistence.EntityNotFoundException;
-import java.util.List;
-
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 public class DummyDao {
 
-  Logger logger = LoggerFactory.getLogger(DummyDao.class);
+  private final Logger logger = LoggerFactory.getLogger(DummyDao.class);
 
   @Transactional(type = TxType.REQUIRES_NEW)
   public void doSomething() {
@@ -30,18 +29,12 @@ public class DummyDao {
 
   }
 
-  @Transactional
-  public void addToObject(Long id, Double anotherNumber, List<Long> ids) throws EntityNotFoundException {
-    // and more code
-  }
-
-
   @Transactional(batch = PersistBatch.ALL, batchOnCascade = PersistBatch.ALL, batchSize = 99)
-  public void doWithBatchOptionsSet() {
+  private void doWithBatchOptionsSet() {
 
     Transaction txn = Ebean.currentTransaction();
-    assertEquals(PersistBatch.ALL, txn.getBatch());
-    assertEquals(PersistBatch.ALL, txn.getBatchOnCascade());
+    assertTrue(txn.isBatchMode());
+    assertTrue(txn.isBatchOnCascade());
     assertEquals(99, txn.getBatchSize());
   }
 
@@ -51,15 +44,15 @@ public class DummyDao {
 
     Transaction txn = Ebean.currentTransaction();
 
-    assertEquals(PersistBatch.ALL, txn.getBatch());
-    assertEquals(PersistBatch.NONE, txn.getBatchOnCascade());
+    assertTrue(txn.isBatchMode());
+    assertFalse(txn.isBatchOnCascade());
     assertEquals(77, txn.getBatchSize());
 
     doWithBatchOptionsSet();
 
     // batch options set back
-    assertEquals(PersistBatch.ALL, txn.getBatch());
-    assertEquals(PersistBatch.NONE, txn.getBatchOnCascade());
+    assertTrue(txn.isBatchMode());
+    assertFalse(txn.isBatchOnCascade());
     assertEquals(77, txn.getBatchSize());
 
   }
diff --git a/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java b/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java
index e49daffa9..75402e4d9 100644
--- a/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java
+++ b/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java
@@ -3,20 +3,20 @@ package org.tests.text.json;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.text.json.JsonContext;
+import org.junit.Test;
 import org.tests.model.basic.Animal;
 import org.tests.model.basic.Cat;
 import org.tests.model.basic.Dog;
-import org.junit.Assert;
-import org.junit.Test;
 
-import java.io.IOException;
 import java.sql.Date;
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
+
 public class TestJsonInheritanceDiscriminator extends BaseTestCase {
 
   @Test
-  public void testNoDiscriminator() throws IOException {
+  public void testNoDiscriminator() {
 
     Cat cat = new Cat();
     cat.setName("Gemma");
@@ -28,17 +28,17 @@ public class TestJsonInheritanceDiscriminator extends BaseTestCase {
 
     Cat cat2 = json.toBean(Cat.class, jsonContent);
 
-    Assert.assertEquals(cat.getId(), cat2.getId());
-    Assert.assertEquals(cat.getName(), cat2.getName());
-    Assert.assertEquals(cat.getVersion(), cat2.getVersion());
+    assertEquals(cat.getId(), cat2.getId());
+    assertEquals(cat.getName(), cat2.getName());
+    assertEquals(cat.getVersion(), cat2.getVersion());
 
     String noDiscriminator = "{\"id\":1,\"name\":\"Gemma\",\"version\":1}";
 
     Cat cat3 = json.toBean(Cat.class, noDiscriminator);
 
-    Assert.assertEquals(1L, cat3.getId().longValue());
-    Assert.assertEquals("Gemma", cat3.getName());
-    Assert.assertEquals(1L, cat3.getVersion().longValue());
+    assertEquals(1L, cat3.getId().longValue());
+    assertEquals("Gemma", cat3.getName());
+    assertEquals(1L, cat3.getVersion().longValue());
 
     Dog dog = new Dog();
     dog.setRegistrationNumber("ABC123");
@@ -51,11 +51,11 @@ public class TestJsonInheritanceDiscriminator extends BaseTestCase {
     String listJson = json.toJson(animals);
 
     List<Animal> animals2 = json.toList(Animal.class, listJson);
-    Assert.assertEquals(animals.size(), animals2.size());
+    assertEquals(animals.size(), animals2.size());
 
     String noDiscList = "[{\"id\":1,\"name\":\"Gemma\",\"version\":1},{\"name\":\"PussCat\",\"version\":1},{\"species\":\"CAT\",\"name\":\"PussCat\",\"version\":1}]";
     List<Cat> cats = json.toList(Cat.class, noDiscList);
-    Assert.assertEquals(cats.size(), 3);
+    assertEquals(cats.size(), 3);
 
   }
 

From 1ba9f4e9dea664a8be6c97d18f9b1b286b24d260 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 4 Jul 2018 21:25:36 +1200
Subject: [PATCH 0365/1036] No effective change - Add simple profile query main

---
 .../org/tests/profile/ProfileSimpleQuery.java | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 src/test/java/org/tests/profile/ProfileSimpleQuery.java

diff --git a/src/test/java/org/tests/profile/ProfileSimpleQuery.java b/src/test/java/org/tests/profile/ProfileSimpleQuery.java
new file mode 100644
index 000000000..77102c74a
--- /dev/null
+++ b/src/test/java/org/tests/profile/ProfileSimpleQuery.java
@@ -0,0 +1,35 @@
+package org.tests.profile;
+
+import org.tests.model.basic.Customer;
+//import org.tests.model.basic.ResetBasicData;
+
+public class ProfileSimpleQuery {
+
+  public static void main(String[] args) {
+
+//    ResetBasicData.reset();
+    ProfileSimpleQuery me = new ProfileSimpleQuery();
+    me.runIt();
+
+  }
+
+  private long counter;
+
+  private void runIt() {
+    long start = System.currentTimeMillis();
+    for (int i = 0; i < 1000_000; i++) {
+      readCustomer();
+    }
+    long exe = System.currentTimeMillis() - start;
+    System.out.println("run in " + exe);
+  }
+
+  private void readCustomer() {
+    Customer customer = Customer.find.byName("Rob");
+    String name = customer.getName();
+    if (name.length() > 999) {
+      counter++;
+    }
+  }
+
+}

From c981944c8e0af196db7eef32dede93d70c3f102d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 4 Jul 2018 21:26:17 +1200
Subject: [PATCH 0366/1036] #1444 - JSON parsing with inheritance -
 java.lang.UnsupportedOperationException: cannot create entity bean for
 abstract entity ...

---
 .../server/deploy/BeanDescriptor.java         | 18 ++++--
 .../server/deploy/BeanDescriptorJsonHelp.java | 56 +++++++++----------
 .../server/deploy/InheritInfo.java            |  1 -
 .../deploy/meta/DeployBeanPropertyLists.java  | 18 ++++++
 .../text/json/TestTextJsonInheritance.java    | 15 ++++-
 5 files changed, 71 insertions(+), 37 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 3edb14519..1df2c0d0e 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -291,6 +291,8 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    */
   protected final InheritInfo inheritInfo;
 
+  private final boolean abstractType;
+
   /**
    * Derived list of properties that make up the unique id.
    */
@@ -546,7 +548,8 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     this.whenCreatedProperty = findWhenCreatedProperty();
 
     // derive the index position of the Id and Version properties
-    if (Modifier.isAbstract(beanType.getModifiers())) {
+    this.abstractType = Modifier.isAbstract(beanType.getModifiers());
+    if (abstractType) {
       this.idPropertyIndex = -1;
       this.versionPropertyIndex = -1;
       this.unloadProperties = new int[0];
@@ -653,6 +656,13 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return ebeanServer;
   }
 
+  /**
+   * Return true if this is an abstract type.
+   */
+  public boolean isAbstractType() {
+    return abstractType;
+  }
+
   /**
    * Return true if this is a "Doc Store only" entity bean.
    */
@@ -3433,11 +3443,11 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   }
 
   public T jsonRead(SpiJsonReader jsonRead, String path) throws IOException {
-    return jsonHelp.jsonRead(jsonRead, path);
+    return jsonHelp.jsonRead(jsonRead, path, true);
   }
 
-  protected T jsonReadObject(SpiJsonReader jsonRead, String path) throws IOException {
-    return jsonHelp.jsonReadObject(jsonRead, path);
+  public T jsonReadObject(SpiJsonReader jsonRead, String path) throws IOException {
+    return jsonHelp.jsonRead(jsonRead, path, false);
   }
 
   public List<BeanProperty[]> getUniqueProps() {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java
index ca895e92a..a2355bdb9 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java
@@ -3,6 +3,8 @@ package io.ebeaninternal.server.deploy;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.ebean.bean.EntityBean;
 import io.ebean.text.json.EJson;
 import io.ebeaninternal.api.json.SpiJsonReader;
@@ -12,18 +14,18 @@ import java.io.IOException;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-public class BeanDescriptorJsonHelp<T> {
+class BeanDescriptorJsonHelp<T> {
 
   private final BeanDescriptor<T> desc;
 
   private final InheritInfo inheritInfo;
 
-  public BeanDescriptorJsonHelp(BeanDescriptor<T> desc) {
+  BeanDescriptorJsonHelp(BeanDescriptor<T> desc) {
     this.desc = desc;
     this.inheritInfo = desc.inheritInfo;
   }
 
-  public void jsonWrite(SpiJsonWriter writeJson, EntityBean bean, String key) throws IOException {
+  void jsonWrite(SpiJsonWriter writeJson, EntityBean bean, String key) throws IOException {
 
     writeJson.writeStartObject(key);
 
@@ -42,13 +44,11 @@ public class BeanDescriptorJsonHelp<T> {
     writeJson.writeEndObject();
   }
 
-  protected void jsonWriteProperties(SpiJsonWriter writeJson, EntityBean bean) throws IOException {
-
+  void jsonWriteProperties(SpiJsonWriter writeJson, EntityBean bean) {
     writeJson.writeBean(desc, bean);
   }
 
-  public void jsonWriteDirty(SpiJsonWriter writeJson, EntityBean bean, boolean[] dirtyProps) throws IOException {
-
+  void jsonWriteDirty(SpiJsonWriter writeJson, EntityBean bean, boolean[] dirtyProps) throws IOException {
     if (inheritInfo == null) {
       jsonWriteDirtyProperties(writeJson, bean, dirtyProps);
     } else {
@@ -56,7 +56,7 @@ public class BeanDescriptorJsonHelp<T> {
     }
   }
 
-  protected void jsonWriteDirtyProperties(SpiJsonWriter writeJson, EntityBean bean, boolean[] dirtyProps) throws IOException {
+  void jsonWriteDirtyProperties(SpiJsonWriter writeJson, EntityBean bean, boolean[] dirtyProps) throws IOException {
 
     writeJson.writeStartObject(null);
     // render the dirty properties
@@ -70,7 +70,7 @@ public class BeanDescriptorJsonHelp<T> {
   }
 
   @SuppressWarnings("unchecked")
-  public T jsonRead(SpiJsonReader jsonRead, String path) throws IOException {
+  T jsonRead(SpiJsonReader jsonRead, String path, boolean withInheritance) throws IOException {
 
     JsonParser parser = jsonRead.getParser();
     //noinspection StatementWithEmptyBody
@@ -87,43 +87,39 @@ public class BeanDescriptorJsonHelp<T> {
       }
     }
 
-    if (desc.inheritInfo == null) {
+    if (desc.inheritInfo == null || !withInheritance) {
       return jsonReadObject(jsonRead, path);
     }
 
+    ObjectNode node = jsonRead.getObjectMapper().readTree(parser);
+    if (node.isNull()) {
+      return null;
+    }
+    JsonParser newParser = node.traverse();
+    SpiJsonReader newReader = jsonRead.forJson(newParser, false);
+
     // check for the discriminator value to determine the correct sub type
     String discColumn = inheritInfo.getRoot().getDiscriminatorColumn();
-
-    if (parser.nextToken() != JsonToken.FIELD_NAME) {
-      String msg = "Error reading inheritance discriminator - expected [" + discColumn + "] but no json key?";
-      throw new JsonParseException(parser, msg, parser.getCurrentLocation());
-    }
-
-    String propName = parser.getCurrentName();
-    if (!propName.equalsIgnoreCase(discColumn)) {
-      // just try to assume this is the correct bean type in the inheritance
-      BeanProperty property = desc.getBeanProperty(propName);
-      if (property != null) {
-        EntityBean bean = desc.createEntityBean();
-        property.jsonRead(jsonRead, bean);
-        return jsonReadProperties(jsonRead, bean, path);
+    JsonNode discNode = node.get(discColumn);
+    if (discNode == null || discNode.isNull()) {
+      if (!desc.isAbstractType()) {
+        return desc.jsonReadObject(newReader, path);
       }
-      String msg = "Error reading inheritance discriminator, expected property [" + discColumn + "] but got [" + propName + "] ?";
-      throw new JsonParseException(parser, msg, parser.getCurrentLocation());
+      String msg = "Error reading inheritance discriminator - expected [" + discColumn + "] but no json key?";
+      throw new JsonParseException(newParser, msg, parser.getCurrentLocation());
     }
 
-    String discValue = parser.nextTextValue();
-    return (T) inheritInfo.readType(discValue).desc().jsonReadObject(jsonRead, path);
+    return (T) inheritInfo.readType(discNode.asText()).desc().jsonReadObject(newReader, path);
   }
 
-  protected T jsonReadObject(SpiJsonReader readJson, String path) throws IOException {
+  private T jsonReadObject(SpiJsonReader readJson, String path) throws IOException {
 
     EntityBean bean = desc.createEntityBeanForJson();
     return jsonReadProperties(readJson, bean, path);
   }
 
   @SuppressWarnings("unchecked")
-  protected T jsonReadProperties(SpiJsonReader readJson, EntityBean bean, String path) throws IOException {
+  private T jsonReadProperties(SpiJsonReader readJson, EntityBean bean, String path) throws IOException {
 
     if (path != null) {
       readJson.pushPath(path);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java b/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
index 8c536d6ca..6d112329b 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
@@ -151,7 +151,6 @@ public class InheritInfo {
    * Set the descriptor for this node.
    */
   public void setDescriptor(BeanDescriptor<?> descriptor) {
-
     this.descriptor = descriptor;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
index 241c56484..b35d0a32d 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.deploy.meta;
 
+import io.ebean.bean.EntityBean;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanDescriptorMap;
 import io.ebeaninternal.server.deploy.BeanProperty;
@@ -11,6 +12,7 @@ import io.ebeaninternal.server.deploy.BeanPropertySimpleCollection;
 import io.ebeaninternal.server.deploy.InheritInfo;
 import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty;
+import io.ebeaninternal.server.properties.BeanPropertySetter;
 import io.ebeaninternal.server.type.ScalarTypeString;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,6 +28,8 @@ public class DeployBeanPropertyLists {
 
   private static final Logger logger = LoggerFactory.getLogger(DeployBeanPropertyLists.class);
 
+  private static final NoopSetter NOOP_SETTER = new NoopSetter();
+
   private BeanProperty versionProperty;
 
   private BeanProperty unmappedJson;
@@ -100,6 +104,7 @@ public class DeployBeanPropertyLists {
       discDeployProp.setDiscriminator();
       discDeployProp.setName(discriminatorColumn);
       discDeployProp.setDbColumn(discriminatorColumn);
+      discDeployProp.setSetter(NOOP_SETTER);
 
       // only register it in the propertyMap. This might not be used if
       // an explicit property is mapped to the discriminator on the bean
@@ -491,4 +496,17 @@ public class DeployBeanPropertyLists {
 
     return new BeanProperty(desc, deployProp);
   }
+
+  private static class NoopSetter implements BeanPropertySetter {
+
+    @Override
+    public void set(EntityBean bean, Object value) {
+      // do nothing
+    }
+
+    @Override
+    public void setIntercept(EntityBean bean, Object value) {
+      // do nothing
+    }
+  }
 }
diff --git a/src/test/java/org/tests/text/json/TestTextJsonInheritance.java b/src/test/java/org/tests/text/json/TestTextJsonInheritance.java
index 570dd527b..288a61cc5 100644
--- a/src/test/java/org/tests/text/json/TestTextJsonInheritance.java
+++ b/src/test/java/org/tests/text/json/TestTextJsonInheritance.java
@@ -13,13 +13,24 @@ import org.tests.model.basic.VehicleDriver;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.io.IOException;
 import java.util.List;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class TestTextJsonInheritance extends BaseTestCase {
 
   @Test
-  public void test() throws IOException {
+  public void parseJson_when_inheritanceType_outOfOrderDtype() {
+
+    String fom = "{\"id\":90,\"name\":\"Frank\",\"vehicle\":{\"id\":42,\"licenseNumber\":\"T100\",\"capacity\":99.0,\"dtype\":\"T\"}}";
+
+    VehicleDriver driver1 = Ebean.json().toBean(VehicleDriver.class, fom);
+    assertThat(driver1.getVehicle()).isInstanceOf(Truck.class);
+    assertThat(driver1.getVehicle().getLicenseNumber()).isEqualTo("T100");
+  }
+
+  @Test
+  public void test() {
 
     setupData();
 

From 629e096e2896d611120c568b9ad0fea6890926b4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 4 Jul 2018 22:09:12 +1200
Subject: [PATCH 0367/1036] [maven-release-plugin] prepare release
 ebean-11.18.3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 211e52fb1..434bea963 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.18.3-SNAPSHOT</version>
+  <version>11.18.3</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.18.3</tag>
   </scm>
 
   <profiles>

From f6047d3b73a2e43ee5ba7417661b1f0b508cb11f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 4 Jul 2018 22:09:27 +1200
Subject: [PATCH 0368/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 434bea963..b394fdb35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.18.3</version>
+  <version>11.18.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.18.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 68649d0e98634c2f437251a1c16219990f951eff Mon Sep 17 00:00:00 2001
From: Michael Benz <michael.benz@foconis.de>
Date: Thu, 5 Jul 2018 09:52:40 +0200
Subject: [PATCH 0369/1036] =?UTF-8?q?Failing=20unit=20test=20to=20demonstr?=
 =?UTF-8?q?ate=20the=20bug=20that=20deleting=20an=20entity=20via=20?=
 =?UTF-8?q?=E2=80=A6=20(#1445)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Failing unit test to demonstrate the bug that deleting an entity via an Ebean query does not respect the cascade setting.
(here a mapped optional OneToOne entity is not deleted using an Ebean query even if the CascadeType.ALL was used)

* moved init and cleanup code to @Before and @After JUnit methods and added another test that shows Ebean.delete() works as expected
---
 .../delete/TestDeleteCascadeByQuery.java      | 76 +++++++++++++++++++
 .../org/tests/model/onetoone/OtoUser.java     | 31 ++++++++
 .../tests/model/onetoone/OtoUserOptional.java | 22 ++++++
 3 files changed, 129 insertions(+)
 create mode 100644 src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java
 create mode 100644 src/test/java/org/tests/model/onetoone/OtoUser.java
 create mode 100644 src/test/java/org/tests/model/onetoone/OtoUserOptional.java

diff --git a/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java b/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java
new file mode 100644
index 000000000..5da596325
--- /dev/null
+++ b/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java
@@ -0,0 +1,76 @@
+package org.tests.basic.delete;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.Query;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.tests.model.onetoone.OtoUser;
+import org.tests.model.onetoone.OtoUserOptional;
+
+public class TestDeleteCascadeByQuery extends BaseTestCase {
+  
+  private OtoUser testUser;
+  private OtoUserOptional userOptional;
+  private Query<OtoUserOptional> userOptionalQuery = Ebean.find(OtoUserOptional.class);
+  private Query<OtoUser> userQuery = Ebean.find(OtoUser.class);
+  
+  /**
+   * Init each test. Delete all existing beans. Then create OtoUser, add OtoUserOptional and save.
+   */
+  @Before
+  public void init() {
+    Ebean.deleteAll(userQuery.findList());
+    Ebean.deleteAll(userOptionalQuery.findList());
+    
+    userOptional = new OtoUserOptional();
+    Ebean.save(userOptional);
+    testUser = new OtoUser();
+    testUser.setOptional(userOptional);
+    Ebean.save(testUser);
+  }
+  
+  /**
+   * Test that validates deleting a bean using Ebean.delete() respects the CascadeType.DELETE 
+   * setting.
+   */
+  @Test
+  public void testDeleteCascadeByEbeanDelete() {
+
+    assertThat(Ebean.delete(testUser)).isTrue();
+
+    assertThat(userOptionalQuery.findCount())
+      .overridingErrorMessage("Entity OtoUserOptional found. Ebean.delete() on the user "
+          + "did not delete the OneToOne mapped entity as set with CascadeType.ALL")
+      .isEqualTo(0);
+  }
+  
+  /**
+   * Test that validates deleting a bean with OneToOne mapping with a query respects the 
+   * CascadeType.DELETE setting.
+   */
+  @Test
+  public void testDeleteCascadeByQuery() {
+    
+    assertThat(userQuery.delete()).isEqualTo(1);
+
+    assertThat(userOptionalQuery.findCount())
+      .overridingErrorMessage("Entity OtoUserOptional found. Ebean query delete() on the user "
+          + "did not delete the OneToOne mapped entity as set with CascadeType.ALL")
+      .isEqualTo(0);
+  }
+  
+  /**
+   * Cleanup - Delete all existing beans for the next test.
+   */
+  @After
+  public void cleanup() {
+    Ebean.deleteAll(userQuery.findList());
+    Ebean.deleteAll(userOptionalQuery.findList());
+  }
+}
diff --git a/src/test/java/org/tests/model/onetoone/OtoUser.java b/src/test/java/org/tests/model/onetoone/OtoUser.java
new file mode 100644
index 000000000..d6ff1b6ae
--- /dev/null
+++ b/src/test/java/org/tests/model/onetoone/OtoUser.java
@@ -0,0 +1,31 @@
+package org.tests.model.onetoone;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+import org.tests.model.BaseModel;
+
+@Entity
+@Table(name = "oto_user_model")
+public class OtoUser extends BaseModel {
+
+  String name;
+  
+  @OneToOne(optional = true, cascade = CascadeType.ALL)
+  OtoUserOptional userOptional;
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+  
+  public void setOptional(OtoUserOptional userOptional) {
+    this.userOptional = userOptional;
+  }
+
+}
diff --git a/src/test/java/org/tests/model/onetoone/OtoUserOptional.java b/src/test/java/org/tests/model/onetoone/OtoUserOptional.java
new file mode 100644
index 000000000..3fb1fe19d
--- /dev/null
+++ b/src/test/java/org/tests/model/onetoone/OtoUserOptional.java
@@ -0,0 +1,22 @@
+package org.tests.model.onetoone;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+import org.tests.model.BaseModel;
+
+@Entity
+@Table(name = "oto_user_model_optional")
+public class OtoUserOptional extends BaseModel {
+
+  String optional;
+
+  public void setPassword(final String optional) {
+    this.optional = optional;
+  }
+  
+  String getOptional() {
+    return optional;
+  }
+
+}

From 588aaf93614a560bf75f96ad1830f28268dea867 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 5 Jul 2018 22:37:54 +1200
Subject: [PATCH 0370/1036] #1447 - Delete query ... should honour cascading
 delete if defined

See also PR #1445 with the failing test case
---
 .../server/core/DefaultServer.java            | 13 ++-
 .../server/core/OrmQueryRequest.java          |  5 ++
 .../ebeaninternal/server/core/Persister.java  |  5 ++
 .../server/core/SpiOrmQueryRequest.java       |  5 ++
 .../server/persist/DefaultPersister.java      | 32 ++++---
 .../org/tests/delete/TestDeleteByQuery.java   | 83 +++++++++++++++++--
 .../org/tests/model/basic/BBookmarkOrg.java   | 35 ++++++++
 .../org/tests/model/basic/BBookmarkUser.java  | 60 ++++----------
 .../transaction/TestInsertManyAndRef.java     | 22 +----
 9 files changed, 174 insertions(+), 86 deletions(-)
 create mode 100644 src/test/java/org/tests/model/basic/BBookmarkOrg.java

diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index a540ecb1b..2a7c4e1cc 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -1384,7 +1384,18 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     try {
       request.initTransIfRequired();
       request.markNotQueryOnly();
-      return request.delete();
+      if (request.isDeleteByStatement()) {
+        return request.delete();
+      } else {
+        // escalate to fetch the ids of the beans to delete due
+        // to cascading deletes or l2 caching etc
+        List<Object> ids = request.findIds();
+        if (ids.isEmpty()) {
+          return 0;
+        } else {
+          return persister.deleteByIds(request.getBeanDescriptor(), ids, request.getTransaction(), false);
+        }
+      }
     } finally {
       request.endTransIfRequired();
     }
diff --git a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index 8c9420911..fd21d8f8a 100644
--- a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -116,6 +116,11 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
     }
   }
 
+  @Override
+  public boolean isDeleteByStatement() {
+    return beanDescriptor.isDeleteByStatement();
+  }
+
   @Override
   public boolean isMultiValueIdSupported() {
     return beanDescriptor.isMultiValueIdSupported();
diff --git a/src/main/java/io/ebeaninternal/server/core/Persister.java b/src/main/java/io/ebeaninternal/server/core/Persister.java
index 20cbfcce4..c64daaa4e 100644
--- a/src/main/java/io/ebeaninternal/server/core/Persister.java
+++ b/src/main/java/io/ebeaninternal/server/core/Persister.java
@@ -63,6 +63,11 @@ public interface Persister {
    */
   int deleteMany(Class<?> beanType, Collection<?> ids, Transaction transaction, boolean permanent);
 
+  /**
+   * Delete multiple beans when escalated from a delete query.
+   */
+  int deleteByIds(BeanDescriptor<?> descriptor, List<Object> idList, Transaction transaction, boolean permanent);
+
   /**
    * Execute the Update.
    */
diff --git a/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
index 68895bb88..c78661398 100644
--- a/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
@@ -171,4 +171,9 @@ public interface SpiOrmQueryRequest<T> extends BeanQueryRequest<T>, DocQueryRequ
    * Set profile location for "find all" if not set.
    */
   void profileLocationAll();
+
+  /**
+   * Return true if delete by statement is allowed for this type given cascade rules etc.
+   */
+  boolean isDeleteByStatement();
 }
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index a259f8b84..feb7337b3 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -680,6 +680,12 @@ public final class DefaultPersister implements Persister {
     return delete(descriptor, id, null, transaction, deleteMode);
   }
 
+  @Override
+  public int deleteByIds(BeanDescriptor<?> descriptor, List<Object> idList, Transaction transaction, boolean permanent) {
+    DeleteMode deleteMode = (permanent || !descriptor.isSoftDelete()) ? DeleteMode.HARD : DeleteMode.SOFT;
+    return delete(descriptor, null, idList, transaction, deleteMode);
+  }
+
   /**
    * Delete by Id or a List of Id's.
    */
@@ -739,18 +745,20 @@ public final class DefaultPersister implements Persister {
       // OneToMany's with delete cascade
       BeanPropertyAssocMany<?>[] manys = descriptor.propertiesManyDelete();
       for (BeanPropertyAssocMany<?> many : manys) {
-        BeanDescriptor<?> targetDesc = many.getTargetDescriptor();
-        // only cascade soft deletes when supported by target
-        if (deleteMode.isHard() || targetDesc.isSoftDelete()) {
-          if (deleteMode.isHard() && targetDesc.isDeleteByStatement()) {
-            // we can just delete children with a single statement
-            SqlUpdate sqlDelete = many.deleteByParentId(id, idList);
-            executeSqlUpdate(sqlDelete, t);
-          } else {
-            // we need to fetch the Id's to delete (recurse or notify L2 cache)
-            List<Object> childIds = many.findIdsByParentId(id, idList, t, null);
-            if (!childIds.isEmpty()) {
-              delete(targetDesc, null, childIds, t, deleteMode);
+        if (!many.isManyToMany()) {
+          BeanDescriptor<?> targetDesc = many.getTargetDescriptor();
+          // only cascade soft deletes when supported by target
+          if (deleteMode.isHard() || targetDesc.isSoftDelete()) {
+            if (deleteMode.isHard() && targetDesc.isDeleteByStatement()) {
+              // we can just delete children with a single statement
+              SqlUpdate sqlDelete = many.deleteByParentId(id, idList);
+              executeSqlUpdate(sqlDelete, t);
+            } else {
+              // we need to fetch the Id's to delete (recurse or notify L2 cache)
+              List<Object> childIds = many.findIdsByParentId(id, idList, t, null);
+              if (!childIds.isEmpty()) {
+                delete(targetDesc, null, childIds, t, deleteMode);
+              }
             }
           }
         }
diff --git a/src/test/java/org/tests/delete/TestDeleteByQuery.java b/src/test/java/org/tests/delete/TestDeleteByQuery.java
index a4b7ce989..47c1c7ff8 100644
--- a/src/test/java/org/tests/delete/TestDeleteByQuery.java
+++ b/src/test/java/org/tests/delete/TestDeleteByQuery.java
@@ -7,6 +7,7 @@ import io.ebean.Query;
 import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.Platform;
 
+import org.tests.model.basic.BBookmarkUser;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
@@ -22,7 +23,46 @@ public class TestDeleteByQuery extends BaseTestCase {
   @Test
   @IgnorePlatform(Platform.MYSQL)
   // FIXME: MySql does not the sub query selecting from the delete table
-  public void test() {
+  public void deleteWithSubquery() {
+
+    EbeanServer server = Ebean.getDefaultServer();
+
+    BBookmarkUser u1 = new BBookmarkUser("u1");
+    Ebean.save(u1);
+
+    Query<BBookmarkUser> query = server.find(BBookmarkUser.class)
+      .where().eq("org.name", "NahYeahMaybe")
+      .query();
+
+    LoggedSqlCollector.start();
+    query.delete();
+
+    List<String> loggedSql = LoggedSqlCollector.stop();
+    assertThat(loggedSql).hasSize(1);
+    assertThat(trimSql(loggedSql.get(0), 1)).contains("delete from bbookmark_user where id in (select t0.id from bbookmark_user t0 left join bbookmark_org t1 on t1.id = t0.org_id  where t1.name");
+
+    Query<BBookmarkUser> query2 = server.find(BBookmarkUser.class)
+      .where().eq("name", "NotARealFirstName").query();
+
+    LoggedSqlCollector.start();
+    query2.delete();
+
+    loggedSql = LoggedSqlCollector.stop();
+    assertThat(loggedSql).hasSize(1);
+    assertThat(loggedSql.get(0)).contains("delete from bbookmark_user where name =");
+
+
+    server.find(BBookmarkUser.class).select("id").where().eq("name", "NotARealFirstName").delete();
+    server.find(BBookmarkUser.class).select("id").where().eq("name", "TwoAlsoNotRealFirstName").query().delete();
+
+    List<BBookmarkUser> list = server.find(BBookmarkUser.class).select("id").where().eq("name", "NotARealFirstName").findList();
+    assertThat(list).isEmpty();
+  }
+
+  @Test
+  @IgnorePlatform(Platform.MYSQL)
+  // FIXME: MySql does not the sub query selecting from the delete table
+  public void deleteWithSubquery_withEscalation() {
 
     EbeanServer server = Ebean.getDefaultServer();
 
@@ -33,7 +73,7 @@ public class TestDeleteByQuery extends BaseTestCase {
 
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertThat(loggedSql).hasSize(1);
-    assertThat(trimSql(loggedSql.get(0), 1)).contains("delete from contact where id in (select t0.id from contact t0 left join");
+    assertThat(trimSql(loggedSql.get(0), 1)).contains("select t0.id from contact t0 left join contact_group t1 on t1.id = t0.group_id  where t1.name = ?");
 
     Query<Contact> query2 = server.find(Contact.class).where().eq("firstName", "NotARealFirstName").query();
 
@@ -42,7 +82,7 @@ public class TestDeleteByQuery extends BaseTestCase {
 
     loggedSql = LoggedSqlCollector.stop();
     assertThat(loggedSql).hasSize(1);
-    assertThat(loggedSql.get(0)).contains("delete from contact where first_name =");
+    assertThat(loggedSql.get(0)).contains("select t0.id from contact t0 where t0.first_name = ?");
 
 
     server.find(Contact.class).select("id").where().eq("firstName", "NotARealFirstName").delete();
@@ -57,12 +97,29 @@ public class TestDeleteByQuery extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
+    Ebean.find(BBookmarkUser.class).where().eq("id", 7000).delete();
+    Ebean.find(BBookmarkUser.class).setId(7000).delete();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("delete from bbookmark_user where id = ?");
+    assertThat(sql.get(1)).contains("delete from bbookmark_user where id = ?");
+
+    // and note this is the easiest option
+    Ebean.delete(BBookmarkUser.class, 7000);
+  }
+
+  @Test
+  public void queryByIdDelete_withEscalation() {
+
+    LoggedSqlCollector.start();
+
     Ebean.find(Contact.class).where().eq("id", 7000).delete();
     Ebean.find(Contact.class).setId(7000).delete();
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(sql.get(0)).contains("delete from contact where id = ?");
-    assertThat(sql.get(1)).contains("delete from contact where id = ?");
+    // escalate to fetch ids then delete ... but no rows found
+    assertThat(sql.get(0)).contains("select t0.id from contact t0 where t0.id = ?");
+    assertThat(sql.get(1)).contains("select t0.id from contact t0 where t0.id = ?");
 
     // and note this is the easiest option
     Ebean.delete(Contact.class, 7000);
@@ -80,11 +137,23 @@ public class TestDeleteByQuery extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("delete from o_customer where name = ?");
+    assertThat(sql.get(0)).contains("select t0.id from o_customer t0 where t0.name = ?");
   }
 
   @Test
-  public void testCommit() {
+  public void deleteByPredicate() {
+
+    BBookmarkUser ud = new BBookmarkUser("deleteQueryByPredicate");
+    Ebean.save(ud);
+
+    Ebean.find(BBookmarkUser.class).where().eq("name", "deleteQueryByPredicate").delete();
+
+    BBookmarkUser found = Ebean.find(BBookmarkUser.class, ud.getId());
+    assertThat(found).isNull();
+  }
+
+  @Test
+  public void deleteByPredicate_withEscalation() {
 
     ResetBasicData.reset();
 
diff --git a/src/test/java/org/tests/model/basic/BBookmarkOrg.java b/src/test/java/org/tests/model/basic/BBookmarkOrg.java
new file mode 100644
index 000000000..305ab9497
--- /dev/null
+++ b/src/test/java/org/tests/model/basic/BBookmarkOrg.java
@@ -0,0 +1,35 @@
+package org.tests.model.basic;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class BBookmarkOrg {
+
+  @Id
+  @GeneratedValue
+  private int id;
+
+  private String name;
+
+  public BBookmarkOrg(String name) {
+    this.name = name;
+  }
+
+  public int getId() {
+    return id;
+  }
+
+  public void setId(int id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+}
diff --git a/src/test/java/org/tests/model/basic/BBookmarkUser.java b/src/test/java/org/tests/model/basic/BBookmarkUser.java
index 873af8096..064f4aa66 100644
--- a/src/test/java/org/tests/model/basic/BBookmarkUser.java
+++ b/src/test/java/org/tests/model/basic/BBookmarkUser.java
@@ -1,13 +1,11 @@
 package org.tests.model.basic;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.ManyToOne;
 
 /**
- * represents a user entity. A user contains a username and password.
- *
  * @author Chris
  */
 @Entity
@@ -17,97 +15,69 @@ public class BBookmarkUser {
   @GeneratedValue
   private Integer id;
 
-  @Column
   private String name;
 
-  @Column
   private String password;
 
-  @Column
   private String emailAddress;
 
-  @Column
   private String country;
 
-//	@Version
-//	private Timestamp lastUpdate;
-
   /**
-   * @return the id
+   * An optional non-cascading ManyToOne.
    */
+  @ManyToOne
+  private BBookmarkOrg org;
+
+  public BBookmarkUser(String name) {
+    this.name = name;
+  }
+
   public Integer getId() {
     return this.id;
   }
 
-  /**
-   * @param id the id to set
-   */
   public void setId(final Integer id) {
     this.id = id;
   }
 
-  /**
-   * @return the password
-   */
   public String getPassword() {
     return this.password;
   }
 
-  /**
-   * @param password the password to set
-   */
   public void setPassword(final String password) {
     this.password = password;
   }
 
-  /**
-   * @return the name
-   */
   public String getName() {
     return this.name;
   }
 
-  /**
-   * @param name the name to set
-   */
   public void setName(final String name) {
     this.name = name;
   }
 
-  /**
-   * @return the emailAddress
-   */
   public String getEmailAddress() {
     return this.emailAddress;
   }
 
-  /**
-   * @param emailAddress the emailAddress to set
-   */
   public void setEmailAddress(final String emailAddress) {
     this.emailAddress = emailAddress;
   }
 
-  /**
-   * @return the country
-   */
   public String getCountry() {
     return this.country;
   }
 
-  /**
-   * @param country the country to set
-   */
   public void setCountry(final String country) {
     this.country = country;
   }
 
-//	public Timestamp getLastUpdate() {
-//    	return lastUpdate;
-//    }
-//
-//	public void setLastUpdate(Timestamp lastUpdate) {
-//    	this.lastUpdate = lastUpdate;
-//    }
+  public BBookmarkOrg getOrg() {
+    return org;
+  }
 
+  public void setOrg(BBookmarkOrg org) {
+    this.org = org;
+  }
 }
diff --git a/src/test/java/org/tests/transaction/TestInsertManyAndRef.java b/src/test/java/org/tests/transaction/TestInsertManyAndRef.java
index 029595eb7..de123a74d 100644
--- a/src/test/java/org/tests/transaction/TestInsertManyAndRef.java
+++ b/src/test/java/org/tests/transaction/TestInsertManyAndRef.java
@@ -14,28 +14,8 @@ public class TestInsertManyAndRef extends BaseTestCase {
   @Test
   public void testMe() {
 
-    // ResetBasicData.reset();
-    //
-    // Customer u = new Customer();
-    // u.setName("Mr Test");
-    //
-    // final List<Order> bookmarks = new ArrayList<Order>();
-    // final Order b1 = new Order();
-    // b1.setCustomer(u);
-    // b1.setStatus(Status.NEW);
-    //
-    // final Order b2 = new Order();
-    // b2.setStatus(Status.NEW);
-    // b2.setCustomer(u);
-    //
-    // bookmarks.add(b1);
-    // bookmarks.add(b2);
-    //
-    // Ebean.save(bookmarks);
-
-    final BBookmarkUser u = new BBookmarkUser();
+    final BBookmarkUser u = new BBookmarkUser("Mr Test");
     u.setEmailAddress("test@test.com");
-    u.setName("Mr Test");
     u.setPassword("password");
 
     final List<BBookmark> bookmarks = new ArrayList<>();

From 8789709fb8a7f759fdce58303f5bb0d5852145a5 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 5 Jul 2018 22:40:09 +1200
Subject: [PATCH 0371/1036] No effective change - tidy test code

---
 src/test/java/org/tests/model/onetoone/OtoUser.java    | 10 +++++-----
 .../java/org/tests/model/onetoone/OtoUserOptional.java |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/test/java/org/tests/model/onetoone/OtoUser.java b/src/test/java/org/tests/model/onetoone/OtoUser.java
index d6ff1b6ae..dabab0825 100644
--- a/src/test/java/org/tests/model/onetoone/OtoUser.java
+++ b/src/test/java/org/tests/model/onetoone/OtoUser.java
@@ -11,10 +11,10 @@ import org.tests.model.BaseModel;
 @Table(name = "oto_user_model")
 public class OtoUser extends BaseModel {
 
-  String name;
-  
-  @OneToOne(optional = true, cascade = CascadeType.ALL)
-  OtoUserOptional userOptional;
+  private String name;
+
+  @OneToOne(cascade = CascadeType.ALL)
+  private OtoUserOptional userOptional;
 
   public String getName() {
     return name;
@@ -23,7 +23,7 @@ public class OtoUser extends BaseModel {
   public void setName(String name) {
     this.name = name;
   }
-  
+
   public void setOptional(OtoUserOptional userOptional) {
     this.userOptional = userOptional;
   }
diff --git a/src/test/java/org/tests/model/onetoone/OtoUserOptional.java b/src/test/java/org/tests/model/onetoone/OtoUserOptional.java
index 3fb1fe19d..65dd701b0 100644
--- a/src/test/java/org/tests/model/onetoone/OtoUserOptional.java
+++ b/src/test/java/org/tests/model/onetoone/OtoUserOptional.java
@@ -9,13 +9,13 @@ import org.tests.model.BaseModel;
 @Table(name = "oto_user_model_optional")
 public class OtoUserOptional extends BaseModel {
 
-  String optional;
+  private String optional;
 
   public void setPassword(final String optional) {
     this.optional = optional;
   }
-  
-  String getOptional() {
+
+  public String getOptional() {
     return optional;
   }
 

From 72788c7428e10f79ab22bb73fc3fb2f4ecf688d3 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 5 Jul 2018 22:41:28 +1200
Subject: [PATCH 0372/1036] No effective change - tidy test code

---
 .../java/org/tests/model/basic/BBookmark.java  | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/test/java/org/tests/model/basic/BBookmark.java b/src/test/java/org/tests/model/basic/BBookmark.java
index ddd7d283d..3e18cb56d 100644
--- a/src/test/java/org/tests/model/basic/BBookmark.java
+++ b/src/test/java/org/tests/model/basic/BBookmark.java
@@ -26,44 +26,26 @@ public class BBookmark {
   @Column
   private BBookmarkUser user;
 
-  /**
-   * @return the id
-   */
   public Integer getId() {
     return this.id;
   }
 
-  /**
-   * @param id the id to set
-   */
   public void setId(final Integer id) {
     this.id = id;
   }
 
-  /**
-   * @return the bookmarkReference
-   */
   public String getBookmarkReference() {
     return this.bookmarkReference;
   }
 
-  /**
-   * @param bookmarkReference the bookmarkReference to set
-   */
   public void setBookmarkReference(final String bookmarkReference) {
     this.bookmarkReference = bookmarkReference;
   }
 
-  /**
-   * @return the user
-   */
   public BBookmarkUser getUser() {
     return this.user;
   }
 
-  /**
-   * @param user the user to set
-   */
   public void setUser(final BBookmarkUser user) {
     this.user = user;
   }

From 2024193da988bc35af072360736dd914cbf3dfbf Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 5 Jul 2018 23:39:56 +1200
Subject: [PATCH 0373/1036] [maven-release-plugin] prepare release
 ebean-11.18.4

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b394fdb35..4797a9ad7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.18.4-SNAPSHOT</version>
+  <version>11.18.4</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.18.4</tag>
   </scm>
 
   <profiles>

From 2755e6d1ec8f42eda40a39268ee85485bb5231f2 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 5 Jul 2018 23:40:12 +1200
Subject: [PATCH 0374/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4797a9ad7..c85db8d1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.18.4</version>
+  <version>11.18.5-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.18.4</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From df892f450985fa2ad910a29da2038e57ab5b5503 Mon Sep 17 00:00:00 2001
From: Tobias <tobias@olsson.be>
Date: Wed, 11 Jul 2018 15:52:56 +0200
Subject: [PATCH 0375/1036] Failing testcase with lazy fetch

For some reason, all entities with an id starting with _ fails when
lazy-fetching due to sort not being properly renamed.
---
 .../org/tests/model/lazywithid/Looney.java    | 36 +++++++++++++++++++
 .../model/lazywithid/TestColumnIdName.java    | 26 ++++++++++++++
 .../java/org/tests/model/lazywithid/Tune.java | 29 +++++++++++++++
 3 files changed, 91 insertions(+)
 create mode 100644 src/test/java/org/tests/model/lazywithid/Looney.java
 create mode 100644 src/test/java/org/tests/model/lazywithid/TestColumnIdName.java
 create mode 100644 src/test/java/org/tests/model/lazywithid/Tune.java

diff --git a/src/test/java/org/tests/model/lazywithid/Looney.java b/src/test/java/org/tests/model/lazywithid/Looney.java
new file mode 100644
index 000000000..a51758b3f
--- /dev/null
+++ b/src/test/java/org/tests/model/lazywithid/Looney.java
@@ -0,0 +1,36 @@
+package org.tests.model.lazywithid;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+@Entity
+public class Looney {
+  @Id
+  public Long id;
+
+  @ManyToOne
+  private Tune tune;
+
+  private String name;
+
+  public Looney(final String name) {
+    this.name = name;
+  }
+
+  public Tune getTune() {
+    return tune;
+  }
+
+  public void setTune(final Tune tune) {
+    this.tune = tune;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(final String name) {
+    this.name = name;
+  }
+}
diff --git a/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java b/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java
new file mode 100644
index 000000000..4d8a16106
--- /dev/null
+++ b/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java
@@ -0,0 +1,26 @@
+package org.tests.model.lazywithid;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
+import org.junit.Test;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+
+public class TestColumnIdName extends BaseTestCase {
+  @Test
+  public void test() {
+
+    Tune tune = new Tune();
+    tune.getLoonies().add(new Looney("Taz"));
+    Ebean.save(tune);
+
+    final List<Tune> fetchedCollection = Ebean.find(Tune.class).findList();
+
+    assertEquals(1, fetchedCollection.size());
+    assertEquals(1, fetchedCollection.get(0).getLoonies().size());
+    assertEquals("Taz", fetchedCollection.get(0).getLoonies().get(0).getName());
+  }
+}
diff --git a/src/test/java/org/tests/model/lazywithid/Tune.java b/src/test/java/org/tests/model/lazywithid/Tune.java
new file mode 100644
index 000000000..4054db960
--- /dev/null
+++ b/src/test/java/org/tests/model/lazywithid/Tune.java
@@ -0,0 +1,29 @@
+package org.tests.model.lazywithid;
+
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+import io.ebean.common.BeanList;
+
+@Entity
+public class Tune {
+  @Id
+  @Column(name = "id")
+  public Long _id;
+
+  @OneToMany(cascade = CascadeType.ALL)
+  private List<Looney> loonies = new BeanList<>();
+
+  public List<Looney> getLoonies() {
+    return loonies;
+  }
+
+  public void setLoonies(final List<Looney> loonies) {
+    this.loonies = loonies;
+  }
+}

From 5b8ef8154ae024ca9c433404cee4589706393ec1 Mon Sep 17 00:00:00 2001
From: Mitsch164 <michi.dobler@yahoo.de>
Date: Thu, 12 Jul 2018 05:10:17 +0200
Subject: [PATCH 0376/1036] Fix Transaction Flushing when ID Property is Loaded
 (#1450)

* Fix for unintentianal flush when ID is loaded

* fix duplicateKey Exception

* higher id
---
 .../server/core/PersistRequestBean.java       | 10 ++-
 .../server/deploy/BeanDescriptor.java         |  4 +
 .../batchinsert/TestBatchInsertFlush.java     | 74 ++++++++++++++++++-
 3 files changed, 85 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index 4839790ec..d3a5c9bec 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -356,7 +356,15 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
 
   private boolean flushBatchOnGetter(int propertyIndex) {
     // propertyIndex of -1 the Id property, no flush for get Id on UPDATE
-    return propertyIndex == -1 ? type == Type.INSERT : beanDescriptor.isGeneratedProperty(propertyIndex);
+    if (propertyIndex == -1) {
+      if (beanDescriptor.isIdLoaded(intercept)) {
+        return false;
+      } else {
+        return type == Type.INSERT;
+      }
+    } else {
+      return beanDescriptor.isGeneratedProperty(propertyIndex);
+    }
   }
 
   public void setSkipBatchForTopLevel() {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 1df2c0d0e..05076b078 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -3160,6 +3160,10 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   public boolean hasIdPropertyOnly(EntityBeanIntercept ebi) {
     return ebi.hasIdOnly(idPropertyIndex);
   }
+  
+  public boolean isIdLoaded(EntityBeanIntercept ebi) {
+    return ebi.isLoadedProperty(idPropertyIndex);
+  }
 
   public boolean hasIdValue(EntityBean bean) {
     return (idProperty != null && !DmlUtil.isNullOrZero(idProperty.getValue(bean)));
diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
index 37998bfdc..8bc76c951 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
@@ -122,15 +122,20 @@ public class TestBatchInsertFlush extends BaseTestCase {
   public void transactional_flushOnGetId() {
 
     EbeanServer server = Ebean.getDefaultServer();
-
+    LoggedSqlCollector.start();
+    
     EBasicVer b1 = new EBasicVer("b1");
     server.save(b1);
 
     EBasicVer b2 = new EBasicVer("b2");
     server.save(b2);
 
+    //flush here
+    assertThat(LoggedSqlCollector.current()).isEmpty();
     Integer id = b1.getId();
     assertNotNull(id);
+    assertThat(LoggedSqlCollector.current()).hasSize(2);
+    
     EBasicVer b3 = new EBasicVer("b3");
     server.save(b3);
   }
@@ -141,7 +146,8 @@ public class TestBatchInsertFlush extends BaseTestCase {
     EbeanServer server = Ebean.getDefaultServer();
     Transaction txn = server.beginTransaction();
     try {
-      txn.setBatch(PersistBatch.ALL);
+      LoggedSqlCollector.start();
+      txn.setBatchMode(true);
 
       EBasicVer b1 = new EBasicVer("b1");
       server.save(b1, txn);
@@ -149,8 +155,11 @@ public class TestBatchInsertFlush extends BaseTestCase {
       EBasicVer b2 = new EBasicVer("b2");
       server.save(b2, txn);
 
+      //flush here
+      assertThat(LoggedSqlCollector.current()).isEmpty();
       Integer id = b1.getId();
       assertNotNull(id);
+      assertThat(LoggedSqlCollector.current()).hasSize(2);
 
       EBasicVer b3 = new EBasicVer("b3");
       server.save(b3, txn);
@@ -161,6 +170,67 @@ public class TestBatchInsertFlush extends BaseTestCase {
       txn.end();
     }
   }
+  
+  @Test
+  @Transactional(batch = PersistBatch.ALL)
+  public void transactional_noflushWhenIdIsLoaded() {
+
+    EbeanServer server = Ebean.getDefaultServer();
+      
+    LoggedSqlCollector.start();
+
+    EBasicVer b1 = new EBasicVer("b1");
+    b1.setId(78965);
+    server.save(b1);
+
+    EBasicVer b2 = new EBasicVer("b2");
+    b2.setId(78645);
+    server.save(b2);
+
+    assertThat(LoggedSqlCollector.current()).isEmpty();
+    // dont flush here
+    Integer id = b1.getId();
+    assertNotNull(id);
+    assertThat(LoggedSqlCollector.current()).isEmpty();
+    
+    EBasicVer b3 = new EBasicVer("b3");
+    server.save(b3);
+    
+  }
+
+  @Test
+  public void noflushWhenIdIsLoaded() {
+
+    EbeanServer server = Ebean.getDefaultServer();
+    Transaction txn = server.beginTransaction();
+    try {
+      LoggedSqlCollector.start();
+      txn.setBatchMode(true);
+
+      EBasicVer b1 = new EBasicVer("b1");
+      b1.setId(546864);
+      server.save(b1, txn);
+
+      EBasicVer b2 = new EBasicVer("b2");
+      b2.setId(21354);
+      server.save(b2, txn);
+
+      assertThat(LoggedSqlCollector.current()).isEmpty();
+      //dont flush here
+      Integer id = b1.getId();
+      assertNotNull(id);
+      assertThat(LoggedSqlCollector.current()).isEmpty();
+
+      EBasicVer b3 = new EBasicVer("b3");
+      server.save(b3, txn);
+
+      txn.commit();
+      assertThat(LoggedSqlCollector.current()).hasSize(3);
+
+    } finally {
+      txn.end();
+    }
+  }
 
   @Test
   public void testFlushOnGetProperty() {

From f13de2c8a6b62d8a2835edae559ac8a9f3f37f19 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Fri, 13 Jul 2018 19:57:56 +0200
Subject: [PATCH 0377/1036] ADD: Testcase for delete with cache

---
 .../org/tests/delete/TestDeleteByQuery.java   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/test/java/org/tests/delete/TestDeleteByQuery.java b/src/test/java/org/tests/delete/TestDeleteByQuery.java
index 47c1c7ff8..e19bdf821 100644
--- a/src/test/java/org/tests/delete/TestDeleteByQuery.java
+++ b/src/test/java/org/tests/delete/TestDeleteByQuery.java
@@ -9,6 +9,7 @@ import io.ebean.annotation.Platform;
 
 import org.tests.model.basic.BBookmarkUser;
 import org.tests.model.basic.Contact;
+import org.tests.model.basic.Country;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
 import org.ebeantest.LoggedSqlCollector;
@@ -170,4 +171,22 @@ public class TestDeleteByQuery extends BaseTestCase {
     Contact contactFind = Ebean.find(Contact.class, contact.getId());
     assertThat(contactFind).isNull();
   }
+
+  @Test
+  public void deleteByPredicateCached() {
+
+    Country country = new Country();
+    country.setCode("XX");
+    country.setName("SecretName");
+    Ebean.save(country);
+    Query<Country> query = Ebean.find(Country.class).where().eq("name", "SecretName").setUseQueryCache(true);
+
+    assertThat(query.findList()).hasSize(1);
+    assertThat(query.findCount()).isEqualTo(1);
+
+    Ebean.find(Country.class).where().eq("name", "SecretName").delete();
+    //Ebean.getDefaultServer().getPluginApi().getBeanType(Country.class).clearQueryCache();
+    assertThat(query.findList()).hasSize(0);
+    assertThat(query.findCount()).isEqualTo(0);
+  }
 }

From 93e603ca258e59c9fcc04e5274e02f7408473206 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 15 Jul 2018 13:49:05 +1200
Subject: [PATCH 0378/1036] #1449 Fix for failing lazy fetch when logical
 property name starts with underscore

---
 src/main/java/io/ebeaninternal/server/deploy/DeployParser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java b/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java
index 9d01766fa..75f0a3b1a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java
@@ -187,6 +187,6 @@ public abstract class DeployParser {
   }
 
   private boolean isWordStart(char ch) {
-    return Character.isLetter(ch);
+    return Character.isLetter(ch) || ch == UNDERSCORE;
   }
 }

From 0c41993ce760a1f239f892e18e85565f72c1b16c Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 15 Jul 2018 13:55:15 +1200
Subject: [PATCH 0379/1036] No effective change, whitespace

---
 src/test/java/org/tests/model/lazywithid/Tune.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/java/org/tests/model/lazywithid/Tune.java b/src/test/java/org/tests/model/lazywithid/Tune.java
index 4054db960..57f241c3a 100644
--- a/src/test/java/org/tests/model/lazywithid/Tune.java
+++ b/src/test/java/org/tests/model/lazywithid/Tune.java
@@ -12,6 +12,7 @@ import io.ebean.common.BeanList;
 
 @Entity
 public class Tune {
+
   @Id
   @Column(name = "id")
   public Long _id;

From 02b6ab0f74eb6e482b36be949bce2ac94b816872 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 15 Jul 2018 13:55:51 +1200
Subject: [PATCH 0380/1036] No effective change, move null check on orderBy to
 prior to parse

---
 .../server/query/CQueryOrderBy.java              | 16 +++++-----------
 .../server/query/CQueryPredicates.java           |  7 ++++++-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java b/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java
index 9898169d4..c325255ef 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java
@@ -2,7 +2,6 @@ package io.ebeaninternal.server.query;
 
 import io.ebean.OrderBy;
 import io.ebean.OrderBy.Property;
-import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssoc;
@@ -18,27 +17,22 @@ class CQueryOrderBy {
 
   private final BeanDescriptor<?> desc;
 
-  private final SpiQuery<?> query;
+  private final OrderBy<?> orderBy;
 
   /**
    * Create the logical order by clause.
    */
-  public static String parse(BeanDescriptor<?> desc, SpiQuery<?> query) {
-    return new CQueryOrderBy(desc, query).parseInternal();
+  public static String parse(BeanDescriptor<?> desc, OrderBy<?> orderBy) {
+    return new CQueryOrderBy(desc, orderBy).parseInternal();
   }
 
-  private CQueryOrderBy(BeanDescriptor<?> desc, SpiQuery<?> query) {
+  private CQueryOrderBy(BeanDescriptor<?> desc, OrderBy<?> orderBy) {
     this.desc = desc;
-    this.query = query;
+    this.orderBy = orderBy;
   }
 
   private String parseInternal() {
 
-    OrderBy<?> orderBy = query.getOrderBy();
-    if (orderBy == null) {
-      return null;
-    }
-
     StringBuilder sb = new StringBuilder();
 
     List<Property> properties = orderBy.getProperties();
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java b/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
index 5df1633c0..c41f830c6 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.query;
 
+import io.ebean.OrderBy;
 import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.SpiExpressionList;
 import io.ebeaninternal.api.SpiQuery;
@@ -329,7 +330,11 @@ public class CQueryPredicates {
 
   private String parseOrderBy() {
 
-    return CQueryOrderBy.parse(request.getBeanDescriptor(), query);
+    OrderBy<?> orderBy = query.getOrderBy();
+    if (orderBy == null) {
+      return null;
+    }
+    return CQueryOrderBy.parse(request.getBeanDescriptor(), orderBy);
   }
 
   /**

From 74c88ce5119e59cbe5d0a4810d9781a4aadf67d5 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 15 Jul 2018 14:13:29 +1200
Subject: [PATCH 0381/1036] #1452 Fix - Deleting a bean does not invalidate the
 bean cache (Regression from 11.18.1 - introduced by changes in #1427)

---
 .../io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index 3066e14b4..ee602ab74 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -739,6 +739,7 @@ final class BeanDescriptorCacheHelp<T> {
     if (invalidateQueryCache) {
      changeSet.addInvalidate(desc);
     } else {
+      queryCacheClear(changeSet);
       if (beanCache != null) {
         changeSet.addBeanRemoveMany(desc, ids);
       }

From b6d3dc35169068438d820eaf8a63c6b2da2dfaa2 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 15 Jul 2018 15:01:17 +1200
Subject: [PATCH 0382/1036] Fix test code only - Tune entity bean needs at
 least 1 non Id property

---
 src/test/java/org/tests/model/lazywithid/Tune.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/tests/model/lazywithid/Tune.java b/src/test/java/org/tests/model/lazywithid/Tune.java
index 57f241c3a..93c374d03 100644
--- a/src/test/java/org/tests/model/lazywithid/Tune.java
+++ b/src/test/java/org/tests/model/lazywithid/Tune.java
@@ -15,11 +15,21 @@ public class Tune {
 
   @Id
   @Column(name = "id")
-  public Long _id;
+  Long _id;
+
+  String name;
 
   @OneToMany(cascade = CascadeType.ALL)
   private List<Looney> loonies = new BeanList<>();
 
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
   public List<Looney> getLoonies() {
     return loonies;
   }

From d5551220678ceda565b7ea5592438760474b126c Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 15 Jul 2018 15:36:29 +1200
Subject: [PATCH 0383/1036] #1453 - @Formula property included in DDL when on
 @Inheritance bean and without @Transient

---
 .../dbmigration/model/visitor/VisitAllUsing.java     | 10 +++++-----
 src/test/java/org/tests/model/basic/Cat.java         | 12 ++++++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java b/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java
index 2ce73123a..2796dbd4e 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java
@@ -133,8 +133,7 @@ public class VisitAllUsing {
     InheritInfo inheritInfo = descriptor.getInheritInfo();
     if (inheritInfo != null && inheritInfo.isRoot()) {
       // add all properties on the children objects
-      InheritChildVisitor childVisitor = new InheritChildVisitor(this, pv);
-      inheritInfo.visitChildren(childVisitor);
+      inheritInfo.visitChildren(new InheritChildVisitor(this, pv));
     }
   }
 
@@ -155,9 +154,10 @@ public class VisitAllUsing {
 
     @Override
     public void visit(InheritInfo inheritInfo) {
-      BeanProperty[] propertiesLocal = inheritInfo.desc().propertiesLocal();
-      for (BeanProperty aPropertiesLocal : propertiesLocal) {
-        owner.visit(pv, aPropertiesLocal);
+      for (BeanProperty beanProperty : inheritInfo.desc().propertiesLocal()) {
+        if (beanProperty.isDDLColumn()) {
+          owner.visit(pv, beanProperty);
+        }
       }
     }
   }
diff --git a/src/test/java/org/tests/model/basic/Cat.java b/src/test/java/org/tests/model/basic/Cat.java
index a94316b64..d3df201b6 100644
--- a/src/test/java/org/tests/model/basic/Cat.java
+++ b/src/test/java/org/tests/model/basic/Cat.java
@@ -1,5 +1,7 @@
 package org.tests.model.basic;
 
+import io.ebean.annotation.Formula;
+
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;
 
@@ -9,6 +11,9 @@ public class Cat extends Animal {
 
   String name;
 
+  @Formula(select = "${ta}.species")
+  String catFormula;
+
   public String getName() {
     return name;
   }
@@ -17,4 +22,11 @@ public class Cat extends Animal {
     this.name = name;
   }
 
+  public String getCatFormula() {
+    return catFormula;
+  }
+
+  public void setCatFormula(String catFormula) {
+    this.catFormula = catFormula;
+  }
 }

From 11586fb635f41faf1b9a698f15d7903f38724b03 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 15 Jul 2018 16:09:00 +1200
Subject: [PATCH 0384/1036] [maven-release-plugin] prepare release
 ebean-11.18.5

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c85db8d1a..1b24f0acf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.18.5-SNAPSHOT</version>
+  <version>11.18.5</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.18.5</tag>
   </scm>
 
   <profiles>

From 5ef7fe850477a47bbf424c589c1461693086621c Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 15 Jul 2018 16:09:15 +1200
Subject: [PATCH 0385/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1b24f0acf..cdac953cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.18.5</version>
+  <version>11.18.6-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.18.5</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 5a6cdb9a86da28afabf708f021e352373325f104 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Wed, 18 Jul 2018 06:33:36 +0200
Subject: [PATCH 0386/1036] FIX: null handling in ScalarType.toBeanType (#1455)

---
 .../server/type/ScalarTypeChar.java           |  1 +
 .../server/type/ScalarTypeCharArray.java      |  1 +
 .../server/type/ScalarTypeDuration.java       |  1 +
 .../type/ScalarTypeDurationWithNanos.java     |  1 +
 .../server/type/ScalarTypeInstant.java        |  4 +-
 .../server/type/ScalarTypeLocalDateTime.java  |  4 +-
 .../server/type/ScalarTypeOffsetDateTime.java |  4 +-
 .../server/type/ScalarTypeYear.java           |  1 +
 .../server/type/ScalarTypeYearMonthDate.java  |  1 +
 .../server/type/ScalarTypeZonedDateTime.java  |  4 +-
 .../java/org/tests/types/TestNewTypes.java    | 93 ++++++++++++++++++-
 11 files changed, 104 insertions(+), 11 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java
index 5fd8a1c5d..bc43726ba 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java
@@ -51,6 +51,7 @@ public class ScalarTypeChar extends ScalarTypeBaseVarchar<Character> {
 
   @Override
   public Character toBeanType(Object value) {
+    if (value == null) return null;
     String s = BasicTypeConverter.toString(value);
     return s.charAt(0);
   }
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java
index f966a2ff9..da7789a37 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java
@@ -54,6 +54,7 @@ public class ScalarTypeCharArray extends ScalarTypeBaseVarchar<char[]> {
 
   @Override
   public char[] toBeanType(Object value) {
+    if (value == null) return null;
     String s = BasicTypeConverter.toString(value);
     return s.toCharArray();
   }
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java
index 778435676..93cca744c 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java
@@ -59,6 +59,7 @@ public class ScalarTypeDuration extends ScalarTypeBase<Duration> {
   @Override
   public Duration toBeanType(Object value) {
     if (value instanceof Duration) return (Duration) value;
+    if (value == null) return null;
     return Duration.ofSeconds(BasicTypeConverter.toLong(value));
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java
index 1961a5fb7..3289f4b64 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java
@@ -42,6 +42,7 @@ public class ScalarTypeDurationWithNanos extends ScalarTypeDuration {
   @Override
   public Duration toBeanType(Object value) {
     if (value instanceof Duration) return (Duration) value;
+    if (value == null) return null;
     return convertFromBigDecimal(BasicTypeConverter.toBigDecimal(value));
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java
index a5d7c0c2a..3b98929ce 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java
@@ -53,7 +53,7 @@ public class ScalarTypeInstant extends ScalarTypeBaseDateTime<Instant> {
 
   @Override
   public Instant toBeanType(Object value) {
-    if (value instanceof Instant) return (Instant) value;
-    return convertFromTimestamp((Timestamp) value);
+    if (value instanceof Timestamp) return convertFromTimestamp((Timestamp) value);
+    return (Instant) value;
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
index 46c38cdaa..05a6f1a2f 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
@@ -54,7 +54,7 @@ public class ScalarTypeLocalDateTime extends ScalarTypeBaseDateTime<LocalDateTim
 
   @Override
   public LocalDateTime toBeanType(Object value) {
-    if (value instanceof LocalDateTime) return (LocalDateTime) value;
-    return convertFromTimestamp((Timestamp) value);
+    if (value instanceof Timestamp) return convertFromTimestamp((Timestamp) value);
+    return (LocalDateTime) value;
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java
index f870e96f5..17a359a7a 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java
@@ -55,7 +55,7 @@ public class ScalarTypeOffsetDateTime extends ScalarTypeBaseDateTime<OffsetDateT
 
   @Override
   public OffsetDateTime toBeanType(Object value) {
-    if (value instanceof OffsetDateTime) return (OffsetDateTime) value;
-    return convertFromTimestamp((Timestamp) value);
+    if (value instanceof Timestamp) return convertFromTimestamp((Timestamp) value);
+    return (OffsetDateTime) value;
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java
index 19d84059e..0ebdba0a9 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java
@@ -65,6 +65,7 @@ public class ScalarTypeYear extends ScalarTypeBase<Year> {
   @Override
   public Year toBeanType(Object value) {
     if (value instanceof Year) return (Year) value;
+    if (value == null) return null;
     return Year.of(BasicTypeConverter.toInteger(value));
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java
index 0feff27e0..175fd6be9 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java
@@ -61,6 +61,7 @@ public class ScalarTypeYearMonthDate extends ScalarTypeBaseDate<YearMonth> {
   public YearMonth toBeanType(Object value) {
     if (value instanceof YearMonth) return (YearMonth) value;
     if (value instanceof LocalDate) return fromLocalDate((LocalDate) value);
+    if (value == null) return null;
     return fromLocalDate(BasicTypeConverter.toDate(value).toLocalDate());
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java
index 67f08f880..d580f563b 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java
@@ -55,7 +55,7 @@ public class ScalarTypeZonedDateTime extends ScalarTypeBaseDateTime<ZonedDateTim
 
   @Override
   public ZonedDateTime toBeanType(Object value) {
-    if (value instanceof ZonedDateTime) return (ZonedDateTime) value;
-    return convertFromTimestamp((Timestamp) value);
+    if (value instanceof Timestamp) return convertFromTimestamp((Timestamp) value);
+    return (ZonedDateTime) value;
   }
 }
diff --git a/src/test/java/org/tests/types/TestNewTypes.java b/src/test/java/org/tests/types/TestNewTypes.java
index 8248c8028..4f2f15981 100644
--- a/src/test/java/org/tests/types/TestNewTypes.java
+++ b/src/test/java/org/tests/types/TestNewTypes.java
@@ -2,6 +2,9 @@ package org.tests.types;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.plugin.BeanType;
+import io.ebean.plugin.ExpressionPath;
+
 import org.junit.Test;
 import org.tests.model.types.SomeNewTypesBean;
 
@@ -21,9 +24,7 @@ import java.time.ZonedDateTime;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 public class TestNewTypes extends BaseTestCase {
 
@@ -145,4 +146,90 @@ public class TestNewTypes extends BaseTestCase {
     assertNull(fetched.getPath());
     assertNull(fetched.getPeriod());
   }
+
+  @Test
+  public void testSetGetPathNonNull() throws Exception {
+    SomeNewTypesBean refBean = new SomeNewTypesBean();
+    refBean.setLocalDate(LocalDate.now());
+    refBean.setLocalDateTime(LocalDateTime.now());
+    refBean.setOffsetDateTime(OffsetDateTime.now());
+    refBean.setZonedDateTime(ZonedDateTime.now());
+    refBean.setInstant(Instant.now());
+    refBean.setYear(Year.now());
+    refBean.setMonth(Month.APRIL);
+    refBean.setDayOfWeek(DayOfWeek.WEDNESDAY);
+    refBean.setZoneId(ZoneId.systemDefault());
+    refBean.setZoneOffset(ZonedDateTime.now().getOffset());
+    refBean.setYearMonth(YearMonth.of(2014, 9));
+    refBean.setPath(Paths.get(TEMP_PATH));
+    refBean.setPeriod(Period.of(4,3,2));
+
+    testSetGetPath(refBean);
+  }
+
+  @Test
+  public void testSetGetPathNull() throws Exception {
+    SomeNewTypesBean refBean = new SomeNewTypesBean();
+    testSetGetPath(refBean);
+  }
+  private void testSetGetPath(SomeNewTypesBean refBean) {
+    SomeNewTypesBean testBean = new SomeNewTypesBean();
+    BeanType<SomeNewTypesBean> beanType = Ebean.getDefaultServer().getPluginApi().getBeanType(SomeNewTypesBean.class);
+    ExpressionPath localDate = beanType.getExpressionPath("localDate");
+    ExpressionPath localDateTime = beanType.getExpressionPath("localDateTime");
+    ExpressionPath offsetDateTime = beanType.getExpressionPath("offsetDateTime");
+    ExpressionPath zonedDateTime = beanType.getExpressionPath("zonedDateTime");
+    ExpressionPath instant = beanType.getExpressionPath("instant");
+    ExpressionPath year = beanType.getExpressionPath("year");
+    ExpressionPath month = beanType.getExpressionPath("month");
+    ExpressionPath dayOfWeek = beanType.getExpressionPath("dayOfWeek");
+    ExpressionPath zoneId = beanType.getExpressionPath("zoneId");
+    ExpressionPath zoneOffset = beanType.getExpressionPath("zoneOffset");
+    ExpressionPath yearMonth = beanType.getExpressionPath("yearMonth");
+    ExpressionPath path = beanType.getExpressionPath("path");
+    ExpressionPath period = beanType.getExpressionPath("period");
+
+    localDate.pathSet(testBean, refBean.getLocalDate());
+    assertThat(localDate.pathGet(testBean)).isEqualTo(refBean.getLocalDate());
+
+    localDateTime.pathSet(testBean, refBean.getLocalDateTime());
+    assertThat(localDateTime.pathGet(testBean)).isEqualTo(refBean.getLocalDateTime());
+
+    offsetDateTime.pathSet(testBean, refBean.getOffsetDateTime());
+    assertThat(offsetDateTime.pathGet(testBean)).isEqualTo(refBean.getOffsetDateTime());
+
+    zonedDateTime.pathSet(testBean, refBean.getZonedDateTime());
+    assertThat(zonedDateTime.pathGet(testBean)).isEqualTo(refBean.getZonedDateTime());
+
+    instant.pathSet(testBean, refBean.getInstant());
+    assertThat(instant.pathGet(testBean)).isEqualTo(refBean.getInstant());
+
+    year.pathSet(testBean, refBean.getYear());
+    assertThat(year.pathGet(testBean)).isEqualTo(refBean.getYear());
+
+    month.pathSet(testBean, refBean.getMonth());
+    assertThat(month.pathGet(testBean)).isEqualTo(refBean.getMonth());
+
+    dayOfWeek.pathSet(testBean, refBean.getDayOfWeek());
+    assertThat(dayOfWeek.pathGet(testBean)).isEqualTo(refBean.getDayOfWeek());
+
+    zoneId.pathSet(testBean, refBean.getZoneId());
+    assertThat(zoneId.pathGet(testBean)).isEqualTo(refBean.getZoneId());
+
+    zoneOffset.pathSet(testBean, refBean.getZoneOffset());
+    assertThat(zoneOffset.pathGet(testBean)).isEqualTo(refBean.getZoneOffset());
+
+    yearMonth.pathSet(testBean, refBean.getYearMonth());
+    assertThat(yearMonth.pathGet(testBean)).isEqualTo(refBean.getYearMonth());
+
+    path.pathSet(testBean, refBean.getPath());
+    assertThat(path.pathGet(testBean)).isEqualTo(refBean.getPath());
+
+    period.pathSet(testBean, refBean.getPeriod());
+    assertThat(period.pathGet(testBean)).isEqualTo(refBean.getPeriod());
+
+    Ebean.save(refBean);
+    Ebean.save(testBean);
+  }
+
 }

From fda930a162ff75dde91c83793b05a80022d244bb Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 18 Jul 2018 17:01:14 +1200
Subject: [PATCH 0387/1036] No effective change - fix javadoc title to Ebean 11

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index cdac953cf..436ba5dfc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -360,7 +360,7 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>2.9.1</version>
         <configuration>
-          <doctitle>Ebean 10</doctitle>
+          <doctitle>Ebean 11</doctitle>
           <overview>src/main/java/io/ebean/overview.html</overview>
           <source>1.8</source>
           <doclet>org.avaje.doclet.PygmentsDoclet</doclet>

From 2d44d06f36c97a80e9556bafc45662fecd18cff2 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 18 Jul 2018 19:36:41 +1200
Subject: [PATCH 0388/1036] #1456 - io.ebean.annotation.NotNull not honored by
 @ManyToOne property

---
 .../dbmigration/ddlgeneration/platform/PlatformDdl.java      | 3 +++
 .../server/deploy/parse/AnnotationAssocOnes.java             | 4 ++++
 src/test/java/misc/migration/v1_1/EBasic.java                | 1 -
 src/test/java/org/tests/merge/MContactMessage.java           | 5 ++++-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
index 8edd3b990..b2320c7b9 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -246,6 +246,9 @@ public class PlatformDdl {
    * Convert the standard type to the platform specific type.
    */
   public String convert(String type, boolean identity) {
+    if (type == null) {
+      return null;
+    }
     if (type.contains("[]")) {
       return convertArrayType(type);
     }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index 5f792e670..0c3606bd3 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -116,6 +116,10 @@ public class AnnotationAssocOnes extends AnnotationParser {
       prop.setFetchPreference(fetchPreference.value());
     }
 
+    io.ebean.annotation.NotNull nonNull = get(prop, io.ebean.annotation.NotNull.class);
+    if (nonNull != null) {
+      prop.setNullable(false);
+    }
     if (validationAnnotations) {
       NotNull notNull = get(prop, NotNull.class);
       if (notNull != null && isEbeanValidationGroups(notNull.groups())) {
diff --git a/src/test/java/misc/migration/v1_1/EBasic.java b/src/test/java/misc/migration/v1_1/EBasic.java
index 9fa379bdd..b2597d3f0 100644
--- a/src/test/java/misc/migration/v1_1/EBasic.java
+++ b/src/test/java/misc/migration/v1_1/EBasic.java
@@ -108,7 +108,6 @@ public class EBasic {
   @DbDefault("42")
   int newInteger;
 
-  @NotNull
   @ManyToOne
   @DbMigration(preAlter= "insert into migtest_e_user (id) select distinct user_id from migtest_e_basic") // ensure all users exist
   EUser user;
diff --git a/src/test/java/org/tests/merge/MContactMessage.java b/src/test/java/org/tests/merge/MContactMessage.java
index 95d22026f..a5f71b452 100644
--- a/src/test/java/org/tests/merge/MContactMessage.java
+++ b/src/test/java/org/tests/merge/MContactMessage.java
@@ -1,5 +1,7 @@
 package org.tests.merge;
 
+import io.ebean.annotation.NotNull;
+
 import javax.persistence.Entity;
 import javax.persistence.ManyToOne;
 
@@ -12,7 +14,8 @@ public class MContactMessage extends MBase {
 
   private String notes;
 
-  @ManyToOne(optional = false)
+  @NotNull
+  @ManyToOne
   private MContact contact;
 
   public MContactMessage(String title, String subject) {

From 01541bb20891bae1ad6299c83cd5aa367395c4fb Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 18 Jul 2018 21:29:08 +1200
Subject: [PATCH 0389/1036] #1457 - Issue with @ManyToOne with @EmbeddedId
 where only some columns are insertable or updatable

---
 .../server/deploy/BeanPropertyAssoc.java      | 30 +++++++++--
 .../server/deploy/id/ImportedIdEmbedded.java  | 21 ++++----
 .../server/deploy/id/ImportedIdSimple.java    | 26 ++++++++-
 .../server/persist/dml/DeleteHandler.java     |  5 ++
 .../persist/dml/GenerateDmlRequest.java       |  7 ++-
 .../server/persist/dml/InsertHandler.java     |  5 ++
 .../server/persist/dml/UpdateHandler.java     |  5 ++
 .../persist/dmlbind/BindableRequest.java      |  4 ++
 .../persist/dmlbind/FactoryAssocOnes.java     |  4 +-
 .../org/tests/model/composite/CkeClient.java  | 48 +++++++++++++++++
 .../tests/model/composite/CkeClientKey.java   | 53 +++++++++++++++++++
 .../org/tests/model/composite/CkeUser.java    | 29 ++++++++++
 .../org/tests/model/composite/CkeUserKey.java | 53 +++++++++++++++++++
 .../composite/TestCompositeKeyUserClient.java | 50 +++++++++++++++++
 14 files changed, 318 insertions(+), 22 deletions(-)
 create mode 100644 src/test/java/org/tests/model/composite/CkeClient.java
 create mode 100644 src/test/java/org/tests/model/composite/CkeClientKey.java
 create mode 100644 src/test/java/org/tests/model/composite/CkeUser.java
 create mode 100644 src/test/java/org/tests/model/composite/CkeUserKey.java
 create mode 100644 src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
index bb4fab41b..be940861b 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
@@ -357,14 +357,34 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
    * Return true if this association is updateable.
    */
   public boolean isUpdateable() {
-    return tableJoin.columns().length <= 0 || tableJoin.columns()[0].isUpdateable();
+    TableJoinColumn[] columns = tableJoin.columns();
+    if (columns.length <= 0) {
+      return true;
+    }
+    for (TableJoinColumn column : columns) {
+      if (column.isUpdateable()) {
+        // at least 1 is updatable
+        return true;
+      }
+    }
+    return false;
   }
 
   /**
    * Return true if this association is insertable.
    */
   public boolean isInsertable() {
-    return tableJoin.columns().length <= 0 || tableJoin.columns()[0].isInsertable();
+    TableJoinColumn[] columns = tableJoin.columns();
+    if (columns.length <= 0) {
+      return true;
+    }
+    for (TableJoinColumn column : columns) {
+      if (column.isInsertable()) {
+        // at least 1 is insertable
+        return true;
+      }
+    }
+    return false;
   }
 
   /**
@@ -443,16 +463,18 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
     String matchColumn = col.getForeignDbColumn();
     String localColumn = col.getLocalDbColumn();
     String localSqlFormula = col.getLocalSqlFormula();
+    boolean insertable = col.isInsertable();
+    boolean updateable = col.isUpdateable();
 
     for (int j = 0; j < props.length; j++) {
       if (props[j].getDbColumn().equalsIgnoreCase(matchColumn)) {
-        return new ImportedIdSimple(owner, localColumn, localSqlFormula, props[j], j);
+        return new ImportedIdSimple(owner, localColumn, localSqlFormula, props[j], j, insertable, updateable);
       }
     }
 
     for (int j = 0; j < others.length; j++) {
       if (others[j].getDbColumn().equalsIgnoreCase(matchColumn)) {
-        return new ImportedIdSimple(owner, localColumn, localSqlFormula, others[j], j + props.length);
+        return new ImportedIdSimple(owner, localColumn, localSqlFormula, others[j], j + props.length, insertable, updateable);
       }
     }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java
index 22c80dfc9..d22916da3 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java
@@ -64,8 +64,11 @@ public class ImportedIdEmbedded implements ImportedId {
   @Override
   public void dmlAppend(GenerateDmlRequest request) {
 
+    boolean update = request.isUpdate();
     for (ImportedIdSimple anImported : imported) {
-      request.appendColumn(anImported.localDbColumn);
+      if (anImported.isInclude(update)) {
+        request.appendColumn(anImported.localDbColumn);
+      }
     }
   }
 
@@ -100,30 +103,28 @@ public class ImportedIdEmbedded implements ImportedId {
   @Override
   public Object bind(BindableRequest request, EntityBean bean) throws SQLException {
 
-    Object embeddedId = null;
-
-    if (bean != null) {
-      embeddedId = foreignAssocOne.getValue(bean);
-    }
+    Object embeddedId = (bean == null) ? null : foreignAssocOne.getValue(bean);
 
+    boolean update = request.isUpdate();
     if (embeddedId == null) {
       for (ImportedIdSimple anImported : imported) {
-        if (anImported.owner.isUpdateable()) {
+        if (anImported.isInclude(update)) {
           request.bind(null, anImported.foreignProperty);
         }
       }
+      // return anything non-null to skip a derived relationship update
+      return Object.class;
 
     } else {
       EntityBean embedded = (EntityBean) embeddedId;
       for (ImportedIdSimple anImported : imported) {
-        if (anImported.owner.isUpdateable()) {
+        if (anImported.isInclude(update)) {
           Object scalarValue = anImported.foreignProperty.getValue(embedded);
           request.bind(scalarValue, anImported.foreignProperty);
         }
       }
+      return embedded;
     }
-    // hmmm, not worrying about this just yet
-    return null;
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
index e84b07e49..2ff4b60b1 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
@@ -47,15 +47,32 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
 
   protected final int position;
 
-  public ImportedIdSimple(BeanPropertyAssoc<?> owner, String localDbColumn, String localSqlFormula, BeanProperty foreignProperty, int position) {
+  /**
+   * If true include in insert.
+   */
+  private final boolean insertable;
+
+  /**
+   * If true include in update.
+   */
+  private final boolean updateable;
+
+  public ImportedIdSimple(BeanPropertyAssoc<?> owner, String localDbColumn, String localSqlFormula, BeanProperty foreignProperty, int position,
+                          boolean insertable, boolean updateable) {
     this.owner = owner;
     this.localDbColumn = InternString.intern(localDbColumn);
     this.localSqlFormula = InternString.intern(localSqlFormula);
     this.foreignProperty = foreignProperty;
     this.position = position;
+    this.insertable = insertable;
+    this.updateable = updateable;
     this.logicalName = InternString.intern(owner.getName() + "." + foreignProperty.getName());
   }
 
+  public ImportedIdSimple(BeanPropertyAssoc<?> owner, String localDbColumn, String localSqlFormula, BeanProperty foreignProperty, int position) {
+    this(owner, localDbColumn, localSqlFormula, foreignProperty, position, true, true);
+  }
+
   /**
    * Return the list as an array sorted into the same order as the Bean Properties.
    */
@@ -68,6 +85,13 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
     return importedIds;
   }
 
+  /**
+   * Return true if it should be included in the update (or insert).
+   */
+  public boolean isInclude(boolean update) {
+    return (update) ? updateable : insertable;
+  }
+
   @Override
   public boolean equals(Object obj) {
     // remove FindBugs warning
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java
index b092186b3..7dfc416e3 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java
@@ -19,6 +19,11 @@ public class DeleteHandler extends DmlHandler {
     this.meta = meta;
   }
 
+  @Override
+  public boolean isUpdate() {
+    return false;
+  }
+
   /**
    * Generate and bind the delete statement.
    */
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/GenerateDmlRequest.java b/src/main/java/io/ebeaninternal/server/persist/dml/GenerateDmlRequest.java
index 23e687ea1..fab4485c3 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/GenerateDmlRequest.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/GenerateDmlRequest.java
@@ -29,10 +29,6 @@ public class GenerateDmlRequest {
     return this;
   }
 
-  public void appendColumnIsNull(String column) {
-    appendColumn(column, IS_NULL);
-  }
-
   public void appendColumn(String column) {
     //String bind = (insertMode > 0) ? "?" : "=?";
     appendColumn(column, "?");
@@ -91,4 +87,7 @@ public class GenerateDmlRequest {
     this.prefix2 = ", ";
   }
 
+  public boolean isUpdate() {
+    return insertMode == 0;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
index babc0ab39..8e7246730 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
@@ -50,6 +50,11 @@ public class InsertHandler extends DmlHandler {
     this.concatinatedKey = meta.isConcatenatedKey();
   }
 
+  @Override
+  public boolean isUpdate() {
+    return false;
+  }
+
   /**
    * Generate and bind the insert statement.
    */
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java
index 2f1082046..772396618 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java
@@ -22,6 +22,11 @@ public class UpdateHandler extends DmlHandler {
     this.meta = meta;
   }
 
+  @Override
+  public boolean isUpdate() {
+    return true;
+  }
+
   /**
    * Generate and bind the update statement.
    */
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableRequest.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableRequest.java
index a3f497b4e..66a0abf2a 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableRequest.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableRequest.java
@@ -59,4 +59,8 @@ public interface BindableRequest {
    */
   long now();
 
+  /**
+   * Return true if this is an update request.
+   */
+  boolean isUpdate();
 }
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java
index 78b0c558d..bf3b0723d 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java
@@ -19,9 +19,7 @@ public class FactoryAssocOnes {
    */
   public void create(List<Bindable> list, BeanDescriptor<?> desc, DmlMode mode) {
 
-    BeanPropertyAssocOne<?>[] ones = desc.propertiesOneImported();
-
-    for (BeanPropertyAssocOne<?> one : ones) {
+    for (BeanPropertyAssocOne<?> one : desc.propertiesOneImported()) {
       if (!one.isImportedPrimaryKey()) {
         switch (mode) {
           case INSERT:
diff --git a/src/test/java/org/tests/model/composite/CkeClient.java b/src/test/java/org/tests/model/composite/CkeClient.java
new file mode 100644
index 000000000..59cd53edb
--- /dev/null
+++ b/src/test/java/org/tests/model/composite/CkeClient.java
@@ -0,0 +1,48 @@
+package org.tests.model.composite;
+
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
+import javax.persistence.ManyToOne;
+
+@Entity
+public class CkeClient {
+
+  @EmbeddedId
+  private CkeClientKey clientPK;
+
+  @JoinColumns({
+    @JoinColumn(name = "username", referencedColumnName = "username"),
+    @JoinColumn(name = "cod_cpny", referencedColumnName = "cod_cpny", insertable = false, updatable = false)
+    })
+  @ManyToOne(optional = false, fetch = FetchType.LAZY)
+  private CkeUser user;
+
+  private String notes;
+
+  public CkeUser getUser() {
+    return user;
+  }
+
+  public void setUser(CkeUser user) {
+    this.user = user;
+  }
+
+  public CkeClientKey getClientPK() {
+    return clientPK;
+  }
+
+  public void setClientPK(CkeClientKey clientPK) {
+    this.clientPK = clientPK;
+  }
+
+  public String getNotes() {
+    return notes;
+  }
+
+  public void setNotes(String notes) {
+    this.notes = notes;
+  }
+}
diff --git a/src/test/java/org/tests/model/composite/CkeClientKey.java b/src/test/java/org/tests/model/composite/CkeClientKey.java
new file mode 100644
index 000000000..c32bdb10f
--- /dev/null
+++ b/src/test/java/org/tests/model/composite/CkeClientKey.java
@@ -0,0 +1,53 @@
+package org.tests.model.composite;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+import java.util.Objects;
+
+@Embeddable
+public class CkeClientKey {
+
+  @Basic(optional = false)
+  @Column(name = "cod_cpny")
+  private int codCompany;
+
+  @Basic(optional = false)
+  @Column(name = "cod_client")
+  private String codClient;
+
+  public CkeClientKey(int codCompany, String codClient) {
+    this.codCompany = codCompany;
+    this.codClient = codClient;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    CkeClientKey that = (CkeClientKey) o;
+    return codCompany == that.codCompany &&
+      Objects.equals(codClient, that.codClient);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(codCompany, codClient);
+  }
+
+  public int getCodCompany() {
+    return codCompany;
+  }
+
+  public void setCodCompany(int codCompany) {
+    this.codCompany = codCompany;
+  }
+
+  public String getCodClient() {
+    return codClient;
+  }
+
+  public void setCodClient(String codClient) {
+    this.codClient = codClient;
+  }
+}
diff --git a/src/test/java/org/tests/model/composite/CkeUser.java b/src/test/java/org/tests/model/composite/CkeUser.java
new file mode 100644
index 000000000..1c9de8ccc
--- /dev/null
+++ b/src/test/java/org/tests/model/composite/CkeUser.java
@@ -0,0 +1,29 @@
+package org.tests.model.composite;
+
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+
+@Entity
+public class CkeUser {
+
+  @EmbeddedId
+  private CkeUserKey userPK;
+
+  private String name;
+
+  public CkeUserKey getUserPK() {
+    return userPK;
+  }
+
+  public void setUserPK(CkeUserKey userPK) {
+    this.userPK = userPK;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+}
diff --git a/src/test/java/org/tests/model/composite/CkeUserKey.java b/src/test/java/org/tests/model/composite/CkeUserKey.java
new file mode 100644
index 000000000..cb7655e19
--- /dev/null
+++ b/src/test/java/org/tests/model/composite/CkeUserKey.java
@@ -0,0 +1,53 @@
+package org.tests.model.composite;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+import java.util.Objects;
+
+@Embeddable
+public class CkeUserKey {
+
+  @Basic(optional = false)
+  @Column(name = "cod_cpny")
+  private int codCompany;
+
+  @Basic(optional = false)
+  @Column(name = "username")
+  private String username;
+
+  public CkeUserKey(int codCompany, String username) {
+    this.codCompany = codCompany;
+    this.username = username;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    CkeUserKey that = (CkeUserKey) o;
+    return codCompany == that.codCompany &&
+      Objects.equals(username, that.username);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(codCompany, username);
+  }
+
+  public int getCodCompany() {
+    return codCompany;
+  }
+
+  public void setCodCompany(int codCompany) {
+    this.codCompany = codCompany;
+  }
+
+  public String getUsername() {
+    return username;
+  }
+
+  public void setUsername(String username) {
+    this.username = username;
+  }
+}
diff --git a/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java b/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java
new file mode 100644
index 000000000..cf4d59e09
--- /dev/null
+++ b/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java
@@ -0,0 +1,50 @@
+package org.tests.model.composite;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestCompositeKeyUserClient extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    CkeUser user0 = new CkeUser();
+    user0.setUserPK(new CkeUserKey(20, "sally"));
+    user0.setName("sally");
+    Ebean.save(user0);
+
+    CkeUser user1 = new CkeUser();
+    user1.setUserPK(new CkeUserKey(20, "frank"));
+    user1.setName("hello");
+    Ebean.save(user1);
+
+    CkeClient client = new CkeClient();
+    client.setNotes("try it");
+    client.setClientPK(new CkeClientKey(20, "susan"));
+    client.setUser(user1);
+
+    LoggedSqlCollector.start();
+
+    Ebean.save(client);
+
+    client.setNotes("update it");
+    client.setUser(user0);
+
+    Ebean.save(client);
+
+    List<String> sql = LoggedSqlCollector.stop();
+
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("insert into cke_client (cod_cpny, cod_client, notes, username) values (?,?,?,?)");
+    assertThat(sql.get(1)).contains("update cke_client set notes=?, username=? where cod_cpny=? and cod_client=?");
+
+    Ebean.delete(client);
+
+  }
+}

From c8e32253a5a1c733efa883e45643455f1322e134 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Wed, 18 Jul 2018 11:41:46 +0200
Subject: [PATCH 0390/1036] FIX: support for ScalarTypeConverter and @Lob
 (#1454)

---
 .../server/deploy/parse/DeployUtil.java       | 27 +++---
 .../java/org/tests/types/EncryptedBinary.java | 36 ++++++++
 .../java/org/tests/types/EncryptedString.java | 41 +++++++++
 .../org/tests/types/PasswordStoreModel.java   | 83 +++++++++++++++++++
 .../ScalarTypeEncryptedBinaryConverter.java   | 23 +++++
 .../ScalarTypeEncryptedStringConverter.java   | 22 +++++
 .../org/tests/types/TestEncryptedString.java  | 48 +++++++++++
 7 files changed, 270 insertions(+), 10 deletions(-)
 create mode 100644 src/test/java/org/tests/types/EncryptedBinary.java
 create mode 100644 src/test/java/org/tests/types/EncryptedString.java
 create mode 100644 src/test/java/org/tests/types/PasswordStoreModel.java
 create mode 100644 src/test/java/org/tests/types/ScalarTypeEncryptedBinaryConverter.java
 create mode 100644 src/test/java/org/tests/types/ScalarTypeEncryptedStringConverter.java
 create mode 100644 src/test/java/org/tests/types/TestEncryptedString.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
index ccb44db9d..e740bf616 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
@@ -18,6 +18,7 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 import io.ebeaninternal.server.type.DataEncryptSupport;
 import io.ebeaninternal.server.type.ScalarType;
 import io.ebeaninternal.server.type.ScalarTypeArray;
+import io.ebeaninternal.server.type.ScalarTypeWrapper;
 import io.ebeaninternal.server.type.SimpleAesEncryptor;
 import io.ebeaninternal.server.type.TypeManager;
 import org.slf4j.Logger;
@@ -278,19 +279,25 @@ public class DeployUtil {
    */
   public void setLobType(DeployBeanProperty prop) {
 
-    // is String or byte[] ? used to determine if its a CLOB or BLOB
-    Class<?> type = prop.getPropertyType();
+    ScalarType<?> scalarType = prop.getScalarType();
 
-    // this also sets the lob flag on DeployBeanProperty
-    int lobType = isClobType(type) ? dbCLOBType : dbBLOBType;
+    if (scalarType instanceof ScalarTypeWrapper) {
+      int lobType = scalarType.getJdbcType() == Types.VARCHAR ? dbCLOBType : dbBLOBType;
+      prop.setDbType(lobType);
+    } else {
+      // is String or byte[] ? used to determine if its a CLOB or BLOB
+      Class<?> type = prop.getPropertyType();
+      // this also sets the lob flag on DeployBeanProperty
+      int lobType = isClobType(type) ? dbCLOBType : dbBLOBType;
 
-    ScalarType<?> scalarType = typeManager.getScalarType(type, lobType);
-    if (scalarType == null) {
-      // this should never occur actually
-      throw new RuntimeException("No ScalarType for LOB type [" + type + "] [" + lobType + "]");
+      scalarType = typeManager.getScalarType(type, lobType);
+      if (scalarType == null) {
+        // this should never occur actually
+        throw new RuntimeException("No ScalarType for LOB type [" + type + "] [" + lobType + "]");
+      }
+      prop.setDbType(lobType);
+      prop.setScalarType(scalarType);
     }
-    prop.setDbType(lobType);
-    prop.setScalarType(scalarType);
   }
 
   private boolean isClobType(Class<?> type) {
diff --git a/src/test/java/org/tests/types/EncryptedBinary.java b/src/test/java/org/tests/types/EncryptedBinary.java
new file mode 100644
index 000000000..c0db92544
--- /dev/null
+++ b/src/test/java/org/tests/types/EncryptedBinary.java
@@ -0,0 +1,36 @@
+package org.tests.types;
+
+/**
+ * Encrypted string.
+ *
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+public class EncryptedBinary {
+
+  private final byte[] encryptedData;
+
+  EncryptedBinary(byte[] encryptedData) {
+    this.encryptedData = encryptedData;
+  }
+
+  public byte[] getEncryptedData() {
+    return encryptedData;
+  }
+
+  public byte[] decrypt() {
+      return xor(encryptedData);
+  }
+
+  public static EncryptedBinary encrypt(final byte[] s) {
+      return new EncryptedBinary(xor(s));
+  }
+
+  private static  byte[] xor(byte[] s) {
+    byte[] ret = new byte[s.length];
+    for (int i = 0; i < s.length; i++) {
+        ret[i] = (byte) (s[i] ^ i);
+    }
+    return ret;
+  }
+}
diff --git a/src/test/java/org/tests/types/EncryptedString.java b/src/test/java/org/tests/types/EncryptedString.java
new file mode 100644
index 000000000..c2c0cd05e
--- /dev/null
+++ b/src/test/java/org/tests/types/EncryptedString.java
@@ -0,0 +1,41 @@
+package org.tests.types;
+
+/**
+ * Encrypted string.
+ *
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+public class EncryptedString {
+
+  private final String encryptedData;
+
+  EncryptedString(String encryptedData) {
+    this.encryptedData = encryptedData;
+  }
+
+  public String getEncryptedData() {
+    return encryptedData;
+  }
+
+  public String decrypt() {
+      return rot13(encryptedData);
+  }
+
+  public static EncryptedString encrypt(final String s) {
+      return new EncryptedString(rot13(s));
+  }
+
+  private static  String rot13(String s) {
+    StringBuilder sb = new StringBuilder();
+    for (int i = 0; i < s.length(); i++) {
+        char c = s.charAt(i);
+        if       (c >= 'a' && c <= 'm') c += 13;
+        else if  (c >= 'A' && c <= 'M') c += 13;
+        else if  (c >= 'n' && c <= 'z') c -= 13;
+        else if  (c >= 'N' && c <= 'Z') c -= 13;
+       sb.append(c);
+    }
+    return sb.toString();
+  }
+}
diff --git a/src/test/java/org/tests/types/PasswordStoreModel.java b/src/test/java/org/tests/types/PasswordStoreModel.java
new file mode 100644
index 000000000..07578ed6c
--- /dev/null
+++ b/src/test/java/org/tests/types/PasswordStoreModel.java
@@ -0,0 +1,83 @@
+package org.tests.types;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.validation.constraints.Size;
+
+import org.tests.model.BaseModel;
+
+@Entity
+public class PasswordStoreModel extends BaseModel {
+  private static final long serialVersionUID = 1L;
+  // PasswordStoreModel should have the following column definitions in DDL
+  // enc1 varchar(30),
+  // enc2 varchar(40),
+  // enc3 clob,
+  // enc4 varbinary(30),
+  // enc5 varbinary(40),
+  // enc6 blob,
+
+  @Size(max = 30)
+  private EncryptedString enc1;
+  @Column(length = 40)
+  private EncryptedString enc2;
+  @Lob
+  private EncryptedString enc3;
+
+  @Size(max = 30)
+  private EncryptedBinary enc4;
+  @Column(length = 40)
+  private EncryptedBinary enc5;
+  @Lob
+  private EncryptedBinary enc6;
+
+  public EncryptedString getEnc1() {
+    return enc1;
+  }
+
+  public void setEnc1(EncryptedString enc1) {
+    this.enc1 = enc1;
+  }
+
+  public EncryptedString getEnc2() {
+    return enc2;
+  }
+
+  public void setEnc2(EncryptedString enc2) {
+    this.enc2 = enc2;
+  }
+
+  public EncryptedString getEnc3() {
+    return enc3;
+  }
+
+  public void setEnc3(EncryptedString enc3) {
+    this.enc3 = enc3;
+  }
+
+  public EncryptedBinary getEnc4() {
+    return enc4;
+  }
+
+  public void setEnc4(EncryptedBinary enc4) {
+    this.enc4 = enc4;
+  }
+
+  public EncryptedBinary getEnc5() {
+    return enc5;
+  }
+
+  public void setEnc5(EncryptedBinary enc5) {
+    this.enc5 = enc5;
+  }
+
+  public EncryptedBinary getEnc6() {
+    return enc6;
+  }
+
+  public void setEnc6(EncryptedBinary enc6) {
+    this.enc6 = enc6;
+  }
+
+}
diff --git a/src/test/java/org/tests/types/ScalarTypeEncryptedBinaryConverter.java b/src/test/java/org/tests/types/ScalarTypeEncryptedBinaryConverter.java
new file mode 100644
index 000000000..18f86ae6e
--- /dev/null
+++ b/src/test/java/org/tests/types/ScalarTypeEncryptedBinaryConverter.java
@@ -0,0 +1,23 @@
+package org.tests.types;
+
+import io.ebean.config.ScalarTypeConverter;
+
+public class ScalarTypeEncryptedBinaryConverter implements ScalarTypeConverter<EncryptedBinary, byte[]> {
+
+
+  @Override
+  public EncryptedBinary getNullValue() {
+    return null;
+  }
+
+  @Override
+  public EncryptedBinary wrapValue(final byte[] scalarType) {
+    return new EncryptedBinary(scalarType);
+  }
+
+  @Override
+  public byte[] unwrapValue(final EncryptedBinary beanType) {
+    return beanType.getEncryptedData();
+  }
+
+}
diff --git a/src/test/java/org/tests/types/ScalarTypeEncryptedStringConverter.java b/src/test/java/org/tests/types/ScalarTypeEncryptedStringConverter.java
new file mode 100644
index 000000000..16f3deeed
--- /dev/null
+++ b/src/test/java/org/tests/types/ScalarTypeEncryptedStringConverter.java
@@ -0,0 +1,22 @@
+package org.tests.types;
+
+import io.ebean.config.ScalarTypeConverter;
+
+public class ScalarTypeEncryptedStringConverter implements ScalarTypeConverter<EncryptedString, String> {
+
+  @Override
+  public EncryptedString getNullValue() {
+    return null;
+  }
+
+  @Override
+  public EncryptedString wrapValue(final String scalarType) {
+    return new EncryptedString(scalarType);
+  }
+
+  @Override
+  public String unwrapValue(final EncryptedString beanType) {
+    return beanType.getEncryptedData();
+  }
+
+}
diff --git a/src/test/java/org/tests/types/TestEncryptedString.java b/src/test/java/org/tests/types/TestEncryptedString.java
new file mode 100644
index 000000000..d54642a20
--- /dev/null
+++ b/src/test/java/org/tests/types/TestEncryptedString.java
@@ -0,0 +1,48 @@
+package org.tests.types;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.*;
+
+import java.nio.charset.StandardCharsets;
+
+import org.junit.Test;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+
+public class TestEncryptedString extends BaseTestCase{
+
+  @Test
+  public void testName() throws Exception {
+    PasswordStoreModel model = new PasswordStoreModel();
+
+    model.setEnc1(EncryptedString.encrypt("Hello"));
+    model.setEnc2(EncryptedString.encrypt("World"));
+    model.setEnc3(EncryptedString.encrypt("Test"));
+
+    model.setEnc4(EncryptedBinary.encrypt("Hello".getBytes(StandardCharsets.UTF_8)));
+    model.setEnc5(EncryptedBinary.encrypt("World".getBytes(StandardCharsets.UTF_8)));
+    model.setEnc6(EncryptedBinary.encrypt("Test".getBytes(StandardCharsets.UTF_8)));
+
+
+    model.save();
+
+    model = Ebean.find(PasswordStoreModel.class, model.getId());
+
+    assertThat(model.getEnc1().getEncryptedData()).isNotEqualTo("Hello");
+    assertThat(model.getEnc2().getEncryptedData()).isNotEqualTo("World");
+    assertThat(model.getEnc3().getEncryptedData()).isNotEqualTo("Test");
+    assertThat(model.getEnc4().getEncryptedData()).isNotEqualTo("Hello".getBytes(StandardCharsets.UTF_8));
+    assertThat(model.getEnc5().getEncryptedData()).isNotEqualTo("World".getBytes(StandardCharsets.UTF_8));
+    assertThat(model.getEnc6().getEncryptedData()).isNotEqualTo("Test".getBytes(StandardCharsets.UTF_8));
+
+
+    assertThat(model.getEnc1().decrypt()).isEqualTo("Hello");
+    assertThat(model.getEnc2().decrypt()).isEqualTo("World");
+    assertThat(model.getEnc3().decrypt()).isEqualTo("Test");
+    assertThat(model.getEnc4().decrypt()).isEqualTo("Hello".getBytes(StandardCharsets.UTF_8));
+    assertThat(model.getEnc5().decrypt()).isEqualTo("World".getBytes(StandardCharsets.UTF_8));
+    assertThat(model.getEnc6().decrypt()).isEqualTo("Test".getBytes(StandardCharsets.UTF_8));
+
+  }
+}

From f0f7feb125b21a1c5831afdff4bee2b14f42d02a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 18 Jul 2018 21:49:19 +1200
Subject: [PATCH 0391/1036] No effective change - code format

---
 .../server/deploy/parse/DeployUtil.java          |  4 ++--
 .../org/tests/types/TestEncryptedString.java     | 16 +++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
index e740bf616..83ed5eb21 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
@@ -117,8 +117,8 @@ public class DeployUtil {
       throw new IllegalArgumentException("Class [" + enumType + "] is Not a Enum?");
     }
     try {
-	    Class<? extends Enum<?>> enumClass = (Class<? extends Enum<?>>) enumType;
-	    EnumType type = enumerated != null ? enumerated.value() : null;
+      Class<? extends Enum<?>> enumClass = (Class<? extends Enum<?>>) enumType;
+      EnumType type = enumerated != null ? enumerated.value() : null;
       ScalarType<?> scalarType = typeManager.createEnumScalarType(enumClass, type);
       prop.setScalarType(scalarType);
       prop.setDbType(scalarType.getJdbcType());
diff --git a/src/test/java/org/tests/types/TestEncryptedString.java b/src/test/java/org/tests/types/TestEncryptedString.java
index d54642a20..3f510b4b3 100644
--- a/src/test/java/org/tests/types/TestEncryptedString.java
+++ b/src/test/java/org/tests/types/TestEncryptedString.java
@@ -1,19 +1,17 @@
 package org.tests.types;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
-
-import java.nio.charset.StandardCharsets;
-
-import org.junit.Test;
-
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import org.junit.Test;
 
-public class TestEncryptedString extends BaseTestCase{
+import java.nio.charset.StandardCharsets;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestEncryptedString extends BaseTestCase {
 
   @Test
-  public void testName() throws Exception {
+  public void testName() {
     PasswordStoreModel model = new PasswordStoreModel();
 
     model.setEnc1(EncryptedString.encrypt("Hello"));

From cb0023345f1e35e6c54854c9a6daaa514a342e5c Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 18 Jul 2018 21:59:11 +1200
Subject: [PATCH 0392/1036] Refactor scalar types for Varchar, LongVarchar and
 Clob - ScalarTypeStringBase

---
 .../server/type/ScalarTypeClob.java           |  50 +--------
 .../server/type/ScalarTypeLongVarchar.java    |   5 -
 .../server/type/ScalarTypeString.java         |  92 +---------------
 .../server/type/ScalarTypeStringBase.java     | 101 ++++++++++++++++++
 4 files changed, 107 insertions(+), 141 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java

diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeClob.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeClob.java
index 5b10769f3..e7971e0c7 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeClob.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeClob.java
@@ -1,66 +1,24 @@
 package io.ebeaninternal.server.type;
 
-import io.ebeaninternal.server.core.BasicTypeConverter;
-
 import java.sql.SQLException;
 import java.sql.Types;
 
 /**
  * ScalarType for String.
  */
-public class ScalarTypeClob extends ScalarTypeBaseVarchar<String> {
+public class ScalarTypeClob extends ScalarTypeStringBase {
 
-  protected ScalarTypeClob(boolean jdbcNative, int jdbcType) {
-    super(String.class, jdbcNative, jdbcType);
+  ScalarTypeClob(boolean jdbcNative, int jdbcType) {
+    super(jdbcNative, jdbcType);
   }
 
   public ScalarTypeClob() {
-    super(String.class, true, Types.CLOB);
-  }
-
-  @Override
-  public String convertFromDbString(String dbValue) {
-    return dbValue;
-  }
-
-  @Override
-  public String convertToDbString(String beanValue) {
-    return beanValue;
-  }
-
-  @Override
-  public void bind(DataBind b, String value) throws SQLException {
-    if (value == null) {
-      b.setNull(Types.VARCHAR);
-    } else {
-      b.setString(value);
-    }
+    super(true, Types.CLOB);
   }
 
   @Override
   public String read(DataReader dataReader) throws SQLException {
-
     return dataReader.getStringFromStream();
   }
 
-  @Override
-  public Object toJdbcType(Object value) {
-    return BasicTypeConverter.toString(value);
-  }
-
-  @Override
-  public String toBeanType(Object value) {
-    return BasicTypeConverter.toString(value);
-  }
-
-  @Override
-  public String formatValue(String t) {
-    return t;
-  }
-
-  @Override
-  public String parse(String value) {
-    return value;
-  }
-
 }
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeLongVarchar.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLongVarchar.java
index e192a33e1..9bde5947f 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeLongVarchar.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLongVarchar.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.type;
 
-import java.sql.SQLException;
 import java.sql.Types;
 
 /**
@@ -12,8 +11,4 @@ public class ScalarTypeLongVarchar extends ScalarTypeClob {
     super(true, Types.LONGVARCHAR);
   }
 
-  @Override
-  public String read(DataReader dataReader) throws SQLException {
-    return dataReader.getStringFromStream();
-  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeString.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeString.java
index f9a31355c..3ee87d9d9 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeString.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeString.java
@@ -1,103 +1,15 @@
 package io.ebeaninternal.server.type;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import io.ebeaninternal.server.core.BasicTypeConverter;
-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.sql.SQLException;
 import java.sql.Types;
 
 /**
  * ScalarType for String.
  */
-public class ScalarTypeString extends ScalarTypeBase<String> {
+public class ScalarTypeString extends ScalarTypeStringBase {
 
   public static final ScalarTypeString INSTANCE = new ScalarTypeString();
 
   private ScalarTypeString() {
-    super(String.class, true, Types.VARCHAR);
-  }
-
-  @Override
-  public void bind(DataBind b, String value) throws SQLException {
-    if (value == null) {
-      b.setNull(Types.VARCHAR);
-    } else {
-      b.setString(value);
-    }
-  }
-
-  @Override
-  public String read(DataReader dataReader) throws SQLException {
-    return dataReader.getString();
-  }
-
-  @Override
-  public Object toJdbcType(Object value) {
-    return BasicTypeConverter.toString(value);
-  }
-
-  @Override
-  public String toBeanType(Object value) {
-    return BasicTypeConverter.toString(value);
-  }
-
-  @Override
-  public String formatValue(String value) {
-    return value;
-  }
-
-  @Override
-  public String parse(String value) {
-    return value;
-  }
-
-  @Override
-  public String convertFromMillis(long systemTimeMillis) {
-    return String.valueOf(systemTimeMillis);
-  }
-
-  @Override
-  public boolean isDateTimeCapable() {
-    return true;
-  }
-
-  @Override
-  public String readData(DataInput dataInput) throws IOException {
-    if (!dataInput.readBoolean()) {
-      return null;
-    } else {
-      return dataInput.readUTF();
-    }
-  }
-
-  @Override
-  public void writeData(DataOutput dataOutput, String value) throws IOException {
-
-    if (value == null) {
-      dataOutput.writeBoolean(false);
-    } else {
-      dataOutput.writeBoolean(true);
-      dataOutput.writeUTF(value);
-    }
-  }
-
-  @Override
-  public String jsonRead(JsonParser parser) throws IOException {
-    return parser.getValueAsString();
-  }
-
-  @Override
-  public void jsonWrite(JsonGenerator writer, String value) throws IOException {
-    writer.writeString(value);
-  }
-
-  @Override
-  public DocPropertyType getDocType() {
-    return DocPropertyType.TEXT;
+    super(true, Types.VARCHAR);
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
new file mode 100644
index 000000000..b19a9f874
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
@@ -0,0 +1,101 @@
+package io.ebeaninternal.server.type;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebeanservice.docstore.api.mapping.DocPropertyType;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.sql.SQLException;
+import java.sql.Types;
+
+/**
+ * Base ScalarType for String type using Varchar, Clob and LongVarchar.
+ */
+public abstract class ScalarTypeStringBase extends ScalarTypeBase<String> {
+
+  ScalarTypeStringBase(boolean jdbcNative, int jdbcType) {
+    super(String.class, jdbcNative, jdbcType);
+  }
+
+  @Override
+  public void bind(DataBind b, String value) throws SQLException {
+    if (value == null) {
+      b.setNull(Types.VARCHAR);
+    } else {
+      b.setString(value);
+    }
+  }
+
+  @Override
+  public String read(DataReader dataReader) throws SQLException {
+    return dataReader.getString();
+  }
+
+  @Override
+  public Object toJdbcType(Object value) {
+    return BasicTypeConverter.toString(value);
+  }
+
+  @Override
+  public String toBeanType(Object value) {
+    return BasicTypeConverter.toString(value);
+  }
+
+  @Override
+  public String formatValue(String value) {
+    return value;
+  }
+
+  @Override
+  public String parse(String value) {
+    return value;
+  }
+
+  @Override
+  public String convertFromMillis(long systemTimeMillis) {
+    return String.valueOf(systemTimeMillis);
+  }
+
+  @Override
+  public boolean isDateTimeCapable() {
+    return true;
+  }
+
+  @Override
+  public String readData(DataInput dataInput) throws IOException {
+    if (!dataInput.readBoolean()) {
+      return null;
+    } else {
+      return dataInput.readUTF();
+    }
+  }
+
+  @Override
+  public void writeData(DataOutput dataOutput, String value) throws IOException {
+
+    if (value == null) {
+      dataOutput.writeBoolean(false);
+    } else {
+      dataOutput.writeBoolean(true);
+      dataOutput.writeUTF(value);
+    }
+  }
+
+  @Override
+  public String jsonRead(JsonParser parser) throws IOException {
+    return parser.getValueAsString();
+  }
+
+  @Override
+  public void jsonWrite(JsonGenerator writer, String value) throws IOException {
+    writer.writeString(value);
+  }
+
+  @Override
+  public DocPropertyType getDocType() {
+    return DocPropertyType.TEXT;
+  }
+}

From eac68166d9fd99094655f444f88e3ed67cae0248 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 18 Jul 2018 22:04:48 +1200
Subject: [PATCH 0393/1036] [maven-release-plugin] prepare release
 ebean-11.18.6

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 436ba5dfc..ab51e51e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.18.6-SNAPSHOT</version>
+  <version>11.18.6</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.18.6</tag>
   </scm>
 
   <profiles>

From 7668fb11a91bbf9c21c846ed61b1f82bb1255bd7 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 18 Jul 2018 22:05:02 +1200
Subject: [PATCH 0394/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ab51e51e6..6fd0c19f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.18.6</version>
+  <version>11.18.7-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.18.6</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 7d38933e9dc8e0796d34e1d9d05cb10a0dd68fcb Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 18 Jul 2018 22:16:15 +1200
Subject: [PATCH 0395/1036] Refactor remove dead code - BindableRequest
 registerGeneratedVersion()

No effective change
---
 .../server/core/PersistRequestBean.java       |  2 +-
 .../server/persist/dml/DeleteHandler.java     |  2 +-
 .../server/persist/dml/DmlHandler.java        | 29 -------------------
 .../server/persist/dml/UpdateHandler.java     |  4 +--
 .../persist/dmlbind/BindableRequest.java      |  6 ----
 5 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index d3a5c9bec..dcee6530f 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -1202,7 +1202,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   /**
    * Set the value of the Version property on the bean.
    */
-  public void setVersionValue(Object versionValue) {
+  private void setVersionValue(Object versionValue) {
     version = beanDescriptor.setVersion(entityBean, versionValue);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java
index 7dfc416e3..a5f65f257 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java
@@ -14,7 +14,7 @@ public class DeleteHandler extends DmlHandler {
 
   private final DeleteMeta meta;
 
-  public DeleteHandler(PersistRequestBean<?> persist, DeleteMeta meta) {
+  DeleteHandler(PersistRequestBean<?> persist, DeleteMeta meta) {
     super(persist, meta.isEmptyStringAsNull());
     this.meta = meta;
   }
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
index a861385dc..a90e3198b 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
@@ -50,11 +50,6 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
 
   protected String sql;
 
-  /**
-   * The generated value for the @Version property. Must be set after where clause is bound.
-   */
-  protected Object versionValue;
-
   protected DmlHandler(PersistRequestBean<?> persistRequest, boolean emptyStringToNull) {
     this.now = System.currentTimeMillis();
     this.persistRequest = persistRequest;
@@ -231,30 +226,6 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
     prop.bind(dataBind, value);
   }
 
-  /**
-   * Register a generated value on a update. This can not be set to the bean
-   * until after the where clause has been bound for concurrency checking.
-   * <p>
-   * GeneratedProperty values are likely going to be used for optimistic
-   * concurrency checking. This includes 'counter' and 'update timestamp'
-   * generation.
-   * </p>
-   */
-  @Override
-  public void registerGeneratedVersion(Object versionValue) {
-    this.versionValue = versionValue;
-  }
-
-  /**
-   * Set any update generated values to the bean. Must be called after where
-   * clause has been bound.
-   */
-  public void setUpdateGenValues() {
-    if (versionValue != null) {
-      persistRequest.setVersionValue(versionValue);
-    }
-  }
-
   /**
    * Check with useGeneratedKeys to get appropriate PreparedStatement.
    */
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java
index 772396618..4d3a261b4 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java
@@ -17,7 +17,7 @@ public class UpdateHandler extends DmlHandler {
 
   private boolean emptySetClause;
 
-  public UpdateHandler(PersistRequestBean<?> persist, UpdateMeta meta) {
+  UpdateHandler(PersistRequestBean<?> persist, UpdateMeta meta) {
     super(persist, meta.isEmptyStringAsNull());
     this.meta = meta;
   }
@@ -55,8 +55,6 @@ public class UpdateHandler extends DmlHandler {
     if (persistRequest.isBatched()) {
       batchedPstmt.registerInputStreams(dataBind.getInputStreams());
     }
-    setUpdateGenValues();
-
     logSql(sql);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableRequest.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableRequest.java
index 66a0abf2a..4a1fc6754 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableRequest.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableRequest.java
@@ -42,12 +42,6 @@ public interface BindableRequest {
    */
   void bindNoLog(Object value, BeanProperty prop) throws SQLException;
 
-  /**
-   * Register the value from a update GeneratedValue. This can only be set to
-   * the bean property after the where clause has bean built.
-   */
-  void registerGeneratedVersion(Object value);
-
   /**
    * Return the original PersistRequest.
    */

From 5c99986476c101909da8836f987390340c09041f Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Wed, 18 Jul 2018 12:21:47 +0200
Subject: [PATCH 0396/1036] Migration with procedures (#1451)

DB Migration with helper stored procedures (for MySql and SQL Server)
---
 .../dbmigration/DefaultDbMigration.java       |  32 ++-
 .../ddlgeneration/platform/MySqlDdl.java      |  12 +-
 .../ddlgeneration/platform/SqlServerDdl.java  |  65 ++++---
 .../dbmigration/model/CurrentModel.java       |  17 ++
 .../build/ModelBuildPropertyVisitor.java      |   3 +-
 .../extraddl/model/DdlScript.java             |  16 +-
 .../extraddl/model/ExtraDdlXmlReader.java     |  16 +-
 .../dbmigration/builtin-extra-ddl.xml         | 162 ++++++++++++++++
 .../dbmigration/DbMigrationTest.java          |  17 +-
 .../platform/PlatformDdl_AlterColumnTest.java |   2 +-
 .../extraddl/model/ExtraDdlXmlReaderTest.java |   2 +-
 .../misc/migration/v1_0/CKeyParentId.java     |   1 -
 .../misc/migration/v1_1/CKeyParentId.java     |   1 -
 src/test/java/misc/migration/v1_1/EBasic.java |   6 +-
 .../java/misc/migration/v1_1/EHistory2.java   |  10 +-
 .../misc/migration/v1_2/CKeyParentId.java     |   1 -
 .../dbmigration/migrationtest/db2/1.1.sql     |   5 +-
 .../dbmigration/migrationtest/db2/1.3.sql     |   2 -
 .../migrationtest/db2/1.4__dropsFor_1.3.sql   |   2 +
 .../migrationtest/h2/1.0__initial.sql         |   2 +-
 .../dbmigration/migrationtest/h2/1.1.sql      |  10 +-
 .../dbmigration/migrationtest/h2/1.3.sql      |   2 -
 .../migrationtest/h2/1.4__dropsFor_1.3.sql    |   5 +-
 .../dbmigration/migrationtest/hsqldb/1.1.sql  |   5 +-
 .../dbmigration/migrationtest/hsqldb/1.3.sql  |   2 -
 .../hsqldb/1.4__dropsFor_1.3.sql              |   2 +
 .../model/1.0__initial.model.xml              |   2 +-
 .../migrationtest/model/1.1.model.xml         |   4 +-
 .../migrationtest/model/1.3.model.xml         |   2 +-
 .../model/1.4__dropsFor_1.3.model.xml         |   1 +
 .../migrationtest/mysql/1.0__initial.sql      |   2 +-
 .../dbmigration/migrationtest/mysql/1.1.sql   |  14 +-
 .../migrationtest/mysql/1.2__dropsFor_1.1.sql |  18 +-
 .../dbmigration/migrationtest/mysql/1.3.sql   |   5 +-
 .../migrationtest/mysql/1.4__dropsFor_1.3.sql |  37 ++--
 .../migrationtest/mysql/I__create_procs.sql   |  48 +++++
 .../migrationtest/oracle/1.0__initial.sql     |   2 +-
 .../dbmigration/migrationtest/oracle/1.1.sql  |   7 +-
 .../dbmigration/migrationtest/oracle/1.3.sql  |   2 -
 .../oracle/1.4__dropsFor_1.3.sql              |   2 +
 .../migrationtest/postgres/1.1.sql            |  12 +-
 .../postgres/1.2__dropsFor_1.1.sql            |   4 +-
 .../migrationtest/postgres/1.3.sql            |   6 +-
 .../postgres/1.4__dropsFor_1.3.sql            |   5 +-
 .../migrationtest/sqlite/1.0__initial.sql     |   2 +-
 .../dbmigration/migrationtest/sqlite/1.1.sql  |   7 +-
 .../dbmigration/migrationtest/sqlite/1.3.sql  |   2 -
 .../sqlite/1.4__dropsFor_1.3.sql              |   2 +
 .../migrationtest/sqlserver17/1.1.sql         |   5 +-
 .../sqlserver17/1.2__dropsFor_1.1.sql         |  65 +------
 .../migrationtest/sqlserver17/1.3.sql         |  23 +--
 .../sqlserver17/1.4__dropsFor_1.3.sql         | 183 ++----------------
 .../sqlserver17/I__create_procs.sql           | 107 ++++++++++
 53 files changed, 570 insertions(+), 399 deletions(-)
 create mode 100644 src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml
 create mode 100644 src/test/resources/dbmigration/migrationtest/mysql/I__create_procs.sql
 create mode 100644 src/test/resources/dbmigration/migrationtest/sqlserver17/I__create_procs.sql

diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index bc81db030..d420a459b 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -314,24 +314,28 @@ public class DefaultDbMigration implements DbMigration {
   private void generateExtraDdl(File migrationDir, DatabasePlatform dbPlatform) throws IOException {
 
     if (dbPlatform != null) {
-      ExtraDdl extraDdl = ExtraDdlXmlReader.read("/extra-ddl.xml");
-      if (extraDdl != null) {
-        List<DdlScript> ddlScript = extraDdl.getDdlScript();
-        for (DdlScript script : ddlScript) {
-          if (!script.isDrop() && ExtraDdlXmlReader.matchPlatform(dbPlatform.getName(), script.getPlatforms())) {
+      generateExtraDdl(migrationDir, dbPlatform, ExtraDdlXmlReader.readBuiltin());
+      generateExtraDdl(migrationDir, dbPlatform, ExtraDdlXmlReader.read());
+    }
+  }
+
+  private void generateExtraDdl(File migrationDir, DatabasePlatform dbPlatform, ExtraDdl extraDdl) throws IOException {
+    if (extraDdl != null) {
+      List<DdlScript> ddlScript = extraDdl.getDdlScript();
+      for (DdlScript script : ddlScript) {
+        if (!script.isDrop() && ExtraDdlXmlReader.matchPlatform(dbPlatform.getName(), script.getPlatforms())) {
             writeExtraDdl(migrationDir, script);
           }
         }
       }
     }
-  }
 
   /**
    * Write (or override) the "repeatable" migration script.
    */
   private void writeExtraDdl(File migrationDir, DdlScript script) throws IOException {
 
-    String fullName = repeatableMigrationName(script.getName());
+    String fullName = repeatableMigrationName(script.isInit(), script.getName());
 
     logger.info("writing repeatable script {}", fullName);
 
@@ -342,8 +346,18 @@ public class DefaultDbMigration implements DbMigration {
     }
   }
 
-  private String repeatableMigrationName(String scriptName) {
-    return "R__" + scriptName.replace(' ', '_') + migrationConfig.getApplySuffix();
+
+
+  private String repeatableMigrationName(boolean init, String scriptName) {
+    StringBuilder sb = new StringBuilder();
+    if (init) {
+      sb.append("I__");
+    } else {
+      sb.append("R__");
+    }
+    sb.append(scriptName.replace(' ', '_'));
+    sb.append(migrationConfig.getApplySuffix());
+    return sb.toString();
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
index dd6fc1ae8..4159bfb3d 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
@@ -38,6 +38,16 @@ public class MySqlDdl extends PlatformDdl {
     return "alter table " + tableName + " drop foreign key " + maxConstraintName(fkName);
   }
 
+  /**
+   * It is rather complex to delete a column on MySql as there must not exist any foreign keys.
+   * That's why we call a user stored procedure here
+   */
+  @Override
+  public void alterTableDropColumn(DdlBuffer buffer, String tableName, String columnName) throws IOException {
+
+    buffer.append("CALL usp_ebean_drop_column('").append(tableName).append("', '").append(columnName).append("')").endOfStatement();
+  }
+
   @Override
   public String alterTableDropConstraint(String tableName, String constraintName) {
     // drop constraint not supported in MySQL 5.7 and 8.0 but starting with MariaDB 10.2.1 CHECK is evaluated
@@ -61,7 +71,7 @@ public class MySqlDdl extends PlatformDdl {
   @Override
   public String alterColumnDefaultValue(String tableName, String columnName, String defaultValue) {
 
-    String suffix = DdlHelp.isDropDefault(defaultValue) ? columnDropDefault : columnSetDefault + " " + defaultValue;
+    String suffix = DdlHelp.isDropDefault(defaultValue) ? columnDropDefault : columnSetDefault + " " + convertDefaultValue(defaultValue);
 
     // use alter
     return "alter table " + tableName + " alter " + columnName + " " + suffix;
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
index a1e078355..0e8885645 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
@@ -3,7 +3,9 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 import io.ebean.annotation.ConstraintMode;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
 import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.server.persist.platform.MultiValueBind;
 
 import java.io.IOException;
 
@@ -137,13 +139,7 @@ public class SqlServerDdl extends PlatformDdl {
     // a rather complex statement.
     StringBuilder sb = new StringBuilder();
     if (DdlHelp.isDropDefault(defaultValue)) {
-      sb.append("delimiter $$\n");
-      sb.append("DECLARE @Tmp nvarchar(200);");
-      sb.append("select @Tmp = t1.name  from sys.default_constraints t1\n");
-      sb.append("  join sys.columns t2 on t1.object_id = t2.default_object_id\n");
-      sb.append("  where t1.parent_object_id = OBJECT_ID('").append(tableName)
-        .append("') and t2.name = '").append(columnName).append("';\n");
-      sb.append("if @Tmp is not null EXEC('alter table ").append(tableName).append(" drop constraint ' + @Tmp)$$");
+      sb.append("EXEC usp_ebean_drop_default_constraint ").append(tableName).append(", ").append(columnName);
     } else {
       sb.append("alter table ").append(tableName);
       sb.append(" add default ").append(convertDefaultValue(defaultValue)).append(" for ").append(columnName);
@@ -200,25 +196,50 @@ public class SqlServerDdl extends PlatformDdl {
 
   /**
    * It is rather complex to delete a column on SqlServer as there must not exist any references
-   * (constraints, default values, indices and foreign keys). The list is not yet complete, as
-   * indices over multiple columns will not yet deleted.
-   * (This may be changed to delete all refering objects by using the sys.* tables later)
+   * (constraints, default values, indices and foreign keys). That's why we call a user stored procedure here
    */
   @Override
   public void alterTableDropColumn(DdlBuffer buffer, String tableName, String columnName) throws IOException {
-    buffer.append("-- drop column ").append(tableName).append(".").append(columnName).endOfStatement();
 
-    buffer.append(alterTableDropUniqueConstraint(tableName, naming.uniqueConstraintName(tableName, columnName)));
-    buffer.endOfStatement();
-    buffer.append(alterColumnDefaultValue(tableName, columnName, DdlHelp.DROP_DEFAULT));
-    buffer.endOfStatement();
-    buffer.append(alterTableDropConstraint(tableName, naming.checkConstraintName(tableName, columnName)));
-    buffer.endOfStatement();
-    buffer.append(dropIndex(naming.indexName(tableName, columnName), tableName));
-    buffer.endOfStatement();
-    buffer.append(alterTableDropForeignKey(tableName, naming.foreignKeyConstraintName(tableName, columnName)));
-    buffer.endOfStatement();
-    super.alterTableDropColumn(buffer, tableName, columnName);
+    buffer.append("EXEC usp_ebean_drop_column ").append(tableName).append(", ").append(columnName).endOfStatement();
+  }
+
+  /**
+   * This writes the multi value datatypes needed for {@link MultiValueBind}
+   */
+  @Override
+  public void generateProlog(DdlWrite write) throws IOException {
+    super.generateProlog(write);
+
+    generateTVPDefinitions(write, "bigint");
+    generateTVPDefinitions(write, "float");
+    generateTVPDefinitions(write, "bit");
+    generateTVPDefinitions(write, "date");
+    generateTVPDefinitions(write, "time");
+    //generateTVPDefinitions(write, "datetime2");
+    generateTVPDefinitions(write, "uniqueidentifier");
+    generateTVPDefinitions(write, "nvarchar(max)");
+
+  }
+
+  private void generateTVPDefinitions(DdlWrite write, String definition) throws IOException {
+    int pos = definition.indexOf('(');
+    String name = pos == -1 ? definition : definition.substring(0, pos);
+
+    dropTVP(write.dropAll(), name);
+    //TVPs are included in "I__create_procs.sql"
+    //createTVP(write.apply(), name, definition);
+  }
+
+  private void dropTVP(DdlBuffer ddl, String name) throws IOException {
+    ddl.append("if exists (select name  from sys.types where name = 'ebean_").append(name)
+        .append("_tvp') drop type ebean_").append(name).append("_tvp").endOfStatement();
+  }
+
+  private void createTVP(DdlBuffer ddl, String name, String definition) throws IOException {
+    ddl.append("if not exists (select name  from sys.types where name = 'ebean_").append(name)
+    .append("_tvp') create type ebean_").append(name).append("_tvp as table (c1 ").append(definition).append(")")
+        .endOfStatement();
   }
 
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java b/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
index 14aba6833..8418cc8d0 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
@@ -9,8 +9,12 @@ import io.ebeaninternal.dbmigration.migration.ChangeSet;
 import io.ebeaninternal.dbmigration.model.build.ModelBuildBeanVisitor;
 import io.ebeaninternal.dbmigration.model.build.ModelBuildContext;
 import io.ebeaninternal.dbmigration.model.visitor.VisitAllUsing;
+import io.ebeaninternal.extraddl.model.DdlScript;
+import io.ebeaninternal.extraddl.model.ExtraDdl;
+import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader;
 
 import java.io.IOException;
+import java.util.List;
 
 /**
  * Reads EbeanServer bean descriptors to build the current model.
@@ -111,6 +115,19 @@ public class CurrentModel {
     if (header != null && !header.isEmpty()) {
       ddl.append(header).append('\n');
     }
+
+    ExtraDdl extraDdl = ExtraDdlXmlReader.readBuiltin();
+    if (extraDdl != null) {
+      List<DdlScript> ddlScript = extraDdl.getDdlScript();
+      for (DdlScript script : ddlScript) {
+        if (script.isInit() && ExtraDdlXmlReader.matchPlatform(server.getDatabasePlatform().getName(), script.getPlatforms())) {
+          ddl.append("-- init script " + script.getName()).append('\n');
+          ddl.append(script.getValue());
+        }
+      }
+    }
+
+
     ddl.append(write.apply().getBuffer());
     ddl.append(write.applyForeignKeys().getBuffer());
     ddl.append(write.applyHistoryView().getBuffer());
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
index c1ad11197..0c89d4a6d 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
@@ -258,12 +258,13 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
       }
     } else {
       col.setDefaultValue(p.getDbColumnDefault());
-      col.setDbMigrationInfos(p.getDbMigrationInfos());
       if (!p.isNullable() || p.isDDLNotNull()) {
         col.setNotnull(true);
       }
     }
 
+    col.setDbMigrationInfos(p.getDbMigrationInfos());
+
     if (p.isUnique() && !p.isId()) {
       col.setUnique(determineUniqueConstraintName(col.getName()));
       indexSetAdd(col.getName());
diff --git a/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java b/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java
index 3b0c945ec..53819461f 100644
--- a/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java
+++ b/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java
@@ -39,7 +39,8 @@ public class DdlScript {
   protected String platforms;
   @XmlAttribute(name = "drop")
   protected boolean drop;
-
+  @XmlAttribute(name = "init")
+  protected boolean init;
   /**
    * Gets the value of the value property.
    *
@@ -114,4 +115,17 @@ public class DdlScript {
     this.drop = drop;
   }
 
+  /**
+   * Return if this a init script.
+   */
+  public boolean isInit() {
+    return init;
+  }
+
+  /**
+   * Sets that this is a init script.
+   */
+  public void setInit(boolean init) {
+    this.init = init;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java b/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
index 1cb735073..541b725a3 100644
--- a/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
+++ b/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
@@ -83,10 +83,24 @@ public class ExtraDdlXmlReader {
     }
   }
 
+  /**
+   * Read the builtin extra ddl. (Stored procedures, tvp types etc)
+   */
+  public static ExtraDdl readBuiltin() {
+    return read("/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml");
+  }
+
+  /**
+   * Read the extra ddl.
+   */
+  public static ExtraDdl read() {
+    return read("/extra-ddl.xml");
+  }
+
   /**
    * Read and return a ExtraDdl from an xml document at the given resource path.
    */
-  public static ExtraDdl read(String resourcePath) {
+  private static ExtraDdl read(String resourcePath) {
 
     try (InputStream is = ExtraDdlXmlReader.class.getResourceAsStream(resourcePath)) {
       if (is == null) {
diff --git a/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml b/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml
new file mode 100644
index 000000000..1309cd7c7
--- /dev/null
+++ b/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<extra-ddl xmlns="http://ebean-orm.github.io/xml/ns/extraddl">
+
+<ddl-script name="create procs" platforms="sqlserver" init="true">-- Initial script to create stored procedures etc for sqlserver platform
+
+-- create table-value-parameters
+if not exists (select name  from sys.types where name = 'ebean_bigint_tvp') create type ebean_bigint_tvp as table (c1 bigint);
+if not exists (select name  from sys.types where name = 'ebean_float_tvp') create type ebean_float_tvp as table (c1 float);
+if not exists (select name  from sys.types where name = 'ebean_bit_tvp') create type ebean_bit_tvp as table (c1 bit);
+if not exists (select name  from sys.types where name = 'ebean_date_tvp') create type ebean_date_tvp as table (c1 date);
+if not exists (select name  from sys.types where name = 'ebean_time_tvp') create type ebean_time_tvp as table (c1 time);
+if not exists (select name  from sys.types where name = 'ebean_uniqueidentifier_tvp') create type ebean_uniqueidentifier_tvp as table (c1 uniqueidentifier);
+if not exists (select name  from sys.types where name = 'ebean_nvarchar_tvp') create type ebean_nvarchar_tvp as table (c1 nvarchar(max));
+
+delimiter $$
+-----------------------------------------------------------
+-- PROCEDURE: usp_ebean_drop_indices TABLE, COLUMN
+-- deletes all indices referring to TABLE.COLUMN
+-----------------------------------------------------------
+CREATE OR ALTER PROCEDURE usp_ebean_drop_indices @tableName nvarchar(255), @columnName nvarchar(255)
+AS SET NOCOUNT ON
+declare @sql nvarchar(1000)
+declare @indexName nvarchar(255)
+BEGIN
+  DECLARE index_cursor CURSOR FOR SELECT i.name from sys.indexes i 
+    join sys.index_columns ic on ic.object_id = i.object_id and ic.index_id = i.index_id
+    join sys.columns c on c.object_id = ic.object_id and c.column_id = ic.column_id
+    where i.object_id = OBJECT_ID(@tableName) AND c.name = @columnName;
+  OPEN index_cursor
+  FETCH NEXT FROM index_cursor INTO @indexName
+  WHILE @@FETCH_STATUS = 0
+    BEGIN
+      set @sql = 'drop index ' + @indexName + ' on ' + @tableName;
+      EXECUTE(@sql);
+
+      FETCH NEXT FROM index_cursor INTO @indexName
+    END;
+  CLOSE index_cursor;
+  DEALLOCATE index_cursor;
+END
+$$
+
+delimiter $$
+--------------------------------------------------------------------
+-- PROCEDURE: usp_ebean_drop_default_constraint TABLE, COLUMN
+-- deletes the default constraint, which has a random name
+--------------------------------------------------------------------
+CREATE OR ALTER PROCEDURE usp_ebean_drop_default_constraint @tableName nvarchar(255), @columnName nvarchar(255)
+AS SET NOCOUNT ON
+declare @tmp nvarchar(1000)
+BEGIN
+  select @Tmp = t1.name from sys.default_constraints t1
+    join sys.columns t2 on t1.object_id = t2.default_object_id
+    where t1.parent_object_id = OBJECT_ID(@tableName) and t2.name = @columnName;
+
+  if @Tmp is not null EXEC('alter table ' + @tableName +' drop constraint ' + @tmp);
+END
+$$
+
+delimiter $$
+--------------------------------------------------------------------
+-- PROCEDURE: usp_ebean_drop_constraints TABLE, COLUMN
+-- deletes constraints and foreign keys refering to TABLE.COLUMN
+--------------------------------------------------------------------
+CREATE OR ALTER PROCEDURE usp_ebean_drop_constraints @tableName nvarchar(255), @columnName nvarchar(255)
+AS SET NOCOUNT ON
+declare @sql nvarchar(1000)
+declare @constraintName nvarchar(255)
+BEGIN
+  DECLARE name_cursor CURSOR FOR 
+  SELECT cc.name from sys.check_constraints cc
+    join sys.columns c on c.object_id = cc.parent_object_id and c.column_id = cc.parent_column_id
+    where parent_object_id = OBJECT_ID(@tableName) AND c.name = @columnName
+  UNION SELECT fk.name from sys.foreign_keys fk
+    join sys.foreign_key_columns fkc on fkc.constraint_object_id = fk.object_id
+      and  fkc.parent_object_id = fk.parent_object_id
+    join sys.columns c on c.object_id = fkc.parent_object_id and c.column_id = fkc.parent_column_id
+    where fkc.parent_object_id = OBJECT_ID(@tableName) AND c.name = @columnName;
+
+  OPEN name_cursor
+  FETCH NEXT FROM name_cursor INTO @constraintName
+  WHILE @@FETCH_STATUS = 0
+    BEGIN
+      set @sql = 'alter table ' + @tableName + ' drop constraint ' + @constraintName;
+      EXECUTE(@sql);
+
+      FETCH NEXT FROM name_cursor INTO @constraintName
+    END;
+  CLOSE name_cursor;
+  DEALLOCATE name_cursor;
+END
+$$
+
+delimiter $$
+-------------------------------------------------------------------------------------
+-- PROCEDURE: usp_ebean_drop_column TABLE, COLUMN
+-- deletes the column annd ensures that all indices and constraints are dropped first
+-------------------------------------------------------------------------------------
+CREATE OR ALTER PROCEDURE usp_ebean_drop_column @tableName nvarchar(255), @columnName nvarchar(255)
+AS SET NOCOUNT ON
+declare @sql nvarchar(1000)
+BEGIN
+  EXEC usp_ebean_drop_indices @tableName, @columnName;
+  EXEC usp_ebean_drop_default_constraint @tableName, @columnName;
+  EXEC usp_ebean_drop_constraints @tableName, @columnName;
+
+  set @sql = 'alter table ' + @tableName + ' drop column ' + @columnName;
+  EXECUTE(@sql);
+END
+$$
+</ddl-script>
+
+<ddl-script name="create procs" platforms="mysql" init="true">-- Inital script to create stored procedures etc for mysql platform
+DROP PROCEDURE IF EXISTS usp_ebean_drop_foreign_keys;
+
+delimiter $$
+------------------------------------------------------------------------------
+-- PROCEDURE: usp_ebean_drop_foreign_keys TABLE, COLUMN
+-- deletes all constraints and foreign keys referring to TABLE.COLUMN
+------------------------------------------------------------------------------
+CREATE PROCEDURE usp_ebean_drop_foreign_keys(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
+BEGIN
+  DECLARE done INT DEFAULT FALSE;
+  DECLARE c_fk_name CHAR(255);
+  DECLARE curs CURSOR FOR SELECT CONSTRAINT_NAME from information_schema.KEY_COLUMN_USAGE 
+    WHERE TABLE_SCHEMA = DATABASE() and TABLE_NAME = p_table_name and COLUMN_NAME = p_column_name
+      AND REFERENCED_TABLE_NAME IS NOT NULL;
+  DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+
+  OPEN curs;
+  
+  read_loop: LOOP
+    FETCH curs INTO c_fk_name;
+    IF done THEN
+      LEAVE read_loop;
+    END IF;
+    SET @sql = CONCAT('ALTER TABLE ', p_table_name, ' DROP FOREIGN KEY ', c_fk_name);
+    PREPARE stmt FROM @sql;
+    EXECUTE stmt;
+  END LOOP;
+  
+  CLOSE curs;
+END
+$$
+
+DROP PROCEDURE IF EXISTS usp_ebean_drop_column;
+
+delimiter $$
+-------------------------------------------------------------------------------------
+-- PROCEDURE: usp_ebean_drop_column TABLE, COLUMN
+-- deletes the column and ensures that all indices and constraints are dropped first
+-------------------------------------------------------------------------------------
+CREATE PROCEDURE usp_ebean_drop_column(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
+BEGIN
+  CALL usp_ebean_drop_foreign_keys(p_table_name, p_column_name);
+  SET @sql = CONCAT('ALTER TABLE ', p_table_name, ' DROP COLUMN ', p_column_name);
+  PREPARE stmt FROM @sql;
+  EXECUTE stmt;
+END
+$$
+</ddl-script>
+</extra-ddl>
diff --git a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
index 4a50d6f34..218b2ced8 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
@@ -7,6 +7,7 @@ import io.ebean.SqlUpdate;
 import io.ebean.Transaction;
 import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.Platform;
+import io.ebean.migration.MigrationConfig;
 import io.ebean.migration.ddl.DdlRunner;
 import io.ebeaninternal.dbmigration.ddlgeneration.Helper;
 
@@ -16,7 +17,6 @@ import javax.persistence.PersistenceException;
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.sql.Timestamp;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -84,6 +84,9 @@ public class DbMigrationTest extends BaseTestCase {
         "migtest_oto_child",
         "migtest_oto_master");
 
+    if (isSqlServer() || isMySql()) {
+      runScript(false, "I__create_procs.sql");
+    }
 
     runScript(false, "1.0__initial.sql");
 
@@ -103,7 +106,6 @@ public class DbMigrationTest extends BaseTestCase {
       assertThat(server().execute(update)).isEqualTo(2);
     }
 
-
     createHistoryEntities();
 
     // Run migration
@@ -121,7 +123,7 @@ public class DbMigrationTest extends BaseTestCase {
 
     assertThat(row.getString("new_string_field")).isEqualTo("foo'bar");
     assertThat(row.getBoolean("new_boolean_field2")).isTrue();
-    assertThat(row.getTimestamp("some_date")).isEqualTo(new Timestamp(100, 0, 1, 0, 0, 0, 0)); // = 2000-01-01T00:00:00
+    //assertThat(row.getTimestamp("some_date")).isCloseTo(new Date(), 86_000); // allow 1 minute delta
 
     row = result.get(1);
     assertThat(row.getInteger("id")).isEqualTo(2);
@@ -130,15 +132,10 @@ public class DbMigrationTest extends BaseTestCase {
 
     assertThat(row.getString("new_string_field")).isEqualTo("foo'bar");
     assertThat(row.getBoolean("new_boolean_field2")).isTrue();
-    assertThat(row.getTimestamp("some_date")).isEqualTo(new Timestamp(100, 0, 1, 0, 0, 0, 0)); // = 2000-01-01T00:00:00
+    //assertThat(row.getTimestamp("some_date")).isCloseTo(new Date(), 60_000); // allow 1 minute delta
 
-    // Run migration & drops
-    if (isMySql()) {
-      return; // TODO: mysql cannot drop table (need stored procedure for drop column)
-    }
     runScript(false, "1.2__dropsFor_1.1.sql");
 
-
     // Oracle caches the statement and does not detect schema change. It fails with
     // an ORA-01007
     if (isOracle()) {
@@ -191,7 +188,7 @@ public class DbMigrationTest extends BaseTestCase {
     update = server().createSqlUpdate("update migtest_e_history5 set test_number = 45 where id = 1");
     assertThat(server().execute(update)).isEqualTo(1);
 
-    update = server().createSqlUpdate("insert into migtest_e_history6 (id, test_number2) values (1, 7)");
+    update = server().createSqlUpdate("insert into migtest_e_history6 (id, test_number1, test_number2) values (1, 2, 7)");
     assertThat(server().execute(update)).isEqualTo(1);
     update = server().createSqlUpdate("update migtest_e_history6 set test_number2 = 45 where id = 1");
     assertThat(server().execute(update)).isEqualTo(1);
diff --git a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
index 5cd6e6a1d..d19d4cc28 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
@@ -185,7 +185,7 @@ public class PlatformDdl_AlterColumnTest {
     assertEquals("alter table mytab alter acol drop default", sql);
 
     sql = sqlServerDdl.alterColumnDefaultValue("mytab", "acol", "DROP DEFAULT");
-    assertThat(sql).startsWith("delimiter $$").endsWith("$$");
+    assertEquals("EXEC usp_ebean_drop_default_constraint mytab, acol", sql);
   }
 
   @Test
diff --git a/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java b/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java
index 364fa32a9..b28b1fb2e 100644
--- a/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java
+++ b/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java
@@ -12,7 +12,7 @@ public class ExtraDdlXmlReaderTest {
   @Test
   public void read(){
 
-    ExtraDdl read = ExtraDdlXmlReader.read("/extra-ddl.xml");
+    ExtraDdl read = ExtraDdlXmlReader.read();
     assertNotNull(read);
   }
 
diff --git a/src/test/java/misc/migration/v1_0/CKeyParentId.java b/src/test/java/misc/migration/v1_0/CKeyParentId.java
index 2413977b5..d61d29e7d 100644
--- a/src/test/java/misc/migration/v1_0/CKeyParentId.java
+++ b/src/test/java/misc/migration/v1_0/CKeyParentId.java
@@ -6,7 +6,6 @@ import javax.validation.constraints.Size;
 @Embeddable
 public class CKeyParentId {
 
-  @Size(max=127)
   Integer oneKey;
 
   @Size(max=127)
diff --git a/src/test/java/misc/migration/v1_1/CKeyParentId.java b/src/test/java/misc/migration/v1_1/CKeyParentId.java
index dfc86560d..4d2723166 100644
--- a/src/test/java/misc/migration/v1_1/CKeyParentId.java
+++ b/src/test/java/misc/migration/v1_1/CKeyParentId.java
@@ -6,7 +6,6 @@ import javax.validation.constraints.Size;
 @Embeddable
 public class CKeyParentId {
 
-  @Size(max=127)
   Integer oneKey;
 
   @Size(max=127)
diff --git a/src/test/java/misc/migration/v1_1/EBasic.java b/src/test/java/misc/migration/v1_1/EBasic.java
index b2597d3f0..b46d426ad 100644
--- a/src/test/java/misc/migration/v1_1/EBasic.java
+++ b/src/test/java/misc/migration/v1_1/EBasic.java
@@ -62,8 +62,10 @@ public class EBasic {
   @Size(max=127)
   String description;
 
-  @NotNull
-  @DbDefault("2000-01-01T00:00:00")
+  //@NotNull
+  //@DbDefault("2000-01-01T00:00:00") //- date time literals do not work for each platform yet
+  //@DbDefault("now") //- now does not work for mariaDb
+  // MariaDb requires: ALTER TABLE `migtest_e_basic` CHANGE `some_date` `some_date` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP;
   Timestamp someDate;
 
   @NotNull
diff --git a/src/test/java/misc/migration/v1_1/EHistory2.java b/src/test/java/misc/migration/v1_1/EHistory2.java
index 54c2f3d68..7b05d9fe7 100644
--- a/src/test/java/misc/migration/v1_1/EHistory2.java
+++ b/src/test/java/misc/migration/v1_1/EHistory2.java
@@ -4,6 +4,7 @@ package misc.migration.v1_1;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.validation.constraints.Size;
 
 import io.ebean.annotation.DbDefault;
 import io.ebean.annotation.History;
@@ -14,18 +15,21 @@ import io.ebean.annotation.NotNull;
 @Table(name = "migtest_e_history2")
 @History
 public class EHistory2 {
-  
+
   @Id
   Integer id;
-  
+
   @NotNull
   @DbDefault("unknown")
   String testString;
 
   @HistoryExclude
   String testString2;
-  
+
   @NotNull
   @DbDefault("unknown")
   String testString3;
+
+  @Size(max = 20)
+  String newColumn;
 }
diff --git a/src/test/java/misc/migration/v1_2/CKeyParentId.java b/src/test/java/misc/migration/v1_2/CKeyParentId.java
index 4a7f30150..a2f42926b 100644
--- a/src/test/java/misc/migration/v1_2/CKeyParentId.java
+++ b/src/test/java/misc/migration/v1_2/CKeyParentId.java
@@ -6,7 +6,6 @@ import javax.validation.constraints.Size;
 @Embeddable
 public class CKeyParentId {
 
-  @Size(max=127)
   Integer oneKey;
 
   @Size(max=127)
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.1.sql b/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
index 685773be7..d36f007a2 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
@@ -39,10 +39,6 @@ alter table migtest_e_basic add constraint ck_mgtst__bsc_stts check ( status in
 -- rename all collisions;
 -- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__b_vs45xo unique  (description);
 
-update migtest_e_basic set some_date = '2000-01-01T00:00:00' where some_date is null;
-alter table migtest_e_basic alter column some_date set default '2000-01-01T00:00:00';
-alter table migtest_e_basic alter column some_date set not null;
-
 insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
 alter table migtest_e_basic add constraint fk_mgtst__bsc_sr_d foreign key (user_id) references migtest_e_user (id) on delete restrict;
 alter table migtest_e_basic alter column user_id set null;
@@ -72,6 +68,7 @@ alter table migtest_e_history2 alter column test_string set default 'unknown';
 alter table migtest_e_history2 alter column test_string set not null;
 alter table migtest_e_history2 add column test_string2 varchar(255);
 alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null;
+alter table migtest_e_history2 add column new_column varchar(20);
 
 alter table migtest_e_history4 alter column test_number bigint;
 alter table migtest_e_history5 add column test_boolean boolean default false not null;
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.3.sql b/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
index 13005cf1f..8bd92631d 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
@@ -19,8 +19,6 @@ alter table migtest_e_basic alter column status drop default;
 alter table migtest_e_basic alter column status set null;
 alter table migtest_e_basic add constraint ck_mgtst__bsc_stts check ( status in ('N','A','I'));
 alter table migtest_e_basic drop constraint uq_mgtst__b_vs45xo;
-alter table migtest_e_basic alter column some_date drop default;
-alter table migtest_e_basic alter column some_date set null;
 
 update migtest_e_basic set user_id = 23 where user_id is null;
 alter table migtest_e_basic drop constraint fk_mgtst__bsc_sr_d;
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql
index cf681d5d1..038f64f6a 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql
@@ -20,6 +20,8 @@ alter table migtest_e_history2 drop column test_string2;
 
 alter table migtest_e_history2 drop column test_string3;
 
+alter table migtest_e_history2 drop column new_column;
+
 alter table migtest_e_history5 drop column test_boolean;
 
 alter table migtest_e_softdelete drop column deleted;
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
index 63543a2d2..204b1f555 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
@@ -13,7 +13,7 @@ create table migtest_ckey_detail (
 );
 
 create table migtest_ckey_parent (
-  one_key                       integer(127) not null,
+  one_key                       integer not null,
   two_key                       varchar(127) not null,
   name                          varchar(255),
   version                       integer not null,
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.1.sql b/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
index c3e1a6313..9c8af60f4 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
@@ -23,7 +23,7 @@ create table migtest_mtm_m_migtest_mtm_c (
   constraint pk_migtest_mtm_m_migtest_mtm_c primary key (migtest_mtm_m_id,migtest_mtm_c_id)
 );
 
-alter table migtest_ckey_detail add column one_key integer(127);
+alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 
 alter table migtest_ckey_detail add constraint fk_migtest_ckey_detail_parent foreign key (one_key,two_key) references migtest_ckey_parent (one_key,two_key) on delete restrict on update restrict;
@@ -45,10 +45,6 @@ alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( sta
 -- rename all collisions;
 alter table migtest_e_basic add constraint uq_migtest_e_basic_description unique  (description);
 
-update migtest_e_basic set some_date = '2000-01-01T00:00:00' where some_date is null;
-alter table migtest_e_basic alter column some_date set default '2000-01-01T00:00:00';
-alter table migtest_e_basic alter column some_date set not null;
-
 insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict on update restrict;
 alter table migtest_e_basic alter column user_id set null;
@@ -78,8 +74,10 @@ alter table migtest_e_history2 alter column test_string set default 'unknown';
 alter table migtest_e_history2 alter column test_string set not null;
 alter table migtest_e_history2 add column test_string2 varchar(255);
 alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null;
+alter table migtest_e_history2 add column new_column varchar(20);
 alter table migtest_e_history2_history add column test_string2 varchar(255);
 alter table migtest_e_history2_history add column test_string3 varchar(255) default 'unknown';
+alter table migtest_e_history2_history add column new_column varchar(20);
 
 alter table migtest_e_history4 alter column test_number bigint;
 alter table migtest_e_history4_history alter column test_number bigint;
@@ -136,7 +134,7 @@ create view migtest_e_history4_with_history as select * from migtest_e_history4
 create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history;
 
 create trigger migtest_e_history_history_upd before update,delete on migtest_e_history for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
--- changes: [add test_string2, add test_string3]
+-- changes: [add test_string2, add test_string3, add new_column]
 drop trigger migtest_e_history2_history_upd;
 create trigger migtest_e_history2_history_upd before update,delete on migtest_e_history2 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
 -- changes: [exclude test_string]
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.3.sql b/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
index 0bf536155..2d5e03935 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
@@ -24,8 +24,6 @@ alter table migtest_e_basic alter column status drop default;
 alter table migtest_e_basic alter column status set null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I'));
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_description;
-alter table migtest_e_basic alter column some_date drop default;
-alter table migtest_e_basic alter column some_date set null;
 
 update migtest_e_basic set user_id = 23 where user_id is null;
 alter table migtest_e_basic drop constraint if exists fk_migtest_e_basic_user_id;
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql
index fd0fb772f..1776f5309 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql
@@ -32,6 +32,9 @@ alter table migtest_e_history2_history drop column test_string2;
 alter table migtest_e_history2 drop column test_string3;
 alter table migtest_e_history2_history drop column test_string3;
 
+alter table migtest_e_history2 drop column new_column;
+alter table migtest_e_history2_history drop column new_column;
+
 alter table migtest_e_history5 drop column test_boolean;
 alter table migtest_e_history5_history drop column test_boolean;
 
@@ -47,7 +50,7 @@ create view migtest_e_history2_with_history as select * from migtest_e_history2
 
 create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history;
 
--- changes: [drop test_string2, drop test_string3]
+-- changes: [drop test_string2, drop test_string3, drop new_column]
 drop trigger migtest_e_history2_history_upd;
 create trigger migtest_e_history2_history_upd before update,delete on migtest_e_history2 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
 -- changes: [drop test_boolean]
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
index 75e7798b7..102421264 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
@@ -39,10 +39,6 @@ alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( sta
 -- rename all collisions;
 alter table migtest_e_basic add constraint uq_migtest_e_basic_description unique  (description);
 
-update migtest_e_basic set some_date = '2000-01-01T00:00:00' where some_date is null;
-alter table migtest_e_basic alter column some_date set default '2000-01-01T00:00:00';
-alter table migtest_e_basic alter column some_date set not null;
-
 insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict on update restrict;
 alter table migtest_e_basic alter column user_id set null;
@@ -72,6 +68,7 @@ alter table migtest_e_history2 alter column test_string set default 'unknown';
 alter table migtest_e_history2 alter column test_string set not null;
 alter table migtest_e_history2 add column test_string2 varchar(255);
 alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null;
+alter table migtest_e_history2 add column new_column varchar(20);
 
 alter table migtest_e_history4 alter column test_number bigint;
 alter table migtest_e_history5 add column test_boolean boolean default false not null;
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
index 57f0c0341..1414c3818 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
@@ -19,8 +19,6 @@ alter table migtest_e_basic alter column status drop default;
 alter table migtest_e_basic alter column status set null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I'));
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_description;
-alter table migtest_e_basic alter column some_date drop default;
-alter table migtest_e_basic alter column some_date set null;
 
 update migtest_e_basic set user_id = 23 where user_id is null;
 alter table migtest_e_basic drop constraint if exists fk_migtest_e_basic_user_id;
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql
index 413f33e82..c613e4a5a 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql
@@ -20,6 +20,8 @@ alter table migtest_e_history2 drop column test_string2;
 
 alter table migtest_e_history2 drop column test_string3;
 
+alter table migtest_e_history2 drop column new_column;
+
 alter table migtest_e_history5 drop column test_boolean;
 
 alter table migtest_e_softdelete drop column deleted;
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
index 1d6458497..fa3defb9a 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
@@ -10,7 +10,7 @@
             <column name="something" type="varchar"/>
         </createTable>
         <createTable name="migtest_ckey_parent" pkName="pk_migtest_ckey_parent">
-            <column name="one_key" type="integer(127)" primaryKey="true"/>
+            <column name="one_key" type="integer" primaryKey="true"/>
             <column name="two_key" type="varchar(127)" primaryKey="true"/>
             <column name="name" type="varchar"/>
             <column name="version" type="integer" notnull="true"/>
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
index 3e5d0c1af..72f3ef7ab 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
@@ -2,7 +2,7 @@
 <migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
     <changeSet type="apply">
         <addColumn tableName="migtest_ckey_detail">
-            <column name="one_key" type="integer(127)"/>
+            <column name="one_key" type="integer"/>
             <column name="two_key" type="varchar(127)"/>
         </addColumn>
         <alterForeignKey name="fk_migtest_ckey_detail_parent" columnNames="one_key,two_key" refColumnNames="one_key,two_key" refTableName="migtest_ckey_parent" indexName="ix_migtest_ckey_detail_parent" tableName="migtest_ckey_detail"/>
@@ -17,7 +17,6 @@
         <alterColumn columnName="description" tableName="migtest_e_basic" unique="uq_migtest_e_basic_description">
             <before>-- rename all collisions</before>
         </alterColumn>
-        <alterColumn columnName="some_date" tableName="migtest_e_basic" currentType="timestamp" defaultValue="'2000-01-01T00:00:00'" notnull="true" currentNotnull="false"/>
         <alterColumn columnName="user_id" tableName="migtest_e_basic" currentType="integer" notnull="false" currentNotnull="true" references="migtest_e_user.id" foreignKeyName="fk_migtest_e_basic_user_id" foreignKeyIndex="ix_migtest_e_basic_user_id">
             <before>insert into migtest_e_user (id) select distinct user_id from migtest_e_basic</before>
         </alterColumn>
@@ -46,6 +45,7 @@
         <addColumn tableName="migtest_e_history2" withHistory="true">
             <column name="test_string2" type="varchar" historyExclude="true"/>
             <column name="test_string3" type="varchar" defaultValue="'unknown'" notnull="true"/>
+            <column name="new_column" type="varchar(20)"/>
         </addColumn>
         <alterColumn columnName="test_string" tableName="migtest_e_history3" withHistory="true" historyExclude="true"/>
         <alterColumn columnName="test_number" tableName="migtest_e_history4" withHistory="true" type="bigint" currentType="integer" currentNotnull="false"/>
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
index 5713508cc..02d4777ba 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
@@ -8,7 +8,6 @@
         <alterColumn columnName="one_id" tableName="migtest_fk_set_null" references="migtest_fk_one.id" foreignKeyName="fk_migtest_fk_set_null_one_id" foreignKeyIndex="ix_migtest_fk_set_null_one_id" foreignKeyOnDelete="SET_NULL" foreignKeyOnUpdate="RESTRICT" dropForeignKey="fk_migtest_fk_set_null_one_id" dropForeignKeyIndex="ix_migtest_fk_set_null_one_id"/>
         <alterColumn columnName="status" tableName="migtest_e_basic" currentType="varchar(1)" defaultValue="DROP DEFAULT" notnull="false" currentNotnull="true" checkConstraint="check ( status in ('N','A','I'))" checkConstraintName="ck_migtest_e_basic_status"/>
         <alterColumn columnName="description" tableName="migtest_e_basic" dropUnique="uq_migtest_e_basic_description"/>
-        <alterColumn columnName="some_date" tableName="migtest_e_basic" currentType="timestamp" defaultValue="DROP DEFAULT" notnull="false" currentNotnull="true"/>
         <alterColumn columnName="user_id" tableName="migtest_e_basic" currentType="integer" defaultValue="23" notnull="true" currentNotnull="false" dropForeignKey="fk_migtest_e_basic_user_id" dropForeignKeyIndex="ix_migtest_e_basic_user_id"/>
         <addColumn tableName="migtest_e_basic">
             <column name="old_boolean" type="boolean" defaultValue="false" notnull="true"/>
@@ -55,6 +54,7 @@
         <dropHistoryTable baseTable="migtest_e_history"/>
         <dropColumn columnName="test_string2" tableName="migtest_e_history2" withHistory="true"/>
         <dropColumn columnName="test_string3" tableName="migtest_e_history2" withHistory="true"/>
+        <dropColumn columnName="new_column" tableName="migtest_e_history2" withHistory="true"/>
         <dropColumn columnName="test_boolean" tableName="migtest_e_history5" withHistory="true"/>
         <dropColumn columnName="deleted" tableName="migtest_e_softdelete"/>
         <dropColumn columnName="master_id" tableName="migtest_oto_child"/>
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml
index d46dc6825..a1cc6616a 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml
@@ -12,6 +12,7 @@
         <dropHistoryTable baseTable="migtest_e_history"/>
         <dropColumn columnName="test_string2" tableName="migtest_e_history2" withHistory="true"/>
         <dropColumn columnName="test_string3" tableName="migtest_e_history2" withHistory="true"/>
+        <dropColumn columnName="new_column" tableName="migtest_e_history2" withHistory="true"/>
         <dropColumn columnName="test_boolean" tableName="migtest_e_history5" withHistory="true"/>
         <dropColumn columnName="deleted" tableName="migtest_e_softdelete"/>
         <dropColumn columnName="master_id" tableName="migtest_oto_child"/>
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
index 97cf5f7d2..ef52ebb7c 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
@@ -13,7 +13,7 @@ create table migtest_ckey_detail (
 );
 
 create table migtest_ckey_parent (
-  one_key                       integer(127) not null,
+  one_key                       integer not null,
   two_key                       varchar(127) not null,
   name                          varchar(255),
   version                       integer not null,
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
index 738778578..45ea3f4b6 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
@@ -23,7 +23,7 @@ create table migtest_mtm_m_migtest_mtm_c (
   constraint pk_migtest_mtm_m_migtest_mtm_c primary key (migtest_mtm_m_id,migtest_mtm_c_id)
 );
 
-alter table migtest_ckey_detail add column one_key integer(127);
+alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 
 alter table migtest_ckey_detail add constraint fk_migtest_ckey_detail_parent foreign key (one_key,two_key) references migtest_ckey_parent (one_key,two_key) on delete restrict on update restrict;
@@ -44,10 +44,6 @@ alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( sta
 -- rename all collisions;
 alter table migtest_e_basic add constraint uq_migtest_e_basic_description unique  (description);
 
-update migtest_e_basic set some_date = '2000-01-01T00:00:00' where some_date is null;
-alter table migtest_e_basic alter some_date set default '2000-01-01T00:00:00';
-alter table migtest_e_basic modify some_date datetime(6) not null;
-
 insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict on update restrict;
 alter table migtest_e_basic modify user_id integer;
@@ -75,8 +71,10 @@ alter table migtest_e_history2 alter test_string set default 'unknown';
 alter table migtest_e_history2 modify test_string varchar(255) not null;
 alter table migtest_e_history2 add column test_string2 varchar(255);
 alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null;
+alter table migtest_e_history2 add column new_column varchar(20);
 alter table migtest_e_history2_history add column test_string2 varchar(255);
 alter table migtest_e_history2_history add column test_string3 varchar(255) default 'unknown';
+alter table migtest_e_history2_history add column new_column varchar(20);
 
 alter table migtest_e_history4 modify test_number bigint;
 alter table migtest_e_history4_history modify test_number bigint;
@@ -142,17 +140,17 @@ create trigger migtest_e_history_history_del before delete on migtest_e_history
     insert into migtest_e_history_history (sys_period_start,sys_period_end,id, test_string) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string);
 end$$
 lock tables migtest_e_history2 write, migtest_e_history3 write, migtest_e_history4 write, migtest_e_history5 write;
--- changes: [add test_string2, add test_string3]
+-- changes: [add test_string2, add test_string3, add new_column]
 drop trigger migtest_e_history2_history_upd;
 drop trigger migtest_e_history2_history_del;
 delimiter $$
 create trigger migtest_e_history2_history_upd before update on migtest_e_history2 for each row begin
-    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, test_string3, obsolete_string1, obsolete_string2) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.test_string3, OLD.obsolete_string1, OLD.obsolete_string2);
+    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, test_string3, new_column, obsolete_string1, obsolete_string2) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.test_string3, OLD.new_column, OLD.obsolete_string1, OLD.obsolete_string2);
     set NEW.sys_period_start = now(6);
 end$$
 delimiter $$
 create trigger migtest_e_history2_history_del before delete on migtest_e_history2 for each row begin
-    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, test_string3, obsolete_string1, obsolete_string2) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.test_string3, OLD.obsolete_string1, OLD.obsolete_string2);
+    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, test_string3, new_column, obsolete_string1, obsolete_string2) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.test_string3, OLD.new_column, OLD.obsolete_string1, OLD.obsolete_string2);
 end$$
 -- changes: [exclude test_string]
 drop trigger migtest_e_history3_history_upd;
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.2__dropsFor_1.1.sql
index cab80c68a..a22adf90b 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.2__dropsFor_1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.2__dropsFor_1.1.sql
@@ -3,17 +3,17 @@
 drop view if exists migtest_e_history2_with_history;
 
 -- apply changes
-alter table migtest_e_basic drop column old_boolean;
+CALL usp_ebean_drop_column('migtest_e_basic', 'old_boolean');
 
-alter table migtest_e_basic drop column old_boolean2;
+CALL usp_ebean_drop_column('migtest_e_basic', 'old_boolean2');
 
-alter table migtest_e_basic drop column eref_id;
+CALL usp_ebean_drop_column('migtest_e_basic', 'eref_id');
 
-alter table migtest_e_history2 drop column obsolete_string1;
-alter table migtest_e_history2_history drop column obsolete_string1;
+CALL usp_ebean_drop_column('migtest_e_history2', 'obsolete_string1');
+CALL usp_ebean_drop_column('migtest_e_history2_history', 'obsolete_string1');
 
-alter table migtest_e_history2 drop column obsolete_string2;
-alter table migtest_e_history2_history drop column obsolete_string2;
+CALL usp_ebean_drop_column('migtest_e_history2', 'obsolete_string2');
+CALL usp_ebean_drop_column('migtest_e_history2_history', 'obsolete_string2');
 
 drop table if exists migtest_e_ref;
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
@@ -24,11 +24,11 @@ drop trigger migtest_e_history2_history_upd;
 drop trigger migtest_e_history2_history_del;
 delimiter $$
 create trigger migtest_e_history2_history_upd before update on migtest_e_history2 for each row begin
-    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, test_string3) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.test_string3);
+    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, test_string3, new_column) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.test_string3, OLD.new_column);
     set NEW.sys_period_start = now(6);
 end$$
 delimiter $$
 create trigger migtest_e_history2_history_del before delete on migtest_e_history2 for each row begin
-    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, test_string3) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.test_string3);
+    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, test_string3, new_column) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.test_string3, OLD.new_column);
 end$$
 unlock tables;
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
index 71cf77c91..7365a52ce 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
@@ -22,7 +22,6 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 alter table migtest_e_basic alter status drop default;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I'));
 alter table migtest_e_basic drop index uq_migtest_e_basic_description;
-alter table migtest_e_basic alter some_date drop default;
 
 update migtest_e_basic set user_id = 23 where user_id is null;
 alter table migtest_e_basic drop foreign key fk_migtest_e_basic_user_id;
@@ -73,12 +72,12 @@ drop trigger migtest_e_history2_history_upd;
 drop trigger migtest_e_history2_history_del;
 delimiter $$
 create trigger migtest_e_history2_history_upd before update on migtest_e_history2 for each row begin
-    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, obsolete_string2, test_string2, test_string3) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.obsolete_string2, OLD.test_string2, OLD.test_string3);
+    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, obsolete_string2, test_string2, test_string3, new_column) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.obsolete_string2, OLD.test_string2, OLD.test_string3, OLD.new_column);
     set NEW.sys_period_start = now(6);
 end$$
 delimiter $$
 create trigger migtest_e_history2_history_del before delete on migtest_e_history2 for each row begin
-    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, obsolete_string2, test_string2, test_string3) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.obsolete_string2, OLD.test_string2, OLD.test_string3);
+    insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, obsolete_string2, test_string2, test_string3, new_column) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.obsolete_string2, OLD.test_string2, OLD.test_string3, OLD.new_column);
 end$$
 -- changes: [include test_string]
 drop trigger migtest_e_history3_history_upd;
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql
index 548aec6b8..7d2ef6bec 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql
@@ -11,34 +11,37 @@ drop view if exists migtest_e_history2_with_history;
 drop view if exists migtest_e_history5_with_history;
 
 -- apply changes
-alter table migtest_ckey_detail drop column one_key;
+CALL usp_ebean_drop_column('migtest_ckey_detail', 'one_key');
 
-alter table migtest_ckey_detail drop column two_key;
+CALL usp_ebean_drop_column('migtest_ckey_detail', 'two_key');
 
-alter table migtest_ckey_parent drop column assoc_id;
+CALL usp_ebean_drop_column('migtest_ckey_parent', 'assoc_id');
 
-alter table migtest_e_basic drop column new_string_field;
+CALL usp_ebean_drop_column('migtest_e_basic', 'new_string_field');
 
-alter table migtest_e_basic drop column new_boolean_field;
+CALL usp_ebean_drop_column('migtest_e_basic', 'new_boolean_field');
 
-alter table migtest_e_basic drop column new_boolean_field2;
+CALL usp_ebean_drop_column('migtest_e_basic', 'new_boolean_field2');
 
-alter table migtest_e_basic drop column progress;
+CALL usp_ebean_drop_column('migtest_e_basic', 'progress');
 
-alter table migtest_e_basic drop column new_integer;
+CALL usp_ebean_drop_column('migtest_e_basic', 'new_integer');
 
-alter table migtest_e_history2 drop column test_string2;
-alter table migtest_e_history2_history drop column test_string2;
+CALL usp_ebean_drop_column('migtest_e_history2', 'test_string2');
+CALL usp_ebean_drop_column('migtest_e_history2_history', 'test_string2');
 
-alter table migtest_e_history2 drop column test_string3;
-alter table migtest_e_history2_history drop column test_string3;
+CALL usp_ebean_drop_column('migtest_e_history2', 'test_string3');
+CALL usp_ebean_drop_column('migtest_e_history2_history', 'test_string3');
 
-alter table migtest_e_history5 drop column test_boolean;
-alter table migtest_e_history5_history drop column test_boolean;
+CALL usp_ebean_drop_column('migtest_e_history2', 'new_column');
+CALL usp_ebean_drop_column('migtest_e_history2_history', 'new_column');
 
-alter table migtest_e_softdelete drop column deleted;
+CALL usp_ebean_drop_column('migtest_e_history5', 'test_boolean');
+CALL usp_ebean_drop_column('migtest_e_history5_history', 'test_boolean');
 
-alter table migtest_oto_child drop column master_id;
+CALL usp_ebean_drop_column('migtest_e_softdelete', 'deleted');
+
+CALL usp_ebean_drop_column('migtest_oto_child', 'master_id');
 
 drop table if exists migtest_e_user;
 drop table if exists migtest_mtm_c_migtest_mtm_m;
@@ -48,7 +51,7 @@ create view migtest_e_history2_with_history as select * from migtest_e_history2
 create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history;
 
 lock tables migtest_e_history2 write, migtest_e_history5 write;
--- changes: [drop test_string2, drop test_string3]
+-- changes: [drop test_string2, drop test_string3, drop new_column]
 drop trigger migtest_e_history2_history_upd;
 drop trigger migtest_e_history2_history_del;
 delimiter $$
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/I__create_procs.sql b/src/test/resources/dbmigration/migrationtest/mysql/I__create_procs.sql
new file mode 100644
index 000000000..581d9965a
--- /dev/null
+++ b/src/test/resources/dbmigration/migrationtest/mysql/I__create_procs.sql
@@ -0,0 +1,48 @@
+-- Inital script to create stored procedures etc for mysql platform
+DROP PROCEDURE IF EXISTS usp_ebean_drop_foreign_keys;
+
+delimiter $$
+------------------------------------------------------------------------------
+-- PROCEDURE: usp_ebean_drop_foreign_keys TABLE, COLUMN
+-- deletes all constraints and foreign keys referring to TABLE.COLUMN
+------------------------------------------------------------------------------
+CREATE PROCEDURE usp_ebean_drop_foreign_keys(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
+BEGIN
+  DECLARE done INT DEFAULT FALSE;
+  DECLARE c_fk_name CHAR(255);
+  DECLARE curs CURSOR FOR SELECT CONSTRAINT_NAME from information_schema.KEY_COLUMN_USAGE 
+    WHERE TABLE_SCHEMA = DATABASE() and TABLE_NAME = p_table_name and COLUMN_NAME = p_column_name
+      AND REFERENCED_TABLE_NAME IS NOT NULL;
+  DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+
+  OPEN curs;
+  
+  read_loop: LOOP
+    FETCH curs INTO c_fk_name;
+    IF done THEN
+      LEAVE read_loop;
+    END IF;
+    SET @sql = CONCAT('ALTER TABLE ', p_table_name, ' DROP FOREIGN KEY ', c_fk_name);
+    PREPARE stmt FROM @sql;
+    EXECUTE stmt;
+  END LOOP;
+  
+  CLOSE curs;
+END
+$$
+
+DROP PROCEDURE IF EXISTS usp_ebean_drop_column;
+
+delimiter $$
+-------------------------------------------------------------------------------------
+-- PROCEDURE: usp_ebean_drop_column TABLE, COLUMN
+-- deletes the column and ensures that all indices and constraints are dropped first
+-------------------------------------------------------------------------------------
+CREATE PROCEDURE usp_ebean_drop_column(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
+BEGIN
+  CALL usp_ebean_drop_foreign_keys(p_table_name, p_column_name);
+  SET @sql = CONCAT('ALTER TABLE ', p_table_name, ' DROP COLUMN ', p_column_name);
+  PREPARE stmt FROM @sql;
+  EXECUTE stmt;
+END
+$$
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
index e215dc485..c2f988553 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
@@ -15,7 +15,7 @@ create table migtest_ckey_detail (
 create sequence migtest_ckey_detail_seq;
 
 create table migtest_ckey_parent (
-  one_key                       number(127) not null,
+  one_key                       number(10) not null,
   two_key                       varchar2(127) not null,
   name                          varchar2(255),
   version                       number(10) not null,
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
index 9786d2401..9015ce54c 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
@@ -18,7 +18,7 @@ create table migtest_mtm_m_migtest_mtm_c (
   constraint pk_migtest_mtm_m_migtest_mtm_c primary key (migtest_mtm_m_id,migtest_mtm_c_id)
 );
 
-alter table migtest_ckey_detail add column one_key number(127);
+alter table migtest_ckey_detail add column one_key number(10);
 alter table migtest_ckey_detail add column two_key varchar2(127);
 
 alter table migtest_ckey_detail add constraint fk_migtest_ckey_detail_parent foreign key (one_key,two_key) references migtest_ckey_parent (one_key,two_key);
@@ -40,10 +40,6 @@ alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( sta
 -- rename all collisions;
 -- NOT YET IMPLEMENTED: alter table migtest_e_basic add constraint uq_migtest_e_basic_description unique  (description);
 
-update migtest_e_basic set some_date = '2000-01-01T00:00:00' where some_date is null;
-alter table migtest_e_basic modify some_date default '2000-01-01T00:00:00';
-alter table migtest_e_basic modify some_date not null;
-
 insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id);
 alter table migtest_e_basic modify user_id null;
@@ -73,6 +69,7 @@ alter table migtest_e_history2 modify test_string default 'unknown';
 alter table migtest_e_history2 modify test_string not null;
 alter table migtest_e_history2 add column test_string2 varchar2(255);
 alter table migtest_e_history2 add column test_string3 varchar2(255) default 'unknown' not null;
+alter table migtest_e_history2 add column new_column varchar2(20);
 
 alter table migtest_e_history4 modify test_number number(19);
 alter table migtest_e_history5 add column test_boolean number(1) default 0 not null;
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
index e4f5064cd..aa3ea6fc3 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
@@ -20,8 +20,6 @@ alter table migtest_e_basic modify status drop default;
 alter table migtest_e_basic modify status null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I'));
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_description;
-alter table migtest_e_basic modify some_date drop default;
-alter table migtest_e_basic modify some_date null;
 
 update migtest_e_basic set user_id = 23 where user_id is null;
 alter table migtest_e_basic drop constraint fk_migtest_e_basic_user_id;
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql
index b370f746a..52c81411a 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql
@@ -20,6 +20,8 @@ alter table migtest_e_history2 drop column test_string2;
 
 alter table migtest_e_history2 drop column test_string3;
 
+alter table migtest_e_history2 drop column new_column;
+
 alter table migtest_e_history5 drop column test_boolean;
 
 alter table migtest_e_softdelete drop column deleted;
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
index 80e049568..15a950efd 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
@@ -45,10 +45,6 @@ alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( sta
 -- rename all collisions;
 alter table migtest_e_basic add constraint uq_migtest_e_basic_description unique  (description);
 
-update migtest_e_basic set some_date = '2000-01-01T00:00:00' where some_date is null;
-alter table migtest_e_basic alter column some_date set default '2000-01-01T00:00:00';
-alter table migtest_e_basic alter column some_date set not null;
-
 insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict on update restrict;
 alter table migtest_e_basic alter column user_id drop not null;
@@ -80,8 +76,10 @@ alter table migtest_e_history2 alter column test_string set default 'unknown';
 alter table migtest_e_history2 alter column test_string set not null;
 alter table migtest_e_history2 add column test_string2 varchar(255);
 alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null;
+alter table migtest_e_history2 add column new_column varchar(20);
 alter table migtest_e_history2_history add column test_string2 varchar(255);
 alter table migtest_e_history2_history add column test_string3 varchar(255) default 'unknown';
+alter table migtest_e_history2_history add column new_column varchar(20);
 
 alter table migtest_e_history4 alter column test_number type bigint;
 alter table migtest_e_history4_history alter column test_number type bigint;
@@ -153,7 +151,7 @@ create trigger migtest_e_history_history_upd
   before update or delete on migtest_e_history
   for each row execute procedure migtest_e_history_history_version();
 
--- changes: [add test_string2, add test_string3]
+-- changes: [add test_string2, add test_string3, add new_column]
 create or replace function migtest_e_history2_history_version() returns trigger as $$
 declare
   lowerTs timestamptz;
@@ -162,11 +160,11 @@ begin
   lowerTs = lower(OLD.sys_period);
   upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into migtest_e_history2_history (sys_period,id, test_string, test_string3, obsolete_string1, obsolete_string2) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string, OLD.test_string3, OLD.obsolete_string1, OLD.obsolete_string2);
+    insert into migtest_e_history2_history (sys_period,id, test_string, test_string3, new_column, obsolete_string1, obsolete_string2) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string, OLD.test_string3, OLD.new_column, OLD.obsolete_string1, OLD.obsolete_string2);
     NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into migtest_e_history2_history (sys_period,id, test_string, test_string3, obsolete_string1, obsolete_string2) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string, OLD.test_string3, OLD.obsolete_string1, OLD.obsolete_string2);
+    insert into migtest_e_history2_history (sys_period,id, test_string, test_string3, new_column, obsolete_string1, obsolete_string2) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string, OLD.test_string3, OLD.new_column, OLD.obsolete_string1, OLD.obsolete_string2);
     return old;
   end if;
 end;
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql
index 83c88afd6..c9a6d03e6 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql
@@ -28,11 +28,11 @@ begin
   lowerTs = lower(OLD.sys_period);
   upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into migtest_e_history2_history (sys_period,id, test_string, test_string3) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string, OLD.test_string3);
+    insert into migtest_e_history2_history (sys_period,id, test_string, test_string3, new_column) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string, OLD.test_string3, OLD.new_column);
     NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into migtest_e_history2_history (sys_period,id, test_string, test_string3) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string, OLD.test_string3);
+    insert into migtest_e_history2_history (sys_period,id, test_string, test_string3, new_column) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string, OLD.test_string3, OLD.new_column);
     return old;
   end if;
 end;
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
index 406991599..4fd4074c8 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
@@ -24,8 +24,6 @@ alter table migtest_e_basic alter column status drop default;
 alter table migtest_e_basic alter column status drop not null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I'));
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_description;
-alter table migtest_e_basic alter column some_date drop default;
-alter table migtest_e_basic alter column some_date drop not null;
 
 update migtest_e_basic set user_id = 23 where user_id is null;
 alter table if exists migtest_e_basic drop constraint if exists fk_migtest_e_basic_user_id;
@@ -83,11 +81,11 @@ begin
   lowerTs = lower(OLD.sys_period);
   upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2, test_string2, test_string3) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string, OLD.obsolete_string2, OLD.test_string2, OLD.test_string3);
+    insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2, test_string2, test_string3, new_column) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string, OLD.obsolete_string2, OLD.test_string2, OLD.test_string3, OLD.new_column);
     NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2, test_string2, test_string3) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string, OLD.obsolete_string2, OLD.test_string2, OLD.test_string3);
+    insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2, test_string2, test_string3, new_column) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.test_string, OLD.obsolete_string2, OLD.test_string2, OLD.test_string3, OLD.new_column);
     return old;
   end if;
 end;
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql
index 6530a3b97..748ee959b 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql
@@ -33,6 +33,9 @@ alter table migtest_e_history2_history drop column test_string2;
 alter table migtest_e_history2 drop column test_string3;
 alter table migtest_e_history2_history drop column test_string3;
 
+alter table migtest_e_history2 drop column new_column;
+alter table migtest_e_history2_history drop column new_column;
+
 alter table migtest_e_history5 drop column test_boolean;
 alter table migtest_e_history5_history drop column test_boolean;
 
@@ -48,7 +51,7 @@ create view migtest_e_history2_with_history as select * from migtest_e_history2
 
 create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history;
 
--- changes: [drop test_string2, drop test_string3]
+-- changes: [drop test_string2, drop test_string3, drop new_column]
 create or replace function migtest_e_history2_history_version() returns trigger as $$
 declare
   lowerTs timestamptz;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
index 897032ac5..4f25fb26b 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
@@ -13,7 +13,7 @@ create table migtest_ckey_detail (
 );
 
 create table migtest_ckey_parent (
-  one_key                       integer(127) not null,
+  one_key                       integer not null,
   two_key                       varchar(127) not null,
   name                          varchar(255),
   version                       integer not null,
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
index 6c32de45d..f158133bf 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
@@ -21,7 +21,7 @@ create table migtest_mtm_m_migtest_mtm_c (
   foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict
 );
 
-alter table migtest_ckey_detail add column one_key integer(127);
+alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 
 alter table migtest_ckey_parent add column assoc_id integer;
@@ -38,10 +38,6 @@ alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( sta
 -- rename all collisions;
 alter table migtest_e_basic add constraint uq_migtest_e_basic_description unique  (description);
 
-update migtest_e_basic set some_date = '2000-01-01T00:00:00' where some_date is null;
-alter table migtest_e_basic alter column some_date set default '2000-01-01T00:00:00';
-alter table migtest_e_basic alter column some_date set not null;
-
 insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
 alter table migtest_e_basic alter column user_id set null;
 alter table migtest_e_basic add column new_string_field varchar(255) default 'foo''bar' not null;
@@ -68,6 +64,7 @@ alter table migtest_e_history2 alter column test_string set default 'unknown';
 alter table migtest_e_history2 alter column test_string set not null;
 alter table migtest_e_history2 add column test_string2 varchar(255);
 alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null;
+alter table migtest_e_history2 add column new_column varchar(20);
 
 alter table migtest_e_history4 alter column test_number integer;
 alter table migtest_e_history5 add column test_boolean int default 0 not null;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
index b8da78f83..b4e83b150 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
@@ -17,8 +17,6 @@ alter table migtest_e_basic alter column status drop default;
 alter table migtest_e_basic alter column status set null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I'));
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_description;
-alter table migtest_e_basic alter column some_date drop default;
-alter table migtest_e_basic alter column some_date set null;
 
 update migtest_e_basic set user_id = 23 where user_id is null;
 alter table migtest_e_basic drop constraint if exists fk_migtest_e_basic_user_id;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql
index cb6dfa7c1..24e4e93ba 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql
@@ -20,6 +20,8 @@ alter table migtest_e_history2 drop column test_string2;
 
 alter table migtest_e_history2 drop column test_string3;
 
+alter table migtest_e_history2 drop column new_column;
+
 alter table migtest_e_history5 drop column test_boolean;
 
 alter table migtest_e_softdelete drop column deleted;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql
index ad3a60c73..804342b64 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql
@@ -40,10 +40,6 @@ alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( sta
 -- rename all collisions;
 create unique nonclustered index uq_migtest_e_basic_description on migtest_e_basic(description) where description is not null;
 
-update migtest_e_basic set some_date = '2000-01-01T00:00:00' where some_date is null;
-alter table migtest_e_basic add default '2000-01-01T00:00:00' for some_date;
-alter table migtest_e_basic alter column some_date datetime2 not null;
-
 insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id);
 alter table migtest_e_basic alter column user_id integer;
@@ -73,6 +69,7 @@ alter table migtest_e_history2 add default 'unknown' for test_string;
 alter table migtest_e_history2 alter column test_string nvarchar(255) not null;
 alter table migtest_e_history2 add test_string2 nvarchar(255);
 alter table migtest_e_history2 add test_string3 nvarchar(255) default 'unknown' not null;
+alter table migtest_e_history2 add new_column nvarchar(20);
 
 alter table migtest_e_history4 alter column test_number numeric(19);
 alter table migtest_e_history5 add test_boolean bit default 0 not null;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.2__dropsFor_1.1.sql
index 981cfe94a..b34091486 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.2__dropsFor_1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.2__dropsFor_1.1.sql
@@ -1,69 +1,14 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
--- drop column migtest_e_basic.old_boolean;
-IF (OBJECT_ID('uq_migtest_e_basic_old_boolean', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_old_boolean;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_old_boolean') drop index uq_migtest_e_basic_old_boolean ON migtest_e_basic;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'old_boolean';
-if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_e_basic_old_boolean', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_old_boolean;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_old_boolean') drop index ix_migtest_e_basic_old_boolean ON migtest_e_basic;
-IF OBJECT_ID('fk_migtest_e_basic_old_boolean', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_old_boolean;
-alter table migtest_e_basic drop column old_boolean;
+EXEC usp_ebean_drop_column migtest_e_basic, old_boolean;
 
--- drop column migtest_e_basic.old_boolean2;
-IF (OBJECT_ID('uq_migtest_e_basic_old_boolean2', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_old_boolean2;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_old_boolean2') drop index uq_migtest_e_basic_old_boolean2 ON migtest_e_basic;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'old_boolean2';
-if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_e_basic_old_boolean2', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_old_boolean2;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_old_boolean2') drop index ix_migtest_e_basic_old_boolean2 ON migtest_e_basic;
-IF OBJECT_ID('fk_migtest_e_basic_old_boolean2', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_old_boolean2;
-alter table migtest_e_basic drop column old_boolean2;
+EXEC usp_ebean_drop_column migtest_e_basic, old_boolean2;
 
--- drop column migtest_e_basic.eref_id;
-IF (OBJECT_ID('uq_migtest_e_basic_eref_id', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_eref_id;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_eref_id') drop index uq_migtest_e_basic_eref_id ON migtest_e_basic;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'eref_id';
-if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_e_basic_eref_id', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_eref_id;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_eref_id') drop index ix_migtest_e_basic_eref_id ON migtest_e_basic;
-IF OBJECT_ID('fk_migtest_e_basic_eref_id', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_eref_id;
-alter table migtest_e_basic drop column eref_id;
+EXEC usp_ebean_drop_column migtest_e_basic, eref_id;
 
--- drop column migtest_e_history2.obsolete_string1;
-IF (OBJECT_ID('uq_migtest_e_history2_obsolete_string1', 'UQ') IS NOT NULL) alter table migtest_e_history2 drop constraint uq_migtest_e_history2_obsolete_string1;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history2','U') AND name = 'uq_migtest_e_history2_obsolete_string1') drop index uq_migtest_e_history2_obsolete_string1 ON migtest_e_history2;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_history2') and t2.name = 'obsolete_string1';
-if @Tmp is not null EXEC('alter table migtest_e_history2 drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_e_history2_obsolete_string1', 'C') IS NOT NULL) alter table migtest_e_history2 drop constraint ck_migtest_e_history2_obsolete_string1;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history2','U') AND name = 'ix_migtest_e_history2_obsolete_string1') drop index ix_migtest_e_history2_obsolete_string1 ON migtest_e_history2;
-IF OBJECT_ID('fk_migtest_e_history2_obsolete_string1', 'F') IS NOT NULL alter table migtest_e_history2 drop constraint fk_migtest_e_history2_obsolete_string1;
-alter table migtest_e_history2 drop column obsolete_string1;
+EXEC usp_ebean_drop_column migtest_e_history2, obsolete_string1;
 
--- drop column migtest_e_history2.obsolete_string2;
-IF (OBJECT_ID('uq_migtest_e_history2_obsolete_string2', 'UQ') IS NOT NULL) alter table migtest_e_history2 drop constraint uq_migtest_e_history2_obsolete_string2;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history2','U') AND name = 'uq_migtest_e_history2_obsolete_string2') drop index uq_migtest_e_history2_obsolete_string2 ON migtest_e_history2;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_history2') and t2.name = 'obsolete_string2';
-if @Tmp is not null EXEC('alter table migtest_e_history2 drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_e_history2_obsolete_string2', 'C') IS NOT NULL) alter table migtest_e_history2 drop constraint ck_migtest_e_history2_obsolete_string2;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history2','U') AND name = 'ix_migtest_e_history2_obsolete_string2') drop index ix_migtest_e_history2_obsolete_string2 ON migtest_e_history2;
-IF OBJECT_ID('fk_migtest_e_history2_obsolete_string2', 'F') IS NOT NULL alter table migtest_e_history2 drop constraint fk_migtest_e_history2_obsolete_string2;
-alter table migtest_e_history2 drop column obsolete_string2;
+EXEC usp_ebean_drop_column migtest_e_history2, obsolete_string2;
 
 IF OBJECT_ID('migtest_e_ref', 'U') IS NOT NULL drop table migtest_e_ref;
 IF OBJECT_ID('migtest_e_ref_seq', 'SO') IS NOT NULL drop sequence migtest_e_ref_seq;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql
index 473805780..57aa39278 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql
@@ -16,19 +16,10 @@ IF OBJECT_ID('fk_migtest_fk_none_via_join_one_id', 'F') IS NOT NULL alter table
 IF OBJECT_ID('fk_migtest_fk_set_null_one_id', 'F') IS NOT NULL alter table migtest_fk_set_null drop constraint fk_migtest_fk_set_null_one_id;
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
 IF (OBJECT_ID('ck_migtest_e_basic_status', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'status';
-if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
+EXEC usp_ebean_drop_default_constraint migtest_e_basic, status;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I'));
 IF (OBJECT_ID('uq_migtest_e_basic_description', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_description;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_description') drop index uq_migtest_e_basic_description ON migtest_e_basic;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'some_date';
-if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
 
 update migtest_e_basic set user_id = 23 where user_id is null;
 IF OBJECT_ID('fk_migtest_e_basic_user_id', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_user_id;
@@ -50,20 +41,12 @@ create unique nonclustered index uq_migtest_e_basic_indextest2 on migtest_e_basi
 create unique nonclustered index uq_migtest_e_basic_indextest6 on migtest_e_basic(indextest6) where indextest6 is not null;
 IF (OBJECT_ID('ck_migtest_e_enum_test_status', 'C') IS NOT NULL) alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status;
 alter table migtest_e_enum add constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I'));
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_history2') and t2.name = 'test_string';
-if @Tmp is not null EXEC('alter table migtest_e_history2 drop constraint ' + @Tmp)$$;
+EXEC usp_ebean_drop_default_constraint migtest_e_history2, test_string;
 alter table migtest_e_history2 add obsolete_string1 nvarchar(255);
 alter table migtest_e_history2 add obsolete_string2 nvarchar(255);
 
 alter table migtest_e_history4 alter column test_number integer;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_history6') and t2.name = 'test_number1';
-if @Tmp is not null EXEC('alter table migtest_e_history6 drop constraint ' + @Tmp)$$;
+EXEC usp_ebean_drop_default_constraint migtest_e_history6, test_number1;
 
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number2 = 7 where test_number2 is null;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.4__dropsFor_1.3.sql
index 96a6e677e..4cc7ad30b 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.4__dropsFor_1.3.sql
@@ -1,189 +1,40 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
--- drop column migtest_ckey_detail.one_key;
-IF (OBJECT_ID('uq_migtest_ckey_detail_one_key', 'UQ') IS NOT NULL) alter table migtest_ckey_detail drop constraint uq_migtest_ckey_detail_one_key;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_ckey_detail','U') AND name = 'uq_migtest_ckey_detail_one_key') drop index uq_migtest_ckey_detail_one_key ON migtest_ckey_detail;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_ckey_detail') and t2.name = 'one_key';
-if @Tmp is not null EXEC('alter table migtest_ckey_detail drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_ckey_detail_one_key', 'C') IS NOT NULL) alter table migtest_ckey_detail drop constraint ck_migtest_ckey_detail_one_key;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_ckey_detail','U') AND name = 'ix_migtest_ckey_detail_one_key') drop index ix_migtest_ckey_detail_one_key ON migtest_ckey_detail;
-IF OBJECT_ID('fk_migtest_ckey_detail_one_key', 'F') IS NOT NULL alter table migtest_ckey_detail drop constraint fk_migtest_ckey_detail_one_key;
-alter table migtest_ckey_detail drop column one_key;
+EXEC usp_ebean_drop_column migtest_ckey_detail, one_key;
 
--- drop column migtest_ckey_detail.two_key;
-IF (OBJECT_ID('uq_migtest_ckey_detail_two_key', 'UQ') IS NOT NULL) alter table migtest_ckey_detail drop constraint uq_migtest_ckey_detail_two_key;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_ckey_detail','U') AND name = 'uq_migtest_ckey_detail_two_key') drop index uq_migtest_ckey_detail_two_key ON migtest_ckey_detail;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_ckey_detail') and t2.name = 'two_key';
-if @Tmp is not null EXEC('alter table migtest_ckey_detail drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_ckey_detail_two_key', 'C') IS NOT NULL) alter table migtest_ckey_detail drop constraint ck_migtest_ckey_detail_two_key;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_ckey_detail','U') AND name = 'ix_migtest_ckey_detail_two_key') drop index ix_migtest_ckey_detail_two_key ON migtest_ckey_detail;
-IF OBJECT_ID('fk_migtest_ckey_detail_two_key', 'F') IS NOT NULL alter table migtest_ckey_detail drop constraint fk_migtest_ckey_detail_two_key;
-alter table migtest_ckey_detail drop column two_key;
+EXEC usp_ebean_drop_column migtest_ckey_detail, two_key;
 
--- drop column migtest_ckey_parent.assoc_id;
-IF (OBJECT_ID('uq_migtest_ckey_parent_assoc_id', 'UQ') IS NOT NULL) alter table migtest_ckey_parent drop constraint uq_migtest_ckey_parent_assoc_id;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_ckey_parent','U') AND name = 'uq_migtest_ckey_parent_assoc_id') drop index uq_migtest_ckey_parent_assoc_id ON migtest_ckey_parent;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_ckey_parent') and t2.name = 'assoc_id';
-if @Tmp is not null EXEC('alter table migtest_ckey_parent drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_ckey_parent_assoc_id', 'C') IS NOT NULL) alter table migtest_ckey_parent drop constraint ck_migtest_ckey_parent_assoc_id;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_ckey_parent','U') AND name = 'ix_migtest_ckey_parent_assoc_id') drop index ix_migtest_ckey_parent_assoc_id ON migtest_ckey_parent;
-IF OBJECT_ID('fk_migtest_ckey_parent_assoc_id', 'F') IS NOT NULL alter table migtest_ckey_parent drop constraint fk_migtest_ckey_parent_assoc_id;
-alter table migtest_ckey_parent drop column assoc_id;
+EXEC usp_ebean_drop_column migtest_ckey_parent, assoc_id;
 
--- drop column migtest_e_basic.new_string_field;
-IF (OBJECT_ID('uq_migtest_e_basic_new_string_field', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_new_string_field;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_new_string_field') drop index uq_migtest_e_basic_new_string_field ON migtest_e_basic;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'new_string_field';
-if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_e_basic_new_string_field', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_new_string_field;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_new_string_field') drop index ix_migtest_e_basic_new_string_field ON migtest_e_basic;
-IF OBJECT_ID('fk_migtest_e_basic_new_string_field', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_new_string_field;
-alter table migtest_e_basic drop column new_string_field;
+EXEC usp_ebean_drop_column migtest_e_basic, new_string_field;
 
--- drop column migtest_e_basic.new_boolean_field;
-IF (OBJECT_ID('uq_migtest_e_basic_new_boolean_field', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_new_boolean_field;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_new_boolean_field') drop index uq_migtest_e_basic_new_boolean_field ON migtest_e_basic;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'new_boolean_field';
-if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_e_basic_new_boolean_field', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_new_boolean_field;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_new_boolean_field') drop index ix_migtest_e_basic_new_boolean_field ON migtest_e_basic;
-IF OBJECT_ID('fk_migtest_e_basic_new_boolean_field', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_new_boolean_field;
-alter table migtest_e_basic drop column new_boolean_field;
+EXEC usp_ebean_drop_column migtest_e_basic, new_boolean_field;
 
--- drop column migtest_e_basic.new_boolean_field2;
-IF (OBJECT_ID('uq_migtest_e_basic_new_boolean_field2', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_new_boolean_field2;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_new_boolean_field2') drop index uq_migtest_e_basic_new_boolean_field2 ON migtest_e_basic;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'new_boolean_field2';
-if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_e_basic_new_boolean_field2', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_new_boolean_field2;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_new_boolean_field2') drop index ix_migtest_e_basic_new_boolean_field2 ON migtest_e_basic;
-IF OBJECT_ID('fk_migtest_e_basic_new_boolean_field2', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_new_boolean_field2;
-alter table migtest_e_basic drop column new_boolean_field2;
+EXEC usp_ebean_drop_column migtest_e_basic, new_boolean_field2;
 
--- drop column migtest_e_basic.progress;
-IF (OBJECT_ID('uq_migtest_e_basic_progress', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_progress;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_progress') drop index uq_migtest_e_basic_progress ON migtest_e_basic;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'progress';
-if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_e_basic_progress', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_progress;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_progress') drop index ix_migtest_e_basic_progress ON migtest_e_basic;
-IF OBJECT_ID('fk_migtest_e_basic_progress', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_progress;
-alter table migtest_e_basic drop column progress;
+EXEC usp_ebean_drop_column migtest_e_basic, progress;
 
--- drop column migtest_e_basic.new_integer;
-IF (OBJECT_ID('uq_migtest_e_basic_new_integer', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_new_integer;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_new_integer') drop index uq_migtest_e_basic_new_integer ON migtest_e_basic;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_basic') and t2.name = 'new_integer';
-if @Tmp is not null EXEC('alter table migtest_e_basic drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_e_basic_new_integer', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_new_integer;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_new_integer') drop index ix_migtest_e_basic_new_integer ON migtest_e_basic;
-IF OBJECT_ID('fk_migtest_e_basic_new_integer', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_new_integer;
-alter table migtest_e_basic drop column new_integer;
+EXEC usp_ebean_drop_column migtest_e_basic, new_integer;
 
--- drop column migtest_e_history2.test_string2;
-IF (OBJECT_ID('uq_migtest_e_history2_test_string2', 'UQ') IS NOT NULL) alter table migtest_e_history2 drop constraint uq_migtest_e_history2_test_string2;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history2','U') AND name = 'uq_migtest_e_history2_test_string2') drop index uq_migtest_e_history2_test_string2 ON migtest_e_history2;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_history2') and t2.name = 'test_string2';
-if @Tmp is not null EXEC('alter table migtest_e_history2 drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_e_history2_test_string2', 'C') IS NOT NULL) alter table migtest_e_history2 drop constraint ck_migtest_e_history2_test_string2;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history2','U') AND name = 'ix_migtest_e_history2_test_string2') drop index ix_migtest_e_history2_test_string2 ON migtest_e_history2;
-IF OBJECT_ID('fk_migtest_e_history2_test_string2', 'F') IS NOT NULL alter table migtest_e_history2 drop constraint fk_migtest_e_history2_test_string2;
-alter table migtest_e_history2 drop column test_string2;
+EXEC usp_ebean_drop_column migtest_e_history2, test_string2;
 
--- drop column migtest_e_history2.test_string3;
-IF (OBJECT_ID('uq_migtest_e_history2_test_string3', 'UQ') IS NOT NULL) alter table migtest_e_history2 drop constraint uq_migtest_e_history2_test_string3;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history2','U') AND name = 'uq_migtest_e_history2_test_string3') drop index uq_migtest_e_history2_test_string3 ON migtest_e_history2;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_history2') and t2.name = 'test_string3';
-if @Tmp is not null EXEC('alter table migtest_e_history2 drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_e_history2_test_string3', 'C') IS NOT NULL) alter table migtest_e_history2 drop constraint ck_migtest_e_history2_test_string3;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history2','U') AND name = 'ix_migtest_e_history2_test_string3') drop index ix_migtest_e_history2_test_string3 ON migtest_e_history2;
-IF OBJECT_ID('fk_migtest_e_history2_test_string3', 'F') IS NOT NULL alter table migtest_e_history2 drop constraint fk_migtest_e_history2_test_string3;
-alter table migtest_e_history2 drop column test_string3;
+EXEC usp_ebean_drop_column migtest_e_history2, test_string3;
 
--- drop column migtest_e_history5.test_boolean;
-IF (OBJECT_ID('uq_migtest_e_history5_test_boolean', 'UQ') IS NOT NULL) alter table migtest_e_history5 drop constraint uq_migtest_e_history5_test_boolean;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history5','U') AND name = 'uq_migtest_e_history5_test_boolean') drop index uq_migtest_e_history5_test_boolean ON migtest_e_history5;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_history5') and t2.name = 'test_boolean';
-if @Tmp is not null EXEC('alter table migtest_e_history5 drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_e_history5_test_boolean', 'C') IS NOT NULL) alter table migtest_e_history5 drop constraint ck_migtest_e_history5_test_boolean;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history5','U') AND name = 'ix_migtest_e_history5_test_boolean') drop index ix_migtest_e_history5_test_boolean ON migtest_e_history5;
-IF OBJECT_ID('fk_migtest_e_history5_test_boolean', 'F') IS NOT NULL alter table migtest_e_history5 drop constraint fk_migtest_e_history5_test_boolean;
-alter table migtest_e_history5 drop column test_boolean;
+EXEC usp_ebean_drop_column migtest_e_history2, new_column;
 
--- drop column migtest_e_softdelete.deleted;
-IF (OBJECT_ID('uq_migtest_e_softdelete_deleted', 'UQ') IS NOT NULL) alter table migtest_e_softdelete drop constraint uq_migtest_e_softdelete_deleted;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_softdelete','U') AND name = 'uq_migtest_e_softdelete_deleted') drop index uq_migtest_e_softdelete_deleted ON migtest_e_softdelete;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_softdelete') and t2.name = 'deleted';
-if @Tmp is not null EXEC('alter table migtest_e_softdelete drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_e_softdelete_deleted', 'C') IS NOT NULL) alter table migtest_e_softdelete drop constraint ck_migtest_e_softdelete_deleted;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_softdelete','U') AND name = 'ix_migtest_e_softdelete_deleted') drop index ix_migtest_e_softdelete_deleted ON migtest_e_softdelete;
-IF OBJECT_ID('fk_migtest_e_softdelete_deleted', 'F') IS NOT NULL alter table migtest_e_softdelete drop constraint fk_migtest_e_softdelete_deleted;
-alter table migtest_e_softdelete drop column deleted;
+EXEC usp_ebean_drop_column migtest_e_history5, test_boolean;
 
--- drop column migtest_oto_child.master_id;
-IF (OBJECT_ID('uq_migtest_oto_child_master_id', 'UQ') IS NOT NULL) alter table migtest_oto_child drop constraint uq_migtest_oto_child_master_id;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_oto_child','U') AND name = 'uq_migtest_oto_child_master_id') drop index uq_migtest_oto_child_master_id ON migtest_oto_child;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_oto_child') and t2.name = 'master_id';
-if @Tmp is not null EXEC('alter table migtest_oto_child drop constraint ' + @Tmp)$$;
-IF (OBJECT_ID('ck_migtest_oto_child_master_id', 'C') IS NOT NULL) alter table migtest_oto_child drop constraint ck_migtest_oto_child_master_id;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_oto_child','U') AND name = 'ix_migtest_oto_child_master_id') drop index ix_migtest_oto_child_master_id ON migtest_oto_child;
-IF OBJECT_ID('fk_migtest_oto_child_master_id', 'F') IS NOT NULL alter table migtest_oto_child drop constraint fk_migtest_oto_child_master_id;
-alter table migtest_oto_child drop column master_id;
+EXEC usp_ebean_drop_column migtest_e_softdelete, deleted;
+
+EXEC usp_ebean_drop_column migtest_oto_child, master_id;
 
 IF OBJECT_ID('migtest_e_user', 'U') IS NOT NULL drop table migtest_e_user;
 IF OBJECT_ID('migtest_e_user_seq', 'SO') IS NOT NULL drop sequence migtest_e_user_seq;
 IF OBJECT_ID('migtest_mtm_c_migtest_mtm_m', 'U') IS NOT NULL drop table migtest_mtm_c_migtest_mtm_m;
 IF OBJECT_ID('migtest_mtm_m_migtest_mtm_c', 'U') IS NOT NULL drop table migtest_mtm_m_migtest_mtm_c;
 -- dropping history support for migtest_e_history;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_history') and t2.name = 'sys_periodFrom';
-if @Tmp is not null EXEC('alter table migtest_e_history drop constraint ' + @Tmp)$$;
-delimiter $$
-DECLARE @Tmp nvarchar(200);select @Tmp = t1.name  from sys.default_constraints t1
-  join sys.columns t2 on t1.object_id = t2.default_object_id
-  where t1.parent_object_id = OBJECT_ID('migtest_e_history') and t2.name = 'sys_periodTo';
-if @Tmp is not null EXEC('alter table migtest_e_history drop constraint ' + @Tmp)$$;
+EXEC usp_ebean_drop_default_constraint migtest_e_history, sys_periodFrom;
+EXEC usp_ebean_drop_default_constraint migtest_e_history, sys_periodTo;
 alter table migtest_e_history set (system_versioning = off);
 alter table migtest_e_history drop period for system_time;
 alter table migtest_e_history drop column sys_periodFrom;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/I__create_procs.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/I__create_procs.sql
new file mode 100644
index 000000000..7ff3b383f
--- /dev/null
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/I__create_procs.sql
@@ -0,0 +1,107 @@
+-- Initial script to create stored procedures etc for sqlserver platform
+
+-- create table-value-parameters
+if not exists (select name  from sys.types where name = 'ebean_bigint_tvp') create type ebean_bigint_tvp as table (c1 bigint);
+if not exists (select name  from sys.types where name = 'ebean_float_tvp') create type ebean_float_tvp as table (c1 float);
+if not exists (select name  from sys.types where name = 'ebean_bit_tvp') create type ebean_bit_tvp as table (c1 bit);
+if not exists (select name  from sys.types where name = 'ebean_date_tvp') create type ebean_date_tvp as table (c1 date);
+if not exists (select name  from sys.types where name = 'ebean_time_tvp') create type ebean_time_tvp as table (c1 time);
+if not exists (select name  from sys.types where name = 'ebean_uniqueidentifier_tvp') create type ebean_uniqueidentifier_tvp as table (c1 uniqueidentifier);
+if not exists (select name  from sys.types where name = 'ebean_nvarchar_tvp') create type ebean_nvarchar_tvp as table (c1 nvarchar(max));
+
+delimiter $$
+-----------------------------------------------------------
+-- PROCEDURE: usp_ebean_drop_indices TABLE, COLUMN
+-- deletes all indices referring to TABLE.COLUMN
+-----------------------------------------------------------
+CREATE OR ALTER PROCEDURE usp_ebean_drop_indices @tableName nvarchar(255), @columnName nvarchar(255)
+AS SET NOCOUNT ON
+declare @sql nvarchar(1000)
+declare @indexName nvarchar(255)
+BEGIN
+  DECLARE index_cursor CURSOR FOR SELECT i.name from sys.indexes i 
+    join sys.index_columns ic on ic.object_id = i.object_id and ic.index_id = i.index_id
+    join sys.columns c on c.object_id = ic.object_id and c.column_id = ic.column_id
+    where i.object_id = OBJECT_ID(@tableName) AND c.name = @columnName;
+  OPEN index_cursor
+  FETCH NEXT FROM index_cursor INTO @indexName
+  WHILE @@FETCH_STATUS = 0
+    BEGIN
+      set @sql = 'drop index ' + @indexName + ' on ' + @tableName;
+      EXECUTE(@sql);
+
+      FETCH NEXT FROM index_cursor INTO @indexName
+    END;
+  CLOSE index_cursor;
+  DEALLOCATE index_cursor;
+END
+$$
+
+delimiter $$
+--------------------------------------------------------------------
+-- PROCEDURE: usp_ebean_drop_default_constraint TABLE, COLUMN
+-- deletes the default constraint, which has a random name
+--------------------------------------------------------------------
+CREATE OR ALTER PROCEDURE usp_ebean_drop_default_constraint @tableName nvarchar(255), @columnName nvarchar(255)
+AS SET NOCOUNT ON
+declare @tmp nvarchar(1000)
+BEGIN
+  select @Tmp = t1.name from sys.default_constraints t1
+    join sys.columns t2 on t1.object_id = t2.default_object_id
+    where t1.parent_object_id = OBJECT_ID(@tableName) and t2.name = @columnName;
+
+  if @Tmp is not null EXEC('alter table ' + @tableName +' drop constraint ' + @tmp);
+END
+$$
+
+delimiter $$
+--------------------------------------------------------------------
+-- PROCEDURE: usp_ebean_drop_constraints TABLE, COLUMN
+-- deletes constraints and foreign keys refering to TABLE.COLUMN
+--------------------------------------------------------------------
+CREATE OR ALTER PROCEDURE usp_ebean_drop_constraints @tableName nvarchar(255), @columnName nvarchar(255)
+AS SET NOCOUNT ON
+declare @sql nvarchar(1000)
+declare @constraintName nvarchar(255)
+BEGIN
+  DECLARE name_cursor CURSOR FOR 
+  SELECT cc.name from sys.check_constraints cc
+    join sys.columns c on c.object_id = cc.parent_object_id and c.column_id = cc.parent_column_id
+    where parent_object_id = OBJECT_ID(@tableName) AND c.name = @columnName
+  UNION SELECT fk.name from sys.foreign_keys fk
+    join sys.foreign_key_columns fkc on fkc.constraint_object_id = fk.object_id
+      and  fkc.parent_object_id = fk.parent_object_id
+    join sys.columns c on c.object_id = fkc.parent_object_id and c.column_id = fkc.parent_column_id
+    where fkc.parent_object_id = OBJECT_ID(@tableName) AND c.name = @columnName;
+
+  OPEN name_cursor
+  FETCH NEXT FROM name_cursor INTO @constraintName
+  WHILE @@FETCH_STATUS = 0
+    BEGIN
+      set @sql = 'alter table ' + @tableName + ' drop constraint ' + @constraintName;
+      EXECUTE(@sql);
+
+      FETCH NEXT FROM name_cursor INTO @constraintName
+    END;
+  CLOSE name_cursor;
+  DEALLOCATE name_cursor;
+END
+$$
+
+delimiter $$
+-------------------------------------------------------------------------------------
+-- PROCEDURE: usp_ebean_drop_column TABLE, COLUMN
+-- deletes the column annd ensures that all indices and constraints are dropped first
+-------------------------------------------------------------------------------------
+CREATE OR ALTER PROCEDURE usp_ebean_drop_column @tableName nvarchar(255), @columnName nvarchar(255)
+AS SET NOCOUNT ON
+declare @sql nvarchar(1000)
+BEGIN
+  EXEC usp_ebean_drop_indices @tableName, @columnName;
+  EXEC usp_ebean_drop_default_constraint @tableName, @columnName;
+  EXEC usp_ebean_drop_constraints @tableName, @columnName;
+
+  set @sql = 'alter table ' + @tableName + ' drop column ' + @columnName;
+  EXECUTE(@sql);
+END
+$$

From 9b74602617b1443b2447257f221edaf5b6face12 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 18 Jul 2018 22:22:48 +1200
Subject: [PATCH 0397/1036] Bump pom to 11.19.1-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6fd0c19f5..f92b1baf3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.18.7-SNAPSHOT</version>
+  <version>11.19.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>

From 9a424d7d6dcf4ecb5c4e3685412ec73d4e7e1726 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 18 Jul 2018 22:24:45 +1200
Subject: [PATCH 0398/1036] [maven-release-plugin] prepare release
 ebean-11.19.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f92b1baf3..e43c8612a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.19.1-SNAPSHOT</version>
+  <version>11.19.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.19.1</tag>
   </scm>
 
   <profiles>

From c2489beb82a4b2f1f9197cc2aeeca7dff800aec7 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 18 Jul 2018 22:25:00 +1200
Subject: [PATCH 0399/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e43c8612a..d7fe46de2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.19.1</version>
+  <version>11.19.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.19.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From db13034fec633d8446625ad0b4a83cb1def2eb02 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 27 Jul 2018 12:31:27 +1200
Subject: [PATCH 0400/1036] No effective change - update code style in test

---
 .../tests/batchload/TestSecondaryQueries.java | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/test/java/org/tests/batchload/TestSecondaryQueries.java b/src/test/java/org/tests/batchload/TestSecondaryQueries.java
index de0e1ccce..7923656ef 100644
--- a/src/test/java/org/tests/batchload/TestSecondaryQueries.java
+++ b/src/test/java/org/tests/batchload/TestSecondaryQueries.java
@@ -3,15 +3,14 @@ package org.tests.batchload;
 import io.ebean.Ebean;
 import io.ebean.FetchConfig;
 import io.ebean.Query;
+import io.ebean.QueryIterator;
 import io.ebean.TransactionalTestCase;
-
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
-import org.ebeantest.LoggedSqlCollector;
-import org.junit.Test;
 
-import java.util.Iterator;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -78,13 +77,15 @@ public class TestSecondaryQueries extends TransactionalTestCase {
 
     LoggedSqlCollector.start();
 
-    Iterator<Order> orders = Ebean.find(Order.class)
-      .select("status")
-      .setMaxRows(10)
-      .setUseCache(false)
-      .findIterate();
-    while (orders.hasNext()) {
-      orders.next(); // dummy read
+    try (QueryIterator<Order> orders =
+           Ebean.find(Order.class).select("status")
+        .setMaxRows(10)
+        .setUseCache(false)
+        .findIterate()) {
+
+      while (orders.hasNext()) {
+        orders.next(); // dummy read
+      }
     }
     List<String> sql = LoggedSqlCollector.stop();
 

From 02fe956056436ce728612e89f831f8a747b6008a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 27 Jul 2018 12:31:56 +1200
Subject: [PATCH 0401/1036] #1459 - findNative with join to a @OneToMany ...
 does not map properly

---
 .../server/deploy/BeanPropertyAssocMany.java  |  6 ++
 .../org/tests/query/TestQueryFindNative.java  | 64 +++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 src/test/java/org/tests/query/TestQueryFindNative.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index 687cc9d84..0eaf2ae01 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -213,6 +213,12 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     // by default not including "Many" properties in document store
   }
 
+  @Override
+  public void registerColumn(BeanDescriptor<?> desc, String prefix) {
+    if (targetDescriptor != null) {
+      desc.registerTable(targetDescriptor.getBaseTable(), this);
+    }
+  }
   /**
    * Return the underlying collection of beans.
    */
diff --git a/src/test/java/org/tests/query/TestQueryFindNative.java b/src/test/java/org/tests/query/TestQueryFindNative.java
new file mode 100644
index 000000000..734eb1c76
--- /dev/null
+++ b/src/test/java/org/tests/query/TestQueryFindNative.java
@@ -0,0 +1,64 @@
+package org.tests.query;
+
+import io.ebean.BaseTestCase;
+import org.junit.Test;
+import org.tests.model.basic.Contact;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestQueryFindNative extends BaseTestCase {
+
+
+  @Test
+  public void joinFromManyToOne() {
+
+    ResetBasicData.reset();
+
+    String sql =
+      "select c.id, c.first_name, c.last_name, t.id, t.name " +
+        " from contact c  " +
+        " join o_customer t on t.id = c.customer_id " +
+        " where t.name like ? " +
+        " order by c.first_name, c.last_name";
+
+    List<Contact> contacts =
+      server()
+        .findNative(Contact.class, sql)
+        .setParameter(1, "Rob")
+        .findList();
+
+
+    assertThat(contacts).isNotEmpty();
+
+    Customer customer = contacts.get(0).getCustomer();
+    assertThat(customer).isNotNull();
+  }
+
+  @Test
+  public void joinFromOneToMany() {
+
+    ResetBasicData.reset();
+
+    String sql =
+      "select cu.id, cu.name, ct.id, ct.first_name " +
+        " from o_customer cu " +
+        " left join contact ct on cu.id = ct.customer_id " +
+        " where cu.name like ? " +
+        " order by name";
+
+    List<Customer> customers =
+      server()
+        .findNative(Customer.class, sql)
+        .setParameter(1, "Rob")
+        .findList();
+
+    assertThat(customers).isNotEmpty();
+
+    List<Contact> contacts = customers.get(0).getContacts();
+    assertThat(contacts).isNotEmpty();
+  }
+}

From 471605619a9011d7a4a211ed78a1ea8d46625930 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 30 Jul 2018 23:51:52 +1200
Subject: [PATCH 0402/1036] #1460 - ENH: Add FetchGroup ... as a mechanism to
 specify select() + fetch() separately from Query

---
 src/main/java/io/ebean/ExpressionList.java    |   5 +
 src/main/java/io/ebean/FetchGroup.java        | 114 ++++++++++++++++++
 src/main/java/io/ebean/FetchGroupBuilder.java |  87 +++++++++++++
 src/main/java/io/ebean/Query.java             |   5 +
 src/main/java/io/ebean/XServiceProvider.java  |  24 ++++
 .../ebean/service/SpiFetchGroupService.java   |  23 ++++
 .../expression/DefaultExpressionList.java     |   6 +
 .../server/expression/JunctionExpression.java |   6 +
 .../server/query/DFetchGroup.java             |  26 ++++
 .../server/query/DFetchGroupBuilder.java      |  85 +++++++++++++
 .../server/query/DFetchGroupService.java      |  28 +++++
 .../server/querydefn/DefaultOrmQuery.java     |   7 ++
 .../server/querydefn/OrmQueryDetail.java      |  10 ++
 .../server/querydefn/OrmQueryProperties.java  |  17 +--
 .../server/querydefn/SpiFetchGroup.java       |  19 +++
 .../io.ebean.service.SpiFetchGroupService     |   1 +
 src/test/java/io/ebean/FetchGroupTest.java    | 113 +++++++++++++++++
 17 files changed, 569 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/io/ebean/FetchGroup.java
 create mode 100644 src/main/java/io/ebean/FetchGroupBuilder.java
 create mode 100644 src/main/java/io/ebean/service/SpiFetchGroupService.java
 create mode 100644 src/main/java/io/ebeaninternal/server/query/DFetchGroup.java
 create mode 100644 src/main/java/io/ebeaninternal/server/query/DFetchGroupBuilder.java
 create mode 100644 src/main/java/io/ebeaninternal/server/query/DFetchGroupService.java
 create mode 100644 src/main/java/io/ebeaninternal/server/querydefn/SpiFetchGroup.java
 create mode 100644 src/main/resources/META-INF/services/io.ebean.service.SpiFetchGroupService
 create mode 100644 src/test/java/io/ebean/FetchGroupTest.java

diff --git a/src/main/java/io/ebean/ExpressionList.java b/src/main/java/io/ebean/ExpressionList.java
index 280a6356b..2a2a6938b 100644
--- a/src/main/java/io/ebean/ExpressionList.java
+++ b/src/main/java/io/ebean/ExpressionList.java
@@ -412,6 +412,11 @@ public interface ExpressionList<T> {
    */
   Query<T> select(String properties);
 
+  /**
+   * Apply the fetchGroup which defines what part of the object graph to load.
+   */
+  Query<T> select(FetchGroup fetchGroup);
+
   /**
    * Set whether this query uses DISTINCT.
    * <p>
diff --git a/src/main/java/io/ebean/FetchGroup.java b/src/main/java/io/ebean/FetchGroup.java
new file mode 100644
index 000000000..54552a227
--- /dev/null
+++ b/src/main/java/io/ebean/FetchGroup.java
@@ -0,0 +1,114 @@
+package io.ebean;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Defines what part of the object graph to load (select and fetch clauses).
+ * <p>
+ * Using a FetchGroup effectively sets the select() and fetch() clauses for a query. It is alternative
+ * to specifying the select() and fetch() clauses on the query allowing for more re-use of "what to load"
+ * that can be defined separately from the query and combined with other FetchGroups.
+ * </p>
+ *
+ * <h3>Select example</h3>*
+ * <pre>{@code
+ *
+ * FetchGroup fetchGroup = FetchGroup.of("name, status");
+ *
+ * Customer.query()
+ *   .select(fetchGroup)
+ *   .findList();
+ *
+ * }</pre>
+ *
+ * <h3>Select and fetch example</h3>
+ * <pre>{@code
+ *
+ * FetchGroup fetchGroup = FetchGroup
+ *   .select("name, status")
+ *   .fetch("contacts", "firstName, lastName, email")
+ *   .build();
+ *
+ * Customer.query()
+ *   .select(fetchGroup)
+ *   .findList();
+ *
+ * }</pre>
+ *
+ * <h3>Combining FetchGroups</h3>
+ * <p>
+ *   FetchGroups can be combined together to form another FetchGroup.
+ * </p>
+ * <pre>{@code
+ *
+ *  FetchGroup FG_ADDRESS = FetchGroup
+ *    .select("line1, line2, city")
+ *    .fetch("country", "name")
+ *    .build();
+ *
+ *  FetchGroup FG_CUSTOMER = FetchGroup
+ *    .select("name, version")
+ *    .fetch("billingAddress", FG_ADDRESS)
+ *    .build();
+ *
+ *
+ *  Customer.query()
+ *    .select(FG_CUSTOMER)
+ *    .findList();
+ *
+ * }</pre>
+ */
+public interface FetchGroup {
+
+  /**
+   * Return the FetchGroup with the given select clause.
+   * <p>
+   *   We use this for simple FetchGroup that only select() properties and do not have additional fetch() clause.
+   * </p>
+   * <pre>{@code
+   *
+   * FetchGroup fetchGroup = FetchGroup.of("name, status");
+   *
+   * Customer.query()
+   *   .select(fetchGroup)
+   *   .findList();
+   *
+   * }</pre>
+   *
+   * @param select The select clause of the FetchGroup
+   *
+   * @return The FetchGroup with the given select clause
+   */
+  @Nonnull
+  static FetchGroup of(String select) {
+    return XServiceProvider.fetchGroupOf(select);
+  }
+
+  /**
+   * Return the FetchGroupBuilder with the given select clause that we can add fetch clauses to.
+   * <p>
+   * We chain select() with one or more fetch() clauses to define the object graph to load.
+   * </p>
+   * <pre>{@code
+   *
+   * FetchGroup fetchGroup = FetchGroup
+   *   .select("name, status")
+   *   .fetch("contacts", "firstName, lastName, email")
+   *   .build();
+   *
+   * Customer.query()
+   *   .select(fetchGroup)
+   *   .findList();
+   *
+   * }</pre>
+   *
+   * @param select The select clause for the FetchGroup
+   *
+   * @return The FetchGroupBuilder with the given select clause which we will add fetch clauses to
+   */
+  @Nonnull
+  static FetchGroupBuilder select(String select) {
+    return XServiceProvider.fetchGroupSelect(select);
+  }
+
+}
diff --git a/src/main/java/io/ebean/FetchGroupBuilder.java b/src/main/java/io/ebean/FetchGroupBuilder.java
new file mode 100644
index 000000000..65ad49bbf
--- /dev/null
+++ b/src/main/java/io/ebean/FetchGroupBuilder.java
@@ -0,0 +1,87 @@
+package io.ebean;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Builds a FetchGroup by adding fetch clauses.
+ * <p>
+ * We add select() and fetch() clauses to define the object graph we want to load.
+ * </p>
+ *
+ * <pre>{@code
+ *
+ * FetchGroup fetchGroup = FetchGroup
+ *   .select("name, status")
+ *   .fetch("contacts", "firstName, lastName, email")
+ *   .build();
+ *
+ * Customer.query()
+ *   .select(fetchGroup)
+ *   .where()
+ *   ...
+ *   .findList();
+ *
+ * }</pre>
+ */
+public interface FetchGroupBuilder {
+
+  /**
+   * Fetch the path including all its properties.
+   */
+  @Nonnull
+  FetchGroupBuilder fetch(String path);
+
+  /**
+   * Fetch the path with the nested fetch group.
+   */
+  @Nonnull
+  FetchGroupBuilder fetch(String path, FetchGroup nestedGroup);
+
+  /**
+   * Fetch the path using a query join with the nested fetch group.
+   */
+  @Nonnull
+  FetchGroupBuilder fetchQuery(String path, FetchGroup nestedGroup);
+
+  /**
+   * Fetch the path lazily with the nested fetch group.
+   */
+  @Nonnull
+  FetchGroupBuilder fetchLazy(String path, FetchGroup nestedGroup);
+
+  /**
+   * Fetch the path including specified properties.
+   */
+  @Nonnull
+  FetchGroupBuilder fetch(String path, String properties);
+
+  /**
+   * Fetch the path including all its properties using a query join.
+   */
+  @Nonnull
+  FetchGroupBuilder fetchQuery(String path);
+
+  /**
+   * Fetch the path including specified properties using a query join.
+   */
+  @Nonnull
+  FetchGroupBuilder fetchQuery(String path, String properties);
+
+  /**
+   * Fetch the path including all its properties lazily.
+   */
+  @Nonnull
+  FetchGroupBuilder fetchLazy(String path);
+
+  /**
+   * Fetch the path including specified properties lazily.
+   */
+  @Nonnull
+  FetchGroupBuilder fetchLazy(String path, String properties);
+
+  /**
+   * Build and return the FetchGroup.
+   */
+  @Nonnull
+  FetchGroup build();
+}
diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index 3fb48c1eb..350393776 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -397,6 +397,11 @@ public interface Query<T> {
    */
   Query<T> select(String fetchProperties);
 
+  /**
+   * Apply the fetchGroup which defines what part of the object graph to load.
+   */
+  Query<T> select(FetchGroup fetchGroup);
+
   /**
    * Specify a path to fetch eagerly including specific properties.
    * <p>
diff --git a/src/main/java/io/ebean/XServiceProvider.java b/src/main/java/io/ebean/XServiceProvider.java
index 518e1b3af..53a81993a 100644
--- a/src/main/java/io/ebean/XServiceProvider.java
+++ b/src/main/java/io/ebean/XServiceProvider.java
@@ -1,5 +1,6 @@
 package io.ebean;
 
+import io.ebean.service.SpiFetchGroupService;
 import io.ebean.service.SpiProfileLocationFactory;
 import io.ebean.service.SpiRawSqlService;
 
@@ -15,6 +16,16 @@ class XServiceProvider {
 
   private static SpiProfileLocationFactory profileLocationFactory = initProfileLocation();
 
+  private static SpiFetchGroupService fetchGroupService = initSpiFetchGroupService();
+
+  private static SpiFetchGroupService initSpiFetchGroupService() {
+    Iterator<SpiFetchGroupService> loader = ServiceLoader.load(SpiFetchGroupService.class).iterator();
+    if (loader.hasNext()) {
+      return loader.next();
+    }
+    throw new IllegalStateException("No service implementation found for SpiFetchGroupService?");
+  }
+
   private static SpiRawSqlService initRawSql() {
 
     Iterator<SpiRawSqlService> loader = ServiceLoader.load(SpiRawSqlService.class).iterator();
@@ -47,4 +58,17 @@ class XServiceProvider {
     return profileLocationFactory;
   }
 
+  /**
+   * Return the FetchGroup with the given select clause.
+   */
+  static FetchGroup fetchGroupOf(String select) {
+    return fetchGroupService.of(select);
+  }
+
+  /**
+   * Return the FetchGroupBuilder with the given select clause.
+   */
+  static FetchGroupBuilder fetchGroupSelect(String select) {
+    return fetchGroupService.select(select);
+  }
 }
diff --git a/src/main/java/io/ebean/service/SpiFetchGroupService.java b/src/main/java/io/ebean/service/SpiFetchGroupService.java
new file mode 100644
index 000000000..813f5244d
--- /dev/null
+++ b/src/main/java/io/ebean/service/SpiFetchGroupService.java
@@ -0,0 +1,23 @@
+package io.ebean.service;
+
+import io.ebean.FetchGroup;
+import io.ebean.FetchGroupBuilder;
+
+/**
+ * Service that parses FetchGroup expressions.
+ */
+public interface SpiFetchGroupService {
+
+  /**
+   * Return the FetchGroup with the given select clause.
+   */
+  FetchGroup of(String select);
+
+  /**
+   * Create and return a FetchGroupBuilder starting with a select() clause.
+   *
+   * @param select The properties to select (top level properties)
+   * @return The FetchGroupBuilder to add additional fetch clauses
+   */
+  FetchGroupBuilder select(String select);
+}
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 45324d954..578e2d9b1 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -6,6 +6,7 @@ import io.ebean.DtoQuery;
 import io.ebean.Expression;
 import io.ebean.ExpressionFactory;
 import io.ebean.ExpressionList;
+import io.ebean.FetchGroup;
 import io.ebean.FetchPath;
 import io.ebean.FutureIds;
 import io.ebean.FutureList;
@@ -460,6 +461,11 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return query.select(fetchProperties);
   }
 
+  @Override
+  public Query<T> select(FetchGroup fetchGroup) {
+    return query.select(fetchGroup);
+  }
+
   @Override
   public Query<T> setDistinct(boolean distinct) {
     return query.setDistinct(distinct);
diff --git a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index d927bb22f..b0329a1f0 100644
--- a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -5,6 +5,7 @@ import io.ebean.CountDistinctOrder;
 import io.ebean.DtoQuery;
 import io.ebean.Expression;
 import io.ebean.ExpressionList;
+import io.ebean.FetchGroup;
 import io.ebean.FetchPath;
 import io.ebean.FutureIds;
 import io.ebean.FutureList;
@@ -759,6 +760,11 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.select(properties);
   }
 
+  @Override
+  public Query<T> select(FetchGroup fetchGroup) {
+    return exprList.select(fetchGroup);
+  }
+
   @Override
   public Query<T> setDistinct(boolean distinct) {
     return exprList.setDistinct(distinct);
diff --git a/src/main/java/io/ebeaninternal/server/query/DFetchGroup.java b/src/main/java/io/ebeaninternal/server/query/DFetchGroup.java
new file mode 100644
index 000000000..6bd9cbc8e
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/query/DFetchGroup.java
@@ -0,0 +1,26 @@
+package io.ebeaninternal.server.query;
+
+import io.ebeaninternal.server.querydefn.OrmQueryDetail;
+import io.ebeaninternal.server.querydefn.SpiFetchGroup;
+
+/**
+ * Default FetchGroup implementation.
+ */
+class DFetchGroup implements SpiFetchGroup {
+
+  private final OrmQueryDetail detail;
+
+  DFetchGroup(OrmQueryDetail detail) {
+    this.detail = detail;
+  }
+
+  @Override
+  public OrmQueryDetail detail() {
+    return detail.copy();
+  }
+
+  @Override
+  public OrmQueryDetail underlying() {
+    return detail;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/query/DFetchGroupBuilder.java b/src/main/java/io/ebeaninternal/server/query/DFetchGroupBuilder.java
new file mode 100644
index 000000000..76778ee41
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/query/DFetchGroupBuilder.java
@@ -0,0 +1,85 @@
+package io.ebeaninternal.server.query;
+
+import io.ebean.FetchConfig;
+import io.ebean.FetchGroup;
+import io.ebean.FetchGroupBuilder;
+import io.ebeaninternal.server.querydefn.OrmQueryDetail;
+import io.ebeaninternal.server.querydefn.SpiFetchGroup;
+
+/**
+ * Default implementation of the FetchGroupBuilder.
+ */
+class DFetchGroupBuilder implements FetchGroupBuilder {
+
+  private static final FetchConfig FETCH_QUERY = new FetchConfig().query();
+
+  private static final FetchConfig FETCH_LAZY = new FetchConfig().lazy();
+
+  private OrmQueryDetail detail;
+
+  DFetchGroupBuilder(OrmQueryDetail detail) {
+    this.detail = detail;
+  }
+
+  @Override
+  public FetchGroupBuilder fetch(String path) {
+    detail.fetch(path, null, null);
+    return this;
+  }
+
+  @Override
+  public FetchGroupBuilder fetch(String path, FetchGroup nestedGroup) {
+    return fetchNested(path, nestedGroup, null);
+  }
+  @Override
+  public FetchGroupBuilder fetchQuery(String path, FetchGroup nestedGroup) {
+    return fetchNested(path, nestedGroup, FETCH_QUERY);
+  }
+
+  @Override
+  public FetchGroupBuilder fetchLazy(String path, FetchGroup nestedGroup) {
+    return fetchNested(path, nestedGroup, FETCH_LAZY);
+  }
+
+  private FetchGroupBuilder fetchNested(String path, FetchGroup nestedGroup, FetchConfig fetchConfig) {
+
+    OrmQueryDetail nestedDetail = ((SpiFetchGroup) nestedGroup).underlying();
+    detail.addNested(path, nestedDetail, fetchConfig);
+    return this;
+  }
+
+  @Override
+  public FetchGroupBuilder fetchQuery(String path) {
+    detail.fetch(path, null, FETCH_QUERY);
+    return this;
+  }
+
+  @Override
+  public FetchGroupBuilder fetchLazy(String path) {
+    detail.fetch(path, null, FETCH_LAZY);
+    return this;
+  }
+
+  @Override
+  public FetchGroupBuilder fetch(String path, String properties) {
+    detail.fetch(path, properties, null);
+    return this;
+  }
+
+  @Override
+  public FetchGroupBuilder fetchQuery(String path, String properties) {
+    detail.fetch(path, properties, FETCH_QUERY);
+    return this;
+  }
+
+  @Override
+  public FetchGroupBuilder fetchLazy(String path, String properties) {
+    detail.fetch(path, properties, FETCH_LAZY);
+    return this;
+  }
+
+  @Override
+  public FetchGroup build() {
+    return new DFetchGroup(detail);
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/query/DFetchGroupService.java b/src/main/java/io/ebeaninternal/server/query/DFetchGroupService.java
new file mode 100644
index 000000000..62555997d
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/query/DFetchGroupService.java
@@ -0,0 +1,28 @@
+package io.ebeaninternal.server.query;
+
+import io.ebean.FetchGroup;
+import io.ebean.FetchGroupBuilder;
+import io.ebean.service.SpiFetchGroupService;
+import io.ebeaninternal.server.querydefn.OrmQueryDetail;
+
+/**
+ * Default implementation of SpiFetchGroupService.
+ */
+public final class DFetchGroupService implements SpiFetchGroupService {
+
+  @Override
+  public FetchGroup of(String select) {
+    return new DFetchGroup(detail(select));
+  }
+
+  @Override
+  public FetchGroupBuilder select(String select) {
+    return new DFetchGroupBuilder(detail(select));
+  }
+
+  private OrmQueryDetail detail(String select) {
+    OrmQueryDetail detail = new OrmQueryDetail();
+    detail.select(select);
+    return detail;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index be5b769c5..da8a39f51 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -7,6 +7,7 @@ import io.ebean.Expression;
 import io.ebean.ExpressionFactory;
 import io.ebean.ExpressionList;
 import io.ebean.FetchConfig;
+import io.ebean.FetchGroup;
 import io.ebean.FetchPath;
 import io.ebean.FutureIds;
 import io.ebean.FutureList;
@@ -1329,6 +1330,12 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return this;
   }
 
+  @Override
+  public DefaultOrmQuery<T> select(FetchGroup fetchGroup) {
+    this.detail = ((SpiFetchGroup)fetchGroup).detail();
+    return this;
+  }
+
   @Override
   public DefaultOrmQuery<T> fetch(String property) {
     return fetch(property, null, null);
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
index e7fa731b3..3b61ff949 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
@@ -55,6 +55,16 @@ public class OrmQueryDetail implements Serializable {
     return copy;
   }
 
+  /**
+   * Add a nested OrmQueryDetail to this detail.
+   */
+  public void addNested(String path, OrmQueryDetail other, FetchConfig config) {
+    fetch(path, other.baseProps.getProperties(), config);
+    for (Map.Entry<String, OrmQueryProperties> entry : other.fetchPaths.entrySet()) {
+      fetch(path + "." + entry.getKey(), entry.getValue().getProperties(), entry.getValue().getFetchConfig());
+    }
+  }
+
   /**
    * Calculate the hash for the query plan.
    */
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
index 82c1f1630..966ca0543 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
@@ -148,27 +148,30 @@ public class OrmQueryProperties implements Serializable {
   /**
    * Copy constructor.
    */
-  private OrmQueryProperties(OrmQueryProperties source) {
-
+  private OrmQueryProperties(OrmQueryProperties source, FetchConfig sourceFetchConfig) {
+    this.fetchConfig = sourceFetchConfig;
     this.parentPath = source.parentPath;
     this.path = source.path;
     this.rawProperties = source.rawProperties;
     this.trimmedProperties = source.trimmedProperties;
     this.cache = source.cache;
     this.readOnly = source.readOnly;
-    this.fetchConfig = source.fetchConfig;
     this.filterMany = source.filterMany;
     this.included = (source.included == null) ? null : new LinkedHashSet<>(source.included);
-    if (includedBeanJoin != null) {
-      this.includedBeanJoin = new HashSet<>(source.includedBeanJoin);
-    }
   }
 
   /**
    * Creates a copy of the OrmQueryProperties.
    */
   public OrmQueryProperties copy() {
-    return new OrmQueryProperties(this);
+    return new OrmQueryProperties(this, this.fetchConfig);
+  }
+
+  /**
+   * Create a copy with the given fetch config.
+   */
+  public OrmQueryProperties copy(FetchConfig fetchConfig) {
+    return new OrmQueryProperties(this, fetchConfig);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/SpiFetchGroup.java b/src/main/java/io/ebeaninternal/server/querydefn/SpiFetchGroup.java
new file mode 100644
index 000000000..05935e25c
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/querydefn/SpiFetchGroup.java
@@ -0,0 +1,19 @@
+package io.ebeaninternal.server.querydefn;
+
+import io.ebean.FetchGroup;
+
+/**
+ * Service API of FetchGroup.
+ */
+public interface SpiFetchGroup extends FetchGroup {
+
+  /**
+   * Return the detail to use for query execution.
+   */
+  OrmQueryDetail detail();
+
+  /**
+   * Return the underlying detail for copy purposes.
+   */
+  OrmQueryDetail underlying();
+}
diff --git a/src/main/resources/META-INF/services/io.ebean.service.SpiFetchGroupService b/src/main/resources/META-INF/services/io.ebean.service.SpiFetchGroupService
new file mode 100644
index 000000000..56c2058bd
--- /dev/null
+++ b/src/main/resources/META-INF/services/io.ebean.service.SpiFetchGroupService
@@ -0,0 +1 @@
+io.ebeaninternal.server.query.DFetchGroupService
diff --git a/src/test/java/io/ebean/FetchGroupTest.java b/src/test/java/io/ebean/FetchGroupTest.java
new file mode 100644
index 000000000..91bf229b8
--- /dev/null
+++ b/src/test/java/io/ebean/FetchGroupTest.java
@@ -0,0 +1,113 @@
+package io.ebean;
+
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class FetchGroupTest extends BaseTestCase {
+
+  @Test
+  public void simple() {
+
+    FetchGroup fetch = FetchGroup.of("name, status");
+
+    Query<Customer> query = Customer.find
+      .query()
+      .where()
+      .ilike("name", "rob")
+      .select(fetch);
+
+    query.findList();
+
+    assertThat(sqlOf(query)).contains("select t0.id, t0.name, t0.status from");
+  }
+
+
+  @Test
+  public void nestedWithQueryJoin() {
+
+    ResetBasicData.reset();
+
+    FetchGroup fetch = FetchGroup
+      .select("name, status")
+      .fetchQuery("contacts", "firstName, lastName, email")
+      .build();
+
+    Query<Customer> query = Customer.find
+      .query()
+      .where()
+      .ilike("name", "rob")
+      .select(fetch);
+
+    LoggedSqlCollector.start();
+    query.findList();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("select t0.id, t0.name, t0.status from o_customer");
+    assertThat(sql.get(1)).contains("select t0.customer_id, t0.id, t0.first_name, t0.last_name, t0.email from contact");
+  }
+
+
+  @Test
+  public void nestedWithQueryJoin_asNestedFetchGroup() {
+
+    ResetBasicData.reset();
+
+    FetchGroup CT_NAME = FetchGroup.of("firstName, lastName, email");
+
+    FetchGroup fetch = FetchGroup
+      .select("name")
+      .fetchQuery("contacts", CT_NAME)
+      .build();
+
+    Query<Customer> query = Customer.find
+      .query()
+      .where()
+      .ilike("name", "rob")
+      .select(fetch);
+
+    LoggedSqlCollector.start();
+    query.findList();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("select t0.id, t0.name from o_customer");
+    assertThat(sql.get(1)).contains(" from contact");
+  }
+
+  @Test
+  public void nested_withNestedFetchGroup() {
+
+    ResetBasicData.reset();
+
+    FetchGroup FGAddress = FetchGroup
+      .select("line1, line2, city")
+      .fetch("country", "name")
+      .build();
+
+    FetchGroup FBCustomer = FetchGroup
+      .select("name, version")
+      .fetch("billingAddress", FGAddress)
+      .build();
+
+    Query<Customer> query = Customer.find
+      .query()
+      .where()
+      .ilike("name", "rob")
+      .select(FBCustomer);
+
+    LoggedSqlCollector.start();
+    query.findList();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("select t0.id, t0.name, t0.version, t1.id, t1.line_1, t1.line_2, t1.city, t2.code, t2.name from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id  left join o_country t2 on t2.code = t1.country_code ");
+  }
+
+}

From ec7e4e493572fcf10fa0b1711623c0120ee6d8fc Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 2 Aug 2018 22:25:48 +1200
Subject: [PATCH 0403/1036] #1461 - @OneToMany with @JoinTable without table
 name does not default join table name

---
 .../deploy/parse/AnnotationAssocManys.java    |  6 ++
 .../tests/o2m/jointable/JtMonkeyGroup.java    | 65 +++++++++++++++++
 .../TestOneToManyJoinTableNoTableName.java    | 72 +++++++++++++++++++
 3 files changed, 143 insertions(+)
 create mode 100644 src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java
 create mode 100644 src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index a5e317ea3..e4b6d52d0 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -304,6 +304,12 @@ class AnnotationAssocManys extends AnnotationParser {
   private void readJoinTable(JoinTable joinTable, DeployBeanPropertyAssocMany<?> prop) {
 
     String intTableName = getFullTableName(joinTable);
+    if (intTableName.isEmpty()) {
+      BeanTable localTable = factory.getBeanTable(descriptor.getBeanType());
+      BeanTable otherTable = factory.getBeanTable(prop.getTargetType());
+      intTableName = getM2MJoinTableName(localTable, otherTable);
+    }
+
     // set the intersection table
     DeployTableJoin intJoin = new DeployTableJoin();
     intJoin.setTable(intTableName);
diff --git a/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java b/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java
new file mode 100644
index 000000000..496782f2b
--- /dev/null
+++ b/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java
@@ -0,0 +1,65 @@
+package org.tests.o2m.jointable;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinTable;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.Version;
+import java.util.List;
+
+@Entity
+@Table(name="mkeygroup")
+public class JtMonkeyGroup {
+
+  @Id
+  long pid;
+
+  String name;
+
+  /**
+   * No cascading over to Monkey but we do maintain the join table regardless.
+   */
+  @OneToMany
+  @JoinTable
+  List<JtMonkey> monkeys;
+
+  @Version
+  long version;
+
+  public JtMonkeyGroup(String name) {
+    this.name = name;
+  }
+
+  public long getPid() {
+    return pid;
+  }
+
+  public void setPid(long pid) {
+    this.pid = pid;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public List<JtMonkey> getMonkeys() {
+    return monkeys;
+  }
+
+  public void setMonkeys(List<JtMonkey> monkeys) {
+    this.monkeys = monkeys;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java
new file mode 100644
index 000000000..dc8b93738
--- /dev/null
+++ b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java
@@ -0,0 +1,72 @@
+package org.tests.o2m.jointable;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestOneToManyJoinTableNoTableName extends BaseTestCase {
+
+  private JtMonkeyGroup troop = new JtMonkeyGroup("Pink");
+
+  private JtMonkey m0 = new JtMonkey("Sim3");
+  private JtMonkey m1 = new JtMonkey("Tim3");
+  private JtMonkey m2 = new JtMonkey("Uim3");
+
+  private void initialInsert() {
+    Ebean.saveAll(Arrays.asList(troop, m0, m1, m2));
+  }
+
+  @Test
+  public void base() {
+
+    initialInsert();
+
+    LoggedSqlCollector.start();
+
+    // make m0 dirty ... but no cascade saved?
+    m0.setFoodPreference("camera");
+    troop.getMonkeys().add(m0);
+    troop.getMonkeys().add(m1);
+
+    Ebean.save(troop);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("insert into mkeygroup_monkey (mkeygroup_pid, monkey_mid) values (?, ?)");
+
+    int intersectionRows = Ebean.createSqlQuery("select count(*) as total from mkeygroup_monkey where mkeygroup_pid = ?")
+      .setParameter(1, troop.getPid())
+      .findOne()
+      .getInteger("total");
+
+    assertThat(intersectionRows).isEqualTo(2);
+
+    LoggedSqlCollector.current();
+    JtMonkeyGroup fetchTroop = Ebean.find(JtMonkeyGroup.class)
+      .fetch("monkeys")
+      .where().idEq(troop.getPid())
+      .findOne();
+
+    assertThat(fetchTroop.getMonkeys()).hasSize(2);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(1);
+    assertThat(trimSql(sql.get(0))).contains("from mkeygroup t0 left join mkeygroup_monkey t1z_ on t1z_.mkeygroup_pid = t0.pid  left join monkey t1 on t1.mid = t1z_.monkey_mid  where t0.pid = ?");
+    assertThat(trimSql(sql.get(0))).contains("select t0.pid, t0.name, t0.version, t1.mid, t1.name, t1.food_preference, t1.version");
+
+    Ebean.delete(troop);
+
+    sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("delete from mkeygroup_monkey where mkeygroup_pid = ?");
+    assertThat(sql.get(1)).contains("delete from mkeygroup where pid=? and version=?");
+
+  }
+
+}

From 6d0556a120afa852f16d501c97f5706a3c74f0db Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 2 Aug 2018 23:18:44 +1200
Subject: [PATCH 0404/1036] #1460 - ENH: Add FetchGroup ... as a mechanism to
 specify select() + fetch() separately from Query

Change to add generics for FetchGroup
---
 src/main/java/io/ebean/ExpressionList.java    |  2 +-
 src/main/java/io/ebean/FetchGroup.java        | 26 ++++++-------
 src/main/java/io/ebean/FetchGroupBuilder.java | 30 ++++++++------
 src/main/java/io/ebean/Query.java             |  2 +-
 src/main/java/io/ebean/XServiceProvider.java  |  8 ++--
 .../ebean/service/SpiFetchGroupService.java   | 11 ++++--
 .../server/query/DFetchGroup.java             |  2 +-
 .../server/query/DFetchGroupBuilder.java      | 39 +++++++++++--------
 .../server/query/DFetchGroupService.java      |  8 ++--
 .../server/querydefn/SpiFetchGroup.java       |  2 +-
 src/test/java/io/ebean/FetchGroupTest.java    | 14 ++++---
 11 files changed, 81 insertions(+), 63 deletions(-)

diff --git a/src/main/java/io/ebean/ExpressionList.java b/src/main/java/io/ebean/ExpressionList.java
index 2a2a6938b..9ce5e8d08 100644
--- a/src/main/java/io/ebean/ExpressionList.java
+++ b/src/main/java/io/ebean/ExpressionList.java
@@ -415,7 +415,7 @@ public interface ExpressionList<T> {
   /**
    * Apply the fetchGroup which defines what part of the object graph to load.
    */
-  Query<T> select(FetchGroup fetchGroup);
+  Query<T> select(FetchGroup<T> fetchGroup);
 
   /**
    * Set whether this query uses DISTINCT.
diff --git a/src/main/java/io/ebean/FetchGroup.java b/src/main/java/io/ebean/FetchGroup.java
index 54552a227..003bd0de9 100644
--- a/src/main/java/io/ebean/FetchGroup.java
+++ b/src/main/java/io/ebean/FetchGroup.java
@@ -13,7 +13,7 @@ import javax.annotation.Nonnull;
  * <h3>Select example</h3>*
  * <pre>{@code
  *
- * FetchGroup fetchGroup = FetchGroup.of("name, status");
+ * FetchGroup<Customer> fetchGroup = FetchGroup.of(Customer.class, "name, status");
  *
  * Customer.query()
  *   .select(fetchGroup)
@@ -24,7 +24,7 @@ import javax.annotation.Nonnull;
  * <h3>Select and fetch example</h3>
  * <pre>{@code
  *
- * FetchGroup fetchGroup = FetchGroup
+ * FetchGroup<Customer> fetchGroup = FetchGroup.of(Customer.class)
  *   .select("name, status")
  *   .fetch("contacts", "firstName, lastName, email")
  *   .build();
@@ -41,12 +41,12 @@ import javax.annotation.Nonnull;
  * </p>
  * <pre>{@code
  *
- *  FetchGroup FG_ADDRESS = FetchGroup
+ *  FetchGroup<Address> FG_ADDRESS = FetchGroup.of(Address.class)
  *    .select("line1, line2, city")
  *    .fetch("country", "name")
  *    .build();
  *
- *  FetchGroup FG_CUSTOMER = FetchGroup
+ *  FetchGroup<Customer> FG_CUSTOMER = FetchGroup.of(Customer.class)
  *    .select("name, version")
  *    .fetch("billingAddress", FG_ADDRESS)
  *    .build();
@@ -57,8 +57,10 @@ import javax.annotation.Nonnull;
  *    .findList();
  *
  * }</pre>
+ *
+ * @param <T> The bean type the Fetch group can be applied to
  */
-public interface FetchGroup {
+public interface FetchGroup<T> {
 
   /**
    * Return the FetchGroup with the given select clause.
@@ -67,7 +69,7 @@ public interface FetchGroup {
    * </p>
    * <pre>{@code
    *
-   * FetchGroup fetchGroup = FetchGroup.of("name, status");
+   * FetchGroup<Customer> fetchGroup = FetchGroup.of(Customer.class, "name, status");
    *
    * Customer.query()
    *   .select(fetchGroup)
@@ -80,8 +82,8 @@ public interface FetchGroup {
    * @return The FetchGroup with the given select clause
    */
   @Nonnull
-  static FetchGroup of(String select) {
-    return XServiceProvider.fetchGroupOf(select);
+  static <T> FetchGroup<T> of(Class<T> cls, String select) {
+    return XServiceProvider.fetchGroupOf(cls, select);
   }
 
   /**
@@ -91,7 +93,7 @@ public interface FetchGroup {
    * </p>
    * <pre>{@code
    *
-   * FetchGroup fetchGroup = FetchGroup
+   * FetchGroup<Customer> fetchGroup = FetchGroup.of(Customer.class)
    *   .select("name, status")
    *   .fetch("contacts", "firstName, lastName, email")
    *   .build();
@@ -102,13 +104,11 @@ public interface FetchGroup {
    *
    * }</pre>
    *
-   * @param select The select clause for the FetchGroup
-   *
    * @return The FetchGroupBuilder with the given select clause which we will add fetch clauses to
    */
   @Nonnull
-  static FetchGroupBuilder select(String select) {
-    return XServiceProvider.fetchGroupSelect(select);
+  static <T> FetchGroupBuilder<T> of(Class<T> cls) {
+    return XServiceProvider.fetchGroupOf(cls);
   }
 
 }
diff --git a/src/main/java/io/ebean/FetchGroupBuilder.java b/src/main/java/io/ebean/FetchGroupBuilder.java
index 65ad49bbf..cfe1ebfd8 100644
--- a/src/main/java/io/ebean/FetchGroupBuilder.java
+++ b/src/main/java/io/ebean/FetchGroupBuilder.java
@@ -23,65 +23,71 @@ import javax.annotation.Nonnull;
  *
  * }</pre>
  */
-public interface FetchGroupBuilder {
+public interface FetchGroupBuilder<T> {
 
   /**
-   * Fetch the path including all its properties.
+   * Specify specific properties to select (top level properties).
    */
   @Nonnull
-  FetchGroupBuilder fetch(String path);
+  FetchGroupBuilder<T> select(String select);
+
+  /**
+   * Fetch all the properties at the given path.
+   */
+  @Nonnull
+  FetchGroupBuilder<T> fetch(String path);
 
   /**
    * Fetch the path with the nested fetch group.
    */
   @Nonnull
-  FetchGroupBuilder fetch(String path, FetchGroup nestedGroup);
+  FetchGroupBuilder<T> fetch(String path, FetchGroup nestedGroup);
 
   /**
    * Fetch the path using a query join with the nested fetch group.
    */
   @Nonnull
-  FetchGroupBuilder fetchQuery(String path, FetchGroup nestedGroup);
+  FetchGroupBuilder<T> fetchQuery(String path, FetchGroup nestedGroup);
 
   /**
    * Fetch the path lazily with the nested fetch group.
    */
   @Nonnull
-  FetchGroupBuilder fetchLazy(String path, FetchGroup nestedGroup);
+  FetchGroupBuilder<T> fetchLazy(String path, FetchGroup nestedGroup);
 
   /**
    * Fetch the path including specified properties.
    */
   @Nonnull
-  FetchGroupBuilder fetch(String path, String properties);
+  FetchGroupBuilder<T> fetch(String path, String properties);
 
   /**
    * Fetch the path including all its properties using a query join.
    */
   @Nonnull
-  FetchGroupBuilder fetchQuery(String path);
+  FetchGroupBuilder<T> fetchQuery(String path);
 
   /**
    * Fetch the path including specified properties using a query join.
    */
   @Nonnull
-  FetchGroupBuilder fetchQuery(String path, String properties);
+  FetchGroupBuilder<T> fetchQuery(String path, String properties);
 
   /**
    * Fetch the path including all its properties lazily.
    */
   @Nonnull
-  FetchGroupBuilder fetchLazy(String path);
+  FetchGroupBuilder<T> fetchLazy(String path);
 
   /**
    * Fetch the path including specified properties lazily.
    */
   @Nonnull
-  FetchGroupBuilder fetchLazy(String path, String properties);
+  FetchGroupBuilder<T> fetchLazy(String path, String properties);
 
   /**
    * Build and return the FetchGroup.
    */
   @Nonnull
-  FetchGroup build();
+  FetchGroup<T> build();
 }
diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index 350393776..8749a2213 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -400,7 +400,7 @@ public interface Query<T> {
   /**
    * Apply the fetchGroup which defines what part of the object graph to load.
    */
-  Query<T> select(FetchGroup fetchGroup);
+  Query<T> select(FetchGroup<T> fetchGroup);
 
   /**
    * Specify a path to fetch eagerly including specific properties.
diff --git a/src/main/java/io/ebean/XServiceProvider.java b/src/main/java/io/ebean/XServiceProvider.java
index 53a81993a..81976df38 100644
--- a/src/main/java/io/ebean/XServiceProvider.java
+++ b/src/main/java/io/ebean/XServiceProvider.java
@@ -61,14 +61,14 @@ class XServiceProvider {
   /**
    * Return the FetchGroup with the given select clause.
    */
-  static FetchGroup fetchGroupOf(String select) {
-    return fetchGroupService.of(select);
+  static <T> FetchGroup<T> fetchGroupOf(Class<T> cls, String select) {
+    return fetchGroupService.of(cls, select);
   }
 
   /**
    * Return the FetchGroupBuilder with the given select clause.
    */
-  static FetchGroupBuilder fetchGroupSelect(String select) {
-    return fetchGroupService.select(select);
+  static <T> FetchGroupBuilder<T> fetchGroupOf(Class<T> cls) {
+    return fetchGroupService.of(cls);
   }
 }
diff --git a/src/main/java/io/ebean/service/SpiFetchGroupService.java b/src/main/java/io/ebean/service/SpiFetchGroupService.java
index 813f5244d..b486d4ae1 100644
--- a/src/main/java/io/ebean/service/SpiFetchGroupService.java
+++ b/src/main/java/io/ebean/service/SpiFetchGroupService.java
@@ -10,14 +10,17 @@ public interface SpiFetchGroupService {
 
   /**
    * Return the FetchGroup with the given select clause.
+   *
+   * @param beanType The type of entity bean the fetch group is for
+   * @param select   The properties to select (top level properties)
    */
-  FetchGroup of(String select);
+  <T> FetchGroup<T> of(Class<T> beanType, String select);
 
   /**
    * Create and return a FetchGroupBuilder starting with a select() clause.
    *
-   * @param select The properties to select (top level properties)
-   * @return The FetchGroupBuilder to add additional fetch clauses
+   * @param beanType The type of entity bean the fetch group is for
+   * @return The FetchGroupBuilder to add additional select and fetch clauses
    */
-  FetchGroupBuilder select(String select);
+  <T> FetchGroupBuilder<T> of(Class<T> beanType);
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/DFetchGroup.java b/src/main/java/io/ebeaninternal/server/query/DFetchGroup.java
index 6bd9cbc8e..4b17e3461 100644
--- a/src/main/java/io/ebeaninternal/server/query/DFetchGroup.java
+++ b/src/main/java/io/ebeaninternal/server/query/DFetchGroup.java
@@ -6,7 +6,7 @@ import io.ebeaninternal.server.querydefn.SpiFetchGroup;
 /**
  * Default FetchGroup implementation.
  */
-class DFetchGroup implements SpiFetchGroup {
+class DFetchGroup<T> implements SpiFetchGroup<T> {
 
   private final OrmQueryDetail detail;
 
diff --git a/src/main/java/io/ebeaninternal/server/query/DFetchGroupBuilder.java b/src/main/java/io/ebeaninternal/server/query/DFetchGroupBuilder.java
index 76778ee41..15c876b0d 100644
--- a/src/main/java/io/ebeaninternal/server/query/DFetchGroupBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/DFetchGroupBuilder.java
@@ -9,39 +9,46 @@ import io.ebeaninternal.server.querydefn.SpiFetchGroup;
 /**
  * Default implementation of the FetchGroupBuilder.
  */
-class DFetchGroupBuilder implements FetchGroupBuilder {
+class DFetchGroupBuilder<T> implements FetchGroupBuilder<T> {
 
   private static final FetchConfig FETCH_QUERY = new FetchConfig().query();
 
   private static final FetchConfig FETCH_LAZY = new FetchConfig().lazy();
 
-  private OrmQueryDetail detail;
+  private final OrmQueryDetail detail;
 
-  DFetchGroupBuilder(OrmQueryDetail detail) {
-    this.detail = detail;
+  DFetchGroupBuilder() {
+    this.detail = new OrmQueryDetail();
   }
 
   @Override
-  public FetchGroupBuilder fetch(String path) {
+  public FetchGroupBuilder<T> select(String select) {
+    detail.select(select);
+    return this;
+  }
+
+  @Override
+  public FetchGroupBuilder<T> fetch(String path) {
     detail.fetch(path, null, null);
     return this;
   }
 
   @Override
-  public FetchGroupBuilder fetch(String path, FetchGroup nestedGroup) {
+  public FetchGroupBuilder<T> fetch(String path, FetchGroup nestedGroup) {
     return fetchNested(path, nestedGroup, null);
   }
+
   @Override
-  public FetchGroupBuilder fetchQuery(String path, FetchGroup nestedGroup) {
+  public FetchGroupBuilder<T> fetchQuery(String path, FetchGroup nestedGroup) {
     return fetchNested(path, nestedGroup, FETCH_QUERY);
   }
 
   @Override
-  public FetchGroupBuilder fetchLazy(String path, FetchGroup nestedGroup) {
+  public FetchGroupBuilder<T> fetchLazy(String path, FetchGroup nestedGroup) {
     return fetchNested(path, nestedGroup, FETCH_LAZY);
   }
 
-  private FetchGroupBuilder fetchNested(String path, FetchGroup nestedGroup, FetchConfig fetchConfig) {
+  private FetchGroupBuilder<T> fetchNested(String path, FetchGroup nestedGroup, FetchConfig fetchConfig) {
 
     OrmQueryDetail nestedDetail = ((SpiFetchGroup) nestedGroup).underlying();
     detail.addNested(path, nestedDetail, fetchConfig);
@@ -49,37 +56,37 @@ class DFetchGroupBuilder implements FetchGroupBuilder {
   }
 
   @Override
-  public FetchGroupBuilder fetchQuery(String path) {
+  public FetchGroupBuilder<T> fetchQuery(String path) {
     detail.fetch(path, null, FETCH_QUERY);
     return this;
   }
 
   @Override
-  public FetchGroupBuilder fetchLazy(String path) {
+  public FetchGroupBuilder<T> fetchLazy(String path) {
     detail.fetch(path, null, FETCH_LAZY);
     return this;
   }
 
   @Override
-  public FetchGroupBuilder fetch(String path, String properties) {
+  public FetchGroupBuilder<T> fetch(String path, String properties) {
     detail.fetch(path, properties, null);
     return this;
   }
 
   @Override
-  public FetchGroupBuilder fetchQuery(String path, String properties) {
+  public FetchGroupBuilder<T> fetchQuery(String path, String properties) {
     detail.fetch(path, properties, FETCH_QUERY);
     return this;
   }
 
   @Override
-  public FetchGroupBuilder fetchLazy(String path, String properties) {
+  public FetchGroupBuilder<T> fetchLazy(String path, String properties) {
     detail.fetch(path, properties, FETCH_LAZY);
     return this;
   }
 
   @Override
-  public FetchGroup build() {
-    return new DFetchGroup(detail);
+  public FetchGroup<T> build() {
+    return new DFetchGroup<>(detail);
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/DFetchGroupService.java b/src/main/java/io/ebeaninternal/server/query/DFetchGroupService.java
index 62555997d..3dc53a83a 100644
--- a/src/main/java/io/ebeaninternal/server/query/DFetchGroupService.java
+++ b/src/main/java/io/ebeaninternal/server/query/DFetchGroupService.java
@@ -11,13 +11,13 @@ import io.ebeaninternal.server.querydefn.OrmQueryDetail;
 public final class DFetchGroupService implements SpiFetchGroupService {
 
   @Override
-  public FetchGroup of(String select) {
-    return new DFetchGroup(detail(select));
+  public <T> FetchGroup<T> of(Class<T> cls, String select) {
+    return new DFetchGroup<>(detail(select));
   }
 
   @Override
-  public FetchGroupBuilder select(String select) {
-    return new DFetchGroupBuilder(detail(select));
+  public <T> FetchGroupBuilder<T> of(Class<T> cls) {
+    return new DFetchGroupBuilder<>();
   }
 
   private OrmQueryDetail detail(String select) {
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/SpiFetchGroup.java b/src/main/java/io/ebeaninternal/server/querydefn/SpiFetchGroup.java
index 05935e25c..35f622f03 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/SpiFetchGroup.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/SpiFetchGroup.java
@@ -5,7 +5,7 @@ import io.ebean.FetchGroup;
 /**
  * Service API of FetchGroup.
  */
-public interface SpiFetchGroup extends FetchGroup {
+public interface SpiFetchGroup<T> extends FetchGroup<T> {
 
   /**
    * Return the detail to use for query execution.
diff --git a/src/test/java/io/ebean/FetchGroupTest.java b/src/test/java/io/ebean/FetchGroupTest.java
index 91bf229b8..148cc7230 100644
--- a/src/test/java/io/ebean/FetchGroupTest.java
+++ b/src/test/java/io/ebean/FetchGroupTest.java
@@ -2,6 +2,8 @@ package io.ebean;
 
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
+import org.tests.model.basic.Address;
+import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
 
@@ -14,7 +16,7 @@ public class FetchGroupTest extends BaseTestCase {
   @Test
   public void simple() {
 
-    FetchGroup fetch = FetchGroup.of("name, status");
+    FetchGroup<Customer> fetch = FetchGroup.of(Customer.class, "name, status");
 
     Query<Customer> query = Customer.find
       .query()
@@ -33,7 +35,7 @@ public class FetchGroupTest extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    FetchGroup fetch = FetchGroup
+    FetchGroup<Customer> fetch = FetchGroup.of(Customer.class)
       .select("name, status")
       .fetchQuery("contacts", "firstName, lastName, email")
       .build();
@@ -59,9 +61,9 @@ public class FetchGroupTest extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    FetchGroup CT_NAME = FetchGroup.of("firstName, lastName, email");
+    FetchGroup<Contact> CT_NAME = FetchGroup.of(Contact.class, "firstName, lastName, email");
 
-    FetchGroup fetch = FetchGroup
+    FetchGroup<Customer> fetch = FetchGroup.of(Customer.class)
       .select("name")
       .fetchQuery("contacts", CT_NAME)
       .build();
@@ -86,12 +88,12 @@ public class FetchGroupTest extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    FetchGroup FGAddress = FetchGroup
+    FetchGroup<Address> FGAddress = FetchGroup.of(Address.class)
       .select("line1, line2, city")
       .fetch("country", "name")
       .build();
 
-    FetchGroup FBCustomer = FetchGroup
+    FetchGroup<Customer> FBCustomer = FetchGroup.of(Customer.class)
       .select("name, version")
       .fetch("billingAddress", FGAddress)
       .build();

From d4be0718a8fe17ba0cbf77fa16070d6f26fae3bf Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 6 Aug 2018 21:30:36 +1200
Subject: [PATCH 0405/1036] #1460 - ENH: Add FetchGroup ... as a mechanism to
 specify select() + fetch() separately from Query

Change to add generics for FetchGroup
---
 src/main/java/io/ebean/FetchGroupBuilder.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/ebean/FetchGroupBuilder.java b/src/main/java/io/ebean/FetchGroupBuilder.java
index cfe1ebfd8..5b4f8ad3a 100644
--- a/src/main/java/io/ebean/FetchGroupBuilder.java
+++ b/src/main/java/io/ebean/FetchGroupBuilder.java
@@ -41,19 +41,19 @@ public interface FetchGroupBuilder<T> {
    * Fetch the path with the nested fetch group.
    */
   @Nonnull
-  FetchGroupBuilder<T> fetch(String path, FetchGroup nestedGroup);
+  FetchGroupBuilder<T> fetch(String path, FetchGroup<?> nestedGroup);
 
   /**
    * Fetch the path using a query join with the nested fetch group.
    */
   @Nonnull
-  FetchGroupBuilder<T> fetchQuery(String path, FetchGroup nestedGroup);
+  FetchGroupBuilder<T> fetchQuery(String path, FetchGroup<?> nestedGroup);
 
   /**
    * Fetch the path lazily with the nested fetch group.
    */
   @Nonnull
-  FetchGroupBuilder<T> fetchLazy(String path, FetchGroup nestedGroup);
+  FetchGroupBuilder<T> fetchLazy(String path, FetchGroup<?> nestedGroup);
 
   /**
    * Fetch the path including specified properties.

From 2b3e485beba8f64a02a2453968503b1da8978220 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 6 Aug 2018 21:42:41 +1200
Subject: [PATCH 0406/1036] [maven-release-plugin] prepare release
 ebean-11.19.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d7fe46de2..bd3f97995 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.19.2-SNAPSHOT</version>
+  <version>11.19.2</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.19.2</tag>
   </scm>
 
   <profiles>

From 3d2f885e87c0430e5cee7e4600949e0ac62b9f0d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 6 Aug 2018 21:42:56 +1200
Subject: [PATCH 0407/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index bd3f97995..ca1a8d895 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.19.2</version>
+  <version>11.19.3-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.19.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 1dd7720605e41f0a37dc337e7077b06a77bdc7e7 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 7 Aug 2018 11:19:09 +1200
Subject: [PATCH 0408/1036] #1462 - DB Migration generation with Postgis types
 gives us non-strict geometry column DDL

---
 .../ebeaninternal/dbmigration/DefaultDbMigration.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index d420a459b..68872221a 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -84,6 +84,8 @@ public class DefaultDbMigration implements DbMigration {
 
   protected DatabasePlatform databasePlatform;
 
+  private boolean vanillaPlatform;
+
   protected List<Pair> platforms = new ArrayList<>();
 
   protected ServerConfig serverConfig;
@@ -192,6 +194,7 @@ public class DefaultDbMigration implements DbMigration {
    */
   @Override
   public void setPlatform(Platform platform) {
+    vanillaPlatform = true;
     setPlatform(getPlatform(platform));
   }
 
@@ -556,11 +559,10 @@ public class DefaultDbMigration implements DbMigration {
     if (server == null) {
       setServer(Ebean.getDefaultServer());
     }
-    if (databasePlatform == null && platforms.isEmpty()) {
-      // not explicitly set not set a list of platforms so
-      // default to the platform of the default server
+    if (vanillaPlatform || databasePlatform == null) {
+      // not explicitly set so use the platform of the server
       databasePlatform = server.getDatabasePlatform();
-      logger.debug("set platform to {}", databasePlatform.getName());
+      logger.trace("set platform to {}", databasePlatform.getName());
     }
     if (migrationConfig != null) {
       if (strictMode != null) {

From a161d0c01b1f11477feba0c74197e233c980689f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 7 Aug 2018 11:36:26 +1200
Subject: [PATCH 0409/1036] #1463 - NPE in MigrationModel.readMigrations() when
 running using File resources with no migration directory

---
 .../io/ebeaninternal/dbmigration/model/MigrationModel.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java b/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
index f12283c05..a27feb783 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
@@ -42,9 +42,10 @@ public class MigrationModel {
 
     // find all the migration xml files
     File[] xmlFiles = modelDirectory.listFiles(pathname -> pathname.getName().toLowerCase().endsWith(modelSuffix));
-
+    if (xmlFiles == null || xmlFiles.length == 0) {
+      return;
+    }
     List<MigrationResource> resources = new ArrayList<>(xmlFiles.length);
-
     for (File xmlFile : xmlFiles) {
       resources.add(new MigrationResource(xmlFile, createVersion(xmlFile)));
     }

From 75395a848174318d44708ae49ad33fe3e07aa579 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 7 Aug 2018 11:55:06 +1200
Subject: [PATCH 0410/1036] #1464 - NPE in
 PropertiesWrapper.internalGet(PropertiesWrapper.java:74) running
 multi-platform DB migration generation with ServerConfig that has no
 properties

Note that newPlatformConfig() is only used for multi-platform DB migration generation.
---
 src/main/java/io/ebean/config/ServerConfig.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 088ec3663..30e6e92f1 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -3130,9 +3130,10 @@ public class ServerConfig {
    * @return A copy of the PlatformConfig with overridden properties
    */
   public PlatformConfig newPlatformConfig(String propertiesPath, String platformPrefix) {
-
+    if (properties == null) {
+      properties = new Properties();
+    }
     PropertiesWrapper p = new PropertiesWrapper(propertiesPath, platformPrefix, properties, classLoadConfig);
-
     PlatformConfig config = new PlatformConfig(platformConfig);
     config.loadSettings(p);
     return config;

From 23a9cf9bb34bf9921b1759a15b166ee3adee0f98 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 8 Aug 2018 12:05:50 +1200
Subject: [PATCH 0411/1036] [maven-release-plugin] prepare release
 ebean-11.19.3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ca1a8d895..0d54fbf55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.19.3-SNAPSHOT</version>
+  <version>11.19.3</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.19.3</tag>
   </scm>
 
   <profiles>

From c9497fd654b9639191388dacc8d2aa4b8c10f551 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 8 Aug 2018 12:06:03 +1200
Subject: [PATCH 0412/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0d54fbf55..ee4a78d73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.19.3</version>
+  <version>11.19.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.19.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From ded7d44974c33c9cdee5be2aaf993e7a4620237d Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 8 Aug 2018 23:29:29 +1200
Subject: [PATCH 0413/1036] Add support for Postgres range partition DDL plus
 refactor xsd definitions that had got out of sync (#1465)

* Add partition meta mapping

* Fix to allow schema prefix on select dynamic formula

* Add partition meta mapping

* Migration XSD Update

* Fix to allow schema prefix on select dynamic formula

* Bump ebean-migration to 11.8.1
---
 pom.xml                                       |   6 +-
 .../ddlgeneration/platform/BaseTableDdl.java  |   9 +-
 .../ddlgeneration/platform/PlatformDdl.java   |   8 +
 .../ddlgeneration/platform/PostgresDdl.java   |  13 ++
 .../dbmigration/migration/AddColumn.java      |  12 +-
 .../migration/AddHistoryTable.java            |   4 +-
 .../migration/AddTableComment.java            |   4 +-
 .../migration/AddUniqueConstraint.java        |  72 +++++----
 .../dbmigration/migration/AlterColumn.java    |  82 +++++++---
 .../migration/AlterForeignKey.java            |  25 ++-
 .../migration/AlterHistoryTable.java          |   4 +-
 .../dbmigration/migration/Apply.java          |   4 +-
 .../dbmigration/migration/ChangeSet.java      |  20 +--
 .../dbmigration/migration/ChangeSetType.java  |   7 +-
 .../dbmigration/migration/Column.java         |  64 ++++++--
 .../dbmigration/migration/Configuration.java  |   4 +-
 .../dbmigration/migration/CreateIndex.java    |   4 +-
 .../dbmigration/migration/CreateTable.java    |  74 +++++++--
 .../dbmigration/migration/DdlScript.java      |  49 ++++--
 .../migration/DefaultTablespace.java          |   4 +-
 .../dbmigration/migration/DropColumn.java     |   4 +-
 .../migration/DropHistoryTable.java           |   4 +-
 .../dbmigration/migration/DropIndex.java      |   4 +-
 .../dbmigration/migration/DropTable.java      |  26 +--
 .../dbmigration/migration/ForeignKey.java     |   5 +-
 .../dbmigration/migration/IdentityType.java   |   2 +-
 .../dbmigration/migration/Migration.java      |  12 +-
 .../dbmigration/migration/ObjectFactory.java  | 153 +++++++++---------
 .../dbmigration/migration/RenameColumn.java   |   4 +-
 .../dbmigration/migration/RenameTable.java    |   4 +-
 .../dbmigration/migration/Rollback.java       |   4 +-
 .../dbmigration/migration/Sql.java            |   4 +-
 .../migration/UniqueConstraint.java           |  33 ++--
 .../model/MCompoundUniqueConstraint.java      |  27 ++--
 .../dbmigration/model/MTable.java             |  19 +++
 .../model/build/ModelBuildBeanVisitor.java    |   1 +
 .../build/ModelBuildPropertyVisitor.java      |   4 +-
 .../server/deploy/BeanDescriptor.java         |  20 ++-
 .../server/deploy/PartitionMeta.java          |  27 ++++
 .../deploy/meta/DeployBeanDescriptor.java     |  18 +++
 .../server/deploy/parse/AnnotationClass.java  |   7 +
 .../server/query/SqlTreeBuilder.java          |   8 +-
 src/main/resources/ebean-dbmigration-1.0.xsd  |  40 ++++-
 src/main/resources/ebean-extraddl-1.0.xsd     |   2 +
 .../migrationtest/model/1.1.model.xml         |  24 ++-
 .../migrationtest/model/1.3.model.xml         |   4 +-
 46 files changed, 639 insertions(+), 290 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/PartitionMeta.java

diff --git a/pom.xml b/pom.xml
index ee4a78d73..d07b0a928 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.19.4-SNAPSHOT</version>
+  <version>11.20.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -117,7 +117,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>4.1</version>
+      <version>4.2</version>
     </dependency>
 
     <dependency>
@@ -135,7 +135,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>11.7.1</version>
+      <version>11.8.1</version>
     </dependency>
 
     <dependency>
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
index 47930bce1..7b3c72bb9 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
@@ -257,6 +257,8 @@ public class BaseTableDdl implements TableDdl {
       useSequence = (IdType.SEQUENCE == useDbIdentityType);
     }
 
+    String partitionMode = createTable.getPartitionMode();
+
     DdlBuffer apply = writer.apply();
     apply.append("create table ").append(tableName).append(" (");
     writeTableColumns(apply, columns, useIdentity);
@@ -265,7 +267,9 @@ public class BaseTableDdl implements TableDdl {
     writeCompoundUniqueConstraints(apply, createTable);
     if (!pk.isEmpty()) {
       // defined on the columns
-      writePrimaryKeyConstraint(apply, createTable.getPkName(), toColumnNames(pk));
+      if (partitionMode == null || !platformDdl.suppressPrimaryKeyOnPartition()) {
+        writePrimaryKeyConstraint(apply, createTable.getPkName(), toColumnNames(pk));
+      }
     }
     if (platformDdl.isInlineForeignKeys()) {
       writeInlineForeignKeys(writer, createTable);
@@ -273,6 +277,9 @@ public class BaseTableDdl implements TableDdl {
 
     apply.newLine().append(")");
     addTableCommentInline(apply, createTable);
+    if (partitionMode != null) {
+      platformDdl.addTablePartition(apply, partitionMode, createTable.getPartitionColumn());
+    }
     apply.endOfStatement();
 
     addComments(apply, createTable);
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
index b2320c7b9..515004bd5 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -662,4 +662,12 @@ public class PlatformDdl {
   public void unlockTables(DdlBuffer buffer, Collection<String> tables) throws IOException {
 
   }
+
+  public boolean suppressPrimaryKeyOnPartition() {
+    return false;
+  }
+
+  public void addTablePartition(DdlBuffer apply, String partitionMode, String partitionColumn) throws IOException {
+    // only supported by postgres initially
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java
index 709e6f026..5230f14a0 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java
@@ -1,6 +1,9 @@
 package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
 import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+
+import java.io.IOException;
 
 /**
  * Postgres specific DDL.
@@ -16,6 +19,11 @@ public class PostgresDdl extends PlatformDdl {
     this.columnSetNull = "drop not null";
   }
 
+  @Override
+  public boolean suppressPrimaryKeyOnPartition() {
+    return true;
+  }
+
   @Override
   protected String convertArrayType(String logicalArrayType) {
     return NativeDbArray.logicalToNative(logicalArrayType);
@@ -38,4 +46,9 @@ public class PostgresDdl extends PlatformDdl {
     }
     return columnDefn;
   }
+
+  @Override
+  public void addTablePartition(DdlBuffer apply, String partitionMode, String partitionColumn) throws IOException {
+    apply.append(" partition by range (").append(partitionColumn).append(")");
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java b/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java
index f3423c852..3de2c81ec 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java
@@ -12,9 +12,9 @@ import java.util.List;
 
 /**
  * <p>Java class for anonymous complex type.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -45,20 +45,20 @@ public class AddColumn {
 
   /**
    * Gets the value of the column property.
-   * <p>
+   *
    * <p>
    * This accessor method returns a reference to the live list,
    * not a snapshot. Therefore any modification you make to the
    * returned list will be present inside the JAXB object.
    * This is why there is not a <CODE>set</CODE> method for the column property.
-   * <p>
+   *
    * <p>
    * For example, to add a new item, do as follows:
    * <pre>
    *    getColumn().add(newItem);
    * </pre>
-   * <p>
-   * <p>
+   *
+   *
    * <p>
    * Objects of the following type(s) are allowed in the list
    * {@link Column }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java b/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java
index 7af32e7da..5ea02ada8 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java b/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java
index c9b21ff63..e8564fa0a 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java b/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java
index 8ed14b23f..01dacaead 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java
@@ -9,11 +9,21 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
- * TODO
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="constraintName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="tableName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="columnNames" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="oneToOne" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="nullableColumns" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  */
 @XmlAccessorType(XmlAccessType.FIELD)
@@ -23,18 +33,14 @@ public class AddUniqueConstraint {
 
   @XmlAttribute(name = "constraintName", required = true)
   protected String constraintName;
-
   @XmlAttribute(name = "tableName", required = true)
   protected String tableName;
-
   @XmlAttribute(name = "columnNames", required = true)
   protected String columnNames;
-
-  @XmlAttribute(name = "nullableColumns", required = true)
-  protected String nullableColumns;
-    
-  @XmlAttribute(name = "oneToOne", required = false)
+  @XmlAttribute(name = "oneToOne")
   protected Boolean oneToOne;
+  @XmlAttribute(name = "nullableColumns")
+  protected String nullableColumns;
 
   /**
    * Gets the value of the constraintName property.
@@ -55,7 +61,7 @@ public class AddUniqueConstraint {
   public void setConstraintName(String value) {
     this.constraintName = value;
   }
-  
+
   /**
    * Gets the value of the tableName property.
    *
@@ -65,15 +71,15 @@ public class AddUniqueConstraint {
   public String getTableName() {
     return tableName;
   }
-  
+
   /**
    * Sets the value of the tableName property.
    *
    * @param value allowed object is
    *              {@link String }
    */
-  public void setTableName(String tableName) {
-    this.tableName = tableName;
+  public void setTableName(String value) {
+    this.tableName = value;
   }
 
   /**
@@ -96,6 +102,26 @@ public class AddUniqueConstraint {
     this.columnNames = value;
   }
 
+  /**
+   * Gets the value of the oneToOne property.
+   *
+   * @return possible object is
+   * {@link Boolean }
+   */
+  public Boolean isOneToOne() {
+    return oneToOne;
+  }
+
+  /**
+   * Sets the value of the oneToOne property.
+   *
+   * @param value allowed object is
+   *              {@link Boolean }
+   */
+  public void setOneToOne(Boolean value) {
+    this.oneToOne = value;
+  }
+
   /**
    * Gets the value of the nullableColumns property.
    *
@@ -115,23 +141,5 @@ public class AddUniqueConstraint {
   public void setNullableColumns(String value) {
     this.nullableColumns = value;
   }
-  
-  /**
-   * Gets the value of the oneToOne property.
-   *
-   * @return true if oneToOne was set
-   */
-  public boolean isOneToOne() {
-    return Boolean.TRUE.equals(oneToOne);
-  }
-
-  /**
-   * Sets the value of the oneToOne property.
-   *
-   * @param value boolean
-   */
-  public void setOneToOne(boolean oneToOne) {
-    this.oneToOne = oneToOne;
-  }
 
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java b/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java
index 47f9a413b..1723abc50 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java
@@ -3,7 +3,6 @@ package io.ebeaninternal.dbmigration.migration;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
@@ -12,13 +11,17 @@ import java.util.List;
 
 /**
  * <p>Java class for anonymous complex type.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="before" type="{http://ebean-orm.github.io/xml/ns/dbmigration}ddl-script" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="after" type="{http://ebean-orm.github.io/xml/ns/dbmigration}ddl-script" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
  *       &lt;attribute name="columnName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
  *       &lt;attribute name="tableName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
  *       &lt;attribute name="withHistory" type="{http://www.w3.org/2001/XMLSchema}boolean" />
@@ -50,16 +53,14 @@ import java.util.List;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-    "before", "after"
+  "before",
+  "after"
 })
 @XmlRootElement(name = "alterColumn")
 public class AlterColumn {
 
-  @XmlElement(required = false)
   protected List<DdlScript> before;
-  @XmlElement(required = false)
   protected List<DdlScript> after;
-
   @XmlAttribute(name = "columnName", required = true)
   protected String columnName;
   @XmlAttribute(name = "tableName", required = true)
@@ -109,6 +110,60 @@ public class AlterColumn {
   @XmlAttribute(name = "dropForeignKeyIndex")
   protected String dropForeignKeyIndex;
 
+  /**
+   * Gets the value of the before property.
+   *
+   * <p>
+   * This accessor method returns a reference to the live list,
+   * not a snapshot. Therefore any modification you make to the
+   * returned list will be present inside the JAXB object.
+   * This is why there is not a <CODE>set</CODE> method for the before property.
+   *
+   * <p>
+   * For example, to add a new item, do as follows:
+   * <pre>
+   *    getBefore().add(newItem);
+   * </pre>
+   *
+   *
+   * <p>
+   * Objects of the following type(s) are allowed in the list
+   * {@link DdlScript }
+   */
+  public List<DdlScript> getBefore() {
+    if (before == null) {
+      before = new ArrayList<>();
+    }
+    return this.before;
+  }
+
+  /**
+   * Gets the value of the after property.
+   *
+   * <p>
+   * This accessor method returns a reference to the live list,
+   * not a snapshot. Therefore any modification you make to the
+   * returned list will be present inside the JAXB object.
+   * This is why there is not a <CODE>set</CODE> method for the after property.
+   *
+   * <p>
+   * For example, to add a new item, do as follows:
+   * <pre>
+   *    getAfter().add(newItem);
+   * </pre>
+   *
+   *
+   * <p>
+   * Objects of the following type(s) are allowed in the list
+   * {@link DdlScript }
+   */
+  public List<DdlScript> getAfter() {
+    if (after == null) {
+      after = new ArrayList<>();
+    }
+    return this.after;
+  }
+
   /**
    * Gets the value of the columnName property.
    *
@@ -589,17 +644,4 @@ public class AlterColumn {
     this.dropForeignKeyIndex = value;
   }
 
-  public List<DdlScript> getBefore() {
-    if (before == null) {
-      before = new ArrayList<>();
-    }
-    return before;
-  }
-
-  public List<DdlScript> getAfter() {
-    if (after == null) {
-      after = new ArrayList<>();
-    }
-    return after;
-  }
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java b/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java
index ed0ccf000..deb5e812f 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java
@@ -9,21 +9,34 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
- * TODO
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="columnNames" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="refColumnNames" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="refTableName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="indexName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="tableName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="onDelete" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="onUpdate" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "")
-@XmlRootElement(name = "foreignKey")
+@XmlRootElement(name = "alterForeignKey")
 public class AlterForeignKey {
 
   @XmlAttribute(name = "name", required = true)
   protected String name;
-  @XmlAttribute(name = "columnNames", required = true)
+  @XmlAttribute(name = "columnNames")
   protected String columnNames;
   @XmlAttribute(name = "refColumnNames")
   protected String refColumnNames;
@@ -37,6 +50,7 @@ public class AlterForeignKey {
   protected String onDelete;
   @XmlAttribute(name = "onUpdate")
   protected String onUpdate;
+
   /**
    * Gets the value of the name property.
    *
@@ -196,4 +210,5 @@ public class AlterForeignKey {
   public void setOnUpdate(String value) {
     this.onUpdate = value;
   }
+
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java b/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java
index feb807968..f77e1d8f2 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java b/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java
index 5c40b242b..8b9a3913d 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlValue;
 
 /**
  * <p>Java class for anonymous complex type.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
  * &lt;complexType>
  *   &lt;simpleContent>
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java b/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java
index be9259950..5fa984ce1 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java
@@ -13,9 +13,9 @@ import java.util.List;
 
 /**
  * <p>Java class for anonymous complex type.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -50,16 +50,16 @@ public class ChangeSet {
     @XmlElement(name = "dropTable", type = DropTable.class),
     @XmlElement(name = "renameTable", type = RenameTable.class),
     @XmlElement(name = "addTableComment", type = AddTableComment.class),
+    @XmlElement(name = "addUniqueConstraint", type = AddUniqueConstraint.class),
     @XmlElement(name = "addHistoryTable", type = AddHistoryTable.class),
     @XmlElement(name = "dropHistoryTable", type = DropHistoryTable.class),
+    @XmlElement(name = "alterForeignKey", type = AlterForeignKey.class),
     @XmlElement(name = "addColumn", type = AddColumn.class),
     @XmlElement(name = "dropColumn", type = DropColumn.class),
     @XmlElement(name = "alterColumn", type = AlterColumn.class),
     @XmlElement(name = "renameColumn", type = RenameColumn.class),
     @XmlElement(name = "createIndex", type = CreateIndex.class),
-    @XmlElement(name = "dropIndex", type = DropIndex.class),
-    @XmlElement(name = "addUniqueConstraint", type = AddUniqueConstraint.class),
-    @XmlElement(name = "alterForeignKey", type = AlterForeignKey.class),
+    @XmlElement(name = "dropIndex", type = DropIndex.class)
   })
   protected List<Object> changeSetChildren;
   @XmlAttribute(name = "type", required = true)
@@ -77,20 +77,20 @@ public class ChangeSet {
 
   /**
    * Gets the value of the changeSetChildren property.
-   * <p>
+   *
    * <p>
    * This accessor method returns a reference to the live list,
    * not a snapshot. Therefore any modification you make to the
    * returned list will be present inside the JAXB object.
    * This is why there is not a <CODE>set</CODE> method for the changeSetChildren property.
-   * <p>
+   *
    * <p>
    * For example, to add a new item, do as follows:
    * <pre>
    *    getChangeSetChildren().add(newItem);
    * </pre>
-   * <p>
-   * <p>
+   *
+   *
    * <p>
    * Objects of the following type(s) are allowed in the list
    * {@link Configuration }
@@ -99,8 +99,10 @@ public class ChangeSet {
    * {@link DropTable }
    * {@link RenameTable }
    * {@link AddTableComment }
+   * {@link AddUniqueConstraint }
    * {@link AddHistoryTable }
    * {@link DropHistoryTable }
+   * {@link AlterForeignKey }
    * {@link AddColumn }
    * {@link DropColumn }
    * {@link AlterColumn }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java b/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java
index 4537e85c5..c3e8c80ed 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java
@@ -7,7 +7,7 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for changeSetType.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
  * <pre>
@@ -16,6 +16,7 @@ import javax.xml.bind.annotation.XmlType;
  *     &lt;enumeration value="apply"/>
  *     &lt;enumeration value="pendingDrops"/>
  *     &lt;enumeration value="baseline"/>
+ *     &lt;enumeration value="drop"/>
  *   &lt;/restriction>
  * &lt;/simpleType>
  * </pre>
@@ -29,7 +30,9 @@ public enum ChangeSetType {
   @XmlEnumValue("pendingDrops")
   PENDING_DROPS("pendingDrops"),
   @XmlEnumValue("baseline")
-  BASELINE("baseline");
+  BASELINE("baseline"),
+  @XmlEnumValue("drop")
+  DROP("drop");
   private final String value;
 
   ChangeSetType(String v) {
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java b/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java
index 0aefdfbc8..b393e1936 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java
@@ -3,7 +3,6 @@ package io.ebeaninternal.dbmigration.migration;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
@@ -12,13 +11,17 @@ import java.util.List;
 
 /**
  * <p>Java class for anonymous complex type.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="before" type="{http://ebean-orm.github.io/xml/ns/dbmigration}ddl-script" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="after" type="{http://ebean-orm.github.io/xml/ns/dbmigration}ddl-script" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
  *       &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
  *       &lt;attribute name="type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
  *       &lt;attribute name="defaultValue" type="{http://www.w3.org/2001/XMLSchema}string" />
@@ -43,16 +46,14 @@ import java.util.List;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-  "before", "after"
+  "before",
+  "after"
 })
 @XmlRootElement(name = "column")
 public class Column {
 
-  @XmlElement(required = false)
   protected List<DdlScript> before;
-  @XmlElement(required = false)
   protected List<DdlScript> after;
-
   @XmlAttribute(name = "name", required = true)
   protected String name;
   @XmlAttribute(name = "type", required = true)
@@ -88,19 +89,58 @@ public class Column {
   @XmlAttribute(name = "comment")
   protected String comment;
 
-
+  /**
+   * Gets the value of the before property.
+   *
+   * <p>
+   * This accessor method returns a reference to the live list,
+   * not a snapshot. Therefore any modification you make to the
+   * returned list will be present inside the JAXB object.
+   * This is why there is not a <CODE>set</CODE> method for the before property.
+   *
+   * <p>
+   * For example, to add a new item, do as follows:
+   * <pre>
+   *    getBefore().add(newItem);
+   * </pre>
+   *
+   *
+   * <p>
+   * Objects of the following type(s) are allowed in the list
+   * {@link DdlScript }
+   */
   public List<DdlScript> getBefore() {
     if (before == null) {
       before = new ArrayList<>();
     }
-    return before;
+    return this.before;
   }
 
+  /**
+   * Gets the value of the after property.
+   *
+   * <p>
+   * This accessor method returns a reference to the live list,
+   * not a snapshot. Therefore any modification you make to the
+   * returned list will be present inside the JAXB object.
+   * This is why there is not a <CODE>set</CODE> method for the after property.
+   *
+   * <p>
+   * For example, to add a new item, do as follows:
+   * <pre>
+   *    getAfter().add(newItem);
+   * </pre>
+   *
+   *
+   * <p>
+   * Objects of the following type(s) are allowed in the list
+   * {@link DdlScript }
+   */
   public List<DdlScript> getAfter() {
     if (after == null) {
       after = new ArrayList<>();
     }
-    return after;
+    return this.after;
   }
 
   /**
@@ -384,7 +424,7 @@ public class Column {
   }
 
   /**
-   * Gets the value of the foreignOnDelete property.
+   * Gets the value of the foreignKeyOnDelete property.
    *
    * @return possible object is
    * {@link String }
@@ -404,7 +444,7 @@ public class Column {
   }
 
   /**
-   * Gets the value of the foreignOnUpdate property.
+   * Gets the value of the foreignKeyOnUpdate property.
    *
    * @return possible object is
    * {@link String }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java b/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java
index 8c84632ba..dad4879b8 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java b/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java
index 5e753e084..9e581d0c3 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java b/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java
index d9f0b788a..cf27b1ce0 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java
@@ -14,9 +14,9 @@ import java.util.List;
 
 /**
  * <p>Java class for anonymous complex type.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -28,6 +28,8 @@ import java.util.List;
  *       &lt;/sequence>
  *       &lt;attGroup ref="{http://ebean-orm.github.io/xml/ns/dbmigration}tablespaceAttributes"/>
  *       &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="partitionMode" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="partitionColumn" type="{http://www.w3.org/2001/XMLSchema}string" />
  *       &lt;attribute name="withHistory" type="{http://www.w3.org/2001/XMLSchema}boolean" />
  *       &lt;attribute name="draft" type="{http://www.w3.org/2001/XMLSchema}boolean" />
  *       &lt;attribute name="identityType" type="{http://ebean-orm.github.io/xml/ns/dbmigration}identityType" />
@@ -55,6 +57,10 @@ public class CreateTable {
   protected List<ForeignKey> foreignKey;
   @XmlAttribute(name = "name", required = true)
   protected String name;
+  @XmlAttribute(name = "partitionMode")
+  protected String partitionMode;
+  @XmlAttribute(name = "partitionColumn")
+  protected String partitionColumn;
   @XmlAttribute(name = "withHistory")
   protected Boolean withHistory;
   @XmlAttribute(name = "draft")
@@ -80,20 +86,20 @@ public class CreateTable {
 
   /**
    * Gets the value of the column property.
-   * <p>
+   *
    * <p>
    * This accessor method returns a reference to the live list,
    * not a snapshot. Therefore any modification you make to the
    * returned list will be present inside the JAXB object.
    * This is why there is not a <CODE>set</CODE> method for the column property.
-   * <p>
+   *
    * <p>
    * For example, to add a new item, do as follows:
    * <pre>
    *    getColumn().add(newItem);
    * </pre>
-   * <p>
-   * <p>
+   *
+   *
    * <p>
    * Objects of the following type(s) are allowed in the list
    * {@link Column }
@@ -107,20 +113,20 @@ public class CreateTable {
 
   /**
    * Gets the value of the uniqueConstraint property.
-   * <p>
+   *
    * <p>
    * This accessor method returns a reference to the live list,
    * not a snapshot. Therefore any modification you make to the
    * returned list will be present inside the JAXB object.
    * This is why there is not a <CODE>set</CODE> method for the uniqueConstraint property.
-   * <p>
+   *
    * <p>
    * For example, to add a new item, do as follows:
    * <pre>
    *    getUniqueConstraint().add(newItem);
    * </pre>
-   * <p>
-   * <p>
+   *
+   *
    * <p>
    * Objects of the following type(s) are allowed in the list
    * {@link UniqueConstraint }
@@ -134,20 +140,20 @@ public class CreateTable {
 
   /**
    * Gets the value of the foreignKey property.
-   * <p>
+   *
    * <p>
    * This accessor method returns a reference to the live list,
    * not a snapshot. Therefore any modification you make to the
    * returned list will be present inside the JAXB object.
    * This is why there is not a <CODE>set</CODE> method for the foreignKey property.
-   * <p>
+   *
    * <p>
    * For example, to add a new item, do as follows:
    * <pre>
    *    getForeignKey().add(newItem);
    * </pre>
-   * <p>
-   * <p>
+   *
+   *
    * <p>
    * Objects of the following type(s) are allowed in the list
    * {@link ForeignKey }
@@ -179,6 +185,46 @@ public class CreateTable {
     this.name = value;
   }
 
+  /**
+   * Gets the value of the partitionMode property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getPartitionMode() {
+    return partitionMode;
+  }
+
+  /**
+   * Sets the value of the partitionMode property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setPartitionMode(String value) {
+    this.partitionMode = value;
+  }
+
+  /**
+   * Gets the value of the partitionColumn property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getPartitionColumn() {
+    return partitionColumn;
+  }
+
+  /**
+   * Sets the value of the partitionColumn property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setPartitionColumn(String value) {
+    this.partitionColumn = value;
+  }
+
   /**
    * Gets the value of the withHistory property.
    *
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java b/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java
index be259f394..12d1f1cff 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java
@@ -1,42 +1,61 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
+import java.util.ArrayList;
+import java.util.List;
 
 
 /**
- * <p>Java class for anonymous complex type.
- * <p>
+ * <p>Java class for ddl-script complex type.
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
- * TODO @Rob: Can this generated automatically?
+ * &lt;complexType name="ddl-script">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="ddl" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="platforms" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
+@XmlType(name = "ddl-script", propOrder = {
   "ddl"
 })
-@XmlRootElement(name = "ddl-script")
 public class DdlScript {
 
-  @XmlValue
+  @XmlElement(required = true)
   protected List<String> ddl;
-
   @XmlAttribute(name = "platforms")
   protected String platforms;
 
   /**
-   * Gets the value of the value property.
+   * Gets the value of the ddl property.
    *
-   * @return possible object is
+   * <p>
+   * This accessor method returns a reference to the live list,
+   * not a snapshot. Therefore any modification you make to the
+   * returned list will be present inside the JAXB object.
+   * This is why there is not a <CODE>set</CODE> method for the ddl property.
+   *
+   * <p>
+   * For example, to add a new item, do as follows:
+   * <pre>
+   *    getDdl().add(newItem);
+   * </pre>
+   *
+   *
+   * <p>
+   * Objects of the following type(s) are allowed in the list
    * {@link String }
    */
   public List<String> getDdl() {
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java b/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java
index 2e1981622..92fa6d744 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java b/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java
index 9d125415d..03062cff2 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java b/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java
index 8471b2c52..608b2bc23 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java b/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java
index 71e472a5a..5a70943a3 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java b/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java
index 6d9a0f076..beb22f36a 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java
@@ -9,14 +9,16 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="sequenceCol" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="sequenceName" type="{http://www.w3.org/2001/XMLSchema}string" />
  *     &lt;/restriction>
  *   &lt;/complexContent>
  * &lt;/complexType>
@@ -64,16 +66,6 @@ public class DropTable {
     return sequenceCol;
   }
 
-  /**
-   * Gets the value of the sequenceName property.
-   *
-   * @return possible object is
-   * {@link String }
-   */
-  public String getSequenceName() {
-    return sequenceName;
-  }
-
   /**
    * Sets the value of the sequenceCol property.
    *
@@ -84,6 +76,16 @@ public class DropTable {
     this.sequenceCol = value;
   }
 
+  /**
+   * Gets the value of the sequenceName property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getSequenceName() {
+    return sequenceName;
+  }
+
   /**
    * Sets the value of the sequenceName property.
    *
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java b/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java
index 37d314207..867e918cf 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -47,6 +47,7 @@ public class ForeignKey {
   protected String onDelete;
   @XmlAttribute(name = "onUpdate")
   protected String onUpdate;
+
   /**
    * Gets the value of the name property.
    *
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java b/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java
index 4d95169b3..3d59cd0ce 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java
@@ -7,7 +7,7 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for identityType.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
  * <pre>
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java b/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java
index fea9ef068..c830a44d0 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java
@@ -11,9 +11,9 @@ import java.util.List;
 
 /**
  * <p>Java class for anonymous complex type.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -38,20 +38,20 @@ public class Migration {
 
   /**
    * Gets the value of the changeSet property.
-   * <p>
+   *
    * <p>
    * This accessor method returns a reference to the live list,
    * not a snapshot. Therefore any modification you make to the
    * returned list will be present inside the JAXB object.
    * This is why there is not a <CODE>set</CODE> method for the changeSet property.
-   * <p>
+   *
    * <p>
    * For example, to add a new item, do as follows:
    * <pre>
    *    getChangeSet().add(newItem);
    * </pre>
-   * <p>
-   * <p>
+   *
+   *
    * <p>
    * Objects of the following type(s) are allowed in the list
    * {@link ChangeSet }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java b/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java
index 472d67261..ac15ca0d5 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java
@@ -6,7 +6,7 @@ import javax.xml.bind.annotation.XmlRegistry;
 /**
  * This object contains factory methods for each
  * Java content interface and Java element interface
- * generated in the io.ebean.dbmigration.migration package.
+ * generated in the io.ebeaninternal.dbmigration.migration package.
  * <p>An ObjectFactory allows you to programatically
  * construct new instances of the Java representation
  * for XML content. The Java representation of XML
@@ -21,23 +21,23 @@ public class ObjectFactory {
 
 
   /**
-   * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: io.ebean.dbmigration.migration
+   * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: io.ebeaninternal.dbmigration.migration
    */
   public ObjectFactory() {
   }
 
   /**
-   * Create an instance of {@link Rollback }
+   * Create an instance of {@link AddUniqueConstraint }
    */
-  public Rollback createRollback() {
-    return new Rollback();
+  public AddUniqueConstraint createAddUniqueConstraint() {
+    return new AddUniqueConstraint();
   }
 
   /**
-   * Create an instance of {@link AddColumn }
+   * Create an instance of {@link CreateTable }
    */
-  public AddColumn createAddColumn() {
-    return new AddColumn();
+  public CreateTable createCreateTable() {
+    return new CreateTable();
   }
 
   /**
@@ -48,10 +48,10 @@ public class ObjectFactory {
   }
 
   /**
-   * Create an instance of {@link CreateTable }
+   * Create an instance of {@link DdlScript }
    */
-  public CreateTable createCreateTable() {
-    return new CreateTable();
+  public DdlScript createDdlScript() {
+    return new DdlScript();
   }
 
   /**
@@ -68,13 +68,6 @@ public class ObjectFactory {
     return new ForeignKey();
   }
 
-  /**
-   * Create an instance of {@link Apply }
-   */
-  public Apply createApply() {
-    return new Apply();
-  }
-
   /**
    * Create an instance of {@link Configuration }
    */
@@ -89,13 +82,6 @@ public class ObjectFactory {
     return new DefaultTablespace();
   }
 
-  /**
-   * Create an instance of {@link AddTableComment }
-   */
-  public AddTableComment createAddTableComment() {
-    return new AddTableComment();
-  }
-
   /**
    * Create an instance of {@link RenameTable }
    */
@@ -111,10 +97,10 @@ public class ObjectFactory {
   }
 
   /**
-   * Create an instance of {@link AlterColumn }
+   * Create an instance of {@link AlterForeignKey }
    */
-  public AlterColumn createAlterColumn() {
-    return new AlterColumn();
+  public AlterForeignKey createAlterForeignKey() {
+    return new AlterForeignKey();
   }
 
   /**
@@ -124,6 +110,69 @@ public class ObjectFactory {
     return new DropColumn();
   }
 
+  /**
+   * Create an instance of {@link Sql }
+   */
+  public Sql createSql() {
+    return new Sql();
+  }
+
+  /**
+   * Create an instance of {@link Apply }
+   */
+  public Apply createApply() {
+    return new Apply();
+  }
+
+  /**
+   * Create an instance of {@link Rollback }
+   */
+  public Rollback createRollback() {
+    return new Rollback();
+  }
+
+  /**
+   * Create an instance of {@link DropIndex }
+   */
+  public DropIndex createDropIndex() {
+    return new DropIndex();
+  }
+
+  /**
+   * Create an instance of {@link RenameColumn }
+   */
+  public RenameColumn createRenameColumn() {
+    return new RenameColumn();
+  }
+
+  /**
+   * Create an instance of {@link DropTable }
+   */
+  public DropTable createDropTable() {
+    return new DropTable();
+  }
+
+  /**
+   * Create an instance of {@link AddColumn }
+   */
+  public AddColumn createAddColumn() {
+    return new AddColumn();
+  }
+
+  /**
+   * Create an instance of {@link AddTableComment }
+   */
+  public AddTableComment createAddTableComment() {
+    return new AddTableComment();
+  }
+
+  /**
+   * Create an instance of {@link AlterColumn }
+   */
+  public AlterColumn createAlterColumn() {
+    return new AlterColumn();
+  }
+
   /**
    * Create an instance of {@link CreateIndex }
    */
@@ -138,20 +187,6 @@ public class ObjectFactory {
     return new ChangeSet();
   }
 
-  /**
-   * Create an instance of {@link Sql }
-   */
-  public Sql createSql() {
-    return new Sql();
-  }
-
-  /**
-   * Create an instance of {@link DropTable }
-   */
-  public DropTable createDropTable() {
-    return new DropTable();
-  }
-
   /**
    * Create an instance of {@link AddHistoryTable }
    */
@@ -159,20 +194,6 @@ public class ObjectFactory {
     return new AddHistoryTable();
   }
 
-  /**
-   * Create an instance of {@link RenameColumn }
-   */
-  public RenameColumn createRenameColumn() {
-    return new RenameColumn();
-  }
-
-  /**
-   * Create an instance of {@link DropIndex }
-   */
-  public DropIndex createDropIndex() {
-    return new DropIndex();
-  }
-
   /**
    * Create an instance of {@link AlterHistoryTable }
    */
@@ -187,24 +208,4 @@ public class ObjectFactory {
     return new Migration();
   }
 
-  /**
-   * Create an instance of {@link DdlScript }
-   */
-  public DdlScript createDdlScript() {
-    return new DdlScript();
-  }
-
-  /**
-   * Create an instance of {@link AddUniqueConstraint }
-   */
-  public AddUniqueConstraint createAddUniqueConstraint() {
-    return new AddUniqueConstraint();
-  }
-
-  /**
-   * Create an instance of {@link AddUniqueConstraint }
-   */
-  public AlterForeignKey createAlterForeignKey() {
-    return new AlterForeignKey();
-  }
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java b/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java
index 3838725e6..23c8bee30 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java b/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java
index a4eb9185f..02221fcb6 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java b/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java
index 8647f8d88..994b201c3 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlValue;
 
 /**
  * <p>Java class for anonymous complex type.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
  * &lt;complexType>
  *   &lt;simpleContent>
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java b/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java
index f65d32003..02532da78 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java b/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java
index d4c61fd8f..79a6f5e05 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java
@@ -9,15 +9,17 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * <p>
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
+ *
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
  *       &lt;attribute name="columnNames" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="oneToOne" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="nullableColumns" type="{http://www.w3.org/2001/XMLSchema}string" />
  *     &lt;/restriction>
  *   &lt;/complexContent>
  * &lt;/complexType>
@@ -30,16 +32,13 @@ public class UniqueConstraint {
 
   @XmlAttribute(name = "name", required = true)
   protected String name;
-
   @XmlAttribute(name = "columnNames", required = true)
   protected String columnNames;
-
-  @XmlAttribute(name = "oneToOne", required = false)
+  @XmlAttribute(name = "oneToOne")
   protected Boolean oneToOne;
-
-  @XmlAttribute(name = "nullableColumns", required = true)
+  @XmlAttribute(name = "nullableColumns")
   protected String nullableColumns;
-  
+
   /**
    * Gets the value of the name property.
    *
@@ -79,23 +78,25 @@ public class UniqueConstraint {
   public void setColumnNames(String value) {
     this.columnNames = value;
   }
-  
+
   /**
    * Gets the value of the oneToOne property.
    *
-   * @return true if oneToOne was set
+   * @return possible object is
+   * {@link Boolean }
    */
-  public boolean isOneToOne() {
-    return Boolean.TRUE.equals(oneToOne);
+  public Boolean isOneToOne() {
+    return oneToOne;
   }
-  
+
   /**
    * Sets the value of the oneToOne property.
    *
-   * @param value boolean
+   * @param value allowed object is
+   *              {@link Boolean }
    */
-  public void setOneToOne(boolean oneToOne) {
-    this.oneToOne = oneToOne;
+  public void setOneToOne(Boolean value) {
+    this.oneToOne = value;
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundUniqueConstraint.java b/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundUniqueConstraint.java
index daf3a19e2..aee6f1963 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundUniqueConstraint.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundUniqueConstraint.java
@@ -1,11 +1,12 @@
 package io.ebeaninternal.dbmigration.model;
 
-import java.util.Arrays;
-import java.util.Objects;
-
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.DdlHelp;
 import io.ebeaninternal.dbmigration.migration.AddUniqueConstraint;
 import io.ebeaninternal.dbmigration.migration.UniqueConstraint;
+
+import java.util.Arrays;
+import java.util.Objects;
+
 /**
  * A unique constraint for multiple columns.
  * <p>
@@ -26,13 +27,13 @@ public class MCompoundUniqueConstraint {
    * The columns combined to be unique.
    */
   private final String[] columns;
-  
+
   private String[] nullableColumns;
 
-  public MCompoundUniqueConstraint(String[] columns, boolean oneToOne, String name) {
+  public MCompoundUniqueConstraint(String[] columns, Boolean oneToOne, String name) {
     this.name = name;
     this.columns = columns;
-    this.oneToOne = oneToOne;
+    this.oneToOne = Boolean.TRUE.equals(oneToOne);
   }
 
   /**
@@ -55,6 +56,7 @@ public class MCompoundUniqueConstraint {
   public String getName() {
     return name;
   }
+
   public UniqueConstraint getUniqueConstraint() {
     UniqueConstraint uq = new UniqueConstraint();
     uq.setName(getName());
@@ -63,6 +65,7 @@ public class MCompoundUniqueConstraint {
     uq.setOneToOne(isOneToOne());
     return uq;
   }
+
   /**
    * Return a AddUniqueConstraint migration for this constraint.
    */
@@ -87,7 +90,7 @@ public class MCompoundUniqueConstraint {
     dropUniqueConstraint.setNullableColumns(join(nullableColumns));
     return dropUniqueConstraint;
   }
-  
+
   public void setNullableColumns(String[] nullableColumns) {
     if (nullableColumns != null && nullableColumns.length == 0) {
       this.nullableColumns = null;
@@ -109,12 +112,12 @@ public class MCompoundUniqueConstraint {
     }
     return sb.toString();
   }
-  
+
   @Override
   public int hashCode() {
     return Arrays.hashCode(columns) + 31 * Objects.hash(name, oneToOne);
   }
-  
+
   @Override
   public boolean equals(Object obj) {
     if (obj == this) {
@@ -125,8 +128,8 @@ public class MCompoundUniqueConstraint {
     }
     MCompoundUniqueConstraint other = (MCompoundUniqueConstraint) obj;
     return Arrays.equals(columns, other.columns)
-        && Arrays.equals(nullableColumns, other.nullableColumns)
-        && Objects.equals(name, other.name)
-        && oneToOne == other.oneToOne;
+      && Arrays.equals(nullableColumns, other.nullableColumns)
+      && Objects.equals(name, other.name)
+      && oneToOne == other.oneToOne;
   }
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
index c53e3aad7..024071aea 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.dbmigration.model;
 
+import io.ebean.annotation.PartitionMode;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.DdlHelp;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.SplitColumns;
 import io.ebeaninternal.dbmigration.migration.AddColumn;
@@ -14,6 +15,7 @@ import io.ebeaninternal.dbmigration.migration.DropTable;
 import io.ebeaninternal.dbmigration.migration.ForeignKey;
 import io.ebeaninternal.dbmigration.migration.IdentityType;
 import io.ebeaninternal.dbmigration.migration.UniqueConstraint;
+import io.ebeaninternal.server.deploy.PartitionMeta;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -61,6 +63,8 @@ public class MTable {
    */
   private boolean draft;
 
+  private PartitionMeta partitionMeta;
+
   /**
    * Primary key name.
    */
@@ -237,6 +241,10 @@ public class MTable {
     createTable.setName(name);
     createTable.setPkName(pkName);
     createTable.setComment(comment);
+    if (partitionMeta != null) {
+      createTable.setPartitionMode(partitionMeta.getMode().name());
+      createTable.setPartitionColumn(partitionMeta.getProperty());
+    }
     createTable.setTablespace(tablespace);
     createTable.setIndexTablespace(indexTablespace);
     createTable.setSequenceName(sequenceName);
@@ -419,6 +427,13 @@ public class MTable {
     return draft;
   }
 
+  /**
+   * Return true if this table is partitioned.
+   */
+  public boolean isPartitioned() {
+    return partitionMeta != null;
+  }
+
   public void setPkName(String pkName) {
     this.pkName = pkName;
   }
@@ -745,4 +760,8 @@ public class MTable {
       compoundKey.setIndexName(null);
     }
   }
+
+  public void setPartitionMeta(PartitionMeta partitionMeta) {
+    this.partitionMeta = partitionMeta;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitor.java b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitor.java
index 74a7dd856..8ac300074 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitor.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitor.java
@@ -36,6 +36,7 @@ public class ModelBuildBeanVisitor implements BeanVisitor {
     }
 
     MTable table = new MTable(descriptor.getBaseTable());
+    table.setPartitionMeta(descriptor.getPartitionMeta());
     table.setComment(descriptor.getDbComment());
     if (descriptor.isHistorySupport()) {
       table.setWithHistory(true);
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
index 0c89d4a6d..0e366a9b1 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
@@ -192,7 +192,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
       col.setDbMigrationInfos(p.getDbMigrationInfos());
       col.setDefaultValue(p.getDbColumnDefault());
       if (columns.length == 1) {
-        if (p.hasForeignKey()) {
+        if (p.hasForeignKey() && !importedProperty.getBeanDescriptor().suppressForeignKey()) {
           // single references column (put it on the column)
           String refTable = importedProperty.getBeanDescriptor().getBaseTable();
           if (refTable == null) {
@@ -251,7 +251,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
         col.setIdentity(true);
       }
       TableJoin primaryKeyJoin = p.getBeanDescriptor().getPrimaryKeyJoin();
-      if (primaryKeyJoin != null) {
+      if (primaryKeyJoin != null && !table.isPartitioned()) {
         TableJoinColumn[] columns = primaryKeyJoin.columns();
         col.setReferences(primaryKeyJoin.getTable() + "." + columns[0].getForeignDbColumn());
         col.setForeignKeyName(determineForeignKeyConstraintName(col.getName()));
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 05076b078..4a0c711d5 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -7,6 +7,7 @@ import io.ebean.SqlUpdate;
 import io.ebean.Transaction;
 import io.ebean.ValuePair;
 import io.ebean.annotation.DocStoreMode;
+import io.ebean.annotation.PartitionMode;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
@@ -204,6 +205,8 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
 
   private final String draftTable;
 
+  private final PartitionMeta partitionMeta;
+
   /**
    * DB table comment.
    */
@@ -482,6 +485,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     this.baseTableVersionsBetween = deploy.getBaseTableVersionsBetween();
     this.dependentTables = deploy.getDependentTables();
     this.dbComment = deploy.getDbComment();
+    this.partitionMeta = deploy.getPartitionMeta();
     this.autoTunable = EntityType.ORM == entityType && (beanFinder == null);
 
     // helper object used to derive lists of properties
@@ -2816,6 +2820,20 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return dbComment;
   }
 
+  /**
+   * Return true if foreign keys to the base table should be suppressed.
+   */
+  public boolean suppressForeignKey() {
+    return partitionMeta != null;
+  }
+
+  /**
+   * Return the partition details of the bean.
+   */
+  public PartitionMeta getPartitionMeta() {
+    return partitionMeta;
+  }
+
   /**
    * Return the dependent tables for a view based entity.
    * <p>
@@ -3160,7 +3178,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   public boolean hasIdPropertyOnly(EntityBeanIntercept ebi) {
     return ebi.hasIdOnly(idPropertyIndex);
   }
-  
+
   public boolean isIdLoaded(EntityBeanIntercept ebi) {
     return ebi.isLoadedProperty(idPropertyIndex);
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/PartitionMeta.java b/src/main/java/io/ebeaninternal/server/deploy/PartitionMeta.java
new file mode 100644
index 000000000..d041ae0a1
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/PartitionMeta.java
@@ -0,0 +1,27 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebean.annotation.PartitionMode;
+
+public class PartitionMeta {
+
+  private final PartitionMode mode;
+
+  private String property;
+
+  public PartitionMeta(PartitionMode mode, String property) {
+    this.mode = mode;
+    this.property = property;
+  }
+
+  public PartitionMode getMode() {
+    return mode;
+  }
+
+  public String getProperty() {
+    return property;
+  }
+
+  public void setProperty(String dbColumn) {
+    this.property = dbColumn;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index 24eca35eb..e6688c222 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.deploy.meta;
 import io.ebean.annotation.Cache;
 import io.ebean.annotation.DocStore;
 import io.ebean.annotation.DocStoreMode;
+import io.ebean.annotation.PartitionMode;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.TableName;
 import io.ebean.config.dbplatform.IdType;
@@ -27,6 +28,7 @@ import io.ebeaninternal.server.deploy.ChainedBeanQueryAdapter;
 import io.ebeaninternal.server.deploy.DeployPropertyParserMap;
 import io.ebeaninternal.server.deploy.IndexDefinition;
 import io.ebeaninternal.server.deploy.InheritInfo;
+import io.ebeaninternal.server.deploy.PartitionMeta;
 import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.deploy.parse.DeployBeanInfo;
 import io.ebeaninternal.server.idgen.UuidV1IdGenerator;
@@ -193,6 +195,8 @@ public class DeployBeanDescriptor<T> {
 
   private String dbComment;
 
+  private PartitionMeta partitionMeta;
+
   /**
    * One of NONE, INDEX or EMBEDDED.
    */
@@ -305,6 +309,20 @@ public class DeployBeanDescriptor<T> {
     return dbComment;
   }
 
+  public void setPartitionMeta(PartitionMeta partitionMeta) {
+    this.partitionMeta = partitionMeta;
+  }
+
+  public PartitionMeta  getPartitionMeta() {
+    if (partitionMeta != null) {
+      DeployBeanProperty beanProperty = getBeanProperty(partitionMeta.getProperty());
+      if (beanProperty != null) {
+        partitionMeta.setProperty(beanProperty.getDbColumn());
+      }
+    }
+    return partitionMeta;
+  }
+
   public void setDraftable() {
     draftable = true;
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
index f28f5e303..083d04b61 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.deploy.parse;
 
 import io.ebean.annotation.Cache;
 import io.ebean.annotation.DbComment;
+import io.ebean.annotation.DbPartition;
 import io.ebean.annotation.DocStore;
 import io.ebean.annotation.Draftable;
 import io.ebean.annotation.DraftableElement;
@@ -16,6 +17,7 @@ import io.ebean.util.AnnotationUtil;
 import io.ebeaninternal.server.deploy.BeanDescriptor.EntityType;
 import io.ebeaninternal.server.deploy.IndexDefinition;
 import io.ebeaninternal.server.deploy.InheritInfo;
+import io.ebeaninternal.server.deploy.PartitionMeta;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -152,6 +154,11 @@ public class AnnotationClass extends AnnotationParser {
       }
     }
 
+    DbPartition partition = AnnotationUtil.findAnnotationRecursive(cls, DbPartition.class);
+    if (partition != null) {
+      descriptor.setPartitionMeta(new PartitionMeta(partition.mode(), partition.property()));
+    }
+
     Draftable draftable = AnnotationUtil.findAnnotationRecursive(cls, Draftable.class);
     if (draftable != null) {
       descriptor.setDraftable();
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 9cfaad7e8..e7682b8f8 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -412,7 +412,13 @@ public final class SqlTreeBuilder {
       if (!selectProps.containsProperty(baseName)) {
         STreeProperty p = desc.findPropertyWithDynamic(baseName);
         if (p == null) {
-          logger.error("property [" + propName + "] not found on " + desc + " for query - excluding it.");
+          // maybe dynamic formula with schema prefix
+          p = desc.findPropertyWithDynamic(propName);
+          if (p != null) {
+            selectProps.add(p);
+          } else {
+            logger.error("property [" + propName + "] not found on " + desc + " for query - excluding it.");
+          }
 
         } else if (p.isEmbedded()) {
           // add the embedded bean (and effectively
diff --git a/src/main/resources/ebean-dbmigration-1.0.xsd b/src/main/resources/ebean-dbmigration-1.0.xsd
index 58959aa46..a78d2fade 100644
--- a/src/main/resources/ebean-dbmigration-1.0.xsd
+++ b/src/main/resources/ebean-dbmigration-1.0.xsd
@@ -37,9 +37,17 @@
       <xsd:enumeration value="apply"/>
       <xsd:enumeration value="pendingDrops"/>
       <xsd:enumeration value="baseline"/>
+      <xsd:enumeration value="drop"/>
     </xsd:restriction>
   </xsd:simpleType>
 
+  <xsd:complexType name="ddl-script">
+      <xsd:sequence>
+        <xsd:element name="ddl" type="xsd:string" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:attribute name="platforms" type="xsd:string"/>
+  </xsd:complexType>
+
   <!-- =========================================================== -->
   <!-- CHANGE SET CHILDREN                                         -->
   <!-- =========================================================== -->
@@ -99,6 +107,8 @@
         <xsd:element ref="foreignKey" minOccurs="0" maxOccurs="unbounded"/>
       </xsd:sequence>
       <xsd:attribute name="name" type="xsd:string" use="required"/>
+      <xsd:attribute name="partitionMode" type="xsd:string"/>
+      <xsd:attribute name="partitionColumn" type="xsd:string"/>
       <xsd:attribute name="withHistory" type="xsd:boolean"/>
       <xsd:attribute name="draft" type="xsd:boolean"/>
       <xsd:attribute name="identityType" type="identityType"/>
@@ -125,6 +135,18 @@
     <xsd:complexType>
       <xsd:attribute name="name" type="xsd:string" use="required"/>
       <xsd:attribute name="columnNames" type="xsd:string" use="required"/>
+      <xsd:attribute name="oneToOne" type="xsd:boolean"/>
+      <xsd:attribute name="nullableColumns" type="xsd:string"/>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:element name="addUniqueConstraint">
+    <xsd:complexType>
+      <xsd:attribute name="constraintName" type="xsd:string" use="required"/>
+      <xsd:attribute name="tableName" type="xsd:string" use="required"/>
+      <xsd:attribute name="columnNames" type="xsd:string" use="required"/>
+      <xsd:attribute name="oneToOne" type="xsd:boolean"/>
+      <xsd:attribute name="nullableColumns" type="xsd:string"/>
     </xsd:complexType>
   </xsd:element>
 
@@ -157,6 +179,8 @@
   <xsd:element name="dropTable">
     <xsd:complexType>
       <xsd:attribute name="name" type="xsd:string" use="required"/>
+      <xsd:attribute name="sequenceCol" type="xsd:string"/>
+      <xsd:attribute name="sequenceName" type="xsd:string"/>
     </xsd:complexType>
   </xsd:element>
 
@@ -216,6 +240,10 @@
 
   <xsd:element name="alterColumn">
     <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="before" minOccurs="0" maxOccurs="unbounded" type="ddl-script"/>
+        <xsd:element name="after" minOccurs="0" maxOccurs="unbounded" type="ddl-script"/>
+      </xsd:sequence>
       <xsd:attribute name="columnName" type="xsd:string" use="required"/>
       <xsd:attribute name="tableName" type="xsd:string" use="required"/>
       <xsd:attribute name="withHistory" type="xsd:boolean"/>
@@ -236,8 +264,8 @@
       <xsd:attribute name="references" type="xsd:string"/>
       <xsd:attribute name="foreignKeyName" type="xsd:string"/>
       <xsd:attribute name="foreignKeyIndex" type="xsd:string"/>
-      <xsd:attribute name="foreignOnDelete" type="xsd:string"/>
-      <xsd:attribute name="foreignOnUpdate" type="xsd:string"/>
+      <xsd:attribute name="foreignKeyOnDelete" type="xsd:string"/>
+      <xsd:attribute name="foreignKeyOnUpdate" type="xsd:string"/>
       <xsd:attribute name="dropForeignKey" type="xsd:string"/>
       <xsd:attribute name="dropForeignKeyIndex" type="xsd:string"/>
     </xsd:complexType>
@@ -269,11 +297,14 @@
     </xsd:complexType>
   </xsd:element>
 
-
   <!-- ============================================ -->
 
   <xsd:element name="column">
-    <xsd:complexType mixed="true">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="before" minOccurs="0" maxOccurs="unbounded" type="ddl-script"/>
+        <xsd:element name="after" minOccurs="0" maxOccurs="unbounded" type="ddl-script"/>
+      </xsd:sequence>
       <xsd:attribute name="name" type="xsd:string" use="required"/>
       <xsd:attribute name="type" type="xsd:string" use="required"/>
       <xsd:attribute name="defaultValue" type="xsd:string"/>
@@ -310,6 +341,7 @@
       <xsd:element ref="dropTable" maxOccurs="unbounded"/>
       <xsd:element ref="renameTable" maxOccurs="unbounded"/>
       <xsd:element ref="addTableComment" maxOccurs="unbounded"/>
+      <xsd:element ref="addUniqueConstraint" maxOccurs="unbounded"/>
 
       <xsd:element ref="addHistoryTable" maxOccurs="unbounded"/>
       <xsd:element ref="dropHistoryTable" maxOccurs="unbounded"/>
diff --git a/src/main/resources/ebean-extraddl-1.0.xsd b/src/main/resources/ebean-extraddl-1.0.xsd
index b9b39bb02..93a7090d4 100644
--- a/src/main/resources/ebean-extraddl-1.0.xsd
+++ b/src/main/resources/ebean-extraddl-1.0.xsd
@@ -18,6 +18,8 @@
         <xsd:extension base="xsd:string">
           <xsd:attribute name="name" type="xsd:string" use="required"/>
           <xsd:attribute name="platforms" type="xsd:string"/>
+          <xsd:attribute name="init" type="xsd:boolean"/>
+          <xsd:attribute name="drop" type="xsd:boolean"/>
         </xsd:extension>
       </xsd:simpleContent>
     </xsd:complexType>
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
index 72f3ef7ab..5a2e4d63d 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
@@ -15,15 +15,21 @@
         <alterColumn columnName="one_id" tableName="migtest_fk_set_null" references="migtest_fk_one.id" foreignKeyName="fk_migtest_fk_set_null_one_id" foreignKeyIndex="ix_migtest_fk_set_null_one_id" foreignKeyOnDelete="RESTRICT" foreignKeyOnUpdate="RESTRICT" dropForeignKey="fk_migtest_fk_set_null_one_id" dropForeignKeyIndex="ix_migtest_fk_set_null_one_id"/>
         <alterColumn columnName="status" tableName="migtest_e_basic" currentType="varchar(1)" defaultValue="'A'" notnull="true" currentNotnull="false" checkConstraint="check ( status in ('N','A','I','?'))" checkConstraintName="ck_migtest_e_basic_status"/>
         <alterColumn columnName="description" tableName="migtest_e_basic" unique="uq_migtest_e_basic_description">
-            <before>-- rename all collisions</before>
+            <before>
+                <ddl>-- rename all collisions</ddl>
+            </before>
         </alterColumn>
         <alterColumn columnName="user_id" tableName="migtest_e_basic" currentType="integer" notnull="false" currentNotnull="true" references="migtest_e_user.id" foreignKeyName="fk_migtest_e_basic_user_id" foreignKeyIndex="ix_migtest_e_basic_user_id">
-            <before>insert into migtest_e_user (id) select distinct user_id from migtest_e_basic</before>
+            <before>
+                <ddl>insert into migtest_e_user (id) select distinct user_id from migtest_e_basic</ddl>
+            </before>
         </alterColumn>
         <addColumn tableName="migtest_e_basic">
             <column name="new_string_field" type="varchar" defaultValue="'foo''bar'" notnull="true"/>
             <column name="new_boolean_field" type="boolean" defaultValue="true" notnull="true">
-                <after>update ${table} set ${column} = old_boolean</after>
+                <after>
+                    <ddl>update ${table} set ${column} = old_boolean</ddl>
+                </after>
             </column>
             <column name="new_boolean_field2" type="boolean" defaultValue="true" notnull="true"/>
             <column name="progress" type="integer" defaultValue="0" notnull="true" checkConstraint="check ( progress in (0,1,2))" checkConstraintName="ck_migtest_e_basic_progress"/>
@@ -31,14 +37,16 @@
         </addColumn>
         <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest2" tableName="migtest_e_basic" columnNames="DROP CONSTRAINT" nullableColumns="indextest2"/>
         <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest6" tableName="migtest_e_basic" columnNames="DROP CONSTRAINT" nullableColumns="indextest6"/>
-        <addUniqueConstraint constraintName="uq_migtest_e_basic_status_indextest1" tableName="migtest_e_basic" columnNames="status,indextest1" nullableColumns="indextest1" oneToOne="false"/>
-        <addUniqueConstraint constraintName="uq_migtest_e_basic_name" tableName="migtest_e_basic" columnNames="name" nullableColumns="name" oneToOne="false"/>
-        <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest4" tableName="migtest_e_basic" columnNames="indextest4" nullableColumns="indextest4" oneToOne="false"/>
-        <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest5" tableName="migtest_e_basic" columnNames="indextest5" nullableColumns="indextest5" oneToOne="false"/>
+        <addUniqueConstraint constraintName="uq_migtest_e_basic_status_indextest1" tableName="migtest_e_basic" columnNames="status,indextest1" oneToOne="false" nullableColumns="indextest1"/>
+        <addUniqueConstraint constraintName="uq_migtest_e_basic_name" tableName="migtest_e_basic" columnNames="name" oneToOne="false" nullableColumns="name"/>
+        <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest4" tableName="migtest_e_basic" columnNames="indextest4" oneToOne="false" nullableColumns="indextest4"/>
+        <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest5" tableName="migtest_e_basic" columnNames="indextest5" oneToOne="false" nullableColumns="indextest5"/>
         <alterColumn columnName="test_status" tableName="migtest_e_enum" dropCheckConstraint="ck_migtest_e_enum_test_status"/>
         <addHistoryTable baseTable="migtest_e_history"/>
         <alterColumn columnName="test_string" tableName="migtest_e_history" type="bigint" currentType="varchar" currentNotnull="false" comment="Column altered to long now">
-            <before platforms="postgres">alter table ${table} alter column ${column} TYPE bigint USING (${column}::integer)</before>
+            <before platforms="postgres">
+                <ddl>alter table ${table} alter column ${column} TYPE bigint USING (${column}::integer)</ddl>
+            </before>
         </alterColumn>
         <addTableComment name="migtest_e_history" comment="We have history now"/>
         <alterColumn columnName="test_string" tableName="migtest_e_history2" withHistory="true" currentType="varchar" defaultValue="'unknown'" notnull="true" currentNotnull="false"/>
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
index 02d4777ba..d32d725be 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
@@ -18,8 +18,8 @@
         <addUniqueConstraint constraintName="uq_migtest_e_basic_name" tableName="migtest_e_basic" columnNames="DROP CONSTRAINT" nullableColumns="name"/>
         <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest4" tableName="migtest_e_basic" columnNames="DROP CONSTRAINT" nullableColumns="indextest4"/>
         <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest5" tableName="migtest_e_basic" columnNames="DROP CONSTRAINT" nullableColumns="indextest5"/>
-        <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest2" tableName="migtest_e_basic" columnNames="indextest2" nullableColumns="indextest2" oneToOne="false"/>
-        <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest6" tableName="migtest_e_basic" columnNames="indextest6" nullableColumns="indextest6" oneToOne="false"/>
+        <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest2" tableName="migtest_e_basic" columnNames="indextest2" oneToOne="false" nullableColumns="indextest2"/>
+        <addUniqueConstraint constraintName="uq_migtest_e_basic_indextest6" tableName="migtest_e_basic" columnNames="indextest6" oneToOne="false" nullableColumns="indextest6"/>
         <alterColumn columnName="test_status" tableName="migtest_e_enum" checkConstraint="check ( test_status in ('N','A','I'))" checkConstraintName="ck_migtest_e_enum_test_status"/>
         <alterColumn columnName="test_string" tableName="migtest_e_history" withHistory="true" comment="DROP COMMENT"/>
         <addTableComment name="migtest_e_history" comment="DROP COMMENT"/>

From 1d678576f77c847092fdd230d041c7042373a3fb Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 8 Aug 2018 23:33:57 +1200
Subject: [PATCH 0414/1036] [maven-release-plugin] prepare release
 ebean-11.20.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d07b0a928..91f8576b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.20.1-SNAPSHOT</version>
+  <version>11.20.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.20.1</tag>
   </scm>
 
   <profiles>

From 19756421adfa42219f44da7882c38cac17642054 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 8 Aug 2018 23:34:11 +1200
Subject: [PATCH 0415/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 91f8576b4..f2f64fa2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.20.1</version>
+  <version>11.20.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.20.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From db35f0f5ed8f1a815bc0b188988d45da11dc1d93 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 9 Aug 2018 21:34:23 +1200
Subject: [PATCH 0416/1036] #1466 - With ebean.dbSchema property (aka default
 db schema) we should not connection.setSchema() when running migrations

---
 pom.xml                                       |  2 +-
 .../io/ebean/config/DbMigrationConfig.java    | 20 ++++++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index f2f64fa2f..764c2b2e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>11.8.1</version>
+      <version>11.8.2</version>
     </dependency>
 
     <dependency>
diff --git a/src/main/java/io/ebean/config/DbMigrationConfig.java b/src/main/java/io/ebean/config/DbMigrationConfig.java
index f40f6f58d..d09f3430a 100644
--- a/src/main/java/io/ebean/config/DbMigrationConfig.java
+++ b/src/main/java/io/ebean/config/DbMigrationConfig.java
@@ -107,6 +107,11 @@ public class DbMigrationConfig {
    */
   protected String dbSchema;
 
+  /**
+   * Set to true if we consider this the 'default schema' (Postgres schema that matches DB username)
+   */
+  protected boolean defaultDbSchema;
+
   /**
    * DB user used to run the DB migration.
    */
@@ -400,9 +405,15 @@ public class DbMigrationConfig {
    * Set the Db schema if it hasn't already been defined.
    */
   public void setDefaultDbSchema(String dbSchema) {
-    if (this.dbSchema == null) {
-      this.dbSchema = dbSchema;
-    }
+    this.defaultDbSchema = true;
+    this.dbSchema = dbSchema;
+  }
+
+  /**
+   * Return true if this is considered the default DB schema (Postgres schema matching DB username).
+   */
+  public boolean isDefaultDbSchema() {
+    return defaultDbSchema;
   }
 
   /**
@@ -591,6 +602,9 @@ public class DbMigrationConfig {
     runnerConfig.setDbUsername(getDbUsername());
     runnerConfig.setDbPassword(getDbPassword());
     runnerConfig.setDbSchema(getDbSchema());
+    if (defaultDbSchema) {
+      runnerConfig.setSetCurrentSchema(false);
+    }
     runnerConfig.setClassLoader(classLoader);
     if (patchInsertOn != null) {
       runnerConfig.setPatchInsertOn(patchInsertOn);

From afb76793027d2eb3540547d9e7d66b3df91bc454 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 10 Aug 2018 14:52:42 +1200
Subject: [PATCH 0417/1036] #1468 - ENH: Add built-in DDL generation for
 Postgres table partitioning (by day, week, month and year) (#1469)

---
 .../config/dbplatform/DatabasePlatform.java   |  15 ++
 .../dbplatform/postgres/PostgresPlatform.java |  32 +++
 .../io/ebean/dbmigration/DbMigration.java     |   5 +
 .../dbmigration/DdlGenerator.java             |  43 ++++
 .../dbmigration/DefaultDbMigration.java       |  32 ++-
 .../dbmigration/model/CurrentModel.java       |  38 ++-
 .../dbmigration/model/MTable.java             |  18 ++
 .../dbmigration/model/ModelContainer.java     |  20 ++
 .../extraddl/model/ExtraDdlXmlReader.java     |  20 ++
 .../builtin-extra-ddl-partitioning.xml        | 242 ++++++++++++++++++
 10 files changed, 444 insertions(+), 21 deletions(-)
 create mode 100644 src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl-partitioning.xml

diff --git a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
index ecc211289..ff887d038 100644
--- a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
@@ -2,6 +2,7 @@ package io.ebean.config.dbplatform;
 
 import io.ebean.BackgroundExecutor;
 import io.ebean.Query;
+import io.ebean.annotation.PartitionMode;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
 import io.ebean.config.CustomDbTypeMapping;
@@ -706,6 +707,20 @@ public class DatabasePlatform {
     }
   }
 
+  /**
+   * Return true if partitions exist for the given table.
+   */
+  public boolean tablePartitionsExist(Connection connection, String table) throws SQLException {
+    return true;
+  }
+
+  /**
+   * Return the SQL to create an initial partition for the given table.
+   */
+  public String tablePartitionInit(String tableName, PartitionMode mode, String property, String singlePrimaryKey) {
+    return null;
+  }
+
   /**
    * Escapes the like string for this DB-Platform
    */
diff --git a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
index 75a395568..fde6f7af3 100644
--- a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
@@ -2,6 +2,7 @@ package io.ebean.config.dbplatform.postgres;
 
 import io.ebean.BackgroundExecutor;
 import io.ebean.Query;
+import io.ebean.annotation.PartitionMode;
 import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
@@ -11,6 +12,10 @@ import io.ebean.config.dbplatform.PlatformIdGenerator;
 import io.ebean.config.dbplatform.SqlErrorCodes;
 
 import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.sql.Types;
 
 /**
@@ -116,4 +121,31 @@ public class PostgresPlatform extends DatabasePlatform {
         return sql + " for update";
     }
   }
+
+  @Override
+  public boolean tablePartitionsExist(Connection connection, String table) throws SQLException {
+
+    try (PreparedStatement statement = connection.prepareStatement("select count(*) from pg_inherits i WHERE  i.inhparent = ?::regclass")) {
+      statement.setString(1, table);
+      try (ResultSet resultSet = statement.executeQuery()) {
+        return resultSet.next() && resultSet.getInt(1) > 0;
+      }
+    }
+  }
+
+  /**
+   * Return SQL using built in partition helper functions to create some initial partitions.
+   *
+   * Only use this if extra-dll doesn't have some initial partitions defined (which it should).
+   */
+  public String tablePartitionInit(String tableName, PartitionMode mode, String property, String pkey) {
+    if (property == null) {
+      property = "";
+    }
+    if (pkey == null) {
+      pkey = "";
+    }
+    return "select partition('" + mode.name().toLowerCase() + "','" + tableName + "','" + pkey + "','" + property + "',1);";
+  }
+
 }
diff --git a/src/main/java/io/ebean/dbmigration/DbMigration.java b/src/main/java/io/ebean/dbmigration/DbMigration.java
index 582838e79..1a1e0e9f6 100644
--- a/src/main/java/io/ebean/dbmigration/DbMigration.java
+++ b/src/main/java/io/ebean/dbmigration/DbMigration.java
@@ -98,6 +98,11 @@ public interface DbMigration {
    */
   void setIncludeGeneratedFileComment(boolean includeGeneratedFileComment);
 
+  /**
+   * Set this to false to exclude the builtin support for table partitioning (with @DbPartition).
+   */
+  void setIncludeBuiltInPartitioning(boolean includeBuiltInPartitioning);
+
   /**
    * Set the header that is included in the generated DDL script.
    */
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
index e8edf79dc..b8271273b 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
@@ -1,11 +1,14 @@
 package io.ebeaninternal.dbmigration;
 
 import io.ebean.config.ServerConfig;
+import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.migration.ddl.DdlRunner;
 import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.dbmigration.model.CurrentModel;
+import io.ebeaninternal.dbmigration.model.MTable;
 import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader;
+import io.ebeaninternal.server.deploy.PartitionMeta;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -180,10 +183,50 @@ public class DdlGenerator {
 
     String ignoreExtraDdl = System.getProperty("ebean.ignoreExtraDdl");
     if (!"true".equalsIgnoreCase(ignoreExtraDdl) && jaxbPresent) {
+      if (currentModel.isTablePartitioning()) {
+        String extraPartitioning = ExtraDdlXmlReader.buildPartitioning(server.getDatabasePlatform().getName());
+        if (extraPartitioning != null && !extraPartitioning.isEmpty()) {
+          runScript(connection, false, extraPartitioning, "builtin-partitioning-dll");
+        }
+      }
+
       String extraApply = ExtraDdlXmlReader.buildExtra(server.getDatabasePlatform().getName(), false);
       if (extraApply != null) {
         runScript(connection, false, extraApply, "extra-dll");
       }
+
+      if (currentModel.isTablePartitioning()) {
+        checkInitialTablePartitions(connection);
+      }
+    }
+  }
+
+  /**
+   * Check if table partitions exist and if not create some. The expectation is that
+   * extra-dll.xml should have some partition initialisation but this helps people get going.
+   */
+  private void checkInitialTablePartitions(Connection connection) {
+
+    DatabasePlatform databasePlatform = server.getDatabasePlatform();
+    try {
+      StringBuilder sb = new StringBuilder();
+      for (MTable table : currentModel.getPartitionedTables()) {
+        String tableName = table.getName();
+        if (!databasePlatform.tablePartitionsExist(connection, tableName)) {
+          log.info("No table partitions for table {}", tableName);
+          PartitionMeta meta = table.getPartitionMeta();
+          String initPart = databasePlatform.tablePartitionInit(tableName, meta.getMode(), meta.getProperty(), table.singlePrimaryKey());
+          sb.append(initPart).append("\n");
+        }
+      }
+
+      String initialPartitionSql = sb.toString();
+      if (!initialPartitionSql.isEmpty()) {
+        runScript(connection, false, initialPartitionSql, "initial table partitions");
+      }
+
+    } catch (SQLException e) {
+      log.error("Error checking initial table partitions", e);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index 68872221a..b73812955 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -100,6 +100,8 @@ public class DefaultDbMigration implements DbMigration {
   protected String name;
   protected String generatePendingDrop;
 
+  protected boolean includeBuiltInPartitioning = true;
+
   /**
    * Create for offline migration generation.
    */
@@ -181,6 +183,11 @@ public class DefaultDbMigration implements DbMigration {
     this.includeGeneratedFileComment = includeGeneratedFileComment;
   }
 
+  @Override
+  public void setIncludeBuiltInPartitioning(boolean includeBuiltInPartitioning) {
+    this.includeBuiltInPartitioning = includeBuiltInPartitioning;
+  }
+
   @Override
   public void setHeader(String header) {
     this.header = header;
@@ -279,7 +286,7 @@ public class DefaultDbMigration implements DbMigration {
     try {
       Request request = createRequest();
       if (platforms.isEmpty()) {
-        generateExtraDdl(request.migrationDir, databasePlatform);
+        generateExtraDdl(request.migrationDir, databasePlatform, request.isTablePartitioning());
       }
 
       String pendingVersion = generatePendingDrop();
@@ -314,24 +321,27 @@ public class DefaultDbMigration implements DbMigration {
    * migration runner.
    * </p>
    */
-  private void generateExtraDdl(File migrationDir, DatabasePlatform dbPlatform) throws IOException {
+  private void generateExtraDdl(File migrationDir, DatabasePlatform dbPlatform, boolean tablePartitioning) throws IOException {
 
     if (dbPlatform != null) {
-      generateExtraDdl(migrationDir, dbPlatform, ExtraDdlXmlReader.readBuiltin());
-      generateExtraDdl(migrationDir, dbPlatform, ExtraDdlXmlReader.read());
+      if (tablePartitioning && includeBuiltInPartitioning) {
+        generateExtraDdlFor(migrationDir, dbPlatform, ExtraDdlXmlReader.readBuiltinTablePartitioning());
+      }
+      generateExtraDdlFor(migrationDir, dbPlatform, ExtraDdlXmlReader.readBuiltin());
+      generateExtraDdlFor(migrationDir, dbPlatform, ExtraDdlXmlReader.read());
     }
   }
 
-  private void generateExtraDdl(File migrationDir, DatabasePlatform dbPlatform, ExtraDdl extraDdl) throws IOException {
+  private void generateExtraDdlFor(File migrationDir, DatabasePlatform dbPlatform, ExtraDdl extraDdl) throws IOException {
     if (extraDdl != null) {
       List<DdlScript> ddlScript = extraDdl.getDdlScript();
       for (DdlScript script : ddlScript) {
         if (!script.isDrop() && ExtraDdlXmlReader.matchPlatform(dbPlatform.getName(), script.getPlatforms())) {
-            writeExtraDdl(migrationDir, script);
-          }
+          writeExtraDdl(migrationDir, script);
         }
       }
     }
+  }
 
   /**
    * Write (or override) the "repeatable" migration script.
@@ -349,8 +359,6 @@ public class DefaultDbMigration implements DbMigration {
     }
   }
 
-
-
   private String repeatableMigrationName(boolean init, String scriptName) {
     StringBuilder sb = new StringBuilder();
     if (init) {
@@ -421,6 +429,10 @@ public class DefaultDbMigration implements DbMigration {
       this.current = currentModel.read();
     }
 
+    boolean isTablePartitioning() {
+      return current.isTablePartitioning();
+    }
+
     /**
      * Return the migration for the pending drops for a given version.
      */
@@ -528,7 +540,7 @@ public class DefaultDbMigration implements DbMigration {
       File subPath = platformWriter.subPath(writePath, pair.prefix);
       platformWriter.processMigration(dbMigration, platformBuffer, subPath, fullVersion);
 
-      generateExtraDdl(subPath, pair.platform);
+      generateExtraDdl(subPath, pair.platform, currentModel.isTablePartitioning());
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java b/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
index 8418cc8d0..1b83beb4c 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
@@ -60,6 +60,20 @@ public class CurrentModel {
     this.platformTypes = platformTypes;
   }
 
+  /**
+   * Return true if the model contains tables that are partitioned.
+   */
+  public boolean isTablePartitioning() {
+    return model.isTablePartitioning();
+  }
+
+  /**
+   * Return the tables that have partitioning.
+   */
+  public List<MTable> getPartitionedTables() {
+    return model.getPartitionedTables();
+  }
+
   private static DbConstraintNaming.MaxLength maxLength(SpiEbeanServer server, DbConstraintNaming naming) {
 
     if (naming.getMaxLength() != null) {
@@ -116,17 +130,7 @@ public class CurrentModel {
       ddl.append(header).append('\n');
     }
 
-    ExtraDdl extraDdl = ExtraDdlXmlReader.readBuiltin();
-    if (extraDdl != null) {
-      List<DdlScript> ddlScript = extraDdl.getDdlScript();
-      for (DdlScript script : ddlScript) {
-        if (script.isInit() && ExtraDdlXmlReader.matchPlatform(server.getDatabasePlatform().getName(), script.getPlatforms())) {
-          ddl.append("-- init script " + script.getName()).append('\n');
-          ddl.append(script.getValue());
-        }
-      }
-    }
-
+    addExtraDdl(ddl, ExtraDdlXmlReader.readBuiltin(), "-- init script ");
 
     ddl.append(write.apply().getBuffer());
     ddl.append(write.applyForeignKeys().getBuffer());
@@ -136,6 +140,18 @@ public class CurrentModel {
     return ddl.toString();
   }
 
+  private void addExtraDdl(StringBuilder ddl, ExtraDdl extraDdl, String prefix) {
+    if (extraDdl != null) {
+      List<DdlScript> ddlScript = extraDdl.getDdlScript();
+      for (DdlScript script : ddlScript) {
+        if (script.isInit() && ExtraDdlXmlReader.matchPlatform(server.getDatabasePlatform().getName(), script.getPlatforms())) {
+          ddl.append(prefix + script.getName()).append('\n');
+          ddl.append(script.getValue());
+        }
+      }
+    }
+  }
+
   /**
    * Return the 'Drop' DDL.
    */
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
index 024071aea..3e3c5fa1a 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
@@ -434,6 +434,13 @@ public class MTable {
     return partitionMeta != null;
   }
 
+  /**
+   * Return the partition meta for this table.
+   */
+  public PartitionMeta getPartitionMeta() {
+    return partitionMeta;
+  }
+
   public void setPkName(String pkName) {
     this.pkName = pkName;
   }
@@ -546,6 +553,17 @@ public class MTable {
     return pk;
   }
 
+  /**
+   * Return the primary key column if it is a simple primary key.
+   */
+  public String singlePrimaryKey() {
+    List<MColumn> columns = primaryKeyColumns();
+    if (columns.size() == 1) {
+      return columns.get(0).getName();
+    }
+    return null;
+  }
+
   private void checkTableName(String tableName) {
     if (!name.equals(tableName)) {
       throw new IllegalArgumentException("addColumn tableName [" + tableName + "] does not match [" + name + "]");
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java b/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
index 15009f5b1..f2daca21b 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
@@ -19,6 +19,7 @@ import io.ebeaninternal.dbmigration.migration.DropTable;
 import io.ebeaninternal.dbmigration.migration.Migration;
 import io.ebeaninternal.dbmigration.migration.Sql;
 
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -43,9 +44,25 @@ public class ModelContainer {
 
   private final PendingDrops pendingDrops = new PendingDrops();
 
+  private final List<MTable> partitionedTables = new ArrayList<>();
+
   public ModelContainer() {
   }
 
+  /**
+   * Return true if the model contains tables that are partitioned.
+   */
+  public boolean isTablePartitioning() {
+    return !partitionedTables.isEmpty();
+  }
+
+  /**
+   * Return the list of partitioned tables.
+   */
+  public List<MTable> getPartitionedTables() {
+    return partitionedTables;
+  }
+
   /**
    * Adjust the FK references on all the draft tables.
    */
@@ -300,6 +317,9 @@ public class ModelContainer {
    * Add a table (typically from reading EbeanServer meta data).
    */
   public MTable addTable(MTable table) {
+    if (table.isPartitioned()) {
+      partitionedTables.add(table);
+    }
     return tables.put(table.getName(), table);
   }
 
diff --git a/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java b/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
index 541b725a3..34b7381a5 100644
--- a/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
+++ b/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
@@ -26,9 +26,22 @@ public class ExtraDdlXmlReader {
   public static String buildExtra(String platformName, boolean drops) {
 
     ExtraDdl read = ExtraDdlXmlReader.read("/extra-ddl.xml");
+    return buildExtra(platformName, drops, read);
+  }
+
+  /**
+   * Return any extra DDL for supporting partitioning given the database platform.
+   */
+  public static String buildPartitioning(String platformName) {
+    return buildExtra(platformName, false, readBuiltinTablePartitioning());
+  }
+
+  private static String buildExtra(String platformName, boolean drops, ExtraDdl read) {
+
     if (read == null) {
       return null;
     }
+
     StringBuilder sb = new StringBuilder(300);
     for (DdlScript script : read.getDdlScript()) {
       if (script.isDrop() == drops && matchPlatform(platformName, script.getPlatforms())) {
@@ -90,6 +103,13 @@ public class ExtraDdlXmlReader {
     return read("/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml");
   }
 
+  /**
+   * Read the builtin extra ddl to support table partitioning.
+   */
+  public static ExtraDdl readBuiltinTablePartitioning() {
+    return read("/io/ebeaninternal/dbmigration/builtin-extra-ddl-partitioning.xml");
+  }
+
   /**
    * Read the extra ddl.
    */
diff --git a/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl-partitioning.xml b/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl-partitioning.xml
new file mode 100644
index 000000000..237e563cb
--- /dev/null
+++ b/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl-partitioning.xml
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<extra-ddl xmlns="http://ebean-orm.github.io/xml/ns/extraddl">
+
+<ddl-script name="partition help" init="true" platforms="postgres">
+-- partitioning helper functions (UTC based)
+
+------------------------------------------------------------------------------------
+-- Type: partition_meta
+--
+-- Type used to hold common partitioning parameters such as period start and end etc
+------------------------------------------------------------------------------------
+do $$
+begin
+  if not exists (select 1 from pg_type where typname = 'partition_meta') THEN
+    create type partition_meta as
+    (
+      period_start   timestamptz,
+      period_end     timestamptz,
+      period_name    text,
+      base_name      text,
+      part_name      text,
+      unique_column  text,
+      index_column   text
+    );
+  end if;
+end$$;
+
+------------------------------------------------------------------------------------
+-- Function: _partition_create
+--
+-- Internal helper method to create a partition given meta data and
+-- optional extra function to call (typically to create additional indexes)
+------------------------------------------------------------------------------------
+create or replace function _partition_create(meta partition_meta, extra text)
+  returns text
+language plpgsql
+set timezone to 'UTC'
+as $$
+begin
+
+  execute format('create table if not exists %I partition of %I for values from (''%s'') TO (''%s'')', meta.part_name, meta.base_name, meta.period_start, meta.period_end);
+
+  if (length(meta.unique_column) > 0) then
+    execute format('create unique index if not exists uq_%I ON %I (%I)', meta.part_name, meta.part_name, meta.unique_column);
+  end if;
+
+  if (length(meta.index_column) > 0) then
+    execute format('create index if not exists ix_%I_%s ON %I (%I)', meta.part_name, meta.index_column, meta.part_name, meta.index_column);
+  end if;
+
+  if (length(extra) > 0) then
+    execute 'select ' || extra || '($1)' using meta;
+  end if;
+
+  return meta.part_name;
+end;
+$$;
+
+
+------------------------------------------------------------------------------------
+-- Function: _partition_meta
+--
+-- Internal helper method to create and return meta data used to create a partition.
+-- Helps work out start and end periods for day, week, month and year partitions.
+------------------------------------------------------------------------------------
+create or replace function _partition_meta(
+  mode          text,
+  asOf          date,
+  baseName      text,
+  uniqueColumn  text,
+  indexColumn   text)
+  returns partition_meta
+language plpgsql
+set timezone to 'UTC'
+as $$
+declare
+  partName  text;
+  meta      partition_meta;
+  asOfUtc   timestamptz;
+begin
+  asOfUtc = timezone('utc', asOf);
+  if (mode = 'day') then
+    asOfUtc = date_trunc('day', asOfUtc);
+    partName = to_char(asOfUtc, 'YYYY_MM_DD');
+    select asOfUtc, asOfUtc + interval '1 days' into meta.period_start, meta.period_end;
+
+  elseif (mode = 'week') then
+    asOfUtc = date_trunc('week', asOfUtc);
+    partName = format('%s_w%s', extract(ISOYEAR FROM asOfUtc), extract(WEEK FROM asOfUtc));
+    select asOfUtc, asOfUtc + interval '7 days' into meta.period_start, meta.period_end;
+
+  elseif (mode = 'year') then
+    asOfUtc = date_trunc('year', asOfUtc);
+    partName = to_char(date_trunc('year', asOfUtc), 'YYYY');
+    select asOfUtc, asOfUtc + interval '1 year' into meta.period_start, meta.period_end;
+
+  else
+    asOfUtc = date_trunc('month', asOfUtc);
+    partName = to_char(asOfUtc, 'YYYY_MM');
+    select asOfUtc, asOfUtc + interval '1 month' into meta.period_start, meta.period_end;
+  end if;
+
+  select partName, baseName, format('%s_%s', baseName, partName), uniqueColumn, indexColumn
+      into meta.period_name, meta.base_name, meta.part_name, meta.unique_column, meta.index_column;
+
+  return meta;
+end;
+$$;
+
+create or replace function _partition_meta_initdate(
+  meta partition_meta,
+  initDate date)
+  returns partition_meta
+language plpgsql
+set timezone to 'UTC'
+as $$
+begin
+  meta.period_start = initDate;
+  return meta;
+end;
+$$;
+
+
+-- select _partition_over('week', current_date, 4);
+
+------------------------------------------------------------------------------------
+-- Function: _partition_over
+--
+-- Internal helper method to return a set/table of dates to ensure partitions exists for.
+-- Typically we want to ensure some future partitions exist and this helps return dates
+-- for which we loop to create partitions.
+------------------------------------------------------------------------------------
+create or replace function _partition_over(
+  mode              text,
+  fromDate          date default current_date,
+  _count            integer default 0)
+  returns TABLE(of_date date)
+language plpgsql
+as $$
+declare
+  endDate date;
+begin
+  if (mode = 'day') then
+    endDate = fromDate + (interval '1 day' * _count);
+    fromDate = fromDate - interval '1 day'; -- allow for timezone
+    return query select s::date from generate_series(fromDate, endDate, '1 day') s;
+
+  elseif (mode = 'week') then
+    fromDate = date_trunc('week', fromDate);
+    endDate = fromDate + (interval '1 week' * _count);
+    return query select s::date from generate_series(fromDate, endDate, '1 week') s;
+
+  elseif (mode = 'year') then
+    fromDate = date_trunc('year', fromDate);
+    endDate = fromDate + (interval '1 year' * _count);
+    return query select s::date from generate_series(fromDate, endDate, '1 year') s;
+
+  else
+    fromDate = date_trunc('month', fromDate);
+    endDate = fromDate + (interval '1 month' * _count);
+    return query select s::date from generate_series(fromDate, endDate, '1 month') s;
+  end if;
+end;
+$$;
+
+
+------------------------------------------------------------------------------------
+-- Function: partition
+--
+-- Helper to ensure we create partitions into the future as needed for day, week, month
+-- and year based partitioning. Typically we call this periodically (e.g. every day).
+--
+-- Examples:
+--
+--   select partition('week', 'trip', 'id', 'when_started', 4);
+--   select partition('month', 'event', 'id', 'event_timestamp', 1);
+--
+------------------------------------------------------------------------------------
+create or replace function partition(
+  mode           text,                       -- one of 'day','week','month','year'
+  baseName       text,                       -- base table name
+  uniqueColumn   text,                       -- optional unique column
+  indexColumn    text,                       -- optional column to index
+  partitionCount integer default 0,          -- number of additional partitions
+  fromDate       date default current_date,  -- date to create first partition for
+  extra          text default '')            -- custom function to call per partition
+  returns text
+language plpgsql
+set timezone to 'UTC'
+as $$
+begin
+  perform _partition_create(_partition_meta(mode, poDate, baseName, uniqueColumn, indexColumn), extra)
+  from _partition_over(mode, fromDate, partitionCount) poDate;
+  return 'done';
+end;
+$$;
+
+
+------------------------------------------------------------------------------------
+-- Function: partition_init
+--
+-- Similar to partition but allows the first partition to be bigger with an explicit
+-- initDate typically to allow back dated rows to go into the initial partition.
+--
+-- Examples:
+--
+--   select partition_init(date '2001-01-01', 'week', 'event', 'id', 'event_timestamp', 4);
+--
+------------------------------------------------------------------------------------
+create or replace function partition_init(
+  initDate       date,                       -- first partition period start date
+  mode           text,                       -- one of 'day','week','month','year'
+  baseName       text,                       -- base table name
+  uniqueColumn   text,                       -- optional unique column
+  indexColumn    text,                       -- optional column to index
+  partitionCount integer default 0,          -- number of additional partitions
+  fromDate       date default current_date,  -- date to create first partition for
+  extra          text default '')            -- custom function to call per partition
+  returns text
+language plpgsql
+set timezone to 'UTC'
+as $$
+declare
+  meta partition_meta;
+begin
+  -- override the period start for the first partition
+  meta = _partition_meta(mode, fromDate, baseName, uniqueColumn, indexColumn);
+  meta = _partition_meta_initdate(meta, initDate);
+  perform _partition_create(meta, extra);
+
+  if (partitionCount > 0) then
+    -- create additional migrations normally
+    perform _partition_create(_partition_meta(mode, poDate, baseName, uniqueColumn, indexColumn), extra)
+    from _partition_over(mode, fromDate, partitionCount) poDate;
+  end if;
+
+  return 'done';
+end;
+$$;
+</ddl-script>
+
+</extra-ddl>

From 046a9b30b01e02b0d449b06a58664eb14d24b4e6 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 10 Aug 2018 15:54:29 +1200
Subject: [PATCH 0418/1036] [maven-release-plugin] prepare release
 ebean-11.20.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 764c2b2e5..dac671dec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.20.2-SNAPSHOT</version>
+  <version>11.20.2</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.20.2</tag>
   </scm>
 
   <profiles>

From 0faf9f54eac51ea784df60daf99abd111468a051 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 10 Aug 2018 15:54:42 +1200
Subject: [PATCH 0419/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index dac671dec..7ea3e4133 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.20.2</version>
+  <version>11.20.3-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.20.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 9bbe99657ace3c2550689911051b6570d2cd9af5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sn=C5=8Dwball?= <tobias@olsson.be>
Date: Mon, 13 Aug 2018 11:26:14 +0200
Subject: [PATCH 0420/1036] Let enum arrays be saved as integers or strings
 (#1467)

* Let enums be saved as integers or strings as needed

* Add tests for int and varchar @DbArray enums
---
 .../server/type/ArrayElementConverter.java    |  4 +-
 .../server/type/ScalarTypeArrayList.java      | 14 ++++++-
 .../server/type/ScalarTypeArraySet.java       | 15 ++++++-
 .../org/tests/model/array/EArrayBean.java     | 21 ++++++++++
 .../java/org/tests/model/array/IntEnum.java   | 13 +++++++
 .../tests/model/array/TestDbArray_basic.java  | 39 +++++++++++++++----
 .../org/tests/model/array/VarcharEnum.java    | 13 +++++++
 7 files changed, 106 insertions(+), 13 deletions(-)
 create mode 100644 src/test/java/org/tests/model/array/IntEnum.java
 create mode 100644 src/test/java/org/tests/model/array/VarcharEnum.java

diff --git a/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java b/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java
index 2c6c09b76..0d704b81e 100644
--- a/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java
+++ b/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java
@@ -112,14 +112,14 @@ interface ArrayElementConverter<T> {
 
     @Override
     public Object toElement(Object rawValue) {
-      return scalarType.parse(rawValue.toString());
+      return scalarType.toBeanType(rawValue);
     }
 
     @Override
     public Object[] toDbArray(Object[] objects) {
       Object[] dbArray = new Object[objects.length];
       for (int i = 0; i < objects.length; i++) {
-        dbArray[i] = scalarType.format(objects[i]);
+        dbArray[i] = scalarType.toJdbcType(objects[i]);
       }
       return dbArray;
     }
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
index 0621fe833..f9e07fd60 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
@@ -60,7 +60,19 @@ public class ScalarTypeArrayList extends ScalarTypeJsonCollection<List> implemen
 
     @Override
     public ScalarTypeArrayList typeForEnum(ScalarType<?> scalarType) {
-      return new ScalarTypeArrayList("varchar", DocPropertyType.TEXT, new ArrayElementConverter.EnumConverter(scalarType));
+      final String arrayType;
+      switch (scalarType.getJdbcType()) {
+        case Types.INTEGER:
+          arrayType = "integer";
+          break;
+        case Types.VARCHAR:
+          arrayType = "varchar";
+          break;
+        default:
+          throw new IllegalArgumentException("JdbcType [" + scalarType.getJdbcType() + "] not supported for @DbArray mapping on set.");
+      }
+
+      return new ScalarTypeArrayList(arrayType, scalarType.getDocType(), new ArrayElementConverter.EnumConverter(scalarType));
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
index 29fc9d0f8..79f5a9411 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
@@ -54,13 +54,24 @@ public class ScalarTypeArraySet<T> extends ScalarTypeJsonCollection<Set<T>> impl
       if (valueType.equals(String.class)) {
         return STRING;
       }
-      throw new IllegalArgumentException("Type [" + valueType + "] not supported for @DbArray mapping on set");
+      throw new IllegalArgumentException("Type [" + valueType + "] not supported for @DbArray mapping on list");
     }
 
     @Override
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public ScalarTypeArraySet typeForEnum(ScalarType<?> scalarType) {
-      return new ScalarTypeArraySet("varchar", DocPropertyType.TEXT, new ArrayElementConverter.EnumConverter(scalarType));
+      final String arrayType;
+      switch (scalarType.getJdbcType()) {
+        case Types.INTEGER:
+          arrayType = "integer";
+          break;
+        case Types.VARCHAR:
+          arrayType = "varchar";
+          break;
+          default:
+            throw new IllegalArgumentException("JdbcType [" + scalarType.getJdbcType() + "] not supported for @DbArray mapping on set.");
+      }
+      return new ScalarTypeArraySet(arrayType, scalarType.getDocType(), new ArrayElementConverter.EnumConverter(scalarType));
     }
   }
 
diff --git a/src/test/java/org/tests/model/array/EArrayBean.java b/src/test/java/org/tests/model/array/EArrayBean.java
index 853fe9976..a9c4e7d64 100644
--- a/src/test/java/org/tests/model/array/EArrayBean.java
+++ b/src/test/java/org/tests/model/array/EArrayBean.java
@@ -38,6 +38,12 @@ public class EArrayBean {
   @DbArray
   List<Status> statuses;
 
+  @DbArray
+  List<VarcharEnum> vcEnums = new ArrayList<>();
+
+  @DbArray
+  List<IntEnum> intEnums = new ArrayList<>();
+
   @DbArray
   Set<Status> status2;
 
@@ -100,6 +106,21 @@ public class EArrayBean {
     this.statuses = statuses;
   }
 
+  public List<VarcharEnum> getVcEnums() {
+    return vcEnums;
+  }
+
+  public void setVcEnums(final List<VarcharEnum> vcEnums) {
+    this.vcEnums = vcEnums;
+  }
+
+  public List<IntEnum> getIntEnums() {
+    return intEnums;
+  }
+
+  public void setIntEnums(final List<IntEnum> intEnums) {
+    this.intEnums = intEnums;
+  }
 
   public Set<Status> getStatus2() {
     return status2;
diff --git a/src/test/java/org/tests/model/array/IntEnum.java b/src/test/java/org/tests/model/array/IntEnum.java
new file mode 100644
index 000000000..130d9d030
--- /dev/null
+++ b/src/test/java/org/tests/model/array/IntEnum.java
@@ -0,0 +1,13 @@
+package org.tests.model.array;
+
+import io.ebean.annotation.DbEnumType;
+import io.ebean.annotation.DbEnumValue;
+
+public enum IntEnum {
+  ZERO, ONE, TWO;
+
+  @DbEnumValue(storage = DbEnumType.INTEGER)
+  public int dbValue() {
+    return 100 + ordinal();
+  }
+}
diff --git a/src/test/java/org/tests/model/array/TestDbArray_basic.java b/src/test/java/org/tests/model/array/TestDbArray_basic.java
index e816edc86..6a3e938c5 100644
--- a/src/test/java/org/tests/model/array/TestDbArray_basic.java
+++ b/src/test/java/org/tests/model/array/TestDbArray_basic.java
@@ -1,19 +1,22 @@
 package org.tests.model.array;
 
-import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
-import io.ebean.Query;
-import org.ebeantest.LoggedSqlCollector;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
 
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.Query;
+import io.ebean.SqlRow;
 
 public class TestDbArray_basic extends BaseTestCase {
 
@@ -22,7 +25,7 @@ public class TestDbArray_basic extends BaseTestCase {
   private EArrayBean found;
 
   @Test
-  public void insert() {
+  public void insert() throws SQLException {
 
     bean.setName("some stuff");
 
@@ -44,6 +47,10 @@ public class TestDbArray_basic extends BaseTestCase {
     bean.setStatuses(new ArrayList<>());
     bean.getStatuses().add(EArrayBean.Status.ONE);
     bean.getStatuses().add(EArrayBean.Status.THREE);
+    bean.getVcEnums().add(VarcharEnum.ONE);
+    bean.getVcEnums().add(VarcharEnum.TWO);
+    bean.getIntEnums().add(IntEnum.ZERO);
+    bean.getIntEnums().add(IntEnum.TWO);
 
     bean.setStatus2(new LinkedHashSet<>());
     bean.getStatus2().add(EArrayBean.Status.TWO);
@@ -64,16 +71,23 @@ public class TestDbArray_basic extends BaseTestCase {
         .arrayIsNotEmpty("phoneNumbers")
         .arrayContains("statuses", EArrayBean.Status.ONE)
         .arrayContains("status2", EArrayBean.Status.TWO)
+        .arrayContains("vcEnums", VarcharEnum.TWO)
+        .arrayContains("intEnums", IntEnum.ZERO)
         .query();
 
       List<EArrayBean> list = query.findList();
 
       List<EArrayBean.Status> statuses = list.get(0).getStatuses();
       Set<EArrayBean.Status> status2 = list.get(0).getStatus2();
+      List<IntEnum> intEnums = list.get(0).getIntEnums();
+      List<VarcharEnum> varcharEnums = list.get(0).getVcEnums();
 
       assertThat(statuses).contains(EArrayBean.Status.ONE, EArrayBean.Status.THREE);
       assertThat(status2).contains(EArrayBean.Status.ONE, EArrayBean.Status.TWO);
 
+      assertThat(intEnums).containsExactly(IntEnum.ZERO, IntEnum.TWO);
+      assertThat(varcharEnums).containsExactly(VarcharEnum.ONE, VarcharEnum.TWO);
+
       assertThat(query.getGeneratedSql()).contains(" t0.other_ids @> array[?,?]::bigint[] ");
       assertThat(query.getGeneratedSql()).contains(" t0.uids @> array[?] ");
       assertThat(query.getGeneratedSql()).contains(" t0.phone_numbers @> array[?] ");
@@ -87,6 +101,15 @@ public class TestDbArray_basic extends BaseTestCase {
         .query();
       query.findList();
 
+
+      final SqlRow row = Ebean.createSqlQuery("select * from earray_bean").findOne();
+
+      final String[] vcs = (String[]) ((java.sql.Array) row.get("vc_enums")).getArray();
+      assertThat(vcs).containsExactly("xXxONE", "xXxTWO");
+
+      final Integer[] ints = (Integer[]) ((java.sql.Array) row.get("int_enums")).getArray();
+      assertThat(ints).containsExactly(100, 102);
+
       assertThat(query.getGeneratedSql()).contains(" coalesce(cardinality(t0.other_ids),0) = 0");
       assertThat(query.getGeneratedSql()).contains(" not (t0.uids @> array[?])");
     }
diff --git a/src/test/java/org/tests/model/array/VarcharEnum.java b/src/test/java/org/tests/model/array/VarcharEnum.java
new file mode 100644
index 000000000..2bbc64daf
--- /dev/null
+++ b/src/test/java/org/tests/model/array/VarcharEnum.java
@@ -0,0 +1,13 @@
+package org.tests.model.array;
+
+import io.ebean.annotation.DbEnumType;
+import io.ebean.annotation.DbEnumValue;
+
+public enum VarcharEnum {
+  ZERO, ONE, TWO;
+
+  @DbEnumValue(storage = DbEnumType.VARCHAR)
+  public String dbValue() {
+    return "xXx" + name();
+  }
+}

From 94e6fe90e53d2799a3a07ef811ebc6cd0363521f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 13 Aug 2018 21:54:19 +1200
Subject: [PATCH 0421/1036] No effective change - white space format

---
 .../ebeaninternal/server/type/ScalarTypeArraySet.java  | 10 +++++-----
 .../server/type/ScalarTypeArraySetH2.java              |  5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
index 79f5a9411..78c3ca3db 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
@@ -58,7 +58,7 @@ public class ScalarTypeArraySet<T> extends ScalarTypeJsonCollection<Set<T>> impl
     }
 
     @Override
-    @SuppressWarnings({ "unchecked", "rawtypes" })
+    @SuppressWarnings({"unchecked", "rawtypes"})
     public ScalarTypeArraySet typeForEnum(ScalarType<?> scalarType) {
       final String arrayType;
       switch (scalarType.getJdbcType()) {
@@ -68,8 +68,8 @@ public class ScalarTypeArraySet<T> extends ScalarTypeJsonCollection<Set<T>> impl
         case Types.VARCHAR:
           arrayType = "varchar";
           break;
-          default:
-            throw new IllegalArgumentException("JdbcType [" + scalarType.getJdbcType() + "] not supported for @DbArray mapping on set.");
+        default:
+          throw new IllegalArgumentException("JdbcType [" + scalarType.getJdbcType() + "] not supported for @DbArray mapping on set.");
       }
       return new ScalarTypeArraySet(arrayType, scalarType.getDocType(), new ArrayElementConverter.EnumConverter(scalarType));
     }
@@ -79,9 +79,9 @@ public class ScalarTypeArraySet<T> extends ScalarTypeJsonCollection<Set<T>> impl
 
   private final ArrayElementConverter<T> converter;
 
-  @SuppressWarnings({ "unchecked", "rawtypes" })
+  @SuppressWarnings({"unchecked", "rawtypes"})
   public ScalarTypeArraySet(String arrayType, DocPropertyType docPropertyType, ArrayElementConverter<T> converter) {
-    super((Class)Set.class, Types.ARRAY, docPropertyType);
+    super((Class) Set.class, Types.ARRAY, docPropertyType);
     this.arrayType = arrayType;
     this.converter = converter;
   }
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java
index 1d54314fa..86bc471b5 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java
@@ -7,6 +7,7 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.Set;
 import java.util.UUID;
+
 /**
  * H2 database support for DB ARRAY.
  */
@@ -48,13 +49,13 @@ class ScalarTypeArraySetH2<T> extends ScalarTypeArraySet<T> {
     }
 
     @Override
-    @SuppressWarnings({ "unchecked", "rawtypes" })
+    @SuppressWarnings({"unchecked", "rawtypes"})
     public ScalarTypeArraySetH2 typeForEnum(ScalarType<?> scalarType) {
       return new ScalarTypeArraySetH2("varchar", DocPropertyType.TEXT, new ArrayElementConverter.EnumConverter(scalarType));
     }
   }
 
-  @SuppressWarnings({ "unchecked", "rawtypes" })
+  @SuppressWarnings({"unchecked", "rawtypes"})
   private ScalarTypeArraySetH2(String arrayType, DocPropertyType docPropertyType, ArrayElementConverter converter) {
     super(arrayType, docPropertyType, converter);
   }

From 6d1e3a08e1f78ff273f491f1d90c46d77cc28e33 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 13 Aug 2018 21:59:33 +1200
Subject: [PATCH 0422/1036] #1470 - Change OnQueryOnly to default to
 OnQueryOnly.COMMIT

---
 src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java  | 2 +-
 .../io/ebeaninternal/server/transaction/TransactionManager.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
index ff887d038..65bdfff4c 100644
--- a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
@@ -52,7 +52,7 @@ public class DatabasePlatform {
   /**
    * The behaviour used when ending a read only transaction at read committed isolation level.
    */
-  protected OnQueryOnly onQueryOnly = OnQueryOnly.ROLLBACK;
+  protected OnQueryOnly onQueryOnly = OnQueryOnly.COMMIT;
 
   /**
    * The open quote used by quoted identifiers.
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index 147839461..51824492e 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -301,7 +301,7 @@ public class TransactionManager implements SpiTransactionManager {
     }
 
     // default to rollback if not defined on the platform
-    return dbPlatformOnQueryOnly == null ? OnQueryOnly.ROLLBACK : dbPlatformOnQueryOnly;
+    return dbPlatformOnQueryOnly == null ? OnQueryOnly.COMMIT : dbPlatformOnQueryOnly;
   }
 
   public String getServerName() {

From cd1ae2001514f7192d33ba5030c9b4d1e6bc2d73 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 13 Aug 2018 22:00:15 +1200
Subject: [PATCH 0423/1036] Bump to 11.21.1-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7ea3e4133..06807d451 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.20.3-SNAPSHOT</version>
+  <version>11.21.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>

From 3f12739e71c24376630746da5d5a303695d574bb Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 13 Aug 2018 22:06:26 +1200
Subject: [PATCH 0424/1036] [maven-release-plugin] prepare release
 ebean-11.21.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 06807d451..0a68704e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.21.1-SNAPSHOT</version>
+  <version>11.21.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.21.1</tag>
   </scm>
 
   <profiles>

From ce10dd79f949923e4403b89bbf197f80c0c7b7c0 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 13 Aug 2018 22:06:41 +1200
Subject: [PATCH 0425/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0a68704e1..4ee1fb037 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.21.1</version>
+  <version>11.21.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.21.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 95dab97b1bc52f33e357a5560f3d3837de438db7 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 14 Aug 2018 14:16:08 +1200
Subject: [PATCH 0426/1036] No effective change - adjust test adding @Draft
 property to @Draftable Document

---
 .../java/org/tests/model/draftable/Document.java     | 12 ++++++++++++
 .../transaction/TestTransactionTryResources.java     |  1 +
 2 files changed, 13 insertions(+)

diff --git a/src/test/java/org/tests/model/draftable/Document.java b/src/test/java/org/tests/model/draftable/Document.java
index 5340ee4fe..2652b2237 100644
--- a/src/test/java/org/tests/model/draftable/Document.java
+++ b/src/test/java/org/tests/model/draftable/Document.java
@@ -1,6 +1,7 @@
 package org.tests.model.draftable;
 
 import io.ebean.Finder;
+import io.ebean.annotation.Draft;
 import io.ebean.annotation.DraftOnly;
 import io.ebean.annotation.Draftable;
 
@@ -25,6 +26,9 @@ public class Document extends BaseDomain {
 
   String body;
 
+  @Draft
+  boolean draft;
+
   @DraftOnly
   Timestamp whenPublish;
 
@@ -54,6 +58,14 @@ public class Document extends BaseDomain {
     this.body = body;
   }
 
+  public boolean isDraft() {
+    return draft;
+  }
+
+  public void setDraft(boolean draft) {
+    this.draft = draft;
+  }
+
   public Organisation getOrganisation() {
     return organisation;
   }
diff --git a/src/test/java/org/tests/transaction/TestTransactionTryResources.java b/src/test/java/org/tests/transaction/TestTransactionTryResources.java
index a9978a237..f53640dfd 100644
--- a/src/test/java/org/tests/transaction/TestTransactionTryResources.java
+++ b/src/test/java/org/tests/transaction/TestTransactionTryResources.java
@@ -34,6 +34,7 @@ public class TestTransactionTryResources extends BaseTestCase {
 
     Document document = Document.find.asDraft(doc.getId());
     assertThat(document).isNotNull();
+    assertThat(document.isDraft()).isTrue();
 
     // cleanup
     Ebean.delete(document);

From 80975acfbf83cdbb6dd1cbed212ad92a7568ab53 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 14 Aug 2018 14:23:28 +1200
Subject: [PATCH 0427/1036] #1471 - Change stateless update on bean with no
 @Version property that updates 0 rows to throw EntityNotFoundException

---
 .../server/core/PersistRequestBean.java       | 12 +++++-----
 .../server/persist/dml/DmlHandler.java        |  1 -
 .../org/tests/update/TestStatelessUpdate.java | 23 +++++++++++++++++++
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index dcee6530f..d71d7e9cd 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -31,6 +31,7 @@ import io.ebeanservice.docstore.api.DocStoreUpdate;
 import io.ebeanservice.docstore.api.DocStoreUpdateContext;
 import io.ebeanservice.docstore.api.DocStoreUpdates;
 
+import javax.persistence.EntityNotFoundException;
 import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
 import java.io.IOException;
@@ -854,12 +855,11 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    */
   @Override
   public final void checkRowCount(int rowCount) {
-    if (ConcurrencyMode.VERSION == concurrencyMode && rowCount != 1) {
-      // fix for oracle.
-      // see: https://stackoverflow.com/questions/19022175/executebatch-method-return-array-of-value-2-in-java
-      if (rowCount != Statement.SUCCESS_NO_INFO) {
-        String m = Message.msg("persist.conc2", String.valueOf(rowCount));
-        throw new OptimisticLockException(m, null, bean);
+    if (rowCount != 1 && rowCount != Statement.SUCCESS_NO_INFO) {
+      if (ConcurrencyMode.VERSION == concurrencyMode) {
+        throw new OptimisticLockException(Message.msg("persist.conc2", String.valueOf(rowCount)), null, bean);
+      } else if (rowCount == 0 && type == Type.UPDATE) {
+        throw new EntityNotFoundException("No rows updated");
       }
     }
     switch (type) {
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
index a90e3198b..ea1a05087 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
@@ -7,7 +7,6 @@ import io.ebeaninternal.server.lib.util.Str;
 import io.ebeaninternal.server.persist.BatchedPstmt;
 import io.ebeaninternal.server.persist.BatchedPstmtHolder;
 import io.ebeaninternal.server.persist.dmlbind.BindableRequest;
-import io.ebeaninternal.server.transaction.TransactionManager;
 import io.ebeaninternal.server.type.DataBind;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/test/java/org/tests/update/TestStatelessUpdate.java b/src/test/java/org/tests/update/TestStatelessUpdate.java
index 184248b88..7a3376adf 100644
--- a/src/test/java/org/tests/update/TestStatelessUpdate.java
+++ b/src/test/java/org/tests/update/TestStatelessUpdate.java
@@ -11,6 +11,7 @@ import org.tests.model.basic.EBasic.Status;
 import org.junit.Assert;
 import org.junit.Test;
 
+import javax.persistence.EntityNotFoundException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashSet;
@@ -70,6 +71,28 @@ public class TestStatelessUpdate extends TransactionalTestCase {
 
   }
 
+  @Test(expected = EntityNotFoundException.class)
+  public void update_NoRowsUpdated_expect_EntityNotFoundException() {
+
+    EBasic basic = new EBasic();
+    basic.setId(999999999);
+    basic.setName("something");
+    basic.setStatus(Status.ACTIVE);
+
+    Ebean.update(basic);
+  }
+
+  @Test
+  public void delete_NoRowsDeleted_expect_false() {
+
+    EBasic basic = new EBasic();
+    basic.setId(999999999);
+    basic.setName("something");
+    basic.setStatus(Status.ACTIVE);
+
+    assertThat(Ebean.delete(basic)).isFalse();
+  }
+
   /**
    * I am expecting that Ebean detects there aren't any changes and don't execute any query.
    * Currently a {@link javax.persistence.PersistenceException} with message 'Invalid value "null" for parameter "SQL"' is thrown.

From 340b100a1ab1e432ea315a02a1803f8f85614291 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 14 Aug 2018 22:09:01 +1200
Subject: [PATCH 0428/1036] No effective change - Add test for OneToOne
 orphanRemoval=true and String Ids (non generated ids)

---
 .../org/tests/model/onetoone/OtoAone.java     | 19 ++++++++
 .../org/tests/model/onetoone/OtoAtwo.java     | 47 +++++++++++++++++++
 .../onetoone/TestOneToOneOrphanStringId.java  | 39 +++++++++++++++
 3 files changed, 105 insertions(+)
 create mode 100644 src/test/java/org/tests/model/onetoone/OtoAone.java
 create mode 100644 src/test/java/org/tests/model/onetoone/OtoAtwo.java
 create mode 100644 src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java

diff --git a/src/test/java/org/tests/model/onetoone/OtoAone.java b/src/test/java/org/tests/model/onetoone/OtoAone.java
new file mode 100644
index 000000000..9716b4a37
--- /dev/null
+++ b/src/test/java/org/tests/model/onetoone/OtoAone.java
@@ -0,0 +1,19 @@
+package org.tests.model.onetoone;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class OtoAone {
+
+  @Id
+  private String id;
+
+  private String description;
+
+  public OtoAone(String id, String description){
+    this.id = id;
+    this.description = description;
+  }
+
+}
diff --git a/src/test/java/org/tests/model/onetoone/OtoAtwo.java b/src/test/java/org/tests/model/onetoone/OtoAtwo.java
new file mode 100644
index 000000000..d60bfb5c1
--- /dev/null
+++ b/src/test/java/org/tests/model/onetoone/OtoAtwo.java
@@ -0,0 +1,47 @@
+package org.tests.model.onetoone;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+
+@Entity
+public class OtoAtwo {
+
+  @Id
+  private String id;
+
+  private String description;
+
+  @OneToOne(orphanRemoval=true, cascade = CascadeType.ALL)
+  private OtoAone aone;
+
+  public OtoAtwo(String id, String description){
+    this.id = id;
+    this.description = description;
+  }
+
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  public OtoAone getAone() {
+    return aone;
+  }
+
+  public void setAone(OtoAone aone) {
+    this.aone = aone;
+  }
+}
diff --git a/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java b/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java
new file mode 100644
index 000000000..de738af4e
--- /dev/null
+++ b/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java
@@ -0,0 +1,39 @@
+package org.tests.model.onetoone;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestOneToOneOrphanStringId extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    OtoAone a = new OtoAone("a", "a test");
+    OtoAtwo b = new OtoAtwo("b", "b test");
+    b.setAone(a);
+
+    LoggedSqlCollector.start();
+
+    Ebean.save(b);
+
+    List<String> inserts = LoggedSqlCollector.current();
+    assertThat(inserts).hasSize(2);
+    assertThat(inserts.get(0)).contains("insert into oto_aone");
+    assertThat(inserts.get(1)).contains("insert into oto_atwo");
+
+    Ebean.delete(b);
+
+    List<String> deletes = LoggedSqlCollector.stop();
+    assertThat(deletes).hasSize(2);
+    assertThat(deletes.get(0)).contains("delete from oto_atwo");
+    assertThat(deletes.get(1)).contains("delete from oto_aone");
+  }
+}
+
+

From 29c5a17202b9835134414a3920cf87d47e77e137 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 15 Aug 2018 23:12:06 +1200
Subject: [PATCH 0429/1036] #1472 - Cascade insert with managed id ... results
 in update rather than insert statement

---
 .../server/core/PersistRequestBean.java       | 12 +++-
 .../server/persist/DefaultPersister.java      |  7 +--
 .../ebeaninternal/server/persist/Flags.java   | 63 +++++++++++++------
 .../server/persist/FlagsTest.java             | 51 +++++++++++++--
 .../onetoone/TestOneToOneOrphanStringId.java  | 33 +++++++++-
 5 files changed, 132 insertions(+), 34 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index d71d7e9cd..9a8d0f23b 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -1307,14 +1307,22 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    * Set the request flags indicating this is an insert.
    */
   public void flagInsert() {
-    flags = Flags.setInsert(flags);
+    if (intercept.isNew()) {
+      flags = Flags.setInsertNormal(flags);
+    } else {
+      flags = Flags.setInsert(flags);
+    }
   }
 
   /**
    * Unset the request insert flag indicating this is an update.
    */
   public void flagUpdate() {
-    flags = Flags.unsetInsert(flags);
+    if (intercept.isLoaded()) {
+      flags = Flags.setUpdateNormal(flags);
+    } else {
+      flags = Flags.setUpdate(flags);
+    }
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index feb7337b3..0e402dcdc 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -456,8 +456,7 @@ public final class DefaultPersister implements Persister {
   void saveRecurse(EntityBean bean, Transaction t, Object parentBean, int flags) {
 
     // determine insert or update taking into account stateless updates
-    PersistRequestBean<?> request = createRequestRecurse(bean, t, parentBean, flags);
-    saveRecurse(request);
+    saveRecurse(createRequestRecurse(bean, t, parentBean, flags));
   }
 
   private void saveRecurse(PersistRequestBean<?> request) {
@@ -1229,8 +1228,8 @@ public final class DefaultPersister implements Persister {
     BeanDescriptor<T> desc = mgr.getBeanDescriptor();
     EntityBean entityBean = (EntityBean) bean;
     PersistRequest.Type type;
-    if (Flags.isPublishOrMerge(flags)) {
-      // insert if it is a new bean (as publish created it)
+    if (Flags.isPublishMergeOrNormal(flags)) {
+      // just use bean state to determine insert or update
       type = entityBean._ebean_getIntercept().isUpdate() ? Type.UPDATE : Type.INSERT;
     } else {
       // determine Insert or Update based on bean state and insert flag
diff --git a/src/main/java/io/ebeaninternal/server/persist/Flags.java b/src/main/java/io/ebeaninternal/server/persist/Flags.java
index ffde410c5..263dbb6e8 100644
--- a/src/main/java/io/ebeaninternal/server/persist/Flags.java
+++ b/src/main/java/io/ebeaninternal/server/persist/Flags.java
@@ -5,7 +5,7 @@ package io.ebeaninternal.server.persist;
  * <p>
  * Allows passing of flag state when recursively persisting.
  */
-public class Flags {
+public final class Flags {
 
   /**
    * Indicates the bean is being inserted.
@@ -27,6 +27,11 @@ public class Flags {
    */
   public static final int MERGE = 0x00000008;
 
+  /**
+   * Indicates Normal insert or update (not forced).
+   */
+  public static final int NORMAL = 0x00000010;
+
   /**
    * No flags set.
    */
@@ -34,7 +39,9 @@ public class Flags {
 
   public static final int PUBLISH_RECURSE = PUBLISH + RECURSE;
 
-  private static final int PUBLISH_MERGE = PUBLISH + MERGE;
+  private static final int PUBLISH_MERGE_NORMAL = PUBLISH + MERGE + NORMAL;
+
+  private static final int INSERT_NORMAL = INSERT + NORMAL;
 
   /**
    * Return true if the bean is being inserted.
@@ -65,10 +72,10 @@ public class Flags {
   }
 
   /**
-   * Return true if part of a Merge or Publish.
+   * Return true if part of a Merge or Publish or Normal (bean state matches persist).
    */
-  public static boolean isPublishOrMerge(long state) {
-    return (state & PUBLISH_MERGE) != 0;
+  public static boolean isPublishMergeOrNormal(int state) {
+    return (state & PUBLISH_MERGE_NORMAL) != 0;
   }
 
   /**
@@ -82,54 +89,70 @@ public class Flags {
    * Set Insert flag.
    */
   public static int setInsert(int state) {
-    return set(state, INSERT, true);
+    return set(state, INSERT);
+  }
+
+  /**
+   * Insert flag and normal in that bean is in NEW state (for insert).
+   */
+  public static int setInsertNormal(int state) {
+    return set(state, INSERT_NORMAL);
   }
 
   /**
    * Parent was not inserted.
    */
-  public static int unsetInsert(int state) {
-    return set(state, INSERT, false);
+  public static int setUpdate(int state) {
+    return unset(state, INSERT);
+  }
+
+  /**
+   * Not Insert and normal in that bean is in LOADED state (for update).
+   */
+  public static int setUpdateNormal(int state) {
+    state &= ~INSERT;
+    state |= NORMAL;
+    return state;
   }
 
   /**
    * Set Recurse flag.
    */
   public static int setRecurse(int state) {
-    return set(state, RECURSE, true);
+    return set(state, RECURSE);
   }
 
   public static int unsetRecuse(int state) {
-    return set(state, RECURSE, false);
+    return unset(state, RECURSE);
   }
 
   /**
    * Set Publish flag.
    */
   public static int setPublish(int state) {
-    return set(state, PUBLISH, true);
+    return set(state, PUBLISH);
   }
 
   public static int unsetPublish(int state) {
-    return set(state, PUBLISH, false);
+    return unset(state, PUBLISH);
   }
 
   /**
    * Set Merge flag.
    */
   public static int setMerge(int state) {
-    return set(state, MERGE, true);
+    return set(state, MERGE);
   }
 
   public static int unsetMerge(int state) {
-    return set(state, MERGE, false);
+    return unset(state, MERGE);
   }
 
-  private static int set(int state, int flag, boolean setFlag) {
-    if (setFlag) {
-      return (state |= flag);
-    } else {
-      return state &= ~flag;
-    }
+  private static int set(int state, int flag) {
+    return (state |= flag);
+  }
+
+  private static int unset(int state, int flag) {
+    return state &= ~flag;
   }
 }
diff --git a/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java b/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java
index 4e4d947c4..0753a3841 100644
--- a/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java
+++ b/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java
@@ -26,19 +26,60 @@ public class FlagsTest {
     assertThat(Flags.isSet(state, Flags.PUBLISH)).isFalse();
     assertThat(Flags.isSet(state, Flags.MERGE)).isTrue();
     assertThat(Flags.isSet(state, Flags.INSERT)).isTrue();
+  }
 
+  @Test
+  public void insert() {
+
+    int state = 0;
+
+    state = Flags.setInsert(state);
+    assertThat(Flags.isSet(state, Flags.INSERT)).isTrue();
+    assertThat(Flags.isSet(state, Flags.NORMAL)).isFalse();
+  }
+
+  @Test
+  public void insertNormal() {
+
+    int state = 0;
+
+    state = Flags.setInsertNormal(state);
+    assertThat(Flags.isSet(state, Flags.INSERT)).isTrue();
+    assertThat(Flags.isSet(state, Flags.NORMAL)).isTrue();
+  }
+
+  @Test
+  public void update() {
+
+    int state = 0;
+
+    state = Flags.setUpdate(state);
+    assertThat(Flags.isSet(state, Flags.INSERT)).isFalse();
+    assertThat(Flags.isSet(state, Flags.NORMAL)).isFalse();
+  }
+
+  @Test
+  public void updateNormal() {
+
+    int state = 0;
+
+    state = Flags.setUpdateNormal(state);
+    assertThat(Flags.isSet(state, Flags.INSERT)).isFalse();
+    assertThat(Flags.isSet(state, Flags.NORMAL)).isTrue();
   }
 
   @Test
   public void isPublishOrMerge() {
 
-    assertThat(Flags.isPublishOrMerge(0)).isFalse();
-    assertThat(Flags.isPublishOrMerge(Flags.INSERT)).isFalse();
+    assertThat(Flags.isPublishMergeOrNormal(0)).isFalse();
+    assertThat(Flags.isPublishMergeOrNormal(Flags.INSERT)).isFalse();
+    assertThat(Flags.isPublishMergeOrNormal(Flags.RECURSE)).isFalse();
 
-    assertThat(Flags.isPublishOrMerge(Flags.PUBLISH)).isTrue();
-    assertThat(Flags.isPublishOrMerge(Flags.MERGE)).isTrue();
+    assertThat(Flags.isPublishMergeOrNormal(Flags.PUBLISH)).isTrue();
+    assertThat(Flags.isPublishMergeOrNormal(Flags.MERGE)).isTrue();
+    assertThat(Flags.isPublishMergeOrNormal(Flags.NORMAL)).isTrue();
 
     int mergePublish = Flags.setMerge(Flags.setPublish(0));
-    assertThat(Flags.isPublishOrMerge(mergePublish)).isTrue();
+    assertThat(Flags.isPublishMergeOrNormal(mergePublish)).isTrue();
   }
 }
diff --git a/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java b/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java
index de738af4e..1a16f50d6 100644
--- a/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java
+++ b/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java
@@ -12,10 +12,37 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class TestOneToOneOrphanStringId extends BaseTestCase {
 
   @Test
-  public void test() {
+  public void test_updateInsert() {
+
+    OtoAtwo b = new OtoAtwo("b1", "b test");
+    Ebean.save(b);
+
+    OtoAone a = new OtoAone("a1", "a test");
+    b.setAone(a);
+
+    LoggedSqlCollector.start();
+
+    Ebean.save(b);
+
+    List<String> update = LoggedSqlCollector.current();
+    assertThat(update).hasSize(2);
+    assertThat(update.get(0)).contains("insert into oto_aone");
+    assertThat(update.get(1)).contains("update oto_atwo set aone_id=? where id=?");
+
+    Ebean.delete(b);
+
+    List<String> deletes = LoggedSqlCollector.stop();
+    assertThat(deletes).hasSize(2);
+    assertThat(deletes.get(0)).contains("delete from oto_atwo");
+    assertThat(deletes.get(1)).contains("delete from oto_aone");
+  }
+
+  @Test
+  public void test_cascade() {
+
+    OtoAone a = new OtoAone("a2", "a test");
+    OtoAtwo b = new OtoAtwo("b2", "b test");
 
-    OtoAone a = new OtoAone("a", "a test");
-    OtoAtwo b = new OtoAtwo("b", "b test");
     b.setAone(a);
 
     LoggedSqlCollector.start();

From f63a3cb9260645abb7f831a0655f9cbb9b7e8e6e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 16 Aug 2018 00:02:10 +1200
Subject: [PATCH 0430/1036] Bump ebean-migration to 11.9.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4ee1fb037..27a2e272a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>11.8.2</version>
+      <version>11.9.1</version>
     </dependency>
 
     <dependency>

From e1b7161b22e22490935cabb72bece2c96519057b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 16 Aug 2018 00:03:15 +1200
Subject: [PATCH 0431/1036] Bump version to 11.22.1-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 27a2e272a..8787fb6e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.21.2-SNAPSHOT</version>
+  <version>11.22.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>

From d28e3ee456ead8d66a5234cfa19ae8c25031493e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 16 Aug 2018 00:05:16 +1200
Subject: [PATCH 0432/1036] [maven-release-plugin] prepare release
 ebean-11.22.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8787fb6e3..0528b83c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.22.1-SNAPSHOT</version>
+  <version>11.22.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.22.1</tag>
   </scm>
 
   <profiles>

From 5f83584315f1534b319da42f70e5a31ab8a1b5e9 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 16 Aug 2018 00:05:31 +1200
Subject: [PATCH 0433/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0528b83c9..13393abcb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.22.1</version>
+  <version>11.22.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.22.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From f3d26e32ecb60791ae1354c325c4f1253e2b00c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sn=C5=8Dwball?= <tobias@olsson.be>
Date: Tue, 21 Aug 2018 10:26:08 +0200
Subject: [PATCH 0434/1036] Possible fix error with multiple uses of enum
 (#1473)

When an enum is exists in the type cache and isn't String, @DbArray
fails. This includes a test that should fail everywhere (order of
reading fields isn't guaranteed afaik and the column needs to be read
before the @DbArray for the test to fail).
---
 .../ebeaninternal/server/type/DefaultTypeManager.java  |  4 ++--
 src/test/java/org/tests/model/array/EArrayBean.java    | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index eebf80aca..d6fb20e33 100644
--- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -351,7 +351,7 @@ public final class DefaultTypeManager implements TypeManager {
     if (type.equals(List.class)) {
       if (arrayTypeListFactory != null) {
         if (isEnumType(valueType)) {
-          return arrayTypeListFactory.typeForEnum(createEnumScalarType(asEnumClass(valueType), EnumType.STRING));
+          return arrayTypeListFactory.typeForEnum(createEnumScalarType(asEnumClass(valueType), null));
         }
         return arrayTypeListFactory.typeFor(valueType);
       }
@@ -360,7 +360,7 @@ public final class DefaultTypeManager implements TypeManager {
     } else if (type.equals(Set.class)) {
       if (arrayTypeSetFactory != null) {
         if (isEnumType(valueType)) {
-          return arrayTypeSetFactory.typeForEnum(createEnumScalarType(asEnumClass(valueType), EnumType.STRING));
+          return arrayTypeSetFactory.typeForEnum(createEnumScalarType(asEnumClass(valueType), null));
         }
         return arrayTypeSetFactory.typeFor(valueType);
       }
diff --git a/src/test/java/org/tests/model/array/EArrayBean.java b/src/test/java/org/tests/model/array/EArrayBean.java
index a9c4e7d64..c8fd0f29d 100644
--- a/src/test/java/org/tests/model/array/EArrayBean.java
+++ b/src/test/java/org/tests/model/array/EArrayBean.java
@@ -18,6 +18,8 @@ public class EArrayBean {
     ONE, TWO, THREE
   }
 
+  IntEnum foo;
+
   @Id
   Long id;
 
@@ -50,6 +52,14 @@ public class EArrayBean {
   @Version
   Long version;
 
+  public IntEnum getFoo() {
+    return foo;
+  }
+
+  public void setFoo(final IntEnum foo) {
+    this.foo = foo;
+  }
+
   public Long getId() {
     return id;
   }

From 663b1bb4aa01a640b855f6e62a844aaebd5cbff3 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 21 Aug 2018 20:45:31 +1200
Subject: [PATCH 0435/1036] #1474 - IllegalStateException: Table [some_table]
 does not exists in model? ... when applying drop table migration and table is
 no longer in the model

---
 .../dbmigration/model/ModelContainer.java     | 26 +++++------------
 .../dbmigration/model/ModelContainerTest.java | 28 +++++++++++++++++++
 .../model/5.0__dropTable.model.xml            |  6 ++++
 3 files changed, 41 insertions(+), 19 deletions(-)
 create mode 100644 src/test/resources/io/ebeaninternal/dbmigration/model/5.0__dropTable.model.xml

diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java b/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
index f2daca21b..d92adfb61 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
@@ -184,13 +184,12 @@ public class ModelContainer {
   /**
    * Unset the withHistory flag on the associated base table.
    */
-  private void applyChange(DropHistoryTable change) {
+  protected void applyChange(DropHistoryTable change) {
 
     MTable table = tables.get(change.getBaseTable());
-    if (table == null) {
-      throw new IllegalStateException("Table [" + change.getBaseTable() + "] does not exist in model?");
+    if (table != null) {
+      table.setWithHistory(false);
     }
-    table.setWithHistory(false);
   }
 
   private void applyChange(AddUniqueConstraint change) {
@@ -241,19 +240,14 @@ public class ModelContainer {
     if (tables.containsKey(tableName)) {
       throw new IllegalStateException("Table [" + tableName + "] already exists in model?");
     }
-    MTable table = new MTable(createTable);
-    tables.put(tableName, table);
+    tables.put(tableName, new MTable(createTable));
   }
 
   /**
    * Apply a DropTable change to the model.
    */
   protected void applyChange(DropTable dropTable) {
-    String tableName = dropTable.getName();
-    if (!tables.containsKey(tableName)) {
-      throw new IllegalStateException("Table [" + tableName + "] does not exists in model?");
-    }
-    tables.remove(tableName);
+    tables.remove(dropTable.getName());
   }
 
   /**
@@ -264,22 +258,16 @@ public class ModelContainer {
     if (indexes.containsKey(indexName)) {
       throw new IllegalStateException("Index [" + indexName + "] already exists in model?");
     }
-    MIndex index = new MIndex(createIndex);
-    indexes.put(createIndex.getIndexName(), index);
+    indexes.put(createIndex.getIndexName(), new MIndex(createIndex));
   }
 
   /**
    * Apply a DropTable change to the model.
    */
   protected void applyChange(DropIndex dropIndex) {
-    String name = dropIndex.getIndexName();
-    if (!indexes.containsKey(name)) {
-      throw new IllegalStateException("Index [" + name + "] does not exist in model?");
-    }
-    indexes.remove(name);
+    indexes.remove(dropIndex.getIndexName());
   }
 
-
   /**
    * Apply a AddColumn change to the model.
    */
diff --git a/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java
index ae05f368b..591e7aa99 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java
@@ -1,6 +1,9 @@
 package io.ebeaninternal.dbmigration.model;
 
 
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
+import io.ebeaninternal.dbmigration.migration.DropIndex;
+import io.ebeaninternal.dbmigration.migration.DropTable;
 import io.ebeaninternal.dbmigration.migration.Migration;
 import io.ebeaninternal.dbmigration.migrationreader.MigrationXmlReader;
 import org.junit.Test;
@@ -79,6 +82,31 @@ public class ModelContainerTest {
     assertThat(container.getPendingDrops()).isEmpty();
   }
 
+  @Test
+  public void apply_dropTable_when_notInModel_then_ok() {
+
+    ModelContainer container = new ModelContainer();
+    container.apply(mig("5.0__dropTable.model.xml"), ver("5.0"));
+    assertThat(container.getTables()).isEmpty();
+  }
+
+  @Test
+  public void apply_drop_when_notInModel_then_ok() {
+
+    ModelContainer container = new ModelContainer();
+    DropTable dropTable = new DropTable();
+    dropTable.setName("DoesNotExist");
+    container.applyChange(dropTable);
+
+    DropIndex dropIndex = new DropIndex();
+    dropIndex.setIndexName("DoesNotExist");
+    container.applyChange(dropIndex);
+
+    DropHistoryTable dropHistoryTable = new DropHistoryTable();
+    dropHistoryTable.setBaseTable("DoesNotExist");
+    container.applyChange(dropHistoryTable);
+  }
+
   private ModelContainer container_2_1() {
     ModelContainer container = new ModelContainer();
     container.apply(mig("2.0.model.xml"), ver("2.0"));
diff --git a/src/test/resources/io/ebeaninternal/dbmigration/model/5.0__dropTable.model.xml b/src/test/resources/io/ebeaninternal/dbmigration/model/5.0__dropTable.model.xml
new file mode 100644
index 000000000..5085a7aba
--- /dev/null
+++ b/src/test/resources/io/ebeaninternal/dbmigration/model/5.0__dropTable.model.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
+  <changeSet type="apply">
+    <dropTable name="some_table"/>
+  </changeSet>
+</migration>

From d11bb2c4e509a7895e4e82dc70fa168120eaf2d8 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 21 Aug 2018 21:08:17 +1200
Subject: [PATCH 0436/1036] No effective change - add a new test for OneToMany
 orphanRemoval=true

---
 .../tests/model/orphanremoval/OrpDetail.java  | 58 ++++++++++++++++++
 .../tests/model/orphanremoval/OrpMaster.java  | 60 +++++++++++++++++++
 .../orphanremoval/TestOrphanRemoveO2M.java    | 36 +++++++++++
 3 files changed, 154 insertions(+)
 create mode 100644 src/test/java/org/tests/model/orphanremoval/OrpDetail.java
 create mode 100644 src/test/java/org/tests/model/orphanremoval/OrpMaster.java
 create mode 100644 src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java

diff --git a/src/test/java/org/tests/model/orphanremoval/OrpDetail.java b/src/test/java/org/tests/model/orphanremoval/OrpDetail.java
new file mode 100644
index 000000000..4ba7c12fa
--- /dev/null
+++ b/src/test/java/org/tests/model/orphanremoval/OrpDetail.java
@@ -0,0 +1,58 @@
+package org.tests.model.orphanremoval;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Version;
+
+@Entity
+public class OrpDetail {
+
+  @Id
+  String id;
+
+  String detail;
+
+  @ManyToOne
+  OrpMaster master;
+
+  @Version
+  long version;
+
+  public OrpDetail(String id, String detail) {
+    this.id = id;
+    this.detail = detail;
+  }
+
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public OrpMaster getMaster() {
+    return master;
+  }
+
+  public void setMaster(OrpMaster master) {
+    this.master = master;
+  }
+
+  public String getDetail() {
+    return detail;
+  }
+
+  public void setDetail(String detail) {
+    this.detail = detail;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/orphanremoval/OrpMaster.java b/src/test/java/org/tests/model/orphanremoval/OrpMaster.java
new file mode 100644
index 000000000..8801d87f7
--- /dev/null
+++ b/src/test/java/org/tests/model/orphanremoval/OrpMaster.java
@@ -0,0 +1,60 @@
+package org.tests.model.orphanremoval;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Version;
+import java.util.List;
+
+@Entity
+public class OrpMaster {
+
+  @Id
+  String id;
+
+  String name;
+
+  @OneToMany(orphanRemoval = true, cascade = CascadeType.ALL)
+  List<OrpDetail> details;
+
+  @Version
+  long version;
+
+  public OrpMaster(String id, String name) {
+    this.id = id;
+    this.name = name;
+  }
+
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public List<OrpDetail> getDetails() {
+    return details;
+  }
+
+  public void setDetails(List<OrpDetail> details) {
+    this.details = details;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java b/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java
new file mode 100644
index 000000000..b0c52a12b
--- /dev/null
+++ b/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java
@@ -0,0 +1,36 @@
+package org.tests.model.orphanremoval;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestOrphanRemoveO2M extends BaseTestCase {
+
+  @Test
+  public void clear_expect_deletes() {
+
+    OrpMaster master = new OrpMaster("m","master");
+    master.getDetails().add(new OrpDetail("d1", "d1"));
+    master.getDetails().add(new OrpDetail("d2", "d2"));
+
+    Ebean.save(master);
+
+    master.getDetails().clear();
+
+    LoggedSqlCollector.start();
+    Ebean.save(master);
+
+    List<String> sql = LoggedSqlCollector.stop();
+
+    assertThat(Ebean.find(OrpDetail.class, "d1")).isNull();
+    assertThat(Ebean.find(OrpDetail.class, "d2")).isNull();
+
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("delete from orp_detail where id=?");
+  }
+}

From 4d4886d8080207f7c0b005349dd6dad4a637b8d4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 21 Aug 2018 21:15:07 +1200
Subject: [PATCH 0437/1036] [maven-release-plugin] prepare release
 ebean-11.22.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 13393abcb..c1f928873 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.22.2-SNAPSHOT</version>
+  <version>11.22.2</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.22.2</tag>
   </scm>
 
   <profiles>

From e1e8092144614f85a3f13b3aab30acab96556cf4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 21 Aug 2018 21:15:23 +1200
Subject: [PATCH 0438/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c1f928873..3c8fe96d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.22.2</version>
+  <version>11.22.3-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.22.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 2df2224286dc1043f5681da80887756a19c99c45 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 27 Aug 2018 20:00:44 +1200
Subject: [PATCH 0439/1036] No effective change - add a new test for OneToOne
 with fetchType LAZY

---
 .../org/tests/model/onetoone/OtoBMaster.java  |  3 +-
 .../TestOneToOneImportedPkNative.java         | 41 +++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/tests/model/onetoone/OtoBMaster.java b/src/test/java/org/tests/model/onetoone/OtoBMaster.java
index 2ab81d97e..43e968ef0 100644
--- a/src/test/java/org/tests/model/onetoone/OtoBMaster.java
+++ b/src/test/java/org/tests/model/onetoone/OtoBMaster.java
@@ -2,6 +2,7 @@ package org.tests.model.onetoone;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.persistence.OneToOne;
 
@@ -13,7 +14,7 @@ public class OtoBMaster {
 
   String name;
 
-  @OneToOne(cascade = CascadeType.ALL, mappedBy = "master")
+  @OneToOne(cascade = CascadeType.ALL, mappedBy = "master", fetch = FetchType.LAZY)
   OtoBChild child;
 
   public Long getId() {
diff --git a/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java b/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java
index b01c4ddb3..1ee9e17e9 100644
--- a/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java
+++ b/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java
@@ -3,12 +3,53 @@ package org.tests.model.onetoone;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.EbeanServer;
+import io.ebean.Query;
+import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
+import java.util.List;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestOneToOneImportedPkNative extends BaseTestCase {
 
+  @Test
+  public void findWithLazyOneToOne() {
+
+    OtoBChild child = new OtoBChild();
+    child.setChild("c1");
+
+    OtoBMaster master = new OtoBMaster();
+    master.setName("m2");
+    master.setChild(child);
+
+    Ebean.save(master);
+
+    Query<OtoBMaster> query = Ebean.find(OtoBMaster.class)
+      //.select("name")
+      .where().idEq(master.getId())
+      .query();
+
+    OtoBMaster one = query.findOne();
+
+    String sql = sqlOf(query);
+    assertThat(sql).contains("select t0.id, t0.name from oto_bmaster t0 where t0.id ");
+    assertThat(sql).doesNotContain("left join oto_bchild");
+
+    assertThat(one).isNotNull();
+
+    LoggedSqlCollector.start();
+
+    OtoBChild child1 = one.getChild();
+    assertThat(child1).isNotNull();
+    assertThat(child1.getChild()).isEqualTo("c1");
+
+    List<String> lazyLoadSql = LoggedSqlCollector.stop();
+    assertThat(lazyLoadSql).hasSize(2);
+    assertThat(lazyLoadSql.get(0)).contains("select t0.id, t0.name, t1.master_id from oto_bmaster t0 left join oto_bchild t1");
+    assertThat(lazyLoadSql.get(1)).contains("select t0.master_id, t0.child, t0.master_id from oto_bchild t0 where t0.master_id");
+  }
+
   @Test
   public void native_with_o2oAndImportedPrimaryKey() {
 

From 55a9ba7170a3111e5a879267f3d03b7d2ef6e990 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 27 Aug 2018 21:35:00 +1200
Subject: [PATCH 0440/1036] #1475 - @OneToOne child with @SoftDelete that is
 deleted is still loaded by parent

---
 .../deploy/AssocOneHelpRefExported.java       | 14 +++-
 .../server/deploy/DbSqlContext.java           | 13 ++--
 .../server/deploy/TableJoin.java              | 10 +++
 .../server/query/DefaultDbSqlContext.java     | 15 ++--
 .../server/query/SqlTreeAlias.java            | 10 ++-
 .../server/query/SqlTreeBuilder.java          |  2 +-
 .../org/tests/model/onetoone/OtoSdChild.java  | 73 +++++++++++++++++++
 .../org/tests/model/onetoone/OtoSdMaster.java | 55 ++++++++++++++
 .../onetoone/TestOneToOneSoftDeleteChild.java | 47 ++++++++++++
 9 files changed, 218 insertions(+), 21 deletions(-)
 create mode 100644 src/test/java/org/tests/model/onetoone/OtoSdChild.java
 create mode 100644 src/test/java/org/tests/model/onetoone/OtoSdMaster.java
 create mode 100644 src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java
index 81de5a036..874231645 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java
@@ -7,8 +7,14 @@ import io.ebeaninternal.server.query.SqlJoinType;
  */
 class AssocOneHelpRefExported extends AssocOneHelp {
 
-  public AssocOneHelpRefExported(BeanPropertyAssocOne<?> property) {
+  private final boolean softDelete;
+
+  private final String softDeletePredicate;
+
+  AssocOneHelpRefExported(BeanPropertyAssocOne<?> property) {
     super(property);
+    this.softDelete = property.targetDescriptor.isSoftDelete();
+    this.softDeletePredicate = (softDelete) ? property.targetDescriptor.getSoftDeletePredicate("") : null;
   }
 
   /**
@@ -28,6 +34,10 @@ class AssocOneHelpRefExported extends AssocOneHelp {
   void appendFrom(DbSqlContext ctx, SqlJoinType joinType) {
 
     String relativePrefix = ctx.getRelativePrefix(property.getName());
-    property.tableJoin.addJoin(joinType, relativePrefix, ctx);
+    if (softDelete && !ctx.isIncludeSoftDelete()) {
+      property.tableJoin.addJoin(joinType, relativePrefix, ctx, softDeletePredicate);
+    } else {
+      property.tableJoin.addJoin(joinType, relativePrefix, ctx);
+    }
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java b/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java
index 0eca9a112..3fd4e3666 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java
@@ -12,8 +12,6 @@ public interface DbSqlContext {
    */
   void addJoin(String type, String table, TableJoinColumn[] cols, String a1, String a2, String inheritance);
 
-  void pushSecondaryTableAlias(String alias);
-
   /**
    * Push the current table alias onto the stack.
    */
@@ -91,11 +89,6 @@ public interface DbSqlContext {
    */
   String getContent();
 
-  /**
-   * Return the current join node.
-   */
-  String peekJoin();
-
   /**
    * Push a join node onto the stack.
    */
@@ -125,6 +118,11 @@ public interface DbSqlContext {
    */
   void appendHistorySysPeriod();
 
+  /**
+   * Return true if the query includes soft deleted rows.
+   */
+  boolean isIncludeSoftDelete();
+
   /**
    * Return true if the query is a 'asDraft' query.
    */
@@ -139,4 +137,5 @@ public interface DbSqlContext {
    * Append 'for update' lock hints on FROM clause (sql server only).
    */
   void appendFromForUpdate();
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java b/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java
index 6a23e300d..eedb2b547 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java
@@ -126,6 +126,16 @@ public final class TableJoin {
     return type;
   }
 
+  public SqlJoinType addJoin(SqlJoinType joinType, String prefix, DbSqlContext ctx, String predicate) {
+    String[] names = SplitName.split(prefix);
+    String a1 = ctx.getTableAlias(names[0]);
+    String a2 = ctx.getTableAlias(prefix);
+
+    SqlJoinType returnJoinType = addJoin(joinType, a1, a2, ctx);
+    ctx.append("and ").append(a2).append(predicate);
+    return returnJoinType;
+  }
+
   public SqlJoinType addJoin(SqlJoinType joinType, String prefix, DbSqlContext ctx) {
 
     String[] names = SplitName.split(prefix);
diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java b/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
index f40b9c2cf..cb5ae732e 100644
--- a/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
+++ b/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
@@ -70,6 +70,11 @@ class DefaultDbSqlContext implements DbSqlContext {
     this.fromForUpdate = fromForUpdate;
   }
 
+  @Override
+  public boolean isIncludeSoftDelete() {
+    return alias.isIncludeSoftDelete();
+  }
+
   @Override
   public void appendFromForUpdate() {
     if (fromForUpdate != null) {
@@ -99,11 +104,6 @@ class DefaultDbSqlContext implements DbSqlContext {
     return encryptedProps.toArray(new BeanProperty[encryptedProps.size()]);
   }
 
-  @Override
-  public String peekJoin() {
-    return joinStack.peek();
-  }
-
   @Override
   public void popJoin() {
     joinStack.pop();
@@ -206,11 +206,6 @@ class DefaultDbSqlContext implements DbSqlContext {
     return alias.getTableAliasManyWhere(prefix);
   }
 
-  @Override
-  public void pushSecondaryTableAlias(String alias) {
-    tableAliasStack.push(alias);
-  }
-
   @Override
   public String getRelativePrefix(String propName) {
 
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java
index ea583c833..39895df70 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.query;
 
 import io.ebean.util.SplitName;
+import io.ebeaninternal.api.SpiQuery;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -17,6 +18,8 @@ class SqlTreeAlias {
 
   private static final Pattern TABLE_ALIAS_REPLACE = Pattern.compile("${}", Pattern.LITERAL);
 
+  private final SpiQuery.TemporalMode temporalMode;
+
   private int counter;
 
   private int manyWhereCounter;
@@ -33,8 +36,9 @@ class SqlTreeAlias {
 
   private final String rootTableAlias;
 
-  SqlTreeAlias(String rootTableAlias) {
+  SqlTreeAlias(String rootTableAlias, SpiQuery.TemporalMode temporalMode) {
     this.rootTableAlias = rootTableAlias;
+    this.temporalMode = temporalMode;
   }
 
   /**
@@ -211,4 +215,8 @@ class SqlTreeAlias {
   boolean isIncludeJoins() {
     return !aliasMap.isEmpty() || !manyWhereAliasMap.isEmpty();
   }
+
+  boolean isIncludeSoftDelete() {
+    return temporalMode == SpiQuery.TemporalMode.SOFT_DELETED;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index e7682b8f8..0dcf9f773 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -110,7 +110,7 @@ public final class SqlTreeBuilder {
     this.queryDetail = query.getDetail();
 
     this.predicates = predicates;
-    this.alias = new SqlTreeAlias(request.getBaseTableAlias());
+    this.alias = new SqlTreeAlias(request.getBaseTableAlias(), temporalMode);
     this.distinctOnPlatform = builder.isPlatformDistinctOn();
 
     String fromForUpdate = builder.fromForUpdate(query);
diff --git a/src/test/java/org/tests/model/onetoone/OtoSdChild.java b/src/test/java/org/tests/model/onetoone/OtoSdChild.java
new file mode 100644
index 000000000..2d60a7dfa
--- /dev/null
+++ b/src/test/java/org/tests/model/onetoone/OtoSdChild.java
@@ -0,0 +1,73 @@
+package org.tests.model.onetoone;
+
+import io.ebean.Finder;
+import io.ebean.annotation.SoftDelete;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Version;
+
+@Entity
+public class OtoSdChild {
+
+  public static Finder<Long, OtoSdChild> find = new Finder<>(OtoSdChild.class);
+
+  @Id
+  long id;
+
+  String child;
+
+  @SoftDelete
+  boolean deleted;
+
+  @OneToOne
+  OtoSdMaster master;
+
+  @Version
+  long version;
+
+  public OtoSdChild(String child) {
+    this.child = child;
+  }
+
+  public long getId() {
+    return id;
+  }
+
+  public void setId(long id) {
+    this.id = id;
+  }
+
+  public String getChild() {
+    return child;
+  }
+
+  public void setChild(String child) {
+    this.child = child;
+  }
+
+  public boolean isDeleted() {
+    return deleted;
+  }
+
+  public void setDeleted(boolean deleted) {
+    this.deleted = deleted;
+  }
+
+  public OtoSdMaster getMaster() {
+    return master;
+  }
+
+  public void setMaster(OtoSdMaster master) {
+    this.master = master;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/onetoone/OtoSdMaster.java b/src/test/java/org/tests/model/onetoone/OtoSdMaster.java
new file mode 100644
index 000000000..95e5f947c
--- /dev/null
+++ b/src/test/java/org/tests/model/onetoone/OtoSdMaster.java
@@ -0,0 +1,55 @@
+package org.tests.model.onetoone;
+
+import io.ebean.Finder;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Version;
+
+@Entity
+public class OtoSdMaster {
+
+  public static Finder<Long, OtoSdMaster> find = new Finder<>(OtoSdMaster.class);
+
+  @Id
+  long id;
+
+  String name;
+
+  @OneToOne(cascade = CascadeType.ALL, mappedBy = "master")//, fetch = FetchType.LAZY)
+  OtoSdChild child;
+
+  @Version
+  long version;
+
+  public OtoSdMaster(String name) {
+    this.name = name;
+  }
+
+  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 OtoSdChild getChild() {
+    return child;
+  }
+
+  public void setChild(OtoSdChild child) {
+    this.child = child;
+  }
+
+}
diff --git a/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java b/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java
new file mode 100644
index 000000000..326f822dc
--- /dev/null
+++ b/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java
@@ -0,0 +1,47 @@
+package org.tests.model.onetoone;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestOneToOneSoftDeleteChild extends BaseTestCase {
+
+  @Test
+  public void deleteChild() {
+
+
+    OtoSdChild child = new OtoSdChild("c1");
+    OtoSdMaster master = new OtoSdMaster("m1");
+    master.setChild(child);
+
+    Ebean.save(master);
+
+
+    verifyBeforeDelete(master, child);
+
+    Ebean.delete(child);
+
+    verifyAfterDelete(master, child);
+  }
+
+  private void verifyBeforeDelete(OtoSdMaster parent, OtoSdChild child) {
+    assertThat(OtoSdMaster.find.byId(parent.getId()).getChild().getId())
+      .isEqualTo(child.getId());
+
+    assertThat(
+      OtoSdChild.find.byId(child.getId()).getMaster().getId())
+      .isEqualTo(parent.getId());
+  }
+
+  private void verifyAfterDelete(OtoSdMaster parent, OtoSdChild child) {
+    // After delete, finding child by id should return null
+    assertThat(OtoSdChild.find.byId(child.getId()))
+      .isNull();
+
+    // After delete, getting linked child from parent should return null
+    assertThat(OtoSdMaster.find.byId(parent.getId()).getChild())
+      .isNull();
+  }
+}

From db25cb7bfbfa2a0061de3d9ad0f12d696b86f656 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 27 Aug 2018 21:44:38 +1200
Subject: [PATCH 0441/1036] [maven-release-plugin] prepare release
 ebean-11.22.3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3c8fe96d4..5d2e45853 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.22.3-SNAPSHOT</version>
+  <version>11.22.3</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.22.3</tag>
   </scm>
 
   <profiles>

From bd3cb3c54775f5453244bd6528bc2292316a3c95 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 27 Aug 2018 21:44:54 +1200
Subject: [PATCH 0442/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5d2e45853..ad7f8491e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.22.3</version>
+  <version>11.22.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.22.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 7809858634c3406cfc69ffc699af27a2af7b1323 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 31 Aug 2018 21:54:48 +1200
Subject: [PATCH 0443/1036] #1478 - MySql DDL, invalid comment included
 resulting in PersistenceException: Failed to run script

---
 .../dbmigration/builtin-extra-ddl.xml         | 34 +++++++++----------
 .../cache/TestQueryCacheTableDependency.java  |  2 +-
 .../org/tests/model/composite/CkeUserKey.java |  8 ++---
 .../migrationtest/mysql/I__create_procs.sql   | 14 ++++----
 .../sqlserver17/I__create_procs.sql           | 20 +++++------
 5 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml b/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml
index 1309cd7c7..825171455 100644
--- a/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml
+++ b/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml
@@ -13,16 +13,16 @@ if not exists (select name  from sys.types where name = 'ebean_uniqueidentifier_
 if not exists (select name  from sys.types where name = 'ebean_nvarchar_tvp') create type ebean_nvarchar_tvp as table (c1 nvarchar(max));
 
 delimiter $$
------------------------------------------------------------
+--
 -- PROCEDURE: usp_ebean_drop_indices TABLE, COLUMN
 -- deletes all indices referring to TABLE.COLUMN
------------------------------------------------------------
+--
 CREATE OR ALTER PROCEDURE usp_ebean_drop_indices @tableName nvarchar(255), @columnName nvarchar(255)
 AS SET NOCOUNT ON
 declare @sql nvarchar(1000)
 declare @indexName nvarchar(255)
 BEGIN
-  DECLARE index_cursor CURSOR FOR SELECT i.name from sys.indexes i 
+  DECLARE index_cursor CURSOR FOR SELECT i.name from sys.indexes i
     join sys.index_columns ic on ic.object_id = i.object_id and ic.index_id = i.index_id
     join sys.columns c on c.object_id = ic.object_id and c.column_id = ic.column_id
     where i.object_id = OBJECT_ID(@tableName) AND c.name = @columnName;
@@ -41,10 +41,10 @@ END
 $$
 
 delimiter $$
---------------------------------------------------------------------
+--
 -- PROCEDURE: usp_ebean_drop_default_constraint TABLE, COLUMN
 -- deletes the default constraint, which has a random name
---------------------------------------------------------------------
+--
 CREATE OR ALTER PROCEDURE usp_ebean_drop_default_constraint @tableName nvarchar(255), @columnName nvarchar(255)
 AS SET NOCOUNT ON
 declare @tmp nvarchar(1000)
@@ -58,16 +58,16 @@ END
 $$
 
 delimiter $$
---------------------------------------------------------------------
+--
 -- PROCEDURE: usp_ebean_drop_constraints TABLE, COLUMN
 -- deletes constraints and foreign keys refering to TABLE.COLUMN
---------------------------------------------------------------------
+--
 CREATE OR ALTER PROCEDURE usp_ebean_drop_constraints @tableName nvarchar(255), @columnName nvarchar(255)
 AS SET NOCOUNT ON
 declare @sql nvarchar(1000)
 declare @constraintName nvarchar(255)
 BEGIN
-  DECLARE name_cursor CURSOR FOR 
+  DECLARE name_cursor CURSOR FOR
   SELECT cc.name from sys.check_constraints cc
     join sys.columns c on c.object_id = cc.parent_object_id and c.column_id = cc.parent_column_id
     where parent_object_id = OBJECT_ID(@tableName) AND c.name = @columnName
@@ -92,10 +92,10 @@ END
 $$
 
 delimiter $$
--------------------------------------------------------------------------------------
+--
 -- PROCEDURE: usp_ebean_drop_column TABLE, COLUMN
 -- deletes the column annd ensures that all indices and constraints are dropped first
--------------------------------------------------------------------------------------
+--
 CREATE OR ALTER PROCEDURE usp_ebean_drop_column @tableName nvarchar(255), @columnName nvarchar(255)
 AS SET NOCOUNT ON
 declare @sql nvarchar(1000)
@@ -114,21 +114,21 @@ $$
 DROP PROCEDURE IF EXISTS usp_ebean_drop_foreign_keys;
 
 delimiter $$
-------------------------------------------------------------------------------
+--
 -- PROCEDURE: usp_ebean_drop_foreign_keys TABLE, COLUMN
 -- deletes all constraints and foreign keys referring to TABLE.COLUMN
-------------------------------------------------------------------------------
+--
 CREATE PROCEDURE usp_ebean_drop_foreign_keys(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
 BEGIN
   DECLARE done INT DEFAULT FALSE;
   DECLARE c_fk_name CHAR(255);
-  DECLARE curs CURSOR FOR SELECT CONSTRAINT_NAME from information_schema.KEY_COLUMN_USAGE 
+  DECLARE curs CURSOR FOR SELECT CONSTRAINT_NAME from information_schema.KEY_COLUMN_USAGE
     WHERE TABLE_SCHEMA = DATABASE() and TABLE_NAME = p_table_name and COLUMN_NAME = p_column_name
       AND REFERENCED_TABLE_NAME IS NOT NULL;
   DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
 
   OPEN curs;
-  
+
   read_loop: LOOP
     FETCH curs INTO c_fk_name;
     IF done THEN
@@ -138,7 +138,7 @@ BEGIN
     PREPARE stmt FROM @sql;
     EXECUTE stmt;
   END LOOP;
-  
+
   CLOSE curs;
 END
 $$
@@ -146,10 +146,10 @@ $$
 DROP PROCEDURE IF EXISTS usp_ebean_drop_column;
 
 delimiter $$
--------------------------------------------------------------------------------------
+--
 -- PROCEDURE: usp_ebean_drop_column TABLE, COLUMN
 -- deletes the column and ensures that all indices and constraints are dropped first
--------------------------------------------------------------------------------------
+--
 CREATE PROCEDURE usp_ebean_drop_column(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
 BEGIN
   CALL usp_ebean_drop_foreign_keys(p_table_name, p_column_name);
diff --git a/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java b/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java
index 494d5c377..ee12f6794 100644
--- a/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java
+++ b/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java
@@ -72,7 +72,7 @@ public class TestQueryCacheTableDependency extends BaseTestCase {
       .findCount();
     assertThat(custs).isEqualTo(1);
 
-    Ebean.createSqlUpdate("update O_ADDRESS set line_2=? where line_2=?")
+    Ebean.createSqlUpdate("update o_address set line_2=? where line_2=?")
       .setNextParameter("St Lucky3")
       .setNextParameter("St Lucky2")
       .execute();
diff --git a/src/test/java/org/tests/model/composite/CkeUserKey.java b/src/test/java/org/tests/model/composite/CkeUserKey.java
index cb7655e19..637a10cf7 100644
--- a/src/test/java/org/tests/model/composite/CkeUserKey.java
+++ b/src/test/java/org/tests/model/composite/CkeUserKey.java
@@ -8,14 +8,14 @@ import java.util.Objects;
 @Embeddable
 public class CkeUserKey {
 
-  @Basic(optional = false)
-  @Column(name = "cod_cpny")
-  private int codCompany;
-
   @Basic(optional = false)
   @Column(name = "username")
   private String username;
 
+  @Basic(optional = false)
+  @Column(name = "cod_cpny")
+  private int codCompany;
+
   public CkeUserKey(int codCompany, String username) {
     this.codCompany = codCompany;
     this.username = username;
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/I__create_procs.sql b/src/test/resources/dbmigration/migrationtest/mysql/I__create_procs.sql
index 581d9965a..55acf0bf3 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/I__create_procs.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/I__create_procs.sql
@@ -2,21 +2,21 @@
 DROP PROCEDURE IF EXISTS usp_ebean_drop_foreign_keys;
 
 delimiter $$
-------------------------------------------------------------------------------
+--
 -- PROCEDURE: usp_ebean_drop_foreign_keys TABLE, COLUMN
 -- deletes all constraints and foreign keys referring to TABLE.COLUMN
-------------------------------------------------------------------------------
+--
 CREATE PROCEDURE usp_ebean_drop_foreign_keys(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
 BEGIN
   DECLARE done INT DEFAULT FALSE;
   DECLARE c_fk_name CHAR(255);
-  DECLARE curs CURSOR FOR SELECT CONSTRAINT_NAME from information_schema.KEY_COLUMN_USAGE 
+  DECLARE curs CURSOR FOR SELECT CONSTRAINT_NAME from information_schema.KEY_COLUMN_USAGE
     WHERE TABLE_SCHEMA = DATABASE() and TABLE_NAME = p_table_name and COLUMN_NAME = p_column_name
       AND REFERENCED_TABLE_NAME IS NOT NULL;
   DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
 
   OPEN curs;
-  
+
   read_loop: LOOP
     FETCH curs INTO c_fk_name;
     IF done THEN
@@ -26,7 +26,7 @@ BEGIN
     PREPARE stmt FROM @sql;
     EXECUTE stmt;
   END LOOP;
-  
+
   CLOSE curs;
 END
 $$
@@ -34,10 +34,10 @@ $$
 DROP PROCEDURE IF EXISTS usp_ebean_drop_column;
 
 delimiter $$
--------------------------------------------------------------------------------------
+--
 -- PROCEDURE: usp_ebean_drop_column TABLE, COLUMN
 -- deletes the column and ensures that all indices and constraints are dropped first
--------------------------------------------------------------------------------------
+--
 CREATE PROCEDURE usp_ebean_drop_column(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
 BEGIN
   CALL usp_ebean_drop_foreign_keys(p_table_name, p_column_name);
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/I__create_procs.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/I__create_procs.sql
index 7ff3b383f..5c35dffc6 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver17/I__create_procs.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/I__create_procs.sql
@@ -10,16 +10,16 @@ if not exists (select name  from sys.types where name = 'ebean_uniqueidentifier_
 if not exists (select name  from sys.types where name = 'ebean_nvarchar_tvp') create type ebean_nvarchar_tvp as table (c1 nvarchar(max));
 
 delimiter $$
------------------------------------------------------------
+--
 -- PROCEDURE: usp_ebean_drop_indices TABLE, COLUMN
 -- deletes all indices referring to TABLE.COLUMN
------------------------------------------------------------
+--
 CREATE OR ALTER PROCEDURE usp_ebean_drop_indices @tableName nvarchar(255), @columnName nvarchar(255)
 AS SET NOCOUNT ON
 declare @sql nvarchar(1000)
 declare @indexName nvarchar(255)
 BEGIN
-  DECLARE index_cursor CURSOR FOR SELECT i.name from sys.indexes i 
+  DECLARE index_cursor CURSOR FOR SELECT i.name from sys.indexes i
     join sys.index_columns ic on ic.object_id = i.object_id and ic.index_id = i.index_id
     join sys.columns c on c.object_id = ic.object_id and c.column_id = ic.column_id
     where i.object_id = OBJECT_ID(@tableName) AND c.name = @columnName;
@@ -38,10 +38,10 @@ END
 $$
 
 delimiter $$
---------------------------------------------------------------------
+--
 -- PROCEDURE: usp_ebean_drop_default_constraint TABLE, COLUMN
 -- deletes the default constraint, which has a random name
---------------------------------------------------------------------
+--
 CREATE OR ALTER PROCEDURE usp_ebean_drop_default_constraint @tableName nvarchar(255), @columnName nvarchar(255)
 AS SET NOCOUNT ON
 declare @tmp nvarchar(1000)
@@ -55,16 +55,16 @@ END
 $$
 
 delimiter $$
---------------------------------------------------------------------
+--
 -- PROCEDURE: usp_ebean_drop_constraints TABLE, COLUMN
 -- deletes constraints and foreign keys refering to TABLE.COLUMN
---------------------------------------------------------------------
+--
 CREATE OR ALTER PROCEDURE usp_ebean_drop_constraints @tableName nvarchar(255), @columnName nvarchar(255)
 AS SET NOCOUNT ON
 declare @sql nvarchar(1000)
 declare @constraintName nvarchar(255)
 BEGIN
-  DECLARE name_cursor CURSOR FOR 
+  DECLARE name_cursor CURSOR FOR
   SELECT cc.name from sys.check_constraints cc
     join sys.columns c on c.object_id = cc.parent_object_id and c.column_id = cc.parent_column_id
     where parent_object_id = OBJECT_ID(@tableName) AND c.name = @columnName
@@ -89,10 +89,10 @@ END
 $$
 
 delimiter $$
--------------------------------------------------------------------------------------
+--
 -- PROCEDURE: usp_ebean_drop_column TABLE, COLUMN
 -- deletes the column annd ensures that all indices and constraints are dropped first
--------------------------------------------------------------------------------------
+--
 CREATE OR ALTER PROCEDURE usp_ebean_drop_column @tableName nvarchar(255), @columnName nvarchar(255)
 AS SET NOCOUNT ON
 declare @sql nvarchar(1000)

From 7c1c144af559d92417ef1751c0630f4392d6fd57 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 31 Aug 2018 21:56:19 +1200
Subject: [PATCH 0444/1036] [maven-release-plugin] prepare release
 ebean-11.22.4

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ad7f8491e..1a0438040 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.22.4-SNAPSHOT</version>
+  <version>11.22.4</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.22.4</tag>
   </scm>
 
   <profiles>

From c81d329100adf54d469dc72805946329642f516f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 31 Aug 2018 21:56:34 +1200
Subject: [PATCH 0445/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1a0438040..a1bf35b2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.22.4</version>
+  <version>11.22.5-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.22.4</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 29d88d7de8bdee184887928102008bf0befb6f4b Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Thu, 20 Sep 2018 10:23:46 +0200
Subject: [PATCH 0446/1036] FIX: NPE in StalarTypeLocalTime and
 StalarTypeMonthDay (#1479)

---
 .../server/type/ScalarTypeLocalTime.java      |  1 +
 .../type/ScalarTypeLocalTimeWithNanos.java    |  1 +
 .../server/type/ScalarTypeMonthDay.java       |  1 +
 .../tests/model/types/SomeNewTypesBean.java   | 34 ++++++++++++++++
 .../java/org/tests/types/TestNewTypes.java    | 39 +++++++++++++++++++
 5 files changed, 76 insertions(+)

diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java
index f4449b718..49a217951 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java
@@ -51,6 +51,7 @@ public class ScalarTypeLocalTime extends ScalarTypeBase<LocalTime> {
   @Override
   public LocalTime toBeanType(Object value) {
     if (value instanceof LocalTime) return (LocalTime) value;
+    if (value == null) return null;
     return BasicTypeConverter.toTime(value).toLocalTime();
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java
index 9a39e3222..780820f02 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java
@@ -39,6 +39,7 @@ public class ScalarTypeLocalTimeWithNanos extends ScalarTypeLocalTime {
   @Override
   public LocalTime toBeanType(Object value) {
     if (value instanceof LocalTime) return (LocalTime) value;
+    if (value == null) return null;
     return LocalTime.ofNanoOfDay(BasicTypeConverter.toLong(value));
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java
index 0afa5e865..3a3acdb3e 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java
@@ -72,6 +72,7 @@ public class ScalarTypeMonthDay extends ScalarTypeBase<MonthDay> {
   @Override
   public MonthDay toBeanType(Object value) {
     if (value instanceof MonthDay) return (MonthDay) value;
+    if (value == null) return null;
     return convertFromDate((Date) value);
   }
 
diff --git a/src/test/java/org/tests/model/types/SomeNewTypesBean.java b/src/test/java/org/tests/model/types/SomeNewTypesBean.java
index 64f0a2220..35a133d8f 100644
--- a/src/test/java/org/tests/model/types/SomeNewTypesBean.java
+++ b/src/test/java/org/tests/model/types/SomeNewTypesBean.java
@@ -6,10 +6,13 @@ import javax.persistence.Id;
 import javax.persistence.Version;
 import java.nio.file.Path;
 import java.time.DayOfWeek;
+import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.Month;
+import java.time.MonthDay;
 import java.time.OffsetDateTime;
 import java.time.Period;
 import java.time.Year;
@@ -39,6 +42,9 @@ public class SomeNewTypesBean {
   @Column(name = "yr_mth")
   YearMonth yearMonth;
 
+  @Column(name = "month_day")
+  MonthDay monthDay;
+
   LocalDate localDate;
 
   LocalDateTime localDateTime;
@@ -47,6 +53,8 @@ public class SomeNewTypesBean {
 
   ZonedDateTime zonedDateTime;
 
+  LocalTime localTime;
+
   Instant instant;
 
   ZoneId zoneId;
@@ -57,6 +65,8 @@ public class SomeNewTypesBean {
 
   Period period;
 
+  Duration duration;
+
   public Long getId() {
     return id;
   }
@@ -105,6 +115,14 @@ public class SomeNewTypesBean {
     this.yearMonth = yearMonth;
   }
 
+  public MonthDay getMonthDay() {
+    return monthDay;
+  }
+
+  public void setMonthDay(MonthDay monthDay) {
+    this.monthDay = monthDay;
+  }
+
   public LocalDate getLocalDate() {
     return localDate;
   }
@@ -137,6 +155,14 @@ public class SomeNewTypesBean {
     this.zonedDateTime = zonedDateTime;
   }
 
+  public LocalTime getLocalTime() {
+    return localTime;
+  }
+
+  public void setLocalTime(LocalTime localTime) {
+    this.localTime = localTime;
+  }
+
   public Instant getInstant() {
     return instant;
   }
@@ -176,4 +202,12 @@ public class SomeNewTypesBean {
   public void setPeriod(Period period) {
     this.period = period;
   }
+
+  public Duration getDuration() {
+    return duration;
+  }
+
+  public void setDuration(Duration duration) {
+    this.duration = duration;
+  }
 }
diff --git a/src/test/java/org/tests/types/TestNewTypes.java b/src/test/java/org/tests/types/TestNewTypes.java
index 4f2f15981..45578f6b1 100644
--- a/src/test/java/org/tests/types/TestNewTypes.java
+++ b/src/test/java/org/tests/types/TestNewTypes.java
@@ -11,10 +11,13 @@ import org.tests.model.types.SomeNewTypesBean;
 import java.io.File;
 import java.nio.file.Paths;
 import java.time.DayOfWeek;
+import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.Month;
+import java.time.MonthDay;
 import java.time.OffsetDateTime;
 import java.time.Period;
 import java.time.Year;
@@ -37,6 +40,7 @@ public class TestNewTypes extends BaseTestCase {
     bean.setLocalDateTime(LocalDateTime.now());
     bean.setOffsetDateTime(OffsetDateTime.now());
     bean.setZonedDateTime(ZonedDateTime.now());
+    bean.setLocalTime(LocalTime.now());
     bean.setInstant(Instant.now());
     bean.setYear(Year.now());
     bean.setMonth(Month.APRIL);
@@ -44,8 +48,10 @@ public class TestNewTypes extends BaseTestCase {
     bean.setZoneId(ZoneId.systemDefault());
     bean.setZoneOffset(ZonedDateTime.now().getOffset());
     bean.setYearMonth(YearMonth.of(2014, 9));
+    bean.setMonthDay(MonthDay.of(9,22));
     bean.setPath(Paths.get(TEMP_PATH));
     bean.setPeriod(Period.of(4,3,2));
+    bean.setDuration(Duration.ofMinutes(5));
 
 
     Ebean.save(bean);
@@ -70,6 +76,9 @@ public class TestNewTypes extends BaseTestCase {
     list = Ebean.find(SomeNewTypesBean.class).where().lt("zonedDateTime", ZonedDateTime.now()).findList();
     assertTrue(!list.isEmpty());
 
+    list = Ebean.find(SomeNewTypesBean.class).where().le("localTime", LocalTime.now()).findList();
+    assertTrue(!list.isEmpty());
+
     list = Ebean.find(SomeNewTypesBean.class).where().eq("zoneId", ZoneId.systemDefault().getId()).findList();
     assertTrue(!list.isEmpty());
 
@@ -79,6 +88,9 @@ public class TestNewTypes extends BaseTestCase {
     list = Ebean.find(SomeNewTypesBean.class).where().le("yearMonth", YearMonth.of(2014, 9)).findList();
     assertTrue(!list.isEmpty());
 
+    list = Ebean.find(SomeNewTypesBean.class).where().le("monthDay", MonthDay.of(9,22)).findList();
+    assertTrue(!list.isEmpty());
+
     list = Ebean.find(SomeNewTypesBean.class).where().le("year", Year.now()).findList();
     assertTrue(!list.isEmpty());
 
@@ -91,6 +103,9 @@ public class TestNewTypes extends BaseTestCase {
     list = Ebean.find(SomeNewTypesBean.class).where().eq("period", Period.of(4,3,2)).findList();
     assertTrue(!list.isEmpty());
 
+    list = Ebean.find(SomeNewTypesBean.class).where().eq("duration", Duration.ofMinutes(5)).findList();
+    assertTrue(!list.isEmpty());
+
     SomeNewTypesBean fetched = Ebean.find(SomeNewTypesBean.class, bean.getId());
 
     assertEquals(bean.getZoneId(), fetched.getZoneId());
@@ -98,12 +113,15 @@ public class TestNewTypes extends BaseTestCase {
     assertEquals(bean.getMonth(), fetched.getMonth());
     assertEquals(bean.getYear(), fetched.getYear());
     assertEquals(bean.getYearMonth(), fetched.getYearMonth());
+    assertEquals(bean.getMonthDay(), fetched.getMonthDay());
     assertEquals(bean.getLocalDate(), fetched.getLocalDate());
     assertThat(fetched.getLocalDateTime()).isEqualToIgnoringNanos(bean.getLocalDateTime());
     assertThat(fetched.getOffsetDateTime()).isEqualToIgnoringNanos(bean.getOffsetDateTime());
+    assertThat(fetched.getLocalTime().toSecondOfDay()).isEqualTo(bean.getLocalTime().toSecondOfDay());
     assertEquals(bean.getInstant().toEpochMilli() / 1000, fetched.getInstant().toEpochMilli() / 1000);
     assertEquals(bean.getPath(), fetched.getPath());
     assertEquals(bean.getPeriod(), fetched.getPeriod());
+    assertEquals(bean.getDuration(), fetched.getDuration());
 
 
     String asJson = Ebean.json().toJson(fetched);
@@ -115,13 +133,16 @@ public class TestNewTypes extends BaseTestCase {
     assertEquals(bean.getMonth(), toBean.getMonth());
     assertEquals(bean.getYear(), toBean.getYear());
     assertEquals(bean.getYearMonth(), toBean.getYearMonth());
+    assertEquals(bean.getMonthDay(), toBean.getMonthDay());
     assertEquals(bean.getLocalDate(), toBean.getLocalDate());
     assertThat(toBean.getLocalDateTime()).isEqualToIgnoringNanos(bean.getLocalDateTime());
     assertThat(toBean.getOffsetDateTime()).isEqualToIgnoringNanos(bean.getOffsetDateTime());
+    assertEquals(bean.getLocalTime().toSecondOfDay(), toBean.getLocalTime().toSecondOfDay());
     assertEquals(bean.getInstant().toEpochMilli() / 1000, toBean.getInstant().toEpochMilli() / 1000);
     // FIXME: This test fails on Windows with: expected:<\tmp> but was:<C:\tmp>
     assertEquals(bean.getPath(), toBean.getPath());
     assertEquals(bean.getPeriod(), toBean.getPeriod());
+    assertEquals(bean.getDuration(), toBean.getDuration());
 
   }
 
@@ -139,12 +160,15 @@ public class TestNewTypes extends BaseTestCase {
     assertNull(fetched.getMonth());
     assertNull(fetched.getYear());
     assertNull(fetched.getYearMonth());
+    assertNull(fetched.getMonthDay());
     assertNull(fetched.getLocalDate());
     assertNull(fetched.getLocalDateTime());
     assertNull(fetched.getOffsetDateTime());
+    assertNull(fetched.getLocalTime());
     assertNull(fetched.getInstant());
     assertNull(fetched.getPath());
     assertNull(fetched.getPeriod());
+    assertNull(fetched.getDuration());
   }
 
   @Test
@@ -154,6 +178,7 @@ public class TestNewTypes extends BaseTestCase {
     refBean.setLocalDateTime(LocalDateTime.now());
     refBean.setOffsetDateTime(OffsetDateTime.now());
     refBean.setZonedDateTime(ZonedDateTime.now());
+    refBean.setLocalTime(LocalTime.now());
     refBean.setInstant(Instant.now());
     refBean.setYear(Year.now());
     refBean.setMonth(Month.APRIL);
@@ -161,8 +186,10 @@ public class TestNewTypes extends BaseTestCase {
     refBean.setZoneId(ZoneId.systemDefault());
     refBean.setZoneOffset(ZonedDateTime.now().getOffset());
     refBean.setYearMonth(YearMonth.of(2014, 9));
+    refBean.setMonthDay(MonthDay.of( 9, 22));
     refBean.setPath(Paths.get(TEMP_PATH));
     refBean.setPeriod(Period.of(4,3,2));
+    refBean.setDuration(Duration.ofMinutes(5));
 
     testSetGetPath(refBean);
   }
@@ -179,6 +206,7 @@ public class TestNewTypes extends BaseTestCase {
     ExpressionPath localDateTime = beanType.getExpressionPath("localDateTime");
     ExpressionPath offsetDateTime = beanType.getExpressionPath("offsetDateTime");
     ExpressionPath zonedDateTime = beanType.getExpressionPath("zonedDateTime");
+    ExpressionPath localTime = beanType.getExpressionPath("localTime");
     ExpressionPath instant = beanType.getExpressionPath("instant");
     ExpressionPath year = beanType.getExpressionPath("year");
     ExpressionPath month = beanType.getExpressionPath("month");
@@ -186,8 +214,10 @@ public class TestNewTypes extends BaseTestCase {
     ExpressionPath zoneId = beanType.getExpressionPath("zoneId");
     ExpressionPath zoneOffset = beanType.getExpressionPath("zoneOffset");
     ExpressionPath yearMonth = beanType.getExpressionPath("yearMonth");
+    ExpressionPath monthDay = beanType.getExpressionPath("monthDay");
     ExpressionPath path = beanType.getExpressionPath("path");
     ExpressionPath period = beanType.getExpressionPath("period");
+    ExpressionPath duration = beanType.getExpressionPath("duration");
 
     localDate.pathSet(testBean, refBean.getLocalDate());
     assertThat(localDate.pathGet(testBean)).isEqualTo(refBean.getLocalDate());
@@ -201,6 +231,9 @@ public class TestNewTypes extends BaseTestCase {
     zonedDateTime.pathSet(testBean, refBean.getZonedDateTime());
     assertThat(zonedDateTime.pathGet(testBean)).isEqualTo(refBean.getZonedDateTime());
 
+    localTime.pathSet(testBean, refBean.getLocalTime());
+    assertThat(localTime.pathGet(testBean)).isEqualTo(refBean.getLocalTime());
+
     instant.pathSet(testBean, refBean.getInstant());
     assertThat(instant.pathGet(testBean)).isEqualTo(refBean.getInstant());
 
@@ -222,12 +255,18 @@ public class TestNewTypes extends BaseTestCase {
     yearMonth.pathSet(testBean, refBean.getYearMonth());
     assertThat(yearMonth.pathGet(testBean)).isEqualTo(refBean.getYearMonth());
 
+    monthDay.pathSet(testBean, refBean.getMonthDay());
+    assertThat(monthDay.pathGet(testBean)).isEqualTo(refBean.getMonthDay());
+
     path.pathSet(testBean, refBean.getPath());
     assertThat(path.pathGet(testBean)).isEqualTo(refBean.getPath());
 
     period.pathSet(testBean, refBean.getPeriod());
     assertThat(period.pathGet(testBean)).isEqualTo(refBean.getPeriod());
 
+    duration.pathSet(testBean, refBean.getDuration());
+    assertThat(duration.pathGet(testBean)).isEqualTo(refBean.getDuration());
+
     Ebean.save(refBean);
     Ebean.save(testBean);
   }

From 72845acbad6bb24752b6b81d99e29c8146aed69e Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Thu, 20 Sep 2018 10:24:33 +0200
Subject: [PATCH 0447/1036] FIX: JunctionExpression.notExists (#1481)

---
 .../io/ebeaninternal/server/expression/JunctionExpression.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index b0329a1f0..04bdc0777 100644
--- a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -667,7 +667,7 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
 
   @Override
   public ExpressionList<T> notExists(Query<?> subQuery) {
-    return exprList.exists(subQuery);
+    return exprList.notExists(subQuery);
   }
 
   @Override

From 0e7dc4209c544f5be75f7ae7b66c88a46cb13fdd Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 20 Sep 2018 21:09:01 +1200
Subject: [PATCH 0448/1036] #1482 - Improve error message for incorrect mapping
 - @JoinColumn without @ManyToOne etc

---
 .../server/deploy/parse/AnnotationAssocOnes.java            | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index 0c3606bd3..bb0bac37d 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -132,6 +132,9 @@ public class AnnotationAssocOnes extends AnnotationParser {
     // check for manually defined joins
     BeanTable beanTable = prop.getBeanTable();
     for (JoinColumn joinColumn : getAll(prop, JoinColumn.class)) {
+      if (beanTable == null) {
+        throw new IllegalStateException("Looks like a missing @ManyToOne or @OneToOne on property " + prop.getFullBeanName()+" - no related 'BeanTable'");
+      }
       prop.getTableJoin().addJoinColumn(false, joinColumn, beanTable);
       if (!joinColumn.updatable()) {
         prop.setDbUpdateable(false);
@@ -146,6 +149,9 @@ public class AnnotationAssocOnes extends AnnotationParser {
     JoinTable joinTable = get(prop, JoinTable.class);
     if (joinTable != null) {
       for (JoinColumn joinColumn : joinTable.joinColumns()) {
+        if (beanTable == null) {
+          throw new IllegalStateException("Looks like a missing @ManyToOne or @OneToOne on property " + prop.getFullBeanName()+" - no related 'BeanTable'");
+        }
         prop.getTableJoin().addJoinColumn(false, joinColumn, beanTable);
         if (!joinColumn.updatable()) {
           prop.setDbUpdateable(false);

From 3a50c264b10e6be6992c6a2baa5846a7f0af478a Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 20 Sep 2018 21:10:41 +1200
Subject: [PATCH 0449/1036] No effective change - add test with softDelete on
 bean with history

---
 .../java/org/tests/model/history/HeLink.java   | 13 ++++++++++++-
 .../model/history/TestHistoryExclude.java      | 18 +++++++++++++++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/tests/model/history/HeLink.java b/src/test/java/org/tests/model/history/HeLink.java
index 449bca72d..8bc4e2011 100644
--- a/src/test/java/org/tests/model/history/HeLink.java
+++ b/src/test/java/org/tests/model/history/HeLink.java
@@ -2,12 +2,12 @@ package org.tests.model.history;
 
 import io.ebean.annotation.History;
 import io.ebean.annotation.HistoryExclude;
+import io.ebean.annotation.SoftDelete;
 import org.tests.model.draftable.BaseDomain;
 
 import javax.persistence.Entity;
 import javax.persistence.ManyToMany;
 import javax.persistence.Table;
-
 import java.util.List;
 
 @History
@@ -21,6 +21,9 @@ public class HeLink extends BaseDomain {
 
   String comments;
 
+  @SoftDelete
+  boolean deleted;
+
   @HistoryExclude
   @ManyToMany
   List<HeDoc> docs;
@@ -33,6 +36,14 @@ public class HeLink extends BaseDomain {
   public HeLink() {
   }
 
+  public boolean isDeleted() {
+    return deleted;
+  }
+
+  public void setDeleted(boolean deleted) {
+    this.deleted = deleted;
+  }
+
   public String getName() {
     return name;
   }
diff --git a/src/test/java/org/tests/model/history/TestHistoryExclude.java b/src/test/java/org/tests/model/history/TestHistoryExclude.java
index a8b4c746f..4193b6323 100644
--- a/src/test/java/org/tests/model/history/TestHistoryExclude.java
+++ b/src/test/java/org/tests/model/history/TestHistoryExclude.java
@@ -7,8 +7,9 @@ import io.ebean.annotation.Platform;
 import org.junit.Test;
 
 import java.sql.Timestamp;
+import java.util.List;
 
-import static org.assertj.core.api.StrictAssertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestHistoryExclude extends BaseTestCase {
 
@@ -28,6 +29,21 @@ public class TestHistoryExclude extends BaseTestCase {
     }
   }
 
+  @Test
+  public void testSoftDelete() {
+
+    HeLink l = new HeLink("two", "boo");
+    Ebean.save(l);
+
+    Ebean.delete(l);
+
+    List<HeLink> list = Ebean.find(HeLink.class)
+      .setIncludeSoftDeletes()
+      .findList();
+
+    assertThat(list).isNotEmpty();
+  }
+
   @Test
   public void testLazyLoad() {
 

From bb164a0763e5c5c868cf2e04e3f0be5c698b17df Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 20 Sep 2018 21:32:48 +1200
Subject: [PATCH 0450/1036]  OneToOne inserts with idType=SEQUENCE will fail
 #1480

---
 src/test/java/org/tests/model/onetoone/OtoBChild.java       | 4 ++--
 .../tests/model/onetoone/TestOneToOneImportedPkNative.java  | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/test/java/org/tests/model/onetoone/OtoBChild.java b/src/test/java/org/tests/model/onetoone/OtoBChild.java
index 56c1b58a5..a91fce44b 100644
--- a/src/test/java/org/tests/model/onetoone/OtoBChild.java
+++ b/src/test/java/org/tests/model/onetoone/OtoBChild.java
@@ -3,8 +3,8 @@ package org.tests.model.onetoone;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
 import javax.persistence.OneToOne;
+import javax.persistence.PrimaryKeyJoinColumn;
 
 @Entity
 public class OtoBChild {
@@ -16,7 +16,7 @@ public class OtoBChild {
   String child;
 
   @OneToOne
-  @JoinColumn(name = "master_id", referencedColumnName = "id")
+  @PrimaryKeyJoinColumn
   OtoBMaster master;
 
   public Long getId() {
diff --git a/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java b/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java
index 1ee9e17e9..3cb7e3319 100644
--- a/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java
+++ b/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java
@@ -46,8 +46,8 @@ public class TestOneToOneImportedPkNative extends BaseTestCase {
 
     List<String> lazyLoadSql = LoggedSqlCollector.stop();
     assertThat(lazyLoadSql).hasSize(2);
-    assertThat(lazyLoadSql.get(0)).contains("select t0.id, t0.name, t1.master_id from oto_bmaster t0 left join oto_bchild t1");
-    assertThat(lazyLoadSql.get(1)).contains("select t0.master_id, t0.child, t0.master_id from oto_bchild t0 where t0.master_id");
+    assertThat(lazyLoadSql.get(0)).contains("select t0.id, t0.name, t0.id from oto_bmaster t0 where t0.id = ?");
+    assertThat(lazyLoadSql.get(1)).contains("select t0.master_id, t0.child, t0.master_id from oto_bchild t0 where t0.master_id = ?");
   }
 
   @Test
@@ -64,12 +64,10 @@ public class TestOneToOneImportedPkNative extends BaseTestCase {
 
     assertThat(m.getId()).isEqualTo(one.getId());
     assertThat(m.getName()).isEqualTo(one.getName());
-    assertThat(m.getChild()).isNull();
 
     OtoBMaster m2 = server.find(OtoBMaster.class, one.getId());
     assertThat(m2.getId()).isEqualTo(one.getId());
     assertThat(m2.getName()).isEqualTo(one.getName());
-    assertThat(m2.getChild()).isNull();
   }
 
 }

From 42d3e9eb91ef7bb2e2e61a39cc9787a36e18563c Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 20 Sep 2018 21:35:08 +1200
Subject: [PATCH 0451/1036] [maven-release-plugin] prepare release
 ebean-11.22.5

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a1bf35b2f..2ccc15c44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.22.5-SNAPSHOT</version>
+  <version>11.22.5</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.22.5</tag>
   </scm>
 
   <profiles>

From be24e11b919ba2813db37897d0d1a37374f422ad Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 20 Sep 2018 21:35:24 +1200
Subject: [PATCH 0452/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2ccc15c44..5b056dc3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.22.5</version>
+  <version>11.22.6-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.22.5</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 42f9e74d91a63a95e07be71ba0dc4e7b7620c59b Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 20 Sep 2018 23:12:26 +1200
Subject: [PATCH 0453/1036] #1483 - Invalid SQL with allQuotedIdentifiers true
 - where t0.[t0.[COND]] in (?, ?, ?, ?, ?, ?, ?, ?, ?, ? )

---
 .../server/deploy/DeployParser.java           |  8 ++++--
 .../deploy/DeployPropertyParserTest.java      | 13 ++++++++++
 .../org/tests/model/basic/BWithQIdent.java    | 12 ++++++++-
 .../TestQuotedIdentifierQuery.java            | 26 +++++++++++++++++++
 4 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java b/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java
index 75f0a3b1a..a5e71183e 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java
@@ -22,6 +22,10 @@ public abstract class DeployParser {
    */
   protected static final char UNDERSCORE = '_';
 
+  protected static final char OPEN_SQUARE_BRACKET = '[';
+  protected static final char CLOSE_SQUARE_BRACKET = ']';
+  protected static final char DOUBLE_QUOTE = '\"';
+
   /**
    * Used to determine when a column name terminates.
    */
@@ -183,10 +187,10 @@ public abstract class DeployParser {
       wordBuffer.append(ch);
       return false;
     }
-    return Character.isLetterOrDigit(ch) || ch == UNDERSCORE || ch == PERIOD;
+    return Character.isLetterOrDigit(ch) || ch == UNDERSCORE || ch == PERIOD || ch == DOUBLE_QUOTE || ch == CLOSE_SQUARE_BRACKET;
   }
 
   private boolean isWordStart(char ch) {
-    return Character.isLetter(ch) || ch == UNDERSCORE;
+    return Character.isLetter(ch) || ch == UNDERSCORE || ch == DOUBLE_QUOTE || ch == OPEN_SQUARE_BRACKET;
   }
 }
diff --git a/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java b/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java
index 10056984e..1c387aa49 100644
--- a/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.deploy;
 import io.ebean.BaseTestCase;
 import org.junit.Test;
 import org.tests.model.basic.Address;
+import org.tests.model.basic.BWithQIdent;
 import org.tests.model.basic.Customer;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -14,6 +15,8 @@ public class DeployPropertyParserTest extends BaseTestCase {
 
   private final BeanDescriptor<Address> addressBeanDescriptor = getBeanDescriptor(Address.class);
 
+  private final BeanDescriptor<BWithQIdent> bWithQIdentDescriptor = getBeanDescriptor(BWithQIdent.class);
+
   @Test
   public void from_prefix_expect_unchanged() {
     assertThat(parser().parse("(select x from status join status)")).isEqualTo("(select x from status join status)");
@@ -49,6 +52,12 @@ public class DeployPropertyParserTest extends BaseTestCase {
     assertThat(addressParser().parse("concat(line1, line2, '-EA')")).isEqualTo("concat(${}line_1, ${}line_2, '-EA')");
   }
 
+  @Test
+  public void withQuote_when_match() {
+    assertThat(withQuoteParser().parse("name like ?")).isEqualTo("${}\"Name\" like ?");
+    assertThat(withQuoteParser().parse("t0.\"CODE\" like ?")).isEqualTo("t0.\"CODE\" like ?");
+  }
+
   @Test
   public void unknown_path() {
     assertThat(parser().parse(" foo ")).isEqualTo(" foo ");
@@ -62,4 +71,8 @@ public class DeployPropertyParserTest extends BaseTestCase {
     return addressBeanDescriptor.parser();
   }
 
+  private DeployPropertyParser withQuoteParser() {
+    return bWithQIdentDescriptor.parser();
+  }
+
 }
diff --git a/src/test/java/org/tests/model/basic/BWithQIdent.java b/src/test/java/org/tests/model/basic/BWithQIdent.java
index 329d40f41..fcb91cdb3 100644
--- a/src/test/java/org/tests/model/basic/BWithQIdent.java
+++ b/src/test/java/org/tests/model/basic/BWithQIdent.java
@@ -5,7 +5,6 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Version;
 import javax.validation.constraints.Size;
-
 import java.sql.Timestamp;
 
 @Entity
@@ -18,6 +17,9 @@ public class BWithQIdent {
   @Size(max = 191) // key must not exceed 767 Bytes, so max key len for mysql with utf8mb4 = 191*4 = 764 bytes
   String name;
 
+  @Column(name = "`CODE`")
+  String CODE;
+
   @Version
   Timestamp lastUpdated;
 
@@ -37,6 +39,14 @@ public class BWithQIdent {
     this.name = name;
   }
 
+  public String getCODE() {
+    return CODE;
+  }
+
+  public void setCODE(String CODE) {
+    this.CODE = CODE;
+  }
+
   public Timestamp getLastUpdated() {
     return lastUpdated;
   }
diff --git a/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java b/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java
new file mode 100644
index 000000000..90f6b3be8
--- /dev/null
+++ b/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java
@@ -0,0 +1,26 @@
+package org.tests.quotedidentifier;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.junit.Test;
+import org.tests.model.basic.BWithQIdent;
+
+public class TestQuotedIdentifierQuery extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    BWithQIdent bean = new BWithQIdent();
+    bean.setName("foo");
+    bean.setCODE("bar");
+
+    Ebean.save(bean);
+
+    Ebean.find(BWithQIdent.class)
+      .where()
+      .eq("name", "foo")
+      .raw("t0.\"Name\" = ?", "foo")
+      .raw("t0.\"CODE\" = ?", "bar")
+      .findList();
+  }
+}

From eb7277aa13e292b7285944d1c31a8858479e9b2f Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Fri, 21 Sep 2018 05:35:01 +0200
Subject: [PATCH 0454/1036] Wrong behaviour in BeanMap.put/putAll (#1484)

---
 src/main/java/io/ebean/common/BeanMap.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/ebean/common/BeanMap.java b/src/main/java/io/ebean/common/BeanMap.java
index 34bb51f9e..82a3c9853 100644
--- a/src/main/java/io/ebean/common/BeanMap.java
+++ b/src/main/java/io/ebean/common/BeanMap.java
@@ -273,14 +273,16 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
     checkReadOnly();
     init();
     if (modifyListening) {
-      Object oldBean = map.put(key, value);
+      E oldBean = map.put(key, value);
       if (value != oldBean) {
         // register the add of the new and the removal of the old
         modifyAddition(value);
         modifyRemoval(oldBean);
       }
+      return oldBean;
+    } else {
+      return map.put(key, value);
     }
-    return map.put(key, value);
   }
 
   @Override
@@ -295,8 +297,9 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
           modifyRemoval(oldBean);
         }
       }
+    } else {
+      map.putAll(puts);
     }
-    map.putAll(puts);
   }
 
   @Override

From 56e65d7463bf15af7e4abe5cff1fe57db956d132 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Fri, 21 Sep 2018 05:35:53 +0200
Subject: [PATCH 0455/1036] Fix issue in UUID-v1 generator on AWS Beanstalk
 (#1485)

---
 src/main/java/io/ebean/config/ServerConfig.java |  9 +++++++++
 .../server/idgen/UuidV1IdGenerator.java         | 17 +++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 30e6e92f1..853c05858 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -1965,6 +1965,15 @@ public class ServerConfig {
    * Return the UUID state file.
    */
   public String getUuidStateFile() {
+    if (uuidStateFile == null || uuidStateFile.isEmpty()) {
+      // by default, add servername...
+      uuidStateFile = name + "-uuid.state";
+      // and store it in the user's home directory
+      String homeDir = System.getProperty("user.home");
+      if (homeDir != null && homeDir.isEmpty()) {
+        uuidStateFile = homeDir + "/.ebean/" + uuidStateFile;
+      }
+    }
     return uuidStateFile;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/idgen/UuidV1IdGenerator.java b/src/main/java/io/ebeaninternal/server/idgen/UuidV1IdGenerator.java
index 0202ab816..19e94f4cd 100644
--- a/src/main/java/io/ebeaninternal/server/idgen/UuidV1IdGenerator.java
+++ b/src/main/java/io/ebeaninternal/server/idgen/UuidV1IdGenerator.java
@@ -82,8 +82,17 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
     final Enumeration<NetworkInterface> e = NetworkInterface.getNetworkInterfaces();
     while (e.hasMoreElements()) {
       NetworkInterface network = e.nextElement();
-      if (!network.isLoopback()) {
-        return network.getHardwareAddress();
+      try {
+        logger.trace("Probing interface {}", network);
+        if (!network.isLoopback()) {
+          byte[] addr = network.getHardwareAddress();
+          if (addr != null) {
+            logger.debug("Using interface {}", network);
+            return addr;
+          }
+        }
+      } catch (SocketException ex) {
+        logger.debug("Skipping {}", network, ex);
       }
     }
     return null;
@@ -181,6 +190,10 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
     prop.setProperty("nodeId", getNodeIdentifier());
     prop.setProperty("clockSeq", String.valueOf(clockSeq.get()));
     prop.setProperty("timeStamp", String.valueOf(timeStamp.get()));
+    File dir = stateFile.getParentFile();
+    if (dir != null) {
+      dir.mkdirs();
+    }
     try (OutputStream os = new FileOutputStream(stateFile)) {
       prop.store(os, "ebean uuid state file");
       logger.debug("Persisted state to '{}'", stateFile);

From 66703a3a295747b54406a9ab2dd8504daf6e20db Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Fri, 21 Sep 2018 05:38:21 +0200
Subject: [PATCH 0456/1036] FIX: recursive BatchedPstmtHolder.flush, when
 BeanPersistController or ChangeLogFilter hit the database (#1486)

---
 .../server/persist/BatchedPstmtHolder.java           | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java b/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java
index 100b2ff21..3ac38f6c0 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java
@@ -110,7 +110,15 @@ public class BatchedPstmtHolder {
     // but still need to close PreparedStatements.
     boolean isError = false;
 
-    for (BatchedPstmt bs : stmtMap.values()) {
+    // if there are Listeners/Controllers that interact with the database,
+    // the flush may get called recursively in executeBatch/postExecute.
+    // which leads that we process stmtMap.values() twice in the loop.
+    // So we copy the values, that we want to flush and clear it immediately.
+    BatchedPstmt[] values = stmtMap.values().toArray(new BatchedPstmt[stmtMap.values().size()]);
+    clear();
+
+    // this loop
+    for (BatchedPstmt bs : values) {
       try {
         if (!isError) {
           bs.executeBatch(getGeneratedKeys);
@@ -139,8 +147,6 @@ public class BatchedPstmtHolder {
       }
     }
 
-    // clear the batch cache
-    clear();
 
     if (firstError != null) {
       String msg = "Error when batch flush on sql: " + errorSql;

From cd1cdb027f902b28dadc0993ecb1f1c6d0ef3ec4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 24 Sep 2018 22:30:28 +1200
Subject: [PATCH 0457/1036] #1487 - @OneToOne Postgres with different Id types
 - error PSQLException: ERROR: operator does not exist: uuid = character
 varying

Test
---
 .../uuidsibling/SoftDeleteCascadeTest.java    | 66 +++++++++++++++++
 .../tests/model/uuidsibling/USibChild.java    | 70 +++++++++++++++++++
 .../model/uuidsibling/USibChildSibling.java   | 56 +++++++++++++++
 .../tests/model/uuidsibling/USibParent.java   | 52 ++++++++++++++
 4 files changed, 244 insertions(+)
 create mode 100644 src/test/java/org/tests/model/uuidsibling/SoftDeleteCascadeTest.java
 create mode 100644 src/test/java/org/tests/model/uuidsibling/USibChild.java
 create mode 100644 src/test/java/org/tests/model/uuidsibling/USibChildSibling.java
 create mode 100644 src/test/java/org/tests/model/uuidsibling/USibParent.java

diff --git a/src/test/java/org/tests/model/uuidsibling/SoftDeleteCascadeTest.java b/src/test/java/org/tests/model/uuidsibling/SoftDeleteCascadeTest.java
new file mode 100644
index 000000000..42cfa2a62
--- /dev/null
+++ b/src/test/java/org/tests/model/uuidsibling/SoftDeleteCascadeTest.java
@@ -0,0 +1,66 @@
+package org.tests.model.uuidsibling;
+
+import org.junit.Test;
+
+import java.util.UUID;
+
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsNot.not;
+import static org.hamcrest.core.IsNull.nullValue;
+import static org.junit.Assert.assertThat;
+
+public class SoftDeleteCascadeTest {
+
+  @Test
+  public void testDeleteParent() {
+    // Insert + link records
+    USibParent parent = new USibParent();
+    parent.save();
+
+    USibChild child = new USibChild(parent);
+    child.save();
+
+    USibChildSibling childSibling = new USibChildSibling(child);
+    childSibling.save();
+
+    Long parentId = parent.getId();
+    UUID childId = child.getId();
+    Long childSiblingId = childSibling.getId();
+
+    assertBefore(parent, child, childSibling);
+    parent.delete();
+    assertAfter(parentId, childId, childSiblingId);
+  }
+
+  private void assertBefore(USibParent parent, USibChild child, USibChildSibling childSibling) {
+
+    parent.refresh();
+
+    assertThat("Parent should have one child loaded",
+      parent.getChildren().size(),
+      is(1)
+    );
+
+    assertThat("Parent should have correct child loaded",
+      parent.getChildren().get(0).getId(),
+      is(child.getId())
+    );
+
+    assertThat("Child that was loaded should have its sibling available",
+      parent.getChildren().get(0).getChildSibling(),
+      not(nullValue())
+    );
+
+    assertThat(
+      "Child that was loaded should have loaded correct sibling",
+      parent.getChildren().get(0).getChildSibling().getId(),
+      is(childSibling.getId())
+    );
+  }
+
+  private void assertAfter(Long parentId, UUID childId, Long childSiblingId) {
+    assertThat(USibParent.find.byId(parentId), is(nullValue()));
+    assertThat(USibChild.find.byId(childId), is(nullValue()));
+    assertThat(USibChildSibling.find.byId(childSiblingId), is(nullValue()));
+  }
+}
diff --git a/src/test/java/org/tests/model/uuidsibling/USibChild.java b/src/test/java/org/tests/model/uuidsibling/USibChild.java
new file mode 100644
index 000000000..b2ff59e42
--- /dev/null
+++ b/src/test/java/org/tests/model/uuidsibling/USibChild.java
@@ -0,0 +1,70 @@
+package org.tests.model.uuidsibling;
+
+import io.ebean.Finder;
+import io.ebean.Model;
+import io.ebean.annotation.SoftDelete;
+import java.util.UUID;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToOne;
+
+@Entity
+public class USibChild extends Model {
+
+    private static final long serialVersionUID = 738194912181571389L;
+
+    @Id
+    private UUID id;
+
+    @SoftDelete
+    private boolean deleted;
+
+    @OneToOne(mappedBy = "child", cascade = CascadeType.REMOVE)
+    private USibChildSibling childSibling;
+
+    @ManyToOne
+    private USibParent parent;
+
+    public static Finder<UUID, USibChild> find = new Finder<>(USibChild.class);
+
+    public USibChild() {}
+
+    public USibChild(USibParent parent) {
+        this.parent = parent;
+    }
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public boolean isDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(boolean deleted) {
+        this.deleted = deleted;
+    }
+
+    public USibChildSibling getChildSibling() {
+        return childSibling;
+    }
+
+    public USibChild setChildSibling(USibChildSibling childSibling) {
+        this.childSibling = childSibling;
+        return this;
+    }
+
+    public USibParent getParent() {
+        return parent;
+    }
+
+    public void setParent(USibParent parent) {
+        this.parent = parent;
+    }
+}
diff --git a/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java b/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java
new file mode 100644
index 000000000..888c1cc88
--- /dev/null
+++ b/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java
@@ -0,0 +1,56 @@
+package org.tests.model.uuidsibling;
+
+import io.ebean.Finder;
+import io.ebean.Model;
+import io.ebean.annotation.SoftDelete;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+
+@Entity
+public class USibChildSibling extends Model {
+
+    private static final long serialVersionUID = 738194912181571389L;
+
+    @Id
+    private Long id;
+
+    @SoftDelete
+    private boolean deleted;
+
+    @OneToOne
+    private USibChild child;
+
+    public static Finder<Long, USibChildSibling> find = new Finder<>(USibChildSibling.class);
+
+    public USibChildSibling() {}
+
+    public USibChildSibling(USibChild child) {
+        this.child = child;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public boolean isDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(boolean deleted) {
+        this.deleted = deleted;
+    }
+
+    public USibChild getChild() {
+        return child;
+    }
+
+    public USibChildSibling setChild(USibChild child) {
+        this.child = child;
+        return this;
+    }
+}
diff --git a/src/test/java/org/tests/model/uuidsibling/USibParent.java b/src/test/java/org/tests/model/uuidsibling/USibParent.java
new file mode 100644
index 000000000..a7e349d12
--- /dev/null
+++ b/src/test/java/org/tests/model/uuidsibling/USibParent.java
@@ -0,0 +1,52 @@
+package org.tests.model.uuidsibling;
+
+import io.ebean.Finder;
+import io.ebean.Model;
+import io.ebean.annotation.SoftDelete;
+import java.util.List;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+@Entity
+public class USibParent extends Model {
+
+    private static final long serialVersionUID = 4116545858939406149L;
+
+    @Id
+    private Long id;
+
+    @SoftDelete
+    private boolean deleted;
+
+    @OneToMany(cascade = CascadeType.REMOVE, mappedBy = "parent")
+    private List<USibChild> children;
+
+    public static Finder<Long, USibParent> find = new Finder<>(USibParent.class);
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public boolean isDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(boolean deleted) {
+        this.deleted = deleted;
+    }
+
+    public List<USibChild> getChildren() {
+        return children;
+    }
+
+    public USibParent setChildren(List<USibChild> children) {
+        this.children = children;
+        return this;
+    }
+}

From 0e75c50be5b7c73399aaf155159891c0a24ebc0f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 24 Sep 2018 22:30:45 +1200
Subject: [PATCH 0458/1036] #1487 - @OneToOne Postgres with different Id types
 - error PSQLException: ERROR: operator does not exist: uuid = character
 varying

Fix
---
 .../ebeaninternal/server/deploy/BeanPropertyAssocOne.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index 8f8e3b66e..bd3455d90 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -261,7 +261,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
   private List<Object> findIdsByParentIdList(List<Object> parentIds, Transaction t) {
 
     String rawWhere = deriveWhereParentIdSql(true);
-    String inClause = targetIdBinder.getIdInValueExpr(false, parentIds.size());
+    String inClause = getIdBinder().getIdInValueExpr(false, parentIds.size());
     String expr = rawWhere + inClause;
 
     SpiEbeanServer server = server();
@@ -537,8 +537,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
       BeanProperty[] emIds = targetDesc.propertiesBaseScalar();
       try {
         for (BeanProperty emId : emIds) {
-          ExportedProperty expProp = findMatch(true, emId);
-          list.add(expProp);
+          list.add(findMatch(true, emId));
         }
       } catch (PersistenceException e) {
         // not found as individual scalar properties
@@ -547,8 +546,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
 
     } else {
       if (idProp != null) {
-        ExportedProperty expProp = findMatch(false, idProp);
-        list.add(expProp);
+        list.add(findMatch(false, idProp));
       }
     }
 

From ef46bc86cce1fe95a21ad0aba78ddeec83edfeef Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Wed, 26 Sep 2018 10:40:56 +0200
Subject: [PATCH 0459/1036] Original Value and bean change was not computed
 correctly in changelog (#1488)

* Bug in Changelog: It takes the first non null value as oldValue and does not detect if oldValue == newValue

* CHANGE: EntityBeanIntercept uses bitflags instead of separate boolean arrays - new flag 'origValueSet' introduced - getDirtyValues checks, if values are really different.
---
 .../io/ebean/bean/EntityBeanIntercept.java    | 141 +++++++++---------
 .../org/tests/changelog/TestChangeLog.java    |  69 +++++++++
 2 files changed, 140 insertions(+), 70 deletions(-)

diff --git a/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/src/main/java/io/ebean/bean/EntityBeanIntercept.java
index e35384ad4..fcd6bb7ad 100644
--- a/src/main/java/io/ebean/bean/EntityBeanIntercept.java
+++ b/src/main/java/io/ebean/bean/EntityBeanIntercept.java
@@ -71,21 +71,30 @@ public final class EntityBeanIntercept implements Serializable {
   /**
    * Used when a bean is partially filled.
    */
-  private final boolean[] loadedProps;
-
-  private boolean fullyLoadedBean;
+  private static final byte FLAG_LOADED_PROP = 1;
 
   /**
    * Set of changed properties.
    */
-  private boolean[] changedProps;
+  private static final byte FLAG_CHANGED_PROP = 2;
 
   /**
    * Flags indicating if a property is a dirty embedded bean. Used to distingush
    * between an embedded bean being completely overwritten and one of its
    * embedded properties being made dirty.
    */
-  private boolean[] embeddedDirty;
+  private static final byte FLAG_EMBEDDED_DIRTY = 4;
+
+  /**
+   * Flags indicating if a property is a dirty embedded bean. Used to distingush
+   * between an embedded bean being completely overwritten and one of its
+   * embedded properties being made dirty.
+   */
+  private static final byte FLAG_ORIG_VALUE_SET = 8;
+
+  private final byte[] flags;
+
+  private boolean fullyLoadedBean;
 
   private Object[] origValues;
 
@@ -102,7 +111,7 @@ public final class EntityBeanIntercept implements Serializable {
    */
   public EntityBeanIntercept(Object ownerBean) {
     this.owner = (EntityBean) ownerBean;
-    this.loadedProps = new boolean[owner._ebean_getPropertyNames().length];
+    this.flags = new byte[owner._ebean_getPropertyNames().length];
   }
 
   /**
@@ -213,8 +222,8 @@ public final class EntityBeanIntercept implements Serializable {
    * Check each property to see if the bean is partially loaded.
    */
   public boolean isPartial() {
-    for (boolean loadedProp : loadedProps) {
-      if (!loadedProp) {
+    for (byte flag : flags) {
+      if ((flag & FLAG_LOADED_PROP) == 0) {
         return true;
       }
     }
@@ -259,10 +268,10 @@ public final class EntityBeanIntercept implements Serializable {
    * Return true if only the Id property has been loaded.
    */
   public boolean hasIdOnly(int idIndex) {
-    for (int i = 0; i < loadedProps.length; i++) {
+    for (int i = 0; i < flags.length; i++) {
       if (i == idIndex) {
-        if (!loadedProps[i]) return false;
-      } else if (loadedProps[i]) {
+        if ((flags[i] & FLAG_LOADED_PROP) == 0) return false;
+      } else if ((flags[i] & FLAG_LOADED_PROP) != 0) {
         return false;
       }
     }
@@ -284,9 +293,9 @@ public final class EntityBeanIntercept implements Serializable {
     if (idPos > -1) {
       // For cases where properties are set on constructor
       // set every non Id property to unloaded (for lazy loading)
-      for (int i = 0; i < loadedProps.length; i++) {
+      for (int i = 0; i < flags.length; i++) {
         if (i != idPos) {
-          loadedProps[i] = false;
+          flags[i] &= ~FLAG_LOADED_PROP;
         }
       }
     }
@@ -352,7 +361,9 @@ public final class EntityBeanIntercept implements Serializable {
     this.owner._ebean_setEmbeddedLoaded();
     this.lazyLoadProperty = -1;
     this.origValues = null;
-    this.changedProps = null;
+    for (int i = 0; i < flags.length; i++) {
+      flags[i] &= ~(FLAG_CHANGED_PROP + FLAG_ORIG_VALUE_SET);
+    }
     this.dirty = false;
   }
 
@@ -475,7 +486,11 @@ public final class EntityBeanIntercept implements Serializable {
     if (position == -1) {
       throw new IllegalArgumentException("Property " + propertyName + " not found");
     }
-    loadedProps[position] = loaded;
+    if (loaded) {
+      flags[position] |= FLAG_LOADED_PROP;
+    } else {
+      flags[position] &= ~FLAG_LOADED_PROP;
+    }
   }
 
   /**
@@ -483,22 +498,22 @@ public final class EntityBeanIntercept implements Serializable {
    * constructor.
    */
   public void setPropertyUnloaded(int propertyIndex) {
-    loadedProps[propertyIndex] = false;
+    flags[propertyIndex] &= ~FLAG_LOADED_PROP;
   }
 
   /**
    * Set the property to be loaded.
    */
   public void setLoadedProperty(int propertyIndex) {
-    loadedProps[propertyIndex] = true;
+    flags[propertyIndex] |= FLAG_LOADED_PROP;
   }
 
   /**
    * Set all properties to be loaded (post insert).
    */
   public void setLoadedPropertyAll() {
-    for (int i = 0; i < loadedProps.length; i++) {
-      loadedProps[i] = true;
+    for (int i = 0; i < flags.length; i++) {
+      flags[i] |= FLAG_LOADED_PROP;
     }
   }
 
@@ -506,14 +521,14 @@ public final class EntityBeanIntercept implements Serializable {
    * Return true if the property is loaded.
    */
   public boolean isLoadedProperty(int propertyIndex) {
-    return loadedProps[propertyIndex];
+    return (flags[propertyIndex] & FLAG_LOADED_PROP) != 0;
   }
 
   /**
    * Return true if the property is considered changed.
    */
   public boolean isChangedProperty(int propertyIndex) {
-    return (changedProps != null && changedProps[propertyIndex]);
+    return (flags[propertyIndex] & FLAG_CHANGED_PROP) != 0;
   }
 
   /**
@@ -521,8 +536,7 @@ public final class EntityBeanIntercept implements Serializable {
    * embedded properties is dirty.
    */
   public boolean isDirtyProperty(int propertyIndex) {
-    return (changedProps != null && changedProps[propertyIndex]
-      || embeddedDirty != null && embeddedDirty[propertyIndex]);
+    return (flags[propertyIndex] & (FLAG_CHANGED_PROP + FLAG_EMBEDDED_DIRTY)) != 0;
   }
 
   /**
@@ -534,27 +548,22 @@ public final class EntityBeanIntercept implements Serializable {
   }
 
   public void setChangedProperty(int propertyIndex) {
-    if (changedProps == null) {
-      changedProps = new boolean[owner._ebean_getPropertyNames().length];
-    }
-    changedProps[propertyIndex] = true;
+    flags[propertyIndex] |= FLAG_CHANGED_PROP;
   }
 
   /**
    * Set that an embedded bean has had one of its properties changed.
    */
   private void setEmbeddedPropertyDirty(int propertyIndex) {
-    if (embeddedDirty == null) {
-      embeddedDirty = new boolean[owner._ebean_getPropertyNames().length];
-    }
-    embeddedDirty[propertyIndex] = true;
+    flags[propertyIndex] |= FLAG_EMBEDDED_DIRTY;
   }
 
   private void setOriginalValue(int propertyIndex, Object value) {
     if (origValues == null) {
       origValues = new Object[owner._ebean_getPropertyNames().length];
     }
-    if (origValues[propertyIndex] == null) {
+    if ((flags[propertyIndex] & FLAG_ORIG_VALUE_SET) == 0) {
+      flags[propertyIndex] |= FLAG_ORIG_VALUE_SET;
       origValues[propertyIndex] = value;
     }
   }
@@ -574,13 +583,9 @@ public final class EntityBeanIntercept implements Serializable {
    */
   public void setNewBeanForUpdate() {
 
-    if (changedProps == null) {
-      changedProps = new boolean[owner._ebean_getPropertyNames().length];
-    }
-
-    for (int i = 0; i < loadedProps.length; i++) {
-      if (loadedProps[i]) {
-        changedProps[i] = true;
+    for (int i = 0; i < flags.length; i++) {
+      if ((flags[i] & FLAG_LOADED_PROP) != 0) {
+        flags[i] |= FLAG_CHANGED_PROP;
       }
     }
     setDirty(true);
@@ -594,8 +599,8 @@ public final class EntityBeanIntercept implements Serializable {
       return null;
     }
     Set<String> props = new LinkedHashSet<>();
-    for (int i = 0; i < loadedProps.length; i++) {
-      if (loadedProps[i]) {
+    for (int i = 0; i < flags.length; i++) {
+      if ((flags[i] & FLAG_LOADED_PROP) != 0) {
         props.add(getProperty(i));
       }
     }
@@ -609,12 +614,8 @@ public final class EntityBeanIntercept implements Serializable {
     int len = getPropertyLength();
     boolean[] dirties = new boolean[len];
     for (int i = 0; i < len; i++) {
-      if (changedProps != null && changedProps[i]) {
-        dirties[i] = true;
-      } else if (embeddedDirty != null && embeddedDirty[i]) {
-        // an embedded property has been changed - recurse
-        dirties[i] = true;
-      }
+      // this, or an embedded property has been changed - recurse
+      dirties[i] = (flags[i] & (FLAG_CHANGED_PROP + FLAG_EMBEDDED_DIRTY)) != 0;
     }
     return dirties;
   }
@@ -634,11 +635,11 @@ public final class EntityBeanIntercept implements Serializable {
   public void addDirtyPropertyNames(Set<String> props, String prefix) {
     int len = getPropertyLength();
     for (int i = 0; i < len; i++) {
-      if (changedProps != null && changedProps[i]) {
+      if ((flags[i] & FLAG_CHANGED_PROP) != 0) {
         // the property has been changed on this bean
         String propName = (prefix == null ? getProperty(i) : prefix + getProperty(i));
         props.add(propName);
-      } else if (embeddedDirty != null && embeddedDirty[i]) {
+      } else if ((flags[i] & FLAG_EMBEDDED_DIRTY) != 0) {
         // an embedded property has been changed - recurse
         EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
         embeddedBean._ebean_getIntercept().addDirtyPropertyNames(props, getProperty(i) + ".");
@@ -654,12 +655,12 @@ public final class EntityBeanIntercept implements Serializable {
     String[] names = owner._ebean_getPropertyNames();
     int len = getPropertyLength();
     for (int i = 0; i < len; i++) {
-      if (changedProps != null && changedProps[i]) {
+      if ((flags[i] & FLAG_CHANGED_PROP) != 0) {
         // the property has been changed on this bean
         if (propertyNames.contains(names[i])) {
           return true;
         }
-      } else if (embeddedDirty != null && embeddedDirty[i]) {
+      } else if ((flags[i] & FLAG_EMBEDDED_DIRTY) != 0) {
         if (propertyNames.contains(names[i])) {
           return true;
         }
@@ -683,15 +684,16 @@ public final class EntityBeanIntercept implements Serializable {
   public void addDirtyPropertyValues(Map<String, ValuePair> dirtyValues, String prefix) {
     int len = getPropertyLength();
     for (int i = 0; i < len; i++) {
-      if (changedProps != null && changedProps[i]) {
+      if ((flags[i] & FLAG_CHANGED_PROP) != 0) {
         // the property has been changed on this bean
         String propName = (prefix == null ? getProperty(i) : prefix + getProperty(i));
         Object newVal = owner._ebean_getField(i);
         Object oldVal = getOrigValue(i);
+        if (!areEqual(oldVal, newVal)) {
+          dirtyValues.put(propName, new ValuePair(newVal, oldVal));
+        }
 
-        dirtyValues.put(propName, new ValuePair(newVal, oldVal));
-
-      } else if (embeddedDirty != null && embeddedDirty[i]) {
+      } else if ((flags[i] & FLAG_EMBEDDED_DIRTY) != 0) {
         // an embedded property has been changed - recurse
         EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
         embeddedBean._ebean_getIntercept().addDirtyPropertyValues(dirtyValues, getProperty(i) + ".");
@@ -705,13 +707,15 @@ public final class EntityBeanIntercept implements Serializable {
   public void addDirtyPropertyValues(BeanDiffVisitor visitor) {
     int len = getPropertyLength();
     for (int i = 0; i < len; i++) {
-      if (changedProps != null && changedProps[i]) {
+      if ((flags[i] & FLAG_CHANGED_PROP) != 0) {
         // the property has been changed on this bean
         Object newVal = owner._ebean_getField(i);
         Object oldVal = getOrigValue(i);
-        visitor.visit(i, newVal, oldVal);
+        if (!areEqual(oldVal, newVal)) {
+          visitor.visit(i, newVal, oldVal);
+        }
 
-      } else if (embeddedDirty != null && embeddedDirty[i]) {
+      } else if ((flags[i] & FLAG_EMBEDDED_DIRTY) != 0) {
         // an embedded property has been changed - recurse
         EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
         visitor.visitPush(i);
@@ -739,9 +743,9 @@ public final class EntityBeanIntercept implements Serializable {
     }
     int len = getPropertyLength();
     for (int i = 0; i < len; i++) {
-      if (changedProps != null && changedProps[i]) {
+      if ((flags[i] & FLAG_CHANGED_PROP) != 0) {
         sb.append(i).append(',');
-      } else if (embeddedDirty != null && embeddedDirty[i]) {
+      } else if ((flags[i] & FLAG_EMBEDDED_DIRTY) != 0) {
         // an embedded property has been changed - recurse
         EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
         sb.append(i).append('[');
@@ -765,15 +769,12 @@ public final class EntityBeanIntercept implements Serializable {
     return sb;
   }
 
-  /**
-   * Return the set of property names for changed properties.
-   */
-  public boolean[] getChanged() {
-    return changedProps;
-  }
-
   public boolean[] getLoaded() {
-    return loadedProps;
+    boolean[] ret= new boolean[flags.length];
+    for (int i = 0; i < ret.length; i++) {
+      ret[i] = (flags[i] & FLAG_LOADED_PROP) != 0;
+    }
+    return ret;
   }
 
   /**
@@ -821,7 +822,7 @@ public final class EntityBeanIntercept implements Serializable {
    */
   private void loadBeanInternal(int loadProperty, BeanLoader loader) {
 
-    if (loadedProps == null || loadedProps[loadProperty]) {
+    if ((flags[loadProperty] & FLAG_LOADED_PROP) != 0) {
       // race condition where multiple threads calling preGetter concurrently
       return;
     }
@@ -887,7 +888,7 @@ public final class EntityBeanIntercept implements Serializable {
    * Called when a BeanCollection is initialised automatically.
    */
   public void initialisedMany(int propertyIndex) {
-    loadedProps[propertyIndex] = true;
+    flags[propertyIndex] |= FLAG_LOADED_PROP;
   }
 
   private void preGetterCallback(int propertyIndex) {
diff --git a/src/test/java/org/tests/changelog/TestChangeLog.java b/src/test/java/org/tests/changelog/TestChangeLog.java
index d253c9173..9b906a8fd 100644
--- a/src/test/java/org/tests/changelog/TestChangeLog.java
+++ b/src/test/java/org/tests/changelog/TestChangeLog.java
@@ -5,11 +5,13 @@ import io.ebean.EbeanServerFactory;
 import io.ebean.annotation.ChangeLog;
 import io.ebean.config.ServerConfig;
 import io.ebean.event.BeanPersistRequest;
+import io.ebean.event.changelog.BeanChange;
 import io.ebean.event.changelog.ChangeLogFilter;
 import io.ebean.event.changelog.ChangeLogListener;
 import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeLogRegister;
 import io.ebean.event.changelog.ChangeSet;
+import io.ebean.event.changelog.ChangeType;
 import io.ebeaninternal.api.SpiEbeanServer;
 import org.tests.model.basic.EBasicChangeLog;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -18,8 +20,12 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class TestChangeLog extends BaseTestCase {
 
   TDChangeLogPrepare changeLogPrepare = new TDChangeLogPrepare();
@@ -47,14 +53,77 @@ public class TestChangeLog extends BaseTestCase {
     bean.setName("logBean");
     bean.setShortDescription("hello");
     server.save(bean);
+    BeanChange change = changeLogListener.changes.getChanges().get(0);
+
+    assertThat(change.getEvent()).isEqualTo(ChangeType.INSERT);
+    assertThat(change.getData())
+      .contains("\"name\":\"logBean\"")
+      .contains("\"shortDescription\":\"hello\"");
+
 
     bean.setName("ChangedName");
     server.save(bean);
 
+    change = changeLogListener.changes.getChanges().get(0);
+
+    assertThat(change.getEvent()).isEqualTo(ChangeType.UPDATE);
+    assertThat(change.getOldData()).contains("\"name\":\"logBean\"");
+    assertThat(change.getData())   .contains("\"name\":\"ChangedName\"");
+
+
     server.delete(bean);
 
+    change = changeLogListener.changes.getChanges().get(0);
+
+    assertThat(change.getEvent()).isEqualTo(ChangeType.DELETE);
+    assertThat(change.getData()).isNull();
+
   }
 
+
+  @Test
+  public void testWithNull() {
+
+    EBasicChangeLog bean = new EBasicChangeLog();
+    bean.setName(null);
+    bean.setShortDescription("hello");
+    server.save(bean);
+    BeanChange change = changeLogListener.changes.getChanges().get(0);
+
+    assertThat(change.getEvent()).isEqualTo(ChangeType.INSERT);
+    assertThat(change.getData())
+      .doesNotContain("\"name\"")
+      .contains("\"shortDescription\":\"hello\"");
+
+
+    bean.setName("log");
+    bean.setName("logBean");
+    bean.setShortDescription("world");
+    bean.setShortDescription("hello");
+    server.save(bean);
+
+    change = changeLogListener.changes.getChanges().get(0);
+
+    assertThat(change.getEvent()).isEqualTo(ChangeType.UPDATE);
+    assertThat(change.getOldData())
+      .contains("\"name\":null") // it was null
+      .doesNotContain("\"shortDescription\""); // it is unchanged
+
+    assertThat(change.getData())
+      .contains("\"name\":\"logBean\"")
+      .doesNotContain("\"shortDescription\""); // it is unchanged
+
+
+    server.delete(bean);
+
+    change = changeLogListener.changes.getChanges().get(0);
+
+    assertThat(change.getEvent()).isEqualTo(ChangeType.DELETE);
+    assertThat(change.getData()).isNull();
+
+  }
+
+
   private SpiEbeanServer getServer() {
 
     System.setProperty("ebean.ignoreExtraDdl", "true");

From 7e995efb6229a54b590a2ca3180b9702cd2c6090 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Wed, 26 Sep 2018 10:48:19 +0200
Subject: [PATCH 0460/1036] Add methods th the plugin API to access type and
 inheritance information (#1491)

---
 src/main/java/io/ebean/plugin/BeanType.java   | 30 +++++++++++++++++++
 src/main/java/io/ebean/plugin/Property.java   |  9 ++++++
 .../server/deploy/BeanDescriptor.java         | 29 ++++++++++++++++++
 .../server/deploy/BeanProperty.java           |  3 ++
 4 files changed, 71 insertions(+)

diff --git a/src/main/java/io/ebean/plugin/BeanType.java b/src/main/java/io/ebean/plugin/BeanType.java
index 2f00cd0af..bb487de35 100644
--- a/src/main/java/io/ebean/plugin/BeanType.java
+++ b/src/main/java/io/ebean/plugin/BeanType.java
@@ -9,6 +9,10 @@ import io.ebean.event.BeanQueryAdapter;
 import io.ebeanservice.docstore.api.mapping.DocumentMapping;
 
 import java.util.Collection;
+import java.util.List;
+import java.util.function.Consumer;
+
+import javax.annotation.Nonnull;
 
 /**
  * Information and methods on BeanDescriptors made available to plugins.
@@ -18,6 +22,7 @@ public interface BeanType<T> {
   /**
    * Return the short name of the bean type.
    */
+  @Nonnull
   String getName();
 
   /**
@@ -28,11 +33,13 @@ public interface BeanType<T> {
   /**
    * Return the full name of the bean type.
    */
+  @Nonnull
   String getFullName();
 
   /**
    * Return the class type this BeanDescriptor describes.
    */
+  @Nonnull
   Class<T> getBeanType();
 
   /**
@@ -43,6 +50,7 @@ public interface BeanType<T> {
   /**
    * Return all the properties for this bean type.
    */
+  @Nonnull
   Collection<? extends Property> allProperties();
 
   /**
@@ -197,6 +205,28 @@ public interface BeanType<T> {
    */
   boolean hasInheritance();
 
+  /**
+   * Return true if this object is the root level object in its entity
+   * inheritance.
+   */
+  boolean isInheritanceRoot();
+
+  /**
+   * Returns all direct children of this beantype
+   */
+  List<BeanType<?>> getInheritanceChildren();
+
+  /**
+   * Returns the parent in inheritance hiearchy
+   */
+  BeanType<?> getInheritanceParent();
+
+  /**
+   * Visit all children recursively
+   * @param visitor
+   */
+  void visitAllInheritanceChildren(Consumer<BeanType<?>> visitor);
+
   /**
    * Return the discriminator column.
    */
diff --git a/src/main/java/io/ebean/plugin/Property.java b/src/main/java/io/ebean/plugin/Property.java
index e3e9d2c3e..20d81d7e5 100644
--- a/src/main/java/io/ebean/plugin/Property.java
+++ b/src/main/java/io/ebean/plugin/Property.java
@@ -1,5 +1,7 @@
 package io.ebean.plugin;
 
+import javax.annotation.Nonnull;
+
 /**
  * Property of a entity bean that can be read.
  */
@@ -8,8 +10,15 @@ public interface Property {
   /**
    * Return the name of the property.
    */
+  @Nonnull
   String getName();
 
+  /**
+   * Return the type of the property.
+   */
+  @Nonnull
+  Class<?> getPropertyType();
+
   /**
    * Return the value of the property on the given bean.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 4a0c711d5..f114970f9 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -100,6 +100,7 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -107,6 +108,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 /**
  * Describes Beans including their deployment information.
@@ -1133,6 +1136,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * Return true if this object is the root level object in its entity
    * inheritance.
    */
+  @Override
   public boolean isInheritanceRoot() {
     return inheritInfo == null || inheritInfo.isRoot();
   }
@@ -3475,4 +3479,29 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   public List<BeanProperty[]> getUniqueProps() {
     return propertiesUnique;
   }
+
+  @Override
+  public List<BeanType<?>> getInheritanceChildren() {
+    if (hasInheritance()) {
+      return getInheritInfo().getChildren()
+        .stream()
+        .map(InheritInfo::desc)
+        .collect(Collectors.toList());
+    } else {
+      return Collections.emptyList();
+    }
+  }
+
+  @Override
+  public BeanType<?> getInheritanceParent() {
+    return getInheritInfo() == null ? null : getInheritInfo().getParent().desc();
+  }
+
+  @Override
+  public void visitAllInheritanceChildren(Consumer<BeanType<?>> visitor) {
+    if (hasInheritance()) {
+      getInheritInfo().visitChildren(info -> visitor.accept(info.desc()));
+    }
+  }
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 7473e01aa..8b0650f54 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -979,6 +979,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   /**
    * Return the full name of this property.
    */
+  @Override
   public String getFullBeanName() {
     return descriptor.getFullName() + "." + name;
   }
@@ -994,6 +995,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   /**
    * Return the scalarType.
    */
+  @Override
   @SuppressWarnings(value = "unchecked")
   public ScalarType<Object> getScalarType() {
     return scalarType;
@@ -1369,6 +1371,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   /**
    * Return the property type.
    */
+  @Override
   public Class<?> getPropertyType() {
     return propertyType;
   }

From 5522d56e8da0b2604b6ccc0afce7a7a46f4979d4 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Wed, 26 Sep 2018 10:48:49 +0200
Subject: [PATCH 0461/1036] ignored tests for sqlserver, because there is no
 nested transaction support, yet (#1493)

---
 .../tests/transaction/TestNestedSubTransaction.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/test/java/org/tests/transaction/TestNestedSubTransaction.java b/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
index 05eeed4d8..dc9e3d147 100644
--- a/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
+++ b/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
@@ -20,7 +20,7 @@ public class TestNestedSubTransaction extends BaseTestCase {
   /**
    * MySql only supports named savepoints - review.
    */
-  @IgnorePlatform(Platform.MYSQL)
+  @IgnorePlatform({Platform.MYSQL, Platform.SQLSERVER})
   @Test
   public void ebeanServer_commitTransaction_expect_sameAsTransactionCommit() {
 
@@ -65,7 +65,7 @@ public class TestNestedSubTransaction extends BaseTestCase {
   }
 
 
-  @IgnorePlatform(Platform.MYSQL)
+  @IgnorePlatform({Platform.SQLSERVER, Platform.MYSQL})
   @Test
   public void nestedUseSavepoint_doubleNested_rollbackCommit() {
 
@@ -102,7 +102,7 @@ public class TestNestedSubTransaction extends BaseTestCase {
     }
   }
 
-  @IgnorePlatform(Platform.MYSQL)
+  @IgnorePlatform({Platform.SQLSERVER, Platform.MYSQL})
   @Test
   public void nestedUseSavepoint_doubleNested_commitRollback() {
 
@@ -139,7 +139,7 @@ public class TestNestedSubTransaction extends BaseTestCase {
     }
   }
 
-  @IgnorePlatform(Platform.MYSQL)
+  @IgnorePlatform({Platform.SQLSERVER, Platform.MYSQL})
   @Test
   public void nestedUseSavepoint_nested_RequiresNew() {
 
@@ -175,7 +175,7 @@ public class TestNestedSubTransaction extends BaseTestCase {
     assertNull(after);
   }
 
-  @IgnorePlatform(Platform.MYSQL)
+  @IgnorePlatform({Platform.SQLSERVER, Platform.MYSQL})
   @Test
   public void nestedUseSavepoint() {
 

From fe71c7cc4e1f38e285f559a4915fdcd1c6bd4760 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Wed, 26 Sep 2018 10:54:22 +0200
Subject: [PATCH 0462/1036] FIX: tableName detection for native statements on
 SQLServer (#1494)

---
 .../java/io/ebeaninternal/server/query/CQueryBuilder.java     | 4 +++-
 .../java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index cd1dc413c..8fb718024 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -417,7 +417,9 @@ class CQueryBuilder {
 
     BeanDescriptor<?> desc = request.getBeanDescriptor();
     try {
-      PreparedStatement statement = connection.prepareStatement(sql);
+      // For SqlServer we need either "selectMethod=cursor" in the connection string or fetch explicitly a cursorable
+      // statement here by specifying ResultSet.CONCUR_UPDATABLE
+      PreparedStatement statement = connection.prepareStatement(sql,ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_UPDATABLE);
       predicates.bind(statement, connection);
 
       ResultSet resultSet = statement.executeQuery();
diff --git a/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java b/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java
index 94f7219a4..1ab49cda3 100644
--- a/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java
+++ b/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java
@@ -139,7 +139,7 @@ public class TestNativeSqlBasic extends BaseTestCase {
    * Oracle does not support getTableName() via JDBC resultSet meta data
    */
   @Test
-  @IgnorePlatform({Platform.SQLSERVER, Platform.ORACLE}) // does only work in 'cursor' mode!
+  @IgnorePlatform({Platform.ORACLE})
   public void partialAssoc() {
 
     ResetBasicData.reset();

From a83a4fa1c4ea6041d5f33e80be62ba7c160ab1a4 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Wed, 26 Sep 2018 10:55:39 +0200
Subject: [PATCH 0463/1036] FIX: check platform on multiple annotations like
 '@Formula(platform=...)' (#1495)

---
 .../io/ebeaninternal/server/deploy/parse/AnnotationBase.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java
index f86cac704..3d6e6b7d4 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java
@@ -82,12 +82,12 @@ public abstract class AnnotationBase {
     T a = null;
     Field field = prop.getField();
     if (field != null) {
-      a = AnnotationUtil.findAnnotation(field, annClass);
+      a = AnnotationUtil.findAnnotation(field, annClass, platform);
     }
     if (a == null) {
       Method method = prop.getReadMethod();
       if (method != null) {
-        a = AnnotationUtil.findAnnotation(method, annClass);
+        a = AnnotationUtil.findAnnotation(method, annClass, platform);
       }
     }
     return a;

From eb1ea5ddd2f5d358a56cbcf9d1384fbbfde2fada Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Wed, 26 Sep 2018 10:57:33 +0200
Subject: [PATCH 0464/1036] NEW: collation support for orderBy (#1492)

---
 src/main/java/io/ebean/OrderBy.java           | 63 +++++++++++++++++--
 .../tests/unitinternal/TestOrderByParse.java  | 47 ++++++++++++++
 2 files changed, 105 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/ebean/OrderBy.java b/src/main/java/io/ebean/OrderBy.java
index e9f68f6f5..438396109 100644
--- a/src/main/java/io/ebean/OrderBy.java
+++ b/src/main/java/io/ebean/OrderBy.java
@@ -5,6 +5,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import io.ebean.util.StringHelper;
+
 /**
  * Represents an Order By for a Query.
  * <p>
@@ -74,6 +76,15 @@ public final class OrderBy<T> implements Serializable {
     return query;
   }
 
+  /**
+   * Add a property with ascending order to this OrderBy.
+   */
+  public Query<T> asc(String propertyName, String collation) {
+
+    list.add(new Property(propertyName, true, collation));
+    return query;
+  }
+
   /**
    * Add a property with descending order to this OrderBy.
    */
@@ -83,6 +94,16 @@ public final class OrderBy<T> implements Serializable {
     return query;
   }
 
+  /**
+   * Add a property with descending order to this OrderBy.
+   */
+  public Query<T> desc(String propertyName, String collation) {
+
+    list.add(new Property(propertyName, false, collation));
+    return query;
+  }
+
+
   /**
    * Return true if the property is known to be contained in the order by clause.
    */
@@ -231,6 +252,8 @@ public final class OrderBy<T> implements Serializable {
 
     private boolean ascending;
 
+    private String collation;
+
     private String nulls;
 
     private String highLow;
@@ -247,17 +270,32 @@ public final class OrderBy<T> implements Serializable {
       this.highLow = highLow;
     }
 
+    public Property(String property, boolean ascending, String collation) {
+      this.property = property;
+      this.ascending = ascending;
+      this.collation = collation;
+    }
+
+    public Property(String property, boolean ascending, String collation, String nulls, String highLow) {
+      this.property = property;
+      this.ascending = ascending;
+      this.collation = collation;
+      this.nulls = nulls;
+      this.highLow = highLow;
+    }
+
     /**
      * Return a copy of this Property with the path trimmed.
      */
     public Property copyWithTrim(String path) {
-      return new Property(property.substring(path.length() + 1), ascending, nulls, highLow);
+      return new Property(property.substring(path.length() + 1), ascending, collation, nulls, highLow);
     }
 
     @Override
     public int hashCode() {
       int hc = property.hashCode();
       hc = hc * 92821 + (ascending ? 0 : 1);
+      hc = hc * 92821 + (collation == null ? 0 : collation.hashCode());
       hc = hc * 92821 + (nulls == null ? 0 : nulls.hashCode());
       hc = hc * 92821 + (highLow == null ? 0 : highLow.hashCode());
       return hc;
@@ -273,6 +311,7 @@ public final class OrderBy<T> implements Serializable {
       }
       Property e = (Property) obj;
       if (ascending != e.ascending) return false;
+      if (collation != e.collation) return false;
       if (!property.equals(e.property)) return false;
       if (nulls != null ? !nulls.equals(e.nulls) : e.nulls != null) return false;
       return highLow != null ? highLow.equals(e.highLow) : e.highLow == null;
@@ -284,7 +323,7 @@ public final class OrderBy<T> implements Serializable {
     }
 
     public String toStringFormat() {
-      if (nulls == null) {
+      if (nulls == null && collation == null) {
         if (ascending) {
           return property;
         } else {
@@ -292,11 +331,25 @@ public final class OrderBy<T> implements Serializable {
         }
       } else {
         StringBuilder sb = new StringBuilder();
-        sb.append(property);
+
+        // collate
+        if (collation != null)  {
+          if (collation.contains("${}")) {
+            // this is a complex collation, e.g. DB2 - we must replace the property
+            sb.append(StringHelper.replaceString(collation, "${}", property));
+          } else {
+            sb.append(property);
+            sb.append(" COLLATE ").append(collation);
+          }
+        } else {
+          sb.append(property);
+        }
         if (!ascending) {
           sb.append(" ").append("desc");
         }
-        sb.append(" ").append(nulls).append(" ").append(highLow);
+        if (nulls != null) {
+          sb.append(" ").append(nulls).append(" ").append(highLow);
+        }
         return sb.toString();
       }
     }
@@ -319,7 +372,7 @@ public final class OrderBy<T> implements Serializable {
      * Return a copy of this property.
      */
     public Property copy() {
-      return new Property(property, ascending, nulls, highLow);
+      return new Property(property, ascending, collation, nulls, highLow);
     }
 
     /**
diff --git a/src/test/java/org/tests/unitinternal/TestOrderByParse.java b/src/test/java/org/tests/unitinternal/TestOrderByParse.java
index 5fc876353..0dc23eccb 100644
--- a/src/test/java/org/tests/unitinternal/TestOrderByParse.java
+++ b/src/test/java/org/tests/unitinternal/TestOrderByParse.java
@@ -153,4 +153,51 @@ public class TestOrderByParse extends BaseTestCase {
     assertEquals("id, name", copy.toStringFormat());
 
   }
+
+  @Test
+  public void testParsingWithCollation() {
+
+    OrderBy<Object> o1 = new OrderBy<>();
+    o1.asc("id", "latin_1");
+    assertTrue(o1.getProperties().size() == 1);
+    assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
+    assertTrue(o1.getProperties().get(0).isAscending());
+    assertEquals("id COLLATE latin_1", o1.toStringFormat());
+
+    o1 = new OrderBy<>();
+    o1.desc("id", "latin_1");
+    assertTrue(o1.getProperties().size() == 1);
+    assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
+    assertTrue(!o1.getProperties().get(0).isAscending());
+    assertEquals("id COLLATE latin_1 desc", o1.toStringFormat());
+
+    o1 = new OrderBy<>();
+    o1.desc("id", "latin_1");
+    o1.asc("date");
+    assertTrue(o1.getProperties().size() == 2);
+    assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
+    assertTrue(o1.getProperties().get(1).getProperty().equals("date"));
+    assertTrue(!o1.getProperties().get(0).isAscending());
+    assertTrue(o1.getProperties().get(1).isAscending());
+    assertEquals("id COLLATE latin_1 desc, date", o1.toStringFormat());
+
+    o1 = new OrderBy<>();
+    o1.desc("id", "latin_1");
+    o1.asc("name", "latin_2");
+    assertTrue(o1.getProperties().size() == 2);
+    assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
+    assertTrue(o1.getProperties().get(1).getProperty().equals("name"));
+    assertTrue(!o1.getProperties().get(0).isAscending());
+    assertTrue(o1.getProperties().get(1).isAscending());
+    assertEquals("id COLLATE latin_1 desc, name COLLATE latin_2", o1.toStringFormat());
+
+    // functional (DB2) syntax
+    o1 = new OrderBy<>();
+    o1.desc("id", "COLLATION_KEY(${}, 'latin_1')");
+    assertTrue(o1.getProperties().size() == 1);
+    assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
+    assertTrue(!o1.getProperties().get(0).isAscending());
+    assertEquals("COLLATION_KEY(id, 'latin_1') desc", o1.toStringFormat());
+
+  }
 }

From efa86043bfa64f8b7fcd0946ca22bb72a8a5ed77 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 26 Sep 2018 21:15:41 +1200
Subject: [PATCH 0465/1036] #1492 - Update for NEW: collation support for
 orderBy

---
 src/main/java/io/ebean/OrderBy.java           | 15 +++---
 .../tests/unitinternal/TestOrderByParse.java  | 54 +++++++++++++++++--
 2 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/src/main/java/io/ebean/OrderBy.java b/src/main/java/io/ebean/OrderBy.java
index 438396109..7ce78f340 100644
--- a/src/main/java/io/ebean/OrderBy.java
+++ b/src/main/java/io/ebean/OrderBy.java
@@ -1,11 +1,12 @@
 package io.ebean;
 
+import io.ebean.util.StringHelper;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
-import io.ebean.util.StringHelper;
+import java.util.Objects;
 
 /**
  * Represents an Order By for a Query.
@@ -311,10 +312,10 @@ public final class OrderBy<T> implements Serializable {
       }
       Property e = (Property) obj;
       if (ascending != e.ascending) return false;
-      if (collation != e.collation) return false;
       if (!property.equals(e.property)) return false;
-      if (nulls != null ? !nulls.equals(e.nulls) : e.nulls != null) return false;
-      return highLow != null ? highLow.equals(e.highLow) : e.highLow == null;
+      if (!Objects.equals(collation, e.collation)) return false;
+      if (!Objects.equals(nulls, e.nulls)) return false;
+      return Objects.equals(highLow, e.highLow);
     }
 
     @Override
@@ -331,15 +332,13 @@ public final class OrderBy<T> implements Serializable {
         }
       } else {
         StringBuilder sb = new StringBuilder();
-
-        // collate
         if (collation != null)  {
           if (collation.contains("${}")) {
             // this is a complex collation, e.g. DB2 - we must replace the property
             sb.append(StringHelper.replaceString(collation, "${}", property));
           } else {
             sb.append(property);
-            sb.append(" COLLATE ").append(collation);
+            sb.append(" collate ").append(collation);
           }
         } else {
           sb.append(property);
diff --git a/src/test/java/org/tests/unitinternal/TestOrderByParse.java b/src/test/java/org/tests/unitinternal/TestOrderByParse.java
index 0dc23eccb..37ea83782 100644
--- a/src/test/java/org/tests/unitinternal/TestOrderByParse.java
+++ b/src/test/java/org/tests/unitinternal/TestOrderByParse.java
@@ -4,7 +4,10 @@ import io.ebean.BaseTestCase;
 import io.ebean.OrderBy;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Test the OrderBy object and especially its parsing.
@@ -162,14 +165,14 @@ public class TestOrderByParse extends BaseTestCase {
     assertTrue(o1.getProperties().size() == 1);
     assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
     assertTrue(o1.getProperties().get(0).isAscending());
-    assertEquals("id COLLATE latin_1", o1.toStringFormat());
+    assertEquals("id collate latin_1", o1.toStringFormat());
 
     o1 = new OrderBy<>();
     o1.desc("id", "latin_1");
     assertTrue(o1.getProperties().size() == 1);
     assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
     assertTrue(!o1.getProperties().get(0).isAscending());
-    assertEquals("id COLLATE latin_1 desc", o1.toStringFormat());
+    assertEquals("id collate latin_1 desc", o1.toStringFormat());
 
     o1 = new OrderBy<>();
     o1.desc("id", "latin_1");
@@ -179,7 +182,7 @@ public class TestOrderByParse extends BaseTestCase {
     assertTrue(o1.getProperties().get(1).getProperty().equals("date"));
     assertTrue(!o1.getProperties().get(0).isAscending());
     assertTrue(o1.getProperties().get(1).isAscending());
-    assertEquals("id COLLATE latin_1 desc, date", o1.toStringFormat());
+    assertEquals("id collate latin_1 desc, date", o1.toStringFormat());
 
     o1 = new OrderBy<>();
     o1.desc("id", "latin_1");
@@ -189,7 +192,7 @@ public class TestOrderByParse extends BaseTestCase {
     assertTrue(o1.getProperties().get(1).getProperty().equals("name"));
     assertTrue(!o1.getProperties().get(0).isAscending());
     assertTrue(o1.getProperties().get(1).isAscending());
-    assertEquals("id COLLATE latin_1 desc, name COLLATE latin_2", o1.toStringFormat());
+    assertEquals("id collate latin_1 desc, name collate latin_2", o1.toStringFormat());
 
     // functional (DB2) syntax
     o1 = new OrderBy<>();
@@ -200,4 +203,45 @@ public class TestOrderByParse extends BaseTestCase {
     assertEquals("COLLATION_KEY(id, 'latin_1') desc", o1.toStringFormat());
 
   }
+
+  @Test
+  public void equals_with_nulls() {
+
+    OrderBy<Object> o1 = new OrderBy<>("id desc nulls high");
+    OrderBy<Object> o2 = new OrderBy<>("id desc nulls high");
+    OrderBy<Object> o3 = new OrderBy<>();
+    o3.add("id desc nulls high");
+
+    assertEquals(o1, o2);
+    assertEquals(o1, o3);
+
+
+    OrderBy<Object> o4 = new OrderBy<>("id desc");
+    OrderBy<Object> o5 = new OrderBy<>("oid desc nulls high");
+    OrderBy<Object> o6 = new OrderBy<>("id desc nulls low");
+
+    assertNotEquals(o1, o4);
+    assertNotEquals(o1, o5);
+    assertNotEquals(o1, o6);
+  }
+
+  @Test
+  public void equals_with_collation() {
+
+    OrderBy<Object> o1 = new OrderBy<>();
+    o1.asc("name", "latin_1");
+
+    OrderBy<Object> o2 = new OrderBy<>();
+    o2.asc("name", null);
+
+    OrderBy<Object> o3 = new OrderBy<>();
+    o2.asc("name", "bar");
+
+    assertNotEquals(o1, o2);
+    assertNotEquals(o1, o3);
+
+    OrderBy<Object> o4 = new OrderBy<>();
+    o4.asc("name", "latin_1");
+    assertEquals(o1, o4);
+  }
 }

From a020bb15a1e88604f221efdb05cbe6d0d7cd9cd3 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Wed, 26 Sep 2018 11:19:28 +0200
Subject: [PATCH 0466/1036] removed the concat-operator "||" and replaced with
 "concat()" (#1489)

* removed the concat-operator "||" and replaced with "concat()"

* using || in postgres

* FIX: Assert-statement
---
 .../config/dbplatform/DatabasePlatform.java   |  9 --------
 .../server/expression/InPairsExpression.java  | 12 +++++-----
 .../expression/platform/BaseDbExpression.java | 22 +++++++++----------
 .../platform/BasicDbExpression.java           |  4 ----
 .../platform/DbExpressionHandler.java         | 10 ++++-----
 .../platform/DbExpressionHandlerFactory.java  | 15 +++++++------
 .../expression/platform/H2DbExpression.java   |  4 ----
 .../platform/MySqlDbExpression.java           |  4 ----
 .../platform/OracleDbExpression.java          |  4 ----
 .../platform/PostgresDbExpression.java        | 16 ++++++++++----
 .../platform/SqlServerDbExpression.java       |  4 ----
 .../cache/TestCacheViaComplexNaturalKey3.java | 16 +++++++-------
 12 files changed, 49 insertions(+), 71 deletions(-)

diff --git a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
index 65bdfff4c..152cd3588 100644
--- a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
@@ -64,8 +64,6 @@ public class DatabasePlatform {
    */
   protected String closeQuote = "\"";
 
-  protected String concatOperator = "||";
-
   /**
    * When set to true all db column names and table names use quoted identifiers.
    */
@@ -455,13 +453,6 @@ public class DatabasePlatform {
     return openQuote;
   }
 
-  /**
-   * Return the DB concat operator.
-   */
-  public String getConcatOperator() {
-    return concatOperator;
-  }
-
   /**
    * Return the JDBC type used to store booleans.
    */
diff --git a/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java b/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
index 91f6742d6..9b2c5c5f1 100644
--- a/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
@@ -92,14 +92,12 @@ class InPairsExpression extends AbstractExpression {
       return;
     }
 
-    String concat = request.getDbPlatformHandler().getConcatOperator();
 
-    String concatFormula = "(" + property0 + concat + "'" + separator + "'" + concat + property1;
-    if (suffix != null && !suffix.isEmpty()) {
-      concatFormula += concat + "'" + suffix + "'";
-    }
-    concatFormula += ")";
-    request.append(concatFormula);
+    StringBuilder sb = new StringBuilder();
+
+    request.getDbPlatformHandler().concat(property0, separator, property1, suffix);
+
+    request.append(request.getDbPlatformHandler().concat(property0, separator, property1, suffix));
     request.appendInExpression(not, concatBindValues);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/expression/platform/BaseDbExpression.java b/src/main/java/io/ebeaninternal/server/expression/platform/BaseDbExpression.java
index 584215d4c..8879c84f4 100644
--- a/src/main/java/io/ebeaninternal/server/expression/platform/BaseDbExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/platform/BaseDbExpression.java
@@ -8,17 +8,6 @@ import io.ebeaninternal.server.expression.BitwiseOp;
  */
 abstract class BaseDbExpression implements DbExpressionHandler {
 
-  private final String concatOperator;
-
-  BaseDbExpression(String concatOperator) {
-    this.concatOperator = concatOperator;
-  }
-
-  @Override
-  public String getConcatOperator() {
-    return concatOperator;
-  }
-
   @Override
   public void bitwise(SpiExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare, long match) {
 
@@ -57,4 +46,15 @@ abstract class BaseDbExpression implements DbExpressionHandler {
     }
   }
 
+  @Override
+  public String concat(String property0, String separator, String property1, String suffix) {
+    StringBuilder sb = new StringBuilder();
+    sb.append("CONCAT(").append(property0).append(",'").append(separator).append("',").append(property1);
+
+    if (suffix != null && !suffix.isEmpty()) {
+      sb.append(",'").append(suffix).append('\'');
+    }
+    sb.append(')');
+    return sb.toString();
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/expression/platform/BasicDbExpression.java b/src/main/java/io/ebeaninternal/server/expression/platform/BasicDbExpression.java
index adacca04d..8b5ab8d70 100644
--- a/src/main/java/io/ebeaninternal/server/expression/platform/BasicDbExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/platform/BasicDbExpression.java
@@ -8,10 +8,6 @@ import io.ebeaninternal.server.expression.Op;
  */
 public class BasicDbExpression extends BaseDbExpression {
 
-  BasicDbExpression(String concatOperator) {
-    super(concatOperator);
-  }
-
   @Override
   public void json(SpiExpressionRequest request, String propName, String path, Op operator, Object value) {
     throw new RuntimeException("JSON expressions only supported on Postgres and Oracle");
diff --git a/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandler.java b/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandler.java
index 7cf6d696a..93c9dc18a 100644
--- a/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandler.java
+++ b/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandler.java
@@ -9,11 +9,6 @@ import io.ebeaninternal.server.expression.Op;
  */
 public interface DbExpressionHandler {
 
-  /**
-   * Return the DB concat operator (Usually SQL standard "||").
-   */
-  String getConcatOperator();
-
   /**
    * Write the db platform specific json expression.
    */
@@ -33,4 +28,9 @@ public interface DbExpressionHandler {
    * Add the bitwise expression.
    */
   void bitwise(SpiExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare, long match);
+
+  /**
+   * Performs a "CONCAT" operation for that platform.
+   */
+  String concat(String property0, String separator, String property1, String suffix);
 }
diff --git a/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java b/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java
index b7b62eb71..e9696e5b6 100644
--- a/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java
+++ b/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java
@@ -12,20 +12,21 @@ public class DbExpressionHandlerFactory {
   public static DbExpressionHandler from(DatabasePlatform databasePlatform) {
 
     Platform platform = databasePlatform.getPlatform();
-    String concatOperator = databasePlatform.getConcatOperator();
     switch (platform) {
       case H2:
-        return new H2DbExpression(concatOperator);
+        return new H2DbExpression();
       case POSTGRES:
-        return new PostgresDbExpression(concatOperator);
+        return new PostgresDbExpression();
       case MYSQL:
-        return new MySqlDbExpression(concatOperator);
+        return new MySqlDbExpression();
       case ORACLE:
-        return new OracleDbExpression(concatOperator);
+        return new OracleDbExpression();
+      case SQLSERVER16:
+      case SQLSERVER17:
       case SQLSERVER:
-        return new SqlServerDbExpression(concatOperator);
+        return new SqlServerDbExpression();
       default:
-        return new BasicDbExpression(concatOperator);
+        return new BasicDbExpression();
     }
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/expression/platform/H2DbExpression.java b/src/main/java/io/ebeaninternal/server/expression/platform/H2DbExpression.java
index 4e0b544f2..fb65c7c03 100644
--- a/src/main/java/io/ebeaninternal/server/expression/platform/H2DbExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/platform/H2DbExpression.java
@@ -8,10 +8,6 @@ import io.ebeaninternal.server.expression.BitwiseOp;
  */
 class H2DbExpression extends BasicDbExpression {
 
-  H2DbExpression(String concatOperator) {
-    super(concatOperator);
-  }
-
   @Override
   public void bitwise(SpiExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare, long match) {
 
diff --git a/src/main/java/io/ebeaninternal/server/expression/platform/MySqlDbExpression.java b/src/main/java/io/ebeaninternal/server/expression/platform/MySqlDbExpression.java
index e0e04ad1f..dff49e0b2 100644
--- a/src/main/java/io/ebeaninternal/server/expression/platform/MySqlDbExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/platform/MySqlDbExpression.java
@@ -5,8 +5,4 @@ package io.ebeaninternal.server.expression.platform;
  */
 class MySqlDbExpression extends BasicDbExpression {
 
-  MySqlDbExpression(String concatOperator) {
-    super(concatOperator);
-  }
-
 }
diff --git a/src/main/java/io/ebeaninternal/server/expression/platform/OracleDbExpression.java b/src/main/java/io/ebeaninternal/server/expression/platform/OracleDbExpression.java
index 4347d2e80..168f01aaf 100644
--- a/src/main/java/io/ebeaninternal/server/expression/platform/OracleDbExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/platform/OracleDbExpression.java
@@ -9,10 +9,6 @@ import io.ebeaninternal.server.expression.Op;
  */
 public class OracleDbExpression extends BaseDbExpression {
 
-  OracleDbExpression(String concatOperator) {
-    super(concatOperator);
-  }
-
   @Override
   public void json(SpiExpressionRequest request, String propName, String path, Op operator, Object value) {
 
diff --git a/src/main/java/io/ebeaninternal/server/expression/platform/PostgresDbExpression.java b/src/main/java/io/ebeaninternal/server/expression/platform/PostgresDbExpression.java
index 4af9aa2f7..adac971b5 100644
--- a/src/main/java/io/ebeaninternal/server/expression/platform/PostgresDbExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/platform/PostgresDbExpression.java
@@ -8,10 +8,6 @@ import io.ebeaninternal.server.expression.Op;
  */
 public class PostgresDbExpression extends BaseDbExpression {
 
-  PostgresDbExpression(String concatOperator) {
-    super(concatOperator);
-  }
-
   @Override
   public void json(SpiExpressionRequest request, String propName, String path, Op operator, Object value) {
 
@@ -65,4 +61,16 @@ public class PostgresDbExpression extends BaseDbExpression {
       request.append(" <> 0");
     }
   }
+
+  @Override
+  public String concat(String property0, String separator, String property1, String suffix) {
+    StringBuilder sb = new StringBuilder();
+    sb.append("(").append(property0).append("||'").append(separator).append("'||").append(property1);
+
+    if (suffix != null && !suffix.isEmpty()) {
+      sb.append("||'").append(suffix).append('\'');
+    }
+    sb.append(')');
+    return sb.toString();
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/expression/platform/SqlServerDbExpression.java b/src/main/java/io/ebeaninternal/server/expression/platform/SqlServerDbExpression.java
index dc52066e3..98d76ec43 100644
--- a/src/main/java/io/ebeaninternal/server/expression/platform/SqlServerDbExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/platform/SqlServerDbExpression.java
@@ -8,10 +8,6 @@ import io.ebeaninternal.server.expression.Op;
  */
 public class SqlServerDbExpression extends BaseDbExpression {
 
-  SqlServerDbExpression(String concatOperator) {
-    super(concatOperator);
-  }
-
   @Override
   public void json(final SpiExpressionRequest request, final String propName,
                    final String path, final Op operator, final Object value) {
diff --git a/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java b/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
index 7f584c378..c9e698890 100644
--- a/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
+++ b/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
@@ -4,8 +4,6 @@ import io.ebean.BaseTestCase;
 import io.ebean.CacheMode;
 import io.ebean.Ebean;
 import io.ebean.Pairs;
-import io.ebean.annotation.IgnorePlatform;
-import io.ebean.annotation.Platform;
 import io.ebean.cache.ServerCache;
 import io.ebean.cache.ServerCacheManager;
 import io.ebean.cache.ServerCacheStatistics;
@@ -251,7 +249,6 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
     assertBeanCacheHitMiss(0, 0);
   }
 
-  @IgnorePlatform({Platform.MYSQL, Platform.SQLSERVER})
   @Test
   public void findList_inPairs_standardConcat() {
 
@@ -280,14 +277,15 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
     assertBeanCacheHitMiss(1, 0);
 
     if (isH2()) {
-      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and (t0.sku||'-'||t0.code) in (?, ? )  order by t0.sku desc; --bind(def,Array[2]={2-1000,3-1000})");
-    } else {
+      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and CONCAT(t0.sku,'-',t0.code) in (?, ? )  order by t0.sku desc; --bind(def,Array[2]={2-1000,3-1000})");
+    } else if (isPostgres()) {
       assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and (t0.sku||'-'||t0.code)");
+    } else {
+      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and CONCAT(t0.sku,'-',t0.code)");
     }
 
   }
 
-  @IgnorePlatform({Platform.MYSQL, Platform.SQLSERVER})
   @Test
   public void findList_inPairs_userConcat() {
 
@@ -318,9 +316,11 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
     assertBeanCacheHitMiss(1, 0);
 
     if (isH2()) {
-      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and (t0.sku||':'||t0.code||'-foo') in (?, ? )  order by t0.sku desc; --bind(def,Array[2]={2:1000-foo,3:1000-foo})");
-    } else {
+      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and CONCAT(t0.sku,':',t0.code,'-foo') in (?, ? )  order by t0.sku desc; --bind(def,Array[2]={2:1000-foo,3:1000-foo})");
+    } else if (isPostgres()){
       assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and (t0.sku||':'||t0.code||'-foo')");
+    } else {
+      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and CONCAT(t0.sku,':',t0.code,'-foo')");
     }
 
   }

From 0036473971478abd92afb3b7435872a60b8ac465 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 26 Sep 2018 21:23:14 +1200
Subject: [PATCH 0467/1036] #1489 - removed the concat-operator "||" and
 replaced with "concat()"

---
 .../server/expression/InPairsExpression.java              | 5 -----
 .../server/expression/platform/BaseDbExpression.java      | 3 +--
 .../model/basic/cache/TestCacheViaComplexNaturalKey3.java | 8 ++++----
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java b/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
index 9b2c5c5f1..2147af1a2 100644
--- a/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
@@ -92,11 +92,6 @@ class InPairsExpression extends AbstractExpression {
       return;
     }
 
-
-    StringBuilder sb = new StringBuilder();
-
-    request.getDbPlatformHandler().concat(property0, separator, property1, suffix);
-
     request.append(request.getDbPlatformHandler().concat(property0, separator, property1, suffix));
     request.appendInExpression(not, concatBindValues);
   }
diff --git a/src/main/java/io/ebeaninternal/server/expression/platform/BaseDbExpression.java b/src/main/java/io/ebeaninternal/server/expression/platform/BaseDbExpression.java
index 8879c84f4..40ae04a1d 100644
--- a/src/main/java/io/ebeaninternal/server/expression/platform/BaseDbExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/platform/BaseDbExpression.java
@@ -49,8 +49,7 @@ abstract class BaseDbExpression implements DbExpressionHandler {
   @Override
   public String concat(String property0, String separator, String property1, String suffix) {
     StringBuilder sb = new StringBuilder();
-    sb.append("CONCAT(").append(property0).append(",'").append(separator).append("',").append(property1);
-
+    sb.append("concat(").append(property0).append(",'").append(separator).append("',").append(property1);
     if (suffix != null && !suffix.isEmpty()) {
       sb.append(",'").append(suffix).append('\'');
     }
diff --git a/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java b/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
index c9e698890..9a42ea601 100644
--- a/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
+++ b/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
@@ -277,11 +277,11 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
     assertBeanCacheHitMiss(1, 0);
 
     if (isH2()) {
-      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and CONCAT(t0.sku,'-',t0.code) in (?, ? )  order by t0.sku desc; --bind(def,Array[2]={2-1000,3-1000})");
+      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and concat(t0.sku,'-',t0.code) in (?, ? )  order by t0.sku desc; --bind(def,Array[2]={2-1000,3-1000})");
     } else if (isPostgres()) {
       assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and (t0.sku||'-'||t0.code)");
     } else {
-      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and CONCAT(t0.sku,'-',t0.code)");
+      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and concat(t0.sku,'-',t0.code)");
     }
 
   }
@@ -316,11 +316,11 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
     assertBeanCacheHitMiss(1, 0);
 
     if (isH2()) {
-      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and CONCAT(t0.sku,':',t0.code,'-foo') in (?, ? )  order by t0.sku desc; --bind(def,Array[2]={2:1000-foo,3:1000-foo})");
+      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and concat(t0.sku,':',t0.code,'-foo') in (?, ? )  order by t0.sku desc; --bind(def,Array[2]={2:1000-foo,3:1000-foo})");
     } else if (isPostgres()){
       assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and (t0.sku||':'||t0.code||'-foo')");
     } else {
-      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and CONCAT(t0.sku,':',t0.code,'-foo')");
+      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and concat(t0.sku,':',t0.code,'-foo')");
     }
 
   }

From b817d5ee4d05cf3045d01fdcc14da3881aa78555 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Wed, 26 Sep 2018 11:26:29 +0200
Subject: [PATCH 0468/1036] FIX: withQuote_when:_match for different platforms
 (#1490)

---
 .../deploy/DeployPropertyParserTest.java      | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java b/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java
index 1c387aa49..f7d40815d 100644
--- a/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java
@@ -1,6 +1,9 @@
 package io.ebeaninternal.server.deploy;
 
 import io.ebean.BaseTestCase;
+import io.ebean.annotation.ForPlatform;
+import io.ebean.annotation.Platform;
+
 import org.junit.Test;
 import org.tests.model.basic.Address;
 import org.tests.model.basic.BWithQIdent;
@@ -53,11 +56,26 @@ public class DeployPropertyParserTest extends BaseTestCase {
   }
 
   @Test
-  public void withQuote_when_match() {
+  @ForPlatform(value = {Platform.H2, Platform.POSTGRES})
+  public void withQuote_when_match_h2() {
     assertThat(withQuoteParser().parse("name like ?")).isEqualTo("${}\"Name\" like ?");
     assertThat(withQuoteParser().parse("t0.\"CODE\" like ?")).isEqualTo("t0.\"CODE\" like ?");
   }
 
+  @Test
+  @ForPlatform(value = Platform.SQLSERVER)
+  public void withQuote_when_match_sqlserver() {
+    assertThat(withQuoteParser().parse("name like ?")).isEqualTo("${}[Name] like ?");
+    assertThat(withQuoteParser().parse("t0.[CODE] like ?")).isEqualTo("t0.[CODE] like ?");
+  }
+
+  @Test
+  @ForPlatform(value = Platform.MYSQL)
+  public void withQuote_when_match_mysql() {
+    assertThat(withQuoteParser().parse("name like ?")).isEqualTo("${}`Name` like ?");
+    assertThat(withQuoteParser().parse("t0.`CODE` like ?")).isEqualTo("t0.`CODE` like ?");
+  }
+
   @Test
   public void unknown_path() {
     assertThat(parser().parse(" foo ")).isEqualTo(" foo ");

From 9734ae57875ce688d8c9bab5d4c0558ac5507e4a Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 26 Sep 2018 21:33:27 +1200
Subject: [PATCH 0469/1036] #1490 - FIX: withQuote_when_match for different
 platforms

---
 .../io/ebeaninternal/server/deploy/DeployParser.java  |  5 +++--
 .../server/deploy/DeployPropertyParserTest.java       | 11 +++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java b/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java
index a5e71183e..ecbfeb0a8 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java
@@ -25,6 +25,7 @@ public abstract class DeployParser {
   protected static final char OPEN_SQUARE_BRACKET = '[';
   protected static final char CLOSE_SQUARE_BRACKET = ']';
   protected static final char DOUBLE_QUOTE = '\"';
+  protected static final char BACK_QUOTE = '`';
 
   /**
    * Used to determine when a column name terminates.
@@ -187,10 +188,10 @@ public abstract class DeployParser {
       wordBuffer.append(ch);
       return false;
     }
-    return Character.isLetterOrDigit(ch) || ch == UNDERSCORE || ch == PERIOD || ch == DOUBLE_QUOTE || ch == CLOSE_SQUARE_BRACKET;
+    return Character.isLetterOrDigit(ch) || ch == UNDERSCORE || ch == PERIOD || ch == DOUBLE_QUOTE || ch == CLOSE_SQUARE_BRACKET || ch == BACK_QUOTE;
   }
 
   private boolean isWordStart(char ch) {
-    return Character.isLetter(ch) || ch == UNDERSCORE || ch == DOUBLE_QUOTE || ch == OPEN_SQUARE_BRACKET;
+    return Character.isLetter(ch) || ch == UNDERSCORE || ch == DOUBLE_QUOTE || ch == OPEN_SQUARE_BRACKET || ch == BACK_QUOTE;
   }
 }
diff --git a/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java b/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java
index f7d40815d..bb7d4e20a 100644
--- a/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java
@@ -3,7 +3,6 @@ package io.ebeaninternal.server.deploy;
 import io.ebean.BaseTestCase;
 import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
-
 import org.junit.Test;
 import org.tests.model.basic.Address;
 import org.tests.model.basic.BWithQIdent;
@@ -55,25 +54,29 @@ public class DeployPropertyParserTest extends BaseTestCase {
     assertThat(addressParser().parse("concat(line1, line2, '-EA')")).isEqualTo("concat(${}line_1, ${}line_2, '-EA')");
   }
 
+  @Test
+  public void withExplicitQuote_all_platforms() {
+    assertThat(withQuoteParser().parse("t0.`CODE` like ?")).isEqualTo("t0.`CODE` like ?");
+    assertThat(withQuoteParser().parse("t0.[CODE] like ?")).isEqualTo("t0.[CODE] like ?");
+    assertThat(withQuoteParser().parse("t0.\"CODE\" like ?")).isEqualTo("t0.\"CODE\" like ?");
+  }
+
   @Test
   @ForPlatform(value = {Platform.H2, Platform.POSTGRES})
   public void withQuote_when_match_h2() {
     assertThat(withQuoteParser().parse("name like ?")).isEqualTo("${}\"Name\" like ?");
-    assertThat(withQuoteParser().parse("t0.\"CODE\" like ?")).isEqualTo("t0.\"CODE\" like ?");
   }
 
   @Test
   @ForPlatform(value = Platform.SQLSERVER)
   public void withQuote_when_match_sqlserver() {
     assertThat(withQuoteParser().parse("name like ?")).isEqualTo("${}[Name] like ?");
-    assertThat(withQuoteParser().parse("t0.[CODE] like ?")).isEqualTo("t0.[CODE] like ?");
   }
 
   @Test
   @ForPlatform(value = Platform.MYSQL)
   public void withQuote_when_match_mysql() {
     assertThat(withQuoteParser().parse("name like ?")).isEqualTo("${}`Name` like ?");
-    assertThat(withQuoteParser().parse("t0.`CODE` like ?")).isEqualTo("t0.`CODE` like ?");
   }
 
   @Test

From 6a616144302b4bb78ed87c724ba077fee314446c Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 26 Sep 2018 23:38:42 +1200
Subject: [PATCH 0470/1036] [maven-release-plugin] prepare release
 ebean-11.22.6

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5b056dc3f..116b59e48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.22.6-SNAPSHOT</version>
+  <version>11.22.6</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.22.6</tag>
   </scm>
 
   <profiles>

From 3409f264ece552efcecf721e47c14fee8c92b174 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 26 Sep 2018 23:38:57 +1200
Subject: [PATCH 0471/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 116b59e48..c6f265724 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.22.6</version>
+  <version>11.22.7-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.22.6</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 57056d7abd391e6399e72dba2cf70c2af898db59 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 28 Sep 2018 16:33:54 +1200
Subject: [PATCH 0472/1036] #1496 - Query label lost for findId()

---
 .../java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index da8a39f51..b2f294b02 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -768,6 +768,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     copy.timeout = timeout;
     copy.mapKey = mapKey;
     copy.id = id;
+    copy.label = label;
     copy.useBeanCache = useBeanCache;
     copy.useQueryCache = useQueryCache;
     copy.readOnly = readOnly;

From 2c044301853b50cabeb0fb0bd750dec4614453c4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 4 Oct 2018 17:14:53 +1300
Subject: [PATCH 0473/1036] No effective change - add
 testSoftDelete_includeSoftDeletes_findOne

---
 .../model/history/TestHistoryExclude.java     | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/tests/model/history/TestHistoryExclude.java b/src/test/java/org/tests/model/history/TestHistoryExclude.java
index 4193b6323..0132f9d7f 100644
--- a/src/test/java/org/tests/model/history/TestHistoryExclude.java
+++ b/src/test/java/org/tests/model/history/TestHistoryExclude.java
@@ -30,7 +30,7 @@ public class TestHistoryExclude extends BaseTestCase {
   }
 
   @Test
-  public void testSoftDelete() {
+  public void testSoftDelete_includeSoftDeletes_findList() {
 
     HeLink l = new HeLink("two", "boo");
     Ebean.save(l);
@@ -44,6 +44,23 @@ public class TestHistoryExclude extends BaseTestCase {
     assertThat(list).isNotEmpty();
   }
 
+  @Test
+  public void testSoftDelete_includeSoftDeletes_findOne() {
+
+    HeLink l = new HeLink("three", "boo2");
+    Ebean.save(l);
+
+    Ebean.delete(l);
+
+    HeLink found = Ebean.find(HeLink.class)
+      .setId(l.getId())
+      .setIncludeSoftDeletes()
+      .findOne();
+
+    assertThat(found).isNotNull();
+    assertThat(found.getName()).isEqualTo("three");
+  }
+
   @Test
   public void testLazyLoad() {
 

From c27749ae2d2d6a18c5c5b54c433f2e9b51904633 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 4 Oct 2018 19:59:36 +1300
Subject: [PATCH 0474/1036] #1497 - SQL Error with @History + @SoftDelete +
 @OneToOne fetch=FetchType.EAGER

---
 .../java/io/ebeaninternal/api/SpiQuery.java   | 23 +++++--
 .../server/query/CQueryBuilder.java           |  2 +-
 .../org/tests/model/history/HsdSetting.java   | 62 +++++++++++++++++++
 .../java/org/tests/model/history/HsdUser.java | 54 ++++++++++++++++
 .../TestHistorySoftDeleteOneToOne.java        | 27 ++++++++
 5 files changed, 162 insertions(+), 6 deletions(-)
 create mode 100644 src/test/java/org/tests/model/history/HsdSetting.java
 create mode 100644 src/test/java/org/tests/model/history/HsdUser.java
 create mode 100644 src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java

diff --git a/src/main/java/io/ebeaninternal/api/SpiQuery.java b/src/main/java/io/ebeaninternal/api/SpiQuery.java
index ae8b83805..24d625f47 100644
--- a/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -134,27 +134,40 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
     /**
      * Includes soft deletes rows in the result.
      */
-    SOFT_DELETED,
+    SOFT_DELETED(false),
 
     /**
      * Query runs against draft tables.
      */
-    DRAFT,
+    DRAFT(false),
 
     /**
      * Query runs against current data (normal).
      */
-    CURRENT,
+    CURRENT(false),
 
     /**
      * Query runs potentially returning many versions of the same bean.
      */
-    VERSIONS,
+    VERSIONS(true),
 
     /**
      * Query runs 'As Of' a given date time.
      */
-    AS_OF;
+    AS_OF(true);
+
+    private final boolean history;
+
+    TemporalMode(boolean history) {
+      this.history = history;
+    }
+
+    /**
+     * Return true if this is a history query.
+     */
+    public boolean isHistory() {
+      return history;
+    }
 
     /**
      * Return the mode of the query of if null return CURRENT mode.
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 8fb718024..43f4275f0 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -217,7 +217,7 @@ class CQueryBuilder {
    * Return the history support if this query needs it (is a 'as of' type query).
    */
   <T> CQueryHistorySupport getHistorySupport(SpiQuery<T> query) {
-    return query.getTemporalMode() != SpiQuery.TemporalMode.CURRENT ? historySupport : null;
+    return query.getTemporalMode().isHistory() ? historySupport : null;
   }
 
   /**
diff --git a/src/test/java/org/tests/model/history/HsdSetting.java b/src/test/java/org/tests/model/history/HsdSetting.java
new file mode 100644
index 000000000..26cfc30d9
--- /dev/null
+++ b/src/test/java/org/tests/model/history/HsdSetting.java
@@ -0,0 +1,62 @@
+package org.tests.model.history;
+
+import io.ebean.annotation.History;
+import io.ebean.annotation.SoftDelete;
+import org.tests.model.draftable.BaseDomain;
+
+import javax.persistence.Entity;
+import javax.persistence.OneToOne;
+
+@History
+@Entity
+public class HsdSetting extends BaseDomain {
+
+  String key;
+  String val;
+
+  @SoftDelete
+  boolean deleted;
+
+  @OneToOne
+  private HsdUser user;
+
+
+  public HsdSetting(String key) {
+    this.key = key;
+  }
+
+  public HsdSetting() {
+  }
+
+  public String getKey() {
+    return key;
+  }
+
+  public void setKey(String key) {
+    this.key = key;
+  }
+
+  public String getVal() {
+    return val;
+  }
+
+  public void setVal(String val) {
+    this.val = val;
+  }
+
+  public boolean isDeleted() {
+    return deleted;
+  }
+
+  public void setDeleted(boolean deleted) {
+    this.deleted = deleted;
+  }
+
+  public HsdUser getUser() {
+    return user;
+  }
+
+  public void setUser(HsdUser user) {
+    this.user = user;
+  }
+}
diff --git a/src/test/java/org/tests/model/history/HsdUser.java b/src/test/java/org/tests/model/history/HsdUser.java
new file mode 100644
index 000000000..377bcf4ee
--- /dev/null
+++ b/src/test/java/org/tests/model/history/HsdUser.java
@@ -0,0 +1,54 @@
+package org.tests.model.history;
+
+import io.ebean.annotation.History;
+import io.ebean.annotation.SoftDelete;
+import org.tests.model.draftable.BaseDomain;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.OneToOne;
+
+@History
+@Entity
+public class HsdUser extends BaseDomain {
+
+  String name;
+
+  @SoftDelete
+  boolean deleted;
+
+  @OneToOne(mappedBy = "user", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+  HsdSetting setting;
+
+  public HsdUser(String name) {
+    this.name = name;
+  }
+
+  public HsdUser() {
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public boolean isDeleted() {
+    return deleted;
+  }
+
+  public void setDeleted(boolean deleted) {
+    this.deleted = deleted;
+  }
+
+  public HsdSetting getSetting() {
+    return setting;
+  }
+
+  public void setSetting(HsdSetting setting) {
+    this.setting = setting;
+  }
+}
diff --git a/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java b/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java
new file mode 100644
index 000000000..36ba5d279
--- /dev/null
+++ b/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java
@@ -0,0 +1,27 @@
+package org.tests.model.history;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestHistorySoftDeleteOneToOne extends BaseTestCase {
+
+  @Test
+  public void findOne() {
+
+    HsdUser u1 = new HsdUser("u1");
+
+    Ebean.save(u1);
+    Ebean.delete(u1);
+
+    HsdUser one = Ebean.find(HsdUser.class)
+      .setId(u1.getId())
+      .setIncludeSoftDeletes()
+      .findOne();
+
+    assertThat(one).isNotNull();
+
+  }
+}

From f8b9ca2034137959705165856edf437b4a1b4f1f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 4 Oct 2018 20:26:00 +1300
Subject: [PATCH 0475/1036] #1498 - findIds() with @SoftDelete bean returns all
 Ids (when soft deleted ones should not return)

---
 .../server/query/CQueryBuilder.java           | 17 +++++++---
 .../tests/softdelete/TestSoftDeleteBasic.java | 32 +++++++++++++++++--
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 43f4275f0..e1f4b2249 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -138,11 +138,14 @@ class CQueryBuilder {
     // wrap as - delete from table where id in (select id ...)
     String sql = buildSql(null, request, predicates, sqlTree).getSql();
     sql = request.getBeanDescriptor().getDeleteByIdInSql() + "in (" + sql + ")";
-    String alias = (rootTableAlias == null) ? "t0" : rootTableAlias;
-    sql = aliasReplace(sql, alias);
+    sql = aliasReplace(sql, alias(rootTableAlias));
     return sql;
   }
 
+  private String alias(String rootTableAlias) {
+    return (rootTableAlias == null) ? "t0" : rootTableAlias;
+  }
+
   private <T> String buildUpdateSql(OrmQueryRequest<T> request, String rootTableAlias, CQueryPredicates predicates, SqlTree sqlTree) {
 
     StringBuilder sb = new StringBuilder(200);
@@ -160,8 +163,7 @@ class CQueryBuilder {
     // wrap as - update table set ... where id in (select id ...)
     String sql = buildSqlUpdate(null, request, predicates, sqlTree).getSql();
     sql = updateClause + " " + request.getBeanDescriptor().getWhereIdInSql() + "in (" + sql + ")";
-    String alias = (rootTableAlias == null) ? "t0" : rootTableAlias;
-    sql = aliasReplace(sql, alias);
+    sql = aliasReplace(sql, alias(rootTableAlias));
     return sql;
   }
 
@@ -209,7 +211,12 @@ class CQueryBuilder {
    */
   <T> CQueryFetchSingleAttribute buildFetchIdsQuery(OrmQueryRequest<T> request) {
 
-    request.getQuery().setSelectId();
+    SpiQuery<T> query = request.getQuery();
+    query.setSelectId();
+    BeanDescriptor<T> desc = request.getBeanDescriptor();
+    if (desc.isSoftDelete()) {
+      query.addSoftDeletePredicate(desc.getSoftDeletePredicate(alias(query.getAlias())));
+    }
     return buildFetchAttributeQuery(request);
   }
 
diff --git a/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java b/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
index d15698cda..511e68fd3 100644
--- a/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
+++ b/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
@@ -6,11 +6,10 @@ import io.ebean.Query;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
 import io.ebean.Transaction;
-
-import org.tests.model.softdelete.EBasicSDChild;
-import org.tests.model.softdelete.EBasicSoftDelete;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
+import org.tests.model.softdelete.EBasicSDChild;
+import org.tests.model.softdelete.EBasicSoftDelete;
 
 import java.util.List;
 
@@ -18,6 +17,33 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestSoftDeleteBasic extends BaseTestCase {
 
+  @Test
+  public void testFindIdsWhenIncludeSoftDeletedChlld() {
+
+    EBasicSoftDelete bean = new EBasicSoftDelete();
+    bean.setName("softDelChildren");
+    bean.addChild("child1", 10);
+    bean.addChild("child2", 20);
+    bean.addChild("child3", 30);
+
+    Ebean.save(bean);
+    Ebean.delete(bean.getChildren().get(0));
+
+    LoggedSqlCollector.start();
+
+    List<Object> ids = Ebean.find(EBasicSDChild.class).where().eq("owner", bean).findIds();
+    assertThat(ids).hasSize(2);
+
+    List<EBasicSDChild> beans = Ebean.find(EBasicSDChild.class).where().eq("owner", bean).findList();
+    assertThat(beans).hasSize(2);
+
+    List<String> sql = LoggedSqlCollector.stop();
+
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("from ebasic_sdchild t0 where t0.owner_id = ?  and t0.deleted = false");
+    assertThat(sql.get(1)).contains("from ebasic_sdchild t0 where t0.owner_id = ?  and t0.deleted = false");
+  }
+
   @Test
   public void test() {
 

From 31093babe370bf09fe7708a24e158ac83ef797c3 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 4 Oct 2018 20:49:30 +1300
Subject: [PATCH 0476/1036] #1498 - findIds() with @SoftDelete bean returns all
 Ids (when soft deleted ones should not return)

And fix delete permanent that cascades
---
 .../server/deploy/BeanPropertyAssocMany.java         |  6 +++---
 .../server/deploy/BeanPropertyAssocManySqlHelp.java  | 12 ++++++++----
 .../server/persist/DefaultPersister.java             |  4 ++--
 .../io/ebeaninternal/server/query/CQueryBuilder.java |  2 +-
 .../server/deploy/BeanPropertyAssocManyTest.java     |  4 ++--
 ...TestOnCascadeDeleteChildrenWithCompositeKeys.java |  4 ++--
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index 0eaf2ae01..2058f0e56 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -318,11 +318,11 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   /**
    * Find the Id's of detail beans given a parent Id or list of parent Id's.
    */
-  public List<Object> findIdsByParentId(Object parentId, List<Object> parentIdList, Transaction t, List<Object> excludeDetailIds) {
+  public List<Object> findIdsByParentId(Object parentId, List<Object> parentIdList, Transaction t, List<Object> excludeDetailIds, boolean hard) {
     if (parentId != null) {
-      return sqlHelp.findIdsByParentId(parentId, t, excludeDetailIds);
+      return sqlHelp.findIdsByParentId(parentId, t, excludeDetailIds, hard);
     } else {
-      return sqlHelp.findIdsByParentIdList(parentIdList, t, excludeDetailIds);
+      return sqlHelp.findIdsByParentIdList(parentIdList, t, excludeDetailIds, hard);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java
index 3b3426aa3..7f58aa511 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java
@@ -127,14 +127,16 @@ class BeanPropertyAssocManySqlHelp<T> {
     many.bindParentIdsIn(expr, parentIds, query);
   }
 
-  List<Object> findIdsByParentId(Object parentId, Transaction t, List<Object> excludeDetailIds) {
+  List<Object> findIdsByParentId(Object parentId, Transaction t, List<Object> excludeDetailIds, boolean hard) {
 
     String rawWhere = deriveWhereParentIdSql(false, "");
 
     SpiEbeanServer server = descriptor.getEbeanServer();
     SpiQuery<?> q = many.newQuery(server);
     many.bindParentIdEq(rawWhere, parentId, q);
-
+    if (hard) {
+      q.setIncludeSoftDeletes();
+    }
     if (excludeDetailIds != null && !excludeDetailIds.isEmpty()) {
       q.where().not(q.getExpressionFactory().idIn(excludeDetailIds));
     }
@@ -142,7 +144,7 @@ class BeanPropertyAssocManySqlHelp<T> {
     return server.findIds(q, t);
   }
 
-  List<Object> findIdsByParentIdList(List<Object> parentIds, Transaction t, List<Object> excludeDetailIds) {
+  List<Object> findIdsByParentIdList(List<Object> parentIds, Transaction t, List<Object> excludeDetailIds, boolean hard) {
 
     String rawWhere = deriveWhereParentIdSql(true, "");
     String inClause = buildInClauseBinding(parentIds.size(), exportedPropertyBindProto);
@@ -153,7 +155,9 @@ class BeanPropertyAssocManySqlHelp<T> {
     SpiQuery<?> q = many.newQuery(server);
     //Query<?> q = server.find(propertyType);
     many.bindParentIdsIn(expr, parentIds, q);
-
+    if (hard) {
+      q.setIncludeSoftDeletes();
+    }
     if (excludeDetailIds != null && !excludeDetailIds.isEmpty()) {
       q.where().not(q.getExpressionFactory().idIn(excludeDetailIds));
     }
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 0e402dcdc..884997f65 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -754,7 +754,7 @@ public final class DefaultPersister implements Persister {
               executeSqlUpdate(sqlDelete, t);
             } else {
               // we need to fetch the Id's to delete (recurse or notify L2 cache)
-              List<Object> childIds = many.findIdsByParentId(id, idList, t, null);
+              List<Object> childIds = many.findIdsByParentId(id, idList, t, null, deleteMode.isHard());
               if (!childIds.isEmpty()) {
                 delete(targetDesc, null, childIds, t, deleteMode);
               }
@@ -1052,7 +1052,7 @@ public final class DefaultPersister implements Persister {
         } else {
           // Delete recurse using the Id values of the children
           Object parentId = desc.getId(parentBean);
-          List<Object> idsByParentId = many.findIdsByParentId(parentId, null, t, excludeDetailIds);
+          List<Object> idsByParentId = many.findIdsByParentId(parentId, null, t, excludeDetailIds, deleteMode.isHard());
           if (!idsByParentId.isEmpty()) {
             deleteChildrenById(t, targetDesc, idsByParentId, deleteMode);
           }
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index e1f4b2249..a58c7b6ec 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -214,7 +214,7 @@ class CQueryBuilder {
     SpiQuery<T> query = request.getQuery();
     query.setSelectId();
     BeanDescriptor<T> desc = request.getBeanDescriptor();
-    if (desc.isSoftDelete()) {
+    if (!query.isIncludeSoftDeletes() && desc.isSoftDelete()) {
       query.addSoftDeletePredicate(desc.getSoftDeletePredicate(alias(query.getAlias())));
     }
     return buildFetchAttributeQuery(request);
diff --git a/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java b/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java
index 162832e76..ff35bf77e 100644
--- a/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java
+++ b/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java
@@ -72,9 +72,9 @@ public class BeanPropertyAssocManyTest extends BaseTestCase {
     customerIds.add(1L);
     customerIds.add(2L);
 
-    List<Object> contactIdsForOne = contacts().findIdsByParentId(1L, null, null, null);
+    List<Object> contactIdsForOne = contacts().findIdsByParentId(1L, null, null, null, true);
 
-    List<Object> contactIdsForMultiple = contacts().findIdsByParentId(null, customerIds, null, null);
+    List<Object> contactIdsForMultiple = contacts().findIdsByParentId(null, customerIds, null, null, true);
 
     assertThat(contactIdsForOne).isNotEmpty();
     assertThat(contactIdsForMultiple).isNotEmpty();
diff --git a/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java b/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java
index 08cde0802..095313e33 100644
--- a/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java
+++ b/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java
@@ -85,8 +85,8 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase {
     ids.add(1L);
     ids.add(2L);
 
-    beanProperty.findIdsByParentId(null, ids, null, null);
-    beanProperty.findIdsByParentId(1L, null, null, null);
+    beanProperty.findIdsByParentId(null, ids, null, null, true);
+    beanProperty.findIdsByParentId(1L, null, null, null, true);
   }
 
   @Entity

From 5b09443cdf0544c26f053bd86ffca94101ba7e07 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 4 Oct 2018 22:10:06 +1300
Subject: [PATCH 0477/1036] [maven-release-plugin] prepare release
 ebean-11.22.7

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c6f265724..4741079d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.22.7-SNAPSHOT</version>
+  <version>11.22.7</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.22.7</tag>
   </scm>
 
   <profiles>

From 9a6d33944916d5e1727a09d41db54f2e7ef3b93a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 4 Oct 2018 22:10:24 +1300
Subject: [PATCH 0478/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4741079d3..443584bd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.22.7</version>
+  <version>11.22.8-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.22.7</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From fc26765a7e9d138164d8a2bc5e5b7ee35bdcc343 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 4 Oct 2018 22:51:51 +1300
Subject: [PATCH 0479/1036] #1499 - findNative with findIds (or
 findSingleAttributeList with id property) throws
 ArrayIndexOutOfBoundsException

---
 .../server/query/SqlTreeNodeBean.java         |  5 ++-
 .../server/querydefn/DefaultOrmQuery.java     |  1 +
 .../org/tests/query/TestQueryFindNative.java  | 31 +++++++++++++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
index 9bafd1317..c67d58600 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
@@ -148,7 +148,10 @@ class SqlTreeNodeBean implements SqlTreeNode {
   public ScalarType<?> getSingleAttributeScalarType() {
     if (properties == null || properties.length == 0) {
       // if we have no property ask first children (in a distinct select with join)
-      // if we have also no children, NPE happens anyway.
+      if (children.length == 0) {
+        // expected to be a findIds query
+        return desc.getIdBinder().getBeanProperty().getScalarType();
+      }
       return children[0].getSingleAttributeScalarType();
     }
     if (properties[0] instanceof STreePropertyAssocOne) {
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index b2f294b02..fb3be3605 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -769,6 +769,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     copy.mapKey = mapKey;
     copy.id = id;
     copy.label = label;
+    copy.nativeSql = nativeSql;
     copy.useBeanCache = useBeanCache;
     copy.useQueryCache = useQueryCache;
     copy.readOnly = readOnly;
diff --git a/src/test/java/org/tests/query/TestQueryFindNative.java b/src/test/java/org/tests/query/TestQueryFindNative.java
index 734eb1c76..12dc45a6f 100644
--- a/src/test/java/org/tests/query/TestQueryFindNative.java
+++ b/src/test/java/org/tests/query/TestQueryFindNative.java
@@ -1,6 +1,7 @@
 package org.tests.query;
 
 import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
 import org.junit.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
@@ -13,6 +14,36 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class TestQueryFindNative extends BaseTestCase {
 
 
+  @Test
+  public void findIds() {
+
+    ResetBasicData.reset();
+
+    String sql = "select c.id from contact c where c.first_name like ? ";
+
+    List<Integer> ids = Ebean.createSqlQuery(sql)
+      .setParameter(1, "J%")
+      .findSingleAttributeList(Integer.class);
+
+    List<Integer> idsScalar =
+      server()
+        .findNative(Contact.class, sql)
+        .setParameter(1, "J%")
+        .findSingleAttributeList();
+
+    List<Integer> nativeIds =
+      server()
+        .findNative(Contact.class, sql)
+        .setParameter(1, "J%")
+        .findIds();
+
+
+    assertThat(nativeIds).isNotEmpty();
+    assertThat(nativeIds).containsAll(ids);
+    assertThat(idsScalar).containsAll(ids);
+  }
+
+
   @Test
   public void joinFromManyToOne() {
 

From b5eec9399540593fec4d57020eb27a3fd57f6d75 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 5 Oct 2018 10:41:40 +1300
Subject: [PATCH 0480/1036] #1500 - Improve Postgres 10 partitioning support,
 easier to create multiple indexes on each partition

---
 .../dbmigration/builtin-extra-ddl-partitioning.xml     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl-partitioning.xml b/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl-partitioning.xml
index 237e563cb..678ab367b 100644
--- a/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl-partitioning.xml
+++ b/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl-partitioning.xml
@@ -36,6 +36,9 @@ create or replace function _partition_create(meta partition_meta, extra text)
 language plpgsql
 set timezone to 'UTC'
 as $$
+declare
+  idx_col  text;
+  idx_name text;
 begin
 
   execute format('create table if not exists %I partition of %I for values from (''%s'') TO (''%s'')', meta.part_name, meta.base_name, meta.period_start, meta.period_end);
@@ -45,7 +48,12 @@ begin
   end if;
 
   if (length(meta.index_column) > 0) then
-    execute format('create index if not exists ix_%I_%s ON %I (%I)', meta.part_name, meta.index_column, meta.part_name, meta.index_column);
+    -- delimited for multiple indexes
+    foreach idx_col in array regexp_split_to_array(meta.index_column,';')
+    loop
+      idx_name = replace(idx_col, ',', '_');
+      execute format('create index if not exists ix_%I_%s ON %I (%s)', meta.part_name, idx_name, meta.part_name, idx_col);
+    end loop;
   end if;
 
   if (length(extra) > 0) then

From da95ec0c05d65368f5d8d74619b45999af5879d4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 5 Oct 2018 11:26:42 +1300
Subject: [PATCH 0481/1036] #1501 - Change logging for
 io.ebeaninternal.dbmigration.DefaultDbMigration to
 "io.ebean.GenerateMigration"

---
 .../java/io/ebeaninternal/dbmigration/DefaultDbMigration.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index b73812955..122899571 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -65,7 +65,7 @@ import java.util.List;
  */
 public class DefaultDbMigration implements DbMigration {
 
-  protected static final Logger logger = LoggerFactory.getLogger(DefaultDbMigration.class);
+  protected static final Logger logger = LoggerFactory.getLogger("io.ebean.GenerateMigration");
 
   private static final String initialVersion = "1.0";
 

From 54b56846280136c3b4f703596acf2087e60bd158 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 5 Oct 2018 12:22:25 +1300
Subject: [PATCH 0482/1036] #1502 - findNative build query to findPagedList,
 the query count is incorrect.

---
 .../server/querydefn/DefaultOrmQuery.java     |  2 +-
 .../org/tests/query/TestQueryFindNative.java  | 80 +++++++++++++++++++
 2 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index fb3be3605..e64ab5c79 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1051,7 +1051,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   CQueryPlanKey createQueryPlanKey() {
 
     if (isNativeSql()) {
-      queryPlanKey = new NativeSqlQueryPlanKey(nativeSql + "-" + firstRow + "-" + maxRows);
+      queryPlanKey = new NativeSqlQueryPlanKey(type.ordinal() + nativeSql + "-" + firstRow + "-" + maxRows);
     } else {
       queryPlanKey = new OrmQueryPlanKey(planDescription(), maxRows, firstRow, rawSql);
     }
diff --git a/src/test/java/org/tests/query/TestQueryFindNative.java b/src/test/java/org/tests/query/TestQueryFindNative.java
index 12dc45a6f..4ad221231 100644
--- a/src/test/java/org/tests/query/TestQueryFindNative.java
+++ b/src/test/java/org/tests/query/TestQueryFindNative.java
@@ -2,6 +2,8 @@ package org.tests.query;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.PagedList;
+import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
@@ -14,6 +16,84 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class TestQueryFindNative extends BaseTestCase {
 
 
+  @Test
+  public void findCount() {
+
+    ResetBasicData.reset();
+    String sql = "select n.id from contact n where n.first_name like ?";
+
+    LoggedSqlCollector.start();
+
+    int rowCount = server()
+      .findNative(Contact.class, sql)
+      .setParameter(1, "J%")
+      .findCount();
+
+    List<Integer> nativeIds =
+      server()
+        .findNative(Contact.class, sql)
+        .setParameter(1, "J%")
+        .findIds();
+
+    List<String> loggedSql = LoggedSqlCollector.stop();
+
+    assertThat(nativeIds).hasSize(rowCount);
+
+    assertThat(loggedSql).hasSize(2);
+    assertThat(loggedSql.get(0)).contains("select count(*) from ( select n.id from contact n where n.first_name like ?)");
+    assertThat(loggedSql.get(1)).startsWith("select n.id from contact n where n.first_name like ?");
+  }
+
+  @Test
+  public void findPagedList() {
+
+    ResetBasicData.reset();
+    String sql = "select n.id, n.first_name from contact n where n.first_name like ?";
+
+    PagedList<Contact> pagedList = server()
+      .findNative(Contact.class, sql)
+      .setParameter(1, "J%")
+      .setMaxRows(100)
+      .findPagedList();
+
+    LoggedSqlCollector.start();
+
+    int listSize = pagedList.getList().size();
+    int totalCount = pagedList.getTotalCount();
+
+    List<String> loggedSql = LoggedSqlCollector.stop();
+
+    assertThat(listSize).isEqualTo(totalCount);
+
+    assertThat(loggedSql).hasSize(2);
+    assertThat(loggedSql.get(0)).startsWith("select n.id, n.first_name from contact n where n.first_name like ?");
+    assertThat(loggedSql.get(1)).contains("select count(*) from ( select n.id, n.first_name from contact n where n.first_name like ?)");
+  }
+
+
+  @Test
+  public void findPagedList_withColumnAlias() {
+
+    ResetBasicData.reset();
+    String sql = "select n.id, 'SillyName' first_name from contact n where n.id < ? ";
+
+    PagedList<Contact> pagedList = server()
+      .findNative(Contact.class, sql)
+      .setParameter(1, 100)
+      .setMaxRows(100)
+      .findPagedList();
+
+    int listSize = pagedList.getList().size();
+    int totalCount = pagedList.getTotalCount();
+
+    assertThat(listSize).isEqualTo(totalCount);
+
+    for (Contact contact : pagedList.getList()) {
+      assertThat(contact.getFirstName()).isEqualTo("SillyName");
+    }
+  }
+
+
   @Test
   public void findIds() {
 

From 0371043914fde1d09af482ebfd6e8961a303c607 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 5 Oct 2018 13:04:15 +1300
Subject: [PATCH 0483/1036] [maven-release-plugin] prepare release
 ebean-11.22.8

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 443584bd5..adf45a5a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.22.8-SNAPSHOT</version>
+  <version>11.22.8</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.22.8</tag>
   </scm>
 
   <profiles>

From 82e68d7756dcbc5b6db24939849f882130818c87 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 5 Oct 2018 13:04:31 +1300
Subject: [PATCH 0484/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index adf45a5a4..b0267aa03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.22.8</version>
+  <version>11.22.9-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.22.8</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From b87e360ac77cc1d11c3fbb6476508b39584bffa4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 12 Oct 2018 18:49:20 +1300
Subject: [PATCH 0485/1036] #1504 - ENH: Add SqlUpdate executeNow() method ...
 that executes now regardless of transaction batch mode

---
 src/main/java/io/ebean/SqlUpdate.java         | 10 ++++++
 .../io/ebeaninternal/api/SpiEbeanServer.java  |  4 +++
 .../server/core/DefaultServer.java            |  5 +++
 .../server/core/DefaultSqlUpdate.java         |  9 +++++
 .../server/core/PersistRequestUpdateSql.java  | 15 +++++---
 .../ebeaninternal/server/core/Persister.java  |  7 +++-
 .../server/persist/DefaultPersister.java      |  5 +++
 .../ebeaninternal/api/TDSpiEbeanServer.java   |  5 +++
 .../org/tests/update/TestSqlUpdateInTxn.java  | 36 +++++++++++++++++++
 9 files changed, 90 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/ebean/SqlUpdate.java b/src/main/java/io/ebean/SqlUpdate.java
index 9884c095c..27e7be39e 100644
--- a/src/main/java/io/ebean/SqlUpdate.java
+++ b/src/main/java/io/ebean/SqlUpdate.java
@@ -98,6 +98,11 @@ public interface SqlUpdate {
   /**
    * Execute the update returning the number of rows modified.
    * <p>
+   * Note that if the transaction has batch mode on then this update will use JDBC batch and may not execute until
+   * later - at commit time or a transaction flush. In this case this method returns -1 indicating that the
+   * update has been batched for later execution.
+   * </p>
+   * <p>
    * After you have executed the SqlUpdate you can bind new variables using
    * {@link #setParameter(String, Object)} etc and then execute the SqlUpdate
    * again.
@@ -112,6 +117,11 @@ public interface SqlUpdate {
    */
   int execute();
 
+  /**
+   * Execute the statement now regardless of the JDBC batch mode of the transaction.
+   */
+  int executeNow();
+
   /**
    * Execute when addBatch() has been used to batch multiple bind executions.
    *
diff --git a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
index 1971b4b24..f1936cf94 100644
--- a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
+++ b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
@@ -312,4 +312,8 @@ public interface SpiEbeanServer extends ExtendedServer, EbeanServer, BeanLoader,
    */
   int[] executeBatch(SpiSqlUpdate defaultSqlUpdate, SpiTransaction transaction);
 
+  /**
+   * Execute the sql update regardless of transaction batch mode.
+   */
+  int executeNow(SpiSqlUpdate sqlUpdate);
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 2a7c4e1cc..be4693ff7 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -2054,6 +2054,11 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return persister.executeSqlUpdate(updSql, t);
   }
 
+  @Override
+  public int executeNow(SpiSqlUpdate sqlUpdate) {
+    return persister.executeSqlUpdateNow(sqlUpdate, null);
+  }
+
   @Override
   public void addBatch(SpiSqlUpdate sqlUpdate, SpiTransaction transaction) {
     persister.addBatch(sqlUpdate, transaction);
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java b/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
index d9d4e6500..4ea9a06b0 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
@@ -133,6 +133,15 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
     }
   }
 
+  @Override
+  public int executeNow() {
+    if (server != null) {
+      return server.executeNow(this);
+    } else {
+      throw new IllegalStateException("server is null?");
+    }
+  }
+
   @Override
   public int[] executeBatch() {
     if (server == null) {
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
index 6aa17970c..289592cbe 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
@@ -28,18 +28,23 @@ public final class PersistRequestUpdateSql extends PersistRequest {
 
   private boolean addBatch;
 
-  /**
-   * Create.
-   */
+  private boolean forceNoBatch;
+
   public PersistRequestUpdateSql(SpiEbeanServer server, SpiSqlUpdate sqlUpdate,
-                                 SpiTransaction t, PersistExecute persistExecute) {
+                                 SpiTransaction t, PersistExecute persistExecute, boolean forceNoBatch) {
 
     super(server, t, persistExecute, sqlUpdate.getLabel());
     this.type = Type.UPDATESQL;
     this.updateSql = sqlUpdate;
+    this.forceNoBatch = forceNoBatch;
     updateSql.reset();
   }
 
+  public PersistRequestUpdateSql(SpiEbeanServer server, SpiSqlUpdate sqlUpdate,
+                                 SpiTransaction t, PersistExecute persistExecute) {
+    this(server, sqlUpdate, t, persistExecute, false);
+  }
+
   @Override
   public void profile(long offset, int flushCount) {
     profileBase(EVT_UPDATESQL, offset, (short)0, flushCount);
@@ -60,7 +65,7 @@ public final class PersistRequestUpdateSql extends PersistRequest {
 
   @Override
   public boolean isBatchThisRequest() {
-    return addBatch || super.isBatchThisRequest();
+    return !forceNoBatch && (addBatch || super.isBatchThisRequest());
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/core/Persister.java b/src/main/java/io/ebeaninternal/server/core/Persister.java
index c64daaa4e..a1b9eedbe 100644
--- a/src/main/java/io/ebeaninternal/server/core/Persister.java
+++ b/src/main/java/io/ebeaninternal/server/core/Persister.java
@@ -74,10 +74,15 @@ public interface Persister {
   int executeOrmUpdate(Update<?> update, Transaction t);
 
   /**
-   * Execute the UpdateSql.
+   * Execute the SqlUpdate (taking into account transaction batch mode).
    */
   int executeSqlUpdate(SqlUpdate update, Transaction t);
 
+  /**
+   * Execute the SqlUpdate now regardless of transaction batch mode.
+   */
+  int executeSqlUpdateNow(SpiSqlUpdate update, Transaction t);
+
   /**
    * Execute the CallableSql.
    */
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 884997f65..14f3b937b 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -150,6 +150,11 @@ public final class DefaultPersister implements Persister {
     return executeOrQueue(new PersistRequestUpdateSql(server, (SpiSqlUpdate) updSql, (SpiTransaction) t, persistExecute));
   }
 
+  @Override
+  public int executeSqlUpdateNow(SpiSqlUpdate updSql, Transaction t) {
+    return executeOrQueue(new PersistRequestUpdateSql(server, updSql, (SpiTransaction) t, persistExecute, true));
+  }
+
   /**
    * Restore draft beans to match live beans given the query.
    */
diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index d52327463..2100f8d7c 100644
--- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -854,6 +854,11 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
     return 0;
   }
 
+  @Override
+  public int executeNow(SpiSqlUpdate sqlUpdate) {
+    return 0;
+  }
+
   @Override
   public void addBatch(SpiSqlUpdate sqlUpdate, SpiTransaction transaction) {
 
diff --git a/src/test/java/org/tests/update/TestSqlUpdateInTxn.java b/src/test/java/org/tests/update/TestSqlUpdateInTxn.java
index e306e477d..673f72b01 100644
--- a/src/test/java/org/tests/update/TestSqlUpdateInTxn.java
+++ b/src/test/java/org/tests/update/TestSqlUpdateInTxn.java
@@ -3,6 +3,7 @@ package org.tests.update;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.SqlUpdate;
+import io.ebean.Transaction;
 import io.ebean.meta.MetaTimedMetric;
 import org.junit.Assert;
 import org.junit.Test;
@@ -38,6 +39,41 @@ public class TestSqlUpdateInTxn extends BaseTestCase {
     }
   }
 
+  @Test
+  public void testExecute_inTransaction_withBatch() {
+
+    try (Transaction transaction = Ebean.beginTransaction()) {
+      transaction.setBatchMode(true);
+
+      int row = Ebean.createSqlUpdate("update audit_log set description = description where id = ?")
+        .setParameter(1, 999999)
+        .execute();
+
+      // update statement using JDBC batch so not executed yet
+      assertThat(row).isEqualTo(-1);
+
+      transaction.commit();
+    }
+
+  }
+
+  @Test
+  public void testExecuteNow_inTransaction_withBatch() {
+
+    try (Transaction transaction = Ebean.beginTransaction()) {
+      transaction.setBatchMode(true);
+
+      int row = Ebean.createSqlUpdate("update audit_log set description = description where id = ?")
+        .setParameter(1, 999999)
+        .executeNow();
+
+      // update statement executed even though JDBC batch mode is on
+      assertThat(row).isEqualTo(0);
+
+      transaction.commit();
+    }
+  }
+
   @Test
   public void testSqlUpdateWithWhitespace() {
 

From 15cab24848c65707f9dc9bf817799f24bcbb09ec Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 12 Oct 2018 20:33:59 +1300
Subject: [PATCH 0486/1036] #1504 - ENH: Add SqlUpdate executeNow() method ...
 that executes now regardless of transaction batch mode

Add test for UpdateQuery (which executes immediately regardless)
---
 src/test/java/io/ebean/UpdateQueryTest.java | 26 +++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/test/java/io/ebean/UpdateQueryTest.java b/src/test/java/io/ebean/UpdateQueryTest.java
index 00498227d..583341517 100644
--- a/src/test/java/io/ebean/UpdateQueryTest.java
+++ b/src/test/java/io/ebean/UpdateQueryTest.java
@@ -42,6 +42,32 @@ public class UpdateQueryTest extends BaseTestCase {
     assertThat(ormQueryMetrics.get(0).getLabel()).isEqualTo("updateActive");
   }
 
+  @Test
+  public void update_withTransactionBatch() {
+
+    EbeanServer server = server();
+
+    try (Transaction transaction = server.beginTransaction()) {
+      transaction.setBatchMode(true);
+
+      UpdateQuery<Customer> update = server.update(Customer.class);
+
+      Query<Customer> query = update
+        .set("status", Customer.Status.ACTIVE)
+        .set("updtime", new Timestamp(System.currentTimeMillis()))
+        .where()
+        .eq("status", Customer.Status.NEW)
+        .gt("id", 99999)
+        .query();
+
+      // update executes now regardless of transaction batch mode
+      int rows = query.update();
+      assertThat(rows).isEqualTo(0);
+
+      transaction.commit();
+    }
+  }
+
   @Test
   @IgnorePlatform(Platform.SQLSERVER)
   public void withTableAlias() {

From de9823b69bc7d053fb724a619b1e40b1315d5882 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 12 Oct 2018 22:30:06 +1300
Subject: [PATCH 0487/1036] #1505 - Unidirectional @OneToOne orphanRemoval=true
 ... does not delete orphan that is replaced

---
 .../server/core/PersistRequestBean.java       | 21 ++++++++++++
 .../deploy/parse/AnnotationAssocOnes.java     |  2 ++
 .../server/persist/DefaultPersister.java      | 21 +++++++++---
 .../onetoone/TestOneToOneOrphanStringId.java  | 32 +++++++++++++++++++
 4 files changed, 72 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index 9a8d0f23b..44e5a32ad 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -19,6 +19,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanManager;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
+import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty;
 import io.ebeaninternal.server.deploy.id.ImportedId;
 import io.ebeaninternal.server.persist.BatchControl;
@@ -131,6 +132,11 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    */
   private boolean[] dirtyProperties;
 
+  /**
+   * Imported OneToOne orphan that needs to be deleted.
+   */
+  private EntityBean orphanBean;
+
   /**
    * Flag set when request is added to JDBC batch.
    */
@@ -1377,4 +1383,19 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
       changeSet.addBeanUpdate(beanDescriptor, idValue, changes, updateNaturalKey, getVersion());
     }
   }
+
+  /**
+   * Set an orphan bean that needs to be deleted AFTER the request has persisted.
+   */
+  public void setImportedOrphanForRemoval(BeanPropertyAssocOne<?> prop) {
+    Object orphan = getOrigValue(prop);
+    if (orphan instanceof EntityBean) {
+      orphanBean = (EntityBean)orphan;
+    }
+  }
+
+  public EntityBean getImportedOrphanForRemoval() {
+    return orphanBean;
+  }
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index bb0bac37d..add0870e8 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -229,6 +229,8 @@ public class AnnotationAssocOnes extends AnnotationParser {
     if (!"".equals(propAnn.mappedBy())) {
       prop.setOneToOneExported();
       prop.setOrphanRemoval(propAnn.orphanRemoval());
+    } else if (propAnn.orphanRemoval()) {
+      prop.setOrphanRemoval(true);
     }
 
     setCascadeTypes(propAnn.cascade(), prop.getCascadeInfo());
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 14f3b937b..fea311ad1 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -901,6 +901,11 @@ public final class DefaultPersister implements Persister {
     BeanDescriptor<?> desc = request.getBeanDescriptor();
     SpiTransaction t = request.getTransaction();
 
+    EntityBean orphanForRemoval = request.getImportedOrphanForRemoval();
+    if (orphanForRemoval != null) {
+      delete(orphanForRemoval, request.getTransaction(), true);
+    }
+
     // exported ones with cascade save
     for (BeanPropertyAssocOne<?> prop : desc.propertiesOneExportedSave()) {
       // check for partial beans
@@ -1097,6 +1102,10 @@ public final class DefaultPersister implements Persister {
     // imported ones with save cascade
     for (BeanPropertyAssocOne<?> prop : desc.propertiesOneImportedSave()) {
       // check for partial objects
+      if (prop.isOrphanRemoval() && request.isDirtyProperty(prop)) {
+        request.setImportedOrphanForRemoval(prop);
+      }
+
       if (request.isLoadedProperty(prop)) {
         EntityBean detailBean = prop.getValueAsEntityBean(request.getEntityBean());
         if (detailBean != null
@@ -1113,14 +1122,18 @@ public final class DefaultPersister implements Persister {
 
     for (BeanPropertyAssocOne<?> prop : desc.propertiesOneExportedSave()) {
       if (prop.isOrphanRemoval() && request.isDirtyProperty(prop)) {
-        Object origValue = request.getOrigValue(prop);
-        if (origValue instanceof EntityBean) {
-          delete((EntityBean) origValue, request.getTransaction(), true);
-        }
+        deleteOrphan(request, prop);
       }
     }
   }
 
+  private void deleteOrphan(PersistRequestBean<?> request, BeanPropertyAssocOne<?> prop) {
+    Object origValue = request.getOrigValue(prop);
+    if (origValue instanceof EntityBean) {
+      delete((EntityBean) origValue, request.getTransaction(), true);
+    }
+  }
+
   /**
    * Support for loading any Imported Associated One properties that are not
    * loaded but required for Delete cascade.
diff --git a/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java b/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java
index 1a16f50d6..5f7a6f3f4 100644
--- a/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java
+++ b/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java
@@ -61,6 +61,38 @@ public class TestOneToOneOrphanStringId extends BaseTestCase {
     assertThat(deletes.get(0)).contains("delete from oto_atwo");
     assertThat(deletes.get(1)).contains("delete from oto_aone");
   }
+
+  @Test
+  public void test_remove() {
+
+    OtoAtwo b = new OtoAtwo("b3", "b test");
+    Ebean.save(b);
+
+    OtoAone a = new OtoAone("a3", "a test");
+    b.setAone(a);
+
+    Ebean.save(b);
+
+    LoggedSqlCollector.start();
+
+    OtoAone a2 = new OtoAone("a4", "a test");
+    b.setAone(a2);
+    Ebean.save(b);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(3);
+    assertThat(sql.get(0)).contains("insert into oto_aone");
+    assertThat(sql.get(1)).contains("update oto_atwo set aone_id=? where id=?");
+    assertThat(sql.get(2)).contains("delete from oto_aone where id=?");
+
+    Ebean.delete(b);
+
+    List<String> deletes = LoggedSqlCollector.stop();
+    assertThat(deletes).hasSize(2);
+    assertThat(deletes.get(0)).contains("delete from oto_atwo");
+    assertThat(deletes.get(1)).contains("delete from oto_aone");
+
+  }
 }
 
 

From 283943477350a42d76ed11c9613bcdd2fe809d59 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 13 Oct 2018 00:23:44 +1300
Subject: [PATCH 0488/1036] #1506 - @ElementCollection DDL generates 2 indexes
 on the same column

---
 .../dbmigration/model/build/ModelBuildElementTable.java        | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildElementTable.java b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildElementTable.java
index 94a2526a8..0cbf2f2a4 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildElementTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildElementTable.java
@@ -24,9 +24,6 @@ public class ModelBuildElementTable {
 
     VisitAllUsing.visitOne(targetDescriptor, new ModelBuildPropertyVisitor(ctx, table, targetDescriptor));
 
-    ctx.fkeyBuilder(table)
-      .addForeignKey(manyProp.getBeanDescriptor(), manyProp.getTableJoin(), true);
-
     ctx.addTable(table);
   }
 

From aa7325b24960aa9810399737050af366bfcb2abb Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 15 Oct 2018 22:12:39 +1300
Subject: [PATCH 0489/1036] #1507 - SqlUpdate.execute PersistenceException is
 not translated into more specific exception (like DuplicateKeyException)

---
 .../server/core/PersistRequest.java           | 10 +++
 .../server/persist/ExeUpdateSql.java          |  4 +-
 .../tests/update/TestSqlUpdateExceptions.java | 72 +++++++++++++++++++
 3 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/org/tests/update/TestSqlUpdateExceptions.java

diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequest.java b/src/main/java/io/ebeaninternal/server/core/PersistRequest.java
index 102bfa07d..42b8efae0 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequest.java
@@ -8,6 +8,9 @@ import io.ebeaninternal.server.persist.BatchPostExecute;
 import io.ebeaninternal.server.persist.BatchedSqlException;
 import io.ebeaninternal.server.persist.PersistExecute;
 
+import javax.persistence.PersistenceException;
+import java.sql.SQLException;
+
 /**
  * Wraps all the objects used to persist a bean.
  */
@@ -95,6 +98,13 @@ public abstract class PersistRequest extends BeanRequest implements BatchPostExe
     return transaction.isBatchThisRequest();
   }
 
+  /**
+   * Translate the SQLException into a specific exception given the platform.
+   */
+  public PersistenceException translateSqlException(SQLException e) {
+    return transaction.translate(e.getMessage(), e);
+  }
+
   /**
    * Execute the statement.
    */
diff --git a/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java b/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java
index 88879458d..01bacb57b 100644
--- a/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java
+++ b/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java
@@ -55,8 +55,8 @@ class ExeUpdateSql {
         request.postExecute();
         return rowCount;
       }
-    } catch (SQLException ex) {
-      throw new PersistenceException(ex);
+    } catch (SQLException e) {
+      throw request.translateSqlException(e);
 
     } finally {
       if (!batchThisRequest) {
diff --git a/src/test/java/org/tests/update/TestSqlUpdateExceptions.java b/src/test/java/org/tests/update/TestSqlUpdateExceptions.java
new file mode 100644
index 000000000..20007ce7e
--- /dev/null
+++ b/src/test/java/org/tests/update/TestSqlUpdateExceptions.java
@@ -0,0 +1,72 @@
+package org.tests.update;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DuplicateKeyException;
+import io.ebean.Ebean;
+import io.ebean.SqlUpdate;
+import io.ebean.Transaction;
+import org.junit.Test;
+
+import java.util.UUID;
+
+public class TestSqlUpdateExceptions extends BaseTestCase {
+
+  private String sql = "insert into uuone (id, name, version) values (?,?,?)";
+
+  @Test(expected = DuplicateKeyException.class)
+  public void duplicateKey() {
+
+    UUID id = UUID.randomUUID();
+
+    SqlUpdate sqlUpdate = Ebean.createSqlUpdate(sql);
+    sqlUpdate.setParameter(1, id);
+    sqlUpdate.setParameter(2, "hi");
+    sqlUpdate.setParameter(3, 1);
+    sqlUpdate.execute();
+
+    sqlUpdate.setParameter(1, id);
+    sqlUpdate.setParameter(2, "fail");
+    sqlUpdate.setParameter(3, 1);
+    sqlUpdate.execute();
+  }
+
+  @Test(expected = DuplicateKeyException.class)
+  public void duplicateKey_executeNow() {
+
+
+    UUID id = UUID.randomUUID();
+
+    SqlUpdate sqlUpdate = Ebean.createSqlUpdate(sql);
+    sqlUpdate.setParameter(1, id);
+    sqlUpdate.setParameter(2, "hi");
+    sqlUpdate.setParameter(3, 1);
+    sqlUpdate.executeNow();
+
+    sqlUpdate.setParameter(1, id);
+    sqlUpdate.setParameter(2, "fail");
+    sqlUpdate.setParameter(3, 1);
+    sqlUpdate.executeNow();
+  }
+
+  @Test(expected = DuplicateKeyException.class)
+  public void duplicateKey_inBatch() {
+
+    UUID id = UUID.randomUUID();
+
+    try (Transaction transaction = Ebean.beginTransaction()) {
+
+      SqlUpdate sqlUpdate = Ebean.createSqlUpdate(sql);
+      sqlUpdate.setParameter(1, id);
+      sqlUpdate.setParameter(2, "hi in batch");
+      sqlUpdate.setParameter(3, 1);
+      sqlUpdate.addBatch();
+
+      sqlUpdate.setParameter(1, id);
+      sqlUpdate.setParameter(2, "fail in batch");
+      sqlUpdate.setParameter(3, 1);
+      sqlUpdate.addBatch();
+
+      transaction.commit();
+    }
+  }
+}

From 9d643527713fd9e511fde7fe78ff2b5cd4fd805b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 15 Oct 2018 22:13:18 +1300
Subject: [PATCH 0490/1036] No effective change - add additional tests

---
 .../java/org/tests/cache/TestBeanCache.java   | 12 ++++++
 .../tests/softdelete/TestSoftDeleteBasic.java | 39 +++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/src/test/java/org/tests/cache/TestBeanCache.java b/src/test/java/org/tests/cache/TestBeanCache.java
index 11a726475..2419d3b3c 100644
--- a/src/test/java/org/tests/cache/TestBeanCache.java
+++ b/src/test/java/org/tests/cache/TestBeanCache.java
@@ -2,6 +2,7 @@ package org.tests.cache;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import org.tests.model.basic.Country;
 import org.tests.model.basic.OCachedBean;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
@@ -41,4 +42,15 @@ public class TestBeanCache extends BaseTestCase {
     assertThat(sql).isEmpty();
 
   }
+
+  @Test
+  public void find_whenNotExits() {
+
+    Country country = Ebean.find(Country.class)
+      .where()
+      .eq("name","NotValid")
+      .findOne();
+
+    assertThat(country).isNull();
+  }
 }
diff --git a/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java b/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
index 511e68fd3..6240c49cd 100644
--- a/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
+++ b/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
@@ -14,9 +14,48 @@ import org.tests.model.softdelete.EBasicSoftDelete;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
 
 public class TestSoftDeleteBasic extends BaseTestCase {
 
+  @Test
+  public void testCascadeSaveDelete_other() {
+
+    EBasicSoftDelete bean = new EBasicSoftDelete();
+    bean.setName("cascadeOne");
+    bean.addChild("child1", 10);
+    bean.addChild("child2", 20);
+    bean.addChild("child3", 30);
+    bean.addNoSoftDeleteChild("nsd1", 101);
+    bean.addNoSoftDeleteChild("nsd2", 102);
+
+    Ebean.save(bean);
+
+    assertEquals(new Long(1), bean.getVersion());
+    assertEquals(new Long(1), bean.getChildren().get(0).getVersion());
+
+    LoggedSqlCollector.start();
+
+    Ebean.delete(bean);
+
+//    List<String> loggedSql = LoggedSqlCollector.stop();
+//
+//    assertEquals(new Long(2), bean.getVersion());
+//    assertEquals(new Long(2), bean.getChildren().get(0).getVersion()); // Fails with 1
+//
+//    // The children without SoftDelete are left as is (so no third statement)
+//    assertThat(loggedSql).hasSize(2);
+//
+//    // first statement is a single bulk update of the children with SoftDelete
+//    assertThat(loggedSql.get(0)).contains("update ebasic_sdchild set deleted=");
+//    assertThat(loggedSql.get(0)).contains("where owner_id = ?");
+//
+//    // second statement is the top level bean
+//    assertThat(loggedSql.get(1)).contains(
+//      "update ebasic_soft_delete set version=?, deleted=? where id=? and version=?");
+
+  }
+
   @Test
   public void testFindIdsWhenIncludeSoftDeletedChlld() {
 

From 3eaf47fd7058334de2a075b8433901ffda39bc04 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 15 Oct 2018 22:25:38 +1300
Subject: [PATCH 0491/1036] No effective change - add additional tests

---
 .../server/persist/ExeCallableSql.java        |  2 +-
 src/test/java/io/ebean/UpdateQueryTest.java   | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java b/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java
index 3bc2dc3d2..b48d2d2cf 100644
--- a/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java
+++ b/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java
@@ -48,7 +48,7 @@ class ExeCallableSql {
       }
 
     } catch (SQLException ex) {
-      throw new PersistenceException(ex);
+      throw request.translateSqlException(ex);
 
     } finally {
       if (!batchThisRequest) {
diff --git a/src/test/java/io/ebean/UpdateQueryTest.java b/src/test/java/io/ebean/UpdateQueryTest.java
index 583341517..31285feb5 100644
--- a/src/test/java/io/ebean/UpdateQueryTest.java
+++ b/src/test/java/io/ebean/UpdateQueryTest.java
@@ -7,6 +7,7 @@ import io.ebean.meta.MetaOrmQueryMetric;
 import org.junit.Test;
 import org.tests.model.basic.Country;
 import org.tests.model.basic.Customer;
+import org.tests.model.basic.EBasicWithUniqueCon;
 
 import java.sql.Timestamp;
 import java.util.List;
@@ -225,4 +226,27 @@ public class UpdateQueryTest extends BaseTestCase {
 
     assertThat(rows).isEqualTo(0);
   }
+
+  @Test(expected = DuplicateKeyException.class)
+  public void exceptionTranslation() {
+
+    newEbasicWithUnique("o1","other1_a");
+    Integer id = newEbasicWithUnique("o2", "other1_b");
+
+    Ebean.update(EBasicWithUniqueCon.class)
+      .set("other", "other1_a")
+      .set("otherOne", "other1_a")
+      .where().idEq(id)
+      .update();
+  }
+
+  private Integer newEbasicWithUnique(String name, String other) {
+    EBasicWithUniqueCon b0 = new EBasicWithUniqueCon();
+    b0.setName(name);
+    b0.setOther(other);
+    b0.setOtherOne(other);
+    Ebean.save(b0);
+
+    return b0.getId();
+  }
 }

From 2646e8c27fa24ca4a293c3dcd19306e4e4db789f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 15 Oct 2018 22:30:42 +1300
Subject: [PATCH 0492/1036] #1507 - SqlUpdate.execute PersistenceException is
 not translated into more specific exception (like DuplicateKeyException)

Support for sqlUpdate.executeBatch()
---
 .../server/persist/DefaultPersister.java      |  2 +-
 .../tests/update/TestSqlUpdateExceptions.java | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index fea311ad1..2a1651660 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -137,7 +137,7 @@ public final class DefaultPersister implements Persister {
     try {
       return batchControl.execute(sqlUpdate.getSql(), sqlUpdate.isGetGeneratedKeys());
     } catch (SQLException e) {
-      throw new PersistenceException(e);
+      throw transaction.translate(e.getMessage(), e);
     }
   }
 
diff --git a/src/test/java/org/tests/update/TestSqlUpdateExceptions.java b/src/test/java/org/tests/update/TestSqlUpdateExceptions.java
index 20007ce7e..7296811f2 100644
--- a/src/test/java/org/tests/update/TestSqlUpdateExceptions.java
+++ b/src/test/java/org/tests/update/TestSqlUpdateExceptions.java
@@ -69,4 +69,27 @@ public class TestSqlUpdateExceptions extends BaseTestCase {
       transaction.commit();
     }
   }
+
+  @Test(expected = DuplicateKeyException.class)
+  public void duplicateKey_executeBatch() {
+
+    UUID id = UUID.randomUUID();
+
+    try (Transaction transaction = Ebean.beginTransaction()) {
+
+      SqlUpdate sqlUpdate = Ebean.createSqlUpdate(sql);
+      sqlUpdate.setParameter(1, id);
+      sqlUpdate.setParameter(2, "hi in batch");
+      sqlUpdate.setParameter(3, 1);
+      sqlUpdate.addBatch();
+
+      sqlUpdate.setParameter(1, id);
+      sqlUpdate.setParameter(2, "fail in batch");
+      sqlUpdate.setParameter(3, 1);
+      sqlUpdate.addBatch();
+      int[] ints = sqlUpdate.executeBatch();
+
+      transaction.commit();
+    }
+  }
 }

From 249cc5df4968d51793ca0029bc4c608a6d0b9450 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 15 Oct 2018 22:35:12 +1300
Subject: [PATCH 0493/1036] [maven-release-plugin] prepare release
 ebean-11.22.9

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b0267aa03..b44674332 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.22.9-SNAPSHOT</version>
+  <version>11.22.9</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.22.9</tag>
   </scm>
 
   <profiles>

From 6fd76ff697a4f9a8d5b6e88d4368b50f15230702 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 15 Oct 2018 22:35:28 +1300
Subject: [PATCH 0494/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b44674332..ba5c0f8d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.22.9</version>
+  <version>11.22.10-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.22.9</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 8160d1f01cb5660deaa464a03c21430ce1a31e9d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 19 Oct 2018 15:56:39 +1300
Subject: [PATCH 0495/1036] #1508 - Invalid SQL used to fetch identity value
 for @Draftable with database platform that uses Identity but not
 getGeneratedKeys

---
 .../ebean/config/dbplatform/DbIdentity.java   |   8 +-
 .../server/core/PersistRequestBean.java       |   6 +
 .../server/deploy/BeanDescriptor.java         |  13 ++-
 .../server/deploy/BeanDescriptorManager.java  |   5 +-
 .../deploy/meta/DeployBeanDescriptor.java     |   8 +-
 .../server/persist/dml/InsertHandler.java     |  13 +--
 .../server/persist/dml/InsertMeta.java        |  20 ++--
 .../config/PlatformNoGeneratedKeysTest.java   | 103 ++++++++++++++++++
 .../model/draftable/BasicDraftableBean.java   |  32 ++++++
 src/test/resources/extra-ddl.xml              |   2 +-
 10 files changed, 182 insertions(+), 28 deletions(-)
 create mode 100644 src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java
 create mode 100644 src/test/java/org/tests/model/draftable/BasicDraftableBean.java

diff --git a/src/main/java/io/ebean/config/dbplatform/DbIdentity.java b/src/main/java/io/ebean/config/dbplatform/DbIdentity.java
index af1f4574c..c57626b3f 100644
--- a/src/main/java/io/ebean/config/dbplatform/DbIdentity.java
+++ b/src/main/java/io/ebean/config/dbplatform/DbIdentity.java
@@ -8,7 +8,9 @@ import java.util.regex.Pattern;
  */
 public class DbIdentity {
 
-  private static final Pattern TABLE_REPLACE = Pattern.compile("{table}", Pattern.LITERAL);
+  private static final String TABLE_PLACEHOLDER = "{table}";
+
+  private static final Pattern TABLE_REPLACE = Pattern.compile(TABLE_PLACEHOLDER, Pattern.LITERAL);
 
   /**
    * Set if this DB supports sequences. Note some DB's support both Sequences
@@ -53,7 +55,9 @@ public class DbIdentity {
     if (selectLastInsertedIdTemplate == null) {
       return null;
     }
-
+    if (!selectLastInsertedIdTemplate.contains(TABLE_PLACEHOLDER)) {
+      return selectLastInsertedIdTemplate;
+    }
     return TABLE_REPLACE.matcher(selectLastInsertedIdTemplate).replaceAll(Matcher.quoteReplacement(table));
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index 44e5a32ad..acaa7c57d 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -1398,4 +1398,10 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
     return orphanBean;
   }
 
+  /**
+   * Return the SQL used to fetch the last inserted id value.
+   */
+  public String getSelectLastInsertedId() {
+    return beanDescriptor.getSelectLastInsertedId(publish);
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index f114970f9..6f951ab87 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -182,6 +182,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * getGeneratedKeys is not supported.
    */
   private final String selectLastInsertedId;
+  private final String selectLastInsertedIdDraft;
 
   private final boolean autoTunable;
 
@@ -473,6 +474,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     this.sequenceInitialValue = deploy.getSequenceInitialValue();
     this.sequenceAllocationSize = deploy.getSequenceAllocationSize();
     this.selectLastInsertedId = deploy.getSelectLastInsertedId();
+    this.selectLastInsertedIdDraft = deploy.getSelectLastInsertedIdDraft();
     this.concurrencyMode = deploy.getConcurrencyMode();
     this.updateChangesOnly = deploy.isUpdateChangesOnly();
     this.indexDefinitions = deploy.getIndexDefinitions();
@@ -3086,8 +3088,15 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * supported.
    * </p>
    */
-  public String getSelectLastInsertedId() {
-    return selectLastInsertedId;
+  public String getSelectLastInsertedId(boolean publish) {
+    return publish ? selectLastInsertedId : selectLastInsertedIdDraft;
+  }
+
+  /**
+   * Return true if this bean uses a SQL select to fetch the last inserted id value.
+   */
+  public boolean supportsSelectLastInsertedId() {
+    return selectLastInsertedId != null;
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 470df5ac8..1083235cc 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -1387,9 +1387,10 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     }
 
     if (IdType.IDENTITY == desc.getIdType()) {
-      // used when getGeneratedKeys is not supported (SQL Server 2000)
+      // used when getGeneratedKeys is not supported (SQL Server 2000, SAP Hana)
       String selectLastInsertedId = dbIdentity.getSelectLastInsertedId(desc.getBaseTable());
-      desc.setSelectLastInsertedId(selectLastInsertedId);
+      String selectLastInsertedIdDraft = (!desc.isDraftable()) ? selectLastInsertedId : dbIdentity.getSelectLastInsertedId(desc.getDraftTable());
+      desc.setSelectLastInsertedId(selectLastInsertedId, selectLastInsertedIdDraft);
       return;
     }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index e6688c222..76a54220a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -126,6 +126,7 @@ public class DeployBeanDescriptor<T> {
    * Used with Identity columns but no getGeneratedKeys support.
    */
   private String selectLastInsertedId;
+  private String selectLastInsertedIdDraft;
 
   /**
    * The concurrency mode for beans of this type.
@@ -839,11 +840,16 @@ public class DeployBeanDescriptor<T> {
     return selectLastInsertedId;
   }
 
+  public String getSelectLastInsertedIdDraft() {
+    return selectLastInsertedIdDraft;
+  }
+
   /**
    * Set the SQL used to return the last inserted Id.
    */
-  public void setSelectLastInsertedId(String selectLastInsertedId) {
+  public void setSelectLastInsertedId(String selectLastInsertedId, String selectLastInsertedIdDraft) {
     this.selectLastInsertedId = selectLastInsertedId;
+    this.selectLastInsertedIdDraft = selectLastInsertedIdDraft;
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
index 8e7246730..70e2917c8 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
@@ -39,7 +39,7 @@ public class InsertHandler extends DmlHandler {
    * A SQL Select used to fetch back the Id where generatedKeys is not
    * supported.
    */
-  private String selectLastInsertedId;
+  private boolean useSelectLastInsertedId;
 
   /**
    * Create to handle the insert execution.
@@ -79,7 +79,7 @@ public class InsertHandler extends DmlHandler {
         useGeneratedKeys = true;
       } else {
         // use a query to get the last inserted id
-        selectLastInsertedId = meta.getSelectLastInsertedId();
+        useSelectLastInsertedId = meta.supportsSelectLastInsertedId();
       }
     }
 
@@ -117,8 +117,7 @@ public class InsertHandler extends DmlHandler {
   }
 
   /**
-   * Execute the insert in a normal non batch fashion. Additionally using
-   * getGeneratedKeys if required.
+   * Execute non batched insert additionally using getGeneratedKeys if required.
    */
   @Override
   public int execute() throws SQLException, OptimisticLockException {
@@ -127,7 +126,7 @@ public class InsertHandler extends DmlHandler {
       // get the auto-increment value back and set into the bean
       getGeneratedKeys();
 
-    } else if (selectLastInsertedId != null) {
+    } else if (useSelectLastInsertedId) {
       // fetch back the Id using a query
       fetchGeneratedKeyUsingSelect();
     }
@@ -167,12 +166,10 @@ public class InsertHandler extends DmlHandler {
    */
   private void fetchGeneratedKeyUsingSelect() throws SQLException {
 
-    Connection conn = transaction.getConnection();
-
     PreparedStatement stmt = null;
     ResultSet rset = null;
     try {
-      stmt = conn.prepareStatement(selectLastInsertedId);
+      stmt = transaction.getConnection().prepareStatement(persistRequest.getSelectLastInsertedId());
       rset = stmt.executeQuery();
       setGeneratedKey(rset);
     } finally {
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java b/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java
index ff11081aa..d38ae2952 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java
@@ -38,7 +38,7 @@ public final class InsertMeta {
   /**
    * Used for DB that do not support getGeneratedKeys.
    */
-  private final String selectLastInsertedId;
+  private final boolean supportsSelectLastInsertedId;
 
   private final Bindable shadowFKey;
 
@@ -69,7 +69,7 @@ public final class InsertMeta {
       this.sqlNullId = null;
       this.sqlDraftNullId = null;
       this.supportsGetGeneratedKeys = false;
-      this.selectLastInsertedId = null;
+      this.supportsSelectLastInsertedId = false;
 
     } else {
       // insert sql for db identity or sequence insert
@@ -77,11 +77,11 @@ public final class InsertMeta {
       if (id.getIdentityColumn() == null) {
         this.identityDbColumns = new String[]{};
         this.supportsGetGeneratedKeys = false;
-        this.selectLastInsertedId = null;
+        this.supportsSelectLastInsertedId = false;
       } else {
         this.identityDbColumns = new String[]{id.getIdentityColumn()};
         this.supportsGetGeneratedKeys = dbPlatform.getDbIdentity().isSupportsGetGeneratedKeys();
-        this.selectLastInsertedId = desc.getSelectLastInsertedId();
+        this.supportsSelectLastInsertedId = desc.supportsSelectLastInsertedId();
       }
       this.sqlNullId = genSql(true, tableName, false);
       this.sqlDraftNullId = desc.isDraftable() ? genSql(true, draftTableName, true) : sqlNullId;
@@ -116,15 +116,11 @@ public final class InsertMeta {
   }
 
   /**
-   * Returns sql that is used to fetch back the last inserted id. This will
-   * return null if it should not be used.
-   * <p>
-   * This is only for DB's that do not support getGeneratedKeys. For MS
-   * SQLServer 2000 this could return "SELECT (at)(at)IDENTITY as id".
-   * </p>
+   * Return true if we should use a SQL query to return the generated key.
+   * This can not be used with JDBC batch mode.
    */
-  public String getSelectLastInsertedId() {
-    return selectLastInsertedId;
+  public boolean supportsSelectLastInsertedId() {
+    return supportsSelectLastInsertedId;
   }
 
   /**
diff --git a/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java b/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java
new file mode 100644
index 000000000..857577a9c
--- /dev/null
+++ b/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java
@@ -0,0 +1,103 @@
+package io.ebean.config;
+
+import io.ebean.EbeanServer;
+import io.ebean.EbeanServerFactory;
+import io.ebean.Transaction;
+import io.ebean.annotation.Platform;
+import io.ebean.config.dbplatform.DbIdentity;
+import io.ebean.config.dbplatform.IdType;
+import io.ebean.config.dbplatform.h2.H2Platform;
+import org.junit.Test;
+import org.tests.model.basic.EBasicVer;
+import org.tests.model.draftable.BasicDraftableBean;
+
+import static org.assertj.core.api.StrictAssertions.assertThat;
+
+public class PlatformNoGeneratedKeysTest {
+
+  static EbeanServer server = testH2Server();
+
+  @Test
+  public void insertBatch_expect_noIdValuesFetched() {
+
+    EBasicVer b0 = new EBasicVer("a");
+    EBasicVer b1 = new EBasicVer("b");
+    EBasicVer b2 = new EBasicVer("c");
+
+    try (Transaction transaction = server.beginTransaction()) {
+      transaction.setBatchMode(true);
+
+      server.save(b0);
+      server.save(b1);
+      server.save(b2);
+
+      transaction.commit();
+    }
+
+    assertThat(b0.getId()).isNull();
+    assertThat(b1.getId()).isNull();
+    assertThat(b2.getId()).isNull();
+
+  }
+
+  @Test
+  public void insertNoBatch_expect_selectIdentity() {
+
+    EBasicVer b0 = new EBasicVer("one");
+    server.save(b0);
+
+    assertThat(b0.getId()).isNotNull();
+
+
+    BasicDraftableBean d0 = new BasicDraftableBean("done");
+    server.save(d0);
+
+    assertThat(d0.getId()).isNotNull();
+
+    server.publish(BasicDraftableBean.class, d0.getId());
+
+    BasicDraftableBean one = server.find(BasicDraftableBean.class, d0.getId());
+
+    assertThat(one.getName()).isEqualTo("done");
+    assertThat(one.isDraft()).isFalse();
+  }
+
+  private static EbeanServer testH2Server() {
+
+    ServerConfig config = new ServerConfig();
+    config.setName("h2_noGeneratedKeys");
+
+    OtherH2Platform platform = new OtherH2Platform();
+    DbIdentity dbIdentity = platform.getDbIdentity();
+    dbIdentity.setIdType(IdType.IDENTITY);
+    dbIdentity.setSupportsIdentity(true);
+    dbIdentity.setSupportsGetGeneratedKeys(false);
+    dbIdentity.setSupportsSequence(false);
+    dbIdentity.setSelectLastInsertedIdTemplate("select identity() --{table}");
+
+    config.setDatabasePlatform(platform);
+    config.getDataSourceConfig().setUsername("sa");
+    config.getDataSourceConfig().setPassword("");
+    config.getDataSourceConfig().setUrl("jdbc:h2:mem:withPCQuery;");
+    config.getDataSourceConfig().setDriver("org.h2.Driver");
+
+    config.setDisableL2Cache(true);
+    config.setDefaultServer(false);
+    config.setRegister(false);
+    config.setDdlGenerate(true);
+    config.setDdlRun(true);
+    config.getClasses().add(EBasicVer.class);
+    config.getClasses().add(BasicDraftableBean.class);
+
+
+    return EbeanServerFactory.create(config);
+  }
+
+  static class OtherH2Platform extends H2Platform {
+
+    OtherH2Platform() {
+      super();
+      this.platform = Platform.GENERIC;
+    }
+  }
+}
diff --git a/src/test/java/org/tests/model/draftable/BasicDraftableBean.java b/src/test/java/org/tests/model/draftable/BasicDraftableBean.java
new file mode 100644
index 000000000..98b79cb68
--- /dev/null
+++ b/src/test/java/org/tests/model/draftable/BasicDraftableBean.java
@@ -0,0 +1,32 @@
+package org.tests.model.draftable;
+
+import io.ebean.annotation.Draft;
+import io.ebean.annotation.Draftable;
+
+import javax.persistence.Entity;
+
+@Entity
+@Draftable
+public class BasicDraftableBean extends BaseDomain {
+
+  private String name;
+
+  @Draft
+  boolean draft;
+
+  public BasicDraftableBean(String name) {
+    this.name = name;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public boolean isDraft() {
+    return draft;
+  }
+}
diff --git a/src/test/resources/extra-ddl.xml b/src/test/resources/extra-ddl.xml
index 8ca843ad6..bb786221b 100644
--- a/src/test/resources/extra-ddl.xml
+++ b/src/test/resources/extra-ddl.xml
@@ -4,7 +4,7 @@
   <ddl-script name="order views" platforms="h2" drop="true">
       drop view order_agg_vw if exists;
   </ddl-script>
-  <ddl-script name="order views" platforms="generic,db2,h2,postgres,oracle,mysql">
+  <ddl-script name="order views" platforms="db2,h2,postgres,oracle,mysql">
 
     create or replace view order_agg_vw as
     select d.order_id, sum(d.order_qty * d.unit_price) as order_total,

From 29aa395cd40c9a3cdbdcca3832aeb7ae2605e653 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 19 Oct 2018 16:24:06 +1300
Subject: [PATCH 0496/1036] #1509 - DBMigration add ... List<String>
 getPendingDrops();

---
 .../io/ebean/dbmigration/DbMigration.java     |  6 +++++
 .../dbmigration/DefaultDbMigration.java       | 23 ++++++++++++++++---
 .../DbMigrationDropHistoryTest.java           |  7 ++++--
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/ebean/dbmigration/DbMigration.java b/src/main/java/io/ebean/dbmigration/DbMigration.java
index 1a1e0e9f6..8a9f3f427 100644
--- a/src/main/java/io/ebean/dbmigration/DbMigration.java
+++ b/src/main/java/io/ebean/dbmigration/DbMigration.java
@@ -7,6 +7,7 @@ import io.ebean.config.dbplatform.DatabasePlatform;
 
 import java.io.IOException;
 import java.util.Iterator;
+import java.util.List;
 import java.util.ServiceLoader;
 
 /**
@@ -147,6 +148,11 @@ public interface DbMigration {
    */
   void addDatabasePlatform(DatabasePlatform databasePlatform, String prefix);
 
+  /**
+   * Return the list of versions that contain pending drops.
+   */
+  List<String> getPendingDrops();
+
   /**
    * Generate the next migration xml file and associated apply and rollback sql scripts.
    * <p>
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index 122899571..bf662a91a 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -303,6 +303,23 @@ public class DefaultDbMigration implements DbMigration {
     }
   }
 
+  /**
+   * Return the versions containing pending drops.
+   */
+  public List<String> getPendingDrops() {
+    if (!online) {
+      DbOffline.setGenerateMigration();
+    }
+    setDefaults();
+    try {
+      return createRequest().getPendingDrops();
+    } finally {
+      if (!online) {
+        DbOffline.reset();
+      }
+    }
+  }
+
   /**
    * Load the configuration for each of the target platforms.
    */
@@ -494,6 +511,9 @@ public class DefaultDbMigration implements DbMigration {
     if (nextDrop != null) {
       return nextDrop;
     }
+    if (generatePendingDrop != null) {
+      return generatePendingDrop;
+    }
     return migrationConfig.getGeneratePendingDrop();
   }
 
@@ -595,9 +615,6 @@ public class DefaultDbMigration implements DbMigration {
       if (name != null) {
         migrationConfig.setName(name);
       }
-      if (generatePendingDrop != null) {
-        migrationConfig.setGeneratePendingDrop(generatePendingDrop);
-      }
     }
   }
 
diff --git a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java
index 10fd869d6..58b3a82bf 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java
@@ -2,7 +2,6 @@ package io.ebeaninternal.dbmigration;
 
 import io.ebean.EbeanServer;
 import io.ebean.EbeanServerFactory;
-import io.ebean.annotation.Platform;
 import io.ebean.config.ServerConfig;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -13,6 +12,7 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
+import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.StrictAssertions.assertThatThrownBy;
@@ -71,8 +71,11 @@ public class DbMigrationDropHistoryTest {
     assertThat(migration.generateMigration()).isNull(); // subsequent call
 
 
+    List<String> pendingDrops = migration.getPendingDrops();
+    assertThat(pendingDrops).contains("1.1");
 
-    System.setProperty("ddl.migration.pendingDropsFor", "1.1");
+    //System.setProperty("ddl.migration.pendingDropsFor", "1.1");
+    migration.setGeneratePendingDrop("1.1");
     assertThat(migration.generateMigration()).isEqualTo("1.2__dropsFor_1.1");
     assertThatThrownBy(()->migration.generateMigration())
       .isInstanceOf(IllegalArgumentException.class)

From 4c2e9ccacd19079811e61ffb94c71050d12f6712 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 19 Oct 2018 20:07:16 +1300
Subject: [PATCH 0497/1036] [maven-release-plugin] prepare release
 ebean-11.22.10

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ba5c0f8d8..41eb76e00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.22.10-SNAPSHOT</version>
+  <version>11.22.10</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.22.10</tag>
   </scm>
 
   <profiles>

From b1410cc660fae96c80f07cee6af4070d724e16bf Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 19 Oct 2018 20:07:32 +1300
Subject: [PATCH 0498/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 41eb76e00..b89db10dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.22.10</version>
+  <version>11.22.11-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.22.10</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 158ee9a0817c89f1a223f986af1cbe214efdd653 Mon Sep 17 00:00:00 2001
From: Jonathan Bregler <jonathan.bregler@sap.com>
Date: Wed, 24 Oct 2018 10:38:17 +0200
Subject: [PATCH 0499/1036] Add SAP HANA support (#1511)

---
 howto-test.md                                 |  15 ++
 pom.xml                                       |   9 +-
 .../config/dbplatform/DatabasePlatform.java   |  28 ++-
 .../dbplatform/hana/HanaBasicSqlLimiter.java  |  24 ++
 .../dbplatform/hana/HanaHistorySupport.java   |  27 ++
 .../config/dbplatform/hana/HanaPlatform.java  | 101 ++++++++
 .../dbplatform/hana/HanaSqlLimiter.java       |  35 +++
 .../config/dbplatform/hana/package-info.java  |   4 +
 .../dbmigration/DefaultDbMigration.java       |   3 +
 .../ddlgeneration/BaseDdlHandler.java         |   6 +-
 .../platform/AbstractHanaDdl.java             | 226 +++++++++++++++++
 .../ddlgeneration/platform/BaseTableDdl.java  |   2 +-
 .../platform/DbTriggerBasedHistoryDdl.java    |   6 +-
 .../platform/HanaColumnStoreDdl.java          |  51 ++++
 .../platform/HanaDdlHandler.java              |  11 +
 .../platform/HanaHistoryDdl.java              | 160 ++++++++++++
 .../platform/HanaRowStoreDdl.java             |  11 +
 .../ddlgeneration/platform/HanaTableDdl.java  | 136 ++++++++++
 .../ddlgeneration/platform/PlatformDdl.java   |  39 ++-
 .../server/core/DatabasePlatformFactory.java  |   6 +
 .../server/core/PlatformDdlBuilder.java       |   3 +
 .../platform/DbExpressionHandlerFactory.java  |   2 +
 .../expression/platform/HanaDbExpression.java |  60 +++++
 .../server/query/CQueryBuilder.java           |   2 +-
 .../dbmigration/builtin-extra-ddl.xml         |  35 +++
 src/test/java/io/ebean/BaseTestCase.java      |  24 ++
 .../java/io/ebean/DtoQueryFromOrmTest.java    | 113 ++++-----
 src/test/java/io/ebean/SqlRowBooleanTest.java |   2 +
 .../dbplatform/HanaHistorySupportTest.java    |  48 ++++
 .../config/dbplatform/HanaPlatformTest.java   |  67 +++++
 .../dbmigration/DbMigrationGenerateTest.java  |   2 +
 .../dbmigration/DbMigrationTest.java          |   4 +-
 .../ddlgeneration/BaseDdlHandlerTest.java     |  59 ++++-
 .../ddlgeneration/platform/HanaDdlTest.java   |  42 ++++
 .../platform/PlatformDdl_AlterColumnTest.java |  61 +++++
 .../PlatformDdl_dropUniqueConstraintTest.java |  19 +-
 .../platform/HanaDbExpressionTest.java        |  70 ++++++
 .../server/grammer/EqlParserTest.java         |  45 ++++
 .../org/tests/basic/TestErrorBindLog.java     |   7 +-
 .../batchinsert/TestBatchInsertFlush.java     |   4 +
 .../batchinsert/TestBatchInsertSimple.java    |   5 +-
 .../TestBatchOnCascadeExceptionHandling.java  |   5 +-
 .../TestBatchSaveWithGetBeanId.java           |   3 +
 .../java/org/tests/compositekeys/db/Type.java |   2 +
 .../java/org/tests/merge/TestMergeBasic.java  |  42 +++-
 .../org/tests/merge/TestMergeCustomer.java    |  34 ++-
 .../java/org/tests/merge/TestMergeM2M.java    |  18 +-
 .../tests/model/array/TestDbArray_asSet.java  |   6 +
 .../tests/model/array/TestDbArray_basic.java  |   5 +
 .../cache/TestCacheViaComplexNaturalKey3.java |   4 +
 .../TestInsertBatchThenFlushThenUpdate.java   |   4 +
 .../basic/xtra/TestInsertBatchThenUpdate.java |   5 +
 ...TestInsertBatchWithDifferentRootTypes.java |   4 +
 .../TestElementCollectionBasic.java           |  50 +++-
 .../TestElementCollectionBasicCache.java      |  21 +-
 .../TestElementCollectionBasicMap.java        |  50 +++-
 .../TestElementCollectionBasicMapCache.java   |  21 +-
 .../TestElementCollectionBasicSet.java        |  48 +++-
 .../TestElementCollectionEmbeddedList.java    |  48 +++-
 ...estElementCollectionEmbeddedListCache.java |  16 +-
 .../TestElementCollectionEmbeddedMap.java     |  48 +++-
 ...TestElementCollectionEmbeddedMapCache.java |  14 +-
 .../tests/model/m2o/TestManyToOneAsOne.java   |   2 +-
 .../album/DeleteById_SoftDelete_Tests.java    |  21 +-
 .../o2m/jointable/TestOneToManyJoinTable.java |  35 ++-
 .../TestOneToManyJoinTableNoTableName.java    |  11 +-
 .../aggregation/TestAggregationCount.java     |  30 +--
 .../transaction/TestBatchPersistCascade.java  |   4 +
 .../transaction/TestNestedSubTransaction.java |  10 +-
 .../resources/assert/create-column-table.txt  |   8 +
 .../migrationtest/hana/1.0__initial.sql       | 235 ++++++++++++++++++
 .../dbmigration/migrationtest/hana/1.1.sql    | 176 +++++++++++++
 .../migrationtest/hana/1.2__dropsFor_1.1.sql  |  19 ++
 .../dbmigration/migrationtest/hana/1.3.sql    | 134 ++++++++++
 .../migrationtest/hana/1.4__dropsFor_1.3.sql  |  51 ++++
 .../migrationtest/hana/I__create_procs.sql    |  33 +++
 .../hana/R__order_views_hana.sql              |   7 +
 src/test/resources/ebean.properties           |   5 +
 src/test/resources/extra-ddl.xml              |   8 +
 79 files changed, 2596 insertions(+), 215 deletions(-)
 create mode 100644 src/main/java/io/ebean/config/dbplatform/hana/HanaBasicSqlLimiter.java
 create mode 100644 src/main/java/io/ebean/config/dbplatform/hana/HanaHistorySupport.java
 create mode 100644 src/main/java/io/ebean/config/dbplatform/hana/HanaPlatform.java
 create mode 100644 src/main/java/io/ebean/config/dbplatform/hana/HanaSqlLimiter.java
 create mode 100644 src/main/java/io/ebean/config/dbplatform/hana/package-info.java
 create mode 100644 src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/AbstractHanaDdl.java
 create mode 100644 src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaColumnStoreDdl.java
 create mode 100644 src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlHandler.java
 create mode 100644 src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaHistoryDdl.java
 create mode 100644 src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaRowStoreDdl.java
 create mode 100644 src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaTableDdl.java
 create mode 100644 src/main/java/io/ebeaninternal/server/expression/platform/HanaDbExpression.java
 create mode 100644 src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java
 create mode 100644 src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java
 create mode 100644 src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlTest.java
 create mode 100644 src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java
 create mode 100644 src/test/resources/assert/create-column-table.txt
 create mode 100644 src/test/resources/dbmigration/migrationtest/hana/1.0__initial.sql
 create mode 100644 src/test/resources/dbmigration/migrationtest/hana/1.1.sql
 create mode 100644 src/test/resources/dbmigration/migrationtest/hana/1.2__dropsFor_1.1.sql
 create mode 100644 src/test/resources/dbmigration/migrationtest/hana/1.3.sql
 create mode 100644 src/test/resources/dbmigration/migrationtest/hana/1.4__dropsFor_1.3.sql
 create mode 100644 src/test/resources/dbmigration/migrationtest/hana/I__create_procs.sql
 create mode 100644 src/test/resources/dbmigration/migrationtest/hana/R__order_views_hana.sql

diff --git a/howto-test.md b/howto-test.md
index dcb2c727d..ed159cac2 100644
--- a/howto-test.md
+++ b/howto-test.md
@@ -151,3 +151,18 @@ In `InsertHandler.getPstmt` the `meta.getIdentityDbColumns()` contains
 TODO: not yet tested
 
 
+
+'hana' platform
+--------------------
+
+Requires an installed SAP HANA server - e.g. https://store.docker.com/images/sap-hana-express-edition
+
+- Create a user `EBEAN_TEST` with password `Eb3an_test` in the tenant database `HXE`
+- Adjust the connection string and/or username in `ebean.properties`
+  
+run: `mvn clean test -Ddatasource.default=hana`
+
+Current status: PASS
+Tests run: 2486, Failures: 0, Errors: 0, Skipped: 84
+
+
diff --git a/pom.xml b/pom.xml
index b89db10dc..c08c66ca6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>4.2</version>
+      <version>4.3</version>
     </dependency>
 
     <dependency>
@@ -270,6 +270,13 @@
       <version>5.1.43</version>
       <scope>test</scope>
     </dependency>
+    
+    <dependency>
+      <groupId>com.sap.cloud.db.jdbc</groupId>
+      <artifactId>ngdbc</artifactId>
+      <version>2.3.48</version>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>org.avaje.composite</groupId>
diff --git a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
index 152cd3588..035673c10 100644
--- a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
@@ -176,9 +176,17 @@ public class DatabasePlatform {
    * findIterate() and findVisit().
    */
   protected boolean forwardOnlyHintOnFindIterate;
+  
+  /**
+   * If set then use the CONCUR_UPDATABLE hint when creating ResultSets.
+   * 
+   * This is {@code false} for HANA
+   */
+  protected boolean supportsResultSetConcurrencyModeUpdatable = true;
+
 
   /**
-   * By default we use JDBC batch when cascading (except for SQL Server).
+   * By default we use JDBC batch when cascading (except for SQL Server and HANA).
    */
   protected PersistBatch persistBatchOnCascade = PersistBatch.ALL;
 
@@ -516,6 +524,24 @@ public class DatabasePlatform {
   public void setForwardOnlyHintOnFindIterate(boolean forwardOnlyHintOnFindIterate) {
     this.forwardOnlyHintOnFindIterate = forwardOnlyHintOnFindIterate;
   }
+  
+  /**
+   * Return true if the ResultSet CONCUR_UPDATABLE Hint should be used on
+   * createNativeSqlTree() PreparedStatements.
+   * <p>
+   * This specifically is required for Hana which doesn't support CONCUR_UPDATABLE
+   * </p>
+   */
+  public boolean isSupportsResultSetConcurrencyModeUpdatable() {
+    return supportsResultSetConcurrencyModeUpdatable;
+  }
+  
+  /**
+   * Set to true if the ResultSet CONCUR_UPDATABLE Hint should be used by default on createNativeSqlTree() PreparedStatements.
+   */
+  public void setSupportsResultSetConcurrencyModeUpdatable(boolean supportsResultSetConcurrencyModeUpdatable) {
+    this.supportsResultSetConcurrencyModeUpdatable = supportsResultSetConcurrencyModeUpdatable;
+  }
 
   /**
    * Normally not needed - overridden in CockroachPlatform.
diff --git a/src/main/java/io/ebean/config/dbplatform/hana/HanaBasicSqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/hana/HanaBasicSqlLimiter.java
new file mode 100644
index 000000000..42239fc1a
--- /dev/null
+++ b/src/main/java/io/ebean/config/dbplatform/hana/HanaBasicSqlLimiter.java
@@ -0,0 +1,24 @@
+package io.ebean.config.dbplatform.hana;
+
+import io.ebean.config.dbplatform.BasicSqlLimiter;
+
+public class HanaBasicSqlLimiter implements BasicSqlLimiter {
+  @Override
+  public String limit(String dbSql, int firstRow, int maxRows) {
+    StringBuilder sb = new StringBuilder(50 + dbSql.length());
+
+    sb.append(dbSql);
+
+    if (maxRows > 0) {
+      sb.append(" ").append("limit");
+      sb.append(" ").append(maxRows);
+
+      if (firstRow > 0) {
+        sb.append(" ").append("offset").append(" ");
+        sb.append(firstRow);
+      }
+    }
+
+    return sb.toString();
+  }
+}
\ No newline at end of file
diff --git a/src/main/java/io/ebean/config/dbplatform/hana/HanaHistorySupport.java b/src/main/java/io/ebean/config/dbplatform/hana/HanaHistorySupport.java
new file mode 100644
index 000000000..ea2c20d18
--- /dev/null
+++ b/src/main/java/io/ebean/config/dbplatform/hana/HanaHistorySupport.java
@@ -0,0 +1,27 @@
+package io.ebean.config.dbplatform.hana;
+
+import io.ebean.config.dbplatform.DbStandardHistorySupport;
+
+public class HanaHistorySupport extends DbStandardHistorySupport {
+
+  @Override
+  public String getAsOfViewSuffix(String asOfViewSuffix) {
+    return " for system_time as of ?";
+  }
+
+  @Override
+  public String getVersionsBetweenSuffix(String asOfViewSuffix) {
+    return " for system_time between ? and ?";
+  }
+
+  @Override
+  public String getSysPeriodLower(String tableAlias, String sysPeriod) {
+    return tableAlias + "." + sysPeriod + "_start";
+  }
+
+  @Override
+  public String getSysPeriodUpper(String tableAlias, String sysPeriod) {
+    return tableAlias + "." + sysPeriod + "_end";
+  }
+  
+}
diff --git a/src/main/java/io/ebean/config/dbplatform/hana/HanaPlatform.java b/src/main/java/io/ebean/config/dbplatform/hana/HanaPlatform.java
new file mode 100644
index 000000000..f266bb931
--- /dev/null
+++ b/src/main/java/io/ebean/config/dbplatform/hana/HanaPlatform.java
@@ -0,0 +1,101 @@
+package io.ebean.config.dbplatform.hana;
+
+import io.ebean.Query.ForUpdate;
+import io.ebean.annotation.PersistBatch;
+import io.ebean.annotation.Platform;
+import io.ebean.config.PlatformConfig;
+import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebean.config.dbplatform.DbPlatformType;
+import io.ebean.config.dbplatform.DbType;
+import io.ebean.config.dbplatform.IdType;
+import io.ebean.config.dbplatform.SqlErrorCodes;
+
+public class HanaPlatform extends DatabasePlatform {
+  public HanaPlatform() {
+    this.basicSqlLimiter = new HanaBasicSqlLimiter();
+    
+    this.columnAliasPrefix = null;
+
+    this.dbDefaultValue.setNow("current_timestamp");
+
+    this.dbIdentity.setIdType(IdType.IDENTITY);
+    this.dbIdentity.setSelectLastInsertedIdTemplate("select current_identity_value() from sys.dummy");
+    this.dbIdentity.setSupportsGetGeneratedKeys(false);
+    this.dbIdentity.setSupportsIdentity(true);
+
+    this.dbTypeMap.put(DbType.BIGINT, new DbPlatformType("bigint", false));
+    this.dbTypeMap.put(DbType.BINARY, new DbPlatformType("varbinary", 255));
+    this.dbTypeMap.put(DbType.BIT, new DbPlatformType("smallint", false));
+    this.dbTypeMap.put(DbType.BLOB, new DbPlatformType("blob", false));
+    this.dbTypeMap.put(DbType.CHAR, new DbPlatformType("nvarchar", 255));
+    this.dbTypeMap.put(DbType.CLOB, new DbPlatformType("nclob", false));
+    this.dbTypeMap.put(DbType.INTEGER, new DbPlatformType("integer", false));
+    this.dbTypeMap.put(DbType.JSONVARCHAR, new DbPlatformType("nvarchar", 255));
+    this.dbTypeMap.put(DbType.LINESTRING, new DbPlatformType("st_geometry"));
+    this.dbTypeMap.put(DbType.LONGVARBINARY, new DbPlatformType("blob", false));
+    this.dbTypeMap.put(DbType.LONGVARCHAR, new DbPlatformType("nclob", false));
+    this.dbTypeMap.put(DbType.MULTILINESTRING, new DbPlatformType("st_geometry"));
+    this.dbTypeMap.put(DbType.MULTIPOINT, new DbPlatformType("st_geometry"));
+    this.dbTypeMap.put(DbType.MULTIPOLYGON, new DbPlatformType("st_geometry"));
+    this.dbTypeMap.put(DbType.POINT, new DbPlatformType("st_point"));
+    this.dbTypeMap.put(DbType.POLYGON, new DbPlatformType("st_geometry"));
+    this.dbTypeMap.put(DbType.SMALLINT, new DbPlatformType("smallint", false));
+    this.dbTypeMap.put(DbType.TINYINT, new DbPlatformType("smallint", false));
+    this.dbTypeMap.put(DbType.UUID, new DbPlatformType("varchar", 40));
+    this.dbTypeMap.put(DbType.VARBINARY, new DbPlatformType("varbinary", 255));
+    this.dbTypeMap.put(DbType.VARCHAR, new DbPlatformType("nvarchar", 255));
+
+    this.exceptionTranslator = new SqlErrorCodes().addAcquireLock("131", "133", "146")
+        .addDataIntegrity("130", "429", "461", "462").addDuplicateKey("144", "301", "349").build();
+
+    this.historySupport = new HanaHistorySupport();
+    
+    this.likeClauseRaw = "like ?";
+
+    this.maxConstraintNameLength = 127;
+    this.maxTableNameLength = 127;
+
+    this.persistBatchOnCascade = PersistBatch.NONE;
+    
+    this.platform = Platform.HANA;
+
+    this.sqlLimiter = new HanaSqlLimiter();
+    
+    this.supportsResultSetConcurrencyModeUpdatable = false;
+  }
+
+  @Override
+  protected void addGeoTypes(int srid) {
+    this.dbTypeMap.put(DbType.LINESTRING, new DbPlatformType("st_geometry(" + srid + ")", false));
+    this.dbTypeMap.put(DbType.MULTILINESTRING, new DbPlatformType("st_geometry(" + srid + ")", false));
+    this.dbTypeMap.put(DbType.MULTIPOINT, new DbPlatformType("st_geometry(" + srid + ")", false));
+    this.dbTypeMap.put(DbType.MULTIPOLYGON, new DbPlatformType("st_geometry(" + srid + ")", false));
+    this.dbTypeMap.put(DbType.POINT, new DbPlatformType("st_point(" + srid + ")", false));
+    this.dbTypeMap.put(DbType.POLYGON, new DbPlatformType("st_geometry(" + srid + ")", false));
+  }
+
+  @Override
+  protected String withForUpdate(String sql, ForUpdate forUpdateMode) {
+    switch (forUpdateMode) {
+    case BASE:
+      return sql + " for update";
+    case NOWAIT:
+      return sql + " for update nowait";
+    case SKIPLOCKED:
+      return sql + " for update ignore locked";
+    default:
+      throw new IllegalArgumentException("Unknown update mode: " + forUpdateMode.name());
+    }
+  }
+
+  @Override
+  protected void configure(PlatformConfig config, boolean allQuotedIdentifiers) {
+    super.configure(config, allQuotedIdentifiers);
+    if (config.getDbUuid().useBinary()) {
+      this.dbTypeMap.put(DbType.UUID, new DbPlatformType("varbinary", 16));
+    } else {
+      this.dbTypeMap.put(DbType.UUID, new DbPlatformType("varchar", 40));
+    }
+  }
+
+}
diff --git a/src/main/java/io/ebean/config/dbplatform/hana/HanaSqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/hana/HanaSqlLimiter.java
new file mode 100644
index 000000000..bf8ca4e7b
--- /dev/null
+++ b/src/main/java/io/ebean/config/dbplatform/hana/HanaSqlLimiter.java
@@ -0,0 +1,35 @@
+package io.ebean.config.dbplatform.hana;
+
+import io.ebean.config.dbplatform.SqlLimitRequest;
+import io.ebean.config.dbplatform.SqlLimitResponse;
+import io.ebean.config.dbplatform.SqlLimiter;
+
+public class HanaSqlLimiter implements SqlLimiter {
+  @Override
+  public SqlLimitResponse limit(SqlLimitRequest request) {
+    String dbSql = request.getDbSql();
+
+    StringBuilder sb = new StringBuilder(50 + dbSql.length());
+    sb.append("select ");
+    if (request.isDistinct()) {
+      sb.append("distinct ");
+    }
+
+    sb.append(dbSql);
+
+    int firstRow = request.getFirstRow();
+    int maxRows = request.getMaxRows();
+
+    if (maxRows > 0) {
+      sb.append(" ").append("limit ").append(maxRows);
+      if (firstRow > 0) {
+        sb.append(" ").append("offset ");
+        sb.append(firstRow);
+      }
+    }
+
+    String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
+
+    return new SqlLimitResponse(sql, false);
+  }
+}
\ No newline at end of file
diff --git a/src/main/java/io/ebean/config/dbplatform/hana/package-info.java b/src/main/java/io/ebean/config/dbplatform/hana/package-info.java
new file mode 100644
index 000000000..55fc12c5e
--- /dev/null
+++ b/src/main/java/io/ebean/config/dbplatform/hana/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * SAP HANA specific support.
+ */
+package io.ebean.config.dbplatform.hana;
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index bf662a91a..19817a924 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -10,6 +10,7 @@ import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.db2.DB2Platform;
 import io.ebean.config.dbplatform.h2.H2Platform;
+import io.ebean.config.dbplatform.hana.HanaPlatform;
 import io.ebean.config.dbplatform.hsqldb.HsqldbPlatform;
 import io.ebean.config.dbplatform.mysql.MySqlPlatform;
 import io.ebean.config.dbplatform.oracle.OraclePlatform;
@@ -679,6 +680,8 @@ public class DefaultDbMigration implements DbMigration {
         return new DB2Platform();
       case SQLITE:
         return new SQLitePlatform();
+      case HANA:
+    	return new HanaPlatform();
       case GENERIC:
         return new DatabasePlatform();
 
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java
index ac5f64557..29ee263bc 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java
@@ -28,7 +28,11 @@ public class BaseDdlHandler implements DdlHandler {
   protected final TableDdl tableDdl;
 
   public BaseDdlHandler(ServerConfig serverConfig, PlatformDdl platformDdl) {
-    this.tableDdl = new BaseTableDdl(serverConfig, platformDdl);
+    this(serverConfig, platformDdl, new BaseTableDdl(serverConfig, platformDdl));
+  }
+  
+  protected BaseDdlHandler(ServerConfig serverConfig, PlatformDdl platformDdl, TableDdl tableDdl) {
+    this.tableDdl = tableDdl;
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/AbstractHanaDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/AbstractHanaDdl.java
new file mode 100644
index 000000000..b898c02a6
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/AbstractHanaDdl.java
@@ -0,0 +1,226 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+import java.io.IOException;
+import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import io.ebean.config.ServerConfig;
+import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebean.config.dbplatform.DbPlatformType;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
+
+public abstract class AbstractHanaDdl extends PlatformDdl {
+
+  private static final Pattern ARRAY_PATTERN = Pattern.compile("(\\w+)\\s*\\[\\s*\\]\\s*(\\(\\d+\\))?",
+      Pattern.CASE_INSENSITIVE);
+
+  public AbstractHanaDdl(DatabasePlatform platform) {
+    super(platform);
+    this.addColumn = "add (";
+    this.addColumnSuffix = ")";
+    this.alterColumn = "alter (";
+    this.alterColumnSuffix = ")";
+    this.columnDropDefault = " default null";
+    this.columnSetDefault = " default";
+    this.columnSetNotnull = " not null";
+    this.columnSetNull = " null";
+    this.dropColumn = "drop (";
+    this.dropColumnSuffix = ")";
+    this.dropConstraintIfExists = "drop constraint ";
+    this.dropIndexIfExists = "drop index ";
+    this.dropSequenceIfExists = "drop sequence ";
+    this.dropTableCascade = " cascade";
+    this.dropTableIfExists = "drop table ";
+    this.fallbackArrayType = "nvarchar(1000)";
+    this.historyDdl = new HanaHistoryDdl();
+    this.identitySuffix = " generated by default as identity";
+  }
+
+  @Override
+  public String alterColumnBaseAttributes(AlterColumn alter) {
+    String tableName = alter.getTableName();
+    String columnName = alter.getColumnName();
+    String currentType = alter.getCurrentType();
+    String type = alter.getType() != null ? alter.getType() : currentType;
+    type = convert(type, false);
+    currentType = convert(currentType, false);
+    boolean notnull = (alter.isNotnull() != null) ? alter.isNotnull() : Boolean.TRUE.equals(alter.isCurrentNotnull());
+    String notnullClause = notnull ? " not null" : "";
+    String defaultValue = DdlHelp.isDropDefault(alter.getDefaultValue()) ? "null"
+        : (alter.getDefaultValue() != null ? alter.getDefaultValue() : alter.getCurrentDefaultValue());
+    String defaultValueClause = (defaultValue == null || defaultValue.isEmpty()) ? "" : " default " + defaultValue;
+
+    try {
+      DdlBuffer buffer = new BaseDdlBuffer(null);
+      if (!isConvertible(currentType, type)) {
+        // add an intermediate conversion if possible
+        if (isNumberType(currentType)) {
+          // numbers can always be converted to decimal
+          buffer.append("alter table ").append(tableName).append(" ").append(alterColumn).append(" ").append(columnName)
+              .append(" decimal ").append(defaultValueClause).append(notnullClause).append(alterColumnSuffix)
+              .endOfStatement();
+        } else if (isStringType(currentType)) {
+          // strings can always be converted to nclob
+          buffer.append("alter table ").append(tableName).append(" ").append(alterColumn).append(" ").append(columnName)
+              .append(" nclob ").append(defaultValueClause).append(notnullClause).append(alterColumnSuffix)
+              .endOfStatement();
+        }
+      }
+
+      buffer.append("alter table ").append(tableName).append(" ").append(alterColumn).append(" ").append(columnName)
+          .append(" ").append(type).append(defaultValueClause).append(notnullClause).append(alterColumnSuffix);
+
+      return buffer.getBuffer();
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @Override
+  public String alterColumnDefaultValue(String tableName, String columnName, String defaultValue) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public String alterColumnNotnull(String tableName, String columnName, boolean notnull) {
+    return null;
+  }
+
+  @Override
+  public DdlHandler createDdlHandler(ServerConfig serverConfig) {
+    return new HanaDdlHandler(serverConfig, this);
+  }
+
+  @Override
+  public String alterColumnType(String tableName, String columnName, String type) {
+    return null;
+  }
+
+  @Override
+  protected String convertArrayType(String logicalArrayType) {
+    Matcher matcher = ARRAY_PATTERN.matcher(logicalArrayType);
+    if (matcher.matches()) {
+      return convert(matcher.group(1), false) + " array" + (matcher.group(2) == null ? "" : matcher.group(2));
+    } else {
+      return fallbackArrayType;
+    }
+  }
+
+  @Override
+  public String alterTableAddUniqueConstraint(String tableName, String uqName, String[] columns,
+      String[] nullableColumns) {
+    if (nullableColumns == null || nullableColumns.length == 0) {
+      return super.alterTableAddUniqueConstraint(tableName, uqName, columns, nullableColumns);
+    } else {
+      return "-- cannot create unique index \"" + uqName + "\" on table \"" + tableName + "\" with nullable columns";
+    }
+  }
+
+  @Override
+  public String alterTableDropUniqueConstraint(String tableName, String uniqueConstraintName) {
+    DdlBuffer buffer = new BaseDdlBuffer(null);
+    try {
+      buffer.append("delimiter $$").newLine();
+      buffer.append("do").newLine();
+      buffer.append("begin").newLine();
+      buffer.append("declare exit handler for sql_error_code 397 begin end").endOfStatement();
+      buffer.append("exec 'alter table ").append(tableName).append(" ").append(dropUniqueConstraint).append(" ")
+          .append(maxConstraintName(uniqueConstraintName)).append("'").endOfStatement();
+      buffer.append("end").endOfStatement();
+      buffer.append("$$");
+      return buffer.getBuffer();
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+  
+  @Override
+  public String alterTableDropConstraint(String tableName, String constraintName) {
+    return alterTableDropUniqueConstraint(tableName, constraintName);
+  }
+
+  /**
+   * It is rather complex to delete a column on HANA as there must not exist any
+   * foreign keys. That's why we call a user stored procedure here
+   */
+  @Override
+  public void alterTableDropColumn(DdlBuffer buffer, String tableName, String columnName) throws IOException {
+    buffer.append("CALL usp_ebean_drop_column('").append(tableName).append("', '").append(columnName).append("')")
+        .endOfStatement();
+  }
+
+  /**
+   * Check if a data type can be converted to another data type. Data types can't
+   * be converted if the target type has a lower precision than the source type.
+   * 
+   * @param sourceType The source data type
+   * @param targetType the target data type
+   * @return {@code true} if the type can be converted, {@code false} otherwise
+   */
+  private boolean isConvertible(String sourceType, String targetType) {
+    if (Objects.equals(sourceType, targetType)) {
+      return true;
+    }
+
+    if (sourceType == null || targetType == null) {
+      return true;
+    }
+
+    if ("bigint".equals(sourceType)) {
+      if ("integer".equals(targetType) || "smallint".equals(targetType) || "tinyint".equals(targetType)) {
+        return false;
+      }
+    } else if ("integer".equals(sourceType)) {
+      if ("smallint".equals(targetType) || "tinyint".equals(targetType)) {
+        return false;
+      }
+    } else if ("smallint".equals(sourceType)) {
+      if ("tinyint".equals(targetType)) {
+        return false;
+      }
+    } else if ("double".equals(sourceType)) {
+      if ("real".equals(targetType)) {
+        return false;
+      }
+    }
+
+    DbPlatformType dbPlatformSourceType = DbPlatformType.parse(sourceType);
+
+    if ("float".equals(dbPlatformSourceType.getName())) {
+      if ("real".equals(targetType)) {
+        return false;
+      }
+    } else if ("varchar".equals(dbPlatformSourceType.getName()) || "nvarchar".equals(dbPlatformSourceType.getName())) {
+      DbPlatformType dbPlatformTargetType = DbPlatformType.parse(targetType);
+      if ("varchar".equals(dbPlatformTargetType.getName()) || "nvarchar".equals(dbPlatformTargetType.getName())) {
+        if (dbPlatformSourceType.getDefaultLength() > dbPlatformTargetType.getDefaultLength()) {
+          return false;
+        }
+      }
+    } else if ("decimal".equals(dbPlatformSourceType.getName())) {
+      DbPlatformType dbPlatformTargetType = DbPlatformType.parse(targetType);
+      if ("decimal".equals(dbPlatformTargetType.getName())) {
+        if (dbPlatformSourceType.getDefaultLength() > dbPlatformTargetType.getDefaultLength()
+            || dbPlatformSourceType.getDefaultScale() > dbPlatformTargetType.getDefaultScale()) {
+          return false;
+        }
+      }
+    }
+
+    return true;
+  }
+
+  private boolean isNumberType(String type) {
+    return type != null
+        && ("bigint".equals(type) || "integer".equals(type) || "smallint".equals(type) || "tinyint".equals(type)
+            || type.startsWith("float") || "real".equals(type) || "double".equals(type) || type.startsWith("decimal"));
+  }
+
+  private boolean isStringType(String type) {
+    return type != null
+        && (type.startsWith("varchar") || type.startsWith("nvarchar") || "clob".equals(type) || "nclob".equals(type));
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
index 7b3c72bb9..2a46f83a0 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
@@ -260,7 +260,7 @@ public class BaseTableDdl implements TableDdl {
     String partitionMode = createTable.getPartitionMode();
 
     DdlBuffer apply = writer.apply();
-    apply.append("create table ").append(tableName).append(" (");
+    apply.append(platformDdl.getCreateTableCommandPrefix()).append(" ").append(tableName).append(" (");
     writeTableColumns(apply, columns, useIdentity);
     writeCheckConstraints(apply, createTable);
     writeUniqueConstraints(apply, createTable);
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
index 5eb3d6978..a425cf9be 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
@@ -175,7 +175,7 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl {
 
   protected void createHistoryTable(DdlBuffer apply, MTable table) throws IOException {
 
-    apply.append("create table ").append(table.getName()).append(historySuffix).append("(").newLine();
+    apply.append(platformDdl.getCreateTableCommandPrefix()).append(" ").append(table.getName()).append(historySuffix).append("(").newLine();
 
     Collection<MColumn> cols = table.allColumns();
     for (MColumn column : cols) {
@@ -238,8 +238,8 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl {
   }
 
   protected void dropSysPeriodColumns(DdlBuffer buffer, String baseTableName) throws IOException {
-    buffer.append("alter table ").append(baseTableName).append(" drop column ").append(sysPeriodStart).endOfStatement();
-    buffer.append("alter table ").append(baseTableName).append(" drop column ").append(sysPeriodEnd).endOfStatement();
+    platformDdl.alterTableDropColumn(buffer, baseTableName, sysPeriodStart);
+    platformDdl.alterTableDropColumn(buffer, baseTableName, sysPeriodEnd);
   }
 
   protected void appendInsertIntoHistory(DdlBuffer buffer, String historyTable, List<String> columns) throws IOException {
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaColumnStoreDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaColumnStoreDdl.java
new file mode 100644
index 000000000..b3b36c3ef
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaColumnStoreDdl.java
@@ -0,0 +1,51 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+import java.io.IOException;
+
+import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+
+public class HanaColumnStoreDdl extends AbstractHanaDdl {
+
+  public HanaColumnStoreDdl(DatabasePlatform platform) {
+    super(platform);
+    this.createTable = "create column table";
+  }
+
+  @Override
+  public String createIndex(String indexName, String tableName, String[] columns) {
+    if (columns == null || columns.length == 0) {
+      return "-- cannot create index: no columns given";
+    }
+
+    if (columns.length == 1) {
+      return "-- explicit index \"" + indexName + "\" for single column \"" + columns[0] + "\" of table \"" + tableName
+          + "\" is not necessary";
+    }
+
+    StringBuilder buffer = new StringBuilder();
+    buffer.append("create inverted hash index ").append(maxConstraintName(indexName)).append(" on ").append(tableName);
+    appendColumns(columns, buffer);
+
+    return buffer.toString();
+  }
+
+  @Override
+  public String dropIndex(String indexName, String tableName) {
+    DdlBuffer buffer = new BaseDdlBuffer(null);
+    try {
+      buffer.append("delimiter $$").newLine();
+      buffer.append("do").newLine();
+      buffer.append("begin").newLine();
+      buffer.append("declare exit handler for sql_error_code 261 begin end").endOfStatement();
+      buffer.append("exec '").append(dropIndexIfExists).append(maxConstraintName(indexName)).append("'")
+          .endOfStatement();
+      buffer.append("end").endOfStatement();
+      buffer.append("$$");
+      return buffer.getBuffer();
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlHandler.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlHandler.java
new file mode 100644
index 000000000..b3355e280
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlHandler.java
@@ -0,0 +1,11 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+import io.ebean.config.ServerConfig;
+import io.ebeaninternal.dbmigration.ddlgeneration.BaseDdlHandler;
+
+public class HanaDdlHandler extends BaseDdlHandler {
+
+  public HanaDdlHandler(ServerConfig serverConfig, PlatformDdl platformDdl) {
+    super(serverConfig, platformDdl, new HanaTableDdl(serverConfig, platformDdl));
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaHistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaHistoryDdl.java
new file mode 100644
index 000000000..0ea165ba3
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaHistoryDdl.java
@@ -0,0 +1,160 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import io.ebean.config.ServerConfig;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
+import io.ebeaninternal.dbmigration.model.MColumn;
+import io.ebeaninternal.dbmigration.model.MTable;
+
+public class HanaHistoryDdl implements PlatformHistoryDdl {
+
+  private String systemPeriodStart;
+  private String systemPeriodEnd;
+  private PlatformDdl platformDdl;
+  private String historySuffix;
+  private final AtomicInteger counter = new AtomicInteger(0);
+  private Map<String, String> createdHistoryTables = new ConcurrentHashMap<>();
+
+  @Override
+  public void configure(ServerConfig serverConfig, PlatformDdl platformDdl) {
+    this.systemPeriodStart = serverConfig.getAsOfSysPeriod() + "_start";
+    this.systemPeriodEnd = serverConfig.getAsOfSysPeriod() + "_end";
+    this.platformDdl = platformDdl;
+    this.historySuffix = serverConfig.getHistoryTableSuffix();
+  }
+
+  @Override
+  public void createWithHistory(DdlWrite writer, MTable table) throws IOException {
+    String tableName = table.getName();
+    String historyTableName = tableName + historySuffix;
+    DdlBuffer apply = writer.applyHistoryView();
+    if (apply.isEmpty()) {
+      createdHistoryTables.clear();
+    }
+
+    apply.append(platformDdl.getCreateTableCommandPrefix()).append(" ").append(historyTableName).append(" (").newLine();
+
+    // create history table
+    Collection<MColumn> cols = table.allColumns();
+    for (MColumn column : cols) {
+      if (!column.isDraftOnly()) {
+        writeColumnDefinition(apply, column.getName(), column.getType(), column.getDefaultValue(), column.isNotnull(),
+            column.isIdentity() ? platformDdl.identitySuffix : null);
+        apply.append(",").newLine();
+      }
+    }
+    writeColumnDefinition(apply, systemPeriodStart, "TIMESTAMP", null, false, null);
+    apply.append(",").newLine();
+    writeColumnDefinition(apply, systemPeriodEnd, "TIMESTAMP", null, false, null);
+    apply.newLine().append(")").endOfStatement();
+
+    // enable system versioning
+    apply.append("alter table ").append(tableName).append(" add (").newLine();
+    apply.append("    ").append(systemPeriodStart).append(" TIMESTAMP NOT NULL GENERATED ALWAYS AS ROW START, ")
+        .newLine();
+    apply.append("    ").append(systemPeriodEnd).append(" TIMESTAMP NOT NULL GENERATED ALWAYS AS ROW END").newLine();
+    apply.append(")").endOfStatement();
+
+    apply.append("alter table ").append(tableName).append(" add period for system_time(").append(systemPeriodStart)
+        .append(",").append(systemPeriodEnd).append(")").endOfStatement();
+
+    enableSystemVersioning(apply, tableName, historyTableName, true, false);
+
+    createdHistoryTables.put(tableName, historyTableName);
+
+    dropHistoryTable(writer.dropAll(), tableName, historyTableName);
+  }
+
+  @Override
+  public void dropHistoryTable(DdlWrite writer, DropHistoryTable dropHistoryTable) throws IOException {
+    dropHistoryTable(writer.applyDropDependencies(), dropHistoryTable.getBaseTable(),
+        dropHistoryTable.getBaseTable() + historySuffix);
+  }
+
+  protected void dropHistoryTable(DdlBuffer apply, String baseTable, String historyTable) throws IOException {
+    // disable system versioning
+    disableSystemVersioning(apply, baseTable);
+
+    apply.append("alter table ").append(baseTable).append(" drop period for system_time").endOfStatement();
+
+    // drop the period columns
+    apply.append("alter table ").append(baseTable).append(" drop (").append(systemPeriodStart).append(",")
+        .append(systemPeriodEnd).append(")").endOfStatement();
+
+    // drop the history table
+    apply.append("drop table ").append(historyTable).append(" cascade").endOfStatement();
+  }
+
+  @Override
+  public void addHistoryTable(DdlWrite writer, AddHistoryTable addHistoryTable) throws IOException {
+    MTable table = writer.getTable(addHistoryTable.getBaseTable());
+    if (table == null) {
+      throw new IllegalStateException(
+          "MTable " + addHistoryTable.getBaseTable() + " not found in writer? (required for history DDL)");
+    }
+    createWithHistory(writer, table);
+  }
+
+  @Override
+  public void updateTriggers(DdlWrite write, HistoryTableUpdate baseTable) throws IOException {
+    // nothing to do
+  }
+
+  protected void writeColumnDefinition(DdlBuffer buffer, String columnName, String type, String defaultValue,
+      boolean isNotNull, String generated) throws IOException {
+
+    String platformType = platformDdl.convert(type, false);
+    buffer.append(" ").append(platformDdl.lowerColumnName(columnName));
+    buffer.append(" ").append(platformType);
+    if (defaultValue != null) {
+      buffer.append(" default ").append(defaultValue);
+    }
+    if (isNotNull) {
+      buffer.append(" not null");
+    }
+    if (generated != null) {
+      buffer.append(" ").append(generated);
+    }
+  }
+
+  public void disableSystemVersioning(DdlBuffer apply, String tableName) throws IOException {
+    disableSystemVersioning(apply, tableName, false);
+  }
+
+  public void disableSystemVersioning(DdlBuffer apply, String tableName, boolean uniqueStatement) throws IOException {
+    apply.append("alter table ").append(tableName).append(" drop system versioning");
+    if (uniqueStatement) {
+      // needed for the DB migration test to prevent the statement from being filtered
+      // out as a duplicate
+      apply.append(" /* ").append(String.valueOf(counter.getAndIncrement())).append(" */");
+    }
+    apply.endOfStatement();
+  }
+
+  public void enableSystemVersioning(DdlBuffer apply, String tableName, String historyTableName, boolean validated,
+      boolean uniqueStatement) throws IOException {
+    apply.append("alter table ").append(tableName).append(" add system versioning history table ")
+        .append(historyTableName);
+    if (!validated) {
+      apply.append(" not validated");
+    }
+    if (uniqueStatement) {
+      // needed for the DB migration test to prevent the statement from being filtered
+      // out as a duplicate
+      apply.append(" /* ").append(String.valueOf(counter.getAndIncrement())).append(" */");
+    }
+    apply.endOfStatement();
+  }
+
+  public boolean isSystemVersioningEnabled(String tableName) {
+    return !createdHistoryTables.containsKey(tableName);
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaRowStoreDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaRowStoreDdl.java
new file mode 100644
index 000000000..d662f1039
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaRowStoreDdl.java
@@ -0,0 +1,11 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+import io.ebean.config.dbplatform.DatabasePlatform;
+
+public class HanaRowStoreDdl extends AbstractHanaDdl {
+
+  public HanaRowStoreDdl(DatabasePlatform platform) {
+    super(platform);
+    this.createTable = "create row table";
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaTableDdl.java
new file mode 100644
index 000000000..1d0b47abc
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaTableDdl.java
@@ -0,0 +1,136 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+import java.io.IOException;
+import java.util.List;
+
+import io.ebean.config.PropertiesWrapper;
+import io.ebean.config.ServerConfig;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.migration.AddColumn;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.Column;
+import io.ebeaninternal.dbmigration.migration.DropColumn;
+import io.ebeaninternal.dbmigration.model.MTable;
+
+public class HanaTableDdl extends BaseTableDdl {
+
+  private final HanaHistoryDdl historyDdl;
+  private final boolean generateUniqueDdl;
+
+  public HanaTableDdl(ServerConfig serverConfig, PlatformDdl platformDdl) {
+    super(serverConfig, platformDdl);
+    this.historyDdl = (HanaHistoryDdl) platformDdl.historyDdl;
+    if (serverConfig.getProperties() != null) {
+      PropertiesWrapper wrapper = new PropertiesWrapper("ebean", "hana", serverConfig.getProperties(),
+          serverConfig.getClassLoadConfig());
+      this.generateUniqueDdl = wrapper.getBoolean("generateUniqueDdl", false);
+    } else {
+      this.generateUniqueDdl = false;
+    }
+  }
+
+  @Override
+  protected void alterColumnDefaultValue(DdlWrite writer, AlterColumn alter) throws IOException {
+    String ddl = platformDdl.alterColumnBaseAttributes(alter);
+    if (hasValue(ddl)) {
+      writer.apply().append(ddl).endOfStatement();
+    }
+  }
+
+  @Override
+  public void generate(DdlWrite writer, AddColumn addColumn) throws IOException {
+    String tableName = addColumn.getTableName();
+    MTable table = writer.getTable(tableName);
+    if (table == null) {
+      super.generate(writer, addColumn);
+      return;
+    }
+
+    boolean manageSystemVersioning = isTrue(table.isWithHistory()) && historyDdl.isSystemVersioningEnabled(tableName);
+
+    if (manageSystemVersioning) {
+      historyDdl.disableSystemVersioning(writer.apply(), table.getName(), this.generateUniqueDdl);
+    }
+
+    super.generate(writer, addColumn);
+
+    if (manageSystemVersioning) {
+      // make same changes to the history table
+      String historyTable = historyTable(tableName);
+      List<Column> columns = addColumn.getColumn();
+      for (Column column : columns) {
+        alterTableAddColumn(writer.apply(), historyTable, column, true, true);
+      }
+
+      historyDdl.enableSystemVersioning(writer.apply(), table.getName(), historyTable, false, this.generateUniqueDdl);
+    }
+  }
+
+  @Override
+  public void generate(DdlWrite writer, AlterColumn alterColumn) throws IOException {
+    String tableName = alterColumn.getTableName();
+    MTable table = writer.getTable(tableName);
+    if (table == null) {
+      super.generate(writer, alterColumn);
+      return;
+    }
+
+    boolean manageSystemVersioning = isTrue(table.isWithHistory()) && historyDdl.isSystemVersioningEnabled(tableName);
+
+    if (manageSystemVersioning) {
+      historyDdl.disableSystemVersioning(writer.apply(), tableName, this.generateUniqueDdl);
+    }
+
+    super.generate(writer, alterColumn);
+
+    if (manageSystemVersioning) {
+      // make same changes to the history table
+      String historyTable = historyTable(tableName);
+      if (hasValue(alterColumn.getType()) || hasValue(alterColumn.getDefaultValue())
+          || alterColumn.isNotnull() != null) {
+        AlterColumn alterHistoryColumn = new AlterColumn();
+        alterHistoryColumn.setTableName(historyTable);
+        alterHistoryColumn.setColumnName(alterColumn.getColumnName());
+        alterHistoryColumn.setType(alterColumn.getType());
+        alterHistoryColumn.setDefaultValue(alterColumn.getDefaultValue());
+        alterHistoryColumn.setNotnull(alterColumn.isNotnull());
+        alterHistoryColumn.setCurrentType(alterColumn.getCurrentType());
+        alterHistoryColumn.setCurrentDefaultValue(alterColumn.getCurrentDefaultValue());
+        alterHistoryColumn.setCurrentNotnull(alterColumn.isCurrentNotnull());
+        String histColumnDdl = platformDdl.alterColumnBaseAttributes(alterHistoryColumn);
+
+        // write the apply to history table
+        writer.apply().append(histColumnDdl).endOfStatement();
+      }
+
+      historyDdl.enableSystemVersioning(writer.apply(), tableName, historyTable, false, this.generateUniqueDdl);
+    }
+  }
+
+  @Override
+  public void generate(DdlWrite writer, DropColumn dropColumn) throws IOException {
+    String tableName = dropColumn.getTableName();
+    MTable table = writer.getTable(tableName);
+    if (table == null) {
+      super.generate(writer, dropColumn);
+      return;
+    }
+
+    boolean manageSystemVersioning = isTrue(table.isWithHistory()) && historyDdl.isSystemVersioningEnabled(tableName);
+
+    if (manageSystemVersioning) {
+      historyDdl.disableSystemVersioning(writer.apply(), tableName, this.generateUniqueDdl);
+    }
+
+    super.generate(writer, dropColumn);
+
+    if (manageSystemVersioning) {
+      // also drop from the history table
+      String historyTable = historyTable(tableName);
+      alterTableDropColumn(writer.apply(), historyTable, dropColumn.getColumnName());
+
+      historyDdl.enableSystemVersioning(writer.apply(), tableName, historyTable, false, this.generateUniqueDdl);
+    }
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
index 515004bd5..a07dcdfd6 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -78,12 +78,16 @@ public class PlatformDdl {
   protected String dropIndexIfExists = "drop index if exists ";
 
   protected String alterColumn = "alter column";
+  
+  protected String alterColumnSuffix = "";
 
   protected String dropUniqueConstraint = "drop constraint";
 
   protected String addConstraint = "add constraint";
 
   protected String addColumn = "add column";
+  
+  protected String addColumnSuffix = "";
 
   protected String columnSetType = "";
 
@@ -96,6 +100,12 @@ public class PlatformDdl {
   protected String columnSetNull = "set null";
 
   protected String updateNullWithDefault = "update ${table} set ${column} = ${default} where ${column} is null";
+  
+  protected String createTable = "create table";
+  
+  protected String dropColumn = "drop column";
+  
+  protected String dropColumnSuffix = "";
 
   /**
    * Set false for MsSqlServer to allow multiple nulls for OneToOne mapping.
@@ -458,6 +468,7 @@ public class PlatformDdl {
       if (isTrue(column.isNotnull())) {
         buffer.append(" not null");
       }
+      buffer.append(addColumnSuffix);
       buffer.endOfStatement();
 
       // check constraints cannot be added in one statement for h2
@@ -467,14 +478,15 @@ public class PlatformDdl {
         buffer.append(ddl).endOfStatement();
       }
     } else {
+      buffer.append(addColumnSuffix);
       buffer.endOfStatement();
     }
 
   }
 
   public void alterTableDropColumn(DdlBuffer buffer, String tableName, String columnName) throws IOException {
-    buffer.append("alter table ").append(tableName).append(" drop column ").append(columnName)
-    .endOfStatement();
+    buffer.append("alter table ").append(tableName).append(" ").append(dropColumn).append(" ").append(columnName)
+    .append(dropColumnSuffix).endOfStatement();
   }
 
   /**
@@ -494,19 +506,19 @@ public class PlatformDdl {
    */
   public String alterColumnType(String tableName, String columnName, String type) {
 
-    return "alter table " + tableName + " " + alterColumn + " " + columnName + " " + columnSetType + convert(type, false);
+    return "alter table " + tableName + " " + alterColumn + " " + columnName + " " + columnSetType + convert(type, false) + alterColumnSuffix;
   }
 
   /**
    * Alter a column adding or removing the not null constraint.
    * <p>
-   * Note that that MySql and SQL Server instead use alterColumnBaseAttributes()
+   * Note that that MySql, SQL Server, and HANA instead use alterColumnBaseAttributes()
    * </p>
    */
   public String alterColumnNotnull(String tableName, String columnName, boolean notnull) {
 
     String suffix = notnull ? columnSetNotnull : columnSetNull;
-    return "alter table " + tableName + " " + alterColumn + " " + columnName + " " + suffix;
+    return "alter table " + tableName + " " + alterColumn + " " + columnName + " " + suffix + alterColumnSuffix;
   }
 
   /**
@@ -522,17 +534,17 @@ public class PlatformDdl {
    */
   public String alterColumnDefaultValue(String tableName, String columnName, String defaultValue) {
     String suffix = DdlHelp.isDropDefault(defaultValue) ? columnDropDefault : columnSetDefault + " " + convertDefaultValue(defaultValue);
-    return "alter table " + tableName + " " + alterColumn + " " + columnName + " " + suffix;
+    return "alter table " + tableName + " " + alterColumn + " " + columnName + " " + suffix + alterColumnSuffix;
   }
 
   /**
    * Alter column setting both the type and not null constraint.
    * <p>
-   * Used by MySql and SQL Server as these require both column attributes to be set together.
+   * Used by MySql, SQL Server, and HANA as these require both column attributes to be set together.
    * </p>
    */
   public String alterColumnBaseAttributes(AlterColumn alter) {
-    // by default do nothing, only used by mysql and sql server as they can only
+    // by default do nothing, only used by mysql, sql server, and HANA as they can only
     // modify the column with the full column definition
     return null;
   }
@@ -662,6 +674,17 @@ public class PlatformDdl {
   public void unlockTables(DdlBuffer buffer, Collection<String> tables) throws IOException {
 
   }
+  
+  /**
+   * Returns the database-specific "create table" command prefix. For HANA this is
+   * either "create column table" or "create row table", for all other databases
+   * it is "create table".
+   * 
+   * @return The "create table" command prefix
+   */
+  public String getCreateTableCommandPrefix() {
+    return createTable;
+  }
 
   public boolean suppressPrimaryKeyOnPartition() {
     return false;
diff --git a/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java b/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
index efeb3d9e0..acf955620 100644
--- a/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
+++ b/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
@@ -5,6 +5,7 @@ import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.cockroach.CockroachPlatform;
 import io.ebean.config.dbplatform.db2.DB2Platform;
 import io.ebean.config.dbplatform.h2.H2Platform;
+import io.ebean.config.dbplatform.hana.HanaPlatform;
 import io.ebean.config.dbplatform.hsqldb.HsqldbPlatform;
 import io.ebean.config.dbplatform.mysql.MySqlPlatform;
 import io.ebean.config.dbplatform.oracle.OraclePlatform;
@@ -106,6 +107,9 @@ public class DatabasePlatformFactory {
     if (dbName.equals("sqlite")) {
       return new SQLitePlatform();
     }
+    if (dbName.equals("hana")) {
+      return new HanaPlatform();
+    }
 
     throw new RuntimeException("database platform " + dbName + " is not known?");
   }
@@ -156,6 +160,8 @@ public class DatabasePlatformFactory {
       return new DB2Platform();
     } else if (dbProductName.contains("sql anywhere")) {
       return new SqlAnywherePlatform();
+    }else if (dbProductName.contains("hdb")) {
+      return new HanaPlatform();
     }
 
     // use the standard one
diff --git a/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java b/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java
index bf901ed50..dbf657c49 100644
--- a/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java
@@ -4,6 +4,7 @@ import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.CockroachDdl;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.DB2Ddl;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.H2Ddl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.HanaColumnStoreDdl;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.HsqldbDdl;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.MySqlDdl;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.Oracle10Ddl;
@@ -47,6 +48,8 @@ public class PlatformDdlBuilder {
       case SQLSERVER17:
       case SQLSERVER:
         return new SqlServerDdl(platform);
+      case HANA:
+        return new HanaColumnStoreDdl(platform);
       default:
         return new PlatformDdl(platform);
     }
diff --git a/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java b/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java
index e9696e5b6..1bebb5e96 100644
--- a/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java
+++ b/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java
@@ -25,6 +25,8 @@ public class DbExpressionHandlerFactory {
       case SQLSERVER17:
       case SQLSERVER:
         return new SqlServerDbExpression();
+      case HANA:
+        return new HanaDbExpression();
       default:
         return new BasicDbExpression();
     }
diff --git a/src/main/java/io/ebeaninternal/server/expression/platform/HanaDbExpression.java b/src/main/java/io/ebeaninternal/server/expression/platform/HanaDbExpression.java
new file mode 100644
index 000000000..0593bdb84
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/expression/platform/HanaDbExpression.java
@@ -0,0 +1,60 @@
+package io.ebeaninternal.server.expression.platform;
+
+import io.ebeaninternal.api.SpiExpressionRequest;
+import io.ebeaninternal.server.expression.BitwiseOp;
+import io.ebeaninternal.server.expression.Op;
+
+/**
+ * HANA handling of platform specific expressions.
+ */
+public class HanaDbExpression extends BaseDbExpression {
+
+  @Override
+  public void bitwise(SpiExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare,
+      long match) {
+    bitwiseFunction(request, propName, operator, compare);
+  }
+
+  @Override
+  public void json(SpiExpressionRequest request, String propName, String path, Op operator, Object value) {
+    request.append("json_value(").append(propName).append(", '$.").append(path).append("')");
+    request.append(operator.bind());
+  }
+
+  @Override
+  public void arrayIsEmpty(SpiExpressionRequest request, String propName, boolean empty) {
+    request.append("cardinality(").append(propName).append(")");
+    if (empty) {
+      request.append(" = 0");
+    } else {
+      request.append(" <> 0");
+    }
+  }
+
+  @Override
+  public String concat(String property0, String separator, String property1, String suffix) {
+    StringBuilder sb = new StringBuilder();
+    sb.append("concat(").append(property0).append(", '").append(separator).append("'||").append(property1);
+    if (suffix != null && !suffix.isEmpty()) {
+      sb.append("||'").append(suffix).append('\'');
+    }
+    sb.append(")");
+    return sb.toString();
+  }
+
+  @Override
+  public void arrayContains(SpiExpressionRequest request, String propName, boolean contains, Object... values) {
+    for (int i = 0; i < values.length; i++) {
+      if (i > 0) {
+        request.append(" and ");
+      }
+      request.append("(?");
+      if (!contains) {
+        request.append(" not ");
+      }
+      request.append(" member of ").append(propName).append(")");
+
+    }
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index a58c7b6ec..eeacc87df 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -426,7 +426,7 @@ class CQueryBuilder {
     try {
       // For SqlServer we need either "selectMethod=cursor" in the connection string or fetch explicitly a cursorable
       // statement here by specifying ResultSet.CONCUR_UPDATABLE
-      PreparedStatement statement = connection.prepareStatement(sql,ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_UPDATABLE);
+      PreparedStatement statement = connection.prepareStatement(sql,ResultSet.TYPE_FORWARD_ONLY, dbPlatform.isSupportsResultSetConcurrencyModeUpdatable() ? ResultSet.CONCUR_UPDATABLE : ResultSet.CONCUR_READ_ONLY);
       predicates.bind(statement, connection);
 
       ResultSet resultSet = statement.executeQuery();
diff --git a/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml b/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml
index 825171455..d50eef8b6 100644
--- a/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml
+++ b/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml
@@ -159,4 +159,39 @@ BEGIN
 END
 $$
 </ddl-script>
+
+<ddl-script name="create procs" platforms="hana" init="true">-- Inital script to create stored procedures etc for the hana platform
+delimiter $$
+--
+-- PROCEDURE: usp_ebean_drop_foreign_keys TABLE, COLUMN
+-- deletes all constraints and foreign keys referring to TABLE.COLUMN
+--
+CREATE OR REPLACE PROCEDURE usp_ebean_drop_foreign_keys(IN table_name NVARCHAR(256), IN column_name NVARCHAR(256))
+AS
+BEGIN
+  DECLARE foreign_key_names TABLE(CONSTRAINT_NAME NVARCHAR(256), TABLE_NAME NVARCHAR(256));
+  DECLARE i INT;
+  
+  foreign_key_names = SELECT CONSTRAINT_NAME, TABLE_NAME FROM SYS.REFERENTIAL_CONSTRAINTS WHERE SCHEMA_NAME=CURRENT_SCHEMA AND TABLE_NAME=UPPER(:table_name) AND COLUMN_NAME=UPPER(:column_name);
+  
+  FOR I IN 1 .. RECORD_COUNT(:foreign_key_names) DO
+    EXEC 'ALTER TABLE "' || ESCAPE_DOUBLE_QUOTES(:foreign_key_names.TABLE_NAME[i]) || '" DROP CONSTRAINT "' || ESCAPE_DOUBLE_QUOTES(:foreign_key_names.CONSTRAINT_NAME[i]) || '"';
+  END FOR;
+  
+END;
+$$
+
+delimiter $$
+--
+-- PROCEDURE: usp_ebean_drop_column TABLE, COLUMN
+-- deletes the column and ensures that all indices and constraints are dropped first
+--
+CREATE OR REPLACE PROCEDURE usp_ebean_drop_column(IN table_name NVARCHAR(256), IN column_name NVARCHAR(256))
+AS
+BEGIN
+  CALL usp_ebean_drop_foreign_keys(table_name, column_name);
+  EXEC 'ALTER TABLE "' || UPPER(ESCAPE_DOUBLE_QUOTES(table_name)) || '" DROP ("' || UPPER(ESCAPE_DOUBLE_QUOTES(column_name)) || '")';
+END;
+$$
+</ddl-script>
 </extra-ddl>
diff --git a/src/test/java/io/ebean/BaseTestCase.java b/src/test/java/io/ebean/BaseTestCase.java
index cee47bcaf..7fd97fa9e 100644
--- a/src/test/java/io/ebean/BaseTestCase.java
+++ b/src/test/java/io/ebean/BaseTestCase.java
@@ -1,5 +1,6 @@
 package io.ebean;
 
+import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
 import io.ebean.meta.BasicMetricVisitor;
 import io.ebean.meta.MetaTimedMetric;
@@ -10,6 +11,9 @@ import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.core.HelpCreateQueryRequest;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
+import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
+import io.ebeaninternal.server.expression.platform.DbExpressionHandlerFactory;
+
 import org.avaje.agentloader.AgentLoader;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -144,6 +148,10 @@ public abstract class BaseTestCase {
   public boolean isMySql() {
     return Platform.MYSQL == platform();
   }
+  
+  public boolean isHana() {
+    return Platform.HANA == platform();
+  }
 
   public boolean isPlatformBooleanNative() {
     return Types.BOOLEAN == spiEbeanServer().getDatabasePlatform().getBooleanDbType();
@@ -152,6 +160,10 @@ public abstract class BaseTestCase {
   public boolean isPlatformOrderNullsSupport() {
     return isH2() || isPostgres();
   }
+  
+  public boolean isPersistBatchOnCascade() {
+    return spiEbeanServer().getDatabasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE;
+  }
 
   /**
    * Wait for the L2 cache to propagate changes post-commit.
@@ -205,6 +217,18 @@ public abstract class BaseTestCase {
       assertThat(sql).contains(containsIn+" not in ");
     }
   }
+  
+  /**
+   * Platform specific CONCAT clause.
+   */
+  protected String concat(String property0, String separator, String property1) {
+    return concat(property0, separator, property1, null);
+  }
+
+  protected String concat(String property0, String separator, String property1, String suffix) {
+    DbExpressionHandler dbExpressionHandler = DbExpressionHandlerFactory.from(spiEbeanServer().getDatabasePlatform());
+    return dbExpressionHandler.concat(property0, separator, property1, suffix);
+  }
 
   protected <T> OrmQueryRequest<T> createQueryRequest(SpiQuery.Type type, Query<T> query, Transaction t) {
     return HelpCreateQueryRequest.create(server(), type, query, t);
diff --git a/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
index 07e8b3122..3a1adf02c 100644
--- a/src/test/java/io/ebean/DtoQueryFromOrmTest.java
+++ b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
@@ -3,6 +3,7 @@ package io.ebean;
 import io.ebean.meta.BasicMetricVisitor;
 import io.ebean.meta.MetaQueryMetric;
 import io.ebean.meta.MetaTimedMetric;
+
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -43,17 +44,13 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     resetAllMetrics();
 
-    String[] prefix = {"Bl", "B", "Red", "jim"};
+    String[] prefix = { "Bl", "B", "Red", "jim" };
 
     for (String val : prefix) {
       List<ContactDto> list = Ebean.find(Contact.class)
-        .select("email, concat(lastName,', ',firstName) as fullName")
-        .where().istartsWith("concat(lastName,', ',firstName)", val)
-        .orderBy().asc("lastName")
-        .setMaxRows(10)
-        .asDto(ContactDto.class)
-        .setLabel("prefixLoop")
-        .findList();
+          .select("email, " + concat("lastName", ", ", "firstName") + " as fullName").where()
+          .istartsWith(concat("lastName", ", ", "firstName"), val).orderBy().asc("lastName").setMaxRows(10)
+          .asDto(ContactDto.class).setLabel("prefixLoop").findList();
 
       System.out.println("List:" + list);
     }
@@ -77,14 +74,10 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    DtoQuery<ContactDto> query =
-      Ebean.find(Contact.class)
+    DtoQuery<ContactDto> query = Ebean.find(Contact.class)
         // we must explicitly add the id property for DTO query (if we want it)
-        .select("id, email, concat(lastName,', ',firstName) as fullName")
-        .where().isNotNull("email").isNotNull("lastName")
-        .orderBy().asc("lastName")
-        .asDto(ContactDto.class)
-        .setLabel("explicitId")
+        .select("id, email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email")
+        .isNotNull("lastName").orderBy().asc("lastName").asDto(ContactDto.class).setLabel("explicitId")
         .setRelaxedMode();
 
     List<ContactDto> dtos = query.findList();
@@ -98,7 +91,8 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     }
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(sql.get(0)).contains("select t0.id, t0.email, concat(t0.last_name,', ',t0.first_name) fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+    assertThat(sql.get(0)).contains("select t0.id, t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
+        + " fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
   }
 
   @Test
@@ -108,12 +102,9 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    DtoQuery<ContactDto> query =
-      Ebean.find(Contact.class)
-        .select("email, concat(lastName,', ',firstName) as fullName")
-        .where().isNotNull("email").isNotNull("lastName")
-        .orderBy().asc("lastName")
-        .asDto(ContactDto.class);
+    DtoQuery<ContactDto> query = Ebean.find(Contact.class)
+        .select("email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email")
+        .isNotNull("lastName").orderBy().asc("lastName").asDto(ContactDto.class);
 
     List<ContactDto> dtos = query.findList();
 
@@ -126,10 +117,10 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     }
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(sql.get(0)).contains("select t0.email, concat(t0.last_name,', ',t0.first_name) fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+    assertThat(sql.get(0)).contains("select t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
+        + " fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
   }
 
-
   @Test
   public void example() {
 
@@ -137,15 +128,9 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    List<ContactDto> contactDtos
-      = Ebean.find(Contact.class)
-      .setLabel("emailFullName")
-      .select("email, concat(lastName,', ',firstName) as fullName")
-      .where().isNotNull("email").isNotNull("lastName")
-      .orderBy().asc("lastName")
-      .setMaxRows(10)
-      .asDto(ContactDto.class)
-      .findList();
+    List<ContactDto> contactDtos = Ebean.find(Contact.class).setLabel("emailFullName")
+        .select("email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email")
+        .isNotNull("lastName").orderBy().asc("lastName").setMaxRows(10).asDto(ContactDto.class).findList();
 
     assertThat(contactDtos).isNotEmpty();
 
@@ -158,10 +143,12 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
 
     if (isSqlServer()) {
-      assertThat(sql.get(0)).contains("select top 10 t0.email, concat(t0.last_name,', ',t0.first_name) fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+      assertThat(sql.get(0)).contains("select top 10 t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
+          + " fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
 
     } else {
-      assertThat(sql.get(0)).contains("select t0.email, concat(t0.last_name,', ',t0.first_name) fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+      assertThat(sql.get(0)).contains("select t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
+          + " fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
     }
   }
 
@@ -172,14 +159,9 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    List<ContactDto> contactDtos
-      = Ebean.find(Contact.class)
-      .select("id, email, concat(lastName,', ',firstName) as fullName")
-      .where().isNotNull("email").isNotNull("lastName")
-      .orderBy().asc("lastName")
-      .setMaxRows(10)
-      .asDto(ContactDto.class)
-      .findList();
+    List<ContactDto> contactDtos = Ebean.find(Contact.class)
+        .select("id, email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email")
+        .isNotNull("lastName").orderBy().asc("lastName").setMaxRows(10).asDto(ContactDto.class).findList();
 
     assertThat(contactDtos).isNotEmpty();
 
@@ -192,9 +174,12 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.stop();
     if (isSqlServer()) {
-      assertThat(sql.get(0)).contains("select top 10 t0.id, t0.email, concat(t0.last_name,', ',t0.first_name) fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+      assertThat(sql.get(0)).contains("select top 10 t0.id, t0.email, "
+          + concat("t0.last_name", ", ", "t0.first_name")
+          + " fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
     } else {
-      assertThat(sql.get(0)).contains("select t0.id, t0.email, concat(t0.last_name,', ',t0.first_name) fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+      assertThat(sql.get(0)).contains("select t0.id, t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
+          + " fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
     }
   }
 
@@ -205,15 +190,9 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    List<ContactDto> contactDtos
-      = Ebean.find(Contact.class)
-      .select("concat(lastName,', ',firstName) as fullName")
-      .where().isNotNull("lastName")
-      .orderBy().asc("lastName")
-      .asDto(ContactDto.class)
-      .setFirstRow(2)
-      .setMaxRows(5)
-      .findList();
+    List<ContactDto> contactDtos = Ebean.find(Contact.class)
+        .select(concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("lastName").orderBy()
+        .asc("lastName").asDto(ContactDto.class).setFirstRow(2).setMaxRows(5).findList();
 
     assertThat(contactDtos).isNotEmpty();
 
@@ -225,10 +204,10 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     }
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(sql.get(0)).contains("select concat(t0.last_name,', ',t0.first_name) fullName from contact t0 where");
+    assertThat(sql.get(0))
+        .contains("select " + concat("t0.last_name", ", ", "t0.first_name") + " fullName from contact t0 where");
   }
 
-
   @Test
   public void example_aggregate() {
 
@@ -236,14 +215,9 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    List<ContactTotals> contactDtos
-      = Ebean.find(Contact.class)
-      .select("lastName, count(*) as totalCount")
-      .where().isNotNull("lastName")
-      .having().gt("count(*)", 1)
-      .orderBy().desc("count(*)")
-      .asDto(ContactTotals.class)
-      .findList();
+    List<ContactTotals> contactDtos = Ebean.find(Contact.class).select("lastName, count(*) as totalCount").where()
+        .isNotNull("lastName").having().gt("count(*)", 1).orderBy().desc("count(*)").asDto(ContactTotals.class)
+        .findList();
 
     assertThat(contactDtos).isNotEmpty();
 
@@ -253,7 +227,8 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     }
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(sql.get(0)).contains("select t0.last_name, count(*) totalCount from contact t0 where t0.last_name is not null  group by t0.last_name having count(*) > ?");
+    assertThat(sql.get(0)).contains(
+        "select t0.last_name, count(*) totalCount from contact t0 where t0.last_name is not null  group by t0.last_name having count(*) > ?");
   }
 
   @Test
@@ -261,12 +236,8 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    List<ContactTotals> contactDtos
-      = Ebean.find(Contact.class)
-      .select("lastName, count(*) as totalCount")
-      .where().isNotNull("lastName")
-      .asDto(ContactTotals.class)
-      .findList();
+    List<ContactTotals> contactDtos = Ebean.find(Contact.class).select("lastName, count(*) as totalCount").where()
+        .isNotNull("lastName").asDto(ContactTotals.class).findList();
 
     assertThat(contactDtos).isNotEmpty();
   }
diff --git a/src/test/java/io/ebean/SqlRowBooleanTest.java b/src/test/java/io/ebean/SqlRowBooleanTest.java
index 3496b02cd..e5aa7d148 100644
--- a/src/test/java/io/ebean/SqlRowBooleanTest.java
+++ b/src/test/java/io/ebean/SqlRowBooleanTest.java
@@ -16,6 +16,8 @@ public class SqlRowBooleanTest extends BaseTestCase {
       sqlQuery = Ebean.createSqlQuery("SELECT 1 AS ISNT_NULL from dual");
     } else if (isDb2()) {
       sqlQuery = Ebean.createSqlQuery("SELECT 1 AS ISNT_NULL from SYSIBM.SYSDUMMY1");
+    } else if (isHana()) {
+      sqlQuery = Ebean.createSqlQuery("SELECT 1 AS ISNT_NULL from sys.dummy");
     } else {
       sqlQuery = Ebean.createSqlQuery("SELECT 1 IS NOT NULL AS ISNT_NULL");
     }
diff --git a/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java b/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java
new file mode 100644
index 000000000..c40ceaf41
--- /dev/null
+++ b/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java
@@ -0,0 +1,48 @@
+package io.ebean.config.dbplatform;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import org.junit.Test;
+
+import io.ebean.config.dbplatform.hana.HanaHistorySupport;
+
+public class HanaHistorySupportTest {
+
+  private HanaHistorySupport support = new HanaHistorySupport();
+
+  @Test
+  public void getAsOfPredicate() {
+
+    String asOfPredicate = support.getAsOfPredicate("t0", "sys_period");
+    assertNull(asOfPredicate);
+  }
+
+  @Test
+  public void getAsOfViewSuffix() {
+
+    String asOfViewSuffix = support.getAsOfViewSuffix("_with_history");
+    assertEquals(asOfViewSuffix, " for system_time as of ?");
+  }
+  
+  @Test
+  public void getVersionsBetweenSuffix() {
+
+    String asOfViewSuffix = support.getVersionsBetweenSuffix("_with_history");
+    assertEquals(asOfViewSuffix, " for system_time between ? and ?");
+  }
+
+  @Test
+  public void getLower() throws Exception {
+
+    String lower = support.getSysPeriodLower("t0", "sys_period");
+    assertEquals(lower, "t0.sys_period_start");
+  }
+
+  @Test
+  public void getUpper() throws Exception {
+
+    String upper = support.getSysPeriodUpper("t0", "sys_period");
+    assertEquals(upper, "t0.sys_period_end");
+  }
+}
diff --git a/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java b/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java
new file mode 100644
index 000000000..948513a05
--- /dev/null
+++ b/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java
@@ -0,0 +1,67 @@
+package io.ebean.config.dbplatform;
+
+import io.ebean.config.PlatformConfig;
+import io.ebean.config.dbplatform.hana.HanaPlatform;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl;
+import io.ebeaninternal.server.core.PlatformDdlBuilder;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class HanaPlatformTest {
+
+  HanaPlatform platform = new HanaPlatform();
+
+  @Test
+  public void testTypeConversion() {
+
+    PlatformDdl ddl = PlatformDdlBuilder.create(platform);
+
+    assertThat(ddl.convert("clob", false)).isEqualTo("nclob");
+    assertThat(ddl.convert("blob", false)).isEqualTo("blob");
+    assertThat(ddl.convert("json", false)).isEqualTo("nclob");
+    assertThat(ddl.convert("jsonb", false)).isEqualTo("nclob");
+    assertThat(ddl.convert("jsonvarchar", false)).isEqualTo("nvarchar(255)");
+
+    assertThat(ddl.convert("double", false)).isEqualTo("double");
+    assertThat(ddl.convert("varchar(20)", false)).isEqualTo("nvarchar(20)");
+    assertThat(ddl.convert("decimal(10)", false)).isEqualTo("decimal(10)");
+    assertThat(ddl.convert("decimal(8,4)", false)).isEqualTo("decimal(8,4)");
+    assertThat(ddl.convert("boolean", false)).isEqualTo("boolean");
+    assertThat(ddl.convert("bit", false)).isEqualTo("smallint");
+    assertThat(ddl.convert("tinyint", false)).isEqualTo("smallint");
+    assertThat(ddl.convert("binary", false)).isEqualTo("varbinary(255)");
+    assertThat(ddl.convert("binary(16)", false)).isEqualTo("varbinary(16)");
+    
+    assertThat(ddl.convert("point", false)).isEqualTo("st_point");
+    
+    assertThat(ddl.convert("multilinestring", false)).isEqualTo("st_geometry");
+    assertThat(ddl.convert("multipolygon", false)).isEqualTo("st_geometry");
+    assertThat(ddl.convert("multipoint", false)).isEqualTo("st_geometry");
+    assertThat(ddl.convert("linestring", false)).isEqualTo("st_geometry");
+    assertThat(ddl.convert("polygon", false)).isEqualTo("st_geometry");
+  }
+
+  @Test
+  public void uuid_default() {
+
+    HanaPlatform platform = new HanaPlatform();
+    platform.configure(new PlatformConfig());
+    DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
+
+    assertThat(dbType.renderType(0, 0)).isEqualTo("varchar(40)");
+  }
+
+  @Test
+  public void uuid_as_binary() {
+
+    HanaPlatform platform = new HanaPlatform();
+    PlatformConfig config = new PlatformConfig();
+    config.setDbUuid(PlatformConfig.DbUuid.AUTO_BINARY);
+
+    platform.configure(config);
+
+    DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
+    assertThat(dbType.renderType(0, 0)).isEqualTo("varbinary(16)");
+  }
+}
diff --git a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
index 635a9b9ac..27fda6d25 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
@@ -53,12 +53,14 @@ public class DbMigrationGenerateTest {
     migration.addPlatform(Platform.ORACLE, "oracle");
     migration.addPlatform(Platform.SQLITE, "sqlite");
     migration.addPlatform(Platform.SQLSERVER17, "sqlserver17");
+    migration.addPlatform(Platform.HANA, "hana");
 
     ServerConfig config = new ServerConfig();
     config.setName("migrationtest");
     config.loadFromProperties();
     config.setRegister(false);
     config.setDefaultServer(false);
+    config.getProperties().put("ebean.hana.generateUniqueDdl", "true"); // need to generate unique statements to prevent them from being filtered out as duplicates by the DdlRunner
 
 
     config.setPackages(Arrays.asList("misc.migration.v1_0"));
diff --git a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
index 218b2ced8..00b99161f 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
@@ -7,7 +7,6 @@ import io.ebean.SqlUpdate;
 import io.ebean.Transaction;
 import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.Platform;
-import io.ebean.migration.MigrationConfig;
 import io.ebean.migration.ddl.DdlRunner;
 import io.ebeaninternal.dbmigration.ddlgeneration.Helper;
 
@@ -90,7 +89,7 @@ public class DbMigrationTest extends BaseTestCase {
 
     runScript(false, "1.0__initial.sql");
 
-    if (isOracle()) {
+    if (isOracle() || isHana()) {
       SqlUpdate update = server().createSqlUpdate("insert into migtest_e_basic (id, old_boolean, user_id) values (1, :false, 1)");
       update.setParameter("false", false);
       assertThat(server().execute(update)).isEqualTo(1);
@@ -199,6 +198,7 @@ public class DbMigrationTest extends BaseTestCase {
     for (String table : tables) {
       // simple and stupid try to execute all commands on all dialects.
       sb.append("alter table ").append(table).append(" set ( system_versioning = OFF  );\n");
+      sb.append("alter table ").append(table).append(" drop system versioning;\n");
       sb.append("drop table ").append(table).append(";\n");
       sb.append("drop table ").append(table).append(" cascade;\n");
       sb.append("drop table ").append(table).append("_history;\n");
diff --git a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java
index e185e8df7..bfb7b0b64 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java
@@ -5,6 +5,7 @@ import io.ebean.Ebean;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.h2.H2Platform;
+import io.ebean.config.dbplatform.hana.HanaPlatform;
 import io.ebean.config.dbplatform.postgres.PostgresPlatform;
 import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
 import io.ebeaninternal.api.SpiEbeanServer;
@@ -16,7 +17,6 @@ import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-
 public class BaseDdlHandlerTest extends BaseTestCase {
 
   private ServerConfig serverConfig = new ServerConfig();
@@ -37,6 +37,10 @@ public class BaseDdlHandlerTest extends BaseTestCase {
     return handler(new SqlServer17Platform());
   }
 
+  private DdlHandler hanaHandler() {
+    return handler(new HanaPlatform());
+  }
+
   @Test
   public void addColumn_nullable_noConstraint() throws Exception {
 
@@ -47,6 +51,10 @@ public class BaseDdlHandlerTest extends BaseTestCase {
     write = new DdlWrite();
     sqlserverHandler().generate(write, Helper.getAddColumn());
     assertThat(write.apply().getBuffer()).isEqualTo("alter table foo add added_to_foo nvarchar(20);\n\n");
+
+    write = new DdlWrite();
+    hanaHandler().generate(write, Helper.getAddColumn());
+    assertThat(write.apply().getBuffer()).isEqualTo("alter table foo add ( added_to_foo nvarchar(20));\n\n");
   }
 
   @Test
@@ -56,10 +64,16 @@ public class BaseDdlHandlerTest extends BaseTestCase {
     h2Handler().generate(write, Helper.getAlterTableAddColumnWithCheckConstraint());
     assertThat(write.apply().getBuffer()).isEqualTo("alter table foo add column status integer;\n"
         + "alter table foo add constraint ck_ordering_status check ( status in (0,1));\n\n");
+
+    write = new DdlWrite();
+    hanaHandler().generate(write, Helper.getAlterTableAddColumnWithCheckConstraint());
+    assertThat(write.apply().getBuffer()).isEqualTo("alter table foo add ( status integer);\n"
+        + "alter table foo add constraint ck_ordering_status check ( status in (0,1));\n\n");
   }
 
   /**
-   * Test the functionality of the Ebean {@literal @}DbArray extension during DDL generation.
+   * Test the functionality of the Ebean {@literal @}DbArray extension during DDL
+   * generation.
    */
   @Test
   public void addColumn_dbarray() throws Exception {
@@ -76,6 +90,12 @@ public class BaseDdlHandlerTest extends BaseTestCase {
     DdlHandler sqlserverHandler = sqlserverHandler();
     sqlserverHandler.generate(write, Helper.getAlterTableAddDbArrayColumn());
     assertThat(write.apply().getBuffer()).isEqualTo("alter table foo add dbarray_added_to_foo varchar(1000);\n\n");
+
+    write = new DdlWrite();
+
+    DdlHandler hanaHandler = hanaHandler();
+    hanaHandler.generate(write, Helper.getAlterTableAddDbArrayColumn());
+    assertThat(write.apply().getBuffer()).isEqualTo("alter table foo add ( dbarray_added_to_foo nvarchar(255) array);\n\n");
   }
 
   @Test
@@ -93,6 +113,10 @@ public class BaseDdlHandlerTest extends BaseTestCase {
     write = new DdlWrite();
     sqlserverHandler().generate(write, Helper.getAlterTableAddDbArrayColumnWithLength());
     assertThat(write.apply().getBuffer()).isEqualTo("alter table foo add dbarray_ninety varchar(90);\n\n");
+
+    write = new DdlWrite();
+    hanaHandler().generate(write, Helper.getAlterTableAddDbArrayColumnWithLength());
+    assertThat(write.apply().getBuffer()).isEqualTo("alter table foo add ( dbarray_ninety nvarchar(255) array(90));\n\n");
   }
 
   @Test
@@ -113,6 +137,14 @@ public class BaseDdlHandlerTest extends BaseTestCase {
     write = new DdlWrite();
     sqlserverHandler().generate(write, Helper.getAlterTableAddDbArrayColumnInteger());
     assertThat(write.apply().getBuffer()).isEqualTo("alter table foo add dbarray_integer varchar(1000);\n\n");
+
+    write = new DdlWrite();
+    hanaHandler().generate(write, Helper.getAlterTableAddDbArrayColumnIntegerWithLength());
+    assertThat(write.apply().getBuffer()).isEqualTo("alter table foo add ( dbarray_integer integer array(90));\n\n");
+    
+    write = new DdlWrite();
+    hanaHandler().generate(write, Helper.getAlterTableAddDbArrayColumnInteger());
+    assertThat(write.apply().getBuffer()).isEqualTo("alter table foo add ( dbarray_integer integer array);\n\n");
   }
 
   @Test
@@ -127,7 +159,8 @@ public class BaseDdlHandlerTest extends BaseTestCase {
     assertThat(buffer).contains("alter table foo add column some_id integer;");
 
     String fkBuffer = write.applyForeignKeys().getBuffer();
-    assertThat(fkBuffer).contains("alter table foo add constraint fk_foo_some_id foreign key (some_id) references bar (id) on delete restrict on update restrict;");
+    assertThat(fkBuffer).contains(
+        "alter table foo add constraint fk_foo_some_id foreign key (some_id) references bar (id) on delete restrict on update restrict;");
     assertThat(fkBuffer).contains("create index idx_foo_some_id on foo (some_id);");
     assertThat(write.dropAll().getBuffer()).isEqualTo("");
   }
@@ -142,8 +175,15 @@ public class BaseDdlHandlerTest extends BaseTestCase {
 
     assertThat(write.apply().getBuffer()).isEqualTo("alter table foo drop column col2;\n\n");
     assertThat(write.dropAll().getBuffer()).isEqualTo("");
-  }
 
+    write = new DdlWrite();
+    DdlHandler hanaHandler = hanaHandler();
+
+    hanaHandler.generate(write, Helper.getDropColumn());
+
+    assertThat(write.apply().getBuffer()).isEqualTo("CALL usp_ebean_drop_column('foo', 'col2');\n\n");
+    assertThat(write.dropAll().getBuffer()).isEqualTo("");
+  }
 
   @Test
   public void createTable() throws Exception {
@@ -157,6 +197,16 @@ public class BaseDdlHandlerTest extends BaseTestCase {
 
     assertThat(write.apply().getBuffer()).isEqualTo(createTableDDL);
     assertThat(write.dropAll().getBuffer().trim()).isEqualTo("drop table if exists foo;");
+
+    write = new DdlWrite();
+    DdlHandler hanaHandler = hanaHandler();
+
+    hanaHandler.generate(write, Helper.getCreateTable());
+
+    String createColumnTableDDL = Helper.asText(this, "/assert/create-column-table.txt");
+
+    assertThat(write.apply().getBuffer()).isEqualTo(createColumnTableDDL);
+    assertThat(write.dropAll().getBuffer().trim()).isEqualTo("drop table foo cascade;");
   }
 
   @Test
@@ -174,7 +224,6 @@ public class BaseDdlHandlerTest extends BaseTestCase {
     assertThat(write.dropAll().getBuffer()).isEqualTo(rollbackLast);
   }
 
-
   @Ignore
   @Test
   public void generateChangeSetFromModel() throws Exception {
diff --git a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlTest.java
new file mode 100644
index 000000000..911a28964
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlTest.java
@@ -0,0 +1,42 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+import io.ebean.config.dbplatform.hana.HanaPlatform;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.migration.Column;
+
+public class HanaDdlTest {
+
+  @Test
+  public void alterTableDropColumn() throws IOException {
+    HanaColumnStoreDdl ddl = new HanaColumnStoreDdl(new HanaPlatform());
+    DdlWrite write = new DdlWrite();
+    ddl.alterTableDropColumn(write.apply(), "my_table", "my_column");
+    assertEquals("CALL usp_ebean_drop_column('my_table', 'my_column');\n", write.apply().getBuffer());
+  }
+
+  @Test
+  public void alterTableAddColumn() throws IOException {
+    HanaColumnStoreDdl ddl = new HanaColumnStoreDdl(new HanaPlatform());
+    DdlWrite write = new DdlWrite();
+    Column column = new Column();
+    column.setName("my_column");
+    column.setComment("comment");
+    column.setDefaultValue("1");
+    column.setNotnull(Boolean.TRUE);
+    column.setType("int");
+    column.setUnique("unique");
+    column.setPrimaryKey(Boolean.TRUE);
+    column.setCheckConstraint("CHECK(my_column > 0)");
+    column.setCheckConstraintName("check_constraint");
+    column.setHistoryExclude(Boolean.TRUE);
+    column.setIdentity(Boolean.TRUE);
+    ddl.alterTableAddColumn(write.apply(), "my_table", column, false, "1");
+    assertEquals("alter table my_table add ( my_column int default 1 not null);\nalter table my_table add constraint check_constraint CHECK(my_column > 0);\n", write.apply().getBuffer());
+  }
+}
diff --git a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
index d19d4cc28..7d5279990 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
@@ -4,6 +4,7 @@ import io.ebean.Ebean;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.h2.H2Platform;
+import io.ebean.config.dbplatform.hana.HanaPlatform;
 import io.ebean.config.dbplatform.mysql.MySqlPlatform;
 import io.ebean.config.dbplatform.oracle.OraclePlatform;
 import io.ebean.config.dbplatform.postgres.PostgresPlatform;
@@ -16,6 +17,8 @@ import org.junit.Test;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 
 public class PlatformDdl_AlterColumnTest {
 
@@ -24,6 +27,7 @@ public class PlatformDdl_AlterColumnTest {
   private PlatformDdl mysqlDdl = PlatformDdlBuilder.create(new MySqlPlatform());
   private PlatformDdl oraDdl = PlatformDdlBuilder.create(new OraclePlatform());
   private PlatformDdl sqlServerDdl = PlatformDdlBuilder.create(new SqlServer17Platform());
+  private PlatformDdl hanaDdl = PlatformDdlBuilder.create(new HanaPlatform());
 
   {
     ServerConfig serverConfig = Ebean.getDefaultServer().getPluginApi().getServerConfig();
@@ -63,6 +67,14 @@ public class PlatformDdl_AlterColumnTest {
     assertThat(pgDdl.convertArrayType("varchar[]")).isEqualTo("varchar[]");
     assertThat(pgDdl.convertArrayType("integer[]")).isEqualTo("integer[]");
   }
+  
+  @Test
+  public void convertArrayType_hana() {
+    assertThat(hanaDdl.convertArrayType("varchar[](90)")).isEqualTo("nvarchar(255) array(90)");
+    assertThat(hanaDdl.convertArrayType("integer[](60)")).isEqualTo("integer array(60)");
+    assertThat(hanaDdl.convertArrayType("varchar[]")).isEqualTo("nvarchar(255) array");
+    assertThat(hanaDdl.convertArrayType("integer[]")).isEqualTo("integer array");
+  }
 
   @Test
   public void testAlterColumnBaseAttributes() throws Exception {
@@ -77,20 +89,32 @@ public class PlatformDdl_AlterColumnTest {
 
     sql = sqlServerDdl.alterColumnBaseAttributes(alterColumn);
     assertEquals("alter table mytab alter column acol nvarchar(5) not null", sql);
+    
+    sql = hanaDdl.alterColumnBaseAttributes(alterColumn);
+    assertEquals("alter table mytab alter ( acol nvarchar(5) not null)", sql);
 
     alterColumn.setNotnull(Boolean.FALSE);
     sql = mysqlDdl.alterColumnBaseAttributes(alterColumn);
     assertEquals("alter table mytab modify acol varchar(5)", sql);
+    
+    sql = hanaDdl.alterColumnBaseAttributes(alterColumn);
+    assertEquals("alter table mytab alter ( acol nvarchar(5))", sql);
 
     alterColumn.setNotnull(null);
     alterColumn.setType("varchar(100)");
 
     sql = mysqlDdl.alterColumnBaseAttributes(alterColumn);
     assertEquals("alter table mytab modify acol varchar(100)", sql);
+    
+    sql = hanaDdl.alterColumnBaseAttributes(alterColumn);
+    assertEquals("alter table mytab alter ( acol nvarchar(100))", sql);
 
     alterColumn.setCurrentNotnull(Boolean.TRUE);
     sql = mysqlDdl.alterColumnBaseAttributes(alterColumn);
     assertEquals("alter table mytab modify acol varchar(100) not null", sql);
+    
+    sql = hanaDdl.alterColumnBaseAttributes(alterColumn);
+    assertEquals("alter table mytab alter ( acol nvarchar(100) not null)", sql);
   }
 
   @Test
@@ -110,6 +134,9 @@ public class PlatformDdl_AlterColumnTest {
 
     sql = sqlServerDdl.alterColumnType("mytab", "acol", "varchar(20)");
     assertNull(sql);
+    
+    sql = hanaDdl.alterColumnType("mytab", "acol", "varchar(20)");
+    assertNull(sql);
   }
 
   @Test
@@ -129,6 +156,9 @@ public class PlatformDdl_AlterColumnTest {
 
     sql = sqlServerDdl.alterColumnNotnull("mytab", "acol", true);
     assertNull(sql);
+    
+    sql = hanaDdl.alterColumnNotnull("mytab", "acol", true);
+    assertNull(sql);
   }
 
   @Test
@@ -148,6 +178,9 @@ public class PlatformDdl_AlterColumnTest {
 
     sql = sqlServerDdl.alterColumnNotnull("mytab", "acol", false);
     assertNull(sql);
+    
+    sql = hanaDdl.alterColumnNotnull("mytab", "acol", false);
+    assertNull(sql);
   }
 
   @Test
@@ -167,6 +200,15 @@ public class PlatformDdl_AlterColumnTest {
 
     sql = sqlServerDdl.alterColumnDefaultValue("mytab", "acol", "'hi'");
     assertEquals("alter table mytab add default 'hi' for acol", sql);
+    
+    boolean exceptionCaught = false;
+    try {
+      hanaDdl.alterColumnDefaultValue("mytab", "acol", "'hi'");
+    }
+    catch (UnsupportedOperationException e) {
+      exceptionCaught = true;
+    }
+    assertTrue(exceptionCaught);
   }
 
   @Test
@@ -186,6 +228,15 @@ public class PlatformDdl_AlterColumnTest {
 
     sql = sqlServerDdl.alterColumnDefaultValue("mytab", "acol", "DROP DEFAULT");
     assertEquals("EXEC usp_ebean_drop_default_constraint mytab, acol", sql);
+    
+    boolean exceptionCaught = false;
+    try {
+      hanaDdl.alterColumnDefaultValue("mytab", "acol", "DROP DEFAULT");
+    }
+    catch (UnsupportedOperationException e) {
+      exceptionCaught = true;
+    }
+    assertTrue(exceptionCaught);
   }
 
   @Test
@@ -226,4 +277,14 @@ public class PlatformDdl_AlterColumnTest {
     assertEquals(oraDdl.useIdentityType(IdentityType.GENERATOR), IdType.GENERATOR);
     assertEquals(oraDdl.useIdentityType(IdentityType.EXTERNAL), IdType.EXTERNAL);
   }
+  
+  @Test
+  public void useIdentityType_hana() {
+
+    assertEquals(hanaDdl.useIdentityType(null), IdType.IDENTITY);
+    assertEquals(hanaDdl.useIdentityType(IdentityType.SEQUENCE), IdType.IDENTITY);
+    assertEquals(hanaDdl.useIdentityType(IdentityType.IDENTITY), IdType.IDENTITY);
+    assertEquals(hanaDdl.useIdentityType(IdentityType.GENERATOR), IdType.GENERATOR);
+    assertEquals(hanaDdl.useIdentityType(IdentityType.EXTERNAL), IdType.EXTERNAL);
+  }
 }
diff --git a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java
index e68ece07c..50bd331b6 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java
@@ -1,6 +1,8 @@
 package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
+import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.h2.H2Platform;
+import io.ebean.config.dbplatform.hana.HanaPlatform;
 import io.ebean.config.dbplatform.mysql.MySqlPlatform;
 import io.ebean.config.dbplatform.oracle.OraclePlatform;
 import io.ebean.config.dbplatform.postgres.PostgresPlatform;
@@ -12,12 +14,12 @@ import static org.junit.Assert.assertEquals;
 
 public class PlatformDdl_dropUniqueConstraintTest {
 
-
   private PlatformDdl h2Ddl = PlatformDdlBuilder.create(new H2Platform());
   private PlatformDdl pgDdl = PlatformDdlBuilder.create(new PostgresPlatform());
   private PlatformDdl mysqlDdl = PlatformDdlBuilder.create(new MySqlPlatform());
   private PlatformDdl oraDdl = PlatformDdlBuilder.create(new OraclePlatform());
   private PlatformDdl sqlServerDdl = PlatformDdlBuilder.create(new SqlServer17Platform());
+  private PlatformDdl hanaDdl = PlatformDdlBuilder.create(new HanaPlatform());
 
   @Test
   public void test() throws Exception {
@@ -30,11 +32,22 @@ public class PlatformDdl_dropUniqueConstraintTest {
     assertEquals("alter table mytab drop constraint uq_name", sql);
     sql = sqlServerDdl.alterTableDropUniqueConstraint("mytab", "uq_name");
     assertEquals("IF (OBJECT_ID('uq_name', 'UQ') IS NOT NULL) alter table mytab drop constraint uq_name;\n"
-        + "IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mytab','U') AND name = 'uq_name') drop index uq_name ON mytab", sql);
-
+        + "IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mytab','U') AND name = 'uq_name') drop index uq_name ON mytab",
+        sql);
 
     sql = mysqlDdl.alterTableDropUniqueConstraint("mytab", "uq_name");
     assertEquals("alter table mytab drop index uq_name", sql);
+
+    ServerConfig serverConfig = new ServerConfig();
+    hanaDdl.configure(serverConfig);
+    sql = hanaDdl.alterTableDropUniqueConstraint("mytab", "uq_name");
+    assertEquals("delimiter $$\n" + 
+        "do\n" + 
+        "begin\n" + 
+        "declare exit handler for sql_error_code 397 begin end;\n" + 
+        "exec 'alter table mytab drop constraint uq_name';\n" + 
+        "end;\n" + 
+        "$$", sql);
   }
 
 }
diff --git a/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java
new file mode 100644
index 000000000..c67fe6de5
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java
@@ -0,0 +1,70 @@
+package io.ebeaninternal.server.expression.platform;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import io.ebeaninternal.api.SpiExpressionRequest;
+import io.ebeaninternal.server.expression.DefaultExpressionRequest;
+import io.ebeaninternal.server.expression.Op;
+
+public class HanaDbExpressionTest {
+  private HanaDbExpression expression = new HanaDbExpression();
+
+  @Test
+  public void testArrayContains() {
+    SpiExpressionRequest request = new DefaultExpressionRequest(null);
+    expression.arrayContains(request, "arrayproperty", true, "v1", "v2", "v3");
+    assertEquals("(? member of arrayproperty) and (? member of arrayproperty) and (? member of arrayproperty)",
+        request.getSql());
+  }
+
+  @Test
+  public void testArrayNotContains() {
+    SpiExpressionRequest request = new DefaultExpressionRequest(null);
+    expression.arrayContains(request, "arrayproperty", false, "v1", "v2", "v3");
+    assertEquals(
+        "(? not  member of arrayproperty) and (? not  member of arrayproperty) and (? not  member of arrayproperty)",
+        request.getSql());
+  }
+
+  @Test
+  public void testArrayContainsEmpty() {
+    SpiExpressionRequest request = new DefaultExpressionRequest(null);
+    expression.arrayContains(request, "arrayproperty", true);
+    assertEquals("", request.getSql());
+  }
+
+  @Test
+  public void testArrayIsEmpty() {
+    SpiExpressionRequest request = new DefaultExpressionRequest(null);
+    expression.arrayIsEmpty(request, "arrayproperty", true);
+    assertEquals("cardinality(arrayproperty) = 0", request.getSql());
+  }
+
+  @Test
+  public void testArrayIsNotEmpty() {
+    SpiExpressionRequest request = new DefaultExpressionRequest(null);
+    expression.arrayIsEmpty(request, "arrayproperty", false);
+    assertEquals("cardinality(arrayproperty) <> 0", request.getSql());
+  }
+
+  @Test
+  public void testConcat() {
+    String concat = expression.concat("property0", "separator", "property1", "suffix");
+    assertEquals("concat(property0, 'separator'||property1||'suffix')", concat);
+  }
+  
+  @Test
+  public void testConcatNullSuffix() {
+    String concat = expression.concat("property0", "separator", "property1", null);
+    assertEquals("concat(property0, 'separator'||property1)", concat);
+  }
+  
+  @Test
+  public void testJson() {
+    SpiExpressionRequest request = new DefaultExpressionRequest(null);
+    expression.json(request, "jsonproperty", "path", Op.EQ, "val");
+    assertEquals("json_value(jsonproperty, '$.path') = ? ", request.getSql());
+  }
+}
diff --git a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
index 0f09a79a1..ccf3aab1f 100644
--- a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
@@ -3,6 +3,9 @@ package io.ebeaninternal.server.grammer;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import io.ebean.annotation.ForPlatform;
+import io.ebean.annotation.IgnorePlatform;
+import io.ebean.annotation.Platform;
 import io.ebeaninternal.api.SpiQuery;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
@@ -11,6 +14,8 @@ import org.tests.model.basic.ResetBasicData;
 import java.util.Arrays;
 import java.util.List;
 
+import javax.xml.ws.RequestWrapper;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class EqlParserTest extends BaseTestCase {
@@ -127,6 +132,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
+  @IgnorePlatform(Platform.HANA) // The HANA JDBC driver checks the field length on binding and rejects 'NEW'
   public void where_or1() {
 
     Query<Customer> query = parse("where name = 'Rob' or (status = 'NEW' and smallnote is null)");
@@ -134,8 +140,19 @@ public class EqlParserTest extends BaseTestCase {
 
     assertThat(query.getGeneratedSql()).contains("where (t0.name = ?  or (t0.status = ?  and t0.smallnote is null ) )");
   }
+  
+  @Test
+  @ForPlatform(Platform.HANA)
+  public void where_or1_hana() {
+
+    Query<Customer> query = parse("where name = 'Rob' or (status = 'N' and smallnote is null)");
+    query.findList();
+
+    assertThat(query.getGeneratedSql()).contains("where (t0.name = ?  or (t0.status = ?  and t0.smallnote is null ) )");
+  }
 
   @Test
+  @IgnorePlatform(Platform.HANA) // The HANA JDBC driver checks the field length on binding and rejects 'NEW'
   public void where_or2() {
 
     Query<Customer> query = parse("where (name = 'Rob' or status = 'NEW') and smallnote is null");
@@ -143,8 +160,19 @@ public class EqlParserTest extends BaseTestCase {
 
     assertThat(query.getGeneratedSql()).contains("where ((t0.name = ?  or t0.status = ? )  and t0.smallnote is null )");
   }
+  
+  @Test
+  @ForPlatform(Platform.HANA)
+  public void where_or2_hana() {
+
+    Query<Customer> query = parse("where (name = 'Rob' or status = 'N') and smallnote is null");
+    query.findList();
+
+    assertThat(query.getGeneratedSql()).contains("where ((t0.name = ?  or t0.status = ? )  and t0.smallnote is null )");
+  }
 
   @Test
+  @IgnorePlatform(Platform.HANA) // The HANA JDBC driver checks the field length on binding and rejects 'NEW'
   public void test_simplifyExpressions() {
 
     Query<Customer> query = parse("where not (name = 'Rob' and status = 'NEW')");
@@ -159,6 +187,23 @@ public class EqlParserTest extends BaseTestCase {
     query.findList();
     assertThat(query.getGeneratedSql()).contains("where not (t0.name = ?  and t0.status = ? )");
   }
+  
+  @Test
+  @ForPlatform(Platform.HANA)
+  public void test_simplifyExpressions_hana() {
+
+    Query<Customer> query = parse("where not (name = 'Rob' and status = 'N')");
+    query.findList();
+    assertThat(query.getGeneratedSql()).contains("where not (t0.name = ?  and t0.status = ? )");
+
+    query = parse("where not ((name = 'Rob' and status = 'N'))");
+    query.findList();
+    assertThat(query.getGeneratedSql()).contains("where not (t0.name = ?  and t0.status = ? )");
+
+    query = parse("where not (((name = 'Rob') and (status = 'N')))");
+    query.findList();
+    assertThat(query.getGeneratedSql()).contains("where not (t0.name = ?  and t0.status = ? )");
+  }
 
 
   @Test
diff --git a/src/test/java/org/tests/basic/TestErrorBindLog.java b/src/test/java/org/tests/basic/TestErrorBindLog.java
index 0b90f485a..75b1bd7c5 100644
--- a/src/test/java/org/tests/basic/TestErrorBindLog.java
+++ b/src/test/java/org/tests/basic/TestErrorBindLog.java
@@ -18,7 +18,12 @@ public class TestErrorBindLog extends BaseTestCase {
 
     } catch (PersistenceException e) {
       String msg = e.getMessage();
-      Assert.assertTrue(msg.contains("Bind values:"));
+      if (isHana()) {
+        Assert.assertTrue(msg.contains("Error with property[1] dt[12]data[JUNK]"));
+      }
+      else {
+        Assert.assertTrue(msg.contains("Bind values:"));
+      }
     }
   }
 }
diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
index 8bc76c951..c818a3287 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
@@ -4,7 +4,9 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import io.ebean.Transaction;
+import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.PersistBatch;
+import io.ebean.annotation.Platform;
 import io.ebean.annotation.Transactional;
 import io.ebean.meta.BasicMetricVisitor;
 import io.ebean.meta.MetaTimedMetric;
@@ -119,6 +121,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
 
   @Test
   @Transactional(batch = PersistBatch.ALL)
+  @IgnorePlatform(Platform.HANA)
   public void transactional_flushOnGetId() {
 
     EbeanServer server = Ebean.getDefaultServer();
@@ -141,6 +144,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
   }
 
   @Test
+  @IgnorePlatform(Platform.HANA)
   public void testFlushOnGetId() {
 
     EbeanServer server = Ebean.getDefaultServer();
diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java b/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java
index 8245f31ea..497b9d137 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java
@@ -3,7 +3,9 @@ package org.tests.batchinsert;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Transaction;
+import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.PersistBatch;
+import io.ebean.annotation.Platform;
 import io.ebean.annotation.Transactional;
 import org.junit.Test;
 import org.tests.model.basic.UTDetail;
@@ -46,6 +48,7 @@ public class TestBatchInsertSimple extends BaseTestCase {
   }
 
   @Test
+  @IgnorePlatform(Platform.HANA)
   public void testTransactional() {
 
     saveWithFullBatchMode();
@@ -131,7 +134,7 @@ public class TestBatchInsertSimple extends BaseTestCase {
     Transaction transaction = Ebean.beginTransaction();
     try {
       transaction.setBatch(PersistBatch.NONE);
-      transaction.setBatchOnCascade(PersistBatch.ALL);
+      transaction.setBatchOnCascade(spiEbeanServer().getDatabasePlatform().getPersistBatchOnCascade());
       transaction.setBatchSize(20);
 
       // escalate based on batchOnCascade value
diff --git a/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java b/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java
index 568dd0e8b..d28dcc974 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java
@@ -3,7 +3,9 @@ package org.tests.batchinsert;
 import io.ebean.BaseTestCase;
 import io.ebean.EbeanServer;
 import io.ebean.Transaction;
+import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.PersistBatch;
+import io.ebean.annotation.Platform;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.persist.BatchControl;
 import org.tests.model.basic.EBasicWithUniqueCon;
@@ -20,6 +22,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestBatchOnCascadeExceptionHandling extends BaseTestCase {
 
+  @IgnorePlatform(Platform.HANA)
   @Test
   public void testBatchScenarioWithSavepoint() throws SQLException {
     server().save(createEntityWithName("conflict", "before"));
@@ -84,7 +87,7 @@ public class TestBatchOnCascadeExceptionHandling extends BaseTestCase {
     Transaction txn = server.beginTransaction();
     try {
       assertThat(txn.getBatch()).isSameAs(PersistBatch.NONE);
-      assertThat(txn.getBatchOnCascade()).isSameAs(PersistBatch.ALL);
+      assertThat(txn.getBatchOnCascade()).isSameAs(spiEbeanServer().getDatabasePlatform().getPersistBatchOnCascade());
 
       failingOperation.run();
       Assertions.fail("PersistenceException expected");
diff --git a/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java b/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java
index 2fab37ff9..3b3230581 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java
@@ -3,6 +3,8 @@ package org.tests.batchinsert;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.EbeanServer;
+import io.ebean.annotation.IgnorePlatform;
+import io.ebean.annotation.Platform;
 import io.ebean.annotation.Transactional;
 import org.tests.model.basic.Customer;
 import org.junit.Test;
@@ -18,6 +20,7 @@ public class TestBatchSaveWithGetBeanId extends BaseTestCase {
    */
   @Transactional(batchSize = 10)
   @Test
+  @IgnorePlatform(Platform.HANA) // HANA doesn't support insert batching
   public void test() {
 
     EbeanServer server = Ebean.getDefaultServer();
diff --git a/src/test/java/org/tests/compositekeys/db/Type.java b/src/test/java/org/tests/compositekeys/db/Type.java
index 0b5784b8a..298d6bc4b 100644
--- a/src/test/java/org/tests/compositekeys/db/Type.java
+++ b/src/test/java/org/tests/compositekeys/db/Type.java
@@ -6,10 +6,12 @@ import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumns;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
+import javax.persistence.Table;
 import javax.persistence.Version;
 import java.util.List;
 
 @Entity
+@Table(name="`type`") // needs to be quoted because it's a keyword on HANA
 public class Type {
   @Id
   private TypeKey key;
diff --git a/src/test/java/org/tests/merge/TestMergeBasic.java b/src/test/java/org/tests/merge/TestMergeBasic.java
index 03938fa71..d02861c5e 100644
--- a/src/test/java/org/tests/merge/TestMergeBasic.java
+++ b/src/test/java/org/tests/merge/TestMergeBasic.java
@@ -59,12 +59,23 @@ public class TestMergeBasic extends BaseTestCase {
     assertThat(sql.get(2)).contains("update uuone set name=?, description=?, version=? where id=? and version=?");
 
     // persist children ...
-    assertThat(sql.get(3)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);");
-    assertThat(sql.get(4)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql.get(3)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);");
+      assertThat(sql.get(4)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);");
 
-    assertThat(sql.get(5)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
-    assertThat(sql.get(6)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
-    assertThat(sql.get(7)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
+      assertThat(sql.get(5)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
+      assertThat(sql.get(6)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
+      assertThat(sql.get(7)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
+    }
+    else {
+      assertThat(sql.get(3)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);");
+
+      assertThat(sql.get(4)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
+      assertThat(sql.get(5)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
+      assertThat(sql.get(6)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
+      
+      assertThat(sql.get(7)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);");
+    }
   }
 
   @Test
@@ -97,12 +108,23 @@ public class TestMergeBasic extends BaseTestCase {
     assertThat(sql.get(2)).contains("update uuone set name=?, description=?, version=? where id=? and version=?");
 
     // persist children ...
-    assertThat(sql.get(3)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);");
-    assertThat(sql.get(4)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql.get(3)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);");
+      assertThat(sql.get(4)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);");
+  
+      assertThat(sql.get(5)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
+      assertThat(sql.get(6)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
+      assertThat(sql.get(7)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
+    }
+    else {
+      assertThat(sql.get(3)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);");
 
-    assertThat(sql.get(5)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
-    assertThat(sql.get(6)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
-    assertThat(sql.get(7)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
+      assertThat(sql.get(4)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
+      assertThat(sql.get(5)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
+      assertThat(sql.get(6)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
+      
+      assertThat(sql.get(7)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);");
+    }
 
   }
 
diff --git a/src/test/java/org/tests/merge/TestMergeCustomer.java b/src/test/java/org/tests/merge/TestMergeCustomer.java
index c796d702b..6068d034d 100644
--- a/src/test/java/org/tests/merge/TestMergeCustomer.java
+++ b/src/test/java/org/tests/merge/TestMergeCustomer.java
@@ -277,10 +277,18 @@ public class TestMergeCustomer extends BaseTestCase {
     assertThat(sql.get(2)).contains("delete from mcontact where id=?");
 
     assertThat(sql.get(5)).contains("update mcustomer set name=?, version=?, shipping_address_id=?, billing_address_id=? where id=? and version=?");
-    assertThat(sql.get(6)).contains("insert into mcontact");
-    assertThat(sql.get(7)).contains("insert into mcontact");
-    assertThat(sql.get(8)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?");
-    assertThat(sql.get(11)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql.get(6)).contains("insert into mcontact");
+      assertThat(sql.get(7)).contains("insert into mcontact");
+      assertThat(sql.get(8)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?");
+      assertThat(sql.get(11)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?");
+    }
+    else {
+      assertThat(sql.get(6)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?");
+      assertThat(sql.get(7)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?");
+      assertThat(sql.get(10)).contains("insert into mcontact");
+      assertThat(sql.get(11)).contains("insert into mcontact");
+    }
   }
 
   @Test
@@ -305,7 +313,7 @@ public class TestMergeCustomer extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql.get(0)).contains("select t0.id, t3.id, t1.id, t2.id from mcustomer t0 left join maddress t3 on t3.id = t0.shipping_address_id  left join maddress t1 on t1.id = t0.billing_address_id  left join mcontact t2 on t2.customer_id = t0.id  where t0.id = ?");
-    if (isH2()) {
+    if (isH2() || isHana()) {
       // with nested OneToMany .. we need a second query to read the contact message ids
       assertThat(sql.get(1)).contains("select t0.contact_id, t0.id from mcontact_message t0 where (t0.contact_id) in (?, ?, ?, ?, ?, ?, ?, ?, ?, ? )");
     }
@@ -317,10 +325,18 @@ public class TestMergeCustomer extends BaseTestCase {
     assertThat(sql.get(6)).contains("update maddress set street=?, city=?, version=? where id=? and version=?");
     assertThat(sql.get(7)).contains("update mcustomer set name=?, notes=?, version=?, shipping_address_id=?, billing_address_id=? where id=? and version=?");
 
-    assertThat(sql.get(8)).contains("insert into mcontact");
-    assertThat(sql.get(9)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?");
-
-    assertThat(sql.get(13)).contains("update mcontact_message set title=?, subject=?, notes=?, version=?, contact_id=? where id=? and version=?");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql.get(8)).contains("insert into mcontact");
+      assertThat(sql.get(9)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?");
+  
+      assertThat(sql.get(13)).contains("update mcontact_message set title=?, subject=?, notes=?, version=?, contact_id=? where id=? and version=?");
+    }
+    else {
+      assertThat(sql.get(8)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?");
+      assertThat(sql.get(9)).contains("update mcontact_message set title=?, subject=?, notes=?, version=?, contact_id=? where id=? and version=?");
+      
+      assertThat(sql.get(sql.size()-1)).contains("insert into mcontact");
+    }
 
   }
 
diff --git a/src/test/java/org/tests/merge/TestMergeM2M.java b/src/test/java/org/tests/merge/TestMergeM2M.java
index 930d2def1..784e53025 100644
--- a/src/test/java/org/tests/merge/TestMergeM2M.java
+++ b/src/test/java/org/tests/merge/TestMergeM2M.java
@@ -40,10 +40,20 @@ public class TestMergeM2M extends BaseTestCase {
     Ebean.merge(machine, options);
 
     List<String> sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(3);
-    assertThat(sql.get(0)).contains("select");
-    assertThat(sql.get(1)).contains("insert into mmachine");
-    assertThat(sql.get(2)).contains("insert into mmachine_mgroup");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(3);
+      assertThat(sql.get(0)).contains("select");
+      assertThat(sql.get(1)).contains("insert into mmachine");
+      assertThat(sql.get(2)).contains("insert into mmachine_mgroup");
+    }
+    else {
+      assertThat(sql).hasSize(5);
+      assertThat(sql.get(0)).contains("select");
+      assertThat(sql.get(1)).contains("insert into mmachine");
+      assertThat(sql.get(2)).contains("insert into mmachine_mgroup");
+      assertThat(sql.get(3)).contains("insert into mmachine_mgroup");
+      assertThat(sql.get(4)).contains("insert into mmachine_mgroup");
+    }
 
     machine.setName("mac1-mod");
     machine.getGroups().remove(group2);
diff --git a/src/test/java/org/tests/model/array/TestDbArray_asSet.java b/src/test/java/org/tests/model/array/TestDbArray_asSet.java
index ac970b2e4..b87726c53 100644
--- a/src/test/java/org/tests/model/array/TestDbArray_asSet.java
+++ b/src/test/java/org/tests/model/array/TestDbArray_asSet.java
@@ -3,6 +3,9 @@ package org.tests.model.array;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import io.ebean.annotation.IgnorePlatform;
+import io.ebean.annotation.Platform;
+
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -22,6 +25,7 @@ public class TestDbArray_asSet extends BaseTestCase {
   private EArraySetBean found;
 
   @Test
+  @IgnorePlatform(Platform.HANA)
   public void insert() {
 
     bean.setName("some stuff");
@@ -122,6 +126,7 @@ public class TestDbArray_asSet extends BaseTestCase {
   }
 
   @Test
+  @IgnorePlatform(Platform.HANA)
   public void insertNulls() {
 
     EArraySetBean bean = new EArraySetBean();
@@ -135,6 +140,7 @@ public class TestDbArray_asSet extends BaseTestCase {
   }
 
   @Test
+  @IgnorePlatform(Platform.HANA)
   public void insertAll_when_hasNulls() {
 
     EArraySetBean bean = new EArraySetBean();
diff --git a/src/test/java/org/tests/model/array/TestDbArray_basic.java b/src/test/java/org/tests/model/array/TestDbArray_basic.java
index 6a3e938c5..4da3ada4a 100644
--- a/src/test/java/org/tests/model/array/TestDbArray_basic.java
+++ b/src/test/java/org/tests/model/array/TestDbArray_basic.java
@@ -17,6 +17,8 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
 import io.ebean.SqlRow;
+import io.ebean.annotation.IgnorePlatform;
+import io.ebean.annotation.Platform;
 
 public class TestDbArray_basic extends BaseTestCase {
 
@@ -25,6 +27,7 @@ public class TestDbArray_basic extends BaseTestCase {
   private EArrayBean found;
 
   @Test
+  @IgnorePlatform(Platform.HANA)
   public void insert() throws SQLException {
 
     bean.setName("some stuff");
@@ -159,6 +162,7 @@ public class TestDbArray_basic extends BaseTestCase {
   }
 
   @Test
+  @IgnorePlatform(Platform.HANA)
   public void insertNulls() {
 
     EArrayBean bean = new EArrayBean();
@@ -172,6 +176,7 @@ public class TestDbArray_basic extends BaseTestCase {
   }
 
   @Test
+  @IgnorePlatform(Platform.HANA)
   public void insertAll_when_hasNulls() {
 
     EArrayBean bean = new EArrayBean();
diff --git a/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java b/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
index 9a42ea601..34a484ce9 100644
--- a/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
+++ b/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
@@ -280,6 +280,8 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
       assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and concat(t0.sku,'-',t0.code) in (?, ? )  order by t0.sku desc; --bind(def,Array[2]={2-1000,3-1000})");
     } else if (isPostgres()) {
       assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and (t0.sku||'-'||t0.code)");
+    } else if (isHana()) {
+      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and concat(t0.sku, '-'||t0.code)");
     } else {
       assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and concat(t0.sku,'-',t0.code)");
     }
@@ -319,6 +321,8 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
       assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and concat(t0.sku,':',t0.code,'-foo') in (?, ? )  order by t0.sku desc; --bind(def,Array[2]={2:1000-foo,3:1000-foo})");
     } else if (isPostgres()){
       assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and (t0.sku||':'||t0.code||'-foo')");
+    } else if (isHana()){
+      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and concat(t0.sku, ':'||t0.code||'-foo')");
     } else {
       assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and concat(t0.sku,':',t0.code,'-foo')");
     }
diff --git a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java
index 59b29a499..b10abc2df 100644
--- a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java
+++ b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java
@@ -3,7 +3,10 @@ package org.tests.model.basic.xtra;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Transaction;
+import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.PersistBatch;
+import io.ebean.annotation.Platform;
+
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -16,6 +19,7 @@ import static org.junit.Assert.assertTrue;
 public class TestInsertBatchThenFlushThenUpdate extends BaseTestCase {
 
   @Test
+  @IgnorePlatform(Platform.HANA)
   public void test() {
 
     LoggedSqlCollector.start();
diff --git a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java
index 08d86c0de..cc2dd8185 100644
--- a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java
+++ b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java
@@ -3,7 +3,10 @@ package org.tests.model.basic.xtra;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Transaction;
+import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.PersistBatch;
+import io.ebean.annotation.Platform;
+
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -16,6 +19,7 @@ import static org.junit.Assert.assertEquals;
 public class TestInsertBatchThenUpdate extends BaseTestCase {
 
   @Test
+  @IgnorePlatform(Platform.HANA)
   public void test() {
 
     LoggedSqlCollector.start();
@@ -60,6 +64,7 @@ public class TestInsertBatchThenUpdate extends BaseTestCase {
 
 
   @Test
+  @IgnorePlatform(Platform.HANA)
   public void test_noFlushOn_getterOfNonGeneratedProperty() {
 
     LoggedSqlCollector.start();
diff --git a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java
index 487e98a09..da54417e1 100644
--- a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java
+++ b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java
@@ -3,7 +3,10 @@ package org.tests.model.basic.xtra;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Transaction;
+import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.PersistBatch;
+import io.ebean.annotation.Platform;
+
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -15,6 +18,7 @@ import static org.junit.Assert.assertEquals;
 public class TestInsertBatchWithDifferentRootTypes extends BaseTestCase {
 
   @Test
+  @IgnorePlatform(Platform.HANA)
   public void testDifferRootTypes() {
 
     LoggedSqlCollector.start();
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
index 0dea97952..bcbb642f8 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
@@ -29,9 +29,17 @@ public class TestElementCollectionBasic extends BaseTestCase {
     assertThat(eventLog()).containsExactly("preInsert", "postInsert");
 
     List<String> sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(2);
-    assertThat(sql.get(0)).contains("insert into ec_person");
-    assertThat(sql.get(1)).contains("insert into ec_person_phone");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(2);
+      assertThat(sql.get(0)).contains("insert into ec_person");
+      assertThat(sql.get(1)).contains("insert into ec_person_phone");
+    }
+    else {
+      assertThat(sql).hasSize(3);
+      assertThat(sql.get(0)).contains("insert into ec_person");
+      assertThat(sql.get(1)).contains("insert into ec_person_phone");
+      assertThat(sql.get(2)).contains("insert into ec_person_phone");
+    }
 
     EcPerson person1 = new EcPerson("Fiona09");
     person1.getPhoneNumbers().add("09 1234");
@@ -121,10 +129,20 @@ public class TestElementCollectionBasic extends BaseTestCase {
     Ebean.save(bean);
 
     List<String> sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(3);
-    assertThat(sql.get(0)).contains("update ec_person set name=?, version=? where id=? and version=?");
-    assertThat(sql.get(1)).contains("delete from ec_person_phone where owner_id=?");
-    assertThat(sql.get(2)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(3);
+      assertThat(sql.get(0)).contains("update ec_person set name=?, version=? where id=? and version=?");
+      assertThat(sql.get(1)).contains("delete from ec_person_phone where owner_id=?");
+      assertThat(sql.get(2)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
+    }
+    else {
+      assertThat(sql).hasSize(5);
+      assertThat(sql.get(0)).contains("update ec_person set name=?, version=? where id=? and version=?");
+      assertThat(sql.get(1)).contains("delete from ec_person_phone where owner_id=?");
+      assertThat(sql.get(2)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
+      assertThat(sql.get(3)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
+      assertThat(sql.get(4)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
+    }
 
     assertThat(eventLog()).containsExactly("preUpdate", "postUpdate");
 
@@ -189,9 +207,21 @@ public class TestElementCollectionBasic extends BaseTestCase {
     Ebean.save(bean);
 
     List<String> sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(2);
-    assertThat(sql.get(0)).contains("delete from ec_person_phone where owner_id=?");
-    assertThat(sql.get(1)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(2);
+      assertThat(sql.get(0)).contains("delete from ec_person_phone where owner_id=?");
+      assertThat(sql.get(1)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
+    }
+    else {
+      assertThat(sql).hasSize(7);
+      assertThat(sql.get(0)).contains("delete from ec_person_phone where owner_id=?");
+      assertThat(sql.get(1)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
+      assertThat(sql.get(2)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
+      assertThat(sql.get(3)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
+      assertThat(sql.get(4)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
+      assertThat(sql.get(5)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
+      assertThat(sql.get(6)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
+    }
 
     assertThat(eventLog()).containsExactly("preUpdate", "postUpdate");
 
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java
index a73220ce1..13a41e66d 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java
@@ -1,6 +1,9 @@
 package org.tests.model.elementcollection;
 
 import io.ebean.Ebean;
+import io.ebean.annotation.PersistBatch;
+import io.ebeaninternal.api.SpiEbeanServer;
+
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -39,7 +42,12 @@ public class TestElementCollectionBasicCache {
     Ebean.save(two);
 
     sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(3);
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(3);
+    }
+    else {
+      assertThat(sql).hasSize(5);
+    }
 
     Ebean.save(two);
 
@@ -60,7 +68,12 @@ public class TestElementCollectionBasicCache {
     Ebean.save(three);
 
     sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(2); // cache hit
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(2); // cache hit
+    }
+    else {
+      assertThat(sql).hasSize(5); // cache hit
+    }
 
     EcPerson four = Ebean.find(EcPerson.class)
       .setId(person.getId())
@@ -77,4 +90,8 @@ public class TestElementCollectionBasicCache {
 
     LoggedSqlCollector.stop();
   }
+  
+  public boolean isPersistBatchOnCascade() {
+    return ((SpiEbeanServer) Ebean.getDefaultServer()).getDatabasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE;
+  }
 }
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
index a2e181892..3ae0ddb19 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
@@ -2,6 +2,8 @@ package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.annotation.PersistBatch;
+
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -24,9 +26,17 @@ public class TestElementCollectionBasicMap extends BaseTestCase {
     Ebean.save(person);
 
     List<String> sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(2);
-    assertThat(sql.get(0)).contains("insert into ecm_person");
-    assertThat(sql.get(1)).contains("insert into ecm_person_phone");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(2);
+      assertThat(sql.get(0)).contains("insert into ecm_person");
+      assertThat(sql.get(1)).contains("insert into ecm_person_phone");
+    }
+    else {
+      assertThat(sql).hasSize(3);
+      assertThat(sql.get(0)).contains("insert into ecm_person");
+      assertThat(sql.get(1)).contains("insert into ecm_person_phone");
+      assertThat(sql.get(2)).contains("insert into ecm_person_phone");
+    }
 
     EcmPerson person1 = new EcmPerson("Fiona09");
     person1.getPhoneNumbers().put("home", "09 1234");
@@ -96,10 +106,20 @@ public class TestElementCollectionBasicMap extends BaseTestCase {
     Ebean.save(bean);
 
     List<String> sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(3);
-    assertThat(sql.get(0)).contains("update ecm_person set name=?, version=? where id=? and version=?");
-    assertThat(sql.get(1)).contains("delete from ecm_person_phone_numbers where ecm_person_id=?");
-    assertThat(sql.get(2)).contains("insert into ecm_person_phone_numbers (ecm_person_id,type,number) values (?,?,?)");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(3);
+      assertThat(sql.get(0)).contains("update ecm_person set name=?, version=? where id=? and version=?");
+      assertThat(sql.get(1)).contains("delete from ecm_person_phone_numbers where ecm_person_id=?");
+      assertThat(sql.get(2)).contains("insert into ecm_person_phone_numbers (ecm_person_id,type,number) values (?,?,?)");
+    }
+    else {
+      assertThat(sql).hasSize(5);
+      assertThat(sql.get(0)).contains("update ecm_person set name=?, version=? where id=? and version=?");
+      assertThat(sql.get(1)).contains("delete from ecm_person_phone_numbers where ecm_person_id=?");
+      assertThat(sql.get(2)).contains("insert into ecm_person_phone_numbers (ecm_person_id,type,number) values (?,?,?)");
+      assertThat(sql.get(3)).contains("insert into ecm_person_phone_numbers (ecm_person_id,type,number) values (?,?,?)");
+      assertThat(sql.get(4)).contains("insert into ecm_person_phone_numbers (ecm_person_id,type,number) values (?,?,?)");
+    }
 
     updateNothing(bean);
   }
@@ -120,9 +140,19 @@ public class TestElementCollectionBasicMap extends BaseTestCase {
     Ebean.save(bean);
 
     List<String> sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(2);
-    assertThat(sql.get(0)).contains("delete from ecm_person_phone_numbers where ecm_person_id=?");
-    assertThat(sql.get(1)).contains("insert into ecm_person_phone_numbers (ecm_person_id,type,number) values (?,?,?)");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(2);
+      assertThat(sql.get(0)).contains("delete from ecm_person_phone_numbers where ecm_person_id=?");
+      assertThat(sql.get(1)).contains("insert into ecm_person_phone_numbers (ecm_person_id,type,number) values (?,?,?)");
+    }
+    else {
+      assertThat(sql).hasSize(5);
+      assertThat(sql.get(0)).contains("delete from ecm_person_phone_numbers where ecm_person_id=?");
+      assertThat(sql.get(1)).contains("insert into ecm_person_phone_numbers (ecm_person_id,type,number) values (?,?,?)");
+      assertThat(sql.get(2)).contains("insert into ecm_person_phone_numbers (ecm_person_id,type,number) values (?,?,?)");
+      assertThat(sql.get(3)).contains("insert into ecm_person_phone_numbers (ecm_person_id,type,number) values (?,?,?)");
+      assertThat(sql.get(4)).contains("insert into ecm_person_phone_numbers (ecm_person_id,type,number) values (?,?,?)");
+    }
 
     delete(bean);
   }
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java
index 137e8e495..e92ba9324 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java
@@ -1,6 +1,9 @@
 package org.tests.model.elementcollection;
 
 import io.ebean.Ebean;
+import io.ebean.annotation.PersistBatch;
+import io.ebeaninternal.api.SpiEbeanServer;
+
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -41,7 +44,12 @@ public class TestElementCollectionBasicMapCache {
     Ebean.save(two);
 
     sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(3);
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(3);
+    }
+    else {
+      assertThat(sql).hasSize(5);
+    }
 
     Ebean.save(two);
 
@@ -64,7 +72,12 @@ public class TestElementCollectionBasicMapCache {
     Ebean.save(three);
 
     sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(2); // cache hit
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(2); // cache hit
+    }
+    else {
+      assertThat(sql).hasSize(3); // cache hit
+    }
 
     EcmPerson four = Ebean.find(EcmPerson.class)
       .setId(person.getId())
@@ -82,4 +95,8 @@ public class TestElementCollectionBasicMapCache {
 
     LoggedSqlCollector.stop();
   }
+  
+  public boolean isPersistBatchOnCascade() {
+    return ((SpiEbeanServer) Ebean.getDefaultServer()).getDatabasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE;
+  }
 }
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java
index 2d3124351..2d240671a 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java
@@ -23,9 +23,17 @@ public class TestElementCollectionBasicSet extends BaseTestCase {
     Ebean.save(person);
 
     List<String> sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(2);
-    assertThat(sql.get(0)).contains("insert into ecs_person");
-    assertThat(sql.get(1)).contains("insert into ecs_person_phone");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(2);
+      assertThat(sql.get(0)).contains("insert into ecs_person");
+      assertThat(sql.get(1)).contains("insert into ecs_person_phone");
+    }
+    else {
+      assertThat(sql).hasSize(3);
+      assertThat(sql.get(0)).contains("insert into ecs_person");
+      assertThat(sql.get(1)).contains("insert into ecs_person_phone");
+      assertThat(sql.get(2)).contains("insert into ecs_person_phone");
+    }
 
     EcsPerson person1 = new EcsPerson("Fiona09");
     person1.getPhoneNumbers().add("09 1234");
@@ -94,10 +102,20 @@ public class TestElementCollectionBasicSet extends BaseTestCase {
     Ebean.save(bean);
 
     List<String> sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(3);
-    assertThat(sql.get(0)).contains("update ecs_person set name=?, version=? where id=? and version=?");
-    assertThat(sql.get(1)).contains("delete from ecs_person_phone where ecs_person_id=?");
-    assertThat(sql.get(2)).contains("insert into ecs_person_phone (ecs_person_id,phone) values (?,?)");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(3);
+      assertThat(sql.get(0)).contains("update ecs_person set name=?, version=? where id=? and version=?");
+      assertThat(sql.get(1)).contains("delete from ecs_person_phone where ecs_person_id=?");
+      assertThat(sql.get(2)).contains("insert into ecs_person_phone (ecs_person_id,phone) values (?,?)");
+    }
+    else {
+      assertThat(sql).hasSize(5);
+      assertThat(sql.get(0)).contains("update ecs_person set name=?, version=? where id=? and version=?");
+      assertThat(sql.get(1)).contains("delete from ecs_person_phone where ecs_person_id=?");
+      assertThat(sql.get(2)).contains("insert into ecs_person_phone (ecs_person_id,phone) values (?,?)");
+      assertThat(sql.get(3)).contains("insert into ecs_person_phone (ecs_person_id,phone) values (?,?)");
+      assertThat(sql.get(4)).contains("insert into ecs_person_phone (ecs_person_id,phone) values (?,?)");
+    }
 
     updateNothing(bean);
   }
@@ -118,9 +136,19 @@ public class TestElementCollectionBasicSet extends BaseTestCase {
     Ebean.save(bean);
 
     List<String> sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(2);
-    assertThat(sql.get(0)).contains("delete from ecs_person_phone where ecs_person_id=?");
-    assertThat(sql.get(1)).contains("insert into ecs_person_phone (ecs_person_id,phone) values (?,?)");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(2);
+      assertThat(sql.get(0)).contains("delete from ecs_person_phone where ecs_person_id=?");
+      assertThat(sql.get(1)).contains("insert into ecs_person_phone (ecs_person_id,phone) values (?,?)");
+    }
+    else {
+      assertThat(sql).hasSize(5);
+      assertThat(sql.get(0)).contains("delete from ecs_person_phone where ecs_person_id=?");
+      assertThat(sql.get(1)).contains("insert into ecs_person_phone (ecs_person_id,phone) values (?,?)");
+      assertThat(sql.get(2)).contains("insert into ecs_person_phone (ecs_person_id,phone) values (?,?)");
+      assertThat(sql.get(3)).contains("insert into ecs_person_phone (ecs_person_id,phone) values (?,?)");
+      assertThat(sql.get(4)).contains("insert into ecs_person_phone (ecs_person_id,phone) values (?,?)");
+    }
 
     delete(bean);
   }
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java
index 8b86e6477..8d4cfbd0c 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java
@@ -22,9 +22,17 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase {
     Ebean.save(person);
 
     List<String> sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(2);
-    assertThat(sql.get(0)).contains("insert into ecbl_person");
-    assertThat(sql.get(1)).contains("insert into ecbl_person_phone_numbers");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(2);
+      assertThat(sql.get(0)).contains("insert into ecbl_person");
+      assertThat(sql.get(1)).contains("insert into ecbl_person_phone_numbers");
+    }
+    else {
+      assertThat(sql).hasSize(3);
+      assertThat(sql.get(0)).contains("insert into ecbl_person");
+      assertThat(sql.get(1)).contains("insert into ecbl_person_phone_numbers");
+      assertThat(sql.get(2)).contains("insert into ecbl_person_phone_numbers");
+    }
 
     EcblPerson person1 = new EcblPerson("Fiona6409");
     person1.getPhoneNumbers().add(new EcPhone("61","09","1234"));
@@ -94,10 +102,20 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase {
     Ebean.save(bean);
 
     List<String> sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(3);
-    assertThat(sql.get(0)).contains("update ecbl_person set name=?, version=? where id=? and version=?");
-    assertThat(sql.get(1)).contains("delete from ecbl_person_phone_numbers where person_id=?");
-    assertThat(sql.get(2)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,number) values (?,?,?,?)");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(3);
+      assertThat(sql.get(0)).contains("update ecbl_person set name=?, version=? where id=? and version=?");
+      assertThat(sql.get(1)).contains("delete from ecbl_person_phone_numbers where person_id=?");
+      assertThat(sql.get(2)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,number) values (?,?,?,?)");
+    }
+    else {
+      assertThat(sql).hasSize(5);
+      assertThat(sql.get(0)).contains("update ecbl_person set name=?, version=? where id=? and version=?");
+      assertThat(sql.get(1)).contains("delete from ecbl_person_phone_numbers where person_id=?");
+      assertThat(sql.get(2)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,number) values (?,?,?,?)");
+      assertThat(sql.get(3)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,number) values (?,?,?,?)");
+      assertThat(sql.get(4)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,number) values (?,?,?,?)");
+    }
 
     updateNothing(bean);
   }
@@ -118,9 +136,19 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase {
     Ebean.save(bean);
 
     List<String> sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(2);
-    assertThat(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id=?");
-    assertThat(sql.get(1)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,number) values (?,?,?,?)");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(2);
+      assertThat(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id=?");
+      assertThat(sql.get(1)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,number) values (?,?,?,?)");
+    }
+    else {
+      assertThat(sql).hasSize(5);
+      assertThat(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id=?");
+      assertThat(sql.get(1)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,number) values (?,?,?,?)");
+      assertThat(sql.get(2)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,number) values (?,?,?,?)");
+      assertThat(sql.get(3)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,number) values (?,?,?,?)");
+      assertThat(sql.get(4)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,number) values (?,?,?,?)");
+    }
 
     delete(bean);
   }
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java
index c9cbaf4d4..cd236e4eb 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java
@@ -2,6 +2,8 @@ package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.annotation.PersistBatch;
+
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -47,9 +49,17 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase {
     Ebean.save(two);
 
     sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(2); // update of collection only
-    assertThat(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id=?");
-    assertThat(sql.get(1)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,number) values (?,?,?,?)");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(2); // update of collection only
+      assertThat(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id=?");
+      assertThat(sql.get(1)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,number) values (?,?,?,?)");
+    }
+    else {
+      assertThat(sql).hasSize(3); // update of collection only
+      assertThat(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id=?");
+      assertThat(sql.get(1)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,number) values (?,?,?,?)");
+      assertThat(sql.get(2)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,number) values (?,?,?,?)");
+    }
 
     EcblPerson three = Ebean.find(EcblPerson.class)
       .setId(person.getId())
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java
index 50b37480c..4a6419c0e 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java
@@ -23,9 +23,17 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase {
     Ebean.save(person);
 
     List<String> sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(2);
-    assertThat(sql.get(0)).contains("insert into ecbm_person");
-    assertThat(sql.get(1)).contains("insert into ecbm_person_phone_numbers");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(2);
+      assertThat(sql.get(0)).contains("insert into ecbm_person");
+      assertThat(sql.get(1)).contains("insert into ecbm_person_phone_numbers");
+    }
+    else {
+      assertThat(sql).hasSize(3);
+      assertThat(sql.get(0)).contains("insert into ecbm_person");
+      assertThat(sql.get(1)).contains("insert into ecbm_person_phone_numbers");
+      assertThat(sql.get(2)).contains("insert into ecbm_person_phone_numbers");
+    }
 
     EcbmPerson person1 = new EcbmPerson("Fiona6409");
     person1.getPhoneNumbers().put("home",new EcPhone("64","09","1234"));
@@ -87,10 +95,20 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase {
     Ebean.save(bean);
 
     List<String> sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(3);
-    assertThat(sql.get(0)).contains("update ecbm_person set name=?, version=? where id=? and version=?");
-    assertThat(sql.get(1)).contains("delete from ecbm_person_phone_numbers where person_id=?");
-    assertThat(sql.get(2)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number)");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(3);
+      assertThat(sql.get(0)).contains("update ecbm_person set name=?, version=? where id=? and version=?");
+      assertThat(sql.get(1)).contains("delete from ecbm_person_phone_numbers where person_id=?");
+      assertThat(sql.get(2)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number)");
+    }
+    else {
+      assertThat(sql).hasSize(5);
+      assertThat(sql.get(0)).contains("update ecbm_person set name=?, version=? where id=? and version=?");
+      assertThat(sql.get(1)).contains("delete from ecbm_person_phone_numbers where person_id=?");
+      assertThat(sql.get(2)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number)");
+      assertThat(sql.get(3)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number)");
+      assertThat(sql.get(4)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number)");
+    }
 
     updateNothing(bean);
   }
@@ -111,9 +129,19 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase {
     Ebean.save(bean);
 
     List<String> sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(2);
-    assertThat(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id=?");
-    assertThat(sql.get(1)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number) values (?,?,?,?,?)");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(2);
+      assertThat(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id=?");
+      assertThat(sql.get(1)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number) values (?,?,?,?,?)");
+    }
+    else {
+      assertThat(sql).hasSize(5);
+      assertThat(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id=?");
+      assertThat(sql.get(1)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number) values (?,?,?,?,?)");
+      assertThat(sql.get(2)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number) values (?,?,?,?,?)");
+      assertThat(sql.get(3)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number) values (?,?,?,?,?)");
+      assertThat(sql.get(4)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number) values (?,?,?,?,?)");
+    }
 
     delete(bean);
   }
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java
index 1c29bfc55..4aa75ed22 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java
@@ -48,9 +48,17 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase {
     Ebean.save(two);
 
     sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(2); // update of collection only
-    assertThat(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id=?");
-    assertThat(sql.get(1)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number) values (?,?,?,?,?)");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(2); // update of collection only
+      assertThat(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id=?");
+      assertThat(sql.get(1)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number) values (?,?,?,?,?)");
+    }
+    else {
+      assertThat(sql).hasSize(3); // update of collection only
+      assertThat(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id=?");
+      assertThat(sql.get(1)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number) values (?,?,?,?,?)");
+      assertThat(sql.get(2)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number) values (?,?,?,?,?)");
+    }
 
     EcbmPerson three = Ebean.find(EcbmPerson.class)
       .setId(person.getId())
diff --git a/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java b/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java
index b7d1cc7b6..eb993da93 100644
--- a/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java
+++ b/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java
@@ -18,7 +18,7 @@ public class TestManyToOneAsOne extends BaseTestCase {
 
   @Transactional(batchSize = 20)
   @Test
-  @IgnorePlatform({Platform.SQLSERVER, Platform.ORACLE}) // probably due the use of sequences - Empl has already an ID and Addr refers to it.
+  @IgnorePlatform({Platform.SQLSERVER, Platform.ORACLE, Platform.HANA}) // probably due the use of sequences - Empl has already an ID and Addr refers to it.
   public void test_when_jdbcBatch() {
     runInserts();
   }
diff --git a/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java b/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java
index bb27d3c5a..5beea394f 100644
--- a/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java
+++ b/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java
@@ -216,7 +216,12 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(2);
-    assertThat(sql.get(0)).contains("update cover set s3url=?, deleted=? where id=?");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql.get(0)).contains("update cover set s3url=?, deleted=? where id=?");
+    }
+    else {
+      assertThat(sql.get(0)).contains("update cover set deleted=? where id=?");
+    }
   }
 
   @Test
@@ -232,7 +237,12 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(2);
-    assertThat(sql.get(0)).contains("update cover set s3url=?, deleted=? where id=?");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql.get(0)).contains("update cover set s3url=?, deleted=? where id=?");
+    }
+    else {
+      assertThat(sql.get(0)).contains("update cover set deleted=? where id=?");
+    }
   }
 
   @Test
@@ -254,7 +264,12 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(2);
-    assertThat(sql.get(0)).contains("update cover set s3url=?, deleted=? where id=?");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql.get(0)).contains("update cover set s3url=?, deleted=? where id=?");
+    }
+    else {
+      assertThat(sql.get(0)).contains("update cover set deleted=? where id=?");
+    }
   }
 
   @Test
diff --git a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java
index dd7f6b6c1..1a377b7e5 100644
--- a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java
+++ b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java
@@ -2,10 +2,13 @@ package org.tests.o2m.jointable;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.annotation.PersistBatch;
+
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -37,8 +40,15 @@ public class TestOneToManyJoinTable extends BaseTestCase {
     Ebean.save(troop);
 
     List<String> sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("insert into troop_monkey (troop_pid, monkey_mid) values (?, ?)");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(1);
+      assertThat(sql.get(0)).contains("insert into troop_monkey (troop_pid, monkey_mid) values (?, ?)");
+    }
+    else {
+      assertThat(sql).hasSize(2);
+      assertThat(sql.get(0)).contains("insert into troop_monkey (troop_pid, monkey_mid) values (?, ?)");
+      assertThat(sql.get(1)).contains("insert into troop_monkey (troop_pid, monkey_mid) values (?, ?)");
+    }
 
     int intersectionRows = Ebean.createSqlQuery("select count(*) as total from troop_monkey where troop_pid = ?")
       .setParameter(1, troop.getPid())
@@ -87,12 +97,23 @@ public class TestOneToManyJoinTable extends BaseTestCase {
     Ebean.save(trainer);
 
     List<String> sql = LoggedSqlCollector.current();
+    //Collections.sort(sql);
 
-    assertThat(sql).hasSize(6);
-    assertThat(sql.get(0)).contains("insert into trainer ");
-    assertThat(sql.get(1)).contains("insert into monkey ");
-    assertThat(sql.get(4)).contains("update monkey set name=?, food_preference=?, version=? where mid=? and version=?");
-    assertThat(sql.get(5)).contains("insert into trainer_monkey ");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(6);
+      assertThat(sql.get(0)).contains("insert into trainer ");
+      assertThat(sql.get(1)).contains("insert into monkey ");
+      assertThat(sql.get(4)).contains("update monkey set name=?, food_preference=?, version=? where mid=? and version=?");
+      assertThat(sql.get(5)).contains("insert into trainer_monkey ");
+    }
+    else {
+      assertThat(sql).hasSize(10);
+      assertThat(sql.get(0)).contains("insert into trainer ");
+      assertThat(sql.get(1)).contains("update monkey set food_preference=?, version=? where mid=? and version=?");
+      assertThat(sql.get(2)).contains("insert into monkey ");
+      assertThat(sql.get(5)).contains("insert into trainer_monkey ");
+      assertThat(sql.get(9)).contains("insert into trainer_monkey ");
+    }
 
 
     int intersectionRows = Ebean.createSqlQuery("select count(*) as total from trainer_monkey where trainer_tid = ?")
diff --git a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java
index dc8b93738..3ba5331e2 100644
--- a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java
+++ b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java
@@ -37,8 +37,15 @@ public class TestOneToManyJoinTableNoTableName extends BaseTestCase {
     Ebean.save(troop);
 
     List<String> sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("insert into mkeygroup_monkey (mkeygroup_pid, monkey_mid) values (?, ?)");
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(1);
+      assertThat(sql.get(0)).contains("insert into mkeygroup_monkey (mkeygroup_pid, monkey_mid) values (?, ?)");
+    }
+    else {
+      assertThat(sql).hasSize(2);
+      assertThat(sql.get(0)).contains("insert into mkeygroup_monkey (mkeygroup_pid, monkey_mid) values (?, ?)");
+      assertThat(sql.get(1)).contains("insert into mkeygroup_monkey (mkeygroup_pid, monkey_mid) values (?, ?)");
+    }
 
     int intersectionRows = Ebean.createSqlQuery("select count(*) as total from mkeygroup_monkey where mkeygroup_pid = ?")
       .setParameter(1, troop.getPid())
diff --git a/src/test/java/org/tests/query/aggregation/TestAggregationCount.java b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
index 3c027b662..cbd55510e 100644
--- a/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
+++ b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
@@ -1,8 +1,12 @@
 package org.tests.query.aggregation;
 
-import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
-import io.ebean.Query;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.StrictAssertions.assertThat;
+
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.util.List;
+
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -13,11 +17,9 @@ import org.tests.model.basic.ResetBasicData;
 import org.tests.model.tevent.TEventMany;
 import org.tests.model.tevent.TEventOne;
 
-import java.sql.Timestamp;
-import java.time.Instant;
-import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.Query;
 
 public class TestAggregationCount extends BaseTestCase {
 
@@ -383,7 +385,7 @@ public class TestAggregationCount extends BaseTestCase {
     List<String> names =
 
       Ebean.find(Contact.class)
-        .select("concat(lastName,', ',firstName)")
+        .select(concat("lastName",", ","firstName"))
         .where().isNull("phone")
         .orderBy().asc("lastName")
         .findSingleAttributeList();
@@ -391,7 +393,7 @@ public class TestAggregationCount extends BaseTestCase {
     assertThat(names).isNotEmpty();
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(trimSql(sql.get(0))).contains("select concat(t0.last_name,', ',t0.first_name) from contact t0 where t0.phone is null  order by t0.last_name");
+    assertThat(trimSql(sql.get(0))).contains("select " + concat("t0.last_name",", ","t0.first_name") + " from contact t0 where t0.phone is null  order by t0.last_name");
   }
 
   @Test
@@ -404,7 +406,7 @@ public class TestAggregationCount extends BaseTestCase {
     List<String> names =
 
       Ebean.find(Contact.class)
-        .select("concat(updtime,', ',firstName)")
+        .select(concat("updtime",", ","firstName"))
         .where().isNull("phone")
         .orderBy().asc("lastName")
         .findSingleAttributeList();
@@ -412,7 +414,7 @@ public class TestAggregationCount extends BaseTestCase {
     assertThat(names).isNotEmpty();
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(trimSql(sql.get(0))).contains("select concat(t0.updtime,', ',t0.first_name) from contact t0");
+    assertThat(trimSql(sql.get(0))).contains("select " + concat("t0.updtime",", ","t0.first_name") + " from contact t0");
   }
 
   @Test
@@ -446,7 +448,7 @@ public class TestAggregationCount extends BaseTestCase {
     List<Contact> contacts =
 
       Ebean.find(Contact.class)
-        .select("email, concat(lastName,', ',firstName) as lastName")
+        .select("email, " + concat("lastName",", ","firstName") + " as lastName")
         .where().isNull("phone")
         .orderBy().asc("lastName")
         .findList();
@@ -459,7 +461,7 @@ public class TestAggregationCount extends BaseTestCase {
     }
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(trimSql(sql.get(0))).contains("select t0.id, t0.email, concat(t0.last_name,', ',t0.first_name) lastName from contact t0 where t0.phone is null  order by t0.last_name; --bind()");
+    assertThat(trimSql(sql.get(0))).contains("select t0.id, t0.email, " + concat("t0.last_name",", ","t0.first_name") + " lastName from contact t0 where t0.phone is null  order by t0.last_name; --bind()");
   }
 
 }
diff --git a/src/test/java/org/tests/transaction/TestBatchPersistCascade.java b/src/test/java/org/tests/transaction/TestBatchPersistCascade.java
index 5c35a381d..982a127fb 100644
--- a/src/test/java/org/tests/transaction/TestBatchPersistCascade.java
+++ b/src/test/java/org/tests/transaction/TestBatchPersistCascade.java
@@ -4,7 +4,10 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import io.ebean.Transaction;
+import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.PersistBatch;
+import io.ebean.annotation.Platform;
+
 import org.tests.model.basic.UTDetail;
 import org.tests.model.basic.UTMaster;
 import org.ebeantest.LoggedSqlCollector;
@@ -21,6 +24,7 @@ public class TestBatchPersistCascade extends BaseTestCase {
   Logger logger = LoggerFactory.getLogger(TestBatchPersistCascade.class);
 
   @Test
+  @IgnorePlatform(Platform.HANA)
   public void test() {
 
     EbeanServer ebeanServer = Ebean.getServer(null);
diff --git a/src/test/java/org/tests/transaction/TestNestedSubTransaction.java b/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
index dc9e3d147..a30d5a104 100644
--- a/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
+++ b/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
@@ -20,7 +20,7 @@ public class TestNestedSubTransaction extends BaseTestCase {
   /**
    * MySql only supports named savepoints - review.
    */
-  @IgnorePlatform({Platform.MYSQL, Platform.SQLSERVER})
+  @IgnorePlatform({Platform.MYSQL, Platform.SQLSERVER, Platform.HANA})
   @Test
   public void ebeanServer_commitTransaction_expect_sameAsTransactionCommit() {
 
@@ -65,7 +65,7 @@ public class TestNestedSubTransaction extends BaseTestCase {
   }
 
 
-  @IgnorePlatform({Platform.SQLSERVER, Platform.MYSQL})
+  @IgnorePlatform({Platform.SQLSERVER, Platform.MYSQL, Platform.HANA})
   @Test
   public void nestedUseSavepoint_doubleNested_rollbackCommit() {
 
@@ -102,7 +102,7 @@ public class TestNestedSubTransaction extends BaseTestCase {
     }
   }
 
-  @IgnorePlatform({Platform.SQLSERVER, Platform.MYSQL})
+  @IgnorePlatform({Platform.SQLSERVER, Platform.MYSQL, Platform.HANA})
   @Test
   public void nestedUseSavepoint_doubleNested_commitRollback() {
 
@@ -139,7 +139,7 @@ public class TestNestedSubTransaction extends BaseTestCase {
     }
   }
 
-  @IgnorePlatform({Platform.SQLSERVER, Platform.MYSQL})
+  @IgnorePlatform({Platform.SQLSERVER, Platform.MYSQL, Platform.HANA})
   @Test
   public void nestedUseSavepoint_nested_RequiresNew() {
 
@@ -175,7 +175,7 @@ public class TestNestedSubTransaction extends BaseTestCase {
     assertNull(after);
   }
 
-  @IgnorePlatform({Platform.SQLSERVER, Platform.MYSQL})
+  @IgnorePlatform({Platform.SQLSERVER, Platform.MYSQL, Platform.HANA})
   @Test
   public void nestedUseSavepoint() {
 
diff --git a/src/test/resources/assert/create-column-table.txt b/src/test/resources/assert/create-column-table.txt
new file mode 100644
index 000000000..879972680
--- /dev/null
+++ b/src/test/resources/assert/create-column-table.txt
@@ -0,0 +1,8 @@
+create column table foo (
+  col1                          nvarchar(4) generated by default as identity not null,
+  col2                          nvarchar(30) not null,
+  col3                          nvarchar(30) not null,
+  constraint pk_foo primary key (col1)
+);
+comment on table foo is 'comment';
+
diff --git a/src/test/resources/dbmigration/migrationtest/hana/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/hana/1.0__initial.sql
new file mode 100644
index 000000000..cb6d8e6d4
--- /dev/null
+++ b/src/test/resources/dbmigration/migrationtest/hana/1.0__initial.sql
@@ -0,0 +1,235 @@
+-- Migrationscripts for ebean unittest
+-- apply changes
+create column table migtest_ckey_assoc (
+  id                            integer generated by default as identity not null,
+  assoc_one                     nvarchar(255),
+  constraint pk_migtest_ckey_assoc primary key (id)
+);
+
+create column table migtest_ckey_detail (
+  id                            integer generated by default as identity not null,
+  something                     nvarchar(255),
+  constraint pk_migtest_ckey_detail primary key (id)
+);
+
+create column table migtest_ckey_parent (
+  one_key                       integer not null,
+  two_key                       nvarchar(127) not null,
+  name                          nvarchar(255),
+  version                       integer not null,
+  constraint pk_migtest_ckey_parent primary key (one_key,two_key)
+);
+
+create column table migtest_fk_cascade (
+  id                            bigint generated by default as identity not null,
+  one_id                        bigint,
+  constraint pk_migtest_fk_cascade primary key (id)
+);
+
+create column table migtest_fk_cascade_one (
+  id                            bigint generated by default as identity not null,
+  constraint pk_migtest_fk_cascade_one primary key (id)
+);
+
+create column table migtest_fk_none (
+  id                            bigint generated by default as identity not null,
+  one_id                        bigint,
+  constraint pk_migtest_fk_none primary key (id)
+);
+
+create column table migtest_fk_none_via_join (
+  id                            bigint generated by default as identity not null,
+  one_id                        bigint,
+  constraint pk_migtest_fk_none_via_join primary key (id)
+);
+
+create column table migtest_fk_one (
+  id                            bigint generated by default as identity not null,
+  constraint pk_migtest_fk_one primary key (id)
+);
+
+create column table migtest_fk_set_null (
+  id                            bigint generated by default as identity not null,
+  one_id                        bigint,
+  constraint pk_migtest_fk_set_null primary key (id)
+);
+
+create column table migtest_e_basic (
+  id                            integer generated by default as identity not null,
+  status                        nvarchar(1),
+  name                          nvarchar(127),
+  description                   nvarchar(127),
+  some_date                     timestamp,
+  old_boolean                   boolean default false not null,
+  old_boolean2                  boolean,
+  eref_id                       integer,
+  indextest1                    nvarchar(127),
+  indextest2                    nvarchar(127),
+  indextest3                    nvarchar(127),
+  indextest4                    nvarchar(127),
+  indextest5                    nvarchar(127),
+  indextest6                    nvarchar(127),
+  user_id                       integer not null,
+  constraint ck_migtest_e_basic_status check ( status in ('N','A','I')),
+  constraint uq_migtest_e_basic_indextest2 unique (indextest2),
+  constraint uq_migtest_e_basic_indextest6 unique (indextest6),
+  constraint pk_migtest_e_basic primary key (id)
+);
+
+create column table migtest_e_enum (
+  id                            integer generated by default as identity not null,
+  test_status                   nvarchar(1),
+  constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I')),
+  constraint pk_migtest_e_enum primary key (id)
+);
+
+create column table migtest_e_history (
+  id                            integer generated by default as identity not null,
+  test_string                   nvarchar(255),
+  constraint pk_migtest_e_history primary key (id)
+);
+
+create column table migtest_e_history2 (
+  id                            integer generated by default as identity not null,
+  test_string                   nvarchar(255),
+  obsolete_string1              nvarchar(255),
+  obsolete_string2              nvarchar(255),
+  constraint pk_migtest_e_history2 primary key (id)
+);
+
+create column table migtest_e_history3 (
+  id                            integer generated by default as identity not null,
+  test_string                   nvarchar(255),
+  constraint pk_migtest_e_history3 primary key (id)
+);
+
+create column table migtest_e_history4 (
+  id                            integer generated by default as identity not null,
+  test_number                   integer,
+  constraint pk_migtest_e_history4 primary key (id)
+);
+
+create column table migtest_e_history5 (
+  id                            integer generated by default as identity not null,
+  test_number                   integer,
+  constraint pk_migtest_e_history5 primary key (id)
+);
+
+create column table migtest_e_history6 (
+  id                            integer generated by default as identity not null,
+  test_number1                  integer,
+  test_number2                  integer not null,
+  constraint pk_migtest_e_history6 primary key (id)
+);
+
+create column table migtest_e_ref (
+  id                            integer generated by default as identity not null,
+  name                          nvarchar(127) not null,
+  constraint uq_migtest_e_ref_name unique (name),
+  constraint pk_migtest_e_ref primary key (id)
+);
+
+create column table migtest_e_softdelete (
+  id                            integer generated by default as identity not null,
+  test_string                   nvarchar(255),
+  constraint pk_migtest_e_softdelete primary key (id)
+);
+
+create column table migtest_mtm_c (
+  id                            integer generated by default as identity not null,
+  name                          nvarchar(255),
+  constraint pk_migtest_mtm_c primary key (id)
+);
+
+create column table migtest_mtm_m (
+  id                            bigint generated by default as identity not null,
+  name                          nvarchar(255),
+  constraint pk_migtest_mtm_m primary key (id)
+);
+
+create column table migtest_oto_child (
+  id                            integer generated by default as identity not null,
+  name                          nvarchar(255),
+  constraint pk_migtest_oto_child primary key (id)
+);
+
+create column table migtest_oto_master (
+  id                            bigint generated by default as identity not null,
+  name                          nvarchar(255),
+  constraint pk_migtest_oto_master primary key (id)
+);
+
+-- explicit index "ix_migtest_e_basic_indextest1" for single column "indextest1" of table "migtest_e_basic" is not necessary;
+-- explicit index "ix_migtest_e_basic_indextest5" for single column "indextest5" of table "migtest_e_basic" is not necessary;
+-- explicit index "ix_migtest_fk_cascade_one_id" for single column "one_id" of table "migtest_fk_cascade" is not necessary;
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
+
+-- explicit index "ix_migtest_fk_set_null_one_id" for single column "one_id" of table "migtest_fk_set_null" is not necessary;
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
+
+-- explicit index "ix_migtest_e_basic_eref_id" for single column "eref_id" of table "migtest_e_basic" is not necessary;
+alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
+
+create column table migtest_e_history2_history (
+ id integer,
+ test_string nvarchar(255),
+ obsolete_string1 nvarchar(255),
+ obsolete_string2 nvarchar(255),
+ sys_period_start timestamp,
+ sys_period_end timestamp
+);
+alter table migtest_e_history2 add (
+    sys_period_start TIMESTAMP NOT NULL GENERATED ALWAYS AS ROW START, 
+    sys_period_end TIMESTAMP NOT NULL GENERATED ALWAYS AS ROW END
+);
+alter table migtest_e_history2 add period for system_time(sys_period_start,sys_period_end);
+alter table migtest_e_history2 add system versioning history table migtest_e_history2_history;
+create column table migtest_e_history3_history (
+ id integer,
+ test_string nvarchar(255),
+ sys_period_start timestamp,
+ sys_period_end timestamp
+);
+alter table migtest_e_history3 add (
+    sys_period_start TIMESTAMP NOT NULL GENERATED ALWAYS AS ROW START, 
+    sys_period_end TIMESTAMP NOT NULL GENERATED ALWAYS AS ROW END
+);
+alter table migtest_e_history3 add period for system_time(sys_period_start,sys_period_end);
+alter table migtest_e_history3 add system versioning history table migtest_e_history3_history;
+create column table migtest_e_history4_history (
+ id integer,
+ test_number integer,
+ sys_period_start timestamp,
+ sys_period_end timestamp
+);
+alter table migtest_e_history4 add (
+    sys_period_start TIMESTAMP NOT NULL GENERATED ALWAYS AS ROW START, 
+    sys_period_end TIMESTAMP NOT NULL GENERATED ALWAYS AS ROW END
+);
+alter table migtest_e_history4 add period for system_time(sys_period_start,sys_period_end);
+alter table migtest_e_history4 add system versioning history table migtest_e_history4_history;
+create column table migtest_e_history5_history (
+ id integer,
+ test_number integer,
+ sys_period_start timestamp,
+ sys_period_end timestamp
+);
+alter table migtest_e_history5 add (
+    sys_period_start TIMESTAMP NOT NULL GENERATED ALWAYS AS ROW START, 
+    sys_period_end TIMESTAMP NOT NULL GENERATED ALWAYS AS ROW END
+);
+alter table migtest_e_history5 add period for system_time(sys_period_start,sys_period_end);
+alter table migtest_e_history5 add system versioning history table migtest_e_history5_history;
+create column table migtest_e_history6_history (
+ id integer,
+ test_number1 integer,
+ test_number2 integer not null,
+ sys_period_start timestamp,
+ sys_period_end timestamp
+);
+alter table migtest_e_history6 add (
+    sys_period_start TIMESTAMP NOT NULL GENERATED ALWAYS AS ROW START, 
+    sys_period_end TIMESTAMP NOT NULL GENERATED ALWAYS AS ROW END
+);
+alter table migtest_e_history6 add period for system_time(sys_period_start,sys_period_end);
+alter table migtest_e_history6 add system versioning history table migtest_e_history6_history;
diff --git a/src/test/resources/dbmigration/migrationtest/hana/1.1.sql b/src/test/resources/dbmigration/migrationtest/hana/1.1.sql
new file mode 100644
index 000000000..efa06b208
--- /dev/null
+++ b/src/test/resources/dbmigration/migrationtest/hana/1.1.sql
@@ -0,0 +1,176 @@
+-- Migrationscripts for ebean unittest
+-- apply changes
+create column table migtest_e_user (
+  id                            integer generated by default as identity not null,
+  constraint pk_migtest_e_user primary key (id)
+);
+
+create column table migtest_mtm_c_migtest_mtm_m (
+  migtest_mtm_c_id              integer not null,
+  migtest_mtm_m_id              bigint not null,
+  constraint pk_migtest_mtm_c_migtest_mtm_m primary key (migtest_mtm_c_id,migtest_mtm_m_id)
+);
+
+create column table migtest_mtm_m_migtest_mtm_c (
+  migtest_mtm_m_id              bigint not null,
+  migtest_mtm_c_id              integer not null,
+  constraint pk_migtest_mtm_m_migtest_mtm_c primary key (migtest_mtm_m_id,migtest_mtm_c_id)
+);
+
+alter table migtest_ckey_detail add ( one_key integer);
+alter table migtest_ckey_detail add ( two_key nvarchar(127));
+
+alter table migtest_ckey_detail add constraint fk_migtest_ckey_detail_parent foreign key (one_key,two_key) references migtest_ckey_parent (one_key,two_key) on delete restrict on update restrict;
+alter table migtest_ckey_parent add ( assoc_id integer);
+
+alter table migtest_fk_cascade drop constraint  fk_migtest_fk_cascade_one_id;
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete restrict on update restrict;
+alter table migtest_fk_none add constraint fk_migtest_fk_none_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
+alter table migtest_fk_none_via_join add constraint fk_migtest_fk_none_via_join_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
+alter table migtest_fk_set_null drop constraint  fk_migtest_fk_set_null_one_id;
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict on update restrict;
+
+update migtest_e_basic set status = 'A' where status is null;
+delimiter $$
+do
+begin
+declare exit handler for sql_error_code 397 begin end;
+exec 'alter table migtest_e_basic drop constraint ck_migtest_e_basic_status';
+end;
+$$;
+alter table migtest_e_basic alter ( status nvarchar(1) default 'A' not null);
+alter table migtest_e_basic alter ( status nvarchar(1) default 'A' not null);
+alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
+
+-- rename all collisions;
+-- cannot create unique index "uq_migtest_e_basic_description" on table "migtest_e_basic" with nullable columns;
+
+insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
+alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict on update restrict;
+alter table migtest_e_basic alter ( user_id integer);
+alter table migtest_e_basic add ( new_string_field nvarchar(255) default 'foo''bar' not null);
+alter table migtest_e_basic add ( new_boolean_field boolean default true not null);
+update migtest_e_basic set new_boolean_field = old_boolean;
+
+alter table migtest_e_basic add ( new_boolean_field2 boolean default true not null);
+alter table migtest_e_basic add ( progress integer default 0 not null);
+alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2));
+alter table migtest_e_basic add ( new_integer integer default 42 not null);
+
+delimiter $$
+do
+begin
+declare exit handler for sql_error_code 397 begin end;
+exec 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2';
+end;
+$$;
+delimiter $$
+do
+begin
+declare exit handler for sql_error_code 397 begin end;
+exec 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6';
+end;
+$$;
+-- cannot create unique index "uq_migtest_e_basic_status_indextest1" on table "migtest_e_basic" with nullable columns;
+-- cannot create unique index "uq_migtest_e_basic_name" on table "migtest_e_basic" with nullable columns;
+-- cannot create unique index "uq_migtest_e_basic_indextest4" on table "migtest_e_basic" with nullable columns;
+-- cannot create unique index "uq_migtest_e_basic_indextest5" on table "migtest_e_basic" with nullable columns;
+delimiter $$
+do
+begin
+declare exit handler for sql_error_code 397 begin end;
+exec 'alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status';
+end;
+$$;
+comment on column migtest_e_history.test_string is 'Column altered to long now';
+alter table migtest_e_history alter ( test_string bigint);
+comment on table migtest_e_history is 'We have history now';
+alter table migtest_e_history2 drop system versioning /* 0 */;
+
+-- NOTE: table has @History - special migration may be necessary
+update migtest_e_history2 set test_string = 'unknown' where test_string is null;
+alter table migtest_e_history2 alter ( test_string nvarchar(255) default 'unknown' not null);
+alter table migtest_e_history2 alter ( test_string nvarchar(255) default 'unknown' not null);
+alter table migtest_e_history2_history alter ( test_string nvarchar(255) default 'unknown' not null);
+alter table migtest_e_history2 add system versioning history table migtest_e_history2_history not validated /* 1 */;
+alter table migtest_e_history2 drop system versioning /* 2 */;
+alter table migtest_e_history2 add ( test_string2 nvarchar(255));
+alter table migtest_e_history2 add ( test_string3 nvarchar(255) default 'unknown' not null);
+alter table migtest_e_history2 add ( new_column nvarchar(20));
+
+alter table migtest_e_history2_history add ( test_string2 nvarchar(255));
+alter table migtest_e_history2_history add ( test_string3 nvarchar(255) default 'unknown');
+alter table migtest_e_history2_history add ( new_column nvarchar(20));
+alter table migtest_e_history2 add system versioning history table migtest_e_history2_history not validated /* 3 */;
+alter table migtest_e_history3 drop system versioning /* 4 */;
+alter table migtest_e_history3 add system versioning history table migtest_e_history3_history not validated /* 5 */;
+alter table migtest_e_history4 drop system versioning /* 6 */;
+alter table migtest_e_history4 alter ( test_number bigint);
+alter table migtest_e_history4_history alter ( test_number bigint);
+alter table migtest_e_history4 add system versioning history table migtest_e_history4_history not validated /* 7 */;
+alter table migtest_e_history5 drop system versioning /* 8 */;
+alter table migtest_e_history5 add ( test_boolean boolean default false not null);
+
+alter table migtest_e_history5_history add ( test_boolean boolean default false);
+alter table migtest_e_history5 add system versioning history table migtest_e_history5_history not validated /* 9 */;
+alter table migtest_e_history6 drop system versioning /* 10 */;
+
+-- NOTE: table has @History - special migration may be necessary
+update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
+alter table migtest_e_history6 alter ( test_number1 integer default 42 not null);
+alter table migtest_e_history6 alter ( test_number1 integer default 42 not null);
+alter table migtest_e_history6_history alter ( test_number1 integer default 42 not null);
+alter table migtest_e_history6 add system versioning history table migtest_e_history6_history not validated /* 11 */;
+alter table migtest_e_history6 drop system versioning /* 12 */;
+alter table migtest_e_history6 alter ( test_number2 integer);
+alter table migtest_e_history6_history alter ( test_number2 integer);
+alter table migtest_e_history6 add system versioning history table migtest_e_history6_history not validated /* 13 */;
+alter table migtest_e_softdelete add ( deleted boolean default false not null);
+
+alter table migtest_oto_child add ( master_id bigint);
+
+-- explicit index "ix_migtest_e_basic_indextest3" for single column "indextest3" of table "migtest_e_basic" is not necessary;
+-- explicit index "ix_migtest_e_basic_indextest6" for single column "indextest6" of table "migtest_e_basic" is not necessary;
+delimiter $$
+do
+begin
+declare exit handler for sql_error_code 261 begin end;
+exec 'drop index ix_migtest_e_basic_indextest1';
+end;
+$$;
+delimiter $$
+do
+begin
+declare exit handler for sql_error_code 261 begin end;
+exec 'drop index ix_migtest_e_basic_indextest5';
+end;
+$$;
+-- explicit index "ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c" for single column "migtest_mtm_c_id" of table "migtest_mtm_c_migtest_mtm_m" is not necessary;
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
+
+-- explicit index "ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m" for single column "migtest_mtm_m_id" of table "migtest_mtm_c_migtest_mtm_m" is not necessary;
+alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
+
+-- explicit index "ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m" for single column "migtest_mtm_m_id" of table "migtest_mtm_m_migtest_mtm_c" is not necessary;
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict on update restrict;
+
+-- explicit index "ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c" for single column "migtest_mtm_c_id" of table "migtest_mtm_m_migtest_mtm_c" is not necessary;
+alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
+
+-- explicit index "ix_migtest_ckey_parent_assoc_id" for single column "assoc_id" of table "migtest_ckey_parent" is not necessary;
+alter table migtest_ckey_parent add constraint fk_migtest_ckey_parent_assoc_id foreign key (assoc_id) references migtest_ckey_assoc (id) on delete restrict on update restrict;
+
+alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict on update restrict;
+
+create column table migtest_e_history_history (
+ id integer,
+ test_string bigint,
+ sys_period_start timestamp,
+ sys_period_end timestamp
+);
+alter table migtest_e_history add (
+    sys_period_start TIMESTAMP NOT NULL GENERATED ALWAYS AS ROW START, 
+    sys_period_end TIMESTAMP NOT NULL GENERATED ALWAYS AS ROW END
+);
+alter table migtest_e_history add period for system_time(sys_period_start,sys_period_end);
+alter table migtest_e_history add system versioning history table migtest_e_history_history;
diff --git a/src/test/resources/dbmigration/migrationtest/hana/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/hana/1.2__dropsFor_1.1.sql
new file mode 100644
index 000000000..a69417f3e
--- /dev/null
+++ b/src/test/resources/dbmigration/migrationtest/hana/1.2__dropsFor_1.1.sql
@@ -0,0 +1,19 @@
+-- Migrationscripts for ebean unittest
+-- apply changes
+CALL usp_ebean_drop_column('migtest_e_basic', 'old_boolean');
+
+CALL usp_ebean_drop_column('migtest_e_basic', 'old_boolean2');
+
+CALL usp_ebean_drop_column('migtest_e_basic', 'eref_id');
+
+alter table migtest_e_history2 drop system versioning /* 0 */;
+CALL usp_ebean_drop_column('migtest_e_history2', 'obsolete_string1');
+
+CALL usp_ebean_drop_column('migtest_e_history2_history', 'obsolete_string1');
+alter table migtest_e_history2 add system versioning history table migtest_e_history2_history not validated /* 1 */;
+alter table migtest_e_history2 drop system versioning /* 2 */;
+CALL usp_ebean_drop_column('migtest_e_history2', 'obsolete_string2');
+
+CALL usp_ebean_drop_column('migtest_e_history2_history', 'obsolete_string2');
+alter table migtest_e_history2 add system versioning history table migtest_e_history2_history not validated /* 3 */;
+drop table migtest_e_ref cascade;
diff --git a/src/test/resources/dbmigration/migrationtest/hana/1.3.sql b/src/test/resources/dbmigration/migrationtest/hana/1.3.sql
new file mode 100644
index 000000000..11221535d
--- /dev/null
+++ b/src/test/resources/dbmigration/migrationtest/hana/1.3.sql
@@ -0,0 +1,134 @@
+-- Migrationscripts for ebean unittest
+-- apply changes
+create column table migtest_e_ref (
+  id                            integer generated by default as identity not null,
+  name                          nvarchar(127) not null,
+  constraint uq_migtest_e_ref_name unique (name),
+  constraint pk_migtest_e_ref primary key (id)
+);
+
+alter table migtest_ckey_detail drop constraint  fk_migtest_ckey_detail_parent;
+alter table migtest_fk_cascade drop constraint  fk_migtest_fk_cascade_one_id;
+alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update cascade;
+alter table migtest_fk_none drop constraint  fk_migtest_fk_none_one_id;
+alter table migtest_fk_none_via_join drop constraint  fk_migtest_fk_none_via_join_one_id;
+alter table migtest_fk_set_null drop constraint  fk_migtest_fk_set_null_one_id;
+alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
+delimiter $$
+do
+begin
+declare exit handler for sql_error_code 397 begin end;
+exec 'alter table migtest_e_basic drop constraint ck_migtest_e_basic_status';
+end;
+$$;
+alter table migtest_e_basic alter ( status nvarchar(1) default null);
+alter table migtest_e_basic alter ( status nvarchar(1) default null);
+alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I'));
+delimiter $$
+do
+begin
+declare exit handler for sql_error_code 397 begin end;
+exec 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_description';
+end;
+$$;
+
+update migtest_e_basic set user_id = 23 where user_id is null;
+alter table migtest_e_basic drop constraint  fk_migtest_e_basic_user_id;
+alter table migtest_e_basic alter ( user_id integer default 23 not null);
+alter table migtest_e_basic alter ( user_id integer default 23 not null);
+alter table migtest_e_basic add ( old_boolean boolean default false not null);
+alter table migtest_e_basic add ( old_boolean2 boolean);
+alter table migtest_e_basic add ( eref_id integer);
+
+delimiter $$
+do
+begin
+declare exit handler for sql_error_code 397 begin end;
+exec 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_status_indextest1';
+end;
+$$;
+delimiter $$
+do
+begin
+declare exit handler for sql_error_code 397 begin end;
+exec 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_name';
+end;
+$$;
+delimiter $$
+do
+begin
+declare exit handler for sql_error_code 397 begin end;
+exec 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4';
+end;
+$$;
+delimiter $$
+do
+begin
+declare exit handler for sql_error_code 397 begin end;
+exec 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5';
+end;
+$$;
+-- cannot create unique index "uq_migtest_e_basic_indextest2" on table "migtest_e_basic" with nullable columns;
+-- cannot create unique index "uq_migtest_e_basic_indextest6" on table "migtest_e_basic" with nullable columns;
+delimiter $$
+do
+begin
+declare exit handler for sql_error_code 397 begin end;
+exec 'alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status';
+end;
+$$;
+alter table migtest_e_enum add constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I'));
+comment on column migtest_e_history.test_string is '';
+comment on table migtest_e_history is '';
+alter table migtest_e_history2 drop system versioning /* 0 */;
+alter table migtest_e_history2 alter ( test_string nvarchar(255) default null);
+alter table migtest_e_history2 alter ( test_string nvarchar(255) default null);
+alter table migtest_e_history2_history alter ( test_string nvarchar(255) default null);
+alter table migtest_e_history2 add system versioning history table migtest_e_history2_history not validated /* 1 */;
+alter table migtest_e_history2 drop system versioning /* 2 */;
+alter table migtest_e_history2 add ( obsolete_string1 nvarchar(255));
+alter table migtest_e_history2 add ( obsolete_string2 nvarchar(255));
+
+alter table migtest_e_history2_history add ( obsolete_string1 nvarchar(255));
+alter table migtest_e_history2_history add ( obsolete_string2 nvarchar(255));
+alter table migtest_e_history2 add system versioning history table migtest_e_history2_history not validated /* 3 */;
+alter table migtest_e_history3 drop system versioning /* 4 */;
+alter table migtest_e_history3 add system versioning history table migtest_e_history3_history not validated /* 5 */;
+alter table migtest_e_history4 drop system versioning /* 6 */;
+alter table migtest_e_history4 alter ( test_number decimal );
+alter table migtest_e_history4 alter ( test_number integer);
+alter table migtest_e_history4_history alter ( test_number decimal );
+alter table migtest_e_history4_history alter ( test_number integer);
+alter table migtest_e_history4 add system versioning history table migtest_e_history4_history not validated /* 7 */;
+alter table migtest_e_history6 drop system versioning /* 8 */;
+alter table migtest_e_history6 alter ( test_number1 integer default null);
+alter table migtest_e_history6 alter ( test_number1 integer default null);
+alter table migtest_e_history6_history alter ( test_number1 integer default null);
+alter table migtest_e_history6 add system versioning history table migtest_e_history6_history not validated /* 9 */;
+alter table migtest_e_history6 drop system versioning /* 10 */;
+
+-- NOTE: table has @History - special migration may be necessary
+update migtest_e_history6 set test_number2 = 7 where test_number2 is null;
+alter table migtest_e_history6 alter ( test_number2 integer default 7 not null);
+alter table migtest_e_history6 alter ( test_number2 integer default 7 not null);
+alter table migtest_e_history6_history alter ( test_number2 integer default 7 not null);
+alter table migtest_e_history6 add system versioning history table migtest_e_history6_history not validated /* 11 */;
+-- explicit index "ix_migtest_e_basic_indextest1" for single column "indextest1" of table "migtest_e_basic" is not necessary;
+-- explicit index "ix_migtest_e_basic_indextest5" for single column "indextest5" of table "migtest_e_basic" is not necessary;
+delimiter $$
+do
+begin
+declare exit handler for sql_error_code 261 begin end;
+exec 'drop index ix_migtest_e_basic_indextest3';
+end;
+$$;
+delimiter $$
+do
+begin
+declare exit handler for sql_error_code 261 begin end;
+exec 'drop index ix_migtest_e_basic_indextest6';
+end;
+$$;
+-- explicit index "ix_migtest_e_basic_eref_id" for single column "eref_id" of table "migtest_e_basic" is not necessary;
+alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
+
diff --git a/src/test/resources/dbmigration/migrationtest/hana/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/hana/1.4__dropsFor_1.3.sql
new file mode 100644
index 000000000..fe5d6371f
--- /dev/null
+++ b/src/test/resources/dbmigration/migrationtest/hana/1.4__dropsFor_1.3.sql
@@ -0,0 +1,51 @@
+-- Migrationscripts for ebean unittest
+-- drop dependencies
+alter table migtest_e_history drop system versioning;
+alter table migtest_e_history drop period for system_time;
+alter table migtest_e_history drop (sys_period_start,sys_period_end);
+drop table migtest_e_history_history cascade;
+
+-- apply changes
+CALL usp_ebean_drop_column('migtest_ckey_detail', 'one_key');
+
+CALL usp_ebean_drop_column('migtest_ckey_detail', 'two_key');
+
+CALL usp_ebean_drop_column('migtest_ckey_parent', 'assoc_id');
+
+CALL usp_ebean_drop_column('migtest_e_basic', 'new_string_field');
+
+CALL usp_ebean_drop_column('migtest_e_basic', 'new_boolean_field');
+
+CALL usp_ebean_drop_column('migtest_e_basic', 'new_boolean_field2');
+
+CALL usp_ebean_drop_column('migtest_e_basic', 'progress');
+
+CALL usp_ebean_drop_column('migtest_e_basic', 'new_integer');
+
+alter table migtest_e_history2 drop system versioning /* 0 */;
+CALL usp_ebean_drop_column('migtest_e_history2', 'test_string2');
+
+CALL usp_ebean_drop_column('migtest_e_history2_history', 'test_string2');
+alter table migtest_e_history2 add system versioning history table migtest_e_history2_history not validated /* 1 */;
+alter table migtest_e_history2 drop system versioning /* 2 */;
+CALL usp_ebean_drop_column('migtest_e_history2', 'test_string3');
+
+CALL usp_ebean_drop_column('migtest_e_history2_history', 'test_string3');
+alter table migtest_e_history2 add system versioning history table migtest_e_history2_history not validated /* 3 */;
+alter table migtest_e_history2 drop system versioning /* 4 */;
+CALL usp_ebean_drop_column('migtest_e_history2', 'new_column');
+
+CALL usp_ebean_drop_column('migtest_e_history2_history', 'new_column');
+alter table migtest_e_history2 add system versioning history table migtest_e_history2_history not validated /* 5 */;
+alter table migtest_e_history5 drop system versioning /* 6 */;
+CALL usp_ebean_drop_column('migtest_e_history5', 'test_boolean');
+
+CALL usp_ebean_drop_column('migtest_e_history5_history', 'test_boolean');
+alter table migtest_e_history5 add system versioning history table migtest_e_history5_history not validated /* 7 */;
+CALL usp_ebean_drop_column('migtest_e_softdelete', 'deleted');
+
+CALL usp_ebean_drop_column('migtest_oto_child', 'master_id');
+
+drop table migtest_e_user cascade;
+drop table migtest_mtm_c_migtest_mtm_m cascade;
+drop table migtest_mtm_m_migtest_mtm_c cascade;
diff --git a/src/test/resources/dbmigration/migrationtest/hana/I__create_procs.sql b/src/test/resources/dbmigration/migrationtest/hana/I__create_procs.sql
new file mode 100644
index 000000000..6abbe7a96
--- /dev/null
+++ b/src/test/resources/dbmigration/migrationtest/hana/I__create_procs.sql
@@ -0,0 +1,33 @@
+-- Inital script to create stored procedures etc for the hana platform
+delimiter $$
+--
+-- PROCEDURE: usp_ebean_drop_foreign_keys TABLE, COLUMN
+-- deletes all constraints and foreign keys referring to TABLE.COLUMN
+--
+CREATE OR REPLACE PROCEDURE usp_ebean_drop_foreign_keys(IN table_name NVARCHAR(256), IN column_name NVARCHAR(256))
+AS
+BEGIN
+  DECLARE foreign_key_names TABLE(CONSTRAINT_NAME NVARCHAR(256), TABLE_NAME NVARCHAR(256));
+  DECLARE i INT;
+  
+  foreign_key_names = SELECT CONSTRAINT_NAME, TABLE_NAME FROM SYS.REFERENTIAL_CONSTRAINTS WHERE SCHEMA_NAME=CURRENT_SCHEMA AND TABLE_NAME=UPPER(:table_name) AND COLUMN_NAME=UPPER(:column_name);
+  
+  FOR I IN 1 .. RECORD_COUNT(:foreign_key_names) DO
+    EXEC 'ALTER TABLE "' || ESCAPE_DOUBLE_QUOTES(:foreign_key_names.TABLE_NAME[i]) || '" DROP CONSTRAINT "' || ESCAPE_DOUBLE_QUOTES(:foreign_key_names.CONSTRAINT_NAME[i]) || '"';
+  END FOR;
+  
+END;
+$$
+
+delimiter $$
+--
+-- PROCEDURE: usp_ebean_drop_column TABLE, COLUMN
+-- deletes the column and ensures that all indices and constraints are dropped first
+--
+CREATE OR REPLACE PROCEDURE usp_ebean_drop_column(IN table_name NVARCHAR(256), IN column_name NVARCHAR(256))
+AS
+BEGIN
+  CALL usp_ebean_drop_foreign_keys(table_name, column_name);
+  EXEC 'ALTER TABLE "' || UPPER(ESCAPE_DOUBLE_QUOTES(table_name)) || '" DROP ("' || UPPER(ESCAPE_DOUBLE_QUOTES(column_name)) || '")';
+END;
+$$
diff --git a/src/test/resources/dbmigration/migrationtest/hana/R__order_views_hana.sql b/src/test/resources/dbmigration/migrationtest/hana/R__order_views_hana.sql
new file mode 100644
index 000000000..85b1dce9f
--- /dev/null
+++ b/src/test/resources/dbmigration/migrationtest/hana/R__order_views_hana.sql
@@ -0,0 +1,7 @@
+
+    create view order_agg_vw as
+    select d.order_id, sum(d.order_qty * d.unit_price) as order_total,
+           sum(d.ship_qty * d.unit_price) as ship_total
+    from o_order_detail d
+    group by d.order_id;
+  
\ No newline at end of file
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 5080db655..0e9fc7c8a 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -158,6 +158,11 @@ datasource.db2.password=veryverysecret#1234
 datasource.db2.databaseUrl=jdbc:db2://127.0.0.1:50000/SAMPLE
 datasource.db2.databaseDriver=com.ibm.db2.jcc.DB2Driver
 
+datasource.hana.username=EBEAN_TEST
+datasource.hana.password=Eb3an_test
+datasource.hana.databaseUrl=jdbc:sap://hxehost:39013/?databaseName=HXE
+datasource.hana.databaseDriver=com.sap.db.jdbc.Driver
+
 # parameters for migration test
 datasource.migrationtest.username=SA
 datasource.migrationtest.password=SA
diff --git a/src/test/resources/extra-ddl.xml b/src/test/resources/extra-ddl.xml
index bb786221b..aaf69b523 100644
--- a/src/test/resources/extra-ddl.xml
+++ b/src/test/resources/extra-ddl.xml
@@ -21,6 +21,14 @@
     from o_order_detail d
     group by d.order_id;
   </ddl-script>
+  
+  <ddl-script name="order views hana" platforms="hana">
+    create view order_agg_vw as
+    select d.order_id, sum(d.order_qty * d.unit_price) as order_total,
+           sum(d.ship_qty * d.unit_price) as ship_total
+    from o_order_detail d
+    group by d.order_id;
+  </ddl-script>
 
   <ddl-script name="order views sqlite" platforms="sqlite">
     drop view if exists order_agg_vw;

From 2dbb5ea80dedc25a6bcac19cfd2b2f0ce0b3132f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 24 Oct 2018 21:49:48 +1300
Subject: [PATCH 0500/1036] #1511 - Add SAP HANA support - format only changes

---
 .../config/dbplatform/hana/HanaPlatform.java  | 51 +++++++++----------
 .../dbmigration/DefaultDbMigration.java       |  3 +-
 .../platform/AbstractHanaDdl.java             | 45 ++++++++--------
 .../platform/HanaHistoryDdl.java              | 35 ++++++-------
 .../ddlgeneration/platform/HanaTableDdl.java  |  6 +--
 .../server/core/DatabasePlatformFactory.java  |  2 +-
 .../expression/platform/HanaDbExpression.java |  3 +-
 7 files changed, 67 insertions(+), 78 deletions(-)

diff --git a/src/main/java/io/ebean/config/dbplatform/hana/HanaPlatform.java b/src/main/java/io/ebean/config/dbplatform/hana/HanaPlatform.java
index f266bb931..3e06d0094 100644
--- a/src/main/java/io/ebean/config/dbplatform/hana/HanaPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/hana/HanaPlatform.java
@@ -11,13 +11,26 @@ import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.SqlErrorCodes;
 
 public class HanaPlatform extends DatabasePlatform {
+
   public HanaPlatform() {
-    this.basicSqlLimiter = new HanaBasicSqlLimiter();
-    
+    this.platform = Platform.HANA;
+    this.sqlLimiter = new HanaSqlLimiter();
+    this.persistBatchOnCascade = PersistBatch.NONE;
+    this.supportsResultSetConcurrencyModeUpdatable = false;
     this.columnAliasPrefix = null;
 
+    this.historySupport = new HanaHistorySupport();
+    this.basicSqlLimiter = new HanaBasicSqlLimiter();
+
+    this.likeClauseRaw = "like ?";
+    this.maxConstraintNameLength = 127;
+    this.maxTableNameLength = 127;
+
     this.dbDefaultValue.setNow("current_timestamp");
 
+    this.exceptionTranslator = new SqlErrorCodes().addAcquireLock("131", "133", "146")
+      .addDataIntegrity("130", "429", "461", "462").addDuplicateKey("144", "301", "349").build();
+
     this.dbIdentity.setIdType(IdType.IDENTITY);
     this.dbIdentity.setSelectLastInsertedIdTemplate("select current_identity_value() from sys.dummy");
     this.dbIdentity.setSupportsGetGeneratedKeys(false);
@@ -44,24 +57,6 @@ public class HanaPlatform extends DatabasePlatform {
     this.dbTypeMap.put(DbType.UUID, new DbPlatformType("varchar", 40));
     this.dbTypeMap.put(DbType.VARBINARY, new DbPlatformType("varbinary", 255));
     this.dbTypeMap.put(DbType.VARCHAR, new DbPlatformType("nvarchar", 255));
-
-    this.exceptionTranslator = new SqlErrorCodes().addAcquireLock("131", "133", "146")
-        .addDataIntegrity("130", "429", "461", "462").addDuplicateKey("144", "301", "349").build();
-
-    this.historySupport = new HanaHistorySupport();
-    
-    this.likeClauseRaw = "like ?";
-
-    this.maxConstraintNameLength = 127;
-    this.maxTableNameLength = 127;
-
-    this.persistBatchOnCascade = PersistBatch.NONE;
-    
-    this.platform = Platform.HANA;
-
-    this.sqlLimiter = new HanaSqlLimiter();
-    
-    this.supportsResultSetConcurrencyModeUpdatable = false;
   }
 
   @Override
@@ -77,14 +72,14 @@ public class HanaPlatform extends DatabasePlatform {
   @Override
   protected String withForUpdate(String sql, ForUpdate forUpdateMode) {
     switch (forUpdateMode) {
-    case BASE:
-      return sql + " for update";
-    case NOWAIT:
-      return sql + " for update nowait";
-    case SKIPLOCKED:
-      return sql + " for update ignore locked";
-    default:
-      throw new IllegalArgumentException("Unknown update mode: " + forUpdateMode.name());
+      case BASE:
+        return sql + " for update";
+      case NOWAIT:
+        return sql + " for update nowait";
+      case SKIPLOCKED:
+        return sql + " for update ignore locked";
+      default:
+        throw new IllegalArgumentException("Unknown update mode: " + forUpdateMode.name());
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index 19817a924..5ae428a10 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -266,6 +266,7 @@ public class DefaultDbMigration implements DbMigration {
    *       migration.generateMigration();
    *
    * }</pre>
+   *
    * @return the generated migration or null
    */
   @Override
@@ -681,7 +682,7 @@ public class DefaultDbMigration implements DbMigration {
       case SQLITE:
         return new SQLitePlatform();
       case HANA:
-    	return new HanaPlatform();
+        return new HanaPlatform();
       case GENERIC:
         return new DatabasePlatform();
 
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/AbstractHanaDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/AbstractHanaDdl.java
index b898c02a6..cd3b580b3 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/AbstractHanaDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/AbstractHanaDdl.java
@@ -1,10 +1,5 @@
 package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
-import java.io.IOException;
-import java.util.Objects;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
@@ -12,10 +7,14 @@ import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler;
 import io.ebeaninternal.dbmigration.migration.AlterColumn;
 
+import java.io.IOException;
+import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 public abstract class AbstractHanaDdl extends PlatformDdl {
 
-  private static final Pattern ARRAY_PATTERN = Pattern.compile("(\\w+)\\s*\\[\\s*\\]\\s*(\\(\\d+\\))?",
-      Pattern.CASE_INSENSITIVE);
+  private static final Pattern ARRAY_PATTERN = Pattern.compile("(\\w+)\\s*\\[\\s*\\]\\s*(\\(\\d+\\))?", Pattern.CASE_INSENSITIVE);
 
   public AbstractHanaDdl(DatabasePlatform platform) {
     super(platform);
@@ -50,7 +49,7 @@ public abstract class AbstractHanaDdl extends PlatformDdl {
     boolean notnull = (alter.isNotnull() != null) ? alter.isNotnull() : Boolean.TRUE.equals(alter.isCurrentNotnull());
     String notnullClause = notnull ? " not null" : "";
     String defaultValue = DdlHelp.isDropDefault(alter.getDefaultValue()) ? "null"
-        : (alter.getDefaultValue() != null ? alter.getDefaultValue() : alter.getCurrentDefaultValue());
+      : (alter.getDefaultValue() != null ? alter.getDefaultValue() : alter.getCurrentDefaultValue());
     String defaultValueClause = (defaultValue == null || defaultValue.isEmpty()) ? "" : " default " + defaultValue;
 
     try {
@@ -60,18 +59,19 @@ public abstract class AbstractHanaDdl extends PlatformDdl {
         if (isNumberType(currentType)) {
           // numbers can always be converted to decimal
           buffer.append("alter table ").append(tableName).append(" ").append(alterColumn).append(" ").append(columnName)
-              .append(" decimal ").append(defaultValueClause).append(notnullClause).append(alterColumnSuffix)
-              .endOfStatement();
+            .append(" decimal ").append(defaultValueClause).append(notnullClause).append(alterColumnSuffix)
+            .endOfStatement();
+
         } else if (isStringType(currentType)) {
           // strings can always be converted to nclob
           buffer.append("alter table ").append(tableName).append(" ").append(alterColumn).append(" ").append(columnName)
-              .append(" nclob ").append(defaultValueClause).append(notnullClause).append(alterColumnSuffix)
-              .endOfStatement();
+            .append(" nclob ").append(defaultValueClause).append(notnullClause).append(alterColumnSuffix)
+            .endOfStatement();
         }
       }
 
       buffer.append("alter table ").append(tableName).append(" ").append(alterColumn).append(" ").append(columnName)
-          .append(" ").append(type).append(defaultValueClause).append(notnullClause).append(alterColumnSuffix);
+        .append(" ").append(type).append(defaultValueClause).append(notnullClause).append(alterColumnSuffix);
 
       return buffer.getBuffer();
     } catch (IOException e) {
@@ -110,8 +110,7 @@ public abstract class AbstractHanaDdl extends PlatformDdl {
   }
 
   @Override
-  public String alterTableAddUniqueConstraint(String tableName, String uqName, String[] columns,
-      String[] nullableColumns) {
+  public String alterTableAddUniqueConstraint(String tableName, String uqName, String[] columns, String[] nullableColumns) {
     if (nullableColumns == null || nullableColumns.length == 0) {
       return super.alterTableAddUniqueConstraint(tableName, uqName, columns, nullableColumns);
     } else {
@@ -128,7 +127,7 @@ public abstract class AbstractHanaDdl extends PlatformDdl {
       buffer.append("begin").newLine();
       buffer.append("declare exit handler for sql_error_code 397 begin end").endOfStatement();
       buffer.append("exec 'alter table ").append(tableName).append(" ").append(dropUniqueConstraint).append(" ")
-          .append(maxConstraintName(uniqueConstraintName)).append("'").endOfStatement();
+        .append(maxConstraintName(uniqueConstraintName)).append("'").endOfStatement();
       buffer.append("end").endOfStatement();
       buffer.append("$$");
       return buffer.getBuffer();
@@ -136,7 +135,7 @@ public abstract class AbstractHanaDdl extends PlatformDdl {
       throw new RuntimeException(e);
     }
   }
-  
+
   @Override
   public String alterTableDropConstraint(String tableName, String constraintName) {
     return alterTableDropUniqueConstraint(tableName, constraintName);
@@ -149,13 +148,13 @@ public abstract class AbstractHanaDdl extends PlatformDdl {
   @Override
   public void alterTableDropColumn(DdlBuffer buffer, String tableName, String columnName) throws IOException {
     buffer.append("CALL usp_ebean_drop_column('").append(tableName).append("', '").append(columnName).append("')")
-        .endOfStatement();
+      .endOfStatement();
   }
 
   /**
    * Check if a data type can be converted to another data type. Data types can't
    * be converted if the target type has a lower precision than the source type.
-   * 
+   *
    * @param sourceType The source data type
    * @param targetType the target data type
    * @return {@code true} if the type can be converted, {@code false} otherwise
@@ -204,7 +203,7 @@ public abstract class AbstractHanaDdl extends PlatformDdl {
       DbPlatformType dbPlatformTargetType = DbPlatformType.parse(targetType);
       if ("decimal".equals(dbPlatformTargetType.getName())) {
         if (dbPlatformSourceType.getDefaultLength() > dbPlatformTargetType.getDefaultLength()
-            || dbPlatformSourceType.getDefaultScale() > dbPlatformTargetType.getDefaultScale()) {
+          || dbPlatformSourceType.getDefaultScale() > dbPlatformTargetType.getDefaultScale()) {
           return false;
         }
       }
@@ -215,12 +214,12 @@ public abstract class AbstractHanaDdl extends PlatformDdl {
 
   private boolean isNumberType(String type) {
     return type != null
-        && ("bigint".equals(type) || "integer".equals(type) || "smallint".equals(type) || "tinyint".equals(type)
-            || type.startsWith("float") || "real".equals(type) || "double".equals(type) || type.startsWith("decimal"));
+      && ("bigint".equals(type) || "integer".equals(type) || "smallint".equals(type) || "tinyint".equals(type)
+      || type.startsWith("float") || "real".equals(type) || "double".equals(type) || type.startsWith("decimal"));
   }
 
   private boolean isStringType(String type) {
     return type != null
-        && (type.startsWith("varchar") || type.startsWith("nvarchar") || "clob".equals(type) || "nclob".equals(type));
+      && (type.startsWith("varchar") || type.startsWith("nvarchar") || "clob".equals(type) || "nclob".equals(type));
   }
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaHistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaHistoryDdl.java
index 0ea165ba3..9fd37416f 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaHistoryDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaHistoryDdl.java
@@ -1,11 +1,5 @@
 package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-
 import io.ebean.config.ServerConfig;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
@@ -14,6 +8,12 @@ import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
 import io.ebeaninternal.dbmigration.model.MColumn;
 import io.ebeaninternal.dbmigration.model.MTable;
 
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
 public class HanaHistoryDdl implements PlatformHistoryDdl {
 
   private String systemPeriodStart;
@@ -47,7 +47,7 @@ public class HanaHistoryDdl implements PlatformHistoryDdl {
     for (MColumn column : cols) {
       if (!column.isDraftOnly()) {
         writeColumnDefinition(apply, column.getName(), column.getType(), column.getDefaultValue(), column.isNotnull(),
-            column.isIdentity() ? platformDdl.identitySuffix : null);
+          column.isIdentity() ? platformDdl.identitySuffix : null);
         apply.append(",").newLine();
       }
     }
@@ -58,13 +58,12 @@ public class HanaHistoryDdl implements PlatformHistoryDdl {
 
     // enable system versioning
     apply.append("alter table ").append(tableName).append(" add (").newLine();
-    apply.append("    ").append(systemPeriodStart).append(" TIMESTAMP NOT NULL GENERATED ALWAYS AS ROW START, ")
-        .newLine();
+    apply.append("    ").append(systemPeriodStart).append(" TIMESTAMP NOT NULL GENERATED ALWAYS AS ROW START, ").newLine();
     apply.append("    ").append(systemPeriodEnd).append(" TIMESTAMP NOT NULL GENERATED ALWAYS AS ROW END").newLine();
     apply.append(")").endOfStatement();
 
     apply.append("alter table ").append(tableName).append(" add period for system_time(").append(systemPeriodStart)
-        .append(",").append(systemPeriodEnd).append(")").endOfStatement();
+      .append(",").append(systemPeriodEnd).append(")").endOfStatement();
 
     enableSystemVersioning(apply, tableName, historyTableName, true, false);
 
@@ -76,7 +75,7 @@ public class HanaHistoryDdl implements PlatformHistoryDdl {
   @Override
   public void dropHistoryTable(DdlWrite writer, DropHistoryTable dropHistoryTable) throws IOException {
     dropHistoryTable(writer.applyDropDependencies(), dropHistoryTable.getBaseTable(),
-        dropHistoryTable.getBaseTable() + historySuffix);
+      dropHistoryTable.getBaseTable() + historySuffix);
   }
 
   protected void dropHistoryTable(DdlBuffer apply, String baseTable, String historyTable) throws IOException {
@@ -87,7 +86,7 @@ public class HanaHistoryDdl implements PlatformHistoryDdl {
 
     // drop the period columns
     apply.append("alter table ").append(baseTable).append(" drop (").append(systemPeriodStart).append(",")
-        .append(systemPeriodEnd).append(")").endOfStatement();
+      .append(systemPeriodEnd).append(")").endOfStatement();
 
     // drop the history table
     apply.append("drop table ").append(historyTable).append(" cascade").endOfStatement();
@@ -97,19 +96,18 @@ public class HanaHistoryDdl implements PlatformHistoryDdl {
   public void addHistoryTable(DdlWrite writer, AddHistoryTable addHistoryTable) throws IOException {
     MTable table = writer.getTable(addHistoryTable.getBaseTable());
     if (table == null) {
-      throw new IllegalStateException(
-          "MTable " + addHistoryTable.getBaseTable() + " not found in writer? (required for history DDL)");
+      throw new IllegalStateException("MTable " + addHistoryTable.getBaseTable() + " not found in writer? (required for history DDL)");
     }
     createWithHistory(writer, table);
   }
 
   @Override
-  public void updateTriggers(DdlWrite write, HistoryTableUpdate baseTable) throws IOException {
+  public void updateTriggers(DdlWrite write, HistoryTableUpdate baseTable) {
     // nothing to do
   }
 
   protected void writeColumnDefinition(DdlBuffer buffer, String columnName, String type, String defaultValue,
-      boolean isNotNull, String generated) throws IOException {
+                                       boolean isNotNull, String generated) throws IOException {
 
     String platformType = platformDdl.convert(type, false);
     buffer.append(" ").append(platformDdl.lowerColumnName(columnName));
@@ -140,9 +138,8 @@ public class HanaHistoryDdl implements PlatformHistoryDdl {
   }
 
   public void enableSystemVersioning(DdlBuffer apply, String tableName, String historyTableName, boolean validated,
-      boolean uniqueStatement) throws IOException {
-    apply.append("alter table ").append(tableName).append(" add system versioning history table ")
-        .append(historyTableName);
+                                     boolean uniqueStatement) throws IOException {
+    apply.append("alter table ").append(tableName).append(" add system versioning history table ").append(historyTableName);
     if (!validated) {
       apply.append(" not validated");
     }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaTableDdl.java
index 1d0b47abc..943dc3ecd 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaTableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaTableDdl.java
@@ -21,8 +21,7 @@ public class HanaTableDdl extends BaseTableDdl {
     super(serverConfig, platformDdl);
     this.historyDdl = (HanaHistoryDdl) platformDdl.historyDdl;
     if (serverConfig.getProperties() != null) {
-      PropertiesWrapper wrapper = new PropertiesWrapper("ebean", "hana", serverConfig.getProperties(),
-          serverConfig.getClassLoadConfig());
+      PropertiesWrapper wrapper = new PropertiesWrapper("ebean", "hana", serverConfig.getProperties(), serverConfig.getClassLoadConfig());
       this.generateUniqueDdl = wrapper.getBoolean("generateUniqueDdl", false);
     } else {
       this.generateUniqueDdl = false;
@@ -86,8 +85,7 @@ public class HanaTableDdl extends BaseTableDdl {
     if (manageSystemVersioning) {
       // make same changes to the history table
       String historyTable = historyTable(tableName);
-      if (hasValue(alterColumn.getType()) || hasValue(alterColumn.getDefaultValue())
-          || alterColumn.isNotnull() != null) {
+      if (hasValue(alterColumn.getType()) || hasValue(alterColumn.getDefaultValue()) || alterColumn.isNotnull() != null) {
         AlterColumn alterHistoryColumn = new AlterColumn();
         alterHistoryColumn.setTableName(historyTable);
         alterHistoryColumn.setColumnName(alterColumn.getColumnName());
diff --git a/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java b/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
index acf955620..b5a5b6ef5 100644
--- a/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
+++ b/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
@@ -160,7 +160,7 @@ public class DatabasePlatformFactory {
       return new DB2Platform();
     } else if (dbProductName.contains("sql anywhere")) {
       return new SqlAnywherePlatform();
-    }else if (dbProductName.contains("hdb")) {
+    } else if (dbProductName.contains("hdb")) {
       return new HanaPlatform();
     }
 
diff --git a/src/main/java/io/ebeaninternal/server/expression/platform/HanaDbExpression.java b/src/main/java/io/ebeaninternal/server/expression/platform/HanaDbExpression.java
index 0593bdb84..a6633edfa 100644
--- a/src/main/java/io/ebeaninternal/server/expression/platform/HanaDbExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/platform/HanaDbExpression.java
@@ -10,8 +10,7 @@ import io.ebeaninternal.server.expression.Op;
 public class HanaDbExpression extends BaseDbExpression {
 
   @Override
-  public void bitwise(SpiExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare,
-      long match) {
+  public void bitwise(SpiExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare, long match) {
     bitwiseFunction(request, propName, operator, compare);
   }
 

From d185ea5962f3f3da94124af7f5afcdf6fcc69106 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 24 Oct 2018 22:12:42 +1300
Subject: [PATCH 0501/1036] Updated db migration test for mysql

---
 .../dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql
index 7d2ef6bec..efa0bbc8a 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql
@@ -3,8 +3,8 @@
 drop trigger migtest_e_history_history_upd;
 drop trigger migtest_e_history_history_del;
 drop view migtest_e_history_with_history;
-alter table migtest_e_history drop column sys_period_start;
-alter table migtest_e_history drop column sys_period_end;
+CALL usp_ebean_drop_column('migtest_e_history', 'sys_period_start');
+CALL usp_ebean_drop_column('migtest_e_history', 'sys_period_end');
 drop table migtest_e_history_history;
 
 drop view if exists migtest_e_history2_with_history;

From 1d1d479ddab11485ab30d2b0208beaadfa2545d3 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 24 Oct 2018 22:17:44 +1300
Subject: [PATCH 0502/1036] Fix concat_expectString test with explicit cast to
 string

---
 .../java/org/tests/query/aggregation/TestAggregationCount.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/tests/query/aggregation/TestAggregationCount.java b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
index cbd55510e..fc578780e 100644
--- a/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
+++ b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
@@ -406,7 +406,7 @@ public class TestAggregationCount extends BaseTestCase {
     List<String> names =
 
       Ebean.find(Contact.class)
-        .select(concat("updtime",", ","firstName"))
+        .select(concat("updtime",", ","firstName")+"::String")
         .where().isNull("phone")
         .orderBy().asc("lastName")
         .findSingleAttributeList();

From 156469ae0fd49d13849473d605189cfa5722e1d7 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 24 Oct 2018 22:59:48 +1300
Subject: [PATCH 0503/1036] Update tests for running MySql

---
 .../org/tests/model/history/HsdSetting.java   | 24 +++++++++---------
 .../TestQuotedIdentifierQuery.java            | 25 ++++++++++++++-----
 .../tests/softdelete/TestSoftDeleteBasic.java |  4 +--
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/src/test/java/org/tests/model/history/HsdSetting.java b/src/test/java/org/tests/model/history/HsdSetting.java
index 26cfc30d9..c315110e0 100644
--- a/src/test/java/org/tests/model/history/HsdSetting.java
+++ b/src/test/java/org/tests/model/history/HsdSetting.java
@@ -11,8 +11,8 @@ import javax.persistence.OneToOne;
 @Entity
 public class HsdSetting extends BaseDomain {
 
-  String key;
-  String val;
+  String code;
+  String content;
 
   @SoftDelete
   boolean deleted;
@@ -21,27 +21,27 @@ public class HsdSetting extends BaseDomain {
   private HsdUser user;
 
 
-  public HsdSetting(String key) {
-    this.key = key;
+  public HsdSetting(String code) {
+    this.code = code;
   }
 
   public HsdSetting() {
   }
 
-  public String getKey() {
-    return key;
+  public String getCode() {
+    return code;
   }
 
-  public void setKey(String key) {
-    this.key = key;
+  public void setCode(String code) {
+    this.code = code;
   }
 
-  public String getVal() {
-    return val;
+  public String getContent() {
+    return content;
   }
 
-  public void setVal(String val) {
-    this.val = val;
+  public void setContent(String content) {
+    this.content = content;
   }
 
   public boolean isDeleted() {
diff --git a/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java b/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java
index 90f6b3be8..caf230efc 100644
--- a/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java
+++ b/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java
@@ -16,11 +16,24 @@ public class TestQuotedIdentifierQuery extends BaseTestCase {
 
     Ebean.save(bean);
 
-    Ebean.find(BWithQIdent.class)
-      .where()
-      .eq("name", "foo")
-      .raw("t0.\"Name\" = ?", "foo")
-      .raw("t0.\"CODE\" = ?", "bar")
-      .findList();
+    if (isMySql()) {
+
+      Ebean.find(BWithQIdent.class)
+        .where()
+        .eq("name", "foo")
+        .raw("t0.`Name` = ?", "foo")
+        .raw("t0.`CODE` = ?", "bar")
+        .findList();
+
+    } else if (isH2() || isPostgres()) {
+
+      Ebean.find(BWithQIdent.class)
+        .where()
+        .eq("name", "foo")
+        .raw("t0.\"Name\" = ?", "foo")
+        .raw("t0.\"CODE\" = ?", "bar")
+        .findList();
+
+    }
   }
 }
diff --git a/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java b/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
index 6240c49cd..9058195dc 100644
--- a/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
+++ b/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
@@ -79,8 +79,8 @@ public class TestSoftDeleteBasic extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
 
     assertThat(sql).hasSize(2);
-    assertThat(sql.get(0)).contains("from ebasic_sdchild t0 where t0.owner_id = ?  and t0.deleted = false");
-    assertThat(sql.get(1)).contains("from ebasic_sdchild t0 where t0.owner_id = ?  and t0.deleted = false");
+    assertThat(sql.get(0)).contains("from ebasic_sdchild t0 where t0.owner_id = ?  and t0.deleted = ");
+    assertThat(sql.get(1)).contains("from ebasic_sdchild t0 where t0.owner_id = ?  and t0.deleted = ");
   }
 
   @Test

From e06967ff4a60fef40149753ddc0e2595dcb12318 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 24 Oct 2018 23:25:48 +1300
Subject: [PATCH 0504/1036] #1512 - Invalid SQL with Postgres + order by nulls
 first/last + where() expression on ManyToMany

---
 src/main/java/io/ebeaninternal/server/query/DbOrderByTrim.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/query/DbOrderByTrim.java b/src/main/java/io/ebeaninternal/server/query/DbOrderByTrim.java
index 2edfe488b..5865da349 100644
--- a/src/main/java/io/ebeaninternal/server/query/DbOrderByTrim.java
+++ b/src/main/java/io/ebeaninternal/server/query/DbOrderByTrim.java
@@ -4,7 +4,7 @@ import java.util.regex.Pattern;
 
 class DbOrderByTrim {
 
-  private static final Pattern orderByTrim = Pattern.compile("(?i)\\b asc\\b|\\b desc\\b");
+  private static final Pattern orderByTrim = Pattern.compile("(?i)\\b asc\\b|\\b desc\\b|\\b nulls first\\b|\\b nulls last\\b");
 
   /**
    * Convert the dbOrderBy clause to be safe for adding to select or distinct on.

From c1a479e1f467fa1a38434d7e16a1df78b7d5a6af Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 24 Oct 2018 23:26:19 +1300
Subject: [PATCH 0505/1036] #1512 - Invalid SQL with Postgres + order by nulls
 first/last + where() expression on ManyToMany

---
 .../server/query/SqlTreeBuilderTest.java      | 37 ++++++++++---------
 .../orderby/TestOrderByWithDistinct.java      | 21 +++++++++++
 2 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java b/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java
index 7b8232ba6..2c5beb403 100644
--- a/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java
+++ b/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java
@@ -7,57 +7,58 @@ import static org.junit.Assert.*;
 public class SqlTreeBuilderTest {
 
   @Test
-  public void mergeOnDistinct_equal() throws Exception {
-
+  public void mergeOnDistinct_equal() {
     assertEquals(SqlTreeBuilder.mergeOnDistinct("t0.id", "t0.id"), "t0.id");
   }
 
   @Test
-  public void mergeOnDistinct_add() throws Exception {
-
+  public void mergeOnDistinct_add() {
     assertEquals(SqlTreeBuilder.mergeOnDistinct("t0.id", "t0.cre"), "t0.cre, t0.id");
   }
 
   @Test
-  public void mergeOnDistinct_contained() throws Exception {
-
+  public void mergeOnDistinct_contained() {
     assertEquals(SqlTreeBuilder.mergeOnDistinct("t0.id", "t0.cre, t0.id"), "t0.cre, t0.id");
   }
 
   @Test
-  public void mergeOnDistinct_overlap() throws Exception {
-
+  public void mergeOnDistinct_overlap() {
     assertEquals(SqlTreeBuilder.mergeOnDistinct("t0.id, t1.id", "t0.cre, t0.id"), "t0.cre, t0.id, t1.id");
   }
 
   @Test
-  public void mergeOnDistinct_overlapBoth() throws Exception {
-
+  public void mergeOnDistinct_overlapBoth() {
     assertEquals(SqlTreeBuilder.mergeOnDistinct("t0.id, t1.id", "t0.cre, t1.id, t0.id"), "t0.cre, t1.id, t0.id");
   }
 
   @Test
-  public void mergeOnDistinct_inlineAscDesc() throws Exception {
-
+  public void mergeOnDistinct_inlineAscDesc() {
     assertEquals(SqlTreeBuilder.mergeOnDistinct("t0.id", "t0.cre asc, t1.bb desc, t3.b"), "t0.cre, t1.bb, t3.b, t0.id");
   }
 
   @Test
-  public void mergeOnDistinct_inlineAscDesc2() throws Exception {
-
+  public void mergeOnDistinct_inlineAscDesc2() {
     assertEquals(SqlTreeBuilder.mergeOnDistinct("t0.id", "t0.cre desc, t1.bb asc, t3.b"), "t0.cre, t1.bb, t3.b, t0.id");
   }
 
   @Test
-  public void mergeOnDistinct_trailingAsc() throws Exception {
-
+  public void mergeOnDistinct_trailingAsc() {
     assertEquals(SqlTreeBuilder.mergeOnDistinct("t0.id", "t0.cre asc"), "t0.cre, t0.id");
   }
 
   @Test
-  public void mergeOnDistinct_trailingDesc() throws Exception {
-
+  public void mergeOnDistinct_trailingDesc() {
     assertEquals(SqlTreeBuilder.mergeOnDistinct("t0.id", "t0.cre desc"), "t0.cre, t0.id");
   }
 
+  @Test
+  public void mergeOnDistinct_trailingDescNullsFirst() {
+    assertEquals(SqlTreeBuilder.mergeOnDistinct("t0.id", "t0.cre desc nulls first"), "t0.cre, t0.id");
+  }
+
+  @Test
+  public void mergeOnDistinct_trailingDescNullsLast() {
+    assertEquals(SqlTreeBuilder.mergeOnDistinct("t0.id", "t0.cre desc nulls last"), "t0.cre, t0.id");
+  }
+
 }
diff --git a/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java b/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java
index 2090a0566..9d2ece465 100644
--- a/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java
+++ b/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java
@@ -37,6 +37,27 @@ public class TestOrderByWithDistinct extends BaseTestCase {
 
   }
 
+  @Test
+  public void testDistinctOn() {
+
+    MRole role = Ebean.getReference(MRole.class, 1);
+
+    Query<MUser> query = Ebean.find(MUser.class)
+      .where()
+      .eq("roles", role)
+      .orderBy("userName asc nulls first");
+
+    query.findList();
+
+    String sql = sqlOf(query);
+    if (isPostgres()) {
+      assertThat(sql).contains("select distinct on (t0.user_name, t0.userid) t0.userid,");
+    } else if (isH2()) {
+      assertThat(sql).contains("select distinct t0.userid, t0.user_name, t0.user_type_id,");
+    }
+
+  }
+
 
   @Test
   public void testOrderByWithDistinct() {

From 6909b20a9e6ce2f96fce374927a321c5242bf00c Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 24 Oct 2018 23:31:07 +1300
Subject: [PATCH 0506/1036] #1510 - Tidy DbMigrationConfig removing the
 properties that should only be with DbMigration generation (#1513)

---
 .../io/ebean/config/DbMigrationConfig.java    | 125 ------------------
 .../dbmigration/DefaultDbMigration.java       |  82 +++++++++---
 2 files changed, 64 insertions(+), 143 deletions(-)

diff --git a/src/main/java/io/ebean/config/DbMigrationConfig.java b/src/main/java/io/ebean/config/DbMigrationConfig.java
index d09f3430a..cdbb3a416 100644
--- a/src/main/java/io/ebean/config/DbMigrationConfig.java
+++ b/src/main/java/io/ebean/config/DbMigrationConfig.java
@@ -28,34 +28,6 @@ public class DbMigrationConfig {
    */
   protected Platform platform;
 
-  /**
-   * Set to true if the DB migration should be generated on server start.
-   */
-  protected boolean generate;
-
-  /**
-   * The migration version name (typically FlywayDb compatible).
-   * <p>
-   * Example: 1.1.1_2
-   * <p>
-   * The version is expected to be the combination of the current pom version plus
-   * a 'feature' id. The combined version must be unique and ordered to work with
-   * FlywayDb so each developer sets a unique version so that the migration script
-   * generated is unique (typically just prior to being submitted as a merge request).
-   */
-  protected String version;
-
-  /**
-   * Description text that can be appended to the version to become the ddl script file name.
-   * <p>
-   * So if the name is "a foo table" then the ddl script file could be:
-   * "1.1.1_2__a-foo-table.sql"
-   * <p>
-   * When the DB migration relates to a git feature (merge request) then this description text
-   * is a short description of the feature.
-   */
-  protected String name;
-
   /**
    * Resource path for the migration xml and sql.
    */
@@ -75,13 +47,6 @@ public class DbMigrationConfig {
 
   protected String modelSuffix = ".model.xml";
 
-  protected boolean includeGeneratedFileComment;
-
-  /**
-   * The version of a pending drop that should be generated as the next migration.
-   */
-  protected String generatePendingDrop;
-
   /**
    * For running migration the DB table that holds migration execution status.
    */
@@ -228,52 +193,6 @@ public class DbMigrationConfig {
     this.applyPrefix = applyPrefix;
   }
 
-  /**
-   * Return true if the generated file comment should be included.
-   */
-  public boolean isIncludeGeneratedFileComment() {
-    return includeGeneratedFileComment;
-  }
-
-  /**
-   * Set to true if the generated file comment should be included.
-   */
-  public void setIncludeGeneratedFileComment(boolean includeGeneratedFileComment) {
-    this.includeGeneratedFileComment = includeGeneratedFileComment;
-  }
-
-  /**
-   * Return the migration version (or "next") to generate pending drops for.
-   */
-  public String getGeneratePendingDrop() {
-    return generatePendingDrop;
-  }
-
-  /**
-   * Set the migration version (or "next") to generate pending drops for.
-   */
-  public void setGeneratePendingDrop(String generatePendingDrop) {
-    this.generatePendingDrop = generatePendingDrop;
-  }
-
-  /**
-   * Set the migration version.
-   * <p>
-   * Note that version set via System property or environment variable <code>ddl.migration.version</code> takes precedence.
-   */
-  public void setVersion(String version) {
-    this.version = version;
-  }
-
-  /**
-   * Set the migration name.
-   * <p>
-   * Note that name set via System property or environment variable <code>ddl.migration.name</code> takes precedence.
-   */
-  public void setName(String name) {
-    this.name = name;
-  }
-
   /**
    * Return the table name that holds the migration run details
    * (used by DB Migration runner only).
@@ -504,14 +423,8 @@ public class DbMigrationConfig {
     applyPrefix = properties.get("migration.applyPrefix", applyPrefix);
     applySuffix = properties.get("migration.applySuffix", applySuffix);
     modelSuffix = properties.get("migration.modelSuffix", modelSuffix);
-    includeGeneratedFileComment = properties.getBoolean("migration.includeGeneratedFileComment", includeGeneratedFileComment);
-    generatePendingDrop = properties.get("migration.generatePendingDrop", generatePendingDrop);
 
     platform = properties.getEnum(Platform.class, "migration.platform", platform);
-
-    generate = properties.getBoolean("migration.generate", generate);
-    version = properties.get("migration.version", version);
-    name = properties.get("migration.name", name);
     patchInsertOn = properties.get("migration.patchInsertOn", patchInsertOn);
     patchResetChecksumOn = properties.get("migration.patchResetChecksumOn", patchResetChecksumOn);
 
@@ -532,44 +445,6 @@ public class DbMigrationConfig {
     ddlHeader = properties.get("ddl.header", ddlHeader);
   }
 
-  /**
-   * Return the migration version (typically FlywayDb compatible).
-   * <p>
-   * Example: 1.1.1_2
-   * <p>
-   * The version is expected to be the combination of the current pom version plus
-   * a 'feature' id. The combined version must be unique and ordered to work with
-   * FlywayDb so each developer sets a unique version so that the migration script
-   * generated is unique (typically just prior to being submitted as a merge request).
-   */
-  public String getVersion() {
-    String envVersion = readEnvironment("ddl.migration.version");
-    if (!isEmpty(envVersion)) {
-      return envVersion.trim();
-    }
-    return version;
-  }
-
-  /**
-   * Return the migration name which is short description text that can be appended to
-   * the migration version to become the ddl script file name.
-   * <p>
-   * So if the name is "a foo table" then the ddl script file could be:
-   * "1.1.1_2__a-foo-table.sql"
-   * </p>
-   * <p>
-   * When the DB migration relates to a git feature (merge request) then this description text
-   * is a short description of the feature.
-   * </p>
-   */
-  public String getName() {
-    String envName = readEnvironment("ddl.migration.name");
-    if (!isEmpty(envName)) {
-      return envName.trim();
-    }
-    return name;
-  }
-
   /**
    * Return the system or environment property.
    */
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index 5ae428a10..2eced70a2 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -58,7 +58,7 @@ import java.util.List;
  *
  *       DbMigration migration = DbMigration.create();
  *       migration.setPathToResources("src/main/resources");
- *       migration.setPlatform(DbPlatformName.ORACLE);
+ *       migration.setPlatform(Platform.POSTGRES);
  *
  *       migration.generateMigration();
  *
@@ -513,10 +513,7 @@ public class DefaultDbMigration implements DbMigration {
     if (nextDrop != null) {
       return nextDrop;
     }
-    if (generatePendingDrop != null) {
-      return generatePendingDrop;
-    }
-    return migrationConfig.getGeneratePendingDrop();
+    return generatePendingDrop;
   }
 
   /**
@@ -526,14 +523,15 @@ public class DefaultDbMigration implements DbMigration {
    */
   private String getFullVersion(MigrationModel migrationModel, String dropsFor) {
 
-    String version = migrationConfig.getVersion();
+    String version = getVersion();
     if (version == null) {
       version = migrationModel.getNextVersion(initialVersion);
     }
 
     String fullVersion = migrationConfig.getApplyPrefix() + version;
-    if (migrationConfig.getName() != null) {
-      fullVersion += "__" + toUnderScore(migrationConfig.getName());
+    String name = getName();
+    if (name != null) {
+      fullVersion += "__" + toUnderScore(name);
 
     } else if (dropsFor != null) {
       fullVersion += "__" + toUnderScore("dropsFor_" + MigrationVersion.trim(dropsFor));
@@ -580,7 +578,7 @@ public class DefaultDbMigration implements DbMigration {
     if (file.exists()) {
       return false;
     }
-    String comment = migrationConfig.isIncludeGeneratedFileComment() ? GENERATED_COMMENT : null;
+    String comment = Boolean.TRUE.equals(includeGeneratedFileComment) ? GENERATED_COMMENT : null;
     MigrationXmlWriter xmlWriter = new MigrationXmlWriter(comment);
     xmlWriter.write(dbMigration, file);
     return true;
@@ -608,18 +606,66 @@ public class DefaultDbMigration implements DbMigration {
       if (header != null) {
         migrationConfig.setDdlHeader(header);
       }
-      if (includeGeneratedFileComment != null) {
-        migrationConfig.setIncludeGeneratedFileComment(includeGeneratedFileComment);
-      }
-      if (version != null) {
-        migrationConfig.setVersion(version);
-      }
-      if (name != null) {
-        migrationConfig.setName(name);
-      }
     }
   }
 
+  /**
+   * Return the migration version (typically FlywayDb compatible).
+   * <p>
+   * Example: 1.1.1_2
+   * <p>
+   * The version is expected to be the combination of the current pom version plus
+   * a 'feature' id. The combined version must be unique and ordered to work with
+   * FlywayDb so each developer sets a unique version so that the migration script
+   * generated is unique (typically just prior to being submitted as a merge request).
+   */
+  private String getVersion() {
+    String envVersion = readEnvironment("ddl.migration.version");
+    if (!isEmpty(envVersion)) {
+      return envVersion.trim();
+    }
+    return version;
+  }
+
+  /**
+   * Return the migration name which is short description text that can be appended to
+   * the migration version to become the ddl script file name.
+   * <p>
+   * So if the name is "a foo table" then the ddl script file could be:
+   * "1.1.1_2__a-foo-table.sql"
+   * </p>
+   * <p>
+   * When the DB migration relates to a git feature (merge request) then this description text
+   * is a short description of the feature.
+   * </p>
+   */
+  private String getName() {
+    String envName = readEnvironment("ddl.migration.name");
+    if (!isEmpty(envName)) {
+      return envName.trim();
+    }
+    return name;
+  }
+
+  /**
+   * Return true if the string is null or empty.
+   */
+  private boolean isEmpty(String val) {
+    return val == null || val.trim().isEmpty();
+  }
+
+  /**
+   * Return the system or environment property.
+   */
+  private String readEnvironment(String key) {
+
+    String val = System.getProperty(key);
+    if (val == null) {
+      val = System.getenv(key);
+    }
+    return val;
+  }
+
   /**
    * Return the file path to write the xml and sql to.
    */

From fef87323b383b6ef6ba58731cf05903045a266b3 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 24 Oct 2018 23:49:26 +1300
Subject: [PATCH 0507/1036] Bump to 11.23.1-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c08c66ca6..ac8e674e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.22.11-SNAPSHOT</version>
+  <version>11.23.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>

From afcd6859e067146058ab1377d227b53d78da35f8 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 24 Oct 2018 23:50:44 +1300
Subject: [PATCH 0508/1036] [maven-release-plugin] prepare release
 ebean-11.23.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ac8e674e8..8a9d061ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.23.1-SNAPSHOT</version>
+  <version>11.23.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.23.1</tag>
   </scm>
 
   <profiles>

From bdc991781119d83cbb1d51d9f4be39d88d6aab3a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 24 Oct 2018 23:51:00 +1300
Subject: [PATCH 0509/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8a9d061ec..845fea9ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.23.1</version>
+  <version>11.23.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.23.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From fecb5fa731552361087a428e399f086cb87eda75 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Wed, 24 Oct 2018 23:35:02 +0200
Subject: [PATCH 0510/1036] There should be only one "Rob" in o_customer
 (#1515)

* FIX: CsvReader-Test

* Fixes for tests

* reversed changes

* tidy TestCsvReaderWithCallback
---
 src/test/java/org/tests/basic/TestTransient.java | 2 +-
 src/test/resources/test1.csv                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/tests/basic/TestTransient.java b/src/test/java/org/tests/basic/TestTransient.java
index 70e560a1c..0652fd5e2 100644
--- a/src/test/java/org/tests/basic/TestTransient.java
+++ b/src/test/java/org/tests/basic/TestTransient.java
@@ -54,7 +54,7 @@ public class TestTransient extends BaseTestCase {
     selected = c.getSelected();
     Assert.assertNotNull(selected);
 
-    String updateStmt = "update customer set name = 'Rob' where id = :id";
+    String updateStmt = "update customer set name = 'testTrans2' where id = :id";
     int rows = Ebean.createUpdate(Customer.class, updateStmt).set("id", custId).execute();
 
     Assert.assertTrue("changed name back", 1 == rows);
diff --git a/src/test/resources/test1.csv b/src/test/resources/test1.csv
index b04efe79a..136964f46 100644
--- a/src/test/resources/test1.csv
+++ b/src/test/resources/test1.csv
@@ -1,4 +1,4 @@
-10000,NEW,"Rob",01-JAN-2009,"12 someplace",Auckland,NZ
+10000,NEW,"Roland",01-JAN-2009,"12 someplace",Auckland,NZ
 ,ACTIVE,"Greg",14-FEB-2009,"13 someplace",Sydney,AU
 ,INACTIVE,"Dan",29-SEP-2009,"14 someplace",Auckland,NZ
 ,NEW,"ARob",01-JAN-2009,"12 someplace",Auckland,NZ

From 939397acfce33185b911073cc48af06b475c5dbf Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Thu, 25 Oct 2018 11:11:36 +0200
Subject: [PATCH 0511/1036] Add support for JacksonAnnotations at
 bean-properties (#1514)

---
 .../deploy/meta/DeployBeanDescriptor.java     |  15 +++
 .../deploy/meta/DeployBeanProperty.java       |  14 +++
 .../server/deploy/parse/DeployUtil.java       |   5 +-
 .../server/type/DefaultTypeManager.java       |  37 ++++--
 .../type/ScalarTypeJsonObjectMapper.java      |  87 ++++++++++----
 .../server/type/TypeManager.java              |   3 +-
 .../org/tests/json/TestDbJson_Jackson.java    | 113 ++++++++++++++++++
 .../org/tests/json/TestDbJson_Jackson2.java   |  62 ++++++++++
 .../tests/model/json/BasicJacksonType.java    |  15 +++
 .../tests/model/json/EBasicJsonJackson.java   | 101 ++++++++++++++++
 .../tests/model/json/EBasicJsonJackson2.java  |  98 +++++++++++++++
 .../org/tests/model/json/LongJacksonType.java |  22 ++++
 .../tests/model/json/StringJacksonType.java   |  22 ++++
 13 files changed, 554 insertions(+), 40 deletions(-)
 create mode 100644 src/test/java/org/tests/json/TestDbJson_Jackson.java
 create mode 100644 src/test/java/org/tests/json/TestDbJson_Jackson2.java
 create mode 100644 src/test/java/org/tests/model/json/BasicJacksonType.java
 create mode 100644 src/test/java/org/tests/model/json/EBasicJsonJackson.java
 create mode 100644 src/test/java/org/tests/model/json/EBasicJsonJackson2.java
 create mode 100644 src/test/java/org/tests/model/json/LongJacksonType.java
 create mode 100644 src/test/java/org/tests/model/json/StringJacksonType.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index 76a54220a..9f26a4f34 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -223,6 +223,8 @@ public class DeployBeanDescriptor<T> {
 
   private short profileId;
 
+  private Object jacksonAnnotatedClass;
+
   /**
    * Construct the BeanDescriptor.
    */
@@ -1238,6 +1240,7 @@ public class DeployBeanDescriptor<T> {
       this.descriptor = descriptor;
     }
 
+    @Override
     public String getDeployWord(String expression) {
       return descriptor.getDeployWord(expression);
     }
@@ -1252,4 +1255,16 @@ public class DeployBeanDescriptor<T> {
     return (property == null) ? null : "${ta}." + property.getDbColumn();
   }
 
+  /**
+   * Returns the jackson annotated class, if jackson is present.
+   */
+  public Object /*AnnotatedClass*/ getJacksonAnnotatedClass() {
+    if (jacksonAnnotatedClass == null) {
+      com.fasterxml.jackson.databind.ObjectMapper objectMapper = (com.fasterxml.jackson.databind.ObjectMapper) serverConfig.getObjectMapper();
+      com.fasterxml.jackson.databind.JavaType javaType = objectMapper.getTypeFactory().constructType(beanType);
+      jacksonAnnotatedClass = com.fasterxml.jackson.databind.introspect.AnnotatedClassResolver
+        .resolve(objectMapper.getDeserializationConfig(), javaType, objectMapper.getDeserializationConfig());
+    }
+    return jacksonAnnotatedClass;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
index 0bfa5b328..4b38812d5 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
@@ -1124,4 +1124,18 @@ public class DeployBeanProperty {
   public void setElementProperty() {
     this.elementProperty = true;
   }
+
+  /**
+   * Returns the jackson annotated field, if jackson is present.
+   */
+  public Object /*AnnotatedField*/ getJacksonField() {
+    com.fasterxml.jackson.databind.introspect.AnnotatedClass jac =
+        (com.fasterxml.jackson.databind.introspect.AnnotatedClass) getDesc().getJacksonAnnotatedClass();
+    for (com.fasterxml.jackson.databind.introspect.AnnotatedField candidate : jac.fields()) {
+      if (candidate.getName().equals(getName())) {
+        return candidate;
+      }
+    }
+    return null;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
index 83ed5eb21..303135e91 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
@@ -239,10 +239,9 @@ public class DeployUtil {
 
   private void setDbJsonType(DeployBeanProperty prop, int dbType, int dbLength) {
 
-    Class<?> type = prop.getPropertyType();
-    ScalarType<?> scalarType = typeManager.getJsonScalarType(type, dbType, dbLength, prop.getGenericType());
+    ScalarType<?> scalarType = typeManager.getJsonScalarType(prop, dbType, dbLength);
     if (scalarType == null) {
-      throw new RuntimeException("No ScalarType for JSON type [" + type + "] [" + dbType + "]");
+      throw new RuntimeException("No ScalarType for JSON property [" + prop + "] [" + dbType + "]");
     }
     prop.setDbType(dbType);
     prop.setScalarType(scalarType);
diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index d6fb20e33..896391ff5 100644
--- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -2,6 +2,8 @@ package io.ebeaninternal.server.type;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.introspect.AnnotatedField;
+
 import io.ebean.annotation.DbArray;
 import io.ebean.annotation.DbEnumType;
 import io.ebean.annotation.DbEnumValue;
@@ -17,6 +19,7 @@ import io.ebean.util.AnnotationUtil;
 import io.ebeaninternal.api.ExtraTypeFactory;
 import io.ebeaninternal.dbmigration.DbOffline;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
+import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
@@ -379,31 +382,36 @@ public final class DefaultTypeManager implements TypeManager {
   }
 
   @Override
-  public ScalarType<?> getJsonScalarType(Class<?> type, int dbType, int dbLength, Type genericType) {
+  public ScalarType<?> getJsonScalarType(DeployBeanProperty prop, int dbType, int dbLength) {
+
+    Class<?> type = prop.getPropertyType();
+    Type genericType = prop.getGenericType();
+
+    boolean hasJacksonAnnotations = objectMapperPresent && checkJacksonAnnotations(prop);
 
     if (type.equals(List.class)) {
       DocPropertyType docType = getDocType(genericType);
-      if (isValueTypeSimple(genericType)) {
+      if (!hasJacksonAnnotations && isValueTypeSimple(genericType)) {
         return ScalarTypeJsonList.typeFor(postgres, dbType, docType);
       } else {
-        return createJsonObjectMapperType(type, genericType, dbType, docType);
+        return createJsonObjectMapperType(prop, dbType, docType);
       }
     }
 
     if (type.equals(Set.class)) {
       DocPropertyType docType = getDocType(genericType);
-      if (isValueTypeSimple(genericType)) {
+      if (!hasJacksonAnnotations && isValueTypeSimple(genericType)) {
         return ScalarTypeJsonSet.typeFor(postgres, dbType, docType);
       } else {
-        return createJsonObjectMapperType(type, genericType, dbType, docType);
+        return createJsonObjectMapperType(prop, dbType, docType);
       }
     }
 
     if (type.equals(Map.class)) {
-      if (isMapValueTypeObject(genericType)) {
+      if (!hasJacksonAnnotations && isMapValueTypeObject(genericType)) {
         return ScalarTypeJsonMap.typeFor(postgres, dbType);
       } else {
-        return createJsonObjectMapperType(type, genericType, dbType, DocPropertyType.OBJECT);
+        return createJsonObjectMapperType(prop, dbType, DocPropertyType.OBJECT);
       }
     }
 
@@ -426,7 +434,15 @@ public final class DefaultTypeManager implements TypeManager {
       }
     }
 
-    return createJsonObjectMapperType(type, type, dbType, DocPropertyType.OBJECT);
+    return createJsonObjectMapperType(prop, dbType, DocPropertyType.OBJECT);
+  }
+
+  /**
+   * Returns TRUE, if there is any jackson annotation on that property. All jackson annotations
+   * are annotated with the &#64;JacksonAnnotation meta annotation. So detection is easy.
+   */
+  private boolean checkJacksonAnnotations(DeployBeanProperty prop) {
+    return AnnotationUtil.findAnnotation(prop.getField(), com.fasterxml.jackson.annotation.JacksonAnnotation.class) != null;
   }
 
   private DocPropertyType getDocType(Type genericType) {
@@ -459,11 +475,12 @@ public final class DefaultTypeManager implements TypeManager {
     return Object.class.equals(typeArgs[1]) || "?".equals(typeArgs[1].toString());
   }
 
-  private ScalarType<?> createJsonObjectMapperType(Class<?> type, Type genericType, int dbType, DocPropertyType docType) {
+  private ScalarType<?> createJsonObjectMapperType(DeployBeanProperty prop, int dbType, DocPropertyType docType) {
+    Class<?> type = prop.getPropertyType();
     if (objectMapper == null) {
       throw new IllegalArgumentException("Type [" + type + "] unsupported for @DbJson mapping - Jackson ObjectMapper not present");
     }
-    return ScalarTypeJsonObjectMapper.createTypeFor(postgres, type, (ObjectMapper) objectMapper, genericType, dbType, docType);
+    return ScalarTypeJsonObjectMapper.createTypeFor(postgres, (AnnotatedField) prop.getJacksonField(), (ObjectMapper) objectMapper, dbType, docType);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
index eda46122a..91c1e1c9b 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
@@ -9,14 +9,19 @@ import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.AnnotationIntrospector;
+import com.fasterxml.jackson.databind.DeserializationConfig;
 import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
+import com.fasterxml.jackson.databind.SerializationConfig;
+import com.fasterxml.jackson.databind.introspect.AnnotatedField;
 
 import javax.persistence.PersistenceException;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
-import java.lang.reflect.Type;
 import java.sql.SQLException;
 import java.sql.Types;
 import java.util.List;
@@ -31,20 +36,21 @@ public class ScalarTypeJsonObjectMapper {
   /**
    * Create and return the appropriate ScalarType.
    */
-  public static ScalarType<?> createTypeFor(boolean postgres, Class<?> type, ObjectMapper objectMapper,
-                                            Type genericType, int dbType, DocPropertyType docType) {
+  public static ScalarType<?> createTypeFor(boolean postgres, AnnotatedField field, ObjectMapper objectMapper,
+                                            int dbType, DocPropertyType docType) {
 
+    Class<?> type = field.getRawType();
     String pgType = getPostgresType(postgres, dbType);
     if (Set.class.equals(type)) {
-      return new OmSet(objectMapper, genericType, dbType, pgType, docType);
+      return new OmSet(objectMapper, field, dbType, pgType, docType);
     }
     if (List.class.equals(type)) {
-      return new OmList(objectMapper, genericType, dbType, pgType, docType);
+      return new OmList(objectMapper, field, dbType, pgType, docType);
     }
     if (Map.class.equals(type)) {
-      return new OmMap(objectMapper, genericType, dbType, pgType);
+      return new OmMap(objectMapper, field, dbType, pgType);
     }
-    return new GenericObject(objectMapper, genericType, dbType, pgType);
+    return new GenericObject(objectMapper, field, dbType, pgType);
   }
 
   private static String getPostgresType(boolean postgres, int dbType) {
@@ -64,8 +70,8 @@ public class ScalarTypeJsonObjectMapper {
    */
   private static class GenericObject extends Base<Object> {
 
-    public GenericObject(ObjectMapper objectMapper, Type type, int dbType, String pgType) {
-      super(Object.class, objectMapper, type, dbType, pgType, DocPropertyType.OBJECT);
+    public GenericObject(ObjectMapper objectMapper, AnnotatedField field, int dbType, String pgType) {
+      super(Object.class, objectMapper, field, dbType, pgType, DocPropertyType.OBJECT);
     }
   }
 
@@ -75,8 +81,8 @@ public class ScalarTypeJsonObjectMapper {
   @SuppressWarnings("rawtypes")
   private static class OmSet extends Base<Set> {
 
-    public OmSet(ObjectMapper objectMapper, Type type, int dbType, String pgType, DocPropertyType docType) {
-      super(Set.class, objectMapper, type, dbType, pgType, docType);
+    public OmSet(ObjectMapper objectMapper, AnnotatedField field, int dbType, String pgType, DocPropertyType docType) {
+      super(Set.class, objectMapper, field, dbType, pgType, docType);
     }
 
     @Override
@@ -93,8 +99,8 @@ public class ScalarTypeJsonObjectMapper {
   @SuppressWarnings("rawtypes")
   private static class OmList extends Base<List> {
 
-    public OmList(ObjectMapper objectMapper, Type type, int dbType, String pgType, DocPropertyType docType) {
-      super(List.class, objectMapper, type, dbType, pgType, docType);
+    public OmList(ObjectMapper objectMapper, AnnotatedField field, int dbType, String pgType, DocPropertyType docType) {
+      super(List.class, objectMapper, field, dbType, pgType, docType);
     }
 
     @Override
@@ -111,8 +117,8 @@ public class ScalarTypeJsonObjectMapper {
   @SuppressWarnings("rawtypes")
   private static class OmMap extends Base<Map> {
 
-    public OmMap(ObjectMapper objectMapper, Type type, int dbType, String pgType) {
-      super(Map.class, objectMapper, type, dbType, pgType, DocPropertyType.OBJECT);
+    public OmMap(ObjectMapper objectMapper, AnnotatedField field, int dbType, String pgType) {
+      super(Map.class, objectMapper, field, dbType, pgType, DocPropertyType.OBJECT);
     }
 
     @Override
@@ -129,9 +135,11 @@ public class ScalarTypeJsonObjectMapper {
    */
   private static abstract class Base<T> extends ScalarTypeBase<T> {
 
-    private final ObjectMapper objectMapper;
+    private final ObjectWriter objectWriter;
 
-    private final JavaType javaType;
+    private final ObjectMapper objectReader;
+
+    private JavaType deserType;
 
     private final String pgType;
 
@@ -140,12 +148,39 @@ public class ScalarTypeJsonObjectMapper {
     /**
      * Construct given the object mapper, property type and DB type for storage.
      */
-    public Base(Class<T> cls, ObjectMapper objectMapper, Type type, int dbType, String pgType, DocPropertyType docType) {
+    public Base(Class<T> cls, ObjectMapper objectMapper, AnnotatedField field, int dbType, String pgType, DocPropertyType docType) {
       super(cls, false, dbType);
       this.pgType = pgType;
       this.docType = docType;
-      this.objectMapper = objectMapper;
-      this.javaType = objectMapper.getTypeFactory().constructType(type);
+      this.objectReader = objectMapper;
+
+      JavaType javaType = field.getType();
+      DeserializationConfig deserConfig = objectMapper.getDeserializationConfig();
+      AnnotationIntrospector ai = deserConfig.getAnnotationIntrospector();
+
+      if (ai != null && javaType != null && !javaType.hasRawClass(Object.class)) {
+        try {
+          this.deserType = ai.refineDeserializationType(deserConfig, field, javaType);
+        } catch (JsonMappingException e) {
+          throw new RuntimeException(e);
+        }
+      } else {
+        this.deserType = javaType;
+      }
+
+      SerializationConfig serConfig = objectMapper.getSerializationConfig();
+       ai = deserConfig.getAnnotationIntrospector();
+
+       if (ai != null && javaType != null && !javaType.hasRawClass(Object.class)) {
+         try {
+           JavaType serType = ai.refineSerializationType(serConfig, field, javaType);
+           this.objectWriter = objectMapper.writerFor(serType);
+         } catch (JsonMappingException e) {
+           throw new RuntimeException(e);
+         }
+       } else {
+         this.objectWriter = objectMapper.writerFor(javaType);
+       }
     }
 
     /**
@@ -171,7 +206,7 @@ public class ScalarTypeJsonObjectMapper {
         return null;
       }
       try {
-        return objectMapper.readValue(json, javaType);
+        return objectReader.readValue(json, deserType);
       } catch (IOException e) {
         throw new SQLException("Unable to convert JSON", e);
       }
@@ -187,7 +222,7 @@ public class ScalarTypeJsonObjectMapper {
           bind.setNull(Types.VARCHAR); // use varchar, otherwise SqlServer/db2 will fail with 'Invalid JDBC data type 5.001.'
         } else {
           try {
-            String json = objectMapper.writeValueAsString(value);
+            String json = objectWriter.writeValueAsString(value);
             bind.setString(json);
           } catch (JsonProcessingException e) {
             throw new SQLException("Unable to create JSON", e);
@@ -212,7 +247,7 @@ public class ScalarTypeJsonObjectMapper {
     @Override
     public String formatValue(T value) {
       try {
-        return objectMapper.writeValueAsString(value);
+        return objectWriter.writeValueAsString(value);
       } catch (JsonProcessingException e) {
         throw new PersistenceException("Unable to create JSON", e);
       }
@@ -221,7 +256,7 @@ public class ScalarTypeJsonObjectMapper {
     @Override
     public T parse(String value) {
       try {
-        return objectMapper.readValue(value, javaType);
+        return objectReader.readValue(value, deserType);
       } catch (IOException e) {
         throw new PersistenceException("Unable to convert JSON", e);
       }
@@ -244,12 +279,12 @@ public class ScalarTypeJsonObjectMapper {
 
     @Override
     public T jsonRead(JsonParser parser) throws IOException {
-      return objectMapper.readValue(parser, javaType);
+      return objectReader.readValue(parser, deserType);
     }
 
     @Override
     public void jsonWrite(JsonGenerator writer, T value) throws IOException {
-      objectMapper.writeValue(writer, value);
+      objectWriter.writeValue(writer, value);
     }
 
     @Override
diff --git a/src/main/java/io/ebeaninternal/server/type/TypeManager.java b/src/main/java/io/ebeaninternal/server/type/TypeManager.java
index ebfebc955..9e6ca0d7b 100644
--- a/src/main/java/io/ebeaninternal/server/type/TypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/TypeManager.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.annotation.DbArray;
+import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 
 import javax.persistence.EnumType;
 import java.lang.reflect.Type;
@@ -57,7 +58,7 @@ public interface TypeManager {
    * Note that type expected to be JsonNode or Map.
    * </p>
    */
-  ScalarType<?> getJsonScalarType(Class<?> type, int dbType, int dbLength, Type genericType);
+  ScalarType<?> getJsonScalarType(DeployBeanProperty prop, int dbType, int dbLength);
 
   /**
    * Return the ScalarType used to handle DB ARRAY.
diff --git a/src/test/java/org/tests/json/TestDbJson_Jackson.java b/src/test/java/org/tests/json/TestDbJson_Jackson.java
new file mode 100644
index 000000000..c281444a7
--- /dev/null
+++ b/src/test/java/org/tests/json/TestDbJson_Jackson.java
@@ -0,0 +1,113 @@
+package org.tests.json;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.StrictAssertions.assertThat;
+
+import java.io.IOException;
+
+import org.junit.Test;
+import org.tests.model.json.EBasicJsonJackson;
+import org.tests.model.json.EBasicJsonJackson2;
+import org.tests.model.json.LongJacksonType;
+import org.tests.model.json.StringJacksonType;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+
+public class TestDbJson_Jackson extends BaseTestCase {
+
+
+  /**
+   * This testcase verifies if the &#64;JsonDeserialize Annotation will work properly in ebean.
+   */
+  @Test
+  public void testJsonDeserializeAnnotation() throws IOException {
+
+    EBasicJsonJackson bean = new EBasicJsonJackson();
+
+    bean.setName("stuff");
+
+    bean.setPlainValue("plain");
+
+    bean.getValueSet().add("A");
+    bean.getValueSet().add("B");
+
+    bean.getValueList().add("A");
+    bean.getValueList().add("B");
+
+    bean.getValueMap().put(1, "one");
+    bean.getValueMap().put(2, "two");
+
+    ObjectMapper mapper = (ObjectMapper) Ebean.getDefaultServer().getPluginApi().getServerConfig().getObjectMapper();
+
+    String json = mapper.writeValueAsString(bean);
+    EBasicJsonJackson found = mapper.readValue(json, EBasicJsonJackson.class);
+
+    // here we assert, that we can serialize/deserialize that bean with jackson
+    assertThat(found.getPlainValue()).isEqualTo("plain");
+    assertThat(found.getValueList()).containsExactly("A", "B");
+    assertThat(found.getValueSet()).containsExactly("A", "B");
+    assertThat(found.getValueMap()).containsEntry(1L, "one").containsEntry(2L, "two");
+
+    Ebean.save(bean);
+
+    // here we do the same and expect, that we can deserialize the bean also
+    found = Ebean.find(EBasicJsonJackson.class, bean.getId());
+
+    assertThat(found.getPlainValue()).isEqualTo("plain");
+    assertThat(found.getValueList()).containsExactly("A", "B");
+    assertThat(found.getValueSet()).containsExactly("A", "B");
+    assertThat(found.getValueMap()).containsEntry(1L, "one").containsEntry(2L, "two");
+  }
+
+  /**
+   * This testcase verifies if polymorph objects will work in ebean.
+   *
+   * for BasicJacksonType there exists two types and has a &#64;JsonTypeInfo
+   * annotation. It is expected that this information is also honored by ebean.
+   */
+  @Test
+  public void testPolymorph() throws IOException {
+
+    EBasicJsonJackson2 bean = new EBasicJsonJackson2();
+
+    bean.setName("stuff");
+
+    bean.setPlainValue(new LongJacksonType(42L));
+
+    bean.getValueSet().add(new StringJacksonType("A"));
+    bean.getValueSet().add(new LongJacksonType(7l));
+
+    bean.getValueList().add(new StringJacksonType("A"));
+    bean.getValueList().add(new LongJacksonType(7l));
+
+    bean.getValueMap().put(1, new StringJacksonType("A"));
+    bean.getValueMap().put(2, new LongJacksonType(7l));
+
+    ObjectMapper mapper = (ObjectMapper) Ebean.getDefaultServer().getPluginApi().getServerConfig().getObjectMapper();
+
+    String json = mapper.writeValueAsString(bean);
+    assertThat(json)
+      .contains("\"type\":\"string\"")
+      .contains("\"type\":\"long\"");
+    EBasicJsonJackson2 found = mapper.readValue(json, EBasicJsonJackson2.class);
+
+    assertThat(found.getPlainValue()).isInstanceOf(LongJacksonType.class);
+    assertThat(found.getValueList()).hasSize(2);
+    assertThat(found.getValueSet()).hasSize(2);
+    assertThat(found.getValueMap()).hasSize(2);;
+
+    Ebean.save(bean);
+
+    found = Ebean.find(EBasicJsonJackson2.class, bean.getId());
+
+    assertThat(found.getPlainValue()).isInstanceOf(LongJacksonType.class);
+    assertThat(found.getValueList()).hasSize(2);
+    assertThat(found.getValueSet()).hasSize(2);
+    assertThat(found.getValueMap()).hasSize(2);;
+
+  }
+
+}
diff --git a/src/test/java/org/tests/json/TestDbJson_Jackson2.java b/src/test/java/org/tests/json/TestDbJson_Jackson2.java
new file mode 100644
index 000000000..866161cf0
--- /dev/null
+++ b/src/test/java/org/tests/json/TestDbJson_Jackson2.java
@@ -0,0 +1,62 @@
+package org.tests.json;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.StrictAssertions.assertThat;
+
+import java.io.IOException;
+
+import org.junit.Test;
+import org.tests.model.json.EBasicJsonJackson2;
+import org.tests.model.json.LongJacksonType;
+import org.tests.model.json.StringJacksonType;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+
+public class TestDbJson_Jackson2 extends BaseTestCase {
+
+  private EBasicJsonJackson2 bean = new EBasicJsonJackson2();
+
+  private EBasicJsonJackson2 found;
+
+  @Test
+  public void insert() throws IOException {
+
+    bean.setName("stuff");
+
+    bean.setPlainValue(new LongJacksonType(42L));
+
+    bean.getValueSet().add(new StringJacksonType("A"));
+    bean.getValueSet().add(new LongJacksonType(7l));
+
+    bean.getValueList().add(new StringJacksonType("A"));
+    bean.getValueList().add(new LongJacksonType(7l));
+
+    bean.getValueMap().put(1, new StringJacksonType("A"));
+    bean.getValueMap().put(2, new LongJacksonType(7l));
+
+    ObjectMapper mapper = (ObjectMapper) Ebean.getDefaultServer().getPluginApi().getServerConfig().getObjectMapper();
+
+    String json = mapper.writeValueAsString(bean);
+    found = mapper.readValue(json, EBasicJsonJackson2.class);
+
+    assertThat(found.getPlainValue()).isInstanceOf(LongJacksonType.class);
+    assertThat(found.getValueList()).hasSize(2);
+    assertThat(found.getValueSet()).hasSize(2);
+    assertThat(found.getValueMap()).hasSize(2);;
+
+    Ebean.save(bean);
+
+    found = Ebean.find(EBasicJsonJackson2.class, bean.getId());
+
+    assertThat(found.getPlainValue()).isInstanceOf(LongJacksonType.class);
+    assertThat(found.getValueList()).hasSize(2);
+    assertThat(found.getValueSet()).hasSize(2);
+    assertThat(found.getValueMap()).hasSize(2);;
+
+  }
+
+
+}
diff --git a/src/test/java/org/tests/model/json/BasicJacksonType.java b/src/test/java/org/tests/model/json/BasicJacksonType.java
new file mode 100644
index 000000000..fee853259
--- /dev/null
+++ b/src/test/java/org/tests/model/json/BasicJacksonType.java
@@ -0,0 +1,15 @@
+package org.tests.model.json;
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
+
+
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = As.PROPERTY, property = "type")
+@JsonSubTypes({
+        @JsonSubTypes.Type(value = LongJacksonType.class, name = "long"),
+        @JsonSubTypes.Type(value = StringJacksonType.class, name = "string")
+})
+public interface BasicJacksonType<T> {
+  T getValue();
+}
diff --git a/src/test/java/org/tests/model/json/EBasicJsonJackson.java b/src/test/java/org/tests/model/json/EBasicJsonJackson.java
new file mode 100644
index 000000000..9faa35eee
--- /dev/null
+++ b/src/test/java/org/tests/model/json/EBasicJsonJackson.java
@@ -0,0 +1,101 @@
+package org.tests.model.json;
+
+import io.ebean.annotation.DbJson;
+import io.ebean.annotation.DbJsonB;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Version;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+@Entity
+public class EBasicJsonJackson {
+
+  @Id
+  Long id;
+
+  String name;
+
+  @DbJson(length = 700)
+  @JsonDeserialize(contentAs = String.class)
+  Set<Object> valueSet = new LinkedHashSet<>();
+
+  @DbJsonB
+  @JsonDeserialize(contentAs = String.class)
+  List<Object> valueList = new ArrayList<>();
+
+  @DbJson(length = 700)
+  @JsonDeserialize(keyAs = Long.class, contentAs = String.class)
+  Map<Object, Object> valueMap = new LinkedHashMap<>();
+
+  @DbJson(length = 500)
+  @JsonDeserialize(as = String.class)
+  Object plainValue;
+
+  @Version
+  Long version;
+
+  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 Set<Object> getValueSet() {
+    return valueSet;
+  }
+
+  public void setValueSet(Set<Object> valueSet) {
+    this.valueSet = valueSet;
+  }
+
+  public List<Object> getValueList() {
+    return valueList;
+  }
+
+  public void setValueList(List<Object> valueList) {
+    this.valueList = valueList;
+  }
+
+  public Object getPlainValue() {
+    return plainValue;
+  }
+
+  public void setPlainValue(Object plainValue) {
+    this.plainValue = plainValue;
+  }
+
+  public Map<Object, Object> getValueMap() {
+    return valueMap;
+  }
+
+  public void setValueMap(Map<Object, Object> valueMap) {
+    this.valueMap = valueMap;
+  }
+
+  public Long getVersion() {
+    return version;
+  }
+
+  public void setVersion(Long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/json/EBasicJsonJackson2.java b/src/test/java/org/tests/model/json/EBasicJsonJackson2.java
new file mode 100644
index 000000000..dc8269682
--- /dev/null
+++ b/src/test/java/org/tests/model/json/EBasicJsonJackson2.java
@@ -0,0 +1,98 @@
+package org.tests.model.json;
+
+import io.ebean.annotation.DbJson;
+import io.ebean.annotation.DbJsonB;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Version;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+@Entity
+public class EBasicJsonJackson2 {
+
+  @Id
+  Long id;
+
+  String name;
+
+  @DbJson(length = 700)
+  Set<BasicJacksonType<?>> valueSet = new LinkedHashSet<>();
+
+  @DbJsonB
+  List<BasicJacksonType<?>> valueList = new ArrayList<>();
+
+  @DbJson(length = 700)
+  @JsonDeserialize(keyAs = Long.class)
+  Map<Number, BasicJacksonType<?>> valueMap = new LinkedHashMap<>();
+
+  @DbJson(length = 500)
+  BasicJacksonType<?> plainValue;
+
+  @Version
+  Long version;
+
+  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 Set<BasicJacksonType<?>> getValueSet() {
+    return valueSet;
+  }
+
+  public void setValueSet(Set<BasicJacksonType<?>> valueSet) {
+    this.valueSet = valueSet;
+  }
+
+  public List<BasicJacksonType<?>> getValueList() {
+    return valueList;
+  }
+
+  public void setValueList(List<BasicJacksonType<?>> valueList) {
+    this.valueList = valueList;
+  }
+
+  public BasicJacksonType<?> getPlainValue() {
+    return plainValue;
+  }
+
+  public void setPlainValue(BasicJacksonType<?> plainValue) {
+    this.plainValue = plainValue;
+  }
+
+  public Map<Number, BasicJacksonType<?>> getValueMap() {
+    return valueMap;
+  }
+
+  public void setValueMap(Map<Number, BasicJacksonType<?>> valueMap) {
+    this.valueMap = valueMap;
+  }
+
+  public Long getVersion() {
+    return version;
+  }
+
+  public void setVersion(Long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/json/LongJacksonType.java b/src/test/java/org/tests/model/json/LongJacksonType.java
new file mode 100644
index 000000000..c1800bf04
--- /dev/null
+++ b/src/test/java/org/tests/model/json/LongJacksonType.java
@@ -0,0 +1,22 @@
+package org.tests.model.json;
+
+public class LongJacksonType implements BasicJacksonType<Long> {
+
+  private Long value;
+
+  public LongJacksonType() {}
+
+  public LongJacksonType(Long value) {
+    this.value = value;
+  }
+
+  @Override
+  public Long getValue() {
+    return value;
+  }
+
+  public void setValue(Long value) {
+    this.value = value;
+  }
+
+}
diff --git a/src/test/java/org/tests/model/json/StringJacksonType.java b/src/test/java/org/tests/model/json/StringJacksonType.java
new file mode 100644
index 000000000..e562495d6
--- /dev/null
+++ b/src/test/java/org/tests/model/json/StringJacksonType.java
@@ -0,0 +1,22 @@
+package org.tests.model.json;
+
+public class StringJacksonType implements BasicJacksonType<String> {
+
+  private String value;
+
+  public StringJacksonType() {}
+
+  public StringJacksonType(String value) {
+    this.value = value;
+  }
+
+  @Override
+  public String getValue() {
+    return value;
+  }
+
+  public void setValue(String value) {
+    this.value = value;
+  }
+
+}

From d395c666fc2157b565d869149834bdff740838b1 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 26 Oct 2018 01:32:22 +1300
Subject: [PATCH 0512/1036] #1516 - More user friendly exceptions -
 BeanNotEnhancedException, BeanNotRegisteredException

---
 src/main/java/io/ebean/Ebean.java             | 11 +++++++++
 .../config/BeanNotEnhancedException.java      | 13 +++++++++++
 .../config/BeanNotRegisteredException.java    | 13 +++++++++++
 .../server/deploy/BeanDescriptorManager.java  | 23 +++++++++++++------
 .../deploy/BeanEmbeddedMetaFactory.java       |  5 ++--
 5 files changed, 56 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/io/ebean/config/BeanNotEnhancedException.java
 create mode 100644 src/main/java/io/ebean/config/BeanNotRegisteredException.java

diff --git a/src/main/java/io/ebean/Ebean.java b/src/main/java/io/ebean/Ebean.java
index 09d2d738b..cd27c7109 100644
--- a/src/main/java/io/ebean/Ebean.java
+++ b/src/main/java/io/ebean/Ebean.java
@@ -2,10 +2,12 @@ package io.ebean;
 
 import io.ebean.annotation.TxIsolation;
 import io.ebean.cache.ServerCacheManager;
+import io.ebean.config.BeanNotEnhancedException;
 import io.ebean.config.ServerConfig;
 import io.ebean.plugin.Property;
 import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;
+import io.ebean.datasource.DataSourceConfigurationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -160,6 +162,15 @@ public final class Ebean {
             defaultServer = getWithCreate(defaultName.trim());
           }
         }
+      } catch (BeanNotEnhancedException e) {
+        throw e;
+
+      } catch (DataSourceConfigurationException e) {
+        String msg = "Configuration error creating DataSource for the default EbeanServer." +
+          " This typically means a missing application-test.yml or missing ebean-test-config dependency." +
+          " See https://ebean-orm.github.io/docs/trouble-shooting#datasource";
+        throw new DataSourceConfigurationException(msg, e);
+
       } catch (Throwable e) {
         logger.error("Error trying to create the default EbeanServer", e);
         throw new RuntimeException(e);
diff --git a/src/main/java/io/ebean/config/BeanNotEnhancedException.java b/src/main/java/io/ebean/config/BeanNotEnhancedException.java
new file mode 100644
index 000000000..67ff285da
--- /dev/null
+++ b/src/main/java/io/ebean/config/BeanNotEnhancedException.java
@@ -0,0 +1,13 @@
+package io.ebean.config;
+
+/**
+ * Throw when an processing an entity bean that is not bytecode enhanced.
+ *
+ * Refer: https://ebean-orm.github.io/docs/trouble-shooting#not-enhanced
+ */
+public class BeanNotEnhancedException extends IllegalStateException {
+
+  public BeanNotEnhancedException(String msg) {
+    super(msg);
+  }
+}
diff --git a/src/main/java/io/ebean/config/BeanNotRegisteredException.java b/src/main/java/io/ebean/config/BeanNotRegisteredException.java
new file mode 100644
index 000000000..29212c24b
--- /dev/null
+++ b/src/main/java/io/ebean/config/BeanNotRegisteredException.java
@@ -0,0 +1,13 @@
+package io.ebean.config;
+
+/**
+ * Throw when an processing thinks a bean is not registered.
+ *
+ * Refer: https://ebean-orm.github.io/docs/trouble-shooting#not-registered
+ */
+public class BeanNotRegisteredException extends IllegalStateException {
+
+  public BeanNotRegisteredException(String msg) {
+    super(msg);
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 1083235cc..b836faeba 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -6,6 +6,7 @@ import io.ebean.RawSqlBuilder;
 import io.ebean.annotation.ConstraintMode;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
+import io.ebean.config.BeanNotEnhancedException;
 import io.ebean.config.EncryptKey;
 import io.ebean.config.EncryptKeyManager;
 import io.ebean.config.NamingConvention;
@@ -388,6 +389,9 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
       return asOfTableMap;
 
+    } catch (BeanNotEnhancedException e) {
+      throw e;
+
     } catch (RuntimeException e) {
       logger.error("Error in deployment", e);
       throw e;
@@ -1471,7 +1475,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
         if (isPersistentField(prop)) {
           throw new IllegalStateException(
             "If you are running in an IDE with enhancement plugin try a Build -> Rebuild Project to recompile and enhance all entity beans. " +
-            "Error - property " + propName + " not found in " + reflectProps + " for type " + desc.getBeanType());
+              "Error - property " + propName + " not found in " + reflectProps + " for type " + desc.getBeanType());
         }
 
       } else {
@@ -1554,7 +1558,9 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     Class<?> beanClass = desc.getBeanType();
 
     if (!hasEntityBeanInterface(beanClass)) {
-      throw new IllegalStateException("Bean " + beanClass + " is not enhanced?");
+      String msg = "Bean " + beanClass + " is not enhanced? If you are running in IDEA or Eclipse check" +
+        " that the enhancement plugin is installed. See https://ebean-orm.github.io/docs/trouble-shooting#not-enhanced";
+      throw new BeanNotEnhancedException(msg);
     }
 
     // the bean already implements EntityBean
@@ -1583,7 +1589,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
         // ok to stop and treat just the same as Object.class
         return;
       }
-      throw new IllegalStateException("Super type " + superclass + " is not enhanced?");
+      throw new BeanNotEnhancedException("Super type " + superclass + " is not enhanced? See https://ebean-orm.github.io/docs/trouble-shooting#not-enhanced");
     }
 
     // recursively continue up the inheritance hierarchy
@@ -1666,11 +1672,14 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
   private ElementHelp elementHelper(ManyType manyType) {
     switch (manyType) {
-      case LIST: return new ElementHelpList();
-      case SET: return new ElementHelpSet();
-      case MAP: return new ElementHelpMap();
+      case LIST:
+        return new ElementHelpList();
+      case SET:
+        return new ElementHelpSet();
+      case MAP:
+        return new ElementHelpMap();
       default:
-        throw new IllegalStateException("manyType unexpected "+manyType);
+        throw new IllegalStateException("manyType unexpected " + manyType);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java b/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java
index cbe297901..016a760e4 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.deploy;
 
+import io.ebean.config.BeanNotRegisteredException;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
 
 import javax.persistence.PersistenceException;
@@ -22,8 +23,8 @@ public class BeanEmbeddedMetaFactory {
     BeanDescriptor<?> targetDesc = owner.getBeanDescriptor(prop.getTargetType());
     if (targetDesc == null) {
       String msg = "Could not find BeanDescriptor for " + prop.getTargetType()
-        + ". Perhaps the EmbeddedId class is not registered?";
-      throw new PersistenceException(msg);
+        + ". Perhaps the EmbeddedId class is not registered? See https://ebean-orm.github.io/docs/trouble-shooting#not-registered";
+      throw new BeanNotRegisteredException(msg);
     }
 
     // deployment override information (column names)

From d627bb47e228f28784902c918bef9378392ead7d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 26 Oct 2018 01:33:24 +1300
Subject: [PATCH 0513/1036] #1516 - More user friendly exceptions -
 BeanNotEnhancedException, BeanNotRegisteredException

---
 .../server/deploy/parse/AnnotationAssocManys.java        | 9 ++++-----
 .../server/deploy/parse/AnnotationAssocOnes.java         | 5 +++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index e4b6d52d0..7ed87e639 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -6,6 +6,7 @@ import io.ebean.annotation.HistoryExclude;
 import io.ebean.annotation.PrivateOwned;
 import io.ebean.annotation.Where;
 import io.ebean.bean.BeanCollection.ModifyListenMode;
+import io.ebean.config.BeanNotRegisteredException;
 import io.ebean.config.NamingConvention;
 import io.ebean.config.TableName;
 import io.ebean.util.CamelCaseHelper;
@@ -430,7 +431,7 @@ class AnnotationAssocManys extends AnnotationParser {
 
 
   private String errorMsgMissingBeanTable(Class<?> type, String from) {
-    return "Error with association to [" + type + "] from [" + from + "]. Is " + type + " registered?";
+    return "Error with association to [" + type + "] from [" + from + "]. Is " + type + " registered? See https://ebean-orm.github.io/docs/trouble-shooting#not-registered";
   }
 
   private void readToMany(ManyToMany propAnn, DeployBeanPropertyAssocMany<?> manyProp) {
@@ -451,8 +452,7 @@ class AnnotationAssocManys extends AnnotationParser {
     // find the other many table (not intersection)
     BeanTable assoc = factory.getBeanTable(targetType);
     if (assoc == null) {
-      String msg = errorMsgMissingBeanTable(targetType, manyProp.getFullBeanName());
-      throw new RuntimeException(msg);
+      throw new BeanNotRegisteredException(errorMsgMissingBeanTable(targetType, manyProp.getFullBeanName()));
     }
 
     manyProp.setManyToMany();
@@ -478,8 +478,7 @@ class AnnotationAssocManys extends AnnotationParser {
 
     BeanTable assoc = factory.getBeanTable(targetType);
     if (assoc == null) {
-      String msg = errorMsgMissingBeanTable(targetType, manyProp.getFullBeanName());
-      throw new RuntimeException(msg);
+      throw new BeanNotRegisteredException(errorMsgMissingBeanTable(targetType, manyProp.getFullBeanName()));
     }
 
     manyProp.setBeanTable(assoc);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index add0870e8..c17b5e708 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -4,6 +4,7 @@ import io.ebean.annotation.DbForeignKey;
 import io.ebean.annotation.FetchPreference;
 import io.ebean.annotation.TenantId;
 import io.ebean.annotation.Where;
+import io.ebean.config.BeanNotRegisteredException;
 import io.ebean.config.NamingConvention;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
 import io.ebeaninternal.server.deploy.BeanTable;
@@ -194,13 +195,13 @@ public class AnnotationAssocOnes extends AnnotationParser {
   }
 
   private String errorMsgMissingBeanTable(Class<?> type, String from) {
-    return "Error with association to [" + type + "] from [" + from + "]. Is " + type + " registered? Does it have the @Entity annotation?";
+    return "Error with association to [" + type + "] from [" + from + "]. Is " + type + " registered? Does it have the @Entity annotation? See https://ebean-orm.github.io/docs/trouble-shooting#not-registered";
   }
 
   private BeanTable beanTable(DeployBeanPropertyAssoc<?> prop) {
     BeanTable assoc = factory.getBeanTable(prop.getPropertyType());
     if (assoc == null) {
-      throw new RuntimeException(errorMsgMissingBeanTable(prop.getPropertyType(), prop.getFullBeanName()));
+      throw new BeanNotRegisteredException(errorMsgMissingBeanTable(prop.getPropertyType(), prop.getFullBeanName()));
     }
     return assoc;
   }

From b9ca8be95ae5dee1c30bc98d480a0395c66cc42d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 26 Oct 2018 01:34:16 +1300
Subject: [PATCH 0514/1036] #1517 - Update for ebean-datasource maven groupId
 change to io.ebean

---
 pom.xml                                                | 10 +++++-----
 src/main/java/io/ebean/config/ServerConfig.java        |  2 +-
 .../io/ebeaninternal/server/core/DefaultContainer.java |  8 ++++----
 .../server/core/InternalConfiguration.java             |  2 +-
 .../server/core/MultiTenantDbCatalogSupplier.java      |  2 +-
 .../server/core/MultiTenantDbSchemaSupplier.java       |  2 +-
 .../server/core/SimpleDataSourceProvider.java          |  2 +-
 src/test/java/io/ebean/config/ServerConfigTest.java    |  2 +-
 src/test/java/org/tests/basic/MainDbBoolean.java       |  2 +-
 .../org/tests/basic/MyTestDataSourcePoolListener.java  |  2 +-
 .../java/org/tests/query/TestQueryFindIterate.java     |  2 +-
 .../tests/transaction/TestAutoCommitDataSource.java    |  6 +++---
 .../tests/transaction/TestExplicitTransactionMode.java |  6 +++---
 src/test/java/org/tests/unitinternal/HelloMain.java    |  2 +-
 14 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index 845fea9ae..db4f48f77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.23.2-SNAPSHOT</version>
+  <version>11.24.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -121,9 +121,9 @@
     </dependency>
 
     <dependency>
-      <groupId>org.avaje</groupId>
-      <artifactId>avaje-datasource</artifactId>
-      <version>3.2.2</version>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>4.2.1</version>
     </dependency>
 
     <dependency>
@@ -270,7 +270,7 @@
       <version>5.1.43</version>
       <scope>test</scope>
     </dependency>
-    
+
     <dependency>
       <groupId>com.sap.cloud.db.jdbc</groupId>
       <artifactId>ngdbc</artifactId>
diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 853c05858..a1f622568 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -30,7 +30,7 @@ import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.meta.MetaInfoManager;
 import io.ebean.migration.MigrationRunner;
 import io.ebean.util.StringHelper;
-import org.avaje.datasource.DataSourceConfig;
+import io.ebean.datasource.DataSourceConfig;
 
 import javax.sql.DataSource;
 import java.time.Clock;
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index 5b9f111d7..9c547e8ae 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -15,10 +15,10 @@ import io.ebeaninternal.server.cluster.ClusterManager;
 import io.ebeaninternal.server.core.bootup.BootupClassPathSearch;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
 import io.ebeaninternal.server.lib.ShutdownManager;
-import org.avaje.datasource.DataSourceAlertFactory;
-import org.avaje.datasource.DataSourceConfig;
-import org.avaje.datasource.DataSourceFactory;
-import org.avaje.datasource.DataSourcePoolListener;
+import io.ebean.datasource.DataSourceAlertFactory;
+import io.ebean.datasource.DataSourceConfig;
+import io.ebean.datasource.DataSourceFactory;
+import io.ebean.datasource.DataSourcePoolListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index a2090e2e0..c27c530d1 100644
--- a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -87,7 +87,7 @@ import io.ebeanservice.docstore.api.DocStoreFactory;
 import io.ebeanservice.docstore.api.DocStoreIntegration;
 import io.ebeanservice.docstore.api.DocStoreUpdateProcessor;
 import io.ebeanservice.docstore.none.NoneDocStoreFactory;
-import org.avaje.datasource.DataSourcePool;
+import io.ebean.datasource.DataSourcePool;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/ebeaninternal/server/core/MultiTenantDbCatalogSupplier.java b/src/main/java/io/ebeaninternal/server/core/MultiTenantDbCatalogSupplier.java
index 11ede3e96..f1dfc07e1 100644
--- a/src/main/java/io/ebeaninternal/server/core/MultiTenantDbCatalogSupplier.java
+++ b/src/main/java/io/ebeaninternal/server/core/MultiTenantDbCatalogSupplier.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.core;
 import io.ebean.config.CurrentTenantProvider;
 import io.ebean.config.TenantCatalogProvider;
 import io.ebeaninternal.server.transaction.DataSourceSupplier;
-import org.avaje.datasource.DataSourcePool;
+import io.ebean.datasource.DataSourcePool;
 
 import javax.sql.DataSource;
 import java.io.PrintWriter;
diff --git a/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java b/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java
index 33f4de3ff..a309f4f2f 100644
--- a/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java
+++ b/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.core;
 import io.ebean.config.CurrentTenantProvider;
 import io.ebean.config.TenantSchemaProvider;
 import io.ebeaninternal.server.transaction.DataSourceSupplier;
-import org.avaje.datasource.DataSourcePool;
+import io.ebean.datasource.DataSourcePool;
 
 import javax.sql.DataSource;
 import java.io.PrintWriter;
diff --git a/src/main/java/io/ebeaninternal/server/core/SimpleDataSourceProvider.java b/src/main/java/io/ebeaninternal/server/core/SimpleDataSourceProvider.java
index 532f2f720..6d83da262 100644
--- a/src/main/java/io/ebeaninternal/server/core/SimpleDataSourceProvider.java
+++ b/src/main/java/io/ebeaninternal/server/core/SimpleDataSourceProvider.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.core;
 
 import io.ebeaninternal.server.transaction.DataSourceSupplier;
-import org.avaje.datasource.DataSourcePool;
+import io.ebean.datasource.DataSourcePool;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
diff --git a/src/test/java/io/ebean/config/ServerConfigTest.java b/src/test/java/io/ebean/config/ServerConfigTest.java
index b0ff31457..5ac810e8b 100644
--- a/src/test/java/io/ebean/config/ServerConfigTest.java
+++ b/src/test/java/io/ebean/config/ServerConfigTest.java
@@ -2,7 +2,7 @@ package io.ebean.config;
 
 import io.ebean.annotation.PersistBatch;
 import io.ebean.config.dbplatform.IdType;
-import org.avaje.datasource.DataSourceConfig;
+import io.ebean.datasource.DataSourceConfig;
 import org.junit.Test;
 
 import java.util.Properties;
diff --git a/src/test/java/org/tests/basic/MainDbBoolean.java b/src/test/java/org/tests/basic/MainDbBoolean.java
index 3715760c5..47feddb82 100644
--- a/src/test/java/org/tests/basic/MainDbBoolean.java
+++ b/src/test/java/org/tests/basic/MainDbBoolean.java
@@ -9,7 +9,7 @@ import io.ebean.config.dbplatform.postgres.PostgresPlatform;
 import org.tests.model.basic.TOne;
 import org.tests.model.basic.TSDetail;
 import org.tests.model.basic.TSMaster;
-import org.avaje.datasource.DataSourceConfig;
+import io.ebean.datasource.DataSourceConfig;
 import org.junit.Assert;
 
 import java.util.List;
diff --git a/src/test/java/org/tests/basic/MyTestDataSourcePoolListener.java b/src/test/java/org/tests/basic/MyTestDataSourcePoolListener.java
index f73cb92ee..e94299d52 100644
--- a/src/test/java/org/tests/basic/MyTestDataSourcePoolListener.java
+++ b/src/test/java/org/tests/basic/MyTestDataSourcePoolListener.java
@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import org.avaje.datasource.DataSourcePoolListener;
+import io.ebean.datasource.DataSourcePoolListener;
 
 import java.sql.Connection;
 
diff --git a/src/test/java/org/tests/query/TestQueryFindIterate.java b/src/test/java/org/tests/query/TestQueryFindIterate.java
index de2c9f16b..47c20eb73 100644
--- a/src/test/java/org/tests/query/TestQueryFindIterate.java
+++ b/src/test/java/org/tests/query/TestQueryFindIterate.java
@@ -6,7 +6,7 @@ import io.ebean.EbeanServer;
 import io.ebean.Query;
 import io.ebean.QueryIterator;
 import io.ebean.plugin.SpiServer;
-import org.avaje.datasource.DataSourcePool;
+import io.ebean.datasource.DataSourcePool;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
diff --git a/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java b/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java
index 554b2efd7..577dbc74c 100644
--- a/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java
+++ b/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java
@@ -9,9 +9,9 @@ import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.properties.PropertiesLoader;
-import org.avaje.datasource.DataSourceConfig;
-import org.avaje.datasource.DataSourcePool;
-import org.avaje.datasource.pool.ConnectionPool;
+import io.ebean.datasource.DataSourceConfig;
+import io.ebean.datasource.DataSourcePool;
+import io.ebean.datasource.pool.ConnectionPool;
 import org.junit.Test;
 import org.tests.model.basic.UTDetail;
 import org.tests.model.basic.UTMaster;
diff --git a/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
index 0809baa9c..b125ce66f 100644
--- a/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
+++ b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
@@ -9,9 +9,9 @@ import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.properties.PropertiesLoader;
-import org.avaje.datasource.DataSourceConfig;
-import org.avaje.datasource.DataSourcePool;
-import org.avaje.datasource.pool.ConnectionPool;
+import io.ebean.datasource.DataSourceConfig;
+import io.ebean.datasource.DataSourcePool;
+import io.ebean.datasource.pool.ConnectionPool;
 import org.junit.Test;
 import org.tests.model.basic.UTDetail;
 import org.tests.model.basic.UTMaster;
diff --git a/src/test/java/org/tests/unitinternal/HelloMain.java b/src/test/java/org/tests/unitinternal/HelloMain.java
index 1d80fcdbe..5efeba5ea 100644
--- a/src/test/java/org/tests/unitinternal/HelloMain.java
+++ b/src/test/java/org/tests/unitinternal/HelloMain.java
@@ -5,7 +5,7 @@ import io.ebean.EbeanServerFactory;
 import io.ebean.config.ServerConfig;
 import org.tests.model.basic.TOne;
 import org.avaje.agentloader.AgentLoader;
-import org.avaje.datasource.DataSourceConfig;
+import io.ebean.datasource.DataSourceConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

From 19d29cd8367ecaad773d02a6db0fe79794a325bf Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 26 Oct 2018 14:50:17 +1300
Subject: [PATCH 0515/1036] #1514 - Add support for JacksonAnnotations at
 bean-properties

Fix where Jackson is not present on the classpath
---
 .../deploy/meta/DeployBeanDescriptor.java     |  6 +---
 .../deploy/meta/DeployBeanObtainJackson.java  | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanObtainJackson.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index 9f26a4f34..18873232a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -3,7 +3,6 @@ package io.ebeaninternal.server.deploy.meta;
 import io.ebean.annotation.Cache;
 import io.ebean.annotation.DocStore;
 import io.ebean.annotation.DocStoreMode;
-import io.ebean.annotation.PartitionMode;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.TableName;
 import io.ebean.config.dbplatform.IdType;
@@ -1260,10 +1259,7 @@ public class DeployBeanDescriptor<T> {
    */
   public Object /*AnnotatedClass*/ getJacksonAnnotatedClass() {
     if (jacksonAnnotatedClass == null) {
-      com.fasterxml.jackson.databind.ObjectMapper objectMapper = (com.fasterxml.jackson.databind.ObjectMapper) serverConfig.getObjectMapper();
-      com.fasterxml.jackson.databind.JavaType javaType = objectMapper.getTypeFactory().constructType(beanType);
-      jacksonAnnotatedClass = com.fasterxml.jackson.databind.introspect.AnnotatedClassResolver
-        .resolve(objectMapper.getDeserializationConfig(), javaType, objectMapper.getDeserializationConfig());
+      jacksonAnnotatedClass = new DeployBeanObtainJackson(serverConfig, beanType).obtain();
     }
     return jacksonAnnotatedClass;
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanObtainJackson.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanObtainJackson.java
new file mode 100644
index 000000000..9526c2aa2
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanObtainJackson.java
@@ -0,0 +1,30 @@
+package io.ebeaninternal.server.deploy.meta;
+
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.introspect.AnnotatedClassResolver;
+import io.ebean.config.ServerConfig;
+
+/**
+ * Used to obtain the Jackson AnnotatedClass for a given bean type utlimately to obtain field level Jackson annotations.
+ */
+class DeployBeanObtainJackson<T> {
+
+  private final ServerConfig serverConfig;
+  private final Class<T> beanType;
+
+  DeployBeanObtainJackson(ServerConfig serverConfig, Class<T> beanType) {
+    this.serverConfig = serverConfig;
+    this.beanType = beanType;
+  }
+
+  /**
+   * Return the Jackson AnnotatedClass for the given bean type.
+   */
+  Object obtain() {
+
+    ObjectMapper objectMapper = (ObjectMapper) serverConfig.getObjectMapper();
+    JavaType javaType = objectMapper.getTypeFactory().constructType(beanType);
+    return AnnotatedClassResolver.resolve(objectMapper.getDeserializationConfig(), javaType, objectMapper.getDeserializationConfig());
+  }
+}

From 23d2c64046044cb49a158ee89372f4da61f604de Mon Sep 17 00:00:00 2001
From: Michael Benz <michael.benz@foconis.de>
Date: Tue, 30 Oct 2018 00:55:58 +0100
Subject: [PATCH 0516/1036] JavaDoc Fix closing h3 tag in Transaction. no code
 change! (#1520)

---
 src/main/java/io/ebean/Transaction.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/ebean/Transaction.java b/src/main/java/io/ebean/Transaction.java
index df79941e7..961d1f5a8 100644
--- a/src/main/java/io/ebean/Transaction.java
+++ b/src/main/java/io/ebean/Transaction.java
@@ -84,7 +84,7 @@ public interface Transaction extends AutoCloseable {
    * <p>
    * This is similar to commit() but leaves the transaction "Active".
    * </p>
-   * <h3>Functions/h3>
+   * <h3>Functions</h3>
    * <ul>
    * <li>Flush the JDBC batch buffer</li>
    * <li>Call commit on the underlying JDBC connection</li>
@@ -100,7 +100,7 @@ public interface Transaction extends AutoCloseable {
    * This performs commit and completes the transaction closing underlying resources and
    * marking the transaction as "In active".
    * </p>
-   * <h3>Functions/h3>
+   * <h3>Functions</h3>
    * <ul>
    * <li>Flush the JDBC batch buffer</li>
    * <li>Call commit on the underlying JDBC connection</li>
@@ -117,7 +117,7 @@ public interface Transaction extends AutoCloseable {
    * <p>
    * This performs rollback, closes underlying resources and marks the transaction as "In active".
    * </p>
-   * <h3>Functions/h3>
+   * <h3>Functions</h3>
    * <ul>
    * <li>Call rollback on the underlying JDBC connection</li>
    * <li>Trigger any registered TransactionCallbacks</li>

From d920d8eb76427bf596cefbdb8d9f56a22b3cbe49 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 30 Oct 2018 13:38:57 +1300
Subject: [PATCH 0517/1036] #1522 - Refactor - Change io.ebean.Model to not be
 a annotated with `@MappedSuperclass`

---
 src/main/java/io/ebean/Model.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/io/ebean/Model.java b/src/main/java/io/ebean/Model.java
index b0f29b968..b17d03ac3 100644
--- a/src/main/java/io/ebean/Model.java
+++ b/src/main/java/io/ebean/Model.java
@@ -74,7 +74,6 @@ import javax.persistence.MappedSuperclass;
  *
  * }</pre>
  */
-@MappedSuperclass
 public abstract class Model {
 
   /**

From 1f928e65a46ff907f57272739be0f3ece464db81 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 30 Oct 2018 13:39:54 +1300
Subject: [PATCH 0518/1036] #1521 - Add API for using explicit transaction for
 UpdateQuery - e.g.
 ebeanServer.update(Customer.class)...update(activeTransaction);

---
 src/main/java/io/ebean/ExpressionList.java    | 20 ++++++
 src/main/java/io/ebean/Query.java             | 20 ++++++
 .../expression/DefaultExpressionList.java     | 11 ++++
 .../server/expression/JunctionExpression.java | 11 ++++
 .../server/querydefn/DefaultOrmQuery.java     | 11 ++++
 src/test/java/io/ebean/UpdateQueryTest.java   | 61 +++++++++++++++++++
 6 files changed, 134 insertions(+)

diff --git a/src/main/java/io/ebean/ExpressionList.java b/src/main/java/io/ebean/ExpressionList.java
index 9ce5e8d08..b156afdd9 100644
--- a/src/main/java/io/ebean/ExpressionList.java
+++ b/src/main/java/io/ebean/ExpressionList.java
@@ -166,6 +166,18 @@ public interface ExpressionList<T> {
    */
   int delete();
 
+  /**
+   * Execute as a delete query deleting the 'root level' beans that match the predicates
+   * in the query.
+   * <p>
+   * Note that if the query includes joins then the generated delete statement may not be
+   * optimal depending on the database platform.
+   * </p>
+   *
+   * @return the number of rows that were deleted.
+   */
+  int delete(Transaction transaction);
+
   /**
    * Execute as a update query.
    *
@@ -174,6 +186,14 @@ public interface ExpressionList<T> {
    */
   int update();
 
+  /**
+   * Execute as a update query with the given transaction.
+   *
+   * @return the number of rows that were updated.
+   * @see UpdateQuery
+   */
+  int update(Transaction transaction);
+
   /**
    * Execute the query iterating over the results.
    *
diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index 8749a2213..d2678e54e 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -924,11 +924,31 @@ public interface Query<T> {
    */
   int delete();
 
+  /**
+   * Execute as a delete query returning the number of rows deleted using the given transaction.
+   * <p>
+   * Note that if the query includes joins then the generated delete statement may not be
+   * optimal depending on the database platform.
+   * </p>
+   *
+   * @return the number of beans/rows that were deleted.
+   */
+  int delete(Transaction transaction);
+
   /**
    * Execute the UpdateQuery returning the number of rows updated.
+   *
+   * @return the number of beans/rows updated.
    */
   int update();
 
+  /**
+   * Execute the UpdateQuery returning the number of rows updated using the given transaction.
+   *
+   * @return the number of beans/rows updated.
+   */
+  int update(Transaction transaction);
+
   /**
    * Return the count of entities this query should return.
    * <p>
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 578e2d9b1..76211069b 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -17,6 +17,7 @@ import io.ebean.PagedList;
 import io.ebean.Pairs;
 import io.ebean.Query;
 import io.ebean.QueryIterator;
+import io.ebean.Transaction;
 import io.ebean.Version;
 import io.ebean.event.BeanQueryRequest;
 import io.ebean.search.Match;
@@ -356,11 +357,21 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return query.delete();
   }
 
+  @Override
+  public int delete(Transaction transaction) {
+    return query.delete(transaction);
+  }
+
   @Override
   public int update() {
     return query.update();
   }
 
+  @Override
+  public int update(Transaction transaction) {
+    return query.update(transaction);
+  }
+
   @Override
   public FutureIds<T> findFutureIds() {
     return query.findFutureIds();
diff --git a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index 04bdc0777..4dc93e626 100644
--- a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -16,6 +16,7 @@ import io.ebean.PagedList;
 import io.ebean.Pairs;
 import io.ebean.Query;
 import io.ebean.QueryIterator;
+import io.ebean.Transaction;
 import io.ebean.Version;
 import io.ebean.event.BeanQueryRequest;
 import io.ebean.search.Match;
@@ -318,11 +319,21 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.delete();
   }
 
+  @Override
+  public int delete(Transaction transaction) {
+    return exprList.delete(transaction);
+  }
+
   @Override
   public int update() {
     return exprList.update();
   }
 
+  @Override
+  public int update(Transaction transaction) {
+    return exprList.update(transaction);
+  }
+
   @Override
   public Query<T> asOf(Timestamp asOf) {
     return exprList.asOf(asOf);
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index e64ab5c79..33710a1d9 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -21,6 +21,7 @@ import io.ebean.Query;
 import io.ebean.QueryIterator;
 import io.ebean.QueryType;
 import io.ebean.RawSql;
+import io.ebean.Transaction;
 import io.ebean.Version;
 import io.ebean.bean.CallStack;
 import io.ebean.bean.ObjectGraphNode;
@@ -1384,11 +1385,21 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return server.delete(this, null);
   }
 
+  @Override
+  public int delete(Transaction transaction) {
+    return server.delete(this, transaction);
+  }
+
   @Override
   public int update() {
     return server.update(this, null);
   }
 
+  @Override
+  public int update(Transaction transaction) {
+    return server.update(this, transaction);
+  }
+
   @Override
   public <A> List<A> findIds() {
     // a copy of this query is made in the server
diff --git a/src/test/java/io/ebean/UpdateQueryTest.java b/src/test/java/io/ebean/UpdateQueryTest.java
index 31285feb5..304a228f5 100644
--- a/src/test/java/io/ebean/UpdateQueryTest.java
+++ b/src/test/java/io/ebean/UpdateQueryTest.java
@@ -215,6 +215,67 @@ public class UpdateQueryTest extends BaseTestCase {
     assertThat(rows).isEqualTo(0);
   }
 
+  @Test
+  public void updateQuery_withExplicitTransaction() {
+
+    EbeanServer server = server();
+
+    int rowsExprList;
+    int rowsQuery;
+
+    try (Transaction transaction = server.beginTransaction()) {
+
+      rowsExprList = server
+        .update(Customer.class)
+        .setRaw("status = coalesce(status, ?)", Customer.Status.ACTIVE)
+        .where()
+        .gt("id", 10000)
+        .update(transaction);
+
+      rowsQuery = server
+        .update(Customer.class)
+        .setRaw("status = coalesce(status, ?)", Customer.Status.ACTIVE)
+        .where()
+        .gt("id", 10001)
+        .query().update(transaction);
+
+      transaction.commit();
+    }
+
+    assertThat(rowsExprList).isEqualTo(0);
+    assertThat(rowsQuery).isEqualTo(0);
+  }
+
+
+  @Test
+  public void deleteQuery_withExplicitTransaction() {
+
+    EbeanServer server = server();
+
+    int rowsExprList;
+    int rowsQuery;
+
+    try (Transaction transaction = server.beginTransaction()) {
+
+      rowsExprList = server
+        .update(Customer.class)
+        .where()
+        .gt("id", 10000)
+        .delete(transaction);
+
+      rowsQuery = server
+        .update(Customer.class)
+        .where()
+        .gt("id", 10001)
+        .query().delete(transaction);
+
+      transaction.commit();
+    }
+
+    assertThat(rowsExprList).isEqualTo(0);
+    assertThat(rowsQuery).isEqualTo(0);
+  }
+
   @Test
   public void useViaEbean() {
 

From f928923b5b380c1dafd261fac7c7cfaef2387f31 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 31 Oct 2018 23:53:16 +1300
Subject: [PATCH 0519/1036] #1519 - Memory leak when using
 @Cache(enableQueryCache=true) (#1523)

* #1519 - Memory leak when using @Cache(enableQueryCache=true)

* #1519 - Memory leak when using @Cache(enableQueryCache=true)

Remove unused TransactionEventBeans
---
 .../ebeaninternal/api/TransactionEvent.java   | 58 +++++++++-----
 .../api/TransactionEventBeans.java            | 44 ----------
 .../server/core/PersistRequestBean.java       | 80 +++++++++++++++----
 .../server/deploy/BeanCollectionUtil.java     | 30 ++++++-
 .../server/deploy/BeanDescriptor.java         |  1 -
 .../deploy/BeanDescriptorCacheHelp.java       |  6 +-
 .../server/persist/DefaultPersister.java      |  9 ++-
 .../server/transaction/JdbcTransaction.java   |  5 +-
 .../transaction/PostCommitProcessing.java     | 23 +++---
 .../transaction/TransactionManager.java       |  2 +-
 .../config/PlatformNoGeneratedKeysTest.java   |  4 +-
 src/test/java/org/MainMemoryLeak.java         | 76 ++++++++++++++++++
 src/test/resources/ebean.properties           |  4 +
 src/test/resources/logback-test.xml           | 16 ++--
 14 files changed, 240 insertions(+), 118 deletions(-)
 delete mode 100644 src/main/java/io/ebeaninternal/api/TransactionEventBeans.java
 create mode 100644 src/test/java/org/MainMemoryLeak.java

diff --git a/src/main/java/io/ebeaninternal/api/TransactionEvent.java b/src/main/java/io/ebeaninternal/api/TransactionEvent.java
index d8b25c113..348dd2a0f 100644
--- a/src/main/java/io/ebeaninternal/api/TransactionEvent.java
+++ b/src/main/java/io/ebeaninternal/api/TransactionEvent.java
@@ -9,6 +9,7 @@ import io.ebeaninternal.server.transaction.TransactionManager;
 import io.ebeanservice.docstore.api.DocStoreUpdates;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -29,16 +30,21 @@ public class TransactionEvent implements Serializable {
    */
   private final transient boolean local;
 
+  private final long startMillis;
+
   private TransactionEventTable eventTables;
 
-  private transient TransactionEventBeans eventBeans;
+  private transient List<PersistRequestBean<?>> listenerNotify;
 
   private transient DeleteByIdMap deleteByIdMap;
 
+  private transient CacheChangeSet changeSet;
+
   /**
    * Create the TransactionEvent, one per Transaction.
    */
-  public TransactionEvent() {
+  public TransactionEvent(long startMillis) {
+    this.startMillis = startMillis;
     this.local = true;
   }
 
@@ -71,8 +77,8 @@ public class TransactionEvent implements Serializable {
   /**
    * Return the list of PersistRequestBean's for this transaction.
    */
-  public List<PersistRequestBean<?>> getPersistRequestBeans() {
-    return (eventBeans == null) ? null : eventBeans.getRequests();
+  public List<PersistRequestBean<?>> getListenerNotify() {
+    return (listenerNotify == null) ? null : listenerNotify;
   }
 
   public TransactionEventTable getEventTables() {
@@ -94,17 +100,13 @@ public class TransactionEvent implements Serializable {
   }
 
   /**
-   * Add a inserted updated or deleted bean to the event.
+   * Add post commit listeners. Watch this for large transactions.
    */
-  public void add(PersistRequestBean<?> request) {
-
-    if (request.isNotify()) {
-      // either a BeanListener or Cache is interested
-      if (eventBeans == null) {
-        eventBeans = new TransactionEventBeans();
-      }
-      eventBeans.add(request);
+  public void addListenerNotify(PersistRequestBean<?> request) {
+    if (listenerNotify == null) {
+      listenerNotify = new ArrayList<>();
     }
+    listenerNotify.add(request);
   }
 
   /**
@@ -112,11 +114,13 @@ public class TransactionEvent implements Serializable {
    */
   public CacheChangeSet buildCacheChanges(TransactionManager manager) {
 
-    if (eventBeans == null && deleteByIdMap == null && eventTables == null) {
+    if (changeSet == null && deleteByIdMap == null && eventTables == null) {
       return null;
     }
 
-    CacheChangeSet changeSet = new CacheChangeSet(manager.clockNowMillis());
+    if (changeSet == null) {
+      changeSet = new CacheChangeSet(manager.clockNowMillis());
+    }
     if (eventTables != null && !eventTables.isEmpty()) {
       // notify cache with table based changes
       BeanDescriptorManager dm = manager.getBeanDescriptorManager();
@@ -124,9 +128,6 @@ public class TransactionEvent implements Serializable {
         dm.cacheNotify(tableIUD, changeSet);
       }
     }
-    if (eventBeans != null) {
-      eventBeans.notifyCache(changeSet);
-    }
     if (deleteByIdMap != null) {
       deleteByIdMap.notifyCache(changeSet);
     }
@@ -137,12 +138,25 @@ public class TransactionEvent implements Serializable {
    * Add any relevant PersistRequestBean's to DocStoreUpdates for later processing.
    */
   public void addDocStoreUpdates(DocStoreUpdates docStoreUpdates) {
-
-    List<PersistRequestBean<?>> persistRequestBeans = getPersistRequestBeans();
-    if (persistRequestBeans != null) {
-      for (PersistRequestBean<?> persistRequestBean : persistRequestBeans) {
+    List<PersistRequestBean<?>> requests = getListenerNotify();
+    if (requests != null) {
+      for (PersistRequestBean<?> persistRequestBean : requests) {
         persistRequestBean.addDocStoreUpdates(docStoreUpdates);
       }
     }
   }
+
+  /**
+   * Return the CacheChangeSet that we add cache notification messages to.
+   *
+   * We want to add to this change set as we process requests allowing the
+   * PersistRequestBean to be garbage collected for large transactions.
+   */
+  public CacheChangeSet obtainCacheChangeSet() {
+    if (changeSet == null) {
+      changeSet = new CacheChangeSet(startMillis);
+    }
+    return changeSet;
+  }
+
 }
diff --git a/src/main/java/io/ebeaninternal/api/TransactionEventBeans.java b/src/main/java/io/ebeaninternal/api/TransactionEventBeans.java
deleted file mode 100644
index 8e0cd0621..000000000
--- a/src/main/java/io/ebeaninternal/api/TransactionEventBeans.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package io.ebeaninternal.api;
-
-import io.ebeaninternal.server.cache.CacheChangeSet;
-import io.ebeaninternal.server.core.PersistRequestBean;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Lists of inserted updated and deleted beans that have a BeanPersistListener.
- * <p>
- * These beans will be sent to the appropriate BeanListeners after a successful
- * commit of the transaction.
- * </p>
- */
-public class TransactionEventBeans {
-
-  final ArrayList<PersistRequestBean<?>> requests = new ArrayList<>();
-
-  /**
-   * Return the list of PersistRequests that BeanListeners are interested in.
-   */
-  public List<PersistRequestBean<?>> getRequests() {
-    return requests;
-  }
-
-  /**
-   * Add a bean for BeanListener notification.
-   */
-  public void add(PersistRequestBean<?> request) {
-
-    requests.add(request);
-  }
-
-  /**
-   * Collect the cache changes.
-   */
-  public void notifyCache(CacheChangeSet changeSet) {
-    for (PersistRequestBean<?> request : requests) {
-      request.notifyCache(changeSet);
-    }
-  }
-
-}
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index acaa7c57d..d2a93c9d6 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -173,6 +173,16 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    */
   private int pendingPostUpdateNotify;
 
+  /**
+   * Set to true when post execute has occured (so includes batch flush).
+   */
+  private boolean postExecute;
+
+  /**
+   * Set to true after many properties have been persisted (so includes element collections).
+   */
+  private boolean complete;
+
   public PersistRequestBean(SpiEbeanServer server, T bean, Object parentBean, BeanManager<T> mgr, SpiTransaction t,
                             PersistExecute persistExecute, PersistRequest.Type type, int flags) {
 
@@ -441,10 +451,10 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   }
 
   /**
-   * Return true if this change should notify cache, listener or doc store.
+   * Return true if this change should notify persist listener or doc store (and keep the request).
    */
-  public boolean isNotify() {
-    return notifyCache || isNotifyPersistListener() || isDocStoreNotify();
+  private boolean isNotifyListeners() {
+    return isNotifyPersistListener() || isDocStoreNotify();
   }
 
   /**
@@ -918,7 +928,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    */
   @Override
   public void postExecute() {
-
+    postExecute = true;
     if (controller != null) {
       controllerPost();
     }
@@ -939,7 +949,8 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
       postInsert();
     }
 
-    addEvent();
+    addPostCommitListeners();
+    notifyCacheOnPostExecute();
 
     if (isLogSummary()) {
       logSummary();
@@ -1017,14 +1028,12 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   }
 
   /**
-   * Add the bean to the TransactionEvent. This will be used by TransactionManager to sync Cache,
-   * Cluster and text indexes.
+   * Add the request to TransactionEvent if there are post commit listeners.
    */
-  private void addEvent() {
-
+  private void addPostCommitListeners() {
     TransactionEvent event = transaction.getEvent();
-    if (event != null) {
-      event.add(this);
+    if (event != null && isNotifyListeners()) {
+      event.addListenerNotify(this);
     }
   }
 
@@ -1087,23 +1096,62 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   }
 
   /**
-   * Check if any of its many properties where cascade saved and hence we need to update related
-   * many property caches.
+   * Completed insert or delete request. Do cache notify in non-batched case.
    */
-  public void checkUpdatedManysOnly() {
+  public void complete() {
+    notifyCacheOnComplete();
+  }
+
+  /**
+   * Completed update request handling cases for element collection and where ONLY
+   * many properties were updated.
+   */
+  public void completeUpdate() {
     if (!dirty && updatedManys != null) {
       // set the flag and register for post commit processing if there
       // is caching or registered listeners
       if (idValue == null) {
         this.idValue = beanDescriptor.getId(entityBean);
       }
+      // not dirty so postExecute() will never be called
+      // set true to trigger cache notify if needed
+      postExecute = true;
       updatedManysOnly = true;
       setNotifyCache();
-      addEvent();
+      addPostCommitListeners();
     }
+    notifyCacheOnComplete();
     postUpdateNotify();
   }
 
+  /**
+   * Notify cache when using batched persist.
+   */
+  private void notifyCacheOnPostExecute() {
+    postExecute = true;
+    if (notifyCache && complete) {
+      // add cache notification (on batch persist)
+      TransactionEvent event = transaction.getEvent();
+      if (event != null) {
+        notifyCache(event.obtainCacheChangeSet());
+      }
+    }
+  }
+
+  /**
+   * Notify cache when not use batched persist.
+   */
+  private void notifyCacheOnComplete() {
+    complete = true;
+    if (notifyCache && postExecute) {
+      // add cache notification (on non-batch persist)
+      TransactionEvent event = transaction.getEvent();
+      if (event != null) {
+        notifyCache(event.obtainCacheChangeSet());
+      }
+    }
+  }
+
   /**
    * For requests that update document store add this event to either the list
    * of queue events or list of update events.
@@ -1390,7 +1438,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   public void setImportedOrphanForRemoval(BeanPropertyAssocOne<?> prop) {
     Object orphan = getOrigValue(prop);
     if (orphan instanceof EntityBean) {
-      orphanBean = (EntityBean)orphan;
+      orphanBean = (EntityBean) orphan;
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java
index 0b8d46dcf..e632a729c 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java
@@ -22,7 +22,7 @@ public class BeanCollectionUtil {
   }
 
   /**
-   * Return the details of the collection or map taking care to avoid
+   * Return the details (map entry set) of the collection or map taking care to avoid
    * unnecessary fetching of the data.
    */
   public static Collection<?> getActualEntries(Object o) {
@@ -48,4 +48,32 @@ public class BeanCollectionUtil {
     }
     throw new PersistenceException("expecting a Map or Collection but got [" + o.getClass().getName() + "]");
   }
+
+  /**
+   * Return the details (map values) of the collection or map taking care to avoid
+   * unnecessary fetching of the data.
+   */
+  public static Collection<?> getActualDetails(Object o) {
+    if (o == null) {
+      return null;
+    }
+    if (o instanceof BeanCollection<?>) {
+      BeanCollection<?> bc = (BeanCollection<?>) o;
+      if (!bc.isPopulated()) {
+        return null;
+      }
+      // For maps this is a collection of Map.Entry, otherwise it
+      // returns a collection of beans
+      return bc.getActualDetails();
+    }
+
+    if (o instanceof Map<?, ?>) {
+      // yes, we want the entrySet (to set the keys)
+      return ((Map<?, ?>) o).values();
+
+    } else if (o instanceof Collection<?>) {
+      return ((Collection<?>) o);
+    }
+    throw new PersistenceException("expecting a Map or Collection but got [" + o.getClass().getName() + "]");
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 6f951ab87..2ca824f98 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -7,7 +7,6 @@ import io.ebean.SqlUpdate;
 import io.ebean.Transaction;
 import io.ebean.ValuePair;
 import io.ebean.annotation.DocStoreMode;
-import io.ebean.annotation.PartitionMode;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index ee602ab74..56f951b98 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -348,13 +348,12 @@ final class BeanDescriptorCacheHelp<T> {
 
   private CachedManyIds createManyIds(BeanPropertyAssocMany<?> many, Object details) {
 
-    BeanDescriptor<?> targetDescriptor = many.getTargetDescriptor();
-
-    Collection<?> actualDetails = BeanCollectionUtil.getActualEntries(details);
+    Collection<?> actualDetails = BeanCollectionUtil.getActualDetails(details);
     if (actualDetails == null) {
       return null;
     }
 
+    BeanDescriptor<?> targetDescriptor = many.getTargetDescriptor();
     List<Object> idList = new ArrayList<>(actualDetails.size());
     for (Object bean : actualDetails) {
       idList.add(targetDescriptor.getId((EntityBean) bean));
@@ -794,7 +793,6 @@ final class BeanDescriptorCacheHelp<T> {
         // query caching only
         return;
       }
-
       List<BeanPropertyAssocMany<?>> manyCollections = updateRequest.getUpdatedManyCollections();
       if (manyCollections != null) {
         for (BeanPropertyAssocMany<?> many : manyCollections) {
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 2a1651660..8b2c6340a 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -412,7 +412,7 @@ public final class DefaultPersister implements Persister {
         if (req.isPersistCascade()) {
           saveAssocMany(req);
         }
-        req.checkUpdatedManysOnly();
+        req.completeUpdate();
       } else {
         update(req);
       }
@@ -472,7 +472,7 @@ public final class DefaultPersister implements Persister {
         request.flagUpdate();
         saveAssocMany(request);
       }
-      request.checkUpdatedManysOnly();
+      request.completeUpdate();
     } else {
       if (request.isInsert()) {
         insert(request);
@@ -506,6 +506,8 @@ public final class DefaultPersister implements Persister {
         // save any associated List held beans
         saveAssocMany(request);
       }
+      request.complete();
+
     } finally {
       request.unRegisterBean();
     }
@@ -539,7 +541,7 @@ public final class DefaultPersister implements Persister {
         saveAssocMany(request);
       }
 
-      request.checkUpdatedManysOnly();
+      request.completeUpdate();
 
     } finally {
       request.unRegisterBean();
@@ -883,6 +885,7 @@ public final class DefaultPersister implements Persister {
         unloadedForeignKeys.deleteCascade();
       }
     }
+    request.complete();
 
     // return true if using JDBC batch (as we can't tell until the batch is flushed)
     return count;
diff --git a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index bafd7a57f..2f469f3e9 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -14,7 +14,6 @@ import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.api.TransactionEvent;
 import io.ebeaninternal.api.TxnProfileEventCodes;
 import io.ebeaninternal.server.core.PersistDeferredRelationship;
-import io.ebeaninternal.server.core.PersistRequest;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.lib.util.Str;
 import io.ebeaninternal.server.persist.BatchControl;
@@ -855,7 +854,7 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   public TransactionEvent getEvent() {
     queryOnly = false;
     if (event == null) {
-      event = new TransactionEvent();
+      event = new TransactionEvent(startMillis);
     }
     return event;
   }
@@ -1052,7 +1051,7 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
       // the event has been sent to the transaction manager
       // for postCommit processing (l2 cache updates etc)
       // start a new transaction event
-      event = new TransactionEvent();
+      event = new TransactionEvent(startMillis);
 
     } catch (Exception e) {
       doRollback(e);
diff --git a/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java b/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
index 550bb8be4..9797ef59f 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
@@ -33,9 +33,7 @@ final class PostCommitProcessing {
 
   private final TransactionManager manager;
 
-  private final List<PersistRequestBean<?>> persistBeanRequests;
-
-  private final BeanPersistIdMap beanPersistIdMap;
+  private final List<PersistRequestBean<?>> listenerNotify;
 
   private final RemoteTransactionEvent remoteTransactionEvent;
 
@@ -57,8 +55,7 @@ final class PostCommitProcessing {
     this.txnDocStoreBatchSize = 0;
     this.event = event;
     this.deleteByIdMap = event.getDeleteByIdMap();
-    this.persistBeanRequests = event.getPersistRequestBeans();
-    this.beanPersistIdMap = createBeanPersistIdMap();
+    this.listenerNotify = event.getListenerNotify();
     this.remoteTransactionEvent = createRemoteTransactionEvent();
   }
 
@@ -74,8 +71,7 @@ final class PostCommitProcessing {
     this.txnDocStoreBatchSize = transaction.getDocStoreBatchSize();
     this.event = transaction.getEvent();
     this.deleteByIdMap = event.getDeleteByIdMap();
-    this.persistBeanRequests = event.getPersistRequestBeans();
-    this.beanPersistIdMap = createBeanPersistIdMap();
+    this.listenerNotify = event.getListenerNotify();
     this.remoteTransactionEvent = createRemoteTransactionEvent();
   }
 
@@ -159,9 +155,9 @@ final class PostCommitProcessing {
   }
 
   private void localPersistListenersNotify() {
-    if (persistBeanRequests != null) {
-      for (PersistRequestBean<?> persistBeanRequest : persistBeanRequests) {
-        persistBeanRequest.notifyLocalPersistListener();
+    if (listenerNotify != null) {
+      for (PersistRequestBean<?> request : listenerNotify) {
+        request.notifyLocalPersistListener();
       }
     }
     TransactionEventTable eventTables = event.getEventTables();
@@ -175,13 +171,13 @@ final class PostCommitProcessing {
 
   private BeanPersistIdMap createBeanPersistIdMap() {
 
-    if (persistBeanRequests == null) {
+    if (listenerNotify == null) {
       return null;
     }
 
     BeanPersistIdMap m = new BeanPersistIdMap();
-    for (PersistRequestBean<?> persistBeanRequest : persistBeanRequests) {
-      persistBeanRequest.addToPersistMap(m);
+    for (PersistRequestBean<?> request : listenerNotify) {
+      request.addToPersistMap(m);
     }
     return m;
   }
@@ -193,6 +189,7 @@ final class PostCommitProcessing {
     }
 
     RemoteTransactionEvent remoteTransactionEvent = new RemoteTransactionEvent(serverName);
+    BeanPersistIdMap beanPersistIdMap = createBeanPersistIdMap();
     if (beanPersistIdMap != null) {
       for (BeanPersistIds beanPersist : beanPersistIdMap.values()) {
         remoteTransactionEvent.addBeanPersistIds(beanPersist);
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index 51824492e..ee1ded434 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -452,7 +452,7 @@ public class TransactionManager implements SpiTransactionManager {
 
   private void externalModificationEvent(TransactionEventTable tableEvents) {
 
-    TransactionEvent event = new TransactionEvent();
+    TransactionEvent event = new TransactionEvent(clockNowMillis());
     event.add(tableEvents);
 
     PostCommitProcessing postCommit = new PostCommitProcessing(clusterManager, this, event);
diff --git a/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java b/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java
index 857577a9c..af873247e 100644
--- a/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java
+++ b/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java
@@ -93,9 +93,9 @@ public class PlatformNoGeneratedKeysTest {
     return EbeanServerFactory.create(config);
   }
 
-  static class OtherH2Platform extends H2Platform {
+  public static class OtherH2Platform extends H2Platform {
 
-    OtherH2Platform() {
+    public OtherH2Platform() {
       super();
       this.platform = Platform.GENERIC;
     }
diff --git a/src/test/java/org/MainMemoryLeak.java b/src/test/java/org/MainMemoryLeak.java
new file mode 100644
index 000000000..03d00622d
--- /dev/null
+++ b/src/test/java/org/MainMemoryLeak.java
@@ -0,0 +1,76 @@
+package org;
+
+import io.ebean.Ebean;
+import io.ebean.EbeanServer;
+import io.ebean.EbeanServerFactory;
+import io.ebean.Transaction;
+import io.ebean.annotation.Cache;
+import io.ebean.config.PlatformNoGeneratedKeysTest;
+import io.ebean.config.ServerConfig;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Lob;
+import java.util.Arrays;
+
+/**
+ *
+ * Test preparation:
+ *
+ * - Enable file based H2 in ebean.properties (line `datasource.h2.databaseUrl=jdbc:h2:file:~/tests`)
+ * - disable logging of io.ebean.SUM/TXN/SQL in logback-test.xml
+ * - remove existing database in ~/tests (do that before each run)
+ * - run this class with `-Xmx1g` jvm argument
+ * - an OOM in iteration ~45000 will occur (45k * 10k chars = 45k * 20k bytes = 900MB)
+ *
+ * remove the line `@Cache(enableQueryCache=true)` - and it will run forever (until disk is full)
+ */
+public class MainMemoryLeak {
+
+  @Cache(enableQueryCache=true)
+  @Entity
+  public static class ECachedBean {
+    @Id
+    private Long id;
+
+    @Lob
+    private String description;
+  }
+
+  public static void main(String[] args) {
+
+    PlatformNoGeneratedKeysTest.OtherH2Platform platform = new PlatformNoGeneratedKeysTest.OtherH2Platform();
+
+    ServerConfig config = new ServerConfig();
+
+    config.setDatabasePlatform(platform);
+    config.addClass(ECachedBean.class);
+    config.loadFromProperties();
+
+    EbeanServer server = EbeanServerFactory.create(config);
+
+    // create a string with 10k chars
+    char[] c = new char[10_000];
+    Arrays.fill(c, 'x');
+
+    try (Transaction txn = server.beginTransaction()) {
+      for (int i = 0; i < 500000; i++) {
+
+        if (i % 1000 == 0) {
+          long mem = Runtime.getRuntime().freeMemory() / 1024 / 1024;
+          if (mem > 1024) {
+            throw new IllegalStateException("-Xmx1g JVM argument expected");
+          }
+          System.out.println("Iteration: " + i + " Free mem: " + mem + " MB");
+        }
+
+        ECachedBean a = new ECachedBean();
+        a.description = new String(c);
+        server.save(a);
+      }
+      System.out.println("Success, no mem limit detected");
+      txn.commit();
+    }
+
+  }
+}
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 0e9fc7c8a..d7a9263cc 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -56,6 +56,10 @@ ebean.migration.migrationPath=dbmigration/myapp
 ## -------------------------------------------------------------
 
 
+datasource.db.username=sa
+datasource.db.password=
+datasource.db.databaseUrl=jdbc:h2:file:~/tests
+datasource.db.databaseDriver=org.h2.Driver
 
 datasource.h2.username=sa
 datasource.h2.password=
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
index ce6598fd2..35a6bd233 100644
--- a/src/test/resources/logback-test.xml
+++ b/src/test/resources/logback-test.xml
@@ -82,16 +82,16 @@
   <logger name="org.avaje.docker" level="TRACE"/>
   <!--<logger name="io.ebean.DDL" level="DEBUG"/>-->
 
-  <logger name="io.ebean.SQL" level="TRACE"/>
-  <logger name="io.ebean.TXN" level="TRACE"/>
-  <logger name="io.ebean.SUM" level="TRACE"/>
+  <!--<logger name="io.ebean.SQL" level="TRACE"/>-->
+  <!--<logger name="io.ebean.TXN" level="TRACE"/>-->
+  <!--<logger name="io.ebean.SUM" level="TRACE"/>-->
 
-  <logger name="io.ebean.cache.TABLEMOD" level="TRACE"/>
+  <!--<logger name="io.ebean.cache.TABLEMOD" level="TRACE"/>-->
 
-  <logger name="io.ebean.cache.QUERY" level="TRACE"/>
-  <logger name="io.ebean.cache.BEAN" level="TRACE"/>
-  <logger name="io.ebean.cache.NATKEY" level="TRACE"/>
-  <logger name="io.ebean.cache.COLL" level="TRACE"/>
+  <!--<logger name="io.ebean.cache.QUERY" level="TRACE"/>-->
+  <!--<logger name="io.ebean.cache.BEAN" level="TRACE"/>-->
+  <!--<logger name="io.ebean.cache.NATKEY" level="TRACE"/>-->
+  <!--<logger name="io.ebean.cache.COLL" level="TRACE"/>-->
 
   <!--<logger name="io.ebeaninternal.server.deploy" level="TRACE"/>-->
 

From 34fd24d6204c630b594f936abd8f81a568822974 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Nov 2018 00:48:02 +1300
Subject: [PATCH 0520/1036] No effective change - add back SQL logging

---
 src/test/resources/logback-test.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
index 35a6bd233..3ee1469c7 100644
--- a/src/test/resources/logback-test.xml
+++ b/src/test/resources/logback-test.xml
@@ -80,18 +80,18 @@
   <logger name="io.ebean" level="INFO"/>
 
   <logger name="org.avaje.docker" level="TRACE"/>
-  <!--<logger name="io.ebean.DDL" level="DEBUG"/>-->
+  <logger name="io.ebean.DDL" level="DEBUG"/>
 
-  <!--<logger name="io.ebean.SQL" level="TRACE"/>-->
-  <!--<logger name="io.ebean.TXN" level="TRACE"/>-->
-  <!--<logger name="io.ebean.SUM" level="TRACE"/>-->
+  <logger name="io.ebean.SQL" level="TRACE"/>
+  <logger name="io.ebean.TXN" level="TRACE"/>
+  <logger name="io.ebean.SUM" level="TRACE"/>
 
-  <!--<logger name="io.ebean.cache.TABLEMOD" level="TRACE"/>-->
+  <logger name="io.ebean.cache.TABLEMOD" level="TRACE"/>
 
-  <!--<logger name="io.ebean.cache.QUERY" level="TRACE"/>-->
-  <!--<logger name="io.ebean.cache.BEAN" level="TRACE"/>-->
-  <!--<logger name="io.ebean.cache.NATKEY" level="TRACE"/>-->
-  <!--<logger name="io.ebean.cache.COLL" level="TRACE"/>-->
+  <logger name="io.ebean.cache.QUERY" level="TRACE"/>
+  <logger name="io.ebean.cache.BEAN" level="TRACE"/>
+  <logger name="io.ebean.cache.NATKEY" level="TRACE"/>
+  <logger name="io.ebean.cache.COLL" level="TRACE"/>
 
   <!--<logger name="io.ebeaninternal.server.deploy" level="TRACE"/>-->
 

From 32b599512b8699bd95329bd2fcf8980259e16ee0 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Nov 2018 00:48:46 +1300
Subject: [PATCH 0521/1036] #1524 - @History on @OneToMany with asOf() query
 and fetch(many property) gives PersistenceException: Error with property[6]
 dt[93]data[2018-11-01 14:56:18.015][java.sql.Timestamp]

---
 .../server/deploy/BeanProperty.java           |  2 +-
 .../server/deploy/BeanPropertyAssocMany.java  |  5 ++
 .../java/org/tests/model/history/HiTOne.java  | 52 ++++++++++++++++
 .../org/tests/model/history/HiTThree.java     | 28 +++++++++
 .../java/org/tests/model/history/HiTTwo.java  | 39 ++++++++++++
 .../model/history/TestHistoryOneToMany.java   | 62 +++++++++++++++++++
 6 files changed, 187 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/org/tests/model/history/HiTOne.java
 create mode 100644 src/test/java/org/tests/model/history/HiTThree.java
 create mode 100644 src/test/java/org/tests/model/history/HiTTwo.java
 create mode 100644 src/test/java/org/tests/model/history/TestHistoryOneToMany.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 8b0650f54..231f48357 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -1285,7 +1285,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
    * Return true if this is a ManyToMany with history support (on the intersection table).
    */
   public boolean isManyToManyWithHistory() {
-    return !excludedFromHistory && descriptor.isHistorySupport();
+    return false;
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index 2058f0e56..fa7eca5ef 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -208,6 +208,11 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     }
   }
 
+  @Override
+  public boolean isManyToManyWithHistory() {
+    return manyToMany && !excludedFromHistory && descriptor.isHistorySupport();
+  }
+
   @Override
   protected void docStoreIncludeByDefault(PathProperties pathProps) {
     // by default not including "Many" properties in document store
diff --git a/src/test/java/org/tests/model/history/HiTOne.java b/src/test/java/org/tests/model/history/HiTOne.java
new file mode 100644
index 000000000..36018af05
--- /dev/null
+++ b/src/test/java/org/tests/model/history/HiTOne.java
@@ -0,0 +1,52 @@
+package org.tests.model.history;
+
+import io.ebean.annotation.History;
+import org.tests.model.draftable.BaseDomain;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.OneToMany;
+import java.util.List;
+
+@History
+@Entity
+public class HiTOne extends BaseDomain {
+
+  String name;
+
+  String comments;
+
+  @OneToMany(cascade = CascadeType.ALL)
+  List<HiTTwo> twos;
+
+  public HiTOne(String name) {
+    this.name = name;
+  }
+
+  public HiTOne() {
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getComments() {
+    return comments;
+  }
+
+  public void setComments(String comments) {
+    this.comments = comments;
+  }
+
+  public List<HiTTwo> getTwos() {
+    return twos;
+  }
+
+  public void setTwos(List<HiTTwo> twos) {
+    this.twos = twos;
+  }
+}
diff --git a/src/test/java/org/tests/model/history/HiTThree.java b/src/test/java/org/tests/model/history/HiTThree.java
new file mode 100644
index 000000000..2b7ae5473
--- /dev/null
+++ b/src/test/java/org/tests/model/history/HiTThree.java
@@ -0,0 +1,28 @@
+package org.tests.model.history;
+
+import io.ebean.annotation.History;
+import org.tests.model.draftable.BaseDomain;
+
+import javax.persistence.Entity;
+
+@History
+@Entity
+public class HiTThree extends BaseDomain {
+
+  String three;
+
+  public HiTThree(String three) {
+    this.three = three;
+  }
+
+  public HiTThree() {
+  }
+
+  public String getThree() {
+    return three;
+  }
+
+  public void setThree(String three) {
+    this.three = three;
+  }
+}
diff --git a/src/test/java/org/tests/model/history/HiTTwo.java b/src/test/java/org/tests/model/history/HiTTwo.java
new file mode 100644
index 000000000..18c2d299d
--- /dev/null
+++ b/src/test/java/org/tests/model/history/HiTTwo.java
@@ -0,0 +1,39 @@
+package org.tests.model.history;
+
+import io.ebean.annotation.History;
+import org.tests.model.draftable.BaseDomain;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.OneToMany;
+import java.util.List;
+
+@History
+@Entity
+public class HiTTwo extends BaseDomain {
+
+  String two;
+
+  @OneToMany(cascade = CascadeType.ALL)
+  List<HiTThree> threes;
+
+  public HiTTwo(String two) {
+    this.two = two;
+  }
+
+  public String getTwo() {
+    return two;
+  }
+
+  public void setTwo(String two) {
+    this.two = two;
+  }
+
+  public List<HiTThree> getThrees() {
+    return threes;
+  }
+
+  public void setThrees(List<HiTThree> threes) {
+    this.threes = threes;
+  }
+}
diff --git a/src/test/java/org/tests/model/history/TestHistoryOneToMany.java b/src/test/java/org/tests/model/history/TestHistoryOneToMany.java
new file mode 100644
index 000000000..7332b81e2
--- /dev/null
+++ b/src/test/java/org/tests/model/history/TestHistoryOneToMany.java
@@ -0,0 +1,62 @@
+package org.tests.model.history;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.sql.Timestamp;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestHistoryOneToMany extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    HiTOne one = new HiTOne("one");
+
+    HiTThree _31 = new HiTThree("3.1");
+    HiTThree _32 = new HiTThree("3.2");
+    HiTThree _33 = new HiTThree("3.3");
+    HiTThree _34 = new HiTThree("3.4");
+
+    HiTTwo _21 = new HiTTwo("2.1");
+    _21.getThrees().add(_31);
+    _21.getThrees().add(_32);
+    _21.getThrees().add(_33);
+
+    HiTTwo _22 = new HiTTwo("2.2");
+    _22.getThrees().add(_34);
+
+    one.getTwos().add(_21);
+    one.getTwos().add(_22);
+
+
+    Ebean.save(one);
+
+    LoggedSqlCollector.start();
+
+    List<HiTOne> list = Ebean.find(HiTOne.class)
+      .fetch("twos")
+      .fetch("twos.threes")
+      .where().ilike("name", "on%")
+      .setMaxRows(10)
+      .asOf(new Timestamp(System.currentTimeMillis()))
+      .findList();
+
+    List<String> sql = LoggedSqlCollector.stop();
+
+    if (isH2()) {
+      assertThat(sql).hasSize(2);
+      assertThat(sql.get(0)).contains("from hi_tone_with_history t0 where (t0.sys_period_start <= ? and (t0.sys_period_end is null or t0.sys_period_end > ?)) and lower(t0.name) like ? escape''  order by t0.id limit 10");
+      assertThat(sql.get(1)).contains("from hi_ttwo_with_history t0 left join hi_tthree_with_history t1 on t1.hi_ttwo_id = t0.id and (t1.sys_period_start <= ? and (t1.sys_period_end is null or t1.sys_period_end > ?))  where (t0.sys_period_start <= ? and (t0.sys_period_end is null or t0.sys_period_end > ?)) and (t0.hi_tone_id) in (? )  order by t0.id");
+    }
+
+    assertThat(list).hasSize(1);
+    assertThat(list.get(0).getTwos()).hasSize(2);
+    assertThat(list.get(0).getTwos().get(0).getThrees()).hasSize(3);
+
+  }
+}

From a6f9120905825476d7f1c99071f175a5b46ad614 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Nov 2018 13:31:08 +1300
Subject: [PATCH 0522/1036] #1525 - Check for presence of JAXB in classpath in
 CurrentModel (to support Java 11 without xml)

---
 .../io/ebeaninternal/dbmigration/model/CurrentModel.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java b/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
index 1b83beb4c..b3f783a0b 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
@@ -29,6 +29,8 @@ public class CurrentModel {
 
   private final boolean platformTypes;
 
+  private final boolean jaxbPresent;
+
   private ModelContainer model;
 
   private ChangeSet changeSet;
@@ -58,6 +60,7 @@ public class CurrentModel {
     this.constraintNaming = constraintNaming;
     this.maxLength = maxLength(server, constraintNaming);
     this.platformTypes = platformTypes;
+    this.jaxbPresent = server.getServerConfig().getClassLoadConfig().isJavaxJAXBPresent();
   }
 
   /**
@@ -130,7 +133,9 @@ public class CurrentModel {
       ddl.append(header).append('\n');
     }
 
-    addExtraDdl(ddl, ExtraDdlXmlReader.readBuiltin(), "-- init script ");
+    if (jaxbPresent) {
+      addExtraDdl(ddl, ExtraDdlXmlReader.readBuiltin(), "-- init script ");
+    }
 
     ddl.append(write.apply().getBuffer());
     ddl.append(write.applyForeignKeys().getBuffer());

From 1733d2382ca091e5f2b98ce7d8702ea375558561 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Nov 2018 17:20:41 +1300
Subject: [PATCH 0523/1036] Bump agent to 11.24.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index db4f48f77..754c95aba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -229,7 +229,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-agent</artifactId>
-      <version>11.11.1</version>
+      <version>11.24.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -309,7 +309,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>11.11.1</version>
+        <version>11.24.1</version>
         <executions>
           <execution>
             <id>test</id>

From 166906a814358ac3d59c29cae52aa50c87f503f0 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Nov 2018 17:22:22 +1300
Subject: [PATCH 0524/1036] [maven-release-plugin] prepare release
 ebean-11.24.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 754c95aba..16ba4881c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.24.1-SNAPSHOT</version>
+  <version>11.24.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.24.1</tag>
   </scm>
 
   <profiles>

From b87e6d90f6c125a2b3a77d4a96e34627f3feb9fb Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Nov 2018 17:22:36 +1300
Subject: [PATCH 0525/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 16ba4881c..73add8867 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.24.1</version>
+  <version>11.24.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.24.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 0f9c98964e6721b1e49f5732f1febe062260d5fa Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Thu, 1 Nov 2018 21:21:31 +0100
Subject: [PATCH 0526/1036] FIX Typos (DLL -> DDL) (#1526)

---
 .../config/dbplatform/postgres/PostgresPlatform.java      | 3 ++-
 .../java/io/ebeaninternal/dbmigration/DdlGenerator.java   | 8 ++++----
 .../io/ebeaninternal/dbmigration/DefaultDbMigration.java  | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
index fde6f7af3..80a9c40e9 100644
--- a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
@@ -136,8 +136,9 @@ public class PostgresPlatform extends DatabasePlatform {
   /**
    * Return SQL using built in partition helper functions to create some initial partitions.
    *
-   * Only use this if extra-dll doesn't have some initial partitions defined (which it should).
+   * Only use this if extra-ddl doesn't have some initial partitions defined (which it should).
    */
+  @Override
   public String tablePartitionInit(String tableName, PartitionMode mode, String property, String pkey) {
     if (property == null) {
       property = "";
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
index b8271273b..826621a4a 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
@@ -164,7 +164,7 @@ public class DdlGenerator {
       if (!"true".equalsIgnoreCase(ignoreExtraDdl) && jaxbPresent) {
         String extraApply = ExtraDdlXmlReader.buildExtra(server.getDatabasePlatform().getName(), true);
         if (extraApply != null) {
-          runScript(connection, false, extraApply, "extra-dll");
+          runScript(connection, false, extraApply, "extra-ddl");
         }
       }
 
@@ -186,13 +186,13 @@ public class DdlGenerator {
       if (currentModel.isTablePartitioning()) {
         String extraPartitioning = ExtraDdlXmlReader.buildPartitioning(server.getDatabasePlatform().getName());
         if (extraPartitioning != null && !extraPartitioning.isEmpty()) {
-          runScript(connection, false, extraPartitioning, "builtin-partitioning-dll");
+          runScript(connection, false, extraPartitioning, "builtin-partitioning-ddl");
         }
       }
 
       String extraApply = ExtraDdlXmlReader.buildExtra(server.getDatabasePlatform().getName(), false);
       if (extraApply != null) {
-        runScript(connection, false, extraApply, "extra-dll");
+        runScript(connection, false, extraApply, "extra-ddl");
       }
 
       if (currentModel.isTablePartitioning()) {
@@ -203,7 +203,7 @@ public class DdlGenerator {
 
   /**
    * Check if table partitions exist and if not create some. The expectation is that
-   * extra-dll.xml should have some partition initialisation but this helps people get going.
+   * extra-ddl.xml should have some partition initialisation but this helps people get going.
    */
   private void checkInitialTablePartitions(Connection connection) {
 
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index 2eced70a2..794d0230f 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -308,6 +308,7 @@ public class DefaultDbMigration implements DbMigration {
   /**
    * Return the versions containing pending drops.
    */
+  @Override
   public List<String> getPendingDrops() {
     if (!online) {
       DbOffline.setGenerateMigration();
@@ -335,7 +336,7 @@ public class DefaultDbMigration implements DbMigration {
   /**
    * Generate "repeatable" migration scripts.
    * <p>
-   * These take scrips from extra-dll.xml (typically views) and outputs "repeatable"
+   * These take scrips from extra-ddl.xml (typically views) and outputs "repeatable"
    * migration scripts (starting with "R__") to be run by FlywayDb or Ebean's own
    * migration runner.
    * </p>

From 13a55113182dd344067db243fd116e8f97e5e795 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Sat, 3 Nov 2018 04:23:27 +0100
Subject: [PATCH 0527/1036] FIX: disableLazyLoading was not checked correctly
 (#1528)

---
 .../io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java
index 0bc418563..c2506237a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java
@@ -54,7 +54,7 @@ class AssocOneHelpRefInherit extends AssocOneHelp {
     // for inheritance hierarchy create the correct type for this row...
     boolean disableLazyLoading = ctx.isDisableLazyLoading();
     Object ref = desc.contextRef(pc, ctx.isReadOnly(), disableLazyLoading, id);
-    if (disableLazyLoading) {
+    if (!disableLazyLoading) {
       ctx.register(property.name, ((EntityBean) ref)._ebean_getIntercept());
     }
     return ref;

From 662ffdd0709e48ff6c36a883d3ecaf823417802f Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Sat, 3 Nov 2018 04:26:21 +0100
Subject: [PATCH 0528/1036] FIX: update extra ddl also, if no migration was
 written (#1529)

---
 .../io/ebeaninternal/dbmigration/DefaultDbMigration.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index 794d0230f..2ad5ca993 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -289,6 +289,12 @@ public class DefaultDbMigration implements DbMigration {
       Request request = createRequest();
       if (platforms.isEmpty()) {
         generateExtraDdl(request.migrationDir, databasePlatform, request.isTablePartitioning());
+      } else {
+        for (Pair pair : platforms) {
+          PlatformDdlWriter platformWriter = createDdlWriter(pair.platform);
+          File subPath = platformWriter.subPath(request.migrationDir, pair.prefix);
+          generateExtraDdl(subPath, pair.platform, request.isTablePartitioning());
+        }
       }
 
       String pendingVersion = generatePendingDrop();
@@ -560,8 +566,6 @@ public class DefaultDbMigration implements DbMigration {
       PlatformDdlWriter platformWriter = createDdlWriter(pair.platform);
       File subPath = platformWriter.subPath(writePath, pair.prefix);
       platformWriter.processMigration(dbMigration, platformBuffer, subPath, fullVersion);
-
-      generateExtraDdl(subPath, pair.platform, currentModel.isTablePartitioning());
     }
   }
 

From 61eedb4e9add4ea7146682683a974101d156ecea Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Sat, 3 Nov 2018 04:38:26 +0100
Subject: [PATCH 0529/1036] Fixed tests that modify BasicData (#1530)

---
 .../io/ebean/plugin/ExpressionPathTest.java   |  7 +++++++
 .../TunedQueryWithNullFetchedBeanTest.java    |  2 ++
 .../basic/TestLazyLoadEmptyOneToMany.java     |  3 +++
 .../java/org/tests/basic/TestTransient.java   |  6 ++++++
 .../TestBatchSaveWithGetBeanId.java           |  2 ++
 .../tests/batchload/TestBasicNavOnEmpty.java  |  6 ++++++
 .../batchload/TestEmptyManyLazyLoad.java      |  3 +++
 .../batchload/TestSecondQueryNoRows.java      |  5 +++++
 .../TestCacheInterceptSaveWhenLazyLoaded.java |  9 +++++---
 .../TestDeleteByIdWithPersistenceContext.java |  3 +++
 .../org/tests/model/basic/ResetBasicData.java | 21 +++++++++++++++++++
 .../tests/query/TestQueryFindPagedList.java   |  2 +-
 .../tests/repository/TestBeanRepository.java  |  5 +++++
 .../org/tests/text/csv/TestCsvReader.java     |  4 ++--
 .../text/csv/TestCsvReaderWithCallback.java   | 14 +++++++++----
 .../text/json/TestTextJsonInsertUpdate.java   |  3 +++
 .../org/tests/update/TestUpdatePartial.java   |  7 +++++++
 17 files changed, 92 insertions(+), 10 deletions(-)

diff --git a/src/test/java/io/ebean/plugin/ExpressionPathTest.java b/src/test/java/io/ebean/plugin/ExpressionPathTest.java
index 050cdb3d4..e55598744 100644
--- a/src/test/java/io/ebean/plugin/ExpressionPathTest.java
+++ b/src/test/java/io/ebean/plugin/ExpressionPathTest.java
@@ -4,6 +4,7 @@ import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
+import org.tests.model.basic.ResetBasicData;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -80,6 +81,8 @@ public class ExpressionPathTest {
   @Test
   public void test_dirty() throws Exception {
 
+    ResetBasicData.reset();
+
     BeanType<Customer> customerBeanType = beanType(Customer.class);
     BeanType<Order> orderBeanType = beanType(Order.class);
 
@@ -113,6 +116,10 @@ public class ExpressionPathTest {
 
     order = server.find(Order.class, order.getId());
     assertThat(order.getCustomer().getName()).isEqualTo("baz");
+
+    // cleanup
+    server.delete(Order.class, order.getId());
+    server.delete(Customer.class, customer.getId());
   }
 
 }
diff --git a/src/test/java/org/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java b/src/test/java/org/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java
index b7bb545dc..4d20c866b 100644
--- a/src/test/java/org/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java
+++ b/src/test/java/org/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java
@@ -63,5 +63,7 @@ public class TunedQueryWithNullFetchedBeanTest extends BaseTestCase {
     // assert only one query executed
     List<String> loggedSql = LoggedSqlCollector.stop();
     Assert.assertEquals(1, loggedSql.size());
+
+    Ebean.delete(newCustomer);
   }
 }
diff --git a/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java b/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java
index 24f075e4d..0c8c29094 100644
--- a/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java
+++ b/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java
@@ -33,5 +33,8 @@ public class TestLazyLoadEmptyOneToMany extends BaseTestCase {
     int sz = contacts.size();
 
     Assert.assertTrue(sz == 0);
+
+    // cleanup
+    Ebean.delete(c1);
   }
 }
diff --git a/src/test/java/org/tests/basic/TestTransient.java b/src/test/java/org/tests/basic/TestTransient.java
index 0652fd5e2..e6c69752b 100644
--- a/src/test/java/org/tests/basic/TestTransient.java
+++ b/src/test/java/org/tests/basic/TestTransient.java
@@ -4,6 +4,7 @@ import io.ebean.BaseTestCase;
 import io.ebean.BeanState;
 import io.ebean.Ebean;
 import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -12,6 +13,8 @@ public class TestTransient extends BaseTestCase {
   @Test
   public void testTransient() {
 
+    ResetBasicData.reset();
+
     Customer cnew = new Customer();
     cnew.setName("testTrans");
 
@@ -58,5 +61,8 @@ public class TestTransient extends BaseTestCase {
     int rows = Ebean.createUpdate(Customer.class, updateStmt).set("id", custId).execute();
 
     Assert.assertTrue("changed name back", 1 == rows);
+
+    // cleanup
+    Ebean.delete(Customer.class, custId);
   }
 }
diff --git a/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java b/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java
index 3b3230581..2d4cfa3ea 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java
@@ -33,5 +33,7 @@ public class TestBatchSaveWithGetBeanId extends BaseTestCase {
     // insert occurs and the bean has an Id value
     Object beanId = server.getBeanId(model);
     assertNotNull(beanId);
+
+    Ebean.delete(Customer.class, beanId);
   }
 }
diff --git a/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java b/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java
index 15e765a5f..61d098ce0 100644
--- a/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java
+++ b/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java
@@ -4,6 +4,7 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -14,6 +15,8 @@ public class TestBasicNavOnEmpty extends BaseTestCase {
   @Test
   public void test() {
 
+    ResetBasicData.reset();
+
     Customer c = new Customer();
     c.setName("HelloRob");
 
@@ -23,6 +26,9 @@ public class TestBasicNavOnEmpty extends BaseTestCase {
 
     List<Contact> contacts = c.getContacts();
     Assert.assertEquals(0, contacts.size());
+
+    // cleanup
+    Ebean.delete(c);
   }
 
 }
diff --git a/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java b/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java
index 5cbc25901..825735cf8 100644
--- a/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java
+++ b/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java
@@ -26,5 +26,8 @@ public class TestEmptyManyLazyLoad extends BaseTestCase {
     Order o2 = Ebean.find(Order.class, o.getId());
     o2.getDetails().size();
 
+    // cleanup
+    Ebean.delete(o2);
+
   }
 }
diff --git a/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java b/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java
index 344d774b4..54e8d28bb 100644
--- a/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java
+++ b/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java
@@ -4,6 +4,7 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.FetchConfig;
 import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -14,6 +15,8 @@ public class TestSecondQueryNoRows extends BaseTestCase {
   @Test
   public void test() {
 
+    ResetBasicData.reset();
+
     Customer cnew = new Customer();
     cnew.setName("testSecQueryNoRows");
 
@@ -27,5 +30,7 @@ public class TestSecondQueryNoRows extends BaseTestCase {
 
     assertNotNull(c);
     assertEquals(0, c.getContacts().size());
+
+    Ebean.delete(c);
   }
 }
diff --git a/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java b/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java
index 63ada4008..5ad1e93c7 100644
--- a/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java
+++ b/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java
@@ -4,6 +4,7 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
+import org.tests.model.basic.ResetBasicData;
 import org.junit.Test;
 
 import static org.junit.Assert.assertSame;
@@ -14,6 +15,8 @@ public class TestCacheInterceptSaveWhenLazyLoaded extends BaseTestCase {
   @Test
   public void test() {
 
+    ResetBasicData.reset();
+
     Customer customer = new Customer();
     customer.setName("daCustomer");
     Ebean.save(customer);
@@ -45,12 +48,12 @@ public class TestCacheInterceptSaveWhenLazyLoaded extends BaseTestCase {
       assertSame(foundOrder, order1);
       assertTrue(Ebean.getBeanState(foundOrder).isDirty());
 
-      Ebean.delete(order1);
-      Ebean.delete(customer);
-
     } finally {
       Ebean.endTransaction();
     }
 
+    // cleanup
+    Ebean.delete(order);
+    Ebean.delete(customer);
   }
 }
diff --git a/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java b/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java
index 9e7f2a348..eb8fb6685 100644
--- a/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java
+++ b/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java
@@ -43,6 +43,9 @@ public class TestDeleteByIdWithPersistenceContext extends BaseTestCase {
 
     }
 
+    // cleanup
+    Ebean.delete(Product.class, 100);
+    Ebean.delete(Product.class, 101);
   }
 
   private Product createProduct(Integer id, String name) {
diff --git a/src/test/java/org/tests/model/basic/ResetBasicData.java b/src/test/java/org/tests/model/basic/ResetBasicData.java
index da93c3c9f..954932238 100644
--- a/src/test/java/org/tests/model/basic/ResetBasicData.java
+++ b/src/test/java/org/tests/model/basic/ResetBasicData.java
@@ -4,6 +4,8 @@ import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import org.tests.model.basic.Order.Status;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import java.sql.Date;
 import java.util.ArrayList;
 import java.util.List;
@@ -17,6 +19,25 @@ public class ResetBasicData {
   public static synchronized void reset() {
 
     if (runOnce) {
+      int cnt1 = server.find(Customer.class).findCount();
+      int cnt2 = server.find(Order.class).findCount();
+      int cnt3 = server.find(Country.class).findCount();
+      int cnt4 = server.find(Product.class).findCount();
+      if (cnt1 == 4 && cnt2 == 5 && cnt3 == 2 && cnt4 == 4) {
+        // OK, test data not modified
+      } else {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Customers:");
+        server.find(Customer.class).findEach(c -> sb.append(' ').append(c.getId()));
+        sb.append(", Orders:");
+        server.find(Order.class).findEach(c -> sb.append(' ').append(c.getId()));
+        sb.append(", Countries:");
+        server.find(Country.class).findEach(c -> sb.append(' ').append(c.getCode()));
+        sb.append(", Products:");
+        server.find(Product.class).findEach(c -> sb.append(' ').append(c.getId()));
+        System.err.println("WARNING: basic test data was modified. Current content:");
+        System.err.println(sb.toString());
+      }
       return;
     }
 
diff --git a/src/test/java/org/tests/query/TestQueryFindPagedList.java b/src/test/java/org/tests/query/TestQueryFindPagedList.java
index 094e16df5..97775405a 100644
--- a/src/test/java/org/tests/query/TestQueryFindPagedList.java
+++ b/src/test/java/org/tests/query/TestQueryFindPagedList.java
@@ -194,7 +194,7 @@ public class TestQueryFindPagedList extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    PagedList<Order> pagedList = Ebean.find(Order.class).setMaxRows(6).findPagedList();
+    PagedList<Order> pagedList = Ebean.find(Order.class).setMaxRows(3).findPagedList();
 
     LoggedSqlCollector.start();
 
diff --git a/src/test/java/org/tests/repository/TestBeanRepository.java b/src/test/java/org/tests/repository/TestBeanRepository.java
index 3bc791aac..3649dccc5 100644
--- a/src/test/java/org/tests/repository/TestBeanRepository.java
+++ b/src/test/java/org/tests/repository/TestBeanRepository.java
@@ -3,6 +3,7 @@ package org.tests.repository;
 import io.ebean.BaseTestCase;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -15,6 +16,8 @@ public class TestBeanRepository extends BaseTestCase {
   @Test
   public void test() {
 
+    ResetBasicData.reset();
+
     CustomerRepository repository = new CustomerRepository(server());
 
     Customer customer = new Customer();
@@ -48,6 +51,8 @@ public class TestBeanRepository extends BaseTestCase {
   @Test
   public void findByName() {
 
+    ResetBasicData.reset();
+
     CustomerRepository repository = new CustomerRepository(server());
 
     Customer blah = new Customer();
diff --git a/src/test/java/org/tests/text/csv/TestCsvReader.java b/src/test/java/org/tests/text/csv/TestCsvReader.java
index 624d42128..de4a0d4c5 100644
--- a/src/test/java/org/tests/text/csv/TestCsvReader.java
+++ b/src/test/java/org/tests/text/csv/TestCsvReader.java
@@ -1,7 +1,7 @@
 package org.tests.text.csv;
 
-import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.TransactionalTestCase;
 import io.ebean.text.csv.CsvReader;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
@@ -12,7 +12,7 @@ import java.io.FileReader;
 import java.net.URL;
 import java.util.Locale;
 
-public class TestCsvReader extends BaseTestCase {
+public class TestCsvReader extends TransactionalTestCase {
 
   @Test
   public void test() {
diff --git a/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java b/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java
index 15cb47d67..4ead0767a 100644
--- a/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java
+++ b/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java
@@ -1,26 +1,26 @@
 package org.tests.text.csv;
 
-import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.EbeanServer;
+import io.ebean.TransactionalTestCase;
 import io.ebean.text.csv.CsvReader;
 import io.ebean.text.csv.DefaultCsvCallback;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
 import org.junit.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import java.io.File;
 import java.io.FileReader;
 import java.net.URL;
 import java.util.Locale;
 
-public class TestCsvReaderWithCallback extends BaseTestCase {
+public class TestCsvReaderWithCallback extends TransactionalTestCase {
 
   @Test
   public void test() throws Throwable {
 
-    ResetBasicData.reset();
-
     URL resource = TestCsvReaderWithCallback.class.getResource("/test1.csv");
     File f = new File(resource.getFile());
 
@@ -43,6 +43,8 @@ public class TestCsvReaderWithCallback extends BaseTestCase {
     // processor.addReference("billingAddress.country.code");
     csvReader.addProperty("billingAddress.country.code");
 
+    int before = Ebean.find(Customer.class).findCount();
+
     csvReader.process(reader, new DefaultCsvCallback<Customer>() {
 
       @Override
@@ -50,10 +52,14 @@ public class TestCsvReaderWithCallback extends BaseTestCase {
 
         server.save(cust.getBillingAddress(), transaction);
         server.save(cust, transaction);
+
       }
 
     });
 
+    int after = Ebean.find(Customer.class).findCount();
+    assertThat(after).isEqualTo(before + 9);
+
   }
 
 }
diff --git a/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java b/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java
index 8f5b7de1f..06bfc9c11 100644
--- a/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java
+++ b/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java
@@ -36,5 +36,8 @@ public class TestTextJsonInsertUpdate extends BaseTestCase {
     Customer c2 = jsonContext.toBean(Customer.class, j2);
     Ebean.update(c2);
 
+    // cleanup
+    Ebean.delete(Customer.class, c0.getId());
+
   }
 }
diff --git a/src/test/java/org/tests/update/TestUpdatePartial.java b/src/test/java/org/tests/update/TestUpdatePartial.java
index 091e10a1c..48624e35a 100644
--- a/src/test/java/org/tests/update/TestUpdatePartial.java
+++ b/src/test/java/org/tests/update/TestUpdatePartial.java
@@ -46,6 +46,9 @@ public class TestUpdatePartial extends BaseTestCase {
 
     Ebean.save(c3);
     checkDbStatusValue(c.getId(), "N");
+
+    // cleanup
+    Ebean.delete(Customer.class, c.getId());
   }
 
   private void checkDbStatusValue(Integer custId, String dbStatus) {
@@ -71,5 +74,9 @@ public class TestUpdatePartial extends BaseTestCase {
     Ebean.save(customerWithoutChanges);
 
     assertThat(customerWithoutChanges.getUpdtime()).isEqualToIgnoringMillis(customer.getUpdtime());
+
+    // cleanup
+    Ebean.delete(customerWithoutChanges);
+
   }
 }

From 808004165c2236464b0a7c89a30f1db04856dc45 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Sat, 10 Nov 2018 08:07:01 +0100
Subject: [PATCH 0530/1036] Code cleanup (#1534)

* removed unused imports (no code change)

* Add missing @Override / @SupressWarnings (no code change)

* FIX: serialization warnings

* FIX: Access to static member
---
 src/main/java/io/ebean/EbeanServer.java       |  4 ----
 .../java/io/ebean/MergeOptionsBuilder.java    |  1 +
 src/main/java/io/ebean/Model.java             |  1 -
 .../config/BeanNotEnhancedException.java      |  2 ++
 .../config/BeanNotRegisteredException.java    |  2 ++
 .../io/ebeaninternal/api/SpiDtoQuery.java     |  1 +
 .../io/ebeaninternal/api/SpiTransaction.java  |  1 -
 .../api/SpiTransactionProxy.java              |  1 -
 .../ddlgeneration/platform/BaseTableDdl.java  |  2 +-
 .../dbmigration/model/MTable.java             |  1 -
 .../server/cache/DefaultServerQueryCache.java |  1 +
 .../server/cluster/ClusterManager.java        |  1 +
 .../server/core/AbstractSqlQueryRequest.java  |  1 -
 .../server/core/DefaultSqlUpdate.java         |  1 +
 .../server/deploy/BaseCollectionHelp.java     |  1 +
 .../server/deploy/BeanCollectionHelp.java     |  2 ++
 .../server/deploy/BeanDescriptor.java         | 11 +++++++++
 .../deploy/BeanDescriptorElementEmbedded.java |  1 +
 .../deploy/BeanDescriptorElementScalar.java   |  1 +
 .../server/deploy/BeanDescriptorManager.java  |  1 -
 .../deploy/BeanEmbeddedMetaFactory.java       |  1 -
 .../server/deploy/BeanPropertyAssoc.java      |  1 +
 .../server/deploy/BeanPropertyAssocMany.java  |  5 ++++
 .../server/deploy/ElementEntityBean.java      |  2 ++
 .../expression/DefaultExpressionList.java     |  1 +
 .../server/persist/ExeCallableSql.java        |  1 -
 .../persist/MergeNodeAssocManyToMany.java     |  1 +
 .../server/persist/MergeNodeAssocOne.java     |  1 +
 .../persist/MergeNodeAssocOneToMany.java      |  2 +-
 .../server/query/DefaultOrmQueryEngine.java   |  2 --
 .../server/query/SqlTreeNodeManyRoot.java     |  1 -
 .../server/querydefn/DefaultDtoQuery.java     |  1 +
 .../server/transaction/BeanPersistIdMap.java  |  1 -
 .../ImplicitReadOnlyTransaction.java          |  1 -
 .../server/transaction/NoTransaction.java     |  1 -
 .../platform/PlatformDdl_AlterColumnTest.java | 23 +++++++++----------
 .../server/grammer/EqlParserTest.java         |  8 +++----
 .../server/type/TypeReflectHelperTest.java    |  4 ++++
 src/test/java/org/MainMemoryLeak.java         |  1 -
 .../org/tests/changelog/TestChangeLog.java    |  3 ---
 .../cache/TestInheritanceRefCache.java        |  1 -
 .../org/tests/model/basic/ResetBasicData.java |  2 --
 .../TestElementCollectionBasicMap.java        |  1 -
 ...estElementCollectionEmbeddedListCache.java |  1 -
 .../tests/model/uuidsibling/USibChild.java    |  4 +++-
 .../model/uuidsibling/USibChildSibling.java   |  5 +++-
 .../tests/model/uuidsibling/USibParent.java   |  4 +++-
 .../o2m/jointable/TestOneToManyJoinTable.java |  2 --
 .../other/TestFindWhereUsingEnumerated.java   |  1 -
 .../text/csv/TestCsvReaderWithCallback.java   |  1 -
 50 files changed, 67 insertions(+), 53 deletions(-)

diff --git a/src/main/java/io/ebean/EbeanServer.java b/src/main/java/io/ebean/EbeanServer.java
index e8d252ec0..aad3eb6d9 100644
--- a/src/main/java/io/ebean/EbeanServer.java
+++ b/src/main/java/io/ebean/EbeanServer.java
@@ -11,17 +11,13 @@ import io.ebean.text.json.JsonContext;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.persistence.NonUniqueResultException;
 import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.Callable;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
 
 /**
  * Provides the API for fetching and saving beans to a particular DataSource.
diff --git a/src/main/java/io/ebean/MergeOptionsBuilder.java b/src/main/java/io/ebean/MergeOptionsBuilder.java
index 7193c681c..98173ed8d 100644
--- a/src/main/java/io/ebean/MergeOptionsBuilder.java
+++ b/src/main/java/io/ebean/MergeOptionsBuilder.java
@@ -78,6 +78,7 @@ public class MergeOptionsBuilder {
       this.deletePermanent = deletePermanent;
     }
 
+    @Override
     public Set<String> paths() {
       return paths;
     }
diff --git a/src/main/java/io/ebean/Model.java b/src/main/java/io/ebean/Model.java
index b17d03ac3..f00409aa6 100644
--- a/src/main/java/io/ebean/Model.java
+++ b/src/main/java/io/ebean/Model.java
@@ -2,7 +2,6 @@ package io.ebean;
 
 import io.ebean.bean.EntityBean;
 
-import javax.persistence.MappedSuperclass;
 
 /**
  * A MappedSuperclass base class that provides convenience methods for inserting, updating and
diff --git a/src/main/java/io/ebean/config/BeanNotEnhancedException.java b/src/main/java/io/ebean/config/BeanNotEnhancedException.java
index 67ff285da..21e1a5b1a 100644
--- a/src/main/java/io/ebean/config/BeanNotEnhancedException.java
+++ b/src/main/java/io/ebean/config/BeanNotEnhancedException.java
@@ -7,6 +7,8 @@ package io.ebean.config;
  */
 public class BeanNotEnhancedException extends IllegalStateException {
 
+  private static final long serialVersionUID = 3008101919425876799L;
+
   public BeanNotEnhancedException(String msg) {
     super(msg);
   }
diff --git a/src/main/java/io/ebean/config/BeanNotRegisteredException.java b/src/main/java/io/ebean/config/BeanNotRegisteredException.java
index 29212c24b..840482d59 100644
--- a/src/main/java/io/ebean/config/BeanNotRegisteredException.java
+++ b/src/main/java/io/ebean/config/BeanNotRegisteredException.java
@@ -7,6 +7,8 @@ package io.ebean.config;
  */
 public class BeanNotRegisteredException extends IllegalStateException {
 
+  private static final long serialVersionUID = -1411298126011136552L;
+
   public BeanNotRegisteredException(String msg) {
     super(msg);
   }
diff --git a/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java b/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java
index c7d3e4f88..3ba088c58 100644
--- a/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java
+++ b/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java
@@ -37,6 +37,7 @@ public interface SpiDtoQuery<T> extends DtoQuery<T>, SpiSqlBinding {
   /**
    * Return the label for the query.
    */
+  @Override
   String getLabel();
 
   /**
diff --git a/src/main/java/io/ebeaninternal/api/SpiTransaction.java b/src/main/java/io/ebeaninternal/api/SpiTransaction.java
index e362e1e9e..fc89b85f3 100644
--- a/src/main/java/io/ebeaninternal/api/SpiTransaction.java
+++ b/src/main/java/io/ebeaninternal/api/SpiTransaction.java
@@ -7,7 +7,6 @@ import io.ebean.bean.PersistenceContext;
 import io.ebean.event.changelog.BeanChange;
 import io.ebean.event.changelog.ChangeSet;
 import io.ebeaninternal.server.core.PersistDeferredRelationship;
-import io.ebeaninternal.server.core.PersistRequest;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeaninternal.server.transaction.ProfileStream;
diff --git a/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java b/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
index c84f7bc2e..1aab60ad7 100644
--- a/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
+++ b/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
@@ -8,7 +8,6 @@ import io.ebean.bean.PersistenceContext;
 import io.ebean.event.changelog.BeanChange;
 import io.ebean.event.changelog.ChangeSet;
 import io.ebeaninternal.server.core.PersistDeferredRelationship;
-import io.ebeaninternal.server.core.PersistRequest;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeaninternal.server.transaction.ProfileStream;
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
index 2a46f83a0..859c73399 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
@@ -909,7 +909,7 @@ public class BaseTableDdl implements TableDdl {
     if (hasValue(ddl)) {
       writer.apply().append(ddl).endOfStatement();
 
-      if (isTrue(alter.isWithHistory()) && alter.getType() != null && historySupport == historySupport.TRIGGER_BASED) {
+      if (isTrue(alter.isWithHistory()) && alter.getType() != null && historySupport == HistorySupport.TRIGGER_BASED) {
         // mysql and sql server column type change allowing nulls in the history table column
         regenerateHistoryTriggers(alter.getTableName(), HistoryTableUpdate.Change.ALTER, alter.getColumnName());
         AlterColumn alterHistoryColumn = new AlterColumn();
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
index 3e3c5fa1a..2a6b0a8b3 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.dbmigration.model;
 
-import io.ebean.annotation.PartitionMode;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.DdlHelp;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.SplitColumns;
 import io.ebeaninternal.dbmigration.migration.AddColumn;
diff --git a/src/main/java/io/ebeaninternal/server/cache/DefaultServerQueryCache.java b/src/main/java/io/ebeaninternal/server/cache/DefaultServerQueryCache.java
index 85f4b22ca..afbdb37f7 100644
--- a/src/main/java/io/ebeaninternal/server/cache/DefaultServerQueryCache.java
+++ b/src/main/java/io/ebeaninternal/server/cache/DefaultServerQueryCache.java
@@ -19,6 +19,7 @@ public class DefaultServerQueryCache extends DefaultServerCache {
     this.queryCacheEntryValidate = config.getQueryCacheEntryValidate();
   }
 
+  @Override
   protected Object unwrapEntry(CacheEntry entry) {
     return ((QueryCacheEntry) entry.getValue()).getValue();
   }
diff --git a/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java b/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java
index bffc93a10..2e5df2d3f 100644
--- a/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java
+++ b/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java
@@ -59,6 +59,7 @@ public class ClusterManager implements ServerLookup {
     }
   }
 
+  @Override
   public EbeanServer getServer(String name) {
     synchronized (monitor) {
       return serverMap.get(name);
diff --git a/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
index d827d5dcf..e0980c537 100644
--- a/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
@@ -11,7 +11,6 @@ import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.lib.util.Str;
 import io.ebeaninternal.server.persist.Binder;
 import io.ebeaninternal.server.persist.TrimLogSql;
-import io.ebeaninternal.server.transaction.TransactionManager;
 import io.ebeaninternal.server.util.BindParamsParser;
 
 import java.sql.Connection;
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java b/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
index 4ea9a06b0..9af2f2af4 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
@@ -239,6 +239,7 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
     return this;
   }
 
+  @Override
   public SqlUpdate setNextParameter(Object value) {
     setParameter(++addPos, value);
     return this;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java
index 576d9a12b..60ce3510b 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java
@@ -42,6 +42,7 @@ abstract class BaseCollectionHelp<T> implements BeanCollectionHelp<T> {
     }
   }
 
+  @SuppressWarnings("rawtypes")
   @Override
   public Collection underlying(Object value) {
     if (value instanceof BeanCollection) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java
index 308284040..9fda096aa 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java
@@ -39,6 +39,7 @@ public interface BeanCollectionHelp<T> extends CQueryCollectionAdd<T> {
   /**
    * Create an empty collection of the correct type without a parent bean.
    */
+  @Override
   BeanCollection<T> createEmptyNoParent();
 
   /**
@@ -49,6 +50,7 @@ public interface BeanCollectionHelp<T> extends CQueryCollectionAdd<T> {
   /**
    * Add a bean to the List Set or Map.
    */
+  @Override
   void add(BeanCollection<?> collection, EntityBean bean, boolean withCheck);
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 2ca824f98..60f0ab854 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -1834,6 +1834,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Return the IdBinder which is helpful for handling the various types of Id.
    */
+  @Override
   public IdBinder getIdBinder() {
     return idBinder;
   }
@@ -1942,6 +1943,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Creates a new entity bean without invoking {@link BeanPostConstructListener#postCreate(Object)}
    */
+  @Override
   public EntityBean createEntityBean() {
     return createEntityBean(false);
   }
@@ -2212,6 +2214,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Put the bean into the persistence context if it is absent.
    */
+  @Override
   public Object contextPutIfAbsent(PersistenceContext pc, Object id, EntityBean localBean) {
     return pc.putIfAbsent(rootBeanType, id, localBean);
   }
@@ -2638,6 +2641,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return autoTunable;
   }
 
+  @Override
   public boolean isElementType() {
     return false;
   }
@@ -2646,6 +2650,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * Returns the Inheritance mapping information. This will be null if this type
    * of bean is not involved in any ORM inheritance mapping.
    */
+  @Override
   public InheritInfo getInheritInfo() {
     return inheritInfo;
   }
@@ -2814,6 +2819,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Returns true if this bean is based on RawSql.
    */
+  @Override
   public boolean isRawSqlBased() {
     return EntityType.SQL == entityType;
   }
@@ -2868,6 +2874,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Return the base table to use given the query temporal mode.
    */
+  @Override
   public String getBaseTable(SpiQuery.TemporalMode mode) {
     switch (mode) {
       case DRAFT:
@@ -2895,6 +2902,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return readAuditing;
   }
 
+  @Override
   public boolean isSoftDelete() {
     return softDelete;
   }
@@ -2907,6 +2915,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return softDeleteProperty.getSoftDeleteDbSet();
   }
 
+  @Override
   public String getSoftDeletePredicate(String tableAlias) {
     return softDeleteProperty.getSoftDeleteDbPredicate(tableAlias);
   }
@@ -2979,6 +2988,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * Set the draft to true for this entity bean instance.
    * This bean is being loaded via asDraft() query.
    */
+  @Override
   public void setDraft(EntityBean entityBean) {
     if (draft != null) {
       draft.setValue(entityBean, true);
@@ -3032,6 +3042,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Return true if this entity bean has history support.
    */
+  @Override
   public boolean isHistorySupport() {
     return historySupport;
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java
index 6d24e4569..44328c081 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java
@@ -46,6 +46,7 @@ class BeanDescriptorElementEmbedded<T> extends BeanDescriptorElement<T> {
     return (EntityBean)prototype._ebean_newInstance();
   }
 
+  @Override
   public void bindElementValue(SqlUpdate insert, Object value) {
     targetDescriptor.bindElementValue(insert, value);
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalar.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalar.java
index 236d664d3..715bde03b 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalar.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalar.java
@@ -24,6 +24,7 @@ class BeanDescriptorElementScalar<T> extends BeanDescriptorElement<T> {
     this.scalarType = firstBaseScalarType();
   }
 
+  @Override
   public void bindElementValue(SqlUpdate insert, Object value) {
     insert.setNextParameter(value);
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index b836faeba..0abaf7a06 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -1014,7 +1014,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * into the order_id column on the order_lines table).
    * </p>
    */
-  @SuppressWarnings({"unchecked", "rawtypes"})
   private void makeUnidirectional(DeployBeanPropertyAssocMany<?> oneToMany) {
 
     DeployBeanDescriptor<?> targetDesc = getTargetDescriptor(oneToMany);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java b/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java
index 016a760e4..d4f4cd4a5 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java
@@ -3,7 +3,6 @@ package io.ebeaninternal.server.deploy;
 import io.ebean.config.BeanNotRegisteredException;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
 
-import javax.persistence.PersistenceException;
 import java.util.Map;
 
 /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
index be940861b..f24d71346 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
@@ -292,6 +292,7 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
    * Return an extra clause to add to the query for loading or joining
    * to this bean type.
    */
+  @Override
   public String getExtraWhere() {
     return extraWhere;
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index fa7eca5ef..bfba8ed9d 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -255,6 +255,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   /**
    * Add the bean to the appropriate collection on the parent bean.
    */
+  @Override
   public void addBeanToCollectionWithCreate(EntityBean parentBean, EntityBean detailBean, boolean withCheck) {
     BeanCollection<?> bc = (BeanCollection<?>) super.getValue(parentBean);
     if (bc == null) {
@@ -538,6 +539,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   /**
    * Return true if this is many to many.
    */
+  @Override
   public boolean hasJoinTable() {
     return manyToMany || o2mJoinTable;
   }
@@ -563,6 +565,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   /**
    * ManyToMany only, join from local table to intersection table.
    */
+  @Override
   public TableJoin getIntersectionTableJoin() {
     return intersectionJoin;
   }
@@ -606,6 +609,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     return mapKey;
   }
 
+  @Override
   public BeanCollection<?> createReferenceIfNull(EntityBean parentBean) {
 
     Object v = getValue(parentBean);
@@ -638,6 +642,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     return descriptor.getId(parentBean);
   }
 
+  @Override
   public void addSelectExported(DbSqlContext ctx, String tableAlias) {
 
     String alias = hasJoinTable() ? "int_" : tableAlias;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ElementEntityBean.java b/src/main/java/io/ebeaninternal/server/deploy/ElementEntityBean.java
index 3724cac99..53b1e69b1 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ElementEntityBean.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ElementEntityBean.java
@@ -5,6 +5,8 @@ import io.ebean.bean.EntityBeanIntercept;
 
 class ElementEntityBean implements EntityBean {
 
+  private static final long serialVersionUID = 8742536671024715601L;
+
   private final String[] properties;
 
   private Object[] data;
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 76211069b..746a1f0a7 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -517,6 +517,7 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return query.setUseQueryCache(useCache);
   }
 
+  @Override
   public Query<T> setCountDistinct(CountDistinctOrder orderBy) {
     return query.setCountDistinct(orderBy);
   }
diff --git a/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java b/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java
index b48d2d2cf..39698726a 100644
--- a/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java
+++ b/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java
@@ -7,7 +7,6 @@ import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.core.PersistRequestCallableSql;
 import io.ebeaninternal.server.util.BindParamsParser;
 
-import javax.persistence.PersistenceException;
 import java.sql.CallableStatement;
 import java.sql.SQLException;
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java b/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java
index 043b735cc..4516cefd4 100644
--- a/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java
+++ b/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java
@@ -24,6 +24,7 @@ class MergeNodeAssocManyToMany extends MergeNode {
     this.many = property;
   }
 
+  @Override
   public void merge(MergeRequest request) {
 
     EntityBean parentBean = request.getBean();
diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOne.java b/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOne.java
index b33c393c5..90f44e07f 100644
--- a/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOne.java
@@ -17,6 +17,7 @@ class MergeNodeAssocOne extends MergeNode {
     this.one = property;
   }
 
+  @Override
   public void merge(MergeRequest request) {
 
     EntityBean entityBean = getEntityBean(request.getBean());
diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOneToMany.java b/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOneToMany.java
index 4c894cd0f..a75ea26fb 100644
--- a/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOneToMany.java
+++ b/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOneToMany.java
@@ -4,7 +4,6 @@ import io.ebean.bean.EntityBean;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -19,6 +18,7 @@ class MergeNodeAssocOneToMany extends MergeNode {
     this.many = property;
   }
 
+  @Override
   public void merge(MergeRequest request) {
 
     Collection beans = many.getRawCollection(request.getBean());
diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java
index d72a2f688..74c42a1d5 100644
--- a/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java
@@ -15,9 +15,7 @@ import io.ebeaninternal.server.persist.Binder;
 
 import javax.persistence.PersistenceException;
 import java.sql.SQLException;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 
 /**
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
index ec8f6aa47..edeff9fce 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
@@ -7,7 +7,6 @@ import io.ebeaninternal.server.deploy.DbSqlContext;
 
 import java.sql.SQLException;
 import java.util.List;
-import java.util.Set;
 
 final class SqlTreeNodeManyRoot extends SqlTreeNodeBean {
 
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
index 3c7049fe2..1f97fdb12 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
@@ -139,6 +139,7 @@ public class DefaultDtoQuery<T> implements SpiDtoQuery<T> {
     return descriptor.getType();
   }
 
+  @Override
   public SpiQuery<?> getOrmQuery() {
     return ormQuery;
   }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIdMap.java b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIdMap.java
index 0bcbcb381..8274af4bb 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIdMap.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIdMap.java
@@ -3,7 +3,6 @@ package io.ebeaninternal.server.transaction;
 import io.ebeaninternal.server.core.PersistRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 
-import java.io.Serializable;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
index 8bca03fc9..619574cd4 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
@@ -12,7 +12,6 @@ import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.api.TransactionEvent;
 import io.ebeaninternal.api.TxnProfileEventCodes;
 import io.ebeaninternal.server.core.PersistDeferredRelationship;
-import io.ebeaninternal.server.core.PersistRequest;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeanservice.docstore.api.DocStoreTransaction;
diff --git a/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
index 31bf1ca30..0f331d9ab 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
@@ -11,7 +11,6 @@ import io.ebeaninternal.api.SpiProfileTransactionEvent;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.api.TransactionEvent;
 import io.ebeaninternal.server.core.PersistDeferredRelationship;
-import io.ebeaninternal.server.core.PersistRequest;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeanservice.docstore.api.DocStoreTransaction;
diff --git a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
index 7d5279990..b8ecef82e 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
@@ -17,7 +17,6 @@ import org.junit.Test;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 public class PlatformDdl_AlterColumnTest {
@@ -67,7 +66,7 @@ public class PlatformDdl_AlterColumnTest {
     assertThat(pgDdl.convertArrayType("varchar[]")).isEqualTo("varchar[]");
     assertThat(pgDdl.convertArrayType("integer[]")).isEqualTo("integer[]");
   }
-  
+
   @Test
   public void convertArrayType_hana() {
     assertThat(hanaDdl.convertArrayType("varchar[](90)")).isEqualTo("nvarchar(255) array(90)");
@@ -89,14 +88,14 @@ public class PlatformDdl_AlterColumnTest {
 
     sql = sqlServerDdl.alterColumnBaseAttributes(alterColumn);
     assertEquals("alter table mytab alter column acol nvarchar(5) not null", sql);
-    
+
     sql = hanaDdl.alterColumnBaseAttributes(alterColumn);
     assertEquals("alter table mytab alter ( acol nvarchar(5) not null)", sql);
 
     alterColumn.setNotnull(Boolean.FALSE);
     sql = mysqlDdl.alterColumnBaseAttributes(alterColumn);
     assertEquals("alter table mytab modify acol varchar(5)", sql);
-    
+
     sql = hanaDdl.alterColumnBaseAttributes(alterColumn);
     assertEquals("alter table mytab alter ( acol nvarchar(5))", sql);
 
@@ -105,14 +104,14 @@ public class PlatformDdl_AlterColumnTest {
 
     sql = mysqlDdl.alterColumnBaseAttributes(alterColumn);
     assertEquals("alter table mytab modify acol varchar(100)", sql);
-    
+
     sql = hanaDdl.alterColumnBaseAttributes(alterColumn);
     assertEquals("alter table mytab alter ( acol nvarchar(100))", sql);
 
     alterColumn.setCurrentNotnull(Boolean.TRUE);
     sql = mysqlDdl.alterColumnBaseAttributes(alterColumn);
     assertEquals("alter table mytab modify acol varchar(100) not null", sql);
-    
+
     sql = hanaDdl.alterColumnBaseAttributes(alterColumn);
     assertEquals("alter table mytab alter ( acol nvarchar(100) not null)", sql);
   }
@@ -134,7 +133,7 @@ public class PlatformDdl_AlterColumnTest {
 
     sql = sqlServerDdl.alterColumnType("mytab", "acol", "varchar(20)");
     assertNull(sql);
-    
+
     sql = hanaDdl.alterColumnType("mytab", "acol", "varchar(20)");
     assertNull(sql);
   }
@@ -156,7 +155,7 @@ public class PlatformDdl_AlterColumnTest {
 
     sql = sqlServerDdl.alterColumnNotnull("mytab", "acol", true);
     assertNull(sql);
-    
+
     sql = hanaDdl.alterColumnNotnull("mytab", "acol", true);
     assertNull(sql);
   }
@@ -178,7 +177,7 @@ public class PlatformDdl_AlterColumnTest {
 
     sql = sqlServerDdl.alterColumnNotnull("mytab", "acol", false);
     assertNull(sql);
-    
+
     sql = hanaDdl.alterColumnNotnull("mytab", "acol", false);
     assertNull(sql);
   }
@@ -200,7 +199,7 @@ public class PlatformDdl_AlterColumnTest {
 
     sql = sqlServerDdl.alterColumnDefaultValue("mytab", "acol", "'hi'");
     assertEquals("alter table mytab add default 'hi' for acol", sql);
-    
+
     boolean exceptionCaught = false;
     try {
       hanaDdl.alterColumnDefaultValue("mytab", "acol", "'hi'");
@@ -228,7 +227,7 @@ public class PlatformDdl_AlterColumnTest {
 
     sql = sqlServerDdl.alterColumnDefaultValue("mytab", "acol", "DROP DEFAULT");
     assertEquals("EXEC usp_ebean_drop_default_constraint mytab, acol", sql);
-    
+
     boolean exceptionCaught = false;
     try {
       hanaDdl.alterColumnDefaultValue("mytab", "acol", "DROP DEFAULT");
@@ -277,7 +276,7 @@ public class PlatformDdl_AlterColumnTest {
     assertEquals(oraDdl.useIdentityType(IdentityType.GENERATOR), IdType.GENERATOR);
     assertEquals(oraDdl.useIdentityType(IdentityType.EXTERNAL), IdType.EXTERNAL);
   }
-  
+
   @Test
   public void useIdentityType_hana() {
 
diff --git a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
index ccf3aab1f..2ccb97ce5 100644
--- a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
@@ -14,8 +14,6 @@ import org.tests.model.basic.ResetBasicData;
 import java.util.Arrays;
 import java.util.List;
 
-import javax.xml.ws.RequestWrapper;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class EqlParserTest extends BaseTestCase {
@@ -140,7 +138,7 @@ public class EqlParserTest extends BaseTestCase {
 
     assertThat(query.getGeneratedSql()).contains("where (t0.name = ?  or (t0.status = ?  and t0.smallnote is null ) )");
   }
-  
+
   @Test
   @ForPlatform(Platform.HANA)
   public void where_or1_hana() {
@@ -160,7 +158,7 @@ public class EqlParserTest extends BaseTestCase {
 
     assertThat(query.getGeneratedSql()).contains("where ((t0.name = ?  or t0.status = ? )  and t0.smallnote is null )");
   }
-  
+
   @Test
   @ForPlatform(Platform.HANA)
   public void where_or2_hana() {
@@ -187,7 +185,7 @@ public class EqlParserTest extends BaseTestCase {
     query.findList();
     assertThat(query.getGeneratedSql()).contains("where not (t0.name = ?  and t0.status = ? )");
   }
-  
+
   @Test
   @ForPlatform(Platform.HANA)
   public void test_simplifyExpressions_hana() {
diff --git a/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java b/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java
index 8ba6d612f..aed4f42ee 100644
--- a/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java
@@ -109,7 +109,11 @@ public class TypeReflectHelperTest {
 
   private static class Some {
 
+    // note: values are accessed via reflection
+    @SuppressWarnings("unused")
     List<? extends Order.Status> wildOrderStatus = new ArrayList<>();
+
+    @SuppressWarnings("unused")
     List<Order.Status> orderStatus = new ArrayList<>();
   }
 
diff --git a/src/test/java/org/MainMemoryLeak.java b/src/test/java/org/MainMemoryLeak.java
index 03d00622d..fe840df87 100644
--- a/src/test/java/org/MainMemoryLeak.java
+++ b/src/test/java/org/MainMemoryLeak.java
@@ -1,6 +1,5 @@
 package org;
 
-import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import io.ebean.EbeanServerFactory;
 import io.ebean.Transaction;
diff --git a/src/test/java/org/tests/changelog/TestChangeLog.java b/src/test/java/org/tests/changelog/TestChangeLog.java
index 9b906a8fd..f430c2769 100644
--- a/src/test/java/org/tests/changelog/TestChangeLog.java
+++ b/src/test/java/org/tests/changelog/TestChangeLog.java
@@ -23,9 +23,6 @@ import org.junit.Test;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class TestChangeLog extends BaseTestCase {
 
   TDChangeLogPrepare changeLogPrepare = new TDChangeLogPrepare();
diff --git a/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java b/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java
index 3314a5dde..5b7f37d06 100644
--- a/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java
+++ b/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java
@@ -9,7 +9,6 @@ import org.tests.model.basic.cache.CInhTwo;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/test/java/org/tests/model/basic/ResetBasicData.java b/src/test/java/org/tests/model/basic/ResetBasicData.java
index 954932238..4248977c4 100644
--- a/src/test/java/org/tests/model/basic/ResetBasicData.java
+++ b/src/test/java/org/tests/model/basic/ResetBasicData.java
@@ -4,8 +4,6 @@ import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import org.tests.model.basic.Order.Status;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import java.sql.Date;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
index 3ae0ddb19..baf2f6d86 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
@@ -2,7 +2,6 @@ package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
-import io.ebean.annotation.PersistBatch;
 
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java
index cd236e4eb..b885fe488 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java
@@ -2,7 +2,6 @@ package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
-import io.ebean.annotation.PersistBatch;
 
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
diff --git a/src/test/java/org/tests/model/uuidsibling/USibChild.java b/src/test/java/org/tests/model/uuidsibling/USibChild.java
index b2ff59e42..47edd9fc1 100644
--- a/src/test/java/org/tests/model/uuidsibling/USibChild.java
+++ b/src/test/java/org/tests/model/uuidsibling/USibChild.java
@@ -3,6 +3,8 @@ package org.tests.model.uuidsibling;
 import io.ebean.Finder;
 import io.ebean.Model;
 import io.ebean.annotation.SoftDelete;
+
+import java.io.Serializable;
 import java.util.UUID;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
@@ -11,7 +13,7 @@ import javax.persistence.ManyToOne;
 import javax.persistence.OneToOne;
 
 @Entity
-public class USibChild extends Model {
+public class USibChild extends Model  implements Serializable {
 
     private static final long serialVersionUID = 738194912181571389L;
 
diff --git a/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java b/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java
index 888c1cc88..03e39b5f7 100644
--- a/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java
+++ b/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java
@@ -3,12 +3,15 @@ package org.tests.model.uuidsibling;
 import io.ebean.Finder;
 import io.ebean.Model;
 import io.ebean.annotation.SoftDelete;
+
+import java.io.Serializable;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToOne;
 
 @Entity
-public class USibChildSibling extends Model {
+public class USibChildSibling extends Model implements Serializable {
 
     private static final long serialVersionUID = 738194912181571389L;
 
diff --git a/src/test/java/org/tests/model/uuidsibling/USibParent.java b/src/test/java/org/tests/model/uuidsibling/USibParent.java
index a7e349d12..30597f5ad 100644
--- a/src/test/java/org/tests/model/uuidsibling/USibParent.java
+++ b/src/test/java/org/tests/model/uuidsibling/USibParent.java
@@ -3,6 +3,8 @@ package org.tests.model.uuidsibling;
 import io.ebean.Finder;
 import io.ebean.Model;
 import io.ebean.annotation.SoftDelete;
+
+import java.io.Serializable;
 import java.util.List;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
@@ -10,7 +12,7 @@ import javax.persistence.Id;
 import javax.persistence.OneToMany;
 
 @Entity
-public class USibParent extends Model {
+public class USibParent extends Model implements Serializable {
 
     private static final long serialVersionUID = 4116545858939406149L;
 
diff --git a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java
index 1a377b7e5..e18c9e9ba 100644
--- a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java
+++ b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java
@@ -2,13 +2,11 @@ package org.tests.o2m.jointable;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
-import io.ebean.annotation.PersistBatch;
 
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java b/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java
index a90d1dc56..45a97264f 100644
--- a/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java
+++ b/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java
@@ -1,6 +1,5 @@
 package org.tests.query.other;
 
-import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.TransactionalTestCase;
 
diff --git a/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java b/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java
index 4ead0767a..45cae1f70 100644
--- a/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java
+++ b/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java
@@ -6,7 +6,6 @@ import io.ebean.TransactionalTestCase;
 import io.ebean.text.csv.CsvReader;
 import io.ebean.text.csv.DefaultCsvCallback;
 import org.tests.model.basic.Customer;
-import org.tests.model.basic.ResetBasicData;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;

From 1b2bfc5df86dc0be2b0d094c2fa80e7c39bac28c Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Sat, 10 Nov 2018 01:53:02 +0100
Subject: [PATCH 0531/1036] FIX: use outer join on "is null" check

---
 .../server/expression/NullExpression.java     |   3 +
 .../java/org/tests/query/TestOuterJoin.java   | 197 ++++++++++++++++++
 2 files changed, 200 insertions(+)
 create mode 100644 src/test/java/org/tests/query/TestOuterJoin.java

diff --git a/src/main/java/io/ebeaninternal/server/expression/NullExpression.java b/src/main/java/io/ebeaninternal/server/expression/NullExpression.java
index 547bcb36d..ba81c0bef 100644
--- a/src/main/java/io/ebeaninternal/server/expression/NullExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/NullExpression.java
@@ -40,6 +40,9 @@ class NullExpression extends AbstractExpression {
       propertyPath = SplitName.split(propName)[0];
       propertyContainsMany(propertyPath, desc, manyWhereJoin);
     } else {
+      if (elProperty != null && elProperty.containsMany() && !notNull) {
+        manyWhereJoin.setRequireOuterJoins(true);
+      }
       propertyContainsMany(propName, desc, manyWhereJoin);
     }
   }
diff --git a/src/test/java/org/tests/query/TestOuterJoin.java b/src/test/java/org/tests/query/TestOuterJoin.java
new file mode 100644
index 000000000..29fdda09a
--- /dev/null
+++ b/src/test/java/org/tests/query/TestOuterJoin.java
@@ -0,0 +1,197 @@
+package org.tests.query;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.*;
+
+import java.util.List;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.Order;
+import org.tests.model.basic.ResetBasicData;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebeantest.LoggedSql;
+
+/**
+ * Tests if outer joins are correctly used.
+ *
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+public class TestOuterJoin extends BaseTestCase {
+
+  @BeforeClass
+  public static void setup() {
+    ResetBasicData.reset();
+  }
+
+
+  @Test
+  public void testOuterOnNullQuery() throws Exception {
+
+    LoggedSql.start();
+    List<Customer> list = Ebean.find(Customer.class).where()
+        .isNull("orders")
+        .le("id", 4) // ignore others than basicData
+        .findList();
+
+    assertThat(LoggedSql.collect().get(0))
+      .contains(" where not exists "); // perfored with not exists query
+    assertThat(list).hasSize(2);
+
+    // use OR construct
+    LoggedSql.start();
+    list = Ebean.find(Customer.class).where()
+        .or()
+          .isNull("orders.details.product.name")
+          .isNull("orders")
+        .endOr()
+        .le("id", 4) // ignore others than basicData
+        .findList();
+
+    assertThat(LoggedSql.collect().get(0))
+      .contains(" left join o_order ")
+      .contains(" left join o_order_detail ")
+      .contains(" left join o_product ")
+      .contains(" or not exists ");
+
+    assertThat(list).hasSize(4);
+
+    // use AND construct
+    LoggedSql.start();
+    list = Ebean.find(Customer.class).where()
+        .and()
+          .isNull("orders.details.product.name")
+          .isNull("orders")
+        .endAnd()
+        .le("id", 4) // ignore others than basicData
+        .findList();
+
+    assertThat(LoggedSql.collect().get(0))
+      .contains(" left join o_order ")
+      .contains(" left join o_order_detail ")
+      .contains(" left join o_product ")
+      .contains(" and not exists ");
+
+    assertThat(list).hasSize(2);
+
+    LoggedSql.start();
+    list = Ebean.find(Customer.class).where()
+        .isNull("orders.details.product.name")
+        .le("id", 4) // ignore others than basicData
+        .findList();
+
+    assertThat(LoggedSql.collect().get(0))
+      .contains(" left join o_order ")
+      .contains(" left join o_order_detail ")
+      .contains(" left join o_product ");
+    assertThat(list).hasSize(4);
+    LoggedSql.stop();
+  }
+
+  @Test
+  public void testInnerOnNonNullQuery() throws Exception {
+
+    LoggedSql.start();
+    List<Customer> list = Ebean.find(Customer.class).where()
+        .isNotNull("orders")
+        .le("id", 4) // ignore others than basicData
+        .findList();
+
+    assertThat(LoggedSql.collect().get(0))
+      .contains(" where exists "); // perfored with not exists query
+    assertThat(list).hasSize(2);
+
+    // use OR construct
+    LoggedSql.start();
+    list = Ebean.find(Customer.class).where()
+        .or()
+          .isNotNull("orders.details.product.name")
+          .isNotNull("orders")
+        .endOr()
+        .le("id", 4) // ignore others than basicData
+        .findList();
+
+    assertThat(LoggedSql.collect().get(0))
+      .contains(" left join o_order ")
+      .contains(" left join o_order_detail ")
+      .contains(" left join o_product ")
+      .contains(" or exists ");
+
+    assertThat(list).hasSize(2);
+
+    // use AND construct
+    LoggedSql.start();
+    list = Ebean.find(Customer.class).where()
+        .and()
+          .isNotNull("orders.details.product.name")
+          .isNotNull("orders")
+        .endAnd()
+        .le("id", 4) // ignore others than basicData
+        .findList();
+
+    assertThat(LoggedSql.collect().get(0))
+    .doesNotContain(" left join ")
+      .contains(" and exists ");
+
+    assertThat(list).hasSize(2);
+
+
+    LoggedSql.start();
+    list = Ebean.find(Customer.class).where()
+        .isNotNull("orders.details.product.name")
+        .le("id", 4) // ignore others than basicData
+        .findList();
+
+    assertThat(LoggedSql.collect().get(0))
+      .doesNotContain(" left join ");
+    assertThat(list).hasSize(2);
+    LoggedSql.stop();
+  }
+
+  @Test
+  public void testOuterOnFetch() throws Exception {
+    LoggedSql.start();
+
+    List<Order> orders1 =  Ebean.find(Order.class).findList();
+
+    assertThat(LoggedSql.collect().get(0))
+      .contains(" join o_customer") // ensure that we do not left join the customer
+      .doesNotContain(" left join o_customer");
+
+
+    // now fetch "details" bean, which may be optional
+    LoggedSql.start();
+
+    List<Order> orders2 =  Ebean.find(Order.class)
+        .fetch("details", "id").findList();
+
+    assertThat(LoggedSql.collect().get(0))
+      .contains(" left join o_order_detail ");
+
+    LoggedSql.stop();
+
+    // Note: You would expect, that the two lists are equal.
+    // but there is a @Where(clause = "${ta}.id > 0") on the details
+    // property, that will filter orders, where details is zero.
+
+    // The produced SQL is:
+    // select *  from o_order t0
+    //   join o_customer t2 on t2.id = t0.kcustomer_id
+    //   left join o_order_detail t1 on t1.order_id = t0.id
+    //   where t1.id > 0
+    //   order by t0.id, t1.id asc, t1.order_qty asc, t1.cretime desc; --bind()
+    //
+    // I think this is NOT correct as it may exclude orders without details or with negative ID
+    //
+    // Correct way could/would be, to add that extra where to the join
+    //
+    //
+
+    // assertThat(orders2).isEqualTo(orders1);
+  }
+
+}

From c5536aaeecc0c249c79a374cbf9949d8f4ab9619 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Sat, 10 Nov 2018 01:56:28 +0100
Subject: [PATCH 0532/1036] FIX: append extraWhere to join

---
 .../server/query/SqlTreeNodeBean.java         | 19 ++++++++++++-------
 .../server/query/SqlTreeNodeManyRoot.java     | 16 ++++++++++++++++
 .../tests/model/view/TestViewBaseEntity.java  |  2 +-
 .../java/org/tests/query/TestOuterJoin.java   | 19 +------------------
 4 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
index c67d58600..9324016a0 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
@@ -510,6 +510,17 @@ class SqlTreeNodeBean implements SqlTreeNode {
         ctx.append(inheritInfo.getWhere()).append(" ");
       }
     }
+
+    appendExtraWhere(ctx);
+
+    for (SqlTreeNode aChildren : children) {
+      // recursively add to the where clause any
+      // fixed predicates (extraWhere etc)
+      aChildren.appendWhere(ctx);
+    }
+  }
+
+  protected void appendExtraWhere(DbSqlContext ctx) {
     if (extraWhere != null) {
       if (ctx.length() > 0) {
         ctx.append(" and");
@@ -518,12 +529,6 @@ class SqlTreeNodeBean implements SqlTreeNode {
       String ew = StringHelper.replaceString(extraWhere, "${ta}", ta);
       ctx.append(" ").append(ew).append(" ");
     }
-
-    for (SqlTreeNode aChildren : children) {
-      // recursively add to the where clause any
-      // fixed predicates (extraWhere etc)
-      aChildren.appendWhere(ctx);
-    }
   }
 
   /**
@@ -604,7 +609,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
     return sqlJoinType;
   }
 
-  private SqlJoinType appendFromAsJoin(DbSqlContext ctx, SqlJoinType joinType) {
+  protected SqlJoinType appendFromAsJoin(DbSqlContext ctx, SqlJoinType joinType) {
 
     if (nodeBeanProp instanceof STreePropertyAssocMany) {
       STreePropertyAssocMany manyProp = (STreePropertyAssocMany) nodeBeanProp;
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
index edeff9fce..6b050f51a 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
@@ -41,6 +41,22 @@ final class SqlTreeNodeManyRoot extends SqlTreeNodeBean {
     return detailBean;
   }
 
+
+  /**
+   * append extraWhere to the join.
+   */
+  @Override
+  protected SqlJoinType appendFromAsJoin(DbSqlContext ctx, SqlJoinType joinType) {
+    SqlJoinType join = super.appendFromAsJoin(ctx, joinType);
+    super.appendExtraWhere(ctx);
+    return join;
+  }
+
+  @Override
+  protected void appendExtraWhere(DbSqlContext ctx) {
+    // extraWhere is already appended to the tableJoin
+  }
+
   /**
    * Force outer join for everything after the many property.
    */
diff --git a/src/test/java/org/tests/model/view/TestViewBaseEntity.java b/src/test/java/org/tests/model/view/TestViewBaseEntity.java
index e6da2b525..63c94a244 100644
--- a/src/test/java/org/tests/model/view/TestViewBaseEntity.java
+++ b/src/test/java/org/tests/model/view/TestViewBaseEntity.java
@@ -65,6 +65,6 @@ public class TestViewBaseEntity extends BaseTestCase {
       assertThat(details).isNotEmpty();
     }
 
-    assertThat(query.getGeneratedSql()).contains("from order_agg_vw t0 left join o_order t1 on t1.id = t0.order_id  left join o_customer t3 on t3.id = t1.kcustomer_id  left join o_order_detail t2 on t2.order_id = t1.id  where t2.id > 0  and t0.order_total > ?");
+    assertThat(query.getGeneratedSql()).contains("from order_agg_vw t0 left join o_order t1 on t1.id = t0.order_id  left join o_customer t3 on t3.id = t1.kcustomer_id  left join o_order_detail t2 on t2.order_id = t1.id  and t2.id > 0  where t0.order_total > ?");
   }
 }
diff --git a/src/test/java/org/tests/query/TestOuterJoin.java b/src/test/java/org/tests/query/TestOuterJoin.java
index 29fdda09a..b2f8e6ae1 100644
--- a/src/test/java/org/tests/query/TestOuterJoin.java
+++ b/src/test/java/org/tests/query/TestOuterJoin.java
@@ -174,24 +174,7 @@ public class TestOuterJoin extends BaseTestCase {
 
     LoggedSql.stop();
 
-    // Note: You would expect, that the two lists are equal.
-    // but there is a @Where(clause = "${ta}.id > 0") on the details
-    // property, that will filter orders, where details is zero.
-
-    // The produced SQL is:
-    // select *  from o_order t0
-    //   join o_customer t2 on t2.id = t0.kcustomer_id
-    //   left join o_order_detail t1 on t1.order_id = t0.id
-    //   where t1.id > 0
-    //   order by t0.id, t1.id asc, t1.order_qty asc, t1.cretime desc; --bind()
-    //
-    // I think this is NOT correct as it may exclude orders without details or with negative ID
-    //
-    // Correct way could/would be, to add that extra where to the join
-    //
-    //
-
-    // assertThat(orders2).isEqualTo(orders1);
+    assertThat(orders2).isEqualTo(orders1);
   }
 
 }

From b386c9a5a892187df2d4fafc570942165b3ceba3 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 13 Nov 2018 17:51:57 +1300
Subject: [PATCH 0533/1036] #1543 - ENH: Allow ebean.dbSchema to have multiple
 schemas

---
 src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
index 826621a4a..b802515da 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
@@ -126,7 +126,9 @@ public class DdlGenerator {
 
   private void createSchemaIfRequired(Connection connection) {
     try {
-      server.getDatabasePlatform().createSchemaIfNotExists(dbSchema, connection);
+      for (String schema : dbSchema.split(",")) {
+        server.getDatabasePlatform().createSchemaIfNotExists(schema, connection);
+      }
     } catch (SQLException e) {
       throw new PersistenceException("Failed to create DB Schema", e);
     }

From 280697203280d7139d30a917366d1296b24a3cee Mon Sep 17 00:00:00 2001
From: Manuel Danisch <40798549+focdanisch@users.noreply.github.com>
Date: Tue, 13 Nov 2018 08:20:01 +0100
Subject: [PATCH 0534/1036] Transform extra-ddl.xml files when running in ddl
 mode (no migration) (#1531)

---
 .../dbmigration/DdlGenerator.java             | 16 +++++-
 .../dbmigration/PlaceholderBuilder.java       | 53 +++++++++++++++++++
 .../dbmigration/ScriptTransform.java          | 40 ++++++++++++++
 3 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/io/ebeaninternal/dbmigration/PlaceholderBuilder.java
 create mode 100644 src/main/java/io/ebeaninternal/dbmigration/ScriptTransform.java

diff --git a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
index b802515da..daff5c23e 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
@@ -1,7 +1,9 @@
 package io.ebeaninternal.dbmigration;
 
+import io.ebean.config.DbMigrationConfig;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebean.migration.MigrationConfig;
 import io.ebean.migration.ddl.DdlRunner;
 import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.SpiEbeanServer;
@@ -23,6 +25,7 @@ import java.io.LineNumberReader;
 import java.io.Reader;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.Map;
 
 /**
  * Controls the generation and execution of "Create All" and "Drop All" DDL scripts.
@@ -42,6 +45,7 @@ public class DdlGenerator {
   private final boolean jaxbPresent;
   private final boolean ddlCommitOnCreateIndex;
   private final String dbSchema;
+  private final ScriptTransform scriptTransform;
 
   private CurrentModel currentModel;
   private String dropAllContent;
@@ -61,6 +65,7 @@ public class DdlGenerator {
       this.runDdl = serverConfig.isDdlRun();
       this.ddlCommitOnCreateIndex = server.getDatabasePlatform().isDdlCommitOnCreateIndex();
     }
+    this.scriptTransform = createScriptTransform(serverConfig.getMigrationConfig());
   }
 
   /**
@@ -146,7 +151,7 @@ public class DdlGenerator {
       } else if (ddlCommitOnCreateIndex) {
         runner.setCommitOnCreateIndex();
       }
-      int count = runner.runAll(content, connection);
+      int count = runner.runAll(scriptTransform.transform(content), connection);
       if (expectErrors) {
         connection.setAutoCommit(false);
       }
@@ -348,4 +353,13 @@ public class DdlGenerator {
     }
   }
 
+  /**
+   * Create the ScriptTransform for placeholder key/value replacement.
+   */
+  private ScriptTransform createScriptTransform(DbMigrationConfig config) {
+
+    Map<String, String> map = PlaceholderBuilder.build(config.getRunPlaceholders(), config.getRunPlaceholderMap());
+    return new ScriptTransform(map);
+  }
+
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/PlaceholderBuilder.java b/src/main/java/io/ebeaninternal/dbmigration/PlaceholderBuilder.java
new file mode 100644
index 000000000..5f85d46ea
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/PlaceholderBuilder.java
@@ -0,0 +1,53 @@
+package io.ebeaninternal.dbmigration;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Joins placeholder map and comma/equals delimited string.
+ */
+class PlaceholderBuilder {
+
+  private final Map<String,String> map = new HashMap<>();
+
+  /**
+   * Create with raw comma and equals delimited pairs plus map of key value pairs.
+   */
+  static Map<String,String> build(String commaDelimited, Map<String,String> placeholders) {
+
+    PlaceholderBuilder builder = new PlaceholderBuilder();
+    builder.add(commaDelimited);
+    builder.add(placeholders);
+
+    return builder.map;
+  }
+
+  private PlaceholderBuilder() {
+
+  }
+
+  /**
+   * Add a comma and equals delimited string to parse for key value pairs.
+   */
+  private void add(String commaDelimited) {
+
+    if (commaDelimited != null) {
+      String[] split = commaDelimited.split("[,;]");
+      for (String keyValue : split) {
+        String[] pair = keyValue.split("=");
+        if (pair.length == 2) {
+          map.put(pair[0].trim(), pair[1].trim());
+        }
+      }
+    }
+  }
+
+  /**
+   * Add a map of key value placeholder pairs.
+   */
+  private void add(Map<String,String> placeholders) {
+    if (placeholders != null) {
+      map.putAll(placeholders);
+    }
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ScriptTransform.java b/src/main/java/io/ebeaninternal/dbmigration/ScriptTransform.java
new file mode 100644
index 000000000..b6ee979f6
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/ScriptTransform.java
@@ -0,0 +1,40 @@
+package io.ebeaninternal.dbmigration;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Transforms a SQL script given a map of key/value substitutions.
+ */
+class ScriptTransform {
+
+  /**
+   * Transform just ${table} with the table name.
+   */
+  static String replace(String key, String value, String script) {
+    return script.replace(key, value);
+  }
+
+  private final Map<String,String> placeholders = new HashMap<>();
+
+  ScriptTransform(Map<String,String> map) {
+    for (Map.Entry<String, String> entry : map.entrySet()) {
+      placeholders.put(wrapKey(entry.getKey()), entry.getValue());
+    }
+  }
+
+  private String wrapKey(String key) {
+    return "${"+key+"}";
+  }
+
+  /**
+   * Transform the script replacing placeholders in the form <code>${key}</code> with <code>value</code>.
+   */
+  String transform(String source) {
+
+    for (Map.Entry<String, String> entry : placeholders.entrySet()) {
+      source = source.replace(entry.getKey(), entry.getValue());
+    }
+    return source;
+  }
+}

From 3c6a52da31a51f37d3a5e87912fa4fb463bee985 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 13 Nov 2018 20:39:15 +1300
Subject: [PATCH 0535/1036] #1531 - Transform extra-ddl.xml files when running
 in ddl mode (no migration)

Update to ebean-migration to with ScriptTransform as public and reuse here in Ebean
---
 pom.xml                                       |  2 +-
 .../dbmigration/DdlGenerator.java             |  6 +--
 .../dbmigration/PlaceholderBuilder.java       | 53 -------------------
 .../dbmigration/ScriptTransform.java          | 40 --------------
 4 files changed, 3 insertions(+), 98 deletions(-)
 delete mode 100644 src/main/java/io/ebeaninternal/dbmigration/PlaceholderBuilder.java
 delete mode 100644 src/main/java/io/ebeaninternal/dbmigration/ScriptTransform.java

diff --git a/pom.xml b/pom.xml
index 73add8867..9068b335d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>11.9.1</version>
+      <version>11.10.1</version>
     </dependency>
 
     <dependency>
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
index daff5c23e..8230bc65b 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
@@ -3,8 +3,8 @@ package io.ebeaninternal.dbmigration;
 import io.ebean.config.DbMigrationConfig;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebean.migration.MigrationConfig;
 import io.ebean.migration.ddl.DdlRunner;
+import io.ebean.migration.runner.ScriptTransform;
 import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.dbmigration.model.CurrentModel;
@@ -25,7 +25,6 @@ import java.io.LineNumberReader;
 import java.io.Reader;
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.Map;
 
 /**
  * Controls the generation and execution of "Create All" and "Drop All" DDL scripts.
@@ -358,8 +357,7 @@ public class DdlGenerator {
    */
   private ScriptTransform createScriptTransform(DbMigrationConfig config) {
 
-    Map<String, String> map = PlaceholderBuilder.build(config.getRunPlaceholders(), config.getRunPlaceholderMap());
-    return new ScriptTransform(map);
+    return ScriptTransform.build(config.getRunPlaceholders(), config.getRunPlaceholderMap());
   }
 
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/PlaceholderBuilder.java b/src/main/java/io/ebeaninternal/dbmigration/PlaceholderBuilder.java
deleted file mode 100644
index 5f85d46ea..000000000
--- a/src/main/java/io/ebeaninternal/dbmigration/PlaceholderBuilder.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package io.ebeaninternal.dbmigration;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Joins placeholder map and comma/equals delimited string.
- */
-class PlaceholderBuilder {
-
-  private final Map<String,String> map = new HashMap<>();
-
-  /**
-   * Create with raw comma and equals delimited pairs plus map of key value pairs.
-   */
-  static Map<String,String> build(String commaDelimited, Map<String,String> placeholders) {
-
-    PlaceholderBuilder builder = new PlaceholderBuilder();
-    builder.add(commaDelimited);
-    builder.add(placeholders);
-
-    return builder.map;
-  }
-
-  private PlaceholderBuilder() {
-
-  }
-
-  /**
-   * Add a comma and equals delimited string to parse for key value pairs.
-   */
-  private void add(String commaDelimited) {
-
-    if (commaDelimited != null) {
-      String[] split = commaDelimited.split("[,;]");
-      for (String keyValue : split) {
-        String[] pair = keyValue.split("=");
-        if (pair.length == 2) {
-          map.put(pair[0].trim(), pair[1].trim());
-        }
-      }
-    }
-  }
-
-  /**
-   * Add a map of key value placeholder pairs.
-   */
-  private void add(Map<String,String> placeholders) {
-    if (placeholders != null) {
-      map.putAll(placeholders);
-    }
-  }
-}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ScriptTransform.java b/src/main/java/io/ebeaninternal/dbmigration/ScriptTransform.java
deleted file mode 100644
index b6ee979f6..000000000
--- a/src/main/java/io/ebeaninternal/dbmigration/ScriptTransform.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package io.ebeaninternal.dbmigration;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Transforms a SQL script given a map of key/value substitutions.
- */
-class ScriptTransform {
-
-  /**
-   * Transform just ${table} with the table name.
-   */
-  static String replace(String key, String value, String script) {
-    return script.replace(key, value);
-  }
-
-  private final Map<String,String> placeholders = new HashMap<>();
-
-  ScriptTransform(Map<String,String> map) {
-    for (Map.Entry<String, String> entry : map.entrySet()) {
-      placeholders.put(wrapKey(entry.getKey()), entry.getValue());
-    }
-  }
-
-  private String wrapKey(String key) {
-    return "${"+key+"}";
-  }
-
-  /**
-   * Transform the script replacing placeholders in the form <code>${key}</code> with <code>value</code>.
-   */
-  String transform(String source) {
-
-    for (Map.Entry<String, String> entry : placeholders.entrySet()) {
-      source = source.replace(entry.getKey(), entry.getValue());
-    }
-    return source;
-  }
-}

From ce403e72a73a70b2532c05d170948ff04faeec7d Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Tue, 13 Nov 2018 08:44:45 +0100
Subject: [PATCH 0536/1036] FIX: improved support for
 @DbForeignKey(noConstraint = true) (#1527)

* FIX: improved support for DbForeignKey(noConstraint = true)

* FIX: Tests for mariadb and sqlserver

* FIX: SqlServer was still incorrect

* FIX: not ommit property for formula

* Update BeanDescriptor.java (typo fix)

fix typo column (no code change!)
---
 .../io/ebean/bean/EntityBeanIntercept.java    |   2 +-
 .../io/ebeaninternal/api/LoadBeanRequest.java |   9 +-
 .../server/deploy/BeanDescriptor.java         |  20 +-
 .../server/query/STreePropertyAssocOne.java   |  11 +
 .../ebeaninternal/server/query/STreeType.java |   8 +
 .../server/query/SqlTreeBuilder.java          |   7 +-
 .../server/query/SqlTreeNodeBean.java         |   8 +
 .../java/org/tests/model/nofk/EFile2NoFk.java |  60 +++
 .../java/org/tests/model/nofk/EFileNoFk.java  |  79 ++++
 .../java/org/tests/model/nofk/EUserNoFk.java  |  44 ++
 .../tests/model/nofk/EUserNoFkSoftDel.java    |  62 +++
 .../java/org/tests/model/nofk/Test2NoFk.java  | 230 ++++++++++
 .../java/org/tests/model/nofk/TestNoFk.java   | 402 ++++++++++++++++++
 13 files changed, 931 insertions(+), 11 deletions(-)
 create mode 100644 src/test/java/org/tests/model/nofk/EFile2NoFk.java
 create mode 100644 src/test/java/org/tests/model/nofk/EFileNoFk.java
 create mode 100644 src/test/java/org/tests/model/nofk/EUserNoFk.java
 create mode 100644 src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java
 create mode 100644 src/test/java/org/tests/model/nofk/Test2NoFk.java
 create mode 100644 src/test/java/org/tests/model/nofk/TestNoFk.java

diff --git a/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/src/main/java/io/ebean/bean/EntityBeanIntercept.java
index fcd6bb7ad..87b4f3023 100644
--- a/src/main/java/io/ebean/bean/EntityBeanIntercept.java
+++ b/src/main/java/io/ebean/bean/EntityBeanIntercept.java
@@ -829,7 +829,7 @@ public final class EntityBeanIntercept implements Serializable {
 
     if (lazyLoadFailure) {
       // failed when batch lazy loaded by another bean in the batch
-      throw new EntityNotFoundException("Lazy loading failed on type:" + owner.getClass().getName() + " id:" + ownerId + " - Bean has been deleted");
+      throw new EntityNotFoundException("(Lazy) loading failed on type:" + owner.getClass().getName() + " id:" + ownerId + " - Bean has been deleted");
     }
 
     if (lazyLoadProperty == -1) {
diff --git a/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java b/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java
index 3642daecd..3a5d9b79e 100644
--- a/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java
+++ b/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java
@@ -168,13 +168,8 @@ public class LoadBeanRequest extends LoadRequest {
         // necessary but allow processing to continue until it is accessed by client code
         Object id = desc.getId(ebi.getOwner());
         if (!loadedIds.contains(id)) {
-          if (desc.isSoftDelete()) {
-            // assume this is logically deleted (hence not found)
-            desc.setSoftDeleteValue(ebi.getOwner());
-          } else {
-            logger.info("Lazy loading unsuccessful for type:" + desc.getName() + " id:" + id + " - expecting when bean has been deleted");
-            ebi.setLazyLoadFailure(id);
-          }
+          // assume this is logically deleted (hence not found)
+          desc.markAsDeleted(ebi.getOwner());
         }
       }
     }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 60f0ab854..d5f590d8f 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -7,6 +7,7 @@ import io.ebean.SqlUpdate;
 import io.ebean.Transaction;
 import io.ebean.ValuePair;
 import io.ebean.annotation.DocStoreMode;
+import io.ebean.annotation.Formula;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
@@ -496,7 +497,10 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     DeployBeanPropertyLists listHelper = new DeployBeanPropertyLists(owner, this, deploy);
 
     this.softDeleteProperty = listHelper.getSoftDeleteProperty();
-    this.softDelete = (softDeleteProperty != null);
+    // if formula is set, the property is virtual only (there is no column in db) the formula must evaluate to true,
+    // if there is a join to a deleted bean. Example: '@Formula(select = "${ta}.user_id is null")'
+    // this is required to support markAsDelete on beans that may have no FK constraint.
+    this.softDelete = (softDeleteProperty != null && !softDeleteProperty.isFormula());
     this.idProperty = listHelper.getId();
     this.versionProperty = listHelper.getVersionProperty();
     this.unmappedJson = listHelper.getUnmappedJson();
@@ -2920,6 +2924,20 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return softDeleteProperty.getSoftDeleteDbPredicate(tableAlias);
   }
 
+  @Override
+  public void markAsDeleted(EntityBean bean) {
+    if (softDeleteProperty == null) {
+      Object id = getId(bean);
+      logger.info("(Lazy) loading unsuccessful for type:{} id:{} - expecting when bean has been deleted", getName(), id);
+      bean._ebean_getIntercept().setLazyLoadFailure(id);
+    } else {
+      setSoftDeleteValue(bean);
+      bean._ebean_getIntercept().setLoaded();
+      setAllLoaded(bean);
+    }
+  }
+
+
   /**
    * Return true if this entity type is draftable.
    */
diff --git a/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocOne.java
index 722a43a02..4ec7bcbc5 100644
--- a/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocOne.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.query;
 
+import io.ebean.bean.EntityBean;
 import io.ebeaninternal.server.type.ScalarType;
 
 public interface STreePropertyAssocOne extends STreePropertyAssoc {
@@ -13,4 +14,14 @@ public interface STreePropertyAssocOne extends STreePropertyAssoc {
    * Return the scalar type of the associated id property.
    */
   ScalarType<?> getIdScalarType();
+
+  /**
+   * Returns true, if this relation has a foreign key.
+   */
+  boolean hasForeignKey();
+
+  /**
+   * Return the property value as an entity bean from the parent.
+   */
+  public EntityBean getValueAsEntityBean(EntityBean parentBean);
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/STreeType.java b/src/main/java/io/ebeaninternal/server/query/STreeType.java
index e824272c0..1e4d40e9c 100644
--- a/src/main/java/io/ebeaninternal/server/query/STreeType.java
+++ b/src/main/java/io/ebeaninternal/server/query/STreeType.java
@@ -132,5 +132,13 @@ public interface STreeType {
    */
   void inheritanceLoad(SqlBeanLoad sqlBeanLoad, STreeProperty property, DbReadContext ctx);
 
+  /**
+   * Mark the bean as deleted by setting the softDelete property to true.
+   *
+   * This works also, if there is only a virtual softDelete property computed by a formula.
+   *
+   * If there is no softdelete property, it sets the lazyLoadFailure flag in EBI.
+   */
+  void markAsDeleted(EntityBean bean);
 
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 0dcf9f773..bf8201a84 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -498,8 +498,11 @@ public final class SqlTreeBuilder {
 
     for (STreePropertyAssocOne propertyAssocOne : desc.propsOne()) {
       //noinspection StatementWithEmptyBody
-      if (queryProps != null && queryProps.isIncludedBeanJoin(propertyAssocOne.getName())) {
-        // if it is a joined bean... then don't add the property
+      if (queryProps != null
+          && queryProps.isIncludedBeanJoin(propertyAssocOne.getName())
+          && propertyAssocOne.hasForeignKey()
+          && !propertyAssocOne.isFormula()) {
+        // if it is a joined bean with FK constraint... then don't add the property
         // as it will have its own entire Node in the SqlTree
       } else {
         selectProps.add(propertyAssocOne);
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
index c67d58600..62a77917b 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
@@ -266,6 +266,14 @@ class SqlTreeNodeBean implements SqlTreeNode {
       if (id == null) {
         // bean must be null...
         localBean = null;
+
+        // ... but there may exist as reference bean in parent which has to be marked as deleted.
+        if (parentBean != null && nodeBeanProp instanceof STreePropertyAssocOne) {
+          contextBean = ((STreePropertyAssocOne)nodeBeanProp).getValueAsEntityBean(parentBean);
+          if (contextBean != null) {
+            desc.markAsDeleted(contextBean);
+          }
+        }
       } else if (!temporalVersions) {
         // check the PersistenceContext to see if the bean already exists
         contextBean = (EntityBean) localDesc.contextPutIfAbsent(persistenceContext, id, localBean);
diff --git a/src/test/java/org/tests/model/nofk/EFile2NoFk.java b/src/test/java/org/tests/model/nofk/EFile2NoFk.java
new file mode 100644
index 000000000..aee08e6fb
--- /dev/null
+++ b/src/test/java/org/tests/model/nofk/EFile2NoFk.java
@@ -0,0 +1,60 @@
+package org.tests.model.nofk;
+
+import java.util.List;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
+import javax.validation.constraints.Size;
+
+import io.ebean.annotation.DbForeignKey;
+import io.ebean.annotation.Formula;
+import io.ebean.annotation.Index;
+
+@Entity
+public class EFile2NoFk {
+
+  @Id
+  @Size(max = 64) // Note: mysql supports only 767 bytes for index
+  String fileName;
+
+  @Index
+  int ownerId;
+
+  // owner without softdelete property - will throw bean has been deleted
+  @ManyToOne
+  @Formula(select = "${ta}.Owner_Id")
+  EUserNoFk owner;
+
+  // owner with softdelete property - will set the property to true
+  @ManyToOne
+  @Formula(select = "${ta}.Owner_id")
+  EUserNoFkSoftDel ownerSoftDel;
+
+
+  public String getFileName() {
+    return fileName;
+  }
+
+  public void setFileName(String fileName) {
+    this.fileName = fileName;
+  }
+
+  public int getOwnerId() {
+    return ownerId;
+  }
+
+  public void setOwnerId(int ownerId) {
+    this.ownerId = ownerId;
+  }
+
+  public EUserNoFk getOwner() {
+    return owner;
+  }
+
+  public EUserNoFkSoftDel getOwnerSoftDel() {
+    return ownerSoftDel;
+  }
+
+}
diff --git a/src/test/java/org/tests/model/nofk/EFileNoFk.java b/src/test/java/org/tests/model/nofk/EFileNoFk.java
new file mode 100644
index 000000000..fb48a53b0
--- /dev/null
+++ b/src/test/java/org/tests/model/nofk/EFileNoFk.java
@@ -0,0 +1,79 @@
+package org.tests.model.nofk;
+
+import java.util.List;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
+import javax.validation.constraints.Size;
+
+import io.ebean.annotation.DbForeignKey;
+
+@Entity
+public class EFileNoFk {
+
+  @Id
+  @Size(max = 64) // Note: mysql supports only 767 bytes for index
+  String fileName;
+
+  // owner without softdelete property - will throw bean has been deleted
+  @ManyToOne
+  @DbForeignKey(noConstraint = true)
+  EUserNoFk owner;
+
+  // owner with softdelete property - will set the property to true
+  @ManyToOne
+  @DbForeignKey(noConstraint = true)
+  EUserNoFkSoftDel ownerSoftDel;
+
+  // hold also a many-2-many relation for tests.
+  @ManyToMany
+  @DbForeignKey(noConstraint = true)
+  List<EUserNoFk> editors;
+
+  @ManyToMany
+  @DbForeignKey(noConstraint = true)
+  List<EUserNoFkSoftDel> editorsSoftDel;
+
+  public String getFileName() {
+    return fileName;
+  }
+
+  public void setFileName(String fileName) {
+    this.fileName = fileName;
+  }
+
+  public EUserNoFk getOwner() {
+    return owner;
+  }
+
+  public void setOwner(EUserNoFk owner) {
+    this.owner = owner;
+  }
+
+  public EUserNoFkSoftDel getOwnerSoftDel() {
+    return ownerSoftDel;
+  }
+
+  public void setOwnerSoftDel(EUserNoFkSoftDel ownerSoftDel) {
+    this.ownerSoftDel = ownerSoftDel;
+  }
+
+  public List<EUserNoFk> getEditors() {
+    return editors;
+  }
+
+  public void setEditors(List<EUserNoFk> editors) {
+    this.editors = editors;
+  }
+
+  public List<EUserNoFkSoftDel> getEditorsSoftDel() {
+    return editorsSoftDel;
+  }
+
+  public void setEditorsSoftDel(List<EUserNoFkSoftDel> editorsSoftDel) {
+    this.editorsSoftDel = editorsSoftDel;
+  }
+
+}
diff --git a/src/test/java/org/tests/model/nofk/EUserNoFk.java b/src/test/java/org/tests/model/nofk/EUserNoFk.java
new file mode 100644
index 000000000..8513ad8d5
--- /dev/null
+++ b/src/test/java/org/tests/model/nofk/EUserNoFk.java
@@ -0,0 +1,44 @@
+package org.tests.model.nofk;
+
+import java.util.List;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+@Entity
+public class EUserNoFk {
+
+  @Id
+  int userId;
+
+  String userName;
+
+  @OneToMany(mappedBy = "owner")
+  List<EFileNoFk> files;
+
+  public int getUserId() {
+    return userId;
+  }
+
+  public void setUserId(int userId) {
+    this.userId = userId;
+  }
+
+  public String getUserName() {
+    return userName;
+  }
+
+  public void setUserName(String userName) {
+    this.userName = userName;
+  }
+
+  public List<EFileNoFk> getFiles() {
+    return files;
+  }
+
+  public void setFiles(List<EFileNoFk> files) {
+    this.files = files;
+  }
+
+}
diff --git a/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java b/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java
new file mode 100644
index 000000000..792a004af
--- /dev/null
+++ b/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java
@@ -0,0 +1,62 @@
+package org.tests.model.nofk;
+
+import java.util.List;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+import io.ebean.annotation.Formula;
+import io.ebean.annotation.Platform;
+import io.ebean.annotation.SoftDelete;
+
+@Entity
+public class EUserNoFkSoftDel {
+
+  @Id
+  int userId;
+
+  String userName;
+
+  @SoftDelete
+  @Formula(select = "${ta}.user_id is null")
+  @Formula(select = "CASE WHEN ${ta}.user_id is null THEN 1 ELSE 0 END", platforms = Platform.SQLSERVER17)
+  // evaluates to true in a left join if bean has been deleted.
+  boolean deleted;
+
+  @OneToMany(mappedBy = "ownerSoftDel")
+  List<EFileNoFk> files;
+
+  public int getUserId() {
+    return userId;
+  }
+
+  public void setUserId(int userId) {
+    this.userId = userId;
+  }
+
+  public String getUserName() {
+    return userName;
+  }
+
+  public void setUserName(String userName) {
+    this.userName = userName;
+  }
+
+  public List<EFileNoFk> getFiles() {
+    return files;
+  }
+
+  public void setFiles(List<EFileNoFk> files) {
+    this.files = files;
+  }
+
+  public boolean isDeleted() {
+    return deleted;
+  }
+
+  public void setDeleted(boolean deleted) {
+    this.deleted = deleted;
+  }
+
+}
diff --git a/src/test/java/org/tests/model/nofk/Test2NoFk.java b/src/test/java/org/tests/model/nofk/Test2NoFk.java
new file mode 100644
index 000000000..4e963b4f3
--- /dev/null
+++ b/src/test/java/org/tests/model/nofk/Test2NoFk.java
@@ -0,0 +1,230 @@
+package org.tests.model.nofk;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.bean.EntityBean;
+import io.ebean.bean.EntityBeanIntercept;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.List;
+
+import javax.persistence.EntityNotFoundException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+// test that simulates relations with @formula
+public class Test2NoFk extends BaseTestCase {
+
+  @Before
+  public void setup() {
+    // Reset t
+    Ebean.find(EFile2NoFk.class).delete();
+    Ebean.find(EUserNoFk.class).delete();
+    Ebean.find(EUserNoFkSoftDel.class).delete();
+
+    // There are two user accounts persisted in our database
+    EUserNoFk root = new EUserNoFk();
+    root.setUserId(1);
+    root.setUserName("root");
+    Ebean.save(root);
+
+    EUserNoFk nobody = new EUserNoFk();
+    nobody.setUserId(2);
+    nobody.setUserName("nobody");
+    Ebean.save(nobody);
+
+
+    // Now build the same with the softDel flag.
+    EUserNoFkSoftDel rootSoftDel = new EUserNoFkSoftDel();
+    rootSoftDel.setUserId(1);
+    rootSoftDel.setUserName("root");
+    Ebean.save(rootSoftDel);
+
+    EUserNoFkSoftDel nobodySoftDel = new EUserNoFkSoftDel();
+    nobodySoftDel.setUserId(2);
+    nobodySoftDel.setUserName("nobody");
+    Ebean.save(nobodySoftDel);
+
+
+    EFile2NoFk bash = new EFile2NoFk();
+    bash.setFileName("bash");
+    bash.setOwnerId(1);
+
+    EUserNoFk user501 = new EUserNoFk();
+    EUserNoFkSoftDel user501SoftDel = new EUserNoFkSoftDel();
+    user501.setUserId(501);
+    user501SoftDel.setUserId(501);
+
+    Ebean.save(bash);
+
+    // create relation to non existent user
+    EFile2NoFk cmd = new EFile2NoFk();
+
+    cmd.setFileName("java");
+    cmd.setOwnerId(500);
+
+    Ebean.save(cmd);
+
+    assertThat(Ebean.find(EFile2NoFk.class).findCount()).isEqualTo(2);
+    assertThat(Ebean.find(EUserNoFk.class).findCount()).isEqualTo(2);
+    assertThat(Ebean.find(EUserNoFkSoftDel.class).findCount()).isEqualTo(2);
+
+    // We should have this data in the database:
+    //
+    // Owner:   userId | userName    File: fileName | ownerId
+    //          =======+=========          =========+========
+    //               1 | root                  bash | 1       (= root)
+    //               2 | nobody                java | 500     (= non existent user account)
+    //
+    // Editors: userId | fileName
+    //          =======+=========
+    //               1 | bash
+    //               2 | bash
+    //             501 | bash
+  }
+
+  @Test
+  public void testLazyLoadFile() {
+    List<EFile2NoFk> files = Ebean.find(EFile2NoFk.class).findList();
+    assertThat(files).hasSize(2);
+
+    EFile2NoFk file1 = files.get(0);
+    EFile2NoFk file2 = files.get(1);
+
+    assertThat(file1.getFileName()).isEqualTo("bash");
+    assertThat(file2.getFileName()).isEqualTo("java");
+
+    // File1 is owned by "root"
+    EntityBeanIntercept ownerEbi = ((EntityBean)file1.getOwner())._ebean_getIntercept();
+    assertThat(file1.getOwner().getUserId()).isEqualTo(1);
+    assertTrue(ownerEbi.isReference());
+    assertTrue(ownerEbi.isPartial());
+
+    assertThat(file1.getOwner().getUserName()).isEqualTo("root"); // trigger lazy-load
+    assertFalse(ownerEbi.isReference());
+    assertFalse(ownerEbi.isPartial());  // and expect, that bean is fully loaded
+
+
+
+    // File2 is owned by user #500, but user account does not exist
+    ownerEbi = ((EntityBean)file2.getOwner())._ebean_getIntercept();
+
+    assertThat(file2.getOwner().getUserId()).isEqualTo(500);
+    assertThatThrownBy(()->file2.getOwner().getUserName())
+      .isInstanceOf(EntityNotFoundException.class)
+      .hasMessageContaining("id:500 - Bean has been deleted");
+
+    assertTrue(ownerEbi.isReference());
+    assertTrue(ownerEbi.isPartial());
+    assertTrue(ownerEbi.isLazyLoadFailure());
+
+  }
+
+  @Test
+  public void testEagerLoadFile() {
+    List<EFile2NoFk> files = Ebean.find(EFile2NoFk.class).fetch("owner").findList();
+    assertThat(files).hasSize(2);
+
+    EFile2NoFk file1 = files.get(0);
+    EFile2NoFk file2 = files.get(1);
+
+    assertThat(file1.getFileName()).isEqualTo("bash");
+    assertThat(file2.getFileName()).isEqualTo("java");
+
+    // File1 is owned by "root"
+    EntityBeanIntercept ownerEbi = ((EntityBean)file1.getOwner())._ebean_getIntercept();
+    assertFalse(ownerEbi.isReference());
+    assertFalse(ownerEbi.isPartial());
+
+    assertThat(file1.getOwner().getUserId()).isEqualTo(1);
+    assertThat(file1.getOwner().getUserName()).isEqualTo("root");
+
+    // File2 is owned by user #500, but user account does not exist
+    ownerEbi = ((EntityBean)file2.getOwner())._ebean_getIntercept();
+
+    assertThat(file2.getOwner().getUserId()).isEqualTo(500);
+    assertThatThrownBy(()->file2.getOwner().getUserName())
+      .isInstanceOf(EntityNotFoundException.class)
+      .hasMessageContaining("id:500 - Bean has been deleted");
+
+    assertTrue(ownerEbi.isReference());
+    assertTrue(ownerEbi.isPartial());
+    assertTrue(ownerEbi.isLazyLoadFailure());
+
+  }
+
+  @Test
+  public void testLazyLoadFileSoftDel() {
+    List<EFile2NoFk> files = Ebean.find(EFile2NoFk.class).findList();
+    assertThat(files).hasSize(2);
+
+    EFile2NoFk file1 = files.get(0);
+    EFile2NoFk file2 = files.get(1);
+
+    assertThat(file1.getFileName()).isEqualTo("bash");
+    assertThat(file2.getFileName()).isEqualTo("java");
+
+    // File1 is owned by "root"
+    EntityBeanIntercept ownerEbi = ((EntityBean)file1.getOwnerSoftDel())._ebean_getIntercept();
+    assertThat(file1.getOwnerSoftDel().getUserId()).isEqualTo(1);
+    assertTrue(ownerEbi.isReference());
+    assertTrue(ownerEbi.isPartial());
+
+
+    assertThat(file1.getOwnerSoftDel().isDeleted()).isEqualTo(false); // trigger lazy-load
+    assertFalse(ownerEbi.isReference());
+    assertFalse(ownerEbi.isPartial());  // and expect, that bean is fully loaded
+
+    assertThat(file1.getOwnerSoftDel().getUserName()).isEqualTo("root");
+
+
+    // File2 is owned by user #500, but user account does not exist
+    ownerEbi = ((EntityBean)file2.getOwnerSoftDel())._ebean_getIntercept();
+
+    assertThat(file2.getOwnerSoftDel().getUserId()).isEqualTo(500);
+    assertThat(file2.getOwnerSoftDel().isDeleted()).isEqualTo(true);
+    assertThat(file2.getOwnerSoftDel().getUserName()).isNull();
+
+    assertFalse(ownerEbi.isReference());
+    assertFalse(ownerEbi.isPartial());
+
+  }
+
+  @Test
+  public void testEagerLoadFileSoftDel() {
+    List<EFile2NoFk> files = Ebean.find(EFile2NoFk.class).fetch("ownerSoftDel").findList();
+    assertThat(files).hasSize(2);
+
+    EFile2NoFk file1 = files.get(0);
+    EFile2NoFk file2 = files.get(1);
+
+    assertThat(file1.getFileName()).isEqualTo("bash");
+    assertThat(file2.getFileName()).isEqualTo("java");
+
+    // File1 is owned by "root"
+    EntityBeanIntercept ownerEbi = ((EntityBean)file1.getOwnerSoftDel())._ebean_getIntercept();
+    assertFalse(ownerEbi.isReference());
+    assertFalse(ownerEbi.isPartial());
+
+    assertThat(file1.getOwnerSoftDel().getUserId()).isEqualTo(1);
+    assertThat(file1.getOwnerSoftDel().isDeleted()).isEqualTo(false);
+    assertThat(file1.getOwnerSoftDel().getUserName()).isEqualTo("root");
+
+    // File2 is owned by user #500, but user account does not exist
+    ownerEbi = ((EntityBean)file2.getOwnerSoftDel())._ebean_getIntercept();
+//    assertFalse(ownerEbi.isReference());
+//    assertFalse(ownerEbi.isPartial());
+
+    assertThat(file2.getOwnerSoftDel().getUserId()).isEqualTo(500);
+    assertThat(file2.getOwnerSoftDel().isDeleted()).isEqualTo(true);
+    assertThat(file2.getOwnerSoftDel().getUserName()).isNull();
+
+
+  }
+
+}
diff --git a/src/test/java/org/tests/model/nofk/TestNoFk.java b/src/test/java/org/tests/model/nofk/TestNoFk.java
new file mode 100644
index 000000000..9d49f0666
--- /dev/null
+++ b/src/test/java/org/tests/model/nofk/TestNoFk.java
@@ -0,0 +1,402 @@
+package org.tests.model.nofk;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.SqlRow;
+import io.ebean.bean.EntityBean;
+import io.ebean.bean.EntityBeanIntercept;
+import io.ebean.plugin.BeanType;
+import io.ebean.plugin.Property;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import java.util.List;
+
+import javax.persistence.EntityNotFoundException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class TestNoFk extends BaseTestCase {
+
+  @Before
+  public void setup() {
+    // Reset t
+    Ebean.find(EFileNoFk.class).delete();
+    Ebean.find(EUserNoFk.class).delete();
+    Ebean.find(EUserNoFkSoftDel.class).delete();
+
+    Ebean.createSqlUpdate("delete from efile_no_fk_euser_no_fk").execute();
+    Ebean.createSqlUpdate("delete from efile_no_fk_euser_no_fk_soft_del").execute();
+
+    // There are two user accounts persisted in our database
+    EUserNoFk root = new EUserNoFk();
+    root.setUserId(1);
+    root.setUserName("root");
+    Ebean.save(root);
+
+    EUserNoFk nobody = new EUserNoFk();
+    nobody.setUserId(2);
+    nobody.setUserName("nobody");
+    Ebean.save(nobody);
+
+
+    // Now build the same with the softDel flag.
+    EUserNoFkSoftDel rootSoftDel = new EUserNoFkSoftDel();
+    rootSoftDel.setUserId(1);
+    rootSoftDel.setUserName("root");
+    Ebean.save(rootSoftDel);
+
+    EUserNoFkSoftDel nobodySoftDel = new EUserNoFkSoftDel();
+    nobodySoftDel.setUserId(2);
+    nobodySoftDel.setUserName("nobody");
+    Ebean.save(nobodySoftDel);
+
+
+    EFileNoFk bash = new EFileNoFk();
+    bash.setFileName("bash");
+    bash.setOwner(root);
+    bash.setOwnerSoftDel(rootSoftDel);
+
+    EUserNoFk user501 = new EUserNoFk();
+    EUserNoFkSoftDel user501SoftDel = new EUserNoFkSoftDel();
+    user501.setUserId(501);
+    user501SoftDel.setUserId(501);
+    bash.getEditors().add(root);
+    bash.getEditors().add(nobody);
+    bash.getEditors().add(user501);
+    bash.getEditorsSoftDel().add(rootSoftDel);
+    bash.getEditorsSoftDel().add(nobodySoftDel);
+    bash.getEditorsSoftDel().add(user501SoftDel);
+
+    Ebean.save(bash);
+
+    // create relation to non existent user
+    EFileNoFk cmd = new EFileNoFk();
+
+    cmd.setFileName("java");
+    EUserNoFk user500 = new EUserNoFk();
+    user500.setUserId(500);
+    user500.setUserName("not persisted");
+    cmd.setOwner(user500);
+
+    EUserNoFkSoftDel user500SoftDel = new EUserNoFkSoftDel();
+    user500SoftDel.setUserId(500);
+    user500SoftDel.setUserName("not persisted");
+    cmd.setOwnerSoftDel(user500SoftDel);
+
+    Ebean.save(cmd);
+
+
+    assertThat(Ebean.find(EFileNoFk.class).findCount()).isEqualTo(2);
+    assertThat(Ebean.find(EUserNoFk.class).findCount()).isEqualTo(2);
+    assertThat(Ebean.find(EUserNoFkSoftDel.class).findCount()).isEqualTo(2);
+
+    SqlRow row = Ebean.createSqlQuery("select count(*) as cnt from efile_no_fk_euser_no_fk").findOne();
+    assertThat(row.getInteger("cnt")).isEqualTo(3);
+    // We should have this data in the database:
+    //
+    // Owner:   userId | userName    File: fileName | ownerId
+    //          =======+=========          =========+========
+    //               1 | root                  bash | 1       (= root)
+    //               2 | nobody                java | 500     (= non existent user account)
+    //
+    // Editors: userId | fileName
+    //          =======+=========
+    //               1 | bash
+    //               2 | bash
+    //             501 | bash
+  }
+
+  @Test
+  public void testLazyLoadFile() {
+    List<EFileNoFk> files = Ebean.find(EFileNoFk.class).findList();
+    assertThat(files).hasSize(2);
+
+    EFileNoFk file1 = files.get(0);
+    EFileNoFk file2 = files.get(1);
+
+    assertThat(file1.getFileName()).isEqualTo("bash");
+    assertThat(file2.getFileName()).isEqualTo("java");
+
+    // File1 is owned by "root"
+    EntityBeanIntercept ownerEbi = ((EntityBean)file1.getOwner())._ebean_getIntercept();
+    assertThat(file1.getOwner().getUserId()).isEqualTo(1);
+    assertTrue(ownerEbi.isReference());
+    assertTrue(ownerEbi.isPartial());
+
+    assertThat(file1.getOwner().getUserName()).isEqualTo("root"); // trigger lazy-load
+    assertFalse(ownerEbi.isReference());
+    assertFalse(ownerEbi.isPartial());  // and expect, that bean is fully loaded
+
+
+
+    // File2 is owned by user #500, but user account does not exist
+    ownerEbi = ((EntityBean)file2.getOwner())._ebean_getIntercept();
+
+    assertThat(file2.getOwner().getUserId()).isEqualTo(500);
+    assertThatThrownBy(()->file2.getOwner().getUserName())
+      .isInstanceOf(EntityNotFoundException.class)
+      .hasMessageContaining("id:500 - Bean has been deleted");
+
+    assertTrue(ownerEbi.isReference());
+    assertTrue(ownerEbi.isPartial());
+    assertTrue(ownerEbi.isLazyLoadFailure());
+
+  }
+
+  @Test
+  public void testEagerLoadFile() {
+    List<EFileNoFk> files = Ebean.find(EFileNoFk.class).fetch("owner").findList();
+    assertThat(files).hasSize(2);
+
+    EFileNoFk file1 = files.get(0);
+    EFileNoFk file2 = files.get(1);
+
+    assertThat(file1.getFileName()).isEqualTo("bash");
+    assertThat(file2.getFileName()).isEqualTo("java");
+
+    // File1 is owned by "root"
+    EntityBeanIntercept ownerEbi = ((EntityBean)file1.getOwner())._ebean_getIntercept();
+    assertFalse(ownerEbi.isReference());
+    assertFalse(ownerEbi.isPartial());
+
+    assertThat(file1.getOwner().getUserId()).isEqualTo(1);
+    assertThat(file1.getOwner().getUserName()).isEqualTo("root");
+
+    // File2 is owned by user #500, but user account does not exist
+    ownerEbi = ((EntityBean)file2.getOwner())._ebean_getIntercept();
+
+    assertThat(file2.getOwner().getUserId()).isEqualTo(500);
+    assertThatThrownBy(()->file2.getOwner().getUserName())
+      .isInstanceOf(EntityNotFoundException.class)
+      .hasMessageContaining("id:500 - Bean has been deleted");
+
+    assertTrue(ownerEbi.isReference());
+    assertTrue(ownerEbi.isPartial());
+    assertTrue(ownerEbi.isLazyLoadFailure());
+
+  }
+
+  @Test
+  public void testLazyLoadOwner() {
+    List<EUserNoFk> owners = Ebean.find(EUserNoFk.class).findList();
+    assertThat(owners).hasSize(2);
+
+    EUserNoFk owner1 = owners.get(0);
+    EUserNoFk owner2 = owners.get(1);
+
+    assertThat(owner1.getUserId()).isEqualTo(1);
+    assertThat(owner1.getUserName()).isEqualTo("root");
+    assertThat(owner2.getUserId()).isEqualTo(2);
+    assertThat(owner2.getUserName()).isEqualTo("nobody");
+
+    assertThat(owner1.getFiles()).hasSize(1);
+    assertThat(owner2.getFiles()).hasSize(0);
+
+    assertThat(owner1.getFiles().get(0).getFileName()).isEqualTo("bash");
+
+  }
+
+  @Test
+  public void testEagerLoadOwner() {
+    List<EUserNoFk> owners = Ebean.find(EUserNoFk.class)
+        .fetch("files")
+        .findList();
+    assertThat(owners).hasSize(2);
+
+    EUserNoFk owner1 = owners.get(0);
+    EUserNoFk owner2 = owners.get(1);
+
+    assertThat(owner1.getUserId()).isEqualTo(1);
+    assertThat(owner1.getUserName()).isEqualTo("root");
+    assertThat(owner2.getUserId()).isEqualTo(2);
+    assertThat(owner2.getUserName()).isEqualTo("nobody");
+
+    assertThat(owner1.getFiles()).hasSize(1);
+    assertThat(owner2.getFiles()).hasSize(0);
+
+    assertThat(owner1.getFiles().get(0).getFileName()).isEqualTo("bash");
+
+  }
+
+  @Test
+  public void testLazyLoadFileSoftDel() {
+    List<EFileNoFk> files = Ebean.find(EFileNoFk.class).findList();
+    assertThat(files).hasSize(2);
+
+    EFileNoFk file1 = files.get(0);
+    EFileNoFk file2 = files.get(1);
+
+    assertThat(file1.getFileName()).isEqualTo("bash");
+    assertThat(file2.getFileName()).isEqualTo("java");
+
+    // File1 is owned by "root"
+    EntityBeanIntercept ownerEbi = ((EntityBean)file1.getOwnerSoftDel())._ebean_getIntercept();
+    assertThat(file1.getOwnerSoftDel().getUserId()).isEqualTo(1);
+    assertTrue(ownerEbi.isReference());
+    assertTrue(ownerEbi.isPartial());
+
+
+    assertThat(file1.getOwnerSoftDel().isDeleted()).isEqualTo(false); // trigger lazy-load
+    assertFalse(ownerEbi.isReference());
+    assertFalse(ownerEbi.isPartial());  // and expect, that bean is fully loaded
+
+    assertThat(file1.getOwnerSoftDel().getUserName()).isEqualTo("root");
+
+
+    // File2 is owned by user #500, but user account does not exist
+    ownerEbi = ((EntityBean)file2.getOwnerSoftDel())._ebean_getIntercept();
+
+    assertThat(file2.getOwnerSoftDel().getUserId()).isEqualTo(500);
+    assertThat(file2.getOwnerSoftDel().isDeleted()).isEqualTo(true);
+    assertThat(file2.getOwnerSoftDel().getUserName()).isNull();
+
+    assertFalse(ownerEbi.isReference());
+    assertFalse(ownerEbi.isPartial());
+
+  }
+
+  @Test
+  public void testEagerLoadFileSoftDel() {
+    List<EFileNoFk> files = Ebean.find(EFileNoFk.class).fetch("ownerSoftDel").findList();
+    assertThat(files).hasSize(2);
+
+    EFileNoFk file1 = files.get(0);
+    EFileNoFk file2 = files.get(1);
+
+    assertThat(file1.getFileName()).isEqualTo("bash");
+    assertThat(file2.getFileName()).isEqualTo("java");
+
+    // File1 is owned by "root"
+    EntityBeanIntercept ownerEbi = ((EntityBean)file1.getOwnerSoftDel())._ebean_getIntercept();
+    assertFalse(ownerEbi.isReference());
+    assertFalse(ownerEbi.isPartial());
+
+    assertThat(file1.getOwnerSoftDel().getUserId()).isEqualTo(1);
+    assertThat(file1.getOwnerSoftDel().isDeleted()).isEqualTo(false);
+    assertThat(file1.getOwnerSoftDel().getUserName()).isEqualTo("root");
+
+    // File2 is owned by user #500, but user account does not exist
+    ownerEbi = ((EntityBean)file2.getOwnerSoftDel())._ebean_getIntercept();
+//    assertFalse(ownerEbi.isReference());
+//    assertFalse(ownerEbi.isPartial());
+
+    assertThat(file2.getOwnerSoftDel().getUserId()).isEqualTo(500);
+    assertThat(file2.getOwnerSoftDel().isDeleted()).isEqualTo(true);
+    assertThat(file2.getOwnerSoftDel().getUserName()).isNull();
+
+
+  }
+
+  @Test
+  public void testLazyLoadOwnerSoftDel() {
+    List<EUserNoFkSoftDel> owners = Ebean.find(EUserNoFkSoftDel.class).findList();
+    assertThat(owners).hasSize(2);
+
+    EUserNoFkSoftDel owner1 = owners.get(0);
+    EUserNoFkSoftDel owner2 = owners.get(1);
+
+    assertThat(owner1.getUserId()).isEqualTo(1);
+    assertThat(owner1.getUserName()).isEqualTo("root");
+    assertThat(owner2.getUserId()).isEqualTo(2);
+    assertThat(owner2.getUserName()).isEqualTo("nobody");
+
+    assertThat(owner1.getFiles()).hasSize(1);
+    assertThat(owner2.getFiles()).hasSize(0);
+
+    assertThat(owner1.getFiles().get(0).getFileName()).isEqualTo("bash");
+
+  }
+
+  @Test
+  public void testEagerLoadOwnerSoftDel() {
+    List<EUserNoFkSoftDel> owners = Ebean.find(EUserNoFkSoftDel.class)
+        .fetch("files")
+        .findList();
+    assertThat(owners).hasSize(2);
+
+    EUserNoFkSoftDel owner1 = owners.get(0);
+    EUserNoFkSoftDel owner2 = owners.get(1);
+
+    assertThat(owner1.getUserId()).isEqualTo(1);
+    assertThat(owner1.getUserName()).isEqualTo("root");
+    assertThat(owner2.getUserId()).isEqualTo(2);
+    assertThat(owner2.getUserName()).isEqualTo("nobody");
+
+    assertThat(owner1.getFiles()).hasSize(1);
+    assertThat(owner2.getFiles()).hasSize(0);
+
+    assertThat(owner1.getFiles().get(0).getFileName()).isEqualTo("bash");
+
+  }
+
+
+  @Test
+  @Ignore("this would be a bonus task :)")
+  public void testLazyLoadUser500() {
+    // user 500 does not exist in DB
+    EUserNoFk owner = Ebean.find(EUserNoFk.class, 500);
+    assertThat(owner).isNull();
+
+    // but there are files that are owned by #500
+    owner = Ebean.getReference(EUserNoFk.class, 500);
+    assertThat(owner.getUserId()).isEqualTo(500);
+    // this does not work yet, because the executed select contains a join:
+    // select t0.user_id, t1.file_name, t1.owner_user_id
+    //   from eowner_no_fk t0
+    //   left join efile_no_fk t1 on t1.owner_user_id = t0.user_id
+    //   where t0.user_id = ?   order by t0.user_id; --bind(500, )
+    //
+    // expected select (without join, as t0.user_id is already set and not neccessary to query):
+    // select t1.file_name, t1.owner_user_id
+    //   from efile_no_fk t1
+    //   where t1.owner_user_id = ?; --bind(500, )
+    //
+    assertThat(owner.getFiles()).hasSize(1);
+    assertThat(owner.getFiles().get(0).getFileName()).isEqualTo("java");
+
+  }
+
+  @Test
+  @Ignore("Bonus Task 2")
+  public void testM2mLazyLoadFile() {
+    List<EFileNoFk> files = Ebean.find(EFileNoFk.class).findList();
+    assertThat(files).hasSize(2);
+
+    EFileNoFk file1 = files.get(0);
+    EFileNoFk file2 = files.get(1);
+
+    assertThat(file1.getFileName()).isEqualTo("bash");
+    assertThat(file2.getFileName()).isEqualTo("java");
+
+
+    // Currently, the test will fail here, because the generated SQL is:
+    //
+    // select int_.efile_no_fk_file_name, t0.user_id, t0.user_name from euser_no_fk t0
+    //   left join efile_no_fk_euser_no_fk int_ on int_.euser_no_fk_user_id = t0.user_id
+    //  where (int_.efile_no_fk_file_name) in (?, ?, ?, ?, ? ) ; --bind(Array[5]={bash,java,bash,bash,bash})
+    //
+    // So as there is no entry in 'euser_no_fk', we also cannot read the m2m table
+    assertThat(file1.getEditors()).hasSize(3);
+    assertThat(file1.getEditorsSoftDel()).hasSize(3);
+
+    assertThat(file2.getEditors()).isEmpty();
+    assertThat(file2.getEditorsSoftDel()).isEmpty();
+
+
+    assertThat(file2.getEditors().get(2).getUserId()).isEqualTo(501);
+    assertThatThrownBy(()->file2.getEditors().get(2).getUserName())
+      .isInstanceOf(EntityNotFoundException.class)
+      .hasMessageContaining("id:501 - Bean has been deleted");
+
+    assertThat(file2.getEditorsSoftDel().get(2).getUserId()).isEqualTo(501);
+    assertThat(file2.getEditorsSoftDel().get(2).isDeleted()).isTrue();
+    assertThat(file2.getEditorsSoftDel().get(2).getUserName()).isNull();
+
+  }
+}

From 88a0c34d3732f8c48d95bd83e21ffb6fd3529a6b Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Tue, 13 Nov 2018 08:46:18 +0100
Subject: [PATCH 0537/1036] FIX: use outer join on "is null" check (#1535)

---
 .../server/expression/NullExpression.java     |   3 +
 .../java/org/tests/query/TestOuterJoin.java   | 197 ++++++++++++++++++
 2 files changed, 200 insertions(+)
 create mode 100644 src/test/java/org/tests/query/TestOuterJoin.java

diff --git a/src/main/java/io/ebeaninternal/server/expression/NullExpression.java b/src/main/java/io/ebeaninternal/server/expression/NullExpression.java
index 547bcb36d..ba81c0bef 100644
--- a/src/main/java/io/ebeaninternal/server/expression/NullExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/NullExpression.java
@@ -40,6 +40,9 @@ class NullExpression extends AbstractExpression {
       propertyPath = SplitName.split(propName)[0];
       propertyContainsMany(propertyPath, desc, manyWhereJoin);
     } else {
+      if (elProperty != null && elProperty.containsMany() && !notNull) {
+        manyWhereJoin.setRequireOuterJoins(true);
+      }
       propertyContainsMany(propName, desc, manyWhereJoin);
     }
   }
diff --git a/src/test/java/org/tests/query/TestOuterJoin.java b/src/test/java/org/tests/query/TestOuterJoin.java
new file mode 100644
index 000000000..29fdda09a
--- /dev/null
+++ b/src/test/java/org/tests/query/TestOuterJoin.java
@@ -0,0 +1,197 @@
+package org.tests.query;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.*;
+
+import java.util.List;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.Order;
+import org.tests.model.basic.ResetBasicData;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebeantest.LoggedSql;
+
+/**
+ * Tests if outer joins are correctly used.
+ *
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+public class TestOuterJoin extends BaseTestCase {
+
+  @BeforeClass
+  public static void setup() {
+    ResetBasicData.reset();
+  }
+
+
+  @Test
+  public void testOuterOnNullQuery() throws Exception {
+
+    LoggedSql.start();
+    List<Customer> list = Ebean.find(Customer.class).where()
+        .isNull("orders")
+        .le("id", 4) // ignore others than basicData
+        .findList();
+
+    assertThat(LoggedSql.collect().get(0))
+      .contains(" where not exists "); // perfored with not exists query
+    assertThat(list).hasSize(2);
+
+    // use OR construct
+    LoggedSql.start();
+    list = Ebean.find(Customer.class).where()
+        .or()
+          .isNull("orders.details.product.name")
+          .isNull("orders")
+        .endOr()
+        .le("id", 4) // ignore others than basicData
+        .findList();
+
+    assertThat(LoggedSql.collect().get(0))
+      .contains(" left join o_order ")
+      .contains(" left join o_order_detail ")
+      .contains(" left join o_product ")
+      .contains(" or not exists ");
+
+    assertThat(list).hasSize(4);
+
+    // use AND construct
+    LoggedSql.start();
+    list = Ebean.find(Customer.class).where()
+        .and()
+          .isNull("orders.details.product.name")
+          .isNull("orders")
+        .endAnd()
+        .le("id", 4) // ignore others than basicData
+        .findList();
+
+    assertThat(LoggedSql.collect().get(0))
+      .contains(" left join o_order ")
+      .contains(" left join o_order_detail ")
+      .contains(" left join o_product ")
+      .contains(" and not exists ");
+
+    assertThat(list).hasSize(2);
+
+    LoggedSql.start();
+    list = Ebean.find(Customer.class).where()
+        .isNull("orders.details.product.name")
+        .le("id", 4) // ignore others than basicData
+        .findList();
+
+    assertThat(LoggedSql.collect().get(0))
+      .contains(" left join o_order ")
+      .contains(" left join o_order_detail ")
+      .contains(" left join o_product ");
+    assertThat(list).hasSize(4);
+    LoggedSql.stop();
+  }
+
+  @Test
+  public void testInnerOnNonNullQuery() throws Exception {
+
+    LoggedSql.start();
+    List<Customer> list = Ebean.find(Customer.class).where()
+        .isNotNull("orders")
+        .le("id", 4) // ignore others than basicData
+        .findList();
+
+    assertThat(LoggedSql.collect().get(0))
+      .contains(" where exists "); // perfored with not exists query
+    assertThat(list).hasSize(2);
+
+    // use OR construct
+    LoggedSql.start();
+    list = Ebean.find(Customer.class).where()
+        .or()
+          .isNotNull("orders.details.product.name")
+          .isNotNull("orders")
+        .endOr()
+        .le("id", 4) // ignore others than basicData
+        .findList();
+
+    assertThat(LoggedSql.collect().get(0))
+      .contains(" left join o_order ")
+      .contains(" left join o_order_detail ")
+      .contains(" left join o_product ")
+      .contains(" or exists ");
+
+    assertThat(list).hasSize(2);
+
+    // use AND construct
+    LoggedSql.start();
+    list = Ebean.find(Customer.class).where()
+        .and()
+          .isNotNull("orders.details.product.name")
+          .isNotNull("orders")
+        .endAnd()
+        .le("id", 4) // ignore others than basicData
+        .findList();
+
+    assertThat(LoggedSql.collect().get(0))
+    .doesNotContain(" left join ")
+      .contains(" and exists ");
+
+    assertThat(list).hasSize(2);
+
+
+    LoggedSql.start();
+    list = Ebean.find(Customer.class).where()
+        .isNotNull("orders.details.product.name")
+        .le("id", 4) // ignore others than basicData
+        .findList();
+
+    assertThat(LoggedSql.collect().get(0))
+      .doesNotContain(" left join ");
+    assertThat(list).hasSize(2);
+    LoggedSql.stop();
+  }
+
+  @Test
+  public void testOuterOnFetch() throws Exception {
+    LoggedSql.start();
+
+    List<Order> orders1 =  Ebean.find(Order.class).findList();
+
+    assertThat(LoggedSql.collect().get(0))
+      .contains(" join o_customer") // ensure that we do not left join the customer
+      .doesNotContain(" left join o_customer");
+
+
+    // now fetch "details" bean, which may be optional
+    LoggedSql.start();
+
+    List<Order> orders2 =  Ebean.find(Order.class)
+        .fetch("details", "id").findList();
+
+    assertThat(LoggedSql.collect().get(0))
+      .contains(" left join o_order_detail ");
+
+    LoggedSql.stop();
+
+    // Note: You would expect, that the two lists are equal.
+    // but there is a @Where(clause = "${ta}.id > 0") on the details
+    // property, that will filter orders, where details is zero.
+
+    // The produced SQL is:
+    // select *  from o_order t0
+    //   join o_customer t2 on t2.id = t0.kcustomer_id
+    //   left join o_order_detail t1 on t1.order_id = t0.id
+    //   where t1.id > 0
+    //   order by t0.id, t1.id asc, t1.order_qty asc, t1.cretime desc; --bind()
+    //
+    // I think this is NOT correct as it may exclude orders without details or with negative ID
+    //
+    // Correct way could/would be, to add that extra where to the join
+    //
+    //
+
+    // assertThat(orders2).isEqualTo(orders1);
+  }
+
+}

From cfba4d2debc7ff1275694431cc75e53580e14c85 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Tue, 13 Nov 2018 08:53:38 +0100
Subject: [PATCH 0538/1036] Add Java 8 Time API support for BasicTypeConverter
 (#1537)

---
 .../server/core/BasicTypeConverter.java             | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/main/java/io/ebeaninternal/server/core/BasicTypeConverter.java b/src/main/java/io/ebeaninternal/server/core/BasicTypeConverter.java
index 5a82baf0a..b87a1c287 100644
--- a/src/main/java/io/ebeaninternal/server/core/BasicTypeConverter.java
+++ b/src/main/java/io/ebeaninternal/server/core/BasicTypeConverter.java
@@ -7,6 +7,10 @@ import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.sql.Timestamp;
 import java.sql.Types;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.Calendar;
 import java.util.UUID;
 
@@ -341,6 +345,9 @@ public final class BasicTypeConverter implements Serializable {
     } else if (value instanceof String) {
       return Timestamp.valueOf((String) value);
 
+    } else if (value instanceof LocalDateTime) {
+      return Timestamp.valueOf((LocalDateTime) value);
+
     } else if (value instanceof Number) {
       return new Timestamp(((Number) value).longValue());
 
@@ -361,6 +368,9 @@ public final class BasicTypeConverter implements Serializable {
     } else if (value instanceof String) {
       return java.sql.Time.valueOf((String) value);
 
+    } else if (value instanceof LocalTime) {
+      return java.sql.Time.valueOf((LocalTime) value);
+
     } else {
       String m = "Unable to convert [" + value.getClass().getName() + "] into a java.sql.Date.";
       throw new RuntimeException(m);
@@ -390,6 +400,9 @@ public final class BasicTypeConverter implements Serializable {
     } else if (value instanceof Number) {
       return new java.sql.Date(((Number) value).longValue());
 
+    } else if (value instanceof LocalDate) {
+      return java.sql.Date.valueOf((LocalDate)value);
+
     } else {
       String m = "Unable to convert [" + value.getClass().getName() + "] into a java.sql.Date.";
       throw new RuntimeException(m);

From ec24374d72ef0f21f986dc01cd26abe0e6f119b8 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Tue, 13 Nov 2018 08:55:09 +0100
Subject: [PATCH 0539/1036] Add some sanity checks when creating sort
 comparators (#1538)

---
 .../server/deploy/BeanDescriptor.java         |  9 ++++++++
 .../server/el/ElComparatorNoop.java           | 23 +++++++++++++++++++
 .../server/el/ElComparatorProperty.java       |  8 +++++++
 .../server/el/ElPropertyChain.java            |  3 +++
 4 files changed, 43 insertions(+)
 create mode 100644 src/main/java/io/ebeaninternal/server/el/ElComparatorNoop.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index d5f590d8f..979c4cf0b 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -61,6 +61,7 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyLists;
 import io.ebeaninternal.server.el.ElComparator;
 import io.ebeaninternal.server.el.ElComparatorCompound;
+import io.ebeaninternal.server.el.ElComparatorNoop;
 import io.ebeaninternal.server.el.ElComparatorProperty;
 import io.ebeaninternal.server.el.ElPropertyChainBuilder;
 import io.ebeaninternal.server.el.ElPropertyDeploy;
@@ -2443,7 +2444,15 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   private ElComparator<T> createPropertyComparator(SortByClause.Property sortProp) {
 
     ElPropertyValue elGetValue = getElGetValue(sortProp.getName());
+    if (elGetValue == null) {
+      logger.error("Sort property [" + sortProp + "] not found in " + beanType + ". Cannot sort.");
+      return new ElComparatorNoop<>();
+    }
 
+    if (elGetValue.isAssocMany()) {
+      logger.error("Sort property [" + sortProp + "] in " + beanType + " is a many-property. Cannot sort.");
+      return new ElComparatorNoop<>();
+    }
     Boolean nullsHigh = sortProp.getNullsHigh();
     if (nullsHigh == null) {
       nullsHigh = Boolean.TRUE;
diff --git a/src/main/java/io/ebeaninternal/server/el/ElComparatorNoop.java b/src/main/java/io/ebeaninternal/server/el/ElComparatorNoop.java
new file mode 100644
index 000000000..9377aa91c
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/el/ElComparatorNoop.java
@@ -0,0 +1,23 @@
+package io.ebeaninternal.server.el;
+
+/**
+ * Comparator with no operation for unsortable properties.
+ *
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+public class ElComparatorNoop<T> implements ElComparator<T> {
+
+  private static final long serialVersionUID = -9060871822183687180L;
+
+  @Override
+  public int compare(T o1, T o2) {
+    return 0;
+  }
+
+  @Override
+  public int compareValue(Object value, T o2) {
+    return 0;
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java b/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java
index 84f188167..d3ffb5aa2 100644
--- a/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java
+++ b/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java
@@ -2,6 +2,8 @@ package io.ebeaninternal.server.el;
 
 import java.util.Comparator;
 
+import io.ebean.bean.EntityBean;
+
 /**
  * Comparator based on a ElGetValue.
  */
@@ -42,9 +44,15 @@ public final class ElComparatorProperty<T> implements Comparator<T>, ElComparato
     if (val1 == null) {
       return val2 == null ? 0 : nullOrder;
     }
+    if (elGetValue.isAssocId()) {
+      val1 = elGetValue.getAssocIdValues((EntityBean) val1)[0]; // TODO: compound key not yet supported
+    }
     if (val2 == null) {
       return -1 * nullOrder;
     }
+    if (elGetValue.isAssocId()) {
+      val2 = elGetValue.getAssocIdValues((EntityBean) val2)[0];
+    }
     Comparable c = (Comparable) val1;
     return asc * c.compareTo(val2);
   }
diff --git a/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java b/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
index 7afd21a1f..c5a91e896 100644
--- a/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
+++ b/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
@@ -266,6 +266,9 @@ public class ElPropertyChain implements ElPropertyValue {
   @Override
   public Object pathGet(Object bean) {
     for (ElPropertyValue aChain : chain) {
+      if (aChain.isAssocMany()) {
+        throw new UnsupportedOperationException("pathGet not supported on [" + expression + "], because " + aChain + " is an assocMany property");
+      }
       bean = aChain.pathGet(bean);
       if (bean == null) {
         return null;

From e4cb5f04436b29fc1f8d262948ea9424fb265e13 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Tue, 13 Nov 2018 09:08:53 +0100
Subject: [PATCH 0540/1036] FIX for the limit query (#1540)

---
 .../ebean/config/dbplatform/LimitOffsetSqlLimiter.java   | 9 ++++-----
 .../io/ebean/config/dbplatform/db2/Db2SqlLimiter.java    | 2 ++
 .../io/ebean/config/dbplatform/hana/HanaSqlLimiter.java  | 8 ++++----
 src/test/java/org/tests/basic/TestLimitQuery.java        | 2 ++
 .../tests/query/TestAddOrderByWithFirstRowsMaxRows.java  | 3 ++-
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/main/java/io/ebean/config/dbplatform/LimitOffsetSqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/LimitOffsetSqlLimiter.java
index 81f9b7625..113a402e3 100644
--- a/src/main/java/io/ebean/config/dbplatform/LimitOffsetSqlLimiter.java
+++ b/src/main/java/io/ebean/config/dbplatform/LimitOffsetSqlLimiter.java
@@ -31,12 +31,11 @@ public class LimitOffsetSqlLimiter implements SqlLimiter {
     int firstRow = request.getFirstRow();
     int maxRows = request.getMaxRows();
 
-    if (maxRows > 0 || firstRow > 0) {
+    if (maxRows > 0) {
       sb.append(" ").append(LIMIT).append(" ").append(maxRows);
-      if (firstRow > 0) {
-        sb.append(" ").append(OFFSET).append(" ");
-        sb.append(firstRow);
-      }
+    }
+    if (firstRow > 0) {
+      sb.append(" ").append(OFFSET).append(" ").append(firstRow);
     }
 
     String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
diff --git a/src/main/java/io/ebean/config/dbplatform/db2/Db2SqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/db2/Db2SqlLimiter.java
index d8ae313ed..f22571082 100644
--- a/src/main/java/io/ebean/config/dbplatform/db2/Db2SqlLimiter.java
+++ b/src/main/java/io/ebean/config/dbplatform/db2/Db2SqlLimiter.java
@@ -20,6 +20,8 @@ public class Db2SqlLimiter implements SqlLimiter {
     if (maxRows > 0) {
       sb.append(" ").append(NEW_LINE).append("FETCH FIRST ").append(maxRows).append(" ROWS ONLY");
     }
+    // FIXME: There is no 'firstRow' support for DB2. Maybe we can use the MYS compatibility:
+    // https://www.ibm.com/developerworks/community/blogs/SQLTips4DB2LUW/entry/limit_offset?lang=en
 
     String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
     return new SqlLimitResponse(sql, false);
diff --git a/src/main/java/io/ebean/config/dbplatform/hana/HanaSqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/hana/HanaSqlLimiter.java
index bf8ca4e7b..bf3685c9d 100644
--- a/src/main/java/io/ebean/config/dbplatform/hana/HanaSqlLimiter.java
+++ b/src/main/java/io/ebean/config/dbplatform/hana/HanaSqlLimiter.java
@@ -22,11 +22,11 @@ public class HanaSqlLimiter implements SqlLimiter {
 
     if (maxRows > 0) {
       sb.append(" ").append("limit ").append(maxRows);
-      if (firstRow > 0) {
-        sb.append(" ").append("offset ");
-        sb.append(firstRow);
-      }
     }
+    if (firstRow > 0) {
+      sb.append(" ").append("offset ").append(firstRow);
+    }
+    // CHECKME: Roland Praml: as far as I see, this code does the same as 'LimotOffsetSqlLimiter'
 
     String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
 
diff --git a/src/test/java/org/tests/basic/TestLimitQuery.java b/src/test/java/org/tests/basic/TestLimitQuery.java
index be00b4e35..fdc6c4236 100644
--- a/src/test/java/org/tests/basic/TestLimitQuery.java
+++ b/src/test/java/org/tests/basic/TestLimitQuery.java
@@ -6,6 +6,7 @@ import io.ebean.Query;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.List;
@@ -22,6 +23,7 @@ public class TestLimitQuery extends BaseTestCase {
   }
 
   @Test
+  @Ignore("TODO: maxRows=-1 should become the default value for 'unset'")
   public void testMaxRowsZeroWithFirstRow() {
 
     ResetBasicData.reset();
diff --git a/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java b/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java
index b6a9d0a01..6fc4c3199 100644
--- a/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java
+++ b/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java
@@ -24,7 +24,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    Ebean.find(Order.class)
+    List<Order> list = Ebean.find(Order.class)
       .setFirstRow(3)
       .orderBy().asc("id")
       .findList();
@@ -33,6 +33,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
 
     assertThat(loggedSql).hasSize(1);
     assertThat(loggedSql.get(0)).contains("order by t0.id");
+    assertThat(list).isNotEmpty();
   }
 
 

From 7b4215f4f8c0c7da22f60aa27a727ce3dc66c13d Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Tue, 13 Nov 2018 09:09:53 +0100
Subject: [PATCH 0541/1036] Fix test data (#1541)

* FIX: Put correct dataType for anniversary

* NEW: Add some deterministic ship dates to reference data
---
 src/test/java/org/tests/model/basic/ResetBasicData.java | 6 ++++++
 src/test/java/org/tests/types/TestPeriodType.java       | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/tests/model/basic/ResetBasicData.java b/src/test/java/org/tests/model/basic/ResetBasicData.java
index 4248977c4..c0112d21a 100644
--- a/src/test/java/org/tests/model/basic/ResetBasicData.java
+++ b/src/test/java/org/tests/model/basic/ResetBasicData.java
@@ -5,6 +5,7 @@ import io.ebean.EbeanServer;
 import org.tests.model.basic.Order.Status;
 
 import java.sql.Date;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -264,6 +265,7 @@ public class ResetBasicData {
 
     Order order = new Order();
     order.setCustomer(customer);
+    order.setOrderDate(Date.valueOf("2018-07-01"));
 
     List<OrderDetail> details = new ArrayList<>();
     details.add(new OrderDetail(product1, 5, 10.50));
@@ -285,6 +287,7 @@ public class ResetBasicData {
     Order order = new Order();
     order.setStatus(Status.SHIPPED);
     order.setCustomer(customer);
+    order.setOrderDate(Date.valueOf("2018-06-01"));
 
     List<OrderDetail> details = new ArrayList<>();
     details.add(new OrderDetail(product1, 4, 10.50));
@@ -303,6 +306,7 @@ public class ResetBasicData {
     Order order = new Order();
     order.setStatus(Status.COMPLETE);
     order.setCustomer(customer);
+    order.setOrderDate(Date.valueOf("2018-07-02"));
 
     List<OrderDetail> details = new ArrayList<>();
     details.add(new OrderDetail(product1, 3, 10.50));
@@ -319,6 +323,7 @@ public class ResetBasicData {
 
     Order order = new Order();
     order.setCustomer(customer);
+    order.setOrderDate(Date.valueOf("2018-07-04"));
 
     order.addShipment(new OrderShipment());
 
@@ -329,6 +334,7 @@ public class ResetBasicData {
 
     Order order = new Order();
     order.setCustomer(customer);
+    order.setOrderDate(Date.valueOf("2018-06-28"));
     order.addShipment(new OrderShipment());
 
     Ebean.save(order);
diff --git a/src/test/java/org/tests/types/TestPeriodType.java b/src/test/java/org/tests/types/TestPeriodType.java
index 510d40963..ef753550e 100644
--- a/src/test/java/org/tests/types/TestPeriodType.java
+++ b/src/test/java/org/tests/types/TestPeriodType.java
@@ -52,7 +52,7 @@ public class TestPeriodType extends BaseTestCase {
     // ... and can use LocalDate to bind
     anniversaryList = Ebean.find(SomePeriodBean.class)
       .where()
-      .gt("anniversary", LocalDate.of(2000, 4, 22))
+      .gt("anniversary", MonthDay.of(4, 22))
       .findList();
 
     assertEquals(1, anniversaryList.size());

From 89c0324e42254e865c1954a4c629537562417e37 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 13 Nov 2018 21:26:56 +1300
Subject: [PATCH 0542/1036] #1544 - No effective change - use https://ebean.io
 for urls

---
 src/main/java/io/ebean/Ebean.java                             | 2 +-
 src/main/java/io/ebean/config/BeanNotEnhancedException.java   | 2 +-
 src/main/java/io/ebean/config/BeanNotRegisteredException.java | 2 +-
 .../io/ebeaninternal/server/deploy/BeanDescriptorManager.java | 4 ++--
 .../ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java  | 2 +-
 .../server/deploy/parse/AnnotationAssocManys.java             | 2 +-
 .../server/deploy/parse/AnnotationAssocOnes.java              | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/ebean/Ebean.java b/src/main/java/io/ebean/Ebean.java
index cd27c7109..099ff6a95 100644
--- a/src/main/java/io/ebean/Ebean.java
+++ b/src/main/java/io/ebean/Ebean.java
@@ -168,7 +168,7 @@ public final class Ebean {
       } catch (DataSourceConfigurationException e) {
         String msg = "Configuration error creating DataSource for the default EbeanServer." +
           " This typically means a missing application-test.yml or missing ebean-test-config dependency." +
-          " See https://ebean-orm.github.io/docs/trouble-shooting#datasource";
+          " See https://ebean.io/docs/trouble-shooting#datasource";
         throw new DataSourceConfigurationException(msg, e);
 
       } catch (Throwable e) {
diff --git a/src/main/java/io/ebean/config/BeanNotEnhancedException.java b/src/main/java/io/ebean/config/BeanNotEnhancedException.java
index 21e1a5b1a..3f42875db 100644
--- a/src/main/java/io/ebean/config/BeanNotEnhancedException.java
+++ b/src/main/java/io/ebean/config/BeanNotEnhancedException.java
@@ -3,7 +3,7 @@ package io.ebean.config;
 /**
  * Throw when an processing an entity bean that is not bytecode enhanced.
  *
- * Refer: https://ebean-orm.github.io/docs/trouble-shooting#not-enhanced
+ * Refer: https://ebean.io/docs/trouble-shooting#not-enhanced
  */
 public class BeanNotEnhancedException extends IllegalStateException {
 
diff --git a/src/main/java/io/ebean/config/BeanNotRegisteredException.java b/src/main/java/io/ebean/config/BeanNotRegisteredException.java
index 840482d59..dc722e8b4 100644
--- a/src/main/java/io/ebean/config/BeanNotRegisteredException.java
+++ b/src/main/java/io/ebean/config/BeanNotRegisteredException.java
@@ -3,7 +3,7 @@ package io.ebean.config;
 /**
  * Throw when an processing thinks a bean is not registered.
  *
- * Refer: https://ebean-orm.github.io/docs/trouble-shooting#not-registered
+ * Refer: https://ebean.io/docs/trouble-shooting#not-registered
  */
 public class BeanNotRegisteredException extends IllegalStateException {
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 0abaf7a06..8234c4ce4 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -1558,7 +1558,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
     if (!hasEntityBeanInterface(beanClass)) {
       String msg = "Bean " + beanClass + " is not enhanced? If you are running in IDEA or Eclipse check" +
-        " that the enhancement plugin is installed. See https://ebean-orm.github.io/docs/trouble-shooting#not-enhanced";
+        " that the enhancement plugin is installed. See https://ebean.io/docs/trouble-shooting#not-enhanced";
       throw new BeanNotEnhancedException(msg);
     }
 
@@ -1588,7 +1588,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
         // ok to stop and treat just the same as Object.class
         return;
       }
-      throw new BeanNotEnhancedException("Super type " + superclass + " is not enhanced? See https://ebean-orm.github.io/docs/trouble-shooting#not-enhanced");
+      throw new BeanNotEnhancedException("Super type " + superclass + " is not enhanced? See https://ebean.io/docs/trouble-shooting#not-enhanced");
     }
 
     // recursively continue up the inheritance hierarchy
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java b/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java
index d4f4cd4a5..cfc8e306f 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java
@@ -22,7 +22,7 @@ public class BeanEmbeddedMetaFactory {
     BeanDescriptor<?> targetDesc = owner.getBeanDescriptor(prop.getTargetType());
     if (targetDesc == null) {
       String msg = "Could not find BeanDescriptor for " + prop.getTargetType()
-        + ". Perhaps the EmbeddedId class is not registered? See https://ebean-orm.github.io/docs/trouble-shooting#not-registered";
+        + ". Perhaps the EmbeddedId class is not registered? See https://ebean.io/docs/trouble-shooting#not-registered";
       throw new BeanNotRegisteredException(msg);
     }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index 7ed87e639..06ff2122d 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -431,7 +431,7 @@ class AnnotationAssocManys extends AnnotationParser {
 
 
   private String errorMsgMissingBeanTable(Class<?> type, String from) {
-    return "Error with association to [" + type + "] from [" + from + "]. Is " + type + " registered? See https://ebean-orm.github.io/docs/trouble-shooting#not-registered";
+    return "Error with association to [" + type + "] from [" + from + "]. Is " + type + " registered? See https://ebean.io/docs/trouble-shooting#not-registered";
   }
 
   private void readToMany(ManyToMany propAnn, DeployBeanPropertyAssocMany<?> manyProp) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index c17b5e708..1932970fe 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -195,7 +195,7 @@ public class AnnotationAssocOnes extends AnnotationParser {
   }
 
   private String errorMsgMissingBeanTable(Class<?> type, String from) {
-    return "Error with association to [" + type + "] from [" + from + "]. Is " + type + " registered? Does it have the @Entity annotation? See https://ebean-orm.github.io/docs/trouble-shooting#not-registered";
+    return "Error with association to [" + type + "] from [" + from + "]. Is " + type + " registered? Does it have the @Entity annotation? See https://ebean.io/docs/trouble-shooting#not-registered";
   }
 
   private BeanTable beanTable(DeployBeanPropertyAssoc<?> prop) {

From f09b38c58c40d986eb31f82bb96a298a4873f5f5 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 13 Nov 2018 21:33:44 +1300
Subject: [PATCH 0543/1036] #1545 - Bump ebean-datasource to 4.2.2 fix for leak
 with SQLWarning and Postgres JDBC driver

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9068b335d..13e5ae0dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-datasource</artifactId>
-      <version>4.2.1</version>
+      <version>4.2.2</version>
     </dependency>
 
     <dependency>

From 01d9dd3fe86b51639442d6d69610653eee5e04a6 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 13 Nov 2018 23:37:45 +1300
Subject: [PATCH 0544/1036] #1533 - Enhanced bean can not use final fields in
 Java 9+.

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 13e5ae0dc..0db8e3e5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -229,7 +229,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-agent</artifactId>
-      <version>11.24.1</version>
+      <version>11.25.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -309,7 +309,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>11.24.1</version>
+        <version>11.25.1</version>
         <executions>
           <execution>
             <id>test</id>

From 105f08cca1aaa736c948aafc12d74746b0dde6db Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Tue, 13 Nov 2018 11:41:36 +0100
Subject: [PATCH 0545/1036] FIX: Pairs must not be modified by query (#1539)

* FIX: Pairs must not be modified by query

* Modification can also occur on inValues.

* fixed tests

* removed obsolete line
---
 src/main/java/io/ebean/Pairs.java             |  3 +-
 .../api/NaturalKeyQueryData.java              | 28 +++++++++----------
 .../server/expression/InExpression.java       | 12 ++++++--
 .../server/expression/InPairsExpression.java  | 17 +++++++----
 .../cache/TestCacheViaComplexNaturalKey3.java | 14 ++++++----
 5 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/src/main/java/io/ebean/Pairs.java b/src/main/java/io/ebean/Pairs.java
index d32d1c986..3c99bceed 100644
--- a/src/main/java/io/ebean/Pairs.java
+++ b/src/main/java/io/ebean/Pairs.java
@@ -1,6 +1,7 @@
 package io.ebean;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -125,7 +126,7 @@ public class Pairs {
    * Return all the value pairs.
    */
   public List<Entry> getEntries() {
-    return entries;
+    return Collections.unmodifiableList(entries);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java b/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java
index d542404f4..ddd02d768 100644
--- a/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java
+++ b/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java
@@ -25,7 +25,7 @@ public class NaturalKeyQueryData<T> {
   private List<Pairs.Entry> inPairs;
 
   // IN clause - only one allowed
-  private Collection<?> inValues;
+  private List<Object> inValues;
   private String inProperty;
 
   // normal EQ expressions
@@ -52,36 +52,36 @@ public class NaturalKeyQueryData<T> {
   /**
    * Match for In Pairs expression. We only allow one IN clause.
    */
-  public boolean matchInPairs(Pairs pairs) {
+  public List<Pairs.Entry> matchInPairs(String property0, String property1, List<Pairs.Entry> inPairs) {
     if (hasIn) {
       // only 1 IN allowed (to project naturalIds)
-      return false;
+      return null;
     }
-    if (matchProperty(pairs.getProperty0()) && matchProperty(pairs.getProperty1())) {
+    if (matchProperty(property0) && matchProperty(property1)) {
       this.hasIn = true;
-      this.inProperty0 = pairs.getProperty0();
-      this.inProperty1 = pairs.getProperty1();
-      this.inPairs = pairs.getEntries();
-      return true;
+      this.inProperty0 = property0;
+      this.inProperty1 = property1;
+      this.inPairs = new ArrayList<>(inPairs); // will be modified
+      return this.inPairs;
     }
-    return false;
+    return null;
   }
 
   /**
    * Match for IN expression. We only allow one IN clause.
    */
-  public boolean matchIn(String propName, Collection<?> sourceValues) {
+  public List<Object> matchIn(String propName, List<Object> sourceValues) {
     if (hasIn) {
       // only 1 IN allowed (to project naturalIds)
-      return false;
+      return null;
     }
     if (matchProperty(propName)) {
       this.hasIn = true;
       this.inProperty = propName;
-      this.inValues = sourceValues;
-      return true;
+      this.inValues = new ArrayList<>(sourceValues);
+      return this.inValues;
     }
-    return false;
+    return null;
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/expression/InExpression.java b/src/main/java/io/ebeaninternal/server/expression/InExpression.java
index c1101b9a2..ccb1a5862 100644
--- a/src/main/java/io/ebeaninternal/server/expression/InExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/InExpression.java
@@ -48,8 +48,16 @@ class InExpression extends AbstractExpression {
 
   @Override
   public boolean naturalKey(NaturalKeyQueryData<?> data) {
-    // can't use naturalKey cache for NOT IN
-    return !not && data.matchIn(propName, bindValues);
+    // can't use naturalKey cache for NOT IN or if multi values are used
+    if (not || multiValueSupported) {
+      return false;
+    }
+    List<Object> copy = data.matchIn(propName, bindValues);
+    if (copy == null) {
+      return false;
+    }
+    bindValues = copy;
+    return true;
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java b/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
index 2147af1a2..07dbc2945 100644
--- a/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.Pairs;
+import io.ebean.Pairs.Entry;
 import io.ebean.event.BeanQueryRequest;
 import io.ebeaninternal.api.NaturalKeyQueryData;
 import io.ebeaninternal.api.SpiExpression;
@@ -15,11 +16,9 @@ class InPairsExpression extends AbstractExpression {
 
   private final boolean not;
 
-  private final Pairs pairs;
-
   private final String property0, property1;
 
-  private final List<Pairs.Entry> entries;
+  private List<Pairs.Entry> entries;
 
   private boolean multiValueSupported;
 
@@ -31,9 +30,9 @@ class InPairsExpression extends AbstractExpression {
 
   InPairsExpression(Pairs pairs, boolean not) {
     super(pairs.getProperty0());
-    this.pairs = pairs;
     this.property0 = pairs.getProperty0();
     this.property1 = pairs.getProperty1();
+    // the entries might be modified on cache hit.
     this.entries = pairs.getEntries();
     this.not = not;
     this.separator = pairs.getConcatSeparator();
@@ -42,7 +41,15 @@ class InPairsExpression extends AbstractExpression {
 
   @Override
   public boolean naturalKey(NaturalKeyQueryData<?> data) {
-    return !not && data.matchInPairs(pairs);
+    if (not) {
+      return false;
+    }
+    List<Entry> copy = data.matchInPairs(property0, property1, entries);
+    if (copy == null) {
+      return false;
+    }
+    entries = copy;
+    return true;
   }
 
   @Override
diff --git a/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java b/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
index 34a484ce9..1f1073116 100644
--- a/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
+++ b/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
@@ -31,9 +31,9 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
     if (!loadOnce) {
       Ebean.find(OCachedNatKeyBean3.class).delete();
 
-      List<String> stores = new ArrayList<>(Arrays.asList("abc", "def"));
+      List<String> stores =Arrays.asList("abc", "def");
       for (String store : stores) {
-        List<String> skus = new ArrayList<>(Arrays.asList("1", "2", "3"));
+        List<String> skus = Arrays.asList("1", "2", "3");
         for (String sku : skus) {
           int[] codes = {1000,1001,1002,1003,1004};
           for (int code : codes) {
@@ -99,7 +99,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
     loadSomeIntoCache();
 
 
-    List<Integer> codes = new ArrayList<>(Arrays.asList(1001, 1000, 1002, 1003));
+    List<Integer> codes = Arrays.asList(1001, 1000, 1002, 1003);
 
     LoggedSqlCollector.start();
 
@@ -132,7 +132,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
     setup();
     loadSomeIntoCache();
 
-    List<String> skus = new ArrayList<>(Arrays.asList("2", "3"));
+    List<String> skus = Arrays.asList("2", "3");
 
     LoggedSqlCollector.start();
 
@@ -162,7 +162,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
     loadSomeIntoCache();
 
     String storeId = "abc";
-    List<String> skus = new ArrayList<>(Arrays.asList("3", "2", "4"));
+    List<String> skus = Arrays.asList("3", "2", "4");
 
     LoggedSqlCollector.start();
 
@@ -272,6 +272,8 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.stop();
 
+    assertThat(pairs.getEntries()).hasSize(3);
+
     assertThat(list).hasSize(3);
     assertNaturalKeyHitMiss(1, 2);
     assertBeanCacheHitMiss(1, 0);
@@ -313,6 +315,8 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.stop();
 
+    assertThat(pairs.getEntries()).hasSize(3);
+
     assertThat(list).hasSize(3);
     assertNaturalKeyHitMiss(1, 2);
     assertBeanCacheHitMiss(1, 0);

From 54a4fd75f120d3e54a8c3c2061a6fb69d25dc28a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 13 Nov 2018 23:44:16 +1300
Subject: [PATCH 0546/1036] #1539 - FIX: Pairs must not be modified by query

Remove the (|| multiValueSupported) part
---
 .../java/io/ebeaninternal/server/expression/InExpression.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/expression/InExpression.java b/src/main/java/io/ebeaninternal/server/expression/InExpression.java
index ccb1a5862..8e21c112f 100644
--- a/src/main/java/io/ebeaninternal/server/expression/InExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/InExpression.java
@@ -48,8 +48,8 @@ class InExpression extends AbstractExpression {
 
   @Override
   public boolean naturalKey(NaturalKeyQueryData<?> data) {
-    // can't use naturalKey cache for NOT IN or if multi values are used
-    if (not || multiValueSupported) {
+    // can't use naturalKey cache for NOT IN
+    if (not) {
       return false;
     }
     List<Object> copy = data.matchIn(propName, bindValues);

From 4bd3a0f2936ed6bbd79866c83f3d619bb141c3e8 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 13 Nov 2018 23:50:13 +1300
Subject: [PATCH 0547/1036] #1546 - Refactor: Swap from
 entityBean._ebean_intercept() to entityBean._ebean_getIntercept()

---
 .../io/ebeaninternal/server/cache/CachedBeanDataFromBean.java | 2 +-
 src/main/java/io/ebeaninternal/server/core/DefaultServer.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java b/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java
index e894a8710..c91fee62d 100644
--- a/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java
+++ b/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java
@@ -66,7 +66,7 @@ public class CachedBeanDataFromBean {
       Object v = aPropertiesNonTransient.getValue(bean);
       aPropertiesNonTransient.setValue(sharableBean, v);
     }
-    EntityBeanIntercept intercept = sharableBean._ebean_intercept();
+    EntityBeanIntercept intercept = sharableBean._ebean_getIntercept();
     intercept.setReadOnly(true);
     intercept.setLoaded();
     return sharableBean;
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index be4693ff7..df991c343 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -2351,7 +2351,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
 
     Object id = idProperty.getVal(entityBean);
-    if (entityBean._ebean_intercept().isNew() && id != null) {
+    if (entityBean._ebean_getIntercept().isNew() && id != null) {
       // Primary Key is changeable only on new models - so skip check if we are not
       // new.
       Query<?> query = new DefaultOrmQuery<>(beanDesc, this, expressionFactory);
@@ -2381,7 +2381,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     Query<?> query = new DefaultOrmQuery<>(beanDesc, this, expressionFactory);
     ExpressionList<?> exprList = query.where();
 
-    if (!entityBean._ebean_intercept().isNew()) {
+    if (!entityBean._ebean_getIntercept().isNew()) {
       // if model is not new, exclude ourself.
       exprList.ne(idProperty.getName(), idProperty.getVal(entityBean));
     }

From 33d104e6aacc477bf8d855922e41e6f07c5c8dd6 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 13 Nov 2018 23:52:35 +1300
Subject: [PATCH 0548/1036] Bump version to 11.25.1-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0db8e3e5c..00b993ee7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.24.2-SNAPSHOT</version>
+  <version>11.25.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>

From c3f41f4157f79e80194e975b8ca1330369ebf594 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 13 Nov 2018 23:58:22 +1300
Subject: [PATCH 0549/1036] [maven-release-plugin] prepare release
 ebean-11.25.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 00b993ee7..c0d8e2a8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.25.1-SNAPSHOT</version>
+  <version>11.25.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.25.1</tag>
   </scm>
 
   <profiles>

From 528ad7c7fb2a065639394d6840d0143e603e7fe5 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 13 Nov 2018 23:58:37 +1300
Subject: [PATCH 0550/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c0d8e2a8e..7d52b8b8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.25.1</version>
+  <version>11.25.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.25.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From c074b7c4572456bef2a38da1545d72ce1727c467 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 14 Nov 2018 09:29:36 +1300
Subject: [PATCH 0551/1036] #1547 - Revert for - FIX for the limit query #1540

---
 .../ebean/config/dbplatform/LimitOffsetSqlLimiter.java   | 9 +++++----
 .../io/ebean/config/dbplatform/db2/Db2SqlLimiter.java    | 2 --
 .../io/ebean/config/dbplatform/hana/HanaSqlLimiter.java  | 8 ++++----
 src/test/java/org/tests/basic/TestLimitQuery.java        | 6 ++----
 .../tests/query/TestAddOrderByWithFirstRowsMaxRows.java  | 3 +--
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/main/java/io/ebean/config/dbplatform/LimitOffsetSqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/LimitOffsetSqlLimiter.java
index 113a402e3..81f9b7625 100644
--- a/src/main/java/io/ebean/config/dbplatform/LimitOffsetSqlLimiter.java
+++ b/src/main/java/io/ebean/config/dbplatform/LimitOffsetSqlLimiter.java
@@ -31,11 +31,12 @@ public class LimitOffsetSqlLimiter implements SqlLimiter {
     int firstRow = request.getFirstRow();
     int maxRows = request.getMaxRows();
 
-    if (maxRows > 0) {
+    if (maxRows > 0 || firstRow > 0) {
       sb.append(" ").append(LIMIT).append(" ").append(maxRows);
-    }
-    if (firstRow > 0) {
-      sb.append(" ").append(OFFSET).append(" ").append(firstRow);
+      if (firstRow > 0) {
+        sb.append(" ").append(OFFSET).append(" ");
+        sb.append(firstRow);
+      }
     }
 
     String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
diff --git a/src/main/java/io/ebean/config/dbplatform/db2/Db2SqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/db2/Db2SqlLimiter.java
index f22571082..d8ae313ed 100644
--- a/src/main/java/io/ebean/config/dbplatform/db2/Db2SqlLimiter.java
+++ b/src/main/java/io/ebean/config/dbplatform/db2/Db2SqlLimiter.java
@@ -20,8 +20,6 @@ public class Db2SqlLimiter implements SqlLimiter {
     if (maxRows > 0) {
       sb.append(" ").append(NEW_LINE).append("FETCH FIRST ").append(maxRows).append(" ROWS ONLY");
     }
-    // FIXME: There is no 'firstRow' support for DB2. Maybe we can use the MYS compatibility:
-    // https://www.ibm.com/developerworks/community/blogs/SQLTips4DB2LUW/entry/limit_offset?lang=en
 
     String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
     return new SqlLimitResponse(sql, false);
diff --git a/src/main/java/io/ebean/config/dbplatform/hana/HanaSqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/hana/HanaSqlLimiter.java
index bf3685c9d..bf8ca4e7b 100644
--- a/src/main/java/io/ebean/config/dbplatform/hana/HanaSqlLimiter.java
+++ b/src/main/java/io/ebean/config/dbplatform/hana/HanaSqlLimiter.java
@@ -22,11 +22,11 @@ public class HanaSqlLimiter implements SqlLimiter {
 
     if (maxRows > 0) {
       sb.append(" ").append("limit ").append(maxRows);
+      if (firstRow > 0) {
+        sb.append(" ").append("offset ");
+        sb.append(firstRow);
+      }
     }
-    if (firstRow > 0) {
-      sb.append(" ").append("offset ").append(firstRow);
-    }
-    // CHECKME: Roland Praml: as far as I see, this code does the same as 'LimotOffsetSqlLimiter'
 
     String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
 
diff --git a/src/test/java/org/tests/basic/TestLimitQuery.java b/src/test/java/org/tests/basic/TestLimitQuery.java
index fdc6c4236..6e92f6b61 100644
--- a/src/test/java/org/tests/basic/TestLimitQuery.java
+++ b/src/test/java/org/tests/basic/TestLimitQuery.java
@@ -3,11 +3,10 @@ package org.tests.basic;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import org.junit.Assert;
+import org.junit.Test;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
 
 import java.util.List;
 
@@ -23,7 +22,6 @@ public class TestLimitQuery extends BaseTestCase {
   }
 
   @Test
-  @Ignore("TODO: maxRows=-1 should become the default value for 'unset'")
   public void testMaxRowsZeroWithFirstRow() {
 
     ResetBasicData.reset();
diff --git a/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java b/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java
index 6fc4c3199..b6a9d0a01 100644
--- a/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java
+++ b/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java
@@ -24,7 +24,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    List<Order> list = Ebean.find(Order.class)
+    Ebean.find(Order.class)
       .setFirstRow(3)
       .orderBy().asc("id")
       .findList();
@@ -33,7 +33,6 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
 
     assertThat(loggedSql).hasSize(1);
     assertThat(loggedSql.get(0)).contains("order by t0.id");
-    assertThat(list).isNotEmpty();
   }
 
 

From 658ee3d39f4368f012ed1de647902a36edf30a3d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 14 Nov 2018 09:32:25 +1300
Subject: [PATCH 0552/1036] Bump to 11.26.1-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7d52b8b8f..8a98afc21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.25.2-SNAPSHOT</version>
+  <version>11.26.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>

From 903ee35d63f7a47f0cbed991d53a175a5785f01e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 14 Nov 2018 09:33:50 +1300
Subject: [PATCH 0553/1036] [maven-release-plugin] prepare release
 ebean-11.26.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8a98afc21..05e8d3d2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.26.1-SNAPSHOT</version>
+  <version>11.26.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.26.1</tag>
   </scm>
 
   <profiles>

From 68da8944ed4104551c96e488cbd0d1559405897f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 14 Nov 2018 09:34:02 +1300
Subject: [PATCH 0554/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 05e8d3d2d..4c8e05980 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.26.1</version>
+  <version>11.26.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.26.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From b3584a81b4d2f49c83523dc3776d7727829b02d9 Mon Sep 17 00:00:00 2001
From: ooknight <ooknight@163.com>
Date: Mon, 19 Nov 2018 16:45:05 +0800
Subject: [PATCH 0555/1036] add global configuration disableLazyLoading (#1548)

---
 .../java/io/ebean/config/ServerConfig.java    | 11 ++++++++
 .../server/querydefn/DefaultOrmQuery.java     |  1 +
 .../tests/basic/TestLazyLoadGlobalConfig.java | 26 +++++++++++++++++++
 src/test/resources/test-ebean.properties      |  4 ++-
 4 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/org/tests/basic/TestLazyLoadGlobalConfig.java

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index a1f622568..8c4ddfe38 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -229,6 +229,8 @@ public class ServerConfig {
 
   private int persistBatchSize = 20;
 
+  private boolean disableLazyLoading;
+
   /**
    * The default batch size for lazy loading
    */
@@ -927,6 +929,14 @@ public class ServerConfig {
     this.queryBatchSize = queryBatchSize;
   }
 
+  public boolean isDisableLazyLoading() {
+    return disableLazyLoading;
+  }
+
+  public void setDisableLazyLoading(boolean disableLazyLoading) {
+    this.disableLazyLoading = disableLazyLoading;
+  }
+
   /**
    * Return the default batch size for lazy loading of beans and collections.
    */
@@ -2896,6 +2906,7 @@ public class ServerConfig {
     localTimeWithNanos = p.getBoolean("localTimeWithNanos", localTimeWithNanos);
     jodaLocalTimeMode = p.get("jodaLocalTimeMode", jodaLocalTimeMode);
 
+    disableLazyLoading = p.getBoolean("disableLazyLoading", disableLazyLoading);
     lazyLoadBatchSize = p.getInt("lazyLoadBatchSize", lazyLoadBatchSize);
     queryBatchSize = p.getInt("queryBatchSize", queryBatchSize);
 
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 33710a1d9..88469e3d8 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -284,6 +284,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     this.orderById = server.getServerConfig().isDefaultOrderById();
     this.expressionFactory = expressionFactory;
     this.detail = new OrmQueryDetail();
+    this.disableLazyLoading = server.getServerConfig().isDisableLazyLoading();
   }
 
   public void setNativeSql(String nativeSql) {
diff --git a/src/test/java/org/tests/basic/TestLazyLoadGlobalConfig.java b/src/test/java/org/tests/basic/TestLazyLoadGlobalConfig.java
new file mode 100644
index 000000000..4c294607f
--- /dev/null
+++ b/src/test/java/org/tests/basic/TestLazyLoadGlobalConfig.java
@@ -0,0 +1,26 @@
+package org.tests.basic;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.junit.Assert;
+import org.junit.Test;
+import org.tests.model.basic.Contact;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
+
+import java.util.List;
+
+public class TestLazyLoadGlobalConfig extends BaseTestCase {
+
+  @Test
+  public void test() {
+    ResetBasicData.reset();
+
+    Customer customer = Ebean.find(Customer.class, 1);
+
+    if (customer != null) {
+      List<Contact> contacts = customer.getContacts();
+      Assert.assertEquals(0, contacts.size());
+    }
+  }
+}
diff --git a/src/test/resources/test-ebean.properties b/src/test/resources/test-ebean.properties
index b64de6610..39ee02486 100644
--- a/src/test/resources/test-ebean.properties
+++ b/src/test/resources/test-ebean.properties
@@ -4,4 +4,6 @@ datasource.h2.username=sa
 ebean.jodaLocalTimeMode=normal
 #ebean.jodaLocalTimeMode=utc
 
-#ebean.skipCacheAfterWrite=false
\ No newline at end of file
+#ebean.skipCacheAfterWrite=false
+
+ebean.disableLazyLoading=true

From 55e4c7bc26d61352a22621a60667b18d942f1628 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 19 Nov 2018 22:03:51 +1300
Subject: [PATCH 0556/1036] #1548 add global configuration disableLazyLoading

Fix tests
---
 .../config/PlatformNoGeneratedKeysTest.java   | 18 +++++++++++++
 .../tests/basic/TestLazyLoadGlobalConfig.java | 26 -------------------
 src/test/resources/test-ebean.properties      |  1 -
 3 files changed, 18 insertions(+), 27 deletions(-)
 delete mode 100644 src/test/java/org/tests/basic/TestLazyLoadGlobalConfig.java

diff --git a/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java b/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java
index af873247e..b5ea52414 100644
--- a/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java
+++ b/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java
@@ -17,6 +17,23 @@ public class PlatformNoGeneratedKeysTest {
 
   static EbeanServer server = testH2Server();
 
+  @Test
+  public void global_serverConfig_setDisableLazyLoading() {
+
+    EBasicVer b0 = new EBasicVer("basic");
+    b0.setDescription("some description");
+
+    server.save(b0);
+
+    EBasicVer found = server.find(EBasicVer.class)
+      .select("name")
+      .setId(b0.getId())
+      .findOne();
+
+    assertThat(found.getName()).isEqualTo("basic");
+    assertThat(found.getDescription()).isNull();
+  }
+
   @Test
   public void insertBatch_expect_noIdValuesFetched() {
 
@@ -81,6 +98,7 @@ public class PlatformNoGeneratedKeysTest {
     config.getDataSourceConfig().setUrl("jdbc:h2:mem:withPCQuery;");
     config.getDataSourceConfig().setDriver("org.h2.Driver");
 
+    config.setDisableLazyLoading(true);
     config.setDisableL2Cache(true);
     config.setDefaultServer(false);
     config.setRegister(false);
diff --git a/src/test/java/org/tests/basic/TestLazyLoadGlobalConfig.java b/src/test/java/org/tests/basic/TestLazyLoadGlobalConfig.java
deleted file mode 100644
index 4c294607f..000000000
--- a/src/test/java/org/tests/basic/TestLazyLoadGlobalConfig.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.tests.basic;
-
-import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
-import org.junit.Assert;
-import org.junit.Test;
-import org.tests.model.basic.Contact;
-import org.tests.model.basic.Customer;
-import org.tests.model.basic.ResetBasicData;
-
-import java.util.List;
-
-public class TestLazyLoadGlobalConfig extends BaseTestCase {
-
-  @Test
-  public void test() {
-    ResetBasicData.reset();
-
-    Customer customer = Ebean.find(Customer.class, 1);
-
-    if (customer != null) {
-      List<Contact> contacts = customer.getContacts();
-      Assert.assertEquals(0, contacts.size());
-    }
-  }
-}
diff --git a/src/test/resources/test-ebean.properties b/src/test/resources/test-ebean.properties
index 39ee02486..a8a89e96b 100644
--- a/src/test/resources/test-ebean.properties
+++ b/src/test/resources/test-ebean.properties
@@ -6,4 +6,3 @@ ebean.jodaLocalTimeMode=normal
 
 #ebean.skipCacheAfterWrite=false
 
-ebean.disableLazyLoading=true

From 06b71781f508886bc22ad0b7a9bc8f2e940f158e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 19 Nov 2018 22:08:50 +1300
Subject: [PATCH 0557/1036] #1548 add global configuration disableLazyLoading

Add javadoc
---
 src/main/java/io/ebean/config/ServerConfig.java        | 10 +++++++++-
 .../server/querydefn/DefaultOrmQuery.java              |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 8c4ddfe38..297a9e70d 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -14,6 +14,7 @@ import io.ebean.config.dbplatform.DbEncrypt;
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.properties.PropertiesLoader;
+import io.ebean.datasource.DataSourceConfig;
 import io.ebean.event.BeanFindController;
 import io.ebean.event.BeanPersistController;
 import io.ebean.event.BeanPersistListener;
@@ -30,7 +31,6 @@ import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.meta.MetaInfoManager;
 import io.ebean.migration.MigrationRunner;
 import io.ebean.util.StringHelper;
-import io.ebean.datasource.DataSourceConfig;
 
 import javax.sql.DataSource;
 import java.time.Clock;
@@ -929,10 +929,18 @@ public class ServerConfig {
     this.queryBatchSize = queryBatchSize;
   }
 
+  /**
+   * Return true if lazy loading is disabled on queries by default.
+   */
   public boolean isDisableLazyLoading() {
     return disableLazyLoading;
   }
 
+  /**
+   * Set to true to disable lazy loading by default.
+   * <p>
+   * It can be turned on per query via {@link Query#setDisableLazyLoading(boolean)}.
+   */
   public void setDisableLazyLoading(boolean disableLazyLoading) {
     this.disableLazyLoading = disableLazyLoading;
   }
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 88469e3d8..ee9cd5868 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -282,9 +282,9 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     this.beanType = desc.getBeanType();
     this.server = server;
     this.orderById = server.getServerConfig().isDefaultOrderById();
+    this.disableLazyLoading = server.getServerConfig().isDisableLazyLoading();
     this.expressionFactory = expressionFactory;
     this.detail = new OrmQueryDetail();
-    this.disableLazyLoading = server.getServerConfig().isDisableLazyLoading();
   }
 
   public void setNativeSql(String nativeSql) {

From 7be4675d3e301f2c9c67a6ce17c664b08030344b Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 19 Nov 2018 10:16:01 +0100
Subject: [PATCH 0558/1036] NEW: ExpressionPath provides access to property and
 elName (#1550)

---
 src/main/java/io/ebean/plugin/ExpressionPath.java      | 10 ++++++++++
 .../ebeaninternal/server/deploy/BeanFkeyProperty.java  |  6 ++++++
 .../io/ebeaninternal/server/deploy/BeanProperty.java   |  5 +++++
 .../io/ebeaninternal/server/el/ElPropertyChain.java    |  6 ++++++
 4 files changed, 27 insertions(+)

diff --git a/src/main/java/io/ebean/plugin/ExpressionPath.java b/src/main/java/io/ebean/plugin/ExpressionPath.java
index 9b6e27cf0..a1ab051f3 100644
--- a/src/main/java/io/ebean/plugin/ExpressionPath.java
+++ b/src/main/java/io/ebean/plugin/ExpressionPath.java
@@ -73,4 +73,14 @@ public interface ExpressionPath {
    * Return the Id values for the given bean value.
    */
   Object[] getAssocIdValues(EntityBean bean);
+
+  /**
+   * Return the underlying bean property.
+   */
+  public Property getProperty();
+
+  /**
+   * The ElPrefix plus name.
+   */
+  String getElName();
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java b/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java
index a6908d315..fe184c287 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.deploy;
 
 import io.ebean.bean.EntityBean;
+import io.ebean.plugin.Property;
 import io.ebean.text.StringParser;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.el.ElPropertyValue;
@@ -226,4 +227,9 @@ public final class BeanFkeyProperty implements ElPropertyValue {
     throw new RuntimeException("ElPropertyDeploy only - not implemented");
   }
 
+  @Override
+  public Property getProperty() {
+    throw new RuntimeException("ElPropertyDeploy only - not implemented");
+  }
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 231f48357..6641c158f 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -676,6 +676,11 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     return this;
   }
 
+  @Override
+  public Property getProperty() {
+    return this;
+  }
+
   /**
    * Return true if this object is part of an inheritance hierarchy.
    */
diff --git a/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java b/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
index c5a91e896..a51679b93 100644
--- a/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
+++ b/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.el;
 
 import io.ebean.bean.EntityBean;
+import io.ebean.plugin.Property;
 import io.ebean.text.StringParser;
 import io.ebean.util.StringHelper;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -211,6 +212,11 @@ public class ElPropertyChain implements ElPropertyValue {
     return lastElPropertyValue.isAssocMany();
   }
 
+  @Override
+  public Property getProperty() {
+    return lastBeanProperty;
+  }
+
   @Override
   public boolean isAssocId() {
     return assocId;

From 4fe2016891b7b06c3e9dcdec27b58acb4a0a0506 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 19 Nov 2018 10:22:46 +0100
Subject: [PATCH 0559/1036] new comparison method Ine (caseInsensitive
 notEquals) (#1551)

---
 src/main/java/io/ebean/ExpressionFactory.java |   11 +
 src/main/java/io/ebean/ExpressionList.java    |    6 +
 .../CaseInsensitiveEqualExpression.java       |   24 +-
 .../expression/DefaultExpressionFactory.java  |   24 +-
 .../expression/DefaultExpressionList.java     |    6 +
 .../server/expression/DocQueryContext.java    |    7 +
 .../server/expression/JunctionExpression.java |    5 +
 .../server/grammer/EqlAdapter.java            |    6 +
 .../server/grammer/EqlAdapterHelper.java      |    3 +
 .../server/grammer/EqlOperator.java           |    1 +
 .../server/grammer/OperatorMapping.java       |    1 +
 .../server/grammer/antlr/EQL.tokens           |   22 +-
 .../server/grammer/antlr/EQLBaseListener.java |  346 +++--
 .../server/grammer/antlr/EQLLexer.java        |  442 +++----
 .../server/grammer/antlr/EQLLexer.tokens      |   22 +-
 .../server/grammer/antlr/EQLListener.java     |  244 ++--
 .../server/grammer/antlr/EQLParser.java       | 1165 +++++++++--------
 .../CaseInsensitiveEqualExpressionTest.java   |    2 +-
 .../DefaultExpressionFactoryTest.java         |   21 +-
 .../server/grammer/EqlParserTest.java         |   18 +
 .../query/TestQueryFilterCaseInsensitive.java |  116 ++
 src/test/resources/EQL.g4                     |    3 +-
 22 files changed, 1487 insertions(+), 1008 deletions(-)
 create mode 100644 src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java

diff --git a/src/main/java/io/ebean/ExpressionFactory.java b/src/main/java/io/ebean/ExpressionFactory.java
index 0c81a32e3..bd5f0a590 100644
--- a/src/main/java/io/ebean/ExpressionFactory.java
+++ b/src/main/java/io/ebean/ExpressionFactory.java
@@ -133,11 +133,22 @@ public interface ExpressionFactory {
    */
   Expression ieq(String propertyName, String value);
 
+  /**
+   * Case Insensitive Not Equal To - property not equal to the given value (typically
+   * using a lower() function to make it case insensitive).
+   */
+  Expression ine(String propertyName, String value);
+
   /**
    * Case Insensitive Equal To that allows for named parameter use.
    */
   Expression ieqObject(String propertyName, Object value);
 
+  /**
+   * Case Insensitive Not Equal To that allows for named parameter use.
+   */
+  Expression ineObject(String propertyName, Object value);
+
   /**
    * Between - property between the two given values.
    */
diff --git a/src/main/java/io/ebean/ExpressionList.java b/src/main/java/io/ebean/ExpressionList.java
index b156afdd9..5a68a6308 100644
--- a/src/main/java/io/ebean/ExpressionList.java
+++ b/src/main/java/io/ebean/ExpressionList.java
@@ -749,6 +749,12 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> ieq(String propertyName, String value);
 
+  /**
+   * Case Insensitive Not Equal To - property not equal to the given value (typically
+   * using a lower() function to make it case insensitive).
+   */
+  ExpressionList<T> ine(String propertyName, String value);
+
   /**
    * Between - property between the two given values.
    */
diff --git a/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java b/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java
index e82698a4a..afa352940 100644
--- a/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java
@@ -8,8 +8,11 @@ import java.io.IOException;
 
 class CaseInsensitiveEqualExpression extends AbstractValueExpression {
 
-  CaseInsensitiveEqualExpression(String propertyName, Object value) {
+  private boolean not;
+
+  CaseInsensitiveEqualExpression(String propertyName, Object value, boolean not) {
     super(propertyName, value);
+    this.not = not;
   }
 
   /**
@@ -21,7 +24,11 @@ class CaseInsensitiveEqualExpression extends AbstractValueExpression {
 
   @Override
   public void writeDocQuery(DocQueryContext context) throws IOException {
-    context.writeIEqualTo(propName, val());
+    if (not) {
+      context.writeINotEqualTo(propName, val());
+    } else {
+      context.writeIEqualTo(propName, val());
+    }
   }
 
   @Override
@@ -45,13 +52,20 @@ class CaseInsensitiveEqualExpression extends AbstractValueExpression {
     if (prop != null && prop.isDbEncrypted()) {
       pname = prop.getBeanProperty().getDecryptProperty(propName);
     }
-
-    request.append("lower(").append(pname).append(") =? ");
+    if (not) {
+      request.append("lower(").append(pname).append(") !=? ");
+    } else {
+      request.append("lower(").append(pname).append(") =? ");
+    }
   }
 
   @Override
   public void queryPlanHash(StringBuilder builder) {
-    builder.append("Ieq[").append(propName).append("]");
+    if (not) {
+      builder.append("Ine[").append(propName).append("]");
+    } else {
+      builder.append("Ieq[").append(propName).append("]");
+    }
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
index 14ab457c8..43d0fae18 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
@@ -182,7 +182,19 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
     if (value == null) {
       return equalsWithNullAsNoop ? NoopExpression.INSTANCE : isNull(propertyName);
     }
-    return new CaseInsensitiveEqualExpression(propertyName, value);
+    return new CaseInsensitiveEqualExpression(propertyName, value, false);
+  }
+
+  /**
+   * Case Insensitive Equal To - property equal to the given value (typically
+   * using a lower() function to make it case insensitive).
+   */
+  @Override
+  public Expression ine(String propertyName, String value) {
+    if (value == null) {
+      return equalsWithNullAsNoop ? NoopExpression.INSTANCE : isNotNull(propertyName);
+    }
+    return new CaseInsensitiveEqualExpression(propertyName, value, true);
   }
 
   /**
@@ -190,7 +202,15 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
    */
   @Override
   public Expression ieqObject(String propertyName, Object value) {
-    return new CaseInsensitiveEqualExpression(propertyName, value);
+    return new CaseInsensitiveEqualExpression(propertyName, value, false);
+  }
+
+  /**
+   * Create for named parameter use (and without support for equalsWithNullAsNoop).
+   */
+  @Override
+  public Expression ineObject(String propertyName, Object value) {
+    return new CaseInsensitiveEqualExpression(propertyName, value, true);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 746a1f0a7..6a64b1b1b 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -759,6 +759,12 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return this;
   }
 
+  @Override
+  public ExpressionList<T> ine(String propertyName, String value) {
+    add(expr.ine(propertyName, value));
+    return this;
+  }
+
   @Override
   public ExpressionList<T> ne(String propertyName, Object value) {
     add(expr.ne(propertyName, value));
diff --git a/src/main/java/io/ebeaninternal/server/expression/DocQueryContext.java b/src/main/java/io/ebeaninternal/server/expression/DocQueryContext.java
index 9f0195e85..9e1cf9641 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DocQueryContext.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DocQueryContext.java
@@ -48,6 +48,13 @@ public interface DocQueryContext {
    */
   void writeIEqualTo(String propName, String value) throws IOException;
 
+  /**
+   * Write a case insensitive notEqualTo expression.
+   */
+  default void writeINotEqualTo(String propName, String value) throws IOException {
+    throw new AbstractMethodError("writeINotEqualTo not implemented");
+  }
+
   /**
    * Write a range operation with one value.
    */
diff --git a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index 4dc93e626..a4c2206db 100644
--- a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -616,6 +616,11 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.ieq(propertyName, value);
   }
 
+  @Override
+  public ExpressionList<T> ine(String propertyName, String value) {
+    return exprList.ine(propertyName, value);
+  }
+
   @Override
   public ExpressionList<T> iexampleLike(Object example) {
     return exprList.iexampleLike(example);
diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java
index b3ecad1c3..837e24d29 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java
@@ -312,6 +312,8 @@ class EqlAdapter<T> extends EQLBaseListener {
         return EqlOperator.EQ;
       case IEQ:
         return EqlOperator.IEQ;
+      case INE:
+        return EqlOperator.INE;
       case NE:
         return EqlOperator.NE;
       // invert
@@ -401,4 +403,8 @@ class EqlAdapter<T> extends EQLBaseListener {
   public Expression ieq(String property, Object bindValue) {
     return query.getExpressionFactory().ieqObject(property, bindValue);
   }
+
+  public Expression ine(String property, Object bindValue) {
+    return query.getExpressionFactory().ineObject(property, bindValue);
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlAdapterHelper.java b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapterHelper.java
index ebcf8521e..fabbcfe8e 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/EqlAdapterHelper.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapterHelper.java
@@ -65,6 +65,9 @@ class EqlAdapterHelper {
       case NE:
         peekExprList().ne(path, bind(value));
         break;
+      case INE:
+        peekExprList().add(owner.ine(path, bind(value)));
+        break;
       case GT:
         peekExprList().gt(path, bind(value));
         break;
diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlOperator.java b/src/main/java/io/ebeaninternal/server/grammer/EqlOperator.java
index 73cab1063..b3cb4c6ba 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/EqlOperator.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlOperator.java
@@ -5,6 +5,7 @@ enum EqlOperator {
   EQ,
   IEQ,
   NE,
+  INE,
   LT,
   LTE,
   GT,
diff --git a/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java b/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java
index d7a588856..8e6315eec 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java
@@ -13,6 +13,7 @@ class OperatorMapping {
     map.put("ieq", EqlOperator.IEQ);
 
     map.put("ne", EqlOperator.NE);
+    map.put("ine", EqlOperator.INE);
     map.put("<>", EqlOperator.NE);
     map.put("!=", EqlOperator.NE);
 
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens
index c6d1f969f..a475c2939 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens
@@ -55,15 +55,16 @@ T__53=54
 T__54=55
 T__55=56
 T__56=57
-INPUT_VARIABLE=58
-PATH_VARIABLE=59
-BOOLEAN_LITERAL=60
-NUMBER_LITERAL=61
-DOUBLE=62
-INT=63
-ZERO=64
-STRING_LITERAL=65
-WS=66
+T__57=58
+INPUT_VARIABLE=59
+PATH_VARIABLE=60
+BOOLEAN_LITERAL=61
+NUMBER_LITERAL=62
+DOUBLE=63
+INT=64
+ZERO=65
+STRING_LITERAL=66
+WS=67
 'select'=1
 '('=2
 ')'=3
@@ -121,4 +122,5 @@ WS=66
 '!='=55
 'ne'=56
 'ieq'=57
-'0'=64
+'ine'=58
+'0'=65
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
index e368fb917..28d89cc14 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
@@ -1,4 +1,4 @@
-// Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.7
+// Generated from C:/dev/ebean/ebean/src/test/resources/EQL.g4 by ANTLR 4.7.1
 package io.ebeaninternal.server.grammer.antlr;
 
 import org.antlr.v4.runtime.ParserRuleContext;
@@ -6,15 +6,17 @@ import org.antlr.v4.runtime.tree.ErrorNode;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
 /**
- * This class provides an empty implementation of {@link EQLListener},
- * which can be extended to create a listener which only needs to handle a subset
- * of the available methods.
+ * This class provides an empty implementation of {@link EQLListener}, which can
+ * be extended to create a listener which only needs to handle a subset of the
+ * available methods.
  */
 public class EQLBaseListener implements EQLListener {
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterSelect_statement(EQLParser.Select_statementContext ctx) {
@@ -22,8 +24,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitSelect_statement(EQLParser.Select_statementContext ctx) {
@@ -31,8 +35,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterSelect_clause(EQLParser.Select_clauseContext ctx) {
@@ -40,8 +46,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitSelect_clause(EQLParser.Select_clauseContext ctx) {
@@ -49,8 +57,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterDistinct(EQLParser.DistinctContext ctx) {
@@ -58,8 +68,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitDistinct(EQLParser.DistinctContext ctx) {
@@ -67,8 +79,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterFetch_clause(EQLParser.Fetch_clauseContext ctx) {
@@ -76,8 +90,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitFetch_clause(EQLParser.Fetch_clauseContext ctx) {
@@ -85,8 +101,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterWhere_clause(EQLParser.Where_clauseContext ctx) {
@@ -94,8 +112,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitWhere_clause(EQLParser.Where_clauseContext ctx) {
@@ -103,8 +123,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterOrderby_clause(EQLParser.Orderby_clauseContext ctx) {
@@ -112,8 +134,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitOrderby_clause(EQLParser.Orderby_clauseContext ctx) {
@@ -121,8 +145,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterOrderby_property(EQLParser.Orderby_propertyContext ctx) {
@@ -130,8 +156,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitOrderby_property(EQLParser.Orderby_propertyContext ctx) {
@@ -139,8 +167,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterNulls_firstlast(EQLParser.Nulls_firstlastContext ctx) {
@@ -148,8 +178,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitNulls_firstlast(EQLParser.Nulls_firstlastContext ctx) {
@@ -157,8 +189,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterAsc_desc(EQLParser.Asc_descContext ctx) {
@@ -166,8 +200,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitAsc_desc(EQLParser.Asc_descContext ctx) {
@@ -175,8 +211,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterLimit_clause(EQLParser.Limit_clauseContext ctx) {
@@ -184,8 +222,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitLimit_clause(EQLParser.Limit_clauseContext ctx) {
@@ -193,8 +233,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterOffset_clause(EQLParser.Offset_clauseContext ctx) {
@@ -202,8 +244,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitOffset_clause(EQLParser.Offset_clauseContext ctx) {
@@ -211,8 +255,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterFetch_path(EQLParser.Fetch_pathContext ctx) {
@@ -220,8 +266,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitFetch_path(EQLParser.Fetch_pathContext ctx) {
@@ -229,8 +277,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterFetch_property_set(EQLParser.Fetch_property_setContext ctx) {
@@ -238,8 +288,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitFetch_property_set(EQLParser.Fetch_property_setContext ctx) {
@@ -247,8 +299,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterFetch_property_group(EQLParser.Fetch_property_groupContext ctx) {
@@ -256,8 +310,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitFetch_property_group(EQLParser.Fetch_property_groupContext ctx) {
@@ -265,8 +321,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterFetch_property(EQLParser.Fetch_propertyContext ctx) {
@@ -274,8 +332,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitFetch_property(EQLParser.Fetch_propertyContext ctx) {
@@ -283,8 +343,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterFetch_query_hint(EQLParser.Fetch_query_hintContext ctx) {
@@ -292,8 +354,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitFetch_query_hint(EQLParser.Fetch_query_hintContext ctx) {
@@ -301,8 +365,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterFetch_lazy_hint(EQLParser.Fetch_lazy_hintContext ctx) {
@@ -310,8 +376,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitFetch_lazy_hint(EQLParser.Fetch_lazy_hintContext ctx) {
@@ -319,8 +387,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterFetch_option(EQLParser.Fetch_optionContext ctx) {
@@ -328,8 +398,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitFetch_option(EQLParser.Fetch_optionContext ctx) {
@@ -337,8 +409,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterFetch_query_option(EQLParser.Fetch_query_optionContext ctx) {
@@ -346,8 +420,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitFetch_query_option(EQLParser.Fetch_query_optionContext ctx) {
@@ -355,8 +431,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterFetch_lazy_option(EQLParser.Fetch_lazy_optionContext ctx) {
@@ -364,8 +442,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitFetch_lazy_option(EQLParser.Fetch_lazy_optionContext ctx) {
@@ -373,8 +453,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterFetch_batch_size(EQLParser.Fetch_batch_sizeContext ctx) {
@@ -382,8 +464,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitFetch_batch_size(EQLParser.Fetch_batch_sizeContext ctx) {
@@ -391,8 +475,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterConditional_expression(EQLParser.Conditional_expressionContext ctx) {
@@ -400,8 +486,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitConditional_expression(EQLParser.Conditional_expressionContext ctx) {
@@ -409,8 +497,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterConditional_term(EQLParser.Conditional_termContext ctx) {
@@ -418,8 +508,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitConditional_term(EQLParser.Conditional_termContext ctx) {
@@ -427,8 +519,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterConditional_factor(EQLParser.Conditional_factorContext ctx) {
@@ -436,8 +530,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitConditional_factor(EQLParser.Conditional_factorContext ctx) {
@@ -445,8 +541,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterConditional_primary(EQLParser.Conditional_primaryContext ctx) {
@@ -454,8 +552,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitConditional_primary(EQLParser.Conditional_primaryContext ctx) {
@@ -463,8 +563,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterAny_expression(EQLParser.Any_expressionContext ctx) {
@@ -472,8 +574,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitAny_expression(EQLParser.Any_expressionContext ctx) {
@@ -481,8 +585,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterIn_expression(EQLParser.In_expressionContext ctx) {
@@ -490,8 +596,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitIn_expression(EQLParser.In_expressionContext ctx) {
@@ -499,8 +607,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterIn_value(EQLParser.In_valueContext ctx) {
@@ -508,8 +618,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitIn_value(EQLParser.In_valueContext ctx) {
@@ -517,8 +629,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterBetween_expression(EQLParser.Between_expressionContext ctx) {
@@ -526,8 +640,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitBetween_expression(EQLParser.Between_expressionContext ctx) {
@@ -535,8 +651,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterPropertyBetween_expression(EQLParser.PropertyBetween_expressionContext ctx) {
@@ -544,8 +662,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitPropertyBetween_expression(EQLParser.PropertyBetween_expressionContext ctx) {
@@ -553,8 +673,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterIsNull_expression(EQLParser.IsNull_expressionContext ctx) {
@@ -562,8 +684,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitIsNull_expression(EQLParser.IsNull_expressionContext ctx) {
@@ -571,8 +695,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterIsNotNull_expression(EQLParser.IsNotNull_expressionContext ctx) {
@@ -580,8 +706,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitIsNotNull_expression(EQLParser.IsNotNull_expressionContext ctx) {
@@ -589,8 +717,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterIsEmpty_expression(EQLParser.IsEmpty_expressionContext ctx) {
@@ -598,8 +728,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitIsEmpty_expression(EQLParser.IsEmpty_expressionContext ctx) {
@@ -607,8 +739,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterIsNotEmpty_expression(EQLParser.IsNotEmpty_expressionContext ctx) {
@@ -616,8 +750,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitIsNotEmpty_expression(EQLParser.IsNotEmpty_expressionContext ctx) {
@@ -625,8 +761,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterLike_expression(EQLParser.Like_expressionContext ctx) {
@@ -634,8 +772,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitLike_expression(EQLParser.Like_expressionContext ctx) {
@@ -643,8 +783,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterLike_op(EQLParser.Like_opContext ctx) {
@@ -652,8 +794,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitLike_op(EQLParser.Like_opContext ctx) {
@@ -661,8 +805,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterComparison_expression(EQLParser.Comparison_expressionContext ctx) {
@@ -670,8 +816,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitComparison_expression(EQLParser.Comparison_expressionContext ctx) {
@@ -679,8 +827,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterComparison_operator(EQLParser.Comparison_operatorContext ctx) {
@@ -688,8 +838,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitComparison_operator(EQLParser.Comparison_operatorContext ctx) {
@@ -697,8 +849,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterValue_expression(EQLParser.Value_expressionContext ctx) {
@@ -706,8 +860,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitValue_expression(EQLParser.Value_expressionContext ctx) {
@@ -715,8 +871,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterLiteral(EQLParser.LiteralContext ctx) {
@@ -724,8 +882,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitLiteral(EQLParser.LiteralContext ctx) {
@@ -733,8 +893,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterEveryRule(ParserRuleContext ctx) {
@@ -742,8 +904,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitEveryRule(ParserRuleContext ctx) {
@@ -751,8 +915,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void visitTerminal(TerminalNode node) {
@@ -760,10 +926,12 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void visitErrorNode(ErrorNode node) {
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
index b0c5076a4..dc0486a0f 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
@@ -1,77 +1,55 @@
-// Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.7
+// Generated from C:/dev/ebean/ebean/src/test/resources/EQL.g4 by ANTLR 4.7.1
 package io.ebeaninternal.server.grammer.antlr;
 
-import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.Lexer;
-import org.antlr.v4.runtime.RuntimeMetaData;
-import org.antlr.v4.runtime.Vocabulary;
-import org.antlr.v4.runtime.VocabularyImpl;
-import org.antlr.v4.runtime.atn.ATN;
-import org.antlr.v4.runtime.atn.ATNDeserializer;
-import org.antlr.v4.runtime.atn.LexerATNSimulator;
-import org.antlr.v4.runtime.atn.PredictionContextCache;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.TokenStream;
+import org.antlr.v4.runtime.*;
+import org.antlr.v4.runtime.atn.*;
 import org.antlr.v4.runtime.dfa.DFA;
+import org.antlr.v4.runtime.misc.*;
 
-@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
+@SuppressWarnings({ "all", "warnings", "unchecked", "unused", "cast" })
 public class EQLLexer extends Lexer {
   static {
-    RuntimeMetaData.checkVersion("4.7", RuntimeMetaData.VERSION);
+    RuntimeMetaData.checkVersion("4.7.1", RuntimeMetaData.VERSION);
   }
 
   protected static final DFA[] _decisionToDFA;
-  protected static final PredictionContextCache _sharedContextCache =
-    new PredictionContextCache();
-  public static final int
-    T__0 = 1, T__1 = 2, T__2 = 3, T__3 = 4, T__4 = 5, T__5 = 6, T__6 = 7, T__7 = 8, T__8 = 9,
-    T__9 = 10, T__10 = 11, T__11 = 12, T__12 = 13, T__13 = 14, T__14 = 15, T__15 = 16, T__16 = 17,
-    T__17 = 18, T__18 = 19, T__19 = 20, T__20 = 21, T__21 = 22, T__22 = 23, T__23 = 24,
-    T__24 = 25, T__25 = 26, T__26 = 27, T__27 = 28, T__28 = 29, T__29 = 30, T__30 = 31,
-    T__31 = 32, T__32 = 33, T__33 = 34, T__34 = 35, T__35 = 36, T__36 = 37, T__37 = 38,
-    T__38 = 39, T__39 = 40, T__40 = 41, T__41 = 42, T__42 = 43, T__43 = 44, T__44 = 45,
-    T__45 = 46, T__46 = 47, T__47 = 48, T__48 = 49, T__49 = 50, T__50 = 51, T__51 = 52,
-    T__52 = 53, T__53 = 54, T__54 = 55, T__55 = 56, T__56 = 57, INPUT_VARIABLE = 58, PATH_VARIABLE = 59,
-    BOOLEAN_LITERAL = 60, NUMBER_LITERAL = 61, DOUBLE = 62, INT = 63, ZERO = 64, STRING_LITERAL = 65,
-    WS = 66;
-  public static String[] channelNames = {
-    "DEFAULT_TOKEN_CHANNEL", "HIDDEN"
-  };
+  protected static final PredictionContextCache _sharedContextCache = new PredictionContextCache();
+  public static final int T__0 = 1, T__1 = 2, T__2 = 3, T__3 = 4, T__4 = 5, T__5 = 6, T__6 = 7, T__7 = 8, T__8 = 9,
+      T__9 = 10, T__10 = 11, T__11 = 12, T__12 = 13, T__13 = 14, T__14 = 15, T__15 = 16, T__16 = 17, T__17 = 18,
+      T__18 = 19, T__19 = 20, T__20 = 21, T__21 = 22, T__22 = 23, T__23 = 24, T__24 = 25, T__25 = 26, T__26 = 27,
+      T__27 = 28, T__28 = 29, T__29 = 30, T__30 = 31, T__31 = 32, T__32 = 33, T__33 = 34, T__34 = 35, T__35 = 36,
+      T__36 = 37, T__37 = 38, T__38 = 39, T__39 = 40, T__40 = 41, T__41 = 42, T__42 = 43, T__43 = 44, T__44 = 45,
+      T__45 = 46, T__46 = 47, T__47 = 48, T__48 = 49, T__49 = 50, T__50 = 51, T__51 = 52, T__52 = 53, T__53 = 54,
+      T__54 = 55, T__55 = 56, T__56 = 57, T__57 = 58, INPUT_VARIABLE = 59, PATH_VARIABLE = 60, BOOLEAN_LITERAL = 61,
+      NUMBER_LITERAL = 62, DOUBLE = 63, INT = 64, ZERO = 65, STRING_LITERAL = 66, WS = 67;
+  public static String[] channelNames = { "DEFAULT_TOKEN_CHANNEL", "HIDDEN" };
 
-  public static String[] modeNames = {
-    "DEFAULT_MODE"
-  };
+  public static String[] modeNames = { "DEFAULT_MODE" };
 
-  public static final String[] ruleNames = {
-    "T__0", "T__1", "T__2", "T__3", "T__4", "T__5", "T__6", "T__7", "T__8",
-    "T__9", "T__10", "T__11", "T__12", "T__13", "T__14", "T__15", "T__16",
-    "T__17", "T__18", "T__19", "T__20", "T__21", "T__22", "T__23", "T__24",
-    "T__25", "T__26", "T__27", "T__28", "T__29", "T__30", "T__31", "T__32",
-    "T__33", "T__34", "T__35", "T__36", "T__37", "T__38", "T__39", "T__40",
-    "T__41", "T__42", "T__43", "T__44", "T__45", "T__46", "T__47", "T__48",
-    "T__49", "T__50", "T__51", "T__52", "T__53", "T__54", "T__55", "T__56",
-    "INPUT_VARIABLE", "PATH_VARIABLE", "BOOLEAN_LITERAL", "NUMBER_LITERAL",
-    "DOUBLE", "INT", "ZERO", "STRING_LITERAL", "WS"
-  };
+  public static final String[] ruleNames = { "T__0", "T__1", "T__2", "T__3", "T__4", "T__5", "T__6", "T__7", "T__8",
+      "T__9", "T__10", "T__11", "T__12", "T__13", "T__14", "T__15", "T__16", "T__17", "T__18", "T__19", "T__20",
+      "T__21", "T__22", "T__23", "T__24", "T__25", "T__26", "T__27", "T__28", "T__29", "T__30", "T__31", "T__32",
+      "T__33", "T__34", "T__35", "T__36", "T__37", "T__38", "T__39", "T__40", "T__41", "T__42", "T__43", "T__44",
+      "T__45", "T__46", "T__47", "T__48", "T__49", "T__50", "T__51", "T__52", "T__53", "T__54", "T__55", "T__56",
+      "T__57", "INPUT_VARIABLE", "PATH_VARIABLE", "BOOLEAN_LITERAL", "NUMBER_LITERAL", "DOUBLE", "INT", "ZERO",
+      "STRING_LITERAL", "WS" };
 
-  private static final String[] _LITERAL_NAMES = {
-    null, "'select'", "'('", "')'", "'distinct'", "'where'", "'order'", "'by'",
-    "','", "'nulls'", "'first'", "'last'", "'asc'", "'desc'", "'limit'", "'offset'",
-    "'fetch'", "'+'", "'query'", "'lazy'", "'or'", "'and'", "'not'", "'in'",
-    "'between'", "'is'", "'null'", "'isNull'", "'isNotNull'", "'notNull'",
-    "'empty'", "'isEmpty'", "'isNotEmpty'", "'notEmpty'", "'like'", "'ilike'",
-    "'contains'", "'icontains'", "'startsWith'", "'istartsWith'", "'endsWith'",
-    "'iendsWith'", "'='", "'eq'", "'>'", "'gt'", "'>='", "'ge'", "'gte'",
-    "'<'", "'lt'", "'<='", "'le'", "'lte'", "'<>'", "'!='", "'ne'", "'ieq'",
-    null, null, null, null, null, null, "'0'"
-  };
-  private static final String[] _SYMBOLIC_NAMES = {
-    null, null, null, null, null, null, null, null, null, null, null, null,
-    null, null, null, null, null, null, null, null, null, null, null, null,
-    null, null, null, null, null, null, null, null, null, null, null, null,
-    null, null, null, null, null, null, null, null, null, null, null, null,
-    null, null, null, null, null, null, null, null, null, null, "INPUT_VARIABLE",
-    "PATH_VARIABLE", "BOOLEAN_LITERAL", "NUMBER_LITERAL", "DOUBLE", "INT",
-    "ZERO", "STRING_LITERAL", "WS"
-  };
+  private static final String[] _LITERAL_NAMES = { null, "'select'", "'('", "')'", "'distinct'", "'where'", "'order'",
+      "'by'", "','", "'nulls'", "'first'", "'last'", "'asc'", "'desc'", "'limit'", "'offset'", "'fetch'", "'+'",
+      "'query'", "'lazy'", "'or'", "'and'", "'not'", "'in'", "'between'", "'is'", "'null'", "'isNull'", "'isNotNull'",
+      "'notNull'", "'empty'", "'isEmpty'", "'isNotEmpty'", "'notEmpty'", "'like'", "'ilike'", "'contains'",
+      "'icontains'", "'startsWith'", "'istartsWith'", "'endsWith'", "'iendsWith'", "'='", "'eq'", "'>'", "'gt'", "'>='",
+      "'ge'", "'gte'", "'<'", "'lt'", "'<='", "'le'", "'lte'", "'<>'", "'!='", "'ne'", "'ieq'", "'ine'", null, null,
+      null, null, null, null, "'0'" };
+  private static final String[] _SYMBOLIC_NAMES = { null, null, null, null, null, null, null, null, null, null, null,
+      null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+      null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+      null, null, null, null, null, null, null, null, null, null, "INPUT_VARIABLE", "PATH_VARIABLE", "BOOLEAN_LITERAL",
+      "NUMBER_LITERAL", "DOUBLE", "INT", "ZERO", "STRING_LITERAL", "WS" };
   public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
 
   /**
@@ -79,7 +57,6 @@ public class EQLLexer extends Lexer {
    */
   @Deprecated
   public static final String[] tokenNames;
-
   static {
     tokenNames = new String[_SYMBOLIC_NAMES.length];
     for (int i = 0; i < tokenNames.length; i++) {
@@ -106,7 +83,6 @@ public class EQLLexer extends Lexer {
     return VOCABULARY;
   }
 
-
   public EQLLexer(CharStream input) {
     super(input);
     _interp = new LexerATNSimulator(this, _ATN, _decisionToDFA, _sharedContextCache);
@@ -142,180 +118,178 @@ public class EQLLexer extends Lexer {
     return _ATN;
   }
 
-  public static final String _serializedATN =
-    "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2D\u0200\b\1\4\2\t" +
-      "\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13" +
-      "\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22" +
-      "\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31" +
-      "\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\4\36\t\36\4\37\t\37\4 \t \4!" +
-      "\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\4*\t*\4+\t+\4" +
-      ",\t,\4-\t-\4.\t.\4/\t/\4\60\t\60\4\61\t\61\4\62\t\62\4\63\t\63\4\64\t" +
-      "\64\4\65\t\65\4\66\t\66\4\67\t\67\48\t8\49\t9\4:\t:\4;\t;\4<\t<\4=\t=" +
-      "\4>\t>\4?\t?\4@\t@\4A\tA\4B\tB\4C\tC\3\2\3\2\3\2\3\2\3\2\3\2\3\2\3\3\3" +
-      "\3\3\4\3\4\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\6\3\6\3\6\3\6\3\6\3\6" +
-      "\3\7\3\7\3\7\3\7\3\7\3\7\3\b\3\b\3\b\3\t\3\t\3\n\3\n\3\n\3\n\3\n\3\n\3" +
-      "\13\3\13\3\13\3\13\3\13\3\13\3\f\3\f\3\f\3\f\3\f\3\r\3\r\3\r\3\r\3\16" +
-      "\3\16\3\16\3\16\3\16\3\17\3\17\3\17\3\17\3\17\3\17\3\20\3\20\3\20\3\20" +
-      "\3\20\3\20\3\20\3\21\3\21\3\21\3\21\3\21\3\21\3\22\3\22\3\23\3\23\3\23" +
-      "\3\23\3\23\3\23\3\24\3\24\3\24\3\24\3\24\3\25\3\25\3\25\3\26\3\26\3\26" +
-      "\3\26\3\27\3\27\3\27\3\27\3\30\3\30\3\30\3\31\3\31\3\31\3\31\3\31\3\31" +
-      "\3\31\3\31\3\32\3\32\3\32\3\33\3\33\3\33\3\33\3\33\3\34\3\34\3\34\3\34" +
-      "\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\36" +
-      "\3\36\3\36\3\36\3\36\3\36\3\36\3\36\3\37\3\37\3\37\3\37\3\37\3\37\3 \3" +
-      " \3 \3 \3 \3 \3 \3 \3!\3!\3!\3!\3!\3!\3!\3!\3!\3!\3!\3\"\3\"\3\"\3\"\3" +
-      "\"\3\"\3\"\3\"\3\"\3#\3#\3#\3#\3#\3$\3$\3$\3$\3$\3$\3%\3%\3%\3%\3%\3%" +
-      "\3%\3%\3%\3&\3&\3&\3&\3&\3&\3&\3&\3&\3&\3\'\3\'\3\'\3\'\3\'\3\'\3\'\3" +
-      "\'\3\'\3\'\3\'\3(\3(\3(\3(\3(\3(\3(\3(\3(\3(\3(\3(\3)\3)\3)\3)\3)\3)\3" +
-      ")\3)\3)\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3+\3+\3,\3,\3,\3-\3-\3.\3.\3.\3" +
-      "/\3/\3/\3\60\3\60\3\60\3\61\3\61\3\61\3\61\3\62\3\62\3\63\3\63\3\63\3" +
-      "\64\3\64\3\64\3\65\3\65\3\65\3\66\3\66\3\66\3\66\3\67\3\67\3\67\38\38" +
-      "\38\39\39\39\3:\3:\3:\3:\3;\3;\3;\7;\u01bb\n;\f;\16;\u01be\13;\3<\3<\7" +
-      "<\u01c2\n<\f<\16<\u01c5\13<\3=\3=\3=\3=\3=\3=\3=\3=\3=\5=\u01d0\n=\3>" +
-      "\5>\u01d3\n>\3>\3>\5>\u01d7\n>\3>\3>\5>\u01db\n>\3?\6?\u01de\n?\r?\16" +
-      "?\u01df\3?\3?\7?\u01e4\n?\f?\16?\u01e7\13?\3@\3@\7@\u01eb\n@\f@\16@\u01ee" +
-      "\13@\3A\3A\3B\3B\3B\3B\7B\u01f6\nB\fB\16B\u01f9\13B\3B\3B\3C\3C\3C\3C" +
-      "\2\2D\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16\33\17\35" +
-      "\20\37\21!\22#\23%\24\'\25)\26+\27-\30/\31\61\32\63\33\65\34\67\359\36" +
-      ";\37= ?!A\"C#E$G%I&K\'M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63e\64g\65i\66k\67" +
-      "m8o9q:s;u<w=y>{?}@\177A\u0081B\u0083C\u0085D\3\2\t\5\2C\\aac|\6\2\62;" +
-      "C\\aac|\7\2\60\60\62;C\\aac|\3\2\62;\3\2\63;\3\2))\5\2\13\f\17\17\"\"" +
-      "\2\u020b\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2" +
-      "\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27" +
-      "\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2\2" +
-      "\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2\2\2" +
-      "\2/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2\29\3\2" +
-      "\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3\2\2\2" +
-      "\2G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2\2\2S" +
-      "\3\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2\2_\3\2" +
-      "\2\2\2a\3\2\2\2\2c\3\2\2\2\2e\3\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2k\3\2\2\2" +
-      "\2m\3\2\2\2\2o\3\2\2\2\2q\3\2\2\2\2s\3\2\2\2\2u\3\2\2\2\2w\3\2\2\2\2y" +
-      "\3\2\2\2\2{\3\2\2\2\2}\3\2\2\2\2\177\3\2\2\2\2\u0081\3\2\2\2\2\u0083\3" +
-      "\2\2\2\2\u0085\3\2\2\2\3\u0087\3\2\2\2\5\u008e\3\2\2\2\7\u0090\3\2\2\2" +
-      "\t\u0092\3\2\2\2\13\u009b\3\2\2\2\r\u00a1\3\2\2\2\17\u00a7\3\2\2\2\21" +
-      "\u00aa\3\2\2\2\23\u00ac\3\2\2\2\25\u00b2\3\2\2\2\27\u00b8\3\2\2\2\31\u00bd" +
-      "\3\2\2\2\33\u00c1\3\2\2\2\35\u00c6\3\2\2\2\37\u00cc\3\2\2\2!\u00d3\3\2" +
-      "\2\2#\u00d9\3\2\2\2%\u00db\3\2\2\2\'\u00e1\3\2\2\2)\u00e6\3\2\2\2+\u00e9" +
-      "\3\2\2\2-\u00ed\3\2\2\2/\u00f1\3\2\2\2\61\u00f4\3\2\2\2\63\u00fc\3\2\2" +
-      "\2\65\u00ff\3\2\2\2\67\u0104\3\2\2\29\u010b\3\2\2\2;\u0115\3\2\2\2=\u011d" +
-      "\3\2\2\2?\u0123\3\2\2\2A\u012b\3\2\2\2C\u0136\3\2\2\2E\u013f\3\2\2\2G" +
-      "\u0144\3\2\2\2I\u014a\3\2\2\2K\u0153\3\2\2\2M\u015d\3\2\2\2O\u0168\3\2" +
-      "\2\2Q\u0174\3\2\2\2S\u017d\3\2\2\2U\u0187\3\2\2\2W\u0189\3\2\2\2Y\u018c" +
-      "\3\2\2\2[\u018e\3\2\2\2]\u0191\3\2\2\2_\u0194\3\2\2\2a\u0197\3\2\2\2c" +
-      "\u019b\3\2\2\2e\u019d\3\2\2\2g\u01a0\3\2\2\2i\u01a3\3\2\2\2k\u01a6\3\2" +
-      "\2\2m\u01aa\3\2\2\2o\u01ad\3\2\2\2q\u01b0\3\2\2\2s\u01b3\3\2\2\2u\u01b7" +
-      "\3\2\2\2w\u01bf\3\2\2\2y\u01cf\3\2\2\2{\u01da\3\2\2\2}\u01dd\3\2\2\2\177" +
-      "\u01e8\3\2\2\2\u0081\u01ef\3\2\2\2\u0083\u01f1\3\2\2\2\u0085\u01fc\3\2" +
-      "\2\2\u0087\u0088\7u\2\2\u0088\u0089\7g\2\2\u0089\u008a\7n\2\2\u008a\u008b" +
-      "\7g\2\2\u008b\u008c\7e\2\2\u008c\u008d\7v\2\2\u008d\4\3\2\2\2\u008e\u008f" +
-      "\7*\2\2\u008f\6\3\2\2\2\u0090\u0091\7+\2\2\u0091\b\3\2\2\2\u0092\u0093" +
-      "\7f\2\2\u0093\u0094\7k\2\2\u0094\u0095\7u\2\2\u0095\u0096\7v\2\2\u0096" +
-      "\u0097\7k\2\2\u0097\u0098\7p\2\2\u0098\u0099\7e\2\2\u0099\u009a\7v\2\2" +
-      "\u009a\n\3\2\2\2\u009b\u009c\7y\2\2\u009c\u009d\7j\2\2\u009d\u009e\7g" +
-      "\2\2\u009e\u009f\7t\2\2\u009f\u00a0\7g\2\2\u00a0\f\3\2\2\2\u00a1\u00a2" +
-      "\7q\2\2\u00a2\u00a3\7t\2\2\u00a3\u00a4\7f\2\2\u00a4\u00a5\7g\2\2\u00a5" +
-      "\u00a6\7t\2\2\u00a6\16\3\2\2\2\u00a7\u00a8\7d\2\2\u00a8\u00a9\7{\2\2\u00a9" +
-      "\20\3\2\2\2\u00aa\u00ab\7.\2\2\u00ab\22\3\2\2\2\u00ac\u00ad\7p\2\2\u00ad" +
-      "\u00ae\7w\2\2\u00ae\u00af\7n\2\2\u00af\u00b0\7n\2\2\u00b0\u00b1\7u\2\2" +
-      "\u00b1\24\3\2\2\2\u00b2\u00b3\7h\2\2\u00b3\u00b4\7k\2\2\u00b4\u00b5\7" +
-      "t\2\2\u00b5\u00b6\7u\2\2\u00b6\u00b7\7v\2\2\u00b7\26\3\2\2\2\u00b8\u00b9" +
-      "\7n\2\2\u00b9\u00ba\7c\2\2\u00ba\u00bb\7u\2\2\u00bb\u00bc\7v\2\2\u00bc" +
-      "\30\3\2\2\2\u00bd\u00be\7c\2\2\u00be\u00bf\7u\2\2\u00bf\u00c0\7e\2\2\u00c0" +
-      "\32\3\2\2\2\u00c1\u00c2\7f\2\2\u00c2\u00c3\7g\2\2\u00c3\u00c4\7u\2\2\u00c4" +
-      "\u00c5\7e\2\2\u00c5\34\3\2\2\2\u00c6\u00c7\7n\2\2\u00c7\u00c8\7k\2\2\u00c8" +
-      "\u00c9\7o\2\2\u00c9\u00ca\7k\2\2\u00ca\u00cb\7v\2\2\u00cb\36\3\2\2\2\u00cc" +
-      "\u00cd\7q\2\2\u00cd\u00ce\7h\2\2\u00ce\u00cf\7h\2\2\u00cf\u00d0\7u\2\2" +
-      "\u00d0\u00d1\7g\2\2\u00d1\u00d2\7v\2\2\u00d2 \3\2\2\2\u00d3\u00d4\7h\2" +
-      "\2\u00d4\u00d5\7g\2\2\u00d5\u00d6\7v\2\2\u00d6\u00d7\7e\2\2\u00d7\u00d8" +
-      "\7j\2\2\u00d8\"\3\2\2\2\u00d9\u00da\7-\2\2\u00da$\3\2\2\2\u00db\u00dc" +
-      "\7s\2\2\u00dc\u00dd\7w\2\2\u00dd\u00de\7g\2\2\u00de\u00df\7t\2\2\u00df" +
-      "\u00e0\7{\2\2\u00e0&\3\2\2\2\u00e1\u00e2\7n\2\2\u00e2\u00e3\7c\2\2\u00e3" +
-      "\u00e4\7|\2\2\u00e4\u00e5\7{\2\2\u00e5(\3\2\2\2\u00e6\u00e7\7q\2\2\u00e7" +
-      "\u00e8\7t\2\2\u00e8*\3\2\2\2\u00e9\u00ea\7c\2\2\u00ea\u00eb\7p\2\2\u00eb" +
-      "\u00ec\7f\2\2\u00ec,\3\2\2\2\u00ed\u00ee\7p\2\2\u00ee\u00ef\7q\2\2\u00ef" +
-      "\u00f0\7v\2\2\u00f0.\3\2\2\2\u00f1\u00f2\7k\2\2\u00f2\u00f3\7p\2\2\u00f3" +
-      "\60\3\2\2\2\u00f4\u00f5\7d\2\2\u00f5\u00f6\7g\2\2\u00f6\u00f7\7v\2\2\u00f7" +
-      "\u00f8\7y\2\2\u00f8\u00f9\7g\2\2\u00f9\u00fa\7g\2\2\u00fa\u00fb\7p\2\2" +
-      "\u00fb\62\3\2\2\2\u00fc\u00fd\7k\2\2\u00fd\u00fe\7u\2\2\u00fe\64\3\2\2" +
-      "\2\u00ff\u0100\7p\2\2\u0100\u0101\7w\2\2\u0101\u0102\7n\2\2\u0102\u0103" +
-      "\7n\2\2\u0103\66\3\2\2\2\u0104\u0105\7k\2\2\u0105\u0106\7u\2\2\u0106\u0107" +
-      "\7P\2\2\u0107\u0108\7w\2\2\u0108\u0109\7n\2\2\u0109\u010a\7n\2\2\u010a" +
-      "8\3\2\2\2\u010b\u010c\7k\2\2\u010c\u010d\7u\2\2\u010d\u010e\7P\2\2\u010e" +
-      "\u010f\7q\2\2\u010f\u0110\7v\2\2\u0110\u0111\7P\2\2\u0111\u0112\7w\2\2" +
-      "\u0112\u0113\7n\2\2\u0113\u0114\7n\2\2\u0114:\3\2\2\2\u0115\u0116\7p\2" +
-      "\2\u0116\u0117\7q\2\2\u0117\u0118\7v\2\2\u0118\u0119\7P\2\2\u0119\u011a" +
-      "\7w\2\2\u011a\u011b\7n\2\2\u011b\u011c\7n\2\2\u011c<\3\2\2\2\u011d\u011e" +
-      "\7g\2\2\u011e\u011f\7o\2\2\u011f\u0120\7r\2\2\u0120\u0121\7v\2\2\u0121" +
-      "\u0122\7{\2\2\u0122>\3\2\2\2\u0123\u0124\7k\2\2\u0124\u0125\7u\2\2\u0125" +
-      "\u0126\7G\2\2\u0126\u0127\7o\2\2\u0127\u0128\7r\2\2\u0128\u0129\7v\2\2" +
-      "\u0129\u012a\7{\2\2\u012a@\3\2\2\2\u012b\u012c\7k\2\2\u012c\u012d\7u\2" +
-      "\2\u012d\u012e\7P\2\2\u012e\u012f\7q\2\2\u012f\u0130\7v\2\2\u0130\u0131" +
-      "\7G\2\2\u0131\u0132\7o\2\2\u0132\u0133\7r\2\2\u0133\u0134\7v\2\2\u0134" +
-      "\u0135\7{\2\2\u0135B\3\2\2\2\u0136\u0137\7p\2\2\u0137\u0138\7q\2\2\u0138" +
-      "\u0139\7v\2\2\u0139\u013a\7G\2\2\u013a\u013b\7o\2\2\u013b\u013c\7r\2\2" +
-      "\u013c\u013d\7v\2\2\u013d\u013e\7{\2\2\u013eD\3\2\2\2\u013f\u0140\7n\2" +
-      "\2\u0140\u0141\7k\2\2\u0141\u0142\7m\2\2\u0142\u0143\7g\2\2\u0143F\3\2" +
-      "\2\2\u0144\u0145\7k\2\2\u0145\u0146\7n\2\2\u0146\u0147\7k\2\2\u0147\u0148" +
-      "\7m\2\2\u0148\u0149\7g\2\2\u0149H\3\2\2\2\u014a\u014b\7e\2\2\u014b\u014c" +
-      "\7q\2\2\u014c\u014d\7p\2\2\u014d\u014e\7v\2\2\u014e\u014f\7c\2\2\u014f" +
-      "\u0150\7k\2\2\u0150\u0151\7p\2\2\u0151\u0152\7u\2\2\u0152J\3\2\2\2\u0153" +
-      "\u0154\7k\2\2\u0154\u0155\7e\2\2\u0155\u0156\7q\2\2\u0156\u0157\7p\2\2" +
-      "\u0157\u0158\7v\2\2\u0158\u0159\7c\2\2\u0159\u015a\7k\2\2\u015a\u015b" +
-      "\7p\2\2\u015b\u015c\7u\2\2\u015cL\3\2\2\2\u015d\u015e\7u\2\2\u015e\u015f" +
-      "\7v\2\2\u015f\u0160\7c\2\2\u0160\u0161\7t\2\2\u0161\u0162\7v\2\2\u0162" +
-      "\u0163\7u\2\2\u0163\u0164\7Y\2\2\u0164\u0165\7k\2\2\u0165\u0166\7v\2\2" +
-      "\u0166\u0167\7j\2\2\u0167N\3\2\2\2\u0168\u0169\7k\2\2\u0169\u016a\7u\2" +
-      "\2\u016a\u016b\7v\2\2\u016b\u016c\7c\2\2\u016c\u016d\7t\2\2\u016d\u016e" +
-      "\7v\2\2\u016e\u016f\7u\2\2\u016f\u0170\7Y\2\2\u0170\u0171\7k\2\2\u0171" +
-      "\u0172\7v\2\2\u0172\u0173\7j\2\2\u0173P\3\2\2\2\u0174\u0175\7g\2\2\u0175" +
-      "\u0176\7p\2\2\u0176\u0177\7f\2\2\u0177\u0178\7u\2\2\u0178\u0179\7Y\2\2" +
-      "\u0179\u017a\7k\2\2\u017a\u017b\7v\2\2\u017b\u017c\7j\2\2\u017cR\3\2\2" +
-      "\2\u017d\u017e\7k\2\2\u017e\u017f\7g\2\2\u017f\u0180\7p\2\2\u0180\u0181" +
-      "\7f\2\2\u0181\u0182\7u\2\2\u0182\u0183\7Y\2\2\u0183\u0184\7k\2\2\u0184" +
-      "\u0185\7v\2\2\u0185\u0186\7j\2\2\u0186T\3\2\2\2\u0187\u0188\7?\2\2\u0188" +
-      "V\3\2\2\2\u0189\u018a\7g\2\2\u018a\u018b\7s\2\2\u018bX\3\2\2\2\u018c\u018d" +
-      "\7@\2\2\u018dZ\3\2\2\2\u018e\u018f\7i\2\2\u018f\u0190\7v\2\2\u0190\\\3" +
-      "\2\2\2\u0191\u0192\7@\2\2\u0192\u0193\7?\2\2\u0193^\3\2\2\2\u0194\u0195" +
-      "\7i\2\2\u0195\u0196\7g\2\2\u0196`\3\2\2\2\u0197\u0198\7i\2\2\u0198\u0199" +
-      "\7v\2\2\u0199\u019a\7g\2\2\u019ab\3\2\2\2\u019b\u019c\7>\2\2\u019cd\3" +
-      "\2\2\2\u019d\u019e\7n\2\2\u019e\u019f\7v\2\2\u019ff\3\2\2\2\u01a0\u01a1" +
-      "\7>\2\2\u01a1\u01a2\7?\2\2\u01a2h\3\2\2\2\u01a3\u01a4\7n\2\2\u01a4\u01a5" +
-      "\7g\2\2\u01a5j\3\2\2\2\u01a6\u01a7\7n\2\2\u01a7\u01a8\7v\2\2\u01a8\u01a9" +
-      "\7g\2\2\u01a9l\3\2\2\2\u01aa\u01ab\7>\2\2\u01ab\u01ac\7@\2\2\u01acn\3" +
-      "\2\2\2\u01ad\u01ae\7#\2\2\u01ae\u01af\7?\2\2\u01afp\3\2\2\2\u01b0\u01b1" +
-      "\7p\2\2\u01b1\u01b2\7g\2\2\u01b2r\3\2\2\2\u01b3\u01b4\7k\2\2\u01b4\u01b5" +
-      "\7g\2\2\u01b5\u01b6\7s\2\2\u01b6t\3\2\2\2\u01b7\u01b8\7<\2\2\u01b8\u01bc" +
-      "\t\2\2\2\u01b9\u01bb\t\3\2\2\u01ba\u01b9\3\2\2\2\u01bb\u01be\3\2\2\2\u01bc" +
-      "\u01ba\3\2\2\2\u01bc\u01bd\3\2\2\2\u01bdv\3\2\2\2\u01be\u01bc\3\2\2\2" +
-      "\u01bf\u01c3\t\2\2\2\u01c0\u01c2\t\4\2\2\u01c1\u01c0\3\2\2\2\u01c2\u01c5" +
-      "\3\2\2\2\u01c3\u01c1\3\2\2\2\u01c3\u01c4\3\2\2\2\u01c4x\3\2\2\2\u01c5" +
-      "\u01c3\3\2\2\2\u01c6\u01c7\7v\2\2\u01c7\u01c8\7t\2\2\u01c8\u01c9\7w\2" +
-      "\2\u01c9\u01d0\7g\2\2\u01ca\u01cb\7h\2\2\u01cb\u01cc\7c\2\2\u01cc\u01cd" +
-      "\7n\2\2\u01cd\u01ce\7u\2\2\u01ce\u01d0\7g\2\2\u01cf\u01c6\3\2\2\2\u01cf" +
-      "\u01ca\3\2\2\2\u01d0z\3\2\2\2\u01d1\u01d3\7/\2\2\u01d2\u01d1\3\2\2\2\u01d2" +
-      "\u01d3\3\2\2\2\u01d3\u01d4\3\2\2\2\u01d4\u01db\5}?\2\u01d5\u01d7\7/\2" +
-      "\2\u01d6\u01d5\3\2\2\2\u01d6\u01d7\3\2\2\2\u01d7\u01d8\3\2\2\2\u01d8\u01db" +
-      "\5\177@\2\u01d9\u01db\5\u0081A\2\u01da\u01d2\3\2\2\2\u01da\u01d6\3\2\2" +
-      "\2\u01da\u01d9\3\2\2\2\u01db|\3\2\2\2\u01dc\u01de\t\5\2\2\u01dd\u01dc" +
-      "\3\2\2\2\u01de\u01df\3\2\2\2\u01df\u01dd\3\2\2\2\u01df\u01e0\3\2\2\2\u01e0" +
-      "\u01e1\3\2\2\2\u01e1\u01e5\7\60\2\2\u01e2\u01e4\t\5\2\2\u01e3\u01e2\3" +
-      "\2\2\2\u01e4\u01e7\3\2\2\2\u01e5\u01e3\3\2\2\2\u01e5\u01e6\3\2\2\2\u01e6" +
-      "~\3\2\2\2\u01e7\u01e5\3\2\2\2\u01e8\u01ec\t\6\2\2\u01e9\u01eb\t\5\2\2" +
-      "\u01ea\u01e9\3\2\2\2\u01eb\u01ee\3\2\2\2\u01ec\u01ea\3\2\2\2\u01ec\u01ed" +
-      "\3\2\2\2\u01ed\u0080\3\2\2\2\u01ee\u01ec\3\2\2\2\u01ef\u01f0\7\62\2\2" +
-      "\u01f0\u0082\3\2\2\2\u01f1\u01f7\7)\2\2\u01f2\u01f6\n\7\2\2\u01f3\u01f4" +
-      "\7)\2\2\u01f4\u01f6\7)\2\2\u01f5\u01f2\3\2\2\2\u01f5\u01f3\3\2\2\2\u01f6" +
-      "\u01f9\3\2\2\2\u01f7\u01f5\3\2\2\2\u01f7\u01f8\3\2\2\2\u01f8\u01fa\3\2" +
-      "\2\2\u01f9\u01f7\3\2\2\2\u01fa\u01fb\7)\2\2\u01fb\u0084\3\2\2\2\u01fc" +
-      "\u01fd\t\b\2\2\u01fd\u01fe\3\2\2\2\u01fe\u01ff\bC\2\2\u01ff\u0086\3\2" +
-      "\2\2\16\2\u01bc\u01c3\u01cf\u01d2\u01d6\u01da\u01df\u01e5\u01ec\u01f5" +
-      "\u01f7\3\b\2\2";
-  public static final ATN _ATN =
-    new ATNDeserializer().deserialize(_serializedATN.toCharArray());
-
+  public static final String _serializedATN = "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2E\u0206\b\1\4\2\t"
+      + "\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13"
+      + "\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"
+      + "\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"
+      + "\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\4\36\t\36\4\37\t\37\4 \t \4!"
+      + "\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\4*\t*\4+\t+\4"
+      + ",\t,\4-\t-\4.\t.\4/\t/\4\60\t\60\4\61\t\61\4\62\t\62\4\63\t\63\4\64\t"
+      + "\64\4\65\t\65\4\66\t\66\4\67\t\67\48\t8\49\t9\4:\t:\4;\t;\4<\t<\4=\t="
+      + "\4>\t>\4?\t?\4@\t@\4A\tA\4B\tB\4C\tC\4D\tD\3\2\3\2\3\2\3\2\3\2\3\2\3\2"
+      + "\3\3\3\3\3\4\3\4\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\6\3\6\3\6\3\6\3"
+      + "\6\3\6\3\7\3\7\3\7\3\7\3\7\3\7\3\b\3\b\3\b\3\t\3\t\3\n\3\n\3\n\3\n\3\n"
+      + "\3\n\3\13\3\13\3\13\3\13\3\13\3\13\3\f\3\f\3\f\3\f\3\f\3\r\3\r\3\r\3\r"
+      + "\3\16\3\16\3\16\3\16\3\16\3\17\3\17\3\17\3\17\3\17\3\17\3\20\3\20\3\20"
+      + "\3\20\3\20\3\20\3\20\3\21\3\21\3\21\3\21\3\21\3\21\3\22\3\22\3\23\3\23"
+      + "\3\23\3\23\3\23\3\23\3\24\3\24\3\24\3\24\3\24\3\25\3\25\3\25\3\26\3\26"
+      + "\3\26\3\26\3\27\3\27\3\27\3\27\3\30\3\30\3\30\3\31\3\31\3\31\3\31\3\31"
+      + "\3\31\3\31\3\31\3\32\3\32\3\32\3\33\3\33\3\33\3\33\3\33\3\34\3\34\3\34"
+      + "\3\34\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35"
+      + "\3\36\3\36\3\36\3\36\3\36\3\36\3\36\3\36\3\37\3\37\3\37\3\37\3\37\3\37"
+      + "\3 \3 \3 \3 \3 \3 \3 \3 \3!\3!\3!\3!\3!\3!\3!\3!\3!\3!\3!\3\"\3\"\3\""
+      + "\3\"\3\"\3\"\3\"\3\"\3\"\3#\3#\3#\3#\3#\3$\3$\3$\3$\3$\3$\3%\3%\3%\3%"
+      + "\3%\3%\3%\3%\3%\3&\3&\3&\3&\3&\3&\3&\3&\3&\3&\3\'\3\'\3\'\3\'\3\'\3\'"
+      + "\3\'\3\'\3\'\3\'\3\'\3(\3(\3(\3(\3(\3(\3(\3(\3(\3(\3(\3(\3)\3)\3)\3)\3"
+      + ")\3)\3)\3)\3)\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3+\3+\3,\3,\3,\3-\3-\3.\3"
+      + ".\3.\3/\3/\3/\3\60\3\60\3\60\3\61\3\61\3\61\3\61\3\62\3\62\3\63\3\63\3"
+      + "\63\3\64\3\64\3\64\3\65\3\65\3\65\3\66\3\66\3\66\3\66\3\67\3\67\3\67\3"
+      + "8\38\38\39\39\39\3:\3:\3:\3:\3;\3;\3;\3;\3<\3<\3<\7<\u01c1\n<\f<\16<\u01c4"
+      + "\13<\3=\3=\7=\u01c8\n=\f=\16=\u01cb\13=\3>\3>\3>\3>\3>\3>\3>\3>\3>\5>"
+      + "\u01d6\n>\3?\5?\u01d9\n?\3?\3?\5?\u01dd\n?\3?\3?\5?\u01e1\n?\3@\6@\u01e4"
+      + "\n@\r@\16@\u01e5\3@\3@\7@\u01ea\n@\f@\16@\u01ed\13@\3A\3A\7A\u01f1\nA"
+      + "\fA\16A\u01f4\13A\3B\3B\3C\3C\3C\3C\7C\u01fc\nC\fC\16C\u01ff\13C\3C\3"
+      + "C\3D\3D\3D\3D\2\2E\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\23\13\25\f\27\r"
+      + "\31\16\33\17\35\20\37\21!\22#\23%\24\'\25)\26+\27-\30/\31\61\32\63\33"
+      + "\65\34\67\359\36;\37= ?!A\"C#E$G%I&K\'M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63"
+      + "e\64g\65i\66k\67m8o9q:s;u<w=y>{?}@\177A\u0081B\u0083C\u0085D\u0087E\3"
+      + "\2\t\5\2C\\aac|\6\2\62;C\\aac|\7\2\60\60\62;C\\aac|\3\2\62;\3\2\63;\3"
+      + "\2))\5\2\13\f\17\17\"\"\2\u0211\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2"
+      + "\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2"
+      + "\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2"
+      + "\2\37\3\2\2\2\2!\3\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2"
+      + "\2+\3\2\2\2\2-\3\2\2\2\2/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2"
+      + "\2\2\67\3\2\2\2\29\3\2\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2"
+      + "\2C\3\2\2\2\2E\3\2\2\2\2G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O"
+      + "\3\2\2\2\2Q\3\2\2\2\2S\3\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2"
+      + "\2\2\2]\3\2\2\2\2_\3\2\2\2\2a\3\2\2\2\2c\3\2\2\2\2e\3\2\2\2\2g\3\2\2\2"
+      + "\2i\3\2\2\2\2k\3\2\2\2\2m\3\2\2\2\2o\3\2\2\2\2q\3\2\2\2\2s\3\2\2\2\2u"
+      + "\3\2\2\2\2w\3\2\2\2\2y\3\2\2\2\2{\3\2\2\2\2}\3\2\2\2\2\177\3\2\2\2\2\u0081"
+      + "\3\2\2\2\2\u0083\3\2\2\2\2\u0085\3\2\2\2\2\u0087\3\2\2\2\3\u0089\3\2\2"
+      + "\2\5\u0090\3\2\2\2\7\u0092\3\2\2\2\t\u0094\3\2\2\2\13\u009d\3\2\2\2\r"
+      + "\u00a3\3\2\2\2\17\u00a9\3\2\2\2\21\u00ac\3\2\2\2\23\u00ae\3\2\2\2\25\u00b4"
+      + "\3\2\2\2\27\u00ba\3\2\2\2\31\u00bf\3\2\2\2\33\u00c3\3\2\2\2\35\u00c8\3"
+      + "\2\2\2\37\u00ce\3\2\2\2!\u00d5\3\2\2\2#\u00db\3\2\2\2%\u00dd\3\2\2\2\'"
+      + "\u00e3\3\2\2\2)\u00e8\3\2\2\2+\u00eb\3\2\2\2-\u00ef\3\2\2\2/\u00f3\3\2"
+      + "\2\2\61\u00f6\3\2\2\2\63\u00fe\3\2\2\2\65\u0101\3\2\2\2\67\u0106\3\2\2"
+      + "\29\u010d\3\2\2\2;\u0117\3\2\2\2=\u011f\3\2\2\2?\u0125\3\2\2\2A\u012d"
+      + "\3\2\2\2C\u0138\3\2\2\2E\u0141\3\2\2\2G\u0146\3\2\2\2I\u014c\3\2\2\2K"
+      + "\u0155\3\2\2\2M\u015f\3\2\2\2O\u016a\3\2\2\2Q\u0176\3\2\2\2S\u017f\3\2"
+      + "\2\2U\u0189\3\2\2\2W\u018b\3\2\2\2Y\u018e\3\2\2\2[\u0190\3\2\2\2]\u0193"
+      + "\3\2\2\2_\u0196\3\2\2\2a\u0199\3\2\2\2c\u019d\3\2\2\2e\u019f\3\2\2\2g"
+      + "\u01a2\3\2\2\2i\u01a5\3\2\2\2k\u01a8\3\2\2\2m\u01ac\3\2\2\2o\u01af\3\2"
+      + "\2\2q\u01b2\3\2\2\2s\u01b5\3\2\2\2u\u01b9\3\2\2\2w\u01bd\3\2\2\2y\u01c5"
+      + "\3\2\2\2{\u01d5\3\2\2\2}\u01e0\3\2\2\2\177\u01e3\3\2\2\2\u0081\u01ee\3"
+      + "\2\2\2\u0083\u01f5\3\2\2\2\u0085\u01f7\3\2\2\2\u0087\u0202\3\2\2\2\u0089"
+      + "\u008a\7u\2\2\u008a\u008b\7g\2\2\u008b\u008c\7n\2\2\u008c\u008d\7g\2\2"
+      + "\u008d\u008e\7e\2\2\u008e\u008f\7v\2\2\u008f\4\3\2\2\2\u0090\u0091\7*"
+      + "\2\2\u0091\6\3\2\2\2\u0092\u0093\7+\2\2\u0093\b\3\2\2\2\u0094\u0095\7"
+      + "f\2\2\u0095\u0096\7k\2\2\u0096\u0097\7u\2\2\u0097\u0098\7v\2\2\u0098\u0099"
+      + "\7k\2\2\u0099\u009a\7p\2\2\u009a\u009b\7e\2\2\u009b\u009c\7v\2\2\u009c"
+      + "\n\3\2\2\2\u009d\u009e\7y\2\2\u009e\u009f\7j\2\2\u009f\u00a0\7g\2\2\u00a0"
+      + "\u00a1\7t\2\2\u00a1\u00a2\7g\2\2\u00a2\f\3\2\2\2\u00a3\u00a4\7q\2\2\u00a4"
+      + "\u00a5\7t\2\2\u00a5\u00a6\7f\2\2\u00a6\u00a7\7g\2\2\u00a7\u00a8\7t\2\2"
+      + "\u00a8\16\3\2\2\2\u00a9\u00aa\7d\2\2\u00aa\u00ab\7{\2\2\u00ab\20\3\2\2"
+      + "\2\u00ac\u00ad\7.\2\2\u00ad\22\3\2\2\2\u00ae\u00af\7p\2\2\u00af\u00b0"
+      + "\7w\2\2\u00b0\u00b1\7n\2\2\u00b1\u00b2\7n\2\2\u00b2\u00b3\7u\2\2\u00b3"
+      + "\24\3\2\2\2\u00b4\u00b5\7h\2\2\u00b5\u00b6\7k\2\2\u00b6\u00b7\7t\2\2\u00b7"
+      + "\u00b8\7u\2\2\u00b8\u00b9\7v\2\2\u00b9\26\3\2\2\2\u00ba\u00bb\7n\2\2\u00bb"
+      + "\u00bc\7c\2\2\u00bc\u00bd\7u\2\2\u00bd\u00be\7v\2\2\u00be\30\3\2\2\2\u00bf"
+      + "\u00c0\7c\2\2\u00c0\u00c1\7u\2\2\u00c1\u00c2\7e\2\2\u00c2\32\3\2\2\2\u00c3"
+      + "\u00c4\7f\2\2\u00c4\u00c5\7g\2\2\u00c5\u00c6\7u\2\2\u00c6\u00c7\7e\2\2"
+      + "\u00c7\34\3\2\2\2\u00c8\u00c9\7n\2\2\u00c9\u00ca\7k\2\2\u00ca\u00cb\7"
+      + "o\2\2\u00cb\u00cc\7k\2\2\u00cc\u00cd\7v\2\2\u00cd\36\3\2\2\2\u00ce\u00cf"
+      + "\7q\2\2\u00cf\u00d0\7h\2\2\u00d0\u00d1\7h\2\2\u00d1\u00d2\7u\2\2\u00d2"
+      + "\u00d3\7g\2\2\u00d3\u00d4\7v\2\2\u00d4 \3\2\2\2\u00d5\u00d6\7h\2\2\u00d6"
+      + "\u00d7\7g\2\2\u00d7\u00d8\7v\2\2\u00d8\u00d9\7e\2\2\u00d9\u00da\7j\2\2"
+      + "\u00da\"\3\2\2\2\u00db\u00dc\7-\2\2\u00dc$\3\2\2\2\u00dd\u00de\7s\2\2"
+      + "\u00de\u00df\7w\2\2\u00df\u00e0\7g\2\2\u00e0\u00e1\7t\2\2\u00e1\u00e2"
+      + "\7{\2\2\u00e2&\3\2\2\2\u00e3\u00e4\7n\2\2\u00e4\u00e5\7c\2\2\u00e5\u00e6"
+      + "\7|\2\2\u00e6\u00e7\7{\2\2\u00e7(\3\2\2\2\u00e8\u00e9\7q\2\2\u00e9\u00ea"
+      + "\7t\2\2\u00ea*\3\2\2\2\u00eb\u00ec\7c\2\2\u00ec\u00ed\7p\2\2\u00ed\u00ee"
+      + "\7f\2\2\u00ee,\3\2\2\2\u00ef\u00f0\7p\2\2\u00f0\u00f1\7q\2\2\u00f1\u00f2"
+      + "\7v\2\2\u00f2.\3\2\2\2\u00f3\u00f4\7k\2\2\u00f4\u00f5\7p\2\2\u00f5\60"
+      + "\3\2\2\2\u00f6\u00f7\7d\2\2\u00f7\u00f8\7g\2\2\u00f8\u00f9\7v\2\2\u00f9"
+      + "\u00fa\7y\2\2\u00fa\u00fb\7g\2\2\u00fb\u00fc\7g\2\2\u00fc\u00fd\7p\2\2"
+      + "\u00fd\62\3\2\2\2\u00fe\u00ff\7k\2\2\u00ff\u0100\7u\2\2\u0100\64\3\2\2"
+      + "\2\u0101\u0102\7p\2\2\u0102\u0103\7w\2\2\u0103\u0104\7n\2\2\u0104\u0105"
+      + "\7n\2\2\u0105\66\3\2\2\2\u0106\u0107\7k\2\2\u0107\u0108\7u\2\2\u0108\u0109"
+      + "\7P\2\2\u0109\u010a\7w\2\2\u010a\u010b\7n\2\2\u010b\u010c\7n\2\2\u010c"
+      + "8\3\2\2\2\u010d\u010e\7k\2\2\u010e\u010f\7u\2\2\u010f\u0110\7P\2\2\u0110"
+      + "\u0111\7q\2\2\u0111\u0112\7v\2\2\u0112\u0113\7P\2\2\u0113\u0114\7w\2\2"
+      + "\u0114\u0115\7n\2\2\u0115\u0116\7n\2\2\u0116:\3\2\2\2\u0117\u0118\7p\2"
+      + "\2\u0118\u0119\7q\2\2\u0119\u011a\7v\2\2\u011a\u011b\7P\2\2\u011b\u011c"
+      + "\7w\2\2\u011c\u011d\7n\2\2\u011d\u011e\7n\2\2\u011e<\3\2\2\2\u011f\u0120"
+      + "\7g\2\2\u0120\u0121\7o\2\2\u0121\u0122\7r\2\2\u0122\u0123\7v\2\2\u0123"
+      + "\u0124\7{\2\2\u0124>\3\2\2\2\u0125\u0126\7k\2\2\u0126\u0127\7u\2\2\u0127"
+      + "\u0128\7G\2\2\u0128\u0129\7o\2\2\u0129\u012a\7r\2\2\u012a\u012b\7v\2\2"
+      + "\u012b\u012c\7{\2\2\u012c@\3\2\2\2\u012d\u012e\7k\2\2\u012e\u012f\7u\2"
+      + "\2\u012f\u0130\7P\2\2\u0130\u0131\7q\2\2\u0131\u0132\7v\2\2\u0132\u0133"
+      + "\7G\2\2\u0133\u0134\7o\2\2\u0134\u0135\7r\2\2\u0135\u0136\7v\2\2\u0136"
+      + "\u0137\7{\2\2\u0137B\3\2\2\2\u0138\u0139\7p\2\2\u0139\u013a\7q\2\2\u013a"
+      + "\u013b\7v\2\2\u013b\u013c\7G\2\2\u013c\u013d\7o\2\2\u013d\u013e\7r\2\2"
+      + "\u013e\u013f\7v\2\2\u013f\u0140\7{\2\2\u0140D\3\2\2\2\u0141\u0142\7n\2"
+      + "\2\u0142\u0143\7k\2\2\u0143\u0144\7m\2\2\u0144\u0145\7g\2\2\u0145F\3\2"
+      + "\2\2\u0146\u0147\7k\2\2\u0147\u0148\7n\2\2\u0148\u0149\7k\2\2\u0149\u014a"
+      + "\7m\2\2\u014a\u014b\7g\2\2\u014bH\3\2\2\2\u014c\u014d\7e\2\2\u014d\u014e"
+      + "\7q\2\2\u014e\u014f\7p\2\2\u014f\u0150\7v\2\2\u0150\u0151\7c\2\2\u0151"
+      + "\u0152\7k\2\2\u0152\u0153\7p\2\2\u0153\u0154\7u\2\2\u0154J\3\2\2\2\u0155"
+      + "\u0156\7k\2\2\u0156\u0157\7e\2\2\u0157\u0158\7q\2\2\u0158\u0159\7p\2\2"
+      + "\u0159\u015a\7v\2\2\u015a\u015b\7c\2\2\u015b\u015c\7k\2\2\u015c\u015d"
+      + "\7p\2\2\u015d\u015e\7u\2\2\u015eL\3\2\2\2\u015f\u0160\7u\2\2\u0160\u0161"
+      + "\7v\2\2\u0161\u0162\7c\2\2\u0162\u0163\7t\2\2\u0163\u0164\7v\2\2\u0164"
+      + "\u0165\7u\2\2\u0165\u0166\7Y\2\2\u0166\u0167\7k\2\2\u0167\u0168\7v\2\2"
+      + "\u0168\u0169\7j\2\2\u0169N\3\2\2\2\u016a\u016b\7k\2\2\u016b\u016c\7u\2"
+      + "\2\u016c\u016d\7v\2\2\u016d\u016e\7c\2\2\u016e\u016f\7t\2\2\u016f\u0170"
+      + "\7v\2\2\u0170\u0171\7u\2\2\u0171\u0172\7Y\2\2\u0172\u0173\7k\2\2\u0173"
+      + "\u0174\7v\2\2\u0174\u0175\7j\2\2\u0175P\3\2\2\2\u0176\u0177\7g\2\2\u0177"
+      + "\u0178\7p\2\2\u0178\u0179\7f\2\2\u0179\u017a\7u\2\2\u017a\u017b\7Y\2\2"
+      + "\u017b\u017c\7k\2\2\u017c\u017d\7v\2\2\u017d\u017e\7j\2\2\u017eR\3\2\2"
+      + "\2\u017f\u0180\7k\2\2\u0180\u0181\7g\2\2\u0181\u0182\7p\2\2\u0182\u0183"
+      + "\7f\2\2\u0183\u0184\7u\2\2\u0184\u0185\7Y\2\2\u0185\u0186\7k\2\2\u0186"
+      + "\u0187\7v\2\2\u0187\u0188\7j\2\2\u0188T\3\2\2\2\u0189\u018a\7?\2\2\u018a"
+      + "V\3\2\2\2\u018b\u018c\7g\2\2\u018c\u018d\7s\2\2\u018dX\3\2\2\2\u018e\u018f"
+      + "\7@\2\2\u018fZ\3\2\2\2\u0190\u0191\7i\2\2\u0191\u0192\7v\2\2\u0192\\\3"
+      + "\2\2\2\u0193\u0194\7@\2\2\u0194\u0195\7?\2\2\u0195^\3\2\2\2\u0196\u0197"
+      + "\7i\2\2\u0197\u0198\7g\2\2\u0198`\3\2\2\2\u0199\u019a\7i\2\2\u019a\u019b"
+      + "\7v\2\2\u019b\u019c\7g\2\2\u019cb\3\2\2\2\u019d\u019e\7>\2\2\u019ed\3"
+      + "\2\2\2\u019f\u01a0\7n\2\2\u01a0\u01a1\7v\2\2\u01a1f\3\2\2\2\u01a2\u01a3"
+      + "\7>\2\2\u01a3\u01a4\7?\2\2\u01a4h\3\2\2\2\u01a5\u01a6\7n\2\2\u01a6\u01a7"
+      + "\7g\2\2\u01a7j\3\2\2\2\u01a8\u01a9\7n\2\2\u01a9\u01aa\7v\2\2\u01aa\u01ab"
+      + "\7g\2\2\u01abl\3\2\2\2\u01ac\u01ad\7>\2\2\u01ad\u01ae\7@\2\2\u01aen\3"
+      + "\2\2\2\u01af\u01b0\7#\2\2\u01b0\u01b1\7?\2\2\u01b1p\3\2\2\2\u01b2\u01b3"
+      + "\7p\2\2\u01b3\u01b4\7g\2\2\u01b4r\3\2\2\2\u01b5\u01b6\7k\2\2\u01b6\u01b7"
+      + "\7g\2\2\u01b7\u01b8\7s\2\2\u01b8t\3\2\2\2\u01b9\u01ba\7k\2\2\u01ba\u01bb"
+      + "\7p\2\2\u01bb\u01bc\7g\2\2\u01bcv\3\2\2\2\u01bd\u01be\7<\2\2\u01be\u01c2"
+      + "\t\2\2\2\u01bf\u01c1\t\3\2\2\u01c0\u01bf\3\2\2\2\u01c1\u01c4\3\2\2\2\u01c2"
+      + "\u01c0\3\2\2\2\u01c2\u01c3\3\2\2\2\u01c3x\3\2\2\2\u01c4\u01c2\3\2\2\2"
+      + "\u01c5\u01c9\t\2\2\2\u01c6\u01c8\t\4\2\2\u01c7\u01c6\3\2\2\2\u01c8\u01cb"
+      + "\3\2\2\2\u01c9\u01c7\3\2\2\2\u01c9\u01ca\3\2\2\2\u01caz\3\2\2\2\u01cb"
+      + "\u01c9\3\2\2\2\u01cc\u01cd\7v\2\2\u01cd\u01ce\7t\2\2\u01ce\u01cf\7w\2"
+      + "\2\u01cf\u01d6\7g\2\2\u01d0\u01d1\7h\2\2\u01d1\u01d2\7c\2\2\u01d2\u01d3"
+      + "\7n\2\2\u01d3\u01d4\7u\2\2\u01d4\u01d6\7g\2\2\u01d5\u01cc\3\2\2\2\u01d5"
+      + "\u01d0\3\2\2\2\u01d6|\3\2\2\2\u01d7\u01d9\7/\2\2\u01d8\u01d7\3\2\2\2\u01d8"
+      + "\u01d9\3\2\2\2\u01d9\u01da\3\2\2\2\u01da\u01e1\5\177@\2\u01db\u01dd\7"
+      + "/\2\2\u01dc\u01db\3\2\2\2\u01dc\u01dd\3\2\2\2\u01dd\u01de\3\2\2\2\u01de"
+      + "\u01e1\5\u0081A\2\u01df\u01e1\5\u0083B\2\u01e0\u01d8\3\2\2\2\u01e0\u01dc"
+      + "\3\2\2\2\u01e0\u01df\3\2\2\2\u01e1~\3\2\2\2\u01e2\u01e4\t\5\2\2\u01e3"
+      + "\u01e2\3\2\2\2\u01e4\u01e5\3\2\2\2\u01e5\u01e3\3\2\2\2\u01e5\u01e6\3\2"
+      + "\2\2\u01e6\u01e7\3\2\2\2\u01e7\u01eb\7\60\2\2\u01e8\u01ea\t\5\2\2\u01e9"
+      + "\u01e8\3\2\2\2\u01ea\u01ed\3\2\2\2\u01eb\u01e9\3\2\2\2\u01eb\u01ec\3\2"
+      + "\2\2\u01ec\u0080\3\2\2\2\u01ed\u01eb\3\2\2\2\u01ee\u01f2\t\6\2\2\u01ef"
+      + "\u01f1\t\5\2\2\u01f0\u01ef\3\2\2\2\u01f1\u01f4\3\2\2\2\u01f2\u01f0\3\2"
+      + "\2\2\u01f2\u01f3\3\2\2\2\u01f3\u0082\3\2\2\2\u01f4\u01f2\3\2\2\2\u01f5"
+      + "\u01f6\7\62\2\2\u01f6\u0084\3\2\2\2\u01f7\u01fd\7)\2\2\u01f8\u01fc\n\7"
+      + "\2\2\u01f9\u01fa\7)\2\2\u01fa\u01fc\7)\2\2\u01fb\u01f8\3\2\2\2\u01fb\u01f9"
+      + "\3\2\2\2\u01fc\u01ff\3\2\2\2\u01fd\u01fb\3\2\2\2\u01fd\u01fe\3\2\2\2\u01fe"
+      + "\u0200\3\2\2\2\u01ff\u01fd\3\2\2\2\u0200\u0201\7)\2\2\u0201\u0086\3\2"
+      + "\2\2\u0202\u0203\t\b\2\2\u0203\u0204\3\2\2\2\u0204\u0205\bD\2\2\u0205"
+      + "\u0088\3\2\2\2\16\2\u01c2\u01c9\u01d5\u01d8\u01dc\u01e0\u01e5\u01eb\u01f2" + "\u01fb\u01fd\3\b\2\2";
+  public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray());
   static {
     _decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
     for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {
       _decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens
index c6d1f969f..a475c2939 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens
@@ -55,15 +55,16 @@ T__53=54
 T__54=55
 T__55=56
 T__56=57
-INPUT_VARIABLE=58
-PATH_VARIABLE=59
-BOOLEAN_LITERAL=60
-NUMBER_LITERAL=61
-DOUBLE=62
-INT=63
-ZERO=64
-STRING_LITERAL=65
-WS=66
+T__57=58
+INPUT_VARIABLE=59
+PATH_VARIABLE=60
+BOOLEAN_LITERAL=61
+NUMBER_LITERAL=62
+DOUBLE=63
+INT=64
+ZERO=65
+STRING_LITERAL=66
+WS=67
 'select'=1
 '('=2
 ')'=3
@@ -121,4 +122,5 @@ WS=66
 '!='=55
 'ne'=56
 'ieq'=57
-'0'=64
+'ine'=58
+'0'=65
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java
index 6fddb3633..661d6c0d7 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java
@@ -1,4 +1,4 @@
-// Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.7
+// Generated from C:/dev/ebean/ebean/src/test/resources/EQL.g4 by ANTLR 4.7.1
 package io.ebeaninternal.server.grammer.antlr;
 
 import org.antlr.v4.runtime.tree.ParseTreeListener;
@@ -11,560 +11,640 @@ public interface EQLListener extends ParseTreeListener {
   /**
    * Enter a parse tree produced by {@link EQLParser#select_statement}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterSelect_statement(EQLParser.Select_statementContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#select_statement}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitSelect_statement(EQLParser.Select_statementContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#select_clause}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterSelect_clause(EQLParser.Select_clauseContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#select_clause}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitSelect_clause(EQLParser.Select_clauseContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#distinct}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterDistinct(EQLParser.DistinctContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#distinct}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitDistinct(EQLParser.DistinctContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#fetch_clause}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterFetch_clause(EQLParser.Fetch_clauseContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#fetch_clause}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitFetch_clause(EQLParser.Fetch_clauseContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#where_clause}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterWhere_clause(EQLParser.Where_clauseContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#where_clause}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitWhere_clause(EQLParser.Where_clauseContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#orderby_clause}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterOrderby_clause(EQLParser.Orderby_clauseContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#orderby_clause}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitOrderby_clause(EQLParser.Orderby_clauseContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#orderby_property}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterOrderby_property(EQLParser.Orderby_propertyContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#orderby_property}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitOrderby_property(EQLParser.Orderby_propertyContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#nulls_firstlast}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterNulls_firstlast(EQLParser.Nulls_firstlastContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#nulls_firstlast}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitNulls_firstlast(EQLParser.Nulls_firstlastContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#asc_desc}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterAsc_desc(EQLParser.Asc_descContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#asc_desc}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitAsc_desc(EQLParser.Asc_descContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#limit_clause}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterLimit_clause(EQLParser.Limit_clauseContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#limit_clause}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitLimit_clause(EQLParser.Limit_clauseContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#offset_clause}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterOffset_clause(EQLParser.Offset_clauseContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#offset_clause}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitOffset_clause(EQLParser.Offset_clauseContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#fetch_path}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterFetch_path(EQLParser.Fetch_pathContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#fetch_path}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitFetch_path(EQLParser.Fetch_pathContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#fetch_property_set}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterFetch_property_set(EQLParser.Fetch_property_setContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#fetch_property_set}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitFetch_property_set(EQLParser.Fetch_property_setContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#fetch_property_group}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterFetch_property_group(EQLParser.Fetch_property_groupContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#fetch_property_group}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitFetch_property_group(EQLParser.Fetch_property_groupContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#fetch_property}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterFetch_property(EQLParser.Fetch_propertyContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#fetch_property}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitFetch_property(EQLParser.Fetch_propertyContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#fetch_query_hint}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterFetch_query_hint(EQLParser.Fetch_query_hintContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#fetch_query_hint}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitFetch_query_hint(EQLParser.Fetch_query_hintContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#fetch_lazy_hint}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterFetch_lazy_hint(EQLParser.Fetch_lazy_hintContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#fetch_lazy_hint}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitFetch_lazy_hint(EQLParser.Fetch_lazy_hintContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#fetch_option}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterFetch_option(EQLParser.Fetch_optionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#fetch_option}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitFetch_option(EQLParser.Fetch_optionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#fetch_query_option}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterFetch_query_option(EQLParser.Fetch_query_optionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#fetch_query_option}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitFetch_query_option(EQLParser.Fetch_query_optionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#fetch_lazy_option}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterFetch_lazy_option(EQLParser.Fetch_lazy_optionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#fetch_lazy_option}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitFetch_lazy_option(EQLParser.Fetch_lazy_optionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#fetch_batch_size}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterFetch_batch_size(EQLParser.Fetch_batch_sizeContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#fetch_batch_size}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitFetch_batch_size(EQLParser.Fetch_batch_sizeContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#conditional_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterConditional_expression(EQLParser.Conditional_expressionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#conditional_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitConditional_expression(EQLParser.Conditional_expressionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#conditional_term}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterConditional_term(EQLParser.Conditional_termContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#conditional_term}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitConditional_term(EQLParser.Conditional_termContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#conditional_factor}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterConditional_factor(EQLParser.Conditional_factorContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#conditional_factor}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitConditional_factor(EQLParser.Conditional_factorContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#conditional_primary}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterConditional_primary(EQLParser.Conditional_primaryContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#conditional_primary}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitConditional_primary(EQLParser.Conditional_primaryContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#any_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterAny_expression(EQLParser.Any_expressionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#any_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitAny_expression(EQLParser.Any_expressionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#in_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterIn_expression(EQLParser.In_expressionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#in_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitIn_expression(EQLParser.In_expressionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#in_value}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterIn_value(EQLParser.In_valueContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#in_value}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitIn_value(EQLParser.In_valueContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#between_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterBetween_expression(EQLParser.Between_expressionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#between_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitBetween_expression(EQLParser.Between_expressionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#propertyBetween_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterPropertyBetween_expression(EQLParser.PropertyBetween_expressionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#propertyBetween_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitPropertyBetween_expression(EQLParser.PropertyBetween_expressionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#isNull_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterIsNull_expression(EQLParser.IsNull_expressionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#isNull_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitIsNull_expression(EQLParser.IsNull_expressionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#isNotNull_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterIsNotNull_expression(EQLParser.IsNotNull_expressionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#isNotNull_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitIsNotNull_expression(EQLParser.IsNotNull_expressionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#isEmpty_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterIsEmpty_expression(EQLParser.IsEmpty_expressionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#isEmpty_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitIsEmpty_expression(EQLParser.IsEmpty_expressionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#isNotEmpty_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterIsNotEmpty_expression(EQLParser.IsNotEmpty_expressionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#isNotEmpty_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitIsNotEmpty_expression(EQLParser.IsNotEmpty_expressionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#like_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterLike_expression(EQLParser.Like_expressionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#like_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitLike_expression(EQLParser.Like_expressionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#like_op}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterLike_op(EQLParser.Like_opContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#like_op}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitLike_op(EQLParser.Like_opContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#comparison_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterComparison_expression(EQLParser.Comparison_expressionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#comparison_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitComparison_expression(EQLParser.Comparison_expressionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#comparison_operator}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterComparison_operator(EQLParser.Comparison_operatorContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#comparison_operator}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitComparison_operator(EQLParser.Comparison_operatorContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#value_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterValue_expression(EQLParser.Value_expressionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#value_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitValue_expression(EQLParser.Value_expressionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#literal}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterLiteral(EQLParser.LiteralContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#literal}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitLiteral(EQLParser.LiteralContext ctx);
-}
+}
\ No newline at end of file
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
index 151146b94..67d3d0d5b 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
@@ -1,93 +1,63 @@
-// Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.7
+// Generated from C:/dev/ebean/ebean/src/test/resources/EQL.g4 by ANTLR 4.7.1
 package io.ebeaninternal.server.grammer.antlr;
 
-import org.antlr.v4.runtime.NoViableAltException;
-import org.antlr.v4.runtime.Parser;
-import org.antlr.v4.runtime.ParserRuleContext;
-import org.antlr.v4.runtime.RecognitionException;
-import org.antlr.v4.runtime.RuntimeMetaData;
-import org.antlr.v4.runtime.Token;
-import org.antlr.v4.runtime.TokenStream;
-import org.antlr.v4.runtime.Vocabulary;
-import org.antlr.v4.runtime.VocabularyImpl;
-import org.antlr.v4.runtime.atn.ATN;
-import org.antlr.v4.runtime.atn.ATNDeserializer;
-import org.antlr.v4.runtime.atn.ParserATNSimulator;
-import org.antlr.v4.runtime.atn.PredictionContextCache;
+import org.antlr.v4.runtime.atn.*;
 import org.antlr.v4.runtime.dfa.DFA;
-import org.antlr.v4.runtime.tree.ParseTreeListener;
-import org.antlr.v4.runtime.tree.TerminalNode;
-
+import org.antlr.v4.runtime.*;
+import org.antlr.v4.runtime.misc.*;
+import org.antlr.v4.runtime.tree.*;
 import java.util.List;
+import java.util.Iterator;
+import java.util.ArrayList;
 
-@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
+@SuppressWarnings({ "all", "warnings", "unchecked", "unused", "cast" })
 public class EQLParser extends Parser {
   static {
-    RuntimeMetaData.checkVersion("4.7", RuntimeMetaData.VERSION);
+    RuntimeMetaData.checkVersion("4.7.1", RuntimeMetaData.VERSION);
   }
 
   protected static final DFA[] _decisionToDFA;
-  protected static final PredictionContextCache _sharedContextCache =
-    new PredictionContextCache();
-  public static final int
-    T__0 = 1, T__1 = 2, T__2 = 3, T__3 = 4, T__4 = 5, T__5 = 6, T__6 = 7, T__7 = 8, T__8 = 9,
-    T__9 = 10, T__10 = 11, T__11 = 12, T__12 = 13, T__13 = 14, T__14 = 15, T__15 = 16, T__16 = 17,
-    T__17 = 18, T__18 = 19, T__19 = 20, T__20 = 21, T__21 = 22, T__22 = 23, T__23 = 24,
-    T__24 = 25, T__25 = 26, T__26 = 27, T__27 = 28, T__28 = 29, T__29 = 30, T__30 = 31,
-    T__31 = 32, T__32 = 33, T__33 = 34, T__34 = 35, T__35 = 36, T__36 = 37, T__37 = 38,
-    T__38 = 39, T__39 = 40, T__40 = 41, T__41 = 42, T__42 = 43, T__43 = 44, T__44 = 45,
-    T__45 = 46, T__46 = 47, T__47 = 48, T__48 = 49, T__49 = 50, T__50 = 51, T__51 = 52,
-    T__52 = 53, T__53 = 54, T__54 = 55, T__55 = 56, T__56 = 57, INPUT_VARIABLE = 58, PATH_VARIABLE = 59,
-    BOOLEAN_LITERAL = 60, NUMBER_LITERAL = 61, DOUBLE = 62, INT = 63, ZERO = 64, STRING_LITERAL = 65,
-    WS = 66;
-  public static final int
-    RULE_select_statement = 0, RULE_select_clause = 1, RULE_distinct = 2,
-    RULE_fetch_clause = 3, RULE_where_clause = 4, RULE_orderby_clause = 5,
-    RULE_orderby_property = 6, RULE_nulls_firstlast = 7, RULE_asc_desc = 8,
-    RULE_limit_clause = 9, RULE_offset_clause = 10, RULE_fetch_path = 11,
-    RULE_fetch_property_set = 12, RULE_fetch_property_group = 13, RULE_fetch_property = 14,
-    RULE_fetch_query_hint = 15, RULE_fetch_lazy_hint = 16, RULE_fetch_option = 17,
-    RULE_fetch_query_option = 18, RULE_fetch_lazy_option = 19, RULE_fetch_batch_size = 20,
-    RULE_conditional_expression = 21, RULE_conditional_term = 22, RULE_conditional_factor = 23,
-    RULE_conditional_primary = 24, RULE_any_expression = 25, RULE_in_expression = 26,
-    RULE_in_value = 27, RULE_between_expression = 28, RULE_propertyBetween_expression = 29,
-    RULE_isNull_expression = 30, RULE_isNotNull_expression = 31, RULE_isEmpty_expression = 32,
-    RULE_isNotEmpty_expression = 33, RULE_like_expression = 34, RULE_like_op = 35,
-    RULE_comparison_expression = 36, RULE_comparison_operator = 37, RULE_value_expression = 38,
-    RULE_literal = 39;
-  public static final String[] ruleNames = {
-    "select_statement", "select_clause", "distinct", "fetch_clause", "where_clause",
-    "orderby_clause", "orderby_property", "nulls_firstlast", "asc_desc", "limit_clause",
-    "offset_clause", "fetch_path", "fetch_property_set", "fetch_property_group",
-    "fetch_property", "fetch_query_hint", "fetch_lazy_hint", "fetch_option",
-    "fetch_query_option", "fetch_lazy_option", "fetch_batch_size", "conditional_expression",
-    "conditional_term", "conditional_factor", "conditional_primary", "any_expression",
-    "in_expression", "in_value", "between_expression", "propertyBetween_expression",
-    "isNull_expression", "isNotNull_expression", "isEmpty_expression", "isNotEmpty_expression",
-    "like_expression", "like_op", "comparison_expression", "comparison_operator",
-    "value_expression", "literal"
-  };
+  protected static final PredictionContextCache _sharedContextCache = new PredictionContextCache();
+  public static final int T__0 = 1, T__1 = 2, T__2 = 3, T__3 = 4, T__4 = 5, T__5 = 6, T__6 = 7, T__7 = 8, T__8 = 9,
+      T__9 = 10, T__10 = 11, T__11 = 12, T__12 = 13, T__13 = 14, T__14 = 15, T__15 = 16, T__16 = 17, T__17 = 18,
+      T__18 = 19, T__19 = 20, T__20 = 21, T__21 = 22, T__22 = 23, T__23 = 24, T__24 = 25, T__25 = 26, T__26 = 27,
+      T__27 = 28, T__28 = 29, T__29 = 30, T__30 = 31, T__31 = 32, T__32 = 33, T__33 = 34, T__34 = 35, T__35 = 36,
+      T__36 = 37, T__37 = 38, T__38 = 39, T__39 = 40, T__40 = 41, T__41 = 42, T__42 = 43, T__43 = 44, T__44 = 45,
+      T__45 = 46, T__46 = 47, T__47 = 48, T__48 = 49, T__49 = 50, T__50 = 51, T__51 = 52, T__52 = 53, T__53 = 54,
+      T__54 = 55, T__55 = 56, T__56 = 57, T__57 = 58, INPUT_VARIABLE = 59, PATH_VARIABLE = 60, BOOLEAN_LITERAL = 61,
+      NUMBER_LITERAL = 62, DOUBLE = 63, INT = 64, ZERO = 65, STRING_LITERAL = 66, WS = 67;
+  public static final int RULE_select_statement = 0, RULE_select_clause = 1, RULE_distinct = 2, RULE_fetch_clause = 3,
+      RULE_where_clause = 4, RULE_orderby_clause = 5, RULE_orderby_property = 6, RULE_nulls_firstlast = 7,
+      RULE_asc_desc = 8, RULE_limit_clause = 9, RULE_offset_clause = 10, RULE_fetch_path = 11,
+      RULE_fetch_property_set = 12, RULE_fetch_property_group = 13, RULE_fetch_property = 14,
+      RULE_fetch_query_hint = 15, RULE_fetch_lazy_hint = 16, RULE_fetch_option = 17, RULE_fetch_query_option = 18,
+      RULE_fetch_lazy_option = 19, RULE_fetch_batch_size = 20, RULE_conditional_expression = 21,
+      RULE_conditional_term = 22, RULE_conditional_factor = 23, RULE_conditional_primary = 24, RULE_any_expression = 25,
+      RULE_in_expression = 26, RULE_in_value = 27, RULE_between_expression = 28, RULE_propertyBetween_expression = 29,
+      RULE_isNull_expression = 30, RULE_isNotNull_expression = 31, RULE_isEmpty_expression = 32,
+      RULE_isNotEmpty_expression = 33, RULE_like_expression = 34, RULE_like_op = 35, RULE_comparison_expression = 36,
+      RULE_comparison_operator = 37, RULE_value_expression = 38, RULE_literal = 39;
+  public static final String[] ruleNames = { "select_statement", "select_clause", "distinct", "fetch_clause",
+      "where_clause", "orderby_clause", "orderby_property", "nulls_firstlast", "asc_desc", "limit_clause",
+      "offset_clause", "fetch_path", "fetch_property_set", "fetch_property_group", "fetch_property", "fetch_query_hint",
+      "fetch_lazy_hint", "fetch_option", "fetch_query_option", "fetch_lazy_option", "fetch_batch_size",
+      "conditional_expression", "conditional_term", "conditional_factor", "conditional_primary", "any_expression",
+      "in_expression", "in_value", "between_expression", "propertyBetween_expression", "isNull_expression",
+      "isNotNull_expression", "isEmpty_expression", "isNotEmpty_expression", "like_expression", "like_op",
+      "comparison_expression", "comparison_operator", "value_expression", "literal" };
 
-  private static final String[] _LITERAL_NAMES = {
-    null, "'select'", "'('", "')'", "'distinct'", "'where'", "'order'", "'by'",
-    "','", "'nulls'", "'first'", "'last'", "'asc'", "'desc'", "'limit'", "'offset'",
-    "'fetch'", "'+'", "'query'", "'lazy'", "'or'", "'and'", "'not'", "'in'",
-    "'between'", "'is'", "'null'", "'isNull'", "'isNotNull'", "'notNull'",
-    "'empty'", "'isEmpty'", "'isNotEmpty'", "'notEmpty'", "'like'", "'ilike'",
-    "'contains'", "'icontains'", "'startsWith'", "'istartsWith'", "'endsWith'",
-    "'iendsWith'", "'='", "'eq'", "'>'", "'gt'", "'>='", "'ge'", "'gte'",
-    "'<'", "'lt'", "'<='", "'le'", "'lte'", "'<>'", "'!='", "'ne'", "'ieq'",
-    null, null, null, null, null, null, "'0'"
-  };
-  private static final String[] _SYMBOLIC_NAMES = {
-    null, null, null, null, null, null, null, null, null, null, null, null,
-    null, null, null, null, null, null, null, null, null, null, null, null,
-    null, null, null, null, null, null, null, null, null, null, null, null,
-    null, null, null, null, null, null, null, null, null, null, null, null,
-    null, null, null, null, null, null, null, null, null, null, "INPUT_VARIABLE",
-    "PATH_VARIABLE", "BOOLEAN_LITERAL", "NUMBER_LITERAL", "DOUBLE", "INT",
-    "ZERO", "STRING_LITERAL", "WS"
-  };
+  private static final String[] _LITERAL_NAMES = { null, "'select'", "'('", "')'", "'distinct'", "'where'", "'order'",
+      "'by'", "','", "'nulls'", "'first'", "'last'", "'asc'", "'desc'", "'limit'", "'offset'", "'fetch'", "'+'",
+      "'query'", "'lazy'", "'or'", "'and'", "'not'", "'in'", "'between'", "'is'", "'null'", "'isNull'", "'isNotNull'",
+      "'notNull'", "'empty'", "'isEmpty'", "'isNotEmpty'", "'notEmpty'", "'like'", "'ilike'", "'contains'",
+      "'icontains'", "'startsWith'", "'istartsWith'", "'endsWith'", "'iendsWith'", "'='", "'eq'", "'>'", "'gt'", "'>='",
+      "'ge'", "'gte'", "'<'", "'lt'", "'<='", "'le'", "'lte'", "'<>'", "'!='", "'ne'", "'ieq'", "'ine'", null, null,
+      null, null, null, null, "'0'" };
+  private static final String[] _SYMBOLIC_NAMES = { null, null, null, null, null, null, null, null, null, null, null,
+      null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+      null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+      null, null, null, null, null, null, null, null, null, null, "INPUT_VARIABLE", "PATH_VARIABLE", "BOOLEAN_LITERAL",
+      "NUMBER_LITERAL", "DOUBLE", "INT", "ZERO", "STRING_LITERAL", "WS" };
   public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
 
   /**
@@ -95,7 +65,6 @@ public class EQLParser extends Parser {
    */
   @Deprecated
   public static final String[] tokenNames;
-
   static {
     tokenNames = new String[_SYMBOLIC_NAMES.length];
     for (int i = 0; i < tokenNames.length; i++) {
@@ -187,12 +156,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterSelect_statement(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterSelect_statement(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitSelect_statement(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitSelect_statement(this);
     }
   }
 
@@ -290,12 +261,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterSelect_clause(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterSelect_clause(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitSelect_clause(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitSelect_clause(this);
     }
   }
 
@@ -347,12 +320,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterDistinct(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterDistinct(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitDistinct(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitDistinct(this);
     }
   }
 
@@ -391,12 +366,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterFetch_clause(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterFetch_clause(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitFetch_clause(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitFetch_clause(this);
     }
   }
 
@@ -435,12 +412,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterWhere_clause(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterWhere_clause(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitWhere_clause(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitWhere_clause(this);
     }
   }
 
@@ -485,12 +464,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterOrderby_clause(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterOrderby_clause(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitOrderby_clause(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitOrderby_clause(this);
     }
   }
 
@@ -558,12 +539,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterOrderby_property(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterOrderby_property(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitOrderby_property(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitOrderby_property(this);
     }
   }
 
@@ -619,12 +602,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterNulls_firstlast(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterNulls_firstlast(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitNulls_firstlast(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitNulls_firstlast(this);
     }
   }
 
@@ -635,23 +620,21 @@ public class EQLParser extends Parser {
       setState(136);
       _errHandler.sync(this);
       switch (getInterpreter().adaptivePredict(_input, 9, _ctx)) {
-        case 1:
-          enterOuterAlt(_localctx, 1);
-        {
-          setState(132);
-          match(T__8);
-          setState(133);
-          match(T__9);
-        }
+      case 1:
+        enterOuterAlt(_localctx, 1); {
+        setState(132);
+        match(T__8);
+        setState(133);
+        match(T__9);
+      }
         break;
-        case 2:
-          enterOuterAlt(_localctx, 2);
-        {
-          setState(134);
-          match(T__8);
-          setState(135);
-          match(T__10);
-        }
+      case 2:
+        enterOuterAlt(_localctx, 2); {
+        setState(134);
+        match(T__8);
+        setState(135);
+        match(T__10);
+      }
         break;
       }
     } catch (RecognitionException re) {
@@ -676,12 +659,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterAsc_desc(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterAsc_desc(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitAsc_desc(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitAsc_desc(this);
     }
   }
 
@@ -697,7 +682,8 @@ public class EQLParser extends Parser {
         if (!(_la == T__11 || _la == T__12)) {
           _errHandler.recoverInline(this);
         } else {
-          if (_input.LA(1) == Token.EOF) matchedEOF = true;
+          if (_input.LA(1) == Token.EOF)
+            matchedEOF = true;
           _errHandler.reportMatch(this);
           consume();
         }
@@ -732,12 +718,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterLimit_clause(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterLimit_clause(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitLimit_clause(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitLimit_clause(this);
     }
   }
 
@@ -789,12 +777,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterOffset_clause(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterOffset_clause(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitOffset_clause(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitOffset_clause(this);
     }
   }
 
@@ -843,12 +833,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterFetch_path(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterFetch_path(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitFetch_path(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitFetch_path(this);
     }
   }
 
@@ -910,12 +902,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterFetch_property_set(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterFetch_property_set(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitFetch_property_set(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitFetch_property_set(this);
     }
   }
 
@@ -962,12 +956,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterFetch_property_group(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterFetch_property_group(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitFetch_property_group(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitFetch_property_group(this);
     }
   }
 
@@ -1031,12 +1027,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterFetch_property(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterFetch_property(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitFetch_property(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitFetch_property(this);
     }
   }
 
@@ -1047,26 +1045,23 @@ public class EQLParser extends Parser {
       setState(171);
       _errHandler.sync(this);
       switch (getInterpreter().adaptivePredict(_input, 14, _ctx)) {
-        case 1:
-          enterOuterAlt(_localctx, 1);
-        {
-          setState(168);
-          match(PATH_VARIABLE);
-        }
+      case 1:
+        enterOuterAlt(_localctx, 1); {
+        setState(168);
+        match(PATH_VARIABLE);
+      }
         break;
-        case 2:
-          enterOuterAlt(_localctx, 2);
-        {
-          setState(169);
-          fetch_query_hint();
-        }
+      case 2:
+        enterOuterAlt(_localctx, 2); {
+        setState(169);
+        fetch_query_hint();
+      }
         break;
-        case 3:
-          enterOuterAlt(_localctx, 3);
-        {
-          setState(170);
-          fetch_lazy_hint();
-        }
+      case 3:
+        enterOuterAlt(_localctx, 3); {
+        setState(170);
+        fetch_lazy_hint();
+      }
         break;
       }
     } catch (RecognitionException re) {
@@ -1095,12 +1090,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterFetch_query_hint(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterFetch_query_hint(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitFetch_query_hint(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitFetch_query_hint(this);
     }
   }
 
@@ -1141,12 +1138,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterFetch_lazy_hint(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterFetch_lazy_hint(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitFetch_lazy_hint(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitFetch_lazy_hint(this);
     }
   }
 
@@ -1191,12 +1190,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterFetch_option(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterFetch_option(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitFetch_option(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitFetch_option(this);
     }
   }
 
@@ -1207,22 +1208,20 @@ public class EQLParser extends Parser {
       setState(181);
       _errHandler.sync(this);
       switch (_input.LA(1)) {
-        case T__17:
-          enterOuterAlt(_localctx, 1);
-        {
-          setState(179);
-          fetch_query_option();
-        }
+      case T__17:
+        enterOuterAlt(_localctx, 1); {
+        setState(179);
+        fetch_query_option();
+      }
         break;
-        case T__18:
-          enterOuterAlt(_localctx, 2);
-        {
-          setState(180);
-          fetch_lazy_option();
-        }
+      case T__18:
+        enterOuterAlt(_localctx, 2); {
+        setState(180);
+        fetch_lazy_option();
+      }
         break;
-        default:
-          throw new NoViableAltException(this);
+      default:
+        throw new NoViableAltException(this);
       }
     } catch (RecognitionException re) {
       _localctx.exception = re;
@@ -1250,12 +1249,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterFetch_query_option(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterFetch_query_option(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitFetch_query_option(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitFetch_query_option(this);
     }
   }
 
@@ -1305,12 +1306,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterFetch_lazy_option(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterFetch_lazy_option(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitFetch_lazy_option(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitFetch_lazy_option(this);
     }
   }
 
@@ -1360,12 +1363,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterFetch_batch_size(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterFetch_batch_size(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitFetch_batch_size(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitFetch_batch_size(this);
     }
   }
 
@@ -1412,12 +1417,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterConditional_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterConditional_expression(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitConditional_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitConditional_expression(this);
     }
   }
 
@@ -1477,12 +1484,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterConditional_term(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterConditional_term(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitConditional_term(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitConditional_term(this);
     }
   }
 
@@ -1538,12 +1547,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterConditional_factor(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterConditional_factor(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitConditional_factor(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitConditional_factor(this);
     }
   }
 
@@ -1597,12 +1608,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterConditional_primary(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterConditional_primary(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitConditional_primary(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitConditional_primary(this);
     }
   }
 
@@ -1613,23 +1626,21 @@ public class EQLParser extends Parser {
       setState(221);
       _errHandler.sync(this);
       switch (getInterpreter().adaptivePredict(_input, 21, _ctx)) {
-        case 1:
-          enterOuterAlt(_localctx, 1);
-        {
-          setState(216);
-          any_expression();
-        }
+      case 1:
+        enterOuterAlt(_localctx, 1); {
+        setState(216);
+        any_expression();
+      }
         break;
-        case 2:
-          enterOuterAlt(_localctx, 2);
-        {
-          setState(217);
-          match(T__1);
-          setState(218);
-          conditional_expression();
-          setState(219);
-          match(T__2);
-        }
+      case 2:
+        enterOuterAlt(_localctx, 2); {
+        setState(217);
+        match(T__1);
+        setState(218);
+        conditional_expression();
+        setState(219);
+        match(T__2);
+      }
         break;
       }
     } catch (RecognitionException re) {
@@ -1694,12 +1705,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterAny_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterAny_expression(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitAny_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitAny_expression(this);
     }
   }
 
@@ -1710,79 +1723,69 @@ public class EQLParser extends Parser {
       setState(236);
       _errHandler.sync(this);
       switch (getInterpreter().adaptivePredict(_input, 22, _ctx)) {
-        case 1:
-          enterOuterAlt(_localctx, 1);
-        {
-          setState(223);
-          comparison_expression();
-        }
+      case 1:
+        enterOuterAlt(_localctx, 1); {
+        setState(223);
+        comparison_expression();
+      }
         break;
-        case 2:
-          enterOuterAlt(_localctx, 2);
-        {
-          setState(224);
-          like_expression();
-        }
+      case 2:
+        enterOuterAlt(_localctx, 2); {
+        setState(224);
+        like_expression();
+      }
         break;
-        case 3:
-          enterOuterAlt(_localctx, 3);
-        {
-          setState(225);
-          between_expression();
-        }
+      case 3:
+        enterOuterAlt(_localctx, 3); {
+        setState(225);
+        between_expression();
+      }
         break;
-        case 4:
-          enterOuterAlt(_localctx, 4);
-        {
-          setState(226);
-          propertyBetween_expression();
-        }
+      case 4:
+        enterOuterAlt(_localctx, 4); {
+        setState(226);
+        propertyBetween_expression();
+      }
         break;
-        case 5:
-          enterOuterAlt(_localctx, 5);
-        {
-          setState(227);
-          in_expression();
-        }
+      case 5:
+        enterOuterAlt(_localctx, 5); {
+        setState(227);
+        in_expression();
+      }
         break;
-        case 6:
-          enterOuterAlt(_localctx, 6);
-        {
-          setState(228);
-          isNull_expression();
-        }
+      case 6:
+        enterOuterAlt(_localctx, 6); {
+        setState(228);
+        isNull_expression();
+      }
         break;
-        case 7:
-          enterOuterAlt(_localctx, 7);
-        {
-          setState(229);
-          isNotNull_expression();
-        }
+      case 7:
+        enterOuterAlt(_localctx, 7); {
+        setState(229);
+        isNotNull_expression();
+      }
         break;
-        case 8:
-          enterOuterAlt(_localctx, 8);
-        {
-          setState(230);
-          isEmpty_expression();
-        }
+      case 8:
+        enterOuterAlt(_localctx, 8); {
+        setState(230);
+        isEmpty_expression();
+      }
         break;
-        case 9:
-          enterOuterAlt(_localctx, 9);
-        {
-          setState(231);
-          isNotEmpty_expression();
-        }
+      case 9:
+        enterOuterAlt(_localctx, 9); {
+        setState(231);
+        isNotEmpty_expression();
+      }
         break;
-        case 10:
-          enterOuterAlt(_localctx, 10);
-        {
-          setState(232);
-          match(T__1);
-          setState(233);
-          any_expression();
-          setState(234);
-          match(T__2);
-        }
+      case 10:
+        enterOuterAlt(_localctx, 10); {
+        setState(232);
+        match(T__1);
+        setState(233);
+        any_expression();
+        setState(234);
+        match(T__2);
+      }
         break;
       }
     } catch (RecognitionException re) {
@@ -1815,12 +1818,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterIn_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterIn_expression(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitIn_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitIn_expression(this);
     }
   }
 
@@ -1871,12 +1876,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterIn_value(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterIn_value(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitIn_value(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitIn_value(this);
     }
   }
 
@@ -1888,42 +1895,40 @@ public class EQLParser extends Parser {
       setState(254);
       _errHandler.sync(this);
       switch (_input.LA(1)) {
-        case INPUT_VARIABLE:
-          enterOuterAlt(_localctx, 1);
-        {
-          setState(242);
-          match(INPUT_VARIABLE);
-        }
+      case INPUT_VARIABLE:
+        enterOuterAlt(_localctx, 1); {
+        setState(242);
+        match(INPUT_VARIABLE);
+      }
         break;
-        case T__1:
-          enterOuterAlt(_localctx, 2);
-        {
-          setState(243);
-          match(T__1);
-          setState(244);
-          value_expression();
-          setState(249);
+      case T__1:
+        enterOuterAlt(_localctx, 2); {
+        setState(243);
+        match(T__1);
+        setState(244);
+        value_expression();
+        setState(249);
+        _errHandler.sync(this);
+        _la = _input.LA(1);
+        while (_la == T__7) {
+          {
+            {
+              setState(245);
+              match(T__7);
+              setState(246);
+              value_expression();
+            }
+          }
+          setState(251);
           _errHandler.sync(this);
           _la = _input.LA(1);
-          while (_la == T__7) {
-            {
-              {
-                setState(245);
-                match(T__7);
-                setState(246);
-                value_expression();
-              }
-            }
-            setState(251);
-            _errHandler.sync(this);
-            _la = _input.LA(1);
-          }
-          setState(252);
-          match(T__2);
         }
+        setState(252);
+        match(T__2);
+      }
         break;
-        default:
-          throw new NoViableAltException(this);
+      default:
+        throw new NoViableAltException(this);
       }
     } catch (RecognitionException re) {
       _localctx.exception = re;
@@ -1959,12 +1964,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterBetween_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterBetween_expression(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitBetween_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitBetween_expression(this);
     }
   }
 
@@ -2019,12 +2026,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterPropertyBetween_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterPropertyBetween_expression(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitPropertyBetween_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitPropertyBetween_expression(this);
     }
   }
 
@@ -2071,12 +2080,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterIsNull_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterIsNull_expression(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitIsNull_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitIsNull_expression(this);
     }
   }
 
@@ -2087,25 +2098,23 @@ public class EQLParser extends Parser {
       setState(273);
       _errHandler.sync(this);
       switch (getInterpreter().adaptivePredict(_input, 25, _ctx)) {
-        case 1:
-          enterOuterAlt(_localctx, 1);
-        {
-          setState(268);
-          match(PATH_VARIABLE);
-          setState(269);
-          match(T__24);
-          setState(270);
-          match(T__25);
-        }
+      case 1:
+        enterOuterAlt(_localctx, 1); {
+        setState(268);
+        match(PATH_VARIABLE);
+        setState(269);
+        match(T__24);
+        setState(270);
+        match(T__25);
+      }
         break;
-        case 2:
-          enterOuterAlt(_localctx, 2);
-        {
-          setState(271);
-          match(PATH_VARIABLE);
-          setState(272);
-          match(T__26);
-        }
+      case 2:
+        enterOuterAlt(_localctx, 2); {
+        setState(271);
+        match(PATH_VARIABLE);
+        setState(272);
+        match(T__26);
+      }
         break;
       }
     } catch (RecognitionException re) {
@@ -2134,12 +2143,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterIsNotNull_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterIsNotNull_expression(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitIsNotNull_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitIsNotNull_expression(this);
     }
   }
 
@@ -2150,36 +2161,33 @@ public class EQLParser extends Parser {
       setState(283);
       _errHandler.sync(this);
       switch (getInterpreter().adaptivePredict(_input, 26, _ctx)) {
-        case 1:
-          enterOuterAlt(_localctx, 1);
-        {
-          setState(275);
-          match(PATH_VARIABLE);
-          setState(276);
-          match(T__24);
-          setState(277);
-          match(T__21);
-          setState(278);
-          match(T__25);
-        }
+      case 1:
+        enterOuterAlt(_localctx, 1); {
+        setState(275);
+        match(PATH_VARIABLE);
+        setState(276);
+        match(T__24);
+        setState(277);
+        match(T__21);
+        setState(278);
+        match(T__25);
+      }
         break;
-        case 2:
-          enterOuterAlt(_localctx, 2);
-        {
-          setState(279);
-          match(PATH_VARIABLE);
-          setState(280);
-          match(T__27);
-        }
+      case 2:
+        enterOuterAlt(_localctx, 2); {
+        setState(279);
+        match(PATH_VARIABLE);
+        setState(280);
+        match(T__27);
+      }
         break;
-        case 3:
-          enterOuterAlt(_localctx, 3);
-        {
-          setState(281);
-          match(PATH_VARIABLE);
-          setState(282);
-          match(T__28);
-        }
+      case 3:
+        enterOuterAlt(_localctx, 3); {
+        setState(281);
+        match(PATH_VARIABLE);
+        setState(282);
+        match(T__28);
+      }
         break;
       }
     } catch (RecognitionException re) {
@@ -2208,12 +2216,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterIsEmpty_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterIsEmpty_expression(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitIsEmpty_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitIsEmpty_expression(this);
     }
   }
 
@@ -2224,25 +2234,23 @@ public class EQLParser extends Parser {
       setState(290);
       _errHandler.sync(this);
       switch (getInterpreter().adaptivePredict(_input, 27, _ctx)) {
-        case 1:
-          enterOuterAlt(_localctx, 1);
-        {
-          setState(285);
-          match(PATH_VARIABLE);
-          setState(286);
-          match(T__24);
-          setState(287);
-          match(T__29);
-        }
+      case 1:
+        enterOuterAlt(_localctx, 1); {
+        setState(285);
+        match(PATH_VARIABLE);
+        setState(286);
+        match(T__24);
+        setState(287);
+        match(T__29);
+      }
         break;
-        case 2:
-          enterOuterAlt(_localctx, 2);
-        {
-          setState(288);
-          match(PATH_VARIABLE);
-          setState(289);
-          match(T__30);
-        }
+      case 2:
+        enterOuterAlt(_localctx, 2); {
+        setState(288);
+        match(PATH_VARIABLE);
+        setState(289);
+        match(T__30);
+      }
         break;
       }
     } catch (RecognitionException re) {
@@ -2271,12 +2279,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterIsNotEmpty_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterIsNotEmpty_expression(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitIsNotEmpty_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitIsNotEmpty_expression(this);
     }
   }
 
@@ -2287,36 +2297,33 @@ public class EQLParser extends Parser {
       setState(300);
       _errHandler.sync(this);
       switch (getInterpreter().adaptivePredict(_input, 28, _ctx)) {
-        case 1:
-          enterOuterAlt(_localctx, 1);
-        {
-          setState(292);
-          match(PATH_VARIABLE);
-          setState(293);
-          match(T__24);
-          setState(294);
-          match(T__21);
-          setState(295);
-          match(T__29);
-        }
+      case 1:
+        enterOuterAlt(_localctx, 1); {
+        setState(292);
+        match(PATH_VARIABLE);
+        setState(293);
+        match(T__24);
+        setState(294);
+        match(T__21);
+        setState(295);
+        match(T__29);
+      }
         break;
-        case 2:
-          enterOuterAlt(_localctx, 2);
-        {
-          setState(296);
-          match(PATH_VARIABLE);
-          setState(297);
-          match(T__31);
-        }
+      case 2:
+        enterOuterAlt(_localctx, 2); {
+        setState(296);
+        match(PATH_VARIABLE);
+        setState(297);
+        match(T__31);
+      }
         break;
-        case 3:
-          enterOuterAlt(_localctx, 3);
-        {
-          setState(298);
-          match(PATH_VARIABLE);
-          setState(299);
-          match(T__32);
-        }
+      case 3:
+        enterOuterAlt(_localctx, 3); {
+        setState(298);
+        match(PATH_VARIABLE);
+        setState(299);
+        match(T__32);
+      }
         break;
       }
     } catch (RecognitionException re) {
@@ -2353,12 +2360,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterLike_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterLike_expression(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitLike_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitLike_expression(this);
     }
   }
 
@@ -2397,12 +2406,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterLike_op(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterLike_op(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitLike_op(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitLike_op(this);
     }
   }
 
@@ -2415,10 +2426,12 @@ public class EQLParser extends Parser {
       {
         setState(306);
         _la = _input.LA(1);
-        if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__33) | (1L << T__34) | (1L << T__35) | (1L << T__36) | (1L << T__37) | (1L << T__38) | (1L << T__39) | (1L << T__40))) != 0))) {
+        if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__33) | (1L << T__34) | (1L << T__35) | (1L << T__36)
+            | (1L << T__37) | (1L << T__38) | (1L << T__39) | (1L << T__40))) != 0))) {
           _errHandler.recoverInline(this);
         } else {
-          if (_input.LA(1) == Token.EOF) matchedEOF = true;
+          if (_input.LA(1) == Token.EOF)
+            matchedEOF = true;
           _errHandler.reportMatch(this);
           consume();
         }
@@ -2457,12 +2470,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterComparison_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterComparison_expression(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitComparison_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitComparison_expression(this);
     }
   }
 
@@ -2473,33 +2488,31 @@ public class EQLParser extends Parser {
       setState(316);
       _errHandler.sync(this);
       switch (_input.LA(1)) {
-        case PATH_VARIABLE:
-          enterOuterAlt(_localctx, 1);
-        {
-          setState(308);
-          match(PATH_VARIABLE);
-          setState(309);
-          comparison_operator();
-          setState(310);
-          value_expression();
-        }
+      case PATH_VARIABLE:
+        enterOuterAlt(_localctx, 1); {
+        setState(308);
+        match(PATH_VARIABLE);
+        setState(309);
+        comparison_operator();
+        setState(310);
+        value_expression();
+      }
         break;
-        case INPUT_VARIABLE:
-        case BOOLEAN_LITERAL:
-        case NUMBER_LITERAL:
-        case STRING_LITERAL:
-          enterOuterAlt(_localctx, 2);
-        {
-          setState(312);
-          value_expression();
-          setState(313);
-          comparison_operator();
-          setState(314);
-          match(PATH_VARIABLE);
-        }
+      case INPUT_VARIABLE:
+      case BOOLEAN_LITERAL:
+      case NUMBER_LITERAL:
+      case STRING_LITERAL:
+        enterOuterAlt(_localctx, 2); {
+        setState(312);
+        value_expression();
+        setState(313);
+        comparison_operator();
+        setState(314);
+        match(PATH_VARIABLE);
+      }
         break;
-        default:
-          throw new NoViableAltException(this);
+      default:
+        throw new NoViableAltException(this);
       }
     } catch (RecognitionException re) {
       _localctx.exception = re;
@@ -2523,12 +2536,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterComparison_operator(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterComparison_operator(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitComparison_operator(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitComparison_operator(this);
     }
   }
 
@@ -2541,10 +2556,14 @@ public class EQLParser extends Parser {
       {
         setState(318);
         _la = _input.LA(1);
-        if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__41) | (1L << T__42) | (1L << T__43) | (1L << T__44) | (1L << T__45) | (1L << T__46) | (1L << T__47) | (1L << T__48) | (1L << T__49) | (1L << T__50) | (1L << T__51) | (1L << T__52) | (1L << T__53) | (1L << T__54) | (1L << T__55) | (1L << T__56))) != 0))) {
+        if (!((((_la) & ~0x3f) == 0 && ((1L << _la)
+            & ((1L << T__41) | (1L << T__42) | (1L << T__43) | (1L << T__44) | (1L << T__45) | (1L << T__46)
+                | (1L << T__47) | (1L << T__48) | (1L << T__49) | (1L << T__50) | (1L << T__51) | (1L << T__52)
+                | (1L << T__53) | (1L << T__54) | (1L << T__55) | (1L << T__56) | (1L << T__57))) != 0))) {
           _errHandler.recoverInline(this);
         } else {
-          if (_input.LA(1) == Token.EOF) matchedEOF = true;
+          if (_input.LA(1) == Token.EOF)
+            matchedEOF = true;
           _errHandler.reportMatch(this);
           consume();
         }
@@ -2579,12 +2598,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterValue_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterValue_expression(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitValue_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitValue_expression(this);
     }
   }
 
@@ -2595,24 +2616,22 @@ public class EQLParser extends Parser {
       setState(322);
       _errHandler.sync(this);
       switch (_input.LA(1)) {
-        case BOOLEAN_LITERAL:
-        case NUMBER_LITERAL:
-        case STRING_LITERAL:
-          enterOuterAlt(_localctx, 1);
-        {
-          setState(320);
-          literal();
-        }
+      case BOOLEAN_LITERAL:
+      case NUMBER_LITERAL:
+      case STRING_LITERAL:
+        enterOuterAlt(_localctx, 1); {
+        setState(320);
+        literal();
+      }
         break;
-        case INPUT_VARIABLE:
-          enterOuterAlt(_localctx, 2);
-        {
-          setState(321);
-          match(INPUT_VARIABLE);
-        }
+      case INPUT_VARIABLE:
+        enterOuterAlt(_localctx, 2); {
+        setState(321);
+        match(INPUT_VARIABLE);
+      }
         break;
-        default:
-          throw new NoViableAltException(this);
+      default:
+        throw new NoViableAltException(this);
       }
     } catch (RecognitionException re) {
       _localctx.exception = re;
@@ -2648,12 +2667,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterLiteral(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterLiteral(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitLiteral(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitLiteral(this);
     }
   }
 
@@ -2666,10 +2687,12 @@ public class EQLParser extends Parser {
       {
         setState(324);
         _la = _input.LA(1);
-        if (!(((((_la - 60)) & ~0x3f) == 0 && ((1L << (_la - 60)) & ((1L << (BOOLEAN_LITERAL - 60)) | (1L << (NUMBER_LITERAL - 60)) | (1L << (STRING_LITERAL - 60)))) != 0))) {
+        if (!(((((_la - 61)) & ~0x3f) == 0 && ((1L << (_la - 61)) & ((1L << (BOOLEAN_LITERAL - 61))
+            | (1L << (NUMBER_LITERAL - 61)) | (1L << (STRING_LITERAL - 61)))) != 0))) {
           _errHandler.recoverInline(this);
         } else {
-          if (_input.LA(1) == Token.EOF) matchedEOF = true;
+          if (_input.LA(1) == Token.EOF)
+            matchedEOF = true;
           _errHandler.reportMatch(this);
           consume();
         }
@@ -2684,123 +2707,119 @@ public class EQLParser extends Parser {
     return _localctx;
   }
 
-  public static final String _serializedATN =
-    "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3D\u0149\4\2\t\2\4" +
-      "\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t" +
-      "\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22" +
-      "\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31" +
-      "\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\4\36\t\36\4\37\t\37\4 \t \4!" +
-      "\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\3\2\5\2T\n\2\3" +
-      "\2\7\2W\n\2\f\2\16\2Z\13\2\3\2\5\2]\n\2\3\2\5\2`\n\2\3\2\5\2c\n\2\3\2" +
-      "\3\2\3\3\3\3\5\3i\n\3\3\3\3\3\3\3\3\3\3\4\3\4\3\5\3\5\3\6\3\6\3\6\3\7" +
-      "\3\7\3\7\3\7\3\7\7\7{\n\7\f\7\16\7~\13\7\3\b\3\b\5\b\u0082\n\b\3\b\5\b" +
-      "\u0085\n\b\3\t\3\t\3\t\3\t\5\t\u008b\n\t\3\n\3\n\3\13\3\13\3\13\5\13\u0092" +
-      "\n\13\3\f\3\f\3\f\3\r\3\r\5\r\u0099\n\r\3\r\3\r\5\r\u009d\n\r\3\16\3\16" +
-      "\3\16\3\16\3\17\3\17\3\17\7\17\u00a6\n\17\f\17\16\17\u00a9\13\17\3\20" +
-      "\3\20\3\20\5\20\u00ae\n\20\3\21\3\21\3\21\3\22\3\22\3\22\3\23\3\23\5\23" +
-      "\u00b8\n\23\3\24\3\24\5\24\u00bc\n\24\3\25\3\25\5\25\u00c0\n\25\3\26\3" +
-      "\26\3\26\3\26\3\27\3\27\3\27\7\27\u00c9\n\27\f\27\16\27\u00cc\13\27\3" +
-      "\30\3\30\3\30\7\30\u00d1\n\30\f\30\16\30\u00d4\13\30\3\31\5\31\u00d7\n" +
-      "\31\3\31\3\31\3\32\3\32\3\32\3\32\3\32\5\32\u00e0\n\32\3\33\3\33\3\33" +
-      "\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\5\33\u00ef\n\33\3\34" +
-      "\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\35\7\35\u00fa\n\35\f\35\16\35\u00fd" +
-      "\13\35\3\35\3\35\5\35\u0101\n\35\3\36\3\36\3\36\3\36\3\36\3\36\3\37\3" +
-      "\37\3\37\3\37\3\37\3\37\3 \3 \3 \3 \3 \5 \u0114\n \3!\3!\3!\3!\3!\3!\3" +
-      "!\3!\5!\u011e\n!\3\"\3\"\3\"\3\"\3\"\5\"\u0125\n\"\3#\3#\3#\3#\3#\3#\3" +
-      "#\3#\5#\u012f\n#\3$\3$\3$\3$\3%\3%\3&\3&\3&\3&\3&\3&\3&\3&\5&\u013f\n" +
-      "&\3\'\3\'\3(\3(\5(\u0145\n(\3)\3)\3)\2\2*\2\4\6\b\n\f\16\20\22\24\26\30" +
-      "\32\34\36 \"$&(*,.\60\62\64\668:<>@BDFHJLNP\2\6\3\2\16\17\3\2$+\3\2,;" +
-      "\4\2>?CC\2\u014a\2S\3\2\2\2\4f\3\2\2\2\6n\3\2\2\2\bp\3\2\2\2\nr\3\2\2" +
-      "\2\fu\3\2\2\2\16\177\3\2\2\2\20\u008a\3\2\2\2\22\u008c\3\2\2\2\24\u008e" +
-      "\3\2\2\2\26\u0093\3\2\2\2\30\u0096\3\2\2\2\32\u009e\3\2\2\2\34\u00a2\3" +
-      "\2\2\2\36\u00ad\3\2\2\2 \u00af\3\2\2\2\"\u00b2\3\2\2\2$\u00b7\3\2\2\2" +
-      "&\u00b9\3\2\2\2(\u00bd\3\2\2\2*\u00c1\3\2\2\2,\u00c5\3\2\2\2.\u00cd\3" +
-      "\2\2\2\60\u00d6\3\2\2\2\62\u00df\3\2\2\2\64\u00ee\3\2\2\2\66\u00f0\3\2" +
-      "\2\28\u0100\3\2\2\2:\u0102\3\2\2\2<\u0108\3\2\2\2>\u0113\3\2\2\2@\u011d" +
-      "\3\2\2\2B\u0124\3\2\2\2D\u012e\3\2\2\2F\u0130\3\2\2\2H\u0134\3\2\2\2J" +
-      "\u013e\3\2\2\2L\u0140\3\2\2\2N\u0144\3\2\2\2P\u0146\3\2\2\2RT\5\4\3\2" +
-      "SR\3\2\2\2ST\3\2\2\2TX\3\2\2\2UW\5\b\5\2VU\3\2\2\2WZ\3\2\2\2XV\3\2\2\2" +
-      "XY\3\2\2\2Y\\\3\2\2\2ZX\3\2\2\2[]\5\n\6\2\\[\3\2\2\2\\]\3\2\2\2]_\3\2" +
-      "\2\2^`\5\f\7\2_^\3\2\2\2_`\3\2\2\2`b\3\2\2\2ac\5\24\13\2ba\3\2\2\2bc\3" +
-      "\2\2\2cd\3\2\2\2de\7\2\2\3e\3\3\2\2\2fh\7\3\2\2gi\5\6\4\2hg\3\2\2\2hi" +
-      "\3\2\2\2ij\3\2\2\2jk\7\4\2\2kl\5\34\17\2lm\7\5\2\2m\5\3\2\2\2no\7\6\2" +
-      "\2o\7\3\2\2\2pq\5\30\r\2q\t\3\2\2\2rs\7\7\2\2st\5,\27\2t\13\3\2\2\2uv" +
-      "\7\b\2\2vw\7\t\2\2w|\5\16\b\2xy\7\n\2\2y{\5\16\b\2zx\3\2\2\2{~\3\2\2\2" +
-      "|z\3\2\2\2|}\3\2\2\2}\r\3\2\2\2~|\3\2\2\2\177\u0081\7=\2\2\u0080\u0082" +
-      "\5\22\n\2\u0081\u0080\3\2\2\2\u0081\u0082\3\2\2\2\u0082\u0084\3\2\2\2" +
-      "\u0083\u0085\5\20\t\2\u0084\u0083\3\2\2\2\u0084\u0085\3\2\2\2\u0085\17" +
-      "\3\2\2\2\u0086\u0087\7\13\2\2\u0087\u008b\7\f\2\2\u0088\u0089\7\13\2\2" +
-      "\u0089\u008b\7\r\2\2\u008a\u0086\3\2\2\2\u008a\u0088\3\2\2\2\u008b\21" +
-      "\3\2\2\2\u008c\u008d\t\2\2\2\u008d\23\3\2\2\2\u008e\u008f\7\20\2\2\u008f" +
-      "\u0091\7?\2\2\u0090\u0092\5\26\f\2\u0091\u0090\3\2\2\2\u0091\u0092\3\2" +
-      "\2\2\u0092\25\3\2\2\2\u0093\u0094\7\21\2\2\u0094\u0095\7?\2\2\u0095\27" +
-      "\3\2\2\2\u0096\u0098\7\22\2\2\u0097\u0099\5$\23\2\u0098\u0097\3\2\2\2" +
-      "\u0098\u0099\3\2\2\2\u0099\u009a\3\2\2\2\u009a\u009c\7=\2\2\u009b\u009d" +
-      "\5\32\16\2\u009c\u009b\3\2\2\2\u009c\u009d\3\2\2\2\u009d\31\3\2\2\2\u009e" +
-      "\u009f\7\4\2\2\u009f\u00a0\5\34\17\2\u00a0\u00a1\7\5\2\2\u00a1\33\3\2" +
-      "\2\2\u00a2\u00a7\5\36\20\2\u00a3\u00a4\7\n\2\2\u00a4\u00a6\5\36\20\2\u00a5" +
-      "\u00a3\3\2\2\2\u00a6\u00a9\3\2\2\2\u00a7\u00a5\3\2\2\2\u00a7\u00a8\3\2" +
-      "\2\2\u00a8\35\3\2\2\2\u00a9\u00a7\3\2\2\2\u00aa\u00ae\7=\2\2\u00ab\u00ae" +
-      "\5 \21\2\u00ac\u00ae\5\"\22\2\u00ad\u00aa\3\2\2\2\u00ad\u00ab\3\2\2\2" +
-      "\u00ad\u00ac\3\2\2\2\u00ae\37\3\2\2\2\u00af\u00b0\7\23\2\2\u00b0\u00b1" +
-      "\5&\24\2\u00b1!\3\2\2\2\u00b2\u00b3\7\23\2\2\u00b3\u00b4\5(\25\2\u00b4" +
-      "#\3\2\2\2\u00b5\u00b8\5&\24\2\u00b6\u00b8\5(\25\2\u00b7\u00b5\3\2\2\2" +
-      "\u00b7\u00b6\3\2\2\2\u00b8%\3\2\2\2\u00b9\u00bb\7\24\2\2\u00ba\u00bc\5" +
-      "*\26\2\u00bb\u00ba\3\2\2\2\u00bb\u00bc\3\2\2\2\u00bc\'\3\2\2\2\u00bd\u00bf" +
-      "\7\25\2\2\u00be\u00c0\5*\26\2\u00bf\u00be\3\2\2\2\u00bf\u00c0\3\2\2\2" +
-      "\u00c0)\3\2\2\2\u00c1\u00c2\7\4\2\2\u00c2\u00c3\7?\2\2\u00c3\u00c4\7\5" +
-      "\2\2\u00c4+\3\2\2\2\u00c5\u00ca\5.\30\2\u00c6\u00c7\7\26\2\2\u00c7\u00c9" +
-      "\5.\30\2\u00c8\u00c6\3\2\2\2\u00c9\u00cc\3\2\2\2\u00ca\u00c8\3\2\2\2\u00ca" +
-      "\u00cb\3\2\2\2\u00cb-\3\2\2\2\u00cc\u00ca\3\2\2\2\u00cd\u00d2\5\60\31" +
-      "\2\u00ce\u00cf\7\27\2\2\u00cf\u00d1\5\60\31\2\u00d0\u00ce\3\2\2\2\u00d1" +
-      "\u00d4\3\2\2\2\u00d2\u00d0\3\2\2\2\u00d2\u00d3\3\2\2\2\u00d3/\3\2\2\2" +
-      "\u00d4\u00d2\3\2\2\2\u00d5\u00d7\7\30\2\2\u00d6\u00d5\3\2\2\2\u00d6\u00d7" +
-      "\3\2\2\2\u00d7\u00d8\3\2\2\2\u00d8\u00d9\5\62\32\2\u00d9\61\3\2\2\2\u00da" +
-      "\u00e0\5\64\33\2\u00db\u00dc\7\4\2\2\u00dc\u00dd\5,\27\2\u00dd\u00de\7" +
-      "\5\2\2\u00de\u00e0\3\2\2\2\u00df\u00da\3\2\2\2\u00df\u00db\3\2\2\2\u00e0" +
-      "\63\3\2\2\2\u00e1\u00ef\5J&\2\u00e2\u00ef\5F$\2\u00e3\u00ef\5:\36\2\u00e4" +
-      "\u00ef\5<\37\2\u00e5\u00ef\5\66\34\2\u00e6\u00ef\5> \2\u00e7\u00ef\5@" +
-      "!\2\u00e8\u00ef\5B\"\2\u00e9\u00ef\5D#\2\u00ea\u00eb\7\4\2\2\u00eb\u00ec" +
-      "\5\64\33\2\u00ec\u00ed\7\5\2\2\u00ed\u00ef\3\2\2\2\u00ee\u00e1\3\2\2\2" +
-      "\u00ee\u00e2\3\2\2\2\u00ee\u00e3\3\2\2\2\u00ee\u00e4\3\2\2\2\u00ee\u00e5" +
-      "\3\2\2\2\u00ee\u00e6\3\2\2\2\u00ee\u00e7\3\2\2\2\u00ee\u00e8\3\2\2\2\u00ee" +
-      "\u00e9\3\2\2\2\u00ee\u00ea\3\2\2\2\u00ef\65\3\2\2\2\u00f0\u00f1\7=\2\2" +
-      "\u00f1\u00f2\7\31\2\2\u00f2\u00f3\58\35\2\u00f3\67\3\2\2\2\u00f4\u0101" +
-      "\7<\2\2\u00f5\u00f6\7\4\2\2\u00f6\u00fb\5N(\2\u00f7\u00f8\7\n\2\2\u00f8" +
-      "\u00fa\5N(\2\u00f9\u00f7\3\2\2\2\u00fa\u00fd\3\2\2\2\u00fb\u00f9\3\2\2" +
-      "\2\u00fb\u00fc\3\2\2\2\u00fc\u00fe\3\2\2\2\u00fd\u00fb\3\2\2\2\u00fe\u00ff" +
-      "\7\5\2\2\u00ff\u0101\3\2\2\2\u0100\u00f4\3\2\2\2\u0100\u00f5\3\2\2\2\u0101" +
-      "9\3\2\2\2\u0102\u0103\7=\2\2\u0103\u0104\7\32\2\2\u0104\u0105\5N(\2\u0105" +
-      "\u0106\7\27\2\2\u0106\u0107\5N(\2\u0107;\3\2\2\2\u0108\u0109\5N(\2\u0109" +
-      "\u010a\7\32\2\2\u010a\u010b\7=\2\2\u010b\u010c\7\27\2\2\u010c\u010d\7" +
-      "=\2\2\u010d=\3\2\2\2\u010e\u010f\7=\2\2\u010f\u0110\7\33\2\2\u0110\u0114" +
-      "\7\34\2\2\u0111\u0112\7=\2\2\u0112\u0114\7\35\2\2\u0113\u010e\3\2\2\2" +
-      "\u0113\u0111\3\2\2\2\u0114?\3\2\2\2\u0115\u0116\7=\2\2\u0116\u0117\7\33" +
-      "\2\2\u0117\u0118\7\30\2\2\u0118\u011e\7\34\2\2\u0119\u011a\7=\2\2\u011a" +
-      "\u011e\7\36\2\2\u011b\u011c\7=\2\2\u011c\u011e\7\37\2\2\u011d\u0115\3" +
-      "\2\2\2\u011d\u0119\3\2\2\2\u011d\u011b\3\2\2\2\u011eA\3\2\2\2\u011f\u0120" +
-      "\7=\2\2\u0120\u0121\7\33\2\2\u0121\u0125\7 \2\2\u0122\u0123\7=\2\2\u0123" +
-      "\u0125\7!\2\2\u0124\u011f\3\2\2\2\u0124\u0122\3\2\2\2\u0125C\3\2\2\2\u0126" +
-      "\u0127\7=\2\2\u0127\u0128\7\33\2\2\u0128\u0129\7\30\2\2\u0129\u012f\7" +
-      " \2\2\u012a\u012b\7=\2\2\u012b\u012f\7\"\2\2\u012c\u012d\7=\2\2\u012d" +
-      "\u012f\7#\2\2\u012e\u0126\3\2\2\2\u012e\u012a\3\2\2\2\u012e\u012c\3\2" +
-      "\2\2\u012fE\3\2\2\2\u0130\u0131\7=\2\2\u0131\u0132\5H%\2\u0132\u0133\5" +
-      "N(\2\u0133G\3\2\2\2\u0134\u0135\t\3\2\2\u0135I\3\2\2\2\u0136\u0137\7=" +
-      "\2\2\u0137\u0138\5L\'\2\u0138\u0139\5N(\2\u0139\u013f\3\2\2\2\u013a\u013b" +
-      "\5N(\2\u013b\u013c\5L\'\2\u013c\u013d\7=\2\2\u013d\u013f\3\2\2\2\u013e" +
-      "\u0136\3\2\2\2\u013e\u013a\3\2\2\2\u013fK\3\2\2\2\u0140\u0141\t\4\2\2" +
-      "\u0141M\3\2\2\2\u0142\u0145\5P)\2\u0143\u0145\7<\2\2\u0144\u0142\3\2\2" +
-      "\2\u0144\u0143\3\2\2\2\u0145O\3\2\2\2\u0146\u0147\t\5\2\2\u0147Q\3\2\2" +
-      "\2!SX\\_bh|\u0081\u0084\u008a\u0091\u0098\u009c\u00a7\u00ad\u00b7\u00bb" +
-      "\u00bf\u00ca\u00d2\u00d6\u00df\u00ee\u00fb\u0100\u0113\u011d\u0124\u012e" +
-      "\u013e\u0144";
-  public static final ATN _ATN =
-    new ATNDeserializer().deserialize(_serializedATN.toCharArray());
-
+  public static final String _serializedATN = "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3E\u0149\4\2\t\2\4"
+      + "\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t"
+      + "\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"
+      + "\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"
+      + "\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\4\36\t\36\4\37\t\37\4 \t \4!"
+      + "\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\3\2\5\2T\n\2\3"
+      + "\2\7\2W\n\2\f\2\16\2Z\13\2\3\2\5\2]\n\2\3\2\5\2`\n\2\3\2\5\2c\n\2\3\2"
+      + "\3\2\3\3\3\3\5\3i\n\3\3\3\3\3\3\3\3\3\3\4\3\4\3\5\3\5\3\6\3\6\3\6\3\7"
+      + "\3\7\3\7\3\7\3\7\7\7{\n\7\f\7\16\7~\13\7\3\b\3\b\5\b\u0082\n\b\3\b\5\b"
+      + "\u0085\n\b\3\t\3\t\3\t\3\t\5\t\u008b\n\t\3\n\3\n\3\13\3\13\3\13\5\13\u0092"
+      + "\n\13\3\f\3\f\3\f\3\r\3\r\5\r\u0099\n\r\3\r\3\r\5\r\u009d\n\r\3\16\3\16"
+      + "\3\16\3\16\3\17\3\17\3\17\7\17\u00a6\n\17\f\17\16\17\u00a9\13\17\3\20"
+      + "\3\20\3\20\5\20\u00ae\n\20\3\21\3\21\3\21\3\22\3\22\3\22\3\23\3\23\5\23"
+      + "\u00b8\n\23\3\24\3\24\5\24\u00bc\n\24\3\25\3\25\5\25\u00c0\n\25\3\26\3"
+      + "\26\3\26\3\26\3\27\3\27\3\27\7\27\u00c9\n\27\f\27\16\27\u00cc\13\27\3"
+      + "\30\3\30\3\30\7\30\u00d1\n\30\f\30\16\30\u00d4\13\30\3\31\5\31\u00d7\n"
+      + "\31\3\31\3\31\3\32\3\32\3\32\3\32\3\32\5\32\u00e0\n\32\3\33\3\33\3\33"
+      + "\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\5\33\u00ef\n\33\3\34"
+      + "\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\35\7\35\u00fa\n\35\f\35\16\35\u00fd"
+      + "\13\35\3\35\3\35\5\35\u0101\n\35\3\36\3\36\3\36\3\36\3\36\3\36\3\37\3"
+      + "\37\3\37\3\37\3\37\3\37\3 \3 \3 \3 \3 \5 \u0114\n \3!\3!\3!\3!\3!\3!\3"
+      + "!\3!\5!\u011e\n!\3\"\3\"\3\"\3\"\3\"\5\"\u0125\n\"\3#\3#\3#\3#\3#\3#\3"
+      + "#\3#\5#\u012f\n#\3$\3$\3$\3$\3%\3%\3&\3&\3&\3&\3&\3&\3&\3&\5&\u013f\n"
+      + "&\3\'\3\'\3(\3(\5(\u0145\n(\3)\3)\3)\2\2*\2\4\6\b\n\f\16\20\22\24\26\30"
+      + "\32\34\36 \"$&(*,.\60\62\64\668:<>@BDFHJLNP\2\6\3\2\16\17\3\2$+\3\2,<"
+      + "\4\2?@DD\2\u014a\2S\3\2\2\2\4f\3\2\2\2\6n\3\2\2\2\bp\3\2\2\2\nr\3\2\2"
+      + "\2\fu\3\2\2\2\16\177\3\2\2\2\20\u008a\3\2\2\2\22\u008c\3\2\2\2\24\u008e"
+      + "\3\2\2\2\26\u0093\3\2\2\2\30\u0096\3\2\2\2\32\u009e\3\2\2\2\34\u00a2\3"
+      + "\2\2\2\36\u00ad\3\2\2\2 \u00af\3\2\2\2\"\u00b2\3\2\2\2$\u00b7\3\2\2\2"
+      + "&\u00b9\3\2\2\2(\u00bd\3\2\2\2*\u00c1\3\2\2\2,\u00c5\3\2\2\2.\u00cd\3"
+      + "\2\2\2\60\u00d6\3\2\2\2\62\u00df\3\2\2\2\64\u00ee\3\2\2\2\66\u00f0\3\2"
+      + "\2\28\u0100\3\2\2\2:\u0102\3\2\2\2<\u0108\3\2\2\2>\u0113\3\2\2\2@\u011d"
+      + "\3\2\2\2B\u0124\3\2\2\2D\u012e\3\2\2\2F\u0130\3\2\2\2H\u0134\3\2\2\2J"
+      + "\u013e\3\2\2\2L\u0140\3\2\2\2N\u0144\3\2\2\2P\u0146\3\2\2\2RT\5\4\3\2"
+      + "SR\3\2\2\2ST\3\2\2\2TX\3\2\2\2UW\5\b\5\2VU\3\2\2\2WZ\3\2\2\2XV\3\2\2\2"
+      + "XY\3\2\2\2Y\\\3\2\2\2ZX\3\2\2\2[]\5\n\6\2\\[\3\2\2\2\\]\3\2\2\2]_\3\2"
+      + "\2\2^`\5\f\7\2_^\3\2\2\2_`\3\2\2\2`b\3\2\2\2ac\5\24\13\2ba\3\2\2\2bc\3"
+      + "\2\2\2cd\3\2\2\2de\7\2\2\3e\3\3\2\2\2fh\7\3\2\2gi\5\6\4\2hg\3\2\2\2hi"
+      + "\3\2\2\2ij\3\2\2\2jk\7\4\2\2kl\5\34\17\2lm\7\5\2\2m\5\3\2\2\2no\7\6\2"
+      + "\2o\7\3\2\2\2pq\5\30\r\2q\t\3\2\2\2rs\7\7\2\2st\5,\27\2t\13\3\2\2\2uv"
+      + "\7\b\2\2vw\7\t\2\2w|\5\16\b\2xy\7\n\2\2y{\5\16\b\2zx\3\2\2\2{~\3\2\2\2"
+      + "|z\3\2\2\2|}\3\2\2\2}\r\3\2\2\2~|\3\2\2\2\177\u0081\7>\2\2\u0080\u0082"
+      + "\5\22\n\2\u0081\u0080\3\2\2\2\u0081\u0082\3\2\2\2\u0082\u0084\3\2\2\2"
+      + "\u0083\u0085\5\20\t\2\u0084\u0083\3\2\2\2\u0084\u0085\3\2\2\2\u0085\17"
+      + "\3\2\2\2\u0086\u0087\7\13\2\2\u0087\u008b\7\f\2\2\u0088\u0089\7\13\2\2"
+      + "\u0089\u008b\7\r\2\2\u008a\u0086\3\2\2\2\u008a\u0088\3\2\2\2\u008b\21"
+      + "\3\2\2\2\u008c\u008d\t\2\2\2\u008d\23\3\2\2\2\u008e\u008f\7\20\2\2\u008f"
+      + "\u0091\7@\2\2\u0090\u0092\5\26\f\2\u0091\u0090\3\2\2\2\u0091\u0092\3\2"
+      + "\2\2\u0092\25\3\2\2\2\u0093\u0094\7\21\2\2\u0094\u0095\7@\2\2\u0095\27"
+      + "\3\2\2\2\u0096\u0098\7\22\2\2\u0097\u0099\5$\23\2\u0098\u0097\3\2\2\2"
+      + "\u0098\u0099\3\2\2\2\u0099\u009a\3\2\2\2\u009a\u009c\7>\2\2\u009b\u009d"
+      + "\5\32\16\2\u009c\u009b\3\2\2\2\u009c\u009d\3\2\2\2\u009d\31\3\2\2\2\u009e"
+      + "\u009f\7\4\2\2\u009f\u00a0\5\34\17\2\u00a0\u00a1\7\5\2\2\u00a1\33\3\2"
+      + "\2\2\u00a2\u00a7\5\36\20\2\u00a3\u00a4\7\n\2\2\u00a4\u00a6\5\36\20\2\u00a5"
+      + "\u00a3\3\2\2\2\u00a6\u00a9\3\2\2\2\u00a7\u00a5\3\2\2\2\u00a7\u00a8\3\2"
+      + "\2\2\u00a8\35\3\2\2\2\u00a9\u00a7\3\2\2\2\u00aa\u00ae\7>\2\2\u00ab\u00ae"
+      + "\5 \21\2\u00ac\u00ae\5\"\22\2\u00ad\u00aa\3\2\2\2\u00ad\u00ab\3\2\2\2"
+      + "\u00ad\u00ac\3\2\2\2\u00ae\37\3\2\2\2\u00af\u00b0\7\23\2\2\u00b0\u00b1"
+      + "\5&\24\2\u00b1!\3\2\2\2\u00b2\u00b3\7\23\2\2\u00b3\u00b4\5(\25\2\u00b4"
+      + "#\3\2\2\2\u00b5\u00b8\5&\24\2\u00b6\u00b8\5(\25\2\u00b7\u00b5\3\2\2\2"
+      + "\u00b7\u00b6\3\2\2\2\u00b8%\3\2\2\2\u00b9\u00bb\7\24\2\2\u00ba\u00bc\5"
+      + "*\26\2\u00bb\u00ba\3\2\2\2\u00bb\u00bc\3\2\2\2\u00bc\'\3\2\2\2\u00bd\u00bf"
+      + "\7\25\2\2\u00be\u00c0\5*\26\2\u00bf\u00be\3\2\2\2\u00bf\u00c0\3\2\2\2"
+      + "\u00c0)\3\2\2\2\u00c1\u00c2\7\4\2\2\u00c2\u00c3\7@\2\2\u00c3\u00c4\7\5"
+      + "\2\2\u00c4+\3\2\2\2\u00c5\u00ca\5.\30\2\u00c6\u00c7\7\26\2\2\u00c7\u00c9"
+      + "\5.\30\2\u00c8\u00c6\3\2\2\2\u00c9\u00cc\3\2\2\2\u00ca\u00c8\3\2\2\2\u00ca"
+      + "\u00cb\3\2\2\2\u00cb-\3\2\2\2\u00cc\u00ca\3\2\2\2\u00cd\u00d2\5\60\31"
+      + "\2\u00ce\u00cf\7\27\2\2\u00cf\u00d1\5\60\31\2\u00d0\u00ce\3\2\2\2\u00d1"
+      + "\u00d4\3\2\2\2\u00d2\u00d0\3\2\2\2\u00d2\u00d3\3\2\2\2\u00d3/\3\2\2\2"
+      + "\u00d4\u00d2\3\2\2\2\u00d5\u00d7\7\30\2\2\u00d6\u00d5\3\2\2\2\u00d6\u00d7"
+      + "\3\2\2\2\u00d7\u00d8\3\2\2\2\u00d8\u00d9\5\62\32\2\u00d9\61\3\2\2\2\u00da"
+      + "\u00e0\5\64\33\2\u00db\u00dc\7\4\2\2\u00dc\u00dd\5,\27\2\u00dd\u00de\7"
+      + "\5\2\2\u00de\u00e0\3\2\2\2\u00df\u00da\3\2\2\2\u00df\u00db\3\2\2\2\u00e0"
+      + "\63\3\2\2\2\u00e1\u00ef\5J&\2\u00e2\u00ef\5F$\2\u00e3\u00ef\5:\36\2\u00e4"
+      + "\u00ef\5<\37\2\u00e5\u00ef\5\66\34\2\u00e6\u00ef\5> \2\u00e7\u00ef\5@"
+      + "!\2\u00e8\u00ef\5B\"\2\u00e9\u00ef\5D#\2\u00ea\u00eb\7\4\2\2\u00eb\u00ec"
+      + "\5\64\33\2\u00ec\u00ed\7\5\2\2\u00ed\u00ef\3\2\2\2\u00ee\u00e1\3\2\2\2"
+      + "\u00ee\u00e2\3\2\2\2\u00ee\u00e3\3\2\2\2\u00ee\u00e4\3\2\2\2\u00ee\u00e5"
+      + "\3\2\2\2\u00ee\u00e6\3\2\2\2\u00ee\u00e7\3\2\2\2\u00ee\u00e8\3\2\2\2\u00ee"
+      + "\u00e9\3\2\2\2\u00ee\u00ea\3\2\2\2\u00ef\65\3\2\2\2\u00f0\u00f1\7>\2\2"
+      + "\u00f1\u00f2\7\31\2\2\u00f2\u00f3\58\35\2\u00f3\67\3\2\2\2\u00f4\u0101"
+      + "\7=\2\2\u00f5\u00f6\7\4\2\2\u00f6\u00fb\5N(\2\u00f7\u00f8\7\n\2\2\u00f8"
+      + "\u00fa\5N(\2\u00f9\u00f7\3\2\2\2\u00fa\u00fd\3\2\2\2\u00fb\u00f9\3\2\2"
+      + "\2\u00fb\u00fc\3\2\2\2\u00fc\u00fe\3\2\2\2\u00fd\u00fb\3\2\2\2\u00fe\u00ff"
+      + "\7\5\2\2\u00ff\u0101\3\2\2\2\u0100\u00f4\3\2\2\2\u0100\u00f5\3\2\2\2\u0101"
+      + "9\3\2\2\2\u0102\u0103\7>\2\2\u0103\u0104\7\32\2\2\u0104\u0105\5N(\2\u0105"
+      + "\u0106\7\27\2\2\u0106\u0107\5N(\2\u0107;\3\2\2\2\u0108\u0109\5N(\2\u0109"
+      + "\u010a\7\32\2\2\u010a\u010b\7>\2\2\u010b\u010c\7\27\2\2\u010c\u010d\7"
+      + ">\2\2\u010d=\3\2\2\2\u010e\u010f\7>\2\2\u010f\u0110\7\33\2\2\u0110\u0114"
+      + "\7\34\2\2\u0111\u0112\7>\2\2\u0112\u0114\7\35\2\2\u0113\u010e\3\2\2\2"
+      + "\u0113\u0111\3\2\2\2\u0114?\3\2\2\2\u0115\u0116\7>\2\2\u0116\u0117\7\33"
+      + "\2\2\u0117\u0118\7\30\2\2\u0118\u011e\7\34\2\2\u0119\u011a\7>\2\2\u011a"
+      + "\u011e\7\36\2\2\u011b\u011c\7>\2\2\u011c\u011e\7\37\2\2\u011d\u0115\3"
+      + "\2\2\2\u011d\u0119\3\2\2\2\u011d\u011b\3\2\2\2\u011eA\3\2\2\2\u011f\u0120"
+      + "\7>\2\2\u0120\u0121\7\33\2\2\u0121\u0125\7 \2\2\u0122\u0123\7>\2\2\u0123"
+      + "\u0125\7!\2\2\u0124\u011f\3\2\2\2\u0124\u0122\3\2\2\2\u0125C\3\2\2\2\u0126"
+      + "\u0127\7>\2\2\u0127\u0128\7\33\2\2\u0128\u0129\7\30\2\2\u0129\u012f\7"
+      + " \2\2\u012a\u012b\7>\2\2\u012b\u012f\7\"\2\2\u012c\u012d\7>\2\2\u012d"
+      + "\u012f\7#\2\2\u012e\u0126\3\2\2\2\u012e\u012a\3\2\2\2\u012e\u012c\3\2"
+      + "\2\2\u012fE\3\2\2\2\u0130\u0131\7>\2\2\u0131\u0132\5H%\2\u0132\u0133\5"
+      + "N(\2\u0133G\3\2\2\2\u0134\u0135\t\3\2\2\u0135I\3\2\2\2\u0136\u0137\7>"
+      + "\2\2\u0137\u0138\5L\'\2\u0138\u0139\5N(\2\u0139\u013f\3\2\2\2\u013a\u013b"
+      + "\5N(\2\u013b\u013c\5L\'\2\u013c\u013d\7>\2\2\u013d\u013f\3\2\2\2\u013e"
+      + "\u0136\3\2\2\2\u013e\u013a\3\2\2\2\u013fK\3\2\2\2\u0140\u0141\t\4\2\2"
+      + "\u0141M\3\2\2\2\u0142\u0145\5P)\2\u0143\u0145\7=\2\2\u0144\u0142\3\2\2"
+      + "\2\u0144\u0143\3\2\2\2\u0145O\3\2\2\2\u0146\u0147\t\5\2\2\u0147Q\3\2\2"
+      + "\2!SX\\_bh|\u0081\u0084\u008a\u0091\u0098\u009c\u00a7\u00ad\u00b7\u00bb"
+      + "\u00bf\u00ca\u00d2\u00d6\u00df\u00ee\u00fb\u0100\u0113\u011d\u0124\u012e" + "\u013e\u0144";
+  public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray());
   static {
     _decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
     for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {
       _decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java
index 3e9e0ca45..4e1423cda 100644
--- a/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java
+++ b/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java
@@ -8,7 +8,7 @@ import static org.assertj.core.api.StrictAssertions.assertThat;
 public class CaseInsensitiveEqualExpressionTest extends BaseExpressionTest {
 
   CaseInsensitiveEqualExpression exp(String propName, String value) {
-    return new CaseInsensitiveEqualExpression(propName, value);
+    return new CaseInsensitiveEqualExpression(propName, value, false);
   }
 
   @Test
diff --git a/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java b/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java
index 9244d229e..a7ad85e6b 100644
--- a/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java
+++ b/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java
@@ -1,6 +1,8 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.Expression;
+import io.ebeaninternal.api.SpiExpression;
+
 import org.junit.Test;
 
 import static org.assertj.core.api.StrictAssertions.assertThat;
@@ -8,6 +10,12 @@ import static org.assertj.core.api.StrictAssertions.assertThat;
 
 public class DefaultExpressionFactoryTest {
 
+  private String toQueryPlanHash(Expression expression) {
+    StringBuilder sb = new StringBuilder();
+    ((SpiExpression)expression).queryPlanHash(sb);
+    return sb.toString();
+
+  }
   @Test
   public void testLowerILike() throws Exception {
 
@@ -30,6 +38,7 @@ public class DefaultExpressionFactoryTest {
     DefaultExpressionFactory factory = new DefaultExpressionFactory(false, false);
     Expression expression = factory.eq("name", null);
     assertThat(expression).isInstanceOf(NullExpression.class);
+    assertThat(toQueryPlanHash(expression)).isEqualTo("Null[name]");
   }
 
   @Test
@@ -38,14 +47,24 @@ public class DefaultExpressionFactoryTest {
     DefaultExpressionFactory factory = new DefaultExpressionFactory(false, false);
     Expression expression = factory.ne("name", null);
     assertThat(expression).isInstanceOf(NullExpression.class);
+    assertThat(toQueryPlanHash(expression)).isEqualTo("NotNull[name]");
   }
-
   @Test
   public void testIeq() throws Exception {
 
     DefaultExpressionFactory factory = new DefaultExpressionFactory(false, false);
     Expression expression = factory.ieq("name", null);
     assertThat(expression).isInstanceOf(NullExpression.class);
+    assertThat(toQueryPlanHash(expression)).isEqualTo("Null[name]");
+  }
+
+  @Test
+  public void testIne() throws Exception {
+
+    DefaultExpressionFactory factory = new DefaultExpressionFactory(false, false);
+    Expression expression = factory.ine("name", null);
+    assertThat(expression).isInstanceOf(NullExpression.class);
+    assertThat(toQueryPlanHash(expression)).isEqualTo("NotNull[name]");
   }
 
   @Test
diff --git a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
index 2ccb97ce5..29ad43ae4 100644
--- a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
@@ -83,6 +83,15 @@ public class EqlParserTest extends BaseTestCase {
     assertThat(query.getGeneratedSql()).contains("where lower(t0.name) =?");
   }
 
+  @Test
+  public void where_ine() {
+
+    Query<Customer> query = parse("where name ine 'Rob'");
+    query.findList();
+
+    assertThat(query.getGeneratedSql()).contains("where lower(t0.name) !=?");
+  }
+
   @Test
   public void where_ieq_reverse() {
 
@@ -91,6 +100,15 @@ public class EqlParserTest extends BaseTestCase {
     assertThat(query.getGeneratedSql()).contains("where lower(t0.name) =?");
   }
 
+  @Test
+  public void where_ine_reverse() {
+
+    Query<Customer> query = parse("where 'Rob' ine name");
+    query.findList();
+
+    assertThat(query.getGeneratedSql()).contains("where lower(t0.name) !=?");
+  }
+
   @Test
   public void where_eq2() {
 
diff --git a/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java b/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java
new file mode 100644
index 000000000..8ddf3f181
--- /dev/null
+++ b/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java
@@ -0,0 +1,116 @@
+package org.tests.query;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestQueryFilterCaseInsensitive extends BaseTestCase {
+
+  @BeforeClass
+  public static void setup() {
+    ResetBasicData.reset();
+  }
+
+  @Test
+  public void testEq() {
+
+    // Note: this test uses only customer#1..#4
+
+    List<Customer> customers = Ebean.find(Customer.class).where()
+        .eq("name", "ROB") // case match
+        .le("id", 4).findList();
+
+    assertThat(customers).isEmpty();
+
+    customers = Ebean.find(Customer.class).where()
+        .ieq("name", "ROB") // case insensitive match
+        .le("id", 4).findList();
+
+    assertThat(customers).hasSize(1);
+  }
+
+  @Test
+  public void testNe() {
+    List<Customer> customers = Ebean.find(Customer.class).where()
+        .ne("name", "ROB") // case match
+        .le("id", 4).findList();
+
+    assertThat(customers).hasSize(4);
+
+    customers = Ebean.find(Customer.class).where()
+        .ine("name", "ROB") // case insensitive match
+        .le("id", 4).findList();
+
+    assertThat(customers).hasSize(3);
+
+  }
+
+  @Test
+  public void testLike() {
+    List<Customer> customers = Ebean.find(Customer.class).where()
+        .like("name", "%O%") // case match
+        .le("id", 4).findList();
+
+    assertThat(customers).isEmpty();
+
+    customers = Ebean.find(Customer.class).where()
+        .ilike("name", "%O%") // case insensitive match
+        .le("id", 4).findList();
+
+    assertThat(customers).hasSize(4); // Rob / Fiona / Cust No address / NocCust
+  }
+
+  @Test
+  public void testContains() {
+    List<Customer> customers = Ebean.find(Customer.class).where()
+        .contains("name", "O") // case match
+        .le("id", 4).findList();
+
+    assertThat(customers).isEmpty();
+
+    customers = Ebean.find(Customer.class).where()
+        .icontains("name", "O") // case insensitive match
+        .le("id", 4).findList();
+
+    assertThat(customers).hasSize(4); // Rob / Fiona / Cust No address / NocCust
+
+  }
+
+  @Test
+  public void testStartsWith() {
+    List<Customer> customers = Ebean.find(Customer.class).where()
+        .startsWith("name", "RO") // case match
+        .le("id", 4).findList();
+
+    assertThat(customers).isEmpty();
+
+    customers = Ebean.find(Customer.class).where()
+        .istartsWith("name", "RO") // case insensitive match
+        .le("id", 4).findList();
+
+    assertThat(customers).hasSize(1);
+  }
+
+  @Test
+  public void testEndsWith() {
+    List<Customer> customers = Ebean.find(Customer.class).where()
+        .endsWith("name", "OB") // case match
+        .le("id", 4).findList();
+
+    assertThat(customers).isEmpty();
+
+    customers = Ebean.find(Customer.class).where()
+        .iendsWith("name", "OB") // case insensitive match
+        .le("id", 4).findList();
+
+    assertThat(customers).hasSize(1);
+  }
+
+}
diff --git a/src/test/resources/EQL.g4 b/src/test/resources/EQL.g4
index 4e021172b..30aa67ae0 100644
--- a/src/test/resources/EQL.g4
+++ b/src/test/resources/EQL.g4
@@ -181,7 +181,8 @@ comparison_operator
    | '<'  | 'lt'
    | '<=' | 'le' | 'lte'
    | '<>' | '!=' | 'ne'
-   | 'ieq'
+   | 'ieq' 
+   | 'ine'
    ;
 
 value_expression

From 6bc72ae6bbb5ee0bcf4969122349a8049088d95d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 19 Nov 2018 22:25:01 +1300
Subject: [PATCH 0560/1036] No effective change - format only

---
 .../DefaultExpressionFactoryTest.java         | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java b/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java
index a7ad85e6b..2a81b11bd 100644
--- a/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java
+++ b/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java
@@ -2,7 +2,6 @@ package io.ebeaninternal.server.expression;
 
 import io.ebean.Expression;
 import io.ebeaninternal.api.SpiExpression;
-
 import org.junit.Test;
 
 import static org.assertj.core.api.StrictAssertions.assertThat;
@@ -12,12 +11,12 @@ public class DefaultExpressionFactoryTest {
 
   private String toQueryPlanHash(Expression expression) {
     StringBuilder sb = new StringBuilder();
-    ((SpiExpression)expression).queryPlanHash(sb);
+    ((SpiExpression) expression).queryPlanHash(sb);
     return sb.toString();
-
   }
+
   @Test
-  public void testLowerILike() throws Exception {
+  public void testLowerILike() {
 
     DefaultExpressionFactory factory = new DefaultExpressionFactory(false, false);
     Expression expression = factory.ilike("name", "foo");
@@ -25,7 +24,7 @@ public class DefaultExpressionFactoryTest {
   }
 
   @Test
-  public void testNativeILike() throws Exception {
+  public void testNativeILike() {
 
     DefaultExpressionFactory factory = new DefaultExpressionFactory(false, true);
     Expression expression = factory.ilike("name", "foo");
@@ -33,7 +32,7 @@ public class DefaultExpressionFactoryTest {
   }
 
   @Test
-  public void testEq() throws Exception {
+  public void testEq() {
 
     DefaultExpressionFactory factory = new DefaultExpressionFactory(false, false);
     Expression expression = factory.eq("name", null);
@@ -42,15 +41,16 @@ public class DefaultExpressionFactoryTest {
   }
 
   @Test
-  public void testNe() throws Exception {
+  public void testNe() {
 
     DefaultExpressionFactory factory = new DefaultExpressionFactory(false, false);
     Expression expression = factory.ne("name", null);
     assertThat(expression).isInstanceOf(NullExpression.class);
     assertThat(toQueryPlanHash(expression)).isEqualTo("NotNull[name]");
   }
+
   @Test
-  public void testIeq() throws Exception {
+  public void testIeq() {
 
     DefaultExpressionFactory factory = new DefaultExpressionFactory(false, false);
     Expression expression = factory.ieq("name", null);
@@ -59,7 +59,7 @@ public class DefaultExpressionFactoryTest {
   }
 
   @Test
-  public void testIne() throws Exception {
+  public void testIne() {
 
     DefaultExpressionFactory factory = new DefaultExpressionFactory(false, false);
     Expression expression = factory.ine("name", null);
@@ -68,7 +68,7 @@ public class DefaultExpressionFactoryTest {
   }
 
   @Test
-  public void testEq_with_equalsWithNullAsNoop() throws Exception {
+  public void testEq_with_equalsWithNullAsNoop() {
 
     DefaultExpressionFactory factory = new DefaultExpressionFactory(true, false);
     Expression expression = factory.eq("name", null);
@@ -76,7 +76,7 @@ public class DefaultExpressionFactoryTest {
   }
 
   @Test
-  public void testNe_with_equalsWithNullAsNoop() throws Exception {
+  public void testNe_with_equalsWithNullAsNoop() {
 
     DefaultExpressionFactory factory = new DefaultExpressionFactory(true, false);
     Expression expression = factory.ne("name", null);
@@ -84,7 +84,7 @@ public class DefaultExpressionFactoryTest {
   }
 
   @Test
-  public void testIeq_with_equalsWithNullAsNoop() throws Exception {
+  public void testIeq_with_equalsWithNullAsNoop() {
 
     DefaultExpressionFactory factory = new DefaultExpressionFactory(true, false);
     Expression expression = factory.ieq("name", null);

From 83776a1eae10849e16a0ca06398b0274e97679db Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 19 Nov 2018 23:36:15 +1300
Subject: [PATCH 0561/1036] #1552 - Remove deprecated methods on Transaction
 setBatch(PersistBatch) .. migrate to setBatchMode(boolean)

---
 src/main/java/io/ebean/Transaction.java       | 39 -------------------
 src/main/java/io/ebean/TxScope.java           |  7 ++++
 .../java/io/ebeaninternal/api/ScopeTrans.java | 15 ++++---
 .../api/SpiTransactionProxy.java              | 21 ----------
 .../ImplicitReadOnlyTransaction.java          | 20 ----------
 .../server/transaction/JdbcTransaction.java   | 21 ----------
 .../server/transaction/NoTransaction.java     | 21 ----------
 .../io/ebean/EbeanServer_saveAllTest.java     |  5 +--
 .../batchinsert/TestBatchInsertFlush.java     | 18 ++++-----
 .../batchinsert/TestBatchInsertSimple.java    | 12 +++---
 ...tBatchInsertWithInitialisedCollection.java |  5 +--
 .../TestBatchOnCascadeExceptionHandling.java  | 10 ++---
 .../TestDeleteWithoutOptimisticLocking.java   |  5 +--
 .../TestInsertBatchThenFlushThenUpdate.java   |  4 +-
 .../basic/xtra/TestInsertBatchThenUpdate.java |  6 +--
 ...TestInsertBatchWithDifferentRootTypes.java |  4 +-
 .../tests/softdelete/TestSoftDeleteTop.java   |  5 +--
 .../transaction/TestBatchPersistCascade.java  | 12 +++---
 18 files changed, 51 insertions(+), 179 deletions(-)

diff --git a/src/main/java/io/ebean/Transaction.java b/src/main/java/io/ebean/Transaction.java
index 961d1f5a8..1decc34f5 100644
--- a/src/main/java/io/ebean/Transaction.java
+++ b/src/main/java/io/ebean/Transaction.java
@@ -358,29 +358,6 @@ public interface Transaction extends AutoCloseable {
    */
   void setBatchMode(boolean useBatch);
 
-  /**
-   * Deprecated - migrate to {@link #setBatchMode(boolean)}.
-   * <p>
-   * Set the JDBC batch mode to use for this transaction.
-   * </p>
-   * <p>
-   * If this is NONE then JDBC batch can still be used for each request - save(), insert(), update() or delete()
-   * and this would be useful if the request cascades to detail beans.
-   * </p>
-   *
-   * @param persistBatchMode the batch mode to use for this transaction
-   * @see io.ebean.config.ServerConfig#setPersistBatch(PersistBatch)
-   */
-  @Deprecated
-  void setBatch(PersistBatch persistBatchMode);
-
-  /**
-   * Deprecated - migrate to {@link #isBatchMode()}.
-   * Return the batch mode at the transaction level.
-   */
-  @Deprecated
-  PersistBatch getBatch();
-
   /**
    * Return the batch mode at the transaction level.
    */
@@ -405,22 +382,6 @@ public interface Transaction extends AutoCloseable {
    */
   void setBatchOnCascade(boolean batchMode);
 
-  /**
-   * Set the batch mode when cascading.
-   * <p>
-   * Deprecated in favour of {@link #setBatchOnCascade(boolean)}
-   * </p>
-   */
-  @Deprecated
-  void setBatchOnCascade(PersistBatch batchOnCascadeMode);
-
-  /**
-   * Deprecated - migrate to {@link #isBatchMode()}.
-   * Return the batch mode at the request level (for each save(), insert(), update() or delete()).
-   */
-  @Deprecated
-  PersistBatch getBatchOnCascade();
-
   /**
    * Return the batch mode at the request level.
    */
diff --git a/src/main/java/io/ebean/TxScope.java b/src/main/java/io/ebean/TxScope.java
index b7b02d0c1..d150b533c 100644
--- a/src/main/java/io/ebean/TxScope.java
+++ b/src/main/java/io/ebean/TxScope.java
@@ -432,4 +432,11 @@ public final class TxScope {
     return this;
   }
 
+  public boolean isBatchMode() {
+    return PersistBatch.ALL.equals(batch);
+  }
+
+  public boolean isBatchOnCascade() {
+    return PersistBatch.ALL.equals(batchOnCascade);
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/api/ScopeTrans.java b/src/main/java/io/ebeaninternal/api/ScopeTrans.java
index 275f6c09a..0eb06f950 100644
--- a/src/main/java/io/ebeaninternal/api/ScopeTrans.java
+++ b/src/main/java/io/ebeaninternal/api/ScopeTrans.java
@@ -1,7 +1,6 @@
 package io.ebeaninternal.api;
 
 import io.ebean.TxScope;
-import io.ebean.annotation.PersistBatch;
 
 import java.util.ArrayList;
 
@@ -38,9 +37,9 @@ public class ScopeTrans {
    */
   private final ArrayList<Class<? extends Throwable>> rollbackFor;
 
-  private PersistBatch restoreBatch;
+  private Boolean restoreBatch;
 
-  private PersistBatch restoreBatchOnCascade;
+  private Boolean restoreBatchOnCascade;
 
   private int restoreBatchSize;
 
@@ -68,20 +67,20 @@ public class ScopeTrans {
 
     if (transaction != null) {
       if (!created && txScope.isBatchSet() || txScope.isBatchOnCascadeSet() || txScope.isBatchSizeSet()) {
-        restoreBatch = transaction.getBatch();
-        restoreBatchOnCascade = transaction.getBatchOnCascade();
+        restoreBatch = transaction.isBatchMode();
+        restoreBatchOnCascade = transaction.isBatchOnCascade();
         restoreBatchSize = transaction.getBatchSize();
         restoreBatchGeneratedKeys = transaction.getBatchGetGeneratedKeys();
         restoreBatchFlushOnQuery = transaction.isBatchFlushOnQuery();
       }
       if (txScope.isBatchSet()) {
-        transaction.setBatch(txScope.getBatch());
+        transaction.setBatchMode(txScope.isBatchMode());
       }
       if (!txScope.isFlushOnQuery()) {
         transaction.setBatchFlushOnQuery(false);
       }
       if (txScope.isBatchOnCascadeSet()) {
-        transaction.setBatchOnCascade(txScope.getBatchOnCascade());
+        transaction.setBatchOnCascade(txScope.isBatchOnCascade());
       }
       if (txScope.isBatchSizeSet()) {
         transaction.setBatchSize(txScope.getBatchSize());
@@ -139,7 +138,7 @@ public class ScopeTrans {
       nestedCommit = true;
       transaction.setBatchFlushOnQuery(restoreBatchFlushOnQuery);
       if (restoreBatch != null) {
-        transaction.setBatch(restoreBatch);
+        transaction.setBatchMode(restoreBatch);
       }
       if (restoreBatchOnCascade != null) {
         transaction.setBatchOnCascade(restoreBatchOnCascade);
diff --git a/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java b/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
index 1aab60ad7..bac97a83a 100644
--- a/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
+++ b/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
@@ -3,7 +3,6 @@ package io.ebeaninternal.api;
 import io.ebean.ProfileLocation;
 import io.ebean.TransactionCallback;
 import io.ebean.annotation.DocStoreMode;
-import io.ebean.annotation.PersistBatch;
 import io.ebean.bean.PersistenceContext;
 import io.ebean.event.changelog.BeanChange;
 import io.ebean.event.changelog.ChangeSet;
@@ -254,36 +253,16 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
     return transaction.isBatchMode();
   }
 
-  @Override
-  public void setBatch(PersistBatch persistBatchMode) {
-    transaction.setBatch(persistBatchMode);
-  }
-
-  @Override
-  public PersistBatch getBatch() {
-    return transaction.getBatch();
-  }
-
   @Override
   public void setBatchOnCascade(boolean batchMode) {
     transaction.setBatchOnCascade(batchMode);
   }
 
-  @Override
-  public void setBatchOnCascade(PersistBatch batchOnCascadeMode) {
-    transaction.setBatchOnCascade(batchOnCascadeMode);
-  }
-
   @Override
   public boolean isBatchOnCascade() {
     return transaction.isBatchOnCascade();
   }
 
-  @Override
-  public PersistBatch getBatchOnCascade() {
-    return transaction.getBatchOnCascade();
-  }
-
   @Override
   public void setBatchSize(int batchSize) {
     transaction.setBatchSize(batchSize);
diff --git a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
index 619574cd4..5241aa90e 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
@@ -3,7 +3,6 @@ package io.ebeaninternal.server.transaction;
 import io.ebean.ProfileLocation;
 import io.ebean.TransactionCallback;
 import io.ebean.annotation.DocStoreMode;
-import io.ebean.annotation.PersistBatch;
 import io.ebean.bean.PersistenceContext;
 import io.ebean.event.changelog.BeanChange;
 import io.ebean.event.changelog.ChangeSet;
@@ -291,11 +290,6 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
 
   }
 
-  @Override
-  public void setBatch(PersistBatch batchMode) {
-
-  }
-
   @Override
   public boolean isBatchMode() {
     return false;
@@ -306,24 +300,10 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
     return false;
   }
 
-  @Override
-  public PersistBatch getBatch() {
-    return null;
-  }
-
   @Override
   public void setBatchOnCascade(boolean batchMode) {
   }
 
-  @Override
-  public void setBatchOnCascade(PersistBatch batchOnCascadeMode) {
-  }
-
-  @Override
-  public PersistBatch getBatchOnCascade() {
-    return null;
-  }
-
   @Override
   public Boolean getBatchGetGeneratedKeys() {
     return null;
diff --git a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index 2f469f3e9..e38fb375b 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -3,7 +3,6 @@ package io.ebeaninternal.server.transaction;
 import io.ebean.ProfileLocation;
 import io.ebean.TransactionCallback;
 import io.ebean.annotation.DocStoreMode;
-import io.ebean.annotation.PersistBatch;
 import io.ebean.bean.PersistenceContext;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform.OnQueryOnly;
@@ -575,21 +574,11 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
     this.batchMode = batchMode;
   }
 
-  @Override
-  public void setBatch(PersistBatch batchMode) {
-    setBatchMode(PersistBatch.ALL == batchMode);
-  }
-
   @Override
   public boolean isBatchMode() {
     return batchMode;
   }
 
-  @Override
-  public PersistBatch getBatch() {
-    return batchMode  ? PersistBatch.ALL : PersistBatch.NONE;
-  }
-
   @Override
   public void setBatchOnCascade(boolean batchMode) {
     if (!isActive()) {
@@ -598,16 +587,6 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
     this.batchOnCascadeMode = batchMode;
   }
 
-  @Override
-  public void setBatchOnCascade(PersistBatch batchMode) {
-    setBatchOnCascade(PersistBatch.ALL == batchMode);
-  }
-
-  @Override
-  public PersistBatch getBatchOnCascade() {
-    return batchOnCascadeMode ? PersistBatch.ALL : PersistBatch.NONE;
-  }
-
   @Override
   public boolean isBatchOnCascade() {
     return batchOnCascadeMode;
diff --git a/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
index 0f331d9ab..a13076e87 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
@@ -3,7 +3,6 @@ package io.ebeaninternal.server.transaction;
 import io.ebean.ProfileLocation;
 import io.ebean.TransactionCallback;
 import io.ebean.annotation.DocStoreMode;
-import io.ebean.annotation.PersistBatch;
 import io.ebean.bean.PersistenceContext;
 import io.ebean.event.changelog.BeanChange;
 import io.ebean.event.changelog.ChangeSet;
@@ -225,16 +224,6 @@ class NoTransaction implements SpiTransaction {
 
   }
 
-  @Override
-  public void setBatch(PersistBatch persistBatchMode) {
-
-  }
-
-  @Override
-  public PersistBatch getBatch() {
-    return null;
-  }
-
   @Override
   public boolean isBatchMode() {
     return false;
@@ -244,16 +233,6 @@ class NoTransaction implements SpiTransaction {
   public void setBatchOnCascade(boolean batchMode) {
   }
 
-  @Override
-  public void setBatchOnCascade(PersistBatch batchOnCascadeMode) {
-
-  }
-
-  @Override
-  public PersistBatch getBatchOnCascade() {
-    return null;
-  }
-
   @Override
   public boolean isBatchOnCascade() {
     return false;
diff --git a/src/test/java/io/ebean/EbeanServer_saveAllTest.java b/src/test/java/io/ebean/EbeanServer_saveAllTest.java
index 53a3b4ccb..69ded9704 100644
--- a/src/test/java/io/ebean/EbeanServer_saveAllTest.java
+++ b/src/test/java/io/ebean/EbeanServer_saveAllTest.java
@@ -1,9 +1,8 @@
 package io.ebean;
 
-import io.ebean.annotation.PersistBatch;
-import org.tests.model.basic.EBasicVer;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
+import org.tests.model.basic.EBasicVer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -61,7 +60,7 @@ public class EbeanServer_saveAllTest extends BaseTestCase {
 
     Transaction transaction = server.beginTransaction();
     try {
-      transaction.setBatch(PersistBatch.ALL);
+      transaction.setBatchMode(true);
       LoggedSqlCollector.start();
 
       for (EBasicVer bean : beans(2)) {
diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
index c818a3287..daf725b39 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
@@ -37,7 +37,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
     try {
       transaction.setPersistCascade(false);
       transaction.setBatchSize(10);
-      transaction.setBatch(PersistBatch.ALL);
+      transaction.setBatchMode(true);
       transaction.setLabel("TestBatchInsertFlush.no_cascade");
 
       LoggedSqlCollector.start();
@@ -126,7 +126,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
 
     EbeanServer server = Ebean.getDefaultServer();
     LoggedSqlCollector.start();
-    
+
     EBasicVer b1 = new EBasicVer("b1");
     server.save(b1);
 
@@ -138,7 +138,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
     Integer id = b1.getId();
     assertNotNull(id);
     assertThat(LoggedSqlCollector.current()).hasSize(2);
-    
+
     EBasicVer b3 = new EBasicVer("b3");
     server.save(b3);
   }
@@ -174,13 +174,13 @@ public class TestBatchInsertFlush extends BaseTestCase {
       txn.end();
     }
   }
-  
+
   @Test
   @Transactional(batch = PersistBatch.ALL)
   public void transactional_noflushWhenIdIsLoaded() {
 
     EbeanServer server = Ebean.getDefaultServer();
-      
+
     LoggedSqlCollector.start();
 
     EBasicVer b1 = new EBasicVer("b1");
@@ -196,10 +196,10 @@ public class TestBatchInsertFlush extends BaseTestCase {
     Integer id = b1.getId();
     assertNotNull(id);
     assertThat(LoggedSqlCollector.current()).isEmpty();
-    
+
     EBasicVer b3 = new EBasicVer("b3");
     server.save(b3);
-    
+
   }
 
   @Test
@@ -242,7 +242,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
     EbeanServer server = Ebean.getDefaultServer();
     Transaction txn = server.beginTransaction();
     try {
-      txn.setBatch(PersistBatch.ALL);
+      txn.setBatchMode(true);
 
       EBasicVer b1 = new EBasicVer("b1");
       server.save(b1, txn);
@@ -270,7 +270,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
     EbeanServer server = Ebean.getDefaultServer();
     Transaction txn = server.beginTransaction();
     try {
-      txn.setBatch(PersistBatch.ALL);
+      txn.setBatchMode(true);
 
       EBasicVer b1 = new EBasicVer("b1");
       server.save(b1, txn);
diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java b/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java
index 497b9d137..a98f21c0e 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java
@@ -29,8 +29,8 @@ public class TestBatchInsertSimple extends BaseTestCase {
 
     Transaction transaction = Ebean.beginTransaction();
     try {
-      transaction.setBatch(PersistBatch.NONE);
-      transaction.setBatchOnCascade(PersistBatch.ALL);
+      transaction.setBatchMode(false);
+      transaction.setBatchOnCascade(true);
       transaction.setBatchSize(30);
       // setBatchGetGeneratedKeys MUST be turned off for MS SQL Server because :(
       transaction.setBatchGetGeneratedKeys(false);
@@ -103,8 +103,8 @@ public class TestBatchInsertSimple extends BaseTestCase {
 
     Transaction transaction = Ebean.beginTransaction();
     try {
-      transaction.setBatch(PersistBatch.NONE);
-      transaction.setBatchOnCascade(PersistBatch.ALL);
+      transaction.setBatchMode(false);
+      transaction.setBatchOnCascade(true);
       transaction.setBatchSize(30);
       // setBatchGetGeneratedKeys MUST be turned off for MS SQL Server because :(
       transaction.setBatchGetGeneratedKeys(false);
@@ -133,8 +133,8 @@ public class TestBatchInsertSimple extends BaseTestCase {
 
     Transaction transaction = Ebean.beginTransaction();
     try {
-      transaction.setBatch(PersistBatch.NONE);
-      transaction.setBatchOnCascade(spiEbeanServer().getDatabasePlatform().getPersistBatchOnCascade());
+      transaction.setBatchMode(true);
+      transaction.setBatchOnCascade(PersistBatch.ALL.equals(spiEbeanServer().getDatabasePlatform().getPersistBatchOnCascade()));
       transaction.setBatchSize(20);
 
       // escalate based on batchOnCascade value
diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java b/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java
index f3d6433ae..3d5d936ef 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java
@@ -3,10 +3,9 @@ package org.tests.batchinsert;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Transaction;
-import io.ebean.annotation.PersistBatch;
-import org.tests.model.basic.OCachedBean;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
+import org.tests.model.basic.OCachedBean;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,7 +30,7 @@ public class TestBatchInsertWithInitialisedCollection extends BaseTestCase {
 
     Transaction txn = Ebean.beginTransaction();
     try {
-      txn.setBatch(PersistBatch.ALL);
+      txn.setBatchMode(true);
 
       Ebean.saveAll(list);
       txn.commit();
diff --git a/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java b/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java
index d28dcc974..757a79881 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java
@@ -8,11 +8,11 @@ import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.persist.BatchControl;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
 import org.tests.model.basic.EBasicWithUniqueCon;
 import org.tests.model.basic.EOptOneB;
 import org.tests.model.basic.EOptOneC;
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
 
 import javax.persistence.PersistenceException;
 import java.sql.SQLException;
@@ -86,13 +86,13 @@ public class TestBatchOnCascadeExceptionHandling extends BaseTestCase {
   protected void testBatchOnCascadeIsExceptionSafe(EbeanServer server, Runnable failingOperation) {
     Transaction txn = server.beginTransaction();
     try {
-      assertThat(txn.getBatch()).isSameAs(PersistBatch.NONE);
-      assertThat(txn.getBatchOnCascade()).isSameAs(spiEbeanServer().getDatabasePlatform().getPersistBatchOnCascade());
+      assertThat(txn.isBatchMode()).isFalse();
+      assertThat(txn.isBatchOnCascade()).isSameAs(PersistBatch.ALL.equals(spiEbeanServer().getDatabasePlatform().getPersistBatchOnCascade()));
 
       failingOperation.run();
       Assertions.fail("PersistenceException expected");
     } catch (PersistenceException e) {
-      assertThat(txn.getBatch()).as("batch mode").isSameAs(PersistBatch.NONE); // should not have changed
+      assertThat(txn.isBatchMode()).as("batch mode").isFalse(); // should not have changed
       BatchControl bc = ((SpiTransaction) txn).getBatchControl();
       assertThat(bc == null || bc.isEmpty()).as("batch emtpy").isTrue();
     } finally {
diff --git a/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java b/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java
index 7704d1b63..92bf36a70 100644
--- a/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java
+++ b/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java
@@ -4,11 +4,10 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import io.ebean.Transaction;
-import io.ebean.annotation.PersistBatch;
+import org.junit.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.EBasicVer;
 import org.tests.model.converstation.Group;
-import org.junit.Test;
 
 import static org.assertj.core.api.StrictAssertions.assertThat;
 
@@ -48,7 +47,7 @@ public class TestDeleteWithoutOptimisticLocking extends BaseTestCase {
     EbeanServer server = Ebean.getDefaultServer();
     Transaction transaction = server.beginTransaction();
     try {
-      transaction.setBatch(PersistBatch.ALL);
+      transaction.setBatchMode(true);
 
       // returns true even though the delete has not occurred yet
       assertThat(server.delete(Ebean.getReference(EBasicVer.class, basic.getId()), transaction)).isTrue();
diff --git a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java
index b10abc2df..9b8334b62 100644
--- a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java
+++ b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java
@@ -4,9 +4,7 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Transaction;
 import io.ebean.annotation.IgnorePlatform;
-import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
-
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -25,7 +23,7 @@ public class TestInsertBatchThenFlushThenUpdate extends BaseTestCase {
     LoggedSqlCollector.start();
     Transaction txn = Ebean.beginTransaction();
     try {
-      txn.setBatch(PersistBatch.ALL);
+      txn.setBatchMode(true);
 
       EdParent parent = new EdParent();
       parent.setName("MyComputer");
diff --git a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java
index cc2dd8185..6e2f33ddc 100644
--- a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java
+++ b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java
@@ -4,9 +4,7 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Transaction;
 import io.ebean.annotation.IgnorePlatform;
-import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
-
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -25,7 +23,7 @@ public class TestInsertBatchThenUpdate extends BaseTestCase {
     LoggedSqlCollector.start();
     Transaction txn = Ebean.beginTransaction();
     try {
-      txn.setBatch(PersistBatch.ALL);
+      txn.setBatchMode(true);
 
       LoggedSqlCollector.start();
 
@@ -70,7 +68,7 @@ public class TestInsertBatchThenUpdate extends BaseTestCase {
     LoggedSqlCollector.start();
     Transaction txn = Ebean.beginTransaction();
     try {
-      txn.setBatch(PersistBatch.ALL);
+      txn.setBatchMode(true);
 
       LoggedSqlCollector.start();
 
diff --git a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java
index da54417e1..ca7d8e957 100644
--- a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java
+++ b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java
@@ -4,9 +4,7 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Transaction;
 import io.ebean.annotation.IgnorePlatform;
-import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
-
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -24,7 +22,7 @@ public class TestInsertBatchWithDifferentRootTypes extends BaseTestCase {
     LoggedSqlCollector.start();
     Transaction txn = Ebean.beginTransaction();
     try {
-      txn.setBatch(PersistBatch.ALL);
+      txn.setBatchMode(true);
 
       EdParent parent = new EdParent();
       parent.setName("MyComputer");
diff --git a/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java b/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java
index f234462ea..07388a367 100644
--- a/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java
+++ b/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java
@@ -4,11 +4,10 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
 import io.ebean.Transaction;
-import io.ebean.annotation.PersistBatch;
+import org.junit.Test;
 import org.tests.model.softdelete.ESoftDelMid;
 import org.tests.model.softdelete.ESoftDelTop;
 import org.tests.model.softdelete.ESoftDelUp;
-import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -38,7 +37,7 @@ public class TestSoftDeleteTop extends BaseTestCase {
 
     Transaction transaction = Ebean.beginTransaction();
     try {
-      transaction.setBatch(PersistBatch.ALL);
+      transaction.setBatchMode(true);
       Ebean.delete(up1);
       Ebean.delete(up2);
       transaction.commit();
diff --git a/src/test/java/org/tests/transaction/TestBatchPersistCascade.java b/src/test/java/org/tests/transaction/TestBatchPersistCascade.java
index 982a127fb..2849adcb5 100644
--- a/src/test/java/org/tests/transaction/TestBatchPersistCascade.java
+++ b/src/test/java/org/tests/transaction/TestBatchPersistCascade.java
@@ -5,15 +5,13 @@ import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import io.ebean.Transaction;
 import io.ebean.annotation.IgnorePlatform;
-import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
-
-import org.tests.model.basic.UTDetail;
-import org.tests.model.basic.UTMaster;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.tests.model.basic.UTDetail;
+import org.tests.model.basic.UTMaster;
 
 import java.util.List;
 
@@ -33,7 +31,7 @@ public class TestBatchPersistCascade extends BaseTestCase {
 
     Transaction txn = ebeanServer.beginTransaction();
     try {
-      txn.setBatch(PersistBatch.ALL);
+      txn.setBatchMode(true);
       logger.info("start ------------");
 
       for (int i = 0; i < 3; i++) {
@@ -66,8 +64,8 @@ public class TestBatchPersistCascade extends BaseTestCase {
 
     Transaction txn = server.beginTransaction();
     try {
-      txn.setBatch(PersistBatch.ALL);
-      txn.setBatchOnCascade(PersistBatch.ALL);
+      txn.setBatchMode(true);
+      txn.setBatchOnCascade(true);
 
       for (int i = 0; i < 3; i++) {
         UTMaster master = createMaster(i + 500);

From 9dbb69f4f45f05fd09e3f360f122fb5f2610a443 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 19 Nov 2018 23:40:00 +1300
Subject: [PATCH 0562/1036] #1553 - Remove deprecated method
 Query.setForUpdate(boolean) ... migrate to setForUpdate()

---
 src/main/java/io/ebean/Query.java                        | 9 ---------
 .../ebeaninternal/server/querydefn/DefaultOrmQuery.java  | 7 -------
 2 files changed, 16 deletions(-)

diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index d2678e54e..a1d34375d 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -1505,15 +1505,6 @@ public interface Query<T> {
    */
   String getGeneratedSql();
 
-  /**
-   * Deprecated - migrate to forUpdate().
-   *
-   * executed the select with "for update" which should lock the record
-   * "on read"
-   */
-  @Deprecated
-  Query<T> setForUpdate(boolean forUpdate);
-
   /**
    * Execute using "for update" clause which results in the DB locking the record.
    */
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index ee9cd5868..1f9056c3e 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -910,13 +910,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return this;
   }
 
-  @Override
-  public DefaultOrmQuery<T> setForUpdate(boolean forUpdate) {
-    this.forUpdate = (forUpdate) ? ForUpdate.BASE : null;
-    this.useBeanCache = CacheMode.OFF;
-    return this;
-  }
-
   @Override
   public DefaultOrmQuery<T> forUpdate() {
     return setForUpdateWithMode(ForUpdate.BASE);

From 426c6c81110f8e5e69290dd940aaad01cda3a229 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 20 Nov 2018 11:33:16 +1300
Subject: [PATCH 0563/1036] #1554 - Improve exception message for
 BeanNotEnhancedException

---
 .../ebeaninternal/server/deploy/BeanDescriptorManager.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 8234c4ce4..7a536f687 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -1557,8 +1557,8 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     Class<?> beanClass = desc.getBeanType();
 
     if (!hasEntityBeanInterface(beanClass)) {
-      String msg = "Bean " + beanClass + " is not enhanced? If you are running in IDEA or Eclipse check" +
-        " that the enhancement plugin is installed. See https://ebean.io/docs/trouble-shooting#not-enhanced";
+      String msg = "Bean " + beanClass + " is not enhanced? Check packages specified in ebean.mf. If you are running in IDEA or " +
+        "Eclipse check that the enhancement plugin is installed. See https://ebean.io/docs/trouble-shooting#not-enhanced";
       throw new BeanNotEnhancedException(msg);
     }
 
@@ -1588,7 +1588,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
         // ok to stop and treat just the same as Object.class
         return;
       }
-      throw new BeanNotEnhancedException("Super type " + superclass + " is not enhanced? See https://ebean.io/docs/trouble-shooting#not-enhanced");
+      throw new BeanNotEnhancedException("Super type " + superclass + " is not enhanced? Check the packages specified in ebean.mf See https://ebean.io/docs/trouble-shooting#not-enhanced");
     }
 
     // recursively continue up the inheritance hierarchy

From ecf5b56652132b7ee93e2b010ef514ac71c4ef06 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 20 Nov 2018 11:45:45 +1300
Subject: [PATCH 0564/1036] #1555 - Support .yaml extension (in addition to the
 existing .yml extension) for application.yaml and application-test.yaml

---
 src/main/java/io/ebean/Ebean.java                           | 4 ++--
 src/main/java/io/ebean/config/properties/Loader.java        | 2 ++
 .../java/io/ebean/config/properties/PropertiesLoader.java   | 6 +++---
 src/test/java/io/ebean/config/properties/LoaderTest.java    | 2 +-
 .../test-properties/{application.yml => application.yaml}   | 0
 5 files changed, 8 insertions(+), 6 deletions(-)
 rename src/test/resources/test-properties/{application.yml => application.yaml} (100%)

diff --git a/src/main/java/io/ebean/Ebean.java b/src/main/java/io/ebean/Ebean.java
index 099ff6a95..50300010c 100644
--- a/src/main/java/io/ebean/Ebean.java
+++ b/src/main/java/io/ebean/Ebean.java
@@ -4,10 +4,10 @@ import io.ebean.annotation.TxIsolation;
 import io.ebean.cache.ServerCacheManager;
 import io.ebean.config.BeanNotEnhancedException;
 import io.ebean.config.ServerConfig;
+import io.ebean.datasource.DataSourceConfigurationException;
 import io.ebean.plugin.Property;
 import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;
-import io.ebean.datasource.DataSourceConfigurationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -167,7 +167,7 @@ public final class Ebean {
 
       } catch (DataSourceConfigurationException e) {
         String msg = "Configuration error creating DataSource for the default EbeanServer." +
-          " This typically means a missing application-test.yml or missing ebean-test-config dependency." +
+          " This typically means a missing application-test.yaml or missing ebean-test-config dependency." +
           " See https://ebean.io/docs/trouble-shooting#datasource";
         throw new DataSourceConfigurationException(msg, e);
 
diff --git a/src/main/java/io/ebean/config/properties/Loader.java b/src/main/java/io/ebean/config/properties/Loader.java
index 4c0d07443..544514d68 100644
--- a/src/main/java/io/ebean/config/properties/Loader.java
+++ b/src/main/java/io/ebean/config/properties/Loader.java
@@ -63,6 +63,7 @@ class Loader {
    */
   private void loadTest() {
     loadProperties("application-test.properties", Source.RESOURCE);
+    loadYaml("application-test.yaml", Source.RESOURCE);
     loadYaml("application-test.yml", Source.RESOURCE);
     loadProperties("test-ebean.properties", Source.RESOURCE);
   }
@@ -83,6 +84,7 @@ class Loader {
    * Load the main configuration for the given source.
    */
   private void loadMain(Source source) {
+    loadYaml("application.yaml", source);
     loadYaml("application.yml", source);
     loadProperties("application.properties", source);
     loadProperties("ebean.properties", source);
diff --git a/src/main/java/io/ebean/config/properties/PropertiesLoader.java b/src/main/java/io/ebean/config/properties/PropertiesLoader.java
index 3df479919..a9eb27faa 100644
--- a/src/main/java/io/ebean/config/properties/PropertiesLoader.java
+++ b/src/main/java/io/ebean/config/properties/PropertiesLoader.java
@@ -18,14 +18,14 @@ public class PropertiesLoader {
    * <p>Firstly loads from main resources</p>
    * <pre>
    *   - application.properties
-   *   - application.yml
+   *   - application.yaml
    *   - ebean.properties
    * </pre>
    * <p>
    * <p>Then loads from local files</p>
    * <pre>
    *   - application.properties
-   *   - application.yml
+   *   - application.yaml
    *   - ebean.properties
    * </pre>
    * <p>
@@ -41,7 +41,7 @@ public class PropertiesLoader {
    * <p>Loads from test resources</p>
    * <pre>
    *   - application-test.properties
-   *   - application-test.yml
+   *   - application-test.yaml
    *   - test-ebean.properties
    * </pre>
    */
diff --git a/src/test/java/io/ebean/config/properties/LoaderTest.java b/src/test/java/io/ebean/config/properties/LoaderTest.java
index 7a4edea8d..7f89d5848 100644
--- a/src/test/java/io/ebean/config/properties/LoaderTest.java
+++ b/src/test/java/io/ebean/config/properties/LoaderTest.java
@@ -17,7 +17,7 @@ public class LoaderTest {
 
     Loader loader = new Loader();
     loader.loadProperties("test-properties/application.properties", Loader.Source.RESOURCE);
-    loader.loadYaml("test-properties/application.yml", Loader.Source.RESOURCE);
+    loader.loadYaml("test-properties/application.yaml", Loader.Source.RESOURCE);
 
     loader.loadProperties("test-properties/one.properties", Loader.Source.RESOURCE);
     loader.loadYaml("test-properties/foo.yml", Loader.Source.RESOURCE);
diff --git a/src/test/resources/test-properties/application.yml b/src/test/resources/test-properties/application.yaml
similarity index 100%
rename from src/test/resources/test-properties/application.yml
rename to src/test/resources/test-properties/application.yaml

From b4154031cc5766442928407cd429400168d3555a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 20 Nov 2018 11:51:27 +1300
Subject: [PATCH 0565/1036] #1555 - Support .yaml extension (in addition to the
 existing .yml extension) for application.yaml and application-test.yaml

---
 src/main/java/io/ebean/config/properties/Loader.java     | 2 +-
 src/test/java/io/ebean/config/properties/LoaderTest.java | 2 ++
 test-dummy2.yaml                                         | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 test-dummy2.yaml

diff --git a/src/main/java/io/ebean/config/properties/Loader.java b/src/main/java/io/ebean/config/properties/Loader.java
index 544514d68..c65242339 100644
--- a/src/main/java/io/ebean/config/properties/Loader.java
+++ b/src/main/java/io/ebean/config/properties/Loader.java
@@ -101,7 +101,7 @@ class Loader {
   }
 
   void loadWithExtensionCheck(String fileName) {
-    if (fileName.endsWith("yml")) {
+    if (fileName.endsWith("yaml") || fileName.endsWith("yml")) {
       loadYaml(fileName, Source.FILE);
     } else if (fileName.endsWith("properties")) {
       loadProperties(fileName, Source.FILE);
diff --git a/src/test/java/io/ebean/config/properties/LoaderTest.java b/src/test/java/io/ebean/config/properties/LoaderTest.java
index 7f89d5848..307d18089 100644
--- a/src/test/java/io/ebean/config/properties/LoaderTest.java
+++ b/src/test/java/io/ebean/config/properties/LoaderTest.java
@@ -38,8 +38,10 @@ public class LoaderTest {
     Loader loader = new Loader();
     loader.loadWithExtensionCheck("test-dummy.properties");
     loader.loadWithExtensionCheck("test-dummy.yml");
+    loader.loadWithExtensionCheck("test-dummy2.yaml");
 
     Properties properties = loader.eval();
+    assertThat(properties.getProperty("dummy.yaml.bar")).isEqualTo("baz");
     assertThat(properties.getProperty("dummy.yml.foo")).isEqualTo("bar");
     assertThat(properties.getProperty("dummy.properties.foo")).isEqualTo("bar");
   }
diff --git a/test-dummy2.yaml b/test-dummy2.yaml
new file mode 100644
index 000000000..687905373
--- /dev/null
+++ b/test-dummy2.yaml
@@ -0,0 +1,3 @@
+dummy:
+  yaml:
+    bar: baz

From e81a61378c91fbd166455c2f3fd70e4e0270ea3b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 23 Nov 2018 11:37:38 +1300
Subject: [PATCH 0566/1036] No effective change - javadoc

---
 src/main/java/io/ebean/FetchGroup.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/ebean/FetchGroup.java b/src/main/java/io/ebean/FetchGroup.java
index 003bd0de9..2d45ee4f1 100644
--- a/src/main/java/io/ebean/FetchGroup.java
+++ b/src/main/java/io/ebean/FetchGroup.java
@@ -10,7 +10,7 @@ import javax.annotation.Nonnull;
  * that can be defined separately from the query and combined with other FetchGroups.
  * </p>
  *
- * <h3>Select example</h3>*
+ * <h3>Select example</h3>
  * <pre>{@code
  *
  * FetchGroup<Customer> fetchGroup = FetchGroup.of(Customer.class, "name, status");

From ba16cea405279b35642460009932c7eb896c4cf1 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 23 Nov 2018 12:20:18 +1300
Subject: [PATCH 0567/1036] #1556 - Query.setDisableLazyLoading(true) not
 working on @OneToMany Set (but does on List)

---
 src/main/java/io/ebean/common/BeanMap.java    |  8 +-
 src/main/java/io/ebean/common/BeanSet.java    | 10 +-
 .../batchload/TestQueryJoinToAssocOne.java    | 96 ++++++++++++++++++-
 .../tests/query/other/TestOneToManyAsMap.java | 15 ++-
 4 files changed, 113 insertions(+), 16 deletions(-)

diff --git a/src/main/java/io/ebean/common/BeanMap.java b/src/main/java/io/ebean/common/BeanMap.java
index 82a3c9853..406bd9f17 100644
--- a/src/main/java/io/ebean/common/BeanMap.java
+++ b/src/main/java/io/ebean/common/BeanMap.java
@@ -123,7 +123,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
   private void initClear() {
     synchronized (this) {
       if (map == null) {
-        if (modifyListening) {
+        if (!disableLazyLoad && modifyListening) {
           lazyLoadCollection(true);
         } else {
           map = new LinkedHashMap<>();
@@ -135,7 +135,11 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
   private void init() {
     synchronized (this) {
       if (map == null) {
-        lazyLoadCollection(false);
+        if (disableLazyLoad) {
+          map = new LinkedHashMap<>();
+        } else {
+          lazyLoadCollection(false);
+        }
       }
     }
   }
diff --git a/src/main/java/io/ebean/common/BeanSet.java b/src/main/java/io/ebean/common/BeanSet.java
index c19564247..42872ad10 100644
--- a/src/main/java/io/ebean/common/BeanSet.java
+++ b/src/main/java/io/ebean/common/BeanSet.java
@@ -116,7 +116,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
   private void initClear() {
     synchronized (this) {
       if (set == null) {
-        if (modifyListening) {
+        if (!disableLazyLoad && modifyListening) {
           lazyLoadCollection(true);
         } else {
           set = new LinkedHashSet<>();
@@ -128,7 +128,11 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
   private void init() {
     synchronized (this) {
       if (set == null) {
-        lazyLoadCollection(true);
+        if (disableLazyLoad) {
+          set = new LinkedHashSet<>();
+        } else {
+          lazyLoadCollection(true);
+        }
       }
     }
   }
@@ -377,7 +381,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
       throw new IllegalStateException("This collection is in ReadOnly mode");
     }
   }
-  
+
   @Override
   public BeanCollection<E> getShallowCopy() {
     BeanSet<E> copy = new BeanSet<>(new LinkedHashSet<>(set));
diff --git a/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java b/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java
index ffde77d3b..d1b697a70 100644
--- a/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java
+++ b/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java
@@ -3,12 +3,17 @@ package org.tests.batchload;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.FetchConfig;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.OrderDetail;
 import org.tests.model.basic.ResetBasicData;
-import org.ebeantest.LoggedSqlCollector;
-import org.junit.Test;
+import org.tests.model.m2m.Role;
+import org.tests.model.m2m.Tenant;
+import org.tests.model.map.MpRole;
+import org.tests.model.map.MpUser;
 
+import java.util.Arrays;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -107,6 +112,93 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
     assertThat(secondaryQuery).contains(" order by t0.order_id, t0.id");
   }
 
+  @Test
+  public void disableLazyLoading_when_oneToManyList() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    // This will use 2 SQL queries to build this object graph
+    List<Order> l0 = Ebean.find(Order.class)
+      .setDisableLazyLoading(true)
+      .select("status, shipDate")
+      .order().asc("id")
+      .findList();
+
+    assertThat(l0).isNotEmpty();
+
+    Order order = l0.get(0);
+    // try to invoke lazy loading on the bean
+    assertThat(order.getCustomer()).isNull();
+    assertThat(order.getCretime()).isNull();
+
+    // try to invoke lazy loading on the OneToMany ...
+    List<OrderDetail> details = order.getDetails();
+    assertThat(details).isEmpty();
+    assertThat(details.size()).isEqualTo(0);
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(1);
+  }
+
+  @Test
+  public void disableLazyLoad_when_oneToManySet() {
+
+    Role role0 = new Role("r0");
+    Role role1 = new Role("r1");
+    Ebean.save(role0);
+    Ebean.save(role1);
+
+    Tenant tenant = new Tenant("t0");
+    tenant.getRoles().add(role0);
+    tenant.getRoles().add(role1);
+
+    Ebean.save(tenant);
+
+    LoggedSqlCollector.start();
+
+    Tenant found = Ebean.find(Tenant.class)
+      .setDisableLazyLoading(true)
+      .select("name")
+      .setId(tenant.getId())
+      .findOne();
+
+    assertThat(found.getRoles().size()).isEqualTo(0);
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(1);
+  }
+
+  @Test
+  public void disableLazyLoading_when_oneToManyMap() {
+
+    MpRole r0 = new MpRole();
+    r0.setCode("disableLazyLoading");
+
+    MpUser u = new MpUser();
+    u.setName("disableLazy");
+    u.getRoles().put("disableLazyLoading", r0);
+    Ebean.save(u);
+
+    LoggedSqlCollector.start();
+
+    MpUser found = Ebean.find(MpUser.class)
+      .setDisableLazyLoading(true)
+      .select("name")
+      .setId(u.getId())
+      .findOne();
+
+    // normally invokes lazy loading
+    assertThat(found.getRoles().size()).isEqualTo(0);
+
+    // only 1 query ... no lazy loading query
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(1);
+
+    Ebean.deleteAll(Arrays.asList(found, r0));
+  }
+
   @Test
   public void testJoinOnPartiallyPopulatedParent_withLazyLoadingDisabled() {
 
diff --git a/src/test/java/org/tests/query/other/TestOneToManyAsMap.java b/src/test/java/org/tests/query/other/TestOneToManyAsMap.java
index 48fe3400c..a14930a3b 100644
--- a/src/test/java/org/tests/query/other/TestOneToManyAsMap.java
+++ b/src/test/java/org/tests/query/other/TestOneToManyAsMap.java
@@ -2,11 +2,10 @@ package org.tests.query.other;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
-import io.ebean.EbeanServer;
-import org.tests.model.map.MpRole;
-import org.tests.model.map.MpUser;
 import org.junit.Assert;
 import org.junit.Test;
+import org.tests.model.map.MpRole;
+import org.tests.model.map.MpUser;
 
 import java.util.Map;
 
@@ -15,21 +14,19 @@ public class TestOneToManyAsMap extends BaseTestCase {
   @Test
   public void test() {
 
-    EbeanServer eServer = Ebean.getServer(null);
-
     MpUser u = new MpUser();
-    eServer.save(u);
+    Ebean.save(u);
 
-    MpUser u2 = eServer.find(MpUser.class, u.getId());
+    MpUser u2 = Ebean.find(MpUser.class, u.getId());
     Assert.assertNotNull(u2);
 
     u2.setName("Charlie Brown");
     MpRole ourl = new MpRole();
     ourl.setOrganizationId(47L);
     u2.getRoles().put("one", ourl);
-    eServer.save(u2);
+    Ebean.save(u2);
 
-    MpUser u3 = eServer.find(MpUser.class, u.getId());
+    MpUser u3 = Ebean.find(MpUser.class, u.getId());
     Assert.assertEquals("Charlie Brown", u3.getName());
 
     Map<String, MpRole> listMap = u3.getRoles();

From 54ba78218bfb532fef032539c7b77e578c6de418 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 23 Nov 2018 14:36:41 +1300
Subject: [PATCH 0568/1036] #1558 - Bump ebean-migration to 11.11.1 - refer:
 https://github.com/ebean-orm/ebean-migration/pull/56

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4c8e05980..f35668f6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>11.10.1</version>
+      <version>11.11.1</version>
     </dependency>
 
     <dependency>

From 2f0e5e6e4650ec1961ddd4abea4b256f50cefd9d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 27 Nov 2018 14:50:48 +1300
Subject: [PATCH 0569/1036] #1561 - ENH: Add ScriptRunner API ... for easier
 running of SQL and DDL scripts (for testing usually)

---
 src/main/java/io/ebean/EbeanServer.java       |   7 ++
 src/main/java/io/ebean/ScriptRunner.java      |  65 ++++++++++
 .../dbmigration/DdlGenerator.java             |   1 -
 .../server/core/DScriptRunner.java            | 116 ++++++++++++++++++
 .../server/core/DefaultServer.java            |   9 ++
 .../java/io/ebean/EbeanServer_refresh.java    |  13 +-
 .../ebeaninternal/api/TDSpiEbeanServer.java   |   6 +
 src/test/resources/scripts/test-script-2.sql  |   4 +
 src/test/resources/scripts/test-script.sql    |   4 +
 9 files changed, 221 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/io/ebean/ScriptRunner.java
 create mode 100644 src/main/java/io/ebeaninternal/server/core/DScriptRunner.java
 create mode 100644 src/test/resources/scripts/test-script-2.sql
 create mode 100644 src/test/resources/scripts/test-script.sql

diff --git a/src/main/java/io/ebean/EbeanServer.java b/src/main/java/io/ebean/EbeanServer.java
index aad3eb6d9..face93fa3 100644
--- a/src/main/java/io/ebean/EbeanServer.java
+++ b/src/main/java/io/ebean/EbeanServer.java
@@ -1442,6 +1442,13 @@ public interface EbeanServer {
    */
   JsonContext json();
 
+  /**
+   * Return a ScriptRunner for running SQL or DDL scripts.
+   * <p/>
+   * Intended to use mostly in testing to run seed SQL scripts or truncate table scripts etc.
+   */
+  ScriptRunner script();
+
   /**
    * Return the Document store.
    */
diff --git a/src/main/java/io/ebean/ScriptRunner.java b/src/main/java/io/ebean/ScriptRunner.java
new file mode 100644
index 000000000..b9130d57b
--- /dev/null
+++ b/src/main/java/io/ebean/ScriptRunner.java
@@ -0,0 +1,65 @@
+package io.ebean;
+
+import java.net.URL;
+import java.util.Map;
+
+/**
+ * Runs DDL and SQL scripts.
+ * <p/>
+ * Typically these are scripts used for testing such as seed SQL scripts or truncate SQL scripts.
+ * <p/>
+ * Scripts are executed in their own transaction and committed on successful completion.
+ *
+ * <h3>Example of simple use</h3>
+ * <pre>{@code
+ *
+ *   EbeanServer server = Ebean.getDefaultServer();
+ *   server.script().run("/scripts/test-script.sql");
+ *
+ * }</pre>
+ *
+ *
+ * <h3>Example using place holders in the script</h3>
+ * <pre>{@code
+ *
+ *   Map<String,String> placeholders = new HashMap<>();
+ *   placeholders.put("tableName", "e_basic");
+ *
+ *   EbeanServer server = Ebean.getDefaultServer();
+ *   server.script().run("/scripts/test-script.sql");
+ *
+ * }</pre>
+ */
+public interface ScriptRunner {
+
+  /**
+   * Run a script given the resource path (that should start with "/").
+   */
+  void run(String path);
+
+  /**
+   * Run a script given the resource path (that should start with "/") and place holders.
+   *
+   * <pre>{@code
+   *
+   *   Map<String,String> placeholders = new HashMap<>();
+   *   placeholders.put("tableName", "e_basic");
+   *
+   *   EbeanServer server = Ebean.getDefaultServer();
+   *   server.script().run("/scripts/test-script.sql");
+   *
+   * }</pre>
+   */
+  void run(String path, Map<String, String> placeholderMap);
+
+  /**
+   * Run a DDL or SQL script given the resource.
+   */
+  void run(URL resource);
+
+  /**
+   * Run a DDL or SQL script given the resource and place holders.
+   */
+  void run(URL resource, Map<String, String> placeholderMap);
+
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
index 8230bc65b..fa0b662cf 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
@@ -348,7 +348,6 @@ public class DdlGenerator {
         buf.append(s).append("\n");
       }
       return buf.toString();
-
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java b/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java
new file mode 100644
index 000000000..cefe9f22a
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java
@@ -0,0 +1,116 @@
+package io.ebeaninternal.server.core;
+
+import io.ebean.ScriptRunner;
+import io.ebean.migration.ddl.DdlRunner;
+import io.ebean.migration.runner.ScriptTransform;
+import io.ebeaninternal.api.SpiEbeanServer;
+
+import javax.persistence.PersistenceException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
+import java.io.Reader;
+import java.net.URL;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Map;
+
+class DScriptRunner implements ScriptRunner {
+
+  private static final String NEWLINE = "\n";
+
+  private final SpiEbeanServer server;
+
+  DScriptRunner(SpiEbeanServer server) {
+    this.server = server;
+  }
+
+  @Override
+  public void run(String path) {
+    run(path, null);
+  }
+
+  @Override
+  public void run(String path, Map<String, String> placeholderMap) {
+    run(this.getClass().getResource(path), path, placeholderMap);
+  }
+
+  @Override
+  public void run(URL resource) {
+    run(resource, null, null);
+  }
+
+  @Override
+  public void run(URL resource, Map<String, String> placeholderMap) {
+    run(resource, null, placeholderMap);
+  }
+
+  private void run(URL resource, String scriptName, Map<String, String> placeholderMap) {
+    if (resource == null) {
+      throw new IllegalArgumentException("resource is null?");
+    }
+    if (scriptName == null) {
+      scriptName = resource.getFile();
+    }
+
+    String content = content(resource);
+    runScript(content, scriptName, placeholderMap);
+  }
+
+  private String content(URL resource) {
+    if (resource == null) {
+      throw new IllegalArgumentException("resource is null?");
+    }
+
+    try (InputStream inputStream = resource.openStream()) {
+      return readContent(new InputStreamReader(inputStream));
+
+    } catch (IOException e) {
+      throw new PersistenceException("Failed to read script content", e);
+    }
+  }
+
+
+  /**
+   * Execute all the DDL statements in the script.
+   */
+  private void runScript(String content, String scriptName, Map<String, String> placeholderMap) {
+
+    try {
+      if (placeholderMap != null) {
+        content = ScriptTransform.build(null, placeholderMap).transform(content);
+      }
+
+      try (Connection connection = obtainConnection()) {
+        DdlRunner runner = new DdlRunner(false, scriptName);
+        runner.runAll(content, connection);
+        connection.commit();
+      }
+
+    } catch (SQLException e) {
+      throw new PersistenceException("Failed to run script", e);
+    }
+  }
+
+  private Connection obtainConnection() {
+    try {
+      return server.getPluginApi().getDataSource().getConnection();
+    } catch (SQLException e) {
+      throw new PersistenceException("Failed to obtain connection to run script", e);
+    }
+  }
+
+  private String readContent(Reader reader) throws IOException {
+
+    StringBuilder buf = new StringBuilder();
+    try (LineNumberReader lineReader = new LineNumberReader(reader)) {
+      String line;
+      while ((line = lineReader.readLine()) != null) {
+        buf.append(line).append(NEWLINE);
+      }
+      return buf.toString();
+    }
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index df991c343..1872c0f5b 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -22,6 +22,7 @@ import io.ebean.Query;
 import io.ebean.QueryIterator;
 import io.ebean.RowConsumer;
 import io.ebean.RowMapper;
+import io.ebean.ScriptRunner;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
 import io.ebean.SqlUpdate;
@@ -185,6 +186,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   private final DdlGenerator ddlGenerator;
 
+  private final ScriptRunner scriptRunner;
+
   private final ExpressionFactory expressionFactory;
 
   private final SpiBackgroundExecutor backgroundExecutor;
@@ -291,6 +294,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
     this.serverPlugins = config.getPlugins();
     this.ddlGenerator = new DdlGenerator(this, serverConfig);
+    this.scriptRunner = new DScriptRunner(this);
 
     configureServerPlugins();
 
@@ -370,6 +374,11 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return databasePlatform;
   }
 
+  @Override
+  public ScriptRunner script() {
+    return scriptRunner;
+  }
+
   @Override
   public DdlHandler createDdlHandler() {
     return PlatformDdlBuilder.create(databasePlatform).createDdlHandler(serverConfig);
diff --git a/src/test/java/io/ebean/EbeanServer_refresh.java b/src/test/java/io/ebean/EbeanServer_refresh.java
index 1c1188ea4..0c3e676a8 100644
--- a/src/test/java/io/ebean/EbeanServer_refresh.java
+++ b/src/test/java/io/ebean/EbeanServer_refresh.java
@@ -1,13 +1,13 @@
 package io.ebean;
 
-import io.ebean.Ebean;
-import io.ebean.EbeanServer;
+import org.junit.Test;
 import org.tests.model.basic.EBasic;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Test;
 
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
 
@@ -16,7 +16,14 @@ public class EbeanServer_refresh {
   @Test
   public void basic() {
 
+    Map<String, String> map = new HashMap<>();
+    map.put("tableName", "e_basic");
+
     EbeanServer server = Ebean.getDefaultServer();
+    server.script().run("/scripts/test-script.sql");
+    server.script().run("/scripts/test-script-2.sql", map);
+    server.script().run(this.getClass().getResource("/scripts/test-script.sql"));
+    server.script().run(this.getClass().getResource("/scripts/test-script-2.sql"), map);
 
     EBasic basic = new EBasic("basic refresh");
     basic.setStatus(EBasic.Status.NEW);
diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index 2100f8d7c..afa192641 100644
--- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -19,6 +19,7 @@ import io.ebean.Query;
 import io.ebean.QueryIterator;
 import io.ebean.RowConsumer;
 import io.ebean.RowMapper;
+import io.ebean.ScriptRunner;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
 import io.ebean.SqlUpdate;
@@ -106,6 +107,11 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
 
   }
 
+  @Override
+  public ScriptRunner script() {
+    return null;
+  }
+
   @Override
   public void scopedTransactionEnter(TxScope txScope) {
 
diff --git a/src/test/resources/scripts/test-script-2.sql b/src/test/resources/scripts/test-script-2.sql
new file mode 100644
index 000000000..977ee0ec4
--- /dev/null
+++ b/src/test/resources/scripts/test-script-2.sql
@@ -0,0 +1,4 @@
+delete from ${tableName};
+
+-- some other comment, tableName is replaced
+select count(*) from ${tableName};
diff --git a/src/test/resources/scripts/test-script.sql b/src/test/resources/scripts/test-script.sql
new file mode 100644
index 000000000..6118a0454
--- /dev/null
+++ b/src/test/resources/scripts/test-script.sql
@@ -0,0 +1,4 @@
+delete from e_basic;
+
+-- some comment, select not useful here
+select count(*) from e_basic;

From 890cc6f66d566e523198e160a010cb9e82d268ef Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 27 Nov 2018 14:53:06 +1300
Subject: [PATCH 0570/1036] Bump to 11.27.1-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f35668f6a..64faed79b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.26.2-SNAPSHOT</version>
+  <version>11.27.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>

From 174fe464858f6a14ca91f8524c326a0b2b7c073b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 27 Nov 2018 14:58:26 +1300
Subject: [PATCH 0571/1036] [maven-release-plugin] prepare release
 ebean-11.27.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 64faed79b..b0db2aed1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.27.1-SNAPSHOT</version>
+  <version>11.27.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.27.1</tag>
   </scm>
 
   <profiles>

From 211f28eea33a7d793459768711c2abafd6ee0138 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 27 Nov 2018 14:58:40 +1300
Subject: [PATCH 0572/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b0db2aed1..efa3a6190 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.27.1</version>
+  <version>11.27.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.27.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 70e2b1c2aed9c3264fd8a9aef5c8a36a61486609 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 29 Nov 2018 09:54:24 +1300
Subject: [PATCH 0573/1036] #1562 - Query cache use incorrect with
 RawExpression - incorrect bind hash

---
 .../server/expression/RawExpression.java      |  6 +-
 .../server/expression/RawExpressionTest.java  | 23 ++++++++
 .../tests/cache/TestQueryCacheCountry.java    | 58 +++++++++++++++++++
 3 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/expression/RawExpression.java b/src/main/java/io/ebeaninternal/server/expression/RawExpression.java
index 85b593521..cad8582bd 100644
--- a/src/main/java/io/ebeaninternal/server/expression/RawExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/RawExpression.java
@@ -74,7 +74,11 @@ class RawExpression extends NonPrepareExpression {
 
   @Override
   public int queryBindHash() {
-    return sql.hashCode();
+    int hc = sql.hashCode();
+    for (Object value : values) {
+      hc = hc * 92821 + value.hashCode();
+    }
+    return hc;
   }
 
   @Override
diff --git a/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java
index c34e9c037..853a6a2c8 100644
--- a/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java
+++ b/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java
@@ -45,4 +45,27 @@ public class RawExpressionTest extends BaseExpressionTest {
     assertThat(exp("a", 10, 20).isSameByBind(exp("a", 10))).isFalse();
   }
 
+  @Test
+  public void queryBindHash_when_sameBindValues() {
+    assert_queryBindHash_isSame(exp("a", 10), exp("a", 10));
+  }
+
+  @Test
+  public void queryBindHash_when_diffBindValues() {
+    assert_queryBindHash_isDifferent(exp("a", 10), exp("a", 20));
+  }
+
+  @Test
+  public void queryBindHash_when_diffBindValues2() {
+    assert_queryBindHash_isDifferent(exp("a", 10), exp("a", 10, 11));
+  }
+
+  public void assert_queryBindHash_isDifferent(RawExpression exp0, RawExpression exp1) {
+    assertThat(exp0.queryBindHash()).isNotEqualTo(exp1.queryBindHash());
+  }
+
+  public void assert_queryBindHash_isSame(RawExpression exp0, RawExpression exp1) {
+    assertThat(exp0.queryBindHash()).isEqualTo(exp1.queryBindHash());
+  }
+
 }
diff --git a/src/test/java/org/tests/cache/TestQueryCacheCountry.java b/src/test/java/org/tests/cache/TestQueryCacheCountry.java
index b70a8ad81..28694eac3 100644
--- a/src/test/java/org/tests/cache/TestQueryCacheCountry.java
+++ b/src/test/java/org/tests/cache/TestQueryCacheCountry.java
@@ -62,6 +62,60 @@ public class TestQueryCacheCountry extends BaseTestCase {
     assertEquals(1, queryStats1.getHitCount());
   }
 
+  @Test
+  public void rawExpression() {
+
+    ResetBasicData.reset();
+    awaitL2Cache();
+    clearCache();
+
+    List<Country> countryList0 = Ebean.find(Country.class)
+      .setUseQueryCache(true)
+      .where().raw("code = ?", "NZ")
+      .findList();
+
+    assertThat(countryList0.get(0).getName()).isEqualTo("New Zealand");
+
+    List<Country> countryList1 = Ebean.find(Country.class)
+      .setUseQueryCache(true)
+      .where().raw("code = ?", "AU")
+      .findList();
+
+    assertThat(countryList1.get(0).getName()).isEqualTo("Australia");
+
+    ServerCacheStatistics queryStats1 = queryCache.getStatistics(false);
+    assertEquals(2, queryStats1.getMissCount());
+    assertEquals(2, queryStats1.getSize());
+    assertEquals(0, queryStats1.getHitCount()); // no hits yet
+
+
+    // we get a hit this time
+    List<Country> countryList2 = Ebean.find(Country.class)
+      .setUseQueryCache(true)
+      .where().raw("code = ?", "NZ")
+      .findList();
+
+    assertThat(countryList2.get(0).getName()).isEqualTo("New Zealand");
+
+    ServerCacheStatistics queryStats2 = queryCache.getStatistics(false);
+    assertEquals(2, queryStats2.getMissCount());
+    assertEquals(2, queryStats2.getSize());
+    assertEquals(1, queryStats2.getHitCount()); // got a hit
+
+    // we get a hit on AU
+    List<Country> countryList3 = Ebean.find(Country.class)
+      .setUseQueryCache(true)
+      .where().raw("code = ?", "AU")
+      .findList();
+
+    assertThat(countryList3.get(0).getName()).isEqualTo("Australia");
+
+    ServerCacheStatistics queryStats3 = queryCache.getStatistics(false);
+    assertEquals(2, queryStats3.getMissCount());
+    assertEquals(2, queryStats3.getSize());
+    assertEquals(2, queryStats3.getHitCount()); // got another hit
+  }
+
   @Test
   public void test() {
 
@@ -104,6 +158,10 @@ public class TestQueryCacheCountry extends BaseTestCase {
       .findList();
 
     assertNotSame(countryList2, countryList0);
+
+    nz = Ebean.find(Country.class, "NZ");
+    nz.setName("New Zealand");
+    Ebean.save(nz);
   }
 
 }

From c6ae501354a5ce3aec1bbab2c38be64b5aeaf736 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 29 Nov 2018 09:59:16 +1300
Subject: [PATCH 0574/1036] #1563 - Remove deprecated noop method
 ServerConfig.loadTestProperties() - migrate to loadProperties()

---
 src/main/java/io/ebean/config/ServerConfig.java | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 297a9e70d..3ee4568be 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -2763,20 +2763,6 @@ public class ServerConfig {
     return list;
   }
 
-  /**
-   * Deprecated - this does nothing now, we always try to read test configuration.
-   * <p>
-   * Load settings from test-ebean.properties and do nothing if the properties is not found.
-   * <p>
-   * This is typically used when test-ebean.properties is put into the test class path and used
-   * to configure Ebean for running tests.
-   * </p>
-   */
-  @Deprecated
-  public void loadTestProperties() {
-    // do nothing now ... as we always try to read test configuration and that should only
-  }
-
   /**
    * Return the properties that we used for configuration and were set via a call to loadFromProperties().
    */

From c440c768cf622c600970a049ae56d5db7d2ddb79 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 29 Nov 2018 10:01:56 +1300
Subject: [PATCH 0575/1036] #1564 - Remove deprecated
 io.ebeaninternal.server.core.ServletContextListener - migrate to
 io.ebean.event.ServletContextListener

---
 .../server/core/ServletContextListener.java   | 35 -------------------
 1 file changed, 35 deletions(-)
 delete mode 100644 src/main/java/io/ebeaninternal/server/core/ServletContextListener.java

diff --git a/src/main/java/io/ebeaninternal/server/core/ServletContextListener.java b/src/main/java/io/ebeaninternal/server/core/ServletContextListener.java
deleted file mode 100644
index 260cfa296..000000000
--- a/src/main/java/io/ebeaninternal/server/core/ServletContextListener.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package io.ebeaninternal.server.core;
-
-import io.ebeaninternal.server.lib.ShutdownManager;
-
-import javax.servlet.ServletContextEvent;
-
-/**
- * Deprecated - migrate to io.ebean.event.ServletContextListener.
- * <p>
- * Listens for webserver server starting and stopping events.
- * <p>
- * Register this listener in the web.xml configuration file. This will listen
- * for startup and shutdown events.
- * </p>
- */
-@Deprecated
-public class ServletContextListener implements javax.servlet.ServletContextListener {
-
-  /**
-   * The servlet container is stopping.
-   */
-  @Override
-  public void contextDestroyed(ServletContextEvent event) {
-    ShutdownManager.shutdown();
-  }
-
-  /**
-   * Do nothing on startup.
-   */
-  @Override
-  public void contextInitialized(ServletContextEvent event) {
-
-  }
-
-}

From 8252a51545ac621ae07709510fd1a8b35bacafad Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 29 Nov 2018 10:16:48 +1300
Subject: [PATCH 0576/1036] #1565 - Bump to ebean-datasource 4.3.1 ... with
 option for owner database credentials and InitDatabase

---
 pom.xml                                                |  4 ++--
 .../io/ebeaninternal/server/core/DefaultContainer.java | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index efa3a6190..02d86118d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.27.2-SNAPSHOT</version>
+  <version>11.28.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -123,7 +123,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-datasource</artifactId>
-      <version>4.2.2</version>
+      <version>4.3.1</version>
     </dependency>
 
     <dependency>
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index 9c547e8ae..8be384042 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -7,6 +7,10 @@ import io.ebean.config.TenantMode;
 import io.ebean.config.UnderscoreNamingConvention;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.h2.H2Platform;
+import io.ebean.datasource.DataSourceAlertFactory;
+import io.ebean.datasource.DataSourceConfig;
+import io.ebean.datasource.DataSourceFactory;
+import io.ebean.datasource.DataSourcePoolListener;
 import io.ebean.service.SpiContainer;
 import io.ebeaninternal.api.SpiBackgroundExecutor;
 import io.ebeaninternal.api.SpiEbeanServer;
@@ -15,10 +19,6 @@ import io.ebeaninternal.server.cluster.ClusterManager;
 import io.ebeaninternal.server.core.bootup.BootupClassPathSearch;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
 import io.ebeaninternal.server.lib.ShutdownManager;
-import io.ebean.datasource.DataSourceAlertFactory;
-import io.ebean.datasource.DataSourceConfig;
-import io.ebean.datasource.DataSourceFactory;
-import io.ebean.datasource.DataSourcePoolListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -249,7 +249,7 @@ public class DefaultContainer implements SpiContainer {
       return null;
     }
 
-    DataSourceFactory factory = config.service(DataSourceFactory.class);
+    DataSourceFactory factory = DataSourceFactory.get();
     if (factory == null) {
       throw new IllegalStateException("No DataSourceFactory service implementation found in class path."
         + " Probably missing dependency to avaje-datasource?");

From f45089240a4f0acfabcbe12d1fcac1ee45724d14 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 30 Nov 2018 09:44:07 +1300
Subject: [PATCH 0577/1036] #1565 - Bump to ebean-datasource 4.3.1 ... with
 option for owner database credentials and InitDatabase

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 02d86118d..34260a0d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-datasource</artifactId>
-      <version>4.3.1</version>
+      <version>4.3.2</version>
     </dependency>
 
     <dependency>

From cca9bb4427da10be4038e83cfaa2d6e24461c949 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 30 Nov 2018 09:55:06 +1300
Subject: [PATCH 0578/1036] [maven-release-plugin] prepare release
 ebean-11.28.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 34260a0d8..0d0da5fa1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.28.1-SNAPSHOT</version>
+  <version>11.28.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.28.1</tag>
   </scm>
 
   <profiles>

From 7fda8079c2c484c2aea3bbf66bd68272d2e51ca9 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 30 Nov 2018 09:55:20 +1300
Subject: [PATCH 0579/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0d0da5fa1..7965ca52b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.28.1</version>
+  <version>11.28.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.28.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From fcffa92c554b21c22fc95552262029b4d09f5b20 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 30 Nov 2018 21:47:23 +1300
Subject: [PATCH 0580/1036] #1567 - SqlUpdate addBatch() ... with named
 parameters errors with PersistenceException: No batched statement found for
 key

---
 .../server/persist/DefaultPersister.java      |  2 +-
 .../tests/rawsql/TestInsertSqlLogging.java    | 31 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 8b2c6340a..ff8cd13c9 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -135,7 +135,7 @@ public final class DefaultPersister implements Persister {
   public int[] executeBatch(SpiSqlUpdate sqlUpdate, SpiTransaction transaction) {
     BatchControl batchControl = transaction.getBatchControl();
     try {
-      return batchControl.execute(sqlUpdate.getSql(), sqlUpdate.isGetGeneratedKeys());
+      return batchControl.execute(sqlUpdate.getGeneratedSql(), sqlUpdate.isGetGeneratedKeys());
     } catch (SQLException e) {
       throw transaction.translate(e.getMessage(), e);
     }
diff --git a/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java b/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java
index 4ff697eae..c5d093962 100644
--- a/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java
+++ b/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java
@@ -75,7 +75,38 @@ public class TestInsertSqlLogging extends BaseTestCase {
 
       txn.commit();
     }
+  }
 
+  @Test
+  public void addBatch_namedParams() {
+
+    Ebean.find(AuditLog.class).where().ge("id", 10000).delete();
+
+    String sql = "insert into audit_log (id, description, modified_description) values (:id, :desc, :modDesc)";
+    SqlUpdate insert = Ebean.createSqlUpdate(sql);
+
+    try (Transaction txn = Ebean.beginTransaction()) {
+
+      insert.setParameter("id", 20000);
+      insert.setParameter("desc", "hello");
+      insert.setParameter("modDesc", "rob");
+      insert.addBatch();
+
+      insert.setParameter("id", 20001);
+      insert.setParameter("desc", "goodbye");
+      insert.setParameter("modDesc", "rob");
+      insert.addBatch();
+
+      insert.setParameter("id", 20002);
+      insert.setParameter("desc", "chow");
+      insert.setParameter("modDesc", "bob");
+      insert.addBatch();
+
+      int[] rows = insert.executeBatch();
+      System.out.println("Rows was " + Arrays.toString(rows));
+
+      txn.commit();
+    }
   }
 
   @Test

From a2ce17aec07ff6b64f9f5d4e0c8d682f95ed51ab Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 30 Nov 2018 22:42:36 +1300
Subject: [PATCH 0581/1036] Add test only - Add test for L2 cache with
 orphanRemoval

---
 .../tests/model/orphanremoval/OrpMaster.java  |  7 +++-
 .../orphanremoval/TestOrphanRemoveO2M.java    | 41 +++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/tests/model/orphanremoval/OrpMaster.java b/src/test/java/org/tests/model/orphanremoval/OrpMaster.java
index 8801d87f7..c21761c0b 100644
--- a/src/test/java/org/tests/model/orphanremoval/OrpMaster.java
+++ b/src/test/java/org/tests/model/orphanremoval/OrpMaster.java
@@ -1,12 +1,16 @@
 package org.tests.model.orphanremoval;
 
+import io.ebean.annotation.Cache;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
 import javax.persistence.Version;
 import java.util.List;
 
+@Cache
 @Entity
 public class OrpMaster {
 
@@ -15,7 +19,8 @@ public class OrpMaster {
 
   String name;
 
-  @OneToMany(orphanRemoval = true, cascade = CascadeType.ALL)
+  @OneToMany(orphanRemoval = true, cascade = CascadeType.ALL)//, mappedBy = "master")
+  @JoinColumn(name = "master_id", referencedColumnName = "id")
   List<OrpDetail> details;
 
   @Version
diff --git a/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java b/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java
index b0c52a12b..87685c910 100644
--- a/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java
+++ b/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java
@@ -33,4 +33,45 @@ public class TestOrphanRemoveO2M extends BaseTestCase {
     assertThat(sql).hasSize(2);
     assertThat(sql.get(0)).contains("delete from orp_detail where id=?");
   }
+
+  @Test
+  public void testCacheUse() {
+
+    // add test data first
+    OrpMaster m0 = new OrpMaster("m2", "master2");
+    m0.getDetails().add(new OrpDetail("d21", "d1"));
+    m0.getDetails().add(new OrpDetail("d22", "d2"));
+
+    Ebean.save(m0);
+
+    OrpMaster m1 = Ebean.find(OrpMaster.class, "m2");
+
+    m1.getDetails().clear();
+    m1.getDetails().add(new OrpDetail("d23", "d3"));
+    Ebean.save(m1);
+
+    m1 = Ebean.find(OrpMaster.class, "m2");
+    // Expect only one.
+    assertThat(m1.getDetails()).hasSize(1);
+    assertThat(m1.getDetails()).extracting("id").containsExactly("d23");
+
+    m1.getDetails().clear();
+    m1.getDetails().add(new OrpDetail("d24", "d4"));
+    m1.getDetails().add(new OrpDetail("d25", "d5"));
+    Ebean.save(m1);
+
+    m1 = Ebean.find(OrpMaster.class, "m2");
+    assertThat(m1.getDetails()).hasSize(2);
+    assertThat(m1.getDetails()).extracting("id").containsExactly("d24", "d25");
+
+
+    m1 = Ebean.find(OrpMaster.class)
+      .setId("m2")
+      .setUseCache(false)
+      .findOne();
+
+    // Expect only one.
+    assertThat(m1.getDetails()).hasSize(2);
+    assertThat(m1.getDetails()).extracting("id").containsExactly("d24", "d25");
+  }
 }

From 6d5e0c4766be597c0c693e0549d291c7031d6a12 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 30 Nov 2018 23:41:23 +1300
Subject: [PATCH 0582/1036] Add test only - Add test for L2 cache with
 orphanRemoval

---
 src/test/java/org/tests/model/orphanremoval/OrpMaster.java    | 4 +---
 .../org/tests/model/orphanremoval/TestOrphanRemoveO2M.java    | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/tests/model/orphanremoval/OrpMaster.java b/src/test/java/org/tests/model/orphanremoval/OrpMaster.java
index c21761c0b..2bba0d742 100644
--- a/src/test/java/org/tests/model/orphanremoval/OrpMaster.java
+++ b/src/test/java/org/tests/model/orphanremoval/OrpMaster.java
@@ -5,7 +5,6 @@ import io.ebean.annotation.Cache;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
 import javax.persistence.Version;
 import java.util.List;
@@ -19,8 +18,7 @@ public class OrpMaster {
 
   String name;
 
-  @OneToMany(orphanRemoval = true, cascade = CascadeType.ALL)//, mappedBy = "master")
-  @JoinColumn(name = "master_id", referencedColumnName = "id")
+  @OneToMany(orphanRemoval = true, cascade = CascadeType.ALL, mappedBy = "master")
   List<OrpDetail> details;
 
   @Version
diff --git a/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java b/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java
index 87685c910..82f22a6f9 100644
--- a/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java
+++ b/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java
@@ -45,6 +45,7 @@ public class TestOrphanRemoveO2M extends BaseTestCase {
     Ebean.save(m0);
 
     OrpMaster m1 = Ebean.find(OrpMaster.class, "m2");
+    m1.getDetails().size();
 
     m1.getDetails().clear();
     m1.getDetails().add(new OrpDetail("d23", "d3"));

From 315b39813b597ff58640e24aaffd136e30cedc21 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 30 Nov 2018 23:46:11 +1300
Subject: [PATCH 0583/1036] #1568 - @OneToMany with orphanRemoval=true ... with
 @Cache (and not a @ManyToOne) doesn't remove orphans after cache hit

---
 .../server/persist/SaveManyBeans.java         |  2 +-
 .../tests/model/orphanremoval/OrpDetail2.java | 57 +++++++++++++++++
 .../tests/model/orphanremoval/OrpMaster2.java | 63 +++++++++++++++++++
 .../TestOrphanRemoveO2MFlat.java              | 54 ++++++++++++++++
 4 files changed, 175 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/org/tests/model/orphanremoval/OrpDetail2.java
 create mode 100644 src/test/java/org/tests/model/orphanremoval/OrpMaster2.java
 create mode 100644 src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java

diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
index 52d75b4fd..8190e0726 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
@@ -344,7 +344,7 @@ class SaveManyBeans extends SaveManyBase {
         for (Object removedBean : modifyRemovals) {
           if (removedBean instanceof EntityBean) {
             EntityBean eb = (EntityBean) removedBean;
-            if (eb._ebean_getIntercept().isLoaded()) {
+            if (!eb._ebean_getIntercept().isNew()) {
               // only delete if the bean was loaded meaning that it is known to exist in the DB
               persister.deleteRequest(persister.createPublishRequest(removedBean, transaction, PersistRequest.Type.DELETE, request.getFlags()));
             }
diff --git a/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java b/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java
new file mode 100644
index 000000000..4f369ce6b
--- /dev/null
+++ b/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java
@@ -0,0 +1,57 @@
+package org.tests.model.orphanremoval;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Version;
+
+@Entity
+public class OrpDetail2 {
+
+  @Id
+  String id;
+
+  String detail;
+
+  String masterId;
+
+  @Version
+  long version;
+
+  public OrpDetail2(String id, String detail, String masterId) {
+    this.id = id;
+    this.detail = detail;
+    this.masterId = masterId;
+  }
+
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public String getMasterId() {
+    return masterId;
+  }
+
+  public void setMasterId(String masterId) {
+    this.masterId = masterId;
+  }
+
+  public String getDetail() {
+    return detail;
+  }
+
+  public void setDetail(String detail) {
+    this.detail = detail;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java b/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java
new file mode 100644
index 000000000..a6d65f14f
--- /dev/null
+++ b/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java
@@ -0,0 +1,63 @@
+package org.tests.model.orphanremoval;
+
+import io.ebean.annotation.Cache;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Version;
+import java.util.List;
+
+@Cache
+@Entity
+public class OrpMaster2 {
+
+  @Id
+  String id;
+
+  String name;
+
+  @OneToMany(orphanRemoval = true, cascade = CascadeType.ALL)
+  List<OrpDetail2> details;
+
+  @Version
+  long version;
+
+  public OrpMaster2(String id, String name) {
+    this.id = id;
+    this.name = name;
+  }
+
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public List<OrpDetail2> getDetails() {
+    return details;
+  }
+
+  public void setDetails(List<OrpDetail2> details) {
+    this.details = details;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java b/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java
new file mode 100644
index 000000000..7d929cf90
--- /dev/null
+++ b/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java
@@ -0,0 +1,54 @@
+package org.tests.model.orphanremoval;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestOrphanRemoveO2MFlat extends BaseTestCase {
+
+  @Test
+  public void testCacheUse() {
+
+    // add test data first
+    OrpMaster2 m0 = new OrpMaster2("m2", "master2");
+    m0.getDetails().add(new OrpDetail2("d21", "d1", "m2"));
+    m0.getDetails().add(new OrpDetail2("d22", "d2", "m2"));
+
+    Ebean.save(m0);
+
+    OrpMaster2 m1 = Ebean.find(OrpMaster2.class, "m2");
+    m1.getDetails().size();
+
+    m1.getDetails().clear();
+    m1.getDetails().add(new OrpDetail2("d23", "d3", "m2"));
+    Ebean.save(m1);
+
+    m1 = Ebean.find(OrpMaster2.class, "m2");
+    // Expect only one.
+    assertThat(m1.getDetails()).hasSize(1);
+    assertThat(m1.getDetails()).extracting("id").containsExactly("d23");
+
+    m1.getDetails().clear();
+    m1.getDetails().add(new OrpDetail2("d24", "d4", "m2"));
+    m1.getDetails().add(new OrpDetail2("d25", "d5", "m2"));
+    Ebean.save(m1);
+
+    m1 = Ebean.find(OrpMaster2.class, "m2");
+    assertThat(m1.getDetails()).hasSize(2);
+    assertThat(m1.getDetails()).extracting("id").containsExactly("d24", "d25");
+
+
+    m1 = Ebean.find(OrpMaster2.class)
+      .setId("m2")
+      .setUseCache(false)
+      .findOne();
+
+    // Expect only one.
+    assertThat(m1.getDetails()).hasSize(2);
+    assertThat(m1.getDetails()).extracting("id").containsExactly("d24", "d25");
+  }
+
+
+}

From e876ef8d877aa3e5350606634655d1a80870e0fb Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 3 Dec 2018 21:07:33 +1300
Subject: [PATCH 0584/1036] #1559 - @Lob with @ElementCollection

---
 .../deploy/parse/AnnotationAssocManys.java    |  5 ++
 .../model/elementcollection/EcmcPerson.java   | 71 +++++++++++++++++++
 .../TestElementCollectionBasicMapAsLob.java   | 39 ++++++++++
 3 files changed, 115 insertions(+)
 create mode 100644 src/test/java/org/tests/model/elementcollection/EcmcPerson.java
 create mode 100644 src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index 06ff2122d..1914051aa 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -32,6 +32,7 @@ import javax.persistence.ElementCollection;
 import javax.persistence.EnumType;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
+import javax.persistence.Lob;
 import javax.persistence.ManyToMany;
 import javax.persistence.MapKey;
 import javax.persistence.MapKeyColumn;
@@ -271,6 +272,10 @@ class AnnotationAssocManys extends AnnotationParser {
         valueProp.setDbLength(column.length());
         valueProp.setDbScale(column.scale());
       }
+      Lob lob = get(prop, Lob.class);
+      if (lob != null) {
+        util.setLobType(valueProp);
+      }
       elementDescriptor.addBeanProperty(valueProp);
     }
 
diff --git a/src/test/java/org/tests/model/elementcollection/EcmcPerson.java b/src/test/java/org/tests/model/elementcollection/EcmcPerson.java
new file mode 100644
index 000000000..fe7d326e6
--- /dev/null
+++ b/src/test/java/org/tests/model/elementcollection/EcmcPerson.java
@@ -0,0 +1,71 @@
+package org.tests.model.elementcollection;
+
+import io.ebean.annotation.Cache;
+
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Lob;
+import javax.persistence.MapKeyColumn;
+import javax.persistence.Version;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+@Cache
+@Entity
+public class EcmcPerson {
+
+  @Id
+  long id;
+
+  String name;
+
+  @ElementCollection
+  @MapKeyColumn(name = "type", length = 4)
+  @Lob
+  Map<String, String> phoneNumbers = new LinkedHashMap<>();
+
+  @Version
+  long version;
+
+  public EcmcPerson(String name) {
+    this.name = name;
+  }
+
+  @Override
+  public String toString() {
+    return "person id:" + id + " name:" + name + " phs:" + phoneNumbers;
+  }
+
+  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 Map<String, String> getPhoneNumbers() {
+    return phoneNumbers;
+  }
+
+  public void setPhoneNumbers(Map<String, String> phoneNumbers) {
+    this.phoneNumbers = phoneNumbers;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java
new file mode 100644
index 000000000..60e140434
--- /dev/null
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java
@@ -0,0 +1,39 @@
+package org.tests.model.elementcollection;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestElementCollectionBasicMapAsLob extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    LoggedSqlCollector.start();
+
+    EcmcPerson person = new EcmcPerson("Lob021");
+    person.getPhoneNumbers().put("home", "021 1234");
+    person.getPhoneNumbers().put("work", "021 4321");
+    Ebean.save(person);
+
+    List<String> sql = LoggedSqlCollector.current();
+    if (isPersistBatchOnCascade()) {
+      assertThat(sql).hasSize(2);
+      assertThat(sql.get(0)).contains("insert into ecmc_person");
+      assertThat(sql.get(1)).contains("insert into ecmc_person_phone");
+    } else {
+      assertThat(sql).hasSize(3);
+      assertThat(sql.get(0)).contains("insert into ecmc_person");
+      assertThat(sql.get(1)).contains("insert into ecmc_person_phone");
+      assertThat(sql.get(2)).contains("insert into ecmc_person_phone");
+    }
+
+    LoggedSqlCollector.stop();
+  }
+
+}

From a8892292fbcd3e067ff4ce184502972131316e30 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 3 Dec 2018 22:05:18 +1300
Subject: [PATCH 0585/1036] #1569 - Ebean generates wrong ddl (datetime(6) vs
 timestamp) for H2 with `@History` annotation

---
 pom.xml                                       |  2 +-
 .../ddlgeneration/platform/H2HistoryDdl.java  |  2 +
 .../migrationtest-history/1.0__initial.sql    | 12 +--
 .../migrationtest/h2/1.0__initial.sql         | 76 +++++++++++--------
 .../dbmigration/migrationtest/h2/1.1.sql      | 14 ++--
 5 files changed, 61 insertions(+), 45 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7965ca52b..c733942fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -238,7 +238,7 @@
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
-      <version>1.4.196</version>
+      <version>1.4.197</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
index 4240c30d9..a1f8f1806 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
@@ -15,6 +15,8 @@ public class H2HistoryDdl extends DbTriggerBasedHistoryDdl {
   private static final String TRIGGER_CLASS = H2HistoryTrigger.class.getName();
 
   public H2HistoryDdl() {
+    this.sysPeriodType = "timestamp";
+    this.currentTimestamp = "now()";
   }
 
   @Override
diff --git a/src/test/resources/dbmigration/migrationtest-history/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest-history/1.0__initial.sql
index 16fa48f95..68987746a 100644
--- a/src/test/resources/dbmigration/migrationtest-history/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest-history/1.0__initial.sql
@@ -5,12 +5,14 @@ create table migtest_e_history7 (
   constraint pk_migtest_e_history7 primary key (id)
 );
 
-alter table migtest_e_history7 add column sys_period_start datetime(6) default now(6);
-alter table migtest_e_history7 add column sys_period_end datetime(6);
+alter table migtest_e_history7
+  add column sys_period_start timestamp default now();
+alter table migtest_e_history7
+  add column sys_period_end timestamp;
 create table migtest_e_history7_history(
-  id                            integer,
-  sys_period_start              datetime(6),
-  sys_period_end                datetime(6)
+                                         id               integer,
+                                         sys_period_start timestamp,
+                                         sys_period_end   timestamp
 );
 create view migtest_e_history7_with_history as select * from migtest_e_history7 union all select * from migtest_e_history7_history;
 
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
index 204b1f555..30ba59c08 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
@@ -170,56 +170,66 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
-alter table migtest_e_history2 add column sys_period_start datetime(6) default now(6);
-alter table migtest_e_history2 add column sys_period_end datetime(6);
+alter table migtest_e_history2
+  add column sys_period_start timestamp default now();
+alter table migtest_e_history2
+  add column sys_period_end timestamp;
 create table migtest_e_history2_history(
-  id                            integer,
-  test_string                   varchar(255),
-  obsolete_string1              varchar(255),
-  obsolete_string2              varchar(255),
-  sys_period_start              datetime(6),
-  sys_period_end                datetime(6)
+                                         id               integer,
+                                         test_string      varchar(255),
+                                         obsolete_string1 varchar(255),
+                                         obsolete_string2 varchar(255),
+                                         sys_period_start timestamp,
+                                         sys_period_end   timestamp
 );
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 
-alter table migtest_e_history3 add column sys_period_start datetime(6) default now(6);
-alter table migtest_e_history3 add column sys_period_end datetime(6);
+alter table migtest_e_history3
+  add column sys_period_start timestamp default now();
+alter table migtest_e_history3
+  add column sys_period_end timestamp;
 create table migtest_e_history3_history(
-  id                            integer,
-  test_string                   varchar(255),
-  sys_period_start              datetime(6),
-  sys_period_end                datetime(6)
+                                         id               integer,
+                                         test_string      varchar(255),
+                                         sys_period_start timestamp,
+                                         sys_period_end   timestamp
 );
 create view migtest_e_history3_with_history as select * from migtest_e_history3 union all select * from migtest_e_history3_history;
 
-alter table migtest_e_history4 add column sys_period_start datetime(6) default now(6);
-alter table migtest_e_history4 add column sys_period_end datetime(6);
+alter table migtest_e_history4
+  add column sys_period_start timestamp default now();
+alter table migtest_e_history4
+  add column sys_period_end timestamp;
 create table migtest_e_history4_history(
-  id                            integer,
-  test_number                   integer,
-  sys_period_start              datetime(6),
-  sys_period_end                datetime(6)
+                                         id               integer,
+                                         test_number      integer,
+                                         sys_period_start timestamp,
+                                         sys_period_end   timestamp
 );
 create view migtest_e_history4_with_history as select * from migtest_e_history4 union all select * from migtest_e_history4_history;
 
-alter table migtest_e_history5 add column sys_period_start datetime(6) default now(6);
-alter table migtest_e_history5 add column sys_period_end datetime(6);
+alter table migtest_e_history5
+  add column sys_period_start timestamp default now();
+alter table migtest_e_history5
+  add column sys_period_end timestamp;
 create table migtest_e_history5_history(
-  id                            integer,
-  test_number                   integer,
-  sys_period_start              datetime(6),
-  sys_period_end                datetime(6)
+                                         id               integer,
+                                         test_number      integer,
+                                         sys_period_start timestamp,
+                                         sys_period_end   timestamp
 );
 create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history;
 
-alter table migtest_e_history6 add column sys_period_start datetime(6) default now(6);
-alter table migtest_e_history6 add column sys_period_end datetime(6);
+alter table migtest_e_history6
+  add column sys_period_start timestamp default now();
+alter table migtest_e_history6
+  add column sys_period_end timestamp;
 create table migtest_e_history6_history(
-  id                            integer,
-  test_number1                  integer,
-  test_number2                  integer,
-  sys_period_start              datetime(6),
-  sys_period_end                datetime(6)
+                                         id               integer,
+                                         test_number1     integer,
+                                         test_number2     integer,
+                                         sys_period_start timestamp,
+                                         sys_period_end   timestamp
 );
 create view migtest_e_history6_with_history as select * from migtest_e_history6 union all select * from migtest_e_history6_history;
 
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.1.sql b/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
index 9c8af60f4..75be16374 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
@@ -115,13 +115,15 @@ alter table migtest_ckey_parent add constraint fk_migtest_ckey_parent_assoc_id f
 
 alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict on update restrict;
 
-alter table migtest_e_history add column sys_period_start datetime(6) default now(6);
-alter table migtest_e_history add column sys_period_end datetime(6);
+alter table migtest_e_history
+  add column sys_period_start timestamp default now();
+alter table migtest_e_history
+  add column sys_period_end timestamp;
 create table migtest_e_history_history(
-  id                            integer,
-  test_string                   bigint,
-  sys_period_start              datetime(6),
-  sys_period_end                datetime(6)
+                                        id               integer,
+                                        test_string      bigint,
+                                        sys_period_start timestamp,
+                                        sys_period_end   timestamp
 );
 create view migtest_e_history_with_history as select * from migtest_e_history union all select * from migtest_e_history_history;
 

From 05df47c0d7f7f2061cd63cbf3687d66b48fb7bb2 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 3 Dec 2018 22:11:47 +1300
Subject: [PATCH 0586/1036] #1569 - Ebean generates wrong ddl (datetime(6) vs
 timestamp) for H2 with `@History` annotation

---
 .../migrationtest-history/1.0__initial.sql    | 12 ++-
 .../migrationtest/h2/1.0__initial.sql         | 76 ++++++++-----------
 .../dbmigration/migrationtest/h2/1.1.sql      | 14 ++--
 3 files changed, 44 insertions(+), 58 deletions(-)

diff --git a/src/test/resources/dbmigration/migrationtest-history/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest-history/1.0__initial.sql
index 68987746a..344badd88 100644
--- a/src/test/resources/dbmigration/migrationtest-history/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest-history/1.0__initial.sql
@@ -5,14 +5,12 @@ create table migtest_e_history7 (
   constraint pk_migtest_e_history7 primary key (id)
 );
 
-alter table migtest_e_history7
-  add column sys_period_start timestamp default now();
-alter table migtest_e_history7
-  add column sys_period_end timestamp;
+alter table migtest_e_history7 add column sys_period_start timestamp default now();
+alter table migtest_e_history7 add column sys_period_end timestamp;
 create table migtest_e_history7_history(
-                                         id               integer,
-                                         sys_period_start timestamp,
-                                         sys_period_end   timestamp
+  id                            integer,
+  sys_period_start              timestamp,
+  sys_period_end                timestamp
 );
 create view migtest_e_history7_with_history as select * from migtest_e_history7 union all select * from migtest_e_history7_history;
 
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
index 30ba59c08..f90dcc0a0 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
@@ -170,66 +170,56 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
-alter table migtest_e_history2
-  add column sys_period_start timestamp default now();
-alter table migtest_e_history2
-  add column sys_period_end timestamp;
+alter table migtest_e_history2 add column sys_period_start timestamp default now();
+alter table migtest_e_history2 add column sys_period_end timestamp;
 create table migtest_e_history2_history(
-                                         id               integer,
-                                         test_string      varchar(255),
-                                         obsolete_string1 varchar(255),
-                                         obsolete_string2 varchar(255),
-                                         sys_period_start timestamp,
-                                         sys_period_end   timestamp
+  id                            integer,
+  test_string                   varchar(255),
+  obsolete_string1              varchar(255),
+  obsolete_string2              varchar(255),
+  sys_period_start              timestamp,
+  sys_period_end                timestamp
 );
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 
-alter table migtest_e_history3
-  add column sys_period_start timestamp default now();
-alter table migtest_e_history3
-  add column sys_period_end timestamp;
+alter table migtest_e_history3 add column sys_period_start timestamp default now();
+alter table migtest_e_history3 add column sys_period_end timestamp;
 create table migtest_e_history3_history(
-                                         id               integer,
-                                         test_string      varchar(255),
-                                         sys_period_start timestamp,
-                                         sys_period_end   timestamp
+  id                            integer,
+  test_string                   varchar(255),
+  sys_period_start              timestamp,
+  sys_period_end                timestamp
 );
 create view migtest_e_history3_with_history as select * from migtest_e_history3 union all select * from migtest_e_history3_history;
 
-alter table migtest_e_history4
-  add column sys_period_start timestamp default now();
-alter table migtest_e_history4
-  add column sys_period_end timestamp;
+alter table migtest_e_history4 add column sys_period_start timestamp default now();
+alter table migtest_e_history4 add column sys_period_end timestamp;
 create table migtest_e_history4_history(
-                                         id               integer,
-                                         test_number      integer,
-                                         sys_period_start timestamp,
-                                         sys_period_end   timestamp
+  id                            integer,
+  test_number                   integer,
+  sys_period_start              timestamp,
+  sys_period_end                timestamp
 );
 create view migtest_e_history4_with_history as select * from migtest_e_history4 union all select * from migtest_e_history4_history;
 
-alter table migtest_e_history5
-  add column sys_period_start timestamp default now();
-alter table migtest_e_history5
-  add column sys_period_end timestamp;
+alter table migtest_e_history5 add column sys_period_start timestamp default now();
+alter table migtest_e_history5 add column sys_period_end timestamp;
 create table migtest_e_history5_history(
-                                         id               integer,
-                                         test_number      integer,
-                                         sys_period_start timestamp,
-                                         sys_period_end   timestamp
+  id                            integer,
+  test_number                   integer,
+  sys_period_start              timestamp,
+  sys_period_end                timestamp
 );
 create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history;
 
-alter table migtest_e_history6
-  add column sys_period_start timestamp default now();
-alter table migtest_e_history6
-  add column sys_period_end timestamp;
+alter table migtest_e_history6 add column sys_period_start timestamp default now();
+alter table migtest_e_history6 add column sys_period_end timestamp;
 create table migtest_e_history6_history(
-                                         id               integer,
-                                         test_number1     integer,
-                                         test_number2     integer,
-                                         sys_period_start timestamp,
-                                         sys_period_end   timestamp
+  id                            integer,
+  test_number1                  integer,
+  test_number2                  integer,
+  sys_period_start              timestamp,
+  sys_period_end                timestamp
 );
 create view migtest_e_history6_with_history as select * from migtest_e_history6 union all select * from migtest_e_history6_history;
 
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.1.sql b/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
index 75be16374..2732f5d8e 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
@@ -115,15 +115,13 @@ alter table migtest_ckey_parent add constraint fk_migtest_ckey_parent_assoc_id f
 
 alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict on update restrict;
 
-alter table migtest_e_history
-  add column sys_period_start timestamp default now();
-alter table migtest_e_history
-  add column sys_period_end timestamp;
+alter table migtest_e_history add column sys_period_start timestamp default now();
+alter table migtest_e_history add column sys_period_end timestamp;
 create table migtest_e_history_history(
-                                        id               integer,
-                                        test_string      bigint,
-                                        sys_period_start timestamp,
-                                        sys_period_end   timestamp
+  id                            integer,
+  test_string                   bigint,
+  sys_period_start              timestamp,
+  sys_period_end                timestamp
 );
 create view migtest_e_history_with_history as select * from migtest_e_history union all select * from migtest_e_history_history;
 

From fcaf11f262b8e43f7249b0d2e8b488ce0989b87c Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 3 Dec 2018 22:14:46 +1300
Subject: [PATCH 0587/1036] [maven-release-plugin] prepare release
 ebean-11.28.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c733942fa..c81892107 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.28.2-SNAPSHOT</version>
+  <version>11.28.2</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.28.2</tag>
   </scm>
 
   <profiles>

From ebf96c87bfefa366b0c4a40edc172c0b241e1e07 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 3 Dec 2018 22:14:59 +1300
Subject: [PATCH 0588/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c81892107..5f28b77af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.28.2</version>
+  <version>11.28.3-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.28.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 0405ceb96cb388b9fb016e89b2aaf052a7a29b92 Mon Sep 17 00:00:00 2001
From: Rien <info@nentjes.com>
Date: Wed, 5 Dec 2018 09:49:27 +0100
Subject: [PATCH 0589/1036] NPE in cacheable bean with embeddedid on delete
 (#1570)

---
 .../tests/compositekeys/TestCKeyDelete.java   | 19 +++++++++++++++++++
 .../org/tests/model/basic/CKeyParent.java     |  4 ++++
 2 files changed, 23 insertions(+)

diff --git a/src/test/java/org/tests/compositekeys/TestCKeyDelete.java b/src/test/java/org/tests/compositekeys/TestCKeyDelete.java
index 1b4131eed..f25d44c0a 100644
--- a/src/test/java/org/tests/compositekeys/TestCKeyDelete.java
+++ b/src/test/java/org/tests/compositekeys/TestCKeyDelete.java
@@ -32,4 +32,23 @@ public class TestCKeyDelete extends BaseTestCase {
     Assert.assertNull(notFound);
 
   }
+
+  @Test
+  public void testDeleteWhere() {
+
+    CKeyParentId id = new CKeyParentId(100, "deleteMe");
+    CKeyParentId searchId = new CKeyParentId(100, "deleteMe");
+
+    CKeyParent p = new CKeyParent();
+    p.setId(id);
+    p.setName("testDelete");
+
+    Ebean.save(p);
+
+    Ebean.createQuery(CKeyParent.class).where().eq("id.oneKey", 100).delete();
+
+    CKeyParent found = Ebean.find(CKeyParent.class).where().idEq(searchId).findOne();
+
+    Assert.assertNull(found);
+  }
 }
diff --git a/src/test/java/org/tests/model/basic/CKeyParent.java b/src/test/java/org/tests/model/basic/CKeyParent.java
index 27b68e9c0..f5e387b09 100644
--- a/src/test/java/org/tests/model/basic/CKeyParent.java
+++ b/src/test/java/org/tests/model/basic/CKeyParent.java
@@ -1,5 +1,8 @@
 package org.tests.model.basic;
 
+import io.ebean.annotation.Cache;
+
+import javax.persistence.Cacheable;
 import javax.persistence.CascadeType;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
@@ -10,6 +13,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Entity
+@Cache
 public class CKeyParent {
 
   @EmbeddedId

From e4088c5fbe45ebfb61e89c51d62e73d4ed52adb2 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 5 Dec 2018 23:03:15 +1300
Subject: [PATCH 0590/1036] #1571 - NPE in cacheable bean with embeddedid on
 delete

---
 .../server/deploy/AssocOneHelp.java           | 19 +++++++++
 .../server/deploy/AssocOneHelpEmbedded.java   | 42 +++++++++++++++----
 .../server/deploy/BeanProperty.java           | 18 ++++++++
 .../server/deploy/BeanPropertyAssocOne.java   | 22 ++++++----
 .../DynamicPropertyAggregationFormula.java    | 11 +++++
 .../query/CQueryFetchSingleAttribute.java     | 10 ++---
 .../server/query/CQueryPlan.java              |  6 +--
 .../server/query/STreeProperty.java           |  3 +-
 .../server/query/STreePropertyAssocOne.java   |  4 +-
 .../server/query/SqlTreeNode.java             |  6 +--
 .../server/query/SqlTreeNodeBean.java         | 12 +++---
 .../server/query/SqlTreeNodeExtraJoin.java    |  2 +-
 .../query/SqlTreeNodeManyWhereJoin.java       |  2 +-
 .../server/type/ScalarDataReader.java         | 10 -----
 .../ebeaninternal/server/type/ScalarType.java |  6 +--
 .../tests/compositekeys/TestCKeyDelete.java   | 31 +++++++++-----
 16 files changed, 142 insertions(+), 62 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelp.java b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelp.java
index adfb689a2..0fbf29da6 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelp.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.deploy;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.PersistenceContext;
 import io.ebeaninternal.server.query.SqlJoinType;
+import io.ebeaninternal.server.type.DataReader;
 
 import java.sql.SQLException;
 
@@ -28,6 +29,24 @@ abstract class AssocOneHelp {
     property.targetIdBinder.loadIgnore(ctx);
   }
 
+  /**
+   * Read and return the property.
+   */
+  Object read(DataReader reader) throws SQLException {
+    return property.read(reader);
+  }
+
+  /**
+   * Read and return the property setting value into the bean.
+   */
+  Object readSet(DataReader reader, EntityBean bean) throws SQLException {
+    Object val = read(reader);
+    if (bean != null) {
+      property.setValue(bean, val);
+    }
+    return val;
+  }
+
   /**
    * Read and return the bean.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpEmbedded.java b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpEmbedded.java
index b15650e53..a767b2e14 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpEmbedded.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpEmbedded.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.deploy;
 
 import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.type.DataReader;
 
 import java.sql.SQLException;
 
@@ -9,14 +10,41 @@ import java.sql.SQLException;
  */
 final class AssocOneHelpEmbedded extends AssocOneHelp {
 
-  public AssocOneHelpEmbedded(BeanPropertyAssocOne<?> property) {
+  AssocOneHelpEmbedded(BeanPropertyAssocOne<?> property) {
     super(property);
   }
 
   @Override
   void loadIgnore(DbReadContext ctx) {
-    for (int i = 0; i < property.embeddedProps.length; i++) {
-      property.embeddedProps[i].loadIgnore(ctx);
+    for (BeanProperty property : property.embeddedProps) {
+      property.loadIgnore(ctx);
+    }
+  }
+
+  @Override
+  Object readSet(DataReader reader, EntityBean bean) throws SQLException {
+    Object dbVal = read(reader);
+    if (bean != null) {
+      property.setValue(bean, dbVal);
+    }
+    return dbVal;
+  }
+
+  @Override
+  Object read(DataReader reader) throws SQLException {
+
+    EntityBean embeddedBean = property.targetDescriptor.createEntityBean();
+    boolean notNull = false;
+    for (BeanProperty property : property.embeddedProps) {
+      Object value = property.readSet(reader, embeddedBean);
+      if (value != null) {
+        notNull = true;
+      }
+    }
+    if (notNull) {
+      return embeddedBean;
+    } else {
+      return null;
     }
   }
 
@@ -39,8 +67,8 @@ final class AssocOneHelpEmbedded extends AssocOneHelp {
     EntityBean embeddedBean = property.targetDescriptor.createEntityBean();
 
     boolean notNull = false;
-    for (int i = 0; i < property.embeddedProps.length; i++) {
-      Object value = property.embeddedProps[i].readSet(ctx, embeddedBean);
+    for (BeanProperty property : property.embeddedProps) {
+      Object value = property.readSet(ctx, embeddedBean);
       if (value != null) {
         notNull = true;
       }
@@ -55,8 +83,8 @@ final class AssocOneHelpEmbedded extends AssocOneHelp {
 
   @Override
   void appendSelect(DbSqlContext ctx, boolean subQuery) {
-    for (int i = 0; i < property.embeddedProps.length; i++) {
-      property.embeddedProps[i].appendSelect(ctx, subQuery);
+    for (BeanProperty property : property.embeddedProps) {
+      property.appendSelect(ctx, subQuery);
     }
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 6641c158f..6ae467d44 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -28,6 +28,7 @@ import io.ebeaninternal.server.query.STreeProperty;
 import io.ebeaninternal.server.query.SqlBeanLoad;
 import io.ebeaninternal.server.query.SqlJoinType;
 import io.ebeaninternal.server.type.DataBind;
+import io.ebeaninternal.server.type.DataReader;
 import io.ebeaninternal.server.type.LocalEncryptedType;
 import io.ebeaninternal.server.type.ScalarType;
 import io.ebeaninternal.server.type.ScalarTypeBoolean;
@@ -640,6 +641,23 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     }
   }
 
+  @Override
+  public Object read(DataReader reader) throws SQLException {
+    return scalarType.read(reader);
+  }
+
+  public Object readSet(DataReader reader, EntityBean bean) throws SQLException {
+    try {
+      Object value = scalarType.read(reader);
+      if (bean != null) {
+        setValue(bean, value);
+      }
+      return value;
+    } catch (Exception e) {
+      throw new PersistenceException("Error readSet on " + descriptor + "." + name, e);
+    }
+  }
+
   public Object read(DbReadContext ctx) throws SQLException {
     return scalarType.read(ctx.getDataReader());
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index bd3455d90..9a5f7c1c2 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -21,7 +21,8 @@ import io.ebeaninternal.server.el.ElPropertyValue;
 import io.ebeaninternal.server.query.STreePropertyAssocOne;
 import io.ebeaninternal.server.query.SqlBeanLoad;
 import io.ebeaninternal.server.query.SqlJoinType;
-import io.ebeaninternal.server.type.ScalarType;
+import io.ebeaninternal.server.type.DataReader;
+import io.ebeaninternal.server.type.ScalarDataReader;
 
 import javax.persistence.PersistenceException;
 import java.io.IOException;
@@ -434,8 +435,8 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
   }
 
   @Override
-  public ScalarType<?> getIdScalarType() {
-    return targetDescriptor.getIdProperty().getScalarType();
+  public ScalarDataReader<?> getIdReader() {
+    return targetDescriptor.getIdProperty();
   }
 
   /**
@@ -583,18 +584,23 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     }
   }
 
+  @Override
+  public Object readSet(DataReader reader, EntityBean bean) throws SQLException {
+    return localHelp.readSet(reader, bean);
+  }
+
+  @Override
+  public Object read(DataReader reader) throws SQLException {
+    return localHelp.read(reader);
+  }
+
   @Override
   public Object readSet(DbReadContext ctx, EntityBean bean) throws SQLException {
     return localHelp.readSet(ctx, bean);
   }
 
-  /**
-   * Read the data from the resultSet effectively ignoring it and returning null.
-   */
   @Override
   public Object read(DbReadContext ctx) throws SQLException {
-    // just read the resultSet incrementing the column index
-    // pass in null for the bean so any data read is ignored
     return localHelp.read(ctx);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
index d238e7ca2..8b1d95561 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
@@ -1,9 +1,11 @@
 package io.ebeaninternal.server.deploy;
 
 import io.ebeaninternal.server.query.SqlBeanLoad;
+import io.ebeaninternal.server.type.DataReader;
 import io.ebeaninternal.server.type.ScalarType;
 
 import javax.persistence.PersistenceException;
+import java.sql.SQLException;
 
 /**
  * Dynamic property based on aggregation (max, min, avg, count).
@@ -36,6 +38,15 @@ class DynamicPropertyAggregationFormula extends DynamicPropertyBase {
     return aggregate;
   }
 
+  @Override
+  public Object read(DataReader dataReader) throws SQLException {
+    try {
+      return scalarType.read(dataReader);
+    } catch (Exception e) {
+      throw new PersistenceException("Error loading on " + fullName, e);
+    }
+  }
+
   @Override
   public void load(SqlBeanLoad sqlBeanLoad) {
 
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java b/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
index 3b8b8ef01..061a35b71 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
@@ -1,14 +1,14 @@
 package io.ebeaninternal.server.query;
 
-import io.ebean.util.JdbcClose;
 import io.ebean.CountedValue;
+import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.SpiProfileTransactionEvent;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.type.RsetDataReader;
-import io.ebeaninternal.server.type.ScalarType;
+import io.ebeaninternal.server.type.ScalarDataReader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -60,7 +60,7 @@ class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent {
 
   private int rowCount;
 
-  private final ScalarType<?> scalarType;
+  private final ScalarDataReader<?> reader;
 
   private final boolean containsCounts;
 
@@ -77,7 +77,7 @@ class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent {
     this.desc = request.getBeanDescriptor();
     this.predicates = predicates;
     this.containsCounts = containsCounts;
-    this.scalarType = queryPlan.getSingleAttributeScalarType();
+    this.reader = queryPlan.getSingleAttributeScalarType();
     query.setGeneratedSql(sql);
   }
 
@@ -106,7 +106,7 @@ class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent {
 
       List<Object> result = new ArrayList<>();
       while (dataReader.next()) {
-        Object value = scalarType.read(dataReader);
+        Object value = reader.read(dataReader);
         if (containsCounts) {
           value = new CountedValue<>(value, dataReader.getLong());
         }
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
index 7b4b27e18..657a2bdcc 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
@@ -15,7 +15,7 @@ import io.ebeaninternal.server.query.CQueryPlanStats.Snapshot;
 import io.ebeaninternal.server.type.DataBind;
 import io.ebeaninternal.server.type.DataReader;
 import io.ebeaninternal.server.type.RsetDataReader;
-import io.ebeaninternal.server.type.ScalarType;
+import io.ebeaninternal.server.type.ScalarDataReader;
 import io.ebeaninternal.server.util.Md5;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -286,8 +286,8 @@ public class CQueryPlan {
     return stats.getLastQueryTime();
   }
 
-  ScalarType<?> getSingleAttributeScalarType() {
-    return sqlTree.getRootNode().getSingleAttributeScalarType();
+  ScalarDataReader<?> getSingleAttributeScalarType() {
+    return sqlTree.getRootNode().getSingleAttributeReader();
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/query/STreeProperty.java b/src/main/java/io/ebeaninternal/server/query/STreeProperty.java
index 340766e9a..b0c2ee916 100644
--- a/src/main/java/io/ebeaninternal/server/query/STreeProperty.java
+++ b/src/main/java/io/ebeaninternal/server/query/STreeProperty.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.query;
 
 import io.ebeaninternal.server.deploy.DbReadContext;
 import io.ebeaninternal.server.deploy.DbSqlContext;
+import io.ebeaninternal.server.type.ScalarDataReader;
 import io.ebeaninternal.server.type.ScalarType;
 
 import java.util.List;
@@ -11,7 +12,7 @@ import java.util.List;
  * <p>
  * A BeanProperty or a dynamically created property based on formula.
  */
-public interface STreeProperty {
+public interface STreeProperty extends ScalarDataReader<Object> {
 
   /**
    * Return the property name.
diff --git a/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocOne.java
index 4ec7bcbc5..c7d9c8f85 100644
--- a/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocOne.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.query;
 
 import io.ebean.bean.EntityBean;
-import io.ebeaninternal.server.type.ScalarType;
+import io.ebeaninternal.server.type.ScalarDataReader;
 
 public interface STreePropertyAssocOne extends STreePropertyAssoc {
 
@@ -13,7 +13,7 @@ public interface STreePropertyAssocOne extends STreePropertyAssoc {
   /**
    * Return the scalar type of the associated id property.
    */
-  ScalarType<?> getIdScalarType();
+  ScalarDataReader<?> getIdReader();
 
   /**
    * Returns true, if this relation has a foreign key.
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java
index 39e0bff28..c78de34a5 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java
@@ -5,7 +5,7 @@ import io.ebean.bean.EntityBean;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.deploy.DbReadContext;
 import io.ebeaninternal.server.deploy.DbSqlContext;
-import io.ebeaninternal.server.type.ScalarType;
+import io.ebeaninternal.server.type.ScalarDataReader;
 
 import java.sql.SQLException;
 import java.util.List;
@@ -80,9 +80,9 @@ interface SqlTreeNode {
   boolean hasMany();
 
   /**
-   * Return the property for singleAttribute query.
+   * Return the reader for the single attribute query.
    */
-  ScalarType<?> getSingleAttributeScalarType();
+  ScalarDataReader<?> getSingleAttributeReader();
 
   /**
    * Return true if the query is known to only have a single property selected.
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
index 73ffb3e23..a62106a52 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
@@ -14,7 +14,7 @@ import io.ebeaninternal.server.deploy.DbSqlContext;
 import io.ebeaninternal.server.deploy.InheritInfo;
 import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.deploy.id.IdBinder;
-import io.ebeaninternal.server.type.ScalarType;
+import io.ebeaninternal.server.type.ScalarDataReader;
 
 import java.sql.SQLException;
 import java.sql.Timestamp;
@@ -145,22 +145,22 @@ class SqlTreeNodeBean implements SqlTreeNode {
   }
 
   @Override
-  public ScalarType<?> getSingleAttributeScalarType() {
+  public ScalarDataReader<?> getSingleAttributeReader() {
     if (properties == null || properties.length == 0) {
       // if we have no property ask first children (in a distinct select with join)
       if (children.length == 0) {
         // expected to be a findIds query
-        return desc.getIdBinder().getBeanProperty().getScalarType();
+        return desc.getIdBinder().getBeanProperty();
       }
-      return children[0].getSingleAttributeScalarType();
+      return children[0].getSingleAttributeReader();
     }
     if (properties[0] instanceof STreePropertyAssocOne) {
       STreePropertyAssocOne assocOne = (STreePropertyAssocOne)properties[0];
       if (assocOne.isAssocId()) {
-        return assocOne.getIdScalarType();
+        return assocOne.getIdReader();
       }
     }
-    return properties[0].getScalarType();
+    return properties[0];
   }
 
   private Map<String, String> createPathMap(String prefix, STreeType desc) {
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
index 6dfd1fd7b..f1df4476d 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
@@ -76,7 +76,7 @@ class SqlTreeNodeExtraJoin implements SqlTreeNode {
   }
 
   @Override
-  public ScalarType<?> getSingleAttributeScalarType() {
+  public ScalarType<?> getSingleAttributeReader() {
     throw new IllegalStateException("No expected");
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java
index a5cd0e232..1db89c56f 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java
@@ -43,7 +43,7 @@ class SqlTreeNodeManyWhereJoin implements SqlTreeNode {
   }
 
   @Override
-  public ScalarType<?> getSingleAttributeScalarType() {
+  public ScalarType<?> getSingleAttributeReader() {
     throw new IllegalStateException("No expected");
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarDataReader.java b/src/main/java/io/ebeaninternal/server/type/ScalarDataReader.java
index 00787b823..f410cbe09 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarDataReader.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarDataReader.java
@@ -12,14 +12,4 @@ public interface ScalarDataReader<T> {
    */
   T read(DataReader dataReader) throws SQLException;
 
-  /**
-   * Ignore typically by moving the index position.
-   */
-  void loadIgnore(DataReader dataReader);
-
-  /**
-   * Bind the value to the underlying preparedStatement.
-   */
-  void bind(DataBind b, T value) throws SQLException;
-
 }
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarType.java b/src/main/java/io/ebeaninternal/server/type/ScalarType.java
index e8e609a73..a61b8ac2b 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarType.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarType.java
@@ -1,10 +1,10 @@
 package io.ebeaninternal.server.type;
 
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.text.StringFormatter;
 import io.ebean.text.StringParser;
 import io.ebeanservice.docstore.api.mapping.DocPropertyType;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -103,7 +103,6 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
    * Ignore the reading of this value. Typically this means moving the index
    * position in the ResultSet.
    */
-  @Override
   void loadIgnore(DataReader reader);
 
   /**
@@ -113,7 +112,6 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
    * JDBC type.
    * </p>
    */
-  @Override
   void bind(DataBind bind, T value) throws SQLException;
 
   /**
diff --git a/src/test/java/org/tests/compositekeys/TestCKeyDelete.java b/src/test/java/org/tests/compositekeys/TestCKeyDelete.java
index f25d44c0a..c3697e043 100644
--- a/src/test/java/org/tests/compositekeys/TestCKeyDelete.java
+++ b/src/test/java/org/tests/compositekeys/TestCKeyDelete.java
@@ -2,10 +2,15 @@ package org.tests.compositekeys;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import org.junit.Test;
 import org.tests.model.basic.CKeyParent;
 import org.tests.model.basic.CKeyParentId;
-import org.junit.Assert;
-import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 public class TestCKeyDelete extends BaseTestCase {
 
@@ -22,22 +27,20 @@ public class TestCKeyDelete extends BaseTestCase {
     Ebean.save(p);
 
     CKeyParent found = Ebean.find(CKeyParent.class).where().idEq(searchId).findOne();
-
-    Assert.assertNotNull(found);
+    assertNotNull(found);
 
     Ebean.delete(CKeyParent.class, searchId);
 
     CKeyParent notFound = Ebean.find(CKeyParent.class).where().idEq(searchId).findOne();
-
-    Assert.assertNull(notFound);
+    assertNull(notFound);
 
   }
 
   @Test
   public void testDeleteWhere() {
 
-    CKeyParentId id = new CKeyParentId(100, "deleteMe");
-    CKeyParentId searchId = new CKeyParentId(100, "deleteMe");
+    CKeyParentId id = new CKeyParentId(101, "deleteMe2");
+    CKeyParentId searchId = new CKeyParentId(101, "deleteMe2");
 
     CKeyParent p = new CKeyParent();
     p.setId(id);
@@ -45,10 +48,16 @@ public class TestCKeyDelete extends BaseTestCase {
 
     Ebean.save(p);
 
-    Ebean.createQuery(CKeyParent.class).where().eq("id.oneKey", 100).delete();
+    List<CKeyParentId> ids = Ebean.find(CKeyParent.class).where().eq("id.oneKey", 101).findIds();
+    assertThat(ids).hasSize(1);
+
+    CKeyParentId foundId = ids.get(0);
+    assertThat(foundId.getOneKey()).isEqualTo(101);
+    assertThat(foundId.getTwoKey()).isEqualTo("deleteMe2");
+
+    Ebean.createQuery(CKeyParent.class).where().eq("id.oneKey", 101).delete();
 
     CKeyParent found = Ebean.find(CKeyParent.class).where().idEq(searchId).findOne();
-
-    Assert.assertNull(found);
+    assertNull(found);
   }
 }

From bafba0babfb1833b363af75044c9b169340bc253 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 6 Dec 2018 00:15:06 +1300
Subject: [PATCH 0591/1036] #1572 - Support
 query.select("customer.id").findSingleAttributeList() ... in addition to the
 expected and working select("customer").findSingleAttributeList()

---
 .../server/query/SqlTreeBuilder.java              | 10 +++-------
 .../query/other/TestQuerySingleAttribute.java     | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index bf8201a84..8fa67bd2c 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -419,15 +419,11 @@ public final class SqlTreeBuilder {
           } else {
             logger.error("property [" + propName + "] not found on " + desc + " for query - excluding it.");
           }
-
-        } else if (p.isEmbedded()) {
-          // add the embedded bean (and effectively
-          // all its properties)
+        } else if (p.isEmbedded() || (p instanceof STreePropertyAssoc && !queryProps.isIncludedBeanJoin(p.getName()))) {
+          // add the embedded bean or the *ToOne assoc bean.  We skip the check that the *ToOne propName maps to Id property ...
           selectProps.add(p);
-
         } else {
-          String m = "property [" + p.getFullBeanName() + "] expected to be an embedded bean for query - excluding it.";
-          logger.error(m);
+          logger.error("property [" + p.getFullBeanName() + "] expected to be an embedded or *ToOne bean for query - excluding it.");
         }
       }
 
diff --git a/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
index b985a2a0a..4b5c9ed3c 100644
--- a/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
+++ b/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
@@ -359,6 +359,21 @@ public class TestQuerySingleAttribute extends BaseTestCase {
     assertThat(sqlOf(query)).contains("select distinct t0.customer_id from contact t0 order by t0.customer_id desc");
   }
 
+  @Test
+  public void distinctWithOrderByPkWithId() {
+
+    ResetBasicData.reset();
+
+    Query<Contact> query = Ebean.find(Contact.class)
+      .setDistinct(true)
+      .select("customer.id")
+      .orderBy().desc("customer.id");
+
+    query.findSingleAttributeList();
+
+    assertThat(sqlOf(query)).contains("select distinct t0.customer_id from contact t0 order by t0.customer_id desc");
+  }
+
   @Test
   public void distinctWithCascadedFetchOrderByPk() {
 

From a5fea5e9bec0056f771ec6d91b08a19e9893a855 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 6 Dec 2018 00:18:53 +1300
Subject: [PATCH 0592/1036] [maven-release-plugin] prepare release
 ebean-11.28.3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5f28b77af..915a3c623 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.28.3-SNAPSHOT</version>
+  <version>11.28.3</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.28.3</tag>
   </scm>
 
   <profiles>

From fa96f81f8caac17d0be1bc93b7be6f527ddf546f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 6 Dec 2018 00:19:14 +1300
Subject: [PATCH 0593/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 915a3c623..fa66ecb43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.28.3</version>
+  <version>11.28.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.28.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 4b0230e862262ede022071d5a9d330b2dad4d310 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 11 Dec 2018 21:03:45 +1300
Subject: [PATCH 0594/1036] Refactor - reduce visibility on DefaultDbMigration

---
 .../dbmigration/DefaultDbMigration.java       | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index 2ad5ca993..a85e3f651 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -462,7 +462,7 @@ public class DefaultDbMigration implements DbMigration {
     /**
      * Return the migration for the pending drops for a given version.
      */
-    public Migration migrationForPendingDrop(String pendingVersion) {
+    Migration migrationForPendingDrop(String pendingVersion) {
 
       Migration migration = migrated.migrationForPendingDrop(pendingVersion);
 
@@ -481,7 +481,7 @@ public class DefaultDbMigration implements DbMigration {
     /**
      * Create and return the diff of the current model to the migration model.
      */
-    public Migration createDiffMigration() {
+    Migration createDiffMigration() {
       ModelDiff diff = new ModelDiff(migrated);
       diff.compareTo(current);
       return diff.isEmpty() ? null : diff.getMigration();
@@ -559,7 +559,7 @@ public class DefaultDbMigration implements DbMigration {
   /**
    * Write any extra platform ddl.
    */
-  protected void writeExtraPlatformDdl(String fullVersion, CurrentModel currentModel, Migration dbMigration, File writePath) throws IOException {
+  private void writeExtraPlatformDdl(String fullVersion, CurrentModel currentModel, Migration dbMigration, File writePath) throws IOException {
 
     for (Pair pair : platforms) {
       DdlWrite platformBuffer = new DdlWrite(new MConfiguration(), currentModel.read());
@@ -576,7 +576,7 @@ public class DefaultDbMigration implements DbMigration {
   /**
    * Write the migration xml.
    */
-  protected boolean writeMigrationXml(Migration dbMigration, File resourcePath, String fullVersion) {
+  private boolean writeMigrationXml(Migration dbMigration, File resourcePath, String fullVersion) {
 
     String modelFile = fullVersion + migrationConfig.getModelSuffix();
     File file = new File(resourcePath, modelFile);
@@ -592,7 +592,7 @@ public class DefaultDbMigration implements DbMigration {
   /**
    * Set default server and platform if necessary.
    */
-  protected void setDefaults() {
+  private void setDefaults() {
     if (server == null) {
       setServer(Ebean.getDefaultServer());
     }
@@ -674,7 +674,7 @@ public class DefaultDbMigration implements DbMigration {
   /**
    * Return the file path to write the xml and sql to.
    */
-  protected File getMigrationDirectory() {
+  File getMigrationDirectory() {
 
     // path to src/main/resources in typical maven project
     File resourceRootDir = new File(pathToResources);
@@ -693,7 +693,7 @@ public class DefaultDbMigration implements DbMigration {
   /**
    * Return the model directory (relative to the migration directory).
    */
-  protected File getModelDirectory(File migrationDirectory) {
+  private File getModelDirectory(File migrationDirectory) {
     String modelPath = migrationConfig.getModelPath();
     if (modelPath == null || modelPath.isEmpty()) {
       return migrationDirectory;
@@ -746,19 +746,19 @@ public class DefaultDbMigration implements DbMigration {
    * Holds a platform and prefix. Used to generate multiple platform specific DDL
    * for a single migration.
    */
-  public static class Pair {
+  static class Pair {
 
     /**
      * The platform to generate the DDL for.
      */
-    public final DatabasePlatform platform;
+    final DatabasePlatform platform;
 
     /**
      * A prefix included into the file/resource names indicating the platform.
      */
-    public final String prefix;
+    final String prefix;
 
-    public Pair(DatabasePlatform platform, String prefix) {
+    Pair(DatabasePlatform platform, String prefix) {
       this.platform = platform;
       this.prefix = prefix;
     }

From 8410de88312807eb27a75a67cd7b1c02b7cee076 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 13 Dec 2018 00:19:40 +1300
Subject: [PATCH 0595/1036] #1573 - Incorrect CamelCase conversion when number
 proceeds uppercase letter

---
 .../java/io/ebean/util/CamelCaseHelper.java   |  2 +-
 .../io/ebean/util/CamelCaseHelperTest.java    | 25 +++++++++++++++----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/ebean/util/CamelCaseHelper.java b/src/main/java/io/ebean/util/CamelCaseHelper.java
index d3573309e..c58c78200 100644
--- a/src/main/java/io/ebean/util/CamelCaseHelper.java
+++ b/src/main/java/io/ebean/util/CamelCaseHelper.java
@@ -26,9 +26,9 @@ public class CamelCaseHelper {
       } else if (Character.isDigit(c)) {
         if (i > lastUpper + 1 && !digitsCompressed) {
           sb.append("_");
+          lastUpper = i;
         }
         sb.append(c);
-        lastUpper = i;
 
       } else if (Character.isUpperCase(c)) {
         if (i > lastUpper + 1) {
diff --git a/src/test/java/io/ebean/util/CamelCaseHelperTest.java b/src/test/java/io/ebean/util/CamelCaseHelperTest.java
index ab5b4af2f..3341071e9 100644
--- a/src/test/java/io/ebean/util/CamelCaseHelperTest.java
+++ b/src/test/java/io/ebean/util/CamelCaseHelperTest.java
@@ -7,21 +7,36 @@ import static org.junit.Assert.assertEquals;
 public class CamelCaseHelperTest {
 
   @Test
-  public void when_underscore() throws Exception {
-
+  public void when_underscore() {
     assertEquals(CamelCaseHelper.toCamelFromUnderscore("hello_there"), "helloThere");
     assertEquals(CamelCaseHelper.toCamelFromUnderscore("hello_there_jim"), "helloThereJim");
   }
 
   @Test
-  public void when_trailing_numbers() throws Exception {
-
+  public void when_trailing_numbers() {
     assertEquals(CamelCaseHelper.toCamelFromUnderscore("hello_1"), "hello1");
     assertEquals(CamelCaseHelper.toCamelFromUnderscore("hello_there_2"), "helloThere2");
   }
 
   @Test
-  public void when_already_camel() throws Exception {
+  public void when_numbers() {
+    assertEquals(CamelCaseHelper.toCamelFromUnderscore("hello1_id"), "hello1Id");
+    assertEquals(CamelCaseHelper.toCamelFromUnderscore("hello_there2_foo"), "helloThere2Foo");
+    assertEquals(CamelCaseHelper.toCamelFromUnderscore("hello1id"), "hello1id");
+    assertEquals(CamelCaseHelper.toCamelFromUnderscore("hello_there2foo"), "helloThere2foo");
+  }
+
+  @Test
+  public void when_numbersProceedUppercase() {
+    assertEquals(CamelCaseHelper.toCamelFromUnderscore("hello1_id"), "hello1Id");
+    assertEquals(CamelCaseHelper.toCamelFromUnderscore("hello_there2_foo"), "helloThere2Foo");
+
+    assertEquals(CamelCaseHelper.toUnderscoreFromCamel("hello1Id"), "hello1_id");
+    assertEquals(CamelCaseHelper.toUnderscoreFromCamel("helloThere2Foo"), "hello_there2_foo");
+  }
+
+  @Test
+  public void when_already_camel() {
     assertEquals(CamelCaseHelper.toCamelFromUnderscore("helloThere"), "helloThere");
     assertEquals(CamelCaseHelper.toCamelFromUnderscore("helloThereJim"), "helloThereJim");
     assertEquals(CamelCaseHelper.toCamelFromUnderscore("hello"), "hello");

From 6d5374e66a3ff7d2d03039ccc9a4f749b14d6603 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 15 Dec 2018 23:17:00 +1300
Subject: [PATCH 0596/1036] #1576 - ClusterManager creates ClusterBroadcast
 even when config is not active

---
 .../java/io/ebeaninternal/server/cluster/ClusterManager.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java b/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java
index 2e5df2d3f..514331b7c 100644
--- a/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java
+++ b/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java
@@ -29,7 +29,7 @@ public class ClusterManager implements ServerLookup {
 
   public ClusterManager(ContainerConfig config) {
     ClusterBroadcastFactory factory = createFactory();
-    if (factory != null) {
+    if (factory != null && config.isActive()) {
       broadcast = factory.create(this, config);
     } else {
       broadcast = null;

From d266d6d440ce86817d359c3f04dba78843504b01 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 16 Dec 2018 00:29:18 +1300
Subject: [PATCH 0597/1036] #1574 - "NullPointerException" in
 query.copy().findList() but not in query.findList()

---
 .../server/querydefn/OrmQueryProperties.java  |  5 +-
 .../org/tests/query/TestQueryFilterMany.java  | 53 ++++++++++++++++---
 2 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
index 966ca0543..f5a558607 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
@@ -4,13 +4,13 @@ import io.ebean.ExpressionFactory;
 import io.ebean.FetchConfig;
 import io.ebean.OrderBy;
 import io.ebean.Query;
+import io.ebean.util.SplitName;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionFactory;
 import io.ebeaninternal.api.SpiExpressionList;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.expression.FilterExprPath;
 import io.ebeaninternal.server.expression.FilterExpressionList;
-import io.ebean.util.SplitName;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -75,7 +75,7 @@ public class OrmQueryProperties implements Serializable {
    * Construct for root so path (and parentPath) are null.
    */
   public OrmQueryProperties() {
-    this((String) null);
+    this(null);
   }
 
   /**
@@ -157,6 +157,7 @@ public class OrmQueryProperties implements Serializable {
     this.cache = source.cache;
     this.readOnly = source.readOnly;
     this.filterMany = source.filterMany;
+    this.markForQueryJoin = source.markForQueryJoin;
     this.included = (source.included == null) ? null : new LinkedHashSet<>(source.included);
   }
 
diff --git a/src/test/java/org/tests/query/TestQueryFilterMany.java b/src/test/java/org/tests/query/TestQueryFilterMany.java
index dc03f4982..f0c21fd21 100644
--- a/src/test/java/org/tests/query/TestQueryFilterMany.java
+++ b/src/test/java/org/tests/query/TestQueryFilterMany.java
@@ -3,18 +3,18 @@ package org.tests.query;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.FetchConfig;
+import io.ebean.Query;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
-import org.ebeantest.LoggedSqlCollector;
-import org.junit.Test;
 
 import java.time.LocalDate;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 public class TestQueryFilterMany extends BaseTestCase {
 
@@ -36,13 +36,52 @@ public class TestQueryFilterMany extends BaseTestCase {
 
     List<String> sqlList = LoggedSqlCollector.stop();
     assertEquals(2, sqlList.size());
-    assertTrue(sqlList.get(1).contains("status = ?"));
+    assertThat(sqlList.get(1)).contains("status = ?");
 
     // Currently this does not include the query filter
     Ebean.refreshMany(customer, "orders");
 
   }
 
+  @Test
+  public void test_filterMany_in_findCount() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    Query<Customer> query = Ebean.find(Customer.class)
+      .fetch("orders")
+      .filterMany("orders").in("status", Order.Status.NEW)
+      .order().asc("id");
+
+    query.findCount();
+
+    List<String> sqlList = LoggedSqlCollector.stop();
+    assertEquals(1, sqlList.size());
+    assertThat(sqlList.get(0)).contains("select count(*) from o_customer");
+  }
+
+  @Test
+  public void test_filterMany_copy_findList() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    Query<Customer> query = Ebean.find(Customer.class)
+      .fetch("orders")
+      .filterMany("orders").in("status", Order.Status.NEW)
+      .order().asc("id");
+
+    query.copy().findList();
+
+    List<String> sqlList = LoggedSqlCollector.stop();
+    assertEquals(2, sqlList.size());
+    assertThat(sqlList.get(0)).contains("from o_customer t0");
+    assertThat(sqlList.get(1)).contains("from o_order t0 join o_customer t1");
+  }
+
   @Test
   public void testDisjunction() {
 
@@ -52,9 +91,9 @@ public class TestQueryFilterMany extends BaseTestCase {
 
     Ebean.find(Customer.class)
       .filterMany("orders")
-        .or()
-          .eq("status", Order.Status.NEW)
-          .eq("orderDate", LocalDate.now())
+      .or()
+      .eq("status", Order.Status.NEW)
+      .eq("orderDate", LocalDate.now())
       .findList();
 
     List<String> sql = LoggedSqlCollector.stop();

From 7d35789db4a66607ecca998376c0c084c9ffb1dc Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 16 Dec 2018 16:12:34 +1300
Subject: [PATCH 0598/1036] #1573 - Incorrect CamelCase conversion when number
 proceeds uppercase letter

---
 .../model/onetoone/album/DeleteById_SoftDelete_Tests.java  | 6 +++---
 .../tests/query/softdelete/TestSoftDeletePagingList.java   | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java b/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java
index 5beea394f..8455e5669 100644
--- a/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java
+++ b/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java
@@ -217,7 +217,7 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(2);
     if (isPersistBatchOnCascade()) {
-      assertThat(sql.get(0)).contains("update cover set s3url=?, deleted=? where id=?");
+      assertThat(sql.get(0)).contains("update cover set s3_url=?, deleted=? where id=?");
     }
     else {
       assertThat(sql.get(0)).contains("update cover set deleted=? where id=?");
@@ -238,7 +238,7 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(2);
     if (isPersistBatchOnCascade()) {
-      assertThat(sql.get(0)).contains("update cover set s3url=?, deleted=? where id=?");
+      assertThat(sql.get(0)).contains("update cover set s3_url=?, deleted=? where id=?");
     }
     else {
       assertThat(sql.get(0)).contains("update cover set deleted=? where id=?");
@@ -265,7 +265,7 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(2);
     if (isPersistBatchOnCascade()) {
-      assertThat(sql.get(0)).contains("update cover set s3url=?, deleted=? where id=?");
+      assertThat(sql.get(0)).contains("update cover set s3_url=?, deleted=? where id=?");
     }
     else {
       assertThat(sql.get(0)).contains("update cover set deleted=? where id=?");
diff --git a/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java b/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java
index da591cab2..1942f0adb 100644
--- a/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java
+++ b/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java
@@ -3,10 +3,9 @@ package org.tests.query.softdelete;
 import io.ebean.Ebean;
 import io.ebean.PagedList;
 import io.ebean.TransactionalTestCase;
-
-import org.tests.model.onetoone.album.Cover;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
+import org.tests.model.onetoone.album.Cover;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,14 +41,14 @@ public class TestSoftDeletePagingList extends TransactionalTestCase {
     assertThat(totalRowCount).isEqualTo(2);
 
     assertThat(sql).hasSize(2);
-    assertThat(sql.get(0)).contains("select count(*) from cover t0 where t0.s3url like");
+    assertThat(sql.get(0)).contains("select count(*) from cover t0 where t0.s3_url like");
     if (isPlatformBooleanNative()) {
       assertThat(sql.get(0)).contains("and t0.deleted = false; --bind(SoftDelPaged-%)");
     } else {
       assertThat(sql.get(0)).contains("and t0.deleted = 0; --bind(SoftDelPaged-%)");
     }
 
-    assertThat(sql.get(1)).contains("where t0.s3url like ");
+    assertThat(sql.get(1)).contains("where t0.s3_url like ");
     if (isPlatformBooleanNative()) {
       assertThat(sql.get(1)).contains("and t0.deleted = false order by t0.id");
     } else {

From 41c1e7260c258498430c6eba84228008d064759d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 17 Dec 2018 23:11:13 +1300
Subject: [PATCH 0599/1036] #1577 - ENH: Add support for "dbinit" migrations
 (Sort of "checkpoint" or "fast forward" migrations)

---
 pom.xml                                       |  2 +-
 .../io/ebean/config/DbMigrationConfig.java    | 14 ++-
 .../io/ebean/dbmigration/DbMigration.java     | 13 ++-
 .../dbmigration/DefaultDbMigration.java       | 81 ++++++++++++-----
 .../dbmigration/LastMigration.java            | 91 +++++++++++++++++++
 .../dbmigration/model/MigrationModel.java     | 16 ++--
 .../dbmigration/LastMigrationTest.java        | 66 ++++++++++++++
 .../resources/dbmigration/app2/v1.0__one.sql  |  0
 .../resources/dbmigration/app2/v1.1__one.sql  |  0
 src/test/resources/dbmigration/app2/v3.1.sql  |  0
 .../app3/model_larger/v4.1__foo.model.xml     |  0
 .../app3/model_smaller/v2.0.model.xml         |  0
 .../app3/model_smaller/v2.1__foo.model.xml    |  0
 .../resources/dbmigration/app3/v1.0__one.sql  |  0
 .../resources/dbmigration/app3/v1.1__one.sql  |  0
 .../dbmigration/app3/v3.1.2__foo.sql          |  0
 16 files changed, 251 insertions(+), 32 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/dbmigration/LastMigration.java
 create mode 100644 src/test/java/io/ebeaninternal/dbmigration/LastMigrationTest.java
 create mode 100644 src/test/resources/dbmigration/app2/v1.0__one.sql
 create mode 100644 src/test/resources/dbmigration/app2/v1.1__one.sql
 create mode 100644 src/test/resources/dbmigration/app2/v3.1.sql
 create mode 100644 src/test/resources/dbmigration/app3/model_larger/v4.1__foo.model.xml
 create mode 100644 src/test/resources/dbmigration/app3/model_smaller/v2.0.model.xml
 create mode 100644 src/test/resources/dbmigration/app3/model_smaller/v2.1__foo.model.xml
 create mode 100644 src/test/resources/dbmigration/app3/v1.0__one.sql
 create mode 100644 src/test/resources/dbmigration/app3/v1.1__one.sql
 create mode 100644 src/test/resources/dbmigration/app3/v3.1.2__foo.sql

diff --git a/pom.xml b/pom.xml
index fa66ecb43..7a8bc375f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>11.11.1</version>
+      <version>11.12.1</version>
     </dependency>
 
     <dependency>
diff --git a/src/main/java/io/ebean/config/DbMigrationConfig.java b/src/main/java/io/ebean/config/DbMigrationConfig.java
index cdbb3a416..8946d4000 100644
--- a/src/main/java/io/ebean/config/DbMigrationConfig.java
+++ b/src/main/java/io/ebean/config/DbMigrationConfig.java
@@ -5,7 +5,6 @@ import io.ebean.annotation.Platform;
 import io.ebean.migration.MigrationConfig;
 import io.ebean.migration.MigrationRunner;
 import io.ebean.util.StringHelper;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,6 +32,8 @@ public class DbMigrationConfig {
    */
   protected String migrationPath = "dbmigration";
 
+  protected String migrationInitPath = "dbinit";
+
   /**
    * Subdirectory the model xml files go into.
    */
@@ -118,6 +119,15 @@ public class DbMigrationConfig {
     this.platform = platform;
   }
 
+  /**
+   * Return the path for normal migrations or dbinit migrations.
+   *
+   * @param dbinitMigration When true return the path for dbinit migrations.
+   */
+  public String getMigrationPath(boolean dbinitMigration) {
+    return dbinitMigration ? migrationInitPath : migrationPath;
+  }
+
   /**
    * Return the resource path for db migrations.
    */
@@ -419,6 +429,7 @@ public class DbMigrationConfig {
   public void loadSettings(PropertiesWrapper properties, String serverName) {
 
     migrationPath = properties.get("migration.migrationPath", migrationPath);
+    migrationInitPath = properties.get("migration.migrationInitPath", migrationInitPath);
     modelPath = properties.get("migration.modelPath", modelPath);
     applyPrefix = properties.get("migration.applyPrefix", applyPrefix);
     applySuffix = properties.get("migration.applySuffix", applySuffix);
@@ -472,6 +483,7 @@ public class DbMigrationConfig {
     runnerConfig.setMetaTable(metaTable);
     runnerConfig.setApplySuffix(applySuffix);
     runnerConfig.setMigrationPath(migrationPath);
+    runnerConfig.setMigrationInitPath(migrationInitPath);
     runnerConfig.setRunPlaceholderMap(runPlaceholderMap);
     runnerConfig.setRunPlaceholders(runPlaceholders);
     runnerConfig.setDbUsername(getDbUsername());
diff --git a/src/main/java/io/ebean/dbmigration/DbMigration.java b/src/main/java/io/ebean/dbmigration/DbMigration.java
index 8a9f3f427..2d9018806 100644
--- a/src/main/java/io/ebean/dbmigration/DbMigration.java
+++ b/src/main/java/io/ebean/dbmigration/DbMigration.java
@@ -154,7 +154,7 @@ public interface DbMigration {
   List<String> getPendingDrops();
 
   /**
-   * Generate the next migration xml file and associated apply and rollback sql scripts.
+   * Generate the next migration sql script and associated model xml.
    * <p>
    * This does not run the migration or ddl scripts but just generates them.
    * </p>
@@ -186,4 +186,15 @@ public interface DbMigration {
    * @return the version of the generated migration or null
    */
   String generateMigration() throws IOException;
+
+  /**
+   * Generate an "init" migration which has all changes.
+   * <p>
+   * An "init" migration can only be executed and used on a database that has had no
+   * prior migrations run on it.
+   * </p>
+   * @return the version of the generated migration
+   */
+  String generateInitMigration() throws IOException;
+
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index a85e3f651..bf92237dc 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -271,6 +271,15 @@ public class DefaultDbMigration implements DbMigration {
    */
   @Override
   public String generateMigration() throws IOException {
+    return generateMigrationFor(false);
+  }
+
+  @Override
+  public String generateInitMigration() throws IOException {
+    return generateMigrationFor(true);
+  }
+
+  private String generateMigrationFor(boolean dbinitMigration) throws IOException {
 
     // use this flag to stop other plugins like full DDL generation
     if (!online) {
@@ -286,14 +295,17 @@ public class DefaultDbMigration implements DbMigration {
       configurePlatforms();
     }
     try {
-      Request request = createRequest();
-      if (platforms.isEmpty()) {
-        generateExtraDdl(request.migrationDir, databasePlatform, request.isTablePartitioning());
-      } else {
-        for (Pair pair : platforms) {
-          PlatformDdlWriter platformWriter = createDdlWriter(pair.platform);
-          File subPath = platformWriter.subPath(request.migrationDir, pair.prefix);
-          generateExtraDdl(subPath, pair.platform, request.isTablePartitioning());
+      Request request = createRequest(dbinitMigration);
+      if (!dbinitMigration) {
+        // repeatable migrations
+        if (platforms.isEmpty()) {
+          generateExtraDdl(request.migrationDir, databasePlatform, request.isTablePartitioning());
+        } else {
+          for (Pair pair : platforms) {
+            PlatformDdlWriter platformWriter = createDdlWriter(pair.platform);
+            File subPath = platformWriter.subPath(request.migrationDir, pair.prefix);
+            generateExtraDdl(subPath, pair.platform, request.isTablePartitioning());
+          }
         }
       }
 
@@ -321,7 +333,7 @@ public class DefaultDbMigration implements DbMigration {
     }
     setDefaults();
     try {
-      return createRequest().getPendingDrops();
+      return createRequest(false).getPendingDrops();
     } finally {
       if (!online) {
         DbOffline.reset();
@@ -433,32 +445,48 @@ public class DefaultDbMigration implements DbMigration {
     return version;
   }
 
-  private Request createRequest() {
-    return new Request();
+  private Request createRequest(boolean dbinitMigration) {
+    return new Request(dbinitMigration);
   }
 
   private class Request {
 
+    final boolean dbinitMigration;
     final File migrationDir;
     final File modelDir;
-    final MigrationModel migrationModel;
     final CurrentModel currentModel;
     final ModelContainer migrated;
     final ModelContainer current;
 
-    private Request() {
-      this.migrationDir = getMigrationDirectory();
-      this.modelDir = getModelDirectory(migrationDir);
-      this.migrationModel = new MigrationModel(modelDir, migrationConfig.getModelSuffix());
-      this.migrated = migrationModel.read();
+    private Request(boolean dbinitMigration) {
+      this.dbinitMigration = dbinitMigration;
       this.currentModel = new CurrentModel(server, constraintNaming);
       this.current = currentModel.read();
+      this.migrationDir = getMigrationDirectory(dbinitMigration);
+      if (dbinitMigration) {
+        this.modelDir = null;
+        this.migrated = new ModelContainer();
+      } else {
+        this.modelDir = getModelDirectory(migrationDir);
+        MigrationModel migrationModel = new MigrationModel(modelDir, migrationConfig.getModelSuffix());
+        this.migrated = migrationModel.read(dbinitMigration);
+      }
     }
 
     boolean isTablePartitioning() {
       return current.isTablePartitioning();
     }
 
+    /**
+     * Return the next migration version (based on existing migration versions).
+     */
+    String nextVersion() {
+      // always read the next version using the main migration directory (not dbinit)
+      File migDirectory = getMigrationDirectory(false);
+      File modelDir = getModelDirectory(migDirectory);
+      return LastMigration.nextVersion(migDirectory, modelDir, dbinitMigration);
+    }
+
     /**
      * Return the migration for the pending drops for a given version.
      */
@@ -490,10 +518,10 @@ public class DefaultDbMigration implements DbMigration {
 
   private String generateMigration(Request request, Migration dbMigration, String dropsFor) throws IOException {
 
-    String fullVersion = getFullVersion(request.migrationModel, dropsFor);
+    String fullVersion = getFullVersion(request.nextVersion(), dropsFor);
 
     logger.info("generating migration:{}", fullVersion);
-    if (!writeMigrationXml(dbMigration, request.modelDir, fullVersion)) {
+    if (!request.dbinitMigration && !writeMigrationXml(dbMigration, request.modelDir, fullVersion)) {
       logger.warn("migration already exists, not generating DDL");
       return null;
     } else {
@@ -528,11 +556,11 @@ public class DefaultDbMigration implements DbMigration {
    * <p>
    * The full version can contain a comment suffix after a "__" double underscore.
    */
-  private String getFullVersion(MigrationModel migrationModel, String dropsFor) {
+  private String getFullVersion(String nextVersion, String dropsFor) {
 
     String version = getVersion();
     if (version == null) {
-      version = migrationModel.getNextVersion(initialVersion);
+      version = (nextVersion != null) ? nextVersion : initialVersion;
     }
 
     String fullVersion = migrationConfig.getApplyPrefix() + version;
@@ -672,13 +700,20 @@ public class DefaultDbMigration implements DbMigration {
   }
 
   /**
-   * Return the file path to write the xml and sql to.
+   * Return the main migration directory.
    */
   File getMigrationDirectory() {
+    return getMigrationDirectory(false);
+  }
+
+  /**
+   * Return the file path to write the xml and sql to.
+   */
+  File getMigrationDirectory(boolean dbinitMigration) {
 
     // path to src/main/resources in typical maven project
     File resourceRootDir = new File(pathToResources);
-    String resourcePath = migrationConfig.getMigrationPath();
+    String resourcePath = migrationConfig.getMigrationPath(dbinitMigration);
 
     // expect to be a path to something like - src/main/resources/dbmigration/model
     File path = new File(resourceRootDir, resourcePath);
diff --git a/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java b/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java
new file mode 100644
index 000000000..102eb87a9
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java
@@ -0,0 +1,91 @@
+package io.ebeaninternal.dbmigration;
+
+import io.ebeaninternal.dbmigration.model.MigrationVersion;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Utility to determine the last sql migration version and next version.
+ */
+class LastMigration {
+
+  private static final String SQL = ".sql";
+
+  private static final String MODEL_XML = ".model.xml";
+
+  /**
+   * Return the next migation version given the migration directory.
+   */
+  static String nextVersion(File migDir, File modelDir, boolean dbinitMigration) {
+
+    String last = lastVersion(migDir, modelDir);
+    if (last == null) {
+      return null;
+    }
+    return (dbinitMigration) ? last : MigrationVersion.parse(last).nextVersion();
+  }
+
+  /**
+   * Return the last migation version given the migration directory.
+   */
+  static String lastVersion(File migDirectory, File modelDir) {
+
+    List<String> fileNames = new ArrayList<>();
+
+    File[] sqlFiles = migDirectory.listFiles(pathname -> includeSqlFile(pathname.getName().toLowerCase()));
+    if (sqlFiles != null) {
+      for (File file : sqlFiles) {
+        fileNames.add(trim(file.getName()));
+      }
+    }
+
+    if (modelDir != null) {
+      File[] xmlFiles = modelDir.listFiles(pathname -> includeModelFile(pathname.getName().toLowerCase()));
+      if (xmlFiles != null) {
+        for (File file : xmlFiles) {
+          fileNames.add(trim(file.getName()));
+        }
+      }
+    }
+
+    Collections.sort(fileNames);
+    if (!fileNames.isEmpty()) {
+      return fileNames.get(fileNames.size() - 1);
+    }
+    return null;
+  }
+
+  private static boolean includeSqlFile(String lowerFileName) {
+    if (lowerFileName.startsWith("r") || lowerFileName.startsWith("i") || !lowerFileName.endsWith(SQL)) {
+      return false;
+    }
+    return true;
+  }
+
+  private static boolean includeModelFile(String lowerFileName) {
+    return lowerFileName.endsWith(MODEL_XML);
+  }
+
+  private static String trim(String name) {
+    name = name.toLowerCase();
+    char c = name.charAt(0);
+    if (c == 'v') {
+      name = name.substring(1);
+    }
+    int p = name.indexOf("__");
+    if (p > -1) {
+      name = name.substring(0, p);
+    }
+    if (name.endsWith(SQL)) {
+      name = name.substring(0, name.length() - 4);
+    }
+    if (name.endsWith(MODEL_XML)) {
+      name = name.substring(0, name.length() - 10);
+    }
+    return name;
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java b/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
index a27feb783..cc1776c13 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
@@ -31,14 +31,16 @@ public class MigrationModel {
   /**
    * Read all the migrations returning the model with all
    * the migrations applied in version order.
+   *
+   * @param dbinitMigration If true we don't apply model changes, migration is from scratch.
    */
-  public ModelContainer read() {
+  public ModelContainer read(boolean dbinitMigration) {
 
-    readMigrations();
+    readMigrations(dbinitMigration);
     return model;
   }
 
-  private void readMigrations() {
+  private void readMigrations(boolean dbinitMigration) {
 
     // find all the migration xml files
     File[] xmlFiles = modelDirectory.listFiles(pathname -> pathname.getName().toLowerCase().endsWith(modelSuffix));
@@ -53,9 +55,11 @@ public class MigrationModel {
     // sort into version order before applying
     Collections.sort(resources);
 
-    for (MigrationResource migrationResource : resources) {
-      logger.debug("read {}", migrationResource);
-      model.apply(migrationResource.read(), migrationResource.getVersion());
+    if (!dbinitMigration) {
+      for (MigrationResource migrationResource : resources) {
+        logger.debug("read {}", migrationResource);
+        model.apply(migrationResource.read(), migrationResource.getVersion());
+      }
     }
 
     // remember the last version
diff --git a/src/test/java/io/ebeaninternal/dbmigration/LastMigrationTest.java b/src/test/java/io/ebeaninternal/dbmigration/LastMigrationTest.java
new file mode 100644
index 000000000..e0adf54b2
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/dbmigration/LastMigrationTest.java
@@ -0,0 +1,66 @@
+package io.ebeaninternal.dbmigration;
+
+import org.junit.Test;
+
+import java.io.File;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class LastMigrationTest {
+
+  @Test
+  public void lastVersion() {
+    File d = new File("src/test/resources/dbmigration/migrationtest/h2");
+    assertThat(LastMigration.lastVersion(d, null)).isEqualTo("1.4");
+    assertThat(LastMigration.nextVersion(d, null, false)).isEqualTo("1.5");
+    assertThat(LastMigration.nextVersion(d, null, true)).isEqualTo("1.4");
+  }
+
+  @Test
+  public void lastVersion_no_v_Prefix() {
+    File d = new File("src/test/resources/dbmigration/migrationtest-history");
+    assertThat(LastMigration.lastVersion(d, null)).isEqualTo("1.2");
+  }
+
+  @Test
+  public void lastVersion_test() {
+    File d = new File("src/test/resources/test-dbmigration");
+    assertThat(LastMigration.lastVersion(d, null)).isEqualTo("2.1");
+    assertThat(LastMigration.nextVersion(d, null, false)).isEqualTo("2.2");
+
+  }
+
+  @Test
+  public void lastVersion_app2() {
+    File d = new File("src/test/resources/dbmigration/app2");
+    assertThat(LastMigration.lastVersion(d, null)).isEqualTo("3.1");
+    assertThat(LastMigration.nextVersion(d, null, false)).isEqualTo("3.2");
+  }
+
+  @Test
+  public void lastVersion_app3() {
+    File d = new File("src/test/resources/dbmigration/app3");
+    assertThat(LastMigration.lastVersion(d, null)).isEqualTo("3.1.2");
+    assertThat(LastMigration.nextVersion(d, null, false)).isEqualTo("3.1.3");
+    assertThat(LastMigration.nextVersion(d, null, true)).isEqualTo("3.1.2");
+  }
+
+  @Test
+  public void lastVersion_app3_with_model_larger() {
+    File d = new File("src/test/resources/dbmigration/app3");
+    File m = new File("src/test/resources/dbmigration/app3/model_larger");
+    assertThat(LastMigration.lastVersion(d, m)).isEqualTo("4.1");
+    assertThat(LastMigration.nextVersion(d, m, false)).isEqualTo("4.2");
+    assertThat(LastMigration.nextVersion(d, m, true)).isEqualTo("4.1");
+  }
+
+  @Test
+  public void lastVersion_app3_with_model_smaller() {
+
+    File d = new File("src/test/resources/dbmigration/app3");
+    File m = new File("src/test/resources/dbmigration/app3/model_smaller");
+    assertThat(LastMigration.lastVersion(d, m)).isEqualTo("3.1.2");
+    assertThat(LastMigration.nextVersion(d, m, false)).isEqualTo("3.1.3");
+    assertThat(LastMigration.nextVersion(d, m, true)).isEqualTo("3.1.2");
+  }
+}
diff --git a/src/test/resources/dbmigration/app2/v1.0__one.sql b/src/test/resources/dbmigration/app2/v1.0__one.sql
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/dbmigration/app2/v1.1__one.sql b/src/test/resources/dbmigration/app2/v1.1__one.sql
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/dbmigration/app2/v3.1.sql b/src/test/resources/dbmigration/app2/v3.1.sql
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/dbmigration/app3/model_larger/v4.1__foo.model.xml b/src/test/resources/dbmigration/app3/model_larger/v4.1__foo.model.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/dbmigration/app3/model_smaller/v2.0.model.xml b/src/test/resources/dbmigration/app3/model_smaller/v2.0.model.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/dbmigration/app3/model_smaller/v2.1__foo.model.xml b/src/test/resources/dbmigration/app3/model_smaller/v2.1__foo.model.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/dbmigration/app3/v1.0__one.sql b/src/test/resources/dbmigration/app3/v1.0__one.sql
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/dbmigration/app3/v1.1__one.sql b/src/test/resources/dbmigration/app3/v1.1__one.sql
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/dbmigration/app3/v3.1.2__foo.sql b/src/test/resources/dbmigration/app3/v3.1.2__foo.sql
new file mode 100644
index 000000000..e69de29bb

From 65890f977780f77c4eaf9c1c5163eb691ece8d08 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 17 Dec 2018 23:14:51 +1300
Subject: [PATCH 0600/1036] No effective change - remove unused resources from
 test resources

---
 .../dbmigration/app1/v1.0-apply-rollback.sql  |  1 -
 .../resources/dbmigration/app1/v1.0-apply.sql |  1 -
 .../resources/dbmigration/app1/v1.0-drop.sql  |  1 -
 src/test/resources/dbmigration/app1/v1.0.xml  | 49 -------------------
 .../dbmigration/app1/v1.1-apply-rollback.sql  |  2 -
 .../resources/dbmigration/app1/v1.1-apply.sql |  1 -
 .../dbmigration/app1/v1.1-drop-history.sql    |  4 --
 .../resources/dbmigration/app1/v1.1-drop.sql  |  3 --
 src/test/resources/dbmigration/app1/v1.1.xml  | 32 ------------
 src/test/resources/dbmigration/app1/v2.0.xml  | 22 ---------
 10 files changed, 116 deletions(-)
 delete mode 100644 src/test/resources/dbmigration/app1/v1.0-apply-rollback.sql
 delete mode 100644 src/test/resources/dbmigration/app1/v1.0-apply.sql
 delete mode 100644 src/test/resources/dbmigration/app1/v1.0-drop.sql
 delete mode 100644 src/test/resources/dbmigration/app1/v1.0.xml
 delete mode 100644 src/test/resources/dbmigration/app1/v1.1-apply-rollback.sql
 delete mode 100644 src/test/resources/dbmigration/app1/v1.1-apply.sql
 delete mode 100644 src/test/resources/dbmigration/app1/v1.1-drop-history.sql
 delete mode 100644 src/test/resources/dbmigration/app1/v1.1-drop.sql
 delete mode 100644 src/test/resources/dbmigration/app1/v1.1.xml
 delete mode 100644 src/test/resources/dbmigration/app1/v2.0.xml

diff --git a/src/test/resources/dbmigration/app1/v1.0-apply-rollback.sql b/src/test/resources/dbmigration/app1/v1.0-apply-rollback.sql
deleted file mode 100644
index a94a43b6e..000000000
--- a/src/test/resources/dbmigration/app1/v1.0-apply-rollback.sql
+++ /dev/null
@@ -1 +0,0 @@
-drop table if exists foo;
diff --git a/src/test/resources/dbmigration/app1/v1.0-apply.sql b/src/test/resources/dbmigration/app1/v1.0-apply.sql
deleted file mode 100644
index e323d74cd..000000000
--- a/src/test/resources/dbmigration/app1/v1.0-apply.sql
+++ /dev/null
@@ -1 +0,0 @@
-create table foo;
diff --git a/src/test/resources/dbmigration/app1/v1.0-drop.sql b/src/test/resources/dbmigration/app1/v1.0-drop.sql
deleted file mode 100644
index a94a43b6e..000000000
--- a/src/test/resources/dbmigration/app1/v1.0-drop.sql
+++ /dev/null
@@ -1 +0,0 @@
-drop table if exists foo;
diff --git a/src/test/resources/dbmigration/app1/v1.0.xml b/src/test/resources/dbmigration/app1/v1.0.xml
deleted file mode 100644
index 20d45b80a..000000000
--- a/src/test/resources/dbmigration/app1/v1.0.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://ebean-orm.github.io/xml/ns/dbmigration http://ebean-orm.github.io/xml/ns/dbmigration-1.0.xsd">
-
-  <changeSet type="apply" generated="true">
-
-    <sql>
-      <apply>
-        create table foo;
-      </apply>
-      <rollback>
-        drop table if exists foo;
-      </rollback>
-    </sql>
-
-    <createTable name="v10_table">
-      <column name="application" type="varchar(30)" notnull="true"/>
-      <column name="change_log"  type="integer"     notnull="true"/>
-      <column name="change_set"  type="integer"     notnull="true"/>
-      <column name="locked_by"   type="varchar(30)"/>
-      <column name="locked_at"   type="timestamp"/>
-    </createTable>
-
-    <createTable name="hello_world" withHistory="true">
-      <column name="id" type="integer" primaryKey="true"/>
-      <column name="name" type="varchar(20)" notnull="true"/>
-      <column name="type" type="varchar(20)" notnull="true"/>
-      <column name="description" type="varchar(20)" notnull="true"/>
-      <uniqueConstraint name="uq_hello_world_name_type" columnNames="name,type"/>
-    </createTable>
-
-    <addColumn tableName="hello_world">
-      <column name="fooe" type="varchar(20)"/>
-    </addColumn>
-
-
-    <createHistoryTable baseTable="hello_world"/>
-
-    <!--<addForeignKey name="fk_hello_world_x" columns="x" references="asdsad.asd"/>-->
-
-  </changeSet>
-
-  <changeSet type="drop" generated="true">
-
-    <dropColumn columnName="fooe" tableName="hello_world"/>
-
-  </changeSet>
-
-</migration>
\ No newline at end of file
diff --git a/src/test/resources/dbmigration/app1/v1.1-apply-rollback.sql b/src/test/resources/dbmigration/app1/v1.1-apply-rollback.sql
deleted file mode 100644
index ed4bde169..000000000
--- a/src/test/resources/dbmigration/app1/v1.1-apply-rollback.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- CONTAINS --
--- drop statements for all the newly created objects in apply-create.sql
diff --git a/src/test/resources/dbmigration/app1/v1.1-apply.sql b/src/test/resources/dbmigration/app1/v1.1-apply.sql
deleted file mode 100644
index e323d74cd..000000000
--- a/src/test/resources/dbmigration/app1/v1.1-apply.sql
+++ /dev/null
@@ -1 +0,0 @@
-create table foo;
diff --git a/src/test/resources/dbmigration/app1/v1.1-drop-history.sql b/src/test/resources/dbmigration/app1/v1.1-drop-history.sql
deleted file mode 100644
index aec64487e..000000000
--- a/src/test/resources/dbmigration/app1/v1.1-drop-history.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- CONTAINS --
--- recreate history procedures to ignore certain column(s)
--- drop history view
--- drop history table
diff --git a/src/test/resources/dbmigration/app1/v1.1-drop.sql b/src/test/resources/dbmigration/app1/v1.1-drop.sql
deleted file mode 100644
index e1e59f95b..000000000
--- a/src/test/resources/dbmigration/app1/v1.1-drop.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- CONTAINS --
--- drop column
--- drop table
diff --git a/src/test/resources/dbmigration/app1/v1.1.xml b/src/test/resources/dbmigration/app1/v1.1.xml
deleted file mode 100644
index bf9bef4e2..000000000
--- a/src/test/resources/dbmigration/app1/v1.1.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://ebean-orm.github.io/xml/ns/dbmigration http://ebean-orm.github.io/xml/ns/dbmigration-1.0.xsd">
-
-  <changeSet type="apply">
-
-    <sql>
-      <apply>
-        create table foo;
-      </apply>
-      <rollback>
-        drop table if exists foo;
-      </rollback>
-    </sql>
-
-    <createTable name="v11_table">
-      <column name="application" type="varchar(30)" notnull="true"/>
-      <column name="change_log"  type="integer"     notnull="true"/>
-      <column name="change_set"  type="integer"     notnull="true"/>
-      <column name="locked_by"   type="varchar(30)"/>
-      <column name="locked_at"   type="timestamp"/>
-    </createTable>
-
-  </changeSet>
-
-  <changeSet type="drop" generated="true">
-
-    <dropColumn columnName="fooe" tableName="hello_world"/>
-
-  </changeSet>
-
-</migration>
\ No newline at end of file
diff --git a/src/test/resources/dbmigration/app1/v2.0.xml b/src/test/resources/dbmigration/app1/v2.0.xml
deleted file mode 100644
index 5e5bb7815..000000000
--- a/src/test/resources/dbmigration/app1/v2.0.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://ebean-orm.github.io/xml/ns/dbmigration http://ebean-orm.github.io/xml/ns/dbmigration-1.0.xsd">
-
-  <changeSet type="apply">
-
-    <sql>
-      <apply>
-        create table foo;
-      </apply>
-      <rollback>
-        drop table if exists foo;
-      </rollback>
-    </sql>
-
-  </changeSet>
-
-  <changeSet type="drop" generated="true">
-    <!-- no drops to do -->
-  </changeSet>
-
-</migration>
\ No newline at end of file

From 55de9972977546fb30ceaaf1ff5593c58cd784ef Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 17 Dec 2018 23:18:29 +1300
Subject: [PATCH 0601/1036] #1578 - Remove unmaintained
 META-INF/ebean-version.mf manifest file ... use EbeanVersion.getVersion()
 instead

---
 src/main/resources/META-INF/ebean-version.mf | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 src/main/resources/META-INF/ebean-version.mf

diff --git a/src/main/resources/META-INF/ebean-version.mf b/src/main/resources/META-INF/ebean-version.mf
deleted file mode 100644
index 851cd0b1a..000000000
--- a/src/main/resources/META-INF/ebean-version.mf
+++ /dev/null
@@ -1 +0,0 @@
-api-version: 11.4

From f3213e7b90ade154c2b33e875ea61ff4bcf13322 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 17 Dec 2018 23:19:43 +1300
Subject: [PATCH 0602/1036] Bump to 11.29.1-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7a8bc375f..2e440ad19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.28.4-SNAPSHOT</version>
+  <version>11.29.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>

From c2a69714caa3a1d00bf21497008a64cd31bffd29 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 17 Dec 2018 23:39:18 +1300
Subject: [PATCH 0603/1036] [maven-release-plugin] prepare release
 ebean-11.29.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2e440ad19..0215d1fcf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.29.1-SNAPSHOT</version>
+  <version>11.29.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.29.1</tag>
   </scm>
 
   <profiles>

From 51f79e769cddb6c713d075815355996fc8a55ece Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 17 Dec 2018 23:39:34 +1300
Subject: [PATCH 0604/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0215d1fcf..ac673ed79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.29.1</version>
+  <version>11.29.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.29.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From ebdc28e1cd729d37bc3b3f45c7fab1197bf1244e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 19 Dec 2018 13:58:28 +1300
Subject: [PATCH 0605/1036] #1579 - ENH: for UpdateQuery add setLabel() and
 update() as top level methods

---
 src/main/java/io/ebean/UpdateQuery.java       | 10 ++++++
 .../server/querydefn/DefaultUpdateQuery.java  | 11 +++++++
 src/test/java/io/ebean/UpdateQueryTest.java   | 32 +++++++++++++++++++
 3 files changed, 53 insertions(+)

diff --git a/src/main/java/io/ebean/UpdateQuery.java b/src/main/java/io/ebean/UpdateQuery.java
index b4633a462..336ad38b1 100644
--- a/src/main/java/io/ebean/UpdateQuery.java
+++ b/src/main/java/io/ebean/UpdateQuery.java
@@ -154,9 +154,19 @@ public interface UpdateQuery<T> {
    */
   UpdateQuery<T> setProfileLocation(ProfileLocation profileLocation);
 
+  /**
+   * Set the label on the update query.
+   */
+  UpdateQuery<T> setLabel(String label);
+
   /**
    * Return the query expression list to add predicates to.
    */
   ExpressionList<T> where();
 
+  /**
+   * Execute the update returning the number of rows updated.
+   */
+  int update();
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java
index f9189e88b..20d4ae3a0 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java
@@ -48,8 +48,19 @@ public class DefaultUpdateQuery<T> implements UpdateQuery<T> {
     return this;
   }
 
+  @Override
+  public UpdateQuery<T> setLabel(String label) {
+    query.setLabel(label);
+    return this;
+  }
+
   @Override
   public ExpressionList<T> where() {
     return query.where();
   }
+
+  @Override
+  public int update() {
+    return query.update();
+  }
 }
diff --git a/src/test/java/io/ebean/UpdateQueryTest.java b/src/test/java/io/ebean/UpdateQueryTest.java
index 304a228f5..545712bc6 100644
--- a/src/test/java/io/ebean/UpdateQueryTest.java
+++ b/src/test/java/io/ebean/UpdateQueryTest.java
@@ -4,10 +4,12 @@ import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.meta.BasicMetricVisitor;
 import io.ebean.meta.MetaOrmQueryMetric;
+import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.model.basic.Country;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.EBasicWithUniqueCon;
+import org.tests.model.basic.ResetBasicData;
 
 import java.sql.Timestamp;
 import java.util.List;
@@ -43,6 +45,36 @@ public class UpdateQueryTest extends BaseTestCase {
     assertThat(ormQueryMetrics.get(0).getLabel()).isEqualTo("updateActive");
   }
 
+  @Test
+  public void update() {
+
+    ResetBasicData.reset();
+
+    resetAllMetrics();
+
+    UpdateQuery<Customer> update = server().update(Customer.class);
+
+    LoggedSqlCollector.start();
+
+    int rows = update
+      .setRaw("status = status")
+      .setLabel("updateAll")
+      .update();
+
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(rows).isGreaterThan(0);
+
+    assertThat(sql.get(0)).contains("update o_customer set status = status");
+
+    BasicMetricVisitor basic = visitMetricsBasic();
+    List<MetaOrmQueryMetric> ormQueryMetrics = basic.getOrmQueryMetrics();
+    assertThat(ormQueryMetrics).hasSize(1);
+    assertThat(ormQueryMetrics.get(0).getType()).isEqualTo(Customer.class);
+    assertThat(ormQueryMetrics.get(0).getLabel()).isEqualTo("updateAll");
+  }
+
   @Test
   public void update_withTransactionBatch() {
 

From 8fc6c4c6486ad6515b95120d680b65a6bce830b9 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 19 Dec 2018 14:16:36 +1300
Subject: [PATCH 0606/1036] #1580 - Refactor move io.ebeaninternal.metric to
 public package of io.ebean.metric (such that it can be used by plugins like
 redis l2 cache plugin)

---
 src/main/java/io/ebean/meta/MetricType.java               | 7 ++++++-
 .../io/{ebeaninternal => ebean}/metric/MetricFactory.java | 2 +-
 .../metric/MetricServiceProvider.java                     | 2 +-
 .../metric/QueryPlanCollector.java                        | 2 +-
 .../{ebeaninternal => ebean}/metric/QueryPlanMetric.java  | 2 +-
 .../io/{ebeaninternal => ebean}/metric/TimedMetric.java   | 2 +-
 .../{ebeaninternal => ebean}/metric/TimedMetricMap.java   | 2 +-
 .../{ebeaninternal => ebean}/metric/TimedMetricStats.java | 2 +-
 .../io/ebeaninternal/server/dto/DtoMappingRequest.java    | 4 ++--
 .../io/ebeaninternal/server/dto/DtoQueryPlanBase.java     | 4 ++--
 .../server/persist/DefaultPersistExecute.java             | 4 ++--
 .../io/ebeaninternal/server/profile/DMetricFactory.java   | 8 ++++----
 .../server/profile/DProfileLocationFactory.java           | 4 ++--
 .../ebeaninternal/server/profile/DQueryPlanCollector.java | 2 +-
 .../io/ebeaninternal/server/profile/DQueryPlanMetric.java | 6 +++---
 .../io/ebeaninternal/server/profile/DTimeMetricStats.java | 2 +-
 .../io/ebeaninternal/server/profile/DTimedMetric.java     | 2 +-
 .../io/ebeaninternal/server/profile/DTimedMetricMap.java  | 2 +-
 .../server/profile/DTimedProfileLocation.java             | 4 ++--
 .../server/profile/TimedProfileLocation.java              | 2 +-
 .../java/io/ebeaninternal/server/query/CQueryPlan.java    | 4 ++--
 .../io/ebeaninternal/server/query/CQueryPlanStats.java    | 4 ++--
 .../server/query/DefaultRelationalQueryEngine.java        | 4 ++--
 .../server/transaction/TransactionManager.java            | 6 +++---
 .../server/profile/BasicProfileLocationTest.java          | 2 +-
 25 files changed, 45 insertions(+), 40 deletions(-)
 rename src/main/java/io/{ebeaninternal => ebean}/metric/MetricFactory.java (94%)
 rename src/main/java/io/{ebeaninternal => ebean}/metric/MetricServiceProvider.java (94%)
 rename src/main/java/io/{ebeaninternal => ebean}/metric/QueryPlanCollector.java (92%)
 rename src/main/java/io/{ebeaninternal => ebean}/metric/QueryPlanMetric.java (89%)
 rename src/main/java/io/{ebeaninternal => ebean}/metric/TimedMetric.java (95%)
 rename src/main/java/io/{ebeaninternal => ebean}/metric/TimedMetricMap.java (92%)
 rename src/main/java/io/{ebeaninternal => ebean}/metric/TimedMetricStats.java (89%)

diff --git a/src/main/java/io/ebean/meta/MetricType.java b/src/main/java/io/ebean/meta/MetricType.java
index 6b39cbc47..e0d718170 100644
--- a/src/main/java/io/ebean/meta/MetricType.java
+++ b/src/main/java/io/ebean/meta/MetricType.java
@@ -25,6 +25,11 @@ public enum MetricType {
    * <p>
    * SqlQuery and SqlUpdate without a label have no metrics collected.
    */
-  SQL
+  SQL,
+
+  /**
+   * L2 cache metrics.
+   */
+  L2
 
 }
diff --git a/src/main/java/io/ebeaninternal/metric/MetricFactory.java b/src/main/java/io/ebean/metric/MetricFactory.java
similarity index 94%
rename from src/main/java/io/ebeaninternal/metric/MetricFactory.java
rename to src/main/java/io/ebean/metric/MetricFactory.java
index 72ccbb3ad..f068089d4 100644
--- a/src/main/java/io/ebeaninternal/metric/MetricFactory.java
+++ b/src/main/java/io/ebean/metric/MetricFactory.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.metric;
+package io.ebean.metric;
 
 import io.ebean.meta.MetricType;
 
diff --git a/src/main/java/io/ebeaninternal/metric/MetricServiceProvider.java b/src/main/java/io/ebean/metric/MetricServiceProvider.java
similarity index 94%
rename from src/main/java/io/ebeaninternal/metric/MetricServiceProvider.java
rename to src/main/java/io/ebean/metric/MetricServiceProvider.java
index e90649780..d6a5e3721 100644
--- a/src/main/java/io/ebeaninternal/metric/MetricServiceProvider.java
+++ b/src/main/java/io/ebean/metric/MetricServiceProvider.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.metric;
+package io.ebean.metric;
 
 import io.ebeaninternal.server.profile.DMetricFactory;
 
diff --git a/src/main/java/io/ebeaninternal/metric/QueryPlanCollector.java b/src/main/java/io/ebean/metric/QueryPlanCollector.java
similarity index 92%
rename from src/main/java/io/ebeaninternal/metric/QueryPlanCollector.java
rename to src/main/java/io/ebean/metric/QueryPlanCollector.java
index aa7e901d5..17f49a3b8 100644
--- a/src/main/java/io/ebeaninternal/metric/QueryPlanCollector.java
+++ b/src/main/java/io/ebean/metric/QueryPlanCollector.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.metric;
+package io.ebean.metric;
 
 import io.ebean.meta.MetaQueryMetric;
 
diff --git a/src/main/java/io/ebeaninternal/metric/QueryPlanMetric.java b/src/main/java/io/ebean/metric/QueryPlanMetric.java
similarity index 89%
rename from src/main/java/io/ebeaninternal/metric/QueryPlanMetric.java
rename to src/main/java/io/ebean/metric/QueryPlanMetric.java
index f0d5e31db..edc2aaf03 100644
--- a/src/main/java/io/ebeaninternal/metric/QueryPlanMetric.java
+++ b/src/main/java/io/ebean/metric/QueryPlanMetric.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.metric;
+package io.ebean.metric;
 
 import io.ebean.meta.MetricVisitor;
 
diff --git a/src/main/java/io/ebeaninternal/metric/TimedMetric.java b/src/main/java/io/ebean/metric/TimedMetric.java
similarity index 95%
rename from src/main/java/io/ebeaninternal/metric/TimedMetric.java
rename to src/main/java/io/ebean/metric/TimedMetric.java
index 1bba42bb0..cd943375f 100644
--- a/src/main/java/io/ebeaninternal/metric/TimedMetric.java
+++ b/src/main/java/io/ebean/metric/TimedMetric.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.metric;
+package io.ebean.metric;
 
 import io.ebean.meta.MetricVisitor;
 
diff --git a/src/main/java/io/ebeaninternal/metric/TimedMetricMap.java b/src/main/java/io/ebean/metric/TimedMetricMap.java
similarity index 92%
rename from src/main/java/io/ebeaninternal/metric/TimedMetricMap.java
rename to src/main/java/io/ebean/metric/TimedMetricMap.java
index 801bc74c1..70436f21a 100644
--- a/src/main/java/io/ebeaninternal/metric/TimedMetricMap.java
+++ b/src/main/java/io/ebean/metric/TimedMetricMap.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.metric;
+package io.ebean.metric;
 
 import io.ebean.meta.MetricVisitor;
 
diff --git a/src/main/java/io/ebeaninternal/metric/TimedMetricStats.java b/src/main/java/io/ebean/metric/TimedMetricStats.java
similarity index 89%
rename from src/main/java/io/ebeaninternal/metric/TimedMetricStats.java
rename to src/main/java/io/ebean/metric/TimedMetricStats.java
index 0353e56ab..03dbf2288 100644
--- a/src/main/java/io/ebeaninternal/metric/TimedMetricStats.java
+++ b/src/main/java/io/ebean/metric/TimedMetricStats.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.metric;
+package io.ebean.metric;
 
 import io.ebean.meta.MetaTimedMetric;
 
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java b/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java
index c7ab221ef..de21fd1a9 100644
--- a/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java
@@ -1,9 +1,9 @@
 package io.ebeaninternal.server.dto;
 
 import io.ebean.meta.MetricType;
+import io.ebean.metric.MetricFactory;
+import io.ebean.metric.QueryPlanMetric;
 import io.ebeaninternal.api.SpiDtoQuery;
-import io.ebeaninternal.metric.MetricFactory;
-import io.ebeaninternal.metric.QueryPlanMetric;
 
 /**
  * Request to map a resultSet columns for a query into a DTO bean.
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanBase.java b/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanBase.java
index b6218cbcd..969a131fb 100644
--- a/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanBase.java
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanBase.java
@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.dto;
 
 import io.ebean.meta.MetricVisitor;
-import io.ebeaninternal.metric.QueryPlanMetric;
-import io.ebeaninternal.metric.TimedMetric;
+import io.ebean.metric.QueryPlanMetric;
+import io.ebean.metric.TimedMetric;
 
 abstract class DtoQueryPlanBase implements DtoQueryPlan {
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersistExecute.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersistExecute.java
index 621f8338a..1a4bc7803 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersistExecute.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersistExecute.java
@@ -2,9 +2,9 @@ package io.ebeaninternal.server.persist;
 
 import io.ebean.meta.MetricType;
 import io.ebean.meta.MetricVisitor;
+import io.ebean.metric.MetricFactory;
+import io.ebean.metric.TimedMetricMap;
 import io.ebeaninternal.api.SpiTransaction;
-import io.ebeaninternal.metric.MetricFactory;
-import io.ebeaninternal.metric.TimedMetricMap;
 import io.ebeaninternal.server.core.PersistRequestCallableSql;
 import io.ebeaninternal.server.core.PersistRequestOrmUpdate;
 import io.ebeaninternal.server.core.PersistRequestUpdateSql;
diff --git a/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java b/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java
index 40cd2b36a..404dc65c6 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java
@@ -1,10 +1,10 @@
 package io.ebeaninternal.server.profile;
 
 import io.ebean.meta.MetricType;
-import io.ebeaninternal.metric.MetricFactory;
-import io.ebeaninternal.metric.QueryPlanMetric;
-import io.ebeaninternal.metric.TimedMetric;
-import io.ebeaninternal.metric.TimedMetricMap;
+import io.ebean.metric.MetricFactory;
+import io.ebean.metric.QueryPlanMetric;
+import io.ebean.metric.TimedMetric;
+import io.ebean.metric.TimedMetricMap;
 
 /**
  * Default metric factory implementation.
diff --git a/src/main/java/io/ebeaninternal/server/profile/DProfileLocationFactory.java b/src/main/java/io/ebeaninternal/server/profile/DProfileLocationFactory.java
index 950e10740..51e46ad86 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DProfileLocationFactory.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DProfileLocationFactory.java
@@ -2,9 +2,9 @@ package io.ebeaninternal.server.profile;
 
 import io.ebean.ProfileLocation;
 import io.ebean.meta.MetricType;
+import io.ebean.metric.MetricFactory;
+import io.ebean.metric.TimedMetric;
 import io.ebean.service.SpiProfileLocationFactory;
-import io.ebeaninternal.metric.MetricFactory;
-import io.ebeaninternal.metric.TimedMetric;
 
 /**
  * Default implementation of the profile location factory.
diff --git a/src/main/java/io/ebeaninternal/server/profile/DQueryPlanCollector.java b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanCollector.java
index a3903ec1f..c049b99e7 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DQueryPlanCollector.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanCollector.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.profile;
 
 import io.ebean.meta.MetaQueryMetric;
-import io.ebeaninternal.metric.QueryPlanCollector;
+import io.ebean.metric.QueryPlanCollector;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
index 1d7dff3e9..4f4240233 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
@@ -3,9 +3,9 @@ package io.ebeaninternal.server.profile;
 import io.ebean.meta.MetaQueryMetric;
 import io.ebean.meta.MetricType;
 import io.ebean.meta.MetricVisitor;
-import io.ebeaninternal.metric.QueryPlanMetric;
-import io.ebeaninternal.metric.TimedMetric;
-import io.ebeaninternal.metric.TimedMetricStats;
+import io.ebean.metric.QueryPlanMetric;
+import io.ebean.metric.TimedMetric;
+import io.ebean.metric.TimedMetricStats;
 
 class DQueryPlanMetric implements QueryPlanMetric {
 
diff --git a/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java b/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
index dc446b4a6..9dde68b79 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.profile;
 
 import io.ebean.meta.MetricType;
-import io.ebeaninternal.metric.TimedMetricStats;
+import io.ebean.metric.TimedMetricStats;
 
 /**
  * Snapshot of the current statistics for a Counter or TimeCounter.
diff --git a/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java b/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
index bb7ee0b6f..e7eb4096d 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.profile;
 
 import io.ebean.meta.MetricType;
 import io.ebean.meta.MetricVisitor;
-import io.ebeaninternal.metric.TimedMetric;
+import io.ebean.metric.TimedMetric;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.LongAccumulator;
diff --git a/src/main/java/io/ebeaninternal/server/profile/DTimedMetricMap.java b/src/main/java/io/ebeaninternal/server/profile/DTimedMetricMap.java
index 37f1b7632..f9e6a8472 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DTimedMetricMap.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DTimedMetricMap.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.profile;
 
 import io.ebean.meta.MetricType;
 import io.ebean.meta.MetricVisitor;
-import io.ebeaninternal.metric.TimedMetricMap;
+import io.ebean.metric.TimedMetricMap;
 
 import java.util.concurrent.ConcurrentHashMap;
 
diff --git a/src/main/java/io/ebeaninternal/server/profile/DTimedProfileLocation.java b/src/main/java/io/ebeaninternal/server/profile/DTimedProfileLocation.java
index 5479bc686..f9403b8bb 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DTimedProfileLocation.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DTimedProfileLocation.java
@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.profile;
 
 import io.ebean.meta.MetricVisitor;
-import io.ebeaninternal.metric.TimedMetric;
-import io.ebeaninternal.metric.TimedMetricStats;
+import io.ebean.metric.TimedMetric;
+import io.ebean.metric.TimedMetricStats;
 
 /**
  * Default profile location that uses stack trace.
diff --git a/src/main/java/io/ebeaninternal/server/profile/TimedProfileLocation.java b/src/main/java/io/ebeaninternal/server/profile/TimedProfileLocation.java
index 6402993ce..bc98f2fd2 100644
--- a/src/main/java/io/ebeaninternal/server/profile/TimedProfileLocation.java
+++ b/src/main/java/io/ebeaninternal/server/profile/TimedProfileLocation.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.profile;
 
 import io.ebean.ProfileLocation;
 import io.ebean.meta.MetricVisitor;
-import io.ebeaninternal.metric.TimedMetric;
+import io.ebean.metric.TimedMetric;
 
 /**
  * ProfileLocation that collects timing metrics.
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
index 657a2bdcc..e2ad826d7 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
@@ -4,11 +4,11 @@ import io.ebean.ProfileLocation;
 import io.ebean.bean.ObjectGraphNode;
 import io.ebean.config.dbplatform.SqlLimitResponse;
 import io.ebean.meta.MetricType;
+import io.ebean.metric.MetricFactory;
+import io.ebean.metric.TimedMetric;
 import io.ebeaninternal.api.CQueryPlanKey;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiQuery;
-import io.ebeaninternal.metric.MetricFactory;
-import io.ebeaninternal.metric.TimedMetric;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
 import io.ebeaninternal.server.query.CQueryPlanStats.Snapshot;
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
index 83defb38a..56653ef95 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
@@ -5,8 +5,8 @@ import io.ebean.bean.ObjectGraphNode;
 import io.ebean.meta.MetaOrmQueryMetric;
 import io.ebean.meta.MetaOrmQueryOrigin;
 import io.ebean.meta.MetricType;
-import io.ebeaninternal.metric.TimedMetric;
-import io.ebeaninternal.metric.TimedMetricStats;
+import io.ebean.metric.TimedMetric;
+import io.ebean.metric.TimedMetricStats;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
index d46aaf0a3..d580a878c 100644
--- a/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
@@ -5,9 +5,9 @@ import io.ebean.RowMapper;
 import io.ebean.SqlRow;
 import io.ebean.meta.MetricType;
 import io.ebean.meta.MetricVisitor;
+import io.ebean.metric.MetricFactory;
+import io.ebean.metric.TimedMetricMap;
 import io.ebeaninternal.api.SpiQuery;
-import io.ebeaninternal.metric.MetricFactory;
-import io.ebeaninternal.metric.TimedMetricMap;
 import io.ebeaninternal.server.core.Message;
 import io.ebeaninternal.server.core.RelationalQueryEngine;
 import io.ebeaninternal.server.core.RelationalQueryRequest;
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index ee1ded434..3a79d43b9 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -15,6 +15,9 @@ import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeSet;
 import io.ebean.meta.MetricType;
 import io.ebean.meta.MetricVisitor;
+import io.ebean.metric.MetricFactory;
+import io.ebean.metric.TimedMetric;
+import io.ebean.metric.TimedMetricMap;
 import io.ebeaninternal.api.ScopeTrans;
 import io.ebeaninternal.api.ScopedTransaction;
 import io.ebeaninternal.api.SpiLogManager;
@@ -25,9 +28,6 @@ import io.ebeaninternal.api.SpiTransactionManager;
 import io.ebeaninternal.api.TransactionEvent;
 import io.ebeaninternal.api.TransactionEventTable;
 import io.ebeaninternal.api.TransactionEventTable.TableIUD;
-import io.ebeaninternal.metric.MetricFactory;
-import io.ebeaninternal.metric.TimedMetric;
-import io.ebeaninternal.metric.TimedMetricMap;
 import io.ebeaninternal.server.cache.CacheChangeSet;
 import io.ebeaninternal.server.cluster.ClusterManager;
 import io.ebeaninternal.server.core.ClockService;
diff --git a/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java b/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java
index 457bfad89..7ec7e7667 100644
--- a/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java
+++ b/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.profile;
 
 import io.ebean.meta.MetricType;
-import io.ebeaninternal.metric.MetricFactory;
+import io.ebean.metric.MetricFactory;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;

From 138b587ff7da350172fb1365475f3872d24cb4ff Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 19 Dec 2018 14:45:33 +1300
Subject: [PATCH 0607/1036] #1581 - ENH: Add query.asUpdate() ... to convert a
 query into an UpdateQuery (typically with query beans)

---
 pom.xml                                       |  2 +-
 src/main/java/io/ebean/ExpressionList.java    | 32 ++++++++++++++++++
 src/main/java/io/ebean/Query.java             | 33 ++++++++++++++++++-
 .../expression/DefaultExpressionList.java     |  6 ++++
 .../server/expression/JunctionExpression.java |  6 ++++
 .../server/querydefn/DefaultOrmQuery.java     |  6 ++++
 src/test/java/io/ebean/UpdateQueryTest.java   | 23 +++++++++++++
 7 files changed, 106 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ac673ed79..19cda5e30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.29.2-SNAPSHOT</version>
+  <version>11.30.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
diff --git a/src/main/java/io/ebean/ExpressionList.java b/src/main/java/io/ebean/ExpressionList.java
index 5a68a6308..a001bcfdb 100644
--- a/src/main/java/io/ebean/ExpressionList.java
+++ b/src/main/java/io/ebean/ExpressionList.java
@@ -128,6 +128,38 @@ public interface ExpressionList<T> {
    */
   <D> DtoQuery<D> asDto(Class<D> dtoClass);
 
+  /**
+   * Return the underlying query as an UpdateQuery.
+   * <p>
+   * Typically this is used with query beans to covert a query bean
+   * query into an UpdateQuery like the examples below.
+   * </p>
+   *
+   * <pre>{@code
+   *
+   *  int rowsUpdated = new QCustomer()
+   *       .name.startsWith("Rob")
+   *       .asUpdate()
+   *       .set("active", false)
+   *       .update();;
+   *
+   * }</pre>
+   *
+   * <pre>{@code
+   *
+   *   int rowsUpdated = new QContact()
+   *       .notes.note.startsWith("Make Inactive")
+   *       .email.endsWith("@foo.com")
+   *       .customer.id.equalTo(42)
+   *       .asUpdate()
+   *       .set("inactive", true)
+   *       .setRaw("email = lower(email)")
+   *       .update();
+   *
+   * }</pre>
+   */
+  UpdateQuery<T> asUpdate();
+
   /**
    * Execute using "for update" clause which results in the DB locking the record.
    */
diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index a1d34375d..eb4e0daa4 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -244,6 +244,38 @@ public interface Query<T> {
    */
   <D> DtoQuery<D> asDto(Class<D> dtoClass);
 
+  /**
+   * Convert the query to a UpdateQuery.
+   * <p>
+   * Typically this is used with query beans to covert a query bean
+   * query into an UpdateQuery like the examples below.
+   * </p>
+   *
+   * <pre>{@code
+   *
+   *  int rowsUpdated = new QCustomer()
+   *       .name.startsWith("Rob")
+   *       .asUpdate()
+   *       .set("active", false)
+   *       .update();;
+   *
+   * }</pre>
+   *
+   * <pre>{@code
+   *
+   *   int rowsUpdated = new QContact()
+   *       .notes.note.startsWith("Make Inactive")
+   *       .email.endsWith("@foo.com")
+   *       .customer.id.equalTo(42)
+   *       .asUpdate()
+   *       .set("inactive", true)
+   *       .setRaw("email = lower(email)")
+   *       .update();
+   *
+   * }</pre>
+   */
+  UpdateQuery<T> asUpdate();
+
   /**
    * Cancel the query execution if supported by the underlying database and
    * driver.
@@ -1329,7 +1361,6 @@ public interface Query<T> {
    *   count:1 orderStatus:COMPLETE
    *
    * }</pre>
-   *
    */
   Query<T> setCountDistinct(CountDistinctOrder orderBy);
 
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 6a64b1b1b..85a8ffb26 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -18,6 +18,7 @@ import io.ebean.Pairs;
 import io.ebean.Query;
 import io.ebean.QueryIterator;
 import io.ebean.Transaction;
+import io.ebean.UpdateQuery;
 import io.ebean.Version;
 import io.ebean.event.BeanQueryRequest;
 import io.ebean.search.Match;
@@ -302,6 +303,11 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return query.asDto(dtoClass);
   }
 
+  @Override
+  public UpdateQuery<T> asUpdate() {
+    return query.asUpdate();
+  }
+
   @Override
   public Query<T> setIncludeSoftDeletes() {
     return query.setIncludeSoftDeletes();
diff --git a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index a4c2206db..e1c5a5a79 100644
--- a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -17,6 +17,7 @@ import io.ebean.Pairs;
 import io.ebean.Query;
 import io.ebean.QueryIterator;
 import io.ebean.Transaction;
+import io.ebean.UpdateQuery;
 import io.ebean.Version;
 import io.ebean.event.BeanQueryRequest;
 import io.ebean.search.Match;
@@ -349,6 +350,11 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.asDto(dtoClass);
   }
 
+  @Override
+  public UpdateQuery<T> asUpdate() {
+    return exprList.asUpdate();
+  }
+
   @Override
   public Query<T> setIncludeSoftDeletes() {
     return exprList.setIncludeSoftDeletes();
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 1f9056c3e..fc43615b3 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -22,6 +22,7 @@ import io.ebean.QueryIterator;
 import io.ebean.QueryType;
 import io.ebean.RawSql;
 import io.ebean.Transaction;
+import io.ebean.UpdateQuery;
 import io.ebean.Version;
 import io.ebean.bean.CallStack;
 import io.ebean.bean.ObjectGraphNode;
@@ -296,6 +297,11 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return server.findDto(dtoClass, this);
   }
 
+  @Override
+  public UpdateQuery<T> asUpdate() {
+    return new DefaultUpdateQuery<>(this);
+  }
+
   @Override
   public BeanDescriptor<T> getBeanDescriptor() {
     return beanDescriptor;
diff --git a/src/test/java/io/ebean/UpdateQueryTest.java b/src/test/java/io/ebean/UpdateQueryTest.java
index 545712bc6..5a5d9b698 100644
--- a/src/test/java/io/ebean/UpdateQueryTest.java
+++ b/src/test/java/io/ebean/UpdateQueryTest.java
@@ -75,6 +75,29 @@ public class UpdateQueryTest extends BaseTestCase {
     assertThat(ormQueryMetrics.get(0).getLabel()).isEqualTo("updateAll");
   }
 
+  @Test
+  public void query_asUpdate() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    int rows = server().find(Customer.class)
+      .where()
+      .gt("id", 1000)
+      .asUpdate()
+      .setRaw("status = status")
+      .setLabel("asUpdate")
+      .update();
+
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(rows).isEqualTo(0);
+
+    assertThat(sql.get(0)).contains("update o_customer set status = status where id > ?");
+  }
+
   @Test
   public void update_withTransactionBatch() {
 

From e7811910e95a6273f1c057bd51df73743a5fb529 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 19 Dec 2018 15:15:38 +1300
Subject: [PATCH 0608/1036] No effective change - update javadoc

---
 src/main/java/io/ebean/DtoQuery.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/ebean/DtoQuery.java b/src/main/java/io/ebean/DtoQuery.java
index c99ffdfbb..c72a16216 100644
--- a/src/main/java/io/ebean/DtoQuery.java
+++ b/src/main/java/io/ebean/DtoQuery.java
@@ -30,7 +30,7 @@ import java.util.function.Predicate;
  *   String sql = "select id, name from customer where name like :name and status_code = :status";
  *
  *   List<CustomerDto> beans =
- *     Ebean.findDto(CustomrDto.class, sql)
+ *     Ebean.findDto(CustomerDto.class, sql)
  *     .setParameter("name", "Acme%")
  *     .setParameter("status", "ACTIVE")
  *     .findList();

From e611353163a1eecff4152f25cbca6f0d5549da72 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 19 Dec 2018 15:22:32 +1300
Subject: [PATCH 0609/1036] No effective change - update javadoc for
 QueryIterator to use try with resources

---
 src/main/java/io/ebean/Query.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index eb4e0daa4..601e3a889 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -668,15 +668,13 @@ public interface Query<T> {
    *     .where().eq("status", Status.NEW)
    *     .order().asc("id");
    *
-   *  QueryIterator<Customer> it = query.findIterate();
-   *  try {
+   *  // use try with resources to ensure QueryIterator is closed
+   *
+   *  try (QueryIterator<Customer> it = query.findIterate()) {
    *    while (it.hasNext()) {
    *      Customer customer = it.next();
    *      // do something with customer ...
    *    }
-   *  } finally {
-   *    // close the underlying resources
-   *    it.close();
    *  }
    *
    * }</pre>

From 94591954b3891d5de6785e72b358fe0d6a7cc582 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 19 Dec 2018 16:04:28 +1300
Subject: [PATCH 0610/1036] 1476 - Query plan capture, initial wip capturing
 bind params (#1477)

* 1476 - Query plan capture, initial wip capturing bind params

* No effective change - Reset test default db to H2

* #1476 - Query plan capture, initial wip capturing bind params #1477

Update with consumer

* #1476 - Query plan capture, initial wip capturing bind params #1477

Update with query plan request

* #1476 - Query plan capture, initial wip capturing bind params #1477

Extract interface

* #1476 - Query plan capture, initial wip capturing bind params #1477

Extract interface
---
 .../java/io/ebean/config/ServerConfig.java    |  20 +
 .../java/io/ebean/meta/MetaInfoManager.java   |   6 +
 .../java/io/ebean/meta/MetaQueryPlan.java     |  23 +
 .../java/io/ebean/meta/QueryPlanRequest.java  |  97 ++++
 .../api/NaturalKeyQueryData.java              |   1 -
 .../platform/HanaColumnStoreDdl.java          |   4 +-
 .../ddlgeneration/platform/HanaTableDdl.java  |   6 +-
 .../ddlgeneration/platform/PlatformDdl.java   |  15 +-
 .../server/core/BasicTypeConverter.java       |   1 -
 .../server/core/DefaultMetaInfoManager.java   |   7 +
 .../server/core/DefaultServer.java            |  26 +-
 .../server/core/InternalConfiguration.java    |   2 +-
 .../core/MultiTenantDbCatalogSupplier.java    |   2 +-
 .../core/MultiTenantDbSchemaSupplier.java     |   2 +-
 .../server/core/SimpleDataSourceProvider.java |   2 +-
 .../server/deploy/BeanDescriptor.java         |  10 +-
 .../server/deploy/BeanDescriptorManager.java  |   9 +
 .../server/el/ElComparatorProperty.java       |   4 +-
 .../server/el/ElPropertyChain.java            |   2 +-
 .../server/expression/InExpression.java       |   2 +-
 .../server/expression/NullExpression.java     |   2 +-
 .../server/grammer/antlr/EQLLexer.java        |  16 +-
 .../server/grammer/antlr/EQLParser.java       |  24 +-
 .../io/ebeaninternal/server/query/CQuery.java |   4 +-
 .../server/query/CQueryBindCapture.java       |  73 +++
 .../server/query/CQueryBuilderRawSql.java     |   2 +-
 .../query/CQueryFetchSingleAttribute.java     |   4 +-
 .../server/query/CQueryPlan.java              |  40 +-
 .../server/query/CQueryRowCount.java          |   4 +-
 .../server/query/CQueryUpdate.java            |   4 +-
 .../server/query/DQueryPlanOutput.java        | 108 +++++
 .../server/query/PlatformQueryPlan.java       |  36 ++
 .../server/query/QueryPlanLogger.java         |  47 ++
 .../server/query/QueryPlanLoggerExplain.java  |  30 ++
 .../server/query/QueryPlanLoggerOracle.java   |  37 ++
 .../server/query/QueryPlanLoggerPostgres.java |  31 ++
 .../query/QueryPlanLoggerSqlServer.java       |  52 +++
 .../ebeaninternal/server/type/DataBind.java   |   2 +-
 .../server/type/DataBindCapture.java          |  38 ++
 .../server/type/DefaultTypeManager.java       |   1 -
 .../type/ScalarTypeJsonObjectMapper.java      |  12 +-
 .../server/type/bindcapture/BindCapture.java  |  34 ++
 .../type/bindcapture/BindCaptureEntry.java    |  10 +
 .../bindcapture/BindCaptureStatement.java     | 120 +++++
 .../bindcapture/BindCaptureStatementBase.java | 441 ++++++++++++++++++
 .../type/bindcapture/BindCaptureTypes.java    | 406 ++++++++++++++++
 src/test/java/io/ebean/BaseTestCase.java      |   7 +-
 .../java/io/ebean/DtoQueryFromOrmTest.java    |   1 -
 .../dbplatform/HanaHistorySupportTest.java    |   9 +-
 .../io/ebean/plugin/ExpressionPathTest.java   |   2 +-
 .../dbmigration/DbMigrationTest.java          |   1 -
 .../ddlgeneration/platform/HanaDdlTest.java   |  11 +-
 .../platform/HanaDbExpressionTest.java        |  11 +-
 .../server/query/SqlTreeBuilderTest.java      |   2 +-
 .../TunedQueryWithNullFetchedBeanTest.java    |   6 +-
 .../java/org/tests/basic/MainDbBoolean.java   |   4 +-
 .../org/tests/basic/TestErrorBindLog.java     |   2 +-
 .../basic/TestLazyLoadEmptyOneToMany.java     |   4 +-
 .../java/org/tests/basic/TestTransient.java   |   4 +-
 .../TestBatchSaveWithGetBeanId.java           |   2 +-
 .../tests/batchload/TestBasicNavOnEmpty.java  |   4 +-
 .../batchload/TestEmptyManyLazyLoad.java      |   2 +-
 .../batchload/TestSecondQueryNoRows.java      |   2 +-
 .../java/org/tests/cache/TestBeanCache.java   |   4 +-
 .../TestCacheInterceptSaveWhenLazyLoaded.java |   2 +-
 .../org/tests/changelog/TestChangeLog.java    |   6 +-
 .../TestDeleteByIdWithPersistenceContext.java |   4 +-
 .../cache/TestInheritanceRefCache.java        |   7 +-
 .../org/tests/json/TestDbJson_Jackson.java    |  13 +-
 .../org/tests/json/TestDbJson_Jackson2.java   |  13 +-
 .../java/org/tests/merge/TestMergeM2M.java    |  24 +-
 .../tests/model/array/TestDbArray_asSet.java  |   1 -
 .../tests/model/array/TestDbArray_basic.java  |  21 +-
 .../org/tests/model/basic/CKeyParent.java     |   1 -
 .../org/tests/model/basic/ResetBasicData.java |   1 -
 .../cache/TestCacheViaComplexNaturalKey3.java |   1 -
 .../TestElementCollectionBasicCache.java      |   3 +-
 .../TestElementCollectionBasicMap.java        |   1 -
 .../TestElementCollectionBasicMapCache.java   |   3 +-
 ...estElementCollectionEmbeddedListCache.java |   1 -
 .../tests/model/json/EBasicJsonJackson.java   |   4 +-
 .../tests/model/json/EBasicJsonJackson2.java  |   4 +-
 .../java/org/tests/model/nofk/EFile2NoFk.java |   8 +-
 .../java/org/tests/model/nofk/EFileNoFk.java  |   5 +-
 .../java/org/tests/model/nofk/EUserNoFk.java  |   3 +-
 .../tests/model/nofk/EUserNoFkSoftDel.java    |  11 +-
 .../java/org/tests/model/nofk/Test2NoFk.java  |   4 +-
 .../java/org/tests/model/nofk/TestNoFk.java   |   6 +-
 .../tests/model/uuidsibling/USibChild.java    |   4 +-
 .../model/uuidsibling/USibChildSibling.java   |   3 +-
 .../tests/model/uuidsibling/USibParent.java   |   4 +-
 .../tests/model/view/TestViewBaseEntity.java  |   2 +-
 .../o2m/jointable/TestOneToManyJoinTable.java |   1 -
 .../java/org/tests/query/TestOuterJoin.java   |  14 +-
 .../query/TestQueryFilterCaseInsensitive.java |   4 +-
 .../org/tests/query/TestQueryFindIterate.java |   2 +-
 .../tests/query/TestQueryFindPagedList.java   |   8 +-
 .../aggregation/TestAggregationCount.java     |  18 +-
 .../query/finder/TestCustomerFinder.java      |  10 +
 .../orderby/TestOrderByWithDistinct.java      |   4 +-
 .../other/TestFindWhereUsingEnumerated.java   |   3 +-
 .../org/tests/text/csv/TestCsvReader.java     |   2 +-
 .../text/csv/TestCsvReaderWithCallback.java   |   6 +-
 .../text/json/TestTextJsonInsertUpdate.java   |   2 +-
 .../java/org/tests/types/TestPeriodType.java  |   2 +-
 .../org/tests/unitinternal/HelloMain.java     |   4 +-
 .../org/tests/update/TestUpdatePartial.java   |   2 +-
 src/test/resources/ebean.properties           |   2 +
 108 files changed, 1908 insertions(+), 233 deletions(-)
 create mode 100644 src/main/java/io/ebean/meta/MetaQueryPlan.java
 create mode 100644 src/main/java/io/ebean/meta/QueryPlanRequest.java
 create mode 100644 src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
 create mode 100644 src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java
 create mode 100644 src/main/java/io/ebeaninternal/server/query/PlatformQueryPlan.java
 create mode 100644 src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java
 create mode 100644 src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java
 create mode 100644 src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java
 create mode 100644 src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java
 create mode 100644 src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java
 create mode 100644 src/main/java/io/ebeaninternal/server/type/DataBindCapture.java
 create mode 100644 src/main/java/io/ebeaninternal/server/type/bindcapture/BindCapture.java
 create mode 100644 src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureEntry.java
 create mode 100644 src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureStatement.java
 create mode 100644 src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureStatementBase.java
 create mode 100644 src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureTypes.java

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 3ee4568be..e6a978d46 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -486,6 +486,11 @@ public class ServerConfig {
    */
   private boolean notifyL2CacheInForeground;
 
+  /**
+   * Set to true to support query plan capture.
+   */
+  private boolean collectQueryPlans;
+
   /**
    * The time in millis used to determine when a query is alerted for being slow.
    */
@@ -2832,6 +2837,7 @@ public class ServerConfig {
 
     queryPlanTTLSeconds = p.getInt("queryPlanTTLSeconds", queryPlanTTLSeconds);
     slowQueryMillis = p.getLong("slowQueryMillis", slowQueryMillis);
+    collectQueryPlans = p.getBoolean("collectQueryPlans", collectQueryPlans);
     docStoreOnly = p.getBoolean("docStoreOnly", docStoreOnly);
     disableL2Cache = p.getBoolean("disableL2Cache", disableL2Cache);
     notifyL2CacheInForeground = p.getBoolean("notifyL2CacheInForeground", notifyL2CacheInForeground);
@@ -3197,6 +3203,20 @@ public class ServerConfig {
     this.idGeneratorAutomatic = idGeneratorAutomatic;
   }
 
+  /**
+   * Return true if query plan capture is enabled.
+   */
+  public boolean isCollectQueryPlans() {
+    return collectQueryPlans;
+  }
+
+  /**
+   * Set to true to enable query plan capture.
+   */
+  public void setCollectQueryPlans(boolean collectQueryPlans) {
+    this.collectQueryPlans = collectQueryPlans;
+  }
+
   public enum UuidVersion {
     VERSION4,
     VERSION1,
diff --git a/src/main/java/io/ebean/meta/MetaInfoManager.java b/src/main/java/io/ebean/meta/MetaInfoManager.java
index 9535de536..74d0e7882 100644
--- a/src/main/java/io/ebean/meta/MetaInfoManager.java
+++ b/src/main/java/io/ebean/meta/MetaInfoManager.java
@@ -1,12 +1,18 @@
 package io.ebean.meta;
 
 import java.util.List;
+import java.util.function.Consumer;
 
 /**
  * Provides access to the meta data in EbeanServer such as query execution statistics.
  */
 public interface MetaInfoManager {
 
+  /**
+   * Collect query plans.
+   */
+  List<MetaQueryPlan> collectQueryPlans(QueryPlanRequest request);
+
   /**
    * Visit the metrics resetting and collecting/reporting as desired.
    */
diff --git a/src/main/java/io/ebean/meta/MetaQueryPlan.java b/src/main/java/io/ebean/meta/MetaQueryPlan.java
new file mode 100644
index 000000000..f24ff94fa
--- /dev/null
+++ b/src/main/java/io/ebean/meta/MetaQueryPlan.java
@@ -0,0 +1,23 @@
+package io.ebean.meta;
+
+public interface MetaQueryPlan {
+
+  Class<?> getBeanType();
+
+  /**
+   * Return a string representation of the query plan hash.
+   */
+  String getQueryPlanHash();
+
+  String getLabel();
+
+  String getSql();
+
+  String getBind();
+
+  String getPlan();
+
+  long getQueryTimeMicros();
+
+  long getCaptureCount();
+}
diff --git a/src/main/java/io/ebean/meta/QueryPlanRequest.java b/src/main/java/io/ebean/meta/QueryPlanRequest.java
new file mode 100644
index 000000000..20b12c145
--- /dev/null
+++ b/src/main/java/io/ebean/meta/QueryPlanRequest.java
@@ -0,0 +1,97 @@
+package io.ebean.meta;
+
+import java.sql.Connection;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Request used to capture query plans.
+ */
+public class QueryPlanRequest {
+
+  private List<MetaQueryPlan> plans = new ArrayList<>();
+
+  private Connection connection;
+
+  private boolean store;
+
+  private long since;
+
+  private Set<Class<?>> includedBeanTypes;
+
+  private Set<String> includedLabels;
+
+  public List<MetaQueryPlan> getPlans() {
+    return plans;
+  }
+
+  /**
+   * Return the connection to use to capture the query plans.
+   */
+  public Connection getConnection() {
+    return connection;
+  }
+
+  /**
+   * Set the connection to use to capture the query plans.
+   */
+  public void setConnection(Connection connection) {
+    this.connection = connection;
+  }
+
+  /**
+   * Return true if the captured query plan is stored.
+   */
+  public boolean isStore() {
+    return store;
+  }
+
+  /**
+   * Set to true to store the captured query plan.
+   */
+  public void setStore(boolean store) {
+    this.store = store;
+  }
+
+  /**
+   * Return the epoch time after which the query plan was capture (to be included).
+   */
+  public long getSince() {
+    return since;
+  }
+
+  /**
+   * Set the epoch time after which the query plan was captured.
+   * <p>
+   * This is used to only capture plans that have changed since a given time (like the time of last capture).
+   * </p>
+   *
+   * @param since The time after which the query plan was captured to be included
+   */
+  public void setSince(long since) {
+    this.since = since;
+  }
+
+  /**
+   * Process consume the query plan.
+   */
+  public void process(MetaQueryPlan plan) {
+    plans.add(plan);
+  }
+
+  /**
+   * Return true if the bean type should be included in the query plan capture.
+   */
+  public boolean includeType(Class<?> beanType) {
+    return includedBeanTypes == null || includedBeanTypes.isEmpty() || includedBeanTypes.contains(beanType);
+  }
+
+  /**
+   * Return true if the label should be included in the query plan capture.
+   */
+  public boolean includeLabel(String label) {
+    return includedLabels == null || includedLabels.isEmpty() || includedLabels.contains(label);
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java b/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java
index ddd02d768..37ff3d2f2 100644
--- a/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java
+++ b/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java
@@ -3,7 +3,6 @@ package io.ebeaninternal.api;
 import io.ebean.Pairs;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaColumnStoreDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaColumnStoreDdl.java
index b3b36c3ef..da679d9a5 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaColumnStoreDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaColumnStoreDdl.java
@@ -1,10 +1,10 @@
 package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
-import java.io.IOException;
-
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
 
+import java.io.IOException;
+
 public class HanaColumnStoreDdl extends AbstractHanaDdl {
 
   public HanaColumnStoreDdl(DatabasePlatform platform) {
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaTableDdl.java
index 943dc3ecd..8740db1c4 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaTableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaTableDdl.java
@@ -1,8 +1,5 @@
 package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
-import java.io.IOException;
-import java.util.List;
-
 import io.ebean.config.PropertiesWrapper;
 import io.ebean.config.ServerConfig;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
@@ -12,6 +9,9 @@ import io.ebeaninternal.dbmigration.migration.Column;
 import io.ebeaninternal.dbmigration.migration.DropColumn;
 import io.ebeaninternal.dbmigration.model.MTable;
 
+import java.io.IOException;
+import java.util.List;
+
 public class HanaTableDdl extends BaseTableDdl {
 
   private final HanaHistoryDdl historyDdl;
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
index a07dcdfd6..f6a65da81 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -20,7 +20,6 @@ import io.ebeaninternal.dbmigration.migration.Column;
 import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
 import io.ebeaninternal.dbmigration.migration.IdentityType;
 import io.ebeaninternal.dbmigration.model.MTable;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -78,7 +77,7 @@ public class PlatformDdl {
   protected String dropIndexIfExists = "drop index if exists ";
 
   protected String alterColumn = "alter column";
-  
+
   protected String alterColumnSuffix = "";
 
   protected String dropUniqueConstraint = "drop constraint";
@@ -86,7 +85,7 @@ public class PlatformDdl {
   protected String addConstraint = "add constraint";
 
   protected String addColumn = "add column";
-  
+
   protected String addColumnSuffix = "";
 
   protected String columnSetType = "";
@@ -100,11 +99,11 @@ public class PlatformDdl {
   protected String columnSetNull = "set null";
 
   protected String updateNullWithDefault = "update ${table} set ${column} = ${default} where ${column} is null";
-  
+
   protected String createTable = "create table";
-  
+
   protected String dropColumn = "drop column";
-  
+
   protected String dropColumnSuffix = "";
 
   /**
@@ -674,12 +673,12 @@ public class PlatformDdl {
   public void unlockTables(DdlBuffer buffer, Collection<String> tables) throws IOException {
 
   }
-  
+
   /**
    * Returns the database-specific "create table" command prefix. For HANA this is
    * either "create column table" or "create row table", for all other databases
    * it is "create table".
-   * 
+   *
    * @return The "create table" command prefix
    */
   public String getCreateTableCommandPrefix() {
diff --git a/src/main/java/io/ebeaninternal/server/core/BasicTypeConverter.java b/src/main/java/io/ebeaninternal/server/core/BasicTypeConverter.java
index b87a1c287..dbdf6b110 100644
--- a/src/main/java/io/ebeaninternal/server/core/BasicTypeConverter.java
+++ b/src/main/java/io/ebeaninternal/server/core/BasicTypeConverter.java
@@ -7,7 +7,6 @@ import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.sql.Timestamp;
 import java.sql.Types;
-import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java b/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java
index 6ebc4152d..377ccb081 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java
@@ -6,8 +6,10 @@ import io.ebean.meta.MetaInfoManager;
 import io.ebean.meta.MetaOrmQueryMetric;
 import io.ebean.meta.MetaOrmQueryNode;
 import io.ebean.meta.MetaQueryMetric;
+import io.ebean.meta.MetaQueryPlan;
 import io.ebean.meta.MetaTimedMetric;
 import io.ebean.meta.MetricVisitor;
+import io.ebean.meta.QueryPlanRequest;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,6 +25,11 @@ public class DefaultMetaInfoManager implements MetaInfoManager {
     this.server = server;
   }
 
+  @Override
+  public List<MetaQueryPlan> collectQueryPlans(QueryPlanRequest request) {
+    return server.collectQueryPlans(request);
+  }
+
   @Override
   public void visitMetrics(MetricVisitor visitor) {
     server.visitMetrics(visitor);
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 1872c0f5b..5b9e2893c 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -54,13 +54,16 @@ import io.ebean.event.BeanPersistController;
 import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.meta.MetaInfoManager;
+import io.ebean.meta.MetaQueryPlan;
 import io.ebean.meta.MetricVisitor;
+import io.ebean.meta.QueryPlanRequest;
 import io.ebean.plugin.BeanType;
 import io.ebean.plugin.Plugin;
 import io.ebean.plugin.Property;
 import io.ebean.plugin.SpiServer;
 import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;
+import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.LoadBeanRequest;
 import io.ebeaninternal.api.LoadManyRequest;
 import io.ebeaninternal.api.ScopedTransaction;
@@ -120,6 +123,8 @@ import javax.persistence.NonUniqueResultException;
 import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.SQLException;
 import java.time.Clock;
 import java.util.Collection;
 import java.util.Collections;
@@ -2335,10 +2340,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   @Override
   public void slowQueryCheck(long timeMicros, int rowCount, SpiQuery<?> query) {
-    if (timeMicros > slowQueryMicros) {
-      if (slowQueryListener != null) {
-        slowQueryListener.process(new SlowQueryEvent(query.getGeneratedSql(), timeMicros / 1000L, rowCount, query.getParentNode()));
-      }
+    if (timeMicros > slowQueryMicros && slowQueryListener != null) {
+      slowQueryListener.process(new SlowQueryEvent(query.getGeneratedSql(), timeMicros / 1000L, rowCount, query.getParentNode()));
     }
   }
 
@@ -2425,4 +2428,19 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
     visitor.visitEnd();
   }
+
+  public List<MetaQueryPlan> collectQueryPlans(QueryPlanRequest request) {
+    Connection connection = null;
+    try {
+      connection = getDataSource().getConnection();
+      request.setConnection(connection);
+      beanDescriptorManager.collectQueryPlans(request);
+    } catch (SQLException e) {
+      throw new RuntimeException(e);
+
+    } finally {
+      JdbcClose.close(connection);
+    }
+    return request.getPlans();
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index c27c530d1..bfe2d756e 100644
--- a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -15,6 +15,7 @@ import io.ebean.config.ServerConfig;
 import io.ebean.config.SlowQueryListener;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbHistorySupport;
+import io.ebean.datasource.DataSourcePool;
 import io.ebean.event.changelog.ChangeLogListener;
 import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeLogRegister;
@@ -87,7 +88,6 @@ import io.ebeanservice.docstore.api.DocStoreFactory;
 import io.ebeanservice.docstore.api.DocStoreIntegration;
 import io.ebeanservice.docstore.api.DocStoreUpdateProcessor;
 import io.ebeanservice.docstore.none.NoneDocStoreFactory;
-import io.ebean.datasource.DataSourcePool;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/ebeaninternal/server/core/MultiTenantDbCatalogSupplier.java b/src/main/java/io/ebeaninternal/server/core/MultiTenantDbCatalogSupplier.java
index f1dfc07e1..936a79c3b 100644
--- a/src/main/java/io/ebeaninternal/server/core/MultiTenantDbCatalogSupplier.java
+++ b/src/main/java/io/ebeaninternal/server/core/MultiTenantDbCatalogSupplier.java
@@ -2,8 +2,8 @@ package io.ebeaninternal.server.core;
 
 import io.ebean.config.CurrentTenantProvider;
 import io.ebean.config.TenantCatalogProvider;
-import io.ebeaninternal.server.transaction.DataSourceSupplier;
 import io.ebean.datasource.DataSourcePool;
+import io.ebeaninternal.server.transaction.DataSourceSupplier;
 
 import javax.sql.DataSource;
 import java.io.PrintWriter;
diff --git a/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java b/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java
index a309f4f2f..a31f48896 100644
--- a/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java
+++ b/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java
@@ -2,8 +2,8 @@ package io.ebeaninternal.server.core;
 
 import io.ebean.config.CurrentTenantProvider;
 import io.ebean.config.TenantSchemaProvider;
-import io.ebeaninternal.server.transaction.DataSourceSupplier;
 import io.ebean.datasource.DataSourcePool;
+import io.ebeaninternal.server.transaction.DataSourceSupplier;
 
 import javax.sql.DataSource;
 import java.io.PrintWriter;
diff --git a/src/main/java/io/ebeaninternal/server/core/SimpleDataSourceProvider.java b/src/main/java/io/ebeaninternal/server/core/SimpleDataSourceProvider.java
index 6d83da262..556a5ab6d 100644
--- a/src/main/java/io/ebeaninternal/server/core/SimpleDataSourceProvider.java
+++ b/src/main/java/io/ebeaninternal/server/core/SimpleDataSourceProvider.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.core;
 
-import io.ebeaninternal.server.transaction.DataSourceSupplier;
 import io.ebean.datasource.DataSourcePool;
+import io.ebeaninternal.server.transaction.DataSourceSupplier;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 979c4cf0b..5c2f18a76 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -7,7 +7,6 @@ import io.ebean.SqlUpdate;
 import io.ebean.Transaction;
 import io.ebean.ValuePair;
 import io.ebean.annotation.DocStoreMode;
-import io.ebean.annotation.Formula;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
@@ -30,6 +29,7 @@ import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.event.readaudit.ReadEvent;
 import io.ebean.meta.MetricVisitor;
+import io.ebean.meta.QueryPlanRequest;
 import io.ebean.plugin.BeanDocType;
 import io.ebean.plugin.BeanType;
 import io.ebean.plugin.ExpressionPath;
@@ -1652,6 +1652,14 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return new DeployUpdateParser(this).parse(ormUpdateStatement);
   }
 
+  public void collectQueryPlans(QueryPlanRequest request) {
+    for (CQueryPlan queryPlan : queryPlanCache.values()) {
+      if (request.includeLabel(queryPlan.getLabel())) {
+        queryPlan.collectQueryPlan(request);
+      }
+    }
+  }
+
   /**
    * Visit all the ORM query plan metrics (includes UpdateQuery with updates and deletes).
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 7a536f687..ee8087a4f 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -21,6 +21,7 @@ import io.ebean.event.changelog.ChangeLogListener;
 import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeLogRegister;
 import io.ebean.meta.MetricVisitor;
+import io.ebean.meta.QueryPlanRequest;
 import io.ebean.plugin.BeanType;
 import io.ebean.util.AnnotationUtil;
 import io.ebeaninternal.api.ConcurrencyMode;
@@ -1688,6 +1689,14 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     }
   }
 
+  public void collectQueryPlans(QueryPlanRequest request) {
+    for (BeanDescriptor<?> desc : immutableDescriptorList) {
+      if (request.includeType(desc.getBeanType())) {
+        desc.collectQueryPlans(request);
+      }
+    }
+  }
+
   /**
    * Comparator to sort the BeanDescriptors by name.
    */
diff --git a/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java b/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java
index d3ffb5aa2..a1093473f 100644
--- a/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java
+++ b/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java
@@ -1,9 +1,9 @@
 package io.ebeaninternal.server.el;
 
-import java.util.Comparator;
-
 import io.ebean.bean.EntityBean;
 
+import java.util.Comparator;
+
 /**
  * Comparator based on a ElGetValue.
  */
diff --git a/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java b/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
index a51679b93..ee2732cbb 100644
--- a/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
+++ b/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
@@ -3,10 +3,10 @@ package io.ebeaninternal.server.el;
 import io.ebean.bean.EntityBean;
 import io.ebean.plugin.Property;
 import io.ebean.text.StringParser;
+import io.ebean.util.SplitName;
 import io.ebean.util.StringHelper;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.deploy.BeanProperty;
-import io.ebean.util.SplitName;
 import io.ebeaninternal.server.type.ScalarType;
 
 import java.util.Arrays;
diff --git a/src/main/java/io/ebeaninternal/server/expression/InExpression.java b/src/main/java/io/ebeaninternal/server/expression/InExpression.java
index 8e21c112f..ca0ba1730 100644
--- a/src/main/java/io/ebeaninternal/server/expression/InExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/InExpression.java
@@ -2,11 +2,11 @@ package io.ebeaninternal.server.expression;
 
 import io.ebean.bean.EntityBean;
 import io.ebean.event.BeanQueryRequest;
+import io.ebeaninternal.api.NaturalKeyQueryData;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.el.ElPropertyValue;
 import io.ebeaninternal.server.persist.MultiValueWrapper;
-import io.ebeaninternal.api.NaturalKeyQueryData;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/src/main/java/io/ebeaninternal/server/expression/NullExpression.java b/src/main/java/io/ebeaninternal/server/expression/NullExpression.java
index ba81c0bef..51ac7b27a 100644
--- a/src/main/java/io/ebeaninternal/server/expression/NullExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/NullExpression.java
@@ -1,11 +1,11 @@
 package io.ebeaninternal.server.expression;
 
+import io.ebean.util.SplitName;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.el.ElPropertyValue;
-import io.ebean.util.SplitName;
 
 import java.io.IOException;
 
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
index dc0486a0f..7dc2d8101 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
@@ -1,14 +1,16 @@
 // Generated from C:/dev/ebean/ebean/src/test/resources/EQL.g4 by ANTLR 4.7.1
 package io.ebeaninternal.server.grammer.antlr;
 
-import org.antlr.v4.runtime.Lexer;
 import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.Token;
-import org.antlr.v4.runtime.TokenStream;
-import org.antlr.v4.runtime.*;
-import org.antlr.v4.runtime.atn.*;
+import org.antlr.v4.runtime.Lexer;
+import org.antlr.v4.runtime.RuntimeMetaData;
+import org.antlr.v4.runtime.Vocabulary;
+import org.antlr.v4.runtime.VocabularyImpl;
+import org.antlr.v4.runtime.atn.ATN;
+import org.antlr.v4.runtime.atn.ATNDeserializer;
+import org.antlr.v4.runtime.atn.LexerATNSimulator;
+import org.antlr.v4.runtime.atn.PredictionContextCache;
 import org.antlr.v4.runtime.dfa.DFA;
-import org.antlr.v4.runtime.misc.*;
 
 @SuppressWarnings({ "all", "warnings", "unchecked", "unused", "cast" })
 public class EQLLexer extends Lexer {
@@ -292,4 +294,4 @@ public class EQLLexer extends Lexer {
       _decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
index 67d3d0d5b..31e012d79 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
@@ -1,14 +1,24 @@
 // Generated from C:/dev/ebean/ebean/src/test/resources/EQL.g4 by ANTLR 4.7.1
 package io.ebeaninternal.server.grammer.antlr;
 
-import org.antlr.v4.runtime.atn.*;
+import org.antlr.v4.runtime.NoViableAltException;
+import org.antlr.v4.runtime.Parser;
+import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.RuntimeMetaData;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.TokenStream;
+import org.antlr.v4.runtime.Vocabulary;
+import org.antlr.v4.runtime.VocabularyImpl;
+import org.antlr.v4.runtime.atn.ATN;
+import org.antlr.v4.runtime.atn.ATNDeserializer;
+import org.antlr.v4.runtime.atn.ParserATNSimulator;
+import org.antlr.v4.runtime.atn.PredictionContextCache;
 import org.antlr.v4.runtime.dfa.DFA;
-import org.antlr.v4.runtime.*;
-import org.antlr.v4.runtime.misc.*;
-import org.antlr.v4.runtime.tree.*;
+import org.antlr.v4.runtime.tree.ParseTreeListener;
+import org.antlr.v4.runtime.tree.TerminalNode;
+
 import java.util.List;
-import java.util.Iterator;
-import java.util.ArrayList;
 
 @SuppressWarnings({ "all", "warnings", "unchecked", "unused", "cast" })
 public class EQLParser extends Parser {
@@ -2822,4 +2832,4 @@ public class EQLParser extends Parser {
       _decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/io/ebeaninternal/server/query/CQuery.java b/src/main/java/io/ebeaninternal/server/query/CQuery.java
index cdc0a7138..3b04a99a8 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQuery.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQuery.java
@@ -602,7 +602,9 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
       if (autoTuneProfiling) {
         profilingListener.collectQueryInfo(objectGraphNode, loadedBeanCount, executionTimeMicros);
       }
-      queryPlan.executionTime(loadedBeanCount, executionTimeMicros, objectGraphNode);
+      if (queryPlan.executionTime(loadedBeanCount, executionTimeMicros, objectGraphNode)) {
+        queryPlan.captureBindForQueryPlan(predicates, executionTimeMicros);
+      }
       getTransaction().profileEvent(this);
     } catch (Exception e) {
       logger.error("Error updating execution statistics", e);
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java b/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
new file mode 100644
index 000000000..f3d1990f4
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
@@ -0,0 +1,73 @@
+package io.ebeaninternal.server.query;
+
+import io.ebean.config.ServerConfig;
+import io.ebean.meta.QueryPlanRequest;
+import io.ebeaninternal.server.type.bindcapture.BindCapture;
+
+class CQueryBindCapture {
+
+  private final double multiplier = 1.3d;
+
+  private final CQueryPlan cQueryPlan;
+  private final QueryPlanLogger planLogger;
+  private final boolean enabled;
+
+  private BindCapture bindCapture;
+  private long queryTimeMicros;
+  private long thresholdMicros;
+  private long captureCount;
+
+  private long lastBindCapture;
+
+
+  CQueryBindCapture(CQueryPlan cQueryPlan, ServerConfig serverConfig) {
+    this.cQueryPlan = cQueryPlan;
+    this.enabled = serverConfig.isCollectQueryPlans();
+    this.planLogger = PlatformQueryPlan.getLogger(serverConfig.getDatabasePlatform().getPlatform());
+  }
+
+  /**
+   * Return true if we should capture the bind values for this query.
+   */
+  boolean collectFor(long timeMicros) {
+    return enabled && (bindCapture == null || timeMicros > thresholdMicros);
+  }
+
+  /**
+   * Set the captured bind values that we can use later to collect a query plan.
+   *
+   * @param bindCapture     The bind values of the query
+   * @param queryTimeMicros The query execution time
+   */
+  void setBind(BindCapture bindCapture, long queryTimeMicros) {
+    synchronized (this) {
+      this.bindCapture = bindCapture;
+      this.queryTimeMicros = queryTimeMicros;
+      this.thresholdMicros = Math.round(queryTimeMicros * multiplier);
+      captureCount++;
+      lastBindCapture = System.currentTimeMillis();
+    }
+  }
+
+
+  /**
+   * Collect the query plan using already captured bind values.
+   */
+  void collectQueryPlan(QueryPlanRequest request) {
+
+    if (request.getSince() > lastBindCapture) {
+      // no bind capture since the last capture
+      return;
+    }
+
+    final BindCapture last = this.bindCapture;
+    if (last == null) {
+      return;
+    }
+
+    DQueryPlanOutput queryPlan = planLogger.logQueryPlan(request.getConnection(), cQueryPlan, last);
+    queryPlan.with(queryTimeMicros, captureCount, cQueryPlan.getPlanKey().toString());
+    request.process(queryPlan);
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java
index 9cc90b5ba..0bbee778d 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java
@@ -28,7 +28,7 @@ class CQueryBuilderRawSql {
 
     if (rsql == null) {
       // this is a ResultSet based RawSql query - just use some placeholder for the SQL
-      return new SqlLimitResponse("--ResultSetBasedRawSql", false);
+      return new SqlLimitResponse(CQueryPlan.RESULT_SET_BASED_RAW_SQL, false);
     }
 
     if (!rsql.isParsed()) {
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java b/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
index 061a35b71..7f0ea84e5 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
@@ -117,7 +117,9 @@ class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent {
 
       executionTimeMicros = (System.nanoTime() - startNano) / 1000L;
       request.slowQueryCheck(executionTimeMicros, rowCount);
-      queryPlan.executionTime(rowCount, executionTimeMicros, null);
+      if (queryPlan.executionTime(rowCount, executionTimeMicros, null)) {
+        queryPlan.captureBindForQueryPlan(predicates, executionTimeMicros);
+      }
       getTransaction().profileEvent(this);
 
       return result;
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
index e2ad826d7..36302a8d9 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
@@ -4,6 +4,7 @@ import io.ebean.ProfileLocation;
 import io.ebean.bean.ObjectGraphNode;
 import io.ebean.config.dbplatform.SqlLimitResponse;
 import io.ebean.meta.MetricType;
+import io.ebean.meta.QueryPlanRequest;
 import io.ebean.metric.MetricFactory;
 import io.ebean.metric.TimedMetric;
 import io.ebeaninternal.api.CQueryPlanKey;
@@ -13,6 +14,7 @@ import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
 import io.ebeaninternal.server.query.CQueryPlanStats.Snapshot;
 import io.ebeaninternal.server.type.DataBind;
+import io.ebeaninternal.server.type.DataBindCapture;
 import io.ebeaninternal.server.type.DataReader;
 import io.ebeaninternal.server.type.RsetDataReader;
 import io.ebeaninternal.server.type.ScalarDataReader;
@@ -50,6 +52,8 @@ public class CQueryPlan {
 
   private static final Logger logger = LoggerFactory.getLogger(CQueryPlan.class);
 
+  public static final String RESULT_SET_BASED_RAW_SQL = "--ResultSetBasedRawSql";
+
   private final SpiEbeanServer server;
 
   private final boolean autoTuned;
@@ -92,6 +96,8 @@ public class CQueryPlan {
 
   private final Set<String> dependentTables;
 
+  private final CQueryBindCapture bindCapture;
+
   /**
    * Create a query plan based on a OrmQueryRequest.
    */
@@ -115,6 +121,7 @@ public class CQueryPlan {
     this.encryptedProps = sqlTree.getEncryptedProps();
     this.stats = new CQueryPlanStats(this, server.isCollectQueryOrigins());
     this.dependentTables = sqlTree.dependentTables();
+    this.bindCapture = new CQueryBindCapture(this, server.getServerConfig());
   }
 
   /**
@@ -140,6 +147,7 @@ public class CQueryPlan {
     this.encryptedProps = sqlTree.getEncryptedProps();
     this.stats = new CQueryPlanStats(this, server.isCollectQueryOrigins());
     this.dependentTables = (rawSql) ? Collections.emptySet() : sqlTree.dependentTables();
+    this.bindCapture = new CQueryBindCapture(this, server.getServerConfig());
   }
 
   private String location() {
@@ -193,6 +201,16 @@ public class CQueryPlan {
     return dataBind;
   }
 
+  private DataBindCapture bindCapture() throws SQLException {
+    DataBindCapture dataBind = DataBindCapture.of(dataTimeZone);
+    if (encryptedProps != null) {
+      for (STreeProperty encryptedProp : encryptedProps) {
+        dataBind.setString(encryptedProp.getEncryptKeyAsString());
+      }
+    }
+    return dataBind;
+  }
+
   int getAsOfTableCount() {
     return asOfTableCount;
   }
@@ -263,13 +281,15 @@ public class CQueryPlan {
   /**
    * Register an execution time against this query plan;
    */
-  void executionTime(long loadedBeanCount, long timeMicros, ObjectGraphNode objectGraphNode) {
+  boolean executionTime(long loadedBeanCount, long timeMicros, ObjectGraphNode objectGraphNode) {
 
     stats.add(loadedBeanCount, timeMicros, objectGraphNode);
     if (objectGraphNode != null) {
       // collect stats based on objectGraphNode for lazy loading reporting
       server.collectQueryStats(objectGraphNode, loadedBeanCount, timeMicros);
     }
+
+    return bindCapture.collectFor(timeMicros);
   }
 
   /**
@@ -300,4 +320,22 @@ public class CQueryPlan {
   public TimedMetric createTimedMetric() {
     return MetricFactory.get().createTimedMetric(MetricType.ORM, label);
   }
+
+  void captureBindForQueryPlan(CQueryPredicates predicates, long executionTimeMicros) {
+    try {
+      DataBindCapture capture = bindCapture();
+      predicates.bind(capture);
+      bindCapture.setBind(capture.bindCapture(), executionTimeMicros);
+
+    } catch (SQLException e) {
+      logger.error("Error capturing bind values", e);
+    }
+  }
+
+  public void collectQueryPlan(QueryPlanRequest request) {
+
+    if (!getSql().equals(RESULT_SET_BASED_RAW_SQL)) {
+      bindCapture.collectQueryPlan(request);
+    }
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java b/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java
index e0f9c1dbb..173cfc2be 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java
@@ -125,8 +125,10 @@ class CQueryRowCount implements SpiProfileTransactionEvent {
       rowCount = rset.getInt(1);
 
       executionTimeMicros = (System.nanoTime() - startNano) / 1000L;
-      queryPlan.executionTime(rowCount, executionTimeMicros, query.getParentNode());
       request.slowQueryCheck(executionTimeMicros, rowCount);
+      if (queryPlan.executionTime(rowCount, executionTimeMicros, query.getParentNode())) {
+        queryPlan.captureBindForQueryPlan(predicates, executionTimeMicros);
+      }
       getTransaction().profileEvent(this);
       return rowCount;
 
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java b/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java
index 6331c1cb6..5782ae337 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java
@@ -111,7 +111,9 @@ class CQueryUpdate implements SpiProfileTransactionEvent {
 
       executionTimeMicros = (System.nanoTime() - startNano) / 1000L;
       request.slowQueryCheck(executionTimeMicros, rowCount);
-      queryPlan.executionTime(rowCount, executionTimeMicros, null);
+      if (queryPlan.executionTime(rowCount, executionTimeMicros, null)) {
+        queryPlan.captureBindForQueryPlan(predicates, executionTimeMicros);
+      }
       getTransaction().profileEvent(this);
       return rowCount;
 
diff --git a/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java b/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java
new file mode 100644
index 000000000..cb68aa7b2
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java
@@ -0,0 +1,108 @@
+package io.ebeaninternal.server.query;
+
+import io.ebean.meta.MetaQueryPlan;
+
+/**
+ * Captured query plan details.
+ */
+class DQueryPlanOutput implements MetaQueryPlan {
+
+  private final Class<?> beanType;
+  private final String label;
+
+
+  private final String sql;
+
+  private final String bind;
+
+  private final String plan;
+
+  private String planHash;
+  private long queryTimeMicros;
+  private long captureCount;
+
+  DQueryPlanOutput(Class<?> beanType, String label, String sql, String bind, String plan) {
+    this.beanType = beanType;
+    this.label = label;
+    this.sql = sql;
+    this.bind = bind;
+    this.plan = plan;
+  }
+
+  @Override
+  public String getQueryPlanHash() {
+    return planHash;
+  }
+
+  /**
+   * Return the associated bean.
+   */
+  @Override
+  public Class<?> getBeanType() {
+    return beanType;
+  }
+
+  /**
+   * Return the query label if set.
+   */
+  @Override
+  public String getLabel() {
+    return label;
+  }
+
+  /**
+   * Return the sql of query.
+   */
+  @Override
+  public String getSql() {
+    return sql;
+  }
+
+  /**
+   * Return a description of the bind values used.
+   */
+  @Override
+  public String getBind() {
+    return bind;
+  }
+
+  /**
+   * Return the query plan.
+   */
+  @Override
+  public String getPlan() {
+    return plan;
+  }
+
+  /**
+   * Return the query execution time associated with the capture of bind values used
+   * to build the query plan.
+   */
+  @Override
+  public long getQueryTimeMicros() {
+    return queryTimeMicros;
+  }
+
+  /**
+   * Return the total count of times bind capture has occurred. We don't want this to be
+   * massive as that implies a high overhead.
+   */
+  @Override
+  public long getCaptureCount() {
+    return captureCount;
+  }
+
+  @Override
+  public String toString() {
+    return " BeanType:" + ((beanType == null) ? "" : beanType.getSimpleName()) + " planHash:" + planHash + " label:" + label + " queryTimeMicros:" + queryTimeMicros + " captureCount:" + captureCount + "\n SQL:" + sql + "\nBIND:" + bind + "\nPLAN:" + plan;
+  }
+
+  /**
+   * Additionally set the query execution time and the number of bind captures.
+   */
+  void with(long queryTimeMicros, long captureCount, String planHash) {
+    this.queryTimeMicros = queryTimeMicros;
+    this.captureCount = captureCount;
+    this.planHash = planHash;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/query/PlatformQueryPlan.java b/src/main/java/io/ebeaninternal/server/query/PlatformQueryPlan.java
new file mode 100644
index 000000000..6f65622d9
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/query/PlatformQueryPlan.java
@@ -0,0 +1,36 @@
+package io.ebeaninternal.server.query;
+
+import io.ebean.annotation.Platform;
+
+public final class PlatformQueryPlan {
+
+  private static QueryPlanLogger explainLogger = new QueryPlanLoggerExplain();
+
+  private static QueryPlanLogger postgresLogger = new QueryPlanLoggerPostgres();
+
+  private static QueryPlanLogger sqlServerLogger = new QueryPlanLoggerSqlServer();
+
+  private static QueryPlanLogger oracleLogger = new QueryPlanLoggerOracle();
+
+  /**
+   * Returns the logger to log query plans for the given platform.
+   */
+  public static QueryPlanLogger getLogger(Platform platform) {
+
+    switch (platform) {
+      case POSTGRES:
+        return postgresLogger;
+
+      case SQLSERVER:
+      case SQLSERVER16:
+      case SQLSERVER17:
+        return sqlServerLogger;
+
+      case ORACLE:
+        return oracleLogger;
+
+      default:
+        return explainLogger;
+    }
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java b/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java
new file mode 100644
index 000000000..8f51e0e67
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java
@@ -0,0 +1,47 @@
+package io.ebeaninternal.server.query;
+
+import io.ebeaninternal.server.type.bindcapture.BindCapture;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public abstract class QueryPlanLogger {
+
+  static final Logger queryPlanLog = LoggerFactory.getLogger(QueryPlanLogger.class);
+
+  public abstract DQueryPlanOutput logQueryPlan(Connection conn, CQueryPlan plan, BindCapture bind);
+
+  DQueryPlanOutput readQueryPlan(CQueryPlan plan, BindCapture bind, ResultSet rset) throws SQLException {
+    StringBuilder sb = new StringBuilder();
+    for (int i = 1; i <= rset.getMetaData().getColumnCount(); i++) {
+      sb.append(rset.getMetaData().getColumnLabel(i)).append("\t");
+    }
+    sb.setLength(sb.length() - 1);
+    readPlanData(sb, rset);
+
+    return createPlan(plan, bind.toString(), sb.toString());
+  }
+
+  protected DQueryPlanOutput createPlan(CQueryPlan plan, String bind, String planString) {
+    return new DQueryPlanOutput(plan.getBeanType(), plan.getLabel(), plan.getSql(), bind, planString);
+  }
+
+  DQueryPlanOutput readQueryPlanBasic(CQueryPlan plan, BindCapture bind, ResultSet rset) throws SQLException {
+    StringBuilder sb = new StringBuilder();
+    readPlanData(sb, rset);
+    return createPlan(plan, bind.toString(), sb.toString().trim());
+  }
+
+  private void readPlanData(StringBuilder sb, ResultSet rset) throws SQLException {
+    while (rset.next()) {
+      sb.append('\n');
+      for (int i = 1; i <= rset.getMetaData().getColumnCount(); i++) {
+        sb.append(rset.getString(i)).append("\t");
+      }
+      sb.setLength(sb.length()-1);
+    }
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java b/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java
new file mode 100644
index 000000000..21ce968de
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java
@@ -0,0 +1,30 @@
+package io.ebeaninternal.server.query;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import io.ebeaninternal.server.type.bindcapture.BindCapture;
+
+/**
+ * A QueryPlanlogger that prefixes "EXPLAIN " to the query. This works for Postgres, H2 and MySql.
+ */
+public class QueryPlanLoggerExplain extends QueryPlanLogger {
+
+  @Override
+  public DQueryPlanOutput logQueryPlan(Connection conn, CQueryPlan plan, BindCapture bind)  {
+
+    try (PreparedStatement explainStmt = conn.prepareStatement("EXPLAIN " + plan.getSql())) {
+      bind.prepare(explainStmt, conn);
+      try (ResultSet rset = explainStmt.executeQuery()) {
+        return readQueryPlan(plan, bind, rset);
+      }
+
+    } catch (SQLException e) {
+      queryPlanLog.error("Could not log query plan", e);
+    }
+    return null;
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java b/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java
new file mode 100644
index 000000000..773724880
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java
@@ -0,0 +1,37 @@
+
+package io.ebeaninternal.server.query;
+
+import io.ebeaninternal.server.type.bindcapture.BindCapture;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+/**
+ * A QueryPlanlogger for oracle.
+ *
+ * @author Roland Praml, FOCONIS AG
+ */
+public class QueryPlanLoggerOracle extends QueryPlanLogger {
+
+  @Override
+  public DQueryPlanOutput logQueryPlan(Connection conn, CQueryPlan plan, BindCapture bind) {
+
+    try (Statement stmt = conn.createStatement()) {
+      try (PreparedStatement explainStmt = conn.prepareStatement("EXPLAIN PLAN FOR " + plan.getSql())) {
+        bind.prepare(explainStmt, conn);
+        explainStmt.execute();
+      }
+      try (ResultSet rset = stmt.executeQuery("select plan_table_output from table(dbms_xplan.display())")) {
+        return readQueryPlan(plan, bind, rset);
+      }
+
+    } catch (SQLException e) {
+      queryPlanLog.error("Could not log query plan", e);
+    }
+    return null;
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java b/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java
new file mode 100644
index 000000000..bd04e0eb2
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java
@@ -0,0 +1,31 @@
+package io.ebeaninternal.server.query;
+
+import io.ebeaninternal.server.type.bindcapture.BindCapture;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * A QueryPlanlogger that prefixes "EXPLAIN " to the query. This works for Postgres, H2 and MySql.
+ */
+public class QueryPlanLoggerPostgres extends QueryPlanLogger {
+
+  @Override
+  public DQueryPlanOutput logQueryPlan(Connection conn, CQueryPlan plan, BindCapture bind) {
+
+    String explain = "EXPLAIN " + plan.getSql();
+    try (PreparedStatement explainStmt = conn.prepareStatement(explain)) {
+      bind.prepare(explainStmt, conn);
+      try (ResultSet rset = explainStmt.executeQuery()) {
+        return readQueryPlanBasic(plan, bind, rset);
+      }
+
+    } catch (SQLException e) {
+      queryPlanLog.error("Could not log query plan: " + explain, e);
+      throw new IllegalStateException("Failed to obtain explain plan: " + explain, e);
+    }
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java b/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java
new file mode 100644
index 000000000..9a6b82459
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java
@@ -0,0 +1,52 @@
+package io.ebeaninternal.server.query;
+
+import io.ebeaninternal.server.type.bindcapture.BindCapture;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+/**
+ * A QueryPlanlogger for sqlserver. It will return the plan as XML, which can be opened in
+ * Microsoft SQL Server Management Studio.
+ *
+ * @author Roland Praml, FOCONIS AG
+ */
+public class QueryPlanLoggerSqlServer extends QueryPlanLogger {
+
+  @Override
+  public DQueryPlanOutput logQueryPlan(Connection conn, CQueryPlan plan, BindCapture bind) {
+
+    try (Statement stmt = conn.createStatement()) {
+      stmt.execute("SET STATISTICS XML ON");
+      try (PreparedStatement explainStmt = conn.prepareStatement(plan.getSql())) {
+        bind.prepare(explainStmt, conn);
+
+        try (ResultSet rset = explainStmt.executeQuery()) {
+          // unfortunately, this will execute the
+        }
+        if (explainStmt.getMoreResults()) {
+          try (ResultSet rset = explainStmt.getResultSet()) {
+            StringBuilder sb = new StringBuilder();
+            while (rset.next()) {
+              sb.append("XML: ").append(rset.getString(1));
+            }
+            return createPlan(plan, bind.toString(), sb.toString());
+          }
+        }
+
+      } catch (SQLException e) {
+        queryPlanLog.error("Could not log query plan", e);
+
+      } finally {
+        stmt.execute("SET STATISTICS XML OFF");
+      }
+    } catch (SQLException e) {
+      queryPlanLog.error("Could not log query plan", e);
+    }
+    return null;
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/type/DataBind.java b/src/main/java/io/ebeaninternal/server/type/DataBind.java
index b28be14b7..6c81384af 100644
--- a/src/main/java/io/ebeaninternal/server/type/DataBind.java
+++ b/src/main/java/io/ebeaninternal/server/type/DataBind.java
@@ -34,7 +34,7 @@ public class DataBind {
 
   private List<InputStream> inputStreams;
 
-  private int pos;
+  protected int pos;
 
   public DataBind(DataTimeZone dataTimeZone, PreparedStatement pstmt, Connection connection) {
     this.dataTimeZone = dataTimeZone;
diff --git a/src/main/java/io/ebeaninternal/server/type/DataBindCapture.java b/src/main/java/io/ebeaninternal/server/type/DataBindCapture.java
new file mode 100644
index 000000000..e87ebf471
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/type/DataBindCapture.java
@@ -0,0 +1,38 @@
+package io.ebeaninternal.server.type;
+
+import io.ebeaninternal.server.core.timezone.DataTimeZone;
+import io.ebeaninternal.server.type.bindcapture.BindCapture;
+import io.ebeaninternal.server.type.bindcapture.BindCaptureStatement;
+
+/**
+ * Special DataBind used to capture bind values for obtaining explain plans.
+ */
+public class DataBindCapture extends DataBind {
+
+  private final BindCaptureStatement captureStatement;
+
+  /**
+   * Create given the dataTimeZone in use.
+   */
+  public static DataBindCapture of(DataTimeZone dataTimeZone) {
+    return new DataBindCapture(dataTimeZone, new BindCaptureStatement());
+  }
+
+  private DataBindCapture(DataTimeZone dataTimeZone, BindCaptureStatement pstmt) {
+    super(dataTimeZone, pstmt, null);
+    this.captureStatement = pstmt;
+  }
+
+  /**
+   * Return the bind values capture used to obtain explain plans.
+   */
+  public BindCapture bindCapture() {
+    return captureStatement.bindCapture();
+  }
+
+  @Override
+  public void setArray(String arrayType, Object[] elements) {
+    captureStatement.setArray(++pos, arrayType, elements);
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 896391ff5..c29afeaad 100644
--- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -3,7 +3,6 @@ package io.ebeaninternal.server.type;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.introspect.AnnotatedField;
-
 import io.ebean.annotation.DbArray;
 import io.ebean.annotation.DbEnumType;
 import io.ebean.annotation.DbEnumValue;
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
index 91c1e1c9b..3e6b06952 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
@@ -1,11 +1,5 @@
 package io.ebeaninternal.server.type;
 
-import io.ebean.config.dbplatform.DbPlatformType;
-import io.ebeaninternal.json.ModifyAwareList;
-import io.ebeaninternal.json.ModifyAwareMap;
-import io.ebeaninternal.json.ModifyAwareOwner;
-import io.ebeaninternal.json.ModifyAwareSet;
-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -17,6 +11,12 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.databind.SerializationConfig;
 import com.fasterxml.jackson.databind.introspect.AnnotatedField;
+import io.ebean.config.dbplatform.DbPlatformType;
+import io.ebeaninternal.json.ModifyAwareList;
+import io.ebeaninternal.json.ModifyAwareMap;
+import io.ebeaninternal.json.ModifyAwareOwner;
+import io.ebeaninternal.json.ModifyAwareSet;
+import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 
 import javax.persistence.PersistenceException;
 import java.io.DataInput;
diff --git a/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCapture.java b/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCapture.java
new file mode 100644
index 000000000..f8e27393c
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCapture.java
@@ -0,0 +1,34 @@
+package io.ebeaninternal.server.type.bindcapture;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Holds bind values that can be used to obtain an explain plan.
+ */
+public class BindCapture {
+
+  private final List<BindCaptureEntry> entries = new ArrayList<>();
+
+  public void add(BindCaptureEntry entry) {
+    this.entries.add(entry);
+  }
+
+  /**
+   * Prepare for explain plan statement execution.
+   */
+  public void prepare(PreparedStatement explainStmt, Connection connection) throws SQLException {
+    for (BindCaptureEntry entry : entries) {
+      entry.bind(explainStmt, connection);
+    }
+  }
+
+  @Override
+  public String toString() {
+    return entries.toString();
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureEntry.java b/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureEntry.java
new file mode 100644
index 000000000..3bb7d3f95
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureEntry.java
@@ -0,0 +1,10 @@
+package io.ebeaninternal.server.type.bindcapture;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+public interface BindCaptureEntry {
+
+  void bind(PreparedStatement statement, Connection connection) throws SQLException;
+}
diff --git a/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureStatement.java b/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureStatement.java
new file mode 100644
index 000000000..e8cda7b13
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureStatement.java
@@ -0,0 +1,120 @@
+package io.ebeaninternal.server.type.bindcapture;
+
+import java.io.InputStream;
+import java.io.Reader;
+import java.math.BigDecimal;
+import java.sql.Date;
+import java.sql.PreparedStatement;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.Calendar;
+
+/**
+ * Special PreparedStatement used to capture bind values used to obtain explain plans.
+ */
+public class BindCaptureStatement extends BindCaptureStatementBase implements PreparedStatement {
+
+  private final BindCapture capture = new BindCapture();
+
+  /**
+   * Return the captured bind values.
+   */
+  public BindCapture bindCapture() {
+    return capture;
+  }
+
+  public void setArray(int parameterIndex, String arrayType, Object[] elements) {
+    capture.add(new BindCaptureTypes.TArray(parameterIndex, arrayType, elements));
+  }
+
+  @Override
+  public void setNull(int parameterIndex, int sqlType) {
+    capture.add(new BindCaptureTypes.Null(parameterIndex, sqlType));
+  }
+
+  @Override
+  public void setBoolean(int parameterIndex, boolean x) {
+    capture.add(new BindCaptureTypes.Boolean(parameterIndex, x));
+  }
+
+  @Override
+  public void setByte(int parameterIndex, byte x) {
+    capture.add(new BindCaptureTypes.Byte(parameterIndex, x));
+  }
+
+  @Override
+  public void setShort(int parameterIndex, short x) {
+    capture.add(new BindCaptureTypes.TShort(parameterIndex, x));
+  }
+
+  @Override
+  public void setInt(int parameterIndex, int x) {
+    capture.add(new BindCaptureTypes.TInt(parameterIndex, x));
+  }
+
+  @Override
+  public void setLong(int parameterIndex, long x) {
+    capture.add(new BindCaptureTypes.TLong(parameterIndex, x));
+  }
+
+  @Override
+  public void setFloat(int parameterIndex, float x) {
+    capture.add(new BindCaptureTypes.TFloat(parameterIndex, x));
+  }
+
+  @Override
+  public void setDouble(int parameterIndex, double x) {
+    capture.add(new BindCaptureTypes.TDouble(parameterIndex, x));
+  }
+
+  @Override
+  public void setBigDecimal(int parameterIndex, BigDecimal x) {
+    capture.add(new BindCaptureTypes.TBigDecimal(parameterIndex, x));
+  }
+
+  @Override
+  public void setString(int parameterIndex, String x) {
+    capture.add(new BindCaptureTypes.TString(parameterIndex, x));
+  }
+
+  @Override
+  public void setBytes(int parameterIndex, byte[] x) {
+    capture.add(new BindCaptureTypes.Bytes(parameterIndex, x));
+  }
+
+  @Override
+  public void setDate(int parameterIndex, Date x) {
+    capture.add(new BindCaptureTypes.TDate(parameterIndex, x));
+  }
+
+  @Override
+  public void setTime(int parameterIndex, Time x) {
+    capture.add(new BindCaptureTypes.TTime(parameterIndex, x));
+  }
+
+  @Override
+  public void setTimestamp(int parameterIndex, Timestamp x) {
+    capture.add(new BindCaptureTypes.TTimestamp(parameterIndex, x, null));
+  }
+
+  @Override
+  public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) {
+    capture.add(new BindCaptureTypes.TTimestamp(parameterIndex, x, cal));
+  }
+
+  @Override
+  public void setObject(int parameterIndex, Object x) {
+    capture.add(new BindCaptureTypes.TObject(parameterIndex, x));
+  }
+
+  @Override
+  public void setBinaryStream(int parameterIndex, InputStream x, int length) {
+    capture.add(new BindCaptureTypes.BinaryStream(parameterIndex));
+  }
+
+  @Override
+  public void setCharacterStream(int parameterIndex, Reader reader, int length) {
+    capture.add(new BindCaptureTypes.CharacterStream(parameterIndex));
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureStatementBase.java b/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureStatementBase.java
new file mode 100644
index 000000000..ba4e01524
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureStatementBase.java
@@ -0,0 +1,441 @@
+package io.ebeaninternal.server.type.bindcapture;
+
+import java.io.InputStream;
+import java.io.Reader;
+import java.net.URL;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.NClob;
+import java.sql.ParameterMetaData;
+import java.sql.PreparedStatement;
+import java.sql.Ref;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.RowId;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Time;
+import java.util.Calendar;
+
+abstract class BindCaptureStatementBase implements PreparedStatement {
+
+  @Override
+  public ResultSet executeQuery() {
+    return null;
+  }
+
+  @Override
+  public int executeUpdate() {
+    return 0;
+  }
+
+
+  @Override
+  public void setAsciiStream(int parameterIndex, InputStream x, int length) {
+
+  }
+
+  @Override
+  public void setUnicodeStream(int parameterIndex, InputStream x, int length) {
+
+  }
+
+  @Override
+  public void setBinaryStream(int parameterIndex, InputStream x, int length) {
+
+  }
+
+  @Override
+  public void clearParameters() {
+
+  }
+
+  @Override
+  public void setObject(int parameterIndex, Object x, int targetSqlType) {
+
+  }
+
+  @Override
+  public boolean execute() {
+    return false;
+  }
+
+  @Override
+  public void addBatch() {
+
+  }
+
+  @Override
+  public void setCharacterStream(int parameterIndex, Reader reader, int length) {
+
+  }
+
+  @Override
+  public void setRef(int parameterIndex, Ref x) {
+
+  }
+
+  @Override
+  public void setBlob(int parameterIndex, Blob x) {
+
+  }
+
+  @Override
+  public void setClob(int parameterIndex, Clob x) {
+
+  }
+
+  @Override
+  public void setArray(int parameterIndex, Array x) {
+
+  }
+
+  @Override
+  public ResultSetMetaData getMetaData() {
+    return null;
+  }
+
+  @Override
+  public void setDate(int parameterIndex, Date x, Calendar cal) {
+
+  }
+
+  @Override
+  public void setTime(int parameterIndex, Time x, Calendar cal) {
+
+  }
+
+  @Override
+  public void setNull(int parameterIndex, int sqlType, String typeName) {
+
+  }
+
+  @Override
+  public void setURL(int parameterIndex, URL x) {
+
+  }
+
+  @Override
+  public ParameterMetaData getParameterMetaData() {
+    return null;
+  }
+
+  @Override
+  public void setRowId(int parameterIndex, RowId x) {
+
+  }
+
+  @Override
+  public void setNString(int parameterIndex, String value) {
+
+  }
+
+  @Override
+  public void setNCharacterStream(int parameterIndex, Reader value, long length) {
+
+  }
+
+  @Override
+  public void setNClob(int parameterIndex, NClob value) {
+
+  }
+
+  @Override
+  public void setClob(int parameterIndex, Reader reader, long length) {
+
+  }
+
+  @Override
+  public void setBlob(int parameterIndex, InputStream inputStream, long length) {
+
+  }
+
+  @Override
+  public void setNClob(int parameterIndex, Reader reader, long length) {
+
+  }
+
+  @Override
+  public void setSQLXML(int parameterIndex, SQLXML xmlObject) {
+
+  }
+
+  @Override
+  public void setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength) {
+
+  }
+
+  @Override
+  public void setAsciiStream(int parameterIndex, InputStream x, long length) {
+
+  }
+
+  @Override
+  public void setBinaryStream(int parameterIndex, InputStream x, long length) {
+
+  }
+
+  @Override
+  public void setCharacterStream(int parameterIndex, Reader reader, long length) {
+
+  }
+
+
+  @Override
+  public void setNCharacterStream(int parameterIndex, Reader value) {
+
+  }
+
+  @Override
+  public void setClob(int parameterIndex, Reader reader) {
+
+  }
+
+  @Override
+  public void setBlob(int parameterIndex, InputStream inputStream) {
+
+  }
+
+  @Override
+  public void setNClob(int parameterIndex, Reader reader) {
+
+  }
+
+  @Override
+  public void setAsciiStream(int parameterIndex, InputStream x) {
+
+  }
+
+  @Override
+  public void setBinaryStream(int parameterIndex, InputStream x) {
+
+  }
+
+  @Override
+  public void setCharacterStream(int parameterIndex, Reader reader) {
+
+  }
+
+  @Override
+  public ResultSet executeQuery(String sql) {
+    return null;
+  }
+
+  @Override
+  public int executeUpdate(String sql) {
+    return 0;
+  }
+
+  @Override
+  public void close() {
+
+  }
+
+  @Override
+  public int getMaxFieldSize() {
+    return 0;
+  }
+
+  @Override
+  public void setMaxFieldSize(int max) {
+
+  }
+
+  @Override
+  public int getMaxRows() {
+    return 0;
+  }
+
+  @Override
+  public void setMaxRows(int max) {
+
+  }
+
+  @Override
+  public void setEscapeProcessing(boolean enable) {
+
+  }
+
+  @Override
+  public int getQueryTimeout() {
+    return 0;
+  }
+
+  @Override
+  public void setQueryTimeout(int seconds) {
+
+  }
+
+  @Override
+  public void cancel() {
+
+  }
+
+  @Override
+  public SQLWarning getWarnings() {
+    return null;
+  }
+
+  @Override
+  public void clearWarnings() {
+
+  }
+
+  @Override
+  public void setCursorName(String name) {
+
+  }
+
+  @Override
+  public boolean execute(String sql) {
+    return false;
+  }
+
+  @Override
+  public ResultSet getResultSet() {
+    return null;
+  }
+
+  @Override
+  public int getUpdateCount() {
+    return 0;
+  }
+
+  @Override
+  public boolean getMoreResults() {
+    return false;
+  }
+
+  @Override
+  public void setFetchDirection(int direction) {
+
+  }
+
+  @Override
+  public int getFetchDirection() {
+    return 0;
+  }
+
+  @Override
+  public void setFetchSize(int rows) {
+
+  }
+
+  @Override
+  public int getFetchSize() {
+    return 0;
+  }
+
+  @Override
+  public int getResultSetConcurrency() {
+    return 0;
+  }
+
+  @Override
+  public int getResultSetType() {
+    return 0;
+  }
+
+  @Override
+  public void addBatch(String sql) {
+
+  }
+
+  @Override
+  public void clearBatch() {
+
+  }
+
+  @Override
+  public int[] executeBatch() {
+    return new int[0];
+  }
+
+  @Override
+  public Connection getConnection() {
+    return null;
+  }
+
+  @Override
+  public boolean getMoreResults(int current) {
+    return false;
+  }
+
+  @Override
+  public ResultSet getGeneratedKeys() {
+    return null;
+  }
+
+  @Override
+  public int executeUpdate(String sql, int autoGeneratedKeys) {
+    return 0;
+  }
+
+  @Override
+  public int executeUpdate(String sql, int[] columnIndexes) {
+    return 0;
+  }
+
+  @Override
+  public int executeUpdate(String sql, String[] columnNames) {
+    return 0;
+  }
+
+  @Override
+  public boolean execute(String sql, int autoGeneratedKeys) {
+    return false;
+  }
+
+  @Override
+  public boolean execute(String sql, int[] columnIndexes) {
+    return false;
+  }
+
+  @Override
+  public boolean execute(String sql, String[] columnNames) {
+    return false;
+  }
+
+  @Override
+  public int getResultSetHoldability() {
+    return 0;
+  }
+
+  @Override
+  public boolean isClosed() {
+    return false;
+  }
+
+  @Override
+  public void setPoolable(boolean poolable) {
+
+  }
+
+  @Override
+  public boolean isPoolable() {
+    return false;
+  }
+
+  @Override
+  public void closeOnCompletion() {
+
+  }
+
+  @Override
+  public boolean isCloseOnCompletion() {
+    return false;
+  }
+
+  @Override
+  public <T> T unwrap(Class<T> iface) {
+    return null;
+  }
+
+  @Override
+  public boolean isWrapperFor(Class<?> iface) {
+    return false;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureTypes.java b/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureTypes.java
new file mode 100644
index 000000000..661047c44
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureTypes.java
@@ -0,0 +1,406 @@
+package io.ebeaninternal.server.type.bindcapture;
+
+import java.io.ByteArrayInputStream;
+import java.io.StringReader;
+import java.math.BigDecimal;
+import java.nio.charset.Charset;
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.Arrays;
+import java.util.Calendar;
+
+class BindCaptureTypes {
+
+  static class Null implements BindCaptureEntry {
+
+    private final int parameterIndex;
+    private final int sqlType;
+
+    Null(int parameterIndex, int sqlType) {
+      this.parameterIndex = parameterIndex;
+      this.sqlType = sqlType;
+    }
+
+    @Override
+    public void bind(PreparedStatement statement, Connection connection) throws SQLException {
+      statement.setNull(parameterIndex, sqlType);
+    }
+
+    @Override
+    public String toString() {
+      return "null";
+    }
+  }
+
+  static class Boolean implements BindCaptureEntry {
+
+    private final int parameterIndex;
+    private final boolean x;
+
+    Boolean(int parameterIndex, boolean x) {
+      this.parameterIndex = parameterIndex;
+      this.x = x;
+    }
+
+    @Override
+    public void bind(PreparedStatement statement, Connection connection) throws SQLException {
+      statement.setBoolean(parameterIndex, x);
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(x);
+    }
+  }
+
+  static class Byte implements BindCaptureEntry {
+
+    private final int parameterIndex;
+    private final byte x;
+
+    Byte(int parameterIndex, byte x) {
+      this.parameterIndex = parameterIndex;
+      this.x = x;
+    }
+
+    @Override
+    public void bind(PreparedStatement statement, Connection connection) throws SQLException {
+      statement.setByte(parameterIndex, x);
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(x);
+    }
+  }
+
+  static class Bytes implements BindCaptureEntry {
+
+    private final int parameterIndex;
+    private final byte[] x;
+
+    Bytes(int parameterIndex, byte[] x) {
+      this.parameterIndex = parameterIndex;
+      this.x = x;
+    }
+
+    @Override
+    public void bind(PreparedStatement statement, Connection connection) throws SQLException {
+      statement.setBytes(parameterIndex, x);
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(x);
+    }
+  }
+
+  static class TShort implements BindCaptureEntry {
+
+    private final int parameterIndex;
+    private final short value;
+
+    TShort(int parameterIndex, short value) {
+      this.parameterIndex = parameterIndex;
+      this.value = value;
+    }
+
+    @Override
+    public void bind(PreparedStatement statement, Connection connection) throws SQLException {
+      statement.setShort(parameterIndex, value);
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+  }
+
+  static class TInt implements BindCaptureEntry {
+
+    private final int parameterIndex;
+    private final int value;
+
+    TInt(int parameterIndex, int value) {
+      this.parameterIndex = parameterIndex;
+      this.value = value;
+    }
+
+    @Override
+    public void bind(PreparedStatement statement, Connection connection) throws SQLException {
+      statement.setInt(parameterIndex, value);
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+  }
+
+  static class TLong implements BindCaptureEntry {
+
+    private final int parameterIndex;
+    private final long value;
+
+    TLong(int parameterIndex, long value) {
+      this.parameterIndex = parameterIndex;
+      this.value = value;
+    }
+
+    @Override
+    public void bind(PreparedStatement statement, Connection connection) throws SQLException {
+      statement.setLong(parameterIndex, value);
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+  }
+
+  static class TFloat implements BindCaptureEntry {
+
+    private final int parameterIndex;
+    private final float value;
+
+    TFloat(int parameterIndex, float value) {
+      this.parameterIndex = parameterIndex;
+      this.value = value;
+    }
+
+    @Override
+    public void bind(PreparedStatement statement, Connection connection) throws SQLException {
+      statement.setFloat(parameterIndex, value);
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+  }
+
+  static class TDouble implements BindCaptureEntry {
+
+    private final int parameterIndex;
+    private final double value;
+
+    TDouble(int parameterIndex, double value) {
+      this.parameterIndex = parameterIndex;
+      this.value = value;
+    }
+
+    @Override
+    public void bind(PreparedStatement statement, Connection connection) throws SQLException {
+      statement.setDouble(parameterIndex, value);
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+  }
+
+  static class TBigDecimal implements BindCaptureEntry {
+
+    private final int parameterIndex;
+    private final BigDecimal value;
+
+    TBigDecimal(int parameterIndex, BigDecimal value) {
+      this.parameterIndex = parameterIndex;
+      this.value = value;
+    }
+
+    @Override
+    public void bind(PreparedStatement statement, Connection connection) throws SQLException {
+      statement.setBigDecimal(parameterIndex, value);
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+  }
+
+
+  static class TString implements BindCaptureEntry {
+
+    private final int parameterIndex;
+    private final String value;
+
+    TString(int parameterIndex, String value) {
+      this.parameterIndex = parameterIndex;
+      this.value = value;
+    }
+
+    @Override
+    public void bind(PreparedStatement statement, Connection connection) throws SQLException {
+      statement.setString(parameterIndex, value);
+    }
+
+    @Override
+    public String toString() {
+      return value;
+    }
+  }
+
+  static class TDate implements BindCaptureEntry {
+
+    private final int parameterIndex;
+    private final Date value;
+
+    TDate(int parameterIndex, Date value) {
+      this.parameterIndex = parameterIndex;
+      this.value = value;
+    }
+
+    @Override
+    public void bind(PreparedStatement statement, Connection connection) throws SQLException {
+      statement.setDate(parameterIndex, value);
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+  }
+
+  static class TTime implements BindCaptureEntry {
+
+    private final int parameterIndex;
+    private final Time value;
+
+    TTime(int parameterIndex, Time value) {
+      this.parameterIndex = parameterIndex;
+      this.value = value;
+    }
+
+    @Override
+    public void bind(PreparedStatement statement, Connection connection) throws SQLException {
+      statement.setTime(parameterIndex, value);
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+  }
+
+  static class TTimestamp implements BindCaptureEntry {
+
+    private final int parameterIndex;
+    private final Timestamp value;
+    private final Calendar timezone;
+
+    TTimestamp(int parameterIndex, Timestamp value, Calendar timezone) {
+      this.parameterIndex = parameterIndex;
+      this.value = value;
+      this.timezone = timezone;
+    }
+
+    @Override
+    public void bind(PreparedStatement statement, Connection connection) throws SQLException {
+      if (timezone == null) {
+        statement.setTimestamp(parameterIndex, value);
+      } else {
+        statement.setTimestamp(parameterIndex, value, timezone);
+      }
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+  }
+
+  static class TObject implements BindCaptureEntry {
+
+    private final int parameterIndex;
+    private final Object value;
+
+    TObject(int parameterIndex, Object value) {
+      this.parameterIndex = parameterIndex;
+      this.value = value;
+    }
+
+    @Override
+    public void bind(PreparedStatement statement, Connection connection) throws SQLException {
+      statement.setObject(parameterIndex, value);
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+  }
+
+  static class TArray implements BindCaptureEntry {
+
+    private final int parameterIndex;
+    private final String arrayType;
+    private final Object[] elements;
+
+
+    TArray(int parameterIndex, String arrayType, Object[] elements) {
+      this.parameterIndex = parameterIndex;
+      this.arrayType = arrayType;
+      this.elements = elements;
+    }
+
+    @Override
+    public void bind(PreparedStatement statement, Connection connection) throws SQLException {
+      java.sql.Array array = connection.createArrayOf(arrayType, elements);
+      statement.setArray(parameterIndex, array);
+    }
+
+    @Override
+    public String toString() {
+      return "Array{" + arrayType + ": " + Arrays.toString(elements) + "}";
+    }
+  }
+
+  static class CharacterStream implements BindCaptureEntry {
+
+    private static final String dummy = "hi";
+
+    private final int parameterIndex;
+
+    CharacterStream(int parameterIndex) {
+      this.parameterIndex = parameterIndex;
+    }
+
+    @Override
+    public void bind(PreparedStatement statement, Connection connection) throws SQLException {
+      statement.setCharacterStream(parameterIndex, new StringReader(dummy), dummy.length());
+    }
+
+    @Override
+    public String toString() {
+      return "charStream";
+    }
+  }
+
+  static class BinaryStream implements BindCaptureEntry {
+
+    private static final byte[] dummy = "hi".getBytes(Charset.defaultCharset());
+
+    private final int parameterIndex;
+
+    BinaryStream(int parameterIndex) {
+      this.parameterIndex = parameterIndex;
+    }
+
+    @Override
+    public void bind(PreparedStatement statement, Connection connection) throws SQLException {
+      statement.setBinaryStream(parameterIndex, new ByteArrayInputStream(dummy), dummy.length);
+    }
+
+    @Override
+    public String toString() {
+      return "binaryStream";
+    }
+  }
+}
diff --git a/src/test/java/io/ebean/BaseTestCase.java b/src/test/java/io/ebean/BaseTestCase.java
index 7fd97fa9e..c0c5bb672 100644
--- a/src/test/java/io/ebean/BaseTestCase.java
+++ b/src/test/java/io/ebean/BaseTestCase.java
@@ -13,7 +13,6 @@ import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandlerFactory;
-
 import org.avaje.agentloader.AgentLoader;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -148,7 +147,7 @@ public abstract class BaseTestCase {
   public boolean isMySql() {
     return Platform.MYSQL == platform();
   }
-  
+
   public boolean isHana() {
     return Platform.HANA == platform();
   }
@@ -160,7 +159,7 @@ public abstract class BaseTestCase {
   public boolean isPlatformOrderNullsSupport() {
     return isH2() || isPostgres();
   }
-  
+
   public boolean isPersistBatchOnCascade() {
     return spiEbeanServer().getDatabasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE;
   }
@@ -217,7 +216,7 @@ public abstract class BaseTestCase {
       assertThat(sql).contains(containsIn+" not in ");
     }
   }
-  
+
   /**
    * Platform specific CONCAT clause.
    */
diff --git a/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
index 3a1adf02c..0288e4732 100644
--- a/src/test/java/io/ebean/DtoQueryFromOrmTest.java
+++ b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
@@ -3,7 +3,6 @@ package io.ebean;
 import io.ebean.meta.BasicMetricVisitor;
 import io.ebean.meta.MetaQueryMetric;
 import io.ebean.meta.MetaTimedMetric;
-
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
diff --git a/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java b/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java
index c40ceaf41..9af554f9e 100644
--- a/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java
+++ b/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java
@@ -1,12 +1,11 @@
 package io.ebean.config.dbplatform;
 
+import io.ebean.config.dbplatform.hana.HanaHistorySupport;
+import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-import org.junit.Test;
-
-import io.ebean.config.dbplatform.hana.HanaHistorySupport;
-
 public class HanaHistorySupportTest {
 
   private HanaHistorySupport support = new HanaHistorySupport();
@@ -24,7 +23,7 @@ public class HanaHistorySupportTest {
     String asOfViewSuffix = support.getAsOfViewSuffix("_with_history");
     assertEquals(asOfViewSuffix, " for system_time as of ?");
   }
-  
+
   @Test
   public void getVersionsBetweenSuffix() {
 
diff --git a/src/test/java/io/ebean/plugin/ExpressionPathTest.java b/src/test/java/io/ebean/plugin/ExpressionPathTest.java
index e55598744..274cbb846 100644
--- a/src/test/java/io/ebean/plugin/ExpressionPathTest.java
+++ b/src/test/java/io/ebean/plugin/ExpressionPathTest.java
@@ -2,10 +2,10 @@ package io.ebean.plugin;
 
 import io.ebean.Ebean;
 import io.ebean.EbeanServer;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
index 00b99161f..f30fc8eba 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
@@ -9,7 +9,6 @@ import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.migration.ddl.DdlRunner;
 import io.ebeaninternal.dbmigration.ddlgeneration.Helper;
-
 import org.junit.Test;
 
 import javax.persistence.PersistenceException;
diff --git a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlTest.java
index 911a28964..6fc27e34d 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlTest.java
@@ -1,14 +1,13 @@
 package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-
-import org.junit.Test;
-
 import io.ebean.config.dbplatform.hana.HanaPlatform;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
 import io.ebeaninternal.dbmigration.migration.Column;
+import org.junit.Test;
+
+import java.io.IOException;
+
+import static org.junit.Assert.assertEquals;
 
 public class HanaDdlTest {
 
diff --git a/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java
index c67fe6de5..c2d47bea2 100644
--- a/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java
+++ b/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java
@@ -1,12 +1,11 @@
 package io.ebeaninternal.server.expression.platform;
 
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.expression.DefaultExpressionRequest;
 import io.ebeaninternal.server.expression.Op;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
 
 public class HanaDbExpressionTest {
   private HanaDbExpression expression = new HanaDbExpression();
@@ -54,13 +53,13 @@ public class HanaDbExpressionTest {
     String concat = expression.concat("property0", "separator", "property1", "suffix");
     assertEquals("concat(property0, 'separator'||property1||'suffix')", concat);
   }
-  
+
   @Test
   public void testConcatNullSuffix() {
     String concat = expression.concat("property0", "separator", "property1", null);
     assertEquals("concat(property0, 'separator'||property1)", concat);
   }
-  
+
   @Test
   public void testJson() {
     SpiExpressionRequest request = new DefaultExpressionRequest(null);
diff --git a/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java b/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java
index 2c5beb403..241c218da 100644
--- a/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java
+++ b/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.query;
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 public class SqlTreeBuilderTest {
 
diff --git a/src/test/java/org/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java b/src/test/java/org/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java
index 4d20c866b..af082e386 100644
--- a/src/test/java/org/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java
+++ b/src/test/java/org/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java
@@ -6,12 +6,12 @@ import io.ebean.EbeanServer;
 import io.ebean.Query;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
-import org.tests.model.basic.Address;
-import org.tests.model.basic.Customer;
-import org.tests.model.basic.ResetBasicData;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Assert;
 import org.junit.Test;
+import org.tests.model.basic.Address;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
 
 import java.util.List;
 import java.util.Set;
diff --git a/src/test/java/org/tests/basic/MainDbBoolean.java b/src/test/java/org/tests/basic/MainDbBoolean.java
index 47feddb82..b8d6c6f2c 100644
--- a/src/test/java/org/tests/basic/MainDbBoolean.java
+++ b/src/test/java/org/tests/basic/MainDbBoolean.java
@@ -6,11 +6,11 @@ import io.ebean.Query;
 import io.ebean.SqlRow;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.postgres.PostgresPlatform;
+import io.ebean.datasource.DataSourceConfig;
+import org.junit.Assert;
 import org.tests.model.basic.TOne;
 import org.tests.model.basic.TSDetail;
 import org.tests.model.basic.TSMaster;
-import io.ebean.datasource.DataSourceConfig;
-import org.junit.Assert;
 
 import java.util.List;
 
diff --git a/src/test/java/org/tests/basic/TestErrorBindLog.java b/src/test/java/org/tests/basic/TestErrorBindLog.java
index 75b1bd7c5..481f385ee 100644
--- a/src/test/java/org/tests/basic/TestErrorBindLog.java
+++ b/src/test/java/org/tests/basic/TestErrorBindLog.java
@@ -2,9 +2,9 @@ package org.tests.basic;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
-import org.tests.model.basic.Order;
 import org.junit.Assert;
 import org.junit.Test;
+import org.tests.model.basic.Order;
 
 import javax.persistence.PersistenceException;
 
diff --git a/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java b/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java
index 0c8c29094..4135d09aa 100644
--- a/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java
+++ b/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java
@@ -2,11 +2,11 @@ package org.tests.basic;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import org.junit.Assert;
+import org.junit.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Assert;
-import org.junit.Test;
 
 import java.util.List;
 
diff --git a/src/test/java/org/tests/basic/TestTransient.java b/src/test/java/org/tests/basic/TestTransient.java
index e6c69752b..3c59ae7fd 100644
--- a/src/test/java/org/tests/basic/TestTransient.java
+++ b/src/test/java/org/tests/basic/TestTransient.java
@@ -3,10 +3,10 @@ package org.tests.basic;
 import io.ebean.BaseTestCase;
 import io.ebean.BeanState;
 import io.ebean.Ebean;
-import org.tests.model.basic.Customer;
-import org.tests.model.basic.ResetBasicData;
 import org.junit.Assert;
 import org.junit.Test;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
 
 public class TestTransient extends BaseTestCase {
 
diff --git a/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java b/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java
index 2d4cfa3ea..a83aa13ae 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java
@@ -6,8 +6,8 @@ import io.ebean.EbeanServer;
 import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.annotation.Transactional;
-import org.tests.model.basic.Customer;
 import org.junit.Test;
+import org.tests.model.basic.Customer;
 
 import static org.junit.Assert.assertNotNull;
 
diff --git a/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java b/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java
index 61d098ce0..5354c7cf3 100644
--- a/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java
+++ b/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java
@@ -2,11 +2,11 @@ package org.tests.batchload;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import org.junit.Assert;
+import org.junit.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Assert;
-import org.junit.Test;
 
 import java.util.List;
 
diff --git a/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java b/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java
index 825735cf8..40be470a8 100644
--- a/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java
+++ b/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java
@@ -2,11 +2,11 @@ package org.tests.batchload;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.Order.Status;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Test;
 
 public class TestEmptyManyLazyLoad extends BaseTestCase {
 
diff --git a/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java b/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java
index 54e8d28bb..3b4151589 100644
--- a/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java
+++ b/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java
@@ -3,9 +3,9 @@ package org.tests.batchload;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.FetchConfig;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/src/test/java/org/tests/cache/TestBeanCache.java b/src/test/java/org/tests/cache/TestBeanCache.java
index 2419d3b3c..ed9aae7ad 100644
--- a/src/test/java/org/tests/cache/TestBeanCache.java
+++ b/src/test/java/org/tests/cache/TestBeanCache.java
@@ -2,10 +2,10 @@ package org.tests.cache;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
-import org.tests.model.basic.Country;
-import org.tests.model.basic.OCachedBean;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
+import org.tests.model.basic.Country;
+import org.tests.model.basic.OCachedBean;
 
 import java.util.List;
 
diff --git a/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java b/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java
index 5ad1e93c7..992d3eabc 100644
--- a/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java
+++ b/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java
@@ -2,10 +2,10 @@ package org.tests.cache;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Test;
 
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/org/tests/changelog/TestChangeLog.java b/src/test/java/org/tests/changelog/TestChangeLog.java
index f430c2769..3be63f361 100644
--- a/src/test/java/org/tests/changelog/TestChangeLog.java
+++ b/src/test/java/org/tests/changelog/TestChangeLog.java
@@ -1,5 +1,7 @@
 package org.tests.changelog;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.ebean.BaseTestCase;
 import io.ebean.EbeanServerFactory;
 import io.ebean.annotation.ChangeLog;
@@ -13,12 +15,10 @@ import io.ebean.event.changelog.ChangeLogRegister;
 import io.ebean.event.changelog.ChangeSet;
 import io.ebean.event.changelog.ChangeType;
 import io.ebeaninternal.api.SpiEbeanServer;
-import org.tests.model.basic.EBasicChangeLog;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.tests.model.basic.EBasicChangeLog;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java b/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java
index eb8fb6685..6858e12d4 100644
--- a/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java
+++ b/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java
@@ -4,10 +4,10 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import io.ebean.Transaction;
-import org.tests.model.basic.Product;
-import org.tests.model.basic.ResetBasicData;
 import org.junit.Assert;
 import org.junit.Test;
+import org.tests.model.basic.Product;
+import org.tests.model.basic.ResetBasicData;
 
 import java.util.Arrays;
 
diff --git a/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java b/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java
index 5b7f37d06..0b39f4f03 100644
--- a/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java
+++ b/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java
@@ -2,18 +2,17 @@ package org.tests.inheritance.cache;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
 import org.tests.model.basic.cache.CInhOne;
 import org.tests.model.basic.cache.CInhRef;
 import org.tests.model.basic.cache.CInhRoot;
 import org.tests.model.basic.cache.CInhTwo;
-import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.ebeantest.LoggedSqlCollector;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestInheritanceRefCache extends BaseTestCase {
 
diff --git a/src/test/java/org/tests/json/TestDbJson_Jackson.java b/src/test/java/org/tests/json/TestDbJson_Jackson.java
index c281444a7..00b4bfa52 100644
--- a/src/test/java/org/tests/json/TestDbJson_Jackson.java
+++ b/src/test/java/org/tests/json/TestDbJson_Jackson.java
@@ -1,20 +1,17 @@
 package org.tests.json;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.StrictAssertions.assertThat;
-
-import java.io.IOException;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
 import org.junit.Test;
 import org.tests.model.json.EBasicJsonJackson;
 import org.tests.model.json.EBasicJsonJackson2;
 import org.tests.model.json.LongJacksonType;
 import org.tests.model.json.StringJacksonType;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
 
-import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestDbJson_Jackson extends BaseTestCase {
 
diff --git a/src/test/java/org/tests/json/TestDbJson_Jackson2.java b/src/test/java/org/tests/json/TestDbJson_Jackson2.java
index 866161cf0..f4a9a0d41 100644
--- a/src/test/java/org/tests/json/TestDbJson_Jackson2.java
+++ b/src/test/java/org/tests/json/TestDbJson_Jackson2.java
@@ -1,19 +1,16 @@
 package org.tests.json;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.StrictAssertions.assertThat;
-
-import java.io.IOException;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
 import org.junit.Test;
 import org.tests.model.json.EBasicJsonJackson2;
 import org.tests.model.json.LongJacksonType;
 import org.tests.model.json.StringJacksonType;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
 
-import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestDbJson_Jackson2 extends BaseTestCase {
 
diff --git a/src/test/java/org/tests/merge/TestMergeM2M.java b/src/test/java/org/tests/merge/TestMergeM2M.java
index 784e53025..fe955b713 100644
--- a/src/test/java/org/tests/merge/TestMergeM2M.java
+++ b/src/test/java/org/tests/merge/TestMergeM2M.java
@@ -28,16 +28,16 @@ public class TestMergeM2M extends BaseTestCase {
     Ebean.save(group4);
     Ebean.save(group5);
 
-    MMachine machine = new MMachine("mac1");
-    machine.getGroups().add(group1);
-    machine.getGroups().add(group2);
-    machine.getGroups().add(group3);
+    MMachine m0 = new MMachine("mac1");
+    m0.getGroups().add(group1);
+    m0.getGroups().add(group2);
+    m0.getGroups().add(group3);
 
     MergeOptions options = new MergeOptionsBuilder().addPath("groups").build();
 
     LoggedSqlCollector.start();
 
-    Ebean.merge(machine, options);
+    Ebean.merge(m0, options);
 
     List<String> sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
@@ -55,13 +55,15 @@ public class TestMergeM2M extends BaseTestCase {
       assertThat(sql.get(4)).contains("insert into mmachine_mgroup");
     }
 
-    machine.setName("mac1-mod");
-    machine.getGroups().remove(group2);
-    machine.getGroups().remove(group3);
-    machine.getGroups().add(group4);
-    machine.getGroups().add(group5);
+    MMachine m1 = new MMachine("mac1");
+    m1.setId(m0.getId());
+    m1.setName("mac1-mod");
+    m1.getGroups().remove(group2);
+    m1.getGroups().remove(group3);
+    m1.getGroups().add(group4);
+    m1.getGroups().add(group5);
 
-    Ebean.merge(machine, options);
+    Ebean.merge(m1, options);
 
     sql = LoggedSqlCollector.current();
     assertThat(sql).hasSize(4);
diff --git a/src/test/java/org/tests/model/array/TestDbArray_asSet.java b/src/test/java/org/tests/model/array/TestDbArray_asSet.java
index b87726c53..5501eafe2 100644
--- a/src/test/java/org/tests/model/array/TestDbArray_asSet.java
+++ b/src/test/java/org/tests/model/array/TestDbArray_asSet.java
@@ -5,7 +5,6 @@ import io.ebean.Ebean;
 import io.ebean.Query;
 import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.Platform;
-
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
diff --git a/src/test/java/org/tests/model/array/TestDbArray_basic.java b/src/test/java/org/tests/model/array/TestDbArray_basic.java
index 4da3ada4a..f13bf3516 100644
--- a/src/test/java/org/tests/model/array/TestDbArray_basic.java
+++ b/src/test/java/org/tests/model/array/TestDbArray_basic.java
@@ -1,7 +1,13 @@
 package org.tests.model.array;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.Query;
+import io.ebean.SqlRow;
+import io.ebean.annotation.IgnorePlatform;
+import io.ebean.annotation.Platform;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -10,15 +16,8 @@ import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
-import org.ebeantest.LoggedSqlCollector;
-import org.junit.Test;
-
-import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
-import io.ebean.Query;
-import io.ebean.SqlRow;
-import io.ebean.annotation.IgnorePlatform;
-import io.ebean.annotation.Platform;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
 
 public class TestDbArray_basic extends BaseTestCase {
 
diff --git a/src/test/java/org/tests/model/basic/CKeyParent.java b/src/test/java/org/tests/model/basic/CKeyParent.java
index f5e387b09..36ef22ab8 100644
--- a/src/test/java/org/tests/model/basic/CKeyParent.java
+++ b/src/test/java/org/tests/model/basic/CKeyParent.java
@@ -2,7 +2,6 @@ package org.tests.model.basic;
 
 import io.ebean.annotation.Cache;
 
-import javax.persistence.Cacheable;
 import javax.persistence.CascadeType;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
diff --git a/src/test/java/org/tests/model/basic/ResetBasicData.java b/src/test/java/org/tests/model/basic/ResetBasicData.java
index c0112d21a..d1b7468a3 100644
--- a/src/test/java/org/tests/model/basic/ResetBasicData.java
+++ b/src/test/java/org/tests/model/basic/ResetBasicData.java
@@ -5,7 +5,6 @@ import io.ebean.EbeanServer;
 import org.tests.model.basic.Order.Status;
 
 import java.sql.Date;
-import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java b/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
index 1f1073116..b8b0b20e5 100644
--- a/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
+++ b/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
@@ -10,7 +10,6 @@ import io.ebean.cache.ServerCacheStatistics;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java
index 13a41e66d..52bdb65d9 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java
@@ -3,7 +3,6 @@ package org.tests.model.elementcollection;
 import io.ebean.Ebean;
 import io.ebean.annotation.PersistBatch;
 import io.ebeaninternal.api.SpiEbeanServer;
-
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -90,7 +89,7 @@ public class TestElementCollectionBasicCache {
 
     LoggedSqlCollector.stop();
   }
-  
+
   public boolean isPersistBatchOnCascade() {
     return ((SpiEbeanServer) Ebean.getDefaultServer()).getDatabasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE;
   }
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
index baf2f6d86..f3c5c49e0 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
@@ -2,7 +2,6 @@ package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
-
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java
index e92ba9324..1c5317516 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java
@@ -3,7 +3,6 @@ package org.tests.model.elementcollection;
 import io.ebean.Ebean;
 import io.ebean.annotation.PersistBatch;
 import io.ebeaninternal.api.SpiEbeanServer;
-
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -95,7 +94,7 @@ public class TestElementCollectionBasicMapCache {
 
     LoggedSqlCollector.stop();
   }
-  
+
   public boolean isPersistBatchOnCascade() {
     return ((SpiEbeanServer) Ebean.getDefaultServer()).getDatabasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE;
   }
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java
index b885fe488..b9425e59f 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java
@@ -2,7 +2,6 @@ package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
-
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
diff --git a/src/test/java/org/tests/model/json/EBasicJsonJackson.java b/src/test/java/org/tests/model/json/EBasicJsonJackson.java
index 9faa35eee..bdfa43add 100644
--- a/src/test/java/org/tests/model/json/EBasicJsonJackson.java
+++ b/src/test/java/org/tests/model/json/EBasicJsonJackson.java
@@ -1,14 +1,12 @@
 package org.tests.model.json;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.ebean.annotation.DbJson;
 import io.ebean.annotation.DbJsonB;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Version;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
diff --git a/src/test/java/org/tests/model/json/EBasicJsonJackson2.java b/src/test/java/org/tests/model/json/EBasicJsonJackson2.java
index dc8269682..45a305105 100644
--- a/src/test/java/org/tests/model/json/EBasicJsonJackson2.java
+++ b/src/test/java/org/tests/model/json/EBasicJsonJackson2.java
@@ -1,14 +1,12 @@
 package org.tests.model.json;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.ebean.annotation.DbJson;
 import io.ebean.annotation.DbJsonB;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Version;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
diff --git a/src/test/java/org/tests/model/nofk/EFile2NoFk.java b/src/test/java/org/tests/model/nofk/EFile2NoFk.java
index aee08e6fb..5d5ff5c90 100644
--- a/src/test/java/org/tests/model/nofk/EFile2NoFk.java
+++ b/src/test/java/org/tests/model/nofk/EFile2NoFk.java
@@ -1,17 +1,13 @@
 package org.tests.model.nofk;
 
-import java.util.List;
+import io.ebean.annotation.Formula;
+import io.ebean.annotation.Index;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
-import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.validation.constraints.Size;
 
-import io.ebean.annotation.DbForeignKey;
-import io.ebean.annotation.Formula;
-import io.ebean.annotation.Index;
-
 @Entity
 public class EFile2NoFk {
 
diff --git a/src/test/java/org/tests/model/nofk/EFileNoFk.java b/src/test/java/org/tests/model/nofk/EFileNoFk.java
index fb48a53b0..c6823500b 100644
--- a/src/test/java/org/tests/model/nofk/EFileNoFk.java
+++ b/src/test/java/org/tests/model/nofk/EFileNoFk.java
@@ -1,14 +1,13 @@
 package org.tests.model.nofk;
 
-import java.util.List;
+import io.ebean.annotation.DbForeignKey;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.validation.constraints.Size;
-
-import io.ebean.annotation.DbForeignKey;
+import java.util.List;
 
 @Entity
 public class EFileNoFk {
diff --git a/src/test/java/org/tests/model/nofk/EUserNoFk.java b/src/test/java/org/tests/model/nofk/EUserNoFk.java
index 8513ad8d5..2b4e57013 100644
--- a/src/test/java/org/tests/model/nofk/EUserNoFk.java
+++ b/src/test/java/org/tests/model/nofk/EUserNoFk.java
@@ -1,10 +1,9 @@
 package org.tests.model.nofk;
 
-import java.util.List;
-
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
+import java.util.List;
 
 @Entity
 public class EUserNoFk {
diff --git a/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java b/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java
index 792a004af..214dd289c 100644
--- a/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java
+++ b/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java
@@ -1,15 +1,14 @@
 package org.tests.model.nofk;
 
-import java.util.List;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-
 import io.ebean.annotation.Formula;
 import io.ebean.annotation.Platform;
 import io.ebean.annotation.SoftDelete;
 
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import java.util.List;
+
 @Entity
 public class EUserNoFkSoftDel {
 
diff --git a/src/test/java/org/tests/model/nofk/Test2NoFk.java b/src/test/java/org/tests/model/nofk/Test2NoFk.java
index 4e963b4f3..a6851bf9b 100644
--- a/src/test/java/org/tests/model/nofk/Test2NoFk.java
+++ b/src/test/java/org/tests/model/nofk/Test2NoFk.java
@@ -4,13 +4,11 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
-
 import org.junit.Before;
 import org.junit.Test;
 
-import java.util.List;
-
 import javax.persistence.EntityNotFoundException;
+import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
diff --git a/src/test/java/org/tests/model/nofk/TestNoFk.java b/src/test/java/org/tests/model/nofk/TestNoFk.java
index 9d49f0666..87110ce14 100644
--- a/src/test/java/org/tests/model/nofk/TestNoFk.java
+++ b/src/test/java/org/tests/model/nofk/TestNoFk.java
@@ -5,16 +5,12 @@ import io.ebean.Ebean;
 import io.ebean.SqlRow;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
-import io.ebean.plugin.BeanType;
-import io.ebean.plugin.Property;
-
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import java.util.List;
-
 import javax.persistence.EntityNotFoundException;
+import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
diff --git a/src/test/java/org/tests/model/uuidsibling/USibChild.java b/src/test/java/org/tests/model/uuidsibling/USibChild.java
index 47edd9fc1..7fa10caea 100644
--- a/src/test/java/org/tests/model/uuidsibling/USibChild.java
+++ b/src/test/java/org/tests/model/uuidsibling/USibChild.java
@@ -4,13 +4,13 @@ import io.ebean.Finder;
 import io.ebean.Model;
 import io.ebean.annotation.SoftDelete;
 
-import java.io.Serializable;
-import java.util.UUID;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToOne;
+import java.io.Serializable;
+import java.util.UUID;
 
 @Entity
 public class USibChild extends Model  implements Serializable {
diff --git a/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java b/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java
index 03e39b5f7..152ba6212 100644
--- a/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java
+++ b/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java
@@ -4,11 +4,10 @@ import io.ebean.Finder;
 import io.ebean.Model;
 import io.ebean.annotation.SoftDelete;
 
-import java.io.Serializable;
-
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToOne;
+import java.io.Serializable;
 
 @Entity
 public class USibChildSibling extends Model implements Serializable {
diff --git a/src/test/java/org/tests/model/uuidsibling/USibParent.java b/src/test/java/org/tests/model/uuidsibling/USibParent.java
index 30597f5ad..7f8332c6f 100644
--- a/src/test/java/org/tests/model/uuidsibling/USibParent.java
+++ b/src/test/java/org/tests/model/uuidsibling/USibParent.java
@@ -4,12 +4,12 @@ import io.ebean.Finder;
 import io.ebean.Model;
 import io.ebean.annotation.SoftDelete;
 
-import java.io.Serializable;
-import java.util.List;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
+import java.io.Serializable;
+import java.util.List;
 
 @Entity
 public class USibParent extends Model implements Serializable {
diff --git a/src/test/java/org/tests/model/view/TestViewBaseEntity.java b/src/test/java/org/tests/model/view/TestViewBaseEntity.java
index 63c94a244..a0560ff98 100644
--- a/src/test/java/org/tests/model/view/TestViewBaseEntity.java
+++ b/src/test/java/org/tests/model/view/TestViewBaseEntity.java
@@ -3,10 +3,10 @@ package org.tests.model.view;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import org.junit.Test;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.OrderDetail;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Test;
 
 import java.util.List;
 
diff --git a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java
index e18c9e9ba..98e405a36 100644
--- a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java
+++ b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java
@@ -2,7 +2,6 @@ package org.tests.o2m.jointable;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
-
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
diff --git a/src/test/java/org/tests/query/TestOuterJoin.java b/src/test/java/org/tests/query/TestOuterJoin.java
index b2f8e6ae1..5256bcc1b 100644
--- a/src/test/java/org/tests/query/TestOuterJoin.java
+++ b/src/test/java/org/tests/query/TestOuterJoin.java
@@ -1,19 +1,17 @@
 package org.tests.query;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
-
-import java.util.List;
-
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebeantest.LoggedSql;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
 
-import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
-import io.ebeantest.LoggedSql;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Tests if outer joins are correctly used.
diff --git a/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java b/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java
index 8ddf3f181..8d606cc4b 100644
--- a/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java
+++ b/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java
@@ -2,10 +2,10 @@ package org.tests.query;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
-import org.tests.model.basic.Customer;
-import org.tests.model.basic.ResetBasicData;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
 
 import java.util.List;
 
diff --git a/src/test/java/org/tests/query/TestQueryFindIterate.java b/src/test/java/org/tests/query/TestQueryFindIterate.java
index 47c20eb73..ccca68cdf 100644
--- a/src/test/java/org/tests/query/TestQueryFindIterate.java
+++ b/src/test/java/org/tests/query/TestQueryFindIterate.java
@@ -5,8 +5,8 @@ import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import io.ebean.Query;
 import io.ebean.QueryIterator;
-import io.ebean.plugin.SpiServer;
 import io.ebean.datasource.DataSourcePool;
+import io.ebean.plugin.SpiServer;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
diff --git a/src/test/java/org/tests/query/TestQueryFindPagedList.java b/src/test/java/org/tests/query/TestQueryFindPagedList.java
index 97775405a..293b4d519 100644
--- a/src/test/java/org/tests/query/TestQueryFindPagedList.java
+++ b/src/test/java/org/tests/query/TestQueryFindPagedList.java
@@ -3,10 +3,10 @@ package org.tests.query;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.PagedList;
-import org.tests.model.basic.Order;
-import org.tests.model.basic.ResetBasicData;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
+import org.tests.model.basic.Order;
+import org.tests.model.basic.ResetBasicData;
 
 import javax.persistence.PersistenceException;
 import java.util.List;
@@ -16,7 +16,9 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 public class TestQueryFindPagedList extends BaseTestCase {
 
diff --git a/src/test/java/org/tests/query/aggregation/TestAggregationCount.java b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
index fc578780e..65231e8d1 100644
--- a/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
+++ b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
@@ -1,12 +1,8 @@
 package org.tests.query.aggregation;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.StrictAssertions.assertThat;
-
-import java.sql.Timestamp;
-import java.time.Instant;
-import java.util.List;
-
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.Query;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -17,9 +13,11 @@ import org.tests.model.basic.ResetBasicData;
 import org.tests.model.tevent.TEventMany;
 import org.tests.model.tevent.TEventOne;
 
-import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
-import io.ebean.Query;
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestAggregationCount extends BaseTestCase {
 
diff --git a/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/src/test/java/org/tests/query/finder/TestCustomerFinder.java
index 63e41a954..26c2f1b4c 100644
--- a/src/test/java/org/tests/query/finder/TestCustomerFinder.java
+++ b/src/test/java/org/tests/query/finder/TestCustomerFinder.java
@@ -5,7 +5,9 @@ import io.ebean.Ebean;
 import io.ebean.Transaction;
 import io.ebean.meta.BasicMetricVisitor;
 import io.ebean.meta.MetaOrmQueryMetric;
+import io.ebean.meta.MetaQueryPlan;
 import io.ebean.meta.MetaTimedMetric;
+import io.ebean.meta.QueryPlanRequest;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
@@ -163,6 +165,14 @@ public class TestCustomerFinder extends BaseTestCase {
     for (MetaTimedMetric txnTimed : basic.getTimedMetrics()) {
       System.out.println(txnTimed);
     }
+
+    QueryPlanRequest request = new QueryPlanRequest();
+
+    List<MetaQueryPlan> plans = server().getMetaInfoManager().collectQueryPlans(request);
+    for (MetaQueryPlan plan : plans) {
+      System.out.println(plan);
+    }
+
   }
 
 }
diff --git a/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java b/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java
index 9d2ece465..a1c9d7767 100644
--- a/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java
+++ b/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java
@@ -3,13 +3,13 @@ package org.tests.query.orderby;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import org.junit.Assert;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.MRole;
 import org.tests.model.basic.MUser;
 import org.tests.model.basic.MUserType;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Assert;
-import org.junit.Test;
 
 import java.util.List;
 import java.util.Set;
diff --git a/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java b/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java
index 45a97264f..274b5eeb4 100644
--- a/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java
+++ b/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java
@@ -2,10 +2,9 @@ package org.tests.query.other;
 
 import io.ebean.Ebean;
 import io.ebean.TransactionalTestCase;
-
+import org.junit.Test;
 import org.tests.model.basic.MNonEnum;
 import org.tests.model.basic.MNonUpdPropEntity;
-import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/org/tests/text/csv/TestCsvReader.java b/src/test/java/org/tests/text/csv/TestCsvReader.java
index de4a0d4c5..73df33c30 100644
--- a/src/test/java/org/tests/text/csv/TestCsvReader.java
+++ b/src/test/java/org/tests/text/csv/TestCsvReader.java
@@ -3,9 +3,9 @@ package org.tests.text.csv;
 import io.ebean.Ebean;
 import io.ebean.TransactionalTestCase;
 import io.ebean.text.csv.CsvReader;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Test;
 
 import java.io.File;
 import java.io.FileReader;
diff --git a/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java b/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java
index 45cae1f70..0d8a6bd76 100644
--- a/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java
+++ b/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java
@@ -5,16 +5,16 @@ import io.ebean.EbeanServer;
 import io.ebean.TransactionalTestCase;
 import io.ebean.text.csv.CsvReader;
 import io.ebean.text.csv.DefaultCsvCallback;
-import org.tests.model.basic.Customer;
 import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import org.tests.model.basic.Customer;
 
 import java.io.File;
 import java.io.FileReader;
 import java.net.URL;
 import java.util.Locale;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class TestCsvReaderWithCallback extends TransactionalTestCase {
 
   @Test
diff --git a/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java b/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java
index 06bfc9c11..6f510b7e2 100644
--- a/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java
+++ b/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java
@@ -4,9 +4,9 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.text.json.JsonContext;
 import io.ebean.util.StringHelper;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Test;
 
 import java.io.IOException;
 
diff --git a/src/test/java/org/tests/types/TestPeriodType.java b/src/test/java/org/tests/types/TestPeriodType.java
index ef753550e..7d7dc995a 100644
--- a/src/test/java/org/tests/types/TestPeriodType.java
+++ b/src/test/java/org/tests/types/TestPeriodType.java
@@ -2,8 +2,8 @@ package org.tests.types;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
-import org.tests.model.types.SomePeriodBean;
 import org.junit.Test;
+import org.tests.model.types.SomePeriodBean;
 
 import java.sql.Date;
 import java.time.LocalDate;
diff --git a/src/test/java/org/tests/unitinternal/HelloMain.java b/src/test/java/org/tests/unitinternal/HelloMain.java
index 5efeba5ea..ca43af917 100644
--- a/src/test/java/org/tests/unitinternal/HelloMain.java
+++ b/src/test/java/org/tests/unitinternal/HelloMain.java
@@ -3,11 +3,11 @@ package org.tests.unitinternal;
 import io.ebean.EbeanServer;
 import io.ebean.EbeanServerFactory;
 import io.ebean.config.ServerConfig;
-import org.tests.model.basic.TOne;
-import org.avaje.agentloader.AgentLoader;
 import io.ebean.datasource.DataSourceConfig;
+import org.avaje.agentloader.AgentLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.tests.model.basic.TOne;
 
 import java.io.File;
 
diff --git a/src/test/java/org/tests/update/TestUpdatePartial.java b/src/test/java/org/tests/update/TestUpdatePartial.java
index 48624e35a..2d0c4466c 100644
--- a/src/test/java/org/tests/update/TestUpdatePartial.java
+++ b/src/test/java/org/tests/update/TestUpdatePartial.java
@@ -4,8 +4,8 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
-import org.tests.model.basic.Customer;
 import org.junit.Test;
+import org.tests.model.basic.Customer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index d7a9263cc..cd6b5c07c 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -22,6 +22,8 @@ ebean.ddl.header=-- Generated by ebean ${version} at ${timestamp}
 ebean.packages=org.tests
 datasource.default=h2
 
+ebean.collectQueryPlans=true
+
 ebean.autoReadOnlyDataSource=true
 
 #ebean.persistBatch=NONE

From a66edf80773e882f0830cb2fbf0aa6cfffdfe3c5 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 19 Dec 2018 16:55:24 +1300
Subject: [PATCH 0611/1036] #1477 Query plan capture - use explain analyze for
 Postgres

... so that we also get DB side timing
---
 src/main/java/io/ebean/meta/MetaInfoManager.java              | 1 -
 .../ebeaninternal/server/query/QueryPlanLoggerPostgres.java   | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/ebean/meta/MetaInfoManager.java b/src/main/java/io/ebean/meta/MetaInfoManager.java
index 74d0e7882..8880014b7 100644
--- a/src/main/java/io/ebean/meta/MetaInfoManager.java
+++ b/src/main/java/io/ebean/meta/MetaInfoManager.java
@@ -1,7 +1,6 @@
 package io.ebean.meta;
 
 import java.util.List;
-import java.util.function.Consumer;
 
 /**
  * Provides access to the meta data in EbeanServer such as query execution statistics.
diff --git a/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java b/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java
index bd04e0eb2..06cab4682 100644
--- a/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java
+++ b/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java
@@ -8,14 +8,14 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 /**
- * A QueryPlanlogger that prefixes "EXPLAIN " to the query. This works for Postgres, H2 and MySql.
+ * A QueryPlanlogger for Postgres that prefixes "EXPLAIN ANALYZE" to the query.
  */
 public class QueryPlanLoggerPostgres extends QueryPlanLogger {
 
   @Override
   public DQueryPlanOutput logQueryPlan(Connection conn, CQueryPlan plan, BindCapture bind) {
 
-    String explain = "EXPLAIN " + plan.getSql();
+    String explain = "explain analyze " + plan.getSql();
     try (PreparedStatement explainStmt = conn.prepareStatement(explain)) {
       bind.prepare(explainStmt, conn);
       try (ResultSet rset = explainStmt.executeQuery()) {

From ced8c794581cddb378662f07c5de9d706a6e949a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 19 Dec 2018 20:57:45 +1300
Subject: [PATCH 0612/1036] #1582 - ENH: Pass @Cache nearCache option to
 ServerCacheOptions (for L2 plugins like Redis)

---
 pom.xml                                       |  2 +-
 .../io/ebean/cache/ServerCacheOptions.java    | 24 +++++++++++++++++++
 .../server/cache/DefaultCacheHolder.java      |  7 +++++-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 19cda5e30..bb87496ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>4.3</version>
+      <version>4.4</version>
     </dependency>
 
     <dependency>
diff --git a/src/main/java/io/ebean/cache/ServerCacheOptions.java b/src/main/java/io/ebean/cache/ServerCacheOptions.java
index 6d32089c1..feb0623ee 100644
--- a/src/main/java/io/ebean/cache/ServerCacheOptions.java
+++ b/src/main/java/io/ebean/cache/ServerCacheOptions.java
@@ -12,6 +12,7 @@ public class ServerCacheOptions {
   private int maxIdleSecs;
   private int maxSecsToLive;
   private int trimFrequency;
+  private boolean nearCache;
 
   /**
    * Construct with no set options.
@@ -40,6 +41,14 @@ public class ServerCacheOptions {
     this.trimFrequency = cacheTuning.trimFrequency();
   }
 
+  /**
+   * Create with nearCache option.
+   */
+  public ServerCacheOptions(boolean nearCache, CacheBeanTuning tuning) {
+    this(tuning);
+    this.nearCache = nearCache;
+  }
+
   /**
    * Apply any settings from the default settings that have not already been
    * specifically set.
@@ -70,9 +79,24 @@ public class ServerCacheOptions {
     copy.maxIdleSecs = maxIdleSecs;
     copy.maxSecsToLive = maxSecsToLive;
     copy.trimFrequency = trimFrequency;
+    copy.nearCache = nearCache;
     return copy;
   }
 
+  /**
+   * Return true if nearCache was explicitly turned on.
+   */
+  public boolean isNearCache() {
+    return nearCache;
+  }
+
+  /**
+   * Turn on nearCache option.
+   */
+  public void setNearCache(boolean nearCache) {
+    this.nearCache = nearCache;
+  }
+
   /**
    * Return the maximum cache size.
    */
diff --git a/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java b/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
index 20e966f6e..71b3af1a8 100644
--- a/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
+++ b/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.cache;
 
+import io.ebean.annotation.Cache;
 import io.ebean.annotation.CacheBeanTuning;
 import io.ebean.annotation.CacheQueryTuning;
 import io.ebean.cache.QueryCacheEntryValidate;
@@ -123,9 +124,13 @@ class DefaultCacheHolder {
   }
 
   private ServerCacheOptions getBeanOptions(Class<?> cls) {
+
+    Cache cache = cls.getAnnotation(Cache.class);
+    boolean nearCache = (cache != null && cache.nearCache());
+
     CacheBeanTuning tuning = cls.getAnnotation(CacheBeanTuning.class);
     if (tuning != null) {
-      return new ServerCacheOptions(tuning).applyDefaults(beanDefault);
+      return new ServerCacheOptions(nearCache, tuning).applyDefaults(beanDefault);
     }
     return beanDefault.copy();
   }

From 049cacad1c7663aab68782412700b23e64edd7ce Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 19 Dec 2018 21:14:25 +1300
Subject: [PATCH 0613/1036] #1583 - ENH: Add type safe ServerConfig
 getServiceObject(Class<P> cls) and putServiceObject()

---
 .../java/io/ebean/config/ServerConfig.java    | 42 +++++++++++++++++++
 .../io/ebean/config/ServerConfigTest.java     | 16 +++++++
 2 files changed, 58 insertions(+)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index e6a978d46..2d22890bd 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -599,6 +599,48 @@ public class ServerConfig {
     return serviceObject.get(key);
   }
 
+  /**
+   * Put a service object into configuration such that it can be passed to a plugin.
+   *
+   * <pre>{@code
+   *
+   *   JedisPool jedisPool = ..
+   *
+   *   serverConfig.putServiceObject(jedisPool);
+   *
+   * }</pre>
+   */
+  public void putServiceObject(Object configObject) {
+    String key = serviceObjectKey(configObject);
+    serviceObject.put(key, configObject);
+  }
+
+  private String serviceObjectKey(Object configObject) {
+    return serviceObjectKey(configObject.getClass());
+  }
+
+  private String serviceObjectKey(Class<?> cls) {
+    String simpleName = cls.getSimpleName();
+    return Character.toLowerCase(simpleName.charAt(0)) + simpleName.substring(1);
+  }
+
+  /**
+   * Used by plugins to obtain service objects.
+   *
+   * <pre>{@code
+   *
+   *   JedisPool jedisPool = serverConfig.getServiceObject(JedisPool.class);
+   *
+   * }</pre>
+   *
+   * @param cls The
+   * @param <P>
+   * @return
+   */
+  public <P> P getServiceObject(Class<P> cls) {
+    return (P)serviceObject.get(serviceObjectKey(cls));
+  }
+
   /**
    * Return the Jackson JsonFactory to use.
    * <p>
diff --git a/src/test/java/io/ebean/config/ServerConfigTest.java b/src/test/java/io/ebean/config/ServerConfigTest.java
index 5ac810e8b..e5487b2b9 100644
--- a/src/test/java/io/ebean/config/ServerConfigTest.java
+++ b/src/test/java/io/ebean/config/ServerConfigTest.java
@@ -1,5 +1,6 @@
 package io.ebean.config;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.datasource.DataSourceConfig;
@@ -121,4 +122,19 @@ public class ServerConfigTest {
     serverConfig.setIdGeneratorAutomatic(false);
     assertFalse(serverConfig.isIdGeneratorAutomatic());
   }
+
+  @Test
+  public void test_putServiceObject() {
+
+    ObjectMapper objectMapper = new ObjectMapper();
+
+    ServerConfig config = new ServerConfig();
+    config.putServiceObject(objectMapper);
+
+    ObjectMapper mapper0 = config.getServiceObject(ObjectMapper.class);
+    ObjectMapper mapper1 = (ObjectMapper)config.getServiceObject("objectMapper");
+
+    assertThat(objectMapper).isSameAs(mapper0);
+    assertThat(objectMapper).isSameAs(mapper1);
+  }
 }

From da874d84a8da4e140202c2f686569fee14d0d3d7 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 19 Dec 2018 21:16:27 +1300
Subject: [PATCH 0614/1036] [maven-release-plugin] prepare release
 ebean-11.30.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index bb87496ba..6873b5b1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.30.1-SNAPSHOT</version>
+  <version>11.30.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.30.1</tag>
   </scm>
 
   <profiles>

From ea02bebc6fcc04d5cad0969114abaa9a2b408bd7 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 19 Dec 2018 21:16:42 +1300
Subject: [PATCH 0615/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6873b5b1f..2d1f7c223 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.30.1</version>
+  <version>11.30.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.30.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 84f7fc5d818a317e91c0ae17e2dd47dbcb2dc00a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 19 Dec 2018 21:20:37 +1300
Subject: [PATCH 0616/1036] No effective change - javadoc for ServerConfig
 getServiceObject

---
 src/main/java/io/ebean/config/ServerConfig.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 2d22890bd..1abf7bb56 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -633,12 +633,11 @@ public class ServerConfig {
    *
    * }</pre>
    *
-   * @param cls The
-   * @param <P>
-   * @return
+   * @param cls The type of the service object to obtain
+   * @return The service object given the class type
    */
   public <P> P getServiceObject(Class<P> cls) {
-    return (P)serviceObject.get(serviceObjectKey(cls));
+    return (P) serviceObject.get(serviceObjectKey(cls));
   }
 
   /**

From 58f6c67d78ee0a678ba36f9d8b812eac56a835d4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 21 Dec 2018 01:54:46 +1300
Subject: [PATCH 0617/1036] #1585 - Change the L2 bean cache keys to be String
 based

---
 pom.xml                                       |  2 +-
 .../server/cache/CacheChangeBeanUpdate.java   |  8 +-
 .../cache/CacheChangeNaturalKeyPut.java       | 10 +-
 .../server/cache/CacheChangeSet.java          |  8 +-
 .../server/core/PersistRequestBean.java       |  6 +-
 .../server/deploy/BeanDescriptor.java         | 34 +++++--
 .../deploy/BeanDescriptorCacheHelp.java       | 91 ++++++++++---------
 .../server/deploy/BeanProperty.java           |  7 ++
 .../server/deploy/BeanPropertyAssocMany.java  |  8 +-
 .../server/deploy/BeanPropertyAssocOne.java   |  5 +
 .../server/deploy/id/IdBinder.java            |  6 ++
 .../server/deploy/id/IdBinderEmbedded.java    | 16 ++++
 .../server/deploy/id/IdBinderEmpty.java       |  6 ++
 .../server/deploy/id/IdBinderSimple.java      |  6 ++
 14 files changed, 141 insertions(+), 72 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2d1f7c223..3c268889f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.30.2-SNAPSHOT</version>
+  <version>11.31.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
diff --git a/src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanUpdate.java b/src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanUpdate.java
index 5463eab5e..391e778c2 100644
--- a/src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanUpdate.java
+++ b/src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanUpdate.java
@@ -10,14 +10,14 @@ import java.util.Map;
 class CacheChangeBeanUpdate implements CacheChange {
 
   private final BeanDescriptor<?> desc;
-  private final Object id;
+  private final String key;
   private final Map<String, Object> changes;
   private final boolean updateNaturalKey;
   private final long version;
 
-  CacheChangeBeanUpdate(BeanDescriptor<?> desc, Object id, Map<String, Object> changes, boolean updateNaturalKey, long version) {
+  CacheChangeBeanUpdate(BeanDescriptor<?> desc, String key, Map<String, Object> changes, boolean updateNaturalKey, long version) {
     this.desc = desc;
-    this.id = id;
+    this.key = key;
     this.changes = changes;
     this.updateNaturalKey = updateNaturalKey;
     this.version = version;
@@ -25,6 +25,6 @@ class CacheChangeBeanUpdate implements CacheChange {
 
   @Override
   public void apply() {
-    desc.cacheApplyBeanUpdate(id, changes, updateNaturalKey, version);
+    desc.cacheApplyBeanUpdate(key, changes, updateNaturalKey, version);
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/cache/CacheChangeNaturalKeyPut.java b/src/main/java/io/ebeaninternal/server/cache/CacheChangeNaturalKeyPut.java
index 208e097bb..f90a23749 100644
--- a/src/main/java/io/ebeaninternal/server/cache/CacheChangeNaturalKeyPut.java
+++ b/src/main/java/io/ebeaninternal/server/cache/CacheChangeNaturalKeyPut.java
@@ -8,17 +8,17 @@ import io.ebeaninternal.server.deploy.BeanDescriptor;
 class CacheChangeNaturalKeyPut implements CacheChange {
 
   private final BeanDescriptor<?> descriptor;
-  private final Object id;
-  private final Object newKey;
+  private final String key;
+  private final String newKey;
 
-  CacheChangeNaturalKeyPut(BeanDescriptor<?> descriptor, Object id, Object newKey) {
+  CacheChangeNaturalKeyPut(BeanDescriptor<?> descriptor, String key, String newKey) {
     this.descriptor = descriptor;
-    this.id = id;
+    this.key = key;
     this.newKey = newKey;
   }
 
   @Override
   public void apply() {
-    descriptor.cacheNaturalKeyPut(id, newKey);
+    descriptor.cacheNaturalKeyPut(key, newKey);
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java b/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
index 5865d2bbc..9a058444e 100644
--- a/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
+++ b/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
@@ -152,16 +152,16 @@ public class CacheChangeSet {
   /**
    * Update a bean entry.
    */
-  public <T> void addBeanUpdate(BeanDescriptor<T> desc, Object id, Map<String, Object> changes, boolean updateNaturalKey, long version) {
+  public <T> void addBeanUpdate(BeanDescriptor<T> desc, String key, Map<String, Object> changes, boolean updateNaturalKey, long version) {
     touchedTables.add(desc.getBaseTable());
-    entries.add(new CacheChangeBeanUpdate(desc, id, changes, updateNaturalKey, version));
+    entries.add(new CacheChangeBeanUpdate(desc, key, changes, updateNaturalKey, version));
   }
 
   /**
    * Update a natural key.
    */
-  public <T> void addNaturalKeyPut(BeanDescriptor<T> desc, Object id, Object val) {
-    entries.add(new CacheChangeNaturalKeyPut(desc, id, val));
+  public <T> void addNaturalKeyPut(BeanDescriptor<T> desc, String key, String val) {
+    entries.add(new CacheChangeNaturalKeyPut(desc, key, val));
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index d2a93c9d6..8bf7ffd81 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -1405,6 +1405,8 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
 
       boolean updateNaturalKey = false;
 
+      String key = beanDescriptor.cacheKey(idValue);
+
       Map<String, Object> changes = new LinkedHashMap<>();
       EntityBean bean = getEntityBean();
       boolean[] dirtyProperties = getDirtyProperties();
@@ -1417,7 +1419,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
               changes.put(property.getName(), val);
               if (property.isNaturalKey()) {
                 updateNaturalKey = true;
-                changeSet.addNaturalKeyPut(beanDescriptor, idValue, val);
+                changeSet.addNaturalKeyPut(beanDescriptor, key, val.toString());
               }
             }
           }
@@ -1428,7 +1430,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
         changes.putAll(collectionChanges);
       }
 
-      changeSet.addBeanUpdate(beanDescriptor, idValue, changes, updateNaturalKey, getVersion());
+      changeSet.addBeanUpdate(beanDescriptor, key, changes, updateNaturalKey, getVersion());
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 5c2f18a76..48985d2ee 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -1487,21 +1487,25 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * Return a bean from the bean cache (or null).
    */
   public T cacheBeanGet(Object id, Boolean readOnly, PersistenceContext context) {
-    return cacheHelp.beanCacheGet(id, readOnly, context);
+    return cacheHelp.beanCacheGet(cacheKey(id), readOnly, context);
   }
 
   /**
    * Remove a collection of beans from the cache given the ids.
    */
   public void cacheApplyInvalidate(Collection<Object> ids) {
-    cacheHelp.beanCacheApplyInvalidate(ids);
+    List<String> keys = new ArrayList<>(ids.size());
+    for (Object id : ids) {
+      keys.add(cacheKey(id));
+    }
+    cacheHelp.beanCacheApplyInvalidate(keys);
   }
 
   /**
    * Returns true if it managed to populate/load the bean from the cache.
    */
   public boolean cacheBeanLoad(EntityBean bean, EntityBeanIntercept ebi, Object id, PersistenceContext context) {
-    return cacheHelp.beanCacheLoad(bean, ebi, id, context);
+    return cacheHelp.beanCacheLoad(bean, ebi, cacheKey(id), context);
   }
 
   /**
@@ -1520,8 +1524,8 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return cacheHelp.naturalKeyLookup(context, keys);
   }
 
-  public void cacheNaturalKeyPut(Object id, Object newKey) {
-    cacheHelp.cacheNaturalKeyPut(id, newKey);
+  public void cacheNaturalKeyPut(String key, String newKey) {
+    cacheHelp.cacheNaturalKeyPut(key, newKey);
   }
 
   /**
@@ -1569,8 +1573,8 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Apply the update to the cache.
    */
-  public void cacheApplyBeanUpdate(Object id, Map<String, Object> changes, boolean updateNaturalKey, long version) {
-    cacheHelp.cacheBeanUpdate(id, changes, updateNaturalKey, version);
+  public void cacheApplyBeanUpdate(String key, Map<String, Object> changes, boolean updateNaturalKey, long version) {
+    cacheHelp.cacheBeanUpdate(key, changes, updateNaturalKey, version);
   }
 
   /**
@@ -1989,7 +1993,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   public T createReference(Boolean readOnly, boolean disableLazyLoad, Object id, PersistenceContext pc) {
 
     if (cacheSharableBeans && !disableLazyLoad && !Boolean.FALSE.equals(readOnly)) {
-      CachedBeanData d = cacheHelp.beanCacheGetData(id);
+      CachedBeanData d = cacheHelp.beanCacheGetData(cacheKey(id));
       if (d != null) {
         Object shareableBean = d.getSharableBean();
         if (shareableBean != null) {
@@ -2270,6 +2274,20 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return (idProperty == null) ? null : idProperty.getValueIntercept(bean);
   }
 
+  /**
+   * Return the cache key for the given bean (based on id value).
+   */
+  public String cacheKeyForBean(EntityBean bean) {
+    return cacheKey(idProperty.getValue(bean));
+  }
+
+  /**
+   * Return the cache key for the given id value.
+   */
+  public String cacheKey(Object id) {
+    return idBinder.cacheKey(id);
+  }
+
   @Override
   public Object beanId(Object bean) {
     return getId((EntityBean) bean);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index 56f951b98..ed5d7cdfb 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -282,7 +282,7 @@ final class BeanDescriptorCacheHelp<T> {
 
     if (many.isElementCollection()) {
       // held as part of the bean cache so skip
-			return false;
+      return false;
     }
 
     CachedManyIds entry = manyPropGet(parentId, many.getName());
@@ -317,7 +317,7 @@ final class BeanDescriptorCacheHelp<T> {
         try {
           // add as JSON to bean cache
           String asJson = many.jsonWriteCollection(details);
-          Map<String,Object> changes = new HashMap<>();
+          Map<String, Object> changes = new HashMap<>();
           changes.put(many.getName(), asJson);
 
           CachedBeanData newData = data.update(changes, data.getVersion());
@@ -475,7 +475,7 @@ final class BeanDescriptorCacheHelp<T> {
 
   private Class<?> theClassOf(Collection<EntityBean> beans) {
     if (beans instanceof List) {
-      return ((List<?>)beans).get(0).getClass();
+      return ((List<?>) beans).get(0).getClass();
     }
     return beans.iterator().next().getClass();
   }
@@ -494,20 +494,20 @@ final class BeanDescriptorCacheHelp<T> {
 
   void beanCachePutAllDirect(Collection<EntityBean> beans) {
 
-    Map<Object,Object> natKeys = null;
+    Map<Object, Object> natKeys = null;
     if (naturalKey != null) {
       natKeys = new LinkedHashMap<>();
     }
 
-    Map<Object,Object> map = new LinkedHashMap<>();
+    Map<Object, Object> map = new LinkedHashMap<>();
     for (EntityBean bean : beans) {
       CachedBeanData beanData = beanExtractData(desc, bean);
-      Object id = desc.getId(bean);
-      map.put(id, beanData);
+      String key = desc.cacheKeyForBean(bean);
+      map.put(key, beanData);
       if (naturalKey != null) {
         Object naturalKey = calculateNaturalKey(beanData);
         if (naturalKey != null) {
-          natKeys.put(naturalKey, id);
+          natKeys.put(naturalKey, key);
         }
       }
     }
@@ -525,32 +525,33 @@ final class BeanDescriptorCacheHelp<T> {
   }
 
   /**
-	 * Put the bean into the bean cache.
-	 */
+   * Put the bean into the bean cache.
+   */
   void beanCachePutDirect(EntityBean bean) {
 
     CachedBeanData beanData = beanExtractData(desc, bean);
 
-    Object id = desc.getId(bean);
+    String key = desc.cacheKeyForBean(bean);
     if (beanLog.isDebugEnabled()) {
-      beanLog.debug("   PUT {}({}) data:{}", cacheName, id, beanData);
+      beanLog.debug("   PUT {}({}) data:{}", cacheName, key, beanData);
     }
-    getBeanCache().put(id, beanData);
+    getBeanCache().put(key, beanData);
 
     if (naturalKey != null) {
-      Object naturalKey = calculateNaturalKey(beanData);
+      String naturalKey = calculateNaturalKey(beanData);
       if (naturalKey != null) {
         if (natLog.isDebugEnabled()) {
-          natLog.debug(" PUT {}({}, {})", cacheName, naturalKey, id);
+          natLog.debug(" PUT {}({}, {})", cacheName, naturalKey, key);
         }
-        naturalKeyCache.put(naturalKey, id);
+        naturalKeyCache.put(naturalKey, key);
       }
     }
   }
 
-  private Object calculateNaturalKey(CachedBeanData beanData) {
+  private String calculateNaturalKey(CachedBeanData beanData) {
     if (naturalKey.length == 1) {
-      return beanData.getData(naturalKey[0]);
+      Object data = beanData.getData(naturalKey[0]);
+      return (data == null) ? null : data.toString();
     }
     StringBuilder sb = new StringBuilder();
     for (String key : naturalKey) {
@@ -563,12 +564,12 @@ final class BeanDescriptorCacheHelp<T> {
     return sb.toString();
   }
 
-  CachedBeanData beanCacheGetData(Object id) {
-    return (CachedBeanData) getBeanCache().get(id);
+  CachedBeanData beanCacheGetData(String key) {
+    return (CachedBeanData) getBeanCache().get(key);
   }
 
-  T beanCacheGet(Object id, Boolean readOnly, PersistenceContext context) {
-    T bean = beanCacheGetInternal(id, readOnly, context);
+  T beanCacheGet(String key, Boolean readOnly, PersistenceContext context) {
+    T bean = beanCacheGetInternal(key, readOnly, context);
     if (bean != null) {
       setupContext(bean, context);
     }
@@ -578,19 +579,19 @@ final class BeanDescriptorCacheHelp<T> {
   /**
    * Return a bean from the bean cache.
    */
-  private T beanCacheGetInternal(Object id, Boolean readOnly, PersistenceContext context) {
+  private T beanCacheGetInternal(String key, Boolean readOnly, PersistenceContext context) {
 
-    CachedBeanData data = (CachedBeanData) getBeanCache().get(id);
+    CachedBeanData data = (CachedBeanData) getBeanCache().get(key);
     if (data == null) {
       if (beanLog.isTraceEnabled()) {
-        beanLog.trace("   GET {}({}) - cache miss", cacheName, id);
+        beanLog.trace("   GET {}({}) - cache miss", cacheName, key);
       }
       return null;
     }
     if (beanLog.isTraceEnabled()) {
-      beanLog.trace("   GET {}({}) - hit", cacheName, id);
+      beanLog.trace("   GET {}({}) - hit", cacheName, key);
     }
-    return convertToBean(id, readOnly, context, data);
+    return convertToBean(key, readOnly, context, data);
   }
 
   @SuppressWarnings("unchecked")
@@ -686,12 +687,12 @@ final class BeanDescriptorCacheHelp<T> {
   /**
    * Remove a bean from the cache given its Id.
    */
-  void beanCacheApplyInvalidate(Collection<Object> ids) {
+  void beanCacheApplyInvalidate(Collection<String> keys) {
     if (beanCache != null) {
       if (beanLog.isDebugEnabled()) {
-        beanLog.debug("   REMOVE {}({})", cacheName, ids);
+        beanLog.debug("   REMOVE {}({})", cacheName, keys);
       }
-      beanCache.removeAll(new HashSet<>(ids));
+      beanCache.removeAll(new HashSet<>(keys));
     }
     for (BeanPropertyAssocOne<?> imported : propertiesOneImported) {
       imported.cacheClear();
@@ -701,26 +702,26 @@ final class BeanDescriptorCacheHelp<T> {
   /**
    * Returns true if it managed to populate/load the bean from the cache.
    */
-  boolean beanCacheLoad(EntityBean bean, EntityBeanIntercept ebi, Object id, PersistenceContext context) {
+  boolean beanCacheLoad(EntityBean bean, EntityBeanIntercept ebi, String key, PersistenceContext context) {
 
-    CachedBeanData cacheData = (CachedBeanData) getBeanCache().get(id);
+    CachedBeanData cacheData = (CachedBeanData) getBeanCache().get(key);
     if (cacheData == null) {
       if (beanLog.isTraceEnabled()) {
-        beanLog.trace("   LOAD {}({}) - cache miss", cacheName, id);
+        beanLog.trace("   LOAD {}({}) - cache miss", cacheName, key);
       }
       return false;
     }
     int lazyLoadProperty = ebi.getLazyLoadPropertyIndex();
     if (lazyLoadProperty > -1 && !cacheData.isLoaded(ebi.getLazyLoadProperty())) {
       if (beanLog.isTraceEnabled()) {
-        beanLog.trace("   LOAD {}({}) - cache miss on property({})", cacheName, id, ebi.getLazyLoadProperty());
+        beanLog.trace("   LOAD {}({}) - cache miss on property({})", cacheName, key, ebi.getLazyLoadProperty());
       }
       return false;
     }
 
     CachedBeanDataToBean.load(desc, bean, cacheData, context);
     if (beanLog.isDebugEnabled()) {
-      beanLog.debug("   LOAD {}({}) - hit", cacheName, id);
+      beanLog.debug("   LOAD {}({}) - hit", cacheName, key);
     }
     return true;
   }
@@ -736,7 +737,7 @@ final class BeanDescriptorCacheHelp<T> {
    */
   void persistDeleteIds(Collection<Object> ids, CacheChangeSet changeSet) {
     if (invalidateQueryCache) {
-     changeSet.addInvalidate(desc);
+      changeSet.addInvalidate(desc);
     } else {
       queryCacheClear(changeSet);
       if (beanCache != null) {
@@ -833,42 +834,42 @@ final class BeanDescriptorCacheHelp<T> {
     }
   }
 
-  void cacheNaturalKeyPut(Object id, Object newKey) {
+  void cacheNaturalKeyPut(String key, String newKey) {
     if (newKey != null) {
-      naturalKeyCache.put(newKey, id);
+      naturalKeyCache.put(newKey, key);
     }
   }
 
   /**
    * Apply changes to the bean cache entry.
    */
-  void cacheBeanUpdate(Object id, Map<String, Object> changes, boolean updateNaturalKey, long version) {
+  void cacheBeanUpdate(String key, Map<String, Object> changes, boolean updateNaturalKey, long version) {
 
     ServerCache cache = getBeanCache();
-    CachedBeanData existingData = (CachedBeanData) cache.get(id);
+    CachedBeanData existingData = (CachedBeanData) cache.get(key);
     if (existingData != null) {
       long currentVersion = existingData.getVersion();
       if (version > 0 && version < currentVersion) {
         if (beanLog.isDebugEnabled()) {
-          beanLog.debug("   REMOVE {}({}) - version conflict old:{} new:{}", cacheName, id, currentVersion, version);
+          beanLog.debug("   REMOVE {}({}) - version conflict old:{} new:{}", cacheName, key, currentVersion, version);
         }
-        cache.remove(id);
+        cache.remove(key);
       } else {
         if (version == 0) {
           version = currentVersion;
         }
         CachedBeanData newData = existingData.update(changes, version);
         if (beanLog.isDebugEnabled()) {
-          beanLog.debug("   UPDATE {}({})  changes:{}", cacheName, id, changes);
+          beanLog.debug("   UPDATE {}({})  changes:{}", cacheName, key, changes);
         }
-        cache.put(id, newData);
+        cache.put(key, newData);
       }
 
       if (updateNaturalKey) {
         Object oldKey = calculateNaturalKey(existingData);
         if (oldKey != null) {
           if (natLog.isDebugEnabled()) {
-            natLog.debug(".. update {} REMOVE({}) - old key for ({})", cacheName, oldKey, id);
+            natLog.debug(".. update {} REMOVE({}) - old key for ({})", cacheName, oldKey, key);
           }
           naturalKeyCache.remove(oldKey);
         }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 6ae467d44..a2c7b0086 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -827,6 +827,13 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     }
   }
 
+  /**
+   * Return the value in String format (for bean cache key).
+   */
+  public String format(Object value) {
+    return scalarType.format(value);
+  }
+
   /**
    * Read the value for this property from L2 cache entry and set it to the bean.
    * <p>
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index bfba8ed9d..fdb38088c 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -972,8 +972,10 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   public void setCacheDataValue(EntityBean bean, Object cacheData, PersistenceContext context) {
     try {
       String asJson = (String) cacheData;
-      Object collection = jsonReadCollection(asJson);
-      setValue(bean, collection);
+      if (asJson != null && !asJson.isEmpty()) {
+        Object collection = jsonReadCollection(asJson);
+        setValue(bean, collection);
+      }
     } catch (Exception e) {
       logger.error("Error setting value from L2 cache", e);
     }
@@ -999,7 +1001,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   public String jsonWriteCollection(Object value) throws IOException {
     StringWriter writer = new StringWriter(300);
     SpiJsonWriter ctx = descriptor.createJsonWriter(writer);
-    help.jsonWrite(ctx, null, value, false);
+    help.jsonWrite(ctx, null, value, true);
     ctx.flush();
     return writer.toString();
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index 9a5f7c1c2..4245235cd 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -413,6 +413,11 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     }
   }
 
+  @Override
+  public String format(Object value) {
+    return targetDescriptor.getIdBinder().cacheKey(value);
+  }
+
   @Override
   public void setCacheDataValue(EntityBean bean, Object cacheData, PersistenceContext context) {
     if (cacheData == null) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java
index d3a018e10..c722af79e 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java
@@ -207,4 +207,10 @@ public interface IdBinder {
    * Cast or convert the Id value if necessary.
    */
   Object convertId(Object idValue);
+
+  /**
+   * Return a key to use for bean caches given the id value.
+   */
+  String cacheKey(Object idValue);
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java
index c78e9ba25..6358a57c3 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java
@@ -479,4 +479,20 @@ public final class IdBinderEmbedded implements IdBinder {
 
     return idValue;
   }
+
+  @Override
+  public String cacheKey(Object value) {
+
+    EntityBean bean = (EntityBean)value;
+    StringBuilder sb = new StringBuilder();
+    for (BeanProperty prop : props) {
+      Object val = prop.getValue(bean);
+      if (val != null) {
+        sb.append(prop.format(val));
+      }
+      sb.append("|");
+    }
+    return sb.toString();
+  }
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java
index 01052b076..651c995d2 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java
@@ -178,4 +178,10 @@ public final class IdBinderEmpty implements IdBinder {
   public void writeData(DataOutput dataOutput, Object idValue) throws IOException {
 
   }
+
+  @Override
+  public String cacheKey(Object bean) {
+    return null;
+  }
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
index f424f4662..e76503b20 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
@@ -262,4 +262,10 @@ public final class IdBinderSimple implements IdBinder {
     }
     return idValue;
   }
+
+  @Override
+  public String cacheKey(Object value) {
+    return scalarType.format(value);
+  }
+
 }

From 0377e3ec5c597c628173741eec835c046af70b16 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 21 Dec 2018 02:10:16 +1300
Subject: [PATCH 0618/1036] #1586 - ENH: Add TimedMetric.addSinceNanos() ... as
 a helper when using start nanos

---
 .../java/io/ebean/metric/TimedMetric.java     |  5 ++++
 .../java/io/ebean/metric/TimedMetricMap.java  |  5 ++++
 .../server/profile/DTimedMetric.java          |  5 ++++
 .../server/profile/DTimedMetricMap.java       |  5 ++++
 .../ImplicitReadOnlyTransaction.java          |  3 +-
 .../server/profile/DTimedMetricMapTest.java   | 29 +++++++++++++++++++
 .../server/profile/DTimedMetricTest.java      | 26 +++++++++++++++++
 7 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java
 create mode 100644 src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java

diff --git a/src/main/java/io/ebean/metric/TimedMetric.java b/src/main/java/io/ebean/metric/TimedMetric.java
index cd943375f..6a142bfe2 100644
--- a/src/main/java/io/ebean/metric/TimedMetric.java
+++ b/src/main/java/io/ebean/metric/TimedMetric.java
@@ -17,6 +17,11 @@ public interface TimedMetric {
    */
   void add(long micros, long beans);
 
+  /**
+   * Add a time event given the start nanos.
+   */
+  void addSinceNanos(long startNanos);
+
   /**
    * Return true if there are no metrics collected since the last collection.
    */
diff --git a/src/main/java/io/ebean/metric/TimedMetricMap.java b/src/main/java/io/ebean/metric/TimedMetricMap.java
index 70436f21a..5b6fccdb2 100644
--- a/src/main/java/io/ebean/metric/TimedMetricMap.java
+++ b/src/main/java/io/ebean/metric/TimedMetricMap.java
@@ -7,6 +7,11 @@ import io.ebean.meta.MetricVisitor;
  */
 public interface TimedMetricMap {
 
+  /**
+   * Add a time event given the start nanos.
+   */
+  void addSinceNanos(String key, long startNanos);
+
   /**
    * Add an execution for the given key.
    */
diff --git a/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java b/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
index e7eb4096d..cb1c4b4c4 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
@@ -35,6 +35,11 @@ class DTimedMetric implements TimedMetric {
     this.name = name;
   }
 
+  @Override
+  public void addSinceNanos(long startNanos) {
+    add((System.nanoTime() - startNanos) / 1000L);
+  }
+
   /**
    * Add a value. Usually the value is Time or Bytes etc.
    */
diff --git a/src/main/java/io/ebeaninternal/server/profile/DTimedMetricMap.java b/src/main/java/io/ebeaninternal/server/profile/DTimedMetricMap.java
index f9e6a8472..c5c4ffdc8 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DTimedMetricMap.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DTimedMetricMap.java
@@ -19,6 +19,11 @@ class DTimedMetricMap implements TimedMetricMap {
     this.name = name;
   }
 
+  @Override
+  public void addSinceNanos(String key, long startNanos) {
+    add(key, (System.nanoTime() - startNanos)/1000L);
+  }
+
   @Override
   public void add(String key, long exeMicros) {
     map.computeIfAbsent(key, (k) -> new DTimedMetric(metricType, name + key)).add(exeMicros);
diff --git a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
index 5241aa90e..907db2256 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
@@ -512,8 +512,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
     }
     connection = null;
     active = false;
-    long exeMicros = (System.nanoTime() - startNanos) / 1000L;
-    manager.collectMetricReadOnly(exeMicros);
+    manager.collectMetricReadOnly((System.nanoTime() - startNanos) / 1000L);
   }
 
   /**
diff --git a/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java b/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java
new file mode 100644
index 000000000..7b1c3f713
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java
@@ -0,0 +1,29 @@
+package io.ebeaninternal.server.profile;
+
+import io.ebean.meta.BasicMetricVisitor;
+import io.ebean.meta.MetaTimedMetric;
+import io.ebean.meta.MetricType;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class DTimedMetricMapTest {
+
+  @Test
+  public void addSinceNanos() throws InterruptedException {
+
+    DTimedMetricMap metricMap = new DTimedMetricMap(MetricType.L2, "addSinceNanos");
+
+    long nanos = System.nanoTime();
+    Thread.sleep(10);
+
+    metricMap.addSinceNanos("some", nanos);
+
+    BasicMetricVisitor visitor = new BasicMetricVisitor();
+    metricMap.visit(visitor);
+
+    MetaTimedMetric timedMetric = visitor.getTimedMetrics().get(0);
+    assertThat(timedMetric.getCount()).isEqualTo(1);
+    assertThat(timedMetric.getTotal()).isGreaterThan(10);
+  }
+}
diff --git a/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java b/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java
new file mode 100644
index 000000000..1ec6d4f55
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java
@@ -0,0 +1,26 @@
+package io.ebeaninternal.server.profile;
+
+import io.ebean.meta.MetricType;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class DTimedMetricTest {
+
+  @Test
+  public void addSinceNanos() throws InterruptedException {
+
+    DTimedMetric metric = new DTimedMetric(MetricType.L2, "addSinceNanos");
+
+    long start = System.nanoTime();
+    Thread.sleep(10);
+
+    metric.addSinceNanos(start);
+
+    DTimeMetricStats stats = metric.collect(true);
+    assertThat(stats.getCount()).isEqualTo(1);
+    assertThat(stats.getTotal()).isGreaterThan(10);
+    assertThat(stats.getMax()).isEqualTo(stats.getTotal());
+
+  }
+}

From 81f42f8e95f765cb7333af5fe605dab5ba5311bd Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 21 Dec 2018 02:19:21 +1300
Subject: [PATCH 0619/1036] #1587 - Fix for propagation of
 @Cache(nearCache=true)

---
 .../io/ebean/cache/ServerCacheOptions.java    |  9 ++++++
 .../server/cache/DefaultCacheHolder.java      |  2 +-
 .../ebean/cache/ServerCacheOptionsTest.java   | 30 +++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/io/ebean/cache/ServerCacheOptionsTest.java

diff --git a/src/main/java/io/ebean/cache/ServerCacheOptions.java b/src/main/java/io/ebean/cache/ServerCacheOptions.java
index feb0623ee..fe8fdb486 100644
--- a/src/main/java/io/ebean/cache/ServerCacheOptions.java
+++ b/src/main/java/io/ebean/cache/ServerCacheOptions.java
@@ -79,6 +79,15 @@ public class ServerCacheOptions {
     copy.maxIdleSecs = maxIdleSecs;
     copy.maxSecsToLive = maxSecsToLive;
     copy.trimFrequency = trimFrequency;
+    copy.nearCache = this.nearCache;
+    return copy;
+  }
+
+  /**
+   * Return a copy of this object with nearCache option.
+   */
+  public ServerCacheOptions copy(boolean nearCache) {
+    ServerCacheOptions copy = copy();
     copy.nearCache = nearCache;
     return copy;
   }
diff --git a/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java b/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
index 71b3af1a8..8211e32c4 100644
--- a/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
+++ b/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
@@ -132,7 +132,7 @@ class DefaultCacheHolder {
     if (tuning != null) {
       return new ServerCacheOptions(nearCache, tuning).applyDefaults(beanDefault);
     }
-    return beanDefault.copy();
+    return beanDefault.copy(nearCache);
   }
 
 }
diff --git a/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java b/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java
new file mode 100644
index 000000000..47f569c74
--- /dev/null
+++ b/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java
@@ -0,0 +1,30 @@
+package io.ebean.cache;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ServerCacheOptionsTest {
+
+  @Test
+  public void copy_when_off() {
+
+    ServerCacheOptions basic = new ServerCacheOptions();
+    assertThat(basic.isNearCache()).isFalse();
+
+    ServerCacheOptions copy = basic.copy(true);
+    assertThat(copy.isNearCache()).isTrue();
+  }
+
+  @Test
+  public void copy_when_on() {
+
+    ServerCacheOptions basic = new ServerCacheOptions();
+    basic.setNearCache(true);
+    assertThat(basic.isNearCache()).isTrue();
+
+    ServerCacheOptions copy = basic.copy(false);
+    assertThat(copy.isNearCache()).isFalse();
+  }
+
+}

From baa3909c6307a0db7fcc2470d00fcb8b3299cc01 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 21 Dec 2018 02:28:23 +1300
Subject: [PATCH 0620/1036] #1586 - ENH: Add TimedMetric.addSinceNanos() ... as
 a helper when using start nanos

---
 src/main/java/io/ebean/metric/TimedMetric.java         |  5 +++++
 src/main/java/io/ebean/metric/TimedMetricMap.java      |  5 +++++
 .../io/ebeaninternal/server/profile/DTimedMetric.java  |  5 +++++
 .../ebeaninternal/server/profile/DTimedMetricMap.java  |  5 +++++
 .../server/profile/DTimedMetricMapTest.java            | 10 ++++++++++
 .../ebeaninternal/server/profile/DTimedMetricTest.java |  7 +++++++
 6 files changed, 37 insertions(+)

diff --git a/src/main/java/io/ebean/metric/TimedMetric.java b/src/main/java/io/ebean/metric/TimedMetric.java
index 6a142bfe2..fb2589273 100644
--- a/src/main/java/io/ebean/metric/TimedMetric.java
+++ b/src/main/java/io/ebean/metric/TimedMetric.java
@@ -22,6 +22,11 @@ public interface TimedMetric {
    */
   void addSinceNanos(long startNanos);
 
+  /**
+   * Add a time event given the start nanos and bean count.
+   */
+  void addSinceNanos(long startNanos, long beans);
+
   /**
    * Return true if there are no metrics collected since the last collection.
    */
diff --git a/src/main/java/io/ebean/metric/TimedMetricMap.java b/src/main/java/io/ebean/metric/TimedMetricMap.java
index 5b6fccdb2..55c0ab372 100644
--- a/src/main/java/io/ebean/metric/TimedMetricMap.java
+++ b/src/main/java/io/ebean/metric/TimedMetricMap.java
@@ -12,6 +12,11 @@ public interface TimedMetricMap {
    */
   void addSinceNanos(String key, long startNanos);
 
+  /**
+   * Add a time event given the start nanos and beans.
+   */
+  void addSinceNanos(String key, long startNanos, int beans);
+
   /**
    * Add an execution for the given key.
    */
diff --git a/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java b/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
index cb1c4b4c4..065d44c8b 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
@@ -40,6 +40,11 @@ class DTimedMetric implements TimedMetric {
     add((System.nanoTime() - startNanos) / 1000L);
   }
 
+  @Override
+  public void addSinceNanos(long startNanos, long beans) {
+    add((System.nanoTime() - startNanos) / 1000L, beans);
+  }
+
   /**
    * Add a value. Usually the value is Time or Bytes etc.
    */
diff --git a/src/main/java/io/ebeaninternal/server/profile/DTimedMetricMap.java b/src/main/java/io/ebeaninternal/server/profile/DTimedMetricMap.java
index c5c4ffdc8..418e4d7e2 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DTimedMetricMap.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DTimedMetricMap.java
@@ -24,6 +24,11 @@ class DTimedMetricMap implements TimedMetricMap {
     add(key, (System.nanoTime() - startNanos)/1000L);
   }
 
+  @Override
+  public void addSinceNanos(String key, long startNanos, int beans) {
+    add(key, (System.nanoTime() - startNanos)/1000L, beans);
+  }
+
   @Override
   public void add(String key, long exeMicros) {
     map.computeIfAbsent(key, (k) -> new DTimedMetric(metricType, name + key)).add(exeMicros);
diff --git a/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java b/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java
index 7b1c3f713..07a44265d 100644
--- a/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java
+++ b/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java
@@ -25,5 +25,15 @@ public class DTimedMetricMapTest {
     MetaTimedMetric timedMetric = visitor.getTimedMetrics().get(0);
     assertThat(timedMetric.getCount()).isEqualTo(1);
     assertThat(timedMetric.getTotal()).isGreaterThan(10);
+
+    metricMap.addSinceNanos("some", nanos, 42);
+
+    visitor = new BasicMetricVisitor();
+    metricMap.visit(visitor);
+
+    timedMetric = visitor.getTimedMetrics().get(0);
+    assertThat(timedMetric.getCount()).isEqualTo(1);
+    assertThat(timedMetric.getTotal()).isGreaterThan(10);
+    assertThat(timedMetric.getBeanCount()).isEqualTo(42);
   }
 }
diff --git a/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java b/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java
index 1ec6d4f55..b84800624 100644
--- a/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java
+++ b/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java
@@ -22,5 +22,12 @@ public class DTimedMetricTest {
     assertThat(stats.getTotal()).isGreaterThan(10);
     assertThat(stats.getMax()).isEqualTo(stats.getTotal());
 
+    metric.addSinceNanos(start, 42);
+
+    stats = metric.collect(true);
+    assertThat(stats.getCount()).isEqualTo(1);
+    assertThat(stats.getTotal()).isGreaterThan(10);
+    assertThat(stats.getMax()).isEqualTo(stats.getTotal());
+    assertThat(stats.getBeanCount()).isEqualTo(42);
   }
 }

From b403942491fc1feec0b84dbd85a8217de151bc71 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Thu, 20 Dec 2018 23:55:07 +0100
Subject: [PATCH 0621/1036] Query cache bug, which produces wrong results
 (#1584)

---
 src/test/java/org/tests/query/cache/Acl.java  | 20 +++++++
 .../query/cache/AclContainerRelation.java     | 48 +++++++++++++++
 .../java/org/tests/query/cache/Contract.java  | 49 +++++++++++++++
 .../org/tests/query/cache/ContractCosts.java  | 34 +++++++++++
 .../java/org/tests/query/cache/Main1.java     | 23 ++++++++
 .../java/org/tests/query/cache/Main2.java     | 22 +++++++
 .../java/org/tests/query/cache/Position.java  | 32 ++++++++++
 .../org/tests/query/cache/TestDistinct.java   | 59 +++++++++++++++++++
 8 files changed, 287 insertions(+)
 create mode 100644 src/test/java/org/tests/query/cache/Acl.java
 create mode 100644 src/test/java/org/tests/query/cache/AclContainerRelation.java
 create mode 100644 src/test/java/org/tests/query/cache/Contract.java
 create mode 100644 src/test/java/org/tests/query/cache/ContractCosts.java
 create mode 100644 src/test/java/org/tests/query/cache/Main1.java
 create mode 100644 src/test/java/org/tests/query/cache/Main2.java
 create mode 100644 src/test/java/org/tests/query/cache/Position.java
 create mode 100644 src/test/java/org/tests/query/cache/TestDistinct.java

diff --git a/src/test/java/org/tests/query/cache/Acl.java b/src/test/java/org/tests/query/cache/Acl.java
new file mode 100644
index 000000000..5919ae13a
--- /dev/null
+++ b/src/test/java/org/tests/query/cache/Acl.java
@@ -0,0 +1,20 @@
+package org.tests.query.cache;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class Acl {
+	@Id
+	@GeneratedValue
+	protected Long id;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(final Long id) {
+		this.id = id;
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/tests/query/cache/AclContainerRelation.java b/src/test/java/org/tests/query/cache/AclContainerRelation.java
new file mode 100644
index 000000000..9038bb56f
--- /dev/null
+++ b/src/test/java/org/tests/query/cache/AclContainerRelation.java
@@ -0,0 +1,48 @@
+package org.tests.query.cache;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.validation.constraints.NotNull;
+
+@Entity
+public class AclContainerRelation {
+	@Id
+	@GeneratedValue
+	protected Long id;
+
+	@ManyToOne(cascade = {}, fetch = FetchType.LAZY)
+	@NotNull
+	private Contract container;
+
+	@ManyToOne(cascade = {}, fetch = FetchType.LAZY)
+	@NotNull
+	private Acl aclEntry;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(final Long id) {
+		this.id = id;
+	}
+
+	public Contract getContainer() {
+		return container;
+	}
+
+	public void setContainer(final Contract container) {
+		this.container = container;
+	}
+
+	public Acl getAclEntry() {
+		return aclEntry;
+	}
+
+	public void setAclEntry(final Acl aclEntry) {
+		this.aclEntry = aclEntry;
+	}
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/tests/query/cache/Contract.java b/src/test/java/org/tests/query/cache/Contract.java
new file mode 100644
index 000000000..db89b1cbe
--- /dev/null
+++ b/src/test/java/org/tests/query/cache/Contract.java
@@ -0,0 +1,49 @@
+package org.tests.query.cache;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Nonnull;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+@Entity
+public class Contract {
+	@Id
+	@GeneratedValue
+	protected Long id;
+
+	@OneToMany(cascade = CascadeType.ALL, mappedBy = "contract")
+	private List<Position> positions;
+
+	@OneToMany(cascade = CascadeType.ALL, mappedBy = "container", fetch = FetchType.LAZY)
+	@Nonnull
+	private List<AclContainerRelation> aclEntries = new ArrayList<>();
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(final Long id) {
+		this.id = id;
+	}
+
+	public List<Position> getPositions() {
+		return positions;
+	}
+
+	public void setPositions(final List<Position> positions) {
+		this.positions = positions;
+	}
+
+	public List<AclContainerRelation> getAclEntries() {
+		return aclEntries;
+	}
+
+	public void setAclEntries(final List<AclContainerRelation> aclEntries) {
+		this.aclEntries = aclEntries;
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/tests/query/cache/ContractCosts.java b/src/test/java/org/tests/query/cache/ContractCosts.java
new file mode 100644
index 000000000..ed2655bc3
--- /dev/null
+++ b/src/test/java/org/tests/query/cache/ContractCosts.java
@@ -0,0 +1,34 @@
+package org.tests.query.cache;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.validation.constraints.NotNull;
+
+@Entity
+public class ContractCosts {
+	@Id
+	@GeneratedValue
+	protected Long id;
+
+	@NotNull
+	@ManyToOne(cascade = {}, optional = false)
+	private Position position;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(final Long id) {
+		this.id = id;
+	}
+
+	public Position getPosition() {
+		return position;
+	}
+
+	public void setPosition(final Position position) {
+		this.position = position;
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/tests/query/cache/Main1.java b/src/test/java/org/tests/query/cache/Main1.java
new file mode 100644
index 000000000..1a092443c
--- /dev/null
+++ b/src/test/java/org/tests/query/cache/Main1.java
@@ -0,0 +1,23 @@
+package org.tests.query.cache;
+
+
+public class Main1 {
+
+  public static void main(String[] args) {
+    TestDistinct test = new TestDistinct();
+    test.testMissingUnique();
+    // executed query:
+    // select t0.id, t0.position_id from contract_costs t0
+    //   join position t1 on t1.id = t0.position_id
+    //   join contract t2 on t2.id = t1.contract_id
+    //   left join acl_container_relation t3 on t3.container_id = t2.id
+    // where t3.acl_entry_id in (?, ? ) ; --bind(Array[2]={1,2})
+
+    // Test will fail:
+    // Expected size:<1> but was:<2> in:
+    //   <[org.tests.query.cache.ContractCosts@1, org.tests.query.cache.ContractCosts@1]>
+    //    at org.tests.query.cache.TestDistinct.testMissingUnique(TestDistinct.java:49)
+    //    at org.tests.query.cache.Main1.main(Main1.java:7)
+  }
+
+}
diff --git a/src/test/java/org/tests/query/cache/Main2.java b/src/test/java/org/tests/query/cache/Main2.java
new file mode 100644
index 000000000..56a7ee0b1
--- /dev/null
+++ b/src/test/java/org/tests/query/cache/Main2.java
@@ -0,0 +1,22 @@
+package org.tests.query.cache;
+
+import io.ebean.Ebean;
+
+public class Main2 {
+
+  public static void main(String[] args) {
+    TestDistinct test = new TestDistinct();
+    Ebean.find(ContractCosts.class).where()
+    .in("position.contract.aclEntries.aclEntry.id",1L, 2L, 3L).findList(); // <-- will fix some cache issue?
+    test.testMissingUnique();
+
+    // executed query:
+    // select distinct t0.id, t0.position_id from contract_costs t0
+    //   join position u1 on u1.id = t0.position_id
+    //   join contract u2 on u2.id = u1.contract_id
+    //   join acl_container_relation u3 on u3.container_id = u2.id
+    // where u3.acl_entry_id in (?, ? ) ; --bind(Array[2]={1,2})
+
+  }
+
+}
diff --git a/src/test/java/org/tests/query/cache/Position.java b/src/test/java/org/tests/query/cache/Position.java
new file mode 100644
index 000000000..fc6a5edbc
--- /dev/null
+++ b/src/test/java/org/tests/query/cache/Position.java
@@ -0,0 +1,32 @@
+package org.tests.query.cache;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+@Entity
+public class Position {
+	@Id
+	@GeneratedValue
+	protected Long id;
+
+	@ManyToOne(cascade = {}, optional = false)
+	private Contract contract;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(final Long id) {
+		this.id = id;
+	}
+
+	public Contract getContract() {
+		return contract;
+	}
+
+	public void setContract(final Contract contract) {
+		this.contract = contract;
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/tests/query/cache/TestDistinct.java b/src/test/java/org/tests/query/cache/TestDistinct.java
new file mode 100644
index 000000000..164c70019
--- /dev/null
+++ b/src/test/java/org/tests/query/cache/TestDistinct.java
@@ -0,0 +1,59 @@
+package org.tests.query.cache;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+import java.util.UUID;
+
+import org.junit.Test;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.ExpressionList;
+
+public class TestDistinct extends BaseTestCase {
+	/**
+	 * The call of {@link #positionsQuery} {@link ExpressionList#findList()} causes the following use of {@link #costsQuery(UUID...)} to not
+	 * use distinct and return the wrong number of results.
+	 */
+	@Test
+	public void testMissingUnique() {
+		Acl acl = new Acl();
+		Ebean.save(acl);
+		Acl acl2 = new Acl();
+		Ebean.save(acl2);
+		Contract contract = new Contract();
+		AclContainerRelation rel1 = new AclContainerRelation();
+		rel1.setAclEntry(acl);
+		rel1.setContainer(contract);
+		AclContainerRelation rel2 = new AclContainerRelation();
+		rel2.setAclEntry(acl2);
+		rel2.setContainer(contract);
+		contract.getAclEntries().add(rel1);
+		contract.getAclEntries().add(rel2);
+		Position pos = new Position();
+		pos.setContract(contract);
+		contract.getPositions().add(pos);
+		Ebean.save(contract);
+		ContractCosts cost = new ContractCosts();
+		cost.setPosition(pos);
+		Ebean.save(cost);
+
+		//costsQuery(acl.getId(), acl2.getId()).findCount();
+
+		// the between causes the error
+		List<Position> positions = positionsQuery(acl.getId()).findList();
+		// the between causes the error
+
+		System.out.println("The error, query without distinct:");
+		List<ContractCosts> costs = costsQuery(acl.getId(), acl2.getId()).findList();
+		assertThat(costs).hasSize(1);
+	}
+
+	public ExpressionList<Position> positionsQuery(final Long aclId) {
+		return Ebean.find(Position.class).where().eq("contract.aclEntries.aclEntry.id", aclId);
+	}
+
+	public ExpressionList<ContractCosts> costsQuery(final Long... aclId) {
+		return Ebean.find(ContractCosts.class).where().in("position.contract.aclEntries.aclEntry.id", aclId);
+	}
+}
\ No newline at end of file

From f66316138db7cc7845bbc4aa986dc90c0677170c Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 21 Dec 2018 13:53:05 +1300
Subject: [PATCH 0622/1036] #1584 - Fix for - Query cache bug, which produces
 wrong results

---
 .../server/deploy/BeanFkeyProperty.java            |  5 ++---
 .../java/org/tests/query/cache/TestDistinct.java   | 14 +++++++-------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java b/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java
index fe184c287..e651e7fc2 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java
@@ -56,11 +56,10 @@ public final class BeanFkeyProperty implements ElPropertyValue {
     }
   }
 
-  public BeanFkeyProperty create(String expression, boolean containsMany) {
+  public BeanFkeyProperty create(String expression, boolean pathContainsMany) {
     int len = expression.length() - name.length() - 1;
     String prefix = expression.substring(0, len);
-
-    return new BeanFkeyProperty(prefix, name, dbColumn, deployOrder, containsMany);
+    return new BeanFkeyProperty(prefix, name, dbColumn, deployOrder, containsMany || pathContainsMany);
   }
 
   /**
diff --git a/src/test/java/org/tests/query/cache/TestDistinct.java b/src/test/java/org/tests/query/cache/TestDistinct.java
index 164c70019..588a468d9 100644
--- a/src/test/java/org/tests/query/cache/TestDistinct.java
+++ b/src/test/java/org/tests/query/cache/TestDistinct.java
@@ -1,14 +1,14 @@
 package org.tests.query.cache;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.List;
-import java.util.UUID;
-
-import org.junit.Test;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.ExpressionList;
+import org.junit.Test;
+
+import java.util.List;
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestDistinct extends BaseTestCase {
 	/**
@@ -56,4 +56,4 @@ public class TestDistinct extends BaseTestCase {
 	public ExpressionList<ContractCosts> costsQuery(final Long... aclId) {
 		return Ebean.find(ContractCosts.class).where().in("position.contract.aclEntries.aclEntry.id", aclId);
 	}
-}
\ No newline at end of file
+}

From 72263c0af01bd230cbcaf750f5566db2f624bd3e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 21 Dec 2018 13:57:00 +1300
Subject: [PATCH 0623/1036] No effective change - test assert to contains
 rather than containsExactly

---
 .../org/tests/model/orphanremoval/TestOrphanRemoveO2M.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java b/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java
index 82f22a6f9..9988ffaff 100644
--- a/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java
+++ b/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java
@@ -63,7 +63,7 @@ public class TestOrphanRemoveO2M extends BaseTestCase {
 
     m1 = Ebean.find(OrpMaster.class, "m2");
     assertThat(m1.getDetails()).hasSize(2);
-    assertThat(m1.getDetails()).extracting("id").containsExactly("d24", "d25");
+    assertThat(m1.getDetails()).extracting("id").contains("d24", "d25");
 
 
     m1 = Ebean.find(OrpMaster.class)
@@ -73,6 +73,6 @@ public class TestOrphanRemoveO2M extends BaseTestCase {
 
     // Expect only one.
     assertThat(m1.getDetails()).hasSize(2);
-    assertThat(m1.getDetails()).extracting("id").containsExactly("d24", "d25");
+    assertThat(m1.getDetails()).extracting("id").contains("d24", "d25");
   }
 }

From 60c8683914bfea0eb464338fd8f82445d0a531cb Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 21 Dec 2018 14:29:50 +1300
Subject: [PATCH 0624/1036] No effective change - test assert to contains
 rather than containsExactly

---
 .../TestOrphanRemoveO2MFlat.java              |  6 +-
 .../org/tests/query/cache/TestDistinct.java   | 83 ++++++++++---------
 2 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java b/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java
index 7d929cf90..74c1c5fc1 100644
--- a/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java
+++ b/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java
@@ -28,7 +28,7 @@ public class TestOrphanRemoveO2MFlat extends BaseTestCase {
     m1 = Ebean.find(OrpMaster2.class, "m2");
     // Expect only one.
     assertThat(m1.getDetails()).hasSize(1);
-    assertThat(m1.getDetails()).extracting("id").containsExactly("d23");
+    assertThat(m1.getDetails()).extracting("id").contains("d23");
 
     m1.getDetails().clear();
     m1.getDetails().add(new OrpDetail2("d24", "d4", "m2"));
@@ -37,7 +37,7 @@ public class TestOrphanRemoveO2MFlat extends BaseTestCase {
 
     m1 = Ebean.find(OrpMaster2.class, "m2");
     assertThat(m1.getDetails()).hasSize(2);
-    assertThat(m1.getDetails()).extracting("id").containsExactly("d24", "d25");
+    assertThat(m1.getDetails()).extracting("id").contains("d24", "d25");
 
 
     m1 = Ebean.find(OrpMaster2.class)
@@ -47,7 +47,7 @@ public class TestOrphanRemoveO2MFlat extends BaseTestCase {
 
     // Expect only one.
     assertThat(m1.getDetails()).hasSize(2);
-    assertThat(m1.getDetails()).extracting("id").containsExactly("d24", "d25");
+    assertThat(m1.getDetails()).extracting("id").contains("d24", "d25");
   }
 
 
diff --git a/src/test/java/org/tests/query/cache/TestDistinct.java b/src/test/java/org/tests/query/cache/TestDistinct.java
index 588a468d9..0ae8dc440 100644
--- a/src/test/java/org/tests/query/cache/TestDistinct.java
+++ b/src/test/java/org/tests/query/cache/TestDistinct.java
@@ -3,6 +3,8 @@ package org.tests.query.cache;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.ExpressionList;
+import io.ebean.annotation.ForPlatform;
+import io.ebean.annotation.Platform;
 import org.junit.Test;
 
 import java.util.List;
@@ -11,49 +13,50 @@ import java.util.UUID;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestDistinct extends BaseTestCase {
-	/**
-	 * The call of {@link #positionsQuery} {@link ExpressionList#findList()} causes the following use of {@link #costsQuery(UUID...)} to not
-	 * use distinct and return the wrong number of results.
-	 */
-	@Test
-	public void testMissingUnique() {
-		Acl acl = new Acl();
-		Ebean.save(acl);
-		Acl acl2 = new Acl();
-		Ebean.save(acl2);
-		Contract contract = new Contract();
-		AclContainerRelation rel1 = new AclContainerRelation();
-		rel1.setAclEntry(acl);
-		rel1.setContainer(contract);
-		AclContainerRelation rel2 = new AclContainerRelation();
-		rel2.setAclEntry(acl2);
-		rel2.setContainer(contract);
-		contract.getAclEntries().add(rel1);
-		contract.getAclEntries().add(rel2);
-		Position pos = new Position();
-		pos.setContract(contract);
-		contract.getPositions().add(pos);
-		Ebean.save(contract);
-		ContractCosts cost = new ContractCosts();
-		cost.setPosition(pos);
-		Ebean.save(cost);
+  /**
+   * The call of {@link #positionsQuery} {@link ExpressionList#findList()} causes the following use of {@link #costsQuery(UUID...)} to not
+   * use distinct and return the wrong number of results.
+   */
+  @ForPlatform(Platform.H2)
+  @Test
+  public void testMissingUnique() {
+    Acl acl = new Acl();
+    Ebean.save(acl);
+    Acl acl2 = new Acl();
+    Ebean.save(acl2);
+    Contract contract = new Contract();
+    AclContainerRelation rel1 = new AclContainerRelation();
+    rel1.setAclEntry(acl);
+    rel1.setContainer(contract);
+    AclContainerRelation rel2 = new AclContainerRelation();
+    rel2.setAclEntry(acl2);
+    rel2.setContainer(contract);
+    contract.getAclEntries().add(rel1);
+    contract.getAclEntries().add(rel2);
+    Position pos = new Position();
+    pos.setContract(contract);
+    contract.getPositions().add(pos);
+    Ebean.save(contract);
+    ContractCosts cost = new ContractCosts();
+    cost.setPosition(pos);
+    Ebean.save(cost);
 
-		//costsQuery(acl.getId(), acl2.getId()).findCount();
+    //costsQuery(acl.getId(), acl2.getId()).findCount();
 
-		// the between causes the error
-		List<Position> positions = positionsQuery(acl.getId()).findList();
-		// the between causes the error
+    // the between causes the error
+    List<Position> positions = positionsQuery(acl.getId()).findList();
+    // the between causes the error
 
-		System.out.println("The error, query without distinct:");
-		List<ContractCosts> costs = costsQuery(acl.getId(), acl2.getId()).findList();
-		assertThat(costs).hasSize(1);
-	}
+    System.out.println("The error, query without distinct:");
+    List<ContractCosts> costs = costsQuery(acl.getId(), acl2.getId()).findList();
+    assertThat(costs).hasSize(1);
+  }
 
-	public ExpressionList<Position> positionsQuery(final Long aclId) {
-		return Ebean.find(Position.class).where().eq("contract.aclEntries.aclEntry.id", aclId);
-	}
+  public ExpressionList<Position> positionsQuery(final Long aclId) {
+    return Ebean.find(Position.class).where().eq("contract.aclEntries.aclEntry.id", aclId);
+  }
 
-	public ExpressionList<ContractCosts> costsQuery(final Long... aclId) {
-		return Ebean.find(ContractCosts.class).where().in("position.contract.aclEntries.aclEntry.id", aclId);
-	}
+  public ExpressionList<ContractCosts> costsQuery(final Long... aclId) {
+    return Ebean.find(ContractCosts.class).where().in("position.contract.aclEntries.aclEntry.id", aclId);
+  }
 }

From 3af1b574fde0ba2b535a50101a060a28dd2f3d00 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 21 Dec 2018 14:31:49 +1300
Subject: [PATCH 0625/1036] #1588 -Fix query plan capture excluding update and
 delete queries from query plan capture

---
 .../server/query/CQueryBindCapture.java         | 15 ++++-----------
 .../ebeaninternal/server/query/CQueryPlan.java  | 17 +++++++++++++----
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java b/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
index f3d1990f4..b856ed535 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.query;
 
-import io.ebean.config.ServerConfig;
 import io.ebean.meta.QueryPlanRequest;
 import io.ebeaninternal.server.type.bindcapture.BindCapture;
 
@@ -10,7 +9,6 @@ class CQueryBindCapture {
 
   private final CQueryPlan cQueryPlan;
   private final QueryPlanLogger planLogger;
-  private final boolean enabled;
 
   private BindCapture bindCapture;
   private long queryTimeMicros;
@@ -19,18 +17,16 @@ class CQueryBindCapture {
 
   private long lastBindCapture;
 
-
-  CQueryBindCapture(CQueryPlan cQueryPlan, ServerConfig serverConfig) {
+  CQueryBindCapture(CQueryPlan cQueryPlan, QueryPlanLogger planLogger) {
     this.cQueryPlan = cQueryPlan;
-    this.enabled = serverConfig.isCollectQueryPlans();
-    this.planLogger = PlatformQueryPlan.getLogger(serverConfig.getDatabasePlatform().getPlatform());
+    this.planLogger = planLogger;
   }
 
   /**
    * Return true if we should capture the bind values for this query.
    */
   boolean collectFor(long timeMicros) {
-    return enabled && (bindCapture == null || timeMicros > thresholdMicros);
+    return (bindCapture == null || timeMicros > thresholdMicros);
   }
 
   /**
@@ -55,15 +51,12 @@ class CQueryBindCapture {
    */
   void collectQueryPlan(QueryPlanRequest request) {
 
-    if (request.getSince() > lastBindCapture) {
+    if (bindCapture == null || request.getSince() > lastBindCapture) {
       // no bind capture since the last capture
       return;
     }
 
     final BindCapture last = this.bindCapture;
-    if (last == null) {
-      return;
-    }
 
     DQueryPlanOutput queryPlan = planLogger.logQueryPlan(request.getConnection(), cQueryPlan, last);
     queryPlan.with(queryTimeMicros, captureCount, cQueryPlan.getPlanKey().toString());
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
index 36302a8d9..d067a2c46 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.query;
 
 import io.ebean.ProfileLocation;
 import io.ebean.bean.ObjectGraphNode;
+import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.SqlLimitResponse;
 import io.ebean.meta.MetricType;
 import io.ebean.meta.QueryPlanRequest;
@@ -121,7 +122,7 @@ public class CQueryPlan {
     this.encryptedProps = sqlTree.getEncryptedProps();
     this.stats = new CQueryPlanStats(this, server.isCollectQueryOrigins());
     this.dependentTables = sqlTree.dependentTables();
-    this.bindCapture = new CQueryBindCapture(this, server.getServerConfig());
+    this.bindCapture = initBindCapture(server.getServerConfig(), query);
   }
 
   /**
@@ -147,7 +148,15 @@ public class CQueryPlan {
     this.encryptedProps = sqlTree.getEncryptedProps();
     this.stats = new CQueryPlanStats(this, server.isCollectQueryOrigins());
     this.dependentTables = (rawSql) ? Collections.emptySet() : sqlTree.dependentTables();
-    this.bindCapture = new CQueryBindCapture(this, server.getServerConfig());
+    this.bindCapture = initBindCapture(server.getServerConfig(), query);
+  }
+
+  private CQueryBindCapture initBindCapture(ServerConfig serverConfig, SpiQuery<?> query) {
+    if (serverConfig.isCollectQueryPlans() && !query.getType().isUpdate()) {
+      return new CQueryBindCapture(this, PlatformQueryPlan.getLogger(serverConfig.getDatabasePlatform().getPlatform()));
+    } else {
+      return null;
+    }
   }
 
   private String location() {
@@ -289,7 +298,7 @@ public class CQueryPlan {
       server.collectQueryStats(objectGraphNode, loadedBeanCount, timeMicros);
     }
 
-    return bindCapture.collectFor(timeMicros);
+    return bindCapture != null && bindCapture.collectFor(timeMicros);
   }
 
   /**
@@ -334,7 +343,7 @@ public class CQueryPlan {
 
   public void collectQueryPlan(QueryPlanRequest request) {
 
-    if (!getSql().equals(RESULT_SET_BASED_RAW_SQL)) {
+    if (!getSql().equals(RESULT_SET_BASED_RAW_SQL) && bindCapture != null) {
       bindCapture.collectQueryPlan(request);
     }
   }

From 60ad417e1b34a56cf486a96a86ce27a145511b7e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 21 Dec 2018 15:21:01 +1300
Subject: [PATCH 0626/1036] No effective change - adjust test to have at least
 1 column on insert

---
 src/test/java/org/tests/query/cache/Acl.java          | 10 ++++++++--
 src/test/java/org/tests/query/cache/TestDistinct.java |  7 ++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/test/java/org/tests/query/cache/Acl.java b/src/test/java/org/tests/query/cache/Acl.java
index 5919ae13a..0594164fc 100644
--- a/src/test/java/org/tests/query/cache/Acl.java
+++ b/src/test/java/org/tests/query/cache/Acl.java
@@ -10,11 +10,17 @@ public class Acl {
 	@GeneratedValue
 	protected Long id;
 
-	public Long getId() {
+	String name;
+
+  public Acl(String name) {
+    this.name = name;
+  }
+
+  public Long getId() {
 		return id;
 	}
 
 	public void setId(final Long id) {
 		this.id = id;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/tests/query/cache/TestDistinct.java b/src/test/java/org/tests/query/cache/TestDistinct.java
index 0ae8dc440..e67c2d0ea 100644
--- a/src/test/java/org/tests/query/cache/TestDistinct.java
+++ b/src/test/java/org/tests/query/cache/TestDistinct.java
@@ -3,8 +3,6 @@ package org.tests.query.cache;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.ExpressionList;
-import io.ebean.annotation.ForPlatform;
-import io.ebean.annotation.Platform;
 import org.junit.Test;
 
 import java.util.List;
@@ -17,12 +15,11 @@ public class TestDistinct extends BaseTestCase {
    * The call of {@link #positionsQuery} {@link ExpressionList#findList()} causes the following use of {@link #costsQuery(UUID...)} to not
    * use distinct and return the wrong number of results.
    */
-  @ForPlatform(Platform.H2)
   @Test
   public void testMissingUnique() {
-    Acl acl = new Acl();
+    Acl acl = new Acl("1");
     Ebean.save(acl);
-    Acl acl2 = new Acl();
+    Acl acl2 = new Acl("2");
     Ebean.save(acl2);
     Contract contract = new Contract();
     AclContainerRelation rel1 = new AclContainerRelation();

From 82def2710e07ae02f124a3c6e1cbd275764b7dfd Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 21 Dec 2018 15:51:09 +1300
Subject: [PATCH 0627/1036] No effective change - adjust test to have at least
 1 column on insert

---
 .../java/org/tests/query/cache/Contract.java   | 18 ++++++++++++++----
 .../org/tests/query/cache/ContractCosts.java   | 14 ++++++++++++--
 .../java/org/tests/query/cache/Position.java   | 14 ++++++++++++--
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/src/test/java/org/tests/query/cache/Contract.java b/src/test/java/org/tests/query/cache/Contract.java
index db89b1cbe..795fbb466 100644
--- a/src/test/java/org/tests/query/cache/Contract.java
+++ b/src/test/java/org/tests/query/cache/Contract.java
@@ -1,6 +1,4 @@
 package org.tests.query.cache;
-import java.util.ArrayList;
-import java.util.List;
 
 import javax.annotation.Nonnull;
 import javax.persistence.CascadeType;
@@ -9,6 +7,8 @@ import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
+import java.util.ArrayList;
+import java.util.List;
 
 @Entity
 public class Contract {
@@ -16,6 +16,8 @@ public class Contract {
 	@GeneratedValue
 	protected Long id;
 
+	private String name;
+
 	@OneToMany(cascade = CascadeType.ALL, mappedBy = "contract")
 	private List<Position> positions;
 
@@ -31,7 +33,15 @@ public class Contract {
 		this.id = id;
 	}
 
-	public List<Position> getPositions() {
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public List<Position> getPositions() {
 		return positions;
 	}
 
@@ -46,4 +56,4 @@ public class Contract {
 	public void setAclEntries(final List<AclContainerRelation> aclEntries) {
 		this.aclEntries = aclEntries;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/tests/query/cache/ContractCosts.java b/src/test/java/org/tests/query/cache/ContractCosts.java
index ed2655bc3..409715391 100644
--- a/src/test/java/org/tests/query/cache/ContractCosts.java
+++ b/src/test/java/org/tests/query/cache/ContractCosts.java
@@ -12,6 +12,8 @@ public class ContractCosts {
 	@GeneratedValue
 	protected Long id;
 
+	String status;
+
 	@NotNull
 	@ManyToOne(cascade = {}, optional = false)
 	private Position position;
@@ -24,11 +26,19 @@ public class ContractCosts {
 		this.id = id;
 	}
 
-	public Position getPosition() {
+  public String getStatus() {
+    return status;
+  }
+
+  public void setStatus(String status) {
+    this.status = status;
+  }
+
+  public Position getPosition() {
 		return position;
 	}
 
 	public void setPosition(final Position position) {
 		this.position = position;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/tests/query/cache/Position.java b/src/test/java/org/tests/query/cache/Position.java
index fc6a5edbc..0e98ae65d 100644
--- a/src/test/java/org/tests/query/cache/Position.java
+++ b/src/test/java/org/tests/query/cache/Position.java
@@ -11,6 +11,8 @@ public class Position {
 	@GeneratedValue
 	protected Long id;
 
+	private String name;
+
 	@ManyToOne(cascade = {}, optional = false)
 	private Contract contract;
 
@@ -22,11 +24,19 @@ public class Position {
 		this.id = id;
 	}
 
-	public Contract getContract() {
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public Contract getContract() {
 		return contract;
 	}
 
 	public void setContract(final Contract contract) {
 		this.contract = contract;
 	}
-}
\ No newline at end of file
+}

From 0397140e0b83dc9ed859ff7e5c3c220255b7e9f3 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 21 Dec 2018 15:57:07 +1300
Subject: [PATCH 0628/1036] #1589 - Refactor internals move SqlQuery
 sqlDistinct ... to SqlTreeNodeRoot (query plan)

---
 .../java/io/ebeaninternal/api/SpiQuery.java   | 17 ----------
 .../server/query/CQueryBuilder.java           | 16 ++++------
 .../server/query/CQueryBuilderRawSql.java     |  4 +--
 .../ebeaninternal/server/query/SqlTree.java   |  7 ++++
 .../server/query/SqlTreeBuilder.java          | 10 +++---
 .../server/query/SqlTreeNode.java             |  4 +++
 .../server/query/SqlTreeNodeRoot.java         | 10 +++++-
 .../server/querydefn/DefaultOrmQuery.java     | 32 -------------------
 .../querydefn/OrmQueryLimitRequest.java       |  7 ++--
 .../server/querydefn/OrmQueryPlanKeyTest.java | 22 -------------
 10 files changed, 39 insertions(+), 90 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/api/SpiQuery.java b/src/main/java/io/ebeaninternal/api/SpiQuery.java
index 24d625f47..881cae5e3 100644
--- a/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -749,23 +749,6 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
    */
   boolean isDisableLazyLoading();
 
-  /**
-   * Internally set by Ebean when this query must use the DISTINCT keyword.
-   * <p>
-   * This does not exclude/remove the use of the id property.
-   */
-  void setSqlDistinct(boolean sqlDistinct);
-
-  /**
-   * Return true if this query has been specified by a user or internally by Ebean to use DISTINCT.
-   */
-  boolean isDistinctQuery();
-
-  /**
-   * Return true if this was internally set to sql distinct (ie. many where predicate).
-   */
-  boolean isSqlDistinct();
-
   /**
    * Return true if this query has been specified by a user to use DISTINCT.
    */
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index eeacc87df..8b2e52f46 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -280,13 +280,8 @@ class CQueryBuilder {
       if (sqlTree.isSingleProperty()) {
         request.setInlineCountDistinct();
       }
-    } else {
-      if (hasMany) {
-        // need to count distinct id's ...
-        query.setSqlDistinct(true);
-      } else {
-        sqlSelect = "select count(*)";
-      }
+    } else if (!hasMany) {
+      sqlSelect = "select count(*)";
     }
 
     SqlLimitResponse s = buildSql(sqlSelect, request, predicates, sqlTree);
@@ -556,6 +551,7 @@ class CQueryBuilder {
       return rawSqlHandler.buildSql(request, predicates, query.getRawSql().getSql());
     }
 
+    boolean distinct = query.isDistinct() || select.isSqlDistinct();
     boolean useSqlLimiter = false;
     StringBuilder sb = new StringBuilder(500);
     String dbOrderBy = predicates.getDbOrderBy();
@@ -568,7 +564,7 @@ class CQueryBuilder {
 
       if (!useSqlLimiter) {
         sb.append("select ");
-        if (query.isDistinctQuery()) {
+        if (distinct) {
           if (request.isInlineCountDistinct()) {
             sb.append("count(");
           }
@@ -590,7 +586,7 @@ class CQueryBuilder {
       if (request.isInlineCountDistinct()) {
         sb.append(")");
       }
-      if (query.isDistinctQuery() && dbOrderBy != null && !query.isSingleAttribute()) {
+      if (distinct && dbOrderBy != null && !query.isSingleAttribute()) {
         // add the orderBy columns to the select clause (due to distinct)
         sb.append(", ").append(DbOrderByTrim.trim(dbOrderBy));
       }
@@ -692,7 +688,7 @@ class CQueryBuilder {
 
     if (useSqlLimiter) {
       // use LIMIT/OFFSET, ROW_NUMBER() or rownum type SQL query limitation
-      SqlLimitRequest r = new OrmQueryLimitRequest(sb.toString(), dbOrderBy, query, dbPlatform);
+      SqlLimitRequest r = new OrmQueryLimitRequest(sb.toString(), dbOrderBy, query, dbPlatform, distinct);
       return sqlLimiter.limit(r);
 
     } else {
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java
index 0bbee778d..0d37f2344 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.query;
 
-import io.ebeaninternal.server.rawsql.SpiRawSql;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.SqlLimitResponse;
 import io.ebean.config.dbplatform.SqlLimiter;
@@ -9,6 +8,7 @@ import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.querydefn.OrmQueryLimitRequest;
+import io.ebeaninternal.server.rawsql.SpiRawSql;
 import io.ebeaninternal.server.util.BindParamsParser;
 
 class CQueryBuilderRawSql {
@@ -50,7 +50,7 @@ class CQueryBuilderRawSql {
     SpiQuery<?> query = request.getQuery();
     if (query.hasMaxRowsOrFirstRow() && sqlLimiter != null) {
       // wrap with a limit offset or ROW_NUMBER() etc
-      return sqlLimiter.limit(new OrmQueryLimitRequest(sql, orderBy, query, dbPlatform));
+      return sqlLimiter.limit(new OrmQueryLimitRequest(sql, orderBy, query, dbPlatform, rsql.isDistinct() || query.isDistinct()));
 
     } else {
       // add back select keyword (it was removed to support sqlQueryLimiter)
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTree.java b/src/main/java/io/ebeaninternal/server/query/SqlTree.java
index 91e71fb0d..ad9128f46 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTree.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTree.java
@@ -65,6 +65,13 @@ class SqlTree {
     this.includeJoins = includeJoins;
   }
 
+  /**
+   * Return true if the query mandates SQL Distinct due to ToMany inclusion.
+   */
+  boolean isSqlDistinct() {
+    return rootNode.isSqlDistinct();
+  }
+
   /**
    * Return true if the query includes joins (not valid for rawSql).
    */
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 8fa67bd2c..00ddc14c5 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -70,6 +70,8 @@ public final class SqlTreeBuilder {
 
   private SqlTreeNode rootNode;
 
+  private boolean sqlDistinct;
+
   /**
    * Construct for RawSql query.
    */
@@ -172,7 +174,7 @@ public final class SqlTreeBuilder {
 
   private String buildDistinctOn() {
 
-    if (rawSql || !distinctOnPlatform || !query.isSqlDistinct() || Type.COUNT == query.getType()) {
+    if (rawSql || !distinctOnPlatform || !sqlDistinct || Type.COUNT == query.getType()) {
       return null;
     }
     ctx.startGroupBy();
@@ -273,7 +275,7 @@ public final class SqlTreeBuilder {
 
     if (prefix == null && !rawSql) {
       if (props.requireSqlDistinct(manyWhereJoins)) {
-        query.setSqlDistinct(true);
+        sqlDistinct = true;
       }
       addManyWhereJoins(myJoinList);
     }
@@ -310,7 +312,7 @@ public final class SqlTreeBuilder {
       // Optional many property for lazy loading query
       STreePropertyAssocMany lazyLoadMany = (query == null) ? null : query.getLazyLoadMany();
       boolean withId = !rawNoId && !subQuery && (query == null || query.isWithId());
-      return new SqlTreeNodeRoot(desc, props, myList, withId, includeJoin, lazyLoadMany, temporalMode, disableLazyLoad);
+      return new SqlTreeNodeRoot(desc, props, myList, withId, includeJoin, lazyLoadMany, temporalMode, disableLazyLoad, sqlDistinct);
 
     } else if (prop instanceof STreePropertyAssocMany) {
       return new SqlTreeNodeManyRoot(prefix, (STreePropertyAssocMany) prop, props, myList, temporalMode, disableLazyLoad);
@@ -361,7 +363,7 @@ public final class SqlTreeBuilder {
           // as we are now going to join to the many then we need
           // to add the distinct to the sql query to stop duplicate
           // rows...
-          query.setSqlDistinct(true);
+          sqlDistinct = true;
         }
       }
     }
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java
index c78de34a5..70fa0cdd2 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java
@@ -20,6 +20,10 @@ interface SqlTreeNode {
    */
   void buildRawSqlSelectChain(List<String> selectChain);
 
+  default boolean isSqlDistinct() {
+    return false;
+  }
+
   /**
    * Return true if this node includes an aggregation.
    */
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java
index 2a69a0c16..2f25bf7e2 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java
@@ -14,14 +14,17 @@ final class SqlTreeNodeRoot extends SqlTreeNodeBean {
 
   private final TableJoin includeJoin;
 
+  private final boolean sqlDistinct;
+
   /**
    * Specify for SqlSelect to include an Id property or not.
    */
   SqlTreeNodeRoot(STreeType desc, SqlTreeProperties props, List<SqlTreeNode> myList, boolean withId,
-                  TableJoin includeJoin, STreePropertyAssocMany many, SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad) {
+                  TableJoin includeJoin, STreePropertyAssocMany many, SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad, boolean sqlDistinct) {
 
     super(desc, props, myList, withId, many, temporalMode, disableLazyLoad);
     this.includeJoin = includeJoin;
+    this.sqlDistinct = sqlDistinct;
   }
 
   @Override
@@ -29,6 +32,11 @@ final class SqlTreeNodeRoot extends SqlTreeNodeBean {
     return true;
   }
 
+  @Override
+  public boolean isSqlDistinct() {
+    return sqlDistinct;
+  }
+
   /**
    * Append the property columns to the buffer.
    */
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index fc43615b3..4b4b906dd 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -146,12 +146,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
    */
   private boolean distinct;
 
-  /**
-   * Set to true internally by Ebean when it needs the DISTINCT keyword added to the query (id
-   * property still expected).
-   */
-  private boolean sqlDistinct;
-
   /**
    * Set to true if this is a future fetch using background threads.
    */
@@ -772,7 +766,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
     copy.rootTableAlias = rootTableAlias;
     copy.distinct = distinct;
-    copy.sqlDistinct = sqlDistinct;
     copy.timeout = timeout;
     copy.mapKey = mapKey;
     copy.id = id;
@@ -1086,9 +1079,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     if (distinct) {
       sb.append(",dist:");
     }
-    if (sqlDistinct) {
-      sb.append(",sqlD:");
-    }
     if (disableLazyLoading) {
       sb.append(",disLazy:");
     }
@@ -1635,28 +1625,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return countDistinctOrder != null;
   }
 
-  /**
-   * Return true if this query uses SQL DISTINCT either explicitly by the user or internally defined
-   * by ebean.
-   */
-  @Override
-  public boolean isDistinctQuery() {
-    return distinct || sqlDistinct;
-  }
-
-  @Override
-  public boolean isSqlDistinct() {
-    return sqlDistinct;
-  }
-
-  /**
-   * Internally set to use SQL DISTINCT on the query but still have id property included.
-   */
-  @Override
-  public void setSqlDistinct(boolean sqlDistinct) {
-    this.sqlDistinct = sqlDistinct;
-  }
-
   @Override
   public Class<T> getBeanType() {
     return beanType;
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryLimitRequest.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryLimitRequest.java
index 085586376..99354bf71 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryLimitRequest.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryLimitRequest.java
@@ -14,11 +14,14 @@ public class OrmQueryLimitRequest implements SqlLimitRequest {
 
   private final String sqlOrderBy;
 
-  public OrmQueryLimitRequest(String sql, String sqlOrderBy, SpiQuery<?> ormQuery, DatabasePlatform dbPlatform) {
+  private final boolean distinct;
+
+  public OrmQueryLimitRequest(String sql, String sqlOrderBy, SpiQuery<?> ormQuery, DatabasePlatform dbPlatform, boolean distinct) {
     this.sql = sql;
     this.sqlOrderBy = sqlOrderBy;
     this.ormQuery = ormQuery;
     this.dbPlatform = dbPlatform;
+    this.distinct = distinct;
   }
 
   @Override
@@ -43,7 +46,7 @@ public class OrmQueryLimitRequest implements SqlLimitRequest {
 
   @Override
   public boolean isDistinct() {
-    return ormQuery.isDistinctQuery();
+    return distinct;
   }
 
   @Override
diff --git a/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java b/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java
index 043ecf6f0..4cffd3e61 100644
--- a/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java
+++ b/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java
@@ -165,28 +165,6 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
     assertSame(key1, key2);
   }
 
-  @Test
-  public void equals_when_diffSqlDistinct() {
-    DefaultOrmQuery<Customer> q1 = query();
-    q1.setSqlDistinct(true);
-    CQueryPlanKey key1 = q1.createQueryPlanKey();
-    CQueryPlanKey key2 = query().createQueryPlanKey();
-
-    assertDifferent(key1, key2);
-  }
-
-  @Test
-  public void equals_when_sameSqlDistinct() {
-
-    DefaultOrmQuery<Customer> q1 = query();
-    q1.setSqlDistinct(true);
-
-    DefaultOrmQuery<Customer> q2 = query();
-    q2.setSqlDistinct(true);
-
-    assertSame(q1, q2);
-  }
-
   @Test
   public void equals_when_useDocStore() {
     CQueryPlanKey key1 = query().setUseDocStore(true).createQueryPlanKey();

From babba914a0019b32b69378e28230ec870c9fadcc Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 21 Dec 2018 17:14:29 +1300
Subject: [PATCH 0629/1036] No effective change - add toString() for
 ServerCacheNotification

---
 src/main/java/io/ebean/cache/ServerCacheNotification.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/io/ebean/cache/ServerCacheNotification.java b/src/main/java/io/ebean/cache/ServerCacheNotification.java
index 4b5b08a6f..325003e9f 100644
--- a/src/main/java/io/ebean/cache/ServerCacheNotification.java
+++ b/src/main/java/io/ebean/cache/ServerCacheNotification.java
@@ -19,6 +19,11 @@ public class ServerCacheNotification {
     this.dependentTables = dependentTables;
   }
 
+  @Override
+  public String toString() {
+    return "ts:" + modifyTimestamp + " tables:" + dependentTables;
+  }
+
   public long getModifyTimestamp() {
     return modifyTimestamp;
   }

From cf1024678361592f908707542c7aa412f66f7062 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 21 Dec 2018 20:56:26 +1300
Subject: [PATCH 0630/1036] [maven-release-plugin] prepare release
 ebean-11.31.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3c268889f..6a6b20f05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.31.1-SNAPSHOT</version>
+  <version>11.31.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.31.1</tag>
   </scm>
 
   <profiles>

From 0b299edf0da7b281ad4653866bebb4f386a815d4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 21 Dec 2018 20:56:41 +1300
Subject: [PATCH 0631/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6a6b20f05..9651a11b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.31.1</version>
+  <version>11.31.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.31.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 4d93b70bf9c9987f9d5686fe28b3475d54eac00d Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Wed, 2 Jan 2019 21:05:21 +0100
Subject: [PATCH 0632/1036] Supports loading of corrupt beans

---
 src/main/java/io/ebean/BeanState.java         |  8 ++++
 .../io/ebean/bean/EntityBeanIntercept.java    | 34 +++++++++++++++++
 .../java/io/ebean/config/ServerConfig.java    | 31 +++++++++++++++
 .../io/ebean/plugin/LoadErrorHandler.java     | 14 +++++++
 .../java/io/ebean/text/TextException.java     | 38 +++++++++++++++++++
 .../java/io/ebeaninternal/api/SpiQuery.java   |  7 ++++
 .../server/core/DefaultBeanState.java         |  6 +++
 .../server/deploy/DbReadContext.java          |  6 +++
 .../DynamicPropertyAggregationFormula.java    | 13 ++++---
 .../io/ebeaninternal/server/query/CQuery.java |  6 +++
 .../server/query/SqlBeanLoad.java             |  7 ++--
 .../server/querydefn/DefaultOrmQuery.java     |  7 ++++
 .../server/text/csv/TCsvReader.java           |  2 +-
 .../server/type/ScalarTypeArrayList.java      |  3 +-
 .../server/type/ScalarTypeArraySet.java       |  3 +-
 .../server/type/ScalarTypeInetAddress.java    |  2 +-
 .../server/type/ScalarTypeJsonList.java       |  5 ++-
 .../server/type/ScalarTypeJsonMap.java        |  2 +-
 .../server/type/ScalarTypeJsonNode.java       |  2 +-
 .../type/ScalarTypeJsonObjectMapper.java      |  5 ++-
 .../server/type/ScalarTypeJsonSet.java        |  3 +-
 .../server/type/ScalarTypePostgresHstore.java |  2 +-
 .../server/type/ScalarTypeURI.java            |  2 +-
 .../server/type/ScalarTypeURL.java            |  2 +-
 .../java/org/tests/json/TestDbJson_List.java  | 34 +++++++++++++++++
 src/test/resources/ebean.properties           |  1 +
 26 files changed, 221 insertions(+), 24 deletions(-)
 create mode 100644 src/main/java/io/ebean/plugin/LoadErrorHandler.java

diff --git a/src/main/java/io/ebean/BeanState.java b/src/main/java/io/ebean/BeanState.java
index ddb76d358..cbe4e9849 100644
--- a/src/main/java/io/ebean/BeanState.java
+++ b/src/main/java/io/ebean/BeanState.java
@@ -3,6 +3,8 @@ package io.ebean;
 import java.util.Map;
 import java.util.Set;
 
+import javax.annotation.Nullable;
+
 /**
  * Provides access to the internal state of an entity bean.
  */
@@ -111,4 +113,10 @@ public interface BeanState {
    * Reset the bean putting it into NEW state such that a save() results in an insert.
    */
   void resetForInsert();
+
+  /**
+   * Returns a map with load erros.
+   */
+  @Nullable
+  Map<String, Exception> getLoadErrors();
 }
diff --git a/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/src/main/java/io/ebean/bean/EntityBeanIntercept.java
index 87b4f3023..22b667608 100644
--- a/src/main/java/io/ebean/bean/EntityBeanIntercept.java
+++ b/src/main/java/io/ebean/bean/EntityBeanIntercept.java
@@ -98,6 +98,8 @@ public final class EntityBeanIntercept implements Serializable {
 
   private Object[] origValues;
 
+  private Exception[] loadErrors;
+
   private int lazyLoadProperty = -1;
 
   private Object ownerId;
@@ -1115,4 +1117,36 @@ public final class EntityBeanIntercept implements Serializable {
   public void setSortOrder(int sortOrder) {
     this.sortOrder = sortOrder;
   }
+
+  /**
+   * Set the load error that happened on this property.
+   */
+  public void setLoadError(int propertyIndex, Exception t) {
+    if (loadErrors == null) {
+      loadErrors = new Exception[owner._ebean_getPropertyNames().length];
+    }
+    loadErrors[propertyIndex] = t;
+    flags[propertyIndex] |= FLAG_LOADED_PROP;
+  }
+
+  /**
+   * Returns the loadErrors.
+   */
+  public Map<String, Exception> getLoadErrors() {
+    if (loadErrors == null) {
+      return null;
+    }
+    Map<String, Exception> ret = null;
+    int len = getPropertyLength();
+    for (int i = 0; i < len; i++) {
+      Exception loadError = loadErrors[i];
+      if (loadError != null) {
+        if (ret == null) {
+          ret = new LinkedHashMap<>();
+        }
+        ret.put(getProperty(i), loadError);
+      }
+    }
+    return ret;
+  }
 }
diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 1abf7bb56..3d4048fa3 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -30,9 +30,15 @@ import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.meta.MetaInfoManager;
 import io.ebean.migration.MigrationRunner;
+import io.ebean.plugin.LoadErrorHandler;
 import io.ebean.util.StringHelper;
 
+import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.time.Clock;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -518,6 +524,10 @@ public class ServerConfig {
    */
   private boolean idGeneratorAutomatic = true;
 
+  private LoadErrorHandler loadErrorHandler = (bean, prop, fullName, e) -> {
+    throw new PersistenceException("Error loading on " + fullName, e);
+  };
+
   /**
    * Construct a Server Configuration for programmatically creating an EbeanServer.
    */
@@ -2985,6 +2995,13 @@ public class ServerConfig {
 
     String mappingsProp = p.get("mappingLocations", null);
     mappingLocations = getSearchList(mappingsProp, mappingLocations);
+
+    if (!p.getBoolean("failOnLoadError", true)) {
+      Logger logger = LoggerFactory.getLogger("io.ebean.SQL");
+      loadErrorHandler = (bean, prop, fullName, e) -> {
+        logger.error("Error loading on {}", fullName, e);
+      };
+    }
   }
 
   private NamingConvention createNamingConvention(PropertiesWrapper properties, NamingConvention namingConvention) {
@@ -3244,6 +3261,20 @@ public class ServerConfig {
     this.idGeneratorAutomatic = idGeneratorAutomatic;
   }
 
+  /**
+   * Returns the load error handler.
+   */
+  public LoadErrorHandler getLoadErrorHandler() {
+    return loadErrorHandler;
+  }
+
+  /**
+   * Sets the loadErrorHandler.
+   */
+  public void setLoadErrorHandler(LoadErrorHandler loadErrorHandler) {
+    this.loadErrorHandler = loadErrorHandler;
+  }
+
   /**
    * Return true if query plan capture is enabled.
    */
diff --git a/src/main/java/io/ebean/plugin/LoadErrorHandler.java b/src/main/java/io/ebean/plugin/LoadErrorHandler.java
new file mode 100644
index 000000000..278a70f96
--- /dev/null
+++ b/src/main/java/io/ebean/plugin/LoadErrorHandler.java
@@ -0,0 +1,14 @@
+package io.ebean.plugin;
+
+import io.ebean.bean.EntityBean;
+
+/**
+ * Errorhandler to handle load errors and may be recover correct value.
+ *
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+@FunctionalInterface
+public interface LoadErrorHandler {
+  void handleLoadError(EntityBean bean, Property prop, String fullName, Exception e);
+}
diff --git a/src/main/java/io/ebean/text/TextException.java b/src/main/java/io/ebean/text/TextException.java
index e5036e112..f7dd7cfa9 100644
--- a/src/main/java/io/ebean/text/TextException.java
+++ b/src/main/java/io/ebean/text/TextException.java
@@ -6,6 +6,7 @@ package io.ebean.text;
 public class TextException extends RuntimeException {
 
   private static final long serialVersionUID = 1601310159486033148L;
+  private String text;
 
   /**
    * Construct with an error message.
@@ -27,4 +28,41 @@ public class TextException extends RuntimeException {
   public TextException(Exception e) {
     super(e);
   }
+
+  /**
+   * Constructor for a detailed exception.
+   *
+   * @param message
+   *          the message. The placeholder {} will be replaced by
+   *          <code>text</code>
+   * @param text
+   *          the fault text.
+   * @param cause
+   *          the case
+   */
+  public TextException(String message, String text, Exception cause) {
+    super(message.replace("{}", String.valueOf(text)), cause);
+    this.text = text;
+  }
+
+  /**
+   * Constructor for a detailed exception.
+   *
+   * @param message
+   *          the message. The placeholder {} will be replaced by
+   *          <code>text</code>
+   * @param text
+   *          the fault text.
+   */
+  public TextException(String message, String text) {
+    super(message.replace("{}", String.valueOf(text)));
+    this.text = text;
+  }
+
+  /**
+   * Return the text, that caused the error. (e.g. the JSON). May be null.
+   */
+  public String getText() {
+    return text;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/api/SpiQuery.java b/src/main/java/io/ebeaninternal/api/SpiQuery.java
index 881cae5e3..efdefd718 100644
--- a/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -8,6 +8,7 @@ import io.ebean.PersistenceContextScope;
 import io.ebean.ProfileLocation;
 import io.ebean.Query;
 import io.ebean.bean.CallStack;
+import io.ebean.bean.EntityBean;
 import io.ebean.bean.ObjectGraphNode;
 import io.ebean.bean.PersistenceContext;
 import io.ebean.event.readaudit.ReadEvent;
@@ -15,6 +16,7 @@ import io.ebean.plugin.BeanType;
 import io.ebeaninternal.server.autotune.ProfilingListener;
 import io.ebeaninternal.server.core.SpiOrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
+import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.query.CancelableQuery;
@@ -844,4 +846,9 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
    * Returns the count distinct order setting.
    */
   CountDistinctOrder getCountDistinctOrder();
+
+  /**
+   * Handles load errors.
+   */
+  void handleLoadError(EntityBean bean, BeanProperty prop, String fullName, Exception e);
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java b/src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java
index 3b489948e..22f2b7ae8 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java
@@ -88,4 +88,10 @@ public class DefaultBeanState implements BeanState {
   public void resetForInsert() {
     intercept.setNew();
   }
+
+  @Override
+  public Map<String, Exception> getLoadErrors() {
+    return intercept.getLoadErrors();
+  }
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DbReadContext.java b/src/main/java/io/ebeaninternal/server/deploy/DbReadContext.java
index c282eca47..09e257a93 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DbReadContext.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DbReadContext.java
@@ -90,4 +90,10 @@ public interface DbReadContext {
    * Return true if this request disables lazy loading.
    */
   boolean isDisableLazyLoading();
+
+  /**
+   * Handles a load error on given property.
+   */
+  void handleLoadError(EntityBean bean, BeanProperty prop, String fullName, Exception e);
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
index 8b1d95561..efc45759a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
@@ -49,15 +49,16 @@ class DynamicPropertyAggregationFormula extends DynamicPropertyBase {
 
   @Override
   public void load(SqlBeanLoad sqlBeanLoad) {
-
+    Object value;
     try {
-      Object value = scalarType.read(sqlBeanLoad.ctx().getDataReader());
-      if (asTarget != null) {
-        sqlBeanLoad.load(asTarget, value);
-      }
+      value = scalarType.read(sqlBeanLoad.ctx().getDataReader());
 
     } catch (Exception e) {
-      throw new PersistenceException("Error loading on " + fullName, e);
+      sqlBeanLoad.ctx().handleLoadError(null, asTarget, fullName, e);
+      return;
+    }
+    if (asTarget != null) {
+      sqlBeanLoad.load(asTarget, value);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/query/CQuery.java b/src/main/java/io/ebeaninternal/server/query/CQuery.java
index 3b04a99a8..d142e4e1d 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQuery.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQuery.java
@@ -21,6 +21,7 @@ import io.ebeaninternal.server.core.SpiOrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanCollectionHelp;
 import io.ebeaninternal.server.deploy.BeanCollectionHelpFactory;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
+import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.DbReadContext;
 import io.ebeaninternal.server.type.DataBind;
@@ -815,6 +816,11 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
     return pstmt;
   }
 
+  @Override
+  public void handleLoadError(EntityBean bean, BeanProperty prop, String fullName, Exception e) {
+    query.handleLoadError(bean, prop, fullName, e);
+  }
+
   public Set<String> getDependentTables() {
     return queryPlan.getDependentTables();
   }
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java b/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java
index b5855576d..c6557a5e0 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java
@@ -6,8 +6,6 @@ import io.ebeaninternal.api.SpiQuery.Mode;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.DbReadContext;
 
-import javax.persistence.PersistenceException;
-
 /**
  * Controls the loading of property data into a bean.
  * <p>
@@ -88,8 +86,9 @@ public class SqlBeanLoad {
       return dbVal;
 
     } catch (Exception e) {
-      String msg = "Error loading on " + prop.getFullBeanName();
-      throw new PersistenceException(msg, e);
+      bean._ebean_getIntercept().setLoadError(prop.getPropertyIndex(), e);
+      ctx.handleLoadError(bean, prop, prop.getFullBeanName(), e);
+      return prop.getValue(bean);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 4b4b906dd..1cfbd9bff 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -25,6 +25,7 @@ import io.ebean.Transaction;
 import io.ebean.UpdateQuery;
 import io.ebean.Version;
 import io.ebean.bean.CallStack;
+import io.ebean.bean.EntityBean;
 import io.ebean.bean.ObjectGraphNode;
 import io.ebean.bean.ObjectGraphOrigin;
 import io.ebean.bean.PersistenceContext;
@@ -46,6 +47,7 @@ import io.ebeaninternal.api.SpiQuerySecondary;
 import io.ebeaninternal.server.autotune.ProfilingListener;
 import io.ebeaninternal.server.core.SpiOrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
+import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.expression.DefaultExpressionList;
@@ -1921,6 +1923,11 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return profileLocation;
   }
 
+  @Override
+  public void handleLoadError(EntityBean bean, BeanProperty prop, String fullName, Exception e) {
+    server.getServerConfig().getLoadErrorHandler().handleLoadError(bean, prop, fullName, e);
+  }
+
   @Override
   public Query<T> orderById(boolean orderById) {
     this.orderById = orderById;
diff --git a/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java b/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java
index e294e7e49..01a3b6065 100644
--- a/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java
+++ b/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java
@@ -351,7 +351,7 @@ public class TCsvReader<T> implements CsvReader<T> {
         return path.parseDateTime(dt.getTime());
 
       } catch (ParseException e) {
-        throw new TextException("Error parsing [" + value + "] using format[" + format + "]", e);
+        throw new TextException("Error parsing [{}] using format[" + format + "]", value, e);
       }
     }
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
index f9e07fd60..b7511cab3 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.type;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
+import io.ebean.text.TextException;
 import io.ebean.text.json.EJson;
 import io.ebeaninternal.json.ModifyAwareList;
 import io.ebeanservice.docstore.api.mapping.DocPropertyType;
@@ -145,7 +146,7 @@ public class ScalarTypeArrayList extends ScalarTypeJsonCollection<List> implemen
     try {
       return EJson.parseList(value, false);
     } catch (IOException e) {
-      throw new PersistenceException("Failed to parse JSON content as List: [" + value + "]", e);
+      throw new TextException("Failed to parse JSON [{}] as List", value, e);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
index 78c3ca3db..ea3c0bc84 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.type;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
+import io.ebean.text.TextException;
 import io.ebean.text.json.EJson;
 import io.ebeaninternal.json.ModifyAwareSet;
 import io.ebeanservice.docstore.api.mapping.DocPropertyType;
@@ -144,7 +145,7 @@ public class ScalarTypeArraySet<T> extends ScalarTypeJsonCollection<Set<T>> impl
     try {
       return EJson.parseSet(value, false);
     } catch (IOException e) {
-      throw new PersistenceException("Failed to parse JSON content as List: [" + value + "]", e);
+      throw new TextException("Failed to parse JSON [{}] as Set", value, e);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java
index c710b7d75..1de5e1db7 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java
@@ -42,7 +42,7 @@ public class ScalarTypeInetAddress extends ScalarTypeBaseVarchar<InetAddress> {
     try {
       return ConvertInetAddresses.forUriString(value);
     } catch (IllegalArgumentException e) {
-      throw new TextException("Error with InetAddresses [" + value + "] ", e);
+      throw new TextException("Error with InetAddresses [{}]", value, e);
     }
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
index 92f12f1cf..a4df1f732 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.config.dbplatform.DbPlatformType;
+import io.ebean.text.TextException;
 import io.ebean.text.json.EJson;
 import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import com.fasterxml.jackson.core.JsonGenerator;
@@ -75,7 +76,7 @@ public class ScalarTypeJsonList {
         // parse JSON into modifyAware list
         return EJson.parseList(json, true);
       } catch (IOException e) {
-        throw new SQLException("Failed to parse JSON content as List: [" + json + "]", e);
+        throw new TextException("Failed to parse JSON [{}] as List", json, e);
       }
     }
 
@@ -109,7 +110,7 @@ public class ScalarTypeJsonList {
       try {
         return EJson.parseList(value, false);
       } catch (IOException e) {
-        throw new PersistenceException("Failed to parse JSON content as List: [" + value + "]", e);
+        throw new TextException("Failed to parse JSON [{}] as List", value, e);
       }
     }
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java
index 84146d218..cd84774f8 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java
@@ -175,7 +175,7 @@ public abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
       // return a modify aware map
       return EJson.parseObject(value, true);
     } catch (IOException e) {
-      throw new TextException(e);
+      throw new TextException("Failed to parse JSON [{}] as Object", value, e);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java
index 4c5c42dfe..922e46dc9 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java
@@ -158,7 +158,7 @@ public abstract class ScalarTypeJsonNode extends ScalarTypeBase<JsonNode> {
     try {
       return objectMapper.readValue(value, JsonNode.class);
     } catch (IOException e) {
-      throw new TextException(e);
+      throw new TextException("Failed to parse JSON [{}] as JsonNode", value, e);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
index 3e6b06952..265e336cc 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
@@ -12,6 +12,7 @@ import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.databind.SerializationConfig;
 import com.fasterxml.jackson.databind.introspect.AnnotatedField;
 import io.ebean.config.dbplatform.DbPlatformType;
+import io.ebean.text.TextException;
 import io.ebeaninternal.json.ModifyAwareList;
 import io.ebeaninternal.json.ModifyAwareMap;
 import io.ebeaninternal.json.ModifyAwareOwner;
@@ -208,7 +209,7 @@ public class ScalarTypeJsonObjectMapper {
       try {
         return objectReader.readValue(json, deserType);
       } catch (IOException e) {
-        throw new SQLException("Unable to convert JSON", e);
+        throw new TextException("Failed to parse JSON [{}] as " + deserType, json, e);
       }
     }
 
@@ -258,7 +259,7 @@ public class ScalarTypeJsonObjectMapper {
       try {
         return objectReader.readValue(value, deserType);
       } catch (IOException e) {
-        throw new PersistenceException("Unable to convert JSON", e);
+        throw new TextException("Failed to parse JSON [{}] as " + deserType, value, e);
       }
     }
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
index afe521fe6..129ca28bc 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.config.dbplatform.DbPlatformType;
+import io.ebean.text.TextException;
 import io.ebean.text.json.EJson;
 import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import com.fasterxml.jackson.core.JsonGenerator;
@@ -78,7 +79,7 @@ public class ScalarTypeJsonSet {
         // parse JSON into modifyAware list
         return EJson.parseSet(json, true);
       } catch (IOException e) {
-        throw new SQLException("Failed to parse JSON content as List: [" + json + "]", e);
+        throw new TextException("Failed to parse JSON [{}] as Set", json, e);
       }
     }
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java
index 0f5984bdf..13d6e4c4f 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java
@@ -78,7 +78,7 @@ public class ScalarTypePostgresHstore extends ScalarTypeBase<Map> {
     try {
       return EJson.parseObject(value);
     } catch (IOException e) {
-      throw new TextException(e);
+      throw new TextException("Failed to parse JSON [{}] as Object", value, e);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeURI.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeURI.java
index 504f95454..3e3a67146 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeURI.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeURI.java
@@ -38,7 +38,7 @@ public class ScalarTypeURI extends ScalarTypeBaseVarchar<URI> {
     try {
       return new URI(value);
     } catch (URISyntaxException e) {
-      throw new TextException("Error with URI [" + value + "] ", e);
+      throw new TextException("Error with URI [{}]", value, e);
     }
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeURL.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeURL.java
index b9ae39870..577c20b19 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeURL.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeURL.java
@@ -38,7 +38,7 @@ public class ScalarTypeURL extends ScalarTypeBaseVarchar<URL> {
     try {
       return new URL(value);
     } catch (MalformedURLException e) {
-      throw new TextException(e);
+      throw new TextException("Error with URL [{}]", value, e);
     }
   }
 
diff --git a/src/test/java/org/tests/json/TestDbJson_List.java b/src/test/java/org/tests/json/TestDbJson_List.java
index 04dc55f6f..00c7b1820 100644
--- a/src/test/java/org/tests/json/TestDbJson_List.java
+++ b/src/test/java/org/tests/json/TestDbJson_List.java
@@ -2,6 +2,10 @@ package org.tests.json;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.annotation.ForPlatform;
+import io.ebean.annotation.Platform;
+import io.ebean.text.TextException;
+
 import org.tests.model.json.EBasicJsonList;
 import org.tests.model.json.PlainBean;
 import org.ebeantest.LoggedSqlCollector;
@@ -10,6 +14,7 @@ import org.junit.Test;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -165,4 +170,33 @@ public class TestDbJson_List extends BaseTestCase {
     String asJson = Ebean.json().toJson(found);
     assertNotNull(asJson);
   }
+
+  @ForPlatform(Platform.H2)
+  @Test
+  public void find_corrupt_json() {
+
+
+    EBasicJsonList bean = new EBasicJsonList();
+
+    PlainBean plainBean = new PlainBean();
+    plainBean.setName("Blubb");
+    bean.getBeanMap().put("bla", plainBean );
+
+    Ebean.save(bean);
+
+    Ebean.update(EBasicJsonList.class)
+    .set("beanMap", "blabla")
+    .where().eq("id", bean.getId())
+    .update();
+
+
+    bean = Ebean.find(EBasicJsonList.class, bean.getId());
+    Map<String, Exception> errors = server().getBeanState(bean).getLoadErrors();
+
+    assertThat(errors).containsKey("beanMap").hasSize(1);
+    assertThat(errors.values().iterator().next())
+      .isInstanceOf(TextException.class)
+      .hasMessageContaining("blabla");
+    //assertThat(bean.getBeanMap().get("bla").getName()).isEqualTo("Blubb");
+  }
 }
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index cd6b5c07c..6efadcc56 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -26,6 +26,7 @@ ebean.collectQueryPlans=true
 
 ebean.autoReadOnlyDataSource=true
 
+ebean.failOnLoadError=false
 #ebean.persistBatch=NONE
 
 #ebean.h2.idType=SEQUENCE

From cb4432a588d9934cf2a3ec7791b114ad8a7335ab Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 7 Jan 2019 21:46:14 +1300
Subject: [PATCH 0633/1036] No effective change - Bump agent to 11.27.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9651a11b8..fbfc7acab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -229,7 +229,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-agent</artifactId>
-      <version>11.25.1</version>
+      <version>11.27.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -309,7 +309,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>11.25.1</version>
+        <version>11.27.1</version>
         <executions>
           <execution>
             <id>test</id>

From 2653ec50aacac5c14bb6bea21a492c30634dc145 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 7 Jan 2019 21:52:55 +1300
Subject: [PATCH 0634/1036] #1604 - Open URL resources without caching

---
 .../server/core/DScriptRunner.java            |  3 ++-
 .../server/core/bootup/ManifestReader.java    |  3 ++-
 .../java/io/ebeaninternal/util/UrlHelper.java | 22 +++++++++++++++++++
 .../xmlmapping/XmlMappingReader.java          |  3 ++-
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/util/UrlHelper.java

diff --git a/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java b/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java
index cefe9f22a..5fdea4a9a 100644
--- a/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java
+++ b/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java
@@ -4,6 +4,7 @@ import io.ebean.ScriptRunner;
 import io.ebean.migration.ddl.DdlRunner;
 import io.ebean.migration.runner.ScriptTransform;
 import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.util.UrlHelper;
 
 import javax.persistence.PersistenceException;
 import java.io.IOException;
@@ -63,7 +64,7 @@ class DScriptRunner implements ScriptRunner {
       throw new IllegalArgumentException("resource is null?");
     }
 
-    try (InputStream inputStream = resource.openStream()) {
+    try (InputStream inputStream = UrlHelper.openNoCache(resource)) {
       return readContent(new InputStreamReader(inputStream));
 
     } catch (IOException e) {
diff --git a/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java b/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java
index 1a1e89f36..579e82994 100644
--- a/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java
+++ b/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.core.bootup;
 
 import io.ebean.util.StringHelper;
+import io.ebeaninternal.util.UrlHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -59,7 +60,7 @@ class ManifestReader {
     try {
       Enumeration<URL> resources = classLoader.getResources(resourcePath);
       while (resources.hasMoreElements()) {
-        try (InputStream is = resources.nextElement().openStream()) {
+        try (InputStream is = UrlHelper.openNoCache(resources.nextElement())) {
           read(new Manifest(is));
         }
       }
diff --git a/src/main/java/io/ebeaninternal/util/UrlHelper.java b/src/main/java/io/ebeaninternal/util/UrlHelper.java
new file mode 100644
index 000000000..443273c6b
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/util/UrlHelper.java
@@ -0,0 +1,22 @@
+package io.ebeaninternal.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+
+/**
+ * Helper to open URL content without file descriptor caching (by underlying JDK JarURLConnection).
+ */
+public class UrlHelper {
+
+  /**
+   * Open the URL content without using caching returning the resulting InputStream.
+   */
+  public static InputStream openNoCache(URL url) throws IOException {
+
+    URLConnection urlConnection = url.openConnection();
+    urlConnection.setUseCaches(false);
+    return urlConnection.getInputStream();
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java b/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java
index 79a275e60..8e0c355b3 100644
--- a/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java
+++ b/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.xmlmapping;
 
+import io.ebeaninternal.util.UrlHelper;
 import io.ebeaninternal.xmlmapping.model.XmEbean;
 import org.avaje.classpath.scanner.Resource;
 
@@ -41,7 +42,7 @@ public class XmlMappingReader {
       List<XmEbean> mappings = new ArrayList<>();
       while (resources.hasMoreElements()) {
         URL url = resources.nextElement();
-        try (InputStream is = url.openStream()) {
+        try (InputStream is = UrlHelper.openNoCache(url)) {
           mappings.add(XmlMappingReader.read(is));
         }
       }

From 585eb2b57b6df396d4b1a6736e8c5e5643d878cc Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 7 Jan 2019 22:10:17 +1300
Subject: [PATCH 0635/1036] #1604 - Open URL resources without caching

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fbfc7acab..2d67e08db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>11.12.1</version>
+      <version>11.13.1</version>
     </dependency>
 
     <dependency>

From b1beb0b7875d89266791d6b51a1c10578c1b3e0e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 7 Jan 2019 22:21:54 +1300
Subject: [PATCH 0636/1036] #1596 - NullPointerException at findOne() with
 filterMany()

---
 .../expression/FilterExpressionList.java      | 12 ++++++-
 .../org/tests/query/TestQueryFilterMany.java  | 31 +++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java
index bd6f4c704..a6578ed01 100644
--- a/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java
@@ -11,10 +11,10 @@ import io.ebean.Query;
 import io.ebeaninternal.api.SpiExpressionList;
 
 import javax.persistence.PersistenceException;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 
 public class FilterExpressionList<T> extends DefaultExpressionList<T> {
@@ -89,6 +89,16 @@ public class FilterExpressionList<T> extends DefaultExpressionList<T> {
     return rootQuery.findSet();
   }
 
+  @Override
+  public T findOne() {
+    return rootQuery.findOne();
+  }
+
+  @Override
+  public Optional<T> findOneOrEmpty() {
+    return rootQuery.findOneOrEmpty();
+  }
+
   @Override
   public ExpressionList<T> having() {
     throw new PersistenceException(notAllowedMessage);
diff --git a/src/test/java/org/tests/query/TestQueryFilterMany.java b/src/test/java/org/tests/query/TestQueryFilterMany.java
index f0c21fd21..9a1f19375 100644
--- a/src/test/java/org/tests/query/TestQueryFilterMany.java
+++ b/src/test/java/org/tests/query/TestQueryFilterMany.java
@@ -12,6 +12,7 @@ import org.tests.model.basic.ResetBasicData;
 
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
@@ -43,6 +44,36 @@ public class TestQueryFilterMany extends BaseTestCase {
 
   }
 
+  @Test
+  public void test_with_findOne() {
+
+    ResetBasicData.reset();
+
+    Customer customer = Ebean.find(Customer.class)
+      .setMaxRows(1)
+      .orderBy().asc("id")
+      .fetch("orders")
+      .filterMany("orders").raw("1 = 0")
+      .findOne();
+
+    assertThat(customer).isNotNull();
+  }
+
+  @Test
+  public void test_with_findOneOrEmpty() {
+
+    ResetBasicData.reset();
+
+    Optional<Customer> customer = Ebean.find(Customer.class)
+      .setMaxRows(1)
+      .orderBy().asc("id")
+      .fetch("orders")
+      .filterMany("orders").raw("1 = 0")
+      .findOneOrEmpty();
+
+    assertThat(customer).isPresent();
+  }
+
   @Test
   public void test_filterMany_in_findCount() {
 

From 5bcad17ae1e7b9eba5b44a35a79af46e09a0ae10 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 8 Jan 2019 16:50:28 +1300
Subject: [PATCH 0637/1036] No effective change - add a test for filterMany
 with isNotEmpty()

---
 .../org/tests/query/TestQueryFilterMany.java  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/test/java/org/tests/query/TestQueryFilterMany.java b/src/test/java/org/tests/query/TestQueryFilterMany.java
index 9a1f19375..17d40a5ad 100644
--- a/src/test/java/org/tests/query/TestQueryFilterMany.java
+++ b/src/test/java/org/tests/query/TestQueryFilterMany.java
@@ -74,6 +74,31 @@ public class TestQueryFilterMany extends BaseTestCase {
     assertThat(customer).isPresent();
   }
 
+  @Test
+  public void test_filterMany_with_isNotEmpty() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    Query<Customer> query = Ebean.find(Customer.class)
+      .fetch("orders")
+      .filterMany("orders").raw("1=0")
+      .where().isNotEmpty("orders")
+      .query();
+
+    List<Customer> list = query.findList();
+    for (Customer customer : list) {
+      assertThat(customer.getOrders()).isEmpty();
+    }
+
+    List<String> sqlList = LoggedSqlCollector.stop();
+    assertEquals(2, sqlList.size());
+    assertThat(sqlList.get(0)).contains("where exists (select 1 from o_order x where x.kcustomer_id = t0.id)");
+    assertThat(sqlList.get(1)).contains("and 1=0");
+  }
+
+
   @Test
   public void test_filterMany_in_findCount() {
 

From 7aef4ff1bdff82421515e2ee8eaf3103b9a744a0 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 8 Jan 2019 21:44:18 +1300
Subject: [PATCH 0638/1036] #1605 - RuntimeException: Nothing in batch? ...
 when lazy loading on partially populated L2 bean cache

---
 .../server/deploy/BeanDescriptor.java         | 13 ++-
 .../deploy/BeanDescriptorCacheHelp.java       | 52 ++++++++++-
 .../server/loadcontext/DLoadBeanContext.java  | 18 ++--
 .../cache/personinfo/PersonCacheEmail.java    | 49 ++++++++++
 .../cache/personinfo/PersonCacheInfo.java     | 37 ++++++++
 .../cache/personinfo/PersonCacheTests.java    | 89 +++++++++++++++++++
 6 files changed, 240 insertions(+), 18 deletions(-)
 create mode 100644 src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java
 create mode 100644 src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java
 create mode 100644 src/test/java/org/tests/cache/personinfo/PersonCacheTests.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 48985d2ee..11b72808f 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -1502,19 +1502,18 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   }
 
   /**
-   * Returns true if it managed to populate/load the bean from the cache.
+   * Hit the bean cache trying to load a list/batch of entities.
+   * Return the set of entities that were successfully loaded from L2 cache.
    */
-  public boolean cacheBeanLoad(EntityBean bean, EntityBeanIntercept ebi, Object id, PersistenceContext context) {
-    return cacheHelp.beanCacheLoad(bean, ebi, cacheKey(id), context);
+  public Set<EntityBeanIntercept> cacheBeanLoadAll(List<EntityBeanIntercept> list, PersistenceContext persistenceContext, int lazyLoadProperty, String propertyName) {
+    return cacheHelp.beanCacheLoadAll(list, persistenceContext, lazyLoadProperty, propertyName);
   }
 
   /**
    * Returns true if it managed to populate/load the bean from the cache.
    */
-  public boolean cacheBeanLoad(EntityBeanIntercept ebi, PersistenceContext context) {
-    EntityBean bean = ebi.getOwner();
-    Object id = getId(bean);
-    return cacheBeanLoad(bean, ebi, id, context);
+  public boolean cacheBeanLoad(EntityBean bean, EntityBeanIntercept ebi, Object id, PersistenceContext context) {
+    return cacheHelp.beanCacheLoad(bean, ebi, cacheKey(id), context);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index ed5d7cdfb..88c816040 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -27,6 +27,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -700,7 +701,56 @@ final class BeanDescriptorCacheHelp<T> {
   }
 
   /**
-   * Returns true if it managed to populate/load the bean from the cache.
+   * Load a batch of entities from L2 bean cache checking the lazy loaded property is loaded.
+   */
+  Set<EntityBeanIntercept> beanCacheLoadAll(List<EntityBeanIntercept> list, PersistenceContext context, int lazyLoadProperty, String propertyName) {
+
+    Map<Object, EntityBeanIntercept> ebis = new HashMap<>();
+    for (EntityBeanIntercept ebi : list) {
+      ebis.put(desc.cacheKeyForBean(ebi.getOwner()), ebi);
+    }
+
+
+    Map<Object, Object> hits = getBeanCache().getAll(ebis.keySet());
+
+    if (beanLog.isTraceEnabled()) {
+      beanLog.trace("   LOAD ALL {}({}) - got hits ({})", cacheName, ebis.keySet(), hits.size());
+    }
+
+    Set<EntityBeanIntercept> loaded = new HashSet<>();
+
+    Iterator<Map.Entry<Object, Object>> iterator = hits.entrySet().iterator();
+    while (iterator.hasNext()) {
+      Map.Entry<Object, Object> hit = iterator.next();
+
+      Object key = hit.getKey();
+      EntityBeanIntercept ebi = ebis.remove(key);
+      CachedBeanData cacheData = (CachedBeanData) hit.getValue();
+
+      if (lazyLoadProperty > -1 && !cacheData.isLoaded(propertyName)) {
+        if (beanLog.isTraceEnabled()) {
+          beanLog.trace("   LOAD {}({}) - cache miss on property({})", cacheName, key, propertyName);
+        }
+        iterator.remove();
+
+      } else {
+        CachedBeanDataToBean.load(desc, ebi.getOwner(), cacheData, context);
+        loaded.add(ebi);
+        if (beanLog.isDebugEnabled()) {
+          beanLog.debug("   LOAD {}({}) - hit", cacheName, key);
+        }
+      }
+    }
+
+    if (!ebis.isEmpty() && beanLog.isTraceEnabled()) {
+      beanLog.trace("   LOAD {}({}) - cache miss", cacheName, ebis.keySet());
+    }
+
+    return loaded;
+  }
+
+  /**
+   * Returns true if it managed to populate/load the single bean from the cache.
    */
   boolean beanCacheLoad(EntityBean bean, EntityBeanIntercept ebi, String key, PersistenceContext context) {
 
diff --git a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
index 574e6f72a..4c820c71c 100644
--- a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
+++ b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
@@ -13,6 +13,7 @@ import io.ebeaninternal.server.querydefn.OrmQueryProperties;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Default implementation of LoadBeanContext.
@@ -174,22 +175,19 @@ public class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContex
         return;
       }
 
-      if (context.hitCache && context.desc.cacheBeanLoad(ebi, persistenceContext)) {
-        // successfully hit the L2 cache so don't invoke DB lazy loading
-        list.remove(ebi);
-        return;
-      }
-
       if (context.hitCache) {
-        // check each of the beans in the batch to see if they are in the L2 cache.
-        // bean successfully loaded from L2 cache so remove from batch load
-        list.removeIf(batchEbi -> batchEbi != ebi && context.desc.cacheBeanLoad(batchEbi, persistenceContext));
+        Set<EntityBeanIntercept> hits = context.desc.cacheBeanLoadAll(list, persistenceContext, ebi.getLazyLoadPropertyIndex(), ebi.getLazyLoadProperty());
+
+        list.removeAll(hits);
+        if (list.isEmpty() || hits.contains(ebi)) {
+          // successfully hit the L2 cache so don't invoke DB lazy loading
+          return;
+        }
       }
 
       LoadBeanRequest req = new LoadBeanRequest(this, ebi.getLazyLoadProperty(), context.hitCache);
       context.desc.getEbeanServer().loadBean(req);
     }
-
   }
 
 }
diff --git a/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java b/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java
new file mode 100644
index 000000000..fb6a7d147
--- /dev/null
+++ b/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java
@@ -0,0 +1,49 @@
+package org.tests.cache.personinfo;
+
+import io.ebean.annotation.Cache;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+@Entity
+@Cache
+public class PersonCacheEmail {
+
+  @Id
+  private String id;
+
+  @ManyToOne
+  private PersonCacheInfo personInfo;
+
+  private String email;
+
+  public PersonCacheEmail(String id, String email) {
+    this.id = id;
+    this.email = email;
+  }
+
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public PersonCacheInfo getPersonInfo() {
+    return personInfo;
+  }
+
+  public void setPersonInfo(PersonCacheInfo personInfo) {
+    this.personInfo = personInfo;
+  }
+
+  public String getEmail() {
+    return email;
+  }
+
+  public void setEmail(String email) {
+    this.email = email;
+  }
+}
diff --git a/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java b/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java
new file mode 100644
index 000000000..cd5325163
--- /dev/null
+++ b/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java
@@ -0,0 +1,37 @@
+package org.tests.cache.personinfo;
+
+import io.ebean.annotation.Cache;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+@Cache
+public class PersonCacheInfo {
+
+  @Id
+  private String personId;
+
+  private String name;
+
+  public PersonCacheInfo(String personId, String name) {
+    this.personId = personId;
+    this.name = name;
+  }
+
+  public String getPersonId() {
+    return personId;
+  }
+
+  public void setPersonId(String personId) {
+    this.personId = personId;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+}
diff --git a/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java b/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java
new file mode 100644
index 000000000..5cc192eca
--- /dev/null
+++ b/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java
@@ -0,0 +1,89 @@
+package org.tests.cache.personinfo;
+
+import io.ebean.Ebean;
+import io.ebean.cache.ServerCache;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class PersonCacheTests {
+
+  private void insert(int id, String email) {
+
+    PersonCacheInfo person = new PersonCacheInfo("P00" + id, "P00" + id);
+
+    PersonCacheEmail personEmail = new PersonCacheEmail("E00" + id, email);
+    personEmail.setPersonInfo(person);
+
+    Ebean.save(person);
+    Ebean.save(personEmail);
+  }
+
+  private void addTestData() {
+
+    insert(1, "testA");
+    insert(2, "testB");
+    insert(3, "testC");
+  }
+
+  @Test
+  public void testInQuery() {
+
+    addTestData();
+
+    LoggedSqlCollector.start();
+
+    Ebean.find(PersonCacheInfo.class)
+      .select("personId") // do not fetch name
+      .setUseCache(true)
+      .findList();
+
+    ServerCache beanCache = Ebean.getDefaultServer().getServerCacheManager().getBeanCache(PersonCacheInfo.class);
+    beanCache.getStatistics(true);
+
+    List<Object> ids = Arrays.asList(new String[]{"E001", "E002", "E003"});
+
+    List<PersonCacheEmail> emailList =
+      Ebean.find(PersonCacheEmail.class)
+        .where().idIn(ids)
+        .setUseCache(true)
+        .findList();
+
+
+    for (PersonCacheEmail email : emailList) {
+      // get property that isn't in the cached data
+      assertThat(email.getPersonInfo().getName()).isNotNull();
+      System.out.println(email.getPersonInfo().getName());
+    }
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(3);
+
+    assertThat(beanCache.getStatistics(true).getHitCount()).isEqualTo(3);
+
+    System.out.println("Fetch again ...");
+
+    emailList =
+      Ebean.find(PersonCacheEmail.class)
+        .where().idIn(ids)
+        .setUseCache(true)
+        .findList();
+
+
+    for (PersonCacheEmail email : emailList) {
+      // get property but it is in the cache data now
+      System.out.println(email.getPersonInfo().getName());
+      assertThat(email.getPersonInfo().getName()).isNotNull();
+    }
+
+    sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(1);
+
+    assertThat(beanCache.getStatistics(true).getHitCount()).isEqualTo(3);
+
+  }
+}

From 7ed4435ccc620230b55b6a589b73c4f8f6a5c533 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Tue, 8 Jan 2019 10:13:55 +0100
Subject: [PATCH 0639/1036] Fix some testcases fof MySql/SqlServer (#1591)

* FIX testcases for MariaDB+utf8mb4  (Failure was: "Specified key was too long; max key length is 767 bytes")

* Excluded tests that won't work on SqlServers generated ids
---
 .../java/org/tests/batchinsert/TestBatchInsertFlush.java    | 4 ++--
 src/test/java/org/tests/delete/TestDeleteByQuery.java       | 6 +++++-
 .../tests/model/basic/xtra/TestInsertBatchThenUpdate.java   | 4 ++--
 src/test/java/org/tests/model/composite/CkeClientKey.java   | 3 +++
 src/test/java/org/tests/model/composite/CkeUserKey.java     | 3 +++
 src/test/java/org/tests/model/onetoone/OtoAone.java         | 2 ++
 src/test/java/org/tests/model/onetoone/OtoAtwo.java         | 2 ++
 src/test/java/org/tests/model/orphanremoval/OrpDetail.java  | 2 ++
 src/test/java/org/tests/model/orphanremoval/OrpDetail2.java | 2 ++
 src/test/java/org/tests/model/orphanremoval/OrpMaster.java  | 3 +++
 src/test/java/org/tests/model/orphanremoval/OrpMaster2.java | 3 +++
 .../org/tests/query/orderby/TestOrderByWithDistinct.java    | 4 ++++
 12 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
index daf725b39..2ec125a23 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
@@ -121,7 +121,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
 
   @Test
   @Transactional(batch = PersistBatch.ALL)
-  @IgnorePlatform(Platform.HANA)
+  @IgnorePlatform({Platform.SQLSERVER, Platform.HANA}) // has generated IDs
   public void transactional_flushOnGetId() {
 
     EbeanServer server = Ebean.getDefaultServer();
@@ -144,7 +144,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
   }
 
   @Test
-  @IgnorePlatform(Platform.HANA)
+  @IgnorePlatform({Platform.SQLSERVER, Platform.HANA})
   public void testFlushOnGetId() {
 
     EbeanServer server = Ebean.getDefaultServer();
diff --git a/src/test/java/org/tests/delete/TestDeleteByQuery.java b/src/test/java/org/tests/delete/TestDeleteByQuery.java
index e19bdf821..a0b5e5d4c 100644
--- a/src/test/java/org/tests/delete/TestDeleteByQuery.java
+++ b/src/test/java/org/tests/delete/TestDeleteByQuery.java
@@ -138,7 +138,11 @@ public class TestDeleteByQuery extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("select t0.id from o_customer t0 where t0.name = ?");
+    if (isSqlServer()) {
+      assertThat(sql.get(0)).contains("select t0.id from o_customer t0 with (updlock) where t0.name = ?");
+    } else {
+      assertThat(sql.get(0)).contains("select t0.id from o_customer t0 where t0.name = ?");
+    }
   }
 
   @Test
diff --git a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java
index 6e2f33ddc..7d9e1d3c0 100644
--- a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java
+++ b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java
@@ -17,7 +17,7 @@ import static org.junit.Assert.assertEquals;
 public class TestInsertBatchThenUpdate extends BaseTestCase {
 
   @Test
-  @IgnorePlatform(Platform.HANA)
+  @IgnorePlatform({Platform.SQLSERVER, Platform.HANA}) // has generated IDs
   public void test() {
 
     LoggedSqlCollector.start();
@@ -50,7 +50,7 @@ public class TestInsertBatchThenUpdate extends BaseTestCase {
 
       // insert statements for EdExtendedParent
       List<String> loggedSql = LoggedSqlCollector.stop();
-      assertEquals(3, loggedSql.size());
+      assertThat(loggedSql).hasSize(3);
       assertThat(loggedSql.get(0)).contains("insert into td_parent");
       assertThat(loggedSql.get(1)).contains("insert into td_child ");
       assertThat(loggedSql.get(2)).contains("update td_parent set parent_name=? where parent_id=?");
diff --git a/src/test/java/org/tests/model/composite/CkeClientKey.java b/src/test/java/org/tests/model/composite/CkeClientKey.java
index c32bdb10f..2d4456ce9 100644
--- a/src/test/java/org/tests/model/composite/CkeClientKey.java
+++ b/src/test/java/org/tests/model/composite/CkeClientKey.java
@@ -3,6 +3,8 @@ package org.tests.model.composite;
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
+import javax.validation.constraints.Size;
+
 import java.util.Objects;
 
 @Embeddable
@@ -14,6 +16,7 @@ public class CkeClientKey {
 
   @Basic(optional = false)
   @Column(name = "cod_client")
+  @Size(max=100)
   private String codClient;
 
   public CkeClientKey(int codCompany, String codClient) {
diff --git a/src/test/java/org/tests/model/composite/CkeUserKey.java b/src/test/java/org/tests/model/composite/CkeUserKey.java
index 637a10cf7..09939ead3 100644
--- a/src/test/java/org/tests/model/composite/CkeUserKey.java
+++ b/src/test/java/org/tests/model/composite/CkeUserKey.java
@@ -3,6 +3,8 @@ package org.tests.model.composite;
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
+import javax.validation.constraints.Size;
+
 import java.util.Objects;
 
 @Embeddable
@@ -10,6 +12,7 @@ public class CkeUserKey {
 
   @Basic(optional = false)
   @Column(name = "username")
+  @Size(max=100)
   private String username;
 
   @Basic(optional = false)
diff --git a/src/test/java/org/tests/model/onetoone/OtoAone.java b/src/test/java/org/tests/model/onetoone/OtoAone.java
index 9716b4a37..fd0b0c58b 100644
--- a/src/test/java/org/tests/model/onetoone/OtoAone.java
+++ b/src/test/java/org/tests/model/onetoone/OtoAone.java
@@ -2,11 +2,13 @@ package org.tests.model.onetoone;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.validation.constraints.Size;
 
 @Entity
 public class OtoAone {
 
   @Id
+  @Size(max = 100)
   private String id;
 
   private String description;
diff --git a/src/test/java/org/tests/model/onetoone/OtoAtwo.java b/src/test/java/org/tests/model/onetoone/OtoAtwo.java
index d60bfb5c1..ac00af5d1 100644
--- a/src/test/java/org/tests/model/onetoone/OtoAtwo.java
+++ b/src/test/java/org/tests/model/onetoone/OtoAtwo.java
@@ -4,11 +4,13 @@ import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToOne;
+import javax.validation.constraints.Size;
 
 @Entity
 public class OtoAtwo {
 
   @Id
+  @Size(max = 100)
   private String id;
 
   private String description;
diff --git a/src/test/java/org/tests/model/orphanremoval/OrpDetail.java b/src/test/java/org/tests/model/orphanremoval/OrpDetail.java
index 4ba7c12fa..5a22543a1 100644
--- a/src/test/java/org/tests/model/orphanremoval/OrpDetail.java
+++ b/src/test/java/org/tests/model/orphanremoval/OrpDetail.java
@@ -4,11 +4,13 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 import javax.persistence.Version;
+import javax.validation.constraints.Size;
 
 @Entity
 public class OrpDetail {
 
   @Id
+  @Size(max=100)
   String id;
 
   String detail;
diff --git a/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java b/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java
index 4f369ce6b..6fe3be4dd 100644
--- a/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java
+++ b/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java
@@ -3,11 +3,13 @@ package org.tests.model.orphanremoval;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Version;
+import javax.validation.constraints.Size;
 
 @Entity
 public class OrpDetail2 {
 
   @Id
+  @Size(max=100)
   String id;
 
   String detail;
diff --git a/src/test/java/org/tests/model/orphanremoval/OrpMaster.java b/src/test/java/org/tests/model/orphanremoval/OrpMaster.java
index 2bba0d742..cd443a84c 100644
--- a/src/test/java/org/tests/model/orphanremoval/OrpMaster.java
+++ b/src/test/java/org/tests/model/orphanremoval/OrpMaster.java
@@ -7,6 +7,8 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
 import javax.persistence.Version;
+import javax.validation.constraints.Size;
+
 import java.util.List;
 
 @Cache
@@ -14,6 +16,7 @@ import java.util.List;
 public class OrpMaster {
 
   @Id
+  @Size(max = 100)
   String id;
 
   String name;
diff --git a/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java b/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java
index a6d65f14f..09338bdda 100644
--- a/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java
+++ b/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java
@@ -7,6 +7,8 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
 import javax.persistence.Version;
+import javax.validation.constraints.Size;
+
 import java.util.List;
 
 @Cache
@@ -14,6 +16,7 @@ import java.util.List;
 public class OrpMaster2 {
 
   @Id
+  @Size(max=100)
   String id;
 
   String name;
diff --git a/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java b/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java
index a1c9d7767..733af34a0 100644
--- a/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java
+++ b/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java
@@ -3,6 +3,9 @@ package org.tests.query.orderby;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import io.ebean.annotation.IgnorePlatform;
+import io.ebean.annotation.Platform;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
@@ -38,6 +41,7 @@ public class TestOrderByWithDistinct extends BaseTestCase {
   }
 
   @Test
+  @IgnorePlatform({Platform.MYSQL, Platform.SQLSERVER}) // do not support nulls first/last
   public void testDistinctOn() {
 
     MRole role = Ebean.getReference(MRole.class, 1);

From 3108076953e1267e9fbdfcbc6db16f3bb21e63f0 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Tue, 8 Jan 2019 10:15:31 +0100
Subject: [PATCH 0640/1036] SqlServer queryplan captured in transaction & fix
 of possible NPE (#1592)

* SqlServer queryplan captured in transaction & fix of possible NPE

* rolled back transaction earlier
---
 .../server/query/CQueryBindCapture.java           |  6 ++++--
 .../server/query/QueryPlanLoggerSqlServer.java    | 15 +++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java b/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
index b856ed535..644f236fe 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
@@ -59,8 +59,10 @@ class CQueryBindCapture {
     final BindCapture last = this.bindCapture;
 
     DQueryPlanOutput queryPlan = planLogger.logQueryPlan(request.getConnection(), cQueryPlan, last);
-    queryPlan.with(queryTimeMicros, captureCount, cQueryPlan.getPlanKey().toString());
-    request.process(queryPlan);
+    if (queryPlan != null) {
+      queryPlan.with(queryTimeMicros, captureCount, cQueryPlan.getPlanKey().toString());
+      request.process(queryPlan);
+    }
   }
 
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java b/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java
index 9a6b82459..ad45332cc 100644
--- a/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java
+++ b/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java
@@ -20,28 +20,31 @@ public class QueryPlanLoggerSqlServer extends QueryPlanLogger {
   public DQueryPlanOutput logQueryPlan(Connection conn, CQueryPlan plan, BindCapture bind) {
 
     try (Statement stmt = conn.createStatement()) {
-      stmt.execute("SET STATISTICS XML ON");
+      stmt.execute("set statistics xml on");
+      stmt.execute("begin transaction");
       try (PreparedStatement explainStmt = conn.prepareStatement(plan.getSql())) {
         bind.prepare(explainStmt, conn);
 
         try (ResultSet rset = explainStmt.executeQuery()) {
-          // unfortunately, this will execute the
+          // unfortunately, this will execute the query, so we execute this in a transaction
         }
+        stmt.execute("rollback transaction");
+        String xml = null;
         if (explainStmt.getMoreResults()) {
           try (ResultSet rset = explainStmt.getResultSet()) {
             StringBuilder sb = new StringBuilder();
-            while (rset.next()) {
-              sb.append("XML: ").append(rset.getString(1));
+            if (rset.next()) {
+              xml = rset.getString(1);
             }
-            return createPlan(plan, bind.toString(), sb.toString());
           }
         }
+        return createPlan(plan, bind.toString(), xml);
 
       } catch (SQLException e) {
         queryPlanLog.error("Could not log query plan", e);
 
       } finally {
-        stmt.execute("SET STATISTICS XML OFF");
+        stmt.execute("set statistics xml off");
       }
     } catch (SQLException e) {
       queryPlanLog.error("Could not log query plan", e);

From 0b6e73d72983f34d2798b4594d09c269596ad99e Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Tue, 8 Jan 2019 10:37:42 +0100
Subject: [PATCH 0641/1036] FIX: create uuid-state file in user's home
 directory (#1598)

---
 src/main/java/io/ebean/config/ServerConfig.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 1abf7bb56..a4b6a5371 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -366,9 +366,10 @@ public class ServerConfig {
   private UuidVersion uuidVersion = UuidVersion.VERSION4;
 
   /**
-   * The UUID state file (for Version 1 UUIDs).
+   * The UUID state file (for Version 1 UUIDs). By default, the file is created in
+   * ${HOME}/.ebean/${servername}-uuid.state
    */
-  private String uuidStateFile = "ebean-uuid.state";
+  private String uuidStateFile;
 
   /**
    * The clock used for setting the timestamps (e.g. @UpdatedTimestamp) on objects.

From 0b18189e629bb27abc49be89b377777ff39d16a7 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Tue, 8 Jan 2019 10:39:08 +0100
Subject: [PATCH 0642/1036] exposed the schedule methods in BackgroundExecutor
 (#1599)

---
 .../java/io/ebean/BackgroundExecutor.java     | 19 +++++++++
 .../core/DefaultBackgroundExecutor.java       | 42 +++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/src/main/java/io/ebean/BackgroundExecutor.java b/src/main/java/io/ebean/BackgroundExecutor.java
index b88f8b658..f6439773e 100644
--- a/src/main/java/io/ebean/BackgroundExecutor.java
+++ b/src/main/java/io/ebean/BackgroundExecutor.java
@@ -1,6 +1,8 @@
 package io.ebean;
 
+import java.util.concurrent.Callable;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -37,4 +39,21 @@ public interface BackgroundExecutor {
    * </p>
    */
   void executePeriodically(Runnable r, long delay, TimeUnit unit);
+
+  /**
+   * Schedules a Runnable for one-shot action that becomes enabled after the given delay.
+   *
+   * @return a ScheduledFuture representing pending completion of the task and
+   *         whose get() method will return null upon completion
+   */
+  ScheduledFuture<?> schedule(Runnable r, long delay, TimeUnit unit);
+
+  /**
+   * Schedules a Callable for one-shot action that becomes enabled after the given delay.
+   *
+   * @return a ScheduledFuture that can be used to extract result or cancel
+   */
+  <V> ScheduledFuture<V> schedule(Callable<V> c, long delay, TimeUnit unit);
+
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultBackgroundExecutor.java b/src/main/java/io/ebeaninternal/server/core/DefaultBackgroundExecutor.java
index 200f7fedd..e458c5165 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultBackgroundExecutor.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultBackgroundExecutor.java
@@ -6,6 +6,8 @@ import io.ebeaninternal.server.lib.DaemonScheduleThreadPool;
 import org.slf4j.MDC;
 
 import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -64,6 +66,46 @@ public class DefaultBackgroundExecutor implements SpiBackgroundExecutor {
     }
   }
 
+  @Override
+  public ScheduledFuture<?> schedule(Runnable r, long delay, TimeUnit unit) {
+    final Map<String, String> map = MDC.getCopyOfContextMap();
+
+    if (map == null) {
+      return schedulePool.schedule(r, delay, unit);
+    } else {
+      return schedulePool.schedule(() -> {
+        MDC.setContextMap(map);
+        try {
+          r.run();
+        } finally {
+          MDC.clear();
+        }
+      }, delay, unit);
+    }
+  }
+
+  @Override
+  public <V> ScheduledFuture<V> schedule(Callable<V> c, long delay, TimeUnit unit) {
+    final Map<String, String> map = MDC.getCopyOfContextMap();
+
+    if (map == null) {
+      return schedulePool.schedule(c, delay, unit);
+    } else {
+      return schedulePool.schedule(new Callable<V>() {
+        @Override
+        public V call() throws Exception {
+          MDC.setContextMap(map);
+          try {
+            return c.call();
+          } finally {
+            MDC.clear();
+          }
+        }
+
+      }, delay, unit);
+    }
+  }
+
   @Override
   public void shutdown() {
     pool.shutdown();

From 50de32af2927be491d8d946c33d4fde849dd412c Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Tue, 8 Jan 2019 10:40:14 +0100
Subject: [PATCH 0643/1036] Fixed tests, if SqlServer has
 "Latin1_General_100_BIN2" collation. (#1600)

This means, all names are interpreted case sensitive by the db
---
 src/test/java/org/tests/compositekeys/db/Item.java        | 8 ++++----
 src/test/java/org/tests/compositekeys/db/Parcel.java      | 2 +-
 .../java/org/tests/compositekeys/db/ParcelLocation.java   | 4 ++--
 src/test/java/org/tests/model/basic/Phone.java            | 6 +++---
 src/test/java/org/tests/model/carwheeltruck/TTruck.java   | 2 +-
 src/test/java/org/tests/model/composite/ROrder.java       | 4 ++--
 src/test/java/org/tests/model/nofk/EFile2NoFk.java        | 4 ++--
 src/test/java/org/tests/model/selfref/ResourceFile.java   | 2 +-
 src/test/java/org/tests/model/survey/Category.java        | 2 +-
 src/test/java/org/tests/model/survey/Group.java           | 2 +-
 src/test/java/org/tests/model/survey/Question.java        | 2 +-
 src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java    | 2 +-
 .../singleTableInheritance/model/PalletLocation.java      | 2 +-
 .../org/tests/singleTableInheritance/model/Warehouse.java | 6 +++---
 src/test/resources/assert/changeset-apply.txt             | 8 ++++----
 src/test/resources/assert/changeset-pg-apply.sql          | 8 ++++----
 16 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/test/java/org/tests/compositekeys/db/Item.java b/src/test/java/org/tests/compositekeys/db/Item.java
index 4780e06ca..1b0aa526b 100644
--- a/src/test/java/org/tests/compositekeys/db/Item.java
+++ b/src/test/java/org/tests/compositekeys/db/Item.java
@@ -23,10 +23,10 @@ public class Item {
   private int region;
 
   @Embedded
-  @AttributeOverride(name = "lastUpdated", column = @Column(name = "DATE_MODIFIED"))
-  @AttributeOverride(name = "created", column = @Column(name = "DATE_CREATED"))
-  @AttributeOverride(name = "updatedBy", column = @Column(name = "MODIFIED_BY"))
-  @AttributeOverride(name = "createdBy", column = @Column(name = "CREATED_BY"))
+  @AttributeOverride(name = "lastUpdated", column = @Column(name = "date_modified"))
+  @AttributeOverride(name = "created", column = @Column(name = "date_created"))
+  @AttributeOverride(name = "updatedBy", column = @Column(name = "modified_by"))
+  @AttributeOverride(name = "createdBy", column = @Column(name = "created_by"))
   private AuditInfo auditInfo = new AuditInfo();
 
   @Version
diff --git a/src/test/java/org/tests/compositekeys/db/Parcel.java b/src/test/java/org/tests/compositekeys/db/Parcel.java
index cb18bf8e5..bf1324de9 100644
--- a/src/test/java/org/tests/compositekeys/db/Parcel.java
+++ b/src/test/java/org/tests/compositekeys/db/Parcel.java
@@ -7,7 +7,7 @@ import javax.persistence.Id;
 @Entity
 public class Parcel {
   @Id
-  @Column(name = "parcelId")
+  @Column(name = "parcelid")
   private Long parcelId;
 
   private String description;
diff --git a/src/test/java/org/tests/compositekeys/db/ParcelLocation.java b/src/test/java/org/tests/compositekeys/db/ParcelLocation.java
index 4008006b0..b9822b807 100644
--- a/src/test/java/org/tests/compositekeys/db/ParcelLocation.java
+++ b/src/test/java/org/tests/compositekeys/db/ParcelLocation.java
@@ -9,13 +9,13 @@ import javax.persistence.OneToOne;
 @Entity
 public class ParcelLocation {
   @Id
-  @Column(name = "parcelLocId")
+  @Column(name = "parcellocid")
   private Long parcelLocId;
 
   private String location;
 
   @OneToOne
-  @JoinColumn(name = "parcelId", referencedColumnName = "parcelId")
+  @JoinColumn(name = "parcelid", referencedColumnName = "parcelid")
   private Parcel parcel;
 
   public Long getParcelLocId() {
diff --git a/src/test/java/org/tests/model/basic/Phone.java b/src/test/java/org/tests/model/basic/Phone.java
index f20d1106b..94b45624d 100644
--- a/src/test/java/org/tests/model/basic/Phone.java
+++ b/src/test/java/org/tests/model/basic/Phone.java
@@ -27,7 +27,7 @@ public class Phone implements Serializable {
 
   @Id
   @GeneratedValue(strategy = javax.persistence.GenerationType.AUTO)
-  @Column(name = "ID", unique = true, nullable = false)
+  @Column(name = "id", unique = true, nullable = false)
   public Long getId() {
     return id;
   }
@@ -36,7 +36,7 @@ public class Phone implements Serializable {
     this.id = id;
   }
 
-  @Column(name = "PHONE_NUMBER", nullable = false, unique = true, columnDefinition = "varchar(7)")
+  @Column(name = "phone_number", nullable = false, unique = true, columnDefinition = "varchar(7)")
   public String getPhoneNumber() {
     return phoneNumber;
   }
@@ -47,7 +47,7 @@ public class Phone implements Serializable {
 
   @NotNull
   @ManyToOne(targetEntity = Person.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-  @JoinColumn(name = "PERSON_ID", nullable = false)
+  @JoinColumn(name = "person_id", nullable = false)
   public Person getPerson() {
     return person;
   }
diff --git a/src/test/java/org/tests/model/carwheeltruck/TTruck.java b/src/test/java/org/tests/model/carwheeltruck/TTruck.java
index 3c1bd7a83..86529a19c 100644
--- a/src/test/java/org/tests/model/carwheeltruck/TTruck.java
+++ b/src/test/java/org/tests/model/carwheeltruck/TTruck.java
@@ -13,7 +13,7 @@ import javax.persistence.InheritanceType;
 @DiscriminatorValue("truck")
 public class TTruck extends TCar {
 
-  @Column(name = "truckLoad")
+  @Column(name = "truckload")
   Long load;
 
   public Long getLoad() {
diff --git a/src/test/java/org/tests/model/composite/ROrder.java b/src/test/java/org/tests/model/composite/ROrder.java
index 14fd2d9c9..0b543321a 100644
--- a/src/test/java/org/tests/model/composite/ROrder.java
+++ b/src/test/java/org/tests/model/composite/ROrder.java
@@ -24,11 +24,11 @@ public class ROrder {
   @ManyToOne(cascade = CascadeType.PERSIST)
   @JoinColumns({
     @JoinColumn(name = "company", referencedColumnName = "company", insertable = false, updatable = false),
-    @JoinColumn(name = "customerName", referencedColumnName = "name", insertable = false, updatable = false)
+    @JoinColumn(name = "customername", referencedColumnName = "name", insertable = false, updatable = false)
   })
   private RCustomer customer;
 
-  @Column(name = "customerName")
+  @Column(name = "customername")
   @Size(max=127)
   private String customerName;
 
diff --git a/src/test/java/org/tests/model/nofk/EFile2NoFk.java b/src/test/java/org/tests/model/nofk/EFile2NoFk.java
index 5d5ff5c90..71116ea0d 100644
--- a/src/test/java/org/tests/model/nofk/EFile2NoFk.java
+++ b/src/test/java/org/tests/model/nofk/EFile2NoFk.java
@@ -20,12 +20,12 @@ public class EFile2NoFk {
 
   // owner without softdelete property - will throw bean has been deleted
   @ManyToOne
-  @Formula(select = "${ta}.Owner_Id")
+  @Formula(select = "${ta}.owner_id")
   EUserNoFk owner;
 
   // owner with softdelete property - will set the property to true
   @ManyToOne
-  @Formula(select = "${ta}.Owner_id")
+  @Formula(select = "${ta}.owner_id")
   EUserNoFkSoftDel ownerSoftDel;
 
 
diff --git a/src/test/java/org/tests/model/selfref/ResourceFile.java b/src/test/java/org/tests/model/selfref/ResourceFile.java
index b7696eeaf..b8e9b964f 100644
--- a/src/test/java/org/tests/model/selfref/ResourceFile.java
+++ b/src/test/java/org/tests/model/selfref/ResourceFile.java
@@ -20,7 +20,7 @@ public class ResourceFile extends BaseResourceFile {
   private static final long serialVersionUID = 1L;
 
   @ManyToOne(fetch = FetchType.LAZY, optional = true)
-  @JoinColumn(name = "parentResourceFileId", nullable = true)
+  @JoinColumn(name = "parentresourcefileid", nullable = true)
   private ResourceFile parent;
 
   @OneToMany(cascade = CascadeType.REMOVE, fetch = FetchType.LAZY, mappedBy = "parent")
diff --git a/src/test/java/org/tests/model/survey/Category.java b/src/test/java/org/tests/model/survey/Category.java
index c40114a4f..c31b63550 100644
--- a/src/test/java/org/tests/model/survey/Category.java
+++ b/src/test/java/org/tests/model/survey/Category.java
@@ -21,7 +21,7 @@ public class Category {
   }
 
   @ManyToOne
-  @JoinColumn(name = "surveyObjectId")
+  @JoinColumn(name = "surveyobjectid")
   private Survey survey;
 
   @OneToMany(mappedBy = "category", cascade = {CascadeType.PERSIST, CascadeType.MERGE})
diff --git a/src/test/java/org/tests/model/survey/Group.java b/src/test/java/org/tests/model/survey/Group.java
index df4846938..dcbc3fe83 100644
--- a/src/test/java/org/tests/model/survey/Group.java
+++ b/src/test/java/org/tests/model/survey/Group.java
@@ -24,7 +24,7 @@ public class Group {
   }
 
   @ManyToOne
-  @JoinColumn(name = "categoryObjectId")
+  @JoinColumn(name = "categoryobjectid")
   private Category category;
 
   @OneToMany(mappedBy = "group", cascade = {CascadeType.PERSIST, CascadeType.MERGE})
diff --git a/src/test/java/org/tests/model/survey/Question.java b/src/test/java/org/tests/model/survey/Question.java
index 49038c9a4..1f5c9d081 100644
--- a/src/test/java/org/tests/model/survey/Question.java
+++ b/src/test/java/org/tests/model/survey/Question.java
@@ -17,7 +17,7 @@ public class Question {
   }
 
   @ManyToOne
-  @JoinColumn(name = "groupObjectId")
+  @JoinColumn(name = "groupobjectid")
   private Group group;
 
   private int sequenceNumber;
diff --git a/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java b/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
index cabde9917..306ef26ac 100644
--- a/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
+++ b/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
@@ -105,7 +105,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
   }
 
   @Test
-  @IgnorePlatform(Platform.MYSQL)
+  @IgnorePlatform({Platform.MYSQL, Platform.SQLSERVER})
   public void test_upperCaseSql() {
 
     ResetBasicData.reset();
diff --git a/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java b/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java
index 394180d2b..51aafc413 100644
--- a/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java
+++ b/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java
@@ -20,7 +20,7 @@ public class PalletLocation {
   private Integer id;
 
   @ManyToOne(fetch = FetchType.LAZY, optional = false)
-  @JoinColumn(name = "ZONE_SID")
+  @JoinColumn(name = "zone_sid")
   private Zone zone;
 
   public Integer getId() {
diff --git a/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java b/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java
index 6116615d4..58b935c49 100644
--- a/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java
+++ b/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java
@@ -19,13 +19,13 @@ public class Warehouse {
   private Integer id;
 
   @ManyToOne//(optional = false) //todo: should this be nullable with assertions made?
-  @JoinColumn(name = "officeZoneId")
+  @JoinColumn(name = "officezoneid")
   private ZoneInternal officeZone;
 
   @ManyToMany(cascade = CascadeType.PERSIST)
   @JoinTable(name = "warehousesshippingzones",
-    joinColumns = {@JoinColumn(name = "warehouseId", referencedColumnName = "ID")},
-    inverseJoinColumns = {@JoinColumn(name = "shippingZoneId", referencedColumnName = "ID")}
+    joinColumns = {@JoinColumn(name = "warehouseid", referencedColumnName = "id")},
+    inverseJoinColumns = {@JoinColumn(name = "shippingzoneid", referencedColumnName = "id")}
   )
   private Set<ZoneExternal> shippingZones;
 
diff --git a/src/test/resources/assert/changeset-apply.txt b/src/test/resources/assert/changeset-apply.txt
index 16d68bacc..4343a231e 100644
--- a/src/test/resources/assert/changeset-apply.txt
+++ b/src/test/resources/assert/changeset-apply.txt
@@ -877,10 +877,10 @@ create table item (
   units                         varchar(255),
   type                          integer,
   region                        integer,
-  DATE_MODIFIED                 timestamp,
-  DATE_CREATED                  timestamp,
-  MODIFIED_BY                   varchar(255),
-  CREATED_BY                    varchar(255),
+  date_modified                 timestamp,
+  date_created                  timestamp,
+  modified_by                   varchar(255),
+  created_by                    varchar(255),
   version                       bigint not null,
   constraint pk_item primary key (customer,itemNumber)
 );
diff --git a/src/test/resources/assert/changeset-pg-apply.sql b/src/test/resources/assert/changeset-pg-apply.sql
index c995e7c84..5493619f1 100644
--- a/src/test/resources/assert/changeset-pg-apply.sql
+++ b/src/test/resources/assert/changeset-pg-apply.sql
@@ -777,10 +777,10 @@ create table item (
   units                         varchar(255),
   type                          integer,
   region                        integer,
-  DATE_MODIFIED                 timestamp,
-  DATE_CREATED                  timestamp,
-  MODIFIED_BY                   varchar(255),
-  CREATED_BY                    varchar(255),
+  date_modified                 timestamp,
+  date_created                  timestamp,
+  modified_by                   varchar(255),
+  created_by                    varchar(255),
   version                       bigint not null,
   constraint pk_item primary key (customer,itemNumber)
 );

From b18bc82b8ae154ff9ea19ffb25216b5ab2cbe637 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Tue, 8 Jan 2019 10:41:43 +0100
Subject: [PATCH 0644/1036] FIX: possible NPE in
 DeleteUnloadedForeignKeys.deleteCascade and in initPostTarget (#1601)

---
 .../server/deploy/BeanPropertyAssocMany.java   |  4 +++-
 .../persist/DeleteUnloadedForeignKeys.java     | 18 ++++++++++--------
 .../java/org/tests/family/TestInheritance.java |  8 ++++++++
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index fdb38088c..ad296978c 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -204,7 +204,9 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   public void initialisePostTarget() {
     if (childMasterProperty != null) {
       BeanProperty masterId = childMasterProperty.getTargetDescriptor().getIdProperty();
-      childMasterIdProperty = childMasterProperty.getName() + "." + masterId.getName();
+      if (masterId != null) { // in docstore only, the master-id may be not available
+        childMasterIdProperty = childMasterProperty.getName() + "." + masterId.getName();
+      }
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java b/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java
index 2c5c70073..afb91da5f 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java
@@ -84,15 +84,17 @@ class DeleteUnloadedForeignKeys {
    */
   void deleteCascade() {
 
-    for (BeanPropertyAssocOne<?> prop : propList) {
-      Object detailBean = prop.getValue(beanWithForeignKeys);
+    if (beanWithForeignKeys != null) {
+      for (BeanPropertyAssocOne<?> prop : propList) {
+        Object detailBean = prop.getValue(beanWithForeignKeys);
 
-      // if bean exists with a unique id then delete it
-      if (detailBean != null && prop.hasId((EntityBean) detailBean)) {
-        if (deletePermanent) {
-          server.deletePermanent(detailBean, request.getTransaction());
-        } else {
-          server.delete(detailBean, request.getTransaction());
+        // if bean exists with a unique id then delete it
+        if (detailBean != null && prop.hasId((EntityBean) detailBean)) {
+          if (deletePermanent) {
+            server.deletePermanent(detailBean, request.getTransaction());
+          } else {
+            server.delete(detailBean, request.getTransaction());
+          }
         }
       }
     }
diff --git a/src/test/java/org/tests/family/TestInheritance.java b/src/test/java/org/tests/family/TestInheritance.java
index de4ea30d5..a24127737 100644
--- a/src/test/java/org/tests/family/TestInheritance.java
+++ b/src/test/java/org/tests/family/TestInheritance.java
@@ -1,6 +1,7 @@
 package org.tests.family;
 
 import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
 import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
@@ -218,6 +219,10 @@ public class TestInheritance extends BaseTestCase {
     assertEquals("Foo", grandparent1.getFamilyName());
     assertEquals("Munich", grandparent1.getAddress());
     assertEquals(1, grandparent1.getEffectiveBean().getId().intValue());
+
+    Ebean.find(ChildPerson.class).delete();
+    Ebean.find(GrandParentPerson.class).delete();
+    Ebean.find(EBasic.class).delete();
   }
 
   @Test
@@ -260,5 +265,8 @@ public class TestInheritance extends BaseTestCase {
     count = server().find(GrandParentPerson.class).where().eq("basicSameName.description", "Description A").findCount();
     assertEquals(1, count);
 
+    Ebean.find(ChildPerson.class).delete();
+    Ebean.find(GrandParentPerson.class).delete();
+    Ebean.find(EBasic.class).delete();
   }
 }

From 903b0a3929bc819ae89d22da477843e126ab8b45 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 8 Jan 2019 23:03:59 +1300
Subject: [PATCH 0645/1036] [maven-release-plugin] prepare release
 ebean-11.31.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2d67e08db..226cb467c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.31.2-SNAPSHOT</version>
+  <version>11.31.2</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.31.2</tag>
   </scm>
 
   <profiles>

From 5e22079366240f5a0ea1e70ec5b2c98040ad6a54 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 8 Jan 2019 23:04:14 +1300
Subject: [PATCH 0646/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 226cb467c..d95f49610 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.31.2</version>
+  <version>11.31.3-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.31.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 854471244838c57aa17dad0091777bf829a4ca59 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 9 Jan 2019 12:29:28 +1300
Subject: [PATCH 0647/1036] #1606 - Bean with Inheritance and OneToMany with
 JoinTable and cascade ... doesn't cascade save on all bean types

---
 .../server/persist/SaveManyBeans.java         |  3 +
 .../TestOneToManyJoinTableInheritance.java    | 55 +++++++++++++++++++
 .../o2m/jointable/inheritance/ClassA.java     |  7 +++
 .../o2m/jointable/inheritance/ClassB.java     |  7 +++
 .../o2m/jointable/inheritance/ClassSuper.java | 26 +++++++++
 5 files changed, 98 insertions(+)
 create mode 100644 src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java
 create mode 100644 src/test/java/org/tests/o2m/jointable/inheritance/ClassA.java
 create mode 100644 src/test/java/org/tests/o2m/jointable/inheritance/ClassB.java
 create mode 100644 src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java

diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
index 8190e0726..7722d2a39 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
@@ -84,6 +84,9 @@ class SaveManyBeans extends SaveManyBase {
   }
 
   private boolean isSaveIntersection() {
+    if (!many.isManyToMany()) {
+      return true;
+    }
     return transaction.isSaveAssocManyIntersection(many.getIntersectionTableJoin().getTable(), many.getBeanDescriptor().getName());
   }
 
diff --git a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java
new file mode 100644
index 000000000..5468434bc
--- /dev/null
+++ b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java
@@ -0,0 +1,55 @@
+package org.tests.o2m.jointable;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+import org.tests.o2m.jointable.inheritance.ClassA;
+import org.tests.o2m.jointable.inheritance.ClassB;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestOneToManyJoinTableInheritance extends BaseTestCase {
+
+  private JtMonkey m0 = new JtMonkey("Sim");
+  private JtMonkey m1 = new JtMonkey("Tim");
+  private JtMonkey m2 = new JtMonkey("Uim");
+
+  private ClassA classA = new ClassA();
+  private ClassB classB = new ClassB();
+
+  @Test
+  public void testSave() {
+
+    classA.getMonkeys().add(m0);
+    classA.getMonkeys().add(m1);
+    classB.getMonkeys().add(m2);
+
+    LoggedSqlCollector.start();
+
+    Ebean.saveAll(Arrays.asList(classA, classB));
+
+    List<String> sql = LoggedSqlCollector.current();
+
+    assertThat(sql).hasSize(7);
+    assertThat(sql.get(0)).contains("insert into class_super ");
+    assertThat(sql.get(1)).contains("insert into monkey ");
+    assertThat(sql.get(2)).contains("insert into monkey ");
+    assertThat(sql.get(3)).contains("insert into class_super_monkey ");
+    assertThat(sql.get(4)).contains("insert into class_super ");
+    assertThat(sql.get(5)).contains("insert into monkey ");
+    assertThat(sql.get(6)).contains("insert into class_super_monkey ");
+
+    ClassA dbA = Ebean.find(ClassA.class, 1);
+    ClassB dbB = Ebean.find(ClassB.class, 2);
+
+    assertThat(dbA.getMonkeys()).hasSize(2);
+    assertThat(dbB.getMonkeys()).hasSize(1);
+    assertThat(dbA.getMonkeys().get(0).name).isEqualTo("Sim");
+    assertThat(dbA.getMonkeys().get(1).name).isEqualTo("Tim");
+    assertThat(dbB.getMonkeys().get(0).name).isEqualTo("Uim");
+  }
+}
diff --git a/src/test/java/org/tests/o2m/jointable/inheritance/ClassA.java b/src/test/java/org/tests/o2m/jointable/inheritance/ClassA.java
new file mode 100644
index 000000000..14644d200
--- /dev/null
+++ b/src/test/java/org/tests/o2m/jointable/inheritance/ClassA.java
@@ -0,0 +1,7 @@
+package org.tests.o2m.jointable.inheritance;
+
+import javax.persistence.Entity;
+
+@Entity
+public class ClassA extends ClassSuper {
+}
diff --git a/src/test/java/org/tests/o2m/jointable/inheritance/ClassB.java b/src/test/java/org/tests/o2m/jointable/inheritance/ClassB.java
new file mode 100644
index 000000000..305b33999
--- /dev/null
+++ b/src/test/java/org/tests/o2m/jointable/inheritance/ClassB.java
@@ -0,0 +1,7 @@
+package org.tests.o2m.jointable.inheritance;
+
+import javax.persistence.Entity;
+
+@Entity
+public class ClassB extends ClassSuper {
+}
diff --git a/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java b/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java
new file mode 100644
index 000000000..08d3bbf54
--- /dev/null
+++ b/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java
@@ -0,0 +1,26 @@
+package org.tests.o2m.jointable.inheritance;
+
+import org.tests.o2m.jointable.JtMonkey;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.JoinTable;
+import javax.persistence.OneToMany;
+import java.util.List;
+
+@Inheritance
+@Entity
+public abstract class ClassSuper {
+  @Id
+  long sid;
+
+  @JoinTable
+  @OneToMany(cascade = CascadeType.ALL)
+  private List<JtMonkey> monkeys;
+
+  public List<JtMonkey> getMonkeys() {
+    return monkeys;
+  }
+}

From 1c34c09f3c28a853151d57d2acf0b916b6760bd9 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 9 Jan 2019 12:37:13 +1300
Subject: [PATCH 0648/1036] #1606 - Bean with Inheritance and OneToMany with
 JoinTable and cascade ... doesn't cascade save on all bean types

---
 .../java/io/ebeaninternal/server/persist/SaveManyBeans.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
index 7722d2a39..6d2b5fd3b 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
@@ -87,7 +87,7 @@ class SaveManyBeans extends SaveManyBase {
     if (!many.isManyToMany()) {
       return true;
     }
-    return transaction.isSaveAssocManyIntersection(many.getIntersectionTableJoin().getTable(), many.getBeanDescriptor().getName());
+    return transaction.isSaveAssocManyIntersection(many.getIntersectionTableJoin().getTable(), many.getBeanDescriptor().rootName());
   }
 
   private boolean isModifyListenMode() {

From cc58fc81954ceae74c16d346c20509e1735ae7fe Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 9 Jan 2019 12:42:48 +1300
Subject: [PATCH 0649/1036] [maven-release-plugin] prepare release
 ebean-11.31.3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d95f49610..b6420112f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.31.3-SNAPSHOT</version>
+  <version>11.31.3</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.31.3</tag>
   </scm>
 
   <profiles>

From ab3e6ccbf71a97afa16297f31cf4ba34d3ec548f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 9 Jan 2019 12:43:01 +1300
Subject: [PATCH 0650/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b6420112f..bbf6f7b9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.31.3</version>
+  <version>11.31.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.31.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 8a34d6050b12c3def4b4b49c28165e1913ef4cfe Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 9 Jan 2019 13:59:53 +1300
Subject: [PATCH 0651/1036] #1607 - ENH: Add query.exists() query ... as a
 convenience for "does a row exist" check

---
 src/main/java/io/ebean/ExpressionList.java    | 26 +++++++++++++++++
 src/main/java/io/ebean/ExtendedServer.java    | 29 +++++++++++++++++++
 src/main/java/io/ebean/Query.java             | 26 +++++++++++++++++
 .../server/core/DefaultServer.java            | 19 +++++++++---
 .../expression/DefaultExpressionList.java     |  5 ++++
 .../expression/FilterExpressionList.java      |  5 ++++
 .../server/expression/JunctionExpression.java |  5 ++++
 .../server/querydefn/DefaultOrmQuery.java     |  5 ++++
 .../ebeaninternal/api/TDSpiEbeanServer.java   |  5 ++++
 .../java/org/tests/query/TestQueryExists.java | 28 +++++++++++++++---
 10 files changed, 145 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/ebean/ExpressionList.java b/src/main/java/io/ebean/ExpressionList.java
index a001bcfdb..a7d655fc5 100644
--- a/src/main/java/io/ebean/ExpressionList.java
+++ b/src/main/java/io/ebean/ExpressionList.java
@@ -226,6 +226,32 @@ public interface ExpressionList<T> {
    */
   int update(Transaction transaction);
 
+  /**
+   * Execute the query returning true if a row is found.
+   * <p>
+   * The query is executed using max rows of 1 and will only select the id property.
+   * This method is really just a convenient way to optimise a query to perform a
+   * 'does a row exist in the db' check.
+   * </p>
+   *
+   * <h2>Example:</h2>
+   * <pre>{@code
+   *
+   *   boolean userExists = query().where().eq("email", "rob@foo.com").exists();
+   *
+   * }</pre>
+   *
+   * <h2>Example using a query bean:</h2>
+   * <pre>{@code
+   *
+   *   boolean userExists = new QContact().email.equalTo("rob@foo.com").exists();
+   *
+   * }</pre>
+   *
+   * @return True if the query finds a matching row in the database
+   */
+  boolean exists();
+
   /**
    * Execute the query iterating over the results.
    *
diff --git a/src/main/java/io/ebean/ExtendedServer.java b/src/main/java/io/ebean/ExtendedServer.java
index 0b159f877..deb3582f2 100644
--- a/src/main/java/io/ebean/ExtendedServer.java
+++ b/src/main/java/io/ebean/ExtendedServer.java
@@ -1,5 +1,8 @@
 package io.ebean;
 
+import io.ebeaninternal.api.SpiQuery;
+import io.ebeaninternal.api.SpiTransaction;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.persistence.NonUniqueResultException;
@@ -42,6 +45,32 @@ public interface ExtendedServer {
    */
   void setClock(Clock clock);
 
+  /**
+   * Execute the query returning true if a row is found.
+   * <p>
+   * The query is executed using max rows of 1 and will only select the id property.
+   * This method is really just a convenient way to optimise a query to perform a
+   * 'does a row exist in the db' check.
+   * </p>
+   *
+   * <h2>Example:</h2>
+   * <pre>{@code
+   *
+   *   boolean userExists = query().where().eq("email", "rob@foo.com").exists();
+   *
+   * }</pre>
+   *
+   * <h2>Example using a query bean:</h2>
+   * <pre>{@code
+   *
+   *   boolean userExists = new QContact().email.equalTo("rob@foo.com").exists();
+   *
+   * }</pre>
+   *
+   * @return True if the query finds a matching row in the database
+   */
+  <T> boolean exists(SpiQuery<?> ormQuery, SpiTransaction transaction);
+
   /**
    * Return the number of 'top level' or 'root' entities this query should return.
    *
diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index 601e3a889..4f0fab7de 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -868,6 +868,32 @@ public interface Query<T> {
    */
   boolean isCountDistinct();
 
+  /**
+   * Execute the query returning true if a row is found.
+   * <p>
+   * The query is executed using max rows of 1 and will only select the id property.
+   * This method is really just a convenient way to optimise a query to perform a
+   * 'does a row exist in the db' check.
+   * </p>
+   *
+   * <h2>Example:</h2>
+   * <pre>{@code
+   *
+   *   boolean userExists = query().where().eq("email", "rob@foo.com").exists();
+   *
+   * }</pre>
+   *
+   * <h2>Example using a query bean:</h2>
+   * <pre>{@code
+   *
+   *   boolean userExists = new QContact().email.equalTo("rob@foo.com").exists();
+   *
+   * }</pre>
+   *
+   * @return True if the query finds a matching row in the database
+   */
+  boolean exists();
+
   /**
    * Execute the query returning either a single bean or null (if no matching
    * bean is found).
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 5b9e2893c..77f0e7d0d 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -1363,6 +1363,21 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return !ids.isEmpty();
   }
 
+  @Override
+  public <T> boolean exists(SpiQuery<?> ormQuery, SpiTransaction transaction) {
+
+    ormQuery.setMaxRows(1);
+    SpiOrmQueryRequest<?> request = createQueryRequest(Type.ID_LIST, ormQuery, transaction);
+    try {
+      request.initTransIfRequired();
+      List<Object> ids = request.findIds();
+      return !ids.isEmpty();
+
+    } finally {
+      request.endTransIfRequired();
+    }
+  }
+
   @Override
   public <A, T> List<A> findIds(Query<T> query, Transaction t) {
 
@@ -1444,10 +1459,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return queryFuture;
   }
 
-  public <T> FutureRowCount<T> findFutureRowCount(Query<T> q, Transaction t) {
-    return findFutureCount(q, t);
-  }
-
   @Override
   public <T> FutureIds<T> findFutureIds(Query<T> query, Transaction t) {
 
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 85a8ffb26..4d4d6c432 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -443,6 +443,11 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return query.findSingleAttributeList();
   }
 
+  @Override
+  public boolean exists() {
+    return query.exists();
+  }
+
   @Override
   public T findOne() {
     return query.findOne();
diff --git a/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java
index a6578ed01..ffaa52702 100644
--- a/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java
@@ -99,6 +99,11 @@ public class FilterExpressionList<T> extends DefaultExpressionList<T> {
     return rootQuery.findOneOrEmpty();
   }
 
+  @Override
+  public boolean exists() {
+    return rootQuery.exists();
+  }
+
   @Override
   public ExpressionList<T> having() {
     throw new PersistenceException(notAllowedMessage);
diff --git a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index e1c5a5a79..cd74c635d 100644
--- a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -375,6 +375,11 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.apply(fetchPath);
   }
 
+  @Override
+  public boolean exists() {
+    return exprList.exists();
+  }
+
   @Override
   public FutureIds<T> findFutureIds() {
     return exprList.findFutureIds();
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 4b4b906dd..07608ff51 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1398,6 +1398,11 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return server.findIds(this, null);
   }
 
+  @Override
+  public boolean exists() {
+    return server.exists(this, null);
+  }
+
   @Override
   public int findCount() {
     // a copy of this query is made in the server
diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index afa192641..2a7026e04 100644
--- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -632,6 +632,11 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
     return false;
   }
 
+  @Override
+  public <T> boolean exists(SpiQuery<?> ormQuery, SpiTransaction transaction) {
+    return false;
+  }
+
   @Override
   public <T> T find(Class<T> beanType, Object uid) {
     return null;
diff --git a/src/test/java/org/tests/query/TestQueryExists.java b/src/test/java/org/tests/query/TestQueryExists.java
index ea0b19298..84aac4fb6 100644
--- a/src/test/java/org/tests/query/TestQueryExists.java
+++ b/src/test/java/org/tests/query/TestQueryExists.java
@@ -3,11 +3,10 @@ package org.tests.query;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Assert;
-import org.junit.Test;
 
 import java.util.List;
 
@@ -15,6 +14,27 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestQueryExists extends BaseTestCase {
 
+  @Test
+  public void testExistsBoolean_basic() {
+
+    ResetBasicData.reset();
+
+    Query<Order> query = Ebean.find(Order.class)
+      .where().gt("id", 1)
+      .query();
+
+    boolean check = query.exists();
+    assertThat(check).isTrue();
+
+    String sql = sqlOf(query);
+    if (isH2() || isPostgres()) {
+      assertThat(sql).contains("select t0.id from o_order t0 where t0.id > ?  limit 1");
+    }
+
+    assertThat(Ebean.find(Order.class).where().gt("id", 1).exists()).isTrue();
+    assertThat(Ebean.find(Order.class).where().or().gt("id", 1).isNull("shipDate").exists()).isTrue();
+  }
+
   @Test
   public void testExists_orders_onOneToMany() {
 
@@ -73,7 +93,7 @@ public class TestQueryExists extends BaseTestCase {
     query.findList();
     String sql = query.getGeneratedSql();
 
-    Assert.assertTrue(sql.indexOf("exists (") > 0);
+    assertThat(sql).contains("exists (");
   }
 
   @Test
@@ -86,6 +106,6 @@ public class TestQueryExists extends BaseTestCase {
     query.findList();
     String sql = query.getGeneratedSql();
 
-    Assert.assertTrue(sql.indexOf("not exists (") > 0);
+    assertThat(sql).contains("not exists (");
   }
 }

From 93b9cbf9acea2b59a669d300bdf6f16684c22b03 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 9 Jan 2019 14:01:25 +1300
Subject: [PATCH 0652/1036] bump to 11.32.1-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bbf6f7b9a..c48f43a7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.31.4-SNAPSHOT</version>
+  <version>11.32.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>

From 5fe532c39342a9d7415e2cdf883e5a52ecf91b82 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Wed, 9 Jan 2019 04:17:11 +0100
Subject: [PATCH 0653/1036] Refactor: relpaced system-property
 "ebean.ignoreExtraDdl" with serverConfig flag (#1597)

---
 .../java/io/ebean/config/ServerConfig.java    | 20 +++++++++++++++++++
 .../dbmigration/DdlGenerator.java             |  8 ++++----
 ...nServerFactory_ServerConfigStart_Test.java |  3 +--
 .../ebean/event/BeanFindControllerTest.java   |  6 ++----
 .../event/BeanPersistControllerTest.java      |  3 +--
 .../java/io/ebean/event/BeanPostLoadTest.java |  3 +--
 .../build/ModelBuild_compoundKeyTest.java     |  3 +--
 .../ModelBuild_explicitSequencesTest.java     |  3 +--
 .../deploy/BeanDescriptor_registerTest.java   |  3 +--
 .../partition/MultiTenantPartitionTest.java   |  2 +-
 .../java/org/tests/basic/MainDbBoolean.java   |  6 ++----
 .../org/tests/changelog/TestChangeLog.java    |  4 ++--
 .../TestPersistenceContextServerConfig.java   |  2 +-
 .../org/tests/readaudit/TestReadAudit.java    |  4 ++--
 .../transaction/TestAutoCommitDataSource.java |  4 ++--
 .../TestExplicitTransactionMode.java          |  5 +----
 16 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index a4b6a5371..9979057d0 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -252,6 +252,8 @@ public class ServerConfig {
 
   private boolean ddlRun;
 
+  private boolean ddlExtra = true;
+
   private boolean ddlCreateOnly;
 
   private String ddlInitSql;
@@ -2116,6 +2118,16 @@ public class ServerConfig {
     this.ddlRun = ddlRun;
   }
 
+  /**
+   * Set to false if you not want to run the extra-ddl.xml scripts. (default = true)
+   * <p>
+   * Typically we want this on when we are running tests.
+   */
+  public void setDdlExtra(boolean ddlExtra) {
+    this.ddlExtra = ddlExtra;
+  }
+
+
   /**
    * Return true if the "drop all ddl" should be skipped.
    * <p>
@@ -2186,6 +2198,13 @@ public class ServerConfig {
     return ddlRun;
   }
 
+  /**
+   * Return true, if extra-ddl.xml should be executed.
+   */
+  public boolean isDdlExtra() {
+    return ddlExtra;
+  }
+
   /**
    * Return true if the class path search should be disabled.
    */
@@ -2962,6 +2981,7 @@ public class ServerConfig {
 
     ddlGenerate = p.getBoolean("ddl.generate", ddlGenerate);
     ddlRun = p.getBoolean("ddl.run", ddlRun);
+    ddlExtra = p.getBoolean("ddl.extra", ddlExtra);
     ddlCreateOnly = p.getBoolean("ddl.createOnly", ddlCreateOnly);
     ddlInitSql = p.get("ddl.initSql", ddlInitSql);
     ddlSeedSql = p.get("ddl.seedSql", ddlSeedSql);
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
index fa0b662cf..64af8454f 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
@@ -40,6 +40,7 @@ public class DdlGenerator {
 
   private final boolean generateDdl;
   private final boolean runDdl;
+  private final boolean extraDdl;
   private final boolean createOnly;
   private final boolean jaxbPresent;
   private final boolean ddlCommitOnCreateIndex;
@@ -54,6 +55,7 @@ public class DdlGenerator {
     this.server = server;
     this.jaxbPresent = serverConfig.getClassLoadConfig().isJavaxJAXBPresent();
     this.generateDdl = serverConfig.isDdlGenerate();
+    this.extraDdl = serverConfig.isDdlExtra();
     this.createOnly = serverConfig.isDdlCreateOnly();
     this.dbSchema = serverConfig.getDbSchema();
     if (!serverConfig.getTenantMode().isDdlEnabled() && serverConfig.isDdlRun()) {
@@ -166,8 +168,7 @@ public class DdlGenerator {
 
   protected void runDropSql(Connection connection) throws IOException {
     if (!createOnly) {
-      String ignoreExtraDdl = System.getProperty("ebean.ignoreExtraDdl");
-      if (!"true".equalsIgnoreCase(ignoreExtraDdl) && jaxbPresent) {
+      if (extraDdl && jaxbPresent) {
         String extraApply = ExtraDdlXmlReader.buildExtra(server.getDatabasePlatform().getName(), true);
         if (extraApply != null) {
           runScript(connection, false, extraApply, "extra-ddl");
@@ -187,8 +188,7 @@ public class DdlGenerator {
     }
     runScript(connection, false, createAllContent, getCreateFileName());
 
-    String ignoreExtraDdl = System.getProperty("ebean.ignoreExtraDdl");
-    if (!"true".equalsIgnoreCase(ignoreExtraDdl) && jaxbPresent) {
+    if (extraDdl && jaxbPresent) {
       if (currentModel.isTablePartitioning()) {
         String extraPartitioning = ExtraDdlXmlReader.buildPartitioning(server.getDatabasePlatform().getName());
         if (extraPartitioning != null && !extraPartitioning.isEmpty()) {
diff --git a/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java b/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java
index b3fcc028d..8cc14eb2c 100644
--- a/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java
+++ b/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java
@@ -14,14 +14,13 @@ public class EbeanServerFactory_ServerConfigStart_Test {
   @Test
   public void test() throws InterruptedException {
 
-    System.setProperty("ebean.ignoreExtraDdl", "true");
-
     ServerConfig config = new ServerConfig();
     config.setName("h2");
     config.loadFromProperties();
     config.setName("h2other");
     config.setDdlGenerate(false);
     config.setDdlRun(false);
+    config.setDdlExtra(false);
     config.setDefaultServer(false);
     config.setRegister(false);
 
diff --git a/src/test/java/io/ebean/event/BeanFindControllerTest.java b/src/test/java/io/ebean/event/BeanFindControllerTest.java
index c47d5edca..6592a0cfd 100644
--- a/src/test/java/io/ebean/event/BeanFindControllerTest.java
+++ b/src/test/java/io/ebean/event/BeanFindControllerTest.java
@@ -23,14 +23,14 @@ public class BeanFindControllerTest extends BaseTestCase {
   @Test
   public void test() {
 
-    System.setProperty("ebean.ignoreExtraDdl", "true");
-
     ServerConfig config = new ServerConfig();
 
     config.setName("h2otherfind");
     config.loadFromProperties();
     config.setDdlGenerate(true);
     config.setDdlRun(true);
+    config.setDdlExtra(false);
+
     config.setRegister(false);
     config.setDefaultServer(false);
     config.add(new ModUuidGenerator());
@@ -42,8 +42,6 @@ public class BeanFindControllerTest extends BaseTestCase {
 
     EbeanServer ebeanServer = EbeanServerFactory.create(config);
 
-    System.clearProperty("ebean.ignoreExtraDdl");
-
     assertFalse(findController.calledInterceptFind);
     ebeanServer.find(EBasic.class, 42);
     assertTrue(findController.calledInterceptFind);
diff --git a/src/test/java/io/ebean/event/BeanPersistControllerTest.java b/src/test/java/io/ebean/event/BeanPersistControllerTest.java
index e63f77bc3..89da158a8 100644
--- a/src/test/java/io/ebean/event/BeanPersistControllerTest.java
+++ b/src/test/java/io/ebean/event/BeanPersistControllerTest.java
@@ -113,13 +113,12 @@ public class BeanPersistControllerTest {
 
   private EbeanServer getEbeanServer(PersistAdapter persistAdapter) {
 
-    System.setProperty("ebean.ignoreExtraDdl", "true");
     ServerConfig config = new ServerConfig();
-
     config.setName("h2ebasicver");
     config.loadFromProperties();
     config.setDdlGenerate(true);
     config.setDdlRun(true);
+    config.setDdlExtra(false);
 
     config.setRegister(false);
     config.setDefaultServer(false);
diff --git a/src/test/java/io/ebean/event/BeanPostLoadTest.java b/src/test/java/io/ebean/event/BeanPostLoadTest.java
index 7079a9d10..e2eea0c24 100644
--- a/src/test/java/io/ebean/event/BeanPostLoadTest.java
+++ b/src/test/java/io/ebean/event/BeanPostLoadTest.java
@@ -46,14 +46,13 @@ public class BeanPostLoadTest extends BaseTestCase {
 
   private EbeanServer getEbeanServer() {
 
-    System.setProperty("ebean.ignoreExtraDdl", "true");
-
     ServerConfig config = new ServerConfig();
 
     config.setName("h2ebasicver");
     config.loadFromProperties();
     config.setDdlGenerate(true);
     config.setDdlRun(true);
+    config.setDdlExtra(false);
 
     config.setRegister(false);
     config.setDefaultServer(false);
diff --git a/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compoundKeyTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compoundKeyTest.java
index b62dae809..437d8e6ac 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compoundKeyTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compoundKeyTest.java
@@ -25,14 +25,13 @@ public class ModelBuild_compoundKeyTest extends BaseTestCase {
 
   private SpiEbeanServer getServer() {
 
-    System.setProperty("ebean.ignoreExtraDdl", "true");
-
     ServerConfig config = new ServerConfig();
     config.setName("h2");
     config.loadFromProperties();
     config.setName("h2other");
     config.setDdlGenerate(false);
     config.setDdlRun(false);
+    config.setDdlExtra(false);
     config.setDefaultServer(false);
     config.setRegister(false);
 
diff --git a/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_explicitSequencesTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_explicitSequencesTest.java
index 6e699e4de..c2db773ee 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_explicitSequencesTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_explicitSequencesTest.java
@@ -19,14 +19,13 @@ public class ModelBuild_explicitSequencesTest extends BaseTestCase {
 
   private SpiEbeanServer getServer(boolean postgres) {
 
-    System.setProperty("ebean.ignoreExtraDdl", "true");
-
     ServerConfig config = new ServerConfig();
     config.setName("h2");
     config.loadFromProperties();
     config.setName("h2other");
     config.setDdlGenerate(false);
     config.setDdlRun(false);
+    config.setDdlExtra(false);
     config.setDefaultServer(false);
     config.setRegister(false);
 
diff --git a/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java b/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java
index 04c3641d6..8b65f5dab 100644
--- a/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java
+++ b/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java
@@ -16,12 +16,11 @@ public class BeanDescriptor_registerTest {
   @Test
   public void testRegisterDeregister() throws Exception {
 
-    System.setProperty("ebean.ignoreExtraDdl", "true");
-
     ServerConfig config = new ServerConfig();
 
     config.setName("h2other");
     config.loadFromProperties();
+    config.setDdlExtra(false);
     config.setRegister(false);
     config.setDefaultServer(false);
     config.getClasses().add(EBasic.class);
diff --git a/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java b/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java
index 9104c0179..eeb43d6ac 100644
--- a/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java
+++ b/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java
@@ -103,7 +103,6 @@ public class MultiTenantPartitionTest {
 
 
   private static EbeanServer init() {
-    System.setProperty("ebean.ignoreExtraDdl", "true");
 
     ServerConfig config = new ServerConfig();
 
@@ -111,6 +110,7 @@ public class MultiTenantPartitionTest {
     config.loadFromProperties();
     config.setDdlGenerate(true);
     config.setDdlRun(true);
+    config.setDdlExtra(false);
     config.setRegister(false);
     config.setDefaultServer(false);
     config.setCurrentTenantProvider(new CurrentTenant());
diff --git a/src/test/java/org/tests/basic/MainDbBoolean.java b/src/test/java/org/tests/basic/MainDbBoolean.java
index b8d6c6f2c..14c900d4e 100644
--- a/src/test/java/org/tests/basic/MainDbBoolean.java
+++ b/src/test/java/org/tests/basic/MainDbBoolean.java
@@ -36,10 +36,9 @@ public class MainDbBoolean {
    */
   private EbeanServer createOracleEbeanServer() {
 
-    System.setProperty("ebean.ignoreExtraDdl", "true");
-
     ServerConfig c = new ServerConfig();
     c.setName("ora");
+    c.setDdlExtra(false);
 
     // requires oracle driver in class path
     DataSourceConfig oraDb = new DataSourceConfig();
@@ -72,10 +71,9 @@ public class MainDbBoolean {
 
   private EbeanServer createEbeanServer() {
 
-    System.setProperty("ebean.ignoreExtraDdl", "true");
-
     ServerConfig c = new ServerConfig();
     c.setName("pgtest");
+    c.setDdlExtra(false);
 
     // requires postgres driver in class path
     DataSourceConfig postgresDb = new DataSourceConfig();
diff --git a/src/test/java/org/tests/changelog/TestChangeLog.java b/src/test/java/org/tests/changelog/TestChangeLog.java
index 3be63f361..68f7a4505 100644
--- a/src/test/java/org/tests/changelog/TestChangeLog.java
+++ b/src/test/java/org/tests/changelog/TestChangeLog.java
@@ -123,14 +123,14 @@ public class TestChangeLog extends BaseTestCase {
 
   private SpiEbeanServer getServer() {
 
-    System.setProperty("ebean.ignoreExtraDdl", "true");
-
     ServerConfig config = new ServerConfig();
     config.setName("h2other");
     config.loadFromProperties();
 
     config.setDdlGenerate(true);
     config.setDdlRun(true);
+    config.setDdlExtra(false);
+
     config.setDefaultServer(false);
     config.setRegister(false);
     config.setChangeLogAsync(false);
diff --git a/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java b/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java
index c235a430a..608bf1317 100644
--- a/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java
+++ b/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java
@@ -32,10 +32,10 @@ public class TestPersistenceContextServerConfig extends BaseTestCase {
 
   static EbeanServer create() {
 
-    System.setProperty("ebean.ignoreExtraDdl", "true");
 
     ServerConfig config = new ServerConfig();
     config.setName("withPCQuery");
+    config.setDdlExtra(false);
 
     Properties properties = new Properties();
     properties.setProperty("datasource.withPCQuery.username", "sa");
diff --git a/src/test/java/org/tests/readaudit/TestReadAudit.java b/src/test/java/org/tests/readaudit/TestReadAudit.java
index d41e7fd13..764478c00 100644
--- a/src/test/java/org/tests/readaudit/TestReadAudit.java
+++ b/src/test/java/org/tests/readaudit/TestReadAudit.java
@@ -306,14 +306,14 @@ public class TestReadAudit extends BaseTestCase {
 
   private SpiEbeanServer getServer() {
 
-    System.setProperty("ebean.ignoreExtraDdl", "true");
-
     ServerConfig config = new ServerConfig();
     config.setName("h2other");
     config.loadFromProperties();
 
     config.setDdlGenerate(true);
     config.setDdlRun(true);
+    config.setDdlExtra(false);
+
     config.setDefaultServer(false);
     config.setRegister(false);
 
diff --git a/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java b/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java
index 577dbc74c..46006426b 100644
--- a/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java
+++ b/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java
@@ -42,8 +42,6 @@ public class TestAutoCommitDataSource extends BaseTestCase {
     assertTrue(connection.getAutoCommit());
     connection.close();
 
-    System.setProperty("ebean.ignoreExtraDdl", "true");
-
     ServerConfig config = new ServerConfig();
     config.setName("h2autocommit");
     config.loadFromProperties();
@@ -55,6 +53,8 @@ public class TestAutoCommitDataSource extends BaseTestCase {
     config.addClass(UTDetail.class);
     config.setDdlGenerate(true);
     config.setDdlRun(true);
+    config.setDdlExtra(false);
+
     config.setAutoCommitMode(true);
 
     EbeanServer ebeanServer = EbeanServerFactory.create(config);
diff --git a/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
index b125ce66f..9777f8139 100644
--- a/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
+++ b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
@@ -42,8 +42,6 @@ public class TestExplicitTransactionMode extends BaseTestCase {
     assertTrue(connection.getAutoCommit());
     connection.close();
 
-    System.setProperty("ebean.ignoreExtraDdl", "true");
-
     ServerConfig config = new ServerConfig();
     config.setName("h2autocommit2");
     config.loadFromProperties();
@@ -56,11 +54,10 @@ public class TestExplicitTransactionMode extends BaseTestCase {
     config.addClass(UTDetail.class);
     config.setDdlGenerate(true);
     config.setDdlRun(true);
+    config.setDdlExtra(false);
 
     EbeanServer ebeanServer = EbeanServerFactory.create(config);
 
-    System.clearProperty("ebean.ignoreExtraDdl");
-
     Query<UTMaster> query = ebeanServer.find(UTMaster.class);
     List<UTMaster> details = query.findList();
     assertEquals(0, details.size());

From 3207ae1f08e14e7f0accaebc555274b46af57a3d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 9 Jan 2019 19:05:16 +1300
Subject: [PATCH 0654/1036] No effective change - tidy test

---
 src/test/java/org/tests/query/TestQueryAlias.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/test/java/org/tests/query/TestQueryAlias.java b/src/test/java/org/tests/query/TestQueryAlias.java
index fba7cba1f..de378586c 100644
--- a/src/test/java/org/tests/query/TestQueryAlias.java
+++ b/src/test/java/org/tests/query/TestQueryAlias.java
@@ -3,10 +3,11 @@ package org.tests.query;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import org.junit.Test;
 import org.tests.model.basic.CKeyParent;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Assert;
-import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestQueryAlias extends BaseTestCase {
 
@@ -32,8 +33,8 @@ public class TestQueryAlias extends BaseTestCase {
     // select myt0.one_key c0, myt0.two_key c1, myt0.name c2, myt0.version c3, myt0.assoc_id c4 from ckey_parent myt0
     // where  (myt0.one_key) in (select st0.one_key from ckey_parent st0)
 
-    Assert.assertTrue(sql.contains("ckey_parent myt0"));
-    Assert.assertTrue(sql.contains("(myt0.one_key) in (select st0.one_key from ckey_parent st0)"));
+    assertThat(sql).contains("ckey_parent myt0");
+    assertThat(sql).contains("(myt0.one_key) in (select st0.one_key from ckey_parent st0)");
   }
 
   @Test
@@ -58,8 +59,8 @@ public class TestQueryAlias extends BaseTestCase {
     // select myt0.one_key c0, myt0.two_key c1, myt0.name c2, myt0.version c3, myt0.assoc_id c4 from ckey_parent myt0
     // where  (myt0.one_key) in (select st0.one_key from ckey_parent st0)
 
-    Assert.assertTrue(sql.contains("ckey_parent myt0"));
-    Assert.assertTrue(sql.contains("(myt0.one_key) not in (select st0.one_key from ckey_parent st0)"));
+    assertThat(sql).contains("ckey_parent myt0");
+    assertThat(sql).contains("(myt0.one_key) not in (select st0.one_key from ckey_parent st0)");
   }
 
 }

From cd8c12a9a8f2419e01b5002aaa00053f9cba5458 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 9 Jan 2019 19:13:35 +1300
Subject: [PATCH 0655/1036] #1566 - ENH: Support query.setBaseTable() ... to
 query against dynamic table (ala manual table partitioning)

---
 src/main/java/io/ebean/Query.java             |  9 ++++
 .../java/io/ebeaninternal/api/SpiQuery.java   |  5 ++
 .../server/query/SqlTreeBuilder.java          | 13 +++--
 .../server/query/SqlTreeNodeRoot.java         |  9 ++--
 .../server/querydefn/DefaultOrmQuery.java     | 17 +++++++
 .../org/tests/query/TestQueryBaseTable.java   | 51 +++++++++++++++++++
 6 files changed, 97 insertions(+), 7 deletions(-)
 create mode 100644 src/test/java/org/tests/query/TestQueryBaseTable.java

diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index 4f0fab7de..25e8d2730 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -1596,6 +1596,15 @@ public interface Query<T> {
    */
   Query<T> alias(String alias);
 
+  /**
+   * Set the base table to use for this query.
+   * <p>
+   * Typically this is used when a table has partitioning and we wish to specify a specific
+   * partition/table to query against.
+   * </p>
+   */
+  Query<T> setBaseTable(String baseTable);
+
   /**
    * Return the type of beans being queried.
    */
diff --git a/src/main/java/io/ebeaninternal/api/SpiQuery.java b/src/main/java/io/ebeaninternal/api/SpiQuery.java
index 881cae5e3..e83258486 100644
--- a/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -820,6 +820,11 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
    */
   boolean isCancelled();
 
+  /**
+   * Return the base table to use if user defined on the query.
+   */
+  String getBaseTable();
+
   /**
    * Return root table alias set by {@link #alias(String)} command.
    */
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 00ddc14c5..1c21b2e6f 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -312,7 +312,12 @@ public final class SqlTreeBuilder {
       // Optional many property for lazy loading query
       STreePropertyAssocMany lazyLoadMany = (query == null) ? null : query.getLazyLoadMany();
       boolean withId = !rawNoId && !subQuery && (query == null || query.isWithId());
-      return new SqlTreeNodeRoot(desc, props, myList, withId, includeJoin, lazyLoadMany, temporalMode, disableLazyLoad, sqlDistinct);
+
+      String baseTable = (query == null) ? null : query.getBaseTable();
+      if (baseTable == null) {
+        baseTable = desc.getBaseTable(temporalMode);
+      }
+      return new SqlTreeNodeRoot(desc, props, myList, withId, includeJoin, lazyLoadMany, temporalMode, disableLazyLoad, sqlDistinct, baseTable);
 
     } else if (prop instanceof STreePropertyAssocMany) {
       return new SqlTreeNodeManyRoot(prefix, (STreePropertyAssocMany) prop, props, myList, temporalMode, disableLazyLoad);
@@ -497,9 +502,9 @@ public final class SqlTreeBuilder {
     for (STreePropertyAssocOne propertyAssocOne : desc.propsOne()) {
       //noinspection StatementWithEmptyBody
       if (queryProps != null
-          && queryProps.isIncludedBeanJoin(propertyAssocOne.getName())
-          && propertyAssocOne.hasForeignKey()
-          && !propertyAssocOne.isFormula()) {
+        && queryProps.isIncludedBeanJoin(propertyAssocOne.getName())
+        && propertyAssocOne.hasForeignKey()
+        && !propertyAssocOne.isFormula()) {
         // if it is a joined bean with FK constraint... then don't add the property
         // as it will have its own entire Node in the SqlTree
       } else {
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java
index 2f25bf7e2..78ef22595 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java
@@ -16,15 +16,18 @@ final class SqlTreeNodeRoot extends SqlTreeNodeBean {
 
   private final boolean sqlDistinct;
 
+  private final String baseTable;
+
   /**
    * Specify for SqlSelect to include an Id property or not.
    */
-  SqlTreeNodeRoot(STreeType desc, SqlTreeProperties props, List<SqlTreeNode> myList, boolean withId,
-                  TableJoin includeJoin, STreePropertyAssocMany many, SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad, boolean sqlDistinct) {
+  SqlTreeNodeRoot(STreeType desc, SqlTreeProperties props, List<SqlTreeNode> myList, boolean withId, TableJoin includeJoin,
+                  STreePropertyAssocMany many, SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad, boolean sqlDistinct, String baseTable) {
 
     super(desc, props, myList, withId, many, temporalMode, disableLazyLoad);
     this.includeJoin = includeJoin;
     this.sqlDistinct = sqlDistinct;
+    this.baseTable = baseTable;
   }
 
   @Override
@@ -73,7 +76,7 @@ final class SqlTreeNodeRoot extends SqlTreeNodeBean {
   @Override
   public SqlJoinType appendFromBaseTable(DbSqlContext ctx, SqlJoinType joinType) {
 
-    ctx.append(desc.getBaseTable(temporalMode));
+    ctx.append(baseTable);
     ctx.append(" ").append(baseTableAlias);
     ctx.appendFromForUpdate();
 
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 07608ff51..0a461b743 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -235,6 +235,8 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
    */
   private String rootTableAlias;
 
+  private String baseTable;
+
   /**
    * The node of the bean or collection that fired lazy loading. Not null if profiling is on and
    * this query is for lazy loading. Used to hook back a lazy loading query to the "original" query
@@ -764,6 +766,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     copy.profilingListener = profilingListener;
     copy.profileLocation = profileLocation;
 
+    copy.baseTable = baseTable;
     copy.rootTableAlias = rootTableAlias;
     copy.distinct = distinct;
     copy.timeout = timeout;
@@ -1082,6 +1085,9 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     if (disableLazyLoading) {
       sb.append(",disLazy:");
     }
+    if (baseTable != null) {
+      sb.append(",baseTable:").append(baseTable);
+    }
     if (rootTableAlias != null) {
       sb.append(",root:").append(rootTableAlias);
     }
@@ -1858,6 +1864,17 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     }
   }
 
+  @Override
+  public Query<T> setBaseTable(String baseTable) {
+    this.baseTable = baseTable;
+    return this;
+  }
+
+  @Override
+  public String getBaseTable() {
+    return baseTable;
+  }
+
   @Override
   public DefaultOrmQuery<T> alias(String alias) {
     this.rootTableAlias = alias;
diff --git a/src/test/java/org/tests/query/TestQueryBaseTable.java b/src/test/java/org/tests/query/TestQueryBaseTable.java
new file mode 100644
index 000000000..1e5fc13c0
--- /dev/null
+++ b/src/test/java/org/tests/query/TestQueryBaseTable.java
@@ -0,0 +1,51 @@
+package org.tests.query;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.annotation.ForPlatform;
+import io.ebean.annotation.Platform;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestQueryBaseTable extends BaseTestCase {
+
+  @ForPlatform({Platform.H2, Platform.POSTGRES})
+  @Test
+  public void test() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    Customer one = Ebean.find(Customer.class)
+      .setBaseTable("O_CUSTOMER")
+      .where().startsWith("name", "Rob")
+      .findOne();
+
+    Customer two = Ebean.find(Customer.class)
+      .where().startsWith("name", "Rob")
+      .findOne();
+
+    Customer three = Ebean.find(Customer.class)
+      .setBaseTable("O_CUSTOMER")
+      .where().startsWith("name", "Fiona")
+      .findOne();
+
+    assertThat(one.getName()).isEqualTo(two.getName());
+    assertThat(three.getName()).isEqualTo("Fiona");
+
+    List<String> sql = LoggedSqlCollector.stop();
+
+    assertThat(sql).hasSize(3);
+    assertThat(sql.get(0)).contains("from O_CUSTOMER");
+    assertThat(sql.get(1)).contains("from o_customer");
+    assertThat(sql.get(2)).contains("from O_CUSTOMER");
+
+  }
+}

From 31c6d16e736ee689eabd841a2dcd76d2a789a92f Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Wed, 9 Jan 2019 07:15:04 +0100
Subject: [PATCH 0656/1036] A query on inherited beans can be restricted to the
 subtype of one of its children (#1602)

ENH: A query on inherited beans can be restricted to the subtype of one of its children
---
 src/main/java/io/ebean/Query.java             | 10 ++++
 .../server/querydefn/DefaultOrmQuery.java     | 25 +++++++++-
 .../inheritance/TestInheritanceQuery.java     | 47 +++++++++++++++++++
 3 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/org/tests/inheritance/TestInheritanceQuery.java

diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index 25e8d2730..8541a7090 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -1610,6 +1610,16 @@ public interface Query<T> {
    */
   Class<T> getBeanType();
 
+  /**
+   * Sets the inherit type. Must be a subtype of getBeanType
+   */
+  Query<T> setInheritType(Class<? extends T> type);
+
+  /**
+   * Returns the inherit type. This is normally the same as getBeanType() returns as long as no other type is set.
+   */
+  Class<? extends T> getInheritType();
+
   /**
    * Return the type of query being executed.
    */
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 0a461b743..5c8499034 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -47,6 +47,7 @@ import io.ebeaninternal.server.autotune.ProfilingListener;
 import io.ebeaninternal.server.core.SpiOrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
+import io.ebeaninternal.server.deploy.InheritInfo;
 import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.expression.DefaultExpressionList;
 import io.ebeaninternal.server.expression.SimpleExpression;
@@ -79,7 +80,9 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   private final Class<T> beanType;
 
-  private final BeanDescriptor<T> beanDescriptor;
+  private final BeanDescriptor<T> rootBeanDescriptor;
+
+  private BeanDescriptor<T> beanDescriptor;
 
   private final SpiEbeanServer server;
 
@@ -276,6 +279,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   public DefaultOrmQuery(BeanDescriptor<T> desc, SpiEbeanServer server, ExpressionFactory expressionFactory) {
     this.beanDescriptor = desc;
+    this.rootBeanDescriptor = desc;
     this.beanType = desc.getBeanType();
     this.server = server;
     this.orderById = server.getServerConfig().isDefaultOrderById();
@@ -1641,6 +1645,25 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return beanType;
   }
 
+  @Override
+  public Class<? extends T> getInheritType() {
+    return beanDescriptor.getBeanType();
+  }
+
+  @Override
+  public Query<T> setInheritType(Class<? extends T> type) {
+    if (type == beanType) {
+      return this;
+    }
+    InheritInfo inheritInfo = rootBeanDescriptor.getInheritInfo();
+    inheritInfo = inheritInfo == null ? null : inheritInfo.readType(type);
+    if (inheritInfo == null) {
+      throw new IllegalArgumentException("Given type " + type + " is not a subtype of " + beanType);
+    }
+    beanDescriptor = (BeanDescriptor<T>) rootBeanDescriptor.getBeanDescriptor(type);
+    return this;
+  }
+
   @Override
   public String toString() {
     return "Query [" + whereExpressions + "]";
diff --git a/src/test/java/org/tests/inheritance/TestInheritanceQuery.java b/src/test/java/org/tests/inheritance/TestInheritanceQuery.java
new file mode 100644
index 000000000..57b8db445
--- /dev/null
+++ b/src/test/java/org/tests/inheritance/TestInheritanceQuery.java
@@ -0,0 +1,47 @@
+package org.tests.inheritance;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import org.tests.inherit.ChildA;
+import org.tests.inherit.ChildB;
+import org.tests.inherit.Parent;
+import org.junit.Test;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.Query;
+
+public class TestInheritanceQuery extends BaseTestCase {
+
+  @Test
+  public void test() {
+    Parent a = new ChildA(90, "Bean A");
+    Parent b1 = new ChildB(91, "Bean B1");
+    Parent b2 = new ChildB(92, "Bean B2");
+
+    server().save(a);
+    server().save(b1);
+    server().save(b2);
+
+    Query<Parent> query = Ebean.find(Parent.class);
+
+    query.where().in("val",90, 91); // restrict to a & b1
+
+    assertThat(query.findList()).hasSize(2); // a & b1
+
+    Query<Parent> query2 = query.copy();
+    query2.setInheritType(ChildA.class);
+
+    assertThat(query.findList()).hasSize(2);
+    assertThat(query2.findList()).containsExactly(a);
+
+    query2.setInheritType(ChildB.class);
+    assertThat(query2.findList()).containsExactly(b1);
+
+    query2 = Ebean.find(Parent.class).setInheritType(ChildB.class);
+    assertThat(query2.findList()).contains(b1, b2);
+
+    Ebean.delete(a);
+    Ebean.delete(b1);
+    Ebean.delete(b2);
+  }
+}

From 3351882915ce703878b0dfbe13d8ee9c0827bfe5 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 9 Jan 2019 19:20:05 +1300
Subject: [PATCH 0657/1036] #1602 - Adjust test adding sql checking for
 discriminator

---
 .../inheritance/TestInheritanceQuery.java     | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/test/java/org/tests/inheritance/TestInheritanceQuery.java b/src/test/java/org/tests/inheritance/TestInheritanceQuery.java
index 57b8db445..25053cf57 100644
--- a/src/test/java/org/tests/inheritance/TestInheritanceQuery.java
+++ b/src/test/java/org/tests/inheritance/TestInheritanceQuery.java
@@ -1,19 +1,23 @@
 package org.tests.inheritance;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import org.tests.inherit.ChildA;
-import org.tests.inherit.ChildB;
-import org.tests.inherit.Parent;
-import org.junit.Test;
-
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+import org.tests.inherit.ChildA;
+import org.tests.inherit.ChildB;
+import org.tests.inherit.Parent;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestInheritanceQuery extends BaseTestCase {
 
   @Test
   public void test() {
+
     Parent a = new ChildA(90, "Bean A");
     Parent b1 = new ChildB(91, "Bean B1");
     Parent b2 = new ChildB(92, "Bean B2");
@@ -22,16 +26,18 @@ public class TestInheritanceQuery extends BaseTestCase {
     server().save(b1);
     server().save(b2);
 
+
+    LoggedSqlCollector.start();
+
     Query<Parent> query = Ebean.find(Parent.class);
 
-    query.where().in("val",90, 91); // restrict to a & b1
+    query.where().in("val", 90, 91); // restrict to a & b1
 
     assertThat(query.findList()).hasSize(2); // a & b1
 
     Query<Parent> query2 = query.copy();
     query2.setInheritType(ChildA.class);
 
-    assertThat(query.findList()).hasSize(2);
     assertThat(query2.findList()).containsExactly(a);
 
     query2.setInheritType(ChildB.class);
@@ -40,6 +46,12 @@ public class TestInheritanceQuery extends BaseTestCase {
     query2 = Ebean.find(Parent.class).setInheritType(ChildB.class);
     assertThat(query2.findList()).contains(b1, b2);
 
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(4);
+    assertThat(sql.get(1)).contains("where t0.type = 'A'");
+    assertThat(sql.get(2)).contains("where t0.type = 'B'");
+    assertThat(sql.get(3)).contains("where t0.type = 'B'");
+
     Ebean.delete(a);
     Ebean.delete(b1);
     Ebean.delete(b2);

From 2b0669c2ae1bee3a40fda30ee638618d55361f65 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 9 Jan 2019 20:03:26 +1300
Subject: [PATCH 0658/1036] #1594 - Support loading of beans with invalid JSON
 content

Adjust to be per query via query.setAllowLoadErrors() rather than a
global config via ServerConfig.
---
 src/main/java/io/ebean/Query.java             | 21 +++++++++
 .../java/io/ebean/config/ServerConfig.java    | 31 -------------
 .../java/io/ebeaninternal/api/SpiQuery.java   |  4 +-
 .../server/deploy/DbReadContext.java          |  2 +-
 .../DynamicPropertyAggregationFormula.java    |  3 +-
 .../io/ebeaninternal/server/query/CQuery.java |  5 +--
 .../server/query/SqlBeanLoad.java             |  2 +-
 .../server/querydefn/DefaultOrmQuery.java     | 36 ++++++++++-----
 .../java/org/tests/json/TestDbJson_List.java  | 45 ++++++++++++++-----
 src/test/resources/ebean.properties           |  1 -
 10 files changed, 86 insertions(+), 64 deletions(-)

diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index 8541a7090..bd8d59e43 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -372,6 +372,27 @@ public interface Query<T> {
    */
   Query<T> setAutoTune(boolean autoTune);
 
+  /**
+   * Execute the query allowing properties with invalid JSON to be collected and not fail the query.
+   * <pre>{@code
+   *
+   *   // fetch a bean with JSON content
+   *   EBasicJsonList bean= Ebean.find(EBasicJsonList.class)
+   *       .setId(42)
+   *       .setAllowLoadErrors()  // collect errors into bean state if we have invalid JSON
+   *       .findOne();
+   *
+   *
+   *   // get the invalid JSON errors from the bean state
+   *   Map<String, Exception> errors = server().getBeanState(bean).getLoadErrors();
+   *
+   *   // If this map is not empty tell we have invalid JSON
+   *   // and should try and fix the JSON content or inform the user
+   *
+   * }</pre>
+   */
+  Query<T> setAllowLoadErrors();
+
   /**
    * Set the default lazy loading batch size to use.
    * <p>
diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index b2e29d281..9979057d0 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -30,15 +30,9 @@ import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.meta.MetaInfoManager;
 import io.ebean.migration.MigrationRunner;
-import io.ebean.plugin.LoadErrorHandler;
 import io.ebean.util.StringHelper;
 
-import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.time.Clock;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -527,10 +521,6 @@ public class ServerConfig {
    */
   private boolean idGeneratorAutomatic = true;
 
-  private LoadErrorHandler loadErrorHandler = (bean, prop, fullName, e) -> {
-    throw new PersistenceException("Error loading on " + fullName, e);
-  };
-
   /**
    * Construct a Server Configuration for programmatically creating an EbeanServer.
    */
@@ -3016,13 +3006,6 @@ public class ServerConfig {
 
     String mappingsProp = p.get("mappingLocations", null);
     mappingLocations = getSearchList(mappingsProp, mappingLocations);
-
-    if (!p.getBoolean("failOnLoadError", true)) {
-      Logger logger = LoggerFactory.getLogger("io.ebean.SQL");
-      loadErrorHandler = (bean, prop, fullName, e) -> {
-        logger.error("Error loading on {}", fullName, e);
-      };
-    }
   }
 
   private NamingConvention createNamingConvention(PropertiesWrapper properties, NamingConvention namingConvention) {
@@ -3282,20 +3265,6 @@ public class ServerConfig {
     this.idGeneratorAutomatic = idGeneratorAutomatic;
   }
 
-  /**
-   * Returns the load error handler.
-   */
-  public LoadErrorHandler getLoadErrorHandler() {
-    return loadErrorHandler;
-  }
-
-  /**
-   * Sets the loadErrorHandler.
-   */
-  public void setLoadErrorHandler(LoadErrorHandler loadErrorHandler) {
-    this.loadErrorHandler = loadErrorHandler;
-  }
-
   /**
    * Return true if query plan capture is enabled.
    */
diff --git a/src/main/java/io/ebeaninternal/api/SpiQuery.java b/src/main/java/io/ebeaninternal/api/SpiQuery.java
index fc990f6d0..fe431b268 100644
--- a/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -8,7 +8,6 @@ import io.ebean.PersistenceContextScope;
 import io.ebean.ProfileLocation;
 import io.ebean.Query;
 import io.ebean.bean.CallStack;
-import io.ebean.bean.EntityBean;
 import io.ebean.bean.ObjectGraphNode;
 import io.ebean.bean.PersistenceContext;
 import io.ebean.event.readaudit.ReadEvent;
@@ -16,7 +15,6 @@ import io.ebean.plugin.BeanType;
 import io.ebeaninternal.server.autotune.ProfilingListener;
 import io.ebeaninternal.server.core.SpiOrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.query.CancelableQuery;
@@ -855,5 +853,5 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
   /**
    * Handles load errors.
    */
-  void handleLoadError(EntityBean bean, BeanProperty prop, String fullName, Exception e);
+  void handleLoadError(String fullName, Exception e);
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DbReadContext.java b/src/main/java/io/ebeaninternal/server/deploy/DbReadContext.java
index 09e257a93..8f42ad02d 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DbReadContext.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DbReadContext.java
@@ -94,6 +94,6 @@ public interface DbReadContext {
   /**
    * Handles a load error on given property.
    */
-  void handleLoadError(EntityBean bean, BeanProperty prop, String fullName, Exception e);
+  void handleLoadError(String fullName, Exception e);
 
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
index efc45759a..394266489 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
@@ -52,9 +52,8 @@ class DynamicPropertyAggregationFormula extends DynamicPropertyBase {
     Object value;
     try {
       value = scalarType.read(sqlBeanLoad.ctx().getDataReader());
-
     } catch (Exception e) {
-      sqlBeanLoad.ctx().handleLoadError(null, asTarget, fullName, e);
+      sqlBeanLoad.ctx().handleLoadError(fullName, e);
       return;
     }
     if (asTarget != null) {
diff --git a/src/main/java/io/ebeaninternal/server/query/CQuery.java b/src/main/java/io/ebeaninternal/server/query/CQuery.java
index d142e4e1d..6f7645c40 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQuery.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQuery.java
@@ -21,7 +21,6 @@ import io.ebeaninternal.server.core.SpiOrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanCollectionHelp;
 import io.ebeaninternal.server.deploy.BeanCollectionHelpFactory;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.DbReadContext;
 import io.ebeaninternal.server.type.DataBind;
@@ -817,8 +816,8 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
   }
 
   @Override
-  public void handleLoadError(EntityBean bean, BeanProperty prop, String fullName, Exception e) {
-    query.handleLoadError(bean, prop, fullName, e);
+  public void handleLoadError(String fullName, Exception e) {
+    query.handleLoadError(fullName, e);
   }
 
   public Set<String> getDependentTables() {
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java b/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java
index c6557a5e0..56fe4d4cd 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java
@@ -87,7 +87,7 @@ public class SqlBeanLoad {
 
     } catch (Exception e) {
       bean._ebean_getIntercept().setLoadError(prop.getPropertyIndex(), e);
-      ctx.handleLoadError(bean, prop, prop.getFullBeanName(), e);
+      ctx.handleLoadError(prop.getFullBeanName(), e);
       return prop.getValue(bean);
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 09d7d6e75..c113ae3ac 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -25,7 +25,6 @@ import io.ebean.Transaction;
 import io.ebean.UpdateQuery;
 import io.ebean.Version;
 import io.ebean.bean.CallStack;
-import io.ebean.bean.EntityBean;
 import io.ebean.bean.ObjectGraphNode;
 import io.ebean.bean.ObjectGraphOrigin;
 import io.ebean.bean.PersistenceContext;
@@ -47,7 +46,6 @@ import io.ebeaninternal.api.SpiQuerySecondary;
 import io.ebeaninternal.server.autotune.ProfilingListener;
 import io.ebeaninternal.server.core.SpiOrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.InheritInfo;
 import io.ebeaninternal.server.deploy.TableJoin;
@@ -57,6 +55,7 @@ import io.ebeaninternal.server.query.CancelableQuery;
 import io.ebeaninternal.server.query.NativeSqlQueryPlanKey;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
 
+import javax.persistence.PersistenceException;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -141,6 +140,8 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   private String lazyLoadManyPath;
 
+  private boolean allowLoadErrors;
+
   /**
    * Flag set for report/DTO beans when we may choose to explicitly include the Id property.
    */
@@ -329,8 +330,10 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   @Override
   public String profileEventId() {
     switch (mode) {
-      case LAZYLOAD_BEAN: return FIND_ONE_LAZY;
-      case LAZYLOAD_MANY: return FIND_MANY_LAZY;
+      case LAZYLOAD_BEAN:
+        return FIND_ONE_LAZY;
+      case LAZYLOAD_MANY:
+        return FIND_MANY_LAZY;
       default:
         return type.profileEventId();
     }
@@ -343,7 +346,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   @Override
   public Query<T> setProfileId(int profileId) {
-    this.profileId = (short)profileId;
+    this.profileId = (short) profileId;
     return this;
   }
 
@@ -409,6 +412,12 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     this.asOfBaseTable = true;
   }
 
+  @Override
+  public DefaultOrmQuery<T> setAllowLoadErrors() {
+    this.allowLoadErrors = true;
+    return this;
+  }
+
   @Override
   public void incrementAsOfTableCount() {
     asOfTableCount++;
@@ -463,7 +472,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   @Override
   public DefaultOrmQuery<T> setRawSql(RawSql rawSql) {
-    this.rawSql = (SpiRawSql)rawSql;
+    this.rawSql = (SpiRawSql) rawSql;
     return this;
   }
 
@@ -775,6 +784,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     copy.baseTable = baseTable;
     copy.rootTableAlias = rootTableAlias;
     copy.distinct = distinct;
+    copy.allowLoadErrors = allowLoadErrors;
     copy.timeout = timeout;
     copy.mapKey = mapKey;
     copy.id = id;
@@ -1088,6 +1098,9 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     if (distinct) {
       sb.append(",dist:");
     }
+    if (allowLoadErrors) {
+      sb.append(",allowLoadErrors:");
+    }
     if (disableLazyLoading) {
       sb.append(",disLazy:");
     }
@@ -1194,6 +1207,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
       beanDescriptor.appendOrderById(this);
     }
   }
+
   /**
    * Calculate a hash based on the bind values used in the query.
    * <p>
@@ -1278,7 +1292,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   @Override
   public boolean isBeanCacheGet() {
-    return useBeanCache.isGet() && beanDescriptor.isBeanCaching() ;
+    return useBeanCache.isGet() && beanDescriptor.isBeanCaching();
   }
 
   @Override
@@ -1337,7 +1351,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   @Override
   public DefaultOrmQuery<T> select(FetchGroup fetchGroup) {
-    this.detail = ((SpiFetchGroup)fetchGroup).detail();
+    this.detail = ((SpiFetchGroup) fetchGroup).detail();
     return this;
   }
 
@@ -1969,8 +1983,10 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public void handleLoadError(EntityBean bean, BeanProperty prop, String fullName, Exception e) {
-    server.getServerConfig().getLoadErrorHandler().handleLoadError(bean, prop, fullName, e);
+  public void handleLoadError(String fullName, Exception e) {
+    if (!allowLoadErrors) {
+      throw new PersistenceException("Error loading on " + fullName, e);
+    }
   }
 
   @Override
diff --git a/src/test/java/org/tests/json/TestDbJson_List.java b/src/test/java/org/tests/json/TestDbJson_List.java
index 00c7b1820..af4bf86ec 100644
--- a/src/test/java/org/tests/json/TestDbJson_List.java
+++ b/src/test/java/org/tests/json/TestDbJson_List.java
@@ -5,12 +5,12 @@ import io.ebean.Ebean;
 import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.text.TextException;
-
-import org.tests.model.json.EBasicJsonList;
-import org.tests.model.json.PlainBean;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
+import org.tests.model.json.EBasicJsonList;
+import org.tests.model.json.PlainBean;
 
+import javax.persistence.PersistenceException;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -18,7 +18,10 @@ import java.util.Map;
 import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 public class TestDbJson_List extends BaseTestCase {
 
@@ -173,30 +176,48 @@ public class TestDbJson_List extends BaseTestCase {
 
   @ForPlatform(Platform.H2)
   @Test
-  public void find_corrupt_json() {
-
+  public void find_corrupt_json_using_setAllowLoadErrors() {
 
     EBasicJsonList bean = new EBasicJsonList();
 
     PlainBean plainBean = new PlainBean();
     plainBean.setName("Blubb");
-    bean.getBeanMap().put("bla", plainBean );
+    bean.getBeanMap().put("bla", plainBean);
 
     Ebean.save(bean);
 
+    // set some invalid JSON content into DB
     Ebean.update(EBasicJsonList.class)
-    .set("beanMap", "blabla")
-    .where().eq("id", bean.getId())
-    .update();
+      .set("beanMap", "blabla")
+      .where().eq("id", bean.getId())
+      .update();
 
+    try {
+      // a normal query fails due to invalid JSON content
+      Ebean.find(EBasicJsonList.class)
+        .setId(bean.getId())
+        .findOne();
+
+      // never get here
+      assertTrue(false);
+
+    } catch (PersistenceException e) {
+      // query fails due to error loading invalid JSON content
+      assertThat(e.getMessage()).contains("beanMap");
+    }
+
+    bean = Ebean.find(EBasicJsonList.class)
+      .setId(bean.getId())
+      .setAllowLoadErrors() // allow invalid JSON content
+      .findOne();
 
-    bean = Ebean.find(EBasicJsonList.class, bean.getId());
     Map<String, Exception> errors = server().getBeanState(bean).getLoadErrors();
 
     assertThat(errors).containsKey("beanMap").hasSize(1);
     assertThat(errors.values().iterator().next())
       .isInstanceOf(TextException.class)
       .hasMessageContaining("blabla");
-    //assertThat(bean.getBeanMap().get("bla").getName()).isEqualTo("Blubb");
+
+    Ebean.delete(bean);
   }
 }
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 6efadcc56..cd6b5c07c 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -26,7 +26,6 @@ ebean.collectQueryPlans=true
 
 ebean.autoReadOnlyDataSource=true
 
-ebean.failOnLoadError=false
 #ebean.persistBatch=NONE
 
 #ebean.h2.idType=SEQUENCE

From 6b27a9d280663d1e7726dc0cbc9839459b50ec72 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 10 Jan 2019 03:40:02 +1300
Subject: [PATCH 0659/1036] Support @ManyToOne inside @Embeddables  - fix for
 #52 (#1608)

* #52 - @ManyToOne support inside @Embeddables

Initial test and work

* #52 - @ManyToOne support inside @Embeddables

Initial test and work

* #52 - @ManyToOne support inside @Embeddables

Initial test and work

* #52 - @ManyToOne support inside @Embeddables

Initial test and work

* #52 - @ManyToOne support inside @Embeddables

Initial test and work

* #52 - @ManyToOne support inside @Embeddables

Initial test and work

* #52 - @ManyToOne support inside @Embeddables

Update test with sql capture

* #52 - @ManyToOne support inside @Embeddables

Update test with cache clearing before hand (such that we hit DB on lazy load)
---
 .../build/ModelBuildPropertyVisitor.java      |  6 +-
 .../server/deploy/AssocOneHelp.java           |  9 ++-
 .../server/deploy/AssocOneHelpRefSimple.java  |  4 +-
 .../server/deploy/BeanDescriptor.java         | 25 +++-----
 .../deploy/BeanDescriptorInitContext.java     | 10 +++
 .../server/deploy/BeanDescriptorManager.java  | 64 +++++++++++--------
 .../deploy/BeanEmbeddedMetaFactory.java       |  8 ++-
 .../server/deploy/BeanPropertyAssoc.java      | 16 +++++
 .../server/deploy/BeanPropertyAssocOne.java   | 31 +++++++--
 .../server/deploy/TableJoin.java              | 16 +++++
 .../server/deploy/TableJoinColumn.java        | 13 ++++
 .../server/deploy/parse/AnnotationFields.java |  1 +
 .../server/deploy/parse/AnnotationParser.java |  1 +
 .../server/deploy/parse/DeployBeanInfo.java   | 18 ++++++
 .../dmlbind/FactoryBaseProperties.java        |  2 +-
 .../persist/dmlbind/FactoryEmbedded.java      |  6 +-
 .../persist/dmlbind/FactoryProperty.java      | 24 ++++---
 .../java/org/tests/model/embedded/EAddr.java  | 57 +++++++++++++++++
 .../org/tests/model/embedded/EPerAddr.java    | 58 +++++++++++++++++
 .../model/embedded/TestEmbeddedManyToOne.java | 56 ++++++++++++++++
 20 files changed, 356 insertions(+), 69 deletions(-)
 create mode 100644 src/test/java/org/tests/model/embedded/EAddr.java
 create mode 100644 src/test/java/org/tests/model/embedded/EPerAddr.java
 create mode 100644 src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java

diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
index 0e366a9b1..fa7950b45 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
@@ -147,7 +147,11 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
   @Override
   public void visitEmbeddedScalar(BeanProperty p, BeanPropertyAssocOne<?> embedded) {
 
-    visitScalar(p);
+    if (p instanceof BeanPropertyAssocOne) {
+      visitOneImported((BeanPropertyAssocOne)p);
+    } else {
+      visitScalar(p);
+    }
     if (embedded.isId()) {
       // compound primary key
       lastColumn.setPrimaryKey(true);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelp.java b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelp.java
index 0fbf29da6..e41556a9f 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelp.java
@@ -17,9 +17,16 @@ abstract class AssocOneHelp {
 
   protected final BeanDescriptor<?> target;
 
+  private final String path;
+
   AssocOneHelp(BeanPropertyAssocOne<?> property) {
+    this(property, null);
+  }
+
+  AssocOneHelp(BeanPropertyAssocOne<?> property, String embeddedPrefix) {
     this.property = property;
     this.target = property.targetDescriptor;
+    this.path = (embeddedPrefix == null) ? property.name : embeddedPrefix + "." + property.name;
   }
 
   /**
@@ -67,7 +74,7 @@ abstract class AssocOneHelp {
     boolean disableLazyLoading = ctx.isDisableLazyLoading();
     Object ref = target.contextRef(pc, ctx.isReadOnly(), disableLazyLoading, id);
     if (!disableLazyLoading) {
-      ctx.register(property.name, ((EntityBean) ref)._ebean_getIntercept());
+      ctx.register(path, ((EntityBean) ref)._ebean_getIntercept());
     }
     return ref;
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefSimple.java b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefSimple.java
index 9e10e9ec8..967d7d492 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefSimple.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefSimple.java
@@ -5,8 +5,8 @@ package io.ebeaninternal.server.deploy;
  */
 class AssocOneHelpRefSimple extends AssocOneHelp {
 
-  AssocOneHelpRefSimple(BeanPropertyAssocOne<?> property) {
-    super(property);
+  AssocOneHelpRefSimple(BeanPropertyAssocOne<?> property, String embeddedPrefix) {
+    super(property, embeddedPrefix);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 11b72808f..b94b16bc9 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -724,16 +724,9 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
       inheritInfo.setDescriptor(this);
     }
 
-    if (isEmbedded()) {
-      // initialise all the properties
-      for (BeanProperty prop : propertiesAll()) {
-        prop.initialise(initContext);
-      }
-    } else {
-      // initialise just the Id properties
-      if (idProperty != null) {
-        idProperty.initialise(initContext);
-      }
+    // initialise just the Id property only
+    if (idProperty != null) {
+      idProperty.initialise(initContext);
     }
   }
 
@@ -759,14 +752,12 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
       }
     }
 
-    if (!isEmbedded()) {
-      // initialise all the non-id properties
-      for (BeanProperty prop : propertiesAll()) {
-        if (!prop.isId()) {
-          prop.initialise(initContext);
-        }
-        prop.registerColumn(this, null);
+    // initialise all the non-id properties
+    for (BeanProperty prop : propertiesAll()) {
+      if (!prop.isId()) {
+        prop.initialise(initContext);
       }
+      prop.registerColumn(this, null);
     }
 
     if (unidirectional != null) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorInitContext.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorInitContext.java
index ef367199d..ec9c19044 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorInitContext.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorInitContext.java
@@ -8,6 +8,8 @@ class BeanDescriptorInitContext {
   private final Map<String, String> draftTables;
   private final String asOfViewSuffix;
 
+  private String embeddedPrefix;
+
   BeanDescriptorInitContext(Map<String, String> withHistoryTables, Map<String, String> draftTables, String asOfViewSuffix) {
     this.withHistoryTables = withHistoryTables;
     this.draftTables = draftTables;
@@ -29,4 +31,12 @@ class BeanDescriptorInitContext {
   void addDraftIntersection(String intersectionPublishTable, String intersectionDraftTable) {
     draftTables.put(intersectionPublishTable, intersectionDraftTable);
   }
+
+  public void setEmbeddedPrefix(String embeddedPrefix) {
+    this.embeddedPrefix = embeddedPrefix;
+  }
+
+  public String getEmbeddedPrefix() {
+    return embeddedPrefix;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index ee8087a4f..359da02de 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -150,8 +150,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
   private final String serverName;
 
-  private Map<Class<?>, DeployBeanInfo<?>> deployInfoMap = new HashMap<>();
-
   private final Map<Class<?>, BeanTable> beanTableMap = new HashMap<>();
 
   private final Map<String, BeanDescriptor<?>> descMap = new HashMap<>();
@@ -196,6 +194,12 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
   private final int queryPlanTTLSeconds;
 
+  // temporary collections used during startup and then cleared
+
+  private Map<Class<?>, DeployBeanInfo<?>> deployInfoMap = new HashMap<>();
+  private Set<Class<?>> embeddedIdTypes = new HashSet<>();
+  private List<DeployBeanInfo<?>> embeddedBeans = new ArrayList<>();
+
   /**
    * Create for a given database dbConfig.
    */
@@ -366,7 +370,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
       createListeners();
       readEntityDeploymentInitial();
       readXmlMapping(mappings);
-      readEmbeddedDeployment();
       readEntityBeanTable();
       readEntityDeploymentAssociations();
       readInheritedIdGenerators();
@@ -385,7 +388,9 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
       logStatus();
 
-      deployInfoMap.clear();
+      // clear collections we no longer need
+      embeddedIdTypes = null;
+      embeddedBeans = null;
       deployInfoMap = null;
 
       return asOfTableMap;
@@ -592,8 +597,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     for (BeanDescriptor<?> d : descMap.values()) {
       d.initLast();
       if (!d.isEmbedded()) {
-        BeanManager<?> m = beanManagerFactory.create(d);
-        beanManagerMap.put(d.getFullName(), m);
+        beanManagerMap.put(d.getFullName(), beanManagerFactory.create(d));
         checkForValidEmbeddedId(d);
       }
     }
@@ -676,11 +680,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     logger.debug("Entities[{}]", entityBeanCount);
   }
 
-  private <T> BeanDescriptor<T> createEmbedded(Class<T> beanClass) {
-    DeployBeanInfo<T> info = getDeploy(beanClass);
-    return new BeanDescriptor<>(this, info.getDescriptor());
-  }
-
   /**
    * Return the bean deploy info for the given class.
    */
@@ -689,24 +688,14 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     return (DeployBeanInfo<T>) deployInfoMap.get(cls);
   }
 
-  private void registerBeanDescriptor(BeanDescriptor<?> desc) {
+  private void registerBeanDescriptor(DeployBeanInfo<?> info) {
+    BeanDescriptor desc = new BeanDescriptor<>(this, info.getDescriptor());
     descMap.put(desc.getBeanType().getName(), desc);
     if (desc.isDocStoreMapped()) {
       descQueueMap.put(desc.getDocStoreQueueId(), desc);
     }
   }
 
-  /**
-   * Read deployment information for all the embedded beans.
-   */
-  private void readEmbeddedDeployment() {
-
-    List<Class<?>> embeddedClasses = bootupClasses.getEmbeddables();
-    for (Class<?> embeddedClass : embeddedClasses) {
-      registerBeanDescriptor(createEmbedded(embeddedClass));
-    }
-  }
-
   /**
    * Read the initial deployment information for the entities.
    * <p>
@@ -719,14 +708,31 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     for (Class<?> entityClass : bootupClasses.getEntities()) {
       DeployBeanInfo<?> info = createDeployBeanInfo(entityClass);
       deployInfoMap.put(entityClass, info);
+      Class<?> embeddedIdType = info.getEmbeddedIdType();
+      if (embeddedIdType != null){
+        embeddedIdTypes.add(embeddedIdType);
+      }
     }
     for (Class<?> entityClass : bootupClasses.getEmbeddables()) {
       DeployBeanInfo<?> info = createDeployBeanInfo(entityClass);
-      readDeployAssociations(info);
       deployInfoMap.put(entityClass, info);
+      if (embeddedIdTypes.contains(entityClass)) {
+        // register embeddedId types early - scalar properties only
+        // and needed for creating BeanTables (id properties)
+        registerEmbeddedBean(info);
+      } else {
+        // delay register of other embedded beans until after
+        // the BeanTables have been created to support ManyToOne
+        embeddedBeans.add(info);
+      }
     }
   }
 
+  private void registerEmbeddedBean(DeployBeanInfo<?> info) {
+    readDeployAssociations(info);
+    registerBeanDescriptor(info);
+  }
+
   /**
    * Create the BeanTable information which has the base table and id.
    * <p>
@@ -739,6 +745,11 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
       BeanTable beanTable = createBeanTable(info);
       beanTableMap.put(beanTable.getBeanType(), beanTable);
     }
+
+    // register non-id embedded beans (after bean tables are created)
+    for (DeployBeanInfo<?> info : embeddedBeans) {
+      registerEmbeddedBean(info);
+    }
   }
 
   /**
@@ -816,13 +827,14 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
       secondaryPropsJoins(info);
     }
 
-    // Set inheritance info
     for (DeployBeanInfo<?> info : deployInfoMap.values()) {
       setInheritanceInfo(info);
     }
 
     for (DeployBeanInfo<?> info : deployInfoMap.values()) {
-      registerBeanDescriptor(new BeanDescriptor(this, info.getDescriptor()));
+      if (!info.isEmbedded()) {
+        registerBeanDescriptor(info);
+      }
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java b/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java
index cfc8e306f..11f287025 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java
@@ -30,7 +30,7 @@ public class BeanEmbeddedMetaFactory {
     String columnPrefix = prop.getColumnPrefix();
     Map<String, String> propColMap = prop.getDeployEmbedded().getPropertyColumnMap();
 
-    BeanProperty[] sourceProperties = targetDesc.propertiesBaseScalar();
+    BeanProperty[] sourceProperties = targetDesc.propertiesNonTransient();
     BeanProperty[] embeddedProperties = new BeanProperty[sourceProperties.length];
 
     for (int i = 0; i < sourceProperties.length; i++) {
@@ -45,7 +45,11 @@ public class BeanEmbeddedMetaFactory {
       }
 
       BeanPropertyOverride overrides = new BeanPropertyOverride(dbColumn);
-      embeddedProperties[i] = new BeanProperty(sourceProperties[i], overrides);
+      if (sourceProperties[i] instanceof BeanPropertyAssocOne) {
+        embeddedProperties[i] = new BeanPropertyAssocOne((BeanPropertyAssocOne)sourceProperties[i], overrides);
+      } else {
+        embeddedProperties[i] = new BeanProperty(sourceProperties[i], overrides);
+      }
     }
 
     return new BeanEmbeddedMeta(embeddedProperties);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
index f24d71346..782ee8043 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
@@ -104,6 +104,22 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
     this.fetchPreference = deploy.getFetchPreference();
   }
 
+  /**
+   * Copy constructor for ManyToOne inside Embeddable.
+   */
+  public BeanPropertyAssoc(BeanPropertyAssoc source, BeanPropertyOverride override) {
+    super(source, override);
+    foreignKey = source.foreignKey;
+    extraWhere = source.extraWhere;
+    beanTable = source.beanTable;
+    mappedBy = source.mappedBy;
+    docStoreDoc = source.docStoreDoc;
+    targetType = source.targetType;
+    cascadeInfo = source.cascadeInfo;
+    fetchPreference = source.fetchPreference;
+    tableJoin = source.tableJoin.withOverrideColumn(override.getDbColumn());
+  }
+
   /**
    * Initialise post construction.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index 4245235cd..a5ffe9413 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -93,14 +93,35 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     }
   }
 
+  /**
+   * Copy constructor for ManyToOne inside Embeddable.
+   */
+  public BeanPropertyAssocOne(BeanPropertyAssocOne source, BeanPropertyOverride override) {
+    super(source, override);
+    primaryKeyExport = source.primaryKeyExport;
+    oneToOne = source.oneToOne;
+    oneToOneExported = source.oneToOneExported;
+    orphanRemoval = source.orphanRemoval;
+    embeddedProps = null;
+    embeddedPropsMap = null;
+  }
+
   @Override
   public void initialise(BeanDescriptorInitContext initContext) {
     super.initialise(initContext);
-    initialiseAssocOne();
+    initialiseAssocOne(initContext.getEmbeddedPrefix());
+    if (embedded) {
+      // initialise ManyToOne importedId
+      initContext.setEmbeddedPrefix(name);
+      for (BeanProperty embeddedProp : embeddedProps) {
+        embeddedProp.initialise(initContext);
+      }
+      initContext.setEmbeddedPrefix(null);
+    }
   }
 
-  private void initialiseAssocOne() {
-    localHelp = createHelp(embedded, oneToOneExported);
+  private void initialiseAssocOne(String embeddedPrefix) {
+    localHelp = createHelp(embedded, oneToOneExported, embeddedPrefix);
 
     if (!isTransient) {
       //noinspection StatementWithEmptyBody
@@ -668,7 +689,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     }
   }
 
-  private AssocOneHelp createHelp(boolean embedded, boolean oneToOneExported) {
+  private AssocOneHelp createHelp(boolean embedded, boolean oneToOneExported, String embeddedPrefix) {
     if (embedded) {
       return new AssocOneHelpEmbedded(this);
     } else if (oneToOneExported) {
@@ -677,7 +698,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
       if (targetInheritInfo != null) {
         return new AssocOneHelpRefInherit(this);
       } else {
-        return new AssocOneHelpRefSimple(this);
+        return new AssocOneHelpRefSimple(this, embeddedPrefix);
       }
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java b/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java
index eedb2b547..03cb35d6c 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java
@@ -51,6 +51,15 @@ public final class TableJoin {
     this.queryHash = calcQueryHash();
   }
 
+  private TableJoin(TableJoin source, String overrideColumn) {
+    this.table = source.table;
+    this.type = source.type;
+    this.inheritInfo = source.inheritInfo;
+    this.columns = new TableJoinColumn[1];
+    this.columns[0] = source.columns[0].withOverrideColumn(overrideColumn);
+    this.queryHash = calcQueryHash();
+  }
+
   /**
    * Calculate a hash value for adding to a query plan.
    */
@@ -166,4 +175,11 @@ public final class TableJoin {
       sb.append(a2).append(".").append(pair.getForeignDbColumn());
     }
   }
+
+  TableJoin withOverrideColumn(String overrideColumn) {
+    if (columns.length == 1 && overrideColumn != null && !overrideColumn.equals(columns[0].getLocalDbColumn())) {
+      return new TableJoin(this, overrideColumn);
+    }
+    return this;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/TableJoinColumn.java b/src/main/java/io/ebeaninternal/server/deploy/TableJoinColumn.java
index f8921b49e..a8209d3ff 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/TableJoinColumn.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/TableJoinColumn.java
@@ -46,6 +46,16 @@ public class TableJoinColumn {
     this.queryHash = hash();
   }
 
+  private TableJoinColumn(TableJoinColumn source, String overrideColumn) {
+    this.localDbColumn = InternString.intern(overrideColumn);
+    this.foreignDbColumn = source.foreignDbColumn;
+    this.localSqlFormula = null;
+    this.foreignSqlFormula = null;
+    this.insertable = source.isInsertable();
+    this.updateable = source.isUpdateable();
+    this.queryHash = hash();
+  }
+
   int hash() {
     int result = localDbColumn != null ? localDbColumn.hashCode() : 0;
     result = 92821 * result + (foreignDbColumn != null ? foreignDbColumn.hashCode() : 0);
@@ -123,4 +133,7 @@ public class TableJoinColumn {
     return foreignSqlFormula;
   }
 
+  TableJoinColumn withOverrideColumn(String overrideColumn) {
+    return new TableJoinColumn(this, overrideColumn);
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
index 4b1b28b69..8c2f48754 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
@@ -132,6 +132,7 @@ public class AnnotationFields extends AnnotationParser {
       prop.setId();
       prop.setNullable(false);
       prop.setEmbedded();
+      info.setEmbeddedId(prop);
     }
 
     DocEmbedded docEmbedded = get(prop, DocEmbedded.class);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
index 1bcb1faf3..e8b489a23 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
@@ -54,6 +54,7 @@ public abstract class AnnotationParser extends AnnotationBase {
     } else {
       prop.setId();
       prop.setEmbedded();
+      info.setEmbeddedId(prop);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java
index d683578bc..3b577d986 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.deploy.parse;
 import io.ebean.RawSql;
 import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
+import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoin;
 import io.ebeaninternal.server.query.SqlJoinType;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
@@ -23,6 +24,8 @@ public class DeployBeanInfo<T> {
 
   private final DeployBeanDescriptor<T> descriptor;
 
+  private DeployBeanPropertyAssoc<?> embeddedId;
+
   /**
    * Create with a DeployUtil and BeanDescriptor.
    */
@@ -89,4 +92,19 @@ public class DeployBeanInfo<T> {
   public void setPrimaryKeyJoin(TableJoin join) {
     descriptor.setPrimaryKeyJoin(join);
   }
+
+  /**
+   * This bean type has an embedded Id property.
+   */
+  public void setEmbeddedId(DeployBeanPropertyAssoc<?> embeddedId) {
+    this.embeddedId = embeddedId;
+  }
+
+  public Class<?> getEmbeddedIdType() {
+    return (embeddedId == null) ? null : embeddedId.getTargetType();
+  }
+
+  public boolean isEmbedded() {
+    return descriptor.isEmbedded();
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java
index 36c0998b8..43b9bec8d 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java
@@ -28,7 +28,7 @@ public class FactoryBaseProperties {
 
     for (BeanProperty prop : desc.propertiesBaseScalar()) {
       if (!prop.isImportedPrimaryKey()) {
-        Bindable item = factoryProperty.create(prop, mode, withLobs);
+        Bindable item = factoryProperty.create(prop, mode, withLobs, false);
         if (item != null) {
           list.add(item);
         }
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java
index 585bf1292..380c7b3a9 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java
@@ -24,13 +24,11 @@ public class FactoryEmbedded {
    */
   public void create(List<Bindable> list, BeanDescriptor<?> desc, DmlMode mode, boolean withLobs) {
 
-    BeanPropertyAssocOne<?>[] embedded = desc.propertiesEmbedded();
-
-    for (BeanPropertyAssocOne<?> anEmbedded : embedded) {
+    for (BeanPropertyAssocOne<?> anEmbedded : desc.propertiesEmbedded()) {
       BeanProperty[] props = anEmbedded.getProperties();
       List<Bindable> bindList = new ArrayList<>(props.length);
       for (BeanProperty prop : props) {
-        Bindable item = factoryProperty.create(prop, mode, withLobs);
+        Bindable item = factoryProperty.create(prop, mode, withLobs, true);
         if (item != null) {
           bindList.add(item);
         }
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java
index b0d0b8d4b..5adf5124c 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.persist.dmlbind;
 
 import io.ebeaninternal.server.deploy.BeanProperty;
+import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 import io.ebeaninternal.server.persist.dml.DmlMode;
 
 /**
@@ -14,14 +15,14 @@ public class FactoryProperty {
 
   private final boolean bindEncryptDataFirst;
 
-  public FactoryProperty(boolean bindEncryptDataFirst) {
+  FactoryProperty(boolean bindEncryptDataFirst) {
     this.bindEncryptDataFirst = bindEncryptDataFirst;
   }
 
   /**
    * Create a Bindable for the property given the mode and withLobs flag.
    */
-  public Bindable create(BeanProperty prop, DmlMode mode, boolean withLobs) {
+  public Bindable create(BeanProperty prop, DmlMode mode, boolean withLobs, boolean allowManyToOne) {
 
     if (DmlMode.INSERT == mode && !prop.isDbInsertable()) {
       return null;
@@ -30,15 +31,18 @@ public class FactoryProperty {
       return null;
     }
 
-    if (prop.isLob()) {
-      if (!withLobs) {
-        // Lob exclusion
-        return null;
-      } else {
-        return prop.isDbEncrypted() ? new BindableEncryptedProperty(prop, bindEncryptDataFirst) : new BindableProperty(prop);
-      }
+    if (prop.isLob() && !withLobs) {
+      // Lob exclusion
+      return null;
+    }
+    if (prop.isDbEncrypted()){
+      return new BindableEncryptedProperty(prop, bindEncryptDataFirst);
     }
 
-    return prop.isDbEncrypted() ? new BindableEncryptedProperty(prop, bindEncryptDataFirst) : new BindableProperty(prop);
+    if (allowManyToOne && prop instanceof BeanPropertyAssocOne) {
+      return  new BindableAssocOne((BeanPropertyAssocOne<?>)prop);
+    }
+
+    return new BindableProperty(prop);
   }
 }
diff --git a/src/test/java/org/tests/model/embedded/EAddr.java b/src/test/java/org/tests/model/embedded/EAddr.java
new file mode 100644
index 000000000..5dc697ddd
--- /dev/null
+++ b/src/test/java/org/tests/model/embedded/EAddr.java
@@ -0,0 +1,57 @@
+package org.tests.model.embedded;
+
+import org.tests.model.basic.Country;
+
+import javax.persistence.Embeddable;
+import javax.persistence.ManyToOne;
+
+@Embeddable
+public class EAddr {
+
+  String street;
+
+  String suburb;
+
+  String city;
+
+  @ManyToOne
+  Country country;
+
+  public EAddr(String street, String city, Country country) {
+    this.street = street;
+    this.city = city;
+    this.country = country;
+  }
+
+  public String getStreet() {
+    return street;
+  }
+
+  public void setStreet(String street) {
+    this.street = street;
+  }
+
+  public String getSuburb() {
+    return suburb;
+  }
+
+  public void setSuburb(String suburb) {
+    this.suburb = suburb;
+  }
+
+  public String getCity() {
+    return city;
+  }
+
+  public void setCity(String city) {
+    this.city = city;
+  }
+
+  public Country getCountry() {
+    return country;
+  }
+
+  public void setCountry(Country country) {
+    this.country = country;
+  }
+}
diff --git a/src/test/java/org/tests/model/embedded/EPerAddr.java b/src/test/java/org/tests/model/embedded/EPerAddr.java
new file mode 100644
index 000000000..b3d4ca3e3
--- /dev/null
+++ b/src/test/java/org/tests/model/embedded/EPerAddr.java
@@ -0,0 +1,58 @@
+package org.tests.model.embedded;
+
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Version;
+
+@Entity
+public class EPerAddr {
+
+  @Id
+  Long id;
+
+  @Version
+  Long version;
+
+  String name;
+
+  @Embedded(prefix = "ma_")
+  EAddr address;
+
+  public EPerAddr(String name, EAddr address) {
+    this.name = name;
+    this.address = address;
+  }
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public Long getVersion() {
+    return version;
+  }
+
+  public void setVersion(Long version) {
+    this.version = version;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public EAddr getAddress() {
+    return address;
+  }
+
+  public void setAddress(EAddr address) {
+    this.address = address;
+  }
+}
diff --git a/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java b/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java
new file mode 100644
index 000000000..b7d04754c
--- /dev/null
+++ b/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java
@@ -0,0 +1,56 @@
+package org.tests.model.embedded;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.plugin.BeanType;
+import io.ebean.plugin.Property;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+import org.tests.model.basic.Country;
+import org.tests.model.basic.ResetBasicData;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestEmbeddedManyToOne extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    ResetBasicData.reset();
+
+    BeanType<EAddr> embType = Ebean.getDefaultServer().getPluginApi().getBeanType(EAddr.class);
+
+    Ebean.getDefaultServer().getServerCacheManager().clearAll();
+
+    Country nz = Ebean.getReference(Country.class, "NZ");
+
+    EAddr addr = new EAddr("Foo", "Bar", nz);
+    EPerAddr perAddr = new EPerAddr("Embed", addr);
+
+    Property country = embType.getProperty("country");
+    Object val = country.getVal(addr);
+
+    assertThat(val).isSameAs(nz);
+
+    Ebean.save(perAddr);
+
+
+    LoggedSqlCollector.start();
+
+    EPerAddr found = Ebean.find(EPerAddr.class, perAddr.getId());
+
+    assertThat(found.getAddress().getCountry().getCode()).isEqualTo("NZ");
+    assertThat(found.getAddress().getCountry().getName()).startsWith("New");
+
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(2);
+
+    if (isH2()) {
+      assertThat(sql.get(0)).contains("select t0.id, t0.name, t0.version, t0.ma_street, t0.ma_suburb, t0.ma_city, t0.ma_country_code from eper_addr t0 where t0.id = ? ");
+      assertThat(sql.get(1)).contains("select t0.code, t0.name from o_country t0 where t0.code = ?  ; --bind(NZ,");
+    }
+  }
+}

From 0edf90056ccf5d91bbe44c570f660ef561ab29b4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 10 Jan 2019 03:44:44 +1300
Subject: [PATCH 0660/1036] [maven-release-plugin] prepare release
 ebean-11.32.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c48f43a7f..b0eb26e4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.32.1-SNAPSHOT</version>
+  <version>11.32.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.32.1</tag>
   </scm>
 
   <profiles>

From 669ba7837afbddb39e4d525713bab8f8ddd6b92d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 10 Jan 2019 03:44:59 +1300
Subject: [PATCH 0661/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b0eb26e4d..8b0813bd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.32.1</version>
+  <version>11.32.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.32.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From fc966618a662456bbb4201c69d7c61385ce0a56f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 10 Jan 2019 14:42:55 +1300
Subject: [PATCH 0662/1036] No effective change - improve javadoc for
 Query.setInheritType()

---
 src/main/java/io/ebean/Query.java | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index bd8d59e43..0c7caabaa 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -1632,7 +1632,19 @@ public interface Query<T> {
   Class<T> getBeanType();
 
   /**
-   * Sets the inherit type. Must be a subtype of getBeanType
+   * Restrict the query to only return subtypes of the given inherit type.
+   *
+   * <pre>{@code
+   *
+   *   List<Animal> animals =
+   *     new QAnimal()
+   *       .name.startsWith("Fluffy")
+   *       .setInheritType(Cat.class)
+   *       .findList();
+   *
+   * }</pre>
+   *
+   * @param type An inheritance subtype of the
    */
   Query<T> setInheritType(Class<? extends T> type);
 

From fdd9b1905cbaa0146342ca2b37ed2bde96581303 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 10 Jan 2019 14:52:55 +1300
Subject: [PATCH 0663/1036] No effective change - improve javadoc for
 query.exists() and query.setBaseTable()

---
 src/main/java/io/ebean/Query.java | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index 0c7caabaa..bf9717f12 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -897,17 +897,22 @@ public interface Query<T> {
    * 'does a row exist in the db' check.
    * </p>
    *
-   * <h2>Example:</h2>
-   * <pre>{@code
-   *
-   *   boolean userExists = query().where().eq("email", "rob@foo.com").exists();
-   *
-   * }</pre>
-   *
    * <h2>Example using a query bean:</h2>
    * <pre>{@code
    *
-   *   boolean userExists = new QContact().email.equalTo("rob@foo.com").exists();
+   *   boolean userExists =
+   *     new QContact()
+   *       .email.equalTo("rob@foo.com")
+   *       .exists();
+   *
+   * }</pre>
+   *
+   * <h2>Example:</h2>
+   * <pre>{@code
+   *
+   *   boolean userExists = query()
+   *     .where().eq("email", "rob@foo.com")
+   *     .exists();
    *
    * }</pre>
    *
@@ -1623,6 +1628,14 @@ public interface Query<T> {
    * Typically this is used when a table has partitioning and we wish to specify a specific
    * partition/table to query against.
    * </p>
+   * <pre>{@code
+   *
+   *   QOrder()
+   *   .setBaseTable("order_2019_05")
+   *   .status.equalTo(Status.NEW)
+   *   .findList();
+   *
+   * }</pre>
    */
   Query<T> setBaseTable(String baseTable);
 

From 2e0690efa9775d0e3c86b53b6a95081f48e79851 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 14 Jan 2019 23:10:56 +1300
Subject: [PATCH 0664/1036] No effective change - improve javadoc for
 Transaction and EbeanServer

---
 src/main/java/io/ebean/EbeanServer.java | 11 ++++-------
 src/main/java/io/ebean/Transaction.java | 21 ++++++++-------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/main/java/io/ebean/EbeanServer.java b/src/main/java/io/ebean/EbeanServer.java
index face93fa3..75993bc0a 100644
--- a/src/main/java/io/ebean/EbeanServer.java
+++ b/src/main/java/io/ebean/EbeanServer.java
@@ -570,7 +570,7 @@ public interface EbeanServer {
    *       txn.setBatchGetGeneratedKeys(false);
    *
    *       // explicitly flush the JDBC batch buffer
-   *       txn.flushBatch();
+   *       txn.flush();
    *
    *       ...
    *
@@ -688,8 +688,6 @@ public interface EbeanServer {
    *   }
    *
    * }</pre>
-   * <p>
-   * </p>
    */
   void endTransaction();
 
@@ -963,7 +961,7 @@ public interface EbeanServer {
    * updateSql.getRowCount().
    * <p>
    * If you wish to execute a Sql Select natively then you should use the
-   * FindByNativeSql object.
+   * SqlQuery object or DtoQuery.
    * </p>
    * <p>
    * Note that the table modification information is automatically deduced and
@@ -1330,9 +1328,8 @@ public interface EbeanServer {
    *        u1.setName("u1 mod");
    *        u2.setName("u2 mod");
    *
-   *        ebeanServer.save(u1);
-   *        ebeanServer.save(u2);
-   *
+   *        u1.save();
+   *        u2.save();
    *    });
    *
    * }</pre>
diff --git a/src/main/java/io/ebean/Transaction.java b/src/main/java/io/ebean/Transaction.java
index 1decc34f5..043d381a2 100644
--- a/src/main/java/io/ebean/Transaction.java
+++ b/src/main/java/io/ebean/Transaction.java
@@ -244,8 +244,7 @@ public interface Transaction extends AutoCloseable {
    *
    *   // assume Customer has L2 bean caching enabled ...
    *
-   *   Transaction transaction = Ebean.beginTransaction();
-   *   try {
+   *   try (Transaction transaction = ebeanServer.beginTransaction()) {
    *
    *     // this uses L2 bean cache as the transaction
    *     // ... is considered "query only" at this point
@@ -253,7 +252,7 @@ public interface Transaction extends AutoCloseable {
    *
    *     // transaction no longer "query only" once
    *     // ... a bean has been saved etc
-   *     Ebean.save(someBean);
+   *     someBean.save();
    *
    *     // will NOT use L2 bean cache as the transaction
    *     // ... is no longer considered "query only"
@@ -273,8 +272,7 @@ public interface Transaction extends AutoCloseable {
    *     Customer.find.byId(99); // skips l2 bean cache
    *
    *
-   *   } finally {
-   *     transaction.end();
+   *     transaction.commit();
    *   }
    *
    * }</pre>
@@ -338,20 +336,17 @@ public interface Transaction extends AutoCloseable {
    * // inserts into a table called sp_test
    * cs.addModification("sp_test", true, false, false);
    *
-   * Transaction txn = ebeanServer.beginTransaction();
-   * txn.setBatchMode(true);
-   * txn.setBatchSize(3);
-   * try {
+   * try (Transaction txn = ebeanServer.beginTransaction()) {
+   *   txn.setBatchMode(true);
+   *   txn.setBatchSize(3);
+   *
    *   for (int i = 0; i < da.length;) {
    *     cs.setParameter(1, da[i]);
    *     ebeanServer.execute(cs);
    *   }
    *
-   *   // NB: commit implicitly flushes
+   *   // Note: commit implicitly flushes
    *   txn.commit();
-   *
-   * } finally {
-   *   txn.end();
    * }
    *
    * }</pre>

From bac53a5d7582b05495b5fb832837967f44e5446d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Camilo?= <ajcamilo@users.noreply.github.com>
Date: Mon, 14 Jan 2019 22:56:52 +0000
Subject: [PATCH 0665/1036] FIX: insert in batch OneToOne relationship (#1609)

---
 .../server/persist/BatchControl.java          |  6 ++-
 .../batchinsert/TestBatchInsertOneToOne.java  | 40 +++++++++++++++++++
 .../batchinsert/o2o/MeterAddressData.java     | 23 +++++++++++
 .../batchinsert/o2o/MeterContractData.java    | 26 ++++++++++++
 .../o2o/MeterSpecialNeedsClient.java          | 34 ++++++++++++++++
 .../o2o/MeterSpecialNeedsContact.java         | 21 ++++++++++
 .../tests/batchinsert/o2o/MeterVersion.java   | 38 ++++++++++++++++++
 7 files changed, 186 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java
 create mode 100644 src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java
 create mode 100644 src/test/java/org/tests/batchinsert/o2o/MeterContractData.java
 create mode 100644 src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java
 create mode 100644 src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java
 create mode 100644 src/test/java/org/tests/batchinsert/o2o/MeterVersion.java

diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchControl.java b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
index 319db4302..705e6807b 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
@@ -327,14 +327,16 @@ public final class BatchControl {
       return maxDepth + 1;
     }
 
+    int parentMaxDepth = -1;
+
     for (BeanPropertyAssocOne<?> parent : imported) {
       BatchedBeanHolder parentBatch = beanHoldMap.get(parent.getTargetDescriptor().rootName());
       if (parentBatch != null) {
         // deeper that the parent
-        return parentBatch.getOrder() + 1;
+        parentMaxDepth = Math.max(parentMaxDepth, parentBatch.getOrder() + 1);
       }
     }
-    return -1;
+    return parentMaxDepth;
   }
 
   /**
diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java b/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java
new file mode 100644
index 000000000..620b926bb
--- /dev/null
+++ b/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java
@@ -0,0 +1,40 @@
+package org.tests.batchinsert;
+
+import io.ebean.Ebean;
+import io.ebean.annotation.PersistBatch;
+import io.ebean.annotation.Transactional;
+import org.junit.Test;
+import org.tests.batchinsert.o2o.MeterAddressData;
+import org.tests.batchinsert.o2o.MeterContractData;
+import org.tests.batchinsert.o2o.MeterSpecialNeedsClient;
+import org.tests.batchinsert.o2o.MeterSpecialNeedsContact;
+import org.tests.batchinsert.o2o.MeterVersion;
+
+public class TestBatchInsertOneToOne {
+  private MeterVersion build(){
+    MeterAddressData addressData = new MeterAddressData();
+    addressData.setStreet("street");
+    MeterContractData contractData = new MeterContractData();
+
+    MeterSpecialNeedsClient specialNeedsClient = new MeterSpecialNeedsClient();
+    contractData.setSpecialNeedsClient(specialNeedsClient);
+
+    MeterSpecialNeedsContact contact1 = new MeterSpecialNeedsContact();
+
+    specialNeedsClient.setPrimary(contact1);
+
+    MeterVersion meterVersion = new MeterVersion();
+    meterVersion.setAddressData(addressData);
+    meterVersion.setContractData(contractData);
+
+    return meterVersion;
+  }
+
+  @Transactional(batch = PersistBatch.ALL, batchOnCascade = PersistBatch.ALL, batchSize = 10)
+  @Test
+  public void test() {
+    MeterVersion meterVersion = build();
+
+    Ebean.save(meterVersion);
+  }
+}
diff --git a/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java b/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java
new file mode 100644
index 000000000..d91cc475e
--- /dev/null
+++ b/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java
@@ -0,0 +1,23 @@
+package org.tests.batchinsert.o2o;
+
+import io.ebean.annotation.NotNull;
+import java.util.UUID;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class MeterAddressData {
+  @Id
+  private UUID id;
+
+  @NotNull
+  private String street;
+
+  public String getStreet() {
+    return street;
+  }
+
+  public void setStreet(String street) {
+    this.street = street;
+  }
+}
diff --git a/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java b/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java
new file mode 100644
index 000000000..537dc411b
--- /dev/null
+++ b/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java
@@ -0,0 +1,26 @@
+package org.tests.batchinsert.o2o;
+
+import io.ebean.annotation.NotNull;
+import java.util.UUID;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+
+@Entity
+public class MeterContractData {
+  @Id
+  private UUID id;
+
+  @NotNull
+  @OneToOne(cascade = CascadeType.ALL)
+  private MeterSpecialNeedsClient specialNeedsClient;
+
+  public MeterSpecialNeedsClient getSpecialNeedsClient() {
+    return specialNeedsClient;
+  }
+
+  public void setSpecialNeedsClient(MeterSpecialNeedsClient specialNeedsClient) {
+    this.specialNeedsClient = specialNeedsClient;
+  }
+}
diff --git a/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java b/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java
new file mode 100644
index 000000000..d042b5dff
--- /dev/null
+++ b/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java
@@ -0,0 +1,34 @@
+package org.tests.batchinsert.o2o;
+
+import java.util.UUID;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+
+@Entity
+public class MeterSpecialNeedsClient {
+  @Id
+  private UUID id;
+
+  private String name;
+
+  @OneToOne(cascade = CascadeType.ALL)
+  private MeterSpecialNeedsContact primary;
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public MeterSpecialNeedsContact getPrimary() {
+    return primary;
+  }
+
+  public void setPrimary(MeterSpecialNeedsContact primary) {
+    this.primary = primary;
+  }
+}
diff --git a/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java b/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java
new file mode 100644
index 000000000..029868433
--- /dev/null
+++ b/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java
@@ -0,0 +1,21 @@
+package org.tests.batchinsert.o2o;
+
+import java.util.UUID;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class MeterSpecialNeedsContact {
+  @Id
+  private UUID id;
+
+  private String name;
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+}
diff --git a/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java b/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java
new file mode 100644
index 000000000..49ce21860
--- /dev/null
+++ b/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java
@@ -0,0 +1,38 @@
+package org.tests.batchinsert.o2o;
+
+import io.ebean.annotation.NotNull;
+import java.util.UUID;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+
+@Entity
+public class MeterVersion {
+  @Id
+  private UUID id;
+
+  //@NotNull
+  @OneToOne(cascade = CascadeType.ALL)
+  private MeterAddressData addressData;
+
+  @NotNull
+  @OneToOne(cascade = CascadeType.ALL)
+  private MeterContractData contractData;
+
+  public MeterAddressData getAddressData() {
+    return addressData;
+  }
+
+  public void setAddressData(MeterAddressData addressData) {
+    this.addressData = addressData;
+  }
+
+  public MeterContractData getContractData() {
+    return contractData;
+  }
+
+  public void setContractData(MeterContractData contractData) {
+    this.contractData = contractData;
+  }
+}

From 20fc23c19c026bf7ff596b3e4f74c1d620b14a02 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 15 Jan 2019 22:16:03 +1300
Subject: [PATCH 0666/1036] No effective change - improve javadoc for
 ExpressionList

---
 src/main/java/io/ebean/ExpressionList.java | 65 ++++++++++++----------
 1 file changed, 36 insertions(+), 29 deletions(-)

diff --git a/src/main/java/io/ebean/ExpressionList.java b/src/main/java/io/ebean/ExpressionList.java
index a7d655fc5..86dfdfe49 100644
--- a/src/main/java/io/ebean/ExpressionList.java
+++ b/src/main/java/io/ebean/ExpressionList.java
@@ -316,7 +316,7 @@ public interface ExpressionList<T> {
 
   /**
    * Execute the query returning a list of values for a single property.
-   * <p>
+   *
    * <h3>Example 1:</h3>
    * <pre>{@code
    *
@@ -327,7 +327,7 @@ public interface ExpressionList<T> {
    *      .findSingleAttributeList();
    *
    * }</pre>
-   * <p>
+   *
    * <h3>Example 2:</h3>
    * <pre>{@code
    *
@@ -349,7 +349,6 @@ public interface ExpressionList<T> {
 
   /**
    * Execute a query returning a single value of a single property/column.
-   * <p>
    * <pre>{@code
    *
    *  String name =
@@ -434,7 +433,6 @@ public interface ExpressionList<T> {
    * If maxRows is not set on the query prior to calling findPagedList() then a
    * PersistenceException is thrown.
    * </p>
-   * <p>
    * <pre>{@code
    *
    *  PagedList<Order> pagedList = Ebean.find(Order.class)
@@ -573,7 +571,6 @@ public interface ExpressionList<T> {
 
   /**
    * Extended version for setDistinct in conjunction with "findSingleAttributeList";
-   * <p>
    * <pre>{@code
    *
    *  List<CountedValue<Order.Status>> orderStatusCount =
@@ -683,7 +680,6 @@ public interface ExpressionList<T> {
 
   /**
    * Equal to expression for the value at the given path in the JSON document.
-   * <p>
    * <pre>{@code
    *
    *   where().jsonEqualTo("content", "path.other", 34)
@@ -698,7 +694,6 @@ public interface ExpressionList<T> {
 
   /**
    * Not Equal to - for the given path in a JSON document.
-   * <p>
    * <pre>{@code
    *
    *   where().jsonNotEqualTo("content", "path.other", 34)
@@ -713,7 +708,6 @@ public interface ExpressionList<T> {
 
   /**
    * Greater than - for the given path in a JSON document.
-   * <p>
    * <pre>{@code
    *
    *   where().jsonGreaterThan("content", "path.other", 34)
@@ -724,7 +718,6 @@ public interface ExpressionList<T> {
 
   /**
    * Greater than or equal to - for the given path in a JSON document.
-   * <p>
    * <pre>{@code
    *
    *   where().jsonGreaterOrEqual("content", "path.other", 34)
@@ -735,7 +728,6 @@ public interface ExpressionList<T> {
 
   /**
    * Less than - for the given path in a JSON document.
-   * <p>
    * <pre>{@code
    *
    *   where().jsonLessThan("content", "path.other", 34)
@@ -746,7 +738,6 @@ public interface ExpressionList<T> {
 
   /**
    * Less than or equal to - for the given path in a JSON document.
-   * <p>
    * <pre>{@code
    *
    *   where().jsonLessOrEqualTo("content", "path.other", 34)
@@ -757,7 +748,6 @@ public interface ExpressionList<T> {
 
   /**
    * Between - for the given path in a JSON document.
-   * <p>
    * <pre>{@code
    *
    *   where().jsonBetween("content", "orderDate", lowerDateTime, upperDateTime)
@@ -771,7 +761,6 @@ public interface ExpressionList<T> {
    * <p>
    * This returns the list so that add() can be chained.
    * </p>
-   * <p>
    * <pre>{@code
    *
    * Query<Customer> query = Ebean.find(Customer.class);
@@ -868,7 +857,6 @@ public interface ExpressionList<T> {
    * To get control over the options you can create an ExampleExpression and set
    * those options such as case insensitive etc.
    * </p>
-   * <p>
    * <pre>{@code
    *
    * // create an example bean and set the properties
@@ -877,7 +865,7 @@ public interface ExpressionList<T> {
    * example.setName("Rob%");
    * example.setNotes("%something%");
    *
-   * List&lt;Customer&gt; list = Ebean.find(Customer.class).where()
+   * List<Customer> list = Ebean.find(Customer.class).where()
    *     // pass the bean into the where() clause
    *     .exampleLike(example)
    *     // you can add other expressions to the same query
@@ -886,7 +874,7 @@ public interface ExpressionList<T> {
    * }</pre>
    * <p>
    * Similarly you can create an ExampleExpression
-   * <p>
+   * </p>
    * <pre>{@code
    *
    * Customer example = new Customer();
@@ -1108,7 +1096,6 @@ public interface ExpressionList<T> {
 
   /**
    * Add expression for ALL of the given bit flags to be set.
-   * <p>
    * <pre>{@code
    *
    * where().bitwiseAll("flags", BwFlags.HAS_BULK + BwFlags.HAS_COLOUR)
@@ -1122,7 +1109,6 @@ public interface ExpressionList<T> {
 
   /**
    * Add expression for the given bit flags to be NOT set.
-   * <p>
    * <pre>{@code
    *
    * where().bitwiseNot("flags", BwFlags.HAS_COLOUR)
@@ -1173,6 +1159,13 @@ public interface ExpressionList<T> {
    *   raw("add_days(orderDate, 10) < ?", someDate)
    *
    * }</pre>
+   *
+   * <h4>Subquery example:</h4>
+   * <pre>{@code
+   *
+   *   .raw("t0.customer_id in (select customer_id from customer_group where group_id = any(?::uuid[]))", groupIds)
+   *
+   * }</pre>
    */
   ExpressionList<T> raw(String raw, Object value);
 
@@ -1197,12 +1190,18 @@ public interface ExpressionList<T> {
    * then they are not translated. logical property name names (not fully
    * qualified) will still be translated to their physical name.
    * </p>
-   * <p>
    * <pre>{@code
    *
    *   raw("orderQty < shipQty")
    *
    * }</pre>
+   *
+   * <h4>Subquery example:</h4>
+   * <pre>{@code
+   *
+   *   .raw("t0.customer_id in (select customer_id from customer_group where group_id = any(?::uuid[]))", groupIds)
+   *
+   * }</pre>
    */
   ExpressionList<T> raw(String raw);
 
@@ -1276,12 +1275,10 @@ public interface ExpressionList<T> {
    * typically you only explicitly need to use the and() junction
    * when it is nested inside an or() or not() junction.
    * </p>
-   * <p>
    * <pre>{@code
    *
    *  // Example: Nested and()
    *
-   *  Ebean.find(Customer.class)
    *    .where()
    *    .or()
    *      .and() // nested and
@@ -1302,16 +1299,27 @@ public interface ExpressionList<T> {
    * Return a list of expressions that will be joined by OR's.
    * This is exactly the same as disjunction();
    * <p>
-   * <p>
    * Use endOr() or endJunction() to end the OR junction.
    * </p>
-   * <p>
+   *
+   * <pre>{@code
+   *
+   *  // Example: (status active OR anniversary is null)
+   *
+   *    .where()
+   *    .or()
+   *      .eq("status", Customer.Status.ACTIVE)
+   *      .isNull("anniversary")
+   *    .orderBy().asc("name")
+   *    .findList();
+   *
+   * }</pre>
+   *
    * <pre>{@code
    *
    *  // Example: Use or() to join
    *  // two nested and() expressions
    *
-   *  Ebean.find(Customer.class)
    *    .where()
    *    .or()
    *      .and()
@@ -1335,8 +1343,8 @@ public interface ExpressionList<T> {
    * Use endNot() or endJunction() to end expressions being added to the
    * NOT expression list.
    * </p>
-   * <p>
-   * <pre>@{code
+   *
+   * <pre>{@code
    *
    *    .where()
    *      .not()
@@ -1345,12 +1353,11 @@ public interface ExpressionList<T> {
    *        .endNot()
    *
    * }</pre>
-   * <p>
-   * <pre>@{code
+   *
+   * <pre>{@code
    *
    * // Example: nested not()
    *
-   * Ebean.find(Customer.class)
    *   .where()
    *     .eq("status", Customer.Status.ACTIVE)
    *     .not()

From 7984a9ccd1979ac888116b129d1d173c899bb2ab Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 16 Jan 2019 11:13:43 +1300
Subject: [PATCH 0667/1036] No effective change - update test to use try with
 resources

---
 .../io/ebean/EbeanServer_saveAllTest.java     | 23 ++++---------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/test/java/io/ebean/EbeanServer_saveAllTest.java b/src/test/java/io/ebean/EbeanServer_saveAllTest.java
index 69ded9704..6aa42c1b3 100644
--- a/src/test/java/io/ebean/EbeanServer_saveAllTest.java
+++ b/src/test/java/io/ebean/EbeanServer_saveAllTest.java
@@ -58,8 +58,7 @@ public class EbeanServer_saveAllTest extends BaseTestCase {
 
     EbeanServer server = Ebean.getDefaultServer();
 
-    Transaction transaction = server.beginTransaction();
-    try {
+    try (Transaction transaction = server.beginTransaction()) {
       transaction.setBatchMode(true);
       LoggedSqlCollector.start();
 
@@ -86,9 +85,6 @@ public class EbeanServer_saveAllTest extends BaseTestCase {
 
       // and we have our SQL from jdbc batch flush
       assertThat(LoggedSqlCollector.stop()).isNotEmpty();
-
-    } finally {
-      transaction.end();
     }
 
   }
@@ -121,12 +117,9 @@ public class EbeanServer_saveAllTest extends BaseTestCase {
 
     // act
     LoggedSqlCollector.start();
-    Transaction txn = server.beginTransaction();
-    try {
+    try (Transaction txn = server.beginTransaction()) {
       server.saveAll(someBeans, txn);
       txn.commit();
-    } finally {
-      txn.end();
     }
 
     // assert
@@ -142,12 +135,10 @@ public class EbeanServer_saveAllTest extends BaseTestCase {
 
     // act
     LoggedSqlCollector.start();
-    txn = server.beginTransaction();
-    try {
+
+    try (Transaction txn = server.beginTransaction()) {
       server.updateAll(someBeans, txn);
       txn.commit();
-    } finally {
-      txn.end();
     }
     loggedSql = LoggedSqlCollector.stop();
     for (String updateSql : loggedSql) {
@@ -157,18 +148,14 @@ public class EbeanServer_saveAllTest extends BaseTestCase {
 
     // act
     LoggedSqlCollector.start();
-    txn = server.beginTransaction();
-    try {
+    try (Transaction txn = server.beginTransaction()) {
       server.deleteAll(someBeans, txn);
       txn.commit();
-    } finally {
-      txn.end();
     }
     loggedSql = LoggedSqlCollector.stop();
     for (String updateSql : loggedSql) {
       assertThat(updateSql).contains("delete from e_basicver where id=? ");
     }
-
   }
 
 

From f8d4ad7f337a44f30eaa5e14e0b67703e37674c2 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 16 Jan 2019 15:44:45 +1300
Subject: [PATCH 0668/1036] No effective change - update on Transaction

---
 src/main/java/io/ebean/Transaction.java | 80 +++++++++++++++++--------
 1 file changed, 55 insertions(+), 25 deletions(-)

diff --git a/src/main/java/io/ebean/Transaction.java b/src/main/java/io/ebean/Transaction.java
index 043d381a2..4b0f24bf1 100644
--- a/src/main/java/io/ebean/Transaction.java
+++ b/src/main/java/io/ebean/Transaction.java
@@ -288,36 +288,66 @@ public interface Transaction extends AutoCloseable {
   boolean isSkipCache();
 
   /**
-   * Turn on or off statement batching. Statement batching can be transparent
-   * for drivers and databases that support getGeneratedKeys. Otherwise you may
-   * wish to specifically control when batching is used via this method.
-   * <p>
-   * Refer to <code>java.sql.PreparedStatement.addBatch();</code>
-   * <p>
-   * Note that you may also wish to use the setPersistCascade method to stop
-   * save and delete cascade behaviour. You may do this to have full control
-   * over the order of execution rather than the normal cascading fashion.
-   * </p>
-   * <p>
-   * Note that the <em>execution order</em> in batch mode may be different from
-   * non batch mode execution order. Also note that <em>insert behaviour</em>
-   * may be different depending on the JDBC driver and its support for
-   * getGeneratedKeys. That is, for JDBC drivers that do not support
-   * getGeneratedKeys you may not get back the generated IDs (used for inserting
-   * associated detail beans etc).
-   * </p>
+   * Turn on or off use of JDBC statement batching.
    * <p>
    * Calls to save(), delete(), insert() and execute() all support batch
-   * processing. This includes normal beans, MapBean, CallableSql and UpdateSql.
+   * processing. This includes normal beans, CallableSql and UpdateSql.
    * </p>
+   *
+   * <pre>{@code
+   *
+   * try (Transaction transaction = server.beginTransaction()) {
+   *
+   *   // turn on JDBC batch
+   *   transaction.setBatchMode(true);
+   *
+   *   // tune the batch size
+   *   transaction.setBatchSize(50);
+   *
+   *   ...
+   *
+   *   transaction.commit();
+   * }
+   *
+   * }</pre>
+   *
+   * <h3>getGeneratedKeys</h3>
    * <p>
-   * The flushing of the batched statements is automatic but you can call
-   * batchFlush when you like. Note that flushing occurs when a query is
-   * executed or when you mix UpdateSql and CallableSql with save and delete of
+   * Often with large batch inserts we want to turn off getGeneratedKeys. We do
+   * this via {@link #setBatchGetGeneratedKeys(boolean)}.
+   * Also note that some JDBC drivers do not support getGeneratedKeys in JDBC batch mode.
+   * </p>
+   * <pre>{@code
+   *
+   * try (Transaction transaction = server.beginTransaction()) {
+   *
+   *   transaction.setBatchMode(true);
+   *   transaction.setBatchSize(100);
+   *   // insert but don't bother getting back the generated keys
+   *   transaction.setBatchGetGeneratedKeys(false);
+   *
+   *
+   *   // perform lots of inserts ...
+   *   ...
+   *
+   *   transaction.commit();
+   * }
+   *
+   * }</pre>
+   *
+   * <h3>Flush</h3>
+   * <p>
+   * The batch is automatically flushed when it hits the batch size and also when we
+   * execute queries or when we mix UpdateSql and CallableSql with save and delete of
    * beans.
    * </p>
    * <p>
-   * Example: batch processing executing every 3 rows
+   * We use {@link #flush()} to explicitly flush the batch and we can use
+   * {@link #setBatchFlushOnQuery(boolean)} and {@link #setBatchFlushOnMixed(boolean)}
+   * to control the automatic flushing behaviour.
+   * </p>
+   * <p>
+   * Example: batch processing of CallableSql executing every 10 rows
    * </p>
    *
    * <pre>{@code
@@ -332,13 +362,13 @@ public interface Transaction extends AutoCloseable {
    * CallableSql cs = new CallableSql(sql);
    * cs.registerOut(2, Types.INTEGER);
    *
-   * // (optional) inform eBean this stored procedure
+   * // (optional) inform Ebean this stored procedure
    * // inserts into a table called sp_test
    * cs.addModification("sp_test", true, false, false);
    *
    * try (Transaction txn = ebeanServer.beginTransaction()) {
    *   txn.setBatchMode(true);
-   *   txn.setBatchSize(3);
+   *   txn.setBatchSize(10);
    *
    *   for (int i = 0; i < da.length;) {
    *     cs.setParameter(1, da[i]);

From b399713a85369910d8a2255fa445996ab36c0e4f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 17 Jan 2019 17:19:35 +1300
Subject: [PATCH 0669/1036] No effective change - update readme

---
 README.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 65f85b8e7..afd269257 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,11 @@
+[![Build Status](https://travis-ci.org/ebean-orm/ebean.svg?branch=master)](https://travis-ci.org/ebean-orm/ebean)
+[![Maven Central : ebean](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean)
+
 # Need help?
 Post questions or issues to the Ebean google group - https://groups.google.com/forum/#!forum/ebean
 
 # Documentation
-Goto [https://ebean-orm.github.io/](http://ebean-orm.github.io/ "Ebean ORM's Website")
+Goto [https://ebean.io/docs/](https://ebean.io/docs/)
 
 
 ## Maven cental links:
@@ -10,8 +13,7 @@ Goto [https://ebean-orm.github.io/](http://ebean-orm.github.io/ "Ebean ORM's Web
 
 [Maven central - all related projects](http://search.maven.org/#search%7Cga%7C1%7Cebean "maven central all related projects")
 
-## Current versions
-* [![Maven Central : ebean](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean) - ebean
+## Other versions
 * [![Maven Central : ebean-agent](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean-agent/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean-agent) - ebean-agent
 * [![Maven Central : ebean-maven-plugin](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean-maven-plugin/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean-maven-plugin) - ebean-maven-plugin
 

From c86e6b3cf9d5428a536a1b810fc27794626a157f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 21 Jan 2019 19:31:28 +1300
Subject: [PATCH 0670/1036] #1610 - Refactor: Change SQL logging such that jdbc
 batch use is more obvious

---
 .../server/persist/BatchControl.java          |  4 +--
 .../server/persist/dml/DmlHandler.java        | 22 ++++++++++--
 .../io/ebean/EbeanServer_saveAllTest.java     | 36 ++++++++-----------
 .../batchinsert/TestBatchInsertFlush.java     | 10 +++---
 ...tBatchInsertWithInitialisedCollection.java | 10 ++----
 .../org/tests/cascade/TestOrderedList.java    |  6 ++--
 .../java/org/tests/merge/TestMergeBasic.java  | 36 ++++++++-----------
 .../org/tests/merge/TestMergeCustomer.java    | 18 ++++------
 .../TestInsertBatchThenFlushThenUpdate.java   | 11 +++---
 .../basic/xtra/TestInsertBatchThenUpdate.java | 23 ++++--------
 ...TestInsertBatchWithDifferentRootTypes.java |  8 ++---
 .../TestElementCollectionBasic.java           |  8 ++---
 .../onetoone/TestOneToOneOrphanRemove.java    |  3 +-
 .../album/DeleteById_SoftDelete_Tests.java    | 12 +++----
 .../o2m/jointable/TestOneToManyJoinTable.java | 11 +++---
 .../TestOneToManyJoinTableInheritance.java    | 12 +++----
 .../TestSoftDeleteStatelessUpdate.java        |  2 +-
 .../update/TestUpdateAllLoadedProperties.java | 16 ++++-----
 18 files changed, 113 insertions(+), 135 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchControl.java b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
index 705e6807b..1658d664e 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
@@ -267,8 +267,8 @@ public final class BatchControl {
       if (transaction.isLogSummary()) {
         transaction.logSummary("BatchControl flush " + Arrays.toString(bsArray));
       }
-      for (BatchedBeanHolder aBsArray : bsArray) {
-        aBsArray.executeNow();
+      for (BatchedBeanHolder beanHolder : bsArray) {
+        beanHolder.executeNow();
       }
 
       if (resetTop) {
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
index ea1a05087..ad770bcaf 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
@@ -24,6 +24,8 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
   private static final Logger logger = LoggerFactory.getLogger(DmlHandler.class);
 
   private static final int[] GENERATED_KEY_COLUMNS = new int[]{1};
+  private static final int BATCHED_FIRST = 1;
+  private static final int BATCHED = 2;
 
   /**
    * The originating request.
@@ -49,6 +51,8 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
 
   protected String sql;
 
+  private short batchedStatus;
+
   protected DmlHandler(PersistRequestBean<?> persistRequest, boolean emptyStringToNull) {
     this.now = System.currentTimeMillis();
     this.persistRequest = persistRequest;
@@ -150,8 +154,20 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
    */
   protected void logSql(String sql) {
     if (logLevelSql) {
-      sql = Str.add(sql, "; --bind(", bindLog.toString(), ")");
-      transaction.logSql(sql);
+      switch (batchedStatus) {
+        case BATCHED_FIRST: {
+          transaction.logSql(sql);
+          transaction.logSql(Str.add(" -- bind(", bindLog.toString(), ")"));
+          return;
+        }
+        case BATCHED: {
+          transaction.logSql(Str.add(" -- bind(", bindLog.toString(), ")"));
+          return;
+        }
+        default: {
+          transaction.logSql(Str.add(sql, "; -- bind(", bindLog.toString(), ")"));
+        }
+      }
     }
   }
 
@@ -250,9 +266,11 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
     BatchedPstmtHolder batch = t.getBatchControl().getPstmtHolder();
     batchedPstmt = batch.getBatchedPstmt(sql, request);
     if (batchedPstmt != null) {
+      batchedStatus = BATCHED;
       return batchedPstmt.getStatement();
     }
 
+    batchedStatus = BATCHED_FIRST;
     PreparedStatement stmt = getPstmt(t, sql, genKeys);
 
     batchedPstmt = new BatchedPstmt(stmt, genKeys, sql, t);
diff --git a/src/test/java/io/ebean/EbeanServer_saveAllTest.java b/src/test/java/io/ebean/EbeanServer_saveAllTest.java
index 6aa42c1b3..0187adcf1 100644
--- a/src/test/java/io/ebean/EbeanServer_saveAllTest.java
+++ b/src/test/java/io/ebean/EbeanServer_saveAllTest.java
@@ -23,10 +23,9 @@ public class EbeanServer_saveAllTest extends BaseTestCase {
 
     // assert
     List<String> loggedSql = LoggedSqlCollector.stop();
-    for (String insertSql : loggedSql) {
-      assertThat(insertSql).contains("insert into e_basicver (");
-      assertThat(insertSql).contains("name, description, other, last_update) values (");
-    }
+    assertThat(loggedSql).hasSize(4);
+    assertThat(loggedSql.get(0)).contains("insert into e_basicver (");
+    assertThat(loggedSql.get(0)).contains("name, description, other, last_update) values (");
 
     for (EBasicVer someBean : someBeans) {
       someBean.setName(someBean.getName() + "-mod");
@@ -37,20 +36,17 @@ public class EbeanServer_saveAllTest extends BaseTestCase {
     Ebean.updateAll(someBeans);
 
     loggedSql = LoggedSqlCollector.stop();
-    for (String updateSql : loggedSql) {
-      assertThat(updateSql).contains("update e_basicver set name=?, last_update=? where id=? ");
-    }
 
+    assertThat(loggedSql).hasSize(3);
+    assertThat(loggedSql.get(0)).contains("update e_basicver set name=?, last_update=? where id=? ");
 
     // act
     LoggedSqlCollector.start();
     Ebean.deleteAll(someBeans);
 
     loggedSql = LoggedSqlCollector.stop();
-    for (String updateSql : loggedSql) {
-      assertThat(updateSql).contains("delete from e_basicver where id=? ");
-    }
-
+    assertThat(loggedSql).hasSize(4);
+    assertThat(loggedSql.get(0)).contains("delete from e_basicver where id=?");
   }
 
   @Test
@@ -124,10 +120,9 @@ public class EbeanServer_saveAllTest extends BaseTestCase {
 
     // assert
     List<String> loggedSql = LoggedSqlCollector.stop();
-    for (String insertSql : loggedSql) {
-      assertThat(insertSql).contains("insert into e_basicver (");
-      assertThat(insertSql).contains("name, description, other, last_update) values (");
-    }
+    assertThat(loggedSql).hasSize(4);
+    assertThat(loggedSql.get(0)).contains("insert into e_basicver (");
+    assertThat(loggedSql.get(0)).contains("name, description, other, last_update) values (");
 
     for (EBasicVer someBean : someBeans) {
       someBean.setName(someBean.getName() + "-mod");
@@ -141,10 +136,8 @@ public class EbeanServer_saveAllTest extends BaseTestCase {
       txn.commit();
     }
     loggedSql = LoggedSqlCollector.stop();
-    for (String updateSql : loggedSql) {
-      assertThat(updateSql).contains("update e_basicver set name=?, last_update=? where id=? ");
-    }
-
+    assertThat(loggedSql).hasSize(3);
+    assertThat(loggedSql.get(0)).contains("update e_basicver set name=?, last_update=? where id=? ");
 
     // act
     LoggedSqlCollector.start();
@@ -153,9 +146,8 @@ public class EbeanServer_saveAllTest extends BaseTestCase {
       txn.commit();
     }
     loggedSql = LoggedSqlCollector.stop();
-    for (String updateSql : loggedSql) {
-      assertThat(updateSql).contains("delete from e_basicver where id=? ");
-    }
+    assertThat(loggedSql).hasSize(4);
+    assertThat(loggedSql.get(0)).contains("delete from e_basicver where id=?");
   }
 
 
diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
index 2ec125a23..e9dcfb629 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
@@ -67,9 +67,9 @@ public class TestBatchInsertFlush extends BaseTestCase {
 
       // we get the 2 master inserts first
       assertThat(sql.get(0)).contains("insert into t_atable_thatisrelatively");
-      assertThat(sql.get(1)).contains("insert into t_atable_thatisrelatively");
+      assertThat(sql.get(1)).contains("-- bind(");
       // detail
-      assertThat(sql.get(2)).contains("insert into t_detail_with_other_namexxxyy");
+      assertThat(sql.get(3)).contains("insert into t_detail_with_other_namexxxyy");
 
       assertThat(((SpiTransaction)transaction).getLabel()).isEqualTo("TestBatchInsertFlush.no_cascade");
 
@@ -137,7 +137,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
     assertThat(LoggedSqlCollector.current()).isEmpty();
     Integer id = b1.getId();
     assertNotNull(id);
-    assertThat(LoggedSqlCollector.current()).hasSize(2);
+    assertThat(LoggedSqlCollector.current()).hasSize(3);
 
     EBasicVer b3 = new EBasicVer("b3");
     server.save(b3);
@@ -163,7 +163,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
       assertThat(LoggedSqlCollector.current()).isEmpty();
       Integer id = b1.getId();
       assertNotNull(id);
-      assertThat(LoggedSqlCollector.current()).hasSize(2);
+      assertThat(LoggedSqlCollector.current()).hasSize(3);
 
       EBasicVer b3 = new EBasicVer("b3");
       server.save(b3, txn);
@@ -229,7 +229,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
       server.save(b3, txn);
 
       txn.commit();
-      assertThat(LoggedSqlCollector.current()).hasSize(3);
+      assertThat(LoggedSqlCollector.current()).hasSize(5);
 
     } finally {
       txn.end();
diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java b/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java
index 3d5d936ef..5a6fadfca 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java
@@ -40,12 +40,8 @@ public class TestBatchInsertWithInitialisedCollection extends BaseTestCase {
     }
 
     List<String> loggedSql = LoggedSqlCollector.stop();
-    assertThat(loggedSql).hasSize(3);
-
-    for (String sql : loggedSql) {
-      assertThat(sql).contains("insert into o_cached_bean (");
-      assertThat(sql).contains("name) values (?");
-    }
-
+    assertThat(loggedSql).hasSize(4);
+    assertThat(loggedSql.get(0)).contains("insert into o_cached_bean (");
+    assertThat(loggedSql.get(0)).contains("name) values (?");
   }
 }
diff --git a/src/test/java/org/tests/cascade/TestOrderedList.java b/src/test/java/org/tests/cascade/TestOrderedList.java
index 4b8540adb..c0b08b4a8 100644
--- a/src/test/java/org/tests/cascade/TestOrderedList.java
+++ b/src/test/java/org/tests/cascade/TestOrderedList.java
@@ -78,7 +78,7 @@ public class TestOrderedList extends BaseTestCase {
     Ebean.save(fresh);
 
     sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(6);
+    assertThat(sql).hasSize(7);
     assertThat(sql.get(0)).contains("update om_ordered_master set name=?, version=?");
     assertThat(sql.get(1)).contains("update om_ordered_detail set version=?, sort_order=? where id=? and version=?");
 
@@ -87,10 +87,10 @@ public class TestOrderedList extends BaseTestCase {
     Ebean.save(fresh);
 
     sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(6);
+    assertThat(sql).hasSize(8);
     assertThat(sql.get(0)).contains("update om_ordered_master set name=?, version=?");
     assertThat(sql.get(1)).contains("update om_ordered_detail set version=?, sort_order=? where id=? and version=?");
-    assertThat(sql.get(2)).contains("update om_ordered_detail set name=?, version=?, sort_order=? where id=? and version=?");
+    assertThat(sql.get(3)).contains("update om_ordered_detail set name=?, version=?, sort_order=? where id=? and version=?");
 
 
     Ebean.delete(fresh);
diff --git a/src/test/java/org/tests/merge/TestMergeBasic.java b/src/test/java/org/tests/merge/TestMergeBasic.java
index d02861c5e..f23ee0884 100644
--- a/src/test/java/org/tests/merge/TestMergeBasic.java
+++ b/src/test/java/org/tests/merge/TestMergeBasic.java
@@ -60,20 +60,19 @@ public class TestMergeBasic extends BaseTestCase {
 
     // persist children ...
     if (isPersistBatchOnCascade()) {
-      assertThat(sql.get(3)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);");
-      assertThat(sql.get(4)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);");
-
-      assertThat(sql.get(5)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
+      assertThat(sql.get(3)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?)");
+      assertThat(sql.get(4)).contains("-- bind(");
+      assertThat(sql.get(5)).contains("-- bind(");
       assertThat(sql.get(6)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
-      assertThat(sql.get(7)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
-    }
-    else {
-      assertThat(sql.get(3)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);");
+      assertThat(sql.get(7)).contains("-- bind(");
+      assertThat(sql.get(8)).contains("-- bind(");
+      assertThat(sql.get(9)).contains("-- bind(");
 
+    } else {
+      assertThat(sql.get(3)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);");
       assertThat(sql.get(4)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
       assertThat(sql.get(5)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
       assertThat(sql.get(6)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
-      
       assertThat(sql.get(7)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);");
     }
   }
@@ -109,23 +108,16 @@ public class TestMergeBasic extends BaseTestCase {
 
     // persist children ...
     if (isPersistBatchOnCascade()) {
-      assertThat(sql.get(3)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);");
-      assertThat(sql.get(4)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);");
-  
-      assertThat(sql.get(5)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
+      assertThat(sql.get(3)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?)");
+      assertThat(sql.get(4)).contains("-- bind(");
+      assertThat(sql.get(5)).contains("-- bind(");
       assertThat(sql.get(6)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
-      assertThat(sql.get(7)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
-    }
-    else {
+      assertThat(sql.get(9)).contains("-- bind(");
+
+    } else {
       assertThat(sql.get(3)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);");
-
-      assertThat(sql.get(4)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
-      assertThat(sql.get(5)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
       assertThat(sql.get(6)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?");
-      
-      assertThat(sql.get(7)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);");
     }
-
   }
 
   private UUOne buildGraph() {
diff --git a/src/test/java/org/tests/merge/TestMergeCustomer.java b/src/test/java/org/tests/merge/TestMergeCustomer.java
index 6068d034d..4b4a38b78 100644
--- a/src/test/java/org/tests/merge/TestMergeCustomer.java
+++ b/src/test/java/org/tests/merge/TestMergeCustomer.java
@@ -279,11 +279,9 @@ public class TestMergeCustomer extends BaseTestCase {
     assertThat(sql.get(5)).contains("update mcustomer set name=?, version=?, shipping_address_id=?, billing_address_id=? where id=? and version=?");
     if (isPersistBatchOnCascade()) {
       assertThat(sql.get(6)).contains("insert into mcontact");
-      assertThat(sql.get(7)).contains("insert into mcontact");
-      assertThat(sql.get(8)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?");
-      assertThat(sql.get(11)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?");
-    }
-    else {
+      assertThat(sql.get(7)).contains("-- bind(");
+      assertThat(sql.get(9)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?");
+    } else {
       assertThat(sql.get(6)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?");
       assertThat(sql.get(7)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?");
       assertThat(sql.get(10)).contains("insert into mcontact");
@@ -327,14 +325,12 @@ public class TestMergeCustomer extends BaseTestCase {
 
     if (isPersistBatchOnCascade()) {
       assertThat(sql.get(8)).contains("insert into mcontact");
-      assertThat(sql.get(9)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?");
-  
-      assertThat(sql.get(13)).contains("update mcontact_message set title=?, subject=?, notes=?, version=?, contact_id=? where id=? and version=?");
-    }
-    else {
+      assertThat(sql.get(10)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?");
+      assertThat(sql.get(15)).contains("update mcontact_message set title=?, subject=?, notes=?, version=?, contact_id=? where id=? and version=?");
+    } else {
       assertThat(sql.get(8)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?");
       assertThat(sql.get(9)).contains("update mcontact_message set title=?, subject=?, notes=?, version=?, contact_id=? where id=? and version=?");
-      
+
       assertThat(sql.get(sql.size()-1)).contains("insert into mcontact");
     }
 
diff --git a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java
index 9b8334b62..294e8d898 100644
--- a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java
+++ b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java
@@ -11,6 +11,7 @@ import org.junit.Test;
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -21,8 +22,7 @@ public class TestInsertBatchThenFlushThenUpdate extends BaseTestCase {
   public void test() {
 
     LoggedSqlCollector.start();
-    Transaction txn = Ebean.beginTransaction();
-    try {
+    try (Transaction txn = Ebean.beginTransaction()) {
       txn.setBatchMode(true);
 
       EdParent parent = new EdParent();
@@ -43,7 +43,7 @@ public class TestInsertBatchThenFlushThenUpdate extends BaseTestCase {
       txn.flushBatch();
 
       List<String> loggedSql1 = LoggedSqlCollector.start();
-      assertEquals(loggedSql1.toString(), 2, loggedSql1.size());
+      assertThat(loggedSql1).hasSize(4);
 
       parent.setName("MyDesk");
       Ebean.save(parent);
@@ -55,11 +55,8 @@ public class TestInsertBatchThenFlushThenUpdate extends BaseTestCase {
 
       // insert statements for EdExtendedParent
       List<String> loggedSql2 = LoggedSqlCollector.start();
-      assertEquals(1, loggedSql2.size());
+      assertEquals(2, loggedSql2.size());
       assertTrue(loggedSql2.get(0).contains(" update td_parent "));
-
-    } finally {
-      Ebean.endTransaction();
     }
   }
 
diff --git a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java
index 7d9e1d3c0..7ccd6c4d2 100644
--- a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java
+++ b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java
@@ -12,7 +12,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
 
 public class TestInsertBatchThenUpdate extends BaseTestCase {
 
@@ -21,8 +20,7 @@ public class TestInsertBatchThenUpdate extends BaseTestCase {
   public void test() {
 
     LoggedSqlCollector.start();
-    Transaction txn = Ebean.beginTransaction();
-    try {
+    try (Transaction txn = Ebean.beginTransaction()) {
       txn.setBatchMode(true);
 
       LoggedSqlCollector.start();
@@ -50,13 +48,10 @@ public class TestInsertBatchThenUpdate extends BaseTestCase {
 
       // insert statements for EdExtendedParent
       List<String> loggedSql = LoggedSqlCollector.stop();
-      assertThat(loggedSql).hasSize(3);
+      assertThat(loggedSql).hasSize(6);
       assertThat(loggedSql.get(0)).contains("insert into td_parent");
-      assertThat(loggedSql.get(1)).contains("insert into td_child ");
-      assertThat(loggedSql.get(2)).contains("update td_parent set parent_name=? where parent_id=?");
-
-    } finally {
-      Ebean.endTransaction();
+      assertThat(loggedSql.get(2)).contains("insert into td_child ");
+      assertThat(loggedSql.get(4)).contains("update td_parent set parent_name=? where parent_id=?");
     }
   }
 
@@ -66,8 +61,7 @@ public class TestInsertBatchThenUpdate extends BaseTestCase {
   public void test_noFlushOn_getterOfNonGeneratedProperty() {
 
     LoggedSqlCollector.start();
-    Transaction txn = Ebean.beginTransaction();
-    try {
+    try (Transaction txn = Ebean.beginTransaction()) {
       txn.setBatchMode(true);
 
       LoggedSqlCollector.start();
@@ -97,12 +91,9 @@ public class TestInsertBatchThenUpdate extends BaseTestCase {
 
       // insert statements for EdExtendedParent
       List<String> loggedSql = LoggedSqlCollector.stop();
-      assertEquals(2, loggedSql.size());
+      assertThat(loggedSql).hasSize(4);
       assertThat(loggedSql.get(0)).contains("insert into td_parent");
-      assertThat(loggedSql.get(1)).contains("insert into td_child ");
-
-    } finally {
-      Ebean.endTransaction();
+      assertThat(loggedSql.get(2)).contains("insert into td_child ");
     }
   }
 
diff --git a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java
index ca7d8e957..9bfe75f00 100644
--- a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java
+++ b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java
@@ -20,8 +20,8 @@ public class TestInsertBatchWithDifferentRootTypes extends BaseTestCase {
   public void testDifferRootTypes() {
 
     LoggedSqlCollector.start();
-    Transaction txn = Ebean.beginTransaction();
-    try {
+
+    try (Transaction txn = Ebean.beginTransaction())  {
       txn.setBatchMode(true);
 
       EdParent parent = new EdParent();
@@ -63,10 +63,8 @@ public class TestInsertBatchWithDifferentRootTypes extends BaseTestCase {
 
       // insert statements for EdExtendedParent
       List<String> loggedSql2 = LoggedSqlCollector.start();
-      assertEquals(4, loggedSql2.size());
+      assertEquals(7, loggedSql2.size());
 
-    } finally {
-      Ebean.endTransaction();
     }
   }
 
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
index bcbb642f8..03daa1dab 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
@@ -114,7 +114,7 @@ public class TestElementCollectionBasic extends BaseTestCase {
     }
 
     List<String> sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(1);
+    assertThat(sql).hasSize(2);
     assertThat(sql.get(0)).contains("update ec_person");
 
     assertThat(eventLog()).containsExactly("preUpdate", "postUpdate");
@@ -160,10 +160,10 @@ public class TestElementCollectionBasic extends BaseTestCase {
     }
 
     List<String> sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(3);
+    assertThat(sql).hasSize(4);
     assertThat(sql.get(0)).contains("update ec_person set name=?, version=? where id=? and version=?");
-    assertThat(sql.get(1)).contains("delete from ec_person_phone where owner_id=?");
-    assertThat(sql.get(2)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
+    assertThat(sql.get(2)).contains("delete from ec_person_phone where owner_id=?");
+    assertThat(sql.get(3)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
 
     assertThat(eventLog()).containsExactly("preUpdate", "postUpdate");
 
diff --git a/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java b/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java
index 3dca53db0..e0f3ed0f4 100644
--- a/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java
+++ b/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java
@@ -30,10 +30,11 @@ public class TestOneToOneOrphanRemove extends BaseTestCase {
     Ebean.save(jack);
 
     List<String> sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(3);
+    assertThat(sql).hasSize(4);
     assertThat(sql.get(0)).contains("delete from oto_cust_address where aid=? and version=?");
     assertThat(sql.get(1)).contains("update oto_cust set version=? where cid=? and version=?");
     assertThat(sql.get(2)).contains("insert into oto_cust_address ");
+    assertThat(sql.get(3)).contains("-- bind(other1");
 
     jack.setAddress(null);
     Ebean.save(jack);
diff --git a/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java b/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java
index 8455e5669..b22d92340 100644
--- a/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java
+++ b/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java
@@ -61,7 +61,7 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("update cover set deleted=? where id=?; --bind(false");
+    assertThat(sql.get(0)).contains("update cover set deleted=? where id=?; -- bind(false");
 
     Cover findAgain = Ebean.find(Cover.class, cover.getId());
     assertNotNull(findAgain);
@@ -215,7 +215,7 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
     Ebean.deleteAll(beans);
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(sql).hasSize(2);
+    assertThat(sql).hasSize(3);
     if (isPersistBatchOnCascade()) {
       assertThat(sql.get(0)).contains("update cover set s3_url=?, deleted=? where id=?");
     }
@@ -236,7 +236,7 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
     server.deleteAll(beans);
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(sql).hasSize(2);
+    assertThat(sql).hasSize(3);
     if (isPersistBatchOnCascade()) {
       assertThat(sql.get(0)).contains("update cover set s3_url=?, deleted=? where id=?");
     }
@@ -263,7 +263,7 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
     }
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(sql).hasSize(2);
+    assertThat(sql).hasSize(3);
     if (isPersistBatchOnCascade()) {
       assertThat(sql.get(0)).contains("update cover set s3_url=?, deleted=? where id=?");
     }
@@ -284,7 +284,7 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
     server.deleteAllPermanent(beans);
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(sql).hasSize(2);
+    assertThat(sql).hasSize(3);
     assertThat(sql.get(0)).contains("delete from cover where id=?");
   }
 
@@ -306,7 +306,7 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
     }
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(sql).hasSize(2);
+    assertThat(sql).hasSize(3);
     assertThat(sql.get(0)).contains("delete from cover where id=?");
   }
 
diff --git a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java
index 98e405a36..687bccdf8 100644
--- a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java
+++ b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java
@@ -97,13 +97,14 @@ public class TestOneToManyJoinTable extends BaseTestCase {
     //Collections.sort(sql);
 
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(6);
+      assertThat(sql).hasSize(8);
       assertThat(sql.get(0)).contains("insert into trainer ");
       assertThat(sql.get(1)).contains("insert into monkey ");
-      assertThat(sql.get(4)).contains("update monkey set name=?, food_preference=?, version=? where mid=? and version=?");
-      assertThat(sql.get(5)).contains("insert into trainer_monkey ");
-    }
-    else {
+      assertThat(sql.get(5)).contains("update monkey set name=?, food_preference=?, version=? where mid=? and version=?");
+      assertThat(sql.get(6)).contains("-- bind(");
+      assertThat(sql.get(7)).contains("insert into trainer_monkey ");
+
+    } else {
       assertThat(sql).hasSize(10);
       assertThat(sql.get(0)).contains("insert into trainer ");
       assertThat(sql.get(1)).contains("update monkey set food_preference=?, version=? where mid=? and version=?");
diff --git a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java
index 5468434bc..3de523684 100644
--- a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java
+++ b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java
@@ -34,14 +34,14 @@ public class TestOneToManyJoinTableInheritance extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.current();
 
-    assertThat(sql).hasSize(7);
+    assertThat(sql).hasSize(11);
     assertThat(sql.get(0)).contains("insert into class_super ");
-    assertThat(sql.get(1)).contains("insert into monkey ");
     assertThat(sql.get(2)).contains("insert into monkey ");
-    assertThat(sql.get(3)).contains("insert into class_super_monkey ");
-    assertThat(sql.get(4)).contains("insert into class_super ");
-    assertThat(sql.get(5)).contains("insert into monkey ");
-    assertThat(sql.get(6)).contains("insert into class_super_monkey ");
+    assertThat(sql.get(2)).contains("insert into monkey ");
+    assertThat(sql.get(5)).contains("insert into class_super_monkey ");
+    assertThat(sql.get(6)).contains("insert into class_super ");
+    assertThat(sql.get(8)).contains("insert into monkey ");
+    assertThat(sql.get(10)).contains("insert into class_super_monkey ");
 
     ClassA dbA = Ebean.find(ClassA.class, 1);
     ClassB dbB = Ebean.find(ClassB.class, 2);
diff --git a/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java b/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java
index 3e2875c2b..720447f58 100644
--- a/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java
+++ b/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java
@@ -41,7 +41,7 @@ public class TestSoftDeleteStatelessUpdate extends BaseTestCase {
     Ebean.getDefaultServer().update(upd, null, true);
 
     List<String> sql = LoggedSql.collect();
-    assertThat(sql).hasSize(4);
+    assertThat(sql).hasSize(5);
     assertThat(sql.get(0)).contains("update esd_master set name=? where id=?");
     if (isPlatformBooleanNative()) {
       assertThat(sql.get(1)).contains("update esd_detail set deleted=true where master_id = ? and not");
diff --git a/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java b/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java
index b3d4812cb..38c33c206 100644
--- a/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java
+++ b/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java
@@ -4,9 +4,9 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import io.ebean.Transaction;
-import org.tests.model.basic.EBasicVer;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
+import org.tests.model.basic.EBasicVer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -29,8 +29,7 @@ public class TestUpdateAllLoadedProperties extends BaseTestCase {
 
 
     EbeanServer server = Ebean.getDefaultServer();
-    Transaction txn = server.beginTransaction();
-    try {
+    try (Transaction txn = server.beginTransaction()) {
 
       txn.setUpdateAllLoadedProperties(true);
 
@@ -49,11 +48,8 @@ public class TestUpdateAllLoadedProperties extends BaseTestCase {
 
       assertEquals(2, loggedSql.size());
       // all properties in the bean
-      assertThat(loggedSql.get(0)).contains("update e_basicver set name=?, description=?, other=?, last_update=? where id=? and last_update=?; --bind(");
-      assertThat(loggedSql.get(1)).contains("update e_basicver set name=?, description=?, other=?, last_update=? where id=? and last_update=?; --bind(");
-
-    } finally {
-      txn.end();
+      assertThat(loggedSql.get(0)).contains("update e_basicver set name=?, description=?, other=?, last_update=? where id=? and last_update=?; -- bind(");
+      assertThat(loggedSql.get(1)).contains("update e_basicver set name=?, description=?, other=?, last_update=? where id=? and last_update=?; -- bind(");
     }
 
     testPartiallyLoaded(basic1.getId(), basic2.getId());
@@ -99,8 +95,8 @@ public class TestUpdateAllLoadedProperties extends BaseTestCase {
     List<String> loggedSql = LoggedSqlCollector.stop();
 
     assertThat(loggedSql).hasSize(2);
-    assertThat(loggedSql.get(0)).contains("update e_basicver set name=?, other=? where id=?; --bind(");
-    assertThat(loggedSql.get(1)).contains("update e_basicver set name=?, other=? where id=?; --bind(");
+    assertThat(loggedSql.get(0)).contains("update e_basicver set name=?, other=? where id=?; -- bind(");
+    assertThat(loggedSql.get(1)).contains("update e_basicver set name=?, other=? where id=?; -- bind(");
 
   }
 }

From 471691c747be2378a685d470a0cc8ab4de485720 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 21 Jan 2019 20:01:57 +1300
Subject: [PATCH 0671/1036] #1611 - ENH: Add inRange expression (as half open
 expression) ... (property >= lowerValue and property < upperValue)

---
 src/main/java/io/ebean/Expr.java              | 11 +++
 src/main/java/io/ebean/ExpressionFactory.java |  8 +++
 src/main/java/io/ebean/ExpressionList.java    | 10 ++-
 .../expression/DefaultExpressionFactory.java  | 16 ++---
 .../expression/DefaultExpressionList.java     |  6 ++
 .../server/expression/InRangeExpression.java  | 61 ++++++++++++++++
 .../server/expression/JunctionExpression.java |  5 ++
 .../server/grammer/EqlAdapterHelper.java      |  4 ++
 .../expression/InRangeExpressionTest.java     | 69 +++++++++++++++++++
 .../tests/basic/TestQueryWhereInRange.java    | 31 +++++++++
 10 files changed, 212 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java
 create mode 100644 src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java
 create mode 100644 src/test/java/org/tests/basic/TestQueryWhereInRange.java

diff --git a/src/main/java/io/ebean/Expr.java b/src/main/java/io/ebean/Expr.java
index 08c828fc8..0bf0ddc4d 100644
--- a/src/main/java/io/ebean/Expr.java
+++ b/src/main/java/io/ebean/Expr.java
@@ -64,6 +64,17 @@ public class Expr {
     return Ebean.getExpressionFactory().ieq(propertyName, value);
   }
 
+  /**
+   * In Range - property >= value1 and property < value2.
+   * <p>
+   * Unlike Between inRange is "half open" and usually more useful for use with dates or timestamps.
+   * </p>
+   */
+  public static Expression inRange(String propertyName, Object value1, Object value2) {
+
+    return Ebean.getExpressionFactory().inRange(propertyName, value1, value2);
+  }
+
   /**
    * Between - property between the two given values.
    */
diff --git a/src/main/java/io/ebean/ExpressionFactory.java b/src/main/java/io/ebean/ExpressionFactory.java
index bd5f0a590..e3455cc3f 100644
--- a/src/main/java/io/ebean/ExpressionFactory.java
+++ b/src/main/java/io/ebean/ExpressionFactory.java
@@ -149,6 +149,14 @@ public interface ExpressionFactory {
    */
   Expression ineObject(String propertyName, Object value);
 
+  /**
+   * In Range - property >= value1 and property < value2.
+   * <p>
+   * Unlike Between inRange is "half open" and usually more useful for use with dates or timestamps.
+   * </p>
+   */
+  Expression inRange(String propertyName, Object value1, Object value2);
+
   /**
    * Between - property between the two given values.
    */
diff --git a/src/main/java/io/ebean/ExpressionList.java b/src/main/java/io/ebean/ExpressionList.java
index 86dfdfe49..4e8bf5e62 100644
--- a/src/main/java/io/ebean/ExpressionList.java
+++ b/src/main/java/io/ebean/ExpressionList.java
@@ -803,8 +803,16 @@ public interface ExpressionList<T> {
   ExpressionList<T> ine(String propertyName, String value);
 
   /**
-   * Between - property between the two given values.
+   * In Range - property >= value1 and property < value2.
+   * <p>
+   * Unlike Between inRange is "half open" and usually more useful for use with dates or timestamps.
+   * </p>
    */
+  ExpressionList<T> inRange(String propertyName, Object value1, Object value2);
+
+    /**
+     * Between - property between the two given values.
+     */
   ExpressionList<T> between(String propertyName, Object value1, Object value2);
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
index 43d0fae18..ba845529d 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
@@ -217,8 +217,15 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
    * Between - property between the two given values.
    */
   @Override
-  public Expression between(String propertyName, Object value1, Object value2) {
+  public Expression inRange(String propertyName, Object value1, Object value2) {
+    return new InRangeExpression(propertyName, value1, value2);
+  }
 
+  /**
+   * Between - property between the two given values.
+   */
+  @Override
+  public Expression between(String propertyName, Object value1, Object value2) {
     return new BetweenExpression(propertyName, value1, value2);
   }
 
@@ -227,7 +234,6 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
    */
   @Override
   public Expression betweenProperties(String lowProperty, String highProperty, Object value) {
-
     return new BetweenPropertyExpression(lowProperty, highProperty, value);
   }
 
@@ -236,7 +242,6 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
    */
   @Override
   public Expression gt(String propertyName, Object value) {
-
     return new SimpleExpression(propertyName, Op.GT, value);
   }
 
@@ -246,7 +251,6 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
    */
   @Override
   public Expression ge(String propertyName, Object value) {
-
     return new SimpleExpression(propertyName, Op.GT_EQ, value);
   }
 
@@ -255,7 +259,6 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
    */
   @Override
   public Expression lt(String propertyName, Object value) {
-
     return new SimpleExpression(propertyName, Op.LT, value);
   }
 
@@ -264,7 +267,6 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
    */
   @Override
   public Expression le(String propertyName, Object value) {
-
     return new SimpleExpression(propertyName, Op.LT_EQ, value);
   }
 
@@ -273,7 +275,6 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
    */
   @Override
   public Expression isNull(String propertyName) {
-
     return new NullExpression(propertyName, false);
   }
 
@@ -282,7 +283,6 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
    */
   @Override
   public Expression isNotNull(String propertyName) {
-
     return new NullExpression(propertyName, true);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 4d4d6c432..9f472b255 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -794,6 +794,12 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return this;
   }
 
+  @Override
+  public ExpressionList<T> inRange(String propertyName, Object value1, Object value2) {
+    add(expr.inRange(propertyName, value1, value2));
+    return this;
+  }
+
   @Override
   public ExpressionList<T> between(String propertyName, Object value1, Object value2) {
     add(expr.between(propertyName, value1, value2));
diff --git a/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java b/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java
new file mode 100644
index 000000000..837186871
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java
@@ -0,0 +1,61 @@
+package io.ebeaninternal.server.expression;
+
+import io.ebeaninternal.api.SpiExpression;
+import io.ebeaninternal.api.SpiExpressionRequest;
+
+import java.io.IOException;
+
+class InRangeExpression extends AbstractExpression {
+
+  private final Object valueHigh;
+
+  private final Object valueLow;
+
+  InRangeExpression(String propertyName, Object valueLow, Object valueHigh) {
+    super(propertyName);
+    this.valueLow = valueLow;
+    this.valueHigh = valueHigh;
+  }
+
+  private Object low() {
+    return NamedParamHelp.value(valueLow);
+  }
+
+  private Object high() {
+    return NamedParamHelp.value(valueHigh);
+  }
+
+  @Override
+  public void writeDocQuery(DocQueryContext context) throws IOException {
+    context.writeRange(propName, Op.GT_EQ, low(), Op.LT, high());
+  }
+
+  @Override
+  public void addBindValues(SpiExpressionRequest request) {
+    request.addBindValue(low());
+    request.addBindValue(high());
+  }
+
+  @Override
+  public void addSql(SpiExpressionRequest request) {
+    request.append("(").append(propName).append(" >= ? and ").append(propName).append(" < ?) ");
+  }
+
+  @Override
+  public void queryPlanHash(StringBuilder builder) {
+    builder.append("InRange[").append(propName).append("]");
+  }
+
+  @Override
+  public int queryBindHash() {
+    int hc = low().hashCode();
+    hc = hc * 92821 + high().hashCode();
+    return hc;
+  }
+
+  @Override
+  public boolean isSameByBind(SpiExpression other) {
+    InRangeExpression that = (InRangeExpression) other;
+    return low().equals(that.low()) && high().equals(that.high());
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index cd74c635d..8d0f8f924 100644
--- a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -280,6 +280,11 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.and(expOne, expTwo);
   }
 
+  @Override
+  public ExpressionList<T> inRange(String propertyName, Object value1, Object value2) {
+    return exprList.inRange(propertyName, value1, value2);
+  }
+
   @Override
   public ExpressionList<T> between(String propertyName, Object value1, Object value2) {
     return exprList.between(propertyName, value1, value2);
diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlAdapterHelper.java b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapterHelper.java
index fabbcfe8e..70b9355ab 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/EqlAdapterHelper.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapterHelper.java
@@ -49,6 +49,10 @@ class EqlAdapterHelper {
     peekExprList().between(path, bind(value1), bind(value2));
   }
 
+  protected void addInRange(String path, String value1, String value2) {
+    peekExprList().inRange(path, bind(value1), bind(value2));
+  }
+
   protected void addIn(String path, List<Object> inValues) {
     peekExprList().in(path, inValues);
   }
diff --git a/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java
new file mode 100644
index 000000000..44ee53eb4
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java
@@ -0,0 +1,69 @@
+package io.ebeaninternal.server.expression;
+
+import io.ebeaninternal.api.SpiExpression;
+import org.junit.Test;
+
+import static org.assertj.core.api.StrictAssertions.assertThat;
+
+public class InRangeExpressionTest extends BaseExpressionTest {
+
+  @Test
+  public void addSql() {
+
+    DefaultExpressionRequest expReq = newExpressionRequest();
+
+    InRangeExpression exp = new InRangeExpression("startDate", 1, 2);
+    exp.addSql(expReq);
+
+    assertThat(expReq.getSql()).isEqualTo("(startDate >= ? and startDate < ?) ");
+  }
+
+  @Test
+  public void copyForPlanKey_isSameInstance() {
+
+    InRangeExpression exp = new InRangeExpression("startDate", 1, 2);
+    SpiExpression other = exp.copyForPlanKey();
+
+    assertThat(exp).isSameAs(other);
+  }
+
+  @Test
+  public void isSameByPlan_when_properties_match() {
+
+    InRangeExpression exp0 = new InRangeExpression("startDate", 1, 2);
+    InRangeExpression exp1 = new InRangeExpression("startDate", 3, 4);
+
+    same(exp0, exp1);
+    same(exp1, exp0);
+  }
+
+  @Test
+  public void isSameByPlan_when_properties_do_not_match() {
+
+    InRangeExpression exp0 = new InRangeExpression("startDate", 1, 2);
+    InRangeExpression exp1 = new InRangeExpression("endDate", 1, 2);
+
+    different(exp0, exp1);
+    different(exp1, exp0);
+  }
+
+  @Test
+  public void isSameByBind_when_values_do_not_match() {
+
+    InRangeExpression exp0 = new InRangeExpression("startDate", 1, 2);
+    InRangeExpression exp1 = new InRangeExpression("startDate", 1, 3);
+
+    assertThat(exp0.isSameByBind(exp1)).isFalse();
+    assertThat(exp1.isSameByBind(exp0)).isFalse();
+  }
+
+  @Test
+  public void isSameByBind_when_values_match() {
+
+    InRangeExpression exp0 = new InRangeExpression("startDate", 1, 2);
+    InRangeExpression exp1 = new InRangeExpression("startDate", 1, 2);
+
+    assertThat(exp0.isSameByBind(exp1)).isTrue();
+    assertThat(exp1.isSameByBind(exp0)).isTrue();
+  }
+}
diff --git a/src/test/java/org/tests/basic/TestQueryWhereInRange.java b/src/test/java/org/tests/basic/TestQueryWhereInRange.java
new file mode 100644
index 000000000..86de95624
--- /dev/null
+++ b/src/test/java/org/tests/basic/TestQueryWhereInRange.java
@@ -0,0 +1,31 @@
+package org.tests.basic;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.Query;
+import org.junit.Test;
+import org.tests.model.basic.Order;
+import org.tests.model.basic.ResetBasicData;
+
+import java.time.LocalDate;
+
+public class TestQueryWhereInRange extends BaseTestCase {
+
+  @Test
+  public void inRange() {
+
+    ResetBasicData.reset();
+
+    LocalDate today = LocalDate.now();
+
+    Query<Order> query= Ebean.find(Order.class)
+      .where().inRange("orderDate", today.minusDays(7), today)
+      .isNotNull("id")
+      .query();
+
+    query.findList();
+
+    sqlOf(query).contains("(order_date >= ? and order_date < ?)");
+
+  }
+}

From 0cb8bb0415aa20ce142071b756e6cf199a3e9440 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 21 Jan 2019 20:28:38 +1300
Subject: [PATCH 0672/1036] #1611 - ENH: Add inRange expression (as half open
 expression) ... (property >= lowerValue and property < upperValue)

Add inrange to EQL grammer
---
 .../server/grammer/EqlAdapter.java            |   11 +
 .../server/grammer/EqlOperator.java           |    1 +
 .../server/grammer/OperatorMapping.java       |    1 +
 .../server/grammer/antlr/EQL.interp           |  190 +
 .../server/grammer/antlr/EQL.tokens           |   92 +-
 .../server/grammer/antlr/EQLBaseListener.java | 1448 ++---
 .../server/grammer/antlr/EQLLexer.interp      |  224 +
 .../server/grammer/antlr/EQLLexer.java        |  553 +-
 .../server/grammer/antlr/EQLLexer.tokens      |   92 +-
 .../server/grammer/antlr/EQLListener.java     | 1052 ++--
 .../server/grammer/antlr/EQLParser.java       | 5381 ++++++++---------
 .../server/grammer/EqlParserTest.java         |   20 +
 src/test/resources/EQL.g4                     |    7 +-
 13 files changed, 4338 insertions(+), 4734 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.interp
 create mode 100644 src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp

diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java
index 837e24d29..873c6d88e 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java
@@ -191,6 +191,17 @@ class EqlAdapter<T> extends EQLBaseListener {
     return pathToken.getText();
   }
 
+  @Override
+  public void enterInrange_expression(EQLParser.Inrange_expressionContext ctx) {
+    checkChildren(ctx, 5);
+    String path = getLeftHandSidePath(ctx);
+    EqlOperator op = getOperator(ctx);
+    if (op != EqlOperator.INRANGE) {
+      throw new IllegalStateException("Expecting INRANGE operator but got " + op);
+    }
+    helper.addInRange(path, child(ctx, 2), child(ctx, 4));
+  }
+
   @Override
   public void enterBetween_expression(EQLParser.Between_expressionContext ctx) {
 
diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlOperator.java b/src/main/java/io/ebeaninternal/server/grammer/EqlOperator.java
index b3cb4c6ba..809413fd2 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/EqlOperator.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlOperator.java
@@ -18,6 +18,7 @@ enum EqlOperator {
   ISTARTS_WITH,
   IENDS_WITH,
   ILIKE,
+  INRANGE,
   BETWEEN
 
 }
diff --git a/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java b/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java
index 8e6315eec..2bc0e202b 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java
@@ -41,6 +41,7 @@ class OperatorMapping {
     map.put("iendsWith", EqlOperator.IENDS_WITH);
     map.put("ilike", EqlOperator.ILIKE);
 
+    map.put("inrange", EqlOperator.INRANGE);
     map.put("between", EqlOperator.BETWEEN);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.interp b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.interp
new file mode 100644
index 000000000..de112001d
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.interp
@@ -0,0 +1,190 @@
+token literal names:
+null
+'select'
+'('
+')'
+'distinct'
+'where'
+'order'
+'by'
+','
+'nulls'
+'first'
+'last'
+'asc'
+'desc'
+'limit'
+'offset'
+'fetch'
+'+'
+'query'
+'lazy'
+'or'
+'and'
+'not'
+'in'
+'between'
+'inrange'
+'to'
+'is'
+'null'
+'isNull'
+'isNotNull'
+'notNull'
+'empty'
+'isEmpty'
+'isNotEmpty'
+'notEmpty'
+'like'
+'ilike'
+'contains'
+'icontains'
+'startsWith'
+'istartsWith'
+'endsWith'
+'iendsWith'
+'='
+'eq'
+'>'
+'gt'
+'>='
+'ge'
+'gte'
+'<'
+'lt'
+'<='
+'le'
+'lte'
+'<>'
+'!='
+'ne'
+'ieq'
+'ine'
+null
+null
+null
+null
+null
+null
+'0'
+null
+null
+
+token symbolic names:
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+INPUT_VARIABLE
+PATH_VARIABLE
+BOOLEAN_LITERAL
+NUMBER_LITERAL
+DOUBLE
+INT
+ZERO
+STRING_LITERAL
+WS
+
+rule names:
+select_statement
+select_clause
+distinct
+fetch_clause
+where_clause
+orderby_clause
+orderby_property
+nulls_firstlast
+asc_desc
+limit_clause
+offset_clause
+fetch_path
+fetch_property_set
+fetch_property_group
+fetch_property
+fetch_query_hint
+fetch_lazy_hint
+fetch_option
+fetch_query_option
+fetch_lazy_option
+fetch_batch_size
+conditional_expression
+conditional_term
+conditional_factor
+conditional_primary
+any_expression
+in_expression
+in_value
+between_expression
+inrange_expression
+propertyBetween_expression
+isNull_expression
+isNotNull_expression
+isEmpty_expression
+isNotEmpty_expression
+like_expression
+like_op
+comparison_expression
+comparison_operator
+value_expression
+literal
+
+
+atn:
+[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 71, 338, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 3, 2, 5, 2, 86, 10, 2, 3, 2, 7, 2, 89, 10, 2, 12, 2, 14, 2, 92, 11, 2, 3, 2, 5, 2, 95, 10, 2, 3, 2, 5, 2, 98, 10, 2, 3, 2, 5, 2, 101, 10, 2, 3, 2, 3, 2, 3, 3, 3, 3, 5, 3, 107, 10, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 7, 7, 125, 10, 7, 12, 7, 14, 7, 128, 11, 7, 3, 8, 3, 8, 5, 8, 132, 10, 8, 3, 8, 5, 8, 135, 10, 8, 3, 9, 3, 9, 3, 9, 3, 9, 5, 9, 141, 10, 9, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 5, 11, 148, 10, 11, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 5, 13, 155, 10, 13, 3, 13, 3, 13, 5, 13, 159, 10, 13, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 7, 15, 168, 10, 15, 12, 15, 14, 15, 171, 11, 15, 3, 16, 3, 16, 3, 16, 5, 16, 176, 10, 16, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 19, 3, 19, 5, 19, 186, 10, 19, 3, 20, 3, 20, 5, 20, 190, 10, 20, 3, 21, 3, 21, 5, 21, 194, 10, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 23, 7, 23, 203, 10, 23, 12, 23, 14, 23, 206, 11, 23, 3, 24, 3, 24, 3, 24, 7, 24, 211, 10, 24, 12, 24, 14, 24, 214, 11, 24, 3, 25, 5, 25, 217, 10, 25, 3, 25, 3, 25, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 5, 26, 226, 10, 26, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 5, 27, 242, 10, 27, 3, 28, 3, 28, 3, 28, 3, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 7, 29, 253, 10, 29, 12, 29, 14, 29, 256, 11, 29, 3, 29, 3, 29, 5, 29, 260, 10, 29, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 5, 33, 285, 10, 33, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 5, 34, 295, 10, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 5, 35, 302, 10, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 5, 36, 312, 10, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 38, 3, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 5, 39, 328, 10, 39, 3, 40, 3, 40, 3, 41, 3, 41, 5, 41, 334, 10, 41, 3, 42, 3, 42, 3, 42, 2, 2, 43, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 2, 6, 3, 2, 14, 15, 3, 2, 38, 45, 3, 2, 46, 62, 4, 2, 65, 66, 70, 70, 2, 339, 2, 85, 3, 2, 2, 2, 4, 104, 3, 2, 2, 2, 6, 112, 3, 2, 2, 2, 8, 114, 3, 2, 2, 2, 10, 116, 3, 2, 2, 2, 12, 119, 3, 2, 2, 2, 14, 129, 3, 2, 2, 2, 16, 140, 3, 2, 2, 2, 18, 142, 3, 2, 2, 2, 20, 144, 3, 2, 2, 2, 22, 149, 3, 2, 2, 2, 24, 152, 3, 2, 2, 2, 26, 160, 3, 2, 2, 2, 28, 164, 3, 2, 2, 2, 30, 175, 3, 2, 2, 2, 32, 177, 3, 2, 2, 2, 34, 180, 3, 2, 2, 2, 36, 185, 3, 2, 2, 2, 38, 187, 3, 2, 2, 2, 40, 191, 3, 2, 2, 2, 42, 195, 3, 2, 2, 2, 44, 199, 3, 2, 2, 2, 46, 207, 3, 2, 2, 2, 48, 216, 3, 2, 2, 2, 50, 225, 3, 2, 2, 2, 52, 241, 3, 2, 2, 2, 54, 243, 3, 2, 2, 2, 56, 259, 3, 2, 2, 2, 58, 261, 3, 2, 2, 2, 60, 267, 3, 2, 2, 2, 62, 273, 3, 2, 2, 2, 64, 284, 3, 2, 2, 2, 66, 294, 3, 2, 2, 2, 68, 301, 3, 2, 2, 2, 70, 311, 3, 2, 2, 2, 72, 313, 3, 2, 2, 2, 74, 317, 3, 2, 2, 2, 76, 327, 3, 2, 2, 2, 78, 329, 3, 2, 2, 2, 80, 333, 3, 2, 2, 2, 82, 335, 3, 2, 2, 2, 84, 86, 5, 4, 3, 2, 85, 84, 3, 2, 2, 2, 85, 86, 3, 2, 2, 2, 86, 90, 3, 2, 2, 2, 87, 89, 5, 8, 5, 2, 88, 87, 3, 2, 2, 2, 89, 92, 3, 2, 2, 2, 90, 88, 3, 2, 2, 2, 90, 91, 3, 2, 2, 2, 91, 94, 3, 2, 2, 2, 92, 90, 3, 2, 2, 2, 93, 95, 5, 10, 6, 2, 94, 93, 3, 2, 2, 2, 94, 95, 3, 2, 2, 2, 95, 97, 3, 2, 2, 2, 96, 98, 5, 12, 7, 2, 97, 96, 3, 2, 2, 2, 97, 98, 3, 2, 2, 2, 98, 100, 3, 2, 2, 2, 99, 101, 5, 20, 11, 2, 100, 99, 3, 2, 2, 2, 100, 101, 3, 2, 2, 2, 101, 102, 3, 2, 2, 2, 102, 103, 7, 2, 2, 3, 103, 3, 3, 2, 2, 2, 104, 106, 7, 3, 2, 2, 105, 107, 5, 6, 4, 2, 106, 105, 3, 2, 2, 2, 106, 107, 3, 2, 2, 2, 107, 108, 3, 2, 2, 2, 108, 109, 7, 4, 2, 2, 109, 110, 5, 28, 15, 2, 110, 111, 7, 5, 2, 2, 111, 5, 3, 2, 2, 2, 112, 113, 7, 6, 2, 2, 113, 7, 3, 2, 2, 2, 114, 115, 5, 24, 13, 2, 115, 9, 3, 2, 2, 2, 116, 117, 7, 7, 2, 2, 117, 118, 5, 44, 23, 2, 118, 11, 3, 2, 2, 2, 119, 120, 7, 8, 2, 2, 120, 121, 7, 9, 2, 2, 121, 126, 5, 14, 8, 2, 122, 123, 7, 10, 2, 2, 123, 125, 5, 14, 8, 2, 124, 122, 3, 2, 2, 2, 125, 128, 3, 2, 2, 2, 126, 124, 3, 2, 2, 2, 126, 127, 3, 2, 2, 2, 127, 13, 3, 2, 2, 2, 128, 126, 3, 2, 2, 2, 129, 131, 7, 64, 2, 2, 130, 132, 5, 18, 10, 2, 131, 130, 3, 2, 2, 2, 131, 132, 3, 2, 2, 2, 132, 134, 3, 2, 2, 2, 133, 135, 5, 16, 9, 2, 134, 133, 3, 2, 2, 2, 134, 135, 3, 2, 2, 2, 135, 15, 3, 2, 2, 2, 136, 137, 7, 11, 2, 2, 137, 141, 7, 12, 2, 2, 138, 139, 7, 11, 2, 2, 139, 141, 7, 13, 2, 2, 140, 136, 3, 2, 2, 2, 140, 138, 3, 2, 2, 2, 141, 17, 3, 2, 2, 2, 142, 143, 9, 2, 2, 2, 143, 19, 3, 2, 2, 2, 144, 145, 7, 16, 2, 2, 145, 147, 7, 66, 2, 2, 146, 148, 5, 22, 12, 2, 147, 146, 3, 2, 2, 2, 147, 148, 3, 2, 2, 2, 148, 21, 3, 2, 2, 2, 149, 150, 7, 17, 2, 2, 150, 151, 7, 66, 2, 2, 151, 23, 3, 2, 2, 2, 152, 154, 7, 18, 2, 2, 153, 155, 5, 36, 19, 2, 154, 153, 3, 2, 2, 2, 154, 155, 3, 2, 2, 2, 155, 156, 3, 2, 2, 2, 156, 158, 7, 64, 2, 2, 157, 159, 5, 26, 14, 2, 158, 157, 3, 2, 2, 2, 158, 159, 3, 2, 2, 2, 159, 25, 3, 2, 2, 2, 160, 161, 7, 4, 2, 2, 161, 162, 5, 28, 15, 2, 162, 163, 7, 5, 2, 2, 163, 27, 3, 2, 2, 2, 164, 169, 5, 30, 16, 2, 165, 166, 7, 10, 2, 2, 166, 168, 5, 30, 16, 2, 167, 165, 3, 2, 2, 2, 168, 171, 3, 2, 2, 2, 169, 167, 3, 2, 2, 2, 169, 170, 3, 2, 2, 2, 170, 29, 3, 2, 2, 2, 171, 169, 3, 2, 2, 2, 172, 176, 7, 64, 2, 2, 173, 176, 5, 32, 17, 2, 174, 176, 5, 34, 18, 2, 175, 172, 3, 2, 2, 2, 175, 173, 3, 2, 2, 2, 175, 174, 3, 2, 2, 2, 176, 31, 3, 2, 2, 2, 177, 178, 7, 19, 2, 2, 178, 179, 5, 38, 20, 2, 179, 33, 3, 2, 2, 2, 180, 181, 7, 19, 2, 2, 181, 182, 5, 40, 21, 2, 182, 35, 3, 2, 2, 2, 183, 186, 5, 38, 20, 2, 184, 186, 5, 40, 21, 2, 185, 183, 3, 2, 2, 2, 185, 184, 3, 2, 2, 2, 186, 37, 3, 2, 2, 2, 187, 189, 7, 20, 2, 2, 188, 190, 5, 42, 22, 2, 189, 188, 3, 2, 2, 2, 189, 190, 3, 2, 2, 2, 190, 39, 3, 2, 2, 2, 191, 193, 7, 21, 2, 2, 192, 194, 5, 42, 22, 2, 193, 192, 3, 2, 2, 2, 193, 194, 3, 2, 2, 2, 194, 41, 3, 2, 2, 2, 195, 196, 7, 4, 2, 2, 196, 197, 7, 66, 2, 2, 197, 198, 7, 5, 2, 2, 198, 43, 3, 2, 2, 2, 199, 204, 5, 46, 24, 2, 200, 201, 7, 22, 2, 2, 201, 203, 5, 46, 24, 2, 202, 200, 3, 2, 2, 2, 203, 206, 3, 2, 2, 2, 204, 202, 3, 2, 2, 2, 204, 205, 3, 2, 2, 2, 205, 45, 3, 2, 2, 2, 206, 204, 3, 2, 2, 2, 207, 212, 5, 48, 25, 2, 208, 209, 7, 23, 2, 2, 209, 211, 5, 48, 25, 2, 210, 208, 3, 2, 2, 2, 211, 214, 3, 2, 2, 2, 212, 210, 3, 2, 2, 2, 212, 213, 3, 2, 2, 2, 213, 47, 3, 2, 2, 2, 214, 212, 3, 2, 2, 2, 215, 217, 7, 24, 2, 2, 216, 215, 3, 2, 2, 2, 216, 217, 3, 2, 2, 2, 217, 218, 3, 2, 2, 2, 218, 219, 5, 50, 26, 2, 219, 49, 3, 2, 2, 2, 220, 226, 5, 52, 27, 2, 221, 222, 7, 4, 2, 2, 222, 223, 5, 44, 23, 2, 223, 224, 7, 5, 2, 2, 224, 226, 3, 2, 2, 2, 225, 220, 3, 2, 2, 2, 225, 221, 3, 2, 2, 2, 226, 51, 3, 2, 2, 2, 227, 242, 5, 76, 39, 2, 228, 242, 5, 72, 37, 2, 229, 242, 5, 60, 31, 2, 230, 242, 5, 58, 30, 2, 231, 242, 5, 62, 32, 2, 232, 242, 5, 54, 28, 2, 233, 242, 5, 64, 33, 2, 234, 242, 5, 66, 34, 2, 235, 242, 5, 68, 35, 2, 236, 242, 5, 70, 36, 2, 237, 238, 7, 4, 2, 2, 238, 239, 5, 52, 27, 2, 239, 240, 7, 5, 2, 2, 240, 242, 3, 2, 2, 2, 241, 227, 3, 2, 2, 2, 241, 228, 3, 2, 2, 2, 241, 229, 3, 2, 2, 2, 241, 230, 3, 2, 2, 2, 241, 231, 3, 2, 2, 2, 241, 232, 3, 2, 2, 2, 241, 233, 3, 2, 2, 2, 241, 234, 3, 2, 2, 2, 241, 235, 3, 2, 2, 2, 241, 236, 3, 2, 2, 2, 241, 237, 3, 2, 2, 2, 242, 53, 3, 2, 2, 2, 243, 244, 7, 64, 2, 2, 244, 245, 7, 25, 2, 2, 245, 246, 5, 56, 29, 2, 246, 55, 3, 2, 2, 2, 247, 260, 7, 63, 2, 2, 248, 249, 7, 4, 2, 2, 249, 254, 5, 80, 41, 2, 250, 251, 7, 10, 2, 2, 251, 253, 5, 80, 41, 2, 252, 250, 3, 2, 2, 2, 253, 256, 3, 2, 2, 2, 254, 252, 3, 2, 2, 2, 254, 255, 3, 2, 2, 2, 255, 257, 3, 2, 2, 2, 256, 254, 3, 2, 2, 2, 257, 258, 7, 5, 2, 2, 258, 260, 3, 2, 2, 2, 259, 247, 3, 2, 2, 2, 259, 248, 3, 2, 2, 2, 260, 57, 3, 2, 2, 2, 261, 262, 7, 64, 2, 2, 262, 263, 7, 26, 2, 2, 263, 264, 5, 80, 41, 2, 264, 265, 7, 23, 2, 2, 265, 266, 5, 80, 41, 2, 266, 59, 3, 2, 2, 2, 267, 268, 7, 64, 2, 2, 268, 269, 7, 27, 2, 2, 269, 270, 5, 80, 41, 2, 270, 271, 7, 28, 2, 2, 271, 272, 5, 80, 41, 2, 272, 61, 3, 2, 2, 2, 273, 274, 5, 80, 41, 2, 274, 275, 7, 26, 2, 2, 275, 276, 7, 64, 2, 2, 276, 277, 7, 23, 2, 2, 277, 278, 7, 64, 2, 2, 278, 63, 3, 2, 2, 2, 279, 280, 7, 64, 2, 2, 280, 281, 7, 29, 2, 2, 281, 285, 7, 30, 2, 2, 282, 283, 7, 64, 2, 2, 283, 285, 7, 31, 2, 2, 284, 279, 3, 2, 2, 2, 284, 282, 3, 2, 2, 2, 285, 65, 3, 2, 2, 2, 286, 287, 7, 64, 2, 2, 287, 288, 7, 29, 2, 2, 288, 289, 7, 24, 2, 2, 289, 295, 7, 30, 2, 2, 290, 291, 7, 64, 2, 2, 291, 295, 7, 32, 2, 2, 292, 293, 7, 64, 2, 2, 293, 295, 7, 33, 2, 2, 294, 286, 3, 2, 2, 2, 294, 290, 3, 2, 2, 2, 294, 292, 3, 2, 2, 2, 295, 67, 3, 2, 2, 2, 296, 297, 7, 64, 2, 2, 297, 298, 7, 29, 2, 2, 298, 302, 7, 34, 2, 2, 299, 300, 7, 64, 2, 2, 300, 302, 7, 35, 2, 2, 301, 296, 3, 2, 2, 2, 301, 299, 3, 2, 2, 2, 302, 69, 3, 2, 2, 2, 303, 304, 7, 64, 2, 2, 304, 305, 7, 29, 2, 2, 305, 306, 7, 24, 2, 2, 306, 312, 7, 34, 2, 2, 307, 308, 7, 64, 2, 2, 308, 312, 7, 36, 2, 2, 309, 310, 7, 64, 2, 2, 310, 312, 7, 37, 2, 2, 311, 303, 3, 2, 2, 2, 311, 307, 3, 2, 2, 2, 311, 309, 3, 2, 2, 2, 312, 71, 3, 2, 2, 2, 313, 314, 7, 64, 2, 2, 314, 315, 5, 74, 38, 2, 315, 316, 5, 80, 41, 2, 316, 73, 3, 2, 2, 2, 317, 318, 9, 3, 2, 2, 318, 75, 3, 2, 2, 2, 319, 320, 7, 64, 2, 2, 320, 321, 5, 78, 40, 2, 321, 322, 5, 80, 41, 2, 322, 328, 3, 2, 2, 2, 323, 324, 5, 80, 41, 2, 324, 325, 5, 78, 40, 2, 325, 326, 7, 64, 2, 2, 326, 328, 3, 2, 2, 2, 327, 319, 3, 2, 2, 2, 327, 323, 3, 2, 2, 2, 328, 77, 3, 2, 2, 2, 329, 330, 9, 4, 2, 2, 330, 79, 3, 2, 2, 2, 331, 334, 5, 82, 42, 2, 332, 334, 7, 63, 2, 2, 333, 331, 3, 2, 2, 2, 333, 332, 3, 2, 2, 2, 334, 81, 3, 2, 2, 2, 335, 336, 9, 5, 2, 2, 336, 83, 3, 2, 2, 2, 33, 85, 90, 94, 97, 100, 106, 126, 131, 134, 140, 147, 154, 158, 169, 175, 185, 189, 193, 204, 212, 216, 225, 241, 254, 259, 284, 294, 301, 311, 327, 333]
\ No newline at end of file
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens
index a475c2939..4df1b445f 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens
@@ -56,15 +56,17 @@ T__54=55
 T__55=56
 T__56=57
 T__57=58
-INPUT_VARIABLE=59
-PATH_VARIABLE=60
-BOOLEAN_LITERAL=61
-NUMBER_LITERAL=62
-DOUBLE=63
-INT=64
-ZERO=65
-STRING_LITERAL=66
-WS=67
+T__58=59
+T__59=60
+INPUT_VARIABLE=61
+PATH_VARIABLE=62
+BOOLEAN_LITERAL=63
+NUMBER_LITERAL=64
+DOUBLE=65
+INT=66
+ZERO=67
+STRING_LITERAL=68
+WS=69
 'select'=1
 '('=2
 ')'=3
@@ -89,38 +91,40 @@ WS=67
 'not'=22
 'in'=23
 'between'=24
-'is'=25
-'null'=26
-'isNull'=27
-'isNotNull'=28
-'notNull'=29
-'empty'=30
-'isEmpty'=31
-'isNotEmpty'=32
-'notEmpty'=33
-'like'=34
-'ilike'=35
-'contains'=36
-'icontains'=37
-'startsWith'=38
-'istartsWith'=39
-'endsWith'=40
-'iendsWith'=41
-'='=42
-'eq'=43
-'>'=44
-'gt'=45
-'>='=46
-'ge'=47
-'gte'=48
-'<'=49
-'lt'=50
-'<='=51
-'le'=52
-'lte'=53
-'<>'=54
-'!='=55
-'ne'=56
-'ieq'=57
-'ine'=58
-'0'=65
+'inrange'=25
+'to'=26
+'is'=27
+'null'=28
+'isNull'=29
+'isNotNull'=30
+'notNull'=31
+'empty'=32
+'isEmpty'=33
+'isNotEmpty'=34
+'notEmpty'=35
+'like'=36
+'ilike'=37
+'contains'=38
+'icontains'=39
+'startsWith'=40
+'istartsWith'=41
+'endsWith'=42
+'iendsWith'=43
+'='=44
+'eq'=45
+'>'=46
+'gt'=47
+'>='=48
+'ge'=49
+'gte'=50
+'<'=51
+'lt'=52
+'<='=53
+'le'=54
+'lte'=55
+'<>'=56
+'!='=57
+'ne'=58
+'ieq'=59
+'ine'=60
+'0'=67
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
index 28d89cc14..70c9d6c27 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
@@ -1,4 +1,4 @@
-// Generated from C:/dev/ebean/ebean/src/test/resources/EQL.g4 by ANTLR 4.7.1
+// Generated from /home/rob/github/ebean-dir/ebean/src/test/resources/EQL.g4 by ANTLR 4.7.2
 package io.ebeaninternal.server.grammer.antlr;
 
 import org.antlr.v4.runtime.ParserRuleContext;
@@ -6,932 +6,526 @@ import org.antlr.v4.runtime.tree.ErrorNode;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
 /**
- * This class provides an empty implementation of {@link EQLListener}, which can
- * be extended to create a listener which only needs to handle a subset of the
- * available methods.
+ * This class provides an empty implementation of {@link EQLListener},
+ * which can be extended to create a listener which only needs to handle a subset
+ * of the available methods.
  */
 public class EQLBaseListener implements EQLListener {
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterSelect_statement(EQLParser.Select_statementContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitSelect_statement(EQLParser.Select_statementContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterSelect_clause(EQLParser.Select_clauseContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitSelect_clause(EQLParser.Select_clauseContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterDistinct(EQLParser.DistinctContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitDistinct(EQLParser.DistinctContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterFetch_clause(EQLParser.Fetch_clauseContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitFetch_clause(EQLParser.Fetch_clauseContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterWhere_clause(EQLParser.Where_clauseContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitWhere_clause(EQLParser.Where_clauseContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterOrderby_clause(EQLParser.Orderby_clauseContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitOrderby_clause(EQLParser.Orderby_clauseContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterOrderby_property(EQLParser.Orderby_propertyContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitOrderby_property(EQLParser.Orderby_propertyContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterNulls_firstlast(EQLParser.Nulls_firstlastContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitNulls_firstlast(EQLParser.Nulls_firstlastContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterAsc_desc(EQLParser.Asc_descContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitAsc_desc(EQLParser.Asc_descContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterLimit_clause(EQLParser.Limit_clauseContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitLimit_clause(EQLParser.Limit_clauseContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterOffset_clause(EQLParser.Offset_clauseContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitOffset_clause(EQLParser.Offset_clauseContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterFetch_path(EQLParser.Fetch_pathContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitFetch_path(EQLParser.Fetch_pathContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterFetch_property_set(EQLParser.Fetch_property_setContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitFetch_property_set(EQLParser.Fetch_property_setContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterFetch_property_group(EQLParser.Fetch_property_groupContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitFetch_property_group(EQLParser.Fetch_property_groupContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterFetch_property(EQLParser.Fetch_propertyContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitFetch_property(EQLParser.Fetch_propertyContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterFetch_query_hint(EQLParser.Fetch_query_hintContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitFetch_query_hint(EQLParser.Fetch_query_hintContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterFetch_lazy_hint(EQLParser.Fetch_lazy_hintContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitFetch_lazy_hint(EQLParser.Fetch_lazy_hintContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterFetch_option(EQLParser.Fetch_optionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitFetch_option(EQLParser.Fetch_optionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterFetch_query_option(EQLParser.Fetch_query_optionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitFetch_query_option(EQLParser.Fetch_query_optionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterFetch_lazy_option(EQLParser.Fetch_lazy_optionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitFetch_lazy_option(EQLParser.Fetch_lazy_optionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterFetch_batch_size(EQLParser.Fetch_batch_sizeContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitFetch_batch_size(EQLParser.Fetch_batch_sizeContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterConditional_expression(EQLParser.Conditional_expressionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitConditional_expression(EQLParser.Conditional_expressionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterConditional_term(EQLParser.Conditional_termContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitConditional_term(EQLParser.Conditional_termContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterConditional_factor(EQLParser.Conditional_factorContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitConditional_factor(EQLParser.Conditional_factorContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterConditional_primary(EQLParser.Conditional_primaryContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitConditional_primary(EQLParser.Conditional_primaryContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterAny_expression(EQLParser.Any_expressionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitAny_expression(EQLParser.Any_expressionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterIn_expression(EQLParser.In_expressionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitIn_expression(EQLParser.In_expressionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterIn_value(EQLParser.In_valueContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitIn_value(EQLParser.In_valueContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterBetween_expression(EQLParser.Between_expressionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitBetween_expression(EQLParser.Between_expressionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterPropertyBetween_expression(EQLParser.PropertyBetween_expressionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitPropertyBetween_expression(EQLParser.PropertyBetween_expressionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterIsNull_expression(EQLParser.IsNull_expressionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitIsNull_expression(EQLParser.IsNull_expressionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterIsNotNull_expression(EQLParser.IsNotNull_expressionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitIsNotNull_expression(EQLParser.IsNotNull_expressionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterIsEmpty_expression(EQLParser.IsEmpty_expressionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitIsEmpty_expression(EQLParser.IsEmpty_expressionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterIsNotEmpty_expression(EQLParser.IsNotEmpty_expressionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitIsNotEmpty_expression(EQLParser.IsNotEmpty_expressionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterLike_expression(EQLParser.Like_expressionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitLike_expression(EQLParser.Like_expressionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterLike_op(EQLParser.Like_opContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitLike_op(EQLParser.Like_opContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterComparison_expression(EQLParser.Comparison_expressionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitComparison_expression(EQLParser.Comparison_expressionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterComparison_operator(EQLParser.Comparison_operatorContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitComparison_operator(EQLParser.Comparison_operatorContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterValue_expression(EQLParser.Value_expressionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitValue_expression(EQLParser.Value_expressionContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterLiteral(EQLParser.LiteralContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitLiteral(EQLParser.LiteralContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void enterEveryRule(ParserRuleContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void exitEveryRule(ParserRuleContext ctx) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void visitTerminal(TerminalNode node) {
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * <p>
-   * The default implementation does nothing.
-   * </p>
-   */
-  @Override
-  public void visitErrorNode(ErrorNode node) {
-  }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterSelect_statement(EQLParser.Select_statementContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitSelect_statement(EQLParser.Select_statementContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterSelect_clause(EQLParser.Select_clauseContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitSelect_clause(EQLParser.Select_clauseContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterDistinct(EQLParser.DistinctContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitDistinct(EQLParser.DistinctContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterFetch_clause(EQLParser.Fetch_clauseContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitFetch_clause(EQLParser.Fetch_clauseContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterWhere_clause(EQLParser.Where_clauseContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitWhere_clause(EQLParser.Where_clauseContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterOrderby_clause(EQLParser.Orderby_clauseContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitOrderby_clause(EQLParser.Orderby_clauseContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterOrderby_property(EQLParser.Orderby_propertyContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitOrderby_property(EQLParser.Orderby_propertyContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterNulls_firstlast(EQLParser.Nulls_firstlastContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitNulls_firstlast(EQLParser.Nulls_firstlastContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterAsc_desc(EQLParser.Asc_descContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitAsc_desc(EQLParser.Asc_descContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterLimit_clause(EQLParser.Limit_clauseContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitLimit_clause(EQLParser.Limit_clauseContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterOffset_clause(EQLParser.Offset_clauseContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitOffset_clause(EQLParser.Offset_clauseContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterFetch_path(EQLParser.Fetch_pathContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitFetch_path(EQLParser.Fetch_pathContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterFetch_property_set(EQLParser.Fetch_property_setContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitFetch_property_set(EQLParser.Fetch_property_setContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterFetch_property_group(EQLParser.Fetch_property_groupContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitFetch_property_group(EQLParser.Fetch_property_groupContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterFetch_property(EQLParser.Fetch_propertyContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitFetch_property(EQLParser.Fetch_propertyContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterFetch_query_hint(EQLParser.Fetch_query_hintContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitFetch_query_hint(EQLParser.Fetch_query_hintContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterFetch_lazy_hint(EQLParser.Fetch_lazy_hintContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitFetch_lazy_hint(EQLParser.Fetch_lazy_hintContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterFetch_option(EQLParser.Fetch_optionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitFetch_option(EQLParser.Fetch_optionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterFetch_query_option(EQLParser.Fetch_query_optionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitFetch_query_option(EQLParser.Fetch_query_optionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterFetch_lazy_option(EQLParser.Fetch_lazy_optionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitFetch_lazy_option(EQLParser.Fetch_lazy_optionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterFetch_batch_size(EQLParser.Fetch_batch_sizeContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitFetch_batch_size(EQLParser.Fetch_batch_sizeContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterConditional_expression(EQLParser.Conditional_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitConditional_expression(EQLParser.Conditional_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterConditional_term(EQLParser.Conditional_termContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitConditional_term(EQLParser.Conditional_termContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterConditional_factor(EQLParser.Conditional_factorContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitConditional_factor(EQLParser.Conditional_factorContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterConditional_primary(EQLParser.Conditional_primaryContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitConditional_primary(EQLParser.Conditional_primaryContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterAny_expression(EQLParser.Any_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitAny_expression(EQLParser.Any_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterIn_expression(EQLParser.In_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitIn_expression(EQLParser.In_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterIn_value(EQLParser.In_valueContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitIn_value(EQLParser.In_valueContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterBetween_expression(EQLParser.Between_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitBetween_expression(EQLParser.Between_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterInrange_expression(EQLParser.Inrange_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitInrange_expression(EQLParser.Inrange_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterPropertyBetween_expression(EQLParser.PropertyBetween_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitPropertyBetween_expression(EQLParser.PropertyBetween_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterIsNull_expression(EQLParser.IsNull_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitIsNull_expression(EQLParser.IsNull_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterIsNotNull_expression(EQLParser.IsNotNull_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitIsNotNull_expression(EQLParser.IsNotNull_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterIsEmpty_expression(EQLParser.IsEmpty_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitIsEmpty_expression(EQLParser.IsEmpty_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterIsNotEmpty_expression(EQLParser.IsNotEmpty_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitIsNotEmpty_expression(EQLParser.IsNotEmpty_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterLike_expression(EQLParser.Like_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitLike_expression(EQLParser.Like_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterLike_op(EQLParser.Like_opContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitLike_op(EQLParser.Like_opContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterComparison_expression(EQLParser.Comparison_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitComparison_expression(EQLParser.Comparison_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterComparison_operator(EQLParser.Comparison_operatorContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitComparison_operator(EQLParser.Comparison_operatorContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterValue_expression(EQLParser.Value_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitValue_expression(EQLParser.Value_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterLiteral(EQLParser.LiteralContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitLiteral(EQLParser.LiteralContext ctx) { }
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterEveryRule(ParserRuleContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitEveryRule(ParserRuleContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void visitTerminal(TerminalNode node) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void visitErrorNode(ErrorNode node) { }
 }
\ No newline at end of file
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp
new file mode 100644
index 000000000..f7e626b43
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp
@@ -0,0 +1,224 @@
+token literal names:
+null
+'select'
+'('
+')'
+'distinct'
+'where'
+'order'
+'by'
+','
+'nulls'
+'first'
+'last'
+'asc'
+'desc'
+'limit'
+'offset'
+'fetch'
+'+'
+'query'
+'lazy'
+'or'
+'and'
+'not'
+'in'
+'between'
+'inrange'
+'to'
+'is'
+'null'
+'isNull'
+'isNotNull'
+'notNull'
+'empty'
+'isEmpty'
+'isNotEmpty'
+'notEmpty'
+'like'
+'ilike'
+'contains'
+'icontains'
+'startsWith'
+'istartsWith'
+'endsWith'
+'iendsWith'
+'='
+'eq'
+'>'
+'gt'
+'>='
+'ge'
+'gte'
+'<'
+'lt'
+'<='
+'le'
+'lte'
+'<>'
+'!='
+'ne'
+'ieq'
+'ine'
+null
+null
+null
+null
+null
+null
+'0'
+null
+null
+
+token symbolic names:
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+INPUT_VARIABLE
+PATH_VARIABLE
+BOOLEAN_LITERAL
+NUMBER_LITERAL
+DOUBLE
+INT
+ZERO
+STRING_LITERAL
+WS
+
+rule names:
+T__0
+T__1
+T__2
+T__3
+T__4
+T__5
+T__6
+T__7
+T__8
+T__9
+T__10
+T__11
+T__12
+T__13
+T__14
+T__15
+T__16
+T__17
+T__18
+T__19
+T__20
+T__21
+T__22
+T__23
+T__24
+T__25
+T__26
+T__27
+T__28
+T__29
+T__30
+T__31
+T__32
+T__33
+T__34
+T__35
+T__36
+T__37
+T__38
+T__39
+T__40
+T__41
+T__42
+T__43
+T__44
+T__45
+T__46
+T__47
+T__48
+T__49
+T__50
+T__51
+T__52
+T__53
+T__54
+T__55
+T__56
+T__57
+T__58
+T__59
+INPUT_VARIABLE
+PATH_VARIABLE
+BOOLEAN_LITERAL
+NUMBER_LITERAL
+DOUBLE
+INT
+ZERO
+STRING_LITERAL
+WS
+
+channel names:
+DEFAULT_TOKEN_CHANNEL
+HIDDEN
+
+mode names:
+DEFAULT_MODE
+
+atn:
+[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 71, 533, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 4, 45, 9, 45, 4, 46, 9, 46, 4, 47, 9, 47, 4, 48, 9, 48, 4, 49, 9, 49, 4, 50, 9, 50, 4, 51, 9, 51, 4, 52, 9, 52, 4, 53, 9, 53, 4, 54, 9, 54, 4, 55, 9, 55, 4, 56, 9, 56, 4, 57, 9, 57, 4, 58, 9, 58, 4, 59, 9, 59, 4, 60, 9, 60, 4, 61, 9, 61, 4, 62, 9, 62, 4, 63, 9, 63, 4, 64, 9, 64, 4, 65, 9, 65, 4, 66, 9, 66, 4, 67, 9, 67, 4, 68, 9, 68, 4, 69, 9, 69, 4, 70, 9, 70, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 23, 3, 23, 3, 24, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 27, 3, 27, 3, 27, 3, 28, 3, 28, 3, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 45, 3, 45, 3, 46, 3, 46, 3, 46, 3, 47, 3, 47, 3, 48, 3, 48, 3, 48, 3, 49, 3, 49, 3, 49, 3, 50, 3, 50, 3, 50, 3, 51, 3, 51, 3, 51, 3, 51, 3, 52, 3, 52, 3, 53, 3, 53, 3, 53, 3, 54, 3, 54, 3, 54, 3, 55, 3, 55, 3, 55, 3, 56, 3, 56, 3, 56, 3, 56, 3, 57, 3, 57, 3, 57, 3, 58, 3, 58, 3, 58, 3, 59, 3, 59, 3, 59, 3, 60, 3, 60, 3, 60, 3, 60, 3, 61, 3, 61, 3, 61, 3, 61, 3, 62, 3, 62, 3, 62, 7, 62, 464, 10, 62, 12, 62, 14, 62, 467, 11, 62, 3, 63, 3, 63, 7, 63, 471, 10, 63, 12, 63, 14, 63, 474, 11, 63, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 5, 64, 485, 10, 64, 3, 65, 5, 65, 488, 10, 65, 3, 65, 3, 65, 5, 65, 492, 10, 65, 3, 65, 3, 65, 5, 65, 496, 10, 65, 3, 66, 6, 66, 499, 10, 66, 13, 66, 14, 66, 500, 3, 66, 3, 66, 7, 66, 505, 10, 66, 12, 66, 14, 66, 508, 11, 66, 3, 67, 3, 67, 7, 67, 512, 10, 67, 12, 67, 14, 67, 515, 11, 67, 3, 68, 3, 68, 3, 69, 3, 69, 3, 69, 3, 69, 7, 69, 523, 10, 69, 12, 69, 14, 69, 526, 11, 69, 3, 69, 3, 69, 3, 70, 3, 70, 3, 70, 3, 70, 2, 2, 71, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13, 8, 15, 9, 17, 10, 19, 11, 21, 12, 23, 13, 25, 14, 27, 15, 29, 16, 31, 17, 33, 18, 35, 19, 37, 20, 39, 21, 41, 22, 43, 23, 45, 24, 47, 25, 49, 26, 51, 27, 53, 28, 55, 29, 57, 30, 59, 31, 61, 32, 63, 33, 65, 34, 67, 35, 69, 36, 71, 37, 73, 38, 75, 39, 77, 40, 79, 41, 81, 42, 83, 43, 85, 44, 87, 45, 89, 46, 91, 47, 93, 48, 95, 49, 97, 50, 99, 51, 101, 52, 103, 53, 105, 54, 107, 55, 109, 56, 111, 57, 113, 58, 115, 59, 117, 60, 119, 61, 121, 62, 123, 63, 125, 64, 127, 65, 129, 66, 131, 67, 133, 68, 135, 69, 137, 70, 139, 71, 3, 2, 9, 5, 2, 67, 92, 97, 97, 99, 124, 6, 2, 50, 59, 67, 92, 97, 97, 99, 124, 7, 2, 48, 48, 50, 59, 67, 92, 97, 97, 99, 124, 3, 2, 50, 59, 3, 2, 51, 59, 3, 2, 41, 41, 5, 2, 11, 12, 15, 15, 34, 34, 2, 544, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 2, 35, 3, 2, 2, 2, 2, 37, 3, 2, 2, 2, 2, 39, 3, 2, 2, 2, 2, 41, 3, 2, 2, 2, 2, 43, 3, 2, 2, 2, 2, 45, 3, 2, 2, 2, 2, 47, 3, 2, 2, 2, 2, 49, 3, 2, 2, 2, 2, 51, 3, 2, 2, 2, 2, 53, 3, 2, 2, 2, 2, 55, 3, 2, 2, 2, 2, 57, 3, 2, 2, 2, 2, 59, 3, 2, 2, 2, 2, 61, 3, 2, 2, 2, 2, 63, 3, 2, 2, 2, 2, 65, 3, 2, 2, 2, 2, 67, 3, 2, 2, 2, 2, 69, 3, 2, 2, 2, 2, 71, 3, 2, 2, 2, 2, 73, 3, 2, 2, 2, 2, 75, 3, 2, 2, 2, 2, 77, 3, 2, 2, 2, 2, 79, 3, 2, 2, 2, 2, 81, 3, 2, 2, 2, 2, 83, 3, 2, 2, 2, 2, 85, 3, 2, 2, 2, 2, 87, 3, 2, 2, 2, 2, 89, 3, 2, 2, 2, 2, 91, 3, 2, 2, 2, 2, 93, 3, 2, 2, 2, 2, 95, 3, 2, 2, 2, 2, 97, 3, 2, 2, 2, 2, 99, 3, 2, 2, 2, 2, 101, 3, 2, 2, 2, 2, 103, 3, 2, 2, 2, 2, 105, 3, 2, 2, 2, 2, 107, 3, 2, 2, 2, 2, 109, 3, 2, 2, 2, 2, 111, 3, 2, 2, 2, 2, 113, 3, 2, 2, 2, 2, 115, 3, 2, 2, 2, 2, 117, 3, 2, 2, 2, 2, 119, 3, 2, 2, 2, 2, 121, 3, 2, 2, 2, 2, 123, 3, 2, 2, 2, 2, 125, 3, 2, 2, 2, 2, 127, 3, 2, 2, 2, 2, 129, 3, 2, 2, 2, 2, 131, 3, 2, 2, 2, 2, 133, 3, 2, 2, 2, 2, 135, 3, 2, 2, 2, 2, 137, 3, 2, 2, 2, 2, 139, 3, 2, 2, 2, 3, 141, 3, 2, 2, 2, 5, 148, 3, 2, 2, 2, 7, 150, 3, 2, 2, 2, 9, 152, 3, 2, 2, 2, 11, 161, 3, 2, 2, 2, 13, 167, 3, 2, 2, 2, 15, 173, 3, 2, 2, 2, 17, 176, 3, 2, 2, 2, 19, 178, 3, 2, 2, 2, 21, 184, 3, 2, 2, 2, 23, 190, 3, 2, 2, 2, 25, 195, 3, 2, 2, 2, 27, 199, 3, 2, 2, 2, 29, 204, 3, 2, 2, 2, 31, 210, 3, 2, 2, 2, 33, 217, 3, 2, 2, 2, 35, 223, 3, 2, 2, 2, 37, 225, 3, 2, 2, 2, 39, 231, 3, 2, 2, 2, 41, 236, 3, 2, 2, 2, 43, 239, 3, 2, 2, 2, 45, 243, 3, 2, 2, 2, 47, 247, 3, 2, 2, 2, 49, 250, 3, 2, 2, 2, 51, 258, 3, 2, 2, 2, 53, 266, 3, 2, 2, 2, 55, 269, 3, 2, 2, 2, 57, 272, 3, 2, 2, 2, 59, 277, 3, 2, 2, 2, 61, 284, 3, 2, 2, 2, 63, 294, 3, 2, 2, 2, 65, 302, 3, 2, 2, 2, 67, 308, 3, 2, 2, 2, 69, 316, 3, 2, 2, 2, 71, 327, 3, 2, 2, 2, 73, 336, 3, 2, 2, 2, 75, 341, 3, 2, 2, 2, 77, 347, 3, 2, 2, 2, 79, 356, 3, 2, 2, 2, 81, 366, 3, 2, 2, 2, 83, 377, 3, 2, 2, 2, 85, 389, 3, 2, 2, 2, 87, 398, 3, 2, 2, 2, 89, 408, 3, 2, 2, 2, 91, 410, 3, 2, 2, 2, 93, 413, 3, 2, 2, 2, 95, 415, 3, 2, 2, 2, 97, 418, 3, 2, 2, 2, 99, 421, 3, 2, 2, 2, 101, 424, 3, 2, 2, 2, 103, 428, 3, 2, 2, 2, 105, 430, 3, 2, 2, 2, 107, 433, 3, 2, 2, 2, 109, 436, 3, 2, 2, 2, 111, 439, 3, 2, 2, 2, 113, 443, 3, 2, 2, 2, 115, 446, 3, 2, 2, 2, 117, 449, 3, 2, 2, 2, 119, 452, 3, 2, 2, 2, 121, 456, 3, 2, 2, 2, 123, 460, 3, 2, 2, 2, 125, 468, 3, 2, 2, 2, 127, 484, 3, 2, 2, 2, 129, 495, 3, 2, 2, 2, 131, 498, 3, 2, 2, 2, 133, 509, 3, 2, 2, 2, 135, 516, 3, 2, 2, 2, 137, 518, 3, 2, 2, 2, 139, 529, 3, 2, 2, 2, 141, 142, 7, 117, 2, 2, 142, 143, 7, 103, 2, 2, 143, 144, 7, 110, 2, 2, 144, 145, 7, 103, 2, 2, 145, 146, 7, 101, 2, 2, 146, 147, 7, 118, 2, 2, 147, 4, 3, 2, 2, 2, 148, 149, 7, 42, 2, 2, 149, 6, 3, 2, 2, 2, 150, 151, 7, 43, 2, 2, 151, 8, 3, 2, 2, 2, 152, 153, 7, 102, 2, 2, 153, 154, 7, 107, 2, 2, 154, 155, 7, 117, 2, 2, 155, 156, 7, 118, 2, 2, 156, 157, 7, 107, 2, 2, 157, 158, 7, 112, 2, 2, 158, 159, 7, 101, 2, 2, 159, 160, 7, 118, 2, 2, 160, 10, 3, 2, 2, 2, 161, 162, 7, 121, 2, 2, 162, 163, 7, 106, 2, 2, 163, 164, 7, 103, 2, 2, 164, 165, 7, 116, 2, 2, 165, 166, 7, 103, 2, 2, 166, 12, 3, 2, 2, 2, 167, 168, 7, 113, 2, 2, 168, 169, 7, 116, 2, 2, 169, 170, 7, 102, 2, 2, 170, 171, 7, 103, 2, 2, 171, 172, 7, 116, 2, 2, 172, 14, 3, 2, 2, 2, 173, 174, 7, 100, 2, 2, 174, 175, 7, 123, 2, 2, 175, 16, 3, 2, 2, 2, 176, 177, 7, 46, 2, 2, 177, 18, 3, 2, 2, 2, 178, 179, 7, 112, 2, 2, 179, 180, 7, 119, 2, 2, 180, 181, 7, 110, 2, 2, 181, 182, 7, 110, 2, 2, 182, 183, 7, 117, 2, 2, 183, 20, 3, 2, 2, 2, 184, 185, 7, 104, 2, 2, 185, 186, 7, 107, 2, 2, 186, 187, 7, 116, 2, 2, 187, 188, 7, 117, 2, 2, 188, 189, 7, 118, 2, 2, 189, 22, 3, 2, 2, 2, 190, 191, 7, 110, 2, 2, 191, 192, 7, 99, 2, 2, 192, 193, 7, 117, 2, 2, 193, 194, 7, 118, 2, 2, 194, 24, 3, 2, 2, 2, 195, 196, 7, 99, 2, 2, 196, 197, 7, 117, 2, 2, 197, 198, 7, 101, 2, 2, 198, 26, 3, 2, 2, 2, 199, 200, 7, 102, 2, 2, 200, 201, 7, 103, 2, 2, 201, 202, 7, 117, 2, 2, 202, 203, 7, 101, 2, 2, 203, 28, 3, 2, 2, 2, 204, 205, 7, 110, 2, 2, 205, 206, 7, 107, 2, 2, 206, 207, 7, 111, 2, 2, 207, 208, 7, 107, 2, 2, 208, 209, 7, 118, 2, 2, 209, 30, 3, 2, 2, 2, 210, 211, 7, 113, 2, 2, 211, 212, 7, 104, 2, 2, 212, 213, 7, 104, 2, 2, 213, 214, 7, 117, 2, 2, 214, 215, 7, 103, 2, 2, 215, 216, 7, 118, 2, 2, 216, 32, 3, 2, 2, 2, 217, 218, 7, 104, 2, 2, 218, 219, 7, 103, 2, 2, 219, 220, 7, 118, 2, 2, 220, 221, 7, 101, 2, 2, 221, 222, 7, 106, 2, 2, 222, 34, 3, 2, 2, 2, 223, 224, 7, 45, 2, 2, 224, 36, 3, 2, 2, 2, 225, 226, 7, 115, 2, 2, 226, 227, 7, 119, 2, 2, 227, 228, 7, 103, 2, 2, 228, 229, 7, 116, 2, 2, 229, 230, 7, 123, 2, 2, 230, 38, 3, 2, 2, 2, 231, 232, 7, 110, 2, 2, 232, 233, 7, 99, 2, 2, 233, 234, 7, 124, 2, 2, 234, 235, 7, 123, 2, 2, 235, 40, 3, 2, 2, 2, 236, 237, 7, 113, 2, 2, 237, 238, 7, 116, 2, 2, 238, 42, 3, 2, 2, 2, 239, 240, 7, 99, 2, 2, 240, 241, 7, 112, 2, 2, 241, 242, 7, 102, 2, 2, 242, 44, 3, 2, 2, 2, 243, 244, 7, 112, 2, 2, 244, 245, 7, 113, 2, 2, 245, 246, 7, 118, 2, 2, 246, 46, 3, 2, 2, 2, 247, 248, 7, 107, 2, 2, 248, 249, 7, 112, 2, 2, 249, 48, 3, 2, 2, 2, 250, 251, 7, 100, 2, 2, 251, 252, 7, 103, 2, 2, 252, 253, 7, 118, 2, 2, 253, 254, 7, 121, 2, 2, 254, 255, 7, 103, 2, 2, 255, 256, 7, 103, 2, 2, 256, 257, 7, 112, 2, 2, 257, 50, 3, 2, 2, 2, 258, 259, 7, 107, 2, 2, 259, 260, 7, 112, 2, 2, 260, 261, 7, 116, 2, 2, 261, 262, 7, 99, 2, 2, 262, 263, 7, 112, 2, 2, 263, 264, 7, 105, 2, 2, 264, 265, 7, 103, 2, 2, 265, 52, 3, 2, 2, 2, 266, 267, 7, 118, 2, 2, 267, 268, 7, 113, 2, 2, 268, 54, 3, 2, 2, 2, 269, 270, 7, 107, 2, 2, 270, 271, 7, 117, 2, 2, 271, 56, 3, 2, 2, 2, 272, 273, 7, 112, 2, 2, 273, 274, 7, 119, 2, 2, 274, 275, 7, 110, 2, 2, 275, 276, 7, 110, 2, 2, 276, 58, 3, 2, 2, 2, 277, 278, 7, 107, 2, 2, 278, 279, 7, 117, 2, 2, 279, 280, 7, 80, 2, 2, 280, 281, 7, 119, 2, 2, 281, 282, 7, 110, 2, 2, 282, 283, 7, 110, 2, 2, 283, 60, 3, 2, 2, 2, 284, 285, 7, 107, 2, 2, 285, 286, 7, 117, 2, 2, 286, 287, 7, 80, 2, 2, 287, 288, 7, 113, 2, 2, 288, 289, 7, 118, 2, 2, 289, 290, 7, 80, 2, 2, 290, 291, 7, 119, 2, 2, 291, 292, 7, 110, 2, 2, 292, 293, 7, 110, 2, 2, 293, 62, 3, 2, 2, 2, 294, 295, 7, 112, 2, 2, 295, 296, 7, 113, 2, 2, 296, 297, 7, 118, 2, 2, 297, 298, 7, 80, 2, 2, 298, 299, 7, 119, 2, 2, 299, 300, 7, 110, 2, 2, 300, 301, 7, 110, 2, 2, 301, 64, 3, 2, 2, 2, 302, 303, 7, 103, 2, 2, 303, 304, 7, 111, 2, 2, 304, 305, 7, 114, 2, 2, 305, 306, 7, 118, 2, 2, 306, 307, 7, 123, 2, 2, 307, 66, 3, 2, 2, 2, 308, 309, 7, 107, 2, 2, 309, 310, 7, 117, 2, 2, 310, 311, 7, 71, 2, 2, 311, 312, 7, 111, 2, 2, 312, 313, 7, 114, 2, 2, 313, 314, 7, 118, 2, 2, 314, 315, 7, 123, 2, 2, 315, 68, 3, 2, 2, 2, 316, 317, 7, 107, 2, 2, 317, 318, 7, 117, 2, 2, 318, 319, 7, 80, 2, 2, 319, 320, 7, 113, 2, 2, 320, 321, 7, 118, 2, 2, 321, 322, 7, 71, 2, 2, 322, 323, 7, 111, 2, 2, 323, 324, 7, 114, 2, 2, 324, 325, 7, 118, 2, 2, 325, 326, 7, 123, 2, 2, 326, 70, 3, 2, 2, 2, 327, 328, 7, 112, 2, 2, 328, 329, 7, 113, 2, 2, 329, 330, 7, 118, 2, 2, 330, 331, 7, 71, 2, 2, 331, 332, 7, 111, 2, 2, 332, 333, 7, 114, 2, 2, 333, 334, 7, 118, 2, 2, 334, 335, 7, 123, 2, 2, 335, 72, 3, 2, 2, 2, 336, 337, 7, 110, 2, 2, 337, 338, 7, 107, 2, 2, 338, 339, 7, 109, 2, 2, 339, 340, 7, 103, 2, 2, 340, 74, 3, 2, 2, 2, 341, 342, 7, 107, 2, 2, 342, 343, 7, 110, 2, 2, 343, 344, 7, 107, 2, 2, 344, 345, 7, 109, 2, 2, 345, 346, 7, 103, 2, 2, 346, 76, 3, 2, 2, 2, 347, 348, 7, 101, 2, 2, 348, 349, 7, 113, 2, 2, 349, 350, 7, 112, 2, 2, 350, 351, 7, 118, 2, 2, 351, 352, 7, 99, 2, 2, 352, 353, 7, 107, 2, 2, 353, 354, 7, 112, 2, 2, 354, 355, 7, 117, 2, 2, 355, 78, 3, 2, 2, 2, 356, 357, 7, 107, 2, 2, 357, 358, 7, 101, 2, 2, 358, 359, 7, 113, 2, 2, 359, 360, 7, 112, 2, 2, 360, 361, 7, 118, 2, 2, 361, 362, 7, 99, 2, 2, 362, 363, 7, 107, 2, 2, 363, 364, 7, 112, 2, 2, 364, 365, 7, 117, 2, 2, 365, 80, 3, 2, 2, 2, 366, 367, 7, 117, 2, 2, 367, 368, 7, 118, 2, 2, 368, 369, 7, 99, 2, 2, 369, 370, 7, 116, 2, 2, 370, 371, 7, 118, 2, 2, 371, 372, 7, 117, 2, 2, 372, 373, 7, 89, 2, 2, 373, 374, 7, 107, 2, 2, 374, 375, 7, 118, 2, 2, 375, 376, 7, 106, 2, 2, 376, 82, 3, 2, 2, 2, 377, 378, 7, 107, 2, 2, 378, 379, 7, 117, 2, 2, 379, 380, 7, 118, 2, 2, 380, 381, 7, 99, 2, 2, 381, 382, 7, 116, 2, 2, 382, 383, 7, 118, 2, 2, 383, 384, 7, 117, 2, 2, 384, 385, 7, 89, 2, 2, 385, 386, 7, 107, 2, 2, 386, 387, 7, 118, 2, 2, 387, 388, 7, 106, 2, 2, 388, 84, 3, 2, 2, 2, 389, 390, 7, 103, 2, 2, 390, 391, 7, 112, 2, 2, 391, 392, 7, 102, 2, 2, 392, 393, 7, 117, 2, 2, 393, 394, 7, 89, 2, 2, 394, 395, 7, 107, 2, 2, 395, 396, 7, 118, 2, 2, 396, 397, 7, 106, 2, 2, 397, 86, 3, 2, 2, 2, 398, 399, 7, 107, 2, 2, 399, 400, 7, 103, 2, 2, 400, 401, 7, 112, 2, 2, 401, 402, 7, 102, 2, 2, 402, 403, 7, 117, 2, 2, 403, 404, 7, 89, 2, 2, 404, 405, 7, 107, 2, 2, 405, 406, 7, 118, 2, 2, 406, 407, 7, 106, 2, 2, 407, 88, 3, 2, 2, 2, 408, 409, 7, 63, 2, 2, 409, 90, 3, 2, 2, 2, 410, 411, 7, 103, 2, 2, 411, 412, 7, 115, 2, 2, 412, 92, 3, 2, 2, 2, 413, 414, 7, 64, 2, 2, 414, 94, 3, 2, 2, 2, 415, 416, 7, 105, 2, 2, 416, 417, 7, 118, 2, 2, 417, 96, 3, 2, 2, 2, 418, 419, 7, 64, 2, 2, 419, 420, 7, 63, 2, 2, 420, 98, 3, 2, 2, 2, 421, 422, 7, 105, 2, 2, 422, 423, 7, 103, 2, 2, 423, 100, 3, 2, 2, 2, 424, 425, 7, 105, 2, 2, 425, 426, 7, 118, 2, 2, 426, 427, 7, 103, 2, 2, 427, 102, 3, 2, 2, 2, 428, 429, 7, 62, 2, 2, 429, 104, 3, 2, 2, 2, 430, 431, 7, 110, 2, 2, 431, 432, 7, 118, 2, 2, 432, 106, 3, 2, 2, 2, 433, 434, 7, 62, 2, 2, 434, 435, 7, 63, 2, 2, 435, 108, 3, 2, 2, 2, 436, 437, 7, 110, 2, 2, 437, 438, 7, 103, 2, 2, 438, 110, 3, 2, 2, 2, 439, 440, 7, 110, 2, 2, 440, 441, 7, 118, 2, 2, 441, 442, 7, 103, 2, 2, 442, 112, 3, 2, 2, 2, 443, 444, 7, 62, 2, 2, 444, 445, 7, 64, 2, 2, 445, 114, 3, 2, 2, 2, 446, 447, 7, 35, 2, 2, 447, 448, 7, 63, 2, 2, 448, 116, 3, 2, 2, 2, 449, 450, 7, 112, 2, 2, 450, 451, 7, 103, 2, 2, 451, 118, 3, 2, 2, 2, 452, 453, 7, 107, 2, 2, 453, 454, 7, 103, 2, 2, 454, 455, 7, 115, 2, 2, 455, 120, 3, 2, 2, 2, 456, 457, 7, 107, 2, 2, 457, 458, 7, 112, 2, 2, 458, 459, 7, 103, 2, 2, 459, 122, 3, 2, 2, 2, 460, 461, 7, 60, 2, 2, 461, 465, 9, 2, 2, 2, 462, 464, 9, 3, 2, 2, 463, 462, 3, 2, 2, 2, 464, 467, 3, 2, 2, 2, 465, 463, 3, 2, 2, 2, 465, 466, 3, 2, 2, 2, 466, 124, 3, 2, 2, 2, 467, 465, 3, 2, 2, 2, 468, 472, 9, 2, 2, 2, 469, 471, 9, 4, 2, 2, 470, 469, 3, 2, 2, 2, 471, 474, 3, 2, 2, 2, 472, 470, 3, 2, 2, 2, 472, 473, 3, 2, 2, 2, 473, 126, 3, 2, 2, 2, 474, 472, 3, 2, 2, 2, 475, 476, 7, 118, 2, 2, 476, 477, 7, 116, 2, 2, 477, 478, 7, 119, 2, 2, 478, 485, 7, 103, 2, 2, 479, 480, 7, 104, 2, 2, 480, 481, 7, 99, 2, 2, 481, 482, 7, 110, 2, 2, 482, 483, 7, 117, 2, 2, 483, 485, 7, 103, 2, 2, 484, 475, 3, 2, 2, 2, 484, 479, 3, 2, 2, 2, 485, 128, 3, 2, 2, 2, 486, 488, 7, 47, 2, 2, 487, 486, 3, 2, 2, 2, 487, 488, 3, 2, 2, 2, 488, 489, 3, 2, 2, 2, 489, 496, 5, 131, 66, 2, 490, 492, 7, 47, 2, 2, 491, 490, 3, 2, 2, 2, 491, 492, 3, 2, 2, 2, 492, 493, 3, 2, 2, 2, 493, 496, 5, 133, 67, 2, 494, 496, 5, 135, 68, 2, 495, 487, 3, 2, 2, 2, 495, 491, 3, 2, 2, 2, 495, 494, 3, 2, 2, 2, 496, 130, 3, 2, 2, 2, 497, 499, 9, 5, 2, 2, 498, 497, 3, 2, 2, 2, 499, 500, 3, 2, 2, 2, 500, 498, 3, 2, 2, 2, 500, 501, 3, 2, 2, 2, 501, 502, 3, 2, 2, 2, 502, 506, 7, 48, 2, 2, 503, 505, 9, 5, 2, 2, 504, 503, 3, 2, 2, 2, 505, 508, 3, 2, 2, 2, 506, 504, 3, 2, 2, 2, 506, 507, 3, 2, 2, 2, 507, 132, 3, 2, 2, 2, 508, 506, 3, 2, 2, 2, 509, 513, 9, 6, 2, 2, 510, 512, 9, 5, 2, 2, 511, 510, 3, 2, 2, 2, 512, 515, 3, 2, 2, 2, 513, 511, 3, 2, 2, 2, 513, 514, 3, 2, 2, 2, 514, 134, 3, 2, 2, 2, 515, 513, 3, 2, 2, 2, 516, 517, 7, 50, 2, 2, 517, 136, 3, 2, 2, 2, 518, 524, 7, 41, 2, 2, 519, 523, 10, 7, 2, 2, 520, 521, 7, 41, 2, 2, 521, 523, 7, 41, 2, 2, 522, 519, 3, 2, 2, 2, 522, 520, 3, 2, 2, 2, 523, 526, 3, 2, 2, 2, 524, 522, 3, 2, 2, 2, 524, 525, 3, 2, 2, 2, 525, 527, 3, 2, 2, 2, 526, 524, 3, 2, 2, 2, 527, 528, 7, 41, 2, 2, 528, 138, 3, 2, 2, 2, 529, 530, 9, 8, 2, 2, 530, 531, 3, 2, 2, 2, 531, 532, 8, 70, 2, 2, 532, 140, 3, 2, 2, 2, 14, 2, 465, 472, 484, 487, 491, 495, 500, 506, 513, 522, 524, 3, 8, 2, 2]
\ No newline at end of file
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
index 7dc2d8101..e67271b29 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
@@ -1,4 +1,4 @@
-// Generated from C:/dev/ebean/ebean/src/test/resources/EQL.g4 by ANTLR 4.7.1
+// Generated from /home/rob/github/ebean-dir/ebean/src/test/resources/EQL.g4 by ANTLR 4.7.2
 package io.ebeaninternal.server.grammer.antlr;
 
 import org.antlr.v4.runtime.CharStream;
@@ -12,286 +12,309 @@ import org.antlr.v4.runtime.atn.LexerATNSimulator;
 import org.antlr.v4.runtime.atn.PredictionContextCache;
 import org.antlr.v4.runtime.dfa.DFA;
 
-@SuppressWarnings({ "all", "warnings", "unchecked", "unused", "cast" })
+@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
 public class EQLLexer extends Lexer {
-  static {
-    RuntimeMetaData.checkVersion("4.7.1", RuntimeMetaData.VERSION);
-  }
+	static { RuntimeMetaData.checkVersion("4.7.2", RuntimeMetaData.VERSION); }
 
-  protected static final DFA[] _decisionToDFA;
-  protected static final PredictionContextCache _sharedContextCache = new PredictionContextCache();
-  public static final int T__0 = 1, T__1 = 2, T__2 = 3, T__3 = 4, T__4 = 5, T__5 = 6, T__6 = 7, T__7 = 8, T__8 = 9,
-      T__9 = 10, T__10 = 11, T__11 = 12, T__12 = 13, T__13 = 14, T__14 = 15, T__15 = 16, T__16 = 17, T__17 = 18,
-      T__18 = 19, T__19 = 20, T__20 = 21, T__21 = 22, T__22 = 23, T__23 = 24, T__24 = 25, T__25 = 26, T__26 = 27,
-      T__27 = 28, T__28 = 29, T__29 = 30, T__30 = 31, T__31 = 32, T__32 = 33, T__33 = 34, T__34 = 35, T__35 = 36,
-      T__36 = 37, T__37 = 38, T__38 = 39, T__39 = 40, T__40 = 41, T__41 = 42, T__42 = 43, T__43 = 44, T__44 = 45,
-      T__45 = 46, T__46 = 47, T__47 = 48, T__48 = 49, T__49 = 50, T__50 = 51, T__51 = 52, T__52 = 53, T__53 = 54,
-      T__54 = 55, T__55 = 56, T__56 = 57, T__57 = 58, INPUT_VARIABLE = 59, PATH_VARIABLE = 60, BOOLEAN_LITERAL = 61,
-      NUMBER_LITERAL = 62, DOUBLE = 63, INT = 64, ZERO = 65, STRING_LITERAL = 66, WS = 67;
-  public static String[] channelNames = { "DEFAULT_TOKEN_CHANNEL", "HIDDEN" };
+	protected static final DFA[] _decisionToDFA;
+	protected static final PredictionContextCache _sharedContextCache =
+		new PredictionContextCache();
+	public static final int
+		T__0=1, T__1=2, T__2=3, T__3=4, T__4=5, T__5=6, T__6=7, T__7=8, T__8=9,
+		T__9=10, T__10=11, T__11=12, T__12=13, T__13=14, T__14=15, T__15=16, T__16=17,
+		T__17=18, T__18=19, T__19=20, T__20=21, T__21=22, T__22=23, T__23=24,
+		T__24=25, T__25=26, T__26=27, T__27=28, T__28=29, T__29=30, T__30=31,
+		T__31=32, T__32=33, T__33=34, T__34=35, T__35=36, T__36=37, T__37=38,
+		T__38=39, T__39=40, T__40=41, T__41=42, T__42=43, T__43=44, T__44=45,
+		T__45=46, T__46=47, T__47=48, T__48=49, T__49=50, T__50=51, T__51=52,
+		T__52=53, T__53=54, T__54=55, T__55=56, T__56=57, T__57=58, T__58=59,
+		T__59=60, INPUT_VARIABLE=61, PATH_VARIABLE=62, BOOLEAN_LITERAL=63, NUMBER_LITERAL=64,
+		DOUBLE=65, INT=66, ZERO=67, STRING_LITERAL=68, WS=69;
+	public static String[] channelNames = {
+		"DEFAULT_TOKEN_CHANNEL", "HIDDEN"
+	};
 
-  public static String[] modeNames = { "DEFAULT_MODE" };
+	public static String[] modeNames = {
+		"DEFAULT_MODE"
+	};
 
-  public static final String[] ruleNames = { "T__0", "T__1", "T__2", "T__3", "T__4", "T__5", "T__6", "T__7", "T__8",
-      "T__9", "T__10", "T__11", "T__12", "T__13", "T__14", "T__15", "T__16", "T__17", "T__18", "T__19", "T__20",
-      "T__21", "T__22", "T__23", "T__24", "T__25", "T__26", "T__27", "T__28", "T__29", "T__30", "T__31", "T__32",
-      "T__33", "T__34", "T__35", "T__36", "T__37", "T__38", "T__39", "T__40", "T__41", "T__42", "T__43", "T__44",
-      "T__45", "T__46", "T__47", "T__48", "T__49", "T__50", "T__51", "T__52", "T__53", "T__54", "T__55", "T__56",
-      "T__57", "INPUT_VARIABLE", "PATH_VARIABLE", "BOOLEAN_LITERAL", "NUMBER_LITERAL", "DOUBLE", "INT", "ZERO",
-      "STRING_LITERAL", "WS" };
+	private static String[] makeRuleNames() {
+		return new String[] {
+			"T__0", "T__1", "T__2", "T__3", "T__4", "T__5", "T__6", "T__7", "T__8",
+			"T__9", "T__10", "T__11", "T__12", "T__13", "T__14", "T__15", "T__16",
+			"T__17", "T__18", "T__19", "T__20", "T__21", "T__22", "T__23", "T__24",
+			"T__25", "T__26", "T__27", "T__28", "T__29", "T__30", "T__31", "T__32",
+			"T__33", "T__34", "T__35", "T__36", "T__37", "T__38", "T__39", "T__40",
+			"T__41", "T__42", "T__43", "T__44", "T__45", "T__46", "T__47", "T__48",
+			"T__49", "T__50", "T__51", "T__52", "T__53", "T__54", "T__55", "T__56",
+			"T__57", "T__58", "T__59", "INPUT_VARIABLE", "PATH_VARIABLE", "BOOLEAN_LITERAL",
+			"NUMBER_LITERAL", "DOUBLE", "INT", "ZERO", "STRING_LITERAL", "WS"
+		};
+	}
+	public static final String[] ruleNames = makeRuleNames();
 
-  private static final String[] _LITERAL_NAMES = { null, "'select'", "'('", "')'", "'distinct'", "'where'", "'order'",
-      "'by'", "','", "'nulls'", "'first'", "'last'", "'asc'", "'desc'", "'limit'", "'offset'", "'fetch'", "'+'",
-      "'query'", "'lazy'", "'or'", "'and'", "'not'", "'in'", "'between'", "'is'", "'null'", "'isNull'", "'isNotNull'",
-      "'notNull'", "'empty'", "'isEmpty'", "'isNotEmpty'", "'notEmpty'", "'like'", "'ilike'", "'contains'",
-      "'icontains'", "'startsWith'", "'istartsWith'", "'endsWith'", "'iendsWith'", "'='", "'eq'", "'>'", "'gt'", "'>='",
-      "'ge'", "'gte'", "'<'", "'lt'", "'<='", "'le'", "'lte'", "'<>'", "'!='", "'ne'", "'ieq'", "'ine'", null, null,
-      null, null, null, null, "'0'" };
-  private static final String[] _SYMBOLIC_NAMES = { null, null, null, null, null, null, null, null, null, null, null,
-      null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
-      null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
-      null, null, null, null, null, null, null, null, null, null, "INPUT_VARIABLE", "PATH_VARIABLE", "BOOLEAN_LITERAL",
-      "NUMBER_LITERAL", "DOUBLE", "INT", "ZERO", "STRING_LITERAL", "WS" };
-  public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
+	private static String[] makeLiteralNames() {
+		return new String[] {
+			null, "'select'", "'('", "')'", "'distinct'", "'where'", "'order'", "'by'",
+			"','", "'nulls'", "'first'", "'last'", "'asc'", "'desc'", "'limit'",
+			"'offset'", "'fetch'", "'+'", "'query'", "'lazy'", "'or'", "'and'", "'not'",
+			"'in'", "'between'", "'inrange'", "'to'", "'is'", "'null'", "'isNull'",
+			"'isNotNull'", "'notNull'", "'empty'", "'isEmpty'", "'isNotEmpty'", "'notEmpty'",
+			"'like'", "'ilike'", "'contains'", "'icontains'", "'startsWith'", "'istartsWith'",
+			"'endsWith'", "'iendsWith'", "'='", "'eq'", "'>'", "'gt'", "'>='", "'ge'",
+			"'gte'", "'<'", "'lt'", "'<='", "'le'", "'lte'", "'<>'", "'!='", "'ne'",
+			"'ieq'", "'ine'", null, null, null, null, null, null, "'0'"
+		};
+	}
+	private static final String[] _LITERAL_NAMES = makeLiteralNames();
+	private static String[] makeSymbolicNames() {
+		return new String[] {
+			null, null, null, null, null, null, null, null, null, null, null, null,
+			null, null, null, null, null, null, null, null, null, null, null, null,
+			null, null, null, null, null, null, null, null, null, null, null, null,
+			null, null, null, null, null, null, null, null, null, null, null, null,
+			null, null, null, null, null, null, null, null, null, null, null, null,
+			null, "INPUT_VARIABLE", "PATH_VARIABLE", "BOOLEAN_LITERAL", "NUMBER_LITERAL",
+			"DOUBLE", "INT", "ZERO", "STRING_LITERAL", "WS"
+		};
+	}
+	private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
+	public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
 
-  /**
-   * @deprecated Use {@link #VOCABULARY} instead.
-   */
-  @Deprecated
-  public static final String[] tokenNames;
-  static {
-    tokenNames = new String[_SYMBOLIC_NAMES.length];
-    for (int i = 0; i < tokenNames.length; i++) {
-      tokenNames[i] = VOCABULARY.getLiteralName(i);
-      if (tokenNames[i] == null) {
-        tokenNames[i] = VOCABULARY.getSymbolicName(i);
-      }
+	/**
+	 * @deprecated Use {@link #VOCABULARY} instead.
+	 */
+	@Deprecated
+	public static final String[] tokenNames;
+	static {
+		tokenNames = new String[_SYMBOLIC_NAMES.length];
+		for (int i = 0; i < tokenNames.length; i++) {
+			tokenNames[i] = VOCABULARY.getLiteralName(i);
+			if (tokenNames[i] == null) {
+				tokenNames[i] = VOCABULARY.getSymbolicName(i);
+			}
 
-      if (tokenNames[i] == null) {
-        tokenNames[i] = "<INVALID>";
-      }
-    }
-  }
+			if (tokenNames[i] == null) {
+				tokenNames[i] = "<INVALID>";
+			}
+		}
+	}
 
-  @Override
-  @Deprecated
-  public String[] getTokenNames() {
-    return tokenNames;
-  }
+	@Override
+	@Deprecated
+	public String[] getTokenNames() {
+		return tokenNames;
+	}
 
-  @Override
+	@Override
 
-  public Vocabulary getVocabulary() {
-    return VOCABULARY;
-  }
+	public Vocabulary getVocabulary() {
+		return VOCABULARY;
+	}
 
-  public EQLLexer(CharStream input) {
-    super(input);
-    _interp = new LexerATNSimulator(this, _ATN, _decisionToDFA, _sharedContextCache);
-  }
 
-  @Override
-  public String getGrammarFileName() {
-    return "EQL.g4";
-  }
+	public EQLLexer(CharStream input) {
+		super(input);
+		_interp = new LexerATNSimulator(this,_ATN,_decisionToDFA,_sharedContextCache);
+	}
 
-  @Override
-  public String[] getRuleNames() {
-    return ruleNames;
-  }
+	@Override
+	public String getGrammarFileName() { return "EQL.g4"; }
 
-  @Override
-  public String getSerializedATN() {
-    return _serializedATN;
-  }
+	@Override
+	public String[] getRuleNames() { return ruleNames; }
 
-  @Override
-  public String[] getChannelNames() {
-    return channelNames;
-  }
+	@Override
+	public String getSerializedATN() { return _serializedATN; }
 
-  @Override
-  public String[] getModeNames() {
-    return modeNames;
-  }
+	@Override
+	public String[] getChannelNames() { return channelNames; }
 
-  @Override
-  public ATN getATN() {
-    return _ATN;
-  }
+	@Override
+	public String[] getModeNames() { return modeNames; }
 
-  public static final String _serializedATN = "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2E\u0206\b\1\4\2\t"
-      + "\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13"
-      + "\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"
-      + "\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"
-      + "\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\4\36\t\36\4\37\t\37\4 \t \4!"
-      + "\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\4*\t*\4+\t+\4"
-      + ",\t,\4-\t-\4.\t.\4/\t/\4\60\t\60\4\61\t\61\4\62\t\62\4\63\t\63\4\64\t"
-      + "\64\4\65\t\65\4\66\t\66\4\67\t\67\48\t8\49\t9\4:\t:\4;\t;\4<\t<\4=\t="
-      + "\4>\t>\4?\t?\4@\t@\4A\tA\4B\tB\4C\tC\4D\tD\3\2\3\2\3\2\3\2\3\2\3\2\3\2"
-      + "\3\3\3\3\3\4\3\4\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\6\3\6\3\6\3\6\3"
-      + "\6\3\6\3\7\3\7\3\7\3\7\3\7\3\7\3\b\3\b\3\b\3\t\3\t\3\n\3\n\3\n\3\n\3\n"
-      + "\3\n\3\13\3\13\3\13\3\13\3\13\3\13\3\f\3\f\3\f\3\f\3\f\3\r\3\r\3\r\3\r"
-      + "\3\16\3\16\3\16\3\16\3\16\3\17\3\17\3\17\3\17\3\17\3\17\3\20\3\20\3\20"
-      + "\3\20\3\20\3\20\3\20\3\21\3\21\3\21\3\21\3\21\3\21\3\22\3\22\3\23\3\23"
-      + "\3\23\3\23\3\23\3\23\3\24\3\24\3\24\3\24\3\24\3\25\3\25\3\25\3\26\3\26"
-      + "\3\26\3\26\3\27\3\27\3\27\3\27\3\30\3\30\3\30\3\31\3\31\3\31\3\31\3\31"
-      + "\3\31\3\31\3\31\3\32\3\32\3\32\3\33\3\33\3\33\3\33\3\33\3\34\3\34\3\34"
-      + "\3\34\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35"
-      + "\3\36\3\36\3\36\3\36\3\36\3\36\3\36\3\36\3\37\3\37\3\37\3\37\3\37\3\37"
-      + "\3 \3 \3 \3 \3 \3 \3 \3 \3!\3!\3!\3!\3!\3!\3!\3!\3!\3!\3!\3\"\3\"\3\""
-      + "\3\"\3\"\3\"\3\"\3\"\3\"\3#\3#\3#\3#\3#\3$\3$\3$\3$\3$\3$\3%\3%\3%\3%"
-      + "\3%\3%\3%\3%\3%\3&\3&\3&\3&\3&\3&\3&\3&\3&\3&\3\'\3\'\3\'\3\'\3\'\3\'"
-      + "\3\'\3\'\3\'\3\'\3\'\3(\3(\3(\3(\3(\3(\3(\3(\3(\3(\3(\3(\3)\3)\3)\3)\3"
-      + ")\3)\3)\3)\3)\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3+\3+\3,\3,\3,\3-\3-\3.\3"
-      + ".\3.\3/\3/\3/\3\60\3\60\3\60\3\61\3\61\3\61\3\61\3\62\3\62\3\63\3\63\3"
-      + "\63\3\64\3\64\3\64\3\65\3\65\3\65\3\66\3\66\3\66\3\66\3\67\3\67\3\67\3"
-      + "8\38\38\39\39\39\3:\3:\3:\3:\3;\3;\3;\3;\3<\3<\3<\7<\u01c1\n<\f<\16<\u01c4"
-      + "\13<\3=\3=\7=\u01c8\n=\f=\16=\u01cb\13=\3>\3>\3>\3>\3>\3>\3>\3>\3>\5>"
-      + "\u01d6\n>\3?\5?\u01d9\n?\3?\3?\5?\u01dd\n?\3?\3?\5?\u01e1\n?\3@\6@\u01e4"
-      + "\n@\r@\16@\u01e5\3@\3@\7@\u01ea\n@\f@\16@\u01ed\13@\3A\3A\7A\u01f1\nA"
-      + "\fA\16A\u01f4\13A\3B\3B\3C\3C\3C\3C\7C\u01fc\nC\fC\16C\u01ff\13C\3C\3"
-      + "C\3D\3D\3D\3D\2\2E\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\23\13\25\f\27\r"
-      + "\31\16\33\17\35\20\37\21!\22#\23%\24\'\25)\26+\27-\30/\31\61\32\63\33"
-      + "\65\34\67\359\36;\37= ?!A\"C#E$G%I&K\'M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63"
-      + "e\64g\65i\66k\67m8o9q:s;u<w=y>{?}@\177A\u0081B\u0083C\u0085D\u0087E\3"
-      + "\2\t\5\2C\\aac|\6\2\62;C\\aac|\7\2\60\60\62;C\\aac|\3\2\62;\3\2\63;\3"
-      + "\2))\5\2\13\f\17\17\"\"\2\u0211\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2"
-      + "\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2"
-      + "\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2"
-      + "\2\37\3\2\2\2\2!\3\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2"
-      + "\2+\3\2\2\2\2-\3\2\2\2\2/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2"
-      + "\2\2\67\3\2\2\2\29\3\2\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2"
-      + "\2C\3\2\2\2\2E\3\2\2\2\2G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O"
-      + "\3\2\2\2\2Q\3\2\2\2\2S\3\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2"
-      + "\2\2\2]\3\2\2\2\2_\3\2\2\2\2a\3\2\2\2\2c\3\2\2\2\2e\3\2\2\2\2g\3\2\2\2"
-      + "\2i\3\2\2\2\2k\3\2\2\2\2m\3\2\2\2\2o\3\2\2\2\2q\3\2\2\2\2s\3\2\2\2\2u"
-      + "\3\2\2\2\2w\3\2\2\2\2y\3\2\2\2\2{\3\2\2\2\2}\3\2\2\2\2\177\3\2\2\2\2\u0081"
-      + "\3\2\2\2\2\u0083\3\2\2\2\2\u0085\3\2\2\2\2\u0087\3\2\2\2\3\u0089\3\2\2"
-      + "\2\5\u0090\3\2\2\2\7\u0092\3\2\2\2\t\u0094\3\2\2\2\13\u009d\3\2\2\2\r"
-      + "\u00a3\3\2\2\2\17\u00a9\3\2\2\2\21\u00ac\3\2\2\2\23\u00ae\3\2\2\2\25\u00b4"
-      + "\3\2\2\2\27\u00ba\3\2\2\2\31\u00bf\3\2\2\2\33\u00c3\3\2\2\2\35\u00c8\3"
-      + "\2\2\2\37\u00ce\3\2\2\2!\u00d5\3\2\2\2#\u00db\3\2\2\2%\u00dd\3\2\2\2\'"
-      + "\u00e3\3\2\2\2)\u00e8\3\2\2\2+\u00eb\3\2\2\2-\u00ef\3\2\2\2/\u00f3\3\2"
-      + "\2\2\61\u00f6\3\2\2\2\63\u00fe\3\2\2\2\65\u0101\3\2\2\2\67\u0106\3\2\2"
-      + "\29\u010d\3\2\2\2;\u0117\3\2\2\2=\u011f\3\2\2\2?\u0125\3\2\2\2A\u012d"
-      + "\3\2\2\2C\u0138\3\2\2\2E\u0141\3\2\2\2G\u0146\3\2\2\2I\u014c\3\2\2\2K"
-      + "\u0155\3\2\2\2M\u015f\3\2\2\2O\u016a\3\2\2\2Q\u0176\3\2\2\2S\u017f\3\2"
-      + "\2\2U\u0189\3\2\2\2W\u018b\3\2\2\2Y\u018e\3\2\2\2[\u0190\3\2\2\2]\u0193"
-      + "\3\2\2\2_\u0196\3\2\2\2a\u0199\3\2\2\2c\u019d\3\2\2\2e\u019f\3\2\2\2g"
-      + "\u01a2\3\2\2\2i\u01a5\3\2\2\2k\u01a8\3\2\2\2m\u01ac\3\2\2\2o\u01af\3\2"
-      + "\2\2q\u01b2\3\2\2\2s\u01b5\3\2\2\2u\u01b9\3\2\2\2w\u01bd\3\2\2\2y\u01c5"
-      + "\3\2\2\2{\u01d5\3\2\2\2}\u01e0\3\2\2\2\177\u01e3\3\2\2\2\u0081\u01ee\3"
-      + "\2\2\2\u0083\u01f5\3\2\2\2\u0085\u01f7\3\2\2\2\u0087\u0202\3\2\2\2\u0089"
-      + "\u008a\7u\2\2\u008a\u008b\7g\2\2\u008b\u008c\7n\2\2\u008c\u008d\7g\2\2"
-      + "\u008d\u008e\7e\2\2\u008e\u008f\7v\2\2\u008f\4\3\2\2\2\u0090\u0091\7*"
-      + "\2\2\u0091\6\3\2\2\2\u0092\u0093\7+\2\2\u0093\b\3\2\2\2\u0094\u0095\7"
-      + "f\2\2\u0095\u0096\7k\2\2\u0096\u0097\7u\2\2\u0097\u0098\7v\2\2\u0098\u0099"
-      + "\7k\2\2\u0099\u009a\7p\2\2\u009a\u009b\7e\2\2\u009b\u009c\7v\2\2\u009c"
-      + "\n\3\2\2\2\u009d\u009e\7y\2\2\u009e\u009f\7j\2\2\u009f\u00a0\7g\2\2\u00a0"
-      + "\u00a1\7t\2\2\u00a1\u00a2\7g\2\2\u00a2\f\3\2\2\2\u00a3\u00a4\7q\2\2\u00a4"
-      + "\u00a5\7t\2\2\u00a5\u00a6\7f\2\2\u00a6\u00a7\7g\2\2\u00a7\u00a8\7t\2\2"
-      + "\u00a8\16\3\2\2\2\u00a9\u00aa\7d\2\2\u00aa\u00ab\7{\2\2\u00ab\20\3\2\2"
-      + "\2\u00ac\u00ad\7.\2\2\u00ad\22\3\2\2\2\u00ae\u00af\7p\2\2\u00af\u00b0"
-      + "\7w\2\2\u00b0\u00b1\7n\2\2\u00b1\u00b2\7n\2\2\u00b2\u00b3\7u\2\2\u00b3"
-      + "\24\3\2\2\2\u00b4\u00b5\7h\2\2\u00b5\u00b6\7k\2\2\u00b6\u00b7\7t\2\2\u00b7"
-      + "\u00b8\7u\2\2\u00b8\u00b9\7v\2\2\u00b9\26\3\2\2\2\u00ba\u00bb\7n\2\2\u00bb"
-      + "\u00bc\7c\2\2\u00bc\u00bd\7u\2\2\u00bd\u00be\7v\2\2\u00be\30\3\2\2\2\u00bf"
-      + "\u00c0\7c\2\2\u00c0\u00c1\7u\2\2\u00c1\u00c2\7e\2\2\u00c2\32\3\2\2\2\u00c3"
-      + "\u00c4\7f\2\2\u00c4\u00c5\7g\2\2\u00c5\u00c6\7u\2\2\u00c6\u00c7\7e\2\2"
-      + "\u00c7\34\3\2\2\2\u00c8\u00c9\7n\2\2\u00c9\u00ca\7k\2\2\u00ca\u00cb\7"
-      + "o\2\2\u00cb\u00cc\7k\2\2\u00cc\u00cd\7v\2\2\u00cd\36\3\2\2\2\u00ce\u00cf"
-      + "\7q\2\2\u00cf\u00d0\7h\2\2\u00d0\u00d1\7h\2\2\u00d1\u00d2\7u\2\2\u00d2"
-      + "\u00d3\7g\2\2\u00d3\u00d4\7v\2\2\u00d4 \3\2\2\2\u00d5\u00d6\7h\2\2\u00d6"
-      + "\u00d7\7g\2\2\u00d7\u00d8\7v\2\2\u00d8\u00d9\7e\2\2\u00d9\u00da\7j\2\2"
-      + "\u00da\"\3\2\2\2\u00db\u00dc\7-\2\2\u00dc$\3\2\2\2\u00dd\u00de\7s\2\2"
-      + "\u00de\u00df\7w\2\2\u00df\u00e0\7g\2\2\u00e0\u00e1\7t\2\2\u00e1\u00e2"
-      + "\7{\2\2\u00e2&\3\2\2\2\u00e3\u00e4\7n\2\2\u00e4\u00e5\7c\2\2\u00e5\u00e6"
-      + "\7|\2\2\u00e6\u00e7\7{\2\2\u00e7(\3\2\2\2\u00e8\u00e9\7q\2\2\u00e9\u00ea"
-      + "\7t\2\2\u00ea*\3\2\2\2\u00eb\u00ec\7c\2\2\u00ec\u00ed\7p\2\2\u00ed\u00ee"
-      + "\7f\2\2\u00ee,\3\2\2\2\u00ef\u00f0\7p\2\2\u00f0\u00f1\7q\2\2\u00f1\u00f2"
-      + "\7v\2\2\u00f2.\3\2\2\2\u00f3\u00f4\7k\2\2\u00f4\u00f5\7p\2\2\u00f5\60"
-      + "\3\2\2\2\u00f6\u00f7\7d\2\2\u00f7\u00f8\7g\2\2\u00f8\u00f9\7v\2\2\u00f9"
-      + "\u00fa\7y\2\2\u00fa\u00fb\7g\2\2\u00fb\u00fc\7g\2\2\u00fc\u00fd\7p\2\2"
-      + "\u00fd\62\3\2\2\2\u00fe\u00ff\7k\2\2\u00ff\u0100\7u\2\2\u0100\64\3\2\2"
-      + "\2\u0101\u0102\7p\2\2\u0102\u0103\7w\2\2\u0103\u0104\7n\2\2\u0104\u0105"
-      + "\7n\2\2\u0105\66\3\2\2\2\u0106\u0107\7k\2\2\u0107\u0108\7u\2\2\u0108\u0109"
-      + "\7P\2\2\u0109\u010a\7w\2\2\u010a\u010b\7n\2\2\u010b\u010c\7n\2\2\u010c"
-      + "8\3\2\2\2\u010d\u010e\7k\2\2\u010e\u010f\7u\2\2\u010f\u0110\7P\2\2\u0110"
-      + "\u0111\7q\2\2\u0111\u0112\7v\2\2\u0112\u0113\7P\2\2\u0113\u0114\7w\2\2"
-      + "\u0114\u0115\7n\2\2\u0115\u0116\7n\2\2\u0116:\3\2\2\2\u0117\u0118\7p\2"
-      + "\2\u0118\u0119\7q\2\2\u0119\u011a\7v\2\2\u011a\u011b\7P\2\2\u011b\u011c"
-      + "\7w\2\2\u011c\u011d\7n\2\2\u011d\u011e\7n\2\2\u011e<\3\2\2\2\u011f\u0120"
-      + "\7g\2\2\u0120\u0121\7o\2\2\u0121\u0122\7r\2\2\u0122\u0123\7v\2\2\u0123"
-      + "\u0124\7{\2\2\u0124>\3\2\2\2\u0125\u0126\7k\2\2\u0126\u0127\7u\2\2\u0127"
-      + "\u0128\7G\2\2\u0128\u0129\7o\2\2\u0129\u012a\7r\2\2\u012a\u012b\7v\2\2"
-      + "\u012b\u012c\7{\2\2\u012c@\3\2\2\2\u012d\u012e\7k\2\2\u012e\u012f\7u\2"
-      + "\2\u012f\u0130\7P\2\2\u0130\u0131\7q\2\2\u0131\u0132\7v\2\2\u0132\u0133"
-      + "\7G\2\2\u0133\u0134\7o\2\2\u0134\u0135\7r\2\2\u0135\u0136\7v\2\2\u0136"
-      + "\u0137\7{\2\2\u0137B\3\2\2\2\u0138\u0139\7p\2\2\u0139\u013a\7q\2\2\u013a"
-      + "\u013b\7v\2\2\u013b\u013c\7G\2\2\u013c\u013d\7o\2\2\u013d\u013e\7r\2\2"
-      + "\u013e\u013f\7v\2\2\u013f\u0140\7{\2\2\u0140D\3\2\2\2\u0141\u0142\7n\2"
-      + "\2\u0142\u0143\7k\2\2\u0143\u0144\7m\2\2\u0144\u0145\7g\2\2\u0145F\3\2"
-      + "\2\2\u0146\u0147\7k\2\2\u0147\u0148\7n\2\2\u0148\u0149\7k\2\2\u0149\u014a"
-      + "\7m\2\2\u014a\u014b\7g\2\2\u014bH\3\2\2\2\u014c\u014d\7e\2\2\u014d\u014e"
-      + "\7q\2\2\u014e\u014f\7p\2\2\u014f\u0150\7v\2\2\u0150\u0151\7c\2\2\u0151"
-      + "\u0152\7k\2\2\u0152\u0153\7p\2\2\u0153\u0154\7u\2\2\u0154J\3\2\2\2\u0155"
-      + "\u0156\7k\2\2\u0156\u0157\7e\2\2\u0157\u0158\7q\2\2\u0158\u0159\7p\2\2"
-      + "\u0159\u015a\7v\2\2\u015a\u015b\7c\2\2\u015b\u015c\7k\2\2\u015c\u015d"
-      + "\7p\2\2\u015d\u015e\7u\2\2\u015eL\3\2\2\2\u015f\u0160\7u\2\2\u0160\u0161"
-      + "\7v\2\2\u0161\u0162\7c\2\2\u0162\u0163\7t\2\2\u0163\u0164\7v\2\2\u0164"
-      + "\u0165\7u\2\2\u0165\u0166\7Y\2\2\u0166\u0167\7k\2\2\u0167\u0168\7v\2\2"
-      + "\u0168\u0169\7j\2\2\u0169N\3\2\2\2\u016a\u016b\7k\2\2\u016b\u016c\7u\2"
-      + "\2\u016c\u016d\7v\2\2\u016d\u016e\7c\2\2\u016e\u016f\7t\2\2\u016f\u0170"
-      + "\7v\2\2\u0170\u0171\7u\2\2\u0171\u0172\7Y\2\2\u0172\u0173\7k\2\2\u0173"
-      + "\u0174\7v\2\2\u0174\u0175\7j\2\2\u0175P\3\2\2\2\u0176\u0177\7g\2\2\u0177"
-      + "\u0178\7p\2\2\u0178\u0179\7f\2\2\u0179\u017a\7u\2\2\u017a\u017b\7Y\2\2"
-      + "\u017b\u017c\7k\2\2\u017c\u017d\7v\2\2\u017d\u017e\7j\2\2\u017eR\3\2\2"
-      + "\2\u017f\u0180\7k\2\2\u0180\u0181\7g\2\2\u0181\u0182\7p\2\2\u0182\u0183"
-      + "\7f\2\2\u0183\u0184\7u\2\2\u0184\u0185\7Y\2\2\u0185\u0186\7k\2\2\u0186"
-      + "\u0187\7v\2\2\u0187\u0188\7j\2\2\u0188T\3\2\2\2\u0189\u018a\7?\2\2\u018a"
-      + "V\3\2\2\2\u018b\u018c\7g\2\2\u018c\u018d\7s\2\2\u018dX\3\2\2\2\u018e\u018f"
-      + "\7@\2\2\u018fZ\3\2\2\2\u0190\u0191\7i\2\2\u0191\u0192\7v\2\2\u0192\\\3"
-      + "\2\2\2\u0193\u0194\7@\2\2\u0194\u0195\7?\2\2\u0195^\3\2\2\2\u0196\u0197"
-      + "\7i\2\2\u0197\u0198\7g\2\2\u0198`\3\2\2\2\u0199\u019a\7i\2\2\u019a\u019b"
-      + "\7v\2\2\u019b\u019c\7g\2\2\u019cb\3\2\2\2\u019d\u019e\7>\2\2\u019ed\3"
-      + "\2\2\2\u019f\u01a0\7n\2\2\u01a0\u01a1\7v\2\2\u01a1f\3\2\2\2\u01a2\u01a3"
-      + "\7>\2\2\u01a3\u01a4\7?\2\2\u01a4h\3\2\2\2\u01a5\u01a6\7n\2\2\u01a6\u01a7"
-      + "\7g\2\2\u01a7j\3\2\2\2\u01a8\u01a9\7n\2\2\u01a9\u01aa\7v\2\2\u01aa\u01ab"
-      + "\7g\2\2\u01abl\3\2\2\2\u01ac\u01ad\7>\2\2\u01ad\u01ae\7@\2\2\u01aen\3"
-      + "\2\2\2\u01af\u01b0\7#\2\2\u01b0\u01b1\7?\2\2\u01b1p\3\2\2\2\u01b2\u01b3"
-      + "\7p\2\2\u01b3\u01b4\7g\2\2\u01b4r\3\2\2\2\u01b5\u01b6\7k\2\2\u01b6\u01b7"
-      + "\7g\2\2\u01b7\u01b8\7s\2\2\u01b8t\3\2\2\2\u01b9\u01ba\7k\2\2\u01ba\u01bb"
-      + "\7p\2\2\u01bb\u01bc\7g\2\2\u01bcv\3\2\2\2\u01bd\u01be\7<\2\2\u01be\u01c2"
-      + "\t\2\2\2\u01bf\u01c1\t\3\2\2\u01c0\u01bf\3\2\2\2\u01c1\u01c4\3\2\2\2\u01c2"
-      + "\u01c0\3\2\2\2\u01c2\u01c3\3\2\2\2\u01c3x\3\2\2\2\u01c4\u01c2\3\2\2\2"
-      + "\u01c5\u01c9\t\2\2\2\u01c6\u01c8\t\4\2\2\u01c7\u01c6\3\2\2\2\u01c8\u01cb"
-      + "\3\2\2\2\u01c9\u01c7\3\2\2\2\u01c9\u01ca\3\2\2\2\u01caz\3\2\2\2\u01cb"
-      + "\u01c9\3\2\2\2\u01cc\u01cd\7v\2\2\u01cd\u01ce\7t\2\2\u01ce\u01cf\7w\2"
-      + "\2\u01cf\u01d6\7g\2\2\u01d0\u01d1\7h\2\2\u01d1\u01d2\7c\2\2\u01d2\u01d3"
-      + "\7n\2\2\u01d3\u01d4\7u\2\2\u01d4\u01d6\7g\2\2\u01d5\u01cc\3\2\2\2\u01d5"
-      + "\u01d0\3\2\2\2\u01d6|\3\2\2\2\u01d7\u01d9\7/\2\2\u01d8\u01d7\3\2\2\2\u01d8"
-      + "\u01d9\3\2\2\2\u01d9\u01da\3\2\2\2\u01da\u01e1\5\177@\2\u01db\u01dd\7"
-      + "/\2\2\u01dc\u01db\3\2\2\2\u01dc\u01dd\3\2\2\2\u01dd\u01de\3\2\2\2\u01de"
-      + "\u01e1\5\u0081A\2\u01df\u01e1\5\u0083B\2\u01e0\u01d8\3\2\2\2\u01e0\u01dc"
-      + "\3\2\2\2\u01e0\u01df\3\2\2\2\u01e1~\3\2\2\2\u01e2\u01e4\t\5\2\2\u01e3"
-      + "\u01e2\3\2\2\2\u01e4\u01e5\3\2\2\2\u01e5\u01e3\3\2\2\2\u01e5\u01e6\3\2"
-      + "\2\2\u01e6\u01e7\3\2\2\2\u01e7\u01eb\7\60\2\2\u01e8\u01ea\t\5\2\2\u01e9"
-      + "\u01e8\3\2\2\2\u01ea\u01ed\3\2\2\2\u01eb\u01e9\3\2\2\2\u01eb\u01ec\3\2"
-      + "\2\2\u01ec\u0080\3\2\2\2\u01ed\u01eb\3\2\2\2\u01ee\u01f2\t\6\2\2\u01ef"
-      + "\u01f1\t\5\2\2\u01f0\u01ef\3\2\2\2\u01f1\u01f4\3\2\2\2\u01f2\u01f0\3\2"
-      + "\2\2\u01f2\u01f3\3\2\2\2\u01f3\u0082\3\2\2\2\u01f4\u01f2\3\2\2\2\u01f5"
-      + "\u01f6\7\62\2\2\u01f6\u0084\3\2\2\2\u01f7\u01fd\7)\2\2\u01f8\u01fc\n\7"
-      + "\2\2\u01f9\u01fa\7)\2\2\u01fa\u01fc\7)\2\2\u01fb\u01f8\3\2\2\2\u01fb\u01f9"
-      + "\3\2\2\2\u01fc\u01ff\3\2\2\2\u01fd\u01fb\3\2\2\2\u01fd\u01fe\3\2\2\2\u01fe"
-      + "\u0200\3\2\2\2\u01ff\u01fd\3\2\2\2\u0200\u0201\7)\2\2\u0201\u0086\3\2"
-      + "\2\2\u0202\u0203\t\b\2\2\u0203\u0204\3\2\2\2\u0204\u0205\bD\2\2\u0205"
-      + "\u0088\3\2\2\2\16\2\u01c2\u01c9\u01d5\u01d8\u01dc\u01e0\u01e5\u01eb\u01f2" + "\u01fb\u01fd\3\b\2\2";
-  public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray());
-  static {
-    _decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
-    for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {
-      _decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
-    }
-  }
+	@Override
+	public ATN getATN() { return _ATN; }
+
+	public static final String _serializedATN =
+		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2G\u0215\b\1\4\2\t"+
+		"\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13"+
+		"\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"+
+		"\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"+
+		"\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\4\36\t\36\4\37\t\37\4 \t \4!"+
+		"\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\4*\t*\4+\t+\4"+
+		",\t,\4-\t-\4.\t.\4/\t/\4\60\t\60\4\61\t\61\4\62\t\62\4\63\t\63\4\64\t"+
+		"\64\4\65\t\65\4\66\t\66\4\67\t\67\48\t8\49\t9\4:\t:\4;\t;\4<\t<\4=\t="+
+		"\4>\t>\4?\t?\4@\t@\4A\tA\4B\tB\4C\tC\4D\tD\4E\tE\4F\tF\3\2\3\2\3\2\3\2"+
+		"\3\2\3\2\3\2\3\3\3\3\3\4\3\4\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\6\3"+
+		"\6\3\6\3\6\3\6\3\6\3\7\3\7\3\7\3\7\3\7\3\7\3\b\3\b\3\b\3\t\3\t\3\n\3\n"+
+		"\3\n\3\n\3\n\3\n\3\13\3\13\3\13\3\13\3\13\3\13\3\f\3\f\3\f\3\f\3\f\3\r"+
+		"\3\r\3\r\3\r\3\16\3\16\3\16\3\16\3\16\3\17\3\17\3\17\3\17\3\17\3\17\3"+
+		"\20\3\20\3\20\3\20\3\20\3\20\3\20\3\21\3\21\3\21\3\21\3\21\3\21\3\22\3"+
+		"\22\3\23\3\23\3\23\3\23\3\23\3\23\3\24\3\24\3\24\3\24\3\24\3\25\3\25\3"+
+		"\25\3\26\3\26\3\26\3\26\3\27\3\27\3\27\3\27\3\30\3\30\3\30\3\31\3\31\3"+
+		"\31\3\31\3\31\3\31\3\31\3\31\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3"+
+		"\33\3\33\3\33\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\35\3\36\3\36\3\36\3"+
+		"\36\3\36\3\36\3\36\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3"+
+		" \3 \3 \3 \3 \3 \3 \3 \3!\3!\3!\3!\3!\3!\3\"\3\"\3\"\3\"\3\"\3\"\3\"\3"+
+		"\"\3#\3#\3#\3#\3#\3#\3#\3#\3#\3#\3#\3$\3$\3$\3$\3$\3$\3$\3$\3$\3%\3%\3"+
+		"%\3%\3%\3&\3&\3&\3&\3&\3&\3\'\3\'\3\'\3\'\3\'\3\'\3\'\3\'\3\'\3(\3(\3"+
+		"(\3(\3(\3(\3(\3(\3(\3(\3)\3)\3)\3)\3)\3)\3)\3)\3)\3)\3)\3*\3*\3*\3*\3"+
+		"*\3*\3*\3*\3*\3*\3*\3*\3+\3+\3+\3+\3+\3+\3+\3+\3+\3,\3,\3,\3,\3,\3,\3"+
+		",\3,\3,\3,\3-\3-\3.\3.\3.\3/\3/\3\60\3\60\3\60\3\61\3\61\3\61\3\62\3\62"+
+		"\3\62\3\63\3\63\3\63\3\63\3\64\3\64\3\65\3\65\3\65\3\66\3\66\3\66\3\67"+
+		"\3\67\3\67\38\38\38\38\39\39\39\3:\3:\3:\3;\3;\3;\3<\3<\3<\3<\3=\3=\3"+
+		"=\3=\3>\3>\3>\7>\u01d0\n>\f>\16>\u01d3\13>\3?\3?\7?\u01d7\n?\f?\16?\u01da"+
+		"\13?\3@\3@\3@\3@\3@\3@\3@\3@\3@\5@\u01e5\n@\3A\5A\u01e8\nA\3A\3A\5A\u01ec"+
+		"\nA\3A\3A\5A\u01f0\nA\3B\6B\u01f3\nB\rB\16B\u01f4\3B\3B\7B\u01f9\nB\f"+
+		"B\16B\u01fc\13B\3C\3C\7C\u0200\nC\fC\16C\u0203\13C\3D\3D\3E\3E\3E\3E\7"+
+		"E\u020b\nE\fE\16E\u020e\13E\3E\3E\3F\3F\3F\3F\2\2G\3\3\5\4\7\5\t\6\13"+
+		"\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16\33\17\35\20\37\21!\22#\23%\24\'"+
+		"\25)\26+\27-\30/\31\61\32\63\33\65\34\67\359\36;\37= ?!A\"C#E$G%I&K\'"+
+		"M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63e\64g\65i\66k\67m8o9q:s;u<w=y>{?}@\177"+
+		"A\u0081B\u0083C\u0085D\u0087E\u0089F\u008bG\3\2\t\5\2C\\aac|\6\2\62;C"+
+		"\\aac|\7\2\60\60\62;C\\aac|\3\2\62;\3\2\63;\3\2))\5\2\13\f\17\17\"\"\2"+
+		"\u0220\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2"+
+		"\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3"+
+		"\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2\2\2"+
+		"\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2\2\2\2"+
+		"/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2\29\3\2\2"+
+		"\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3\2\2\2\2"+
+		"G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2\2\2S\3"+
+		"\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2\2_\3\2\2"+
+		"\2\2a\3\2\2\2\2c\3\2\2\2\2e\3\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2k\3\2\2\2\2"+
+		"m\3\2\2\2\2o\3\2\2\2\2q\3\2\2\2\2s\3\2\2\2\2u\3\2\2\2\2w\3\2\2\2\2y\3"+
+		"\2\2\2\2{\3\2\2\2\2}\3\2\2\2\2\177\3\2\2\2\2\u0081\3\2\2\2\2\u0083\3\2"+
+		"\2\2\2\u0085\3\2\2\2\2\u0087\3\2\2\2\2\u0089\3\2\2\2\2\u008b\3\2\2\2\3"+
+		"\u008d\3\2\2\2\5\u0094\3\2\2\2\7\u0096\3\2\2\2\t\u0098\3\2\2\2\13\u00a1"+
+		"\3\2\2\2\r\u00a7\3\2\2\2\17\u00ad\3\2\2\2\21\u00b0\3\2\2\2\23\u00b2\3"+
+		"\2\2\2\25\u00b8\3\2\2\2\27\u00be\3\2\2\2\31\u00c3\3\2\2\2\33\u00c7\3\2"+
+		"\2\2\35\u00cc\3\2\2\2\37\u00d2\3\2\2\2!\u00d9\3\2\2\2#\u00df\3\2\2\2%"+
+		"\u00e1\3\2\2\2\'\u00e7\3\2\2\2)\u00ec\3\2\2\2+\u00ef\3\2\2\2-\u00f3\3"+
+		"\2\2\2/\u00f7\3\2\2\2\61\u00fa\3\2\2\2\63\u0102\3\2\2\2\65\u010a\3\2\2"+
+		"\2\67\u010d\3\2\2\29\u0110\3\2\2\2;\u0115\3\2\2\2=\u011c\3\2\2\2?\u0126"+
+		"\3\2\2\2A\u012e\3\2\2\2C\u0134\3\2\2\2E\u013c\3\2\2\2G\u0147\3\2\2\2I"+
+		"\u0150\3\2\2\2K\u0155\3\2\2\2M\u015b\3\2\2\2O\u0164\3\2\2\2Q\u016e\3\2"+
+		"\2\2S\u0179\3\2\2\2U\u0185\3\2\2\2W\u018e\3\2\2\2Y\u0198\3\2\2\2[\u019a"+
+		"\3\2\2\2]\u019d\3\2\2\2_\u019f\3\2\2\2a\u01a2\3\2\2\2c\u01a5\3\2\2\2e"+
+		"\u01a8\3\2\2\2g\u01ac\3\2\2\2i\u01ae\3\2\2\2k\u01b1\3\2\2\2m\u01b4\3\2"+
+		"\2\2o\u01b7\3\2\2\2q\u01bb\3\2\2\2s\u01be\3\2\2\2u\u01c1\3\2\2\2w\u01c4"+
+		"\3\2\2\2y\u01c8\3\2\2\2{\u01cc\3\2\2\2}\u01d4\3\2\2\2\177\u01e4\3\2\2"+
+		"\2\u0081\u01ef\3\2\2\2\u0083\u01f2\3\2\2\2\u0085\u01fd\3\2\2\2\u0087\u0204"+
+		"\3\2\2\2\u0089\u0206\3\2\2\2\u008b\u0211\3\2\2\2\u008d\u008e\7u\2\2\u008e"+
+		"\u008f\7g\2\2\u008f\u0090\7n\2\2\u0090\u0091\7g\2\2\u0091\u0092\7e\2\2"+
+		"\u0092\u0093\7v\2\2\u0093\4\3\2\2\2\u0094\u0095\7*\2\2\u0095\6\3\2\2\2"+
+		"\u0096\u0097\7+\2\2\u0097\b\3\2\2\2\u0098\u0099\7f\2\2\u0099\u009a\7k"+
+		"\2\2\u009a\u009b\7u\2\2\u009b\u009c\7v\2\2\u009c\u009d\7k\2\2\u009d\u009e"+
+		"\7p\2\2\u009e\u009f\7e\2\2\u009f\u00a0\7v\2\2\u00a0\n\3\2\2\2\u00a1\u00a2"+
+		"\7y\2\2\u00a2\u00a3\7j\2\2\u00a3\u00a4\7g\2\2\u00a4\u00a5\7t\2\2\u00a5"+
+		"\u00a6\7g\2\2\u00a6\f\3\2\2\2\u00a7\u00a8\7q\2\2\u00a8\u00a9\7t\2\2\u00a9"+
+		"\u00aa\7f\2\2\u00aa\u00ab\7g\2\2\u00ab\u00ac\7t\2\2\u00ac\16\3\2\2\2\u00ad"+
+		"\u00ae\7d\2\2\u00ae\u00af\7{\2\2\u00af\20\3\2\2\2\u00b0\u00b1\7.\2\2\u00b1"+
+		"\22\3\2\2\2\u00b2\u00b3\7p\2\2\u00b3\u00b4\7w\2\2\u00b4\u00b5\7n\2\2\u00b5"+
+		"\u00b6\7n\2\2\u00b6\u00b7\7u\2\2\u00b7\24\3\2\2\2\u00b8\u00b9\7h\2\2\u00b9"+
+		"\u00ba\7k\2\2\u00ba\u00bb\7t\2\2\u00bb\u00bc\7u\2\2\u00bc\u00bd\7v\2\2"+
+		"\u00bd\26\3\2\2\2\u00be\u00bf\7n\2\2\u00bf\u00c0\7c\2\2\u00c0\u00c1\7"+
+		"u\2\2\u00c1\u00c2\7v\2\2\u00c2\30\3\2\2\2\u00c3\u00c4\7c\2\2\u00c4\u00c5"+
+		"\7u\2\2\u00c5\u00c6\7e\2\2\u00c6\32\3\2\2\2\u00c7\u00c8\7f\2\2\u00c8\u00c9"+
+		"\7g\2\2\u00c9\u00ca\7u\2\2\u00ca\u00cb\7e\2\2\u00cb\34\3\2\2\2\u00cc\u00cd"+
+		"\7n\2\2\u00cd\u00ce\7k\2\2\u00ce\u00cf\7o\2\2\u00cf\u00d0\7k\2\2\u00d0"+
+		"\u00d1\7v\2\2\u00d1\36\3\2\2\2\u00d2\u00d3\7q\2\2\u00d3\u00d4\7h\2\2\u00d4"+
+		"\u00d5\7h\2\2\u00d5\u00d6\7u\2\2\u00d6\u00d7\7g\2\2\u00d7\u00d8\7v\2\2"+
+		"\u00d8 \3\2\2\2\u00d9\u00da\7h\2\2\u00da\u00db\7g\2\2\u00db\u00dc\7v\2"+
+		"\2\u00dc\u00dd\7e\2\2\u00dd\u00de\7j\2\2\u00de\"\3\2\2\2\u00df\u00e0\7"+
+		"-\2\2\u00e0$\3\2\2\2\u00e1\u00e2\7s\2\2\u00e2\u00e3\7w\2\2\u00e3\u00e4"+
+		"\7g\2\2\u00e4\u00e5\7t\2\2\u00e5\u00e6\7{\2\2\u00e6&\3\2\2\2\u00e7\u00e8"+
+		"\7n\2\2\u00e8\u00e9\7c\2\2\u00e9\u00ea\7|\2\2\u00ea\u00eb\7{\2\2\u00eb"+
+		"(\3\2\2\2\u00ec\u00ed\7q\2\2\u00ed\u00ee\7t\2\2\u00ee*\3\2\2\2\u00ef\u00f0"+
+		"\7c\2\2\u00f0\u00f1\7p\2\2\u00f1\u00f2\7f\2\2\u00f2,\3\2\2\2\u00f3\u00f4"+
+		"\7p\2\2\u00f4\u00f5\7q\2\2\u00f5\u00f6\7v\2\2\u00f6.\3\2\2\2\u00f7\u00f8"+
+		"\7k\2\2\u00f8\u00f9\7p\2\2\u00f9\60\3\2\2\2\u00fa\u00fb\7d\2\2\u00fb\u00fc"+
+		"\7g\2\2\u00fc\u00fd\7v\2\2\u00fd\u00fe\7y\2\2\u00fe\u00ff\7g\2\2\u00ff"+
+		"\u0100\7g\2\2\u0100\u0101\7p\2\2\u0101\62\3\2\2\2\u0102\u0103\7k\2\2\u0103"+
+		"\u0104\7p\2\2\u0104\u0105\7t\2\2\u0105\u0106\7c\2\2\u0106\u0107\7p\2\2"+
+		"\u0107\u0108\7i\2\2\u0108\u0109\7g\2\2\u0109\64\3\2\2\2\u010a\u010b\7"+
+		"v\2\2\u010b\u010c\7q\2\2\u010c\66\3\2\2\2\u010d\u010e\7k\2\2\u010e\u010f"+
+		"\7u\2\2\u010f8\3\2\2\2\u0110\u0111\7p\2\2\u0111\u0112\7w\2\2\u0112\u0113"+
+		"\7n\2\2\u0113\u0114\7n\2\2\u0114:\3\2\2\2\u0115\u0116\7k\2\2\u0116\u0117"+
+		"\7u\2\2\u0117\u0118\7P\2\2\u0118\u0119\7w\2\2\u0119\u011a\7n\2\2\u011a"+
+		"\u011b\7n\2\2\u011b<\3\2\2\2\u011c\u011d\7k\2\2\u011d\u011e\7u\2\2\u011e"+
+		"\u011f\7P\2\2\u011f\u0120\7q\2\2\u0120\u0121\7v\2\2\u0121\u0122\7P\2\2"+
+		"\u0122\u0123\7w\2\2\u0123\u0124\7n\2\2\u0124\u0125\7n\2\2\u0125>\3\2\2"+
+		"\2\u0126\u0127\7p\2\2\u0127\u0128\7q\2\2\u0128\u0129\7v\2\2\u0129\u012a"+
+		"\7P\2\2\u012a\u012b\7w\2\2\u012b\u012c\7n\2\2\u012c\u012d\7n\2\2\u012d"+
+		"@\3\2\2\2\u012e\u012f\7g\2\2\u012f\u0130\7o\2\2\u0130\u0131\7r\2\2\u0131"+
+		"\u0132\7v\2\2\u0132\u0133\7{\2\2\u0133B\3\2\2\2\u0134\u0135\7k\2\2\u0135"+
+		"\u0136\7u\2\2\u0136\u0137\7G\2\2\u0137\u0138\7o\2\2\u0138\u0139\7r\2\2"+
+		"\u0139\u013a\7v\2\2\u013a\u013b\7{\2\2\u013bD\3\2\2\2\u013c\u013d\7k\2"+
+		"\2\u013d\u013e\7u\2\2\u013e\u013f\7P\2\2\u013f\u0140\7q\2\2\u0140\u0141"+
+		"\7v\2\2\u0141\u0142\7G\2\2\u0142\u0143\7o\2\2\u0143\u0144\7r\2\2\u0144"+
+		"\u0145\7v\2\2\u0145\u0146\7{\2\2\u0146F\3\2\2\2\u0147\u0148\7p\2\2\u0148"+
+		"\u0149\7q\2\2\u0149\u014a\7v\2\2\u014a\u014b\7G\2\2\u014b\u014c\7o\2\2"+
+		"\u014c\u014d\7r\2\2\u014d\u014e\7v\2\2\u014e\u014f\7{\2\2\u014fH\3\2\2"+
+		"\2\u0150\u0151\7n\2\2\u0151\u0152\7k\2\2\u0152\u0153\7m\2\2\u0153\u0154"+
+		"\7g\2\2\u0154J\3\2\2\2\u0155\u0156\7k\2\2\u0156\u0157\7n\2\2\u0157\u0158"+
+		"\7k\2\2\u0158\u0159\7m\2\2\u0159\u015a\7g\2\2\u015aL\3\2\2\2\u015b\u015c"+
+		"\7e\2\2\u015c\u015d\7q\2\2\u015d\u015e\7p\2\2\u015e\u015f\7v\2\2\u015f"+
+		"\u0160\7c\2\2\u0160\u0161\7k\2\2\u0161\u0162\7p\2\2\u0162\u0163\7u\2\2"+
+		"\u0163N\3\2\2\2\u0164\u0165\7k\2\2\u0165\u0166\7e\2\2\u0166\u0167\7q\2"+
+		"\2\u0167\u0168\7p\2\2\u0168\u0169\7v\2\2\u0169\u016a\7c\2\2\u016a\u016b"+
+		"\7k\2\2\u016b\u016c\7p\2\2\u016c\u016d\7u\2\2\u016dP\3\2\2\2\u016e\u016f"+
+		"\7u\2\2\u016f\u0170\7v\2\2\u0170\u0171\7c\2\2\u0171\u0172\7t\2\2\u0172"+
+		"\u0173\7v\2\2\u0173\u0174\7u\2\2\u0174\u0175\7Y\2\2\u0175\u0176\7k\2\2"+
+		"\u0176\u0177\7v\2\2\u0177\u0178\7j\2\2\u0178R\3\2\2\2\u0179\u017a\7k\2"+
+		"\2\u017a\u017b\7u\2\2\u017b\u017c\7v\2\2\u017c\u017d\7c\2\2\u017d\u017e"+
+		"\7t\2\2\u017e\u017f\7v\2\2\u017f\u0180\7u\2\2\u0180\u0181\7Y\2\2\u0181"+
+		"\u0182\7k\2\2\u0182\u0183\7v\2\2\u0183\u0184\7j\2\2\u0184T\3\2\2\2\u0185"+
+		"\u0186\7g\2\2\u0186\u0187\7p\2\2\u0187\u0188\7f\2\2\u0188\u0189\7u\2\2"+
+		"\u0189\u018a\7Y\2\2\u018a\u018b\7k\2\2\u018b\u018c\7v\2\2\u018c\u018d"+
+		"\7j\2\2\u018dV\3\2\2\2\u018e\u018f\7k\2\2\u018f\u0190\7g\2\2\u0190\u0191"+
+		"\7p\2\2\u0191\u0192\7f\2\2\u0192\u0193\7u\2\2\u0193\u0194\7Y\2\2\u0194"+
+		"\u0195\7k\2\2\u0195\u0196\7v\2\2\u0196\u0197\7j\2\2\u0197X\3\2\2\2\u0198"+
+		"\u0199\7?\2\2\u0199Z\3\2\2\2\u019a\u019b\7g\2\2\u019b\u019c\7s\2\2\u019c"+
+		"\\\3\2\2\2\u019d\u019e\7@\2\2\u019e^\3\2\2\2\u019f\u01a0\7i\2\2\u01a0"+
+		"\u01a1\7v\2\2\u01a1`\3\2\2\2\u01a2\u01a3\7@\2\2\u01a3\u01a4\7?\2\2\u01a4"+
+		"b\3\2\2\2\u01a5\u01a6\7i\2\2\u01a6\u01a7\7g\2\2\u01a7d\3\2\2\2\u01a8\u01a9"+
+		"\7i\2\2\u01a9\u01aa\7v\2\2\u01aa\u01ab\7g\2\2\u01abf\3\2\2\2\u01ac\u01ad"+
+		"\7>\2\2\u01adh\3\2\2\2\u01ae\u01af\7n\2\2\u01af\u01b0\7v\2\2\u01b0j\3"+
+		"\2\2\2\u01b1\u01b2\7>\2\2\u01b2\u01b3\7?\2\2\u01b3l\3\2\2\2\u01b4\u01b5"+
+		"\7n\2\2\u01b5\u01b6\7g\2\2\u01b6n\3\2\2\2\u01b7\u01b8\7n\2\2\u01b8\u01b9"+
+		"\7v\2\2\u01b9\u01ba\7g\2\2\u01bap\3\2\2\2\u01bb\u01bc\7>\2\2\u01bc\u01bd"+
+		"\7@\2\2\u01bdr\3\2\2\2\u01be\u01bf\7#\2\2\u01bf\u01c0\7?\2\2\u01c0t\3"+
+		"\2\2\2\u01c1\u01c2\7p\2\2\u01c2\u01c3\7g\2\2\u01c3v\3\2\2\2\u01c4\u01c5"+
+		"\7k\2\2\u01c5\u01c6\7g\2\2\u01c6\u01c7\7s\2\2\u01c7x\3\2\2\2\u01c8\u01c9"+
+		"\7k\2\2\u01c9\u01ca\7p\2\2\u01ca\u01cb\7g\2\2\u01cbz\3\2\2\2\u01cc\u01cd"+
+		"\7<\2\2\u01cd\u01d1\t\2\2\2\u01ce\u01d0\t\3\2\2\u01cf\u01ce\3\2\2\2\u01d0"+
+		"\u01d3\3\2\2\2\u01d1\u01cf\3\2\2\2\u01d1\u01d2\3\2\2\2\u01d2|\3\2\2\2"+
+		"\u01d3\u01d1\3\2\2\2\u01d4\u01d8\t\2\2\2\u01d5\u01d7\t\4\2\2\u01d6\u01d5"+
+		"\3\2\2\2\u01d7\u01da\3\2\2\2\u01d8\u01d6\3\2\2\2\u01d8\u01d9\3\2\2\2\u01d9"+
+		"~\3\2\2\2\u01da\u01d8\3\2\2\2\u01db\u01dc\7v\2\2\u01dc\u01dd\7t\2\2\u01dd"+
+		"\u01de\7w\2\2\u01de\u01e5\7g\2\2\u01df\u01e0\7h\2\2\u01e0\u01e1\7c\2\2"+
+		"\u01e1\u01e2\7n\2\2\u01e2\u01e3\7u\2\2\u01e3\u01e5\7g\2\2\u01e4\u01db"+
+		"\3\2\2\2\u01e4\u01df\3\2\2\2\u01e5\u0080\3\2\2\2\u01e6\u01e8\7/\2\2\u01e7"+
+		"\u01e6\3\2\2\2\u01e7\u01e8\3\2\2\2\u01e8\u01e9\3\2\2\2\u01e9\u01f0\5\u0083"+
+		"B\2\u01ea\u01ec\7/\2\2\u01eb\u01ea\3\2\2\2\u01eb\u01ec\3\2\2\2\u01ec\u01ed"+
+		"\3\2\2\2\u01ed\u01f0\5\u0085C\2\u01ee\u01f0\5\u0087D\2\u01ef\u01e7\3\2"+
+		"\2\2\u01ef\u01eb\3\2\2\2\u01ef\u01ee\3\2\2\2\u01f0\u0082\3\2\2\2\u01f1"+
+		"\u01f3\t\5\2\2\u01f2\u01f1\3\2\2\2\u01f3\u01f4\3\2\2\2\u01f4\u01f2\3\2"+
+		"\2\2\u01f4\u01f5\3\2\2\2\u01f5\u01f6\3\2\2\2\u01f6\u01fa\7\60\2\2\u01f7"+
+		"\u01f9\t\5\2\2\u01f8\u01f7\3\2\2\2\u01f9\u01fc\3\2\2\2\u01fa\u01f8\3\2"+
+		"\2\2\u01fa\u01fb\3\2\2\2\u01fb\u0084\3\2\2\2\u01fc\u01fa\3\2\2\2\u01fd"+
+		"\u0201\t\6\2\2\u01fe\u0200\t\5\2\2\u01ff\u01fe\3\2\2\2\u0200\u0203\3\2"+
+		"\2\2\u0201\u01ff\3\2\2\2\u0201\u0202\3\2\2\2\u0202\u0086\3\2\2\2\u0203"+
+		"\u0201\3\2\2\2\u0204\u0205\7\62\2\2\u0205\u0088\3\2\2\2\u0206\u020c\7"+
+		")\2\2\u0207\u020b\n\7\2\2\u0208\u0209\7)\2\2\u0209\u020b\7)\2\2\u020a"+
+		"\u0207\3\2\2\2\u020a\u0208\3\2\2\2\u020b\u020e\3\2\2\2\u020c\u020a\3\2"+
+		"\2\2\u020c\u020d\3\2\2\2\u020d\u020f\3\2\2\2\u020e\u020c\3\2\2\2\u020f"+
+		"\u0210\7)\2\2\u0210\u008a\3\2\2\2\u0211\u0212\t\b\2\2\u0212\u0213\3\2"+
+		"\2\2\u0213\u0214\bF\2\2\u0214\u008c\3\2\2\2\16\2\u01d1\u01d8\u01e4\u01e7"+
+		"\u01eb\u01ef\u01f4\u01fa\u0201\u020a\u020c\3\b\2\2";
+	public static final ATN _ATN =
+		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
+	static {
+		_decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
+		for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {
+			_decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
+		}
+	}
 }
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens
index a475c2939..4df1b445f 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens
@@ -56,15 +56,17 @@ T__54=55
 T__55=56
 T__56=57
 T__57=58
-INPUT_VARIABLE=59
-PATH_VARIABLE=60
-BOOLEAN_LITERAL=61
-NUMBER_LITERAL=62
-DOUBLE=63
-INT=64
-ZERO=65
-STRING_LITERAL=66
-WS=67
+T__58=59
+T__59=60
+INPUT_VARIABLE=61
+PATH_VARIABLE=62
+BOOLEAN_LITERAL=63
+NUMBER_LITERAL=64
+DOUBLE=65
+INT=66
+ZERO=67
+STRING_LITERAL=68
+WS=69
 'select'=1
 '('=2
 ')'=3
@@ -89,38 +91,40 @@ WS=67
 'not'=22
 'in'=23
 'between'=24
-'is'=25
-'null'=26
-'isNull'=27
-'isNotNull'=28
-'notNull'=29
-'empty'=30
-'isEmpty'=31
-'isNotEmpty'=32
-'notEmpty'=33
-'like'=34
-'ilike'=35
-'contains'=36
-'icontains'=37
-'startsWith'=38
-'istartsWith'=39
-'endsWith'=40
-'iendsWith'=41
-'='=42
-'eq'=43
-'>'=44
-'gt'=45
-'>='=46
-'ge'=47
-'gte'=48
-'<'=49
-'lt'=50
-'<='=51
-'le'=52
-'lte'=53
-'<>'=54
-'!='=55
-'ne'=56
-'ieq'=57
-'ine'=58
-'0'=65
+'inrange'=25
+'to'=26
+'is'=27
+'null'=28
+'isNull'=29
+'isNotNull'=30
+'notNull'=31
+'empty'=32
+'isEmpty'=33
+'isNotEmpty'=34
+'notEmpty'=35
+'like'=36
+'ilike'=37
+'contains'=38
+'icontains'=39
+'startsWith'=40
+'istartsWith'=41
+'endsWith'=42
+'iendsWith'=43
+'='=44
+'eq'=45
+'>'=46
+'gt'=47
+'>='=48
+'ge'=49
+'gte'=50
+'<'=51
+'lt'=52
+'<='=53
+'le'=54
+'lte'=55
+'<>'=56
+'!='=57
+'ne'=58
+'ieq'=59
+'ine'=60
+'0'=67
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java
index 661d6c0d7..357206cd2 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java
@@ -1,6 +1,5 @@
-// Generated from C:/dev/ebean/ebean/src/test/resources/EQL.g4 by ANTLR 4.7.1
+// Generated from /home/rob/github/ebean-dir/ebean/src/test/resources/EQL.g4 by ANTLR 4.7.2
 package io.ebeaninternal.server.grammer.antlr;
-
 import org.antlr.v4.runtime.tree.ParseTreeListener;
 
 /**
@@ -8,643 +7,414 @@ import org.antlr.v4.runtime.tree.ParseTreeListener;
  * {@link EQLParser}.
  */
 public interface EQLListener extends ParseTreeListener {
-  /**
-   * Enter a parse tree produced by {@link EQLParser#select_statement}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterSelect_statement(EQLParser.Select_statementContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#select_statement}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitSelect_statement(EQLParser.Select_statementContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#select_clause}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterSelect_clause(EQLParser.Select_clauseContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#select_clause}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitSelect_clause(EQLParser.Select_clauseContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#distinct}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterDistinct(EQLParser.DistinctContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#distinct}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitDistinct(EQLParser.DistinctContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#fetch_clause}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterFetch_clause(EQLParser.Fetch_clauseContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#fetch_clause}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitFetch_clause(EQLParser.Fetch_clauseContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#where_clause}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterWhere_clause(EQLParser.Where_clauseContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#where_clause}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitWhere_clause(EQLParser.Where_clauseContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#orderby_clause}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterOrderby_clause(EQLParser.Orderby_clauseContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#orderby_clause}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitOrderby_clause(EQLParser.Orderby_clauseContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#orderby_property}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterOrderby_property(EQLParser.Orderby_propertyContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#orderby_property}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitOrderby_property(EQLParser.Orderby_propertyContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#nulls_firstlast}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterNulls_firstlast(EQLParser.Nulls_firstlastContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#nulls_firstlast}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitNulls_firstlast(EQLParser.Nulls_firstlastContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#asc_desc}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterAsc_desc(EQLParser.Asc_descContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#asc_desc}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitAsc_desc(EQLParser.Asc_descContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#limit_clause}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterLimit_clause(EQLParser.Limit_clauseContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#limit_clause}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitLimit_clause(EQLParser.Limit_clauseContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#offset_clause}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterOffset_clause(EQLParser.Offset_clauseContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#offset_clause}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitOffset_clause(EQLParser.Offset_clauseContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#fetch_path}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterFetch_path(EQLParser.Fetch_pathContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#fetch_path}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitFetch_path(EQLParser.Fetch_pathContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#fetch_property_set}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterFetch_property_set(EQLParser.Fetch_property_setContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#fetch_property_set}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitFetch_property_set(EQLParser.Fetch_property_setContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#fetch_property_group}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterFetch_property_group(EQLParser.Fetch_property_groupContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#fetch_property_group}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitFetch_property_group(EQLParser.Fetch_property_groupContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#fetch_property}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterFetch_property(EQLParser.Fetch_propertyContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#fetch_property}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitFetch_property(EQLParser.Fetch_propertyContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#fetch_query_hint}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterFetch_query_hint(EQLParser.Fetch_query_hintContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#fetch_query_hint}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitFetch_query_hint(EQLParser.Fetch_query_hintContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#fetch_lazy_hint}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterFetch_lazy_hint(EQLParser.Fetch_lazy_hintContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#fetch_lazy_hint}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitFetch_lazy_hint(EQLParser.Fetch_lazy_hintContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#fetch_option}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterFetch_option(EQLParser.Fetch_optionContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#fetch_option}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitFetch_option(EQLParser.Fetch_optionContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#fetch_query_option}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterFetch_query_option(EQLParser.Fetch_query_optionContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#fetch_query_option}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitFetch_query_option(EQLParser.Fetch_query_optionContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#fetch_lazy_option}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterFetch_lazy_option(EQLParser.Fetch_lazy_optionContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#fetch_lazy_option}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitFetch_lazy_option(EQLParser.Fetch_lazy_optionContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#fetch_batch_size}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterFetch_batch_size(EQLParser.Fetch_batch_sizeContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#fetch_batch_size}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitFetch_batch_size(EQLParser.Fetch_batch_sizeContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#conditional_expression}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterConditional_expression(EQLParser.Conditional_expressionContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#conditional_expression}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitConditional_expression(EQLParser.Conditional_expressionContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#conditional_term}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterConditional_term(EQLParser.Conditional_termContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#conditional_term}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitConditional_term(EQLParser.Conditional_termContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#conditional_factor}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterConditional_factor(EQLParser.Conditional_factorContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#conditional_factor}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitConditional_factor(EQLParser.Conditional_factorContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#conditional_primary}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterConditional_primary(EQLParser.Conditional_primaryContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#conditional_primary}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitConditional_primary(EQLParser.Conditional_primaryContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#any_expression}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterAny_expression(EQLParser.Any_expressionContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#any_expression}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitAny_expression(EQLParser.Any_expressionContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#in_expression}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterIn_expression(EQLParser.In_expressionContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#in_expression}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitIn_expression(EQLParser.In_expressionContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#in_value}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterIn_value(EQLParser.In_valueContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#in_value}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitIn_value(EQLParser.In_valueContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#between_expression}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterBetween_expression(EQLParser.Between_expressionContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#between_expression}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitBetween_expression(EQLParser.Between_expressionContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#propertyBetween_expression}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterPropertyBetween_expression(EQLParser.PropertyBetween_expressionContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#propertyBetween_expression}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitPropertyBetween_expression(EQLParser.PropertyBetween_expressionContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#isNull_expression}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterIsNull_expression(EQLParser.IsNull_expressionContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#isNull_expression}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitIsNull_expression(EQLParser.IsNull_expressionContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#isNotNull_expression}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterIsNotNull_expression(EQLParser.IsNotNull_expressionContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#isNotNull_expression}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitIsNotNull_expression(EQLParser.IsNotNull_expressionContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#isEmpty_expression}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterIsEmpty_expression(EQLParser.IsEmpty_expressionContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#isEmpty_expression}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitIsEmpty_expression(EQLParser.IsEmpty_expressionContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#isNotEmpty_expression}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterIsNotEmpty_expression(EQLParser.IsNotEmpty_expressionContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#isNotEmpty_expression}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitIsNotEmpty_expression(EQLParser.IsNotEmpty_expressionContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#like_expression}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterLike_expression(EQLParser.Like_expressionContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#like_expression}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitLike_expression(EQLParser.Like_expressionContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#like_op}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterLike_op(EQLParser.Like_opContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#like_op}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitLike_op(EQLParser.Like_opContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#comparison_expression}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterComparison_expression(EQLParser.Comparison_expressionContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#comparison_expression}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitComparison_expression(EQLParser.Comparison_expressionContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#comparison_operator}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterComparison_operator(EQLParser.Comparison_operatorContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#comparison_operator}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitComparison_operator(EQLParser.Comparison_operatorContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#value_expression}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterValue_expression(EQLParser.Value_expressionContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#value_expression}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitValue_expression(EQLParser.Value_expressionContext ctx);
-
-  /**
-   * Enter a parse tree produced by {@link EQLParser#literal}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void enterLiteral(EQLParser.LiteralContext ctx);
-
-  /**
-   * Exit a parse tree produced by {@link EQLParser#literal}.
-   *
-   * @param ctx
-   *          the parse tree
-   */
-  void exitLiteral(EQLParser.LiteralContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#select_statement}.
+	 * @param ctx the parse tree
+	 */
+	void enterSelect_statement(EQLParser.Select_statementContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#select_statement}.
+	 * @param ctx the parse tree
+	 */
+	void exitSelect_statement(EQLParser.Select_statementContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#select_clause}.
+	 * @param ctx the parse tree
+	 */
+	void enterSelect_clause(EQLParser.Select_clauseContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#select_clause}.
+	 * @param ctx the parse tree
+	 */
+	void exitSelect_clause(EQLParser.Select_clauseContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#distinct}.
+	 * @param ctx the parse tree
+	 */
+	void enterDistinct(EQLParser.DistinctContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#distinct}.
+	 * @param ctx the parse tree
+	 */
+	void exitDistinct(EQLParser.DistinctContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#fetch_clause}.
+	 * @param ctx the parse tree
+	 */
+	void enterFetch_clause(EQLParser.Fetch_clauseContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#fetch_clause}.
+	 * @param ctx the parse tree
+	 */
+	void exitFetch_clause(EQLParser.Fetch_clauseContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#where_clause}.
+	 * @param ctx the parse tree
+	 */
+	void enterWhere_clause(EQLParser.Where_clauseContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#where_clause}.
+	 * @param ctx the parse tree
+	 */
+	void exitWhere_clause(EQLParser.Where_clauseContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#orderby_clause}.
+	 * @param ctx the parse tree
+	 */
+	void enterOrderby_clause(EQLParser.Orderby_clauseContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#orderby_clause}.
+	 * @param ctx the parse tree
+	 */
+	void exitOrderby_clause(EQLParser.Orderby_clauseContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#orderby_property}.
+	 * @param ctx the parse tree
+	 */
+	void enterOrderby_property(EQLParser.Orderby_propertyContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#orderby_property}.
+	 * @param ctx the parse tree
+	 */
+	void exitOrderby_property(EQLParser.Orderby_propertyContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#nulls_firstlast}.
+	 * @param ctx the parse tree
+	 */
+	void enterNulls_firstlast(EQLParser.Nulls_firstlastContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#nulls_firstlast}.
+	 * @param ctx the parse tree
+	 */
+	void exitNulls_firstlast(EQLParser.Nulls_firstlastContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#asc_desc}.
+	 * @param ctx the parse tree
+	 */
+	void enterAsc_desc(EQLParser.Asc_descContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#asc_desc}.
+	 * @param ctx the parse tree
+	 */
+	void exitAsc_desc(EQLParser.Asc_descContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#limit_clause}.
+	 * @param ctx the parse tree
+	 */
+	void enterLimit_clause(EQLParser.Limit_clauseContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#limit_clause}.
+	 * @param ctx the parse tree
+	 */
+	void exitLimit_clause(EQLParser.Limit_clauseContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#offset_clause}.
+	 * @param ctx the parse tree
+	 */
+	void enterOffset_clause(EQLParser.Offset_clauseContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#offset_clause}.
+	 * @param ctx the parse tree
+	 */
+	void exitOffset_clause(EQLParser.Offset_clauseContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#fetch_path}.
+	 * @param ctx the parse tree
+	 */
+	void enterFetch_path(EQLParser.Fetch_pathContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#fetch_path}.
+	 * @param ctx the parse tree
+	 */
+	void exitFetch_path(EQLParser.Fetch_pathContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#fetch_property_set}.
+	 * @param ctx the parse tree
+	 */
+	void enterFetch_property_set(EQLParser.Fetch_property_setContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#fetch_property_set}.
+	 * @param ctx the parse tree
+	 */
+	void exitFetch_property_set(EQLParser.Fetch_property_setContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#fetch_property_group}.
+	 * @param ctx the parse tree
+	 */
+	void enterFetch_property_group(EQLParser.Fetch_property_groupContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#fetch_property_group}.
+	 * @param ctx the parse tree
+	 */
+	void exitFetch_property_group(EQLParser.Fetch_property_groupContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#fetch_property}.
+	 * @param ctx the parse tree
+	 */
+	void enterFetch_property(EQLParser.Fetch_propertyContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#fetch_property}.
+	 * @param ctx the parse tree
+	 */
+	void exitFetch_property(EQLParser.Fetch_propertyContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#fetch_query_hint}.
+	 * @param ctx the parse tree
+	 */
+	void enterFetch_query_hint(EQLParser.Fetch_query_hintContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#fetch_query_hint}.
+	 * @param ctx the parse tree
+	 */
+	void exitFetch_query_hint(EQLParser.Fetch_query_hintContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#fetch_lazy_hint}.
+	 * @param ctx the parse tree
+	 */
+	void enterFetch_lazy_hint(EQLParser.Fetch_lazy_hintContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#fetch_lazy_hint}.
+	 * @param ctx the parse tree
+	 */
+	void exitFetch_lazy_hint(EQLParser.Fetch_lazy_hintContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#fetch_option}.
+	 * @param ctx the parse tree
+	 */
+	void enterFetch_option(EQLParser.Fetch_optionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#fetch_option}.
+	 * @param ctx the parse tree
+	 */
+	void exitFetch_option(EQLParser.Fetch_optionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#fetch_query_option}.
+	 * @param ctx the parse tree
+	 */
+	void enterFetch_query_option(EQLParser.Fetch_query_optionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#fetch_query_option}.
+	 * @param ctx the parse tree
+	 */
+	void exitFetch_query_option(EQLParser.Fetch_query_optionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#fetch_lazy_option}.
+	 * @param ctx the parse tree
+	 */
+	void enterFetch_lazy_option(EQLParser.Fetch_lazy_optionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#fetch_lazy_option}.
+	 * @param ctx the parse tree
+	 */
+	void exitFetch_lazy_option(EQLParser.Fetch_lazy_optionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#fetch_batch_size}.
+	 * @param ctx the parse tree
+	 */
+	void enterFetch_batch_size(EQLParser.Fetch_batch_sizeContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#fetch_batch_size}.
+	 * @param ctx the parse tree
+	 */
+	void exitFetch_batch_size(EQLParser.Fetch_batch_sizeContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#conditional_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterConditional_expression(EQLParser.Conditional_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#conditional_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitConditional_expression(EQLParser.Conditional_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#conditional_term}.
+	 * @param ctx the parse tree
+	 */
+	void enterConditional_term(EQLParser.Conditional_termContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#conditional_term}.
+	 * @param ctx the parse tree
+	 */
+	void exitConditional_term(EQLParser.Conditional_termContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#conditional_factor}.
+	 * @param ctx the parse tree
+	 */
+	void enterConditional_factor(EQLParser.Conditional_factorContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#conditional_factor}.
+	 * @param ctx the parse tree
+	 */
+	void exitConditional_factor(EQLParser.Conditional_factorContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#conditional_primary}.
+	 * @param ctx the parse tree
+	 */
+	void enterConditional_primary(EQLParser.Conditional_primaryContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#conditional_primary}.
+	 * @param ctx the parse tree
+	 */
+	void exitConditional_primary(EQLParser.Conditional_primaryContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#any_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterAny_expression(EQLParser.Any_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#any_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitAny_expression(EQLParser.Any_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#in_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterIn_expression(EQLParser.In_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#in_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitIn_expression(EQLParser.In_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#in_value}.
+	 * @param ctx the parse tree
+	 */
+	void enterIn_value(EQLParser.In_valueContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#in_value}.
+	 * @param ctx the parse tree
+	 */
+	void exitIn_value(EQLParser.In_valueContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#between_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterBetween_expression(EQLParser.Between_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#between_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitBetween_expression(EQLParser.Between_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#inrange_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterInrange_expression(EQLParser.Inrange_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#inrange_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitInrange_expression(EQLParser.Inrange_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#propertyBetween_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterPropertyBetween_expression(EQLParser.PropertyBetween_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#propertyBetween_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitPropertyBetween_expression(EQLParser.PropertyBetween_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#isNull_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterIsNull_expression(EQLParser.IsNull_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#isNull_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitIsNull_expression(EQLParser.IsNull_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#isNotNull_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterIsNotNull_expression(EQLParser.IsNotNull_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#isNotNull_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitIsNotNull_expression(EQLParser.IsNotNull_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#isEmpty_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterIsEmpty_expression(EQLParser.IsEmpty_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#isEmpty_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitIsEmpty_expression(EQLParser.IsEmpty_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#isNotEmpty_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterIsNotEmpty_expression(EQLParser.IsNotEmpty_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#isNotEmpty_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitIsNotEmpty_expression(EQLParser.IsNotEmpty_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#like_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterLike_expression(EQLParser.Like_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#like_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitLike_expression(EQLParser.Like_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#like_op}.
+	 * @param ctx the parse tree
+	 */
+	void enterLike_op(EQLParser.Like_opContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#like_op}.
+	 * @param ctx the parse tree
+	 */
+	void exitLike_op(EQLParser.Like_opContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#comparison_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterComparison_expression(EQLParser.Comparison_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#comparison_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitComparison_expression(EQLParser.Comparison_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#comparison_operator}.
+	 * @param ctx the parse tree
+	 */
+	void enterComparison_operator(EQLParser.Comparison_operatorContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#comparison_operator}.
+	 * @param ctx the parse tree
+	 */
+	void exitComparison_operator(EQLParser.Comparison_operatorContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#value_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterValue_expression(EQLParser.Value_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#value_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitValue_expression(EQLParser.Value_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#literal}.
+	 * @param ctx the parse tree
+	 */
+	void enterLiteral(EQLParser.LiteralContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#literal}.
+	 * @param ctx the parse tree
+	 */
+	void exitLiteral(EQLParser.LiteralContext ctx);
 }
\ No newline at end of file
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
index 31e012d79..f6c7f0fad 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
@@ -1,4 +1,4 @@
-// Generated from C:/dev/ebean/ebean/src/test/resources/EQL.g4 by ANTLR 4.7.1
+// Generated from /home/rob/github/ebean-dir/ebean/src/test/resources/EQL.g4 by ANTLR 4.7.2
 package io.ebeaninternal.server.grammer.antlr;
 
 import org.antlr.v4.runtime.NoViableAltException;
@@ -20,2816 +20,2573 @@ import org.antlr.v4.runtime.tree.TerminalNode;
 
 import java.util.List;
 
-@SuppressWarnings({ "all", "warnings", "unchecked", "unused", "cast" })
+@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
 public class EQLParser extends Parser {
-  static {
-    RuntimeMetaData.checkVersion("4.7.1", RuntimeMetaData.VERSION);
-  }
-
-  protected static final DFA[] _decisionToDFA;
-  protected static final PredictionContextCache _sharedContextCache = new PredictionContextCache();
-  public static final int T__0 = 1, T__1 = 2, T__2 = 3, T__3 = 4, T__4 = 5, T__5 = 6, T__6 = 7, T__7 = 8, T__8 = 9,
-      T__9 = 10, T__10 = 11, T__11 = 12, T__12 = 13, T__13 = 14, T__14 = 15, T__15 = 16, T__16 = 17, T__17 = 18,
-      T__18 = 19, T__19 = 20, T__20 = 21, T__21 = 22, T__22 = 23, T__23 = 24, T__24 = 25, T__25 = 26, T__26 = 27,
-      T__27 = 28, T__28 = 29, T__29 = 30, T__30 = 31, T__31 = 32, T__32 = 33, T__33 = 34, T__34 = 35, T__35 = 36,
-      T__36 = 37, T__37 = 38, T__38 = 39, T__39 = 40, T__40 = 41, T__41 = 42, T__42 = 43, T__43 = 44, T__44 = 45,
-      T__45 = 46, T__46 = 47, T__47 = 48, T__48 = 49, T__49 = 50, T__50 = 51, T__51 = 52, T__52 = 53, T__53 = 54,
-      T__54 = 55, T__55 = 56, T__56 = 57, T__57 = 58, INPUT_VARIABLE = 59, PATH_VARIABLE = 60, BOOLEAN_LITERAL = 61,
-      NUMBER_LITERAL = 62, DOUBLE = 63, INT = 64, ZERO = 65, STRING_LITERAL = 66, WS = 67;
-  public static final int RULE_select_statement = 0, RULE_select_clause = 1, RULE_distinct = 2, RULE_fetch_clause = 3,
-      RULE_where_clause = 4, RULE_orderby_clause = 5, RULE_orderby_property = 6, RULE_nulls_firstlast = 7,
-      RULE_asc_desc = 8, RULE_limit_clause = 9, RULE_offset_clause = 10, RULE_fetch_path = 11,
-      RULE_fetch_property_set = 12, RULE_fetch_property_group = 13, RULE_fetch_property = 14,
-      RULE_fetch_query_hint = 15, RULE_fetch_lazy_hint = 16, RULE_fetch_option = 17, RULE_fetch_query_option = 18,
-      RULE_fetch_lazy_option = 19, RULE_fetch_batch_size = 20, RULE_conditional_expression = 21,
-      RULE_conditional_term = 22, RULE_conditional_factor = 23, RULE_conditional_primary = 24, RULE_any_expression = 25,
-      RULE_in_expression = 26, RULE_in_value = 27, RULE_between_expression = 28, RULE_propertyBetween_expression = 29,
-      RULE_isNull_expression = 30, RULE_isNotNull_expression = 31, RULE_isEmpty_expression = 32,
-      RULE_isNotEmpty_expression = 33, RULE_like_expression = 34, RULE_like_op = 35, RULE_comparison_expression = 36,
-      RULE_comparison_operator = 37, RULE_value_expression = 38, RULE_literal = 39;
-  public static final String[] ruleNames = { "select_statement", "select_clause", "distinct", "fetch_clause",
-      "where_clause", "orderby_clause", "orderby_property", "nulls_firstlast", "asc_desc", "limit_clause",
-      "offset_clause", "fetch_path", "fetch_property_set", "fetch_property_group", "fetch_property", "fetch_query_hint",
-      "fetch_lazy_hint", "fetch_option", "fetch_query_option", "fetch_lazy_option", "fetch_batch_size",
-      "conditional_expression", "conditional_term", "conditional_factor", "conditional_primary", "any_expression",
-      "in_expression", "in_value", "between_expression", "propertyBetween_expression", "isNull_expression",
-      "isNotNull_expression", "isEmpty_expression", "isNotEmpty_expression", "like_expression", "like_op",
-      "comparison_expression", "comparison_operator", "value_expression", "literal" };
-
-  private static final String[] _LITERAL_NAMES = { null, "'select'", "'('", "')'", "'distinct'", "'where'", "'order'",
-      "'by'", "','", "'nulls'", "'first'", "'last'", "'asc'", "'desc'", "'limit'", "'offset'", "'fetch'", "'+'",
-      "'query'", "'lazy'", "'or'", "'and'", "'not'", "'in'", "'between'", "'is'", "'null'", "'isNull'", "'isNotNull'",
-      "'notNull'", "'empty'", "'isEmpty'", "'isNotEmpty'", "'notEmpty'", "'like'", "'ilike'", "'contains'",
-      "'icontains'", "'startsWith'", "'istartsWith'", "'endsWith'", "'iendsWith'", "'='", "'eq'", "'>'", "'gt'", "'>='",
-      "'ge'", "'gte'", "'<'", "'lt'", "'<='", "'le'", "'lte'", "'<>'", "'!='", "'ne'", "'ieq'", "'ine'", null, null,
-      null, null, null, null, "'0'" };
-  private static final String[] _SYMBOLIC_NAMES = { null, null, null, null, null, null, null, null, null, null, null,
-      null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
-      null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
-      null, null, null, null, null, null, null, null, null, null, "INPUT_VARIABLE", "PATH_VARIABLE", "BOOLEAN_LITERAL",
-      "NUMBER_LITERAL", "DOUBLE", "INT", "ZERO", "STRING_LITERAL", "WS" };
-  public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
-
-  /**
-   * @deprecated Use {@link #VOCABULARY} instead.
-   */
-  @Deprecated
-  public static final String[] tokenNames;
-  static {
-    tokenNames = new String[_SYMBOLIC_NAMES.length];
-    for (int i = 0; i < tokenNames.length; i++) {
-      tokenNames[i] = VOCABULARY.getLiteralName(i);
-      if (tokenNames[i] == null) {
-        tokenNames[i] = VOCABULARY.getSymbolicName(i);
-      }
-
-      if (tokenNames[i] == null) {
-        tokenNames[i] = "<INVALID>";
-      }
-    }
-  }
-
-  @Override
-  @Deprecated
-  public String[] getTokenNames() {
-    return tokenNames;
-  }
-
-  @Override
-
-  public Vocabulary getVocabulary() {
-    return VOCABULARY;
-  }
-
-  @Override
-  public String getGrammarFileName() {
-    return "EQL.g4";
-  }
-
-  @Override
-  public String[] getRuleNames() {
-    return ruleNames;
-  }
-
-  @Override
-  public String getSerializedATN() {
-    return _serializedATN;
-  }
-
-  @Override
-  public ATN getATN() {
-    return _ATN;
-  }
-
-  public EQLParser(TokenStream input) {
-    super(input);
-    _interp = new ParserATNSimulator(this, _ATN, _decisionToDFA, _sharedContextCache);
-  }
-
-  public static class Select_statementContext extends ParserRuleContext {
-    public TerminalNode EOF() {
-      return getToken(EQLParser.EOF, 0);
-    }
-
-    public Select_clauseContext select_clause() {
-      return getRuleContext(Select_clauseContext.class, 0);
-    }
-
-    public List<Fetch_clauseContext> fetch_clause() {
-      return getRuleContexts(Fetch_clauseContext.class);
-    }
-
-    public Fetch_clauseContext fetch_clause(int i) {
-      return getRuleContext(Fetch_clauseContext.class, i);
-    }
-
-    public Where_clauseContext where_clause() {
-      return getRuleContext(Where_clauseContext.class, 0);
-    }
-
-    public Orderby_clauseContext orderby_clause() {
-      return getRuleContext(Orderby_clauseContext.class, 0);
-    }
-
-    public Limit_clauseContext limit_clause() {
-      return getRuleContext(Limit_clauseContext.class, 0);
-    }
-
-    public Select_statementContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_select_statement;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterSelect_statement(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitSelect_statement(this);
-    }
-  }
-
-  public final Select_statementContext select_statement() throws RecognitionException {
-    Select_statementContext _localctx = new Select_statementContext(_ctx, getState());
-    enterRule(_localctx, 0, RULE_select_statement);
-    int _la;
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(81);
-        _errHandler.sync(this);
-        _la = _input.LA(1);
-        if (_la == T__0) {
-          {
-            setState(80);
-            select_clause();
-          }
-        }
-
-        setState(86);
-        _errHandler.sync(this);
-        _la = _input.LA(1);
-        while (_la == T__15) {
-          {
-            {
-              setState(83);
-              fetch_clause();
-            }
-          }
-          setState(88);
-          _errHandler.sync(this);
-          _la = _input.LA(1);
-        }
-        setState(90);
-        _errHandler.sync(this);
-        _la = _input.LA(1);
-        if (_la == T__4) {
-          {
-            setState(89);
-            where_clause();
-          }
-        }
-
-        setState(93);
-        _errHandler.sync(this);
-        _la = _input.LA(1);
-        if (_la == T__5) {
-          {
-            setState(92);
-            orderby_clause();
-          }
-        }
-
-        setState(96);
-        _errHandler.sync(this);
-        _la = _input.LA(1);
-        if (_la == T__13) {
-          {
-            setState(95);
-            limit_clause();
-          }
-        }
-
-        setState(98);
-        match(EOF);
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Select_clauseContext extends ParserRuleContext {
-    public Fetch_property_groupContext fetch_property_group() {
-      return getRuleContext(Fetch_property_groupContext.class, 0);
-    }
-
-    public DistinctContext distinct() {
-      return getRuleContext(DistinctContext.class, 0);
-    }
-
-    public Select_clauseContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_select_clause;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterSelect_clause(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitSelect_clause(this);
-    }
-  }
-
-  public final Select_clauseContext select_clause() throws RecognitionException {
-    Select_clauseContext _localctx = new Select_clauseContext(_ctx, getState());
-    enterRule(_localctx, 2, RULE_select_clause);
-    int _la;
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(100);
-        match(T__0);
-        setState(102);
-        _errHandler.sync(this);
-        _la = _input.LA(1);
-        if (_la == T__3) {
-          {
-            setState(101);
-            distinct();
-          }
-        }
-
-        setState(104);
-        match(T__1);
-        setState(105);
-        fetch_property_group();
-        setState(106);
-        match(T__2);
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class DistinctContext extends ParserRuleContext {
-    public DistinctContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_distinct;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterDistinct(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitDistinct(this);
-    }
-  }
-
-  public final DistinctContext distinct() throws RecognitionException {
-    DistinctContext _localctx = new DistinctContext(_ctx, getState());
-    enterRule(_localctx, 4, RULE_distinct);
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(108);
-        match(T__3);
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Fetch_clauseContext extends ParserRuleContext {
-    public Fetch_pathContext fetch_path() {
-      return getRuleContext(Fetch_pathContext.class, 0);
-    }
-
-    public Fetch_clauseContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_fetch_clause;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterFetch_clause(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitFetch_clause(this);
-    }
-  }
-
-  public final Fetch_clauseContext fetch_clause() throws RecognitionException {
-    Fetch_clauseContext _localctx = new Fetch_clauseContext(_ctx, getState());
-    enterRule(_localctx, 6, RULE_fetch_clause);
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(110);
-        fetch_path();
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Where_clauseContext extends ParserRuleContext {
-    public Conditional_expressionContext conditional_expression() {
-      return getRuleContext(Conditional_expressionContext.class, 0);
-    }
-
-    public Where_clauseContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_where_clause;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterWhere_clause(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitWhere_clause(this);
-    }
-  }
-
-  public final Where_clauseContext where_clause() throws RecognitionException {
-    Where_clauseContext _localctx = new Where_clauseContext(_ctx, getState());
-    enterRule(_localctx, 8, RULE_where_clause);
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(112);
-        match(T__4);
-        setState(113);
-        conditional_expression();
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Orderby_clauseContext extends ParserRuleContext {
-    public List<Orderby_propertyContext> orderby_property() {
-      return getRuleContexts(Orderby_propertyContext.class);
-    }
-
-    public Orderby_propertyContext orderby_property(int i) {
-      return getRuleContext(Orderby_propertyContext.class, i);
-    }
-
-    public Orderby_clauseContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_orderby_clause;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterOrderby_clause(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitOrderby_clause(this);
-    }
-  }
-
-  public final Orderby_clauseContext orderby_clause() throws RecognitionException {
-    Orderby_clauseContext _localctx = new Orderby_clauseContext(_ctx, getState());
-    enterRule(_localctx, 10, RULE_orderby_clause);
-    int _la;
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(115);
-        match(T__5);
-        setState(116);
-        match(T__6);
-        setState(117);
-        orderby_property();
-        setState(122);
-        _errHandler.sync(this);
-        _la = _input.LA(1);
-        while (_la == T__7) {
-          {
-            {
-              setState(118);
-              match(T__7);
-              setState(119);
-              orderby_property();
-            }
-          }
-          setState(124);
-          _errHandler.sync(this);
-          _la = _input.LA(1);
-        }
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Orderby_propertyContext extends ParserRuleContext {
-    public TerminalNode PATH_VARIABLE() {
-      return getToken(EQLParser.PATH_VARIABLE, 0);
-    }
-
-    public Asc_descContext asc_desc() {
-      return getRuleContext(Asc_descContext.class, 0);
-    }
-
-    public Nulls_firstlastContext nulls_firstlast() {
-      return getRuleContext(Nulls_firstlastContext.class, 0);
-    }
-
-    public Orderby_propertyContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_orderby_property;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterOrderby_property(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitOrderby_property(this);
-    }
-  }
-
-  public final Orderby_propertyContext orderby_property() throws RecognitionException {
-    Orderby_propertyContext _localctx = new Orderby_propertyContext(_ctx, getState());
-    enterRule(_localctx, 12, RULE_orderby_property);
-    int _la;
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(125);
-        match(PATH_VARIABLE);
-        setState(127);
-        _errHandler.sync(this);
-        _la = _input.LA(1);
-        if (_la == T__11 || _la == T__12) {
-          {
-            setState(126);
-            asc_desc();
-          }
-        }
-
-        setState(130);
-        _errHandler.sync(this);
-        _la = _input.LA(1);
-        if (_la == T__8) {
-          {
-            setState(129);
-            nulls_firstlast();
-          }
-        }
-
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Nulls_firstlastContext extends ParserRuleContext {
-    public Nulls_firstlastContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_nulls_firstlast;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterNulls_firstlast(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitNulls_firstlast(this);
-    }
-  }
-
-  public final Nulls_firstlastContext nulls_firstlast() throws RecognitionException {
-    Nulls_firstlastContext _localctx = new Nulls_firstlastContext(_ctx, getState());
-    enterRule(_localctx, 14, RULE_nulls_firstlast);
-    try {
-      setState(136);
-      _errHandler.sync(this);
-      switch (getInterpreter().adaptivePredict(_input, 9, _ctx)) {
-      case 1:
-        enterOuterAlt(_localctx, 1); {
-        setState(132);
-        match(T__8);
-        setState(133);
-        match(T__9);
-      }
-        break;
-      case 2:
-        enterOuterAlt(_localctx, 2); {
-        setState(134);
-        match(T__8);
-        setState(135);
-        match(T__10);
-      }
-        break;
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Asc_descContext extends ParserRuleContext {
-    public Asc_descContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_asc_desc;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterAsc_desc(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitAsc_desc(this);
-    }
-  }
-
-  public final Asc_descContext asc_desc() throws RecognitionException {
-    Asc_descContext _localctx = new Asc_descContext(_ctx, getState());
-    enterRule(_localctx, 16, RULE_asc_desc);
-    int _la;
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(138);
-        _la = _input.LA(1);
-        if (!(_la == T__11 || _la == T__12)) {
-          _errHandler.recoverInline(this);
-        } else {
-          if (_input.LA(1) == Token.EOF)
-            matchedEOF = true;
-          _errHandler.reportMatch(this);
-          consume();
-        }
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Limit_clauseContext extends ParserRuleContext {
-    public TerminalNode NUMBER_LITERAL() {
-      return getToken(EQLParser.NUMBER_LITERAL, 0);
-    }
-
-    public Offset_clauseContext offset_clause() {
-      return getRuleContext(Offset_clauseContext.class, 0);
-    }
-
-    public Limit_clauseContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_limit_clause;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterLimit_clause(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitLimit_clause(this);
-    }
-  }
-
-  public final Limit_clauseContext limit_clause() throws RecognitionException {
-    Limit_clauseContext _localctx = new Limit_clauseContext(_ctx, getState());
-    enterRule(_localctx, 18, RULE_limit_clause);
-    int _la;
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(140);
-        match(T__13);
-        setState(141);
-        match(NUMBER_LITERAL);
-        setState(143);
-        _errHandler.sync(this);
-        _la = _input.LA(1);
-        if (_la == T__14) {
-          {
-            setState(142);
-            offset_clause();
-          }
-        }
-
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Offset_clauseContext extends ParserRuleContext {
-    public TerminalNode NUMBER_LITERAL() {
-      return getToken(EQLParser.NUMBER_LITERAL, 0);
-    }
-
-    public Offset_clauseContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_offset_clause;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterOffset_clause(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitOffset_clause(this);
-    }
-  }
-
-  public final Offset_clauseContext offset_clause() throws RecognitionException {
-    Offset_clauseContext _localctx = new Offset_clauseContext(_ctx, getState());
-    enterRule(_localctx, 20, RULE_offset_clause);
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(145);
-        match(T__14);
-        setState(146);
-        match(NUMBER_LITERAL);
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Fetch_pathContext extends ParserRuleContext {
-    public TerminalNode PATH_VARIABLE() {
-      return getToken(EQLParser.PATH_VARIABLE, 0);
-    }
-
-    public Fetch_optionContext fetch_option() {
-      return getRuleContext(Fetch_optionContext.class, 0);
-    }
-
-    public Fetch_property_setContext fetch_property_set() {
-      return getRuleContext(Fetch_property_setContext.class, 0);
-    }
-
-    public Fetch_pathContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_fetch_path;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterFetch_path(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitFetch_path(this);
-    }
-  }
-
-  public final Fetch_pathContext fetch_path() throws RecognitionException {
-    Fetch_pathContext _localctx = new Fetch_pathContext(_ctx, getState());
-    enterRule(_localctx, 22, RULE_fetch_path);
-    int _la;
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(148);
-        match(T__15);
-        setState(150);
-        _errHandler.sync(this);
-        _la = _input.LA(1);
-        if (_la == T__17 || _la == T__18) {
-          {
-            setState(149);
-            fetch_option();
-          }
-        }
-
-        setState(152);
-        match(PATH_VARIABLE);
-        setState(154);
-        _errHandler.sync(this);
-        _la = _input.LA(1);
-        if (_la == T__1) {
-          {
-            setState(153);
-            fetch_property_set();
-          }
-        }
-
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Fetch_property_setContext extends ParserRuleContext {
-    public Fetch_property_groupContext fetch_property_group() {
-      return getRuleContext(Fetch_property_groupContext.class, 0);
-    }
-
-    public Fetch_property_setContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_fetch_property_set;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterFetch_property_set(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitFetch_property_set(this);
-    }
-  }
-
-  public final Fetch_property_setContext fetch_property_set() throws RecognitionException {
-    Fetch_property_setContext _localctx = new Fetch_property_setContext(_ctx, getState());
-    enterRule(_localctx, 24, RULE_fetch_property_set);
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(156);
-        match(T__1);
-        setState(157);
-        fetch_property_group();
-        setState(158);
-        match(T__2);
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Fetch_property_groupContext extends ParserRuleContext {
-    public List<Fetch_propertyContext> fetch_property() {
-      return getRuleContexts(Fetch_propertyContext.class);
-    }
-
-    public Fetch_propertyContext fetch_property(int i) {
-      return getRuleContext(Fetch_propertyContext.class, i);
-    }
-
-    public Fetch_property_groupContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_fetch_property_group;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterFetch_property_group(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitFetch_property_group(this);
-    }
-  }
-
-  public final Fetch_property_groupContext fetch_property_group() throws RecognitionException {
-    Fetch_property_groupContext _localctx = new Fetch_property_groupContext(_ctx, getState());
-    enterRule(_localctx, 26, RULE_fetch_property_group);
-    int _la;
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(160);
-        fetch_property();
-        setState(165);
-        _errHandler.sync(this);
-        _la = _input.LA(1);
-        while (_la == T__7) {
-          {
-            {
-              setState(161);
-              match(T__7);
-              setState(162);
-              fetch_property();
-            }
-          }
-          setState(167);
-          _errHandler.sync(this);
-          _la = _input.LA(1);
-        }
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Fetch_propertyContext extends ParserRuleContext {
-    public TerminalNode PATH_VARIABLE() {
-      return getToken(EQLParser.PATH_VARIABLE, 0);
-    }
-
-    public Fetch_query_hintContext fetch_query_hint() {
-      return getRuleContext(Fetch_query_hintContext.class, 0);
-    }
-
-    public Fetch_lazy_hintContext fetch_lazy_hint() {
-      return getRuleContext(Fetch_lazy_hintContext.class, 0);
-    }
-
-    public Fetch_propertyContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_fetch_property;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterFetch_property(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitFetch_property(this);
-    }
-  }
-
-  public final Fetch_propertyContext fetch_property() throws RecognitionException {
-    Fetch_propertyContext _localctx = new Fetch_propertyContext(_ctx, getState());
-    enterRule(_localctx, 28, RULE_fetch_property);
-    try {
-      setState(171);
-      _errHandler.sync(this);
-      switch (getInterpreter().adaptivePredict(_input, 14, _ctx)) {
-      case 1:
-        enterOuterAlt(_localctx, 1); {
-        setState(168);
-        match(PATH_VARIABLE);
-      }
-        break;
-      case 2:
-        enterOuterAlt(_localctx, 2); {
-        setState(169);
-        fetch_query_hint();
-      }
-        break;
-      case 3:
-        enterOuterAlt(_localctx, 3); {
-        setState(170);
-        fetch_lazy_hint();
-      }
-        break;
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Fetch_query_hintContext extends ParserRuleContext {
-    public Fetch_query_optionContext fetch_query_option() {
-      return getRuleContext(Fetch_query_optionContext.class, 0);
-    }
-
-    public Fetch_query_hintContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_fetch_query_hint;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterFetch_query_hint(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitFetch_query_hint(this);
-    }
-  }
-
-  public final Fetch_query_hintContext fetch_query_hint() throws RecognitionException {
-    Fetch_query_hintContext _localctx = new Fetch_query_hintContext(_ctx, getState());
-    enterRule(_localctx, 30, RULE_fetch_query_hint);
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(173);
-        match(T__16);
-        setState(174);
-        fetch_query_option();
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Fetch_lazy_hintContext extends ParserRuleContext {
-    public Fetch_lazy_optionContext fetch_lazy_option() {
-      return getRuleContext(Fetch_lazy_optionContext.class, 0);
-    }
-
-    public Fetch_lazy_hintContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_fetch_lazy_hint;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterFetch_lazy_hint(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitFetch_lazy_hint(this);
-    }
-  }
-
-  public final Fetch_lazy_hintContext fetch_lazy_hint() throws RecognitionException {
-    Fetch_lazy_hintContext _localctx = new Fetch_lazy_hintContext(_ctx, getState());
-    enterRule(_localctx, 32, RULE_fetch_lazy_hint);
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(176);
-        match(T__16);
-        setState(177);
-        fetch_lazy_option();
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Fetch_optionContext extends ParserRuleContext {
-    public Fetch_query_optionContext fetch_query_option() {
-      return getRuleContext(Fetch_query_optionContext.class, 0);
-    }
-
-    public Fetch_lazy_optionContext fetch_lazy_option() {
-      return getRuleContext(Fetch_lazy_optionContext.class, 0);
-    }
-
-    public Fetch_optionContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_fetch_option;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterFetch_option(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitFetch_option(this);
-    }
-  }
-
-  public final Fetch_optionContext fetch_option() throws RecognitionException {
-    Fetch_optionContext _localctx = new Fetch_optionContext(_ctx, getState());
-    enterRule(_localctx, 34, RULE_fetch_option);
-    try {
-      setState(181);
-      _errHandler.sync(this);
-      switch (_input.LA(1)) {
-      case T__17:
-        enterOuterAlt(_localctx, 1); {
-        setState(179);
-        fetch_query_option();
-      }
-        break;
-      case T__18:
-        enterOuterAlt(_localctx, 2); {
-        setState(180);
-        fetch_lazy_option();
-      }
-        break;
-      default:
-        throw new NoViableAltException(this);
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Fetch_query_optionContext extends ParserRuleContext {
-    public Fetch_batch_sizeContext fetch_batch_size() {
-      return getRuleContext(Fetch_batch_sizeContext.class, 0);
-    }
-
-    public Fetch_query_optionContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_fetch_query_option;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterFetch_query_option(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitFetch_query_option(this);
-    }
-  }
-
-  public final Fetch_query_optionContext fetch_query_option() throws RecognitionException {
-    Fetch_query_optionContext _localctx = new Fetch_query_optionContext(_ctx, getState());
-    enterRule(_localctx, 36, RULE_fetch_query_option);
-    int _la;
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(183);
-        match(T__17);
-        setState(185);
-        _errHandler.sync(this);
-        _la = _input.LA(1);
-        if (_la == T__1) {
-          {
-            setState(184);
-            fetch_batch_size();
-          }
-        }
-
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Fetch_lazy_optionContext extends ParserRuleContext {
-    public Fetch_batch_sizeContext fetch_batch_size() {
-      return getRuleContext(Fetch_batch_sizeContext.class, 0);
-    }
-
-    public Fetch_lazy_optionContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_fetch_lazy_option;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterFetch_lazy_option(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitFetch_lazy_option(this);
-    }
-  }
-
-  public final Fetch_lazy_optionContext fetch_lazy_option() throws RecognitionException {
-    Fetch_lazy_optionContext _localctx = new Fetch_lazy_optionContext(_ctx, getState());
-    enterRule(_localctx, 38, RULE_fetch_lazy_option);
-    int _la;
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(187);
-        match(T__18);
-        setState(189);
-        _errHandler.sync(this);
-        _la = _input.LA(1);
-        if (_la == T__1) {
-          {
-            setState(188);
-            fetch_batch_size();
-          }
-        }
-
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Fetch_batch_sizeContext extends ParserRuleContext {
-    public TerminalNode NUMBER_LITERAL() {
-      return getToken(EQLParser.NUMBER_LITERAL, 0);
-    }
-
-    public Fetch_batch_sizeContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_fetch_batch_size;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterFetch_batch_size(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitFetch_batch_size(this);
-    }
-  }
-
-  public final Fetch_batch_sizeContext fetch_batch_size() throws RecognitionException {
-    Fetch_batch_sizeContext _localctx = new Fetch_batch_sizeContext(_ctx, getState());
-    enterRule(_localctx, 40, RULE_fetch_batch_size);
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(191);
-        match(T__1);
-        setState(192);
-        match(NUMBER_LITERAL);
-        setState(193);
-        match(T__2);
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Conditional_expressionContext extends ParserRuleContext {
-    public List<Conditional_termContext> conditional_term() {
-      return getRuleContexts(Conditional_termContext.class);
-    }
-
-    public Conditional_termContext conditional_term(int i) {
-      return getRuleContext(Conditional_termContext.class, i);
-    }
-
-    public Conditional_expressionContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_conditional_expression;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterConditional_expression(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitConditional_expression(this);
-    }
-  }
-
-  public final Conditional_expressionContext conditional_expression() throws RecognitionException {
-    Conditional_expressionContext _localctx = new Conditional_expressionContext(_ctx, getState());
-    enterRule(_localctx, 42, RULE_conditional_expression);
-    int _la;
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(195);
-        conditional_term();
-        setState(200);
-        _errHandler.sync(this);
-        _la = _input.LA(1);
-        while (_la == T__19) {
-          {
-            {
-              setState(196);
-              match(T__19);
-              setState(197);
-              conditional_term();
-            }
-          }
-          setState(202);
-          _errHandler.sync(this);
-          _la = _input.LA(1);
-        }
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Conditional_termContext extends ParserRuleContext {
-    public List<Conditional_factorContext> conditional_factor() {
-      return getRuleContexts(Conditional_factorContext.class);
-    }
-
-    public Conditional_factorContext conditional_factor(int i) {
-      return getRuleContext(Conditional_factorContext.class, i);
-    }
-
-    public Conditional_termContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_conditional_term;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterConditional_term(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitConditional_term(this);
-    }
-  }
-
-  public final Conditional_termContext conditional_term() throws RecognitionException {
-    Conditional_termContext _localctx = new Conditional_termContext(_ctx, getState());
-    enterRule(_localctx, 44, RULE_conditional_term);
-    int _la;
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(203);
-        conditional_factor();
-        setState(208);
-        _errHandler.sync(this);
-        _la = _input.LA(1);
-        while (_la == T__20) {
-          {
-            {
-              setState(204);
-              match(T__20);
-              setState(205);
-              conditional_factor();
-            }
-          }
-          setState(210);
-          _errHandler.sync(this);
-          _la = _input.LA(1);
-        }
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Conditional_factorContext extends ParserRuleContext {
-    public Conditional_primaryContext conditional_primary() {
-      return getRuleContext(Conditional_primaryContext.class, 0);
-    }
-
-    public Conditional_factorContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_conditional_factor;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterConditional_factor(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitConditional_factor(this);
-    }
-  }
-
-  public final Conditional_factorContext conditional_factor() throws RecognitionException {
-    Conditional_factorContext _localctx = new Conditional_factorContext(_ctx, getState());
-    enterRule(_localctx, 46, RULE_conditional_factor);
-    int _la;
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(212);
-        _errHandler.sync(this);
-        _la = _input.LA(1);
-        if (_la == T__21) {
-          {
-            setState(211);
-            match(T__21);
-          }
-        }
-
-        setState(214);
-        conditional_primary();
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Conditional_primaryContext extends ParserRuleContext {
-    public Any_expressionContext any_expression() {
-      return getRuleContext(Any_expressionContext.class, 0);
-    }
-
-    public Conditional_expressionContext conditional_expression() {
-      return getRuleContext(Conditional_expressionContext.class, 0);
-    }
-
-    public Conditional_primaryContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_conditional_primary;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterConditional_primary(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitConditional_primary(this);
-    }
-  }
-
-  public final Conditional_primaryContext conditional_primary() throws RecognitionException {
-    Conditional_primaryContext _localctx = new Conditional_primaryContext(_ctx, getState());
-    enterRule(_localctx, 48, RULE_conditional_primary);
-    try {
-      setState(221);
-      _errHandler.sync(this);
-      switch (getInterpreter().adaptivePredict(_input, 21, _ctx)) {
-      case 1:
-        enterOuterAlt(_localctx, 1); {
-        setState(216);
-        any_expression();
-      }
-        break;
-      case 2:
-        enterOuterAlt(_localctx, 2); {
-        setState(217);
-        match(T__1);
-        setState(218);
-        conditional_expression();
-        setState(219);
-        match(T__2);
-      }
-        break;
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Any_expressionContext extends ParserRuleContext {
-    public Comparison_expressionContext comparison_expression() {
-      return getRuleContext(Comparison_expressionContext.class, 0);
-    }
-
-    public Like_expressionContext like_expression() {
-      return getRuleContext(Like_expressionContext.class, 0);
-    }
-
-    public Between_expressionContext between_expression() {
-      return getRuleContext(Between_expressionContext.class, 0);
-    }
-
-    public PropertyBetween_expressionContext propertyBetween_expression() {
-      return getRuleContext(PropertyBetween_expressionContext.class, 0);
-    }
-
-    public In_expressionContext in_expression() {
-      return getRuleContext(In_expressionContext.class, 0);
-    }
-
-    public IsNull_expressionContext isNull_expression() {
-      return getRuleContext(IsNull_expressionContext.class, 0);
-    }
-
-    public IsNotNull_expressionContext isNotNull_expression() {
-      return getRuleContext(IsNotNull_expressionContext.class, 0);
-    }
-
-    public IsEmpty_expressionContext isEmpty_expression() {
-      return getRuleContext(IsEmpty_expressionContext.class, 0);
-    }
-
-    public IsNotEmpty_expressionContext isNotEmpty_expression() {
-      return getRuleContext(IsNotEmpty_expressionContext.class, 0);
-    }
-
-    public Any_expressionContext any_expression() {
-      return getRuleContext(Any_expressionContext.class, 0);
-    }
-
-    public Any_expressionContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_any_expression;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterAny_expression(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitAny_expression(this);
-    }
-  }
-
-  public final Any_expressionContext any_expression() throws RecognitionException {
-    Any_expressionContext _localctx = new Any_expressionContext(_ctx, getState());
-    enterRule(_localctx, 50, RULE_any_expression);
-    try {
-      setState(236);
-      _errHandler.sync(this);
-      switch (getInterpreter().adaptivePredict(_input, 22, _ctx)) {
-      case 1:
-        enterOuterAlt(_localctx, 1); {
-        setState(223);
-        comparison_expression();
-      }
-        break;
-      case 2:
-        enterOuterAlt(_localctx, 2); {
-        setState(224);
-        like_expression();
-      }
-        break;
-      case 3:
-        enterOuterAlt(_localctx, 3); {
-        setState(225);
-        between_expression();
-      }
-        break;
-      case 4:
-        enterOuterAlt(_localctx, 4); {
-        setState(226);
-        propertyBetween_expression();
-      }
-        break;
-      case 5:
-        enterOuterAlt(_localctx, 5); {
-        setState(227);
-        in_expression();
-      }
-        break;
-      case 6:
-        enterOuterAlt(_localctx, 6); {
-        setState(228);
-        isNull_expression();
-      }
-        break;
-      case 7:
-        enterOuterAlt(_localctx, 7); {
-        setState(229);
-        isNotNull_expression();
-      }
-        break;
-      case 8:
-        enterOuterAlt(_localctx, 8); {
-        setState(230);
-        isEmpty_expression();
-      }
-        break;
-      case 9:
-        enterOuterAlt(_localctx, 9); {
-        setState(231);
-        isNotEmpty_expression();
-      }
-        break;
-      case 10:
-        enterOuterAlt(_localctx, 10); {
-        setState(232);
-        match(T__1);
-        setState(233);
-        any_expression();
-        setState(234);
-        match(T__2);
-      }
-        break;
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class In_expressionContext extends ParserRuleContext {
-    public TerminalNode PATH_VARIABLE() {
-      return getToken(EQLParser.PATH_VARIABLE, 0);
-    }
-
-    public In_valueContext in_value() {
-      return getRuleContext(In_valueContext.class, 0);
-    }
-
-    public In_expressionContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_in_expression;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterIn_expression(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitIn_expression(this);
-    }
-  }
-
-  public final In_expressionContext in_expression() throws RecognitionException {
-    In_expressionContext _localctx = new In_expressionContext(_ctx, getState());
-    enterRule(_localctx, 52, RULE_in_expression);
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(238);
-        match(PATH_VARIABLE);
-        setState(239);
-        match(T__22);
-        setState(240);
-        in_value();
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class In_valueContext extends ParserRuleContext {
-    public TerminalNode INPUT_VARIABLE() {
-      return getToken(EQLParser.INPUT_VARIABLE, 0);
-    }
-
-    public List<Value_expressionContext> value_expression() {
-      return getRuleContexts(Value_expressionContext.class);
-    }
-
-    public Value_expressionContext value_expression(int i) {
-      return getRuleContext(Value_expressionContext.class, i);
-    }
-
-    public In_valueContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_in_value;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterIn_value(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitIn_value(this);
-    }
-  }
-
-  public final In_valueContext in_value() throws RecognitionException {
-    In_valueContext _localctx = new In_valueContext(_ctx, getState());
-    enterRule(_localctx, 54, RULE_in_value);
-    int _la;
-    try {
-      setState(254);
-      _errHandler.sync(this);
-      switch (_input.LA(1)) {
-      case INPUT_VARIABLE:
-        enterOuterAlt(_localctx, 1); {
-        setState(242);
-        match(INPUT_VARIABLE);
-      }
-        break;
-      case T__1:
-        enterOuterAlt(_localctx, 2); {
-        setState(243);
-        match(T__1);
-        setState(244);
-        value_expression();
-        setState(249);
-        _errHandler.sync(this);
-        _la = _input.LA(1);
-        while (_la == T__7) {
-          {
-            {
-              setState(245);
-              match(T__7);
-              setState(246);
-              value_expression();
-            }
-          }
-          setState(251);
-          _errHandler.sync(this);
-          _la = _input.LA(1);
-        }
-        setState(252);
-        match(T__2);
-      }
-        break;
-      default:
-        throw new NoViableAltException(this);
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Between_expressionContext extends ParserRuleContext {
-    public TerminalNode PATH_VARIABLE() {
-      return getToken(EQLParser.PATH_VARIABLE, 0);
-    }
-
-    public List<Value_expressionContext> value_expression() {
-      return getRuleContexts(Value_expressionContext.class);
-    }
-
-    public Value_expressionContext value_expression(int i) {
-      return getRuleContext(Value_expressionContext.class, i);
-    }
-
-    public Between_expressionContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_between_expression;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterBetween_expression(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitBetween_expression(this);
-    }
-  }
-
-  public final Between_expressionContext between_expression() throws RecognitionException {
-    Between_expressionContext _localctx = new Between_expressionContext(_ctx, getState());
-    enterRule(_localctx, 56, RULE_between_expression);
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(256);
-        match(PATH_VARIABLE);
-        setState(257);
-        match(T__23);
-        setState(258);
-        value_expression();
-        setState(259);
-        match(T__20);
-        setState(260);
-        value_expression();
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class PropertyBetween_expressionContext extends ParserRuleContext {
-    public Value_expressionContext value_expression() {
-      return getRuleContext(Value_expressionContext.class, 0);
-    }
-
-    public List<TerminalNode> PATH_VARIABLE() {
-      return getTokens(EQLParser.PATH_VARIABLE);
-    }
-
-    public TerminalNode PATH_VARIABLE(int i) {
-      return getToken(EQLParser.PATH_VARIABLE, i);
-    }
-
-    public PropertyBetween_expressionContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_propertyBetween_expression;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterPropertyBetween_expression(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitPropertyBetween_expression(this);
-    }
-  }
-
-  public final PropertyBetween_expressionContext propertyBetween_expression() throws RecognitionException {
-    PropertyBetween_expressionContext _localctx = new PropertyBetween_expressionContext(_ctx, getState());
-    enterRule(_localctx, 58, RULE_propertyBetween_expression);
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(262);
-        value_expression();
-        setState(263);
-        match(T__23);
-        setState(264);
-        match(PATH_VARIABLE);
-        setState(265);
-        match(T__20);
-        setState(266);
-        match(PATH_VARIABLE);
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class IsNull_expressionContext extends ParserRuleContext {
-    public TerminalNode PATH_VARIABLE() {
-      return getToken(EQLParser.PATH_VARIABLE, 0);
-    }
-
-    public IsNull_expressionContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_isNull_expression;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterIsNull_expression(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitIsNull_expression(this);
-    }
-  }
-
-  public final IsNull_expressionContext isNull_expression() throws RecognitionException {
-    IsNull_expressionContext _localctx = new IsNull_expressionContext(_ctx, getState());
-    enterRule(_localctx, 60, RULE_isNull_expression);
-    try {
-      setState(273);
-      _errHandler.sync(this);
-      switch (getInterpreter().adaptivePredict(_input, 25, _ctx)) {
-      case 1:
-        enterOuterAlt(_localctx, 1); {
-        setState(268);
-        match(PATH_VARIABLE);
-        setState(269);
-        match(T__24);
-        setState(270);
-        match(T__25);
-      }
-        break;
-      case 2:
-        enterOuterAlt(_localctx, 2); {
-        setState(271);
-        match(PATH_VARIABLE);
-        setState(272);
-        match(T__26);
-      }
-        break;
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class IsNotNull_expressionContext extends ParserRuleContext {
-    public TerminalNode PATH_VARIABLE() {
-      return getToken(EQLParser.PATH_VARIABLE, 0);
-    }
-
-    public IsNotNull_expressionContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_isNotNull_expression;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterIsNotNull_expression(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitIsNotNull_expression(this);
-    }
-  }
-
-  public final IsNotNull_expressionContext isNotNull_expression() throws RecognitionException {
-    IsNotNull_expressionContext _localctx = new IsNotNull_expressionContext(_ctx, getState());
-    enterRule(_localctx, 62, RULE_isNotNull_expression);
-    try {
-      setState(283);
-      _errHandler.sync(this);
-      switch (getInterpreter().adaptivePredict(_input, 26, _ctx)) {
-      case 1:
-        enterOuterAlt(_localctx, 1); {
-        setState(275);
-        match(PATH_VARIABLE);
-        setState(276);
-        match(T__24);
-        setState(277);
-        match(T__21);
-        setState(278);
-        match(T__25);
-      }
-        break;
-      case 2:
-        enterOuterAlt(_localctx, 2); {
-        setState(279);
-        match(PATH_VARIABLE);
-        setState(280);
-        match(T__27);
-      }
-        break;
-      case 3:
-        enterOuterAlt(_localctx, 3); {
-        setState(281);
-        match(PATH_VARIABLE);
-        setState(282);
-        match(T__28);
-      }
-        break;
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class IsEmpty_expressionContext extends ParserRuleContext {
-    public TerminalNode PATH_VARIABLE() {
-      return getToken(EQLParser.PATH_VARIABLE, 0);
-    }
-
-    public IsEmpty_expressionContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_isEmpty_expression;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterIsEmpty_expression(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitIsEmpty_expression(this);
-    }
-  }
-
-  public final IsEmpty_expressionContext isEmpty_expression() throws RecognitionException {
-    IsEmpty_expressionContext _localctx = new IsEmpty_expressionContext(_ctx, getState());
-    enterRule(_localctx, 64, RULE_isEmpty_expression);
-    try {
-      setState(290);
-      _errHandler.sync(this);
-      switch (getInterpreter().adaptivePredict(_input, 27, _ctx)) {
-      case 1:
-        enterOuterAlt(_localctx, 1); {
-        setState(285);
-        match(PATH_VARIABLE);
-        setState(286);
-        match(T__24);
-        setState(287);
-        match(T__29);
-      }
-        break;
-      case 2:
-        enterOuterAlt(_localctx, 2); {
-        setState(288);
-        match(PATH_VARIABLE);
-        setState(289);
-        match(T__30);
-      }
-        break;
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class IsNotEmpty_expressionContext extends ParserRuleContext {
-    public TerminalNode PATH_VARIABLE() {
-      return getToken(EQLParser.PATH_VARIABLE, 0);
-    }
-
-    public IsNotEmpty_expressionContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_isNotEmpty_expression;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterIsNotEmpty_expression(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitIsNotEmpty_expression(this);
-    }
-  }
-
-  public final IsNotEmpty_expressionContext isNotEmpty_expression() throws RecognitionException {
-    IsNotEmpty_expressionContext _localctx = new IsNotEmpty_expressionContext(_ctx, getState());
-    enterRule(_localctx, 66, RULE_isNotEmpty_expression);
-    try {
-      setState(300);
-      _errHandler.sync(this);
-      switch (getInterpreter().adaptivePredict(_input, 28, _ctx)) {
-      case 1:
-        enterOuterAlt(_localctx, 1); {
-        setState(292);
-        match(PATH_VARIABLE);
-        setState(293);
-        match(T__24);
-        setState(294);
-        match(T__21);
-        setState(295);
-        match(T__29);
-      }
-        break;
-      case 2:
-        enterOuterAlt(_localctx, 2); {
-        setState(296);
-        match(PATH_VARIABLE);
-        setState(297);
-        match(T__31);
-      }
-        break;
-      case 3:
-        enterOuterAlt(_localctx, 3); {
-        setState(298);
-        match(PATH_VARIABLE);
-        setState(299);
-        match(T__32);
-      }
-        break;
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Like_expressionContext extends ParserRuleContext {
-    public TerminalNode PATH_VARIABLE() {
-      return getToken(EQLParser.PATH_VARIABLE, 0);
-    }
-
-    public Like_opContext like_op() {
-      return getRuleContext(Like_opContext.class, 0);
-    }
-
-    public Value_expressionContext value_expression() {
-      return getRuleContext(Value_expressionContext.class, 0);
-    }
-
-    public Like_expressionContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_like_expression;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterLike_expression(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitLike_expression(this);
-    }
-  }
-
-  public final Like_expressionContext like_expression() throws RecognitionException {
-    Like_expressionContext _localctx = new Like_expressionContext(_ctx, getState());
-    enterRule(_localctx, 68, RULE_like_expression);
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(302);
-        match(PATH_VARIABLE);
-        setState(303);
-        like_op();
-        setState(304);
-        value_expression();
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Like_opContext extends ParserRuleContext {
-    public Like_opContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_like_op;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterLike_op(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitLike_op(this);
-    }
-  }
-
-  public final Like_opContext like_op() throws RecognitionException {
-    Like_opContext _localctx = new Like_opContext(_ctx, getState());
-    enterRule(_localctx, 70, RULE_like_op);
-    int _la;
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(306);
-        _la = _input.LA(1);
-        if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__33) | (1L << T__34) | (1L << T__35) | (1L << T__36)
-            | (1L << T__37) | (1L << T__38) | (1L << T__39) | (1L << T__40))) != 0))) {
-          _errHandler.recoverInline(this);
-        } else {
-          if (_input.LA(1) == Token.EOF)
-            matchedEOF = true;
-          _errHandler.reportMatch(this);
-          consume();
-        }
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Comparison_expressionContext extends ParserRuleContext {
-    public TerminalNode PATH_VARIABLE() {
-      return getToken(EQLParser.PATH_VARIABLE, 0);
-    }
-
-    public Comparison_operatorContext comparison_operator() {
-      return getRuleContext(Comparison_operatorContext.class, 0);
-    }
-
-    public Value_expressionContext value_expression() {
-      return getRuleContext(Value_expressionContext.class, 0);
-    }
-
-    public Comparison_expressionContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_comparison_expression;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterComparison_expression(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitComparison_expression(this);
-    }
-  }
-
-  public final Comparison_expressionContext comparison_expression() throws RecognitionException {
-    Comparison_expressionContext _localctx = new Comparison_expressionContext(_ctx, getState());
-    enterRule(_localctx, 72, RULE_comparison_expression);
-    try {
-      setState(316);
-      _errHandler.sync(this);
-      switch (_input.LA(1)) {
-      case PATH_VARIABLE:
-        enterOuterAlt(_localctx, 1); {
-        setState(308);
-        match(PATH_VARIABLE);
-        setState(309);
-        comparison_operator();
-        setState(310);
-        value_expression();
-      }
-        break;
-      case INPUT_VARIABLE:
-      case BOOLEAN_LITERAL:
-      case NUMBER_LITERAL:
-      case STRING_LITERAL:
-        enterOuterAlt(_localctx, 2); {
-        setState(312);
-        value_expression();
-        setState(313);
-        comparison_operator();
-        setState(314);
-        match(PATH_VARIABLE);
-      }
-        break;
-      default:
-        throw new NoViableAltException(this);
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Comparison_operatorContext extends ParserRuleContext {
-    public Comparison_operatorContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_comparison_operator;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterComparison_operator(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitComparison_operator(this);
-    }
-  }
-
-  public final Comparison_operatorContext comparison_operator() throws RecognitionException {
-    Comparison_operatorContext _localctx = new Comparison_operatorContext(_ctx, getState());
-    enterRule(_localctx, 74, RULE_comparison_operator);
-    int _la;
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(318);
-        _la = _input.LA(1);
-        if (!((((_la) & ~0x3f) == 0 && ((1L << _la)
-            & ((1L << T__41) | (1L << T__42) | (1L << T__43) | (1L << T__44) | (1L << T__45) | (1L << T__46)
-                | (1L << T__47) | (1L << T__48) | (1L << T__49) | (1L << T__50) | (1L << T__51) | (1L << T__52)
-                | (1L << T__53) | (1L << T__54) | (1L << T__55) | (1L << T__56) | (1L << T__57))) != 0))) {
-          _errHandler.recoverInline(this);
-        } else {
-          if (_input.LA(1) == Token.EOF)
-            matchedEOF = true;
-          _errHandler.reportMatch(this);
-          consume();
-        }
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class Value_expressionContext extends ParserRuleContext {
-    public LiteralContext literal() {
-      return getRuleContext(LiteralContext.class, 0);
-    }
-
-    public TerminalNode INPUT_VARIABLE() {
-      return getToken(EQLParser.INPUT_VARIABLE, 0);
-    }
-
-    public Value_expressionContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_value_expression;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterValue_expression(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitValue_expression(this);
-    }
-  }
-
-  public final Value_expressionContext value_expression() throws RecognitionException {
-    Value_expressionContext _localctx = new Value_expressionContext(_ctx, getState());
-    enterRule(_localctx, 76, RULE_value_expression);
-    try {
-      setState(322);
-      _errHandler.sync(this);
-      switch (_input.LA(1)) {
-      case BOOLEAN_LITERAL:
-      case NUMBER_LITERAL:
-      case STRING_LITERAL:
-        enterOuterAlt(_localctx, 1); {
-        setState(320);
-        literal();
-      }
-        break;
-      case INPUT_VARIABLE:
-        enterOuterAlt(_localctx, 2); {
-        setState(321);
-        match(INPUT_VARIABLE);
-      }
-        break;
-      default:
-        throw new NoViableAltException(this);
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static class LiteralContext extends ParserRuleContext {
-    public TerminalNode STRING_LITERAL() {
-      return getToken(EQLParser.STRING_LITERAL, 0);
-    }
-
-    public TerminalNode BOOLEAN_LITERAL() {
-      return getToken(EQLParser.BOOLEAN_LITERAL, 0);
-    }
-
-    public TerminalNode NUMBER_LITERAL() {
-      return getToken(EQLParser.NUMBER_LITERAL, 0);
-    }
-
-    public LiteralContext(ParserRuleContext parent, int invokingState) {
-      super(parent, invokingState);
-    }
-
-    @Override
-    public int getRuleIndex() {
-      return RULE_literal;
-    }
-
-    @Override
-    public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).enterLiteral(this);
-    }
-
-    @Override
-    public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener)
-        ((EQLListener) listener).exitLiteral(this);
-    }
-  }
-
-  public final LiteralContext literal() throws RecognitionException {
-    LiteralContext _localctx = new LiteralContext(_ctx, getState());
-    enterRule(_localctx, 78, RULE_literal);
-    int _la;
-    try {
-      enterOuterAlt(_localctx, 1);
-      {
-        setState(324);
-        _la = _input.LA(1);
-        if (!(((((_la - 61)) & ~0x3f) == 0 && ((1L << (_la - 61)) & ((1L << (BOOLEAN_LITERAL - 61))
-            | (1L << (NUMBER_LITERAL - 61)) | (1L << (STRING_LITERAL - 61)))) != 0))) {
-          _errHandler.recoverInline(this);
-        } else {
-          if (_input.LA(1) == Token.EOF)
-            matchedEOF = true;
-          _errHandler.reportMatch(this);
-          consume();
-        }
-      }
-    } catch (RecognitionException re) {
-      _localctx.exception = re;
-      _errHandler.reportError(this, re);
-      _errHandler.recover(this, re);
-    } finally {
-      exitRule();
-    }
-    return _localctx;
-  }
-
-  public static final String _serializedATN = "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3E\u0149\4\2\t\2\4"
-      + "\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t"
-      + "\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"
-      + "\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"
-      + "\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\4\36\t\36\4\37\t\37\4 \t \4!"
-      + "\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\3\2\5\2T\n\2\3"
-      + "\2\7\2W\n\2\f\2\16\2Z\13\2\3\2\5\2]\n\2\3\2\5\2`\n\2\3\2\5\2c\n\2\3\2"
-      + "\3\2\3\3\3\3\5\3i\n\3\3\3\3\3\3\3\3\3\3\4\3\4\3\5\3\5\3\6\3\6\3\6\3\7"
-      + "\3\7\3\7\3\7\3\7\7\7{\n\7\f\7\16\7~\13\7\3\b\3\b\5\b\u0082\n\b\3\b\5\b"
-      + "\u0085\n\b\3\t\3\t\3\t\3\t\5\t\u008b\n\t\3\n\3\n\3\13\3\13\3\13\5\13\u0092"
-      + "\n\13\3\f\3\f\3\f\3\r\3\r\5\r\u0099\n\r\3\r\3\r\5\r\u009d\n\r\3\16\3\16"
-      + "\3\16\3\16\3\17\3\17\3\17\7\17\u00a6\n\17\f\17\16\17\u00a9\13\17\3\20"
-      + "\3\20\3\20\5\20\u00ae\n\20\3\21\3\21\3\21\3\22\3\22\3\22\3\23\3\23\5\23"
-      + "\u00b8\n\23\3\24\3\24\5\24\u00bc\n\24\3\25\3\25\5\25\u00c0\n\25\3\26\3"
-      + "\26\3\26\3\26\3\27\3\27\3\27\7\27\u00c9\n\27\f\27\16\27\u00cc\13\27\3"
-      + "\30\3\30\3\30\7\30\u00d1\n\30\f\30\16\30\u00d4\13\30\3\31\5\31\u00d7\n"
-      + "\31\3\31\3\31\3\32\3\32\3\32\3\32\3\32\5\32\u00e0\n\32\3\33\3\33\3\33"
-      + "\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\5\33\u00ef\n\33\3\34"
-      + "\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\35\7\35\u00fa\n\35\f\35\16\35\u00fd"
-      + "\13\35\3\35\3\35\5\35\u0101\n\35\3\36\3\36\3\36\3\36\3\36\3\36\3\37\3"
-      + "\37\3\37\3\37\3\37\3\37\3 \3 \3 \3 \3 \5 \u0114\n \3!\3!\3!\3!\3!\3!\3"
-      + "!\3!\5!\u011e\n!\3\"\3\"\3\"\3\"\3\"\5\"\u0125\n\"\3#\3#\3#\3#\3#\3#\3"
-      + "#\3#\5#\u012f\n#\3$\3$\3$\3$\3%\3%\3&\3&\3&\3&\3&\3&\3&\3&\5&\u013f\n"
-      + "&\3\'\3\'\3(\3(\5(\u0145\n(\3)\3)\3)\2\2*\2\4\6\b\n\f\16\20\22\24\26\30"
-      + "\32\34\36 \"$&(*,.\60\62\64\668:<>@BDFHJLNP\2\6\3\2\16\17\3\2$+\3\2,<"
-      + "\4\2?@DD\2\u014a\2S\3\2\2\2\4f\3\2\2\2\6n\3\2\2\2\bp\3\2\2\2\nr\3\2\2"
-      + "\2\fu\3\2\2\2\16\177\3\2\2\2\20\u008a\3\2\2\2\22\u008c\3\2\2\2\24\u008e"
-      + "\3\2\2\2\26\u0093\3\2\2\2\30\u0096\3\2\2\2\32\u009e\3\2\2\2\34\u00a2\3"
-      + "\2\2\2\36\u00ad\3\2\2\2 \u00af\3\2\2\2\"\u00b2\3\2\2\2$\u00b7\3\2\2\2"
-      + "&\u00b9\3\2\2\2(\u00bd\3\2\2\2*\u00c1\3\2\2\2,\u00c5\3\2\2\2.\u00cd\3"
-      + "\2\2\2\60\u00d6\3\2\2\2\62\u00df\3\2\2\2\64\u00ee\3\2\2\2\66\u00f0\3\2"
-      + "\2\28\u0100\3\2\2\2:\u0102\3\2\2\2<\u0108\3\2\2\2>\u0113\3\2\2\2@\u011d"
-      + "\3\2\2\2B\u0124\3\2\2\2D\u012e\3\2\2\2F\u0130\3\2\2\2H\u0134\3\2\2\2J"
-      + "\u013e\3\2\2\2L\u0140\3\2\2\2N\u0144\3\2\2\2P\u0146\3\2\2\2RT\5\4\3\2"
-      + "SR\3\2\2\2ST\3\2\2\2TX\3\2\2\2UW\5\b\5\2VU\3\2\2\2WZ\3\2\2\2XV\3\2\2\2"
-      + "XY\3\2\2\2Y\\\3\2\2\2ZX\3\2\2\2[]\5\n\6\2\\[\3\2\2\2\\]\3\2\2\2]_\3\2"
-      + "\2\2^`\5\f\7\2_^\3\2\2\2_`\3\2\2\2`b\3\2\2\2ac\5\24\13\2ba\3\2\2\2bc\3"
-      + "\2\2\2cd\3\2\2\2de\7\2\2\3e\3\3\2\2\2fh\7\3\2\2gi\5\6\4\2hg\3\2\2\2hi"
-      + "\3\2\2\2ij\3\2\2\2jk\7\4\2\2kl\5\34\17\2lm\7\5\2\2m\5\3\2\2\2no\7\6\2"
-      + "\2o\7\3\2\2\2pq\5\30\r\2q\t\3\2\2\2rs\7\7\2\2st\5,\27\2t\13\3\2\2\2uv"
-      + "\7\b\2\2vw\7\t\2\2w|\5\16\b\2xy\7\n\2\2y{\5\16\b\2zx\3\2\2\2{~\3\2\2\2"
-      + "|z\3\2\2\2|}\3\2\2\2}\r\3\2\2\2~|\3\2\2\2\177\u0081\7>\2\2\u0080\u0082"
-      + "\5\22\n\2\u0081\u0080\3\2\2\2\u0081\u0082\3\2\2\2\u0082\u0084\3\2\2\2"
-      + "\u0083\u0085\5\20\t\2\u0084\u0083\3\2\2\2\u0084\u0085\3\2\2\2\u0085\17"
-      + "\3\2\2\2\u0086\u0087\7\13\2\2\u0087\u008b\7\f\2\2\u0088\u0089\7\13\2\2"
-      + "\u0089\u008b\7\r\2\2\u008a\u0086\3\2\2\2\u008a\u0088\3\2\2\2\u008b\21"
-      + "\3\2\2\2\u008c\u008d\t\2\2\2\u008d\23\3\2\2\2\u008e\u008f\7\20\2\2\u008f"
-      + "\u0091\7@\2\2\u0090\u0092\5\26\f\2\u0091\u0090\3\2\2\2\u0091\u0092\3\2"
-      + "\2\2\u0092\25\3\2\2\2\u0093\u0094\7\21\2\2\u0094\u0095\7@\2\2\u0095\27"
-      + "\3\2\2\2\u0096\u0098\7\22\2\2\u0097\u0099\5$\23\2\u0098\u0097\3\2\2\2"
-      + "\u0098\u0099\3\2\2\2\u0099\u009a\3\2\2\2\u009a\u009c\7>\2\2\u009b\u009d"
-      + "\5\32\16\2\u009c\u009b\3\2\2\2\u009c\u009d\3\2\2\2\u009d\31\3\2\2\2\u009e"
-      + "\u009f\7\4\2\2\u009f\u00a0\5\34\17\2\u00a0\u00a1\7\5\2\2\u00a1\33\3\2"
-      + "\2\2\u00a2\u00a7\5\36\20\2\u00a3\u00a4\7\n\2\2\u00a4\u00a6\5\36\20\2\u00a5"
-      + "\u00a3\3\2\2\2\u00a6\u00a9\3\2\2\2\u00a7\u00a5\3\2\2\2\u00a7\u00a8\3\2"
-      + "\2\2\u00a8\35\3\2\2\2\u00a9\u00a7\3\2\2\2\u00aa\u00ae\7>\2\2\u00ab\u00ae"
-      + "\5 \21\2\u00ac\u00ae\5\"\22\2\u00ad\u00aa\3\2\2\2\u00ad\u00ab\3\2\2\2"
-      + "\u00ad\u00ac\3\2\2\2\u00ae\37\3\2\2\2\u00af\u00b0\7\23\2\2\u00b0\u00b1"
-      + "\5&\24\2\u00b1!\3\2\2\2\u00b2\u00b3\7\23\2\2\u00b3\u00b4\5(\25\2\u00b4"
-      + "#\3\2\2\2\u00b5\u00b8\5&\24\2\u00b6\u00b8\5(\25\2\u00b7\u00b5\3\2\2\2"
-      + "\u00b7\u00b6\3\2\2\2\u00b8%\3\2\2\2\u00b9\u00bb\7\24\2\2\u00ba\u00bc\5"
-      + "*\26\2\u00bb\u00ba\3\2\2\2\u00bb\u00bc\3\2\2\2\u00bc\'\3\2\2\2\u00bd\u00bf"
-      + "\7\25\2\2\u00be\u00c0\5*\26\2\u00bf\u00be\3\2\2\2\u00bf\u00c0\3\2\2\2"
-      + "\u00c0)\3\2\2\2\u00c1\u00c2\7\4\2\2\u00c2\u00c3\7@\2\2\u00c3\u00c4\7\5"
-      + "\2\2\u00c4+\3\2\2\2\u00c5\u00ca\5.\30\2\u00c6\u00c7\7\26\2\2\u00c7\u00c9"
-      + "\5.\30\2\u00c8\u00c6\3\2\2\2\u00c9\u00cc\3\2\2\2\u00ca\u00c8\3\2\2\2\u00ca"
-      + "\u00cb\3\2\2\2\u00cb-\3\2\2\2\u00cc\u00ca\3\2\2\2\u00cd\u00d2\5\60\31"
-      + "\2\u00ce\u00cf\7\27\2\2\u00cf\u00d1\5\60\31\2\u00d0\u00ce\3\2\2\2\u00d1"
-      + "\u00d4\3\2\2\2\u00d2\u00d0\3\2\2\2\u00d2\u00d3\3\2\2\2\u00d3/\3\2\2\2"
-      + "\u00d4\u00d2\3\2\2\2\u00d5\u00d7\7\30\2\2\u00d6\u00d5\3\2\2\2\u00d6\u00d7"
-      + "\3\2\2\2\u00d7\u00d8\3\2\2\2\u00d8\u00d9\5\62\32\2\u00d9\61\3\2\2\2\u00da"
-      + "\u00e0\5\64\33\2\u00db\u00dc\7\4\2\2\u00dc\u00dd\5,\27\2\u00dd\u00de\7"
-      + "\5\2\2\u00de\u00e0\3\2\2\2\u00df\u00da\3\2\2\2\u00df\u00db\3\2\2\2\u00e0"
-      + "\63\3\2\2\2\u00e1\u00ef\5J&\2\u00e2\u00ef\5F$\2\u00e3\u00ef\5:\36\2\u00e4"
-      + "\u00ef\5<\37\2\u00e5\u00ef\5\66\34\2\u00e6\u00ef\5> \2\u00e7\u00ef\5@"
-      + "!\2\u00e8\u00ef\5B\"\2\u00e9\u00ef\5D#\2\u00ea\u00eb\7\4\2\2\u00eb\u00ec"
-      + "\5\64\33\2\u00ec\u00ed\7\5\2\2\u00ed\u00ef\3\2\2\2\u00ee\u00e1\3\2\2\2"
-      + "\u00ee\u00e2\3\2\2\2\u00ee\u00e3\3\2\2\2\u00ee\u00e4\3\2\2\2\u00ee\u00e5"
-      + "\3\2\2\2\u00ee\u00e6\3\2\2\2\u00ee\u00e7\3\2\2\2\u00ee\u00e8\3\2\2\2\u00ee"
-      + "\u00e9\3\2\2\2\u00ee\u00ea\3\2\2\2\u00ef\65\3\2\2\2\u00f0\u00f1\7>\2\2"
-      + "\u00f1\u00f2\7\31\2\2\u00f2\u00f3\58\35\2\u00f3\67\3\2\2\2\u00f4\u0101"
-      + "\7=\2\2\u00f5\u00f6\7\4\2\2\u00f6\u00fb\5N(\2\u00f7\u00f8\7\n\2\2\u00f8"
-      + "\u00fa\5N(\2\u00f9\u00f7\3\2\2\2\u00fa\u00fd\3\2\2\2\u00fb\u00f9\3\2\2"
-      + "\2\u00fb\u00fc\3\2\2\2\u00fc\u00fe\3\2\2\2\u00fd\u00fb\3\2\2\2\u00fe\u00ff"
-      + "\7\5\2\2\u00ff\u0101\3\2\2\2\u0100\u00f4\3\2\2\2\u0100\u00f5\3\2\2\2\u0101"
-      + "9\3\2\2\2\u0102\u0103\7>\2\2\u0103\u0104\7\32\2\2\u0104\u0105\5N(\2\u0105"
-      + "\u0106\7\27\2\2\u0106\u0107\5N(\2\u0107;\3\2\2\2\u0108\u0109\5N(\2\u0109"
-      + "\u010a\7\32\2\2\u010a\u010b\7>\2\2\u010b\u010c\7\27\2\2\u010c\u010d\7"
-      + ">\2\2\u010d=\3\2\2\2\u010e\u010f\7>\2\2\u010f\u0110\7\33\2\2\u0110\u0114"
-      + "\7\34\2\2\u0111\u0112\7>\2\2\u0112\u0114\7\35\2\2\u0113\u010e\3\2\2\2"
-      + "\u0113\u0111\3\2\2\2\u0114?\3\2\2\2\u0115\u0116\7>\2\2\u0116\u0117\7\33"
-      + "\2\2\u0117\u0118\7\30\2\2\u0118\u011e\7\34\2\2\u0119\u011a\7>\2\2\u011a"
-      + "\u011e\7\36\2\2\u011b\u011c\7>\2\2\u011c\u011e\7\37\2\2\u011d\u0115\3"
-      + "\2\2\2\u011d\u0119\3\2\2\2\u011d\u011b\3\2\2\2\u011eA\3\2\2\2\u011f\u0120"
-      + "\7>\2\2\u0120\u0121\7\33\2\2\u0121\u0125\7 \2\2\u0122\u0123\7>\2\2\u0123"
-      + "\u0125\7!\2\2\u0124\u011f\3\2\2\2\u0124\u0122\3\2\2\2\u0125C\3\2\2\2\u0126"
-      + "\u0127\7>\2\2\u0127\u0128\7\33\2\2\u0128\u0129\7\30\2\2\u0129\u012f\7"
-      + " \2\2\u012a\u012b\7>\2\2\u012b\u012f\7\"\2\2\u012c\u012d\7>\2\2\u012d"
-      + "\u012f\7#\2\2\u012e\u0126\3\2\2\2\u012e\u012a\3\2\2\2\u012e\u012c\3\2"
-      + "\2\2\u012fE\3\2\2\2\u0130\u0131\7>\2\2\u0131\u0132\5H%\2\u0132\u0133\5"
-      + "N(\2\u0133G\3\2\2\2\u0134\u0135\t\3\2\2\u0135I\3\2\2\2\u0136\u0137\7>"
-      + "\2\2\u0137\u0138\5L\'\2\u0138\u0139\5N(\2\u0139\u013f\3\2\2\2\u013a\u013b"
-      + "\5N(\2\u013b\u013c\5L\'\2\u013c\u013d\7>\2\2\u013d\u013f\3\2\2\2\u013e"
-      + "\u0136\3\2\2\2\u013e\u013a\3\2\2\2\u013fK\3\2\2\2\u0140\u0141\t\4\2\2"
-      + "\u0141M\3\2\2\2\u0142\u0145\5P)\2\u0143\u0145\7=\2\2\u0144\u0142\3\2\2"
-      + "\2\u0144\u0143\3\2\2\2\u0145O\3\2\2\2\u0146\u0147\t\5\2\2\u0147Q\3\2\2"
-      + "\2!SX\\_bh|\u0081\u0084\u008a\u0091\u0098\u009c\u00a7\u00ad\u00b7\u00bb"
-      + "\u00bf\u00ca\u00d2\u00d6\u00df\u00ee\u00fb\u0100\u0113\u011d\u0124\u012e" + "\u013e\u0144";
-  public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray());
-  static {
-    _decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
-    for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {
-      _decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
-    }
-  }
+	static { RuntimeMetaData.checkVersion("4.7.2", RuntimeMetaData.VERSION); }
+
+	protected static final DFA[] _decisionToDFA;
+	protected static final PredictionContextCache _sharedContextCache =
+		new PredictionContextCache();
+	public static final int
+		T__0=1, T__1=2, T__2=3, T__3=4, T__4=5, T__5=6, T__6=7, T__7=8, T__8=9,
+		T__9=10, T__10=11, T__11=12, T__12=13, T__13=14, T__14=15, T__15=16, T__16=17,
+		T__17=18, T__18=19, T__19=20, T__20=21, T__21=22, T__22=23, T__23=24,
+		T__24=25, T__25=26, T__26=27, T__27=28, T__28=29, T__29=30, T__30=31,
+		T__31=32, T__32=33, T__33=34, T__34=35, T__35=36, T__36=37, T__37=38,
+		T__38=39, T__39=40, T__40=41, T__41=42, T__42=43, T__43=44, T__44=45,
+		T__45=46, T__46=47, T__47=48, T__48=49, T__49=50, T__50=51, T__51=52,
+		T__52=53, T__53=54, T__54=55, T__55=56, T__56=57, T__57=58, T__58=59,
+		T__59=60, INPUT_VARIABLE=61, PATH_VARIABLE=62, BOOLEAN_LITERAL=63, NUMBER_LITERAL=64,
+		DOUBLE=65, INT=66, ZERO=67, STRING_LITERAL=68, WS=69;
+	public static final int
+		RULE_select_statement = 0, RULE_select_clause = 1, RULE_distinct = 2,
+		RULE_fetch_clause = 3, RULE_where_clause = 4, RULE_orderby_clause = 5,
+		RULE_orderby_property = 6, RULE_nulls_firstlast = 7, RULE_asc_desc = 8,
+		RULE_limit_clause = 9, RULE_offset_clause = 10, RULE_fetch_path = 11,
+		RULE_fetch_property_set = 12, RULE_fetch_property_group = 13, RULE_fetch_property = 14,
+		RULE_fetch_query_hint = 15, RULE_fetch_lazy_hint = 16, RULE_fetch_option = 17,
+		RULE_fetch_query_option = 18, RULE_fetch_lazy_option = 19, RULE_fetch_batch_size = 20,
+		RULE_conditional_expression = 21, RULE_conditional_term = 22, RULE_conditional_factor = 23,
+		RULE_conditional_primary = 24, RULE_any_expression = 25, RULE_in_expression = 26,
+		RULE_in_value = 27, RULE_between_expression = 28, RULE_inrange_expression = 29,
+		RULE_propertyBetween_expression = 30, RULE_isNull_expression = 31, RULE_isNotNull_expression = 32,
+		RULE_isEmpty_expression = 33, RULE_isNotEmpty_expression = 34, RULE_like_expression = 35,
+		RULE_like_op = 36, RULE_comparison_expression = 37, RULE_comparison_operator = 38,
+		RULE_value_expression = 39, RULE_literal = 40;
+	private static String[] makeRuleNames() {
+		return new String[] {
+			"select_statement", "select_clause", "distinct", "fetch_clause", "where_clause",
+			"orderby_clause", "orderby_property", "nulls_firstlast", "asc_desc",
+			"limit_clause", "offset_clause", "fetch_path", "fetch_property_set",
+			"fetch_property_group", "fetch_property", "fetch_query_hint", "fetch_lazy_hint",
+			"fetch_option", "fetch_query_option", "fetch_lazy_option", "fetch_batch_size",
+			"conditional_expression", "conditional_term", "conditional_factor", "conditional_primary",
+			"any_expression", "in_expression", "in_value", "between_expression",
+			"inrange_expression", "propertyBetween_expression", "isNull_expression",
+			"isNotNull_expression", "isEmpty_expression", "isNotEmpty_expression",
+			"like_expression", "like_op", "comparison_expression", "comparison_operator",
+			"value_expression", "literal"
+		};
+	}
+	public static final String[] ruleNames = makeRuleNames();
+
+	private static String[] makeLiteralNames() {
+		return new String[] {
+			null, "'select'", "'('", "')'", "'distinct'", "'where'", "'order'", "'by'",
+			"','", "'nulls'", "'first'", "'last'", "'asc'", "'desc'", "'limit'",
+			"'offset'", "'fetch'", "'+'", "'query'", "'lazy'", "'or'", "'and'", "'not'",
+			"'in'", "'between'", "'inrange'", "'to'", "'is'", "'null'", "'isNull'",
+			"'isNotNull'", "'notNull'", "'empty'", "'isEmpty'", "'isNotEmpty'", "'notEmpty'",
+			"'like'", "'ilike'", "'contains'", "'icontains'", "'startsWith'", "'istartsWith'",
+			"'endsWith'", "'iendsWith'", "'='", "'eq'", "'>'", "'gt'", "'>='", "'ge'",
+			"'gte'", "'<'", "'lt'", "'<='", "'le'", "'lte'", "'<>'", "'!='", "'ne'",
+			"'ieq'", "'ine'", null, null, null, null, null, null, "'0'"
+		};
+	}
+	private static final String[] _LITERAL_NAMES = makeLiteralNames();
+	private static String[] makeSymbolicNames() {
+		return new String[] {
+			null, null, null, null, null, null, null, null, null, null, null, null,
+			null, null, null, null, null, null, null, null, null, null, null, null,
+			null, null, null, null, null, null, null, null, null, null, null, null,
+			null, null, null, null, null, null, null, null, null, null, null, null,
+			null, null, null, null, null, null, null, null, null, null, null, null,
+			null, "INPUT_VARIABLE", "PATH_VARIABLE", "BOOLEAN_LITERAL", "NUMBER_LITERAL",
+			"DOUBLE", "INT", "ZERO", "STRING_LITERAL", "WS"
+		};
+	}
+	private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
+	public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
+
+	/**
+	 * @deprecated Use {@link #VOCABULARY} instead.
+	 */
+	@Deprecated
+	public static final String[] tokenNames;
+	static {
+		tokenNames = new String[_SYMBOLIC_NAMES.length];
+		for (int i = 0; i < tokenNames.length; i++) {
+			tokenNames[i] = VOCABULARY.getLiteralName(i);
+			if (tokenNames[i] == null) {
+				tokenNames[i] = VOCABULARY.getSymbolicName(i);
+			}
+
+			if (tokenNames[i] == null) {
+				tokenNames[i] = "<INVALID>";
+			}
+		}
+	}
+
+	@Override
+	@Deprecated
+	public String[] getTokenNames() {
+		return tokenNames;
+	}
+
+	@Override
+
+	public Vocabulary getVocabulary() {
+		return VOCABULARY;
+	}
+
+	@Override
+	public String getGrammarFileName() { return "EQL.g4"; }
+
+	@Override
+	public String[] getRuleNames() { return ruleNames; }
+
+	@Override
+	public String getSerializedATN() { return _serializedATN; }
+
+	@Override
+	public ATN getATN() { return _ATN; }
+
+	public EQLParser(TokenStream input) {
+		super(input);
+		_interp = new ParserATNSimulator(this,_ATN,_decisionToDFA,_sharedContextCache);
+	}
+
+	public static class Select_statementContext extends ParserRuleContext {
+		public TerminalNode EOF() { return getToken(EQLParser.EOF, 0); }
+		public Select_clauseContext select_clause() {
+			return getRuleContext(Select_clauseContext.class,0);
+		}
+		public List<Fetch_clauseContext> fetch_clause() {
+			return getRuleContexts(Fetch_clauseContext.class);
+		}
+		public Fetch_clauseContext fetch_clause(int i) {
+			return getRuleContext(Fetch_clauseContext.class,i);
+		}
+		public Where_clauseContext where_clause() {
+			return getRuleContext(Where_clauseContext.class,0);
+		}
+		public Orderby_clauseContext orderby_clause() {
+			return getRuleContext(Orderby_clauseContext.class,0);
+		}
+		public Limit_clauseContext limit_clause() {
+			return getRuleContext(Limit_clauseContext.class,0);
+		}
+		public Select_statementContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_select_statement; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterSelect_statement(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitSelect_statement(this);
+		}
+	}
+
+	public final Select_statementContext select_statement() throws RecognitionException {
+		Select_statementContext _localctx = new Select_statementContext(_ctx, getState());
+		enterRule(_localctx, 0, RULE_select_statement);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(83);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if (_la==T__0) {
+				{
+				setState(82);
+				select_clause();
+				}
+			}
+
+			setState(88);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			while (_la==T__15) {
+				{
+				{
+				setState(85);
+				fetch_clause();
+				}
+				}
+				setState(90);
+				_errHandler.sync(this);
+				_la = _input.LA(1);
+			}
+			setState(92);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if (_la==T__4) {
+				{
+				setState(91);
+				where_clause();
+				}
+			}
+
+			setState(95);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if (_la==T__5) {
+				{
+				setState(94);
+				orderby_clause();
+				}
+			}
+
+			setState(98);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if (_la==T__13) {
+				{
+				setState(97);
+				limit_clause();
+				}
+			}
+
+			setState(100);
+			match(EOF);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Select_clauseContext extends ParserRuleContext {
+		public Fetch_property_groupContext fetch_property_group() {
+			return getRuleContext(Fetch_property_groupContext.class,0);
+		}
+		public DistinctContext distinct() {
+			return getRuleContext(DistinctContext.class,0);
+		}
+		public Select_clauseContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_select_clause; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterSelect_clause(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitSelect_clause(this);
+		}
+	}
+
+	public final Select_clauseContext select_clause() throws RecognitionException {
+		Select_clauseContext _localctx = new Select_clauseContext(_ctx, getState());
+		enterRule(_localctx, 2, RULE_select_clause);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(102);
+			match(T__0);
+			setState(104);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if (_la==T__3) {
+				{
+				setState(103);
+				distinct();
+				}
+			}
+
+			setState(106);
+			match(T__1);
+			setState(107);
+			fetch_property_group();
+			setState(108);
+			match(T__2);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class DistinctContext extends ParserRuleContext {
+		public DistinctContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_distinct; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterDistinct(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitDistinct(this);
+		}
+	}
+
+	public final DistinctContext distinct() throws RecognitionException {
+		DistinctContext _localctx = new DistinctContext(_ctx, getState());
+		enterRule(_localctx, 4, RULE_distinct);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(110);
+			match(T__3);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Fetch_clauseContext extends ParserRuleContext {
+		public Fetch_pathContext fetch_path() {
+			return getRuleContext(Fetch_pathContext.class,0);
+		}
+		public Fetch_clauseContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_fetch_clause; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterFetch_clause(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitFetch_clause(this);
+		}
+	}
+
+	public final Fetch_clauseContext fetch_clause() throws RecognitionException {
+		Fetch_clauseContext _localctx = new Fetch_clauseContext(_ctx, getState());
+		enterRule(_localctx, 6, RULE_fetch_clause);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(112);
+			fetch_path();
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Where_clauseContext extends ParserRuleContext {
+		public Conditional_expressionContext conditional_expression() {
+			return getRuleContext(Conditional_expressionContext.class,0);
+		}
+		public Where_clauseContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_where_clause; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterWhere_clause(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitWhere_clause(this);
+		}
+	}
+
+	public final Where_clauseContext where_clause() throws RecognitionException {
+		Where_clauseContext _localctx = new Where_clauseContext(_ctx, getState());
+		enterRule(_localctx, 8, RULE_where_clause);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(114);
+			match(T__4);
+			setState(115);
+			conditional_expression();
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Orderby_clauseContext extends ParserRuleContext {
+		public List<Orderby_propertyContext> orderby_property() {
+			return getRuleContexts(Orderby_propertyContext.class);
+		}
+		public Orderby_propertyContext orderby_property(int i) {
+			return getRuleContext(Orderby_propertyContext.class,i);
+		}
+		public Orderby_clauseContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_orderby_clause; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterOrderby_clause(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitOrderby_clause(this);
+		}
+	}
+
+	public final Orderby_clauseContext orderby_clause() throws RecognitionException {
+		Orderby_clauseContext _localctx = new Orderby_clauseContext(_ctx, getState());
+		enterRule(_localctx, 10, RULE_orderby_clause);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(117);
+			match(T__5);
+			setState(118);
+			match(T__6);
+			setState(119);
+			orderby_property();
+			setState(124);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			while (_la==T__7) {
+				{
+				{
+				setState(120);
+				match(T__7);
+				setState(121);
+				orderby_property();
+				}
+				}
+				setState(126);
+				_errHandler.sync(this);
+				_la = _input.LA(1);
+			}
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Orderby_propertyContext extends ParserRuleContext {
+		public TerminalNode PATH_VARIABLE() { return getToken(EQLParser.PATH_VARIABLE, 0); }
+		public Asc_descContext asc_desc() {
+			return getRuleContext(Asc_descContext.class,0);
+		}
+		public Nulls_firstlastContext nulls_firstlast() {
+			return getRuleContext(Nulls_firstlastContext.class,0);
+		}
+		public Orderby_propertyContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_orderby_property; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterOrderby_property(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitOrderby_property(this);
+		}
+	}
+
+	public final Orderby_propertyContext orderby_property() throws RecognitionException {
+		Orderby_propertyContext _localctx = new Orderby_propertyContext(_ctx, getState());
+		enterRule(_localctx, 12, RULE_orderby_property);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(127);
+			match(PATH_VARIABLE);
+			setState(129);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if (_la==T__11 || _la==T__12) {
+				{
+				setState(128);
+				asc_desc();
+				}
+			}
+
+			setState(132);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if (_la==T__8) {
+				{
+				setState(131);
+				nulls_firstlast();
+				}
+			}
+
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Nulls_firstlastContext extends ParserRuleContext {
+		public Nulls_firstlastContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_nulls_firstlast; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterNulls_firstlast(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitNulls_firstlast(this);
+		}
+	}
+
+	public final Nulls_firstlastContext nulls_firstlast() throws RecognitionException {
+		Nulls_firstlastContext _localctx = new Nulls_firstlastContext(_ctx, getState());
+		enterRule(_localctx, 14, RULE_nulls_firstlast);
+		try {
+			setState(138);
+			_errHandler.sync(this);
+			switch ( getInterpreter().adaptivePredict(_input,9,_ctx) ) {
+			case 1:
+				enterOuterAlt(_localctx, 1);
+				{
+				setState(134);
+				match(T__8);
+				setState(135);
+				match(T__9);
+				}
+				break;
+			case 2:
+				enterOuterAlt(_localctx, 2);
+				{
+				setState(136);
+				match(T__8);
+				setState(137);
+				match(T__10);
+				}
+				break;
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Asc_descContext extends ParserRuleContext {
+		public Asc_descContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_asc_desc; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterAsc_desc(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitAsc_desc(this);
+		}
+	}
+
+	public final Asc_descContext asc_desc() throws RecognitionException {
+		Asc_descContext _localctx = new Asc_descContext(_ctx, getState());
+		enterRule(_localctx, 16, RULE_asc_desc);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(140);
+			_la = _input.LA(1);
+			if ( !(_la==T__11 || _la==T__12) ) {
+			_errHandler.recoverInline(this);
+			}
+			else {
+				if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
+				_errHandler.reportMatch(this);
+				consume();
+			}
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Limit_clauseContext extends ParserRuleContext {
+		public TerminalNode NUMBER_LITERAL() { return getToken(EQLParser.NUMBER_LITERAL, 0); }
+		public Offset_clauseContext offset_clause() {
+			return getRuleContext(Offset_clauseContext.class,0);
+		}
+		public Limit_clauseContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_limit_clause; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterLimit_clause(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitLimit_clause(this);
+		}
+	}
+
+	public final Limit_clauseContext limit_clause() throws RecognitionException {
+		Limit_clauseContext _localctx = new Limit_clauseContext(_ctx, getState());
+		enterRule(_localctx, 18, RULE_limit_clause);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(142);
+			match(T__13);
+			setState(143);
+			match(NUMBER_LITERAL);
+			setState(145);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if (_la==T__14) {
+				{
+				setState(144);
+				offset_clause();
+				}
+			}
+
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Offset_clauseContext extends ParserRuleContext {
+		public TerminalNode NUMBER_LITERAL() { return getToken(EQLParser.NUMBER_LITERAL, 0); }
+		public Offset_clauseContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_offset_clause; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterOffset_clause(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitOffset_clause(this);
+		}
+	}
+
+	public final Offset_clauseContext offset_clause() throws RecognitionException {
+		Offset_clauseContext _localctx = new Offset_clauseContext(_ctx, getState());
+		enterRule(_localctx, 20, RULE_offset_clause);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(147);
+			match(T__14);
+			setState(148);
+			match(NUMBER_LITERAL);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Fetch_pathContext extends ParserRuleContext {
+		public TerminalNode PATH_VARIABLE() { return getToken(EQLParser.PATH_VARIABLE, 0); }
+		public Fetch_optionContext fetch_option() {
+			return getRuleContext(Fetch_optionContext.class,0);
+		}
+		public Fetch_property_setContext fetch_property_set() {
+			return getRuleContext(Fetch_property_setContext.class,0);
+		}
+		public Fetch_pathContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_fetch_path; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterFetch_path(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitFetch_path(this);
+		}
+	}
+
+	public final Fetch_pathContext fetch_path() throws RecognitionException {
+		Fetch_pathContext _localctx = new Fetch_pathContext(_ctx, getState());
+		enterRule(_localctx, 22, RULE_fetch_path);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(150);
+			match(T__15);
+			setState(152);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if (_la==T__17 || _la==T__18) {
+				{
+				setState(151);
+				fetch_option();
+				}
+			}
+
+			setState(154);
+			match(PATH_VARIABLE);
+			setState(156);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if (_la==T__1) {
+				{
+				setState(155);
+				fetch_property_set();
+				}
+			}
+
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Fetch_property_setContext extends ParserRuleContext {
+		public Fetch_property_groupContext fetch_property_group() {
+			return getRuleContext(Fetch_property_groupContext.class,0);
+		}
+		public Fetch_property_setContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_fetch_property_set; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterFetch_property_set(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitFetch_property_set(this);
+		}
+	}
+
+	public final Fetch_property_setContext fetch_property_set() throws RecognitionException {
+		Fetch_property_setContext _localctx = new Fetch_property_setContext(_ctx, getState());
+		enterRule(_localctx, 24, RULE_fetch_property_set);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(158);
+			match(T__1);
+			setState(159);
+			fetch_property_group();
+			setState(160);
+			match(T__2);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Fetch_property_groupContext extends ParserRuleContext {
+		public List<Fetch_propertyContext> fetch_property() {
+			return getRuleContexts(Fetch_propertyContext.class);
+		}
+		public Fetch_propertyContext fetch_property(int i) {
+			return getRuleContext(Fetch_propertyContext.class,i);
+		}
+		public Fetch_property_groupContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_fetch_property_group; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterFetch_property_group(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitFetch_property_group(this);
+		}
+	}
+
+	public final Fetch_property_groupContext fetch_property_group() throws RecognitionException {
+		Fetch_property_groupContext _localctx = new Fetch_property_groupContext(_ctx, getState());
+		enterRule(_localctx, 26, RULE_fetch_property_group);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(162);
+			fetch_property();
+			setState(167);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			while (_la==T__7) {
+				{
+				{
+				setState(163);
+				match(T__7);
+				setState(164);
+				fetch_property();
+				}
+				}
+				setState(169);
+				_errHandler.sync(this);
+				_la = _input.LA(1);
+			}
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Fetch_propertyContext extends ParserRuleContext {
+		public TerminalNode PATH_VARIABLE() { return getToken(EQLParser.PATH_VARIABLE, 0); }
+		public Fetch_query_hintContext fetch_query_hint() {
+			return getRuleContext(Fetch_query_hintContext.class,0);
+		}
+		public Fetch_lazy_hintContext fetch_lazy_hint() {
+			return getRuleContext(Fetch_lazy_hintContext.class,0);
+		}
+		public Fetch_propertyContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_fetch_property; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterFetch_property(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitFetch_property(this);
+		}
+	}
+
+	public final Fetch_propertyContext fetch_property() throws RecognitionException {
+		Fetch_propertyContext _localctx = new Fetch_propertyContext(_ctx, getState());
+		enterRule(_localctx, 28, RULE_fetch_property);
+		try {
+			setState(173);
+			_errHandler.sync(this);
+			switch ( getInterpreter().adaptivePredict(_input,14,_ctx) ) {
+			case 1:
+				enterOuterAlt(_localctx, 1);
+				{
+				setState(170);
+				match(PATH_VARIABLE);
+				}
+				break;
+			case 2:
+				enterOuterAlt(_localctx, 2);
+				{
+				setState(171);
+				fetch_query_hint();
+				}
+				break;
+			case 3:
+				enterOuterAlt(_localctx, 3);
+				{
+				setState(172);
+				fetch_lazy_hint();
+				}
+				break;
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Fetch_query_hintContext extends ParserRuleContext {
+		public Fetch_query_optionContext fetch_query_option() {
+			return getRuleContext(Fetch_query_optionContext.class,0);
+		}
+		public Fetch_query_hintContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_fetch_query_hint; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterFetch_query_hint(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitFetch_query_hint(this);
+		}
+	}
+
+	public final Fetch_query_hintContext fetch_query_hint() throws RecognitionException {
+		Fetch_query_hintContext _localctx = new Fetch_query_hintContext(_ctx, getState());
+		enterRule(_localctx, 30, RULE_fetch_query_hint);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(175);
+			match(T__16);
+			setState(176);
+			fetch_query_option();
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Fetch_lazy_hintContext extends ParserRuleContext {
+		public Fetch_lazy_optionContext fetch_lazy_option() {
+			return getRuleContext(Fetch_lazy_optionContext.class,0);
+		}
+		public Fetch_lazy_hintContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_fetch_lazy_hint; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterFetch_lazy_hint(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitFetch_lazy_hint(this);
+		}
+	}
+
+	public final Fetch_lazy_hintContext fetch_lazy_hint() throws RecognitionException {
+		Fetch_lazy_hintContext _localctx = new Fetch_lazy_hintContext(_ctx, getState());
+		enterRule(_localctx, 32, RULE_fetch_lazy_hint);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(178);
+			match(T__16);
+			setState(179);
+			fetch_lazy_option();
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Fetch_optionContext extends ParserRuleContext {
+		public Fetch_query_optionContext fetch_query_option() {
+			return getRuleContext(Fetch_query_optionContext.class,0);
+		}
+		public Fetch_lazy_optionContext fetch_lazy_option() {
+			return getRuleContext(Fetch_lazy_optionContext.class,0);
+		}
+		public Fetch_optionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_fetch_option; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterFetch_option(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitFetch_option(this);
+		}
+	}
+
+	public final Fetch_optionContext fetch_option() throws RecognitionException {
+		Fetch_optionContext _localctx = new Fetch_optionContext(_ctx, getState());
+		enterRule(_localctx, 34, RULE_fetch_option);
+		try {
+			setState(183);
+			_errHandler.sync(this);
+			switch (_input.LA(1)) {
+			case T__17:
+				enterOuterAlt(_localctx, 1);
+				{
+				setState(181);
+				fetch_query_option();
+				}
+				break;
+			case T__18:
+				enterOuterAlt(_localctx, 2);
+				{
+				setState(182);
+				fetch_lazy_option();
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Fetch_query_optionContext extends ParserRuleContext {
+		public Fetch_batch_sizeContext fetch_batch_size() {
+			return getRuleContext(Fetch_batch_sizeContext.class,0);
+		}
+		public Fetch_query_optionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_fetch_query_option; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterFetch_query_option(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitFetch_query_option(this);
+		}
+	}
+
+	public final Fetch_query_optionContext fetch_query_option() throws RecognitionException {
+		Fetch_query_optionContext _localctx = new Fetch_query_optionContext(_ctx, getState());
+		enterRule(_localctx, 36, RULE_fetch_query_option);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(185);
+			match(T__17);
+			setState(187);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if (_la==T__1) {
+				{
+				setState(186);
+				fetch_batch_size();
+				}
+			}
+
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Fetch_lazy_optionContext extends ParserRuleContext {
+		public Fetch_batch_sizeContext fetch_batch_size() {
+			return getRuleContext(Fetch_batch_sizeContext.class,0);
+		}
+		public Fetch_lazy_optionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_fetch_lazy_option; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterFetch_lazy_option(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitFetch_lazy_option(this);
+		}
+	}
+
+	public final Fetch_lazy_optionContext fetch_lazy_option() throws RecognitionException {
+		Fetch_lazy_optionContext _localctx = new Fetch_lazy_optionContext(_ctx, getState());
+		enterRule(_localctx, 38, RULE_fetch_lazy_option);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(189);
+			match(T__18);
+			setState(191);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if (_la==T__1) {
+				{
+				setState(190);
+				fetch_batch_size();
+				}
+			}
+
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Fetch_batch_sizeContext extends ParserRuleContext {
+		public TerminalNode NUMBER_LITERAL() { return getToken(EQLParser.NUMBER_LITERAL, 0); }
+		public Fetch_batch_sizeContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_fetch_batch_size; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterFetch_batch_size(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitFetch_batch_size(this);
+		}
+	}
+
+	public final Fetch_batch_sizeContext fetch_batch_size() throws RecognitionException {
+		Fetch_batch_sizeContext _localctx = new Fetch_batch_sizeContext(_ctx, getState());
+		enterRule(_localctx, 40, RULE_fetch_batch_size);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(193);
+			match(T__1);
+			setState(194);
+			match(NUMBER_LITERAL);
+			setState(195);
+			match(T__2);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Conditional_expressionContext extends ParserRuleContext {
+		public List<Conditional_termContext> conditional_term() {
+			return getRuleContexts(Conditional_termContext.class);
+		}
+		public Conditional_termContext conditional_term(int i) {
+			return getRuleContext(Conditional_termContext.class,i);
+		}
+		public Conditional_expressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_conditional_expression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterConditional_expression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitConditional_expression(this);
+		}
+	}
+
+	public final Conditional_expressionContext conditional_expression() throws RecognitionException {
+		Conditional_expressionContext _localctx = new Conditional_expressionContext(_ctx, getState());
+		enterRule(_localctx, 42, RULE_conditional_expression);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(197);
+			conditional_term();
+			setState(202);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			while (_la==T__19) {
+				{
+				{
+				setState(198);
+				match(T__19);
+				setState(199);
+				conditional_term();
+				}
+				}
+				setState(204);
+				_errHandler.sync(this);
+				_la = _input.LA(1);
+			}
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Conditional_termContext extends ParserRuleContext {
+		public List<Conditional_factorContext> conditional_factor() {
+			return getRuleContexts(Conditional_factorContext.class);
+		}
+		public Conditional_factorContext conditional_factor(int i) {
+			return getRuleContext(Conditional_factorContext.class,i);
+		}
+		public Conditional_termContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_conditional_term; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterConditional_term(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitConditional_term(this);
+		}
+	}
+
+	public final Conditional_termContext conditional_term() throws RecognitionException {
+		Conditional_termContext _localctx = new Conditional_termContext(_ctx, getState());
+		enterRule(_localctx, 44, RULE_conditional_term);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(205);
+			conditional_factor();
+			setState(210);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			while (_la==T__20) {
+				{
+				{
+				setState(206);
+				match(T__20);
+				setState(207);
+				conditional_factor();
+				}
+				}
+				setState(212);
+				_errHandler.sync(this);
+				_la = _input.LA(1);
+			}
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Conditional_factorContext extends ParserRuleContext {
+		public Conditional_primaryContext conditional_primary() {
+			return getRuleContext(Conditional_primaryContext.class,0);
+		}
+		public Conditional_factorContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_conditional_factor; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterConditional_factor(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitConditional_factor(this);
+		}
+	}
+
+	public final Conditional_factorContext conditional_factor() throws RecognitionException {
+		Conditional_factorContext _localctx = new Conditional_factorContext(_ctx, getState());
+		enterRule(_localctx, 46, RULE_conditional_factor);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(214);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if (_la==T__21) {
+				{
+				setState(213);
+				match(T__21);
+				}
+			}
+
+			setState(216);
+			conditional_primary();
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Conditional_primaryContext extends ParserRuleContext {
+		public Any_expressionContext any_expression() {
+			return getRuleContext(Any_expressionContext.class,0);
+		}
+		public Conditional_expressionContext conditional_expression() {
+			return getRuleContext(Conditional_expressionContext.class,0);
+		}
+		public Conditional_primaryContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_conditional_primary; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterConditional_primary(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitConditional_primary(this);
+		}
+	}
+
+	public final Conditional_primaryContext conditional_primary() throws RecognitionException {
+		Conditional_primaryContext _localctx = new Conditional_primaryContext(_ctx, getState());
+		enterRule(_localctx, 48, RULE_conditional_primary);
+		try {
+			setState(223);
+			_errHandler.sync(this);
+			switch ( getInterpreter().adaptivePredict(_input,21,_ctx) ) {
+			case 1:
+				enterOuterAlt(_localctx, 1);
+				{
+				setState(218);
+				any_expression();
+				}
+				break;
+			case 2:
+				enterOuterAlt(_localctx, 2);
+				{
+				setState(219);
+				match(T__1);
+				setState(220);
+				conditional_expression();
+				setState(221);
+				match(T__2);
+				}
+				break;
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Any_expressionContext extends ParserRuleContext {
+		public Comparison_expressionContext comparison_expression() {
+			return getRuleContext(Comparison_expressionContext.class,0);
+		}
+		public Like_expressionContext like_expression() {
+			return getRuleContext(Like_expressionContext.class,0);
+		}
+		public Inrange_expressionContext inrange_expression() {
+			return getRuleContext(Inrange_expressionContext.class,0);
+		}
+		public Between_expressionContext between_expression() {
+			return getRuleContext(Between_expressionContext.class,0);
+		}
+		public PropertyBetween_expressionContext propertyBetween_expression() {
+			return getRuleContext(PropertyBetween_expressionContext.class,0);
+		}
+		public In_expressionContext in_expression() {
+			return getRuleContext(In_expressionContext.class,0);
+		}
+		public IsNull_expressionContext isNull_expression() {
+			return getRuleContext(IsNull_expressionContext.class,0);
+		}
+		public IsNotNull_expressionContext isNotNull_expression() {
+			return getRuleContext(IsNotNull_expressionContext.class,0);
+		}
+		public IsEmpty_expressionContext isEmpty_expression() {
+			return getRuleContext(IsEmpty_expressionContext.class,0);
+		}
+		public IsNotEmpty_expressionContext isNotEmpty_expression() {
+			return getRuleContext(IsNotEmpty_expressionContext.class,0);
+		}
+		public Any_expressionContext any_expression() {
+			return getRuleContext(Any_expressionContext.class,0);
+		}
+		public Any_expressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_any_expression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterAny_expression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitAny_expression(this);
+		}
+	}
+
+	public final Any_expressionContext any_expression() throws RecognitionException {
+		Any_expressionContext _localctx = new Any_expressionContext(_ctx, getState());
+		enterRule(_localctx, 50, RULE_any_expression);
+		try {
+			setState(239);
+			_errHandler.sync(this);
+			switch ( getInterpreter().adaptivePredict(_input,22,_ctx) ) {
+			case 1:
+				enterOuterAlt(_localctx, 1);
+				{
+				setState(225);
+				comparison_expression();
+				}
+				break;
+			case 2:
+				enterOuterAlt(_localctx, 2);
+				{
+				setState(226);
+				like_expression();
+				}
+				break;
+			case 3:
+				enterOuterAlt(_localctx, 3);
+				{
+				setState(227);
+				inrange_expression();
+				}
+				break;
+			case 4:
+				enterOuterAlt(_localctx, 4);
+				{
+				setState(228);
+				between_expression();
+				}
+				break;
+			case 5:
+				enterOuterAlt(_localctx, 5);
+				{
+				setState(229);
+				propertyBetween_expression();
+				}
+				break;
+			case 6:
+				enterOuterAlt(_localctx, 6);
+				{
+				setState(230);
+				in_expression();
+				}
+				break;
+			case 7:
+				enterOuterAlt(_localctx, 7);
+				{
+				setState(231);
+				isNull_expression();
+				}
+				break;
+			case 8:
+				enterOuterAlt(_localctx, 8);
+				{
+				setState(232);
+				isNotNull_expression();
+				}
+				break;
+			case 9:
+				enterOuterAlt(_localctx, 9);
+				{
+				setState(233);
+				isEmpty_expression();
+				}
+				break;
+			case 10:
+				enterOuterAlt(_localctx, 10);
+				{
+				setState(234);
+				isNotEmpty_expression();
+				}
+				break;
+			case 11:
+				enterOuterAlt(_localctx, 11);
+				{
+				setState(235);
+				match(T__1);
+				setState(236);
+				any_expression();
+				setState(237);
+				match(T__2);
+				}
+				break;
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class In_expressionContext extends ParserRuleContext {
+		public TerminalNode PATH_VARIABLE() { return getToken(EQLParser.PATH_VARIABLE, 0); }
+		public In_valueContext in_value() {
+			return getRuleContext(In_valueContext.class,0);
+		}
+		public In_expressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_in_expression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterIn_expression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitIn_expression(this);
+		}
+	}
+
+	public final In_expressionContext in_expression() throws RecognitionException {
+		In_expressionContext _localctx = new In_expressionContext(_ctx, getState());
+		enterRule(_localctx, 52, RULE_in_expression);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(241);
+			match(PATH_VARIABLE);
+			setState(242);
+			match(T__22);
+			setState(243);
+			in_value();
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class In_valueContext extends ParserRuleContext {
+		public TerminalNode INPUT_VARIABLE() { return getToken(EQLParser.INPUT_VARIABLE, 0); }
+		public List<Value_expressionContext> value_expression() {
+			return getRuleContexts(Value_expressionContext.class);
+		}
+		public Value_expressionContext value_expression(int i) {
+			return getRuleContext(Value_expressionContext.class,i);
+		}
+		public In_valueContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_in_value; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterIn_value(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitIn_value(this);
+		}
+	}
+
+	public final In_valueContext in_value() throws RecognitionException {
+		In_valueContext _localctx = new In_valueContext(_ctx, getState());
+		enterRule(_localctx, 54, RULE_in_value);
+		int _la;
+		try {
+			setState(257);
+			_errHandler.sync(this);
+			switch (_input.LA(1)) {
+			case INPUT_VARIABLE:
+				enterOuterAlt(_localctx, 1);
+				{
+				setState(245);
+				match(INPUT_VARIABLE);
+				}
+				break;
+			case T__1:
+				enterOuterAlt(_localctx, 2);
+				{
+				setState(246);
+				match(T__1);
+				setState(247);
+				value_expression();
+				setState(252);
+				_errHandler.sync(this);
+				_la = _input.LA(1);
+				while (_la==T__7) {
+					{
+					{
+					setState(248);
+					match(T__7);
+					setState(249);
+					value_expression();
+					}
+					}
+					setState(254);
+					_errHandler.sync(this);
+					_la = _input.LA(1);
+				}
+				setState(255);
+				match(T__2);
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Between_expressionContext extends ParserRuleContext {
+		public TerminalNode PATH_VARIABLE() { return getToken(EQLParser.PATH_VARIABLE, 0); }
+		public List<Value_expressionContext> value_expression() {
+			return getRuleContexts(Value_expressionContext.class);
+		}
+		public Value_expressionContext value_expression(int i) {
+			return getRuleContext(Value_expressionContext.class,i);
+		}
+		public Between_expressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_between_expression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterBetween_expression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitBetween_expression(this);
+		}
+	}
+
+	public final Between_expressionContext between_expression() throws RecognitionException {
+		Between_expressionContext _localctx = new Between_expressionContext(_ctx, getState());
+		enterRule(_localctx, 56, RULE_between_expression);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(259);
+			match(PATH_VARIABLE);
+			setState(260);
+			match(T__23);
+			setState(261);
+			value_expression();
+			setState(262);
+			match(T__20);
+			setState(263);
+			value_expression();
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Inrange_expressionContext extends ParserRuleContext {
+		public TerminalNode PATH_VARIABLE() { return getToken(EQLParser.PATH_VARIABLE, 0); }
+		public List<Value_expressionContext> value_expression() {
+			return getRuleContexts(Value_expressionContext.class);
+		}
+		public Value_expressionContext value_expression(int i) {
+			return getRuleContext(Value_expressionContext.class,i);
+		}
+		public Inrange_expressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_inrange_expression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterInrange_expression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitInrange_expression(this);
+		}
+	}
+
+	public final Inrange_expressionContext inrange_expression() throws RecognitionException {
+		Inrange_expressionContext _localctx = new Inrange_expressionContext(_ctx, getState());
+		enterRule(_localctx, 58, RULE_inrange_expression);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(265);
+			match(PATH_VARIABLE);
+			setState(266);
+			match(T__24);
+			setState(267);
+			value_expression();
+			setState(268);
+			match(T__25);
+			setState(269);
+			value_expression();
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class PropertyBetween_expressionContext extends ParserRuleContext {
+		public Value_expressionContext value_expression() {
+			return getRuleContext(Value_expressionContext.class,0);
+		}
+		public List<TerminalNode> PATH_VARIABLE() { return getTokens(EQLParser.PATH_VARIABLE); }
+		public TerminalNode PATH_VARIABLE(int i) {
+			return getToken(EQLParser.PATH_VARIABLE, i);
+		}
+		public PropertyBetween_expressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_propertyBetween_expression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterPropertyBetween_expression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitPropertyBetween_expression(this);
+		}
+	}
+
+	public final PropertyBetween_expressionContext propertyBetween_expression() throws RecognitionException {
+		PropertyBetween_expressionContext _localctx = new PropertyBetween_expressionContext(_ctx, getState());
+		enterRule(_localctx, 60, RULE_propertyBetween_expression);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(271);
+			value_expression();
+			setState(272);
+			match(T__23);
+			setState(273);
+			match(PATH_VARIABLE);
+			setState(274);
+			match(T__20);
+			setState(275);
+			match(PATH_VARIABLE);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class IsNull_expressionContext extends ParserRuleContext {
+		public TerminalNode PATH_VARIABLE() { return getToken(EQLParser.PATH_VARIABLE, 0); }
+		public IsNull_expressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_isNull_expression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterIsNull_expression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitIsNull_expression(this);
+		}
+	}
+
+	public final IsNull_expressionContext isNull_expression() throws RecognitionException {
+		IsNull_expressionContext _localctx = new IsNull_expressionContext(_ctx, getState());
+		enterRule(_localctx, 62, RULE_isNull_expression);
+		try {
+			setState(282);
+			_errHandler.sync(this);
+			switch ( getInterpreter().adaptivePredict(_input,25,_ctx) ) {
+			case 1:
+				enterOuterAlt(_localctx, 1);
+				{
+				setState(277);
+				match(PATH_VARIABLE);
+				setState(278);
+				match(T__26);
+				setState(279);
+				match(T__27);
+				}
+				break;
+			case 2:
+				enterOuterAlt(_localctx, 2);
+				{
+				setState(280);
+				match(PATH_VARIABLE);
+				setState(281);
+				match(T__28);
+				}
+				break;
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class IsNotNull_expressionContext extends ParserRuleContext {
+		public TerminalNode PATH_VARIABLE() { return getToken(EQLParser.PATH_VARIABLE, 0); }
+		public IsNotNull_expressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_isNotNull_expression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterIsNotNull_expression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitIsNotNull_expression(this);
+		}
+	}
+
+	public final IsNotNull_expressionContext isNotNull_expression() throws RecognitionException {
+		IsNotNull_expressionContext _localctx = new IsNotNull_expressionContext(_ctx, getState());
+		enterRule(_localctx, 64, RULE_isNotNull_expression);
+		try {
+			setState(292);
+			_errHandler.sync(this);
+			switch ( getInterpreter().adaptivePredict(_input,26,_ctx) ) {
+			case 1:
+				enterOuterAlt(_localctx, 1);
+				{
+				setState(284);
+				match(PATH_VARIABLE);
+				setState(285);
+				match(T__26);
+				setState(286);
+				match(T__21);
+				setState(287);
+				match(T__27);
+				}
+				break;
+			case 2:
+				enterOuterAlt(_localctx, 2);
+				{
+				setState(288);
+				match(PATH_VARIABLE);
+				setState(289);
+				match(T__29);
+				}
+				break;
+			case 3:
+				enterOuterAlt(_localctx, 3);
+				{
+				setState(290);
+				match(PATH_VARIABLE);
+				setState(291);
+				match(T__30);
+				}
+				break;
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class IsEmpty_expressionContext extends ParserRuleContext {
+		public TerminalNode PATH_VARIABLE() { return getToken(EQLParser.PATH_VARIABLE, 0); }
+		public IsEmpty_expressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_isEmpty_expression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterIsEmpty_expression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitIsEmpty_expression(this);
+		}
+	}
+
+	public final IsEmpty_expressionContext isEmpty_expression() throws RecognitionException {
+		IsEmpty_expressionContext _localctx = new IsEmpty_expressionContext(_ctx, getState());
+		enterRule(_localctx, 66, RULE_isEmpty_expression);
+		try {
+			setState(299);
+			_errHandler.sync(this);
+			switch ( getInterpreter().adaptivePredict(_input,27,_ctx) ) {
+			case 1:
+				enterOuterAlt(_localctx, 1);
+				{
+				setState(294);
+				match(PATH_VARIABLE);
+				setState(295);
+				match(T__26);
+				setState(296);
+				match(T__31);
+				}
+				break;
+			case 2:
+				enterOuterAlt(_localctx, 2);
+				{
+				setState(297);
+				match(PATH_VARIABLE);
+				setState(298);
+				match(T__32);
+				}
+				break;
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class IsNotEmpty_expressionContext extends ParserRuleContext {
+		public TerminalNode PATH_VARIABLE() { return getToken(EQLParser.PATH_VARIABLE, 0); }
+		public IsNotEmpty_expressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_isNotEmpty_expression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterIsNotEmpty_expression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitIsNotEmpty_expression(this);
+		}
+	}
+
+	public final IsNotEmpty_expressionContext isNotEmpty_expression() throws RecognitionException {
+		IsNotEmpty_expressionContext _localctx = new IsNotEmpty_expressionContext(_ctx, getState());
+		enterRule(_localctx, 68, RULE_isNotEmpty_expression);
+		try {
+			setState(309);
+			_errHandler.sync(this);
+			switch ( getInterpreter().adaptivePredict(_input,28,_ctx) ) {
+			case 1:
+				enterOuterAlt(_localctx, 1);
+				{
+				setState(301);
+				match(PATH_VARIABLE);
+				setState(302);
+				match(T__26);
+				setState(303);
+				match(T__21);
+				setState(304);
+				match(T__31);
+				}
+				break;
+			case 2:
+				enterOuterAlt(_localctx, 2);
+				{
+				setState(305);
+				match(PATH_VARIABLE);
+				setState(306);
+				match(T__33);
+				}
+				break;
+			case 3:
+				enterOuterAlt(_localctx, 3);
+				{
+				setState(307);
+				match(PATH_VARIABLE);
+				setState(308);
+				match(T__34);
+				}
+				break;
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Like_expressionContext extends ParserRuleContext {
+		public TerminalNode PATH_VARIABLE() { return getToken(EQLParser.PATH_VARIABLE, 0); }
+		public Like_opContext like_op() {
+			return getRuleContext(Like_opContext.class,0);
+		}
+		public Value_expressionContext value_expression() {
+			return getRuleContext(Value_expressionContext.class,0);
+		}
+		public Like_expressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_like_expression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterLike_expression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitLike_expression(this);
+		}
+	}
+
+	public final Like_expressionContext like_expression() throws RecognitionException {
+		Like_expressionContext _localctx = new Like_expressionContext(_ctx, getState());
+		enterRule(_localctx, 70, RULE_like_expression);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(311);
+			match(PATH_VARIABLE);
+			setState(312);
+			like_op();
+			setState(313);
+			value_expression();
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Like_opContext extends ParserRuleContext {
+		public Like_opContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_like_op; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterLike_op(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitLike_op(this);
+		}
+	}
+
+	public final Like_opContext like_op() throws RecognitionException {
+		Like_opContext _localctx = new Like_opContext(_ctx, getState());
+		enterRule(_localctx, 72, RULE_like_op);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(315);
+			_la = _input.LA(1);
+			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__35) | (1L << T__36) | (1L << T__37) | (1L << T__38) | (1L << T__39) | (1L << T__40) | (1L << T__41) | (1L << T__42))) != 0)) ) {
+			_errHandler.recoverInline(this);
+			}
+			else {
+				if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
+				_errHandler.reportMatch(this);
+				consume();
+			}
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Comparison_expressionContext extends ParserRuleContext {
+		public TerminalNode PATH_VARIABLE() { return getToken(EQLParser.PATH_VARIABLE, 0); }
+		public Comparison_operatorContext comparison_operator() {
+			return getRuleContext(Comparison_operatorContext.class,0);
+		}
+		public Value_expressionContext value_expression() {
+			return getRuleContext(Value_expressionContext.class,0);
+		}
+		public Comparison_expressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_comparison_expression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterComparison_expression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitComparison_expression(this);
+		}
+	}
+
+	public final Comparison_expressionContext comparison_expression() throws RecognitionException {
+		Comparison_expressionContext _localctx = new Comparison_expressionContext(_ctx, getState());
+		enterRule(_localctx, 74, RULE_comparison_expression);
+		try {
+			setState(325);
+			_errHandler.sync(this);
+			switch (_input.LA(1)) {
+			case PATH_VARIABLE:
+				enterOuterAlt(_localctx, 1);
+				{
+				setState(317);
+				match(PATH_VARIABLE);
+				setState(318);
+				comparison_operator();
+				setState(319);
+				value_expression();
+				}
+				break;
+			case INPUT_VARIABLE:
+			case BOOLEAN_LITERAL:
+			case NUMBER_LITERAL:
+			case STRING_LITERAL:
+				enterOuterAlt(_localctx, 2);
+				{
+				setState(321);
+				value_expression();
+				setState(322);
+				comparison_operator();
+				setState(323);
+				match(PATH_VARIABLE);
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Comparison_operatorContext extends ParserRuleContext {
+		public Comparison_operatorContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_comparison_operator; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterComparison_operator(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitComparison_operator(this);
+		}
+	}
+
+	public final Comparison_operatorContext comparison_operator() throws RecognitionException {
+		Comparison_operatorContext _localctx = new Comparison_operatorContext(_ctx, getState());
+		enterRule(_localctx, 76, RULE_comparison_operator);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(327);
+			_la = _input.LA(1);
+			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__43) | (1L << T__44) | (1L << T__45) | (1L << T__46) | (1L << T__47) | (1L << T__48) | (1L << T__49) | (1L << T__50) | (1L << T__51) | (1L << T__52) | (1L << T__53) | (1L << T__54) | (1L << T__55) | (1L << T__56) | (1L << T__57) | (1L << T__58) | (1L << T__59))) != 0)) ) {
+			_errHandler.recoverInline(this);
+			}
+			else {
+				if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
+				_errHandler.reportMatch(this);
+				consume();
+			}
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Value_expressionContext extends ParserRuleContext {
+		public LiteralContext literal() {
+			return getRuleContext(LiteralContext.class,0);
+		}
+		public TerminalNode INPUT_VARIABLE() { return getToken(EQLParser.INPUT_VARIABLE, 0); }
+		public Value_expressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_value_expression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterValue_expression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitValue_expression(this);
+		}
+	}
+
+	public final Value_expressionContext value_expression() throws RecognitionException {
+		Value_expressionContext _localctx = new Value_expressionContext(_ctx, getState());
+		enterRule(_localctx, 78, RULE_value_expression);
+		try {
+			setState(331);
+			_errHandler.sync(this);
+			switch (_input.LA(1)) {
+			case BOOLEAN_LITERAL:
+			case NUMBER_LITERAL:
+			case STRING_LITERAL:
+				enterOuterAlt(_localctx, 1);
+				{
+				setState(329);
+				literal();
+				}
+				break;
+			case INPUT_VARIABLE:
+				enterOuterAlt(_localctx, 2);
+				{
+				setState(330);
+				match(INPUT_VARIABLE);
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class LiteralContext extends ParserRuleContext {
+		public TerminalNode STRING_LITERAL() { return getToken(EQLParser.STRING_LITERAL, 0); }
+		public TerminalNode BOOLEAN_LITERAL() { return getToken(EQLParser.BOOLEAN_LITERAL, 0); }
+		public TerminalNode NUMBER_LITERAL() { return getToken(EQLParser.NUMBER_LITERAL, 0); }
+		public LiteralContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_literal; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterLiteral(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitLiteral(this);
+		}
+	}
+
+	public final LiteralContext literal() throws RecognitionException {
+		LiteralContext _localctx = new LiteralContext(_ctx, getState());
+		enterRule(_localctx, 80, RULE_literal);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(333);
+			_la = _input.LA(1);
+			if ( !(((((_la - 63)) & ~0x3f) == 0 && ((1L << (_la - 63)) & ((1L << (BOOLEAN_LITERAL - 63)) | (1L << (NUMBER_LITERAL - 63)) | (1L << (STRING_LITERAL - 63)))) != 0)) ) {
+			_errHandler.recoverInline(this);
+			}
+			else {
+				if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
+				_errHandler.reportMatch(this);
+				consume();
+			}
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static final String _serializedATN =
+		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3G\u0152\4\2\t\2\4"+
+		"\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t"+
+		"\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"+
+		"\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"+
+		"\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\4\36\t\36\4\37\t\37\4 \t \4!"+
+		"\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\4*\t*\3\2\5\2"+
+		"V\n\2\3\2\7\2Y\n\2\f\2\16\2\\\13\2\3\2\5\2_\n\2\3\2\5\2b\n\2\3\2\5\2e"+
+		"\n\2\3\2\3\2\3\3\3\3\5\3k\n\3\3\3\3\3\3\3\3\3\3\4\3\4\3\5\3\5\3\6\3\6"+
+		"\3\6\3\7\3\7\3\7\3\7\3\7\7\7}\n\7\f\7\16\7\u0080\13\7\3\b\3\b\5\b\u0084"+
+		"\n\b\3\b\5\b\u0087\n\b\3\t\3\t\3\t\3\t\5\t\u008d\n\t\3\n\3\n\3\13\3\13"+
+		"\3\13\5\13\u0094\n\13\3\f\3\f\3\f\3\r\3\r\5\r\u009b\n\r\3\r\3\r\5\r\u009f"+
+		"\n\r\3\16\3\16\3\16\3\16\3\17\3\17\3\17\7\17\u00a8\n\17\f\17\16\17\u00ab"+
+		"\13\17\3\20\3\20\3\20\5\20\u00b0\n\20\3\21\3\21\3\21\3\22\3\22\3\22\3"+
+		"\23\3\23\5\23\u00ba\n\23\3\24\3\24\5\24\u00be\n\24\3\25\3\25\5\25\u00c2"+
+		"\n\25\3\26\3\26\3\26\3\26\3\27\3\27\3\27\7\27\u00cb\n\27\f\27\16\27\u00ce"+
+		"\13\27\3\30\3\30\3\30\7\30\u00d3\n\30\f\30\16\30\u00d6\13\30\3\31\5\31"+
+		"\u00d9\n\31\3\31\3\31\3\32\3\32\3\32\3\32\3\32\5\32\u00e2\n\32\3\33\3"+
+		"\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\5\33\u00f2"+
+		"\n\33\3\34\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\35\7\35\u00fd\n\35\f\35"+
+		"\16\35\u0100\13\35\3\35\3\35\5\35\u0104\n\35\3\36\3\36\3\36\3\36\3\36"+
+		"\3\36\3\37\3\37\3\37\3\37\3\37\3\37\3 \3 \3 \3 \3 \3 \3!\3!\3!\3!\3!\5"+
+		"!\u011d\n!\3\"\3\"\3\"\3\"\3\"\3\"\3\"\3\"\5\"\u0127\n\"\3#\3#\3#\3#\3"+
+		"#\5#\u012e\n#\3$\3$\3$\3$\3$\3$\3$\3$\5$\u0138\n$\3%\3%\3%\3%\3&\3&\3"+
+		"\'\3\'\3\'\3\'\3\'\3\'\3\'\3\'\5\'\u0148\n\'\3(\3(\3)\3)\5)\u014e\n)\3"+
+		"*\3*\3*\2\2+\2\4\6\b\n\f\16\20\22\24\26\30\32\34\36 \"$&(*,.\60\62\64"+
+		"\668:<>@BDFHJLNPR\2\6\3\2\16\17\3\2&-\3\2.>\4\2ABFF\2\u0153\2U\3\2\2\2"+
+		"\4h\3\2\2\2\6p\3\2\2\2\br\3\2\2\2\nt\3\2\2\2\fw\3\2\2\2\16\u0081\3\2\2"+
+		"\2\20\u008c\3\2\2\2\22\u008e\3\2\2\2\24\u0090\3\2\2\2\26\u0095\3\2\2\2"+
+		"\30\u0098\3\2\2\2\32\u00a0\3\2\2\2\34\u00a4\3\2\2\2\36\u00af\3\2\2\2 "+
+		"\u00b1\3\2\2\2\"\u00b4\3\2\2\2$\u00b9\3\2\2\2&\u00bb\3\2\2\2(\u00bf\3"+
+		"\2\2\2*\u00c3\3\2\2\2,\u00c7\3\2\2\2.\u00cf\3\2\2\2\60\u00d8\3\2\2\2\62"+
+		"\u00e1\3\2\2\2\64\u00f1\3\2\2\2\66\u00f3\3\2\2\28\u0103\3\2\2\2:\u0105"+
+		"\3\2\2\2<\u010b\3\2\2\2>\u0111\3\2\2\2@\u011c\3\2\2\2B\u0126\3\2\2\2D"+
+		"\u012d\3\2\2\2F\u0137\3\2\2\2H\u0139\3\2\2\2J\u013d\3\2\2\2L\u0147\3\2"+
+		"\2\2N\u0149\3\2\2\2P\u014d\3\2\2\2R\u014f\3\2\2\2TV\5\4\3\2UT\3\2\2\2"+
+		"UV\3\2\2\2VZ\3\2\2\2WY\5\b\5\2XW\3\2\2\2Y\\\3\2\2\2ZX\3\2\2\2Z[\3\2\2"+
+		"\2[^\3\2\2\2\\Z\3\2\2\2]_\5\n\6\2^]\3\2\2\2^_\3\2\2\2_a\3\2\2\2`b\5\f"+
+		"\7\2a`\3\2\2\2ab\3\2\2\2bd\3\2\2\2ce\5\24\13\2dc\3\2\2\2de\3\2\2\2ef\3"+
+		"\2\2\2fg\7\2\2\3g\3\3\2\2\2hj\7\3\2\2ik\5\6\4\2ji\3\2\2\2jk\3\2\2\2kl"+
+		"\3\2\2\2lm\7\4\2\2mn\5\34\17\2no\7\5\2\2o\5\3\2\2\2pq\7\6\2\2q\7\3\2\2"+
+		"\2rs\5\30\r\2s\t\3\2\2\2tu\7\7\2\2uv\5,\27\2v\13\3\2\2\2wx\7\b\2\2xy\7"+
+		"\t\2\2y~\5\16\b\2z{\7\n\2\2{}\5\16\b\2|z\3\2\2\2}\u0080\3\2\2\2~|\3\2"+
+		"\2\2~\177\3\2\2\2\177\r\3\2\2\2\u0080~\3\2\2\2\u0081\u0083\7@\2\2\u0082"+
+		"\u0084\5\22\n\2\u0083\u0082\3\2\2\2\u0083\u0084\3\2\2\2\u0084\u0086\3"+
+		"\2\2\2\u0085\u0087\5\20\t\2\u0086\u0085\3\2\2\2\u0086\u0087\3\2\2\2\u0087"+
+		"\17\3\2\2\2\u0088\u0089\7\13\2\2\u0089\u008d\7\f\2\2\u008a\u008b\7\13"+
+		"\2\2\u008b\u008d\7\r\2\2\u008c\u0088\3\2\2\2\u008c\u008a\3\2\2\2\u008d"+
+		"\21\3\2\2\2\u008e\u008f\t\2\2\2\u008f\23\3\2\2\2\u0090\u0091\7\20\2\2"+
+		"\u0091\u0093\7B\2\2\u0092\u0094\5\26\f\2\u0093\u0092\3\2\2\2\u0093\u0094"+
+		"\3\2\2\2\u0094\25\3\2\2\2\u0095\u0096\7\21\2\2\u0096\u0097\7B\2\2\u0097"+
+		"\27\3\2\2\2\u0098\u009a\7\22\2\2\u0099\u009b\5$\23\2\u009a\u0099\3\2\2"+
+		"\2\u009a\u009b\3\2\2\2\u009b\u009c\3\2\2\2\u009c\u009e\7@\2\2\u009d\u009f"+
+		"\5\32\16\2\u009e\u009d\3\2\2\2\u009e\u009f\3\2\2\2\u009f\31\3\2\2\2\u00a0"+
+		"\u00a1\7\4\2\2\u00a1\u00a2\5\34\17\2\u00a2\u00a3\7\5\2\2\u00a3\33\3\2"+
+		"\2\2\u00a4\u00a9\5\36\20\2\u00a5\u00a6\7\n\2\2\u00a6\u00a8\5\36\20\2\u00a7"+
+		"\u00a5\3\2\2\2\u00a8\u00ab\3\2\2\2\u00a9\u00a7\3\2\2\2\u00a9\u00aa\3\2"+
+		"\2\2\u00aa\35\3\2\2\2\u00ab\u00a9\3\2\2\2\u00ac\u00b0\7@\2\2\u00ad\u00b0"+
+		"\5 \21\2\u00ae\u00b0\5\"\22\2\u00af\u00ac\3\2\2\2\u00af\u00ad\3\2\2\2"+
+		"\u00af\u00ae\3\2\2\2\u00b0\37\3\2\2\2\u00b1\u00b2\7\23\2\2\u00b2\u00b3"+
+		"\5&\24\2\u00b3!\3\2\2\2\u00b4\u00b5\7\23\2\2\u00b5\u00b6\5(\25\2\u00b6"+
+		"#\3\2\2\2\u00b7\u00ba\5&\24\2\u00b8\u00ba\5(\25\2\u00b9\u00b7\3\2\2\2"+
+		"\u00b9\u00b8\3\2\2\2\u00ba%\3\2\2\2\u00bb\u00bd\7\24\2\2\u00bc\u00be\5"+
+		"*\26\2\u00bd\u00bc\3\2\2\2\u00bd\u00be\3\2\2\2\u00be\'\3\2\2\2\u00bf\u00c1"+
+		"\7\25\2\2\u00c0\u00c2\5*\26\2\u00c1\u00c0\3\2\2\2\u00c1\u00c2\3\2\2\2"+
+		"\u00c2)\3\2\2\2\u00c3\u00c4\7\4\2\2\u00c4\u00c5\7B\2\2\u00c5\u00c6\7\5"+
+		"\2\2\u00c6+\3\2\2\2\u00c7\u00cc\5.\30\2\u00c8\u00c9\7\26\2\2\u00c9\u00cb"+
+		"\5.\30\2\u00ca\u00c8\3\2\2\2\u00cb\u00ce\3\2\2\2\u00cc\u00ca\3\2\2\2\u00cc"+
+		"\u00cd\3\2\2\2\u00cd-\3\2\2\2\u00ce\u00cc\3\2\2\2\u00cf\u00d4\5\60\31"+
+		"\2\u00d0\u00d1\7\27\2\2\u00d1\u00d3\5\60\31\2\u00d2\u00d0\3\2\2\2\u00d3"+
+		"\u00d6\3\2\2\2\u00d4\u00d2\3\2\2\2\u00d4\u00d5\3\2\2\2\u00d5/\3\2\2\2"+
+		"\u00d6\u00d4\3\2\2\2\u00d7\u00d9\7\30\2\2\u00d8\u00d7\3\2\2\2\u00d8\u00d9"+
+		"\3\2\2\2\u00d9\u00da\3\2\2\2\u00da\u00db\5\62\32\2\u00db\61\3\2\2\2\u00dc"+
+		"\u00e2\5\64\33\2\u00dd\u00de\7\4\2\2\u00de\u00df\5,\27\2\u00df\u00e0\7"+
+		"\5\2\2\u00e0\u00e2\3\2\2\2\u00e1\u00dc\3\2\2\2\u00e1\u00dd\3\2\2\2\u00e2"+
+		"\63\3\2\2\2\u00e3\u00f2\5L\'\2\u00e4\u00f2\5H%\2\u00e5\u00f2\5<\37\2\u00e6"+
+		"\u00f2\5:\36\2\u00e7\u00f2\5> \2\u00e8\u00f2\5\66\34\2\u00e9\u00f2\5@"+
+		"!\2\u00ea\u00f2\5B\"\2\u00eb\u00f2\5D#\2\u00ec\u00f2\5F$\2\u00ed\u00ee"+
+		"\7\4\2\2\u00ee\u00ef\5\64\33\2\u00ef\u00f0\7\5\2\2\u00f0\u00f2\3\2\2\2"+
+		"\u00f1\u00e3\3\2\2\2\u00f1\u00e4\3\2\2\2\u00f1\u00e5\3\2\2\2\u00f1\u00e6"+
+		"\3\2\2\2\u00f1\u00e7\3\2\2\2\u00f1\u00e8\3\2\2\2\u00f1\u00e9\3\2\2\2\u00f1"+
+		"\u00ea\3\2\2\2\u00f1\u00eb\3\2\2\2\u00f1\u00ec\3\2\2\2\u00f1\u00ed\3\2"+
+		"\2\2\u00f2\65\3\2\2\2\u00f3\u00f4\7@\2\2\u00f4\u00f5\7\31\2\2\u00f5\u00f6"+
+		"\58\35\2\u00f6\67\3\2\2\2\u00f7\u0104\7?\2\2\u00f8\u00f9\7\4\2\2\u00f9"+
+		"\u00fe\5P)\2\u00fa\u00fb\7\n\2\2\u00fb\u00fd\5P)\2\u00fc\u00fa\3\2\2\2"+
+		"\u00fd\u0100\3\2\2\2\u00fe\u00fc\3\2\2\2\u00fe\u00ff\3\2\2\2\u00ff\u0101"+
+		"\3\2\2\2\u0100\u00fe\3\2\2\2\u0101\u0102\7\5\2\2\u0102\u0104\3\2\2\2\u0103"+
+		"\u00f7\3\2\2\2\u0103\u00f8\3\2\2\2\u01049\3\2\2\2\u0105\u0106\7@\2\2\u0106"+
+		"\u0107\7\32\2\2\u0107\u0108\5P)\2\u0108\u0109\7\27\2\2\u0109\u010a\5P"+
+		")\2\u010a;\3\2\2\2\u010b\u010c\7@\2\2\u010c\u010d\7\33\2\2\u010d\u010e"+
+		"\5P)\2\u010e\u010f\7\34\2\2\u010f\u0110\5P)\2\u0110=\3\2\2\2\u0111\u0112"+
+		"\5P)\2\u0112\u0113\7\32\2\2\u0113\u0114\7@\2\2\u0114\u0115\7\27\2\2\u0115"+
+		"\u0116\7@\2\2\u0116?\3\2\2\2\u0117\u0118\7@\2\2\u0118\u0119\7\35\2\2\u0119"+
+		"\u011d\7\36\2\2\u011a\u011b\7@\2\2\u011b\u011d\7\37\2\2\u011c\u0117\3"+
+		"\2\2\2\u011c\u011a\3\2\2\2\u011dA\3\2\2\2\u011e\u011f\7@\2\2\u011f\u0120"+
+		"\7\35\2\2\u0120\u0121\7\30\2\2\u0121\u0127\7\36\2\2\u0122\u0123\7@\2\2"+
+		"\u0123\u0127\7 \2\2\u0124\u0125\7@\2\2\u0125\u0127\7!\2\2\u0126\u011e"+
+		"\3\2\2\2\u0126\u0122\3\2\2\2\u0126\u0124\3\2\2\2\u0127C\3\2\2\2\u0128"+
+		"\u0129\7@\2\2\u0129\u012a\7\35\2\2\u012a\u012e\7\"\2\2\u012b\u012c\7@"+
+		"\2\2\u012c\u012e\7#\2\2\u012d\u0128\3\2\2\2\u012d\u012b\3\2\2\2\u012e"+
+		"E\3\2\2\2\u012f\u0130\7@\2\2\u0130\u0131\7\35\2\2\u0131\u0132\7\30\2\2"+
+		"\u0132\u0138\7\"\2\2\u0133\u0134\7@\2\2\u0134\u0138\7$\2\2\u0135\u0136"+
+		"\7@\2\2\u0136\u0138\7%\2\2\u0137\u012f\3\2\2\2\u0137\u0133\3\2\2\2\u0137"+
+		"\u0135\3\2\2\2\u0138G\3\2\2\2\u0139\u013a\7@\2\2\u013a\u013b\5J&\2\u013b"+
+		"\u013c\5P)\2\u013cI\3\2\2\2\u013d\u013e\t\3\2\2\u013eK\3\2\2\2\u013f\u0140"+
+		"\7@\2\2\u0140\u0141\5N(\2\u0141\u0142\5P)\2\u0142\u0148\3\2\2\2\u0143"+
+		"\u0144\5P)\2\u0144\u0145\5N(\2\u0145\u0146\7@\2\2\u0146\u0148\3\2\2\2"+
+		"\u0147\u013f\3\2\2\2\u0147\u0143\3\2\2\2\u0148M\3\2\2\2\u0149\u014a\t"+
+		"\4\2\2\u014aO\3\2\2\2\u014b\u014e\5R*\2\u014c\u014e\7?\2\2\u014d\u014b"+
+		"\3\2\2\2\u014d\u014c\3\2\2\2\u014eQ\3\2\2\2\u014f\u0150\t\5\2\2\u0150"+
+		"S\3\2\2\2!UZ^adj~\u0083\u0086\u008c\u0093\u009a\u009e\u00a9\u00af\u00b9"+
+		"\u00bd\u00c1\u00cc\u00d4\u00d8\u00e1\u00f1\u00fe\u0103\u011c\u0126\u012d"+
+		"\u0137\u0147\u014d";
+	public static final ATN _ATN =
+		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
+	static {
+		_decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
+		for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {
+			_decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
+		}
+	}
 }
diff --git a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
index 29ad43ae4..0ed479085 100644
--- a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
@@ -274,6 +274,26 @@ public class EqlParserTest extends BaseTestCase {
     platformAssertIn(query.getGeneratedSql(),"where t0.name");
   }
 
+  @Test
+  public void where_inrange() {
+
+    Query<Customer> query = parse("where name inrange 'As' to 'B'");
+    query.findList();
+
+    assertThat(query.getGeneratedSql()).contains("where (t0.name >= ? and t0.name < ?) ");
+  }
+
+  @Test
+  public void where_inrange_withNamedParams() {
+
+    Query<Customer> query = parse("where name inrange :one to :two");
+    query.setParameter("one", "a");
+    query.setParameter("two", "b");
+    query.findList();
+
+    assertThat(query.getGeneratedSql()).contains("where (t0.name >= ? and t0.name < ?)");
+  }
+
   @Test
   public void where_between() {
 
diff --git a/src/test/resources/EQL.g4 b/src/test/resources/EQL.g4
index 30aa67ae0..c017775e1 100644
--- a/src/test/resources/EQL.g4
+++ b/src/test/resources/EQL.g4
@@ -109,6 +109,7 @@ conditional_primary
 any_expression
    : comparison_expression
    | like_expression
+   | inrange_expression
    | between_expression
    | propertyBetween_expression
    | in_expression
@@ -132,6 +133,10 @@ between_expression
    : PATH_VARIABLE 'between' value_expression 'and' value_expression
    ;
 
+inrange_expression
+   : PATH_VARIABLE 'inrange' value_expression 'to' value_expression
+   ;
+
 propertyBetween_expression
    :  value_expression 'between' PATH_VARIABLE 'and' PATH_VARIABLE
    ;
@@ -181,7 +186,7 @@ comparison_operator
    | '<'  | 'lt'
    | '<=' | 'le' | 'lte'
    | '<>' | '!=' | 'ne'
-   | 'ieq' 
+   | 'ieq'
    | 'ine'
    ;
 

From ab48f796c61f04758abc8e2b3967316ec56784a0 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 21 Jan 2019 20:30:39 +1300
Subject: [PATCH 0673/1036] #1611 - ENH: Add inRange expression (as half open
 expression) ... (property >= lowerValue and property < upperValue)

Bump antlr4-runtime from 4.7.1 to 4.7.2
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8b0813bd2..472f859f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
     <dependency>
       <groupId>org.antlr</groupId>
       <artifactId>antlr4-runtime</artifactId>
-      <version>4.7.1</version>
+      <version>4.7.2</version>
     </dependency>
 
     <!-- Jackson core used internally by Ebean -->

From 4a0806e4532962cd26ff842c025163c2aef0ad9f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 21 Jan 2019 21:57:30 +1300
Subject: [PATCH 0674/1036] #1612 - query.setMapKey("customer.id") throws
 NullPointerException (ie. mapKey is a path rather than local property)

---
 .../deploy/BeanCollectionHelpFactory.java     | 17 +++++----
 .../server/deploy/BeanMapHelp.java            | 10 ------
 .../server/deploy/BeanMapQueryHelp.java       | 35 +++++++++++++++++++
 .../io/ebeaninternal/server/query/CQuery.java |  3 +-
 .../tests/query/TestQueryFindMapTypedKey.java | 17 ++++++++-
 5 files changed, 63 insertions(+), 19 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/BeanMapQueryHelp.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java
index d57b622b1..a3376cd2e 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java
@@ -2,6 +2,8 @@ package io.ebeaninternal.server.deploy;
 
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.core.OrmQueryRequest;
+import io.ebeaninternal.server.el.ElPropertyValue;
+import io.ebeaninternal.server.query.CQueryCollectionAdd;
 
 
 /**
@@ -10,10 +12,10 @@ import io.ebeaninternal.server.core.OrmQueryRequest;
 public class BeanCollectionHelpFactory {
 
   @SuppressWarnings("rawtypes")
-  static final BeanListHelp LIST_HELP = new BeanListHelp();
+  private static final BeanListHelp LIST_HELP = new BeanListHelp();
 
   @SuppressWarnings("rawtypes")
-  static final BeanSetHelp SET_HELP = new BeanSetHelp();
+  private static final BeanSetHelp SET_HELP = new BeanSetHelp();
 
   /**
    * Create the helper based on the many property.
@@ -36,7 +38,7 @@ public class BeanCollectionHelpFactory {
   }
 
   @SuppressWarnings("unchecked")
-  public static <T> BeanCollectionHelp<T> create(SpiQuery.Type manyType, OrmQueryRequest<T> request) {
+  public static <T> CQueryCollectionAdd<T> create(SpiQuery.Type manyType, OrmQueryRequest<T> request) {
 
     if (manyType == SpiQuery.Type.LIST) {
       return LIST_HELP;
@@ -44,10 +46,13 @@ public class BeanCollectionHelpFactory {
     } else if (manyType == SpiQuery.Type.SET) {
       return SET_HELP;
 
-    } else {
+    } else if (manyType == SpiQuery.Type.MAP) {
       BeanDescriptor<T> target = request.getBeanDescriptor();
-      String mapKey = request.getQuery().getMapKey();
-      return new BeanMapHelp<>(target, mapKey);
+      ElPropertyValue elProperty = target.getElGetValue(request.getQuery().getMapKey());
+      return new BeanMapQueryHelp<>(elProperty);
+
+    } else {
+      return null;
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java
index 14440a26f..f28fa54b9 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java
@@ -24,16 +24,6 @@ public class BeanMapHelp<T> extends BaseCollectionHelp<T> {
   private final String propertyName;
   private final BeanProperty beanProperty;
 
-  /**
-   * When created for a given query that will return a map.
-   */
-  BeanMapHelp(BeanDescriptor<T> targetDescriptor, String mapKey) {
-    this.targetDescriptor = targetDescriptor;
-    this.beanProperty = targetDescriptor.getBeanProperty(mapKey);
-    this.many = null;
-    this.propertyName = null;
-  }
-
   /**
    * When help is attached to a specific many property.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanMapQueryHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanMapQueryHelp.java
new file mode 100644
index 000000000..e78381b0b
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanMapQueryHelp.java
@@ -0,0 +1,35 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebean.bean.BeanCollection;
+import io.ebean.bean.EntityBean;
+import io.ebean.common.BeanMap;
+import io.ebeaninternal.server.el.ElPropertyValue;
+import io.ebeaninternal.server.query.CQueryCollectionAdd;
+
+class BeanMapQueryHelp<T> implements CQueryCollectionAdd<T> {
+
+  private final ElPropertyValue elGetValue;
+
+  /**
+   * Create for a findMap query.
+   */
+  BeanMapQueryHelp(ElPropertyValue elGetValue) {
+    this.elGetValue = elGetValue;
+  }
+
+  @Override
+  public BeanCollection<T> createEmptyNoParent() {
+    return new BeanMap<>();
+  }
+
+  @Override
+  public void add(BeanCollection collection, EntityBean bean, boolean withCheck) {
+    if (bean == null) {
+      ((BeanMap<?, ?>) collection).internalPutNull();
+    } else {
+      Object keyValue = elGetValue.pathGet(bean);
+      BeanMap<?, ?> map = ((BeanMap<?, ?>) collection);
+      map.internalPutWithCheck(keyValue, bean);
+    }
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/query/CQuery.java b/src/main/java/io/ebeaninternal/server/query/CQuery.java
index 6f7645c40..ae0a376ff 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQuery.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQuery.java
@@ -18,7 +18,6 @@ import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.autotune.ProfilingListener;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.core.SpiOrmQueryRequest;
-import io.ebeaninternal.server.deploy.BeanCollectionHelp;
 import io.ebeaninternal.server.deploy.BeanCollectionHelpFactory;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
@@ -236,7 +235,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
     this.collection = (help != null ? help.createEmptyNoParent() : null);
   }
 
-  private BeanCollectionHelp<T> createHelp(OrmQueryRequest<T> request) {
+  private CQueryCollectionAdd<T> createHelp(OrmQueryRequest<T> request) {
     if (request.isFindById()) {
       return null;
     } else {
diff --git a/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java b/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java
index 5269baf12..8ea8457a0 100644
--- a/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java
+++ b/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java
@@ -2,10 +2,11 @@ package org.tests.query;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
+import org.tests.model.basic.Order;
 import org.tests.model.basic.Product;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Test;
 
 import java.util.Map;
 
@@ -34,6 +35,20 @@ public class TestQueryFindMapTypedKey extends BaseTestCase {
       .findMap();
 
     assertNotNull(map);
+  }
+
+  @Test
+  public void test_manyToOneId() {
+
+    ResetBasicData.reset();
+
+    Map<Object, Order> orderMap = Ebean.find(Order.class)
+      .where().eq("status", Order.Status.NEW)
+      .setMapKey("customer.id")
+      .findMap();
+
+    assertThat(orderMap).isNotEmpty();
+    assertThat(orderMap.keySet()).contains(1, 2);
 
   }
 }

From 1d49e5b341ea29d0166e9f87e169c4eb336941cd Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 21 Jan 2019 22:09:15 +1300
Subject: [PATCH 0675/1036] #1613 - When using
 transaction.setPersistCascade(false) ... a Delete query should not cascade

---
 .../server/core/OrmQueryRequest.java          |  2 +-
 .../org/tests/delete/TestDeleteByQuery.java   | 23 ++++++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index fd21d8f8a..70bb74d4f 100644
--- a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -118,7 +118,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
 
   @Override
   public boolean isDeleteByStatement() {
-    return beanDescriptor.isDeleteByStatement();
+    return !transaction.isPersistCascade() || beanDescriptor.isDeleteByStatement();
   }
 
   @Override
diff --git a/src/test/java/org/tests/delete/TestDeleteByQuery.java b/src/test/java/org/tests/delete/TestDeleteByQuery.java
index a0b5e5d4c..60c9043a1 100644
--- a/src/test/java/org/tests/delete/TestDeleteByQuery.java
+++ b/src/test/java/org/tests/delete/TestDeleteByQuery.java
@@ -4,16 +4,16 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import io.ebean.Query;
+import io.ebean.Transaction;
 import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.Platform;
-
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
 import org.tests.model.basic.BBookmarkUser;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Country;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
-import org.ebeantest.LoggedSqlCollector;
-import org.junit.Test;
 
 import java.util.List;
 
@@ -126,6 +126,23 @@ public class TestDeleteByQuery extends BaseTestCase {
     Ebean.delete(Contact.class, 7000);
   }
 
+  @Test
+  public void queryDelete_withTransactionNoCascade() {
+
+    LoggedSqlCollector.start();
+
+    try (Transaction transaction = Ebean.beginTransaction()) {
+      transaction.setPersistCascade(false);
+
+      Ebean.find(Contact.class).where().eq("id", 7001).delete();
+
+      transaction.commit();
+    }
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("delete from contact where id = ?");
+  }
+
   @Test
   public void testWithForUpdate() {
 

From 26d1288757375f8544ce829a30a03c034c82ffeb Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 22 Jan 2019 00:05:19 +1300
Subject: [PATCH 0676/1036] #1613 - When using
 transaction.setPersistCascade(false) ... a Delete query should not cascade

---
 .../java/io/ebeaninternal/api/CQueryPlanKey.java     |  4 ++++
 src/main/java/io/ebeaninternal/api/SpiQuery.java     |  5 +++++
 .../ebeaninternal/server/core/OrmQueryRequest.java   |  9 ++++++++-
 .../io/ebeaninternal/server/query/CQueryBuilder.java | 12 ++++++++----
 .../io/ebeaninternal/server/query/CQueryEngine.java  |  4 ++--
 .../server/query/NativeSqlQueryPlanKey.java          |  5 +++++
 .../server/query/RawSqlQueryPlanKey.java             |  5 +++++
 .../server/querydefn/DefaultOrmQuery.java            |  7 +++++++
 .../server/querydefn/OrmQueryPlanKey.java            |  5 +++++
 9 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/api/CQueryPlanKey.java b/src/main/java/io/ebeaninternal/api/CQueryPlanKey.java
index 54de71025..2d3425573 100644
--- a/src/main/java/io/ebeaninternal/api/CQueryPlanKey.java
+++ b/src/main/java/io/ebeaninternal/api/CQueryPlanKey.java
@@ -11,4 +11,8 @@ public interface CQueryPlanKey {
    */
   String getPartialKey();
 
+  /**
+   * Return a query plan key taking into account persist cascading.
+   */
+  CQueryPlanKey withDeleteByIds();
 }
diff --git a/src/main/java/io/ebeaninternal/api/SpiQuery.java b/src/main/java/io/ebeaninternal/api/SpiQuery.java
index fe431b268..c951dae39 100644
--- a/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -439,6 +439,11 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
    */
   void setDelete();
 
+  /**
+   * Set the query to be delete by ids due to cascading delete.
+   */
+  CQueryPlanKey setDeleteByIdsPlan();
+
   /**
    * Set the query to select the id property only.
    */
diff --git a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index 70bb74d4f..0f09bac26 100644
--- a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -118,7 +118,14 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
 
   @Override
   public boolean isDeleteByStatement() {
-    return !transaction.isPersistCascade() || beanDescriptor.isDeleteByStatement();
+    if (!transaction.isPersistCascade() || beanDescriptor.isDeleteByStatement()) {
+      // plain delete by query
+      return true;
+    } else {
+      // delete by ids due to cascading delete needs
+      queryPlanKey = query.setDeleteByIdsPlan();
+      return false;
+    }
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 8b2e52f46..037f53ed1 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -43,8 +43,11 @@ import java.util.List;
  */
 class CQueryBuilder {
 
-  protected final String tableAliasPlaceHolder;
-  protected final String columnAliasPrefix;
+  private static final String DELETE = "Delete";
+  private static final String UPDATE = "Update";
+
+  final String tableAliasPlaceHolder;
+  final String columnAliasPrefix;
 
   private final SqlLimiter sqlLimiter;
 
@@ -98,8 +101,9 @@ class CQueryBuilder {
   /**
    * Build the delete query.
    */
-  <T> CQueryUpdate buildUpdateQuery(String type, OrmQueryRequest<T> request) {
+  <T> CQueryUpdate buildUpdateQuery(boolean deleteRequest, OrmQueryRequest<T> request) {
 
+    String type = (deleteRequest) ? DELETE : UPDATE;
     SpiQuery<T> query = request.getQuery();
     String rootTableAlias = query.getAlias();
     query.setDelete();
@@ -117,7 +121,7 @@ class CQueryBuilder {
     SqlTree sqlTree = createSqlTree(request, predicates);
 
     String sql;
-    if (type.equals("Delete")) {
+    if (deleteRequest) {
       sql = buildDeleteSql(request, rootTableAlias, predicates, sqlTree);
     } else {
       sql = buildUpdateSql(request, rootTableAlias, predicates, sqlTree);
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
index 05e64658a..33f9bf143 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
@@ -68,12 +68,12 @@ public class CQueryEngine {
   }
 
   public <T> int delete(OrmQueryRequest<T> request) {
-    CQueryUpdate query = queryBuilder.buildUpdateQuery("Delete", request);
+    CQueryUpdate query = queryBuilder.buildUpdateQuery(true, request);
     return executeUpdate(request, query);
   }
 
   public <T> int update(OrmQueryRequest<T> request) {
-    CQueryUpdate query = queryBuilder.buildUpdateQuery("Update", request);
+    CQueryUpdate query = queryBuilder.buildUpdateQuery(false, request);
     return executeUpdate(request, query);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/query/NativeSqlQueryPlanKey.java b/src/main/java/io/ebeaninternal/server/query/NativeSqlQueryPlanKey.java
index ac98be5b5..2a0313ff3 100644
--- a/src/main/java/io/ebeaninternal/server/query/NativeSqlQueryPlanKey.java
+++ b/src/main/java/io/ebeaninternal/server/query/NativeSqlQueryPlanKey.java
@@ -18,6 +18,11 @@ public class NativeSqlQueryPlanKey implements CQueryPlanKey {
     return getPartialKey();
   }
 
+  @Override
+  public CQueryPlanKey withDeleteByIds() {
+    throw new IllegalStateException("Not allowed");
+  }
+
   /**
    * Return as a partial key. For rawSql hash the sql is part of the key and as such
    * needs to be included in order to have a complete key. Typically the MD5 of the sql
diff --git a/src/main/java/io/ebeaninternal/server/query/RawSqlQueryPlanKey.java b/src/main/java/io/ebeaninternal/server/query/RawSqlQueryPlanKey.java
index 24336fb8f..04b2e282f 100644
--- a/src/main/java/io/ebeaninternal/server/query/RawSqlQueryPlanKey.java
+++ b/src/main/java/io/ebeaninternal/server/query/RawSqlQueryPlanKey.java
@@ -24,6 +24,11 @@ class RawSqlQueryPlanKey implements CQueryPlanKey {
     return getPartialKey() + ":r";
   }
 
+  @Override
+  public CQueryPlanKey withDeleteByIds() {
+    throw new IllegalStateException("Not allowed");
+  }
+
   /**
    * Return as a partial key. For rawSql hash the sql is part of the key and as such
    * needs to be included in order to have a complete key. Typically the MD5 of the sql
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index c113ae3ac..e0645c688 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -679,6 +679,13 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     setSelectId();
   }
 
+  @Override
+  public CQueryPlanKey setDeleteByIdsPlan() {
+    // re-build plan for cascading via delete by ids
+    queryPlanKey = queryPlanKey.withDeleteByIds();
+    return queryPlanKey;
+  }
+
   /**
    * Set the select clause to select the Id property.
    */
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
index 2286f3ae2..45bf4c802 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
@@ -25,6 +25,11 @@ class OrmQueryPlanKey implements CQueryPlanKey {
     this.planHash = hc;
   }
 
+  @Override
+  public CQueryPlanKey withDeleteByIds() {
+    return new OrmQueryPlanKey(description + ":deleteByIds", 0, 0, null);
+  }
+
   @Override
   public String getPartialKey() {
     return description;

From 31fd0b7ed59d36f5a21d8e4b765032bc5ecb3359 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 22 Jan 2019 01:04:25 +1300
Subject: [PATCH 0677/1036] Bump version to 11.33.1-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 472f859f6..bc8d50783 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.32.2-SNAPSHOT</version>
+  <version>11.33.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>

From ef3d911e19919175941351caf9c58b66da8ad503 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 22 Jan 2019 01:08:15 +1300
Subject: [PATCH 0678/1036] #1614 - Refactor DbMigration.generateMigration() to
 use System out to log key messages and throw UnknownResourcePathException

---
 .../io/ebean/dbmigration/DbMigration.java     |  5 ++
 .../dbmigration/DefaultDbMigration.java       | 53 +++++++++++++++----
 .../UnknownResourcePathException.java         | 14 +++++
 3 files changed, 62 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/dbmigration/UnknownResourcePathException.java

diff --git a/src/main/java/io/ebean/dbmigration/DbMigration.java b/src/main/java/io/ebean/dbmigration/DbMigration.java
index 2d9018806..7880945f9 100644
--- a/src/main/java/io/ebean/dbmigration/DbMigration.java
+++ b/src/main/java/io/ebean/dbmigration/DbMigration.java
@@ -50,6 +50,11 @@ public interface DbMigration {
     throw new IllegalStateException("No service implementation found for DbMigration?");
   }
 
+  /**
+   * Set to false to suppress logging to System out.
+   */
+  void setLogToSystemOut(boolean logToSystemOut);
+
   /**
    * Set the path from the current working directory to the application resources.
    * <p>
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index bf92237dc..6c40cd09b 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -72,6 +72,8 @@ public class DefaultDbMigration implements DbMigration {
 
   private static final String GENERATED_COMMENT = "THIS IS A GENERATED FILE - DO NOT MODIFY";
 
+  private boolean logToSystemOut = true;
+
   /**
    * Set to true if DefaultDbMigration run with online EbeanServer instance.
    */
@@ -316,6 +318,11 @@ public class DefaultDbMigration implements DbMigration {
         return generateDiff(request);
       }
 
+    } catch (UnknownResourcePathException e) {
+      logError("ERROR - " + e.getMessage());
+      logError("Check the working directory or change dbMigration.setPathToResources() value?");
+      return null;
+
     } finally {
       if (!online) {
         DbOffline.reset();
@@ -387,8 +394,7 @@ public class DefaultDbMigration implements DbMigration {
   private void writeExtraDdl(File migrationDir, DdlScript script) throws IOException {
 
     String fullName = repeatableMigrationName(script.isInit(), script.getName());
-
-    logger.info("writing repeatable script {}", fullName);
+    logger.debug("writing repeatable script {}", fullName);
 
     File file = new File(migrationDir, fullName);
     try (FileWriter writer = new FileWriter(file)) {
@@ -397,6 +403,30 @@ public class DefaultDbMigration implements DbMigration {
     }
   }
 
+  @Override
+  public void setLogToSystemOut(boolean logToSystemOut) {
+    this.logToSystemOut = logToSystemOut;
+  }
+
+  private void logError(String message) {
+    if (logToSystemOut) {
+      System.out.println("DbMigration> " + message);
+    } else {
+      logger.error(message);
+    }
+  }
+
+  private void logInfo(String message, Object value) {
+    if (value != null) {
+      message = String.format(message, value);
+    }
+    if (logToSystemOut) {
+      System.out.println("DbMigration> " + message);
+    } else {
+      logger.info(message);
+    }
+  }
+
   private String repeatableMigrationName(boolean init, String scriptName) {
     StringBuilder sb = new StringBuilder();
     if (init) {
@@ -416,12 +446,12 @@ public class DefaultDbMigration implements DbMigration {
 
     List<String> pendingDrops = request.getPendingDrops();
     if (!pendingDrops.isEmpty()) {
-      logger.info("Pending un-applied drops in versions {}", pendingDrops);
+      logInfo("Pending un-applied drops in versions %s", pendingDrops);
     }
 
     Migration migration = request.createDiffMigration();
     if (migration == null) {
-      logger.info("no changes detected - no migration written");
+      logInfo("no changes detected - no migration written", null);
       return null;
     } else {
       // there were actually changes to write
@@ -440,7 +470,7 @@ public class DefaultDbMigration implements DbMigration {
 
     List<String> pendingDrops = request.getPendingDrops();
     if (!pendingDrops.isEmpty()) {
-      logger.info("... remaining pending un-applied drops in versions {}", pendingDrops);
+      logInfo("... remaining pending un-applied drops in versions %s", pendingDrops);
     }
     return version;
   }
@@ -520,9 +550,9 @@ public class DefaultDbMigration implements DbMigration {
 
     String fullVersion = getFullVersion(request.nextVersion(), dropsFor);
 
-    logger.info("generating migration:{}", fullVersion);
+    logInfo("generating migration:%s", fullVersion);
     if (!request.dbinitMigration && !writeMigrationXml(dbMigration, request.modelDir, fullVersion)) {
-      logger.warn("migration already exists, not generating DDL");
+      logError("migration already exists, not generating DDL");
       return null;
     } else {
       if (!platforms.isEmpty()) {
@@ -627,7 +657,6 @@ public class DefaultDbMigration implements DbMigration {
     if (vanillaPlatform || databasePlatform == null) {
       // not explicitly set so use the platform of the server
       databasePlatform = server.getDatabasePlatform();
-      logger.trace("set platform to {}", databasePlatform.getName());
     }
     if (migrationConfig != null) {
       if (strictMode != null) {
@@ -713,13 +742,17 @@ public class DefaultDbMigration implements DbMigration {
 
     // path to src/main/resources in typical maven project
     File resourceRootDir = new File(pathToResources);
+    if (!resourceRootDir.exists()) {
+      String msg = String.format("Error - path to resources %s does not exist. Absolute path is %s", pathToResources, resourceRootDir.getAbsolutePath());
+      throw new UnknownResourcePathException(msg);
+    }
     String resourcePath = migrationConfig.getMigrationPath(dbinitMigration);
 
     // expect to be a path to something like - src/main/resources/dbmigration/model
     File path = new File(resourceRootDir, resourcePath);
     if (!path.exists()) {
       if (!path.mkdirs()) {
-        logger.debug("Unable to ensure migration directory exists at {}", path.getAbsolutePath());
+        logInfo("Warning - Unable to ensure migration directory exists at %s", path.getAbsolutePath());
       }
     }
     return path;
@@ -735,7 +768,7 @@ public class DefaultDbMigration implements DbMigration {
     }
     File modelDir = new File(migrationDirectory, migrationConfig.getModelPath());
     if (!modelDir.exists() && !modelDir.mkdirs()) {
-      logger.debug("Unable to ensure migration model directory exists at {}", modelDir.getAbsolutePath());
+      logInfo("Warning - Unable to ensure migration model directory exists at %s", modelDir.getAbsolutePath());
     }
     return modelDir;
   }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/UnknownResourcePathException.java b/src/main/java/io/ebeaninternal/dbmigration/UnknownResourcePathException.java
new file mode 100644
index 000000000..9ecfde157
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/UnknownResourcePathException.java
@@ -0,0 +1,14 @@
+package io.ebeaninternal.dbmigration;
+
+/**
+ * Exception when db migration resource path does not exist.
+ * <p>
+ * Typically the working directory or pathToResources is incorrect.
+ * </p>
+ */
+public class UnknownResourcePathException extends RuntimeException {
+
+  public UnknownResourcePathException(String msg) {
+    super(msg);
+  }
+}

From b8105190d1df666a2a4243db34f621d7a74c2715 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 22 Jan 2019 01:56:58 +1300
Subject: [PATCH 0679/1036] #1615 - findNative() with List/array named
 parameter throws error ... query plan key doesn't take bind count into
 account

---
 .../server/querydefn/DefaultOrmQuery.java     |  4 ++--
 .../org/tests/query/TestQueryFindNative.java  | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index e0645c688..0f10c5201 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1069,9 +1069,9 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
    * Calculate the query hash for either AutoTune query tuning or Query Plan caching.
    */
   CQueryPlanKey createQueryPlanKey() {
-
     if (isNativeSql()) {
-      queryPlanKey = new NativeSqlQueryPlanKey(type.ordinal() + nativeSql + "-" + firstRow + "-" + maxRows);
+      String bindHash = (bindParams == null) ? "" : bindParams.calcQueryPlanHash();
+      queryPlanKey = new NativeSqlQueryPlanKey(type.ordinal() + nativeSql + "-" + firstRow + "-" + maxRows + "-" + bindHash);
     } else {
       queryPlanKey = new OrmQueryPlanKey(planDescription(), maxRows, firstRow, rawSql);
     }
diff --git a/src/test/java/org/tests/query/TestQueryFindNative.java b/src/test/java/org/tests/query/TestQueryFindNative.java
index 4ad221231..c294c16c7 100644
--- a/src/test/java/org/tests/query/TestQueryFindNative.java
+++ b/src/test/java/org/tests/query/TestQueryFindNative.java
@@ -3,6 +3,7 @@ package org.tests.query;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.PagedList;
+import org.assertj.core.util.Lists;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.model.basic.Contact;
@@ -15,6 +16,24 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestQueryFindNative extends BaseTestCase {
 
+  @Test
+  public void test_in_bindCount() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    String sql = "select id,first_name from contact where id in(:ids)";
+    Ebean.findNative(Contact.class, sql).setParameter("ids", Lists.newArrayList(1, 2, 3)).findList();
+    Ebean.findNative(Contact.class, sql).setParameter("ids", Lists.newArrayList(1, 2)).findList();
+
+    List<String> loggedSql = LoggedSqlCollector.stop();
+    assertThat(loggedSql).hasSize(2);
+    if (isH2()) {
+      assertThat(loggedSql.get(0)).contains("(?,?,?)");
+      assertThat(loggedSql.get(1)).contains("(?,?)");
+    }
+  }
 
   @Test
   public void findCount() {

From 9dbd903a73b25b678790c37245bc1619637ef418 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 22 Jan 2019 15:53:47 +1300
Subject: [PATCH 0680/1036] No effective change - Update tests for aggregation
 queries

---
 .../org/tests/model/aggregation/DMachine.java |  13 ++
 .../model/aggregation/DMachineStats.java      |   2 +-
 .../aggregation/TestAggregationTopLevel.java  | 115 ++++++++++++------
 3 files changed, 94 insertions(+), 36 deletions(-)

diff --git a/src/test/java/org/tests/model/aggregation/DMachine.java b/src/test/java/org/tests/model/aggregation/DMachine.java
index d45a00a11..8276591bc 100644
--- a/src/test/java/org/tests/model/aggregation/DMachine.java
+++ b/src/test/java/org/tests/model/aggregation/DMachine.java
@@ -4,7 +4,9 @@ import io.ebean.Model;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.OneToMany;
 import javax.persistence.Version;
+import java.util.List;
 
 @Entity
 public class DMachine extends Model {
@@ -17,6 +19,9 @@ public class DMachine extends Model {
   @Version
   long version;
 
+  @OneToMany(mappedBy = "machine")
+  List<DMachineStats> machineStats;
+
   public DMachine(String name) {
     this.name = name;
   }
@@ -44,4 +49,12 @@ public class DMachine extends Model {
   public void setVersion(long version) {
     this.version = version;
   }
+
+  public List<DMachineStats> getMachineStats() {
+    return machineStats;
+  }
+
+  public void setMachineStats(List<DMachineStats> machineStats) {
+    this.machineStats = machineStats;
+  }
 }
diff --git a/src/test/java/org/tests/model/aggregation/DMachineStats.java b/src/test/java/org/tests/model/aggregation/DMachineStats.java
index 642946b30..554e4fac3 100644
--- a/src/test/java/org/tests/model/aggregation/DMachineStats.java
+++ b/src/test/java/org/tests/model/aggregation/DMachineStats.java
@@ -15,7 +15,7 @@ public class DMachineStats {
   @Id
   long id;
 
-  @ManyToOne
+  @ManyToOne(optional = false)
   DMachine machine;
 
   LocalDate date;
diff --git a/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java b/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java
index 1ee04a974..eadb2bbed 100644
--- a/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java
+++ b/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java
@@ -3,6 +3,7 @@ package org.tests.model.aggregation;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import org.ebeantest.LoggedSqlCollector;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -74,19 +75,75 @@ public class TestAggregationTopLevel extends BaseTestCase {
   }
 
   @Test
-  public void groupBy_date_dynamicFormula() {
+  public void groupBy_machineDate_dynamicFormula() {
 
     Query<DMachineStats> query = Ebean.find(DMachineStats.class)
-      .select("date, sum(totalKms), sum(hours)")
+      .select("machine, date, sum(totalKms), sum(hours)")
       .where().gt("date", LocalDate.now().minusDays(10))
       .having().gt("sum(hours)", 2)
       .query();
 
     List<DMachineStats> result = query.findList();
-    assertThat(sqlOf(query)).contains("select t0.date, sum(t0.total_kms), sum(t0.hours) from d_machine_stats t0 where t0.date > ?  group by t0.date having sum(t0.hours) > ?");
+    assertThat(sqlOf(query)).contains("select t0.machine_id, t0.date, sum(t0.total_kms), sum(t0.hours) from d_machine_stats t0 where t0.date > ?  group by t0.machine_id, t0.date having sum(t0.hours) > ?");
     assertThat(result).isNotEmpty();
   }
 
+  @Test
+  public void groupBy_machine_dynamicFormula() {
+
+    Query<DMachineStats> query = Ebean.find(DMachineStats.class)
+      .select("machine, sum(totalKms)")
+      .where().gt("date", LocalDate.now().minusDays(10))
+      .having().gt("sum(hours)", 2)
+      .query();
+
+    List<DMachineStats> result = query.findList();
+    assertThat(sqlOf(query)).contains("select t0.machine_id, sum(t0.total_kms) from d_machine_stats t0 where t0.date > ?  group by t0.machine_id having sum(t0.hours) > ?");
+    assertThat(result).isNotEmpty();
+  }
+
+  @Test
+  public void groupBy_machine_dynamicFormula_withJoin() {
+
+    Query<DMachineStats> query = Ebean.find(DMachineStats.class)
+      .select("machine, sum(totalKms), sum(hours)")
+      .fetch("machine", "name")
+      .where().gt("date", LocalDate.now().minusDays(10))
+      .having().gt("sum(hours)", 2)
+      .query();
+
+    LoggedSqlCollector.start();
+
+    List<DMachineStats> result = query.findList();
+    assertThat(result).isNotEmpty();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("select sum(t0.total_kms), sum(t0.hours), t1.id, t1.name from d_machine_stats t0 join dmachine t1 on t1.id = t0.machine_id  where t0.date > ?  group by t1.id, t1.name having sum(t0.hours) > ?");
+  }
+
+  @Test
+  public void groupBy_machine_dynamicFormula_withQueryJoin() {
+
+    Query<DMachineStats> query = Ebean.find(DMachineStats.class)
+      .select("machine, sum(totalKms), sum(hours)")
+      .fetchQuery("machine", "name")
+      .where().gt("date", LocalDate.now().minusDays(10))
+      .having().gt("sum(hours)", 2)
+      .query();
+
+    LoggedSqlCollector.start();
+
+    List<DMachineStats> result = query.findList();
+    assertThat(result).isNotEmpty();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(2);
+
+    assertThat(sql.get(0)).contains("select t0.machine_id, sum(t0.total_kms), sum(t0.hours) from d_machine_stats t0 where t0.date > ?  group by t0.machine_id having sum(t0.hours) > ?");
+    assertThat(sql.get(1)).contains("select t0.id, t0.name from dmachine t0 where t0.id");
+  }
+
   @Test
   public void groupBy_MachineAndDate_dynamicFormula() {
 
@@ -100,35 +157,22 @@ public class TestAggregationTopLevel extends BaseTestCase {
     assertThat(result).isNotEmpty();
   }
 
-  @Test
-  public void groupBy_MachineWithJoin_dynamicFormula() {
+//  @Test
+//  public void groupBy_in_fetchClause() {
+//
+//    Query<DMachine> query = Ebean.find(DMachine.class)
+//      .select("name")
+//      .fetch("machineStats", "date, max(rate), sum(totalKms)")
+//      .where().gt("machineStats.date", LocalDate.now().minusDays(10))
+//      .having().gt("sum(machineStats.totalKms)", 1)
+//      .query();
+//
+//    List<DMachine> result = query.findList();
+//    assertThat(sqlOf(query)).contains("select distinct t0.id, t0.name, t1.date, max(t1.rate), sum(t1.total_kms) from dmachine t0 left join d_machine_stats t1 on t1.machine_id = t0.id  where date > ?  group by t0.id, t0.name, t1.date having sum(t1.total_kms) > ?  order by t0.id");
+//    assertThat(result).isNotEmpty();
+//  }
 
-    Query<DMachineStats> query = Ebean.find(DMachineStats.class)
-      .select("max(rate), sum(totalKms)")
-      .fetch("machine", "name")
-      .where().gt("date", LocalDate.now().minusDays(10))
-      .query();
-
-    List<DMachineStats> result = query.findList();
-    assertThat(sqlOf(query)).contains("select max(t0.rate), sum(t0.total_kms), t1.id, t1.name from d_machine_stats t0 left join dmachine t1 on t1.id = t0.machine_id  where t0.date > ?  group by t1.id, t1.name");
-    assertThat(result).isNotEmpty();
-  }
-
-  @Test
-  public void groupBy_MachineDateWithJoin_dynamicFormula() {
-
-    Query<DMachineStats> query = Ebean.find(DMachineStats.class)
-      .select("machine, date, max(rate), sum(totalKms)")
-      .fetch("machine", "name")
-      .where().gt("date", LocalDate.now().minusDays(10))
-      .query();
-
-    List<DMachineStats> result = query.findList();
-    assertThat(sqlOf(query)).contains("select t0.date, max(t0.rate), sum(t0.total_kms), t1.id, t1.name from d_machine_stats t0 left join dmachine t1 on t1.id = t0.machine_id  where t0.date > ?  group by t0.date, t1.id, t1.name");
-    assertThat(result).isNotEmpty();
-  }
-
-  private static void loadData() {
+  public static void loadData() {
 
     List<DMachine> machines = new ArrayList<>();
 
@@ -146,10 +190,11 @@ public class TestAggregationTopLevel extends BaseTestCase {
 
         DMachineStats stats = new DMachineStats(machine, date);
 
-        stats.setHours(i * 4);
-        stats.setTotalKms(i * 100);
-        stats.setCost(BigDecimal.valueOf(i * 50));
-        stats.setRate(BigDecimal.valueOf(i * 2));
+        long offset = i * machine.getId();
+        stats.setHours(offset * 4);
+        stats.setTotalKms(offset * 100);
+        stats.setCost(BigDecimal.valueOf(offset * 50));
+        stats.setRate(BigDecimal.valueOf(offset * 2));
 
         allStats.add(stats);
       }

From 141f0a8b164e3188e42db0fb390e919bc9da189a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 22 Jan 2019 15:56:20 +1300
Subject: [PATCH 0681/1036] Testing out concept - aggregation formula on fetch
 clause

---
 .../server/deploy/BeanDescriptor.java             |  9 +++++----
 .../server/deploy/FormulaPropertyPath.java        | 11 +++++++++--
 .../io/ebeaninternal/server/query/STreeType.java  |  2 +-
 .../server/query/SqlTreeBuilder.java              | 10 ++++++----
 .../server/query/SqlTreeNodeBean.java             | 15 +++++++++++++--
 .../server/query/SqlTreeProperties.java           |  4 ++++
 .../server/deploy/FormulaPropertyPathTest.java    |  2 +-
 7 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index b94b16bc9..0bc14bdf4 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -2586,9 +2586,10 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Return a 'dynamic property' used to read a formula.
    */
-  private STreeProperty findSqlTreeFormula(String formulaExpression) {
+  private STreeProperty findSqlTreeFormula(String formula, String path) {
 
-    return dynamicProperty.computeIfAbsent(formulaExpression, (formula) -> new FormulaPropertyPath(this, formula).build());
+    String key = formula + "-" + path;
+    return dynamicProperty.computeIfAbsent(key, (fullKey) -> new FormulaPropertyPath(this, formula, path).build());
   }
 
   /**
@@ -2597,9 +2598,9 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * The property can be a dynamic formula or a well known bean property.
    */
   @Override
-  public STreeProperty findPropertyWithDynamic(String propName) {
+  public STreeProperty findPropertyWithDynamic(String propName, String path) {
     if (propName.indexOf('(') > -1) {
-      return findSqlTreeFormula(propName);
+      return findSqlTreeFormula(propName, path);
     }
     return _findBeanProperty(propName);
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java b/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
index df7333c01..20926ceb0 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
@@ -20,15 +20,17 @@ class FormulaPropertyPath {
 
   private final String internalExpression;
 
+  private final String path;
+
   private boolean countDistinct;
 
   private String cast;
   private String alias;
 
-  FormulaPropertyPath(BeanDescriptor<?> descriptor, String formula) {
-
+  FormulaPropertyPath(BeanDescriptor<?> descriptor, String formula, String path) {
     this.descriptor = descriptor;
     this.formula = formula;
+    this.path = path;
 
     int openBracket = formula.indexOf('(');
     int closeBracket = formula.lastIndexOf(')');
@@ -94,6 +96,11 @@ class FormulaPropertyPath {
     DeployPropertyParser parser = descriptor.parser().setCatchFirst(true);
 
     String parsed = parser.parse(internalExpression);
+    if (path != null) {
+      // fetch("machineStats", "sum(hours), sum(totalKms)")
+      parsed = parsed.replace("${}", "${" + path + "}");
+    }
+
     ElPropertyDeploy firstProp = parser.getFirstProp();
 
     ScalarType<?> scalarType;
diff --git a/src/main/java/io/ebeaninternal/server/query/STreeType.java b/src/main/java/io/ebeaninternal/server/query/STreeType.java
index 1e4d40e9c..ee47e45f8 100644
--- a/src/main/java/io/ebeaninternal/server/query/STreeType.java
+++ b/src/main/java/io/ebeaninternal/server/query/STreeType.java
@@ -120,7 +120,7 @@ public interface STreeType {
   /**
    * Find and return property allowing for dynamic formula properties.
    */
-  STreeProperty findPropertyWithDynamic(String baseName);
+  STreeProperty findPropertyWithDynamic(String baseName, String path);
 
   /**
    * Return an extra join if the property path requires it.
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 1c21b2e6f..2ecfb8d7b 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -273,7 +273,9 @@ public final class SqlTreeBuilder {
     OrmQueryProperties queryProps = queryDetail.getChunk(prefix, false);
     SqlTreeProperties props = getBaseSelect(desc, queryProps);
 
-    if (prefix == null && !rawSql) {
+    if (prefix != null) {
+      props.checkAggregation();
+    } else if (!rawSql) {
       if (props.requireSqlDistinct(manyWhereJoins)) {
         sqlDistinct = true;
       }
@@ -417,10 +419,10 @@ public final class SqlTreeBuilder {
 
       // make sure we only included the base/embedded bean once
       if (!selectProps.containsProperty(baseName)) {
-        STreeProperty p = desc.findPropertyWithDynamic(baseName);
+        STreeProperty p = desc.findPropertyWithDynamic(baseName, null);
         if (p == null) {
           // maybe dynamic formula with schema prefix
-          p = desc.findPropertyWithDynamic(propName);
+          p = desc.findPropertyWithDynamic(propName, null);
           if (p != null) {
             selectProps.add(p);
           } else {
@@ -437,7 +439,7 @@ public final class SqlTreeBuilder {
     } else {
       // find the property including searching the
       // sub class hierarchy if required
-      STreeProperty p = desc.findPropertyWithDynamic(propName);
+      STreeProperty p = desc.findPropertyWithDynamic(propName, queryProps.getPath());
       if (p == null) {
         logger.error("property [" + propName + "] not found on " + desc + " for query - excluding it.");
         p = desc.findProperty("id");
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
index a62106a52..10fcca6c0 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
@@ -378,7 +378,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
 
     if (!readId || temporalVersions) {
       // a bean with no Id (never found in context)
-      if (lazyLoadParentId != null && desc.isElementType()) {
+      if (lazyLoadParentId != null) {
         ctx.setLazyLoadedChildBean(localBean, lazyLoadParentId);
       }
       return localBean;
@@ -422,6 +422,9 @@ class SqlTreeNodeBean implements SqlTreeNode {
 
     ctx.pushJoin(prefix);
     ctx.pushTableAlias(prefix);
+    if (lazyLoadParent != null) {
+      lazyLoadParent.addSelectExported(ctx, prefix);
+    }
     if (readId) {
       appendSelectId(ctx, idBinder.getBeanProperty());
     }
@@ -486,7 +489,15 @@ class SqlTreeNodeBean implements SqlTreeNode {
 
   @Override
   public boolean isAggregation() {
-    return aggregation;
+    if (aggregation) {
+      return true;
+    }
+    for (SqlTreeNode child : children) {
+      if (child.isAggregation()) {
+        return true;
+      }
+    }
+    return false;
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
index 5ec9b286d..340cb1e04 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
@@ -92,6 +92,10 @@ public class SqlTreeProperties {
     return aggregation;
   }
 
+  public void checkAggregation() {
+    aggregationJoin();
+  }
+
   /**
    * Return the property to join for aggregation.
    */
diff --git a/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java b/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java
index d20581c0b..92b839fbb 100644
--- a/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java
+++ b/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java
@@ -61,7 +61,7 @@ public class FormulaPropertyPathTest extends BaseTestCase {
 
   private void assertFormula(String input, String funcName, String expression, String cast, String alias) {
 
-    FormulaPropertyPath propertyPath = new FormulaPropertyPath(customerDesc, input);
+    FormulaPropertyPath propertyPath = new FormulaPropertyPath(customerDesc, input, null);
 
     assertThat(propertyPath.internalExpression()).isEqualTo(expression);
     assertThat(propertyPath.outerFunction()).isEqualTo(funcName);

From cc17ea8911e7126dd50d3e7511c7d617972e3e47 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 22 Jan 2019 20:26:50 +1300
Subject: [PATCH 0682/1036] No effective change - improve tests for
 TestAggregationTopLevel

---
 .../aggregation/TestAggregationTopLevel.java  | 49 +++++++++++++++++--
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java b/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java
index eadb2bbed..f3bcfda2e 100644
--- a/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java
+++ b/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java
@@ -106,7 +106,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
   public void groupBy_machine_dynamicFormula_withJoin() {
 
     Query<DMachineStats> query = Ebean.find(DMachineStats.class)
-      .select("machine, sum(totalKms), sum(hours)")
+      .select("sum(totalKms), sum(hours)")
       .fetch("machine", "name")
       .where().gt("date", LocalDate.now().minusDays(10))
       .having().gt("sum(hours)", 2)
@@ -122,11 +122,32 @@ public class TestAggregationTopLevel extends BaseTestCase {
     assertThat(sql.get(0)).contains("select sum(t0.total_kms), sum(t0.hours), t1.id, t1.name from d_machine_stats t0 join dmachine t1 on t1.id = t0.machine_id  where t0.date > ?  group by t1.id, t1.name having sum(t0.hours) > ?");
   }
 
+  @Test
+  public void groupBy_machine_dynamicFormula_withJoin2() {
+
+    Query<DMachineStats> query = Ebean.find(DMachineStats.class)
+      .select("date, sum(totalKms), sum(hours)")
+      .fetch("machine", "name")
+      .where().gt("date", LocalDate.now().minusDays(10))
+      .having().gt("sum(hours)", 2)
+      .query();
+
+    LoggedSqlCollector.start();
+
+    List<DMachineStats> result = query.findList();
+    assertThat(result).isNotEmpty();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("select t0.date, sum(t0.total_kms), sum(t0.hours), t1.id, t1.name from d_machine_stats t0 join dmachine t1 on t1.id = t0.machine_id  where t0.date > ?  group by t0.date, t1.id, t1.name having sum(t0.hours) > ?");
+  }
+
+
   @Test
   public void groupBy_machine_dynamicFormula_withQueryJoin() {
 
     Query<DMachineStats> query = Ebean.find(DMachineStats.class)
-      .select("machine, sum(totalKms), sum(hours)")
+      .select("sum(totalKms), sum(hours)")
       .fetchQuery("machine", "name")
       .where().gt("date", LocalDate.now().minusDays(10))
       .having().gt("sum(hours)", 2)
@@ -140,7 +161,29 @@ public class TestAggregationTopLevel extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(2);
 
-    assertThat(sql.get(0)).contains("select t0.machine_id, sum(t0.total_kms), sum(t0.hours) from d_machine_stats t0 where t0.date > ?  group by t0.machine_id having sum(t0.hours) > ?");
+    assertThat(sql.get(0)).contains("select sum(t0.total_kms), sum(t0.hours), t0.machine_id from d_machine_stats t0 where t0.date > ?  group by t0.machine_id having sum(t0.hours) > ?");
+    assertThat(sql.get(1)).contains("select t0.id, t0.name from dmachine t0 where t0.id");
+  }
+
+  @Test
+  public void groupBy_machine_dynamicFormula_withQueryJoin2() {
+
+    Query<DMachineStats> query = Ebean.find(DMachineStats.class)
+      .select("date, sum(totalKms), sum(hours)")
+      .fetchQuery("machine", "name")
+      .where().gt("date", LocalDate.now().minusDays(10))
+      .having().gt("sum(hours)", 2)
+      .query();
+
+    LoggedSqlCollector.start();
+
+    List<DMachineStats> result = query.findList();
+    assertThat(result).isNotEmpty();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(2);
+
+    assertThat(sql.get(0)).contains("select t0.date, sum(t0.total_kms), sum(t0.hours), t0.machine_id from d_machine_stats t0 where t0.date > ?  group by t0.date, t0.machine_id having sum(t0.hours) > ?");
     assertThat(sql.get(1)).contains("select t0.id, t0.name from dmachine t0 where t0.id");
   }
 

From a6cfed7c44e126bc370fbe3dd3e7b20e01e124c2 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 22 Jan 2019 21:12:18 +1300
Subject: [PATCH 0683/1036] #1616 - Enhance EQL grammer 1) Allow select without
 ( and ) 2) support aggregate functions min,max,sum,count,avg 3) support
 quoting fetch paths (that are keywords)

---
 .../server/grammer/EqlAdapter.java            |  59 +-
 .../server/grammer/antlr/EQL.interp           |  10 +-
 .../server/grammer/antlr/EQL.tokens           |  24 +-
 .../server/grammer/antlr/EQLBaseListener.java |  24 +
 .../server/grammer/antlr/EQLLexer.interp      |  10 +-
 .../server/grammer/antlr/EQLLexer.java        | 367 +++----
 .../server/grammer/antlr/EQLLexer.tokens      |  24 +-
 .../server/grammer/antlr/EQLListener.java     |  20 +
 .../server/grammer/antlr/EQLParser.java       | 905 ++++++++++--------
 .../server/grammer/EqlParserTest.java         | 138 ++-
 src/test/resources/EQL.g4                     |  27 +-
 11 files changed, 985 insertions(+), 623 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java
index 873c6d88e..72110fb68 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java
@@ -99,13 +99,13 @@ class EqlAdapter<T> extends EQLBaseListener {
   @Override
   public void enterSelect_clause(EQLParser.Select_clauseContext ctx) {
 
-    checkChildren(ctx, 4);
+    // with or without surrounding ( and )
+    int childCount = ctx.getChildCount();
+    String clause = trimParenthesis(child(ctx, childCount - 1));
     if (DISTINCT.equals(child(ctx, 1))) {
       query.setDistinct(true);
-      query.select(child(ctx, 3));
-    } else {
-      query.select(child(ctx, 2));
     }
+    query.select(clause);
   }
 
   @Override
@@ -113,24 +113,46 @@ class EqlAdapter<T> extends EQLBaseListener {
 
     int childCount = ctx.getChildCount();
     checkChildren(ctx, 2);
-    String path = child(ctx, 1);
 
-    int noPropertiesLength = 2;
+    String maybePath = child(ctx, 1);
+    FetchConfig fetchConfig = ParseFetchConfig.parse(maybePath);
 
-    FetchConfig fetchConfig = ParseFetchConfig.parse(path);
-    if (fetchConfig != null) {
-      noPropertiesLength = 3;
-      path = child(ctx, 2);
+    int propsIndex = 2;
+
+    String path;
+    if (fetchConfig == null) {
+      path = trimQuotes(maybePath);
+    } else {
+      propsIndex = 3;
+      path = trimQuotes(child(ctx, 2));
     }
-    if (childCount == noPropertiesLength) {
+
+    if (childCount == propsIndex) {
       query.fetch(path, fetchConfig);
 
     } else {
-      String fetchProperties = trimParenthesis(ctx.getChild(noPropertiesLength).getText());
-      query.fetch(path, fetchProperties, fetchConfig);
+      String properties = trimParenthesis(ctx.getChild(propsIndex).getText());
+      query.fetch(path, properties, fetchConfig);
     }
   }
 
+  /**
+   * Trim leading '(' and trailing ')'
+   */
+  private String trimParenthesis(String text) {
+    if (text.charAt(0) == '(') {
+      return text.substring(1, text.length() - 1);
+    }
+    return text;
+  }
+
+  private String trimQuotes(String path) {
+    if (path.charAt(0) == '\'' || path.charAt(0) == '`') {
+      return path.substring(1, path.length() - 1);
+    }
+    return path;
+  }
+
   @Override
   public void enterOrderby_property(EQLParser.Orderby_propertyContext ctx) {
 
@@ -177,15 +199,6 @@ class EqlAdapter<T> extends EQLBaseListener {
     }
   }
 
-  /**
-   * Trim leading '(' and trailing ')'
-   */
-  private String trimParenthesis(String text) {
-    text = text.substring(1);
-    text = text.substring(0, text.length() - 1);
-    return text;
-  }
-
   private String getLeftHandSidePath(ParserRuleContext ctx) {
     TerminalNode pathToken = ctx.getToken(EQLLexer.PATH_VARIABLE, 0);
     return pathToken.getText();
@@ -399,7 +412,7 @@ class EqlAdapter<T> extends EQLBaseListener {
    */
   private void checkChildren(ParserRuleContext ctx, int min) {
     if (ctx.getChildCount() < min) {
-      throw new IllegalStateException("expecting " + min + " children for comparison? " + ctx);
+      throw new IllegalStateException("expecting " + min + " children for comparison but got " + ctx.getChildCount());
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.interp b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.interp
index de112001d..cbba0145d 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.interp
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.interp
@@ -1,8 +1,8 @@
 token literal names:
 null
-'select'
 '('
 ')'
+'select'
 'distinct'
 'where'
 'order'
@@ -66,6 +66,8 @@ null
 null
 null
 null
+null
+null
 '0'
 null
 null
@@ -134,6 +136,8 @@ null
 null
 INPUT_VARIABLE
 PATH_VARIABLE
+QUOTED_PATH_VARIABLE
+PROP_FORMULA
 BOOLEAN_LITERAL
 NUMBER_LITERAL
 DOUBLE
@@ -144,6 +148,7 @@ WS
 
 rule names:
 select_statement
+select_properties
 select_clause
 distinct
 fetch_clause
@@ -157,6 +162,7 @@ offset_clause
 fetch_path
 fetch_property_set
 fetch_property_group
+fetch_path_path
 fetch_property
 fetch_query_hint
 fetch_lazy_hint
@@ -187,4 +193,4 @@ literal
 
 
 atn:
-[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 71, 338, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 3, 2, 5, 2, 86, 10, 2, 3, 2, 7, 2, 89, 10, 2, 12, 2, 14, 2, 92, 11, 2, 3, 2, 5, 2, 95, 10, 2, 3, 2, 5, 2, 98, 10, 2, 3, 2, 5, 2, 101, 10, 2, 3, 2, 3, 2, 3, 3, 3, 3, 5, 3, 107, 10, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 7, 7, 125, 10, 7, 12, 7, 14, 7, 128, 11, 7, 3, 8, 3, 8, 5, 8, 132, 10, 8, 3, 8, 5, 8, 135, 10, 8, 3, 9, 3, 9, 3, 9, 3, 9, 5, 9, 141, 10, 9, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 5, 11, 148, 10, 11, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 5, 13, 155, 10, 13, 3, 13, 3, 13, 5, 13, 159, 10, 13, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 7, 15, 168, 10, 15, 12, 15, 14, 15, 171, 11, 15, 3, 16, 3, 16, 3, 16, 5, 16, 176, 10, 16, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 19, 3, 19, 5, 19, 186, 10, 19, 3, 20, 3, 20, 5, 20, 190, 10, 20, 3, 21, 3, 21, 5, 21, 194, 10, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 23, 7, 23, 203, 10, 23, 12, 23, 14, 23, 206, 11, 23, 3, 24, 3, 24, 3, 24, 7, 24, 211, 10, 24, 12, 24, 14, 24, 214, 11, 24, 3, 25, 5, 25, 217, 10, 25, 3, 25, 3, 25, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 5, 26, 226, 10, 26, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 5, 27, 242, 10, 27, 3, 28, 3, 28, 3, 28, 3, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 7, 29, 253, 10, 29, 12, 29, 14, 29, 256, 11, 29, 3, 29, 3, 29, 5, 29, 260, 10, 29, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 5, 33, 285, 10, 33, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 5, 34, 295, 10, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 5, 35, 302, 10, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 5, 36, 312, 10, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 38, 3, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 5, 39, 328, 10, 39, 3, 40, 3, 40, 3, 41, 3, 41, 5, 41, 334, 10, 41, 3, 42, 3, 42, 3, 42, 2, 2, 43, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 2, 6, 3, 2, 14, 15, 3, 2, 38, 45, 3, 2, 46, 62, 4, 2, 65, 66, 70, 70, 2, 339, 2, 85, 3, 2, 2, 2, 4, 104, 3, 2, 2, 2, 6, 112, 3, 2, 2, 2, 8, 114, 3, 2, 2, 2, 10, 116, 3, 2, 2, 2, 12, 119, 3, 2, 2, 2, 14, 129, 3, 2, 2, 2, 16, 140, 3, 2, 2, 2, 18, 142, 3, 2, 2, 2, 20, 144, 3, 2, 2, 2, 22, 149, 3, 2, 2, 2, 24, 152, 3, 2, 2, 2, 26, 160, 3, 2, 2, 2, 28, 164, 3, 2, 2, 2, 30, 175, 3, 2, 2, 2, 32, 177, 3, 2, 2, 2, 34, 180, 3, 2, 2, 2, 36, 185, 3, 2, 2, 2, 38, 187, 3, 2, 2, 2, 40, 191, 3, 2, 2, 2, 42, 195, 3, 2, 2, 2, 44, 199, 3, 2, 2, 2, 46, 207, 3, 2, 2, 2, 48, 216, 3, 2, 2, 2, 50, 225, 3, 2, 2, 2, 52, 241, 3, 2, 2, 2, 54, 243, 3, 2, 2, 2, 56, 259, 3, 2, 2, 2, 58, 261, 3, 2, 2, 2, 60, 267, 3, 2, 2, 2, 62, 273, 3, 2, 2, 2, 64, 284, 3, 2, 2, 2, 66, 294, 3, 2, 2, 2, 68, 301, 3, 2, 2, 2, 70, 311, 3, 2, 2, 2, 72, 313, 3, 2, 2, 2, 74, 317, 3, 2, 2, 2, 76, 327, 3, 2, 2, 2, 78, 329, 3, 2, 2, 2, 80, 333, 3, 2, 2, 2, 82, 335, 3, 2, 2, 2, 84, 86, 5, 4, 3, 2, 85, 84, 3, 2, 2, 2, 85, 86, 3, 2, 2, 2, 86, 90, 3, 2, 2, 2, 87, 89, 5, 8, 5, 2, 88, 87, 3, 2, 2, 2, 89, 92, 3, 2, 2, 2, 90, 88, 3, 2, 2, 2, 90, 91, 3, 2, 2, 2, 91, 94, 3, 2, 2, 2, 92, 90, 3, 2, 2, 2, 93, 95, 5, 10, 6, 2, 94, 93, 3, 2, 2, 2, 94, 95, 3, 2, 2, 2, 95, 97, 3, 2, 2, 2, 96, 98, 5, 12, 7, 2, 97, 96, 3, 2, 2, 2, 97, 98, 3, 2, 2, 2, 98, 100, 3, 2, 2, 2, 99, 101, 5, 20, 11, 2, 100, 99, 3, 2, 2, 2, 100, 101, 3, 2, 2, 2, 101, 102, 3, 2, 2, 2, 102, 103, 7, 2, 2, 3, 103, 3, 3, 2, 2, 2, 104, 106, 7, 3, 2, 2, 105, 107, 5, 6, 4, 2, 106, 105, 3, 2, 2, 2, 106, 107, 3, 2, 2, 2, 107, 108, 3, 2, 2, 2, 108, 109, 7, 4, 2, 2, 109, 110, 5, 28, 15, 2, 110, 111, 7, 5, 2, 2, 111, 5, 3, 2, 2, 2, 112, 113, 7, 6, 2, 2, 113, 7, 3, 2, 2, 2, 114, 115, 5, 24, 13, 2, 115, 9, 3, 2, 2, 2, 116, 117, 7, 7, 2, 2, 117, 118, 5, 44, 23, 2, 118, 11, 3, 2, 2, 2, 119, 120, 7, 8, 2, 2, 120, 121, 7, 9, 2, 2, 121, 126, 5, 14, 8, 2, 122, 123, 7, 10, 2, 2, 123, 125, 5, 14, 8, 2, 124, 122, 3, 2, 2, 2, 125, 128, 3, 2, 2, 2, 126, 124, 3, 2, 2, 2, 126, 127, 3, 2, 2, 2, 127, 13, 3, 2, 2, 2, 128, 126, 3, 2, 2, 2, 129, 131, 7, 64, 2, 2, 130, 132, 5, 18, 10, 2, 131, 130, 3, 2, 2, 2, 131, 132, 3, 2, 2, 2, 132, 134, 3, 2, 2, 2, 133, 135, 5, 16, 9, 2, 134, 133, 3, 2, 2, 2, 134, 135, 3, 2, 2, 2, 135, 15, 3, 2, 2, 2, 136, 137, 7, 11, 2, 2, 137, 141, 7, 12, 2, 2, 138, 139, 7, 11, 2, 2, 139, 141, 7, 13, 2, 2, 140, 136, 3, 2, 2, 2, 140, 138, 3, 2, 2, 2, 141, 17, 3, 2, 2, 2, 142, 143, 9, 2, 2, 2, 143, 19, 3, 2, 2, 2, 144, 145, 7, 16, 2, 2, 145, 147, 7, 66, 2, 2, 146, 148, 5, 22, 12, 2, 147, 146, 3, 2, 2, 2, 147, 148, 3, 2, 2, 2, 148, 21, 3, 2, 2, 2, 149, 150, 7, 17, 2, 2, 150, 151, 7, 66, 2, 2, 151, 23, 3, 2, 2, 2, 152, 154, 7, 18, 2, 2, 153, 155, 5, 36, 19, 2, 154, 153, 3, 2, 2, 2, 154, 155, 3, 2, 2, 2, 155, 156, 3, 2, 2, 2, 156, 158, 7, 64, 2, 2, 157, 159, 5, 26, 14, 2, 158, 157, 3, 2, 2, 2, 158, 159, 3, 2, 2, 2, 159, 25, 3, 2, 2, 2, 160, 161, 7, 4, 2, 2, 161, 162, 5, 28, 15, 2, 162, 163, 7, 5, 2, 2, 163, 27, 3, 2, 2, 2, 164, 169, 5, 30, 16, 2, 165, 166, 7, 10, 2, 2, 166, 168, 5, 30, 16, 2, 167, 165, 3, 2, 2, 2, 168, 171, 3, 2, 2, 2, 169, 167, 3, 2, 2, 2, 169, 170, 3, 2, 2, 2, 170, 29, 3, 2, 2, 2, 171, 169, 3, 2, 2, 2, 172, 176, 7, 64, 2, 2, 173, 176, 5, 32, 17, 2, 174, 176, 5, 34, 18, 2, 175, 172, 3, 2, 2, 2, 175, 173, 3, 2, 2, 2, 175, 174, 3, 2, 2, 2, 176, 31, 3, 2, 2, 2, 177, 178, 7, 19, 2, 2, 178, 179, 5, 38, 20, 2, 179, 33, 3, 2, 2, 2, 180, 181, 7, 19, 2, 2, 181, 182, 5, 40, 21, 2, 182, 35, 3, 2, 2, 2, 183, 186, 5, 38, 20, 2, 184, 186, 5, 40, 21, 2, 185, 183, 3, 2, 2, 2, 185, 184, 3, 2, 2, 2, 186, 37, 3, 2, 2, 2, 187, 189, 7, 20, 2, 2, 188, 190, 5, 42, 22, 2, 189, 188, 3, 2, 2, 2, 189, 190, 3, 2, 2, 2, 190, 39, 3, 2, 2, 2, 191, 193, 7, 21, 2, 2, 192, 194, 5, 42, 22, 2, 193, 192, 3, 2, 2, 2, 193, 194, 3, 2, 2, 2, 194, 41, 3, 2, 2, 2, 195, 196, 7, 4, 2, 2, 196, 197, 7, 66, 2, 2, 197, 198, 7, 5, 2, 2, 198, 43, 3, 2, 2, 2, 199, 204, 5, 46, 24, 2, 200, 201, 7, 22, 2, 2, 201, 203, 5, 46, 24, 2, 202, 200, 3, 2, 2, 2, 203, 206, 3, 2, 2, 2, 204, 202, 3, 2, 2, 2, 204, 205, 3, 2, 2, 2, 205, 45, 3, 2, 2, 2, 206, 204, 3, 2, 2, 2, 207, 212, 5, 48, 25, 2, 208, 209, 7, 23, 2, 2, 209, 211, 5, 48, 25, 2, 210, 208, 3, 2, 2, 2, 211, 214, 3, 2, 2, 2, 212, 210, 3, 2, 2, 2, 212, 213, 3, 2, 2, 2, 213, 47, 3, 2, 2, 2, 214, 212, 3, 2, 2, 2, 215, 217, 7, 24, 2, 2, 216, 215, 3, 2, 2, 2, 216, 217, 3, 2, 2, 2, 217, 218, 3, 2, 2, 2, 218, 219, 5, 50, 26, 2, 219, 49, 3, 2, 2, 2, 220, 226, 5, 52, 27, 2, 221, 222, 7, 4, 2, 2, 222, 223, 5, 44, 23, 2, 223, 224, 7, 5, 2, 2, 224, 226, 3, 2, 2, 2, 225, 220, 3, 2, 2, 2, 225, 221, 3, 2, 2, 2, 226, 51, 3, 2, 2, 2, 227, 242, 5, 76, 39, 2, 228, 242, 5, 72, 37, 2, 229, 242, 5, 60, 31, 2, 230, 242, 5, 58, 30, 2, 231, 242, 5, 62, 32, 2, 232, 242, 5, 54, 28, 2, 233, 242, 5, 64, 33, 2, 234, 242, 5, 66, 34, 2, 235, 242, 5, 68, 35, 2, 236, 242, 5, 70, 36, 2, 237, 238, 7, 4, 2, 2, 238, 239, 5, 52, 27, 2, 239, 240, 7, 5, 2, 2, 240, 242, 3, 2, 2, 2, 241, 227, 3, 2, 2, 2, 241, 228, 3, 2, 2, 2, 241, 229, 3, 2, 2, 2, 241, 230, 3, 2, 2, 2, 241, 231, 3, 2, 2, 2, 241, 232, 3, 2, 2, 2, 241, 233, 3, 2, 2, 2, 241, 234, 3, 2, 2, 2, 241, 235, 3, 2, 2, 2, 241, 236, 3, 2, 2, 2, 241, 237, 3, 2, 2, 2, 242, 53, 3, 2, 2, 2, 243, 244, 7, 64, 2, 2, 244, 245, 7, 25, 2, 2, 245, 246, 5, 56, 29, 2, 246, 55, 3, 2, 2, 2, 247, 260, 7, 63, 2, 2, 248, 249, 7, 4, 2, 2, 249, 254, 5, 80, 41, 2, 250, 251, 7, 10, 2, 2, 251, 253, 5, 80, 41, 2, 252, 250, 3, 2, 2, 2, 253, 256, 3, 2, 2, 2, 254, 252, 3, 2, 2, 2, 254, 255, 3, 2, 2, 2, 255, 257, 3, 2, 2, 2, 256, 254, 3, 2, 2, 2, 257, 258, 7, 5, 2, 2, 258, 260, 3, 2, 2, 2, 259, 247, 3, 2, 2, 2, 259, 248, 3, 2, 2, 2, 260, 57, 3, 2, 2, 2, 261, 262, 7, 64, 2, 2, 262, 263, 7, 26, 2, 2, 263, 264, 5, 80, 41, 2, 264, 265, 7, 23, 2, 2, 265, 266, 5, 80, 41, 2, 266, 59, 3, 2, 2, 2, 267, 268, 7, 64, 2, 2, 268, 269, 7, 27, 2, 2, 269, 270, 5, 80, 41, 2, 270, 271, 7, 28, 2, 2, 271, 272, 5, 80, 41, 2, 272, 61, 3, 2, 2, 2, 273, 274, 5, 80, 41, 2, 274, 275, 7, 26, 2, 2, 275, 276, 7, 64, 2, 2, 276, 277, 7, 23, 2, 2, 277, 278, 7, 64, 2, 2, 278, 63, 3, 2, 2, 2, 279, 280, 7, 64, 2, 2, 280, 281, 7, 29, 2, 2, 281, 285, 7, 30, 2, 2, 282, 283, 7, 64, 2, 2, 283, 285, 7, 31, 2, 2, 284, 279, 3, 2, 2, 2, 284, 282, 3, 2, 2, 2, 285, 65, 3, 2, 2, 2, 286, 287, 7, 64, 2, 2, 287, 288, 7, 29, 2, 2, 288, 289, 7, 24, 2, 2, 289, 295, 7, 30, 2, 2, 290, 291, 7, 64, 2, 2, 291, 295, 7, 32, 2, 2, 292, 293, 7, 64, 2, 2, 293, 295, 7, 33, 2, 2, 294, 286, 3, 2, 2, 2, 294, 290, 3, 2, 2, 2, 294, 292, 3, 2, 2, 2, 295, 67, 3, 2, 2, 2, 296, 297, 7, 64, 2, 2, 297, 298, 7, 29, 2, 2, 298, 302, 7, 34, 2, 2, 299, 300, 7, 64, 2, 2, 300, 302, 7, 35, 2, 2, 301, 296, 3, 2, 2, 2, 301, 299, 3, 2, 2, 2, 302, 69, 3, 2, 2, 2, 303, 304, 7, 64, 2, 2, 304, 305, 7, 29, 2, 2, 305, 306, 7, 24, 2, 2, 306, 312, 7, 34, 2, 2, 307, 308, 7, 64, 2, 2, 308, 312, 7, 36, 2, 2, 309, 310, 7, 64, 2, 2, 310, 312, 7, 37, 2, 2, 311, 303, 3, 2, 2, 2, 311, 307, 3, 2, 2, 2, 311, 309, 3, 2, 2, 2, 312, 71, 3, 2, 2, 2, 313, 314, 7, 64, 2, 2, 314, 315, 5, 74, 38, 2, 315, 316, 5, 80, 41, 2, 316, 73, 3, 2, 2, 2, 317, 318, 9, 3, 2, 2, 318, 75, 3, 2, 2, 2, 319, 320, 7, 64, 2, 2, 320, 321, 5, 78, 40, 2, 321, 322, 5, 80, 41, 2, 322, 328, 3, 2, 2, 2, 323, 324, 5, 80, 41, 2, 324, 325, 5, 78, 40, 2, 325, 326, 7, 64, 2, 2, 326, 328, 3, 2, 2, 2, 327, 319, 3, 2, 2, 2, 327, 323, 3, 2, 2, 2, 328, 77, 3, 2, 2, 2, 329, 330, 9, 4, 2, 2, 330, 79, 3, 2, 2, 2, 331, 334, 5, 82, 42, 2, 332, 334, 7, 63, 2, 2, 333, 331, 3, 2, 2, 2, 333, 332, 3, 2, 2, 2, 334, 81, 3, 2, 2, 2, 335, 336, 9, 5, 2, 2, 336, 83, 3, 2, 2, 2, 33, 85, 90, 94, 97, 100, 106, 126, 131, 134, 140, 147, 154, 158, 169, 175, 185, 189, 193, 204, 212, 216, 225, 241, 254, 259, 284, 294, 301, 311, 327, 333]
\ No newline at end of file
+[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 73, 350, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 3, 2, 5, 2, 90, 10, 2, 3, 2, 7, 2, 93, 10, 2, 12, 2, 14, 2, 96, 11, 2, 3, 2, 5, 2, 99, 10, 2, 3, 2, 5, 2, 102, 10, 2, 3, 2, 5, 2, 105, 10, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 3, 114, 10, 3, 3, 4, 3, 4, 5, 4, 118, 10, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 7, 8, 134, 10, 8, 12, 8, 14, 8, 137, 11, 8, 3, 9, 3, 9, 5, 9, 141, 10, 9, 3, 9, 5, 9, 144, 10, 9, 3, 10, 3, 10, 3, 10, 3, 10, 5, 10, 150, 10, 10, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 5, 12, 157, 10, 12, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 5, 14, 164, 10, 14, 3, 14, 3, 14, 5, 14, 168, 10, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 7, 16, 177, 10, 16, 12, 16, 14, 16, 180, 11, 16, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 18, 5, 18, 188, 10, 18, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 5, 21, 198, 10, 21, 3, 22, 3, 22, 5, 22, 202, 10, 22, 3, 23, 3, 23, 5, 23, 206, 10, 23, 3, 24, 3, 24, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 7, 25, 215, 10, 25, 12, 25, 14, 25, 218, 11, 25, 3, 26, 3, 26, 3, 26, 7, 26, 223, 10, 26, 12, 26, 14, 26, 226, 11, 26, 3, 27, 5, 27, 229, 10, 27, 3, 27, 3, 27, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 5, 28, 238, 10, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 5, 29, 254, 10, 29, 3, 30, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 7, 31, 265, 10, 31, 12, 31, 14, 31, 268, 11, 31, 3, 31, 3, 31, 5, 31, 272, 10, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 5, 35, 297, 10, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 5, 36, 307, 10, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 5, 37, 314, 10, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 5, 38, 324, 10, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 40, 3, 40, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 5, 41, 340, 10, 41, 3, 42, 3, 42, 3, 43, 3, 43, 5, 43, 346, 10, 43, 3, 44, 3, 44, 3, 44, 2, 2, 45, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 2, 7, 3, 2, 14, 15, 3, 2, 64, 65, 3, 2, 38, 45, 3, 2, 46, 62, 4, 2, 67, 68, 72, 72, 2, 351, 2, 89, 3, 2, 2, 2, 4, 113, 3, 2, 2, 2, 6, 115, 3, 2, 2, 2, 8, 121, 3, 2, 2, 2, 10, 123, 3, 2, 2, 2, 12, 125, 3, 2, 2, 2, 14, 128, 3, 2, 2, 2, 16, 138, 3, 2, 2, 2, 18, 149, 3, 2, 2, 2, 20, 151, 3, 2, 2, 2, 22, 153, 3, 2, 2, 2, 24, 158, 3, 2, 2, 2, 26, 161, 3, 2, 2, 2, 28, 169, 3, 2, 2, 2, 30, 173, 3, 2, 2, 2, 32, 181, 3, 2, 2, 2, 34, 187, 3, 2, 2, 2, 36, 189, 3, 2, 2, 2, 38, 192, 3, 2, 2, 2, 40, 197, 3, 2, 2, 2, 42, 199, 3, 2, 2, 2, 44, 203, 3, 2, 2, 2, 46, 207, 3, 2, 2, 2, 48, 211, 3, 2, 2, 2, 50, 219, 3, 2, 2, 2, 52, 228, 3, 2, 2, 2, 54, 237, 3, 2, 2, 2, 56, 253, 3, 2, 2, 2, 58, 255, 3, 2, 2, 2, 60, 271, 3, 2, 2, 2, 62, 273, 3, 2, 2, 2, 64, 279, 3, 2, 2, 2, 66, 285, 3, 2, 2, 2, 68, 296, 3, 2, 2, 2, 70, 306, 3, 2, 2, 2, 72, 313, 3, 2, 2, 2, 74, 323, 3, 2, 2, 2, 76, 325, 3, 2, 2, 2, 78, 329, 3, 2, 2, 2, 80, 339, 3, 2, 2, 2, 82, 341, 3, 2, 2, 2, 84, 345, 3, 2, 2, 2, 86, 347, 3, 2, 2, 2, 88, 90, 5, 6, 4, 2, 89, 88, 3, 2, 2, 2, 89, 90, 3, 2, 2, 2, 90, 94, 3, 2, 2, 2, 91, 93, 5, 10, 6, 2, 92, 91, 3, 2, 2, 2, 93, 96, 3, 2, 2, 2, 94, 92, 3, 2, 2, 2, 94, 95, 3, 2, 2, 2, 95, 98, 3, 2, 2, 2, 96, 94, 3, 2, 2, 2, 97, 99, 5, 12, 7, 2, 98, 97, 3, 2, 2, 2, 98, 99, 3, 2, 2, 2, 99, 101, 3, 2, 2, 2, 100, 102, 5, 14, 8, 2, 101, 100, 3, 2, 2, 2, 101, 102, 3, 2, 2, 2, 102, 104, 3, 2, 2, 2, 103, 105, 5, 22, 12, 2, 104, 103, 3, 2, 2, 2, 104, 105, 3, 2, 2, 2, 105, 106, 3, 2, 2, 2, 106, 107, 7, 2, 2, 3, 107, 3, 3, 2, 2, 2, 108, 109, 7, 3, 2, 2, 109, 110, 5, 30, 16, 2, 110, 111, 7, 4, 2, 2, 111, 114, 3, 2, 2, 2, 112, 114, 5, 30, 16, 2, 113, 108, 3, 2, 2, 2, 113, 112, 3, 2, 2, 2, 114, 5, 3, 2, 2, 2, 115, 117, 7, 5, 2, 2, 116, 118, 5, 8, 5, 2, 117, 116, 3, 2, 2, 2, 117, 118, 3, 2, 2, 2, 118, 119, 3, 2, 2, 2, 119, 120, 5, 4, 3, 2, 120, 7, 3, 2, 2, 2, 121, 122, 7, 6, 2, 2, 122, 9, 3, 2, 2, 2, 123, 124, 5, 26, 14, 2, 124, 11, 3, 2, 2, 2, 125, 126, 7, 7, 2, 2, 126, 127, 5, 48, 25, 2, 127, 13, 3, 2, 2, 2, 128, 129, 7, 8, 2, 2, 129, 130, 7, 9, 2, 2, 130, 135, 5, 16, 9, 2, 131, 132, 7, 10, 2, 2, 132, 134, 5, 16, 9, 2, 133, 131, 3, 2, 2, 2, 134, 137, 3, 2, 2, 2, 135, 133, 3, 2, 2, 2, 135, 136, 3, 2, 2, 2, 136, 15, 3, 2, 2, 2, 137, 135, 3, 2, 2, 2, 138, 140, 7, 64, 2, 2, 139, 141, 5, 20, 11, 2, 140, 139, 3, 2, 2, 2, 140, 141, 3, 2, 2, 2, 141, 143, 3, 2, 2, 2, 142, 144, 5, 18, 10, 2, 143, 142, 3, 2, 2, 2, 143, 144, 3, 2, 2, 2, 144, 17, 3, 2, 2, 2, 145, 146, 7, 11, 2, 2, 146, 150, 7, 12, 2, 2, 147, 148, 7, 11, 2, 2, 148, 150, 7, 13, 2, 2, 149, 145, 3, 2, 2, 2, 149, 147, 3, 2, 2, 2, 150, 19, 3, 2, 2, 2, 151, 152, 9, 2, 2, 2, 152, 21, 3, 2, 2, 2, 153, 154, 7, 16, 2, 2, 154, 156, 7, 68, 2, 2, 155, 157, 5, 24, 13, 2, 156, 155, 3, 2, 2, 2, 156, 157, 3, 2, 2, 2, 157, 23, 3, 2, 2, 2, 158, 159, 7, 17, 2, 2, 159, 160, 7, 68, 2, 2, 160, 25, 3, 2, 2, 2, 161, 163, 7, 18, 2, 2, 162, 164, 5, 40, 21, 2, 163, 162, 3, 2, 2, 2, 163, 164, 3, 2, 2, 2, 164, 165, 3, 2, 2, 2, 165, 167, 5, 32, 17, 2, 166, 168, 5, 28, 15, 2, 167, 166, 3, 2, 2, 2, 167, 168, 3, 2, 2, 2, 168, 27, 3, 2, 2, 2, 169, 170, 7, 3, 2, 2, 170, 171, 5, 30, 16, 2, 171, 172, 7, 4, 2, 2, 172, 29, 3, 2, 2, 2, 173, 178, 5, 34, 18, 2, 174, 175, 7, 10, 2, 2, 175, 177, 5, 34, 18, 2, 176, 174, 3, 2, 2, 2, 177, 180, 3, 2, 2, 2, 178, 176, 3, 2, 2, 2, 178, 179, 3, 2, 2, 2, 179, 31, 3, 2, 2, 2, 180, 178, 3, 2, 2, 2, 181, 182, 9, 3, 2, 2, 182, 33, 3, 2, 2, 2, 183, 188, 7, 64, 2, 2, 184, 188, 5, 36, 19, 2, 185, 188, 5, 38, 20, 2, 186, 188, 7, 66, 2, 2, 187, 183, 3, 2, 2, 2, 187, 184, 3, 2, 2, 2, 187, 185, 3, 2, 2, 2, 187, 186, 3, 2, 2, 2, 188, 35, 3, 2, 2, 2, 189, 190, 7, 19, 2, 2, 190, 191, 5, 42, 22, 2, 191, 37, 3, 2, 2, 2, 192, 193, 7, 19, 2, 2, 193, 194, 5, 44, 23, 2, 194, 39, 3, 2, 2, 2, 195, 198, 5, 42, 22, 2, 196, 198, 5, 44, 23, 2, 197, 195, 3, 2, 2, 2, 197, 196, 3, 2, 2, 2, 198, 41, 3, 2, 2, 2, 199, 201, 7, 20, 2, 2, 200, 202, 5, 46, 24, 2, 201, 200, 3, 2, 2, 2, 201, 202, 3, 2, 2, 2, 202, 43, 3, 2, 2, 2, 203, 205, 7, 21, 2, 2, 204, 206, 5, 46, 24, 2, 205, 204, 3, 2, 2, 2, 205, 206, 3, 2, 2, 2, 206, 45, 3, 2, 2, 2, 207, 208, 7, 3, 2, 2, 208, 209, 7, 68, 2, 2, 209, 210, 7, 4, 2, 2, 210, 47, 3, 2, 2, 2, 211, 216, 5, 50, 26, 2, 212, 213, 7, 22, 2, 2, 213, 215, 5, 50, 26, 2, 214, 212, 3, 2, 2, 2, 215, 218, 3, 2, 2, 2, 216, 214, 3, 2, 2, 2, 216, 217, 3, 2, 2, 2, 217, 49, 3, 2, 2, 2, 218, 216, 3, 2, 2, 2, 219, 224, 5, 52, 27, 2, 220, 221, 7, 23, 2, 2, 221, 223, 5, 52, 27, 2, 222, 220, 3, 2, 2, 2, 223, 226, 3, 2, 2, 2, 224, 222, 3, 2, 2, 2, 224, 225, 3, 2, 2, 2, 225, 51, 3, 2, 2, 2, 226, 224, 3, 2, 2, 2, 227, 229, 7, 24, 2, 2, 228, 227, 3, 2, 2, 2, 228, 229, 3, 2, 2, 2, 229, 230, 3, 2, 2, 2, 230, 231, 5, 54, 28, 2, 231, 53, 3, 2, 2, 2, 232, 238, 5, 56, 29, 2, 233, 234, 7, 3, 2, 2, 234, 235, 5, 48, 25, 2, 235, 236, 7, 4, 2, 2, 236, 238, 3, 2, 2, 2, 237, 232, 3, 2, 2, 2, 237, 233, 3, 2, 2, 2, 238, 55, 3, 2, 2, 2, 239, 254, 5, 80, 41, 2, 240, 254, 5, 76, 39, 2, 241, 254, 5, 64, 33, 2, 242, 254, 5, 62, 32, 2, 243, 254, 5, 66, 34, 2, 244, 254, 5, 58, 30, 2, 245, 254, 5, 68, 35, 2, 246, 254, 5, 70, 36, 2, 247, 254, 5, 72, 37, 2, 248, 254, 5, 74, 38, 2, 249, 250, 7, 3, 2, 2, 250, 251, 5, 56, 29, 2, 251, 252, 7, 4, 2, 2, 252, 254, 3, 2, 2, 2, 253, 239, 3, 2, 2, 2, 253, 240, 3, 2, 2, 2, 253, 241, 3, 2, 2, 2, 253, 242, 3, 2, 2, 2, 253, 243, 3, 2, 2, 2, 253, 244, 3, 2, 2, 2, 253, 245, 3, 2, 2, 2, 253, 246, 3, 2, 2, 2, 253, 247, 3, 2, 2, 2, 253, 248, 3, 2, 2, 2, 253, 249, 3, 2, 2, 2, 254, 57, 3, 2, 2, 2, 255, 256, 7, 64, 2, 2, 256, 257, 7, 25, 2, 2, 257, 258, 5, 60, 31, 2, 258, 59, 3, 2, 2, 2, 259, 272, 7, 63, 2, 2, 260, 261, 7, 3, 2, 2, 261, 266, 5, 84, 43, 2, 262, 263, 7, 10, 2, 2, 263, 265, 5, 84, 43, 2, 264, 262, 3, 2, 2, 2, 265, 268, 3, 2, 2, 2, 266, 264, 3, 2, 2, 2, 266, 267, 3, 2, 2, 2, 267, 269, 3, 2, 2, 2, 268, 266, 3, 2, 2, 2, 269, 270, 7, 4, 2, 2, 270, 272, 3, 2, 2, 2, 271, 259, 3, 2, 2, 2, 271, 260, 3, 2, 2, 2, 272, 61, 3, 2, 2, 2, 273, 274, 7, 64, 2, 2, 274, 275, 7, 26, 2, 2, 275, 276, 5, 84, 43, 2, 276, 277, 7, 23, 2, 2, 277, 278, 5, 84, 43, 2, 278, 63, 3, 2, 2, 2, 279, 280, 7, 64, 2, 2, 280, 281, 7, 27, 2, 2, 281, 282, 5, 84, 43, 2, 282, 283, 7, 28, 2, 2, 283, 284, 5, 84, 43, 2, 284, 65, 3, 2, 2, 2, 285, 286, 5, 84, 43, 2, 286, 287, 7, 26, 2, 2, 287, 288, 7, 64, 2, 2, 288, 289, 7, 23, 2, 2, 289, 290, 7, 64, 2, 2, 290, 67, 3, 2, 2, 2, 291, 292, 7, 64, 2, 2, 292, 293, 7, 29, 2, 2, 293, 297, 7, 30, 2, 2, 294, 295, 7, 64, 2, 2, 295, 297, 7, 31, 2, 2, 296, 291, 3, 2, 2, 2, 296, 294, 3, 2, 2, 2, 297, 69, 3, 2, 2, 2, 298, 299, 7, 64, 2, 2, 299, 300, 7, 29, 2, 2, 300, 301, 7, 24, 2, 2, 301, 307, 7, 30, 2, 2, 302, 303, 7, 64, 2, 2, 303, 307, 7, 32, 2, 2, 304, 305, 7, 64, 2, 2, 305, 307, 7, 33, 2, 2, 306, 298, 3, 2, 2, 2, 306, 302, 3, 2, 2, 2, 306, 304, 3, 2, 2, 2, 307, 71, 3, 2, 2, 2, 308, 309, 7, 64, 2, 2, 309, 310, 7, 29, 2, 2, 310, 314, 7, 34, 2, 2, 311, 312, 7, 64, 2, 2, 312, 314, 7, 35, 2, 2, 313, 308, 3, 2, 2, 2, 313, 311, 3, 2, 2, 2, 314, 73, 3, 2, 2, 2, 315, 316, 7, 64, 2, 2, 316, 317, 7, 29, 2, 2, 317, 318, 7, 24, 2, 2, 318, 324, 7, 34, 2, 2, 319, 320, 7, 64, 2, 2, 320, 324, 7, 36, 2, 2, 321, 322, 7, 64, 2, 2, 322, 324, 7, 37, 2, 2, 323, 315, 3, 2, 2, 2, 323, 319, 3, 2, 2, 2, 323, 321, 3, 2, 2, 2, 324, 75, 3, 2, 2, 2, 325, 326, 7, 64, 2, 2, 326, 327, 5, 78, 40, 2, 327, 328, 5, 84, 43, 2, 328, 77, 3, 2, 2, 2, 329, 330, 9, 4, 2, 2, 330, 79, 3, 2, 2, 2, 331, 332, 7, 64, 2, 2, 332, 333, 5, 82, 42, 2, 333, 334, 5, 84, 43, 2, 334, 340, 3, 2, 2, 2, 335, 336, 5, 84, 43, 2, 336, 337, 5, 82, 42, 2, 337, 338, 7, 64, 2, 2, 338, 340, 3, 2, 2, 2, 339, 331, 3, 2, 2, 2, 339, 335, 3, 2, 2, 2, 340, 81, 3, 2, 2, 2, 341, 342, 9, 5, 2, 2, 342, 83, 3, 2, 2, 2, 343, 346, 5, 86, 44, 2, 344, 346, 7, 63, 2, 2, 345, 343, 3, 2, 2, 2, 345, 344, 3, 2, 2, 2, 346, 85, 3, 2, 2, 2, 347, 348, 9, 6, 2, 2, 348, 87, 3, 2, 2, 2, 34, 89, 94, 98, 101, 104, 113, 117, 135, 140, 143, 149, 156, 163, 167, 178, 187, 197, 201, 205, 216, 224, 228, 237, 253, 266, 271, 296, 306, 313, 323, 339, 345]
\ No newline at end of file
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens
index 4df1b445f..d6d4462ab 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens
@@ -60,16 +60,18 @@ T__58=59
 T__59=60
 INPUT_VARIABLE=61
 PATH_VARIABLE=62
-BOOLEAN_LITERAL=63
-NUMBER_LITERAL=64
-DOUBLE=65
-INT=66
-ZERO=67
-STRING_LITERAL=68
-WS=69
-'select'=1
-'('=2
-')'=3
+QUOTED_PATH_VARIABLE=63
+PROP_FORMULA=64
+BOOLEAN_LITERAL=65
+NUMBER_LITERAL=66
+DOUBLE=67
+INT=68
+ZERO=69
+STRING_LITERAL=70
+WS=71
+'('=1
+')'=2
+'select'=3
 'distinct'=4
 'where'=5
 'order'=6
@@ -127,4 +129,4 @@ WS=69
 'ne'=58
 'ieq'=59
 'ine'=60
-'0'=67
+'0'=69
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
index 70c9d6c27..53ac70d05 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
@@ -23,6 +23,18 @@ public class EQLBaseListener implements EQLListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitSelect_statement(EQLParser.Select_statementContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterSelect_properties(EQLParser.Select_propertiesContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitSelect_properties(EQLParser.Select_propertiesContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -179,6 +191,18 @@ public class EQLBaseListener implements EQLListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitFetch_property_group(EQLParser.Fetch_property_groupContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterFetch_path_path(EQLParser.Fetch_path_pathContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitFetch_path_path(EQLParser.Fetch_path_pathContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp
index f7e626b43..971c21a1d 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp
@@ -1,8 +1,8 @@
 token literal names:
 null
-'select'
 '('
 ')'
+'select'
 'distinct'
 'where'
 'order'
@@ -66,6 +66,8 @@ null
 null
 null
 null
+null
+null
 '0'
 null
 null
@@ -134,6 +136,8 @@ null
 null
 INPUT_VARIABLE
 PATH_VARIABLE
+QUOTED_PATH_VARIABLE
+PROP_FORMULA
 BOOLEAN_LITERAL
 NUMBER_LITERAL
 DOUBLE
@@ -205,6 +209,8 @@ T__58
 T__59
 INPUT_VARIABLE
 PATH_VARIABLE
+QUOTED_PATH_VARIABLE
+PROP_FORMULA
 BOOLEAN_LITERAL
 NUMBER_LITERAL
 DOUBLE
@@ -221,4 +227,4 @@ mode names:
 DEFAULT_MODE
 
 atn:
-[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 71, 533, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 4, 45, 9, 45, 4, 46, 9, 46, 4, 47, 9, 47, 4, 48, 9, 48, 4, 49, 9, 49, 4, 50, 9, 50, 4, 51, 9, 51, 4, 52, 9, 52, 4, 53, 9, 53, 4, 54, 9, 54, 4, 55, 9, 55, 4, 56, 9, 56, 4, 57, 9, 57, 4, 58, 9, 58, 4, 59, 9, 59, 4, 60, 9, 60, 4, 61, 9, 61, 4, 62, 9, 62, 4, 63, 9, 63, 4, 64, 9, 64, 4, 65, 9, 65, 4, 66, 9, 66, 4, 67, 9, 67, 4, 68, 9, 68, 4, 69, 9, 69, 4, 70, 9, 70, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 23, 3, 23, 3, 24, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 27, 3, 27, 3, 27, 3, 28, 3, 28, 3, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 45, 3, 45, 3, 46, 3, 46, 3, 46, 3, 47, 3, 47, 3, 48, 3, 48, 3, 48, 3, 49, 3, 49, 3, 49, 3, 50, 3, 50, 3, 50, 3, 51, 3, 51, 3, 51, 3, 51, 3, 52, 3, 52, 3, 53, 3, 53, 3, 53, 3, 54, 3, 54, 3, 54, 3, 55, 3, 55, 3, 55, 3, 56, 3, 56, 3, 56, 3, 56, 3, 57, 3, 57, 3, 57, 3, 58, 3, 58, 3, 58, 3, 59, 3, 59, 3, 59, 3, 60, 3, 60, 3, 60, 3, 60, 3, 61, 3, 61, 3, 61, 3, 61, 3, 62, 3, 62, 3, 62, 7, 62, 464, 10, 62, 12, 62, 14, 62, 467, 11, 62, 3, 63, 3, 63, 7, 63, 471, 10, 63, 12, 63, 14, 63, 474, 11, 63, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 5, 64, 485, 10, 64, 3, 65, 5, 65, 488, 10, 65, 3, 65, 3, 65, 5, 65, 492, 10, 65, 3, 65, 3, 65, 5, 65, 496, 10, 65, 3, 66, 6, 66, 499, 10, 66, 13, 66, 14, 66, 500, 3, 66, 3, 66, 7, 66, 505, 10, 66, 12, 66, 14, 66, 508, 11, 66, 3, 67, 3, 67, 7, 67, 512, 10, 67, 12, 67, 14, 67, 515, 11, 67, 3, 68, 3, 68, 3, 69, 3, 69, 3, 69, 3, 69, 7, 69, 523, 10, 69, 12, 69, 14, 69, 526, 11, 69, 3, 69, 3, 69, 3, 70, 3, 70, 3, 70, 3, 70, 2, 2, 71, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13, 8, 15, 9, 17, 10, 19, 11, 21, 12, 23, 13, 25, 14, 27, 15, 29, 16, 31, 17, 33, 18, 35, 19, 37, 20, 39, 21, 41, 22, 43, 23, 45, 24, 47, 25, 49, 26, 51, 27, 53, 28, 55, 29, 57, 30, 59, 31, 61, 32, 63, 33, 65, 34, 67, 35, 69, 36, 71, 37, 73, 38, 75, 39, 77, 40, 79, 41, 81, 42, 83, 43, 85, 44, 87, 45, 89, 46, 91, 47, 93, 48, 95, 49, 97, 50, 99, 51, 101, 52, 103, 53, 105, 54, 107, 55, 109, 56, 111, 57, 113, 58, 115, 59, 117, 60, 119, 61, 121, 62, 123, 63, 125, 64, 127, 65, 129, 66, 131, 67, 133, 68, 135, 69, 137, 70, 139, 71, 3, 2, 9, 5, 2, 67, 92, 97, 97, 99, 124, 6, 2, 50, 59, 67, 92, 97, 97, 99, 124, 7, 2, 48, 48, 50, 59, 67, 92, 97, 97, 99, 124, 3, 2, 50, 59, 3, 2, 51, 59, 3, 2, 41, 41, 5, 2, 11, 12, 15, 15, 34, 34, 2, 544, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 2, 35, 3, 2, 2, 2, 2, 37, 3, 2, 2, 2, 2, 39, 3, 2, 2, 2, 2, 41, 3, 2, 2, 2, 2, 43, 3, 2, 2, 2, 2, 45, 3, 2, 2, 2, 2, 47, 3, 2, 2, 2, 2, 49, 3, 2, 2, 2, 2, 51, 3, 2, 2, 2, 2, 53, 3, 2, 2, 2, 2, 55, 3, 2, 2, 2, 2, 57, 3, 2, 2, 2, 2, 59, 3, 2, 2, 2, 2, 61, 3, 2, 2, 2, 2, 63, 3, 2, 2, 2, 2, 65, 3, 2, 2, 2, 2, 67, 3, 2, 2, 2, 2, 69, 3, 2, 2, 2, 2, 71, 3, 2, 2, 2, 2, 73, 3, 2, 2, 2, 2, 75, 3, 2, 2, 2, 2, 77, 3, 2, 2, 2, 2, 79, 3, 2, 2, 2, 2, 81, 3, 2, 2, 2, 2, 83, 3, 2, 2, 2, 2, 85, 3, 2, 2, 2, 2, 87, 3, 2, 2, 2, 2, 89, 3, 2, 2, 2, 2, 91, 3, 2, 2, 2, 2, 93, 3, 2, 2, 2, 2, 95, 3, 2, 2, 2, 2, 97, 3, 2, 2, 2, 2, 99, 3, 2, 2, 2, 2, 101, 3, 2, 2, 2, 2, 103, 3, 2, 2, 2, 2, 105, 3, 2, 2, 2, 2, 107, 3, 2, 2, 2, 2, 109, 3, 2, 2, 2, 2, 111, 3, 2, 2, 2, 2, 113, 3, 2, 2, 2, 2, 115, 3, 2, 2, 2, 2, 117, 3, 2, 2, 2, 2, 119, 3, 2, 2, 2, 2, 121, 3, 2, 2, 2, 2, 123, 3, 2, 2, 2, 2, 125, 3, 2, 2, 2, 2, 127, 3, 2, 2, 2, 2, 129, 3, 2, 2, 2, 2, 131, 3, 2, 2, 2, 2, 133, 3, 2, 2, 2, 2, 135, 3, 2, 2, 2, 2, 137, 3, 2, 2, 2, 2, 139, 3, 2, 2, 2, 3, 141, 3, 2, 2, 2, 5, 148, 3, 2, 2, 2, 7, 150, 3, 2, 2, 2, 9, 152, 3, 2, 2, 2, 11, 161, 3, 2, 2, 2, 13, 167, 3, 2, 2, 2, 15, 173, 3, 2, 2, 2, 17, 176, 3, 2, 2, 2, 19, 178, 3, 2, 2, 2, 21, 184, 3, 2, 2, 2, 23, 190, 3, 2, 2, 2, 25, 195, 3, 2, 2, 2, 27, 199, 3, 2, 2, 2, 29, 204, 3, 2, 2, 2, 31, 210, 3, 2, 2, 2, 33, 217, 3, 2, 2, 2, 35, 223, 3, 2, 2, 2, 37, 225, 3, 2, 2, 2, 39, 231, 3, 2, 2, 2, 41, 236, 3, 2, 2, 2, 43, 239, 3, 2, 2, 2, 45, 243, 3, 2, 2, 2, 47, 247, 3, 2, 2, 2, 49, 250, 3, 2, 2, 2, 51, 258, 3, 2, 2, 2, 53, 266, 3, 2, 2, 2, 55, 269, 3, 2, 2, 2, 57, 272, 3, 2, 2, 2, 59, 277, 3, 2, 2, 2, 61, 284, 3, 2, 2, 2, 63, 294, 3, 2, 2, 2, 65, 302, 3, 2, 2, 2, 67, 308, 3, 2, 2, 2, 69, 316, 3, 2, 2, 2, 71, 327, 3, 2, 2, 2, 73, 336, 3, 2, 2, 2, 75, 341, 3, 2, 2, 2, 77, 347, 3, 2, 2, 2, 79, 356, 3, 2, 2, 2, 81, 366, 3, 2, 2, 2, 83, 377, 3, 2, 2, 2, 85, 389, 3, 2, 2, 2, 87, 398, 3, 2, 2, 2, 89, 408, 3, 2, 2, 2, 91, 410, 3, 2, 2, 2, 93, 413, 3, 2, 2, 2, 95, 415, 3, 2, 2, 2, 97, 418, 3, 2, 2, 2, 99, 421, 3, 2, 2, 2, 101, 424, 3, 2, 2, 2, 103, 428, 3, 2, 2, 2, 105, 430, 3, 2, 2, 2, 107, 433, 3, 2, 2, 2, 109, 436, 3, 2, 2, 2, 111, 439, 3, 2, 2, 2, 113, 443, 3, 2, 2, 2, 115, 446, 3, 2, 2, 2, 117, 449, 3, 2, 2, 2, 119, 452, 3, 2, 2, 2, 121, 456, 3, 2, 2, 2, 123, 460, 3, 2, 2, 2, 125, 468, 3, 2, 2, 2, 127, 484, 3, 2, 2, 2, 129, 495, 3, 2, 2, 2, 131, 498, 3, 2, 2, 2, 133, 509, 3, 2, 2, 2, 135, 516, 3, 2, 2, 2, 137, 518, 3, 2, 2, 2, 139, 529, 3, 2, 2, 2, 141, 142, 7, 117, 2, 2, 142, 143, 7, 103, 2, 2, 143, 144, 7, 110, 2, 2, 144, 145, 7, 103, 2, 2, 145, 146, 7, 101, 2, 2, 146, 147, 7, 118, 2, 2, 147, 4, 3, 2, 2, 2, 148, 149, 7, 42, 2, 2, 149, 6, 3, 2, 2, 2, 150, 151, 7, 43, 2, 2, 151, 8, 3, 2, 2, 2, 152, 153, 7, 102, 2, 2, 153, 154, 7, 107, 2, 2, 154, 155, 7, 117, 2, 2, 155, 156, 7, 118, 2, 2, 156, 157, 7, 107, 2, 2, 157, 158, 7, 112, 2, 2, 158, 159, 7, 101, 2, 2, 159, 160, 7, 118, 2, 2, 160, 10, 3, 2, 2, 2, 161, 162, 7, 121, 2, 2, 162, 163, 7, 106, 2, 2, 163, 164, 7, 103, 2, 2, 164, 165, 7, 116, 2, 2, 165, 166, 7, 103, 2, 2, 166, 12, 3, 2, 2, 2, 167, 168, 7, 113, 2, 2, 168, 169, 7, 116, 2, 2, 169, 170, 7, 102, 2, 2, 170, 171, 7, 103, 2, 2, 171, 172, 7, 116, 2, 2, 172, 14, 3, 2, 2, 2, 173, 174, 7, 100, 2, 2, 174, 175, 7, 123, 2, 2, 175, 16, 3, 2, 2, 2, 176, 177, 7, 46, 2, 2, 177, 18, 3, 2, 2, 2, 178, 179, 7, 112, 2, 2, 179, 180, 7, 119, 2, 2, 180, 181, 7, 110, 2, 2, 181, 182, 7, 110, 2, 2, 182, 183, 7, 117, 2, 2, 183, 20, 3, 2, 2, 2, 184, 185, 7, 104, 2, 2, 185, 186, 7, 107, 2, 2, 186, 187, 7, 116, 2, 2, 187, 188, 7, 117, 2, 2, 188, 189, 7, 118, 2, 2, 189, 22, 3, 2, 2, 2, 190, 191, 7, 110, 2, 2, 191, 192, 7, 99, 2, 2, 192, 193, 7, 117, 2, 2, 193, 194, 7, 118, 2, 2, 194, 24, 3, 2, 2, 2, 195, 196, 7, 99, 2, 2, 196, 197, 7, 117, 2, 2, 197, 198, 7, 101, 2, 2, 198, 26, 3, 2, 2, 2, 199, 200, 7, 102, 2, 2, 200, 201, 7, 103, 2, 2, 201, 202, 7, 117, 2, 2, 202, 203, 7, 101, 2, 2, 203, 28, 3, 2, 2, 2, 204, 205, 7, 110, 2, 2, 205, 206, 7, 107, 2, 2, 206, 207, 7, 111, 2, 2, 207, 208, 7, 107, 2, 2, 208, 209, 7, 118, 2, 2, 209, 30, 3, 2, 2, 2, 210, 211, 7, 113, 2, 2, 211, 212, 7, 104, 2, 2, 212, 213, 7, 104, 2, 2, 213, 214, 7, 117, 2, 2, 214, 215, 7, 103, 2, 2, 215, 216, 7, 118, 2, 2, 216, 32, 3, 2, 2, 2, 217, 218, 7, 104, 2, 2, 218, 219, 7, 103, 2, 2, 219, 220, 7, 118, 2, 2, 220, 221, 7, 101, 2, 2, 221, 222, 7, 106, 2, 2, 222, 34, 3, 2, 2, 2, 223, 224, 7, 45, 2, 2, 224, 36, 3, 2, 2, 2, 225, 226, 7, 115, 2, 2, 226, 227, 7, 119, 2, 2, 227, 228, 7, 103, 2, 2, 228, 229, 7, 116, 2, 2, 229, 230, 7, 123, 2, 2, 230, 38, 3, 2, 2, 2, 231, 232, 7, 110, 2, 2, 232, 233, 7, 99, 2, 2, 233, 234, 7, 124, 2, 2, 234, 235, 7, 123, 2, 2, 235, 40, 3, 2, 2, 2, 236, 237, 7, 113, 2, 2, 237, 238, 7, 116, 2, 2, 238, 42, 3, 2, 2, 2, 239, 240, 7, 99, 2, 2, 240, 241, 7, 112, 2, 2, 241, 242, 7, 102, 2, 2, 242, 44, 3, 2, 2, 2, 243, 244, 7, 112, 2, 2, 244, 245, 7, 113, 2, 2, 245, 246, 7, 118, 2, 2, 246, 46, 3, 2, 2, 2, 247, 248, 7, 107, 2, 2, 248, 249, 7, 112, 2, 2, 249, 48, 3, 2, 2, 2, 250, 251, 7, 100, 2, 2, 251, 252, 7, 103, 2, 2, 252, 253, 7, 118, 2, 2, 253, 254, 7, 121, 2, 2, 254, 255, 7, 103, 2, 2, 255, 256, 7, 103, 2, 2, 256, 257, 7, 112, 2, 2, 257, 50, 3, 2, 2, 2, 258, 259, 7, 107, 2, 2, 259, 260, 7, 112, 2, 2, 260, 261, 7, 116, 2, 2, 261, 262, 7, 99, 2, 2, 262, 263, 7, 112, 2, 2, 263, 264, 7, 105, 2, 2, 264, 265, 7, 103, 2, 2, 265, 52, 3, 2, 2, 2, 266, 267, 7, 118, 2, 2, 267, 268, 7, 113, 2, 2, 268, 54, 3, 2, 2, 2, 269, 270, 7, 107, 2, 2, 270, 271, 7, 117, 2, 2, 271, 56, 3, 2, 2, 2, 272, 273, 7, 112, 2, 2, 273, 274, 7, 119, 2, 2, 274, 275, 7, 110, 2, 2, 275, 276, 7, 110, 2, 2, 276, 58, 3, 2, 2, 2, 277, 278, 7, 107, 2, 2, 278, 279, 7, 117, 2, 2, 279, 280, 7, 80, 2, 2, 280, 281, 7, 119, 2, 2, 281, 282, 7, 110, 2, 2, 282, 283, 7, 110, 2, 2, 283, 60, 3, 2, 2, 2, 284, 285, 7, 107, 2, 2, 285, 286, 7, 117, 2, 2, 286, 287, 7, 80, 2, 2, 287, 288, 7, 113, 2, 2, 288, 289, 7, 118, 2, 2, 289, 290, 7, 80, 2, 2, 290, 291, 7, 119, 2, 2, 291, 292, 7, 110, 2, 2, 292, 293, 7, 110, 2, 2, 293, 62, 3, 2, 2, 2, 294, 295, 7, 112, 2, 2, 295, 296, 7, 113, 2, 2, 296, 297, 7, 118, 2, 2, 297, 298, 7, 80, 2, 2, 298, 299, 7, 119, 2, 2, 299, 300, 7, 110, 2, 2, 300, 301, 7, 110, 2, 2, 301, 64, 3, 2, 2, 2, 302, 303, 7, 103, 2, 2, 303, 304, 7, 111, 2, 2, 304, 305, 7, 114, 2, 2, 305, 306, 7, 118, 2, 2, 306, 307, 7, 123, 2, 2, 307, 66, 3, 2, 2, 2, 308, 309, 7, 107, 2, 2, 309, 310, 7, 117, 2, 2, 310, 311, 7, 71, 2, 2, 311, 312, 7, 111, 2, 2, 312, 313, 7, 114, 2, 2, 313, 314, 7, 118, 2, 2, 314, 315, 7, 123, 2, 2, 315, 68, 3, 2, 2, 2, 316, 317, 7, 107, 2, 2, 317, 318, 7, 117, 2, 2, 318, 319, 7, 80, 2, 2, 319, 320, 7, 113, 2, 2, 320, 321, 7, 118, 2, 2, 321, 322, 7, 71, 2, 2, 322, 323, 7, 111, 2, 2, 323, 324, 7, 114, 2, 2, 324, 325, 7, 118, 2, 2, 325, 326, 7, 123, 2, 2, 326, 70, 3, 2, 2, 2, 327, 328, 7, 112, 2, 2, 328, 329, 7, 113, 2, 2, 329, 330, 7, 118, 2, 2, 330, 331, 7, 71, 2, 2, 331, 332, 7, 111, 2, 2, 332, 333, 7, 114, 2, 2, 333, 334, 7, 118, 2, 2, 334, 335, 7, 123, 2, 2, 335, 72, 3, 2, 2, 2, 336, 337, 7, 110, 2, 2, 337, 338, 7, 107, 2, 2, 338, 339, 7, 109, 2, 2, 339, 340, 7, 103, 2, 2, 340, 74, 3, 2, 2, 2, 341, 342, 7, 107, 2, 2, 342, 343, 7, 110, 2, 2, 343, 344, 7, 107, 2, 2, 344, 345, 7, 109, 2, 2, 345, 346, 7, 103, 2, 2, 346, 76, 3, 2, 2, 2, 347, 348, 7, 101, 2, 2, 348, 349, 7, 113, 2, 2, 349, 350, 7, 112, 2, 2, 350, 351, 7, 118, 2, 2, 351, 352, 7, 99, 2, 2, 352, 353, 7, 107, 2, 2, 353, 354, 7, 112, 2, 2, 354, 355, 7, 117, 2, 2, 355, 78, 3, 2, 2, 2, 356, 357, 7, 107, 2, 2, 357, 358, 7, 101, 2, 2, 358, 359, 7, 113, 2, 2, 359, 360, 7, 112, 2, 2, 360, 361, 7, 118, 2, 2, 361, 362, 7, 99, 2, 2, 362, 363, 7, 107, 2, 2, 363, 364, 7, 112, 2, 2, 364, 365, 7, 117, 2, 2, 365, 80, 3, 2, 2, 2, 366, 367, 7, 117, 2, 2, 367, 368, 7, 118, 2, 2, 368, 369, 7, 99, 2, 2, 369, 370, 7, 116, 2, 2, 370, 371, 7, 118, 2, 2, 371, 372, 7, 117, 2, 2, 372, 373, 7, 89, 2, 2, 373, 374, 7, 107, 2, 2, 374, 375, 7, 118, 2, 2, 375, 376, 7, 106, 2, 2, 376, 82, 3, 2, 2, 2, 377, 378, 7, 107, 2, 2, 378, 379, 7, 117, 2, 2, 379, 380, 7, 118, 2, 2, 380, 381, 7, 99, 2, 2, 381, 382, 7, 116, 2, 2, 382, 383, 7, 118, 2, 2, 383, 384, 7, 117, 2, 2, 384, 385, 7, 89, 2, 2, 385, 386, 7, 107, 2, 2, 386, 387, 7, 118, 2, 2, 387, 388, 7, 106, 2, 2, 388, 84, 3, 2, 2, 2, 389, 390, 7, 103, 2, 2, 390, 391, 7, 112, 2, 2, 391, 392, 7, 102, 2, 2, 392, 393, 7, 117, 2, 2, 393, 394, 7, 89, 2, 2, 394, 395, 7, 107, 2, 2, 395, 396, 7, 118, 2, 2, 396, 397, 7, 106, 2, 2, 397, 86, 3, 2, 2, 2, 398, 399, 7, 107, 2, 2, 399, 400, 7, 103, 2, 2, 400, 401, 7, 112, 2, 2, 401, 402, 7, 102, 2, 2, 402, 403, 7, 117, 2, 2, 403, 404, 7, 89, 2, 2, 404, 405, 7, 107, 2, 2, 405, 406, 7, 118, 2, 2, 406, 407, 7, 106, 2, 2, 407, 88, 3, 2, 2, 2, 408, 409, 7, 63, 2, 2, 409, 90, 3, 2, 2, 2, 410, 411, 7, 103, 2, 2, 411, 412, 7, 115, 2, 2, 412, 92, 3, 2, 2, 2, 413, 414, 7, 64, 2, 2, 414, 94, 3, 2, 2, 2, 415, 416, 7, 105, 2, 2, 416, 417, 7, 118, 2, 2, 417, 96, 3, 2, 2, 2, 418, 419, 7, 64, 2, 2, 419, 420, 7, 63, 2, 2, 420, 98, 3, 2, 2, 2, 421, 422, 7, 105, 2, 2, 422, 423, 7, 103, 2, 2, 423, 100, 3, 2, 2, 2, 424, 425, 7, 105, 2, 2, 425, 426, 7, 118, 2, 2, 426, 427, 7, 103, 2, 2, 427, 102, 3, 2, 2, 2, 428, 429, 7, 62, 2, 2, 429, 104, 3, 2, 2, 2, 430, 431, 7, 110, 2, 2, 431, 432, 7, 118, 2, 2, 432, 106, 3, 2, 2, 2, 433, 434, 7, 62, 2, 2, 434, 435, 7, 63, 2, 2, 435, 108, 3, 2, 2, 2, 436, 437, 7, 110, 2, 2, 437, 438, 7, 103, 2, 2, 438, 110, 3, 2, 2, 2, 439, 440, 7, 110, 2, 2, 440, 441, 7, 118, 2, 2, 441, 442, 7, 103, 2, 2, 442, 112, 3, 2, 2, 2, 443, 444, 7, 62, 2, 2, 444, 445, 7, 64, 2, 2, 445, 114, 3, 2, 2, 2, 446, 447, 7, 35, 2, 2, 447, 448, 7, 63, 2, 2, 448, 116, 3, 2, 2, 2, 449, 450, 7, 112, 2, 2, 450, 451, 7, 103, 2, 2, 451, 118, 3, 2, 2, 2, 452, 453, 7, 107, 2, 2, 453, 454, 7, 103, 2, 2, 454, 455, 7, 115, 2, 2, 455, 120, 3, 2, 2, 2, 456, 457, 7, 107, 2, 2, 457, 458, 7, 112, 2, 2, 458, 459, 7, 103, 2, 2, 459, 122, 3, 2, 2, 2, 460, 461, 7, 60, 2, 2, 461, 465, 9, 2, 2, 2, 462, 464, 9, 3, 2, 2, 463, 462, 3, 2, 2, 2, 464, 467, 3, 2, 2, 2, 465, 463, 3, 2, 2, 2, 465, 466, 3, 2, 2, 2, 466, 124, 3, 2, 2, 2, 467, 465, 3, 2, 2, 2, 468, 472, 9, 2, 2, 2, 469, 471, 9, 4, 2, 2, 470, 469, 3, 2, 2, 2, 471, 474, 3, 2, 2, 2, 472, 470, 3, 2, 2, 2, 472, 473, 3, 2, 2, 2, 473, 126, 3, 2, 2, 2, 474, 472, 3, 2, 2, 2, 475, 476, 7, 118, 2, 2, 476, 477, 7, 116, 2, 2, 477, 478, 7, 119, 2, 2, 478, 485, 7, 103, 2, 2, 479, 480, 7, 104, 2, 2, 480, 481, 7, 99, 2, 2, 481, 482, 7, 110, 2, 2, 482, 483, 7, 117, 2, 2, 483, 485, 7, 103, 2, 2, 484, 475, 3, 2, 2, 2, 484, 479, 3, 2, 2, 2, 485, 128, 3, 2, 2, 2, 486, 488, 7, 47, 2, 2, 487, 486, 3, 2, 2, 2, 487, 488, 3, 2, 2, 2, 488, 489, 3, 2, 2, 2, 489, 496, 5, 131, 66, 2, 490, 492, 7, 47, 2, 2, 491, 490, 3, 2, 2, 2, 491, 492, 3, 2, 2, 2, 492, 493, 3, 2, 2, 2, 493, 496, 5, 133, 67, 2, 494, 496, 5, 135, 68, 2, 495, 487, 3, 2, 2, 2, 495, 491, 3, 2, 2, 2, 495, 494, 3, 2, 2, 2, 496, 130, 3, 2, 2, 2, 497, 499, 9, 5, 2, 2, 498, 497, 3, 2, 2, 2, 499, 500, 3, 2, 2, 2, 500, 498, 3, 2, 2, 2, 500, 501, 3, 2, 2, 2, 501, 502, 3, 2, 2, 2, 502, 506, 7, 48, 2, 2, 503, 505, 9, 5, 2, 2, 504, 503, 3, 2, 2, 2, 505, 508, 3, 2, 2, 2, 506, 504, 3, 2, 2, 2, 506, 507, 3, 2, 2, 2, 507, 132, 3, 2, 2, 2, 508, 506, 3, 2, 2, 2, 509, 513, 9, 6, 2, 2, 510, 512, 9, 5, 2, 2, 511, 510, 3, 2, 2, 2, 512, 515, 3, 2, 2, 2, 513, 511, 3, 2, 2, 2, 513, 514, 3, 2, 2, 2, 514, 134, 3, 2, 2, 2, 515, 513, 3, 2, 2, 2, 516, 517, 7, 50, 2, 2, 517, 136, 3, 2, 2, 2, 518, 524, 7, 41, 2, 2, 519, 523, 10, 7, 2, 2, 520, 521, 7, 41, 2, 2, 521, 523, 7, 41, 2, 2, 522, 519, 3, 2, 2, 2, 522, 520, 3, 2, 2, 2, 523, 526, 3, 2, 2, 2, 524, 522, 3, 2, 2, 2, 524, 525, 3, 2, 2, 2, 525, 527, 3, 2, 2, 2, 526, 524, 3, 2, 2, 2, 527, 528, 7, 41, 2, 2, 528, 138, 3, 2, 2, 2, 529, 530, 9, 8, 2, 2, 530, 531, 3, 2, 2, 2, 531, 532, 8, 70, 2, 2, 532, 140, 3, 2, 2, 2, 14, 2, 465, 472, 484, 487, 491, 495, 500, 506, 513, 522, 524, 3, 8, 2, 2]
\ No newline at end of file
+[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 73, 585, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 4, 45, 9, 45, 4, 46, 9, 46, 4, 47, 9, 47, 4, 48, 9, 48, 4, 49, 9, 49, 4, 50, 9, 50, 4, 51, 9, 51, 4, 52, 9, 52, 4, 53, 9, 53, 4, 54, 9, 54, 4, 55, 9, 55, 4, 56, 9, 56, 4, 57, 9, 57, 4, 58, 9, 58, 4, 59, 9, 59, 4, 60, 9, 60, 4, 61, 9, 61, 4, 62, 9, 62, 4, 63, 9, 63, 4, 64, 9, 64, 4, 65, 9, 65, 4, 66, 9, 66, 4, 67, 9, 67, 4, 68, 9, 68, 4, 69, 9, 69, 4, 70, 9, 70, 4, 71, 9, 71, 4, 72, 9, 72, 3, 2, 3, 2, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 23, 3, 23, 3, 24, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 27, 3, 27, 3, 27, 3, 28, 3, 28, 3, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 45, 3, 45, 3, 46, 3, 46, 3, 46, 3, 47, 3, 47, 3, 48, 3, 48, 3, 48, 3, 49, 3, 49, 3, 49, 3, 50, 3, 50, 3, 50, 3, 51, 3, 51, 3, 51, 3, 51, 3, 52, 3, 52, 3, 53, 3, 53, 3, 53, 3, 54, 3, 54, 3, 54, 3, 55, 3, 55, 3, 55, 3, 56, 3, 56, 3, 56, 3, 56, 3, 57, 3, 57, 3, 57, 3, 58, 3, 58, 3, 58, 3, 59, 3, 59, 3, 59, 3, 60, 3, 60, 3, 60, 3, 60, 3, 61, 3, 61, 3, 61, 3, 61, 3, 62, 3, 62, 3, 62, 7, 62, 468, 10, 62, 12, 62, 14, 62, 471, 11, 62, 3, 63, 3, 63, 7, 63, 475, 10, 63, 12, 63, 14, 63, 478, 11, 63, 3, 64, 3, 64, 3, 64, 3, 64, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 5, 65, 526, 10, 65, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 5, 66, 537, 10, 66, 3, 67, 5, 67, 540, 10, 67, 3, 67, 3, 67, 5, 67, 544, 10, 67, 3, 67, 3, 67, 5, 67, 548, 10, 67, 3, 68, 6, 68, 551, 10, 68, 13, 68, 14, 68, 552, 3, 68, 3, 68, 7, 68, 557, 10, 68, 12, 68, 14, 68, 560, 11, 68, 3, 69, 3, 69, 7, 69, 564, 10, 69, 12, 69, 14, 69, 567, 11, 69, 3, 70, 3, 70, 3, 71, 3, 71, 3, 71, 3, 71, 7, 71, 575, 10, 71, 12, 71, 14, 71, 578, 11, 71, 3, 71, 3, 71, 3, 72, 3, 72, 3, 72, 3, 72, 2, 2, 73, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13, 8, 15, 9, 17, 10, 19, 11, 21, 12, 23, 13, 25, 14, 27, 15, 29, 16, 31, 17, 33, 18, 35, 19, 37, 20, 39, 21, 41, 22, 43, 23, 45, 24, 47, 25, 49, 26, 51, 27, 53, 28, 55, 29, 57, 30, 59, 31, 61, 32, 63, 33, 65, 34, 67, 35, 69, 36, 71, 37, 73, 38, 75, 39, 77, 40, 79, 41, 81, 42, 83, 43, 85, 44, 87, 45, 89, 46, 91, 47, 93, 48, 95, 49, 97, 50, 99, 51, 101, 52, 103, 53, 105, 54, 107, 55, 109, 56, 111, 57, 113, 58, 115, 59, 117, 60, 119, 61, 121, 62, 123, 63, 125, 64, 127, 65, 129, 66, 131, 67, 133, 68, 135, 69, 137, 70, 139, 71, 141, 72, 143, 73, 3, 2, 9, 5, 2, 67, 92, 97, 97, 99, 124, 6, 2, 50, 59, 67, 92, 97, 97, 99, 124, 7, 2, 48, 48, 50, 59, 67, 92, 97, 97, 99, 124, 3, 2, 50, 59, 3, 2, 51, 59, 3, 2, 41, 41, 5, 2, 11, 12, 15, 15, 34, 34, 2, 600, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 2, 35, 3, 2, 2, 2, 2, 37, 3, 2, 2, 2, 2, 39, 3, 2, 2, 2, 2, 41, 3, 2, 2, 2, 2, 43, 3, 2, 2, 2, 2, 45, 3, 2, 2, 2, 2, 47, 3, 2, 2, 2, 2, 49, 3, 2, 2, 2, 2, 51, 3, 2, 2, 2, 2, 53, 3, 2, 2, 2, 2, 55, 3, 2, 2, 2, 2, 57, 3, 2, 2, 2, 2, 59, 3, 2, 2, 2, 2, 61, 3, 2, 2, 2, 2, 63, 3, 2, 2, 2, 2, 65, 3, 2, 2, 2, 2, 67, 3, 2, 2, 2, 2, 69, 3, 2, 2, 2, 2, 71, 3, 2, 2, 2, 2, 73, 3, 2, 2, 2, 2, 75, 3, 2, 2, 2, 2, 77, 3, 2, 2, 2, 2, 79, 3, 2, 2, 2, 2, 81, 3, 2, 2, 2, 2, 83, 3, 2, 2, 2, 2, 85, 3, 2, 2, 2, 2, 87, 3, 2, 2, 2, 2, 89, 3, 2, 2, 2, 2, 91, 3, 2, 2, 2, 2, 93, 3, 2, 2, 2, 2, 95, 3, 2, 2, 2, 2, 97, 3, 2, 2, 2, 2, 99, 3, 2, 2, 2, 2, 101, 3, 2, 2, 2, 2, 103, 3, 2, 2, 2, 2, 105, 3, 2, 2, 2, 2, 107, 3, 2, 2, 2, 2, 109, 3, 2, 2, 2, 2, 111, 3, 2, 2, 2, 2, 113, 3, 2, 2, 2, 2, 115, 3, 2, 2, 2, 2, 117, 3, 2, 2, 2, 2, 119, 3, 2, 2, 2, 2, 121, 3, 2, 2, 2, 2, 123, 3, 2, 2, 2, 2, 125, 3, 2, 2, 2, 2, 127, 3, 2, 2, 2, 2, 129, 3, 2, 2, 2, 2, 131, 3, 2, 2, 2, 2, 133, 3, 2, 2, 2, 2, 135, 3, 2, 2, 2, 2, 137, 3, 2, 2, 2, 2, 139, 3, 2, 2, 2, 2, 141, 3, 2, 2, 2, 2, 143, 3, 2, 2, 2, 3, 145, 3, 2, 2, 2, 5, 147, 3, 2, 2, 2, 7, 149, 3, 2, 2, 2, 9, 156, 3, 2, 2, 2, 11, 165, 3, 2, 2, 2, 13, 171, 3, 2, 2, 2, 15, 177, 3, 2, 2, 2, 17, 180, 3, 2, 2, 2, 19, 182, 3, 2, 2, 2, 21, 188, 3, 2, 2, 2, 23, 194, 3, 2, 2, 2, 25, 199, 3, 2, 2, 2, 27, 203, 3, 2, 2, 2, 29, 208, 3, 2, 2, 2, 31, 214, 3, 2, 2, 2, 33, 221, 3, 2, 2, 2, 35, 227, 3, 2, 2, 2, 37, 229, 3, 2, 2, 2, 39, 235, 3, 2, 2, 2, 41, 240, 3, 2, 2, 2, 43, 243, 3, 2, 2, 2, 45, 247, 3, 2, 2, 2, 47, 251, 3, 2, 2, 2, 49, 254, 3, 2, 2, 2, 51, 262, 3, 2, 2, 2, 53, 270, 3, 2, 2, 2, 55, 273, 3, 2, 2, 2, 57, 276, 3, 2, 2, 2, 59, 281, 3, 2, 2, 2, 61, 288, 3, 2, 2, 2, 63, 298, 3, 2, 2, 2, 65, 306, 3, 2, 2, 2, 67, 312, 3, 2, 2, 2, 69, 320, 3, 2, 2, 2, 71, 331, 3, 2, 2, 2, 73, 340, 3, 2, 2, 2, 75, 345, 3, 2, 2, 2, 77, 351, 3, 2, 2, 2, 79, 360, 3, 2, 2, 2, 81, 370, 3, 2, 2, 2, 83, 381, 3, 2, 2, 2, 85, 393, 3, 2, 2, 2, 87, 402, 3, 2, 2, 2, 89, 412, 3, 2, 2, 2, 91, 414, 3, 2, 2, 2, 93, 417, 3, 2, 2, 2, 95, 419, 3, 2, 2, 2, 97, 422, 3, 2, 2, 2, 99, 425, 3, 2, 2, 2, 101, 428, 3, 2, 2, 2, 103, 432, 3, 2, 2, 2, 105, 434, 3, 2, 2, 2, 107, 437, 3, 2, 2, 2, 109, 440, 3, 2, 2, 2, 111, 443, 3, 2, 2, 2, 113, 447, 3, 2, 2, 2, 115, 450, 3, 2, 2, 2, 117, 453, 3, 2, 2, 2, 119, 456, 3, 2, 2, 2, 121, 460, 3, 2, 2, 2, 123, 464, 3, 2, 2, 2, 125, 472, 3, 2, 2, 2, 127, 479, 3, 2, 2, 2, 129, 525, 3, 2, 2, 2, 131, 536, 3, 2, 2, 2, 133, 547, 3, 2, 2, 2, 135, 550, 3, 2, 2, 2, 137, 561, 3, 2, 2, 2, 139, 568, 3, 2, 2, 2, 141, 570, 3, 2, 2, 2, 143, 581, 3, 2, 2, 2, 145, 146, 7, 42, 2, 2, 146, 4, 3, 2, 2, 2, 147, 148, 7, 43, 2, 2, 148, 6, 3, 2, 2, 2, 149, 150, 7, 117, 2, 2, 150, 151, 7, 103, 2, 2, 151, 152, 7, 110, 2, 2, 152, 153, 7, 103, 2, 2, 153, 154, 7, 101, 2, 2, 154, 155, 7, 118, 2, 2, 155, 8, 3, 2, 2, 2, 156, 157, 7, 102, 2, 2, 157, 158, 7, 107, 2, 2, 158, 159, 7, 117, 2, 2, 159, 160, 7, 118, 2, 2, 160, 161, 7, 107, 2, 2, 161, 162, 7, 112, 2, 2, 162, 163, 7, 101, 2, 2, 163, 164, 7, 118, 2, 2, 164, 10, 3, 2, 2, 2, 165, 166, 7, 121, 2, 2, 166, 167, 7, 106, 2, 2, 167, 168, 7, 103, 2, 2, 168, 169, 7, 116, 2, 2, 169, 170, 7, 103, 2, 2, 170, 12, 3, 2, 2, 2, 171, 172, 7, 113, 2, 2, 172, 173, 7, 116, 2, 2, 173, 174, 7, 102, 2, 2, 174, 175, 7, 103, 2, 2, 175, 176, 7, 116, 2, 2, 176, 14, 3, 2, 2, 2, 177, 178, 7, 100, 2, 2, 178, 179, 7, 123, 2, 2, 179, 16, 3, 2, 2, 2, 180, 181, 7, 46, 2, 2, 181, 18, 3, 2, 2, 2, 182, 183, 7, 112, 2, 2, 183, 184, 7, 119, 2, 2, 184, 185, 7, 110, 2, 2, 185, 186, 7, 110, 2, 2, 186, 187, 7, 117, 2, 2, 187, 20, 3, 2, 2, 2, 188, 189, 7, 104, 2, 2, 189, 190, 7, 107, 2, 2, 190, 191, 7, 116, 2, 2, 191, 192, 7, 117, 2, 2, 192, 193, 7, 118, 2, 2, 193, 22, 3, 2, 2, 2, 194, 195, 7, 110, 2, 2, 195, 196, 7, 99, 2, 2, 196, 197, 7, 117, 2, 2, 197, 198, 7, 118, 2, 2, 198, 24, 3, 2, 2, 2, 199, 200, 7, 99, 2, 2, 200, 201, 7, 117, 2, 2, 201, 202, 7, 101, 2, 2, 202, 26, 3, 2, 2, 2, 203, 204, 7, 102, 2, 2, 204, 205, 7, 103, 2, 2, 205, 206, 7, 117, 2, 2, 206, 207, 7, 101, 2, 2, 207, 28, 3, 2, 2, 2, 208, 209, 7, 110, 2, 2, 209, 210, 7, 107, 2, 2, 210, 211, 7, 111, 2, 2, 211, 212, 7, 107, 2, 2, 212, 213, 7, 118, 2, 2, 213, 30, 3, 2, 2, 2, 214, 215, 7, 113, 2, 2, 215, 216, 7, 104, 2, 2, 216, 217, 7, 104, 2, 2, 217, 218, 7, 117, 2, 2, 218, 219, 7, 103, 2, 2, 219, 220, 7, 118, 2, 2, 220, 32, 3, 2, 2, 2, 221, 222, 7, 104, 2, 2, 222, 223, 7, 103, 2, 2, 223, 224, 7, 118, 2, 2, 224, 225, 7, 101, 2, 2, 225, 226, 7, 106, 2, 2, 226, 34, 3, 2, 2, 2, 227, 228, 7, 45, 2, 2, 228, 36, 3, 2, 2, 2, 229, 230, 7, 115, 2, 2, 230, 231, 7, 119, 2, 2, 231, 232, 7, 103, 2, 2, 232, 233, 7, 116, 2, 2, 233, 234, 7, 123, 2, 2, 234, 38, 3, 2, 2, 2, 235, 236, 7, 110, 2, 2, 236, 237, 7, 99, 2, 2, 237, 238, 7, 124, 2, 2, 238, 239, 7, 123, 2, 2, 239, 40, 3, 2, 2, 2, 240, 241, 7, 113, 2, 2, 241, 242, 7, 116, 2, 2, 242, 42, 3, 2, 2, 2, 243, 244, 7, 99, 2, 2, 244, 245, 7, 112, 2, 2, 245, 246, 7, 102, 2, 2, 246, 44, 3, 2, 2, 2, 247, 248, 7, 112, 2, 2, 248, 249, 7, 113, 2, 2, 249, 250, 7, 118, 2, 2, 250, 46, 3, 2, 2, 2, 251, 252, 7, 107, 2, 2, 252, 253, 7, 112, 2, 2, 253, 48, 3, 2, 2, 2, 254, 255, 7, 100, 2, 2, 255, 256, 7, 103, 2, 2, 256, 257, 7, 118, 2, 2, 257, 258, 7, 121, 2, 2, 258, 259, 7, 103, 2, 2, 259, 260, 7, 103, 2, 2, 260, 261, 7, 112, 2, 2, 261, 50, 3, 2, 2, 2, 262, 263, 7, 107, 2, 2, 263, 264, 7, 112, 2, 2, 264, 265, 7, 116, 2, 2, 265, 266, 7, 99, 2, 2, 266, 267, 7, 112, 2, 2, 267, 268, 7, 105, 2, 2, 268, 269, 7, 103, 2, 2, 269, 52, 3, 2, 2, 2, 270, 271, 7, 118, 2, 2, 271, 272, 7, 113, 2, 2, 272, 54, 3, 2, 2, 2, 273, 274, 7, 107, 2, 2, 274, 275, 7, 117, 2, 2, 275, 56, 3, 2, 2, 2, 276, 277, 7, 112, 2, 2, 277, 278, 7, 119, 2, 2, 278, 279, 7, 110, 2, 2, 279, 280, 7, 110, 2, 2, 280, 58, 3, 2, 2, 2, 281, 282, 7, 107, 2, 2, 282, 283, 7, 117, 2, 2, 283, 284, 7, 80, 2, 2, 284, 285, 7, 119, 2, 2, 285, 286, 7, 110, 2, 2, 286, 287, 7, 110, 2, 2, 287, 60, 3, 2, 2, 2, 288, 289, 7, 107, 2, 2, 289, 290, 7, 117, 2, 2, 290, 291, 7, 80, 2, 2, 291, 292, 7, 113, 2, 2, 292, 293, 7, 118, 2, 2, 293, 294, 7, 80, 2, 2, 294, 295, 7, 119, 2, 2, 295, 296, 7, 110, 2, 2, 296, 297, 7, 110, 2, 2, 297, 62, 3, 2, 2, 2, 298, 299, 7, 112, 2, 2, 299, 300, 7, 113, 2, 2, 300, 301, 7, 118, 2, 2, 301, 302, 7, 80, 2, 2, 302, 303, 7, 119, 2, 2, 303, 304, 7, 110, 2, 2, 304, 305, 7, 110, 2, 2, 305, 64, 3, 2, 2, 2, 306, 307, 7, 103, 2, 2, 307, 308, 7, 111, 2, 2, 308, 309, 7, 114, 2, 2, 309, 310, 7, 118, 2, 2, 310, 311, 7, 123, 2, 2, 311, 66, 3, 2, 2, 2, 312, 313, 7, 107, 2, 2, 313, 314, 7, 117, 2, 2, 314, 315, 7, 71, 2, 2, 315, 316, 7, 111, 2, 2, 316, 317, 7, 114, 2, 2, 317, 318, 7, 118, 2, 2, 318, 319, 7, 123, 2, 2, 319, 68, 3, 2, 2, 2, 320, 321, 7, 107, 2, 2, 321, 322, 7, 117, 2, 2, 322, 323, 7, 80, 2, 2, 323, 324, 7, 113, 2, 2, 324, 325, 7, 118, 2, 2, 325, 326, 7, 71, 2, 2, 326, 327, 7, 111, 2, 2, 327, 328, 7, 114, 2, 2, 328, 329, 7, 118, 2, 2, 329, 330, 7, 123, 2, 2, 330, 70, 3, 2, 2, 2, 331, 332, 7, 112, 2, 2, 332, 333, 7, 113, 2, 2, 333, 334, 7, 118, 2, 2, 334, 335, 7, 71, 2, 2, 335, 336, 7, 111, 2, 2, 336, 337, 7, 114, 2, 2, 337, 338, 7, 118, 2, 2, 338, 339, 7, 123, 2, 2, 339, 72, 3, 2, 2, 2, 340, 341, 7, 110, 2, 2, 341, 342, 7, 107, 2, 2, 342, 343, 7, 109, 2, 2, 343, 344, 7, 103, 2, 2, 344, 74, 3, 2, 2, 2, 345, 346, 7, 107, 2, 2, 346, 347, 7, 110, 2, 2, 347, 348, 7, 107, 2, 2, 348, 349, 7, 109, 2, 2, 349, 350, 7, 103, 2, 2, 350, 76, 3, 2, 2, 2, 351, 352, 7, 101, 2, 2, 352, 353, 7, 113, 2, 2, 353, 354, 7, 112, 2, 2, 354, 355, 7, 118, 2, 2, 355, 356, 7, 99, 2, 2, 356, 357, 7, 107, 2, 2, 357, 358, 7, 112, 2, 2, 358, 359, 7, 117, 2, 2, 359, 78, 3, 2, 2, 2, 360, 361, 7, 107, 2, 2, 361, 362, 7, 101, 2, 2, 362, 363, 7, 113, 2, 2, 363, 364, 7, 112, 2, 2, 364, 365, 7, 118, 2, 2, 365, 366, 7, 99, 2, 2, 366, 367, 7, 107, 2, 2, 367, 368, 7, 112, 2, 2, 368, 369, 7, 117, 2, 2, 369, 80, 3, 2, 2, 2, 370, 371, 7, 117, 2, 2, 371, 372, 7, 118, 2, 2, 372, 373, 7, 99, 2, 2, 373, 374, 7, 116, 2, 2, 374, 375, 7, 118, 2, 2, 375, 376, 7, 117, 2, 2, 376, 377, 7, 89, 2, 2, 377, 378, 7, 107, 2, 2, 378, 379, 7, 118, 2, 2, 379, 380, 7, 106, 2, 2, 380, 82, 3, 2, 2, 2, 381, 382, 7, 107, 2, 2, 382, 383, 7, 117, 2, 2, 383, 384, 7, 118, 2, 2, 384, 385, 7, 99, 2, 2, 385, 386, 7, 116, 2, 2, 386, 387, 7, 118, 2, 2, 387, 388, 7, 117, 2, 2, 388, 389, 7, 89, 2, 2, 389, 390, 7, 107, 2, 2, 390, 391, 7, 118, 2, 2, 391, 392, 7, 106, 2, 2, 392, 84, 3, 2, 2, 2, 393, 394, 7, 103, 2, 2, 394, 395, 7, 112, 2, 2, 395, 396, 7, 102, 2, 2, 396, 397, 7, 117, 2, 2, 397, 398, 7, 89, 2, 2, 398, 399, 7, 107, 2, 2, 399, 400, 7, 118, 2, 2, 400, 401, 7, 106, 2, 2, 401, 86, 3, 2, 2, 2, 402, 403, 7, 107, 2, 2, 403, 404, 7, 103, 2, 2, 404, 405, 7, 112, 2, 2, 405, 406, 7, 102, 2, 2, 406, 407, 7, 117, 2, 2, 407, 408, 7, 89, 2, 2, 408, 409, 7, 107, 2, 2, 409, 410, 7, 118, 2, 2, 410, 411, 7, 106, 2, 2, 411, 88, 3, 2, 2, 2, 412, 413, 7, 63, 2, 2, 413, 90, 3, 2, 2, 2, 414, 415, 7, 103, 2, 2, 415, 416, 7, 115, 2, 2, 416, 92, 3, 2, 2, 2, 417, 418, 7, 64, 2, 2, 418, 94, 3, 2, 2, 2, 419, 420, 7, 105, 2, 2, 420, 421, 7, 118, 2, 2, 421, 96, 3, 2, 2, 2, 422, 423, 7, 64, 2, 2, 423, 424, 7, 63, 2, 2, 424, 98, 3, 2, 2, 2, 425, 426, 7, 105, 2, 2, 426, 427, 7, 103, 2, 2, 427, 100, 3, 2, 2, 2, 428, 429, 7, 105, 2, 2, 429, 430, 7, 118, 2, 2, 430, 431, 7, 103, 2, 2, 431, 102, 3, 2, 2, 2, 432, 433, 7, 62, 2, 2, 433, 104, 3, 2, 2, 2, 434, 435, 7, 110, 2, 2, 435, 436, 7, 118, 2, 2, 436, 106, 3, 2, 2, 2, 437, 438, 7, 62, 2, 2, 438, 439, 7, 63, 2, 2, 439, 108, 3, 2, 2, 2, 440, 441, 7, 110, 2, 2, 441, 442, 7, 103, 2, 2, 442, 110, 3, 2, 2, 2, 443, 444, 7, 110, 2, 2, 444, 445, 7, 118, 2, 2, 445, 446, 7, 103, 2, 2, 446, 112, 3, 2, 2, 2, 447, 448, 7, 62, 2, 2, 448, 449, 7, 64, 2, 2, 449, 114, 3, 2, 2, 2, 450, 451, 7, 35, 2, 2, 451, 452, 7, 63, 2, 2, 452, 116, 3, 2, 2, 2, 453, 454, 7, 112, 2, 2, 454, 455, 7, 103, 2, 2, 455, 118, 3, 2, 2, 2, 456, 457, 7, 107, 2, 2, 457, 458, 7, 103, 2, 2, 458, 459, 7, 115, 2, 2, 459, 120, 3, 2, 2, 2, 460, 461, 7, 107, 2, 2, 461, 462, 7, 112, 2, 2, 462, 463, 7, 103, 2, 2, 463, 122, 3, 2, 2, 2, 464, 465, 7, 60, 2, 2, 465, 469, 9, 2, 2, 2, 466, 468, 9, 3, 2, 2, 467, 466, 3, 2, 2, 2, 468, 471, 3, 2, 2, 2, 469, 467, 3, 2, 2, 2, 469, 470, 3, 2, 2, 2, 470, 124, 3, 2, 2, 2, 471, 469, 3, 2, 2, 2, 472, 476, 9, 2, 2, 2, 473, 475, 9, 4, 2, 2, 474, 473, 3, 2, 2, 2, 475, 478, 3, 2, 2, 2, 476, 474, 3, 2, 2, 2, 476, 477, 3, 2, 2, 2, 477, 126, 3, 2, 2, 2, 478, 476, 3, 2, 2, 2, 479, 480, 7, 98, 2, 2, 480, 481, 5, 125, 63, 2, 481, 482, 7, 98, 2, 2, 482, 128, 3, 2, 2, 2, 483, 484, 7, 117, 2, 2, 484, 485, 7, 119, 2, 2, 485, 486, 7, 111, 2, 2, 486, 487, 7, 42, 2, 2, 487, 488, 3, 2, 2, 2, 488, 489, 5, 125, 63, 2, 489, 490, 7, 43, 2, 2, 490, 526, 3, 2, 2, 2, 491, 492, 7, 111, 2, 2, 492, 493, 7, 99, 2, 2, 493, 494, 7, 122, 2, 2, 494, 495, 7, 42, 2, 2, 495, 496, 3, 2, 2, 2, 496, 497, 5, 125, 63, 2, 497, 498, 7, 43, 2, 2, 498, 526, 3, 2, 2, 2, 499, 500, 7, 111, 2, 2, 500, 501, 7, 107, 2, 2, 501, 502, 7, 112, 2, 2, 502, 503, 7, 42, 2, 2, 503, 504, 3, 2, 2, 2, 504, 505, 5, 125, 63, 2, 505, 506, 7, 43, 2, 2, 506, 526, 3, 2, 2, 2, 507, 508, 7, 99, 2, 2, 508, 509, 7, 120, 2, 2, 509, 510, 7, 105, 2, 2, 510, 511, 7, 42, 2, 2, 511, 512, 3, 2, 2, 2, 512, 513, 5, 125, 63, 2, 513, 514, 7, 43, 2, 2, 514, 526, 3, 2, 2, 2, 515, 516, 7, 101, 2, 2, 516, 517, 7, 113, 2, 2, 517, 518, 7, 119, 2, 2, 518, 519, 7, 112, 2, 2, 519, 520, 7, 118, 2, 2, 520, 521, 7, 42, 2, 2, 521, 522, 3, 2, 2, 2, 522, 523, 5, 125, 63, 2, 523, 524, 7, 43, 2, 2, 524, 526, 3, 2, 2, 2, 525, 483, 3, 2, 2, 2, 525, 491, 3, 2, 2, 2, 525, 499, 3, 2, 2, 2, 525, 507, 3, 2, 2, 2, 525, 515, 3, 2, 2, 2, 526, 130, 3, 2, 2, 2, 527, 528, 7, 118, 2, 2, 528, 529, 7, 116, 2, 2, 529, 530, 7, 119, 2, 2, 530, 537, 7, 103, 2, 2, 531, 532, 7, 104, 2, 2, 532, 533, 7, 99, 2, 2, 533, 534, 7, 110, 2, 2, 534, 535, 7, 117, 2, 2, 535, 537, 7, 103, 2, 2, 536, 527, 3, 2, 2, 2, 536, 531, 3, 2, 2, 2, 537, 132, 3, 2, 2, 2, 538, 540, 7, 47, 2, 2, 539, 538, 3, 2, 2, 2, 539, 540, 3, 2, 2, 2, 540, 541, 3, 2, 2, 2, 541, 548, 5, 135, 68, 2, 542, 544, 7, 47, 2, 2, 543, 542, 3, 2, 2, 2, 543, 544, 3, 2, 2, 2, 544, 545, 3, 2, 2, 2, 545, 548, 5, 137, 69, 2, 546, 548, 5, 139, 70, 2, 547, 539, 3, 2, 2, 2, 547, 543, 3, 2, 2, 2, 547, 546, 3, 2, 2, 2, 548, 134, 3, 2, 2, 2, 549, 551, 9, 5, 2, 2, 550, 549, 3, 2, 2, 2, 551, 552, 3, 2, 2, 2, 552, 550, 3, 2, 2, 2, 552, 553, 3, 2, 2, 2, 553, 554, 3, 2, 2, 2, 554, 558, 7, 48, 2, 2, 555, 557, 9, 5, 2, 2, 556, 555, 3, 2, 2, 2, 557, 560, 3, 2, 2, 2, 558, 556, 3, 2, 2, 2, 558, 559, 3, 2, 2, 2, 559, 136, 3, 2, 2, 2, 560, 558, 3, 2, 2, 2, 561, 565, 9, 6, 2, 2, 562, 564, 9, 5, 2, 2, 563, 562, 3, 2, 2, 2, 564, 567, 3, 2, 2, 2, 565, 563, 3, 2, 2, 2, 565, 566, 3, 2, 2, 2, 566, 138, 3, 2, 2, 2, 567, 565, 3, 2, 2, 2, 568, 569, 7, 50, 2, 2, 569, 140, 3, 2, 2, 2, 570, 576, 7, 41, 2, 2, 571, 575, 10, 7, 2, 2, 572, 573, 7, 41, 2, 2, 573, 575, 7, 41, 2, 2, 574, 571, 3, 2, 2, 2, 574, 572, 3, 2, 2, 2, 575, 578, 3, 2, 2, 2, 576, 574, 3, 2, 2, 2, 576, 577, 3, 2, 2, 2, 577, 579, 3, 2, 2, 2, 578, 576, 3, 2, 2, 2, 579, 580, 7, 41, 2, 2, 580, 142, 3, 2, 2, 2, 581, 582, 9, 8, 2, 2, 582, 583, 3, 2, 2, 2, 583, 584, 8, 72, 2, 2, 584, 144, 3, 2, 2, 2, 15, 2, 469, 476, 525, 536, 539, 543, 547, 552, 558, 565, 574, 576, 3, 8, 2, 2]
\ No newline at end of file
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
index e67271b29..f0d4414a5 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
@@ -28,8 +28,9 @@ public class EQLLexer extends Lexer {
 		T__38=39, T__39=40, T__40=41, T__41=42, T__42=43, T__43=44, T__44=45,
 		T__45=46, T__46=47, T__47=48, T__48=49, T__49=50, T__50=51, T__51=52,
 		T__52=53, T__53=54, T__54=55, T__55=56, T__56=57, T__57=58, T__58=59,
-		T__59=60, INPUT_VARIABLE=61, PATH_VARIABLE=62, BOOLEAN_LITERAL=63, NUMBER_LITERAL=64,
-		DOUBLE=65, INT=66, ZERO=67, STRING_LITERAL=68, WS=69;
+		T__59=60, INPUT_VARIABLE=61, PATH_VARIABLE=62, QUOTED_PATH_VARIABLE=63,
+		PROP_FORMULA=64, BOOLEAN_LITERAL=65, NUMBER_LITERAL=66, DOUBLE=67, INT=68,
+		ZERO=69, STRING_LITERAL=70, WS=71;
 	public static String[] channelNames = {
 		"DEFAULT_TOKEN_CHANNEL", "HIDDEN"
 	};
@@ -47,15 +48,16 @@ public class EQLLexer extends Lexer {
 			"T__33", "T__34", "T__35", "T__36", "T__37", "T__38", "T__39", "T__40",
 			"T__41", "T__42", "T__43", "T__44", "T__45", "T__46", "T__47", "T__48",
 			"T__49", "T__50", "T__51", "T__52", "T__53", "T__54", "T__55", "T__56",
-			"T__57", "T__58", "T__59", "INPUT_VARIABLE", "PATH_VARIABLE", "BOOLEAN_LITERAL",
-			"NUMBER_LITERAL", "DOUBLE", "INT", "ZERO", "STRING_LITERAL", "WS"
+			"T__57", "T__58", "T__59", "INPUT_VARIABLE", "PATH_VARIABLE", "QUOTED_PATH_VARIABLE",
+			"PROP_FORMULA", "BOOLEAN_LITERAL", "NUMBER_LITERAL", "DOUBLE", "INT",
+			"ZERO", "STRING_LITERAL", "WS"
 		};
 	}
 	public static final String[] ruleNames = makeRuleNames();
 
 	private static String[] makeLiteralNames() {
 		return new String[] {
-			null, "'select'", "'('", "')'", "'distinct'", "'where'", "'order'", "'by'",
+			null, "'('", "')'", "'select'", "'distinct'", "'where'", "'order'", "'by'",
 			"','", "'nulls'", "'first'", "'last'", "'asc'", "'desc'", "'limit'",
 			"'offset'", "'fetch'", "'+'", "'query'", "'lazy'", "'or'", "'and'", "'not'",
 			"'in'", "'between'", "'inrange'", "'to'", "'is'", "'null'", "'isNull'",
@@ -63,7 +65,7 @@ public class EQLLexer extends Lexer {
 			"'like'", "'ilike'", "'contains'", "'icontains'", "'startsWith'", "'istartsWith'",
 			"'endsWith'", "'iendsWith'", "'='", "'eq'", "'>'", "'gt'", "'>='", "'ge'",
 			"'gte'", "'<'", "'lt'", "'<='", "'le'", "'lte'", "'<>'", "'!='", "'ne'",
-			"'ieq'", "'ine'", null, null, null, null, null, null, "'0'"
+			"'ieq'", "'ine'", null, null, null, null, null, null, null, null, "'0'"
 		};
 	}
 	private static final String[] _LITERAL_NAMES = makeLiteralNames();
@@ -74,8 +76,9 @@ public class EQLLexer extends Lexer {
 			null, null, null, null, null, null, null, null, null, null, null, null,
 			null, null, null, null, null, null, null, null, null, null, null, null,
 			null, null, null, null, null, null, null, null, null, null, null, null,
-			null, "INPUT_VARIABLE", "PATH_VARIABLE", "BOOLEAN_LITERAL", "NUMBER_LITERAL",
-			"DOUBLE", "INT", "ZERO", "STRING_LITERAL", "WS"
+			null, "INPUT_VARIABLE", "PATH_VARIABLE", "QUOTED_PATH_VARIABLE", "PROP_FORMULA",
+			"BOOLEAN_LITERAL", "NUMBER_LITERAL", "DOUBLE", "INT", "ZERO", "STRING_LITERAL",
+			"WS"
 		};
 	}
 	private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
@@ -137,7 +140,7 @@ public class EQLLexer extends Lexer {
 	public ATN getATN() { return _ATN; }
 
 	public static final String _serializedATN =
-		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2G\u0215\b\1\4\2\t"+
+		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2I\u0249\b\1\4\2\t"+
 		"\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13"+
 		"\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"+
 		"\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"+
@@ -145,170 +148,188 @@ public class EQLLexer extends Lexer {
 		"\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\4*\t*\4+\t+\4"+
 		",\t,\4-\t-\4.\t.\4/\t/\4\60\t\60\4\61\t\61\4\62\t\62\4\63\t\63\4\64\t"+
 		"\64\4\65\t\65\4\66\t\66\4\67\t\67\48\t8\49\t9\4:\t:\4;\t;\4<\t<\4=\t="+
-		"\4>\t>\4?\t?\4@\t@\4A\tA\4B\tB\4C\tC\4D\tD\4E\tE\4F\tF\3\2\3\2\3\2\3\2"+
-		"\3\2\3\2\3\2\3\3\3\3\3\4\3\4\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\6\3"+
-		"\6\3\6\3\6\3\6\3\6\3\7\3\7\3\7\3\7\3\7\3\7\3\b\3\b\3\b\3\t\3\t\3\n\3\n"+
-		"\3\n\3\n\3\n\3\n\3\13\3\13\3\13\3\13\3\13\3\13\3\f\3\f\3\f\3\f\3\f\3\r"+
-		"\3\r\3\r\3\r\3\16\3\16\3\16\3\16\3\16\3\17\3\17\3\17\3\17\3\17\3\17\3"+
-		"\20\3\20\3\20\3\20\3\20\3\20\3\20\3\21\3\21\3\21\3\21\3\21\3\21\3\22\3"+
-		"\22\3\23\3\23\3\23\3\23\3\23\3\23\3\24\3\24\3\24\3\24\3\24\3\25\3\25\3"+
-		"\25\3\26\3\26\3\26\3\26\3\27\3\27\3\27\3\27\3\30\3\30\3\30\3\31\3\31\3"+
-		"\31\3\31\3\31\3\31\3\31\3\31\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3"+
-		"\33\3\33\3\33\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\35\3\36\3\36\3\36\3"+
-		"\36\3\36\3\36\3\36\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3"+
-		" \3 \3 \3 \3 \3 \3 \3 \3!\3!\3!\3!\3!\3!\3\"\3\"\3\"\3\"\3\"\3\"\3\"\3"+
-		"\"\3#\3#\3#\3#\3#\3#\3#\3#\3#\3#\3#\3$\3$\3$\3$\3$\3$\3$\3$\3$\3%\3%\3"+
-		"%\3%\3%\3&\3&\3&\3&\3&\3&\3\'\3\'\3\'\3\'\3\'\3\'\3\'\3\'\3\'\3(\3(\3"+
-		"(\3(\3(\3(\3(\3(\3(\3(\3)\3)\3)\3)\3)\3)\3)\3)\3)\3)\3)\3*\3*\3*\3*\3"+
-		"*\3*\3*\3*\3*\3*\3*\3*\3+\3+\3+\3+\3+\3+\3+\3+\3+\3,\3,\3,\3,\3,\3,\3"+
-		",\3,\3,\3,\3-\3-\3.\3.\3.\3/\3/\3\60\3\60\3\60\3\61\3\61\3\61\3\62\3\62"+
-		"\3\62\3\63\3\63\3\63\3\63\3\64\3\64\3\65\3\65\3\65\3\66\3\66\3\66\3\67"+
-		"\3\67\3\67\38\38\38\38\39\39\39\3:\3:\3:\3;\3;\3;\3<\3<\3<\3<\3=\3=\3"+
-		"=\3=\3>\3>\3>\7>\u01d0\n>\f>\16>\u01d3\13>\3?\3?\7?\u01d7\n?\f?\16?\u01da"+
-		"\13?\3@\3@\3@\3@\3@\3@\3@\3@\3@\5@\u01e5\n@\3A\5A\u01e8\nA\3A\3A\5A\u01ec"+
-		"\nA\3A\3A\5A\u01f0\nA\3B\6B\u01f3\nB\rB\16B\u01f4\3B\3B\7B\u01f9\nB\f"+
-		"B\16B\u01fc\13B\3C\3C\7C\u0200\nC\fC\16C\u0203\13C\3D\3D\3E\3E\3E\3E\7"+
-		"E\u020b\nE\fE\16E\u020e\13E\3E\3E\3F\3F\3F\3F\2\2G\3\3\5\4\7\5\t\6\13"+
-		"\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16\33\17\35\20\37\21!\22#\23%\24\'"+
-		"\25)\26+\27-\30/\31\61\32\63\33\65\34\67\359\36;\37= ?!A\"C#E$G%I&K\'"+
-		"M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63e\64g\65i\66k\67m8o9q:s;u<w=y>{?}@\177"+
-		"A\u0081B\u0083C\u0085D\u0087E\u0089F\u008bG\3\2\t\5\2C\\aac|\6\2\62;C"+
-		"\\aac|\7\2\60\60\62;C\\aac|\3\2\62;\3\2\63;\3\2))\5\2\13\f\17\17\"\"\2"+
-		"\u0220\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2"+
-		"\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3"+
-		"\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2\2\2"+
-		"\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2\2\2\2"+
-		"/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2\29\3\2\2"+
-		"\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3\2\2\2\2"+
-		"G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2\2\2S\3"+
-		"\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2\2_\3\2\2"+
-		"\2\2a\3\2\2\2\2c\3\2\2\2\2e\3\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2k\3\2\2\2\2"+
-		"m\3\2\2\2\2o\3\2\2\2\2q\3\2\2\2\2s\3\2\2\2\2u\3\2\2\2\2w\3\2\2\2\2y\3"+
-		"\2\2\2\2{\3\2\2\2\2}\3\2\2\2\2\177\3\2\2\2\2\u0081\3\2\2\2\2\u0083\3\2"+
-		"\2\2\2\u0085\3\2\2\2\2\u0087\3\2\2\2\2\u0089\3\2\2\2\2\u008b\3\2\2\2\3"+
-		"\u008d\3\2\2\2\5\u0094\3\2\2\2\7\u0096\3\2\2\2\t\u0098\3\2\2\2\13\u00a1"+
-		"\3\2\2\2\r\u00a7\3\2\2\2\17\u00ad\3\2\2\2\21\u00b0\3\2\2\2\23\u00b2\3"+
-		"\2\2\2\25\u00b8\3\2\2\2\27\u00be\3\2\2\2\31\u00c3\3\2\2\2\33\u00c7\3\2"+
-		"\2\2\35\u00cc\3\2\2\2\37\u00d2\3\2\2\2!\u00d9\3\2\2\2#\u00df\3\2\2\2%"+
-		"\u00e1\3\2\2\2\'\u00e7\3\2\2\2)\u00ec\3\2\2\2+\u00ef\3\2\2\2-\u00f3\3"+
-		"\2\2\2/\u00f7\3\2\2\2\61\u00fa\3\2\2\2\63\u0102\3\2\2\2\65\u010a\3\2\2"+
-		"\2\67\u010d\3\2\2\29\u0110\3\2\2\2;\u0115\3\2\2\2=\u011c\3\2\2\2?\u0126"+
-		"\3\2\2\2A\u012e\3\2\2\2C\u0134\3\2\2\2E\u013c\3\2\2\2G\u0147\3\2\2\2I"+
-		"\u0150\3\2\2\2K\u0155\3\2\2\2M\u015b\3\2\2\2O\u0164\3\2\2\2Q\u016e\3\2"+
-		"\2\2S\u0179\3\2\2\2U\u0185\3\2\2\2W\u018e\3\2\2\2Y\u0198\3\2\2\2[\u019a"+
-		"\3\2\2\2]\u019d\3\2\2\2_\u019f\3\2\2\2a\u01a2\3\2\2\2c\u01a5\3\2\2\2e"+
-		"\u01a8\3\2\2\2g\u01ac\3\2\2\2i\u01ae\3\2\2\2k\u01b1\3\2\2\2m\u01b4\3\2"+
-		"\2\2o\u01b7\3\2\2\2q\u01bb\3\2\2\2s\u01be\3\2\2\2u\u01c1\3\2\2\2w\u01c4"+
-		"\3\2\2\2y\u01c8\3\2\2\2{\u01cc\3\2\2\2}\u01d4\3\2\2\2\177\u01e4\3\2\2"+
-		"\2\u0081\u01ef\3\2\2\2\u0083\u01f2\3\2\2\2\u0085\u01fd\3\2\2\2\u0087\u0204"+
-		"\3\2\2\2\u0089\u0206\3\2\2\2\u008b\u0211\3\2\2\2\u008d\u008e\7u\2\2\u008e"+
-		"\u008f\7g\2\2\u008f\u0090\7n\2\2\u0090\u0091\7g\2\2\u0091\u0092\7e\2\2"+
-		"\u0092\u0093\7v\2\2\u0093\4\3\2\2\2\u0094\u0095\7*\2\2\u0095\6\3\2\2\2"+
-		"\u0096\u0097\7+\2\2\u0097\b\3\2\2\2\u0098\u0099\7f\2\2\u0099\u009a\7k"+
-		"\2\2\u009a\u009b\7u\2\2\u009b\u009c\7v\2\2\u009c\u009d\7k\2\2\u009d\u009e"+
-		"\7p\2\2\u009e\u009f\7e\2\2\u009f\u00a0\7v\2\2\u00a0\n\3\2\2\2\u00a1\u00a2"+
-		"\7y\2\2\u00a2\u00a3\7j\2\2\u00a3\u00a4\7g\2\2\u00a4\u00a5\7t\2\2\u00a5"+
-		"\u00a6\7g\2\2\u00a6\f\3\2\2\2\u00a7\u00a8\7q\2\2\u00a8\u00a9\7t\2\2\u00a9"+
-		"\u00aa\7f\2\2\u00aa\u00ab\7g\2\2\u00ab\u00ac\7t\2\2\u00ac\16\3\2\2\2\u00ad"+
-		"\u00ae\7d\2\2\u00ae\u00af\7{\2\2\u00af\20\3\2\2\2\u00b0\u00b1\7.\2\2\u00b1"+
-		"\22\3\2\2\2\u00b2\u00b3\7p\2\2\u00b3\u00b4\7w\2\2\u00b4\u00b5\7n\2\2\u00b5"+
-		"\u00b6\7n\2\2\u00b6\u00b7\7u\2\2\u00b7\24\3\2\2\2\u00b8\u00b9\7h\2\2\u00b9"+
-		"\u00ba\7k\2\2\u00ba\u00bb\7t\2\2\u00bb\u00bc\7u\2\2\u00bc\u00bd\7v\2\2"+
-		"\u00bd\26\3\2\2\2\u00be\u00bf\7n\2\2\u00bf\u00c0\7c\2\2\u00c0\u00c1\7"+
-		"u\2\2\u00c1\u00c2\7v\2\2\u00c2\30\3\2\2\2\u00c3\u00c4\7c\2\2\u00c4\u00c5"+
-		"\7u\2\2\u00c5\u00c6\7e\2\2\u00c6\32\3\2\2\2\u00c7\u00c8\7f\2\2\u00c8\u00c9"+
-		"\7g\2\2\u00c9\u00ca\7u\2\2\u00ca\u00cb\7e\2\2\u00cb\34\3\2\2\2\u00cc\u00cd"+
-		"\7n\2\2\u00cd\u00ce\7k\2\2\u00ce\u00cf\7o\2\2\u00cf\u00d0\7k\2\2\u00d0"+
-		"\u00d1\7v\2\2\u00d1\36\3\2\2\2\u00d2\u00d3\7q\2\2\u00d3\u00d4\7h\2\2\u00d4"+
-		"\u00d5\7h\2\2\u00d5\u00d6\7u\2\2\u00d6\u00d7\7g\2\2\u00d7\u00d8\7v\2\2"+
-		"\u00d8 \3\2\2\2\u00d9\u00da\7h\2\2\u00da\u00db\7g\2\2\u00db\u00dc\7v\2"+
-		"\2\u00dc\u00dd\7e\2\2\u00dd\u00de\7j\2\2\u00de\"\3\2\2\2\u00df\u00e0\7"+
-		"-\2\2\u00e0$\3\2\2\2\u00e1\u00e2\7s\2\2\u00e2\u00e3\7w\2\2\u00e3\u00e4"+
-		"\7g\2\2\u00e4\u00e5\7t\2\2\u00e5\u00e6\7{\2\2\u00e6&\3\2\2\2\u00e7\u00e8"+
-		"\7n\2\2\u00e8\u00e9\7c\2\2\u00e9\u00ea\7|\2\2\u00ea\u00eb\7{\2\2\u00eb"+
-		"(\3\2\2\2\u00ec\u00ed\7q\2\2\u00ed\u00ee\7t\2\2\u00ee*\3\2\2\2\u00ef\u00f0"+
-		"\7c\2\2\u00f0\u00f1\7p\2\2\u00f1\u00f2\7f\2\2\u00f2,\3\2\2\2\u00f3\u00f4"+
-		"\7p\2\2\u00f4\u00f5\7q\2\2\u00f5\u00f6\7v\2\2\u00f6.\3\2\2\2\u00f7\u00f8"+
-		"\7k\2\2\u00f8\u00f9\7p\2\2\u00f9\60\3\2\2\2\u00fa\u00fb\7d\2\2\u00fb\u00fc"+
-		"\7g\2\2\u00fc\u00fd\7v\2\2\u00fd\u00fe\7y\2\2\u00fe\u00ff\7g\2\2\u00ff"+
-		"\u0100\7g\2\2\u0100\u0101\7p\2\2\u0101\62\3\2\2\2\u0102\u0103\7k\2\2\u0103"+
-		"\u0104\7p\2\2\u0104\u0105\7t\2\2\u0105\u0106\7c\2\2\u0106\u0107\7p\2\2"+
-		"\u0107\u0108\7i\2\2\u0108\u0109\7g\2\2\u0109\64\3\2\2\2\u010a\u010b\7"+
-		"v\2\2\u010b\u010c\7q\2\2\u010c\66\3\2\2\2\u010d\u010e\7k\2\2\u010e\u010f"+
-		"\7u\2\2\u010f8\3\2\2\2\u0110\u0111\7p\2\2\u0111\u0112\7w\2\2\u0112\u0113"+
-		"\7n\2\2\u0113\u0114\7n\2\2\u0114:\3\2\2\2\u0115\u0116\7k\2\2\u0116\u0117"+
-		"\7u\2\2\u0117\u0118\7P\2\2\u0118\u0119\7w\2\2\u0119\u011a\7n\2\2\u011a"+
-		"\u011b\7n\2\2\u011b<\3\2\2\2\u011c\u011d\7k\2\2\u011d\u011e\7u\2\2\u011e"+
-		"\u011f\7P\2\2\u011f\u0120\7q\2\2\u0120\u0121\7v\2\2\u0121\u0122\7P\2\2"+
-		"\u0122\u0123\7w\2\2\u0123\u0124\7n\2\2\u0124\u0125\7n\2\2\u0125>\3\2\2"+
-		"\2\u0126\u0127\7p\2\2\u0127\u0128\7q\2\2\u0128\u0129\7v\2\2\u0129\u012a"+
-		"\7P\2\2\u012a\u012b\7w\2\2\u012b\u012c\7n\2\2\u012c\u012d\7n\2\2\u012d"+
-		"@\3\2\2\2\u012e\u012f\7g\2\2\u012f\u0130\7o\2\2\u0130\u0131\7r\2\2\u0131"+
-		"\u0132\7v\2\2\u0132\u0133\7{\2\2\u0133B\3\2\2\2\u0134\u0135\7k\2\2\u0135"+
-		"\u0136\7u\2\2\u0136\u0137\7G\2\2\u0137\u0138\7o\2\2\u0138\u0139\7r\2\2"+
-		"\u0139\u013a\7v\2\2\u013a\u013b\7{\2\2\u013bD\3\2\2\2\u013c\u013d\7k\2"+
-		"\2\u013d\u013e\7u\2\2\u013e\u013f\7P\2\2\u013f\u0140\7q\2\2\u0140\u0141"+
-		"\7v\2\2\u0141\u0142\7G\2\2\u0142\u0143\7o\2\2\u0143\u0144\7r\2\2\u0144"+
-		"\u0145\7v\2\2\u0145\u0146\7{\2\2\u0146F\3\2\2\2\u0147\u0148\7p\2\2\u0148"+
-		"\u0149\7q\2\2\u0149\u014a\7v\2\2\u014a\u014b\7G\2\2\u014b\u014c\7o\2\2"+
-		"\u014c\u014d\7r\2\2\u014d\u014e\7v\2\2\u014e\u014f\7{\2\2\u014fH\3\2\2"+
-		"\2\u0150\u0151\7n\2\2\u0151\u0152\7k\2\2\u0152\u0153\7m\2\2\u0153\u0154"+
-		"\7g\2\2\u0154J\3\2\2\2\u0155\u0156\7k\2\2\u0156\u0157\7n\2\2\u0157\u0158"+
-		"\7k\2\2\u0158\u0159\7m\2\2\u0159\u015a\7g\2\2\u015aL\3\2\2\2\u015b\u015c"+
-		"\7e\2\2\u015c\u015d\7q\2\2\u015d\u015e\7p\2\2\u015e\u015f\7v\2\2\u015f"+
-		"\u0160\7c\2\2\u0160\u0161\7k\2\2\u0161\u0162\7p\2\2\u0162\u0163\7u\2\2"+
-		"\u0163N\3\2\2\2\u0164\u0165\7k\2\2\u0165\u0166\7e\2\2\u0166\u0167\7q\2"+
-		"\2\u0167\u0168\7p\2\2\u0168\u0169\7v\2\2\u0169\u016a\7c\2\2\u016a\u016b"+
-		"\7k\2\2\u016b\u016c\7p\2\2\u016c\u016d\7u\2\2\u016dP\3\2\2\2\u016e\u016f"+
-		"\7u\2\2\u016f\u0170\7v\2\2\u0170\u0171\7c\2\2\u0171\u0172\7t\2\2\u0172"+
-		"\u0173\7v\2\2\u0173\u0174\7u\2\2\u0174\u0175\7Y\2\2\u0175\u0176\7k\2\2"+
-		"\u0176\u0177\7v\2\2\u0177\u0178\7j\2\2\u0178R\3\2\2\2\u0179\u017a\7k\2"+
-		"\2\u017a\u017b\7u\2\2\u017b\u017c\7v\2\2\u017c\u017d\7c\2\2\u017d\u017e"+
-		"\7t\2\2\u017e\u017f\7v\2\2\u017f\u0180\7u\2\2\u0180\u0181\7Y\2\2\u0181"+
-		"\u0182\7k\2\2\u0182\u0183\7v\2\2\u0183\u0184\7j\2\2\u0184T\3\2\2\2\u0185"+
-		"\u0186\7g\2\2\u0186\u0187\7p\2\2\u0187\u0188\7f\2\2\u0188\u0189\7u\2\2"+
-		"\u0189\u018a\7Y\2\2\u018a\u018b\7k\2\2\u018b\u018c\7v\2\2\u018c\u018d"+
-		"\7j\2\2\u018dV\3\2\2\2\u018e\u018f\7k\2\2\u018f\u0190\7g\2\2\u0190\u0191"+
-		"\7p\2\2\u0191\u0192\7f\2\2\u0192\u0193\7u\2\2\u0193\u0194\7Y\2\2\u0194"+
-		"\u0195\7k\2\2\u0195\u0196\7v\2\2\u0196\u0197\7j\2\2\u0197X\3\2\2\2\u0198"+
-		"\u0199\7?\2\2\u0199Z\3\2\2\2\u019a\u019b\7g\2\2\u019b\u019c\7s\2\2\u019c"+
-		"\\\3\2\2\2\u019d\u019e\7@\2\2\u019e^\3\2\2\2\u019f\u01a0\7i\2\2\u01a0"+
-		"\u01a1\7v\2\2\u01a1`\3\2\2\2\u01a2\u01a3\7@\2\2\u01a3\u01a4\7?\2\2\u01a4"+
-		"b\3\2\2\2\u01a5\u01a6\7i\2\2\u01a6\u01a7\7g\2\2\u01a7d\3\2\2\2\u01a8\u01a9"+
-		"\7i\2\2\u01a9\u01aa\7v\2\2\u01aa\u01ab\7g\2\2\u01abf\3\2\2\2\u01ac\u01ad"+
-		"\7>\2\2\u01adh\3\2\2\2\u01ae\u01af\7n\2\2\u01af\u01b0\7v\2\2\u01b0j\3"+
-		"\2\2\2\u01b1\u01b2\7>\2\2\u01b2\u01b3\7?\2\2\u01b3l\3\2\2\2\u01b4\u01b5"+
-		"\7n\2\2\u01b5\u01b6\7g\2\2\u01b6n\3\2\2\2\u01b7\u01b8\7n\2\2\u01b8\u01b9"+
-		"\7v\2\2\u01b9\u01ba\7g\2\2\u01bap\3\2\2\2\u01bb\u01bc\7>\2\2\u01bc\u01bd"+
-		"\7@\2\2\u01bdr\3\2\2\2\u01be\u01bf\7#\2\2\u01bf\u01c0\7?\2\2\u01c0t\3"+
-		"\2\2\2\u01c1\u01c2\7p\2\2\u01c2\u01c3\7g\2\2\u01c3v\3\2\2\2\u01c4\u01c5"+
-		"\7k\2\2\u01c5\u01c6\7g\2\2\u01c6\u01c7\7s\2\2\u01c7x\3\2\2\2\u01c8\u01c9"+
-		"\7k\2\2\u01c9\u01ca\7p\2\2\u01ca\u01cb\7g\2\2\u01cbz\3\2\2\2\u01cc\u01cd"+
-		"\7<\2\2\u01cd\u01d1\t\2\2\2\u01ce\u01d0\t\3\2\2\u01cf\u01ce\3\2\2\2\u01d0"+
-		"\u01d3\3\2\2\2\u01d1\u01cf\3\2\2\2\u01d1\u01d2\3\2\2\2\u01d2|\3\2\2\2"+
-		"\u01d3\u01d1\3\2\2\2\u01d4\u01d8\t\2\2\2\u01d5\u01d7\t\4\2\2\u01d6\u01d5"+
-		"\3\2\2\2\u01d7\u01da\3\2\2\2\u01d8\u01d6\3\2\2\2\u01d8\u01d9\3\2\2\2\u01d9"+
-		"~\3\2\2\2\u01da\u01d8\3\2\2\2\u01db\u01dc\7v\2\2\u01dc\u01dd\7t\2\2\u01dd"+
-		"\u01de\7w\2\2\u01de\u01e5\7g\2\2\u01df\u01e0\7h\2\2\u01e0\u01e1\7c\2\2"+
-		"\u01e1\u01e2\7n\2\2\u01e2\u01e3\7u\2\2\u01e3\u01e5\7g\2\2\u01e4\u01db"+
-		"\3\2\2\2\u01e4\u01df\3\2\2\2\u01e5\u0080\3\2\2\2\u01e6\u01e8\7/\2\2\u01e7"+
-		"\u01e6\3\2\2\2\u01e7\u01e8\3\2\2\2\u01e8\u01e9\3\2\2\2\u01e9\u01f0\5\u0083"+
-		"B\2\u01ea\u01ec\7/\2\2\u01eb\u01ea\3\2\2\2\u01eb\u01ec\3\2\2\2\u01ec\u01ed"+
-		"\3\2\2\2\u01ed\u01f0\5\u0085C\2\u01ee\u01f0\5\u0087D\2\u01ef\u01e7\3\2"+
-		"\2\2\u01ef\u01eb\3\2\2\2\u01ef\u01ee\3\2\2\2\u01f0\u0082\3\2\2\2\u01f1"+
-		"\u01f3\t\5\2\2\u01f2\u01f1\3\2\2\2\u01f3\u01f4\3\2\2\2\u01f4\u01f2\3\2"+
-		"\2\2\u01f4\u01f5\3\2\2\2\u01f5\u01f6\3\2\2\2\u01f6\u01fa\7\60\2\2\u01f7"+
-		"\u01f9\t\5\2\2\u01f8\u01f7\3\2\2\2\u01f9\u01fc\3\2\2\2\u01fa\u01f8\3\2"+
-		"\2\2\u01fa\u01fb\3\2\2\2\u01fb\u0084\3\2\2\2\u01fc\u01fa\3\2\2\2\u01fd"+
-		"\u0201\t\6\2\2\u01fe\u0200\t\5\2\2\u01ff\u01fe\3\2\2\2\u0200\u0203\3\2"+
-		"\2\2\u0201\u01ff\3\2\2\2\u0201\u0202\3\2\2\2\u0202\u0086\3\2\2\2\u0203"+
-		"\u0201\3\2\2\2\u0204\u0205\7\62\2\2\u0205\u0088\3\2\2\2\u0206\u020c\7"+
-		")\2\2\u0207\u020b\n\7\2\2\u0208\u0209\7)\2\2\u0209\u020b\7)\2\2\u020a"+
-		"\u0207\3\2\2\2\u020a\u0208\3\2\2\2\u020b\u020e\3\2\2\2\u020c\u020a\3\2"+
-		"\2\2\u020c\u020d\3\2\2\2\u020d\u020f\3\2\2\2\u020e\u020c\3\2\2\2\u020f"+
-		"\u0210\7)\2\2\u0210\u008a\3\2\2\2\u0211\u0212\t\b\2\2\u0212\u0213\3\2"+
-		"\2\2\u0213\u0214\bF\2\2\u0214\u008c\3\2\2\2\16\2\u01d1\u01d8\u01e4\u01e7"+
-		"\u01eb\u01ef\u01f4\u01fa\u0201\u020a\u020c\3\b\2\2";
+		"\4>\t>\4?\t?\4@\t@\4A\tA\4B\tB\4C\tC\4D\tD\4E\tE\4F\tF\4G\tG\4H\tH\3\2"+
+		"\3\2\3\3\3\3\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3"+
+		"\5\3\5\3\6\3\6\3\6\3\6\3\6\3\6\3\7\3\7\3\7\3\7\3\7\3\7\3\b\3\b\3\b\3\t"+
+		"\3\t\3\n\3\n\3\n\3\n\3\n\3\n\3\13\3\13\3\13\3\13\3\13\3\13\3\f\3\f\3\f"+
+		"\3\f\3\f\3\r\3\r\3\r\3\r\3\16\3\16\3\16\3\16\3\16\3\17\3\17\3\17\3\17"+
+		"\3\17\3\17\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\21\3\21\3\21\3\21\3\21"+
+		"\3\21\3\22\3\22\3\23\3\23\3\23\3\23\3\23\3\23\3\24\3\24\3\24\3\24\3\24"+
+		"\3\25\3\25\3\25\3\26\3\26\3\26\3\26\3\27\3\27\3\27\3\27\3\30\3\30\3\30"+
+		"\3\31\3\31\3\31\3\31\3\31\3\31\3\31\3\31\3\32\3\32\3\32\3\32\3\32\3\32"+
+		"\3\32\3\32\3\33\3\33\3\33\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\35\3\36"+
+		"\3\36\3\36\3\36\3\36\3\36\3\36\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3\37"+
+		"\3\37\3\37\3 \3 \3 \3 \3 \3 \3 \3 \3!\3!\3!\3!\3!\3!\3\"\3\"\3\"\3\"\3"+
+		"\"\3\"\3\"\3\"\3#\3#\3#\3#\3#\3#\3#\3#\3#\3#\3#\3$\3$\3$\3$\3$\3$\3$\3"+
+		"$\3$\3%\3%\3%\3%\3%\3&\3&\3&\3&\3&\3&\3\'\3\'\3\'\3\'\3\'\3\'\3\'\3\'"+
+		"\3\'\3(\3(\3(\3(\3(\3(\3(\3(\3(\3(\3)\3)\3)\3)\3)\3)\3)\3)\3)\3)\3)\3"+
+		"*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3+\3+\3+\3+\3+\3+\3+\3+\3+\3,\3,\3"+
+		",\3,\3,\3,\3,\3,\3,\3,\3-\3-\3.\3.\3.\3/\3/\3\60\3\60\3\60\3\61\3\61\3"+
+		"\61\3\62\3\62\3\62\3\63\3\63\3\63\3\63\3\64\3\64\3\65\3\65\3\65\3\66\3"+
+		"\66\3\66\3\67\3\67\3\67\38\38\38\38\39\39\39\3:\3:\3:\3;\3;\3;\3<\3<\3"+
+		"<\3<\3=\3=\3=\3=\3>\3>\3>\7>\u01d4\n>\f>\16>\u01d7\13>\3?\3?\7?\u01db"+
+		"\n?\f?\16?\u01de\13?\3@\3@\3@\3@\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3"+
+		"A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3"+
+		"A\3A\3A\3A\3A\3A\3A\5A\u020e\nA\3B\3B\3B\3B\3B\3B\3B\3B\3B\5B\u0219\n"+
+		"B\3C\5C\u021c\nC\3C\3C\5C\u0220\nC\3C\3C\5C\u0224\nC\3D\6D\u0227\nD\r"+
+		"D\16D\u0228\3D\3D\7D\u022d\nD\fD\16D\u0230\13D\3E\3E\7E\u0234\nE\fE\16"+
+		"E\u0237\13E\3F\3F\3G\3G\3G\3G\7G\u023f\nG\fG\16G\u0242\13G\3G\3G\3H\3"+
+		"H\3H\3H\2\2I\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16"+
+		"\33\17\35\20\37\21!\22#\23%\24\'\25)\26+\27-\30/\31\61\32\63\33\65\34"+
+		"\67\359\36;\37= ?!A\"C#E$G%I&K\'M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63e\64g"+
+		"\65i\66k\67m8o9q:s;u<w=y>{?}@\177A\u0081B\u0083C\u0085D\u0087E\u0089F"+
+		"\u008bG\u008dH\u008fI\3\2\t\5\2C\\aac|\6\2\62;C\\aac|\7\2\60\60\62;C\\"+
+		"aac|\3\2\62;\3\2\63;\3\2))\5\2\13\f\17\17\"\"\2\u0258\2\3\3\2\2\2\2\5"+
+		"\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2"+
+		"\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33"+
+		"\3\2\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2"+
+		"\'\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2\2\2\2/\3\2\2\2\2\61\3\2\2\2\2"+
+		"\63\3\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2\29\3\2\2\2\2;\3\2\2\2\2=\3\2\2\2"+
+		"\2?\3\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3\2\2\2\2G\3\2\2\2\2I\3\2\2\2\2K"+
+		"\3\2\2\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2\2\2S\3\2\2\2\2U\3\2\2\2\2W\3\2"+
+		"\2\2\2Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2\2_\3\2\2\2\2a\3\2\2\2\2c\3\2\2\2"+
+		"\2e\3\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2k\3\2\2\2\2m\3\2\2\2\2o\3\2\2\2\2q"+
+		"\3\2\2\2\2s\3\2\2\2\2u\3\2\2\2\2w\3\2\2\2\2y\3\2\2\2\2{\3\2\2\2\2}\3\2"+
+		"\2\2\2\177\3\2\2\2\2\u0081\3\2\2\2\2\u0083\3\2\2\2\2\u0085\3\2\2\2\2\u0087"+
+		"\3\2\2\2\2\u0089\3\2\2\2\2\u008b\3\2\2\2\2\u008d\3\2\2\2\2\u008f\3\2\2"+
+		"\2\3\u0091\3\2\2\2\5\u0093\3\2\2\2\7\u0095\3\2\2\2\t\u009c\3\2\2\2\13"+
+		"\u00a5\3\2\2\2\r\u00ab\3\2\2\2\17\u00b1\3\2\2\2\21\u00b4\3\2\2\2\23\u00b6"+
+		"\3\2\2\2\25\u00bc\3\2\2\2\27\u00c2\3\2\2\2\31\u00c7\3\2\2\2\33\u00cb\3"+
+		"\2\2\2\35\u00d0\3\2\2\2\37\u00d6\3\2\2\2!\u00dd\3\2\2\2#\u00e3\3\2\2\2"+
+		"%\u00e5\3\2\2\2\'\u00eb\3\2\2\2)\u00f0\3\2\2\2+\u00f3\3\2\2\2-\u00f7\3"+
+		"\2\2\2/\u00fb\3\2\2\2\61\u00fe\3\2\2\2\63\u0106\3\2\2\2\65\u010e\3\2\2"+
+		"\2\67\u0111\3\2\2\29\u0114\3\2\2\2;\u0119\3\2\2\2=\u0120\3\2\2\2?\u012a"+
+		"\3\2\2\2A\u0132\3\2\2\2C\u0138\3\2\2\2E\u0140\3\2\2\2G\u014b\3\2\2\2I"+
+		"\u0154\3\2\2\2K\u0159\3\2\2\2M\u015f\3\2\2\2O\u0168\3\2\2\2Q\u0172\3\2"+
+		"\2\2S\u017d\3\2\2\2U\u0189\3\2\2\2W\u0192\3\2\2\2Y\u019c\3\2\2\2[\u019e"+
+		"\3\2\2\2]\u01a1\3\2\2\2_\u01a3\3\2\2\2a\u01a6\3\2\2\2c\u01a9\3\2\2\2e"+
+		"\u01ac\3\2\2\2g\u01b0\3\2\2\2i\u01b2\3\2\2\2k\u01b5\3\2\2\2m\u01b8\3\2"+
+		"\2\2o\u01bb\3\2\2\2q\u01bf\3\2\2\2s\u01c2\3\2\2\2u\u01c5\3\2\2\2w\u01c8"+
+		"\3\2\2\2y\u01cc\3\2\2\2{\u01d0\3\2\2\2}\u01d8\3\2\2\2\177\u01df\3\2\2"+
+		"\2\u0081\u020d\3\2\2\2\u0083\u0218\3\2\2\2\u0085\u0223\3\2\2\2\u0087\u0226"+
+		"\3\2\2\2\u0089\u0231\3\2\2\2\u008b\u0238\3\2\2\2\u008d\u023a\3\2\2\2\u008f"+
+		"\u0245\3\2\2\2\u0091\u0092\7*\2\2\u0092\4\3\2\2\2\u0093\u0094\7+\2\2\u0094"+
+		"\6\3\2\2\2\u0095\u0096\7u\2\2\u0096\u0097\7g\2\2\u0097\u0098\7n\2\2\u0098"+
+		"\u0099\7g\2\2\u0099\u009a\7e\2\2\u009a\u009b\7v\2\2\u009b\b\3\2\2\2\u009c"+
+		"\u009d\7f\2\2\u009d\u009e\7k\2\2\u009e\u009f\7u\2\2\u009f\u00a0\7v\2\2"+
+		"\u00a0\u00a1\7k\2\2\u00a1\u00a2\7p\2\2\u00a2\u00a3\7e\2\2\u00a3\u00a4"+
+		"\7v\2\2\u00a4\n\3\2\2\2\u00a5\u00a6\7y\2\2\u00a6\u00a7\7j\2\2\u00a7\u00a8"+
+		"\7g\2\2\u00a8\u00a9\7t\2\2\u00a9\u00aa\7g\2\2\u00aa\f\3\2\2\2\u00ab\u00ac"+
+		"\7q\2\2\u00ac\u00ad\7t\2\2\u00ad\u00ae\7f\2\2\u00ae\u00af\7g\2\2\u00af"+
+		"\u00b0\7t\2\2\u00b0\16\3\2\2\2\u00b1\u00b2\7d\2\2\u00b2\u00b3\7{\2\2\u00b3"+
+		"\20\3\2\2\2\u00b4\u00b5\7.\2\2\u00b5\22\3\2\2\2\u00b6\u00b7\7p\2\2\u00b7"+
+		"\u00b8\7w\2\2\u00b8\u00b9\7n\2\2\u00b9\u00ba\7n\2\2\u00ba\u00bb\7u\2\2"+
+		"\u00bb\24\3\2\2\2\u00bc\u00bd\7h\2\2\u00bd\u00be\7k\2\2\u00be\u00bf\7"+
+		"t\2\2\u00bf\u00c0\7u\2\2\u00c0\u00c1\7v\2\2\u00c1\26\3\2\2\2\u00c2\u00c3"+
+		"\7n\2\2\u00c3\u00c4\7c\2\2\u00c4\u00c5\7u\2\2\u00c5\u00c6\7v\2\2\u00c6"+
+		"\30\3\2\2\2\u00c7\u00c8\7c\2\2\u00c8\u00c9\7u\2\2\u00c9\u00ca\7e\2\2\u00ca"+
+		"\32\3\2\2\2\u00cb\u00cc\7f\2\2\u00cc\u00cd\7g\2\2\u00cd\u00ce\7u\2\2\u00ce"+
+		"\u00cf\7e\2\2\u00cf\34\3\2\2\2\u00d0\u00d1\7n\2\2\u00d1\u00d2\7k\2\2\u00d2"+
+		"\u00d3\7o\2\2\u00d3\u00d4\7k\2\2\u00d4\u00d5\7v\2\2\u00d5\36\3\2\2\2\u00d6"+
+		"\u00d7\7q\2\2\u00d7\u00d8\7h\2\2\u00d8\u00d9\7h\2\2\u00d9\u00da\7u\2\2"+
+		"\u00da\u00db\7g\2\2\u00db\u00dc\7v\2\2\u00dc \3\2\2\2\u00dd\u00de\7h\2"+
+		"\2\u00de\u00df\7g\2\2\u00df\u00e0\7v\2\2\u00e0\u00e1\7e\2\2\u00e1\u00e2"+
+		"\7j\2\2\u00e2\"\3\2\2\2\u00e3\u00e4\7-\2\2\u00e4$\3\2\2\2\u00e5\u00e6"+
+		"\7s\2\2\u00e6\u00e7\7w\2\2\u00e7\u00e8\7g\2\2\u00e8\u00e9\7t\2\2\u00e9"+
+		"\u00ea\7{\2\2\u00ea&\3\2\2\2\u00eb\u00ec\7n\2\2\u00ec\u00ed\7c\2\2\u00ed"+
+		"\u00ee\7|\2\2\u00ee\u00ef\7{\2\2\u00ef(\3\2\2\2\u00f0\u00f1\7q\2\2\u00f1"+
+		"\u00f2\7t\2\2\u00f2*\3\2\2\2\u00f3\u00f4\7c\2\2\u00f4\u00f5\7p\2\2\u00f5"+
+		"\u00f6\7f\2\2\u00f6,\3\2\2\2\u00f7\u00f8\7p\2\2\u00f8\u00f9\7q\2\2\u00f9"+
+		"\u00fa\7v\2\2\u00fa.\3\2\2\2\u00fb\u00fc\7k\2\2\u00fc\u00fd\7p\2\2\u00fd"+
+		"\60\3\2\2\2\u00fe\u00ff\7d\2\2\u00ff\u0100\7g\2\2\u0100\u0101\7v\2\2\u0101"+
+		"\u0102\7y\2\2\u0102\u0103\7g\2\2\u0103\u0104\7g\2\2\u0104\u0105\7p\2\2"+
+		"\u0105\62\3\2\2\2\u0106\u0107\7k\2\2\u0107\u0108\7p\2\2\u0108\u0109\7"+
+		"t\2\2\u0109\u010a\7c\2\2\u010a\u010b\7p\2\2\u010b\u010c\7i\2\2\u010c\u010d"+
+		"\7g\2\2\u010d\64\3\2\2\2\u010e\u010f\7v\2\2\u010f\u0110\7q\2\2\u0110\66"+
+		"\3\2\2\2\u0111\u0112\7k\2\2\u0112\u0113\7u\2\2\u01138\3\2\2\2\u0114\u0115"+
+		"\7p\2\2\u0115\u0116\7w\2\2\u0116\u0117\7n\2\2\u0117\u0118\7n\2\2\u0118"+
+		":\3\2\2\2\u0119\u011a\7k\2\2\u011a\u011b\7u\2\2\u011b\u011c\7P\2\2\u011c"+
+		"\u011d\7w\2\2\u011d\u011e\7n\2\2\u011e\u011f\7n\2\2\u011f<\3\2\2\2\u0120"+
+		"\u0121\7k\2\2\u0121\u0122\7u\2\2\u0122\u0123\7P\2\2\u0123\u0124\7q\2\2"+
+		"\u0124\u0125\7v\2\2\u0125\u0126\7P\2\2\u0126\u0127\7w\2\2\u0127\u0128"+
+		"\7n\2\2\u0128\u0129\7n\2\2\u0129>\3\2\2\2\u012a\u012b\7p\2\2\u012b\u012c"+
+		"\7q\2\2\u012c\u012d\7v\2\2\u012d\u012e\7P\2\2\u012e\u012f\7w\2\2\u012f"+
+		"\u0130\7n\2\2\u0130\u0131\7n\2\2\u0131@\3\2\2\2\u0132\u0133\7g\2\2\u0133"+
+		"\u0134\7o\2\2\u0134\u0135\7r\2\2\u0135\u0136\7v\2\2\u0136\u0137\7{\2\2"+
+		"\u0137B\3\2\2\2\u0138\u0139\7k\2\2\u0139\u013a\7u\2\2\u013a\u013b\7G\2"+
+		"\2\u013b\u013c\7o\2\2\u013c\u013d\7r\2\2\u013d\u013e\7v\2\2\u013e\u013f"+
+		"\7{\2\2\u013fD\3\2\2\2\u0140\u0141\7k\2\2\u0141\u0142\7u\2\2\u0142\u0143"+
+		"\7P\2\2\u0143\u0144\7q\2\2\u0144\u0145\7v\2\2\u0145\u0146\7G\2\2\u0146"+
+		"\u0147\7o\2\2\u0147\u0148\7r\2\2\u0148\u0149\7v\2\2\u0149\u014a\7{\2\2"+
+		"\u014aF\3\2\2\2\u014b\u014c\7p\2\2\u014c\u014d\7q\2\2\u014d\u014e\7v\2"+
+		"\2\u014e\u014f\7G\2\2\u014f\u0150\7o\2\2\u0150\u0151\7r\2\2\u0151\u0152"+
+		"\7v\2\2\u0152\u0153\7{\2\2\u0153H\3\2\2\2\u0154\u0155\7n\2\2\u0155\u0156"+
+		"\7k\2\2\u0156\u0157\7m\2\2\u0157\u0158\7g\2\2\u0158J\3\2\2\2\u0159\u015a"+
+		"\7k\2\2\u015a\u015b\7n\2\2\u015b\u015c\7k\2\2\u015c\u015d\7m\2\2\u015d"+
+		"\u015e\7g\2\2\u015eL\3\2\2\2\u015f\u0160\7e\2\2\u0160\u0161\7q\2\2\u0161"+
+		"\u0162\7p\2\2\u0162\u0163\7v\2\2\u0163\u0164\7c\2\2\u0164\u0165\7k\2\2"+
+		"\u0165\u0166\7p\2\2\u0166\u0167\7u\2\2\u0167N\3\2\2\2\u0168\u0169\7k\2"+
+		"\2\u0169\u016a\7e\2\2\u016a\u016b\7q\2\2\u016b\u016c\7p\2\2\u016c\u016d"+
+		"\7v\2\2\u016d\u016e\7c\2\2\u016e\u016f\7k\2\2\u016f\u0170\7p\2\2\u0170"+
+		"\u0171\7u\2\2\u0171P\3\2\2\2\u0172\u0173\7u\2\2\u0173\u0174\7v\2\2\u0174"+
+		"\u0175\7c\2\2\u0175\u0176\7t\2\2\u0176\u0177\7v\2\2\u0177\u0178\7u\2\2"+
+		"\u0178\u0179\7Y\2\2\u0179\u017a\7k\2\2\u017a\u017b\7v\2\2\u017b\u017c"+
+		"\7j\2\2\u017cR\3\2\2\2\u017d\u017e\7k\2\2\u017e\u017f\7u\2\2\u017f\u0180"+
+		"\7v\2\2\u0180\u0181\7c\2\2\u0181\u0182\7t\2\2\u0182\u0183\7v\2\2\u0183"+
+		"\u0184\7u\2\2\u0184\u0185\7Y\2\2\u0185\u0186\7k\2\2\u0186\u0187\7v\2\2"+
+		"\u0187\u0188\7j\2\2\u0188T\3\2\2\2\u0189\u018a\7g\2\2\u018a\u018b\7p\2"+
+		"\2\u018b\u018c\7f\2\2\u018c\u018d\7u\2\2\u018d\u018e\7Y\2\2\u018e\u018f"+
+		"\7k\2\2\u018f\u0190\7v\2\2\u0190\u0191\7j\2\2\u0191V\3\2\2\2\u0192\u0193"+
+		"\7k\2\2\u0193\u0194\7g\2\2\u0194\u0195\7p\2\2\u0195\u0196\7f\2\2\u0196"+
+		"\u0197\7u\2\2\u0197\u0198\7Y\2\2\u0198\u0199\7k\2\2\u0199\u019a\7v\2\2"+
+		"\u019a\u019b\7j\2\2\u019bX\3\2\2\2\u019c\u019d\7?\2\2\u019dZ\3\2\2\2\u019e"+
+		"\u019f\7g\2\2\u019f\u01a0\7s\2\2\u01a0\\\3\2\2\2\u01a1\u01a2\7@\2\2\u01a2"+
+		"^\3\2\2\2\u01a3\u01a4\7i\2\2\u01a4\u01a5\7v\2\2\u01a5`\3\2\2\2\u01a6\u01a7"+
+		"\7@\2\2\u01a7\u01a8\7?\2\2\u01a8b\3\2\2\2\u01a9\u01aa\7i\2\2\u01aa\u01ab"+
+		"\7g\2\2\u01abd\3\2\2\2\u01ac\u01ad\7i\2\2\u01ad\u01ae\7v\2\2\u01ae\u01af"+
+		"\7g\2\2\u01aff\3\2\2\2\u01b0\u01b1\7>\2\2\u01b1h\3\2\2\2\u01b2\u01b3\7"+
+		"n\2\2\u01b3\u01b4\7v\2\2\u01b4j\3\2\2\2\u01b5\u01b6\7>\2\2\u01b6\u01b7"+
+		"\7?\2\2\u01b7l\3\2\2\2\u01b8\u01b9\7n\2\2\u01b9\u01ba\7g\2\2\u01ban\3"+
+		"\2\2\2\u01bb\u01bc\7n\2\2\u01bc\u01bd\7v\2\2\u01bd\u01be\7g\2\2\u01be"+
+		"p\3\2\2\2\u01bf\u01c0\7>\2\2\u01c0\u01c1\7@\2\2\u01c1r\3\2\2\2\u01c2\u01c3"+
+		"\7#\2\2\u01c3\u01c4\7?\2\2\u01c4t\3\2\2\2\u01c5\u01c6\7p\2\2\u01c6\u01c7"+
+		"\7g\2\2\u01c7v\3\2\2\2\u01c8\u01c9\7k\2\2\u01c9\u01ca\7g\2\2\u01ca\u01cb"+
+		"\7s\2\2\u01cbx\3\2\2\2\u01cc\u01cd\7k\2\2\u01cd\u01ce\7p\2\2\u01ce\u01cf"+
+		"\7g\2\2\u01cfz\3\2\2\2\u01d0\u01d1\7<\2\2\u01d1\u01d5\t\2\2\2\u01d2\u01d4"+
+		"\t\3\2\2\u01d3\u01d2\3\2\2\2\u01d4\u01d7\3\2\2\2\u01d5\u01d3\3\2\2\2\u01d5"+
+		"\u01d6\3\2\2\2\u01d6|\3\2\2\2\u01d7\u01d5\3\2\2\2\u01d8\u01dc\t\2\2\2"+
+		"\u01d9\u01db\t\4\2\2\u01da\u01d9\3\2\2\2\u01db\u01de\3\2\2\2\u01dc\u01da"+
+		"\3\2\2\2\u01dc\u01dd\3\2\2\2\u01dd~\3\2\2\2\u01de\u01dc\3\2\2\2\u01df"+
+		"\u01e0\7b\2\2\u01e0\u01e1\5}?\2\u01e1\u01e2\7b\2\2\u01e2\u0080\3\2\2\2"+
+		"\u01e3\u01e4\7u\2\2\u01e4\u01e5\7w\2\2\u01e5\u01e6\7o\2\2\u01e6\u01e7"+
+		"\7*\2\2\u01e7\u01e8\3\2\2\2\u01e8\u01e9\5}?\2\u01e9\u01ea\7+\2\2\u01ea"+
+		"\u020e\3\2\2\2\u01eb\u01ec\7o\2\2\u01ec\u01ed\7c\2\2\u01ed\u01ee\7z\2"+
+		"\2\u01ee\u01ef\7*\2\2\u01ef\u01f0\3\2\2\2\u01f0\u01f1\5}?\2\u01f1\u01f2"+
+		"\7+\2\2\u01f2\u020e\3\2\2\2\u01f3\u01f4\7o\2\2\u01f4\u01f5\7k\2\2\u01f5"+
+		"\u01f6\7p\2\2\u01f6\u01f7\7*\2\2\u01f7\u01f8\3\2\2\2\u01f8\u01f9\5}?\2"+
+		"\u01f9\u01fa\7+\2\2\u01fa\u020e\3\2\2\2\u01fb\u01fc\7c\2\2\u01fc\u01fd"+
+		"\7x\2\2\u01fd\u01fe\7i\2\2\u01fe\u01ff\7*\2\2\u01ff\u0200\3\2\2\2\u0200"+
+		"\u0201\5}?\2\u0201\u0202\7+\2\2\u0202\u020e\3\2\2\2\u0203\u0204\7e\2\2"+
+		"\u0204\u0205\7q\2\2\u0205\u0206\7w\2\2\u0206\u0207\7p\2\2\u0207\u0208"+
+		"\7v\2\2\u0208\u0209\7*\2\2\u0209\u020a\3\2\2\2\u020a\u020b\5}?\2\u020b"+
+		"\u020c\7+\2\2\u020c\u020e\3\2\2\2\u020d\u01e3\3\2\2\2\u020d\u01eb\3\2"+
+		"\2\2\u020d\u01f3\3\2\2\2\u020d\u01fb\3\2\2\2\u020d\u0203\3\2\2\2\u020e"+
+		"\u0082\3\2\2\2\u020f\u0210\7v\2\2\u0210\u0211\7t\2\2\u0211\u0212\7w\2"+
+		"\2\u0212\u0219\7g\2\2\u0213\u0214\7h\2\2\u0214\u0215\7c\2\2\u0215\u0216"+
+		"\7n\2\2\u0216\u0217\7u\2\2\u0217\u0219\7g\2\2\u0218\u020f\3\2\2\2\u0218"+
+		"\u0213\3\2\2\2\u0219\u0084\3\2\2\2\u021a\u021c\7/\2\2\u021b\u021a\3\2"+
+		"\2\2\u021b\u021c\3\2\2\2\u021c\u021d\3\2\2\2\u021d\u0224\5\u0087D\2\u021e"+
+		"\u0220\7/\2\2\u021f\u021e\3\2\2\2\u021f\u0220\3\2\2\2\u0220\u0221\3\2"+
+		"\2\2\u0221\u0224\5\u0089E\2\u0222\u0224\5\u008bF\2\u0223\u021b\3\2\2\2"+
+		"\u0223\u021f\3\2\2\2\u0223\u0222\3\2\2\2\u0224\u0086\3\2\2\2\u0225\u0227"+
+		"\t\5\2\2\u0226\u0225\3\2\2\2\u0227\u0228\3\2\2\2\u0228\u0226\3\2\2\2\u0228"+
+		"\u0229\3\2\2\2\u0229\u022a\3\2\2\2\u022a\u022e\7\60\2\2\u022b\u022d\t"+
+		"\5\2\2\u022c\u022b\3\2\2\2\u022d\u0230\3\2\2\2\u022e\u022c\3\2\2\2\u022e"+
+		"\u022f\3\2\2\2\u022f\u0088\3\2\2\2\u0230\u022e\3\2\2\2\u0231\u0235\t\6"+
+		"\2\2\u0232\u0234\t\5\2\2\u0233\u0232\3\2\2\2\u0234\u0237\3\2\2\2\u0235"+
+		"\u0233\3\2\2\2\u0235\u0236\3\2\2\2\u0236\u008a\3\2\2\2\u0237\u0235\3\2"+
+		"\2\2\u0238\u0239\7\62\2\2\u0239\u008c\3\2\2\2\u023a\u0240\7)\2\2\u023b"+
+		"\u023f\n\7\2\2\u023c\u023d\7)\2\2\u023d\u023f\7)\2\2\u023e\u023b\3\2\2"+
+		"\2\u023e\u023c\3\2\2\2\u023f\u0242\3\2\2\2\u0240\u023e\3\2\2\2\u0240\u0241"+
+		"\3\2\2\2\u0241\u0243\3\2\2\2\u0242\u0240\3\2\2\2\u0243\u0244\7)\2\2\u0244"+
+		"\u008e\3\2\2\2\u0245\u0246\t\b\2\2\u0246\u0247\3\2\2\2\u0247\u0248\bH"+
+		"\2\2\u0248\u0090\3\2\2\2\17\2\u01d5\u01dc\u020d\u0218\u021b\u021f\u0223"+
+		"\u0228\u022e\u0235\u023e\u0240\3\b\2\2";
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens
index 4df1b445f..d6d4462ab 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens
@@ -60,16 +60,18 @@ T__58=59
 T__59=60
 INPUT_VARIABLE=61
 PATH_VARIABLE=62
-BOOLEAN_LITERAL=63
-NUMBER_LITERAL=64
-DOUBLE=65
-INT=66
-ZERO=67
-STRING_LITERAL=68
-WS=69
-'select'=1
-'('=2
-')'=3
+QUOTED_PATH_VARIABLE=63
+PROP_FORMULA=64
+BOOLEAN_LITERAL=65
+NUMBER_LITERAL=66
+DOUBLE=67
+INT=68
+ZERO=69
+STRING_LITERAL=70
+WS=71
+'('=1
+')'=2
+'select'=3
 'distinct'=4
 'where'=5
 'order'=6
@@ -127,4 +129,4 @@ WS=69
 'ne'=58
 'ieq'=59
 'ine'=60
-'0'=67
+'0'=69
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java
index 357206cd2..e8e252998 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java
@@ -17,6 +17,16 @@ public interface EQLListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitSelect_statement(EQLParser.Select_statementContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#select_properties}.
+	 * @param ctx the parse tree
+	 */
+	void enterSelect_properties(EQLParser.Select_propertiesContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#select_properties}.
+	 * @param ctx the parse tree
+	 */
+	void exitSelect_properties(EQLParser.Select_propertiesContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link EQLParser#select_clause}.
 	 * @param ctx the parse tree
@@ -147,6 +157,16 @@ public interface EQLListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitFetch_property_group(EQLParser.Fetch_property_groupContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#fetch_path_path}.
+	 * @param ctx the parse tree
+	 */
+	void enterFetch_path_path(EQLParser.Fetch_path_pathContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#fetch_path_path}.
+	 * @param ctx the parse tree
+	 */
+	void exitFetch_path_path(EQLParser.Fetch_path_pathContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link EQLParser#fetch_property}.
 	 * @param ctx the parse tree
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
index f6c7f0fad..9649ffd87 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
@@ -36,34 +36,35 @@ public class EQLParser extends Parser {
 		T__38=39, T__39=40, T__40=41, T__41=42, T__42=43, T__43=44, T__44=45,
 		T__45=46, T__46=47, T__47=48, T__48=49, T__49=50, T__50=51, T__51=52,
 		T__52=53, T__53=54, T__54=55, T__55=56, T__56=57, T__57=58, T__58=59,
-		T__59=60, INPUT_VARIABLE=61, PATH_VARIABLE=62, BOOLEAN_LITERAL=63, NUMBER_LITERAL=64,
-		DOUBLE=65, INT=66, ZERO=67, STRING_LITERAL=68, WS=69;
+		T__59=60, INPUT_VARIABLE=61, PATH_VARIABLE=62, QUOTED_PATH_VARIABLE=63,
+		PROP_FORMULA=64, BOOLEAN_LITERAL=65, NUMBER_LITERAL=66, DOUBLE=67, INT=68,
+		ZERO=69, STRING_LITERAL=70, WS=71;
 	public static final int
-		RULE_select_statement = 0, RULE_select_clause = 1, RULE_distinct = 2,
-		RULE_fetch_clause = 3, RULE_where_clause = 4, RULE_orderby_clause = 5,
-		RULE_orderby_property = 6, RULE_nulls_firstlast = 7, RULE_asc_desc = 8,
-		RULE_limit_clause = 9, RULE_offset_clause = 10, RULE_fetch_path = 11,
-		RULE_fetch_property_set = 12, RULE_fetch_property_group = 13, RULE_fetch_property = 14,
-		RULE_fetch_query_hint = 15, RULE_fetch_lazy_hint = 16, RULE_fetch_option = 17,
-		RULE_fetch_query_option = 18, RULE_fetch_lazy_option = 19, RULE_fetch_batch_size = 20,
-		RULE_conditional_expression = 21, RULE_conditional_term = 22, RULE_conditional_factor = 23,
-		RULE_conditional_primary = 24, RULE_any_expression = 25, RULE_in_expression = 26,
-		RULE_in_value = 27, RULE_between_expression = 28, RULE_inrange_expression = 29,
-		RULE_propertyBetween_expression = 30, RULE_isNull_expression = 31, RULE_isNotNull_expression = 32,
-		RULE_isEmpty_expression = 33, RULE_isNotEmpty_expression = 34, RULE_like_expression = 35,
-		RULE_like_op = 36, RULE_comparison_expression = 37, RULE_comparison_operator = 38,
-		RULE_value_expression = 39, RULE_literal = 40;
+		RULE_select_statement = 0, RULE_select_properties = 1, RULE_select_clause = 2,
+		RULE_distinct = 3, RULE_fetch_clause = 4, RULE_where_clause = 5, RULE_orderby_clause = 6,
+		RULE_orderby_property = 7, RULE_nulls_firstlast = 8, RULE_asc_desc = 9,
+		RULE_limit_clause = 10, RULE_offset_clause = 11, RULE_fetch_path = 12,
+		RULE_fetch_property_set = 13, RULE_fetch_property_group = 14, RULE_fetch_path_path = 15,
+		RULE_fetch_property = 16, RULE_fetch_query_hint = 17, RULE_fetch_lazy_hint = 18,
+		RULE_fetch_option = 19, RULE_fetch_query_option = 20, RULE_fetch_lazy_option = 21,
+		RULE_fetch_batch_size = 22, RULE_conditional_expression = 23, RULE_conditional_term = 24,
+		RULE_conditional_factor = 25, RULE_conditional_primary = 26, RULE_any_expression = 27,
+		RULE_in_expression = 28, RULE_in_value = 29, RULE_between_expression = 30,
+		RULE_inrange_expression = 31, RULE_propertyBetween_expression = 32, RULE_isNull_expression = 33,
+		RULE_isNotNull_expression = 34, RULE_isEmpty_expression = 35, RULE_isNotEmpty_expression = 36,
+		RULE_like_expression = 37, RULE_like_op = 38, RULE_comparison_expression = 39,
+		RULE_comparison_operator = 40, RULE_value_expression = 41, RULE_literal = 42;
 	private static String[] makeRuleNames() {
 		return new String[] {
-			"select_statement", "select_clause", "distinct", "fetch_clause", "where_clause",
-			"orderby_clause", "orderby_property", "nulls_firstlast", "asc_desc",
-			"limit_clause", "offset_clause", "fetch_path", "fetch_property_set",
-			"fetch_property_group", "fetch_property", "fetch_query_hint", "fetch_lazy_hint",
-			"fetch_option", "fetch_query_option", "fetch_lazy_option", "fetch_batch_size",
-			"conditional_expression", "conditional_term", "conditional_factor", "conditional_primary",
-			"any_expression", "in_expression", "in_value", "between_expression",
-			"inrange_expression", "propertyBetween_expression", "isNull_expression",
-			"isNotNull_expression", "isEmpty_expression", "isNotEmpty_expression",
+			"select_statement", "select_properties", "select_clause", "distinct",
+			"fetch_clause", "where_clause", "orderby_clause", "orderby_property",
+			"nulls_firstlast", "asc_desc", "limit_clause", "offset_clause", "fetch_path",
+			"fetch_property_set", "fetch_property_group", "fetch_path_path", "fetch_property",
+			"fetch_query_hint", "fetch_lazy_hint", "fetch_option", "fetch_query_option",
+			"fetch_lazy_option", "fetch_batch_size", "conditional_expression", "conditional_term",
+			"conditional_factor", "conditional_primary", "any_expression", "in_expression",
+			"in_value", "between_expression", "inrange_expression", "propertyBetween_expression",
+			"isNull_expression", "isNotNull_expression", "isEmpty_expression", "isNotEmpty_expression",
 			"like_expression", "like_op", "comparison_expression", "comparison_operator",
 			"value_expression", "literal"
 		};
@@ -72,7 +73,7 @@ public class EQLParser extends Parser {
 
 	private static String[] makeLiteralNames() {
 		return new String[] {
-			null, "'select'", "'('", "')'", "'distinct'", "'where'", "'order'", "'by'",
+			null, "'('", "')'", "'select'", "'distinct'", "'where'", "'order'", "'by'",
 			"','", "'nulls'", "'first'", "'last'", "'asc'", "'desc'", "'limit'",
 			"'offset'", "'fetch'", "'+'", "'query'", "'lazy'", "'or'", "'and'", "'not'",
 			"'in'", "'between'", "'inrange'", "'to'", "'is'", "'null'", "'isNull'",
@@ -80,7 +81,7 @@ public class EQLParser extends Parser {
 			"'like'", "'ilike'", "'contains'", "'icontains'", "'startsWith'", "'istartsWith'",
 			"'endsWith'", "'iendsWith'", "'='", "'eq'", "'>'", "'gt'", "'>='", "'ge'",
 			"'gte'", "'<'", "'lt'", "'<='", "'le'", "'lte'", "'<>'", "'!='", "'ne'",
-			"'ieq'", "'ine'", null, null, null, null, null, null, "'0'"
+			"'ieq'", "'ine'", null, null, null, null, null, null, null, null, "'0'"
 		};
 	}
 	private static final String[] _LITERAL_NAMES = makeLiteralNames();
@@ -91,8 +92,9 @@ public class EQLParser extends Parser {
 			null, null, null, null, null, null, null, null, null, null, null, null,
 			null, null, null, null, null, null, null, null, null, null, null, null,
 			null, null, null, null, null, null, null, null, null, null, null, null,
-			null, "INPUT_VARIABLE", "PATH_VARIABLE", "BOOLEAN_LITERAL", "NUMBER_LITERAL",
-			"DOUBLE", "INT", "ZERO", "STRING_LITERAL", "WS"
+			null, "INPUT_VARIABLE", "PATH_VARIABLE", "QUOTED_PATH_VARIABLE", "PROP_FORMULA",
+			"BOOLEAN_LITERAL", "NUMBER_LITERAL", "DOUBLE", "INT", "ZERO", "STRING_LITERAL",
+			"WS"
 		};
 	}
 	private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
@@ -187,61 +189,61 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(83);
+			setState(87);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			if (_la==T__0) {
+			if (_la==T__2) {
 				{
-				setState(82);
+				setState(86);
 				select_clause();
 				}
 			}
 
-			setState(88);
+			setState(92);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__15) {
 				{
 				{
-				setState(85);
+				setState(89);
 				fetch_clause();
 				}
 				}
-				setState(90);
+				setState(94);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
-			setState(92);
+			setState(96);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__4) {
 				{
-				setState(91);
+				setState(95);
 				where_clause();
 				}
 			}
 
-			setState(95);
+			setState(99);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__5) {
 				{
-				setState(94);
+				setState(98);
 				orderby_clause();
 				}
 			}
 
-			setState(98);
+			setState(102);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__13) {
 				{
-				setState(97);
+				setState(101);
 				limit_clause();
 				}
 			}
 
-			setState(100);
+			setState(104);
 			match(EOF);
 			}
 		}
@@ -256,10 +258,70 @@ public class EQLParser extends Parser {
 		return _localctx;
 	}
 
-	public static class Select_clauseContext extends ParserRuleContext {
+	public static class Select_propertiesContext extends ParserRuleContext {
 		public Fetch_property_groupContext fetch_property_group() {
 			return getRuleContext(Fetch_property_groupContext.class,0);
 		}
+		public Select_propertiesContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_select_properties; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterSelect_properties(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitSelect_properties(this);
+		}
+	}
+
+	public final Select_propertiesContext select_properties() throws RecognitionException {
+		Select_propertiesContext _localctx = new Select_propertiesContext(_ctx, getState());
+		enterRule(_localctx, 2, RULE_select_properties);
+		try {
+			setState(111);
+			_errHandler.sync(this);
+			switch (_input.LA(1)) {
+			case T__0:
+				enterOuterAlt(_localctx, 1);
+				{
+				setState(106);
+				match(T__0);
+				setState(107);
+				fetch_property_group();
+				setState(108);
+				match(T__1);
+				}
+				break;
+			case T__16:
+			case PATH_VARIABLE:
+			case PROP_FORMULA:
+				enterOuterAlt(_localctx, 2);
+				{
+				setState(110);
+				fetch_property_group();
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Select_clauseContext extends ParserRuleContext {
+		public Select_propertiesContext select_properties() {
+			return getRuleContext(Select_propertiesContext.class,0);
+		}
 		public DistinctContext distinct() {
 			return getRuleContext(DistinctContext.class,0);
 		}
@@ -279,29 +341,25 @@ public class EQLParser extends Parser {
 
 	public final Select_clauseContext select_clause() throws RecognitionException {
 		Select_clauseContext _localctx = new Select_clauseContext(_ctx, getState());
-		enterRule(_localctx, 2, RULE_select_clause);
+		enterRule(_localctx, 4, RULE_select_clause);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(102);
-			match(T__0);
-			setState(104);
+			setState(113);
+			match(T__2);
+			setState(115);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__3) {
 				{
-				setState(103);
+				setState(114);
 				distinct();
 				}
 			}
 
-			setState(106);
-			match(T__1);
-			setState(107);
-			fetch_property_group();
-			setState(108);
-			match(T__2);
+			setState(117);
+			select_properties();
 			}
 		}
 		catch (RecognitionException re) {
@@ -332,11 +390,11 @@ public class EQLParser extends Parser {
 
 	public final DistinctContext distinct() throws RecognitionException {
 		DistinctContext _localctx = new DistinctContext(_ctx, getState());
-		enterRule(_localctx, 4, RULE_distinct);
+		enterRule(_localctx, 6, RULE_distinct);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(110);
+			setState(119);
 			match(T__3);
 			}
 		}
@@ -371,11 +429,11 @@ public class EQLParser extends Parser {
 
 	public final Fetch_clauseContext fetch_clause() throws RecognitionException {
 		Fetch_clauseContext _localctx = new Fetch_clauseContext(_ctx, getState());
-		enterRule(_localctx, 6, RULE_fetch_clause);
+		enterRule(_localctx, 8, RULE_fetch_clause);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(112);
+			setState(121);
 			fetch_path();
 			}
 		}
@@ -410,13 +468,13 @@ public class EQLParser extends Parser {
 
 	public final Where_clauseContext where_clause() throws RecognitionException {
 		Where_clauseContext _localctx = new Where_clauseContext(_ctx, getState());
-		enterRule(_localctx, 8, RULE_where_clause);
+		enterRule(_localctx, 10, RULE_where_clause);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(114);
+			setState(123);
 			match(T__4);
-			setState(115);
+			setState(124);
 			conditional_expression();
 			}
 		}
@@ -454,30 +512,30 @@ public class EQLParser extends Parser {
 
 	public final Orderby_clauseContext orderby_clause() throws RecognitionException {
 		Orderby_clauseContext _localctx = new Orderby_clauseContext(_ctx, getState());
-		enterRule(_localctx, 10, RULE_orderby_clause);
+		enterRule(_localctx, 12, RULE_orderby_clause);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(117);
+			setState(126);
 			match(T__5);
-			setState(118);
+			setState(127);
 			match(T__6);
-			setState(119);
+			setState(128);
 			orderby_property();
-			setState(124);
+			setState(133);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__7) {
 				{
 				{
-				setState(120);
+				setState(129);
 				match(T__7);
-				setState(121);
+				setState(130);
 				orderby_property();
 				}
 				}
-				setState(126);
+				setState(135);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -518,29 +576,29 @@ public class EQLParser extends Parser {
 
 	public final Orderby_propertyContext orderby_property() throws RecognitionException {
 		Orderby_propertyContext _localctx = new Orderby_propertyContext(_ctx, getState());
-		enterRule(_localctx, 12, RULE_orderby_property);
+		enterRule(_localctx, 14, RULE_orderby_property);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(127);
+			setState(136);
 			match(PATH_VARIABLE);
-			setState(129);
+			setState(138);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__11 || _la==T__12) {
 				{
-				setState(128);
+				setState(137);
 				asc_desc();
 				}
 			}
 
-			setState(132);
+			setState(141);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__8) {
 				{
-				setState(131);
+				setState(140);
 				nulls_firstlast();
 				}
 			}
@@ -575,26 +633,26 @@ public class EQLParser extends Parser {
 
 	public final Nulls_firstlastContext nulls_firstlast() throws RecognitionException {
 		Nulls_firstlastContext _localctx = new Nulls_firstlastContext(_ctx, getState());
-		enterRule(_localctx, 14, RULE_nulls_firstlast);
+		enterRule(_localctx, 16, RULE_nulls_firstlast);
 		try {
-			setState(138);
+			setState(147);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,9,_ctx) ) {
+			switch ( getInterpreter().adaptivePredict(_input,10,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(134);
+				setState(143);
 				match(T__8);
-				setState(135);
+				setState(144);
 				match(T__9);
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(136);
+				setState(145);
 				match(T__8);
-				setState(137);
+				setState(146);
 				match(T__10);
 				}
 				break;
@@ -628,12 +686,12 @@ public class EQLParser extends Parser {
 
 	public final Asc_descContext asc_desc() throws RecognitionException {
 		Asc_descContext _localctx = new Asc_descContext(_ctx, getState());
-		enterRule(_localctx, 16, RULE_asc_desc);
+		enterRule(_localctx, 18, RULE_asc_desc);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(140);
+			setState(149);
 			_la = _input.LA(1);
 			if ( !(_la==T__11 || _la==T__12) ) {
 			_errHandler.recoverInline(this);
@@ -677,21 +735,21 @@ public class EQLParser extends Parser {
 
 	public final Limit_clauseContext limit_clause() throws RecognitionException {
 		Limit_clauseContext _localctx = new Limit_clauseContext(_ctx, getState());
-		enterRule(_localctx, 18, RULE_limit_clause);
+		enterRule(_localctx, 20, RULE_limit_clause);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(142);
+			setState(151);
 			match(T__13);
-			setState(143);
+			setState(152);
 			match(NUMBER_LITERAL);
-			setState(145);
+			setState(154);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__14) {
 				{
-				setState(144);
+				setState(153);
 				offset_clause();
 				}
 			}
@@ -727,13 +785,13 @@ public class EQLParser extends Parser {
 
 	public final Offset_clauseContext offset_clause() throws RecognitionException {
 		Offset_clauseContext _localctx = new Offset_clauseContext(_ctx, getState());
-		enterRule(_localctx, 20, RULE_offset_clause);
+		enterRule(_localctx, 22, RULE_offset_clause);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(147);
+			setState(156);
 			match(T__14);
-			setState(148);
+			setState(157);
 			match(NUMBER_LITERAL);
 			}
 		}
@@ -749,7 +807,9 @@ public class EQLParser extends Parser {
 	}
 
 	public static class Fetch_pathContext extends ParserRuleContext {
-		public TerminalNode PATH_VARIABLE() { return getToken(EQLParser.PATH_VARIABLE, 0); }
+		public Fetch_path_pathContext fetch_path_path() {
+			return getRuleContext(Fetch_path_pathContext.class,0);
+		}
 		public Fetch_optionContext fetch_option() {
 			return getRuleContext(Fetch_optionContext.class,0);
 		}
@@ -772,31 +832,31 @@ public class EQLParser extends Parser {
 
 	public final Fetch_pathContext fetch_path() throws RecognitionException {
 		Fetch_pathContext _localctx = new Fetch_pathContext(_ctx, getState());
-		enterRule(_localctx, 22, RULE_fetch_path);
+		enterRule(_localctx, 24, RULE_fetch_path);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(150);
+			setState(159);
 			match(T__15);
-			setState(152);
+			setState(161);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__17 || _la==T__18) {
 				{
-				setState(151);
+				setState(160);
 				fetch_option();
 				}
 			}
 
-			setState(154);
-			match(PATH_VARIABLE);
-			setState(156);
+			setState(163);
+			fetch_path_path();
+			setState(165);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			if (_la==T__1) {
+			if (_la==T__0) {
 				{
-				setState(155);
+				setState(164);
 				fetch_property_set();
 				}
 			}
@@ -834,16 +894,16 @@ public class EQLParser extends Parser {
 
 	public final Fetch_property_setContext fetch_property_set() throws RecognitionException {
 		Fetch_property_setContext _localctx = new Fetch_property_setContext(_ctx, getState());
-		enterRule(_localctx, 24, RULE_fetch_property_set);
+		enterRule(_localctx, 26, RULE_fetch_property_set);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(158);
-			match(T__1);
-			setState(159);
+			setState(167);
+			match(T__0);
+			setState(168);
 			fetch_property_group();
-			setState(160);
-			match(T__2);
+			setState(169);
+			match(T__1);
 			}
 		}
 		catch (RecognitionException re) {
@@ -880,26 +940,26 @@ public class EQLParser extends Parser {
 
 	public final Fetch_property_groupContext fetch_property_group() throws RecognitionException {
 		Fetch_property_groupContext _localctx = new Fetch_property_groupContext(_ctx, getState());
-		enterRule(_localctx, 26, RULE_fetch_property_group);
+		enterRule(_localctx, 28, RULE_fetch_property_group);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(162);
+			setState(171);
 			fetch_property();
-			setState(167);
+			setState(176);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__7) {
 				{
 				{
-				setState(163);
+				setState(172);
 				match(T__7);
-				setState(164);
+				setState(173);
 				fetch_property();
 				}
 				}
-				setState(169);
+				setState(178);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -916,6 +976,53 @@ public class EQLParser extends Parser {
 		return _localctx;
 	}
 
+	public static class Fetch_path_pathContext extends ParserRuleContext {
+		public TerminalNode PATH_VARIABLE() { return getToken(EQLParser.PATH_VARIABLE, 0); }
+		public TerminalNode QUOTED_PATH_VARIABLE() { return getToken(EQLParser.QUOTED_PATH_VARIABLE, 0); }
+		public Fetch_path_pathContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_fetch_path_path; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterFetch_path_path(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitFetch_path_path(this);
+		}
+	}
+
+	public final Fetch_path_pathContext fetch_path_path() throws RecognitionException {
+		Fetch_path_pathContext _localctx = new Fetch_path_pathContext(_ctx, getState());
+		enterRule(_localctx, 30, RULE_fetch_path_path);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(179);
+			_la = _input.LA(1);
+			if ( !(_la==PATH_VARIABLE || _la==QUOTED_PATH_VARIABLE) ) {
+			_errHandler.recoverInline(this);
+			}
+			else {
+				if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
+				_errHandler.reportMatch(this);
+				consume();
+			}
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
 	public static class Fetch_propertyContext extends ParserRuleContext {
 		public TerminalNode PATH_VARIABLE() { return getToken(EQLParser.PATH_VARIABLE, 0); }
 		public Fetch_query_hintContext fetch_query_hint() {
@@ -924,6 +1031,7 @@ public class EQLParser extends Parser {
 		public Fetch_lazy_hintContext fetch_lazy_hint() {
 			return getRuleContext(Fetch_lazy_hintContext.class,0);
 		}
+		public TerminalNode PROP_FORMULA() { return getToken(EQLParser.PROP_FORMULA, 0); }
 		public Fetch_propertyContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -940,32 +1048,39 @@ public class EQLParser extends Parser {
 
 	public final Fetch_propertyContext fetch_property() throws RecognitionException {
 		Fetch_propertyContext _localctx = new Fetch_propertyContext(_ctx, getState());
-		enterRule(_localctx, 28, RULE_fetch_property);
+		enterRule(_localctx, 32, RULE_fetch_property);
 		try {
-			setState(173);
+			setState(185);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,14,_ctx) ) {
+			switch ( getInterpreter().adaptivePredict(_input,15,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(170);
+				setState(181);
 				match(PATH_VARIABLE);
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(171);
+				setState(182);
 				fetch_query_hint();
 				}
 				break;
 			case 3:
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(172);
+				setState(183);
 				fetch_lazy_hint();
 				}
 				break;
+			case 4:
+				enterOuterAlt(_localctx, 4);
+				{
+				setState(184);
+				match(PROP_FORMULA);
+				}
+				break;
 			}
 		}
 		catch (RecognitionException re) {
@@ -999,13 +1114,13 @@ public class EQLParser extends Parser {
 
 	public final Fetch_query_hintContext fetch_query_hint() throws RecognitionException {
 		Fetch_query_hintContext _localctx = new Fetch_query_hintContext(_ctx, getState());
-		enterRule(_localctx, 30, RULE_fetch_query_hint);
+		enterRule(_localctx, 34, RULE_fetch_query_hint);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(175);
+			setState(187);
 			match(T__16);
-			setState(176);
+			setState(188);
 			fetch_query_option();
 			}
 		}
@@ -1040,13 +1155,13 @@ public class EQLParser extends Parser {
 
 	public final Fetch_lazy_hintContext fetch_lazy_hint() throws RecognitionException {
 		Fetch_lazy_hintContext _localctx = new Fetch_lazy_hintContext(_ctx, getState());
-		enterRule(_localctx, 32, RULE_fetch_lazy_hint);
+		enterRule(_localctx, 36, RULE_fetch_lazy_hint);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(178);
+			setState(190);
 			match(T__16);
-			setState(179);
+			setState(191);
 			fetch_lazy_option();
 			}
 		}
@@ -1084,22 +1199,22 @@ public class EQLParser extends Parser {
 
 	public final Fetch_optionContext fetch_option() throws RecognitionException {
 		Fetch_optionContext _localctx = new Fetch_optionContext(_ctx, getState());
-		enterRule(_localctx, 34, RULE_fetch_option);
+		enterRule(_localctx, 38, RULE_fetch_option);
 		try {
-			setState(183);
+			setState(195);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case T__17:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(181);
+				setState(193);
 				fetch_query_option();
 				}
 				break;
 			case T__18:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(182);
+				setState(194);
 				fetch_lazy_option();
 				}
 				break;
@@ -1138,19 +1253,19 @@ public class EQLParser extends Parser {
 
 	public final Fetch_query_optionContext fetch_query_option() throws RecognitionException {
 		Fetch_query_optionContext _localctx = new Fetch_query_optionContext(_ctx, getState());
-		enterRule(_localctx, 36, RULE_fetch_query_option);
+		enterRule(_localctx, 40, RULE_fetch_query_option);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(185);
+			setState(197);
 			match(T__17);
-			setState(187);
+			setState(199);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			if (_la==T__1) {
+			if (_la==T__0) {
 				{
-				setState(186);
+				setState(198);
 				fetch_batch_size();
 				}
 			}
@@ -1188,19 +1303,19 @@ public class EQLParser extends Parser {
 
 	public final Fetch_lazy_optionContext fetch_lazy_option() throws RecognitionException {
 		Fetch_lazy_optionContext _localctx = new Fetch_lazy_optionContext(_ctx, getState());
-		enterRule(_localctx, 38, RULE_fetch_lazy_option);
+		enterRule(_localctx, 42, RULE_fetch_lazy_option);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(189);
+			setState(201);
 			match(T__18);
-			setState(191);
+			setState(203);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			if (_la==T__1) {
+			if (_la==T__0) {
 				{
-				setState(190);
+				setState(202);
 				fetch_batch_size();
 				}
 			}
@@ -1236,16 +1351,16 @@ public class EQLParser extends Parser {
 
 	public final Fetch_batch_sizeContext fetch_batch_size() throws RecognitionException {
 		Fetch_batch_sizeContext _localctx = new Fetch_batch_sizeContext(_ctx, getState());
-		enterRule(_localctx, 40, RULE_fetch_batch_size);
+		enterRule(_localctx, 44, RULE_fetch_batch_size);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(193);
-			match(T__1);
-			setState(194);
+			setState(205);
+			match(T__0);
+			setState(206);
 			match(NUMBER_LITERAL);
-			setState(195);
-			match(T__2);
+			setState(207);
+			match(T__1);
 			}
 		}
 		catch (RecognitionException re) {
@@ -1282,26 +1397,26 @@ public class EQLParser extends Parser {
 
 	public final Conditional_expressionContext conditional_expression() throws RecognitionException {
 		Conditional_expressionContext _localctx = new Conditional_expressionContext(_ctx, getState());
-		enterRule(_localctx, 42, RULE_conditional_expression);
+		enterRule(_localctx, 46, RULE_conditional_expression);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(197);
+			setState(209);
 			conditional_term();
-			setState(202);
+			setState(214);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__19) {
 				{
 				{
-				setState(198);
+				setState(210);
 				match(T__19);
-				setState(199);
+				setState(211);
 				conditional_term();
 				}
 				}
-				setState(204);
+				setState(216);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -1341,26 +1456,26 @@ public class EQLParser extends Parser {
 
 	public final Conditional_termContext conditional_term() throws RecognitionException {
 		Conditional_termContext _localctx = new Conditional_termContext(_ctx, getState());
-		enterRule(_localctx, 44, RULE_conditional_term);
+		enterRule(_localctx, 48, RULE_conditional_term);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(205);
+			setState(217);
 			conditional_factor();
-			setState(210);
+			setState(222);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__20) {
 				{
 				{
-				setState(206);
+				setState(218);
 				match(T__20);
-				setState(207);
+				setState(219);
 				conditional_factor();
 				}
 				}
-				setState(212);
+				setState(224);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -1397,22 +1512,22 @@ public class EQLParser extends Parser {
 
 	public final Conditional_factorContext conditional_factor() throws RecognitionException {
 		Conditional_factorContext _localctx = new Conditional_factorContext(_ctx, getState());
-		enterRule(_localctx, 46, RULE_conditional_factor);
+		enterRule(_localctx, 50, RULE_conditional_factor);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(214);
+			setState(226);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__21) {
 				{
-				setState(213);
+				setState(225);
 				match(T__21);
 				}
 			}
 
-			setState(216);
+			setState(228);
 			conditional_primary();
 			}
 		}
@@ -1450,27 +1565,27 @@ public class EQLParser extends Parser {
 
 	public final Conditional_primaryContext conditional_primary() throws RecognitionException {
 		Conditional_primaryContext _localctx = new Conditional_primaryContext(_ctx, getState());
-		enterRule(_localctx, 48, RULE_conditional_primary);
+		enterRule(_localctx, 52, RULE_conditional_primary);
 		try {
-			setState(223);
+			setState(235);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,21,_ctx) ) {
+			switch ( getInterpreter().adaptivePredict(_input,22,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(218);
+				setState(230);
 				any_expression();
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(219);
-				match(T__1);
-				setState(220);
+				setState(231);
+				match(T__0);
+				setState(232);
 				conditional_expression();
-				setState(221);
-				match(T__2);
+				setState(233);
+				match(T__1);
 				}
 				break;
 			}
@@ -1536,90 +1651,90 @@ public class EQLParser extends Parser {
 
 	public final Any_expressionContext any_expression() throws RecognitionException {
 		Any_expressionContext _localctx = new Any_expressionContext(_ctx, getState());
-		enterRule(_localctx, 50, RULE_any_expression);
+		enterRule(_localctx, 54, RULE_any_expression);
 		try {
-			setState(239);
+			setState(251);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,22,_ctx) ) {
+			switch ( getInterpreter().adaptivePredict(_input,23,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(225);
+				setState(237);
 				comparison_expression();
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(226);
+				setState(238);
 				like_expression();
 				}
 				break;
 			case 3:
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(227);
+				setState(239);
 				inrange_expression();
 				}
 				break;
 			case 4:
 				enterOuterAlt(_localctx, 4);
 				{
-				setState(228);
+				setState(240);
 				between_expression();
 				}
 				break;
 			case 5:
 				enterOuterAlt(_localctx, 5);
 				{
-				setState(229);
+				setState(241);
 				propertyBetween_expression();
 				}
 				break;
 			case 6:
 				enterOuterAlt(_localctx, 6);
 				{
-				setState(230);
+				setState(242);
 				in_expression();
 				}
 				break;
 			case 7:
 				enterOuterAlt(_localctx, 7);
 				{
-				setState(231);
+				setState(243);
 				isNull_expression();
 				}
 				break;
 			case 8:
 				enterOuterAlt(_localctx, 8);
 				{
-				setState(232);
+				setState(244);
 				isNotNull_expression();
 				}
 				break;
 			case 9:
 				enterOuterAlt(_localctx, 9);
 				{
-				setState(233);
+				setState(245);
 				isEmpty_expression();
 				}
 				break;
 			case 10:
 				enterOuterAlt(_localctx, 10);
 				{
-				setState(234);
+				setState(246);
 				isNotEmpty_expression();
 				}
 				break;
 			case 11:
 				enterOuterAlt(_localctx, 11);
 				{
-				setState(235);
-				match(T__1);
-				setState(236);
+				setState(247);
+				match(T__0);
+				setState(248);
 				any_expression();
-				setState(237);
-				match(T__2);
+				setState(249);
+				match(T__1);
 				}
 				break;
 			}
@@ -1656,15 +1771,15 @@ public class EQLParser extends Parser {
 
 	public final In_expressionContext in_expression() throws RecognitionException {
 		In_expressionContext _localctx = new In_expressionContext(_ctx, getState());
-		enterRule(_localctx, 52, RULE_in_expression);
+		enterRule(_localctx, 56, RULE_in_expression);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(241);
+			setState(253);
 			match(PATH_VARIABLE);
-			setState(242);
+			setState(254);
 			match(T__22);
-			setState(243);
+			setState(255);
 			in_value();
 			}
 		}
@@ -1703,44 +1818,44 @@ public class EQLParser extends Parser {
 
 	public final In_valueContext in_value() throws RecognitionException {
 		In_valueContext _localctx = new In_valueContext(_ctx, getState());
-		enterRule(_localctx, 54, RULE_in_value);
+		enterRule(_localctx, 58, RULE_in_value);
 		int _la;
 		try {
-			setState(257);
+			setState(269);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case INPUT_VARIABLE:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(245);
+				setState(257);
 				match(INPUT_VARIABLE);
 				}
 				break;
-			case T__1:
+			case T__0:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(246);
-				match(T__1);
-				setState(247);
+				setState(258);
+				match(T__0);
+				setState(259);
 				value_expression();
-				setState(252);
+				setState(264);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 				while (_la==T__7) {
 					{
 					{
-					setState(248);
+					setState(260);
 					match(T__7);
-					setState(249);
+					setState(261);
 					value_expression();
 					}
 					}
-					setState(254);
+					setState(266);
 					_errHandler.sync(this);
 					_la = _input.LA(1);
 				}
-				setState(255);
-				match(T__2);
+				setState(267);
+				match(T__1);
 				}
 				break;
 			default:
@@ -1782,19 +1897,19 @@ public class EQLParser extends Parser {
 
 	public final Between_expressionContext between_expression() throws RecognitionException {
 		Between_expressionContext _localctx = new Between_expressionContext(_ctx, getState());
-		enterRule(_localctx, 56, RULE_between_expression);
+		enterRule(_localctx, 60, RULE_between_expression);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(259);
+			setState(271);
 			match(PATH_VARIABLE);
-			setState(260);
+			setState(272);
 			match(T__23);
-			setState(261);
+			setState(273);
 			value_expression();
-			setState(262);
+			setState(274);
 			match(T__20);
-			setState(263);
+			setState(275);
 			value_expression();
 			}
 		}
@@ -1833,19 +1948,19 @@ public class EQLParser extends Parser {
 
 	public final Inrange_expressionContext inrange_expression() throws RecognitionException {
 		Inrange_expressionContext _localctx = new Inrange_expressionContext(_ctx, getState());
-		enterRule(_localctx, 58, RULE_inrange_expression);
+		enterRule(_localctx, 62, RULE_inrange_expression);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(265);
+			setState(277);
 			match(PATH_VARIABLE);
-			setState(266);
+			setState(278);
 			match(T__24);
-			setState(267);
+			setState(279);
 			value_expression();
-			setState(268);
+			setState(280);
 			match(T__25);
-			setState(269);
+			setState(281);
 			value_expression();
 			}
 		}
@@ -1884,19 +1999,19 @@ public class EQLParser extends Parser {
 
 	public final PropertyBetween_expressionContext propertyBetween_expression() throws RecognitionException {
 		PropertyBetween_expressionContext _localctx = new PropertyBetween_expressionContext(_ctx, getState());
-		enterRule(_localctx, 60, RULE_propertyBetween_expression);
+		enterRule(_localctx, 64, RULE_propertyBetween_expression);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(271);
+			setState(283);
 			value_expression();
-			setState(272);
+			setState(284);
 			match(T__23);
-			setState(273);
+			setState(285);
 			match(PATH_VARIABLE);
-			setState(274);
+			setState(286);
 			match(T__20);
-			setState(275);
+			setState(287);
 			match(PATH_VARIABLE);
 			}
 		}
@@ -1929,28 +2044,28 @@ public class EQLParser extends Parser {
 
 	public final IsNull_expressionContext isNull_expression() throws RecognitionException {
 		IsNull_expressionContext _localctx = new IsNull_expressionContext(_ctx, getState());
-		enterRule(_localctx, 62, RULE_isNull_expression);
+		enterRule(_localctx, 66, RULE_isNull_expression);
 		try {
-			setState(282);
+			setState(294);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,25,_ctx) ) {
+			switch ( getInterpreter().adaptivePredict(_input,26,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(277);
+				setState(289);
 				match(PATH_VARIABLE);
-				setState(278);
+				setState(290);
 				match(T__26);
-				setState(279);
+				setState(291);
 				match(T__27);
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(280);
+				setState(292);
 				match(PATH_VARIABLE);
-				setState(281);
+				setState(293);
 				match(T__28);
 				}
 				break;
@@ -1985,39 +2100,39 @@ public class EQLParser extends Parser {
 
 	public final IsNotNull_expressionContext isNotNull_expression() throws RecognitionException {
 		IsNotNull_expressionContext _localctx = new IsNotNull_expressionContext(_ctx, getState());
-		enterRule(_localctx, 64, RULE_isNotNull_expression);
+		enterRule(_localctx, 68, RULE_isNotNull_expression);
 		try {
-			setState(292);
+			setState(304);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,26,_ctx) ) {
+			switch ( getInterpreter().adaptivePredict(_input,27,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(284);
+				setState(296);
 				match(PATH_VARIABLE);
-				setState(285);
+				setState(297);
 				match(T__26);
-				setState(286);
+				setState(298);
 				match(T__21);
-				setState(287);
+				setState(299);
 				match(T__27);
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(288);
+				setState(300);
 				match(PATH_VARIABLE);
-				setState(289);
+				setState(301);
 				match(T__29);
 				}
 				break;
 			case 3:
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(290);
+				setState(302);
 				match(PATH_VARIABLE);
-				setState(291);
+				setState(303);
 				match(T__30);
 				}
 				break;
@@ -2052,28 +2167,28 @@ public class EQLParser extends Parser {
 
 	public final IsEmpty_expressionContext isEmpty_expression() throws RecognitionException {
 		IsEmpty_expressionContext _localctx = new IsEmpty_expressionContext(_ctx, getState());
-		enterRule(_localctx, 66, RULE_isEmpty_expression);
+		enterRule(_localctx, 70, RULE_isEmpty_expression);
 		try {
-			setState(299);
+			setState(311);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,27,_ctx) ) {
+			switch ( getInterpreter().adaptivePredict(_input,28,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(294);
+				setState(306);
 				match(PATH_VARIABLE);
-				setState(295);
+				setState(307);
 				match(T__26);
-				setState(296);
+				setState(308);
 				match(T__31);
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(297);
+				setState(309);
 				match(PATH_VARIABLE);
-				setState(298);
+				setState(310);
 				match(T__32);
 				}
 				break;
@@ -2108,39 +2223,39 @@ public class EQLParser extends Parser {
 
 	public final IsNotEmpty_expressionContext isNotEmpty_expression() throws RecognitionException {
 		IsNotEmpty_expressionContext _localctx = new IsNotEmpty_expressionContext(_ctx, getState());
-		enterRule(_localctx, 68, RULE_isNotEmpty_expression);
+		enterRule(_localctx, 72, RULE_isNotEmpty_expression);
 		try {
-			setState(309);
+			setState(321);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,28,_ctx) ) {
+			switch ( getInterpreter().adaptivePredict(_input,29,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(301);
+				setState(313);
 				match(PATH_VARIABLE);
-				setState(302);
+				setState(314);
 				match(T__26);
-				setState(303);
+				setState(315);
 				match(T__21);
-				setState(304);
+				setState(316);
 				match(T__31);
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(305);
+				setState(317);
 				match(PATH_VARIABLE);
-				setState(306);
+				setState(318);
 				match(T__33);
 				}
 				break;
 			case 3:
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(307);
+				setState(319);
 				match(PATH_VARIABLE);
-				setState(308);
+				setState(320);
 				match(T__34);
 				}
 				break;
@@ -2181,15 +2296,15 @@ public class EQLParser extends Parser {
 
 	public final Like_expressionContext like_expression() throws RecognitionException {
 		Like_expressionContext _localctx = new Like_expressionContext(_ctx, getState());
-		enterRule(_localctx, 70, RULE_like_expression);
+		enterRule(_localctx, 74, RULE_like_expression);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(311);
+			setState(323);
 			match(PATH_VARIABLE);
-			setState(312);
+			setState(324);
 			like_op();
-			setState(313);
+			setState(325);
 			value_expression();
 			}
 		}
@@ -2221,12 +2336,12 @@ public class EQLParser extends Parser {
 
 	public final Like_opContext like_op() throws RecognitionException {
 		Like_opContext _localctx = new Like_opContext(_ctx, getState());
-		enterRule(_localctx, 72, RULE_like_op);
+		enterRule(_localctx, 76, RULE_like_op);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(315);
+			setState(327);
 			_la = _input.LA(1);
 			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__35) | (1L << T__36) | (1L << T__37) | (1L << T__38) | (1L << T__39) | (1L << T__40) | (1L << T__41) | (1L << T__42))) != 0)) ) {
 			_errHandler.recoverInline(this);
@@ -2273,19 +2388,19 @@ public class EQLParser extends Parser {
 
 	public final Comparison_expressionContext comparison_expression() throws RecognitionException {
 		Comparison_expressionContext _localctx = new Comparison_expressionContext(_ctx, getState());
-		enterRule(_localctx, 74, RULE_comparison_expression);
+		enterRule(_localctx, 78, RULE_comparison_expression);
 		try {
-			setState(325);
+			setState(337);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case PATH_VARIABLE:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(317);
+				setState(329);
 				match(PATH_VARIABLE);
-				setState(318);
+				setState(330);
 				comparison_operator();
-				setState(319);
+				setState(331);
 				value_expression();
 				}
 				break;
@@ -2295,11 +2410,11 @@ public class EQLParser extends Parser {
 			case STRING_LITERAL:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(321);
+				setState(333);
 				value_expression();
-				setState(322);
+				setState(334);
 				comparison_operator();
-				setState(323);
+				setState(335);
 				match(PATH_VARIABLE);
 				}
 				break;
@@ -2335,12 +2450,12 @@ public class EQLParser extends Parser {
 
 	public final Comparison_operatorContext comparison_operator() throws RecognitionException {
 		Comparison_operatorContext _localctx = new Comparison_operatorContext(_ctx, getState());
-		enterRule(_localctx, 76, RULE_comparison_operator);
+		enterRule(_localctx, 80, RULE_comparison_operator);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(327);
+			setState(339);
 			_la = _input.LA(1);
 			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__43) | (1L << T__44) | (1L << T__45) | (1L << T__46) | (1L << T__47) | (1L << T__48) | (1L << T__49) | (1L << T__50) | (1L << T__51) | (1L << T__52) | (1L << T__53) | (1L << T__54) | (1L << T__55) | (1L << T__56) | (1L << T__57) | (1L << T__58) | (1L << T__59))) != 0)) ) {
 			_errHandler.recoverInline(this);
@@ -2384,9 +2499,9 @@ public class EQLParser extends Parser {
 
 	public final Value_expressionContext value_expression() throws RecognitionException {
 		Value_expressionContext _localctx = new Value_expressionContext(_ctx, getState());
-		enterRule(_localctx, 78, RULE_value_expression);
+		enterRule(_localctx, 82, RULE_value_expression);
 		try {
-			setState(331);
+			setState(343);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case BOOLEAN_LITERAL:
@@ -2394,14 +2509,14 @@ public class EQLParser extends Parser {
 			case STRING_LITERAL:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(329);
+				setState(341);
 				literal();
 				}
 				break;
 			case INPUT_VARIABLE:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(330);
+				setState(342);
 				match(INPUT_VARIABLE);
 				}
 				break;
@@ -2440,14 +2555,14 @@ public class EQLParser extends Parser {
 
 	public final LiteralContext literal() throws RecognitionException {
 		LiteralContext _localctx = new LiteralContext(_ctx, getState());
-		enterRule(_localctx, 80, RULE_literal);
+		enterRule(_localctx, 84, RULE_literal);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(333);
+			setState(345);
 			_la = _input.LA(1);
-			if ( !(((((_la - 63)) & ~0x3f) == 0 && ((1L << (_la - 63)) & ((1L << (BOOLEAN_LITERAL - 63)) | (1L << (NUMBER_LITERAL - 63)) | (1L << (STRING_LITERAL - 63)))) != 0)) ) {
+			if ( !(((((_la - 65)) & ~0x3f) == 0 && ((1L << (_la - 65)) & ((1L << (BOOLEAN_LITERAL - 65)) | (1L << (NUMBER_LITERAL - 65)) | (1L << (STRING_LITERAL - 65)))) != 0)) ) {
 			_errHandler.recoverInline(this);
 			}
 			else {
@@ -2469,118 +2584,122 @@ public class EQLParser extends Parser {
 	}
 
 	public static final String _serializedATN =
-		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3G\u0152\4\2\t\2\4"+
+		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3I\u015e\4\2\t\2\4"+
 		"\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t"+
 		"\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"+
 		"\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"+
 		"\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\4\36\t\36\4\37\t\37\4 \t \4!"+
-		"\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\4*\t*\3\2\5\2"+
-		"V\n\2\3\2\7\2Y\n\2\f\2\16\2\\\13\2\3\2\5\2_\n\2\3\2\5\2b\n\2\3\2\5\2e"+
-		"\n\2\3\2\3\2\3\3\3\3\5\3k\n\3\3\3\3\3\3\3\3\3\3\4\3\4\3\5\3\5\3\6\3\6"+
-		"\3\6\3\7\3\7\3\7\3\7\3\7\7\7}\n\7\f\7\16\7\u0080\13\7\3\b\3\b\5\b\u0084"+
-		"\n\b\3\b\5\b\u0087\n\b\3\t\3\t\3\t\3\t\5\t\u008d\n\t\3\n\3\n\3\13\3\13"+
-		"\3\13\5\13\u0094\n\13\3\f\3\f\3\f\3\r\3\r\5\r\u009b\n\r\3\r\3\r\5\r\u009f"+
-		"\n\r\3\16\3\16\3\16\3\16\3\17\3\17\3\17\7\17\u00a8\n\17\f\17\16\17\u00ab"+
-		"\13\17\3\20\3\20\3\20\5\20\u00b0\n\20\3\21\3\21\3\21\3\22\3\22\3\22\3"+
-		"\23\3\23\5\23\u00ba\n\23\3\24\3\24\5\24\u00be\n\24\3\25\3\25\5\25\u00c2"+
-		"\n\25\3\26\3\26\3\26\3\26\3\27\3\27\3\27\7\27\u00cb\n\27\f\27\16\27\u00ce"+
-		"\13\27\3\30\3\30\3\30\7\30\u00d3\n\30\f\30\16\30\u00d6\13\30\3\31\5\31"+
-		"\u00d9\n\31\3\31\3\31\3\32\3\32\3\32\3\32\3\32\5\32\u00e2\n\32\3\33\3"+
-		"\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\5\33\u00f2"+
-		"\n\33\3\34\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\35\7\35\u00fd\n\35\f\35"+
-		"\16\35\u0100\13\35\3\35\3\35\5\35\u0104\n\35\3\36\3\36\3\36\3\36\3\36"+
-		"\3\36\3\37\3\37\3\37\3\37\3\37\3\37\3 \3 \3 \3 \3 \3 \3!\3!\3!\3!\3!\5"+
-		"!\u011d\n!\3\"\3\"\3\"\3\"\3\"\3\"\3\"\3\"\5\"\u0127\n\"\3#\3#\3#\3#\3"+
-		"#\5#\u012e\n#\3$\3$\3$\3$\3$\3$\3$\3$\5$\u0138\n$\3%\3%\3%\3%\3&\3&\3"+
-		"\'\3\'\3\'\3\'\3\'\3\'\3\'\3\'\5\'\u0148\n\'\3(\3(\3)\3)\5)\u014e\n)\3"+
-		"*\3*\3*\2\2+\2\4\6\b\n\f\16\20\22\24\26\30\32\34\36 \"$&(*,.\60\62\64"+
-		"\668:<>@BDFHJLNPR\2\6\3\2\16\17\3\2&-\3\2.>\4\2ABFF\2\u0153\2U\3\2\2\2"+
-		"\4h\3\2\2\2\6p\3\2\2\2\br\3\2\2\2\nt\3\2\2\2\fw\3\2\2\2\16\u0081\3\2\2"+
-		"\2\20\u008c\3\2\2\2\22\u008e\3\2\2\2\24\u0090\3\2\2\2\26\u0095\3\2\2\2"+
-		"\30\u0098\3\2\2\2\32\u00a0\3\2\2\2\34\u00a4\3\2\2\2\36\u00af\3\2\2\2 "+
-		"\u00b1\3\2\2\2\"\u00b4\3\2\2\2$\u00b9\3\2\2\2&\u00bb\3\2\2\2(\u00bf\3"+
-		"\2\2\2*\u00c3\3\2\2\2,\u00c7\3\2\2\2.\u00cf\3\2\2\2\60\u00d8\3\2\2\2\62"+
-		"\u00e1\3\2\2\2\64\u00f1\3\2\2\2\66\u00f3\3\2\2\28\u0103\3\2\2\2:\u0105"+
-		"\3\2\2\2<\u010b\3\2\2\2>\u0111\3\2\2\2@\u011c\3\2\2\2B\u0126\3\2\2\2D"+
-		"\u012d\3\2\2\2F\u0137\3\2\2\2H\u0139\3\2\2\2J\u013d\3\2\2\2L\u0147\3\2"+
-		"\2\2N\u0149\3\2\2\2P\u014d\3\2\2\2R\u014f\3\2\2\2TV\5\4\3\2UT\3\2\2\2"+
-		"UV\3\2\2\2VZ\3\2\2\2WY\5\b\5\2XW\3\2\2\2Y\\\3\2\2\2ZX\3\2\2\2Z[\3\2\2"+
-		"\2[^\3\2\2\2\\Z\3\2\2\2]_\5\n\6\2^]\3\2\2\2^_\3\2\2\2_a\3\2\2\2`b\5\f"+
-		"\7\2a`\3\2\2\2ab\3\2\2\2bd\3\2\2\2ce\5\24\13\2dc\3\2\2\2de\3\2\2\2ef\3"+
-		"\2\2\2fg\7\2\2\3g\3\3\2\2\2hj\7\3\2\2ik\5\6\4\2ji\3\2\2\2jk\3\2\2\2kl"+
-		"\3\2\2\2lm\7\4\2\2mn\5\34\17\2no\7\5\2\2o\5\3\2\2\2pq\7\6\2\2q\7\3\2\2"+
-		"\2rs\5\30\r\2s\t\3\2\2\2tu\7\7\2\2uv\5,\27\2v\13\3\2\2\2wx\7\b\2\2xy\7"+
-		"\t\2\2y~\5\16\b\2z{\7\n\2\2{}\5\16\b\2|z\3\2\2\2}\u0080\3\2\2\2~|\3\2"+
-		"\2\2~\177\3\2\2\2\177\r\3\2\2\2\u0080~\3\2\2\2\u0081\u0083\7@\2\2\u0082"+
-		"\u0084\5\22\n\2\u0083\u0082\3\2\2\2\u0083\u0084\3\2\2\2\u0084\u0086\3"+
-		"\2\2\2\u0085\u0087\5\20\t\2\u0086\u0085\3\2\2\2\u0086\u0087\3\2\2\2\u0087"+
-		"\17\3\2\2\2\u0088\u0089\7\13\2\2\u0089\u008d\7\f\2\2\u008a\u008b\7\13"+
-		"\2\2\u008b\u008d\7\r\2\2\u008c\u0088\3\2\2\2\u008c\u008a\3\2\2\2\u008d"+
-		"\21\3\2\2\2\u008e\u008f\t\2\2\2\u008f\23\3\2\2\2\u0090\u0091\7\20\2\2"+
-		"\u0091\u0093\7B\2\2\u0092\u0094\5\26\f\2\u0093\u0092\3\2\2\2\u0093\u0094"+
-		"\3\2\2\2\u0094\25\3\2\2\2\u0095\u0096\7\21\2\2\u0096\u0097\7B\2\2\u0097"+
-		"\27\3\2\2\2\u0098\u009a\7\22\2\2\u0099\u009b\5$\23\2\u009a\u0099\3\2\2"+
-		"\2\u009a\u009b\3\2\2\2\u009b\u009c\3\2\2\2\u009c\u009e\7@\2\2\u009d\u009f"+
-		"\5\32\16\2\u009e\u009d\3\2\2\2\u009e\u009f\3\2\2\2\u009f\31\3\2\2\2\u00a0"+
-		"\u00a1\7\4\2\2\u00a1\u00a2\5\34\17\2\u00a2\u00a3\7\5\2\2\u00a3\33\3\2"+
-		"\2\2\u00a4\u00a9\5\36\20\2\u00a5\u00a6\7\n\2\2\u00a6\u00a8\5\36\20\2\u00a7"+
-		"\u00a5\3\2\2\2\u00a8\u00ab\3\2\2\2\u00a9\u00a7\3\2\2\2\u00a9\u00aa\3\2"+
-		"\2\2\u00aa\35\3\2\2\2\u00ab\u00a9\3\2\2\2\u00ac\u00b0\7@\2\2\u00ad\u00b0"+
-		"\5 \21\2\u00ae\u00b0\5\"\22\2\u00af\u00ac\3\2\2\2\u00af\u00ad\3\2\2\2"+
-		"\u00af\u00ae\3\2\2\2\u00b0\37\3\2\2\2\u00b1\u00b2\7\23\2\2\u00b2\u00b3"+
-		"\5&\24\2\u00b3!\3\2\2\2\u00b4\u00b5\7\23\2\2\u00b5\u00b6\5(\25\2\u00b6"+
-		"#\3\2\2\2\u00b7\u00ba\5&\24\2\u00b8\u00ba\5(\25\2\u00b9\u00b7\3\2\2\2"+
-		"\u00b9\u00b8\3\2\2\2\u00ba%\3\2\2\2\u00bb\u00bd\7\24\2\2\u00bc\u00be\5"+
-		"*\26\2\u00bd\u00bc\3\2\2\2\u00bd\u00be\3\2\2\2\u00be\'\3\2\2\2\u00bf\u00c1"+
-		"\7\25\2\2\u00c0\u00c2\5*\26\2\u00c1\u00c0\3\2\2\2\u00c1\u00c2\3\2\2\2"+
-		"\u00c2)\3\2\2\2\u00c3\u00c4\7\4\2\2\u00c4\u00c5\7B\2\2\u00c5\u00c6\7\5"+
-		"\2\2\u00c6+\3\2\2\2\u00c7\u00cc\5.\30\2\u00c8\u00c9\7\26\2\2\u00c9\u00cb"+
-		"\5.\30\2\u00ca\u00c8\3\2\2\2\u00cb\u00ce\3\2\2\2\u00cc\u00ca\3\2\2\2\u00cc"+
-		"\u00cd\3\2\2\2\u00cd-\3\2\2\2\u00ce\u00cc\3\2\2\2\u00cf\u00d4\5\60\31"+
-		"\2\u00d0\u00d1\7\27\2\2\u00d1\u00d3\5\60\31\2\u00d2\u00d0\3\2\2\2\u00d3"+
-		"\u00d6\3\2\2\2\u00d4\u00d2\3\2\2\2\u00d4\u00d5\3\2\2\2\u00d5/\3\2\2\2"+
-		"\u00d6\u00d4\3\2\2\2\u00d7\u00d9\7\30\2\2\u00d8\u00d7\3\2\2\2\u00d8\u00d9"+
-		"\3\2\2\2\u00d9\u00da\3\2\2\2\u00da\u00db\5\62\32\2\u00db\61\3\2\2\2\u00dc"+
-		"\u00e2\5\64\33\2\u00dd\u00de\7\4\2\2\u00de\u00df\5,\27\2\u00df\u00e0\7"+
-		"\5\2\2\u00e0\u00e2\3\2\2\2\u00e1\u00dc\3\2\2\2\u00e1\u00dd\3\2\2\2\u00e2"+
-		"\63\3\2\2\2\u00e3\u00f2\5L\'\2\u00e4\u00f2\5H%\2\u00e5\u00f2\5<\37\2\u00e6"+
-		"\u00f2\5:\36\2\u00e7\u00f2\5> \2\u00e8\u00f2\5\66\34\2\u00e9\u00f2\5@"+
-		"!\2\u00ea\u00f2\5B\"\2\u00eb\u00f2\5D#\2\u00ec\u00f2\5F$\2\u00ed\u00ee"+
-		"\7\4\2\2\u00ee\u00ef\5\64\33\2\u00ef\u00f0\7\5\2\2\u00f0\u00f2\3\2\2\2"+
-		"\u00f1\u00e3\3\2\2\2\u00f1\u00e4\3\2\2\2\u00f1\u00e5\3\2\2\2\u00f1\u00e6"+
-		"\3\2\2\2\u00f1\u00e7\3\2\2\2\u00f1\u00e8\3\2\2\2\u00f1\u00e9\3\2\2\2\u00f1"+
-		"\u00ea\3\2\2\2\u00f1\u00eb\3\2\2\2\u00f1\u00ec\3\2\2\2\u00f1\u00ed\3\2"+
-		"\2\2\u00f2\65\3\2\2\2\u00f3\u00f4\7@\2\2\u00f4\u00f5\7\31\2\2\u00f5\u00f6"+
-		"\58\35\2\u00f6\67\3\2\2\2\u00f7\u0104\7?\2\2\u00f8\u00f9\7\4\2\2\u00f9"+
-		"\u00fe\5P)\2\u00fa\u00fb\7\n\2\2\u00fb\u00fd\5P)\2\u00fc\u00fa\3\2\2\2"+
-		"\u00fd\u0100\3\2\2\2\u00fe\u00fc\3\2\2\2\u00fe\u00ff\3\2\2\2\u00ff\u0101"+
-		"\3\2\2\2\u0100\u00fe\3\2\2\2\u0101\u0102\7\5\2\2\u0102\u0104\3\2\2\2\u0103"+
-		"\u00f7\3\2\2\2\u0103\u00f8\3\2\2\2\u01049\3\2\2\2\u0105\u0106\7@\2\2\u0106"+
-		"\u0107\7\32\2\2\u0107\u0108\5P)\2\u0108\u0109\7\27\2\2\u0109\u010a\5P"+
-		")\2\u010a;\3\2\2\2\u010b\u010c\7@\2\2\u010c\u010d\7\33\2\2\u010d\u010e"+
-		"\5P)\2\u010e\u010f\7\34\2\2\u010f\u0110\5P)\2\u0110=\3\2\2\2\u0111\u0112"+
-		"\5P)\2\u0112\u0113\7\32\2\2\u0113\u0114\7@\2\2\u0114\u0115\7\27\2\2\u0115"+
-		"\u0116\7@\2\2\u0116?\3\2\2\2\u0117\u0118\7@\2\2\u0118\u0119\7\35\2\2\u0119"+
-		"\u011d\7\36\2\2\u011a\u011b\7@\2\2\u011b\u011d\7\37\2\2\u011c\u0117\3"+
-		"\2\2\2\u011c\u011a\3\2\2\2\u011dA\3\2\2\2\u011e\u011f\7@\2\2\u011f\u0120"+
-		"\7\35\2\2\u0120\u0121\7\30\2\2\u0121\u0127\7\36\2\2\u0122\u0123\7@\2\2"+
-		"\u0123\u0127\7 \2\2\u0124\u0125\7@\2\2\u0125\u0127\7!\2\2\u0126\u011e"+
-		"\3\2\2\2\u0126\u0122\3\2\2\2\u0126\u0124\3\2\2\2\u0127C\3\2\2\2\u0128"+
-		"\u0129\7@\2\2\u0129\u012a\7\35\2\2\u012a\u012e\7\"\2\2\u012b\u012c\7@"+
-		"\2\2\u012c\u012e\7#\2\2\u012d\u0128\3\2\2\2\u012d\u012b\3\2\2\2\u012e"+
-		"E\3\2\2\2\u012f\u0130\7@\2\2\u0130\u0131\7\35\2\2\u0131\u0132\7\30\2\2"+
-		"\u0132\u0138\7\"\2\2\u0133\u0134\7@\2\2\u0134\u0138\7$\2\2\u0135\u0136"+
-		"\7@\2\2\u0136\u0138\7%\2\2\u0137\u012f\3\2\2\2\u0137\u0133\3\2\2\2\u0137"+
-		"\u0135\3\2\2\2\u0138G\3\2\2\2\u0139\u013a\7@\2\2\u013a\u013b\5J&\2\u013b"+
-		"\u013c\5P)\2\u013cI\3\2\2\2\u013d\u013e\t\3\2\2\u013eK\3\2\2\2\u013f\u0140"+
-		"\7@\2\2\u0140\u0141\5N(\2\u0141\u0142\5P)\2\u0142\u0148\3\2\2\2\u0143"+
-		"\u0144\5P)\2\u0144\u0145\5N(\2\u0145\u0146\7@\2\2\u0146\u0148\3\2\2\2"+
-		"\u0147\u013f\3\2\2\2\u0147\u0143\3\2\2\2\u0148M\3\2\2\2\u0149\u014a\t"+
-		"\4\2\2\u014aO\3\2\2\2\u014b\u014e\5R*\2\u014c\u014e\7?\2\2\u014d\u014b"+
-		"\3\2\2\2\u014d\u014c\3\2\2\2\u014eQ\3\2\2\2\u014f\u0150\t\5\2\2\u0150"+
-		"S\3\2\2\2!UZ^adj~\u0083\u0086\u008c\u0093\u009a\u009e\u00a9\u00af\u00b9"+
-		"\u00bd\u00c1\u00cc\u00d4\u00d8\u00e1\u00f1\u00fe\u0103\u011c\u0126\u012d"+
-		"\u0137\u0147\u014d";
+		"\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\4*\t*\4+\t+\4"+
+		",\t,\3\2\5\2Z\n\2\3\2\7\2]\n\2\f\2\16\2`\13\2\3\2\5\2c\n\2\3\2\5\2f\n"+
+		"\2\3\2\5\2i\n\2\3\2\3\2\3\3\3\3\3\3\3\3\3\3\5\3r\n\3\3\4\3\4\5\4v\n\4"+
+		"\3\4\3\4\3\5\3\5\3\6\3\6\3\7\3\7\3\7\3\b\3\b\3\b\3\b\3\b\7\b\u0086\n\b"+
+		"\f\b\16\b\u0089\13\b\3\t\3\t\5\t\u008d\n\t\3\t\5\t\u0090\n\t\3\n\3\n\3"+
+		"\n\3\n\5\n\u0096\n\n\3\13\3\13\3\f\3\f\3\f\5\f\u009d\n\f\3\r\3\r\3\r\3"+
+		"\16\3\16\5\16\u00a4\n\16\3\16\3\16\5\16\u00a8\n\16\3\17\3\17\3\17\3\17"+
+		"\3\20\3\20\3\20\7\20\u00b1\n\20\f\20\16\20\u00b4\13\20\3\21\3\21\3\22"+
+		"\3\22\3\22\3\22\5\22\u00bc\n\22\3\23\3\23\3\23\3\24\3\24\3\24\3\25\3\25"+
+		"\5\25\u00c6\n\25\3\26\3\26\5\26\u00ca\n\26\3\27\3\27\5\27\u00ce\n\27\3"+
+		"\30\3\30\3\30\3\30\3\31\3\31\3\31\7\31\u00d7\n\31\f\31\16\31\u00da\13"+
+		"\31\3\32\3\32\3\32\7\32\u00df\n\32\f\32\16\32\u00e2\13\32\3\33\5\33\u00e5"+
+		"\n\33\3\33\3\33\3\34\3\34\3\34\3\34\3\34\5\34\u00ee\n\34\3\35\3\35\3\35"+
+		"\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\5\35\u00fe\n\35"+
+		"\3\36\3\36\3\36\3\36\3\37\3\37\3\37\3\37\3\37\7\37\u0109\n\37\f\37\16"+
+		"\37\u010c\13\37\3\37\3\37\5\37\u0110\n\37\3 \3 \3 \3 \3 \3 \3!\3!\3!\3"+
+		"!\3!\3!\3\"\3\"\3\"\3\"\3\"\3\"\3#\3#\3#\3#\3#\5#\u0129\n#\3$\3$\3$\3"+
+		"$\3$\3$\3$\3$\5$\u0133\n$\3%\3%\3%\3%\3%\5%\u013a\n%\3&\3&\3&\3&\3&\3"+
+		"&\3&\3&\5&\u0144\n&\3\'\3\'\3\'\3\'\3(\3(\3)\3)\3)\3)\3)\3)\3)\3)\5)\u0154"+
+		"\n)\3*\3*\3+\3+\5+\u015a\n+\3,\3,\3,\2\2-\2\4\6\b\n\f\16\20\22\24\26\30"+
+		"\32\34\36 \"$&(*,.\60\62\64\668:<>@BDFHJLNPRTV\2\7\3\2\16\17\3\2@A\3\2"+
+		"&-\3\2.>\4\2CDHH\2\u015f\2Y\3\2\2\2\4q\3\2\2\2\6s\3\2\2\2\by\3\2\2\2\n"+
+		"{\3\2\2\2\f}\3\2\2\2\16\u0080\3\2\2\2\20\u008a\3\2\2\2\22\u0095\3\2\2"+
+		"\2\24\u0097\3\2\2\2\26\u0099\3\2\2\2\30\u009e\3\2\2\2\32\u00a1\3\2\2\2"+
+		"\34\u00a9\3\2\2\2\36\u00ad\3\2\2\2 \u00b5\3\2\2\2\"\u00bb\3\2\2\2$\u00bd"+
+		"\3\2\2\2&\u00c0\3\2\2\2(\u00c5\3\2\2\2*\u00c7\3\2\2\2,\u00cb\3\2\2\2."+
+		"\u00cf\3\2\2\2\60\u00d3\3\2\2\2\62\u00db\3\2\2\2\64\u00e4\3\2\2\2\66\u00ed"+
+		"\3\2\2\28\u00fd\3\2\2\2:\u00ff\3\2\2\2<\u010f\3\2\2\2>\u0111\3\2\2\2@"+
+		"\u0117\3\2\2\2B\u011d\3\2\2\2D\u0128\3\2\2\2F\u0132\3\2\2\2H\u0139\3\2"+
+		"\2\2J\u0143\3\2\2\2L\u0145\3\2\2\2N\u0149\3\2\2\2P\u0153\3\2\2\2R\u0155"+
+		"\3\2\2\2T\u0159\3\2\2\2V\u015b\3\2\2\2XZ\5\6\4\2YX\3\2\2\2YZ\3\2\2\2Z"+
+		"^\3\2\2\2[]\5\n\6\2\\[\3\2\2\2]`\3\2\2\2^\\\3\2\2\2^_\3\2\2\2_b\3\2\2"+
+		"\2`^\3\2\2\2ac\5\f\7\2ba\3\2\2\2bc\3\2\2\2ce\3\2\2\2df\5\16\b\2ed\3\2"+
+		"\2\2ef\3\2\2\2fh\3\2\2\2gi\5\26\f\2hg\3\2\2\2hi\3\2\2\2ij\3\2\2\2jk\7"+
+		"\2\2\3k\3\3\2\2\2lm\7\3\2\2mn\5\36\20\2no\7\4\2\2or\3\2\2\2pr\5\36\20"+
+		"\2ql\3\2\2\2qp\3\2\2\2r\5\3\2\2\2su\7\5\2\2tv\5\b\5\2ut\3\2\2\2uv\3\2"+
+		"\2\2vw\3\2\2\2wx\5\4\3\2x\7\3\2\2\2yz\7\6\2\2z\t\3\2\2\2{|\5\32\16\2|"+
+		"\13\3\2\2\2}~\7\7\2\2~\177\5\60\31\2\177\r\3\2\2\2\u0080\u0081\7\b\2\2"+
+		"\u0081\u0082\7\t\2\2\u0082\u0087\5\20\t\2\u0083\u0084\7\n\2\2\u0084\u0086"+
+		"\5\20\t\2\u0085\u0083\3\2\2\2\u0086\u0089\3\2\2\2\u0087\u0085\3\2\2\2"+
+		"\u0087\u0088\3\2\2\2\u0088\17\3\2\2\2\u0089\u0087\3\2\2\2\u008a\u008c"+
+		"\7@\2\2\u008b\u008d\5\24\13\2\u008c\u008b\3\2\2\2\u008c\u008d\3\2\2\2"+
+		"\u008d\u008f\3\2\2\2\u008e\u0090\5\22\n\2\u008f\u008e\3\2\2\2\u008f\u0090"+
+		"\3\2\2\2\u0090\21\3\2\2\2\u0091\u0092\7\13\2\2\u0092\u0096\7\f\2\2\u0093"+
+		"\u0094\7\13\2\2\u0094\u0096\7\r\2\2\u0095\u0091\3\2\2\2\u0095\u0093\3"+
+		"\2\2\2\u0096\23\3\2\2\2\u0097\u0098\t\2\2\2\u0098\25\3\2\2\2\u0099\u009a"+
+		"\7\20\2\2\u009a\u009c\7D\2\2\u009b\u009d\5\30\r\2\u009c\u009b\3\2\2\2"+
+		"\u009c\u009d\3\2\2\2\u009d\27\3\2\2\2\u009e\u009f\7\21\2\2\u009f\u00a0"+
+		"\7D\2\2\u00a0\31\3\2\2\2\u00a1\u00a3\7\22\2\2\u00a2\u00a4\5(\25\2\u00a3"+
+		"\u00a2\3\2\2\2\u00a3\u00a4\3\2\2\2\u00a4\u00a5\3\2\2\2\u00a5\u00a7\5 "+
+		"\21\2\u00a6\u00a8\5\34\17\2\u00a7\u00a6\3\2\2\2\u00a7\u00a8\3\2\2\2\u00a8"+
+		"\33\3\2\2\2\u00a9\u00aa\7\3\2\2\u00aa\u00ab\5\36\20\2\u00ab\u00ac\7\4"+
+		"\2\2\u00ac\35\3\2\2\2\u00ad\u00b2\5\"\22\2\u00ae\u00af\7\n\2\2\u00af\u00b1"+
+		"\5\"\22\2\u00b0\u00ae\3\2\2\2\u00b1\u00b4\3\2\2\2\u00b2\u00b0\3\2\2\2"+
+		"\u00b2\u00b3\3\2\2\2\u00b3\37\3\2\2\2\u00b4\u00b2\3\2\2\2\u00b5\u00b6"+
+		"\t\3\2\2\u00b6!\3\2\2\2\u00b7\u00bc\7@\2\2\u00b8\u00bc\5$\23\2\u00b9\u00bc"+
+		"\5&\24\2\u00ba\u00bc\7B\2\2\u00bb\u00b7\3\2\2\2\u00bb\u00b8\3\2\2\2\u00bb"+
+		"\u00b9\3\2\2\2\u00bb\u00ba\3\2\2\2\u00bc#\3\2\2\2\u00bd\u00be\7\23\2\2"+
+		"\u00be\u00bf\5*\26\2\u00bf%\3\2\2\2\u00c0\u00c1\7\23\2\2\u00c1\u00c2\5"+
+		",\27\2\u00c2\'\3\2\2\2\u00c3\u00c6\5*\26\2\u00c4\u00c6\5,\27\2\u00c5\u00c3"+
+		"\3\2\2\2\u00c5\u00c4\3\2\2\2\u00c6)\3\2\2\2\u00c7\u00c9\7\24\2\2\u00c8"+
+		"\u00ca\5.\30\2\u00c9\u00c8\3\2\2\2\u00c9\u00ca\3\2\2\2\u00ca+\3\2\2\2"+
+		"\u00cb\u00cd\7\25\2\2\u00cc\u00ce\5.\30\2\u00cd\u00cc\3\2\2\2\u00cd\u00ce"+
+		"\3\2\2\2\u00ce-\3\2\2\2\u00cf\u00d0\7\3\2\2\u00d0\u00d1\7D\2\2\u00d1\u00d2"+
+		"\7\4\2\2\u00d2/\3\2\2\2\u00d3\u00d8\5\62\32\2\u00d4\u00d5\7\26\2\2\u00d5"+
+		"\u00d7\5\62\32\2\u00d6\u00d4\3\2\2\2\u00d7\u00da\3\2\2\2\u00d8\u00d6\3"+
+		"\2\2\2\u00d8\u00d9\3\2\2\2\u00d9\61\3\2\2\2\u00da\u00d8\3\2\2\2\u00db"+
+		"\u00e0\5\64\33\2\u00dc\u00dd\7\27\2\2\u00dd\u00df\5\64\33\2\u00de\u00dc"+
+		"\3\2\2\2\u00df\u00e2\3\2\2\2\u00e0\u00de\3\2\2\2\u00e0\u00e1\3\2\2\2\u00e1"+
+		"\63\3\2\2\2\u00e2\u00e0\3\2\2\2\u00e3\u00e5\7\30\2\2\u00e4\u00e3\3\2\2"+
+		"\2\u00e4\u00e5\3\2\2\2\u00e5\u00e6\3\2\2\2\u00e6\u00e7\5\66\34\2\u00e7"+
+		"\65\3\2\2\2\u00e8\u00ee\58\35\2\u00e9\u00ea\7\3\2\2\u00ea\u00eb\5\60\31"+
+		"\2\u00eb\u00ec\7\4\2\2\u00ec\u00ee\3\2\2\2\u00ed\u00e8\3\2\2\2\u00ed\u00e9"+
+		"\3\2\2\2\u00ee\67\3\2\2\2\u00ef\u00fe\5P)\2\u00f0\u00fe\5L\'\2\u00f1\u00fe"+
+		"\5@!\2\u00f2\u00fe\5> \2\u00f3\u00fe\5B\"\2\u00f4\u00fe\5:\36\2\u00f5"+
+		"\u00fe\5D#\2\u00f6\u00fe\5F$\2\u00f7\u00fe\5H%\2\u00f8\u00fe\5J&\2\u00f9"+
+		"\u00fa\7\3\2\2\u00fa\u00fb\58\35\2\u00fb\u00fc\7\4\2\2\u00fc\u00fe\3\2"+
+		"\2\2\u00fd\u00ef\3\2\2\2\u00fd\u00f0\3\2\2\2\u00fd\u00f1\3\2\2\2\u00fd"+
+		"\u00f2\3\2\2\2\u00fd\u00f3\3\2\2\2\u00fd\u00f4\3\2\2\2\u00fd\u00f5\3\2"+
+		"\2\2\u00fd\u00f6\3\2\2\2\u00fd\u00f7\3\2\2\2\u00fd\u00f8\3\2\2\2\u00fd"+
+		"\u00f9\3\2\2\2\u00fe9\3\2\2\2\u00ff\u0100\7@\2\2\u0100\u0101\7\31\2\2"+
+		"\u0101\u0102\5<\37\2\u0102;\3\2\2\2\u0103\u0110\7?\2\2\u0104\u0105\7\3"+
+		"\2\2\u0105\u010a\5T+\2\u0106\u0107\7\n\2\2\u0107\u0109\5T+\2\u0108\u0106"+
+		"\3\2\2\2\u0109\u010c\3\2\2\2\u010a\u0108\3\2\2\2\u010a\u010b\3\2\2\2\u010b"+
+		"\u010d\3\2\2\2\u010c\u010a\3\2\2\2\u010d\u010e\7\4\2\2\u010e\u0110\3\2"+
+		"\2\2\u010f\u0103\3\2\2\2\u010f\u0104\3\2\2\2\u0110=\3\2\2\2\u0111\u0112"+
+		"\7@\2\2\u0112\u0113\7\32\2\2\u0113\u0114\5T+\2\u0114\u0115\7\27\2\2\u0115"+
+		"\u0116\5T+\2\u0116?\3\2\2\2\u0117\u0118\7@\2\2\u0118\u0119\7\33\2\2\u0119"+
+		"\u011a\5T+\2\u011a\u011b\7\34\2\2\u011b\u011c\5T+\2\u011cA\3\2\2\2\u011d"+
+		"\u011e\5T+\2\u011e\u011f\7\32\2\2\u011f\u0120\7@\2\2\u0120\u0121\7\27"+
+		"\2\2\u0121\u0122\7@\2\2\u0122C\3\2\2\2\u0123\u0124\7@\2\2\u0124\u0125"+
+		"\7\35\2\2\u0125\u0129\7\36\2\2\u0126\u0127\7@\2\2\u0127\u0129\7\37\2\2"+
+		"\u0128\u0123\3\2\2\2\u0128\u0126\3\2\2\2\u0129E\3\2\2\2\u012a\u012b\7"+
+		"@\2\2\u012b\u012c\7\35\2\2\u012c\u012d\7\30\2\2\u012d\u0133\7\36\2\2\u012e"+
+		"\u012f\7@\2\2\u012f\u0133\7 \2\2\u0130\u0131\7@\2\2\u0131\u0133\7!\2\2"+
+		"\u0132\u012a\3\2\2\2\u0132\u012e\3\2\2\2\u0132\u0130\3\2\2\2\u0133G\3"+
+		"\2\2\2\u0134\u0135\7@\2\2\u0135\u0136\7\35\2\2\u0136\u013a\7\"\2\2\u0137"+
+		"\u0138\7@\2\2\u0138\u013a\7#\2\2\u0139\u0134\3\2\2\2\u0139\u0137\3\2\2"+
+		"\2\u013aI\3\2\2\2\u013b\u013c\7@\2\2\u013c\u013d\7\35\2\2\u013d\u013e"+
+		"\7\30\2\2\u013e\u0144\7\"\2\2\u013f\u0140\7@\2\2\u0140\u0144\7$\2\2\u0141"+
+		"\u0142\7@\2\2\u0142\u0144\7%\2\2\u0143\u013b\3\2\2\2\u0143\u013f\3\2\2"+
+		"\2\u0143\u0141\3\2\2\2\u0144K\3\2\2\2\u0145\u0146\7@\2\2\u0146\u0147\5"+
+		"N(\2\u0147\u0148\5T+\2\u0148M\3\2\2\2\u0149\u014a\t\4\2\2\u014aO\3\2\2"+
+		"\2\u014b\u014c\7@\2\2\u014c\u014d\5R*\2\u014d\u014e\5T+\2\u014e\u0154"+
+		"\3\2\2\2\u014f\u0150\5T+\2\u0150\u0151\5R*\2\u0151\u0152\7@\2\2\u0152"+
+		"\u0154\3\2\2\2\u0153\u014b\3\2\2\2\u0153\u014f\3\2\2\2\u0154Q\3\2\2\2"+
+		"\u0155\u0156\t\5\2\2\u0156S\3\2\2\2\u0157\u015a\5V,\2\u0158\u015a\7?\2"+
+		"\2\u0159\u0157\3\2\2\2\u0159\u0158\3\2\2\2\u015aU\3\2\2\2\u015b\u015c"+
+		"\t\6\2\2\u015cW\3\2\2\2\"Y^behqu\u0087\u008c\u008f\u0095\u009c\u00a3\u00a7"+
+		"\u00b2\u00bb\u00c5\u00c9\u00cd\u00d8\u00e0\u00e4\u00ed\u00fd\u010a\u010f"+
+		"\u0128\u0132\u0139\u0143\u0153\u0159";
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {
diff --git a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
index 0ed479085..5186f9b20 100644
--- a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
@@ -7,8 +7,10 @@ import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import io.ebeaninternal.api.SpiQuery;
+import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
+import org.tests.model.basic.OrderDetail;
 import org.tests.model.basic.ResetBasicData;
 
 import java.util.Arrays;
@@ -221,14 +223,13 @@ public class EqlParserTest extends BaseTestCase {
     assertThat(query.getGeneratedSql()).contains("where not (t0.name = ?  and t0.status = ? )");
   }
 
-
   @Test
   public void where_in() {
 
     Query<Customer> query = parse("where name in ('Rob','Jim')");
     query.findList();
 
-    platformAssertIn(query.getGeneratedSql(),"where t0.name");
+    platformAssertIn(query.getGeneratedSql(), "where t0.name");
   }
 
   @Test
@@ -239,7 +240,7 @@ public class EqlParserTest extends BaseTestCase {
     query.setParameter("two", "Bar");
     query.findList();
 
-    platformAssertIn(query.getGeneratedSql(),"where t0.name");
+    platformAssertIn(query.getGeneratedSql(), "where t0.name");
   }
 
   @Test
@@ -250,7 +251,7 @@ public class EqlParserTest extends BaseTestCase {
     query.setParameter("two", "Bar");
     query.findList();
 
-    platformAssertIn(query.getGeneratedSql(),"where t0.name");
+    platformAssertIn(query.getGeneratedSql(), "where t0.name");
   }
 
   @Test
@@ -261,7 +262,7 @@ public class EqlParserTest extends BaseTestCase {
     query.setParameter("two", "Bar");
     query.findList();
 
-    platformAssertIn(query.getGeneratedSql(),"where t0.name");
+    platformAssertIn(query.getGeneratedSql(), "where t0.name");
   }
 
   @Test
@@ -271,7 +272,7 @@ public class EqlParserTest extends BaseTestCase {
     query.setParameter("names", Arrays.asList("Baz", "Maz", "Jim"));
     query.findList();
 
-    platformAssertIn(query.getGeneratedSql(),"where t0.name");
+    platformAssertIn(query.getGeneratedSql(), "where t0.name");
   }
 
   @Test
@@ -333,6 +334,79 @@ public class EqlParserTest extends BaseTestCase {
     assertThat(query.getGeneratedSql()).contains("where  ? between t0.name and t0.smallnote");
   }
 
+  @Test
+  public void selectFetch_basic() {
+
+    Query<Customer> query = parse("select name fetch billingAddress");
+    query.findList();
+
+    assertThat(query.getGeneratedSql()).contains("select t0.id, t0.name, t1.id, t1.line_1, t1.line_2, t1.city, t1.cretime, t1.updtime, t1.country_code from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id");
+  }
+
+  @Test
+  public void selectFetch_basic2() {
+
+    ResetBasicData.reset();
+
+    Query<Customer> query = parse("select name, status fetch billingAddress");
+    query.findList();
+
+    assertThat(query.getGeneratedSql()).contains("select t0.id, t0.name, t0.status, t1.id, t1.line_1, t1.line_2, t1.city, t1.cretime, t1.updtime, t1.country_code from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id");
+  }
+
+  @Test
+  public void selectFetch_withProperties() {
+
+    Query<Customer> query = parse("select name fetch billingAddress (line1, city) ");
+    query.findList();
+
+    assertThat(sqlOf(query, 12)).contains("select t0.id, t0.name, t1.id, t1.line_1, t1.city from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id");
+  }
+
+  @Test
+  public void selectFetchFetchLimit() {
+
+    Query<Customer> query = parse("select name fetch billingAddress (line1, city) fetch shippingAddress (line1) limit 10");
+    query.findList();
+
+    assertThat(sqlOf(query, 12)).contains("select t0.id, t0.name, t1.id, t1.line_1, t1.city, t2.id, t2.line_1 from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id  left join o_address t2 on t2.id = t0.shipping_address_id  order by t0.id");
+  }
+
+  @Test
+  public void selectFetchFetchMany() {
+
+    Query<Customer> query = parse("select name fetch billingAddress (line1, city) fetch contacts");
+    query.findList();
+
+    assertThat(sqlOf(query, 12)).contains("select t0.id, t0.name, t1.id, t1.line_1, t1.city, t2.id, t2.first_name, t2.last_name, t2.phone, t2.mobile, t2.email, t2.cretime, t2.updtime, t2.customer_id, t2.group_id from o_customer t0");
+  }
+
+
+  @Test
+  public void selectFetchFetchManyProperties() {
+
+    Query<Customer> query = parse("select name fetch billingAddress (line1, city) fetch contacts (email)");
+    query.findList();
+
+    assertThat(sqlOf(query, 12)).contains("select t0.id, t0.name, t1.id, t1.line_1, t1.city, t2.id, t2.email from o_customer t0");
+  }
+
+  @Test
+  public void selectFetchFetchManyPropertiesLimit() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    Query<Customer> query = parse("select name fetch billingAddress (line1, city) fetch contacts (email) limit 10");
+    query.findList();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("select t0.id, t0.name, t1.id, t1.line_1, t1.city from o_customer t0 left join o_address");
+    assertThat(sql.get(1)).contains("select t0.customer_id, t0.id, t0.email from contact t0 where (t0.customer_id) in");
+  }
+
   @Test
   public void fetch_basic() {
 
@@ -438,6 +512,58 @@ public class EqlParserTest extends BaseTestCase {
     Query<Customer> query = parse("select (name)");
     query.findList();
     assertThat(sqlOf(query, 1)).contains("select t0.id, t0.name from o_customer t0");
+
+    Query<Customer> query2 = parse("select name");
+    query2.findList();
+    assertThat(sqlOf(query2, 1)).contains("select t0.id, t0.name from o_customer t0");
+  }
+
+  @Test
+  public void select_sum() {
+
+    ResetBasicData.reset();
+
+    Query<Customer> query = parse("select (sum(id))");
+    query.findSingleAttribute();
+    assertThat(sqlOf(query, 1)).contains("select sum(t0.id) from o_customer t0");
+  }
+
+  @Test
+  public void select_max() {
+
+    ResetBasicData.reset();
+
+    Query<Customer> query = parse("select (max(cretime))");
+    query.findSingleAttribute();
+    assertThat(sqlOf(query, 1)).contains("select max(t0.cretime) from o_customer t0");
+
+    Query<Customer> query2 = parse("select max(cretime)");
+    query2.findSingleAttribute();
+    assertThat(sqlOf(query2, 1)).contains("select max(t0.cretime) from o_customer t0");
+  }
+
+  @Test
+  public void select_agg() {
+
+    ResetBasicData.reset();
+
+    Query<Customer> query = parse("select status, max(cretime)");
+    List<Customer> customers = query.findList();
+
+    assertThat(customers).isNotEmpty();
+    assertThat(sqlOf(query, 1)).contains("select t0.status, max(t0.cretime) from o_customer t0 group by t0.status");
+  }
+
+  @Test
+  public void select_agg_sum() {
+
+    ResetBasicData.reset();
+
+    Query<OrderDetail> query = Ebean.createQuery(OrderDetail.class, "select sum(orderQty) fetch `order` (id)");
+    List<OrderDetail> details = query.findList();
+
+    assertThat(details).isNotEmpty();
+    assertThat(sqlOf(query, 1)).contains("select sum(t0.order_qty), t1.id from o_order_detail t0 join o_order t1 on t1.id = t0.order_id  group by t1.id");
   }
 
   @Test
diff --git a/src/test/resources/EQL.g4 b/src/test/resources/EQL.g4
index c017775e1..3b6d1d702 100644
--- a/src/test/resources/EQL.g4
+++ b/src/test/resources/EQL.g4
@@ -4,8 +4,13 @@ select_statement
    : select_clause? fetch_clause* where_clause? orderby_clause? limit_clause? EOF
    ;
 
+select_properties
+   : '(' fetch_property_group ')'
+   | fetch_property_group
+   ;
+
 select_clause
-   : 'select' distinct? '(' fetch_property_group ')'
+   : 'select' distinct? select_properties
    ;
 
 distinct
@@ -47,7 +52,7 @@ offset_clause
    ;
 
 fetch_path
-   : 'fetch' fetch_option? PATH_VARIABLE fetch_property_set?
+   : 'fetch' fetch_option? fetch_path_path fetch_property_set?
    ;
 
 fetch_property_set
@@ -58,10 +63,16 @@ fetch_property_group
    : fetch_property (',' fetch_property)*
    ;
 
+fetch_path_path
+   : PATH_VARIABLE
+   | QUOTED_PATH_VARIABLE
+   ;
+
 fetch_property
    : PATH_VARIABLE
    | fetch_query_hint
    | fetch_lazy_hint
+   | PROP_FORMULA
    ;
 
 fetch_query_hint
@@ -210,6 +221,18 @@ PATH_VARIABLE
    : ('a' .. 'z' | 'A' .. 'Z' | '_') ('a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | '.')*
    ;
 
+QUOTED_PATH_VARIABLE
+   : ('`')(PATH_VARIABLE)('`')
+   ;
+
+PROP_FORMULA
+   : 'sum(' PATH_VARIABLE ')'
+   | 'max(' PATH_VARIABLE ')'
+   | 'min(' PATH_VARIABLE ')'
+   | 'avg(' PATH_VARIABLE ')'
+   | 'count(' PATH_VARIABLE ')'
+   ;
+
 BOOLEAN_LITERAL
    : 'true'
    | 'false'

From d4139aa8ef766933e4bcc45f26fd0f8f3187fcdf Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 22 Jan 2019 21:23:16 +1300
Subject: [PATCH 0684/1036] #1616 - Enhance EQL grammer 1) Allow select without
 ( and ) 2) support aggregate functions min,max,sum,count,avg 3) support
 quoting fetch paths (that are keywords)

Fix test for Postgres any()
---
 .../java/io/ebeaninternal/server/grammer/EqlParserTest.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
index 5186f9b20..44febf234 100644
--- a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
@@ -404,7 +404,7 @@ public class EqlParserTest extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(2);
     assertThat(sql.get(0)).contains("select t0.id, t0.name, t1.id, t1.line_1, t1.city from o_customer t0 left join o_address");
-    assertThat(sql.get(1)).contains("select t0.customer_id, t0.id, t0.email from contact t0 where (t0.customer_id) in");
+    assertThat(sql.get(1)).contains("select t0.customer_id, t0.id, t0.email from contact t0 where (t0.customer_id)");
   }
 
   @Test

From 4e1f817adef95b128c7b6f6eea8907ad10ef943b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 22 Jan 2019 21:54:03 +1300
Subject: [PATCH 0685/1036] #1617 - save() on a reference bean causes insert to
 occur ... results in duplicate key exception

Tests that reproduce the issue (supplied by Andre - thanks for that)
---
 src/test/java/org/tests/o2o/OtoLevelA.java    | 39 +++++++++++++++++++
 src/test/java/org/tests/o2o/OtoLevelB.java    | 38 ++++++++++++++++++
 src/test/java/org/tests/o2o/OtoLevelC.java    | 17 ++++++++
 .../o2o/TestOneToOneSaveWithoutChanges.java   | 36 +++++++++++++++++
 .../java/org/tests/o2o/TestReferenceSave.java | 28 +++++++++++++
 5 files changed, 158 insertions(+)
 create mode 100644 src/test/java/org/tests/o2o/OtoLevelA.java
 create mode 100644 src/test/java/org/tests/o2o/OtoLevelB.java
 create mode 100644 src/test/java/org/tests/o2o/OtoLevelC.java
 create mode 100644 src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java
 create mode 100644 src/test/java/org/tests/o2o/TestReferenceSave.java

diff --git a/src/test/java/org/tests/o2o/OtoLevelA.java b/src/test/java/org/tests/o2o/OtoLevelA.java
new file mode 100644
index 000000000..6be6928fd
--- /dev/null
+++ b/src/test/java/org/tests/o2o/OtoLevelA.java
@@ -0,0 +1,39 @@
+package org.tests.o2o;
+
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+
+@Entity
+public class OtoLevelA {
+
+  @Id
+  private Long id;
+
+  private final String name;
+
+  @OneToOne(cascade = CascadeType.ALL)
+  private OtoLevelB b;
+
+  public OtoLevelA(String name) {
+    this.name = name;
+  }
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public OtoLevelB getB() {
+    return b;
+  }
+
+  public void setB(OtoLevelB b) {
+    this.b = b;
+  }
+}
diff --git a/src/test/java/org/tests/o2o/OtoLevelB.java b/src/test/java/org/tests/o2o/OtoLevelB.java
new file mode 100644
index 000000000..5f7899cbf
--- /dev/null
+++ b/src/test/java/org/tests/o2o/OtoLevelB.java
@@ -0,0 +1,38 @@
+package org.tests.o2o;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+
+@Entity
+public class OtoLevelB {
+
+  @Id
+  private Long id;
+
+  private final String name;
+
+  @OneToOne(cascade = CascadeType.ALL)
+  private OtoLevelC c;
+
+  public OtoLevelB(String name) {
+    this.name = name;
+  }
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public OtoLevelC getC() {
+    return c;
+  }
+
+  public void setC(OtoLevelC c) {
+    this.c = c;
+  }
+}
diff --git a/src/test/java/org/tests/o2o/OtoLevelC.java b/src/test/java/org/tests/o2o/OtoLevelC.java
new file mode 100644
index 000000000..b5caa688e
--- /dev/null
+++ b/src/test/java/org/tests/o2o/OtoLevelC.java
@@ -0,0 +1,17 @@
+package org.tests.o2o;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class OtoLevelC {
+
+  @Id
+  private Long id;
+
+  private final String name;
+
+  public OtoLevelC(String name) {
+    this.name = name;
+  }
+}
diff --git a/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java b/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java
new file mode 100644
index 000000000..a80277abd
--- /dev/null
+++ b/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java
@@ -0,0 +1,36 @@
+package org.tests.o2o;
+
+
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestOneToOneSaveWithoutChanges {
+
+  @Test
+  public void testSave3Levels() {
+
+    OtoLevelA a = new OtoLevelA("A");
+    a.setB(new OtoLevelB("B"));
+    a.getB().setC(new OtoLevelC("C"));
+
+    Ebean.save(a);
+
+    OtoLevelA dbA = Ebean.find(OtoLevelA.class, 1);
+    OtoLevelB dbB = dbA.getB();
+    OtoLevelC dbC = dbB.getC();
+
+    LoggedSqlCollector.start();
+
+    Ebean.save(dbA);
+    Ebean.save(dbB);
+    Ebean.save(dbC);
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(0);
+  }
+}
diff --git a/src/test/java/org/tests/o2o/TestReferenceSave.java b/src/test/java/org/tests/o2o/TestReferenceSave.java
new file mode 100644
index 000000000..11d3bd9f2
--- /dev/null
+++ b/src/test/java/org/tests/o2o/TestReferenceSave.java
@@ -0,0 +1,28 @@
+package org.tests.o2o;
+
+
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+import org.tests.update.EPersonOnline;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestReferenceSave {
+
+  @Test
+  public void test() {
+
+    Ebean.getDefaultServer();
+
+    LoggedSqlCollector.start();
+
+    EPersonOnline bean = Ebean.getReference(EPersonOnline.class, 1L);
+    Ebean.save(bean);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(0);
+  }
+}

From 3483372ae3f6b35174d76a50d759b09505dff178 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 22 Jan 2019 21:59:04 +1300
Subject: [PATCH 0686/1036] #1617 - save() on a reference bean causes insert to
 occur ... results in duplicate key exception

Tests broken by fix as the test inserts only included id value in the insert
---
 .../TestOnCascadeDeleteChildrenWithCompositeKeys.java      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java b/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java
index 095313e33..04a37b777 100644
--- a/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java
+++ b/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java
@@ -37,8 +37,8 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase {
     Ebean.deleteAll(Ebean.find(User.class).findList());
 
     // insert 2 User records
-    Ebean.save(new User(1L));
-    Ebean.save(new User(2L));
+    Ebean.save(new User(1L, "one"));
+    Ebean.save(new User(2L, "two"));
   }
 
   /**
@@ -99,8 +99,9 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase {
     public User() {
     }
 
-    public User(Long id) {
+    public User(Long id, String name) {
       this.id = id;
+      this.name = name;
     }
 
     @Id

From a83896f1ff77e854230d501ea698b26b78a434c8 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 22 Jan 2019 21:59:17 +1300
Subject: [PATCH 0687/1036] #1617 - save() on a reference bean causes insert to
 occur ... results in duplicate key exception

Fix
---
 .../io/ebeaninternal/server/persist/DefaultPersister.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index ff8cd13c9..4fc291ca9 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -446,6 +446,10 @@ public final class DefaultPersister implements Persister {
   public void insert(EntityBean bean, Transaction t) {
 
     PersistRequestBean<?> req = createRequest(bean, t, PersistRequest.Type.INSERT);
+    if (req.isReference()) {
+      // skip insert on reference bean
+      return;
+    }
     try {
       req.initTransIfRequiredWithBatchCascade();
       insert(req);

From 396fb49acdb0cecfb9f40c840433562da0cac2dc Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 23 Jan 2019 00:29:51 +1300
Subject: [PATCH 0688/1036] #1618 - ENH: Add @Sum ... as short hand for
 @Aggregation("sum(<property name>)")

---
 pom.xml                                               |  2 +-
 .../server/deploy/parse/AnnotationFields.java         |  5 +++++
 .../org/tests/model/aggregation/DMachineStatsAgg.java | 11 +++--------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index bc8d50783..7420f8b40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>4.4</version>
+      <version>4.5</version>
     </dependency>
 
     <dependency>
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
index 8c2f48754..c140b4cc0 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
@@ -25,6 +25,7 @@ import io.ebean.annotation.Index;
 import io.ebean.annotation.JsonIgnore;
 import io.ebean.annotation.Length;
 import io.ebean.annotation.SoftDelete;
+import io.ebean.annotation.Sum;
 import io.ebean.annotation.TenantId;
 import io.ebean.annotation.UnmappedJson;
 import io.ebean.annotation.UpdatedTimestamp;
@@ -285,6 +286,10 @@ public class AnnotationFields extends AnnotationParser {
     if (aggregation != null) {
       prop.setAggregation(aggregation.value());
     }
+    Sum sum = get(prop, Sum.class);
+    if (sum != null) {
+      prop.setAggregation("sum(" + prop.getName() + ")");
+    }
 
     Version version = get(prop, Version.class);
     if (version != null) {
diff --git a/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java b/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java
index 94f642d9c..0f4774a5c 100644
--- a/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java
+++ b/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java
@@ -1,6 +1,7 @@
 package org.tests.model.aggregation;
 
 import io.ebean.annotation.Aggregation;
+import io.ebean.annotation.Sum;
 import io.ebean.annotation.View;
 
 import javax.persistence.Entity;
@@ -17,16 +18,10 @@ public class DMachineStatsAgg {
 
   LocalDate date;
 
-  /**
-   * Matching with column underscore.
-   */
-  @Aggregation("sum(totalKms)")
+  @Sum  // which is the same as: @Aggregation("sum(totalKms)")
   long totalKms;
 
-  /**
-   * Matching with no underscore.
-   */
-  @Aggregation("sum(hours)")
+  @Aggregation("sum(hours)") // which is the same as: @Sum
   long hours;
 
   @Aggregation("max(rate)")

From 210901ee2d840fc45370432517816c918ff60256 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 23 Jan 2019 00:31:18 +1300
Subject: [PATCH 0689/1036] [maven-release-plugin] prepare release
 ebean-11.33.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7420f8b40..bdafaaa5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.33.1-SNAPSHOT</version>
+  <version>11.33.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.33.1</tag>
   </scm>
 
   <profiles>

From 9cb66b112f4454952691ad1463fbbdff9fbb667e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 23 Jan 2019 00:31:34 +1300
Subject: [PATCH 0690/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index bdafaaa5d..9648bc611 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.33.1</version>
+  <version>11.33.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.33.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From d89a58482c16c451e5c637f23cc15908f6f4e009 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 23 Jan 2019 21:48:49 +1300
Subject: [PATCH 0691/1036] no effective change - tidy test order by parse

---
 .../tests/unitinternal/TestOrderByParse.java  | 119 +++++++++---------
 1 file changed, 60 insertions(+), 59 deletions(-)

diff --git a/src/test/java/org/tests/unitinternal/TestOrderByParse.java b/src/test/java/org/tests/unitinternal/TestOrderByParse.java
index 37ea83782..450cdea1e 100644
--- a/src/test/java/org/tests/unitinternal/TestOrderByParse.java
+++ b/src/test/java/org/tests/unitinternal/TestOrderByParse.java
@@ -7,6 +7,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -18,28 +19,28 @@ public class TestOrderByParse extends BaseTestCase {
   public void testParsingOne() {
 
     OrderBy<Object> o1 = new OrderBy<>("id");
-    assertTrue(o1.getProperties().size() == 1);
-    assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
+    assertEquals(1, o1.getProperties().size());
+    assertEquals("id", o1.getProperties().get(0).getProperty());
     assertTrue(o1.getProperties().get(0).isAscending());
-    assertTrue(o1.toStringFormat().equals("id"));
+    assertEquals("id", o1.toStringFormat());
 
     o1 = new OrderBy<>("id asc");
-    assertTrue(o1.getProperties().size() == 1);
-    assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
+    assertEquals(1, o1.getProperties().size());
+    assertEquals("id", o1.getProperties().get(0).getProperty());
     assertTrue(o1.getProperties().get(0).isAscending());
-    assertTrue(o1.toStringFormat().equals("id"));
+    assertEquals("id", o1.toStringFormat());
 
     o1 = new OrderBy<>("id desc");
-    assertTrue(o1.getProperties().size() == 1);
-    assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
+    assertEquals(1, o1.getProperties().size());
+    assertEquals("id", o1.getProperties().get(0).getProperty());
     assertTrue(!o1.getProperties().get(0).isAscending());
-    assertTrue(o1.toStringFormat().equals("id desc"));
+    assertEquals("id desc", o1.toStringFormat());
 
     o1 = new OrderBy<>(" id  asc ");
-    assertTrue(o1.getProperties().size() == 1);
-    assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
+    assertEquals(1, o1.getProperties().size());
+    assertEquals("id", o1.getProperties().get(0).getProperty());
     assertTrue(o1.getProperties().get(0).isAscending());
-    assertTrue(o1.toStringFormat().equals("id"));
+    assertEquals("id", o1.toStringFormat());
 
     assertTrue(o1.containsProperty("id"));
     assertFalse(o1.containsProperty("junk"));
@@ -49,10 +50,10 @@ public class TestOrderByParse extends BaseTestCase {
   public void parseNullsHigh() {
 
     OrderBy<Object> o1 = new OrderBy<>("id desc nulls high");
-    assertTrue(o1.getProperties().size() == 1);
-    assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
+    assertEquals(1, o1.getProperties().size());
+    assertEquals("id", o1.getProperties().get(0).getProperty());
     assertTrue(!o1.getProperties().get(0).isAscending());
-    assertTrue(o1.toStringFormat().equals("id desc nulls high"));
+    assertEquals("id desc nulls high", o1.toStringFormat());
   }
 
   @Test
@@ -60,21 +61,21 @@ public class TestOrderByParse extends BaseTestCase {
 
     OrderBy<Object> o1 = new OrderBy<>();
     o1.add("id desc nulls high");
-    assertTrue(o1.getProperties().size() == 1);
-    assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
+    assertEquals(1, o1.getProperties().size());
+    assertEquals("id", o1.getProperties().get(0).getProperty());
     assertTrue(!o1.getProperties().get(0).isAscending());
-    assertTrue(o1.toStringFormat().equals("id desc nulls high"));
+    assertEquals("id desc nulls high", o1.toStringFormat());
   }
 
   @Test
   public void parseNullsHigh_with_second() {
 
     OrderBy<Object> o1 = new OrderBy<>("id desc nulls high, name");
-    assertTrue(o1.getProperties().size() == 2);
-    assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
+    assertEquals(2, o1.getProperties().size());
+    assertEquals("id", o1.getProperties().get(0).getProperty());
     assertTrue(!o1.getProperties().get(0).isAscending());
-    assertTrue(o1.toStringFormat().equals("id desc nulls high, name"));
-    assertTrue(o1.getProperties().get(1).getProperty().equals("name"));
+    assertEquals("id desc nulls high, name", o1.toStringFormat());
+    assertEquals("name", o1.getProperties().get(1).getProperty());
     assertTrue(o1.getProperties().get(1).isAscending());
   }
 
@@ -82,34 +83,34 @@ public class TestOrderByParse extends BaseTestCase {
   public void testParsingTwo() {
 
     OrderBy<?> o1 = new OrderBy<>("id,name");
-    assertTrue(o1.getProperties().size() == 2);
-    assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
+    assertEquals(2, o1.getProperties().size());
+    assertEquals("id", o1.getProperties().get(0).getProperty());
     assertTrue(o1.getProperties().get(0).isAscending());
-    assertTrue(o1.getProperties().get(1).getProperty().equals("name"));
+    assertEquals("name", o1.getProperties().get(1).getProperty());
     assertTrue(o1.getProperties().get(1).isAscending());
     assertEquals("id, name", o1.toStringFormat());
 
     o1 = new OrderBy<>("  id  , name ");
-    assertTrue(o1.getProperties().size() == 2);
-    assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
+    assertEquals(2, o1.getProperties().size());
+    assertEquals("id", o1.getProperties().get(0).getProperty());
     assertTrue(o1.getProperties().get(0).isAscending());
-    assertTrue(o1.getProperties().get(1).getProperty().equals("name"));
+    assertEquals("name", o1.getProperties().get(1).getProperty());
     assertTrue(o1.getProperties().get(1).isAscending());
     assertEquals("id, name", o1.toStringFormat());
 
     o1 = new OrderBy<>("  id desc , name  desc ");
-    assertTrue(o1.getProperties().size() == 2);
-    assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
+    assertEquals(2, o1.getProperties().size());
+    assertEquals("id", o1.getProperties().get(0).getProperty());
     assertTrue(!o1.getProperties().get(0).isAscending());
-    assertTrue(o1.getProperties().get(1).getProperty().equals("name"));
+    assertEquals("name", o1.getProperties().get(1).getProperty());
     assertTrue(!o1.getProperties().get(1).isAscending());
     assertEquals("id desc, name desc", o1.toStringFormat());
 
     o1 = new OrderBy<>("  id ascending, name  asc");
-    assertTrue(o1.getProperties().size() == 2);
-    assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
+    assertEquals(2, o1.getProperties().size());
+    assertEquals("id", o1.getProperties().get(0).getProperty());
     assertTrue(o1.getProperties().get(0).isAscending());
-    assertTrue(o1.getProperties().get(1).getProperty().equals("name"));
+    assertEquals("name", o1.getProperties().get(1).getProperty());
     assertTrue(o1.getProperties().get(1).isAscending());
     assertEquals("id, name", o1.toStringFormat());
 
@@ -121,37 +122,37 @@ public class TestOrderByParse extends BaseTestCase {
     OrderBy<?> o1 = new OrderBy<>();
     o1.asc("id");
     o1.asc("name");
-    assertTrue(o1.getProperties().size() == 2);
-    assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
+    assertEquals(2, o1.getProperties().size());
+    assertEquals("id", o1.getProperties().get(0).getProperty());
     assertTrue(o1.getProperties().get(0).isAscending());
-    assertTrue(o1.getProperties().get(1).getProperty().equals("name"));
+    assertEquals("name", o1.getProperties().get(1).getProperty());
     assertTrue(o1.getProperties().get(1).isAscending());
     assertEquals("id, name", o1.toStringFormat());
 
     o1 = new OrderBy<>();
     o1.desc("id");
     o1.desc("name");
-    assertTrue(o1.getProperties().size() == 2);
-    assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
+    assertEquals(2, o1.getProperties().size());
+    assertEquals("id", o1.getProperties().get(0).getProperty());
     assertTrue(!o1.getProperties().get(0).isAscending());
-    assertTrue(o1.getProperties().get(1).getProperty().equals("name"));
+    assertEquals("name", o1.getProperties().get(1).getProperty());
     assertTrue(!o1.getProperties().get(1).isAscending());
     assertEquals("id desc, name desc", o1.toStringFormat());
 
     o1.reverse();
-    assertTrue(o1.getProperties().size() == 2);
-    assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
+    assertEquals(2, o1.getProperties().size());
+    assertEquals("id", o1.getProperties().get(0).getProperty());
     assertTrue(o1.getProperties().get(0).isAscending());
-    assertTrue(o1.getProperties().get(1).getProperty().equals("name"));
+    assertEquals("name", o1.getProperties().get(1).getProperty());
     assertTrue(o1.getProperties().get(1).isAscending());
     assertEquals("id, name", o1.toStringFormat());
 
     OrderBy<?> copy = o1.copy();
-    assertTrue(copy != o1);
-    assertTrue(copy.getProperties().size() == 2);
-    assertTrue(copy.getProperties().get(0).getProperty().equals("id"));
+    assertNotSame(copy, o1);
+    assertEquals(2, copy.getProperties().size());
+    assertEquals("id", copy.getProperties().get(0).getProperty());
     assertTrue(copy.getProperties().get(0).isAscending());
-    assertTrue(copy.getProperties().get(1).getProperty().equals("name"));
+    assertEquals("name", copy.getProperties().get(1).getProperty());
     assertTrue(copy.getProperties().get(1).isAscending());
     assertEquals("id, name", copy.toStringFormat());
 
@@ -162,24 +163,24 @@ public class TestOrderByParse extends BaseTestCase {
 
     OrderBy<Object> o1 = new OrderBy<>();
     o1.asc("id", "latin_1");
-    assertTrue(o1.getProperties().size() == 1);
-    assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
+    assertEquals(1, o1.getProperties().size());
+    assertEquals("id", o1.getProperties().get(0).getProperty());
     assertTrue(o1.getProperties().get(0).isAscending());
     assertEquals("id collate latin_1", o1.toStringFormat());
 
     o1 = new OrderBy<>();
     o1.desc("id", "latin_1");
-    assertTrue(o1.getProperties().size() == 1);
-    assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
+    assertEquals(1, o1.getProperties().size());
+    assertEquals("id", o1.getProperties().get(0).getProperty());
     assertTrue(!o1.getProperties().get(0).isAscending());
     assertEquals("id collate latin_1 desc", o1.toStringFormat());
 
     o1 = new OrderBy<>();
     o1.desc("id", "latin_1");
     o1.asc("date");
-    assertTrue(o1.getProperties().size() == 2);
-    assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
-    assertTrue(o1.getProperties().get(1).getProperty().equals("date"));
+    assertEquals(2, o1.getProperties().size());
+    assertEquals("id", o1.getProperties().get(0).getProperty());
+    assertEquals("date", o1.getProperties().get(1).getProperty());
     assertTrue(!o1.getProperties().get(0).isAscending());
     assertTrue(o1.getProperties().get(1).isAscending());
     assertEquals("id collate latin_1 desc, date", o1.toStringFormat());
@@ -187,9 +188,9 @@ public class TestOrderByParse extends BaseTestCase {
     o1 = new OrderBy<>();
     o1.desc("id", "latin_1");
     o1.asc("name", "latin_2");
-    assertTrue(o1.getProperties().size() == 2);
-    assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
-    assertTrue(o1.getProperties().get(1).getProperty().equals("name"));
+    assertEquals(2, o1.getProperties().size());
+    assertEquals("id", o1.getProperties().get(0).getProperty());
+    assertEquals("name", o1.getProperties().get(1).getProperty());
     assertTrue(!o1.getProperties().get(0).isAscending());
     assertTrue(o1.getProperties().get(1).isAscending());
     assertEquals("id collate latin_1 desc, name collate latin_2", o1.toStringFormat());
@@ -197,8 +198,8 @@ public class TestOrderByParse extends BaseTestCase {
     // functional (DB2) syntax
     o1 = new OrderBy<>();
     o1.desc("id", "COLLATION_KEY(${}, 'latin_1')");
-    assertTrue(o1.getProperties().size() == 1);
-    assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
+    assertEquals(1, o1.getProperties().size());
+    assertEquals("id", o1.getProperties().get(0).getProperty());
     assertTrue(!o1.getProperties().get(0).isAscending());
     assertEquals("COLLATION_KEY(id, 'latin_1') desc", o1.toStringFormat());
 

From 5052afbd07a30cd7ce29af2aa7290c7f3851d07e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 23 Jan 2019 22:28:53 +1300
Subject: [PATCH 0692/1036] #1620 - Support case statement in order by clause

---
 src/main/java/io/ebean/OrderBy.java           | 10 ++++-----
 .../query/orderby/TestOrderByOnComplex.java   | 22 +++++++++++++++++--
 .../tests/unitinternal/TestOrderByParse.java  | 11 ++++++++++
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/ebean/OrderBy.java b/src/main/java/io/ebean/OrderBy.java
index 7ce78f340..10e6baf37 100644
--- a/src/main/java/io/ebean/OrderBy.java
+++ b/src/main/java/io/ebean/OrderBy.java
@@ -4,7 +4,6 @@ import io.ebean.util.StringHelper;
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
@@ -412,15 +411,15 @@ public final class OrderBy<T> implements Serializable {
 
     String[] chunks = orderByClause.split(",");
     for (String chunk : chunks) {
-      String[] pairs = chunk.split(" ");
-      Property p = parseProperty(pairs);
+      Property p = parseProperty(chunk);
       if (p != null) {
         list.add(p);
       }
     }
   }
 
-  private Property parseProperty(String[] pairs) {
+  private Property parseProperty(String chunk) {
+    String[] pairs = chunk.split(" ");
     if (pairs.length == 0) {
       return null;
     }
@@ -446,8 +445,7 @@ public final class OrderBy<T> implements Serializable {
       boolean asc = isAscending(wordList.get(1));
       return new Property(wordList.get(0), asc, wordList.get(2), wordList.get(3));
     }
-    String m = "Expecting a 1, 2 or 4 words in [" + Arrays.toString(pairs) + "] but got " + wordList;
-    throw new RuntimeException(m);
+    return new Property(chunk.trim(), true);
   }
 
   private boolean isAscending(String s) {
diff --git a/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java b/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java
index ab983c7d4..34b029448 100644
--- a/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java
+++ b/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java
@@ -3,10 +3,14 @@ package org.tests.query.orderby;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
-import org.tests.model.basic.Order;
-import org.tests.model.basic.ResetBasicData;
 import org.junit.Assert;
 import org.junit.Test;
+import org.tests.model.basic.Order;
+import org.tests.model.basic.ResetBasicData;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestOrderByOnComplex extends BaseTestCase {
 
@@ -24,4 +28,18 @@ public class TestOrderByOnComplex extends BaseTestCase {
 
   }
 
+  @Test
+  public void testOrderByCase() {
+
+    ResetBasicData.reset();
+
+    Query<Order> query = Ebean.find(Order.class)
+      .orderBy("case when status=3 then 10 when status=2 then 11 else 99 end");
+
+    List<Order> list = query.findList();
+
+    assertThat(sqlOf(query)).contains("select t0.id, t0.status, t0.order_date, t0.ship_date, t1.name, t0.cretime, t0.updtime, t0.kcustomer_id from o_order t0 join o_customer t1 on t1.id = t0.kcustomer_id  order by case when t0.status=3 then 10 when t0.status=2 then 11 else 99 end");
+    assertThat(list).isNotEmpty();
+  }
+
 }
diff --git a/src/test/java/org/tests/unitinternal/TestOrderByParse.java b/src/test/java/org/tests/unitinternal/TestOrderByParse.java
index 450cdea1e..6cd43c5be 100644
--- a/src/test/java/org/tests/unitinternal/TestOrderByParse.java
+++ b/src/test/java/org/tests/unitinternal/TestOrderByParse.java
@@ -4,6 +4,7 @@ import io.ebean.BaseTestCase;
 import io.ebean.OrderBy;
 import org.junit.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
@@ -15,6 +16,16 @@ import static org.junit.Assert.assertTrue;
  */
 public class TestOrderByParse extends BaseTestCase {
 
+  @Test
+  public void testParseRaw() {
+
+    OrderBy<Object> o1 = new OrderBy<>("case when status='N' then 1 when status='F' then 2 else 99 end");
+    assertEquals(1, o1.getProperties().size());
+    assertTrue(o1.getProperties().get(0).isAscending());
+    assertThat(o1.toStringFormat()).isEqualTo("case when status='N' then 1 when status='F' then 2 else 99 end");
+    assertThat(o1.getProperties().get(0).getProperty()).isEqualTo("case when status='N' then 1 when status='F' then 2 else 99 end");
+  }
+
   @Test
   public void testParsingOne() {
 

From 89beaee0f6c52d6ee5342c4db309363b1b784ed7 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 25 Jan 2019 01:47:21 +1300
Subject: [PATCH 0693/1036] #1621 - Consider clean up white space in generated
 SQL (as in remove unneeded extra spaces)

---
 .../server/expression/BetweenExpression.java  |  4 ++--
 .../expression/BetweenPropertyExpression.java |  4 ++--
 .../CaseInsensitiveEqualExpression.java       |  4 ++--
 .../expression/DefaultExampleExpression.java  |  2 +-
 .../expression/ExistsQueryExpression.java     |  4 ++--
 .../server/expression/IdExpression.java       |  2 +-
 .../server/expression/InQueryExpression.java  |  2 +-
 .../server/expression/InRangeExpression.java  |  2 +-
 .../server/expression/JunctionExpression.java |  2 +-
 .../server/expression/LikeExpression.java     |  2 +-
 .../server/expression/LogicExpression.java    |  4 ++--
 .../expression/NativeILikeExpression.java     |  2 +-
 .../server/expression/NoopExpression.java     |  4 ++--
 .../server/expression/NotExpression.java      |  4 ++--
 .../server/expression/NullExpression.java     |  2 +-
 .../ebeaninternal/server/expression/Op.java   | 18 +++++++-------
 .../java/io/ebean/DtoQueryFromOrmTest.java    | 10 ++++----
 src/test/java/io/ebean/UpdateQueryTest.java   |  4 ++--
 .../expression/BetweenExpressionTest.java     | 14 +++++------
 .../BetweenPropertyExpressionTest.java        |  2 +-
 .../expression/InRangeExpressionTest.java     |  2 +-
 .../expression/LogicExpressionTest.java       | 11 +++++++++
 .../server/expression/NoopExpressionTest.java |  2 +-
 .../server/expression/NullExpressionTest.java | 10 ++++----
 .../platform/HanaDbExpressionTest.java        |  2 +-
 .../server/grammer/EqlParserTest.java         | 24 +++++++++----------
 .../basic/TestOrderTotalAmountReportBean.java |  8 +++----
 .../tests/batchload/TestSecondaryQueries.java |  2 +-
 .../aggregation/TestAggregationMany.java      |  4 ++--
 .../aggregation/TestAggregationTopLevel.java  | 24 +++++++++----------
 .../cache/TestCacheViaComplexNaturalKey.java  |  4 ++--
 .../cache/TestCacheViaComplexNaturalKey3.java | 20 ++++++++--------
 .../TestMediaInheritanceJoinToMany.java       |  2 +-
 .../java/org/tests/model/pview/TestPview.java |  2 +-
 .../tests/model/view/TestViewBaseEntity.java  |  2 +-
 .../query/TestExprNestedDisjunction.java      | 12 +++++-----
 .../TestImplicitJoinOnParentRelationship.java |  6 ++---
 .../java/org/tests/query/TestQueryExists.java |  2 +-
 .../org/tests/query/TestQueryFilterMany.java  |  2 +-
 .../aggregation/TestAggregationCount.java     |  8 +++----
 .../joins/TestDisjunctWhereOuterJoin.java     |  4 ++--
 .../joins/TestDisjunctWhereOuterOnMany.java   |  2 +-
 .../other/TestQueryConversationRowCount.java  |  6 ++---
 .../other/TestQueryRowCountWithMany.java      |  8 +++----
 .../query/other/TestQuerySingleAttribute.java | 20 ++++++++--------
 .../tests/softdelete/TestSoftDeleteBasic.java |  4 ++--
 46 files changed, 148 insertions(+), 137 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java b/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java
index 410323cdf..bfdfa1d52 100644
--- a/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java
@@ -7,7 +7,7 @@ import java.io.IOException;
 
 class BetweenExpression extends AbstractExpression {
 
-  private static final String BETWEEN = " between ";
+  private static final String _BETWEEN = " between ? and ?";
 
   private final Object valueHigh;
 
@@ -40,7 +40,7 @@ class BetweenExpression extends AbstractExpression {
 
   @Override
   public void addSql(SpiExpressionRequest request) {
-    request.append(propName).append(BETWEEN).append(" ? and ? ");
+    request.append(propName).append(_BETWEEN);
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java b/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java
index 43574a95d..798908335 100644
--- a/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java
@@ -1,12 +1,12 @@
 package io.ebeaninternal.server.expression;
 
+import io.ebean.util.SplitName;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.api.SpiExpressionValidation;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.el.ElPropertyDeploy;
-import io.ebean.util.SplitName;
 
 import java.io.IOException;
 
@@ -80,7 +80,7 @@ class BetweenPropertyExpression extends NonPrepareExpression {
 
   @Override
   public void addSql(SpiExpressionRequest request) {
-    request.append(" ?").append(BETWEEN).append(name(lowProperty)).append(" and ").append(name(highProperty)).append(" ");
+    request.append(" ?").append(BETWEEN).append(name(lowProperty)).append(" and ").append(name(highProperty));
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java b/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java
index afa352940..4eee83648 100644
--- a/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java
@@ -53,9 +53,9 @@ class CaseInsensitiveEqualExpression extends AbstractValueExpression {
       pname = prop.getBeanProperty().getDecryptProperty(propName);
     }
     if (not) {
-      request.append("lower(").append(pname).append(") !=? ");
+      request.append("lower(").append(pname).append(") != ?");
     } else {
-      request.append("lower(").append(pname).append(") =? ");
+      request.append("lower(").append(pname).append(") = ?");
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
index 53653e416..2a0fd2bd8 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
@@ -212,7 +212,7 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
         }
         item.addSql(request);
       }
-      request.append(") ");
+      request.append(")");
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java b/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
index c6c214f4e..8918bd05d 100644
--- a/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.expression;
 
 import io.ebean.event.BeanQueryRequest;
 import io.ebeaninternal.api.ManyWhereJoins;
+import io.ebeaninternal.api.NaturalKeyQueryData;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -9,7 +10,6 @@ import io.ebeaninternal.api.SpiExpressionValidation;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.query.CQuery;
-import io.ebeaninternal.api.NaturalKeyQueryData;
 
 import java.io.IOException;
 import java.util.List;
@@ -98,7 +98,7 @@ class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreExpress
     }
     request.append(" exists (");
     request.append(sql);
-    request.append(") ");
+    request.append(")");
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/expression/IdExpression.java b/src/main/java/io/ebeaninternal/server/expression/IdExpression.java
index ad7769ae9..12910fb37 100644
--- a/src/main/java/io/ebeaninternal/server/expression/IdExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/IdExpression.java
@@ -60,7 +60,7 @@ class IdExpression extends NonPrepareExpression implements SpiExpression {
     DefaultExpressionRequest r = (DefaultExpressionRequest) request;
     String idSql = r.getBeanDescriptor().getIdBinderIdSql(null);
 
-    request.append(idSql).append(" ");
+    request.append(idSql);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java b/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
index b0681e720..83507af4b 100644
--- a/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
@@ -85,7 +85,7 @@ class InQueryExpression extends AbstractExpression implements UnsupportedDocStor
     }
     request.append(" in (");
     request.append(sql);
-    request.append(") ");
+    request.append(")");
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java b/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java
index 837186871..e1d170b43 100644
--- a/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java
@@ -38,7 +38,7 @@ class InRangeExpression extends AbstractExpression {
 
   @Override
   public void addSql(SpiExpressionRequest request) {
-    request.append("(").append(propName).append(" >= ? and ").append(propName).append(" < ?) ");
+    request.append("(").append(propName).append(" >= ? and ").append(propName).append(" < ?)");
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index 8d0f8f924..c1ed7b611 100644
--- a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -192,7 +192,7 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
         }
         item.addSql(request);
       }
-      request.append(") ");
+      request.append(")");
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java b/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java
index 1d782f57c..6886203c4 100644
--- a/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java
@@ -51,7 +51,7 @@ class LikeExpression extends AbstractValueExpression {
       request.append(pname);
     }
     if (type == LikeType.EQUAL_TO) {
-      request.append(" = ? ");
+      request.append(" = ?");
     } else {
       // append db platform like clause
       request.appendLike(type == LikeType.RAW);
diff --git a/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java b/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java
index 2dd7a4882..0fa0d9b37 100644
--- a/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java
@@ -4,11 +4,11 @@ import io.ebean.Expression;
 import io.ebean.Junction;
 import io.ebean.event.BeanQueryRequest;
 import io.ebeaninternal.api.ManyWhereJoins;
+import io.ebeaninternal.api.NaturalKeyQueryData;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.api.SpiExpressionValidation;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.api.NaturalKeyQueryData;
 
 import java.io.IOException;
 
@@ -140,7 +140,7 @@ abstract class LogicExpression implements SpiExpression {
     expOne.addSql(request);
     request.append(conjunction ? AND : OR);
     expTwo.addSql(request);
-    request.append(") ");
+    request.append(")");
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java b/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java
index a9298e209..c3376f656 100644
--- a/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java
@@ -42,7 +42,7 @@ class NativeILikeExpression extends AbstractExpression {
       pname = prop.getBeanProperty().getDecryptProperty(propName);
     }
 
-    request.append(pname).append(" ilike ? ");
+    request.append(pname).append(" ilike ?");
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java b/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java
index 6d6a7a58a..69759e595 100644
--- a/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java
@@ -2,11 +2,11 @@ package io.ebeaninternal.server.expression;
 
 import io.ebean.event.BeanQueryRequest;
 import io.ebeaninternal.api.ManyWhereJoins;
+import io.ebeaninternal.api.NaturalKeyQueryData;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.api.SpiExpressionValidation;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.api.NaturalKeyQueryData;
 
 import java.io.IOException;
 
@@ -76,7 +76,7 @@ class NoopExpression implements SpiExpression {
 
   @Override
   public void addSql(SpiExpressionRequest request) {
-    request.append("1=1 ");
+    request.append("1=1");
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/expression/NotExpression.java b/src/main/java/io/ebeaninternal/server/expression/NotExpression.java
index 8bafa95b0..29535cd95 100644
--- a/src/main/java/io/ebeaninternal/server/expression/NotExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/NotExpression.java
@@ -3,18 +3,18 @@ package io.ebeaninternal.server.expression;
 import io.ebean.Expression;
 import io.ebean.event.BeanQueryRequest;
 import io.ebeaninternal.api.ManyWhereJoins;
+import io.ebeaninternal.api.NaturalKeyQueryData;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.api.SpiExpressionValidation;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.api.NaturalKeyQueryData;
 
 import java.io.IOException;
 
 final class NotExpression implements SpiExpression {
 
   private static final String NOT_START = "not (";
-  private static final String NOT_END = ") ";
+  private static final String NOT_END = ")";
 
   private final SpiExpression exp;
 
diff --git a/src/main/java/io/ebeaninternal/server/expression/NullExpression.java b/src/main/java/io/ebeaninternal/server/expression/NullExpression.java
index 51ac7b27a..90894dbde 100644
--- a/src/main/java/io/ebeaninternal/server/expression/NullExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/NullExpression.java
@@ -66,7 +66,7 @@ class NullExpression extends AbstractExpression {
       return;
     }
 
-    String nullExpr = notNull ? " is not null " : " is null ";
+    String nullExpr = notNull ? " is not null" : " is null";
     if (elProperty != null && elProperty.isAssocId()) {
       request.append(elProperty.getAssocIdExpression(propName, nullExpr));
     } else {
diff --git a/src/main/java/io/ebeaninternal/server/expression/Op.java b/src/main/java/io/ebeaninternal/server/expression/Op.java
index 90321dc0e..1e20ddeba 100644
--- a/src/main/java/io/ebeaninternal/server/expression/Op.java
+++ b/src/main/java/io/ebeaninternal/server/expression/Op.java
@@ -8,48 +8,48 @@ public enum Op {
   /**
    * Exists (JSON).
    */
-  EXISTS(" is not null ", ""),
+  EXISTS(" is not null", ""),
 
   /**
    * Not Exists (JSON).
    */
-  NOT_EXISTS(" is null ", ""),
+  NOT_EXISTS(" is null", ""),
 
   /**
    * Between (JSON).
    */
-  BETWEEN(" between ? and ? ", ""),
+  BETWEEN(" between ? and ?", ""),
 
   /**
    * Equal to
    */
-  EQ(" = ? ", ""),
+  EQ(" = ?", ""),
 
   /**
    * Not equal to.
    */
-  NOT_EQ(" <> ? ", ""),
+  NOT_EQ(" <> ?", ""),
 
   /**
    * Less than.
    */
 
-  LT(" < ? ", "lt"),
+  LT(" < ?", "lt"),
 
   /**
    * Less than or equal to.
    */
-  LT_EQ(" <= ? ", "lte"),
+  LT_EQ(" <= ?", "lte"),
 
   /**
    * Greater than.
    */
-  GT(" > ? ", "gt"),
+  GT(" > ?", "gt"),
 
   /**
    * Greater than or equal to.
    */
-  GT_EQ(" >= ? ", "gte");
+  GT_EQ(" >= ?", "gte");
 
   final String exp;
 
diff --git a/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
index 0288e4732..c5dca5d7e 100644
--- a/src/test/java/io/ebean/DtoQueryFromOrmTest.java
+++ b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
@@ -91,7 +91,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql.get(0)).contains("select t0.id, t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
-        + " fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+        + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
   }
 
   @Test
@@ -117,7 +117,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql.get(0)).contains("select t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
-        + " fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+        + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
   }
 
   @Test
@@ -147,7 +147,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     } else {
       assertThat(sql.get(0)).contains("select t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
-          + " fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+          + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
     }
   }
 
@@ -178,7 +178,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
           + " fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
     } else {
       assertThat(sql.get(0)).contains("select t0.id, t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
-          + " fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+          + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
     }
   }
 
@@ -227,7 +227,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql.get(0)).contains(
-        "select t0.last_name, count(*) totalCount from contact t0 where t0.last_name is not null  group by t0.last_name having count(*) > ?");
+        "select t0.last_name, count(*) totalCount from contact t0 where t0.last_name is not null group by t0.last_name having count(*) > ?");
   }
 
   @Test
diff --git a/src/test/java/io/ebean/UpdateQueryTest.java b/src/test/java/io/ebean/UpdateQueryTest.java
index 5a5d9b698..0a078d26b 100644
--- a/src/test/java/io/ebean/UpdateQueryTest.java
+++ b/src/test/java/io/ebean/UpdateQueryTest.java
@@ -36,7 +36,7 @@ public class UpdateQueryTest extends BaseTestCase {
 
     query.update();
 
-    assertThat(query.getGeneratedSql()).contains("update o_customer set status=?, updtime=? where status = ?  and id > ?");
+    assertThat(query.getGeneratedSql()).contains("update o_customer set status=?, updtime=? where status = ? and id > ?");
 
     BasicMetricVisitor basic = visitMetricsBasic();
     List<MetaOrmQueryMetric> ormQueryMetrics = basic.getOrmQueryMetrics();
@@ -166,7 +166,7 @@ public class UpdateQueryTest extends BaseTestCase {
 
     query.update();
 
-    assertThat(sqlOf(query)).contains("update o_customer set status=?, updtime=?  where id in (select t0.id from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id  where t0.status = ?  and t1.country_code = ?  and t0.id > ? )");
+    assertThat(sqlOf(query)).contains("update o_customer set status=?, updtime=?  where id in (select t0.id from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id  where t0.status = ? and t1.country_code = ? and t0.id > ?)");
   }
 
   @Test
diff --git a/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java
index 82f742247..950c492dd 100644
--- a/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java
+++ b/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java
@@ -8,18 +8,18 @@ import static org.assertj.core.api.StrictAssertions.assertThat;
 public class BetweenExpressionTest extends BaseExpressionTest {
 
   @Test
-  public void addSql() throws Exception {
+  public void addSql() {
 
     DefaultExpressionRequest expReq = newExpressionRequest();
 
     BetweenExpression exp = new BetweenExpression("startDate", 1, 2);
     exp.addSql(expReq);
 
-    assertThat(expReq.getSql()).isEqualTo("startDate between  ? and ? ");
+    assertThat(expReq.getSql()).isEqualTo("startDate between ? and ?");
   }
 
   @Test
-  public void copyForPlanKey_isSameInstance() throws Exception {
+  public void copyForPlanKey_isSameInstance() {
 
     BetweenExpression exp = new BetweenExpression("startDate", 1, 2);
     SpiExpression other = exp.copyForPlanKey();
@@ -28,7 +28,7 @@ public class BetweenExpressionTest extends BaseExpressionTest {
   }
 
   @Test
-  public void isSameByPlan_when_properties_match() throws Exception {
+  public void isSameByPlan_when_properties_match() {
 
     BetweenExpression exp0 = new BetweenExpression("startDate", 1, 2);
     BetweenExpression exp1 = new BetweenExpression("startDate", 3, 4);
@@ -38,7 +38,7 @@ public class BetweenExpressionTest extends BaseExpressionTest {
   }
 
   @Test
-  public void isSameByPlan_when_properties_do_not_match() throws Exception {
+  public void isSameByPlan_when_properties_do_not_match() {
 
     BetweenExpression exp0 = new BetweenExpression("startDate", 1, 2);
     BetweenExpression exp1 = new BetweenExpression("endDate", 1, 2);
@@ -48,7 +48,7 @@ public class BetweenExpressionTest extends BaseExpressionTest {
   }
 
   @Test
-  public void isSameByBind_when_values_do_not_match() throws Exception {
+  public void isSameByBind_when_values_do_not_match() {
 
     BetweenExpression exp0 = new BetweenExpression("startDate", 1, 2);
     BetweenExpression exp1 = new BetweenExpression("startDate", 1, 3);
@@ -58,7 +58,7 @@ public class BetweenExpressionTest extends BaseExpressionTest {
   }
 
   @Test
-  public void isSameByBind_when_values_match() throws Exception {
+  public void isSameByBind_when_values_match() {
 
     BetweenExpression exp0 = new BetweenExpression("startDate", 1, 2);
     BetweenExpression exp1 = new BetweenExpression("startDate", 1, 2);
diff --git a/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java
index b4de23798..a7ab9e343 100644
--- a/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java
+++ b/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java
@@ -14,7 +14,7 @@ public class BetweenPropertyExpressionTest extends BaseExpressionTest {
   public void sqlExpression() {
     TDSpiExpressionRequest request = new TDSpiExpressionRequest(null);
     exp("a", "b", 10).addSql(request);
-    assertThat(request.getSql()).isEqualTo(" ? between a and b ");
+    assertThat(request.getSql()).isEqualTo(" ? between a and b");
   }
 
   @Test
diff --git a/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java
index 44ee53eb4..759ac0fc1 100644
--- a/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java
+++ b/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java
@@ -15,7 +15,7 @@ public class InRangeExpressionTest extends BaseExpressionTest {
     InRangeExpression exp = new InRangeExpression("startDate", 1, 2);
     exp.addSql(expReq);
 
-    assertThat(expReq.getSql()).isEqualTo("(startDate >= ? and startDate < ?) ");
+    assertThat(expReq.getSql()).isEqualTo("(startDate >= ? and startDate < ?)");
   }
 
   @Test
diff --git a/src/test/java/io/ebeaninternal/server/expression/LogicExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/LogicExpressionTest.java
index 8e2fbea0f..601c607c6 100644
--- a/src/test/java/io/ebeaninternal/server/expression/LogicExpressionTest.java
+++ b/src/test/java/io/ebeaninternal/server/expression/LogicExpressionTest.java
@@ -21,6 +21,17 @@ public class LogicExpressionTest extends BaseExpressionTest {
     return new LogicExpression.Or(a, b);
   }
 
+  @Test
+  public void addSql() {
+
+    DefaultExpressionRequest expReq = newExpressionRequest();
+
+    LogicExpression and = and(eq("a", 10), eq("b", 10));
+    and.addSql(expReq);
+
+    assertThat(expReq.getSql()).isEqualTo("(a = ? and b = ?)");
+  }
+
   @Test
   public void isSameByPlan_when_same() {
 
diff --git a/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java
index 463d9e2fc..a6bac3e9a 100644
--- a/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java
+++ b/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java
@@ -48,7 +48,7 @@ public class NoopExpressionTest extends BaseExpressionTest {
     query.findList();
     String generatedSql = sqlOf(query);
 
-    assertThat(generatedSql).contains("select t0.id from o_customer t0 where t0.name is null  and 1=1  and t0.status is not null");
+    assertThat(generatedSql).contains("select t0.id from o_customer t0 where t0.name is null and 1=1 and t0.status is not null");
   }
 
   @Test
diff --git a/src/test/java/io/ebeaninternal/server/expression/NullExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/NullExpressionTest.java
index 01f35797b..02c47948f 100644
--- a/src/test/java/io/ebeaninternal/server/expression/NullExpressionTest.java
+++ b/src/test/java/io/ebeaninternal/server/expression/NullExpressionTest.java
@@ -2,8 +2,8 @@ package io.ebeaninternal.server.expression;
 
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.SpiExpression;
-import org.tests.model.basic.Order;
 import org.junit.Test;
+import org.tests.model.basic.Order;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,7 +22,7 @@ public class NullExpressionTest extends BaseExpressionTest {
 
     nullExp("id", true).addSql(expReq);
 
-    assertThat(expReq.getSql()).isEqualTo("id is not null ");
+    assertThat(expReq.getSql()).isEqualTo("id is not null");
   }
 
   @Test
@@ -32,7 +32,7 @@ public class NullExpressionTest extends BaseExpressionTest {
 
     nullExp("id", false).addSql(expReq);
 
-    assertThat(expReq.getSql()).isEqualTo("id is null ");
+    assertThat(expReq.getSql()).isEqualTo("id is null");
   }
 
   @Test
@@ -42,7 +42,7 @@ public class NullExpressionTest extends BaseExpressionTest {
 
     nullExp("customer", true).addSql(expReq);
 
-    assertThat(expReq.getSql()).isEqualTo("customer.id is not null ");
+    assertThat(expReq.getSql()).isEqualTo("customer.id is not null");
   }
 
   @Test
@@ -52,7 +52,7 @@ public class NullExpressionTest extends BaseExpressionTest {
 
     nullExp("customer", false).addSql(expReq);
 
-    assertThat(expReq.getSql()).isEqualTo("customer.id is null ");
+    assertThat(expReq.getSql()).isEqualTo("customer.id is null");
   }
 
   @Test
diff --git a/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java
index c2d47bea2..c367ba601 100644
--- a/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java
+++ b/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java
@@ -64,6 +64,6 @@ public class HanaDbExpressionTest {
   public void testJson() {
     SpiExpressionRequest request = new DefaultExpressionRequest(null);
     expression.json(request, "jsonproperty", "path", Op.EQ, "val");
-    assertEquals("json_value(jsonproperty, '$.path') = ? ", request.getSql());
+    assertEquals("json_value(jsonproperty, '$.path') = ?", request.getSql());
   }
 }
diff --git a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
index 44febf234..4be7f66f8 100644
--- a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
@@ -82,7 +82,7 @@ public class EqlParserTest extends BaseTestCase {
     Query<Customer> query = parse("where name ieq 'Rob'");
     query.findList();
 
-    assertThat(query.getGeneratedSql()).contains("where lower(t0.name) =?");
+    assertThat(query.getGeneratedSql()).contains("where lower(t0.name) = ?");
   }
 
   @Test
@@ -91,7 +91,7 @@ public class EqlParserTest extends BaseTestCase {
     Query<Customer> query = parse("where name ine 'Rob'");
     query.findList();
 
-    assertThat(query.getGeneratedSql()).contains("where lower(t0.name) !=?");
+    assertThat(query.getGeneratedSql()).contains("where lower(t0.name) != ?");
   }
 
   @Test
@@ -99,7 +99,7 @@ public class EqlParserTest extends BaseTestCase {
 
     Query<Customer> query = parse("where 'Rob' ieq name");
     query.findList();
-    assertThat(query.getGeneratedSql()).contains("where lower(t0.name) =?");
+    assertThat(query.getGeneratedSql()).contains("where lower(t0.name) = ?");
   }
 
   @Test
@@ -108,7 +108,7 @@ public class EqlParserTest extends BaseTestCase {
     Query<Customer> query = parse("where 'Rob' ine name");
     query.findList();
 
-    assertThat(query.getGeneratedSql()).contains("where lower(t0.name) !=?");
+    assertThat(query.getGeneratedSql()).contains("where lower(t0.name) != ?");
   }
 
   @Test
@@ -156,7 +156,7 @@ public class EqlParserTest extends BaseTestCase {
     Query<Customer> query = parse("where name = 'Rob' or (status = 'NEW' and smallnote is null)");
     query.findList();
 
-    assertThat(query.getGeneratedSql()).contains("where (t0.name = ?  or (t0.status = ?  and t0.smallnote is null ) )");
+    assertThat(query.getGeneratedSql()).contains("where (t0.name = ? or (t0.status = ? and t0.smallnote is null))");
   }
 
   @Test
@@ -176,7 +176,7 @@ public class EqlParserTest extends BaseTestCase {
     Query<Customer> query = parse("where (name = 'Rob' or status = 'NEW') and smallnote is null");
     query.findList();
 
-    assertThat(query.getGeneratedSql()).contains("where ((t0.name = ?  or t0.status = ? )  and t0.smallnote is null )");
+    assertThat(query.getGeneratedSql()).contains("where ((t0.name = ? or t0.status = ?) and t0.smallnote is null)");
   }
 
   @Test
@@ -195,15 +195,15 @@ public class EqlParserTest extends BaseTestCase {
 
     Query<Customer> query = parse("where not (name = 'Rob' and status = 'NEW')");
     query.findList();
-    assertThat(query.getGeneratedSql()).contains("where not (t0.name = ?  and t0.status = ? )");
+    assertThat(query.getGeneratedSql()).contains("where not (t0.name = ? and t0.status = ?)");
 
     query = parse("where not ((name = 'Rob' and status = 'NEW'))");
     query.findList();
-    assertThat(query.getGeneratedSql()).contains("where not (t0.name = ?  and t0.status = ? )");
+    assertThat(query.getGeneratedSql()).contains("where not (t0.name = ? and t0.status = ?)");
 
     query = parse("where not (((name = 'Rob') and (status = 'NEW')))");
     query.findList();
-    assertThat(query.getGeneratedSql()).contains("where not (t0.name = ?  and t0.status = ? )");
+    assertThat(query.getGeneratedSql()).contains("where not (t0.name = ? and t0.status = ?)");
   }
 
   @Test
@@ -281,7 +281,7 @@ public class EqlParserTest extends BaseTestCase {
     Query<Customer> query = parse("where name inrange 'As' to 'B'");
     query.findList();
 
-    assertThat(query.getGeneratedSql()).contains("where (t0.name >= ? and t0.name < ?) ");
+    assertThat(query.getGeneratedSql()).contains("where (t0.name >= ? and t0.name < ?)");
   }
 
   @Test
@@ -301,7 +301,7 @@ public class EqlParserTest extends BaseTestCase {
     Query<Customer> query = parse("where name between 'As' and 'B'");
     query.findList();
 
-    assertThat(query.getGeneratedSql()).contains("where t0.name between  ? and ? ");
+    assertThat(query.getGeneratedSql()).contains("where t0.name between ? and ?");
   }
 
   @Test
@@ -312,7 +312,7 @@ public class EqlParserTest extends BaseTestCase {
     query.setParameter("two", "b");
     query.findList();
 
-    assertThat(query.getGeneratedSql()).contains("where t0.name between  ? and ? ");
+    assertThat(query.getGeneratedSql()).contains("where t0.name between ? and ?");
   }
 
   @Test
diff --git a/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java b/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java
index b844cf9bb..80dd89e80 100644
--- a/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java
+++ b/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java
@@ -5,10 +5,10 @@ import io.ebean.Ebean;
 import io.ebean.Query;
 import io.ebean.RawSql;
 import io.ebean.RawSqlBuilder;
-import org.tests.model.basic.OrderAggregate;
-import org.tests.model.basic.ResetBasicData;
 import org.junit.Assert;
 import org.junit.Test;
+import org.tests.model.basic.OrderAggregate;
+import org.tests.model.basic.ResetBasicData;
 
 import java.util.List;
 
@@ -128,7 +128,7 @@ public class TestOrderTotalAmountReportBean extends BaseTestCase {
       .findList();
 
     assertThat(query.getGeneratedSql()).contains("count(*) as total_items, sum(order_qty*unit_price) as total_amount, max(order_qty*unit_price) as maxAmount from o_order_detail");
-    assertThat(query.getGeneratedSql()).contains("from o_order_detail  where order_id > ?  group by order_id  having count(*) > ?   order by sum(order_qty*unit_price) desc");
+    assertThat(query.getGeneratedSql()).contains("from o_order_detail  where order_id > ? group by order_id  having count(*) > ?  order by sum(order_qty*unit_price) desc");
     assertNotNull(list);
   }
 
@@ -147,7 +147,7 @@ public class TestOrderTotalAmountReportBean extends BaseTestCase {
       .findList();
 
     assertThat(query.getGeneratedSql()).contains("count(*) as totalItems, sum(order_qty*unit_price) as totalAmount, max(order_qty*unit_price) as maxAmount from o_order_detail");
-    assertThat(query.getGeneratedSql()).contains("from o_order_detail where id > ?  and order_id is not null  group by order_id  having sum(order_qty*unit_price) < ?   order by sum(order_qty*unit_price) desc");
+    assertThat(query.getGeneratedSql()).contains("from o_order_detail where id > ?  and order_id is not null group by order_id  having sum(order_qty*unit_price) < ?  order by sum(order_qty*unit_price) desc");
     assertNotNull(list);
   }
 }
diff --git a/src/test/java/org/tests/batchload/TestSecondaryQueries.java b/src/test/java/org/tests/batchload/TestSecondaryQueries.java
index 7923656ef..1e0663e59 100644
--- a/src/test/java/org/tests/batchload/TestSecondaryQueries.java
+++ b/src/test/java/org/tests/batchload/TestSecondaryQueries.java
@@ -149,7 +149,7 @@ public class TestSecondaryQueries extends TransactionalTestCase {
 
     String generatedSql = sqlOf(query, 2);
     //select t0.id c0, t0.status c1, t0.kcustomer_id c2 from o_order t0 where t0.status = ? ; --bind(NEW)
-    assertEquals("select t0.id, t0.status, t0.kcustomer_id from o_order t0 where t0.status = ? ", generatedSql);
+    assertEquals("select t0.id, t0.status, t0.kcustomer_id from o_order t0 where t0.status = ?", generatedSql);
 
 
     //List<SpiQuery<?>> secondaryQueries = spiQuery.getLoggedSecondaryQueries();
diff --git a/src/test/java/org/tests/model/aggregation/TestAggregationMany.java b/src/test/java/org/tests/model/aggregation/TestAggregationMany.java
index bc0aa7ac4..fd77a164c 100644
--- a/src/test/java/org/tests/model/aggregation/TestAggregationMany.java
+++ b/src/test/java/org/tests/model/aggregation/TestAggregationMany.java
@@ -63,7 +63,7 @@ public class TestAggregationMany extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
 
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("select t0.id, t0.name, t1.name, sum(t1.use_secs), sum(t1.fuel) from dmachine t0 left join d_machine_aux_use t1 on t1.machine_id = t0.id  where t0.organisation_id = ?  group by t0.id, t0.name, t1.name order by t0.id");
+    assertThat(sql.get(0)).contains("select t0.id, t0.name, t1.name, sum(t1.use_secs), sum(t1.fuel) from dmachine t0 left join d_machine_aux_use t1 on t1.machine_id = t0.id  where t0.organisation_id = ? group by t0.id, t0.name, t1.name order by t0.id");
   }
 
   @Test
@@ -89,6 +89,6 @@ public class TestAggregationMany extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
 
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("select t0.id, t0.name, sum(t1.use_secs), sum(t1.fuel) from dmachine t0 left join d_machine_aux_use t1 on t1.machine_id = t0.id  where t0.organisation_id = ?  group by t0.id, t0.name order by t0.id");
+    assertThat(sql.get(0)).contains("select t0.id, t0.name, sum(t1.use_secs), sum(t1.fuel) from dmachine t0 left join d_machine_aux_use t1 on t1.machine_id = t0.id  where t0.organisation_id = ? group by t0.id, t0.name order by t0.id");
   }
 }
diff --git a/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java b/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java
index 7eb72309c..b7dad5e50 100644
--- a/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java
+++ b/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java
@@ -43,7 +43,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
       .query();
 
     List<DMachineStatsAgg> result = query.findList();
-    assertThat(sqlOf(query)).contains("select t0.machine_id, t0.date, sum(t0.total_kms), sum(cost) from d_machine_stats t0 where t0.date > ?  group by t0.machine_id, t0.date having sum(cost) > ?");
+    assertThat(sqlOf(query)).contains("select t0.machine_id, t0.date, sum(t0.total_kms), sum(cost) from d_machine_stats t0 where t0.date > ? group by t0.machine_id, t0.date having sum(cost) > ?");
     assertThat(result).isNotEmpty();
   }
 
@@ -56,7 +56,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
       .query();
 
     List<DMachineStatsAgg> result = query.findList();
-    assertThat(sqlOf(query)).contains("select t0.machine_id, sum(t0.total_kms), sum(cost) from d_machine_stats t0 where t0.date > ?  group by t0.machine_id");
+    assertThat(sqlOf(query)).contains("select t0.machine_id, sum(t0.total_kms), sum(cost) from d_machine_stats t0 where t0.date > ? group by t0.machine_id");
     assertThat(result).isNotEmpty();
   }
 
@@ -70,7 +70,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
       .query();
 
     List<DMachineStatsAgg> result = query.findList();
-    assertThat(sqlOf(query)).contains("select t0.date, sum(t0.total_kms), sum(t0.hours), max(t0.rate), sum(cost), max(t0.total_kms) from d_machine_stats t0 where t0.date > ?  group by t0.date having sum(t0.hours) > ?");
+    assertThat(sqlOf(query)).contains("select t0.date, sum(t0.total_kms), sum(t0.hours), max(t0.rate), sum(cost), max(t0.total_kms) from d_machine_stats t0 where t0.date > ? group by t0.date having sum(t0.hours) > ?");
     assertThat(result).isNotEmpty();
   }
 
@@ -84,7 +84,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
       .query();
 
     List<DMachineStats> result = query.findList();
-    assertThat(sqlOf(query)).contains("select t0.machine_id, t0.date, sum(t0.total_kms), sum(t0.hours) from d_machine_stats t0 where t0.date > ?  group by t0.machine_id, t0.date having sum(t0.hours) > ?");
+    assertThat(sqlOf(query)).contains("select t0.machine_id, t0.date, sum(t0.total_kms), sum(t0.hours) from d_machine_stats t0 where t0.date > ? group by t0.machine_id, t0.date having sum(t0.hours) > ?");
     assertThat(result).isNotEmpty();
   }
 
@@ -98,7 +98,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
       .query();
 
     List<DMachineStats> result = query.findList();
-    assertThat(sqlOf(query)).contains("select t0.machine_id, sum(t0.total_kms) from d_machine_stats t0 where t0.date > ?  group by t0.machine_id having sum(t0.hours) > ?");
+    assertThat(sqlOf(query)).contains("select t0.machine_id, sum(t0.total_kms) from d_machine_stats t0 where t0.date > ? group by t0.machine_id having sum(t0.hours) > ?");
     assertThat(result).isNotEmpty();
   }
 
@@ -119,7 +119,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("select sum(t0.total_kms), sum(t0.hours), t1.id, t1.name from d_machine_stats t0 join dmachine t1 on t1.id = t0.machine_id  where t0.date > ?  group by t1.id, t1.name having sum(t0.hours) > ?");
+    assertThat(sql.get(0)).contains("select sum(t0.total_kms), sum(t0.hours), t1.id, t1.name from d_machine_stats t0 join dmachine t1 on t1.id = t0.machine_id  where t0.date > ? group by t1.id, t1.name having sum(t0.hours) > ?");
   }
 
   @Test
@@ -139,7 +139,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("select t0.date, sum(t0.total_kms), sum(t0.hours), t1.id, t1.name from d_machine_stats t0 join dmachine t1 on t1.id = t0.machine_id  where t0.date > ?  group by t0.date, t1.id, t1.name having sum(t0.hours) > ?");
+    assertThat(sql.get(0)).contains("select t0.date, sum(t0.total_kms), sum(t0.hours), t1.id, t1.name from d_machine_stats t0 join dmachine t1 on t1.id = t0.machine_id  where t0.date > ? group by t0.date, t1.id, t1.name having sum(t0.hours) > ?");
   }
 
 
@@ -161,7 +161,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(2);
 
-    assertThat(sql.get(0)).contains("select sum(t0.total_kms), sum(t0.hours), t0.machine_id from d_machine_stats t0 where t0.date > ?  group by t0.machine_id having sum(t0.hours) > ?");
+    assertThat(sql.get(0)).contains("select sum(t0.total_kms), sum(t0.hours), t0.machine_id from d_machine_stats t0 where t0.date > ? group by t0.machine_id having sum(t0.hours) > ?");
     assertThat(sql.get(1)).contains("select t0.id, t0.name from dmachine t0 where t0.id");
   }
 
@@ -183,7 +183,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(2);
 
-    assertThat(sql.get(0)).contains("select t0.date, sum(t0.total_kms), sum(t0.hours), t0.machine_id from d_machine_stats t0 where t0.date > ?  group by t0.date, t0.machine_id having sum(t0.hours) > ?");
+    assertThat(sql.get(0)).contains("select t0.date, sum(t0.total_kms), sum(t0.hours), t0.machine_id from d_machine_stats t0 where t0.date > ? group by t0.date, t0.machine_id having sum(t0.hours) > ?");
     assertThat(sql.get(1)).contains("select t0.id, t0.name from dmachine t0 where t0.id");
   }
 
@@ -196,7 +196,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
       .query();
 
     List<DMachineStats> result = query.findList();
-    assertThat(sqlOf(query)).contains("select t0.machine_id, t0.date, max(t0.rate) from d_machine_stats t0 where t0.date > ?  group by t0.machine_id, t0.date");
+    assertThat(sqlOf(query)).contains("select t0.machine_id, t0.date, max(t0.rate) from d_machine_stats t0 where t0.date > ? group by t0.machine_id, t0.date");
     assertThat(result).isNotEmpty();
   }
 
@@ -218,7 +218,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(1);
 
-    assertThat(sqlOf(query)).contains("select t0.id, t0.name, sum(t1.total_kms) from dmachine t0 left join d_machine_stats t1 on t1.machine_id = t0.id  where t0.name = ?  group by t0.id, t0.name order by t0.id");
+    assertThat(sqlOf(query)).contains("select t0.id, t0.name, sum(t1.total_kms) from dmachine t0 left join d_machine_stats t1 on t1.machine_id = t0.id  where t0.name = ? group by t0.id, t0.name order by t0.id");
   }
 
   @Test
@@ -244,7 +244,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(1);
 
-    assertThat(sqlOf(query)).contains("select t0.id, t0.name, t1.date, max(t1.rate), sum(t1.total_kms) from dmachine t0 left join d_machine_stats t1 on t1.machine_id = t0.id  where t0.name = ?  group by t0.id, t0.name, t1.date order by t0.id");
+    assertThat(sqlOf(query)).contains("select t0.id, t0.name, t1.date, max(t1.rate), sum(t1.total_kms) from dmachine t0 left join d_machine_stats t1 on t1.machine_id = t0.id  where t0.name = ? group by t0.id, t0.name, t1.date order by t0.id");
   }
 
 
diff --git a/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java b/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java
index 7113db45a..d1a95de0b 100644
--- a/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java
+++ b/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java
@@ -108,7 +108,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase {
     assertThat(sql).hasSize(1);
     if (isH2()) {
       // in clause with only 1 bind param - (sku=3 ... we got hits on sku 1 and 2)
-      assertThat(sql.get(0)).contains("from o_cached_natkey t0 where t0.store = ?  and t0.sku in (? )  order by t0.sku desc; --bind(abc,Array[1]={3})");
+      assertThat(sql.get(0)).contains("from o_cached_natkey t0 where t0.store = ? and t0.sku in (? )  order by t0.sku desc; --bind(abc,Array[1]={3})");
     }
 
     assertThat(list).hasSize(3);
@@ -169,7 +169,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase {
     assertThat(sql).hasSize(1);
     if (isH2()) {
       // in clause with 2 bind params as we got not hits on the cache
-      assertThat(sql.get(0)).contains("from o_cached_natkey t0 where t0.store = ?  and t0.sku in (?, ? )  order by t0.sku desc; --bind(abc,Array[2]={3,4})");
+      assertThat(sql.get(0)).contains("from o_cached_natkey t0 where t0.store = ? and t0.sku in (?, ? )  order by t0.sku desc; --bind(abc,Array[2]={3,4})");
     }
 
     assertThat(list).hasSize(2);
diff --git a/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java b/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
index b8b0b20e5..256c730e6 100644
--- a/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
+++ b/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
@@ -116,7 +116,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
     assertThat(sql).hasSize(1);
     if (isH2()) {
       // in clause with only 1 bind param - (sku=3 ... we got hits on sku 1 and 2)
-      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and t0.code in (? )  and t0.sku = ?  order by t0.sku desc, t0.code; --bind(def,Array[1]={1000},2)");
+      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and t0.code in (? )  and t0.sku = ? order by t0.sku desc, t0.code; --bind(def,Array[1]={1000},2)");
     }
 
     assertThat(list).hasSize(4);
@@ -178,7 +178,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
     assertThat(sql).hasSize(1);
     if (isH2()) {
       // in clause with 2 bind params as we got not hits on the cache
-      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and t0.sku in (?, ?, ? )  and t0.code = ?  order by t0.sku desc; --bind(abc,Array[3]={3,2,4},1001)");
+      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and t0.sku in (?, ?, ? )  and t0.code = ? order by t0.sku desc; --bind(abc,Array[3]={3,2,4},1001)");
     }
 
     assertThat(list).hasSize(2);
@@ -278,13 +278,13 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
     assertBeanCacheHitMiss(1, 0);
 
     if (isH2()) {
-      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and concat(t0.sku,'-',t0.code) in (?, ? )  order by t0.sku desc; --bind(def,Array[2]={2-1000,3-1000})");
+      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and concat(t0.sku,'-',t0.code) in (?, ? )  order by t0.sku desc; --bind(def,Array[2]={2-1000,3-1000})");
     } else if (isPostgres()) {
-      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and (t0.sku||'-'||t0.code)");
+      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and (t0.sku||'-'||t0.code)");
     } else if (isHana()) {
-      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and concat(t0.sku, '-'||t0.code)");
+      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and concat(t0.sku, '-'||t0.code)");
     } else {
-      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and concat(t0.sku,'-',t0.code)");
+      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and concat(t0.sku,'-',t0.code)");
     }
 
   }
@@ -321,13 +321,13 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
     assertBeanCacheHitMiss(1, 0);
 
     if (isH2()) {
-      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and concat(t0.sku,':',t0.code,'-foo') in (?, ? )  order by t0.sku desc; --bind(def,Array[2]={2:1000-foo,3:1000-foo})");
+      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and concat(t0.sku,':',t0.code,'-foo') in (?, ? )  order by t0.sku desc; --bind(def,Array[2]={2:1000-foo,3:1000-foo})");
     } else if (isPostgres()){
-      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and (t0.sku||':'||t0.code||'-foo')");
+      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and (t0.sku||':'||t0.code||'-foo')");
     } else if (isHana()){
-      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and concat(t0.sku, ':'||t0.code||'-foo')");
+      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and concat(t0.sku, ':'||t0.code||'-foo')");
     } else {
-      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ?  and concat(t0.sku,':',t0.code,'-foo')");
+      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and concat(t0.sku,':',t0.code,'-foo')");
     }
 
   }
diff --git a/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java b/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java
index f34471dc3..12c8fabc5 100644
--- a/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java
+++ b/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java
@@ -38,7 +38,7 @@ public class TestMediaInheritanceJoinToMany extends BaseTestCase {
 
     String generatedSql = query.getGeneratedSql();
     assertThat(generatedSql).contains("from mprofile t0 left join mmedia t1 on t1.id = t0.picture_id and t1.type = 'Picture' ");
-    assertThat(generatedSql).contains("where t0.name = ? ");
+    assertThat(generatedSql).contains("where t0.name = ?");
 
   }
 
diff --git a/src/test/java/org/tests/model/pview/TestPview.java b/src/test/java/org/tests/model/pview/TestPview.java
index 2b9f55b1f..deceae812 100644
--- a/src/test/java/org/tests/model/pview/TestPview.java
+++ b/src/test/java/org/tests/model/pview/TestPview.java
@@ -23,7 +23,7 @@ public class TestPview extends BaseTestCase {
     query.findList();
     String generatedSql = sqlOf(query, 1);
 
-    assertThat(generatedSql).contains("select distinct t0.amount, t1.value from paggview t0 join pp u1 on u1.id = t0.pview_id  join pp_to_ww u2z_ on u2z_.pp_id = u1.id  join wview u2 on u2.id = u2z_.ww_id  left join pp t1 on t1.id = t0.pview_id  where u2.id = ?  order by t1.value");
+    assertThat(generatedSql).contains("select distinct t0.amount, t1.value from paggview t0 join pp u1 on u1.id = t0.pview_id  join pp_to_ww u2z_ on u2z_.pp_id = u1.id  join wview u2 on u2.id = u2z_.ww_id  left join pp t1 on t1.id = t0.pview_id  where u2.id = ? order by t1.value");
 
   }
 
diff --git a/src/test/java/org/tests/model/view/TestViewBaseEntity.java b/src/test/java/org/tests/model/view/TestViewBaseEntity.java
index a0560ff98..b42c1f8e2 100644
--- a/src/test/java/org/tests/model/view/TestViewBaseEntity.java
+++ b/src/test/java/org/tests/model/view/TestViewBaseEntity.java
@@ -25,7 +25,7 @@ public class TestViewBaseEntity extends BaseTestCase {
 
     List<EOrderAgg> list = query.findList();
 
-    assertThat(sqlOf(query, 3)).contains("select t0.order_id, t0.order_total, t0.ship_total, t0.order_id from order_agg_vw t0 where t0.order_total > ? ");
+    assertThat(sqlOf(query, 3)).contains("select t0.order_id, t0.order_total, t0.ship_total, t0.order_id from order_agg_vw t0 where t0.order_total > ?");
     assertThat(list).isNotEmpty();
   }
 
diff --git a/src/test/java/org/tests/query/TestExprNestedDisjunction.java b/src/test/java/org/tests/query/TestExprNestedDisjunction.java
index 02125bc64..fa9679506 100644
--- a/src/test/java/org/tests/query/TestExprNestedDisjunction.java
+++ b/src/test/java/org/tests/query/TestExprNestedDisjunction.java
@@ -3,9 +3,9 @@ package org.tests.query;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -28,7 +28,7 @@ public class TestExprNestedDisjunction extends BaseTestCase {
     String s = q.getGeneratedSql();
 
     assertThat(s).contains("(t0.name like ");
-    assertThat(s).contains(" and t0.anniversary = ? )  or (t0.status = ?  and t0.id > ? )");
+    assertThat(s).contains(" and t0.anniversary = ?) or (t0.status = ? and t0.id > ?)");
   }
 
 
@@ -52,7 +52,7 @@ public class TestExprNestedDisjunction extends BaseTestCase {
     String s = q.getGeneratedSql();
 
     assertThat(s).contains("(t0.name like ");
-    assertThat(s).contains(" and t0.anniversary = ? )  or (t0.status = ?  and t0.id > ? )");
+    assertThat(s).contains(" and t0.anniversary = ?) or (t0.status = ? and t0.id > ?)");
   }
 
   @Test
@@ -73,7 +73,7 @@ public class TestExprNestedDisjunction extends BaseTestCase {
     q.findList();
     String s = q.getGeneratedSql();
 
-    assertThat(s).contains("where not (t0.id > ?  and t0.anniversary = ? )  order by t0.name");
+    assertThat(s).contains("where not (t0.id > ? and t0.anniversary = ?) order by t0.name");
   }
 
   @Test
@@ -95,7 +95,7 @@ public class TestExprNestedDisjunction extends BaseTestCase {
     q.findList();
     String s = q.getGeneratedSql();
 
-    assertThat(s).contains("where (t0.status = ?  or not (t0.id > ?  and t0.anniversary = ? ) )");
+    assertThat(s).contains("where (t0.status = ? or not (t0.id > ? and t0.anniversary = ?))");
   }
 
   @Test
@@ -119,6 +119,6 @@ public class TestExprNestedDisjunction extends BaseTestCase {
     q.findList();
     String s = q.getGeneratedSql();
 
-    assertThat(s).contains("where (t0.status = ?  or not (t0.id > ?  and t0.anniversary = ? ) )");
+    assertThat(s).contains("where (t0.status = ? or not (t0.id > ? and t0.anniversary = ?))");
   }
 }
diff --git a/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java b/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java
index 92faa6f94..5e50b7b70 100644
--- a/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java
+++ b/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java
@@ -28,7 +28,7 @@ public class TestImplicitJoinOnParentRelationship extends BaseTestCase {
       assertThat(sqlOf(query, 1)).contains(expectedSql);
 
     } else {
-      String expectedSql = "select distinct t0.id, t0.name from o_customer t0 join o_order u1 on u1.kcustomer_id = t0.id  join o_order_detail u2 on u2.order_id = u1.id  join o_product u3 on u3.id = u2.product_id  where u3.name = ? ";
+      String expectedSql = "select distinct t0.id, t0.name from o_customer t0 join o_order u1 on u1.kcustomer_id = t0.id  join o_order_detail u2 on u2.order_id = u1.id  join o_product u3 on u3.id = u2.product_id  where u3.name = ?";
       assertThat(sqlOf(query, 1)).contains(expectedSql);
     }
 
@@ -58,7 +58,7 @@ public class TestImplicitJoinOnParentRelationship extends BaseTestCase {
       String expectedSql = "select distinct on (t0.id) t0.id, t0.name from o_customer t0 left join o_order u1 on u1.kcustomer_id = t0.id  left join o_order_detail u2 on u2.order_id = u1.id  left join o_product u3 on u3.id = u2.product_id  where (u3.name = ?  or t0.id = ? ) ";
       assertThat(sqlOf(query, 1)).contains(expectedSql);
     } else {
-      String expectedSql = "select distinct t0.id, t0.name from o_customer t0 left join o_order u1 on u1.kcustomer_id = t0.id  left join o_order_detail u2 on u2.order_id = u1.id  left join o_product u3 on u3.id = u2.product_id  where (u3.name = ?  or t0.id = ? ) ";
+      String expectedSql = "select distinct t0.id, t0.name from o_customer t0 left join o_order u1 on u1.kcustomer_id = t0.id  left join o_order_detail u2 on u2.order_id = u1.id  left join o_product u3 on u3.id = u2.product_id  where (u3.name = ? or t0.id = ?)";
       assertThat(sqlOf(query, 1)).contains(expectedSql);
     }
   }
@@ -80,7 +80,7 @@ public class TestImplicitJoinOnParentRelationship extends BaseTestCase {
       assertThat(sqlOf(query, 1)).contains(expectedSql);
 
     } else {
-      String expectedSql = "select distinct t0.id, t0.name from o_customer t0 left join o_order u1 on u1.kcustomer_id = t0.id  left join o_order_detail u2 on u2.order_id = u1.id  left join o_product u3 on u3.id = u2.product_id  where (u3.name = ?  or t0.id = ? ) ";
+      String expectedSql = "select distinct t0.id, t0.name from o_customer t0 left join o_order u1 on u1.kcustomer_id = t0.id  left join o_order_detail u2 on u2.order_id = u1.id  left join o_product u3 on u3.id = u2.product_id  where (u3.name = ? or t0.id = ?)";
       assertThat(sqlOf(query, 1)).contains(expectedSql);
     }
   }
diff --git a/src/test/java/org/tests/query/TestQueryExists.java b/src/test/java/org/tests/query/TestQueryExists.java
index 84aac4fb6..5d887034b 100644
--- a/src/test/java/org/tests/query/TestQueryExists.java
+++ b/src/test/java/org/tests/query/TestQueryExists.java
@@ -28,7 +28,7 @@ public class TestQueryExists extends BaseTestCase {
 
     String sql = sqlOf(query);
     if (isH2() || isPostgres()) {
-      assertThat(sql).contains("select t0.id from o_order t0 where t0.id > ?  limit 1");
+      assertThat(sql).contains("select t0.id from o_order t0 where t0.id > ? limit 1");
     }
 
     assertThat(Ebean.find(Order.class).where().gt("id", 1).exists()).isTrue();
diff --git a/src/test/java/org/tests/query/TestQueryFilterMany.java b/src/test/java/org/tests/query/TestQueryFilterMany.java
index 17d40a5ad..448bcd173 100644
--- a/src/test/java/org/tests/query/TestQueryFilterMany.java
+++ b/src/test/java/org/tests/query/TestQueryFilterMany.java
@@ -154,7 +154,7 @@ public class TestQueryFilterMany extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.stop();
     assertEquals(2, sql.size());
-    assertThat(sql.get(1)).contains("and (t0.status = ?  or t0.order_date = ?");
+    assertThat(sql.get(1)).contains("and (t0.status = ? or t0.order_date = ?");
   }
 
   @Test
diff --git a/src/test/java/org/tests/query/aggregation/TestAggregationCount.java b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
index 65231e8d1..3e88ac43a 100644
--- a/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
+++ b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
@@ -95,7 +95,7 @@ public class TestAggregationCount extends BaseTestCase {
     assertThat(sql).contains("select t0.id, t0.name, count(u1.id), sum(u1.units), sum(u1.units * u1.amount) from tevent_one t0");
     assertThat(sql).contains("from tevent_one t0 join tevent_many u1 on u1.event_id = t0.id ");
     assertThat(sql).contains("where u1.description like ");
-    assertThat(sql).contains(" group by t0.id, t0.name having count(u1.id) >= ?  order by t0.name");
+    assertThat(sql).contains(" group by t0.id, t0.name having count(u1.id) >= ? order by t0.name");
 
     // invoke lazy loading
     Long version = list.get(0).getVersion();
@@ -169,7 +169,7 @@ public class TestAggregationCount extends BaseTestCase {
       .orderBy().asc("name");
 
     query1.findList();
-    assertThat(query1.getGeneratedSql()).contains("having count(u1.id) >= ?  order by t0.name");
+    assertThat(query1.getGeneratedSql()).contains("having count(u1.id) >= ? order by t0.name");
   }
 
   @Test
@@ -391,7 +391,7 @@ public class TestAggregationCount extends BaseTestCase {
     assertThat(names).isNotEmpty();
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(trimSql(sql.get(0))).contains("select " + concat("t0.last_name",", ","t0.first_name") + " from contact t0 where t0.phone is null  order by t0.last_name");
+    assertThat(trimSql(sql.get(0))).contains("select " + concat("t0.last_name",", ","t0.first_name") + " from contact t0 where t0.phone is null order by t0.last_name");
   }
 
   @Test
@@ -459,7 +459,7 @@ public class TestAggregationCount extends BaseTestCase {
     }
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(trimSql(sql.get(0))).contains("select t0.id, t0.email, " + concat("t0.last_name",", ","t0.first_name") + " lastName from contact t0 where t0.phone is null  order by t0.last_name; --bind()");
+    assertThat(trimSql(sql.get(0))).contains("select t0.id, t0.email, " + concat("t0.last_name",", ","t0.first_name") + " lastName from contact t0 where t0.phone is null order by t0.last_name; --bind()");
   }
 
 }
diff --git a/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java b/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java
index 0610c7fa6..28b8b0dbd 100644
--- a/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java
+++ b/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java
@@ -79,7 +79,7 @@ public class TestDisjunctWhereOuterJoin extends BaseTestCase {
 
     String sql = sqlOf(query);
     assertSqlOuterJoins(sql);
-    assertThat(sql).contains("where (t0.user_name = ?  or u1.roleid = ? )");
+    assertThat(sql).contains("where (t0.user_name = ? or u1.roleid = ?)");
   }
 
   private void queryOrExpression(Integer roleid) {
@@ -95,7 +95,7 @@ public class TestDisjunctWhereOuterJoin extends BaseTestCase {
 
     String sql = sqlOf(query);
     assertSqlOuterJoins(sql);
-    assertThat(sql).contains("where (t0.user_name = ?  or u1.roleid = ? )");
+    assertThat(sql).contains("where (t0.user_name = ? or u1.roleid = ?)");
   }
 
   private void assertSqlOuterJoins(String sql) {
diff --git a/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java b/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java
index cb7c6522d..435a3de55 100644
--- a/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java
+++ b/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java
@@ -62,7 +62,7 @@ public class TestDisjunctWhereOuterOnMany extends BaseTestCase {
       assertThat(sqlOf(query, 1)).contains(expectedSql);
 
     } else {
-      String expectedSql = "select distinct t0.id, t0.name, t0.description, t0.version from uuone t0 left join uutwo u1 on u1.master_id = t0.id  where (t0.name = ?  or u1.name = ? ) ";
+      String expectedSql = "select distinct t0.id, t0.name, t0.description, t0.version from uuone t0 left join uutwo u1 on u1.master_id = t0.id  where (t0.name = ? or u1.name = ?)";
       assertThat(sqlOf(query, 1)).contains(expectedSql);
     }
 
diff --git a/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java b/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java
index 455e92e71..81635a944 100644
--- a/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java
+++ b/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java
@@ -3,10 +3,10 @@ package org.tests.query.other;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
-import org.tests.model.converstation.Conversation;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Assert;
 import org.junit.Test;
+import org.tests.model.converstation.Conversation;
 
 import java.util.List;
 
@@ -49,7 +49,7 @@ public class TestQueryConversationRowCount extends BaseTestCase {
       assertThat(generatedSql).contains("select distinct t0.id, t0.title, t0.isopen");
     }
     assertThat(generatedSql).contains("left join c_participation u1 on u1.conversation_id = t0.id");
-    assertThat(generatedSql).contains("where t0.group_id = ?  and ((t0.isopen = ?  and u1.user_id = ? )  or t0.isopen = ? )");
+    assertThat(generatedSql).contains("where t0.group_id = ? and ((t0.isopen = ? and u1.user_id = ?) or t0.isopen = ?)");
 
 
     LoggedSqlCollector.start();
@@ -66,7 +66,7 @@ public class TestQueryConversationRowCount extends BaseTestCase {
     Assert.assertEquals(1, loggedSql.size());
 
     String countSql = trimSql(loggedSql.get(0), 0);
-    assertThat(countSql).contains("select count(*) from ( select distinct t0.id from c_conversation t0 left join c_participation u1 on u1.conversation_id = t0.id  where t0.group_id = ?  and ((t0.isopen = ?  and u1.user_id = ? )  or t0.isopen = ? )");
+    assertThat(countSql).contains("select count(*) from ( select distinct t0.id from c_conversation t0 left join c_participation u1 on u1.conversation_id = t0.id  where t0.group_id = ? and ((t0.isopen = ? and u1.user_id = ?) or t0.isopen = ?))");
   }
 
 }
diff --git a/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java b/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java
index 019876280..bf9283d50 100644
--- a/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java
+++ b/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java
@@ -3,11 +3,11 @@ package org.tests.query.other;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
-import org.tests.model.basic.Order;
-import org.tests.model.basic.ResetBasicData;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Assert;
 import org.junit.Test;
+import org.tests.model.basic.Order;
+import org.tests.model.basic.ResetBasicData;
 
 import java.util.List;
 
@@ -69,7 +69,7 @@ public class TestQueryRowCountWithMany extends BaseTestCase {
     Assert.assertEquals(list.size(), rowCount);
     Assert.assertEquals(2, sqlLogged.size());
     assertThat(trimSql(sqlLogged.get(1), 1)).contains(
-      "select count(*) from ( select distinct t0.id from o_order t0 join o_order_detail u1 on u1.order_id = t0.id  where u1.product_id = ? )");
+      "select count(*) from ( select distinct t0.id from o_order t0 join o_order_detail u1 on u1.order_id = t0.id  where u1.product_id = ?)");
 
   }
 
@@ -94,7 +94,7 @@ public class TestQueryRowCountWithMany extends BaseTestCase {
     List<String> sqlLogged = LoggedSqlCollector.stop();
 
     Assert.assertEquals(1, sqlLogged.size());
-    assertThat(trimSql(sqlLogged.get(0), 1)).contains("select count(*) from ( select distinct t0.id from o_order t0 join o_order_detail u1 on u1.order_id = t0.id  where u1.product_id = ? )");
+    assertThat(trimSql(sqlLogged.get(0), 1)).contains("select count(*) from ( select distinct t0.id from o_order t0 join o_order_detail u1 on u1.order_id = t0.id  where u1.product_id = ?)");
 
     query.findList();
   }
diff --git a/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
index 4b5c9ed3c..4e25732bf 100644
--- a/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
+++ b/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
@@ -68,7 +68,7 @@ public class TestQuerySingleAttribute extends BaseTestCase {
         .orderBy().asc("name");
 
     query.findSingleAttributeList();
-    assertThat(sqlOf(query)).contains("select distinct t0.name from o_customer t0 where t0.status = ?  order by t0.name");
+    assertThat(sqlOf(query)).contains("select distinct t0.name from o_customer t0 where t0.status = ? order by t0.name");
   }
 
   @Test
@@ -140,7 +140,7 @@ public class TestQuerySingleAttribute extends BaseTestCase {
 
     List<String> names = query.findSingleAttributeList();
 
-    assertThat(sqlOf(query)).contains("select distinct t0.name from o_customer t0 where t0.status = ? ");
+    assertThat(sqlOf(query)).contains("select distinct t0.name from o_customer t0 where t0.status = ?");
     assertThat(names).isNotNull();
   }
 
@@ -158,7 +158,7 @@ public class TestQuerySingleAttribute extends BaseTestCase {
 
     List<String> names = query.findSingleAttributeList();
 
-    assertThat(sqlOf(query)).contains("select distinct t0.name from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id  where t0.status = ?  and lower(t1.city) like ");
+    assertThat(sqlOf(query)).contains("select distinct t0.name from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id  where t0.status = ? and lower(t1.city) like ");
     assertThat(names).isNotNull();
   }
 
@@ -406,7 +406,7 @@ public class TestQuerySingleAttribute extends BaseTestCase {
     assertThat(sqlOf(query)).contains("select distinct t1.billing_address_id from contact t0 "
       + "join o_customer t1 on t1.id = t0.customer_id  "  // two spaces!
       + "left join o_address t2 on t2.id = t1.billing_address_id  "
-      + "where t2.city = ?  "
+      + "where t2.city = ? "
       + "order by t1.billing_address_id desc");
   }
 
@@ -427,7 +427,7 @@ public class TestQuerySingleAttribute extends BaseTestCase {
     assertThat(sqlOf(query)).contains("select distinct t1.billing_address_id from contact t0 "
       + "join o_customer t1 on t1.id = t0.customer_id  "
       + "left join o_address t2 on t2.id = t1.billing_address_id  "
-      + "where t2.city = ?  "
+      + "where t2.city = ? "
       + "order by t1.billing_address_id desc");
   }
 
@@ -448,7 +448,7 @@ public class TestQuerySingleAttribute extends BaseTestCase {
     assertThat(sqlOf(query)).contains("select distinct t1.billing_address_id from contact t0 "
       + "join o_customer t1 on t1.id = t0.customer_id  "
       + "left join o_address t2 on t2.id = t1.billing_address_id  "
-      + "where t2.city = ?  "
+      + "where t2.city = ? "
       + "order by t1.billing_address");
   }
 
@@ -469,7 +469,7 @@ public class TestQuerySingleAttribute extends BaseTestCase {
     assertThat(sqlOf(query)).contains("select distinct t1.billing_address_id from contact t0 "
       + "join o_customer t1 on t1.id = t0.customer_id  "
       + "left join o_address t2 on t2.id = t1.shipping_address_id  "
-      + "where t2.city = ?  "
+      + "where t2.city = ? "
       + "order by t1.billing_address_id desc");
 
   }
@@ -533,7 +533,7 @@ public class TestQuerySingleAttribute extends BaseTestCase {
     assertThat(sqlOf(query)).contains("select r1.attribute_, count(*) from ("
       + "select t0.first_name as attribute_ from contact t0 "
       + "join o_customer t1 on t1.id = t0.customer_id  "
-      + "left join o_address t2 on t2.id = t1.shipping_address_id  where t2.line_1 = ? "
+      + "left join o_address t2 on t2.id = t1.shipping_address_id  where t2.line_1 = ?"
       + ") r1 group by r1.attribute_ order by r1.attribute_");
     assertThat(list3.get(0)).isInstanceOf(CountedValue.class);
     //assertThat(list3.toString()).isEqualTo("[1: Bugs1, 1: Fiona, 1: Fred1, 1: Jim1, 1: Tracy]");
@@ -552,7 +552,7 @@ public class TestQuerySingleAttribute extends BaseTestCase {
       + "from contact t0 join o_customer t1 on t1.id = t0.customer_id  "
       + "left join o_address t2 on t2.id = t1.billing_address_id  "
       + "left join o_address t3 on t3.id = t1.shipping_address_id  "
-      + "where (t3.line_1 <> ?  or t3.line_1 is null ) "
+      + "where (t3.line_1 <> ? or t3.line_1 is null)"
       + ") r1 group by r1.attribute_ order by r1.attribute_");
     assertThat(list4.get(0)).isInstanceOf(CountedValue.class);
     //assertThat(list4.toString()).isEqualTo("[1: null, 3: Bos town, 3: P.O.Box 1234]");
@@ -568,7 +568,7 @@ public class TestQuerySingleAttribute extends BaseTestCase {
       + "select t2.line_1 as attribute_ from contact t0 "
       + "join o_customer t1 on t1.id = t0.customer_id  "
       + "left join o_address t2 on t2.id = t1.billing_address_id  "
-      + "where t2.line_1 is not null "
+      + "where t2.line_1 is not null"
       + ") r1 group by r1.attribute_ order by r1.attribute_ desc ");
     if (isSqlServer()) {
       assertThat(sqlOf(query)).endsWith(" fetch next 2 rows only");
diff --git a/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java b/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
index 9058195dc..e9557baeb 100644
--- a/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
+++ b/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
@@ -79,8 +79,8 @@ public class TestSoftDeleteBasic extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
 
     assertThat(sql).hasSize(2);
-    assertThat(sql.get(0)).contains("from ebasic_sdchild t0 where t0.owner_id = ?  and t0.deleted = ");
-    assertThat(sql.get(1)).contains("from ebasic_sdchild t0 where t0.owner_id = ?  and t0.deleted = ");
+    assertThat(sql.get(0)).contains("from ebasic_sdchild t0 where t0.owner_id = ? and t0.deleted = ");
+    assertThat(sql.get(1)).contains("from ebasic_sdchild t0 where t0.owner_id = ? and t0.deleted = ");
   }
 
   @Test

From 41abf34ef6ef163f2b5023e0c1ac6d3b80e02987 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 25 Jan 2019 01:52:23 +1300
Subject: [PATCH 0694/1036] #1621 - Consider clean up white space in generated
 SQL (as in remove unneeded extra spaces)

---
 .../tests/query/TestImplicitJoinOnParentRelationship.java   | 6 +++---
 .../org/tests/query/joins/TestDisjunctWhereOuterOnMany.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java b/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java
index 5e50b7b70..05ce7596d 100644
--- a/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java
+++ b/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java
@@ -24,7 +24,7 @@ public class TestImplicitJoinOnParentRelationship extends BaseTestCase {
     query.findList();
 
     if (isPostgres()) {
-      String expectedSql = "select distinct on (t0.id) t0.id, t0.name from o_customer t0 join o_order u1 on u1.kcustomer_id = t0.id  join o_order_detail u2 on u2.order_id = u1.id  join o_product u3 on u3.id = u2.product_id  where u3.name = ? ";
+      String expectedSql = "select distinct on (t0.id) t0.id, t0.name from o_customer t0 join o_order u1 on u1.kcustomer_id = t0.id  join o_order_detail u2 on u2.order_id = u1.id  join o_product u3 on u3.id = u2.product_id  where u3.name = ?";
       assertThat(sqlOf(query, 1)).contains(expectedSql);
 
     } else {
@@ -55,7 +55,7 @@ public class TestImplicitJoinOnParentRelationship extends BaseTestCase {
     query.findList();
 
     if (isPostgres()) {
-      String expectedSql = "select distinct on (t0.id) t0.id, t0.name from o_customer t0 left join o_order u1 on u1.kcustomer_id = t0.id  left join o_order_detail u2 on u2.order_id = u1.id  left join o_product u3 on u3.id = u2.product_id  where (u3.name = ?  or t0.id = ? ) ";
+      String expectedSql = "select distinct on (t0.id) t0.id, t0.name from o_customer t0 left join o_order u1 on u1.kcustomer_id = t0.id  left join o_order_detail u2 on u2.order_id = u1.id  left join o_product u3 on u3.id = u2.product_id  where (u3.name = ? or t0.id = ?)";
       assertThat(sqlOf(query, 1)).contains(expectedSql);
     } else {
       String expectedSql = "select distinct t0.id, t0.name from o_customer t0 left join o_order u1 on u1.kcustomer_id = t0.id  left join o_order_detail u2 on u2.order_id = u1.id  left join o_product u3 on u3.id = u2.product_id  where (u3.name = ? or t0.id = ?)";
@@ -76,7 +76,7 @@ public class TestImplicitJoinOnParentRelationship extends BaseTestCase {
     query.findList();
 
     if (isPostgres()) {
-      String expectedSql = "select distinct on (t0.id) t0.id, t0.name from o_customer t0 left join o_order u1 on u1.kcustomer_id = t0.id  left join o_order_detail u2 on u2.order_id = u1.id  left join o_product u3 on u3.id = u2.product_id  where (u3.name = ?  or t0.id = ? ) ";
+      String expectedSql = "select distinct on (t0.id) t0.id, t0.name from o_customer t0 left join o_order u1 on u1.kcustomer_id = t0.id  left join o_order_detail u2 on u2.order_id = u1.id  left join o_product u3 on u3.id = u2.product_id  where (u3.name = ? or t0.id = ?)";
       assertThat(sqlOf(query, 1)).contains(expectedSql);
 
     } else {
diff --git a/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java b/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java
index 435a3de55..f59a2f9a4 100644
--- a/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java
+++ b/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java
@@ -58,7 +58,7 @@ public class TestDisjunctWhereOuterOnMany extends BaseTestCase {
     Assert.assertEquals(2, rowCount);
 
     if (isPostgres()) {
-      String expectedSql = "select distinct on (t0.id) t0.id, t0.name, t0.description, t0.version from uuone t0 left join uutwo u1 on u1.master_id = t0.id  where (t0.name = ?  or u1.name = ? ) ";
+      String expectedSql = "select distinct on (t0.id) t0.id, t0.name, t0.description, t0.version from uuone t0 left join uutwo u1 on u1.master_id = t0.id  where (t0.name = ? or u1.name = ?)";
       assertThat(sqlOf(query, 1)).contains(expectedSql);
 
     } else {

From b7770a96178c789b6063d5b23f92cd2adb743118 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 29 Jan 2019 15:59:11 +1300
Subject: [PATCH 0695/1036] [maven-release-plugin] prepare release
 ebean-11.33.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9648bc611..faf5b1700 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.33.2-SNAPSHOT</version>
+  <version>11.33.2</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.33.2</tag>
   </scm>
 
   <profiles>

From c5fb1dbe2341d7012df23ee11a51c1ef9c0e61b5 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 29 Jan 2019 15:59:24 +1300
Subject: [PATCH 0696/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index faf5b1700..ad5505adf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.33.2</version>
+  <version>11.33.3-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.33.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 31d7c6fed8dca32c972d61db06515849750dd695 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 30 Jan 2019 12:10:16 +1300
Subject: [PATCH 0697/1036] #1622 - ENH: Bump ebean-datasource to 4.3.3 with
 improved DataSourceInitialiseException

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ad5505adf..a722a73b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-datasource</artifactId>
-      <version>4.3.2</version>
+      <version>4.3.3</version>
     </dependency>
 
     <dependency>

From f3cb7e2cfdd3059eb6c71d9848fcedf624f9894a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 1 Feb 2019 22:53:41 +1300
Subject: [PATCH 0698/1036] #1624 - ENH: Create io.ebean.DB as alias for Ebean
 and io.ebean.Database as alias for EbeanServer

---
 src/main/java/io/ebean/DB.java                | 1194 +++++++++++++
 src/main/java/io/ebean/Database.java          | 1567 +++++++++++++++++
 src/main/java/io/ebean/DatabaseFactory.java   |   67 +
 src/main/java/io/ebean/Ebean.java             |    2 +-
 src/main/java/io/ebean/EbeanServer.java       | 1561 +---------------
 .../java/io/ebean/config/DatabaseConfig.java  |   44 +
 .../ebean/EbeanServer_deleteAllByIdTest.java  |   30 +-
 .../java/io/ebean/plugin/BeanTypeTest.java    |   56 +-
 .../io/ebean/text/json/JsonContextTest.java   |   51 +-
 .../build/ModelBuildBeanVisitorTest.java      |    6 +-
 .../transaction/JdbcTransactionTest.java      |   30 +-
 11 files changed, 2956 insertions(+), 1652 deletions(-)
 create mode 100644 src/main/java/io/ebean/DB.java
 create mode 100644 src/main/java/io/ebean/Database.java
 create mode 100644 src/main/java/io/ebean/DatabaseFactory.java
 create mode 100644 src/main/java/io/ebean/config/DatabaseConfig.java

diff --git a/src/main/java/io/ebean/DB.java b/src/main/java/io/ebean/DB.java
new file mode 100644
index 000000000..9583861ca
--- /dev/null
+++ b/src/main/java/io/ebean/DB.java
@@ -0,0 +1,1194 @@
+package io.ebean;
+
+import io.ebean.annotation.TxIsolation;
+import io.ebean.cache.ServerCacheManager;
+import io.ebean.config.DatabaseConfig;
+import io.ebean.plugin.Property;
+import io.ebean.text.csv.CsvReader;
+import io.ebean.text.json.JsonContext;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.persistence.OptimisticLockException;
+import javax.persistence.PersistenceException;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Callable;
+
+public class DB {
+
+  /**
+   * Return the default database.
+   */
+  public static Database getDefault() {
+    return Ebean.getDefaultServer();
+  }
+
+  /**
+   * Return the database for the given name.
+   *
+   * @param name The name of the database
+   */
+  public static Database byName(String name) {
+    return Ebean.getServer(name);
+  }
+
+//  /**
+//   * Register the server with this Ebean singleton. Specify if the registered
+//   * server is the primary/default server.
+//   */
+//  public static void register(EbeanServer server, boolean defaultServer) {
+//    serverMgr.register(server, defaultServer);
+//  }
+//
+//  /**
+//   * Backdoor for registering a mock implementation of EbeanServer as the default server.
+//   */
+//  protected static EbeanServer mock(String name, EbeanServer server, boolean defaultServer) {
+//    EbeanServer originalPrimaryServer = serverMgr.defaultServer;
+//    serverMgr.registerWithName(name, server, defaultServer);
+//    return originalPrimaryServer;
+//  }
+
+  /**
+   * Return the ExpressionFactory from the default database.
+   * <p>
+   * The ExpressionFactory is used internally by the query and ExpressionList to
+   * build the WHERE and HAVING clauses. Alternatively you can use the
+   * ExpressionFactory directly to create expressions to add to the query where
+   * clause.
+   * </p>
+   * <p>
+   * Alternatively you can use the {@link Expr} as a shortcut to the
+   * ExpressionFactory of the 'Default' database.
+   * </p>
+   * <p>
+   * You generally need to the an ExpressionFactory (or {@link Expr}) to build
+   * an expression that uses OR like Expression e = Expr.or(..., ...);
+   * </p>
+   */
+  public static ExpressionFactory getExpressionFactory() {
+    return getDefault().getExpressionFactory();
+  }
+
+  /**
+   * Return the next identity value for a given bean type.
+   * <p>
+   * This will only work when a IdGenerator is on this bean type such as a DB
+   * sequence or UUID.
+   * </p>
+   * <p>
+   * For DB's supporting getGeneratedKeys and sequences such as Oracle10 you do
+   * not need to use this method generally. It is made available for more
+   * complex cases where it is useful to get an ID prior to some processing.
+   * </p>
+   */
+  public static Object nextId(Class<?> beanType) {
+    return getDefault().nextId(beanType);
+  }
+
+  /**
+   * Start a transaction with 'REQUIRED' semantics.
+   * <p>
+   * With REQUIRED semantics if an active transaction already exists that transaction will be used.
+   * </p>
+   * <p>
+   * The transaction is stored in a ThreadLocal variable and typically you only
+   * need to use the returned Transaction <em>IF</em> you wish to do things like
+   * use batch mode, change the transaction isolation level, use savepoints or
+   * log comments to the transaction log.
+   * </p>
+   * <p>
+   * Example of using a transaction to span multiple calls to find(), save()
+   * etc.
+   * </p>
+   * <pre>{@code
+   *
+   *   try (Transaction txn = DB.beginTransaction()) {
+   * 	   Order order = DB.find(Order.class,10); ...
+   *
+   * 	   DB.save(order);
+   *
+   * 	   txn.commit();
+   *   }
+   *
+   * }</pre>
+   * <p>
+   * If you want to externalise the transaction management then you should be
+   * able to do this via Database. Specifically with Database you can pass
+   * the transaction to the various find() and save() execute() methods. This
+   * gives you the ability to create the transactions yourself externally from
+   * Ebean and pass those transactions through to the various methods available
+   * on Database.
+   * </p>
+   */
+  public static Transaction beginTransaction() {
+    return getDefault().beginTransaction();
+  }
+
+  /**
+   * Start a transaction additionally specifying the isolation level.
+   *
+   * @param isolation the Transaction isolation level
+   */
+  public static Transaction beginTransaction(TxIsolation isolation) {
+    return getDefault().beginTransaction(isolation);
+  }
+
+  /**
+   * Start a transaction typically specifying REQUIRES_NEW or REQUIRED semantics.
+   * <p>
+   * Note that this provides an try finally alternative to using {@link #executeCall(TxScope, Callable)} or
+   * {@link #execute(TxScope, Runnable)}.
+   * </p>
+   * <p>
+   * <h3>REQUIRES_NEW example:</h3>
+   * <pre>{@code
+   * // Start a new transaction. If there is a current transaction
+   * // suspend it until this transaction ends
+   *
+   * try (Transaction txn = DB.beginTransaction(TxScope.requiresNew())) {
+   *
+   *   ...
+   *
+   *   // commit the transaction
+   *   txn.commit();
+   * }
+   *
+   * }</pre>
+   * <h3>REQUIRED example:</h3>
+   * <pre>{@code
+   *
+   * // start a new transaction if there is not a current transaction
+   *
+   * try (Transaction txn = DB.beginTransaction(TxScope.required())) {
+   *
+   *   ...
+   *
+   *   // commit the transaction if it was created or
+   *   // do nothing if there was already a current transaction
+   *   txn.commit();
+   *
+   * }
+   *
+   * }</pre>
+   */
+  public static Transaction beginTransaction(TxScope scope) {
+    return getDefault().beginTransaction(scope);
+  }
+
+  /**
+   * Returns the current transaction or null if there is no current transaction in scope.
+   */
+  public static Transaction currentTransaction() {
+    return getDefault().currentTransaction();
+  }
+
+  /**
+   * The batch will be flushing automatically but you can use this to explicitly
+   * flush the batch if you like.
+   * <p>
+   * Flushing occurs automatically when:
+   * </p>
+   * <ul>
+   * <li>the batch size is reached</li>
+   * <li>A query is executed on the same transaction</li>
+   * <li>UpdateSql or CallableSql are mixed with bean save and delete</li>
+   * <li>Transaction commit occurs</li>
+   * <li>A getter method is called on a batched bean</li>
+   * </ul>
+   */
+  public static void flush() {
+    currentTransaction().flush();
+  }
+
+  /**
+   * Register a TransactionCallback on the currently active transaction.
+   * <p/>
+   * If there is no currently active transaction then a PersistenceException is thrown.
+   *
+   * @param transactionCallback the transaction callback to be registered with the current transaction
+   * @throws PersistenceException if there is no currently active transaction
+   */
+  public static void register(TransactionCallback transactionCallback) throws PersistenceException {
+    getDefault().register(transactionCallback);
+  }
+
+  /**
+   * Commit the current transaction.
+   */
+  public static void commitTransaction() {
+    getDefault().commitTransaction();
+  }
+
+  /**
+   * Rollback the current transaction.
+   */
+  public static void rollbackTransaction() {
+    getDefault().rollbackTransaction();
+  }
+
+  /**
+   * If the current transaction has already been committed do nothing otherwise
+   * rollback the transaction.
+   * <p>
+   * It is preferable to use <em>try with resources</em> rather than this.
+   * </p>
+   * <p>
+   * Useful to put in a finally block to ensure the transaction is ended, rather
+   * than a rollbackTransaction() in each catch block.
+   * </p>
+   * <p>
+   * Code example:
+   * </p>
+   * <pre>{@code
+   *   DB.beginTransaction();
+   *   try {
+   *     // do some fetching and or persisting
+   *
+   *     // commit at the end
+   *     DB.commitTransaction();
+   *
+   *   } finally {
+   *     // if commit didn't occur then rollback the transaction
+   *     DB.endTransaction();
+   *   }
+   * }</pre>
+   */
+  public static void endTransaction() {
+    getDefault().endTransaction();
+  }
+
+  /**
+   * Mark the current transaction as rollback only.
+   */
+  public static void setRollbackOnly() {
+    getDefault().currentTransaction().setRollbackOnly();
+  }
+
+  /**
+   * Return a map of the differences between two objects of the same type.
+   * <p>
+   * When null is passed in for b, then the 'OldValues' of a is used for the
+   * difference comparison.
+   * </p>
+   */
+  public static Map<String, ValuePair> diff(Object a, Object b) {
+    return getDefault().diff(a, b);
+  }
+
+  /**
+   * Either Insert or Update the bean depending on its state.
+   * <p>
+   * If there is no current transaction one will be created and committed for
+   * you automatically.
+   * </p>
+   * <p>
+   * Save can cascade along relationships. For this to happen you need to
+   * specify a cascade of CascadeType.ALL or CascadeType.PERSIST on the
+   * OneToMany, OneToOne or ManyToMany annotation.
+   * </p>
+   * <p>
+   * In this example below the details property has a CascadeType.ALL set so
+   * saving an order will also save all its details.
+   * </p>
+   * <pre>{@code
+   *   public class Order { ...
+   *
+   * 	   @OneToMany(cascade=CascadeType.ALL, mappedBy="order")
+   * 	   List<OrderDetail> details;
+   * 	   ...
+   *   }
+   * }</pre>
+   * <p>
+   * When a save cascades via a OneToMany or ManyToMany Ebean will automatically
+   * set the 'parent' object to the 'detail' object. In the example below in
+   * saving the order and cascade saving the order details the 'parent' order
+   * will be set against each order detail when it is saved.
+   * </p>
+   */
+  public static void save(Object bean) throws OptimisticLockException {
+    getDefault().save(bean);
+  }
+
+  /**
+   * Insert the bean. This is useful when you set the Id property on a bean and
+   * want to explicitly insert it.
+   */
+  public static void insert(Object bean) {
+    getDefault().insert(bean);
+  }
+
+  /**
+   * Insert a collection of beans.
+   */
+  public static void insertAll(Collection<?> beans) {
+    getDefault().insertAll(beans);
+  }
+
+  /**
+   * Marks the entity bean as dirty.
+   * <p>
+   * This is used so that when a bean that is otherwise unmodified is updated with the version
+   * property updated.
+   * <p>
+   * An unmodified bean that is saved or updated is normally skipped and this marks the bean as
+   * dirty so that it is not skipped.
+   * <pre>{@code
+   *
+   *   Customer customer = DB.find(Customer, id);
+   *
+   *   // mark the bean as dirty so that a save() or update() will
+   *   // increment the version property
+   *   DB.markAsDirty(customer);
+   *   DB.save(customer);
+   *
+   * }</pre>
+   */
+  public static void markAsDirty(Object bean) throws OptimisticLockException {
+    getDefault().markAsDirty(bean);
+  }
+
+  /**
+   * Saves the bean using an update. If you know you are updating a bean then it is preferrable to
+   * use this update() method rather than save().
+   * <p>
+   * <b>Stateless updates:</b> Note that the bean does not have to be previously fetched to call
+   * update().You can create a new instance and set some of its properties programmatically for via
+   * JSON/XML marshalling etc. This is described as a 'stateless update'.
+   * </p>
+   * <p>
+   * <b>Optimistic Locking: </b> Note that if the version property is not set when update() is
+   * called then no optimistic locking is performed (internally ConcurrencyMode.NONE is used).
+   * </p>
+   * <p>
+   * <b>{@link DatabaseConfig#setUpdatesDeleteMissingChildren(boolean)}: </b> When cascade saving to a
+   * OneToMany or ManyToMany the updatesDeleteMissingChildren setting controls if any other children
+   * that are in the database but are not in the collection are deleted.
+   * </p>
+   * <p>
+   * <b>{@link DatabaseConfig#setUpdateChangesOnly(boolean)}: </b> The updateChangesOnly setting
+   * controls if only the changed properties are included in the update or if all the loaded
+   * properties are included instead.
+   * </p>
+   * <pre>{@code
+   *
+   *   // A 'stateless update' example
+   *   Customer customer = new Customer();
+   *   customer.setId(7);
+   *   customer.setName("ModifiedNameNoOCC");
+   *   database.update(customer);
+   *
+   * }</pre>
+   *
+   * @see DatabaseConfig#setUpdatesDeleteMissingChildren(boolean)
+   * @see DatabaseConfig#setUpdateChangesOnly(boolean)
+   */
+  public static void update(Object bean) throws OptimisticLockException {
+    getDefault().update(bean);
+  }
+
+  /**
+   * Update the beans in the collection.
+   */
+  public static void updateAll(Collection<?> beans) throws OptimisticLockException {
+    getDefault().updateAll(beans);
+  }
+
+  /**
+   * Merge the bean using the default merge options.
+   *
+   * @param bean The bean to merge
+   */
+  public static void merge(Object bean) {
+    getDefault().merge(bean);
+  }
+
+  /**
+   * Merge the bean using the given merge options.
+   *
+   * @param bean    The bean to merge
+   * @param options The options to control the merge
+   */
+  public static void merge(Object bean, MergeOptions options) {
+    getDefault().merge(bean, options);
+  }
+
+  /**
+   * Save all the beans from a Collection.
+   */
+  public static int saveAll(Collection<?> beans) throws OptimisticLockException {
+    return getDefault().saveAll(beans);
+  }
+
+  /**
+   * This method checks the uniqueness of a bean. I.e. if the save will work. It will return the
+   * properties that violates an unique / primary key. This may be done in an UI save action to
+   * validate if the user has entered correct values.
+   * <p>
+   * Note: This method queries the DB for uniqueness of all indices, so do not use it in a batch update.
+   * <p>
+   * Note: This checks only the root bean!
+   * <p>
+   * <pre>{@code
+   *
+   *   // there is a unique constraint on title
+   *
+   *   Document doc = new Document();
+   *   doc.setTitle("One flew over the cuckoo's nest");
+   *   doc.setBody("clashes with doc1");
+   *
+   *   Set<Property> properties = DB.checkUniqueness(doc);
+   *
+   *   if (properties.isEmpty()) {
+   *     // it is unique ... carry on
+   *
+   *   } else {
+   *     // build a user friendly message
+   *     // to return message back to user
+   *
+   *     String uniqueProperties = properties.toString();
+   *
+   *     StringBuilder msg = new StringBuilder();
+   *
+   *     properties.forEach((it)-> {
+   *       Object propertyValue = it.getVal(doc);
+   *       String propertyName = it.getName();
+   *       msg.append(" property["+propertyName+"] value["+propertyValue+"]");
+   *     });
+   *
+   *     // uniqueProperties > [title]
+   *     //       custom msg > property[title] value[One flew over the cuckoo's nest]
+   *
+   *  }
+   *
+   * }</pre>
+   *
+   * @param bean The entity bean to check uniqueness on
+   * @return a set of Properties if constraint validation was detected or empty list.
+   */
+  @Nonnull
+  public static Set<Property> checkUniqueness(Object bean) {
+    return getDefault().checkUniqueness(bean);
+  }
+
+  /**
+   * Same as {@link #checkUniqueness(Object)}. but with given transaction.
+   */
+  @Nonnull
+  public static Set<Property> checkUniqueness(Object bean, Transaction transaction) {
+    return getDefault().checkUniqueness(bean, transaction);
+  }
+
+  /**
+   * Delete the bean.
+   * <p>
+   * This will return true if the bean was deleted successfully or JDBC batch is being used.
+   * </p>
+   * <p>
+   * If there is no current transaction one will be created and committed for
+   * you automatically.
+   * </p>
+   * <p>
+   * If the bean is configured with <code>@SoftDelete</code> then this will perform a soft
+   * delete rather than a hard/permanent delete.
+   * </p>
+   * <p>
+   * If the Bean does not have a version property (or loaded version property) and
+   * the bean does not exist then this returns false indicating that nothing was
+   * deleted. Note that, if JDBC batch mode is used then this always returns true.
+   * </p>
+   */
+  public static boolean delete(Object bean) throws OptimisticLockException {
+    return getDefault().delete(bean);
+  }
+
+  /**
+   * Delete the bean in permanent fashion (will not use soft delete).
+   */
+  public static boolean deletePermanent(Object bean) throws OptimisticLockException {
+    return getDefault().deletePermanent(bean);
+  }
+
+  /**
+   * Delete the bean given its type and id.
+   */
+  public static int delete(Class<?> beanType, Object id) {
+    return getDefault().delete(beanType, id);
+  }
+
+  /**
+   * Delete permanent the bean given its type and id.
+   */
+  public static int deletePermanent(Class<?> beanType, Object id) {
+    return getDefault().deletePermanent(beanType, id);
+  }
+
+  /**
+   * Delete several beans given their type and id values.
+   */
+  public static int deleteAll(Class<?> beanType, Collection<?> ids) {
+    return getDefault().deleteAll(beanType, ids);
+  }
+
+  /**
+   * Delete permanent several beans given their type and id values.
+   */
+  public static int deleteAllPermanent(Class<?> beanType, Collection<?> ids) {
+    return getDefault().deleteAllPermanent(beanType, ids);
+  }
+
+  /**
+   * Delete all the beans in the Collection.
+   */
+  public static int deleteAll(Collection<?> beans) throws OptimisticLockException {
+    return getDefault().deleteAll(beans);
+  }
+
+  /**
+   * Delete permanent all the beans in the Collection (will not use soft delete).
+   */
+  public static int deleteAllPermanent(Collection<?> beans) throws OptimisticLockException {
+    return getDefault().deleteAllPermanent(beans);
+  }
+
+  /**
+   * Refresh the values of a bean.
+   * <p>
+   * Note that this resets OneToMany and ManyToMany properties so that if they
+   * are accessed a lazy load will refresh the many property.
+   * </p>
+   */
+  public static void refresh(Object bean) {
+    getDefault().refresh(bean);
+  }
+
+  /**
+   * Refresh a 'many' property of a bean.
+   * <pre>{@code
+   *
+   *   Order order = ...;
+   *   ...
+   *   // refresh the order details...
+   *   DB.refreshMany(order, "details");
+   *
+   * }</pre>
+   *
+   * @param bean             the entity bean containing the List Set or Map to refresh.
+   * @param manyPropertyName the property name of the List Set or Map to refresh.
+   */
+  public static void refreshMany(Object bean, String manyPropertyName) {
+    getDefault().refreshMany(bean, manyPropertyName);
+  }
+
+  /**
+   * Get a reference object.
+   * <p>
+   * This is sometimes described as a proxy (with lazy loading).
+   * </p>
+   * <pre>{@code
+   *
+   *   Product product = DB.getReference(Product.class, 1);
+   *
+   *   // You can get the id without causing a fetch/lazy load
+   *   Integer productId = product.getId();
+   *
+   *   // If you try to get any other property a fetch/lazy loading will occur
+   *   // This will cause a query to execute...
+   *   String name = product.getName();
+   *
+   * }</pre>
+   *
+   * @param beanType the type of entity bean
+   * @param id       the id value
+   */
+  public static <T> T getReference(Class<T> beanType, Object id) {
+    return getDefault().getReference(beanType, id);
+  }
+
+  /**
+   * Sort the list using the sortByClause which can contain a comma delimited
+   * list of property names and keywords asc, desc, nullsHigh and nullsLow.
+   * <ul>
+   * <li>asc - ascending order (which is the default)</li>
+   * <li>desc - Descending order</li>
+   * <li>nullsHigh - Treat null values as high/large values (which is the
+   * default)</li>
+   * <li>nullsLow- Treat null values as low/very small values</li>
+   * </ul>
+   * <p>
+   * If you leave off any keywords the defaults are ascending order and treating
+   * nulls as high values.
+   * </p>
+   * <p>
+   * Note that the sorting uses a Comparator and Collections.sort(); and does
+   * not invoke a DB query.
+   * </p>
+   * <pre>{@code
+   *
+   *   // find orders and their customers
+   *   List<Order> list = DB.find(Order.class)
+   *     .fetch("customer")
+   *     .orderBy("id")
+   *     .findList();
+   *
+   *   // sort by customer name ascending, then by order shipDate
+   *   // ... then by the order status descending
+   *   DB.sort(list, "customer.name, shipDate, status desc");
+   *
+   *   // sort by customer name descending (with nulls low)
+   *   // ... then by the order id
+   *   DB.sort(list, "customer.name desc nullsLow, id");
+   *
+   * }</pre>
+   *
+   * @param list         the list of entity beans
+   * @param sortByClause the properties to sort the list by
+   */
+  public static <T> void sort(List<T> list, String sortByClause) {
+    getDefault().sort(list, sortByClause);
+  }
+
+  /**
+   * Find a bean using its unique id. This will not use caching.
+   * <pre>{@code
+   *
+   *   // Fetch order 1
+   *   Order order = DB.find(Order.class, 1);
+   *
+   * }</pre>
+   * <p>
+   * If you want more control over the query then you can use createQuery() and
+   * Query.findOne();
+   * </p>
+   * <pre>{@code
+   *
+   *   // ... additionally fetching customer, customer shipping address,
+   *   // order details, and the product associated with each order detail.
+   *   // note: only product id and name is fetch (its a "partial object").
+   *   // note: all other objects use "*" and have all their properties fetched.
+   *
+   *   Query<Order> query = DB.find(Order.class)
+   *     .setId(1)
+   *     .fetch("customer")
+   *     .fetch("customer.shippingAddress")
+   *     .fetch("details")
+   *     .query();
+   *
+   *   // fetch associated products but only fetch their product id and name
+   *   query.fetch("details.product", "name");
+   *
+   *   // traverse the object graph...
+   *
+   *   Order order = query.findOne();
+   *
+   *   Customer customer = order.getCustomer();
+   *   Address shippingAddress = customer.getShippingAddress();
+   *   List<OrderDetail> details = order.getDetails();
+   *   OrderDetail detail0 = details.get(0);
+   *   Product product = detail0.getProduct();
+   *   String productName = product.getName();
+   *
+   * }</pre>
+   *
+   * @param beanType the type of entity bean to fetch
+   * @param id       the id value
+   */
+  @Nullable
+  public static <T> T find(Class<T> beanType, Object id) {
+    return getDefault().find(beanType, id);
+  }
+
+  /**
+   * Create a SqlQuery for executing native sql
+   * query statements.
+   * <p>
+   * Note that you can use raw SQL with entity beans, refer to the SqlSelect
+   * annotation for examples.
+   * </p>
+   */
+  public static SqlQuery createSqlQuery(String sql) {
+    return getDefault().createSqlQuery(sql);
+  }
+
+  /**
+   * Create a sql update for executing native dml statements.
+   * <p>
+   * Use this to execute a Insert Update or Delete statement. The statement will
+   * be native to the database and contain database table and column names.
+   * </p>
+   * <p>
+   * See {@link SqlUpdate} for example usage.
+   * </p>
+   */
+  public static SqlUpdate createSqlUpdate(String sql) {
+    return getDefault().createSqlUpdate(sql);
+  }
+
+  /**
+   * Create a CallableSql to execute a given stored procedure.
+   *
+   * @see CallableSql
+   */
+  public static CallableSql createCallableSql(String sql) {
+    return getDefault().createCallableSql(sql);
+  }
+
+  /**
+   * Create a orm update where you will supply the insert/update or delete
+   * statement (rather than using a named one that is already defined using the
+   * &#064;NamedUpdates annotation).
+   * <p>
+   * The orm update differs from the sql update in that it you can use the bean
+   * name and bean property names rather than table and column names.
+   * </p>
+   * <p>
+   * An example:
+   * </p>
+   * <pre>{@code
+   *
+   *   // The bean name and properties - "topic","postCount" and "id"
+   *
+   *   // will be converted into their associated table and column names
+   *   String updStatement = "update topic set postCount = :pc where id = :id";
+   *
+   *   Update<Topic> update = DB.createUpdate(Topic.class, updStatement);
+   *
+   *   update.set("pc", 9);
+   *   update.set("id", 3);
+   *
+   *   int rows = update.execute();
+   *   System.out.println("rows updated:" + rows);
+   *
+   * }</pre>
+   */
+  public static <T> Update<T> createUpdate(Class<T> beanType, String ormUpdate) {
+
+    return getDefault().createUpdate(beanType, ormUpdate);
+  }
+
+  /**
+   * Create a CsvReader for a given beanType.
+   */
+  public static <T> CsvReader<T> createCsvReader(Class<T> beanType) {
+
+    return getDefault().createCsvReader(beanType);
+  }
+
+  /**
+   * Create a named query.
+   * <p>
+   * For RawSql the named query is expected to be in ebean.xml.
+   * </p>
+   *
+   * @param beanType   The type of entity bean
+   * @param namedQuery The name of the query
+   * @param <T>        The type of entity bean
+   * @return The query
+   */
+  public static <T> Query<T> createNamedQuery(Class<T> beanType, String namedQuery) {
+    return getDefault().createNamedQuery(beanType, namedQuery);
+  }
+
+  /**
+   * Create a query for a type of entity bean.
+   * <p>
+   * You can use the methods on the Query object to specify fetch paths,
+   * predicates, order by, limits etc.
+   * </p>
+   * <p>
+   * You then use findList(), findSet(), findMap() and findOne() to execute
+   * the query and return the collection or bean.
+   * </p>
+   * <p>
+   * Note that a query executed by {@link Query#findList()} etc will execute against
+   * the same database from which is was created.
+   * </p>
+   *
+   * @param beanType the class of entity to be fetched
+   * @return A ORM Query for this beanType
+   */
+  public static <T> Query<T> createQuery(Class<T> beanType) {
+
+    return getDefault().createQuery(beanType);
+  }
+
+  /**
+   * Parse the Ebean query language statement returning the query which can then
+   * be modified (add expressions, change order by clause, change maxRows, change
+   * fetch and select paths etc).
+   * <p>
+   * <h3>Example</h3>
+   * <pre>{@code
+   *
+   *   // Find order additionally fetching the customer, details and details.product name.
+   *
+   *   String eql = "fetch customer fetch details fetch details.product (name) where id = :orderId ";
+   *
+   *   Query<Order> query = DB.createQuery(Order.class, eql);
+   *   query.setParameter("orderId", 2);
+   *
+   *   Order order = query.findOne();
+   *
+   *   // This is the same as:
+   *
+   *   Order order = DB.find(Order.class)
+   *     .fetch("customer")
+   *     .fetch("details")
+   *     .fetch("detail.product", "name")
+   *     .setId(2)
+   *     .findOne();
+   *
+   * }</pre>
+   *
+   * @param beanType The type of bean to fetch
+   * @param eql      The Ebean query
+   * @param <T>      The type of the entity bean
+   * @return The query with expressions defined as per the parsed query statement
+   */
+  public static <T> Query<T> createQuery(Class<T> beanType, String eql) {
+
+    return getDefault().createQuery(beanType, eql);
+  }
+
+  /**
+   * Create a query for a type of entity bean.
+   * <p>
+   * This is actually the same as {@link #createQuery(Class)}. The reason it
+   * exists is that people used to JPA will probably be looking for a
+   * createQuery method (the same as entityManager).
+   * </p>
+   *
+   * @param beanType the type of entity bean to find
+   * @return A ORM Query object for this beanType
+   */
+  public static <T> Query<T> find(Class<T> beanType) {
+
+    return getDefault().find(beanType);
+  }
+
+  /**
+   * Create a query using native SQL.
+   * <p>
+   * The native SQL can contain named parameters or positioned parameters.
+   * </p>
+   * <pre>{@code
+   *
+   *   String sql = "select c.id, c.name from customer c where c.name like ? order by c.name";
+   *
+   *   Query<Customer> query = database.findNative(Customer.class, sql);
+   *   query.setParameter(1, "Rob%");
+   *
+   *   List<Customer> customers = query.findList();
+   *
+   * }</pre>
+   *
+   * @param beanType  The type of entity bean to fetch
+   * @param nativeSql The SQL that can contain named or positioned parameters
+   * @return The query to set parameters and execute
+   */
+  public static <T> Query<T> findNative(Class<T> beanType, String nativeSql) {
+    return getDefault().findNative(beanType, nativeSql);
+  }
+
+  /**
+   * Create a Query for DTO beans.
+   * <p>
+   * DTO beans are just normal bean like classes with public constructor(s) and setters.
+   * They do not need to be registered with Ebean before use.
+   * </p>
+   *
+   * @param dtoType The type of the DTO bean the rows will be mapped into.
+   * @param sql     The SQL query to execute.
+   * @param <T>     The type of the DTO bean.
+   */
+  public static <T> DtoQuery<T> findDto(Class<T> dtoType, String sql) {
+    return getDefault().findDto(dtoType, sql);
+  }
+
+  /**
+   * Create an Update query to perform a bulk update.
+   * <p>
+   * <pre>{@code
+   *
+   *  int rows = DB.update(Customer.class)
+   *      .set("status", Customer.Status.ACTIVE)
+   *      .set("updtime", new Timestamp(System.currentTimeMillis()))
+   *      .where()
+   *        .gt("id", 1000)
+   *        .update();
+   *
+   * }</pre>
+   *
+   * @param beanType The type of entity bean to update
+   * @param <T>      The type of entity bean
+   * @return The update query to use
+   */
+  public static <T> UpdateQuery<T> update(Class<T> beanType) {
+    return getDefault().update(beanType);
+  }
+
+  /**
+   * Create a filter for sorting and filtering lists of entities locally without
+   * going back to the database.
+   * <p>
+   * This produces and returns a new list with the sort and filters applied.
+   * </p>
+   * <p>
+   * Refer to {@link Filter} for an example of its use.
+   * </p>
+   */
+  public static <T> Filter<T> filter(Class<T> beanType) {
+    return getDefault().filter(beanType);
+  }
+
+//  /**
+//   * Execute a Sql Update Delete or Insert statement. This returns the number of
+//   * rows that where updated, deleted or inserted. If is executed in batch then
+//   * this returns -1. You can get the actual rowCount after commit() from
+//   * updateSql.getRowCount().
+//   * <p>
+//   * If you wish to execute a Sql Select natively then you should use the
+//   * FindByNativeSql object.
+//   * </p>
+//   * <p>
+//   * Note that the table modification information is automatically deduced and
+//   * you do not need to call the DB.externalModification() method when you
+//   * use this method.
+//   * </p>
+//   * <p>
+//   * Example:
+//   * </p>
+//   * <pre>{@code
+//   *
+//   *   // example that uses 'named' parameters
+//   *   String s = "UPDATE f_topic set post_count = :count where id = :id"
+//   *
+//   *   SqlUpdate update = DB.createSqlUpdate(s);
+//   *
+//   *   update.setParameter("id", 1);
+//   *   update.setParameter("count", 50);
+//   *
+//   *   int modifiedCount = DB.execute(update);
+//   *
+//   *   String msg = "There where " + modifiedCount + "rows updated";
+//   *
+//   * }</pre>
+//   *
+//   * @param sqlUpdate the update sql potentially with bind values
+//   * @return the number of rows updated or deleted. -1 if executed in batch.
+//   * @see SqlUpdate
+//   * @see CallableSql
+//   * @see DB#execute(CallableSql)
+//   */
+//  public static int execute(SqlUpdate sqlUpdate) {
+//    return defaultDatabase().execute(sqlUpdate);
+//  }
+//
+//  /**
+//   * For making calls to stored procedures.
+//   * <p>
+//   * Example:
+//   * </p>
+//   * <pre>{@code
+//   *
+//   *   String sql = "{call sp_order_modify(?,?,?)}";
+//   *
+//   *   CallableSql cs = DB.createCallableSql(sql);
+//   *   cs.setParameter(1, 27);
+//   *   cs.setParameter(2, "SHIPPED");
+//   *   cs.registerOut(3, Types.INTEGER);
+//   *
+//   *   DB.execute(cs);
+//   *
+//   *   // read the out parameter
+//   *   Integer returnValue = (Integer) cs.getObject(3);
+//   *
+//   * }</pre>
+//   *
+//   * @see CallableSql
+//   * @see Ebean#execute(SqlUpdate)
+//   */
+//  public static int execute(CallableSql callableSql) {
+//    return defaultDatabase().execute(callableSql);
+//  }
+
+  /**
+   * Execute a TxRunnable in a Transaction with an explicit scope.
+   * <p>
+   * The scope can control the transaction type, isolation and rollback
+   * semantics.
+   * </p>
+   * <pre>{@code
+   *
+   *   // set specific transactional scope settings
+   *   TxScope scope = TxScope.requiresNew().setIsolation(TxIsolation.SERIALIZABLE);
+   *
+   *   DB.execute(scope, new TxRunnable() {
+   * 	   public void run() {
+   * 		   User u1 = DB.find(User.class, 1);
+   * 		   ...
+   * 	   }
+   *   });
+   *
+   * }</pre>
+   */
+  public static void execute(TxScope scope, Runnable r) {
+    getDefault().execute(scope, r);
+  }
+
+  /**
+   * Execute a Runnable in a Transaction with the default scope.
+   * <p>
+   * The default scope runs with REQUIRED and by default will rollback on any
+   * exception (checked or runtime).
+   * </p>
+   * <pre>{@code
+   *
+   *   DB.execute(() -> {
+   *
+   *       User u1 = DB.find(User.class, 1);
+   *       User u2 = DB.find(User.class, 2);
+   *
+   *       u1.setName("u1 mod");
+   *       u2.setName("u2 mod");
+   *
+   *       DB.save(u1);
+   *       DB.save(u2);
+   *
+   *   });
+   *
+   * }</pre>
+   */
+  public static void execute(Runnable r) {
+    getDefault().execute(r);
+  }
+
+  /**
+   * Execute a Callable in a Transaction with an explicit scope.
+   * <p>
+   * The scope can control the transaction type, isolation and rollback
+   * semantics.
+   * </p>
+   * <pre>{@code
+   *
+   *   // set specific transactional scope settings
+   *   TxScope scope = TxScope.requiresNew().setIsolation(TxIsolation.SERIALIZABLE);
+   *
+   *   DB.executeCall(scope, new Callable<String>() {
+   * 	   public String call() {
+   * 		   User u1 = DB.find(User.class, 1);
+   * 		   ...
+   * 		   return u1.getEmail();
+   * 	   }
+   *   });
+   *
+   * }</pre>
+   */
+  public static <T> T executeCall(TxScope scope, Callable<T> c) {
+    return getDefault().executeCall(scope, c);
+  }
+
+  /**
+   * Execute a Callable in a Transaction with the default scope.
+   * <p>
+   * The default scope runs with REQUIRED and by default will rollback on any
+   * exception (checked or runtime).
+   * </p>
+   * <p>
+   * This is basically the same as TxRunnable except that it returns an Object
+   * (and you specify the return type via generics).
+   * </p>
+   * <pre>{@code
+   *
+   *   DB.executeCall(() -> {
+   *
+   *       User u1 = DB.find(User.class, 1);
+   *       User u2 = DB.find(User.class, 2);
+   *
+   *       u1.setName("u1 mod");
+   *       u2.setName("u2 mod");
+   *
+   *       DB.save(u1);
+   *       DB.save(u2);
+   *
+   *       return u1.getEmail();
+   *
+   *   });
+   *
+   * }</pre>
+   */
+  public static <T> T executeCall(Callable<T> c) {
+    return getDefault().executeCall(c);
+  }
+
+  /**
+   * Inform Ebean that tables have been modified externally. These could be the
+   * result of from calling a stored procedure, other JDBC calls or external
+   * programs including other frameworks.
+   * <p>
+   * If you use DB.execute(UpdateSql) then the table modification information
+   * is automatically deduced and you do not need to call this method yourself.
+   * </p>
+   * <p>
+   * This information is used to invalidate objects out of the cache and
+   * potentially text indexes. This information is also automatically broadcast
+   * across the cluster.
+   * </p>
+   * <p>
+   * If there is a transaction then this information is placed into the current
+   * transactions event information. When the transaction is committed this
+   * information is registered (with the transaction manager). If this
+   * transaction is rolled back then none of the transaction event information
+   * registers including the information you put in via this method.
+   * </p>
+   * <p>
+   * If there is NO current transaction when you call this method then this
+   * information is registered immediately (with the transaction manager).
+   * </p>
+   *
+   * @param tableName the name of the table that was modified
+   * @param inserts   true if rows where inserted into the table
+   * @param updates   true if rows on the table where updated
+   * @param deletes   true if rows on the table where deleted
+   */
+  public static void externalModification(String tableName, boolean inserts, boolean updates, boolean deletes) {
+
+    getDefault().externalModification(tableName, inserts, updates, deletes);
+  }
+
+  /**
+   * Return the BeanState for a given entity bean.
+   * <p>
+   * This will return null if the bean is not an enhanced entity bean.
+   * </p>
+   */
+  public static BeanState getBeanState(Object bean) {
+    return getDefault().getBeanState(bean);
+  }
+
+  /**
+   * Return the manager of the level 2 cache ("L2" cache).
+   */
+  public static ServerCacheManager getServerCacheManager() {
+    return getDefault().getServerCacheManager();
+  }
+
+  /**
+   * Return the BackgroundExecutor service for asynchronous processing of
+   * queries.
+   */
+  public static BackgroundExecutor getBackgroundExecutor() {
+    return getDefault().getBackgroundExecutor();
+  }
+
+  /**
+   * Return the JsonContext for reading/writing JSON.
+   */
+  public static JsonContext json() {
+    return getDefault().json();
+  }
+
+}
diff --git a/src/main/java/io/ebean/Database.java b/src/main/java/io/ebean/Database.java
new file mode 100644
index 000000000..81e1d56d4
--- /dev/null
+++ b/src/main/java/io/ebean/Database.java
@@ -0,0 +1,1567 @@
+package io.ebean;
+
+import io.ebean.annotation.TxIsolation;
+import io.ebean.cache.ServerCacheManager;
+import io.ebean.config.DatabaseConfig;
+import io.ebean.config.ServerConfig;
+import io.ebean.meta.MetaInfoManager;
+import io.ebean.plugin.Property;
+import io.ebean.plugin.SpiServer;
+import io.ebean.text.csv.CsvReader;
+import io.ebean.text.json.JsonContext;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.persistence.OptimisticLockException;
+import javax.persistence.PersistenceException;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Callable;
+
+/**
+ * Provides the API for fetching and saving beans to a particular database.
+ *
+ * <h5>Registration with the DB singleton</h5>
+ * <p>
+ * When a Database instance is created it can be registered with the DB
+ * singleton (see {@link DatabaseConfig#setRegister(boolean)}). The DB
+ * singleton is essentially a map of Database's that have been registered
+ * with it.
+ * </p>
+ * <p>
+ * The Database can then be retrieved later via {@link DB#byName(String)}.
+ * </p>
+ *
+ * <h5>The 'default' Database</h5>
+ * <p>
+ * One Database can be designated as the 'default' or 'primary' Database
+ * (see {@link DatabaseConfig#setDefaultServer(boolean)}. Many methods on DB
+ * such as {@link DB#find(Class)} etc are actually just a convenient way to
+ * call methods on the 'default/primary' Database.
+ * </p>
+ *
+ * <h5>Constructing a Database</h5>
+ * <p>
+ * Database's are constructed by the DatabaseFactory. They can be created
+ * programmatically via {@link DatabaseFactory#create(DatabaseConfig)} or they
+ * can be automatically constructed on demand using configuration information in
+ * the application.properties file.
+ * </p>
+ *
+ * <h5>Example: Get a Database</h5>
+ * <p>
+ * <pre>{@code
+ *
+ *   // Get access to the Human Resources Database
+ *   Database hrDatabase = DB.byName("hr");
+ *
+ *
+ *   // fetch contact 3 from the HR database
+ *   Contact contact = hrDatabase.find(Contact.class, new Integer(3));
+ *
+ *   contact.setStatus("INACTIVE"); ...
+ *
+ *   // save the contact back to the HR database
+ *   hrDatabase.save(contact);
+ *
+ * }</pre>
+ *
+ * <h5>Database vs DB API</h5>
+ * <p>
+ * Database provides additional API compared with DB. For example it
+ * provides more control over the use of Transactions that is not available in
+ * the DB API.
+ * </p>
+ *
+ * <p>
+ * <em>External Transactions:</em> If you wanted to use transactions created
+ * externally to Ebean then Database provides additional methods where you
+ * can explicitly pass a transaction (that can be created externally).
+ * </p>
+ *
+ * <p>
+ * <em>Bypass ThreadLocal Mechanism:</em> If you want to bypass the built in
+ * ThreadLocal transaction management you can use the createTransaction()
+ * method. Example: a single thread requires more than one transaction.
+ * </p>
+ *
+ * @see DB
+ * @see DatabaseFactory
+ * @see DatabaseConfig
+ */
+public interface Database {
+
+  /**
+   * Shutdown the Database instance programmatically.
+   * <p>
+   * This method is not normally required. Ebean registers a shutdown hook and shuts down cleanly.
+   * </p>
+   * <p>
+   * If the under underlying DataSource is the Ebean implementation then you
+   * also have the option of shutting down the DataSource and deregistering the
+   * JDBC driver.
+   * </p>
+   *
+   * @param shutdownDataSource if true then shutdown the underlying DataSource if it is the Ebean
+   *                           DataSource implementation.
+   * @param deregisterDriver   if true then deregister the JDBC driver if it is the Ebean
+   *                           DataSource implementation.
+   */
+  void shutdown(boolean shutdownDataSource, boolean deregisterDriver);
+
+  /**
+   * Return AutoTune which is used to control the AutoTune service at runtime.
+   */
+  AutoTune getAutoTune();
+
+  /**
+   * Return the name. This is used with {@link DB#byName(String)} to get a
+   * Database that was registered with the DB singleton.
+   */
+  String getName();
+
+  /**
+   * Return the ExpressionFactory for this server.
+   */
+  ExpressionFactory getExpressionFactory();
+
+  /**
+   * Return the MetaInfoManager which is used to get meta data from the Database
+   * such as query execution statistics.
+   */
+  MetaInfoManager getMetaInfoManager();
+
+  /**
+   * Return the extended API intended for use by plugins.
+   */
+  SpiServer getPluginApi();
+
+  /**
+   * Return the BeanState for a given entity bean.
+   * <p>
+   * This will return null if the bean is not an enhanced entity bean.
+   * </p>
+   */
+  BeanState getBeanState(Object bean);
+
+  /**
+   * Return the value of the Id property for a given bean.
+   */
+  Object getBeanId(Object bean);
+
+  /**
+   * Set the Id value onto the bean converting the type of the id value if necessary.
+   * <p>
+   * For example, if the id value passed in is a String but ought to be a Long or UUID etc
+   * then it will automatically be converted.
+   * </p>
+   *
+   * @param bean The entity bean to set the id value on.
+   * @param id   The id value to set.
+   */
+  Object setBeanId(Object bean, Object id);
+
+  /**
+   * Return a map of the differences between two objects of the same type.
+   * <p>
+   * When null is passed in for b, then the 'OldValues' of a is used for the
+   * difference comparison.
+   * </p>
+   */
+  Map<String, ValuePair> diff(Object newBean, Object oldBean);
+
+  /**
+   * Create a new instance of T that is an EntityBean.
+   * <p>
+   * Useful if you use BeanPostConstructListeners or &#64;PostConstruct Annotations.
+   * In this case you should not use "new Bean...()". Making all bean construtors protected
+   * could be a good idea here.
+   * </p>
+   */
+  <T> T createEntityBean(Class<T> type);
+
+  /**
+   * Create a CsvReader for a given beanType.
+   */
+  <T> CsvReader<T> createCsvReader(Class<T> beanType);
+
+  /**
+   * Create an Update query to perform a bulk update.
+   * <p>
+   * <pre>{@code
+   *
+   *  int rows = database
+   *      .update(Customer.class)
+   *      .set("status", Customer.Status.ACTIVE)
+   *      .set("updtime", new Timestamp(System.currentTimeMillis()))
+   *      .where()
+   *        .gt("id", 1000)
+   *        .update();
+   *
+   * }</pre>
+   *
+   * @param beanType The type of entity bean to update
+   * @param <T>      The type of entity bean
+   * @return The update query to use
+   */
+  <T> UpdateQuery<T> update(Class<T> beanType);
+
+  /**
+   * Create a named query.
+   * <p>
+   * For RawSql the named query is expected to be in ebean.xml.
+   * </p>
+   *
+   * @param beanType   The type of entity bean
+   * @param namedQuery The name of the query
+   * @param <T>        The type of entity bean
+   * @return The query
+   */
+  <T> Query<T> createNamedQuery(Class<T> beanType, String namedQuery);
+
+  /**
+   * Create a query for an entity bean and synonym for {@link #find(Class)}.
+   *
+   * @see #find(Class)
+   */
+  <T> Query<T> createQuery(Class<T> beanType);
+
+  /**
+   * Parse the Ebean query language statement returning the query which can then
+   * be modified (add expressions, change order by clause, change maxRows, change
+   * fetch and select paths etc).
+   * <p>
+   * <h3>Example</h3>
+   * <pre>{@code
+   *
+   *   // Find order additionally fetching the customer, details and details.product name.
+   *
+   *   String ormQuery = "fetch customer fetch details fetch details.product (name) where id = :orderId ";
+   *
+   *   Query<Order> query = DB.createQuery(Order.class, ormQuery);
+   *   query.setParameter("orderId", 2);
+   *
+   *   Order order = query.findOne();
+   *
+   *   // This is the same as:
+   *
+   *   Order order = DB.find(Order.class)
+   *     .fetch("customer")
+   *     .fetch("details")
+   *     .fetch("detail.product", "name")
+   *     .setId(2)
+   *     .findOne();
+   *
+   * }</pre>
+   *
+   * @param beanType The type of bean to fetch
+   * @param ormQuery The Ebean ORM query
+   * @param <T>      The type of the entity bean
+   * @return The query with expressions defined as per the parsed query statement
+   */
+  <T> Query<T> createQuery(Class<T> beanType, String ormQuery);
+
+  /**
+   * Create a query for a type of entity bean.
+   * <p>
+   * You can use the methods on the Query object to specify fetch paths,
+   * predicates, order by, limits etc.
+   * </p>
+   * <p>
+   * You then use findList(), findSet(), findMap() and findOne() to execute
+   * the query and return the collection or bean.
+   * </p>
+   * <p>
+   * Note that a query executed by {@link Query#findList()}
+   * {@link Query#findSet()} etc will execute against the same Database from
+   * which is was created.
+   * </p>
+   * <p>
+   * <pre>{@code
+   *
+   *   // Find order 2 specifying explicitly the parts of the object graph to
+   *   // eagerly fetch. In this case eagerly fetch the associated customer,
+   *   // details and details.product.name
+   *
+   *   Order order = database.find(Order.class)
+   *     .fetch("customer")
+   *     .fetch("details")
+   *     .fetch("detail.product", "name")
+   *     .setId(2)
+   *     .findOne();
+   *
+   *   // find some new orders ... with firstRow/maxRows
+   *   List<Order> orders =
+   *     database.find(Order.class)
+   *       .where().eq("status", Order.Status.NEW)
+   *       .setFirstRow(20)
+   *       .setMaxRows(10)
+   *       .findList();
+   *
+   * }</pre>
+   */
+  <T> Query<T> find(Class<T> beanType);
+
+  /**
+   * Create a query using native SQL.
+   * <p>
+   * The native SQL can contain named parameters or positioned parameters.
+   * </p>
+   * <pre>{@code
+   *
+   *   String sql = "select c.id, c.name from customer c where c.name like ? order by c.name";
+   *
+   *   Query<Customer> query = database.findNative(Customer.class, sql);
+   *   query.setParameter(1, "Rob%");
+   *
+   *   List<Customer> customers = query.findList();
+   *
+   * }</pre>
+   *
+   * @param beanType  The type of entity bean to fetch
+   * @param nativeSql The SQL that can contain named or positioned parameters
+   * @return The query to set parameters and execute
+   */
+  <T> Query<T> findNative(Class<T> beanType, String nativeSql);
+
+  /**
+   * Return the next unique identity value for a given bean type.
+   * <p>
+   * This will only work when a IdGenerator is on the bean such as for beans
+   * that use a DB sequence or UUID.
+   * </p>
+   * <p>
+   * For DB's supporting getGeneratedKeys and sequences such as Oracle10 you do
+   * not need to use this method generally. It is made available for more
+   * complex cases where it is useful to get an ID prior to some processing.
+   * </p>
+   */
+  Object nextId(Class<?> beanType);
+
+  /**
+   * Create a filter for sorting and filtering lists of entities locally without
+   * going back to the database.
+   * <p>
+   * This produces and returns a new list with the sort and filters applied.
+   * </p>
+   * <p>
+   * Refer to {@link Filter} for an example of its use.
+   * </p>
+   */
+  <T> Filter<T> filter(Class<T> beanType);
+
+  /**
+   * Sort the list in memory using the sortByClause which can contain a comma delimited
+   * list of property names and keywords asc, desc, nullsHigh and nullsLow.
+   * <ul>
+   * <li>asc - ascending order (which is the default)</li>
+   * <li>desc - Descending order</li>
+   * <li>nullsHigh - Treat null values as high/large values (which is the
+   * default)</li>
+   * <li>nullsLow- Treat null values as low/very small values</li>
+   * </ul>
+   * <p>
+   * If you leave off any keywords the defaults are ascending order and treating
+   * nulls as high values.
+   * </p>
+   * <p>
+   * Note that the sorting uses a Comparator and Collections.sort(); and does
+   * not invoke a DB query.
+   * </p>
+   * <p>
+   * <pre>{@code
+   *
+   *   // find orders and their customers
+   *   List<Order> list = database.find(Order.class)
+   *     .fetch("customer")
+   *     .orderBy("id")
+   *     .findList();
+   *
+   *   // sort by customer name ascending, then by order shipDate
+   *   // ... then by the order status descending
+   *   database.sort(list, "customer.name, shipDate, status desc");
+   *
+   *   // sort by customer name descending (with nulls low)
+   *   // ... then by the order id
+   *   database.sort(list, "customer.name desc nullsLow, id");
+   *
+   * }</pre>
+   *
+   * @param list         the list of entity beans
+   * @param sortByClause the properties to sort the list by
+   */
+  <T> void sort(List<T> list, String sortByClause);
+
+  /**
+   * Create a orm update where you will supply the insert/update or delete
+   * statement (rather than using a named one that is already defined using the
+   * &#064;NamedUpdates annotation).
+   * <p>
+   * The orm update differs from the sql update in that it you can use the bean
+   * name and bean property names rather than table and column names.
+   * </p>
+   * <p>
+   * An example:
+   * </p>
+   * <p>
+   * <pre>{@code
+   *
+   *   // The bean name and properties - "topic","postCount" and "id"
+   *
+   *   // will be converted into their associated table and column names
+   *   String updStatement = "update topic set postCount = :pc where id = :id";
+   *
+   *   Update<Topic> update = database.createUpdate(Topic.class, updStatement);
+   *
+   *   update.set("pc", 9);
+   *   update.set("id", 3);
+   *
+   *   int rows = update.execute();
+   *   System.out.println("rows updated:" + rows);
+   *
+   * }</pre>
+   */
+  <T> Update<T> createUpdate(Class<T> beanType, String ormUpdate);
+
+  /**
+   * Create a Query for DTO beans.
+   * <p>
+   * DTO beans are just normal bean like classes with public constructor(s) and setters.
+   * They do not need to be registered with DB before use.
+   * </p>
+   *
+   * @param dtoType The type of the DTO bean the rows will be mapped into.
+   * @param sql     The SQL query to execute.
+   * @param <T>     The type of the DTO bean.
+   */
+  <T> DtoQuery<T> findDto(Class<T> dtoType, String sql);
+
+  /**
+   * Create a named Query for DTO beans.
+   * <p>
+   * DTO beans are just normal bean like classes with public constructor(s) and setters.
+   * They do not need to be registered with DB before use.
+   * </p>
+   *
+   * @param dtoType    The type of the DTO bean the rows will be mapped into.
+   * @param namedQuery The name of the query
+   * @param <T>        The type of the DTO bean.
+   */
+  <T> DtoQuery<T> createNamedDtoQuery(Class<T> dtoType, String namedQuery);
+
+  /**
+   * Create a SqlQuery for executing native sql
+   * query statements.
+   * <p>
+   * Note that you can use raw SQL with entity beans, refer to the SqlSelect
+   * annotation for examples.
+   * </p>
+   */
+  SqlQuery createSqlQuery(String sql);
+
+  /**
+   * Create a sql update for executing native dml statements.
+   * <p>
+   * Use this to execute a Insert Update or Delete statement. The statement will
+   * be native to the database and contain database table and column names.
+   * </p>
+   * <p>
+   * See {@link SqlUpdate} for example usage.
+   * </p>
+   */
+  SqlUpdate createSqlUpdate(String sql);
+
+  /**
+   * Create a CallableSql to execute a given stored procedure.
+   */
+  CallableSql createCallableSql(String callableSql);
+
+  /**
+   * Register a TransactionCallback on the currently active transaction.
+   * <p/>
+   * If there is no currently active transaction then a PersistenceException is thrown.
+   *
+   * @param transactionCallback The transaction callback to be registered with the current transaction.
+   * @throws PersistenceException If there is no currently active transaction
+   */
+  void register(TransactionCallback transactionCallback) throws PersistenceException;
+
+  /**
+   * Create a new transaction that is not held in TransactionThreadLocal.
+   * <p>
+   * You will want to do this if you want multiple Transactions in a single
+   * thread or generally use transactions outside of the TransactionThreadLocal
+   * management.
+   * </p>
+   */
+  Transaction createTransaction();
+
+  /**
+   * Create a new transaction additionally specifying the isolation level.
+   * <p>
+   * Note that this transaction is NOT stored in a thread local.
+   * </p>
+   */
+  Transaction createTransaction(TxIsolation isolation);
+
+  /**
+   * Start a transaction with 'REQUIRED' semantics.
+   * <p>
+   * With REQUIRED semantics if an active transaction already exists that transaction will be used.
+   * </p>
+   * <p>
+   * The transaction is stored in a ThreadLocal variable and typically you only
+   * need to use the returned Transaction <em>IF</em> you wish to do things like
+   * use batch mode, change the transaction isolation level, use savepoints or
+   * log comments to the transaction log.
+   * </p>
+   * <p>
+   * Example of using a transaction to span multiple calls to find(), save()
+   * etc.
+   * </p>
+   * <p>
+   * <h3>Using try with resources</h3>
+   * <pre>{@code
+   *
+   *    // start a transaction (stored in a ThreadLocal)
+   *
+   *    try (Transaction txn = database.beginTransaction()) {
+   *
+   * 	    Order order = database.find(Order.class, 10);
+   * 	    ...
+   * 	    database.save(order);
+   *
+   * 	    txn.commit();
+   *    }
+   *
+   * }</pre>
+   * <p>
+   * <h3>Using try finally block</h3>
+   * <pre>{@code
+   *
+   *    // start a transaction (stored in a ThreadLocal)
+   *    Transaction txn = database.beginTransaction();
+   *    try {
+   * 	    Order order = database.find(Order.class,10);
+   *
+   * 	    database.save(order);
+   *
+   * 	    txn.commit();
+   *
+   *    } finally {
+   * 	    txn.end();
+   *    }
+   *
+   * }</pre>
+   * <p>
+   * <h3>Transaction options</h3>
+   * <pre>{@code
+   *
+   *     try (Transaction txn = database.beginTransaction()) {
+   *
+   *       // explicitly turn on/off JDBC batch use
+   *       txn.setBatchMode(true);
+   *       txn.setBatchSize(50);
+   *
+   *       // control flushing when mixing save and queries
+   *       txn.setBatchFlushOnQuery(false);
+   *
+   *       // turn off persist cascade if needed
+   *       txn.setPersistCascade(false);
+   *
+   *       // for large batch insert processing when we do not
+   *       // ... need the generatedKeys, don't get them
+   *       txn.setBatchGetGeneratedKeys(false);
+   *
+   *       // explicitly flush the JDBC batch buffer
+   *       txn.flush();
+   *
+   *       ...
+   *
+   *       txn.commit();
+   *    }
+   *
+   * }</pre>
+   * <p>
+   * <p>
+   * If you want to externalise the transaction management then you use
+   * createTransaction() and pass the transaction around to the various methods on
+   * Database yourself.
+   * </p>
+   */
+  Transaction beginTransaction();
+
+  /**
+   * Start a transaction additionally specifying the isolation level.
+   */
+  Transaction beginTransaction(TxIsolation isolation);
+
+  /**
+   * Start a transaction typically specifying REQUIRES_NEW or REQUIRED semantics.
+   * <p>
+   * <p>
+   * Note that this provides an try finally alternative to using {@link #executeCall(TxScope, Callable)} or
+   * {@link #execute(TxScope, Runnable)}.
+   * </p>
+   * <p>
+   * <h3>REQUIRES_NEW example:</h3>
+   * <pre>{@code
+   * // Start a new transaction. If there is a current transaction
+   * // suspend it until this transaction ends
+   * try (Transaction txn = database.beginTransaction(TxScope.requiresNew())) {
+   *
+   *   ...
+   *
+   *   // commit the transaction
+   *   txn.commit();
+   *
+   *   // At end this transaction will:
+   *   //  A) will rollback transaction if it has not been committed
+   *   //  B) will restore a previously suspended transaction
+   * }
+   *
+   * }</pre>
+   * <p>
+   * <h3>REQUIRED example:</h3>
+   * <pre>{@code
+   *
+   * // start a new transaction if there is not a current transaction
+   * try (Transaction txn = database.beginTransaction(TxScope.required())) {
+   *
+   *   ...
+   *
+   *   // commit the transaction if it was created or
+   *   // do nothing if there was already a current transaction
+   *   txn.commit();
+   * }
+   *
+   * }</pre>
+   */
+  Transaction beginTransaction(TxScope scope);
+
+  /**
+   * Returns the current transaction or null if there is no current transaction in scope.
+   */
+  Transaction currentTransaction();
+
+  /**
+   * Flush the JDBC batch on the current transaction.
+   * <p>
+   * This only is useful when JDBC batch is used. Flush occurs automatically when the
+   * transaction commits or batch size is reached. This manually flushes the JDBC batch
+   * buffer.
+   * </p>
+   * <p>
+   * This is the same as <code>currentTransaction().flush()</code>.
+   * </p>
+   */
+  void flush();
+
+  /**
+   * Commit the current transaction.
+   */
+  void commitTransaction();
+
+  /**
+   * Rollback the current transaction.
+   */
+  void rollbackTransaction();
+
+  /**
+   * If the current transaction has already been committed do nothing otherwise
+   * rollback the transaction.
+   * <p>
+   * Useful to put in a finally block to ensure the transaction is ended, rather
+   * than a rollbackTransaction() in each catch block.
+   * </p>
+   * <p>
+   * Code example:
+   * <p>
+   * <pre>{@code
+   *
+   *   database.beginTransaction();
+   *   try {
+   *     // do some fetching and or persisting ...
+   *
+   *     // commit at the end
+   *     database.commitTransaction();
+   *
+   *   } finally {
+   *     // if commit didn't occur then rollback the transaction
+   *     database.endTransaction();
+   *   }
+   *
+   * }</pre>
+   */
+  void endTransaction();
+
+  /**
+   * Refresh the values of a bean.
+   * <p>
+   * Note that this resets OneToMany and ManyToMany properties so that if they
+   * are accessed a lazy load will refresh the many property.
+   * </p>
+   */
+  void refresh(Object bean);
+
+  /**
+   * Refresh a many property of an entity bean.
+   *
+   * @param bean         the entity bean containing the 'many' property
+   * @param propertyName the 'many' property to be refreshed
+   */
+  void refreshMany(Object bean, String propertyName);
+
+  /**
+   * Find a bean using its unique id.
+   * <p>
+   * <pre>{@code
+   *   // Fetch order 1
+   *   Order order = database.find(Order.class, 1);
+   * }</pre>
+   * <p>
+   * <p>
+   * If you want more control over the query then you can use createQuery() and
+   * Query.findOne();
+   * </p>
+   * <p>
+   * <pre>{@code
+   *   // ... additionally fetching customer, customer shipping address,
+   *   // order details, and the product associated with each order detail.
+   *   // note: only product id and name is fetch (its a "partial object").
+   *   // note: all other objects use "*" and have all their properties fetched.
+   *
+   *   Query<Order> query = database.find(Order.class)
+   *     .setId(1)
+   *     .fetch("customer")
+   *     .fetch("customer.shippingAddress")
+   *     .fetch("details")
+   *     .query();
+   *
+   *   // fetch associated products but only fetch their product id and name
+   *   query.fetch("details.product", "name");
+   *
+   *
+   *   Order order = query.findOne();
+   *
+   *   // traverse the object graph...
+   *
+   *   Customer customer = order.getCustomer();
+   *   Address shippingAddress = customer.getShippingAddress();
+   *   List<OrderDetail> details = order.getDetails();
+   *   OrderDetail detail0 = details.get(0);
+   *   Product product = detail0.getProduct();
+   *   String productName = product.getName();
+   *
+   * }</pre>
+   *
+   * @param beanType the type of entity bean to fetch
+   * @param id       the id value
+   */
+  @Nullable
+  <T> T find(Class<T> beanType, Object id);
+
+  /**
+   * Get a reference object.
+   * <p>
+   * This will not perform a query against the database unless some property other
+   * that the id property is accessed.
+   * </p>
+   * <p>
+   * It is most commonly used to set a 'foreign key' on another bean like:
+   * </p>
+   * <pre>{@code
+   *
+   *   Product product = database.getReference(Product.class, 1);
+   *
+   *   OrderDetail orderDetail = new OrderDetail();
+   *   // set the product 'foreign key'
+   *   orderDetail.setProduct(product);
+   *   orderDetail.setQuantity(42);
+   *   ...
+   *
+   *   database.save(orderDetail);
+   *
+   *
+   * }</pre>
+   * <p>
+   * <h3>Lazy loading characteristics</h3>
+   * <pre>{@code
+   *
+   *   Product product = database.getReference(Product.class, 1);
+   *
+   *   // You can get the id without causing a fetch/lazy load
+   *   Long productId = product.getId();
+   *
+   *   // If you try to get any other property a fetch/lazy loading will occur
+   *   // This will cause a query to execute...
+   *   String name = product.getName();
+   *
+   * }</pre>
+   *
+   * @param beanType the type of entity bean
+   * @param id       the id value
+   */
+  @Nonnull
+  <T> T getReference(Class<T> beanType, Object id);
+
+  /**
+   * Return the extended API for Database.
+   * <p>
+   * The extended API has the options for executing queries that take an explicit
+   * transaction as an argument.
+   * </p>
+   * <p>
+   * Typically we only need to use the extended API when we do NOT want to use the
+   * usual ThreadLocal based mechanism to obtain the current transaction but instead
+   * supply the transaction explicitly.
+   * </p>
+   */
+  ExtendedServer extended();
+
+  /**
+   * Either Insert or Update the bean depending on its state.
+   * <p>
+   * If there is no current transaction one will be created and committed for
+   * you automatically.
+   * </p>
+   * <p>
+   * Save can cascade along relationships. For this to happen you need to
+   * specify a cascade of CascadeType.ALL or CascadeType.PERSIST on the
+   * OneToMany, OneToOne or ManyToMany annotation.
+   * </p>
+   * <p>
+   * In this example below the details property has a CascadeType.ALL set so
+   * saving an order will also save all its details.
+   * </p>
+   * <p>
+   * <pre>{@code
+   *   public class Order { ...
+   *
+   * 	   @OneToMany(cascade=CascadeType.ALL, mappedBy="order")
+   * 	   List<OrderDetail> details;
+   * 	   ...
+   *   }
+   * }</pre>
+   * <p>
+   * <p>
+   * When a save cascades via a OneToMany or ManyToMany Ebean will automatically
+   * set the 'parent' object to the 'detail' object. In the example below in
+   * saving the order and cascade saving the order details the 'parent' order
+   * will be set against each order detail when it is saved.
+   * </p>
+   */
+  void save(Object bean) throws OptimisticLockException;
+
+  /**
+   * Save all the beans in the collection.
+   */
+  int saveAll(Collection<?> beans) throws OptimisticLockException;
+
+  /**
+   * Delete the bean.
+   * <p>
+   * This will return true if the bean was deleted successfully or JDBC batch is being used.
+   * </p>
+   * <p>
+   * If there is no current transaction one will be created and committed for
+   * you automatically.
+   * </p>
+   * <p>
+   * If the Bean does not have a version property (or loaded version property) and
+   * the bean does not exist then this returns false indicating that nothing was
+   * deleted. Note that, if JDBC batch mode is used then this always returns true.
+   * </p>
+   */
+  boolean delete(Object bean) throws OptimisticLockException;
+
+  /**
+   * Delete the bean with an explicit transaction.
+   * <p>
+   * This will return true if the bean was deleted successfully or JDBC batch is being used.
+   * </p>
+   * <p>
+   * If the Bean does not have a version property (or loaded version property) and
+   * the bean does not exist then this returns false indicating that nothing was
+   * deleted. However, if JDBC batch mode is used then this always returns true.
+   * </p>
+   */
+  boolean delete(Object bean, Transaction transaction) throws OptimisticLockException;
+
+  /**
+   * Delete a bean permanently without soft delete.
+   */
+  boolean deletePermanent(Object bean) throws OptimisticLockException;
+
+  /**
+   * Delete a bean permanently without soft delete using an explicit transaction.
+   */
+  boolean deletePermanent(Object bean, Transaction transaction) throws OptimisticLockException;
+
+  /**
+   * Delete all the beans in the collection permanently without soft delete.
+   */
+  int deleteAllPermanent(Collection<?> beans) throws OptimisticLockException;
+
+  /**
+   * Delete all the beans in the collection permanently without soft delete using an explicit transaction.
+   */
+  int deleteAllPermanent(Collection<?> beans, Transaction transaction) throws OptimisticLockException;
+
+  /**
+   * Delete the bean given its type and id.
+   */
+  int delete(Class<?> beanType, Object id);
+
+  /**
+   * Delete the bean given its type and id with an explicit transaction.
+   */
+  int delete(Class<?> beanType, Object id, Transaction transaction);
+
+  /**
+   * Delete permanent given the bean type and id.
+   */
+  int deletePermanent(Class<?> beanType, Object id);
+
+  /**
+   * Delete permanent given the bean type and id with an explicit transaction.
+   */
+  int deletePermanent(Class<?> beanType, Object id, Transaction transaction);
+
+  /**
+   * Delete all the beans in the collection.
+   */
+  int deleteAll(Collection<?> beans) throws OptimisticLockException;
+
+  /**
+   * Delete all the beans in the collection using an explicit transaction.
+   */
+  int deleteAll(Collection<?> beans, Transaction transaction) throws OptimisticLockException;
+
+  /**
+   * Delete several beans given their type and id values.
+   */
+  int deleteAll(Class<?> beanType, Collection<?> ids);
+
+  /**
+   * Delete several beans given their type and id values with an explicit transaction.
+   */
+  int deleteAll(Class<?> beanType, Collection<?> ids, Transaction transaction);
+
+  /**
+   * Delete permanent for several beans given their type and id values.
+   */
+  int deleteAllPermanent(Class<?> beanType, Collection<?> ids);
+
+  /**
+   * Delete permanent for several beans given their type and id values with an explicit transaction.
+   */
+  int deleteAllPermanent(Class<?> beanType, Collection<?> ids, Transaction transaction);
+
+  /**
+   * Execute a Sql Update Delete or Insert statement. This returns the number of
+   * rows that where updated, deleted or inserted. If is executed in batch then
+   * this returns -1. You can get the actual rowCount after commit() from
+   * updateSql.getRowCount().
+   * <p>
+   * If you wish to execute a Sql Select natively then you should use the
+   * SqlQuery object or DtoQuery.
+   * </p>
+   * <p>
+   * Note that the table modification information is automatically deduced and
+   * you do not need to call the DB.externalModification() method when you
+   * use this method.
+   * </p>
+   * <p>
+   * Example:
+   * </p>
+   * <p>
+   * <pre>{@code
+   *
+   *   // example that uses 'named' parameters
+   *   String s = "UPDATE f_topic set post_count = :count where id = :id"
+   *
+   *   SqlUpdate update = database.createSqlUpdate(s);
+   *
+   *   update.setParameter("id", 1);
+   *   update.setParameter("count", 50);
+   *
+   *   int modifiedCount = database.execute(update);
+   *
+   *   String msg = "There where " + modifiedCount + "rows updated";
+   *
+   * }</pre>
+   *
+   * @param sqlUpdate the update sql potentially with bind values
+   * @return the number of rows updated or deleted. -1 if executed in batch.
+   * @see CallableSql
+   */
+  int execute(SqlUpdate sqlUpdate);
+
+  /**
+   * Execute a ORM insert update or delete statement using the current
+   * transaction.
+   * <p>
+   * This returns the number of rows that where inserted, updated or deleted.
+   * </p>
+   */
+  int execute(Update<?> update);
+
+  /**
+   * Execute a ORM insert update or delete statement with an explicit
+   * transaction.
+   */
+  int execute(Update<?> update, Transaction transaction);
+
+  /**
+   * For making calls to stored procedures.
+   * <p>
+   * Example:
+   * </p>
+   * <p>
+   * <pre>{@code
+   *
+   *   String sql = "{call sp_order_modify(?,?,?)}";
+   *
+   *   CallableSql cs = database.createCallableSql(sql);
+   *   cs.setParameter(1, 27);
+   *   cs.setParameter(2, "SHIPPED");
+   *   cs.registerOut(3, Types.INTEGER);
+   *   cs.execute();
+   *
+   *   // read the out parameter
+   *   Integer returnValue = (Integer) cs.getObject(3);
+   *
+   * }</pre>
+   *
+   */
+  int execute(CallableSql callableSql);
+
+  /**
+   * Inform Ebean that tables have been modified externally. These could be the
+   * result of from calling a stored procedure, other JDBC calls or external
+   * programs including other frameworks.
+   * <p>
+   * If you use database.execute(UpdateSql) then the table modification information
+   * is automatically deduced and you do not need to call this method yourself.
+   * </p>
+   * <p>
+   * This information is used to invalidate objects out of the cache and
+   * potentially text indexes. This information is also automatically broadcast
+   * across the cluster.
+   * </p>
+   * <p>
+   * If there is a transaction then this information is placed into the current
+   * transactions event information. When the transaction is committed this
+   * information is registered (with the transaction manager). If this
+   * transaction is rolled back then none of the transaction event information
+   * registers including the information you put in via this method.
+   * </p>
+   * <p>
+   * If there is NO current transaction when you call this method then this
+   * information is registered immediately (with the transaction manager).
+   * </p>
+   *
+   * @param tableName the name of the table that was modified
+   * @param inserted  true if rows where inserted into the table
+   * @param updated   true if rows on the table where updated
+   * @param deleted   true if rows on the table where deleted
+   */
+  void externalModification(String tableName, boolean inserted, boolean updated, boolean deleted);
+
+  /**
+   * Find a entity bean with an explicit transaction.
+   *
+   * @param <T>         the type of entity bean to find
+   * @param beanType    the type of entity bean to find
+   * @param id          the bean id value
+   * @param transaction the transaction to use (can be null)
+   */
+  <T> T find(Class<T> beanType, Object id, Transaction transaction);
+
+  /**
+   * Insert or update a bean with an explicit transaction.
+   */
+  void save(Object bean, Transaction transaction) throws OptimisticLockException;
+
+  /**
+   * Save all the beans in the collection with an explicit transaction.
+   */
+  int saveAll(Collection<?> beans, Transaction transaction) throws OptimisticLockException;
+
+  /**
+   * This method checks the uniqueness of a bean. I.e. if the save will work. It will return the
+   * properties that violates an unique / primary key. This may be done in an UI save action to
+   * validate if the user has entered correct values.
+   * <p>
+   * Note: This method queries the DB for uniqueness of all indices, so do not use it in a batch update.
+   * <p>
+   * Note: This checks only the root bean!
+   * <p>
+   * <pre>{@code
+   *
+   *   // there is a unique constraint on title
+   *
+   *   Document doc = new Document();
+   *   doc.setTitle("One flew over the cuckoo's nest");
+   *   doc.setBody("clashes with doc1");
+   *
+   *   Set<Property> properties = DB.checkUniqueness(doc);
+   *
+   *   if (properties.isEmpty()) {
+   *     // it is unique ... carry on
+   *
+   *   } else {
+   *     // build a user friendly message
+   *     // to return message back to user
+   *
+   *     String uniqueProperties = properties.toString();
+   *
+   *     StringBuilder msg = new StringBuilder();
+   *
+   *     properties.forEach((it)-> {
+   *       Object propertyValue = it.getVal(doc);
+   *       String propertyName = it.getName();
+   *       msg.append(" property["+propertyName+"] value["+propertyValue+"]");
+   *     });
+   *
+   *     // uniqueProperties > [title]
+   *     //       custom msg > property[title] value[One flew over the cuckoo's nest]
+   *
+   *  }
+   *
+   * }</pre>
+   *
+   * @param bean The entity bean to check uniqueness on
+   * @return a set of Properties if constraint validation was detected or empty list.
+   */
+  @Nonnull
+  Set<Property> checkUniqueness(Object bean);
+
+  /**
+   * Same as {@link #checkUniqueness(Object)}. but with given transaction.
+   */
+  @Nonnull
+  Set<Property> checkUniqueness(Object bean, Transaction transaction);
+
+  /**
+   * Marks the entity bean as dirty.
+   * <p>
+   * This is used so that when a bean that is otherwise unmodified is updated the version
+   * property is updated.
+   * <p>
+   * An unmodified bean that is saved or updated is normally skipped and this marks the bean as
+   * dirty so that it is not skipped.
+   * <p>
+   * <pre>{@code
+   *
+   * Customer customer = database.find(Customer, id);
+   *
+   * // mark the bean as dirty so that a save() or update() will
+   * // increment the version property
+   * database.markAsDirty(customer);
+   * database.save(customer);
+   *
+   * }</pre>
+   */
+  void markAsDirty(Object bean);
+
+  /**
+   * Saves the bean using an update. If you know you are updating a bean then it is preferable to
+   * use this update() method rather than save().
+   * <p>
+   * <b>Stateless updates:</b> Note that the bean does not have to be previously fetched to call
+   * update().You can create a new instance and set some of its properties programmatically for via
+   * JSON/XML marshalling etc. This is described as a 'stateless update'.
+   * </p>
+   * <p>
+   * <b>Optimistic Locking: </b> Note that if the version property is not set when update() is
+   * called then no optimistic locking is performed (internally ConcurrencyMode.NONE is used).
+   * </p>
+   * <p>
+   * <b>{@link ServerConfig#setUpdatesDeleteMissingChildren(boolean)}: </b> When cascade saving to a
+   * OneToMany or ManyToMany the updatesDeleteMissingChildren setting controls if any other children
+   * that are in the database but are not in the collection are deleted.
+   * </p>
+   * <p>
+   * <b>{@link ServerConfig#setUpdateChangesOnly(boolean)}: </b> The updateChangesOnly setting
+   * controls if only the changed properties are included in the update or if all the loaded
+   * properties are included instead.
+   * </p>
+   * <p>
+   * <pre>{@code
+   *
+   * // A 'stateless update' example
+   * Customer customer = new Customer();
+   * customer.setId(7);
+   * customer.setName("ModifiedNameNoOCC");
+   * database.update(customer);
+   *
+   * }</pre>
+   *
+   * @see ServerConfig#setUpdatesDeleteMissingChildren(boolean)
+   * @see ServerConfig#setUpdateChangesOnly(boolean)
+   */
+  void update(Object bean) throws OptimisticLockException;
+
+  /**
+   * Update a bean additionally specifying a transaction.
+   */
+  void update(Object bean, Transaction transaction) throws OptimisticLockException;
+
+  /**
+   * Update a bean additionally specifying a transaction and the deleteMissingChildren setting.
+   *
+   * @param bean                  the bean to update
+   * @param transaction           the transaction to use (can be null).
+   * @param deleteMissingChildren specify false if you do not want 'missing children' of a OneToMany
+   *                              or ManyToMany to be automatically deleted.
+   */
+  void update(Object bean, Transaction transaction, boolean deleteMissingChildren) throws OptimisticLockException;
+
+  /**
+   * Update a collection of beans. If there is no current transaction one is created and used to
+   * update all the beans in the collection.
+   */
+  void updateAll(Collection<?> beans) throws OptimisticLockException;
+
+  /**
+   * Update a collection of beans with an explicit transaction.
+   */
+  void updateAll(Collection<?> beans, Transaction transaction) throws OptimisticLockException;
+
+  /**
+   * Merge the bean using the default merge options (no paths specified, default delete).
+   *
+   * @param bean The bean to merge
+   */
+  void merge(Object bean);
+
+  /**
+   * Merge the bean using the given merge options.
+   *
+   * @param bean    The bean to merge
+   * @param options The options to control the merge
+   */
+  void merge(Object bean, MergeOptions options);
+
+  /**
+   * Merge the bean using the given merge options and a transaction.
+   *
+   * @param bean    The bean to merge
+   * @param options The options to control the merge
+   */
+  void merge(Object bean, MergeOptions options, Transaction transaction);
+
+  /**
+   * Insert the bean.
+   * <p>
+   * Compared to save() this forces bean to perform an insert rather than trying to decide
+   * based on the bean state. As such this is useful when you fetch beans from one database
+   * and want to insert them into another database (and you want to explicitly insert them).
+   * </p>
+   */
+  void insert(Object bean);
+
+  /**
+   * Insert the bean with a transaction.
+   */
+  void insert(Object bean, Transaction transaction);
+
+  /**
+   * Insert a collection of beans. If there is no current transaction one is created and used to
+   * insert all the beans in the collection.
+   */
+  void insertAll(Collection<?> beans);
+
+  /**
+   * Insert a collection of beans with an explicit transaction.
+   */
+  void insertAll(Collection<?> beans, Transaction transaction);
+
+  /**
+   * Execute explicitly passing a transaction.
+   */
+  int execute(SqlUpdate updSql, Transaction transaction);
+
+  /**
+   * Execute explicitly passing a transaction.
+   */
+  int execute(CallableSql callableSql, Transaction transaction);
+
+  /**
+   * Execute a Runnable in a Transaction with an explicit scope.
+   * <p>
+   * The scope can control the transaction type, isolation and rollback
+   * semantics.
+   * </p>
+   * <p>
+   * <pre>{@code
+   *
+   *   // set specific transactional scope settings
+   *   TxScope scope = TxScope.requiresNew().setIsolation(TxIsolation.SERIALIZABLE);
+   *
+   *   database.execute(scope, new Runnable() {
+   * 	   public void run() {
+   * 		   User u1 = database.find(User.class, 1);
+   * 		   ...
+   * 	   }
+   *   });
+   *
+   * }</pre>
+   */
+  void execute(TxScope scope, Runnable runnable);
+
+  /**
+   * Execute a Runnable in a Transaction with the default scope.
+   * <p>
+   * The default scope runs with REQUIRED and by default will rollback on any
+   * exception (checked or runtime).
+   * </p>
+   * <p>
+   * <pre>{@code
+   *
+   *    database.execute(() -> {
+   *
+   *        User u1 = database.find(User.class, 1);
+   *        User u2 = database.find(User.class, 2);
+   *
+   *        u1.setName("u1 mod");
+   *        u2.setName("u2 mod");
+   *
+   *        u1.save();
+   *        u2.save();
+   *    });
+   *
+   * }</pre>
+   */
+  void execute(Runnable runnable);
+
+  /**
+   * Execute a TxCallable in a Transaction with an explicit scope.
+   * <p>
+   * The scope can control the transaction type, isolation and rollback
+   * semantics.
+   * </p>
+   * <p>
+   * <pre>{@code
+   *
+   *   // set specific transactional scope settings
+   *   TxScope scope = TxScope.requiresNew().setIsolation(TxIsolation.SERIALIZABLE);
+   *
+   *   database.executeCall(scope, new Callable<String>() {
+   * 	   public String call() {
+   * 		   User u1 = database.find(User.class, 1);
+   * 		   ...
+   * 		   return u1.getEmail();
+   * 	   }
+   *   });
+   *
+   * }</pre>
+   */
+  <T> T executeCall(TxScope scope, Callable<T> callable);
+
+  /**
+   * Execute a TxCallable in a Transaction with the default scope.
+   * <p>
+   * The default scope runs with REQUIRED and by default will rollback on any
+   * exception (checked or runtime).
+   * </p>
+   * <p>
+   * <pre>{@code
+   *
+   *   database.executeCall(new Callable<String>() {
+   *     public String call() {
+   *       User u1 = database.find(User.class, 1);
+   *       User u2 = database.find(User.class, 2);
+   *
+   *       u1.setName("u1 mod");
+   *       u2.setName("u2 mod");
+   *
+   *       database.save(u1);
+   *       database.save(u2);
+   *
+   *       return u1.getEmail();
+   *     }
+   *   });
+   *
+   * }</pre>
+   */
+  <T> T executeCall(Callable<T> callable);
+
+  /**
+   * Return the manager of the server cache ("L2" cache).
+   */
+  ServerCacheManager getServerCacheManager();
+
+  /**
+   * Return the BackgroundExecutor service for asynchronous processing of
+   * queries.
+   */
+  BackgroundExecutor getBackgroundExecutor();
+
+  /**
+   * Return the JsonContext for reading/writing JSON.
+   * <p>
+   * This instance is safe to be used concurrently by multiple threads and this
+   * method is cheap to call.
+   * </p>
+   * <p>
+   * <h3>Simple example:</h3>
+   * <pre>{@code
+   *
+   *     JsonContext json = database.json();
+   *     String jsonOutput = json.toJson(list);
+   *     System.out.println(jsonOutput);
+   *
+   * }</pre>
+   * <p>
+   * <h3>Using PathProperties:</h3>
+   * <pre>{@code
+   *
+   *     // specify just the properties we want
+   *     PathProperties paths = PathProperties.parse("name, status, anniversary");
+   *
+   *     List<Customer> customers =
+   *       database.find(Customer.class)
+   *         // apply those paths to the query (only fetch what we need)
+   *         .apply(paths)
+   *         .where().ilike("name", "rob%")
+   *         .findList();
+   *
+   *     // ... get the json
+   *     JsonContext jsonContext = database.json();
+   *     String json = jsonContext.toJson(customers, paths);
+   *
+   * }</pre>
+   *
+   * @see FetchPath
+   * @see Query#apply(FetchPath)
+   */
+  JsonContext json();
+
+  /**
+   * Return a ScriptRunner for running SQL or DDL scripts.
+   * <p/>
+   * Intended to use mostly in testing to run seed SQL scripts or truncate table scripts etc.
+   */
+  ScriptRunner script();
+
+  /**
+   * Return the Document store.
+   */
+  DocumentStore docStore();
+
+  /**
+   * Publish a single bean given its type and id returning the resulting live bean.
+   * <p>
+   * The values are published from the draft to the live bean.
+   * </p>
+   *
+   * @param <T>         the type of the entity bean
+   * @param beanType    the type of the entity bean
+   * @param id          the id of the entity bean
+   * @param transaction the transaction the publish process should use (can be null)
+   */
+  <T> T publish(Class<T> beanType, Object id, Transaction transaction);
+
+  /**
+   * Publish a single bean given its type and id returning the resulting live bean.
+   * This will use the current transaction or create one if required.
+   * <p>
+   * The values are published from the draft to the live bean.
+   * </p>
+   *
+   * @param <T>      the type of the entity bean
+   * @param beanType the type of the entity bean
+   * @param id       the id of the entity bean
+   */
+  <T> T publish(Class<T> beanType, Object id);
+
+  /**
+   * Publish the beans that match the query returning the resulting published beans.
+   * <p>
+   * The values are published from the draft beans to the live beans.
+   * </p>
+   *
+   * @param <T>         the type of the entity bean
+   * @param query       the query used to select the draft beans to publish
+   * @param transaction the transaction the publish process should use (can be null)
+   */
+  <T> List<T> publish(Query<T> query, Transaction transaction);
+
+  /**
+   * Publish the beans that match the query returning the resulting published beans.
+   * This will use the current transaction or create one if required.
+   * <p>
+   * The values are published from the draft beans to the live beans.
+   * </p>
+   *
+   * @param <T>   the type of the entity bean
+   * @param query the query used to select the draft beans to publish
+   */
+  <T> List<T> publish(Query<T> query);
+
+  /**
+   * Restore the draft bean back to the live state.
+   * <p>
+   * The values from the live beans are set back to the draft bean and the
+   * <code>@DraftDirty</code> and <code>@DraftReset</code> properties are reset.
+   * </p>
+   *
+   * @param <T>         the type of the entity bean
+   * @param beanType    the type of the entity bean
+   * @param id          the id of the entity bean to restore
+   * @param transaction the transaction the restore process should use (can be null)
+   */
+  <T> T draftRestore(Class<T> beanType, Object id, Transaction transaction);
+
+  /**
+   * Restore the draft bean back to the live state.
+   * <p>
+   * The values from the live beans are set back to the draft bean and the
+   * <code>@DraftDirty</code> and <code>@DraftReset</code> properties are reset.
+   * </p>
+   *
+   * @param <T>      the type of the entity bean
+   * @param beanType the type of the entity bean
+   * @param id       the id of the entity bean to restore
+   */
+  <T> T draftRestore(Class<T> beanType, Object id);
+
+  /**
+   * Restore the draft beans matching the query back to the live state.
+   * <p>
+   * The values from the live beans are set back to the draft bean and the
+   * <code>@DraftDirty</code> and <code>@DraftReset</code> properties are reset.
+   * </p>
+   *
+   * @param <T>         the type of the entity bean
+   * @param query       the query used to select the draft beans to restore
+   * @param transaction the transaction the restore process should use (can be null)
+   */
+  <T> List<T> draftRestore(Query<T> query, Transaction transaction);
+
+  /**
+   * Restore the draft beans matching the query back to the live state.
+   * <p>
+   * The values from the live beans are set back to the draft bean and the
+   * <code>@DraftDirty</code> and <code>@DraftReset</code> properties are reset.
+   * </p>
+   *
+   * @param <T>   the type of the entity bean
+   * @param query the query used to select the draft beans to restore
+   */
+  <T> List<T> draftRestore(Query<T> query);
+
+  /**
+   * Returns the set of properties/paths that are unknown (do not map to known properties or paths).
+   * <p>
+   * Validate the query checking the where and orderBy expression paths to confirm if
+   * they represent valid properties/path for the given bean type.
+   * </p>
+   */
+  <T> Set<String> validateQuery(Query<T> query);
+}
diff --git a/src/main/java/io/ebean/DatabaseFactory.java b/src/main/java/io/ebean/DatabaseFactory.java
new file mode 100644
index 000000000..8bd1721b8
--- /dev/null
+++ b/src/main/java/io/ebean/DatabaseFactory.java
@@ -0,0 +1,67 @@
+package io.ebean;
+
+import io.ebean.config.ContainerConfig;
+import io.ebean.config.DatabaseConfig;
+
+/**
+ * Creates Database instances.
+ * <p>
+ * This uses either DatabaseConfig or properties in the application.properties file to
+ * configure and create a Database instance.
+ * </p>
+ * <p>
+ * The Database instance can either be registered with the DB singleton or
+ * not. The DB singleton effectively holds a map of Database by a name.
+ * If the Database is registered with the DB singleton you can retrieve it
+ * later via {@link DB#byName(String)}.
+ * </p>
+ * <p>
+ * One Database can be nominated as the 'default/primary' Database. Many
+ * methods on the DB singleton such as {@link DB#find(Class)} are just a
+ * convenient way of using the 'default/primary' Database.
+ * </p>
+ */
+public class DatabaseFactory {
+
+  /**
+   * Initialise the container with clustering configuration.
+   * <p>
+   * Call this prior to creating any Database instances or alternatively set the
+   * ContainerConfig on the ServerConfig when creating the first Database instance.
+   */
+  public static synchronized void initialiseContainer(ContainerConfig containerConfig) {
+    EbeanServerFactory.initialiseContainer(containerConfig);
+  }
+
+  /**
+   * Create using ebean.properties to configure the server.
+   */
+  public static synchronized Database create(String name) {
+    return EbeanServerFactory.create(name);
+  }
+
+  /**
+   * Create using the ServerConfig object to configure the server.
+   */
+  public static synchronized Database create(DatabaseConfig config) {
+    return EbeanServerFactory.create(config);
+  }
+
+  /**
+   * Create using the ServerConfig additionally specifying a classLoader to use as the context class loader.
+   */
+  public static synchronized Database createWithContextClassLoader(DatabaseConfig config, ClassLoader classLoader) {
+    return EbeanServerFactory.createWithContextClassLoader(config, classLoader);
+  }
+
+  /**
+   * Shutdown gracefully all EbeanServers cleaning up any resources as required.
+   * <p>
+   * This is typically invoked via JVM shutdown hook and not explicitly called.
+   * </p>
+   */
+  public static synchronized void shutdown() {
+    EbeanServerFactory.shutdown();
+  }
+
+}
diff --git a/src/main/java/io/ebean/Ebean.java b/src/main/java/io/ebean/Ebean.java
index 50300010c..c8cfc1304 100644
--- a/src/main/java/io/ebean/Ebean.java
+++ b/src/main/java/io/ebean/Ebean.java
@@ -120,7 +120,7 @@ public final class Ebean {
   private static final Logger logger = LoggerFactory.getLogger(Ebean.class);
 
   static {
-    EbeanVersion.getVersion(); // initalizes the version class and logs the version.
+    EbeanVersion.getVersion(); // initialises the version class and logs the version.
   }
 
   /**
diff --git a/src/main/java/io/ebean/EbeanServer.java b/src/main/java/io/ebean/EbeanServer.java
index 75993bc0a..6b56621f4 100644
--- a/src/main/java/io/ebean/EbeanServer.java
+++ b/src/main/java/io/ebean/EbeanServer.java
@@ -1,1564 +1,13 @@
 package io.ebean;
 
-import io.ebean.annotation.TxIsolation;
-import io.ebean.cache.ServerCacheManager;
-import io.ebean.config.ServerConfig;
-import io.ebean.meta.MetaInfoManager;
-import io.ebean.plugin.Property;
-import io.ebean.plugin.SpiServer;
-import io.ebean.text.csv.CsvReader;
-import io.ebean.text.json.JsonContext;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.persistence.OptimisticLockException;
-import javax.persistence.PersistenceException;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Callable;
-
 /**
- * Provides the API for fetching and saving beans to a particular DataSource.
+ * Provides the API for fetching and saving beans to a particular Database.
  * <p>
- * <b>Registration with the Ebean Singleton:</b><br/>
- * When a EbeanServer is constructed it can be registered with the Ebean
- * singleton (see {@link ServerConfig#setRegister(boolean)}). The Ebean
- * singleton is essentially a map of EbeanServer's that have been registered
- * with it. The EbeanServer can then be retrieved later via
- * {@link Ebean#getServer(String)}.
- * </p>
+ * Effectively this is an alias for {@link Database} which is now the new
+ * and improved name for EbeanServer.
  * <p>
- * <b>The 'default' EbeanServer</b><br/>
- * One EbeanServer can be designated as the 'default' or 'primary' EbeanServer
- * (see {@link ServerConfig#setDefaultServer(boolean)}. Many methods on Ebean
- * such as {@link Ebean#find(Class)} etc are actually just a convenient way to
- * call methods on the 'default/primary' EbeanServer. This is handy for
- * applications that use a single DataSource.
- * <p>
- * There is one EbeanServer per Database (javax.sql.DataSource). One EbeanServer
- * is referred to as the <em>'default'</em> server and that is the one that
- * Ebean methods such as {@link Ebean#find(Class)} use.
- * </p>
- * <p>
- * <b>Constructing a EbeanServer</b><br/>
- * EbeanServer's are constructed by the EbeanServerFactory. They can be created
- * programmatically via {@link EbeanServerFactory#create(ServerConfig)} or they
- * can be automatically constructed on demand using configuration information in
- * the ebean.properties file.
- * </p>
- * <p>
- * Example: Get a EbeanServer
- * </p>
- * <p>
- * <pre>{@code
- * // Get access to the Human Resources EbeanServer/Database
- * EbeanServer hrServer = Ebean.getServer("HR");
- *
- *
- * // fetch contact 3 from the HR database Contact contact =
- * hrServer.find(Contact.class, new Integer(3));
- *
- * contact.setStatus("INACTIVE"); ...
- *
- * // save the contact back to the HR database hrServer.save(contact);
- * }</pre>
- * <p>
- * <p>
- * <b>EbeanServer has more API than Ebean</b><br/>
- * EbeanServer provides additional API compared with Ebean. For example it
- * provides more control over the use of Transactions that is not available in
- * the Ebean API.
- * </p>
- * <p>
- * <em>External Transactions:</em> If you wanted to use transactions created
- * externally to eBean then EbeanServer provides additional methods where you
- * can explicitly pass a transaction (that can be created externally).
- * </p>
- * <p>
- * <em>Bypass ThreadLocal Mechanism:</em> If you want to bypass the built in
- * ThreadLocal transaction management you can use the createTransaction()
- * method. Example: a single thread requires more than one transaction.
- * </p>
- *
- * @see Ebean
- * @see EbeanServerFactory
- * @see ServerConfig
+ * The preference is to use DB and Database rather than Ebean and EbeanServer.
  */
-public interface EbeanServer {
+public interface EbeanServer extends Database {
 
-  /**
-   * Shutdown the EbeanServer programmatically.
-   * <p>
-   * This method is not normally required. Ebean registers a shutdown hook and shuts down cleanly.
-   * </p>
-   * <p>
-   * If the under underlying DataSource is the Ebean implementation then you
-   * also have the option of shutting down the DataSource and deregistering the
-   * JDBC driver.
-   * </p>
-   *
-   * @param shutdownDataSource if true then shutdown the underlying DataSource if it is the EbeanORM
-   *                           DataSource implementation.
-   * @param deregisterDriver   if true then deregister the JDBC driver if it is the EbeanORM
-   *                           DataSource implementation.
-   */
-  void shutdown(boolean shutdownDataSource, boolean deregisterDriver);
-
-  /**
-   * Return AutoTune which is used to control the AutoTune service at runtime.
-   */
-  AutoTune getAutoTune();
-
-  /**
-   * Return the name. This is used with {@link Ebean#getServer(String)} to get a
-   * EbeanServer that was registered with the Ebean singleton.
-   */
-  String getName();
-
-  /**
-   * Return the ExpressionFactory for this server.
-   */
-  ExpressionFactory getExpressionFactory();
-
-  /**
-   * Return the MetaInfoManager which is used to get meta data from the EbeanServer
-   * such as query execution statistics.
-   */
-  MetaInfoManager getMetaInfoManager();
-
-  /**
-   * Return the extended API intended for use by plugins.
-   */
-  SpiServer getPluginApi();
-
-  /**
-   * Return the BeanState for a given entity bean.
-   * <p>
-   * This will return null if the bean is not an enhanced entity bean.
-   * </p>
-   */
-  BeanState getBeanState(Object bean);
-
-  /**
-   * Return the value of the Id property for a given bean.
-   */
-  Object getBeanId(Object bean);
-
-  /**
-   * Set the Id value onto the bean converting the type of the id value if necessary.
-   * <p>
-   * For example, if the id value passed in is a String but ought to be a Long or UUID etc
-   * then it will automatically be converted.
-   * </p>
-   *
-   * @param bean The entity bean to set the id value on.
-   * @param id   The id value to set.
-   */
-  Object setBeanId(Object bean, Object id);
-
-  /**
-   * Return a map of the differences between two objects of the same type.
-   * <p>
-   * When null is passed in for b, then the 'OldValues' of a is used for the
-   * difference comparison.
-   * </p>
-   */
-  Map<String, ValuePair> diff(Object newBean, Object oldBean);
-
-  /**
-   * Create a new instance of T that is an EntityBean.
-   * <p>
-   * Useful if you use BeanPostConstructListeners or &#64;PostConstruct Annotations.
-   * In this case you should not use "new Bean...()". Making all bean construtors protected
-   * could be a good idea here.
-   * </p>
-   */
-  <T> T createEntityBean(Class<T> type);
-
-  /**
-   * Create a CsvReader for a given beanType.
-   */
-  <T> CsvReader<T> createCsvReader(Class<T> beanType);
-
-  /**
-   * Create an Update query to perform a bulk update.
-   * <p>
-   * <pre>{@code
-   *
-   *  int rows = ebeanServer
-   *      .update(Customer.class)
-   *      .set("status", Customer.Status.ACTIVE)
-   *      .set("updtime", new Timestamp(System.currentTimeMillis()))
-   *      .where()
-   *        .gt("id", 1000)
-   *        .update();
-   *
-   * }</pre>
-   *
-   * @param beanType The type of entity bean to update
-   * @param <T>      The type of entity bean
-   * @return The update query to use
-   */
-  <T> UpdateQuery<T> update(Class<T> beanType);
-
-  /**
-   * Create a named query.
-   * <p>
-   * For RawSql the named query is expected to be in ebean.xml.
-   * </p>
-   *
-   * @param beanType   The type of entity bean
-   * @param namedQuery The name of the query
-   * @param <T>        The type of entity bean
-   * @return The query
-   */
-  <T> Query<T> createNamedQuery(Class<T> beanType, String namedQuery);
-
-  /**
-   * Create a query for an entity bean and synonym for {@link #find(Class)}.
-   *
-   * @see #find(Class)
-   */
-  <T> Query<T> createQuery(Class<T> beanType);
-
-  /**
-   * Parse the Ebean query language statement returning the query which can then
-   * be modified (add expressions, change order by clause, change maxRows, change
-   * fetch and select paths etc).
-   * <p>
-   * <h3>Example</h3>
-   * <pre>{@code
-   *
-   *   // Find order additionally fetching the customer, details and details.product name.
-   *
-   *   String ormQuery = "fetch customer fetch details fetch details.product (name) where id = :orderId ";
-   *
-   *   Query<Order> query = Ebean.createQuery(Order.class, ormQuery);
-   *   query.setParameter("orderId", 2);
-   *
-   *   Order order = query.findOne();
-   *
-   *   // This is the same as:
-   *
-   *   Order order = Ebean.find(Order.class)
-   *     .fetch("customer")
-   *     .fetch("details")
-   *     .fetch("detail.product", "name")
-   *     .setId(2)
-   *     .findOne();
-   *
-   * }</pre>
-   *
-   * @param beanType The type of bean to fetch
-   * @param ormQuery The Ebean ORM query
-   * @param <T>      The type of the entity bean
-   * @return The query with expressions defined as per the parsed query statement
-   */
-  <T> Query<T> createQuery(Class<T> beanType, String ormQuery);
-
-  /**
-   * Create a query for a type of entity bean.
-   * <p>
-   * You can use the methods on the Query object to specify fetch paths,
-   * predicates, order by, limits etc.
-   * </p>
-   * <p>
-   * You then use findList(), findSet(), findMap() and findOne() to execute
-   * the query and return the collection or bean.
-   * </p>
-   * <p>
-   * Note that a query executed by {@link Query#findList()}
-   * {@link Query#findSet()} etc will execute against the same EbeanServer from
-   * which is was created.
-   * </p>
-   * <p>
-   * <pre>{@code
-   *
-   *   // Find order 2 specifying explicitly the parts of the object graph to
-   *   // eagerly fetch. In this case eagerly fetch the associated customer,
-   *   // details and details.product.name
-   *
-   *   Order order = ebeanServer.find(Order.class)
-   *     .fetch("customer")
-   *     .fetch("details")
-   *     .fetch("detail.product", "name")
-   *     .setId(2)
-   *     .findOne();
-   *
-   *   // find some new orders ... with firstRow/maxRows
-   *   List<Order> orders =
-   *     ebeanServer.find(Order.class)
-   *       .where().eq("status", Order.Status.NEW)
-   *       .setFirstRow(20)
-   *       .setMaxRows(10)
-   *       .findList();
-   *
-   * }</pre>
-   */
-  <T> Query<T> find(Class<T> beanType);
-
-  /**
-   * Create a query using native SQL.
-   * <p>
-   * The native SQL can contain named parameters or positioned parameters.
-   * </p>
-   * <pre>{@code
-   *
-   *   String sql = "select c.id, c.name from customer c where c.name like ? order by c.name";
-   *
-   *   Query<Customer> query = ebeanServer.findNative(Customer.class, sql);
-   *   query.setParameter(1, "Rob%");
-   *
-   *   List<Customer> customers = query.findList();
-   *
-   * }</pre>
-   *
-   * @param beanType  The type of entity bean to fetch
-   * @param nativeSql The SQL that can contain named or positioned parameters
-   * @return The query to set parameters and execute
-   */
-  <T> Query<T> findNative(Class<T> beanType, String nativeSql);
-
-  /**
-   * Return the next unique identity value for a given bean type.
-   * <p>
-   * This will only work when a IdGenerator is on the bean such as for beans
-   * that use a DB sequence or UUID.
-   * </p>
-   * <p>
-   * For DB's supporting getGeneratedKeys and sequences such as Oracle10 you do
-   * not need to use this method generally. It is made available for more
-   * complex cases where it is useful to get an ID prior to some processing.
-   * </p>
-   */
-  Object nextId(Class<?> beanType);
-
-  /**
-   * Create a filter for sorting and filtering lists of entities locally without
-   * going back to the database.
-   * <p>
-   * This produces and returns a new list with the sort and filters applied.
-   * </p>
-   * <p>
-   * Refer to {@link Filter} for an example of its use.
-   * </p>
-   */
-  <T> Filter<T> filter(Class<T> beanType);
-
-  /**
-   * Sort the list in memory using the sortByClause which can contain a comma delimited
-   * list of property names and keywords asc, desc, nullsHigh and nullsLow.
-   * <ul>
-   * <li>asc - ascending order (which is the default)</li>
-   * <li>desc - Descending order</li>
-   * <li>nullsHigh - Treat null values as high/large values (which is the
-   * default)</li>
-   * <li>nullsLow- Treat null values as low/very small values</li>
-   * </ul>
-   * <p>
-   * If you leave off any keywords the defaults are ascending order and treating
-   * nulls as high values.
-   * </p>
-   * <p>
-   * Note that the sorting uses a Comparator and Collections.sort(); and does
-   * not invoke a DB query.
-   * </p>
-   * <p>
-   * <pre>{@code
-   *
-   *   // find orders and their customers
-   *   List<Order> list = ebeanServer.find(Order.class)
-   *     .fetch("customer")
-   *     .orderBy("id")
-   *     .findList();
-   *
-   *   // sort by customer name ascending, then by order shipDate
-   *   // ... then by the order status descending
-   *   ebeanServer.sort(list, "customer.name, shipDate, status desc");
-   *
-   *   // sort by customer name descending (with nulls low)
-   *   // ... then by the order id
-   *   ebeanServer.sort(list, "customer.name desc nullsLow, id");
-   *
-   * }</pre>
-   *
-   * @param list         the list of entity beans
-   * @param sortByClause the properties to sort the list by
-   */
-  <T> void sort(List<T> list, String sortByClause);
-
-  /**
-   * Create a orm update where you will supply the insert/update or delete
-   * statement (rather than using a named one that is already defined using the
-   * &#064;NamedUpdates annotation).
-   * <p>
-   * The orm update differs from the sql update in that it you can use the bean
-   * name and bean property names rather than table and column names.
-   * </p>
-   * <p>
-   * An example:
-   * </p>
-   * <p>
-   * <pre>{@code
-   *
-   *   // The bean name and properties - "topic","postCount" and "id"
-   *
-   *   // will be converted into their associated table and column names
-   *   String updStatement = "update topic set postCount = :pc where id = :id";
-   *
-   *   Update<Topic> update = ebeanServer.createUpdate(Topic.class, updStatement);
-   *
-   *   update.set("pc", 9);
-   *   update.set("id", 3);
-   *
-   *   int rows = update.execute();
-   *   System.out.println("rows updated:" + rows);
-   *
-   * }</pre>
-   */
-  <T> Update<T> createUpdate(Class<T> beanType, String ormUpdate);
-
-  /**
-   * Create a Query for DTO beans.
-   * <p>
-   * DTO beans are just normal bean like classes with public constructor(s) and setters.
-   * They do not need to be registered with Ebean before use.
-   * </p>
-   *
-   * @param dtoType The type of the DTO bean the rows will be mapped into.
-   * @param sql     The SQL query to execute.
-   * @param <T>     The type of the DTO bean.
-   */
-  <T> DtoQuery<T> findDto(Class<T> dtoType, String sql);
-
-  /**
-   * Create a named Query for DTO beans.
-   * <p>
-   * DTO beans are just normal bean like classes with public constructor(s) and setters.
-   * They do not need to be registered with Ebean before use.
-   * </p>
-   *
-   * @param dtoType    The type of the DTO bean the rows will be mapped into.
-   * @param namedQuery The name of the query
-   * @param <T>        The type of the DTO bean.
-   */
-  <T> DtoQuery<T> createNamedDtoQuery(Class<T> dtoType, String namedQuery);
-
-  /**
-   * Create a SqlQuery for executing native sql
-   * query statements.
-   * <p>
-   * Note that you can use raw SQL with entity beans, refer to the SqlSelect
-   * annotation for examples.
-   * </p>
-   */
-  SqlQuery createSqlQuery(String sql);
-
-  /**
-   * Create a sql update for executing native dml statements.
-   * <p>
-   * Use this to execute a Insert Update or Delete statement. The statement will
-   * be native to the database and contain database table and column names.
-   * </p>
-   * <p>
-   * See {@link SqlUpdate} for example usage.
-   * </p>
-   */
-  SqlUpdate createSqlUpdate(String sql);
-
-  /**
-   * Create a CallableSql to execute a given stored procedure.
-   */
-  CallableSql createCallableSql(String callableSql);
-
-  /**
-   * Register a TransactionCallback on the currently active transaction.
-   * <p/>
-   * If there is no currently active transaction then a PersistenceException is thrown.
-   *
-   * @param transactionCallback The transaction callback to be registered with the current transaction.
-   * @throws PersistenceException If there is no currently active transaction
-   */
-  void register(TransactionCallback transactionCallback) throws PersistenceException;
-
-  /**
-   * Create a new transaction that is not held in TransactionThreadLocal.
-   * <p>
-   * You will want to do this if you want multiple Transactions in a single
-   * thread or generally use transactions outside of the TransactionThreadLocal
-   * management.
-   * </p>
-   */
-  Transaction createTransaction();
-
-  /**
-   * Create a new transaction additionally specifying the isolation level.
-   * <p>
-   * Note that this transaction is NOT stored in a thread local.
-   * </p>
-   */
-  Transaction createTransaction(TxIsolation isolation);
-
-  /**
-   * Start a transaction with 'REQUIRED' semantics.
-   * <p>
-   * With REQUIRED semantics if an active transaction already exists that transaction will be used.
-   * </p>
-   * <p>
-   * The transaction is stored in a ThreadLocal variable and typically you only
-   * need to use the returned Transaction <em>IF</em> you wish to do things like
-   * use batch mode, change the transaction isolation level, use savepoints or
-   * log comments to the transaction log.
-   * </p>
-   * <p>
-   * Example of using a transaction to span multiple calls to find(), save()
-   * etc.
-   * </p>
-   * <p>
-   * <h3>Using try with resources</h3>
-   * <pre>{@code
-   *
-   *    // start a transaction (stored in a ThreadLocal)
-   *
-   *    try (Transaction txn = ebeanServer.beginTransaction()) {
-   *
-   * 	    Order order = ebeanServer.find(Order.class,10);
-   * 	    ...
-   * 	    ebeanServer.save(order);
-   *
-   * 	    txn.commit();
-   *    }
-   *
-   * }</pre>
-   * <p>
-   * <h3>Using try finally block</h3>
-   * <pre>{@code
-   *
-   *    // start a transaction (stored in a ThreadLocal)
-   *    Transaction txn = ebeanServer.beginTransaction();
-   *    try {
-   * 	    Order order = ebeanServer.find(Order.class,10);
-   *
-   * 	    ebeanServer.save(order);
-   *
-   * 	    txn.commit();
-   *
-   *    } finally {
-   * 	    txn.end();
-   *    }
-   *
-   * }</pre>
-   * <p>
-   * <h3>Transaction options</h3>
-   * <pre>{@code
-   *
-   *     try (Transaction txn = ebeanServer.beginTransaction()) {
-   *       // explicitly turn on/off JDBC batch use
-   *       txn.setBatchMode(true);
-   *       txn.setBatchSize(50);
-   *
-   *       // control flushing when mixing save and queries
-   *       txn.setBatchFlushOnQuery(false);
-   *
-   *       // turn off persist cascade if needed
-   *       txn.setPersistCascade(false);
-   *
-   *       // for large batch insert processing when we do not
-   *       // ... need the generatedKeys, don't get them
-   *       txn.setBatchGetGeneratedKeys(false);
-   *
-   *       // explicitly flush the JDBC batch buffer
-   *       txn.flush();
-   *
-   *       ...
-   *
-   *       txn.commit();
-   *    }
-   *
-   * }</pre>
-   * <p>
-   * <p>
-   * If you want to externalise the transaction management then you use
-   * createTransaction() and pass the transaction around to the various methods on
-   * EbeanServer yourself.
-   * </p>
-   */
-  Transaction beginTransaction();
-
-  /**
-   * Start a transaction additionally specifying the isolation level.
-   */
-  Transaction beginTransaction(TxIsolation isolation);
-
-  /**
-   * Start a transaction typically specifying REQUIRES_NEW or REQUIRED semantics.
-   * <p>
-   * <p>
-   * Note that this provides an try finally alternative to using {@link #executeCall(TxScope, Callable)} or
-   * {@link #execute(TxScope, Runnable)}.
-   * </p>
-   * <p>
-   * <h3>REQUIRES_NEW example:</h3>
-   * <pre>{@code
-   * // Start a new transaction. If there is a current transaction
-   * // suspend it until this transaction ends
-   * try (Transaction txn = server.beginTransaction(TxScope.requiresNew())) {
-   *
-   *   ...
-   *
-   *   // commit the transaction
-   *   txn.commit();
-   *
-   *   // At end this transaction will:
-   *   //  A) will rollback transaction if it has not been committed
-   *   //  B) will restore a previously suspended transaction
-   * }
-   *
-   * }</pre>
-   * <p>
-   * <h3>REQUIRED example:</h3>
-   * <pre>{@code
-   *
-   * // start a new transaction if there is not a current transaction
-   * try (Transaction txn = server.beginTransaction(TxScope.required())) {
-   *
-   *   ...
-   *
-   *   // commit the transaction if it was created or
-   *   // do nothing if there was already a current transaction
-   *   txn.commit();
-   * }
-   *
-   * }</pre>
-   */
-  Transaction beginTransaction(TxScope scope);
-
-  /**
-   * Returns the current transaction or null if there is no current transaction in scope.
-   */
-  Transaction currentTransaction();
-
-  /**
-   * Flush the JDBC batch on the current transaction.
-   * <p>
-   * This only is useful when JDBC batch is used. Flush occurs automatically when the
-   * transaction commits or batch size is reached. This manually flushes the JDBC batch
-   * buffer.
-   * </p>
-   * <p>
-   * This is the same as <code>currentTransaction().flush()</code>.
-   * </p>
-   */
-  void flush();
-
-  /**
-   * Commit the current transaction.
-   */
-  void commitTransaction();
-
-  /**
-   * Rollback the current transaction.
-   */
-  void rollbackTransaction();
-
-  /**
-   * If the current transaction has already been committed do nothing otherwise
-   * rollback the transaction.
-   * <p>
-   * Useful to put in a finally block to ensure the transaction is ended, rather
-   * than a rollbackTransaction() in each catch block.
-   * </p>
-   * <p>
-   * Code example:
-   * <p>
-   * <pre>{@code
-   *
-   *   ebeanServer.beginTransaction();
-   *   try {
-   *     // do some fetching and or persisting ...
-   *
-   *     // commit at the end
-   *     ebeanServer.commitTransaction();
-   *
-   *   } finally {
-   *     // if commit didn't occur then rollback the transaction
-   *     ebeanServer.endTransaction();
-   *   }
-   *
-   * }</pre>
-   */
-  void endTransaction();
-
-  /**
-   * Refresh the values of a bean.
-   * <p>
-   * Note that this resets OneToMany and ManyToMany properties so that if they
-   * are accessed a lazy load will refresh the many property.
-   * </p>
-   */
-  void refresh(Object bean);
-
-  /**
-   * Refresh a many property of an entity bean.
-   *
-   * @param bean         the entity bean containing the 'many' property
-   * @param propertyName the 'many' property to be refreshed
-   */
-  void refreshMany(Object bean, String propertyName);
-
-  /**
-   * Find a bean using its unique id.
-   * <p>
-   * <pre>{@code
-   *   // Fetch order 1
-   *   Order order = ebeanServer.find(Order.class, 1);
-   * }</pre>
-   * <p>
-   * <p>
-   * If you want more control over the query then you can use createQuery() and
-   * Query.findOne();
-   * </p>
-   * <p>
-   * <pre>{@code
-   *   // ... additionally fetching customer, customer shipping address,
-   *   // order details, and the product associated with each order detail.
-   *   // note: only product id and name is fetch (its a "partial object").
-   *   // note: all other objects use "*" and have all their properties fetched.
-   *
-   *   Query<Order> query = ebeanServer.find(Order.class)
-   *     .setId(1)
-   *     .fetch("customer")
-   *     .fetch("customer.shippingAddress")
-   *     .fetch("details")
-   *     .query();
-   *
-   *   // fetch associated products but only fetch their product id and name
-   *   query.fetch("details.product", "name");
-   *
-   *
-   *   Order order = query.findOne();
-   *
-   *   // traverse the object graph...
-   *
-   *   Customer customer = order.getCustomer();
-   *   Address shippingAddress = customer.getShippingAddress();
-   *   List<OrderDetail> details = order.getDetails();
-   *   OrderDetail detail0 = details.get(0);
-   *   Product product = detail0.getProduct();
-   *   String productName = product.getName();
-   *
-   * }</pre>
-   *
-   * @param beanType the type of entity bean to fetch
-   * @param id       the id value
-   */
-  @Nullable
-  <T> T find(Class<T> beanType, Object id);
-
-  /**
-   * Get a reference object.
-   * <p>
-   * This will not perform a query against the database unless some property other
-   * that the id property is accessed.
-   * </p>
-   * <p>
-   * It is most commonly used to set a 'foreign key' on another bean like:
-   * </p>
-   * <pre>{@code
-   *
-   *   Product product = ebeanServer.getReference(Product.class, 1);
-   *
-   *   OrderDetail orderDetail = new OrderDetail();
-   *   // set the product 'foreign key'
-   *   orderDetail.setProduct(product);
-   *   orderDetail.setQuantity(42);
-   *   ...
-   *
-   *   ebeanServer.save(orderDetail);
-   *
-   *
-   * }</pre>
-   * <p>
-   * <h3>Lazy loading characteristics</h3>
-   * <pre>{@code
-   *
-   *   Product product = ebeanServer.getReference(Product.class, 1);
-   *
-   *   // You can get the id without causing a fetch/lazy load
-   *   Long productId = product.getId();
-   *
-   *   // If you try to get any other property a fetch/lazy loading will occur
-   *   // This will cause a query to execute...
-   *   String name = product.getName();
-   *
-   * }</pre>
-   *
-   * @param beanType the type of entity bean
-   * @param id       the id value
-   */
-  @Nonnull
-  <T> T getReference(Class<T> beanType, Object id);
-
-  /**
-   * Return the extended API for EbeanServer.
-   * <p>
-   * The extended API has the options for executing queries that take an explicit
-   * transaction as an argument.
-   * </p>
-   * <p>
-   * Typically we only need to use the extended API when we do NOT want to use the
-   * usual ThreadLocal based mechanism to obtain the current transaction but instead
-   * supply the transaction explicitly.
-   * </p>
-   */
-  ExtendedServer extended();
-
-  /**
-   * Either Insert or Update the bean depending on its state.
-   * <p>
-   * If there is no current transaction one will be created and committed for
-   * you automatically.
-   * </p>
-   * <p>
-   * Save can cascade along relationships. For this to happen you need to
-   * specify a cascade of CascadeType.ALL or CascadeType.PERSIST on the
-   * OneToMany, OneToOne or ManyToMany annotation.
-   * </p>
-   * <p>
-   * In this example below the details property has a CascadeType.ALL set so
-   * saving an order will also save all its details.
-   * </p>
-   * <p>
-   * <pre>{@code
-   *   public class Order { ...
-   *
-   * 	   @OneToMany(cascade=CascadeType.ALL, mappedBy="order")
-   * 	   List<OrderDetail> details;
-   * 	   ...
-   *   }
-   * }</pre>
-   * <p>
-   * <p>
-   * When a save cascades via a OneToMany or ManyToMany Ebean will automatically
-   * set the 'parent' object to the 'detail' object. In the example below in
-   * saving the order and cascade saving the order details the 'parent' order
-   * will be set against each order detail when it is saved.
-   * </p>
-   */
-  void save(Object bean) throws OptimisticLockException;
-
-  /**
-   * Save all the beans in the collection.
-   */
-  int saveAll(Collection<?> beans) throws OptimisticLockException;
-
-  /**
-   * Delete the bean.
-   * <p>
-   * This will return true if the bean was deleted successfully or JDBC batch is being used.
-   * </p>
-   * <p>
-   * If there is no current transaction one will be created and committed for
-   * you automatically.
-   * </p>
-   * <p>
-   * If the Bean does not have a version property (or loaded version property) and
-   * the bean does not exist then this returns false indicating that nothing was
-   * deleted. Note that, if JDBC batch mode is used then this always returns true.
-   * </p>
-   */
-  boolean delete(Object bean) throws OptimisticLockException;
-
-  /**
-   * Delete the bean with an explicit transaction.
-   * <p>
-   * This will return true if the bean was deleted successfully or JDBC batch is being used.
-   * </p>
-   * <p>
-   * If the Bean does not have a version property (or loaded version property) and
-   * the bean does not exist then this returns false indicating that nothing was
-   * deleted. However, if JDBC batch mode is used then this always returns true.
-   * </p>
-   */
-  boolean delete(Object bean, Transaction transaction) throws OptimisticLockException;
-
-  /**
-   * Delete a bean permanently without soft delete.
-   */
-  boolean deletePermanent(Object bean) throws OptimisticLockException;
-
-  /**
-   * Delete a bean permanently without soft delete using an explicit transaction.
-   */
-  boolean deletePermanent(Object bean, Transaction transaction) throws OptimisticLockException;
-
-  /**
-   * Delete all the beans in the collection permanently without soft delete.
-   */
-  int deleteAllPermanent(Collection<?> beans) throws OptimisticLockException;
-
-  /**
-   * Delete all the beans in the collection permanently without soft delete using an explicit transaction.
-   */
-  int deleteAllPermanent(Collection<?> beans, Transaction transaction) throws OptimisticLockException;
-
-  /**
-   * Delete the bean given its type and id.
-   */
-  int delete(Class<?> beanType, Object id);
-
-  /**
-   * Delete the bean given its type and id with an explicit transaction.
-   */
-  int delete(Class<?> beanType, Object id, Transaction transaction);
-
-  /**
-   * Delete permanent given the bean type and id.
-   */
-  int deletePermanent(Class<?> beanType, Object id);
-
-  /**
-   * Delete permanent given the bean type and id with an explicit transaction.
-   */
-  int deletePermanent(Class<?> beanType, Object id, Transaction transaction);
-
-  /**
-   * Delete all the beans in the collection.
-   */
-  int deleteAll(Collection<?> beans) throws OptimisticLockException;
-
-  /**
-   * Delete all the beans in the collection using an explicit transaction.
-   */
-  int deleteAll(Collection<?> beans, Transaction transaction) throws OptimisticLockException;
-
-  /**
-   * Delete several beans given their type and id values.
-   */
-  int deleteAll(Class<?> beanType, Collection<?> ids);
-
-  /**
-   * Delete several beans given their type and id values with an explicit transaction.
-   */
-  int deleteAll(Class<?> beanType, Collection<?> ids, Transaction transaction);
-
-  /**
-   * Delete permanent for several beans given their type and id values.
-   */
-  int deleteAllPermanent(Class<?> beanType, Collection<?> ids);
-
-  /**
-   * Delete permanent for several beans given their type and id values with an explicit transaction.
-   */
-  int deleteAllPermanent(Class<?> beanType, Collection<?> ids, Transaction transaction);
-
-  /**
-   * Execute a Sql Update Delete or Insert statement. This returns the number of
-   * rows that where updated, deleted or inserted. If is executed in batch then
-   * this returns -1. You can get the actual rowCount after commit() from
-   * updateSql.getRowCount().
-   * <p>
-   * If you wish to execute a Sql Select natively then you should use the
-   * SqlQuery object or DtoQuery.
-   * </p>
-   * <p>
-   * Note that the table modification information is automatically deduced and
-   * you do not need to call the Ebean.externalModification() method when you
-   * use this method.
-   * </p>
-   * <p>
-   * Example:
-   * </p>
-   * <p>
-   * <pre>{@code
-   *
-   *   // example that uses 'named' parameters
-   *   String s = "UPDATE f_topic set post_count = :count where id = :id"
-   *
-   *   SqlUpdate update = ebeanServer.createSqlUpdate(s);
-   *
-   *   update.setParameter("id", 1);
-   *   update.setParameter("count", 50);
-   *
-   *   int modifiedCount = ebeanServer.execute(update);
-   *
-   *   String msg = "There where " + modifiedCount + "rows updated";
-   *
-   * }</pre>
-   *
-   * @param sqlUpdate the update sql potentially with bind values
-   * @return the number of rows updated or deleted. -1 if executed in batch.
-   * @see CallableSql
-   */
-  int execute(SqlUpdate sqlUpdate);
-
-  /**
-   * Execute a ORM insert update or delete statement using the current
-   * transaction.
-   * <p>
-   * This returns the number of rows that where inserted, updated or deleted.
-   * </p>
-   */
-  int execute(Update<?> update);
-
-  /**
-   * Execute a ORM insert update or delete statement with an explicit
-   * transaction.
-   */
-  int execute(Update<?> update, Transaction transaction);
-
-  /**
-   * For making calls to stored procedures.
-   * <p>
-   * Example:
-   * </p>
-   * <p>
-   * <pre>{@code
-   *
-   *   String sql = "{call sp_order_modify(?,?,?)}";
-   *
-   *   CallableSql cs = ebeanServer.createCallableSql(sql);
-   *   cs.setParameter(1, 27);
-   *   cs.setParameter(2, "SHIPPED");
-   *   cs.registerOut(3, Types.INTEGER);
-   *
-   *   ebeanServer.execute(cs);
-   *
-   *   // read the out parameter
-   *   Integer returnValue = (Integer) cs.getObject(3);
-   *
-   * }</pre>
-   *
-   * @see CallableSql
-   * @see Ebean#execute(SqlUpdate)
-   */
-  int execute(CallableSql callableSql);
-
-  /**
-   * Inform Ebean that tables have been modified externally. These could be the
-   * result of from calling a stored procedure, other JDBC calls or external
-   * programs including other frameworks.
-   * <p>
-   * If you use ebeanServer.execute(UpdateSql) then the table modification information
-   * is automatically deduced and you do not need to call this method yourself.
-   * </p>
-   * <p>
-   * This information is used to invalidate objects out of the cache and
-   * potentially text indexes. This information is also automatically broadcast
-   * across the cluster.
-   * </p>
-   * <p>
-   * If there is a transaction then this information is placed into the current
-   * transactions event information. When the transaction is committed this
-   * information is registered (with the transaction manager). If this
-   * transaction is rolled back then none of the transaction event information
-   * registers including the information you put in via this method.
-   * </p>
-   * <p>
-   * If there is NO current transaction when you call this method then this
-   * information is registered immediately (with the transaction manager).
-   * </p>
-   *
-   * @param tableName the name of the table that was modified
-   * @param inserted  true if rows where inserted into the table
-   * @param updated   true if rows on the table where updated
-   * @param deleted   true if rows on the table where deleted
-   */
-  void externalModification(String tableName, boolean inserted, boolean updated, boolean deleted);
-
-  /**
-   * Find a entity bean with an explicit transaction.
-   *
-   * @param <T>         the type of entity bean to find
-   * @param beanType    the type of entity bean to find
-   * @param id          the bean id value
-   * @param transaction the transaction to use (can be null)
-   */
-  <T> T find(Class<T> beanType, Object id, Transaction transaction);
-
-  /**
-   * Insert or update a bean with an explicit transaction.
-   */
-  void save(Object bean, Transaction transaction) throws OptimisticLockException;
-
-  /**
-   * Save all the beans in the collection with an explicit transaction.
-   */
-  int saveAll(Collection<?> beans, Transaction transaction) throws OptimisticLockException;
-
-  /**
-   * This method checks the uniqueness of a bean. I.e. if the save will work. It will return the
-   * properties that violates an unique / primary key. This may be done in an UI save action to
-   * validate if the user has entered correct values.
-   * <p>
-   * Note: This method queries the DB for uniqueness of all indices, so do not use it in a batch update.
-   * <p>
-   * Note: This checks only the root bean!
-   * <p>
-   * <pre>{@code
-   *
-   *   // there is a unique constraint on title
-   *
-   *   Document doc = new Document();
-   *   doc.setTitle("One flew over the cuckoo's nest");
-   *   doc.setBody("clashes with doc1");
-   *
-   *   Set<Property> properties = server().checkUniqueness(doc);
-   *
-   *   if (properties.isEmpty()) {
-   *     // it is unique ... carry on
-   *
-   *   } else {
-   *     // build a user friendly message
-   *     // to return message back to user
-   *
-   *     String uniqueProperties = properties.toString();
-   *
-   *     StringBuilder msg = new StringBuilder();
-   *
-   *     properties.forEach((it)-> {
-   *       Object propertyValue = it.getVal(doc);
-   *       String propertyName = it.getName();
-   *       msg.append(" property["+propertyName+"] value["+propertyValue+"]");
-   *     });
-   *
-   *     // uniqueProperties > [title]
-   *     //       custom msg > property[title] value[One flew over the cuckoo's nest]
-   *
-   *  }
-   *
-   * }</pre>
-   *
-   * @param bean The entity bean to check uniqueness on
-   * @return a set of Properties if constraint validation was detected or empty list.
-   */
-  @Nonnull
-  Set<Property> checkUniqueness(Object bean);
-
-  /**
-   * Same as {@link #checkUniqueness(Object)}. but with given transaction.
-   */
-  @Nonnull
-  Set<Property> checkUniqueness(Object bean, Transaction transaction);
-
-  /**
-   * Marks the entity bean as dirty.
-   * <p>
-   * This is used so that when a bean that is otherwise unmodified is updated the version
-   * property is updated.
-   * <p>
-   * An unmodified bean that is saved or updated is normally skipped and this marks the bean as
-   * dirty so that it is not skipped.
-   * <p>
-   * <pre>{@code
-   *
-   * Customer customer = ebeanServer.find(Customer, id);
-   *
-   * // mark the bean as dirty so that a save() or update() will
-   * // increment the version property
-   * ebeanServer.markAsDirty(customer);
-   * ebeanServer.save(customer);
-   *
-   * }</pre>
-   */
-  void markAsDirty(Object bean);
-
-  /**
-   * Saves the bean using an update. If you know you are updating a bean then it is preferable to
-   * use this update() method rather than save().
-   * <p>
-   * <b>Stateless updates:</b> Note that the bean does not have to be previously fetched to call
-   * update().You can create a new instance and set some of its properties programmatically for via
-   * JSON/XML marshalling etc. This is described as a 'stateless update'.
-   * </p>
-   * <p>
-   * <b>Optimistic Locking: </b> Note that if the version property is not set when update() is
-   * called then no optimistic locking is performed (internally ConcurrencyMode.NONE is used).
-   * </p>
-   * <p>
-   * <b>{@link ServerConfig#setUpdatesDeleteMissingChildren(boolean)}: </b> When cascade saving to a
-   * OneToMany or ManyToMany the updatesDeleteMissingChildren setting controls if any other children
-   * that are in the database but are not in the collection are deleted.
-   * </p>
-   * <p>
-   * <b>{@link ServerConfig#setUpdateChangesOnly(boolean)}: </b> The updateChangesOnly setting
-   * controls if only the changed properties are included in the update or if all the loaded
-   * properties are included instead.
-   * </p>
-   * <p>
-   * <pre>{@code
-   *
-   * // A 'stateless update' example
-   * Customer customer = new Customer();
-   * customer.setId(7);
-   * customer.setName("ModifiedNameNoOCC");
-   * ebeanServer.update(customer);
-   *
-   * }</pre>
-   *
-   * @see ServerConfig#setUpdatesDeleteMissingChildren(boolean)
-   * @see ServerConfig#setUpdateChangesOnly(boolean)
-   */
-  void update(Object bean) throws OptimisticLockException;
-
-  /**
-   * Update a bean additionally specifying a transaction.
-   */
-  void update(Object bean, Transaction transaction) throws OptimisticLockException;
-
-  /**
-   * Update a bean additionally specifying a transaction and the deleteMissingChildren setting.
-   *
-   * @param bean                  the bean to update
-   * @param transaction           the transaction to use (can be null).
-   * @param deleteMissingChildren specify false if you do not want 'missing children' of a OneToMany
-   *                              or ManyToMany to be automatically deleted.
-   */
-  void update(Object bean, Transaction transaction, boolean deleteMissingChildren) throws OptimisticLockException;
-
-  /**
-   * Update a collection of beans. If there is no current transaction one is created and used to
-   * update all the beans in the collection.
-   */
-  void updateAll(Collection<?> beans) throws OptimisticLockException;
-
-  /**
-   * Update a collection of beans with an explicit transaction.
-   */
-  void updateAll(Collection<?> beans, Transaction transaction) throws OptimisticLockException;
-
-  /**
-   * Merge the bean using the default merge options (no paths specified, default delete).
-   *
-   * @param bean The bean to merge
-   */
-  void merge(Object bean);
-
-  /**
-   * Merge the bean using the given merge options.
-   *
-   * @param bean    The bean to merge
-   * @param options The options to control the merge
-   */
-  void merge(Object bean, MergeOptions options);
-
-  /**
-   * Merge the bean using the given merge options and a transaction.
-   *
-   * @param bean    The bean to merge
-   * @param options The options to control the merge
-   */
-  void merge(Object bean, MergeOptions options, Transaction transaction);
-
-  /**
-   * Insert the bean.
-   * <p>
-   * Compared to save() this forces bean to perform an insert rather than trying to decide
-   * based on the bean state. As such this is useful when you fetch beans from one database
-   * and want to insert them into another database (and you want to explicitly insert them).
-   * </p>
-   */
-  void insert(Object bean);
-
-  /**
-   * Insert the bean with a transaction.
-   */
-  void insert(Object bean, Transaction transaction);
-
-  /**
-   * Insert a collection of beans. If there is no current transaction one is created and used to
-   * insert all the beans in the collection.
-   */
-  void insertAll(Collection<?> beans);
-
-  /**
-   * Insert a collection of beans with an explicit transaction.
-   */
-  void insertAll(Collection<?> beans, Transaction transaction);
-
-  /**
-   * Execute explicitly passing a transaction.
-   */
-  int execute(SqlUpdate updSql, Transaction transaction);
-
-  /**
-   * Execute explicitly passing a transaction.
-   */
-  int execute(CallableSql callableSql, Transaction transaction);
-
-  /**
-   * Execute a Runnable in a Transaction with an explicit scope.
-   * <p>
-   * The scope can control the transaction type, isolation and rollback
-   * semantics.
-   * </p>
-   * <p>
-   * <pre>{@code
-   *
-   *   // set specific transactional scope settings
-   *   TxScope scope = TxScope.requiresNew().setIsolation(TxIsolation.SERIALIZABLE);
-   *
-   *   ebeanServer.execute(scope, new Runnable() {
-   * 	   public void run() {
-   * 		   User u1 = Ebean.find(User.class, 1);
-   * 		   ...
-   * 	   }
-   *   });
-   *
-   * }</pre>
-   */
-  void execute(TxScope scope, Runnable runnable);
-
-  /**
-   * Execute a Runnable in a Transaction with the default scope.
-   * <p>
-   * The default scope runs with REQUIRED and by default will rollback on any
-   * exception (checked or runtime).
-   * </p>
-   * <p>
-   * <pre>{@code
-   *
-   *    ebeanServer.execute(() -> {
-   *
-   *        User u1 = ebeanServer.find(User.class, 1);
-   *        User u2 = ebeanServer.find(User.class, 2);
-   *
-   *        u1.setName("u1 mod");
-   *        u2.setName("u2 mod");
-   *
-   *        u1.save();
-   *        u2.save();
-   *    });
-   *
-   * }</pre>
-   */
-  void execute(Runnable runnable);
-
-  /**
-   * Execute a TxCallable in a Transaction with an explicit scope.
-   * <p>
-   * The scope can control the transaction type, isolation and rollback
-   * semantics.
-   * </p>
-   * <p>
-   * <pre>{@code
-   *
-   *   // set specific transactional scope settings
-   *   TxScope scope = TxScope.requiresNew().setIsolation(TxIsolation.SERIALIZABLE);
-   *
-   *   ebeanServer.executeCall(scope, new Callable<String>() {
-   * 	   public String call() {
-   * 		   User u1 = ebeanServer.find(User.class, 1);
-   * 		   ...
-   * 		   return u1.getEmail();
-   * 	   }
-   *   });
-   *
-   * }</pre>
-   */
-  <T> T executeCall(TxScope scope, Callable<T> callable);
-
-  /**
-   * Execute a TxCallable in a Transaction with the default scope.
-   * <p>
-   * The default scope runs with REQUIRED and by default will rollback on any
-   * exception (checked or runtime).
-   * </p>
-   * <p>
-   * <pre>{@code
-   *
-   *   ebeanServer.executeCall(new Callable<String>() {
-   *     public String call() {
-   *       User u1 = ebeanServer.find(User.class, 1);
-   *       User u2 = ebeanServer.find(User.class, 2);
-   *
-   *       u1.setName("u1 mod");
-   *       u2.setName("u2 mod");
-   *
-   *       ebeanServer.save(u1);
-   *       ebeanServer.save(u2);
-   *
-   *       return u1.getEmail();
-   *     }
-   *   });
-   *
-   * }</pre>
-   */
-  <T> T executeCall(Callable<T> callable);
-
-  /**
-   * Return the manager of the server cache ("L2" cache).
-   */
-  ServerCacheManager getServerCacheManager();
-
-  /**
-   * Return the BackgroundExecutor service for asynchronous processing of
-   * queries.
-   */
-  BackgroundExecutor getBackgroundExecutor();
-
-  /**
-   * Return the JsonContext for reading/writing JSON.
-   * <p>
-   * This instance is safe to be used concurrently by multiple threads and this
-   * method is cheap to call.
-   * </p>
-   * <p>
-   * <h3>Simple example:</h3>
-   * <pre>{@code
-   *
-   *     JsonContext json = ebeanServer.json();
-   *     String jsonOutput = json.toJson(list);
-   *     System.out.println(jsonOutput);
-   *
-   * }</pre>
-   * <p>
-   * <h3>Using PathProperties:</h3>
-   * <pre>{@code
-   *
-   *     // specify just the properties we want
-   *     PathProperties paths = PathProperties.parse("name, status, anniversary");
-   *
-   *     List<Customer> customers =
-   *       ebeanServer.find(Customer.class)
-   *         // apply those paths to the query (only fetch what we need)
-   *         .apply(paths)
-   *         .where().ilike("name", "rob%")
-   *         .findList();
-   *
-   *     // ... get the json
-   *     JsonContext jsonContext = ebeanServer.json();
-   *     String json = jsonContext.toJson(customers, paths);
-   *
-   * }</pre>
-   *
-   * @see FetchPath
-   * @see Query#apply(FetchPath)
-   */
-  JsonContext json();
-
-  /**
-   * Return a ScriptRunner for running SQL or DDL scripts.
-   * <p/>
-   * Intended to use mostly in testing to run seed SQL scripts or truncate table scripts etc.
-   */
-  ScriptRunner script();
-
-  /**
-   * Return the Document store.
-   */
-  DocumentStore docStore();
-
-  /**
-   * Publish a single bean given its type and id returning the resulting live bean.
-   * <p>
-   * The values are published from the draft to the live bean.
-   * </p>
-   *
-   * @param <T>         the type of the entity bean
-   * @param beanType    the type of the entity bean
-   * @param id          the id of the entity bean
-   * @param transaction the transaction the publish process should use (can be null)
-   */
-  <T> T publish(Class<T> beanType, Object id, Transaction transaction);
-
-  /**
-   * Publish a single bean given its type and id returning the resulting live bean.
-   * This will use the current transaction or create one if required.
-   * <p>
-   * The values are published from the draft to the live bean.
-   * </p>
-   *
-   * @param <T>      the type of the entity bean
-   * @param beanType the type of the entity bean
-   * @param id       the id of the entity bean
-   */
-  <T> T publish(Class<T> beanType, Object id);
-
-  /**
-   * Publish the beans that match the query returning the resulting published beans.
-   * <p>
-   * The values are published from the draft beans to the live beans.
-   * </p>
-   *
-   * @param <T>         the type of the entity bean
-   * @param query       the query used to select the draft beans to publish
-   * @param transaction the transaction the publish process should use (can be null)
-   */
-  <T> List<T> publish(Query<T> query, Transaction transaction);
-
-  /**
-   * Publish the beans that match the query returning the resulting published beans.
-   * This will use the current transaction or create one if required.
-   * <p>
-   * The values are published from the draft beans to the live beans.
-   * </p>
-   *
-   * @param <T>   the type of the entity bean
-   * @param query the query used to select the draft beans to publish
-   */
-  <T> List<T> publish(Query<T> query);
-
-  /**
-   * Restore the draft bean back to the live state.
-   * <p>
-   * The values from the live beans are set back to the draft bean and the
-   * <code>@DraftDirty</code> and <code>@DraftReset</code> properties are reset.
-   * </p>
-   *
-   * @param <T>         the type of the entity bean
-   * @param beanType    the type of the entity bean
-   * @param id          the id of the entity bean to restore
-   * @param transaction the transaction the restore process should use (can be null)
-   */
-  <T> T draftRestore(Class<T> beanType, Object id, Transaction transaction);
-
-  /**
-   * Restore the draft bean back to the live state.
-   * <p>
-   * The values from the live beans are set back to the draft bean and the
-   * <code>@DraftDirty</code> and <code>@DraftReset</code> properties are reset.
-   * </p>
-   *
-   * @param <T>      the type of the entity bean
-   * @param beanType the type of the entity bean
-   * @param id       the id of the entity bean to restore
-   */
-  <T> T draftRestore(Class<T> beanType, Object id);
-
-  /**
-   * Restore the draft beans matching the query back to the live state.
-   * <p>
-   * The values from the live beans are set back to the draft bean and the
-   * <code>@DraftDirty</code> and <code>@DraftReset</code> properties are reset.
-   * </p>
-   *
-   * @param <T>         the type of the entity bean
-   * @param query       the query used to select the draft beans to restore
-   * @param transaction the transaction the restore process should use (can be null)
-   */
-  <T> List<T> draftRestore(Query<T> query, Transaction transaction);
-
-  /**
-   * Restore the draft beans matching the query back to the live state.
-   * <p>
-   * The values from the live beans are set back to the draft bean and the
-   * <code>@DraftDirty</code> and <code>@DraftReset</code> properties are reset.
-   * </p>
-   *
-   * @param <T>   the type of the entity bean
-   * @param query the query used to select the draft beans to restore
-   */
-  <T> List<T> draftRestore(Query<T> query);
-
-  /**
-   * Returns the set of properties/paths that are unknown (do not map to known properties or paths).
-   * <p>
-   * Validate the query checking the where and orderBy expression paths to confirm if
-   * they represent valid properties/path for the given bean type.
-   * </p>
-   */
-  <T> Set<String> validateQuery(Query<T> query);
 }
diff --git a/src/main/java/io/ebean/config/DatabaseConfig.java b/src/main/java/io/ebean/config/DatabaseConfig.java
new file mode 100644
index 000000000..f314c73e0
--- /dev/null
+++ b/src/main/java/io/ebean/config/DatabaseConfig.java
@@ -0,0 +1,44 @@
+package io.ebean.config;
+
+import io.ebean.DatabaseFactory;
+
+/**
+ * The configuration used for creating a Database.
+ * <p>
+ * Used to programmatically construct an Database and optionally register it
+ * with the DB singleton.
+ * </p>
+ * <p>
+ * If you just use DB thout this programmatic configuration Ebean will read
+ * the application.properties file and take the configuration from there. This usually
+ * includes searching the class path and automatically registering any entity
+ * classes and listeners etc.
+ * </p>
+ * <pre>{@code
+ *
+ * DatabaseConfig config = new DatabaseConfig();
+ *
+ * // read the ebean.properties and load
+ * // those settings into this serverConfig object
+ * config.loadFromProperties();
+ *
+ * // explicitly register the entity beans to avoid classpath scanning
+ * config.addClass(Customer.class);
+ * config.addClass(User.class);
+ *
+ * Database db = DatabaseFactory.create(config);
+ *
+ * }</pre>
+ *
+ * <p>
+ * Note that ServerConfigProvider provides a standard Java ServiceLoader mechanism that can
+ * be used to apply configuration to the DatabaseConfig.
+ * </p>
+ *
+ * @author emcgreal
+ * @author rbygrave
+ * @see DatabaseFactory
+ */
+public class DatabaseConfig extends ServerConfig {
+
+}
diff --git a/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java b/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java
index b7c285afb..819419fbc 100644
--- a/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java
+++ b/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java
@@ -17,7 +17,7 @@ public class EbeanServer_deleteAllByIdTest extends BaseTestCase {
 
     List<EBasicVer> someBeans = beans(3);
 
-    Ebean.saveAll(someBeans);
+    DB.saveAll(someBeans);
     List<Integer> ids = new ArrayList<>();
     for (EBasicVer someBean : someBeans) {
       ids.add(someBean.getId());
@@ -25,7 +25,7 @@ public class EbeanServer_deleteAllByIdTest extends BaseTestCase {
 
     // act
     LoggedSqlCollector.start();
-    Ebean.deleteAll(EBasicVer.class, ids);
+    DB.deleteAll(EBasicVer.class, ids);
 
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertThat(loggedSql).hasSize(1);
@@ -37,21 +37,18 @@ public class EbeanServer_deleteAllByIdTest extends BaseTestCase {
 
     List<EBasicVer> someBeans = beans(3);
 
-    Ebean.saveAll(someBeans);
+    DB.saveAll(someBeans);
     List<Integer> ids = new ArrayList<>();
     for (EBasicVer someBean : someBeans) {
       ids.add(someBean.getId());
     }
 
-    EbeanServer server = Ebean.getDefaultServer();
+    Database db = DB.getDefault();
     // act
     LoggedSqlCollector.start();
-    Transaction txn = server.beginTransaction();
-    try {
-      server.deleteAll(EBasicVer.class, ids, txn);
+    try (Transaction txn = db.beginTransaction()) {
+      db.deleteAll(EBasicVer.class, ids, txn);
       txn.commit();
-    } finally {
-      txn.end();
     }
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertThat(loggedSql).hasSize(1);
@@ -63,7 +60,7 @@ public class EbeanServer_deleteAllByIdTest extends BaseTestCase {
 
     List<EBasicVer> someBeans = beans(3);
 
-    Ebean.saveAll(someBeans);
+    DB.saveAll(someBeans);
     List<Integer> ids = new ArrayList<>();
     for (EBasicVer someBean : someBeans) {
       ids.add(someBean.getId());
@@ -71,7 +68,7 @@ public class EbeanServer_deleteAllByIdTest extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    Ebean.deleteAllPermanent(EBasicVer.class, ids);
+    DB.deleteAllPermanent(EBasicVer.class, ids);
 
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertThat(loggedSql).hasSize(1);
@@ -84,21 +81,18 @@ public class EbeanServer_deleteAllByIdTest extends BaseTestCase {
 
     List<EBasicVer> someBeans = beans(3);
 
-    Ebean.saveAll(someBeans);
+    DB.saveAll(someBeans);
     List<Integer> ids = new ArrayList<>();
     for (EBasicVer someBean : someBeans) {
       ids.add(someBean.getId());
     }
 
-    EbeanServer server = Ebean.getDefaultServer();
+    Database db = DB.getDefault();
     // act
     LoggedSqlCollector.start();
-    Transaction txn = server.beginTransaction();
-    try {
-      server.deleteAllPermanent(EBasicVer.class, ids, txn);
+    try (Transaction txn = db.beginTransaction()) {
+      db.deleteAllPermanent(EBasicVer.class, ids, txn);
       txn.commit();
-    } finally {
-      txn.end();
     }
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertThat(loggedSql).hasSize(1);
diff --git a/src/test/java/io/ebean/plugin/BeanTypeTest.java b/src/test/java/io/ebean/plugin/BeanTypeTest.java
index dd910def6..42cfb3aa2 100644
--- a/src/test/java/io/ebean/plugin/BeanTypeTest.java
+++ b/src/test/java/io/ebean/plugin/BeanTypeTest.java
@@ -1,12 +1,13 @@
 package io.ebean.plugin;
 
-import io.ebean.Ebean;
-import io.ebean.EbeanServer;
+import io.ebean.DB;
+import io.ebean.Database;
 import io.ebean.FetchPath;
 import io.ebean.Query;
 import io.ebean.text.PathProperties;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.querydefn.OrmQueryDetail;
+import org.junit.Test;
 import org.tests.inheritance.Stockforecast;
 import org.tests.model.basic.Car;
 import org.tests.model.basic.Customer;
@@ -15,60 +16,61 @@ import org.tests.model.basic.OrderDetail;
 import org.tests.model.basic.Person;
 import org.tests.model.basic.Product;
 import org.tests.model.basic.Vehicle;
-import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 
 public class BeanTypeTest {
 
-  static EbeanServer server = Ebean.getDefaultServer();
+  static Database db = DB.getDefault();
 
   <T> BeanType<T> beanType(Class<T> cls) {
-    return server.getPluginApi().getBeanType(cls);
+    return db.getPluginApi().getBeanType(cls);
   }
 
   @Test
-  public void getBeanType() throws Exception {
+  public void getBeanType() {
     assertThat(beanType(Order.class).getBeanType()).isEqualTo(Order.class);
   }
 
   @Test
-  public void getTypeAtPath_when_ManyToOne() throws Exception {
+  public void getTypeAtPath_when_ManyToOne() {
     BeanType<Order> orderType = beanType(Order.class);
     BeanType<?> customerType = orderType.getBeanTypeAtPath("customer");
     assertThat(customerType.getBeanType()).isEqualTo(Customer.class);
   }
 
   @Test
-  public void getTypeAtPath_when_OneToMany() throws Exception {
+  public void getTypeAtPath_when_OneToMany() {
     BeanType<Order> orderType = beanType(Order.class);
     BeanType<?> detailsType = orderType.getBeanTypeAtPath("details");
     assertThat(detailsType.getBeanType()).isEqualTo(OrderDetail.class);
   }
 
   @Test
-  public void getTypeAtPath_when_nested() throws Exception {
+  public void getTypeAtPath_when_nested() {
     BeanType<Order> orderType = beanType(Order.class);
     BeanType<?> productType = orderType.getBeanTypeAtPath("details.product");
     assertThat(productType.getBeanType()).isEqualTo(Product.class);
   }
 
   @Test(expected = RuntimeException.class)
-  public void getTypeAtPath_when_simpleType() throws Exception {
+  public void getTypeAtPath_when_simpleType() {
 
     beanType(Order.class).getBeanTypeAtPath("status");
   }
 
   @Test
-  public void createBean() throws Exception {
+  public void createBean() {
 
     assertThat(beanType(Order.class).createBean()).isNotNull();
   }
 
   @Test
-  public void property() throws Exception {
+  public void property() {
 
     Order order = new Order();
     order.setStatus(Order.Status.APPROVED);
@@ -78,13 +80,13 @@ public class BeanTypeTest {
   }
 
   @Test
-  public void getBaseTable() throws Exception {
+  public void getBaseTable() {
 
     assertThat(beanType(Order.class).getBaseTable()).isEqualTo("o_order");
   }
 
   @Test
-  public void beanId_and_getBeanId() throws Exception {
+  public void beanId_and_getBeanId() {
 
     Order order = new Order();
     order.setId(42);
@@ -97,7 +99,7 @@ public class BeanTypeTest {
   }
 
   @Test
-  public void setBeanId() throws Exception {
+  public void setBeanId() {
 
     Order order = new Order();
     beanType(Order.class).setBeanId(order, 42);
@@ -106,7 +108,7 @@ public class BeanTypeTest {
   }
 
   @Test
-  public void isDocStoreIndex() throws Exception {
+  public void isDocStoreIndex() {
 
     assertThat(beanType(Order.class).isDocStoreMapped()).isFalse();
     assertThat(beanType(Person.class).isDocStoreMapped()).isFalse();
@@ -116,7 +118,7 @@ public class BeanTypeTest {
   }
 
   @Test
-  public void docStore_getEmbedded() throws Exception {
+  public void docStore_getEmbedded() {
 
     BeanDocType<Order> orderDocType = beanType(Order.class).docStore();
     FetchPath customer = orderDocType.getEmbedded("customer");
@@ -125,7 +127,7 @@ public class BeanTypeTest {
   }
 
   @Test
-  public void docStore_getEmbeddedManyRoot() throws Exception {
+  public void docStore_getEmbeddedManyRoot() {
 
     BeanDocType<Order> orderDocType = beanType(Order.class).docStore();
 
@@ -139,28 +141,28 @@ public class BeanTypeTest {
   }
 
   @Test
-  public void getDocStoreQueueId() throws Exception {
+  public void getDocStoreQueueId() {
 
     assertThat(beanType(Order.class).getDocStoreQueueId()).isEqualTo("order");
     assertThat(beanType(Customer.class).getDocStoreQueueId()).isEqualTo("customer");
   }
 
   @Test
-  public void getDocStoreIndexType() throws Exception {
+  public void getDocStoreIndexType() {
 
     assertThat(beanType(Order.class).docStore().getIndexType()).isEqualTo("order");
     assertThat(beanType(Customer.class).docStore().getIndexType()).isEqualTo("customer");
   }
 
   @Test
-  public void getDocStoreIndexName() throws Exception {
+  public void getDocStoreIndexName() {
 
     assertThat(beanType(Order.class).docStore().getIndexType()).isEqualTo("order");
     assertThat(beanType(Customer.class).docStore().getIndexType()).isEqualTo("customer");
   }
 
   @Test
-  public void docStoreNested() throws Exception {
+  public void docStoreNested() {
 
     FetchPath parse = PathProperties.parse("id,name");
 
@@ -169,9 +171,9 @@ public class BeanTypeTest {
   }
 
   @Test
-  public void docStoreApplyPath() throws Exception {
+  public void docStoreApplyPath() {
 
-    SpiQuery<Order> orderQuery = (SpiQuery<Order>) server.find(Order.class);
+    SpiQuery<Order> orderQuery = (SpiQuery<Order>) db.find(Order.class);
     beanType(Order.class).docStore().applyPath(orderQuery);
 
     OrmQueryDetail detail = orderQuery.getDetail();
@@ -228,13 +230,13 @@ public class BeanTypeTest {
 
   @Test
   public void addInheritanceWhere_when_leaf() {
-    Query<Vehicle> query = server.find(Vehicle.class);
+    Query<Vehicle> query = db.find(Vehicle.class);
     beanType(Car.class).addInheritanceWhere(query);
   }
 
   @Test
   public void addInheritanceWhere_when_root() {
-    Query<Vehicle> query = server.find(Vehicle.class);
+    Query<Vehicle> query = db.find(Vehicle.class);
     beanType(Vehicle.class).addInheritanceWhere(query);
   }
 
diff --git a/src/test/java/io/ebean/text/json/JsonContextTest.java b/src/test/java/io/ebean/text/json/JsonContextTest.java
index d6fd854b7..4c1de729b 100644
--- a/src/test/java/io/ebean/text/json/JsonContextTest.java
+++ b/src/test/java/io/ebean/text/json/JsonContextTest.java
@@ -1,14 +1,13 @@
 package io.ebean.text.json;
 
-import io.ebean.Ebean;
-import io.ebean.EbeanServer;
+import com.fasterxml.jackson.core.JsonGenerator;
+import io.ebean.DB;
 import io.ebean.text.PathProperties;
+import org.junit.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
-import com.fasterxml.jackson.core.JsonGenerator;
-import org.junit.Test;
 
 import java.io.StringReader;
 import java.io.StringWriter;
@@ -16,16 +15,18 @@ import java.util.List;
 import java.util.Map;
 
 import static org.assertj.core.api.StrictAssertions.assertThat;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
 public class JsonContextTest {
 
   @Test
-  public void testIsSupportedType() throws Exception {
+  public void testIsSupportedType() {
 
-    EbeanServer server = Ebean.getDefaultServer();
-
-    JsonContext json = server.json();
+    JsonContext json = DB.json();
     assertTrue(json.isSupportedType(Customer.class));
     assertFalse(json.isSupportedType(System.class));
   }
@@ -35,14 +36,14 @@ public class JsonContextTest {
 
     ResetBasicData.reset();
 
-    List<Order> orders = Ebean.find(Order.class)
+    List<Order> orders = DB.find(Order.class)
       .fetch("customer", "id, name")
       .where().eq("customer.id", 1)
       .findList();
 
-    String json = Ebean.json().toJson(orders);
+    String json = DB.json().toJson(orders);
 
-    List<Order> orders1 = Ebean.json().toList(Order.class, json);
+    List<Order> orders1 = DB.json().toList(Order.class, json);
 
     Customer customer = null;
     for (Order order : orders1) {
@@ -60,16 +61,16 @@ public class JsonContextTest {
 
     ResetBasicData.reset();
 
-    List<Order> orders = Ebean.find(Order.class)
+    List<Order> orders = DB.find(Order.class)
       .select("status")
       .fetch("customer", "id, name")
       .findList();
 
-    String json = Ebean.json().toJson(orders);
+    String json = DB.json().toJson(orders);
 
     JsonReadOptions options = new JsonReadOptions().setEnableLazyLoading(true);
 
-    List<Order> orders1 = Ebean.json().toList(Order.class, json, options);
+    List<Order> orders1 = DB.json().toList(Order.class, json, options);
 
     for (Order order : orders1) {
       Customer customer = order.getCustomer();
@@ -81,11 +82,9 @@ public class JsonContextTest {
   }
 
   @Test
-  public void test_toObject() throws Exception {
+  public void test_toObject() {
 
-    EbeanServer server = Ebean.getDefaultServer();
-
-    JsonContext json = server.json();
+    JsonContext json = DB.getDefault().json();
 
     Customer customer = new Customer();
     customer.setId(1);
@@ -111,7 +110,7 @@ public class JsonContextTest {
 
     String jsonWithUnknown = "{\"id\":42,\"unknownProp\":\"foo\",\"name\":\"rob\",\"version\":1}";
 
-    Customer customer = Ebean.json().toBean(Customer.class, jsonWithUnknown);
+    Customer customer = DB.json().toBean(Customer.class, jsonWithUnknown);
     assertEquals(Integer.valueOf(42), customer.getId());
     assertEquals("rob", customer.getName());
   }
@@ -139,7 +138,7 @@ public class JsonContextTest {
     options.addRootVisitor(custReadVisitor);
 
 
-    Customer customer = Ebean.json().toBean(Customer.class, jsonWithUnknown, options);
+    Customer customer = DB.json().toBean(Customer.class, jsonWithUnknown, options);
     assertEquals(Integer.valueOf(42), customer.getId());
     assertEquals("rob", customer.getName());
 
@@ -160,7 +159,7 @@ public class JsonContextTest {
     JsonReadOptions options = new JsonReadOptions();
     options.addRootVisitor(custReadVisitor);
 
-    Customer customer = Ebean.json().toBean(Customer.class, someJsonAllKnown, options);
+    Customer customer = DB.json().toBean(Customer.class, someJsonAllKnown, options);
     assertEquals(Integer.valueOf(42), customer.getId());
     assertEquals("rob", customer.getName());
 
@@ -171,10 +170,8 @@ public class JsonContextTest {
   @Test
   public void testCreateGenerator() throws Exception {
 
-    EbeanServer server = Ebean.getDefaultServer();
-
     StringWriter writer = new StringWriter();
-    JsonContext json = server.json();
+    JsonContext json = DB.json();
     JsonGenerator generator = json.createGenerator(writer);
 
     Customer customer = new Customer();
@@ -198,10 +195,8 @@ public class JsonContextTest {
   @Test
   public void testCreateGenerator_writeRaw() throws Exception {
 
-    EbeanServer server = Ebean.getDefaultServer();
-
     StringWriter writer = new StringWriter();
-    JsonContext json = server.json();
+    JsonContext json = DB.json();
     JsonGenerator generator = json.createGenerator(writer);
 
     // test that we can write anything via writeRaw()
diff --git a/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java
index a62ba120c..14a87348e 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java
@@ -2,14 +2,14 @@ package io.ebeaninternal.dbmigration.model.build;
 
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.config.DbConstraintNaming;
+import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.DefaultConstraintMaxLength;
 import io.ebeaninternal.dbmigration.model.MColumn;
 import io.ebeaninternal.dbmigration.model.MTable;
 import io.ebeaninternal.dbmigration.model.ModelContainer;
 import io.ebeaninternal.dbmigration.model.visitor.VisitAllUsing;
-import io.ebeaninternal.api.SpiEbeanServer;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -19,7 +19,7 @@ public class ModelBuildBeanVisitorTest extends BaseTestCase {
   @Test
   public void test() {
 
-    SpiEbeanServer defaultServer = (SpiEbeanServer) Ebean.getDefaultServer();
+    SpiEbeanServer defaultServer = (SpiEbeanServer) DB.getDefault();
 
     ModelContainer model = new ModelContainer();
 
diff --git a/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java b/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java
index f0dcbd69d..06ffb49f0 100644
--- a/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java
+++ b/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java
@@ -1,28 +1,27 @@
 package io.ebeaninternal.server.transaction;
 
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.Transaction;
 import io.ebean.cache.ServerCache;
 import io.ebean.cache.ServerCacheManager;
+import org.junit.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.EBasic;
-import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class JdbcTransactionTest {
 
   @Test
-  public void isSkipCache() throws Exception {
+  public void isSkipCache() {
 
-    Transaction transaction = Ebean.beginTransaction();
-    try {
+    try (Transaction transaction = DB.beginTransaction()) {
       // implicitly skip false due to query only at this point
       assertThat(transaction.isSkipCache()).isFalse();
 
       EBasic basic = new EBasic("b1");
-      Ebean.save(basic);
+      DB.save(basic);
 
       // implicitly skip true due to save
       assertThat(transaction.isSkipCache()).isTrue();
@@ -35,42 +34,35 @@ public class JdbcTransactionTest {
 
       transaction.setSkipCache(true);
       assertThat(transaction.isSkipCache()).isTrue();
-
-    } finally {
-      transaction.end();
     }
   }
 
   @Test
-  public void skipCacheAfterSave() throws Exception {
+  public void skipCacheAfterSave() {
 
-    ServerCacheManager cacheManager = Ebean.getDefaultServer().getServerCacheManager();
+    ServerCacheManager cacheManager = DB.getDefault().getServerCacheManager();
     ServerCache customerBeanCache = cacheManager.getBeanCache(Customer.class);
     ServerCache contactNatKeyCache = cacheManager.getNaturalKeyCache(Contact.class);
 
-    Transaction transaction = Ebean.beginTransaction();
-    try {
+    try (Transaction transaction = DB.beginTransaction()) {
       customerBeanCache.getStatistics(true);
       contactNatKeyCache.getStatistics(true);
 
       Customer.find.byId(19898989);
-      Ebean.find(Contact.class).where().eq("email", "junk@foo.com").findOne();
+      DB.find(Contact.class).where().eq("email", "junk@foo.com").findOne();
 
       assertThat(customerBeanCache.getStatistics(true).getMissCount()).isEqualTo(1);
       assertThat(contactNatKeyCache.getStatistics(true).getMissCount()).isEqualTo(1);
 
       EBasic basic = new EBasic("b1");
-      Ebean.save(basic);
+      DB.save(basic);
 
       // these don't hit L2 cache due to the save of b1
       Customer.find.byId(29898989);
-      Ebean.find(Contact.class).where().eq("email", "junk2@foo.com").findOne();
+      DB.find(Contact.class).where().eq("email", "junk2@foo.com").findOne();
 
       assertThat(customerBeanCache.getStatistics(true).getMissCount()).isEqualTo(0);
       assertThat(contactNatKeyCache.getStatistics(true).getMissCount()).isEqualTo(0);
-
-    } finally {
-      transaction.end();
     }
   }
 

From b751823abb27bd3ececf3aa8393720902aec2c7e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 1 Feb 2019 23:20:53 +1300
Subject: [PATCH 0699/1036] #1624 - ENH: Create io.ebean.DB as alias for Ebean
 and io.ebean.Database as alias for EbeanServer

Adjust Model and Finder to use DB and Database
---
 src/main/java/io/ebean/Finder.java | 25 ++++++++++-----------
 src/main/java/io/ebean/Model.java  | 36 +++++++++++++-----------------
 2 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/src/main/java/io/ebean/Finder.java b/src/main/java/io/ebean/Finder.java
index bcba9667a..42d5b3910 100644
--- a/src/main/java/io/ebean/Finder.java
+++ b/src/main/java/io/ebean/Finder.java
@@ -2,7 +2,6 @@ package io.ebean;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
 import java.util.List;
 
 /**
@@ -112,26 +111,26 @@ public class Finder<I, T> {
    * <p>
    * This provides full access to the API such as explicit transaction demarcation etc.
    */
-  public EbeanServer db() {
-    return Ebean.getServer(serverName);
+  public Database db() {
+    return DB.byName(serverName);
   }
 
   /**
-   * Return typically a different EbeanServer to the default.
+   * Return typically a different Database to the default.
    * <p>
-   * This is equivalent to {@link Ebean#getServer(String)}
+   * This is equivalent to {@link DB#byName(String)}
    *
-   * @param server The name of the EbeanServer. If this is null then the default EbeanServer is
+   * @param server The name of the Database. If this is null then the default EbeanServer is
    *               returned.
    */
-  public EbeanServer db(String server) {
-    return Ebean.getServer(server);
+  public Database db(String server) {
+    return DB.byName(server);
   }
 
   /**
    * Creates an entity reference for this ID.
    * <p>
-   * Equivalent to {@link EbeanServer#getReference(Class, Object)}
+   * Equivalent to {@link Database#getReference(Class, Object)}
    */
   @Nonnull
   public T ref(I id) {
@@ -141,7 +140,7 @@ public class Finder<I, T> {
   /**
    * Retrieves an entity by ID.
    * <p>
-   * Equivalent to {@link EbeanServer#find(Class, Object)}
+   * Equivalent to {@link Database#find(Class, Object)}
    */
   @Nullable
   public T byId(I id) {
@@ -151,7 +150,7 @@ public class Finder<I, T> {
   /**
    * Delete a bean by Id.
    * <p>
-   * Equivalent to {@link EbeanServer#delete(Class, Object)}
+   * Equivalent to {@link Database#delete(Class, Object)}
    */
   public void deleteById(I id) {
     db().delete(type, id);
@@ -181,7 +180,7 @@ public class Finder<I, T> {
    * }</pre>
    *
    * <p>
-   * Equivalent to {@link EbeanServer#update(Class)}
+   * Equivalent to {@link Database#update(Class)}
    */
   public UpdateQuery<T> update() {
     return db().update(type);
@@ -190,7 +189,7 @@ public class Finder<I, T> {
   /**
    * Creates a query.
    * <p>
-   * Equivalent to {@link EbeanServer#find(Class)}
+   * Equivalent to {@link Database#find(Class)}
    */
   public Query<T> query() {
     return db().find(type);
diff --git a/src/main/java/io/ebean/Model.java b/src/main/java/io/ebean/Model.java
index f00409aa6..80cfd3aec 100644
--- a/src/main/java/io/ebean/Model.java
+++ b/src/main/java/io/ebean/Model.java
@@ -76,15 +76,14 @@ import io.ebean.bean.EntityBean;
 public abstract class Model {
 
   /**
-   * Return the underlying 'default' EbeanServer.
+   * Return the underlying 'default' Database.
    * <p>
    * This provides full access to the API such as explicit transaction demarcation etc.
    * <p>
    * Example:
    * <pre>{@code
    *
-   * Transaction transaction = Customer.db().beginTransaction();
-   * try {
+   * try (Transaction transaction = Customer.db().beginTransaction()) {
    *
    *   // turn off cascade persist for this transaction
    *   transaction.setPersistCascade(false);
@@ -104,26 +103,21 @@ public abstract class Model {
    *
    *   transaction.commit();
    *
-   * } finally {
-   *   transaction.end();
    * }
    *
    * }</pre>
    */
-  public static EbeanServer db() {
-    return Ebean.getDefaultServer();
+  public static Database db() {
+    return DB.getDefault();
   }
 
   /**
-   * Return a named EbeanServer that is typically different to the default server.
-   * <p>
-   * If you are using multiple databases then each database has a name and maps to a single
-   * EbeanServer. You can use this method to get an EbeanServer for another database.
+   * Return a named Database that is typically different to the default database.
    *
-   * @param server The name of the EbeanServer. If this is null then the default EbeanServer is returned.
+   * @param server The name of the Database. If this is null then the default Database is returned.
    */
-  public static EbeanServer db(String server) {
-    return Ebean.getServer(server);
+  public static Database db(String server) {
+    return DB.byName(server);
   }
 
   /**
@@ -146,7 +140,7 @@ public abstract class Model {
    *
    * }</pre>
    *
-   * @see EbeanServer#markAsDirty(Object)
+   * @see Database#markAsDirty(Object)
    */
   public void markAsDirty() {
     db().markAsDirty(this);
@@ -182,7 +176,7 @@ public abstract class Model {
    * Ebean will detect if this is a new bean or a previously fetched bean and perform either an
    * insert or an update based on that.
    *
-   * @see EbeanServer#save(Object)
+   * @see Database#save(Object)
    */
   public void save() {
     db().save(this);
@@ -202,7 +196,7 @@ public abstract class Model {
   /**
    * Update this entity.
    *
-   * @see EbeanServer#update(Object)
+   * @see Database#update(Object)
    */
   public void update() {
     db().update(this);
@@ -211,7 +205,7 @@ public abstract class Model {
   /**
    * Insert this entity.
    *
-   * @see EbeanServer#insert(Object)
+   * @see Database#insert(Object)
    */
   public void insert() {
     db().insert(this);
@@ -232,7 +226,7 @@ public abstract class Model {
    * deleted. Note that, if JDBC batch mode is used then this always returns true.
    * </p>
    *
-   * @see EbeanServer#delete(Object)
+   * @see Database#delete(Object)
    */
   public boolean delete() {
     return db().delete(this);
@@ -245,7 +239,7 @@ public abstract class Model {
    * want to perform a hard/permanent delete.
    * </p>
    *
-   * @see EbeanServer#deletePermanent(Object)
+   * @see Database#deletePermanent(Object)
    */
   public boolean deletePermanent() {
     return db().deletePermanent(this);
@@ -275,7 +269,7 @@ public abstract class Model {
   /**
    * Refreshes this entity from the database.
    *
-   * @see EbeanServer#refresh(Object)
+   * @see Database#refresh(Object)
    */
   public void refresh() {
     db().refresh(this);

From a24e6b60648113fddfd03781c32002d901194c97 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 2 Feb 2019 00:40:56 +1300
Subject: [PATCH 0700/1036] #1623 - DbOrderByTrim doesn't remove asc/desc if
 you're sorting by a function called on a column

This fix removes the word boundary check prior to the blank space for asc and desc (allowing the preceeding char to be a brace or anything)
---
 .../server/query/DbOrderByTrim.java           |  2 +-
 .../server/query/DbOrderByTrimTest.java       | 66 +++++++++++++++++++
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java

diff --git a/src/main/java/io/ebeaninternal/server/query/DbOrderByTrim.java b/src/main/java/io/ebeaninternal/server/query/DbOrderByTrim.java
index 5865da349..766be909b 100644
--- a/src/main/java/io/ebeaninternal/server/query/DbOrderByTrim.java
+++ b/src/main/java/io/ebeaninternal/server/query/DbOrderByTrim.java
@@ -4,7 +4,7 @@ import java.util.regex.Pattern;
 
 class DbOrderByTrim {
 
-  private static final Pattern orderByTrim = Pattern.compile("(?i)\\b asc\\b|\\b desc\\b|\\b nulls first\\b|\\b nulls last\\b");
+  private static final Pattern orderByTrim = Pattern.compile("(?i) asc\\b| desc\\b|\\b nulls first\\b|\\b nulls last\\b");
 
   /**
    * Convert the dbOrderBy clause to be safe for adding to select or distinct on.
diff --git a/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java b/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java
new file mode 100644
index 000000000..d515f6a71
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java
@@ -0,0 +1,66 @@
+package io.ebeaninternal.server.query;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class DbOrderByTrimTest {
+
+  @Test
+  public void trim() {
+
+    String[] tests = {"foo", "bar", "a b c", "some_", "some()", "some'g'", "some('sd')", "some(a.b, '<s d>')"};
+    for (String value : tests) {
+      test(value, " desc");
+    }
+    for (String value : tests) {
+      test(value, " asc");
+    }
+  }
+
+  private void test(String value, String suffix) {
+    assertEquals(value, DbOrderByTrim.trim(value + suffix));
+  }
+
+  @Test
+  public void test_when_pgp_sym_decrypt() {
+    assertEquals("pgp_sym_decrypt(t0.columnName, '<encryption key>')", DbOrderByTrim.trim("pgp_sym_decrypt(t0.columnName, '<encryption key>') desc"));
+  }
+
+  @Test
+  public void trim_doubleSpace() {
+    assertEquals("foo  bar", DbOrderByTrim.trim("foo  desc bar"));
+  }
+
+  @Test
+  public void trim_description() {
+    assertEquals("foo description", DbOrderByTrim.trim("foo description"));
+    assertEquals("foo ription", DbOrderByTrim.trim("foo desc ription"));
+  }
+
+  @Test
+  public void trim_asc1() {
+    assertEquals("foo asc1", DbOrderByTrim.trim("foo asc1"));
+    assertEquals("foo 1", DbOrderByTrim.trim("foo asc 1"));
+  }
+
+  @Test
+  public void trim_various() {
+    assertEquals("foo bar", DbOrderByTrim.trim("foo asc desc bar"));
+    assertEquals("foo bar", DbOrderByTrim.trim("foo desc asc desc asc asc bar"));
+
+    assertEquals("foo", DbOrderByTrim.trim("foo DESC"));
+    assertEquals("foo ", DbOrderByTrim.trim("foo DESC "));
+    assertEquals("foo", DbOrderByTrim.trim("foo ASC"));
+    assertEquals("foo ", DbOrderByTrim.trim("foo ASC "));
+  }
+
+  @Test
+  public void trim_nulls() {
+    assertEquals("foo", DbOrderByTrim.trim("foo nulls first asc"));
+    assertEquals("foo", DbOrderByTrim.trim("foo nulls last desc"));
+    assertEquals("foo", DbOrderByTrim.trim("foo asc nulls first"));
+    assertEquals("foo", DbOrderByTrim.trim("foo desc nulls last"));
+  }
+
+}

From b814ca6e81fdcce3b903987eb11cfdcc0f747a72 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 2 Feb 2019 17:37:21 +1300
Subject: [PATCH 0701/1036] Bump ebean-migration to 11.14.1 with logging
 improvement

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a722a73b1..08489f5e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>11.13.1</version>
+      <version>11.14.1</version>
     </dependency>
 
     <dependency>

From 5cef1ad017af2f115a7f95934adfa6eb66f73f36 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 2 Feb 2019 20:16:05 +1300
Subject: [PATCH 0702/1036] #1625 - Populate UUID via database column default
 value / impossible to disable automatic generation for @Id fields of type
 UUID.

---
 .../ebeaninternal/server/deploy/parse/AnnotationParser.java | 2 +-
 .../server/deploy/parse/ReadAnnotationConfig.java           | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
index e8b489a23..a7ca30444 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
@@ -68,7 +68,7 @@ public abstract class AnnotationParser extends AnnotationBase {
     } else {
       prop.setId();
       if (prop.getPropertyType().equals(UUID.class)) {
-        if (descriptor.getIdGeneratorName() == null) {
+        if (readConfig.isIdGeneratorAutomatic() && descriptor.getIdGeneratorName() == null) {
           descriptor.setUuidGenerator();
         }
       }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java b/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java
index 4b3bf96d0..545bcab0c 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java
@@ -15,6 +15,7 @@ class ReadAnnotationConfig {
   private final boolean eagerFetchLobs;
   private final boolean javaxValidationAnnotations;
   private final boolean jacksonAnnotations;
+  private final boolean idGeneratorAutomatic;
 
   ReadAnnotationConfig(GeneratedPropertyFactory generatedPropFactory, String asOfViewSuffix, String versionsBetweenSuffix, ServerConfig serverConfig) {
 
@@ -23,6 +24,7 @@ class ReadAnnotationConfig {
     this.versionsBetweenSuffix = versionsBetweenSuffix;
     this.disableL2Cache = serverConfig.isDisableL2Cache();
     this.eagerFetchLobs = serverConfig.isEagerFetchLobs();
+    this.idGeneratorAutomatic = serverConfig.isIdGeneratorAutomatic();
 
     this.javaxValidationAnnotations = generatedPropFactory.getClassLoadConfig().isJavaxValidationAnnotationsPresent();
     this.jacksonAnnotations = generatedPropFactory.getClassLoadConfig().isJacksonAnnotationsPresent();
@@ -48,6 +50,10 @@ class ReadAnnotationConfig {
     return eagerFetchLobs;
   }
 
+  public boolean isIdGeneratorAutomatic() {
+    return idGeneratorAutomatic;
+  }
+
   boolean isJavaxValidationAnnotations() {
     return javaxValidationAnnotations;
   }

From 961a7ef7ead297d0c443d7d03552ee336a5f8e5f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 2 Feb 2019 22:17:07 +1300
Subject: [PATCH 0703/1036] #1626 - ENH: Add SqlUpdate.setParams(Object ... )
 and SqlQuery.setParams(Object ... ) ... as convenient alternative to many
 setParameter() calls

---
 src/main/java/io/ebean/SqlQuery.java          | 25 +++++++++++++++++
 src/main/java/io/ebean/SqlUpdate.java         | 27 +++++++++++++++++++
 .../server/core/DefaultSqlUpdate.java         |  8 ++++++
 .../querydefn/DefaultRelationalQuery.java     | 13 +++++++++
 .../tests/update/TestSqlUpdateExceptions.java | 18 +++++++++++++
 5 files changed, 91 insertions(+)

diff --git a/src/main/java/io/ebean/SqlQuery.java b/src/main/java/io/ebean/SqlQuery.java
index d5a71f232..1c4e6e680 100644
--- a/src/main/java/io/ebean/SqlQuery.java
+++ b/src/main/java/io/ebean/SqlQuery.java
@@ -195,6 +195,31 @@ public interface SqlQuery extends Serializable {
    */
   SqlQuery setParameter(String name, Object value);
 
+  /**
+   * Set one of more positioned parameters.
+   * <p>
+   * This is a convenient alternative to multiple calls setParameter().
+   *
+   * <pre>{@code
+   *
+   *   String sql = "select id, name from customer where name like ? and status = ?";
+   *
+   *   Ebean.createSqlQuery(sql)
+   *       .setParams("Rob", Status.NEW)
+   *       .findList();
+   *
+   *
+   *   // is the same as ...
+   *
+   *   Ebean.createSqlQuery(sql)
+   *       .setParameter(1, "Rob")
+   *       .setParameter(2, "Status.NEW)
+   *       .findList();
+   *
+   * }</pre>
+   */
+  SqlQuery setParams(Object... values);
+
   /**
    * The same as bind for positioned parameters.
    */
diff --git a/src/main/java/io/ebean/SqlUpdate.java b/src/main/java/io/ebean/SqlUpdate.java
index 27e7be39e..bd104c344 100644
--- a/src/main/java/io/ebean/SqlUpdate.java
+++ b/src/main/java/io/ebean/SqlUpdate.java
@@ -217,6 +217,33 @@ public interface SqlUpdate {
    */
   SqlUpdate setTimeout(int secs);
 
+  /**
+   * Set one of more positioned parameters.
+   * <p>
+   * This is a convenient alternative to multiple calls setParameter().
+   *
+   * <pre>{@code
+   *
+   *   String sql = "insert into audit_log (id, name, version) values (?,?,?)";
+   *
+   *   Ebean.createSqlUpdate(sql)
+   *       .setParams(UUID.randomUUID(), "Hello", 1)
+   *       .executeNow();
+   *
+   *
+   *   // is the same as ...
+   *
+   *   Ebean.createSqlUpdate(sql)
+   *       .setParameter(1, UUID.randomUUID())
+   *       .setParameter(2, "Hello")
+   *       .setParameter(3, 1)
+   *       .executeNow();
+   *
+   * }</pre>
+   *
+   */
+  SqlUpdate setParams(Object... values);
+
   /**
    * Set the next positioned parameter.
    *
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java b/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
index 9af2f2af4..7b028fa2b 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
@@ -239,6 +239,14 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
     return this;
   }
 
+  @Override
+  public SqlUpdate setParams(Object... values) {
+    for (Object value : values) {
+      setParameter(++addPos, value);
+    }
+    return this;
+  }
+
   @Override
   public SqlUpdate setNextParameter(Object value) {
     setParameter(++addPos, value);
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
index db4948bcb..5dfcd4398 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
@@ -34,6 +34,11 @@ public class DefaultRelationalQuery implements SpiSqlQuery {
 
   private int bufferFetchSizeHint;
 
+  /**
+   * Helper to add positioned parameters in order.
+   */
+  private int addPos;
+
   /**
    * Bind parameters when using the query language.
    */
@@ -107,6 +112,14 @@ public class DefaultRelationalQuery implements SpiSqlQuery {
     return Optional.ofNullable(findOne());
   }
 
+  @Override
+  public DefaultRelationalQuery setParams(Object... values) {
+    for (Object value : values) {
+      setParameter(++addPos, value);
+    }
+    return this;
+  }
+
   @Override
   public DefaultRelationalQuery setParameter(int position, Object value) {
     bindParams.setParameter(position, value);
diff --git a/src/test/java/org/tests/update/TestSqlUpdateExceptions.java b/src/test/java/org/tests/update/TestSqlUpdateExceptions.java
index 7296811f2..466b1154a 100644
--- a/src/test/java/org/tests/update/TestSqlUpdateExceptions.java
+++ b/src/test/java/org/tests/update/TestSqlUpdateExceptions.java
@@ -9,10 +9,28 @@ import org.junit.Test;
 
 import java.util.UUID;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class TestSqlUpdateExceptions extends BaseTestCase {
 
   private String sql = "insert into uuone (id, name, version) values (?,?,?)";
 
+  @Test
+  public void simpleInsert() {
+
+    UUID id = UUID.randomUUID();
+
+    Ebean.createSqlUpdate(sql)
+      .setParams(id, "hi", 1)
+      .executeNow();
+
+    UUID foundId = Ebean.createSqlQuery("select id from uuone where id = ?")
+      .setParams(id)
+      .findSingleAttribute(UUID.class);
+
+    assertThat(foundId).isEqualTo(id);
+  }
+
   @Test(expected = DuplicateKeyException.class)
   public void duplicateKey() {
 

From 448d94a335a66cb0a4660089ab97cec88a0485c9 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 2 Feb 2019 22:28:47 +1300
Subject: [PATCH 0704/1036] [maven-release-plugin] prepare release
 ebean-11.33.3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 08489f5e0..025f9219c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.33.3-SNAPSHOT</version>
+  <version>11.33.3</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.33.3</tag>
   </scm>
 
   <profiles>

From 7026c00290e5cb9a6932210f0eb7049fda9f5f6c Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 2 Feb 2019 22:29:02 +1300
Subject: [PATCH 0705/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 025f9219c..b8d258e55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.33.3</version>
+  <version>11.33.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.33.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 99f7243d6c40b6e5fe221ac72584e883b37bae12 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 3 Feb 2019 22:14:25 +1300
Subject: [PATCH 0706/1036] #1627 - Bump ebean-datasource to 4.3.4

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b8d258e55..74b779a16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-datasource</artifactId>
-      <version>4.3.3</version>
+      <version>4.3.4</version>
     </dependency>
 
     <dependency>

From 5a4a0e3886c2f61d70fac193f30e6285073abc67 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 3 Feb 2019 22:39:23 +1300
Subject: [PATCH 0707/1036] Bump version to 11.34.1-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 74b779a16..b505f45c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.33.4-SNAPSHOT</version>
+  <version>11.34.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>

From 6a7e6caa66084edf076c036632cea6087e76d4de Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Sun, 3 Feb 2019 21:20:09 +0100
Subject: [PATCH 0708/1036] Test fixes (#1628)

* FIX: mysql index sizes

* FIX: osolete whitespace in sqlserver tests

* Updated mssql-jdbc, this fixes problems in the batch insert (https://github.com/Microsoft/mssql-jdbc/pull/912)

* fix tablename  (reserved word in mariadb)

* ignored failing tests for sqlserver
---
 pom.xml                                                       | 2 +-
 src/test/java/io/ebean/DtoQueryFromOrmTest.java               | 4 ++--
 .../java/io/ebeaninternal/server/grammer/EqlParserTest.java   | 2 ++
 src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java | 1 +
 .../java/org/tests/cache/personinfo/PersonCacheEmail.java     | 2 ++
 src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java | 2 ++
 .../org/tests/model/onetoone/TestOneToOneOrphanRemove.java    | 4 ++++
 src/test/java/org/tests/query/cache/Position.java             | 2 ++
 8 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index b505f45c5..5fc6b029f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -259,7 +259,7 @@
     <dependency>
       <groupId>com.microsoft.sqlserver</groupId>
       <artifactId>mssql-jdbc</artifactId>
-      <version>6.4.0.jre8</version>
+      <version>7.2.0.jre8</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
index c5dca5d7e..0e30ded30 100644
--- a/src/test/java/io/ebean/DtoQueryFromOrmTest.java
+++ b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
@@ -143,7 +143,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     if (isSqlServer()) {
       assertThat(sql.get(0)).contains("select top 10 t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
-          + " fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+          + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
 
     } else {
       assertThat(sql.get(0)).contains("select t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
@@ -175,7 +175,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     if (isSqlServer()) {
       assertThat(sql.get(0)).contains("select top 10 t0.id, t0.email, "
           + concat("t0.last_name", ", ", "t0.first_name")
-          + " fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+          + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
     } else {
       assertThat(sql.get(0)).contains("select t0.id, t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
           + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
diff --git a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
index 4be7f66f8..2360772af 100644
--- a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
@@ -364,6 +364,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
+  @IgnorePlatform(Platform.SQLSERVER)
   public void selectFetchFetchLimit() {
 
     Query<Customer> query = parse("select name fetch billingAddress (line1, city) fetch shippingAddress (line1) limit 10");
@@ -392,6 +393,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
+  @IgnorePlatform(Platform.SQLSERVER)
   public void selectFetchFetchManyPropertiesLimit() {
 
     ResetBasicData.reset();
diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
index e9dcfb629..64d0364d1 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
@@ -203,6 +203,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
   }
 
   @Test
+  @IgnorePlatform(Platform.SQLSERVER)
   public void noflushWhenIdIsLoaded() {
 
     EbeanServer server = Ebean.getDefaultServer();
diff --git a/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java b/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java
index fb6a7d147..e78463fe9 100644
--- a/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java
+++ b/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java
@@ -5,12 +5,14 @@ import io.ebean.annotation.Cache;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
+import javax.validation.constraints.Size;
 
 @Entity
 @Cache
 public class PersonCacheEmail {
 
   @Id
+  @Size(max=128)
   private String id;
 
   @ManyToOne
diff --git a/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java b/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java
index cd5325163..bc24ce960 100644
--- a/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java
+++ b/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java
@@ -4,12 +4,14 @@ import io.ebean.annotation.Cache;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.validation.constraints.Size;
 
 @Entity
 @Cache
 public class PersonCacheInfo {
 
   @Id
+  @Size(max=128)
   private String personId;
 
   private String name;
diff --git a/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java b/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java
index e0f3ed0f4..f6c2d340e 100644
--- a/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java
+++ b/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java
@@ -2,6 +2,9 @@ package org.tests.model.onetoone;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.annotation.IgnorePlatform;
+import io.ebean.annotation.Platform;
+
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -12,6 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class TestOneToOneOrphanRemove extends BaseTestCase {
 
   @Test
+  @IgnorePlatform(Platform.SQLSERVER)
   public void base() {
 
     OtoCust jack = new OtoCust("Jack");
diff --git a/src/test/java/org/tests/query/cache/Position.java b/src/test/java/org/tests/query/cache/Position.java
index 0e98ae65d..3d1060fd4 100644
--- a/src/test/java/org/tests/query/cache/Position.java
+++ b/src/test/java/org/tests/query/cache/Position.java
@@ -4,8 +4,10 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 @Entity
+@Table(name = "e_position")
 public class Position {
 	@Id
 	@GeneratedValue

From 9e33f3680824d536a7317b1ad736b7407fac36d4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 4 Feb 2019 11:14:54 +1300
Subject: [PATCH 0709/1036] #1629 - ENH: Add sqlQuery(sql) and sqlUpdate(sql)
 ... as alias for createSqlQuery(sql) and createSqlUpdate(sql)

---
 src/main/java/io/ebean/DB.java                | 36 +++++++++++---
 src/main/java/io/ebean/Database.java          | 26 ++++++++--
 src/main/java/io/ebean/SqlQuery.java          | 49 +++++++++----------
 src/main/java/io/ebean/SqlUpdate.java         | 42 ++++++++++------
 src/test/java/io/ebean/DtoQueryTest.java      |  2 +-
 .../dbmigration/DbMigrationTest.java          | 12 ++---
 .../server/type/TestBinaryUUID.java           | 18 +++----
 .../java/org/tests/basic/TestM2MVanilla.java  | 47 ++++++++----------
 .../tests/basic/TestOrderTotalAmountSql.java  |  6 +--
 .../org/tests/basic/encrypt/TestEncrypt.java  | 27 +++++-----
 .../basic/encrypt/TestEncryptBinary.java      | 19 ++++---
 .../basic/type/TestEnumValueAnnotation.java   | 33 ++++++-------
 12 files changed, 177 insertions(+), 140 deletions(-)

diff --git a/src/main/java/io/ebean/DB.java b/src/main/java/io/ebean/DB.java
index 9583861ca..03822a79f 100644
--- a/src/main/java/io/ebean/DB.java
+++ b/src/main/java/io/ebean/DB.java
@@ -702,29 +702,49 @@ public class DB {
   }
 
   /**
-   * Create a SqlQuery for executing native sql
-   * query statements.
+   * Look to execute a native sql query that does not returns beans but instead
+   * returns SqlRow or direct access to ResultSet (see {@link SqlQuery#findList(RowMapper)}.
+   *
    * <p>
-   * Note that you can use raw SQL with entity beans, refer to the SqlSelect
-   * annotation for examples.
+   * Refer to {@link DtoQuery} for native sql queries returning DTO beans.
+   * </p>
+   * <p>
+   * Refer to {@link #findNative(Class, String)} for native sql queries returning entity beans.
    * </p>
    */
-  public static SqlQuery createSqlQuery(String sql) {
-    return getDefault().createSqlQuery(sql);
+  public static SqlQuery sqlQuery(String sql) {
+    return getDefault().sqlQuery(sql);
   }
 
   /**
-   * Create a sql update for executing native dml statements.
+   * This is an alias for {@link #sqlQuery(String)}.
+   */
+  public static SqlQuery createSqlQuery(String sql) {
+    return sqlQuery(sql);
+  }
+
+  /**
+   * Look to execute a native sql insert update or delete statement.
    * <p>
    * Use this to execute a Insert Update or Delete statement. The statement will
    * be native to the database and contain database table and column names.
    * </p>
+   *
    * <p>
    * See {@link SqlUpdate} for example usage.
    * </p>
+   *
+   * @return The SqlUpdate instance to set parameters and execute
+   */
+  public static SqlUpdate sqlUpdate(String sql) {
+    return getDefault().sqlUpdate(sql);
+  }
+
+  /**
+   * This is an alias for {@link #sqlUpdate(String)}.
    */
   public static SqlUpdate createSqlUpdate(String sql) {
-    return getDefault().createSqlUpdate(sql);
+    return sqlUpdate(sql);
   }
 
   /**
diff --git a/src/main/java/io/ebean/Database.java b/src/main/java/io/ebean/Database.java
index 81e1d56d4..8a7b3a9f4 100644
--- a/src/main/java/io/ebean/Database.java
+++ b/src/main/java/io/ebean/Database.java
@@ -452,24 +452,40 @@ public interface Database {
   <T> DtoQuery<T> createNamedDtoQuery(Class<T> dtoType, String namedQuery);
 
   /**
-   * Create a SqlQuery for executing native sql
-   * query statements.
+   * Look to execute a native sql query that does not returns beans but instead
+   * returns SqlRow or direct access to ResultSet (see {@link SqlQuery#findList(RowMapper)}.
+   *
    * <p>
-   * Note that you can use raw SQL with entity beans, refer to the SqlSelect
-   * annotation for examples.
+   * Refer to {@link DtoQuery} for native sql queries returning DTO beans.
    * </p>
+   * <p>
+   * Refer to {@link #findNative(Class, String)} for native sql queries returning entity beans.
+   * </p>
+   */
+  SqlQuery sqlQuery(String sql);
+
+  /**
+   * This is an alias for {@link #sqlQuery(String)}.
    */
   SqlQuery createSqlQuery(String sql);
 
   /**
-   * Create a sql update for executing native dml statements.
+   * Look to execute a native sql insert update or delete statement.
    * <p>
    * Use this to execute a Insert Update or Delete statement. The statement will
    * be native to the database and contain database table and column names.
    * </p>
+   *
    * <p>
    * See {@link SqlUpdate} for example usage.
    * </p>
+   *
+   * @return The SqlUpdate instance to set parameters and execute
+   */
+  SqlUpdate sqlUpdate(String sql);
+
+  /**
+   * This is an alias for {@link #sqlUpdate(String)}.
    */
   SqlUpdate createSqlUpdate(String sql);
 
diff --git a/src/main/java/io/ebean/SqlQuery.java b/src/main/java/io/ebean/SqlQuery.java
index 1c4e6e680..a35ef7eb4 100644
--- a/src/main/java/io/ebean/SqlQuery.java
+++ b/src/main/java/io/ebean/SqlQuery.java
@@ -10,34 +10,30 @@ import java.util.function.Consumer;
 import java.util.function.Predicate;
 
 /**
- * Query object for performing native SQL queries that return SqlRow's.
- * <p>
- * Firstly note that you can use your own sql queries with <em>entity beans</em>
- * by using the SqlSelect annotation. This should be your first approach when
- * wanting to use your own SQL queries.
- * </p>
- * <p>
- * If ORM Mapping is too tight and constraining for your problem then SqlQuery
- * could be a good approach.
- * </p>
+ * Query object for performing native SQL queries that return SqlRow or directly read
+ * ResultSet using a RowMapper.
  * <p>
  * The returned SqlRow objects are similar to a LinkedHashMap with some type
  * conversion support added.
  * </p>
  * <p>
+ * Refer to {@link DtoQuery} for native sql queries returning DTO beans.
+ * </p>
+ * <p>
+ * Refer to {@link Database#findNative(Class, String)} for native sql queries returning entity beans.
+ * </p>
+ *
  * <pre>{@code
  *
- *   // its typically a good idea to use a named query
- *   // and put the sql in the orm.xml instead of in your code
+ *   // example using named parameters
  *
  *   String sql = "select id, name from customer where name like :name and status_code = :status";
  *
- *   SqlQuery sqlQuery = Ebean.createSqlQuery(sql);
- *   sqlQuery.setParameter("name", "Acme%");
- *   sqlQuery.setParameter("status", "ACTIVE");
- *
- *   // execute the query returning a List of MapBean objects
- *   List<SqlRow> list = sqlQuery.findList();
+ *   List<SqlRow> list =
+ *     DB.sqlQuery(sql)
+ *       .setParameter("name", "Acme%")
+ *       .setParameter("status", "ACTIVE")
+ *       .findList();
  *
  * }</pre>
  */
@@ -104,7 +100,7 @@ public interface SqlQuery extends Serializable {
    *
    *  String sql = "select id, name, status from customer order by name desc";
    *
-   *  Ebean.createSqlQuery(sql)
+   *  DB.sqlQuery(sql)
    *    .findEachRow((resultSet, rowNum) -> {
    *
    *      // read directly from ResultSet
@@ -134,7 +130,7 @@ public interface SqlQuery extends Serializable {
    *
    *   String sql = "select max(unit_price) from o_order_detail where order_qty > ?";
    *
-   *   BigDecimal maxPrice = Ebean.createSqlQuery(sql)
+   *   BigDecimal maxPrice = DB.sqlQuery(sql)
    *     .setParameter(1, 2)
    *     .findSingleAttribute(BigDecimal.class);
    *
@@ -176,9 +172,10 @@ public interface SqlQuery extends Serializable {
    *   " order by (unit_price * order_qty) desc";
    *
    *   //
-   *   List<BigDecimal> lineAmounts = Ebean.createSqlQuery(sql)
-   *     .setParameter(1, 3)
-   *     .findSingleAttributeList(BigDecimal.class);
+   *   List<BigDecimal> lineAmounts =
+   *     DB.sqlQuery(sql)
+   *       .setParameter(1, 3)
+   *       .findSingleAttributeList(BigDecimal.class);
    *
    * }</pre>
    *
@@ -204,14 +201,16 @@ public interface SqlQuery extends Serializable {
    *
    *   String sql = "select id, name from customer where name like ? and status = ?";
    *
-   *   Ebean.createSqlQuery(sql)
+   *   List<SqlRow> list =
+   *     DB.sqlQuery(sql)
    *       .setParams("Rob", Status.NEW)
    *       .findList();
    *
    *
    *   // is the same as ...
    *
-   *   Ebean.createSqlQuery(sql)
+   *   List<SqlRow> list =
+   *     DB.sqlQuery(sql)
    *       .setParameter(1, "Rob")
    *       .setParameter(2, "Status.NEW)
    *       .findList();
diff --git a/src/main/java/io/ebean/SqlUpdate.java b/src/main/java/io/ebean/SqlUpdate.java
index bd104c344..392d6f09f 100644
--- a/src/main/java/io/ebean/SqlUpdate.java
+++ b/src/main/java/io/ebean/SqlUpdate.java
@@ -16,20 +16,33 @@ package io.ebean;
  * notify Ebean of external changes and enable Ebean to maintain it's "L2"
  * server cache.
  * </p>
- * <p>
+ *
  * <pre>{@code
  *
- *   // example that uses 'named' parameters
+ *   // example using 'positioned' parameters
  *
- *   String s = "UPDATE f_topic set post_count = :count where id = :id";
+ *   String sql = "insert into audit_log (group, title, description) values (?, ?, ?);
  *
- *   SqlUpdate update = Ebean.createSqlUpdate(s);
- *   update.setParameter("id", 1);
- *   update.setParameter("count", 50);
+ *   int rows =
+ *     DB.sqlUpdate(sql)
+ *       .setParams("login", "new user", "user rob was created")
+ *       .executeNow();
  *
- *   int modifiedCount = update.execute();
+ * }</pre>
  *
- *   String msg = "There were " + modifiedCount + " rows updated";
+ * <pre>{@code
+ *
+ *   // example using 'named' parameters
+ *
+ *   String sql = "update topic set post_count = :count where id = :id";
+ *
+ *   int rows =
+ *     DB.sqlUpdate(sql)
+ *       .setParameter("id", 1)
+ *       .setParameter("count", 50)
+ *       .execute();
+ *
+ *   String msg = "There were " + rows + " rows updated";
  *
  * }</pre>
  * <p>
@@ -37,9 +50,10 @@ package io.ebean;
  * <pre>{@code
  *
  *  String sql = "insert into audit_log (id, description, modified_description) values (?,?,?)";
- *  SqlUpdate insert = Ebean.createSqlUpdate(sql);
  *
- *  try (Transaction txn = Ebean.beginTransaction()) {
+ *  SqlUpdate insert = DB.sqlUpdate(sql);
+ *
+ *  try (Transaction txn = DB.beginTransaction()) {
  *    txn.setBatchMode(true);
  *
  *    insert.setNextParameter(10000);
@@ -65,7 +79,7 @@ package io.ebean;
  * </p>
  * <pre>{@code
  *
- *   try (Transaction txn = Ebean.beginTransaction()) {
+ *   try (Transaction txn = DB.beginTransaction()) {
  *
  *     insert.setNextParameter(10000);
  *     insert.setNextParameter("hello");
@@ -220,20 +234,20 @@ public interface SqlUpdate {
   /**
    * Set one of more positioned parameters.
    * <p>
-   * This is a convenient alternative to multiple calls setParameter().
+   * This is a convenient alternative to multiple setParameter() calls.
    *
    * <pre>{@code
    *
    *   String sql = "insert into audit_log (id, name, version) values (?,?,?)";
    *
-   *   Ebean.createSqlUpdate(sql)
+   *   DB.sqlUpdate(sql)
    *       .setParams(UUID.randomUUID(), "Hello", 1)
    *       .executeNow();
    *
    *
    *   // is the same as ...
    *
-   *   Ebean.createSqlUpdate(sql)
+   *   DB.sqlUpdate(sql)
    *       .setParameter(1, UUID.randomUUID())
    *       .setParameter(2, "Hello")
    *       .setParameter(3, 1)
diff --git a/src/test/java/io/ebean/DtoQueryTest.java b/src/test/java/io/ebean/DtoQueryTest.java
index 5f693cab4..8381acb9d 100644
--- a/src/test/java/io/ebean/DtoQueryTest.java
+++ b/src/test/java/io/ebean/DtoQueryTest.java
@@ -130,7 +130,7 @@ public class DtoQueryTest extends BaseTestCase {
 
     List<Integer> ids = Arrays.asList(1, 2);
 
-    List<SqlRow> list = server().createSqlQuery("select id, name from o_customer where id = any(?)")
+    List<SqlRow> list = DB.sqlQuery("select id, name from o_customer where id = any(?)")
       .setParameter(1, ids)
       .findList();
 
diff --git a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
index f30fc8eba..d8a0caef0 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
@@ -1,7 +1,6 @@
 package io.ebeaninternal.dbmigration;
 
 import io.ebean.BaseTestCase;
-import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
 import io.ebean.SqlUpdate;
 import io.ebean.Transaction;
@@ -108,8 +107,7 @@ public class DbMigrationTest extends BaseTestCase {
 
     // Run migration
     runScript(false, "1.1.sql");
-    SqlQuery select = server().createSqlQuery("select * from migtest_e_basic order by id");
-    List<SqlRow> result = select.findList();
+    List<SqlRow> result = server().sqlQuery("select * from migtest_e_basic order by id").findList();
     assertThat(result).hasSize(2);
 
     SqlRow row = result.get(0);
@@ -137,11 +135,10 @@ public class DbMigrationTest extends BaseTestCase {
     // Oracle caches the statement and does not detect schema change. It fails with
     // an ORA-01007
     if (isOracle()) {
-      select = server().createSqlQuery("select * from migtest_e_basic order by id,id");
+      result = server().sqlQuery("select * from migtest_e_basic order by id,id").findList();
     } else {
-      select = server().createSqlQuery("select * from migtest_e_basic order by id");
+      result = server().sqlQuery("select * from migtest_e_basic order by id").findList();
     }
-    result = select.findList();
     assertThat(result).hasSize(2);
     row = result.get(0);
     assertThat(row.keySet()).doesNotContain("old_boolean", "old_boolean2");
@@ -150,8 +147,7 @@ public class DbMigrationTest extends BaseTestCase {
     runScript(false, "1.4__dropsFor_1.3.sql");
 
     // now DB structure shoud be the same as v1_0
-    select = server().createSqlQuery("select * from migtest_e_basic order by id");
-    result = select.findList();
+    result = server().sqlQuery("select * from migtest_e_basic order by id").findList();
     assertThat(result).hasSize(2);
     row = result.get(0);
     assertThat(row.keySet()).contains("old_boolean", "old_boolean2");
diff --git a/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java b/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java
index 986f5f829..0f0d2416b 100644
--- a/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java
+++ b/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java
@@ -1,10 +1,10 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.SqlRow;
-import org.tests.model.basic.UUOne;
 import org.junit.Test;
+import org.tests.model.basic.UUOne;
 
 import java.util.List;
 import java.util.UUID;
@@ -25,11 +25,11 @@ public class TestBinaryUUID extends BaseTestCase {
     one1.setId(id);
     one1.setName("second one");
 
-    Ebean.save(one0);
-    Ebean.save(one1);
+    DB.save(one0);
+    DB.save(one1);
 
-    UUOne fetch0 = Ebean.find(UUOne.class, one0.getId());
-    UUOne fetch1 = Ebean.find(UUOne.class, one1.getId());
+    UUOne fetch0 = DB.find(UUOne.class, one0.getId());
+    UUOne fetch1 = DB.find(UUOne.class, one1.getId());
 
     assertEquals(one0.getId(), fetch0.getId());
     assertEquals(one0.getName(), fetch0.getName());
@@ -38,7 +38,7 @@ public class TestBinaryUUID extends BaseTestCase {
     assertEquals(one1.getName(), fetch1.getName());
 
     String sql = "select id, name from uuone";
-    List<SqlRow> list = Ebean.createSqlQuery(sql).findList();
+    List<SqlRow> list = DB.createSqlQuery(sql).findList();
     for (SqlRow sqlRow : list) {
       Object sqlId = sqlRow.get("id");
       assertNotNull(sqlId);
@@ -47,8 +47,8 @@ public class TestBinaryUUID extends BaseTestCase {
     }
 
 
-    String asJson = Ebean.json().toJson(fetch0);
-    UUOne bean = Ebean.json().toBean(UUOne.class, asJson);
+    String asJson = DB.json().toJson(fetch0);
+    UUOne bean = DB.json().toBean(UUOne.class, asJson);
 
     assertEquals(fetch0.getId(), bean.getId());
     assertEquals(fetch0.getName(), bean.getName());
diff --git a/src/test/java/org/tests/basic/TestM2MVanilla.java b/src/test/java/org/tests/basic/TestM2MVanilla.java
index 6eb8d2af2..536ebd9b8 100644
--- a/src/test/java/org/tests/basic/TestM2MVanilla.java
+++ b/src/test/java/org/tests/basic/TestM2MVanilla.java
@@ -1,13 +1,12 @@
 package org.tests.basic;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.Query;
-import io.ebean.SqlUpdate;
-import org.tests.model.basic.MRole;
-import org.tests.model.basic.MUser;
 import org.junit.Assert;
 import org.junit.Test;
+import org.tests.model.basic.MRole;
+import org.tests.model.basic.MUser;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,32 +16,28 @@ public class TestM2MVanilla extends BaseTestCase {
   @Test
   public void testVanilla() {
 
-    SqlUpdate delInt = Ebean.createSqlUpdate("delete from mrole_muser");
-    SqlUpdate delRoles = Ebean.createSqlUpdate("delete from mrole");
-    SqlUpdate delUsers = Ebean.createSqlUpdate("delete from muser");
-
-    Ebean.execute(delInt);
-    Ebean.execute(delRoles);
-    Ebean.execute(delUsers);
+    DB.createSqlUpdate("delete from mrole_muser").execute();
+    DB.sqlUpdate("delete from mrole").execute();
+    DB.sqlUpdate("delete from muser").execute();
 
     MRole r1 = new MRole();
     r1.setRoleName("role1");
-    Ebean.save(r1);
+    DB.save(r1);
 
     MRole r2 = new MRole();
     r2.setRoleName("role2");
-    Ebean.save(r2);
+    DB.save(r2);
 
     MRole r3 = new MRole();
     r3.setRoleName("role3");
-    Ebean.save(r3);
+    DB.save(r3);
 
     MUser u0 = new MUser();
     u0.setUserName("something");
 
-    Ebean.save(u0);
+    DB.save(u0);
 
-    MUser user = Ebean.find(MUser.class, u0.getUserid());
+    MUser user = DB.find(MUser.class, u0.getUserid());
 
     List<MRole> roleList = new ArrayList<>();
     roleList.add(r1);
@@ -50,34 +45,34 @@ public class TestM2MVanilla extends BaseTestCase {
 
     user.setRoles(roleList);
 
-    Ebean.save(user);
+    DB.save(user);
     // Ebean.saveManyToManyAssociations(user, "roles");
 
-    MUser checkUser = Ebean.find(MUser.class, u0.getUserid());
+    MUser checkUser = DB.find(MUser.class, u0.getUserid());
     List<MRole> checkRoles = checkUser.getRoles();
     Assert.assertNotNull(checkRoles);
     Assert.assertEquals(2, checkRoles.size());
 
     checkRoles.add(r3);
 
-    Ebean.save(checkUser);
+    DB.save(checkUser);
     // Ebean.saveManyToManyAssociations(checkUser, "roles");
 
-    MUser checkUser2 = Ebean.find(MUser.class, u0.getUserid());
+    MUser checkUser2 = DB.find(MUser.class, u0.getUserid());
     List<MRole> checkRoles2 = checkUser2.getRoles();
     Assert.assertNotNull(checkRoles2);
     Assert.assertEquals("added a role", 3, checkRoles2.size());
 
-    Query<MUser> rolesQuery0 = Ebean.find(MUser.class).where().eq("roles", r1).query();
+    Query<MUser> rolesQuery0 = DB.find(MUser.class).where().eq("roles", r1).query();
 
     rolesQuery0.findList();
 
-    Query<MUser> rolesQuery = Ebean.find(MUser.class).where().in("roles", roleList).query();
+    Query<MUser> rolesQuery = DB.find(MUser.class).where().in("roles", roleList).query();
 
     List<MUser> userInRolesList = rolesQuery.findList();
     Assert.assertTrue(!userInRolesList.isEmpty());
 
-    List<MUser> list = Ebean.find(MUser.class)
+    List<MUser> list = DB.find(MUser.class)
       .where().in("roles", roleList)
       .filterMany("roles").eq("roleName", "role1")
       .findList();
@@ -88,14 +83,14 @@ public class TestM2MVanilla extends BaseTestCase {
 
     checkRoles2.remove(0);
     checkRoles2.remove(0);
-    Ebean.save(checkUser2);
+    DB.save(checkUser2);
 
-    checkUser2 = Ebean.find(MUser.class, u0.getUserid());
+    checkUser2 = DB.find(MUser.class, u0.getUserid());
     checkRoles2 = checkUser2.getRoles();
     Assert.assertNotNull(checkRoles2);
     Assert.assertEquals("added a role", 1, checkRoles2.size());
 
-    Ebean.delete(checkUser2);
+    DB.delete(checkUser2);
 
   }
 
diff --git a/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java b/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java
index 3bc6fef55..9d6a26f36 100644
--- a/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java
+++ b/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java
@@ -1,11 +1,11 @@
 package org.tests.basic;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.SqlRow;
-import org.tests.model.basic.ResetBasicData;
 import org.junit.Assert;
 import org.junit.Test;
+import org.tests.model.basic.ResetBasicData;
 
 import java.util.List;
 
@@ -17,7 +17,7 @@ public class TestOrderTotalAmountSql extends BaseTestCase {
     ResetBasicData.reset();
 
     String sql = "select order_id, sum(order_qty*unit_price) as total_amount from o_order_detail  where order_qty > :minQty  group by order_id";
-    List<SqlRow> sqlRows = Ebean.createSqlQuery(sql).setParameter("minQty", 1).findList();
+    List<SqlRow> sqlRows = DB.sqlQuery(sql).setParameter("minQty", 1).findList();
 
     for (SqlRow sqlRow : sqlRows) {
       Integer id = sqlRow.getInteger("order_id");
diff --git a/src/test/java/org/tests/basic/encrypt/TestEncrypt.java b/src/test/java/org/tests/basic/encrypt/TestEncrypt.java
index 84c339b49..af60f0102 100644
--- a/src/test/java/org/tests/basic/encrypt/TestEncrypt.java
+++ b/src/test/java/org/tests/basic/encrypt/TestEncrypt.java
@@ -1,8 +1,7 @@
 package org.tests.basic.encrypt;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
-import io.ebean.SqlQuery;
+import io.ebean.DB;
 import io.ebean.SqlRow;
 import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
@@ -26,7 +25,7 @@ public class TestEncrypt extends BaseTestCase {
   public void testQueryBind() {
 
     LoggedSqlCollector.start();
-    Ebean.find(EBasicEncrypt.class)
+    DB.find(EBasicEncrypt.class)
       .where().startsWith("description", "Rob")
       .findList();
 
@@ -39,23 +38,23 @@ public class TestEncrypt extends BaseTestCase {
   @ForPlatform(Platform.H2)
   public void test() {
 
-    Ebean.find(EBasicEncrypt.class).delete();
+    DB.find(EBasicEncrypt.class).delete();
 
     EBasicEncrypt e = new EBasicEncrypt();
     e.setName("testname");
     e.setDescription("testdesc");
     e.setDob(new Date(System.currentTimeMillis() - 100000));
 
-    Ebean.save(e);
+    DB.save(e);
 
-    SqlQuery q = Ebean.createSqlQuery("select * from e_basicenc where id = :id");
-    q.setParameter("id", e.getId());
+    SqlRow row = DB.createSqlQuery("select * from e_basicenc where id = :id")
+      .setParameter("id", e.getId())
+      .findOne();
 
-    SqlRow row = q.findOne();
     row.getString("name");
     row.get("description");
 
-    EBasicEncrypt e1 = Ebean.find(EBasicEncrypt.class, e.getId());
+    EBasicEncrypt e1 = DB.find(EBasicEncrypt.class, e.getId());
 
     e1.getDescription();
 
@@ -63,14 +62,14 @@ public class TestEncrypt extends BaseTestCase {
     e1.setDescription("moddesc");
     e1.setStatus(EBasicEncrypt.Status.ONE);
 
-    Ebean.save(e1);
+    DB.save(e1);
 
-    EBasicEncrypt e2 = Ebean.find(EBasicEncrypt.class, e.getId());
+    EBasicEncrypt e2 = DB.find(EBasicEncrypt.class, e.getId());
 
     assertEquals("moddesc", e2.getDescription());
     assertEquals(EBasicEncrypt.Status.ONE, e2.getStatus());
 
-    SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null);
+    SpiEbeanServer server = (SpiEbeanServer) DB.getDefault();
     DbEncrypt dbEncrypt = server.getDatabasePlatform().getDbEncrypt();
 
     if (dbEncrypt == null) {
@@ -79,12 +78,12 @@ public class TestEncrypt extends BaseTestCase {
 
     } else {
 
-      List<EBasicEncrypt> list = Ebean.find(EBasicEncrypt.class).where()
+      List<EBasicEncrypt> list = DB.find(EBasicEncrypt.class).where()
         .eq("description", "moddesc").findList();
 
       assertEquals(1, list.size());
 
-      list = Ebean.find(EBasicEncrypt.class).where().startsWith("description", "modde").findList();
+      list = DB.find(EBasicEncrypt.class).where().startsWith("description", "modde").findList();
 
       assertEquals(1, list.size());
     }
diff --git a/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java b/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java
index 7378388e0..2a8e4224c 100644
--- a/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java
+++ b/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java
@@ -1,12 +1,11 @@
 package org.tests.basic.encrypt;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
-import io.ebean.SqlQuery;
+import io.ebean.DB;
 import io.ebean.SqlRow;
-import org.tests.model.basic.EBasicEncryptBinary;
 import org.junit.Assert;
 import org.junit.Test;
+import org.tests.model.basic.EBasicEncryptBinary;
 
 import java.sql.Timestamp;
 
@@ -22,17 +21,17 @@ public class TestEncryptBinary extends BaseTestCase {
     e.setSomeTime(t0);
     e.setData("HelloWorld".getBytes());
 
-    Ebean.save(e);
+    DB.save(e);
 
-    SqlQuery q = Ebean.createSqlQuery("select * from e_basicenc_bin where id = :id");
-    q.setParameter("id", e.getId());
+    SqlRow row = DB.createSqlQuery("select * from e_basicenc_bin where id = :id")
+      .setParameter("id", e.getId())
+      .findOne();
 
-    SqlRow row = q.findOne();
     row.getString("name");
     row.get("data");
     row.get("some_time");
 
-    EBasicEncryptBinary e1 = Ebean.find(EBasicEncryptBinary.class, e.getId());
+    EBasicEncryptBinary e1 = DB.find(EBasicEncryptBinary.class, e.getId());
 
     Timestamp t1 = e1.getSomeTime();
     e1.getData();
@@ -44,9 +43,9 @@ public class TestEncryptBinary extends BaseTestCase {
     e1.setName("testmod");
     e1.setDescription("moddesc");
 
-    Ebean.save(e1);
+    DB.save(e1);
 
-    EBasicEncryptBinary e2 = Ebean.find(EBasicEncryptBinary.class, e.getId());
+    EBasicEncryptBinary e2 = DB.find(EBasicEncryptBinary.class, e.getId());
     e2.getDescription();
   }
 
diff --git a/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java b/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java
index d15c76670..1489f1c52 100644
--- a/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java
+++ b/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java
@@ -1,15 +1,15 @@
 package org.tests.basic.type;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
+import org.junit.Assert;
+import org.junit.Test;
 import org.tests.model.basic.EBasic;
 import org.tests.model.basic.EBasic.Status;
 import org.tests.model.basic.EBasicEnumId;
 import org.tests.model.basic.EBasicEnumInt;
-import org.junit.Assert;
-import org.junit.Test;
 
 import java.util.Optional;
 
@@ -25,26 +25,25 @@ public class TestEnumValueAnnotation extends BaseTestCase {
     b.setName("Banana");
     b.setStatus(Status.NEW);
 
-    Ebean.save(b);
+    DB.save(b);
 
-    SqlQuery q = Ebean.createSqlQuery("select * from e_basic where id = :id");
-    q.setParameter("id", b.getId());
+    SqlRow sqlRow = DB.createSqlQuery("select * from e_basic where id = :id")
+      .setParameter("id", b.getId())
+      .findOne();
 
-    SqlRow sqlRow = q.findOne();
     String strStatus = sqlRow.getString("status");
-
     assertEquals("N", strStatus);
 
     EBasic b2 = new EBasic();
     b2.setName("Apple");
     b2.setStatus(Status.NEW);
 
-    Ebean.save(b2);
+    DB.save(b2);
 
-    EBasic b3 = Ebean.find(EBasic.class, b2.getId());
+    EBasic b3 = DB.find(EBasic.class, b2.getId());
     b3.setName("Orange");
 
-    Ebean.save(b3);
+    DB.save(b3);
   }
 
   @Test
@@ -53,9 +52,9 @@ public class TestEnumValueAnnotation extends BaseTestCase {
     b.setName("Banana");
     b.setStatus(EBasicEnumId.Status.NEW);
 
-    Ebean.save(b);
+    DB.save(b);
 
-    SqlQuery q = Ebean.createSqlQuery("select * from e_basic_enum_id where status = :status");
+    SqlQuery q = DB.createSqlQuery("select * from e_basic_enum_id where status = :status");
     q.setParameter("status", b.getStatus());
 
     SqlRow sqlRow = q.findOne();
@@ -64,7 +63,7 @@ public class TestEnumValueAnnotation extends BaseTestCase {
     assertEquals("N", strStatus);
 
     try {
-      b = Ebean.find(EBasicEnumId.class, b.getStatus());
+      b = DB.find(EBasicEnumId.class, b.getStatus());
     } catch (java.lang.IllegalArgumentException iae) {
       Assert.fail("The use of an enum as id should work : " + iae.getLocalizedMessage());
     }
@@ -79,9 +78,9 @@ public class TestEnumValueAnnotation extends BaseTestCase {
     b.setName("Banana");
     b.setStatus(EBasicEnumInt.Status.NEW);
 
-    Ebean.save(b);
+    DB.save(b);
 
-    SqlQuery q = Ebean.createSqlQuery("select * from e_basic_eni where id = :id");
+    SqlQuery q = DB.createSqlQuery("select * from e_basic_eni where id = :id");
     q.setParameter("id", b.getId());
 
     Optional<SqlRow> sqlRow = q.findOneOrEmpty();
@@ -91,7 +90,7 @@ public class TestEnumValueAnnotation extends BaseTestCase {
     });
 
 
-    EBasicEnumInt b2 = Ebean.find(EBasicEnumInt.class)
+    EBasicEnumInt b2 = DB.find(EBasicEnumInt.class)
       .where().eq("id", b.getId())
       .eq("status", EBasicEnumInt.Status.NEW)
       .findOne();

From f787483e30e2b67cf4e6808e0b5eb32e79ca504a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 4 Feb 2019 11:54:45 +1300
Subject: [PATCH 0710/1036] #1629 - ENH: Add sqlQuery(sql) and sqlUpdate(sql)
 ... as alias for createSqlQuery(sql) and createSqlUpdate(sql)

---
 .../ebeaninternal/server/core/DefaultServer.java   | 14 ++++++++++++--
 .../io/ebeaninternal/api/TDSpiEbeanServer.java     | 12 +++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 77f0e7d0d..db6e1bf0a 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -1083,15 +1083,25 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   }
 
   @Override
-  public SqlQuery createSqlQuery(String sql) {
+  public SqlQuery sqlQuery(String sql) {
     return new DefaultRelationalQuery(this, sql.trim());
   }
 
   @Override
-  public SqlUpdate createSqlUpdate(String sql) {
+  public SqlQuery createSqlQuery(String sql) {
+    return sqlQuery(sql);
+  }
+
+  @Override
+  public SqlUpdate sqlUpdate(String sql) {
     return new DefaultSqlUpdate(this, sql.trim());
   }
 
+  @Override
+  public SqlUpdate createSqlUpdate(String sql) {
+    return sqlUpdate(sql);
+  }
+
   @Override
   public CallableSql createCallableSql(String sql) {
     return new DefaultCallableSql(this, sql.trim());
diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index 2a7026e04..44bad8903 100644
--- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -507,14 +507,24 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
 
   }
 
+  @Override
+  public SqlQuery sqlQuery(String sql) {
+    return null;
+  }
+
   @Override
   public SqlQuery createSqlQuery(String sql) {
+    return sqlQuery(sql);
+  }
+
+  @Override
+  public SqlUpdate sqlUpdate(String sql) {
     return null;
   }
 
   @Override
   public SqlUpdate createSqlUpdate(String sql) {
-    return null;
+    return sqlUpdate(sql);
   }
 
   @Override

From a02673359d5215ce0500ef662545332b4e2f948a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 4 Feb 2019 12:34:02 +1300
Subject: [PATCH 0711/1036] No effective change - tidy BindParams

---
 src/main/java/io/ebeaninternal/api/BindParams.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/api/BindParams.java b/src/main/java/io/ebeaninternal/api/BindParams.java
index 53ea7dcf9..0d5651323 100644
--- a/src/main/java/io/ebeaninternal/api/BindParams.java
+++ b/src/main/java/io/ebeaninternal/api/BindParams.java
@@ -171,8 +171,7 @@ public class BindParams implements Serializable {
   }
 
   private Param getParam(String name) {
-    Param p = namedParameters.computeIfAbsent(name, k -> new Param());
-    return p;
+    return namedParameters.computeIfAbsent(name, k -> new Param());
   }
 
   private Param getParam(int position) {

From 37a66f1ee230eb77f29bb31c99d48bfa66e5896b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 4 Feb 2019 14:24:47 +1300
Subject: [PATCH 0712/1036] Playing around with SqlUpdate and bind expansion
 for ?1 etc

---
 .../server/core/DefaultSqlUpdate.java         |  34 +++++-
 .../TestSqlUpdateBindMultipleLists.java       | 100 ++++++++++++++++++
 2 files changed, 131 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java b/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
index 7b028fa2b..04390da12 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
@@ -9,6 +9,7 @@ import io.ebeaninternal.api.SpiSqlUpdate;
 import io.ebeaninternal.api.SpiTransaction;
 
 import java.io.Serializable;
+import java.util.Collection;
 
 /**
  * A SQL Update Delete or Insert statement that can be executed. For the times
@@ -66,6 +67,8 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
    */
   private int addPos;
 
+  private int bindExpansion;
+
   private boolean getGeneratedKeys;
 
   private Object generatedKey;
@@ -253,21 +256,46 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
     return this;
   }
 
+  private SqlUpdate setParamWithBindExpansion(int position, Collection values, String bindLiteral) {
+
+    StringBuilder sqlExpand = new StringBuilder(values.size() * 2);
+    int offset = 0;
+    for (Object val : values) {
+      if (offset > 0) {
+        sqlExpand.append(",");
+      }
+      sqlExpand.append("?");
+      bindParams.setParameter(position + offset++, val);
+    }
+    bindExpansion += offset;
+    generatedSql = generatedSql.replace(bindLiteral, sqlExpand.toString());
+    return this;
+  }
+
   @Override
   public SqlUpdate setParameter(int position, Object value) {
-    bindParams.setParameter(position, value);
+
+    if (value instanceof Collection) {
+      String bindLiteral = "?" + position;
+      int pos = sql.indexOf(bindLiteral);
+      if (pos > -1) {
+        return setParamWithBindExpansion(position, (Collection) value, bindLiteral);
+      }
+    }
+
+    bindParams.setParameter(bindExpansion + position, value);
     return this;
   }
 
   @Override
   public SqlUpdate setNull(int position, int jdbcType) {
-    bindParams.setNullParameter(position, jdbcType);
+    bindParams.setNullParameter(bindExpansion + position, jdbcType);
     return this;
   }
 
   @Override
   public SqlUpdate setNullParameter(int position, int jdbcType) {
-    bindParams.setNullParameter(position, jdbcType);
+    bindParams.setNullParameter(bindExpansion + position, jdbcType);
     return this;
   }
 
diff --git a/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java b/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java
index acef06709..0bad6f45c 100644
--- a/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java
+++ b/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java
@@ -1,8 +1,10 @@
 package org.tests.update;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.SqlUpdate;
+import io.ebean.Transaction;
 import org.junit.Test;
 
 import static java.util.Arrays.asList;
@@ -26,6 +28,104 @@ public class TestSqlUpdateBindMultipleLists extends BaseTestCase {
 
   }
 
+  @Test
+  public void positionParamsExpansion() {
+
+    SqlUpdate sqlUpdate = Ebean.createSqlUpdate("delete from o_customer where id in (?1)");
+
+    sqlUpdate.setParameter(1, asList(9991, 9992, 9993));
+    sqlUpdate.execute();
+
+    assertEquals("delete from o_customer where id in (?,?,?)", sqlUpdate.getGeneratedSql());
+
+    sqlUpdate = Ebean.createSqlUpdate("delete from o_customer where id in (?1)");
+
+    sqlUpdate.setParameter(1, asList(9991, 9993));
+    sqlUpdate.execute();
+
+    assertEquals("delete from o_customer where id in (?,?)", sqlUpdate.getGeneratedSql());
+
+    sqlUpdate = Ebean.createSqlUpdate("delete from o_customer where id in (?1)");
+
+    sqlUpdate.setParameter(1, asList(9993));
+    sqlUpdate.execute();
+
+    assertEquals("delete from o_customer where id in (?)", sqlUpdate.getGeneratedSql());
+  }
+
+  @Test
+  public void positionParamsExpansion_withPrePost() {
+
+    SqlUpdate sqlUpdate = Ebean.createSqlUpdate("delete from o_customer where id > ? and id in (?2) and id < ?");
+
+    sqlUpdate.setParameter(1, 90);
+    sqlUpdate.setParameter(2, asList(9991, 9992, 9993));
+    sqlUpdate.setParameter(3, 91);
+
+    sqlUpdate.execute();
+
+    assertEquals("delete from o_customer where id > ? and id in (?,?,?) and id < ?", sqlUpdate.getGeneratedSql());
+  }
+
+  @Test
+  public void positionParamsExpansion_withPrePost_usingParam() {
+
+    SqlUpdate sqlUpdate = Ebean.createSqlUpdate("delete from o_customer where id > ? and id in (?2) and id < ?");
+
+    sqlUpdate.setParams(90, asList(9991, 9992, 9993), 91);
+    sqlUpdate.execute();
+
+    assertEquals("delete from o_customer where id > ? and id in (?,?,?) and id < ?", sqlUpdate.getGeneratedSql());
+  }
+
+  @Test
+  public void positionParamsExpansion_withPre() {
+
+    SqlUpdate sqlUpdate = Ebean.createSqlUpdate("delete from o_customer where name = ? and id in (?2)");
+
+    sqlUpdate.setParameter(1, "Foo");
+    sqlUpdate.setParameter(2, asList(9991, 9992, 9993));
+
+    sqlUpdate.execute();
+
+    assertEquals("delete from o_customer where name = ? and id in (?,?,?)", sqlUpdate.getGeneratedSql());
+  }
+
+  @Test
+  public void positionParamsExpansion_withPost() {
+
+    SqlUpdate sqlUpdate = Ebean.createSqlUpdate("delete from o_customer where id in (?1) and name = ?");
+
+    sqlUpdate.setParameter(1, asList(9991, 9992, 9993));
+    sqlUpdate.setParameter(2, "Foo");
+    sqlUpdate.execute();
+
+    assertEquals("delete from o_customer where id in (?,?,?) and name = ?", sqlUpdate.getGeneratedSql());
+  }
+
+  @Test
+  public void positionParamsExpansion_withPost_andBatch() {
+
+    SqlUpdate upd = Ebean.createSqlUpdate("delete from o_customer where id in (:ids) and name = :name");
+
+    try (Transaction transaction = DB.beginTransaction()) {
+      transaction.setBatchMode(true);
+
+      upd.setParameter("ids", asList(9991, 9992, 9993));
+      upd.setParameter("name", "Foo");
+      upd.execute();
+
+      upd.setParameter("ids", asList(9991, 9992));
+      upd.setParameter("name", "Bar");
+      upd.execute();
+
+      upd.setParameter("ids", asList(9991, 9992, 9999));
+      upd.setParameter("name", "Baz");
+      upd.execute();
+
+      transaction.commit();
+    }
+  }
 
   @Test
   public void test_multipleLists() {

From 0c03a8b925ec577251d72555271697ada29ff297 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 5 Feb 2019 17:35:58 +1300
Subject: [PATCH 0713/1036] #1630 - ENH: Improve jdbc batch use when persisting
 ManyToMany intersection changes

---
 .../server/core/PersistRequestBean.java       | 30 +++++-
 .../server/core/PersistRequestUpdateSql.java  | 20 ++++
 .../ebeaninternal/server/core/Persister.java  |  5 +
 .../server/deploy/IntersectionRow.java        |  8 +-
 .../server/persist/BatchControl.java          | 62 +++++++++++-
 .../server/persist/DefaultPersister.java      | 31 ++++--
 .../server/persist/SaveManyBeans.java         | 41 ++++----
 .../o2m/jointable/TestOneToManyJoinTable.java |  7 +-
 .../TestOneToManyJoinTableInheritance.java    | 15 +--
 .../org/tests/sp/TestManyToManySaveTwice.java | 96 +++++++++++++++----
 src/test/java/org/tests/sp/model/car/Car.java | 10 ++
 .../java/org/tests/sp/model/car/Wheel.java    |  9 ++
 12 files changed, 276 insertions(+), 58 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index 8bf7ffd81..0ff175eb4 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -27,6 +27,7 @@ import io.ebeaninternal.server.persist.BatchedSqlException;
 import io.ebeaninternal.server.persist.DeleteMode;
 import io.ebeaninternal.server.persist.Flags;
 import io.ebeaninternal.server.persist.PersistExecute;
+import io.ebeaninternal.server.persist.SaveManyBeans;
 import io.ebeaninternal.server.transaction.BeanPersistIdMap;
 import io.ebeanservice.docstore.api.DocStoreUpdate;
 import io.ebeanservice.docstore.api.DocStoreUpdateContext;
@@ -174,7 +175,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   private int pendingPostUpdateNotify;
 
   /**
-   * Set to true when post execute has occured (so includes batch flush).
+   * Set to true when post execute has occurred (so includes batch flush).
    */
   private boolean postExecute;
 
@@ -183,6 +184,11 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    */
   private boolean complete;
 
+  /**
+   * Many to many intersection table changes that are held for later batch processing.
+   */
+  private SaveManyBeans saveManyIntersection;
+
   public PersistRequestBean(SpiEbeanServer server, T bean, Object parentBean, BeanManager<T> mgr, SpiTransaction t,
                             PersistExecute persistExecute, PersistRequest.Type type, int flags) {
 
@@ -955,6 +961,13 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
     if (isLogSummary()) {
       logSummary();
     }
+    saveQueuedManyIntersection();
+  }
+
+  private void saveQueuedManyIntersection() {
+    if (saveManyIntersection != null) {
+      saveManyIntersection.saveIntersectionBatch();
+    }
   }
 
   /**
@@ -1119,6 +1132,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
       updatedManysOnly = true;
       setNotifyCache();
       addPostCommitListeners();
+      saveQueuedManyIntersection();
     }
     notifyCacheOnComplete();
     postUpdateNotify();
@@ -1454,4 +1468,18 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   public String getSelectLastInsertedId() {
     return beanDescriptor.getSelectLastInsertedId(publish);
   }
+
+  /**
+   * Return true if the intersection table updates should be queued and batched.
+   */
+  public boolean isQueueManyIntersection() {
+    return !postExecute;
+  }
+
+  /**
+   * The intersection table updates to the batch executed later on postExecute.
+   */
+  public void setManyIntersection(SaveManyBeans saveManyIntersection) {
+    this.saveManyIntersection = saveManyIntersection;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
index 289592cbe..a1d87937b 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.core;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiSqlUpdate;
 import io.ebeaninternal.api.SpiTransaction;
+import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeaninternal.server.persist.PersistExecute;
 
 /**
@@ -58,6 +59,25 @@ public final class PersistRequestUpdateSql extends PersistRequest {
     return executeOrQueue();
   }
 
+  /**
+   * Execute using jdbc batch.
+   */
+  public void executeAddBatch() {
+    this.addBatch = true;
+    persistExecute.executeSqlUpdate(this);
+  }
+
+  /**
+   * Add this request to BatchControl to flush later.
+   */
+  public void addToFlushQueue(boolean early) {
+    BatchControl control = transaction.getBatchControl();
+    if (control == null) {
+      control = persistExecute.createBatchControl(transaction);
+    }
+    control.addToFlushQueue(this, early);
+  }
+
   @Override
   public int executeNow() {
     return persistExecute.executeSqlUpdate(this);
diff --git a/src/main/java/io/ebeaninternal/server/core/Persister.java b/src/main/java/io/ebeaninternal/server/core/Persister.java
index a1b9eedbe..a0bdf1bb5 100644
--- a/src/main/java/io/ebeaninternal/server/core/Persister.java
+++ b/src/main/java/io/ebeaninternal/server/core/Persister.java
@@ -103,6 +103,11 @@ public interface Persister {
    */
   void visitMetrics(MetricVisitor visitor);
 
+  /**
+   * Execute or queue the update.
+   */
+  void executeOrQueue(SpiSqlUpdate update, SpiTransaction t, boolean queue);
+
   /**
    * Add the statement to JDBC batch for later execution via executeBatch.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java b/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java
index 305469af2..b26f3d81d 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java
@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.SqlUpdate;
 import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.api.SpiSqlUpdate;
 import io.ebeaninternal.server.core.DefaultSqlUpdate;
 import io.ebeaninternal.server.expression.DefaultExpressionRequest;
 import io.ebeaninternal.server.expression.IdInExpression;
@@ -45,7 +45,7 @@ public class IntersectionRow {
     values.put(key, value);
   }
 
-  public SqlUpdate createInsert(SpiEbeanServer server) {
+  public SpiSqlUpdate createInsert(SpiEbeanServer server) {
 
     BindParams bindParams = new BindParams();
 
@@ -73,7 +73,7 @@ public class IntersectionRow {
     return new DefaultSqlUpdate(server, sb.toString(), bindParams);
   }
 
-  public SqlUpdate createDelete(SpiEbeanServer server, DeleteMode deleteMode) {
+  public SpiSqlUpdate createDelete(SpiEbeanServer server, DeleteMode deleteMode) {
 
     BindParams bindParams = new BindParams();
 
@@ -108,7 +108,7 @@ public class IntersectionRow {
     return new DefaultSqlUpdate(server, sb.toString(), bindParams);
   }
 
-  public SqlUpdate createDeleteChildren(SpiEbeanServer server) {
+  public SpiSqlUpdate createDeleteChildren(SpiEbeanServer server) {
 
     BindParams bindParams = new BindParams();
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchControl.java b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
index 1658d664e..4a3cafa8b 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.persist;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.core.PersistRequest;
 import io.ebeaninternal.server.core.PersistRequestBean;
+import io.ebeaninternal.server.core.PersistRequestUpdateSql;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 
@@ -10,6 +11,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * Controls the batch ordering of persist requests.
@@ -68,6 +70,9 @@ public final class BatchControl {
    */
   private int bufferMax;
 
+  private Queue earlyQueue;
+  private Queue lateQueue;
+
   /**
    * Create for a given transaction, PersistExecute, default size and getGeneratedKeys.
    */
@@ -224,14 +229,14 @@ public final class BatchControl {
    * Flush without resetting the topOrder (maintains the depth info).
    */
   public void flush() throws BatchedSqlException {
-    flush(false);
+    flushBuffer(false);
   }
 
   /**
    * Flush with a reset the topOrder (fully empty the batch).
    */
   public void flushReset() throws BatchedSqlException {
-    flush(true);
+    flushBuffer(true);
   }
 
   /**
@@ -243,10 +248,22 @@ public final class BatchControl {
     maxDepth = 0;
   }
 
+  private void flushBuffer(boolean resetTop) throws BatchedSqlException {
+    flushInternal(resetTop);
+    flushQueue(earlyQueue);
+    flushQueue(lateQueue);
+  }
+
+  private void flushQueue(Queue queue) throws BatchedSqlException {
+    if (queue != null && queue.flush() && !pstmtHolder.isEmpty()) {
+      flushPstmtHolder();
+    }
+  }
+
   /**
    * execute all the requests currently queued or batched.
    */
-  private void flush(boolean resetTop) throws BatchedSqlException {
+  private void flushInternal(boolean resetTop) throws BatchedSqlException {
 
     try {
       bufferMax = 0;
@@ -367,4 +384,43 @@ public final class BatchControl {
   public int[] execute(String key, boolean getGeneratedKeys) throws SQLException {
     return pstmtHolder.execute(key, getGeneratedKeys);
   }
+
+  /**
+   * Add a SqlUpdate request to execute after flush.
+   */
+  public void addToFlushQueue(PersistRequestUpdateSql request, boolean early) {
+    if (early) {
+      // add it to the early queue
+      if (earlyQueue == null) {
+        earlyQueue = new Queue();
+      }
+      earlyQueue.add(request);
+    } else {
+      // add it to the late queue
+      if (lateQueue == null) {
+        lateQueue = new Queue();
+      }
+      lateQueue.add(request);
+    }
+  }
+
+  private static class Queue {
+
+    private final List<PersistRequestUpdateSql> queue = new ArrayList<>();
+
+    boolean flush() {
+      if (queue.isEmpty()) {
+        return false;
+      }
+      for (PersistRequestUpdateSql request : queue) {
+        request.executeAddBatch();
+      }
+      queue.clear();
+      return true;
+    }
+
+    void add(PersistRequestUpdateSql request) {
+      queue.add(request);
+    }
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 4fc291ca9..9026e17d4 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -141,12 +141,24 @@ public final class DefaultPersister implements Persister {
     }
   }
 
+  @Override
+  public void executeOrQueue(SpiSqlUpdate update, SpiTransaction t, boolean queue) {
+    if (queue) {
+      addToFlushQueue(update, t, false);
+    } else {
+      executeSqlUpdate(update, t);
+    }
+  }
+
+  private void addToFlushQueue(SpiSqlUpdate update, SpiTransaction t, boolean early) {
+    new PersistRequestUpdateSql(server, update, t, persistExecute).addToFlushQueue(early);
+  }
+
   /**
    * Execute the updateSql.
    */
   @Override
   public int executeSqlUpdate(SqlUpdate updSql, Transaction t) {
-
     return executeOrQueue(new PersistRequestUpdateSql(server, (SpiSqlUpdate) updSql, (SpiTransaction) t, persistExecute));
   }
 
@@ -958,12 +970,19 @@ public final class DefaultPersister implements Persister {
     }
   }
 
-  void deleteAssocManyIntersection(EntityBean bean, BeanPropertyAssocMany<?> many, Transaction t, boolean publish) {
+  void deleteManyIntersection(EntityBean bean, BeanPropertyAssocMany<?> many, SpiTransaction t, boolean publish, boolean queue) {
 
-    // delete all intersection rows for this bean
+    SpiSqlUpdate sqlDelete = deleteAllIntersection(bean, many, publish);
+    if (queue) {
+      addToFlushQueue(sqlDelete, t, true);
+    } else {
+      executeSqlUpdate(sqlDelete, t);
+    }
+  }
+
+  private SpiSqlUpdate deleteAllIntersection(EntityBean bean, BeanPropertyAssocMany<?> many, boolean publish) {
     IntersectionRow intRow = many.buildManyToManyDeleteChildren(bean, publish);
-    SqlUpdate sqlDelete = intRow.createDeleteChildren(server);
-    executeSqlUpdate(sqlDelete, t);
+    return intRow.createDeleteChildren(server);
   }
 
   /**
@@ -1012,7 +1031,7 @@ public final class DefaultPersister implements Persister {
       if (many.hasJoinTable()) {
         if (deleteMode.isHard()) {
           // delete associated rows from intersection table (but not during soft delete)
-          deleteAssocManyIntersection(parentBean, many, t, request.isPublish());
+          deleteManyIntersection(parentBean, many, t, request.isPublish(), false);
         }
       } else {
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
index 6d2b5fd3b..37a98d58a 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
@@ -1,9 +1,9 @@
 package io.ebeaninternal.server.persist;
 
-import io.ebean.SqlUpdate;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
+import io.ebeaninternal.api.SpiSqlUpdate;
 import io.ebeaninternal.server.core.PersistRequest;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.deploy.BeanCollectionUtil;
@@ -24,7 +24,7 @@ import java.util.Set;
 /**
  * Saves the details for a OneToMany or ManyToMany relationship (entity beans).
  */
-class SaveManyBeans extends SaveManyBase {
+public class SaveManyBeans extends SaveManyBase {
 
   private static final Logger log = LoggerFactory.getLogger(SaveManyBeans.class);
 
@@ -244,14 +244,29 @@ class SaveManyBeans extends SaveManyBase {
     if (value == null) {
       return;
     }
+    if (request.isQueueManyIntersection()) {
+      // queue/delay until bean persist request is flushed
+      this.deleteMissing = deleteMissingChildren;
+      request.setManyIntersection(this);
+    } else {
+      saveAssocManyIntersection(deleteMissingChildren, false);
+    }
+  }
+
+  /**
+   * Push intersection table changes onto batch flush queue.
+   */
+  public void saveIntersectionBatch() {
+    saveAssocManyIntersection(deleteMissing, true);
+  }
+
+  private void saveAssocManyIntersection(boolean deleteMissingChildren, boolean queue) {
 
-    //SpiTransaction t = saveManyPropRequest.getTransaction();
     boolean vanillaCollection = !(value instanceof BeanCollection<?>);
-
     if (vanillaCollection || deleteMissingChildren) {
       // delete all intersection rows and then treat all
       // beans in the collection as additions
-      persister.deleteAssocManyIntersection(parentBean, many, transaction, publish);
+      persister.deleteManyIntersection(parentBean, many, transaction, publish, queue);
     }
 
     Collection<?> deletions = null;
@@ -287,10 +302,6 @@ class SaveManyBeans extends SaveManyBase {
     transaction.depth(+1);
 
     if (additions != null && !additions.isEmpty()) {
-      // ensure any cascade batch has been flushed prior
-      // to inserting into the intersection table
-      transaction.flushBatch();
-
       for (Object other : additions) {
         EntityBean otherBean = (EntityBean) other;
         // the object from the 'other' side of the ManyToMany
@@ -309,24 +320,20 @@ class SaveManyBeans extends SaveManyBase {
           } else {
             // build a intersection row for 'insert'
             IntersectionRow intRow = many.buildManyToManyMapBean(parentBean, otherBean, publish);
-            SqlUpdate sqlInsert = intRow.createInsert(server);
-            persister.executeSqlUpdate(sqlInsert, transaction);
+            SpiSqlUpdate sqlInsert = intRow.createInsert(server);
+            persister.executeOrQueue(sqlInsert, transaction, queue);
           }
         }
       }
     }
     if (deletions != null && !deletions.isEmpty()) {
-      // ensure any cascade batch has been flushed prior
-      // to inserting into the intersection table
-      transaction.flushBatch();
-
       for (Object other : deletions) {
         EntityBean otherDelete = (EntityBean) other;
         // the object from the 'other' side of the ManyToMany
         // build a intersection row for 'delete'
         IntersectionRow intRow = many.buildManyToManyMapBean(parentBean, otherDelete, publish);
-        SqlUpdate sqlDelete = intRow.createDelete(server, DeleteMode.HARD);
-        persister.executeSqlUpdate(sqlDelete, transaction);
+        SpiSqlUpdate sqlDelete = intRow.createDelete(server, DeleteMode.HARD);
+        persister.executeOrQueue(sqlDelete, transaction, queue);
       }
     }
 
diff --git a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java
index 687bccdf8..790a4eb82 100644
--- a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java
+++ b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java
@@ -47,12 +47,11 @@ public class TestOneToManyJoinTable extends BaseTestCase {
       assertThat(sql.get(1)).contains("insert into troop_monkey (troop_pid, monkey_mid) values (?, ?)");
     }
 
-    int intersectionRows = Ebean.createSqlQuery("select count(*) as total from troop_monkey where troop_pid = ?")
+    long intersectionRows = Ebean.createSqlQuery("select count(*) as total from troop_monkey where troop_pid = ?")
       .setParameter(1, troop.getPid())
-      .findOne()
-      .getInteger("total");
+      .findSingleLong();
 
-    assertThat(intersectionRows).isEqualTo(2);
+    assertThat(intersectionRows).isEqualTo(2L);
 
     LoggedSqlCollector.current();
     JtTroop fetchTroop = Ebean.find(JtTroop.class)
diff --git a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java
index 3de523684..386d83745 100644
--- a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java
+++ b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java
@@ -34,14 +34,15 @@ public class TestOneToManyJoinTableInheritance extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.current();
 
-    assertThat(sql).hasSize(11);
+    assertThat(sql).hasSize(8);
     assertThat(sql.get(0)).contains("insert into class_super ");
-    assertThat(sql.get(2)).contains("insert into monkey ");
-    assertThat(sql.get(2)).contains("insert into monkey ");
-    assertThat(sql.get(5)).contains("insert into class_super_monkey ");
-    assertThat(sql.get(6)).contains("insert into class_super ");
-    assertThat(sql.get(8)).contains("insert into monkey ");
-    assertThat(sql.get(10)).contains("insert into class_super_monkey ");
+    assertThat(sql.get(1)).contains("-- bind(ClassA)");
+    assertThat(sql.get(2)).contains("-- bind(ClassB)");
+    assertThat(sql.get(3)).contains("insert into monkey ");
+    assertThat(sql.get(4)).contains("-- bind(Sim");
+    assertThat(sql.get(5)).contains("-- bind(Tim");
+    assertThat(sql.get(6)).contains("-- bind(Uim");
+    assertThat(sql.get(7)).contains("insert into class_super_monkey (class_super_sid, monkey_mid) values (?, ?)");
 
     ClassA dbA = Ebean.find(ClassA.class, 1);
     ClassB dbB = Ebean.find(ClassB.class, 2);
diff --git a/src/test/java/org/tests/sp/TestManyToManySaveTwice.java b/src/test/java/org/tests/sp/TestManyToManySaveTwice.java
index 7c7654e1d..87d28e87a 100644
--- a/src/test/java/org/tests/sp/TestManyToManySaveTwice.java
+++ b/src/test/java/org/tests/sp/TestManyToManySaveTwice.java
@@ -1,43 +1,107 @@
 package org.tests.sp;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
+import io.ebean.Transaction;
+import org.junit.Test;
 import org.tests.sp.model.car.Car;
 import org.tests.sp.model.car.Wheel;
-import org.junit.Assert;
-import org.junit.Test;
 
 import java.util.LinkedList;
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 public class TestManyToManySaveTwice extends BaseTestCase {
 
+  @Test
+  public void insertBatch() {
+
+    delete();
+
+    Wheel w0 = new Wheel("wx0");
+    Wheel w1 = new Wheel("wx1");
+
+    List<Wheel> wheels = new LinkedList<>();
+    wheels.add(w0);
+    wheels.add(w1);
+
+    DB.saveAll(wheels);
+
+    Car c0 = new Car("cx0");
+    c0.getWheels().add(w0);
+    c0.getWheels().add(w1);
+
+    Car c1 = new Car("cx1");
+    c1.getWheels().add(w1);
+
+    try (Transaction transaction = DB.beginTransaction()) {
+      transaction.setBatchMode(true);
+
+      DB.save(c0);
+      DB.save(c1);
+
+      transaction.commit();
+    }
+  }
+
+
+  @Test
+  public void insertBasic() {
+
+    delete();
+
+    Wheel w0 = new Wheel("wx0");
+    Wheel w1 = new Wheel("wx1");
+
+    List<Wheel> wheels = new LinkedList<>();
+    wheels.add(w0);
+    wheels.add(w1);
+
+    DB.saveAll(wheels);
+
+    Car c0 = new Car("cx0");
+    c0.getWheels().add(w0);
+    c0.getWheels().add(w1);
+
+    Car c1 = new Car("cx1");
+    c1.getWheels().add(w1);
+
+    DB.save(c0);
+    DB.save(c1);
+  }
+
   @Test
   public void testInsertCarTwice() {
 
-    Ebean.createSqlUpdate("delete from sp_car_car_wheels").execute();
-    Ebean.createSqlUpdate("delete from sp_car_wheel").execute();
-    Ebean.createSqlUpdate("delete from sp_car_car").execute();
+    delete();
 
     List<Wheel> wheels = new LinkedList<>();
-    wheels.add(new Wheel());
-    wheels.add(new Wheel());
-    wheels.add(new Wheel());
-    wheels.add(new Wheel());
+    wheels.add(new Wheel("w0"));
+    wheels.add(new Wheel("w1"));
+    wheels.add(new Wheel("w2"));
+    wheels.add(new Wheel("w3"));
 
-    Car c = new Car();
+    Car c = new Car("c1");
     c.setWheels(wheels);
 
-    Ebean.save(c); // NOTE 1ST SAVE
+    DB.save(c); // NOTE 1ST SAVE
+    assertNotNull(c.getId());
 
-    Assert.assertFalse("No ID assigned!", c.getId() == null);
-
-    Ebean.save(c); // NOTE 2ND SAVE
+    DB.save(c); // NOTE 2ND SAVE
 
     List<Car> allCars = Ebean.find(Car.class).findList();
-    Assert.assertEquals("Inserted 1 car, received more/less!", 1, allCars.size());
+    assertEquals(1, allCars.size());
 
     List<Wheel> allWheels = Ebean.find(Wheel.class).findList();
-    Assert.assertEquals("Inserted 4 wheels, received more/less!", 4, allWheels.size());
+    assertEquals(4, allWheels.size());
+  }
+
+  private void delete() {
+    DB.sqlUpdate("delete from sp_car_car_wheels").execute();
+    DB.sqlUpdate("delete from sp_car_wheel").execute();
+    DB.sqlUpdate("delete from sp_car_car").execute();
   }
 }
diff --git a/src/test/java/org/tests/sp/model/car/Car.java b/src/test/java/org/tests/sp/model/car/Car.java
index 8058bd7a4..1c30f5e58 100644
--- a/src/test/java/org/tests/sp/model/car/Car.java
+++ b/src/test/java/org/tests/sp/model/car/Car.java
@@ -16,10 +16,20 @@ public class Car extends IdEntity {
 
   private static final long serialVersionUID = 2579148859565507940L;
 
+  private final String name;
+
   @ManyToMany(cascade = CascadeType.ALL)
   @JoinTable(name = "sp_car_car_wheels", joinColumns = {@JoinColumn(name = "car")}, inverseJoinColumns = {@JoinColumn(name = "wheel")})
   private List<Wheel> wheels;
 
+  public Car(String name) {
+    this.name = name;
+  }
+
+  public String getName() {
+    return name;
+  }
+
   public List<Wheel> getWheels() {
     return wheels;
   }
diff --git a/src/test/java/org/tests/sp/model/car/Wheel.java b/src/test/java/org/tests/sp/model/car/Wheel.java
index 44bf861b0..46d8ad41f 100644
--- a/src/test/java/org/tests/sp/model/car/Wheel.java
+++ b/src/test/java/org/tests/sp/model/car/Wheel.java
@@ -11,4 +11,13 @@ public class Wheel extends IdEntity {
 
   private static final long serialVersionUID = 2399600193947163469L;
 
+  private String name;
+
+  public Wheel(String name) {
+    this.name = name;
+  }
+
+  public String getName() {
+    return name;
+  }
 }

From 9e1d7ab7222250056865ad2b396f6940cfcac0aa Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 7 Feb 2019 17:20:49 +1300
Subject: [PATCH 0714/1036] #1631 - Change logging for SqlUpdate ... such that
 it is more consistent with other SQL logging wrt JDBC batch

---
 .../server/core/PersistRequestUpdateSql.java  | 28 +++++++++---
 .../io/ebeaninternal/server/lib/util/Str.java |  6 ++-
 .../server/persist/ExeUpdateSql.java          | 20 ++++-----
 src/test/java/io/ebean/BaseTestCase.java      | 10 +++++
 .../java/org/tests/merge/TestMergeM2M.java    | 14 +++---
 .../TestElementCollectionBasic.java           | 32 ++++++++------
 .../TestElementCollectionBasicCache.java      | 14 +++---
 .../TestElementCollectionBasicMap.java        | 18 ++++----
 .../TestElementCollectionBasicMapAsLob.java   |  3 +-
 .../TestElementCollectionBasicMapCache.java   | 15 ++++---
 .../TestElementCollectionBasicSet.java        | 18 ++++----
 .../TestElementCollectionEmbeddedList.java    | 18 ++++----
 ...estElementCollectionEmbeddedListCache.java |  8 ++--
 .../TestElementCollectionEmbeddedMap.java     | 18 ++++----
 ...TestElementCollectionEmbeddedMapCache.java |  8 ++--
 .../o2m/jointable/TestOneToManyJoinTable.java | 11 +++--
 .../TestOneToManyJoinTableInheritance.java    |  3 +-
 .../TestOneToManyJoinTableNoTableName.java    |  6 +--
 .../TestSqlUpdateBindMultipleLists.java       |  8 ++++
 .../org/tests/update/TestSqlUpdateInTxn.java  | 43 +++++++++++++++++--
 20 files changed, 192 insertions(+), 109 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
index a1d87937b..7efe8ac49 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
@@ -3,8 +3,10 @@ package io.ebeaninternal.server.core;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiSqlUpdate;
 import io.ebeaninternal.api.SpiTransaction;
+import io.ebeaninternal.server.lib.util.Str;
 import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeaninternal.server.persist.PersistExecute;
+import io.ebeaninternal.server.persist.TrimLogSql;
 
 /**
  * Persist request specifically for CallableSql.
@@ -25,12 +27,12 @@ public final class PersistRequestUpdateSql extends PersistRequest {
 
   private String tableName;
 
-  private String description;
-
   private boolean addBatch;
 
   private boolean forceNoBatch;
 
+  private boolean batchThisRequest;
+
   public PersistRequestUpdateSql(SpiEbeanServer server, SpiSqlUpdate sqlUpdate,
                                  SpiTransaction t, PersistExecute persistExecute, boolean forceNoBatch) {
 
@@ -124,10 +126,9 @@ public final class PersistRequestUpdateSql extends PersistRequest {
    * Specify the type of statement executed. Used to automatically register
    * with the transaction event.
    */
-  public void setType(SqlType sqlType, String tableName, String description) {
+  public void setType(SqlType sqlType, String tableName) {
     this.sqlType = sqlType;
     this.tableName = tableName;
-    this.description = description;
   }
 
   /**
@@ -137,6 +138,20 @@ public final class PersistRequestUpdateSql extends PersistRequest {
     this.bindLog = bindLog;
   }
 
+  public void startBind(boolean batchThisRequest) {
+    this.batchThisRequest = batchThisRequest;
+    super.startBind(batchThisRequest);
+  }
+
+  /**
+   * Log the sql bind used with jdbc batch.
+   */
+  public void logSqlBatchBind() {
+    if (transaction.isLogSql()) {
+      transaction.logSql(Str.add(" -- bind(", bindLog, ")"));
+    }
+  }
+
   /**
    * Perform post execute processing.
    */
@@ -145,9 +160,8 @@ public final class PersistRequestUpdateSql extends PersistRequest {
     if (startNanos > 0) {
       persistExecute.collectSqlUpdate(label, startNanos, rowCount);
     }
-    if (transaction.isLogSummary()) {
-      String m = description + " table[" + tableName + "] rows[" + rowCount + "] bind[" + bindLog + "]";
-      transaction.logSummary(m);
+    if (transaction.isLogSql() && !batchThisRequest) {
+      transaction.logSql(Str.add(TrimLogSql.trim(updateSql.getGeneratedSql()), "; -- bind(", bindLog, ") rows(", String.valueOf(rowCount), ")"));
     }
 
     if (updateSql.isAutoTableMod()) {
diff --git a/src/main/java/io/ebeaninternal/server/lib/util/Str.java b/src/main/java/io/ebeaninternal/server/lib/util/Str.java
index b181a30e3..9f72e7127 100644
--- a/src/main/java/io/ebeaninternal/server/lib/util/Str.java
+++ b/src/main/java/io/ebeaninternal/server/lib/util/Str.java
@@ -15,14 +15,16 @@ public class Str {
     // determine a decent buffer size
     int len = 16 + s0.length() + s1.length();
     for (String arg1 : args) {
-      len += arg1.length();
+      len += (arg1 == null) ? 0 : arg1.length();
     }
 
     // append all the strings into the buffer
     StringBuilder sb = new StringBuilder(len);
     sb.append(s0).append(s1);
     for (String arg : args) {
-      sb.append(arg);
+      if (arg != null) {
+        sb.append(arg);
+      }
     }
     return sb.toString();
   }
diff --git a/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java b/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java
index 01bacb57b..5de0ec48b 100644
--- a/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java
+++ b/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java
@@ -95,15 +95,10 @@ class ExeUpdateSql {
     sql = BindParamsParser.parse(bindParams, sql);
     updateSql.setGeneratedSql(sql);
 
-    boolean logSql = request.isLogSql();
-
     PreparedStatement pstmt;
     if (batchThisRequest) {
-      pstmt = pstmtFactory.getPstmt(t, logSql, sql, request);
+      pstmt = pstmtFactory.getPstmt(t, request.isLogSql(), sql, request);
     } else {
-      if (logSql) {
-        t.logSql(TrimLogSql.trim(sql));
-      }
       pstmt = pstmtFactory.getPstmt(t, sql, request.isGetGeneratedKeys());
     }
 
@@ -120,6 +115,9 @@ class ExeUpdateSql {
 
     // derive the statement type (for TransactionEvent)
     parseUpdate(sql, request);
+    if (batchThisRequest) {
+      request.logSqlBatchBind();
+    }
     return pstmt;
   }
 
@@ -127,16 +125,16 @@ class ExeUpdateSql {
   private void determineType(String word1, String word2, String word3, PersistRequestUpdateSql request) {
 
     if (word1.equalsIgnoreCase("UPDATE")) {
-      request.setType(SqlType.SQL_UPDATE, word2, "UpdateSql");
+      request.setType(SqlType.SQL_UPDATE, word2);
 
     } else if (word1.equalsIgnoreCase("DELETE")) {
-      request.setType(SqlType.SQL_DELETE, word3, "DeleteSql");
+      request.setType(SqlType.SQL_DELETE, word3);
 
     } else if (word1.equalsIgnoreCase("INSERT")) {
-      request.setType(SqlType.SQL_INSERT, word3, "InsertSql");
+      request.setType(SqlType.SQL_INSERT, word3);
 
     } else {
-      request.setType(SqlType.SQL_UNKNOWN, null, "UnknownSql");
+      request.setType(SqlType.SQL_UNKNOWN, null);
     }
   }
 
@@ -160,7 +158,7 @@ class ExeUpdateSql {
     if (spaceCount < 2) {
       // unknown so no automatic L2 cache invalidation performed (so it should instead)
       // be done explicitly via the server.externalModification() method
-      request.setType(SqlType.SQL_UNKNOWN, null, "UnknownSql");
+      request.setType(SqlType.SQL_UNKNOWN, null);
 
     } else {
       // try to determine if it is insert, update or delete and the table involved
diff --git a/src/test/java/io/ebean/BaseTestCase.java b/src/test/java/io/ebean/BaseTestCase.java
index c0c5bb672..96b661c11 100644
--- a/src/test/java/io/ebean/BaseTestCase.java
+++ b/src/test/java/io/ebean/BaseTestCase.java
@@ -94,6 +94,16 @@ public abstract class BaseTestCase {
     return trimSql(query.getGeneratedSql(), columns);
   }
 
+  protected void assertSqlBind(List<String> sql, int i) {
+    assertThat(sql.get(i)).contains("-- bind");
+  }
+
+  protected void assertSqlBind(List<String> sql, int from, int to) {
+    for (int i = from; i <= to; i++) {
+      assertThat(sql.get(i)).contains("-- bind");
+    }
+  }
+
   protected String trimSql(String sql) {
 
     if (sql.contains(" c1,")) {
diff --git a/src/test/java/org/tests/merge/TestMergeM2M.java b/src/test/java/org/tests/merge/TestMergeM2M.java
index fe955b713..706aa1b5c 100644
--- a/src/test/java/org/tests/merge/TestMergeM2M.java
+++ b/src/test/java/org/tests/merge/TestMergeM2M.java
@@ -41,12 +41,12 @@ public class TestMergeM2M extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(3);
+      assertThat(sql).hasSize(6);
       assertThat(sql.get(0)).contains("select");
       assertThat(sql.get(1)).contains("insert into mmachine");
       assertThat(sql.get(2)).contains("insert into mmachine_mgroup");
-    }
-    else {
+      assertSqlBind(sql, 3, 5);
+    } else {
       assertThat(sql).hasSize(5);
       assertThat(sql.get(0)).contains("select");
       assertThat(sql.get(1)).contains("insert into mmachine");
@@ -66,11 +66,13 @@ public class TestMergeM2M extends BaseTestCase {
     Ebean.merge(m1, options);
 
     sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(4);
+    assertThat(sql).hasSize(9);
     assertThat(sql.get(0)).contains("select");
     assertThat(sql.get(1)).contains("delete from mmachine_mgroup");
-    assertThat(sql.get(2)).contains("insert into mmachine_mgroup");
-    assertThat(sql.get(3)).contains("update mmachine");
+    assertSqlBind(sql, 2, 4);
 
+    assertThat(sql.get(5)).contains("insert into mmachine_mgroup");
+    assertSqlBind(sql, 6, 7);
+    assertThat(sql.get(8)).contains("update mmachine");
   }
 }
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
index 03daa1dab..b825f964d 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
@@ -30,11 +30,11 @@ public class TestElementCollectionBasic extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(2);
+      assertThat(sql).hasSize(4);
       assertThat(sql.get(0)).contains("insert into ec_person");
       assertThat(sql.get(1)).contains("insert into ec_person_phone");
-    }
-    else {
+      assertSqlBind(sql, 2, 3);
+    } else {
       assertThat(sql).hasSize(3);
       assertThat(sql.get(0)).contains("insert into ec_person");
       assertThat(sql.get(1)).contains("insert into ec_person_phone");
@@ -130,12 +130,13 @@ public class TestElementCollectionBasic extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(3);
+      assertThat(sql).hasSize(6);
       assertThat(sql.get(0)).contains("update ec_person set name=?, version=? where id=? and version=?");
       assertThat(sql.get(1)).contains("delete from ec_person_phone where owner_id=?");
       assertThat(sql.get(2)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
-    }
-    else {
+      assertSqlBind(sql, 3, 5);
+
+    } else {
       assertThat(sql).hasSize(5);
       assertThat(sql.get(0)).contains("update ec_person set name=?, version=? where id=? and version=?");
       assertThat(sql.get(1)).contains("delete from ec_person_phone where owner_id=?");
@@ -160,10 +161,12 @@ public class TestElementCollectionBasic extends BaseTestCase {
     }
 
     List<String> sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(4);
+    assertThat(sql).hasSize(9);
     assertThat(sql.get(0)).contains("update ec_person set name=?, version=? where id=? and version=?");
     assertThat(sql.get(2)).contains("delete from ec_person_phone where owner_id=?");
-    assertThat(sql.get(3)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
+    assertSqlBind(sql, 3);
+    assertThat(sql.get(4)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
+    assertSqlBind(sql, 5, 8);
 
     assertThat(eventLog()).containsExactly("preUpdate", "postUpdate");
 
@@ -192,9 +195,11 @@ public class TestElementCollectionBasic extends BaseTestCase {
     }
 
     List<String> sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(2);
+    assertThat(sql).hasSize(8);
     assertThat(sql.get(0)).contains("delete from ec_person_phone where owner_id=?");
-    assertThat(sql.get(1)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
+    assertSqlBind(sql, 1);
+    assertThat(sql.get(2)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
+    assertSqlBind(sql, 3, 7);
 
     assertThat(eventLog()).containsExactly("preUpdate", "postUpdate");
 
@@ -208,11 +213,12 @@ public class TestElementCollectionBasic extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(2);
+      assertThat(sql).hasSize(8);
       assertThat(sql.get(0)).contains("delete from ec_person_phone where owner_id=?");
       assertThat(sql.get(1)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
-    }
-    else {
+      assertSqlBind(sql, 2, 7);
+
+    } else {
       assertThat(sql).hasSize(7);
       assertThat(sql.get(0)).contains("delete from ec_person_phone where owner_id=?");
       assertThat(sql.get(1)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)");
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java
index 52bdb65d9..e36c86a53 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java
@@ -1,5 +1,6 @@
 package org.tests.model.elementcollection;
 
+import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.annotation.PersistBatch;
 import io.ebeaninternal.api.SpiEbeanServer;
@@ -10,7 +11,7 @@ import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TestElementCollectionBasicCache {
+public class TestElementCollectionBasicCache extends BaseTestCase {
 
   @Test
   public void test() {
@@ -42,9 +43,9 @@ public class TestElementCollectionBasicCache {
 
     sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(3);
-    }
-    else {
+      assertThat(sql).hasSize(6);
+      assertSqlBind(sql, 3, 5);
+    } else {
       assertThat(sql).hasSize(5);
     }
 
@@ -68,9 +69,8 @@ public class TestElementCollectionBasicCache {
 
     sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(2); // cache hit
-    }
-    else {
+      assertThat(sql).hasSize(6); // cache hit
+    } else {
       assertThat(sql).hasSize(5); // cache hit
     }
 
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
index f3c5c49e0..225a7316d 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
@@ -25,11 +25,11 @@ public class TestElementCollectionBasicMap extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(2);
+      assertThat(sql).hasSize(4);
       assertThat(sql.get(0)).contains("insert into ecm_person");
       assertThat(sql.get(1)).contains("insert into ecm_person_phone");
-    }
-    else {
+      assertSqlBind(sql, 2, 3);
+    } else {
       assertThat(sql).hasSize(3);
       assertThat(sql.get(0)).contains("insert into ecm_person");
       assertThat(sql.get(1)).contains("insert into ecm_person_phone");
@@ -105,12 +105,12 @@ public class TestElementCollectionBasicMap extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(3);
+      assertThat(sql).hasSize(6);
       assertThat(sql.get(0)).contains("update ecm_person set name=?, version=? where id=? and version=?");
       assertThat(sql.get(1)).contains("delete from ecm_person_phone_numbers where ecm_person_id=?");
       assertThat(sql.get(2)).contains("insert into ecm_person_phone_numbers (ecm_person_id,type,number) values (?,?,?)");
-    }
-    else {
+      assertSqlBind(sql, 3, 5);
+    } else {
       assertThat(sql).hasSize(5);
       assertThat(sql.get(0)).contains("update ecm_person set name=?, version=? where id=? and version=?");
       assertThat(sql.get(1)).contains("delete from ecm_person_phone_numbers where ecm_person_id=?");
@@ -139,11 +139,11 @@ public class TestElementCollectionBasicMap extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(2);
+      assertThat(sql).hasSize(6);
       assertThat(sql.get(0)).contains("delete from ecm_person_phone_numbers where ecm_person_id=?");
       assertThat(sql.get(1)).contains("insert into ecm_person_phone_numbers (ecm_person_id,type,number) values (?,?,?)");
-    }
-    else {
+      assertSqlBind(sql, 2, 5);
+    } else {
       assertThat(sql).hasSize(5);
       assertThat(sql.get(0)).contains("delete from ecm_person_phone_numbers where ecm_person_id=?");
       assertThat(sql.get(1)).contains("insert into ecm_person_phone_numbers (ecm_person_id,type,number) values (?,?,?)");
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java
index 60e140434..3b65b22ba 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java
@@ -23,9 +23,10 @@ public class TestElementCollectionBasicMapAsLob extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(2);
+      assertThat(sql).hasSize(4);
       assertThat(sql.get(0)).contains("insert into ecmc_person");
       assertThat(sql.get(1)).contains("insert into ecmc_person_phone");
+      assertSqlBind(sql, 2, 3);
     } else {
       assertThat(sql).hasSize(3);
       assertThat(sql.get(0)).contains("insert into ecmc_person");
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java
index 1c5317516..3e33693c9 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java
@@ -1,5 +1,6 @@
 package org.tests.model.elementcollection;
 
+import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.annotation.PersistBatch;
 import io.ebeaninternal.api.SpiEbeanServer;
@@ -10,7 +11,7 @@ import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TestElementCollectionBasicMapCache {
+public class TestElementCollectionBasicMapCache extends BaseTestCase {
 
   @Test
   public void test() {
@@ -44,9 +45,9 @@ public class TestElementCollectionBasicMapCache {
 
     sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(3);
-    }
-    else {
+      assertThat(sql).hasSize(6);
+      assertSqlBind(sql, 3, 5);
+    } else {
       assertThat(sql).hasSize(5);
     }
 
@@ -72,9 +73,9 @@ public class TestElementCollectionBasicMapCache {
 
     sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(2); // cache hit
-    }
-    else {
+      assertThat(sql).hasSize(4); // cache hit
+      assertSqlBind(sql, 2, 3);
+    } else {
       assertThat(sql).hasSize(3); // cache hit
     }
 
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java
index 2d240671a..ea0e3c213 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java
@@ -24,11 +24,11 @@ public class TestElementCollectionBasicSet extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(2);
+      assertThat(sql).hasSize(4);
       assertThat(sql.get(0)).contains("insert into ecs_person");
       assertThat(sql.get(1)).contains("insert into ecs_person_phone");
-    }
-    else {
+      assertSqlBind(sql, 2, 3);
+    } else {
       assertThat(sql).hasSize(3);
       assertThat(sql.get(0)).contains("insert into ecs_person");
       assertThat(sql.get(1)).contains("insert into ecs_person_phone");
@@ -103,12 +103,12 @@ public class TestElementCollectionBasicSet extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(3);
+      assertThat(sql).hasSize(6);
       assertThat(sql.get(0)).contains("update ecs_person set name=?, version=? where id=? and version=?");
       assertThat(sql.get(1)).contains("delete from ecs_person_phone where ecs_person_id=?");
       assertThat(sql.get(2)).contains("insert into ecs_person_phone (ecs_person_id,phone) values (?,?)");
-    }
-    else {
+      assertSqlBind(sql, 3, 5);
+    } else {
       assertThat(sql).hasSize(5);
       assertThat(sql.get(0)).contains("update ecs_person set name=?, version=? where id=? and version=?");
       assertThat(sql.get(1)).contains("delete from ecs_person_phone where ecs_person_id=?");
@@ -137,11 +137,11 @@ public class TestElementCollectionBasicSet extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(2);
+      assertThat(sql).hasSize(6);
       assertThat(sql.get(0)).contains("delete from ecs_person_phone where ecs_person_id=?");
       assertThat(sql.get(1)).contains("insert into ecs_person_phone (ecs_person_id,phone) values (?,?)");
-    }
-    else {
+      assertSqlBind(sql, 2, 5);
+    } else {
       assertThat(sql).hasSize(5);
       assertThat(sql.get(0)).contains("delete from ecs_person_phone where ecs_person_id=?");
       assertThat(sql.get(1)).contains("insert into ecs_person_phone (ecs_person_id,phone) values (?,?)");
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java
index 8d4cfbd0c..923054961 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java
@@ -23,11 +23,11 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(2);
+      assertThat(sql).hasSize(4);
       assertThat(sql.get(0)).contains("insert into ecbl_person");
       assertThat(sql.get(1)).contains("insert into ecbl_person_phone_numbers");
-    }
-    else {
+      assertSqlBind(sql, 2, 3);
+    } else {
       assertThat(sql).hasSize(3);
       assertThat(sql.get(0)).contains("insert into ecbl_person");
       assertThat(sql.get(1)).contains("insert into ecbl_person_phone_numbers");
@@ -103,12 +103,12 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(3);
+      assertThat(sql).hasSize(6);
       assertThat(sql.get(0)).contains("update ecbl_person set name=?, version=? where id=? and version=?");
       assertThat(sql.get(1)).contains("delete from ecbl_person_phone_numbers where person_id=?");
       assertThat(sql.get(2)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,number) values (?,?,?,?)");
-    }
-    else {
+      assertSqlBind(sql, 3, 5);
+    } else {
       assertThat(sql).hasSize(5);
       assertThat(sql.get(0)).contains("update ecbl_person set name=?, version=? where id=? and version=?");
       assertThat(sql.get(1)).contains("delete from ecbl_person_phone_numbers where person_id=?");
@@ -137,11 +137,11 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(2);
+      assertThat(sql).hasSize(6);
       assertThat(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id=?");
       assertThat(sql.get(1)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,number) values (?,?,?,?)");
-    }
-    else {
+      assertSqlBind(sql, 2, 5);
+    } else {
       assertThat(sql).hasSize(5);
       assertThat(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id=?");
       assertThat(sql.get(1)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,number) values (?,?,?,?)");
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java
index b9425e59f..a1153b074 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java
@@ -48,11 +48,11 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase {
 
     sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(2); // update of collection only
+      assertThat(sql).hasSize(4); // update of collection only
       assertThat(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id=?");
       assertThat(sql.get(1)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,number) values (?,?,?,?)");
-    }
-    else {
+      assertSqlBind(sql, 2, 3);
+    } else {
       assertThat(sql).hasSize(3); // update of collection only
       assertThat(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id=?");
       assertThat(sql.get(1)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,number) values (?,?,?,?)");
@@ -76,7 +76,7 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase {
     Ebean.save(three);
 
     sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(3);
+    assertThat(sql).hasSize(4);
 
     EcblPerson four = Ebean.find(EcblPerson.class)
       .setId(person.getId())
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java
index 4a6419c0e..5d13fcf5e 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java
@@ -24,11 +24,11 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(2);
+      assertThat(sql).hasSize(4);
       assertThat(sql.get(0)).contains("insert into ecbm_person");
       assertThat(sql.get(1)).contains("insert into ecbm_person_phone_numbers");
-    }
-    else {
+      assertSqlBind(sql, 2, 3);
+    } else {
       assertThat(sql).hasSize(3);
       assertThat(sql.get(0)).contains("insert into ecbm_person");
       assertThat(sql.get(1)).contains("insert into ecbm_person_phone_numbers");
@@ -96,12 +96,12 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(3);
+      assertThat(sql).hasSize(6);
       assertThat(sql.get(0)).contains("update ecbm_person set name=?, version=? where id=? and version=?");
       assertThat(sql.get(1)).contains("delete from ecbm_person_phone_numbers where person_id=?");
       assertThat(sql.get(2)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number)");
-    }
-    else {
+      assertSqlBind(sql, 3, 5);
+    } else {
       assertThat(sql).hasSize(5);
       assertThat(sql.get(0)).contains("update ecbm_person set name=?, version=? where id=? and version=?");
       assertThat(sql.get(1)).contains("delete from ecbm_person_phone_numbers where person_id=?");
@@ -130,11 +130,11 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(2);
+      assertThat(sql).hasSize(6);
       assertThat(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id=?");
       assertThat(sql.get(1)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number) values (?,?,?,?,?)");
-    }
-    else {
+      assertSqlBind(sql, 2, 5);
+    } else {
       assertThat(sql).hasSize(5);
       assertThat(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id=?");
       assertThat(sql.get(1)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number) values (?,?,?,?,?)");
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java
index 4aa75ed22..9fe0ecc21 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java
@@ -49,11 +49,11 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase {
 
     sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(2); // update of collection only
+      assertThat(sql).hasSize(4); // update of collection only
       assertThat(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id=?");
       assertThat(sql.get(1)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number) values (?,?,?,?,?)");
-    }
-    else {
+      assertSqlBind(sql, 2, 3);
+    } else {
       assertThat(sql).hasSize(3); // update of collection only
       assertThat(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id=?");
       assertThat(sql.get(1)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number) values (?,?,?,?,?)");
@@ -77,7 +77,7 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase {
     Ebean.save(three);
 
     sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(3);
+    assertThat(sql).hasSize(4);
 
     EcbmPerson four = Ebean.find(EcbmPerson.class)
       .setId(person.getId())
diff --git a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java
index 790a4eb82..bf42893b3 100644
--- a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java
+++ b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java
@@ -38,10 +38,11 @@ public class TestOneToManyJoinTable extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(1);
+      assertThat(sql).hasSize(3);
       assertThat(sql.get(0)).contains("insert into troop_monkey (troop_pid, monkey_mid) values (?, ?)");
-    }
-    else {
+      assertSqlBind(sql, 1, 2);
+
+    } else {
       assertThat(sql).hasSize(2);
       assertThat(sql.get(0)).contains("insert into troop_monkey (troop_pid, monkey_mid) values (?, ?)");
       assertThat(sql.get(1)).contains("insert into troop_monkey (troop_pid, monkey_mid) values (?, ?)");
@@ -96,12 +97,14 @@ public class TestOneToManyJoinTable extends BaseTestCase {
     //Collections.sort(sql);
 
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(8);
+      assertThat(sql).hasSize(13);
       assertThat(sql.get(0)).contains("insert into trainer ");
       assertThat(sql.get(1)).contains("insert into monkey ");
+      assertSqlBind(sql, 2, 4);
       assertThat(sql.get(5)).contains("update monkey set name=?, food_preference=?, version=? where mid=? and version=?");
       assertThat(sql.get(6)).contains("-- bind(");
       assertThat(sql.get(7)).contains("insert into trainer_monkey ");
+      assertSqlBind(sql, 8, 12);
 
     } else {
       assertThat(sql).hasSize(10);
diff --git a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java
index 386d83745..f3f75a7a6 100644
--- a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java
+++ b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java
@@ -34,7 +34,7 @@ public class TestOneToManyJoinTableInheritance extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.current();
 
-    assertThat(sql).hasSize(8);
+    assertThat(sql).hasSize(11);
     assertThat(sql.get(0)).contains("insert into class_super ");
     assertThat(sql.get(1)).contains("-- bind(ClassA)");
     assertThat(sql.get(2)).contains("-- bind(ClassB)");
@@ -43,6 +43,7 @@ public class TestOneToManyJoinTableInheritance extends BaseTestCase {
     assertThat(sql.get(5)).contains("-- bind(Tim");
     assertThat(sql.get(6)).contains("-- bind(Uim");
     assertThat(sql.get(7)).contains("insert into class_super_monkey (class_super_sid, monkey_mid) values (?, ?)");
+    assertSqlBind(sql, 8, 10);
 
     ClassA dbA = Ebean.find(ClassA.class, 1);
     ClassB dbB = Ebean.find(ClassB.class, 2);
diff --git a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java
index 3ba5331e2..3df05d0e8 100644
--- a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java
+++ b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java
@@ -38,10 +38,10 @@ public class TestOneToManyJoinTableNoTableName extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
-      assertThat(sql).hasSize(1);
+      assertThat(sql).hasSize(3);
       assertThat(sql.get(0)).contains("insert into mkeygroup_monkey (mkeygroup_pid, monkey_mid) values (?, ?)");
-    }
-    else {
+      assertSqlBind(sql, 1, 2);
+    } else {
       assertThat(sql).hasSize(2);
       assertThat(sql.get(0)).contains("insert into mkeygroup_monkey (mkeygroup_pid, monkey_mid) values (?, ?)");
       assertThat(sql.get(1)).contains("insert into mkeygroup_monkey (mkeygroup_pid, monkey_mid) values (?, ?)");
diff --git a/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java b/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java
index acef06709..5019339c0 100644
--- a/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java
+++ b/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java
@@ -3,9 +3,13 @@ package org.tests.update;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.SqlUpdate;
+import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
+import java.util.List;
+
 import static java.util.Arrays.asList;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 
 public class TestSqlUpdateBindMultipleLists extends BaseTestCase {
@@ -13,6 +17,8 @@ public class TestSqlUpdateBindMultipleLists extends BaseTestCase {
   @Test
   public void test() {
 
+    LoggedSqlCollector.start();
+
     SqlUpdate sqlUpdate = Ebean.createSqlUpdate("delete from o_customer where id in (:ids)");
 
     sqlUpdate.setParameter("ids", asList(9991, 9992, 9993));
@@ -24,6 +30,8 @@ public class TestSqlUpdateBindMultipleLists extends BaseTestCase {
     sqlUpdate.execute();
     assertEquals("delete from o_customer where id in (?,?)", sqlUpdate.getGeneratedSql());
 
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(2);
   }
 
 
diff --git a/src/test/java/org/tests/update/TestSqlUpdateInTxn.java b/src/test/java/org/tests/update/TestSqlUpdateInTxn.java
index 673f72b01..1f6593315 100644
--- a/src/test/java/org/tests/update/TestSqlUpdateInTxn.java
+++ b/src/test/java/org/tests/update/TestSqlUpdateInTxn.java
@@ -5,6 +5,7 @@ import io.ebean.Ebean;
 import io.ebean.SqlUpdate;
 import io.ebean.Transaction;
 import io.ebean.meta.MetaTimedMetric;
+import org.ebeantest.LoggedSqlCollector;
 import org.junit.Assert;
 import org.junit.Test;
 import org.tests.idkeys.db.AuditLog;
@@ -42,19 +43,55 @@ public class TestSqlUpdateInTxn extends BaseTestCase {
   @Test
   public void testExecute_inTransaction_withBatch() {
 
+    LoggedSqlCollector.start();
+
     try (Transaction transaction = Ebean.beginTransaction()) {
       transaction.setBatchMode(true);
 
-      int row = Ebean.createSqlUpdate("update audit_log set description = description where id = ?")
-        .setParameter(1, 999999)
-        .execute();
+      SqlUpdate sqlUpdate = Ebean.createSqlUpdate("update audit_log set description = description where id = ?")
+        .setParameter(1, 999999);
 
+      int row = sqlUpdate.execute();
       // update statement using JDBC batch so not executed yet
       assertThat(row).isEqualTo(-1);
 
+      sqlUpdate.setParameter(1, 999998);
+      sqlUpdate.execute();
+
       transaction.commit();
     }
 
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(3);
+    assertThat(sql.get(0)).contains("update audit_log set description = description where id = ?");
+    assertSqlBind(sql, 1, 2);
+  }
+
+  @Test
+  public void testExecute_inTransaction_withoutBatch() {
+
+    LoggedSqlCollector.start();
+
+    try (Transaction transaction = Ebean.beginTransaction()) {
+      transaction.setBatchMode(false);
+
+      SqlUpdate sqlUpdate = Ebean.createSqlUpdate("update audit_log set description = description where id = ?")
+        .setParameter(1, 999999);
+
+      int row0 = sqlUpdate.execute();
+      assertThat(row0).isEqualTo(0);
+
+      sqlUpdate.setParameter(1, 999998);
+      int row1 = sqlUpdate.execute();
+      assertThat(row1).isEqualTo(0);
+
+      transaction.commit();
+    }
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("update audit_log set description = description where id = ?; -- bind(999999)");
+    assertThat(sql.get(1)).contains("update audit_log set description = description where id = ?; -- bind(999998)");
   }
 
   @Test

From 988e4c7386211e9d845cff3bfc5ef0c6e7d65ab3 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 7 Feb 2019 21:10:57 +1300
Subject: [PATCH 0715/1036] WIP Bind parameter expansion

---
 .../java/io/ebeaninternal/api/BindParams.java |   8 +
 .../io/ebeaninternal/api/SpiSqlUpdate.java    |   5 +
 .../server/core/DefaultSqlUpdate.java         |  31 +++-
 .../server/persist/ExeUpdateSql.java          |   5 +-
 .../TestSqlUpdateBindMultipleLists.java       | 137 ++++++++++++++++--
 5 files changed, 165 insertions(+), 21 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/api/BindParams.java b/src/main/java/io/ebeaninternal/api/BindParams.java
index 0d5651323..4188b20b2 100644
--- a/src/main/java/io/ebeaninternal/api/BindParams.java
+++ b/src/main/java/io/ebeaninternal/api/BindParams.java
@@ -41,6 +41,14 @@ public class BindParams implements Serializable {
   public BindParams() {
   }
 
+  /**
+   * Reset positioned parameters (usually due to bind parameter expansion).
+   */
+  public void reset() {
+    bindHash = null;
+    positionedParameters.clear();
+  }
+
   public int queryBindHash() {
     int hc = namedParameters.hashCode();
     for (Param positionedParameter : positionedParameters) {
diff --git a/src/main/java/io/ebeaninternal/api/SpiSqlUpdate.java b/src/main/java/io/ebeaninternal/api/SpiSqlUpdate.java
index a7c8c6e7f..3f2ee2c3e 100644
--- a/src/main/java/io/ebeaninternal/api/SpiSqlUpdate.java
+++ b/src/main/java/io/ebeaninternal/api/SpiSqlUpdate.java
@@ -4,6 +4,11 @@ import io.ebean.SqlUpdate;
 
 public interface SpiSqlUpdate extends SqlUpdate {
 
+  /**
+   * Return the sql taking into account bind parameter expansion.
+   */
+  String getBaseSql();
+
   /**
    * Return the Bind parameters.
    */
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java b/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
index 04390da12..e7d2195f6 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
@@ -36,9 +36,14 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
   private final BindParams bindParams;
 
   /**
-   * The sql update or delete statement.
+   * The original sql update or delete statement.
    */
-  private final String sql;
+  private final String origSql;
+
+  /**
+   * The sql taking into account bind parameter expansion.
+   */
+  private String baseSql;
 
   /**
    * The actual sql with named parameters converted.
@@ -92,7 +97,8 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
    */
   public DefaultSqlUpdate(SpiEbeanServer server, String sql, BindParams bindParams) {
     this.server = server;
-    this.sql = sql;
+    this.origSql = sql;
+    this.baseSql = sql;
     this.bindParams = bindParams;
   }
 
@@ -224,11 +230,21 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
   @Override
   public void setGeneratedSql(String generatedSql) {
     this.generatedSql = generatedSql;
+    this.baseSql = origSql;
+    if (bindExpansion > 0) {
+      bindParams.reset();
+      bindExpansion = 0;
+    }
   }
 
   @Override
   public String getSql() {
-    return sql;
+    return origSql;
+  }
+
+  @Override
+  public String getBaseSql() {
+    return baseSql;
   }
 
   @Override
@@ -259,6 +275,7 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
   private SqlUpdate setParamWithBindExpansion(int position, Collection values, String bindLiteral) {
 
     StringBuilder sqlExpand = new StringBuilder(values.size() * 2);
+    position = position + bindExpansion;
     int offset = 0;
     for (Object val : values) {
       if (offset > 0) {
@@ -267,8 +284,8 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
       sqlExpand.append("?");
       bindParams.setParameter(position + offset++, val);
     }
-    bindExpansion += offset;
-    generatedSql = generatedSql.replace(bindLiteral, sqlExpand.toString());
+    bindExpansion += (offset - 1);
+    baseSql = baseSql.replace(bindLiteral, sqlExpand.toString());
     return this;
   }
 
@@ -277,7 +294,7 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
 
     if (value instanceof Collection) {
       String bindLiteral = "?" + position;
-      int pos = sql.indexOf(bindLiteral);
+      int pos = baseSql.indexOf(bindLiteral);
       if (pos > -1) {
         return setParamWithBindExpansion(position, (Collection) value, bindLiteral);
       }
diff --git a/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java b/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java
index 01bacb57b..c753d2e23 100644
--- a/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java
+++ b/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java
@@ -87,13 +87,11 @@ class ExeUpdateSql {
     SpiSqlUpdate updateSql = request.getUpdateSql();
     SpiTransaction t = request.getTransaction();
 
-    String sql = updateSql.getSql();
-
     BindParams bindParams = updateSql.getBindParams();
 
     // process named parameters if required
+    String sql = updateSql.getBaseSql();
     sql = BindParamsParser.parse(bindParams, sql);
-    updateSql.setGeneratedSql(sql);
 
     boolean logSql = request.isLogSql();
 
@@ -117,6 +115,7 @@ class ExeUpdateSql {
     }
 
     request.setBindLog(bindLog);
+    updateSql.setGeneratedSql(sql);
 
     // derive the statement type (for TransactionEvent)
     parseUpdate(sql, request);
diff --git a/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java b/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java
index 0bad6f45c..5ef4c5dc3 100644
--- a/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java
+++ b/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java
@@ -61,7 +61,6 @@ public class TestSqlUpdateBindMultipleLists extends BaseTestCase {
     sqlUpdate.setParameter(1, 90);
     sqlUpdate.setParameter(2, asList(9991, 9992, 9993));
     sqlUpdate.setParameter(3, 91);
-
     sqlUpdate.execute();
 
     assertEquals("delete from o_customer where id > ? and id in (?,?,?) and id < ?", sqlUpdate.getGeneratedSql());
@@ -71,7 +70,6 @@ public class TestSqlUpdateBindMultipleLists extends BaseTestCase {
   public void positionParamsExpansion_withPrePost_usingParam() {
 
     SqlUpdate sqlUpdate = Ebean.createSqlUpdate("delete from o_customer where id > ? and id in (?2) and id < ?");
-
     sqlUpdate.setParams(90, asList(9991, 9992, 9993), 91);
     sqlUpdate.execute();
 
@@ -85,12 +83,32 @@ public class TestSqlUpdateBindMultipleLists extends BaseTestCase {
 
     sqlUpdate.setParameter(1, "Foo");
     sqlUpdate.setParameter(2, asList(9991, 9992, 9993));
-
     sqlUpdate.execute();
 
     assertEquals("delete from o_customer where name = ? and id in (?,?,?)", sqlUpdate.getGeneratedSql());
   }
 
+  @Test
+  public void positionParamsExpansion_multi() {
+
+    SqlUpdate upd = DB.sqlUpdate("delete from o_customer where id in (?1) and name in (?2) and id not in (?3)");
+
+    try (Transaction transaction = DB.beginTransaction()) {
+      transaction.setBatchMode(true);
+
+      upd.setParams(asList(9991), asList("Foo"), asList("Bar"));
+      upd.execute();
+
+      upd.setParams(asList(9991, 9992), asList("Foo", "Bar"), asList(1,2,3,4));
+      upd.execute();
+
+      upd.setParams(asList(9991), asList("Foo", "Bar", "Baz"), asList(1,2));
+      upd.execute();
+
+      transaction.commit();
+    }
+  }
+
   @Test
   public void positionParamsExpansion_withPost() {
 
@@ -104,29 +122,126 @@ public class TestSqlUpdateBindMultipleLists extends BaseTestCase {
   }
 
   @Test
-  public void positionParamsExpansion_withPost_andBatch() {
+  public void positionParamsExpansion_withPost_andBatch_execute() {
 
-    SqlUpdate upd = Ebean.createSqlUpdate("delete from o_customer where id in (:ids) and name = :name");
+    SqlUpdate upd = DB.sqlUpdate("delete from o_customer where id in (?1) and name = ?");
 
     try (Transaction transaction = DB.beginTransaction()) {
       transaction.setBatchMode(true);
 
-      upd.setParameter("ids", asList(9991, 9992, 9993));
-      upd.setParameter("name", "Foo");
+      upd.setParams(asList(9991, 9992, 9993), "Foo");
       upd.execute();
 
-      upd.setParameter("ids", asList(9991, 9992));
-      upd.setParameter("name", "Bar");
+      upd.setParams(asList(9991, 9992), "Bar");
       upd.execute();
 
-      upd.setParameter("ids", asList(9991, 9992, 9999));
-      upd.setParameter("name", "Baz");
+      upd.setParams(asList(9991, 9992, 9999), "Baz");
       upd.execute();
 
       transaction.commit();
     }
   }
 
+  @Test
+  public void positionParamsExpansion_withPost_addBatch_execute() {
+
+    SqlUpdate upd = DB.sqlUpdate("delete from o_customer where id in (?1) and name = ?");
+
+    try (Transaction transaction = DB.beginTransaction()) {
+      transaction.setBatchMode(true);
+
+      upd.setParams(asList(9991, 9992, 9993), "Foo");
+      upd.addBatch();
+
+      upd.setParams(asList(9991, 9992), "Bar");
+      upd.addBatch();
+
+      upd.setParams(asList(9991, 9992, 9999), "Baz");
+      upd.addBatch();
+
+      transaction.commit();
+    }
+  }
+
+  @Test
+  public void test_multipleLists_asPositioned() {
+
+    SqlUpdate sqlUpdate = DB.sqlUpdate("delete from o_customer where id in (?1) and name in (?2)");
+
+    try (Transaction transaction = DB.beginTransaction()) {
+
+      sqlUpdate.setParameter(1, asList(9991, 9992, 9993));
+      sqlUpdate.setParameter(2, asList("rob", "jim"));
+      sqlUpdate.execute();
+      assertEquals("delete from o_customer where id in (?,?,?) and name in (?,?)", sqlUpdate.getGeneratedSql());
+
+      sqlUpdate.setParams(asList(9991, 9992), asList("rob", "jim", "sd"));
+      sqlUpdate.execute();
+      assertEquals("delete from o_customer where id in (?,?) and name in (?,?,?)", sqlUpdate.getGeneratedSql());
+
+      sqlUpdate.setParameter(1, asList(9991, 9992));
+      sqlUpdate.setParameter(2, asList("rob", "jim"));
+      sqlUpdate.execute();
+      assertEquals("delete from o_customer where id in (?,?) and name in (?,?)", sqlUpdate.getGeneratedSql());
+
+      sqlUpdate.setParams(asList(9991), asList("rob", "jim"));
+      sqlUpdate.execute();
+      assertEquals("delete from o_customer where id in (?) and name in (?,?)", sqlUpdate.getGeneratedSql());
+
+
+      sqlUpdate.setParams(asList(9992), asList("ro3b", "j3im"));
+      sqlUpdate.execute();
+      assertEquals("delete from o_customer where id in (?) and name in (?,?)", sqlUpdate.getGeneratedSql());
+
+      sqlUpdate.setParameter(1, asList(9992, 4545));
+      sqlUpdate.setParameter(2, asList("ro3b"));
+      sqlUpdate.execute();
+      assertEquals("delete from o_customer where id in (?,?) and name in (?)", sqlUpdate.getGeneratedSql());
+
+      transaction.commit();
+    }
+  }
+
+  @Test
+  public void test_multipleLists_asPositioned_withBatch() {
+
+    SqlUpdate sqlUpdate = DB.sqlUpdate("delete from o_customer where id in (?1) and name in (?2)");
+
+    try (Transaction transaction = DB.beginTransaction()) {
+      transaction.setBatchMode(true);
+
+      sqlUpdate.setParameter(1, asList(9991, 9992, 9993));
+      sqlUpdate.setParameter(2, asList("rob", "jim"));
+      sqlUpdate.execute();
+      assertEquals("delete from o_customer where id in (?,?,?) and name in (?,?)", sqlUpdate.getGeneratedSql());
+
+      sqlUpdate.setParams(asList(9991, 9992), asList("rob", "jim", "sd"));
+      sqlUpdate.execute();
+      assertEquals("delete from o_customer where id in (?,?) and name in (?,?,?)", sqlUpdate.getGeneratedSql());
+
+      sqlUpdate.setParameter(1, asList(9991, 9992));
+      sqlUpdate.setParameter(2, asList("rob", "jim"));
+      sqlUpdate.execute();
+      assertEquals("delete from o_customer where id in (?,?) and name in (?,?)", sqlUpdate.getGeneratedSql());
+
+      sqlUpdate.setParams(asList(9991), asList("rob", "jim"));
+      sqlUpdate.execute();
+      assertEquals("delete from o_customer where id in (?) and name in (?,?)", sqlUpdate.getGeneratedSql());
+
+
+      sqlUpdate.setParams(asList(9992), asList("ro3b", "j3im"));
+      sqlUpdate.execute();
+      assertEquals("delete from o_customer where id in (?) and name in (?,?)", sqlUpdate.getGeneratedSql());
+
+      sqlUpdate.setParameter(1, asList(9992, 4545));
+      sqlUpdate.setParameter(2, asList("ro3b"));
+      sqlUpdate.execute();
+      assertEquals("delete from o_customer where id in (?,?) and name in (?)", sqlUpdate.getGeneratedSql());
+
+      transaction.commit();
+    }
+  }
+
   @Test
   public void test_multipleLists() {
 

From ea60e42a4d597a67f5319ac2af751ee16fe42cd0 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 7 Feb 2019 23:29:42 +1300
Subject: [PATCH 0716/1036] #1633 - ENH: Add bind parameter expansion for raw()
 expressions

---
 .../expression/DefaultExpressionFactory.java  |  4 +-
 .../server/expression/RawExpression.java      |  4 +-
 .../expression/RawExpressionBuilder.java      | 86 ++++++++++++++++++
 .../expression/RawExpressionBuilderTest.java  | 90 +++++++++++++++++++
 .../org/tests/query/TestWhereRawClause.java   | 39 ++++++--
 5 files changed, 212 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/expression/RawExpressionBuilder.java
 create mode 100644 src/test/java/io/ebeaninternal/server/expression/RawExpressionBuilderTest.java

diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
index ba845529d..d7a1d9e36 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
@@ -529,7 +529,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
    */
   @Override
   public Expression raw(String raw, Object value) {
-    return new RawExpression(raw, new Object[]{value});
+    return RawExpressionBuilder.buildSingle(raw, value);
   }
 
   /**
@@ -541,7 +541,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
    */
   @Override
   public Expression raw(String raw, Object[] values) {
-    return new RawExpression(raw, values);
+    return RawExpressionBuilder.build(raw, values);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/expression/RawExpression.java b/src/main/java/io/ebeaninternal/server/expression/RawExpression.java
index cad8582bd..295ddc75b 100644
--- a/src/main/java/io/ebeaninternal/server/expression/RawExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/RawExpression.java
@@ -12,9 +12,9 @@ import java.util.Collection;
 
 class RawExpression extends NonPrepareExpression {
 
-  private final String sql;
+  final String sql;
 
-  private final Object[] values;
+  final Object[] values;
 
   RawExpression(String sql, Object[] values) {
     this.sql = sql;
diff --git a/src/main/java/io/ebeaninternal/server/expression/RawExpressionBuilder.java b/src/main/java/io/ebeaninternal/server/expression/RawExpressionBuilder.java
new file mode 100644
index 000000000..73a4da911
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/expression/RawExpressionBuilder.java
@@ -0,0 +1,86 @@
+package io.ebeaninternal.server.expression;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+class RawExpressionBuilder {
+
+  private static final String BP_1 = "?1";
+
+  private static final String[] BP = {BP_1, "?2", "?3", "?4", "?5", "?6", "?7", "?8",
+    "?9", "?10", "?11", "?12", "?13", "?14", "?15", "?16", "?17", "?18", "?19", "?20"};
+
+  /**
+   * Build RawExpression taking into account parameter expansion.
+   */
+  static RawExpression buildSingle(String raw, Object value) {
+    if (isExpand(value, raw, BP_1)) {
+      Collection val = (Collection) value;
+      raw = raw.replace(BP_1, expand(val));
+      return new RawExpression(raw, val.toArray());
+    }
+    return new RawExpression(raw, new Object[]{value});
+  }
+
+  /**
+   * Build RawExpression for multiple bind values taking into account parameter expansion.
+   */
+  static RawExpression build(String raw, Object[] values) {
+
+    for (int i = 0; i < values.length; i++) {
+      if (isExpand(values[i], raw, match(i))) {
+        return new RawExpressionBuilder(raw, values).build();
+      }
+    }
+    return new RawExpression(raw, values);
+  }
+
+  /**
+   * Return true if this value is a collection that should be expanded.
+   */
+  private static boolean isExpand(Object value, String raw, String bindMatch) {
+    return value instanceof Collection && raw.contains(bindMatch);
+  }
+
+  private static String match(int i) {
+    if (i < 20) {
+      return BP[i];
+    }
+    return "?" + (i + 1);
+  }
+
+  private static String expand(Collection values) {
+
+    StringBuilder sqlExpand = new StringBuilder(values.size() * 2);
+    for (int i = 0; i < values.size(); i++) {
+      if (i > 0) {
+        sqlExpand.append(",");
+      }
+      sqlExpand.append("?");
+    }
+    return sqlExpand.toString();
+  }
+
+  private final String expanded;
+
+  private final List<Object> params = new ArrayList<>();
+
+  private RawExpressionBuilder(String raw, Object[] values) {
+    for (int i = 0; i < values.length; i++) {
+      String match = match(i);
+      if (!isExpand(values[i], raw, match)) {
+        params.add(values[i]);
+      } else {
+        Collection val = (Collection) values[i];
+        params.addAll(val);
+        raw = raw.replace(match, expand(val));
+      }
+    }
+    this.expanded = raw;
+  }
+
+  private RawExpression build() {
+    return new RawExpression(expanded, params.toArray());
+  }
+}
diff --git a/src/test/java/io/ebeaninternal/server/expression/RawExpressionBuilderTest.java b/src/test/java/io/ebeaninternal/server/expression/RawExpressionBuilderTest.java
new file mode 100644
index 000000000..8f3c4bf43
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/expression/RawExpressionBuilderTest.java
@@ -0,0 +1,90 @@
+package io.ebeaninternal.server.expression;
+
+import org.junit.Test;
+
+import static java.util.Arrays.asList;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class RawExpressionBuilderTest {
+
+  @Test
+  public void buildSingle_noop() {
+
+    RawExpression exp = RawExpressionBuilder.buildSingle("foo = ?", 42);
+    assertThat(exp.sql).isEqualTo("foo = ?");
+  }
+
+  @Test
+  public void buildSingle_noExpand() {
+
+    RawExpression exp = RawExpressionBuilder.buildSingle("foo = ?", asList(42, 43));
+    assertThat(exp.sql).isEqualTo("foo = ?");
+  }
+
+  @Test
+  public void buildSingle_expand() {
+
+    RawExpression exp = RawExpressionBuilder.buildSingle("foo in (?1)", asList(42, 43));
+    assertThat(exp.sql).isEqualTo("foo in (?,?)");
+    assertThat(exp.values).contains(42, 43);
+  }
+
+  @Test
+  public void buildSingle_expand_more() {
+
+    RawExpression exp = RawExpressionBuilder.buildSingle("foo in (?1)", asList(42, 43, 44, 45));
+    assertThat(exp.sql).isEqualTo("foo in (?,?,?,?)");
+    assertThat(exp.values).contains(42, 43, 44, 45);
+  }
+
+
+  @Test
+  public void buildSingle_expand_single() {
+
+    RawExpression exp = RawExpressionBuilder.buildSingle("foo in (?1)", asList(42));
+    assertThat(exp.sql).isEqualTo("foo in (?)");
+    assertThat(exp.values).contains(42);
+  }
+
+
+  @Test
+  public void build_noop() {
+    RawExpression exp = RawExpressionBuilder.build("foo = ?", asArray(42));
+    assertThat(exp.sql).isEqualTo("foo = ?");
+  }
+
+  @Test
+  public void build_noExpand() {
+
+    RawExpression exp = RawExpressionBuilder.buildSingle("foo = ? and bar = any(?)", asArray(44, asList(42, 43)));
+    assertThat(exp.sql).isEqualTo("foo = ? and bar = any(?)");
+  }
+
+  @Test
+  public void build_expand() {
+
+    RawExpression exp = RawExpressionBuilder.build("foo in (?) and bar in (?2)", asArray(44, asList(42, 43)));
+    assertThat(exp.sql).isEqualTo("foo in (?) and bar in (?,?)");
+    assertThat(exp.values).contains(44, 42, 43);
+  }
+
+  @Test
+  public void build_expand2() {
+
+    RawExpression exp = RawExpressionBuilder.build("foo in (?) and bar in (?2) (?3)", asArray(44, asList(42, 43), asList(91, 92, 93)));
+    assertThat(exp.sql).isEqualTo("foo in (?) and bar in (?,?) (?,?,?)");
+    assertThat(exp.values).containsExactly(44, 42, 43, 91, 92, 93);
+  }
+
+  @Test
+  public void build_expand3() {
+
+    RawExpression exp = RawExpressionBuilder.build("foo in (?) and bar in (?2) (?3) and ?", asArray(44, asList(42, 43), asList(91, 92, 93), 87));
+    assertThat(exp.sql).isEqualTo("foo in (?) and bar in (?,?) (?,?,?) and ?");
+    assertThat(exp.values).containsExactly(44, 42, 43, 91, 92, 93, 87);
+  }
+
+  private Object[] asArray(Object... values) {
+    return values;
+  }
+}
diff --git a/src/test/java/org/tests/query/TestWhereRawClause.java b/src/test/java/org/tests/query/TestWhereRawClause.java
index 9293a0006..a84ffdfd6 100644
--- a/src/test/java/org/tests/query/TestWhereRawClause.java
+++ b/src/test/java/org/tests/query/TestWhereRawClause.java
@@ -6,16 +6,16 @@ import io.ebean.Expr;
 import io.ebean.Query;
 import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.OrderDetail;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Test;
 
 import java.sql.Timestamp;
-import java.util.ArrayList;
 import java.util.List;
 
+import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestWhereRawClause extends BaseTestCase {
@@ -50,6 +50,35 @@ public class TestWhereRawClause extends BaseTestCase {
 
   }
 
+  @Test
+  public void testRaw_bindExpansion_subquery() {
+
+    ResetBasicData.reset();
+
+    Query<Customer> query = Ebean.find(Customer.class)
+      .where()
+      .raw("id in (select c.id from o_customer c where c.name in (?1))", asList("Rob", "Fiona", "Jack"))
+      .query();
+
+    List<Customer> list = query.findList();
+    assertThat(list).isNotEmpty();
+    assertThat(sqlOf(query)).contains(" t0.id in (select c.id from o_customer c where c.name in (?,?,?))");
+  }
+
+  @Test
+  public void testRaw_bindExpansion() {
+
+    ResetBasicData.reset();
+
+    Query<Customer> query = Ebean.find(Customer.class)
+      .where()
+      .raw("name in (?1)", asList("Rob", "Fiona", "Jack"))
+      .query();
+
+    List<Customer> list = query.findList();
+    assertThat(list).isNotEmpty();
+    assertThat(sqlOf(query)).contains(" t0.name in (?,?,?)");
+  }
 
   @Test
   @ForPlatform(Platform.POSTGRES)
@@ -57,13 +86,9 @@ public class TestWhereRawClause extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    List<String> names = new ArrayList<>();
-    names.add("Rob");
-    names.add("Fiona");
-
     List<Customer> list = Ebean.find(Customer.class)
       .where()
-      .raw("name = any(?)", names)
+      .raw("name = any(?)", asList("Rob", "Fiona", "Jack"))
       .findList();
 
     assertThat(list).isNotEmpty();

From e41da2f995d281ed7f403db411141bd02849010e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 7 Feb 2019 23:35:44 +1300
Subject: [PATCH 0717/1036] #1632 - ENH: Add bind parameter expansion for
 SqlUpdate

Fix test with bind type.
---
 .../java/org/tests/update/TestSqlUpdateBindMultipleLists.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java b/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java
index a20b042a3..b19676f99 100644
--- a/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java
+++ b/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java
@@ -104,7 +104,7 @@ public class TestSqlUpdateBindMultipleLists extends BaseTestCase {
     try (Transaction transaction = DB.beginTransaction()) {
       transaction.setBatchMode(true);
 
-      upd.setParams(asList(9991), asList("Foo"), asList("Bar"));
+      upd.setParams(asList(9991), asList("Foo"), asList(9994));
       upd.execute();
 
       upd.setParams(asList(9991, 9992), asList("Foo", "Bar"), asList(1,2,3,4));

From 14fbc3a95553f1b6c36a62b8487ef8bcc3a6ace0 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 7 Feb 2019 23:42:57 +1300
Subject: [PATCH 0718/1036] [maven-release-plugin] prepare release
 ebean-11.34.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5fc6b029f..f41a7930b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.34.1-SNAPSHOT</version>
+  <version>11.34.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.34.1</tag>
   </scm>
 
   <profiles>

From 25b6d2a5a0abc21e17dcc945c1d0e948d9b817c2 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 7 Feb 2019 23:43:13 +1300
Subject: [PATCH 0719/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f41a7930b..5b9eb758a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.34.1</version>
+  <version>11.34.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.34.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 829dfcb013ef1bb767b2ecd4120d339bd10883be Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 9 Feb 2019 00:30:55 +1300
Subject: [PATCH 0720/1036] #1634 - ENH: Add convenience expressions "greater
 than or null" gtOrNull(), ltOrNull() and inRangeWith()

---
 src/main/java/io/ebean/Expr.java              |  3 -
 src/main/java/io/ebean/ExpressionFactory.java | 35 ++++++++++++
 src/main/java/io/ebean/ExpressionList.java    | 29 ++++++++++
 .../expression/DefaultExpressionFactory.java  | 21 +++++++
 .../expression/DefaultExpressionList.java     | 18 ++++++
 .../server/expression/JunctionExpression.java | 15 +++++
 .../tests/basic/TestQueryWhereInRange.java    | 55 ++++++++++++++++++-
 7 files changed, 170 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/ebean/Expr.java b/src/main/java/io/ebean/Expr.java
index 0bf0ddc4d..3b6ec35b4 100644
--- a/src/main/java/io/ebean/Expr.java
+++ b/src/main/java/io/ebean/Expr.java
@@ -71,7 +71,6 @@ public class Expr {
    * </p>
    */
   public static Expression inRange(String propertyName, Object value1, Object value2) {
-
     return Ebean.getExpressionFactory().inRange(propertyName, value1, value2);
   }
 
@@ -79,7 +78,6 @@ public class Expr {
    * Between - property between the two given values.
    */
   public static Expression between(String propertyName, Object value1, Object value2) {
-
     return Ebean.getExpressionFactory().between(propertyName, value1, value2);
   }
 
@@ -87,7 +85,6 @@ public class Expr {
    * Between - value between two given properties.
    */
   public static Expression between(String lowProperty, String highProperty, Object value) {
-
     return Ebean.getExpressionFactory().betweenProperties(lowProperty, highProperty, value);
   }
 
diff --git a/src/main/java/io/ebean/ExpressionFactory.java b/src/main/java/io/ebean/ExpressionFactory.java
index e3455cc3f..873d82dd1 100644
--- a/src/main/java/io/ebean/ExpressionFactory.java
+++ b/src/main/java/io/ebean/ExpressionFactory.java
@@ -157,6 +157,25 @@ public interface ExpressionFactory {
    */
   Expression inRange(String propertyName, Object value1, Object value2);
 
+  /**
+   * Value in Range between 2 properties.
+   *
+   * <pre>{@code
+   *
+   *    .startDate.inRangeWith(endDate, now)
+   *
+   *    // which equates to
+   *    startDate <= now and (endDate > now or endDate is null)
+   *
+   * }</pre>
+   *
+   * <p>
+   * This is a convenience expression combining a number of simple expressions.
+   * The most common use of this could be called "effective dating" where 2 date or
+   * timestamp columns represent the date range in which
+   */
+  Expression inRangeWith(String lowProperty, String highProperty, Object value);
+
   /**
    * Between - property between the two given values.
    */
@@ -167,6 +186,14 @@ public interface ExpressionFactory {
    */
   Expression betweenProperties(String lowProperty, String highProperty, Object value);
 
+  /**
+   * Greater Than Or Null - property greater than the given value or null.
+   * <p>
+   * A convenient expression combining GT and Is Null.  Most often useful for range
+   * expressions where the top range value is nullable.
+   */
+  Expression gtOrNull(String propertyName, Object value);
+
   /**
    * Greater Than - property greater than the given value.
    */
@@ -178,6 +205,14 @@ public interface ExpressionFactory {
    */
   Expression ge(String propertyName, Object value);
 
+  /**
+   * Less Than or Null - property less than the given value or null.
+   * <p>
+   * A convenient expression combining LT and Is Null.  Most often useful for range
+   * expressions where the bottom range value is nullable.
+   */
+  Expression ltOrNull(String propertyName, Object value);
+
   /**
    * Less Than - property less than the given value.
    */
diff --git a/src/main/java/io/ebean/ExpressionList.java b/src/main/java/io/ebean/ExpressionList.java
index 4e8bf5e62..9759a9028 100644
--- a/src/main/java/io/ebean/ExpressionList.java
+++ b/src/main/java/io/ebean/ExpressionList.java
@@ -802,6 +802,25 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> ine(String propertyName, String value);
 
+  /**
+   * Value in Range between 2 properties.
+   *
+   * <pre>{@code
+   *
+   *    .startDate.inRangeWith(endDate, now)
+   *
+   *    // which equates to
+   *    startDate <= now and (endDate > now or endDate is null)
+   *
+   * }</pre>
+   *
+   * <p>
+   * This is a convenience expression combining a number of simple expressions.
+   * The most common use of this could be called "effective dating" where 2 date or
+   * timestamp columns represent the date range in which
+   */
+  ExpressionList<T> inRangeWith(String lowProperty, String highProperty, Object value);
+
   /**
    * In Range - property >= value1 and property < value2.
    * <p>
@@ -825,6 +844,11 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> gt(String propertyName, Object value);
 
+  /**
+   * Greater Than or Null - property greater than the given value or null.
+   */
+  ExpressionList<T> gtOrNull(String propertyName, Object value);
+
   /**
    * Greater Than or Equal to - property greater than or equal to the given
    * value.
@@ -836,6 +860,11 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> lt(String propertyName, Object value);
 
+  /**
+   * Less Than or Null - property less than the given value or null.
+   */
+  ExpressionList<T> ltOrNull(String propertyName, Object value);
+
   /**
    * Less Than or Equal to - property less than or equal to the given value.
    */
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
index d7a1d9e36..e952b63d4 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
@@ -221,6 +221,11 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
     return new InRangeExpression(propertyName, value1, value2);
   }
 
+  @Override
+  public Expression inRangeWith(String lowProperty, String highProperty, Object value) {
+    return and(le(lowProperty, value), gtOrNull(highProperty, value));
+  }
+
   /**
    * Between - property between the two given values.
    */
@@ -245,6 +250,14 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
     return new SimpleExpression(propertyName, Op.GT, value);
   }
 
+  /**
+   * Greater Than or null - property greater than the given value or null.
+   */
+  @Override
+  public Expression gtOrNull(String propertyName, Object value) {
+    return or(gt(propertyName, value), isNull(propertyName));
+  }
+
   /**
    * Greater Than or Equal to - property greater than or equal to the given
    * value.
@@ -254,6 +267,14 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
     return new SimpleExpression(propertyName, Op.GT_EQ, value);
   }
 
+  /**
+   * Less Than or null - property less than the given value or null.
+   */
+  @Override
+  public Expression ltOrNull(String propertyName, Object value) {
+    return or(lt(propertyName, value), isNull(propertyName));
+  }
+
   /**
    * Less Than - property less than the given value.
    */
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 9f472b255..e0b6215d7 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -794,6 +794,12 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return this;
   }
 
+  @Override
+  public ExpressionList<T> inRangeWith(String lowProperty, String highProperty, Object value) {
+    add(expr.inRangeWith(lowProperty, highProperty, value));
+    return this;
+  }
+
   @Override
   public ExpressionList<T> inRange(String propertyName, Object value1, Object value2) {
     add(expr.inRange(propertyName, value1, value2));
@@ -836,6 +842,12 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return this;
   }
 
+  @Override
+  public ExpressionList<T> gtOrNull(String propertyName, Object value) {
+    add(expr.gtOrNull(propertyName, value));
+    return this;
+  }
+
   @Override
   public ExpressionList<T> icontains(String propertyName, String value) {
     add(expr.icontains(propertyName, value));
@@ -990,6 +1002,12 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return this;
   }
 
+  @Override
+  public ExpressionList<T> ltOrNull(String propertyName, Object value) {
+    add(expr.ltOrNull(propertyName, value));
+    return this;
+  }
+
   @Override
   public ExpressionList<T> not(Expression exp) {
     add(expr.not(exp));
diff --git a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index c1ed7b611..dc251f07c 100644
--- a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -280,6 +280,11 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.and(expOne, expTwo);
   }
 
+  @Override
+  public ExpressionList<T> inRangeWith(String lowProperty, String highProperty, Object value) {
+    return exprList.inRangeWith(lowProperty, highProperty, value);
+  }
+
   @Override
   public ExpressionList<T> inRange(String propertyName, Object value1, Object value2) {
     return exprList.inRange(propertyName, value1, value2);
@@ -597,6 +602,11 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.gt(propertyName, value);
   }
 
+  @Override
+  public ExpressionList<T> gtOrNull(String propertyName, Object value) {
+    return exprList.gtOrNull(propertyName, value);
+  }
+
   @Override
   public ExpressionList<T> having() {
     throw new IllegalStateException("having() not allowed on Junction expression list");
@@ -732,6 +742,11 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.lt(propertyName, value);
   }
 
+  @Override
+  public ExpressionList<T> ltOrNull(String propertyName, Object value) {
+    return exprList.ltOrNull(propertyName, value);
+  }
+
   @Override
   public ExpressionList<T> ne(String propertyName, Object value) {
     return exprList.ne(propertyName, value);
diff --git a/src/test/java/org/tests/basic/TestQueryWhereInRange.java b/src/test/java/org/tests/basic/TestQueryWhereInRange.java
index 86de95624..e32831496 100644
--- a/src/test/java/org/tests/basic/TestQueryWhereInRange.java
+++ b/src/test/java/org/tests/basic/TestQueryWhereInRange.java
@@ -1,7 +1,7 @@
 package org.tests.basic;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.Query;
 import org.junit.Test;
 import org.tests.model.basic.Order;
@@ -9,6 +9,8 @@ import org.tests.model.basic.ResetBasicData;
 
 import java.time.LocalDate;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class TestQueryWhereInRange extends BaseTestCase {
 
   @Test
@@ -18,14 +20,61 @@ public class TestQueryWhereInRange extends BaseTestCase {
 
     LocalDate today = LocalDate.now();
 
-    Query<Order> query= Ebean.find(Order.class)
+    Query<Order> query = DB.find(Order.class)
       .where().inRange("orderDate", today.minusDays(7), today)
       .isNotNull("id")
       .query();
 
     query.findList();
 
-    sqlOf(query).contains("(order_date >= ? and order_date < ?)");
+    assertThat(sqlOf(query)).contains("where (t0.order_date >= ? and t0.order_date < ?) and ");
+  }
 
+  @Test
+  public void gtOrNull() {
+
+    ResetBasicData.reset();
+
+    LocalDate today = LocalDate.now();
+
+    Query<Order> query = DB.find(Order.class)
+      .where().gtOrNull("orderDate", today)
+      .query();
+
+    query.findList();
+
+    assertThat(query.getGeneratedSql()).contains("where (t0.order_date > ? or t0.order_date is null)");
+  }
+
+  @Test
+  public void ltOrNull() {
+
+    ResetBasicData.reset();
+
+    LocalDate today = LocalDate.now();
+
+    Query<Order> query = DB.find(Order.class)
+      .where().ltOrNull("orderDate", today)
+      .query();
+
+    query.findList();
+
+    assertThat(query.getGeneratedSql()).contains(" where (t0.order_date < ? or t0.order_date is null)");
+  }
+
+  @Test
+  public void inRangeWith() {
+
+    ResetBasicData.reset();
+
+    LocalDate today = LocalDate.now();
+
+    Query<Order> query = DB.find(Order.class)
+      .where().inRangeWith("orderDate", "shipDate", today)
+      .query();
+
+    query.findList();
+
+    assertThat(query.getGeneratedSql()).contains("(t0.order_date <= ? and (t0.ship_date > ? or t0.ship_date is null))");
   }
 }

From cb74ef01e02a3e9efb018a27184ed216acdf8cc2 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 11 Feb 2019 10:42:05 +0100
Subject: [PATCH 0721/1036] build on jdk11 (#1637)

---
 pom.xml                                       | 21 +++++++++++++--
 .../server/type/ScalarTypeInstantTest.java    | 26 ++++++++++++-------
 .../type/ScalarTypeLocalDateTimeTest.java     |  4 +--
 .../type/ScalarTypeOffsetDateTimeTest.java    |  2 +-
 .../type/ScalarTypeZonedDateTimeTest.java     |  2 +-
 5 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5b9eb758a..4a0791893 100644
--- a/pom.xml
+++ b/pom.xml
@@ -188,6 +188,22 @@
       <scope>provided</scope>
     </dependency>
 
+    <!-- Provided scope to compile with java 11 -->
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+      <version>2.4.0-b180830.0438</version>
+      <scope>provided</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>1.3.2</version>
+      <scope>provided</scope>
+    </dependency>
+    
+
     <!-- Provided scope for Postgres JSON/JSONB support -->
     <dependency>
       <groupId>org.postgresql</groupId>
@@ -222,7 +238,7 @@
     <dependency>
       <groupId>org.avaje</groupId>
       <artifactId>avaje-agentloader</artifactId>
-      <version>2.1.2</version>
+      <version>3.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -327,9 +343,10 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.5</version>
+        <version>2.22.1</version>
         <configuration>
           <useSystemClassLoader>false</useSystemClassLoader>
+          <trimStackTrace>false</trimStackTrace>
           <failIfNoTests>false</failIfNoTests>
           <includes>
             <include>**/Test*.java</include>
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java
index f2593c08e..fccc8e355 100644
--- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java
@@ -16,13 +16,21 @@ public class ScalarTypeInstantTest {
 
   ScalarTypeInstant type = new ScalarTypeInstant(JsonConfig.DateTime.MILLIS);
 
+  private Instant now() {
+    // in JDK11 Instant.now() returns a nanosecond precise instant.
+    // as ScalarTypeInstant is only milliSecond precise, tests may fail with
+    // expected:<2019-02-10T15:39:36.702700200Z> but was:<2019-02-10T15:39:36.702Z>
+    // if we use Instant.now() - so we use this workaround here.
+    return Instant.ofEpochMilli(System.currentTimeMillis());
+  }
+
   @Test
   public void testReadData() throws Exception {
 
     ByteArrayOutputStream os = new ByteArrayOutputStream();
     ObjectOutputStream out = new ObjectOutputStream(os);
 
-    Instant now = Instant.now();
+    Instant now = now();
     type.writeData(out, now);
     type.writeData(out, null);
     out.flush();
@@ -41,7 +49,7 @@ public class ScalarTypeInstantTest {
   @Test
   public void testToJdbcType() throws Exception {
 
-    Instant now = Instant.now();
+    Instant now = now();
     Timestamp timestamp = Timestamp.from(now);
     Object val1 = type.toJdbcType(now);
     Object val2 = type.toJdbcType(timestamp);
@@ -53,7 +61,7 @@ public class ScalarTypeInstantTest {
   @Test
   public void testToBeanType() throws Exception {
 
-    Instant now = Instant.now();
+    Instant now = now();
     Instant val1 = type.toBeanType(now);
     Instant val2 = type.toBeanType(Timestamp.from(now));
 
@@ -64,7 +72,7 @@ public class ScalarTypeInstantTest {
   @Test
   public void testFormatValue() throws Exception {
 
-    Instant now = Instant.now();
+    Instant now = now();
     Timestamp timestamp = Timestamp.from(now);
     String formatted = type.formatValue(now);
     assertEquals("" + timestamp.getTime(), formatted);
@@ -73,7 +81,7 @@ public class ScalarTypeInstantTest {
   @Test
   public void testParse_when_epochMillis() throws Exception {
 
-    Instant now = Instant.now();
+    Instant now = now();
     Timestamp timestamp = Timestamp.from(now);
     Instant val1 = type.parse("" + timestamp.getTime());
     assertEquals(now, val1);
@@ -82,7 +90,7 @@ public class ScalarTypeInstantTest {
   @Test
   public void testParse_when_timestampForm() throws Exception {
 
-    Instant now = Instant.now();
+    Instant now = now();
     Timestamp timestamp = Timestamp.from(now);
     Instant val1 = type.parse(timestamp.toString());
     assertEquals(now, val1);
@@ -91,7 +99,7 @@ public class ScalarTypeInstantTest {
   @Test
   public void testFormatAndParse() throws Exception {
 
-    Instant now = Instant.now();
+    Instant now = now();
 
     String format = type.format(now);
     Instant val1 = type.parse(format);
@@ -107,7 +115,7 @@ public class ScalarTypeInstantTest {
   @Test
   public void testConvertFromMillis() throws Exception {
 
-    Instant now = Instant.now();
+    Instant now = now();
     Instant val = type.convertFromMillis(now.toEpochMilli());
     assertEquals(now, val);
   }
@@ -116,7 +124,7 @@ public class ScalarTypeInstantTest {
   public void testJsonRead() throws Exception {
 
 
-    Instant now = Instant.now();
+    Instant now = now();
 
     JsonTester<Instant> jsonTester = new JsonTester<>(type);
     jsonTester.test(now);
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java
index b4dd13014..65850e947 100644
--- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java
@@ -28,7 +28,7 @@ public class ScalarTypeLocalDateTimeTest {
   @Test
   public void testConvertToMillis() throws Exception {
 
-    LocalDateTime now = LocalDateTime.now();
+    LocalDateTime now = LocalDateTime.now().withNano(123_000_000); // jdk11 workaround
     long asMillis = type.convertToMillis(now);
     LocalDateTime fromMillis = type.convertFromMillis(asMillis);
 
@@ -74,7 +74,7 @@ public class ScalarTypeLocalDateTimeTest {
   @Test
   public void testJson() throws Exception {
 
-    LocalDateTime now = LocalDateTime.now();
+    LocalDateTime now = LocalDateTime.now().withNano(123_000_000); // jdk11 workaround
 
     JsonTester<LocalDateTime> jsonTester = new JsonTester<>(type);
     jsonTester.test(now);
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java
index eb2bba0a7..c950d5814 100644
--- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java
@@ -61,7 +61,7 @@ public class ScalarTypeOffsetDateTimeTest {
   @Test
   public void testJson() throws Exception {
 
-    OffsetDateTime now = OffsetDateTime.now();
+    OffsetDateTime now = OffsetDateTime.now().withNano(123_000_000); // jdk11 workaround
 
     JsonTester<OffsetDateTime> jsonTester = new JsonTester<>(type);
     jsonTester.test(now);
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java
index b9d40b708..be4570ac6 100644
--- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java
@@ -62,7 +62,7 @@ public class ScalarTypeZonedDateTimeTest {
   @Test
   public void testJson() throws Exception {
 
-    ZonedDateTime now = ZonedDateTime.now();
+    ZonedDateTime now = ZonedDateTime.now().withNano(123_000_000); // jdk11 workaround
 
     JsonTester<ZonedDateTime> jsonTester = new JsonTester<>(type);
     jsonTester.test(now);

From aa7b15fd6e92639a25050030003d9bbc5551f50b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 11 Feb 2019 22:48:10 +1300
Subject: [PATCH 0722/1036] #1637 - build on jdk11

---
 pom.xml                                                      | 5 ++---
 .../model/elementcollection/TestElementCollectionBasic.java  | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4a0791893..f3c676c02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,14 +195,13 @@
       <version>2.4.0-b180830.0438</version>
       <scope>provided</scope>
     </dependency>
-    
+
     <dependency>
       <groupId>javax.annotation</groupId>
       <artifactId>javax.annotation-api</artifactId>
       <version>1.3.2</version>
       <scope>provided</scope>
     </dependency>
-    
 
     <!-- Provided scope for Postgres JSON/JSONB support -->
     <dependency>
@@ -238,7 +237,7 @@
     <dependency>
       <groupId>org.avaje</groupId>
       <artifactId>avaje-agentloader</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
+      <version>3.0.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
index b825f964d..c4bd282d0 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
@@ -19,6 +19,7 @@ public class TestElementCollectionBasic extends BaseTestCase {
   @Test
   public void test() {
 
+    eventLog();
     LoggedSqlCollector.start();
 
     EcPerson person = new EcPerson("Fiona021");

From 192a946cf63e151082cb12483dfc30f53afe98d2 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 11 Feb 2019 22:59:47 +1300
Subject: [PATCH 0723/1036] #1634 ENH: Add convenience expressions "equal to or
 null" eqOrNull()

---
 src/main/java/io/ebean/ExpressionFactory.java    |  5 +++++
 src/main/java/io/ebean/ExpressionList.java       |  5 +++++
 .../expression/DefaultExpressionFactory.java     |  5 +++++
 .../server/expression/DefaultExpressionList.java |  6 ++++++
 .../server/expression/JunctionExpression.java    |  5 +++++
 .../org/tests/basic/TestQueryWhereInRange.java   | 16 ++++++++++++++++
 6 files changed, 42 insertions(+)

diff --git a/src/main/java/io/ebean/ExpressionFactory.java b/src/main/java/io/ebean/ExpressionFactory.java
index 873d82dd1..c37ef6e78 100644
--- a/src/main/java/io/ebean/ExpressionFactory.java
+++ b/src/main/java/io/ebean/ExpressionFactory.java
@@ -122,6 +122,11 @@ public interface ExpressionFactory {
    */
   Expression eq(String propertyName, Object value);
 
+  /**
+   * Equal To or Null - property equal to the given value or null.
+   */
+  Expression eqOrNull(String propertyName, Object value);
+
   /**
    * Not Equal To - property not equal to the given value.
    */
diff --git a/src/main/java/io/ebean/ExpressionList.java b/src/main/java/io/ebean/ExpressionList.java
index 9759a9028..94d6b3f1d 100644
--- a/src/main/java/io/ebean/ExpressionList.java
+++ b/src/main/java/io/ebean/ExpressionList.java
@@ -785,6 +785,11 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> eq(String propertyName, Object value);
 
+  /**
+   * Equal To or Null - property is equal to a given value or null.
+   */
+  ExpressionList<T> eqOrNull(String propertyName, Object value);
+
   /**
    * Not Equal To - property not equal to the given value.
    */
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
index e952b63d4..968cc881e 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
@@ -162,6 +162,11 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
     return new SimpleExpression(propertyName, Op.EQ, value);
   }
 
+  @Override
+  public Expression eqOrNull(String propertyName, Object value) {
+    return or(eq(propertyName, value), isNull(propertyName));
+  }
+
   /**
    * Not Equal To - property not equal to the given value.
    */
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index e0b6215d7..1c57f28ab 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -764,6 +764,12 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return this;
   }
 
+  @Override
+  public ExpressionList<T> eqOrNull(String propertyName, Object value) {
+    add(expr.eqOrNull(propertyName, value));
+    return this;
+  }
+
   @Override
   public ExpressionList<T> ieq(String propertyName, String value) {
     add(expr.ieq(propertyName, value));
diff --git a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index dc251f07c..59d00dfe7 100644
--- a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -315,6 +315,11 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.eq(propertyName, value);
   }
 
+  @Override
+  public ExpressionList<T> eqOrNull(String propertyName, Object value) {
+    return exprList.eqOrNull(propertyName, value);
+  }
+
   @Override
   public ExpressionList<T> exampleLike(Object example) {
     return exprList.exampleLike(example);
diff --git a/src/test/java/org/tests/basic/TestQueryWhereInRange.java b/src/test/java/org/tests/basic/TestQueryWhereInRange.java
index e32831496..30f89eddc 100644
--- a/src/test/java/org/tests/basic/TestQueryWhereInRange.java
+++ b/src/test/java/org/tests/basic/TestQueryWhereInRange.java
@@ -30,6 +30,22 @@ public class TestQueryWhereInRange extends BaseTestCase {
     assertThat(sqlOf(query)).contains("where (t0.order_date >= ? and t0.order_date < ?) and ");
   }
 
+  @Test
+  public void eqOrNull() {
+
+    ResetBasicData.reset();
+
+    LocalDate today = LocalDate.now();
+
+    Query<Order> query = DB.find(Order.class)
+      .where().eqOrNull("orderDate", today)
+      .query();
+
+    query.findList();
+
+    assertThat(query.getGeneratedSql()).contains("where (t0.order_date = ? or t0.order_date is null)");
+  }
+
   @Test
   public void gtOrNull() {
 

From 56be1fc047a5387d1df2bd66f6c80a8ac530453e Mon Sep 17 00:00:00 2001
From: Manuel Polo <mrmx@users.noreply.github.com>
Date: Mon, 11 Feb 2019 11:02:10 +0100
Subject: [PATCH 0724/1036] Fixed missing EBEAN_PROPS_FILE loading (#1635)

---
 src/main/java/io/ebean/config/properties/Loader.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/io/ebean/config/properties/Loader.java b/src/main/java/io/ebean/config/properties/Loader.java
index c65242339..1bbda9184 100644
--- a/src/main/java/io/ebean/config/properties/Loader.java
+++ b/src/main/java/io/ebean/config/properties/Loader.java
@@ -97,6 +97,8 @@ class Loader {
       if (fileName != null) {
         loadWithExtensionCheck(fileName);
       }
+    } else {
+        loadWithExtensionCheck(fileName);
     }
   }
 

From 4fdb8a77b4de848625d35c46020f06bf2c3b7c07 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 11 Feb 2019 23:08:50 +1300
Subject: [PATCH 0725/1036] Fix test data

---
 src/test/java/org/tests/insert/TestInsertCheckUnique.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/tests/insert/TestInsertCheckUnique.java b/src/test/java/org/tests/insert/TestInsertCheckUnique.java
index 61884f35e..1895540f4 100644
--- a/src/test/java/org/tests/insert/TestInsertCheckUnique.java
+++ b/src/test/java/org/tests/insert/TestInsertCheckUnique.java
@@ -23,14 +23,14 @@ public class TestInsertCheckUnique extends BaseTestCase {
     server().beginTransaction();
     try {
       Document doc1 = new Document();
-      doc1.setTitle("ThisIsAUniqueKey");
+      doc1.setTitle("AUniqueKey_duplicateCheck");
       doc1.setBody("one");
 
       assertThat(server().checkUniqueness(doc1)).isEmpty();
       doc1.save();
 
       Document doc2 = new Document();
-      doc2.setTitle("ThisIsAUniqueKey");
+      doc2.setTitle("AUniqueKey_duplicateCheck");
       doc2.setBody("clashes with doc1");
 
       assertThat(server().checkUniqueness(doc2)).isEmpty();

From 058766dd929559463d522405a02d6a43adb7f62e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 11 Feb 2019 23:13:57 +1300
Subject: [PATCH 0726/1036] No effective change - adjust test to use DB and try
 with resources

---
 .../tests/insert/TestInsertCheckUnique.java   | 46 ++++++++-----------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/src/test/java/org/tests/insert/TestInsertCheckUnique.java b/src/test/java/org/tests/insert/TestInsertCheckUnique.java
index 1895540f4..a58e2b418 100644
--- a/src/test/java/org/tests/insert/TestInsertCheckUnique.java
+++ b/src/test/java/org/tests/insert/TestInsertCheckUnique.java
@@ -1,6 +1,8 @@
 package org.tests.insert;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import io.ebean.Transaction;
 import io.ebean.plugin.Property;
 import org.junit.Before;
 import org.junit.Test;
@@ -14,80 +16,74 @@ public class TestInsertCheckUnique extends BaseTestCase {
 
   @Before
   public void clearDb() {
-    server().find(Document.class).asDraft().where().contains("title", "UniqueKey").delete();
-    server().find(Document.class).asDraft().where().isNull("title").delete();
+    DB.find(Document.class).asDraft().where().contains("title", "UniqueKey").delete();
+    DB.find(Document.class).asDraft().where().isNull("title").delete();
   }
 
   @Test
   public void insert_duplicateKey() {
-    server().beginTransaction();
-    try {
+
+    try (Transaction transaction = DB.beginTransaction()) {
       Document doc1 = new Document();
       doc1.setTitle("AUniqueKey_duplicateCheck");
       doc1.setBody("one");
 
-      assertThat(server().checkUniqueness(doc1)).isEmpty();
+      assertThat(DB.checkUniqueness(doc1)).isEmpty();
       doc1.save();
 
       Document doc2 = new Document();
       doc2.setTitle("AUniqueKey_duplicateCheck");
       doc2.setBody("clashes with doc1");
 
-      assertThat(server().checkUniqueness(doc2)).isEmpty();
+      assertThat(DB.checkUniqueness(doc2)).isEmpty();
 
-      server().publish(doc1.getClass(), doc1.getId());
+      DB.getDefault().publish(doc1.getClass(), doc1.getId());
 
-      assertThat(server().checkUniqueness(doc2).toString()).contains("title");
-    } finally {
-      server().endTransaction();
+      assertThat(DB.checkUniqueness(doc2).toString()).contains("title");
     }
   }
 
   @Test
   public void insert_duplicateNull() {
-    server().beginTransaction();
-    try {
+    try (Transaction transaction = DB.beginTransaction()) {
       Document doc1 = new Document();
       doc1.setTitle(null);
       doc1.setBody("one");
 
-      assertThat(server().checkUniqueness(doc1)).isEmpty();
+      assertThat(DB.checkUniqueness(doc1)).isEmpty();
       doc1.save();
 
       Document doc2 = new Document();
       doc2.setTitle(null);
       doc2.setBody("clashes with doc1");
 
-      assertThat(server().checkUniqueness(doc2)).isEmpty();
+      assertThat(DB.checkUniqueness(doc2)).isEmpty();
 
-      server().publish(doc1.getClass(), doc1.getId());
+      DB.getDefault().publish(doc1.getClass(), doc1.getId());
 
-      assertThat(server().checkUniqueness(doc2)).isEmpty();
+      assertThat(DB.checkUniqueness(doc2)).isEmpty();
 
       doc2.save();
-      server().publish(doc2.getClass(), doc2.getId());
-    } finally {
-      server().endTransaction();
+      DB.getDefault().publish(doc2.getClass(), doc2.getId());
     }
   }
 
   @Test
   public void example() {
 
-    server().beginTransaction();
-    try {
+    try (Transaction transaction = DB.beginTransaction()) {
       Document doc1 = new Document();
       doc1.setTitle("One flew over the cuckoo's nest");
       doc1.setBody("one");
       doc1.save();
 
-      server().publish(doc1.getClass(), doc1.getId());
+      DB.getDefault().publish(doc1.getClass(), doc1.getId());
 
       Document doc2 = new Document();
       doc2.setTitle("One flew over the cuckoo's nest");
       doc2.setBody("clashes with doc1");
 
-      Set<Property> properties = server().checkUniqueness(doc2);
+      Set<Property> properties = DB.checkUniqueness(doc2);
       if (properties.isEmpty()) {
         // it is unique ... carry on
       } else {
@@ -110,9 +106,7 @@ public class TestInsertCheckUnique extends BaseTestCase {
       }
 
 
-      assertThat(server().checkUniqueness(doc2).toString()).contains("title");
-    } finally {
-      server().endTransaction();
+      assertThat(DB.checkUniqueness(doc2).toString()).contains("title");
     }
   }
 }

From 7929d8c0b81ff0fd52cad98e358381c4ebc861f5 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 11 Feb 2019 23:17:54 +1300
Subject: [PATCH 0727/1036] Fix test data ordering

---
 src/test/java/org/tests/query/TestOuterJoin.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/tests/query/TestOuterJoin.java b/src/test/java/org/tests/query/TestOuterJoin.java
index 5256bcc1b..d13885af2 100644
--- a/src/test/java/org/tests/query/TestOuterJoin.java
+++ b/src/test/java/org/tests/query/TestOuterJoin.java
@@ -151,10 +151,11 @@ public class TestOuterJoin extends BaseTestCase {
   }
 
   @Test
-  public void testOuterOnFetch() throws Exception {
+  public void testOuterOnFetch() {
+
     LoggedSql.start();
 
-    List<Order> orders1 =  Ebean.find(Order.class).findList();
+    List<Order> orders1 =  Ebean.find(Order.class).orderBy("id").findList();
 
     assertThat(LoggedSql.collect().get(0))
       .contains(" join o_customer") // ensure that we do not left join the customer
@@ -165,7 +166,7 @@ public class TestOuterJoin extends BaseTestCase {
     LoggedSql.start();
 
     List<Order> orders2 =  Ebean.find(Order.class)
-        .fetch("details", "id").findList();
+        .fetch("details", "id").orderBy("id").findList();
 
     assertThat(LoggedSql.collect().get(0))
       .contains(" left join o_order_detail ");

From fc7fae35c9caf5eb70cb4e0c3520a9b88c0d314e Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 11 Feb 2019 21:31:04 +0100
Subject: [PATCH 0728/1036]  FIX: When saving multiple m2m beans, only last m2m
 wins (Regression due #1630) (#1638)

* provide test case, that shows problem on multiple-m2m

* FIX: When saving multiple m2m beans, only last m2m wins (Regression due #1630)
---
 .../server/core/PersistRequestBean.java       | 13 +++++++----
 .../server/persist/SaveManyBeans.java         |  2 +-
 .../org/tests/sp/TestManyToManySaveTwice.java | 23 +++++++++++++++++++
 src/test/java/org/tests/sp/model/car/Car.java | 12 ++++++++++
 .../java/org/tests/sp/model/car/Door.java     | 23 +++++++++++++++++++
 5 files changed, 67 insertions(+), 6 deletions(-)
 create mode 100644 src/test/java/org/tests/sp/model/car/Door.java

diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index 0ff175eb4..9671d08cf 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -187,7 +187,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   /**
    * Many to many intersection table changes that are held for later batch processing.
    */
-  private SaveManyBeans saveManyIntersection;
+  private List<SaveManyBeans> saveManyIntersections;
 
   public PersistRequestBean(SpiEbeanServer server, T bean, Object parentBean, BeanManager<T> mgr, SpiTransaction t,
                             PersistExecute persistExecute, PersistRequest.Type type, int flags) {
@@ -965,8 +965,8 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   }
 
   private void saveQueuedManyIntersection() {
-    if (saveManyIntersection != null) {
-      saveManyIntersection.saveIntersectionBatch();
+    if (saveManyIntersections != null) {
+      saveManyIntersections.forEach(SaveManyBeans::saveIntersectionBatch);
     }
   }
 
@@ -1479,7 +1479,10 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   /**
    * The intersection table updates to the batch executed later on postExecute.
    */
-  public void setManyIntersection(SaveManyBeans saveManyIntersection) {
-    this.saveManyIntersection = saveManyIntersection;
+  public void addManyIntersection(SaveManyBeans saveManyIntersection) {
+    if (this.saveManyIntersections == null) {
+      this.saveManyIntersections = new ArrayList<>();
+    }
+    this.saveManyIntersections.add(saveManyIntersection);
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
index 37a98d58a..c67521686 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
@@ -247,7 +247,7 @@ public class SaveManyBeans extends SaveManyBase {
     if (request.isQueueManyIntersection()) {
       // queue/delay until bean persist request is flushed
       this.deleteMissing = deleteMissingChildren;
-      request.setManyIntersection(this);
+      request.addManyIntersection(this);
     } else {
       saveAssocManyIntersection(deleteMissingChildren, false);
     }
diff --git a/src/test/java/org/tests/sp/TestManyToManySaveTwice.java b/src/test/java/org/tests/sp/TestManyToManySaveTwice.java
index 87d28e87a..a505a5d54 100644
--- a/src/test/java/org/tests/sp/TestManyToManySaveTwice.java
+++ b/src/test/java/org/tests/sp/TestManyToManySaveTwice.java
@@ -6,11 +6,13 @@ import io.ebean.Ebean;
 import io.ebean.Transaction;
 import org.junit.Test;
 import org.tests.sp.model.car.Car;
+import org.tests.sp.model.car.Door;
 import org.tests.sp.model.car.Wheel;
 
 import java.util.LinkedList;
 import java.util.List;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
@@ -24,15 +26,24 @@ public class TestManyToManySaveTwice extends BaseTestCase {
     Wheel w0 = new Wheel("wx0");
     Wheel w1 = new Wheel("wx1");
 
+    Door d0 = new Door("dx0");
+    Door d1 = new Door("dx1");
+
     List<Wheel> wheels = new LinkedList<>();
     wheels.add(w0);
     wheels.add(w1);
 
+    List<Door> doors = new LinkedList<>();
+    doors.add(d0);
+    doors.add(d1);
+
     DB.saveAll(wheels);
+    DB.saveAll(doors);
 
     Car c0 = new Car("cx0");
     c0.getWheels().add(w0);
     c0.getWheels().add(w1);
+    c0.getDoors().add(d0);
 
     Car c1 = new Car("cx1");
     c1.getWheels().add(w1);
@@ -45,6 +56,16 @@ public class TestManyToManySaveTwice extends BaseTestCase {
 
       transaction.commit();
     }
+
+    c0 = Ebean.find(Car.class, c0.getId());
+    c1 = Ebean.find(Car.class, c1.getId());
+
+    assertThat(c0.getWheels()).hasSize(2);
+    assertThat(c0.getDoors()).hasSize(1);
+
+    assertThat(c1.getWheels()).hasSize(1);
+    assertThat(c1.getDoors()).hasSize(0);
+
   }
 
 
@@ -101,7 +122,9 @@ public class TestManyToManySaveTwice extends BaseTestCase {
 
   private void delete() {
     DB.sqlUpdate("delete from sp_car_car_wheels").execute();
+    DB.sqlUpdate("delete from sp_car_car_doors").execute();
     DB.sqlUpdate("delete from sp_car_wheel").execute();
+    DB.sqlUpdate("delete from sp_car_door").execute();
     DB.sqlUpdate("delete from sp_car_car").execute();
   }
 }
diff --git a/src/test/java/org/tests/sp/model/car/Car.java b/src/test/java/org/tests/sp/model/car/Car.java
index 1c30f5e58..d742444d2 100644
--- a/src/test/java/org/tests/sp/model/car/Car.java
+++ b/src/test/java/org/tests/sp/model/car/Car.java
@@ -22,6 +22,10 @@ public class Car extends IdEntity {
   @JoinTable(name = "sp_car_car_wheels", joinColumns = {@JoinColumn(name = "car")}, inverseJoinColumns = {@JoinColumn(name = "wheel")})
   private List<Wheel> wheels;
 
+  @ManyToMany(cascade = CascadeType.ALL)
+  @JoinTable(name = "sp_car_car_doors", joinColumns = {@JoinColumn(name = "car")}, inverseJoinColumns = {@JoinColumn(name = "door")})
+  private List<Door> doors;
+
   public Car(String name) {
     this.name = name;
   }
@@ -37,4 +41,12 @@ public class Car extends IdEntity {
   public void setWheels(List<Wheel> wheels) {
     this.wheels = wheels;
   }
+
+  public List<Door> getDoors() {
+    return doors;
+  }
+
+  public void setDoors(List<Door> doors) {
+    this.doors = doors;
+  }
 }
diff --git a/src/test/java/org/tests/sp/model/car/Door.java b/src/test/java/org/tests/sp/model/car/Door.java
new file mode 100644
index 000000000..db8576e65
--- /dev/null
+++ b/src/test/java/org/tests/sp/model/car/Door.java
@@ -0,0 +1,23 @@
+package org.tests.sp.model.car;
+
+import org.tests.sp.model.IdEntity;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "sp_car_door")
+public class Door extends IdEntity {
+
+  private static final long serialVersionUID = 2399600193947163469L;
+
+  private String name;
+
+  public Door(String name) {
+    this.name = name;
+  }
+
+  public String getName() {
+    return name;
+  }
+}

From 6b4aff7191e5744a3ab0246225e595d16359d798 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 13 Feb 2019 11:56:55 +1300
Subject: [PATCH 0729/1036] [maven-release-plugin] prepare release
 ebean-11.34.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f3c676c02..bdfac994f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.34.2-SNAPSHOT</version>
+  <version>11.34.2</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.34.2</tag>
   </scm>
 
   <profiles>

From c344551e4d169df48f8e0d0ac43506274c8491da Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 13 Feb 2019 11:57:09 +1300
Subject: [PATCH 0730/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index bdfac994f..2d190e082 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.34.2</version>
+  <version>11.34.3-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.34.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 6b83800a83c508bd380e2ae65dc24e7b924180b4 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Sun, 17 Feb 2019 05:40:07 +0100
Subject: [PATCH 0731/1036] FIX: Proper sort of migration versions (possible
 regression due #1577) (#1639)

---
 .../dbmigration/LastMigration.java            | 25 ++++++-------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java b/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java
index 102eb87a9..5baaa939e 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java
@@ -33,12 +33,12 @@ class LastMigration {
    */
   static String lastVersion(File migDirectory, File modelDir) {
 
-    List<String> fileNames = new ArrayList<>();
+    List<MigrationVersion> versions = new ArrayList<>();
 
     File[] sqlFiles = migDirectory.listFiles(pathname -> includeSqlFile(pathname.getName().toLowerCase()));
     if (sqlFiles != null) {
       for (File file : sqlFiles) {
-        fileNames.add(trim(file.getName()));
+        versions.add(trimAndParse(file.getName()));
       }
     }
 
@@ -46,14 +46,14 @@ class LastMigration {
       File[] xmlFiles = modelDir.listFiles(pathname -> includeModelFile(pathname.getName().toLowerCase()));
       if (xmlFiles != null) {
         for (File file : xmlFiles) {
-          fileNames.add(trim(file.getName()));
+          versions.add(trimAndParse(file.getName()));
         }
       }
     }
 
-    Collections.sort(fileNames);
-    if (!fileNames.isEmpty()) {
-      return fileNames.get(fileNames.size() - 1);
+    Collections.sort(versions);
+    if (!versions.isEmpty()) {
+      return versions.get(versions.size() - 1).asString();
     }
     return null;
   }
@@ -69,23 +69,14 @@ class LastMigration {
     return lowerFileName.endsWith(MODEL_XML);
   }
 
-  private static String trim(String name) {
-    name = name.toLowerCase();
-    char c = name.charAt(0);
-    if (c == 'v') {
-      name = name.substring(1);
-    }
-    int p = name.indexOf("__");
-    if (p > -1) {
-      name = name.substring(0, p);
-    }
+  private static MigrationVersion trimAndParse(String name) {
     if (name.endsWith(SQL)) {
       name = name.substring(0, name.length() - 4);
     }
     if (name.endsWith(MODEL_XML)) {
       name = name.substring(0, name.length() - 10);
     }
-    return name;
+    return MigrationVersion.parse(name);
   }
 
 }

From 1f1a6e2c04196bc1ee3f0fecdc72bdf626c8dfa4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 18 Feb 2019 10:50:34 +1300
Subject: [PATCH 0732/1036] #1642 - Bump to ebean-datasource 4.5.1 with
 offline/online support

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2d190e082..e5191f2d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-datasource</artifactId>
-      <version>4.3.4</version>
+      <version>4.5.1</version>
     </dependency>
 
     <dependency>

From da20ced1ed1c10fd2acb571c77dcbcd7e0176c74 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 18 Feb 2019 10:58:08 +1300
Subject: [PATCH 0733/1036] [maven-release-plugin] prepare release
 ebean-11.34.3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e5191f2d7..7009e4513 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.34.3-SNAPSHOT</version>
+  <version>11.34.3</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.34.3</tag>
   </scm>
 
   <profiles>

From 84f1e05eb48a7faad40009b2d33baeee7f6bc89a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 18 Feb 2019 10:58:21 +1300
Subject: [PATCH 0734/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7009e4513..d33cf797c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.34.3</version>
+  <version>11.34.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.34.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 03a42f7f6e2c660c83848e6c7ae0abc5d612b20b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 21 Feb 2019 09:37:14 +1300
Subject: [PATCH 0735/1036] No effective change - update test
 DefaultProfileHandlerTest to output profiling files to target

---
 .../transaction/DefaultProfileHandlerTest.java   | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java b/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java
index 9d70a1c96..c6f2ee717 100644
--- a/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java
+++ b/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java
@@ -3,22 +3,28 @@ package io.ebeaninternal.server.transaction;
 import io.ebean.config.ProfilingConfig;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 public class DefaultProfileHandlerTest {
-  @Test
-  public void createProfileStream() throws Exception {
 
-    DefaultProfileHandler handler = new DefaultProfileHandler(new ProfilingConfig());
+  @Test
+  public void createProfileStream() {
+
+    ProfilingConfig profilingConfig = new ProfilingConfig();
+    profilingConfig.setDirectory("target/profiling");
+
+    DefaultProfileHandler handler = new DefaultProfileHandler(profilingConfig);
 
     assertNotNull(handler.createProfileStream(12));
     assertNull(handler.createProfileStream(0));
   }
 
   @Test
-  public void createProfileStream_when_specificIncludeIds() throws Exception {
+  public void createProfileStream_when_specificIncludeIds() {
 
     ProfilingConfig config = new ProfilingConfig();
+    config.setDirectory("target/profiling");
     config.setIncludeProfileIds(new int[]{100,101});
 
     DefaultProfileHandler handler = new DefaultProfileHandler(config);

From 59756945386d937ec91dad2400f65e8536eb1329 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 21 Feb 2019 22:14:21 +1300
Subject: [PATCH 0736/1036] #1640 - For Postgres support mapping InetAddress to
 INET db column (#1641)

* #1640 - For Postgres support mapping InetAddress to INET db column

* #1640 - For Postgres support mapping InetAddress to INET db column

Support for Inet and Cdir types + offlineMigrationGeneration + PlatformConfig.databaseInetAddressVarchar for turning off InetAddress mapping on Postgres
---
 pom.xml                                       |  6 ++
 .../java/io/ebean/config/PlatformConfig.java  | 20 +++++
 .../dbplatform/DbPlatformTypeMapping.java     |  5 ++
 .../io/ebean/config/dbplatform/DbType.java    |  2 +
 .../ebean/config/dbplatform/ExtraDbTypes.java |  3 +
 .../dbplatform/postgres/PostgresPlatform.java |  1 +
 .../server/type/ConvertInetAddresses.java     | 18 +++++
 .../server/type/DefaultTypeManager.java       | 18 ++++-
 .../server/type/PostgresHelper.java           |  6 ++
 .../server/type/ScalarTypeCdir.java           | 71 ++++++++++++++++++
 .../server/type/ScalarTypeInet.java           | 71 ++++++++++++++++++
 .../type/ScalarTypeInetAddressPostgres.java   | 57 ++++++++++++++
 .../server/type/ConvertInetAddressTest.java   | 26 +++++--
 .../tests/basic/type/TestInetAddressType.java | 75 ++++++++++++++-----
 .../org/tests/model/basic/EWithInetAddr.java  | 22 ++++++
 15 files changed, 374 insertions(+), 27 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/type/ScalarTypeCdir.java
 create mode 100644 src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java
 create mode 100644 src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddressPostgres.java

diff --git a/pom.xml b/pom.xml
index d33cf797c..231d7bfc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,6 +120,12 @@
       <version>4.5</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-types</artifactId>
+      <version>1.1</version>
+    </dependency>
+
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-datasource</artifactId>
diff --git a/src/main/java/io/ebean/config/PlatformConfig.java b/src/main/java/io/ebean/config/PlatformConfig.java
index 9a0ada54b..298b25d23 100644
--- a/src/main/java/io/ebean/config/PlatformConfig.java
+++ b/src/main/java/io/ebean/config/PlatformConfig.java
@@ -47,6 +47,11 @@ public class PlatformConfig {
    */
   private DbUuid dbUuid = DbUuid.AUTO_VARCHAR;
 
+  /**
+   * Set to true to force InetAddress to map to Varchar (for Postgres rather than INET)
+   */
+  private boolean databaseInetAddressVarchar;
+
   /**
    * Modify the default mapping of standard types such as default precision for DECIMAL etc.
    */
@@ -181,6 +186,20 @@ public class PlatformConfig {
     this.idType = idType;
   }
 
+  /**
+   * Return true if InetAddress should map to varchar column (rather than Postgres INET).
+   */
+  public boolean isDatabaseInetAddressVarchar() {
+    return databaseInetAddressVarchar;
+  }
+
+  /**
+   * Set to true to force InetAddress to map to varchar column.
+   */
+  public void setDatabaseInetAddressVarchar(boolean databaseInetAddressVarchar) {
+    this.databaseInetAddressVarchar = databaseInetAddressVarchar;
+  }
+
   /**
    * Add a custom type mapping.
    * <p>
@@ -235,6 +254,7 @@ public class PlatformConfig {
     databaseSequenceBatchSize = p.getInt("databaseSequenceBatchSize", databaseSequenceBatchSize);
     databaseBooleanTrue = p.get("databaseBooleanTrue", databaseBooleanTrue);
     databaseBooleanFalse = p.get("databaseBooleanFalse", databaseBooleanFalse);
+    databaseInetAddressVarchar = p.getBoolean("databaseInetAddressVarchar", databaseInetAddressVarchar);
 
     DbUuid dbUuid = p.getEnum(DbUuid.class, "dbuuid", null);
     if (dbUuid != null) {
diff --git a/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java b/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java
index 3376f617c..84fa3ba46 100644
--- a/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java
+++ b/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java
@@ -27,6 +27,9 @@ public class DbPlatformTypeMapping {
 
   private static final DbPlatformType BOOLEAN_LOGICAL = new BooleanLogicalType();
 
+  private static final DbPlatformType INET_NATIVE = new DbPlatformType("inet", false);
+  private static final DbPlatformType INET_VARCHAR = new DbPlatformType("varchar", 50);
+
   private static final DbPlatformType UUID_NATIVE = new DbPlatformType("uuid", false);
   @SuppressWarnings("unused")
   private static final DbPlatformType UUID_PLACEHOLDER = new DbPlatformType("uuidPlaceholder");
@@ -106,6 +109,7 @@ public class DbPlatformTypeMapping {
       put(DbType.JSONBLOB, new DbPlatformType("jsonblob"));
       put(DbType.JSONVARCHAR, new DbPlatformType("jsonvarchar", 1000));
       put(DbType.UUID, UUID_NATIVE);
+      put(DbType.INET, INET_NATIVE);
 
     } else {
       put(DbType.VARCHAR, new DbPlatformType("varchar", 255));
@@ -121,6 +125,7 @@ public class DbPlatformTypeMapping {
       put(DbType.JSONVARCHAR, JSON_VARCHAR_PLACEHOLDER);
       // default to native UUID and override on platform configure()
       put(DbType.UUID, UUID_NATIVE);
+      put(DbType.INET, INET_VARCHAR);
     }
   }
 
diff --git a/src/main/java/io/ebean/config/dbplatform/DbType.java b/src/main/java/io/ebean/config/dbplatform/DbType.java
index f967db9ca..6f7705d65 100644
--- a/src/main/java/io/ebean/config/dbplatform/DbType.java
+++ b/src/main/java/io/ebean/config/dbplatform/DbType.java
@@ -35,6 +35,8 @@ public enum DbType {
   ARRAY(Types.ARRAY),
 
   UUID(ExtraDbTypes.UUID),
+  INET(ExtraDbTypes.INET),
+  CDIR(ExtraDbTypes.CDIR),
 
   POINT(ExtraDbTypes.POINT),
   POLYGON(ExtraDbTypes.POLYGON),
diff --git a/src/main/java/io/ebean/config/dbplatform/ExtraDbTypes.java b/src/main/java/io/ebean/config/dbplatform/ExtraDbTypes.java
index f05ce865c..d7b0f9339 100644
--- a/src/main/java/io/ebean/config/dbplatform/ExtraDbTypes.java
+++ b/src/main/java/io/ebean/config/dbplatform/ExtraDbTypes.java
@@ -40,6 +40,9 @@ public interface ExtraDbTypes {
    */
   int JSONBlob = 5005;
 
+  int INET = 5020;
+  int CDIR = 5021;
+
   /**
    * Geo Point
    */
diff --git a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
index 80a9c40e9..c8266fbec 100644
--- a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
@@ -60,6 +60,7 @@ public class PostgresPlatform extends DatabasePlatform {
     DbPlatformType dbBytea = new DbPlatformType("bytea", false);
 
     dbTypeMap.put(DbType.UUID, new DbPlatformType("uuid", false));
+    dbTypeMap.put(DbType.INET, new DbPlatformType("inet", false));
     dbTypeMap.put(DbType.HSTORE, new DbPlatformType("hstore", false));
     dbTypeMap.put(DbType.JSON, new DbPlatformType("json", false));
     dbTypeMap.put(DbType.JSONB, new DbPlatformType("jsonb", false));
diff --git a/src/main/java/io/ebeaninternal/server/type/ConvertInetAddresses.java b/src/main/java/io/ebeaninternal/server/type/ConvertInetAddresses.java
index cf028c81a..03357004a 100644
--- a/src/main/java/io/ebeaninternal/server/type/ConvertInetAddresses.java
+++ b/src/main/java/io/ebeaninternal/server/type/ConvertInetAddresses.java
@@ -334,6 +334,24 @@ public final class ConvertInetAddresses {
     return ip.getHostAddress();
   }
 
+  /**
+   * Return the host address without the square brackets around IPv6 addresses.
+   */
+  public static String toHostAddress(InetAddress ip) {
+    return ip.getHostAddress();
+  }
+
+  /**
+   * Parse the IPv4 or IPv6 address without quare brackets around IPv6 addresses.
+   */
+  public static InetAddress fromHost(String hostAddr) {
+    if (hostAddr.startsWith("[")) {
+      // IPv6 address
+      hostAddr = hostAddr.substring(1, hostAddr.length() - 1);
+    }
+    return forString(hostAddr);
+  }
+
   /**
    * Returns an InetAddress representing the literal IPv4 or IPv6 host
    * portion of a URL, encoded in the format specified by RFC 3986 section 3.2.2.
diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index c29afeaad..710265bd4 100644
--- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -14,6 +14,8 @@ import io.ebean.config.ScalarTypeConverter;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
+import io.ebean.types.Cdir;
+import io.ebean.types.Inet;
 import io.ebean.util.AnnotationUtil;
 import io.ebeaninternal.api.ExtraTypeFactory;
 import io.ebeaninternal.dbmigration.DbOffline;
@@ -128,7 +130,6 @@ public final class DefaultTypeManager implements TypeManager {
 
   private final ScalarType<?> dateType = new ScalarTypeDate();
 
-  private final ScalarType<?> inetAddressType = new ScalarTypeInetAddress();
   private final ScalarType<?> urlType = new ScalarTypeURL();
   private final ScalarType<?> uriType = new ScalarTypeURI();
   private final ScalarType<?> localeType = new ScalarTypeLocale();
@@ -975,8 +976,21 @@ public final class DefaultTypeManager implements TypeManager {
       addType(UUID.class, uuidType);
     }
 
+    if (offlineMigrationGeneration || (postgres && !config.getPlatformConfig().isDatabaseInetAddressVarchar())) {
+      addType(InetAddress.class, new ScalarTypeInetAddressPostgres());
+    } else {
+      addType(InetAddress.class, new ScalarTypeInetAddress());
+    }
+
+    if (offlineMigrationGeneration || postgres) {
+      addType(Cdir.class, new ScalarTypeCdir.Postgres());
+      addType(Inet.class, new ScalarTypeInet.Postgres());
+    } else {
+      addType(Cdir.class, new ScalarTypeCdir.Varchar());
+      addType(Inet.class, new ScalarTypeInet.Varchar());
+    }
+
     addType(File.class, fileType);
-    addType(InetAddress.class, inetAddressType);
     addType(Locale.class, localeType);
     addType(Currency.class, currencyType);
     addType(TimeZone.class, timeZoneType);
diff --git a/src/main/java/io/ebeaninternal/server/type/PostgresHelper.java b/src/main/java/io/ebeaninternal/server/type/PostgresHelper.java
index b79a8d483..d422b493f 100644
--- a/src/main/java/io/ebeaninternal/server/type/PostgresHelper.java
+++ b/src/main/java/io/ebeaninternal/server/type/PostgresHelper.java
@@ -16,6 +16,12 @@ public class PostgresHelper {
    */
   public static final String JSONB_TYPE = "jsonb";
 
+  public static final String INET_TYPE = "inet";
+
+  public static Object asInet(String value) throws SQLException {
+    return asObject(INET_TYPE, value);
+  }
+
   /**
    * Construct and return Postgres specific PG object.
    */
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeCdir.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeCdir.java
new file mode 100644
index 000000000..cef625c29
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeCdir.java
@@ -0,0 +1,71 @@
+package io.ebeaninternal.server.type;
+
+import io.ebean.config.dbplatform.ExtraDbTypes;
+import io.ebean.types.Cdir;
+
+import java.sql.SQLException;
+import java.sql.Types;
+
+/**
+ * ScalarType for Cdir to Varchar or Postgres CDIR.
+ */
+public abstract class ScalarTypeCdir extends ScalarTypeBaseVarchar<Cdir> {
+
+  ScalarTypeCdir() {
+    super(Cdir.class, false, ExtraDbTypes.INET);
+  }
+
+  @Override
+  public abstract void bind(DataBind b, Cdir value) throws SQLException;
+
+  @Override
+  public Cdir convertFromDbString(String dbValue) {
+    return parse(dbValue);
+  }
+
+  @Override
+  public String convertToDbString(Cdir beanValue) {
+    return formatValue(beanValue);
+  }
+
+  @Override
+  public String formatValue(Cdir value) {
+    return value.getAddress();
+  }
+
+  @Override
+  public Cdir parse(String value) {
+    return new Cdir(value);
+  }
+
+  /**
+   * Cdir to Varchar.
+   */
+  public static class Varchar extends ScalarTypeCdir {
+
+    @Override
+    public void bind(DataBind b, Cdir value) throws SQLException {
+      if (value == null) {
+        b.setNull(Types.VARCHAR);
+      } else {
+        b.setString(convertToDbString(value));
+      }
+    }
+  }
+
+  /**
+   * Cdir to Postgres CDIR.
+   */
+  public static class Postgres extends ScalarTypeCdir {
+
+    @Override
+    public void bind(DataBind b, Cdir value) throws SQLException {
+      if (value == null) {
+        b.setNull(Types.OTHER);
+      } else {
+        String strValue = convertToDbString(value);
+        b.setObject(PostgresHelper.asInet(strValue));
+      }
+    }
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java
new file mode 100644
index 000000000..4168e0c89
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java
@@ -0,0 +1,71 @@
+package io.ebeaninternal.server.type;
+
+import io.ebean.config.dbplatform.ExtraDbTypes;
+import io.ebean.types.Inet;
+
+import java.sql.SQLException;
+import java.sql.Types;
+
+/**
+ * ScalarType for Inet to Varchar or Postgres INET.
+ */
+public abstract class ScalarTypeInet extends ScalarTypeBaseVarchar<Inet> {
+
+  ScalarTypeInet() {
+    super(Inet.class, false, ExtraDbTypes.INET);
+  }
+
+  @Override
+  public abstract void bind(DataBind b, Inet value) throws SQLException;
+
+  @Override
+  public Inet convertFromDbString(String dbValue) {
+    return parse(dbValue);
+  }
+
+  @Override
+  public String convertToDbString(Inet beanValue) {
+    return formatValue(beanValue);
+  }
+
+  @Override
+  public String formatValue(Inet value) {
+    return value.getAddress();
+  }
+
+  @Override
+  public Inet parse(String value) {
+    return new Inet(value);
+  }
+
+  /**
+   * Inet to Varchar.
+   */
+  public static class Varchar extends ScalarTypeInet {
+
+    @Override
+    public void bind(DataBind b, Inet value) throws SQLException {
+      if (value == null) {
+        b.setNull(Types.VARCHAR);
+      } else {
+        b.setString(convertToDbString(value));
+      }
+    }
+  }
+
+  /**
+   * Inet to Postgres INET.
+   */
+  public static class Postgres extends ScalarTypeInet {
+
+    @Override
+    public void bind(DataBind b, Inet value) throws SQLException {
+      if (value == null) {
+        b.setNull(Types.OTHER);
+      } else {
+        String strValue = convertToDbString(value);
+        b.setObject(PostgresHelper.asInet(strValue));
+      }
+    }
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddressPostgres.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddressPostgres.java
new file mode 100644
index 000000000..cf20624c5
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddressPostgres.java
@@ -0,0 +1,57 @@
+package io.ebeaninternal.server.type;
+
+import io.ebean.config.dbplatform.ExtraDbTypes;
+import io.ebean.text.TextException;
+
+import java.net.InetAddress;
+import java.sql.SQLException;
+import java.sql.Types;
+
+/**
+ * ScalarType for InetAddress to Postgres INET.
+ */
+public class ScalarTypeInetAddressPostgres extends ScalarTypeBaseVarchar<InetAddress> {
+
+  public ScalarTypeInetAddressPostgres() {
+    super(InetAddress.class, false, ExtraDbTypes.INET);
+  }
+
+  @Override
+  public void bind(DataBind b, InetAddress value) throws SQLException {
+    if (value == null) {
+      b.setNull(Types.OTHER);
+    } else {
+      String strValue = convertToDbString(value);
+      b.setObject(PostgresHelper.asInet(strValue));
+    }
+  }
+
+  @Override
+  public InetAddress convertFromDbString(String dbValue) {
+    try {
+      return parse(dbValue);
+    } catch (IllegalArgumentException e) {
+      throw new RuntimeException("Error with InetAddresses [" + dbValue + "] " + e);
+    }
+  }
+
+  @Override
+  public String convertToDbString(InetAddress beanValue) {
+    return formatValue(beanValue);
+  }
+
+  @Override
+  public String formatValue(InetAddress v) {
+    return ConvertInetAddresses.toHostAddress(v);
+  }
+
+  @Override
+  public InetAddress parse(String value) {
+    try {
+      return ConvertInetAddresses.fromHost(value);
+    } catch (IllegalArgumentException e) {
+      throw new TextException("Error with InetAddresses [{}]", value, e);
+    }
+  }
+
+}
diff --git a/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java b/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java
index 96243a427..83c7ad3e5 100644
--- a/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java
@@ -1,34 +1,46 @@
 package io.ebeaninternal.server.type;
 
-import org.junit.Assert;
 import org.junit.Test;
 
 import java.net.InetAddress;
 
+import static org.junit.Assert.assertEquals;
+
 public class ConvertInetAddressTest {
 
   @Test
   public void forString() {
 
     InetAddress addr = ConvertInetAddresses.forString("128.1.10.23");
-    Assert.assertNotNull(addr);
-    Assert.assertEquals("128.1.10.23", addr.getHostAddress());
+    assertEquals("128.1.10.23", addr.getHostAddress());
 
     String ip6addr = "2001:db8:85a3:0:0:8a2e:370:7334";
     InetAddress addr6 = ConvertInetAddresses.forString(ip6addr);
     String uriAddr6 = ConvertInetAddresses.toUriString(addr6);
-    Assert.assertEquals("[" + ip6addr + "]", uriAddr6);
-    Assert.assertEquals(ip6addr, addr6.getHostAddress());
+    assertEquals("[" + ip6addr + "]", uriAddr6);
+    assertEquals(ip6addr, addr6.getHostAddress());
+  }
+
+  @Test
+  public void ipv6_fromHost_getHostAddress() {
+    InetAddress addr2 = ConvertInetAddresses.fromHost("2001:4f8:3:ba:2e0:81ff:fe22:d1f1");
+    assertEquals("2001:4f8:3:ba:2e0:81ff:fe22:d1f1", addr2.getHostAddress());
+  }
+
+  @Test
+  public void ipv6_fromHost_getHostAddress_2() {
+    InetAddress addr2 = ConvertInetAddresses.fromHost("2001:db8:85a3:0:0:8a2e:370:7334");
+    assertEquals("2001:db8:85a3:0:0:8a2e:370:7334", addr2.getHostAddress());
   }
 
   @Test
   public void toUriString() {
 
     InetAddress addr = ConvertInetAddresses.forString("128.1.10.23");
-    Assert.assertEquals("128.1.10.23", addr.getHostAddress());
+    assertEquals("128.1.10.23", addr.getHostAddress());
 
     String uriAddr = ConvertInetAddresses.toUriString(addr);
-    Assert.assertEquals("128.1.10.23", uriAddr);
+    assertEquals("128.1.10.23", uriAddr);
   }
 
 }
diff --git a/src/test/java/org/tests/basic/type/TestInetAddressType.java b/src/test/java/org/tests/basic/type/TestInetAddressType.java
index dda0e0ae8..3aba6b688 100644
--- a/src/test/java/org/tests/basic/type/TestInetAddressType.java
+++ b/src/test/java/org/tests/basic/type/TestInetAddressType.java
@@ -1,61 +1,100 @@
 package org.tests.basic.type;
 
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.TransactionalTestCase;
-
-import org.tests.model.basic.EWithInetAddr;
-import org.junit.Assert;
+import io.ebean.types.Cdir;
+import io.ebean.types.Inet;
 import org.junit.Test;
+import org.tests.model.basic.EWithInetAddr;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
 public class TestInetAddressType extends TransactionalTestCase {
 
   @Test
   public void testIp4() throws UnknownHostException {
 
-    insertUpdateDeleteFind("120.12.12.56");
+    insertUpdateDeleteFind("120.12.12.56", "120.12.12.56");
   }
 
   @Test
   public void testIp6() throws UnknownHostException {
 
-    insertUpdateDeleteFind("2001:db8:85a3:0:0:8a2e:370:7334");
+    if (isPostgres()) {
+      insertUpdateDeleteFind("2001:db8:85a3:0:0:8a2e:370:7334", "2001:db8:85a3::8a2e:370:7334");
+    } else {
+      insertUpdateDeleteFind("2001:db8:85a3:0:0:8a2e:370:7334", "2001:db8:85a3:0:0:8a2e:370:7334");
+    }
   }
 
-  private void insertUpdateDeleteFind(String ipAddress) throws UnknownHostException {
+  private void insertUpdateDeleteFind(String ipAddress, String expected) throws UnknownHostException {
 
     EWithInetAddr bean1 = new EWithInetAddr();
     bean1.setName("jim");
 
     InetAddress address1 = InetAddress.getByName(ipAddress);
     bean1.setInetAddress(address1);
+    bean1.setInet2(new Inet(ipAddress));
+    bean1.setCdir(new Cdir(ipAddress));
 
-    Ebean.save(bean1);
 
-    EWithInetAddr bean2 = Ebean.find(EWithInetAddr.class, bean1.getId());
+    DB.save(bean1);
+
+    EWithInetAddr bean2 = DB.find(EWithInetAddr.class, bean1.getId());
     InetAddress address2 = bean2.getInetAddress();
-    Assert.assertNotNull(address2.getHostAddress());
-    Assert.assertEquals(address1.getHostAddress(), address2.getHostAddress());
+    assertNotNull(address2.getHostAddress());
+    assertThat(address1.getHostAddress()).isEqualTo(address2.getHostAddress());
+    assertThat(bean2.getInet2().getAddress()).isEqualTo(expected);
+    assertThat(bean2.getCdir().getAddress()).isEqualTo(expected);
 
     bean2.setName("modJim");
     bean2.setInetAddress(InetAddress.getByName("120.12.20.80"));
-    Ebean.save(bean2);
-    Ebean.delete(bean2);
+    bean1.setInet2(new Inet("120.12.20.80"));
+    bean1.setCdir(new Cdir("120.12.20.80"));
+    DB.save(bean2);
+    DB.delete(bean2);
   }
 
   @Test
-  public void use_null() throws UnknownHostException {
+  public void testIp6_ranges() {
+
+    insertFindDeleteRange("2001:4f8:3:ba::/64");
+    insertFindDeleteRange("2001:4f8:3:ba:2e0:81ff:fe22:d1f1/64");
+  }
+
+  private void insertFindDeleteRange(String ipAddressRange)  {
+
+    EWithInetAddr bean1 = new EWithInetAddr();
+    bean1.setName("withRange");
+    bean1.setInet2(new Inet(ipAddressRange));
+    bean1.setCdir(new Cdir(ipAddressRange));
+
+    DB.save(bean1);
+
+    EWithInetAddr bean2 = DB.find(EWithInetAddr.class, bean1.getId());
+    assertNotNull(bean2.getInet2());
+    assertThat(bean2.getInet2().getAddress()).isEqualTo(ipAddressRange);
+    assertThat(bean2.getCdir().getAddress()).isEqualTo(ipAddressRange);
+
+    DB.delete(bean2);
+  }
+
+  @Test
+  public void use_null() {
 
     EWithInetAddr bean1 = new EWithInetAddr();
     bean1.setName("jim");
 
-    Ebean.save(bean1);
+    DB.save(bean1);
 
-    EWithInetAddr bean2 = Ebean.find(EWithInetAddr.class, bean1.getId());
-    InetAddress address2 = bean2.getInetAddress();
-    Assert.assertNull(address2);
+    EWithInetAddr bean2 = DB.find(EWithInetAddr.class, bean1.getId());
+    assertNull(bean2.getInetAddress());
+    assertNull(bean2.getInet2());
   }
 
 }
diff --git a/src/test/java/org/tests/model/basic/EWithInetAddr.java b/src/test/java/org/tests/model/basic/EWithInetAddr.java
index 3e823dc15..87ca89342 100644
--- a/src/test/java/org/tests/model/basic/EWithInetAddr.java
+++ b/src/test/java/org/tests/model/basic/EWithInetAddr.java
@@ -1,5 +1,8 @@
 package org.tests.model.basic;
 
+import io.ebean.types.Cdir;
+import io.ebean.types.Inet;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
@@ -20,6 +23,10 @@ public class EWithInetAddr {
 
   InetAddress inetAddress;
 
+  Inet inet2;
+
+  Cdir cdir;
+
   public Long getId() {
     return id;
   }
@@ -52,4 +59,19 @@ public class EWithInetAddr {
     this.inetAddress = inetAddress;
   }
 
+  public Inet getInet2() {
+    return inet2;
+  }
+
+  public void setInet2(Inet inet2) {
+    this.inet2 = inet2;
+  }
+
+  public Cdir getCdir() {
+    return cdir;
+  }
+
+  public void setCdir(Cdir cdir) {
+    this.cdir = cdir;
+  }
 }

From 2e496c9e1eaa3278d5eb46ea4a53024b6152136e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 21 Feb 2019 22:15:49 +1300
Subject: [PATCH 0737/1036] Bump pom to 11.35.1-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 231d7bfc8..52231775b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.34.4-SNAPSHOT</version>
+  <version>11.35.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>

From e5f98f1b7a6a59a6ec8423509c9e64dd71ca6f79 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 24 Feb 2019 15:29:07 +1300
Subject: [PATCH 0738/1036] #1640 Additionally add expression eq and in support
 for Inet and Postgres any

---
 pom.xml                                       |  2 +-
 .../ebeaninternal/server/persist/Binder.java  |  6 +++
 .../platform/AbstractMultiValueBind.java      |  4 +-
 .../platform/PostgresMultiValueBind.java      |  3 ++
 .../server/type/DefaultTypeManager.java       | 12 ++++-
 .../server/type/ScalarTypeInet.java           | 12 ++++-
 .../tests/basic/type/TestInetAddressType.java | 53 +++++++++++++++++++
 7 files changed, 85 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 52231775b..969c0c287 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-types</artifactId>
-      <version>1.1</version>
+      <version>1.2</version>
     </dependency>
 
     <dependency>
diff --git a/src/main/java/io/ebeaninternal/server/persist/Binder.java b/src/main/java/io/ebeaninternal/server/persist/Binder.java
index a45aa27f0..666b3660a 100644
--- a/src/main/java/io/ebeaninternal/server/persist/Binder.java
+++ b/src/main/java/io/ebeaninternal/server/persist/Binder.java
@@ -9,6 +9,7 @@ import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
 import io.ebeaninternal.server.persist.platform.MultiValueBind;
 import io.ebeaninternal.server.type.DataBind;
 import io.ebeaninternal.server.type.DataReader;
+import io.ebeaninternal.server.type.PostgresHelper;
 import io.ebeaninternal.server.type.RsetDataReader;
 import io.ebeaninternal.server.type.ScalarType;
 import io.ebeaninternal.server.type.TypeManager;
@@ -374,6 +375,11 @@ public class Binder {
           b.setObject(data);
           break;
 
+        case DbPlatformType.INET:
+          // data is always a String at this point
+          b.setObject(PostgresHelper.asInet(data.toString()));
+          break;
+
         case java.sql.Types.OTHER:
           b.setObject(data, dataType);
           break;
diff --git a/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java b/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java
index 0079ca957..30d68b757 100644
--- a/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java
+++ b/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java
@@ -82,8 +82,8 @@ abstract class AbstractMultiValueBind extends MultiValueBind {
         //case NCLOB:
       case NCHAR:
       case NVARCHAR:
-        return "varchar";
-      case ExtraDbTypes.UUID: // Db Native UUID
+      case ExtraDbTypes.UUID: // Postgres cast to uuid[]
+      case ExtraDbTypes.INET: // Postgres cast to inet[]
         return "varchar";
 
       default:
diff --git a/src/main/java/io/ebeaninternal/server/persist/platform/PostgresMultiValueBind.java b/src/main/java/io/ebeaninternal/server/persist/platform/PostgresMultiValueBind.java
index ac8141a5b..36d3d639e 100644
--- a/src/main/java/io/ebeaninternal/server/persist/platform/PostgresMultiValueBind.java
+++ b/src/main/java/io/ebeaninternal/server/persist/platform/PostgresMultiValueBind.java
@@ -14,6 +14,9 @@ public class PostgresMultiValueBind extends AbstractMultiValueBind {
     if (dbType == ExtraDbTypes.UUID) {
       return (not) ? " != all(?::uuid[])" : " = any(?::uuid[])";
     }
+    if (dbType == ExtraDbTypes.INET) {
+      return (not) ? " != all(?::inet[])" : " = any(?::inet[])";
+    }
     String arrayType = getArrayType(dbType);
     if (arrayType == null) {
       return super.getInExpression(not, type, size);
diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 710265bd4..866ad4942 100644
--- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -39,6 +39,8 @@ import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.net.Inet4Address;
+import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.URI;
 import java.net.URL;
@@ -977,9 +979,9 @@ public final class DefaultTypeManager implements TypeManager {
     }
 
     if (offlineMigrationGeneration || (postgres && !config.getPlatformConfig().isDatabaseInetAddressVarchar())) {
-      addType(InetAddress.class, new ScalarTypeInetAddressPostgres());
+      addInetAddressType(new ScalarTypeInetAddressPostgres());
     } else {
-      addType(InetAddress.class, new ScalarTypeInetAddress());
+      addInetAddressType(new ScalarTypeInetAddress());
     }
 
     if (offlineMigrationGeneration || postgres) {
@@ -1077,4 +1079,10 @@ public final class DefaultTypeManager implements TypeManager {
     nativeMap.put(Types.TIMESTAMP, timestampType);
   }
 
+  private void addInetAddressType(ScalarType scalarType) {
+    addType(InetAddress.class, scalarType);
+    addType(Inet4Address.class, scalarType);
+    addType(Inet6Address.class, scalarType);
+  }
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java
index 4168e0c89..d52676da5 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java
@@ -11,8 +11,8 @@ import java.sql.Types;
  */
 public abstract class ScalarTypeInet extends ScalarTypeBaseVarchar<Inet> {
 
-  ScalarTypeInet() {
-    super(Inet.class, false, ExtraDbTypes.INET);
+  ScalarTypeInet(int jdbcType) {
+    super(Inet.class, false, jdbcType);
   }
 
   @Override
@@ -43,6 +43,10 @@ public abstract class ScalarTypeInet extends ScalarTypeBaseVarchar<Inet> {
    */
   public static class Varchar extends ScalarTypeInet {
 
+    Varchar() {
+      super(Types.VARCHAR);
+    }
+
     @Override
     public void bind(DataBind b, Inet value) throws SQLException {
       if (value == null) {
@@ -58,6 +62,10 @@ public abstract class ScalarTypeInet extends ScalarTypeBaseVarchar<Inet> {
    */
   public static class Postgres extends ScalarTypeInet {
 
+    Postgres() {
+      super(ExtraDbTypes.INET);
+    }
+
     @Override
     public void bind(DataBind b, Inet value) throws SQLException {
       if (value == null) {
diff --git a/src/test/java/org/tests/basic/type/TestInetAddressType.java b/src/test/java/org/tests/basic/type/TestInetAddressType.java
index 3aba6b688..6f821802f 100644
--- a/src/test/java/org/tests/basic/type/TestInetAddressType.java
+++ b/src/test/java/org/tests/basic/type/TestInetAddressType.java
@@ -9,6 +9,8 @@ import org.tests.model.basic.EWithInetAddr;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertNotNull;
@@ -32,6 +34,57 @@ public class TestInetAddressType extends TransactionalTestCase {
     }
   }
 
+  @Test
+  public void test_inet_queryIn() {
+
+    List<Inet> addrs = Inet.listOf("120.12.12.56", "120.12.12.57");
+
+    DB.find(EWithInetAddr.class)
+      .where()
+      .in("inet2", addrs)
+      .findList();
+  }
+
+  @Test
+  public void test_inetAdress_queryIn() throws UnknownHostException {
+
+    List<InetAddress> addrs = new ArrayList<>();
+    addrs.add(InetAddress.getByName("120.12.12.56"));
+    addrs.add(InetAddress.getByName("120.12.12.57"));
+
+    DB.find(EWithInetAddr.class)
+      .where()
+      .in("inetAddress", addrs)
+      .findList();
+  }
+
+  @Test
+  public void test_inet_queryEq() {
+
+    DB.find(EWithInetAddr.class)
+      .where()
+      .eq("inet2", new Inet("120.12.12.58"))
+      .findList();
+  }
+
+  @Test
+  public void test_inet4address_queryEq() throws UnknownHostException {
+
+    DB.find(EWithInetAddr.class)
+      .where()
+      .eq("inetAddress", InetAddress.getByName("120.12.12.58"))
+      .findList();
+  }
+
+  @Test
+  public void test_inet6address_queryEq() throws UnknownHostException {
+
+    DB.find(EWithInetAddr.class)
+      .where()
+      .eq("inetAddress", InetAddress.getByName("2001:db8:85a3:0:0:8a2e:370:7334"))
+      .findList();
+  }
+
   private void insertUpdateDeleteFind(String ipAddress, String expected) throws UnknownHostException {
 
     EWithInetAddr bean1 = new EWithInetAddr();

From 3afd3c453050810932cf0743c9709d918f8d860c Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 24 Feb 2019 16:18:49 +1300
Subject: [PATCH 0739/1036] #1640 Additionally add expression eq and in support
 for Inet and Postgres any

Bump ebean-types to 1.3 with of() helper methods
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 969c0c287..12ab0cde3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-types</artifactId>
-      <version>1.2</version>
+      <version>1.3</version>
     </dependency>
 
     <dependency>

From 1749c2cb4cf6b0348b706f5d7aedd211b8913f56 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 24 Feb 2019 16:20:21 +1300
Subject: [PATCH 0740/1036] [maven-release-plugin] prepare release
 ebean-11.35.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 12ab0cde3..95af6985a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.35.1-SNAPSHOT</version>
+  <version>11.35.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.35.1</tag>
   </scm>
 
   <profiles>

From 817c946eeb2c705f90bd50609378088d9e616478 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 24 Feb 2019 16:20:36 +1300
Subject: [PATCH 0741/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 95af6985a..7975f64ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.35.1</version>
+  <version>11.35.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.35.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 888384f7dbc7dcf5743755368260c9c3a40b4d69 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 1 Mar 2019 18:12:36 +1300
Subject: [PATCH 0742/1036] No effective change (change to DB from Ebean for
 TestSubQuery)

---
 .../java/org/tests/query/TestSubQuery.java    | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/test/java/org/tests/query/TestSubQuery.java b/src/test/java/org/tests/query/TestSubQuery.java
index 1e3427737..dd44ed881 100644
--- a/src/test/java/org/tests/query/TestSubQuery.java
+++ b/src/test/java/org/tests/query/TestSubQuery.java
@@ -1,14 +1,14 @@
 package org.tests.query;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.Query;
+import org.junit.Test;
 import org.tests.model.basic.CKeyParent;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
 import org.tests.model.basic.Vehicle;
 import org.tests.model.basic.VehicleDriver;
-import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,10 +27,10 @@ public class TestSubQuery extends BaseTestCase {
     productIds.add(4);
     productIds.add(5);
 
-    Query<Order> sq = Ebean.createQuery(Order.class).select("id").where()
+    Query<Order> sq = DB.find(Order.class).select("id").where()
       .in("details.product.id", productIds).query();
 
-    Ebean.find(Order.class).where().in("id", sq).findList();
+    DB.find(Order.class).where().in("id", sq).findList();
   }
 
   @Test
@@ -41,19 +41,19 @@ public class TestSubQuery extends BaseTestCase {
     List<Integer> productIds = new ArrayList<>();
     productIds.add(3);
 
-    Query<Order> sq = Ebean.createQuery(Order.class).select("id").where()
+    Query<Order> sq = DB.createQuery(Order.class).select("id").where()
       .isIn("details.product.id", productIds).query();
 
-    Ebean.find(Order.class).where().isIn("id", sq).findList();
+    DB.find(Order.class).where().isIn("id", sq).findList();
   }
 
   public void testCompositeKey() {
     ResetBasicData.reset();
 
-    Query<CKeyParent> sq = Ebean.createQuery(CKeyParent.class).select("id.oneKey")
+    Query<CKeyParent> sq = DB.createQuery(CKeyParent.class).select("id.oneKey")
       .setAutoTune(false).where().query();
 
-    Query<CKeyParent> pq = Ebean.find(CKeyParent.class).where().in("id.oneKey", sq).query();
+    Query<CKeyParent> pq = DB.find(CKeyParent.class).where().in("id.oneKey", sq).query();
 
     pq.findList();
 
@@ -93,10 +93,10 @@ public class TestSubQuery extends BaseTestCase {
   public void testInheritance2() {
     ResetBasicData.reset();
 
-    Query<VehicleDriver> sq = Ebean.createQuery(VehicleDriver.class).select("vehicle")
+    Query<VehicleDriver> sq = DB.createQuery(VehicleDriver.class).select("vehicle")
       .setAutoTune(false).where().query();
 
-    Query<Vehicle> pq = Ebean.find(Vehicle.class).where().in("id", sq).query();
+    Query<Vehicle> pq = DB.find(Vehicle.class).where().in("id", sq).query();
 
     pq.findList();
 
@@ -118,10 +118,10 @@ public class TestSubQuery extends BaseTestCase {
   public void testInheritance3() {
     ResetBasicData.reset();
 
-    Query<VehicleDriver> sq = Ebean.createQuery(VehicleDriver.class).select("vehicle")
+    Query<VehicleDriver> sq = DB.createQuery(VehicleDriver.class).select("vehicle")
       .setAutoTune(false).where().eq("vehicle.licenseNumber", "abc").query();
 
-    Query<Vehicle> pq = Ebean.find(Vehicle.class).where().in("id", sq).query();
+    Query<Vehicle> pq = DB.find(Vehicle.class).where().in("id", sq).query();
 
     pq.findList();
 
@@ -139,10 +139,10 @@ public class TestSubQuery extends BaseTestCase {
   public void testInheritance4() {
     ResetBasicData.reset();
 
-    Query<VehicleDriver> sq = Ebean.createQuery(VehicleDriver.class).select("vehicle.id")
+    Query<VehicleDriver> sq = DB.createQuery(VehicleDriver.class).select("vehicle.id")
       .setAutoTune(false).where().query();
 
-    Query<Vehicle> pq = Ebean.find(Vehicle.class).where().in("id", sq).query();
+    Query<Vehicle> pq = DB.find(Vehicle.class).where().in("id", sq).query();
 
     pq.findList();
 

From a4698ea1b662d06e35adf3399164a33a3df58909 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 1 Mar 2019 18:24:00 +1300
Subject: [PATCH 0743/1036] #1643 - ENH: Add expression inOrEmpty() ... as a
 convenience for conditionally added a IN expression

---
 src/main/java/io/ebean/Expr.java              |  37 ++++++
 src/main/java/io/ebean/ExpressionFactory.java |  35 ++++++
 src/main/java/io/ebean/ExpressionList.java    |  35 ++++++
 .../expression/DefaultExpressionFactory.java  |  10 ++
 .../expression/DefaultExpressionList.java     |   6 +
 .../server/expression/InExpression.java       |  48 +++++--
 .../server/expression/JunctionExpression.java |   5 +
 .../server/expression/InExpressionTest.java   |  28 ++++-
 .../java/org/tests/query/TestWhereIn.java     | 118 +++++++++++++++++-
 9 files changed, 301 insertions(+), 21 deletions(-)

diff --git a/src/main/java/io/ebean/Expr.java b/src/main/java/io/ebean/Expr.java
index 3b6ec35b4..62ffee527 100644
--- a/src/main/java/io/ebean/Expr.java
+++ b/src/main/java/io/ebean/Expr.java
@@ -250,6 +250,43 @@ public class Expr {
     return Ebean.getExpressionFactory().in(propertyName, values);
   }
 
+  /**
+   * In where null or empty values means that no predicate is added to the query.
+   * <p>
+   * That is, only add the IN predicate if the values are not null or empty.
+   * <p>
+   * Without this we typically need to code an <code>if</code> block to only add
+   * the IN predicate if the collection is not empty like:
+   * </p>
+   *
+   * <h3>Without inOrEmpty()</h3>
+   * <pre>{@code
+   *
+   *   query.where() // add some predicates
+   *     .eq("status", Status.NEW);
+   *
+   *   if (ids != null && !ids.isEmpty()) {
+   *     query.where().in("customer.id", ids);
+   *   }
+   *
+   *   query.findList();
+   *
+   * }</pre>
+   *
+   * <h3>Using inOrEmpty()</h3>
+   * <pre>{@code
+   *
+   *   query.where()
+   *     .eq("status", Status.NEW)
+   *     .inOrEmpty("customer.id", ids)
+   *     .findList();
+   *
+   * }</pre>
+   */
+  public static Expression inOrEmpty(String propertyName, Collection<?> values) {
+    return Ebean.getExpressionFactory().inOrEmpty(propertyName, values);
+  }
+
   /**
    * Id Equal to - ID property is equal to the value.
    */
diff --git a/src/main/java/io/ebean/ExpressionFactory.java b/src/main/java/io/ebean/ExpressionFactory.java
index c37ef6e78..0ea9071e4 100644
--- a/src/main/java/io/ebean/ExpressionFactory.java
+++ b/src/main/java/io/ebean/ExpressionFactory.java
@@ -325,6 +325,41 @@ public interface ExpressionFactory {
    */
   Expression in(String propertyName, Collection<?> values);
 
+  /**
+   * In where null or empty values means that no predicate is added to the query.
+   * <p>
+   * That is, only add the IN predicate if the values are not null or empty.
+   * <p>
+   * Without this we typically need to code an <code>if</code> block to only add
+   * the IN predicate if the collection is not empty like:
+   * </p>
+   *
+   * <h3>Without inOrEmpty()</h3>
+   * <pre>{@code
+   *
+   *   query.where() // add some predicates
+   *     .eq("status", Status.NEW);
+   *
+   *   if (ids != null && !ids.isEmpty()) {
+   *     query.where().in("customer.id", ids);
+   *   }
+   *
+   *   query.findList();
+   *
+   * }</pre>
+   *
+   * <h3>Using inOrEmpty()</h3>
+   * <pre>{@code
+   *
+   *   query.where()
+   *     .eq("status", Status.NEW)
+   *     .inOrEmpty("customer.id", ids)
+   *     .findList();
+   *
+   * }</pre>
+   */
+  Expression inOrEmpty(String propertyName, Collection<?> values);
+
   /**
    * Not In - property has a value in the array of values.
    */
diff --git a/src/main/java/io/ebean/ExpressionList.java b/src/main/java/io/ebean/ExpressionList.java
index 94d6b3f1d..8f5cc16fb 100644
--- a/src/main/java/io/ebean/ExpressionList.java
+++ b/src/main/java/io/ebean/ExpressionList.java
@@ -1003,6 +1003,41 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> in(String propertyName, Collection<?> values);
 
+  /**
+   * In where null or empty values means that no predicate is added to the query.
+   * <p>
+   * That is, only add the IN predicate if the values are not null or empty.
+   * <p>
+   * Without this we typically need to code an <code>if</code> block to only add
+   * the IN predicate if the collection is not empty like:
+   * </p>
+   *
+   * <h3>Without inOrEmpty()</h3>
+   * <pre>{@code
+   *
+   *   query.where() // add some predicates
+   *     .eq("status", Status.NEW);
+   *
+   *   if (ids != null && !ids.isEmpty()) {
+   *     query.where().in("customer.id", ids);
+   *   }
+   *
+   *   query.findList();
+   *
+   * }</pre>
+   *
+   * <h3>Using inOrEmpty()</h3>
+   * <pre>{@code
+   *
+   *   query.where()
+   *     .eq("status", Status.NEW)
+   *     .inOrEmpty("customer.id", ids)
+   *     .findList();
+   *
+   * }</pre>
+   */
+  ExpressionList<T> inOrEmpty(String propertyName, Collection<?> values);
+
   /**
    * In - using a subQuery.
    * <p>
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
index 968cc881e..e568c2cbd 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
@@ -455,6 +455,16 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
     return new InExpression(propertyName, values, false);
   }
 
+  /**
+   * In where null or empty values means that no predicate is added to the query.
+   * <p>
+   * That is, only add the IN predicate if the values are not null or empty.
+   */
+  @Override
+  public Expression inOrEmpty(String propertyName, Collection<?> values) {
+    return new InExpression(propertyName, values, false, true);
+  }
+
   /**
    * In - property has a value in the array of values.
    */
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 1c57f28ab..1372a06d2 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -912,6 +912,12 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return this;
   }
 
+  @Override
+  public ExpressionList<T> inOrEmpty(String propertyName, Collection<?> values) {
+    add(expr.inOrEmpty(propertyName, values));
+    return this;
+  }
+
   @Override
   public ExpressionList<T> in(String propertyName, Object... values) {
     add(expr.in(propertyName, values));
diff --git a/src/main/java/io/ebeaninternal/server/expression/InExpression.java b/src/main/java/io/ebeaninternal/server/expression/InExpression.java
index ca0ba1730..656b32fe8 100644
--- a/src/main/java/io/ebeaninternal/server/expression/InExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/InExpression.java
@@ -17,8 +17,16 @@ import java.util.List;
 
 class InExpression extends AbstractExpression {
 
+  private static final String SQL_TRUE = "1=1";
+  private static final String SQL_FALSE = "1=0";
+
   private final boolean not;
 
+  /**
+   * Set to true when adding "1=1" predicate (due to null or empty sourceValues).
+   */
+  private final boolean empty;
+
   private final Collection<?> sourceValues;
 
   private List<Object> bindValues;
@@ -26,18 +34,27 @@ class InExpression extends AbstractExpression {
   private boolean multiValueSupported;
 
   InExpression(String propertyName, Collection<?> sourceValues, boolean not) {
+    this(propertyName, sourceValues, not, false);
+  }
+
+  InExpression(String propertyName, Collection<?> sourceValues, boolean not, boolean orEmpty) {
     super(propertyName);
     this.sourceValues = sourceValues;
     this.not = not;
+    this.empty = orEmpty && (sourceValues == null || sourceValues.isEmpty());
   }
 
   InExpression(String propertyName, Object[] array, boolean not) {
     super(propertyName);
     this.sourceValues = Arrays.asList(array);
     this.not = not;
+    this.empty = false;
   }
 
   private List<Object> values() {
+    if (empty || sourceValues == null) {
+      return Collections.emptyList();
+    }
     List<Object> vals = new ArrayList<>(sourceValues.size());
     for (Object sourceValue : sourceValues) {
       assert sourceValue != null : "null is not allowed in in-queries";
@@ -48,8 +65,8 @@ class InExpression extends AbstractExpression {
 
   @Override
   public boolean naturalKey(NaturalKeyQueryData<?> data) {
-    // can't use naturalKey cache for NOT IN
-    if (not) {
+    // can't use naturalKey cache for NOT IN or when "empty"
+    if (not || empty) {
       return false;
     }
     List<Object> copy = data.matchIn(propName, bindValues);
@@ -70,11 +87,16 @@ class InExpression extends AbstractExpression {
 
   @Override
   public void writeDocQuery(DocQueryContext context) throws IOException {
-    context.writeIn(propName, values().toArray(), not);
+    if (!empty) {
+      context.writeIn(propName, values().toArray(), not);
+    }
   }
 
   @Override
   public void addBindValues(SpiExpressionRequest request) {
+    if (empty) {
+      return;
+    }
     for (Object value : bindValues) {
       if (value == null) {
         throw new NullPointerException("null values in 'in(...)' queries must be handled separately!");
@@ -108,10 +130,12 @@ class InExpression extends AbstractExpression {
 
   @Override
   public void addSql(SpiExpressionRequest request) {
-
+    if (empty) {
+      request.append(SQL_TRUE);
+      return;
+    }
     if (bindValues.isEmpty()) {
-      String expr = not ? "1=1" : "1=0";
-      request.append(expr);
+      request.append(not ? SQL_TRUE : SQL_FALSE);
       return;
     }
 
@@ -142,10 +166,14 @@ class InExpression extends AbstractExpression {
       builder.append("In[");
     }
     builder.append(propName);
-    builder.append(" ?");
-    if (!multiValueSupported) {
-      // query plan specific to the number of parameters in the IN clause
-      builder.append(bindValues.size());
+    if (empty) {
+      builder.append("empty");
+    } else {
+      builder.append(" ?");
+      if (!multiValueSupported) {
+        // query plan specific to the number of parameters in the IN clause
+        builder.append(bindValues.size());
+      }
     }
     builder.append("]");
   }
diff --git a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index 59d00dfe7..ee920b048 100644
--- a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -672,6 +672,11 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.in(propertyName, values);
   }
 
+  @Override
+  public ExpressionList<T> inOrEmpty(String propertyName, Collection<?> values) {
+    return exprList.inOrEmpty(propertyName, values);
+  }
+
   @Override
   public ExpressionList<T> in(String propertyName, Object... values) {
     return exprList.in(propertyName, values);
diff --git a/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java
index cd49f4a34..4b238562d 100644
--- a/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java
+++ b/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java
@@ -11,7 +11,25 @@ import static org.assertj.core.api.StrictAssertions.assertThat;
 public class InExpressionTest extends BaseExpressionTest {
 
   @Test
-  public void queryPlanHash_given_diffPropertyName_should_differentPlanHash() throws Exception {
+  public void queryPlanHash_given_diffEmpty_should_differentPlanHash() {
+
+    List<Integer> emptyValues = values();
+
+    InExpression ex1 = new InExpression("foo", emptyValues, false, true);
+    InExpression ex2 = new InExpression("foo", emptyValues, false);
+    InExpression ex3 = new InExpression("foo", emptyValues, false, true);
+    InExpression ex4 = new InExpression("foo", null, false, true);
+
+    ex1.prepareExpression(multi());
+    ex2.prepareExpression(multi());
+
+    different(ex1, ex2);
+    same(ex1, ex3); // same empty
+    same(ex1, ex4); // same null
+  }
+
+  @Test
+  public void queryPlanHash_given_diffPropertyName_should_differentPlanHash() {
 
     List<Integer> values = values(42, 92);
 
@@ -25,7 +43,7 @@ public class InExpressionTest extends BaseExpressionTest {
   }
 
   @Test
-  public void queryPlanHash_given_diffBindCount_should_differentPlanHash() throws Exception {
+  public void queryPlanHash_given_diffBindCount_should_differentPlanHash() {
 
     List<Integer> values1 = values(42, 92);
     List<Integer> values2 = values(42, 92, 82);
@@ -39,7 +57,7 @@ public class InExpressionTest extends BaseExpressionTest {
   }
 
   @Test
-  public void queryPlanHash_given_diffBindCount_withMultiSupport_samePlanHash() throws Exception {
+  public void queryPlanHash_given_diffBindCount_withMultiSupport_samePlanHash() {
 
     List<Integer> values1 = values(42, 92);
     List<Integer> values2 = values(42, 92, 82);
@@ -53,7 +71,7 @@ public class InExpressionTest extends BaseExpressionTest {
   }
 
   @Test
-  public void queryPlanHash_given_diffNotFlag_should_differentPlanHash() throws Exception {
+  public void queryPlanHash_given_diffNotFlag_should_differentPlanHash() {
 
     List<Integer> values = values(42, 92);
 
@@ -67,7 +85,7 @@ public class InExpressionTest extends BaseExpressionTest {
   }
 
   @Test
-  public void queryPlanHash_given_sameNotFlag_should_samePlanHash() throws Exception {
+  public void queryPlanHash_given_sameNotFlag_should_samePlanHash() {
 
     List<Integer> values = values(42, 92);
 
diff --git a/src/test/java/org/tests/query/TestWhereIn.java b/src/test/java/org/tests/query/TestWhereIn.java
index 4be3ecb91..c173bbc30 100644
--- a/src/test/java/org/tests/query/TestWhereIn.java
+++ b/src/test/java/org/tests/query/TestWhereIn.java
@@ -1,12 +1,19 @@
 package org.tests.query;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.Query;
 import org.junit.Test;
 import org.tests.model.basic.Country;
+import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
 
 public class TestWhereIn extends BaseTestCase {
 
@@ -15,25 +22,124 @@ public class TestWhereIn extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Query<Country> query = Ebean.find(Country.class)
+    Query<Country> query = DB.find(Country.class)
       .where().in("code", "NZ", "AU")
       .query();
 
     query.findList();
-    platformAssertIn(sqlOf(query), "");
+    platformAssertIn(sqlOf(query), "where t0.code");
   }
 
-
   @Test
   public void testNotInVarchar() {
 
     ResetBasicData.reset();
 
-    Query<Country> query = Ebean.find(Country.class)
+    Query<Country> query = DB.find(Country.class)
       .where().notIn("code", "NZ", "SA", "US")
       .query();
 
     query.findList();
-    platformAssertNotIn(sqlOf(query), "");
+    platformAssertNotIn(sqlOf(query), "where t0.code");
+  }
+
+  @Test
+  public void testInOrEmpty_expect_noJoinWhenEmpty() {
+
+    ResetBasicData.reset();
+
+    Query<Order> query = DB.find(Order.class)
+      .select("id")
+      .where().inOrEmpty("customer.billingAddress.id", new ArrayList<>()).query();
+
+    query.findList();
+    assertThat(sqlOf(query)).isEqualTo("select t0.id from o_order t0 where 1=1");
+  }
+
+  @Test
+  public void testInOrEmpty_expect_joinWhenNotEmpty() {
+
+    ResetBasicData.reset();
+
+    Query<Order> query = DB.find(Order.class)
+      .select("id")
+      .where().inOrEmpty("customer.billingAddress.id", Arrays.asList(1)).query();
+
+    query.findList();
+    assertThat(sqlOf(query)).contains("select t0.id from o_order t0 join o_customer t1 on t1.id = t0.kcustomer_id  where t1.billing_address_id ");
+  }
+
+
+  @Test
+  public void testInOrEmpty_when_null() {
+
+    ResetBasicData.reset();
+
+    Query<Country> query = DB.find(Country.class)
+      .where().inOrEmpty("code", null).query();
+
+    query.findList();
+    assertThat(sqlOf(query)).contains("where 1=1");
+  }
+
+
+  @Test
+  public void testInOrEmpty_when_empty() {
+
+    ResetBasicData.reset();
+
+    Query<Country> query = DB.find(Country.class)
+      .where().inOrEmpty("code", new ArrayList<>()).query();
+
+    query.findList();
+    assertThat(sqlOf(query)).contains("where 1=1");
+  }
+
+  @Test
+  public void testIn_when_empty() {
+
+    ResetBasicData.reset();
+
+    Query<Country> query = DB.find(Country.class)
+      .where().in("code", new ArrayList<>()).query();
+
+    query.findList();
+    assertThat(sqlOf(query)).contains("where 1=0");
+  }
+
+  @Test
+  public void testIn_when_null() {
+
+    ResetBasicData.reset();
+
+    Query<Country> query = DB.find(Country.class)
+      .where().in("code", (Collection)null).query();
+
+    query.findList();
+    assertThat(sqlOf(query)).contains("where 1=0");
+  }
+
+  @Test
+  public void testNotIn_when_empty() {
+
+    ResetBasicData.reset();
+
+    Query<Country> query = DB.find(Country.class)
+      .where().notIn("code", new ArrayList<>()).query();
+
+    query.findList();
+    assertThat(sqlOf(query)).contains("where 1=1");
+  }
+
+  @Test
+  public void testNotIn_when_null() {
+
+    ResetBasicData.reset();
+
+    Query<Country> query = DB.find(Country.class)
+      .where().notIn("code", (Collection)null).query();
+
+    query.findList();
+    assertThat(sqlOf(query)).contains("where 1=1");
   }
 }

From 86d02161595b6ac6a1d5ef28ceea40af5cd91c2b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 4 Mar 2019 12:42:08 +1300
Subject: [PATCH 0744/1036] #1644 - ENH: Improve batch flush when multiple "top
 level" (unrelated) types are persisted

---
 .../server/persist/BatchControl.java          |  8 +--
 .../transaction/TestBatchModelFlush.java      | 64 +++++++++++++++++++
 2 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchControl.java b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
index 4a3cafa8b..0b6fd3a66 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
@@ -69,6 +69,7 @@ public final class BatchControl {
    * Size of the largest buffer.
    */
   private int bufferMax;
+  private int topCounter;
 
   private Queue earlyQueue;
   private Queue lateQueue;
@@ -246,6 +247,7 @@ public final class BatchControl {
     pstmtHolder.clear();
     beanHoldMap.clear();
     maxDepth = 0;
+    topCounter = 0;
   }
 
   private void flushBuffer(boolean resetTop) throws BatchedSqlException {
@@ -319,10 +321,8 @@ public final class BatchControl {
         if (maybe != -1) {
           beanDepth = maybe;
         } else {
-          // we can't be certain of the relative ordering for this type so
-          // flush and reset the batch as we are changing the type of our top level
-          // bean so just keep it simple and flush and reset the top
-          flushReset();
+          // additional "top level" bean type ordered by save() order
+          beanDepth += ++topCounter;
         }
       }
 
diff --git a/src/test/java/org/tests/transaction/TestBatchModelFlush.java b/src/test/java/org/tests/transaction/TestBatchModelFlush.java
index c176392a1..a8195ec96 100644
--- a/src/test/java/org/tests/transaction/TestBatchModelFlush.java
+++ b/src/test/java/org/tests/transaction/TestBatchModelFlush.java
@@ -1,10 +1,19 @@
 package org.tests.transaction;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
+import io.ebean.Transaction;
 import io.ebean.annotation.Transactional;
+import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.model.m2m.MnyB;
+import org.tests.model.m2m.MnyTopic;
+import org.tests.model.m2m.Role;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestBatchModelFlush extends BaseTestCase {
 
@@ -30,4 +39,59 @@ public class TestBatchModelFlush extends BaseTestCase {
     // the rest is flushed on commit
     new MnyB("TestBatchModelFlush_5").save();
   }
+
+  @Test
+  public void multipleTopLevel_expect_singleFlush() {
+
+    LoggedSqlCollector.start();
+
+    // 2 unrelated "top level" beans being persisted
+    MnyB m0 = new MnyB("BatchMultipleTop_0");
+    MnyB m1 = new MnyB("BatchMultipleTop_1");
+    Role r0 = new Role("Role_0");
+    Role r1 = new Role("Role_1");
+
+    MnyTopic t0 = new MnyTopic("MnyTopic_0");
+    MnyTopic t1 = new MnyTopic("MnyTopic_1");
+
+    try (Transaction transaction = DB.beginTransaction()) {
+      transaction.setBatchMode(true);
+
+      m0.save();
+      DB.save(r0);
+      DB.save(t0);
+      DB.save(t1);
+
+      m1.save();
+      DB.save(r1);
+
+      transaction.commit();
+    }
+
+    List<String> sql = LoggedSqlCollector.stop();
+
+    // DEBUG io.ebean.SUM - txn[1001] BatchControl flush [MnyB:100 i:2, Role:101 i:2, MnyTopic:102 i:2]
+
+    assertThat(sql).hasSize(9);
+
+    // first saved to batch - (depth 100)
+    assertThat(sql.get(0)).contains("insert into mny_b");
+    assertThat(sql.get(1)).contains(" -- bind(BatchMultipleTop_0");
+    assertThat(sql.get(2)).contains(" -- bind(BatchMultipleTop_1");
+    // second saved to batch - (depth 101)
+    assertThat(sql.get(3)).contains("insert into mt_role");
+    assertThat(sql.get(4)).contains(" -- bind(");
+    assertThat(sql.get(5)).contains(" -- bind(");
+    // third saved to batch - (depth 102)
+    assertThat(sql.get(6)).contains("insert into mny_topic");
+    assertThat(sql.get(7)).contains(" -- bind(MnyTopic_0");
+    assertThat(sql.get(8)).contains(" -- bind(MnyTopic_1");
+
+    DB.delete(t0);
+    DB.delete(t1);
+    DB.delete(r0);
+    DB.delete(r1);
+    DB.delete(m0);
+    DB.delete(m1);
+  }
 }

From e195f20981e100211e7250563ea08d47c19aed73 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 5 Mar 2019 22:13:38 +1300
Subject: [PATCH 0745/1036] #1645 - ENH: Add expression rawOrEmpty() ... as a
 convenience for conditionally added a raw expression

---
 src/main/java/io/ebean/ExpressionList.java    | 62 +++++++++++++++
 .../expression/DefaultExpressionList.java     | 16 +++-
 .../server/expression/JunctionExpression.java |  5 ++
 .../java/org/tests/query/TestWhereIn.java     |  7 +-
 .../org/tests/query/TestWhereRawClause.java   | 77 +++++++++++++++++++
 5 files changed, 162 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/ebean/ExpressionList.java b/src/main/java/io/ebean/ExpressionList.java
index 8f5cc16fb..d669e91b5 100644
--- a/src/main/java/io/ebean/ExpressionList.java
+++ b/src/main/java/io/ebean/ExpressionList.java
@@ -1282,6 +1282,68 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> raw(String raw);
 
+  /**
+   * Only add the raw expression if the values is not null or empty.
+   * <p>
+   * This is a pure convenience expression to make it nicer to deal with the pattern where we use
+   * raw() expression with a subquery and only want to add the subquery predicate when the collection
+   * of values is not empty.
+   * </p>
+   * <h3>Without inOrEmpty()</h3>
+   * <pre>{@code
+   *
+   *   query.where() // add some predicates
+   *     .eq("status", Status.NEW);
+   *
+   *   // common pattern - we can use rawOrEmpty() instead
+   *   if (orderIds != null && !orderIds.isEmpty()) {
+   *     query.where().raw("t0.customer_id in (select o.customer_id from orders o where o.id in (?1))", orderIds);
+   *   }
+   *
+   *   query.findList();
+   *
+   * }</pre>
+   *
+   * <h3>Using rawOrEmpty()</h3>
+   * Note that in the example below we use the <code>?1</code> bind parameter to get  "parameter expansion"
+   * for each element in the collection.
+   *
+   * <pre>{@code
+   *
+   *   query.where()
+   *     .eq("status", Status.NEW)
+   *     // only add the expression if orderIds is not empty
+   *     .rawOrEmpty("t0.customer_id in (select o.customer_id from orders o where o.id in (?1))", orderIds);
+   *     .findList();
+   *
+   * }</pre>
+   *
+   * <h3>Postgres ANY</h3>
+   * With Postgres we would often use the SQL <code>ANY</code> expression and array parameter binding
+   * rather than <code>IN</code>.
+   *
+   * <pre>{@code
+   *
+   *   query.where()
+   *     .eq("status", Status.NEW)
+   *     .rawOrEmpty("t0.customer_id in (select o.customer_id from orders o where o.id = any(?))", orderIds);
+   *     .findList();
+   *
+   * }</pre>
+   * <p>
+   *   Note that we need to cast the Postgres array for UUID types like:
+   * </p>
+   * <pre>{@code
+   *
+   *   " ... = any(?::uuid[])"
+   *
+   * }</pre>
+   *
+   * @param raw The raw expression that is typically a subquery
+   * @param values The values which is typically a list or set of id values.
+   */
+  ExpressionList<T> rawOrEmpty(String raw, Collection<Object> values);
+
   /**
    * Add a match expression.
    *
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 1372a06d2..71600f840 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -914,7 +914,9 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
 
   @Override
   public ExpressionList<T> inOrEmpty(String propertyName, Collection<?> values) {
-    add(expr.inOrEmpty(propertyName, values));
+    if (notEmpty(values)) {
+      add(expr.in(propertyName, values));
+    }
     return this;
   }
 
@@ -1074,6 +1076,18 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return this;
   }
 
+  @Override
+  public ExpressionList<T> rawOrEmpty(String raw, Collection<Object> values) {
+    if (notEmpty(values)) {
+      add(expr.raw(raw, values));
+    }
+    return this;
+  }
+
+  private boolean notEmpty(Collection<?> values) {
+    return values != null && !values.isEmpty();
+  }
+
   @Override
   public ExpressionList<T> startsWith(String propertyName, String value) {
     add(expr.startsWith(propertyName, value));
diff --git a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index ee920b048..010550a3b 100644
--- a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -807,6 +807,11 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.raw(raw, values);
   }
 
+  @Override
+  public ExpressionList<T> rawOrEmpty(String raw, Collection<Object> values) {
+    return exprList.rawOrEmpty(raw, values);
+  }
+
   @Override
   public ExpressionList<T> raw(String raw) {
     return exprList.raw(raw);
diff --git a/src/test/java/org/tests/query/TestWhereIn.java b/src/test/java/org/tests/query/TestWhereIn.java
index c173bbc30..6fd900d68 100644
--- a/src/test/java/org/tests/query/TestWhereIn.java
+++ b/src/test/java/org/tests/query/TestWhereIn.java
@@ -53,7 +53,7 @@ public class TestWhereIn extends BaseTestCase {
       .where().inOrEmpty("customer.billingAddress.id", new ArrayList<>()).query();
 
     query.findList();
-    assertThat(sqlOf(query)).isEqualTo("select t0.id from o_order t0 where 1=1");
+    assertThat(sqlOf(query)).isEqualTo("select t0.id from o_order t0");
   }
 
   @Test
@@ -79,10 +79,9 @@ public class TestWhereIn extends BaseTestCase {
       .where().inOrEmpty("code", null).query();
 
     query.findList();
-    assertThat(sqlOf(query)).contains("where 1=1");
+    assertThat(sqlOf(query)).isEqualTo("select t0.code, t0.name from o_country t0");
   }
 
-
   @Test
   public void testInOrEmpty_when_empty() {
 
@@ -92,7 +91,7 @@ public class TestWhereIn extends BaseTestCase {
       .where().inOrEmpty("code", new ArrayList<>()).query();
 
     query.findList();
-    assertThat(sqlOf(query)).contains("where 1=1");
+    assertThat(sqlOf(query)).isEqualTo("select t0.code, t0.name from o_country t0");
   }
 
   @Test
diff --git a/src/test/java/org/tests/query/TestWhereRawClause.java b/src/test/java/org/tests/query/TestWhereRawClause.java
index a84ffdfd6..58b7d9b59 100644
--- a/src/test/java/org/tests/query/TestWhereRawClause.java
+++ b/src/test/java/org/tests/query/TestWhereRawClause.java
@@ -6,6 +6,7 @@ import io.ebean.Expr;
 import io.ebean.Query;
 import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
+import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
@@ -13,6 +14,7 @@ import org.tests.model.basic.OrderDetail;
 import org.tests.model.basic.ResetBasicData;
 
 import java.sql.Timestamp;
+import java.util.Collections;
 import java.util.List;
 
 import static java.util.Arrays.asList;
@@ -65,6 +67,54 @@ public class TestWhereRawClause extends BaseTestCase {
     assertThat(sqlOf(query)).contains(" t0.id in (select c.id from o_customer c where c.name in (?,?,?))");
   }
 
+  @Test
+  public void testRawOrEmpty_when_notEmpty() {
+
+    ResetBasicData.reset();
+
+    Query<Customer> query = Ebean.find(Customer.class)
+      .select("name")
+      .where()
+      .rawOrEmpty("id in (select c.id from o_customer c where c.name in (?1))", asList("Rob", "Fiona", "Jack"))
+      .query();
+
+    List<Customer> list = query.findList();
+    assertThat(list).isNotEmpty();
+    assertThat(sqlOf(query)).contains(" t0.id in (select c.id from o_customer c where c.name in (?,?,?))");
+  }
+
+  @Test
+  public void testRawOrEmpty_when_null() {
+
+    ResetBasicData.reset();
+
+    Query<Customer> query = Ebean.find(Customer.class)
+      .select("name")
+      .where()
+      .rawOrEmpty("id in (select c.id from o_customer c where c.name in (?1))", null)
+      .query();
+
+    List<Customer> list = query.findList();
+    assertThat(list).isNotEmpty();
+    assertThat(sqlOf(query)).isEqualTo("select t0.id, t0.name from o_customer t0");
+  }
+
+  @Test
+  public void testRawOrEmpty_when_empty() {
+
+    ResetBasicData.reset();
+
+    Query<Customer> query = Ebean.find(Customer.class)
+      .select("name")
+      .where()
+      .rawOrEmpty("id in (select c.id from o_customer c where c.name in (?1))", Collections.emptySet())
+      .query();
+
+    List<Customer> list = query.findList();
+    assertThat(list).isNotEmpty();
+    assertThat(sqlOf(query)).isEqualTo("select t0.id, t0.name from o_customer t0");
+  }
+
   @Test
   public void testRaw_bindExpansion() {
 
@@ -94,6 +144,33 @@ public class TestWhereRawClause extends BaseTestCase {
     assertThat(list).isNotEmpty();
   }
 
+  @Test
+  @ForPlatform(Platform.POSTGRES)
+  public void testRawOrEmpty_PostgresArray() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    Ebean.find(Customer.class)
+      .select("name").where().rawOrEmpty("name = any(?)", asList("Rob", "Fiona", "Jack"))
+      .findList();
+
+    Ebean.find(Customer.class)
+      .select("name").where().rawOrEmpty("name = any(?)", asList())
+      .findList();
+
+    Ebean.find(Customer.class)
+      .select("name").where().rawOrEmpty("name = any(?)", null)
+      .findList();
+
+    List<String> sql = LoggedSqlCollector.stop();
+
+    assertThat(sql.get(0)).isEqualTo("select t0.id, t0.name from o_customer t0 where t0.name = any(?); --bind(Array[3]={Rob,Fiona,Jack})");
+    assertThat(sql.get(1)).isEqualTo("select t0.id, t0.name from o_customer t0; --bind()");
+    assertThat(sql.get(2)).isEqualTo("select t0.id, t0.name from o_customer t0; --bind()");
+  }
+
   @Test
   public void testRawWithBindParams() {
 

From 923828ce87d7fb308b45c9aff0e7e82888e51dae Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 5 Mar 2019 22:26:19 +1300
Subject: [PATCH 0746/1036] [maven-release-plugin] prepare release
 ebean-11.35.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7975f64ce..75ef96728 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.35.2-SNAPSHOT</version>
+  <version>11.35.2</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.35.2</tag>
   </scm>
 
   <profiles>

From 7e8424328f8794087ad5041fbae1014e5b8fe89d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 5 Mar 2019 22:26:35 +1300
Subject: [PATCH 0747/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 75ef96728..1cd9ed147 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.35.2</version>
+  <version>11.35.3-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.35.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 27f86548a6ef2be1f31fb0da155f0025eedfec63 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 5 Mar 2019 23:03:22 +1300
Subject: [PATCH 0748/1036] #1645 - ENH: Add expression rawOrEmpty() ... as a
 convenience for conditionally added a raw expression

---
 src/main/java/io/ebean/ExpressionList.java                  | 2 +-
 .../server/expression/DefaultExpressionList.java            | 2 +-
 .../ebeaninternal/server/expression/JunctionExpression.java | 2 +-
 src/test/java/org/tests/basic/type/TestSqlRowUUID.java      | 6 ++++++
 src/test/java/org/tests/query/TestWhereRawClause.java       | 4 +++-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/ebean/ExpressionList.java b/src/main/java/io/ebean/ExpressionList.java
index d669e91b5..8f727756a 100644
--- a/src/main/java/io/ebean/ExpressionList.java
+++ b/src/main/java/io/ebean/ExpressionList.java
@@ -1342,7 +1342,7 @@ public interface ExpressionList<T> {
    * @param raw The raw expression that is typically a subquery
    * @param values The values which is typically a list or set of id values.
    */
-  ExpressionList<T> rawOrEmpty(String raw, Collection<Object> values);
+  ExpressionList<T> rawOrEmpty(String raw, Collection<?> values);
 
   /**
    * Add a match expression.
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 71600f840..e757214bb 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -1077,7 +1077,7 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
   }
 
   @Override
-  public ExpressionList<T> rawOrEmpty(String raw, Collection<Object> values) {
+  public ExpressionList<T> rawOrEmpty(String raw, Collection<?> values) {
     if (notEmpty(values)) {
       add(expr.raw(raw, values));
     }
diff --git a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index 010550a3b..c71f82647 100644
--- a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -808,7 +808,7 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
   }
 
   @Override
-  public ExpressionList<T> rawOrEmpty(String raw, Collection<Object> values) {
+  public ExpressionList<T> rawOrEmpty(String raw, Collection<?> values) {
     return exprList.rawOrEmpty(raw, values);
   }
 
diff --git a/src/test/java/org/tests/basic/type/TestSqlRowUUID.java b/src/test/java/org/tests/basic/type/TestSqlRowUUID.java
index 1997af5d2..e6b833002 100644
--- a/src/test/java/org/tests/basic/type/TestSqlRowUUID.java
+++ b/src/test/java/org/tests/basic/type/TestSqlRowUUID.java
@@ -57,5 +57,11 @@ public class TestSqlRowUUID extends BaseTestCase {
       .findList();
 
     assertThat(result).hasSize(1);
+
+    List<TUuidEntity> list = Ebean.find(TUuidEntity.class)
+      .where().rawOrEmpty("id = any(?::uuid[])", ids)
+      .findList();
+
+    assertThat(list).hasSize(1);
   }
 }
diff --git a/src/test/java/org/tests/query/TestWhereRawClause.java b/src/test/java/org/tests/query/TestWhereRawClause.java
index 58b7d9b59..ab7958bd6 100644
--- a/src/test/java/org/tests/query/TestWhereRawClause.java
+++ b/src/test/java/org/tests/query/TestWhereRawClause.java
@@ -72,10 +72,12 @@ public class TestWhereRawClause extends BaseTestCase {
 
     ResetBasicData.reset();
 
+    List<String> vals = asList("Rob", "Fiona", "Jack");
+
     Query<Customer> query = Ebean.find(Customer.class)
       .select("name")
       .where()
-      .rawOrEmpty("id in (select c.id from o_customer c where c.name in (?1))", asList("Rob", "Fiona", "Jack"))
+      .rawOrEmpty("id in (select c.id from o_customer c where c.name in (?1))", vals)
       .query();
 
     List<Customer> list = query.findList();

From 82247fd4e4b96d7c2b91d028be7586d0d1b6d6b6 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 5 Mar 2019 23:06:14 +1300
Subject: [PATCH 0749/1036] [maven-release-plugin] prepare release
 ebean-11.35.3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1cd9ed147..10654fc91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.35.3-SNAPSHOT</version>
+  <version>11.35.3</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.35.3</tag>
   </scm>
 
   <profiles>

From 043c523c2a3e999375b6b4884b19031db2476fef Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 5 Mar 2019 23:06:29 +1300
Subject: [PATCH 0750/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 10654fc91..6f0e7d3d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.35.3</version>
+  <version>11.35.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.35.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 933c791d33fb3480aa634b183b33f663d61b394d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 6 Mar 2019 23:13:24 +1300
Subject: [PATCH 0751/1036] No effective change - Finder javadoc to use
 "Database"

---
 src/main/java/io/ebean/Finder.java | 37 +++++++++++++++++-------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/main/java/io/ebean/Finder.java b/src/main/java/io/ebean/Finder.java
index 42d5b3910..7f944753d 100644
--- a/src/main/java/io/ebean/Finder.java
+++ b/src/main/java/io/ebean/Finder.java
@@ -13,8 +13,7 @@ import java.util.List;
  * </p>
  * <h3>Testing</h3>
  * <p>
- * For testing the mocki-ebean project has the ability to replace the finder implementation
- * <p>
+ * For testing the mocki-ebean project has the ability to replace the finder implementation.
  * </p>
  * <pre>{@code
  *
@@ -24,7 +23,7 @@ import java.util.List;
  *     super(Customer.class);
  *   }
  *
- *   // Add your customer finder methods ...
+ *   // Add finder methods ...
  *
  *   public Customer byName(String name) {
  *     return query().eq("name", name).findOne();
@@ -45,6 +44,15 @@ import java.util.List;
  *   ...
  *
  * }</pre>
+ * <p>
+ *  When the Finder is registered as a field on Customer it can then be used like:
+ * </p>
+ * <pre>{@code
+ *
+ *   Customer rob = Customer.find.byName("Rob");
+ *
+ * }</pre>
+ *
  */
 public class Finder<I, T> {
 
@@ -54,9 +62,9 @@ public class Finder<I, T> {
   private final Class<T> type;
 
   /**
-   * The name of the EbeanServer, null for the default server.
+   * The name of the database this finder will use, null for the default database.
    */
-  private final String serverName;
+  private final String _$dbName;
 
   /**
    * Create with the type of the entity bean.
@@ -81,15 +89,15 @@ public class Finder<I, T> {
    */
   public Finder(Class<T> type) {
     this.type = type;
-    this.serverName = null;
+    this._$dbName = null;
   }
 
   /**
    * Create with the type of the entity bean and specific server name.
    */
-  public Finder(Class<T> type, String serverName) {
+  public Finder(Class<T> type, String databaseName) {
     this.type = type;
-    this.serverName = serverName;
+    this._$dbName = databaseName;
   }
 
   /**
@@ -107,12 +115,10 @@ public class Finder<I, T> {
   }
 
   /**
-   * Return the underlying 'default' EbeanServer.
-   * <p>
-   * This provides full access to the API such as explicit transaction demarcation etc.
+   * Return the Database this finder will use.
    */
   public Database db() {
-    return DB.byName(serverName);
+    return DB.byName(_$dbName);
   }
 
   /**
@@ -120,11 +126,10 @@ public class Finder<I, T> {
    * <p>
    * This is equivalent to {@link DB#byName(String)}
    *
-   * @param server The name of the Database. If this is null then the default EbeanServer is
-   *               returned.
+   * @param databaseName The name of the Database. If this is null then the default database is returned.
    */
-  public Database db(String server) {
-    return DB.byName(server);
+  public Database db(String databaseName) {
+    return DB.byName(databaseName);
   }
 
   /**

From e7e6e004730090582e4d3f47252fa110e48b7858 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 7 Mar 2019 09:08:34 +1300
Subject: [PATCH 0752/1036] No effective change - Finder javadoc to use
 "Database"

---
 src/main/java/io/ebean/Finder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/ebean/Finder.java b/src/main/java/io/ebean/Finder.java
index 7f944753d..fbe4e5668 100644
--- a/src/main/java/io/ebean/Finder.java
+++ b/src/main/java/io/ebean/Finder.java
@@ -93,7 +93,7 @@ public class Finder<I, T> {
   }
 
   /**
-   * Create with the type of the entity bean and specific server name.
+   * Create with the type of the entity bean and specific database name.
    */
   public Finder(Class<T> type, String databaseName) {
     this.type = type;

From 197852857d832ccec1083c1ce2b13bb2f2fc0c22 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 7 Mar 2019 09:25:48 +1300
Subject: [PATCH 0753/1036] #1646 - Ensure that java.sql.Array.free() is called

---
 .../server/type/ScalarTypeArrayBase.java      | 30 +++++++++++++++++++
 .../server/type/ScalarTypeArrayList.java      | 16 ++--------
 .../server/type/ScalarTypeArraySet.java       | 16 ++--------
 3 files changed, 36 insertions(+), 26 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayBase.java

diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayBase.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayBase.java
new file mode 100644
index 000000000..783793c72
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayBase.java
@@ -0,0 +1,30 @@
+package io.ebeaninternal.server.type;
+
+import io.ebeanservice.docstore.api.mapping.DocPropertyType;
+
+import java.sql.Array;
+import java.sql.SQLException;
+
+abstract class ScalarTypeArrayBase<T> extends ScalarTypeJsonCollection<T> {
+
+  ScalarTypeArrayBase(Class<T> type, int dbType, DocPropertyType docPropertyType) {
+    super(type, dbType, docPropertyType);
+  }
+
+  @Override
+  public T read(DataReader reader) throws SQLException {
+    Array array = reader.getArray();
+    if (array == null) {
+      return null;
+    } else {
+      try {
+        return fromArray((Object[]) array.getArray());
+      } finally {
+        array.free();
+      }
+    }
+  }
+
+  protected abstract T fromArray(Object[] array1);
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
index b7511cab3..8a728c0ec 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
@@ -11,7 +11,6 @@ import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import javax.persistence.PersistenceException;
 import java.io.IOException;
 import java.lang.reflect.Type;
-import java.sql.Array;
 import java.sql.SQLException;
 import java.sql.Types;
 import java.util.ArrayList;
@@ -22,7 +21,7 @@ import java.util.UUID;
  * Type mapped for DB ARRAY type (Postgres only effectively).
  */
 @SuppressWarnings("rawtypes")
-public class ScalarTypeArrayList extends ScalarTypeJsonCollection<List> implements ScalarTypeArray {
+public class ScalarTypeArrayList extends ScalarTypeArrayBase<List> implements ScalarTypeArray {
 
   private static ScalarTypeArrayList UUID = new ScalarTypeArrayList("uuid", DocPropertyType.UUID, ArrayElementConverter.UUID);
   private static ScalarTypeArrayList LONG = new ScalarTypeArrayList("bigint", DocPropertyType.LONG, ArrayElementConverter.LONG);
@@ -101,7 +100,8 @@ public class ScalarTypeArrayList extends ScalarTypeJsonCollection<List> implemen
   }
 
   @SuppressWarnings("unchecked")
-  private List fromArray(Object[] array1) {
+  @Override
+  protected List fromArray(Object[] array1) {
     List list = new ArrayList(array1.length);
     for (Object element : array1) {
       list.add(converter.toElement(element));
@@ -113,16 +113,6 @@ public class ScalarTypeArrayList extends ScalarTypeJsonCollection<List> implemen
     return converter.toDbArray(value.toArray());
   }
 
-  @Override
-  public List read(DataReader reader) throws SQLException {
-    Array array = reader.getArray();
-    if (array == null) {
-      return null;
-    } else {
-      return fromArray((Object[]) array.getArray());
-    }
-  }
-
   @Override
   public void bind(DataBind bind, List value) throws SQLException {
     if (value == null) {
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
index ea3c0bc84..0d8745d35 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
@@ -11,7 +11,6 @@ import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import javax.persistence.PersistenceException;
 import java.io.IOException;
 import java.lang.reflect.Type;
-import java.sql.Array;
 import java.sql.SQLException;
 import java.sql.Types;
 import java.util.LinkedHashSet;
@@ -21,7 +20,7 @@ import java.util.UUID;
 /**
  * Type mapped for DB ARRAY type (Postgres only effectively).
  */
-public class ScalarTypeArraySet<T> extends ScalarTypeJsonCollection<Set<T>> implements ScalarTypeArray {
+public class ScalarTypeArraySet<T> extends ScalarTypeArrayBase<Set<T>> implements ScalarTypeArray {
 
   private static final ScalarTypeArraySet<UUID> UUID = new ScalarTypeArraySet<>("uuid", DocPropertyType.UUID, ArrayElementConverter.UUID);
   private static final ScalarTypeArraySet<Long> LONG = new ScalarTypeArraySet<>("bigint", DocPropertyType.LONG, ArrayElementConverter.LONG);
@@ -100,7 +99,8 @@ public class ScalarTypeArraySet<T> extends ScalarTypeJsonCollection<Set<T>> impl
     return arrayType + "[]";
   }
 
-  private Set<T> fromArray(Object[] array1) {
+  @Override
+  protected Set<T> fromArray(Object[] array1) {
     Set<T> set = new LinkedHashSet<>();
     for (Object element : array1) {
       set.add(converter.toElement(element));
@@ -112,16 +112,6 @@ public class ScalarTypeArraySet<T> extends ScalarTypeJsonCollection<Set<T>> impl
     return converter.toDbArray(value.toArray());
   }
 
-  @Override
-  public Set<T> read(DataReader reader) throws SQLException {
-    Array array = reader.getArray();
-    if (array == null) {
-      return null;
-    } else {
-      return fromArray((Object[]) array.getArray());
-    }
-  }
-
   @Override
   public void bind(DataBind bind, Set<T> value) throws SQLException {
     if (value == null) {

From 7ea6f16207d7614ad514b7e0892a73016a2811ff Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 7 Mar 2019 10:56:56 +1300
Subject: [PATCH 0754/1036] Javadoc update using "DB" vs "Ebean"

---
 src/main/java/io/ebean/BeanState.java         |  5 +--
 src/main/java/io/ebean/CallableSql.java       | 34 ++++++++---------
 src/main/java/io/ebean/DtoQuery.java          |  2 +-
 src/main/java/io/ebean/ExampleExpression.java |  6 +--
 src/main/java/io/ebean/Expr.java              | 13 +------
 src/main/java/io/ebean/ExpressionFactory.java |  6 +--
 src/main/java/io/ebean/ExpressionList.java    | 37 ++++++------------
 src/main/java/io/ebean/ExtendedServer.java    |  6 +--
 src/main/java/io/ebean/FetchConfig.java       | 12 +++---
 src/main/java/io/ebean/Filter.java            |  8 ++--
 src/main/java/io/ebean/FutureList.java        |  2 +-
 src/main/java/io/ebean/Junction.java          |  6 +--
 src/main/java/io/ebean/Pairs.java             |  2 +-
 src/main/java/io/ebean/Query.java             | 14 +++----
 src/main/java/io/ebean/RawSql.java            |  6 +--
 src/main/java/io/ebean/RowConsumer.java       |  2 +-
 src/main/java/io/ebean/RowMapper.java         |  2 +-
 src/main/java/io/ebean/ScriptRunner.java      | 20 ++--------
 src/main/java/io/ebean/Transaction.java       | 10 ++---
 src/main/java/io/ebean/Update.java            |  2 +-
 .../java/io/ebean/config/ServerConfig.java    |  8 +---
 src/main/java/io/ebean/package.html           | 38 +++++++------------
 .../java/io/ebean/text/csv/CsvReader.java     |  2 +-
 .../java/io/ebean/text/json/package-info.java |  4 +-
 24 files changed, 95 insertions(+), 152 deletions(-)

diff --git a/src/main/java/io/ebean/BeanState.java b/src/main/java/io/ebean/BeanState.java
index cbe4e9849..ac3b50470 100644
--- a/src/main/java/io/ebean/BeanState.java
+++ b/src/main/java/io/ebean/BeanState.java
@@ -1,10 +1,9 @@
 package io.ebean;
 
+import javax.annotation.Nullable;
 import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.Nullable;
-
 /**
  * Provides access to the internal state of an entity bean.
  */
@@ -58,7 +57,7 @@ public interface BeanState {
    *
    *   // set loaded state on the email property to false so that
    *   // the email property is not included in a stateless update
-   *   Ebean.getBeanState(user).setPropertyLoaded("email", false);
+   *   DB.getBeanState(user).setPropertyLoaded("email", false);
    *
    *   user.update();
    *
diff --git a/src/main/java/io/ebean/CallableSql.java b/src/main/java/io/ebean/CallableSql.java
index 0ff90d181..604f5f105 100644
--- a/src/main/java/io/ebean/CallableSql.java
+++ b/src/main/java/io/ebean/CallableSql.java
@@ -17,11 +17,11 @@ import java.sql.SQLException;
  *
  * String sql = "{call sp_order_mod(?,?)}";
  *
- * CallableSql cs = Ebean.createCallableSql(sql);
+ * CallableSql cs = DB.createCallableSql(sql);
  * cs.setParameter(1, "turbo");
  * cs.registerOut(2, Types.INTEGER);
  *
- * Ebean.execute(cs);
+ * DB.execute(cs);
  *
  * // read the out parameter
  * Integer returnValue = (Integer) cs.getObject(2);
@@ -38,7 +38,7 @@ import java.sql.SQLException;
  *
  * String sql = "{call sp_insert_order(?,?)}";
  *
- * CallableSql cs = Ebean.createCallableSql(sql);
+ * CallableSql cs = DB.createCallableSql(sql);
  *
  * // Inform Ebean this stored procedure inserts into the
  * // oe_order table and inserts + updates the oe_order_detail table.
@@ -46,35 +46,33 @@ import java.sql.SQLException;
  * cs.addModification("oe_order", true, false, false);
  * cs.addModification("oe_order_detail", true, true, false);
  *
- * Transaction t = Ebean.startTransaction();
  *
- * // execute using JDBC batching 10 statements at a time
- * t.setBatchMode(true);
- * t.setBatchSize(10);
- * try {
+ * try (Transaction t = DB.beginTransaction()) {
+ *
+ *   // execute using JDBC batching 10 statements at a time
+ *   t.setBatchMode(true);
+ *   t.setBatchSize(10);
+ *
  *   cs.setParameter(1, "Was");
  *   cs.setParameter(2, "Banana");
- *   Ebean.execute(cs);
+ *   DB.execute(cs);
  *
  *   cs.setParameter(1, "Here");
  *   cs.setParameter(2, "Kumera");
- *   Ebean.execute(cs);
+ *   DB.execute(cs);
  *
  *   cs.setParameter(1, "More");
  *   cs.setParameter(2, "Apple");
- *   Ebean.execute(cs);
+ *   DB.execute(cs);
  *
- *   // Ebean.externalModification("oe_order",true,false,false);
- *   // Ebean.externalModification("oe_order_detail",true,true,false);
- *   Ebean.commitTransaction();
+ *   // DB.externalModification("oe_order",true,false,false);
+ *   // DB.externalModification("oe_order_detail",true,true,false);
+ *   t.commit();
  *
- * } finally {
- *   Ebean.endTransaction();
  * }
  * }</pre>
  *
  * @see SqlUpdate
- * @see Ebean#execute(CallableSql)
  */
 public interface CallableSql {
 
@@ -173,7 +171,7 @@ public interface CallableSql {
    * Add table modification information to the TransactionEvent.
    * <p>
    * This would be similar to using the
-   * <code>Ebean.externalModification()</code> method. It may be easier and make
+   * <code>DB.externalModification()</code> method. It may be easier and make
    * more sense to set it here with the CallableSql.
    * </p>
    * <p>
diff --git a/src/main/java/io/ebean/DtoQuery.java b/src/main/java/io/ebean/DtoQuery.java
index c72a16216..1603e1d10 100644
--- a/src/main/java/io/ebean/DtoQuery.java
+++ b/src/main/java/io/ebean/DtoQuery.java
@@ -30,7 +30,7 @@ import java.util.function.Predicate;
  *   String sql = "select id, name from customer where name like :name and status_code = :status";
  *
  *   List<CustomerDto> beans =
- *     Ebean.findDto(CustomerDto.class, sql)
+ *     DB.findDto(CustomerDto.class, sql)
  *     .setParameter("name", "Acme%")
  *     .setParameter("status", "ACTIVE")
  *     .findList();
diff --git a/src/main/java/io/ebean/ExampleExpression.java b/src/main/java/io/ebean/ExampleExpression.java
index 21e40fd35..873f235ab 100644
--- a/src/main/java/io/ebean/ExampleExpression.java
+++ b/src/main/java/io/ebean/ExampleExpression.java
@@ -22,8 +22,8 @@ package io.ebean;
  * example.setName("Rob%");
  * example.setNotes("%something%");
  *
- * List&lt;Customer&gt; list =
- *     Ebean.find(Customer.class)
+ * List<Customer> list =
+ *     DB.find(Customer.class)
  *         .where()
  *         // pass the bean into the where() clause
  *         .exampleLike(example)
@@ -46,7 +46,7 @@ package io.ebean;
  *     .includeZeros();
  *
  * List<Customer> list =
- *     Ebean.find(Customer.class)
+ *     DB.find(Customer.class)
  *         .where()
  *         .add(qbe)
  *         .findList();
diff --git a/src/main/java/io/ebean/Expr.java b/src/main/java/io/ebean/Expr.java
index 62ffee527..b50f1231b 100644
--- a/src/main/java/io/ebean/Expr.java
+++ b/src/main/java/io/ebean/Expr.java
@@ -17,23 +17,12 @@ import java.util.Map;
  * server. It is actually a short cut for using the ExpressionFactory of the
  * 'default' EbeanServer.
  * <p>
- * See also {@link Ebean#getExpressionFactory()}
+ * See also {@link DB#getExpressionFactory()}
  * </p>
  * <p>
  * Creates standard common expressions for using in a Query Where or Having
  * clause.
  * </p>
- * <pre>{@code
- *
- * // Example: Using an Expr.or() method
- * Query<Order> query = Ebean.createQuery(Order.class);
- * query.where(
- *     Expr.or(Expr.eq("status", Order.NEW),
- *             Expr.gt("orderDate", lastWeek));
- *
- * List<Order> list = query.findList();
- * ...
- * }</pre>
  *
  * @see Query#where()
  */
diff --git a/src/main/java/io/ebean/ExpressionFactory.java b/src/main/java/io/ebean/ExpressionFactory.java
index 0ea9071e4..42177057d 100644
--- a/src/main/java/io/ebean/ExpressionFactory.java
+++ b/src/main/java/io/ebean/ExpressionFactory.java
@@ -30,9 +30,9 @@ import java.util.Map;
  *     Expr.or(Expr.eq("status", Order.Status.NEW),
  *             Expr.gt("orderDate", lastWeek));
  *
- * Query<Order> query = Ebean.createQuery(Order.class);
- * query.where().add(newOrLastWeek);
- * List<Order> list = query.findList();
+ * List<Order> list = DB.find(Order.class)
+ *   .where().add(newOrLastWeek)
+ *   .findList();
  * ...
  * }</pre>
  *
diff --git a/src/main/java/io/ebean/ExpressionList.java b/src/main/java/io/ebean/ExpressionList.java
index 8f727756a..be78a5738 100644
--- a/src/main/java/io/ebean/ExpressionList.java
+++ b/src/main/java/io/ebean/ExpressionList.java
@@ -321,7 +321,7 @@ public interface ExpressionList<T> {
    * <pre>{@code
    *
    *  List<String> names =
-   *    Ebean.find(Customer.class)
+   *    DB.find(Customer.class)
    *      .select("name")
    *      .orderBy().asc("name")
    *      .findSingleAttributeList();
@@ -332,7 +332,7 @@ public interface ExpressionList<T> {
    * <pre>{@code
    *
    *  List<String> names =
-   *    Ebean.find(Customer.class)
+   *    DB.find(Customer.class)
    *      .setDistinct(true)
    *      .select("name")
    *      .where().eq("status", Customer.Status.NEW)
@@ -352,7 +352,7 @@ public interface ExpressionList<T> {
    * <pre>{@code
    *
    *  String name =
-   *    Ebean.find(Customer.class)
+   *    DB.find(Customer.class)
    *      .select("name")
    *      .where().eq("id", 42)
    *      .findSingleAttribute();
@@ -435,7 +435,7 @@ public interface ExpressionList<T> {
    * </p>
    * <pre>{@code
    *
-   *  PagedList<Order> pagedList = Ebean.find(Order.class)
+   *  PagedList<Order> pagedList = DB.find(Order.class)
    *       .setFirstRow(50)
    *       .setMaxRows(20)
    *       .findPagedList();
@@ -502,7 +502,7 @@ public interface ExpressionList<T> {
    * <pre>{@code
    *
    *   List<Customer> customers =
-   *       Ebean.find(Customer.class)
+   *       DB.find(Customer.class)
    *          .setDistinct(true)
    *          .select("name")     // only select the customer name
    *          .findList();
@@ -575,7 +575,7 @@ public interface ExpressionList<T> {
    *
    *  List<CountedValue<Order.Status>> orderStatusCount =
    *
-   *     Ebean.find(Order.class)
+   *     DB.find(Order.class)
    *      .select("status")
    *      .where()
    *      .gt("orderDate", LocalDate.now().minusMonths(3))
@@ -758,20 +758,6 @@ public interface ExpressionList<T> {
 
   /**
    * Add an Expression to the list.
-   * <p>
-   * This returns the list so that add() can be chained.
-   * </p>
-   * <pre>{@code
-   *
-   * Query<Customer> query = Ebean.find(Customer.class);
-   * query.where()
-   *     .like("name","Rob%")
-   *     .eq("status", Customer.ACTIVE);
-   *
-   * List<Customer> list = query.findList();
-   * ...
-   *
-   * }</pre>
    */
   ExpressionList<T> add(Expression expr);
 
@@ -907,11 +893,10 @@ public interface ExpressionList<T> {
    * example.setName("Rob%");
    * example.setNotes("%something%");
    *
-   * List<Customer> list = Ebean.find(Customer.class).where()
-   *     // pass the bean into the where() clause
-   *     .exampleLike(example)
-   *     // you can add other expressions to the same query
-   *     .gt("id", 2).findList();
+   * List<Customer> list =
+   *   DB.find(Customer.class)
+   *     .where().exampleLike(example)
+   *     .findList();
    *
    * }</pre>
    * <p>
@@ -926,7 +911,7 @@ public interface ExpressionList<T> {
    * // create a ExampleExpression with more control
    * ExampleExpression qbe = new ExampleExpression(example, true, LikeType.EQUAL_TO).includeZeros();
    *
-   * List<Customer> list = Ebean.find(Customer.class).where().add(qbe).findList();
+   * List<Customer> list = DB.find(Customer.class).where().add(qbe).findList();
    *
    * }</pre>
    */
diff --git a/src/main/java/io/ebean/ExtendedServer.java b/src/main/java/io/ebean/ExtendedServer.java
index deb3582f2..25e4c27ea 100644
--- a/src/main/java/io/ebean/ExtendedServer.java
+++ b/src/main/java/io/ebean/ExtendedServer.java
@@ -272,7 +272,7 @@ public interface ExtendedServer {
    * <p>
    * <pre>{@code
    *
-   *  PagedList<Order> pagedList = Ebean.find(Order.class)
+   *  PagedList<Order> pagedList = DB.find(Order.class)
    *       .setFirstRow(50)
    *       .setMaxRows(20)
    *       .findPagedList();
@@ -341,7 +341,7 @@ public interface ExtendedServer {
    * <pre>{@code
    *
    *  List<String> names =
-   *    Ebean.find(Customer.class)
+   *    DB.find(Customer.class)
    *      .select("name")
    *      .orderBy().asc("name")
    *      .findSingleAttributeList();
@@ -351,7 +351,7 @@ public interface ExtendedServer {
    * <pre>{@code
    *
    *  List<String> names =
-   *    Ebean.find(Customer.class)
+   *    DB.find(Customer.class)
    *      .setDistinct(true)
    *      .select("name")
    *      .where().eq("status", Customer.Status.NEW)
diff --git a/src/main/java/io/ebean/FetchConfig.java b/src/main/java/io/ebean/FetchConfig.java
index 6e6d14517..76324c33c 100644
--- a/src/main/java/io/ebean/FetchConfig.java
+++ b/src/main/java/io/ebean/FetchConfig.java
@@ -24,7 +24,7 @@ import java.io.Serializable;
  * <p>
  * <pre>{@code
  * // Normal fetch join results in a single SQL query
- * List<Order> list = Ebean.find(Order.class).fetch("details").findList();
+ * List<Order> list = DB.find(Order.class).fetch("details").findList();
  *
  * // Find Orders join details using a single SQL query
  * }</pre>
@@ -36,7 +36,7 @@ import java.io.Serializable;
  *
  * // This will use 2 SQL queries to build this object graph
  * List<Order> list =
- *     Ebean.find(Order.class)
+ *     DB.find(Order.class)
  *         .fetch("details", new FetchConfig().query())
  *         .findList();
  *
@@ -52,7 +52,7 @@ import java.io.Serializable;
  *
  * // This will use 3 SQL queries to build this object graph
  * List<Order> list =
- *     Ebean.find(Order.class)
+ *     DB.find(Order.class)
  *         .fetch("details", new FetchConfig().query())
  *         .fetch("customer", new FetchConfig().queryFirst(5))
  *         .findList();
@@ -70,7 +70,7 @@ import java.io.Serializable;
  * <pre>{@code
  * // This will use 3 SQL queries to build this object graph
  * List<Order> list =
- *     Ebean.find(Order.class)
+ *     DB.find(Order.class)
  *         .select("status, shipDate")
  *         .fetch("details", "quantity, price", new FetchConfig().query())
  *         .fetch("details.product", "sku, name")
@@ -100,7 +100,7 @@ import java.io.Serializable;
  * <pre>{@code
  *
  * List<Order> list =
- *     Ebean.find(Order.class)
+ *     DB.find(Order.class)
  *         .fetch("customer", new FetchConfig().query(10).lazy(5))
  *         .findList();
  *
@@ -121,7 +121,7 @@ import java.io.Serializable;
  * <p>
  * <pre>{@code
  *
- * List<Order> list = Ebean.find(Order.class)
+ * List<Order> list = DB.find(Order.class)
  *   .fetch("customer","name", new FetchConfig().lazy(5))
  *   .fetch("customer.contacts","contactName, phone, email")
  *   .fetch("customer.shippingAddress")
diff --git a/src/main/java/io/ebean/Filter.java b/src/main/java/io/ebean/Filter.java
index 5a9ebf593..3b7cdc07a 100644
--- a/src/main/java/io/ebean/Filter.java
+++ b/src/main/java/io/ebean/Filter.java
@@ -25,14 +25,14 @@ import java.util.Set;
  * // get a list of entities (query execution statistics in this case)
  *
  * List<MetaQueryStatistic> list =
- *     Ebean.find(MetaQueryStatistic.class).findList();
+ *     DB.find(MetaQueryStatistic.class).findList();
  *
  * long nowMinus24Hrs = System.currentTimeMillis() - 24 * (1000 * 60 * 60);
  *
  * // sort and filter the list returning a filtered list...
  *
  * List<MetaQueryStatistic> filteredList =
- *     Ebean.filter(MetaQueryStatistic.class)
+ *     DB.filter(MetaQueryStatistic.class)
  *         .sort("avgTimeMicros desc")
  *         .gt("executionCount", 0)
  *         .gt("lastQueryTime", nowMinus24Hrs)
@@ -63,12 +63,12 @@ import java.util.Set;
  * // get a list of entities (query execution statistics)
  *
  * List<Order> orders =
- *     Ebean.find(Order.class).findList();
+ *     DB.find(Order.class).findList();
  *
  * // Apply a filter...
  *
  * List<Order> filteredOrders =
- *     Ebean.filter(Order.class)
+ *     DB.filter(Order.class)
  *         .startsWith("customer.name", "Rob")
  *         .eq("customer.shippingAddress.city", "Auckland")
  *         .filter(orders);
diff --git a/src/main/java/io/ebean/FutureList.java b/src/main/java/io/ebean/FutureList.java
index e6d4c6620..ad7c70485 100644
--- a/src/main/java/io/ebean/FutureList.java
+++ b/src/main/java/io/ebean/FutureList.java
@@ -20,7 +20,7 @@ import java.util.concurrent.TimeoutException;
  * <pre>{@code
  *
  *  // create a query to find all orders
- * Query<Order> query = Ebean.find(Order.class);
+ * Query<Order> query = DB.find(Order.class);
  *
  *  // execute the query in a background thread
  *  // immediately returning the futureList
diff --git a/src/main/java/io/ebean/Junction.java b/src/main/java/io/ebean/Junction.java
index c2a76f196..0ab001b37 100644
--- a/src/main/java/io/ebean/Junction.java
+++ b/src/main/java/io/ebean/Junction.java
@@ -11,7 +11,7 @@ package io.ebean;
  * </p>
  * <pre>{@code
  * Query q =
- *     Ebean.find(Person.class)
+ *     DB.find(Person.class)
  *       .where()
  *         .or()
  *           .like("name", "Rob%")
@@ -30,7 +30,7 @@ package io.ebean;
  * <pre>{@code
  *
  * Query q =
- *     Ebean.find(Person.class)
+ *     DB.find(Person.class)
  *       .where()
  *         .or()
  *           .like("name", "Rob%")
@@ -50,7 +50,7 @@ package io.ebean;
  * </p>
  * <pre>{@code
  * Query<Customer> q =
- *  Ebean.find(Customer.class)
+ *  DB.find(Customer.class)
  *      .where()
  *        .or()
  *          .and()
diff --git a/src/main/java/io/ebean/Pairs.java b/src/main/java/io/ebean/Pairs.java
index 3c99bceed..3e7f125ae 100644
--- a/src/main/java/io/ebean/Pairs.java
+++ b/src/main/java/io/ebean/Pairs.java
@@ -26,7 +26,7 @@ import java.util.List;
  *   pairs.add("sj2", 1001);
  *   pairs.add("pf3", 1000);
  *
- *   List<OCachedNatKeyBean3> list = Ebean.find(OCachedNatKeyBean3.class)
+ *   List<OCachedNatKeyBean3> list = DB.find(OCachedNatKeyBean3.class)
  *   .where()
  *   .eq("store", "def")
  *   .inPairs(pairs)       // IN clause with 'pairs' of values
diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index bf9717f12..308669fbf 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -377,7 +377,7 @@ public interface Query<T> {
    * <pre>{@code
    *
    *   // fetch a bean with JSON content
-   *   EBasicJsonList bean= Ebean.find(EBasicJsonList.class)
+   *   EBasicJsonList bean= DB.find(EBasicJsonList.class)
    *       .setId(42)
    *       .setAllowLoadErrors()  // collect errors into bean state if we have invalid JSON
    *       .findOne();
@@ -843,7 +843,7 @@ public interface Query<T> {
    * <pre>{@code
    *
    *  List<String> names =
-   *    Ebean.find(Customer.class)
+   *    DB.find(Customer.class)
    *      .select("name")
    *      .orderBy().asc("name")
    *      .findSingleAttributeList();
@@ -854,7 +854,7 @@ public interface Query<T> {
    * <pre>{@code
    *
    *  List<String> names =
-   *    Ebean.find(Customer.class)
+   *    DB.find(Customer.class)
    *      .setDistinct(true)
    *      .select("name")
    *      .where().eq("status", Customer.Status.NEW)
@@ -875,7 +875,7 @@ public interface Query<T> {
    * <pre>{@code
    *
    *  String name =
-   *    Ebean.find(Customer.class)
+   *    DB.find(Customer.class)
    *      .select("name")
    *      .where().eq("id", 42)
    *      .findSingleAttribute();
@@ -1089,7 +1089,7 @@ public interface Query<T> {
    * </p>
    * <pre>{@code
    *
-   *  PagedList<Order> pagedList = Ebean.find(Order.class)
+   *  PagedList<Order> pagedList = DB.find(Order.class)
    *       .setFirstRow(50)
    *       .setMaxRows(20)
    *       .findPagedList();
@@ -1375,7 +1375,7 @@ public interface Query<T> {
    * <pre>{@code
    *
    *   List<Customer> customers =
-   *       Ebean.find(Customer.class)
+   *       DB.find(Customer.class)
    *          .setDistinct(true)
    *          .select("name")
    *          .findList();
@@ -1391,7 +1391,7 @@ public interface Query<T> {
    *
    *  List<CountedValue<Order.Status>> orderStatusCount =
    *
-   *     Ebean.find(Order.class)
+   *     DB.find(Order.class)
    *      .select("status")
    *      .where()
    *      .gt("orderDate", LocalDate.now().minusMonths(3))
diff --git a/src/main/java/io/ebean/RawSql.java b/src/main/java/io/ebean/RawSql.java
index 857ce7328..66781155b 100644
--- a/src/main/java/io/ebean/RawSql.java
+++ b/src/main/java/io/ebean/RawSql.java
@@ -87,7 +87,7 @@ package io.ebean;
  *     // .columnMapping("sum(d.order_qty*d.unit_price)", "totalAmount")
  *     .create();
  *
- *   List<OrderAggregate> list = Ebean.find(OrderAggregate.class)
+ *   List<OrderAggregate> list = DB.find(OrderAggregate.class)
  *       .setRawSql(rawSql)
  *       .where().gt("order.id", 0)
  *       .having().gt("totalAmount", 20)
@@ -114,7 +114,7 @@ package io.ebean;
  *     .columnMappingIgnore("'ignoreMe'")
  *     .create();
  *
- *   List<OrderAggregate> orders = Ebean.find(OrderAggregate.class)
+ *   List<OrderAggregate> orders = DB.find(OrderAggregate.class)
  *     .setRawSql(rawSql)
  *     .fetch("order", "status,orderDate", new FetchConfig().query())
  *     .fetch("order.customer", "name")
@@ -146,7 +146,7 @@ package io.ebean;
  *       .tableAliasMapping("p", "details.product")
  *       .create();
  *
- *  List<Order> ordersFromRaw = Ebean.find(Order.class)
+ *  List<Order> ordersFromRaw = DB.find(Order.class)
  *       .setRawSql(rawSql)
  *       .setParameter("maxOrderId", 2)
  *       .setParameter("productId", 1)
diff --git a/src/main/java/io/ebean/RowConsumer.java b/src/main/java/io/ebean/RowConsumer.java
index 4845f18ea..3a02964f2 100644
--- a/src/main/java/io/ebean/RowConsumer.java
+++ b/src/main/java/io/ebean/RowConsumer.java
@@ -13,7 +13,7 @@ import java.sql.SQLException;
  *
  *  String sql = "select id, name, status from o_customer order by name desc";
  *
- *  Ebean.createSqlQuery(sql)
+ *  DB.sqlQuery(sql)
  *    .findEachRow((resultSet, rowNum) -> {
  *
  *      // read directly from ResultSet
diff --git a/src/main/java/io/ebean/RowMapper.java b/src/main/java/io/ebean/RowMapper.java
index 1cc067372..5ef6e64de 100644
--- a/src/main/java/io/ebean/RowMapper.java
+++ b/src/main/java/io/ebean/RowMapper.java
@@ -40,7 +40,7 @@ import java.sql.SQLException;
  *
  *   String sql = "select id, name, status from o_customer where name = ?";
  *
- *  CustomerDto rob = Ebean.createSqlQuery(sql)
+ *  CustomerDto rob = DB.sqlQuery(sql)
  *    .setParameter(1, "Rob")
  *    .findOne(CUSTOMER_MAPPER);
  *
diff --git a/src/main/java/io/ebean/ScriptRunner.java b/src/main/java/io/ebean/ScriptRunner.java
index b9130d57b..2336d1628 100644
--- a/src/main/java/io/ebean/ScriptRunner.java
+++ b/src/main/java/io/ebean/ScriptRunner.java
@@ -13,20 +13,8 @@ import java.util.Map;
  * <h3>Example of simple use</h3>
  * <pre>{@code
  *
- *   EbeanServer server = Ebean.getDefaultServer();
- *   server.script().run("/scripts/test-script.sql");
- *
- * }</pre>
- *
- *
- * <h3>Example using place holders in the script</h3>
- * <pre>{@code
- *
- *   Map<String,String> placeholders = new HashMap<>();
- *   placeholders.put("tableName", "e_basic");
- *
- *   EbeanServer server = Ebean.getDefaultServer();
- *   server.script().run("/scripts/test-script.sql");
+ *   Database database = DB.getDefault();
+ *   database.script().run("/scripts/test-script.sql");
  *
  * }</pre>
  */
@@ -45,8 +33,8 @@ public interface ScriptRunner {
    *   Map<String,String> placeholders = new HashMap<>();
    *   placeholders.put("tableName", "e_basic");
    *
-   *   EbeanServer server = Ebean.getDefaultServer();
-   *   server.script().run("/scripts/test-script.sql");
+   *   Database database = DB.getDefault();
+   *   database.script().run("/scripts/test-script.sql", placeholders);
    *
    * }</pre>
    */
diff --git a/src/main/java/io/ebean/Transaction.java b/src/main/java/io/ebean/Transaction.java
index 4b0f24bf1..465df6732 100644
--- a/src/main/java/io/ebean/Transaction.java
+++ b/src/main/java/io/ebean/Transaction.java
@@ -14,18 +14,18 @@ import java.sql.Connection;
 public interface Transaction extends AutoCloseable {
 
   /**
-   * Return the current transaction (of the default server) or null if there is
+   * Return the current transaction (of the default database) or null if there is
    * no current transaction in scope.
    * <p>
-   * This is the same as <code>Ebean.currentTransaction()</code>
+   * This is the same as <code>DB.currentTransaction()</code>
    * </p>
    * <p>
    * This returns the current transaction for the 'default server'.  If you are using
-   * multiple EbeanServer's then use {@link EbeanServer#currentTransaction()}.
+   * multiple EbeanServer's then use {@link DB#currentTransaction()}.
    * </p>
    *
-   * @see Ebean#currentTransaction()
-   * @see EbeanServer#currentTransaction()
+   * @see DB#currentTransaction()
+   * @see Database#currentTransaction()
    */
   static Transaction current() {
     return Ebean.currentTransaction();
diff --git a/src/main/java/io/ebean/Update.java b/src/main/java/io/ebean/Update.java
index 70c225ce3..95fb5b412 100644
--- a/src/main/java/io/ebean/Update.java
+++ b/src/main/java/io/ebean/Update.java
@@ -41,7 +41,7 @@ package io.ebean;
  * <p>
  * <pre>{@code
  *
- * Update<Topic> update = Ebean.createUpdate(Topic.class, "incrementPostCount");
+ * Update<Topic> update = DB.createUpdate(Topic.class, "incrementPostCount");
  * update.setParameter("id", 1);
  * int rows = update.execute();
  *
diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 9979057d0..27c1098d7 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -2328,8 +2328,7 @@ public class ServerConfig {
    *
    *   // assume Customer has L2 bean caching enabled ...
    *
-   *   Transaction transaction = Ebean.beginTransaction();
-   *   try {
+   *   try (Transaction transaction = DB.beginTransaction()) {
    *
    *     // this uses L2 bean cache as the transaction
    *     // ... is considered "query only" at this point
@@ -2337,7 +2336,7 @@ public class ServerConfig {
    *
    *     // transaction no longer "query only" once
    *     // ... a bean has been saved etc
-   *     Ebean.save(someBean);
+   *     DB.save(someBean);
    *
    *     // will NOT use L2 bean cache as the transaction
    *     // ... is no longer considered "query only"
@@ -2356,9 +2355,6 @@ public class ServerConfig {
    *     transaction.setSkipCache(true);
    *     Customer.find.byId(99); // skips l2 bean cache
    *
-   *
-   *   } finally {
-   *     transaction.end();
    *   }
    *
    * }</pre>
diff --git a/src/main/java/io/ebean/package.html b/src/main/java/io/ebean/package.html
index e3b4f6a25..4aa8efb94 100644
--- a/src/main/java/io/ebean/package.html
+++ b/src/main/java/io/ebean/package.html
@@ -3,19 +3,20 @@
   <TITLE>Ebean core API</TITLE>
 </HEAD>
 <Body BGCOLOR="#ffffff">
-Core API (see <a href="EbeanServer.html">EbeanServer</a> and <a href="Ebean.html">Ebean</a>).
+Core API (see <a href="Database.html">Database</a>, <a href="DB.html">DB</a> and <a href="Query.html">Query</a>).
 
-<h3>Ebean</h3>
+<h3>Database</h3>
 <p>
-  Provides the main API for fetching and persisting beans with eBean.
+  Provides the main API for fetching and persisting beans. We can obtain the "default database"
+  via <code>DB.getDefault()</code> or just use methods on DB.
 </p>
 
 <pre>{@code
-// EXAMPLE 1: Simple fetch
+// EXAMPLE 1: Simple fetch.
 //========================
 
 // fetch order 10
-Order order = Ebean.find(Order.class, 10);
+Order order = DB.find(Order.class, 10);
 
 
 
@@ -24,7 +25,7 @@ Order order = Ebean.find(Order.class, 10);
 
 // fetch Customer 7 including their billing and shipping addresses
 Customer customer =
-	Ebean.find(Customer.class)
+	DB.find(Customer.class)
 		.setId(7)
 		.fetch("billingAddress")
 		.fetch("shippingAddress")
@@ -40,28 +41,16 @@ Address shipAddr = customer.getShippingAddress();
 //=====================================
 
 // get a Customer reference so we don't hit the database
-Customer custRef = Ebean.getReference(Customer.class, 7);
+Customer customer = DB.getReference(Customer.class, 7);
 
 // create a new Order object
 Order newOrder = new Order();
 newOrder.setStatus(Order.Status.NEW);
-newOrder.setCustomer(custRef);
-
-ArrayList orderLines = new ArrayList();
-newOrder.setLines(orderLines);
+newOrder.setCustomer(customer);
 ...
 
-// add a line to the order
-Product prodRef = Ebean.getReference(Product.class, 41);
-OrderLine line = new OrderLine();
-line.setProduct(prodRef);
-line.setQuantity(10);
-orderLines.add(line);
-...
 
-// save the order and its lines in a single transaction
-// NB: assumes CascadeType.PERSIST is set on the order lines association
-Ebean.save(newOrder);
+DB.save(newOrder);
 
 
 
@@ -69,17 +58,16 @@ Ebean.save(newOrder);
 //=================================
 
 // Get access to the Human Resources EbeanServer/Database
-EbeanServer hrServer = Ebean.getServer(&quot;HR&quot;);
+Database hrDatabase = DB.byName("HR");
 
 
-// fetch contact 3 from the HR database
-Contact contact = hrServer.find(Contact.class, 3);
+Contact contact = hrDatabase.find(Contact.class, 42);
 
 contact.setStatus(Contact.Status.INACTIVE);
 ...
 
 // save the contact back to the HR database
-hrServer.save(contact);
+hrDatabase.save(contact);
 }</pre>
 
 </Body>
diff --git a/src/main/java/io/ebean/text/csv/CsvReader.java b/src/main/java/io/ebean/text/csv/CsvReader.java
index cff4a49d0..de64444ab 100644
--- a/src/main/java/io/ebean/text/csv/CsvReader.java
+++ b/src/main/java/io/ebean/text/csv/CsvReader.java
@@ -20,7 +20,7 @@ import java.util.Locale;
  *
  *   FileReader reader = new FileReader(f);
  *
- *   CsvReader&lt;Customer&gt; csvReader = Ebean.createCsvReader(Customer.class);
+ *   CsvReader<Customer> csvReader = DB.createCsvReader(Customer.class);
  *
  *   csvReader.setPersistBatchSize(20);
  *
diff --git a/src/main/java/io/ebean/text/json/package-info.java b/src/main/java/io/ebean/text/json/package-info.java
index a5033072f..62badf679 100644
--- a/src/main/java/io/ebean/text/json/package-info.java
+++ b/src/main/java/io/ebean/text/json/package-info.java
@@ -10,7 +10,7 @@
  * <pre>{@code
  *  // find some customers ...
  *
- * List<Customer> list = Ebean.find(Customer.class)
+ * List<Customer> list = DB.find(Customer.class)
  *     .select("id, name, status, shippingAddress")
  *     .fetch("billingAddress","line1, city")
  *     .fetch("billingAddress.country", "*")
@@ -18,7 +18,7 @@
  *     .order().desc("id")
  *     .findList();
  *
- * JsonContext json = Ebean.json();
+ * JsonContext json = DB.json();
  *
  *  // output as a JSON string
  * String jsonOutput = json.toJson(list);

From aa1e0215010f11e4359f89e5c690313eb7bd2b13 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 7 Mar 2019 11:10:58 +1300
Subject: [PATCH 0755/1036] Javadoc update using "DB"

---
 src/main/java/io/ebean/Ebean.java             |  10 +-
 src/main/java/io/ebean/ExtendedServer.java    |  10 +-
 src/main/java/io/ebean/PagedList.java         |   3 +-
 src/main/java/io/ebean/Query.java             | 108 ++++++------------
 src/main/java/io/ebean/Transaction.java       |   6 +-
 src/main/java/io/ebean/UpdateQuery.java       |  18 +--
 .../java/io/ebean/config/ServerConfig.java    |   2 +-
 7 files changed, 52 insertions(+), 105 deletions(-)

diff --git a/src/main/java/io/ebean/Ebean.java b/src/main/java/io/ebean/Ebean.java
index c8cfc1304..2751cd3bf 100644
--- a/src/main/java/io/ebean/Ebean.java
+++ b/src/main/java/io/ebean/Ebean.java
@@ -631,7 +631,8 @@ public final class Ebean {
    *   Customer customer = new Customer();
    *   customer.setId(7);
    *   customer.setName("ModifiedNameNoOCC");
-   *   ebeanServer.update(customer);
+   *
+   *   DB.update(customer);
    *
    * }</pre>
    *
@@ -1131,10 +1132,9 @@ public final class Ebean {
    *
    *   String sql = "select c.id, c.name from customer c where c.name like ? order by c.name";
    *
-   *   Query<Customer> query = ebeanServer.findNative(Customer.class, sql);
-   *   query.setParameter(1, "Rob%");
-   *
-   *   List<Customer> customers = query.findList();
+   *   List<Customer> customers = DB.findNative(Customer.class, sql)
+   *     .setParameter(1, "Rob%")
+   *     .findList()
    *
    * }</pre>
    *
diff --git a/src/main/java/io/ebean/ExtendedServer.java b/src/main/java/io/ebean/ExtendedServer.java
index 25e4c27ea..ce14e17d0 100644
--- a/src/main/java/io/ebean/ExtendedServer.java
+++ b/src/main/java/io/ebean/ExtendedServer.java
@@ -121,7 +121,7 @@ public interface ExtendedServer {
    * <p>
    * <pre>{@code
    *
-   *     ebeanServer.find(Order.class)
+   *     DB.find(Order.class)
    *       .where().eq("status", Order.Status.NEW)
    *       .order().asc("id")
    *       .findEach((Order order) -> {
@@ -155,7 +155,7 @@ public interface ExtendedServer {
    * <p>
    * <pre>{@code
    *
-   *     ebeanServer.find(Order.class)
+   *     DB.find(Order.class)
    *       .where().eq("status", Order.Status.NEW)
    *       .order().asc("id")
    *       .findEachWhile((Order order) -> {
@@ -194,8 +194,7 @@ public interface ExtendedServer {
    * <p>
    * <pre>{@code
    *
-   * List<Customer> customers =
-   *     ebeanServer.find(Customer.class)
+   * List<Customer> customers = DB.find(Customer.class)
    *     .where().ilike("name", "rob%")
    *     .findList();
    *
@@ -301,8 +300,7 @@ public interface ExtendedServer {
    * <p>
    * <pre>{@code
    *
-   * Set<Customer> customers =
-   *     ebeanServer.find(Customer.class)
+   * Set<Customer> customers = DB.find(Customer.class)
    *     .where().ilike("name", "rob%")
    *     .findSet();
    *
diff --git a/src/main/java/io/ebean/PagedList.java b/src/main/java/io/ebean/PagedList.java
index 421fde776..6b0a92ef1 100644
--- a/src/main/java/io/ebean/PagedList.java
+++ b/src/main/java/io/ebean/PagedList.java
@@ -24,8 +24,7 @@ import java.util.concurrent.Future;
  *     // We want to find the first 50 new orders
  *     //  ... so we don't really need setFirstRow(0)
  *
- *     PagedList<Order> pagedList
- *       = ebeanServer.find(Order.class)
+ *     PagedList<Order> pagedList = DB.find(Order.class)
  *       .where().eq("status", Order.Status.NEW)
  *       .order().asc("id")
  *       .setFirstRow(0)
diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index 308669fbf..712281e48 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -19,10 +19,7 @@ import java.util.function.Predicate;
  * <p>
  * <pre>{@code
  *
- * List<Order> orderList =
- *   ebeanServer.find(Order.class)
- *     .fetch("customer")
- *     .fetch("details")
+ * List<Order> orderList = DB.find(Order.class)
  *     .where()
  *       .like("customer.name","rob%")
  *       .gt("orderDate",lastWeek)
@@ -38,29 +35,14 @@ import java.util.function.Predicate;
  * <pre>{@code
  *
  * String oql =
- *   	+" fetch customer "
- *   	+" fetch details "
  *   	+" where customer.name like :custName and orderDate > :minOrderDate "
  *   	+" order by customer.id, id desc "
  *   	+" limit 50 ";
  *
- * Query<Order> query = ebeanServer.createQuery(Order.class, oql);
- * query.setParameter("custName", "Rob%");
- * query.setParameter("minOrderDate", lastWeek);
- *
- * List<Order> orderList = query.findList();
- * ...
- * }</pre>
- * <p>
- * Example: Using a named query called "with.cust.and.details"
- * </p>
- * <pre>{@code
- *
- * Query<Order> query = ebeanServer.createNamedQuery(Order.class,"with.cust.and.details");
- * query.setParameter("custName", "Rob%");
- * query.setParameter("minOrderDate", lastWeek);
- *
- * List<Order> orderList = query.findList();
+ * List<Order> orderList = DB.createQuery(Order.class, oql)
+ *   .setParameter("custName", "Rob%")
+ *   .setParameter("minOrderDate", lastWeek)
+ *   .findList();
  * ...
  * }</pre>
  * <h3>AutoTune</h3>
@@ -436,8 +418,7 @@ public interface Query<T> {
    * </p>
    * <pre>{@code
    *
-   * List<Customer> customers =
-   *     ebeanServer.find(Customer.class)
+   * List<Customer> customers = DB.find(Customer.class)
    *     // Only fetch the customer id, name and status.
    *     // This is described as a "Partial Object"
    *     .select("name, status")
@@ -465,8 +446,7 @@ public interface Query<T> {
    * <pre>{@code
    *
    * // query orders...
-   * List<Order> orders =
-   *     ebeanServer.find(Order.class)
+   * List<Order> orders = DB.find(Order.class)
    *       // fetch the customer...
    *       // ... getting the customers name and phone number
    *       .fetch("customer", "name, phoneNumber")
@@ -481,8 +461,7 @@ public interface Query<T> {
    * <pre>{@code
    *
    * // fetch customers (their id, name and status)
-   * List<Customer> customers =
-   *     ebeanServer.find(Customer.class)
+   * List<Customer> customers = DB.find(Customer.class)
    *     .select("name, status")
    *     .fetch("contacts", "firstName,lastName,email")
    *     .findList();
@@ -551,8 +530,7 @@ public interface Query<T> {
    * <pre>{@code
    *
    * // fetch customers (their id, name and status)
-   * List<Customer> customers =
-   *     ebeanServer.find(Customer.class)
+   * List<Customer> customers = DB.find(Customer.class)
    *     .select("name, status")
    *     .fetch("contacts", "firstName,lastName,email", new FetchConfig().lazy(10))
    *     .findList();
@@ -573,8 +551,7 @@ public interface Query<T> {
    * <pre>{@code
    *
    * // fetch customers (their id, name and status)
-   * List<Customer> customers =
-   *     ebeanServer.find(Customer.class)
+   * List<Customer> customers = DB.find(Customer.class)
    *     // eager fetch the contacts
    *     .fetch("contacts")
    *     .findList();
@@ -637,8 +614,7 @@ public interface Query<T> {
    * <pre>{@code
    *
    * // fetch customers (their id, name and status)
-   * List<Customer> customers =
-   *     ebeanServer.find(Customer.class)
+   * List<Customer> customers = DB.find(Customer.class)
    *     // lazy fetch contacts with a batch size of 100
    *     .fetch("contacts", new FetchConfig().lazy(100))
    *     .findList();
@@ -684,8 +660,7 @@ public interface Query<T> {
    * </p>
    * <pre>{@code
    *
-   *  Query<Customer> query =
-   *    ebeanServer.find(Customer.class)
+   *  Query<Customer> query = DB.find(Customer.class)
    *     .where().eq("status", Status.NEW)
    *     .order().asc("id");
    *
@@ -732,7 +707,7 @@ public interface Query<T> {
    * </p>
    * <pre>{@code
    *
-   *  ebeanServer.find(Customer.class)
+   *  DB.find(Customer.class)
    *     .where().eq("status", Status.NEW)
    *     .order().asc("id")
    *     .findEach((Customer customer) -> {
@@ -761,7 +736,7 @@ public interface Query<T> {
    * </p>
    * <pre>{@code
    *
-   *  ebeanServer.find(Customer.class)
+   *  DB.find(Customer.class)
    *     .fetch("contacts", new FetchConfig().query(2))
    *     .where().eq("status", Status.NEW)
    *     .order().asc("id")
@@ -788,8 +763,7 @@ public interface Query<T> {
    * </p>
    * <pre>{@code
    *
-   * List<Customer> customers =
-   *     ebeanServer.find(Customer.class)
+   * List<Customer> customers = DB.find(Customer.class)
    *     .where().ilike("name", "rob%")
    *     .findList();
    *
@@ -805,8 +779,7 @@ public interface Query<T> {
    * </p>
    * <pre>{@code
    *
-   * Set<Customer> customers =
-   *     ebeanServer.find(Customer.class)
+   * Set<Customer> customers = DB.find(Customer.class)
    *     .where().ilike("name", "rob%")
    *     .findSet();
    *
@@ -826,8 +799,7 @@ public interface Query<T> {
    * </p>
    * <pre>{@code
    *
-   * Map<String, Product> map =
-   *   ebeanServer.find(Product.class)
+   * Map<String, Product> map = DB.find(Product.class)
    *     .setMapKey("sku")
    *     .findMap();
    *
@@ -934,8 +906,7 @@ public interface Query<T> {
    * <pre>{@code
    *
    * // assuming the sku of products is unique...
-   * Product product =
-   *     ebeanServer.find(Product.class)
+   * Product product = DB.find(Product.class)
    *         .where().eq("sku", "aa113")
    *         .findOne();
    * ...
@@ -947,8 +918,7 @@ public interface Query<T> {
    * <pre>{@code
    *
    * // Fetch order 1 and additionally fetch join its order details...
-   * Order order =
-   *     ebeanServer.find(Order.class)
+   * Order order = DB.find(Order.class)
    *       .setId(1)
    *       .fetch("details")
    *       .findOne();
@@ -1114,11 +1084,9 @@ public interface Query<T> {
    * // a query with a named parameter
    * String oql = "find order where status = :orderStatus";
    *
-   * Query<Order> query = ebeanServer.find(Order.class, oql);
-   *
-   * // bind the named parameter
-   * query.bind("orderStatus", OrderStatus.NEW);
-   * List<Order> list = query.findList();
+   * List<Order> list = DB.find(Order.class, oql)
+   *   .setParameter("orderStatus", OrderStatus.NEW)
+   *   .findList();
    *
    * }</pre>
    *
@@ -1136,12 +1104,9 @@ public interface Query<T> {
    * // a query with a positioned parameter
    * String oql = "where status = ? order by id desc";
    *
-   * Query<Order> query = ebeanServer.createQuery(Order.class, oql);
-   *
-   * // bind the parameter
-   * query.setParameter(1, OrderStatus.NEW);
-   *
-   * List<Order> list = query.findList();
+   * List<Order> list = DB.createQuery(Order.class, oql)
+   *   .setParameter(1, OrderStatus.NEW)
+   *   .findList();
    *
    * }</pre>
    *
@@ -1158,8 +1123,7 @@ public interface Query<T> {
    * </p>
    * <pre>{@code
    *
-   * Order order =
-   *     ebeanServer.find(Order.class)
+   * Order order = DB.find(Order.class)
    *     .setId(1)
    *     .fetch("details")
    *     .findOne();
@@ -1180,8 +1144,7 @@ public interface Query<T> {
    * Add a single Expression to the where clause returning the query.
    * <pre>{@code
    *
-   * List<Order> newOrders =
-   *     ebeanServer.find(Order.class)
+   * List<Order> newOrders = DB.find(Order.class)
    * 		.where().eq("status", Order.NEW)
    * 		.findList();
    * ...
@@ -1196,8 +1159,7 @@ public interface Query<T> {
    * where clause.
    * <pre>{@code
    *
-   * List<Order> orders =
-   *     ebeanServer.find(Order.class)
+   * List<Order> orders = DB.find(Order.class)
    *     .where()
    *       .eq("status", Order.NEW)
    *       .ilike("customer.name","rob%")
@@ -1243,10 +1205,7 @@ public interface Query<T> {
    * </p>
    * <pre>{@code
    *
-   * List<Customer> list =
-   *     ebeanServer.find(Customer.class)
-   *     // .fetch("orders", new FetchConfig().lazy())
-   *     // .fetch("orders", new FetchConfig().query())
+   * List<Customer> list = DB.find(Customer.class)
    *     .fetch("orders")
    *     .where().ilike("name", "rob%")
    *     .filterMany("orders").eq("status", Order.Status.NEW).gt("orderDate", lastWeek)
@@ -1260,8 +1219,7 @@ public interface Query<T> {
    * </p>
    *
    * @param propertyName the name of the many property that you want to have a filter on.
-   * @return the expression list that you add filter expressions for the many
-   * to.
+   * @return the expression list that you add filter expressions for the many to.
    */
   ExpressionList<T> filterMany(String propertyName);
 
@@ -1447,10 +1405,8 @@ public interface Query<T> {
    *
    * // Assuming sku is unique for products...
    *
-   * Map<String,Product> productMap =
-   *     ebeanServer.find(Product.class)
-   *     // use sku for keys...
-   *     .setMapKey("sku")
+   * Map<String,Product> productMap = DB.find(Product.class)
+   *     .setMapKey("sku")  // sku map keys...
    *     .findMap();
    *
    * }</pre>
diff --git a/src/main/java/io/ebean/Transaction.java b/src/main/java/io/ebean/Transaction.java
index 465df6732..4ec8e2701 100644
--- a/src/main/java/io/ebean/Transaction.java
+++ b/src/main/java/io/ebean/Transaction.java
@@ -244,7 +244,7 @@ public interface Transaction extends AutoCloseable {
    *
    *   // assume Customer has L2 bean caching enabled ...
    *
-   *   try (Transaction transaction = ebeanServer.beginTransaction()) {
+   *   try (Transaction transaction = DB.beginTransaction()) {
    *
    *     // this uses L2 bean cache as the transaction
    *     // ... is considered "query only" at this point
@@ -366,13 +366,13 @@ public interface Transaction extends AutoCloseable {
    * // inserts into a table called sp_test
    * cs.addModification("sp_test", true, false, false);
    *
-   * try (Transaction txn = ebeanServer.beginTransaction()) {
+   * try (Transaction txn = DB.beginTransaction()) {
    *   txn.setBatchMode(true);
    *   txn.setBatchSize(10);
    *
    *   for (int i = 0; i < da.length;) {
    *     cs.setParameter(1, da[i]);
-   *     ebeanServer.execute(cs);
+   *     DB.execute(cs);
    *   }
    *
    *   // Note: commit implicitly flushes
diff --git a/src/main/java/io/ebean/UpdateQuery.java b/src/main/java/io/ebean/UpdateQuery.java
index 336ad38b1..1860fffe9 100644
--- a/src/main/java/io/ebean/UpdateQuery.java
+++ b/src/main/java/io/ebean/UpdateQuery.java
@@ -12,8 +12,7 @@ package io.ebean;
  * <p>
  * <pre>{@code
  *
- *  int rows = ebeanServer
- *      .update(Customer.class)
+ *  int rows = DB.update(Customer.class)
  *      .set("status", Customer.Status.ACTIVE)
  *      .set("updtime", new Timestamp(System.currentTimeMillis()))
  *      .where()
@@ -39,8 +38,7 @@ package io.ebean;
  * <p>
  * <pre>{@code
  *
- *   int rows = ebeanServer
- *       .update(Customer.class)
+ *   int rows = DB.update(Customer.class)
  *       .set("status", Customer.Status.ACTIVE)
  *       .set("updtime", new Timestamp(System.currentTimeMillis()))
  *       .where()
@@ -73,8 +71,7 @@ public interface UpdateQuery<T> {
    * <p>
    * <pre>{@code
    *
-   *   int rows = ebeanServer
-   *      .update(Customer.class)
+   *   int rows = DB.update(Customer.class)
    *      .set("status", Customer.Status.ACTIVE)
    *      .set("updtime", new Timestamp(System.currentTimeMillis()))
    *      .where()
@@ -93,8 +90,7 @@ public interface UpdateQuery<T> {
    * <p>
    * <pre>{@code
    *
-   *   int rows = ebeanServer
-   *      .update(Customer.class)
+   *   int rows = DB.update(Customer.class)
    *      .setNull("notes")
    *      .where()
    *      .gt("id", 1000)
@@ -114,8 +110,7 @@ public interface UpdateQuery<T> {
    * <p>
    * <pre>{@code
    *
-   *   int rows = ebeanServer
-   *      .update(Customer.class)
+   *   int rows = DB.update(Customer.class)
    *      .setRaw("status = coalesce(status, 'A')")
    *      .where()
    *      .gt("id", 1000)
@@ -134,8 +129,7 @@ public interface UpdateQuery<T> {
    * </p>
    * <pre>{@code
    *
-   *   int rows = ebeanServer
-   *      .update(Customer.class)
+   *   int rows = DB.update(Customer.class)
    *      .setRaw("status = coalesce(status, ?)", Customer.Status.ACTIVE)
    *      .where()
    *      .gt("id", 1000)
diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 27c1098d7..e57e4fd45 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -2422,7 +2422,7 @@ public class ServerConfig {
   }
 
   /**
-   * Return true if the ebeanServer should collection query statistics by ObjectGraphNode.
+   * Return true if query statistics should be collected by ObjectGraphNode.
    */
   public boolean isCollectQueryStatsByNode() {
     return collectQueryStatsByNode;

From a5f435dbcf742872c85e57f313ab4c79222a4225 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 7 Mar 2019 11:25:34 +1300
Subject: [PATCH 0756/1036] Javadoc update using "DB"

---
 src/main/java/io/ebean/DB.java    | 44 +++++++++++++++
 src/main/java/io/ebean/Ebean.java | 92 +------------------------------
 2 files changed, 47 insertions(+), 89 deletions(-)

diff --git a/src/main/java/io/ebean/DB.java b/src/main/java/io/ebean/DB.java
index 03822a79f..198795856 100644
--- a/src/main/java/io/ebean/DB.java
+++ b/src/main/java/io/ebean/DB.java
@@ -17,6 +17,50 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Callable;
 
+/**
+ * DB is a registry of {@link Database} by name.
+ * <p>
+ * DB additionally provides a convenient way to use the 'default' Database.
+ * <p>
+ *   <h3>Default database</h3>
+ *   <p>
+ *     One of the Database instances can be registered as the "default database"
+ *     and can be obtained using <code>DB.getDefault()</code>
+ *   </p>
+ * <pre>{@code
+ *
+ * Database database = DB.getDefault();
+ *
+ * }</pre>
+ *
+ * <h3>Named database</h3>
+ * <p>
+ *   Multiple database instances can be registered with DB and we can obtain them
+ *   using <code>DB.byName()</code>
+ * </p>
+ * <pre>{@code
+ *
+ * Database hrDatabase = DB.byName("hr");
+ *
+ * }</pre>
+ *
+ * <h3>Convenience methods</h3>
+ * <p>
+ *   DB has methods like {@link #find(Class)} and {@link #save(Object)} which are
+ *   just convenience for using the default database.
+ * </p>
+ *
+ * <pre>{@code
+ *
+ *   // fetch using the default database
+ *   Order order = DB.find(Order.class, 10);
+ *
+ *   // is the same as
+ *   Database database = DB.getDefault();
+ *   Order order = database.find(Order.class, 10);
+ *
+ * }</pre>
+ */
 public class DB {
 
   /**
diff --git a/src/main/java/io/ebean/Ebean.java b/src/main/java/io/ebean/Ebean.java
index 2751cd3bf..eb85c9509 100644
--- a/src/main/java/io/ebean/Ebean.java
+++ b/src/main/java/io/ebean/Ebean.java
@@ -24,97 +24,11 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * This Ebean object is effectively a singleton that holds a map of registered
- * {@link EbeanServer}s. It additionally provides a convenient way to use the
- * 'default' EbeanServer.
+ * Ebean is a registry of {@link Database} by name. Ebean has now been renamed to {@link DB}.
  * <p>
- * If you are using a Dependency Injection framework such as
- * <strong>Spring</strong> or <strong>Guice</strong> you will probably
- * <strong>NOT</strong> use this Ebean singleton object. Instead you will
- * configure and construct EbeanServer instances using {@link ServerConfig} and
- * {@link EbeanServerFactory} and inject those EbeanServer instances into your
- * data access objects.
- * </p>
+ * Ebean is effectively this is an alias for {@link DB} which is the new and improved name for Ebean.
  * <p>
- * In documentation "Ebean singleton" refers to this object.
- * </p>
- * <ul>
- * <li>There is one EbeanServer per Database (javax.sql.DataSource).</li>
- * <li>EbeanServers can be 'registered' with the Ebean singleton (put into its
- * map). Registered EbeanServer's can later be retrieved via
- * {@link #getServer(String)}.</li>
- * <li>One EbeanServer can be referred to as the 'default' EbeanServer. For
- * convenience, the Ebean singleton (this object) provides methods such as
- * {@link #find(Class)} that proxy through to the 'default' EbeanServer. This
- * can be useful for applications that use a single database.</li>
- * </ul>
- * <p>
- * For developer convenience Ebean has static methods that proxy through to the
- * methods on the <em>'default'</em> EbeanServer. These methods are provided for
- * developers who are mostly using a single database. Many developers will be
- * able to use the methods on Ebean rather than get a EbeanServer.
- * </p>
- * <p>
- * EbeanServers can be created and used without ever needing or using the Ebean
- * singleton. Refer to {@link ServerConfig#setRegister(boolean)}.
- * </p>
- * <p>
- * You can either programmatically create/register EbeanServers via
- * {@link EbeanServerFactory} or they can automatically be created and
- * registered when you first use the Ebean singleton. When EbeanServers are
- * created automatically they are configured using information in the
- * ebean.properties file.
- * </p>
- * <pre>{@code
- *
- *   // fetch shipped orders (and also their customer)
- *   List<Order> list = Ebean.find(Order.class)
- * 	  .fetch("customer")
- * 	  .where()
- * 	  .eq("status.code", Order.Status.SHIPPED)
- * 	  .findList();
- *
- *   // read/use the order list ...
- *   for (Order order : list) {
- * 	   Customer customer = order.getCustomer();
- * 	   ...
- *   }
- *
- * }</pre>
- * <pre>{@code
- *
- *   // fetch order 10, modify and save
- *   Order order = Ebean.find(Order.class, 10);
- *
- *   OrderStatus shipped = Ebean.getReference(OrderStatus.class,"SHIPPED");
- *   order.setStatus(shipped);
- *   order.setShippedDate(shippedDate);
- *   ...
- *
- *   // implicitly creates a transaction and commits
- *   Ebean.save(order);
- *
- * }</pre>
- * <p>
- * When you have multiple databases and need access to a specific one the
- * {@link #getServer(String)} method provides access to the EbeanServer for that
- * specific database.
- * </p>
- * <pre>{@code
- *
- *   // Get access to the Human Resources EbeanServer/Database
- *   EbeanServer hrDb = Ebean.getServer("hr");
- *
- *   // fetch contact 3 from the HR database
- *   Contact contact = hrDb.find(Contact.class, 3);
- *
- *   contact.setName("I'm going to change");
- *   ...
- *
- *   // save the contact back to the HR database
- *   hrDb.save(contact);
- *
- * }</pre>
+ * The preference is to use DB and Database rather than Ebean and EbeanServer.
  */
 public final class Ebean {
   private static final Logger logger = LoggerFactory.getLogger(Ebean.class);

From e3ca5d2419fcd5ace6f276c8c9c52fae3dde1249 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 7 Mar 2019 12:01:05 +1300
Subject: [PATCH 0757/1036] Javadoc update using "DB" and hide DB constructor

---
 src/main/java/io/ebean/DB.java       | 146 ++++++++++++---------------
 src/main/java/io/ebean/overview.html | 126 ++---------------------
 src/main/java/io/ebean/package.html  |  60 ++++-------
 3 files changed, 91 insertions(+), 241 deletions(-)

diff --git a/src/main/java/io/ebean/DB.java b/src/main/java/io/ebean/DB.java
index 198795856..db386a5e5 100644
--- a/src/main/java/io/ebean/DB.java
+++ b/src/main/java/io/ebean/DB.java
@@ -22,11 +22,11 @@ import java.util.concurrent.Callable;
  * <p>
  * DB additionally provides a convenient way to use the 'default' Database.
  * <p>
- *   <h3>Default database</h3>
- *   <p>
- *     One of the Database instances can be registered as the "default database"
- *     and can be obtained using <code>DB.getDefault()</code>
- *   </p>
+ * <h3>Default database</h3>
+ * <p>
+ * One of the Database instances can be registered as the "default database"
+ * and can be obtained using <code>DB.getDefault()</code>
+ * </p>
  * <pre>{@code
  *
  * Database database = DB.getDefault();
@@ -35,8 +35,8 @@ import java.util.concurrent.Callable;
  *
  * <h3>Named database</h3>
  * <p>
- *   Multiple database instances can be registered with DB and we can obtain them
- *   using <code>DB.byName()</code>
+ * Multiple database instances can be registered with DB and we can obtain them
+ * using <code>DB.byName()</code>
  * </p>
  * <pre>{@code
  *
@@ -46,23 +46,29 @@ import java.util.concurrent.Callable;
  *
  * <h3>Convenience methods</h3>
  * <p>
- *   DB has methods like {@link #find(Class)} and {@link #save(Object)} which are
- *   just convenience for using the default database.
+ * DB has methods like {@link #find(Class)} and {@link #save(Object)} which are
+ * just convenience for using the default database.
  * </p>
  *
  * <pre>{@code
  *
- *   // fetch using the default database
- *   Order order = DB.find(Order.class, 10);
+ * // fetch using the default database
+ * Order order = DB.find(Order.class, 10);
  *
- *   // is the same as
- *   Database database = DB.getDefault();
- *   Order order = database.find(Order.class, 10);
+ * // is the same as
+ * Database database = DB.getDefault();
+ * Order order = database.find(Order.class, 10);
  *
  * }</pre>
  */
 public class DB {
 
+  /**
+   * Hide constructor.
+   */
+  private DB() {
+  }
+
   /**
    * Return the default database.
    */
@@ -150,22 +156,21 @@ public class DB {
    * </p>
    * <pre>{@code
    *
-   *   try (Transaction txn = DB.beginTransaction()) {
-   * 	   Order order = DB.find(Order.class,10); ...
+   *   try (Transaction transaction = DB.beginTransaction()) {
    *
-   * 	   DB.save(order);
+   *     Order order = DB.find(Order.class, 42);
+   *     order.setStatus(Status.COMPLETE);
+   *     order.save();
    *
-   * 	   txn.commit();
+   *     transaction.commit();
    *   }
    *
    * }</pre>
    * <p>
-   * If you want to externalise the transaction management then you should be
-   * able to do this via Database. Specifically with Database you can pass
-   * the transaction to the various find() and save() execute() methods. This
-   * gives you the ability to create the transactions yourself externally from
-   * Ebean and pass those transactions through to the various methods available
-   * on Database.
+   * If we want to externalise the transaction management then we do this via Database.
+   * With Database we can pass the transaction to the various find(), save() and execute()
+   * methods. This gives us the ability to create the transactions externally from Ebean
+   * and use the transaction explicitly via the various methods available on Database.
    * </p>
    */
   public static Transaction beginTransaction() {
@@ -194,29 +199,24 @@ public class DB {
    * // suspend it until this transaction ends
    *
    * try (Transaction txn = DB.beginTransaction(TxScope.requiresNew())) {
-   *
    *   ...
    *
    *   // commit the transaction
    *   txn.commit();
    * }
-   *
    * }</pre>
+   *
    * <h3>REQUIRED example:</h3>
    * <pre>{@code
-   *
    * // start a new transaction if there is not a current transaction
    *
    * try (Transaction txn = DB.beginTransaction(TxScope.required())) {
-   *
    *   ...
    *
    *   // commit the transaction if it was created or
    *   // do nothing if there was already a current transaction
    *   txn.commit();
-   *
    * }
-   *
    * }</pre>
    */
   public static Transaction beginTransaction(TxScope scope) {
@@ -335,18 +335,6 @@ public class DB {
    * OneToMany, OneToOne or ManyToMany annotation.
    * </p>
    * <p>
-   * In this example below the details property has a CascadeType.ALL set so
-   * saving an order will also save all its details.
-   * </p>
-   * <pre>{@code
-   *   public class Order { ...
-   *
-   * 	   @OneToMany(cascade=CascadeType.ALL, mappedBy="order")
-   * 	   List<OrderDetail> details;
-   * 	   ...
-   *   }
-   * }</pre>
-   * <p>
    * When a save cascades via a OneToMany or ManyToMany Ebean will automatically
    * set the 'parent' object to the 'detail' object. In the example below in
    * saving the order and cascade saving the order details the 'parent' order
@@ -1087,15 +1075,15 @@ public class DB {
    * </p>
    * <pre>{@code
    *
-   *   // set specific transactional scope settings
-   *   TxScope scope = TxScope.requiresNew().setIsolation(TxIsolation.SERIALIZABLE);
+   * // set specific transactional scope settings
+   * TxScope scope = TxScope.requiresNew().setIsolation(TxIsolation.SERIALIZABLE);
    *
-   *   DB.execute(scope, new TxRunnable() {
-   * 	   public void run() {
-   * 		   User u1 = DB.find(User.class, 1);
-   * 		   ...
-   * 	   }
-   *   });
+   * DB.execute(scope, new TxRunnable() {
+   *   public void run() {
+   * 	   User u1 = DB.find(User.class, 1);
+   *     ...
+   *   }
+   * });
    *
    * }</pre>
    */
@@ -1111,19 +1099,17 @@ public class DB {
    * </p>
    * <pre>{@code
    *
-   *   DB.execute(() -> {
+   * DB.execute(() -> {
    *
-   *       User u1 = DB.find(User.class, 1);
-   *       User u2 = DB.find(User.class, 2);
+   *   User u1 = DB.find(User.class, 1);
+   *   User u2 = DB.find(User.class, 2);
    *
-   *       u1.setName("u1 mod");
-   *       u2.setName("u2 mod");
-   *
-   *       DB.save(u1);
-   *       DB.save(u2);
-   *
-   *   });
+   *   u1.setName("u1 mod");
+   *   u2.setName("u2 mod");
    *
+   *   DB.save(u1);
+   *   DB.save(u2);
+   * });
    * }</pre>
    */
   public static void execute(Runnable r) {
@@ -1138,17 +1124,16 @@ public class DB {
    * </p>
    * <pre>{@code
    *
-   *   // set specific transactional scope settings
-   *   TxScope scope = TxScope.requiresNew().setIsolation(TxIsolation.SERIALIZABLE);
-   *
-   *   DB.executeCall(scope, new Callable<String>() {
-   * 	   public String call() {
-   * 		   User u1 = DB.find(User.class, 1);
-   * 		   ...
-   * 		   return u1.getEmail();
-   * 	   }
-   *   });
+   * // set specific transactional scope settings
+   * TxScope scope = TxScope.requiresNew().setIsolation(TxIsolation.SERIALIZABLE);
    *
+   * DB.executeCall(scope, new Callable<String>() {
+   *   public String call() {
+   * 	   User u1 = DB.find(User.class, 1);
+   * 		 ...
+   * 		 return u1.getEmail();
+   *   }
+   * });
    * }</pre>
    */
   public static <T> T executeCall(TxScope scope, Callable<T> c) {
@@ -1167,21 +1152,19 @@ public class DB {
    * </p>
    * <pre>{@code
    *
-   *   DB.executeCall(() -> {
+   * DB.executeCall(() -> {
    *
-   *       User u1 = DB.find(User.class, 1);
-   *       User u2 = DB.find(User.class, 2);
+   *   User u1 = DB.find(User.class, 1);
+   *   User u2 = DB.find(User.class, 2);
    *
-   *       u1.setName("u1 mod");
-   *       u2.setName("u2 mod");
+   *   u1.setName("u1 mod");
+   *   u2.setName("u2 mod");
    *
-   *       DB.save(u1);
-   *       DB.save(u2);
-   *
-   *       return u1.getEmail();
-   *
-   *   });
+   *   DB.save(u1);
+   *   DB.save(u2);
    *
+   *   return u1.getEmail();
+   * });
    * }</pre>
    */
   public static <T> T executeCall(Callable<T> c) {
@@ -1219,7 +1202,6 @@ public class DB {
    * @param deletes   true if rows on the table where deleted
    */
   public static void externalModification(String tableName, boolean inserts, boolean updates, boolean deletes) {
-
     getDefault().externalModification(tableName, inserts, updates, deletes);
   }
 
diff --git a/src/main/java/io/ebean/overview.html b/src/main/java/io/ebean/overview.html
index 0c0a17139..3db912a27 100644
--- a/src/main/java/io/ebean/overview.html
+++ b/src/main/java/io/ebean/overview.html
@@ -3,130 +3,24 @@
   <title>Ebean API</title>
 </head>
 <body BGCOLOR="#ffffff">
-Ebean Object Relational Mapping (start at
-<a href='com/avaje/ebean/EbeanServer.html'>EbeanServer</a> or <a href='com/avaje/ebean/Ebean.html'>Ebean</a>).
+Ebean Object Relational Mapping -
+<a href='io/ebean/Database.html'>Database</a> or <a href='io/ebean/DB.html'>DB</a>).
 
 
-<h3>Ebean</h3>
+<h4><a href='io/ebean/Database.html'>Database</a></h4>
 <p>
-  Provides the main API for fetching and persisting beans with Ebean.
+  Database provides the main API for fetching and persisting beans.
 </p>
+
+<h4><a href='io/ebean/DB.html'>DB</a></h4>
 <p>
-  For a full description of the query language refer to <a href="com/avaje/ebean/Query.html">Query</a>.
+  DB holds a registry of Database instances by name.
 </p>
+
+<h4><a href='https://ebean.io/docs/query'>Query</a></h4>
 <p>
-  &nbsp;
+  Review the documentation for the query capabilities.
 </p>
-<div id="overviewexamples">
-  <h3>
-    EXAMPLE 1: Simple fetch
-  </h3>
-  <pre>{@code
-// fetch order 10
-Order order = Ebean.find(Order.class, 10);
-}</pre>
-
-  <h3>
-    EXAMPLE 2: Fetch an Object with associations
-  </h3>
-  <pre>{@code
-// fetch Customer 7 including their billing and shipping addresses
-Customer customer = Ebean.find(Customer.class)
-    .fetch("billingAddress");
-    .fetch("shippingAddress");
-    .setId(7)
-    .findOne();
-
-
-Address billAddr = customer.getBillingAddress();
-Address shipAddr = customer.getShippingAddress();
-}</pre>
-
-  <h3>
-    EXAMPLE 3: Fetch a list of Objects with associations
-  </h3>
-  <pre>{@code
-// Note: This example shows a "Partial Object".
-//       For the product objects associated with the
-//       order details only the product id and name is
-//       fetched (the product objects are partially populated).
-
-// fetch orders for customer.id = 2
-List<Order> orderList = Ebean.find(Order.class);
-    .fetch("customer")
-    .fetch("customer.shippingAddress")
-    .fetch("details")
-    .fetch("details.product","name")
-    .where().eq("customer.id",2)
-    .findList();
-
-
-// Note: Only the product id and name is fetched for the
-//       product details. This is referred to as a
-//       "Partial Object" (one that is partially populated).
-
-
-// code that traverses the object graph...
-
-Order order = orderList.get(0);
-Customer customer = order.getCustomer();
-Address shipAddr = customer.getShippingAddress();
-
-List<OrderDetail> details = order.getDetails();
-OrderDetail detail = details.get(0);
-Product product = detail.getProduct();
-String productName = product.getName();
-
-}</pre>
-
-  <h3>
-    EXAMPLE 4: Create and save an Order
-  </h3>
-  <pre>{@code
-// get a Customer reference so we don't hit the database
-Customer custRef = Ebean.getReference(Customer.class, 7);
-
-// create a new Order object
-Order newOrder = new Order();
-newOrder.setStatus(Order.Status.NEW);
-newOrder.setCustomer(custRef);
-
-ArrayList orderLines = new ArrayList();
-newOrder.setLines(orderLines);
-...
-
-// add a line to the order
-Product prodRef = Ebean.getReference(Product.class, 41);
-OrderLine line = new OrderLine();
-line.setProduct(prodRef);
-line.setQuantity(10);
-orderLines.add(line);
-...
-
-// save the order and its lines in a single transaction
-// NB: assumes CascadeType.PERSIST is set on the order lines association
-Ebean.save(newOrder);
-
-}</pre>
-
-  <h3>
-    EXAMPLE 5: Use another database
-  </h3>
-  <pre>{@code
-// Get access to the Human Resources EbeanServer/Database
-EbeanServer hrServer = Ebean.getServer("HR");
-
-
-// fetch contact 3 from the HR database
-Contact contact = hrServer.find(Contact.class, 3);
-
-contact.setStatus(Contact.Status.INACTIVE);
-...
-
-// save the contact back to the HR database
-hrServer.save(contact);
-}</pre>
-</div>
 
 
 </body>
diff --git a/src/main/java/io/ebean/package.html b/src/main/java/io/ebean/package.html
index 4aa8efb94..f1524bdc6 100644
--- a/src/main/java/io/ebean/package.html
+++ b/src/main/java/io/ebean/package.html
@@ -12,21 +12,29 @@ Core API (see <a href="Database.html">Database</a>, <a href="DB.html">DB</a> and
 </p>
 
 <pre>{@code
-// EXAMPLE 1: Simple fetch.
-//========================
 
-// fetch order 10
+// Example find by id
+
 Order order = DB.find(Order.class, 10);
 
 
+// Example save
 
-// EXAMPLE 2: Fetch an Object with associations
-//=============================================
+Customer customer = DB.getReference(Customer.class, 42);
 
-// fetch Customer 7 including their billing and shipping addresses
-Customer customer =
-	DB.find(Customer.class)
-		.setId(7)
+Order newOrder = new Order();
+newOrder.setStatus(Order.Status.NEW);
+newOrder.setCustomer(customer);
+...
+
+DB.save(newOrder);
+
+
+// Example: Eagerly fetching associations
+
+// fetch Customer 42 including their billing and shipping addresses
+Customer customer = DB.find(Customer.class)
+		.setId(42)
 		.fetch("billingAddress")
 		.fetch("shippingAddress")
 		.findOne();
@@ -34,40 +42,6 @@ Customer customer =
 Address billAddr = customer.getBillingAddress();
 Address shipAddr = customer.getShippingAddress();
 
-
-
-
-// EXAMPLE 3: Create and save an Order
-//=====================================
-
-// get a Customer reference so we don't hit the database
-Customer customer = DB.getReference(Customer.class, 7);
-
-// create a new Order object
-Order newOrder = new Order();
-newOrder.setStatus(Order.Status.NEW);
-newOrder.setCustomer(customer);
-...
-
-
-DB.save(newOrder);
-
-
-
-// EXAMPLE 4: Use another database
-//=================================
-
-// Get access to the Human Resources EbeanServer/Database
-Database hrDatabase = DB.byName("HR");
-
-
-Contact contact = hrDatabase.find(Contact.class, 42);
-
-contact.setStatus(Contact.Status.INACTIVE);
-...
-
-// save the contact back to the HR database
-hrDatabase.save(contact);
 }</pre>
 
 </Body>

From 17e0953cadeb00297dea7f9f263104281e43bc4a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 7 Mar 2019 16:26:05 +1300
Subject: [PATCH 0758/1036] Javadoc update - reduce generated packages

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6f0e7d3d6..295cb9b88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -393,7 +393,7 @@
           <overview>src/main/java/io/ebean/overview.html</overview>
           <source>1.8</source>
           <doclet>org.avaje.doclet.PygmentsDoclet</doclet>
-          <excludePackageNames>io.ebeaninternal.*:com.avaje.ebean.util</excludePackageNames>
+          <excludePackageNames>io.ebeaninternal.*:io.ebeanservice:io.ebean.common:io.ebean.bean:io.ebean.service:io.ebean.metric:io.ebean.util:io.ebean.config.properties:io.ebean.config.dbplatform*</excludePackageNames>
           <docletArtifact>
             <groupId>org.avaje</groupId>
             <artifactId>pygments-doclet</artifactId>

From 33ff113585ae960c79bf55c521f11cb60a49ad14 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 7 Mar 2019 16:51:33 +1300
Subject: [PATCH 0759/1036] #1648 - Change BeanFinder and BeanRepository to use
 Database rather than EbeanServer

---
 src/main/java/io/ebean/BeanFinder.java     | 37 ++++++++++------------
 src/main/java/io/ebean/BeanRepository.java | 28 ++++++++--------
 2 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/src/main/java/io/ebean/BeanFinder.java b/src/main/java/io/ebean/BeanFinder.java
index 0afcc7227..2c8e04eec 100644
--- a/src/main/java/io/ebean/BeanFinder.java
+++ b/src/main/java/io/ebean/BeanFinder.java
@@ -15,8 +15,8 @@ import java.util.Optional;
  * public class CustomerFinder extends BeanFinder<Long,Customer> {
  *
  *   @Inject
- *   public CustomerFinder(EbeanServer server) {
- *     super(Customer.class, server);
+ *   public CustomerFinder(Database database) {
+ *     super(Customer.class, database);
  *   }
  *
  *   // ... add customer specific finders
@@ -29,25 +29,25 @@ import java.util.Optional;
  */
 public abstract class BeanFinder<I,T> {
 
-  protected final EbeanServer server;
+  protected final Database server;
 
   protected final Class<T> type;
 
   /**
-   * Create with the given bean type and EbeanServer instance.
+   * Create with the given bean type and Database instance.
    *
    * @param type The bean type
-   * @param server The EbeanServer instance typically created via Spring factory or equivalent.
+   * @param server The Database instance typically created via Spring factory or equivalent.
    */
-  protected BeanFinder(Class<T> type, EbeanServer server) {
+  protected BeanFinder(Class<T> type, Database server) {
     this.type = type;
     this.server = server;
   }
 
   /**
-   * Return the EbeanServer to use.
+   * Return the Database to use.
    */
-  public EbeanServer db() {
+  public Database db() {
     return server;
   }
 
@@ -66,21 +66,20 @@ public abstract class BeanFinder<I,T> {
   }
 
   /**
-   * Return typically a different EbeanServer to the default.
+   * Return typically a different Database to the default.
    * <p>
-   * This is equivalent to {@link Ebean#getServer(String)}
+   * This is equivalent to {@link DB#byName(String)}
    *
-   * @param server The name of the EbeanServer. If this is null then the default EbeanServer is
-   *               returned.
+   * @param server The name of the Database. If this is null then the default Database is returned.
    */
-  public EbeanServer db(String server) {
-    return Ebean.getServer(server);
+  public Database db(String server) {
+    return DB.byName(server);
   }
 
   /**
    * Creates an entity reference for this ID.
    * <p>
-   * Equivalent to {@link EbeanServer#getReference(Class, Object)}
+   * Equivalent to {@link Database#getReference(Class, Object)}
    */
   @Nonnull
   public T ref(I id) {
@@ -89,8 +88,6 @@ public abstract class BeanFinder<I,T> {
 
   /**
    * Retrieves an entity by ID.
-   * <p>
-   * Equivalent to {@link EbeanServer#find(Class, Object)}
    */
   @Nullable
   public T findById(I id) {
@@ -107,8 +104,6 @@ public abstract class BeanFinder<I,T> {
 
   /**
    * Delete a bean by Id.
-   * <p>
-   * Equivalent to {@link EbeanServer#delete(Class, Object)}
    */
   public void deleteById(I id) {
     db().delete(type, id);
@@ -138,7 +133,7 @@ public abstract class BeanFinder<I,T> {
    * }</pre>
    *
    * <p>
-   * Equivalent to {@link EbeanServer#update(Class)}
+   * Equivalent to {@link Database#update(Class)}
    */
   protected UpdateQuery<T> updateQuery() {
     return db().update(type);
@@ -147,7 +142,7 @@ public abstract class BeanFinder<I,T> {
   /**
    * Creates a query.
    * <p>
-   * Equivalent to {@link EbeanServer#find(Class)}
+   * Equivalent to {@link Database#find(Class)}
    */
   protected Query<T> query() {
     return db().find(type);
diff --git a/src/main/java/io/ebean/BeanRepository.java b/src/main/java/io/ebean/BeanRepository.java
index 4fd46bcba..b89a49b39 100644
--- a/src/main/java/io/ebean/BeanRepository.java
+++ b/src/main/java/io/ebean/BeanRepository.java
@@ -13,7 +13,7 @@ import java.util.Collection;
  * public class CustomerRepository extends BeanRepository<Long,Customer> {
  *
  *   @Inject
- *   public CustomerRepository(EbeanServer server) {
+ *   public CustomerRepository(Database server) {
  *     super(Customer.class, server);
  *   }
  *
@@ -34,23 +34,23 @@ import java.util.Collection;
 public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
 
   /**
-   * Create with the given bean type and EbeanServer instance.
+   * Create with the given bean type and Database instance.
    * <p>
    * Typically users would extend BeanRepository rather than BeanFinder.
    * </p>
    * <pre>{@code
    *
    *   @Inject
-   *   public CustomerRepository(EbeanServer server) {
+   *   public CustomerRepository(Database server) {
    *     super(Customer.class, server);
    *   }
    *
    * }</pre>
    *
    * @param type   The bean type
-   * @param server The EbeanServer instance typically created via Spring factory or equivalent
+   * @param server The Database instance typically created via Spring factory or equivalent
    */
-  protected BeanRepository(Class<T> type, EbeanServer server) {
+  protected BeanRepository(Class<T> type, Database server) {
     super(type, server);
   }
 
@@ -75,7 +75,7 @@ public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
    *
    * }</pre>
    *
-   * @see EbeanServer#markAsDirty(Object)
+   * @see Database#markAsDirty(Object)
    */
   public void markAsDirty(T bean) {
     db().markAsDirty(bean);
@@ -111,7 +111,7 @@ public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
    * Ebean will detect if this is a new bean or a previously fetched bean and perform either an
    * insert or an update based on that.
    *
-   * @see EbeanServer#save(Object)
+   * @see Database#save(Object)
    */
   public void save(T bean) {
     db().save(bean);
@@ -127,7 +127,7 @@ public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
   /**
    * Update this entity.
    *
-   * @see EbeanServer#update(Object)
+   * @see Database#update(Object)
    */
   public void update(T bean) {
     db().update(bean);
@@ -136,7 +136,7 @@ public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
   /**
    * Insert this entity.
    *
-   * @see EbeanServer#insert(Object)
+   * @see Database#insert(Object)
    */
   public void insert(T bean) {
     db().insert(bean);
@@ -157,7 +157,7 @@ public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
    * deleted. Note that, if JDBC batch mode is used then this always returns true.
    * </p>
    *
-   * @see EbeanServer#delete(Object)
+   * @see Database#delete(Object)
    */
   public boolean delete(T bean) {
     return db().delete(bean);
@@ -177,7 +177,7 @@ public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
    * want to perform a hard/permanent delete.
    * </p>
    *
-   * @see EbeanServer#deletePermanent(Object)
+   * @see Database#deletePermanent(Object)
    */
   public boolean deletePermanent(T bean) {
     return db().deletePermanent(bean);
@@ -189,7 +189,7 @@ public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
    * Ebean will detect if this is a new bean or a previously fetched bean and perform either an
    * insert or an update based on that.
    *
-   * @see EbeanServer#merge(Object)
+   * @see Database#merge(Object)
    */
   public void merge(T bean) {
     db().merge(bean);
@@ -201,7 +201,7 @@ public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
    * Ebean will detect if this is a new bean or a previously fetched bean and perform either an
    * insert or an update based on that.
    *
-   * @see EbeanServer#merge(Object, MergeOptions)
+   * @see Database#merge(Object, MergeOptions)
    */
   public void merge(T bean, MergeOptions options) {
     db().merge(bean, options);
@@ -210,7 +210,7 @@ public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
   /**
    * Refreshes this entity from the database.
    *
-   * @see EbeanServer#refresh(Object)
+   * @see Database#refresh(Object)
    */
   public void refresh(T bean) {
     db().refresh(bean);

From 119049b6965539823377b6b097725f543b385ccf Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 7 Mar 2019 16:53:13 +1300
Subject: [PATCH 0760/1036] Javadoc update using "Database" vs "EbeanServer"

---
 src/main/java/io/ebean/BeanState.java         |  2 +-
 src/main/java/io/ebean/DatabaseFactory.java   |  2 +-
 src/main/java/io/ebean/Ebean.java             | 17 +++--
 src/main/java/io/ebean/Expr.java              |  5 +-
 src/main/java/io/ebean/ExtendedServer.java    |  6 +-
 src/main/java/io/ebean/Model.java             |  8 +--
 src/main/java/io/ebean/Query.java             | 10 +--
 src/main/java/io/ebean/Transaction.java       |  3 +-
 .../io/ebean/bean/BeanCollectionLoader.java   |  2 +-
 src/main/java/io/ebean/bean/BeanLoader.java   |  2 +-
 .../ebean/common/AbstractBeanCollection.java  |  2 +-
 .../java/io/ebean/config/AutoConfigure.java   |  2 +-
 .../java/io/ebean/config/AutoTuneConfig.java  |  2 +-
 .../java/io/ebean/config/ContainerConfig.java |  2 +-
 .../io/ebean/config/DbMigrationConfig.java    |  2 +-
 .../java/io/ebean/config/ServerConfig.java    | 62 +++++++++----------
 src/main/java/io/ebean/config/package.html    |  4 +-
 .../io/ebean/event/BeanPersistController.java |  2 +-
 .../event/BeanPostConstructListener.java      |  6 +-
 .../java/io/ebean/meta/MetaInfoManager.java   |  2 +-
 src/main/java/io/ebean/meta/package-info.java |  2 +-
 src/main/java/io/ebean/plugin/Plugin.java     |  2 +-
 src/main/java/io/ebean/plugin/SpiServer.java  |  6 +-
 .../java/io/ebean/plugin/package-info.java    |  2 +-
 .../java/io/ebean/service/SpiContainer.java   |  2 +-
 25 files changed, 77 insertions(+), 80 deletions(-)

diff --git a/src/main/java/io/ebean/BeanState.java b/src/main/java/io/ebean/BeanState.java
index ac3b50470..da8c24d81 100644
--- a/src/main/java/io/ebean/BeanState.java
+++ b/src/main/java/io/ebean/BeanState.java
@@ -102,7 +102,7 @@ public interface BeanState {
   /**
    * Advanced - Used to programmatically build a partially or fully loaded
    * entity bean. First create an entity bean via
-   * {@link EbeanServer#createEntityBean(Class)}, then populate its properties
+   * {@link Database#createEntityBean(Class)}, then populate its properties
    * and then call this method specifying which properties where loaded or null
    * for a fully loaded entity bean.
    */
diff --git a/src/main/java/io/ebean/DatabaseFactory.java b/src/main/java/io/ebean/DatabaseFactory.java
index 8bd1721b8..d050c7e24 100644
--- a/src/main/java/io/ebean/DatabaseFactory.java
+++ b/src/main/java/io/ebean/DatabaseFactory.java
@@ -55,7 +55,7 @@ public class DatabaseFactory {
   }
 
   /**
-   * Shutdown gracefully all EbeanServers cleaning up any resources as required.
+   * Shutdown gracefully all Database instances cleaning up any resources as required.
    * <p>
    * This is typically invoked via JVM shutdown hook and not explicitly called.
    * </p>
diff --git a/src/main/java/io/ebean/Ebean.java b/src/main/java/io/ebean/Ebean.java
index eb85c9509..2fc69a7bf 100644
--- a/src/main/java/io/ebean/Ebean.java
+++ b/src/main/java/io/ebean/Ebean.java
@@ -38,13 +38,12 @@ public final class Ebean {
   }
 
   /**
-   * Manages creation and cache of EbeanServers.
+   * Manages creation and cache of Databases.
    */
   private static final Ebean.ServerManager serverMgr = new Ebean.ServerManager();
 
   /**
-   * Helper class for managing fast and safe access and creation of
-   * EbeanServers.
+   * Helper class for managing fast and safe access and creation of Databases.
    */
   private static final class ServerManager {
 
@@ -61,7 +60,7 @@ public final class Ebean {
     private final Object monitor = new Object();
 
     /**
-     * The 'default' EbeanServer.
+     * The 'default' Database.
      */
     private EbeanServer defaultServer;
 
@@ -80,20 +79,20 @@ public final class Ebean {
         throw e;
 
       } catch (DataSourceConfigurationException e) {
-        String msg = "Configuration error creating DataSource for the default EbeanServer." +
+        String msg = "Configuration error creating DataSource for the default Database." +
           " This typically means a missing application-test.yaml or missing ebean-test-config dependency." +
           " See https://ebean.io/docs/trouble-shooting#datasource";
         throw new DataSourceConfigurationException(msg, e);
 
       } catch (Throwable e) {
-        logger.error("Error trying to create the default EbeanServer", e);
+        logger.error("Error trying to create the default Database", e);
         throw new RuntimeException(e);
       }
     }
 
     private EbeanServer getDefaultServer() {
       if (defaultServer == null) {
-        String msg = "The default EbeanServer has not been defined?";
+        String msg = "The default Database has not been defined?";
         msg += " This is normally set via the ebean.datasource.default property.";
         msg += " Otherwise it should be registered programmatically via registerServer()";
         throw new PersistenceException(msg);
@@ -115,7 +114,7 @@ public final class Ebean {
     }
 
     /**
-     * Synchronized read, create and put of EbeanServers.
+     * Synchronized read, create and put of Databases.
      */
     private EbeanServer getWithCreate(String name) {
 
@@ -154,7 +153,7 @@ public final class Ebean {
   }
 
   /**
-   * Get the EbeanServer for a given DataSource. If name is null this will
+   * Get the Database for a given DataSource. If name is null this will
    * return the 'default' EbeanServer.
    * <p>
    * This is provided to access EbeanServer for databases other than the
diff --git a/src/main/java/io/ebean/Expr.java b/src/main/java/io/ebean/Expr.java
index b50f1231b..ab8887c49 100644
--- a/src/main/java/io/ebean/Expr.java
+++ b/src/main/java/io/ebean/Expr.java
@@ -13,9 +13,8 @@ import java.util.Map;
  * {@link Query#where()}.
  * </p>
  * <p>
- * This provides a convenient way to create expressions for the 'Default'
- * server. It is actually a short cut for using the ExpressionFactory of the
- * 'default' EbeanServer.
+ * This provides a convenient way to create expressions for the default
+ * database.
  * <p>
  * See also {@link DB#getExpressionFactory()}
  * </p>
diff --git a/src/main/java/io/ebean/ExtendedServer.java b/src/main/java/io/ebean/ExtendedServer.java
index ce14e17d0..ae1c1a6b6 100644
--- a/src/main/java/io/ebean/ExtendedServer.java
+++ b/src/main/java/io/ebean/ExtendedServer.java
@@ -15,7 +15,7 @@ import java.util.function.Consumer;
 import java.util.function.Predicate;
 
 /**
- * The extended API for EbeanServer.
+ * The extended API for Database.
  * <p>
  * This provides the finder methods that take an explicit transaction rather than obtaining
  * the transaction from the usual mechanism (which is ThreadLocal based).
@@ -26,7 +26,7 @@ import java.util.function.Predicate;
  * the transaction to use.
  * </p>
  * <p>
- * Note that in all cases the transaction supplied can be null and in this case the EbeanServer
+ * Note that in all cases the transaction supplied can be null and in this case the Database
  * will use the normal mechanism to obtain the transaction to use.
  * </p>
  */
@@ -411,7 +411,7 @@ public interface ExtendedServer {
   /**
    * Execute the update query returning the number of rows updated.
    * <p>
-   * The update query must be created using {@link EbeanServer#update(Class)}.
+   * The update query must be created using {@link Database#update(Class)}.
    * </p>
    *
    * @param query       the update query to execute
diff --git a/src/main/java/io/ebean/Model.java b/src/main/java/io/ebean/Model.java
index 80cfd3aec..60d200869 100644
--- a/src/main/java/io/ebean/Model.java
+++ b/src/main/java/io/ebean/Model.java
@@ -11,15 +11,15 @@ import io.ebean.bean.EntityBean;
  * Ebean users.
  * <p>
  * Note that there is a ebean-mocker project that enables you to use Mockito or similar
- * tools to still mock out the underlying 'default EbeanServer' for testing purposes.
+ * tools to still mock out the underlying 'default Database' for testing purposes.
  * <p>
  * You may choose not use this Model mapped superclass if you don't like the 'Active Record' style
  * or if you believe it 'pollutes' your entity beans.
  * <p>
- * You can use Dependency Injection like Guice or Spring to construct and wire a EbeanServer instance
+ * You can use Dependency Injection like Guice or Spring to construct and wire a Database instance
  * and have that same instance used with this Model and Finder. The way that works is that when the
- * DI container creates the EbeanServer instance it can be registered with the Ebean singleton. In this
- * way the EbeanServer instance can be injected as per normal Guice / Spring dependency injection and
+ * DI container creates the Database instance it can be registered with DB. In this
+ * way the Database instance can be injected as per normal Guice / Spring dependency injection and
  * that same instance also used to support the Model and Finder active record style.
  * <p>
  * If you choose to use the Model mapped superclass you will probably also chose to additionally add
diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index 712281e48..9bc8508ca 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -634,7 +634,7 @@ public interface Query<T> {
   /**
    * Execute the query returning the list of Id's.
    * <p>
-   * This query will execute against the EbeanServer that was used to create it.
+   * This query will execute against the Database that was used to create it.
    * </p>
    */
   @Nonnull
@@ -656,7 +656,7 @@ public interface Query<T> {
    * the jdbc statement and resultSet are closed at the end of the iteration.
    * </p>
    * <p>
-   * This query will execute against the EbeanServer that was used to create it.
+   * This query will execute against the Database that was used to create it.
    * </p>
    * <pre>{@code
    *
@@ -759,7 +759,7 @@ public interface Query<T> {
   /**
    * Execute the query returning the list of objects.
    * <p>
-   * This query will execute against the EbeanServer that was used to create it.
+   * This query will execute against the Database that was used to create it.
    * </p>
    * <pre>{@code
    *
@@ -775,7 +775,7 @@ public interface Query<T> {
   /**
    * Execute the query returning the set of objects.
    * <p>
-   * This query will execute against the EbeanServer that was used to create it.
+   * This query will execute against the Database that was used to create it.
    * </p>
    * <pre>{@code
    *
@@ -791,7 +791,7 @@ public interface Query<T> {
   /**
    * Execute the query returning a map of the objects.
    * <p>
-   * This query will execute against the EbeanServer that was used to create it.
+   * This query will execute against the Database that was used to create it.
    * </p>
    * <p>
    * You can use setMapKey() so specify the property values to be used as keys
diff --git a/src/main/java/io/ebean/Transaction.java b/src/main/java/io/ebean/Transaction.java
index 4ec8e2701..e9bd914c0 100644
--- a/src/main/java/io/ebean/Transaction.java
+++ b/src/main/java/io/ebean/Transaction.java
@@ -20,8 +20,7 @@ public interface Transaction extends AutoCloseable {
    * This is the same as <code>DB.currentTransaction()</code>
    * </p>
    * <p>
-   * This returns the current transaction for the 'default server'.  If you are using
-   * multiple EbeanServer's then use {@link DB#currentTransaction()}.
+   * This returns the current transaction for the default database.
    * </p>
    *
    * @see DB#currentTransaction()
diff --git a/src/main/java/io/ebean/bean/BeanCollectionLoader.java b/src/main/java/io/ebean/bean/BeanCollectionLoader.java
index fce7d7037..2f0e2848d 100644
--- a/src/main/java/io/ebean/bean/BeanCollectionLoader.java
+++ b/src/main/java/io/ebean/bean/BeanCollectionLoader.java
@@ -9,7 +9,7 @@ package io.ebean.bean;
 public interface BeanCollectionLoader {
 
   /**
-   * Return the name of the associated EbeanServer.
+   * Return the name of the associated Database.
    */
   String getName();
 
diff --git a/src/main/java/io/ebean/bean/BeanLoader.java b/src/main/java/io/ebean/bean/BeanLoader.java
index b4e004568..af96a3d01 100644
--- a/src/main/java/io/ebean/bean/BeanLoader.java
+++ b/src/main/java/io/ebean/bean/BeanLoader.java
@@ -9,7 +9,7 @@ package io.ebean.bean;
 public interface BeanLoader {
 
   /**
-   * Return the name of the associated EbeanServer.
+   * Return the name of the associated Database.
    */
   String getName();
 
diff --git a/src/main/java/io/ebean/common/AbstractBeanCollection.java b/src/main/java/io/ebean/common/AbstractBeanCollection.java
index 33b30f3ac..33f05fb89 100644
--- a/src/main/java/io/ebean/common/AbstractBeanCollection.java
+++ b/src/main/java/io/ebean/common/AbstractBeanCollection.java
@@ -20,7 +20,7 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
   protected boolean disableLazyLoad;
 
   /**
-   * The EbeanServer this is associated with. (used for lazy fetch).
+   * The Database this is associated with. (used for lazy fetch).
    */
   protected transient BeanCollectionLoader loader;
 
diff --git a/src/main/java/io/ebean/config/AutoConfigure.java b/src/main/java/io/ebean/config/AutoConfigure.java
index 879338ce5..525d3ac8b 100644
--- a/src/main/java/io/ebean/config/AutoConfigure.java
+++ b/src/main/java/io/ebean/config/AutoConfigure.java
@@ -1,7 +1,7 @@
 package io.ebean.config;
 
 /**
- * Used to provide some automatic configuration early in the creation of an EbeanServer.
+ * Used to provide some automatic configuration early in the creation of a Database.
  */
 public interface AutoConfigure {
 
diff --git a/src/main/java/io/ebean/config/AutoTuneConfig.java b/src/main/java/io/ebean/config/AutoTuneConfig.java
index 7f9c0d980..e0940241b 100644
--- a/src/main/java/io/ebean/config/AutoTuneConfig.java
+++ b/src/main/java/io/ebean/config/AutoTuneConfig.java
@@ -1,7 +1,7 @@
 package io.ebean.config;
 
 /**
- * Defines the AutoTune behaviour for a EbeanServer.
+ * Defines the AutoTune behaviour for a Database.
  */
 public class AutoTuneConfig {
 
diff --git a/src/main/java/io/ebean/config/ContainerConfig.java b/src/main/java/io/ebean/config/ContainerConfig.java
index 32fb98770..00cf8f8bf 100644
--- a/src/main/java/io/ebean/config/ContainerConfig.java
+++ b/src/main/java/io/ebean/config/ContainerConfig.java
@@ -3,7 +3,7 @@ package io.ebean.config;
 import java.util.Properties;
 
 /**
- * Configuration for the container that holds the EbeanServer instances.
+ * Configuration for the container that holds the Database instances.
  * <p>
  * Provides configuration for cluster communication (if clustering is used). The cluster communication is
  * used to invalidate appropriate parts of the L2 cache across the cluster.
diff --git a/src/main/java/io/ebean/config/DbMigrationConfig.java b/src/main/java/io/ebean/config/DbMigrationConfig.java
index 8946d4000..54e8adcb5 100644
--- a/src/main/java/io/ebean/config/DbMigrationConfig.java
+++ b/src/main/java/io/ebean/config/DbMigrationConfig.java
@@ -140,7 +140,7 @@ public class DbMigrationConfig {
    * <p>
    * The default of "dbmigration" is reasonable in most cases. You may look to set this
    * to be something like "dbmigration/myapp" where myapp gives it a unique resource path
-   * in the case there are multiple EbeanServer applications in the single classpath.
+   * in the case there are multiple Database applications in the single classpath.
    * </p>
    */
   public void setMigrationPath(String migrationPath) {
diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index e57e4fd45..69ba64f2c 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -1,7 +1,7 @@
 package io.ebean.config;
 
 import com.fasterxml.jackson.core.JsonFactory;
-import io.ebean.EbeanServerFactory;
+import io.ebean.DatabaseFactory;
 import io.ebean.PersistenceContextScope;
 import io.ebean.Query;
 import io.ebean.Transaction;
@@ -44,30 +44,30 @@ import java.util.Properties;
 import java.util.ServiceLoader;
 
 /**
- * The configuration used for creating a EbeanServer.
+ * The configuration used for creating a Database.
  * <p>
- * Used to programmatically construct an EbeanServer and optionally register it
- * with the Ebean singleton.
+ * Used to programmatically construct a Database and optionally register it
+ * with the DB singleton.
  * </p>
  * <p>
- * If you just use Ebean without this programmatic configuration Ebean will read
- * the ebean.properties file and take the configuration from there. This usually
+ * If you just use DB without this programmatic configuration DB will read
+ * the application.properties file and take the configuration from there. This usually
  * includes searching the class path and automatically registering any entity
  * classes and listeners etc.
  * </p>
  * <pre>{@code
  *
- * ServerConfig c = new ServerConfig();
+ * ServerConfig config = new ServerConfig();
  *
  * // read the ebean.properties and load
  * // those settings into this serverConfig object
- * c.loadFromProperties();
+ * config.loadFromProperties();
  *
  * // explicitly register the entity beans to avoid classpath scanning
- * c.addClass(Customer.class);
- * c.addClass(User.class);
+ * config.addClass(Customer.class);
+ * config.addClass(User.class);
  *
- * EbeanServer server = EbeanServerFactory.create(c);
+ * Database database = DatabaseFactory.create(config);
  *
  * }</pre>
  *
@@ -78,12 +78,12 @@ import java.util.ServiceLoader;
  *
  * @author emcgreal
  * @author rbygrave
- * @see EbeanServerFactory
+ * @see DatabaseFactory
  */
 public class ServerConfig {
 
   /**
-   * The EbeanServer name.
+   * The Database name.
    */
   private String name = "db";
 
@@ -106,12 +106,12 @@ public class ServerConfig {
   private String resourceDirectory;
 
   /**
-   * Set to true to register this EbeanServer with the Ebean singleton.
+   * Set to true to register this Database with the DB singleton.
    */
   private boolean register = true;
 
   /**
-   * Set to true if this is the default/primary server.
+   * Set to true if this is the default/primary database.
    */
   private boolean defaultServer = true;
 
@@ -150,7 +150,7 @@ public class ServerConfig {
   private DocStoreConfig docStoreConfig = new DocStoreConfig();
 
   /**
-   * Set to true when the EbeanServer only uses Document store.
+   * Set to true when the Database only uses Document store.
    */
   private boolean docStoreOnly;
 
@@ -522,7 +522,7 @@ public class ServerConfig {
   private boolean idGeneratorAutomatic = true;
 
   /**
-   * Construct a Server Configuration for programmatically creating an EbeanServer.
+   * Construct a Database Configuration for programmatically creating an Database.
    */
   public ServerConfig() {
 
@@ -693,14 +693,14 @@ public class ServerConfig {
   }
 
   /**
-   * Return the name of the EbeanServer.
+   * Return the name of the Database.
    */
   public String getName() {
     return name;
   }
 
   /**
-   * Set the name of the EbeanServer.
+   * Set the name of the Database.
    */
   public void setName(String name) {
     this.name = name;
@@ -709,8 +709,8 @@ public class ServerConfig {
   /**
    * Return the container / clustering configuration.
    * <p/>
-   * The container holds all the EbeanServer instances and provides clustering communication
-   * services to all the EbeanServer instances.
+   * The container holds all the Database instances and provides clustering communication
+   * services to all the Database instances.
    */
   public ContainerConfig getContainerConfig() {
     return containerConfig;
@@ -719,8 +719,8 @@ public class ServerConfig {
   /**
    * Set the container / clustering configuration.
    * <p/>
-   * The container holds all the EbeanServer instances and provides clustering communication
-   * services to all the EbeanServer instances.
+   * The container holds all the Database instances and provides clustering communication
+   * services to all the Database instances.
    */
   public void setContainerConfig(ContainerConfig containerConfig) {
     this.containerConfig = containerConfig;
@@ -760,8 +760,8 @@ public class ServerConfig {
   }
 
   /**
-   * Set false if you do not want this EbeanServer to be registered as the "default" server
-   * with the Ebean singleton.
+   * Set false if you do not want this Database to be registered as the "default" database
+   * with the DB singleton.
    * <p>
    * This is only used when {@link #setRegister(boolean)} is also true.
    * </p>
@@ -1547,14 +1547,14 @@ public class ServerConfig {
   }
 
   /**
-   * Return true if this EbeanServer is a Document store only instance (has no JDBC DB).
+   * Return true if this Database is a Document store only instance (has no JDBC DB).
    */
   public boolean isDocStoreOnly() {
     return docStoreOnly;
   }
 
   /**
-   * Set to true if this EbeanServer is Document store only instance (has no JDBC DB).
+   * Set to true if this Database is Document store only instance (has no JDBC DB).
    */
   public void setDocStoreOnly(boolean docStoreOnly) {
     this.docStoreOnly = docStoreOnly;
@@ -1954,16 +1954,16 @@ public class ServerConfig {
   }
 
   /**
-   * Return true if the EbeanServer instance should be created in offline mode.
+   * Return true if the Database instance should be created in offline mode.
    */
   public boolean isDbOffline() {
     return dbOffline;
   }
 
   /**
-   * Set to true if the EbeanServer instance should be created in offline mode.
+   * Set to true if the Database instance should be created in offline mode.
    * <p>
-   * Typically used to create an EbeanServer instance for DDL Migration generation
+   * Typically used to create an Database instance for DDL Migration generation
    * without requiring a real DataSource / Database to connect to.
    * </p>
    */
@@ -2214,7 +2214,7 @@ public class ServerConfig {
 
   /**
    * Set to true to disable the class path search even for the case where no entity bean classes
-   * have been registered. This can be used to start an EbeanServer instance just to use the
+   * have been registered. This can be used to start an Database instance just to use the
    * SQL functions such as SqlQuery, SqlUpdate etc.
    */
   public void setDisableClasspathSearch(boolean disableClasspathSearch) {
diff --git a/src/main/java/io/ebean/config/package.html b/src/main/java/io/ebean/config/package.html
index f89a304ff..abb6ed9ba 100644
--- a/src/main/java/io/ebean/config/package.html
+++ b/src/main/java/io/ebean/config/package.html
@@ -1,10 +1,10 @@
 <HTML>
 <HEAD>
   <META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=iso-8859-1">
-  <TITLE>Configuration settings for EbeanServer construction</TITLE>
+  <TITLE>Configuration settings for Database construction</TITLE>
 </HEAD>
 <Body BGCOLOR="#ffffff">
-Configuration settings for EbeanServer construction
+Configuration settings for Database construction
 
 </Body>
 </HTML>
diff --git a/src/main/java/io/ebean/event/BeanPersistController.java b/src/main/java/io/ebean/event/BeanPersistController.java
index 15160cb28..ed46dbdef 100644
--- a/src/main/java/io/ebean/event/BeanPersistController.java
+++ b/src/main/java/io/ebean/event/BeanPersistController.java
@@ -9,7 +9,7 @@ package io.ebean.event;
  * <p>
  * Note that getTransaction() on the PersistRequest returns the transaction used
  * for the insert, update, delete or fetch. To explicitly use this same
- * transaction you should use this transaction via methods on EbeanServer.
+ * transaction you should use this transaction via methods on Database.
  * </p>
  * <pre>{@code
  *
diff --git a/src/main/java/io/ebean/event/BeanPostConstructListener.java b/src/main/java/io/ebean/event/BeanPostConstructListener.java
index e0fb74215..b24a343a5 100644
--- a/src/main/java/io/ebean/event/BeanPostConstructListener.java
+++ b/src/main/java/io/ebean/event/BeanPostConstructListener.java
@@ -1,6 +1,6 @@
 package io.ebean.event;
 
-import io.ebean.EbeanServer;
+import io.ebean.Database;
 
 /**
  * Fired after a bean is constructed, but not yet loaded from database.
@@ -9,7 +9,7 @@ import io.ebean.EbeanServer;
  * properties will get unload. Use {@link BeanPostLoad} instead.
  * <p>
  * it's intended to do some dependency-injection here.
- * If you plan to use this feature you should use {@link EbeanServer#createEntityBean(Class)}
+ * If you plan to use this feature you should use {@link Database#createEntityBean(Class)}
  * to create new beans.
  * </p>
  */
@@ -32,7 +32,7 @@ public interface BeanPostConstructListener {
   void postConstruct(Object bean);
 
   /**
-   * Called after {@link EbeanServer#createEntityBean(Class)}. Only for new beans.
+   * Called after {@link Database#createEntityBean(Class)}. Only for new beans.
    * intended to set default values here.
    */
   void postCreate(Object bean);
diff --git a/src/main/java/io/ebean/meta/MetaInfoManager.java b/src/main/java/io/ebean/meta/MetaInfoManager.java
index 8880014b7..a1638b6be 100644
--- a/src/main/java/io/ebean/meta/MetaInfoManager.java
+++ b/src/main/java/io/ebean/meta/MetaInfoManager.java
@@ -3,7 +3,7 @@ package io.ebean.meta;
 import java.util.List;
 
 /**
- * Provides access to the meta data in EbeanServer such as query execution statistics.
+ * Provides access to the meta data in Database such as query execution statistics.
  */
 public interface MetaInfoManager {
 
diff --git a/src/main/java/io/ebean/meta/package-info.java b/src/main/java/io/ebean/meta/package-info.java
index 26f24d774..42412dd3e 100644
--- a/src/main/java/io/ebean/meta/package-info.java
+++ b/src/main/java/io/ebean/meta/package-info.java
@@ -1,4 +1,4 @@
 /**
- * Meta data that can be retrieved for the EbeanServer.
+ * Meta data that can be retrieved for a Database instance.
  */
 package io.ebean.meta;
diff --git a/src/main/java/io/ebean/plugin/Plugin.java b/src/main/java/io/ebean/plugin/Plugin.java
index d2107bdf9..359adce38 100644
--- a/src/main/java/io/ebean/plugin/Plugin.java
+++ b/src/main/java/io/ebean/plugin/Plugin.java
@@ -1,7 +1,7 @@
 package io.ebean.plugin;
 
 /**
- * A 'plugin' that wants to be configured on startup so it can use features of the EbeanServer itself.
+ * A 'plugin' that wants to be configured on startup so it can use features of the Database itself.
  */
 public interface Plugin {
 
diff --git a/src/main/java/io/ebean/plugin/SpiServer.java b/src/main/java/io/ebean/plugin/SpiServer.java
index 4eb11837e..d7bf69b62 100644
--- a/src/main/java/io/ebean/plugin/SpiServer.java
+++ b/src/main/java/io/ebean/plugin/SpiServer.java
@@ -8,7 +8,7 @@ import javax.sql.DataSource;
 import java.util.List;
 
 /**
- * Extensions to EbeanServer API made available to plugins.
+ * Extensions to Database API made available to plugins.
  */
 public interface SpiServer extends EbeanServer {
 
@@ -43,12 +43,12 @@ public interface SpiServer extends EbeanServer {
   BeanType<?> getBeanTypeForQueueId(String queueId);
 
   /**
-   * Return the associated DataSource for this EbeanServer instance.
+   * Return the associated DataSource for this Database instance.
    */
   DataSource getDataSource();
 
   /**
-   * Return the associated read only DataSource for this EbeanServer instance (can be null).
+   * Return the associated read only DataSource for this Database instance (can be null).
    */
   DataSource getReadOnlyDataSource();
 
diff --git a/src/main/java/io/ebean/plugin/package-info.java b/src/main/java/io/ebean/plugin/package-info.java
index b541d543e..7c91ed6ec 100644
--- a/src/main/java/io/ebean/plugin/package-info.java
+++ b/src/main/java/io/ebean/plugin/package-info.java
@@ -2,7 +2,7 @@
  * Provides a API for plugins.
  * <p>
  * Plugins can get and read meta data about the entity beans and enhance or utilise the
- * functionality of the EbeanServer.
+ * functionality of the Database.
  * </p>
  */
 package io.ebean.plugin;
diff --git a/src/main/java/io/ebean/service/SpiContainer.java b/src/main/java/io/ebean/service/SpiContainer.java
index 3f1ffc9a1..d317ed4b8 100644
--- a/src/main/java/io/ebean/service/SpiContainer.java
+++ b/src/main/java/io/ebean/service/SpiContainer.java
@@ -4,7 +4,7 @@ import io.ebean.EbeanServer;
 import io.ebean.config.ServerConfig;
 
 /**
- * Creates the EbeanServer implementations. This is used internally by the EbeanServerFactory and is not currently
+ * Creates the Database implementations. This is used internally by the EbeanServerFactory and is not currently
  * exposed as public API.
  */
 public interface SpiContainer {

From bfeb0cd667ca4b904f7ddaa7c4a9d98d08a09008 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 12 Mar 2019 14:29:28 +1300
Subject: [PATCH 0761/1036] No effective change - update to using "Database"
 and DB

---
 src/test/java/io/ebean/DtoQueryFromOrmTest.java             | 2 +-
 .../java/org/tests/basic/type/TestEnumValueAnnotation.java  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
index 0e30ded30..76d3c0785 100644
--- a/src/test/java/io/ebean/DtoQueryFromOrmTest.java
+++ b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
@@ -24,7 +24,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
   @AfterClass
   public static void reportStats() {
-    BasicMetricVisitor basic = Ebean.getDefaultServer().getMetaInfoManager().visitBasic();
+    BasicMetricVisitor basic = DB.getDefault().getMetaInfoManager().visitBasic();
     for (MetaQueryMetric metric : basic.getDtoQueryMetrics()) {
       System.out.println(metric);
     }
diff --git a/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java b/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java
index 1489f1c52..e7b8577cb 100644
--- a/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java
+++ b/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java
@@ -27,7 +27,7 @@ public class TestEnumValueAnnotation extends BaseTestCase {
 
     DB.save(b);
 
-    SqlRow sqlRow = DB.createSqlQuery("select * from e_basic where id = :id")
+    SqlRow sqlRow = DB.sqlQuery("select * from e_basic where id = :id")
       .setParameter("id", b.getId())
       .findOne();
 
@@ -54,7 +54,7 @@ public class TestEnumValueAnnotation extends BaseTestCase {
 
     DB.save(b);
 
-    SqlQuery q = DB.createSqlQuery("select * from e_basic_enum_id where status = :status");
+    SqlQuery q = DB.sqlQuery("select * from e_basic_enum_id where status = :status");
     q.setParameter("status", b.getStatus());
 
     SqlRow sqlRow = q.findOne();
@@ -80,7 +80,7 @@ public class TestEnumValueAnnotation extends BaseTestCase {
 
     DB.save(b);
 
-    SqlQuery q = DB.createSqlQuery("select * from e_basic_eni where id = :id");
+    SqlQuery q = DB.sqlQuery("select * from e_basic_eni where id = :id");
     q.setParameter("id", b.getId());
 
     Optional<SqlRow> sqlRow = q.findOneOrEmpty();

From 9ded3890d7c502691ac0323ef353d6d294cc2a02 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 12 Mar 2019 14:31:44 +1300
Subject: [PATCH 0762/1036] #1649 - ENH: Add optional length() attribute to
 @DbEnumValue

---
 pom.xml                                                    | 2 +-
 .../io/ebeaninternal/server/type/DefaultTypeManager.java   | 7 +++----
 src/test/java/org/tests/model/basic/Truck.java             | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 295cb9b88..f6754546e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>4.5</version>
+      <version>4.6</version>
     </dependency>
 
     <dependency>
diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 866ad4942..cf8308e68 100644
--- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -663,11 +663,10 @@ public final class DefaultTypeManager implements TypeManager {
       DbEnumValue dbValue = AnnotationUtil.findAnnotation(method, DbEnumValue.class);
       if (dbValue != null) {
         boolean integerValues = DbEnumType.INTEGER == dbValue.storage();
-        return createEnumScalarTypeDbValue(enumType, method, integerValues);
+        return createEnumScalarTypeDbValue(enumType, method, integerValues, dbValue.length());
       }
     }
 
-
     // look for EnumValue annotations instead
     return createEnumScalarType2(enumType);
   }
@@ -678,7 +677,7 @@ public final class DefaultTypeManager implements TypeManager {
    * Return null if the EnumValue annotations are not present/used.
    * </p>
    */
-  private ScalarTypeEnum<?> createEnumScalarTypeDbValue(Class<? extends Enum<?>> enumType, Method method, boolean integerType) {
+  private ScalarTypeEnum<?> createEnumScalarTypeDbValue(Class<? extends Enum<?>> enumType, Method method, boolean integerType, int length) {
 
     Map<String, String> nameValueMap = new LinkedHashMap<>();
 
@@ -696,7 +695,7 @@ public final class DefaultTypeManager implements TypeManager {
       return null;
     }
 
-    return createEnumScalarType(enumType, nameValueMap, integerType, 0);
+    return createEnumScalarType(enumType, nameValueMap, integerType, length);
   }
 
   /**
diff --git a/src/test/java/org/tests/model/basic/Truck.java b/src/test/java/org/tests/model/basic/Truck.java
index b8d03b091..1c7778734 100644
--- a/src/test/java/org/tests/model/basic/Truck.java
+++ b/src/test/java/org/tests/model/basic/Truck.java
@@ -26,7 +26,7 @@ public class Truck extends Vehicle {
       this.value = value;
     }
 
-    @DbEnumValue
+    @DbEnumValue(length = 3)
     public String value() {
       return value;
     }

From 276e865f72b5ef694116fc15e60ed8f4fbaa2b0e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 12 Mar 2019 14:49:00 +1300
Subject: [PATCH 0763/1036] #1647 - Change
 ServerConfig.updateAllPropertiesInBatch to default to false

---
 pom.xml                                       |   2 +-
 .../java/io/ebean/config/ServerConfig.java    |   2 +-
 .../album/DeleteById_SoftDelete_Tests.java    | 102 +++++++-----------
 .../o2m/jointable/TestOneToManyJoinTable.java |  23 ++--
 4 files changed, 53 insertions(+), 76 deletions(-)

diff --git a/pom.xml b/pom.xml
index f6754546e..fdaa845e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.35.4-SNAPSHOT</version>
+  <version>11.36.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 69ba64f2c..f9a9e3d7d 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -350,7 +350,7 @@ public class ServerConfig {
   /**
    * Behaviour of updates in JDBC batch to by default include all properties.
    */
-  private boolean updateAllPropertiesInBatch = true;
+  private boolean updateAllPropertiesInBatch;
 
   /**
    * Default behaviour for updates when cascade save on a O2M or M2M to delete any missing children.
diff --git a/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java b/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java
index b22d92340..8f71abd42 100644
--- a/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java
+++ b/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java
@@ -1,8 +1,7 @@
 package org.tests.model.onetoone.album;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
-import io.ebean.EbeanServer;
+import io.ebean.DB;
 import io.ebean.Transaction;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
@@ -24,7 +23,7 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    Ebean.delete(Cover.class, cover.getId());
+    DB.delete(Cover.class, cover.getId());
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(1);
@@ -43,12 +42,12 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
     Cover cover = new Cover("b1");
     cover.save();
 
-    Ebean.delete(Cover.class, cover.getId());
+    DB.delete(Cover.class, cover.getId());
 
-    Cover findWhenSoft = Ebean.find(Cover.class, cover.getId());
+    Cover findWhenSoft = DB.find(Cover.class, cover.getId());
     assertNull(findWhenSoft);
 
-    Cover cover1 = Ebean.find(Cover.class)
+    Cover cover1 = DB.find(Cover.class)
       .setIncludeSoftDeletes()
       .setId(cover.getId())
       .findOne();
@@ -63,7 +62,7 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
     assertThat(sql).hasSize(1);
     assertThat(sql.get(0)).contains("update cover set deleted=? where id=?; -- bind(false");
 
-    Cover findAgain = Ebean.find(Cover.class, cover.getId());
+    Cover findAgain = DB.find(Cover.class, cover.getId());
     assertNotNull(findAgain);
 
     cover.deletePermanent();
@@ -77,7 +76,7 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    Ebean.getDefaultServer().delete(Cover.class, cover.getId(), null);
+    DB.getDefault().delete(Cover.class, cover.getId(), null);
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(1);
@@ -97,7 +96,7 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    Ebean.getDefaultServer().deletePermanent(Cover.class, cover.getId(), null);
+    DB.getDefault().deletePermanent(Cover.class, cover.getId(), null);
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(1);
@@ -107,13 +106,12 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
   @Test
   public void deleteAllById_when_softDelete() {
 
-    EbeanServer server = Ebean.getDefaultServer();
     List<Cover> beans = beans(2);
-    server.saveAll(beans);
+    DB.saveAll(beans);
 
     LoggedSqlCollector.start();
 
-    server.deleteAll(Cover.class, ids(beans));
+    DB.deleteAll(Cover.class, ids(beans));
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(1);
@@ -127,18 +125,14 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
   @Test
   public void deleteAllById_when_softDelete_withTransaction() {
 
-    EbeanServer server = Ebean.getDefaultServer();
     List<Cover> beans = beans(2);
-    server.saveAll(beans);
+    DB.saveAll(beans);
 
     LoggedSqlCollector.start();
 
-    Transaction transaction = server.beginTransaction();
-    try {
-      server.deleteAll(Cover.class, ids(beans), transaction);
-      server.commitTransaction();
-    } finally {
-      server.endTransaction();
+    try (Transaction transaction = DB.beginTransaction()) {
+      DB.getDefault().deleteAll(Cover.class, ids(beans), transaction);
+      transaction.commit();
     }
 
     List<String> sql = LoggedSqlCollector.stop();
@@ -154,11 +148,11 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
   public void ebean_deleteAllPermanentById_when_softDelete() {
 
     List<Cover> beans = beans(2);
-    Ebean.saveAll(beans);
+    DB.saveAll(beans);
 
     LoggedSqlCollector.start();
 
-    Ebean.deleteAllPermanent(Cover.class, ids(beans));
+    DB.deleteAllPermanent(Cover.class, ids(beans));
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(1);
@@ -168,13 +162,12 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
   @Test
   public void deleteAllPermanentById_when_softDelete() {
 
-    EbeanServer server = Ebean.getDefaultServer();
     List<Cover> beans = beans(2);
-    server.saveAll(beans);
+    DB.saveAll(beans);
 
     LoggedSqlCollector.start();
 
-    server.deleteAllPermanent(Cover.class, ids(beans));
+    DB.deleteAllPermanent(Cover.class, ids(beans));
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(1);
@@ -185,18 +178,14 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
   @Test
   public void deleteAllPermanentById_when_softDelete_withTransaction() {
 
-    EbeanServer server = Ebean.getDefaultServer();
     List<Cover> beans = beans(2);
-    server.saveAll(beans);
+    DB.saveAll(beans);
 
     LoggedSqlCollector.start();
 
-    Transaction transaction = server.beginTransaction();
-    try {
-      server.deleteAllPermanent(Cover.class, ids(beans), transaction);
-      server.commitTransaction();
-    } finally {
-      server.endTransaction();
+    try (Transaction transaction = DB.beginTransaction()) {
+      DB.getDefault().deleteAllPermanent(Cover.class, ids(beans), transaction);
+      transaction.commit();
     }
 
     List<String> sql = LoggedSqlCollector.stop();
@@ -208,18 +197,17 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
   public void ebean_deleteAll_when_softDelete() {
 
     List<Cover> beans = beans(2);
-    Ebean.saveAll(beans);
+    DB.saveAll(beans);
 
     LoggedSqlCollector.start();
 
-    Ebean.deleteAll(beans);
+    DB.deleteAll(beans);
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(3);
     if (isPersistBatchOnCascade()) {
-      assertThat(sql.get(0)).contains("update cover set s3_url=?, deleted=? where id=?");
-    }
-    else {
+      assertThat(sql.get(0)).contains("update cover set deleted=? where id=?");
+    } else {
       assertThat(sql.get(0)).contains("update cover set deleted=? where id=?");
     }
   }
@@ -227,18 +215,17 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
   @Test
   public void deleteAll_when_softDelete() {
 
-    EbeanServer server = Ebean.getDefaultServer();
     List<Cover> beans = beans(2);
-    server.saveAll(beans);
+    DB.saveAll(beans);
 
     LoggedSqlCollector.start();
 
-    server.deleteAll(beans);
+    DB.deleteAll(beans);
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(3);
     if (isPersistBatchOnCascade()) {
-      assertThat(sql.get(0)).contains("update cover set s3_url=?, deleted=? where id=?");
+      assertThat(sql.get(0)).contains("update cover set deleted=? where id=?");
     }
     else {
       assertThat(sql.get(0)).contains("update cover set deleted=? where id=?");
@@ -248,24 +235,20 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
   @Test
   public void deleteAll_when_softDelete_withTransaction() {
 
-    EbeanServer server = Ebean.getDefaultServer();
     List<Cover> beans = beans(2);
-    server.saveAll(beans);
+    DB.saveAll(beans);
 
     LoggedSqlCollector.start();
 
-    Transaction transaction = server.beginTransaction();
-    try {
-      server.deleteAll(beans, transaction);
-      server.commitTransaction();
-    } finally {
-      server.endTransaction();
+    try (Transaction transaction = DB.beginTransaction()) {
+      DB.getDefault().deleteAll(beans, transaction);
+      transaction.commit();
     }
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(3);
     if (isPersistBatchOnCascade()) {
-      assertThat(sql.get(0)).contains("update cover set s3_url=?, deleted=? where id=?");
+      assertThat(sql.get(0)).contains("update cover set deleted=? where id=?");
     }
     else {
       assertThat(sql.get(0)).contains("update cover set deleted=? where id=?");
@@ -275,13 +258,12 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
   @Test
   public void deleteAllPermanent_when_softDelete() {
 
-    EbeanServer server = Ebean.getDefaultServer();
     List<Cover> beans = beans(2);
-    server.saveAll(beans);
+    DB.saveAll(beans);
 
     LoggedSqlCollector.start();
 
-    server.deleteAllPermanent(beans);
+    DB.deleteAllPermanent(beans);
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(3);
@@ -291,18 +273,14 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase {
   @Test
   public void deleteAllPermanent_when_softDelete_withTransaction() {
 
-    EbeanServer server = Ebean.getDefaultServer();
     List<Cover> beans = beans(2);
-    server.saveAll(beans);
+    DB.saveAll(beans);
 
     LoggedSqlCollector.start();
 
-    Transaction transaction = server.beginTransaction();
-    try {
-      server.deleteAllPermanent(beans, transaction);
-      server.commitTransaction();
-    } finally {
-      server.endTransaction();
+    try (Transaction transaction = DB.beginTransaction()) {
+      DB.getDefault().deleteAllPermanent(beans, transaction);
+      transaction.commit();
     }
 
     List<String> sql = LoggedSqlCollector.stop();
diff --git a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java
index bf42893b3..487a2a80d 100644
--- a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java
+++ b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java
@@ -1,7 +1,7 @@
 package org.tests.o2m.jointable;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -19,7 +19,7 @@ public class TestOneToManyJoinTable extends BaseTestCase {
   private JtMonkey m2 = new JtMonkey("Uim");
 
   private void initialInsert() {
-    Ebean.saveAll(Arrays.asList(troop, m0, m1, m2));
+    DB.saveAll(Arrays.asList(troop, m0, m1, m2));
   }
 
   @Test
@@ -34,7 +34,7 @@ public class TestOneToManyJoinTable extends BaseTestCase {
     troop.getMonkeys().add(m0);
     troop.getMonkeys().add(m1);
 
-    Ebean.save(troop);
+    DB.save(troop);
 
     List<String> sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
@@ -48,14 +48,14 @@ public class TestOneToManyJoinTable extends BaseTestCase {
       assertThat(sql.get(1)).contains("insert into troop_monkey (troop_pid, monkey_mid) values (?, ?)");
     }
 
-    long intersectionRows = Ebean.createSqlQuery("select count(*) as total from troop_monkey where troop_pid = ?")
+    long intersectionRows = DB.sqlQuery("select count(*) as total from troop_monkey where troop_pid = ?")
       .setParameter(1, troop.getPid())
       .findSingleLong();
 
     assertThat(intersectionRows).isEqualTo(2L);
 
     LoggedSqlCollector.current();
-    JtTroop fetchTroop = Ebean.find(JtTroop.class)
+    JtTroop fetchTroop = DB.find(JtTroop.class)
       .fetch("monkeys")
       .where().idEq(troop.getPid())
       .findOne();
@@ -67,7 +67,7 @@ public class TestOneToManyJoinTable extends BaseTestCase {
     assertThat(trimSql(sql.get(0))).contains("from troop t0 left join troop_monkey t1z_ on t1z_.troop_pid = t0.pid  left join monkey t1 on t1.mid = t1z_.monkey_mid  where t0.pid = ?");
     assertThat(trimSql(sql.get(0))).contains("select t0.pid, t0.name, t0.version, t1.mid, t1.name, t1.food_preference, t1.version");
 
-    Ebean.delete(troop);
+    DB.delete(troop);
 
     sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(2);
@@ -85,23 +85,22 @@ public class TestOneToManyJoinTable extends BaseTestCase {
     // make m2 dirty ... cascades to an update on Uim
     m2.setFoodPreference("Apple");
     trainer.getMonkeys().add(m2);
-    trainer.getMonkeys().add(Ebean.getReference(JtMonkey.class, m1.getMid()));
+    trainer.getMonkeys().add(DB.getReference(JtMonkey.class, m1.getMid()));
     trainer.getMonkeys().add(new JtMonkey("FAlp"));
     trainer.getMonkeys().add(new JtMonkey("FBet"));
     trainer.getMonkeys().add(new JtMonkey("FThe"));
 
     LoggedSqlCollector.start();
-    Ebean.save(trainer);
+    DB.save(trainer);
 
     List<String> sql = LoggedSqlCollector.current();
-    //Collections.sort(sql);
 
     if (isPersistBatchOnCascade()) {
       assertThat(sql).hasSize(13);
       assertThat(sql.get(0)).contains("insert into trainer ");
       assertThat(sql.get(1)).contains("insert into monkey ");
       assertSqlBind(sql, 2, 4);
-      assertThat(sql.get(5)).contains("update monkey set name=?, food_preference=?, version=? where mid=? and version=?");
+      assertThat(sql.get(5)).contains("update monkey set food_preference=?, version=? where mid=? and version=?");
       assertThat(sql.get(6)).contains("-- bind(");
       assertThat(sql.get(7)).contains("insert into trainer_monkey ");
       assertSqlBind(sql, 8, 12);
@@ -116,7 +115,7 @@ public class TestOneToManyJoinTable extends BaseTestCase {
     }
 
 
-    int intersectionRows = Ebean.createSqlQuery("select count(*) as total from trainer_monkey where trainer_tid = ?")
+    int intersectionRows = DB.sqlQuery("select count(*) as total from trainer_monkey where trainer_tid = ?")
       .setParameter(1, trainer.getTid())
       .findOne()
       .getInteger("total");
@@ -125,7 +124,7 @@ public class TestOneToManyJoinTable extends BaseTestCase {
 
 
     LoggedSqlCollector.current();
-    Ebean.delete(trainer);
+    DB.delete(trainer);
 
     sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(2);

From fbc2d70967be0a34b6c17caa6884d63977d68801 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 12 Mar 2019 14:53:09 +1300
Subject: [PATCH 0764/1036] [maven-release-plugin] prepare release
 ebean-11.36.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index fdaa845e8..255554557 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.36.1-SNAPSHOT</version>
+  <version>11.36.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.36.1</tag>
   </scm>
 
   <profiles>

From 770364fd1a26fa5714717252e81fd57157ea6e95 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 12 Mar 2019 14:53:24 +1300
Subject: [PATCH 0765/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 255554557..046f747f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.36.1</version>
+  <version>11.36.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.36.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 0230e3e253f2541a1e0ecadf3263341eee024c7a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 12 Mar 2019 15:06:26 +1300
Subject: [PATCH 0766/1036] Reduce logging for CI server

---
 src/test/resources/logback-test.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
index 3ee1469c7..cab30c58a 100644
--- a/src/test/resources/logback-test.xml
+++ b/src/test/resources/logback-test.xml
@@ -79,19 +79,19 @@
   <logger name="org.tests" level="INFO"/>
   <logger name="io.ebean" level="INFO"/>
 
-  <logger name="org.avaje.docker" level="TRACE"/>
-  <logger name="io.ebean.DDL" level="DEBUG"/>
+  <!--<logger name="org.avaje.docker" level="TRACE"/>-->
+  <!--<logger name="io.ebean.DDL" level="DEBUG"/>-->
 
-  <logger name="io.ebean.SQL" level="TRACE"/>
-  <logger name="io.ebean.TXN" level="TRACE"/>
-  <logger name="io.ebean.SUM" level="TRACE"/>
+  <!--<logger name="io.ebean.SQL" level="TRACE"/>-->
+  <!--<logger name="io.ebean.TXN" level="TRACE"/>-->
+  <!--<logger name="io.ebean.SUM" level="TRACE"/>-->
 
-  <logger name="io.ebean.cache.TABLEMOD" level="TRACE"/>
+  <!--<logger name="io.ebean.cache.TABLEMOD" level="TRACE"/>-->
 
-  <logger name="io.ebean.cache.QUERY" level="TRACE"/>
-  <logger name="io.ebean.cache.BEAN" level="TRACE"/>
-  <logger name="io.ebean.cache.NATKEY" level="TRACE"/>
-  <logger name="io.ebean.cache.COLL" level="TRACE"/>
+  <!--<logger name="io.ebean.cache.QUERY" level="TRACE"/>-->
+  <!--<logger name="io.ebean.cache.BEAN" level="TRACE"/>-->
+  <!--<logger name="io.ebean.cache.NATKEY" level="TRACE"/>-->
+  <!--<logger name="io.ebean.cache.COLL" level="TRACE"/>-->
 
   <!--<logger name="io.ebeaninternal.server.deploy" level="TRACE"/>-->
 

From 435e1f61fe92a142272fdcbd83737091394d8867 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 13 Mar 2019 15:05:08 +1300
Subject: [PATCH 0767/1036] #1651 - ENH: Support change to io.ebean.Model that
 supports named databases (other than default database)

---
 .../server/deploy/parse/DeployCreateProperties.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
index 29c64d4d1..7000ba2b1 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
@@ -64,7 +64,7 @@ public class DeployCreateProperties {
    * </p>
    */
   private boolean ignoreFieldByName(String fieldName) {
-    if (fieldName.startsWith("_ebean_")) {
+    if (fieldName.startsWith("_ebean_") || fieldName.equals("_$targetDatabase")) {
       // ignore Ebean internal fields
       return true;
     }

From aef512a851a47c04a48fe965b54732bc46d60cd7 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 14 Mar 2019 00:08:13 +1300
Subject: [PATCH 0768/1036] #1653 - ENH: Add support for ClickHouse database

---
 pom.xml                                       |  4 +-
 .../clickhouse/ClickHousePlatform.java        | 45 ++++++++++++++++
 .../dbmigration/DdlGenerator.java             |  4 +-
 .../dbmigration/DefaultDbMigration.java       |  7 +++
 .../ddlgeneration/platform/BaseTableDdl.java  | 13 +++++
 .../ddlgeneration/platform/ClickHouseDdl.java | 42 +++++++++++++++
 .../ddlgeneration/platform/PlatformDdl.java   | 53 ++++++++++++++-----
 .../dbmigration/migration/CreateTable.java    | 22 ++++++++
 .../dbmigration/model/CurrentModel.java       |  4 +-
 .../dbmigration/model/MTable.java             |  8 +++
 .../model/build/ModelBuildBeanVisitor.java    |  1 +
 .../server/core/DatabasePlatformFactory.java  |  6 +++
 .../server/core/PlatformDdlBuilder.java       |  3 ++
 .../server/deploy/BeanDescriptor.java         | 17 ++++--
 .../deploy/meta/DeployBeanDescriptor.java     | 12 ++++-
 .../server/deploy/parse/AnnotationClass.java  |  6 +++
 src/main/resources/ebean-dbmigration-1.0.xsd  |  1 +
 17 files changed, 224 insertions(+), 24 deletions(-)
 create mode 100644 src/main/java/io/ebean/config/dbplatform/clickhouse/ClickHousePlatform.java
 create mode 100644 src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdl.java

diff --git a/pom.xml b/pom.xml
index 046f747f9..31a26c797 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,13 +111,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>persistence-api</artifactId>
-      <version>2.2.1</version>
+      <version>2.2.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>4.6</version>
+      <version>4.7</version>
     </dependency>
 
     <dependency>
diff --git a/src/main/java/io/ebean/config/dbplatform/clickhouse/ClickHousePlatform.java b/src/main/java/io/ebean/config/dbplatform/clickhouse/ClickHousePlatform.java
new file mode 100644
index 000000000..c4bf13641
--- /dev/null
+++ b/src/main/java/io/ebean/config/dbplatform/clickhouse/ClickHousePlatform.java
@@ -0,0 +1,45 @@
+package io.ebean.config.dbplatform.clickhouse;
+
+import io.ebean.annotation.Platform;
+import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebean.config.dbplatform.DbPlatformType;
+import io.ebean.config.dbplatform.DbType;
+import io.ebean.config.dbplatform.IdType;
+
+import java.sql.Types;
+
+public class ClickHousePlatform extends DatabasePlatform {
+
+  public ClickHousePlatform() {
+    super();
+    this.platform = Platform.CLICKHOUSE;
+    //this.dbEncrypt =
+    //this.historySupport =
+    //this.exceptionTranslator =
+
+    this.nativeUuidType = true;
+    this.dbDefaultValue.setNow("now()");
+    this.columnAliasPrefix = null;
+
+    this.dbIdentity.setIdType(IdType.IDENTITY);
+    this.dbIdentity.setSupportsGetGeneratedKeys(false);
+    this.dbIdentity.setSupportsSequence(false);
+    this.dbIdentity.setSupportsIdentity(true);
+
+    this.booleanDbType = Types.INTEGER;
+    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("UInt8"));
+
+    // using unsigned as default types ...
+    dbTypeMap.put(DbType.TINYINT, new DbPlatformType("UInt8", false));
+    dbTypeMap.put(DbType.SMALLINT, new DbPlatformType("UInt16", false));
+    dbTypeMap.put(DbType.INTEGER, new DbPlatformType("UInt32", false));
+    dbTypeMap.put(DbType.BIGINT, new DbPlatformType("UInt64", false));
+    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("Decimal", 38));
+
+    dbTypeMap.put(DbType.VARCHAR, new DbPlatformType("String", false));
+    dbTypeMap.put(DbType.DATE, new DbPlatformType("Date", false));
+    dbTypeMap.put(DbType.TIMESTAMP, new DbPlatformType("DateTime", false));
+
+    dbTypeMap.put(DbType.UUID, new DbPlatformType("UUID", false));
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
index 64af8454f..fd533a8fd 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
@@ -189,7 +189,7 @@ public class DdlGenerator {
     runScript(connection, false, createAllContent, getCreateFileName());
 
     if (extraDdl && jaxbPresent) {
-      if (currentModel.isTablePartitioning()) {
+      if (currentModel().isTablePartitioning()) {
         String extraPartitioning = ExtraDdlXmlReader.buildPartitioning(server.getDatabasePlatform().getName());
         if (extraPartitioning != null && !extraPartitioning.isEmpty()) {
           runScript(connection, false, extraPartitioning, "builtin-partitioning-ddl");
@@ -201,7 +201,7 @@ public class DdlGenerator {
         runScript(connection, false, extraApply, "extra-ddl");
       }
 
-      if (currentModel.isTablePartitioning()) {
+      if (currentModel().isTablePartitioning()) {
         checkInitialTablePartitions(connection);
       }
     }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index 6c40cd09b..464fdfbdc 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -8,6 +8,8 @@ import io.ebean.config.DbMigrationConfig;
 import io.ebean.config.PlatformConfig;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebean.config.dbplatform.clickhouse.ClickHousePlatform;
+import io.ebean.config.dbplatform.cockroach.CockroachPlatform;
 import io.ebean.config.dbplatform.db2.DB2Platform;
 import io.ebean.config.dbplatform.h2.H2Platform;
 import io.ebean.config.dbplatform.hana.HanaPlatform;
@@ -802,6 +804,11 @@ public class DefaultDbMigration implements DbMigration {
         return new SQLitePlatform();
       case HANA:
         return new HanaPlatform();
+      case COCKROACH:
+        return new CockroachPlatform();
+      case CLICKHOUSE:
+        return new ClickHousePlatform();
+
       case GENERIC:
         return new DatabasePlatform();
 
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
index 859c73399..96fd2a5fc 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
@@ -276,6 +276,7 @@ public class BaseTableDdl implements TableDdl {
     }
 
     apply.newLine().append(")");
+    addTableStorageEngine(apply, createTable);
     addTableCommentInline(apply, createTable);
     if (partitionMode != null) {
       platformDdl.addTablePartition(apply, partitionMode, createTable.getPartitionColumn());
@@ -329,6 +330,18 @@ public class BaseTableDdl implements TableDdl {
     }
   }
 
+  /**
+   * Add the table storage engine clause.
+   */
+  private void addTableStorageEngine(DdlBuffer apply, CreateTable createTable) throws IOException {
+    if (platformDdl.isIncludeStorageEngine()) {
+      String storageEngine = createTable.getStorageEngine();
+      if (!StringHelper.isNull(storageEngine)) {
+        platformDdl.tableStorageEngine(apply, storageEngine);
+      }
+    }
+  }
+
   /**
    * Add the table comment inline with the create table statement.
    */
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdl.java
new file mode 100644
index 000000000..4907ce6f0
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdl.java
@@ -0,0 +1,42 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+
+import java.io.IOException;
+
+public class ClickHouseDdl extends PlatformDdl {
+
+  public ClickHouseDdl(DatabasePlatform platform) {
+    super(platform);
+    this.includeStorageEngine = true;
+  }
+
+  /**
+   * Add an table storage engine to the create table statement.
+   */
+  @Override
+  public void tableStorageEngine(DdlBuffer apply, String storageEngine) throws IOException {
+    apply.append(" ").append(storageEngine);
+  }
+
+  @Override
+  protected void writeColumnNotNull(DdlBuffer buffer) {
+    // do nothing
+  }
+
+  @Override
+  public void addTableComment(DdlBuffer apply, String tableName, String tableComment) {
+    // do nothing
+  }
+
+  @Override
+  public void addColumnComment(DdlBuffer apply, String table, String column, String comment) {
+    // do nothing
+  }
+
+  @Override
+  public boolean isInlineComments() {
+    return false;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
index f6a65da81..d76c6bd44 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -118,6 +118,8 @@ public class PlatformDdl {
    */
   protected boolean inlineForeignKeys;
 
+  protected boolean includeStorageEngine;
+
   protected final DbDefaultValue dbDefaultValue;
 
   protected String fallbackArrayType = "varchar(1000)";
@@ -191,6 +193,13 @@ public class PlatformDdl {
     return inlineComments;
   }
 
+  /**
+   * Return true if the platform includes storage engine clause.
+   */
+  public boolean isIncludeStorageEngine() {
+    return includeStorageEngine;
+  }
+
   /**
    * Return true if foreign key reference constraints need to inlined with create table.
    * Ideally we don't do this as then the constraints are not named. Do this for SQLite.
@@ -230,13 +239,20 @@ public class PlatformDdl {
       }
     }
     if (isTrue(column.isNotnull()) || isTrue(column.isPrimaryKey())) {
-      buffer.append(" not null");
+      writeColumnNotNull(buffer);
     }
 
     // add check constraints later as we really want to give them a nice name
     // so that the database can potentially provide a nice SQL error
   }
 
+  /**
+   * Allow for platform overriding (e.g. ClickHouse).
+   */
+  protected void writeColumnNotNull(DdlBuffer buffer) throws IOException {
+    buffer.append(" not null");
+  }
+
   /**
    * Convert the DB column default literal to platform specific.
    */
@@ -409,13 +425,17 @@ public class PlatformDdl {
   }
 
   protected String translate(ConstraintMode mode) {
-    switch(mode) {
-      case SET_NULL: return "set null";
-      case SET_DEFAULT: return "set default";
-      case RESTRICT: return "restrict";
-      case CASCADE: return "cascade";
+    switch (mode) {
+      case SET_NULL:
+        return "set null";
+      case SET_DEFAULT:
+        return "set default";
+      case RESTRICT:
+        return "restrict";
+      case CASCADE:
+        return "cascade";
       default:
-        throw new IllegalStateException("Unknown mode "+mode);
+        throw new IllegalStateException("Unknown mode " + mode);
     }
   }
 
@@ -465,7 +485,7 @@ public class PlatformDdl {
 
     if (!onHistoryTable) {
       if (isTrue(column.isNotnull())) {
-        buffer.append(" not null");
+        writeColumnNotNull(buffer);
       }
       buffer.append(addColumnSuffix);
       buffer.endOfStatement();
@@ -473,7 +493,7 @@ public class PlatformDdl {
       // check constraints cannot be added in one statement for h2
       if (!StringHelper.isNull(column.getCheckConstraint())) {
         String ddl = alterTableAddCheckConstraint(tableName, column.getCheckConstraintName(),
-            column.getCheckConstraint());
+          column.getCheckConstraint());
         buffer.append(ddl).endOfStatement();
       }
     } else {
@@ -485,7 +505,7 @@ public class PlatformDdl {
 
   public void alterTableDropColumn(DdlBuffer buffer, String tableName, String columnName) throws IOException {
     buffer.append("alter table ").append(tableName).append(" ").append(dropColumn).append(" ").append(columnName)
-    .append(dropColumnSuffix).endOfStatement();
+      .append(dropColumnSuffix).endOfStatement();
   }
 
   /**
@@ -607,6 +627,13 @@ public class PlatformDdl {
     // do nothing by default (MySql only)
   }
 
+  /**
+   * Add an table storage engine to the create table statement.
+   */
+  public void tableStorageEngine(DdlBuffer apply, String storageEngine) throws IOException {
+    // do nothing by default
+  }
+
   /**
    * Add table comment as a separate statement (from the create table statement).
    */
@@ -643,10 +670,10 @@ public class PlatformDdl {
 
   /**
    * Shortens the given name to the maximum constraint name length of the platform in a deterministic way.
-   *
+   * <p>
    * First, all vowels are removed, If the string is still to long, 31 bits are taken from the hash code
    * of the string and base36 encoded (10 digits and 26 chars) string.
-   *
+   * <p>
    * As 36^6 > 31^2, the resulting string is never longer as 6 chars.
    */
   protected String maxConstraintName(String name) {
@@ -654,7 +681,7 @@ public class PlatformDdl {
       int hash = name.hashCode() & 0x7FFFFFFF;
       name = VowelRemover.trim(name, 4);
       if (name.length() > platform.getMaxConstraintNameLength()) {
-        return name.substring(0, platform.getMaxConstraintNameLength()-7) + "_" + Integer.toString(hash, 36);
+        return name.substring(0, platform.getMaxConstraintNameLength() - 7) + "_" + Integer.toString(hash, 36);
       }
     }
     return name;
diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java b/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java
index cf27b1ce0..c088ffc09 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java
@@ -77,6 +77,8 @@ public class CreateTable {
   protected BigInteger sequenceAllocate;
   @XmlAttribute(name = "pkName")
   protected String pkName;
+  @XmlAttribute(name = "storageEngine")
+  protected String storageEngine;
   @XmlAttribute(name = "tablespace")
   protected String tablespace;
   @XmlAttribute(name = "indexTablespace")
@@ -365,6 +367,26 @@ public class CreateTable {
     this.pkName = value;
   }
 
+  /**
+   * Gets the value of the storageEngine property.
+   *
+   * @return possible object is
+   * {@link String }
+   */
+  public String getStorageEngine() {
+    return storageEngine;
+  }
+
+  /**
+   * Sets the value of the storageEngine property.
+   *
+   * @param value allowed object is
+   *              {@link String }
+   */
+  public void setStorageEngine(String value) {
+    this.storageEngine = value;
+  }
+
   /**
    * Gets the value of the tablespace property.
    *
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java b/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
index b3f783a0b..e37ca0377 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
@@ -67,14 +67,14 @@ public class CurrentModel {
    * Return true if the model contains tables that are partitioned.
    */
   public boolean isTablePartitioning() {
-    return model.isTablePartitioning();
+    return read().isTablePartitioning();
   }
 
   /**
    * Return the tables that have partitioning.
    */
   public List<MTable> getPartitionedTables() {
-    return model.getPartitionedTables();
+    return read().getPartitionedTables();
   }
 
   private static DbConstraintNaming.MaxLength maxLength(SpiEbeanServer server, DbConstraintNaming naming) {
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
index 2a6b0a8b3..c80281472 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
@@ -79,6 +79,8 @@ public class MTable {
    */
   private String tablespace;
 
+  private String storageEngine;
+
   /**
    * Tablespace to use for indexes on this table.
    */
@@ -159,6 +161,7 @@ public class MTable {
     this.name = createTable.getName();
     this.pkName = createTable.getPkName();
     this.comment = createTable.getComment();
+    this.storageEngine = createTable.getStorageEngine();
     this.tablespace = createTable.getTablespace();
     this.indexTablespace = createTable.getIndexTablespace();
     this.withHistory = Boolean.TRUE.equals(createTable.isWithHistory());
@@ -244,6 +247,7 @@ public class MTable {
       createTable.setPartitionMode(partitionMeta.getMode().name());
       createTable.setPartitionColumn(partitionMeta.getProperty());
     }
+    createTable.setStorageEngine(storageEngine);
     createTable.setTablespace(tablespace);
     createTable.setIndexTablespace(indexTablespace);
     createTable.setSequenceName(sequenceName);
@@ -452,6 +456,10 @@ public class MTable {
     this.comment = comment;
   }
 
+  public void setStorageEngine(String storageEngine) {
+    this.storageEngine = storageEngine;
+  }
+
   public String getTablespace() {
     return tablespace;
   }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitor.java b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitor.java
index 8ac300074..9b6e3147e 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitor.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitor.java
@@ -36,6 +36,7 @@ public class ModelBuildBeanVisitor implements BeanVisitor {
     }
 
     MTable table = new MTable(descriptor.getBaseTable());
+    table.setStorageEngine(descriptor.getStorageEngine());
     table.setPartitionMeta(descriptor.getPartitionMeta());
     table.setComment(descriptor.getDbComment());
     if (descriptor.isHistorySupport()) {
diff --git a/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java b/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
index b5a5b6ef5..9cd221c92 100644
--- a/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
+++ b/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.core;
 
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebean.config.dbplatform.clickhouse.ClickHousePlatform;
 import io.ebean.config.dbplatform.cockroach.CockroachPlatform;
 import io.ebean.config.dbplatform.db2.DB2Platform;
 import io.ebean.config.dbplatform.h2.H2Platform;
@@ -104,6 +105,9 @@ public class DatabasePlatformFactory {
     if (dbName.equals("db2")) {
       return new DB2Platform();
     }
+    if (dbName.equals("clickhouse")) {
+      return new ClickHousePlatform();
+    }
     if (dbName.equals("sqlite")) {
       return new SQLitePlatform();
     }
@@ -162,6 +166,8 @@ public class DatabasePlatformFactory {
       return new SqlAnywherePlatform();
     } else if (dbProductName.contains("hdb")) {
       return new HanaPlatform();
+    } else if (dbProductName.contains("clickhouse")) {
+      return new ClickHousePlatform();
     }
 
     // use the standard one
diff --git a/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java b/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java
index dbf657c49..34e696735 100644
--- a/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.core;
 
 import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.ClickHouseDdl;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.CockroachDdl;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.DB2Ddl;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.H2Ddl;
@@ -50,6 +51,8 @@ public class PlatformDdlBuilder {
         return new SqlServerDdl(platform);
       case HANA:
         return new HanaColumnStoreDdl(platform);
+      case CLICKHOUSE:
+        return new ClickHouseDdl(platform);
       default:
         return new PlatformDdl(platform);
     }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 8add0f49a..7d3cba9c1 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -211,6 +211,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   private final String draftTable;
 
   private final PartitionMeta partitionMeta;
+  private final String storageEngine;
 
   /**
    * DB table comment.
@@ -492,6 +493,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     this.dependentTables = deploy.getDependentTables();
     this.dbComment = deploy.getDbComment();
     this.partitionMeta = deploy.getPartitionMeta();
+    this.storageEngine = deploy.getStorageEngine();
     this.autoTunable = EntityType.ORM == entityType && (beanFinder == null);
 
     // helper object used to derive lists of properties
@@ -1970,10 +1972,10 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     DefaultOrmQuery<T> query = new DefaultOrmQuery<>(this, ebeanServer, ebeanServer.getExpressionFactory());
     query.setPersistenceContext(pc);
     return query
-        // .select(getIdProperty().getName())
-        // we do not select the id because we
-        // probably have to load the entire bean
-        .setId(id).findOne();
+      // .select(getIdProperty().getName())
+      // we do not select the id because we
+      // probably have to load the entire bean
+      .setId(id).findOne();
   }
 
   /**
@@ -2874,6 +2876,13 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return partitionMeta;
   }
 
+  /**
+   * Return the storage engine.
+   */
+  public String getStorageEngine() {
+    return storageEngine;
+  }
+
   /**
    * Return the dependent tables for a view based entity.
    * <p>
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index 18873232a..b43b0d6fc 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -136,6 +136,8 @@ public class DeployBeanDescriptor<T> {
 
   private List<IndexDefinition> indexDefinitions;
 
+  private String storageEngine;
+
   /**
    * The base database table.
    */
@@ -275,6 +277,14 @@ public class DeployBeanDescriptor<T> {
     return Modifier.isAbstract(beanType.getModifiers());
   }
 
+  public void setStorageEngine(String storageEngine) {
+    this.storageEngine = storageEngine;
+  }
+
+  public String getStorageEngine() {
+    return storageEngine;
+  }
+
   /**
    * Set to true for @History entity beans that have history.
    */
@@ -315,7 +325,7 @@ public class DeployBeanDescriptor<T> {
     this.partitionMeta = partitionMeta;
   }
 
-  public PartitionMeta  getPartitionMeta() {
+  public PartitionMeta getPartitionMeta() {
     if (partitionMeta != null) {
       DeployBeanProperty beanProperty = getBeanProperty(partitionMeta.getProperty());
       if (beanProperty != null) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
index 083d04b61..657c94797 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
@@ -10,6 +10,7 @@ import io.ebean.annotation.History;
 import io.ebean.annotation.Index;
 import io.ebean.annotation.InvalidateQueryCache;
 import io.ebean.annotation.ReadAudit;
+import io.ebean.annotation.StorageEngine;
 import io.ebean.annotation.UpdateMode;
 import io.ebean.annotation.View;
 import io.ebean.config.TableName;
@@ -154,6 +155,11 @@ public class AnnotationClass extends AnnotationParser {
       }
     }
 
+    StorageEngine storage = AnnotationUtil.findAnnotationRecursive(cls, StorageEngine.class);
+    if (storage != null) {
+      descriptor.setStorageEngine(storage.value());
+    }
+
     DbPartition partition = AnnotationUtil.findAnnotationRecursive(cls, DbPartition.class);
     if (partition != null) {
       descriptor.setPartitionMeta(new PartitionMeta(partition.mode(), partition.property()));
diff --git a/src/main/resources/ebean-dbmigration-1.0.xsd b/src/main/resources/ebean-dbmigration-1.0.xsd
index a78d2fade..3066f38b1 100644
--- a/src/main/resources/ebean-dbmigration-1.0.xsd
+++ b/src/main/resources/ebean-dbmigration-1.0.xsd
@@ -116,6 +116,7 @@
       <xsd:attribute name="sequenceInitial" type="xsd:positiveInteger"/>
       <xsd:attribute name="sequenceAllocate" type="xsd:positiveInteger"/>
       <xsd:attribute name="pkName" type="xsd:string"/>
+      <xsd:attribute name="storageEngine" type="xsd:string"/>
       <xsd:attributeGroup ref="tablespaceAttributes"/>
     </xsd:complexType>
   </xsd:element>

From 01f2881940732a3dde69c8a4f9f941d5b92b3686 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 14 Mar 2019 14:44:30 +1300
Subject: [PATCH 0769/1036] #1653 - ENH: Add support for ClickHouse database

With array type conversion etc
---
 .../clickhouse/ClickHousePlatform.java        |  11 +-
 .../dbmigration/ddlgeneration/DdlBuffer.java  |   5 +
 .../ddlgeneration/platform/BaseDdlBuffer.java |  13 +-
 .../ddlgeneration/platform/BaseTableDdl.java  | 175 ++++++------------
 .../platform/ClickHouseDbArray.java           |  33 ++++
 .../ddlgeneration/platform/ClickHouseDdl.java |  44 +++++
 .../platform/ClickHouseDdlHandler.java        |  11 ++
 .../platform/ClickHouseTableDdl.java          |  34 ++++
 .../ddlgeneration/platform/MySqlDdl.java      |   1 -
 .../platform/BaseTableDdlTest.java            |  18 ++
 .../platform/ClickHouseDbArrayTest.java       |  24 +++
 11 files changed, 243 insertions(+), 126 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDbArray.java
 create mode 100644 src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdlHandler.java
 create mode 100644 src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseTableDdl.java
 create mode 100644 src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDbArrayTest.java

diff --git a/src/main/java/io/ebean/config/dbplatform/clickhouse/ClickHousePlatform.java b/src/main/java/io/ebean/config/dbplatform/clickhouse/ClickHousePlatform.java
index c4bf13641..1a1d45a79 100644
--- a/src/main/java/io/ebean/config/dbplatform/clickhouse/ClickHousePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/clickhouse/ClickHousePlatform.java
@@ -34,12 +34,19 @@ public class ClickHousePlatform extends DatabasePlatform {
     dbTypeMap.put(DbType.SMALLINT, new DbPlatformType("UInt16", false));
     dbTypeMap.put(DbType.INTEGER, new DbPlatformType("UInt32", false));
     dbTypeMap.put(DbType.BIGINT, new DbPlatformType("UInt64", false));
-    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("Decimal", 38));
+    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("Decimal", 16,4));
+    dbTypeMap.put(DbType.DOUBLE, new DbPlatformType("Float64", false));
 
-    dbTypeMap.put(DbType.VARCHAR, new DbPlatformType("String", false));
     dbTypeMap.put(DbType.DATE, new DbPlatformType("Date", false));
     dbTypeMap.put(DbType.TIMESTAMP, new DbPlatformType("DateTime", false));
 
+    dbTypeMap.put(DbType.VARCHAR, new DbPlatformType("String", false));
+    dbTypeMap.put(DbType.LONGVARCHAR, new DbPlatformType("String", false));
+    dbTypeMap.put(DbType.CLOB, new DbPlatformType("String", false));
+    dbTypeMap.put(DbType.JSONVARCHAR, new DbPlatformType("String", false));
+
     dbTypeMap.put(DbType.UUID, new DbPlatformType("UUID", false));
+    dbTypeMap.put(DbType.INET, new DbPlatformType("String", false));
+    dbTypeMap.put(DbType.CDIR, new DbPlatformType("String", false));
   }
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlBuffer.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlBuffer.java
index 2ecbdc8ea..5d37cb762 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlBuffer.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlBuffer.java
@@ -19,6 +19,11 @@ public interface DdlBuffer {
    */
   boolean isEmpty();
 
+  /**
+   * Append a statement allowing for null or empty statements.
+   */
+  DdlBuffer appendStatement(String content) throws IOException;
+
   /**
    * Append DDL content to the buffer.
    */
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java
index fad70f133..e54e91ba0 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java
@@ -38,6 +38,15 @@ public class BaseDdlBuffer implements DdlBuffer {
     return this;
   }
 
+  @Override
+  public DdlBuffer appendStatement(String content) throws IOException {
+    if (content != null && !content.isEmpty()) {
+      writer.append(content);
+      endOfStatement();
+    }
+    return this;
+  }
+
   @Override
   public DdlBuffer append(String content) throws IOException {
     writer.append(content);
@@ -73,7 +82,9 @@ public class BaseDdlBuffer implements DdlBuffer {
    */
   @Override
   public DdlBuffer end() throws IOException {
-    writer.append("\n");
+    if (!isEmpty()) {
+      writer.append("\n");
+    }
     return this;
   }
 
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
index 96fd2a5fc..1de59a353 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
@@ -37,6 +37,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import static io.ebeaninternal.dbmigration.ddlgeneration.platform.SplitColumns.split;
+
 /**
  * Base implementation for 'create table' and 'alter table' statements.
  */
@@ -148,8 +150,7 @@ public class BaseTableDdl implements TableDdl {
         buffer.append("-- NOTE: table has @History - special migration may be necessary").newLine();
       }
       for (String ddlScript : before) {
-        buffer.append(translate(ddlScript, tableName, columnName, this.defaultValue));
-        buffer.endOfStatement();
+        buffer.appendStatement(translate(ddlScript, tableName, columnName, this.defaultValue));
       }
     }
 
@@ -159,8 +160,7 @@ public class BaseTableDdl implements TableDdl {
       }
       // here we run post migration scripts
       for (String ddlScript : after) {
-        buffer.append(translate(ddlScript, tableName, columnName, defaultValue));
-        buffer.endOfStatement();
+        buffer.appendStatement(translate(ddlScript, tableName, columnName, defaultValue));
       }
       if (!after.isEmpty()) {
         buffer.end();
@@ -317,12 +317,11 @@ public class BaseTableDdl implements TableDdl {
   private void addComments(DdlBuffer apply, CreateTable createTable) throws IOException {
     if (!platformDdl.isInlineComments()) {
       String tableComment = createTable.getComment();
-      if (!StringHelper.isNull(tableComment)) {
+      if (hasValue(tableComment)) {
         platformDdl.addTableComment(apply, createTable.getName(), tableComment);
       }
 
-      List<Column> columns = createTable.getColumn();
-      for (Column column : columns) {
+      for (Column column : createTable.getColumn()) {
         if (!StringHelper.isNull(column.getComment())) {
           platformDdl.addColumnComment(apply, createTable.getName(), column.getName(), column.getComment());
         }
@@ -335,10 +334,7 @@ public class BaseTableDdl implements TableDdl {
    */
   private void addTableStorageEngine(DdlBuffer apply, CreateTable createTable) throws IOException {
     if (platformDdl.isIncludeStorageEngine()) {
-      String storageEngine = createTable.getStorageEngine();
-      if (!StringHelper.isNull(storageEngine)) {
-        platformDdl.tableStorageEngine(apply, storageEngine);
-      }
+      platformDdl.tableStorageEngine(apply, createTable.getStorageEngine());
     }
   }
 
@@ -371,26 +367,17 @@ public class BaseTableDdl implements TableDdl {
         uqName = col.getUnique();
       }
       String[] columnNames = {col.getName()};
-      write.apply()
-        .append(platformDdl.alterTableAddUniqueConstraint(tableName, uqName, columnNames, Boolean.TRUE.equals(col.isNotnull()) ? null : columnNames))
-        .endOfStatement();
-
-      write.dropAllForeignKeys()
-        .append(platformDdl.dropIndex(uqName, tableName))
-        .endOfStatement();
+      write.apply().appendStatement(platformDdl.alterTableAddUniqueConstraint(tableName, uqName, columnNames, Boolean.TRUE.equals(col.isNotnull()) ? null : columnNames));
+      write.dropAllForeignKeys().appendStatement(platformDdl.dropIndex(uqName, tableName));
     }
 
     for (UniqueConstraint constraint : externalCompoundUnique) {
       String uqName = constraint.getName();
-      String[] columnNames = SplitColumns.split(constraint.getColumnNames());
-      String[] nullableColumns = SplitColumns.split(constraint.getNullableColumns());
-      write.apply()
-        .append(platformDdl.alterTableAddUniqueConstraint(tableName, uqName, columnNames, nullableColumns))
-        .endOfStatement();
+      String[] columnNames = split(constraint.getColumnNames());
+      String[] nullableColumns = split(constraint.getNullableColumns());
 
-      write.dropAllForeignKeys()
-        .append(platformDdl.dropIndex(uqName, tableName))
-        .endOfStatement();
+      write.apply().appendStatement(platformDdl.alterTableAddUniqueConstraint(tableName, uqName, columnNames, nullableColumns));
+      write.dropAllForeignKeys().appendStatement(platformDdl.dropIndex(uqName, tableName));
     }
   }
 
@@ -407,9 +394,9 @@ public class BaseTableDdl implements TableDdl {
     }
 
     String createSeq = platformDdl.createSequence(seqName, initial, allocate);
-    if (createSeq != null) {
+    if (hasValue(createSeq)) {
       writer.apply().append(createSeq).newLine();
-      writer.dropAll().append(platformDdl.dropSequence(seqName)).endOfStatement();
+      writer.dropAll().appendStatement(platformDdl.dropSequence(seqName));
     }
   }
 
@@ -438,8 +425,7 @@ public class BaseTableDdl implements TableDdl {
 
   protected void writeInlineCompoundForeignKeys(DdlWrite write, CreateTable createTable) throws IOException {
 
-    List<ForeignKey> foreignKey = createTable.getForeignKey();
-    for (ForeignKey key : foreignKey) {
+    for (ForeignKey key : createTable.getForeignKey()) {
       String fkConstraint = platformDdl.tableInlineForeignKey(new WriteForeignKey(null, key));
       write.apply().append(",").newLine().append("  ").append(fkConstraint);
     }
@@ -447,12 +433,10 @@ public class BaseTableDdl implements TableDdl {
 
   protected void writeAddForeignKeys(DdlWrite write, CreateTable createTable) throws IOException {
 
-    String tableName = createTable.getName();
-    List<Column> columns = createTable.getColumn();
-    for (Column column : columns) {
+    for (Column column : createTable.getColumn()) {
       String references = column.getReferences();
       if (hasValue(references)) {
-        writeForeignKey(write, tableName, column);
+        writeForeignKey(write, createTable.getName(), column);
       }
     }
 
@@ -461,11 +445,8 @@ public class BaseTableDdl implements TableDdl {
 
   protected void writeAddCompoundForeignKeys(DdlWrite write, CreateTable createTable) throws IOException {
 
-    String tableName = createTable.getName();
-
-    List<ForeignKey> foreignKey = createTable.getForeignKey();
-    for (ForeignKey key : foreignKey) {
-      writeForeignKey(write, new WriteForeignKey(tableName, key));
+    for (ForeignKey key : createTable.getForeignKey()) {
+      writeForeignKey(write, new WriteForeignKey(createTable.getName(), key));
     }
   }
 
@@ -479,19 +460,15 @@ public class BaseTableDdl implements TableDdl {
     String tableName = lowerTableName(request.table());
     if (request.indexName() != null) {
       // no matching unique constraint so add the index
-      fkeyBuffer.append(platformDdl.createIndex(request.indexName(), tableName, request.cols())).endOfStatement();
+      fkeyBuffer.appendStatement(platformDdl.createIndex(request.indexName(), tableName, request.cols()));
     }
 
     alterTableAddForeignKey(fkeyBuffer, request);
-
     fkeyBuffer.end();
 
-    write.dropAllForeignKeys()
-      .append(platformDdl.alterTableDropForeignKey(tableName, request.fkName())).endOfStatement();
-
-    if (request.indexName() != null) {
-      write.dropAllForeignKeys()
-        .append(platformDdl.dropIndex(request.indexName(), tableName)).endOfStatement();
+    write.dropAllForeignKeys().appendStatement(platformDdl.alterTableDropForeignKey(tableName, request.fkName()));
+    if (hasValue(request.indexName())) {
+      write.dropAllForeignKeys().appendStatement(platformDdl.dropIndex(request.indexName(), tableName));
     }
 
     write.dropAllForeignKeys().end();
@@ -499,10 +476,7 @@ public class BaseTableDdl implements TableDdl {
 
   protected void alterTableAddForeignKey(DdlBuffer buffer, WriteForeignKey request) throws IOException {
 
-    String fkConstraint = platformDdl.alterTableAddForeignKey(request);
-    if (fkConstraint != null && !fkConstraint.isEmpty()) {
-      buffer.append(fkConstraint).endOfStatement();
-    }
+    buffer.appendStatement(platformDdl.alterTableAddForeignKey(request));
   }
 
   protected void appendColumns(String[] columns, DdlBuffer buffer) throws IOException {
@@ -516,13 +490,12 @@ public class BaseTableDdl implements TableDdl {
     buffer.append(")");
   }
 
-
   /**
    * Add 'drop table' statement to the buffer.
    */
   protected void dropTable(DdlBuffer buffer, String tableName) throws IOException {
 
-    buffer.append(platformDdl.dropTable(tableName)).endOfStatement();
+    buffer.appendStatement(platformDdl.dropTable(tableName));
   }
 
   /**
@@ -530,7 +503,7 @@ public class BaseTableDdl implements TableDdl {
    */
   protected void dropSequence(DdlBuffer buffer, String sequenceName) throws IOException {
 
-    buffer.append(platformDdl.dropSequence(sequenceName)).endOfStatement();
+    buffer.appendStatement(platformDdl.dropSequence(sequenceName));
   }
 
   /**
@@ -538,8 +511,7 @@ public class BaseTableDdl implements TableDdl {
    */
   protected void writeCheckConstraints(DdlBuffer apply, CreateTable createTable) throws IOException {
 
-    List<Column> columns = createTable.getColumn();
-    for (Column column : columns) {
+    for (Column column : createTable.getColumn()) {
       String checkConstraint = column.getCheckConstraint();
       if (hasValue(checkConstraint)) {
         writeCheckConstraint(apply, column, checkConstraint);
@@ -561,12 +533,11 @@ public class BaseTableDdl implements TableDdl {
 
   protected void writeCompoundUniqueConstraints(DdlBuffer apply, CreateTable createTable) throws IOException {
 
-    List<UniqueConstraint> uniqueConstraints = createTable.getUniqueConstraint();
     boolean inlineUniqueWhenNull = platformDdl.isInlineUniqueWhenNullable();
-    for (UniqueConstraint uniqueConstraint : uniqueConstraints) {
+    for (UniqueConstraint uniqueConstraint : createTable.getUniqueConstraint()) {
        if (inlineUniqueWhenNull) {
         String uqName = uniqueConstraint.getName();
-        String[] columns = SplitColumns.split(uniqueConstraint.getColumnNames());
+        String[] columns = split(uniqueConstraint.getColumnNames());
         apply.append(",").newLine();
         apply.append("  constraint ").append(uqName).append(" unique");
         appendColumns(columns, apply);
@@ -663,54 +634,34 @@ public class BaseTableDdl implements TableDdl {
 
   @Override
   public void generate(DdlWrite writer, CreateIndex createIndex) throws IOException {
-
-    String[] cols = SplitColumns.split(createIndex.getColumns());
-    writer.apply()
-      .append(platformDdl.createIndex(createIndex.getIndexName(), createIndex.getTableName(), cols))
-      .endOfStatement();
-
-    writer.dropAll()
-      .append(platformDdl.dropIndex(createIndex.getIndexName(), createIndex.getTableName()))
-      .endOfStatement();
+    writer.apply().appendStatement(platformDdl.createIndex(createIndex.getIndexName(), createIndex.getTableName(), split(createIndex.getColumns())));
+    writer.dropAll().appendStatement(platformDdl.dropIndex(createIndex.getIndexName(), createIndex.getTableName()));
   }
 
   @Override
   public void generate(DdlWrite writer, DropIndex dropIndex) throws IOException {
-
-    writer.apply()
-      .append(platformDdl.dropIndex(dropIndex.getIndexName(), dropIndex.getTableName()))
-      .endOfStatement();
+    writer.apply().appendStatement(platformDdl.dropIndex(dropIndex.getIndexName(), dropIndex.getTableName()));
   }
+
   @Override
   public void generate(DdlWrite writer, AddUniqueConstraint constraint) throws IOException {
 
     if (DdlHelp.isDropConstraint(constraint.getColumnNames())) {
-      String ddl = platformDdl.alterTableDropUniqueConstraint(constraint.getTableName(), constraint.getConstraintName());
-      if (hasValue(ddl)) {
-        writer.apply().append(ddl).endOfStatement();
-      }
+      writer.apply().appendStatement(platformDdl.alterTableDropUniqueConstraint(constraint.getTableName(), constraint.getConstraintName()));
+
     } else {
-      String[] cols = SplitColumns.split(constraint.getColumnNames());
-      String[] nullableColumns = SplitColumns.split(constraint.getNullableColumns());
-      String ddl = platformDdl.alterTableAddUniqueConstraint(constraint.getTableName(), constraint.getConstraintName(), cols, nullableColumns);
-      if (hasValue(ddl)) {
-        writer.apply().append(ddl).endOfStatement();
-      }
+      String[] cols = split(constraint.getColumnNames());
+      String[] nullableColumns = split(constraint.getNullableColumns());
+      writer.apply().appendStatement(platformDdl.alterTableAddUniqueConstraint(constraint.getTableName(), constraint.getConstraintName(), cols, nullableColumns));
     }
   }
 
   @Override
   public void generate(DdlWrite writer, AlterForeignKey alterForeignKey) throws IOException {
     if (DdlHelp.isDropForeignKey(alterForeignKey.getColumnNames())) {
-      String ddl = platformDdl.alterTableDropForeignKey(alterForeignKey.getTableName(), alterForeignKey.getName());
-      if (hasValue(ddl)) {
-        writer.apply().append(ddl).endOfStatement();
-      }
+      writer.apply().appendStatement(platformDdl.alterTableDropForeignKey(alterForeignKey.getTableName(), alterForeignKey.getName()));
     } else {
-      String ddl = platformDdl.alterTableAddForeignKey(new WriteForeignKey(alterForeignKey));
-      if (hasValue(ddl)) {
-        writer.apply().append(ddl).endOfStatement();
-      }
+      writer.apply().appendStatement(platformDdl.alterTableAddForeignKey(new WriteForeignKey(alterForeignKey)));
     }
   }
 
@@ -920,7 +871,7 @@ public class BaseTableDdl implements TableDdl {
 
     String ddl = platformDdl.alterColumnBaseAttributes(alter);
     if (hasValue(ddl)) {
-      writer.apply().append(ddl).endOfStatement();
+      writer.apply().appendStatement(ddl);
 
       if (isTrue(alter.isWithHistory()) && alter.getType() != null && historySupport == HistorySupport.TRIGGER_BASED) {
         // mysql and sql server column type change allowing nulls in the history table column
@@ -932,53 +883,41 @@ public class BaseTableDdl implements TableDdl {
         String histColumnDdl = platformDdl.alterColumnBaseAttributes(alterHistoryColumn);
 
         // write the apply to history table
-        writer.apply().append(histColumnDdl).endOfStatement();
+        writer.apply().appendStatement(histColumnDdl);
       }
     }
   }
 
   protected void alterColumnDefaultValue(DdlWrite writer, AlterColumn alter) throws IOException {
 
-    String ddl = platformDdl.alterColumnDefaultValue(alter.getTableName(), alter.getColumnName(), alter.getDefaultValue());
-    if (hasValue(ddl)) {
-      writer.apply().append(ddl).endOfStatement();
-    }
+    writer.apply().appendStatement(platformDdl.alterColumnDefaultValue(alter.getTableName(), alter.getColumnName(), alter.getDefaultValue()));
   }
 
   protected void dropCheckConstraint(DdlWrite writer, AlterColumn alter, String constraintName) throws IOException {
 
-    String ddl = platformDdl.alterTableDropConstraint(alter.getTableName(), constraintName);
-    if (hasValue(ddl)) {
-      writer.apply().append(ddl).endOfStatement();
-    }
+    writer.apply().appendStatement(platformDdl.alterTableDropConstraint(alter.getTableName(), constraintName));
   }
 
   protected void addCheckConstraint(DdlWrite writer, AlterColumn alter) throws IOException {
 
-    String ddl = platformDdl.alterTableAddCheckConstraint(alter.getTableName(), alter.getCheckConstraintName(), alter.getCheckConstraint());
-    if (hasValue(ddl)) {
-      writer.apply().append(ddl).endOfStatement();
-    }
+    writer.apply().appendStatement(platformDdl.alterTableAddCheckConstraint(alter.getTableName(), alter.getCheckConstraintName(), alter.getCheckConstraint()));
   }
 
   protected void alterColumnNotnull(DdlWrite writer, AlterColumn alter) throws IOException {
 
-    String ddl = platformDdl.alterColumnNotnull(alter.getTableName(), alter.getColumnName(), alter.isNotnull());
-    if (hasValue(ddl)) {
-      writer.apply().append(ddl).endOfStatement();
-    }
+    writer.apply().appendStatement(platformDdl.alterColumnNotnull(alter.getTableName(), alter.getColumnName(), alter.isNotnull()));
   }
 
   protected void alterColumnType(DdlWrite writer, AlterColumn alter) throws IOException {
 
     String ddl = platformDdl.alterColumnType(alter.getTableName(), alter.getColumnName(), alter.getType());
     if (hasValue(ddl)) {
-      writer.apply().append(ddl).endOfStatement();
+      writer.apply().appendStatement(ddl);
       if (isTrue(alter.isWithHistory()) && historySupport == HistorySupport.TRIGGER_BASED) {
         regenerateHistoryTriggers(alter.getTableName(), HistoryTableUpdate.Change.ALTER, alter.getColumnName());
         // apply same type change to matching column in the history table
         ddl = platformDdl.alterColumnType(historyTable(alter.getTableName()), alter.getColumnName(), alter.getType());
-        writer.apply().append(ddl).endOfStatement();
+        writer.apply().appendStatement(ddl);
       }
     }
   }
@@ -990,17 +929,13 @@ public class BaseTableDdl implements TableDdl {
 
   protected void alterColumnDropForeignKey(DdlWrite writer, AlterColumn alter) throws IOException {
 
-    writer.apply()
-      .append(platformDdl.alterTableDropForeignKey(alter.getTableName(), alter.getDropForeignKey()))
-      .endOfStatement();
+    writer.apply().appendStatement(platformDdl.alterTableDropForeignKey(alter.getTableName(), alter.getDropForeignKey()));
   }
 
 
   protected void alterColumnDropUniqueConstraint(DdlWrite writer, AlterColumn alter) throws IOException {
 
-    writer.apply()
-      .append(platformDdl.alterTableDropUniqueConstraint(alter.getTableName(), alter.getDropUnique()))
-      .endOfStatement();
+    writer.apply().appendStatement(platformDdl.alterTableDropUniqueConstraint(alter.getTableName(), alter.getDropUnique()));
   }
 
   protected void alterColumnAddUniqueOneToOneConstraint(DdlWrite writer, AlterColumn alter) throws IOException {
@@ -1017,13 +952,9 @@ public class BaseTableDdl implements TableDdl {
 
     String[] cols = {alter.getColumnName()};
     boolean notNull = alter.isNotnull() != null ? alter.isNotnull() : Boolean.TRUE.equals(alter.isNotnull());
-    writer.apply()
-      .append(platformDdl.alterTableAddUniqueConstraint(alter.getTableName(), uqName, cols, notNull ? null : cols))
-      .endOfStatement();
+    writer.apply().appendStatement(platformDdl.alterTableAddUniqueConstraint(alter.getTableName(), uqName, cols, notNull ? null : cols));
 
-    writer.dropAllForeignKeys()
-      .append(platformDdl.dropIndex(uqName, alter.getTableName()))
-      .endOfStatement();
+    writer.dropAllForeignKeys().appendStatement(platformDdl.dropIndex(uqName, alter.getTableName()));
   }
 
 
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDbArray.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDbArray.java
new file mode 100644
index 000000000..ec141d7f0
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDbArray.java
@@ -0,0 +1,33 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Logical array type to ClickHouse array type conversion.
+ */
+class ClickHouseDbArray {
+
+  private static final Map<String, String> mapping = new HashMap<>();
+  static {
+    mapping.put("uuid[]", "Array(UUID)");
+    mapping.put("varchar[]", "Array(String)");
+    mapping.put("integer[]", "Array(UInt32)");
+    mapping.put("bigint[]", "Array(UInt64)");
+  }
+
+  /**
+   * Covert the 'logical' array type to a native one (for Postgres and Cockroach).
+   */
+  static String logicalToNative(String logicalArrayType) {
+    int colonPos = logicalArrayType.indexOf(':');
+    if (colonPos > -1) {
+      logicalArrayType = logicalArrayType.substring(0, colonPos);
+    }
+    String clickHouseType = mapping.get(logicalArrayType);
+    if (clickHouseType == null) {
+      throw new IllegalStateException("No mapping for logical array type " + logicalArrayType);
+    }
+    return clickHouseType;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdl.java
index 4907ce6f0..0c680f3eb 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdl.java
@@ -1,15 +1,30 @@
 package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
+import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler;
 
 import java.io.IOException;
 
 public class ClickHouseDdl extends PlatformDdl {
 
+  private static final String LOG_TABLE = "ENGINE = Log()";
+
   public ClickHouseDdl(DatabasePlatform platform) {
     super(platform);
     this.includeStorageEngine = true;
+    this.identitySuffix = "";
+  }
+
+  @Override
+  public DdlHandler createDdlHandler(ServerConfig serverConfig) {
+    return new ClickHouseDdlHandler(serverConfig, this);
+  }
+
+  @Override
+  protected String convertArrayType(String logicalArrayType) {
+    return ClickHouseDbArray.logicalToNative(logicalArrayType);
   }
 
   /**
@@ -17,9 +32,38 @@ public class ClickHouseDdl extends PlatformDdl {
    */
   @Override
   public void tableStorageEngine(DdlBuffer apply, String storageEngine) throws IOException {
+    if (storageEngine == null) {
+      // default to Log() table but really should all be explicit (need arguments for MergeTree etc)
+      storageEngine = LOG_TABLE;
+    }
     apply.append(" ").append(storageEngine);
   }
 
+  @Override
+  public String alterTableAddForeignKey(WriteForeignKey request) {
+    return null;
+  }
+
+  @Override
+  public String alterTableDropForeignKey(String tableName, String fkName) {
+    return null;
+  }
+
+  @Override
+  public String tableInlineForeignKey(WriteForeignKey request) {
+    return null;
+  }
+
+  @Override
+  public String dropIndex(String indexName, String tableName) {
+    return null;
+  }
+
+  @Override
+  public String createIndex(String indexName, String tableName, String[] columns) {
+    return null;
+  }
+
   @Override
   protected void writeColumnNotNull(DdlBuffer buffer) {
     // do nothing
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdlHandler.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdlHandler.java
new file mode 100644
index 000000000..2371cfaee
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdlHandler.java
@@ -0,0 +1,11 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+import io.ebean.config.ServerConfig;
+import io.ebeaninternal.dbmigration.ddlgeneration.BaseDdlHandler;
+
+public class ClickHouseDdlHandler extends BaseDdlHandler {
+
+  public ClickHouseDdlHandler(ServerConfig serverConfig, PlatformDdl platformDdl) {
+    super(serverConfig, platformDdl, new ClickHouseTableDdl(serverConfig, platformDdl));
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseTableDdl.java
new file mode 100644
index 000000000..b959d1ff7
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseTableDdl.java
@@ -0,0 +1,34 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+import io.ebean.config.ServerConfig;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.migration.CreateTable;
+
+public class ClickHouseTableDdl extends BaseTableDdl {
+
+  public ClickHouseTableDdl(ServerConfig serverConfig, PlatformDdl platformDdl) {
+    super(serverConfig, platformDdl);
+  }
+
+  @Override
+  protected void writePrimaryKeyConstraint(DdlBuffer buffer, String pkName, String[] pkColumns) {
+    // do nothing
+  }
+
+  @Override
+  protected void writeCompoundUniqueConstraints(DdlBuffer apply, CreateTable createTable) {
+    // do nothing
+  }
+
+  @Override
+  protected void writeUniqueConstraints(DdlBuffer apply, CreateTable createTable) {
+    // do nothing
+  }
+
+
+  @Override
+  protected void writeCheckConstraints(DdlBuffer apply, CreateTable createTable) {
+    // do nothing
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
index 4159bfb3d..eb69d3be3 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
@@ -104,7 +104,6 @@ public class MySqlDdl extends PlatformDdl {
       }
       buffer.append(String.format(" comment '%s'", comment));
     }
-
   }
 
   @Override
diff --git a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java
index d36abb449..b141cd979 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
 
 import io.ebean.config.ServerConfig;
+import io.ebean.config.dbplatform.clickhouse.ClickHousePlatform;
 import io.ebean.config.dbplatform.h2.H2Platform;
 import io.ebean.config.dbplatform.mysql.MySqlPlatform;
 import io.ebean.config.dbplatform.oracle.OraclePlatform;
@@ -62,6 +63,23 @@ public class BaseTableDdlTest {
     assertThat(ddl).contains("alter table mytable add column col_name varchar2(20)");
   }
 
+  @Test
+  public void testAddColumn_withTypeConversion_clickHouseVarchar() throws IOException {
+
+    ClickHouseTableDdl ddlGen = new ClickHouseTableDdl(serverConfig, PlatformDdlBuilder.create(new ClickHousePlatform()));
+
+    DdlWrite write = new DdlWrite();
+
+    Column column = new Column();
+    column.setName("col_name");
+    column.setType("varchar(20)");
+
+    ddlGen.alterTableAddColumn(write.apply(), "mytable", column, false, false);
+
+    String ddl = write.apply().getBuffer();
+    assertThat(ddl).contains("alter table mytable add column col_name String");
+  }
+
   @Test
   public void testAlterColumnComment() throws IOException {
 
diff --git a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDbArrayTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDbArrayTest.java
new file mode 100644
index 000000000..181630396
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDbArrayTest.java
@@ -0,0 +1,24 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ClickHouseDbArrayTest {
+
+  @Test
+  public void logicalToNative() {
+
+    assertThat(ClickHouseDbArray.logicalToNative("uuid[]")).isEqualTo("Array(UUID)");
+    assertThat(ClickHouseDbArray.logicalToNative("varchar[]")).isEqualTo("Array(String)");
+    assertThat(ClickHouseDbArray.logicalToNative("integer[]")).isEqualTo("Array(UInt32)");
+    assertThat(ClickHouseDbArray.logicalToNative("bigint[]")).isEqualTo("Array(UInt64)");
+  }
+
+  @Test
+  public void logicalToNative_withFallbackDefined() {
+
+    assertThat(ClickHouseDbArray.logicalToNative("uuid[]:(1000)")).isEqualTo("Array(UUID)");
+  }
+
+}

From 409c1d06b225afb1480fbf0cc10069356db7a5ee Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 14 Mar 2019 16:08:04 +1300
Subject: [PATCH 0770/1036] #1652 - Conversion problem between
 org.joda.time.LocalDate and java.sql.Date field for dates before Jan 2 1900

---
 .../server/type/ScalarTypeJodaLocalDate.java  |  2 +-
 .../type/ScalarTypeJodaLocalDateTest.java     | 19 +++++++----
 .../org/tests/model/joda/BasicJodaEntity.java | 11 ++++++
 .../model/joda/TestJodaInsertUpdate.java      | 34 ++++++++++++++++---
 4 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
index 82a7bc1ee..7c2d6a5db 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
@@ -27,7 +27,7 @@ public class ScalarTypeJodaLocalDate extends ScalarTypeBaseDate<LocalDate> {
 
   @Override
   public LocalDate convertFromDate(Date date) {
-    return new LocalDate(date.getTime());
+    return LocalDate.fromDateFields(date);
   }
 
   @Override
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java
index d303c9552..60ee1c92d 100644
--- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java
@@ -10,10 +10,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class ScalarTypeJodaLocalDateTest {
 
-  ScalarTypeJodaLocalDate type = new ScalarTypeJodaLocalDate();
+  private ScalarTypeJodaLocalDate type = new ScalarTypeJodaLocalDate();
 
   @Test
-  public void convertToMillis_convertFromMillis() throws Exception {
+  public void convertToMillis_convertFromMillis() {
 
     LocalDate localDate = new LocalDate();
     long millis = type.convertToMillis(localDate);
@@ -23,18 +23,23 @@ public class ScalarTypeJodaLocalDateTest {
   }
 
   @Test
-  public void convertToDate_convertFromDate() throws Exception {
+  public void convertToDate_convertFromDate() {
+
+    convertDate(new LocalDate());
+    convertDate(new LocalDate(1899, 12, 1));
+    convertDate(new LocalDate(1900, 1, 1));
+  }
+
+  private void convertDate(LocalDate localDate) {
 
-    LocalDate localDate = new LocalDate();
     Date dateValue = type.convertToDate(localDate);
     LocalDate localDate1 = type.convertFromDate(dateValue);
 
     assertThat(localDate).isEqualTo(localDate1);
   }
 
-
   @Test
-  public void toJdbcType() throws Exception {
+  public void toJdbcType() {
 
     LocalDate localDate = new LocalDate();
     Object jdbcType = type.toJdbcType(localDate);
@@ -44,7 +49,7 @@ public class ScalarTypeJodaLocalDateTest {
   }
 
   @Test
-  public void toBeanType() throws Exception {
+  public void toBeanType() {
 
     LocalDate localDate = new LocalDate();
     Date dateValue = type.convertToDate(localDate);
diff --git a/src/test/java/org/tests/model/joda/BasicJodaEntity.java b/src/test/java/org/tests/model/joda/BasicJodaEntity.java
index 52e528e27..78ce42408 100644
--- a/src/test/java/org/tests/model/joda/BasicJodaEntity.java
+++ b/src/test/java/org/tests/model/joda/BasicJodaEntity.java
@@ -3,6 +3,7 @@ package org.tests.model.joda;
 import io.ebean.annotation.CreatedTimestamp;
 import io.ebean.annotation.UpdatedTimestamp;
 import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
 import org.joda.time.LocalDateTime;
 import org.joda.time.Period;
 
@@ -26,6 +27,8 @@ public class BasicJodaEntity {
 
   Period period;
 
+  LocalDate localDate;
+
   @Version
   LocalDateTime version;
 
@@ -76,4 +79,12 @@ public class BasicJodaEntity {
   public void setVersion(LocalDateTime version) {
     this.version = version;
   }
+
+  public void setLocalDate(LocalDate localDate) {
+    this.localDate = localDate;
+  }
+
+  public LocalDate getLocalDate() {
+    return localDate;
+  }
 }
diff --git a/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java b/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java
index df8a79fb5..b29737060 100644
--- a/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java
+++ b/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java
@@ -1,8 +1,9 @@
 package org.tests.model.joda;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
 import org.joda.time.LocalDateTime;
 import org.joda.time.Period;
 import org.junit.Test;
@@ -19,8 +20,8 @@ public class TestJodaInsertUpdate extends BaseTestCase {
 
     BasicJodaEntity e0 = new BasicJodaEntity();
     e0.setName("foo");
-
-    Ebean.save(e0);
+    e0.setLocalDate(new LocalDate(1899, 12, 1));
+    DB.save(e0);
 
     LocalDateTime created = e0.getCreated();
     DateTime updated = e0.getUpdated();
@@ -32,7 +33,7 @@ public class TestJodaInsertUpdate extends BaseTestCase {
     Thread.sleep(10);
     e0.setName("bar");
     e0.setPeriod(Period.years(12).plusDays(1));
-    Ebean.save(e0);
+    DB.save(e0);
 
     LocalDateTime created1 = e0.getCreated();
     DateTime updated1 = e0.getUpdated();
@@ -43,8 +44,31 @@ public class TestJodaInsertUpdate extends BaseTestCase {
     assertNotSame(version, version1);
 
 
-    BasicJodaEntity found = Ebean.find(BasicJodaEntity.class, e0.getId());
+    BasicJodaEntity found = DB.find(BasicJodaEntity.class, e0.getId());
 
     assertThat(found.getPeriod()).isEqualTo(e0.getPeriod());
+    assertThat(found.getLocalDate()).isEqualTo(e0.getLocalDate());
+  }
+
+  @Test
+  public void test_various() {
+    test_at(new LocalDate(1700, 12, 1));
+    test_at(new LocalDate(1899, 12, 1));
+    test_at(new LocalDate(1900, 1, 1));
+    test_at(new LocalDate());
+    test_at(LocalDate.now());
+  }
+
+  private void test_at(LocalDate date) {
+
+    BasicJodaEntity e0 = new BasicJodaEntity();
+    e0.setName("Various local dates");
+    e0.setLocalDate(date);
+    DB.save(e0);
+
+    BasicJodaEntity found = DB.find(BasicJodaEntity.class, e0.getId());
+    assertThat(found.getLocalDate()).isEqualTo(e0.getLocalDate());
+
+    DB.delete(found);
   }
 }

From 2e4f99318a41807639d5851c6fd4fb7bc5a8a1d7 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 14 Mar 2019 16:15:47 +1300
Subject: [PATCH 0771/1036] No effective change - Ebean -> DB in tests

---
 .../java/org/tests/types/TestNewTypes.java    | 59 ++++++++++---------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/src/test/java/org/tests/types/TestNewTypes.java b/src/test/java/org/tests/types/TestNewTypes.java
index 45578f6b1..289969d04 100644
--- a/src/test/java/org/tests/types/TestNewTypes.java
+++ b/src/test/java/org/tests/types/TestNewTypes.java
@@ -1,10 +1,9 @@
 package org.tests.types;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.plugin.BeanType;
 import io.ebean.plugin.ExpressionPath;
-
 import org.junit.Test;
 import org.tests.model.types.SomeNewTypesBean;
 
@@ -27,7 +26,9 @@ import java.time.ZonedDateTime;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 public class TestNewTypes extends BaseTestCase {
 
@@ -54,59 +55,59 @@ public class TestNewTypes extends BaseTestCase {
     bean.setDuration(Duration.ofMinutes(5));
 
 
-    Ebean.save(bean);
+    DB.save(bean);
 
     bean.setYear(Year.now().minusYears(2));
     bean.setMonth(Month.SEPTEMBER);
 
-    Ebean.save(bean);
+    DB.save(bean);
     Thread.sleep(DB_CLOCK_DELTA); // wait, to ensure that instant < Instant.now()
-    List<SomeNewTypesBean> list = Ebean.find(SomeNewTypesBean.class).where().lt("instant", Instant.now()).findList();
+    List<SomeNewTypesBean> list = DB.find(SomeNewTypesBean.class).where().lt("instant", Instant.now()).findList();
     assertTrue(!list.isEmpty());
 
-    list = Ebean.find(SomeNewTypesBean.class).where().le("localDate", LocalDate.now()).findList();
+    list = DB.find(SomeNewTypesBean.class).where().le("localDate", LocalDate.now()).findList();
     assertTrue(!list.isEmpty());
 
-    list = Ebean.find(SomeNewTypesBean.class).where().lt("localDateTime", LocalDateTime.now()).findList();
+    list = DB.find(SomeNewTypesBean.class).where().lt("localDateTime", LocalDateTime.now()).findList();
     assertTrue(!list.isEmpty());
 
-    list = Ebean.find(SomeNewTypesBean.class).where().lt("offsetDateTime", OffsetDateTime.now()).findList();
+    list = DB.find(SomeNewTypesBean.class).where().lt("offsetDateTime", OffsetDateTime.now()).findList();
     assertTrue(!list.isEmpty());
 
-    list = Ebean.find(SomeNewTypesBean.class).where().lt("zonedDateTime", ZonedDateTime.now()).findList();
+    list = DB.find(SomeNewTypesBean.class).where().lt("zonedDateTime", ZonedDateTime.now()).findList();
     assertTrue(!list.isEmpty());
 
-    list = Ebean.find(SomeNewTypesBean.class).where().le("localTime", LocalTime.now()).findList();
+    list = DB.find(SomeNewTypesBean.class).where().le("localTime", LocalTime.now()).findList();
     assertTrue(!list.isEmpty());
 
-    list = Ebean.find(SomeNewTypesBean.class).where().eq("zoneId", ZoneId.systemDefault().getId()).findList();
+    list = DB.find(SomeNewTypesBean.class).where().eq("zoneId", ZoneId.systemDefault().getId()).findList();
     assertTrue(!list.isEmpty());
 
-    list = Ebean.find(SomeNewTypesBean.class).where().eq("zoneOffset", ZonedDateTime.now().getOffset()).findList();
+    list = DB.find(SomeNewTypesBean.class).where().eq("zoneOffset", ZonedDateTime.now().getOffset()).findList();
     assertTrue(!list.isEmpty());
 
-    list = Ebean.find(SomeNewTypesBean.class).where().le("yearMonth", YearMonth.of(2014, 9)).findList();
+    list = DB.find(SomeNewTypesBean.class).where().le("yearMonth", YearMonth.of(2014, 9)).findList();
     assertTrue(!list.isEmpty());
 
-    list = Ebean.find(SomeNewTypesBean.class).where().le("monthDay", MonthDay.of(9,22)).findList();
+    list = DB.find(SomeNewTypesBean.class).where().le("monthDay", MonthDay.of(9,22)).findList();
     assertTrue(!list.isEmpty());
 
-    list = Ebean.find(SomeNewTypesBean.class).where().le("year", Year.now()).findList();
+    list = DB.find(SomeNewTypesBean.class).where().le("year", Year.now()).findList();
     assertTrue(!list.isEmpty());
 
-    list = Ebean.find(SomeNewTypesBean.class).where().le("month", Month.SEPTEMBER).findList();
+    list = DB.find(SomeNewTypesBean.class).where().le("month", Month.SEPTEMBER).findList();
     assertTrue(!list.isEmpty());
 
-    list = Ebean.find(SomeNewTypesBean.class).where().eq("path", Paths.get(TEMP_PATH)).findList();
+    list = DB.find(SomeNewTypesBean.class).where().eq("path", Paths.get(TEMP_PATH)).findList();
     assertTrue(!list.isEmpty());
 
-    list = Ebean.find(SomeNewTypesBean.class).where().eq("period", Period.of(4,3,2)).findList();
+    list = DB.find(SomeNewTypesBean.class).where().eq("period", Period.of(4,3,2)).findList();
     assertTrue(!list.isEmpty());
 
-    list = Ebean.find(SomeNewTypesBean.class).where().eq("duration", Duration.ofMinutes(5)).findList();
+    list = DB.find(SomeNewTypesBean.class).where().eq("duration", Duration.ofMinutes(5)).findList();
     assertTrue(!list.isEmpty());
 
-    SomeNewTypesBean fetched = Ebean.find(SomeNewTypesBean.class, bean.getId());
+    SomeNewTypesBean fetched = DB.find(SomeNewTypesBean.class, bean.getId());
 
     assertEquals(bean.getZoneId(), fetched.getZoneId());
     assertEquals(bean.getZoneOffset(), fetched.getZoneOffset());
@@ -124,9 +125,9 @@ public class TestNewTypes extends BaseTestCase {
     assertEquals(bean.getDuration(), fetched.getDuration());
 
 
-    String asJson = Ebean.json().toJson(fetched);
+    String asJson = DB.json().toJson(fetched);
 
-    SomeNewTypesBean toBean = Ebean.json().toBean(SomeNewTypesBean.class, asJson);
+    SomeNewTypesBean toBean = DB.json().toBean(SomeNewTypesBean.class, asJson);
 
     assertEquals(bean.getZoneId(), toBean.getZoneId());
     assertEquals(bean.getZoneOffset(), toBean.getZoneOffset());
@@ -151,9 +152,9 @@ public class TestNewTypes extends BaseTestCase {
 
     SomeNewTypesBean bean = new SomeNewTypesBean();
 
-    Ebean.save(bean);
+    DB.save(bean);
 
-    SomeNewTypesBean fetched = Ebean.find(SomeNewTypesBean.class, bean.getId());
+    SomeNewTypesBean fetched = DB.find(SomeNewTypesBean.class, bean.getId());
 
     assertNull(fetched.getZoneId());
     assertNull(fetched.getZoneOffset());
@@ -195,13 +196,13 @@ public class TestNewTypes extends BaseTestCase {
   }
 
   @Test
-  public void testSetGetPathNull() throws Exception {
+  public void testSetGetPathNull()  {
     SomeNewTypesBean refBean = new SomeNewTypesBean();
     testSetGetPath(refBean);
   }
   private void testSetGetPath(SomeNewTypesBean refBean) {
     SomeNewTypesBean testBean = new SomeNewTypesBean();
-    BeanType<SomeNewTypesBean> beanType = Ebean.getDefaultServer().getPluginApi().getBeanType(SomeNewTypesBean.class);
+    BeanType<SomeNewTypesBean> beanType = DB.getDefault().getPluginApi().getBeanType(SomeNewTypesBean.class);
     ExpressionPath localDate = beanType.getExpressionPath("localDate");
     ExpressionPath localDateTime = beanType.getExpressionPath("localDateTime");
     ExpressionPath offsetDateTime = beanType.getExpressionPath("offsetDateTime");
@@ -267,8 +268,8 @@ public class TestNewTypes extends BaseTestCase {
     duration.pathSet(testBean, refBean.getDuration());
     assertThat(duration.pathGet(testBean)).isEqualTo(refBean.getDuration());
 
-    Ebean.save(refBean);
-    Ebean.save(testBean);
+    DB.save(refBean);
+    DB.save(testBean);
   }
 
 }

From eb31f1bfce4b93bcc3f7747de9a6d690f4b3e697 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 14 Mar 2019 16:20:14 +1300
Subject: [PATCH 0772/1036] No effective change - Add more tests for LocalDate
 pre 1900 etc

---
 .../java/org/tests/types/TestNewTypes.java    | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/test/java/org/tests/types/TestNewTypes.java b/src/test/java/org/tests/types/TestNewTypes.java
index 289969d04..dab52d5c2 100644
--- a/src/test/java/org/tests/types/TestNewTypes.java
+++ b/src/test/java/org/tests/types/TestNewTypes.java
@@ -200,6 +200,7 @@ public class TestNewTypes extends BaseTestCase {
     SomeNewTypesBean refBean = new SomeNewTypesBean();
     testSetGetPath(refBean);
   }
+
   private void testSetGetPath(SomeNewTypesBean refBean) {
     SomeNewTypesBean testBean = new SomeNewTypesBean();
     BeanType<SomeNewTypesBean> beanType = DB.getDefault().getPluginApi().getBeanType(SomeNewTypesBean.class);
@@ -272,4 +273,24 @@ public class TestNewTypes extends BaseTestCase {
     DB.save(testBean);
   }
 
+  @Test
+  public void test_localDate_pre1900() {
+
+    localDateAt(LocalDate.now());
+    localDateAt(LocalDate.of(1899, 12, 31));
+    localDateAt(LocalDate.of(1899, 12, 1));
+    localDateAt(LocalDate.of(1700, 12, 1));
+    localDateAt(LocalDate.of(1900, 1, 1));
+  }
+
+  private void localDateAt(LocalDate localDate) {
+
+    SomeNewTypesBean bean = new SomeNewTypesBean();
+    bean.setLocalDate(localDate);
+    DB.save(bean);
+
+    SomeNewTypesBean found = DB.find(SomeNewTypesBean.class, bean.getId());
+
+    assertThat(found.getLocalDate()).isEqualTo(localDate);
+  }
 }

From 6a7555055dc450f5586e1dbcd56d18ef8952c950 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 14 Mar 2019 21:11:59 +1300
Subject: [PATCH 0773/1036] No effective change - Update tests from Ebean -> DB

---
 .../aggregation/TestAggregationMany.java      |  8 ++---
 .../aggregation/TestAggregationTopLevel.java  | 32 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/test/java/org/tests/model/aggregation/TestAggregationMany.java b/src/test/java/org/tests/model/aggregation/TestAggregationMany.java
index fd77a164c..093221042 100644
--- a/src/test/java/org/tests/model/aggregation/TestAggregationMany.java
+++ b/src/test/java/org/tests/model/aggregation/TestAggregationMany.java
@@ -1,7 +1,7 @@
 package org.tests.model.aggregation;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -18,7 +18,7 @@ public class TestAggregationMany extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    List<DMachine> machines = Ebean.find(DMachine.class)
+    List<DMachine> machines = DB.find(DMachine.class)
       .setDisableLazyLoading(true)
       .fetchQuery("auxUseAggs", "name, useSecs, fuel")
       .where().eq("organisation", org)
@@ -48,7 +48,7 @@ public class TestAggregationMany extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    List<DMachine> machines = Ebean.find(DMachine.class)
+    List<DMachine> machines = DB.find(DMachine.class)
       .setDisableLazyLoading(true)
       .select("name")
       .fetch("auxUseAggs", "name, useSecs, fuel")
@@ -73,7 +73,7 @@ public class TestAggregationMany extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    List<DMachine> machines = Ebean.find(DMachine.class)
+    List<DMachine> machines = DB.find(DMachine.class)
       .setDisableLazyLoading(true)
       .select("name")
       .fetch("auxUseAggs", "useSecs, fuel")
diff --git a/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java b/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java
index b7dad5e50..946ea750b 100644
--- a/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java
+++ b/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java
@@ -1,7 +1,7 @@
 package org.tests.model.aggregation;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.Query;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.BeforeClass;
@@ -24,7 +24,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
   @Test
   public void query_noSelect() {
 
-    Query<DMachineStatsAgg> query = Ebean.find(DMachineStatsAgg.class)
+    Query<DMachineStatsAgg> query = DB.find(DMachineStatsAgg.class)
       .where().gt("date", LocalDate.now().minusDays(10))
       .query();
 
@@ -36,7 +36,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
   @Test
   public void query_machineTotalKms_withHaving() {
 
-    Query<DMachineStatsAgg> query = Ebean.find(DMachineStatsAgg.class)
+    Query<DMachineStatsAgg> query = DB.find(DMachineStatsAgg.class)
       .select("machine, date, totalKms, totalCost")
       .where().gt("date", LocalDate.now().minusDays(10))
       .having().gt("totalCost", 10)
@@ -50,7 +50,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
   @Test
   public void query_machineTotalKms() {
 
-    Query<DMachineStatsAgg> query = Ebean.find(DMachineStatsAgg.class)
+    Query<DMachineStatsAgg> query = DB.find(DMachineStatsAgg.class)
       .select("machine, totalKms, totalCost")
       .where().gt("date", LocalDate.now().minusDays(10))
       .query();
@@ -63,7 +63,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
   @Test
   public void query_byDate() {
 
-    Query<DMachineStatsAgg> query = Ebean.find(DMachineStatsAgg.class)
+    Query<DMachineStatsAgg> query = DB.find(DMachineStatsAgg.class)
       .select("date, totalKms, hours, rate, totalCost, maxKms")
       .where().gt("date", LocalDate.now().minusDays(10))
       .having().gt("hours", 2)
@@ -77,7 +77,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
   @Test
   public void groupBy_machineDate_dynamicFormula() {
 
-    Query<DMachineStats> query = Ebean.find(DMachineStats.class)
+    Query<DMachineStats> query = DB.find(DMachineStats.class)
       .select("machine, date, sum(totalKms), sum(hours)")
       .where().gt("date", LocalDate.now().minusDays(10))
       .having().gt("sum(hours)", 2)
@@ -91,7 +91,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
   @Test
   public void groupBy_machine_dynamicFormula() {
 
-    Query<DMachineStats> query = Ebean.find(DMachineStats.class)
+    Query<DMachineStats> query = DB.find(DMachineStats.class)
       .select("machine, sum(totalKms)")
       .where().gt("date", LocalDate.now().minusDays(10))
       .having().gt("sum(hours)", 2)
@@ -105,7 +105,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
   @Test
   public void groupBy_machine_dynamicFormula_withJoin() {
 
-    Query<DMachineStats> query = Ebean.find(DMachineStats.class)
+    Query<DMachineStats> query = DB.find(DMachineStats.class)
       .select("sum(totalKms), sum(hours)")
       .fetch("machine", "name")
       .where().gt("date", LocalDate.now().minusDays(10))
@@ -125,7 +125,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
   @Test
   public void groupBy_machine_dynamicFormula_withJoin2() {
 
-    Query<DMachineStats> query = Ebean.find(DMachineStats.class)
+    Query<DMachineStats> query = DB.find(DMachineStats.class)
       .select("date, sum(totalKms), sum(hours)")
       .fetch("machine", "name")
       .where().gt("date", LocalDate.now().minusDays(10))
@@ -146,7 +146,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
   @Test
   public void groupBy_machine_dynamicFormula_withQueryJoin() {
 
-    Query<DMachineStats> query = Ebean.find(DMachineStats.class)
+    Query<DMachineStats> query = DB.find(DMachineStats.class)
       .select("sum(totalKms), sum(hours)")
       .fetchQuery("machine", "name")
       .where().gt("date", LocalDate.now().minusDays(10))
@@ -168,7 +168,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
   @Test
   public void groupBy_machine_dynamicFormula_withQueryJoin2() {
 
-    Query<DMachineStats> query = Ebean.find(DMachineStats.class)
+    Query<DMachineStats> query = DB.find(DMachineStats.class)
       .select("date, sum(totalKms), sum(hours)")
       .fetchQuery("machine", "name")
       .where().gt("date", LocalDate.now().minusDays(10))
@@ -190,7 +190,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
   @Test
   public void groupBy_MachineAndDate_dynamicFormula() {
 
-    Query<DMachineStats> query = Ebean.find(DMachineStats.class)
+    Query<DMachineStats> query = DB.find(DMachineStats.class)
       .select("machine, date, max(rate)")
       .where().gt("date", LocalDate.now().minusDays(10))
       .query();
@@ -205,7 +205,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    Query<DMachine> query = Ebean.find(DMachine.class)
+    Query<DMachine> query = DB.find(DMachine.class)
       .select("name")
       .fetch("machineStats", "sum(totalKms)")
       .where().eq("name", "Machine0")
@@ -226,7 +226,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    Query<DMachine> query = Ebean.find(DMachine.class)
+    Query<DMachine> query = DB.find(DMachine.class)
       .select("name")
       .fetch("machineStats", "date, max(rate), sum(totalKms)")
       .where().eq("name", "Machine0")
@@ -258,7 +258,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
       machines.add(new DMachine(org, "Machine" + i));
     }
 
-    Ebean.saveAll(machines);
+    DB.saveAll(machines);
 
     List<DMachineStats> allStats = new ArrayList<>();
 
@@ -280,6 +280,6 @@ public class TestAggregationTopLevel extends BaseTestCase {
       date = date.minusDays(1);
     }
 
-    Ebean.saveAll(allStats);
+    DB.saveAll(allStats);
   }
 }

From 8b073ef10a866726bbd0785d028375cc6f88f951 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 14 Mar 2019 21:16:47 +1300
Subject: [PATCH 0774/1036] [maven-release-plugin] prepare release
 ebean-11.36.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 046f747f9..d5b5543df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.36.2-SNAPSHOT</version>
+  <version>11.36.2</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.36.2</tag>
   </scm>
 
   <profiles>

From fd6a7f64eb639e73a258acdab965c184ab56d793 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 14 Mar 2019 21:17:03 +1300
Subject: [PATCH 0775/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d5b5543df..05c5ab681 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.36.2</version>
+  <version>11.36.3-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.36.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 518ba37fb222ca98a21fee33bb29bf38874cc374 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 16 Mar 2019 15:28:44 +1300
Subject: [PATCH 0776/1036] No effective change - Bump maven plugin version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 05c5ab681..13929a872 100644
--- a/pom.xml
+++ b/pom.xml
@@ -330,7 +330,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>11.27.1</version>
+        <version>11.35.1</version>
         <executions>
           <execution>
             <id>test</id>

From 3ba9a52b0e1a1b680eba340899feca55a76a6fc0 Mon Sep 17 00:00:00 2001
From: ooknight <ooknight@163.com>
Date: Wed, 20 Mar 2019 16:45:44 +0800
Subject: [PATCH 0777/1036] add server config : default enum type (#1655)

ENH: add server config : default enum type
---
 .../java/io/ebean/config/ServerConfig.java    | 12 ++++++++
 .../server/type/DefaultTypeManager.java       | 13 +++++++--
 src/test/java/io/ebean/server/type/MySex.java |  5 ++++
 .../io/ebean/server/type/TestTypeManager.java | 28 +++++++++++++++++++
 4 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/io/ebean/server/type/MySex.java

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index f9a9e3d7d..899044d9f 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -32,6 +32,7 @@ import io.ebean.meta.MetaInfoManager;
 import io.ebean.migration.MigrationRunner;
 import io.ebean.util.StringHelper;
 
+import javax.persistence.EnumType;
 import javax.sql.DataSource;
 import java.time.Clock;
 import java.util.ArrayList;
@@ -229,6 +230,8 @@ public class ServerConfig {
 
   private int persistBatchSize = 20;
 
+  private EnumType defaultEnumType = EnumType.ORDINAL;
+
   private boolean disableLazyLoading;
 
   /**
@@ -978,6 +981,14 @@ public class ServerConfig {
     this.queryBatchSize = queryBatchSize;
   }
 
+  public EnumType getDefaultEnumType() {
+    return defaultEnumType;
+  }
+
+  public void setDefaultEnumType(EnumType defaultEnumType) {
+    this.defaultEnumType = defaultEnumType;
+  }
+
   /**
    * Return true if lazy loading is disabled on queries by default.
    */
@@ -2963,6 +2974,7 @@ public class ServerConfig {
     localTimeWithNanos = p.getBoolean("localTimeWithNanos", localTimeWithNanos);
     jodaLocalTimeMode = p.get("jodaLocalTimeMode", jodaLocalTimeMode);
 
+    defaultEnumType = p.getEnum(EnumType.class, "defaultEnumType", defaultEnumType);
     disableLazyLoading = p.getBoolean("disableLazyLoading", disableLazyLoading);
     lazyLoadBatchSize = p.getInt("lazyLoadBatchSize", lazyLoadBatchSize);
     queryBatchSize = p.getInt("queryBatchSize", queryBatchSize);
diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index cf8308e68..ca630c36f 100644
--- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -154,6 +154,8 @@ public final class DefaultTypeManager implements TypeManager {
 
   private final boolean offlineMigrationGeneration;
 
+  private final EnumType defaultEnumType;
+
   // OPTIONAL ScalarTypes registered if Jackson/JsonNode is in the classpath
 
   /**
@@ -201,6 +203,8 @@ public final class DefaultTypeManager implements TypeManager {
 
     this.offlineMigrationGeneration = DbOffline.isGenerateMigration();
 
+    this.defaultEnumType = config.getDefaultEnumType();
+
     initialiseStandard(jsonDateTime, config);
     initialiseJavaTimeTypes(jsonDateTime, config);
     initialiseJodaTypes(jsonDateTime, config);
@@ -645,8 +649,13 @@ public final class DefaultTypeManager implements TypeManager {
 
   private ScalarTypeEnum<?> createEnumScalarTypePerSpec(Class<?> enumType, EnumType type) {
     if (type == null) {
-      // default as per spec is ORDINAL
-      return new ScalarTypeEnumStandard.OrdinalEnum(enumType);
+
+      if(defaultEnumType == EnumType.ORDINAL) {
+        return new ScalarTypeEnumStandard.OrdinalEnum(enumType);
+
+      } else {
+        return new ScalarTypeEnumStandard.StringEnum(enumType);
+      }
 
     } else if (type == EnumType.ORDINAL) {
       return new ScalarTypeEnumStandard.OrdinalEnum(enumType);
diff --git a/src/test/java/io/ebean/server/type/MySex.java b/src/test/java/io/ebean/server/type/MySex.java
new file mode 100644
index 000000000..b66ca2e82
--- /dev/null
+++ b/src/test/java/io/ebean/server/type/MySex.java
@@ -0,0 +1,5 @@
+package io.ebean.server.type;
+
+public enum MySex {
+  MALE, FEMALE
+}
diff --git a/src/test/java/io/ebean/server/type/TestTypeManager.java b/src/test/java/io/ebean/server/type/TestTypeManager.java
index e5ab13393..90f3c2c8d 100644
--- a/src/test/java/io/ebean/server/type/TestTypeManager.java
+++ b/src/test/java/io/ebean/server/type/TestTypeManager.java
@@ -7,6 +7,7 @@ import io.ebeaninternal.server.core.bootup.BootupClasses;
 import io.ebeaninternal.server.type.DefaultTypeManager;
 import io.ebeaninternal.server.type.RsetDataReader;
 import io.ebeaninternal.server.type.ScalarType;
+import io.ebeaninternal.server.type.ScalarTypeEnumStandard;
 import org.junit.Assert;
 import org.junit.Test;
 import org.tests.model.ivo.Money;
@@ -95,6 +96,21 @@ public class TestTypeManager extends BaseTestCase {
 
   }
 
+  @Test
+  public void testWithConfig() {
+    DefaultTypeManager typeManager1 = createTypeManager();
+    ScalarType<?> type1 = typeManager1.createEnumScalarType(MySex.class, null);
+    assertThat(type1 instanceof ScalarTypeEnumStandard.OrdinalEnum);
+    //
+    DefaultTypeManager typeManager2 = createTypeManagerDefaultEnumTypeString();
+    ScalarType<?> type2 = typeManager2.createEnumScalarType(MySex.class, null);
+    assertThat(type2 instanceof ScalarTypeEnumStandard.StringEnum);
+    //
+    DefaultTypeManager typeManager3 = createTypeManagerDefaultEnumTypeString();
+    ScalarType<?> type3 = typeManager3.createEnumScalarType(MySex.class, EnumType.ORDINAL);
+    assertThat(type3 instanceof ScalarTypeEnumStandard.OrdinalEnum);
+  }
+
   private DefaultTypeManager createTypeManager() {
 
     ServerConfig serverConfig = new ServerConfig();
@@ -106,6 +122,18 @@ public class TestTypeManager extends BaseTestCase {
     return new DefaultTypeManager(serverConfig, bootupClasses);
   }
 
+  private DefaultTypeManager createTypeManagerDefaultEnumTypeString() {
+
+    ServerConfig serverConfig = new ServerConfig();
+    serverConfig.setDatabasePlatform(new H2Platform());
+    serverConfig.setDefaultEnumType(EnumType.STRING);
+
+    BootupClasses bootupClasses = new BootupClasses();
+    bootupClasses.getAttributeConverters().add(MoneyTypeConverter.class);
+
+    return new DefaultTypeManager(serverConfig, bootupClasses);
+  }
+
   /**
    * Test double DataReader implementation.
    */

From 812dcbb4bbe12e65d30d6e94670ecc4434f38d8a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 20 Mar 2019 23:13:50 +1300
Subject: [PATCH 0778/1036] #1653 - ENH: Add support for ClickHouse database

With array type conversion for primitive arrays
---
 .../clickhouse/ClickHousePlatform.java        |  6 +++
 .../server/type/ScalarTypeArrayBase.java      | 42 ++++++++++++++++++-
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebean/config/dbplatform/clickhouse/ClickHousePlatform.java b/src/main/java/io/ebean/config/dbplatform/clickhouse/ClickHousePlatform.java
index 1a1d45a79..17ee210bf 100644
--- a/src/main/java/io/ebean/config/dbplatform/clickhouse/ClickHousePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/clickhouse/ClickHousePlatform.java
@@ -49,4 +49,10 @@ public class ClickHousePlatform extends DatabasePlatform {
     dbTypeMap.put(DbType.INET, new DbPlatformType("String", false));
     dbTypeMap.put(DbType.CDIR, new DbPlatformType("String", false));
   }
+
+  @Override
+  public boolean isNativeArrayType() {
+    return true;
+  }
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayBase.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayBase.java
index 783793c72..8a08772ad 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayBase.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayBase.java
@@ -18,13 +18,53 @@ abstract class ScalarTypeArrayBase<T> extends ScalarTypeJsonCollection<T> {
       return null;
     } else {
       try {
-        return fromArray((Object[]) array.getArray());
+        return fromArray(convertArray(array.getArray()));
       } finally {
         array.free();
       }
     }
   }
 
+  private Object[] convertArray(Object array) {
+    if (array instanceof Object[]) {
+      return (Object[]) array;
+    }
+    if (array instanceof long[]) {
+      return convertLongs((long[]) array);
+    }
+    if (array instanceof int[]) {
+      return convertInts((int[]) array);
+    }
+    if (array instanceof double[]) {
+      return convertDoubles((double[]) array);
+    }
+    throw new IllegalArgumentException("Unable to convert array " + array);
+  }
+
+  private Object[] convertLongs(long[] o) {
+    Long[] list = new Long[o.length];
+    for (int i = 0; i < o.length; i++) {
+      list[i] = o[i];
+    }
+    return list;
+  }
+
+  private Object[] convertInts(int[] o) {
+    Integer[] list = new Integer[o.length];
+    for (int i = 0; i < o.length; i++) {
+      list[i] = o[i];
+    }
+    return list;
+  }
+
+  private Object[] convertDoubles(double[] o) {
+    Double[] list = new Double[o.length];
+    for (int i = 0; i < o.length; i++) {
+      list[i] = o[i];
+    }
+    return list;
+  }
+
   protected abstract T fromArray(Object[] array1);
 
 }

From 54534ea7f365b1418a761f01a104e149cb04d963 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 21 Mar 2019 22:30:27 +1300
Subject: [PATCH 0779/1036] #1657 - ERROR BeanDescriptorManager - Error in
 deployment java.lang.RuntimeException: Expecting [ ... ] to start with
 "select"

---
 .../server/deploy/BeanDescriptorManager.java       |  8 +++++++-
 .../java/org/tests/rawsql/TestRawSqlOrmQuery.java  | 14 +++++++++++++-
 .../resources/ebean-xml-mappings/OrderMapping.xml  | 11 +++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 359da02de..d00728013 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -433,7 +433,13 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
     } else {
       for (XmRawSql sql : entityDeploy.getRawSql()) {
-        RawSqlBuilder builder = RawSqlBuilder.parse(sql.getQuery().getValue());
+        RawSqlBuilder builder;
+        try {
+          builder = RawSqlBuilder.parse(sql.getQuery().getValue());
+        } catch (RuntimeException e) {
+          builder = RawSqlBuilder.unparsed(sql.getQuery().getValue());
+        }
+
         for (XmColumnMapping columnMapping : sql.getColumnMapping()) {
           builder.columnMapping(columnMapping.getColumn(), columnMapping.getProperty());
         }
diff --git a/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java b/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
index 306ef26ac..54e933d3c 100644
--- a/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
+++ b/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
@@ -10,7 +10,6 @@ import io.ebean.RawSql;
 import io.ebean.RawSqlBuilder;
 import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.Platform;
-
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Assert;
 import org.junit.Test;
@@ -77,6 +76,19 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
     assertThat(sql).contains("where o.status = ?  order by c.name, c.id");
   }
 
+  @IgnorePlatform(Platform.ORACLE)
+  @Test
+  public void testNamed_fromCustomXmlLocations_withComments() {
+
+    ResetBasicData.reset();
+
+    Query<Order> query = Ebean.createNamedQuery(Order.class, "myRawTest3");
+    query.setMaxRows(10);
+
+    List<Order> list = query.findList();
+    assertThat(list).isNotEmpty();
+  }
+
   @Test
   public void test() {
 
diff --git a/src/test/resources/ebean-xml-mappings/OrderMapping.xml b/src/test/resources/ebean-xml-mappings/OrderMapping.xml
index cd35e81a9..59e8ddc52 100644
--- a/src/test/resources/ebean-xml-mappings/OrderMapping.xml
+++ b/src/test/resources/ebean-xml-mappings/OrderMapping.xml
@@ -14,6 +14,17 @@
         order by c.name, c.id
       </query>
     </raw-sql>
+
+    <raw-sql name="myRawTest3">
+      <column-mapping column="o.id" property="id"/>
+      <column-mapping column="o.status" property="status"/>
+      <query>
+        -- must be unparsed raw sql
+        select o.id, o.status
+        from o_order o
+      </query>
+    </raw-sql>
+
   </entity>
 
 </ebean>

From fc032c632b0b0eb227ab6709a04fa57eb732a276 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 27 Mar 2019 09:37:35 +1300
Subject: [PATCH 0780/1036] #1658 - ENH: Add label to ProfileLocation and use
 as default query label

---
 src/main/java/io/ebean/ProfileLocation.java        |  5 +++++
 src/main/java/io/ebeaninternal/api/SpiQuery.java   |  5 +++++
 .../server/profile/BasicProfileLocation.java       | 13 ++++++++++---
 .../server/profile/DProfileLocation.java           | 13 +++++++++++--
 .../ebeaninternal/server/profile/UtilLocation.java | 14 ++++++++++++++
 .../io/ebeaninternal/server/query/CQueryPlan.java  |  4 ++--
 .../server/query/CQueryPlanStats.java              |  2 +-
 .../server/querydefn/DefaultOrmQuery.java          | 11 +++++++++++
 .../server/profile/BasicProfileLocationTest.java   |  4 ++++
 .../org/tests/profile/ProfileLocationTest.java     |  2 ++
 10 files changed, 65 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/profile/UtilLocation.java

diff --git a/src/main/java/io/ebean/ProfileLocation.java b/src/main/java/io/ebean/ProfileLocation.java
index d433f4c3d..7b4b778b8 100644
--- a/src/main/java/io/ebean/ProfileLocation.java
+++ b/src/main/java/io/ebean/ProfileLocation.java
@@ -40,6 +40,11 @@ public interface ProfileLocation {
    */
   String shortDescription();
 
+  /**
+   * Return the short label.
+   */
+  String label();
+
   /**
    * Add execution time.
    */
diff --git a/src/main/java/io/ebeaninternal/api/SpiQuery.java b/src/main/java/io/ebeaninternal/api/SpiQuery.java
index c951dae39..483749988 100644
--- a/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -197,6 +197,11 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
    */
   String getLabel();
 
+  /**
+   * Return the label manually set on the query or from the profile location.
+   */
+  String getPlanLabel();
+
   /**
    * Return true if this is a "find by id" query. This includes a check for a single "equal to" expression for the Id.
    */
diff --git a/src/main/java/io/ebeaninternal/server/profile/BasicProfileLocation.java b/src/main/java/io/ebeaninternal/server/profile/BasicProfileLocation.java
index 790bf2128..30d5c0c72 100644
--- a/src/main/java/io/ebeaninternal/server/profile/BasicProfileLocation.java
+++ b/src/main/java/io/ebeaninternal/server/profile/BasicProfileLocation.java
@@ -5,14 +5,16 @@ import io.ebean.ProfileLocation;
 /**
  * Fixed / given location. Used internally for find by id and find all.
  */
-class BasicProfileLocation implements ProfileLocation {
+final class BasicProfileLocation implements ProfileLocation {
 
   private final String location;
   private final String shortDescription;
+  private final String label;
 
   BasicProfileLocation(String location) {
     this.location = location;
     this.shortDescription = shortDesc(location);
+    this.label = UtilLocation.label(shortDescription);
   }
 
   @Override
@@ -30,6 +32,11 @@ class BasicProfileLocation implements ProfileLocation {
     return location;
   }
 
+  @Override
+  public String label() {
+    return label;
+  }
+
   @Override
   public String shortDescription() {
     return shortDescription;
@@ -38,9 +45,9 @@ class BasicProfileLocation implements ProfileLocation {
   private String shortDesc(String location) {
     int lastPer = location.lastIndexOf('.');
     if (lastPer > -1) {
-      lastPer = location.lastIndexOf('.', lastPer-1);
+      lastPer = location.lastIndexOf('.', lastPer - 1);
       if (lastPer > -1) {
-        return location.substring(lastPer+1);
+        return location.substring(lastPer + 1);
       }
     }
     return location;
diff --git a/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java b/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java
index 9a4afc62d..03cf36070 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java
@@ -15,6 +15,8 @@ class DProfileLocation implements ProfileLocation {
 
   private String shortDescription;
 
+  private String label;
+
   private final int lineNumber;
 
   DProfileLocation() {
@@ -42,12 +44,19 @@ class DProfileLocation implements ProfileLocation {
   public String obtain() {
     // atomic assignment so happy with this
     if (location == null) {
-      location = create();
-      shortDescription = shortDesc(location);
+      final String loc = create();
+      shortDescription = shortDesc(loc);
+      label = UtilLocation.label(shortDescription);
+      location = loc;
     }
     return location;
   }
 
+  @Override
+  public String label() {
+    return label;
+  }
+
   @Override
   public String shortDescription() {
     return shortDescription;
diff --git a/src/main/java/io/ebeaninternal/server/profile/UtilLocation.java b/src/main/java/io/ebeaninternal/server/profile/UtilLocation.java
new file mode 100644
index 000000000..06aedef6d
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/profile/UtilLocation.java
@@ -0,0 +1,14 @@
+package io.ebeaninternal.server.profile;
+
+final class UtilLocation {
+
+  static String label(String shortDescription) {
+    int pos = shortDescription.indexOf("(");
+    if (pos == -1) {
+      return shortDescription;
+    } else {
+      return shortDescription.substring(0, pos);
+    }
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
index d067a2c46..ef3ea29d0 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
@@ -110,7 +110,7 @@ public class CQueryPlan {
     this.planKey = request.getQueryPlanKey();
     SpiQuery<?> query = request.getQuery();
     this.profileLocation = query.getProfileLocation();
-    this.label = query.getLabel();
+    this.label = query.getPlanLabel();
     this.location = location();
     this.autoTuned = query.isAutoTuned();
     this.asOfTableCount = query.getAsOfTableCount();
@@ -135,7 +135,7 @@ public class CQueryPlan {
     this.beanType = request.getBeanDescriptor().getBeanType();
     SpiQuery<?> query = request.getQuery();
     this.profileLocation = query.getProfileLocation();
-    this.label = query.getLabel();
+    this.label = query.getPlanLabel();
     this.location = location();
     this.planKey = buildPlanKey(sql, rawSql, rowNumberIncluded, logWhereSql);
     this.autoTuned = false;
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
index 56653ef95..96fa43e29 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
@@ -164,7 +164,7 @@ public final class CQueryPlanStats {
 
     @Override
     public String toString() {
-      return "location:" + getLocation() + " metrics:" + metrics + " sql:" + getSql();
+      return "label:" + getLabel() + " location:" + getLocation() + " metrics:" + metrics + " sql:" + getSql();
     }
 
     @Override
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 0f10c5201..d79455f5d 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -361,6 +361,17 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return label;
   }
 
+  @Override
+  public String getPlanLabel() {
+    if (label != null) {
+      return label;
+    }
+    if (profileLocation != null) {
+      return profileLocation.label();
+    }
+    return null;
+  }
+
   @Override
   public Query<T> setLabel(String label) {
     this.label = label;
diff --git a/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java b/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java
index 7ec7e7667..139dc3bf8 100644
--- a/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java
+++ b/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java
@@ -15,6 +15,8 @@ public class BasicProfileLocationTest {
 
     assertThat(loc.obtain()).endsWith(":12)");
     assertThat(loc.shortDescription()).isEqualTo("NativeMethodAccessorImpl.invoke0(Native Method:12)");
+    assertThat(loc.label()).isEqualTo("NativeMethodAccessorImpl.invoke0");
+
   }
 
   @Test
@@ -23,6 +25,7 @@ public class BasicProfileLocationTest {
     BasicProfileLocation loc = new BasicProfileLocation("com.foo.Bar.all");
     assertThat(loc.obtain()).isEqualTo("com.foo.Bar.all");
     assertThat(loc.shortDescription()).isEqualTo("Bar.all");
+    assertThat(loc.label()).isEqualTo("Bar.all");
   }
 
   @Test
@@ -31,5 +34,6 @@ public class BasicProfileLocationTest {
     BasicProfileLocation loc = new BasicProfileLocation("foo.Bar.all");
     assertThat(loc.obtain()).isEqualTo("foo.Bar.all");
     assertThat(loc.shortDescription()).isEqualTo("Bar.all");
+    assertThat(loc.label()).isEqualTo("Bar.all");
   }
 }
diff --git a/src/test/java/org/tests/profile/ProfileLocationTest.java b/src/test/java/org/tests/profile/ProfileLocationTest.java
index ef30d3bfa..8165a76a0 100644
--- a/src/test/java/org/tests/profile/ProfileLocationTest.java
+++ b/src/test/java/org/tests/profile/ProfileLocationTest.java
@@ -17,6 +17,8 @@ public class ProfileLocationTest {
   public void test_obtain() {
 
     assertThat(doIt()).isEqualTo("org.tests.profile.ProfileLocationTest.doIt(ProfileLocationTest.java:13)");
+    assertThat(loc.shortDescription()).isEqualTo("ProfileLocationTest.doIt(ProfileLocationTest.java:13)");
+    assertThat(loc.label()).isEqualTo("ProfileLocationTest.doIt");
   }
 
   @Test

From f8b97ff397f5bfe305a56bdcb1f738399293ac8f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 27 Mar 2019 12:57:36 +1300
Subject: [PATCH 0781/1036] #1658 - ENH: Add label to ProfileLocation and use
 as default query label

- Extend/propagate the label from the origin query to secondary queries
(appending the relative path).
---
 .../server/loadcontext/DLoadBaseContext.java  | 15 +++++++++++
 .../server/loadcontext/DLoadBeanContext.java  |  1 +
 .../server/loadcontext/DLoadContext.java      | 25 ++++++++++++++++---
 .../server/loadcontext/DLoadManyContext.java  |  1 +
 4 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java
index 21e6c35d3..3eda74298 100644
--- a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java
+++ b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.loadcontext;
 import io.ebean.FetchConfig;
 import io.ebean.bean.ObjectGraphNode;
 import io.ebean.bean.PersistenceContext;
+import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.querydefn.OrmQueryProperties;
 
@@ -77,6 +78,20 @@ public abstract class DLoadBaseContext {
     return (lazyBatchSize > 1) ? lazyBatchSize : defaultBatchSize;
   }
 
+  /**
+   * If the parent has a query plan label then extend it with the path and
+   * set onto the secondary query.
+   */
+  void setLabel(SpiQuery<?> query) {
+
+    String label = parent.getPlanLabel();
+    if (label != null) {
+      label += "_" + fullPath;
+      query.setLabel(label);
+      query.setProfileLocation(parent.getProfileLocation());
+    }
+  }
+
   protected PersistenceContext getPersistenceContext() {
     return parent.getPersistenceContext();
   }
diff --git a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
index 4c820c71c..f5207c7bf 100644
--- a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
+++ b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
@@ -43,6 +43,7 @@ public class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContex
 
   protected void configureQuery(SpiQuery<?> query, String lazyLoadProperty) {
 
+    setLabel(query);
     parent.propagateQueryState(query, desc.isDocStoreMapped());
     query.setParentNode(objectGraphNode);
     query.setLazyLoadProperty(lazyLoadProperty);
diff --git a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
index 7a04f3bb7..1b86a169a 100644
--- a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
+++ b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.loadcontext;
 
 import io.ebean.CacheMode;
+import io.ebean.ProfileLocation;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.CallStack;
 import io.ebean.bean.EntityBeanIntercept;
@@ -55,6 +56,8 @@ public class DLoadContext implements LoadContext {
   private final String relativePath;
   private final ObjectGraphOrigin origin;
   private final boolean useProfiling;
+  private final String planLabel;
+  private final ProfileLocation profileLocation;
 
   private final Map<String, ObjectGraphNode> nodePathMap = new HashMap<>();
 
@@ -83,6 +86,8 @@ public class DLoadContext implements LoadContext {
     this.disableReadAudit = false;
     this.includeSoftDeletes = false;
     this.relativePath = null;
+    this.planLabel = null;
+    this.profileLocation = null;
     this.useProfiling = false;
     this.rootBeanContext = new DLoadBeanContext(this, rootDescriptor, null, defaultBatchSize, null);
   }
@@ -110,6 +115,8 @@ public class DLoadContext implements LoadContext {
     this.disableLazyLoading = query.isDisableLazyLoading();
     this.useBeanCache = query.getUseBeanCache();
     this.useProfiling = query.getProfilingListener() != null;
+    this.planLabel = query.getPlanLabel();
+    this.profileLocation = query.getProfileLocation();
 
     ObjectGraphNode parentNode = query.getParentNode();
     if (parentNode != null) {
@@ -126,6 +133,19 @@ public class DLoadContext implements LoadContext {
     registerSecondaryQueries(secondaryQueries);
   }
 
+  /**
+   * Return the query plan label of the origin query.
+   */
+  public String getPlanLabel() {
+    return planLabel;
+  }
+
+  /**
+   * Return the profile location of the origin query.
+   */
+  public ProfileLocation getProfileLocation() {
+    return profileLocation;
+  }
 
   /**
    * Register the +query and +lazy secondary queries with their appropriate LoadBeanContext or LoadManyContext.
@@ -211,10 +231,7 @@ public class DLoadContext implements LoadContext {
 
   @Override
   public ObjectGraphNode getObjectGraphNode(String path) {
-
-    ObjectGraphNode node = nodePathMap.computeIfAbsent(path, this::createObjectGraphNode);
-
-    return node;
+    return nodePathMap.computeIfAbsent(path, this::createObjectGraphNode);
   }
 
   private ObjectGraphNode createObjectGraphNode(String path) {
diff --git a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java
index d98a62039..07123109e 100644
--- a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java
+++ b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java
@@ -59,6 +59,7 @@ public class DLoadManyContext extends DLoadBaseContext implements LoadManyContex
 
   public void configureQuery(SpiQuery<?> query) {
 
+    setLabel(query);
     parent.propagateQueryState(query, docStoreMapped);
     query.setParentNode(objectGraphNode);
     if (queryProps != null) {

From f06f21cf5eca8c09a66da51c9f56ee9d10c5cdc0 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 27 Mar 2019 16:12:09 +1300
Subject: [PATCH 0782/1036] #1660 - Modify MetaOrmQueryMetric getQueryPlanHash
 to return hash of sql

---
 .../io/ebeaninternal/server/query/CQueryPlan.java | 15 +++++++++++----
 .../server/query/CQueryPlanStats.java             |  2 +-
 .../java/io/ebeaninternal/server/util/Md5.java    |  5 ++---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
index ef3ea29d0..5680b3135 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
@@ -72,6 +72,7 @@ public class CQueryPlan {
   private final boolean rowNumberIncluded;
 
   private final String sql;
+  private final String sqlHash;
 
   private final String logWhereSql;
 
@@ -115,6 +116,7 @@ public class CQueryPlan {
     this.autoTuned = query.isAutoTuned();
     this.asOfTableCount = query.getAsOfTableCount();
     this.sql = sqlRes.getSql();
+    this.sqlHash = md5Hash(sql);
     this.rowNumberIncluded = sqlRes.isIncludesRowNumberColumn();
     this.sqlTree = sqlTree;
     this.rawSql = rawSql;
@@ -141,6 +143,7 @@ public class CQueryPlan {
     this.autoTuned = false;
     this.asOfTableCount = 0;
     this.sql = sql;
+    this.sqlHash = md5Hash(sql);
     this.sqlTree = sqlTree;
     this.rawSql = rawSql;
     this.rowNumberIncluded = rowNumberIncluded;
@@ -245,21 +248,25 @@ public class CQueryPlan {
 
   private String calcAuditQueryKey() {
     // rawSql needs to include the MD5 hash of the sql
-    return rawSql ? planKey.getPartialKey() + "_" + getSqlMd5Hash() : planKey.getPartialKey();
+    return rawSql ? planKey.getPartialKey() + "_" + sqlHash : planKey.getPartialKey();
   }
 
   /**
-   * Return the MD5 hash of the underlying sql.
+   * Return the MD5 hash of the sql.
    */
-  private String getSqlMd5Hash() {
+  private String md5Hash(String sql) {
     try {
       return Md5.hash(sql);
     } catch (Exception e) {
-      logger.error("Failed to MD5 hash the rawSql query", e);
+      logger.error("Failed to MD5 hash the query", e);
       return "error";
     }
   }
 
+  public String getSqlHash() {
+    return sqlHash;
+  }
+
   public String getSql() {
     return sql;
   }
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
index 96fa43e29..8498b3280 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
@@ -239,7 +239,7 @@ public final class CQueryPlanStats {
 
     @Override
     public String getQueryPlanHash() {
-      return queryPlan.getPlanKey().toString();
+      return queryPlan.getSqlHash();
     }
 
     @Override
diff --git a/src/main/java/io/ebeaninternal/server/util/Md5.java b/src/main/java/io/ebeaninternal/server/util/Md5.java
index 3ddddb681..ff8983e1e 100644
--- a/src/main/java/io/ebeaninternal/server/util/Md5.java
+++ b/src/main/java/io/ebeaninternal/server/util/Md5.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.util;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 
-public class Md5 {
+public final class Md5 {
 
   /**
    * Return the MD5 hash of the underlying sql.
@@ -12,8 +12,7 @@ public class Md5 {
 
     try {
       MessageDigest md = MessageDigest.getInstance("MD5");
-      byte[] digest = md.digest(content.getBytes(StandardCharsets.UTF_8));
-      return digestToHex(digest);
+      return digestToHex(md.digest(content.getBytes(StandardCharsets.UTF_8)));
     } catch (Exception e) {
       throw new RuntimeException("MD5 hashing failed", e);
     }

From c9b71ae373ef64a3421a26ea4f829ed7341795ba Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 27 Mar 2019 16:43:47 +1300
Subject: [PATCH 0783/1036] [maven-release-plugin] prepare release
 ebean-11.36.3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 242137203..e3ec00aac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.36.3-SNAPSHOT</version>
+  <version>11.36.3</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.36.3</tag>
   </scm>
 
   <profiles>

From d23ca31e42d30a1dc991041f86001f8ea1d8ef83 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 27 Mar 2019 16:44:00 +1300
Subject: [PATCH 0784/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e3ec00aac..873ddfd0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.36.3</version>
+  <version>11.36.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.36.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From e417b3cde2068fa632cae36da6c2cffae8cb1e82 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 28 Mar 2019 20:47:34 +1300
Subject: [PATCH 0785/1036] #1661 - AutoTune - callstack filters _ebean_
 methods

---
 src/main/java/io/ebean/config/AutoTuneConfig.java    |  2 +-
 .../server/autotune/service/BaseQueryTuner.java      | 10 ++++++++--
 .../server/core/DefaultCallStackFactory.java         | 12 +++++++++++-
 .../server/loadcontext/DLoadContext.java             | 11 ++++++-----
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/ebean/config/AutoTuneConfig.java b/src/main/java/io/ebean/config/AutoTuneConfig.java
index e0940241b..526fdebb0 100644
--- a/src/main/java/io/ebean/config/AutoTuneConfig.java
+++ b/src/main/java/io/ebean/config/AutoTuneConfig.java
@@ -5,7 +5,7 @@ package io.ebean.config;
  */
 public class AutoTuneConfig {
 
-  private AutoTuneMode mode = AutoTuneMode.DEFAULT_ON;
+  private AutoTuneMode mode = AutoTuneMode.DEFAULT_OFF;
 
   private String queryTuningFile = "ebean-autotune.xml";
 
diff --git a/src/main/java/io/ebeaninternal/server/autotune/service/BaseQueryTuner.java b/src/main/java/io/ebeaninternal/server/autotune/service/BaseQueryTuner.java
index 1c4d82e66..8219b179c 100644
--- a/src/main/java/io/ebeaninternal/server/autotune/service/BaseQueryTuner.java
+++ b/src/main/java/io/ebeaninternal/server/autotune/service/BaseQueryTuner.java
@@ -41,7 +41,7 @@ public class BaseQueryTuner {
    */
   private final boolean skipAll;
 
-  public BaseQueryTuner(AutoTuneConfig config, SpiEbeanServer server, ProfilingListener profilingListener) {
+  BaseQueryTuner(AutoTuneConfig config, SpiEbeanServer server, ProfilingListener profilingListener) {
     this.server = server;
     this.profilingListener = profilingListener;
     this.mode = config.getMode();
@@ -84,12 +84,17 @@ public class BaseQueryTuner {
   /**
    * Auto tune the query and enable profiling.
    */
-  public boolean tuneQuery(SpiQuery<?> query) {
+  boolean tuneQuery(SpiQuery<?> query) {
 
     if (skipAll || !tunableQuery(query)) {
       return false;
     }
 
+    if (query.getProfilingListener() != null) {
+      // profiling secondary query
+      return false;
+    }
+
     if (!useTuning(query)) {
       if (profiling) {
         profiling(query, server.createCallStack());
@@ -138,6 +143,7 @@ public class BaseQueryTuner {
     switch (type) {
       case COUNT:
       case ID_LIST:
+      case UPDATE:
       case DELETE:
       case SUBQUERY:
         return false;
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultCallStackFactory.java b/src/main/java/io/ebeaninternal/server/core/DefaultCallStackFactory.java
index 4b6cabdc0..d7a949d03 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultCallStackFactory.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultCallStackFactory.java
@@ -28,7 +28,7 @@ public class DefaultCallStackFactory implements CallStackFactory {
 
     // find the first non-avaje stackElement
     for (; startIndex < stackTrace.length; startIndex++) {
-      if (!stackTrace[startIndex].getClassName().startsWith(IO_EBEAN)) {
+      if (!ignore(stackTrace[startIndex])) {
         break;
       }
     }
@@ -51,6 +51,16 @@ public class DefaultCallStackFactory implements CallStackFactory {
     return createCallStack(finalTrace);
   }
 
+  private boolean ignore(StackTraceElement element) {
+    if (element.getClassName().startsWith(IO_EBEAN)) {
+      return true;
+    }
+    if (element.getMethodName().startsWith("_ebean_")) {
+      return true;
+    }
+    return false;
+  }
+
   private CallStack createCallStack(StackTraceElement[] finalTrace) {
     return new CallStack(finalTrace, finalTrace[0].hashCode(), pathHash(finalTrace));
   }
diff --git a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
index 1b86a169a..1ecfe8e11 100644
--- a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
+++ b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
@@ -13,6 +13,7 @@ import io.ebeaninternal.api.LoadSecondaryQuery;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.SpiQuerySecondary;
+import io.ebeaninternal.server.autotune.ProfilingListener;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanProperty;
@@ -55,9 +56,9 @@ public class DLoadContext implements LoadContext {
    */
   private final String relativePath;
   private final ObjectGraphOrigin origin;
-  private final boolean useProfiling;
   private final String planLabel;
   private final ProfileLocation profileLocation;
+  private final ProfilingListener profilingListener;
 
   private final Map<String, ObjectGraphNode> nodePathMap = new HashMap<>();
 
@@ -88,7 +89,7 @@ public class DLoadContext implements LoadContext {
     this.relativePath = null;
     this.planLabel = null;
     this.profileLocation = null;
-    this.useProfiling = false;
+    this.profilingListener = null;
     this.rootBeanContext = new DLoadBeanContext(this, rootDescriptor, null, defaultBatchSize, null);
   }
 
@@ -114,7 +115,7 @@ public class DLoadContext implements LoadContext {
     this.disableReadAudit = query.isDisableReadAudit();
     this.disableLazyLoading = query.isDisableLazyLoading();
     this.useBeanCache = query.getUseBeanCache();
-    this.useProfiling = query.getProfilingListener() != null;
+    this.profilingListener = query.getProfilingListener();
     this.planLabel = query.getPlanLabel();
     this.profileLocation = query.getProfileLocation();
 
@@ -368,8 +369,8 @@ public class DLoadContext implements LoadContext {
     if (disableReadAudit) {
       query.setDisableReadAuditing();
     }
-    if (useProfiling) {
-      query.setAutoTune(true);
+    if (profilingListener != null) {
+      query.setProfilingListener(profilingListener);
     }
     if (tenantId != null) {
       query.setTenantId(tenantId);

From 4971db54c8b2e4e0d2e31aa63621a2ebbce2290e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 29 Mar 2019 00:19:21 +1300
Subject: [PATCH 0786/1036] #1663 - AutoTune - merge profiling such that
 "select (orderDate) fetch customer (id)" instead merges to "select
 (orderDate,customer)"

---
 .../autotune/service/ProfileManager.java      |   3 +-
 .../autotune/service/ProfileOrigin.java       |  11 +-
 .../service/ProfileOriginNodeUsage.java       |  21 ++-
 .../autotune/service/ProfileOriginTest.java   | 143 ++++++++++++++++++
 .../query/autotune/TestAutoTuneProfiling.java |  33 ++--
 src/test/resources/ebean.properties           |   1 +
 src/test/resources/logback-test.xml           |   6 +-
 7 files changed, 184 insertions(+), 34 deletions(-)
 create mode 100644 src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java

diff --git a/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java b/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java
index 183007d0e..d89da0073 100644
--- a/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java
+++ b/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java
@@ -103,8 +103,7 @@ public class ProfileManager implements ProfilingListener {
 
   private ProfileOrigin getProfileOrigin(ObjectGraphOrigin originQueryPoint) {
     synchronized (monitor) {
-      ProfileOrigin stats = profileMap.computeIfAbsent(originQueryPoint.getKey(), k -> new ProfileOrigin(originQueryPoint, queryTuningAddVersion, profilingBase, profilingRate));
-      return stats;
+      return profileMap.computeIfAbsent(originQueryPoint.getKey(), k -> new ProfileOrigin(originQueryPoint, queryTuningAddVersion, profilingBase, profilingRate));
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOrigin.java b/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOrigin.java
index 0e3e9c1a7..5f119d326 100644
--- a/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOrigin.java
+++ b/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOrigin.java
@@ -98,7 +98,7 @@ public class ProfileOrigin {
     }
   }
 
-  private OrmQueryDetail buildDetail(BeanDescriptor<?> rootDesc) {
+  OrmQueryDetail buildDetail(BeanDescriptor<?> rootDesc) {
 
     PathProperties pathProps = new PathProperties();
     for (ProfileOriginNodeUsage statsNode : nodeUsageMap.values()) {
@@ -107,8 +107,7 @@ public class ProfileOrigin {
 
     OrmQueryDetail detail = new OrmQueryDetail();
 
-    Collection<Props> pathProperties = pathProps.getPathProps();
-    for (Props props : pathProperties) {
+    for (Props props : pathProps.getPathProps()) {
       if (!props.isEmpty()) {
         detail.fetch(props.getPath(), props.getPropertiesAsString(), null);
       }
@@ -151,12 +150,8 @@ public class ProfileOrigin {
    * Collect the usage information for from a instance for this node.
    */
   public void collectUsageInfo(NodeUsageCollector profile) {
-
-    //logger.info("COLLECT USAGE {}", profile.toString());
-
     if (!profile.isEmpty()) {
-      ProfileOriginNodeUsage nodeStats = getNodeStats(profile.getNode().getPath());
-      nodeStats.collectUsageInfo(profile);
+      getNodeStats(profile.getNode().getPath()).collectUsageInfo(profile);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java b/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java
index 9b9ebc50c..be6d840b8 100644
--- a/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java
+++ b/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java
@@ -55,23 +55,27 @@ public class ProfileOriginNodeUsage {
         }
       }
 
+      BeanProperty toOneIdProperty = null;
+      boolean addedToPath = false;
+
       for (String propName : aggregateUsed) {
         BeanProperty beanProp = desc.findPropertyFromPath(propName);
         if (beanProp == null) {
           logger.warn("AutoTune: Can't find property[" + propName + "] for " + desc.getName());
 
         } else {
-          if (beanProp instanceof BeanPropertyAssoc<?>) {
-            BeanPropertyAssoc<?> assocProp = (BeanPropertyAssoc<?>) beanProp;
-            String targetIdProp = assocProp.getTargetIdProperty();
-            String manyPath = SplitName.add(path, assocProp.getName());
-            pathProps.addToPath(manyPath, targetIdProp);
+          if (beanProp.isId()) {
+            // remember and maybe add ToOne property to parent path
+            toOneIdProperty = beanProp;
+          } else if (beanProp instanceof BeanPropertyAssoc<?>) {
+            // intentionally skip
           } else {
             //noinspection StatementWithEmptyBody
             if (beanProp.isLob() && !beanProp.isFetchEager()) {
               // AutoTune will not include Lob's marked FetchLazy
               // (which is the default for Lob's so typical).
             } else {
+              addedToPath = true;
               pathProps.addToPath(path, beanProp.getName());
             }
           }
@@ -81,9 +85,16 @@ public class ProfileOriginNodeUsage {
       if ((modified || addVersionProperty) && desc != null) {
         BeanProperty versionProp = desc.getVersionProperty();
         if (versionProp != null) {
+          addedToPath = true;
           pathProps.addToPath(path, versionProp.getName());
         }
       }
+
+      if (toOneIdProperty != null && !addedToPath) {
+        // add ToOne property to parent path
+        ElPropertyValue assocOne = rootDesc.getElGetValue(path);
+        pathProps.addToPath(SplitName.parent(path), assocOne.getName());
+      }
     }
   }
 
diff --git a/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java b/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java
new file mode 100644
index 000000000..4660165fd
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java
@@ -0,0 +1,143 @@
+package io.ebeaninternal.server.autotune.service;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import io.ebean.bean.NodeUsageCollector;
+import io.ebean.bean.ObjectGraphNode;
+import io.ebean.bean.ObjectGraphOrigin;
+import io.ebeaninternal.server.deploy.BeanDescriptor;
+import io.ebeaninternal.server.querydefn.OrmQueryDetail;
+import org.junit.Test;
+import org.tests.model.basic.Order;
+import org.tests.model.basic.ResetBasicData;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ProfileOriginTest extends BaseTestCase {
+
+
+  private BeanDescriptor<Order> desc = getBeanDescriptor(Order.class);
+
+  @Test
+  public void buildDetail() {
+
+    NodeUsageCollector c = node("customer");
+    c.addUsed("id");
+    c.addUsed("name");
+
+    ProfileOrigin po = new ProfileOrigin(null, false, 1, 1);
+    po.collectUsageInfo(c);
+
+    OrmQueryDetail detail = po.buildDetail(desc);
+
+    assertThat(detail.asString().trim()).isEqualTo("fetch customer (name)");
+  }
+
+  @Test
+  public void buildDetail_selectFetch() {
+
+    NodeUsageCollector c = node("customer");
+    c.addUsed("id");
+    c.addUsed("name");
+
+    ProfileOrigin po = new ProfileOrigin(null, false, 1, 1);
+    po.collectUsageInfo(c);
+
+    c = node(null);
+    c.addUsed("orderDate");
+    po.collectUsageInfo(c);
+
+    OrmQueryDetail detail = po.buildDetail(desc);
+
+    assertThat(detail.asString().trim()).isEqualTo("select (orderDate)  fetch customer (name)");
+  }
+
+  @Test
+  public void buildDetail_expect_mergeFetchToSelect() {
+
+    NodeUsageCollector c = node("customer");
+    c.addUsed("id");
+
+    ProfileOrigin po = new ProfileOrigin(null, false, 1, 1);
+    po.collectUsageInfo(c);
+
+    c = node(null);
+    c.addUsed("orderDate");
+    po.collectUsageInfo(c);
+
+    OrmQueryDetail detail = po.buildDetail(desc);
+
+    assertThat(detail.asString().trim()).isEqualTo("select (orderDate,customer)");
+  }
+
+  @Test
+  public void buildDetail_expect_mergeFetchToParentFetch() {
+
+    ProfileOrigin po = new ProfileOrigin(null, false, 1, 1);
+
+    NodeUsageCollector c = node(null);
+    c.addUsed("orderDate");
+    c.addUsed("customer");
+    po.collectUsageInfo(c);
+
+    c = node("customer");
+    c.addUsed("billingAddress");
+    po.collectUsageInfo(c);
+
+    c = node("customer.billingAddress");
+    c.addUsed("id");
+    po.collectUsageInfo(c);
+
+    OrmQueryDetail detail = po.buildDetail(desc);
+
+    assertThat(detail.asString().trim()).isEqualTo("select (orderDate)  fetch customer (billingAddress)");
+  }
+
+
+  @Test
+  public void buildDetail_expect_mergeMulit() {
+
+    ProfileOrigin po = new ProfileOrigin(null, false, 1, 1);
+
+    //fetch details (id,orderQty,shipQty,unitPrice)
+
+    NodeUsageCollector c = node(null);
+    c.addUsed("details");
+    po.collectUsageInfo(c);
+
+    c = node("details");
+    c.addUsed("id");
+    c.addUsed("orderQty");
+    c.addUsed("shipQty");
+    c.addUsed("unitPrice");
+    c.addUsed("product");
+    po.collectUsageInfo(c);
+
+    //fetch details.product (id,name)
+    c = node("details.product");
+    c.addUsed("id");
+    c.addUsed("name");
+    po.collectUsageInfo(c);
+
+    OrmQueryDetail detail = po.buildDetail(desc);
+    assertThat(detail.asString().trim()).isEqualTo("fetch details (orderQty,shipQty,unitPrice)  fetch details.product (name)");
+  }
+
+  private NodeUsageCollector node(String path) {
+    ObjectGraphNode node = new ObjectGraphNode((ObjectGraphOrigin)null, path);
+    return new NodeUsageCollector(node, null);
+  }
+
+  @Test
+  public void testQueries() {
+
+    ResetBasicData.reset();
+
+    //DB.createQuery(Order.class, "select (orderDate) fetch customer (billingAddress)").findList();
+
+    // we prefer this first query other the second one
+    DB.createQuery(Order.class, "select (orderDate,customer)").findList();
+    DB.createQuery(Order.class, "select (orderDate) fetch customer (id)").findList();
+
+  }
+}
diff --git a/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java b/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java
index 4b4c7005c..6f1a020fd 100644
--- a/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java
+++ b/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java
@@ -1,14 +1,14 @@
 package org.tests.query.autotune;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
+import org.junit.Ignore;
+import org.junit.Test;
 import org.tests.model.basic.Address;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.OrderDetail;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Ignore;
-import org.junit.Test;
 
 import java.util.List;
 import java.util.Random;
@@ -49,16 +49,17 @@ public class TestAutoTuneProfiling extends BaseTestCase {
 
 
   private void execute() {
-    useOrderDate();
-    useOrderDateCustomerName();
-    useLots();
+//    useOrderDate();
+//    useOrderDateCustomerName();
+//    useLots();
     useLotUntuned();
   }
 
   private Order findById(long id) {
-    return Ebean.find(Order.class)
+    return DB.find(Order.class)
       .select("status, orderDate, shipDate")
       .setId(id)
+      .setUseCache(false)
       .findOne();
   }
 
@@ -99,19 +100,19 @@ public class TestAutoTuneProfiling extends BaseTestCase {
       detail.getUnitPrice();
     }
 
-    Customer customer = order.getCustomer();
-    customer.getName();
-    Address billingAddress = customer.getBillingAddress();
-    if (billingAddress != null) {
-      billingAddress.getCity();
-      billingAddress.getLine1();
-      billingAddress.getLine2();
-    }
+//    Customer customer = order.getCustomer();
+//    customer.getName();
+//    Address billingAddress = customer.getBillingAddress();
+//    if (billingAddress != null) {
+//      billingAddress.getCity();
+//      billingAddress.getLine1();
+//      billingAddress.getLine2();
+//    }
   }
 
   private static void collectUsage() {
 
-    Ebean.getDefaultServer().getAutoTune().collectProfiling();
+    DB.getDefault().getAutoTune().collectProfiling();
   }
 
 }
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index cd6b5c07c..65af4407e 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -13,6 +13,7 @@ ebean.encryptKeyManager=org.tests.basic.encrypt.BasicEncyptKeyManager
 
 #ebean.disableL2Cache=true
 #ebean.autoTune.queryTuning=true
+#ebean.autoTune.mode=DEFAULT_ON
 #ebean.autoTune.profiling=true
 #ebean.autoTune.profilingUpdateFrequency=5
 
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
index cab30c58a..7236805d5 100644
--- a/src/test/resources/logback-test.xml
+++ b/src/test/resources/logback-test.xml
@@ -82,9 +82,9 @@
   <!--<logger name="org.avaje.docker" level="TRACE"/>-->
   <!--<logger name="io.ebean.DDL" level="DEBUG"/>-->
 
-  <!--<logger name="io.ebean.SQL" level="TRACE"/>-->
-  <!--<logger name="io.ebean.TXN" level="TRACE"/>-->
-  <!--<logger name="io.ebean.SUM" level="TRACE"/>-->
+  <logger name="io.ebean.SQL" level="TRACE"/>
+  <logger name="io.ebean.TXN" level="TRACE"/>
+  <logger name="io.ebean.SUM" level="TRACE"/>
 
   <!--<logger name="io.ebean.cache.TABLEMOD" level="TRACE"/>-->
 

From 32b8fd0e26b557c7c8b2a9e7246cab8cc40b5004 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 29 Mar 2019 00:43:32 +1300
Subject: [PATCH 0787/1036] #1663 Additionally trim the
 OrmQueryDetail.asString() output removing extra whitespace

---
 .../io/ebeaninternal/server/querydefn/OrmQueryDetail.java   | 5 ++++-
 .../ebeaninternal/server/querydefn/OrmQueryProperties.java  | 2 +-
 .../server/autotune/service/ProfileOriginTest.java          | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
index 3b61ff949..1310b709a 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
@@ -121,7 +121,10 @@ public class OrmQueryDetail implements Serializable {
     }
     if (fetchPaths != null) {
       for (OrmQueryProperties join : fetchPaths.values()) {
-        join.append(" fetch ", sb);
+        if (sb.length() > 0) {
+          sb.append(" ");
+        }
+        join.append("fetch ", sb);
       }
     }
     return sb.toString();
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
index f5a558607..964250c4a 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
@@ -294,7 +294,7 @@ public class OrmQueryProperties implements Serializable {
       sb.append(path).append(" ");
     }
     if (!isEmpty()) {
-      sb.append("(").append(rawProperties).append(") ");
+      sb.append("(").append(rawProperties).append(")");
     }
     return sb.toString();
   }
diff --git a/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java b/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java
index 4660165fd..4c13b274c 100644
--- a/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java
+++ b/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java
@@ -49,7 +49,7 @@ public class ProfileOriginTest extends BaseTestCase {
 
     OrmQueryDetail detail = po.buildDetail(desc);
 
-    assertThat(detail.asString().trim()).isEqualTo("select (orderDate)  fetch customer (name)");
+    assertThat(detail.asString()).isEqualTo("select (orderDate) fetch customer (name)");
   }
 
   @Test
@@ -90,7 +90,7 @@ public class ProfileOriginTest extends BaseTestCase {
 
     OrmQueryDetail detail = po.buildDetail(desc);
 
-    assertThat(detail.asString().trim()).isEqualTo("select (orderDate)  fetch customer (billingAddress)");
+    assertThat(detail.asString()).isEqualTo("select (orderDate) fetch customer (billingAddress)");
   }
 
 
@@ -120,7 +120,7 @@ public class ProfileOriginTest extends BaseTestCase {
     po.collectUsageInfo(c);
 
     OrmQueryDetail detail = po.buildDetail(desc);
-    assertThat(detail.asString().trim()).isEqualTo("fetch details (orderQty,shipQty,unitPrice)  fetch details.product (name)");
+    assertThat(detail.asString()).isEqualTo("fetch details (orderQty,shipQty,unitPrice) fetch details.product (name)");
   }
 
   private NodeUsageCollector node(String path) {

From 23e035894f30a06c1fb051680b0426669785c25e Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 1 Apr 2019 22:24:50 +1300
Subject: [PATCH 0788/1036] Add foconis.de as sponsor to readme

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index afd269257..444c02ca8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,12 @@
 [![Build Status](https://travis-ci.org/ebean-orm/ebean.svg?branch=master)](https://travis-ci.org/ebean-orm/ebean)
 [![Maven Central : ebean](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean)
 
+# Sponsors
+[1]: https://www.foconis.de/
+[2]: https://www.foconis.de/templates/yootheme/cache/foconis_logo_322-709da1de.png
+
+[![Foconis.de][2]][1]
+
 # Need help?
 Post questions or issues to the Ebean google group - https://groups.google.com/forum/#!forum/ebean
 

From 4119c02f0d7de6c65470fae89d240d8209dd1b98 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 1 Apr 2019 23:09:58 +1300
Subject: [PATCH 0789/1036] #1663 Additionally trim the
 OrmQueryDetail.asString() output removing extra whitespace

---
 .../server/querydefn/OrmQueryPropertiesTest.java            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java b/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java
index c80899781..547ea5966 100644
--- a/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java
+++ b/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java
@@ -62,14 +62,14 @@ public class OrmQueryPropertiesTest {
   public void append_when_someProperties() {
 
     OrmQueryProperties p1 = new OrmQueryProperties(null, "id,name");
-    assertThat(append("select ", p1)).isEqualTo("select (id,name) ");
+    assertThat(append("select ", p1)).isEqualTo("select (id,name)");
   }
 
   @Test
   public void append_when_somePropertiesWithOptions() {
 
     OrmQueryProperties p1 = new OrmQueryProperties(null, "id,name +cache");
-    assertThat(append("select ", p1)).isEqualTo("select (id,name +cache) ");
+    assertThat(append("select ", p1)).isEqualTo("select (id,name +cache)");
   }
 
   @Test
@@ -83,7 +83,7 @@ public class OrmQueryPropertiesTest {
   public void append_when_path_and_somePropertiesWithOptions() {
 
     OrmQueryProperties p1 = new OrmQueryProperties("customer", "id,name +cache");
-    assertThat(append("fetch ", p1)).isEqualTo("fetch customer (id,name +cache) ");
+    assertThat(append("fetch ", p1)).isEqualTo("fetch customer (id,name +cache)");
   }
 
 }

From 18e0ff7067facd6ec6409918fc369ff0b9044c44 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 1 Apr 2019 23:11:16 +1300
Subject: [PATCH 0790/1036] #1665 - Incorrect query execution metrics for ORM
 query converted to DTO query via asDto()

---
 .../server/core/AbstractSqlQueryRequest.java  |  4 +-
 .../server/core/DtoQueryRequest.java          |  1 +
 .../java/io/ebean/DtoQueryFromOrmTest.java    | 41 ++++++++-----------
 src/test/java/io/ebean/DtoQueryTest.java      | 12 ++++++
 4 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
index e0980c537..bd7aa0de9 100644
--- a/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
@@ -144,15 +144,13 @@ public abstract class AbstractSqlQueryRequest {
    * Prepare and execute the SQL using the Binder.
    */
   public void executeSql(Binder binder, SpiQuery.Type type) throws SQLException {
+    startNano = System.nanoTime();
     executeAsSql(binder);
   }
 
   protected void executeAsSql(Binder binder) throws SQLException {
 
-    startNano = System.nanoTime();
-
     prepareSql();
-
     Connection conn = trans.getInternalConnection();
 
     pstmt = conn.prepareStatement(sql);
diff --git a/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
index 99ba16058..d5ea92e5c 100644
--- a/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
@@ -44,6 +44,7 @@ public final class DtoQueryRequest<T> extends AbstractSqlQueryRequest {
    */
   @Override
   public void executeSql(Binder binder, SpiQuery.Type type) throws SQLException {
+    startNano = System.nanoTime();
     SpiQuery<?> ormQuery = query.getOrmQuery();
     if (ormQuery != null) {
       ormQuery.setType(type);
diff --git a/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
index 76d3c0785..d551a9807 100644
--- a/src/test/java/io/ebean/DtoQueryFromOrmTest.java
+++ b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
@@ -1,12 +1,13 @@
 package io.ebean;
 
+import io.ebean.annotation.ForPlatform;
+import io.ebean.annotation.Platform;
 import io.ebean.meta.BasicMetricVisitor;
 import io.ebean.meta.MetaQueryMetric;
 import io.ebean.meta.MetaTimedMetric;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.ResetBasicData;
@@ -19,7 +20,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
   @BeforeClass
   public static void resetStats() {
-    Ebean.getDefaultServer().getMetaInfoManager().resetAllMetrics();
+    DB.getDefault().getMetaInfoManager().resetAllMetrics();
   }
 
   @AfterClass
@@ -35,7 +36,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     }
   }
 
-  @Ignore
+  @ForPlatform(Platform.H2)
   @Test
   public void testPlanHits() {
 
@@ -46,24 +47,23 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     String[] prefix = { "Bl", "B", "Red", "jim" };
 
     for (String val : prefix) {
-      List<ContactDto> list = Ebean.find(Contact.class)
+      DB.find(Contact.class)
           .select("email, " + concat("lastName", ", ", "firstName") + " as fullName").where()
           .istartsWith(concat("lastName", ", ", "firstName"), val).orderBy().asc("lastName").setMaxRows(10)
           .asDto(ContactDto.class).setLabel("prefixLoop").findList();
 
-      System.out.println("List:" + list);
     }
 
     BasicMetricVisitor basic = visitMetricsBasic();
 
     List<MetaQueryMetric> stats = basic.getDtoQueryMetrics();
     for (MetaQueryMetric stat : stats) {
-      System.out.println(stat);
+      long meanMicros = stat.getMean();
+      assertThat(meanMicros).isLessThan(900_000);
     }
 
     assertThat(stats).hasSize(1);
-    assertThat(stats.get(0).getCount()).isEqualTo(3);
-
+    assertThat(stats.get(0).getCount()).isEqualTo(4);
   }
 
   @Test
@@ -73,7 +73,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    DtoQuery<ContactDto> query = Ebean.find(Contact.class)
+    DtoQuery<ContactDto> query = DB.find(Contact.class)
         // we must explicitly add the id property for DTO query (if we want it)
         .select("id, email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email")
         .isNotNull("lastName").orderBy().asc("lastName").asDto(ContactDto.class).setLabel("explicitId")
@@ -86,7 +86,6 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     for (ContactDto dto : dtos) {
       assertThat(dto.getEmail()).isNotNull();
       assertThat(dto.getFullName()).isNotNull();
-      System.out.println(dto);
     }
 
     List<String> sql = LoggedSqlCollector.stop();
@@ -101,7 +100,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    DtoQuery<ContactDto> query = Ebean.find(Contact.class)
+    DtoQuery<ContactDto> query = DB.find(Contact.class)
         .select("email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email")
         .isNotNull("lastName").orderBy().asc("lastName").asDto(ContactDto.class);
 
@@ -112,7 +111,6 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     for (ContactDto dto : dtos) {
       assertThat(dto.getEmail()).isNotNull();
       assertThat(dto.getFullName()).isNotNull();
-      System.out.println(dto);
     }
 
     List<String> sql = LoggedSqlCollector.stop();
@@ -127,7 +125,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    List<ContactDto> contactDtos = Ebean.find(Contact.class).setLabel("emailFullName")
+    List<ContactDto> contactDtos = DB.find(Contact.class).setLabel("emailFullName")
         .select("email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email")
         .isNotNull("lastName").orderBy().asc("lastName").setMaxRows(10).asDto(ContactDto.class).findList();
 
@@ -136,7 +134,6 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     for (ContactDto dto : contactDtos) {
       assertThat(dto.getEmail()).isNotNull();
       assertThat(dto.getFullName()).isNotNull();
-      System.out.println(dto);
     }
 
     List<String> sql = LoggedSqlCollector.stop();
@@ -158,14 +155,13 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    List<ContactDto> contactDtos = Ebean.find(Contact.class)
+    List<ContactDto> contactDtos = DB.find(Contact.class)
         .select("id, email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email")
         .isNotNull("lastName").orderBy().asc("lastName").setMaxRows(10).asDto(ContactDto.class).findList();
 
     assertThat(contactDtos).isNotEmpty();
 
     for (ContactDto dto : contactDtos) {
-      System.out.println(dto);
       assertThat(dto.getId()).isNotNull();
       assertThat(dto.getFullName()).isNotNull();
       assertThat(dto.getEmail()).isNotNull();
@@ -189,22 +185,20 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    List<ContactDto> contactDtos = Ebean.find(Contact.class)
+    List<ContactDto> contactDtos = DB.find(Contact.class)
         .select(concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("lastName").orderBy()
         .asc("lastName").asDto(ContactDto.class).setFirstRow(2).setMaxRows(5).findList();
 
     assertThat(contactDtos).isNotEmpty();
 
     for (ContactDto dto : contactDtos) {
-      System.out.println(dto);
       assertThat(dto.getFullName()).isNotNull();
       assertThat(dto.getId()).isNull();
       assertThat(dto.getEmail()).isNull();
     }
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(sql.get(0))
-        .contains("select " + concat("t0.last_name", ", ", "t0.first_name") + " fullName from contact t0 where");
+    assertThat(sql.get(0)).contains("select " + concat("t0.last_name", ", ", "t0.first_name") + " fullName from contact t0 where");
   }
 
   @Test
@@ -214,7 +208,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    List<ContactTotals> contactDtos = Ebean.find(Contact.class).select("lastName, count(*) as totalCount").where()
+    List<ContactTotals> contactDtos = DB.find(Contact.class).select("lastName, count(*) as totalCount").where()
         .isNotNull("lastName").having().gt("count(*)", 1).orderBy().desc("count(*)").asDto(ContactTotals.class)
         .findList();
 
@@ -226,8 +220,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     }
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(sql.get(0)).contains(
-        "select t0.last_name, count(*) totalCount from contact t0 where t0.last_name is not null group by t0.last_name having count(*) > ?");
+    assertThat(sql.get(0)).contains("select t0.last_name, count(*) totalCount from contact t0 where t0.last_name is not null group by t0.last_name having count(*) > ?");
   }
 
   @Test
@@ -235,7 +228,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    List<ContactTotals> contactDtos = Ebean.find(Contact.class).select("lastName, count(*) as totalCount").where()
+    List<ContactTotals> contactDtos = DB.find(Contact.class).select("lastName, count(*) as totalCount").where()
         .isNotNull("lastName").asDto(ContactTotals.class).findList();
 
     assertThat(contactDtos).isNotEmpty();
diff --git a/src/test/java/io/ebean/DtoQueryTest.java b/src/test/java/io/ebean/DtoQueryTest.java
index 8381acb9d..a1f20ba16 100644
--- a/src/test/java/io/ebean/DtoQueryTest.java
+++ b/src/test/java/io/ebean/DtoQueryTest.java
@@ -24,6 +24,7 @@ public class DtoQueryTest extends BaseTestCase {
   public void dto_findList_constructorMatch() {
 
     ResetBasicData.reset();
+    resetAllMetrics();
 
     DtoQuery<DCust> dtoQuery = server().findDto(DCust.class, "select id, name from o_customer");
 
@@ -31,6 +32,17 @@ public class DtoQueryTest extends BaseTestCase {
 
     log.info(list.toString());
     assertThat(list).isNotEmpty();
+
+    BasicMetricVisitor basic = visitMetricsBasic();
+
+    List<MetaQueryMetric> stats = basic.getDtoQueryMetrics();
+    for (MetaQueryMetric stat : stats) {
+      long meanMicros = stat.getMean();
+      assertThat(meanMicros).isLessThan(900_000);
+    }
+
+    assertThat(stats).hasSize(1);
+    assertThat(stats.get(0).getCount()).isEqualTo(1);
   }
 
   @Test

From c2e5619f70f0497830e9a0750d38bcf3d1d8434c Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 1 Apr 2019 23:12:53 +1300
Subject: [PATCH 0791/1036] [maven-release-plugin] prepare release
 ebean-11.36.4

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 873ddfd0e..fe45029f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.36.4-SNAPSHOT</version>
+  <version>11.36.4</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.36.4</tag>
   </scm>
 
   <profiles>

From f21cac5d4fb96379838bb4cc15534955918ea3ac Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 1 Apr 2019 23:13:07 +1300
Subject: [PATCH 0792/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index fe45029f0..cc7ef5c6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.36.4</version>
+  <version>11.36.5-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.36.4</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 23fd29ddf15d1558f657675c88f960dd0d16227c Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 1 Apr 2019 23:23:02 +1300
Subject: [PATCH 0793/1036] #1659 - CVE-2018-12022 - Bump Jackson version from
 2.9.5 to 2.9.8

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index cc7ef5c6c..eda1d55f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
   <url>http://ebean-orm.github.io/</url>
 
   <properties>
-    <jackson-core.version>2.9.5</jackson-core.version>
+    <jackson-core.version>2.9.8</jackson-core.version>
     <snakeyaml.version>1.21</snakeyaml.version>
   </properties>
 

From b0e487cfbd3d329d8d042f0fe5e7b59cb4cba5d2 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 3 Apr 2019 23:24:13 +1300
Subject: [PATCH 0794/1036] Add sponsor payintech.com

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 444c02ca8..4a1d4ca20 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,11 @@
 
 [![Foconis.de][2]][1]
 
+[3]: https://www.payintech.com/
+[4]: https://www.payintech.com/wp-content/uploads/2015/10/PayinTech-logo-noir.png
+
+[![payintech.com][4]][3]
+
 # Need help?
 Post questions or issues to the Ebean google group - https://groups.google.com/forum/#!forum/ebean
 

From f4db7ca0bb145856dd89a4471f1f6f5cdb536189 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 8 Apr 2019 20:49:28 +1200
Subject: [PATCH 0795/1036] Update sponsors in README

---
 README.md | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 4a1d4ca20..f77887e34 100644
--- a/README.md
+++ b/README.md
@@ -2,15 +2,27 @@
 [![Maven Central : ebean](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean)
 
 # Sponsors
-[1]: https://www.foconis.de/
-[2]: https://www.foconis.de/templates/yootheme/cache/foconis_logo_322-709da1de.png
-
-[![Foconis.de][2]][1]
-
-[3]: https://www.payintech.com/
-[4]: https://www.payintech.com/wp-content/uploads/2015/10/PayinTech-logo-noir.png
-
-[![payintech.com][4]][3]
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="middle">
+        <a href="https://www.foconis.de/" target="_blank">
+          <img width="222px" src="https://www.foconis.de/templates/yootheme/cache/foconis_logo_322-709da1de.png">
+        </a>
+      </td>
+      <td align="center" valign="middle">
+        <a href="https://www.payintech.com/" target="_blank">
+          <img width="222px" src="https://www.payintech.com/wp-content/uploads/2015/10/PayinTech-logo-noir.png">
+        </a>
+      </td>
+      <td align="center" valign="middle">
+        <a href="https://www.premium-minds.com" target="_blank">
+          <img width="222px" src="https://ebean.io/images/logo-premium-minds.png">
+        </a>
+      </td>
+    </tr>
+  </tbody>
+</table>
 
 # Need help?
 Post questions or issues to the Ebean google group - https://groups.google.com/forum/#!forum/ebean

From 3e3f3c35e759926267cdb4a027c22c31e301deea Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 8 Apr 2019 17:21:23 +0200
Subject: [PATCH 0796/1036] add test case to show delete with version

---
 .../java/org/tests/cascade/RelDetail.java     | 44 ++++++++++
 .../java/org/tests/cascade/RelMaster.java     | 48 +++++++++++
 .../tests/cascade/TestMasterDetailDelete.java | 83 +++++++++++++++++++
 3 files changed, 175 insertions(+)
 create mode 100644 src/test/java/org/tests/cascade/RelDetail.java
 create mode 100644 src/test/java/org/tests/cascade/RelMaster.java
 create mode 100644 src/test/java/org/tests/cascade/TestMasterDetailDelete.java

diff --git a/src/test/java/org/tests/cascade/RelDetail.java b/src/test/java/org/tests/cascade/RelDetail.java
new file mode 100644
index 000000000..170f194b0
--- /dev/null
+++ b/src/test/java/org/tests/cascade/RelDetail.java
@@ -0,0 +1,44 @@
+package org.tests.cascade;
+
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Version;
+
+@Entity
+public class RelDetail {
+
+  @Id
+  Long id;
+
+  String name;
+
+  @Version
+  int version;
+
+  @OneToMany(cascade = CascadeType.ALL, mappedBy = "detail")
+  private List<RelMaster> masterRel;
+
+  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 List<RelMaster> getMasterRel() {
+    return masterRel;
+  }
+}
diff --git a/src/test/java/org/tests/cascade/RelMaster.java b/src/test/java/org/tests/cascade/RelMaster.java
new file mode 100644
index 000000000..37409306a
--- /dev/null
+++ b/src/test/java/org/tests/cascade/RelMaster.java
@@ -0,0 +1,48 @@
+package org.tests.cascade;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Version;
+
+@Entity
+public class RelMaster {
+
+  @Id
+  Long id;
+
+  String name;
+
+  @Version
+  int version;
+
+  @ManyToOne(cascade = CascadeType.REMOVE)
+  private RelDetail detail;
+
+  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 RelDetail getDetail() {
+    return detail;
+  }
+
+  public void setDetail(RelDetail detail) {
+    this.detail = detail;
+  }
+
+
+}
diff --git a/src/test/java/org/tests/cascade/TestMasterDetailDelete.java b/src/test/java/org/tests/cascade/TestMasterDetailDelete.java
new file mode 100644
index 000000000..7ff1477cc
--- /dev/null
+++ b/src/test/java/org/tests/cascade/TestMasterDetailDelete.java
@@ -0,0 +1,83 @@
+package org.tests.cascade;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Transaction;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+
+import org.junit.Test;
+
+public class TestMasterDetailDelete extends BaseTestCase {
+
+  @Test
+  public void testDeleteOneMasterTxn() {
+    try (Transaction txn = server().beginTransaction()) {
+      RelDetail rd = new RelDetail();
+      rd.setName("test1");
+      server().save(rd);
+
+      RelMaster rm = new RelMaster();
+      rm.setDetail(rd);
+      server().save(rm);
+
+      List<RelDetail> lst = server().find(RelDetail.class).where().eq("name", "test1").findList();
+      assertThat(lst).hasSize(1);
+
+      server().find(RelMaster.class).delete();
+
+      lst = server().find(RelDetail.class).where().eq("name", "test1").findList();
+      assertThat(lst).isEmpty();
+    } // no commit
+  }
+
+
+  @Test
+  public void testDeleteMultiMasterTxn() {
+    try (Transaction txn = server().beginTransaction()) {
+      RelDetail rd = new RelDetail();
+      rd.setName("test2");
+      server().save(rd);
+
+      RelMaster rm1 = new RelMaster();
+      rm1.setDetail(rd);
+      server().save(rm1);
+
+      RelMaster rm2 = new RelMaster();
+      rm2.setDetail(rd);
+      server().save(rm2);
+
+      List<RelDetail> lst = server().find(RelDetail.class).where().eq("name", "test2").findList();
+      assertThat(lst).hasSize(1);
+
+      server().find(RelMaster.class).delete();
+
+      lst = server().find(RelDetail.class).where().eq("name", "test2").findList();
+      assertThat(lst).isEmpty();
+    } // no commit
+  }
+
+  @Test
+  public void testDeleteMultiMasterPlain() {
+    RelDetail rd = new RelDetail();
+    rd.setName("test3");
+    server().save(rd);
+
+    RelMaster rm1 = new RelMaster();
+    rm1.setDetail(rd);
+    server().save(rm1);
+
+    RelMaster rm2 = new RelMaster();
+    rm2.setDetail(rd);
+    server().save(rm2);
+
+    List<RelDetail> lst = server().find(RelDetail.class).where().eq("name", "test3").findList();
+    assertThat(lst).hasSize(1);
+
+    server().find(RelMaster.class).delete();
+
+    lst = server().find(RelDetail.class).where().eq("name", "test3").findList();
+    assertThat(lst).isEmpty();
+  }
+}

From 65a62bf683ad5203c0987e07eab5822bb96ce2d8 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Tue, 9 Apr 2019 09:38:57 +0200
Subject: [PATCH 0797/1036] Fix check constraint support for MariaDB >= 10.2.1
 (#1668)

* fixed the check constraint support for mysql/mariadb

* update migration scripts
---
 .../ddlgeneration/platform/BaseTableDdl.java  | 26 -------------
 .../ddlgeneration/platform/ClickHouseDdl.java |  5 +++
 .../platform/ClickHouseTableDdl.java          |  6 ---
 .../ddlgeneration/platform/MySqlDdl.java      | 39 +++++++++++++++++--
 .../ddlgeneration/platform/PlatformDdl.java   | 36 +++++++++++++++--
 .../migrationtest/db2/1.0__initial.sql        |  4 +-
 .../migrationtest/mysql/1.0__initial.sql      |  2 -
 .../dbmigration/migrationtest/mysql/1.1.sql   |  2 -
 .../dbmigration/migrationtest/mysql/1.3.sql   |  2 -
 9 files changed, 75 insertions(+), 47 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
index 1de59a353..f82021634 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
@@ -262,7 +262,6 @@ public class BaseTableDdl implements TableDdl {
     DdlBuffer apply = writer.apply();
     apply.append(platformDdl.getCreateTableCommandPrefix()).append(" ").append(tableName).append(" (");
     writeTableColumns(apply, columns, useIdentity);
-    writeCheckConstraints(apply, createTable);
     writeUniqueConstraints(apply, createTable);
     writeCompoundUniqueConstraints(apply, createTable);
     if (!pk.isEmpty()) {
@@ -506,31 +505,6 @@ public class BaseTableDdl implements TableDdl {
     buffer.appendStatement(platformDdl.dropSequence(sequenceName));
   }
 
-  /**
-   * Write all the check constraints.
-   */
-  protected void writeCheckConstraints(DdlBuffer apply, CreateTable createTable) throws IOException {
-
-    for (Column column : createTable.getColumn()) {
-      String checkConstraint = column.getCheckConstraint();
-      if (hasValue(checkConstraint)) {
-        writeCheckConstraint(apply, column, checkConstraint);
-      }
-    }
-  }
-
-  /**
-   * Write a check constraint.
-   */
-  protected void writeCheckConstraint(DdlBuffer buffer, Column column, String checkConstraint) throws IOException {
-
-    String ckName = column.getCheckConstraintName();
-
-    buffer.append(",").newLine();
-    buffer.append("  constraint ").append(ckName);
-    buffer.append(" ").append(checkConstraint);
-  }
-
   protected void writeCompoundUniqueConstraints(DdlBuffer apply, CreateTable createTable) throws IOException {
 
     boolean inlineUniqueWhenNull = platformDdl.isInlineUniqueWhenNullable();
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdl.java
index 0c680f3eb..bb96d613a 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdl.java
@@ -64,6 +64,11 @@ public class ClickHouseDdl extends PlatformDdl {
     return null;
   }
 
+  @Override
+  public String createCheckConstraint(String ckName, String checkConstraint) {
+    return null;
+  }
+
   @Override
   protected void writeColumnNotNull(DdlBuffer buffer) {
     // do nothing
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseTableDdl.java
index b959d1ff7..c8c432856 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseTableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseTableDdl.java
@@ -25,10 +25,4 @@ public class ClickHouseTableDdl extends BaseTableDdl {
     // do nothing
   }
 
-
-  @Override
-  protected void writeCheckConstraints(DdlBuffer apply, CreateTable createTable) {
-    // do nothing
-  }
-
 }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
index eb69d3be3..46ed420eb 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
@@ -14,6 +14,10 @@ import java.util.Collection;
  */
 public class MySqlDdl extends PlatformDdl {
 
+  // check constraint support is disabled by default. See https://groups.google.com/forum/#!topic/ebean/luFN-2xBkUw
+  // this flag is for compatibility. Use it with care.
+  private static final boolean USE_CHECK_CONSTRAINT = Boolean.getBoolean("ebean.mysql.useCheckConstraint");
+
   public MySqlDdl(DatabasePlatform platform) {
     super(platform);
     this.alterColumn = "modify";
@@ -48,11 +52,40 @@ public class MySqlDdl extends PlatformDdl {
     buffer.append("CALL usp_ebean_drop_column('").append(tableName).append("', '").append(columnName).append("')").endOfStatement();
   }
 
+  @Override
+  public String createCheckConstraint(String ckName, String checkConstraint) {
+    if (USE_CHECK_CONSTRAINT) {
+      return super.createCheckConstraint(ckName, checkConstraint);
+    } else {
+      return null;
+    }
+  }
+  @Override
+  public String alterTableAddCheckConstraint(String tableName, String checkConstraintName, String checkConstraint) {
+    if (USE_CHECK_CONSTRAINT) {
+      return super.alterTableAddCheckConstraint(tableName, checkConstraintName, checkConstraint);
+    } else {
+      return null;
+    }
+  }
+
   @Override
   public String alterTableDropConstraint(String tableName, String constraintName) {
-    // drop constraint not supported in MySQL 5.7 and 8.0 but starting with MariaDB 10.2.1 CHECK is evaluated
-    // TODO: Implement for MariaDB >= 10.2.1
-    return null;
+    // drop constraint not supported in MySQL 5.7 and 8.0 but starting with MariaDB
+    // 10.2.1 CHECK is evaluated
+    if (USE_CHECK_CONSTRAINT) {
+      StringBuilder sb = new StringBuilder();
+      // statement for MySQL >= 8.0.16
+      sb.append("/*!80016 alter table ").append(tableName);
+      sb.append(" drop check ").append(constraintName).append(" */;\n");
+      // statement for MariaDB >= 10.2.1
+      sb.append("/*M!100201 ");
+      sb.append(super.alterTableDropConstraint(tableName, constraintName));
+      sb.append(" */");
+      return sb.toString();
+    } else {
+      return null;
+    }
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
index d76c6bd44..2ca3d3ccc 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -213,10 +213,22 @@ public class PlatformDdl {
    */
   public void writeTableColumns(DdlBuffer apply, List<Column> columns, boolean useIdentity) throws IOException {
     for (int i = 0; i < columns.size(); i++) {
+      if (i > 0) {
+        apply.append(",");
+      }
       apply.newLine();
       writeColumnDefinition(apply, columns.get(i), useIdentity);
-      if (i < columns.size() - 1) {
-        apply.append(",");
+    }
+
+    for (Column column : columns) {
+      String checkConstraint = column.getCheckConstraint();
+      if (hasValue(checkConstraint)) {
+        checkConstraint = createCheckConstraint(maxConstraintName(column.getCheckConstraintName()),
+            checkConstraint);
+        if (hasValue(checkConstraint)) {
+          apply.append(",").newLine();
+          apply.append(checkConstraint);
+        }
       }
     }
   }
@@ -253,6 +265,13 @@ public class PlatformDdl {
     buffer.append(" not null");
   }
 
+  /**
+   * Returns the check constraint.
+   */
+  public String createCheckConstraint(String ckName, String checkConstraint) {
+    return "  constraint " + ckName + " " + checkConstraint;
+  }
+
   /**
    * Convert the DB column default literal to platform specific.
    */
@@ -494,7 +513,9 @@ public class PlatformDdl {
       if (!StringHelper.isNull(column.getCheckConstraint())) {
         String ddl = alterTableAddCheckConstraint(tableName, column.getCheckConstraintName(),
           column.getCheckConstraint());
-        buffer.append(ddl).endOfStatement();
+        if (hasValue(ddl)) {
+          buffer.append(ddl).endOfStatement();
+        }
       }
     } else {
       buffer.append(addColumnSuffix);
@@ -580,7 +601,7 @@ public class PlatformDdl {
   }
 
   protected void appendWithSpace(String content, StringBuilder buffer) {
-    if (content != null && !content.isEmpty()) {
+    if (hasValue(content)) {
       buffer.append(" ").append(content);
     }
   }
@@ -613,6 +634,13 @@ public class PlatformDdl {
     return updateNullWithDefault;
   }
 
+  /**
+   * Return true if null or trimmed string is empty.
+   */
+  protected boolean hasValue(String value) {
+    return value != null && !value.trim().isEmpty();
+  }
+
   /**
    * Null safe Boolean true test.
    */
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
index b1046c7bf..239b28462 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
@@ -70,7 +70,7 @@ create table migtest_e_basic (
   indextest5                    varchar(127),
   indextest6                    varchar(127),
   user_id                       integer not null,
-  constraint ck_migtest_e_basic_status check ( status in ('N','A','I')),
+  constraint ck_mgtst__bsc_stts check ( status in ('N','A','I')),
   constraint pk_migtest_e_basic primary key (id)
 );
 -- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__b_4aybzy unique  (indextest2);
@@ -79,7 +79,7 @@ create table migtest_e_basic (
 create table migtest_e_enum (
   id                            integer generated by default as identity not null,
   test_status                   varchar(1),
-  constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I')),
+  constraint ck_mgtst__n_773sok check ( test_status in ('N','A','I')),
   constraint pk_migtest_e_enum primary key (id)
 );
 
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
index ef52ebb7c..e5e98049b 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
@@ -70,7 +70,6 @@ create table migtest_e_basic (
   indextest5                    varchar(127),
   indextest6                    varchar(127),
   user_id                       integer not null,
-  constraint ck_migtest_e_basic_status check ( status in ('N','A','I')),
   constraint uq_migtest_e_basic_indextest2 unique (indextest2),
   constraint uq_migtest_e_basic_indextest6 unique (indextest6),
   constraint pk_migtest_e_basic primary key (id)
@@ -79,7 +78,6 @@ create table migtest_e_basic (
 create table migtest_e_enum (
   id                            integer auto_increment not null,
   test_status                   varchar(1),
-  constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I')),
   constraint pk_migtest_e_enum primary key (id)
 );
 
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
index 45ea3f4b6..ecc42a6ef 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
@@ -39,7 +39,6 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 update migtest_e_basic set status = 'A' where status is null;
 alter table migtest_e_basic alter status set default 'A';
 alter table migtest_e_basic modify status varchar(1) not null;
-alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
 
 -- rename all collisions;
 alter table migtest_e_basic add constraint uq_migtest_e_basic_description unique  (description);
@@ -53,7 +52,6 @@ update migtest_e_basic set new_boolean_field = old_boolean;
 
 alter table migtest_e_basic add column new_boolean_field2 tinyint(1) default 1 not null;
 alter table migtest_e_basic add column progress integer default 0 not null;
-alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2));
 alter table migtest_e_basic add column new_integer integer default 42 not null;
 
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest2;
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
index 7365a52ce..da05d955b 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
@@ -20,7 +20,6 @@ alter table migtest_fk_none_via_join drop foreign key fk_migtest_fk_none_via_joi
 alter table migtest_fk_set_null drop foreign key fk_migtest_fk_set_null_one_id;
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
 alter table migtest_e_basic alter status drop default;
-alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I'));
 alter table migtest_e_basic drop index uq_migtest_e_basic_description;
 
 update migtest_e_basic set user_id = 23 where user_id is null;
@@ -37,7 +36,6 @@ alter table migtest_e_basic drop index uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest5;
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique  (indextest2);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique  (indextest6);
-alter table migtest_e_enum add constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I'));
 alter table migtest_e_history comment = '';
 alter table migtest_e_history2 alter test_string drop default;
 alter table migtest_e_history2 add column obsolete_string1 varchar(255);

From 42591a5a870d8dc75e7c974bdabd59fa3b777830 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 9 Apr 2019 20:05:22 +1200
Subject: [PATCH 0798/1036] No effective change - reformat line

---
 .../dbmigration/ddlgeneration/platform/PlatformDdl.java     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
index 2ca3d3ccc..c1b71aae3 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -223,8 +223,7 @@ public class PlatformDdl {
     for (Column column : columns) {
       String checkConstraint = column.getCheckConstraint();
       if (hasValue(checkConstraint)) {
-        checkConstraint = createCheckConstraint(maxConstraintName(column.getCheckConstraintName()),
-            checkConstraint);
+        checkConstraint = createCheckConstraint(maxConstraintName(column.getCheckConstraintName()), checkConstraint);
         if (hasValue(checkConstraint)) {
           apply.append(",").newLine();
           apply.append(checkConstraint);
@@ -511,8 +510,7 @@ public class PlatformDdl {
 
       // check constraints cannot be added in one statement for h2
       if (!StringHelper.isNull(column.getCheckConstraint())) {
-        String ddl = alterTableAddCheckConstraint(tableName, column.getCheckConstraintName(),
-          column.getCheckConstraint());
+        String ddl = alterTableAddCheckConstraint(tableName, column.getCheckConstraintName(), column.getCheckConstraint());
         if (hasValue(ddl)) {
           buffer.append(ddl).endOfStatement();
         }

From 1c6fa575f2101feea76b3447838ecac8cacadc51 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 9 Apr 2019 20:30:17 +1200
Subject: [PATCH 0799/1036] #1669 - When deleting complex object graphs,
 entities are deleted multiple times

Fix by not unregistering the deleted bean hash in the transaction so that
the skip occurs on other root level bean traversals (the delete of the
2nd master bean)
---
 src/main/java/io/ebeaninternal/api/SpiTransaction.java |  5 -----
 .../java/io/ebeaninternal/api/SpiTransactionProxy.java |  5 -----
 .../ebeaninternal/server/core/PersistRequestBean.java  |  5 -----
 .../ebeaninternal/server/persist/DefaultPersister.java |  1 -
 .../transaction/ImplicitReadOnlyTransaction.java       |  5 -----
 .../server/transaction/JdbcTransaction.java            | 10 ----------
 .../server/transaction/NoTransaction.java              |  5 -----
 7 files changed, 36 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/api/SpiTransaction.java b/src/main/java/io/ebeaninternal/api/SpiTransaction.java
index fc89b85f3..0882d88ba 100644
--- a/src/main/java/io/ebeaninternal/api/SpiTransaction.java
+++ b/src/main/java/io/ebeaninternal/api/SpiTransaction.java
@@ -69,11 +69,6 @@ public interface SpiTransaction extends Transaction {
    */
   void registerDeleteBean(Integer hash);
 
-  /**
-   * Unregister the hash of the bean.
-   */
-  void unregisterDeleteBean(Integer hash);
-
   /**
    * Return true if this is a bean that has already been saved/deleted.
    */
diff --git a/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java b/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
index bac97a83a..be0246b30 100644
--- a/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
+++ b/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
@@ -183,11 +183,6 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
     transaction.registerDeleteBean(hash);
   }
 
-  @Override
-  public void unregisterDeleteBean(Integer hash) {
-    transaction.unregisterDeleteBean(hash);
-  }
-
   @Override
   public boolean isRegisteredDeleteBean(Integer hash) {
     return transaction.isRegisteredDeleteBean(hash);
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index 9671d08cf..78c05e45e 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -607,11 +607,6 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
     transaction.registerDeleteBean(hash);
   }
 
-  public void unregisterDeleteBean() {
-    Integer hash = getBeanHash();
-    transaction.unregisterDeleteBean(hash);
-  }
-
   public boolean isRegisteredForDeleteBean() {
     if (transaction == null) {
       return false;
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 9026e17d4..973bd04c0 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -882,7 +882,6 @@ public final class DefaultPersister implements Persister {
       // bean to handle bi-directional cascading
       request.registerDeleteBean();
       deleteAssocMany(request);
-      request.unregisterDeleteBean();
 
       unloadedForeignKeys = getDeleteUnloadedForeignKeys(request);
       if (unloadedForeignKeys != null) {
diff --git a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
index 907db2256..12c13870f 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
@@ -194,11 +194,6 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
     throw new IllegalStateException(notExpectedMessage);
   }
 
-  @Override
-  public void unregisterDeleteBean(Integer persistedBean) {
-    throw new IllegalStateException(notExpectedMessage);
-  }
-
   /**
    * Return true if this is a bean that has already been saved/deleted.
    */
diff --git a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index e38fb375b..eeb5bbf5b 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -436,16 +436,6 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
     deletingBeansHash.add(persistingBean);
   }
 
-  /**
-   * Unregister the persisted bean.
-   */
-  @Override
-  public void unregisterDeleteBean(Integer persistedBean) {
-    if (deletingBeansHash != null) {
-      deletingBeansHash.remove(persistedBean);
-    }
-  }
-
   /**
    * Return true if this is a bean that has already been saved/deleted.
    */
diff --git a/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
index a13076e87..e357e5a79 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
@@ -123,11 +123,6 @@ class NoTransaction implements SpiTransaction {
 
   }
 
-  @Override
-  public void unregisterDeleteBean(Integer hash) {
-
-  }
-
   @Override
   public boolean isRegisteredDeleteBean(Integer hash) {
     return false;

From 4af8e533151868f404c7e5ee8a29504276c106a1 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 9 Apr 2019 22:54:16 +1200
Subject: [PATCH 0800/1036] #1670 - Expose metrics as ServerMetrics interface
 (improvement over existing BasicMetricVisitor use)

---
 .../io/ebean/meta/BasicMetricVisitor.java     |  5 +-
 .../java/io/ebean/meta/MetaInfoManager.java   |  9 +++
 .../java/io/ebean/meta/ServerMetrics.java     | 24 +++++++
 .../server/core/DefaultMetaInfoManager.java   |  6 ++
 src/test/java/io/ebean/BaseTestCase.java      |  8 +--
 .../java/io/ebean/DtoQueryFromOrmTest.java    | 64 +++++++++----------
 src/test/java/io/ebean/DtoQueryTest.java      |  7 +-
 src/test/java/io/ebean/UpdateQueryTest.java   | 10 +--
 .../batchinsert/TestBatchInsertFlush.java     |  6 +-
 .../query/finder/TestCustomerFinder.java      |  8 +--
 10 files changed, 95 insertions(+), 52 deletions(-)
 create mode 100644 src/main/java/io/ebean/meta/ServerMetrics.java

diff --git a/src/main/java/io/ebean/meta/BasicMetricVisitor.java b/src/main/java/io/ebean/meta/BasicMetricVisitor.java
index bef165ed9..bc1658a02 100644
--- a/src/main/java/io/ebean/meta/BasicMetricVisitor.java
+++ b/src/main/java/io/ebean/meta/BasicMetricVisitor.java
@@ -6,7 +6,7 @@ import java.util.List;
 /**
  * A simple MetricVisitor that can collect the desired metrics into lists.
  */
-public class BasicMetricVisitor extends AbstractMetricVisitor {
+public class BasicMetricVisitor extends AbstractMetricVisitor implements ServerMetrics {
 
   private final List<MetaTimedMetric> timed = new ArrayList<>();
   private final List<MetaQueryMetric> dtoQuery = new ArrayList<>();
@@ -29,6 +29,7 @@ public class BasicMetricVisitor extends AbstractMetricVisitor {
   /**
    * Return timed metrics for Transactions, labelled SqlQuery, labelled SqlUpdate.
    */
+  @Override
   public List<MetaTimedMetric> getTimedMetrics() {
     return timed;
   }
@@ -36,6 +37,7 @@ public class BasicMetricVisitor extends AbstractMetricVisitor {
   /**
    * Return the DTO query metrics.
    */
+  @Override
   public List<MetaQueryMetric> getDtoQueryMetrics() {
     return dtoQuery;
   }
@@ -43,6 +45,7 @@ public class BasicMetricVisitor extends AbstractMetricVisitor {
   /**
    * Return the ORM query metrics.
    */
+  @Override
   public List<MetaOrmQueryMetric> getOrmQueryMetrics() {
     return ormQuery;
   }
diff --git a/src/main/java/io/ebean/meta/MetaInfoManager.java b/src/main/java/io/ebean/meta/MetaInfoManager.java
index a1638b6be..b2eaab614 100644
--- a/src/main/java/io/ebean/meta/MetaInfoManager.java
+++ b/src/main/java/io/ebean/meta/MetaInfoManager.java
@@ -7,6 +7,15 @@ import java.util.List;
  */
 public interface MetaInfoManager {
 
+  /**
+   * Return the metrics for the database instance.
+   * <p>
+   * This will reset the metrics (reset counters back to zero etc) and
+   * will only return the non-empty metrics.
+   * </p>
+   */
+  ServerMetrics collectMetrics();
+
   /**
    * Collect query plans.
    */
diff --git a/src/main/java/io/ebean/meta/ServerMetrics.java b/src/main/java/io/ebean/meta/ServerMetrics.java
new file mode 100644
index 000000000..8b556eb51
--- /dev/null
+++ b/src/main/java/io/ebean/meta/ServerMetrics.java
@@ -0,0 +1,24 @@
+package io.ebean.meta;
+
+import java.util.List;
+
+/**
+ * Metrics of the Database instance.
+ */
+public interface ServerMetrics {
+
+  /**
+   * Return timed metrics for Transactions, labelled SqlQuery, labelled SqlUpdate.
+   */
+  List<MetaTimedMetric> getTimedMetrics();
+
+  /**
+   * Return the DTO query metrics.
+   */
+  List<MetaQueryMetric> getDtoQueryMetrics();
+
+  /**
+   * Return the ORM query metrics.
+   */
+  List<MetaOrmQueryMetric> getOrmQueryMetrics();
+}
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java b/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java
index 377ccb081..2b3c13dc2 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java
@@ -10,6 +10,7 @@ import io.ebean.meta.MetaQueryPlan;
 import io.ebean.meta.MetaTimedMetric;
 import io.ebean.meta.MetricVisitor;
 import io.ebean.meta.QueryPlanRequest;
+import io.ebean.meta.ServerMetrics;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -35,6 +36,11 @@ public class DefaultMetaInfoManager implements MetaInfoManager {
     server.visitMetrics(visitor);
   }
 
+  @Override
+  public ServerMetrics collectMetrics() {
+    return visitBasic();
+  }
+
   @Override
   public BasicMetricVisitor visitBasic() {
     BasicMetricVisitor basic = new BasicMetricVisitor();
diff --git a/src/test/java/io/ebean/BaseTestCase.java b/src/test/java/io/ebean/BaseTestCase.java
index 96b661c11..7f0577c5b 100644
--- a/src/test/java/io/ebean/BaseTestCase.java
+++ b/src/test/java/io/ebean/BaseTestCase.java
@@ -2,9 +2,9 @@ package io.ebean;
 
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
-import io.ebean.meta.BasicMetricVisitor;
 import io.ebean.meta.MetaTimedMetric;
 import io.ebean.meta.MetricType;
+import io.ebean.meta.ServerMetrics;
 import io.ebean.util.StringHelper;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiQuery;
@@ -64,12 +64,12 @@ public abstract class BaseTestCase {
     server().getMetaInfoManager().resetAllMetrics();
   }
 
-  protected BasicMetricVisitor visitMetricsBasic() {
-     return server().getMetaInfoManager().visitBasic();
+  protected ServerMetrics collectMetrics() {
+     return server().getMetaInfoManager().collectMetrics();
   }
 
   protected List<MetaTimedMetric> visitTimedMetrics() {
-    return visitMetricsBasic().getTimedMetrics();
+    return collectMetrics().getTimedMetrics();
   }
 
   protected List<MetaTimedMetric> sqlMetrics() {
diff --git a/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
index d551a9807..793d69720 100644
--- a/src/test/java/io/ebean/DtoQueryFromOrmTest.java
+++ b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
@@ -2,9 +2,9 @@ package io.ebean;
 
 import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
-import io.ebean.meta.BasicMetricVisitor;
 import io.ebean.meta.MetaQueryMetric;
 import io.ebean.meta.MetaTimedMetric;
+import io.ebean.meta.ServerMetrics;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -25,13 +25,13 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
   @AfterClass
   public static void reportStats() {
-    BasicMetricVisitor basic = DB.getDefault().getMetaInfoManager().visitBasic();
-    for (MetaQueryMetric metric : basic.getDtoQueryMetrics()) {
+    ServerMetrics metrics = DB.getDefault().getMetaInfoManager().collectMetrics();
+    for (MetaQueryMetric metric : metrics.getDtoQueryMetrics()) {
       System.out.println(metric);
     }
 
     System.out.println("-- transaction metrics --");
-    for (MetaTimedMetric metric : basic.getTimedMetrics()) {
+    for (MetaTimedMetric metric : metrics.getTimedMetrics()) {
       System.out.println(metric);
     }
   }
@@ -44,19 +44,19 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     resetAllMetrics();
 
-    String[] prefix = { "Bl", "B", "Red", "jim" };
+    String[] prefix = {"Bl", "B", "Red", "jim"};
 
     for (String val : prefix) {
       DB.find(Contact.class)
-          .select("email, " + concat("lastName", ", ", "firstName") + " as fullName").where()
-          .istartsWith(concat("lastName", ", ", "firstName"), val).orderBy().asc("lastName").setMaxRows(10)
-          .asDto(ContactDto.class).setLabel("prefixLoop").findList();
+        .select("email, " + concat("lastName", ", ", "firstName") + " as fullName").where()
+        .istartsWith(concat("lastName", ", ", "firstName"), val).orderBy().asc("lastName").setMaxRows(10)
+        .asDto(ContactDto.class).setLabel("prefixLoop").findList();
 
     }
 
-    BasicMetricVisitor basic = visitMetricsBasic();
+    ServerMetrics metrics = collectMetrics();
 
-    List<MetaQueryMetric> stats = basic.getDtoQueryMetrics();
+    List<MetaQueryMetric> stats = metrics.getDtoQueryMetrics();
     for (MetaQueryMetric stat : stats) {
       long meanMicros = stat.getMean();
       assertThat(meanMicros).isLessThan(900_000);
@@ -74,10 +74,10 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     LoggedSqlCollector.start();
 
     DtoQuery<ContactDto> query = DB.find(Contact.class)
-        // we must explicitly add the id property for DTO query (if we want it)
-        .select("id, email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email")
-        .isNotNull("lastName").orderBy().asc("lastName").asDto(ContactDto.class).setLabel("explicitId")
-        .setRelaxedMode();
+      // we must explicitly add the id property for DTO query (if we want it)
+      .select("id, email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email")
+      .isNotNull("lastName").orderBy().asc("lastName").asDto(ContactDto.class).setLabel("explicitId")
+      .setRelaxedMode();
 
     List<ContactDto> dtos = query.findList();
 
@@ -90,7 +90,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql.get(0)).contains("select t0.id, t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
-        + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
+      + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
   }
 
   @Test
@@ -101,8 +101,8 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     LoggedSqlCollector.start();
 
     DtoQuery<ContactDto> query = DB.find(Contact.class)
-        .select("email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email")
-        .isNotNull("lastName").orderBy().asc("lastName").asDto(ContactDto.class);
+      .select("email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email")
+      .isNotNull("lastName").orderBy().asc("lastName").asDto(ContactDto.class);
 
     List<ContactDto> dtos = query.findList();
 
@@ -115,7 +115,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql.get(0)).contains("select t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
-        + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
+      + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
   }
 
   @Test
@@ -126,8 +126,8 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     LoggedSqlCollector.start();
 
     List<ContactDto> contactDtos = DB.find(Contact.class).setLabel("emailFullName")
-        .select("email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email")
-        .isNotNull("lastName").orderBy().asc("lastName").setMaxRows(10).asDto(ContactDto.class).findList();
+      .select("email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email")
+      .isNotNull("lastName").orderBy().asc("lastName").setMaxRows(10).asDto(ContactDto.class).findList();
 
     assertThat(contactDtos).isNotEmpty();
 
@@ -140,11 +140,11 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     if (isSqlServer()) {
       assertThat(sql.get(0)).contains("select top 10 t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
-          + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
+        + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
 
     } else {
       assertThat(sql.get(0)).contains("select t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
-          + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
+        + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
     }
   }
 
@@ -156,8 +156,8 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     LoggedSqlCollector.start();
 
     List<ContactDto> contactDtos = DB.find(Contact.class)
-        .select("id, email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email")
-        .isNotNull("lastName").orderBy().asc("lastName").setMaxRows(10).asDto(ContactDto.class).findList();
+      .select("id, email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email")
+      .isNotNull("lastName").orderBy().asc("lastName").setMaxRows(10).asDto(ContactDto.class).findList();
 
     assertThat(contactDtos).isNotEmpty();
 
@@ -170,11 +170,11 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
     if (isSqlServer()) {
       assertThat(sql.get(0)).contains("select top 10 t0.id, t0.email, "
-          + concat("t0.last_name", ", ", "t0.first_name")
-          + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
+        + concat("t0.last_name", ", ", "t0.first_name")
+        + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
     } else {
       assertThat(sql.get(0)).contains("select t0.id, t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
-          + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
+        + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
     }
   }
 
@@ -186,8 +186,8 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     LoggedSqlCollector.start();
 
     List<ContactDto> contactDtos = DB.find(Contact.class)
-        .select(concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("lastName").orderBy()
-        .asc("lastName").asDto(ContactDto.class).setFirstRow(2).setMaxRows(5).findList();
+      .select(concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("lastName").orderBy()
+      .asc("lastName").asDto(ContactDto.class).setFirstRow(2).setMaxRows(5).findList();
 
     assertThat(contactDtos).isNotEmpty();
 
@@ -209,8 +209,8 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     LoggedSqlCollector.start();
 
     List<ContactTotals> contactDtos = DB.find(Contact.class).select("lastName, count(*) as totalCount").where()
-        .isNotNull("lastName").having().gt("count(*)", 1).orderBy().desc("count(*)").asDto(ContactTotals.class)
-        .findList();
+      .isNotNull("lastName").having().gt("count(*)", 1).orderBy().desc("count(*)").asDto(ContactTotals.class)
+      .findList();
 
     assertThat(contactDtos).isNotEmpty();
 
@@ -229,7 +229,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     ResetBasicData.reset();
 
     List<ContactTotals> contactDtos = DB.find(Contact.class).select("lastName, count(*) as totalCount").where()
-        .isNotNull("lastName").asDto(ContactTotals.class).findList();
+      .isNotNull("lastName").asDto(ContactTotals.class).findList();
 
     assertThat(contactDtos).isNotEmpty();
   }
diff --git a/src/test/java/io/ebean/DtoQueryTest.java b/src/test/java/io/ebean/DtoQueryTest.java
index a1f20ba16..fd3c20711 100644
--- a/src/test/java/io/ebean/DtoQueryTest.java
+++ b/src/test/java/io/ebean/DtoQueryTest.java
@@ -4,6 +4,7 @@ import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.meta.BasicMetricVisitor;
 import io.ebean.meta.MetaQueryMetric;
+import io.ebean.meta.ServerMetrics;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -33,9 +34,9 @@ public class DtoQueryTest extends BaseTestCase {
     log.info(list.toString());
     assertThat(list).isNotEmpty();
 
-    BasicMetricVisitor basic = visitMetricsBasic();
+    ServerMetrics metrics = collectMetrics();
 
-    List<MetaQueryMetric> stats = basic.getDtoQueryMetrics();
+    List<MetaQueryMetric> stats = metrics.getDtoQueryMetrics();
     for (MetaQueryMetric stat : stats) {
       long meanMicros = stat.getMean();
       assertThat(meanMicros).isLessThan(900_000);
@@ -208,7 +209,7 @@ public class DtoQueryTest extends BaseTestCase {
       .setParameter("name", "rob")
       .findList();
 
-    BasicMetricVisitor metric2 = server().getMetaInfoManager().visitBasic();
+    ServerMetrics metric2 = server().getMetaInfoManager().collectMetrics();
 
     stats = metric2.getDtoQueryMetrics();
     assertThat(stats).hasSize(2);
diff --git a/src/test/java/io/ebean/UpdateQueryTest.java b/src/test/java/io/ebean/UpdateQueryTest.java
index 0a078d26b..cfbdb02f6 100644
--- a/src/test/java/io/ebean/UpdateQueryTest.java
+++ b/src/test/java/io/ebean/UpdateQueryTest.java
@@ -2,8 +2,8 @@ package io.ebean;
 
 import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.Platform;
-import io.ebean.meta.BasicMetricVisitor;
 import io.ebean.meta.MetaOrmQueryMetric;
+import io.ebean.meta.ServerMetrics;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.model.basic.Country;
@@ -38,8 +38,8 @@ public class UpdateQueryTest extends BaseTestCase {
 
     assertThat(query.getGeneratedSql()).contains("update o_customer set status=?, updtime=? where status = ? and id > ?");
 
-    BasicMetricVisitor basic = visitMetricsBasic();
-    List<MetaOrmQueryMetric> ormQueryMetrics = basic.getOrmQueryMetrics();
+    ServerMetrics metrics = collectMetrics();
+    List<MetaOrmQueryMetric> ormQueryMetrics = metrics.getOrmQueryMetrics();
     assertThat(ormQueryMetrics).hasSize(1);
     assertThat(ormQueryMetrics.get(0).getType()).isEqualTo(Customer.class);
     assertThat(ormQueryMetrics.get(0).getLabel()).isEqualTo("updateActive");
@@ -68,8 +68,8 @@ public class UpdateQueryTest extends BaseTestCase {
 
     assertThat(sql.get(0)).contains("update o_customer set status = status");
 
-    BasicMetricVisitor basic = visitMetricsBasic();
-    List<MetaOrmQueryMetric> ormQueryMetrics = basic.getOrmQueryMetrics();
+    ServerMetrics metrics = collectMetrics();
+    List<MetaOrmQueryMetric> ormQueryMetrics = metrics.getOrmQueryMetrics();
     assertThat(ormQueryMetrics).hasSize(1);
     assertThat(ormQueryMetrics.get(0).getType()).isEqualTo(Customer.class);
     assertThat(ormQueryMetrics.get(0).getLabel()).isEqualTo("updateAll");
diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
index 64d0364d1..86ee256bd 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
@@ -8,8 +8,8 @@ import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
 import io.ebean.annotation.Transactional;
-import io.ebean.meta.BasicMetricVisitor;
 import io.ebean.meta.MetaTimedMetric;
+import io.ebean.meta.ServerMetrics;
 import io.ebeaninternal.api.SpiTransaction;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
@@ -77,8 +77,8 @@ public class TestBatchInsertFlush extends BaseTestCase {
       transaction.end();
     }
 
-    BasicMetricVisitor basic = visitMetricsBasic();
-    List<MetaTimedMetric> txnStats = basic.getTimedMetrics();
+    ServerMetrics metrics = collectMetrics();
+    List<MetaTimedMetric> txnStats = metrics.getTimedMetrics();
     for (MetaTimedMetric txnMetric : txnStats) {
       System.out.println(txnMetric);
     }
diff --git a/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/src/test/java/org/tests/query/finder/TestCustomerFinder.java
index 26c2f1b4c..b06bd8e69 100644
--- a/src/test/java/org/tests/query/finder/TestCustomerFinder.java
+++ b/src/test/java/org/tests/query/finder/TestCustomerFinder.java
@@ -3,11 +3,11 @@ package org.tests.query.finder;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Transaction;
-import io.ebean.meta.BasicMetricVisitor;
 import io.ebean.meta.MetaOrmQueryMetric;
 import io.ebean.meta.MetaQueryPlan;
 import io.ebean.meta.MetaTimedMetric;
 import io.ebean.meta.QueryPlanRequest;
+import io.ebean.meta.ServerMetrics;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
@@ -153,16 +153,16 @@ public class TestCustomerFinder extends BaseTestCase {
     Customer.find.updateNames("Junk", 2000);
     Customer.find.byId(3);
 
-    BasicMetricVisitor basic = server().getMetaInfoManager().visitBasic();
+    ServerMetrics metrics = server().getMetaInfoManager().collectMetrics();
 
-    List<MetaOrmQueryMetric> planStats = basic.getOrmQueryMetrics();
+    List<MetaOrmQueryMetric> planStats = metrics.getOrmQueryMetrics();
     assertThat(planStats.size()).isGreaterThan(4);
 
     for (MetaOrmQueryMetric planStat : planStats) {
       System.out.println(planStat);
     }
 
-    for (MetaTimedMetric txnTimed : basic.getTimedMetrics()) {
+    for (MetaTimedMetric txnTimed : metrics.getTimedMetrics()) {
       System.out.println(txnTimed);
     }
 

From 7b7a4922414f06db216806d468ee18ffadc4b01c Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 9 Apr 2019 23:04:34 +1200
Subject: [PATCH 0801/1036] Bump to 11.37.1

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index eda1d55f3..d56453717 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.36.5-SNAPSHOT</version>
+  <version>11.37.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -250,7 +250,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-agent</artifactId>
-      <version>11.27.1</version>
+      <version>11.37.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -330,7 +330,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>11.35.1</version>
+        <version>11.37.1</version>
         <executions>
           <execution>
             <id>test</id>

From 4f4743807cb66a2676295819a62de6f10f9f598e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 10 Apr 2019 01:25:43 +1200
Subject: [PATCH 0802/1036] #1671 - Use table alias with delete query for
 Postgres, Oracle, MySql

---
 .../config/dbplatform/DatabasePlatform.java   | 17 +++++--
 .../config/dbplatform/h2/H2Platform.java      |  1 +
 .../dbplatform/oracle/OraclePlatform.java     |  1 +
 .../dbplatform/postgres/PostgresPlatform.java |  1 +
 .../server/query/CQueryBuilder.java           | 46 +++++++++++--------
 src/test/java/io/ebean/BaseTestCase.java      |  4 ++
 .../IsEmptyExpressionQueryTest.java           | 29 +++++++++++-
 .../org/tests/delete/TestDeleteByQuery.java   | 23 ++++++++--
 8 files changed, 94 insertions(+), 28 deletions(-)

diff --git a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
index 035673c10..16ab2592a 100644
--- a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
@@ -49,6 +49,8 @@ public class DatabasePlatform {
    */
   protected boolean useExtraTransactionOnIterateSecondaryQueries;
 
+  protected boolean supportsDeleteTableAlias;
+
   /**
    * The behaviour used when ending a read only transaction at read committed isolation level.
    */
@@ -176,10 +178,10 @@ public class DatabasePlatform {
    * findIterate() and findVisit().
    */
   protected boolean forwardOnlyHintOnFindIterate;
-  
+
   /**
    * If set then use the CONCUR_UPDATABLE hint when creating ResultSets.
-   * 
+   *
    * This is {@code false} for HANA
    */
   protected boolean supportsResultSetConcurrencyModeUpdatable = true;
@@ -306,6 +308,13 @@ public class DatabasePlatform {
     return supportsNativeIlike;
   }
 
+  /**
+   * Return true if the platform supports delete statements with table alias.
+   */
+  public boolean isSupportsDeleteTableAlias() {
+    return supportsDeleteTableAlias;
+  }
+
   /**
    * Return the maximum table name length.
    * <p>
@@ -524,7 +533,7 @@ public class DatabasePlatform {
   public void setForwardOnlyHintOnFindIterate(boolean forwardOnlyHintOnFindIterate) {
     this.forwardOnlyHintOnFindIterate = forwardOnlyHintOnFindIterate;
   }
-  
+
   /**
    * Return true if the ResultSet CONCUR_UPDATABLE Hint should be used on
    * createNativeSqlTree() PreparedStatements.
@@ -535,7 +544,7 @@ public class DatabasePlatform {
   public boolean isSupportsResultSetConcurrencyModeUpdatable() {
     return supportsResultSetConcurrencyModeUpdatable;
   }
-  
+
   /**
    * Set to true if the ResultSet CONCUR_UPDATABLE Hint should be used by default on createNativeSqlTree() PreparedStatements.
    */
diff --git a/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java b/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java
index 1b093d880..d3418904d 100644
--- a/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java
+++ b/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java
@@ -23,6 +23,7 @@ public class H2Platform extends DatabasePlatform {
     this.dbEncrypt = new H2DbEncrypt();
     this.historySupport = new H2HistorySupport();
     this.nativeUuidType = true;
+    this.supportsDeleteTableAlias = true;
     this.dbDefaultValue.setNow("now()");
     this.columnAliasPrefix = null;
 
diff --git a/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java b/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java
index 3eae9a8c6..cedd2a481 100644
--- a/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java
@@ -23,6 +23,7 @@ public class OraclePlatform extends DatabasePlatform {
   public OraclePlatform() {
     super();
     this.platform = Platform.ORACLE;
+    this.supportsDeleteTableAlias = true;
     this.maxTableNameLength = 30;
     this.maxConstraintNameLength = 30;
     this.dbEncrypt = new OracleDbEncrypt();
diff --git a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
index c8266fbec..938f5b3b3 100644
--- a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
@@ -30,6 +30,7 @@ public class PostgresPlatform extends DatabasePlatform {
     super();
     this.platform = Platform.POSTGRES;
     this.supportsNativeIlike = true;
+    this.supportsDeleteTableAlias = true;
     this.selectCountWithAlias = true;
     this.blobDbType = Types.LONGVARBINARY;
     this.clobDbType = Types.VARCHAR;
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 037f53ed1..6c1151815 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -135,14 +135,22 @@ class CQueryBuilder {
 
   private <T> String buildDeleteSql(OrmQueryRequest<T> request, String rootTableAlias, CQueryPredicates predicates, SqlTree sqlTree) {
 
+    String alias = alias(rootTableAlias);
     if (!sqlTree.isIncludeJoins()) {
-      // simple - delete from table ...
-      return aliasStrip(buildSql("delete", request, predicates, sqlTree).getSql());
+      if (dbPlatform.isSupportsDeleteTableAlias()) {
+        // delete from table <alias> ...
+        return aliasReplace(buildSql("delete", request, predicates, sqlTree).getSql(), alias);
+      } else if (dbPlatform.getPlatform() == Platform.MYSQL) {
+        return aliasReplace(buildSql("delete " + alias, request, predicates, sqlTree).getSql(), alias);
+      } else {
+        // simple - delete from table ...
+        return aliasStrip(buildSql("delete", request, predicates, sqlTree).getSql());
+      }
     }
     // wrap as - delete from table where id in (select id ...)
     String sql = buildSql(null, request, predicates, sqlTree).getSql();
     sql = request.getBeanDescriptor().getDeleteByIdInSql() + "in (" + sql + ")";
-    sql = aliasReplace(sql, alias(rootTableAlias));
+    sql = aliasReplace(sql, alias);
     return sql;
   }
 
@@ -425,7 +433,7 @@ class CQueryBuilder {
     try {
       // For SqlServer we need either "selectMethod=cursor" in the connection string or fetch explicitly a cursorable
       // statement here by specifying ResultSet.CONCUR_UPDATABLE
-      PreparedStatement statement = connection.prepareStatement(sql,ResultSet.TYPE_FORWARD_ONLY, dbPlatform.isSupportsResultSetConcurrencyModeUpdatable() ? ResultSet.CONCUR_UPDATABLE : ResultSet.CONCUR_READ_ONLY);
+      PreparedStatement statement = connection.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, dbPlatform.isSupportsResultSetConcurrencyModeUpdatable() ? ResultSet.CONCUR_UPDATABLE : ResultSet.CONCUR_READ_ONLY);
       predicates.bind(statement, connection);
 
       ResultSet resultSet = statement.executeQuery();
@@ -702,21 +710,21 @@ class CQueryBuilder {
   }
 
   private String toSql(CountDistinctOrder orderBy) {
-    switch(orderBy) {
-    case ATTR_ASC:
-      return " order by r1.attribute_";
-    case ATTR_DESC:
-      return " order by r1.attribute_ desc";
-    case COUNT_ASC_ATTR_ASC:
-      return " order by count(*), r1.attribute_";
-    case COUNT_ASC_ATTR_DESC:
-      return " order by count(*), r1.attribute_ desc";
-    case COUNT_DESC_ATTR_ASC:
-      return " order by count(*) desc, r1.attribute_";
-    case COUNT_DESC_ATTR_DESC:
-      return " order by count(*) desc, r1.attribute_ desc";
-    default:
-      throw new IllegalArgumentException("Illegal enum: "+ orderBy);
+    switch (orderBy) {
+      case ATTR_ASC:
+        return " order by r1.attribute_";
+      case ATTR_DESC:
+        return " order by r1.attribute_ desc";
+      case COUNT_ASC_ATTR_ASC:
+        return " order by count(*), r1.attribute_";
+      case COUNT_ASC_ATTR_DESC:
+        return " order by count(*), r1.attribute_ desc";
+      case COUNT_DESC_ATTR_ASC:
+        return " order by count(*) desc, r1.attribute_";
+      case COUNT_DESC_ATTR_DESC:
+        return " order by count(*) desc, r1.attribute_ desc";
+      default:
+        throw new IllegalArgumentException("Illegal enum: " + orderBy);
     }
   }
 
diff --git a/src/test/java/io/ebean/BaseTestCase.java b/src/test/java/io/ebean/BaseTestCase.java
index 7f0577c5b..17dc0efc1 100644
--- a/src/test/java/io/ebean/BaseTestCase.java
+++ b/src/test/java/io/ebean/BaseTestCase.java
@@ -170,6 +170,10 @@ public abstract class BaseTestCase {
     return isH2() || isPostgres();
   }
 
+  public boolean isPlatformSupportsDeleteTableAlias() {
+    return spiEbeanServer().getDatabasePlatform().isSupportsDeleteTableAlias();
+  }
+
   public boolean isPersistBatchOnCascade() {
     return spiEbeanServer().getDatabasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE;
   }
diff --git a/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java b/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java
index feb486d84..4d60b5442 100644
--- a/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java
+++ b/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java
@@ -3,10 +3,14 @@ package io.ebeaninternal.server.expression;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Test;
+import org.tests.model.nofk.EUserNoFk;
+
+import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -26,6 +30,29 @@ public class IsEmptyExpressionQueryTest extends BaseTestCase {
     assertThat(sqlOf(query)).contains("select t0.id from o_customer t0 where not exists (select 1 from contact x where x.customer_id = t0.id");
   }
 
+  @Test
+  public void deleteQuery_isEmpty() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    Ebean.find(EUserNoFk.class)
+      .where().isEmpty("files")
+      .delete();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(1);
+
+    if (isPlatformSupportsDeleteTableAlias()) {
+      assertThat(sql.get(0)).contains("delete from euser_no_fk t0 where not exists (select 1 from efile_no_fk x where x.owner_user_id = t0.user_id)");
+    } else if (isMySql()) {
+      assertThat(sql.get(0)).contains("delete t0 from euser_no_fk t0 where not exists (select 1 from efile_no_fk x where x.owner_user_id = t0.user_id)");
+    } else {
+      assertThat(sql.get(0)).contains("delete from euser_no_fk where not exists (select 1 from efile_no_fk x where x.owner_user_id = user_id)");
+    }
+  }
+
   @Test
   public void isNotEmpty() {
 
diff --git a/src/test/java/org/tests/delete/TestDeleteByQuery.java b/src/test/java/org/tests/delete/TestDeleteByQuery.java
index 60c9043a1..a28561b19 100644
--- a/src/test/java/org/tests/delete/TestDeleteByQuery.java
+++ b/src/test/java/org/tests/delete/TestDeleteByQuery.java
@@ -50,7 +50,13 @@ public class TestDeleteByQuery extends BaseTestCase {
 
     loggedSql = LoggedSqlCollector.stop();
     assertThat(loggedSql).hasSize(1);
-    assertThat(loggedSql.get(0)).contains("delete from bbookmark_user where name =");
+    if (isPlatformSupportsDeleteTableAlias()) {
+      assertThat(loggedSql.get(0)).contains("delete from bbookmark_user t0 where t0.name =");
+    } else if (isMySql()){
+      assertThat(loggedSql.get(0)).contains("delete t0 from bbookmark_user t0 where t0.name =");
+    } else {
+      assertThat(loggedSql.get(0)).contains("delete from bbookmark_user where name =");
+    }
 
 
     server.find(BBookmarkUser.class).select("id").where().eq("name", "NotARealFirstName").delete();
@@ -102,8 +108,13 @@ public class TestDeleteByQuery extends BaseTestCase {
     Ebean.find(BBookmarkUser.class).setId(7000).delete();
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(sql.get(0)).contains("delete from bbookmark_user where id = ?");
-    assertThat(sql.get(1)).contains("delete from bbookmark_user where id = ?");
+    if (isPlatformSupportsDeleteTableAlias()) {
+      assertThat(sql.get(0)).contains("delete from bbookmark_user t0 where t0.id = ?");
+      assertThat(sql.get(1)).contains("delete from bbookmark_user t0 where t0.id = ?");
+    } else if (!isMySql()) {
+      assertThat(sql.get(0)).contains("delete from bbookmark_user where id = ?");
+      assertThat(sql.get(1)).contains("delete from bbookmark_user where id = ?");
+    }
 
     // and note this is the easiest option
     Ebean.delete(BBookmarkUser.class, 7000);
@@ -140,7 +151,11 @@ public class TestDeleteByQuery extends BaseTestCase {
     }
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertThat(sql.get(0)).contains("delete from contact where id = ?");
+    if (isPlatformSupportsDeleteTableAlias()) {
+      assertThat(sql.get(0)).contains("delete from contact t0 where t0.id = ?");
+    } else if (!isMySql()){
+      assertThat(sql.get(0)).contains("delete from contact where id = ?");
+    }
   }
 
   @Test

From 30ae435f3301e5849fe344fe3f8e35de049162f2 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 12 Apr 2019 00:45:00 +1200
Subject: [PATCH 0803/1036] #1672 - ENH: Add ebean.dumpMetricsOnShutdown=true
 ... for dumping metrics

---
 .../java/io/ebean/config/ServerConfig.java    |  36 ++++
 src/main/java/io/ebean/meta/SortMetric.java   |  80 ++++++++
 .../java/io/ebeaninternal/api/SpiQuery.java   |  38 ++--
 .../server/core/DefaultServer.java            |   6 +-
 .../server/core/DumpMetrics.java              | 172 ++++++++++++++++++
 .../server/core/OrmQueryRequest.java          |  14 --
 .../server/core/SpiOrmQueryRequest.java       |  10 -
 .../server/deploy/BeanDescriptor.java         |  19 --
 .../server/profile/DQueryPlanMeta.java        |  10 +
 .../server/profile/DQueryPlanMetric.java      |   2 +-
 .../server/query/CQueryPlan.java              |  18 ++
 .../server/query/CQueryPlanStats.java         |   2 +-
 .../server/query/QueryPlanLogger.java         |   2 +-
 .../server/profile/SortMetricTest.java        |  67 +++++++
 src/test/resources/ebean.properties           |   3 +
 15 files changed, 415 insertions(+), 64 deletions(-)
 create mode 100644 src/main/java/io/ebean/meta/SortMetric.java
 create mode 100644 src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
 create mode 100644 src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 899044d9f..9efda763d 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -524,6 +524,10 @@ public class ServerConfig {
    */
   private boolean idGeneratorAutomatic = true;
 
+  private boolean dumpMetricsOnShutdown;
+
+  private String dumpMetricsOptions;
+
   /**
    * Construct a Database Configuration for programmatically creating an Database.
    */
@@ -2903,6 +2907,8 @@ public class ServerConfig {
     }
     loadDocStoreSettings(p);
 
+    dumpMetricsOnShutdown = p.getBoolean("dumpMetricsOnShutdown", dumpMetricsOnShutdown);
+    dumpMetricsOptions = p.get("dumpMetricsOptions", dumpMetricsOptions);
     queryPlanTTLSeconds = p.getInt("queryPlanTTLSeconds", queryPlanTTLSeconds);
     slowQueryMillis = p.getLong("slowQueryMillis", slowQueryMillis);
     collectQueryPlans = p.getBoolean("collectQueryPlans", collectQueryPlans);
@@ -3287,6 +3293,36 @@ public class ServerConfig {
     this.collectQueryPlans = collectQueryPlans;
   }
 
+  /**
+   * Return true if metrics should be dumped when the server is shutdown.
+   */
+  public boolean isDumpMetricsOnShutdown() {
+    return dumpMetricsOnShutdown;
+  }
+
+  /**
+   * Set to true if metrics should be dumped when the server is shutdown.
+   */
+  public void setDumpMetricsOnShutdown(boolean dumpMetricsOnShutdown) {
+    this.dumpMetricsOnShutdown = dumpMetricsOnShutdown;
+  }
+
+  /**
+   * Return the options for dumping metrics.
+   */
+  public String getDumpMetricsOptions() {
+    return dumpMetricsOptions;
+  }
+
+  /**
+   * Include 'sql' or 'hash' in options such that they are included in the output.
+   *
+   * @param dumpMetricsOptions Example "sql,hash", "sql"
+   */
+  public void setDumpMetricsOptions(String dumpMetricsOptions) {
+    this.dumpMetricsOptions = dumpMetricsOptions;
+  }
+
   public enum UuidVersion {
     VERSION4,
     VERSION1,
diff --git a/src/main/java/io/ebean/meta/SortMetric.java b/src/main/java/io/ebean/meta/SortMetric.java
new file mode 100644
index 000000000..32d4161d1
--- /dev/null
+++ b/src/main/java/io/ebean/meta/SortMetric.java
@@ -0,0 +1,80 @@
+package io.ebean.meta;
+
+import java.util.Comparator;
+
+/**
+ * Comparator for timed metrics sorted by name and then count.
+ */
+public class SortMetric {
+
+  public static final Comparator<MetaTimedMetric> NAME = new Name();
+  public static final Comparator<MetaTimedMetric> COUNT = new Count();
+  public static final Comparator<MetaTimedMetric> TOTAL = new Total();
+  public static final Comparator<MetaTimedMetric> MEAN = new Mean();
+  public static final Comparator<MetaTimedMetric> MAX = new Max();
+
+  /**
+   * Sort by name.
+   */
+  public static class Name implements Comparator<MetaTimedMetric> {
+
+    @Override
+    public int compare(MetaTimedMetric o1, MetaTimedMetric o2) {
+      String name = o1.getName();
+      String name2 = o2.getName();
+      if (name == null) {
+        return name2 == null ? 0 : -1;
+      }
+      if (name2 == null) {
+        return 1;
+      }
+
+      int i = name.compareTo(name2);
+      return i != 0 ? i : Long.compare(o1.getCount(), o2.getCount());
+    }
+  }
+
+  /**
+   * Sort by count desc.
+   */
+  public static class Count implements Comparator<MetaTimedMetric> {
+
+    @Override
+    public int compare(MetaTimedMetric o1, MetaTimedMetric o2) {
+      return Long.compare(o2.getCount(), o1.getCount());
+    }
+  }
+
+  /**
+   * Sort by total time desc.
+   */
+  public static class Total implements Comparator<MetaTimedMetric> {
+
+    @Override
+    public int compare(MetaTimedMetric o1, MetaTimedMetric o2) {
+      return Long.compare(o2.getTotal(), o1.getTotal());
+    }
+  }
+
+  /**
+   * Sort by mean desc.
+   */
+  public static class Mean implements Comparator<MetaTimedMetric> {
+
+    @Override
+    public int compare(MetaTimedMetric o1, MetaTimedMetric o2) {
+      return Long.compare(o2.getMean(), o1.getMean());
+    }
+  }
+
+  /**
+   * Sort by max desc.
+   */
+  public static class Max implements Comparator<MetaTimedMetric> {
+
+    @Override
+    public int compare(MetaTimedMetric o1, MetaTimedMetric o2) {
+      return Long.compare(o2.getMax(), o1.getMax());
+    }
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/api/SpiQuery.java b/src/main/java/io/ebeaninternal/api/SpiQuery.java
index 483749988..05f4c0e79 100644
--- a/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -54,67 +54,69 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
     /**
      * Find by Id or unique returning a single bean.
      */
-    BEAN(FIND_ONE),
+    BEAN(FIND_ONE, "byId"),
 
     /**
      * Find returning a List.
      */
-    LIST(FIND_MANY),
+    LIST(FIND_MANY, "findList"),
 
     /**
      * Find returning a Set.
      */
-    SET(FIND_MANY),
+    SET(FIND_MANY, "findSet"),
 
     /**
      * Find returning a Map.
      */
-    MAP(FIND_MANY),
+    MAP(FIND_MANY, "findMap"),
 
     /**
      * Find iterate type query - findEach(), findIterate() etc.
      */
-    ITERATE(FIND_ITERATE),
+    ITERATE(FIND_ITERATE, "findEach"),
 
     /**
      * Find the Id's.
      */
-    ID_LIST(FIND_ID_LIST),
+    ID_LIST(FIND_ID_LIST, "findIds"),
 
     /**
      * Find single attribute.
      */
-    ATTRIBUTE(FIND_ATTRIBUTE),
+    ATTRIBUTE(FIND_ATTRIBUTE, "findAttribute"),
 
     /**
      * Find rowCount.
      */
-    COUNT(FIND_COUNT),
+    COUNT(FIND_COUNT, "findCount"),
 
     /**
      * A subquery used as part of a where clause.
      */
-    SUBQUERY(FIND_SUBQUERY),
+    SUBQUERY(FIND_SUBQUERY, "subquery"),
 
     /**
      * Delete query.
      */
-    DELETE(FIND_DELETE, true),
+    DELETE(FIND_DELETE, "delete", true),
 
     /**
      * Update query.
      */
-    UPDATE(FIND_UPDATE, true);
+    UPDATE(FIND_UPDATE, "update", true);
 
-    boolean update;
-    String profileEventId;
+    private boolean update;
+    private String profileEventId;
+    private String label;
 
-    Type(String profileEventId) {
-      this(profileEventId, false);
+    Type(String profileEventId, String label) {
+      this(profileEventId, label, false);
     }
 
-    Type(String profileEventId, boolean update) {
+    Type(String profileEventId, String label, boolean update) {
       this.profileEventId = profileEventId;
+      this.label = label;
       this.update = update;
     }
 
@@ -128,6 +130,10 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
     public String profileEventId() {
       return profileEventId;
     }
+
+    public String label() {
+      return label;
+    }
   }
 
   enum TemporalMode {
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index db6e1bf0a..4606d7fde 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -505,6 +505,10 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   private void shutdownPlugins() {
 
+    if (serverConfig.isDumpMetricsOnShutdown()) {
+      new DumpMetrics(this, serverConfig.getDumpMetricsOptions()).dump();
+    }
+
     for (Plugin plugin : serverPlugins) {
       try {
         plugin.shutdown();
@@ -1234,7 +1238,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
 
     SpiOrmQueryRequest<T> request = createQueryRequest(spiQuery, t);
-    request.profileLocationById();
     if (request.isUseDocStore()) {
       return docStore().find(request);
     }
@@ -1588,7 +1591,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   private <T> List<T> findList(Query<T> query, Transaction t, boolean findOne) {
 
     SpiOrmQueryRequest<T> request = createQueryRequest(Type.LIST, query, t);
-    request.profileLocationAll();
     request.resetBeanCacheAutoMode(findOne);
     Object result = request.getFromQueryCache();
     if (result != null) {
diff --git a/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java b/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
new file mode 100644
index 000000000..f60f7657c
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
@@ -0,0 +1,172 @@
+package io.ebeaninternal.server.core;
+
+import io.ebean.ProfileLocation;
+import io.ebean.meta.MetaOrmQueryMetric;
+import io.ebean.meta.MetaQueryMetric;
+import io.ebean.meta.MetaTimedMetric;
+import io.ebean.meta.ServerMetrics;
+import io.ebean.meta.SortMetric;
+import io.ebeaninternal.api.SpiEbeanServer;
+
+import java.util.Comparator;
+import java.util.List;
+
+class DumpMetrics {
+
+  private final SpiEbeanServer server;
+  private final String options;
+
+  private final String nameFormat;
+  private final String nameFormatTimed;
+
+  private boolean dumpHash;
+  private boolean dumpSql;
+  private boolean dumpLoc;
+
+  private Comparator<MetaTimedMetric> sortBy = SortMetric.NAME;
+
+  DumpMetrics(SpiEbeanServer server, String options) {
+    this.server = server;
+    this.options = options;
+
+    int width = 0;
+
+    if (options != null) {
+      dumpLoc = options.contains("loc");
+      dumpSql = options.contains("sql");
+      dumpHash = options.contains("hash");
+      for (int i = 5; i < 10; i++) {
+        width = Math.max(width, optionWidth(i * 10));
+      }
+      for (String option : new String[]{"Total", "Count", "Mean", "Max"}) {
+        sortOption(option);
+      }
+    }
+    if (width == 0) {
+      width = 80;
+    }
+
+    nameFormat = "%1$-" + width + "s";
+    nameFormatTimed = "%1$-" + (width + 6) + "s";
+  }
+
+  private int optionWidth(int check) {
+    return options.contains("w" + check) ? check : 0;
+  }
+
+  private void sortOption(String option) {
+    if (options.contains("sort" + option)) {
+      sortBy = setSortOption(option);
+    }
+  }
+
+  private Comparator<MetaTimedMetric> setSortOption(String option) {
+    switch (option.toUpperCase()) {
+      case "TOTAL":
+        return SortMetric.TOTAL;
+      case "COUNT":
+        return SortMetric.COUNT;
+      case "MEAN":
+        return SortMetric.MEAN;
+      case "MAX":
+        return SortMetric.MAX;
+    }
+    return SortMetric.NAME;
+  }
+
+  void dump() {
+
+    out("-- Dumping metrics for " + server.getName() + " -- ");
+    ServerMetrics serverMetrics = server.getMetaInfoManager().collectMetrics();
+
+    for (MetaTimedMetric metric : serverMetrics.getTimedMetrics()) {
+      log(metric);
+    }
+
+    List<MetaOrmQueryMetric> ormQueryMetrics = serverMetrics.getOrmQueryMetrics();
+    if (!ormQueryMetrics.isEmpty()) {
+      out("\n-- ORM queries --");
+      ormQueryMetrics.sort(sortBy);
+      for (MetaOrmQueryMetric metric : ormQueryMetrics) {
+        logQuery(metric);
+      }
+    }
+
+    List<MetaQueryMetric> dtoQueryMetrics = serverMetrics.getDtoQueryMetrics();
+    if (!dtoQueryMetrics.isEmpty()) {
+      out("\n-- DTO queries --");
+      dtoQueryMetrics.sort(sortBy);
+      for (MetaQueryMetric metric : dtoQueryMetrics) {
+        logDtoQuery(metric);
+      }
+    }
+  }
+
+  private void out(String sb) {
+    System.out.println(sb);
+  }
+
+  private void logQuery(MetaOrmQueryMetric metric) {
+
+    StringBuilder sb = new StringBuilder();
+
+    sb.append("query:").append(padName(metric.getName())).append(" ");
+    addCounters(metric, sb);
+
+    if (dumpHash) {
+      sb.append("\n hash:").append(metric.getQueryPlanHash());
+    }
+
+    ProfileLocation profileLocation = metric.getProfileLocation();
+    if (dumpLoc && profileLocation != null) {
+      sb.append("\n  loc:").append(profileLocation.shortDescription());
+    }
+
+    if (dumpSql) {
+      sb.append("\n\n  sql:").append(metric.getSql()).append("\n\n");
+    }
+
+    out(sb.toString());
+  }
+
+
+  private void logDtoQuery(MetaQueryMetric metric) {
+
+    StringBuilder sb = new StringBuilder();
+
+    sb.append("query:").append(padName(metric.getName())).append(" ");
+    addCounters(metric, sb);
+
+    if (dumpSql) {
+      sb.append(" \n\n  sql:").append(metric.getSql()).append("\n\n");
+    }
+    out(sb.toString());
+  }
+
+  private void log(MetaTimedMetric metric) {
+
+    StringBuilder sb = new StringBuilder();
+    sb.append(padNameTimed(metric.getName())).append(" ");
+    addCounters(metric, sb);
+    out(sb.toString());
+  }
+
+  private void addCounters(MetaTimedMetric timedMetric, StringBuilder sb) {
+    sb.append(" count:").append(pad(timedMetric.getCount()))
+      .append(" total:").append(pad(timedMetric.getTotal()))
+      .append(" mean:").append(pad(timedMetric.getMean()))
+      .append(" max:").append(pad(timedMetric.getMax()));
+  }
+
+  private String padName(String name) {
+    return String.format(nameFormat, name);
+  }
+
+  private String padNameTimed(String name) {
+    return String.format(nameFormatTimed, name);
+  }
+
+  private String pad(long value) {
+    return String.format("%1$-8s", value);
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index 0f09bac26..af0f73443 100644
--- a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -102,20 +102,6 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
     return queryEngine.translate(this, bindLog, sql, e);
   }
 
-  @Override
-  public void profileLocationById() {
-    if (query.getProfileLocation() == null) {
-      query.setProfileLocation(beanDescriptor.profileLocationById());
-    }
-  }
-
-  @Override
-  public void profileLocationAll() {
-    if (query.getProfileLocation() == null && query.isFindAll()) {
-      query.setProfileLocation(beanDescriptor.profileLocationAll());
-    }
-  }
-
   @Override
   public boolean isDeleteByStatement() {
     if (!transaction.isPersistCascade() || beanDescriptor.isDeleteByStatement()) {
diff --git a/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
index c78661398..d4195701b 100644
--- a/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
@@ -162,16 +162,6 @@ public interface SpiOrmQueryRequest<T> extends BeanQueryRequest<T>, DocQueryRequ
    */
   boolean isUseDocStore();
 
-  /**
-   * Set profile location for "find by id" if not set.
-   */
-  void profileLocationById();
-
-  /**
-   * Set profile location for "find all" if not set.
-   */
-  void profileLocationAll();
-
   /**
    * Return true if delete by statement is allowed for this type given cascade rules etc.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 7d3cba9c1..ed600488a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -1,7 +1,6 @@
 package io.ebeaninternal.server.deploy;
 
 import io.ebean.PersistenceContextScope;
-import io.ebean.ProfileLocation;
 import io.ebean.Query;
 import io.ebean.SqlUpdate;
 import io.ebean.Transaction;
@@ -136,8 +135,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   private final Map<String, String> namedQuery;
 
   private final short profileBeanId;
-  private final ProfileLocation locationById;
-  private final ProfileLocation locationAll;
 
   private final boolean multiValueSupported;
 
@@ -448,8 +445,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     this.name = InternString.intern(deploy.getName());
     this.baseTableAlias = "t0";
     this.fullName = InternString.intern(deploy.getFullName());
-    this.locationById = ProfileLocation.createAt(fullName + ".byId");
-    this.locationAll = ProfileLocation.createAt(fullName + ".all");
     this.profileBeanId = deploy.getProfileId();
     this.beanType = deploy.getBeanType();
     this.rootBeanType = PersistenceContextUtil.root(beanType);
@@ -582,20 +577,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     }
   }
 
-  /**
-   * Return a location for "find by id".
-   */
-  public ProfileLocation profileLocationById() {
-    return locationById;
-  }
-
-  /**
-   * Return a location for "find all".
-   */
-  public ProfileLocation profileLocationAll() {
-    return locationAll;
-  }
-
   /**
    * Return the id used in profiling to identify the bean type.
    */
diff --git a/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java
index 02c6859c4..f6d1f46fd 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java
@@ -4,18 +4,28 @@ class DQueryPlanMeta {
 
   private final Class<?> type;
   private final String label;
+  private final String name;
   private final String sql;
 
   DQueryPlanMeta(Class<?> type, String label, String sql) {
     this.type = type;
     this.label = label;
     this.sql = sql;
+    String name = type.getSimpleName();
+    if (label != null) {
+      name += "_" + label;
+    }
+    this.name = name;
   }
 
   public Class<?> getType() {
     return type;
   }
 
+  public String getName() {
+    return name;
+  }
+
   public String getLabel() {
     return label;
   }
diff --git a/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
index 4f4240233..2490a1b5c 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
@@ -67,7 +67,7 @@ class DQueryPlanMetric implements QueryPlanMetric {
 
     @Override
     public String getName() {
-      return stats.getName();
+      return meta.getName();
     }
 
     @Override
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
index 5680b3135..e1812802b 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
@@ -65,6 +65,8 @@ public class CQueryPlan {
 
   private final String label;
 
+  private final String name;
+
   private final CQueryPlanKey planKey;
 
   private final boolean rawSql;
@@ -112,6 +114,7 @@ public class CQueryPlan {
     SpiQuery<?> query = request.getQuery();
     this.profileLocation = query.getProfileLocation();
     this.label = query.getPlanLabel();
+    this.name = deriveName(label, query.getType());
     this.location = location();
     this.autoTuned = query.isAutoTuned();
     this.asOfTableCount = query.getAsOfTableCount();
@@ -138,6 +141,7 @@ public class CQueryPlan {
     SpiQuery<?> query = request.getQuery();
     this.profileLocation = query.getProfileLocation();
     this.label = query.getPlanLabel();
+    this.name = deriveName(label, query.getType());
     this.location = location();
     this.planKey = buildPlanKey(sql, rawSql, rowNumberIncluded, logWhereSql);
     this.autoTuned = false;
@@ -154,6 +158,16 @@ public class CQueryPlan {
     this.bindCapture = initBindCapture(server.getServerConfig(), query);
   }
 
+  private String deriveName(String label, SpiQuery.Type type) {
+    if (label == null) {
+      return beanType.getSimpleName() + "." + type.label();
+    }
+    if (label.startsWith(beanType.getSimpleName())) {
+      return label;
+    }
+    return beanType.getSimpleName() + "_" + label;
+  }
+
   private CQueryBindCapture initBindCapture(ServerConfig serverConfig, SpiQuery<?> query) {
     if (serverConfig.isCollectQueryPlans() && !query.getType().isUpdate()) {
       return new CQueryBindCapture(this, PlatformQueryPlan.getLogger(serverConfig.getDatabasePlatform().getPlatform()));
@@ -192,6 +206,10 @@ public class CQueryPlan {
     return label;
   }
 
+  public String getName() {
+    return name;
+  }
+
   public String getLocation() {
     return location;
   }
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
index 8498b3280..25455ae37 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
@@ -184,7 +184,7 @@ public final class CQueryPlanStats {
 
     @Override
     public String getName() {
-      return queryPlan.getLabel();
+      return queryPlan.getName();
     }
 
     @Override
diff --git a/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java b/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java
index 8f51e0e67..f3bbb267c 100644
--- a/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java
+++ b/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java
@@ -26,7 +26,7 @@ public abstract class QueryPlanLogger {
   }
 
   protected DQueryPlanOutput createPlan(CQueryPlan plan, String bind, String planString) {
-    return new DQueryPlanOutput(plan.getBeanType(), plan.getLabel(), plan.getSql(), bind, planString);
+    return new DQueryPlanOutput(plan.getBeanType(), plan.getName(), plan.getSql(), bind, planString);
   }
 
   DQueryPlanOutput readQueryPlanBasic(CQueryPlan plan, BindCapture bind, ResultSet rset) throws SQLException {
diff --git a/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java b/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java
new file mode 100644
index 000000000..683964a2c
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java
@@ -0,0 +1,67 @@
+package io.ebeaninternal.server.profile;
+
+import io.ebean.meta.MetaTimedMetric;
+import io.ebean.meta.MetricType;
+import io.ebean.meta.SortMetric;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.junit.Assert.assertEquals;
+
+public class SortMetricTest {
+
+  private Comparator<MetaTimedMetric> sortMetric = SortMetric.NAME;
+
+  @Test
+  public void compare_list() {
+
+    List<DTimeMetricStats> list = new ArrayList<>();
+    list.add(create("d"));
+    list.add(create("b"));
+    list.add(create("c"));
+    list.add(create(null));
+    list.add(create("a"));
+    list.sort(sortMetric);
+
+    String names = list.stream().map(DTimeMetricStats::getName).collect(Collectors.joining());
+
+    assertEquals("nullabcd", names);
+  }
+
+  @Test
+  public void compare_when_same() {
+
+    assertEquals(0, sortMetric.compare(create("foo"), create("foo")));
+    assertEquals(0, sortMetric.compare(create(null), create(null)));
+  }
+
+  @Test
+  public void compare_when_less() {
+
+    assertEquals(-1, sortMetric.compare(create("a"), create("b")));
+    assertEquals(-1, sortMetric.compare(create("foo"), create("goo")));
+  }
+
+  @Test
+  public void compare_when_more() {
+
+    assertEquals(1, sortMetric.compare(create("b"), create("a")));
+    assertEquals(1, sortMetric.compare(create("goo"), create("foo")));
+  }
+
+  @Test
+  public void compare_when_nulls() {
+
+    assertEquals(0, sortMetric.compare(create(null), create(null)));
+    assertEquals(1, sortMetric.compare(create("foo"), create(null)));
+    assertEquals(-1, sortMetric.compare(create(null), create("foo")));
+  }
+
+  private DTimeMetricStats create(String name) {
+    return new DTimeMetricStats(MetricType.L2, name, 0, 0, 0, 0, 0);
+  }
+}
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 65af4407e..9e00efeff 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -23,6 +23,9 @@ ebean.ddl.header=-- Generated by ebean ${version} at ${timestamp}
 ebean.packages=org.tests
 datasource.default=h2
 
+ebean.dumpMetricsOnShutdown=true
+ebean.dumpMetricsOptions=sql,hash
+
 ebean.collectQueryPlans=true
 
 ebean.autoReadOnlyDataSource=true

From 46c66b71691893efde6b29f98287488dc00991db Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 12 Apr 2019 00:55:39 +1200
Subject: [PATCH 0804/1036] #1672 - ENH: Add ebean.dumpMetricsOnShutdown=true
 ... for dumping metrics

---
 src/test/java/io/ebean/DtoQueryTest.java      | 2 +-
 src/test/java/io/ebean/NamedDtoQueryTest.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/io/ebean/DtoQueryTest.java b/src/test/java/io/ebean/DtoQueryTest.java
index fd3c20711..657393f75 100644
--- a/src/test/java/io/ebean/DtoQueryTest.java
+++ b/src/test/java/io/ebean/DtoQueryTest.java
@@ -201,7 +201,7 @@ public class DtoQueryTest extends BaseTestCase {
     MetaQueryMetric queryMetric = stats.get(0);
     assertThat(queryMetric.getLabel()).isEqualTo("basic");
     assertThat(queryMetric.getCount()).isEqualTo(3);
-    assertThat(queryMetric.getName()).isEqualTo("basic");
+    assertThat(queryMetric.getName()).isEqualTo("DCust_basic");
 
 
     server().findDto(DCust.class, "select c4.id, c4.name from o_customer c4 where lower(c4.name) = :name")
diff --git a/src/test/java/io/ebean/NamedDtoQueryTest.java b/src/test/java/io/ebean/NamedDtoQueryTest.java
index 510aa709f..b6362a74e 100644
--- a/src/test/java/io/ebean/NamedDtoQueryTest.java
+++ b/src/test/java/io/ebean/NamedDtoQueryTest.java
@@ -127,7 +127,7 @@ public class NamedDtoQueryTest extends BaseTestCase {
     MetaQueryMetric queryMetric = stats.get(0);
     assertThat(queryMetric.getLabel()).isEqualTo("basic");
     assertThat(queryMetric.getCount()).isEqualTo(3);
-    assertThat(queryMetric.getName()).isEqualTo("basic");
+    assertThat(queryMetric.getName()).isEqualTo("DCust_basic");
 
 
     server().createNamedDtoQuery(DCust.class, "findByName_c4")

From 2639e799c578d7b27328e55ff75995724e4f3350 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 12 Apr 2019 02:01:01 +1200
Subject: [PATCH 0805/1036] #1673 - ENH: Support ProfileLocation on DtoQuery
 including via orm query.asDto()

---
 src/main/java/io/ebean/DtoQuery.java          |  6 ++++
 .../io/ebean/meta/MetaOrmQueryMetric.java     |  7 ----
 .../java/io/ebean/meta/MetaQueryMetric.java   |  7 ++++
 .../java/io/ebean/metric/MetricFactory.java   |  3 +-
 .../io/ebeaninternal/api/SpiDtoQuery.java     | 17 ++++++++-
 .../server/core/DtoQueryRequest.java          |  1 +
 .../server/core/DumpMetrics.java              | 36 ++++++++++---------
 .../server/dto/DtoMappingRequest.java         |  8 +++--
 .../server/profile/DMetricFactory.java        |  5 +--
 .../server/profile/DProfileLocation.java      |  8 +++--
 .../server/profile/DQueryPlanMeta.java        | 10 +++++-
 .../server/profile/DQueryPlanMetric.java      |  6 ++++
 .../server/querydefn/DefaultDtoQuery.java     | 33 +++++++++++++++++
 .../java/io/ebean/DtoQueryFromOrmTest.java    |  5 ++-
 14 files changed, 117 insertions(+), 35 deletions(-)

diff --git a/src/main/java/io/ebean/DtoQuery.java b/src/main/java/io/ebean/DtoQuery.java
index 1603e1d10..61f7f3d86 100644
--- a/src/main/java/io/ebean/DtoQuery.java
+++ b/src/main/java/io/ebean/DtoQuery.java
@@ -109,6 +109,12 @@ public interface DtoQuery<T> {
    */
   DtoQuery<T> setLabel(String label);
 
+  /**
+   * Set the profile location of this query. This is used to relate query execution metrics
+   * back to a location like a specific line of code.
+   */
+  DtoQuery<T> setProfileLocation(ProfileLocation profileLocation);
+
   /**
    * Set a timeout on this query.
    * <p>
diff --git a/src/main/java/io/ebean/meta/MetaOrmQueryMetric.java b/src/main/java/io/ebean/meta/MetaOrmQueryMetric.java
index 7a74409f2..23525261d 100644
--- a/src/main/java/io/ebean/meta/MetaOrmQueryMetric.java
+++ b/src/main/java/io/ebean/meta/MetaOrmQueryMetric.java
@@ -1,7 +1,5 @@
 package io.ebean.meta;
 
-import io.ebean.ProfileLocation;
-
 import java.util.List;
 
 /**
@@ -9,11 +7,6 @@ import java.util.List;
  */
 public interface MetaOrmQueryMetric extends MetaQueryMetric {
 
-  /**
-   * Return the profile location.
-   */
-  ProfileLocation getProfileLocation();
-
   /**
    * Return true if this query plan was tuned by AutoTune.
    */
diff --git a/src/main/java/io/ebean/meta/MetaQueryMetric.java b/src/main/java/io/ebean/meta/MetaQueryMetric.java
index c59142dc6..6816128db 100644
--- a/src/main/java/io/ebean/meta/MetaQueryMetric.java
+++ b/src/main/java/io/ebean/meta/MetaQueryMetric.java
@@ -1,5 +1,7 @@
 package io.ebean.meta;
 
+import io.ebean.ProfileLocation;
+
 /**
  * Query execution metrics.
  */
@@ -15,6 +17,11 @@ public interface MetaQueryMetric extends MetaTimedMetric {
    */
   String getLabel();
 
+  /**
+   * Return the profile location.
+   */
+  ProfileLocation getProfileLocation();
+
   /**
    * The actual SQL of the query.
    */
diff --git a/src/main/java/io/ebean/metric/MetricFactory.java b/src/main/java/io/ebean/metric/MetricFactory.java
index f068089d4..241ca461c 100644
--- a/src/main/java/io/ebean/metric/MetricFactory.java
+++ b/src/main/java/io/ebean/metric/MetricFactory.java
@@ -1,5 +1,6 @@
 package io.ebean.metric;
 
+import io.ebean.ProfileLocation;
 import io.ebean.meta.MetricType;
 
 /**
@@ -27,6 +28,6 @@ public interface MetricFactory {
   /**
    * Create a Timed metric.
    */
-  QueryPlanMetric createQueryPlanMetric(MetricType metricType, Class<?> type, String label, String sql);
+  QueryPlanMetric createQueryPlanMetric(MetricType metricType, Class<?> type, String label, ProfileLocation profileLocation, String sql);
 
 }
diff --git a/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java b/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java
index 3ba088c58..dba0169a2 100644
--- a/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java
+++ b/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.api;
 
 import io.ebean.DtoQuery;
+import io.ebean.ProfileLocation;
 import io.ebeaninternal.server.dto.DtoMappingRequest;
 import io.ebeaninternal.server.dto.DtoQueryPlan;
 
@@ -37,9 +38,23 @@ public interface SpiDtoQuery<T> extends DtoQuery<T>, SpiSqlBinding {
   /**
    * Return the label for the query.
    */
-  @Override
   String getLabel();
 
+  /**
+   * Return the label with fallback to profile location label.
+   */
+  String getPlanLabel();
+
+  /**
+   * Obtain the location if necessary.
+   */
+  void obtainLocation();
+
+  /**
+   * Return the profile location.
+   */
+  ProfileLocation getProfileLocation();
+
   /**
    * Return the associated DTO bean type.
    */
diff --git a/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
index d5ea92e5c..6fd5218df 100644
--- a/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
@@ -37,6 +37,7 @@ public final class DtoQueryRequest<T> extends AbstractSqlQueryRequest {
     super(server, query, null);
     this.queryEngine = engine;
     this.query = query;
+    query.obtainLocation();
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java b/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
index f60f7657c..6857275f9 100644
--- a/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
+++ b/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
@@ -110,22 +110,12 @@ class DumpMetrics {
 
     StringBuilder sb = new StringBuilder();
 
-    sb.append("query:").append(padName(metric.getName())).append(" ");
-    addCounters(metric, sb);
-
+    appendQueryName(metric, sb);
+    appendCounters(metric, sb);
     if (dumpHash) {
       sb.append("\n hash:").append(metric.getQueryPlanHash());
     }
-
-    ProfileLocation profileLocation = metric.getProfileLocation();
-    if (dumpLoc && profileLocation != null) {
-      sb.append("\n  loc:").append(profileLocation.shortDescription());
-    }
-
-    if (dumpSql) {
-      sb.append("\n\n  sql:").append(metric.getSql()).append("\n\n");
-    }
-
+    appendProfileAndSql(metric, sb);
     out(sb.toString());
   }
 
@@ -134,24 +124,36 @@ class DumpMetrics {
 
     StringBuilder sb = new StringBuilder();
 
+    appendQueryName(metric, sb);
+    appendCounters(metric, sb);
+    appendProfileAndSql(metric, sb);
+    out(sb.toString());
+  }
+
+  private void appendQueryName(MetaQueryMetric metric, StringBuilder sb) {
     sb.append("query:").append(padName(metric.getName())).append(" ");
-    addCounters(metric, sb);
+  }
+
+  private void appendProfileAndSql(MetaQueryMetric metric, StringBuilder sb) {
+    ProfileLocation profileLocation = metric.getProfileLocation();
+    if (dumpLoc && profileLocation != null) {
+      sb.append("\n  loc:").append(profileLocation.shortDescription());
+    }
 
     if (dumpSql) {
       sb.append(" \n\n  sql:").append(metric.getSql()).append("\n\n");
     }
-    out(sb.toString());
   }
 
   private void log(MetaTimedMetric metric) {
 
     StringBuilder sb = new StringBuilder();
     sb.append(padNameTimed(metric.getName())).append(" ");
-    addCounters(metric, sb);
+    appendCounters(metric, sb);
     out(sb.toString());
   }
 
-  private void addCounters(MetaTimedMetric timedMetric, StringBuilder sb) {
+  private void appendCounters(MetaTimedMetric timedMetric, StringBuilder sb) {
     sb.append(" count:").append(pad(timedMetric.getCount()))
       .append(" total:").append(pad(timedMetric.getTotal()))
       .append(" mean:").append(pad(timedMetric.getMean()))
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java b/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java
index de21fd1a9..588d7450c 100644
--- a/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.dto;
 
+import io.ebean.ProfileLocation;
 import io.ebean.meta.MetricType;
 import io.ebean.metric.MetricFactory;
 import io.ebean.metric.QueryPlanMetric;
@@ -14,6 +15,8 @@ public class DtoMappingRequest {
 
   private final String label;
 
+  private final ProfileLocation profileLocation;
+
   private final String sql;
 
   private final boolean relaxedMode;
@@ -22,7 +25,8 @@ public class DtoMappingRequest {
 
   public DtoMappingRequest(SpiDtoQuery query, String sql, DtoColumn[] columnMeta) {
     this.type = query.getType();
-    this.label = query.getLabel();
+    this.label = query.getPlanLabel();
+    this.profileLocation = query.getProfileLocation();
     this.sql = sql;
     this.relaxedMode = query.isRelaxedMode();
     this.columnMeta = columnMeta;
@@ -45,6 +49,6 @@ public class DtoMappingRequest {
   }
 
   public QueryPlanMetric createMetric() {
-    return MetricFactory.get().createQueryPlanMetric(MetricType.DTO, type, label, sql);
+    return MetricFactory.get().createQueryPlanMetric(MetricType.DTO, type, label, profileLocation, sql);
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java b/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java
index 404dc65c6..b333efd63 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.profile;
 
+import io.ebean.ProfileLocation;
 import io.ebean.meta.MetricType;
 import io.ebean.metric.MetricFactory;
 import io.ebean.metric.QueryPlanMetric;
@@ -22,8 +23,8 @@ public class DMetricFactory implements MetricFactory {
   }
 
   @Override
-  public QueryPlanMetric createQueryPlanMetric(MetricType metricType, Class<?> type, String label, String sql) {
-    return new DQueryPlanMetric(new DQueryPlanMeta(type, label, sql), new DTimedMetric(metricType, label));
+  public QueryPlanMetric createQueryPlanMetric(MetricType metricType, Class<?> type, String label, ProfileLocation profileLocation, String sql) {
+    return new DQueryPlanMetric(new DQueryPlanMeta(type, label, profileLocation, sql), new DTimedMetric(metricType, label));
   }
 
 }
diff --git a/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java b/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java
index 03cf36070..c8156f581 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java
@@ -42,11 +42,12 @@ class DProfileLocation implements ProfileLocation {
 
   @Override
   public String obtain() {
-    // atomic assignment so happy with this
+    // atomic assignments so happy enough with this (racing but atomic)
     if (location == null) {
       final String loc = create();
-      shortDescription = shortDesc(loc);
-      label = UtilLocation.label(shortDescription);
+      final String shortDesc = shortDesc(loc);
+      label = UtilLocation.label(shortDesc);
+      shortDescription = shortDesc;
       location = loc;
     }
     return location;
@@ -63,6 +64,7 @@ class DProfileLocation implements ProfileLocation {
   }
 
   private String create() {
+    // relatively expensive but we only do it once per profile location
     StackTraceElement[] trace = Thread.currentThread().getStackTrace();
     for (int i = 3; i < trace.length; i++) {
       if (!trace[i].getClassName().startsWith(IO_EBEAN)) {
diff --git a/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java
index f6d1f46fd..bceed88c4 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java
@@ -1,15 +1,19 @@
 package io.ebeaninternal.server.profile;
 
+import io.ebean.ProfileLocation;
+
 class DQueryPlanMeta {
 
   private final Class<?> type;
   private final String label;
+  private final ProfileLocation profileLocation;
   private final String name;
   private final String sql;
 
-  DQueryPlanMeta(Class<?> type, String label, String sql) {
+  DQueryPlanMeta(Class<?> type, String label, ProfileLocation profileLocation, String sql) {
     this.type = type;
     this.label = label;
+    this.profileLocation = profileLocation;
     this.sql = sql;
     String name = type.getSimpleName();
     if (label != null) {
@@ -30,6 +34,10 @@ class DQueryPlanMeta {
     return label;
   }
 
+  public ProfileLocation getProfileLocation() {
+    return profileLocation;
+  }
+
   public String getSql() {
     return sql;
   }
diff --git a/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
index 2490a1b5c..695fdcef2 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.profile;
 
+import io.ebean.ProfileLocation;
 import io.ebean.meta.MetaQueryMetric;
 import io.ebean.meta.MetricType;
 import io.ebean.meta.MetricVisitor;
@@ -60,6 +61,11 @@ class DQueryPlanMetric implements QueryPlanMetric {
       return meta.getLabel();
     }
 
+    @Override
+    public ProfileLocation getProfileLocation() {
+      return meta.getProfileLocation();
+    }
+
     @Override
     public String getSql() {
       return meta.getSql();
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
index 1f97fdb12..6433f83fb 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.querydefn;
 
 import io.ebean.DtoQuery;
+import io.ebean.ProfileLocation;
 import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.SpiDtoQuery;
 import io.ebeaninternal.api.SpiEbeanServer;
@@ -39,6 +40,8 @@ public class DefaultDtoQuery<T> implements SpiDtoQuery<T> {
 
   private String label;
 
+  private ProfileLocation profileLocation;
+
   /**
    * Bind parameters when using the query language.
    */
@@ -52,6 +55,7 @@ public class DefaultDtoQuery<T> implements SpiDtoQuery<T> {
     this.descriptor = descriptor;
     this.ormQuery = ormQuery;
     this.label = ormQuery.getLabel();
+    this.profileLocation = ormQuery.getProfileLocation();
   }
 
   /**
@@ -166,6 +170,35 @@ public class DefaultDtoQuery<T> implements SpiDtoQuery<T> {
     return label;
   }
 
+  @Override
+  public String getPlanLabel() {
+    if (label != null) {
+      return label;
+    }
+    if (profileLocation != null) {
+      return profileLocation.label();
+    }
+    return null;
+  }
+
+  @Override
+  public void obtainLocation() {
+    if (profileLocation != null) {
+      profileLocation.obtain();
+    }
+  }
+
+  @Override
+  public DtoQuery<T> setProfileLocation(ProfileLocation profileLocation) {
+    this.profileLocation = profileLocation;
+    return this;
+  }
+
+  @Override
+  public ProfileLocation getProfileLocation() {
+    return profileLocation;
+  }
+
   @Override
   public int getFirstRow() {
     return firstRow;
diff --git a/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
index 793d69720..95e3830db 100644
--- a/src/test/java/io/ebean/DtoQueryFromOrmTest.java
+++ b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
@@ -36,6 +36,8 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     }
   }
 
+  private static final ProfileLocation loc0 = ProfileLocation.create();
+
   @ForPlatform(Platform.H2)
   @Test
   public void testPlanHits() {
@@ -48,10 +50,10 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     for (String val : prefix) {
       DB.find(Contact.class)
+        .setProfileLocation(loc0)
         .select("email, " + concat("lastName", ", ", "firstName") + " as fullName").where()
         .istartsWith(concat("lastName", ", ", "firstName"), val).orderBy().asc("lastName").setMaxRows(10)
         .asDto(ContactDto.class).setLabel("prefixLoop").findList();
-
     }
 
     ServerMetrics metrics = collectMetrics();
@@ -60,6 +62,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     for (MetaQueryMetric stat : stats) {
       long meanMicros = stat.getMean();
       assertThat(meanMicros).isLessThan(900_000);
+      assertThat(stat.getProfileLocation()).isSameAs(loc0);
     }
 
     assertThat(stats).hasSize(1);

From d32559baf46129a0627e7081796c98d1fab3953b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 12 Apr 2019 02:25:05 +1200
Subject: [PATCH 0806/1036] #1674 - For ProfileLocation use in constructors
 trim label <init> to init .... (for safe label)

---
 .../server/profile/UtilLocation.java          | 13 ++++++++++-
 .../server/profile/UtilLocationTest.java      | 15 ++++++++++++
 .../tests/profile/ProfileLocationTest.java    | 23 +++++++++++++++++--
 3 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java

diff --git a/src/main/java/io/ebeaninternal/server/profile/UtilLocation.java b/src/main/java/io/ebeaninternal/server/profile/UtilLocation.java
index 06aedef6d..7b70dfcb7 100644
--- a/src/main/java/io/ebeaninternal/server/profile/UtilLocation.java
+++ b/src/main/java/io/ebeaninternal/server/profile/UtilLocation.java
@@ -7,8 +7,19 @@ final class UtilLocation {
     if (pos == -1) {
       return shortDescription;
     } else {
-      return shortDescription.substring(0, pos);
+      return trimInit(shortDescription.substring(0, pos));
     }
   }
 
+  /**
+   * Trim constructor init to be "safe" without greater than or less than chars.
+   */
+  private static String trimInit(String desc) {
+    if (desc.endsWith("<init>")) {
+      // trim to make a safe label
+      return desc.substring(0, desc.length() - 6) + "init";
+    }
+    return desc;
+  }
+
 }
diff --git a/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java b/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java
new file mode 100644
index 000000000..1bdbcd2f7
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java
@@ -0,0 +1,15 @@
+package io.ebeaninternal.server.profile;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class UtilLocationTest {
+
+  @Test
+  public void label() {
+
+    assertThat(UtilLocation.label("foo")).isEqualTo("foo");
+    assertThat(UtilLocation.label("ProfileLocationTest$Other.<init>(ProfileLocationTest.java:47)")).isEqualTo("ProfileLocationTest$Other.init");
+  }
+}
diff --git a/src/test/java/org/tests/profile/ProfileLocationTest.java b/src/test/java/org/tests/profile/ProfileLocationTest.java
index 8165a76a0..fccbe8d40 100644
--- a/src/test/java/org/tests/profile/ProfileLocationTest.java
+++ b/src/test/java/org/tests/profile/ProfileLocationTest.java
@@ -9,6 +9,8 @@ public class ProfileLocationTest {
 
   private static ProfileLocation loc = ProfileLocation.create(12, "foo");
 
+  private static ProfileLocation loc2 = ProfileLocation.create();
+
   private String doIt() {
     return loc.obtain();
   }
@@ -16,8 +18,8 @@ public class ProfileLocationTest {
   @Test
   public void test_obtain() {
 
-    assertThat(doIt()).isEqualTo("org.tests.profile.ProfileLocationTest.doIt(ProfileLocationTest.java:13)");
-    assertThat(loc.shortDescription()).isEqualTo("ProfileLocationTest.doIt(ProfileLocationTest.java:13)");
+    assertThat(doIt()).isEqualTo("org.tests.profile.ProfileLocationTest.doIt(ProfileLocationTest.java:15)");
+    assertThat(loc.shortDescription()).isEqualTo("ProfileLocationTest.doIt(ProfileLocationTest.java:15)");
     assertThat(loc.label()).isEqualTo("ProfileLocationTest.doIt");
   }
 
@@ -25,4 +27,21 @@ public class ProfileLocationTest {
   public void test_add() {
     loc.add(100);
   }
+
+  @Test
+  public void test_constructor() {
+
+    Other other = new Other();
+    other.hashCode();
+
+    assertThat(loc2.label()).isEqualTo("ProfileLocationTest$Other.init");
+    assertThat(loc2.shortDescription()).isEqualTo("ProfileLocationTest$Other.<init>(ProfileLocationTest.java:44)");
+  }
+
+  static class Other {
+
+    Other() {
+      loc2.obtain();
+    }
+  }
 }

From 4509c6b1edb32bc2c3fab60470e55338e9ee60c3 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 12 Apr 2019 13:38:41 +1200
Subject: [PATCH 0807/1036] [maven-release-plugin] prepare release
 ebean-11.37.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d56453717..7bfa3f582 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.37.1-SNAPSHOT</version>
+  <version>11.37.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.37.1</tag>
   </scm>
 
   <profiles>

From f667a73dc1f726dffa55b0310b94e790283dc1b8 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 12 Apr 2019 13:38:53 +1200
Subject: [PATCH 0808/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7bfa3f582..b39a81bf7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.37.1</version>
+  <version>11.37.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.37.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 410d1a9b37ab317a9e06aeea4a7e90e1eb3cf721 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 12 Apr 2019 20:53:35 +1200
Subject: [PATCH 0809/1036] update sponsor logo for premium-minds

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f77887e34..197dca9c7 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@
       </td>
       <td align="center" valign="middle">
         <a href="https://www.premium-minds.com" target="_blank">
-          <img width="222px" src="https://ebean.io/images/logo-premium-minds.png">
+          <img width="222px" src="https://ebean.io/images/logo-med-principal.png">
         </a>
       </td>
     </tr>

From ae228d6b0e6a0d82c2ce80f9d7c1d63b5b08c0c4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 24 Apr 2019 14:00:22 +1200
Subject: [PATCH 0810/1036] #1679 - ENH: Support enabling/disabling L2 cache by
 "region" at runtime

---
 pom.xml                                       |  2 +-
 .../io/ebean/cache/ServerCacheManager.java    | 31 +++++++-
 .../io/ebean/cache/ServerCacheRegion.java     | 23 ++++++
 .../io/ebeaninternal/api/SpiCacheControl.java | 25 +++++++
 .../io/ebeaninternal/api/SpiCacheRegion.java  | 10 +++
 .../server/cache/DefaultCacheAdapter.java     | 23 ++++++
 .../cache/DefaultServerCacheManager.java      | 56 ++++++++++++++
 .../server/cache/SpiCacheManager.java         | 26 +++++++
 .../server/core/CacheOptions.java             | 37 +++++----
 .../deploy/BeanDescriptorCacheHelp.java       | 56 +++++++++++---
 .../server/deploy/DCacheControl.java          | 42 +++++++++++
 .../server/deploy/DCacheControlNone.java      | 31 ++++++++
 .../server/deploy/DCacheRegion.java           | 29 +++++++
 .../server/deploy/DCacheRegionNone.java       | 23 ++++++
 .../cache/personinfo/PersonCacheEmail.java    |  2 +-
 .../cache/personinfo/PersonCacheInfo.java     |  2 +-
 .../cache/personinfo/PersonCacheTests.java    | 75 +++++++++++++++----
 17 files changed, 451 insertions(+), 42 deletions(-)
 create mode 100644 src/main/java/io/ebean/cache/ServerCacheRegion.java
 create mode 100644 src/main/java/io/ebeaninternal/api/SpiCacheControl.java
 create mode 100644 src/main/java/io/ebeaninternal/api/SpiCacheRegion.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/DCacheControl.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/DCacheControlNone.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/DCacheRegion.java
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/DCacheRegionNone.java

diff --git a/pom.xml b/pom.xml
index b39a81bf7..a3ed6d149 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>4.7</version>
+      <version>4.8</version>
     </dependency>
 
     <dependency>
diff --git a/src/main/java/io/ebean/cache/ServerCacheManager.java b/src/main/java/io/ebean/cache/ServerCacheManager.java
index 38de72fc6..a81fe9a52 100644
--- a/src/main/java/io/ebean/cache/ServerCacheManager.java
+++ b/src/main/java/io/ebean/cache/ServerCacheManager.java
@@ -1,5 +1,7 @@
 package io.ebean.cache;
 
+import java.util.List;
+
 /**
  * The cache service for server side caching of beans and query results.
  */
@@ -14,6 +16,31 @@ public interface ServerCacheManager {
    */
   boolean isLocalL2Caching();
 
+  /**
+   * Return all the cache regions.
+   */
+  List<ServerCacheRegion> allRegions();
+
+  /**
+   * Set the regions that are enabled.
+   * <p>
+   * Typically this is set on startup and at runtime (via dynamic configuration).
+   * </p>
+   *
+   * @param regions A region name or comma delimited list of region names.
+   */
+  void setEnabledRegions(String regions);
+
+  /**
+   * Enable or disable all the cache regions.
+   */
+  void setAllRegionsEnabled(boolean enabled);
+
+  /**
+   * Return the cache region by name. Typically to enable or disable the region.
+   */
+  ServerCacheRegion getRegion(String name);
+
   /**
    * Return the cache for mapping natural keys to id values.
    */
@@ -46,7 +73,7 @@ public interface ServerCacheManager {
 
   /**
    * Clear all the local caches.
-   *
+   * <p>
    * This is used when the L2 Cache is based on clustered near-caches (Like Ebean-K8s-L2Cache).
    * It is not used when the L2 cache is a distributed cache such as HazelCast or Ignite etc.
    */
@@ -54,7 +81,7 @@ public interface ServerCacheManager {
 
   /**
    * Clear the local caches for this bean type.
-   *
+   * <p>
    * This is used when the L2 Cache is based on clustered near-caches (Like Ebean-K8s-L2Cache).
    * It is not used when the L2 cache is a distributed cache such as HazelCast or Ignite etc.
    */
diff --git a/src/main/java/io/ebean/cache/ServerCacheRegion.java b/src/main/java/io/ebean/cache/ServerCacheRegion.java
new file mode 100644
index 000000000..b63668d91
--- /dev/null
+++ b/src/main/java/io/ebean/cache/ServerCacheRegion.java
@@ -0,0 +1,23 @@
+package io.ebean.cache;
+
+/**
+ * Cache region can be enabled independently.
+ */
+public interface ServerCacheRegion {
+
+  /**
+   * Return the region name.
+   */
+  String getName();
+
+  /**
+   * Return true if the cache region is enabled.
+   */
+  boolean isEnabled();
+
+  /**
+   * Set to true to enable the cache region.
+   */
+  void setEnabled(boolean enabled);
+
+}
diff --git a/src/main/java/io/ebeaninternal/api/SpiCacheControl.java b/src/main/java/io/ebeaninternal/api/SpiCacheControl.java
new file mode 100644
index 000000000..17e2fbe17
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/api/SpiCacheControl.java
@@ -0,0 +1,25 @@
+package io.ebeaninternal.api;
+
+public interface SpiCacheControl {
+
+  /**
+   * Return true if bean caching or query caching.
+   */
+  boolean isCaching();
+
+  /**
+   * Return true if bean caching.
+   */
+  boolean isBeanCaching();
+
+  /**
+   * Return true if natural key caching.
+   */
+  boolean isNaturalKeyCaching();
+
+  /**
+   * Return true if query caching.
+   */
+  boolean isQueryCaching();
+
+}
diff --git a/src/main/java/io/ebeaninternal/api/SpiCacheRegion.java b/src/main/java/io/ebeaninternal/api/SpiCacheRegion.java
new file mode 100644
index 000000000..78595b110
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/api/SpiCacheRegion.java
@@ -0,0 +1,10 @@
+package io.ebeaninternal.api;
+
+import io.ebean.cache.ServerCacheRegion;
+
+/**
+ * Cache region can be enabled independently.
+ */
+public interface SpiCacheRegion extends ServerCacheRegion {
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/cache/DefaultCacheAdapter.java b/src/main/java/io/ebeaninternal/server/cache/DefaultCacheAdapter.java
index 0c3cfa9e5..37e89b864 100644
--- a/src/main/java/io/ebeaninternal/server/cache/DefaultCacheAdapter.java
+++ b/src/main/java/io/ebeaninternal/server/cache/DefaultCacheAdapter.java
@@ -2,6 +2,9 @@ package io.ebeaninternal.server.cache;
 
 import io.ebean.cache.ServerCache;
 import io.ebean.cache.ServerCacheManager;
+import io.ebean.cache.ServerCacheRegion;
+
+import java.util.List;
 
 /**
  * Adapts SpiCacheManager to ServerCacheManager.
@@ -22,6 +25,26 @@ public class DefaultCacheAdapter implements ServerCacheManager {
     return cacheManager.isLocalL2Caching();
   }
 
+  @Override
+  public List<ServerCacheRegion> allRegions() {
+    return cacheManager.allRegions();
+  }
+
+  @Override
+  public void setEnabledRegions(String regions) {
+    cacheManager.setEnabledRegions(regions);
+  }
+
+  @Override
+  public ServerCacheRegion getRegion(String region) {
+    return cacheManager.getRegion(region);
+  }
+
+  @Override
+  public void setAllRegionsEnabled(boolean enabled) {
+    cacheManager.setAllRegionsEnabled(enabled);
+  }
+
   @Override
   public ServerCache getNaturalKeyCache(Class<?> beanType) {
     return cacheManager.getNaturalKeyCache(beanType);
diff --git a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java
index bdb10d453..bf4fadac6 100644
--- a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java
+++ b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java
@@ -1,14 +1,29 @@
 package io.ebeaninternal.server.cache;
 
 import io.ebean.cache.ServerCache;
+import io.ebean.cache.ServerCacheRegion;
 import io.ebean.cache.ServerCacheType;
+import io.ebeaninternal.api.SpiCacheRegion;
 import io.ebeaninternal.server.cluster.ClusterManager;
+import io.ebeaninternal.server.deploy.DCacheRegion;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Manages the bean and query caches.
  */
 public class DefaultServerCacheManager implements SpiCacheManager {
 
+  private static final Logger log = LoggerFactory.getLogger("io.ebean.cache.REGION");
+
+  private final Map<String, SpiCacheRegion> regionMap = new HashMap<>();
+
   private final ClusterManager clusterManager;
 
   private final DefaultCacheHolder cacheHolder;
@@ -39,6 +54,47 @@ public class DefaultServerCacheManager implements SpiCacheManager {
     return localL2Caching;
   }
 
+  @Override
+  public List<ServerCacheRegion> allRegions() {
+    return new ArrayList<>(regionMap.values());
+  }
+
+  @Override
+  public void setEnabledRegions(String regions) {
+
+    List<String> enabledRegions = Arrays.asList(regions.split(","));
+    List<String> disabledRegions = new ArrayList<>();
+
+    for (SpiCacheRegion region : regionMap.values()) {
+      if (enabledRegions.contains(region.getName())) {
+        if (!region.isEnabled()) {
+          region.setEnabled(true);
+          log.debug("Cache region[{}] enabled", region.getName());
+        }
+      } else {
+        disabledRegions.add(region.getName());
+        if (region.isEnabled()) {
+          region.setEnabled(false);
+          log.debug("Cache region[{}] disabled", region.getName());
+        }
+      }
+    }
+    log.info("Cache regions enabled:{} disabled:{}", enabledRegions, disabledRegions);
+  }
+
+  @Override
+  public void setAllRegionsEnabled(boolean enabled) {
+    log.debug("All cache regions enabled[{}]", enabled);
+    for (SpiCacheRegion region : regionMap.values()) {
+      region.setEnabled(enabled);
+    }
+  }
+
+  @Override
+  public SpiCacheRegion getRegion(String region) {
+    return regionMap.computeIfAbsent(region, DCacheRegion::new);
+  }
+
   /**
    * Clear all caches.
    */
diff --git a/src/main/java/io/ebeaninternal/server/cache/SpiCacheManager.java b/src/main/java/io/ebeaninternal/server/cache/SpiCacheManager.java
index 3e83203bd..5ef06b991 100644
--- a/src/main/java/io/ebeaninternal/server/cache/SpiCacheManager.java
+++ b/src/main/java/io/ebeaninternal/server/cache/SpiCacheManager.java
@@ -1,6 +1,10 @@
 package io.ebeaninternal.server.cache;
 
 import io.ebean.cache.ServerCache;
+import io.ebean.cache.ServerCacheRegion;
+import io.ebeaninternal.api.SpiCacheRegion;
+
+import java.util.List;
 
 /**
  * The cache service for server side caching of beans and query results.
@@ -16,6 +20,28 @@ public interface SpiCacheManager {
    */
   boolean isLocalL2Caching();
 
+  /**
+   * Return all the regions.
+   */
+  List<ServerCacheRegion> allRegions();
+
+  /**
+   * Set the regions that are enabled.
+   *
+   * @param regions A single region name or a comma delimited list of region names.
+   */
+  void setEnabledRegions(String regions);
+
+  /**
+   * Enable or disable all cache regions.
+   */
+  void setAllRegionsEnabled(boolean enabled);
+
+  /**
+   * Return the cache region. We can enable L2 caching by region.
+   */
+  SpiCacheRegion getRegion(String region);
+
   /**
    * Return the cache for mapping natural keys to id values.
    */
diff --git a/src/main/java/io/ebeaninternal/server/core/CacheOptions.java b/src/main/java/io/ebeaninternal/server/core/CacheOptions.java
index 24d441828..5fd2fcf54 100644
--- a/src/main/java/io/ebeaninternal/server/core/CacheOptions.java
+++ b/src/main/java/io/ebeaninternal/server/core/CacheOptions.java
@@ -19,16 +19,18 @@ public class CacheOptions {
   private final boolean enableQueryCache;
   private final boolean readOnly;
   private final String[] naturalKey;
+  private final String region;
 
   /**
    * Construct for no caching.
    */
   private CacheOptions() {
-    invalidateQueryCache = false;
-    enableBeanCache = false;
-    enableQueryCache = false;
-    readOnly = false;
-    naturalKey = null;
+    this.invalidateQueryCache = false;
+    this.enableBeanCache = false;
+    this.enableQueryCache = false;
+    this.readOnly = false;
+    this.naturalKey = null;
+    this.region = null;
   }
 
   /**
@@ -36,21 +38,30 @@ public class CacheOptions {
    */
   private CacheOptions(boolean invalidateQueryCache) {
     this.invalidateQueryCache = invalidateQueryCache;
-    enableBeanCache = false;
-    enableQueryCache = false;
-    readOnly = false;
-    naturalKey = null;
+    this.enableBeanCache = false;
+    this.enableQueryCache = false;
+    this.readOnly = false;
+    this.naturalKey = null;
+    this.region = null;
   }
 
   /**
    * Construct with cache annotation.
    */
   public CacheOptions(Cache cache, String[] naturalKey) {
-    invalidateQueryCache = false;
-    enableBeanCache = cache.enableBeanCache();
-    enableQueryCache = cache.enableQueryCache();
-    readOnly = cache.readOnly();
+    this.invalidateQueryCache = false;
+    this.enableBeanCache = cache.enableBeanCache();
+    this.enableQueryCache = cache.enableQueryCache();
+    this.readOnly = cache.readOnly();
     this.naturalKey = naturalKey;
+    this.region = cache.region();
+  }
+
+  /**
+   * Return the cache region name.
+   */
+  public String getRegion() {
+    return region;
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index 88c816040..b2cb88ffb 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -7,6 +7,8 @@ import io.ebean.bean.PersistenceContext;
 import io.ebean.cache.QueryCacheEntry;
 import io.ebean.cache.ServerCache;
 import io.ebeaninternal.api.BeanCacheResult;
+import io.ebeaninternal.api.SpiCacheControl;
+import io.ebeaninternal.api.SpiCacheRegion;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.api.TransactionEventTable.TableIUD;
 import io.ebeaninternal.server.cache.CacheChangeSet;
@@ -72,6 +74,9 @@ final class BeanDescriptorCacheHelp<T> {
 
   private final boolean noCaching;
 
+  private final SpiCacheControl cacheControl;
+  private final SpiCacheRegion cacheRegion;
+
   /**
    * Set to true if all persist changes need to notify the cache.
    */
@@ -113,6 +118,13 @@ final class BeanDescriptorCacheHelp<T> {
       this.naturalKeyCache = null;
     }
     this.noCaching = (beanCache == null && queryCache == null);
+    if (noCaching) {
+      this.cacheControl = DCacheControlNone.INSTANCE;
+      this.cacheRegion = (invalidateQueryCache) ? cacheManager.getRegion(cacheOptions.getRegion()) : DCacheRegionNone.INSTANCE;
+    } else {
+      this.cacheRegion = cacheManager.getRegion(cacheOptions.getRegion());
+      this.cacheControl = new DCacheControl(cacheRegion, (beanCache != null), (naturalKeyCache != null), (queryCache != null));
+    }
   }
 
   /**
@@ -123,8 +135,8 @@ final class BeanDescriptorCacheHelp<T> {
     cacheNotifyOnDelete = !cacheNotifyOnAll && isNotifyOnDeletes();
 
     if (logger.isDebugEnabled()) {
-      if (isBeanCaching() || isQueryCaching() || cacheNotifyOnAll || cacheNotifyOnDelete) {
-        String notifyMode = cacheNotifyOnAll ? "All" : (cacheNotifyOnDelete ? "Delete" : "None");
+      if (cacheNotifyOnAll || cacheNotifyOnDelete) {
+        String notifyMode = cacheNotifyOnAll ? "All" : "Delete";
         logger.debug("l2 caching on {} - beanCaching:{} queryCaching:{} notifyMode:{} ",
           desc.getFullName(), isBeanCaching(), isQueryCaching(), notifyMode);
       }
@@ -148,36 +160,36 @@ final class BeanDescriptorCacheHelp<T> {
    * Return true if the persist request needs to notify the cache.
    */
   boolean isCacheNotify(PersistRequest.Type type) {
-    return cacheNotifyOnAll
-      || cacheNotifyOnDelete && (type == PersistRequest.Type.DELETE || type == PersistRequest.Type.DELETE_PERMANENT);
+    return cacheRegion.isEnabled()
+      && (cacheNotifyOnAll || cacheNotifyOnDelete && (type == PersistRequest.Type.DELETE || type == PersistRequest.Type.DELETE_PERMANENT));
   }
 
   /**
    * Return true if there is currently query caching for this type of bean.
    */
   boolean isQueryCaching() {
-    return queryCache != null;
+    return cacheControl.isQueryCaching();
   }
 
   /**
    * Return true if there is currently bean caching for this type of bean.
    */
   boolean isBeanCaching() {
-    return beanCache != null;
+    return cacheControl.isBeanCaching();
   }
 
   /**
    * Return true if there is natural key caching for this type of bean.
    */
   boolean isNaturalKeyCaching() {
-    return naturalKeyCache != null;
+    return cacheControl.isNaturalKeyCaching();
   }
 
   /**
    * Return true if there is bean or query caching on this type.
    */
   boolean isCaching() {
-    return beanCache != null || queryCache != null;
+    return cacheControl.isCaching();
   }
 
   /**
@@ -206,7 +218,7 @@ final class BeanDescriptorCacheHelp<T> {
   /**
    * Add query cache clear to the changeSet.
    */
-  void queryCacheClear(CacheChangeSet changeSet) {
+  private void queryCacheClear(CacheChangeSet changeSet) {
     if (queryCache != null) {
       changeSet.addClearQuery(desc);
     }
@@ -292,8 +304,8 @@ final class BeanDescriptorCacheHelp<T> {
       return false;
     }
 
-    Object ownerBean = bc.getOwnerBean();
-    EntityBeanIntercept ebi = ((EntityBean) ownerBean)._ebean_getIntercept();
+    EntityBean ownerBean = bc.getOwnerBean();
+    EntityBeanIntercept ebi = ownerBean._ebean_getIntercept();
     PersistenceContext persistenceContext = ebi.getPersistenceContext();
 
     BeanDescriptor<?> targetDescriptor = many.getTargetDescriptor();
@@ -362,6 +374,28 @@ final class BeanDescriptorCacheHelp<T> {
     return new CachedManyIds(idList);
   }
 
+//  BeanCacheResult<T> cacheIdLookup(PersistenceContext context, Collection<?> keys) {
+//
+//    Set<Object> ids = new HashSet<>(keys);
+//    Map<Object, Object> beanDataMap = beanCache.getAll(ids);
+//    if (beanLog.isTraceEnabled()) {
+//      beanLog.trace("   GET MANY {}({}) - hits:{}", cacheName, ids, beanDataMap.keySet());
+//    }
+//
+//    BeanCacheResult<T> result = new BeanCacheResult<>();
+//    // process the hits into beans etc
+//    for (Map.Entry<Object, Object> entry : beanDataMap.entrySet()) {
+//
+//      Object id = entry.getKey();
+//      CachedBeanData cachedBeanData = (CachedBeanData) entry.getValue();
+//
+//      T bean = convertToBean(id, false, context, cachedBeanData);
+//      result.add(bean, id);
+//    }
+//
+//    return result;
+//  }
+
   /**
    * Use natural keys to hit the bean cache and return resulting hits.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DCacheControl.java b/src/main/java/io/ebeaninternal/server/deploy/DCacheControl.java
new file mode 100644
index 000000000..a99dabf89
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/DCacheControl.java
@@ -0,0 +1,42 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebeaninternal.api.SpiCacheControl;
+import io.ebeaninternal.api.SpiCacheRegion;
+
+/**
+ * Default implementation of SpiCacheControl.
+ */
+class DCacheControl implements SpiCacheControl {
+
+  private final SpiCacheRegion region;
+  private final boolean bean;
+  private final boolean naturalKey;
+  private final boolean query;
+
+  DCacheControl(SpiCacheRegion region, boolean bean, boolean naturalKey, boolean query) {
+    this.region = region;
+    this.bean = bean;
+    this.naturalKey = naturalKey;
+    this.query = query;
+  }
+
+  @Override
+  public boolean isCaching() {
+    return (bean || query) && region.isEnabled();
+  }
+
+  @Override
+  public boolean isBeanCaching() {
+    return bean && region.isEnabled();
+  }
+
+  @Override
+  public boolean isNaturalKeyCaching() {
+    return naturalKey && region.isEnabled();
+  }
+
+  @Override
+  public boolean isQueryCaching() {
+    return query && region.isEnabled();
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DCacheControlNone.java b/src/main/java/io/ebeaninternal/server/deploy/DCacheControlNone.java
new file mode 100644
index 000000000..8f4797f47
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/DCacheControlNone.java
@@ -0,0 +1,31 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebeaninternal.api.SpiCacheControl;
+
+/**
+ * Cache control used when no caching is on the bean type.
+ */
+class DCacheControlNone implements SpiCacheControl {
+
+  static final SpiCacheControl INSTANCE = new DCacheControlNone();
+
+  @Override
+  public boolean isCaching() {
+    return false;
+  }
+
+  @Override
+  public boolean isBeanCaching() {
+    return false;
+  }
+
+  @Override
+  public boolean isNaturalKeyCaching() {
+    return false;
+  }
+
+  @Override
+  public boolean isQueryCaching() {
+    return false;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DCacheRegion.java b/src/main/java/io/ebeaninternal/server/deploy/DCacheRegion.java
new file mode 100644
index 000000000..2056833b7
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/DCacheRegion.java
@@ -0,0 +1,29 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebeaninternal.api.SpiCacheRegion;
+
+public class DCacheRegion implements SpiCacheRegion {
+
+  private boolean enabled = true;
+
+  private final String name;
+
+  public DCacheRegion(String name) {
+    this.name = name;
+  }
+
+  @Override
+  public String getName() {
+    return name;
+  }
+
+  @Override
+  public boolean isEnabled() {
+    return enabled;
+  }
+
+  @Override
+  public void setEnabled(boolean enabled) {
+    this.enabled = enabled;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DCacheRegionNone.java b/src/main/java/io/ebeaninternal/server/deploy/DCacheRegionNone.java
new file mode 100644
index 000000000..50c9ba33a
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/DCacheRegionNone.java
@@ -0,0 +1,23 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebeaninternal.api.SpiCacheRegion;
+
+class DCacheRegionNone implements SpiCacheRegion {
+
+  static SpiCacheRegion INSTANCE = new DCacheRegionNone();
+
+  @Override
+  public String getName() {
+    return "<none>";
+  }
+
+  @Override
+  public boolean isEnabled() {
+    return false;
+  }
+
+  @Override
+  public void setEnabled(boolean enabled) {
+    throw new IllegalStateException("Not expected");
+  }
+}
diff --git a/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java b/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java
index e78463fe9..58ddea0a2 100644
--- a/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java
+++ b/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java
@@ -8,7 +8,7 @@ import javax.persistence.ManyToOne;
 import javax.validation.constraints.Size;
 
 @Entity
-@Cache
+@Cache(region = "email")
 public class PersonCacheEmail {
 
   @Id
diff --git a/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java b/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java
index bc24ce960..25d8e4d51 100644
--- a/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java
+++ b/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java
@@ -7,7 +7,7 @@ import javax.persistence.Id;
 import javax.validation.constraints.Size;
 
 @Entity
-@Cache
+@Cache(region = "email")
 public class PersonCacheInfo {
 
   @Id
diff --git a/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java b/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java
index 5cc192eca..b92949f6d 100644
--- a/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java
+++ b/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java
@@ -1,17 +1,31 @@
 package org.tests.cache.personinfo;
 
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.cache.ServerCache;
+import io.ebean.cache.ServerCacheRegion;
+import io.ebean.cache.ServerCacheStatistics;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Arrays;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertTrue;
 
 public class PersonCacheTests {
 
+  private static final Logger log = LoggerFactory.getLogger(PersonCacheTests.class);
+
+  private final List<Object> ids = Arrays.asList("E001", "E002", "E003");
+
+  private ServerCache beanCacheInfo = DB.getDefault().getServerCacheManager().getBeanCache(PersonCacheInfo.class);
+  private ServerCache beanCacheEmail = DB.getDefault().getServerCacheManager().getBeanCache(PersonCacheEmail.class);
+
+  private ServerCacheRegion region = DB.getDefault().getServerCacheManager().getRegion("email");
+
   private void insert(int id, String email) {
 
     PersonCacheInfo person = new PersonCacheInfo("P00" + id, "P00" + id);
@@ -19,8 +33,8 @@ public class PersonCacheTests {
     PersonCacheEmail personEmail = new PersonCacheEmail("E00" + id, email);
     personEmail.setPersonInfo(person);
 
-    Ebean.save(person);
-    Ebean.save(personEmail);
+    DB.save(person);
+    DB.save(personEmail);
   }
 
   private void addTestData() {
@@ -37,18 +51,15 @@ public class PersonCacheTests {
 
     LoggedSqlCollector.start();
 
-    Ebean.find(PersonCacheInfo.class)
+    DB.find(PersonCacheInfo.class)
       .select("personId") // do not fetch name
       .setUseCache(true)
       .findList();
 
-    ServerCache beanCache = Ebean.getDefaultServer().getServerCacheManager().getBeanCache(PersonCacheInfo.class);
-    beanCache.getStatistics(true);
-
-    List<Object> ids = Arrays.asList(new String[]{"E001", "E002", "E003"});
+    beanCacheInfo.getStatistics(true);
 
     List<PersonCacheEmail> emailList =
-      Ebean.find(PersonCacheEmail.class)
+      DB.find(PersonCacheEmail.class)
         .where().idIn(ids)
         .setUseCache(true)
         .findList();
@@ -63,12 +74,12 @@ public class PersonCacheTests {
     List<String> sql = LoggedSqlCollector.current();
     assertThat(sql).hasSize(3);
 
-    assertThat(beanCache.getStatistics(true).getHitCount()).isEqualTo(3);
+    assertThat(beanCacheInfo.getStatistics(true).getHitCount()).isEqualTo(3);
 
-    System.out.println("Fetch again ...");
+    log.info("Fetch again ...");
 
     emailList =
-      Ebean.find(PersonCacheEmail.class)
+      DB.find(PersonCacheEmail.class)
         .where().idIn(ids)
         .setUseCache(true)
         .findList();
@@ -83,7 +94,45 @@ public class PersonCacheTests {
     sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(1);
 
-    assertThat(beanCache.getStatistics(true).getHitCount()).isEqualTo(3);
+    assertThat(beanCacheInfo.getStatistics(true).getHitCount()).isEqualTo(3);
+
+    turnOffRegion_expect_noCacheUse();
 
   }
+
+  private void turnOffRegion_expect_noCacheUse() {
+
+    assertTrue(region.isEnabled());
+    beanCacheEmail.getStatistics(true);
+
+    log.info("Disabled region ...");
+    region.setEnabled(false);
+
+    for (Object id : ids) {
+      DB.find(PersonCacheEmail.class)
+        .where().idEq(id)
+        .setUseCache(true)
+        .findOne();
+    }
+
+    // assert that we didn't hit the cache
+    ServerCacheStatistics statistics = beanCacheEmail.getStatistics(true);
+    assertThat(statistics.getHitCount()).isEqualTo(0);
+    assertThat(statistics.getMissCount()).isEqualTo(0);
+
+    log.info("Enabled region ...");
+    region.setEnabled(true);
+
+    for (Object id : ids) {
+      DB.find(PersonCacheEmail.class)
+        .where().idEq(id)
+        .setUseCache(true)
+        .findOne();
+    }
+
+    // assert that we DID hit the cache
+    statistics = beanCacheEmail.getStatistics(true);
+    assertThat(statistics.getHitCount()).isEqualTo(3);
+    assertThat(statistics.getMissCount()).isEqualTo(0);
+  }
 }

From 86436ac3acbcaf68f63556968b4814ed83e5b1c4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 24 Apr 2019 15:41:07 +1200
Subject: [PATCH 0811/1036] #1679 - ENH: Support enabling/disabling L2 cache by
 "region" at runtime

---
 pom.xml                                       |  2 +-
 .../java/io/ebean/config/ServerConfig.java    | 16 +++++
 .../cache/DefaultServerCacheManager.java      | 32 +++++----
 .../server/core/CacheOptions.java             | 18 ++++-
 .../server/core/DefaultServer.java            | 66 +------------------
 .../deploy/meta/DeployBeanDescriptor.java     |  4 +-
 .../server/deploy/parse/AnnotationClass.java  |  5 +-
 src/test/java/io/ebean/BaseTestCase.java      |  2 +-
 .../ebean/cache/ServerCacheManagerTest.java   | 48 ++++++++++++++
 .../io/ebean/config/ServerConfigTest.java     |  5 ++
 10 files changed, 111 insertions(+), 87 deletions(-)
 create mode 100644 src/test/java/io/ebean/cache/ServerCacheManagerTest.java

diff --git a/pom.xml b/pom.xml
index a3ed6d149..f6eb3b058 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>4.8</version>
+      <version>4.9</version>
     </dependency>
 
     <dependency>
diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 9efda763d..9b394a03e 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -479,6 +479,7 @@ public class ServerConfig {
    */
   private boolean disableL2Cache;
 
+  private String enabledL2Regions;
 
   /**
    * Should the javax.validation.constraints.NotNull enforce a notNull column in DB.
@@ -2914,6 +2915,7 @@ public class ServerConfig {
     collectQueryPlans = p.getBoolean("collectQueryPlans", collectQueryPlans);
     docStoreOnly = p.getBoolean("docStoreOnly", docStoreOnly);
     disableL2Cache = p.getBoolean("disableL2Cache", disableL2Cache);
+    enabledL2Regions = p.get("enabledL2Regions", enabledL2Regions);
     notifyL2CacheInForeground = p.getBoolean("notifyL2CacheInForeground", notifyL2CacheInForeground);
     explicitTransactionBeginMode = p.getBoolean("explicitTransactionBeginMode", explicitTransactionBeginMode);
     autoCommitMode = p.getBoolean("autoCommitMode", autoCommitMode);
@@ -3136,6 +3138,20 @@ public class ServerConfig {
     this.expressionNativeIlike = expressionNativeIlike;
   }
 
+  /**
+   * Return the enabled L2 cache regions.
+   */
+  public String getEnabledL2Regions() {
+    return enabledL2Regions;
+  }
+
+  /**
+   * Set the enabled L2 cache regions (comma delimited).
+   */
+  public void setEnabledL2Regions(String enabledL2Regions) {
+    this.enabledL2Regions = enabledL2Regions;
+  }
+
   /**
    * Return true if L2 cache is disabled.
    */
diff --git a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java
index bf4fadac6..773846b79 100644
--- a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java
+++ b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java
@@ -61,25 +61,29 @@ public class DefaultServerCacheManager implements SpiCacheManager {
 
   @Override
   public void setEnabledRegions(String regions) {
+    if (regions != null) {
+      List<String> enabledRegionNames = Arrays.asList(regions.split(","));
 
-    List<String> enabledRegions = Arrays.asList(regions.split(","));
-    List<String> disabledRegions = new ArrayList<>();
+      List<String> disabled = new ArrayList<>();
+      List<String> enabled = new ArrayList<>();
 
-    for (SpiCacheRegion region : regionMap.values()) {
-      if (enabledRegions.contains(region.getName())) {
-        if (!region.isEnabled()) {
-          region.setEnabled(true);
-          log.debug("Cache region[{}] enabled", region.getName());
-        }
-      } else {
-        disabledRegions.add(region.getName());
-        if (region.isEnabled()) {
-          region.setEnabled(false);
-          log.debug("Cache region[{}] disabled", region.getName());
+      for (SpiCacheRegion region : regionMap.values()) {
+        if (enabledRegionNames.contains(region.getName())) {
+          enabled.add(region.getName());
+          if (!region.isEnabled()) {
+            region.setEnabled(true);
+            log.debug("Cache region[{}] enabled", region.getName());
+          }
+        } else {
+          disabled.add(region.getName());
+          if (region.isEnabled()) {
+            region.setEnabled(false);
+            log.debug("Cache region[{}] disabled", region.getName());
+          }
         }
       }
+      log.info("Cache regions enabled:{} disabled:{}", enabled, disabled);
     }
-    log.info("Cache regions enabled:{} disabled:{}", enabledRegions, disabledRegions);
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/core/CacheOptions.java b/src/main/java/io/ebeaninternal/server/core/CacheOptions.java
index 5fd2fcf54..b2ef8073c 100644
--- a/src/main/java/io/ebeaninternal/server/core/CacheOptions.java
+++ b/src/main/java/io/ebeaninternal/server/core/CacheOptions.java
@@ -12,7 +12,9 @@ public class CacheOptions {
    */
   public static final CacheOptions NO_CACHING = new CacheOptions();
 
-  public static final CacheOptions INVALIDATE_QUERY_CACHE = new CacheOptions(true);
+  private static final String R0 = "r0";
+
+  private static final CacheOptions INVALIDATE_QUERY_CACHE_R0 = new CacheOptions(true);
 
   private final boolean invalidateQueryCache;
   private final boolean enableBeanCache;
@@ -21,6 +23,14 @@ public class CacheOptions {
   private final String[] naturalKey;
   private final String region;
 
+  public static CacheOptions invalidateQueryCache(String region) {
+    if (R0.equals(region)) {
+      return INVALIDATE_QUERY_CACHE_R0;
+    } else {
+      return new CacheOptions(true, region);
+    }
+  }
+
   /**
    * Construct for no caching.
    */
@@ -37,12 +47,16 @@ public class CacheOptions {
    * Construct for invalidateQueryCache.
    */
   private CacheOptions(boolean invalidateQueryCache) {
+    this(invalidateQueryCache, R0);
+  }
+
+  private CacheOptions(boolean invalidateQueryCache, String region) {
     this.invalidateQueryCache = invalidateQueryCache;
     this.enableBeanCache = false;
     this.enableQueryCache = false;
     this.readOnly = false;
     this.naturalKey = null;
-    this.region = null;
+    this.region = region;
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 4606d7fde..26b73d843 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -446,6 +446,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     if (encryptKeyManager != null) {
       encryptKeyManager.initialise();
     }
+    serverCacheManager.setEnabledRegions(serverConfig.getEnabledL2Regions());
   }
 
   /**
@@ -484,7 +485,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    */
   private void shutdownInternal(boolean shutdownDataSource, boolean deregisterDriver) {
 
-    logger.debug("Shutting down EbeanServer {}", serverName);
+    logger.debug("Shutting down instance:{}", serverName);
     if (shutdown) {
       // already shutdown
       return;
@@ -790,23 +791,11 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     transactionManager.exitScopedTransaction(returnOrThrowable, opCode);
   }
 
-  /**
-   * Returns the current transaction (or null) from the scope.
-   */
   @Override
   public SpiTransaction currentServerTransaction() {
     return transactionManager.getActive();
   }
 
-  /**
-   * Start a transaction with 'REQUIRED' semantics.
-   * <p>
-   * If a transaction already exists that transaction will be used.
-   * </p>
-   * <p>
-   * Note that the transaction is stored in a ThreadLocal variable.
-   * </p>
-   */
   @Override
   public Transaction beginTransaction() {
     return beginTransaction(TxScope.required());
@@ -817,12 +806,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return transactionManager.beginScopedTransaction(txScope);
   }
 
-  /**
-   * Start a transaction with a specific Isolation Level.
-   * <p>
-   * Note that the transaction is stored in a ThreadLocal variable.
-   * </p>
-   */
   @Override
   public Transaction beginTransaction(TxIsolation isolation) {
     // start an explicit transaction
@@ -837,10 +820,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return t;
   }
 
-  /**
-   * Return the current transaction or null if there is not one currently in
-   * scope.
-   */
   @Override
   public Transaction currentTransaction() {
     return transactionManager.getActive();
@@ -851,50 +830,16 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     currentTransaction().flush();
   }
 
-  /**
-   * Commit the current transaction.
-   */
   @Override
   public void commitTransaction() {
     currentTransaction().commit();
   }
 
-  /**
-   * Rollback the current transaction.
-   */
   @Override
   public void rollbackTransaction() {
     currentTransaction().rollback();
   }
 
-  /**
-   * If the current transaction has already been committed do nothing otherwise
-   * rollback the transaction.
-   * <p>
-   * Useful to put in a finally block to ensure the transaction is ended, rather
-   * than a rollbackTransaction() in each catch block.
-   * </p>
-   * <p>
-   * Code example:<br />
-   * <p>
-   * <pre>
-   * &lt;code&gt;
-   * Ebean.startTransaction();
-   * try {
-   * 	// do some fetching and or persisting
-   *
-   * 	// commit at the end
-   * 	Ebean.commitTransaction();
-   *
-   * } finally {
-   * 	// if commit didn't occur then rollback the transaction
-   * 	Ebean.endTransaction();
-   * }
-   * &lt;/code&gt;
-   * </pre>
-   * <p>
-   * </p>
-   */
   @Override
   public void endTransaction() {
     Transaction transaction = transactionManager.getInScope();
@@ -903,13 +848,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
-  /**
-   * return the next unique identity value.
-   * <p>
-   * Uses the BeanDescriptor deployment information to determine the sequence to
-   * use.
-   * </p>
-   */
   @Override
   public Object nextId(Class<?> beanType) {
     BeanDescriptor<?> desc = getBeanDescriptor(beanType);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index b43b0d6fc..bf51ceea6 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -473,8 +473,8 @@ public class DeployBeanDescriptor<T> {
   /**
    * Set that this type invalidates query caches.
    */
-  public void setInvalidateQueryCache() {
-    this.cacheOptions = CacheOptions.INVALIDATE_QUERY_CACHE;
+  public void setInvalidateQueryCache(String region) {
+    this.cacheOptions = CacheOptions.invalidateQueryCache(region);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
index 657c94797..a04b8db5e 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
@@ -202,13 +202,12 @@ public class AnnotationClass extends AnnotationParser {
       } else {
         InvalidateQueryCache invalidateQueryCache = AnnotationUtil.findAnnotationRecursive(cls, InvalidateQueryCache.class);
         if (invalidateQueryCache != null) {
-          descriptor.setInvalidateQueryCache();
+          descriptor.setInvalidateQueryCache(invalidateQueryCache.region());
         }
       }
     }
 
-    Set<NamedQuery> namedQueries = AnnotationUtil.findAnnotationsRecursive(cls, NamedQuery.class);
-    for (NamedQuery namedQuery : namedQueries) {
+    for (NamedQuery namedQuery : AnnotationUtil.findAnnotationsRecursive(cls, NamedQuery.class)) {
       descriptor.addNamedQuery(namedQuery.name(), namedQuery.query());
     }
   }
diff --git a/src/test/java/io/ebean/BaseTestCase.java b/src/test/java/io/ebean/BaseTestCase.java
index 17dc0efc1..ee10521e9 100644
--- a/src/test/java/io/ebean/BaseTestCase.java
+++ b/src/test/java/io/ebean/BaseTestCase.java
@@ -48,7 +48,7 @@ public abstract class BaseTestCase {
       DB_CLOCK_DELTA = 100;
     }
     logger.debug("... preStart");
-    if (!AgentLoader.loadAgentFromClasspath("ebean-agent", "debug=1")) {
+    if (!AgentLoader.loadAgentByMainClass("io.ebean.enhance.Transformer", "debug=1")) {
       logger.info("avaje-ebeanorm-agent not found in classpath - not dynamically loaded");
     }
     try {
diff --git a/src/test/java/io/ebean/cache/ServerCacheManagerTest.java b/src/test/java/io/ebean/cache/ServerCacheManagerTest.java
new file mode 100644
index 000000000..337a80116
--- /dev/null
+++ b/src/test/java/io/ebean/cache/ServerCacheManagerTest.java
@@ -0,0 +1,48 @@
+package io.ebean.cache;
+
+import io.ebean.DB;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class ServerCacheManagerTest {
+
+  @Test
+  public void test() {
+
+    ServerCacheManager cacheManager = DB.getDefault().getServerCacheManager();
+
+    for (ServerCacheRegion region : cacheManager.allRegions()) {
+      assertTrue(region.isEnabled());
+    }
+
+    cacheManager.setEnabledRegions("r0,doesNotExist");
+    assertThat(cacheManager.getRegion("email").isEnabled()).isFalse();
+    assertThat(cacheManager.getRegion("r0").isEnabled()).isTrue();
+
+    cacheManager.setEnabledRegions("r0");
+    assertThat(cacheManager.getRegion("email").isEnabled()).isFalse();
+    assertThat(cacheManager.getRegion("r0").isEnabled()).isTrue();
+
+    cacheManager.setEnabledRegions(null);
+    assertThat(cacheManager.getRegion("email").isEnabled()).isFalse();
+    assertThat(cacheManager.getRegion("r0").isEnabled()).isTrue();
+
+    cacheManager.setEnabledRegions("email");
+    assertThat(cacheManager.getRegion("email").isEnabled()).isTrue();
+    assertThat(cacheManager.getRegion("r0").isEnabled()).isFalse();
+
+    cacheManager.setAllRegionsEnabled(false);
+    for (ServerCacheRegion region : cacheManager.allRegions()) {
+      assertFalse(region.isEnabled());
+    }
+
+    cacheManager.setAllRegionsEnabled(true);
+    for (ServerCacheRegion region : cacheManager.allRegions()) {
+      assertTrue(region.isEnabled());
+    }
+
+  }
+}
diff --git a/src/test/java/io/ebean/config/ServerConfigTest.java b/src/test/java/io/ebean/config/ServerConfigTest.java
index e5487b2b9..52965604d 100644
--- a/src/test/java/io/ebean/config/ServerConfigTest.java
+++ b/src/test/java/io/ebean/config/ServerConfigTest.java
@@ -68,6 +68,7 @@ public class ServerConfigTest {
     props.setProperty("mappingLocations", "classpath:/foo;bar");
     props.setProperty("namingConvention", "io.ebean.config.MatchingNamingConvention");
     props.setProperty("idGeneratorAutomatic", "true");
+    props.setProperty("enabledL2Regions", "r0,users,orgs");
 
 
     serverConfig.loadFromProperties(props);
@@ -85,6 +86,7 @@ public class ServerConfigTest {
     assertEquals(PersistBatch.ALL, serverConfig.getPersistBatchOnCascade());
     assertEquals(PlatformConfig.DbUuid.BINARY, serverConfig.getPlatformConfig().getDbUuid());
     assertEquals(JsonConfig.DateTime.ISO8601, serverConfig.getJsonDateTime());
+    assertEquals("r0,users,orgs", serverConfig.getEnabledL2Regions());
 
     assertEquals(42, serverConfig.getJdbcFetchSizeFindEach());
     assertEquals(43, serverConfig.getJdbcFetchSizeFindList());
@@ -111,6 +113,9 @@ public class ServerConfigTest {
 
     assertEquals(PersistBatch.ALL, serverConfig.getPersistBatch());
     assertEquals(PersistBatch.ALL, serverConfig.getPersistBatchOnCascade());
+
+    serverConfig.setEnabledL2Regions("r0,orgs");
+    assertEquals("r0,orgs", serverConfig.getEnabledL2Regions());
   }
 
   @Test

From 8c0d6b1a72daf867a4f5b186b1760fb1bde4ddc5 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 24 Apr 2019 15:41:53 +1200
Subject: [PATCH 0812/1036] #1679 - ENH: Support enabling/disabling L2 cache by
 "region" at runtime

---
 src/test/resources/logback-test.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
index 7236805d5..82935fc18 100644
--- a/src/test/resources/logback-test.xml
+++ b/src/test/resources/logback-test.xml
@@ -86,12 +86,13 @@
   <logger name="io.ebean.TXN" level="TRACE"/>
   <logger name="io.ebean.SUM" level="TRACE"/>
 
-  <!--<logger name="io.ebean.cache.TABLEMOD" level="TRACE"/>-->
+<!--  <logger name="io.ebean.cache.REGION" level="TRACE"/>-->
+<!--  <logger name="io.ebean.cache.TABLEMOD" level="TRACE"/>-->
 
-  <!--<logger name="io.ebean.cache.QUERY" level="TRACE"/>-->
-  <!--<logger name="io.ebean.cache.BEAN" level="TRACE"/>-->
-  <!--<logger name="io.ebean.cache.NATKEY" level="TRACE"/>-->
-  <!--<logger name="io.ebean.cache.COLL" level="TRACE"/>-->
+<!--  <logger name="io.ebean.cache.QUERY" level="TRACE"/>-->
+<!--  <logger name="io.ebean.cache.BEAN" level="TRACE"/>-->
+<!--  <logger name="io.ebean.cache.NATKEY" level="TRACE"/>-->
+<!--  <logger name="io.ebean.cache.COLL" level="TRACE"/>-->
 
   <!--<logger name="io.ebeaninternal.server.deploy" level="TRACE"/>-->
 

From 5e77be6e6d56983da6efe8d9457109823b3c47bd Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 26 Apr 2019 09:16:40 +1200
Subject: [PATCH 0813/1036] Update sponsor image link for PayinTech

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 197dca9c7..b36d2d9d9 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
       </td>
       <td align="center" valign="middle">
         <a href="https://www.payintech.com/" target="_blank">
-          <img width="222px" src="https://www.payintech.com/wp-content/uploads/2015/10/PayinTech-logo-noir.png">
+          <img width="222px" src="https://ebean.io/images/sponsor_PayinTech-logo-noir.png">
         </a>
       </td>
       <td align="center" valign="middle">

From 242945aa1817a11ca35a7270623c33ff71b801df Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 26 Apr 2019 11:54:52 +1200
Subject: [PATCH 0814/1036] #1681 - Update tests for
 TestCacheViaComplexNaturalKey

---
 .../cache/TestCacheViaComplexNaturalKey.java  | 54 ++++++++++++++++---
 1 file changed, 46 insertions(+), 8 deletions(-)

diff --git a/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java b/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java
index d1a95de0b..c9352f5fc 100644
--- a/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java
+++ b/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java
@@ -8,6 +8,8 @@ import io.ebean.cache.ServerCacheManager;
 import io.ebean.cache.ServerCacheStatistics;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -17,6 +19,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestCacheViaComplexNaturalKey extends BaseTestCase {
 
+  private static final Logger log = LoggerFactory.getLogger(TestCacheViaComplexNaturalKey.class);
+
   private ServerCache beanCache = cacheManager().getBeanCache(OCachedNatKeyBean.class);
   private ServerCache natKeyCache = cacheManager().getNaturalKeyCache(OCachedNatKeyBean.class);
 
@@ -29,11 +33,8 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase {
   private static synchronized void insertSome() {
     if (!loadOnce) {
       Ebean.find(OCachedNatKeyBean.class).delete();
-
-      List<String> stores = new ArrayList<>(Arrays.asList("abc", "def"));
-      for (String store : stores) {
-        List<String> skus = new ArrayList<>(Arrays.asList("1", "2", "3", "4"));
-        for (String sku : skus) {
+      for (String store : Arrays.asList("abc", "def")) {
+        for (String sku : Arrays.asList("1", "2", "3", "4")) {
           saveBean(store, sku);
         }
       }
@@ -92,10 +93,11 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase {
     loadSomeIntoCache();
 
     String storeId = "abc";
-    List<String> skus = new ArrayList<>(Arrays.asList("1", "2", "3"));
+    List<String> skus = Arrays.asList("1", "2", "3");
 
     LoggedSqlCollector.start();
 
+    log.info("Partial (2 of 3) ...");
     List<OCachedNatKeyBean> list = Ebean.find(OCachedNatKeyBean.class)
       .where()
       .eq("store", storeId)
@@ -104,7 +106,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase {
       .orderBy("sku desc")
       .findList();
 
-    List<String> sql = LoggedSqlCollector.stop();
+    List<String> sql = LoggedSqlCollector.current();
     assertThat(sql).hasSize(1);
     if (isH2()) {
       // in clause with only 1 bind param - (sku=3 ... we got hits on sku 1 and 2)
@@ -112,9 +114,45 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase {
     }
 
     assertThat(list).hasSize(3);
-
     assertNaturalKeyHitMiss(2, 1);
     assertBeanCacheHitMiss(2, 0);
+
+    list = Ebean.find(OCachedNatKeyBean.class)
+      .where()
+      .eq("store", storeId)
+      .in("sku", skus)
+      .setUseCache(true)
+      .orderBy("sku desc")
+      .findList();
+
+    sql = LoggedSqlCollector.current();
+
+    assertThat(list).hasSize(3);
+    assertThat(sql).hasSize(0);
+    assertNaturalKeyHitMiss(3, 0);
+    assertBeanCacheHitMiss(3, 0);
+
+    natKeyCache.remove("abc;1;");
+    natKeyCache.remove("abc;3;");
+
+    log.info("Partial (1 of 3) ...");
+    list = Ebean.find(OCachedNatKeyBean.class)
+      .where()
+      .eq("store", storeId)
+      .in("sku", skus)
+      .setUseCache(true)
+      .orderBy("sku desc")
+      .findList();
+
+    sql = LoggedSqlCollector.stop();
+
+    assertThat(list).hasSize(3);
+    assertThat(sql).hasSize(1);
+    if (isH2()) {
+      assertThat(sql.get(0)).contains("where t0.store = ? and t0.sku in (?, ? )  order by t0.sku desc; --bind(abc,Array[2]={1,3})");
+    }
+    assertNaturalKeyHitMiss(1, 2);
+    assertBeanCacheHitMiss(1, 0);
   }
 
   @Test

From 65fa1c056b67d3b83317a7244627c4881acd7915 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 26 Apr 2019 12:01:16 +1200
Subject: [PATCH 0815/1036] #1681 - Support hitting L2 bean cache via ...
 findList() with `idsIn()` expression

---
 .../io/ebeaninternal/api/CacheIdLookup.java   |  52 +++++++++
 .../api/NaturalKeyQueryData.java              |  32 +++---
 .../java/io/ebeaninternal/api/SpiQuery.java   |   5 +
 .../server/core/DefaultServer.java            |  30 +++--
 .../server/core/OrmQueryRequest.java          |  12 +-
 .../server/core/SpiOrmQueryRequest.java       |   5 +
 .../server/deploy/BeanDescriptor.java         |   4 +
 .../deploy/BeanDescriptorCacheHelp.java       |  45 ++++----
 .../server/expression/IdInExpression.java     |  22 +++-
 .../server/expression/InExpression.java       |  20 ++--
 .../server/expression/InPairsExpression.java  |   1 -
 .../server/query/CQueryBindCapture.java       |   2 +-
 .../server/query/DQueryPlanOutput.java        |  18 +--
 .../server/query/QueryPlanLogger.java         |   2 +-
 .../server/querydefn/DefaultOrmQuery.java     |  20 +++-
 .../java/org/tests/cache/TestBeanCache.java   | 107 ++++++++++++++++++
 .../cache/personinfo/PersonCacheTests.java    |   6 +-
 17 files changed, 304 insertions(+), 79 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/api/CacheIdLookup.java

diff --git a/src/main/java/io/ebeaninternal/api/CacheIdLookup.java b/src/main/java/io/ebeaninternal/api/CacheIdLookup.java
new file mode 100644
index 000000000..0ae791747
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/api/CacheIdLookup.java
@@ -0,0 +1,52 @@
+package io.ebeaninternal.api;
+
+import io.ebeaninternal.server.expression.IdInExpression;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Used for bean cache lookup with where ids in expression.
+ */
+public class CacheIdLookup<T> {
+
+  private final IdInExpression idInExpression;
+
+  private int remaining;
+
+  public CacheIdLookup(IdInExpression idInExpression) {
+    this.idInExpression = idInExpression;
+  }
+
+  /**
+   * Return the Id values for the in expression.
+   */
+  public Collection<?> idValues() {
+    return idInExpression.idValues();
+  }
+
+  /**
+   * Process the hits returning the beans fetched from cache and
+   * adjusting the in expression (to not fetch the hits).
+   */
+  public List<T> removeHits(BeanCacheResult<T> cacheResult) {
+
+    Set<Object> hitIds = new HashSet<>();
+    List<T> beans = new ArrayList<>(hitIds.size());
+
+    for (BeanCacheResult.Entry<T> hit : cacheResult.hits()) {
+      hitIds.add(hit.getKey());
+      beans.add(hit.getBean());
+    }
+
+    this.remaining = idInExpression.removeIds(hitIds);
+    return beans;
+  }
+
+  public boolean allHits() {
+    return remaining == 0;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java b/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java
index 37ff3d2f2..30a1ff984 100644
--- a/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java
+++ b/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java
@@ -69,18 +69,18 @@ public class NaturalKeyQueryData<T> {
   /**
    * Match for IN expression. We only allow one IN clause.
    */
-  public List<Object> matchIn(String propName, List<Object> sourceValues) {
+  public boolean matchIn(String propName, List<Object> inValues) {
     if (hasIn) {
       // only 1 IN allowed (to project naturalIds)
-      return null;
+      return false;
     }
     if (matchProperty(propName)) {
       this.hasIn = true;
       this.inProperty = propName;
-      this.inValues = new ArrayList<>(sourceValues);
-      return this.inValues;
+      this.inValues = inValues;
+      return true;
     }
-    return null;
+    return false;
   }
 
   /**
@@ -198,21 +198,19 @@ public class NaturalKeyQueryData<T> {
     this.hitCount = hits.size();
 
     List<T> beans = new ArrayList<>(hitCount);
-
     for (BeanCacheResult.Entry<T> hit : hits) {
-      if (inValues != null) {
-        Object naturalKey = hit.getKey();
-        Object inValue = set.getInValue(naturalKey);
-        inValues.remove(inValue);
-
-      } else if (inPairs != null) {
-        Object naturalKey = hit.getKey();
-        Pairs.Entry inValue = (Pairs.Entry)set.getInValue(naturalKey);
-        inPairs.remove(inValue);
-      }
+      removeKey(set.getInValue(hit.getKey()));
       beans.add(hit.getBean());
     }
-
     return beans;
   }
+
+  private void removeKey(Object inValue) {
+    if (inValues != null) {
+      inValues.remove(inValue);
+    } else if (inPairs != null) {
+      //noinspection SuspiciousMethodCalls
+      inPairs.remove(inValue);
+    }
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/api/SpiQuery.java b/src/main/java/io/ebeaninternal/api/SpiQuery.java
index 05f4c0e79..f162e950a 100644
--- a/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -429,6 +429,11 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
    */
   void resetBeanCacheAutoMode(boolean findOne);
 
+  /**
+   * Bean cache lookup for find by ids.
+   */
+  CacheIdLookup<T> cacheIdLookup();
+
   /**
    * Collect natural key data for this query or null if the query does not match
    * the requirements of natural key lookup.
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 26b73d843..e1d35fcef 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -1071,14 +1071,21 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   <T> SpiOrmQueryRequest<T> createQueryRequest(Type type, Query<T> query, Transaction t) {
 
+    SpiOrmQueryRequest<T> request = buildQueryRequest(type, query, t);
+    request.prepareQuery();
+    return request;
+  }
+
+  <T> SpiOrmQueryRequest<T> buildQueryRequest(Type type, Query<T> query, Transaction t) {
+
     SpiQuery<T> spiQuery = (SpiQuery<T>) query;
     spiQuery.setType(type);
     spiQuery.checkNamedParameters();
 
-    return createQueryRequest(spiQuery, t);
+    return buildQueryRequest(spiQuery, t);
   }
 
-  private <T> SpiOrmQueryRequest<T> createQueryRequest(SpiQuery<T> query, Transaction t) {
+  private <T> SpiOrmQueryRequest<T> buildQueryRequest(SpiQuery<T> query, Transaction t) {
 
     if (t == null) {
       t = currentServerTransaction();
@@ -1101,10 +1108,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
       query.setOrigin(createCallStack());
     }
 
-    OrmQueryRequest<T> request = new OrmQueryRequest<>(this, queryEngine, query, (SpiTransaction) t);
-    request.prepareQuery();
-
-    return request;
+    return new OrmQueryRequest<>(this, queryEngine, query, (SpiTransaction) t);
   }
 
   /**
@@ -1175,7 +1179,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
       }
     }
 
-    SpiOrmQueryRequest<T> request = createQueryRequest(spiQuery, t);
+    SpiOrmQueryRequest<T> request = buildQueryRequest(spiQuery, t);
+    request.prepareQuery();
     if (request.isUseDocStore()) {
       return docStore().find(request);
     }
@@ -1528,15 +1533,18 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   @SuppressWarnings("unchecked")
   private <T> List<T> findList(Query<T> query, Transaction t, boolean findOne) {
 
-    SpiOrmQueryRequest<T> request = createQueryRequest(Type.LIST, query, t);
+    SpiOrmQueryRequest<T> request = buildQueryRequest(Type.LIST, query, t);
     request.resetBeanCacheAutoMode(findOne);
+    if ((t == null || !t.isSkipCache()) && request.getFromBeanCache()) {
+      // hit bean cache and got all results from cache
+      return request.getBeanCacheHits();
+    }
+
+    request.prepareQuery();
     Object result = request.getFromQueryCache();
     if (result != null) {
       return (List<T>) result;
     }
-    if ((t == null || !t.isSkipCache()) && request.getFromBeanCache()) {
-      return request.getBeanCacheHits();
-    }
     if (request.isUseDocStore()) {
       return docStore().findList(request);
     }
diff --git a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index af0f73443..7f6bb858f 100644
--- a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -16,6 +16,7 @@ import io.ebean.event.BeanQueryAdapter;
 import io.ebean.text.json.JsonReadOptions;
 import io.ebeaninternal.api.BeanCacheResult;
 import io.ebeaninternal.api.CQueryPlanKey;
+import io.ebeaninternal.api.CacheIdLookup;
 import io.ebeaninternal.api.HashQuery;
 import io.ebeaninternal.api.LoadContext;
 import io.ebeaninternal.api.NaturalKeyQueryData;
@@ -208,7 +209,8 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
   /**
    * Prepare the query and calculate the query plan key.
    */
-  void prepareQuery() {
+  @Override
+  public void prepareQuery() {
     beanDescriptor.prepareQuery(query);
     adapterPreQuery();
     this.secondaryQueries = query.convertJoins();
@@ -598,6 +600,14 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
     //    - merge the 2 results and return
     //
 
+    CacheIdLookup<T> idLookup = query.cacheIdLookup();
+    if (idLookup != null) {
+      BeanCacheResult<T> cacheResult = beanDescriptor.cacheIdLookup(persistenceContext, idLookup.idValues());
+      // adjust the query (IN clause) based on the cache hits
+      this.cacheBeans = idLookup.removeHits(cacheResult);
+      return idLookup.allHits();
+    }
+
     if (!beanDescriptor.isNaturalKeyCaching()) {
       return false;
     }
diff --git a/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
index d4195701b..81a0f520f 100644
--- a/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
@@ -29,6 +29,11 @@ public interface SpiOrmQueryRequest<T> extends BeanQueryRequest<T>, DocQueryRequ
    */
   BeanDescriptor<T> getBeanDescriptor();
 
+  /**
+   * Prepare the query for execution.
+   */
+  void prepareQuery();
+
   /**
    * This will create a local (readOnly) transaction if no current transaction
    * exists.
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index ed600488a..f190d5e3c 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -1490,6 +1490,10 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return cacheHelp.beanCacheLoad(bean, ebi, cacheKey(id), context);
   }
 
+  public BeanCacheResult<T> cacheIdLookup(PersistenceContext context, Collection<?> ids) {
+    return cacheHelp.cacheIdLookup(context, ids);
+  }
+
   /**
    * Use natural key lookup to hit the bean cache.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index b2cb88ffb..398b4a31b 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -374,27 +374,30 @@ final class BeanDescriptorCacheHelp<T> {
     return new CachedManyIds(idList);
   }
 
-//  BeanCacheResult<T> cacheIdLookup(PersistenceContext context, Collection<?> keys) {
-//
-//    Set<Object> ids = new HashSet<>(keys);
-//    Map<Object, Object> beanDataMap = beanCache.getAll(ids);
-//    if (beanLog.isTraceEnabled()) {
-//      beanLog.trace("   GET MANY {}({}) - hits:{}", cacheName, ids, beanDataMap.keySet());
-//    }
-//
-//    BeanCacheResult<T> result = new BeanCacheResult<>();
-//    // process the hits into beans etc
-//    for (Map.Entry<Object, Object> entry : beanDataMap.entrySet()) {
-//
-//      Object id = entry.getKey();
-//      CachedBeanData cachedBeanData = (CachedBeanData) entry.getValue();
-//
-//      T bean = convertToBean(id, false, context, cachedBeanData);
-//      result.add(bean, id);
-//    }
-//
-//    return result;
-//  }
+  /**
+   * Hit the bean cache with the given ids returning the hits.
+   */
+  BeanCacheResult<T> cacheIdLookup(PersistenceContext context, Collection<?> ids) {
+
+    Set<Object> keys = new HashSet<>(ids.size());
+    for (Object id : ids) {
+      keys.add(desc.cacheKey(id));
+    }
+
+    Map<Object, Object> beanDataMap = beanCache.getAll(keys);
+    if (beanLog.isTraceEnabled()) {
+      beanLog.trace("   GET MANY {}({}) - hits:{}", cacheName, ids, beanDataMap.keySet());
+    }
+
+    BeanCacheResult<T> result = new BeanCacheResult<>();
+    for (Map.Entry<Object, Object> entry : beanDataMap.entrySet()) {
+      CachedBeanData cachedBeanData = (CachedBeanData) entry.getValue();
+      T bean = convertToBean(entry.getKey(), false, context, cachedBeanData);
+      result.add(bean, desc.getBeanId(bean));
+    }
+
+    return result;
+  }
 
   /**
    * Use natural keys to hit the bean cache and return resulting hits.
diff --git a/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java b/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java
index 533388153..e37e9d150 100644
--- a/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java
@@ -9,20 +9,38 @@ import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.id.IdBinder;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
 
 /**
  * In a collection of Id values.
  */
 public class IdInExpression extends NonPrepareExpression {
 
-  private final Collection<?> idCollection;
+  private final List<Object> idCollection;
 
   private boolean multiValueIdSupported;
 
   public IdInExpression(Collection<?> idCollection) {
-    this.idCollection = idCollection;
+    this.idCollection = new ArrayList<>(idCollection);
+  }
+
+  /**
+   * Return the ids this expression is looking to fetch.
+   */
+  public Collection<Object> idValues() {
+    return idCollection;
+  }
+
+  /**
+   * Remove Ids that where obtained from l2 cache. Don't fetch these from DB.
+   */
+  public int removeIds(Set<Object> hitIds) {
+    idCollection.removeAll(hitIds);
+    return idCollection.size();
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/expression/InExpression.java b/src/main/java/io/ebeaninternal/server/expression/InExpression.java
index 656b32fe8..fa796f486 100644
--- a/src/main/java/io/ebeaninternal/server/expression/InExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/InExpression.java
@@ -63,23 +63,25 @@ class InExpression extends AbstractExpression {
     return vals;
   }
 
+  private List<Object> initBindValues() {
+    if (bindValues == null) {
+      bindValues = values();
+    }
+    return bindValues;
+  }
+
   @Override
   public boolean naturalKey(NaturalKeyQueryData<?> data) {
     // can't use naturalKey cache for NOT IN or when "empty"
     if (not || empty) {
       return false;
     }
-    List<Object> copy = data.matchIn(propName, bindValues);
-    if (copy == null) {
-      return false;
-    }
-    bindValues = copy;
-    return true;
+    return data.matchIn(propName, initBindValues());
   }
 
   @Override
   public void prepareExpression(BeanQueryRequest<?> request) {
-    bindValues = values();
+    initBindValues();
     if (bindValues.size() > 0) {
       multiValueSupported = request.isMultiValueSupported((bindValues.get(0)).getClass());
     }
@@ -146,9 +148,7 @@ class InExpression extends AbstractExpression {
 
     if (prop != null) {
       request.append(prop.getAssocIdInExpr(propName));
-      String inClause = prop.getAssocIdInValueExpr(not, bindValues.size());
-      request.append(inClause);
-
+      request.append(prop.getAssocIdInValueExpr(not, bindValues.size()));
     } else {
       request.append(propName);
       request.appendInExpression(not, bindValues);
diff --git a/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java b/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
index 07dbc2945..3dbbd10a1 100644
--- a/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
@@ -54,7 +54,6 @@ class InPairsExpression extends AbstractExpression {
 
   @Override
   public void prepareExpression(BeanQueryRequest<?> request) {
-
     // at this stage translating pairs into varchar via DB concat
     multiValueSupported = request.isMultiValueSupported(String.class);
   }
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java b/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
index 644f236fe..90c4a1e72 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
@@ -60,7 +60,7 @@ class CQueryBindCapture {
 
     DQueryPlanOutput queryPlan = planLogger.logQueryPlan(request.getConnection(), cQueryPlan, last);
     if (queryPlan != null) {
-      queryPlan.with(queryTimeMicros, captureCount, cQueryPlan.getPlanKey().toString());
+      queryPlan.with(queryTimeMicros, captureCount, cQueryPlan.getSqlHash());
       request.process(queryPlan);
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java b/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java
index cb68aa7b2..4f7716ef3 100644
--- a/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java
+++ b/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.query;
 
+import io.ebean.ProfileLocation;
 import io.ebean.meta.MetaQueryPlan;
 
 /**
@@ -9,29 +10,28 @@ class DQueryPlanOutput implements MetaQueryPlan {
 
   private final Class<?> beanType;
   private final String label;
-
+  private final ProfileLocation profileLocation;
 
   private final String sql;
-
   private final String bind;
-
   private final String plan;
 
-  private String planHash;
+  private String sqlHash;
   private long queryTimeMicros;
   private long captureCount;
 
-  DQueryPlanOutput(Class<?> beanType, String label, String sql, String bind, String plan) {
+  DQueryPlanOutput(Class<?> beanType, String label, String sql, String bind, String plan, ProfileLocation profileLocation) {
     this.beanType = beanType;
     this.label = label;
     this.sql = sql;
     this.bind = bind;
     this.plan = plan;
+    this.profileLocation = profileLocation;
   }
 
   @Override
   public String getQueryPlanHash() {
-    return planHash;
+    return sqlHash;
   }
 
   /**
@@ -94,15 +94,15 @@ class DQueryPlanOutput implements MetaQueryPlan {
 
   @Override
   public String toString() {
-    return " BeanType:" + ((beanType == null) ? "" : beanType.getSimpleName()) + " planHash:" + planHash + " label:" + label + " queryTimeMicros:" + queryTimeMicros + " captureCount:" + captureCount + "\n SQL:" + sql + "\nBIND:" + bind + "\nPLAN:" + plan;
+    return " BeanType:" + ((beanType == null) ? "" : beanType.getSimpleName()) + " planHash:" + sqlHash + " label:" + label + " queryTimeMicros:" + queryTimeMicros + " captureCount:" + captureCount + "\n SQL:" + sql + "\nBIND:" + bind + "\nPLAN:" + plan;
   }
 
   /**
    * Additionally set the query execution time and the number of bind captures.
    */
-  void with(long queryTimeMicros, long captureCount, String planHash) {
+  void with(long queryTimeMicros, long captureCount, String sqlHash) {
     this.queryTimeMicros = queryTimeMicros;
     this.captureCount = captureCount;
-    this.planHash = planHash;
+    this.sqlHash = sqlHash;
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java b/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java
index f3bbb267c..0455aaa5b 100644
--- a/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java
+++ b/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java
@@ -26,7 +26,7 @@ public abstract class QueryPlanLogger {
   }
 
   protected DQueryPlanOutput createPlan(CQueryPlan plan, String bind, String planString) {
-    return new DQueryPlanOutput(plan.getBeanType(), plan.getName(), plan.getSql(), bind, planString);
+    return new DQueryPlanOutput(plan.getBeanType(), plan.getName(), plan.getSql(), bind, planString, plan.getProfileLocation());
   }
 
   DQueryPlanOutput readQueryPlanBasic(CQueryPlan plan, BindCapture bind, ResultSet rset) throws SQLException {
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index d79455f5d..e5e1639a7 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -33,6 +33,7 @@ import io.ebean.event.readaudit.ReadEvent;
 import io.ebean.plugin.BeanType;
 import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.CQueryPlanKey;
+import io.ebeaninternal.api.CacheIdLookup;
 import io.ebeaninternal.api.HashQuery;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.NaturalKeyQueryData;
@@ -50,6 +51,7 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.InheritInfo;
 import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.expression.DefaultExpressionList;
+import io.ebeaninternal.server.expression.IdInExpression;
 import io.ebeaninternal.server.expression.SimpleExpression;
 import io.ebeaninternal.server.query.CancelableQuery;
 import io.ebeaninternal.server.query.NativeSqlQueryPlanKey;
@@ -733,6 +735,21 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return !manualId && !distinct && !singleAttribute;
   }
 
+  @Override
+  public CacheIdLookup<T> cacheIdLookup() {
+    if (whereExpressions == null) {
+      return null;
+    }
+    List<SpiExpression> underlyingList = whereExpressions.getUnderlyingList();
+    if (underlyingList.size() == 1) {
+      SpiExpression singleExpression = underlyingList.get(0);
+      if (singleExpression instanceof IdInExpression) {
+        return new CacheIdLookup<>((IdInExpression)singleExpression);
+      }
+    }
+    return null;
+  }
+
   @Override
   public NaturalKeyQueryData<T> naturalKey() {
 
@@ -1848,8 +1865,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   @Override
   public void checkNamedParameters() {
     if (namedParams != null) {
-      Collection<ONamedParam> values = namedParams.values();
-      for (ONamedParam value : values) {
+      for (ONamedParam value : namedParams.values()) {
         value.checkValueSet();
       }
     }
diff --git a/src/test/java/org/tests/cache/TestBeanCache.java b/src/test/java/org/tests/cache/TestBeanCache.java
index ed9aae7ad..42af7612f 100644
--- a/src/test/java/org/tests/cache/TestBeanCache.java
+++ b/src/test/java/org/tests/cache/TestBeanCache.java
@@ -1,13 +1,21 @@
 package org.tests.cache;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
+import io.ebean.cache.ServerCache;
+import io.ebean.cache.ServerCacheStatistics;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.tests.model.basic.Country;
 import org.tests.model.basic.OCachedBean;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertNotNull;
@@ -17,6 +25,10 @@ import static org.junit.Assert.assertNotNull;
  */
 public class TestBeanCache extends BaseTestCase {
 
+  private static final Logger log = LoggerFactory.getLogger(TestBeanCache.class);
+
+  private ServerCache beanCache = DB.getDefault().getServerCacheManager().getBeanCache(OCachedBean.class);
+
   @Test
   public void findById_when_idTypeConverted() {
 
@@ -40,7 +52,102 @@ public class TestBeanCache extends BaseTestCase {
     sql = LoggedSqlCollector.stop();
     assertNotNull(bean2);
     assertThat(sql).isEmpty();
+  }
 
+  @Test
+  public void idsInExpression() {
+
+    List<OCachedBean> beans = createBeans();
+    List<Long> ids = beans.stream().map(OCachedBean::getId).collect(Collectors.toList());
+
+    beanCache.clear();
+    beanCache.getStatistics(true);
+
+    LoggedSqlCollector.start();
+
+    log.info("All misses (0 of 3) ...");
+    List<OCachedBean> list = DB.find(OCachedBean.class)
+      .where().idIn(ids)
+      .setUseCache(true)
+      .findList();
+
+    assertThat(list).hasSize(3);
+    assertBeanCacheHitMiss(0, 3);
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(1);
+    if (isH2()) {
+      assertThat(sql.get(0)).contains("from o_cached_bean t0 where t0.id in (?, ?, ? )");
+    }
+
+    log.info("All hits (3 of 3) ...");
+    list = DB.find(OCachedBean.class)
+      .where().idIn(ids)
+      .setUseCache(true)
+      .findList();
+
+    assertBeanCacheHitMiss(3, 0);
+    assertThat(list).hasSize(3);
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(0); // no misses
+
+    // remove a bean so that we get a "partial" hit (2 out of 3 in cache)
+    beanCache.remove(beans.get(0).getId().toString());
+
+    log.info("Partial hits (2 of 3) ...");
+    list = DB.find(OCachedBean.class)
+      .where().idIn(ids)
+      .setUseCache(true)
+      .findList();
+
+    assertBeanCacheHitMiss(2, 1);
+    assertThat(list).hasSize(3);
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(1);
+    if (isH2()) {
+      // fetch the miss from DB
+      assertThat(sql.get(0)).contains("from o_cached_bean t0 where t0.id in (? )");
+    }
+
+    // remove beans so that we get a "partial" hit (1 out of 3 in cache)
+    beanCache.remove(beans.get(1).getId().toString());
+    beanCache.remove(beans.get(2).getId().toString());
+
+    log.info("Partial hits (1 of 3) ...");
+    list = DB.find(OCachedBean.class)
+      .where().idIn(ids)
+      .setUseCache(true)
+      .findList();
+
+    assertBeanCacheHitMiss(1, 2);
+    assertThat(list).hasSize(3);
+    sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(1);
+    if (isH2()) {
+      // fetch the misses from DB
+      assertThat(sql.get(0)).contains("from o_cached_bean t0 where t0.id in (?, ? )");
+    }
+  }
+
+  private void assertBeanCacheHitMiss(int hitCount, int missCount) {
+    ServerCacheStatistics statistics = beanCache.getStatistics(true);
+    assertThat(statistics.getHitCount()).isEqualTo(hitCount);
+    assertThat(statistics.getMissCount()).isEqualTo(missCount);
+  }
+
+  private List<OCachedBean> createBeans() {
+
+    List<String> names = Arrays.asList("z0", "z1", "z2");
+
+    List<OCachedBean> beans = new ArrayList<>();
+    for (String name : names) {
+      OCachedBean bean = new OCachedBean();
+      bean.setName(name);
+      beans.add(bean);
+    }
+
+    DB.saveAll(beans);
+
+    return beans;
   }
 
   @Test
diff --git a/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java b/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java
index b92949f6d..20935a319 100644
--- a/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java
+++ b/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java
@@ -68,7 +68,6 @@ public class PersonCacheTests {
     for (PersonCacheEmail email : emailList) {
       // get property that isn't in the cached data
       assertThat(email.getPersonInfo().getName()).isNotNull();
-      System.out.println(email.getPersonInfo().getName());
     }
 
     List<String> sql = LoggedSqlCollector.current();
@@ -76,7 +75,9 @@ public class PersonCacheTests {
 
     assertThat(beanCacheInfo.getStatistics(true).getHitCount()).isEqualTo(3);
 
-    log.info("Fetch again ...");
+    // force cache misses on PersonCacheEmail
+    beanCacheEmail.clear();
+    log.info("Fetch again - cache missing on PersonCacheEmail and cache hits on PersonCacheInfo ...");
 
     emailList =
       DB.find(PersonCacheEmail.class)
@@ -84,7 +85,6 @@ public class PersonCacheTests {
         .setUseCache(true)
         .findList();
 
-
     for (PersonCacheEmail email : emailList) {
       // get property but it is in the cache data now
       System.out.println(email.getPersonInfo().getName());

From b4105ab5d0902e954a233fee2bb3973b9442f2d1 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 26 Apr 2019 12:55:40 +1200
Subject: [PATCH 0816/1036] #1683 - Refactor MetaQueryPlan and
 MetaOrmQueryMetric - rename getQueryPlanHash() to getSqlHash()

---
 .../io/ebean/meta/MetaOrmQueryMetric.java     |  4 +--
 .../java/io/ebean/meta/MetaQueryPlan.java     | 34 +++++++++++++++++--
 .../server/core/DumpMetrics.java              |  2 +-
 .../server/query/CQueryPlanStats.java         |  2 +-
 .../server/query/DQueryPlanOutput.java        | 10 ++++--
 5 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/src/main/java/io/ebean/meta/MetaOrmQueryMetric.java b/src/main/java/io/ebean/meta/MetaOrmQueryMetric.java
index 23525261d..9bce29409 100644
--- a/src/main/java/io/ebean/meta/MetaOrmQueryMetric.java
+++ b/src/main/java/io/ebean/meta/MetaOrmQueryMetric.java
@@ -13,9 +13,9 @@ public interface MetaOrmQueryMetric extends MetaQueryMetric {
   boolean isAutoTuned();
 
   /**
-   * Return a string representation of the query plan hash.
+   * Return the hash of the sql.
    */
-  String getQueryPlanHash();
+  String getSqlHash();
 
   /**
    * Return the time of the last query executed using this plan.
diff --git a/src/main/java/io/ebean/meta/MetaQueryPlan.java b/src/main/java/io/ebean/meta/MetaQueryPlan.java
index f24ff94fa..6170d5a3a 100644
--- a/src/main/java/io/ebean/meta/MetaQueryPlan.java
+++ b/src/main/java/io/ebean/meta/MetaQueryPlan.java
@@ -1,23 +1,51 @@
 package io.ebean.meta;
 
+import io.ebean.ProfileLocation;
+
 public interface MetaQueryPlan {
 
+  /**
+   * Return the bean type for the query.
+   */
   Class<?> getBeanType();
 
   /**
-   * Return a string representation of the query plan hash.
+   * Return the label of the query.
    */
-  String getQueryPlanHash();
-
   String getLabel();
 
+  /**
+   * Return the profile location for the query.
+   */
+  ProfileLocation getProfileLocation();
+
+  /**
+   * Return the sql of the query.
+   */
   String getSql();
 
+  /**
+   * Return the hash of the sql.
+   */
+  String getSqlHash();
+
+  /**
+   * Return a description of the bind values.
+   */
   String getBind();
 
+  /**
+   * Return the raw plan.
+   */
   String getPlan();
 
+  /**
+   * Return the query execution time associated with the bind values capture.
+   */
   long getQueryTimeMicros();
 
+  /**
+   * Return the total count of times bind capture has occurred.
+   */
   long getCaptureCount();
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java b/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
index 6857275f9..08ee24210 100644
--- a/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
+++ b/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
@@ -113,7 +113,7 @@ class DumpMetrics {
     appendQueryName(metric, sb);
     appendCounters(metric, sb);
     if (dumpHash) {
-      sb.append("\n hash:").append(metric.getQueryPlanHash());
+      sb.append("\n hash:").append(metric.getSqlHash());
     }
     appendProfileAndSql(metric, sb);
     out(sb.toString());
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
index 25455ae37..54a8defbc 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
@@ -238,7 +238,7 @@ public final class CQueryPlanStats {
     }
 
     @Override
-    public String getQueryPlanHash() {
+    public String getSqlHash() {
       return queryPlan.getSqlHash();
     }
 
diff --git a/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java b/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java
index 4f7716ef3..fc4aa0b0a 100644
--- a/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java
+++ b/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java
@@ -30,7 +30,7 @@ class DQueryPlanOutput implements MetaQueryPlan {
   }
 
   @Override
-  public String getQueryPlanHash() {
+  public String getSqlHash() {
     return sqlHash;
   }
 
@@ -50,6 +50,11 @@ class DQueryPlanOutput implements MetaQueryPlan {
     return label;
   }
 
+  @Override
+  public ProfileLocation getProfileLocation() {
+    return profileLocation;
+  }
+
   /**
    * Return the sql of query.
    */
@@ -84,8 +89,7 @@ class DQueryPlanOutput implements MetaQueryPlan {
   }
 
   /**
-   * Return the total count of times bind capture has occurred. We don't want this to be
-   * massive as that implies a high overhead.
+   * Return the total count of times bind capture has occurred.
    */
   @Override
   public long getCaptureCount() {

From cf31830cbc263a2612bda62903db198a11d6af59 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 26 Apr 2019 13:21:19 +1200
Subject: [PATCH 0817/1036] #1677 - No effective change - Add test but not
 failing etc

---
 .../java/org/tests/model/basic/UTMaster.java  | 11 +++++++
 .../TestExplicitTransactionMode.java          | 32 +++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/src/test/java/org/tests/model/basic/UTMaster.java b/src/test/java/org/tests/model/basic/UTMaster.java
index 7cec411fe..f6c9866f1 100644
--- a/src/test/java/org/tests/model/basic/UTMaster.java
+++ b/src/test/java/org/tests/model/basic/UTMaster.java
@@ -8,6 +8,7 @@ import javax.persistence.Id;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.persistence.Version;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -22,6 +23,8 @@ public class UTMaster extends Model {
 
   String description;
 
+  LocalDate date;
+
   @Version
   Integer version;
 
@@ -52,6 +55,14 @@ public class UTMaster extends Model {
     this.name = name;
   }
 
+  public LocalDate getDate() {
+    return date;
+  }
+
+  public void setDate(LocalDate date) {
+    this.date = date;
+  }
+
   public String getDescription() {
     return description;
   }
diff --git a/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
index 9777f8139..86e939ec9 100644
--- a/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
+++ b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
@@ -1,5 +1,7 @@
 package org.tests.transaction;
 
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.BaseTestCase;
 import io.ebean.EbeanServer;
 import io.ebean.EbeanServerFactory;
@@ -12,15 +14,19 @@ import io.ebean.config.properties.PropertiesLoader;
 import io.ebean.datasource.DataSourceConfig;
 import io.ebean.datasource.DataSourcePool;
 import io.ebean.datasource.pool.ConnectionPool;
+import io.ebeaninternal.server.type.ScalarTypeLocalDate;
 import org.junit.Test;
 import org.tests.model.basic.UTDetail;
 import org.tests.model.basic.UTMaster;
 
+import java.io.IOException;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Properties;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -55,9 +61,12 @@ public class TestExplicitTransactionMode extends BaseTestCase {
     config.setDdlGenerate(true);
     config.setDdlRun(true);
     config.setDdlExtra(false);
+    config.addClass(ScalarTypeLocalDateAsString.class);
 
     EbeanServer ebeanServer = EbeanServerFactory.create(config);
 
+    testJsonScalarType(ebeanServer);
+
     Query<UTMaster> query = ebeanServer.find(UTMaster.class);
     List<UTMaster> details = query.findList();
     assertEquals(0, details.size());
@@ -105,4 +114,27 @@ public class TestExplicitTransactionMode extends BaseTestCase {
       assertEquals(3, details.size());
     }
   }
+
+  private void testJsonScalarType(EbeanServer ebeanServer) {
+    UTMaster bean = new UTMaster("one1");
+    bean.setDate(LocalDate.of(2019, 04, 20));
+
+    String json = ebeanServer.json().toJson(bean);
+    assertThat(json).isEqualTo("{\"name\":\"one1\",\"date\":\"2019-04-20\"}");
+    UTMaster jsonMaster = ebeanServer.json().toBean(UTMaster.class, json);
+    assertThat(jsonMaster.getDate()).isEqualTo(LocalDate.of(2019, 4, 20));
+  }
+
+  public static class ScalarTypeLocalDateAsString extends ScalarTypeLocalDate {
+
+    @Override
+    public LocalDate jsonRead(JsonParser parser) throws IOException {
+      return super.jsonRead(parser);
+    }
+
+    @Override
+    public void jsonWrite(JsonGenerator writer, LocalDate value) throws IOException {
+      writer.writeString(value.toString());
+    }
+  }
 }

From 28a70fa5509793068432fdc883342dd23c21098a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 26 Apr 2019 19:00:49 +1200
Subject: [PATCH 0818/1036] #1684 - ENH: Support ISO date format for JSON
 marshalling on LocalDate, sql.Date etc

---
 src/main/java/io/ebean/config/JsonConfig.java | 16 +++++
 .../java/io/ebean/config/ServerConfig.java    | 27 +++++--
 .../server/type/DefaultTypeFactory.java       | 13 ++--
 .../server/type/DefaultTypeManager.java       | 46 ++++++------
 .../server/type/ScalarTypeBaseDate.java       | 21 +++++-
 .../server/type/ScalarTypeBaseDateTime.java   |  2 +-
 .../server/type/ScalarTypeDate.java           | 10 ++-
 .../type/ScalarTypeJodaDateMidnight.java      | 11 ++-
 .../server/type/ScalarTypeJodaLocalDate.java  | 10 ++-
 .../server/type/ScalarTypeLocalDate.java      | 10 ++-
 .../server/type/ScalarTypeUtilDate.java       |  7 +-
 .../server/type/ScalarTypeYearMonthDate.java  |  9 ++-
 .../server/type/UtilDateParser.java           | 26 +++++++
 ...sonParser.java => UtilDateTimeParser.java} |  5 +-
 .../io/ebean/config/ServerConfigTest.java     |  5 ++
 .../server/type/DateTimeJsonParserTest.java   | 71 -------------------
 .../ebeaninternal/server/type/JsonTester.java |  3 +-
 .../server/type/ScalarTypeDateTest.java       | 18 ++++-
 .../type/ScalarTypeJodaLocalDateTest.java     | 15 +++-
 .../server/type/ScalarTypeLocalDateTest.java  | 24 +++++--
 .../server/type/ScalarTypeUtilDateTest.java   | 26 +++++++
 .../type/ScalarTypeYearMonthDateTest.java     | 23 ++++--
 .../server/type/UtilDateParserTest.java       | 18 +++++
 .../server/type/UtilDateTimeParserTest.java   | 44 ++++++++++++
 .../TestExplicitTransactionMode.java          | 14 +---
 src/test/resources/logback-test.xml           | 12 ++--
 26 files changed, 330 insertions(+), 156 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/type/UtilDateParser.java
 rename src/main/java/io/ebeaninternal/server/type/{DateTimeJsonParser.java => UtilDateTimeParser.java} (96%)
 delete mode 100644 src/test/java/io/ebeaninternal/server/type/DateTimeJsonParserTest.java
 create mode 100644 src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java
 create mode 100644 src/test/java/io/ebeaninternal/server/type/UtilDateParserTest.java
 create mode 100644 src/test/java/io/ebeaninternal/server/type/UtilDateTimeParserTest.java

diff --git a/src/main/java/io/ebean/config/JsonConfig.java b/src/main/java/io/ebean/config/JsonConfig.java
index bb745cac7..2ee2996d4 100644
--- a/src/main/java/io/ebean/config/JsonConfig.java
+++ b/src/main/java/io/ebean/config/JsonConfig.java
@@ -5,6 +5,22 @@ package io.ebean.config;
  */
 public abstract class JsonConfig {
 
+  /**
+   * Defined the format used for Date types.
+   */
+  public enum Date {
+
+    /**
+     * Format as epoch millis.
+     */
+    MILLIS,
+
+    /**
+     * Format as ISO-8601 date format.
+     */
+    ISO8601
+  }
+
   /**
    * Defined the format used for DateTime types.
    */
diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 9b394a03e..4b8fbbfc8 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -171,6 +171,11 @@ public class ServerConfig {
    */
   private JsonConfig.DateTime jsonDateTime = JsonConfig.DateTime.MILLIS;
 
+  /**
+   * The JSON format used for Date types. Default to millis.
+   */
+  private JsonConfig.Date jsonDate = JsonConfig.Date.MILLIS;
+
   /**
    * For writing JSON specify if null values or empty collections should be exluded.
    * By default all values are included.
@@ -683,6 +688,20 @@ public class ServerConfig {
     this.jsonDateTime = jsonDateTime;
   }
 
+  /**
+   * Return the JSON format used for Date types.
+   */
+  public JsonConfig.Date getJsonDate() {
+    return jsonDate;
+  }
+
+  /**
+   * Set the JSON format to use for Date types.
+   */
+  public void setJsonDate(JsonConfig.Date jsonDate) {
+    this.jsonDate = jsonDate;
+  }
+
   /**
    * Return the JSON include mode used when writing JSON.
    */
@@ -2988,12 +3007,8 @@ public class ServerConfig {
     queryBatchSize = p.getInt("queryBatchSize", queryBatchSize);
 
     jsonInclude = p.getEnum(JsonConfig.Include.class, "jsonInclude", jsonInclude);
-    String jsonDateTimeFormat = p.get("jsonDateTime", null);
-    if (jsonDateTimeFormat != null) {
-      jsonDateTime = JsonConfig.DateTime.valueOf(jsonDateTimeFormat);
-    } else {
-      jsonDateTime = JsonConfig.DateTime.MILLIS;
-    }
+    jsonDateTime = p.getEnum(JsonConfig.DateTime.class, "jsonDateTime", jsonDateTime);
+    jsonDate = p.getEnum(JsonConfig.Date.class, "jsonDate", jsonDate);
 
     ddlGenerate = p.getBoolean("ddl.generate", ddlGenerate);
     ddlRun = p.getBoolean("ddl.run", ddlRun);
diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeFactory.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeFactory.java
index 8d669aed6..77a69ae21 100644
--- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeFactory.java
+++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeFactory.java
@@ -79,27 +79,24 @@ public class DefaultTypeFactory {
   /**
    * Create the default ScalarType for java.util.Date.
    */
-  public ScalarType<java.util.Date> createUtilDate(JsonConfig.DateTime mode) {
+  public ScalarType<java.util.Date> createUtilDate(JsonConfig.DateTime mode, JsonConfig.Date jsonDate) {
     // by default map anonymous java.util.Date to java.sql.Timestamp.
-    // String mapType =
-    // properties.getProperty("type.mapping.java.util.Date","timestamp");
     int utilDateType = getTemporalMapType("timestamp");
-
-    return createUtilDate(mode, utilDateType);
+    return createUtilDate(mode, jsonDate, utilDateType);
   }
 
   /**
    * Create a ScalarType for java.util.Date explicitly specifying the type to
    * map to.
    */
-  public ScalarType<java.util.Date> createUtilDate(JsonConfig.DateTime mode, int utilDateType) {
+  public ScalarType<java.util.Date> createUtilDate(JsonConfig.DateTime jsonDateTime, JsonConfig.Date jsonDate, int utilDateType) {
 
     switch (utilDateType) {
       case Types.DATE:
-        return new ScalarTypeUtilDate.DateType();
+        return new ScalarTypeUtilDate.DateType(jsonDate);
 
       case Types.TIMESTAMP:
-        return new ScalarTypeUtilDate.TimestampType(mode);
+        return new ScalarTypeUtilDate.TimestampType(jsonDateTime);
 
       default:
         throw new RuntimeException("Invalid type " + utilDateType);
diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index ca630c36f..24c11e2b0 100644
--- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -130,8 +130,6 @@ public final class DefaultTypeManager implements TypeManager {
 
   private final ScalarType<?> timeType = new ScalarTypeTime();
 
-  private final ScalarType<?> dateType = new ScalarTypeDate();
-
   private final ScalarType<?> urlType = new ScalarTypeURL();
   private final ScalarType<?> uriType = new ScalarTypeURI();
   private final ScalarType<?> localeType = new ScalarTypeLocale();
@@ -143,6 +141,7 @@ public final class DefaultTypeManager implements TypeManager {
   private final ScalarType<?> classType = new ScalarTypeClass();
 
   private final JsonConfig.DateTime jsonDateTime;
+  private final JsonConfig.Date jsonDate;
 
   private final Object objectMapper;
 
@@ -189,6 +188,7 @@ public final class DefaultTypeManager implements TypeManager {
 
     this.java7Present = config.getClassLoadConfig().isJava7Present();
     this.jsonDateTime = config.getJsonDateTime();
+    this.jsonDate = config.getJsonDate();
     this.typeMap = new ConcurrentHashMap<>();
     this.nativeMap = new ConcurrentHashMap<>();
     this.logicalMap = new ConcurrentHashMap<>();
@@ -205,9 +205,9 @@ public final class DefaultTypeManager implements TypeManager {
 
     this.defaultEnumType = config.getDefaultEnumType();
 
-    initialiseStandard(jsonDateTime, config);
-    initialiseJavaTimeTypes(jsonDateTime, config);
-    initialiseJodaTypes(jsonDateTime, config);
+    initialiseStandard(config);
+    initialiseJavaTimeTypes(config);
+    initialiseJodaTypes(config);
     initialiseJacksonTypes(config);
 
     loadTypesFromProviders(config, objectMapper);
@@ -522,7 +522,7 @@ public final class DefaultTypeManager implements TypeManager {
     }
     // a util Date with jdbcType not matching server wide settings
     if (type.equals(java.util.Date.class)) {
-      return extraTypeFactory.createUtilDate(jsonDateTime, jdbcType);
+      return extraTypeFactory.createUtilDate(jsonDateTime, jsonDate, jdbcType);
     }
     // a Calendar with jdbcType not matching server wide settings
     if (type.equals(java.util.Calendar.class)) {
@@ -874,7 +874,7 @@ public final class DefaultTypeManager implements TypeManager {
     }
   }
 
-  private void initialiseJavaTimeTypes(JsonConfig.DateTime mode, ServerConfig config) {
+  private void initialiseJavaTimeTypes(ServerConfig config) {
 
     if (java7Present) {
       typeMap.put(java.nio.file.Path.class, new ScalarTypePath());
@@ -883,16 +883,16 @@ public final class DefaultTypeManager implements TypeManager {
     if (config.getClassLoadConfig().isJavaTimePresent()) {
       logger.debug("Registering java.time data types");
       addType(java.time.Period.class, new ScalarTypePeriod());
-      addType(java.time.LocalDate.class, new ScalarTypeLocalDate());
-      addType(java.time.LocalDateTime.class, new ScalarTypeLocalDateTime(mode));
-      addType(OffsetDateTime.class, new ScalarTypeOffsetDateTime(mode));
-      addType(ZonedDateTime.class, new ScalarTypeZonedDateTime(mode));
-      addType(Instant.class, new ScalarTypeInstant(mode));
+      addType(java.time.LocalDate.class, new ScalarTypeLocalDate(jsonDate));
+      addType(java.time.LocalDateTime.class, new ScalarTypeLocalDateTime(jsonDateTime));
+      addType(OffsetDateTime.class, new ScalarTypeOffsetDateTime(jsonDateTime));
+      addType(ZonedDateTime.class, new ScalarTypeZonedDateTime(jsonDateTime));
+      addType(Instant.class, new ScalarTypeInstant(jsonDateTime));
 
       addType(DayOfWeek.class, new ScalarTypeDayOfWeek());
       addType(Month.class, new ScalarTypeMonth());
       addType(Year.class, new ScalarTypeYear());
-      addType(YearMonth.class, new ScalarTypeYearMonthDate());
+      addType(YearMonth.class, new ScalarTypeYearMonthDate(jsonDate));
       addType(MonthDay.class, new ScalarTypeMonthDay());
       addType(OffsetTime.class, new ScalarTypeOffsetTime());
       addType(ZoneId.class, new ScalarTypeZoneId());
@@ -915,16 +915,16 @@ public final class DefaultTypeManager implements TypeManager {
    * Detect if Joda classes are in the classpath and if so register the Joda data types.
    */
   @SuppressWarnings("deprecation")
-  private void initialiseJodaTypes(JsonConfig.DateTime mode, ServerConfig config) {
+  private void initialiseJodaTypes(ServerConfig config) {
 
     // detect if Joda classes are in the classpath
     if (config.getClassLoadConfig().isJodaTimePresent()) {
       // Joda classes are in the classpath so register the types
       logger.debug("Registering Joda data types");
-      addType(LocalDateTime.class, new ScalarTypeJodaLocalDateTime(mode));
-      addType(DateTime.class, new ScalarTypeJodaDateTime(mode));
-      addType(LocalDate.class, new ScalarTypeJodaLocalDate());
-      addType(org.joda.time.DateMidnight.class, new ScalarTypeJodaDateMidnight());
+      addType(LocalDateTime.class, new ScalarTypeJodaLocalDateTime(jsonDateTime));
+      addType(DateTime.class, new ScalarTypeJodaDateTime(jsonDateTime));
+      addType(LocalDate.class, new ScalarTypeJodaLocalDate(jsonDate));
+      addType(org.joda.time.DateMidnight.class, new ScalarTypeJodaDateMidnight(jsonDate));
       addType(org.joda.time.Period.class, new ScalarTypeJodaPeriod());
 
       String jodaLocalTimeMode = config.getJodaLocalTimeMode();
@@ -944,7 +944,7 @@ public final class DefaultTypeManager implements TypeManager {
    * Register all the standard types supported. This is the standard JDBC types
    * plus some other common types such as java.util.Date and java.util.Calendar.
    */
-  private void initialiseStandard(JsonConfig.DateTime mode, ServerConfig config) {
+  private void initialiseStandard(ServerConfig config) {
 
     DatabasePlatform databasePlatform = config.getDatabasePlatform();
     int platformClobType = databasePlatform.getClobDbType();
@@ -952,10 +952,10 @@ public final class DefaultTypeManager implements TypeManager {
 
     nativeMap.put(DbPlatformType.HSTORE, hstoreType);
 
-    ScalarType<?> utilDateType = extraTypeFactory.createUtilDate(mode);
+    ScalarType<?> utilDateType = extraTypeFactory.createUtilDate(jsonDateTime, jsonDate);
     addType(java.util.Date.class, utilDateType);
 
-    ScalarType<?> calType = extraTypeFactory.createCalendar(mode);
+    ScalarType<?> calType = extraTypeFactory.createCalendar(jsonDateTime);
     addType(Calendar.class, calType);
 
     ScalarType<?> mathBigIntType = extraTypeFactory.createMathBigInteger();
@@ -1079,10 +1079,12 @@ public final class DefaultTypeManager implements TypeManager {
     // Temporal types
     addType(Time.class, timeType);
     nativeMap.put(Types.TIME, timeType);
+
+    ScalarTypeDate dateType = new ScalarTypeDate(jsonDate);
     addType(Date.class, dateType);
     nativeMap.put(Types.DATE, dateType);
 
-    ScalarType<?> timestampType = new ScalarTypeTimestamp(mode);
+    ScalarType<?> timestampType = new ScalarTypeTimestamp(jsonDateTime);
     addType(Timestamp.class, timestampType);
     nativeMap.put(Types.TIMESTAMP, timestampType);
   }
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
index 3806064b4..77ccf5fce 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
@@ -1,9 +1,10 @@
 package io.ebeaninternal.server.type;
 
-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
+import io.ebean.config.JsonConfig;
+import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -17,8 +18,11 @@ import java.sql.Types;
  */
 public abstract class ScalarTypeBaseDate<T> extends ScalarTypeBase<T> {
 
-  public ScalarTypeBaseDate(Class<T> type, boolean jdbcNative, int jdbcType) {
+  protected final JsonConfig.Date mode;
+
+  public ScalarTypeBaseDate(JsonConfig.Date mode, Class<T> type, boolean jdbcNative, int jdbcType) {
     super(type, jdbcNative, jdbcType);
+    this.mode = mode;
   }
 
   /**
@@ -93,9 +97,20 @@ public abstract class ScalarTypeBaseDate<T> extends ScalarTypeBase<T> {
 
   @Override
   public void jsonWrite(JsonGenerator writer, T value) throws IOException {
-    writer.writeNumber(convertToMillis(value));
+    switch(mode) {
+      case ISO8601:
+        writer.writeString(toIsoFormat(value));
+        break;
+      default:
+        writer.writeNumber(convertToMillis(value));
+    }
   }
 
+  /**
+   * Convert the value to ISO8601 format.
+   */
+  protected abstract String toIsoFormat(T value);
+
   @Override
   public DocPropertyType getDocType() {
     return DocPropertyType.DATE;
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
index af15abfa2..17f7c320b 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
@@ -19,7 +19,7 @@ import java.sql.Types;
 public abstract class ScalarTypeBaseDateTime<T> extends ScalarTypeBase<T> {
 
 
-  protected final DateTimeJsonParser dateTimeParser = new DateTimeJsonParser();
+  protected final UtilDateTimeParser dateTimeParser = new UtilDateTimeParser();
 
   protected final JsonConfig.DateTime mode;
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java
index 90d478bd9..5c9e992de 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.type;
 
+import io.ebean.config.JsonConfig;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.sql.Date;
@@ -11,8 +12,13 @@ import java.sql.Types;
  */
 public class ScalarTypeDate extends ScalarTypeBaseDate<java.sql.Date> {
 
-  public ScalarTypeDate() {
-    super(Date.class, true, Types.DATE);
+  public ScalarTypeDate(JsonConfig.Date mode) {
+    super(mode, Date.class, true, Types.DATE);
+  }
+
+  @Override
+  protected String toIsoFormat(Date value) {
+    return value.toLocalDate().toString();
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java
index 105db9d07..bebd64de7 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java
@@ -1,6 +1,8 @@
 package io.ebeaninternal.server.type;
 
+import io.ebean.config.JsonConfig;
 import io.ebeaninternal.server.core.BasicTypeConverter;
+import org.joda.time.DateMidnight;
 
 import java.sql.Date;
 import java.sql.Types;
@@ -14,8 +16,13 @@ public class ScalarTypeJodaDateMidnight extends ScalarTypeBaseDate<org.joda.time
   /**
    * Instantiates a new scalar type joda date midnight.
    */
-  public ScalarTypeJodaDateMidnight() {
-    super(org.joda.time.DateMidnight.class, false, Types.DATE);
+  public ScalarTypeJodaDateMidnight(JsonConfig.Date mode) {
+    super(mode, org.joda.time.DateMidnight.class, false, Types.DATE);
+  }
+
+  @Override
+  protected String toIsoFormat(DateMidnight value) {
+    return value.toString();
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
index 7c2d6a5db..e69bb1697 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.type;
 
+import io.ebean.config.JsonConfig;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 import org.joda.time.LocalDate;
 
@@ -11,8 +12,13 @@ import java.sql.Types;
  */
 public class ScalarTypeJodaLocalDate extends ScalarTypeBaseDate<LocalDate> {
 
-  public ScalarTypeJodaLocalDate() {
-    super(LocalDate.class, false, Types.DATE);
+  public ScalarTypeJodaLocalDate(JsonConfig.Date mode) {
+    super(mode, LocalDate.class, false, Types.DATE);
+  }
+
+  @Override
+  protected String toIsoFormat(LocalDate value) {
+    return value.toString();
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
index bcb482bae..8b90b9208 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.type;
 
+import io.ebean.config.JsonConfig;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.sql.Date;
@@ -14,8 +15,12 @@ import java.time.ZonedDateTime;
  */
 public class ScalarTypeLocalDate extends ScalarTypeBaseDate<LocalDate> {
 
-  public ScalarTypeLocalDate() {
-    super(LocalDate.class, false, Types.DATE);
+  public ScalarTypeLocalDate(JsonConfig.Date mode) {
+    super(mode, LocalDate.class, false, Types.DATE);
+  }
+
+  protected String toIsoFormat(LocalDate value) {
+    return value.toString();
   }
 
   @Override
@@ -55,5 +60,4 @@ public class ScalarTypeLocalDate extends ScalarTypeBaseDate<LocalDate> {
     return new Timestamp(systemTimeMillis).toLocalDateTime().toLocalDate();
   }
 
-
 }
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
index 034a77902..0d02b81dc 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
@@ -82,10 +82,13 @@ public class ScalarTypeUtilDate {
 
   public static class DateType extends ScalarTypeBaseDate<java.util.Date> {
 
-    public DateType() {
-      super(Date.class, false, Types.DATE);
+    public DateType(JsonConfig.Date mode) {
+      super(mode, Date.class, false, Types.DATE);
     }
 
+    protected String toIsoFormat(java.util.Date value) {
+      return UtilDateParser.format(value);
+    }
 
     @Override
     public long convertToMillis(java.util.Date value) {
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java
index 175fd6be9..053950ab7 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.type;
 
+import io.ebean.config.JsonConfig;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.sql.Date;
@@ -15,8 +16,12 @@ import java.time.ZonedDateTime;
  */
 public class ScalarTypeYearMonthDate extends ScalarTypeBaseDate<YearMonth> {
 
-  public ScalarTypeYearMonthDate() {
-    super(YearMonth.class, false, Types.DATE);
+  public ScalarTypeYearMonthDate(JsonConfig.Date mode) {
+    super(mode, YearMonth.class, false, Types.DATE);
+  }
+
+  protected String toIsoFormat(YearMonth value) {
+    return value.atDay(1).toString();
   }
 
   protected LocalDate toLocalDate(YearMonth yearMonth) {
diff --git a/src/main/java/io/ebeaninternal/server/type/UtilDateParser.java b/src/main/java/io/ebeaninternal/server/type/UtilDateParser.java
new file mode 100644
index 000000000..a420f7ecc
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/type/UtilDateParser.java
@@ -0,0 +1,26 @@
+package io.ebeaninternal.server.type;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+class UtilDateParser {
+
+  private static final SimpleDateFormat dateTimeProto = new SimpleDateFormat("yyyy-MM-dd");
+
+  private static SimpleDateFormat formatter() {
+    return (SimpleDateFormat) dateTimeProto.clone();
+  }
+
+  static Date parse(String jsonDateTime) {
+    try {
+      return formatter().parse(jsonDateTime);
+    } catch (ParseException e) {
+      throw new RuntimeException("Error parsing Date[" + jsonDateTime + "]", e);
+    }
+  }
+
+  static String format(Date value) {
+    return formatter().format(value);
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/type/DateTimeJsonParser.java b/src/main/java/io/ebeaninternal/server/type/UtilDateTimeParser.java
similarity index 96%
rename from src/main/java/io/ebeaninternal/server/type/DateTimeJsonParser.java
rename to src/main/java/io/ebeaninternal/server/type/UtilDateTimeParser.java
index 89e5a5bbb..3b4a8ff84 100644
--- a/src/main/java/io/ebeaninternal/server/type/DateTimeJsonParser.java
+++ b/src/main/java/io/ebeaninternal/server/type/UtilDateTimeParser.java
@@ -6,15 +6,14 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.TimeZone;
 
-public class DateTimeJsonParser {
+class UtilDateTimeParser {
 
   private final SimpleDateFormat dateTimeProto20;
   private final SimpleDateFormat dateTimeProto22;
   private final SimpleDateFormat dateTimeProto23;
   private final SimpleDateFormat dateTimeProto24;
 
-
-  public DateTimeJsonParser() {
+  UtilDateTimeParser() {
     dateTimeProto20 = init("yyyy-MM-dd'T'HH:mm:ss'Z'");
     dateTimeProto22 = init("yyyy-MM-dd'T'HH:mm:ss.S'Z'");
     dateTimeProto23 = init("yyyy-MM-dd'T'HH:mm:ss.SS'Z'");
diff --git a/src/test/java/io/ebean/config/ServerConfigTest.java b/src/test/java/io/ebean/config/ServerConfigTest.java
index 52965604d..ef62979ea 100644
--- a/src/test/java/io/ebean/config/ServerConfigTest.java
+++ b/src/test/java/io/ebean/config/ServerConfigTest.java
@@ -61,6 +61,7 @@ public class ServerConfigTest {
     props.setProperty("backgroundExecutorSchedulePoolSize", "4");
     props.setProperty("dbOffline", "true");
     props.setProperty("jsonDateTime", "ISO8601");
+    props.setProperty("jsonDate", "ISO8601");
     props.setProperty("autoReadOnlyDataSource", "true");
     props.setProperty("disableL2Cache", "true");
     props.setProperty("notifyL2CacheInForeground", "true");
@@ -86,6 +87,8 @@ public class ServerConfigTest {
     assertEquals(PersistBatch.ALL, serverConfig.getPersistBatchOnCascade());
     assertEquals(PlatformConfig.DbUuid.BINARY, serverConfig.getPlatformConfig().getDbUuid());
     assertEquals(JsonConfig.DateTime.ISO8601, serverConfig.getJsonDateTime());
+    assertEquals(JsonConfig.Date.ISO8601, serverConfig.getJsonDate());
+
     assertEquals("r0,users,orgs", serverConfig.getEnabledL2Regions());
 
     assertEquals(42, serverConfig.getJdbcFetchSizeFindEach());
@@ -126,6 +129,8 @@ public class ServerConfigTest {
 
     serverConfig.setIdGeneratorAutomatic(false);
     assertFalse(serverConfig.isIdGeneratorAutomatic());
+    assertEquals(JsonConfig.DateTime.MILLIS, serverConfig.getJsonDateTime());
+    assertEquals(JsonConfig.Date.MILLIS, serverConfig.getJsonDate());
   }
 
   @Test
diff --git a/src/test/java/io/ebeaninternal/server/type/DateTimeJsonParserTest.java b/src/test/java/io/ebeaninternal/server/type/DateTimeJsonParserTest.java
deleted file mode 100644
index a82e8a417..000000000
--- a/src/test/java/io/ebeaninternal/server/type/DateTimeJsonParserTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package io.ebeaninternal.server.type;
-
-
-import org.junit.Test;
-
-import java.sql.Timestamp;
-
-import static org.assertj.core.api.StrictAssertions.assertThat;
-
-public class DateTimeJsonParserTest {
-
-  @Test
-  public void parseFormat_when_hasMillis() throws Exception {
-
-    DateTimeJsonParser parser = new DateTimeJsonParser();
-
-    String input = "2016-02-28T20:39:00.123Z";
-    String formatted = parseAndFormat(parser, input);
-
-    assertThat(formatted).isEqualTo("2016-02-28T20:39:00.123Z");
-  }
-
-  @Test
-  public void parseFormat_when_noMillis() throws Exception {
-
-    DateTimeJsonParser parser = new DateTimeJsonParser();
-
-    String input = "2016-02-28T20:39:00Z";
-    String formatted = parseAndFormat(parser, input);
-
-    assertThat(formatted).isEqualTo("2016-02-28T20:39:00.000Z");
-  }
-
-  @Test
-  public void parseFormat_when_millis_1dp() throws Exception {
-
-    DateTimeJsonParser parser = new DateTimeJsonParser();
-
-    String input = "2016-02-28T20:39:00.0Z";
-    String formatted = parseAndFormat(parser, input);
-
-    assertThat(formatted).isEqualTo("2016-02-28T20:39:00.000Z");
-  }
-
-  @Test
-  public void parseFormat_when_millis_2dp() throws Exception {
-
-    DateTimeJsonParser parser = new DateTimeJsonParser();
-
-    String input = "2016-02-28T20:39:00.00Z";
-    String formatted = parseAndFormat(parser, input);
-
-    assertThat(formatted).isEqualTo("2016-02-28T20:39:00.000Z");
-  }
-
-  @Test
-  public void parseFormat_when_millis_3dp() throws Exception {
-
-    DateTimeJsonParser parser = new DateTimeJsonParser();
-
-    String input = "2016-02-28T20:39:00.000Z";
-    String formatted = parseAndFormat(parser, input);
-
-    assertThat(formatted).isEqualTo("2016-02-28T20:39:00.000Z");
-  }
-
-  private String parseAndFormat(DateTimeJsonParser parser, String input) {
-    Timestamp timestamp = parser.parse(input);
-    return parser.format(timestamp);
-  }
-}
diff --git a/src/test/java/io/ebeaninternal/server/type/JsonTester.java b/src/test/java/io/ebeaninternal/server/type/JsonTester.java
index 83257d69c..de6f2e324 100644
--- a/src/test/java/io/ebeaninternal/server/type/JsonTester.java
+++ b/src/test/java/io/ebeaninternal/server/type/JsonTester.java
@@ -25,7 +25,7 @@ public class JsonTester<T> {
     this.type = type;
   }
 
-  public void test(T value) throws IOException {
+  public String test(T value) throws IOException {
 
     StringWriter writer = new StringWriter();
 
@@ -48,5 +48,6 @@ public class JsonTester<T> {
     T val1 = type.jsonRead(parser);
     assertEquals(value, val1);
 
+    return writer.toString();
   }
 }
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java
index 14b0e8b4d..5e938c854 100644
--- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java
@@ -1,14 +1,18 @@
 package io.ebeaninternal.server.type;
 
+import io.ebean.config.JsonConfig;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.sql.Date;
+import java.time.LocalDate;
 
+import static org.assertj.core.api.StrictAssertions.assertThat;
 import static org.junit.Assert.assertEquals;
 
 public class ScalarTypeDateTest {
 
-  ScalarTypeDate type = new ScalarTypeDate();
+  private ScalarTypeDate type = new ScalarTypeDate(JsonConfig.Date.MILLIS);
 
   @Test
   public void formatParse_PG_DATE_POSITIVE_INFINITY() {
@@ -19,4 +23,16 @@ public class ScalarTypeDateTest {
     Date parsed = type.parse(format);
     assertEquals(parsed, postgresInfinityDate);
   }
+
+  @Test
+  public void json() throws IOException {
+
+    Date val = Date.valueOf(LocalDate.of(2019, 5, 9));
+
+    JsonTester<Date> jsonMillis = new JsonTester<>(type);
+    assertThat(jsonMillis.test(val)).isEqualTo("{\"key\":1557316800000}");
+
+    JsonTester<Date> jsonIso = new JsonTester<>(new ScalarTypeDate(JsonConfig.Date.ISO8601));
+    assertThat(jsonIso.test(val)).isEqualTo("{\"key\":\"2019-05-09\"}");
+  }
 }
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java
index 60ee1c92d..c5b5bbdb3 100644
--- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java
@@ -1,8 +1,10 @@
 package io.ebeaninternal.server.type;
 
+import io.ebean.config.JsonConfig;
 import org.joda.time.LocalDate;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.sql.Date;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -10,7 +12,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class ScalarTypeJodaLocalDateTest {
 
-  private ScalarTypeJodaLocalDate type = new ScalarTypeJodaLocalDate();
+  private ScalarTypeJodaLocalDate type = new ScalarTypeJodaLocalDate(JsonConfig.Date.MILLIS);
 
   @Test
   public void convertToMillis_convertFromMillis() {
@@ -58,4 +60,15 @@ public class ScalarTypeJodaLocalDateTest {
     assertThat(beanType).isEqualTo(localDate);
   }
 
+  @Test
+  public void json() throws IOException {
+
+    LocalDate val = new LocalDate(2019, 5, 9);
+
+    JsonTester<LocalDate> jsonMillis = new JsonTester<>(type);
+    assertThat(jsonMillis.test(val)).isEqualTo("{\"key\":1557316800000}");
+
+    JsonTester<LocalDate> jsonIso = new JsonTester<>(new ScalarTypeJodaLocalDate(JsonConfig.Date.ISO8601) );
+    assertThat(jsonIso.test(val)).isEqualTo("{\"key\":\"2019-05-09\"}");
+  }
 }
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java
index 92386ba4a..e9250a30f 100644
--- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java
@@ -1,19 +1,22 @@
 package io.ebeaninternal.server.type;
 
+import io.ebean.config.JsonConfig;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.sql.Date;
 import java.time.LocalDate;
 
+import static org.assertj.core.api.StrictAssertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 public class ScalarTypeLocalDateTest {
 
-  ScalarTypeLocalDate type = new ScalarTypeLocalDate();
+  ScalarTypeLocalDate type = new ScalarTypeLocalDate(JsonConfig.Date.MILLIS);
 
   @Test
-  public void testConvertToMillis() throws Exception {
+  public void testConvertToMillis() {
 
     LocalDate date = LocalDate.of(2014, 5, 20);
     long millis = type.convertToMillis(date);
@@ -23,7 +26,7 @@ public class ScalarTypeLocalDateTest {
   }
 
   @Test
-  public void testConvertFromDate() throws Exception {
+  public void testConvertFromDate() {
 
     LocalDate localDate = LocalDate.now();
     Date date = Date.valueOf(localDate);
@@ -37,7 +40,7 @@ public class ScalarTypeLocalDateTest {
 
 
   @Test
-  public void testToJdbcType() throws Exception {
+  public void testToJdbcType() {
 
     LocalDate localDate = LocalDate.now();
     Object o = type.toJdbcType(localDate);
@@ -45,7 +48,7 @@ public class ScalarTypeLocalDateTest {
   }
 
   @Test
-  public void testToBeanType() throws Exception {
+  public void testToBeanType() {
 
     LocalDate localDate = LocalDate.now();
     Date date = Date.valueOf(localDate);
@@ -54,4 +57,15 @@ public class ScalarTypeLocalDateTest {
     assertEquals(localDate, localDate1);
   }
 
+  @Test
+  public void json() throws IOException {
+
+    LocalDate val = LocalDate.of(2019, 5, 9);
+
+    JsonTester<LocalDate> jsonMillis = new JsonTester<>(type);
+    assertThat(jsonMillis.test(val)).isEqualTo("{\"key\":1557316800000}");
+
+    JsonTester<LocalDate> jsonIso = new JsonTester<>(new ScalarTypeLocalDate(JsonConfig.Date.ISO8601) );
+    assertThat(jsonIso.test(val)).isEqualTo("{\"key\":\"2019-05-09\"}");
+  }
 }
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java
new file mode 100644
index 000000000..4d614655e
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java
@@ -0,0 +1,26 @@
+package io.ebeaninternal.server.type;
+
+import io.ebean.config.JsonConfig;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.Date;
+
+import static org.assertj.core.api.StrictAssertions.assertThat;
+
+public class ScalarTypeUtilDateTest {
+
+  private ScalarTypeUtilDate.DateType dateType = new ScalarTypeUtilDate.DateType(JsonConfig.Date.MILLIS);
+
+  @Test
+  public void json() throws IOException {
+
+    Date val = dateType.parse("2019-05-09");
+
+    JsonTester<Date> jsonMillis = new JsonTester<>(dateType);
+    assertThat(jsonMillis.test(val)).isEqualTo("{\"key\":1557316800000}");
+
+    JsonTester<Date> jsonIso = new JsonTester<>(new ScalarTypeUtilDate.DateType(JsonConfig.Date.ISO8601) );
+    assertThat(jsonIso.test(val)).isEqualTo("{\"key\":\"2019-05-09\"}");
+  }
+}
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java
index d449a2a1a..fc57ab04f 100644
--- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java
@@ -1,19 +1,22 @@
 package io.ebeaninternal.server.type;
 
+import io.ebean.config.JsonConfig;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.sql.Date;
 import java.time.LocalDate;
 import java.time.YearMonth;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 
 public class ScalarTypeYearMonthDateTest {
 
-  ScalarTypeYearMonthDate type = new ScalarTypeYearMonthDate();
+  private ScalarTypeYearMonthDate type = new ScalarTypeYearMonthDate(JsonConfig.Date.MILLIS);
 
   @Test
-  public void testConvertFromMillis() throws Exception {
+  public void testConvertFromMillis() {
 
     LocalDate today = LocalDate.now();
     LocalDate firstMonthDay = today.withDayOfMonth(1);
@@ -27,7 +30,7 @@ public class ScalarTypeYearMonthDateTest {
   }
 
   @Test
-  public void testConvertDate() throws Exception {
+  public void testConvertDate() {
 
     LocalDate today = LocalDate.now();
     LocalDate firstMonthDay = today.withDayOfMonth(1);
@@ -40,7 +43,7 @@ public class ScalarTypeYearMonthDateTest {
 
 
   @Test
-  public void testToJdbcType() throws Exception {
+  public void testToJdbcType() {
 
     LocalDate today = LocalDate.now();
     LocalDate firstMonthDay = today.withDayOfMonth(1);
@@ -51,4 +54,16 @@ public class ScalarTypeYearMonthDateTest {
     assertEquals(date, val1);
   }
 
+  @Test
+  public void json() throws IOException {
+
+    YearMonth val = YearMonth.of(2019, 5);
+
+    JsonTester<YearMonth> jsonMillis = new JsonTester<>(type);
+    assertThat(jsonMillis.test(val)).isEqualTo("{\"key\":1556625600000}");
+
+    JsonTester<YearMonth> jsonIso = new JsonTester<>(new ScalarTypeYearMonthDate(JsonConfig.Date.ISO8601) );
+    assertThat(jsonIso.test(val)).isEqualTo("{\"key\":\"2019-05-01\"}");
+  }
+
 }
diff --git a/src/test/java/io/ebeaninternal/server/type/UtilDateParserTest.java b/src/test/java/io/ebeaninternal/server/type/UtilDateParserTest.java
new file mode 100644
index 000000000..50131893b
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/type/UtilDateParserTest.java
@@ -0,0 +1,18 @@
+package io.ebeaninternal.server.type;
+
+import org.junit.Test;
+
+import java.util.Date;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class UtilDateParserTest {
+
+  @Test
+  public void parse() {
+
+    Date val = UtilDateParser.parse("2019-05-09");
+    String format = UtilDateParser.format(val);
+    assertThat(format).isEqualTo("2019-05-09");
+  }
+}
diff --git a/src/test/java/io/ebeaninternal/server/type/UtilDateTimeParserTest.java b/src/test/java/io/ebeaninternal/server/type/UtilDateTimeParserTest.java
new file mode 100644
index 000000000..c27e73810
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/type/UtilDateTimeParserTest.java
@@ -0,0 +1,44 @@
+package io.ebeaninternal.server.type;
+
+
+import org.junit.Test;
+
+import java.sql.Timestamp;
+
+import static org.assertj.core.api.StrictAssertions.assertThat;
+
+public class UtilDateTimeParserTest {
+
+  private UtilDateTimeParser parser = new UtilDateTimeParser();
+
+  @Test
+  public void parseFormat_when_hasMillis() {
+    parseAndFormat("2016-02-28T20:39:00.123Z", "2016-02-28T20:39:00.123Z");
+  }
+
+  @Test
+  public void parseFormat_when_noMillis() {
+    parseAndFormat("2016-02-28T20:39:00Z", "2016-02-28T20:39:00.000Z");
+  }
+
+  @Test
+  public void parseFormat_when_millis_1dp() {
+    parseAndFormat("2016-02-28T20:39:00.0Z", "2016-02-28T20:39:00.000Z");
+  }
+
+  @Test
+  public void parseFormat_when_millis_2dp() {
+    parseAndFormat("2016-02-28T20:39:00.00Z", "2016-02-28T20:39:00.000Z");
+  }
+
+  @Test
+  public void parseFormat_when_millis_3dp() {
+    parseAndFormat("2016-02-28T20:39:00.000Z", "2016-02-28T20:39:00.000Z");
+  }
+
+  private void parseAndFormat(String input, String expected) {
+    Timestamp timestamp = parser.parse(input);
+    String format = parser.format(timestamp);
+    assertThat(format).isEqualTo(expected);
+  }
+}
diff --git a/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
index 86e939ec9..66da8f645 100644
--- a/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
+++ b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
@@ -1,7 +1,5 @@
 package org.tests.transaction;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.BaseTestCase;
 import io.ebean.EbeanServer;
 import io.ebean.EbeanServerFactory;
@@ -9,6 +7,7 @@ import io.ebean.Query;
 import io.ebean.Transaction;
 import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
+import io.ebean.config.JsonConfig;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.properties.PropertiesLoader;
 import io.ebean.datasource.DataSourceConfig;
@@ -19,7 +18,6 @@ import org.junit.Test;
 import org.tests.model.basic.UTDetail;
 import org.tests.model.basic.UTMaster;
 
-import java.io.IOException;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.time.LocalDate;
@@ -127,14 +125,8 @@ public class TestExplicitTransactionMode extends BaseTestCase {
 
   public static class ScalarTypeLocalDateAsString extends ScalarTypeLocalDate {
 
-    @Override
-    public LocalDate jsonRead(JsonParser parser) throws IOException {
-      return super.jsonRead(parser);
-    }
-
-    @Override
-    public void jsonWrite(JsonGenerator writer, LocalDate value) throws IOException {
-      writer.writeString(value.toString());
+    public ScalarTypeLocalDateAsString() {
+      super(JsonConfig.Date.ISO8601);
     }
   }
 }
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
index 82935fc18..d5aba8ffa 100644
--- a/src/test/resources/logback-test.xml
+++ b/src/test/resources/logback-test.xml
@@ -86,13 +86,13 @@
   <logger name="io.ebean.TXN" level="TRACE"/>
   <logger name="io.ebean.SUM" level="TRACE"/>
 
-<!--  <logger name="io.ebean.cache.REGION" level="TRACE"/>-->
-<!--  <logger name="io.ebean.cache.TABLEMOD" level="TRACE"/>-->
+  <logger name="io.ebean.cache.REGION" level="TRACE"/>
+  <logger name="io.ebean.cache.TABLEMOD" level="TRACE"/>
 
-<!--  <logger name="io.ebean.cache.QUERY" level="TRACE"/>-->
-<!--  <logger name="io.ebean.cache.BEAN" level="TRACE"/>-->
-<!--  <logger name="io.ebean.cache.NATKEY" level="TRACE"/>-->
-<!--  <logger name="io.ebean.cache.COLL" level="TRACE"/>-->
+  <logger name="io.ebean.cache.QUERY" level="TRACE"/>
+  <logger name="io.ebean.cache.BEAN" level="TRACE"/>
+  <logger name="io.ebean.cache.NATKEY" level="TRACE"/>
+  <logger name="io.ebean.cache.COLL" level="TRACE"/>
 
   <!--<logger name="io.ebeaninternal.server.deploy" level="TRACE"/>-->
 

From d3ead5d2f9fb2bb556661c4875c9c7c5d59f2d73 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 26 Apr 2019 19:01:16 +1200
Subject: [PATCH 0819/1036] #1684 - ENH: Support ISO date format for JSON
 marshalling on LocalDate, sql.Date etc

---
 src/test/resources/logback-test.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
index d5aba8ffa..25a339db8 100644
--- a/src/test/resources/logback-test.xml
+++ b/src/test/resources/logback-test.xml
@@ -82,17 +82,17 @@
   <!--<logger name="org.avaje.docker" level="TRACE"/>-->
   <!--<logger name="io.ebean.DDL" level="DEBUG"/>-->
 
-  <logger name="io.ebean.SQL" level="TRACE"/>
-  <logger name="io.ebean.TXN" level="TRACE"/>
-  <logger name="io.ebean.SUM" level="TRACE"/>
+<!--  <logger name="io.ebean.SQL" level="TRACE"/>-->
+<!--  <logger name="io.ebean.TXN" level="TRACE"/>-->
+<!--  <logger name="io.ebean.SUM" level="TRACE"/>-->
 
-  <logger name="io.ebean.cache.REGION" level="TRACE"/>
-  <logger name="io.ebean.cache.TABLEMOD" level="TRACE"/>
+<!--  <logger name="io.ebean.cache.REGION" level="TRACE"/>-->
+<!--  <logger name="io.ebean.cache.TABLEMOD" level="TRACE"/>-->
 
-  <logger name="io.ebean.cache.QUERY" level="TRACE"/>
-  <logger name="io.ebean.cache.BEAN" level="TRACE"/>
-  <logger name="io.ebean.cache.NATKEY" level="TRACE"/>
-  <logger name="io.ebean.cache.COLL" level="TRACE"/>
+<!--  <logger name="io.ebean.cache.QUERY" level="TRACE"/>-->
+<!--  <logger name="io.ebean.cache.BEAN" level="TRACE"/>-->
+<!--  <logger name="io.ebean.cache.NATKEY" level="TRACE"/>-->
+<!--  <logger name="io.ebean.cache.COLL" level="TRACE"/>-->
 
   <!--<logger name="io.ebeaninternal.server.deploy" level="TRACE"/>-->
 

From 25e6d05542225b47691984919ea4f8ca146ff464 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 27 Apr 2019 00:34:45 +1200
Subject: [PATCH 0820/1036] #1685 - Add support for `MetaCounterMetric`s and
 refactor DefaultServerCache to use them

---
 src/main/java/io/ebean/cache/ServerCache.java |   9 ++
 .../io/ebean/cache/ServerCacheConfig.java     |  11 +-
 .../io/ebean/cache/ServerCacheManager.java    |   7 +
 .../io/ebean/cache/ServerCacheStatistics.java | 108 ++-------------
 .../io/ebean/meta/AbstractMetricVisitor.java  |   9 +-
 .../io/ebean/meta/BasicMetricVisitor.java     |  17 ++-
 .../java/io/ebean/meta/MetaCountMetric.java   |  23 +++
 .../java/io/ebean/meta/MetricVisitor.java     |  10 ++
 .../java/io/ebean/meta/ServerMetrics.java     |   6 +
 src/main/java/io/ebean/meta/SortMetric.java   |  34 +++--
 .../java/io/ebean/metric/CountMetric.java     |  39 ++++++
 .../io/ebean/metric/CountMetricStats.java     |   6 +
 .../java/io/ebean/metric/MetricFactory.java   |   5 +
 .../server/cache/DefaultCacheAdapter.java     |   6 +
 .../server/cache/DefaultCacheHolder.java      |  47 +++++--
 .../server/cache/DefaultServerCache.java      | 131 ++++++++----------
 .../cache/DefaultServerCacheConfig.java       |   4 +
 .../cache/DefaultServerCacheManager.java      |  24 ++--
 .../server/cache/SpiCacheManager.java         |   6 +
 .../server/core/DefaultMetaInfoManager.java   |   8 +-
 .../server/core/DefaultServer.java            |   3 +
 .../server/core/DumpMetrics.java              |  18 +++
 .../server/profile/DCountMetric.java          |  90 ++++++++++++
 .../server/profile/DMetricFactory.java        |   6 +
 src/test/java/io/ebean/DtoQueryTest.java      |   2 +-
 src/test/java/io/ebean/NamedDtoQueryTest.java |   2 +-
 .../server/cache/DefaultCacheHolderTest.java  |  26 ++--
 .../cache/DefaultServerCacheConfigTest.java   |   2 +-
 .../cache/DefaultServerCacheManagerTest.java  |  21 +--
 .../server/cache/DefaultServerCacheTest.java  |   2 +-
 .../DefaultServerCache_RunEvictionTest.java   |   2 +-
 31 files changed, 449 insertions(+), 235 deletions(-)
 create mode 100644 src/main/java/io/ebean/meta/MetaCountMetric.java
 create mode 100644 src/main/java/io/ebean/metric/CountMetric.java
 create mode 100644 src/main/java/io/ebean/metric/CountMetricStats.java
 create mode 100644 src/main/java/io/ebeaninternal/server/profile/DCountMetric.java

diff --git a/src/main/java/io/ebean/cache/ServerCache.java b/src/main/java/io/ebean/cache/ServerCache.java
index 438817f4b..82bd452b0 100644
--- a/src/main/java/io/ebean/cache/ServerCache.java
+++ b/src/main/java/io/ebean/cache/ServerCache.java
@@ -1,5 +1,7 @@
 package io.ebean.cache;
 
+import io.ebean.meta.MetricVisitor;
+
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
@@ -79,4 +81,11 @@ public interface ServerCache {
    * @param reset if true the statistics are reset.
    */
   ServerCacheStatistics getStatistics(boolean reset);
+
+  /**
+   * Visit the metrics for the cache.
+   */
+  default void visit(MetricVisitor visitor) {
+    // do nothing by default
+  }
 }
diff --git a/src/main/java/io/ebean/cache/ServerCacheConfig.java b/src/main/java/io/ebean/cache/ServerCacheConfig.java
index a2a6d5c52..f5e429299 100644
--- a/src/main/java/io/ebean/cache/ServerCacheConfig.java
+++ b/src/main/java/io/ebean/cache/ServerCacheConfig.java
@@ -9,13 +9,15 @@ public class ServerCacheConfig {
 
   private final ServerCacheType type;
   private final String cacheKey;
+  private final String shortName;
   private final ServerCacheOptions cacheOptions;
   private final CurrentTenantProvider tenantProvider;
   private final QueryCacheEntryValidate queryCacheEntryValidate;
 
-  public ServerCacheConfig(ServerCacheType type, String cacheKey, ServerCacheOptions cacheOptions, CurrentTenantProvider tenantProvider, QueryCacheEntryValidate queryCacheEntryValidate) {
+  public ServerCacheConfig(ServerCacheType type, String cacheKey, String shortName, ServerCacheOptions cacheOptions, CurrentTenantProvider tenantProvider, QueryCacheEntryValidate queryCacheEntryValidate) {
     this.type = type;
     this.cacheKey = cacheKey;
+    this.shortName = shortName;
     this.cacheOptions = cacheOptions;
     this.tenantProvider = tenantProvider;
     this.queryCacheEntryValidate = queryCacheEntryValidate;
@@ -35,6 +37,13 @@ public class ServerCacheConfig {
     return cacheKey;
   }
 
+  /**
+   * Return the short name for the cache.
+   */
+  public String getShortName() {
+    return shortName;
+  }
+
   /**
    * Return the tuning options.
    */
diff --git a/src/main/java/io/ebean/cache/ServerCacheManager.java b/src/main/java/io/ebean/cache/ServerCacheManager.java
index a81fe9a52..5cc1a6040 100644
--- a/src/main/java/io/ebean/cache/ServerCacheManager.java
+++ b/src/main/java/io/ebean/cache/ServerCacheManager.java
@@ -1,5 +1,7 @@
 package io.ebean.cache;
 
+import io.ebean.meta.MetricVisitor;
+
 import java.util.List;
 
 /**
@@ -7,6 +9,11 @@ import java.util.List;
  */
 public interface ServerCacheManager {
 
+  /**
+   * Visit the metrics for all the server caches.
+   */
+  void visitMetrics(MetricVisitor visitor);
+
   /**
    * Return true if the L2 caching is local.
    * <p>
diff --git a/src/main/java/io/ebean/cache/ServerCacheStatistics.java b/src/main/java/io/ebean/cache/ServerCacheStatistics.java
index bbe4de7c4..20e7d8e49 100644
--- a/src/main/java/io/ebean/cache/ServerCacheStatistics.java
+++ b/src/main/java/io/ebean/cache/ServerCacheStatistics.java
@@ -21,23 +21,13 @@ public class ServerCacheStatistics {
 
   protected long missCount;
 
-  protected long insertCount;
-
-  protected long updateCount;
+  protected long putCount;
 
   protected long removeCount;
 
   protected long clearCount;
 
-  protected long evictionRunCount;
-
-  protected long evictionRunMicros;
-
-  protected long evictByIdle;
-
-  protected long evictByTTL;
-
-  protected long evictByLRU;
+  protected long evictCount;
 
   @Override
   public String toString() {
@@ -49,15 +39,10 @@ public class ServerCacheStatistics {
     sb.append(" hitRatio:").append(getHitRatio());
     sb.append(" hit:").append(hitCount);
     sb.append(" miss:").append(missCount);
-    sb.append(" insert:").append(insertCount);
-    sb.append(" update:").append(updateCount);
+    sb.append(" put:").append(putCount);
     sb.append(" remove:").append(removeCount);
     sb.append(" clear:").append(clearCount);
-    sb.append(" evictByIdle:").append(evictByIdle);
-    sb.append(" evictByTTL:").append(evictByTTL);
-    sb.append(" evictByLRU:").append(evictByLRU);
-    sb.append(" evictionRunCount:").append(evictionRunCount);
-    sb.append(" evictionRunMicros:").append(evictionRunMicros);
+    sb.append(" evict:").append(evictCount);
     return sb.toString();
   }
 
@@ -153,29 +138,15 @@ public class ServerCacheStatistics {
   /**
    * Set the put insert count.
    */
-  public void setInsertCount(long insertCount) {
-    this.insertCount = insertCount;
+  public void setPutCount(long putCount) {
+    this.putCount = putCount;
   }
 
   /**
    * Return the put insert count.
    */
-  public long getInsertCount() {
-    return insertCount;
-  }
-
-  /**
-   * Set the put update count.
-   */
-  public void setUpdateCount(long updateCount) {
-    this.updateCount = updateCount;
-  }
-
-  /**
-   * Return the put update count.
-   */
-  public long getUpdateCount() {
-    return updateCount;
+  public long getPutCount() {
+    return putCount;
   }
 
   /**
@@ -206,73 +177,18 @@ public class ServerCacheStatistics {
     return clearCount;
   }
 
-  /**
-   * Set the eviction run count.
-   */
-  public void setEvictionRunCount(long evictCount) {
-    this.evictionRunCount = evictCount;
-  }
-
-  /**
-   * Return the eviction run count.
-   */
-  public long getEvictionRunCount() {
-    return evictionRunCount;
-  }
-
-  /**
-   * Set the eviction run time in micros.
-   */
-  public void setEvictionRunMicros(long evictionRunMicros) {
-    this.evictionRunMicros = evictionRunMicros;
-  }
-
-  /**
-   * Return the eviction run time in micros.
-   */
-  public long getEvictionRunMicros() {
-    return evictionRunMicros;
-  }
-
   /**
    * Set the count of entries evicted due to idle time.
    */
-  public void setEvictByIdle(long evictByIdle) {
-    this.evictByIdle = evictByIdle;
+  public void setEvictCount(long evictCount) {
+    this.evictCount = evictCount;
   }
 
   /**
    * Return the count of entries evicted due to idle time.
    */
-  public long getEvictByIdle() {
-    return evictByIdle;
+  public long getEvictCount() {
+    return evictCount;
   }
 
-  /**
-   * Set the count of entries evicted due to time to live.
-   */
-  public void setEvictByTTL(long evictByTTL) {
-    this.evictByTTL = evictByTTL;
-  }
-
-  /**
-   * Return the count of entries evicted due to time to live.
-   */
-  public long getEvictByTTL() {
-    return evictByTTL;
-  }
-
-  /**
-   * Set the count of entries evicted due to time least recently used.
-   */
-  public void setEvictByLRU(long evictByLRU) {
-    this.evictByLRU = evictByLRU;
-  }
-
-  /**
-   * Return the count of entries evicted due to time least recently used.
-   */
-  public long getEvictByLRU() {
-    return evictByLRU;
-  }
 }
diff --git a/src/main/java/io/ebean/meta/AbstractMetricVisitor.java b/src/main/java/io/ebean/meta/AbstractMetricVisitor.java
index c2eb25b99..323b572ec 100644
--- a/src/main/java/io/ebean/meta/AbstractMetricVisitor.java
+++ b/src/main/java/io/ebean/meta/AbstractMetricVisitor.java
@@ -8,11 +8,13 @@ public abstract class AbstractMetricVisitor implements MetricVisitor {
   private final boolean reset;
   private final boolean collectTransactionMetrics;
   private final boolean collectQueryMetrics;
+  private final boolean collectL2Metrics;
 
-  public AbstractMetricVisitor(boolean reset, boolean collectTransactionMetrics, boolean collectQueryMetrics) {
+  public AbstractMetricVisitor(boolean reset, boolean collectTransactionMetrics, boolean collectQueryMetrics, boolean collectL2Metrics) {
     this.reset = reset;
     this.collectTransactionMetrics = collectTransactionMetrics;
     this.collectQueryMetrics = collectQueryMetrics;
+    this.collectL2Metrics = collectL2Metrics;
   }
 
   @Override
@@ -30,6 +32,11 @@ public abstract class AbstractMetricVisitor implements MetricVisitor {
     return collectQueryMetrics;
   }
 
+  @Override
+  public boolean isCollectL2Metrics() {
+    return collectL2Metrics;
+  }
+
   @Override
   public void visitStart() {
     // do nothing by default
diff --git a/src/main/java/io/ebean/meta/BasicMetricVisitor.java b/src/main/java/io/ebean/meta/BasicMetricVisitor.java
index bc1658a02..7e1d77909 100644
--- a/src/main/java/io/ebean/meta/BasicMetricVisitor.java
+++ b/src/main/java/io/ebean/meta/BasicMetricVisitor.java
@@ -11,19 +11,20 @@ public class BasicMetricVisitor extends AbstractMetricVisitor implements ServerM
   private final List<MetaTimedMetric> timed = new ArrayList<>();
   private final List<MetaQueryMetric> dtoQuery = new ArrayList<>();
   private final List<MetaOrmQueryMetric> ormQuery = new ArrayList<>();
+  private final List<MetaCountMetric> countMetrics = new ArrayList<>();
 
   /**
    * Construct to reset and collect everything.
    */
   public BasicMetricVisitor() {
-    super(true, true, true);
+    super(true, true, true, true);
   }
 
   /**
    * Construct specifying reset and what to collect.
    */
-  public BasicMetricVisitor(boolean reset, boolean collectTransactionMetrics, boolean collectQueryMetrics) {
-    super(reset, collectTransactionMetrics, collectQueryMetrics);
+  public BasicMetricVisitor(boolean reset, boolean collectTransactionMetrics, boolean collectQueryMetrics, boolean collectL2Metrics) {
+    super(reset, collectTransactionMetrics, collectQueryMetrics, collectL2Metrics);
   }
 
   /**
@@ -50,6 +51,11 @@ public class BasicMetricVisitor extends AbstractMetricVisitor implements ServerM
     return ormQuery;
   }
 
+  @Override
+  public List<MetaCountMetric> getCountMetrics() {
+    return countMetrics;
+  }
+
   @Override
   public void visitTimed(MetaTimedMetric metric) {
     timed.add(metric);
@@ -64,4 +70,9 @@ public class BasicMetricVisitor extends AbstractMetricVisitor implements ServerM
   public void visitOrmQuery(MetaOrmQueryMetric metric) {
     ormQuery.add(metric);
   }
+
+  @Override
+  public void visitCount(MetaCountMetric metric) {
+    countMetrics.add(metric);
+  }
 }
diff --git a/src/main/java/io/ebean/meta/MetaCountMetric.java b/src/main/java/io/ebean/meta/MetaCountMetric.java
new file mode 100644
index 000000000..ea3c833b0
--- /dev/null
+++ b/src/main/java/io/ebean/meta/MetaCountMetric.java
@@ -0,0 +1,23 @@
+package io.ebean.meta;
+
+/**
+ * Count metrics.
+ */
+public interface MetaCountMetric {
+
+  /**
+   * Return the metric type.
+   */
+  MetricType getMetricType();
+
+  /**
+   * Return the metric name.
+   */
+  String getName();
+
+  /**
+   * Return the total count.
+   */
+  long getCount();
+
+}
diff --git a/src/main/java/io/ebean/meta/MetricVisitor.java b/src/main/java/io/ebean/meta/MetricVisitor.java
index 8b39e6499..139e7b9f6 100644
--- a/src/main/java/io/ebean/meta/MetricVisitor.java
+++ b/src/main/java/io/ebean/meta/MetricVisitor.java
@@ -20,6 +20,11 @@ public interface MetricVisitor {
    */
   boolean isCollectQueryMetrics();
 
+  /**
+   * Return true if we should visit the L2 cache metrics.
+   */
+  boolean isCollectL2Metrics();
+
   /**
    * Visit has started.
    */
@@ -40,6 +45,11 @@ public interface MetricVisitor {
    */
   void visitOrmQuery(MetaOrmQueryMetric metric);
 
+  /**
+   * Visit a Counter metric.
+   */
+  void visitCount(MetaCountMetric metric);
+
   /**
    * Visit has completed.
    */
diff --git a/src/main/java/io/ebean/meta/ServerMetrics.java b/src/main/java/io/ebean/meta/ServerMetrics.java
index 8b556eb51..c00518715 100644
--- a/src/main/java/io/ebean/meta/ServerMetrics.java
+++ b/src/main/java/io/ebean/meta/ServerMetrics.java
@@ -21,4 +21,10 @@ public interface ServerMetrics {
    * Return the ORM query metrics.
    */
   List<MetaOrmQueryMetric> getOrmQueryMetrics();
+
+  /**
+   * Return the Counter metrics.
+   */
+  List<MetaCountMetric> getCountMetrics();
+
 }
diff --git a/src/main/java/io/ebean/meta/SortMetric.java b/src/main/java/io/ebean/meta/SortMetric.java
index 32d4161d1..9df2c704b 100644
--- a/src/main/java/io/ebean/meta/SortMetric.java
+++ b/src/main/java/io/ebean/meta/SortMetric.java
@@ -7,12 +7,35 @@ import java.util.Comparator;
  */
 public class SortMetric {
 
+  public static final Comparator<MetaCountMetric> COUNT_NAME = new CountName();
+
   public static final Comparator<MetaTimedMetric> NAME = new Name();
   public static final Comparator<MetaTimedMetric> COUNT = new Count();
   public static final Comparator<MetaTimedMetric> TOTAL = new Total();
   public static final Comparator<MetaTimedMetric> MEAN = new Mean();
   public static final Comparator<MetaTimedMetric> MAX = new Max();
 
+  private static int stringCompare(String name, String name2) {
+    if (name == null) {
+      return name2 == null ? 0 : -1;
+    }
+    if (name2 == null) {
+      return 1;
+    }
+    return name.compareTo(name2);
+  }
+
+  /**
+   * Sort MetaCountMetric's by name.
+   */
+  public static class CountName implements Comparator<MetaCountMetric> {
+
+    @Override
+    public int compare(MetaCountMetric o1, MetaCountMetric o2) {
+      return stringCompare(o1.getName(), o2.getName());
+    }
+  }
+
   /**
    * Sort by name.
    */
@@ -20,16 +43,7 @@ public class SortMetric {
 
     @Override
     public int compare(MetaTimedMetric o1, MetaTimedMetric o2) {
-      String name = o1.getName();
-      String name2 = o2.getName();
-      if (name == null) {
-        return name2 == null ? 0 : -1;
-      }
-      if (name2 == null) {
-        return 1;
-      }
-
-      int i = name.compareTo(name2);
+      int i = stringCompare(o1.getName(), o2.getName());
       return i != 0 ? i : Long.compare(o1.getCount(), o2.getCount());
     }
   }
diff --git a/src/main/java/io/ebean/metric/CountMetric.java b/src/main/java/io/ebean/metric/CountMetric.java
new file mode 100644
index 000000000..3ce785c1e
--- /dev/null
+++ b/src/main/java/io/ebean/metric/CountMetric.java
@@ -0,0 +1,39 @@
+package io.ebean.metric;
+
+import io.ebean.meta.MetricVisitor;
+
+/**
+ * Metric for timed events like transaction execution times.
+ */
+public interface CountMetric {
+
+  /**
+   * Add to the counter.
+   */
+  void add(long micros);
+
+  /**
+   * Increment the counter by 1.
+   */
+  void increment();
+
+  /**
+   * Return the count value.
+   */
+  long get(boolean reset);
+
+  /**
+   * Return true if there are no metrics collected since the last collection.
+   */
+  boolean isEmpty();
+
+  /**
+   * Reset the statistics.
+   */
+  void reset();
+
+  /**
+   * Visit non empty metrics.
+   */
+  void visit(MetricVisitor visitor);
+}
diff --git a/src/main/java/io/ebean/metric/CountMetricStats.java b/src/main/java/io/ebean/metric/CountMetricStats.java
new file mode 100644
index 000000000..82bebfd25
--- /dev/null
+++ b/src/main/java/io/ebean/metric/CountMetricStats.java
@@ -0,0 +1,6 @@
+package io.ebean.metric;
+
+import io.ebean.meta.MetaCountMetric;
+
+public interface CountMetricStats extends MetaCountMetric {
+}
diff --git a/src/main/java/io/ebean/metric/MetricFactory.java b/src/main/java/io/ebean/metric/MetricFactory.java
index 241ca461c..d7eed095a 100644
--- a/src/main/java/io/ebean/metric/MetricFactory.java
+++ b/src/main/java/io/ebean/metric/MetricFactory.java
@@ -25,6 +25,11 @@ public interface MetricFactory {
    */
   TimedMetric createTimedMetric(MetricType metricType, String name);
 
+  /**
+   * Create a counter metric.
+   */
+  CountMetric createCountMetric(MetricType metricType, String name);
+
   /**
    * Create a Timed metric.
    */
diff --git a/src/main/java/io/ebeaninternal/server/cache/DefaultCacheAdapter.java b/src/main/java/io/ebeaninternal/server/cache/DefaultCacheAdapter.java
index 37e89b864..bd7b0a763 100644
--- a/src/main/java/io/ebeaninternal/server/cache/DefaultCacheAdapter.java
+++ b/src/main/java/io/ebeaninternal/server/cache/DefaultCacheAdapter.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.cache;
 import io.ebean.cache.ServerCache;
 import io.ebean.cache.ServerCacheManager;
 import io.ebean.cache.ServerCacheRegion;
+import io.ebean.meta.MetricVisitor;
 
 import java.util.List;
 
@@ -20,6 +21,11 @@ public class DefaultCacheAdapter implements ServerCacheManager {
     this.cacheManager = cacheManager;
   }
 
+  @Override
+  public void visitMetrics(MetricVisitor visitor) {
+    cacheManager.visitMetrics(visitor);
+  }
+
   @Override
   public boolean isLocalL2Caching() {
     return cacheManager.isLocalL2Caching();
diff --git a/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java b/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
index 8211e32c4..67ead88b3 100644
--- a/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
+++ b/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
@@ -10,6 +10,7 @@ import io.ebean.cache.ServerCacheFactory;
 import io.ebean.cache.ServerCacheOptions;
 import io.ebean.cache.ServerCacheType;
 import io.ebean.config.CurrentTenantProvider;
+import io.ebean.meta.MetricVisitor;
 import io.ebean.util.AnnotationUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -46,32 +47,50 @@ class DefaultCacheHolder {
     this.queryCacheEntryValidate = builder.getQueryCacheEntryValidate();
   }
 
-  ServerCache getCache(Class<?> beanType, String cacheKey, ServerCacheType type) {
-
-    return getCacheInternal(beanType, cacheKey, type);
+  void visitMetrics(MetricVisitor visitor) {
+    for (ServerCache serverCache : allCaches.values()) {
+      serverCache.visit(visitor);
+    }
   }
 
-  private String key(String cacheKey, ServerCacheType type) {
-    return cacheKey + type.code();
+  ServerCache getCache(Class<?> beanType, ServerCacheType type) {
+    return getCacheInternal(beanType, type, null);
+  }
+
+  ServerCache getCache(Class<?> beanType, String collectionProperty) {
+    return getCacheInternal(beanType, ServerCacheType.COLLECTION_IDS, collectionProperty);
+  }
+
+  private String key(String beanName, ServerCacheType type) {
+    return beanName + type.code();
+  }
+
+  private String key(String beanName, String collectionProperty, ServerCacheType type) {
+    if (collectionProperty != null) {
+      return beanName + "." + collectionProperty + type.code();
+    } else {
+      return beanName + type.code();
+    }
   }
 
   /**
    * Return the cache for a given bean type.
    */
-  private ServerCache getCacheInternal(Class<?> beanType, String cacheKey, ServerCacheType type) {
+  private ServerCache getCacheInternal(Class<?> beanType, ServerCacheType type, String collectionProperty) {
 
-    String fullKey = key(cacheKey, type);
-    return allCaches.computeIfAbsent(fullKey, s -> createCache(beanType, type, fullKey));
+    String shortName = key(beanType.getSimpleName(), collectionProperty, type);
+    String fullKey = key(beanType.getName(), collectionProperty, type);
+    return allCaches.computeIfAbsent(fullKey, s -> createCache(beanType, type, fullKey, shortName));
   }
 
-  private ServerCache createCache(Class<?> beanType, ServerCacheType type, String key) {
+  private ServerCache createCache(Class<?> beanType, ServerCacheType type, String key, String shortName) {
     ServerCacheOptions options = getCacheOptions(beanType, type);
     if (type == ServerCacheType.COLLECTION_IDS) {
       synchronized (this) {
         collectIdCaches.computeIfAbsent(beanType.getName(), s -> new ConcurrentSkipListSet<>()).add(key);
       }
     }
-    return cacheFactory.createCache(new ServerCacheConfig(type, key, options, tenantProvider, queryCacheEntryValidate));
+    return cacheFactory.createCache(new ServerCacheConfig(type, key, shortName, options, tenantProvider, queryCacheEntryValidate));
   }
 
   void clearAll() {
@@ -107,12 +126,10 @@ class DefaultCacheHolder {
    * Return the cache options for a given bean type.
    */
   ServerCacheOptions getCacheOptions(Class<?> beanType, ServerCacheType type) {
-    switch (type) {
-      case QUERY:
-        return getQueryOptions(beanType);
-      default:
-        return getBeanOptions(beanType);
+    if (type == ServerCacheType.QUERY) {
+      return getQueryOptions(beanType);
     }
+    return getBeanOptions(beanType);
   }
 
   private ServerCacheOptions getQueryOptions(Class<?> cls) {
diff --git a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
index 33e85f34b..6c08d1975 100644
--- a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
+++ b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
@@ -4,6 +4,9 @@ import io.ebean.BackgroundExecutor;
 import io.ebean.cache.ServerCache;
 import io.ebean.cache.ServerCacheStatistics;
 import io.ebean.cache.TenantAwareKey;
+import io.ebean.meta.MetricVisitor;
+import io.ebean.metric.CountMetric;
+import io.ebean.metric.MetricFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -14,7 +17,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.LongAdder;
+
+import static io.ebean.meta.MetricType.L2;
 
 /**
  * The default cache implementation.
@@ -37,39 +41,45 @@ public class DefaultServerCache implements ServerCache {
    */
   protected final Map<Object, CacheEntry> map;
 
-  protected final LongAdder missCount = new LongAdder();
-  protected final LongAdder hitCount = new LongAdder();
-  protected final LongAdder insertCount = new LongAdder();
-  protected final LongAdder updateCount = new LongAdder();
-  protected final LongAdder removeCount = new LongAdder();
-  protected final LongAdder clearCount = new LongAdder();
-
-  protected final LongAdder evictByIdle = new LongAdder();
-  protected final LongAdder evictByTTL = new LongAdder();
-  protected final LongAdder evictByLRU = new LongAdder();
-  protected final LongAdder evictCount = new LongAdder();
-  protected final LongAdder evictMicros = new LongAdder();
+  protected final CountMetric hitCount;
+  protected final CountMetric missCount;
+  protected final CountMetric putCount;
+  protected final CountMetric removeCount;
+  protected final CountMetric clearCount;
+  protected final CountMetric evictCount;
 
   protected final String name;
+  protected final String shortName;
 
-  protected int maxSize;
+  private int maxSize;
 
-  protected final int trimFrequency;
+  private final int trimFrequency;
 
-  protected int maxIdleSecs;
+  private int maxIdleSecs;
 
-  protected int maxSecsToLive;
+  private int maxSecsToLive;
 
-  protected TenantAwareKey tenantAwareKey;
+  private TenantAwareKey tenantAwareKey;
 
   public DefaultServerCache(DefaultServerCacheConfig config) {
     this.name = config.getName();
+    this.shortName = config.getShortName();
     this.map = config.getMap();
     this.maxSize = config.getMaxSize();
     this.tenantAwareKey = new TenantAwareKey(config.getTenantProvider());
     this.maxIdleSecs = config.getMaxIdleSecs();
     this.maxSecsToLive = config.getMaxSecsToLive();
     this.trimFrequency = config.determineTrimFrequency();
+
+    MetricFactory factory = MetricFactory.get();
+
+    String prefix = "l2n.";
+    this.hitCount = factory.createCountMetric(L2, prefix + shortName + ".hit");
+    this.missCount = factory.createCountMetric(L2, prefix + shortName + ".miss");
+    this.putCount = factory.createCountMetric(L2, prefix + shortName + ".put");
+    this.removeCount = factory.createCountMetric(L2, prefix + shortName + ".remove");
+    this.clearCount = factory.createCountMetric(L2, prefix + shortName + ".clear");
+    this.evictCount = factory.createCountMetric(L2, prefix + shortName + ".evict");
   }
 
   public void periodicTrim(BackgroundExecutor executor) {
@@ -81,6 +91,16 @@ public class DefaultServerCache implements ServerCache {
     executor.executePeriodically(trim, trimFreqSecs, TimeUnit.SECONDS);
   }
 
+  @Override
+  public void visit(MetricVisitor visitor) {
+    hitCount.visit(visitor);
+    missCount.visit(visitor);
+    putCount.visit(visitor);
+    removeCount.visit(visitor);
+    clearCount.visit(visitor);
+    evictCount.visit(visitor);
+  }
+
   @Override
   public ServerCacheStatistics getStatistics(boolean reset) {
 
@@ -88,38 +108,13 @@ public class DefaultServerCache implements ServerCache {
     cacheStats.setCacheName(name);
     cacheStats.setMaxSize(maxSize);
 
-    // these counters won't necessarily be consistent with
-    // respect to each other as activity can occur while
-    // they are being calculated here but they should be good enough
-    // and we don't want to reduce concurrent use to make them consistent
-    long clear = reset ? clearCount.sumThenReset() : clearCount.sum();
-    long remove = reset ? removeCount.sumThenReset() : removeCount.sum();
-    long update = reset ? updateCount.sumThenReset() : updateCount.sum();
-    long insert = reset ? insertCount.sumThenReset() : insertCount.sum();
-    long miss = reset ? missCount.sumThenReset() : missCount.sum();
-    long hit = reset ? hitCount.sumThenReset() : hitCount.sum();
-
-    long evict = reset ? evictCount.sumThenReset() : evictCount.sum();
-    long evictTime = reset ? evictMicros.sumThenReset() : evictMicros.sum();
-    long evictIdle = reset ? evictByIdle.sumThenReset() : evictByIdle.sum();
-    long evictTTL = reset ? evictByTTL.sumThenReset() : evictByTTL.sum();
-    long evictLRU = reset ? evictByLRU.sumThenReset() : evictByLRU.sum();
-
-    int size = size();
-
-    cacheStats.setSize(size);
-    cacheStats.setHitCount(hit);
-    cacheStats.setMissCount(miss);
-    cacheStats.setInsertCount(insert);
-    cacheStats.setUpdateCount(update);
-    cacheStats.setRemoveCount(remove);
-    cacheStats.setClearCount(clear);
-
-    cacheStats.setEvictionRunCount(evict);
-    cacheStats.setEvictionRunMicros(evictTime);
-    cacheStats.setEvictByIdle(evictIdle);
-    cacheStats.setEvictByTTL(evictTTL);
-    cacheStats.setEvictByLRU(evictLRU);
+    cacheStats.setSize(size());
+    cacheStats.setHitCount(hitCount.get(reset));
+    cacheStats.setMissCount(missCount.get(reset));
+    cacheStats.setPutCount(putCount.get(reset));
+    cacheStats.setRemoveCount(removeCount.get(reset));
+    cacheStats.setClearCount(clearCount.get(reset));
+    cacheStats.setEvictCount(evictCount.get(reset));
 
     return cacheStats;
   }
@@ -127,8 +122,8 @@ public class DefaultServerCache implements ServerCache {
   @Override
   public int getHitRatio() {
 
-    long mc = missCount.sum();
-    long hc = hitCount.sum();
+    long mc = missCount.get(false);
+    long hc = hitCount.get(false);
 
     long totalCount = hc + mc;
     if (totalCount == 0) {
@@ -145,6 +140,10 @@ public class DefaultServerCache implements ServerCache {
     return name;
   }
 
+  public String getShortName() {
+    return shortName;
+  }
+
   /**
    * Clear the cache.
    */
@@ -171,10 +170,7 @@ public class DefaultServerCache implements ServerCache {
     if (entry == null) {
       missCount.increment();
       return null;
-
     } else {
-      // Important that hitCount.increment() MUST be low latency under concurrent
-      // use hence must use LongAdder or better here
       hitCount.increment();
       return unwrapEntry(entry);
     }
@@ -204,14 +200,9 @@ public class DefaultServerCache implements ServerCache {
    */
   @Override
   public void put(Object id, Object value) {
-
     Object key = key(id);
-    CacheEntry entry = map.put(key, new CacheEntry(key, value));
-    if (entry == null) {
-      insertCount.increment();
-    } else {
-      updateCount.increment();
-    }
+    map.put(key, new CacheEntry(key, value));
+    putCount.increment();
   }
 
   /**
@@ -219,7 +210,6 @@ public class DefaultServerCache implements ServerCache {
    */
   @Override
   public void remove(Object id) {
-
     CacheEntry entry = map.remove(key(id));
     if (entry != null) {
       removeCount.increment();
@@ -269,7 +259,7 @@ public class DefaultServerCache implements ServerCache {
 
     List<CacheEntry> activeList = new ArrayList<>(map.size());
 
-    long idleExpireNano =  startNanos - TimeUnit.SECONDS.toNanos(maxIdleSecs);
+    long idleExpireNano = startNanos - TimeUnit.SECONDS.toNanos(maxIdleSecs);
     long ttlExpireNano = startNanos - TimeUnit.SECONDS.toNanos(maxSecsToLive);
 
     Iterator<CacheEntry> it = map.values().iterator();
@@ -301,17 +291,12 @@ public class DefaultServerCache implements ServerCache {
       }
     }
 
-    long exeNanos = System.nanoTime() - startNanos;
-    long exeMicros = TimeUnit.MICROSECONDS.convert(exeNanos, TimeUnit.NANOSECONDS);
-
-    // increment the eviction statistics
-    evictMicros.add(exeMicros);
-    evictCount.increment();
-    evictByIdle.add(trimmedByIdle);
-    evictByTTL.add(trimmedByTTL);
-    evictByLRU.add(trimmedByLRU);
+    evictCount.add(trimmedByIdle);
+    evictCount.add(trimmedByTTL);
+    evictCount.add(trimmedByLRU);
 
     if (logger.isTraceEnabled()) {
+      long exeMicros = TimeUnit.MICROSECONDS.convert(System.nanoTime() - startNanos, TimeUnit.NANOSECONDS);
       logger.trace("Executed trim of cache {} in [{}]millis idle[{}] timeToLive[{}] accessTime[{}]"
         , name, exeMicros, trimmedByIdle, trimmedByTTL, trimmedByLRU);
     }
diff --git a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheConfig.java b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheConfig.java
index 44538beed..638f237a2 100644
--- a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheConfig.java
+++ b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheConfig.java
@@ -46,6 +46,10 @@ public class DefaultServerCacheConfig {
     return config.getCacheKey();
   }
 
+  public String getShortName() {
+    return config.getShortName();
+  }
+
   public Map<Object, DefaultServerCache.CacheEntry> getMap() {
     return map;
   }
diff --git a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java
index 773846b79..7214437cc 100644
--- a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java
+++ b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.cache;
 import io.ebean.cache.ServerCache;
 import io.ebean.cache.ServerCacheRegion;
 import io.ebean.cache.ServerCacheType;
+import io.ebean.meta.MetricVisitor;
 import io.ebeaninternal.api.SpiCacheRegion;
 import io.ebeaninternal.server.cluster.ClusterManager;
 import io.ebeaninternal.server.deploy.DCacheRegion;
@@ -99,6 +100,11 @@ public class DefaultServerCacheManager implements SpiCacheManager {
     return regionMap.computeIfAbsent(region, DCacheRegion::new);
   }
 
+  @Override
+  public void visitMetrics(MetricVisitor visitor) {
+    cacheHolder.visitMetrics(visitor);
+  }
+
   /**
    * Clear all caches.
    */
@@ -117,7 +123,7 @@ public class DefaultServerCacheManager implements SpiCacheManager {
 
   @Override
   public void clear(Class<?> beanType) {
-    cacheHolder.clear(name(beanType));
+    cacheHolder.clear(beanType.getName());
     if (clusterManager != null) {
       clusterManager.cacheClear(serverName, beanType);
     }
@@ -125,17 +131,17 @@ public class DefaultServerCacheManager implements SpiCacheManager {
 
   @Override
   public void clearLocal(Class<?> beanType) {
-    cacheHolder.clear(name(beanType));
+    cacheHolder.clear(beanType.getName());
   }
 
   @Override
-  public ServerCache getCollectionIdsCache(Class<?> beanType, String propertyName) {
-    return cacheHolder.getCache(beanType, name(beanType) + "." + propertyName, ServerCacheType.COLLECTION_IDS);
+  public ServerCache getCollectionIdsCache(Class<?> beanType, String collectionProperty) {
+    return cacheHolder.getCache(beanType, collectionProperty);
   }
 
   @Override
   public ServerCache getNaturalKeyCache(Class<?> beanType) {
-    return cacheHolder.getCache(beanType, name(beanType), ServerCacheType.NATURAL_KEY);
+    return cacheHolder.getCache(beanType, ServerCacheType.NATURAL_KEY);
   }
 
   /**
@@ -143,7 +149,7 @@ public class DefaultServerCacheManager implements SpiCacheManager {
    */
   @Override
   public ServerCache getQueryCache(Class<?> beanType) {
-    return cacheHolder.getCache(beanType, name(beanType), ServerCacheType.QUERY);
+    return cacheHolder.getCache(beanType, ServerCacheType.QUERY);
   }
 
   /**
@@ -151,11 +157,7 @@ public class DefaultServerCacheManager implements SpiCacheManager {
    */
   @Override
   public ServerCache getBeanCache(Class<?> beanType) {
-    return cacheHolder.getCache(beanType, name(beanType), ServerCacheType.BEAN);
-  }
-
-  private String name(Class<?> beanType) {
-    return beanType.getName();
+    return cacheHolder.getCache(beanType, ServerCacheType.BEAN);
   }
 
 }
diff --git a/src/main/java/io/ebeaninternal/server/cache/SpiCacheManager.java b/src/main/java/io/ebeaninternal/server/cache/SpiCacheManager.java
index 5ef06b991..bf6d4d5a2 100644
--- a/src/main/java/io/ebeaninternal/server/cache/SpiCacheManager.java
+++ b/src/main/java/io/ebeaninternal/server/cache/SpiCacheManager.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.cache;
 
 import io.ebean.cache.ServerCache;
 import io.ebean.cache.ServerCacheRegion;
+import io.ebean.meta.MetricVisitor;
 import io.ebeaninternal.api.SpiCacheRegion;
 
 import java.util.List;
@@ -11,6 +12,11 @@ import java.util.List;
  */
 public interface SpiCacheManager {
 
+  /**
+   * Visit and collect the metrics.
+   */
+  void visitMetrics(MetricVisitor visitor);
+
   /**
    * Return true if the L2 caching is local.
    * <p>
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java b/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java
index 2b3c13dc2..0c7fe65fa 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.core;
 
 import io.ebean.meta.AbstractMetricVisitor;
 import io.ebean.meta.BasicMetricVisitor;
+import io.ebean.meta.MetaCountMetric;
 import io.ebean.meta.MetaInfoManager;
 import io.ebean.meta.MetaOrmQueryMetric;
 import io.ebean.meta.MetaOrmQueryNode;
@@ -71,7 +72,7 @@ public class DefaultMetaInfoManager implements MetaInfoManager {
   private static class ResetVisitor extends AbstractMetricVisitor {
 
     ResetVisitor() {
-      super(true, true, true);
+      super(true, true, true, true);
     }
 
     @Override
@@ -88,6 +89,11 @@ public class DefaultMetaInfoManager implements MetaInfoManager {
     public void visitOrmQuery(MetaOrmQueryMetric metric) {
       // ignore
     }
+
+    @Override
+    public void visitCount(MetaCountMetric metric) {
+      // ignore
+    }
   }
 
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index e1d35fcef..9d8e129c5 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -2389,6 +2389,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     if (visitor.isCollectTransactionMetrics()) {
       transactionManager.visitMetrics(visitor);
     }
+    if (visitor.isCollectL2Metrics()) {
+      serverCacheManager.visitMetrics(visitor);
+    }
     if (visitor.isCollectQueryMetrics()) {
       beanDescriptorManager.visitMetrics(visitor);
       dtoBeanManager.visitMetrics(visitor);
diff --git a/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java b/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
index 08ee24210..54bdf8956 100644
--- a/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
+++ b/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.core;
 
 import io.ebean.ProfileLocation;
+import io.ebean.meta.MetaCountMetric;
 import io.ebean.meta.MetaOrmQueryMetric;
 import io.ebean.meta.MetaQueryMetric;
 import io.ebean.meta.MetaTimedMetric;
@@ -83,6 +84,15 @@ class DumpMetrics {
       log(metric);
     }
 
+    List<MetaCountMetric> countMetrics = serverMetrics.getCountMetrics();
+    if (!countMetrics.isEmpty()) {
+      out("\n-- Counters --");
+      countMetrics.sort(SortMetric.COUNT_NAME);
+      for (MetaCountMetric metric : countMetrics) {
+        logCount(metric);
+      }
+    }
+
     List<MetaOrmQueryMetric> ormQueryMetrics = serverMetrics.getOrmQueryMetrics();
     if (!ormQueryMetrics.isEmpty()) {
       out("\n-- ORM queries --");
@@ -102,6 +112,14 @@ class DumpMetrics {
     }
   }
 
+  private void logCount(MetaCountMetric metric) {
+
+    StringBuilder sb = new StringBuilder();
+    sb.append(padNameTimed(metric.getName())).append(" ");
+    sb.append(" count:").append(pad(metric.getCount()));
+    out(sb.toString());
+  }
+
   private void out(String sb) {
     System.out.println(sb);
   }
diff --git a/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java b/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java
new file mode 100644
index 000000000..fa1a622fb
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java
@@ -0,0 +1,90 @@
+package io.ebeaninternal.server.profile;
+
+import io.ebean.meta.MetricType;
+import io.ebean.meta.MetricVisitor;
+import io.ebean.metric.CountMetric;
+import io.ebean.metric.CountMetricStats;
+
+import java.util.concurrent.atomic.LongAdder;
+
+/**
+ * Used to collect counter metrics.
+ */
+class DCountMetric implements CountMetric {
+
+  private final MetricType metricType;
+
+  private final String name;
+
+  private final LongAdder count = new LongAdder();
+
+  DCountMetric(MetricType metricType, String name) {
+    this.metricType = metricType;
+    this.name = name;
+  }
+
+  /**
+   * Add a value. Usually the value is Time or Bytes etc.
+   */
+  @Override
+  public void add(long value) {
+    count.add(value);
+  }
+
+  public void increment() {
+    count.increment();
+  }
+
+  @Override
+  public boolean isEmpty() {
+    return count.sum() == 0;
+  }
+
+  @Override
+  public void reset() {
+    count.reset();
+  }
+
+  @Override
+  public long get(boolean reset) {
+    return reset ? count.sumThenReset() : count.sum();
+  }
+
+  @Override
+  public void visit(MetricVisitor visitor) {
+
+    long val = visitor.isReset() ? count.sumThenReset() : count.sum();
+    if (val > 0) {
+      visitor.visitCount(new DCountMetricStats(metricType, name, val));
+    }
+  }
+
+  private static class DCountMetricStats implements CountMetricStats {
+
+    private final MetricType metricType;
+    private final String name;
+    private final long count;
+
+    private DCountMetricStats(MetricType metricType, String name, long count) {
+      this.metricType = metricType;
+      this.name = name;
+      this.count = count;
+    }
+
+    @Override
+    public MetricType getMetricType() {
+      return metricType;
+    }
+
+    @Override
+    public String getName() {
+      return name;
+    }
+
+    @Override
+    public long getCount() {
+      return count;
+    }
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java b/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java
index b333efd63..c86066904 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.profile;
 
 import io.ebean.ProfileLocation;
 import io.ebean.meta.MetricType;
+import io.ebean.metric.CountMetric;
 import io.ebean.metric.MetricFactory;
 import io.ebean.metric.QueryPlanMetric;
 import io.ebean.metric.TimedMetric;
@@ -22,6 +23,11 @@ public class DMetricFactory implements MetricFactory {
     return new DTimedMetric(metricType, name);
   }
 
+  @Override
+  public CountMetric createCountMetric(MetricType metricType, String name) {
+    return new DCountMetric(metricType, name);
+  }
+
   @Override
   public QueryPlanMetric createQueryPlanMetric(MetricType metricType, Class<?> type, String label, ProfileLocation profileLocation, String sql) {
     return new DQueryPlanMetric(new DQueryPlanMeta(type, label, profileLocation, sql), new DTimedMetric(metricType, label));
diff --git a/src/test/java/io/ebean/DtoQueryTest.java b/src/test/java/io/ebean/DtoQueryTest.java
index 657393f75..651402398 100644
--- a/src/test/java/io/ebean/DtoQueryTest.java
+++ b/src/test/java/io/ebean/DtoQueryTest.java
@@ -192,7 +192,7 @@ public class DtoQueryTest extends BaseTestCase {
     }
 
     // collect without reset
-    BasicMetricVisitor basic = new BasicMetricVisitor(false, true, true);
+    BasicMetricVisitor basic = new BasicMetricVisitor(false, true, true, true);
     server().getMetaInfoManager().visitMetrics(basic);
 
     List<MetaQueryMetric> stats = basic.getDtoQueryMetrics();
diff --git a/src/test/java/io/ebean/NamedDtoQueryTest.java b/src/test/java/io/ebean/NamedDtoQueryTest.java
index b6362a74e..0d24a7ae4 100644
--- a/src/test/java/io/ebean/NamedDtoQueryTest.java
+++ b/src/test/java/io/ebean/NamedDtoQueryTest.java
@@ -118,7 +118,7 @@ public class NamedDtoQueryTest extends BaseTestCase {
     }
 
     // collect without reset
-    BasicMetricVisitor basic = new BasicMetricVisitor(false, true, true);
+    BasicMetricVisitor basic = new BasicMetricVisitor(false, true, true, true);
     server().getMetaInfoManager().visitMetrics(basic);
 
     List<MetaQueryMetric> stats = basic.getDtoQueryMetrics();
diff --git a/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java b/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java
index e7a7966b7..3b8a42ded 100644
--- a/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java
+++ b/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java
@@ -34,19 +34,22 @@ public class DefaultCacheHolderTest {
 
     DefaultCacheHolder holder = new DefaultCacheHolder(options());
 
-    DefaultServerCache cache = cache(holder, Customer.class, "customer");
-    assertThat(cache.getName()).isEqualTo("customer_B");
+    DefaultServerCache cache = cache(holder, Customer.class);
+    assertThat(cache.getName()).isEqualTo("org.tests.model.basic.Customer_B");
+    assertThat(cache.getShortName()).isEqualTo("Customer_B");
 
-    DefaultServerCache cache1 = cache(holder, Customer.class, "customer");
+    DefaultServerCache cache1 = cache(holder, Customer.class);
     assertThat(cache1).isSameAs(cache);
 
-    DefaultServerCache cache2 = cache(holder, Contact.class, "contact");
+    DefaultServerCache cache2 = cache(holder, Contact.class);
     assertThat(cache1).isNotSameAs(cache2);
-    assertThat(cache2.getName()).isEqualTo("contact_B");
+    assertThat(cache2.getName()).isEqualTo("org.tests.model.basic.Contact_B");
+    assertThat(cache2.getShortName()).isEqualTo("Contact_B");
+
   }
 
-  private DefaultServerCache cache(DefaultCacheHolder holder, Class<?> type, String name) {
-    return (DefaultServerCache) holder.getCache(type, name, ServerCacheType.BEAN);
+  private DefaultServerCache cache(DefaultCacheHolder holder, Class<?> type) {
+    return (DefaultServerCache) holder.getCache(type, ServerCacheType.BEAN);
   }
 
   @Test
@@ -57,8 +60,9 @@ public class DefaultCacheHolderTest {
     DefaultCacheHolder holder = new DefaultCacheHolder(builder);
 
     tenantId.set("ten_1");
-    DefaultServerCache cache = cache(holder, Customer.class, "customer");
-    assertThat(cache.getName()).isEqualTo("customer_B");
+    DefaultServerCache cache = cache(holder, Customer.class);
+    assertThat(cache.getName()).isEqualTo("org.tests.model.basic.Customer_B");
+    assertThat(cache.getShortName()).isEqualTo("Customer_B");
 
     cache.put("1", "value-for-tenant1");
     cache.put("2", "an other value-for-tenant1");
@@ -114,7 +118,7 @@ public class DefaultCacheHolderTest {
   public void clearAll() {
 
     DefaultCacheHolder holder = new DefaultCacheHolder(options());
-    DefaultServerCache cache = cache(holder, Customer.class, "customer");
+    DefaultServerCache cache = cache(holder, Customer.class);
     cache.put("foo", "foo");
     assertThat(cache.size()).isEqualTo(1);
     holder.clearAll();
@@ -128,7 +132,7 @@ public class DefaultCacheHolderTest {
     CacheManagerOptions options = options().with(tenantId::get);
 
     DefaultCacheHolder holder = new DefaultCacheHolder(options);
-    DefaultServerCache cache = cache(holder, Customer.class, "customer");
+    DefaultServerCache cache = cache(holder, Customer.class);
     cache.put("foo", "foo");
     assertThat(cache.size()).isEqualTo(1);
 
diff --git a/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java b/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java
index bb03cce18..ecd5ed5c7 100644
--- a/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java
+++ b/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java
@@ -16,7 +16,7 @@ public class DefaultServerCacheConfigTest {
     options.setMaxSecsToLive(maxSecsToLive);
     options.setTrimFrequency(trimFreq);
 
-    return new DefaultServerCacheConfig(new ServerCacheConfig(null, null, options, null, null));
+    return new DefaultServerCacheConfig(new ServerCacheConfig(null, null, null, options, null, null));
   }
 
   @Test
diff --git a/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java b/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java
index 2cf1b9cbb..83792a6af 100644
--- a/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java
+++ b/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java
@@ -43,6 +43,7 @@ public class DefaultServerCacheManagerTest {
 
     DefaultServerCache cache = cache(manager, Customer.class);
     assertThat(cache.getName()).isEqualTo("org.tests.model.basic.Customer_B");
+    assertThat(cache.getShortName()).isEqualTo("Customer_B");
 
     DefaultServerCache cache1 = cache(manager, Customer.class);
     assertThat(cache1).isSameAs(cache);
@@ -50,28 +51,32 @@ public class DefaultServerCacheManagerTest {
     DefaultServerCache cache2 = cache(manager, Contact.class);
     assertThat(cache1).isNotSameAs(cache2);
     assertThat(cache2.getName()).isEqualTo("org.tests.model.basic.Contact_B");
+    assertThat(cache2.getShortName()).isEqualTo("Contact_B");
 
 
     DefaultServerCache natKeyCache = (DefaultServerCache) manager.getNaturalKeyCache(Customer.class);
     assertThat(natKeyCache.getName()).isEqualTo("org.tests.model.basic.Customer_N");
+    assertThat(natKeyCache.getShortName()).isEqualTo("Customer_N");
 
     DefaultServerCache queryCache = (DefaultServerCache) manager.getQueryCache(Customer.class);
     assertThat(queryCache.getName()).isEqualTo("org.tests.model.basic.Customer_Q");
+    assertThat(queryCache.getShortName()).isEqualTo("Customer_Q");
 
     DefaultServerCache collCache = (DefaultServerCache) manager.getCollectionIdsCache(Customer.class, "contacts");
     assertThat(collCache.getName()).isEqualTo("org.tests.model.basic.Customer.contacts_C");
+    assertThat(collCache.getShortName()).isEqualTo("Customer.contacts_C");
 
-    cache.clearCount.sumThenReset();
-    collCache.clearCount.sumThenReset();
-    queryCache.clearCount.sumThenReset();
-    natKeyCache.clearCount.sumThenReset();
+    cache.clearCount.reset();
+    collCache.clearCount.reset();
+    queryCache.clearCount.reset();
+    natKeyCache.clearCount.reset();
 
     manager.clear(Customer.class);
 
-    assertThat(cache.clearCount.sumThenReset()).isEqualTo(1);
-    assertThat(natKeyCache.clearCount.sumThenReset()).isEqualTo(1);
-    assertThat(queryCache.clearCount.sumThenReset()).isEqualTo(1);
-    assertThat(collCache.clearCount.sumThenReset()).isEqualTo(1);
+    assertThat(cache.clearCount.get(true)).isEqualTo(1);
+    assertThat(natKeyCache.clearCount.get(true)).isEqualTo(1);
+    assertThat(queryCache.clearCount.get(true)).isEqualTo(1);
+    assertThat(collCache.clearCount.get(true)).isEqualTo(1);
   }
 
   private DefaultServerCache cache(DefaultServerCacheManager manager, Class<?> beanType) {
diff --git a/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java b/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java
index ead5158ff..53fcdf1e1 100644
--- a/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java
+++ b/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java
@@ -17,7 +17,7 @@ public class DefaultServerCacheTest {
     cacheOptions.setMaxSecsToLive(600);
     cacheOptions.setTrimFrequency(60);
 
-    ServerCacheConfig con = new ServerCacheConfig(ServerCacheType.BEAN, "foo", cacheOptions, null, null);
+    ServerCacheConfig con = new ServerCacheConfig(ServerCacheType.BEAN, "foo", null, cacheOptions, null, null);
     DefaultServerCacheConfig config = new DefaultServerCacheConfig(con);
     return new DefaultServerCache(config);
   }
diff --git a/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java b/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java
index a2d630c98..aa79cf71e 100644
--- a/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java
+++ b/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java
@@ -21,7 +21,7 @@ public class DefaultServerCache_RunEvictionTest {
     cacheOptions.setMaxSecsToLive(2);
     cacheOptions.setTrimFrequency(1);
 
-    ServerCacheConfig con = new ServerCacheConfig(ServerCacheType.BEAN, "foo", cacheOptions, null, null);
+    ServerCacheConfig con = new ServerCacheConfig(ServerCacheType.BEAN, "foo", "foo", cacheOptions, null, null);
     return new DefaultServerCache(new DefaultServerCacheConfig(con));
   }
 

From c46ac04c0a6a62210a8295d416c4203b35d928f5 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 27 Apr 2019 10:33:17 +1200
Subject: [PATCH 0821/1036] #1684 - Fix JSON marshalling on LocalDate, sql.Date
 etc - explicit UTC

Make explicit use of UTC
---
 .../server/type/ScalarTypeBaseDate.java            | 10 ++++------
 .../server/type/ScalarTypeJodaLocalDate.java       |  3 ++-
 .../server/type/ScalarTypeLocalDate.java           | 14 +++++++-------
 .../server/type/ScalarTypeYearMonthDate.java       |  7 +++----
 .../io/ebeaninternal/server/type/JsonTester.java   |  5 ++---
 .../server/type/ScalarTypeDateTest.java            |  9 +++++----
 .../server/type/ScalarTypeJodaLocalDateTest.java   |  2 +-
 .../server/type/ScalarTypeLocalDateTest.java       |  2 +-
 .../server/type/ScalarTypeUtilDateTest.java        |  5 +++--
 .../server/type/ScalarTypeYearMonthDateTest.java   |  9 ++++++---
 10 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
index 77ccf5fce..22184cad0 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
@@ -97,12 +97,10 @@ public abstract class ScalarTypeBaseDate<T> extends ScalarTypeBase<T> {
 
   @Override
   public void jsonWrite(JsonGenerator writer, T value) throws IOException {
-    switch(mode) {
-      case ISO8601:
-        writer.writeString(toIsoFormat(value));
-        break;
-      default:
-        writer.writeNumber(convertToMillis(value));
+    if (mode == JsonConfig.Date.ISO8601) {
+      writer.writeString(toIsoFormat(value));
+    } else {
+      writer.writeNumber(convertToMillis(value));
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
index e69bb1697..b3d8aee8b 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.type;
 
 import io.ebean.config.JsonConfig;
 import io.ebeaninternal.server.core.BasicTypeConverter;
+import org.joda.time.DateTimeZone;
 import org.joda.time.LocalDate;
 
 import java.sql.Date;
@@ -28,7 +29,7 @@ public class ScalarTypeJodaLocalDate extends ScalarTypeBaseDate<LocalDate> {
 
   @Override
   public long convertToMillis(LocalDate value) {
-    return value.toDateTimeAtStartOfDay().getMillis();
+    return value.toDateTimeAtStartOfDay(DateTimeZone.UTC).getMillis();
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
index 8b90b9208..eca6102fa 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
@@ -7,7 +7,7 @@ import java.sql.Date;
 import java.sql.Timestamp;
 import java.sql.Types;
 import java.time.LocalDate;
-import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 
 /**
@@ -23,9 +23,14 @@ public class ScalarTypeLocalDate extends ScalarTypeBaseDate<LocalDate> {
     return value.toString();
   }
 
+  @Override
+  public LocalDate convertFromMillis(long systemTimeMillis) {
+    return new Timestamp(systemTimeMillis).toLocalDateTime().toLocalDate();
+  }
+
   @Override
   public long convertToMillis(LocalDate value) {
-    ZonedDateTime zonedDateTime = value.atStartOfDay(ZoneId.systemDefault());
+    ZonedDateTime zonedDateTime = value.atStartOfDay(ZoneOffset.UTC);
     return zonedDateTime.toInstant().toEpochMilli();
   }
 
@@ -55,9 +60,4 @@ public class ScalarTypeLocalDate extends ScalarTypeBaseDate<LocalDate> {
     return (LocalDate) value;
   }
 
-  @Override
-  public LocalDate convertFromMillis(long systemTimeMillis) {
-    return new Timestamp(systemTimeMillis).toLocalDateTime().toLocalDate();
-  }
-
 }
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java
index 053950ab7..35b6683fd 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
 import java.sql.Types;
 import java.time.LocalDate;
 import java.time.YearMonth;
-import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 
 /**
@@ -25,7 +25,7 @@ public class ScalarTypeYearMonthDate extends ScalarTypeBaseDate<YearMonth> {
   }
 
   protected LocalDate toLocalDate(YearMonth yearMonth) {
-    return LocalDate.of(yearMonth.getYear(), yearMonth.getMonth(), 1);
+    return yearMonth.atDay(1);
   }
 
   protected YearMonth fromLocalDate(LocalDate localDate) {
@@ -39,8 +39,7 @@ public class ScalarTypeYearMonthDate extends ScalarTypeBaseDate<YearMonth> {
 
   @Override
   public long convertToMillis(YearMonth value) {
-    LocalDate localDate = toLocalDate(value);
-    ZonedDateTime zonedDateTime = localDate.atStartOfDay(ZoneId.systemDefault());
+    ZonedDateTime zonedDateTime = value.atDay(1).atStartOfDay(ZoneOffset.UTC);
     return zonedDateTime.toInstant().toEpochMilli();
   }
 
diff --git a/src/test/java/io/ebeaninternal/server/type/JsonTester.java b/src/test/java/io/ebeaninternal/server/type/JsonTester.java
index de6f2e324..578a1fb89 100644
--- a/src/test/java/io/ebeaninternal/server/type/JsonTester.java
+++ b/src/test/java/io/ebeaninternal/server/type/JsonTester.java
@@ -1,11 +1,11 @@
 package io.ebeaninternal.server.type;
 
-import io.ebean.config.JsonConfig;
-import io.ebeaninternal.server.text.json.WriteJson;
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
+import io.ebean.config.JsonConfig;
+import io.ebeaninternal.server.text.json.WriteJson;
 
 import java.io.IOException;
 import java.io.StringWriter;
@@ -26,7 +26,6 @@ public class JsonTester<T> {
   }
 
   public String test(T value) throws IOException {
-
     StringWriter writer = new StringWriter();
 
     JsonGenerator generator = factory.createGenerator(writer);
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java
index 5e938c854..1b4616902 100644
--- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java
@@ -5,7 +5,6 @@ import org.junit.Test;
 
 import java.io.IOException;
 import java.sql.Date;
-import java.time.LocalDate;
 
 import static org.assertj.core.api.StrictAssertions.assertThat;
 import static org.junit.Assert.assertEquals;
@@ -27,12 +26,14 @@ public class ScalarTypeDateTest {
   @Test
   public void json() throws IOException {
 
-    Date val = Date.valueOf(LocalDate.of(2019, 5, 9));
+
+    Date val = new Date(1557360000000L);
 
     JsonTester<Date> jsonMillis = new JsonTester<>(type);
-    assertThat(jsonMillis.test(val)).isEqualTo("{\"key\":1557316800000}");
+    assertThat(jsonMillis.test(val)).isEqualTo("{\"key\":1557360000000}");
 
     JsonTester<Date> jsonIso = new JsonTester<>(new ScalarTypeDate(JsonConfig.Date.ISO8601));
-    assertThat(jsonIso.test(val)).isEqualTo("{\"key\":\"2019-05-09\"}");
+    Date val1 = jsonIso.type.parse("2019-05-09");
+    assertThat(jsonIso.test(val1)).isEqualTo("{\"key\":\"2019-05-09\"}");
   }
 }
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java
index c5b5bbdb3..fc2246daf 100644
--- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java
@@ -66,7 +66,7 @@ public class ScalarTypeJodaLocalDateTest {
     LocalDate val = new LocalDate(2019, 5, 9);
 
     JsonTester<LocalDate> jsonMillis = new JsonTester<>(type);
-    assertThat(jsonMillis.test(val)).isEqualTo("{\"key\":1557316800000}");
+    assertThat(jsonMillis.test(val)).isEqualTo("{\"key\":1557360000000}");
 
     JsonTester<LocalDate> jsonIso = new JsonTester<>(new ScalarTypeJodaLocalDate(JsonConfig.Date.ISO8601) );
     assertThat(jsonIso.test(val)).isEqualTo("{\"key\":\"2019-05-09\"}");
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java
index e9250a30f..d17deb98e 100644
--- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java
@@ -63,7 +63,7 @@ public class ScalarTypeLocalDateTest {
     LocalDate val = LocalDate.of(2019, 5, 9);
 
     JsonTester<LocalDate> jsonMillis = new JsonTester<>(type);
-    assertThat(jsonMillis.test(val)).isEqualTo("{\"key\":1557316800000}");
+    assertThat(jsonMillis.test(val)).isEqualTo("{\"key\":1557360000000}");
 
     JsonTester<LocalDate> jsonIso = new JsonTester<>(new ScalarTypeLocalDate(JsonConfig.Date.ISO8601) );
     assertThat(jsonIso.test(val)).isEqualTo("{\"key\":\"2019-05-09\"}");
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java
index 4d614655e..29be8e8fa 100644
--- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java
@@ -15,12 +15,13 @@ public class ScalarTypeUtilDateTest {
   @Test
   public void json() throws IOException {
 
-    Date val = dateType.parse("2019-05-09");
+    Date val = new Date(1557316800000L);
 
     JsonTester<Date> jsonMillis = new JsonTester<>(dateType);
     assertThat(jsonMillis.test(val)).isEqualTo("{\"key\":1557316800000}");
 
     JsonTester<Date> jsonIso = new JsonTester<>(new ScalarTypeUtilDate.DateType(JsonConfig.Date.ISO8601) );
-    assertThat(jsonIso.test(val)).isEqualTo("{\"key\":\"2019-05-09\"}");
+    Date val1 = jsonIso.type.parse("2019-05-09");
+    assertThat(jsonIso.test(val1)).isEqualTo("{\"key\":\"2019-05-09\"}");
   }
 }
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java
index fc57ab04f..ec0979bd6 100644
--- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java
@@ -7,6 +7,8 @@ import java.io.IOException;
 import java.sql.Date;
 import java.time.LocalDate;
 import java.time.YearMonth;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
@@ -20,8 +22,9 @@ public class ScalarTypeYearMonthDateTest {
 
     LocalDate today = LocalDate.now();
     LocalDate firstMonthDay = today.withDayOfMonth(1);
-    Date date = Date.valueOf(firstMonthDay);
-    long epochMilli = date.getTime();
+    ZonedDateTime zonedDateTime = firstMonthDay.atStartOfDay(ZoneOffset.UTC);
+
+    long epochMilli = zonedDateTime.toInstant().toEpochMilli();
 
     YearMonth yearMonth = type.convertFromMillis(epochMilli);
     long val1 = type.convertToMillis(yearMonth);
@@ -60,7 +63,7 @@ public class ScalarTypeYearMonthDateTest {
     YearMonth val = YearMonth.of(2019, 5);
 
     JsonTester<YearMonth> jsonMillis = new JsonTester<>(type);
-    assertThat(jsonMillis.test(val)).isEqualTo("{\"key\":1556625600000}");
+    assertThat(jsonMillis.test(val)).isEqualTo("{\"key\":1556668800000}");
 
     JsonTester<YearMonth> jsonIso = new JsonTester<>(new ScalarTypeYearMonthDate(JsonConfig.Date.ISO8601) );
     assertThat(jsonIso.test(val)).isEqualTo("{\"key\":\"2019-05-01\"}");

From ecec966a85bc627a3cf9993f2de4c7bb0387f3b9 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 27 Apr 2019 11:20:21 +1200
Subject: [PATCH 0822/1036] #1686 - Change the default JSON format to ISO8601
 for date and datetime types (from epoch millis)

---
 src/main/java/io/ebean/config/ServerConfig.java      |  4 ++--
 src/test/java/io/ebean/config/ServerConfigTest.java  | 12 ++++++------
 .../server/deploy/TestDiffHelpInsertSimple.java      |  2 +-
 .../server/type/ScalarTypeLocalDateTest.java         |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 4b8fbbfc8..eaf40eb50 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -169,12 +169,12 @@ public class ServerConfig {
   /**
    * The JSON format used for DateTime types. Default to millis.
    */
-  private JsonConfig.DateTime jsonDateTime = JsonConfig.DateTime.MILLIS;
+  private JsonConfig.DateTime jsonDateTime = JsonConfig.DateTime.ISO8601;
 
   /**
    * The JSON format used for Date types. Default to millis.
    */
-  private JsonConfig.Date jsonDate = JsonConfig.Date.MILLIS;
+  private JsonConfig.Date jsonDate = JsonConfig.Date.ISO8601;
 
   /**
    * For writing JSON specify if null values or empty collections should be exluded.
diff --git a/src/test/java/io/ebean/config/ServerConfigTest.java b/src/test/java/io/ebean/config/ServerConfigTest.java
index ef62979ea..7a5097190 100644
--- a/src/test/java/io/ebean/config/ServerConfigTest.java
+++ b/src/test/java/io/ebean/config/ServerConfigTest.java
@@ -60,8 +60,8 @@ public class ServerConfigTest {
     props.setProperty("backgroundExecutorShutdownSecs", "98");
     props.setProperty("backgroundExecutorSchedulePoolSize", "4");
     props.setProperty("dbOffline", "true");
-    props.setProperty("jsonDateTime", "ISO8601");
-    props.setProperty("jsonDate", "ISO8601");
+    props.setProperty("jsonDateTime", "MILLIS");
+    props.setProperty("jsonDate", "MILLIS");
     props.setProperty("autoReadOnlyDataSource", "true");
     props.setProperty("disableL2Cache", "true");
     props.setProperty("notifyL2CacheInForeground", "true");
@@ -86,8 +86,8 @@ public class ServerConfigTest {
     assertEquals(PersistBatch.ALL, serverConfig.getPersistBatch());
     assertEquals(PersistBatch.ALL, serverConfig.getPersistBatchOnCascade());
     assertEquals(PlatformConfig.DbUuid.BINARY, serverConfig.getPlatformConfig().getDbUuid());
-    assertEquals(JsonConfig.DateTime.ISO8601, serverConfig.getJsonDateTime());
-    assertEquals(JsonConfig.Date.ISO8601, serverConfig.getJsonDate());
+    assertEquals(JsonConfig.DateTime.MILLIS, serverConfig.getJsonDateTime());
+    assertEquals(JsonConfig.Date.MILLIS, serverConfig.getJsonDate());
 
     assertEquals("r0,users,orgs", serverConfig.getEnabledL2Regions());
 
@@ -129,8 +129,8 @@ public class ServerConfigTest {
 
     serverConfig.setIdGeneratorAutomatic(false);
     assertFalse(serverConfig.isIdGeneratorAutomatic());
-    assertEquals(JsonConfig.DateTime.MILLIS, serverConfig.getJsonDateTime());
-    assertEquals(JsonConfig.Date.MILLIS, serverConfig.getJsonDate());
+    assertEquals(JsonConfig.DateTime.ISO8601, serverConfig.getJsonDateTime());
+    assertEquals(JsonConfig.Date.ISO8601, serverConfig.getJsonDate());
   }
 
   @Test
diff --git a/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java b/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java
index cd48d4247..4e7704a02 100644
--- a/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java
+++ b/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java
@@ -61,7 +61,7 @@ public class TestDiffHelpInsertSimple extends BaseTestCase {
 
     String asJson = buffer.toString();
 
-    assertThat(asJson).startsWith("{\"status\":\"NEW\",\"orderDate\":9466");
+    assertThat(asJson).startsWith("{\"status\":\"NEW\",\"orderDate\":\"2000-01-01\"");
     assertThat(asJson).endsWith(",\"customer\":{\"id\":1234}}");
   }
 
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java
index d17deb98e..f4621e79c 100644
--- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java
@@ -13,7 +13,7 @@ import static org.junit.Assert.assertTrue;
 
 public class ScalarTypeLocalDateTest {
 
-  ScalarTypeLocalDate type = new ScalarTypeLocalDate(JsonConfig.Date.MILLIS);
+  ScalarTypeLocalDate type = new ScalarTypeLocalDate(JsonConfig.Date.ISO8601);
 
   @Test
   public void testConvertToMillis() {
@@ -62,7 +62,7 @@ public class ScalarTypeLocalDateTest {
 
     LocalDate val = LocalDate.of(2019, 5, 9);
 
-    JsonTester<LocalDate> jsonMillis = new JsonTester<>(type);
+    JsonTester<LocalDate> jsonMillis = new JsonTester<>(new ScalarTypeLocalDate(JsonConfig.Date.MILLIS));
     assertThat(jsonMillis.test(val)).isEqualTo("{\"key\":1557360000000}");
 
     JsonTester<LocalDate> jsonIso = new JsonTester<>(new ScalarTypeLocalDate(JsonConfig.Date.ISO8601) );

From 6c88325dad4dd6f11bf251b3f678365ed75bec9f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 27 Apr 2019 22:57:30 +1200
Subject: [PATCH 0823/1036] #1685 Update ServerCacheFactory to support standard
 metrics collection

---
 src/main/java/io/ebean/cache/ServerCacheFactory.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main/java/io/ebean/cache/ServerCacheFactory.java b/src/main/java/io/ebean/cache/ServerCacheFactory.java
index 54c71e7d1..c39762209 100644
--- a/src/main/java/io/ebean/cache/ServerCacheFactory.java
+++ b/src/main/java/io/ebean/cache/ServerCacheFactory.java
@@ -1,10 +1,19 @@
 package io.ebean.cache;
 
+import io.ebean.meta.MetricVisitor;
+
 /**
  * Defines method for constructing caches for beans and queries.
  */
 public interface ServerCacheFactory {
 
+  /**
+   * Visit the metrics for the cache.
+   */
+  default void visit(MetricVisitor visitor) {
+    // do nothing by default
+  }
+
   /**
    * Create the cache for the given type with options.
    */

From b89371acd108b6f9bdd3b293c988094ecef56f29 Mon Sep 17 00:00:00 2001
From: Thibault Meyer <meyer.thibault@gmail.com>
Date: Sat, 27 Apr 2019 13:06:02 +0200
Subject: [PATCH 0824/1036] Fix implicit conversion from array to string

When converting an array to a readable string, use Arrays.toString
for one-dimensional arrays. This function iterate over the contents
of the array and produce human-readable output.

Signed-off-by: Thibault Meyer <meyer.thibault@gmail.com>
---
 .../ebeaninternal/server/type/bindcapture/BindCaptureTypes.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureTypes.java b/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureTypes.java
index 661047c44..1c859c8fb 100644
--- a/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureTypes.java
+++ b/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureTypes.java
@@ -95,7 +95,7 @@ class BindCaptureTypes {
 
     @Override
     public String toString() {
-      return String.valueOf(x);
+      return Arrays.toString(x);
     }
   }
 

From dc5ac029520aac1706aa1336c707837de2819ba3 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 27 Apr 2019 23:06:09 +1200
Subject: [PATCH 0825/1036] Bump to 11.38.1-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f6eb3b058..b996e7732 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.37.2-SNAPSHOT</version>
+  <version>11.38.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>

From e700f1c83c98bb681ecfb517eb5f3db94e9a4b27 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 27 Apr 2019 23:22:26 +1200
Subject: [PATCH 0826/1036] #1685 Update ServerCacheFactory to support standard
 metrics collection

---
 .../java/io/ebeaninternal/server/cache/DefaultCacheHolder.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java b/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
index 67ead88b3..620e78a46 100644
--- a/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
+++ b/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
@@ -48,6 +48,7 @@ class DefaultCacheHolder {
   }
 
   void visitMetrics(MetricVisitor visitor) {
+    cacheFactory.visit(visitor);
     for (ServerCache serverCache : allCaches.values()) {
       serverCache.visit(visitor);
     }

From a5e3a709219b26dbd078c481a0d4bedbbec7a459 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 28 Apr 2019 09:50:45 +1200
Subject: [PATCH 0827/1036] #1685 DefaultServerCache expose hit and miss count
 to assist testing

Expose these counters to assist the testing of duel caches where
 DefaultServerCache is used as the near cache.
---
 .../server/cache/DefaultServerCache.java           | 14 ++++++++++++++
 .../server/cache/DefaultServerCacheTest.java       |  7 +++++++
 2 files changed, 21 insertions(+)

diff --git a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
index 6c08d1975..a008c178d 100644
--- a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
+++ b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
@@ -119,6 +119,20 @@ public class DefaultServerCache implements ServerCache {
     return cacheStats;
   }
 
+  /**
+   * Return the count of get hits.
+   */
+  public long getHitCount() {
+    return hitCount.get(false);
+  }
+
+  /**
+   * Return the count of get misses.
+   */
+  public long getMissCount() {
+    return missCount.get(false);
+  }
+
   @Override
   public int getHitRatio() {
 
diff --git a/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java b/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java
index 53fcdf1e1..e86a4cea0 100644
--- a/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java
+++ b/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java
@@ -27,14 +27,21 @@ public class DefaultServerCacheTest {
 
     DefaultServerCache cache = createCache();
     assertEquals(0, cache.getHitRatio());
+    assertEquals(0, cache.getHitCount());
+    assertEquals(0, cache.getMissCount());
     cache.put("A", "A");
     cache.get("A");
     assertEquals(100, cache.getHitRatio());
+    assertEquals(1, cache.getHitCount());
+    assertEquals(0, cache.getMissCount());
     cache.get("B");
     assertEquals(50, cache.getHitRatio());
+    assertEquals(1, cache.getMissCount());
     cache.get("B");
     cache.get("B");
     assertEquals(25, cache.getHitRatio());
+    assertEquals(3, cache.getMissCount());
+    assertEquals(1, cache.getHitCount());
   }
 
   @Test

From c5d761076ab246baa08e1f73efbe0e1d1b736066 Mon Sep 17 00:00:00 2001
From: Thibault Meyer <meyer.thibault@gmail.com>
Date: Sun, 28 Apr 2019 12:10:56 +0200
Subject: [PATCH 0828/1036] Remove useless comparison test

The result of certain comparison tests can sometimes be inferred
from their context and the results of other comparisons. Inspect
the code to check whether the logic is correct, and consider
simplifying the logical expression.

Signed-off-by: Thibault Meyer <meyer.thibault@gmail.com>
---
 .../dbplatform/sqlserver/SqlServer2005SqlLimiter.java     | 8 ++------
 .../config/dbplatform/sqlserver/SqlServerSqlLimiter.java  | 6 ++----
 .../io/ebeaninternal/server/query/CQueryPlanRawSql.java   | 6 ++----
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2005SqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2005SqlLimiter.java
index cccef861e..e1b198487 100644
--- a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2005SqlLimiter.java
+++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2005SqlLimiter.java
@@ -65,13 +65,9 @@ public class SqlServer2005SqlLimiter implements SqlLimiter {
     sb.append(NEW_LINE).append(") ");
     sb.append(rowNumberWindowAlias);
     sb.append(" where ");
-    if (firstRow > 0) {
-      sb.append(" rn > ").append(firstRow);
-      if (lastRow > 0) {
-        sb.append(" and ");
-      }
-    }
+    sb.append(" rn > ").append(firstRow);
     if (lastRow > 0) {
+      sb.append(" and ");
       sb.append(" rn <= ").append(lastRow);
     }
 
diff --git a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerSqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerSqlLimiter.java
index 0ca126b34..8d05c610c 100644
--- a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerSqlLimiter.java
+++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerSqlLimiter.java
@@ -38,10 +38,8 @@ public class SqlServerSqlLimiter implements SqlLimiter {
     }
 
     sb.append(dbSql);
-    if (firstRow > 0) {
-      sb.append(" ").append("offset");
-      sb.append(" ").append(firstRow).append(" rows");
-    }
+    sb.append(" ").append("offset");
+    sb.append(" ").append(firstRow).append(" rows");
     if (maxRows > 0) {
       sb.append(" fetch next ").append(maxRows).append(" rows only");
     }
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlanRawSql.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlanRawSql.java
index 0c7e8c3a0..70167e823 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryPlanRawSql.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlanRawSql.java
@@ -48,10 +48,8 @@ class CQueryPlanRawSql extends CQueryPlan {
     // an associated bean is in the raw SQL but is mapped columnIgnore
     for (int i = 0; i < indexPositions.length; i++) {
       if (indexPositions[i] == 0) {
-        if (i < indexPositions.length) {
-          // expect discriminator column to immediately proceed id column
-          indexPositions[i] = indexPositions[i + 1] - 1;
-        }
+        // expect discriminator column to immediately proceed id column
+        indexPositions[i] = indexPositions[i + 1] - 1;
       }
     }
 

From 4bf9e2b18ee68001b932a38689648279177d97f6 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 30 Apr 2019 16:34:01 +1200
Subject: [PATCH 0829/1036] Bump ebean-datasource to 4.5.2

---
 pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index b996e7732..543f05ca0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +129,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-datasource</artifactId>
-      <version>4.5.1</version>
+      <version>4.5.2</version>
     </dependency>
 
     <dependency>
@@ -220,10 +220,10 @@
     <!-- Test scope -->
 
     <!--<dependency>-->
-      <!--<groupId>oracle</groupId>-->
-      <!--<artifactId>oracle-jdbc</artifactId>-->
-      <!--<version>7.0</version>-->
-      <!--<scope>test</scope>-->
+    <!--<groupId>oracle</groupId>-->
+    <!--<artifactId>oracle-jdbc</artifactId>-->
+    <!--<version>7.0</version>-->
+    <!--<scope>test</scope>-->
     <!--</dependency>-->
 
     <dependency>

From 856a3a6fdd721b24e59e6d2f9101c7559253d8ed Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 30 Apr 2019 20:13:12 +1200
Subject: [PATCH 0830/1036] #1689 - ENH: Add query usingTransaction() and
 usingConnection()

---
 src/main/java/io/ebean/ExpressionList.java    | 11 ++++
 src/main/java/io/ebean/Query.java             | 11 ++++
 .../expression/DefaultExpressionList.java     | 11 ++++
 .../server/expression/JunctionExpression.java | 11 ++++
 .../server/querydefn/DefaultOrmQuery.java     | 59 ++++++++++-------
 .../org/tests/basic/TestQueryForUpdate.java   | 32 +++++-----
 .../tests/basic/TestQueryUsingConnection.java | 63 +++++++++++++++++++
 .../transaction/TestAutoCommitDataSource.java | 38 +++++------
 .../TestExplicitTransactionMode.java          | 42 +++++++------
 9 files changed, 200 insertions(+), 78 deletions(-)
 create mode 100644 src/test/java/org/tests/basic/TestQueryUsingConnection.java

diff --git a/src/main/java/io/ebean/ExpressionList.java b/src/main/java/io/ebean/ExpressionList.java
index be78a5738..4480251e1 100644
--- a/src/main/java/io/ebean/ExpressionList.java
+++ b/src/main/java/io/ebean/ExpressionList.java
@@ -9,6 +9,7 @@ import io.ebean.search.TextSimple;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.persistence.NonUniqueResultException;
+import java.sql.Connection;
 import java.sql.Timestamp;
 import java.util.Collection;
 import java.util.List;
@@ -186,6 +187,16 @@ public interface ExpressionList<T> {
    */
   Query<T> setIncludeSoftDeletes();
 
+  /**
+   * Execute the query using the given transaction.
+   */
+  Query<T> usingTransaction(Transaction transaction);
+
+  /**
+   * Execute the query using the given connection.
+   */
+  Query<T> usingConnection(Connection connection);
+
   /**
    * Execute as a delete query deleting the 'root level' beans that match the predicates
    * in the query.
diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index 9bc8508ca..218f12a43 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -3,6 +3,7 @@ package io.ebean;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.persistence.NonUniqueResultException;
+import java.sql.Connection;
 import java.sql.Timestamp;
 import java.util.List;
 import java.util.Map;
@@ -631,6 +632,16 @@ public interface Query<T> {
    */
   Query<T> apply(FetchPath fetchPath);
 
+  /**
+   * Execute the query using the given transaction.
+   */
+  Query<T> usingTransaction(Transaction transaction);
+
+  /**
+   * Execute the query using the given connection.
+   */
+  Query<T> usingConnection(Connection connection);
+
   /**
    * Execute the query returning the list of Id's.
    * <p>
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index e757214bb..35a388094 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -36,6 +36,7 @@ import io.ebeaninternal.api.SpiJunction;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 
 import java.io.IOException;
+import java.sql.Connection;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -358,6 +359,16 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return query.apply(fetchPath);
   }
 
+  @Override
+  public Query<T> usingTransaction(Transaction transaction) {
+    return query.usingTransaction(transaction);
+  }
+
+  @Override
+  public Query<T> usingConnection(Connection connection) {
+    return query.usingConnection(connection);
+  }
+
   @Override
   public int delete() {
     return query.delete();
diff --git a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index c71f82647..32fb51f20 100644
--- a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -34,6 +34,7 @@ import io.ebeaninternal.api.SpiJunction;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 
 import java.io.IOException;
+import java.sql.Connection;
 import java.sql.Timestamp;
 import java.util.Collection;
 import java.util.List;
@@ -330,6 +331,16 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     throw new IllegalStateException("filterMany not allowed on Junction expression list");
   }
 
+  @Override
+  public Query<T> usingTransaction(Transaction transaction) {
+    return exprList.usingTransaction(transaction);
+  }
+
+  @Override
+  public Query<T> usingConnection(Connection connection) {
+    return exprList.usingConnection(connection);
+  }
+
   @Override
   public int delete() {
     return exprList.delete();
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index e5e1639a7..49140b07e 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -44,6 +44,7 @@ import io.ebeaninternal.api.SpiExpressionValidation;
 import io.ebeaninternal.api.SpiNamedParam;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.SpiQuerySecondary;
+import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.autotune.ProfilingListener;
 import io.ebeaninternal.server.core.SpiOrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
@@ -56,11 +57,12 @@ import io.ebeaninternal.server.expression.SimpleExpression;
 import io.ebeaninternal.server.query.CancelableQuery;
 import io.ebeaninternal.server.query.NativeSqlQueryPlanKey;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
+import io.ebeaninternal.server.transaction.ExternalJdbcTransaction;
 
 import javax.persistence.PersistenceException;
+import java.sql.Connection;
 import java.sql.Timestamp;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -91,6 +93,8 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   private final ExpressionFactory expressionFactory;
 
+  private SpiTransaction transaction;
+
   /**
    * For lazy loading of ManyToMany we need to add a join to the intersection table. This is that
    * join to the intersection table.
@@ -812,6 +816,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   @Override
   public DefaultOrmQuery<T> copy(SpiEbeanServer server) {
     DefaultOrmQuery<T> copy = new DefaultOrmQuery<>(beanDescriptor, server, expressionFactory);
+    copy.transaction = transaction;
     copy.m2mIncludeJoin = m2mIncludeJoin;
     copy.profilingListener = profilingListener;
     copy.profileLocation = profileLocation;
@@ -1431,9 +1436,21 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return this;
   }
 
+  @Override
+  public Query<T> usingTransaction(Transaction transaction) {
+    this.transaction = (SpiTransaction)transaction;
+    return this;
+  }
+
+  @Override
+  public Query<T> usingConnection(Connection connection) {
+    this.transaction = new ExternalJdbcTransaction(connection);
+    return this;
+  }
+
   @Override
   public int delete() {
-    return server.delete(this, null);
+    return server.delete(this, transaction);
   }
 
   @Override
@@ -1443,7 +1460,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   @Override
   public int update() {
-    return server.update(this, null);
+    return server.update(this, transaction);
   }
 
   @Override
@@ -1456,12 +1473,12 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     // a copy of this query is made in the server
     // as the query needs to modified (so we modify
     // the copy rather than this query instance)
-    return server.findIds(this, null);
+    return server.findIds(this, transaction);
   }
 
   @Override
   public boolean exists() {
-    return server.exists(this, null);
+    return server.exists(this, transaction);
   }
 
   @Override
@@ -1469,28 +1486,28 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     // a copy of this query is made in the server
     // as the query needs to modified (so we modify
     // the copy rather than this query instance)
-    return server.findCount(this, null);
+    return server.findCount(this, transaction);
   }
 
   @Override
   public void findEachWhile(Predicate<T> consumer) {
-    server.findEachWhile(this, consumer, null);
+    server.findEachWhile(this, consumer, transaction);
   }
 
   @Override
   public void findEach(Consumer<T> consumer) {
-    server.findEach(this, consumer, null);
+    server.findEach(this, consumer, transaction);
   }
 
   @Override
   public QueryIterator<T> findIterate() {
-    return server.findIterate(this, null);
+    return server.findIterate(this, transaction);
   }
 
   @Override
   public List<Version<T>> findVersions() {
     this.temporalMode = TemporalMode.VERSIONS;
-    return server.findVersions(this, null);
+    return server.findVersions(this, transaction);
   }
 
   @Override
@@ -1501,28 +1518,28 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     this.temporalMode = TemporalMode.VERSIONS;
     this.versionsStart = start;
     this.versionsEnd = end;
-    return server.findVersions(this, null);
+    return server.findVersions(this, transaction);
   }
 
   @Override
   public List<T> findList() {
-    return server.findList(this, null);
+    return server.findList(this, transaction);
   }
 
   @Override
   public Set<T> findSet() {
-    return server.findSet(this, null);
+    return server.findSet(this, transaction);
   }
 
   @Override
   public <K> Map<K, T> findMap() {
-    return server.findMap(this, null);
+    return server.findMap(this, transaction);
   }
 
   @Override
   @SuppressWarnings("unchecked")
   public <A> List<A> findSingleAttributeList() {
-    return (List<A>) server.findSingleAttributeList(this, null);
+    return (List<A>) server.findSingleAttributeList(this, transaction);
   }
 
   @Override
@@ -1533,32 +1550,32 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   @Override
   public T findOne() {
-    return server.findOne(this, null);
+    return server.findOne(this, transaction);
   }
 
   @Override
   public Optional<T> findOneOrEmpty() {
-    return server.findOneOrEmpty(this, null);
+    return server.findOneOrEmpty(this, transaction);
   }
 
   @Override
   public FutureIds<T> findFutureIds() {
-    return server.findFutureIds(this, null);
+    return server.findFutureIds(this, transaction);
   }
 
   @Override
   public FutureList<T> findFutureList() {
-    return server.findFutureList(this, null);
+    return server.findFutureList(this, transaction);
   }
 
   @Override
   public FutureRowCount<T> findFutureCount() {
-    return server.findFutureCount(this, null);
+    return server.findFutureCount(this, transaction);
   }
 
   @Override
   public PagedList<T> findPagedList() {
-    return server.findPagedList(this, null);
+    return server.findPagedList(this, transaction);
   }
 
   /**
diff --git a/src/test/java/org/tests/basic/TestQueryForUpdate.java b/src/test/java/org/tests/basic/TestQueryForUpdate.java
index f5013e77e..b6f62cac7 100644
--- a/src/test/java/org/tests/basic/TestQueryForUpdate.java
+++ b/src/test/java/org/tests/basic/TestQueryForUpdate.java
@@ -2,8 +2,8 @@ package org.tests.basic;
 
 import io.ebean.AcquireLockException;
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
-import io.ebean.EbeanServer;
+import io.ebean.DB;
+import io.ebean.Database;
 import io.ebean.Query;
 import io.ebean.Transaction;
 import io.ebean.annotation.ForPlatform;
@@ -30,7 +30,7 @@ public class TestQueryForUpdate extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Query<Customer> query = Ebean.find(Customer.class)
+    Query<Customer> query = DB.find(Customer.class)
       .forUpdate()
       .order().desc("id");
 
@@ -49,16 +49,16 @@ public class TestQueryForUpdate extends BaseTestCase {
   public void testForUpdate_when_alreadyInPC() {
 
     EBasic basic = new EBasic("test PC cache");
-    Ebean.save(basic);
+    DB.save(basic);
 
-    try (Transaction transaction = Ebean.beginTransaction()) {
+    try (Transaction transaction = DB.beginTransaction()) {
 
       LoggedSqlCollector.start();
 
-      EBasic basic0 = Ebean.find(EBasic.class, basic.getId());
+      EBasic basic0 = DB.find(EBasic.class, basic.getId());
       assertThat(basic0).isNotNull();
 
-      EBasic basic1 = Ebean.find(EBasic.class)
+      EBasic basic1 = DB.find(EBasic.class)
         .setId( basic.getId())
         .forUpdate()
         .findOne();
@@ -86,7 +86,7 @@ public class TestQueryForUpdate extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Query<Customer> query = Ebean.find(Customer.class)
+    Query<Customer> query = DB.find(Customer.class)
       .forUpdateNoWait()
       .order().desc("id");
 
@@ -110,10 +110,10 @@ public class TestQueryForUpdate extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    EbeanServer server = Ebean.getDefaultServer();
+    Database server = DB.getDefault();
 
-    try (Transaction txn = Ebean.beginTransaction()) {
-      Query<Customer> query = Ebean.find(Customer.class)
+    try (Transaction txn = DB.beginTransaction()) {
+      Query<Customer> query = DB.find(Customer.class)
         .forUpdateNoWait()
         .setMaxRows(1)
         .order().desc("id");
@@ -131,12 +131,12 @@ public class TestQueryForUpdate extends BaseTestCase {
       // row is locked and we can't acquire it
       try (Transaction txn2 = server.createTransaction()) {
         logger.info("... attempt another acquire using 2nd transaction");
-        Query<Customer> query2 =
-          server.find(Customer.class)
-            .where().idEq(first.getId())
-            .forUpdateNoWait();
+        server.find(Customer.class)
+          .where().idEq(first.getId())
+          .forUpdateNoWait()
+          .usingTransaction(txn2)
+          .findOne();
 
-        server.extended().findOne(query2, txn2);
         assertTrue(false); // never get here
       } catch (AcquireLockException e) {
         logger.info("... got AcquireLockException " + e);
diff --git a/src/test/java/org/tests/basic/TestQueryUsingConnection.java b/src/test/java/org/tests/basic/TestQueryUsingConnection.java
new file mode 100644
index 000000000..656af123f
--- /dev/null
+++ b/src/test/java/org/tests/basic/TestQueryUsingConnection.java
@@ -0,0 +1,63 @@
+package org.tests.basic;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import io.ebean.Transaction;
+import org.junit.Test;
+import org.tests.model.basic.Country;
+import org.tests.model.basic.ResetBasicData;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestQueryUsingConnection extends BaseTestCase {
+
+  @Test
+  public void usingConnection() throws SQLException {
+
+    ResetBasicData.reset();
+
+    DataSource dataSource = DB.getDefault().getPluginApi().getDataSource();
+
+    try (Connection connection = dataSource.getConnection()) {
+
+      int count = DB.find(Country.class)
+        .usingConnection(connection)
+        .findCount();
+
+      assertThat(count).isGreaterThan(0);
+    }
+  }
+
+  @Test
+  public void usingTransaction() {
+
+    ResetBasicData.reset();
+
+    try (Transaction transaction = DB.getDefault().createTransaction()) {
+
+      Transaction current = Transaction.current();
+      assertThat(current).isNull();
+
+      Country x = new Country();
+      x.setCode("xx");
+      x.setName("WillRollThisBack");
+
+      DB.getDefault().insert(x, transaction);
+
+      final int count = DB.find(Country.class)
+        .usingTransaction(transaction)
+        .findCount();
+
+      final int otherCount = DB.find(Country.class).findCount();
+
+      transaction.rollback();
+
+      assertThat(count).isEqualTo(otherCount + 1);
+    }
+
+  }
+}
diff --git a/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java b/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java
index 46006426b..ac737164c 100644
--- a/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java
+++ b/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java
@@ -1,13 +1,13 @@
 package org.tests.transaction;
 
 import io.ebean.BaseTestCase;
-import io.ebean.EbeanServer;
-import io.ebean.EbeanServerFactory;
+import io.ebean.Database;
+import io.ebean.DatabaseFactory;
 import io.ebean.Query;
 import io.ebean.Transaction;
 import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
-import io.ebean.config.ServerConfig;
+import io.ebean.config.DatabaseConfig;
 import io.ebean.config.properties.PropertiesLoader;
 import io.ebean.datasource.DataSourceConfig;
 import io.ebean.datasource.DataSourcePool;
@@ -42,7 +42,7 @@ public class TestAutoCommitDataSource extends BaseTestCase {
     assertTrue(connection.getAutoCommit());
     connection.close();
 
-    ServerConfig config = new ServerConfig();
+    DatabaseConfig config = new DatabaseConfig();
     config.setName("h2autocommit");
     config.loadFromProperties();
     config.setDataSource(pool);
@@ -57,9 +57,9 @@ public class TestAutoCommitDataSource extends BaseTestCase {
 
     config.setAutoCommitMode(true);
 
-    EbeanServer ebeanServer = EbeanServerFactory.create(config);
+    Database database = DatabaseFactory.create(config);
 
-    Query<UTMaster> query = ebeanServer.find(UTMaster.class);
+    Query<UTMaster> query = database.find(UTMaster.class);
     List<UTMaster> details = query.findList();
     assertEquals(0, details.size());
 
@@ -68,28 +68,24 @@ public class TestAutoCommitDataSource extends BaseTestCase {
     UTMaster bean3 = new UTMaster("three3");
 
     // use a different transaction to do final query check
-    try (Transaction otherTxn = ebeanServer.createTransaction()) {
-
-      Transaction txn = ebeanServer.beginTransaction();
-      try {
+    try (Transaction otherTxn = database.createTransaction()) {
+      try (Transaction txn = database.beginTransaction()) {
         assertTrue(txn.getConnection().getAutoCommit());
-        ebeanServer.save(bean1);
-        ebeanServer.save(bean2);
+        database.save(bean1);
+        database.save(bean2);
 
-        Query<UTMaster> query2 = ebeanServer.find(UTMaster.class);
-        details = ebeanServer.extended().findList(query2, otherTxn);
+        details = database.find(UTMaster.class)
+          .usingTransaction(otherTxn)
+          .findList();
         assertEquals(2, details.size());
 
-        ebeanServer.save(bean3);
-
+        database.save(bean3);
         txn.rollback();
-
-      } finally {
-        txn.end();
       }
 
-      Query<UTMaster> query3 = ebeanServer.find(UTMaster.class);
-      details = ebeanServer.extended().findList(query3, otherTxn);
+      details = database.find(UTMaster.class)
+        .usingTransaction(otherTxn)
+        .findList();
       assertEquals(3, details.size());
     }
 
diff --git a/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
index 66da8f645..23fa375d3 100644
--- a/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
+++ b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
@@ -1,14 +1,14 @@
 package org.tests.transaction;
 
 import io.ebean.BaseTestCase;
-import io.ebean.EbeanServer;
-import io.ebean.EbeanServerFactory;
+import io.ebean.Database;
+import io.ebean.DatabaseFactory;
 import io.ebean.Query;
 import io.ebean.Transaction;
 import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
+import io.ebean.config.DatabaseConfig;
 import io.ebean.config.JsonConfig;
-import io.ebean.config.ServerConfig;
 import io.ebean.config.properties.PropertiesLoader;
 import io.ebean.datasource.DataSourceConfig;
 import io.ebean.datasource.DataSourcePool;
@@ -46,7 +46,7 @@ public class TestExplicitTransactionMode extends BaseTestCase {
     assertTrue(connection.getAutoCommit());
     connection.close();
 
-    ServerConfig config = new ServerConfig();
+    DatabaseConfig config = new DatabaseConfig();
     config.setName("h2autocommit2");
     config.loadFromProperties();
     config.setDataSource(pool);
@@ -61,44 +61,44 @@ public class TestExplicitTransactionMode extends BaseTestCase {
     config.setDdlExtra(false);
     config.addClass(ScalarTypeLocalDateAsString.class);
 
-    EbeanServer ebeanServer = EbeanServerFactory.create(config);
+    Database database = DatabaseFactory.create(config);
 
-    testJsonScalarType(ebeanServer);
+    testJsonScalarType(database);
 
-    Query<UTMaster> query = ebeanServer.find(UTMaster.class);
+    Query<UTMaster> query = database.find(UTMaster.class);
     List<UTMaster> details = query.findList();
     assertEquals(0, details.size());
 
     UTMaster bean0 = new UTMaster("one0");
-    Transaction txn0 = ebeanServer.beginTransaction();
+    Transaction txn0 = database.beginTransaction();
     try {
-      ebeanServer.save(bean0);
+      database.save(bean0);
       txn0.rollback();
     } finally {
       txn0.end();
     }
 
     // rollback as expected
-    assertEquals(0, ebeanServer.find(UTMaster.class).findCount());
+    assertEquals(0, database.find(UTMaster.class).findCount());
 
     UTMaster bean1 = new UTMaster("one1");
     UTMaster bean2 = new UTMaster("two2");
     UTMaster bean3 = new UTMaster("three3");
 
     // use a different transaction to do final query check
-    try (Transaction otherTxn = ebeanServer.createTransaction()) {
+    try (Transaction otherTxn = database.createTransaction()) {
 
-      Transaction txn = ebeanServer.beginTransaction();
+      Transaction txn = database.beginTransaction();
       try {
-        ebeanServer.save(bean1);
-        ebeanServer.save(bean2);
+        database.save(bean1);
+        database.save(bean2);
 
         // not visible in other transaction
-        Query<UTMaster> query2 = ebeanServer.find(UTMaster.class);
-        details = ebeanServer.extended().findList(query2, otherTxn);
+        Query<UTMaster> query2 = database.find(UTMaster.class);
+        details = database.extended().findList(query2, otherTxn);
         assertEquals(0, details.size());
 
-        ebeanServer.save(bean3);
+        database.save(bean3);
 
         txn.commit();
 
@@ -107,13 +107,15 @@ public class TestExplicitTransactionMode extends BaseTestCase {
       }
 
       // commit as expected
-      Query<UTMaster> query3 = ebeanServer.find(UTMaster.class);
-      details = ebeanServer.extended().findList(query3, otherTxn);
+      details = database.find(UTMaster.class)
+        .usingTransaction(otherTxn)
+        .findList();
+
       assertEquals(3, details.size());
     }
   }
 
-  private void testJsonScalarType(EbeanServer ebeanServer) {
+  private void testJsonScalarType(Database ebeanServer) {
     UTMaster bean = new UTMaster("one1");
     bean.setDate(LocalDate.of(2019, 04, 20));
 

From 9fdb375229a485067d093f5eb13b0111ab303e21 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 30 Apr 2019 23:42:59 +1200
Subject: [PATCH 0831/1036] #1691 - Refactor io.ebean.Model to use a named
 database - support for use with non-default named database

---
 src/main/java/io/ebean/Model.java             | 53 ++++++++-----------
 .../deploy/parse/DeployCreateProperties.java  | 31 +++++------
 .../tests/model/onetoone/album/BaseModel.java |  1 +
 3 files changed, 36 insertions(+), 49 deletions(-)

diff --git a/src/main/java/io/ebean/Model.java b/src/main/java/io/ebean/Model.java
index 60d200869..9eae9b444 100644
--- a/src/main/java/io/ebean/Model.java
+++ b/src/main/java/io/ebean/Model.java
@@ -75,6 +75,25 @@ import io.ebean.bean.EntityBean;
  */
 public abstract class Model {
 
+  /**
+   * The name of the database this entity will use, null for the default database.
+   */
+  private final String _$dbName;
+
+  /**
+   * Create using the default database.
+   */
+  public Model() {
+    this._$dbName = null;
+  }
+
+  /**
+   * Create with a named database (typically not the default database).
+   */
+  public Model(String dbName) {
+    this._$dbName = dbName;
+  }
+
   /**
    * Return the underlying 'default' Database.
    * <p>
@@ -107,17 +126,8 @@ public abstract class Model {
    *
    * }</pre>
    */
-  public static Database db() {
-    return DB.getDefault();
-  }
-
-  /**
-   * Return a named Database that is typically different to the default database.
-   *
-   * @param server The name of the Database. If this is null then the default Database is returned.
-   */
-  public static Database db(String server) {
-    return DB.byName(server);
+  public Database db() {
+    return DB.byName(_$dbName);
   }
 
   /**
@@ -245,27 +255,6 @@ public abstract class Model {
     return db().deletePermanent(this);
   }
 
-  /**
-   * Perform an update using this entity against the specified server.
-   */
-  public void update(String server) {
-    db(server).update(this);
-  }
-
-  /**
-   * Perform an insert using this entity against the specified server.
-   */
-  public void insert(String server) {
-    db(server).insert(this);
-  }
-
-  /**
-   * Perform a delete using this entity against the specified server.
-   */
-  public boolean delete(String server) {
-    return db(server).delete(this);
-  }
-
   /**
    * Refreshes this entity from the database.
    *
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
index 7000ba2b1..1011eb23b 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.deploy.parse;
 
+import io.ebean.Model;
 import io.ebean.annotation.DbArray;
 import io.ebean.annotation.DbHstore;
 import io.ebean.annotation.DbJson;
@@ -64,17 +65,18 @@ public class DeployCreateProperties {
    * </p>
    */
   private boolean ignoreFieldByName(String fieldName) {
-    if (fieldName.startsWith("_ebean_") || fieldName.equals("_$targetDatabase")) {
+    if (fieldName.startsWith("_ebean_")) {
       // ignore Ebean internal fields
       return true;
     }
-    if (fieldName.startsWith("ajc$instance$")) {
-      // ignore AspectJ internal fields
-      return true;
-    }
+    // ignore AspectJ internal fields
+    return fieldName.startsWith("ajc$instance$");
+  }
 
-    // we are interested in this field
-    return false;
+  private boolean ignoreField(Field field) {
+    return Modifier.isStatic(field.getModifiers())
+      || Modifier.isTransient(field.getModifiers())
+      || ignoreFieldByName(field.getName());
   }
 
   /**
@@ -83,6 +85,10 @@ public class DeployCreateProperties {
    */
   private void createProperties(DeployBeanDescriptor<?> desc, Class<?> beanType, int level) {
 
+    if (beanType.equals(Model.class)) {
+      // ignore all fields on model (_$dbName)
+      return;
+    }
     boolean scalaObject = desc.isScalaObject();
 
     try {
@@ -92,16 +98,7 @@ public class DeployCreateProperties {
       for (int i = 0; i < fields.length; i++) {
 
         Field field = fields[i];
-        if (Modifier.isStatic(field.getModifiers())) {
-          // not interested in static fields
-          logger.trace("Skipping static field {} in {}", field.getName(), beanType.getName());
-
-        } else if (Modifier.isTransient(field.getModifiers())) {
-          // not interested in transient fields
-          logger.trace("Skipping transient field {} in {}", field.getName(), beanType.getName());
-
-        } else if (!ignoreFieldByName(field.getName())) {
-
+        if (!ignoreField(field)) {
           String fieldName = getFieldName(field, beanType);
           String initFieldName = initCap(fieldName);
 
diff --git a/src/test/java/org/tests/model/onetoone/album/BaseModel.java b/src/test/java/org/tests/model/onetoone/album/BaseModel.java
index 45b905518..3b316eb91 100644
--- a/src/test/java/org/tests/model/onetoone/album/BaseModel.java
+++ b/src/test/java/org/tests/model/onetoone/album/BaseModel.java
@@ -25,6 +25,7 @@ public abstract class BaseModel extends Model {
   protected DateTime lastUpdate;
 
   protected BaseModel() {
+    super(null);
   }
 
   public Long getId() {

From 8e45462c2c1cef210e9cd133dcd33d36631e6c52 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 30 Apr 2019 23:43:52 +1200
Subject: [PATCH 0832/1036] Bump ebean-annotation to 4.10 with @DbName

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 543f05ca0..3c757caae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>4.9</version>
+      <version>4.10</version>
     </dependency>
 
     <dependency>

From b746c83ed74cabb2e8994330860fac601a794ba8 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 1 May 2019 00:39:44 +1200
Subject: [PATCH 0833/1036] [maven-release-plugin] prepare release
 ebean-11.38.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3c757caae..7c7d55ecd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.38.1-SNAPSHOT</version>
+  <version>11.38.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.38.1</tag>
   </scm>
 
   <profiles>

From ed83bababcb37a57c6aec91c8c340ffd69c6aabb Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 1 May 2019 00:39:58 +1200
Subject: [PATCH 0834/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7c7d55ecd..133bb398c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.38.1</version>
+  <version>11.38.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.38.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From e4569f9362ed72e02f73b7e0e488473f37190c9d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 3 May 2019 12:45:03 +1200
Subject: [PATCH 0835/1036] #1693 - Update ebean-migration 11.15.1

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 133bb398c..cf06c4e09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>11.14.1</version>
+      <version>11.15.1</version>
     </dependency>
 
     <dependency>
@@ -250,7 +250,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-agent</artifactId>
-      <version>11.37.1</version>
+      <version>11.38.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -330,7 +330,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>11.37.1</version>
+        <version>11.38.1</version>
         <executions>
           <execution>
             <id>test</id>

From 4aa8a0dc63cfc47b4613e92f1e032a1a69290dee Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 3 May 2019 14:33:42 +1200
Subject: [PATCH 0836/1036] #1694 - findList() with firstRows/maxRows adds
 "order by id" (even with orderById(false))

---
 .../java/io/ebean/config/ServerConfig.java    |  5 ++-
 .../server/querydefn/DefaultOrmQuery.java     |  2 +-
 .../java/io/ebean/EbeanServer_eqlTest.java    |  8 ++--
 .../server/grammer/EqlParserTest.java         |  2 +-
 .../server/rawsql/TestRawSqlParsing.java      | 30 ++++++++++++++-
 .../model/history/TestHistoryOneToMany.java   |  4 +-
 .../TestAddOrderByWithFirstRowsMaxRows.java   | 12 ++++--
 .../org/tests/query/TestQueryOrderById.java   | 37 +++++++++++++++++++
 .../orderby/TestOrderByWithDistinct.java      |  9 +++--
 .../query/other/TestQuerySingleAttribute.java |  7 +++-
 .../softdelete/TestSoftDeletePagingList.java  |  4 +-
 11 files changed, 98 insertions(+), 22 deletions(-)
 create mode 100644 src/test/java/org/tests/query/TestQueryOrderById.java

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index eaf40eb50..d5fb6092e 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -518,7 +518,7 @@ public class ServerConfig {
   /**
    * Controls the default order by id setting of queries. See {@link Query#orderById(boolean)}
    */
-  private boolean defaultOrderById = false;
+  private boolean defaultOrderById;
 
   /**
    * The mappingLocations for searching xml mapping.
@@ -585,8 +585,9 @@ public class ServerConfig {
 
 
   /**
-   * Sets the default orderById setting for queries.
+   * Deprecated - look to have explicit order by. Sets the default orderById setting for queries.
    */
+  @Deprecated
   public void setDefaultOrderById(boolean defaultOrderById) {
     this.defaultOrderById = defaultOrderById;
   }
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 49140b07e..56a7c35c2 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1615,7 +1615,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   @Override
   public boolean checkPagingOrderBy() {
-    return !useDocStore && (maxRows > 1 || firstRow > 0) && !distinct && (orderByIsEmpty() || isOrderById());
+    return orderById && !useDocStore;
   }
 
   @Override
diff --git a/src/test/java/io/ebean/EbeanServer_eqlTest.java b/src/test/java/io/ebean/EbeanServer_eqlTest.java
index 75c0c1f4f..1e160484d 100644
--- a/src/test/java/io/ebean/EbeanServer_eqlTest.java
+++ b/src/test/java/io/ebean/EbeanServer_eqlTest.java
@@ -135,12 +135,12 @@ public class EbeanServer_eqlTest extends BaseTestCase {
     query.findList();
 
     if (isSqlServer()) {
-      assertThat(query.getGeneratedSql()).endsWith("order by t0.id offset 3 rows fetch next 10 rows only");
+      assertThat(query.getGeneratedSql()).endsWith("from o_customer t0 offset 3 rows fetch next 10 rows only");
     } else if (isOracle()) {
       assertThat(query.getGeneratedSql()).contains("where rownum <= 13");
       assertThat(query.getGeneratedSql()).contains("where rn_ > 3");
     } else {
-      assertThat(query.getGeneratedSql()).endsWith("order by t0.id limit 10 offset 3");
+      assertThat(query.getGeneratedSql()).endsWith("from o_customer t0 limit 10 offset 3");
     }
   }
 
@@ -155,12 +155,10 @@ public class EbeanServer_eqlTest extends BaseTestCase {
 
     if (isSqlServer()) {
       assertThat(query.getGeneratedSql()).startsWith("select top 10 ");
-      assertThat(query.getGeneratedSql()).endsWith("order by t0.id");
     } else if (isOracle()) {
-      assertThat(query.getGeneratedSql()).contains("t0 order by t0.id");
       assertThat(query.getGeneratedSql()).contains(" a  where rownum <= 10");
     } else {
-      assertThat(query.getGeneratedSql()).endsWith("order by t0.id limit 10");
+      assertThat(query.getGeneratedSql()).endsWith("limit 10");
     }
   }
 
diff --git a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
index 2360772af..6e63066e2 100644
--- a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
@@ -370,7 +370,7 @@ public class EqlParserTest extends BaseTestCase {
     Query<Customer> query = parse("select name fetch billingAddress (line1, city) fetch shippingAddress (line1) limit 10");
     query.findList();
 
-    assertThat(sqlOf(query, 12)).contains("select t0.id, t0.name, t1.id, t1.line_1, t1.city, t2.id, t2.line_1 from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id  left join o_address t2 on t2.id = t0.shipping_address_id  order by t0.id");
+    assertThat(sqlOf(query, 12)).contains("select t0.id, t0.name, t1.id, t1.line_1, t1.city, t2.id, t2.line_1 from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id  left join o_address t2 on t2.id = t0.shipping_address_id");
   }
 
   @Test
diff --git a/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java b/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java
index e868cb9bd..89b2f6fb0 100644
--- a/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java
+++ b/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.rawsql;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.Query;
 import io.ebean.RawSql;
 import io.ebean.RawSqlBuilder;
 import io.ebean.annotation.ForPlatform;
@@ -29,7 +30,6 @@ public class TestRawSqlParsing extends BaseTestCase {
     RawSql rawSql = RawSqlBuilder
       .parse(sql)
       .columnMapping("order_id", "order.id")
-      //.columnMapping("sum(order_qty*unit_price)","totalAmount")
       .create();
 
     Sql rs = ((SpiRawSql)rawSql).getSql();
@@ -72,4 +72,32 @@ public class TestRawSqlParsing extends BaseTestCase {
 
     assertThat(customers).isNotEmpty();
   }
+
+  @ForPlatform({Platform.H2, Platform.POSTGRES})
+  @Test
+  public void testUnion() {
+
+    ResetBasicData.reset();
+
+    String sql =
+      "select id, name from (" +
+      "  select id, name from o_customer where name <= 'f' " +
+      "  union all " +
+      "  select id, name from o_customer where name > 'f' " +
+      ") all_split";
+
+
+    RawSql rawSql = RawSqlBuilder.parse(sql).create();
+
+    Query<Customer> query = Ebean.createQuery(Customer.class)
+      .setRawSql(rawSql)
+      .setFirstRow(1)
+      .setMaxRows(5);
+      //.orderById(false);
+
+    query.findList();
+
+    assertThat(sqlOf(query)).contains(") all_split limit 5 offset 1");
+  }
+
 }
diff --git a/src/test/java/org/tests/model/history/TestHistoryOneToMany.java b/src/test/java/org/tests/model/history/TestHistoryOneToMany.java
index 7332b81e2..7ca93fbe7 100644
--- a/src/test/java/org/tests/model/history/TestHistoryOneToMany.java
+++ b/src/test/java/org/tests/model/history/TestHistoryOneToMany.java
@@ -50,8 +50,8 @@ public class TestHistoryOneToMany extends BaseTestCase {
 
     if (isH2()) {
       assertThat(sql).hasSize(2);
-      assertThat(sql.get(0)).contains("from hi_tone_with_history t0 where (t0.sys_period_start <= ? and (t0.sys_period_end is null or t0.sys_period_end > ?)) and lower(t0.name) like ? escape''  order by t0.id limit 10");
-      assertThat(sql.get(1)).contains("from hi_ttwo_with_history t0 left join hi_tthree_with_history t1 on t1.hi_ttwo_id = t0.id and (t1.sys_period_start <= ? and (t1.sys_period_end is null or t1.sys_period_end > ?))  where (t0.sys_period_start <= ? and (t0.sys_period_end is null or t0.sys_period_end > ?)) and (t0.hi_tone_id) in (? )  order by t0.id");
+      assertThat(sql.get(0)).contains("from hi_tone_with_history t0 where (t0.sys_period_start <= ? and (t0.sys_period_end is null or t0.sys_period_end > ?)) and lower(t0.name) like ? escape''  limit 10");
+      assertThat(sql.get(1)).contains("from hi_ttwo_with_history t0 left join hi_tthree_with_history t1 on t1.hi_ttwo_id = t0.id and (t1.sys_period_start <= ? and (t1.sys_period_end is null or t1.sys_period_end > ?))  where (t0.sys_period_start <= ? and (t0.sys_period_end is null or t0.sys_period_end > ?)) and (t0.hi_tone_id) in (? )");
     }
 
     assertThat(list).hasSize(1);
diff --git a/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java b/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java
index b6a9d0a01..d6c7c66b6 100644
--- a/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java
+++ b/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java
@@ -50,7 +50,9 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
     List<String> loggedSql = LoggedSqlCollector.stop();
 
     assertThat(loggedSql).hasSize(1);
-    assertThat(loggedSql.get(0)).contains("order by t0.id");
+    if (isH2()) {
+      assertThat(loggedSql.get(0)).contains("from o_order t0 join o_customer t1 on t1.id = t0.kcustomer_id  limit 10");
+    }
   }
 
 
@@ -109,7 +111,9 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
     List<String> loggedSql = LoggedSqlCollector.stop();
 
     assertThat(loggedSql).hasSize(1);
-    assertThat(loggedSql.get(0)).contains("order by t0.id");
+    if (isH2()) {
+      assertThat(loggedSql.get(0)).contains("join o_customer t1 on t1.id = t0.kcustomer_id  limit 10");
+    }
   }
 
   @Test
@@ -128,7 +132,9 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
     List<String> loggedSql = LoggedSqlCollector.stop();
 
     assertThat(loggedSql).hasSize(1);
-    assertThat(loggedSql.get(0)).contains("order by t0.id");
+    if (isH2()) {
+      assertThat(loggedSql.get(0)).contains(" limit 10 offset 10");
+    }
   }
 
 
diff --git a/src/test/java/org/tests/query/TestQueryOrderById.java b/src/test/java/org/tests/query/TestQueryOrderById.java
new file mode 100644
index 000000000..7d1c402f1
--- /dev/null
+++ b/src/test/java/org/tests/query/TestQueryOrderById.java
@@ -0,0 +1,37 @@
+package org.tests.query;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import io.ebean.Query;
+import org.junit.Test;
+import org.tests.model.basic.Customer;
+
+import static org.assertj.core.api.StrictAssertions.assertThat;
+
+public class TestQueryOrderById extends BaseTestCase {
+
+  @Test
+  public void orderById_default_expectNotOrderById() {
+
+    Query<Customer> query = DB.find(Customer.class)
+      .select("id,name")
+      .setFirstRow(1)
+      .setMaxRows(5);
+
+    query.findList();
+    assertThat(sqlOf(query)).isEqualTo("select t0.id, t0.name from o_customer t0 limit 5 offset 1");
+  }
+
+  @Test
+  public void orderById_whenTrue_expectOrderById() {
+
+    Query<Customer> query = DB.find(Customer.class)
+      .select("id,name")
+      .setFirstRow(1)
+      .setMaxRows(5)
+      .orderById(true);
+
+    query.findList();
+    assertThat(sqlOf(query)).isEqualTo("select t0.id, t0.name from o_customer t0 order by t0.id limit 5 offset 1");
+  }
+}
diff --git a/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java b/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java
index 733af34a0..684678e1f 100644
--- a/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java
+++ b/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java
@@ -73,8 +73,9 @@ public class TestOrderByWithDistinct extends BaseTestCase {
 
     query.setMaxRows(1000);
     query.findList();
-    assertThat(query.getGeneratedSql()).contains("order by t0.userid");
-
+    if (isH2()) {
+      assertThat(query.getGeneratedSql()).contains("from muser t0 limit 1000");
+    }
     query = Ebean.find(MUser.class)
         .where()
         .eq("roles.roleName", "A")
@@ -85,7 +86,9 @@ public class TestOrderByWithDistinct extends BaseTestCase {
 
     query.setMaxRows(1000);
     query.findList();
-    assertThat(query.getGeneratedSql()).contains("order by t0.userid");
+    if (isH2()) {
+      assertThat(query.getGeneratedSql()).contains("where u1.role_name = ? limit 1000");
+    }
   }
 
   @Test
diff --git a/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
index 4e25732bf..ae8ca0e98 100644
--- a/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
+++ b/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
@@ -258,17 +258,20 @@ public class TestQuerySingleAttribute extends BaseTestCase {
   // hmm - same problem when not using distinct
   @Test
   public void findSingleOnIdProperty() {
+
+    ResetBasicData.reset();
+
     Query<Customer> query = Ebean.find(Customer.class)
       .select("id")
       .setMaxRows(100);
 
     List<String> ids = query.findSingleAttributeList();
     if (isSqlServer()) {
-      assertThat(sqlOf(query)).contains("select top 100 t0.id from o_customer t0 order by t0.id");
+      assertThat(sqlOf(query)).contains("select top 100 t0.id from o_customer t0");
     } else if (isOracle()) {
       assertThat(sqlOf(query)).contains("where rownum <= 100");
     } else {
-      assertThat(sqlOf(query)).contains("select t0.id from o_customer t0 order by t0.id limit 100");
+      assertThat(sqlOf(query)).contains("select t0.id from o_customer t0 limit 100");
     }
     assertThat(ids).isNotEmpty();
   }
diff --git a/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java b/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java
index 1942f0adb..c3fc05b9a 100644
--- a/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java
+++ b/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java
@@ -50,9 +50,9 @@ public class TestSoftDeletePagingList extends TransactionalTestCase {
 
     assertThat(sql.get(1)).contains("where t0.s3_url like ");
     if (isPlatformBooleanNative()) {
-      assertThat(sql.get(1)).contains("and t0.deleted = false order by t0.id");
+      assertThat(sql.get(1)).contains("and t0.deleted = false");
     } else {
-      assertThat(sql.get(1)).contains("and t0.deleted = 0 order by t0.id");
+      assertThat(sql.get(1)).contains("and t0.deleted = 0");
     }
   }
 }

From c10ad11b8b0459865d1d423fff601528c1581e28 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 8 May 2019 22:50:37 +1200
Subject: [PATCH 0837/1036] No effective change - add example use of
 PathProperties

---
 .../io/ebean/text/PathPropertiesTests.java    | 32 ++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/test/java/io/ebean/text/PathPropertiesTests.java b/src/test/java/io/ebean/text/PathPropertiesTests.java
index 6942cdbd0..13acc6376 100644
--- a/src/test/java/io/ebean/text/PathPropertiesTests.java
+++ b/src/test/java/io/ebean/text/PathPropertiesTests.java
@@ -1,13 +1,24 @@
 package io.ebean.text;
 
+import io.ebean.DB;
 import io.ebean.FetchPath;
+import io.ebean.Query;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
+
+import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 public class PathPropertiesTests {
 
+  private static final Logger log = LoggerFactory.getLogger(PathPropertiesTests.class);
 
   @Test
   public void test_noParentheses() {
@@ -184,4 +195,23 @@ public class PathPropertiesTests {
     assertFalse(root.includesPath(null, "details"));
     assertFalse(root.includesPath("customer", "shippingAddress"));
   }
+
+  @Test
+  public void example_withQueryAndJson() {
+
+    ResetBasicData.reset();
+
+    PathProperties pathProps = PathProperties.parse("id,name,billingAddress(city),shippingAddress(*))");
+
+    Query<Customer> query = DB.find(Customer.class)
+      .where().lt("id", 2)
+      .query();
+
+    pathProps.apply(query);
+
+    List<Customer> list = query.findList();
+
+    String asJson = DB.json().toJson(list, pathProps);
+    log.info("Json: {}", asJson);
+  }
 }

From b62cea50735f7f084ad74ea80a1a36a95ca37068 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 8 May 2019 23:12:10 +1200
Subject: [PATCH 0838/1036] No effective change - add findNative tests with
 named params in select

---
 .../org/tests/query/TestQueryFindNative.java  | 63 +++++++++++++++++--
 1 file changed, 59 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/tests/query/TestQueryFindNative.java b/src/test/java/org/tests/query/TestQueryFindNative.java
index c294c16c7..a84fd4e13 100644
--- a/src/test/java/org/tests/query/TestQueryFindNative.java
+++ b/src/test/java/org/tests/query/TestQueryFindNative.java
@@ -1,7 +1,7 @@
 package org.tests.query;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.PagedList;
 import org.assertj.core.util.Lists;
 import org.ebeantest.LoggedSqlCollector;
@@ -10,6 +10,7 @@ import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
 
+import java.time.LocalDate;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -24,8 +25,8 @@ public class TestQueryFindNative extends BaseTestCase {
     LoggedSqlCollector.start();
 
     String sql = "select id,first_name from contact where id in(:ids)";
-    Ebean.findNative(Contact.class, sql).setParameter("ids", Lists.newArrayList(1, 2, 3)).findList();
-    Ebean.findNative(Contact.class, sql).setParameter("ids", Lists.newArrayList(1, 2)).findList();
+    DB.findNative(Contact.class, sql).setParameter("ids", Lists.newArrayList(1, 2, 3)).findList();
+    DB.findNative(Contact.class, sql).setParameter("ids", Lists.newArrayList(1, 2)).findList();
 
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertThat(loggedSql).hasSize(2);
@@ -120,7 +121,7 @@ public class TestQueryFindNative extends BaseTestCase {
 
     String sql = "select c.id from contact c where c.first_name like ? ";
 
-    List<Integer> ids = Ebean.createSqlQuery(sql)
+    List<Integer> ids = DB.sqlQuery(sql)
       .setParameter(1, "J%")
       .findSingleAttributeList(Integer.class);
 
@@ -191,4 +192,58 @@ public class TestQueryFindNative extends BaseTestCase {
     List<Contact> contacts = customers.get(0).getContacts();
     assertThat(contacts).isNotEmpty();
   }
+
+  @Test
+  public void bind_positionedParams_InSelect() {
+
+    ResetBasicData.reset();
+
+    String sql = "select id, name, " +
+      "case when anniversary >= ? then 1 when anniversary < ? then 2 end as order_column_1 " +
+      "from o_customer " +
+      "order by order_column_1";
+
+    LoggedSqlCollector.start();
+
+    List<Customer> result = DB.findNative(Customer.class, sql)
+      .setParameter(1, LocalDate.now())
+      .setParameter(2, LocalDate.now())
+      .setFirstRow(1)
+      .setMaxRows(10)
+      .findList();
+
+    assertThat(result).isNotEmpty();
+    List<String> loggedSql = LoggedSqlCollector.stop();
+
+    if (isH2()) {
+      assertThat(loggedSql.get(0)).contains("from o_customer order by order_column_1 limit 10 offset 1");
+    }
+  }
+
+  @Test
+  public void bind_namedParams_InSelect() {
+
+    ResetBasicData.reset();
+
+    String sql = "select id, name, " +
+      "case when anniversary >= :date then 1 when anniversary < :date then 2 end as order_column_1 " +
+      "from o_customer " +
+      "order by order_column_1";
+
+    LoggedSqlCollector.start();
+
+    List<Customer> result = DB.findNative(Customer.class, sql)
+      .setParameter("date", LocalDate.now())
+      .setFirstRow(1)
+      .setMaxRows(10)
+      .findList();
+
+    assertThat(result).isNotEmpty();
+    List<String> loggedSql = LoggedSqlCollector.stop();
+
+    if (isH2()) {
+      assertThat(loggedSql.get(0)).contains("from o_customer order by order_column_1 limit 10 offset 1");
+    }
+  }
+
 }

From 264842393026308166b681e27756714a4efc557f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 8 May 2019 23:22:13 +1200
Subject: [PATCH 0839/1036] #1696 - Refactor - trim unnecessary whitespace
 around IN clause bind parameters

---
 .../server/persist/platform/MultiValueBind.java           | 4 ++--
 src/test/java/org/tests/cache/TestBeanCache.java          | 6 +++---
 src/test/java/org/tests/merge/TestMergeCustomer.java      | 2 +-
 .../org/tests/model/aggregation/TestAggregationMany.java  | 2 +-
 .../model/basic/cache/TestCacheViaComplexNaturalKey.java  | 6 +++---
 .../model/basic/cache/TestCacheViaComplexNaturalKey3.java | 8 ++++----
 .../org/tests/model/history/TestHistoryOneToMany.java     | 2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java b/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java
index 7df88ebde..41fbc3f6f 100644
--- a/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java
+++ b/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java
@@ -62,9 +62,9 @@ public class MultiValueBind {
     }
     sb.append(" in (?");
     for (int i = 1; i < size; i++) {
-      sb.append(", ").append("?");
+      sb.append(",?");
     }
-    sb.append(" ) ");
+    sb.append(")");
     return sb.toString();
   }
 }
diff --git a/src/test/java/org/tests/cache/TestBeanCache.java b/src/test/java/org/tests/cache/TestBeanCache.java
index 42af7612f..783c300a5 100644
--- a/src/test/java/org/tests/cache/TestBeanCache.java
+++ b/src/test/java/org/tests/cache/TestBeanCache.java
@@ -76,7 +76,7 @@ public class TestBeanCache extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.current();
     assertThat(sql).hasSize(1);
     if (isH2()) {
-      assertThat(sql.get(0)).contains("from o_cached_bean t0 where t0.id in (?, ?, ? )");
+      assertThat(sql.get(0)).contains("from o_cached_bean t0 where t0.id in (?,?,?)");
     }
 
     log.info("All hits (3 of 3) ...");
@@ -105,7 +105,7 @@ public class TestBeanCache extends BaseTestCase {
     assertThat(sql).hasSize(1);
     if (isH2()) {
       // fetch the miss from DB
-      assertThat(sql.get(0)).contains("from o_cached_bean t0 where t0.id in (? )");
+      assertThat(sql.get(0)).contains("from o_cached_bean t0 where t0.id in (?)");
     }
 
     // remove beans so that we get a "partial" hit (1 out of 3 in cache)
@@ -124,7 +124,7 @@ public class TestBeanCache extends BaseTestCase {
     assertThat(sql).hasSize(1);
     if (isH2()) {
       // fetch the misses from DB
-      assertThat(sql.get(0)).contains("from o_cached_bean t0 where t0.id in (?, ? )");
+      assertThat(sql.get(0)).contains("from o_cached_bean t0 where t0.id in (?,?)");
     }
   }
 
diff --git a/src/test/java/org/tests/merge/TestMergeCustomer.java b/src/test/java/org/tests/merge/TestMergeCustomer.java
index 4b4a38b78..6990a8f65 100644
--- a/src/test/java/org/tests/merge/TestMergeCustomer.java
+++ b/src/test/java/org/tests/merge/TestMergeCustomer.java
@@ -313,7 +313,7 @@ public class TestMergeCustomer extends BaseTestCase {
     assertThat(sql.get(0)).contains("select t0.id, t3.id, t1.id, t2.id from mcustomer t0 left join maddress t3 on t3.id = t0.shipping_address_id  left join maddress t1 on t1.id = t0.billing_address_id  left join mcontact t2 on t2.customer_id = t0.id  where t0.id = ?");
     if (isH2() || isHana()) {
       // with nested OneToMany .. we need a second query to read the contact message ids
-      assertThat(sql.get(1)).contains("select t0.contact_id, t0.id from mcontact_message t0 where (t0.contact_id) in (?, ?, ?, ?, ?, ?, ?, ?, ?, ? )");
+      assertThat(sql.get(1)).contains("select t0.contact_id, t0.id from mcontact_message t0 where (t0.contact_id) in (?,?,?,?,?,?,?,?,?,?)");
     }
     assertThat(sql.get(2)).contains("delete from mcontact_message where contact_id = ?");
     assertThat(sql.get(3)).contains("delete from mcontact where id=?");
diff --git a/src/test/java/org/tests/model/aggregation/TestAggregationMany.java b/src/test/java/org/tests/model/aggregation/TestAggregationMany.java
index 093221042..462783597 100644
--- a/src/test/java/org/tests/model/aggregation/TestAggregationMany.java
+++ b/src/test/java/org/tests/model/aggregation/TestAggregationMany.java
@@ -36,7 +36,7 @@ public class TestAggregationMany extends BaseTestCase {
 
     assertThat(machines).hasSize(5);
     if (isH2()) {
-      assertThat(sql.get(1)).contains("select t0.machine_id, t0.name, sum(t0.use_secs), sum(t0.fuel) from d_machine_aux_use t0 where (t0.machine_id) in (?, ?, ?, ?, ? )  group by t0.machine_id, t0.name;");
+      assertThat(sql.get(1)).contains("select t0.machine_id, t0.name, sum(t0.use_secs), sum(t0.fuel) from d_machine_aux_use t0 where (t0.machine_id) in (?,?,?,?,?) group by t0.machine_id, t0.name;");
     }
   }
 
diff --git a/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java b/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java
index c9352f5fc..a822c3e94 100644
--- a/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java
+++ b/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java
@@ -110,7 +110,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase {
     assertThat(sql).hasSize(1);
     if (isH2()) {
       // in clause with only 1 bind param - (sku=3 ... we got hits on sku 1 and 2)
-      assertThat(sql.get(0)).contains("from o_cached_natkey t0 where t0.store = ? and t0.sku in (? )  order by t0.sku desc; --bind(abc,Array[1]={3})");
+      assertThat(sql.get(0)).contains("from o_cached_natkey t0 where t0.store = ? and t0.sku in (?) order by t0.sku desc; --bind(abc,Array[1]={3})");
     }
 
     assertThat(list).hasSize(3);
@@ -149,7 +149,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase {
     assertThat(list).hasSize(3);
     assertThat(sql).hasSize(1);
     if (isH2()) {
-      assertThat(sql.get(0)).contains("where t0.store = ? and t0.sku in (?, ? )  order by t0.sku desc; --bind(abc,Array[2]={1,3})");
+      assertThat(sql.get(0)).contains("where t0.store = ? and t0.sku in (?,?) order by t0.sku desc; --bind(abc,Array[2]={1,3})");
     }
     assertNaturalKeyHitMiss(1, 2);
     assertBeanCacheHitMiss(1, 0);
@@ -207,7 +207,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase {
     assertThat(sql).hasSize(1);
     if (isH2()) {
       // in clause with 2 bind params as we got not hits on the cache
-      assertThat(sql.get(0)).contains("from o_cached_natkey t0 where t0.store = ? and t0.sku in (?, ? )  order by t0.sku desc; --bind(abc,Array[2]={3,4})");
+      assertThat(sql.get(0)).contains("from o_cached_natkey t0 where t0.store = ? and t0.sku in (?,?) order by t0.sku desc; --bind(abc,Array[2]={3,4})");
     }
 
     assertThat(list).hasSize(2);
diff --git a/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java b/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
index 256c730e6..cb0ec0c58 100644
--- a/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
+++ b/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
@@ -116,7 +116,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
     assertThat(sql).hasSize(1);
     if (isH2()) {
       // in clause with only 1 bind param - (sku=3 ... we got hits on sku 1 and 2)
-      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and t0.code in (? )  and t0.sku = ? order by t0.sku desc, t0.code; --bind(def,Array[1]={1000},2)");
+      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and t0.code in (?) and t0.sku = ? order by t0.sku desc, t0.code; --bind(def,Array[1]={1000},2)");
     }
 
     assertThat(list).hasSize(4);
@@ -178,7 +178,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
     assertThat(sql).hasSize(1);
     if (isH2()) {
       // in clause with 2 bind params as we got not hits on the cache
-      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and t0.sku in (?, ?, ? )  and t0.code = ? order by t0.sku desc; --bind(abc,Array[3]={3,2,4},1001)");
+      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and t0.sku in (?,?,?) and t0.code = ? order by t0.sku desc; --bind(abc,Array[3]={3,2,4},1001)");
     }
 
     assertThat(list).hasSize(2);
@@ -278,7 +278,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
     assertBeanCacheHitMiss(1, 0);
 
     if (isH2()) {
-      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and concat(t0.sku,'-',t0.code) in (?, ? )  order by t0.sku desc; --bind(def,Array[2]={2-1000,3-1000})");
+      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and concat(t0.sku,'-',t0.code) in (?,?) order by t0.sku desc; --bind(def,Array[2]={2-1000,3-1000})");
     } else if (isPostgres()) {
       assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and (t0.sku||'-'||t0.code)");
     } else if (isHana()) {
@@ -321,7 +321,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
     assertBeanCacheHitMiss(1, 0);
 
     if (isH2()) {
-      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and concat(t0.sku,':',t0.code,'-foo') in (?, ? )  order by t0.sku desc; --bind(def,Array[2]={2:1000-foo,3:1000-foo})");
+      assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and concat(t0.sku,':',t0.code,'-foo') in (?,?) order by t0.sku desc; --bind(def,Array[2]={2:1000-foo,3:1000-foo})");
     } else if (isPostgres()){
       assertThat(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and (t0.sku||':'||t0.code||'-foo')");
     } else if (isHana()){
diff --git a/src/test/java/org/tests/model/history/TestHistoryOneToMany.java b/src/test/java/org/tests/model/history/TestHistoryOneToMany.java
index 7ca93fbe7..589c4daba 100644
--- a/src/test/java/org/tests/model/history/TestHistoryOneToMany.java
+++ b/src/test/java/org/tests/model/history/TestHistoryOneToMany.java
@@ -51,7 +51,7 @@ public class TestHistoryOneToMany extends BaseTestCase {
     if (isH2()) {
       assertThat(sql).hasSize(2);
       assertThat(sql.get(0)).contains("from hi_tone_with_history t0 where (t0.sys_period_start <= ? and (t0.sys_period_end is null or t0.sys_period_end > ?)) and lower(t0.name) like ? escape''  limit 10");
-      assertThat(sql.get(1)).contains("from hi_ttwo_with_history t0 left join hi_tthree_with_history t1 on t1.hi_ttwo_id = t0.id and (t1.sys_period_start <= ? and (t1.sys_period_end is null or t1.sys_period_end > ?))  where (t0.sys_period_start <= ? and (t0.sys_period_end is null or t0.sys_period_end > ?)) and (t0.hi_tone_id) in (? )");
+      assertThat(sql.get(1)).contains("from hi_ttwo_with_history t0 left join hi_tthree_with_history t1 on t1.hi_ttwo_id = t0.id and (t1.sys_period_start <= ? and (t1.sys_period_end is null or t1.sys_period_end > ?))  where (t0.sys_period_start <= ? and (t0.sys_period_end is null or t0.sys_period_end > ?)) and (t0.hi_tone_id) in (?)");
     }
 
     assertThat(list).hasSize(1);

From b4782425f8c5c7b0c2941f94107ee353fc81737d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 8 May 2019 23:38:25 +1200
Subject: [PATCH 0840/1036] #1695 - For MySql like remove the binary keyword

---
 .../dbplatform/mysql/MySqlPlatform.java       |  6 +--
 .../query/TestQueryFilterCaseInsensitive.java | 34 +++++++-----
 .../tests/query/other/TestLikeEscaping.java   | 52 ++++++++++---------
 3 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java
index 9ee373288..e9c769095 100644
--- a/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java
@@ -35,7 +35,7 @@ public class MySqlPlatform extends DatabasePlatform {
     this.dbIdentity.setSupportsGetGeneratedKeys(true);
     this.dbIdentity.setSupportsIdentity(true);
     this.dbIdentity.setSupportsSequence(false);
-    
+
     this.dbDefaultValue.setNow("now(6)"); // must have same precision as TIMESTAMP
     this.dbDefaultValue.setFalse("0");
     this.dbDefaultValue.setTrue("1");
@@ -51,8 +51,8 @@ public class MySqlPlatform extends DatabasePlatform {
     this.openQuote = "`";
     this.closeQuote = "`";
     // use pipe for escaping as it depends if mysql runs in no_backslash_escapes or not.
-    this.likeClauseRaw = "like binary ? escape ''";
-    this.likeClauseEscaped = "like binary ? escape '|'";
+    this.likeClauseRaw = "like ? escape ''";
+    this.likeClauseEscaped = "like ? escape '|'";
 
     this.forwardOnlyHintOnFindIterate = true;
     this.booleanDbType = Types.BIT;
diff --git a/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java b/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java
index 8d606cc4b..a9bb3687d 100644
--- a/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java
+++ b/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java
@@ -1,7 +1,9 @@
 package org.tests.query;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
+import io.ebean.annotation.IgnorePlatform;
+import io.ebean.annotation.Platform;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
@@ -18,33 +20,35 @@ public class TestQueryFilterCaseInsensitive extends BaseTestCase {
     ResetBasicData.reset();
   }
 
+  @IgnorePlatform(Platform.MYSQL)
   @Test
   public void testEq() {
 
     // Note: this test uses only customer#1..#4
 
-    List<Customer> customers = Ebean.find(Customer.class).where()
+    List<Customer> customers = DB.find(Customer.class).where()
         .eq("name", "ROB") // case match
         .le("id", 4).findList();
 
     assertThat(customers).isEmpty();
 
-    customers = Ebean.find(Customer.class).where()
+    customers = DB.find(Customer.class).where()
         .ieq("name", "ROB") // case insensitive match
         .le("id", 4).findList();
 
     assertThat(customers).hasSize(1);
   }
 
+  @IgnorePlatform(Platform.MYSQL)
   @Test
   public void testNe() {
-    List<Customer> customers = Ebean.find(Customer.class).where()
+    List<Customer> customers = DB.find(Customer.class).where()
         .ne("name", "ROB") // case match
         .le("id", 4).findList();
 
     assertThat(customers).hasSize(4);
 
-    customers = Ebean.find(Customer.class).where()
+    customers = DB.find(Customer.class).where()
         .ine("name", "ROB") // case insensitive match
         .le("id", 4).findList();
 
@@ -52,30 +56,32 @@ public class TestQueryFilterCaseInsensitive extends BaseTestCase {
 
   }
 
+  @IgnorePlatform(Platform.MYSQL)
   @Test
   public void testLike() {
-    List<Customer> customers = Ebean.find(Customer.class).where()
+    List<Customer> customers = DB.find(Customer.class).where()
         .like("name", "%O%") // case match
         .le("id", 4).findList();
 
     assertThat(customers).isEmpty();
 
-    customers = Ebean.find(Customer.class).where()
+    customers = DB.find(Customer.class).where()
         .ilike("name", "%O%") // case insensitive match
         .le("id", 4).findList();
 
     assertThat(customers).hasSize(4); // Rob / Fiona / Cust No address / NocCust
   }
 
+  @IgnorePlatform(Platform.MYSQL)
   @Test
   public void testContains() {
-    List<Customer> customers = Ebean.find(Customer.class).where()
+    List<Customer> customers = DB.find(Customer.class).where()
         .contains("name", "O") // case match
         .le("id", 4).findList();
 
     assertThat(customers).isEmpty();
 
-    customers = Ebean.find(Customer.class).where()
+    customers = DB.find(Customer.class).where()
         .icontains("name", "O") // case insensitive match
         .le("id", 4).findList();
 
@@ -83,30 +89,32 @@ public class TestQueryFilterCaseInsensitive extends BaseTestCase {
 
   }
 
+  @IgnorePlatform(Platform.MYSQL)
   @Test
   public void testStartsWith() {
-    List<Customer> customers = Ebean.find(Customer.class).where()
+    List<Customer> customers = DB.find(Customer.class).where()
         .startsWith("name", "RO") // case match
         .le("id", 4).findList();
 
     assertThat(customers).isEmpty();
 
-    customers = Ebean.find(Customer.class).where()
+    customers = DB.find(Customer.class).where()
         .istartsWith("name", "RO") // case insensitive match
         .le("id", 4).findList();
 
     assertThat(customers).hasSize(1);
   }
 
+  @IgnorePlatform(Platform.MYSQL)
   @Test
   public void testEndsWith() {
-    List<Customer> customers = Ebean.find(Customer.class).where()
+    List<Customer> customers = DB.find(Customer.class).where()
         .endsWith("name", "OB") // case match
         .le("id", 4).findList();
 
     assertThat(customers).isEmpty();
 
-    customers = Ebean.find(Customer.class).where()
+    customers = DB.find(Customer.class).where()
         .iendsWith("name", "OB") // case insensitive match
         .le("id", 4).findList();
 
diff --git a/src/test/java/org/tests/query/other/TestLikeEscaping.java b/src/test/java/org/tests/query/other/TestLikeEscaping.java
index 2592ad098..ceebbcddc 100644
--- a/src/test/java/org/tests/query/other/TestLikeEscaping.java
+++ b/src/test/java/org/tests/query/other/TestLikeEscaping.java
@@ -1,6 +1,6 @@
 package org.tests.query.other;
 
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.TransactionalTestCase;
 
 import org.tests.model.basic.Customer;
@@ -16,76 +16,80 @@ public class TestLikeEscaping extends TransactionalTestCase {
   public void testLikeEscaping() {
     // Mysql, PgSql, H2 special chars: "_"  "%"
     // MsSql special chars:  "_"  "%"  "[" AND different Quoting!
-    Ebean.save(ResetBasicData.createCustomer("Paul % Percentage", "*Star", "[none]", 0, null));
-    Ebean.save(ResetBasicData.createCustomer("(none)", "More * Star", "[none]", 0, null));
+    DB.save(ResetBasicData.createCustomer("Paul % Percentage", "*Star", "[none]", 0, null));
+    DB.save(ResetBasicData.createCustomer("(none)", "More * Star", "[none]", 0, null));
 
-    Ebean.save(ResetBasicData.createCustomer("Paul %% Doublepercentage", "|Pipeway", "[other]", 1, null));
-    Ebean.save(ResetBasicData.createCustomer("_Udo Underscore", "|Pipeway", "[other]", 1, null));
+    DB.save(ResetBasicData.createCustomer("Paul %% Doublepercentage", "|Pipeway", "[other]", 1, null));
+    DB.save(ResetBasicData.createCustomer("_Udo Underscore", "|Pipeway", "[other]", 1, null));
 
-    Ebean.save(ResetBasicData.createCustomer("Bodo \\ backslash", "\\BS", "[other]", 1, null));
+    DB.save(ResetBasicData.createCustomer("Bodo \\ backslash", "\\BS", "[other]", 1, null));
 
-    assertThat(Ebean.find(Customer.class)
+    assertThat(DB.find(Customer.class)
         .where().contains("name", "Paul %%").findCount()
     ).isEqualTo(1);
 
-    assertThat(Ebean.find(Customer.class)
+    assertThat(DB.find(Customer.class)
         .where().contains("name", "o \\ b").findCount()
     ).isEqualTo(1);
 
-    assertThat(Ebean.find(Customer.class)
+    assertThat(DB.find(Customer.class)
         .where().contains("name", "o \\\\ b").findCount()
     ).isEqualTo(0);
 
-    assertThat(Ebean.find(Customer.class)
+    assertThat(DB.find(Customer.class)
         .where().startsWith("name", "_").findCount()
     ).isEqualTo(1);
 
-    assertThat(Ebean.find(Customer.class)
+    if (!isMySql()) {
+      assertThat(DB.find(Customer.class)
         .where().startsWith("name", "_u").findCount()
-    ).isEqualTo(0);
+      ).isEqualTo(0);
+    }
 
-    assertThat(Ebean.find(Customer.class)
+    assertThat(DB.find(Customer.class)
         .where().istartsWith("name", "_U").findCount()
     ).isEqualTo(1);
 
-    assertThat(Ebean.find(Customer.class)
+    if (!isMySql()) {
+      assertThat(DB.find(Customer.class)
         .where().startsWith("shippingAddress.line1", "|p").findCount()
-    ).isEqualTo(0);
+      ).isEqualTo(0);
+    }
 
-    assertThat(Ebean.find(Customer.class)
+    assertThat(DB.find(Customer.class)
         .where().startsWith("shippingAddress.line1", "|P").findCount()
     ).isEqualTo(2);
 
-    assertThat(Ebean.find(Customer.class)
+    assertThat(DB.find(Customer.class)
         .where().startsWith("shippingAddress.line1", "\\B").findCount()
     ).isEqualTo(1);
 
-    assertThat(Ebean.find(Customer.class)
+    assertThat(DB.find(Customer.class)
         .where().endsWith("billingAddress.line1", "]").findCount()
     ).isEqualTo(5);
 
-    assertThat(Ebean.find(Customer.class)
+    assertThat(DB.find(Customer.class)
         .where().endsWith("billingAddress.line1", "[none]").findCount()
     ).isEqualTo(2);
 
-    assertThat(Ebean.find(Customer.class)
+    assertThat(DB.find(Customer.class)
         .where().startsWith("billingAddress.line1", "[none]").findCount()
     ).isEqualTo(2);
 
-    assertThat(Ebean.find(Customer.class)
+    assertThat(DB.find(Customer.class)
         .where().contains("billingAddress.line1", "[none]").findCount()
     ).isEqualTo(2);
 
 
-    assertThat(Ebean.find(Customer.class)
+    assertThat(DB.find(Customer.class)
         .where().contains("shippingAddress.line1", "*").findCount()
     ).isEqualTo(2);
 
-    assertThat(Ebean.find(Customer.class)
+    assertThat(DB.find(Customer.class)
         .where().startsWith("shippingAddress.line1", "*").findCount()
     ).isEqualTo(1);
 
-    assertThat(Ebean.find(Customer.class)
+    assertThat(DB.find(Customer.class)
         .where().endsWith("shippingAddress.line1", "*").findCount()
     ).isEqualTo(0);
   }

From 662f9cdeb366f7a519d51bc07aacba052a08c3b3 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Tue, 19 Mar 2019 20:16:54 +0100
Subject: [PATCH 0841/1036] fixed equals() method in ModifyAware collections.

---
 .../java/io/ebeaninternal/json/ModifyAwareList.java   | 10 +++++++---
 .../java/io/ebeaninternal/json/ModifyAwareMap.java    | 11 ++++++++---
 .../java/io/ebeaninternal/json/ModifyAwareSet.java    | 10 +++++++---
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/json/ModifyAwareList.java b/src/main/java/io/ebeaninternal/json/ModifyAwareList.java
index cf3e6b43b..04e63fbf5 100644
--- a/src/main/java/io/ebeaninternal/json/ModifyAwareList.java
+++ b/src/main/java/io/ebeaninternal/json/ModifyAwareList.java
@@ -36,9 +36,13 @@ public class ModifyAwareList<E> implements List<E>, ModifyAwareOwner {
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;
-    if (!(o instanceof ModifyAwareList)) return false;
-    ModifyAwareList<?> that = (ModifyAwareList<?>) o;
-    return Objects.equals(list, that.list);
+    if (o instanceof ModifyAwareList) {
+      ModifyAwareList<?> that = (ModifyAwareList<?>) o;
+      return Objects.equals(list, that.list);
+    }
+    if (!(o instanceof List)) return false;
+    List<?> that = (List<?>) o;
+    return Objects.equals(list, that);
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/json/ModifyAwareMap.java b/src/main/java/io/ebeaninternal/json/ModifyAwareMap.java
index 88b488820..b0cd03f06 100644
--- a/src/main/java/io/ebeaninternal/json/ModifyAwareMap.java
+++ b/src/main/java/io/ebeaninternal/json/ModifyAwareMap.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.json;
 
 import java.util.Collection;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
@@ -38,9 +39,13 @@ public class ModifyAwareMap<K, V> implements Map<K, V>, ModifyAwareOwner {
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;
-    if (!(o instanceof ModifyAwareMap)) return false;
-    ModifyAwareMap<?, ?> that = (ModifyAwareMap<?, ?>) o;
-    return Objects.equals(map, that.map);
+    if (o instanceof ModifyAwareMap) {
+      ModifyAwareMap<?,?> that = (ModifyAwareMap<?,?>) o;
+      return Objects.equals(map, that.map);
+    }
+    if (!(o instanceof Map)) return false;
+    Map<?,?> that = (Map<?,?>) o;
+    return Objects.equals(map, that);
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/json/ModifyAwareSet.java b/src/main/java/io/ebeaninternal/json/ModifyAwareSet.java
index 03a2627de..ba0777283 100644
--- a/src/main/java/io/ebeaninternal/json/ModifyAwareSet.java
+++ b/src/main/java/io/ebeaninternal/json/ModifyAwareSet.java
@@ -55,9 +55,13 @@ public class ModifyAwareSet<E> implements Set<E>, ModifyAwareOwner {
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;
-    if (!(o instanceof ModifyAwareSet)) return false;
-    ModifyAwareSet<?> that = (ModifyAwareSet<?>) o;
-    return Objects.equals(set, that.set);
+    if (o instanceof ModifyAwareSet) {
+      ModifyAwareSet<?> that = (ModifyAwareSet<?>) o;
+      return Objects.equals(set, that.set);
+    }
+    if (!(o instanceof Set)) return false;
+    Set<?> that = (Set<?>) o;
+    return Objects.equals(set, that);
   }
 
   @Override

From 579c1efcf6b0d876fbaeb153da746cadad1217be Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Wed, 8 May 2019 17:00:08 +0200
Subject: [PATCH 0842/1036] Add tests and fixes in hashCode

---
 .../ebeaninternal/json/ModifyAwareList.java   |  2 +-
 .../io/ebeaninternal/json/ModifyAwareMap.java |  3 +-
 .../io/ebeaninternal/json/ModifyAwareSet.java |  2 +-
 .../server/type/ModifyAwareListTest.java      | 21 ++++-
 .../server/type/ModifyAwareMapTest.java       | 88 +++++++++++++++++++
 .../server/type/ModifyAwareSetTest.java       | 23 +++++
 6 files changed, 132 insertions(+), 7 deletions(-)
 create mode 100644 src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java

diff --git a/src/main/java/io/ebeaninternal/json/ModifyAwareList.java b/src/main/java/io/ebeaninternal/json/ModifyAwareList.java
index 04e63fbf5..197f02466 100644
--- a/src/main/java/io/ebeaninternal/json/ModifyAwareList.java
+++ b/src/main/java/io/ebeaninternal/json/ModifyAwareList.java
@@ -47,7 +47,7 @@ public class ModifyAwareList<E> implements List<E>, ModifyAwareOwner {
 
   @Override
   public int hashCode() {
-    return Objects.hash(list);
+    return list.hashCode();
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/json/ModifyAwareMap.java b/src/main/java/io/ebeaninternal/json/ModifyAwareMap.java
index b0cd03f06..74eb81c87 100644
--- a/src/main/java/io/ebeaninternal/json/ModifyAwareMap.java
+++ b/src/main/java/io/ebeaninternal/json/ModifyAwareMap.java
@@ -2,7 +2,6 @@ package io.ebeaninternal.json;
 
 import java.util.Collection;
 import java.util.LinkedHashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
@@ -50,7 +49,7 @@ public class ModifyAwareMap<K, V> implements Map<K, V>, ModifyAwareOwner {
 
   @Override
   public int hashCode() {
-    return Objects.hash(map);
+    return map.hashCode();
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/json/ModifyAwareSet.java b/src/main/java/io/ebeaninternal/json/ModifyAwareSet.java
index ba0777283..f80b16347 100644
--- a/src/main/java/io/ebeaninternal/json/ModifyAwareSet.java
+++ b/src/main/java/io/ebeaninternal/json/ModifyAwareSet.java
@@ -66,7 +66,7 @@ public class ModifyAwareSet<E> implements Set<E>, ModifyAwareOwner {
 
   @Override
   public int hashCode() {
-    return Objects.hash(set);
+    return set.hashCode();
   }
 
   @Override
diff --git a/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java b/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java
index 33cc83199..a7ebbecda 100644
--- a/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java
@@ -16,9 +16,7 @@ import java.util.List;
 import java.util.ListIterator;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 
 public class ModifyAwareListTest {
@@ -290,4 +288,21 @@ public class ModifyAwareListTest {
     assertThat(listA).isNotEqualTo(listB);
     assertThat(listA.hashCode()).isNotEqualTo(listB.hashCode());
   }
+
+  @Test
+  public void testEqualsAndHashCode() throws Exception {
+    ModifyAwareList<String> listA = createEmptyList();
+    ArrayList<String> listB = new ArrayList<>();
+
+    assertThat(listA).isEqualTo(listB);
+    assertThat(listA.hashCode()).isEqualTo(listB.hashCode());
+
+    listA.add("foo");
+    assertThat(listA).isNotEqualTo(listB);
+    assertThat(listA.hashCode()).isNotEqualTo(listB.hashCode());
+
+    listB.add("foo");
+    assertThat(listA).isEqualTo(listB);
+    assertThat(listA.hashCode()).isEqualTo(listB.hashCode());
+  }
 }
diff --git a/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java b/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java
new file mode 100644
index 000000000..5cc23d0dd
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java
@@ -0,0 +1,88 @@
+package io.ebeaninternal.server.type;
+
+import io.ebeaninternal.json.ModifyAwareMap;
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.HashMap;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.StrictAssertions.assertThat;
+
+public class ModifyAwareMapTest {
+
+  private ModifyAwareMap<String, Integer> createMap() {
+    HashMap<String, Integer> set = new HashMap<>();
+    set.put("A", 1);
+    set.put("B", 2);
+    set.put("C", 3);
+    set.put("D", 4);
+    set.put("E", 5);
+    return new ModifyAwareMap<>(set);
+  }
+
+  private ModifyAwareMap<String, Integer> createEmptyMap() {
+    HashMap<String, Integer> set = new HashMap<>();
+    return new ModifyAwareMap<>(set);
+  }
+
+  @Test
+  public void serialise() throws IOException, ClassNotFoundException {
+
+    ByteArrayOutputStream os = new ByteArrayOutputStream();
+    ObjectOutputStream oos = new ObjectOutputStream(os);
+
+    oos.writeObject(createMap());
+    oos.flush();
+    oos.close();
+
+    ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
+    ObjectInputStream ois = new ObjectInputStream(is);
+
+    @SuppressWarnings("unchecked")
+    ModifyAwareMap<String, Integer> read = (ModifyAwareMap<String, Integer>) ois.readObject();
+    assertThat(read).containsKeys("A", "B", "C", "D", "E").containsValues(1, 2, 3, 4, 5);
+  }
+
+  @Test
+  public void equalsWhenEqual() {
+
+    ModifyAwareMap<String, Integer> setA = createMap();
+    ModifyAwareMap<String, Integer> setB = createMap();
+
+    assertThat(setA).isEqualTo(setB);
+    assertThat(setA.hashCode()).isEqualTo(setB.hashCode());
+  }
+
+  @Test
+  public void equalsWhenNotEqual() {
+
+    ModifyAwareMap<String, Integer> setA = createMap();
+    ModifyAwareMap<String, Integer> setB = createMap();
+    setB.put("F", 6);
+
+    assertThat(setA).isNotEqualTo(setB);
+    assertThat(setA.hashCode()).isNotEqualTo(setB.hashCode());
+  }
+
+  @Test
+  public void testEqualsAndHashCode() throws Exception {
+    ModifyAwareMap<String, Integer> setA = createEmptyMap();
+    HashMap<String, Integer> setB = new HashMap<>();
+
+    assertThat(setA).isEqualTo(setB);
+    assertThat(setA.hashCode()).isEqualTo(setB.hashCode());
+
+    setA.put("foo", 42);
+    assertThat(setA).isNotEqualTo(setB);
+    assertThat(setA.hashCode()).isNotEqualTo(setB.hashCode());
+
+    setB.put("foo", 42);
+    assertThat(setA).isEqualTo(setB);
+    assertThat(setA.hashCode()).isEqualTo(setB.hashCode());
+  }
+}
diff --git a/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java b/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java
index fc5775e68..8198505cb 100644
--- a/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java
@@ -12,6 +12,7 @@ import java.util.Arrays;
 import java.util.HashSet;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.StrictAssertions.assertThat;
 
 public class ModifyAwareSetTest {
 
@@ -21,6 +22,11 @@ public class ModifyAwareSetTest {
     return new ModifyAwareSet<>(set);
   }
 
+  private ModifyAwareSet<String> createEmptySet() {
+    HashSet<String> set = new HashSet<>();
+    return new ModifyAwareSet<>(set);
+  }
+
   @Test
   public void serialise() throws IOException, ClassNotFoundException {
 
@@ -59,4 +65,21 @@ public class ModifyAwareSetTest {
     assertThat(setA).isNotEqualTo(setB);
     assertThat(setA.hashCode()).isNotEqualTo(setB.hashCode());
   }
+
+  @Test
+  public void testEqualsAndHashCode() throws Exception {
+    ModifyAwareSet<String> setA = createEmptySet();
+    HashSet<String> setB = new HashSet<>();
+
+    assertThat(setA).isEqualTo(setB);
+    assertThat(setA.hashCode()).isEqualTo(setB.hashCode());
+
+    setA.add("foo");
+    assertThat(setA).isNotEqualTo(setB);
+    assertThat(setA.hashCode()).isNotEqualTo(setB.hashCode());
+
+    setB.add("foo");
+    assertThat(setA).isEqualTo(setB);
+    assertThat(setA.hashCode()).isEqualTo(setB.hashCode());
+  }
 }

From c61e6b04a273646d68e38748abd37e5875f8f158 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 12 May 2019 11:41:24 +1200
Subject: [PATCH 0843/1036] Update sql server testing

---
 pom.xml                                       |  8 ++++----
 .../java/io/ebean/EbeanServer_eqlTest.java    |  5 ++++-
 .../server/grammer/EqlParserTest.java         |  2 +-
 src/test/java/main/StartSqlServer.java        | 19 +++++++++++++++++++
 .../tests/basic/TestQueryUsingConnection.java |  3 +++
 .../tests/batchload/TestSecondaryQueries.java |  4 ++--
 .../TestOneToManyJoinTableInheritance.java    | 17 +++++++++++------
 .../TestAddOrderByWithFirstRowsMaxRows.java   |  1 +
 .../query/TestQueryFilterCaseInsensitive.java |  4 ++--
 .../tests/query/TestQueryFindPagedList.java   |  2 ++
 .../org/tests/query/TestQueryOrderById.java   | 13 +++++++++++--
 .../org/tests/rawsql/TestRawSqlOrmQuery.java  |  1 +
 .../transaction/TestBatchModelFlush.java      | 13 +++++++++----
 src/test/resources/ebean.properties           |  4 ++--
 src/test/resources/logback-test.xml           |  5 +----
 15 files changed, 73 insertions(+), 28 deletions(-)
 create mode 100644 src/test/java/main/StartSqlServer.java

diff --git a/pom.xml b/pom.xml
index cf06c4e09..05d2f4b10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -227,9 +227,9 @@
     <!--</dependency>-->
 
     <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-docker-run</artifactId>
-      <version>1.5.1</version>
+      <groupId>io.ebean.test</groupId>
+      <artifactId>ebean-test-docker</artifactId>
+      <version>2.4.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -280,7 +280,7 @@
     <dependency>
       <groupId>com.microsoft.sqlserver</groupId>
       <artifactId>mssql-jdbc</artifactId>
-      <version>7.2.0.jre8</version>
+      <version>7.2.2.jre8</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/src/test/java/io/ebean/EbeanServer_eqlTest.java b/src/test/java/io/ebean/EbeanServer_eqlTest.java
index 1e160484d..104780fbd 100644
--- a/src/test/java/io/ebean/EbeanServer_eqlTest.java
+++ b/src/test/java/io/ebean/EbeanServer_eqlTest.java
@@ -132,10 +132,13 @@ public class EbeanServer_eqlTest extends BaseTestCase {
     Query<Customer> query = Ebean.createQuery(Customer.class);
     query.setMaxRows(10);
     query.setFirstRow(3);
+    if (isSqlServer()) {
+      query.orderBy("id");
+    }
     query.findList();
 
     if (isSqlServer()) {
-      assertThat(query.getGeneratedSql()).endsWith("from o_customer t0 offset 3 rows fetch next 10 rows only");
+      assertThat(query.getGeneratedSql()).endsWith("from o_customer t0 order by t0.id offset 3 rows fetch next 10 rows only");
     } else if (isOracle()) {
       assertThat(query.getGeneratedSql()).contains("where rownum <= 13");
       assertThat(query.getGeneratedSql()).contains("where rn_ > 3");
diff --git a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
index 6e63066e2..43f79b915 100644
--- a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
@@ -596,7 +596,7 @@ public class EqlParserTest extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Query<Customer> query = parse("limit 10 offset 5");
+    Query<Customer> query = parse("order by name limit 10 offset 5");
     query.findList();
     if (isH2()) {
       assertThat(query.getGeneratedSql()).contains(" limit 10 offset 5");
diff --git a/src/test/java/main/StartSqlServer.java b/src/test/java/main/StartSqlServer.java
new file mode 100644
index 000000000..fe758efba
--- /dev/null
+++ b/src/test/java/main/StartSqlServer.java
@@ -0,0 +1,19 @@
+package main;
+
+import io.ebean.docker.commands.SqlServerConfig;
+import io.ebean.docker.commands.SqlServerContainer;
+
+public class StartSqlServer {
+
+  public static void main(String[] args) {
+
+    SqlServerConfig config = new SqlServerConfig("2017-CU4");
+    config.setDbName("test_ebean");
+    config.setUser("test_ebean");
+
+
+    SqlServerContainer container = new SqlServerContainer(config);
+    container.start();
+
+  }
+}
diff --git a/src/test/java/org/tests/basic/TestQueryUsingConnection.java b/src/test/java/org/tests/basic/TestQueryUsingConnection.java
index 656af123f..5b63c7d33 100644
--- a/src/test/java/org/tests/basic/TestQueryUsingConnection.java
+++ b/src/test/java/org/tests/basic/TestQueryUsingConnection.java
@@ -3,6 +3,8 @@ package org.tests.basic;
 import io.ebean.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Transaction;
+import io.ebean.annotation.IgnorePlatform;
+import io.ebean.annotation.Platform;
 import org.junit.Test;
 import org.tests.model.basic.Country;
 import org.tests.model.basic.ResetBasicData;
@@ -32,6 +34,7 @@ public class TestQueryUsingConnection extends BaseTestCase {
     }
   }
 
+  @IgnorePlatform(Platform.SQLSERVER)
   @Test
   public void usingTransaction() {
 
diff --git a/src/test/java/org/tests/batchload/TestSecondaryQueries.java b/src/test/java/org/tests/batchload/TestSecondaryQueries.java
index 1e0663e59..095ac9fe7 100644
--- a/src/test/java/org/tests/batchload/TestSecondaryQueries.java
+++ b/src/test/java/org/tests/batchload/TestSecondaryQueries.java
@@ -54,7 +54,7 @@ public class TestSecondaryQueries extends TransactionalTestCase {
 
     assertThat(sql).hasSize(1);
     if (isSqlServer()) {
-      assertThat(trimSql(sql.get(0), 2)).contains("select top 10 t0.id, t0.status, t0.kcustomer_id from o_order t0 order by t0.id");
+      assertThat(trimSql(sql.get(0), 2)).contains("select top 10 t0.id, t0.status, t0.kcustomer_id from o_order t0");
     } else {
       assertThat(trimSql(sql.get(0), 2)).contains("select t0.id, t0.status, t0.kcustomer_id from o_order t0");
     }
@@ -91,7 +91,7 @@ public class TestSecondaryQueries extends TransactionalTestCase {
 
     assertThat(sql).hasSize(1);
     if (isSqlServer()) {
-      assertThat(trimSql(sql.get(0), 2)).contains("select top 10 t0.id, t0.status from o_order t0 order by t0.id");
+      assertThat(trimSql(sql.get(0), 2)).contains("select top 10 t0.id, t0.status from o_order t0");
     } else {
       assertThat(trimSql(sql.get(0), 2)).contains("select t0.id, t0.status from o_order t0");
     }
diff --git a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java
index f3f75a7a6..3b2b262a8 100644
--- a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java
+++ b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java
@@ -34,15 +34,20 @@ public class TestOneToManyJoinTableInheritance extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.current();
 
+    boolean hasSequence = isSqlServer(); // uses sequence
     assertThat(sql).hasSize(11);
     assertThat(sql.get(0)).contains("insert into class_super ");
-    assertThat(sql.get(1)).contains("-- bind(ClassA)");
-    assertThat(sql.get(2)).contains("-- bind(ClassB)");
+    if (!hasSequence) {
+      assertThat(sql.get(1)).contains("-- bind(ClassA)");
+      assertThat(sql.get(2)).contains("-- bind(ClassB)");
+    }
     assertThat(sql.get(3)).contains("insert into monkey ");
-    assertThat(sql.get(4)).contains("-- bind(Sim");
-    assertThat(sql.get(5)).contains("-- bind(Tim");
-    assertThat(sql.get(6)).contains("-- bind(Uim");
-    assertThat(sql.get(7)).contains("insert into class_super_monkey (class_super_sid, monkey_mid) values (?, ?)");
+    if (!hasSequence) {
+      assertThat(sql.get(4)).contains("-- bind(Sim");
+      assertThat(sql.get(5)).contains("-- bind(Tim");
+      assertThat(sql.get(6)).contains("-- bind(Uim");
+      assertThat(sql.get(7)).contains("insert into class_super_monkey (class_super_sid, monkey_mid) values (?, ?)");
+    }
     assertSqlBind(sql, 8, 10);
 
     ClassA dbA = Ebean.find(ClassA.class, 1);
diff --git a/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java b/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java
index d6c7c66b6..9ec383234 100644
--- a/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java
+++ b/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java
@@ -126,6 +126,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
     Ebean.find(Order.class)
       .setFirstRow(10)
       .setMaxRows(10)
+      .orderBy("id")
       .findPagedList()
       .getList();
 
diff --git a/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java b/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java
index a9bb3687d..8e565c571 100644
--- a/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java
+++ b/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java
@@ -20,7 +20,7 @@ public class TestQueryFilterCaseInsensitive extends BaseTestCase {
     ResetBasicData.reset();
   }
 
-  @IgnorePlatform(Platform.MYSQL)
+  @IgnorePlatform({Platform.MYSQL, Platform.SQLSERVER})
   @Test
   public void testEq() {
 
@@ -39,7 +39,7 @@ public class TestQueryFilterCaseInsensitive extends BaseTestCase {
     assertThat(customers).hasSize(1);
   }
 
-  @IgnorePlatform(Platform.MYSQL)
+  @IgnorePlatform({Platform.MYSQL, Platform.SQLSERVER})
   @Test
   public void testNe() {
     List<Customer> customers = DB.find(Customer.class).where()
diff --git a/src/test/java/org/tests/query/TestQueryFindPagedList.java b/src/test/java/org/tests/query/TestQueryFindPagedList.java
index 293b4d519..2376fefda 100644
--- a/src/test/java/org/tests/query/TestQueryFindPagedList.java
+++ b/src/test/java/org/tests/query/TestQueryFindPagedList.java
@@ -94,6 +94,7 @@ public class TestQueryFindPagedList extends BaseTestCase {
     PagedList<Order> pagedList2 = Ebean.find(Order.class)
       .setFirstRow(1)
       .setMaxRows(3)
+      .orderBy("id")
       .findPagedList();
 
     pagedList2.loadCount();
@@ -109,6 +110,7 @@ public class TestQueryFindPagedList extends BaseTestCase {
     PagedList<Order> pagedList3 = Ebean.find(Order.class)
       .setFirstRow(2)
       .setMaxRows(150)
+      .orderBy("id")
       .findPagedList();
 
     assertFalse(pagedList3.hasNext());
diff --git a/src/test/java/org/tests/query/TestQueryOrderById.java b/src/test/java/org/tests/query/TestQueryOrderById.java
index 7d1c402f1..854f1b5eb 100644
--- a/src/test/java/org/tests/query/TestQueryOrderById.java
+++ b/src/test/java/org/tests/query/TestQueryOrderById.java
@@ -15,11 +15,16 @@ public class TestQueryOrderById extends BaseTestCase {
 
     Query<Customer> query = DB.find(Customer.class)
       .select("id,name")
+      .orderBy("id")
       .setFirstRow(1)
       .setMaxRows(5);
 
     query.findList();
-    assertThat(sqlOf(query)).isEqualTo("select t0.id, t0.name from o_customer t0 limit 5 offset 1");
+    if (isSqlServer()) {
+      assertThat(sqlOf(query)).isEqualTo("select t0.id, t0.name from o_customer t0 order by t0.id offset 1 rows fetch next 5 rows only");
+    } else {
+      assertThat(sqlOf(query)).isEqualTo("select t0.id, t0.name from o_customer t0 order by t0.id limit 5 offset 1");
+    }
   }
 
   @Test
@@ -32,6 +37,10 @@ public class TestQueryOrderById extends BaseTestCase {
       .orderById(true);
 
     query.findList();
-    assertThat(sqlOf(query)).isEqualTo("select t0.id, t0.name from o_customer t0 order by t0.id limit 5 offset 1");
+    if (isSqlServer()) {
+      assertThat(sqlOf(query)).isEqualTo("select t0.id, t0.name from o_customer t0 order by t0.id offset 1 rows fetch next 5 rows only");
+    } else {
+      assertThat(sqlOf(query)).isEqualTo("select t0.id, t0.name from o_customer t0 order by t0.id limit 5 offset 1");
+    }
   }
 }
diff --git a/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java b/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
index 54e933d3c..7c09cc098 100644
--- a/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
+++ b/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
@@ -151,6 +151,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
 
     query.setFirstRow(1);
     query.setMaxRows(2);
+    query.orderBy("id");
 
     List<Customer> list = query.findList();
 
diff --git a/src/test/java/org/tests/transaction/TestBatchModelFlush.java b/src/test/java/org/tests/transaction/TestBatchModelFlush.java
index a8195ec96..f32a459ff 100644
--- a/src/test/java/org/tests/transaction/TestBatchModelFlush.java
+++ b/src/test/java/org/tests/transaction/TestBatchModelFlush.java
@@ -75,17 +75,22 @@ public class TestBatchModelFlush extends BaseTestCase {
     assertThat(sql).hasSize(9);
 
     // first saved to batch - (depth 100)
+    boolean hasSequence = isSqlServer();
     assertThat(sql.get(0)).contains("insert into mny_b");
-    assertThat(sql.get(1)).contains(" -- bind(BatchMultipleTop_0");
-    assertThat(sql.get(2)).contains(" -- bind(BatchMultipleTop_1");
+    if (!hasSequence) {
+      assertThat(sql.get(1)).contains(" -- bind(BatchMultipleTop_0");
+      assertThat(sql.get(2)).contains(" -- bind(BatchMultipleTop_1");
+    }
     // second saved to batch - (depth 101)
     assertThat(sql.get(3)).contains("insert into mt_role");
     assertThat(sql.get(4)).contains(" -- bind(");
     assertThat(sql.get(5)).contains(" -- bind(");
     // third saved to batch - (depth 102)
     assertThat(sql.get(6)).contains("insert into mny_topic");
-    assertThat(sql.get(7)).contains(" -- bind(MnyTopic_0");
-    assertThat(sql.get(8)).contains(" -- bind(MnyTopic_1");
+    if (!hasSequence) {
+      assertThat(sql.get(7)).contains(" -- bind(MnyTopic_0");
+      assertThat(sql.get(8)).contains(" -- bind(MnyTopic_1");
+    }
 
     DB.delete(t0);
     DB.delete(t1);
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 9e00efeff..cc60f184a 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -160,8 +160,8 @@ ebean.sqlserver.databasePlatformName=sqlserver17
 
 datasource.sqlserver.username=test_ebean
 datasource.sqlserver.password=SqlS3rv#r
-datasource.sqlserver.databaseUrl=jdbc:sqlserver://localhost:1433;databaseName=test_ebean
-datasource.sqlserver.databaseDriver=com.microsoft.sqlserver.jdbc.SQLServerDriver
+datasource.sqlserver.url=jdbc:sqlserver://localhost:1433;databaseName=test_ebean;sendTimeAsDateTime=false
+datasource.sqlserver.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
 
 datasource.db2.username=db2admin
 datasource.db2.password=veryverysecret#1234
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
index 25a339db8..9dfb9aab1 100644
--- a/src/test/resources/logback-test.xml
+++ b/src/test/resources/logback-test.xml
@@ -73,13 +73,10 @@
   </root>
 
 
-  <logger name="io.ebeaninternal.dbmigration.DdlGenerator" level="TRACE"/>
-  <logger name="org.avaje.dbmigration.ddl" level="TRACE"/>
-
   <logger name="org.tests" level="INFO"/>
   <logger name="io.ebean" level="INFO"/>
 
-  <!--<logger name="org.avaje.docker" level="TRACE"/>-->
+  <logger name="io.ebean.docker" level="TRACE"/>
   <!--<logger name="io.ebean.DDL" level="DEBUG"/>-->
 
 <!--  <logger name="io.ebean.SQL" level="TRACE"/>-->

From 654c3f7f67b9ed720d072132eb6d1cdb542b4aa6 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 12 May 2019 15:22:08 +1200
Subject: [PATCH 0844/1036] #1695 - For SQL Server like remove the binary
 collation (Latin1_General_BIN)

---
 .../sqlserver/SqlServerBasePlatform.java      |  4 +-
 src/test/java/io/ebean/BaseTestCase.java      |  4 ++
 .../query/TestQueryFilterCaseInsensitive.java | 45 ++++++++++++-------
 .../tests/query/other/TestLikeEscaping.java   |  4 +-
 4 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java
index 75591f2ad..960309bbc 100644
--- a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java
@@ -47,8 +47,8 @@ abstract class SqlServerBasePlatform extends DatabasePlatform {
     this.openQuote = "[";
     this.closeQuote = "]";
     this.likeSpecialCharacters = new char[]{'%', '_', '['};
-    this.likeClauseRaw = "like ? collate Latin1_General_BIN";
-    this.likeClauseEscaped = "like ? collate Latin1_General_BIN";
+    this.likeClauseRaw = "like ?";
+    this.likeClauseEscaped = "like ?";
 
     booleanDbType = Types.INTEGER;
     this.dbDefaultValue.setFalse("0");
diff --git a/src/test/java/io/ebean/BaseTestCase.java b/src/test/java/io/ebean/BaseTestCase.java
index ee10521e9..db22d6deb 100644
--- a/src/test/java/io/ebean/BaseTestCase.java
+++ b/src/test/java/io/ebean/BaseTestCase.java
@@ -126,6 +126,10 @@ public abstract class BaseTestCase {
     return sql;
   }
 
+  public boolean isPlatformCaseSensitive() {
+    return !isMySql() && !isSqlServer();
+  }
+
   /**
    * MS SQL Server does not allow setting explicit values on identity columns
    * so tests that do this need to be skipped for SQL Server.
diff --git a/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java b/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java
index 8e565c571..86a71b324 100644
--- a/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java
+++ b/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java
@@ -2,8 +2,6 @@ package org.tests.query;
 
 import io.ebean.BaseTestCase;
 import io.ebean.DB;
-import io.ebean.annotation.IgnorePlatform;
-import io.ebean.annotation.Platform;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
@@ -20,7 +18,6 @@ public class TestQueryFilterCaseInsensitive extends BaseTestCase {
     ResetBasicData.reset();
   }
 
-  @IgnorePlatform({Platform.MYSQL, Platform.SQLSERVER})
   @Test
   public void testEq() {
 
@@ -30,7 +27,11 @@ public class TestQueryFilterCaseInsensitive extends BaseTestCase {
         .eq("name", "ROB") // case match
         .le("id", 4).findList();
 
-    assertThat(customers).isEmpty();
+    if (isPlatformCaseSensitive()) {
+      assertThat(customers).isEmpty();
+    } else {
+      assertThat(customers).isNotEmpty();
+    }
 
     customers = DB.find(Customer.class).where()
         .ieq("name", "ROB") // case insensitive match
@@ -39,14 +40,17 @@ public class TestQueryFilterCaseInsensitive extends BaseTestCase {
     assertThat(customers).hasSize(1);
   }
 
-  @IgnorePlatform({Platform.MYSQL, Platform.SQLSERVER})
   @Test
   public void testNe() {
     List<Customer> customers = DB.find(Customer.class).where()
         .ne("name", "ROB") // case match
         .le("id", 4).findList();
 
-    assertThat(customers).hasSize(4);
+    if (isPlatformCaseSensitive()) {
+      assertThat(customers).hasSize(4);
+    } else {
+      assertThat(customers).isNotEmpty();
+    }
 
     customers = DB.find(Customer.class).where()
         .ine("name", "ROB") // case insensitive match
@@ -56,14 +60,17 @@ public class TestQueryFilterCaseInsensitive extends BaseTestCase {
 
   }
 
-  @IgnorePlatform(Platform.MYSQL)
   @Test
   public void testLike() {
     List<Customer> customers = DB.find(Customer.class).where()
         .like("name", "%O%") // case match
         .le("id", 4).findList();
 
-    assertThat(customers).isEmpty();
+    if (isPlatformCaseSensitive()) {
+      assertThat(customers).isEmpty();
+    } else {
+      assertThat(customers).isNotEmpty();
+    }
 
     customers = DB.find(Customer.class).where()
         .ilike("name", "%O%") // case insensitive match
@@ -72,31 +79,36 @@ public class TestQueryFilterCaseInsensitive extends BaseTestCase {
     assertThat(customers).hasSize(4); // Rob / Fiona / Cust No address / NocCust
   }
 
-  @IgnorePlatform(Platform.MYSQL)
   @Test
   public void testContains() {
     List<Customer> customers = DB.find(Customer.class).where()
         .contains("name", "O") // case match
         .le("id", 4).findList();
 
-    assertThat(customers).isEmpty();
+    if (isPlatformCaseSensitive()) {
+      assertThat(customers).isEmpty();
+    } else {
+      assertThat(customers).isNotEmpty();
+    }
 
     customers = DB.find(Customer.class).where()
         .icontains("name", "O") // case insensitive match
         .le("id", 4).findList();
 
     assertThat(customers).hasSize(4); // Rob / Fiona / Cust No address / NocCust
-
   }
 
-  @IgnorePlatform(Platform.MYSQL)
   @Test
   public void testStartsWith() {
     List<Customer> customers = DB.find(Customer.class).where()
         .startsWith("name", "RO") // case match
         .le("id", 4).findList();
 
-    assertThat(customers).isEmpty();
+    if (isPlatformCaseSensitive()) {
+      assertThat(customers).isEmpty();
+    } else {
+      assertThat(customers).isNotEmpty();
+    }
 
     customers = DB.find(Customer.class).where()
         .istartsWith("name", "RO") // case insensitive match
@@ -105,14 +117,17 @@ public class TestQueryFilterCaseInsensitive extends BaseTestCase {
     assertThat(customers).hasSize(1);
   }
 
-  @IgnorePlatform(Platform.MYSQL)
   @Test
   public void testEndsWith() {
     List<Customer> customers = DB.find(Customer.class).where()
         .endsWith("name", "OB") // case match
         .le("id", 4).findList();
 
-    assertThat(customers).isEmpty();
+    if (isPlatformCaseSensitive()) {
+      assertThat(customers).isEmpty();
+    } else {
+      assertThat(customers).isNotEmpty();
+    }
 
     customers = DB.find(Customer.class).where()
         .iendsWith("name", "OB") // case insensitive match
diff --git a/src/test/java/org/tests/query/other/TestLikeEscaping.java b/src/test/java/org/tests/query/other/TestLikeEscaping.java
index ceebbcddc..d5eb0e92c 100644
--- a/src/test/java/org/tests/query/other/TestLikeEscaping.java
+++ b/src/test/java/org/tests/query/other/TestLikeEscaping.java
@@ -40,7 +40,7 @@ public class TestLikeEscaping extends TransactionalTestCase {
         .where().startsWith("name", "_").findCount()
     ).isEqualTo(1);
 
-    if (!isMySql()) {
+    if (isPlatformCaseSensitive()) {
       assertThat(DB.find(Customer.class)
         .where().startsWith("name", "_u").findCount()
       ).isEqualTo(0);
@@ -50,7 +50,7 @@ public class TestLikeEscaping extends TransactionalTestCase {
         .where().istartsWith("name", "_U").findCount()
     ).isEqualTo(1);
 
-    if (!isMySql()) {
+    if (isPlatformCaseSensitive()) {
       assertThat(DB.find(Customer.class)
         .where().startsWith("shippingAddress.line1", "|p").findCount()
       ).isEqualTo(0);

From 906d5f04adb945badc7ca2c45052a099d3cec3f0 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Tue, 14 May 2019 20:01:20 +0200
Subject: [PATCH 0845/1036] FIX: Migration when default value was changed

---
 .../ddlgeneration/platform/BaseTableDdl.java       |  1 +
 .../ddlgeneration/platform/HanaTableDdl.java       |  5 +----
 .../ddlgeneration/platform/MySqlDdl.java           |  5 ++++-
 .../ddlgeneration/platform/SqlServerDdl.java       |  5 ++++-
 src/test/java/misc/migration/v1_0/EBasic.java      |  9 +++++++--
 src/test/java/misc/migration/v1_1/EBasic.java      |  3 +++
 src/test/java/misc/migration/v1_2/EBasic.java      | 14 +++++++++-----
 7 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
index f82021634..54d0ec5be 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
@@ -840,6 +840,7 @@ public class BaseTableDdl implements TableDdl {
 
   /**
    * This is mysql specific - alter all the base attributes of the column together.
+   * Will be called, if there is a type, dbdefault or notnull change.
    */
   protected void alterColumnBaseAttributes(DdlWrite writer, AlterColumn alter) throws IOException {
 
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaTableDdl.java
index 8740db1c4..c0ce7dcee 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaTableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaTableDdl.java
@@ -30,10 +30,7 @@ public class HanaTableDdl extends BaseTableDdl {
 
   @Override
   protected void alterColumnDefaultValue(DdlWrite writer, AlterColumn alter) throws IOException {
-    String ddl = platformDdl.alterColumnBaseAttributes(alter);
-    if (hasValue(ddl)) {
-      writer.apply().append(ddl).endOfStatement();
-    }
+    // done in alterColumnBaseAttributes
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
index 46ed420eb..0c83e2706 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
@@ -112,7 +112,10 @@ public class MySqlDdl extends PlatformDdl {
 
   @Override
   public String alterColumnBaseAttributes(AlterColumn alter) {
-    if (DdlHelp.isDropDefault(alter.getDefaultValue())) {
+    if (alter.getType() == null
+        && alter.isNotnull() == null) {
+      // No type change or notNull change
+      // defaultValue change already handled in alterColumnDefaultValue
       return null;
     }
     String tableName = alter.getTableName();
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
index 0e8885645..c431851c4 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
@@ -149,7 +149,10 @@ public class SqlServerDdl extends PlatformDdl {
 
   @Override
   public String alterColumnBaseAttributes(AlterColumn alter) {
-    if (DdlHelp.isDropDefault(alter.getDefaultValue())) {
+    if (alter.getType() == null
+        && alter.isNotnull() == null) {
+      // No type change or notNull change
+      // defaultValue change already handled in alterColumnDefaultValue
       return null;
     }
     String tableName = alter.getTableName();
diff --git a/src/test/java/misc/migration/v1_0/EBasic.java b/src/test/java/misc/migration/v1_0/EBasic.java
index 8c90882ef..e1c16afd6 100644
--- a/src/test/java/misc/migration/v1_0/EBasic.java
+++ b/src/test/java/misc/migration/v1_0/EBasic.java
@@ -1,5 +1,6 @@
 package misc.migration.v1_0;
 
+import io.ebean.annotation.DbDefault;
 import io.ebean.annotation.EnumValue;
 import io.ebean.annotation.Index;
 import io.ebean.annotation.NotNull;
@@ -32,6 +33,10 @@ public class EBasic {
 
   Status status;
 
+  @DbDefault("N")
+  @NotNull
+  Status status2;
+
   @Size(max=127)
   String name;
 
@@ -39,11 +44,11 @@ public class EBasic {
   String description;
 
   Timestamp someDate;
-  
+
   boolean old_boolean;
 
   Boolean old_boolean2;
-  
+
   @ManyToOne
   ERef eref;
 
diff --git a/src/test/java/misc/migration/v1_1/EBasic.java b/src/test/java/misc/migration/v1_1/EBasic.java
index b46d426ad..9e5b1742d 100644
--- a/src/test/java/misc/migration/v1_1/EBasic.java
+++ b/src/test/java/misc/migration/v1_1/EBasic.java
@@ -52,6 +52,9 @@ public class EBasic {
   @DbDefault("A")
   Status status;
 
+  @Size(max=127)
+  String status2;
+
   @Index(unique = true)
   @Size(max=127)
   String name;
diff --git a/src/test/java/misc/migration/v1_2/EBasic.java b/src/test/java/misc/migration/v1_2/EBasic.java
index 5753cb767..eb2a16d9e 100644
--- a/src/test/java/misc/migration/v1_2/EBasic.java
+++ b/src/test/java/misc/migration/v1_2/EBasic.java
@@ -33,6 +33,10 @@ public class EBasic {
 
   Status status;
 
+  @DbDefault("N")
+  @NotNull
+  Status status2;
+
   @Size(max=127)
   String name;
 
@@ -40,15 +44,15 @@ public class EBasic {
   String description;
 
   Timestamp someDate;
-  
+
   boolean old_boolean;
 
   Boolean old_boolean2;
-  
+
   @ManyToOne
   ERef eref;
-  
-  
+
+
   // test add & remove indices
   @Index
   @Size(max=127)
@@ -75,7 +79,7 @@ public class EBasic {
   @NotNull
   @DbDefault("23")
   int user_id;
-  
+
   public EBasic() {
 
   }

From 9eee224e037bc6ccc101eb040e2156b019d554f3 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Tue, 14 May 2019 20:05:24 +0200
Subject: [PATCH 0846/1036] migration scripts

---
 .../migrationtest/db2/1.0__initial.sql          |  2 ++
 .../dbmigration/migrationtest/db2/1.1.sql       |  4 ++++
 .../dbmigration/migrationtest/db2/1.3.sql       |  7 +++++++
 .../migrationtest/h2/1.0__initial.sql           |  2 ++
 .../dbmigration/migrationtest/h2/1.1.sql        |  4 ++++
 .../dbmigration/migrationtest/h2/1.3.sql        |  7 +++++++
 .../migrationtest/hana/1.0__initial.sql         |  2 ++
 .../dbmigration/migrationtest/hana/1.1.sql      | 11 ++++++++---
 .../dbmigration/migrationtest/hana/1.3.sql      | 17 ++++++++++++-----
 .../migrationtest/hsqldb/1.0__initial.sql       |  2 ++
 .../dbmigration/migrationtest/hsqldb/1.1.sql    |  4 ++++
 .../dbmigration/migrationtest/hsqldb/1.3.sql    |  7 +++++++
 .../migrationtest/model/1.0__initial.model.xml  |  1 +
 .../migrationtest/model/1.1.model.xml           |  1 +
 .../migrationtest/model/1.3.model.xml           |  1 +
 .../migrationtest/mysql/1.0__initial.sql        |  1 +
 .../dbmigration/migrationtest/mysql/1.1.sql     |  2 ++
 .../dbmigration/migrationtest/mysql/1.3.sql     |  7 +++++++
 .../migrationtest/oracle/1.0__initial.sql       |  2 ++
 .../dbmigration/migrationtest/oracle/1.1.sql    |  4 ++++
 .../dbmigration/migrationtest/oracle/1.3.sql    |  7 +++++++
 .../migrationtest/postgres/1.0__initial.sql     |  2 ++
 .../dbmigration/migrationtest/postgres/1.1.sql  |  4 ++++
 .../dbmigration/migrationtest/postgres/1.3.sql  |  7 +++++++
 .../migrationtest/sqlite/1.0__initial.sql       |  2 ++
 .../dbmigration/migrationtest/sqlite/1.1.sql    |  4 ++++
 .../dbmigration/migrationtest/sqlite/1.3.sql    |  7 +++++++
 .../migrationtest/sqlserver17/1.0__initial.sql  |  2 ++
 .../migrationtest/sqlserver17/1.1.sql           |  3 +++
 .../migrationtest/sqlserver17/1.3.sql           |  9 +++++++++
 30 files changed, 127 insertions(+), 8 deletions(-)

diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
index 239b28462..095b581de 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
@@ -57,6 +57,7 @@ create table migtest_fk_set_null (
 create table migtest_e_basic (
   id                            integer generated by default as identity not null,
   status                        varchar(1),
+  status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
   some_date                     timestamp,
@@ -71,6 +72,7 @@ create table migtest_e_basic (
   indextest6                    varchar(127),
   user_id                       integer not null,
   constraint ck_mgtst__bsc_stts check ( status in ('N','A','I')),
+  constraint ck_mgtst__b_z543fg check ( status2 in ('N','A','I')),
   constraint pk_migtest_e_basic primary key (id)
 );
 -- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__b_4aybzy unique  (indextest2);
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.1.sql b/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
index d36f007a2..605a24af3 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
@@ -35,6 +35,10 @@ alter table migtest_e_basic drop constraint ck_mgtst__bsc_stts;
 alter table migtest_e_basic alter column status set default 'A';
 alter table migtest_e_basic alter column status set not null;
 alter table migtest_e_basic add constraint ck_mgtst__bsc_stts check ( status in ('N','A','I','?'));
+alter table migtest_e_basic drop constraint ck_mgtst__b_z543fg;
+alter table migtest_e_basic alter column status2 varchar(127);
+alter table migtest_e_basic alter column status2 drop default;
+alter table migtest_e_basic alter column status2 set null;
 
 -- rename all collisions;
 -- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__b_vs45xo unique  (description);
diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.3.sql b/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
index 8bd92631d..9489c8d98 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
@@ -18,6 +18,13 @@ alter table migtest_e_basic drop constraint ck_mgtst__bsc_stts;
 alter table migtest_e_basic alter column status drop default;
 alter table migtest_e_basic alter column status set null;
 alter table migtest_e_basic add constraint ck_mgtst__bsc_stts check ( status in ('N','A','I'));
+
+update migtest_e_basic set status2 = 'N' where status2 is null;
+alter table migtest_e_basic drop constraint ck_mgtst__b_z543fg;
+alter table migtest_e_basic alter column status2 varchar(1);
+alter table migtest_e_basic alter column status2 set default 'N';
+alter table migtest_e_basic alter column status2 set not null;
+alter table migtest_e_basic add constraint ck_mgtst__b_z543fg check ( status2 in ('N','A','I'));
 alter table migtest_e_basic drop constraint uq_mgtst__b_vs45xo;
 
 update migtest_e_basic set user_id = 23 where user_id is null;
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
index f90dcc0a0..46b82191e 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
@@ -57,6 +57,7 @@ create table migtest_fk_set_null (
 create table migtest_e_basic (
   id                            integer auto_increment not null,
   status                        varchar(1),
+  status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
   some_date                     timestamp,
@@ -71,6 +72,7 @@ create table migtest_e_basic (
   indextest6                    varchar(127),
   user_id                       integer not null,
   constraint ck_migtest_e_basic_status check ( status in ('N','A','I')),
+  constraint ck_migtest_e_basic_status2 check ( status2 in ('N','A','I')),
   constraint uq_migtest_e_basic_indextest2 unique (indextest2),
   constraint uq_migtest_e_basic_indextest6 unique (indextest6),
   constraint pk_migtest_e_basic primary key (id)
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.1.sql b/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
index 2732f5d8e..877c54f92 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
@@ -41,6 +41,10 @@ alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status;
 alter table migtest_e_basic alter column status set default 'A';
 alter table migtest_e_basic alter column status set not null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
+alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status2;
+alter table migtest_e_basic alter column status2 varchar(127);
+alter table migtest_e_basic alter column status2 drop default;
+alter table migtest_e_basic alter column status2 set null;
 
 -- rename all collisions;
 alter table migtest_e_basic add constraint uq_migtest_e_basic_description unique  (description);
diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.3.sql b/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
index 2d5e03935..050bb2146 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
@@ -23,6 +23,13 @@ alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status;
 alter table migtest_e_basic alter column status drop default;
 alter table migtest_e_basic alter column status set null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I'));
+
+update migtest_e_basic set status2 = 'N' where status2 is null;
+alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status2;
+alter table migtest_e_basic alter column status2 varchar(1);
+alter table migtest_e_basic alter column status2 set default 'N';
+alter table migtest_e_basic alter column status2 set not null;
+alter table migtest_e_basic add constraint ck_migtest_e_basic_status2 check ( status2 in ('N','A','I'));
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_description;
 
 update migtest_e_basic set user_id = 23 where user_id is null;
diff --git a/src/test/resources/dbmigration/migrationtest/hana/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/hana/1.0__initial.sql
index cb6d8e6d4..17e451bad 100644
--- a/src/test/resources/dbmigration/migrationtest/hana/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/hana/1.0__initial.sql
@@ -57,6 +57,7 @@ create column table migtest_fk_set_null (
 create column table migtest_e_basic (
   id                            integer generated by default as identity not null,
   status                        nvarchar(1),
+  status2                       nvarchar(1) default 'N' not null,
   name                          nvarchar(127),
   description                   nvarchar(127),
   some_date                     timestamp,
@@ -71,6 +72,7 @@ create column table migtest_e_basic (
   indextest6                    nvarchar(127),
   user_id                       integer not null,
   constraint ck_migtest_e_basic_status check ( status in ('N','A','I')),
+  constraint ck_migtest_e_basic_status2 check ( status2 in ('N','A','I')),
   constraint uq_migtest_e_basic_indextest2 unique (indextest2),
   constraint uq_migtest_e_basic_indextest6 unique (indextest6),
   constraint pk_migtest_e_basic primary key (id)
diff --git a/src/test/resources/dbmigration/migrationtest/hana/1.1.sql b/src/test/resources/dbmigration/migrationtest/hana/1.1.sql
index efa06b208..7f92f6534 100644
--- a/src/test/resources/dbmigration/migrationtest/hana/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/hana/1.1.sql
@@ -39,8 +39,15 @@ exec 'alter table migtest_e_basic drop constraint ck_migtest_e_basic_status';
 end;
 $$;
 alter table migtest_e_basic alter ( status nvarchar(1) default 'A' not null);
-alter table migtest_e_basic alter ( status nvarchar(1) default 'A' not null);
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
+delimiter $$
+do
+begin
+declare exit handler for sql_error_code 397 begin end;
+exec 'alter table migtest_e_basic drop constraint ck_migtest_e_basic_status2';
+end;
+$$;
+alter table migtest_e_basic alter ( status2 nvarchar(127) default null);
 
 -- rename all collisions;
 -- cannot create unique index "uq_migtest_e_basic_description" on table "migtest_e_basic" with nullable columns;
@@ -90,7 +97,6 @@ alter table migtest_e_history2 drop system versioning /* 0 */;
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 alter table migtest_e_history2 alter ( test_string nvarchar(255) default 'unknown' not null);
-alter table migtest_e_history2 alter ( test_string nvarchar(255) default 'unknown' not null);
 alter table migtest_e_history2_history alter ( test_string nvarchar(255) default 'unknown' not null);
 alter table migtest_e_history2 add system versioning history table migtest_e_history2_history not validated /* 1 */;
 alter table migtest_e_history2 drop system versioning /* 2 */;
@@ -118,7 +124,6 @@ alter table migtest_e_history6 drop system versioning /* 10 */;
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
 alter table migtest_e_history6 alter ( test_number1 integer default 42 not null);
-alter table migtest_e_history6 alter ( test_number1 integer default 42 not null);
 alter table migtest_e_history6_history alter ( test_number1 integer default 42 not null);
 alter table migtest_e_history6 add system versioning history table migtest_e_history6_history not validated /* 11 */;
 alter table migtest_e_history6 drop system versioning /* 12 */;
diff --git a/src/test/resources/dbmigration/migrationtest/hana/1.3.sql b/src/test/resources/dbmigration/migrationtest/hana/1.3.sql
index 11221535d..8c8aa59fc 100644
--- a/src/test/resources/dbmigration/migrationtest/hana/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/hana/1.3.sql
@@ -22,8 +22,19 @@ exec 'alter table migtest_e_basic drop constraint ck_migtest_e_basic_status';
 end;
 $$;
 alter table migtest_e_basic alter ( status nvarchar(1) default null);
-alter table migtest_e_basic alter ( status nvarchar(1) default null);
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I'));
+
+update migtest_e_basic set status2 = 'N' where status2 is null;
+delimiter $$
+do
+begin
+declare exit handler for sql_error_code 397 begin end;
+exec 'alter table migtest_e_basic drop constraint ck_migtest_e_basic_status2';
+end;
+$$;
+alter table migtest_e_basic alter ( status2 nclob  default 'N' not null);
+alter table migtest_e_basic alter ( status2 nvarchar(1) default 'N' not null);
+alter table migtest_e_basic add constraint ck_migtest_e_basic_status2 check ( status2 in ('N','A','I'));
 delimiter $$
 do
 begin
@@ -35,7 +46,6 @@ $$;
 update migtest_e_basic set user_id = 23 where user_id is null;
 alter table migtest_e_basic drop constraint  fk_migtest_e_basic_user_id;
 alter table migtest_e_basic alter ( user_id integer default 23 not null);
-alter table migtest_e_basic alter ( user_id integer default 23 not null);
 alter table migtest_e_basic add ( old_boolean boolean default false not null);
 alter table migtest_e_basic add ( old_boolean2 boolean);
 alter table migtest_e_basic add ( eref_id integer);
@@ -82,7 +92,6 @@ comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
 alter table migtest_e_history2 drop system versioning /* 0 */;
 alter table migtest_e_history2 alter ( test_string nvarchar(255) default null);
-alter table migtest_e_history2 alter ( test_string nvarchar(255) default null);
 alter table migtest_e_history2_history alter ( test_string nvarchar(255) default null);
 alter table migtest_e_history2 add system versioning history table migtest_e_history2_history not validated /* 1 */;
 alter table migtest_e_history2 drop system versioning /* 2 */;
@@ -102,7 +111,6 @@ alter table migtest_e_history4_history alter ( test_number integer);
 alter table migtest_e_history4 add system versioning history table migtest_e_history4_history not validated /* 7 */;
 alter table migtest_e_history6 drop system versioning /* 8 */;
 alter table migtest_e_history6 alter ( test_number1 integer default null);
-alter table migtest_e_history6 alter ( test_number1 integer default null);
 alter table migtest_e_history6_history alter ( test_number1 integer default null);
 alter table migtest_e_history6 add system versioning history table migtest_e_history6_history not validated /* 9 */;
 alter table migtest_e_history6 drop system versioning /* 10 */;
@@ -110,7 +118,6 @@ alter table migtest_e_history6 drop system versioning /* 10 */;
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number2 = 7 where test_number2 is null;
 alter table migtest_e_history6 alter ( test_number2 integer default 7 not null);
-alter table migtest_e_history6 alter ( test_number2 integer default 7 not null);
 alter table migtest_e_history6_history alter ( test_number2 integer default 7 not null);
 alter table migtest_e_history6 add system versioning history table migtest_e_history6_history not validated /* 11 */;
 -- explicit index "ix_migtest_e_basic_indextest1" for single column "indextest1" of table "migtest_e_basic" is not necessary;
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
index 1de75c5eb..b4d627c18 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
@@ -57,6 +57,7 @@ create table migtest_fk_set_null (
 create table migtest_e_basic (
   id                            integer generated by default as identity (start with 1)  not null,
   status                        varchar(1),
+  status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
   some_date                     timestamp,
@@ -71,6 +72,7 @@ create table migtest_e_basic (
   indextest6                    varchar(127),
   user_id                       integer not null,
   constraint ck_migtest_e_basic_status check ( status in ('N','A','I')),
+  constraint ck_migtest_e_basic_status2 check ( status2 in ('N','A','I')),
   constraint uq_migtest_e_basic_indextest2 unique (indextest2),
   constraint uq_migtest_e_basic_indextest6 unique (indextest6),
   constraint pk_migtest_e_basic primary key (id)
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
index 102421264..cebb8b994 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
@@ -35,6 +35,10 @@ alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status;
 alter table migtest_e_basic alter column status set default 'A';
 alter table migtest_e_basic alter column status set not null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
+alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status2;
+alter table migtest_e_basic alter column status2 varchar(127);
+alter table migtest_e_basic alter column status2 drop default;
+alter table migtest_e_basic alter column status2 set null;
 
 -- rename all collisions;
 alter table migtest_e_basic add constraint uq_migtest_e_basic_description unique  (description);
diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
index 1414c3818..ed3b50536 100644
--- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
@@ -18,6 +18,13 @@ alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status;
 alter table migtest_e_basic alter column status drop default;
 alter table migtest_e_basic alter column status set null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I'));
+
+update migtest_e_basic set status2 = 'N' where status2 is null;
+alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status2;
+alter table migtest_e_basic alter column status2 varchar(1);
+alter table migtest_e_basic alter column status2 set default 'N';
+alter table migtest_e_basic alter column status2 set not null;
+alter table migtest_e_basic add constraint ck_migtest_e_basic_status2 check ( status2 in ('N','A','I'));
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_description;
 
 update migtest_e_basic set user_id = 23 where user_id is null;
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
index fa3defb9a..ce4f03b4b 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
@@ -40,6 +40,7 @@
         <createTable name="migtest_e_basic" pkName="pk_migtest_e_basic">
             <column name="id" type="integer" primaryKey="true"/>
             <column name="status" type="varchar(1)" checkConstraint="check ( status in ('N','A','I'))" checkConstraintName="ck_migtest_e_basic_status"/>
+            <column name="status2" type="varchar(1)" defaultValue="'N'" notnull="true" checkConstraint="check ( status2 in ('N','A','I'))" checkConstraintName="ck_migtest_e_basic_status2"/>
             <column name="name" type="varchar(127)"/>
             <column name="description" type="varchar(127)"/>
             <column name="some_date" type="timestamp"/>
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
index 5a2e4d63d..d304daa7d 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
@@ -14,6 +14,7 @@
         <alterColumn columnName="one_id" tableName="migtest_fk_none_via_join" references="migtest_fk_one.id" foreignKeyName="fk_migtest_fk_none_via_join_one_id" foreignKeyIndex="ix_migtest_fk_none_via_join_one_id"/>
         <alterColumn columnName="one_id" tableName="migtest_fk_set_null" references="migtest_fk_one.id" foreignKeyName="fk_migtest_fk_set_null_one_id" foreignKeyIndex="ix_migtest_fk_set_null_one_id" foreignKeyOnDelete="RESTRICT" foreignKeyOnUpdate="RESTRICT" dropForeignKey="fk_migtest_fk_set_null_one_id" dropForeignKeyIndex="ix_migtest_fk_set_null_one_id"/>
         <alterColumn columnName="status" tableName="migtest_e_basic" currentType="varchar(1)" defaultValue="'A'" notnull="true" currentNotnull="false" checkConstraint="check ( status in ('N','A','I','?'))" checkConstraintName="ck_migtest_e_basic_status"/>
+        <alterColumn columnName="status2" tableName="migtest_e_basic" type="varchar(127)" currentType="varchar(1)" defaultValue="DROP DEFAULT" notnull="false" currentNotnull="true" dropCheckConstraint="ck_migtest_e_basic_status2"/>
         <alterColumn columnName="description" tableName="migtest_e_basic" unique="uq_migtest_e_basic_description">
             <before>
                 <ddl>-- rename all collisions</ddl>
diff --git a/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
index d32d725be..91d0e6449 100644
--- a/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
+++ b/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
@@ -7,6 +7,7 @@
         <alterColumn columnName="one_id" tableName="migtest_fk_none_via_join" dropForeignKey="fk_migtest_fk_none_via_join_one_id" dropForeignKeyIndex="ix_migtest_fk_none_via_join_one_id"/>
         <alterColumn columnName="one_id" tableName="migtest_fk_set_null" references="migtest_fk_one.id" foreignKeyName="fk_migtest_fk_set_null_one_id" foreignKeyIndex="ix_migtest_fk_set_null_one_id" foreignKeyOnDelete="SET_NULL" foreignKeyOnUpdate="RESTRICT" dropForeignKey="fk_migtest_fk_set_null_one_id" dropForeignKeyIndex="ix_migtest_fk_set_null_one_id"/>
         <alterColumn columnName="status" tableName="migtest_e_basic" currentType="varchar(1)" defaultValue="DROP DEFAULT" notnull="false" currentNotnull="true" checkConstraint="check ( status in ('N','A','I'))" checkConstraintName="ck_migtest_e_basic_status"/>
+        <alterColumn columnName="status2" tableName="migtest_e_basic" type="varchar(1)" currentType="varchar(127)" defaultValue="'N'" notnull="true" currentNotnull="false" checkConstraint="check ( status2 in ('N','A','I'))" checkConstraintName="ck_migtest_e_basic_status2"/>
         <alterColumn columnName="description" tableName="migtest_e_basic" dropUnique="uq_migtest_e_basic_description"/>
         <alterColumn columnName="user_id" tableName="migtest_e_basic" currentType="integer" defaultValue="23" notnull="true" currentNotnull="false" dropForeignKey="fk_migtest_e_basic_user_id" dropForeignKeyIndex="ix_migtest_e_basic_user_id"/>
         <addColumn tableName="migtest_e_basic">
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
index e5e98049b..0267c1545 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
@@ -57,6 +57,7 @@ create table migtest_fk_set_null (
 create table migtest_e_basic (
   id                            integer auto_increment not null,
   status                        varchar(1),
+  status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
   some_date                     datetime(6),
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
index ecc42a6ef..e3e5bf26a 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
@@ -39,6 +39,8 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 update migtest_e_basic set status = 'A' where status is null;
 alter table migtest_e_basic alter status set default 'A';
 alter table migtest_e_basic modify status varchar(1) not null;
+alter table migtest_e_basic alter status2 drop default;
+alter table migtest_e_basic modify status2 varchar(127);
 
 -- rename all collisions;
 alter table migtest_e_basic add constraint uq_migtest_e_basic_description unique  (description);
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
index da05d955b..057cec8bd 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
@@ -20,6 +20,11 @@ alter table migtest_fk_none_via_join drop foreign key fk_migtest_fk_none_via_joi
 alter table migtest_fk_set_null drop foreign key fk_migtest_fk_set_null_one_id;
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
 alter table migtest_e_basic alter status drop default;
+alter table migtest_e_basic modify status varchar(1);
+
+update migtest_e_basic set status2 = 'N' where status2 is null;
+alter table migtest_e_basic alter status2 set default 'N';
+alter table migtest_e_basic modify status2 varchar(1) not null;
 alter table migtest_e_basic drop index uq_migtest_e_basic_description;
 
 update migtest_e_basic set user_id = 23 where user_id is null;
@@ -38,6 +43,7 @@ alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique  (indextest6);
 alter table migtest_e_history comment = '';
 alter table migtest_e_history2 alter test_string drop default;
+alter table migtest_e_history2 modify test_string varchar(255);
 alter table migtest_e_history2 add column obsolete_string1 varchar(255);
 alter table migtest_e_history2 add column obsolete_string2 varchar(255);
 alter table migtest_e_history2_history add column obsolete_string1 varchar(255);
@@ -46,6 +52,7 @@ alter table migtest_e_history2_history add column obsolete_string2 varchar(255);
 alter table migtest_e_history4 modify test_number integer;
 alter table migtest_e_history4_history modify test_number integer;
 alter table migtest_e_history6 alter test_number1 drop default;
+alter table migtest_e_history6 modify test_number1 integer;
 
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number2 = 7 where test_number2 is null;
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
index c2f988553..8c9b8aefb 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
@@ -65,6 +65,7 @@ create sequence migtest_fk_set_null_seq;
 create table migtest_e_basic (
   id                            number(10) not null,
   status                        varchar2(1),
+  status2                       varchar2(1) default 'N' not null,
   name                          varchar2(127),
   description                   varchar2(127),
   some_date                     timestamp,
@@ -79,6 +80,7 @@ create table migtest_e_basic (
   indextest6                    varchar2(127),
   user_id                       number(10) not null,
   constraint ck_migtest_e_basic_status check ( status in ('N','A','I')),
+  constraint ck_migtest_e_basic_status2 check ( status2 in ('N','A','I')),
   constraint uq_migtest_e_basic_indextest2 unique (indextest2),
   constraint uq_migtest_e_basic_indextest6 unique (indextest6),
   constraint pk_migtest_e_basic primary key (id)
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
index 9015ce54c..68ab55e92 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
@@ -36,6 +36,10 @@ alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
 alter table migtest_e_basic modify status default 'A';
 alter table migtest_e_basic modify status not null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
+alter table migtest_e_basic drop constraint ck_migtest_e_basic_status2;
+alter table migtest_e_basic modify status2 varchar2(127);
+alter table migtest_e_basic modify status2 drop default;
+alter table migtest_e_basic modify status2 null;
 
 -- rename all collisions;
 -- NOT YET IMPLEMENTED: alter table migtest_e_basic add constraint uq_migtest_e_basic_description unique  (description);
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
index aa3ea6fc3..8bc419e76 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
@@ -19,6 +19,13 @@ alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
 alter table migtest_e_basic modify status drop default;
 alter table migtest_e_basic modify status null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I'));
+
+update migtest_e_basic set status2 = 'N' where status2 is null;
+alter table migtest_e_basic drop constraint ck_migtest_e_basic_status2;
+alter table migtest_e_basic modify status2 varchar2(1);
+alter table migtest_e_basic modify status2 default 'N';
+alter table migtest_e_basic modify status2 not null;
+alter table migtest_e_basic add constraint ck_migtest_e_basic_status2 check ( status2 in ('N','A','I'));
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_description;
 
 update migtest_e_basic set user_id = 23 where user_id is null;
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
index ea3b65d03..2f06401e3 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
@@ -57,6 +57,7 @@ create table migtest_fk_set_null (
 create table migtest_e_basic (
   id                            serial not null,
   status                        varchar(1),
+  status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
   some_date                     timestamptz,
@@ -71,6 +72,7 @@ create table migtest_e_basic (
   indextest6                    varchar(127),
   user_id                       integer not null,
   constraint ck_migtest_e_basic_status check ( status in ('N','A','I')),
+  constraint ck_migtest_e_basic_status2 check ( status2 in ('N','A','I')),
   constraint uq_migtest_e_basic_indextest2 unique (indextest2),
   constraint uq_migtest_e_basic_indextest6 unique (indextest6),
   constraint pk_migtest_e_basic primary key (id)
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
index 15a950efd..6b3f14652 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
@@ -41,6 +41,10 @@ alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status;
 alter table migtest_e_basic alter column status set default 'A';
 alter table migtest_e_basic alter column status set not null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
+alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status2;
+alter table migtest_e_basic alter column status2 type varchar(127);
+alter table migtest_e_basic alter column status2 drop default;
+alter table migtest_e_basic alter column status2 drop not null;
 
 -- rename all collisions;
 alter table migtest_e_basic add constraint uq_migtest_e_basic_description unique  (description);
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
index 4fd4074c8..95904bfd3 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
@@ -23,6 +23,13 @@ alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status;
 alter table migtest_e_basic alter column status drop default;
 alter table migtest_e_basic alter column status drop not null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I'));
+
+update migtest_e_basic set status2 = 'N' where status2 is null;
+alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status2;
+alter table migtest_e_basic alter column status2 type varchar(1);
+alter table migtest_e_basic alter column status2 set default 'N';
+alter table migtest_e_basic alter column status2 set not null;
+alter table migtest_e_basic add constraint ck_migtest_e_basic_status2 check ( status2 in ('N','A','I'));
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_description;
 
 update migtest_e_basic set user_id = 23 where user_id is null;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
index 4f25fb26b..565b49c14 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
@@ -59,6 +59,7 @@ create table migtest_fk_set_null (
 create table migtest_e_basic (
   id                            integer not null,
   status                        varchar(1),
+  status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
   some_date                     timestamp,
@@ -73,6 +74,7 @@ create table migtest_e_basic (
   indextest6                    varchar(127),
   user_id                       integer not null,
   constraint ck_migtest_e_basic_status check ( status in ('N','A','I')),
+  constraint ck_migtest_e_basic_status2 check ( status2 in ('N','A','I')),
   constraint uq_migtest_e_basic_indextest2 unique (indextest2),
   constraint uq_migtest_e_basic_indextest6 unique (indextest6),
   constraint pk_migtest_e_basic primary key (id),
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
index f158133bf..a762b673e 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
@@ -34,6 +34,10 @@ alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status;
 alter table migtest_e_basic alter column status set default 'A';
 alter table migtest_e_basic alter column status set not null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
+alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status2;
+alter table migtest_e_basic alter column status2 varchar(127);
+alter table migtest_e_basic alter column status2 drop default;
+alter table migtest_e_basic alter column status2 set null;
 
 -- rename all collisions;
 alter table migtest_e_basic add constraint uq_migtest_e_basic_description unique  (description);
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
index b4e83b150..3812d6e38 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
@@ -16,6 +16,13 @@ alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status;
 alter table migtest_e_basic alter column status drop default;
 alter table migtest_e_basic alter column status set null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I'));
+
+update migtest_e_basic set status2 = 'N' where status2 is null;
+alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status2;
+alter table migtest_e_basic alter column status2 varchar(1);
+alter table migtest_e_basic alter column status2 set default 'N';
+alter table migtest_e_basic alter column status2 set not null;
+alter table migtest_e_basic add constraint ck_migtest_e_basic_status2 check ( status2 in ('N','A','I'));
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_description;
 
 update migtest_e_basic set user_id = 23 where user_id is null;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql
index 99a41e4a5..545c2161d 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql
@@ -65,6 +65,7 @@ create sequence migtest_fk_set_null_seq as bigint  start with 1 ;
 create table migtest_e_basic (
   id                            integer not null,
   status                        nvarchar(1),
+  status2                       nvarchar(1) default 'N' not null,
   name                          nvarchar(127),
   description                   nvarchar(127),
   some_date                     datetime2,
@@ -79,6 +80,7 @@ create table migtest_e_basic (
   indextest6                    nvarchar(127),
   user_id                       integer not null,
   constraint ck_migtest_e_basic_status check ( status in ('N','A','I')),
+  constraint ck_migtest_e_basic_status2 check ( status2 in ('N','A','I')),
   constraint pk_migtest_e_basic primary key (id)
 );
 create unique nonclustered index uq_migtest_e_basic_indextest2 on migtest_e_basic(indextest2) where indextest2 is not null;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql
index 804342b64..90dbc13af 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql
@@ -36,6 +36,9 @@ IF (OBJECT_ID('ck_migtest_e_basic_status', 'C') IS NOT NULL) alter table migtest
 alter table migtest_e_basic add default 'A' for status;
 alter table migtest_e_basic alter column status nvarchar(1) not null;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
+IF (OBJECT_ID('ck_migtest_e_basic_status2', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_status2;
+EXEC usp_ebean_drop_default_constraint migtest_e_basic, status2;
+alter table migtest_e_basic alter column status2 nvarchar(127);
 
 -- rename all collisions;
 create unique nonclustered index uq_migtest_e_basic_description on migtest_e_basic(description) where description is not null;
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql
index 57aa39278..5eefaa4e0 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql
@@ -17,7 +17,14 @@ IF OBJECT_ID('fk_migtest_fk_set_null_one_id', 'F') IS NOT NULL alter table migte
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update set null;
 IF (OBJECT_ID('ck_migtest_e_basic_status', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_status;
 EXEC usp_ebean_drop_default_constraint migtest_e_basic, status;
+alter table migtest_e_basic alter column status nvarchar(1);
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I'));
+
+update migtest_e_basic set status2 = 'N' where status2 is null;
+IF (OBJECT_ID('ck_migtest_e_basic_status2', 'C') IS NOT NULL) alter table migtest_e_basic drop constraint ck_migtest_e_basic_status2;
+alter table migtest_e_basic add default 'N' for status2;
+alter table migtest_e_basic alter column status2 nvarchar(1) not null;
+alter table migtest_e_basic add constraint ck_migtest_e_basic_status2 check ( status2 in ('N','A','I'));
 IF (OBJECT_ID('uq_migtest_e_basic_description', 'UQ') IS NOT NULL) alter table migtest_e_basic drop constraint uq_migtest_e_basic_description;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'uq_migtest_e_basic_description') drop index uq_migtest_e_basic_description ON migtest_e_basic;
 
@@ -42,11 +49,13 @@ create unique nonclustered index uq_migtest_e_basic_indextest6 on migtest_e_basi
 IF (OBJECT_ID('ck_migtest_e_enum_test_status', 'C') IS NOT NULL) alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status;
 alter table migtest_e_enum add constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I'));
 EXEC usp_ebean_drop_default_constraint migtest_e_history2, test_string;
+alter table migtest_e_history2 alter column test_string nvarchar(255);
 alter table migtest_e_history2 add obsolete_string1 nvarchar(255);
 alter table migtest_e_history2 add obsolete_string2 nvarchar(255);
 
 alter table migtest_e_history4 alter column test_number integer;
 EXEC usp_ebean_drop_default_constraint migtest_e_history6, test_number1;
+alter table migtest_e_history6 alter column test_number1 integer;
 
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number2 = 7 where test_number2 is null;

From 9da7c9468e945f943cbd50bf71a1db483abc2e3a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 15 May 2019 16:19:12 +1200
Subject: [PATCH 0847/1036] #1695 Add caseSensitiveCollation configuration
 option

This is really only to use with testing via
platform.isCaseSensitiveCollation() to determine
which asserts/tests apply (based on collation).
---
 .../java/io/ebean/config/PlatformConfig.java   | 18 ++++++++++++++++++
 .../config/dbplatform/DatabasePlatform.java    | 13 +++++++++++++
 src/test/java/io/ebean/BaseTestCase.java       |  2 +-
 .../java/io/ebean/config/ServerConfigTest.java |  3 +++
 src/test/resources/ebean.properties            |  7 ++++++-
 5 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/ebean/config/PlatformConfig.java b/src/main/java/io/ebean/config/PlatformConfig.java
index 298b25d23..2aa48c3f0 100644
--- a/src/main/java/io/ebean/config/PlatformConfig.java
+++ b/src/main/java/io/ebean/config/PlatformConfig.java
@@ -52,6 +52,8 @@ public class PlatformConfig {
    */
   private boolean databaseInetAddressVarchar;
 
+  private boolean caseSensitiveCollation = true;
+
   /**
    * Modify the default mapping of standard types such as default precision for DECIMAL etc.
    */
@@ -74,6 +76,7 @@ public class PlatformConfig {
     this.idType = platformConfig.idType;
     this.geometrySRID = platformConfig.geometrySRID;
     this.dbUuid = platformConfig.dbUuid;
+    this.caseSensitiveCollation = platformConfig.caseSensitiveCollation;
   }
 
   /**
@@ -90,6 +93,20 @@ public class PlatformConfig {
     this.allQuotedIdentifiers = allQuotedIdentifiers;
   }
 
+  /**
+   * Return true if the collation is case sensitive.
+   */
+  public boolean isCaseSensitiveCollation() {
+    return caseSensitiveCollation;
+  }
+
+  /**
+   * Set to false to indicate that the collation is case insensitive.
+   */
+  public void setCaseSensitiveCollation(boolean caseSensitiveCollation) {
+    this.caseSensitiveCollation = caseSensitiveCollation;
+  }
+
   /**
    * Return a value used to represent TRUE in the database.
    * <p>
@@ -255,6 +272,7 @@ public class PlatformConfig {
     databaseBooleanTrue = p.get("databaseBooleanTrue", databaseBooleanTrue);
     databaseBooleanFalse = p.get("databaseBooleanFalse", databaseBooleanFalse);
     databaseInetAddressVarchar = p.getBoolean("databaseInetAddressVarchar", databaseInetAddressVarchar);
+    caseSensitiveCollation = p.getBoolean("caseSensitiveCollation", caseSensitiveCollation);
 
     DbUuid dbUuid = p.getEnum(DbUuid.class, "dbuuid", null);
     if (dbUuid != null) {
diff --git a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
index 16ab2592a..6a96724e8 100644
--- a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
@@ -71,6 +71,8 @@ public class DatabasePlatform {
    */
   protected boolean allQuotedIdentifiers;
 
+  protected boolean caseSensitiveCollation = true;
+
   /**
    * For limit/offset, row_number etc limiting of SQL queries.
    */
@@ -226,6 +228,7 @@ public class DatabasePlatform {
    */
   public void configure(PlatformConfig config) {
     this.sequenceBatchSize = config.getDatabaseSequenceBatchSize();
+    this.caseSensitiveCollation = config.isCaseSensitiveCollation();
     configureIdType(config.getIdType());
     configure(config, config.isAllQuotedIdentifiers());
   }
@@ -315,6 +318,16 @@ public class DatabasePlatform {
     return supportsDeleteTableAlias;
   }
 
+  /**
+   * Return true if the collation is case sensitive.
+   * <p>
+   * This is expected to be used for testing only.
+   * </p>
+   */
+  public boolean isCaseSensitiveCollation() {
+    return caseSensitiveCollation;
+  }
+
   /**
    * Return the maximum table name length.
    * <p>
diff --git a/src/test/java/io/ebean/BaseTestCase.java b/src/test/java/io/ebean/BaseTestCase.java
index db22d6deb..9156aaf3c 100644
--- a/src/test/java/io/ebean/BaseTestCase.java
+++ b/src/test/java/io/ebean/BaseTestCase.java
@@ -127,7 +127,7 @@ public abstract class BaseTestCase {
   }
 
   public boolean isPlatformCaseSensitive() {
-    return !isMySql() && !isSqlServer();
+    return spiEbeanServer().getDatabasePlatform().isCaseSensitiveCollation();
   }
 
   /**
diff --git a/src/test/java/io/ebean/config/ServerConfigTest.java b/src/test/java/io/ebean/config/ServerConfigTest.java
index 7a5097190..2279a864e 100644
--- a/src/test/java/io/ebean/config/ServerConfigTest.java
+++ b/src/test/java/io/ebean/config/ServerConfigTest.java
@@ -70,6 +70,7 @@ public class ServerConfigTest {
     props.setProperty("namingConvention", "io.ebean.config.MatchingNamingConvention");
     props.setProperty("idGeneratorAutomatic", "true");
     props.setProperty("enabledL2Regions", "r0,users,orgs");
+    props.setProperty("caseSensitiveCollation", "false");
 
 
     serverConfig.loadFromProperties(props);
@@ -79,6 +80,7 @@ public class ServerConfigTest {
     assertTrue(serverConfig.isDbOffline());
     assertTrue(serverConfig.isAutoReadOnlyDataSource());
     assertTrue(serverConfig.isIdGeneratorAutomatic());
+    assertFalse(serverConfig.getPlatformConfig().isCaseSensitiveCollation());
 
     assertThat(serverConfig.getNamingConvention()).isInstanceOf(MatchingNamingConvention.class);
 
@@ -131,6 +133,7 @@ public class ServerConfigTest {
     assertFalse(serverConfig.isIdGeneratorAutomatic());
     assertEquals(JsonConfig.DateTime.ISO8601, serverConfig.getJsonDateTime());
     assertEquals(JsonConfig.Date.ISO8601, serverConfig.getJsonDate());
+    assertTrue(serverConfig.getPlatformConfig().isCaseSensitiveCollation());
   }
 
   @Test
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index cc60f184a..7fdded46b 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -129,7 +129,9 @@ datasource.hsqldb.password=
 datasource.hsqldb.databaseUrl=jdbc:hsqldb:mem:tests
 datasource.hsqldb.databaseDriver=org.hsqldb.jdbcDriver
 
-
+# Set caseSensitiveCollation to false when using
+# MySql with case insenstive collation
+ebean.mysql.caseSensitiveCollation=false
 datasource.mysql.username=unit
 datasource.mysql.password=unit
 datasource.mysql.databaseUrl=jdbc:mysql://127.0.0.1:3306/unit
@@ -158,6 +160,9 @@ datasource.pg.maxStackTraceSize=50
 # Our main testing target for SqlServer is sqlserver17
 ebean.sqlserver.databasePlatformName=sqlserver17
 
+# set caseSensitiveCollation=false when using a
+# case insenstive collation with sql server
+ebean.sqlserver.caseSensitiveCollation=false
 datasource.sqlserver.username=test_ebean
 datasource.sqlserver.password=SqlS3rv#r
 datasource.sqlserver.url=jdbc:sqlserver://localhost:1433;databaseName=test_ebean;sendTimeAsDateTime=false

From b7905daeb53f8358a252ef921438168e6bca21ff Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 16 May 2019 15:36:22 +1200
Subject: [PATCH 0848/1036] #1695 Fix case sensitive builtin sql server proc

- Update main.StartSqlServer to use updated ebean-test-docker with collation support
---
 pom.xml                                                |  2 +-
 .../io/ebeaninternal/dbmigration/builtin-extra-ddl.xml | 10 +++++-----
 src/test/java/main/StartSqlServer.java                 |  8 +++++++-
 .../dbmigration/migrationtest/hana/I__create_procs.sql |  6 +++---
 .../migrationtest/sqlserver17/I__create_procs.sql      |  4 ++--
 src/test/resources/ebean.properties                    |  4 ++--
 6 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 05d2f4b10..0b8c9e0a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -229,7 +229,7 @@
     <dependency>
       <groupId>io.ebean.test</groupId>
       <artifactId>ebean-test-docker</artifactId>
-      <version>2.4.1</version>
+      <version>2.5.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml b/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml
index d50eef8b6..5a11d4804 100644
--- a/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml
+++ b/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml
@@ -49,11 +49,11 @@ CREATE OR ALTER PROCEDURE usp_ebean_drop_default_constraint @tableName nvarchar(
 AS SET NOCOUNT ON
 declare @tmp nvarchar(1000)
 BEGIN
-  select @Tmp = t1.name from sys.default_constraints t1
+  select @tmp = t1.name from sys.default_constraints t1
     join sys.columns t2 on t1.object_id = t2.default_object_id
     where t1.parent_object_id = OBJECT_ID(@tableName) and t2.name = @columnName;
 
-  if @Tmp is not null EXEC('alter table ' + @tableName +' drop constraint ' + @tmp);
+  if @tmp is not null EXEC('alter table ' + @tableName +' drop constraint ' + @tmp);
 END
 $$
 
@@ -171,13 +171,13 @@ AS
 BEGIN
   DECLARE foreign_key_names TABLE(CONSTRAINT_NAME NVARCHAR(256), TABLE_NAME NVARCHAR(256));
   DECLARE i INT;
-  
+
   foreign_key_names = SELECT CONSTRAINT_NAME, TABLE_NAME FROM SYS.REFERENTIAL_CONSTRAINTS WHERE SCHEMA_NAME=CURRENT_SCHEMA AND TABLE_NAME=UPPER(:table_name) AND COLUMN_NAME=UPPER(:column_name);
-  
+
   FOR I IN 1 .. RECORD_COUNT(:foreign_key_names) DO
     EXEC 'ALTER TABLE "' || ESCAPE_DOUBLE_QUOTES(:foreign_key_names.TABLE_NAME[i]) || '" DROP CONSTRAINT "' || ESCAPE_DOUBLE_QUOTES(:foreign_key_names.CONSTRAINT_NAME[i]) || '"';
   END FOR;
-  
+
 END;
 $$
 
diff --git a/src/test/java/main/StartSqlServer.java b/src/test/java/main/StartSqlServer.java
index fe758efba..a158133ae 100644
--- a/src/test/java/main/StartSqlServer.java
+++ b/src/test/java/main/StartSqlServer.java
@@ -11,9 +11,15 @@ public class StartSqlServer {
     config.setDbName("test_ebean");
     config.setUser("test_ebean");
 
+    // by default this sqlserver docker collation is case sensitive
+    // using MSSQL_COLLATION=Latin1_General_100_BIN2
+    //
+    // when changing to a CI collation also use
+    // ebean.sqlserver.caseSensitiveCollation=false
+    // ... such that tests now take that into account
+    //config.setCollation("Latin1_General_100_CI");
 
     SqlServerContainer container = new SqlServerContainer(config);
     container.start();
-
   }
 }
diff --git a/src/test/resources/dbmigration/migrationtest/hana/I__create_procs.sql b/src/test/resources/dbmigration/migrationtest/hana/I__create_procs.sql
index 6abbe7a96..32b8a9404 100644
--- a/src/test/resources/dbmigration/migrationtest/hana/I__create_procs.sql
+++ b/src/test/resources/dbmigration/migrationtest/hana/I__create_procs.sql
@@ -9,13 +9,13 @@ AS
 BEGIN
   DECLARE foreign_key_names TABLE(CONSTRAINT_NAME NVARCHAR(256), TABLE_NAME NVARCHAR(256));
   DECLARE i INT;
-  
+
   foreign_key_names = SELECT CONSTRAINT_NAME, TABLE_NAME FROM SYS.REFERENTIAL_CONSTRAINTS WHERE SCHEMA_NAME=CURRENT_SCHEMA AND TABLE_NAME=UPPER(:table_name) AND COLUMN_NAME=UPPER(:column_name);
-  
+
   FOR I IN 1 .. RECORD_COUNT(:foreign_key_names) DO
     EXEC 'ALTER TABLE "' || ESCAPE_DOUBLE_QUOTES(:foreign_key_names.TABLE_NAME[i]) || '" DROP CONSTRAINT "' || ESCAPE_DOUBLE_QUOTES(:foreign_key_names.CONSTRAINT_NAME[i]) || '"';
   END FOR;
-  
+
 END;
 $$
 
diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/I__create_procs.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/I__create_procs.sql
index 5c35dffc6..0d6379544 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver17/I__create_procs.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/I__create_procs.sql
@@ -46,11 +46,11 @@ CREATE OR ALTER PROCEDURE usp_ebean_drop_default_constraint @tableName nvarchar(
 AS SET NOCOUNT ON
 declare @tmp nvarchar(1000)
 BEGIN
-  select @Tmp = t1.name from sys.default_constraints t1
+  select @tmp = t1.name from sys.default_constraints t1
     join sys.columns t2 on t1.object_id = t2.default_object_id
     where t1.parent_object_id = OBJECT_ID(@tableName) and t2.name = @columnName;
 
-  if @Tmp is not null EXEC('alter table ' + @tableName +' drop constraint ' + @tmp);
+  if @tmp is not null EXEC('alter table ' + @tableName +' drop constraint ' + @tmp);
 END
 $$
 
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 7fdded46b..3943c47f4 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -161,8 +161,8 @@ datasource.pg.maxStackTraceSize=50
 ebean.sqlserver.databasePlatformName=sqlserver17
 
 # set caseSensitiveCollation=false when using a
-# case insenstive collation with sql server
-ebean.sqlserver.caseSensitiveCollation=false
+# case insenstive collation with sql server - See main.StartSqlServer
+#ebean.sqlserver.caseSensitiveCollation=false
 datasource.sqlserver.username=test_ebean
 datasource.sqlserver.password=SqlS3rv#r
 datasource.sqlserver.url=jdbc:sqlserver://localhost:1433;databaseName=test_ebean;sendTimeAsDateTime=false

From fa5ce9cbbad7a4f3fbe9101c48b04d89892cf186 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 16 May 2019 16:55:05 +1200
Subject: [PATCH 0849/1036] #1695 Add StartMyServer - docker mysql with
 collation options

- Adjust TestWhereLikeWithSlash ignoring slash escaping assert for mysql (due to dependency on no_backslash_escapes setting)
---
 src/test/java/main/StartMyServer.java         | 28 +++++++++++++++++++
 src/test/java/main/StartSqlServer.java        |  2 ++
 .../query/other/TestWhereLikeWithSlash.java   |  9 +++---
 src/test/resources/ebean.properties           |  4 +--
 4 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 src/test/java/main/StartMyServer.java

diff --git a/src/test/java/main/StartMyServer.java b/src/test/java/main/StartMyServer.java
new file mode 100644
index 000000000..de04e1625
--- /dev/null
+++ b/src/test/java/main/StartMyServer.java
@@ -0,0 +1,28 @@
+package main;
+
+import io.ebean.docker.commands.MySqlConfig;
+import io.ebean.docker.commands.MySqlContainer;
+
+public class StartMyServer {
+
+  public static void main(String[] args) {
+
+    MySqlConfig config = new MySqlConfig("5.7");
+    config.setDbName("unit");
+    config.setUser("unit");
+    config.setPassword("unit");
+
+    // by default this mysql docker collation is case sensitive
+    // using utf8mb4_bin
+    //
+    // when changing to a CI collation (e.g. utf8mb4_unicode_ci) we also set
+    // ebean.<db>.caseSensitiveCollation=false
+    // ... such that tests now take that into account
+//    config.setCollation("default");
+//    config.setCollation("utf8mb4_unicode_ci");
+//    config.setCharacterSet("utf8mb4");
+
+    MySqlContainer container = new MySqlContainer(config);
+    container.start();
+  }
+}
diff --git a/src/test/java/main/StartSqlServer.java b/src/test/java/main/StartSqlServer.java
index a158133ae..7eea22376 100644
--- a/src/test/java/main/StartSqlServer.java
+++ b/src/test/java/main/StartSqlServer.java
@@ -17,6 +17,8 @@ public class StartSqlServer {
     // when changing to a CI collation also use
     // ebean.sqlserver.caseSensitiveCollation=false
     // ... such that tests now take that into account
+
+    //config.setCollation("default");
     //config.setCollation("Latin1_General_100_CI");
 
     SqlServerContainer container = new SqlServerContainer(config);
diff --git a/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java b/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java
index f08e57eec..328682e7a 100644
--- a/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java
+++ b/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java
@@ -26,10 +26,11 @@ public class TestWhereLikeWithSlash extends BaseTestCase {
     Query<EBasic> query1 = Ebean.find(EBasic.class).where().like("name", "slash\\mon%").query();
     List<EBasic> list1 = query1.findList();
 
-    // This doesn't work in the latest version of H2 so disable for now.
-    // Still good on Postgres which was the original issue
-    assertEquals(1, list1.size());
-
+    if (!isMySql()) {
+      // For mysql this assert depends on no_backslash_escapes setting so we won't assert here
+      // Still good on Postgres which was the original issue
+      assertEquals(1, list1.size());
+    }
   }
 
   @Test
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 3943c47f4..43fd2954c 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -131,10 +131,10 @@ datasource.hsqldb.databaseDriver=org.hsqldb.jdbcDriver
 
 # Set caseSensitiveCollation to false when using
 # MySql with case insenstive collation
-ebean.mysql.caseSensitiveCollation=false
+#ebean.mysql.caseSensitiveCollation=false
 datasource.mysql.username=unit
 datasource.mysql.password=unit
-datasource.mysql.databaseUrl=jdbc:mysql://127.0.0.1:3306/unit
+datasource.mysql.databaseUrl=jdbc:mysql://127.0.0.1:4306/unit
 #datasource.mysql.username=test_ebean
 #datasource.mysql.password=test
 #datasource.mysql.databaseUrl=jdbc:mysql://127.0.0.1:4306/test_ebean

From c512eb564d11ee32c6a9da195c96d3b28561ca38 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 16 May 2019 20:07:43 +1200
Subject: [PATCH 0850/1036] #1702 - Format only change

---
 .../dbmigration/ddlgeneration/platform/MySqlDdl.java           | 3 +--
 .../dbmigration/ddlgeneration/platform/SqlServerDdl.java       | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
index 0c83e2706..b4793a172 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
@@ -112,8 +112,7 @@ public class MySqlDdl extends PlatformDdl {
 
   @Override
   public String alterColumnBaseAttributes(AlterColumn alter) {
-    if (alter.getType() == null
-        && alter.isNotnull() == null) {
+    if (alter.getType() == null && alter.isNotnull() == null) {
       // No type change or notNull change
       // defaultValue change already handled in alterColumnDefaultValue
       return null;
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
index c431851c4..9b43ff5e7 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
@@ -149,8 +149,7 @@ public class SqlServerDdl extends PlatformDdl {
 
   @Override
   public String alterColumnBaseAttributes(AlterColumn alter) {
-    if (alter.getType() == null
-        && alter.isNotnull() == null) {
+    if (alter.getType() == null && alter.isNotnull() == null) {
       // No type change or notNull change
       // defaultValue change already handled in alterColumnDefaultValue
       return null;

From 1d363776ecb242b56b78adb15580e9282f1126f5 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 16 May 2019 20:08:06 +1200
Subject: [PATCH 0851/1036] No effective change - refactor rename in test for
 StartMySql

---
 src/test/java/main/{StartMyServer.java => StartMySql.java} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/test/java/main/{StartMyServer.java => StartMySql.java} (96%)

diff --git a/src/test/java/main/StartMyServer.java b/src/test/java/main/StartMySql.java
similarity index 96%
rename from src/test/java/main/StartMyServer.java
rename to src/test/java/main/StartMySql.java
index de04e1625..a93b2eacf 100644
--- a/src/test/java/main/StartMyServer.java
+++ b/src/test/java/main/StartMySql.java
@@ -3,7 +3,7 @@ package main;
 import io.ebean.docker.commands.MySqlConfig;
 import io.ebean.docker.commands.MySqlContainer;
 
-public class StartMyServer {
+public class StartMySql {
 
   public static void main(String[] args) {
 

From 3dd5069f5a5e5f6244bee4132711f2d59fcbc4cc Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 16 May 2019 20:26:45 +1200
Subject: [PATCH 0852/1036] #1698 FIX for IAE "key can't be empty" in
 System.getProperty()

That is, assertEquals("${}", PropertyEval.eval("${}"));
... for when we load properties that include the "${}" placeholder
---
 src/main/java/io/ebean/config/properties/PropertyEval.java   | 3 +++
 .../java/io/ebean/config/properties/PropertyEvalTest.java    | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/src/main/java/io/ebean/config/properties/PropertyEval.java b/src/main/java/io/ebean/config/properties/PropertyEval.java
index f1763cb3e..753481d7d 100644
--- a/src/main/java/io/ebean/config/properties/PropertyEval.java
+++ b/src/main/java/io/ebean/config/properties/PropertyEval.java
@@ -59,6 +59,9 @@ final class PropertyEval {
 	 */
 	private static String evaluateExpression(String exp) {
 
+    if (exp.isEmpty()) {
+      return null;
+    }
 		if (isJndiExpression(exp)) {
 			// JNDI property lookup...
 			String val = getJndiProperty(exp);
diff --git a/src/test/java/io/ebean/config/properties/PropertyEvalTest.java b/src/test/java/io/ebean/config/properties/PropertyEvalTest.java
index f074ff7a4..ac996943b 100644
--- a/src/test/java/io/ebean/config/properties/PropertyEvalTest.java
+++ b/src/test/java/io/ebean/config/properties/PropertyEvalTest.java
@@ -33,6 +33,11 @@ public class PropertyEvalTest {
 		System.clearProperty("foo");
 	}
 
+  @Test
+  public void eval_emptyPlaceholder() {
+    assertEquals("${}", PropertyEval.eval("${}"));
+  }
+
 	@Test
 	public void eval_singleExpression_withDefault() {
 

From f7920de3c230d6235578c79ed42e01e563feed9e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 16 May 2019 20:27:16 +1200
Subject: [PATCH 0853/1036] #1698 No effective change - reformat

---
 .../ebean/config/properties/PropertyEval.java | 314 +++++++++---------
 1 file changed, 157 insertions(+), 157 deletions(-)

diff --git a/src/main/java/io/ebean/config/properties/PropertyEval.java b/src/main/java/io/ebean/config/properties/PropertyEval.java
index 753481d7d..94f49e0e3 100644
--- a/src/main/java/io/ebean/config/properties/PropertyEval.java
+++ b/src/main/java/io/ebean/config/properties/PropertyEval.java
@@ -14,192 +14,192 @@ import javax.naming.NamingException;
  */
 final class PropertyEval {
 
-	/**
-	 * Prefix for looking up JNDI Environment variable.
-	 */
-	private static final String JAVA_COMP_ENV = "java:comp/env/";
+  /**
+   * Prefix for looking up JNDI Environment variable.
+   */
+  private static final String JAVA_COMP_ENV = "java:comp/env/";
 
-	/**
-	 * Used to detect the start of an expression.
-	 */
-	private static final String START = "${";
+  /**
+   * Used to detect the start of an expression.
+   */
+  private static final String START = "${";
 
-	/**
-	 * Used to detect the end of an expression.
-	 */
-	private static final String END = "}";
+  /**
+   * Used to detect the end of an expression.
+   */
+  private static final String END = "}";
 
-	/**
-	 * Specify the PropertyHolder.
-	 */
-	private PropertyEval() {
-	}
+  /**
+   * Specify the PropertyHolder.
+   */
+  private PropertyEval() {
+  }
 
-	/**
-	 * Return the property value evaluating and replacing any expressions such as
-	 * ${CATALINA_HOME}.
-	 */
-	static String eval(String val) {
-		if (val == null) {
-			return null;
-		}
-		int sp = val.indexOf(START);
-		if (sp > -1) {
-			int ep = val.indexOf(END, sp + 1);
-			if (ep > -1) {
-				return eval(val, sp, ep);
-			}
-		}
-		return val;
-	}
+  /**
+   * Return the property value evaluating and replacing any expressions such as
+   * ${CATALINA_HOME}.
+   */
+  static String eval(String val) {
+    if (val == null) {
+      return null;
+    }
+    int sp = val.indexOf(START);
+    if (sp > -1) {
+      int ep = val.indexOf(END, sp + 1);
+      if (ep > -1) {
+        return eval(val, sp, ep);
+      }
+    }
+    return val;
+  }
 
-	/**
-	 * Convert the expression using JNDI, Environment variables, System Properties
-	 * or existing an property in SystemProperties itself.
-	 */
-	private static String evaluateExpression(String exp) {
+  /**
+   * Convert the expression using JNDI, Environment variables, System Properties
+   * or existing an property in SystemProperties itself.
+   */
+  private static String evaluateExpression(String exp) {
 
     if (exp.isEmpty()) {
       return null;
     }
-		if (isJndiExpression(exp)) {
-			// JNDI property lookup...
-			String val = getJndiProperty(exp);
-			if (val != null) {
-				return val;
-			}
-		}
-		String val = System.getProperty(exp);
-		if (val == null) {
-			val = System.getenv(exp);
-		}
-		return val;
-	}
+    if (isJndiExpression(exp)) {
+      // JNDI property lookup...
+      String val = getJndiProperty(exp);
+      if (val != null) {
+        return val;
+      }
+    }
+    String val = System.getProperty(exp);
+    if (val == null) {
+      val = System.getenv(exp);
+    }
+    return val;
+  }
 
-	private static String eval(String val, int sp, int ep) {
+  private static String eval(String val, int sp, int ep) {
 
-		return new EvalBuffer(val, sp, ep).process();
-	}
+    return new EvalBuffer(val, sp, ep).process();
+  }
 
 
-	private static boolean isJndiExpression(String exp) {
-		return exp.startsWith("JNDI:") || exp.startsWith("jndi:");
-	}
+  private static boolean isJndiExpression(String exp) {
+    return exp.startsWith("JNDI:") || exp.startsWith("jndi:");
+  }
 
-	/**
-	 * Returns null if JNDI is not setup or if the property is not found.
-	 *
-	 * @param key the key of the JNDI Environment property including a JNDI: prefix.
-	 */
-	private static String getJndiProperty(String key) {
+  /**
+   * Returns null if JNDI is not setup or if the property is not found.
+   *
+   * @param key the key of the JNDI Environment property including a JNDI: prefix.
+   */
+  private static String getJndiProperty(String key) {
 
-		try {
-			// remove the JNDI: prefix
-			key = key.substring(5);
-			return (String) getJndiObject(key);
-		} catch (NamingException ex) {
-			return null;
-		}
-	}
+    try {
+      // remove the JNDI: prefix
+      key = key.substring(5);
+      return (String) getJndiObject(key);
+    } catch (NamingException ex) {
+      return null;
+    }
+  }
 
-	/**
-	 * Similar to getProperty but throws NamingException if JNDI is not setup or
-	 * if the property is not found.
-	 */
-	private static Object getJndiObject(String key) throws NamingException {
+  /**
+   * Similar to getProperty but throws NamingException if JNDI is not setup or
+   * if the property is not found.
+   */
+  private static Object getJndiObject(String key) throws NamingException {
 
-		InitialContext ctx = new InitialContext();
-		return ctx.lookup(JAVA_COMP_ENV + key);
-	}
+    InitialContext ctx = new InitialContext();
+    return ctx.lookup(JAVA_COMP_ENV + key);
+  }
 
 
-	private static class EvalBuffer {
+  private static class EvalBuffer {
 
-		private final StringBuilder buf = new StringBuilder();
-		private final String original;
-		private int position;
-		private int start;
-		private int end;
+    private final StringBuilder buf = new StringBuilder();
+    private final String original;
+    private int position;
+    private int start;
+    private int end;
 
-		private String expression;
-		private String defaultValue;
+    private String expression;
+    private String defaultValue;
 
-		EvalBuffer(String val, int start, int ep) {
-			this.original = val;
-			this.start = start;
-			this.end = ep;
-			this.position = 0;
-			moveToStart();
-		}
+    EvalBuffer(String val, int start, int ep) {
+      this.original = val;
+      this.start = start;
+      this.end = ep;
+      this.position = 0;
+      moveToStart();
+    }
 
-		void moveToStart() {
-			if (start > position) {
-				buf.append(original.substring(position, start));
-				position = start;
-			}
-		}
+    void moveToStart() {
+      if (start > position) {
+        buf.append(original.substring(position, start));
+        position = start;
+      }
+    }
 
-		void parseForDefault() {
-			int colonPos = original.lastIndexOf(':', end);
-			if (colonPos > start) {
-				expression = original.substring(start + START.length(), colonPos);
-				defaultValue = original.substring(colonPos + 1, end);
-			} else {
-				expression = original.substring(start + START.length(), end);
-			}
-		}
+    void parseForDefault() {
+      int colonPos = original.lastIndexOf(':', end);
+      if (colonPos > start) {
+        expression = original.substring(start + START.length(), colonPos);
+        defaultValue = original.substring(colonPos + 1, end);
+      } else {
+        expression = original.substring(start + START.length(), end);
+      }
+    }
 
-		void evaluate() {
-			String eval = evaluateExpression(expression);
-			if (eval != null) {
-				buf.append(eval);
-			} else {
-				if (defaultValue != null) {
-					buf.append(defaultValue);
-				} else {
-					buf.append(START).append(expression).append(END);
-				}
-			}
-		}
+    void evaluate() {
+      String eval = evaluateExpression(expression);
+      if (eval != null) {
+        buf.append(eval);
+      } else {
+        if (defaultValue != null) {
+          buf.append(defaultValue);
+        } else {
+          buf.append(START).append(expression).append(END);
+        }
+      }
+    }
 
-		String end() {
-			if (end < original.length() - 1) {
-				buf.append(original.substring(end + 1));
-			}
-			return buf.toString();
-		}
+    String end() {
+      if (end < original.length() - 1) {
+        buf.append(original.substring(end + 1));
+      }
+      return buf.toString();
+    }
 
-		boolean next() {
-			if (end < original.length()) {
-				int startPos = original.indexOf(START, end + 1);
-				if (startPos > -1) {
-					int endPos = original.indexOf(END, startPos + 1);
-					if (endPos > -1) {
-						if (startPos > end + 1) {
-							buf.append(original.substring(end + 1, startPos));
-						}
-						this.start = startPos;
-						this.end = endPos;
-						return true;
-					}
-				}
-			}
-			return false;
-		}
+    boolean next() {
+      if (end < original.length()) {
+        int startPos = original.indexOf(START, end + 1);
+        if (startPos > -1) {
+          int endPos = original.indexOf(END, startPos + 1);
+          if (endPos > -1) {
+            if (startPos > end + 1) {
+              buf.append(original.substring(end + 1, startPos));
+            }
+            this.start = startPos;
+            this.end = endPos;
+            return true;
+          }
+        }
+      }
+      return false;
+    }
 
-		private void evalNext() {
-			parseForDefault();
-			evaluate();
-		}
+    private void evalNext() {
+      parseForDefault();
+      evaluate();
+    }
 
-		String process() {
-			evalNext();
-			while (next()) {
-				evalNext();
-			}
-			return end();
-		}
+    String process() {
+      evalNext();
+      while (next()) {
+        evalNext();
+      }
+      return end();
+    }
 
-	}
+  }
 
 }

From 73990e3fb7efd701b9a6d06b7929c4d557002fd7 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 16 May 2019 22:26:11 +1200
Subject: [PATCH 0854/1036] #1701 (v2) - Replace TransactionMap with HashMap in
 DefaultTransactionThreadLocal

---
 .../DefaultTransactionThreadLocal.java        | 106 +++++++++++------
 .../server/transaction/TransactionMap.java    | 112 ------------------
 2 files changed, 71 insertions(+), 147 deletions(-)
 delete mode 100644 src/main/java/io/ebeaninternal/server/transaction/TransactionMap.java

diff --git a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java
index 3502f0bc4..5c497514f 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java
@@ -1,19 +1,17 @@
 package io.ebeaninternal.server.transaction;
 
 import io.ebeaninternal.api.SpiTransaction;
-import io.ebeaninternal.server.transaction.TransactionMap.State;
+
+import javax.persistence.PersistenceException;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Used to store Transactions in a ThreadLocal.
  */
 public final class DefaultTransactionThreadLocal {
 
-  private static final ThreadLocal<TransactionMap> local = new ThreadLocal<TransactionMap>() {
-    @Override
-    protected synchronized TransactionMap initialValue() {
-      return new TransactionMap();
-    }
-  };
+  private static final ThreadLocal<Map<String, SpiTransaction>> local = new ThreadLocal<>();
 
   /**
    * Not allowed.
@@ -21,19 +19,46 @@ public final class DefaultTransactionThreadLocal {
   private DefaultTransactionThreadLocal() {
   }
 
+  private static Map<String, SpiTransaction> createMap() {
+    Map<String, SpiTransaction> map = new HashMap<>();
+    local.set(map);
+    return map;
+  }
+
   /**
-   * Return the current TransactionState for a given serverName. This is for the
-   * local thread of course.
+   * Obtain the map creating if needed.
    */
-  private static TransactionMap.State getState(String serverName) {
-    return local.get().getStateWithCreate(serverName);
+  private static Map<String, SpiTransaction> obtainMap() {
+    final Map<String, SpiTransaction> map = local.get();
+    if (map == null) {
+      return createMap();
+    }
+    return map;
+  }
+
+  /**
+   * Remove the transaction entry for the given serverName.
+   */
+  private static void remove(String serverName) {
+    Map<String, SpiTransaction> map = local.get();
+    if (map != null) {
+      map.remove(serverName);
+    }
   }
 
   /**
    * Set a new Transaction for this serverName and Thread.
    */
   public static void set(String serverName, SpiTransaction trans) {
-    getState(serverName).set(trans);
+    if (trans == null) {
+      remove(serverName);
+    } else {
+      Map<String, SpiTransaction> map = obtainMap();
+      SpiTransaction existingTransaction = map.put(serverName, trans);
+      if (existingTransaction != null && existingTransaction.isActive()) {
+        throw new PersistenceException("The existing transaction is still active?");
+      }
+    }
   }
 
   /**
@@ -46,32 +71,43 @@ public final class DefaultTransactionThreadLocal {
    * </p>
    */
   public static void replace(String serverName, SpiTransaction trans) {
-    getState(serverName).replace(trans);
+    if (trans == null) {
+      remove(serverName);
+    } else {
+      Map<String, SpiTransaction> map = obtainMap();
+      map.put(serverName, trans);
+    }
   }
 
   /**
    * Return the current Transaction for this serverName and Thread.
    */
   public static SpiTransaction get(String serverName) {
-    TransactionMap map = local.get();
-    State state = map.getState(serverName);
-    SpiTransaction t = (state == null) ? null : state.transaction;
-    if (map.isEmpty()) {
-      local.remove();
+    Map<String, SpiTransaction> map = local.get();
+    if (map == null) {
+      return null;
     }
-    return t;
+    return map.get(serverName);
+  }
+
+  private static SpiTransaction obtain(String serverName, Map<String, SpiTransaction> map) {
+    if (map == null) {
+      throw new IllegalStateException("No current transaction for [" + serverName + "]");
+    }
+    SpiTransaction transaction = map.remove(serverName);
+    if (transaction == null) {
+      throw new IllegalStateException("No current transaction for [" + serverName + "]");
+    }
+    return transaction;
   }
 
   /**
    * Commit the current transaction.
    */
   public static void commit(String serverName) {
-    TransactionMap map = local.get();
-    State state = map.removeState(serverName);
-    if (state == null) {
-      throw new IllegalStateException("No current transaction for [" + serverName + "]");
-    }
-    state.commit();
+    Map<String, SpiTransaction> map = local.get();
+    SpiTransaction transaction = obtain(serverName, map);
+    transaction.commit();
     if (map.isEmpty()) {
       local.remove();
     }
@@ -81,12 +117,9 @@ public final class DefaultTransactionThreadLocal {
    * Rollback the current transaction.
    */
   public static void rollback(String serverName) {
-    TransactionMap map = local.get();
-    State state = map.removeState(serverName);
-    if (state == null) {
-      throw new IllegalStateException("No current transaction for [" + serverName + "]");
-    }
-    state.rollback();
+    Map<String, SpiTransaction> map = local.get();
+    SpiTransaction transaction = obtain(serverName, map);
+    transaction.rollback();
     if (map.isEmpty()) {
       local.remove();
     }
@@ -113,10 +146,13 @@ public final class DefaultTransactionThreadLocal {
    */
   public static void end(String serverName) {
 
-    TransactionMap map = local.get();
-    State state = map.removeState(serverName);
-    if (state != null) {
-      state.end();
+    Map<String, SpiTransaction> map = local.get();
+    if (map == null) {
+      return;
+    }
+    SpiTransaction transaction = map.remove(serverName);
+    if (transaction != null) {
+      transaction.end();
     }
     if (map.isEmpty()) {
       local.remove();
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionMap.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionMap.java
deleted file mode 100644
index 033e6c74a..000000000
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionMap.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package io.ebeaninternal.server.transaction;
-
-import io.ebeaninternal.api.SpiTransaction;
-
-import javax.persistence.PersistenceException;
-import java.util.HashMap;
-import java.util.Map;
-
-
-/**
- * Current transactions mapped by server name.
- */
-public class TransactionMap {
-
-  /**
-   * Map of State by serverName.
-   */
-  private final Map<String, State> map = new HashMap<>();
-
-  @Override
-  public String toString() {
-    return map.toString();
-  }
-
-  public boolean isEmpty() {
-    return map.isEmpty();
-  }
-
-  /**
-   * Return the State for a given serverName.
-   */
-  public State getState(String serverName) {
-
-    return map.get(serverName);
-  }
-
-  /**
-   * Return the State for a given serverName.
-   */
-  public State getStateWithCreate(String serverName) {
-
-    return map.computeIfAbsent(serverName, k -> new State());
-  }
-
-  /**
-   * Remove and return the State for a given serverName.
-   */
-  public State removeState(String serverName) {
-    return map.remove(serverName);
-  }
-
-  /**
-   * The transaction and whether it is active.
-   */
-  public static class State {
-
-    SpiTransaction transaction;
-
-    @Override
-    public String toString() {
-      return "txn[" + transaction + "]";
-    }
-
-    public SpiTransaction get() {
-      return transaction;
-    }
-
-    /**
-     * Set the transaction. This will now be the current transaction.
-     */
-    public void set(SpiTransaction trans) {
-      if (transaction != null && transaction.isActive()) {
-        throw new PersistenceException("The existing transaction is still active?");
-      }
-      transaction = trans;
-    }
-
-    /**
-     * Commit the transaction.
-     */
-    public void commit() {
-      transaction.commit();
-      transaction = null;
-    }
-
-    /**
-     * Rollback the transaction.
-     */
-    public void rollback() {
-      transaction.rollback();
-      transaction = null;
-    }
-
-    /**
-     * End the transaction.
-     */
-    public void end() {
-      if (transaction != null) {
-        transaction.end();
-        transaction = null;
-      }
-    }
-
-    /**
-     * Used to replace transaction with a proxy.
-     */
-    public void replace(SpiTransaction trans) {
-      transaction = trans;
-    }
-
-  }
-}

From c66e9547e177069e3bd3af52bb15653b67dddce7 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 16 May 2019 22:44:09 +1200
Subject: [PATCH 0855/1036] #1705 - SpiTransactionProxy depth(int diff) ...
 does not pass on depth to underlying transaction

---
 src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java b/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
index be0246b30..999ac7320 100644
--- a/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
+++ b/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
@@ -325,7 +325,7 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
 
   @Override
   public void depth(int diff) {
-    transaction.depth();
+    transaction.depth(diff);
   }
 
   @Override

From 30da589ea030fd2d37fcd2ceb2e5b18de5c6953a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 17 May 2019 12:01:28 +1200
Subject: [PATCH 0856/1036] #1701 (v2) - Replace TransactionMap with HashMap in
 DefaultTransactionThreadLocal

- Use ThreadLocal.withInitial to always have a map.
- Remove the calls to local.remove(); when the map is empty (with the expectation that the thread local will GC with an empty map.
---
 .../DefaultTransactionThreadLocal.java        | 67 +++----------------
 1 file changed, 10 insertions(+), 57 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java
index 5c497514f..4bcd6b9ea 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java
@@ -11,7 +11,7 @@ import java.util.Map;
  */
 public final class DefaultTransactionThreadLocal {
 
-  private static final ThreadLocal<Map<String, SpiTransaction>> local = new ThreadLocal<>();
+  private static final ThreadLocal<Map<String, SpiTransaction>> local = ThreadLocal.withInitial(HashMap::new);
 
   /**
    * Not allowed.
@@ -19,31 +19,11 @@ public final class DefaultTransactionThreadLocal {
   private DefaultTransactionThreadLocal() {
   }
 
-  private static Map<String, SpiTransaction> createMap() {
-    Map<String, SpiTransaction> map = new HashMap<>();
-    local.set(map);
-    return map;
-  }
-
-  /**
-   * Obtain the map creating if needed.
-   */
-  private static Map<String, SpiTransaction> obtainMap() {
-    final Map<String, SpiTransaction> map = local.get();
-    if (map == null) {
-      return createMap();
-    }
-    return map;
-  }
-
   /**
    * Remove the transaction entry for the given serverName.
    */
   private static void remove(String serverName) {
-    Map<String, SpiTransaction> map = local.get();
-    if (map != null) {
-      map.remove(serverName);
-    }
+    local.get().remove(serverName);
   }
 
   /**
@@ -53,8 +33,7 @@ public final class DefaultTransactionThreadLocal {
     if (trans == null) {
       remove(serverName);
     } else {
-      Map<String, SpiTransaction> map = obtainMap();
-      SpiTransaction existingTransaction = map.put(serverName, trans);
+      SpiTransaction existingTransaction = local.get().put(serverName, trans);
       if (existingTransaction != null && existingTransaction.isActive()) {
         throw new PersistenceException("The existing transaction is still active?");
       }
@@ -74,8 +53,7 @@ public final class DefaultTransactionThreadLocal {
     if (trans == null) {
       remove(serverName);
     } else {
-      Map<String, SpiTransaction> map = obtainMap();
-      map.put(serverName, trans);
+      local.get().put(serverName, trans);
     }
   }
 
@@ -83,18 +61,11 @@ public final class DefaultTransactionThreadLocal {
    * Return the current Transaction for this serverName and Thread.
    */
   public static SpiTransaction get(String serverName) {
-    Map<String, SpiTransaction> map = local.get();
-    if (map == null) {
-      return null;
-    }
-    return map.get(serverName);
+    return local.get().get(serverName);
   }
 
-  private static SpiTransaction obtain(String serverName, Map<String, SpiTransaction> map) {
-    if (map == null) {
-      throw new IllegalStateException("No current transaction for [" + serverName + "]");
-    }
-    SpiTransaction transaction = map.remove(serverName);
+  private static SpiTransaction obtain(String serverName) {
+    SpiTransaction transaction = local.get().remove(serverName);
     if (transaction == null) {
       throw new IllegalStateException("No current transaction for [" + serverName + "]");
     }
@@ -105,24 +76,14 @@ public final class DefaultTransactionThreadLocal {
    * Commit the current transaction.
    */
   public static void commit(String serverName) {
-    Map<String, SpiTransaction> map = local.get();
-    SpiTransaction transaction = obtain(serverName, map);
-    transaction.commit();
-    if (map.isEmpty()) {
-      local.remove();
-    }
+    obtain(serverName).commit();
   }
 
   /**
    * Rollback the current transaction.
    */
   public static void rollback(String serverName) {
-    Map<String, SpiTransaction> map = local.get();
-    SpiTransaction transaction = obtain(serverName, map);
-    transaction.rollback();
-    if (map.isEmpty()) {
-      local.remove();
-    }
+    obtain(serverName).rollback();
   }
 
   /**
@@ -145,18 +106,10 @@ public final class DefaultTransactionThreadLocal {
    * </pre>
    */
   public static void end(String serverName) {
-
-    Map<String, SpiTransaction> map = local.get();
-    if (map == null) {
-      return;
-    }
-    SpiTransaction transaction = map.remove(serverName);
+    SpiTransaction transaction = local.get().remove(serverName);
     if (transaction != null) {
       transaction.end();
     }
-    if (map.isEmpty()) {
-      local.remove();
-    }
   }
 
 }

From a1a6d2b725fd4d418dbcb6bc127450114318a8a4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 17 May 2019 14:56:35 +1200
Subject: [PATCH 0857/1036] Fix test TestExecuteComplete

---
 .../java/org/tests/transaction/TestExecuteComplete.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/tests/transaction/TestExecuteComplete.java b/src/test/java/org/tests/transaction/TestExecuteComplete.java
index a8ec5f8c3..4b880cfb9 100644
--- a/src/test/java/org/tests/transaction/TestExecuteComplete.java
+++ b/src/test/java/org/tests/transaction/TestExecuteComplete.java
@@ -16,6 +16,7 @@ import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 
 import static org.assertj.core.api.StrictAssertions.assertThat;
+import static org.junit.Assert.assertTrue;
 
 public class TestExecuteComplete extends BaseTestCase {
 
@@ -31,8 +32,9 @@ public class TestExecuteComplete extends BaseTestCase {
         Order order = new Order();
         order.setCustomer(customer);
 
-        Ebean.save(customer);
+        Ebean.save(order);
       });
+      assertTrue(false);
     } catch (DataIntegrityException e) {
       // assert the thread local has been cleaned up
       SpiTransaction txn = DefaultTransactionThreadLocal.get("h2");
@@ -52,7 +54,7 @@ public class TestExecuteComplete extends BaseTestCase {
           Order order = new Order();
           order.setCustomer(customer);
 
-          Ebean.save(customer);
+          Ebean.save(order);
         }));
     } catch (DataIntegrityException e) {
       // assert the thread local has been cleaned up
@@ -79,7 +81,7 @@ public class TestExecuteComplete extends BaseTestCase {
     Order order = new Order();
     order.setCustomer(customer);
 
-    Ebean.save(customer);
+    Ebean.save(order);
   }
 
   @ForPlatform(Platform.H2)

From 910c04e37335c209481ff35bf1a80c385c668e66 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 17 May 2019 21:08:44 +1200
Subject: [PATCH 0858/1036] Add sponsorship from timerbee.de

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index b36d2d9d9..7a4dca828 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,11 @@
           <img width="222px" src="https://ebean.io/images/logo-med-principal.png">
         </a>
       </td>
+      <td align="center" valign="middle">
+        <a href="https://timerbe.de" target="_blank">
+          <img width="222px" src="https://ebean.io/images/logo-timerbee.png">
+        </a>
+      </td>
     </tr>
   </tbody>
 </table>

From 81e86b07e3393f90908fc594441b0789e46c4930 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Fri, 17 May 2019 16:30:27 +0200
Subject: [PATCH 0859/1036] Refactor Tests: Check idType instead of assuming
 idType for a platform

---
 src/test/java/io/ebean/BaseTestCase.java      |  5 ++++
 .../java/org/tests/genkey/TestSeqBatch.java   | 29 +++++++------------
 .../org/tests/idkeys/TestGeneratedKeys.java   | 13 ++++-----
 .../TestOneToManyJoinTableInheritance.java    |  7 +++--
 .../transaction/TestBatchModelFlush.java      |  7 +++--
 5 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/src/test/java/io/ebean/BaseTestCase.java b/src/test/java/io/ebean/BaseTestCase.java
index 9156aaf3c..92011f37b 100644
--- a/src/test/java/io/ebean/BaseTestCase.java
+++ b/src/test/java/io/ebean/BaseTestCase.java
@@ -2,6 +2,7 @@ package io.ebean;
 
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
+import io.ebean.config.dbplatform.IdType;
 import io.ebean.meta.MetaTimedMetric;
 import io.ebean.meta.MetricType;
 import io.ebean.meta.ServerMetrics;
@@ -197,6 +198,10 @@ public abstract class BaseTestCase {
     return spiEbeanServer().getDatabasePlatform().getPlatform();
   }
 
+  protected IdType idType() {
+    return spiEbeanServer().getDatabasePlatform().getDbIdentity().getIdType();
+  }
+
   protected SpiEbeanServer spiEbeanServer() {
     return (SpiEbeanServer) Ebean.getDefaultServer();
   }
diff --git a/src/test/java/org/tests/genkey/TestSeqBatch.java b/src/test/java/org/tests/genkey/TestSeqBatch.java
index 0c362d433..24b0b787d 100644
--- a/src/test/java/org/tests/genkey/TestSeqBatch.java
+++ b/src/test/java/org/tests/genkey/TestSeqBatch.java
@@ -1,10 +1,7 @@
 package org.tests.genkey;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
-import io.ebean.EbeanServer;
 import io.ebean.config.dbplatform.IdType;
-import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import org.tests.model.basic.TOne;
 import org.junit.Assert;
@@ -14,24 +11,20 @@ public class TestSeqBatch extends BaseTestCase {
 
   @Test
   public void test() {
+    if (idType() != IdType.SEQUENCE) {
+      return;
+    }
 
-    EbeanServer server = Ebean.getServer(null);
-    SpiEbeanServer spiServer = (SpiEbeanServer) server;
+    BeanDescriptor<TOne> d = spiEbeanServer().getBeanDescriptor(TOne.class);
 
-    IdType idType = spiServer.getDatabasePlatform().getDbIdentity().getIdType();
+    Object id = d.nextId(null);
+    Assert.assertNotNull(id);
+    // System.out.println(id);
 
-    if (IdType.SEQUENCE == idType) {
-      BeanDescriptor<TOne> d = spiServer.getBeanDescriptor(TOne.class);
-
-      Object id = d.nextId(null);
-      Assert.assertNotNull(id);
-      //System.out.println(id);
-
-      for (int i = 0; i < 16; i++) {
-        Object id2 = d.nextId(null);
-        Assert.assertNotNull(id2);
-        //System.out.println(id2);
-      }
+    for (int i = 0; i < 16; i++) {
+      Object id2 = d.nextId(null);
+      Assert.assertNotNull(id2);
+      // System.out.println(id2);
     }
   }
 
diff --git a/src/test/java/org/tests/idkeys/TestGeneratedKeys.java b/src/test/java/org/tests/idkeys/TestGeneratedKeys.java
index 9e35598cd..ee46be72f 100644
--- a/src/test/java/org/tests/idkeys/TestGeneratedKeys.java
+++ b/src/test/java/org/tests/idkeys/TestGeneratedKeys.java
@@ -24,8 +24,8 @@ public class TestGeneratedKeys extends BaseTestCase {
   @ForPlatform(Platform.H2) // readSequenceValue is H2 specific
   public void testSequence() throws SQLException {
     SpiEbeanServer server = spiEbeanServer();
-    IdType idType = server.getDatabasePlatform().getDbIdentity().getIdType();
-    if (!IdType.SEQUENCE.equals(idType)) {
+
+    if (idType() != IdType.SEQUENCE) {
       // only run this test when SEQUENCE is being used
       return;
     }
@@ -69,19 +69,16 @@ public class TestGeneratedKeys extends BaseTestCase {
   @Test
   public void testIdentity() throws SQLException {
 
-    SpiEbeanServer server = spiEbeanServer();
-    IdType idType = server.getDatabasePlatform().getDbIdentity().getIdType();
-
-    if (!IdType.IDENTITY.equals(idType)) {
+    if (idType() != IdType.IDENTITY) {
       // only run this test when SEQUENCE is being used
       return;
     }
 
-    try (Transaction tx = server.beginTransaction()) {
+    try (Transaction tx = server().beginTransaction()) {
 
       GenKeyIdentity al = new GenKeyIdentity();
       al.setDescription("my description");
-      server.save(al);
+      server().save(al);
 
       // For JDBC batching we won't get the id until after
       // the batch has been flushed explicitly or via commit
diff --git a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java
index 3b2b262a8..147a77672 100644
--- a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java
+++ b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java
@@ -2,6 +2,8 @@ package org.tests.o2m.jointable;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.config.dbplatform.IdType;
+
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.o2m.jointable.inheritance.ClassA;
@@ -34,15 +36,14 @@ public class TestOneToManyJoinTableInheritance extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.current();
 
-    boolean hasSequence = isSqlServer(); // uses sequence
     assertThat(sql).hasSize(11);
     assertThat(sql.get(0)).contains("insert into class_super ");
-    if (!hasSequence) {
+    if (idType() == IdType.IDENTITY) {
       assertThat(sql.get(1)).contains("-- bind(ClassA)");
       assertThat(sql.get(2)).contains("-- bind(ClassB)");
     }
     assertThat(sql.get(3)).contains("insert into monkey ");
-    if (!hasSequence) {
+    if (idType() == IdType.IDENTITY) {
       assertThat(sql.get(4)).contains("-- bind(Sim");
       assertThat(sql.get(5)).contains("-- bind(Tim");
       assertThat(sql.get(6)).contains("-- bind(Uim");
diff --git a/src/test/java/org/tests/transaction/TestBatchModelFlush.java b/src/test/java/org/tests/transaction/TestBatchModelFlush.java
index f32a459ff..1c5a258e0 100644
--- a/src/test/java/org/tests/transaction/TestBatchModelFlush.java
+++ b/src/test/java/org/tests/transaction/TestBatchModelFlush.java
@@ -5,6 +5,8 @@ import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.Transaction;
 import io.ebean.annotation.Transactional;
+import io.ebean.config.dbplatform.IdType;
+
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.model.m2m.MnyB;
@@ -75,9 +77,8 @@ public class TestBatchModelFlush extends BaseTestCase {
     assertThat(sql).hasSize(9);
 
     // first saved to batch - (depth 100)
-    boolean hasSequence = isSqlServer();
     assertThat(sql.get(0)).contains("insert into mny_b");
-    if (!hasSequence) {
+    if (idType() == IdType.IDENTITY) {
       assertThat(sql.get(1)).contains(" -- bind(BatchMultipleTop_0");
       assertThat(sql.get(2)).contains(" -- bind(BatchMultipleTop_1");
     }
@@ -87,7 +88,7 @@ public class TestBatchModelFlush extends BaseTestCase {
     assertThat(sql.get(5)).contains(" -- bind(");
     // third saved to batch - (depth 102)
     assertThat(sql.get(6)).contains("insert into mny_topic");
-    if (!hasSequence) {
+    if (idType() == IdType.IDENTITY) {
       assertThat(sql.get(7)).contains(" -- bind(MnyTopic_0");
       assertThat(sql.get(8)).contains(" -- bind(MnyTopic_1");
     }

From fe7d73a4a4f411a960ca207a2a348e5cdc70503a Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Fri, 17 May 2019 18:07:24 +0200
Subject: [PATCH 0860/1036] New test for SqlServerPlatform

---
 .../dbplatform/SqlserverPlatformTest.java     | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java

diff --git a/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java b/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java
new file mode 100644
index 000000000..e35fc23b8
--- /dev/null
+++ b/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java
@@ -0,0 +1,68 @@
+package io.ebean.config.dbplatform;
+
+import io.ebean.config.PlatformConfig;
+import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl;
+import io.ebeaninternal.server.core.PlatformDdlBuilder;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class SqlserverPlatformTest {
+
+  SqlServer17Platform platform = new SqlServer17Platform();
+
+  @Test
+  public void testTypeConversion() {
+
+    PlatformDdl ddl = PlatformDdlBuilder.create(platform);
+
+    assertThat(ddl.convert("clob", false)).isEqualTo("nvarchar(max)");
+    assertThat(ddl.convert("blob", false)).isEqualTo("image");
+    assertThat(ddl.convert("json", false)).isEqualTo("nvarchar(max)");
+    assertThat(ddl.convert("jsonb", false)).isEqualTo("nvarchar(max)");
+
+    assertThat(ddl.convert("double", false)).isEqualTo("float(32)");
+    assertThat(ddl.convert("varchar(20)", false)).isEqualTo("nvarchar(20)");
+    assertThat(ddl.convert("decimal(10)", false)).isEqualTo("numeric(10)");
+    assertThat(ddl.convert("decimal(8,4)", false)).isEqualTo("numeric(8,4)");
+    assertThat(ddl.convert("boolean", false)).isEqualTo("bit");
+    assertThat(ddl.convert("bit", false)).isEqualTo("bit");
+    assertThat(ddl.convert("tinyint", false)).isEqualTo("smallint");
+    assertThat(ddl.convert("binary(16)", false)).isEqualTo("binary(16)");
+  }
+
+  @Test
+  public void uuid_default() {
+
+    platform.configure(new PlatformConfig());
+    DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
+
+    assertThat(dbType.renderType(0, 0)).isEqualTo("uniqueidentifier");
+  }
+
+
+  @Test
+  public void uuid_as_binary() {
+
+    PlatformConfig config = new PlatformConfig();
+    config.setDbUuid(PlatformConfig.DbUuid.BINARY);
+
+    platform.configure(config);
+
+    DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
+    assertThat(dbType.renderType(0, 0)).isEqualTo("binary(16)");
+  }
+
+  @Test
+  public void uuid_as_varchar() {
+
+    PlatformConfig config = new PlatformConfig();
+    config.setDbUuid(PlatformConfig.DbUuid.VARCHAR);
+
+    platform.configure(config);
+
+    DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
+    assertThat(dbType.renderType(0, 0)).isEqualTo("nvarchar(40)");
+  }
+}

From 2678f85506bff99843fd82715c1021aa4ca703e1 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Sat, 18 May 2019 00:00:34 +0200
Subject: [PATCH 0861/1036] Fix memory leak in threadLocal on implicit
 transactions (#1711)

* refactor TestExecutionComplete

* Add more tests to discover missing threadScope cleanups

* FIX: clear threadScope on implicit created Jdbc transactions

* FIX: clear threadScope on completed JTA transactions

* Revert "FIX: clear threadScope on completed JTA transactions"

This reverts commit f844405542f03f19b682334951872505676b89dc.
---
 .../DefaultTransactionScopeManager.java       |  4 ++
 .../DefaultTransactionThreadLocal.java        | 11 ++++
 .../server/transaction/JdbcTransaction.java   |  3 +
 .../transaction/TransactionScopeManager.java  |  5 ++
 .../transaction/TestExecuteComplete.java      | 64 +++++++++++++++----
 5 files changed, 75 insertions(+), 12 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java
index bf949c231..103d75be6 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java
@@ -42,5 +42,9 @@ public class DefaultTransactionScopeManager extends TransactionScopeManager {
     DefaultTransactionThreadLocal.set(serverName, trans);
   }
 
+  @Override
+  public void clear(SpiTransaction trans) {
+    DefaultTransactionThreadLocal.clear(serverName, trans);
+  }
 
 }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java
index 4bcd6b9ea..cecd08671 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java
@@ -40,6 +40,17 @@ public final class DefaultTransactionThreadLocal {
     }
   }
 
+  /**
+   * Clears a transaction from the ThreadLocal to prevent memory leaks.
+   * Will only clear, if trans == currentTransaction
+   */
+  public static void clear(String serverName, SpiTransaction trans) {
+    Map<String, SpiTransaction> map = local.get();
+    if (map.get(serverName) == trans) {
+      map.remove(serverName);
+    }
+  }
+
   /**
    * A mechanism to get the transaction out of the thread local by replacing it
    * with a 'proxy'.
diff --git a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index eeb5bbf5b..bec80e982 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -920,6 +920,9 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
     }
     connection = null;
     active = false;
+    if (manager != null) {
+      manager.scope().clear(this);
+    }
     profileEnd();
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java
index 61f2b8050..66ae60f33 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java
@@ -34,6 +34,11 @@ public abstract class TransactionScopeManager implements SpiTransactionScopeMana
    */
   public abstract void set(SpiTransaction trans);
 
+  /**
+   * Clears the given Transaction for this serverName and Thread.
+   */
+  public abstract void clear(SpiTransaction trans);
+
   /**
    * Replace the current transaction with this one.
    * <p>
diff --git a/src/test/java/org/tests/transaction/TestExecuteComplete.java b/src/test/java/org/tests/transaction/TestExecuteComplete.java
index 4b880cfb9..54c3661e8 100644
--- a/src/test/java/org/tests/transaction/TestExecuteComplete.java
+++ b/src/test/java/org/tests/transaction/TestExecuteComplete.java
@@ -1,8 +1,8 @@
 package org.tests.transaction;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.DataIntegrityException;
-import io.ebean.Ebean;
 import io.ebean.Transaction;
 import io.ebean.TxScope;
 import io.ebean.annotation.ForPlatform;
@@ -16,7 +16,7 @@ import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 
 import static org.assertj.core.api.StrictAssertions.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 public class TestExecuteComplete extends BaseTestCase {
 
@@ -26,15 +26,15 @@ public class TestExecuteComplete extends BaseTestCase {
   public void execute_when_errorOnCommit_threadLocalIsCleared() {
 
     try {
-      Ebean.execute(TxScope.required().setBatch(PersistBatch.ALL), () -> {
+      DB.execute(TxScope.required().setBatch(PersistBatch.ALL), () -> {
 
-        Customer customer = Ebean.getReference(Customer.class, 42424242L);
+        Customer customer = DB.getReference(Customer.class, 42424242L);
         Order order = new Order();
         order.setCustomer(customer);
 
-        Ebean.save(order);
+        DB.save(order);
       });
-      assertTrue(false);
+      fail();
     } catch (DataIntegrityException e) {
       // assert the thread local has been cleaned up
       SpiTransaction txn = DefaultTransactionThreadLocal.get("h2");
@@ -47,15 +47,16 @@ public class TestExecuteComplete extends BaseTestCase {
   public void nestedExecute_when_errorOnCommit_threadLocalIsCleared() {
 
     try {
-      Ebean.execute(TxScope.required().setBatch(PersistBatch.ALL), () ->
-        Ebean.execute(() -> {
+      DB.execute(TxScope.required().setBatch(PersistBatch.ALL), () ->
+      DB.execute(() -> {
 
-          Customer customer = Ebean.getReference(Customer.class, 42424242L);
+          Customer customer = DB.getReference(Customer.class, 42424242L);
           Order order = new Order();
           order.setCustomer(customer);
 
-          Ebean.save(order);
+          DB.save(order);
         }));
+      fail();
     } catch (DataIntegrityException e) {
       // assert the thread local has been cleaned up
       SpiTransaction txn = DefaultTransactionThreadLocal.get("h2");
@@ -69,6 +70,7 @@ public class TestExecuteComplete extends BaseTestCase {
 
     try {
       errorOnCommit();
+      fail();
     } catch (DataIntegrityException e) {
       SpiTransaction txn = DefaultTransactionThreadLocal.get("h2");
       assertThat(txn).isNull();
@@ -77,11 +79,11 @@ public class TestExecuteComplete extends BaseTestCase {
 
   @Transactional(batchSize = 10)
   private void errorOnCommit() {
-    Customer customer = Ebean.getReference(Customer.class, 42424242L);
+    Customer customer = DB.getReference(Customer.class, 42424242L);
     Order order = new Order();
     order.setCustomer(customer);
 
-    Ebean.save(order);
+    DB.save(order);
   }
 
   @ForPlatform(Platform.H2)
@@ -131,4 +133,42 @@ public class TestExecuteComplete extends BaseTestCase {
     assertThat(txn2).isNull();
   }
 
+  @ForPlatform(Platform.H2)
+  @Test
+  public void implicit_query_expect_threadScopeCleanup() {
+
+    DB.find(Customer.class).findList();
+
+    SpiTransaction txn = DefaultTransactionThreadLocal.get("h2");
+    assertThat(txn).isNull();
+  }
+
+  @ForPlatform(Platform.H2)
+  @Test
+  public void implicit_save_expect_threadScopeCleanup() {
+
+    Customer cust = new Customer();
+    cust.setName("Roland");
+    DB.save(cust);
+
+    SpiTransaction txn = DefaultTransactionThreadLocal.get("h2");
+    assertThat(txn).isNull();
+  }
+
+  @ForPlatform(Platform.H2)
+  @Test
+  public void no_transaction_expect_threadScopeCleanup() {
+
+    try (Transaction txn = DB.beginTransaction(TxScope.notSupported())) {
+      SpiTransaction txn2 = DefaultTransactionThreadLocal.get("h2");
+      // The NoTransaction placeholder can normally only occur inside
+      // a scopedTrans. (Class is package private, so check
+      assertThat(txn2.toString()).contains("NoTransaction");
+      assertThat(txn2.toString()).contains("NoTransaction");
+    }
+
+    SpiTransaction txn = DefaultTransactionThreadLocal.get("h2");
+    assertThat(txn).isNull();
+  }
+
 }

From c839fe6520ccd6e944aacd449e806fa09df3f2de Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 18 May 2019 11:21:11 +1200
Subject: [PATCH 0862/1036] Adjustment on #1711, more explicit clearing of
 inactive transactions from thread local

---
 .../java/io/ebeaninternal/api/SpiEbeanServer.java     |  5 +++++
 .../io/ebeaninternal/server/core/BeanRequest.java     |  9 +++++++++
 .../io/ebeaninternal/server/core/DefaultServer.java   |  5 +++++
 .../server/persist/DefaultPersister.java              |  8 ++++++++
 .../transaction/DefaultTransactionScopeManager.java   |  4 ++--
 .../transaction/DefaultTransactionThreadLocal.java    | 11 +++++------
 .../server/transaction/JdbcTransaction.java           |  3 ---
 .../server/transaction/TransactionManager.java        |  7 +++++++
 .../server/transaction/TransactionScopeManager.java   |  4 ++--
 .../java/io/ebeaninternal/api/TDSpiEbeanServer.java   |  5 +++++
 10 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
index f1936cf94..b8e4e9b7c 100644
--- a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
+++ b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
@@ -133,6 +133,11 @@ public interface SpiEbeanServer extends ExtendedServer, EbeanServer, BeanLoader,
    */
   void externalModification(TransactionEventTable event);
 
+  /**
+   * Clear an implicit transaction from the scope.
+   */
+  void clearServerTransaction();
+
   /**
    * Begin a managed transaction (Uses scope manager / ThreadLocal).
    */
diff --git a/src/main/java/io/ebeaninternal/server/core/BeanRequest.java b/src/main/java/io/ebeaninternal/server/core/BeanRequest.java
index f3a3e5d2a..74327b5f2 100644
--- a/src/main/java/io/ebeaninternal/server/core/BeanRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/BeanRequest.java
@@ -78,6 +78,15 @@ public abstract class BeanRequest {
     }
   }
 
+  /**
+   * Clear the transaction from the thread local for implicit transactions.
+   */
+  public void clearTransIfRequired() {
+    if (createdTransaction) {
+      ebeanServer.clearServerTransaction();
+    }
+  }
+
   /**
    * Return the server processing the request. Made available for
    * BeanController and BeanFinder.
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 9d8e129c5..0139c9b57 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -2254,6 +2254,11 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return new ObtainedTransactionImplicit(trans, this);
   }
 
+  @Override
+  public void clearServerTransaction() {
+    transactionManager.clearServerTransaction();
+  }
+
   @Override
   public SpiTransaction beginServerTransaction() {
     return transactionManager.beginServerTransaction();
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 973bd04c0..0d02a49ef 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -123,6 +123,8 @@ public final class DefaultPersister implements Persister {
     } catch (RuntimeException e) {
       request.rollbackTransIfRequired();
       throw e;
+    } finally {
+      request.clearTransIfRequired();
     }
   }
 
@@ -435,6 +437,8 @@ public final class DefaultPersister implements Persister {
     } catch (RuntimeException ex) {
       req.rollbackTransIfRequired();
       throw ex;
+    } finally {
+      req.clearTransIfRequired();
     }
   }
 
@@ -471,6 +475,8 @@ public final class DefaultPersister implements Persister {
     } catch (RuntimeException ex) {
       req.rollbackTransIfRequired();
       throw ex;
+    } finally {
+      req.clearTransIfRequired();
     }
   }
 
@@ -623,6 +629,8 @@ public final class DefaultPersister implements Persister {
     } catch (RuntimeException ex) {
       req.rollbackTransIfRequired();
       throw ex;
+    } finally {
+      req.clearTransIfRequired();
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java
index 103d75be6..4a4ca8214 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java
@@ -43,8 +43,8 @@ public class DefaultTransactionScopeManager extends TransactionScopeManager {
   }
 
   @Override
-  public void clear(SpiTransaction trans) {
-    DefaultTransactionThreadLocal.clear(serverName, trans);
+  public void clear() {
+    DefaultTransactionThreadLocal.clear(serverName);
   }
 
 }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java
index cecd08671..c73cd9317 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java
@@ -41,13 +41,12 @@ public final class DefaultTransactionThreadLocal {
   }
 
   /**
-   * Clears a transaction from the ThreadLocal to prevent memory leaks.
-   * Will only clear, if trans == currentTransaction
+   * Clear a transaction. It should be inactive.
    */
-  public static void clear(String serverName, SpiTransaction trans) {
-    Map<String, SpiTransaction> map = local.get();
-    if (map.get(serverName) == trans) {
-      map.remove(serverName);
+  public static void clear(String serverName) {
+    SpiTransaction transaction = local.get().remove(serverName);
+    if (transaction != null && transaction.isActive()) {
+      throw new IllegalStateException("Clearing an ACTIVE transaction " + transaction);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index bec80e982..eeb5bbf5b 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -920,9 +920,6 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
     }
     connection = null;
     active = false;
-    if (manager != null) {
-      manager.scope().clear(this);
-    }
     profileEnd();
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index 3a79d43b9..e446a9477 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -567,6 +567,13 @@ public class TransactionManager implements SpiTransactionManager {
     }
   }
 
+  /**
+   * Clear an implicit transaction from thread local scope.
+   */
+  public void clearServerTransaction() {
+    scopeManager.clear();
+  }
+
   /**
    * Begin an implicit transaction.
    */
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java
index 66ae60f33..98c192a6c 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java
@@ -35,9 +35,9 @@ public abstract class TransactionScopeManager implements SpiTransactionScopeMana
   public abstract void set(SpiTransaction trans);
 
   /**
-   * Clears the given Transaction for this serverName and Thread.
+   * Clears the current Transaction from thread local scope (for implicit transactions).
    */
-  public abstract void clear(SpiTransaction trans);
+  public abstract void clear();
 
   /**
    * Replace the current transaction with this one.
diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index 44bad8903..bde5e8b34 100644
--- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -227,6 +227,11 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
 
   }
 
+  @Override
+  public void clearServerTransaction() {
+    
+  }
+
   @Override
   public SpiTransaction beginServerTransaction() {
     return null;

From 895b5ee4ff7cae3056a8839ac02e1a28425326c8 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Sat, 18 May 2019 01:28:46 +0200
Subject: [PATCH 0863/1036] The BaseTestCase ensures, that the threadLocal is
 cleared after each test. (#1712)

* The BaseTestCase ensures, that the threadLocal is cleared after each test.

* Change JdbcTransaction.toString to distingush between active and inactive transaction
---
 .../DefaultTransactionThreadLocal.java        |  8 +++++++
 .../server/transaction/JdbcTransaction.java   |  6 ++++-
 src/test/java/io/ebean/BaseTestCase.java      | 23 +++++++++++++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java
index cecd08671..38a944b13 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java
@@ -75,6 +75,14 @@ public final class DefaultTransactionThreadLocal {
     return local.get().get(serverName);
   }
 
+  /**
+   * Return all transactions of the current thread (active/inactive).
+   * This is intended for test/debugging purposes only!
+   */
+  public static Map<String, SpiTransaction> currentTransactions() {
+    return local.get();
+  }
+
   private static SpiTransaction obtain(String serverName) {
     SpiTransaction transaction = local.get().remove(serverName);
     if (transaction == null) {
diff --git a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index bec80e982..0d8a5ce7e 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -314,7 +314,11 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
 
   @Override
   public String toString() {
-    return logPrefix;
+    if (active) {
+      return logPrefix;
+    } else {
+      return logPrefix + "(inactive)";
+    }
   }
 
   @Override
diff --git a/src/test/java/io/ebean/BaseTestCase.java b/src/test/java/io/ebean/BaseTestCase.java
index 92011f37b..ce5da0768 100644
--- a/src/test/java/io/ebean/BaseTestCase.java
+++ b/src/test/java/io/ebean/BaseTestCase.java
@@ -9,12 +9,18 @@ import io.ebean.meta.ServerMetrics;
 import io.ebean.util.StringHelper;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiQuery;
+import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.core.HelpCreateQueryRequest;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandlerFactory;
+import io.ebeaninternal.server.transaction.DefaultTransactionThreadLocal;
+
 import org.avaje.agentloader.AgentLoader;
+import org.junit.After;
+import org.junit.Rule;
+import org.junit.rules.TestName;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,15 +28,32 @@ import org.tests.model.basic.Country;
 
 import java.sql.Types;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.fail;
 
 @RunWith(ConditionalTestRunner.class)
 public abstract class BaseTestCase {
 
   protected static Logger logger = LoggerFactory.getLogger(BaseTestCase.class);
 
+  @Rule public TestName name = new TestName();
+
+  @After
+  public void checkForLeak() {
+    Map<String, SpiTransaction> trans = DefaultTransactionThreadLocal.currentTransactions();
+    if (trans != null) {
+      if (!trans.isEmpty()) {
+        String msg = getClass().getSimpleName() + "." + name.getMethodName() + " did not clear threadScope:" + trans;
+        trans.clear(); // clear for next test
+        fail(msg);
+      }
+    }
+  }
+
+
   /**
    * this is the clock delta that may occur between testing machine and db server.
    * If the clock delta of DB server is in future, an "asOf" query may not find the

From 197056dbc501dcfabec021e00b7d9393f1dd7c63 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Sat, 18 May 2019 01:32:17 +0200
Subject: [PATCH 0864/1036] Refactor: Ebean uses the MigrationVersion from the
 ebean-migration artifact (#1713)

---
 .../dbmigration/DefaultDbMigration.java       |   2 +-
 .../dbmigration/LastMigration.java            |   3 +-
 .../dbmigration/model/MigrationModel.java     |   2 +
 .../dbmigration/model/MigrationResource.java  |   1 +
 .../dbmigration/model/MigrationVersion.java   | 211 ------------------
 .../dbmigration/model/ModelContainer.java     |   1 +
 .../dbmigration/model/PendingDrops.java       |   1 +
 .../dbmigration/model/EntryTest.java          |   1 +
 .../model/MigrationVersionTest.java           |  19 +-
 .../model/ModelContainerApplyTest.java        |   1 +
 .../dbmigration/model/ModelContainerTest.java |   1 +
 .../dbmigration/model/PendingDropsTest.java   |   1 +
 12 files changed, 27 insertions(+), 217 deletions(-)
 delete mode 100644 src/main/java/io/ebeaninternal/dbmigration/model/MigrationVersion.java

diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index 464fdfbdc..0ce03379c 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -22,6 +22,7 @@ import io.ebean.config.dbplatform.sqlite.SQLitePlatform;
 import io.ebean.config.dbplatform.sqlserver.SqlServer16Platform;
 import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
 import io.ebean.dbmigration.DbMigration;
+import io.ebean.migration.MigrationVersion;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
 import io.ebeaninternal.dbmigration.migration.Migration;
@@ -29,7 +30,6 @@ import io.ebeaninternal.dbmigration.migrationreader.MigrationXmlWriter;
 import io.ebeaninternal.dbmigration.model.CurrentModel;
 import io.ebeaninternal.dbmigration.model.MConfiguration;
 import io.ebeaninternal.dbmigration.model.MigrationModel;
-import io.ebeaninternal.dbmigration.model.MigrationVersion;
 import io.ebeaninternal.dbmigration.model.ModelContainer;
 import io.ebeaninternal.dbmigration.model.ModelDiff;
 import io.ebeaninternal.dbmigration.model.PlatformDdlWriter;
diff --git a/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java b/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java
index 5baaa939e..1b063ba22 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java
@@ -1,12 +1,13 @@
 package io.ebeaninternal.dbmigration;
 
-import io.ebeaninternal.dbmigration.model.MigrationVersion;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import io.ebean.migration.MigrationVersion;
+
 /**
  * Utility to determine the last sql migration version and next version.
  */
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java b/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
index cc1776c13..6fe5ed66b 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
@@ -3,6 +3,8 @@ package io.ebeaninternal.dbmigration.model;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.ebean.migration.MigrationVersion;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MigrationResource.java b/src/main/java/io/ebeaninternal/dbmigration/model/MigrationResource.java
index 6ef7ce995..eff454813 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/MigrationResource.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MigrationResource.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.dbmigration.model;
 
+import io.ebean.migration.MigrationVersion;
 import io.ebeaninternal.dbmigration.migration.Migration;
 import io.ebeaninternal.dbmigration.migrationreader.MigrationXmlReader;
 
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MigrationVersion.java b/src/main/java/io/ebeaninternal/dbmigration/model/MigrationVersion.java
deleted file mode 100644
index e2925055d..000000000
--- a/src/main/java/io/ebeaninternal/dbmigration/model/MigrationVersion.java
+++ /dev/null
@@ -1,211 +0,0 @@
-package io.ebeaninternal.dbmigration.model;
-
-import java.util.Arrays;
-import java.util.regex.Pattern;
-
-/**
- * The version of a migration used so that migrations are processed in order.
- */
-public class MigrationVersion implements Comparable<MigrationVersion> {
-
-  private static final Pattern SECTION_SPLITTER = Pattern.compile("[\\.-]");
-
-  private static final int[] REPEAT_ORDERING = {Integer.MAX_VALUE};
-
-  private static final boolean[] REPEAT_UNDERSCORES = {false};
-
-  /**
-   * The raw version text.
-   */
-  private final String raw;
-
-  /**
-   * The ordering parts.
-   */
-  private final int[] ordering;
-
-  private final boolean[] underscores;
-
-  private final String comment;
-
-  /**
-   * Construct for "repeatable" version.
-   */
-  private MigrationVersion(String raw, String comment) {
-    this.raw = raw;
-    this.comment = comment;
-    this.ordering = REPEAT_ORDERING;
-    this.underscores = REPEAT_UNDERSCORES;
-  }
-
-  /**
-   * Construct for "normal" version.
-   */
-  private MigrationVersion(String raw, int[] ordering, boolean[] underscores, String comment) {
-    this.raw = raw;
-    this.ordering = ordering;
-    this.underscores = underscores;
-    this.comment = comment;
-  }
-
-  /**
-   * Return true if this is a "repeatable" version.
-   */
-  public boolean isRepeatable() {
-    // Clarification: The comparison here is intended to compare object references and not the content of the arrays.
-    // This is a kind of shortcut to see if some configuration is in place that results in the use of something other than the default.
-    return ordering == REPEAT_ORDERING;
-  }
-
-  /**
-   * Return the full version.
-   */
-  public String getFull() {
-    return raw;
-  }
-
-  @Override
-  public String toString() {
-    return raw;
-  }
-
-  /**
-   * Return the version comment.
-   */
-  public String getComment() {
-    return comment;
-  }
-
-  /**
-   * Return the version in raw form.
-   */
-  public String getRaw() {
-    return raw;
-  }
-
-  /**
-   * Return the trimmed version excluding version comment and un-parsable string.
-   */
-  public String asString() {
-    return formattedVersion(false, false);
-  }
-
-  /**
-   * Return the trimmed version with any underscores replaced with '.'
-   */
-  public String normalised() {
-    return formattedVersion(true, false);
-  }
-
-  /**
-   * Return the next version based on this version.
-   */
-  public String nextVersion() {
-    return formattedVersion(false, true);
-  }
-
-  /**
-   * Returns the version part of the string.
-   * <p>
-   * Normalised means always use '.' delimiters (no underscores).
-   * NextVersion means bump/increase the last version number by 1.
-   */
-  private String formattedVersion(boolean normalised, boolean nextVersion) {
-
-    // Clarification: The comparison here is intended to compare object references and not the content of the arrays.
-    // This is a kind of shortcut to see if some configuration is in place that results in the use of something other than the default.
-    if (ordering == REPEAT_ORDERING) {
-      return "R";
-    }
-    StringBuilder sb = new StringBuilder();
-    for (int i = 0; i < ordering.length; i++) {
-      if (i < ordering.length - 1) {
-        sb.append(ordering[i]);
-        if (normalised) {
-          sb.append('.');
-        } else {
-          sb.append(underscores[i] ? '_' : '.');
-        }
-      } else {
-        sb.append((nextVersion) ? ordering[i] + 1 : ordering[i]);
-      }
-    }
-    return sb.toString();
-  }
-
-  @Override
-  public int compareTo(MigrationVersion other) {
-
-    int otherLength = other.ordering.length;
-    for (int i = 0; i < ordering.length; i++) {
-      if (i >= otherLength) {
-        // considered greater
-        return 1;
-      }
-      if (ordering[i] != other.ordering[i]) {
-        return (ordering[i] > other.ordering[i]) ? 1 : -1;
-      }
-    }
-    return comment.compareTo(other.comment);
-  }
-
-  /**
-   * Parse the raw version string and just return the leading version number;
-   */
-  public static String trim(String raw) {
-    return parse(raw).asString();
-  }
-
-  /**
-   * Parse the raw version string into a MigrationVersion.
-   */
-  public static MigrationVersion parse(String raw) {
-
-    if (raw.startsWith("V") || raw.startsWith("v")) {
-      raw = raw.substring(1);
-    }
-
-    String comment = "";
-    String value = raw;
-    int commentStart = raw.indexOf("__");
-    if (commentStart > -1) {
-      // trim off the trailing comment
-      comment = raw.substring(commentStart + 2);
-      value = value.substring(0, commentStart);
-    }
-
-    value = value.replace('_', '.');
-
-    String[] sections = SECTION_SPLITTER.split(value);
-
-    if ("r".equalsIgnoreCase(sections[0])) {
-      // a "repeatable" version (does not have a version number)
-      return new MigrationVersion(raw, comment);
-    }
-
-    boolean[] underscores = new boolean[sections.length];
-    int[] ordering = new int[sections.length];
-
-    int delimiterPos = 0;
-    int stopIndex = 0;
-    for (int i = 0; i < sections.length; i++) {
-      try {
-        ordering[i] = Integer.parseInt(sections[i]);
-        stopIndex++;
-
-        delimiterPos += sections[i].length();
-        underscores[i] = (delimiterPos < raw.length() - 1 && raw.charAt(delimiterPos) == '_');
-        delimiterPos++;
-      } catch (NumberFormatException e) {
-        // stop parsing
-        break;
-      }
-    }
-
-    int[] actualOrder = Arrays.copyOf(ordering, stopIndex);
-    boolean[] actualUnderscores = Arrays.copyOf(underscores, stopIndex);
-
-    return new MigrationVersion(raw, actualOrder, actualUnderscores, comment);
-  }
-
-}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java b/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
index d92adfb61..7f0e50fa1 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.dbmigration.model;
 
+import io.ebean.migration.MigrationVersion;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.DdlHelp;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.SplitColumns;
 import io.ebeaninternal.dbmigration.migration.AddColumn;
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/PendingDrops.java b/src/main/java/io/ebeaninternal/dbmigration/model/PendingDrops.java
index 44905aa02..9a0bdd242 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/PendingDrops.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/PendingDrops.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.dbmigration.model;
 
+import io.ebean.migration.MigrationVersion;
 import io.ebeaninternal.dbmigration.migration.ChangeSet;
 import io.ebeaninternal.dbmigration.migration.ChangeSetType;
 import io.ebeaninternal.dbmigration.migration.DropColumn;
diff --git a/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java
index 0a3546fd8..1a80bdc87 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.dbmigration.model;
 
+import io.ebean.migration.MigrationVersion;
 import io.ebeaninternal.dbmigration.migration.ChangeSet;
 import io.ebeaninternal.dbmigration.migration.DropColumn;
 import org.junit.Test;
diff --git a/src/test/java/io/ebeaninternal/dbmigration/model/MigrationVersionTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/MigrationVersionTest.java
index cd85b241a..84101bfe7 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/model/MigrationVersionTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/MigrationVersionTest.java
@@ -2,12 +2,15 @@ package io.ebeaninternal.dbmigration.model;
 
 import org.junit.Test;
 
+import io.ebean.migration.MigrationVersion;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import static org.assertj.core.api.StrictAssertions.assertThat;
 
+// FIXME: this test should be moved to ebean-migration artifact
 public class MigrationVersionTest {
 
 
@@ -143,12 +146,20 @@ public class MigrationVersionTest {
     MigrationVersion v2 = MigrationVersion.parse("1.1_1.2_foo");
     MigrationVersion v3 = MigrationVersion.parse("1.1_1.2__foo");
 
-    assertThat(v0.compareTo(v1)).isGreaterThan(0);
-    assertThat(v1.compareTo(v0)).isLessThan(0);
+    // same version number, but not equal. It prints out the warning:
+    // The migrationscript '1.1.1.1_junk' contains non numeric version part.
+    // This may lead to misordered version scripts.
+    assertThat(v0.compareTo(v1)).isEqualTo(0);
+    assertThat(v0).isNotEqualTo(v1);
+    assertThat(v1.compareTo(v0)).isEqualTo(0);
+    assertThat(v1).isNotEqualTo(v0);
     assertThat(v1.compareTo(v2)).isEqualTo(0);
+    assertThat(v1).isNotEqualTo(v2);
 
-    assertThat(v0.compareTo(v3)).isLessThan(0);
-    assertThat(v3.compareTo(v0)).isGreaterThan(0);
+    assertThat(v0.compareTo(v3)).isEqualTo(0);
+    assertThat(v0).isNotEqualTo(v3);
+    assertThat(v3.compareTo(v0)).isEqualTo(0);
+    assertThat(v3).isNotEqualTo(v0);
   }
 
   @Test
diff --git a/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java
index 7f797c376..895b24f3f 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.dbmigration.model;
 
+import io.ebean.migration.MigrationVersion;
 import io.ebeaninternal.dbmigration.migration.AddColumn;
 import io.ebeaninternal.dbmigration.migration.ChangeSet;
 import io.ebeaninternal.dbmigration.migration.CreateTable;
diff --git a/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java
index 591e7aa99..f02ecede7 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.dbmigration.model;
 
 
+import io.ebean.migration.MigrationVersion;
 import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
 import io.ebeaninternal.dbmigration.migration.DropIndex;
 import io.ebeaninternal.dbmigration.migration.DropTable;
diff --git a/src/test/java/io/ebeaninternal/dbmigration/model/PendingDropsTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/PendingDropsTest.java
index 276a08ceb..df58fbc45 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/model/PendingDropsTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/model/PendingDropsTest.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.dbmigration.model;
 
+import io.ebean.migration.MigrationVersion;
 import io.ebeaninternal.dbmigration.migration.ChangeSet;
 import io.ebeaninternal.dbmigration.migration.DropColumn;
 import io.ebeaninternal.dbmigration.migration.Migration;

From 9326c9c79e193b0e9e71ff3be07c4b7a3e45717f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 18 May 2019 12:09:50 +1200
Subject: [PATCH 0865/1036] Adjustment on #1711, fix clearing of inactive
 transactions from thread local

Handles implicit transactions for update and delete queries plus delete
by id
---
 .../io/ebeaninternal/server/core/DefaultServer.java   |  2 ++
 .../server/core/ObtainedTransaction.java              |  3 +++
 .../server/core/ObtainedTransactionImplicit.java      | 11 ++++++++---
 .../io/ebeaninternal/server/core/OrmQueryRequest.java |  4 ++++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 0139c9b57..ff818e9cf 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -2235,6 +2235,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     } catch (RuntimeException e) {
       wrap.endIfCreated();
       throw e;
+    } finally {
+      wrap.clearIfCreated();
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/core/ObtainedTransaction.java b/src/main/java/io/ebeaninternal/server/core/ObtainedTransaction.java
index abe332ac5..dd2115581 100644
--- a/src/main/java/io/ebeaninternal/server/core/ObtainedTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/core/ObtainedTransaction.java
@@ -41,4 +41,7 @@ class ObtainedTransaction {
     // do nothing
   }
 
+  public void clearIfCreated() {
+    // do nothing
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/ObtainedTransactionImplicit.java b/src/main/java/io/ebeaninternal/server/core/ObtainedTransactionImplicit.java
index 7d86156a5..c4e06d434 100644
--- a/src/main/java/io/ebeaninternal/server/core/ObtainedTransactionImplicit.java
+++ b/src/main/java/io/ebeaninternal/server/core/ObtainedTransactionImplicit.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.core;
 
-import io.ebean.EbeanServer;
+import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiTransaction;
 
 /**
@@ -11,12 +11,12 @@ import io.ebeaninternal.api.SpiTransaction;
  */
 final class ObtainedTransactionImplicit extends ObtainedTransaction {
 
-  private final EbeanServer server;
+  private final SpiEbeanServer server;
 
   /**
    * Wrap the transaction indicating if it was just created.
    */
-  ObtainedTransactionImplicit(SpiTransaction t, EbeanServer server) {
+  ObtainedTransactionImplicit(SpiTransaction t, SpiEbeanServer server) {
     super(t);
     this.server = server;
   }
@@ -31,4 +31,9 @@ final class ObtainedTransactionImplicit extends ObtainedTransaction {
     server.endTransaction();
   }
 
+  @Override
+  public void clearIfCreated() {
+    server.clearServerTransaction();
+  }
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index 7f6bb858f..9fa93e693 100644
--- a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -350,6 +350,10 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
   public void endTransIfRequired() {
     if (createdTransaction && transaction.isActive()) {
       transaction.commit();
+      if (query.getType().isUpdate()) {
+        // for implicit update/delete queries clear the thread local
+        ebeanServer.clearServerTransaction();
+      }
     }
   }
 

From 201958f38cfeba1fcfccb552894f02f3ace518d3 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sat, 18 May 2019 12:32:17 +1200
Subject: [PATCH 0866/1036] Refactor tidy on DefaultTransactionThreadLocal
 (#1715)

- remove unused methods
- use clear() rather than set(null)
---
 .../ebeaninternal/api/ScopedTransaction.java  |  2 +-
 .../DefaultTransactionThreadLocal.java        | 59 ++-----------------
 2 files changed, 6 insertions(+), 55 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/api/ScopedTransaction.java b/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
index a8d38b03f..8db8c316d 100644
--- a/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
+++ b/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
@@ -70,7 +70,7 @@ public class ScopedTransaction extends SpiTransactionProxy {
 
   private void clearScopeOnce() {
     if (!scopeCleared) {
-      manager.set(null);
+      manager.clear();
       scopeCleared = true;
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java
index 530878d27..9b415ece5 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java
@@ -31,12 +31,11 @@ public final class DefaultTransactionThreadLocal {
    */
   public static void set(String serverName, SpiTransaction trans) {
     if (trans == null) {
-      remove(serverName);
-    } else {
-      SpiTransaction existingTransaction = local.get().put(serverName, trans);
-      if (existingTransaction != null && existingTransaction.isActive()) {
-        throw new PersistenceException("The existing transaction is still active?");
-      }
+      throw new IllegalStateException("Setting a null transaction?");
+    }
+    SpiTransaction existingTransaction = local.get().put(serverName, trans);
+    if (existingTransaction != null && existingTransaction.isActive()) {
+      throw new PersistenceException("The existing transaction is still active?");
     }
   }
 
@@ -82,52 +81,4 @@ public final class DefaultTransactionThreadLocal {
     return local.get();
   }
 
-  private static SpiTransaction obtain(String serverName) {
-    SpiTransaction transaction = local.get().remove(serverName);
-    if (transaction == null) {
-      throw new IllegalStateException("No current transaction for [" + serverName + "]");
-    }
-    return transaction;
-  }
-
-  /**
-   * Commit the current transaction.
-   */
-  public static void commit(String serverName) {
-    obtain(serverName).commit();
-  }
-
-  /**
-   * Rollback the current transaction.
-   */
-  public static void rollback(String serverName) {
-    obtain(serverName).rollback();
-  }
-
-  /**
-   * If the transaction has not been committed then roll it back.
-   * <p>
-   * Designed to be put in a finally block instead of a rollback() in each catch
-   * block.
-   * <p>
-   * <pre>
-   * Ebean.beginTransaction();
-   * try {
-   *   // ... perform some actions in a single transaction
-   *
-   *   Ebean.commitTransaction();
-   *
-   * } finally {
-   *   // ensure transaction ended. If some error occurred then rollback()
-   *   Ebean.endTransaction();
-   * }
-   * </pre>
-   */
-  public static void end(String serverName) {
-    SpiTransaction transaction = local.get().remove(serverName);
-    if (transaction != null) {
-      transaction.end();
-    }
-  }
-
 }

From c6ba4d8155cd8e5dd93181777722485de87ec8d7 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sat, 18 May 2019 15:16:17 +1200
Subject: [PATCH 0867/1036] Refactor DefaultTransactionThreadLocal, convert
 ThreadLocal to field (from map) (#1716)

* Refactor DefaultTransactionThreadLocal, convert ThreadLocal to field (from map)

* Add test for multiple database thread locals
---
 .../api/SpiTransactionManager.java            |  6 ++
 .../DefaultTransactionScopeManager.java       | 33 ++++++--
 .../DefaultTransactionThreadLocal.java        | 84 -------------------
 .../transaction/JtaTransactionManager.java    | 18 ++--
 .../transaction/TransactionManager.java       |  2 +-
 .../transaction/TransactionScopeManager.java  |  6 ++
 src/test/java/io/ebean/BaseTestCase.java      | 19 +++--
 .../DefaultTransactionThreadLocalTest.java    | 63 +++++++++++---
 .../transaction/TestExecuteComplete.java      | 30 +++----
 9 files changed, 120 insertions(+), 141 deletions(-)
 delete mode 100644 src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java

diff --git a/src/main/java/io/ebeaninternal/api/SpiTransactionManager.java b/src/main/java/io/ebeaninternal/api/SpiTransactionManager.java
index d08e5aa2b..d2c23ee67 100644
--- a/src/main/java/io/ebeaninternal/api/SpiTransactionManager.java
+++ b/src/main/java/io/ebeaninternal/api/SpiTransactionManager.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.api;
 
 import io.ebean.TxScope;
+import io.ebeaninternal.server.transaction.TransactionScopeManager;
 
 import javax.sql.DataSource;
 
@@ -9,6 +10,11 @@ import javax.sql.DataSource;
  */
 public interface SpiTransactionManager {
 
+  /**
+   * Return the scope manager for this server.
+   */
+  TransactionScopeManager scope();
+
   /**
    * Return the main DataSource.
    */
diff --git a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java
index 4a4ca8214..0134ff5ed 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java
@@ -2,12 +2,16 @@ package io.ebeaninternal.server.transaction;
 
 import io.ebeaninternal.api.SpiTransaction;
 
+import javax.persistence.PersistenceException;
+
 /**
  * Manages the transaction scoping using a Ebean thread local.
  */
 public class DefaultTransactionScopeManager extends TransactionScopeManager {
 
 
+  private final ThreadLocal<SpiTransaction> local = new ThreadLocal<>();
+
   public DefaultTransactionScopeManager(String serverName) {
     super(serverName);
   }
@@ -19,12 +23,12 @@ public class DefaultTransactionScopeManager extends TransactionScopeManager {
 
   @Override
   public SpiTransaction getInScope() {
-    return DefaultTransactionThreadLocal.get(serverName);
+    return local.get();
   }
 
   @Override
   public SpiTransaction getActive() {
-    SpiTransaction t = DefaultTransactionThreadLocal.get(serverName);
+    SpiTransaction t = local.get();
     if (t == null || !t.isActive()) {
       return null;
     } else {
@@ -34,17 +38,36 @@ public class DefaultTransactionScopeManager extends TransactionScopeManager {
 
   @Override
   public void replace(SpiTransaction trans) {
-    DefaultTransactionThreadLocal.replace(serverName, trans);
+    if (trans == null) {
+      throw new IllegalStateException("Setting a null transaction?");
+    }
+    local.set(trans);
   }
 
   @Override
   public void set(SpiTransaction trans) {
-    DefaultTransactionThreadLocal.set(serverName, trans);
+    if (trans == null) {
+      throw new IllegalStateException("Setting a null transaction?");
+    }
+    checkForActiveTransaction();
+    local.set(trans);
   }
 
   @Override
   public void clear() {
-    DefaultTransactionThreadLocal.clear(serverName);
+    checkForActiveTransaction();
+    local.remove();
   }
 
+  @Override
+  public void clearExternal() {
+    local.remove();
+  }
+
+  private void checkForActiveTransaction() {
+    SpiTransaction transaction = local.get();
+    if (transaction != null && transaction.isActive()) {
+      throw new PersistenceException("Invalid state - there is an existing Active transaction " + transaction);
+    }
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java
deleted file mode 100644
index 9b415ece5..000000000
--- a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package io.ebeaninternal.server.transaction;
-
-import io.ebeaninternal.api.SpiTransaction;
-
-import javax.persistence.PersistenceException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Used to store Transactions in a ThreadLocal.
- */
-public final class DefaultTransactionThreadLocal {
-
-  private static final ThreadLocal<Map<String, SpiTransaction>> local = ThreadLocal.withInitial(HashMap::new);
-
-  /**
-   * Not allowed.
-   */
-  private DefaultTransactionThreadLocal() {
-  }
-
-  /**
-   * Remove the transaction entry for the given serverName.
-   */
-  private static void remove(String serverName) {
-    local.get().remove(serverName);
-  }
-
-  /**
-   * Set a new Transaction for this serverName and Thread.
-   */
-  public static void set(String serverName, SpiTransaction trans) {
-    if (trans == null) {
-      throw new IllegalStateException("Setting a null transaction?");
-    }
-    SpiTransaction existingTransaction = local.get().put(serverName, trans);
-    if (existingTransaction != null && existingTransaction.isActive()) {
-      throw new PersistenceException("The existing transaction is still active?");
-    }
-  }
-
-  /**
-   * Clear a transaction. It should be inactive.
-   */
-  public static void clear(String serverName) {
-    SpiTransaction transaction = local.get().remove(serverName);
-    if (transaction != null && transaction.isActive()) {
-      throw new IllegalStateException("Clearing an ACTIVE transaction " + transaction);
-    }
-  }
-
-  /**
-   * A mechanism to get the transaction out of the thread local by replacing it
-   * with a 'proxy'.
-   * <p>
-   * Used for background fetching. Replaces the current transaction with a
-   * 'dummy' transaction. The current transaction is given to the background
-   * thread so it can continue the fetch.
-   * </p>
-   */
-  public static void replace(String serverName, SpiTransaction trans) {
-    if (trans == null) {
-      remove(serverName);
-    } else {
-      local.get().put(serverName, trans);
-    }
-  }
-
-  /**
-   * Return the current Transaction for this serverName and Thread.
-   */
-  public static SpiTransaction get(String serverName) {
-    return local.get().get(serverName);
-  }
-
-  /**
-   * Return all transactions of the current thread (active/inactive).
-   * This is intended for test/debugging purposes only!
-   */
-  public static Map<String, SpiTransaction> currentTransactions() {
-    return local.get();
-  }
-
-}
diff --git a/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java
index 1933b10c6..0bfd76e4f 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java
@@ -34,10 +34,7 @@ public class JtaTransactionManager implements ExternalTransactionManager {
    */
   private TransactionManager transactionManager;
 
-  /**
-   * The EbeanServer name.
-   */
-  private String serverName;
+  private TransactionScopeManager scope;
 
   /**
    * Instantiates a new spring aware transaction scope manager.
@@ -55,7 +52,7 @@ public class JtaTransactionManager implements ExternalTransactionManager {
     // the public API and hence the Object type and casting here
 
     this.transactionManager = (TransactionManager) txnMgr;
-    this.serverName = transactionManager.getServerName();
+    this.scope = transactionManager.scope();
   }
 
   /**
@@ -102,7 +99,7 @@ public class JtaTransactionManager implements ExternalTransactionManager {
     }
 
     // check current Ebean transaction
-    SpiTransaction currentEbeanTransaction = DefaultTransactionThreadLocal.get(serverName);
+    SpiTransaction currentEbeanTransaction = scope.getInScope();
     if (currentEbeanTransaction != null) {
       // NOT expecting this so log WARNING
       String msg = "JTA Transaction - no current txn BUT using current Ebean one " + currentEbeanTransaction.getId();
@@ -132,7 +129,7 @@ public class JtaTransactionManager implements ExternalTransactionManager {
     syncRegistry.registerInterposedSynchronization(txnListener);
 
     // also put in Ebean ThreadLocal
-    DefaultTransactionThreadLocal.set(serverName, newTrans);
+    scope.set(newTrans);
     return newTrans;
   }
 
@@ -192,12 +189,9 @@ public class JtaTransactionManager implements ExternalTransactionManager {
 
     private final SpiTransaction transaction;
 
-    private final String serverName;
-
     private JtaTxnListener(TransactionManager transactionManager, SpiTransaction t) {
       this.transactionManager = transactionManager;
       this.transaction = t;
-      this.serverName = transactionManager.getServerName();
     }
 
     @Override
@@ -216,7 +210,7 @@ public class JtaTransactionManager implements ExternalTransactionManager {
           }
           transactionManager.notifyOfCommit(transaction);
           // Remove this transaction object as it is completed
-          DefaultTransactionThreadLocal.replace(serverName, null);
+          transactionManager.scope().clearExternal();
           break;
 
         case Status.STATUS_ROLLEDBACK:
@@ -225,7 +219,7 @@ public class JtaTransactionManager implements ExternalTransactionManager {
           }
           transactionManager.notifyOfRollback(transaction, null);
           // Remove this transaction object as it is completed
-          DefaultTransactionThreadLocal.replace(serverName, null);
+          transactionManager.scope().clearExternal();
           break;
 
         default:
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index e446a9477..14d4e7d72 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -597,7 +597,7 @@ public class TransactionManager implements SpiTransactionManager {
 
   @Override
   public void externalRemoveTransaction() {
-    scopeManager.replace(null);
+    scopeManager.clearExternal();
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java
index 98c192a6c..ac5ce6616 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java
@@ -39,6 +39,12 @@ public abstract class TransactionScopeManager implements SpiTransactionScopeMana
    */
   public abstract void clear();
 
+  /**
+   * Clears the current Transaction from thread local scope without any check for active
+   * transactions. Intended for use with external transactions.
+   */
+  public abstract void clearExternal();
+
   /**
    * Replace the current transaction with this one.
    * <p>
diff --git a/src/test/java/io/ebean/BaseTestCase.java b/src/test/java/io/ebean/BaseTestCase.java
index ce5da0768..c03988613 100644
--- a/src/test/java/io/ebean/BaseTestCase.java
+++ b/src/test/java/io/ebean/BaseTestCase.java
@@ -15,8 +15,7 @@ import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandlerFactory;
-import io.ebeaninternal.server.transaction.DefaultTransactionThreadLocal;
-
+import io.ebeaninternal.server.transaction.TransactionScopeManager;
 import org.avaje.agentloader.AgentLoader;
 import org.junit.After;
 import org.junit.Rule;
@@ -28,7 +27,6 @@ import org.tests.model.basic.Country;
 
 import java.sql.Types;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -43,13 +41,12 @@ public abstract class BaseTestCase {
 
   @After
   public void checkForLeak() {
-    Map<String, SpiTransaction> trans = DefaultTransactionThreadLocal.currentTransactions();
+    TransactionScopeManager scope = spiEbeanServer().getTransactionManager().scope();
+    SpiTransaction trans = scope.getInScope();
     if (trans != null) {
-      if (!trans.isEmpty()) {
-        String msg = getClass().getSimpleName() + "." + name.getMethodName() + " did not clear threadScope:" + trans;
-        trans.clear(); // clear for next test
-        fail(msg);
-      }
+      String msg = getClass().getSimpleName() + "." + name.getMethodName() + " did not clear threadScope:" + trans;
+      scope.clearExternal(); // clear for next test
+      fail(msg);
     }
   }
 
@@ -104,6 +101,10 @@ public abstract class BaseTestCase {
       .collect(Collectors.toList());
   }
 
+  protected SpiTransaction getInScopeTransaction() {
+    return spiEbeanServer().getTransactionManager().scope().getInScope();
+  }
+
   /**
    * Return the generated sql trimming column alias if required.
    */
diff --git a/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java b/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java
index b235b56a6..a3f95c8ed 100644
--- a/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java
+++ b/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java
@@ -1,13 +1,21 @@
 package io.ebeaninternal.server.transaction;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import io.ebean.Database;
+import io.ebean.DatabaseFactory;
 import io.ebean.Ebean;
 import io.ebean.Transaction;
 import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
+import io.ebean.config.DatabaseConfig;
 import io.ebeaninternal.api.SpiTransaction;
 import org.junit.Test;
+import org.tests.model.basic.EBasicVer;
+import org.tests.model.basic.UTDetail;
+import org.tests.model.basic.UTMaster;
 
+import static org.assertj.core.api.StrictAssertions.assertThat;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
@@ -18,12 +26,12 @@ public class DefaultTransactionThreadLocalTest extends BaseTestCase {
   @Test
   public void get() {
     Ebean.execute(() -> {
-      SpiTransaction txn = DefaultTransactionThreadLocal.get("h2");
+      SpiTransaction txn = getInScopeTransaction();
       assertNotNull(txn);
     });
 
     // thread local should be set to null
-    assertNull(DefaultTransactionThreadLocal.get("h2"));
+    assertNull(getInScopeTransaction());
   }
 
   @ForPlatform({Platform.H2})
@@ -32,19 +40,19 @@ public class DefaultTransactionThreadLocalTest extends BaseTestCase {
 
     try (Transaction transaction = Ebean.beginTransaction()) {
       assertNotNull(transaction);
-      SpiTransaction txn = DefaultTransactionThreadLocal.get("h2");
+      SpiTransaction txn = getInScopeTransaction();
       assertSame(txn, transaction);
 
       try (Transaction nested = Ebean.beginTransaction()) {
         assertNotNull(nested);
-        SpiTransaction txnNested = DefaultTransactionThreadLocal.get("h2");
+        SpiTransaction txnNested = getInScopeTransaction();
         assertSame(txnNested, nested);
       }
 
-      assertNotNull(DefaultTransactionThreadLocal.get("h2"));
+      assertNotNull(getInScopeTransaction());
     }
 
-    assertNull(DefaultTransactionThreadLocal.get("h2"));
+    assertNull(getInScopeTransaction());
   }
 
   @ForPlatform({Platform.H2})
@@ -53,9 +61,9 @@ public class DefaultTransactionThreadLocalTest extends BaseTestCase {
 
     try (Transaction transaction = Ebean.beginTransaction()) {
       transaction.commit();
-      assertNull(DefaultTransactionThreadLocal.get("h2"));
+      assertNull(getInScopeTransaction());
     }
-    assertNull(DefaultTransactionThreadLocal.get("h2"));
+    assertNull(getInScopeTransaction());
   }
 
   @ForPlatform({Platform.H2})
@@ -65,9 +73,9 @@ public class DefaultTransactionThreadLocalTest extends BaseTestCase {
     try (Transaction transaction = Ebean.beginTransaction()) {
 
       transaction.rollback();
-      assertNull(DefaultTransactionThreadLocal.get("h2"));
+      assertNull(getInScopeTransaction());
     }
-    assertNull(DefaultTransactionThreadLocal.get("h2"));
+    assertNull(getInScopeTransaction());
   }
 
   @ForPlatform({Platform.H2})
@@ -78,4 +86,39 @@ public class DefaultTransactionThreadLocalTest extends BaseTestCase {
     Ebean.endTransaction();
   }
 
+  @ForPlatform({Platform.H2})
+  @Test
+  public void multi_database_threadlocals() {
+
+    Database db = DB.getDefault();
+    Database otherDb = createOtherDatabase();
+    try {
+      try (Transaction dbTxn = db.beginTransaction()) {
+        try (Transaction otherDbTxn = otherDb.beginTransaction()) {
+          assertThat(dbTxn).isNotSameAs(otherDbTxn);
+        }
+      }
+    } finally {
+      otherDb.shutdown(true, false);
+    }
+  }
+
+
+  private Database createOtherDatabase() {
+
+    DatabaseConfig config = new DatabaseConfig();
+    config.setName("h2ebasicver");
+    config.loadFromProperties();
+    config.setDdlGenerate(true);
+    config.setDdlRun(true);
+    config.setDdlExtra(false);
+
+    config.setRegister(false);
+    config.setDefaultServer(false);
+    config.getClasses().add(EBasicVer.class);
+    config.getClasses().add(UTMaster.class);
+    config.getClasses().add(UTDetail.class);
+
+    return DatabaseFactory.create(config);
+  }
 }
diff --git a/src/test/java/org/tests/transaction/TestExecuteComplete.java b/src/test/java/org/tests/transaction/TestExecuteComplete.java
index 54c3661e8..4847265f4 100644
--- a/src/test/java/org/tests/transaction/TestExecuteComplete.java
+++ b/src/test/java/org/tests/transaction/TestExecuteComplete.java
@@ -10,7 +10,6 @@ import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
 import io.ebean.annotation.Transactional;
 import io.ebeaninternal.api.SpiTransaction;
-import io.ebeaninternal.server.transaction.DefaultTransactionThreadLocal;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
@@ -37,8 +36,7 @@ public class TestExecuteComplete extends BaseTestCase {
       fail();
     } catch (DataIntegrityException e) {
       // assert the thread local has been cleaned up
-      SpiTransaction txn = DefaultTransactionThreadLocal.get("h2");
-      assertThat(txn).isNull();
+      assertThat(getInScopeTransaction()).isNull();
     }
   }
 
@@ -59,8 +57,7 @@ public class TestExecuteComplete extends BaseTestCase {
       fail();
     } catch (DataIntegrityException e) {
       // assert the thread local has been cleaned up
-      SpiTransaction txn = DefaultTransactionThreadLocal.get("h2");
-      assertThat(txn).isNull();
+      assertThat(getInScopeTransaction()).isNull();
     }
   }
 
@@ -72,8 +69,7 @@ public class TestExecuteComplete extends BaseTestCase {
       errorOnCommit();
       fail();
     } catch (DataIntegrityException e) {
-      SpiTransaction txn = DefaultTransactionThreadLocal.get("h2");
-      assertThat(txn).isNull();
+      assertThat(getInScopeTransaction()).isNull();
     }
   }
 
@@ -97,8 +93,7 @@ public class TestExecuteComplete extends BaseTestCase {
       txn1.end();
     }
 
-    SpiTransaction txn2 = DefaultTransactionThreadLocal.get("h2");
-    assertThat(txn2).isNull();
+    assertThat(getInScopeTransaction()).isNull();
   }
 
   @ForPlatform(Platform.H2)
@@ -113,8 +108,7 @@ public class TestExecuteComplete extends BaseTestCase {
       //txn1.end();
     }
 
-    SpiTransaction txn2 = DefaultTransactionThreadLocal.get("h2");
-    assertThat(txn2).isNull();
+    assertThat(getInScopeTransaction()).isNull();
   }
 
   @ForPlatform(Platform.H2)
@@ -129,8 +123,7 @@ public class TestExecuteComplete extends BaseTestCase {
       //txn1.end();
     }
 
-    SpiTransaction txn2 = DefaultTransactionThreadLocal.get("h2");
-    assertThat(txn2).isNull();
+    assertThat(getInScopeTransaction()).isNull();
   }
 
   @ForPlatform(Platform.H2)
@@ -139,8 +132,7 @@ public class TestExecuteComplete extends BaseTestCase {
 
     DB.find(Customer.class).findList();
 
-    SpiTransaction txn = DefaultTransactionThreadLocal.get("h2");
-    assertThat(txn).isNull();
+    assertThat(getInScopeTransaction()).isNull();
   }
 
   @ForPlatform(Platform.H2)
@@ -151,8 +143,7 @@ public class TestExecuteComplete extends BaseTestCase {
     cust.setName("Roland");
     DB.save(cust);
 
-    SpiTransaction txn = DefaultTransactionThreadLocal.get("h2");
-    assertThat(txn).isNull();
+    assertThat(getInScopeTransaction()).isNull();
   }
 
   @ForPlatform(Platform.H2)
@@ -160,15 +151,14 @@ public class TestExecuteComplete extends BaseTestCase {
   public void no_transaction_expect_threadScopeCleanup() {
 
     try (Transaction txn = DB.beginTransaction(TxScope.notSupported())) {
-      SpiTransaction txn2 = DefaultTransactionThreadLocal.get("h2");
+      SpiTransaction txn2 = getInScopeTransaction();
       // The NoTransaction placeholder can normally only occur inside
       // a scopedTrans. (Class is package private, so check
       assertThat(txn2.toString()).contains("NoTransaction");
       assertThat(txn2.toString()).contains("NoTransaction");
     }
 
-    SpiTransaction txn = DefaultTransactionThreadLocal.get("h2");
-    assertThat(txn).isNull();
+    assertThat(getInScopeTransaction()).isNull();
   }
 
 }

From 0cac723eac3a708eb99deb66bb20b77547211eb1 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 20 May 2019 10:25:18 +0200
Subject: [PATCH 0868/1036] Query Cache will not always be invalidated (#1717)

* provide failing test, that shows missing cache invalidation

* FIX: proper cache invalidation when dependent table will be modified
---
 .../deploy/BeanDescriptorCacheHelp.java       |  1 +
 .../server/transaction/BeanPersistIds.java    |  1 +
 .../cache/TestQueryCacheTableDependency.java  | 70 +++++++++++++++++++
 .../tests/model/basic/cache/ECacheChild.java  | 52 ++++++++++++++
 .../tests/model/basic/cache/ECacheRoot.java   | 38 ++++++++++
 5 files changed, 162 insertions(+)
 create mode 100644 src/test/java/org/tests/model/basic/cache/ECacheChild.java
 create mode 100644 src/test/java/org/tests/model/basic/cache/ECacheRoot.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index 398b4a31b..a0622868b 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -220,6 +220,7 @@ final class BeanDescriptorCacheHelp<T> {
    */
   private void queryCacheClear(CacheChangeSet changeSet) {
     if (queryCache != null) {
+      changeSet.addInvalidate(desc);
       changeSet.addClearQuery(desc);
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
index bb1690bfe..d7d24eefc 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
@@ -128,6 +128,7 @@ public class BeanPersistIds implements BinaryWritable {
    * Notify the cache of this event that came from another server in the cluster.
    */
   public void notifyCache(CacheChangeSet changeSet) {
+    changeSet.addInvalidate(beanDescriptor);
     changeSet.addClearQuery(beanDescriptor);
     if (ids != null) {
       changeSet.addBeanRemoveMany(beanDescriptor, ids);
diff --git a/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java b/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java
index ee12f6794..8ee240bd0 100644
--- a/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java
+++ b/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java
@@ -1,13 +1,18 @@
 package org.tests.cache;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
+import io.ebean.Query;
 import io.ebean.cache.ServerCache;
+
 import org.junit.Test;
 import org.tests.model.basic.Address;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
+import org.tests.model.basic.cache.ECacheChild;
+import org.tests.model.basic.cache.ECacheRoot;
 
 import java.util.List;
 
@@ -122,4 +127,69 @@ public class TestQueryCacheTableDependency extends BaseTestCase {
     assertThat(custCount1).isEqualTo(0);
 
   }
+
+  @Test
+  public void testCache_withInvalidateQueryCache() throws InterruptedException {
+    // So Address has no query cache enabled, but has @InvalidateQueryCache annotation
+    Address root = new Address();
+    root.setCity("new york");
+    DB.save(root);
+
+    Customer child = new Customer();
+    child.setName("bobby");
+    child.setBillingAddress(root);
+    DB.save(child);
+    DB.getServerCacheManager().getQueryCache(Address.class).clear();
+    DB.getServerCacheManager().getQueryCache(Customer.class).clear();
+    // Test preparation finished, start the test
+    Thread.sleep(10);
+
+    Query<Customer> query = DB.find(Customer.class).where().eq("billingAddress.city", "new york").query();
+    query.setUseQueryCache(true);
+
+    assertThat(query.findCount()).isEqualTo(1);
+
+    root.setCity("san francisco");
+    DB.save(root);
+
+    assertThat(query.findCount()).isEqualTo(0);
+
+    // clean up
+    DB.delete(child);
+    // DB.delete(root); deleted by M2O cascade.
+  }
+
+  @Test
+  public void testCache_withEnabeldQueryCache() throws InterruptedException {
+    // ECacheRoot and ECacheChild have enabled query cache.
+    ECacheRoot root = new ECacheRoot();
+    root.setName("testRoot");
+    DB.save(root);
+
+    ECacheChild child = new ECacheChild();
+    child.setName("testChild");
+    child.setRoot(root);
+    DB.save(child);
+    DB.getServerCacheManager().getQueryCache(ECacheChild.class).clear();
+    DB.getServerCacheManager().getQueryCache(ECacheRoot.class).clear();
+    // Test preparation finished, start the test
+    Thread.sleep(10);
+    // we need this thread.sleep here, because on a fast machine, DB.save(child) and computing the
+    // queryCacheEntry will happen in the same millisecond (or 10 milliseconds, which is the resolution
+    // of System.currentTimeMillis() on windows 7 & java 8)
+    Query<ECacheChild> query = DB.find(ECacheChild.class).where().eq("root.name", "testRoot").query();
+    query.setUseQueryCache(true);
+
+    assertThat(query.findCount()).isEqualTo(1);
+
+    root = DB.find(ECacheRoot.class).findList().get(0);
+    root.setName("test2");
+    DB.save(root);
+
+    assertThat(query.findCount()).isEqualTo(0);
+
+    // clean up
+    DB.delete(child);
+    DB.delete(root);
+  }
 }
diff --git a/src/test/java/org/tests/model/basic/cache/ECacheChild.java b/src/test/java/org/tests/model/basic/cache/ECacheChild.java
new file mode 100644
index 000000000..d14ae5e4d
--- /dev/null
+++ b/src/test/java/org/tests/model/basic/cache/ECacheChild.java
@@ -0,0 +1,52 @@
+package org.tests.model.basic.cache;
+
+import java.util.UUID;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+import io.ebean.annotation.Cache;
+
+@Entity
+@Cache(enableQueryCache = true)
+public class ECacheChild {
+
+  @Id
+  @GeneratedValue
+  protected UUID id;
+
+  @Size(max = 100)
+  private String name;
+
+  @NotNull
+  @ManyToOne
+  private ECacheRoot root;
+
+  public UUID getId() {
+    return id;
+  }
+
+  public void setId(UUID id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public ECacheRoot getRoot() {
+    return root;
+  }
+
+  public void setRoot(ECacheRoot root) {
+    this.root = root;
+  }
+}
diff --git a/src/test/java/org/tests/model/basic/cache/ECacheRoot.java b/src/test/java/org/tests/model/basic/cache/ECacheRoot.java
new file mode 100644
index 000000000..10b9ef9df
--- /dev/null
+++ b/src/test/java/org/tests/model/basic/cache/ECacheRoot.java
@@ -0,0 +1,38 @@
+package org.tests.model.basic.cache;
+
+import java.util.UUID;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.validation.constraints.Size;
+
+import io.ebean.annotation.Cache;
+
+@Entity
+@Cache(enableQueryCache = true)
+public class ECacheRoot {
+
+  @Id
+  @GeneratedValue
+  protected UUID id;
+
+  @Size(max = 100)
+  private String name;
+
+  public UUID getId() {
+    return id;
+  }
+
+  public void setId(UUID id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+}

From dcd81a857d19bb0335de449d8acb313743187f6a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 20 May 2019 21:14:47 +1200
Subject: [PATCH 0869/1036] #1717 - Add tests for Query Cache invalidation

Revert the prior change that added the extra calls to
changeSet.addInvalidate(desc); as they are not needed.
---
 .../ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java  | 4 +---
 .../io/ebeaninternal/server/transaction/BeanPersistIds.java   | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index a0622868b..b59fc8a11 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -220,7 +220,6 @@ final class BeanDescriptorCacheHelp<T> {
    */
   private void queryCacheClear(CacheChangeSet changeSet) {
     if (queryCache != null) {
-      changeSet.addInvalidate(desc);
       changeSet.addClearQuery(desc);
     }
   }
@@ -910,12 +909,11 @@ final class BeanDescriptorCacheHelp<T> {
       return;
     }
     changeSet.addInvalidate(desc);
+    changeSet.addClearQuery(desc);
     // inserts don't invalidate the bean cache
     if (tableIUD.isUpdateOrDelete()) {
       changeSet.addClearBean(desc);
     }
-    // any change invalidates the query cache
-    changeSet.addClearQuery(desc);
     // any change invalidates the collection IDs cache
     for (BeanPropertyAssocOne<?> imported : propertiesOneImported) {
       imported.cacheClear(changeSet);
diff --git a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
index d7d24eefc..bb1690bfe 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
@@ -128,7 +128,6 @@ public class BeanPersistIds implements BinaryWritable {
    * Notify the cache of this event that came from another server in the cluster.
    */
   public void notifyCache(CacheChangeSet changeSet) {
-    changeSet.addInvalidate(beanDescriptor);
     changeSet.addClearQuery(beanDescriptor);
     if (ids != null) {
       changeSet.addBeanRemoveMany(beanDescriptor, ids);

From cf4d45befbbbc1de7544bf99a8b6f6a4560c5a70 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 20 May 2019 14:37:03 +0200
Subject: [PATCH 0870/1036] refactor: unwrap invocationTargetException (#1718)

---
 .../deploy/BeanLifecycleAdapterFactory.java   |  20 ++-
 .../lifecycle/TestLifecycleExceptions.java    |  47 +++++++
 .../basic/EBasicWithLifecycleExceptions.java  | 130 ++++++++++++++++++
 3 files changed, 194 insertions(+), 3 deletions(-)
 create mode 100644 src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java
 create mode 100644 src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java b/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java
index f9bdcd224..0d525bb81 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java
@@ -145,6 +145,20 @@ class BeanLifecycleAdapterFactory {
     return methodList.toArray(new Method[methodList.size()]);
   }
 
+  static RuntimeException unwrapException(ReflectiveOperationException e) {
+    if (e instanceof InvocationTargetException) {
+      Throwable targetException = ((InvocationTargetException)e).getTargetException();
+      if (targetException instanceof RuntimeException) {
+        // return unchecked exceptions
+        return (RuntimeException) targetException;
+      } else {
+        // wrap checked exceptions
+        return new PersistenceException("Error invoking lifecycle method", targetException);
+      }
+    }
+    return new PersistenceException("Error invoking lifecycle method", e);
+  }
+
   /**
    * Holds Methods for the lifecycle events.s
    */
@@ -192,7 +206,7 @@ class BeanLifecycleAdapterFactory {
       try {
         method.invoke(bean);
       } catch (InvocationTargetException | IllegalAccessException e) {
-        throw new PersistenceException("Error invoking lifecycle method", e);
+        throw unwrapException(e);
       }
     }
 
@@ -268,7 +282,7 @@ class BeanLifecycleAdapterFactory {
       try {
         method.invoke(bean);
       } catch (InvocationTargetException | IllegalAccessException e) {
-        throw new PersistenceException("Error invoking lifecycle method", e);
+        throw unwrapException(e);
       }
     }
 
@@ -301,7 +315,7 @@ class BeanLifecycleAdapterFactory {
       try {
         method.invoke(bean);
       } catch (InvocationTargetException | IllegalAccessException e) {
-        throw new PersistenceException("Error invoking lifecycle method", e);
+        throw unwrapException(e);
       }
     }
 
diff --git a/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java b/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java
new file mode 100644
index 000000000..3e5ddf4a3
--- /dev/null
+++ b/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java
@@ -0,0 +1,47 @@
+package org.tests.lifecycle;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import org.tests.model.basic.EBasicWithLifecycleExceptions;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.io.IOException;
+
+import javax.persistence.PersistenceException;
+
+public class TestLifecycleExceptions extends BaseTestCase {
+
+  @Test
+  public void prePersist_unchecked() {
+    EBasicWithLifecycleExceptions bean = new EBasicWithLifecycleExceptions();
+    bean.preException = new IndexOutOfBoundsException();
+    assertThatThrownBy(() -> DB.save(bean)).isInstanceOf(IndexOutOfBoundsException.class);
+  }
+
+  @Test
+  public void prepersist_checked() {
+    EBasicWithLifecycleExceptions bean = new EBasicWithLifecycleExceptions();
+    bean.preException = new IOException();
+    assertThatThrownBy(() -> DB.save(bean))
+        .isInstanceOf(PersistenceException.class)
+        .hasCauseInstanceOf(IOException.class);
+  }
+
+  @Test
+  public void postPersist_unchecked() {
+    EBasicWithLifecycleExceptions bean = new EBasicWithLifecycleExceptions();
+    bean.postException = new IndexOutOfBoundsException();
+    assertThatThrownBy(() -> DB.save(bean)).isInstanceOf(IndexOutOfBoundsException.class);
+  }
+
+  @Test
+  public void postpersist_checked() {
+    EBasicWithLifecycleExceptions bean = new EBasicWithLifecycleExceptions();
+    bean.postException = new IOException();
+    assertThatThrownBy(() -> DB.save(bean))
+        .isInstanceOf(PersistenceException.class)
+        .hasCauseInstanceOf(IOException.class);
+  }
+}
diff --git a/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java b/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java
new file mode 100644
index 000000000..76c1f00f0
--- /dev/null
+++ b/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java
@@ -0,0 +1,130 @@
+package org.tests.model.basic;
+
+import io.ebean.annotation.PostSoftDelete;
+import io.ebean.annotation.PreSoftDelete;
+import io.ebean.annotation.SoftDelete;
+
+import javax.annotation.PostConstruct;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.PostLoad;
+import javax.persistence.PostPersist;
+import javax.persistence.PostRemove;
+import javax.persistence.PostUpdate;
+import javax.persistence.PrePersist;
+import javax.persistence.PreRemove;
+import javax.persistence.PreUpdate;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name = "e_basic_with_ex")
+public class EBasicWithLifecycleExceptions {
+
+  @Id
+  Long id;
+
+  @SoftDelete
+  boolean deleted;
+
+  @Version
+  Long version;
+
+  public transient Throwable preException;
+  public transient Throwable postException;
+
+  @PrePersist
+  public void prePersist() throws Throwable {
+    if (preException != null) {
+      throw preException;
+    }
+  }
+
+  @PostPersist
+  public void postPersist() throws Throwable {
+    if (postException != null) {
+      throw postException;
+    }
+  }
+
+  @PreUpdate
+  public void preUpdate() throws Throwable {
+    if (preException != null) {
+      throw preException;
+    }
+  }
+
+  @PostUpdate
+  public void postUpdate() throws Throwable {
+    if (postException != null) {
+      throw postException;
+    }
+  }
+
+  @PreRemove
+  public void preRemove() throws Throwable {
+    if (preException != null) {
+      throw preException;
+    }
+  }
+
+  @PostRemove
+  public void postRemove() throws Throwable {
+    if (postException != null) {
+      throw postException;
+    }
+  }
+
+  @PreSoftDelete
+  public void preSoftDelete() throws Throwable {
+    if (preException != null) {
+      throw preException;
+    }
+  }
+
+  @PostSoftDelete
+  public void postSoftDelete() throws Throwable {
+    if (postException != null) {
+      throw postException;
+    }
+  }
+
+  @PostLoad
+  public void postLoad1() throws Throwable {
+    if (postException != null) {
+      throw postException;
+    }
+  }
+
+  @PostConstruct
+  public void postConstruct1() throws Throwable {
+    if (postException != null) {
+      throw postException;
+    }
+  }
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public boolean isDeleted() {
+    return deleted;
+  }
+
+  public void setDeleted(boolean deleted) {
+    this.deleted = deleted;
+  }
+
+  public Long getVersion() {
+    return version;
+  }
+
+  public void setVersion(Long version) {
+    this.version = version;
+  }
+
+}

From 7fbdab6220fb532196644a6bba2b90b06776cf69 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 21 May 2019 00:42:17 +1200
Subject: [PATCH 0871/1036] Refactor TableModState to use nanoTime refactor
 (#1720)

* #1719 - Refactor TableModState to use nanoTime

* Tests only - reduce logging
---
 .../ebean/cache/ServerCacheNotification.java  | 11 ++-------
 .../io/ebeaninternal/api/SpiTransaction.java  |  2 +-
 .../api/SpiTransactionProxy.java              |  4 ++--
 .../ebeaninternal/api/TransactionEvent.java   |  9 +++-----
 .../server/cache/CacheChangeSet.java          | 12 +---------
 .../server/core/InternalConfiguration.java    |  2 +-
 .../server/core/OrmQueryRequest.java          |  4 +---
 .../ImplicitReadOnlyTransaction.java          |  6 ++---
 .../server/transaction/JdbcTransaction.java   | 11 ++++-----
 .../server/transaction/NoTransaction.java     |  4 ++--
 .../transaction/PostCommitProcessing.java     |  4 ++--
 .../server/transaction/RemoteTableMod.java    |  7 +++++-
 .../server/transaction/TableModState.java     | 23 ++++++++-----------
 .../transaction/TransactionManager.java       | 10 ++++----
 .../server/cache/DefaultCacheHolderTest.java  |  7 ++----
 .../BinaryTransactionEventReadWriteTest.java  |  9 ++------
 .../server/transaction/TableModStateTest.java | 23 ++++++++++---------
 src/test/resources/logback-test.xml           |  1 +
 18 files changed, 59 insertions(+), 90 deletions(-)

diff --git a/src/main/java/io/ebean/cache/ServerCacheNotification.java b/src/main/java/io/ebean/cache/ServerCacheNotification.java
index 325003e9f..99c4340ef 100644
--- a/src/main/java/io/ebean/cache/ServerCacheNotification.java
+++ b/src/main/java/io/ebean/cache/ServerCacheNotification.java
@@ -10,22 +10,15 @@ import java.util.Set;
  */
 public class ServerCacheNotification {
 
-  private final long modifyTimestamp;
-
   private final Set<String> dependentTables;
 
-  public ServerCacheNotification(long modifyTimestamp, Set<String> dependentTables) {
-    this.modifyTimestamp = modifyTimestamp;
+  public ServerCacheNotification(Set<String> dependentTables) {
     this.dependentTables = dependentTables;
   }
 
   @Override
   public String toString() {
-    return "ts:" + modifyTimestamp + " tables:" + dependentTables;
-  }
-
-  public long getModifyTimestamp() {
-    return modifyTimestamp;
+    return "tables:" + dependentTables;
   }
 
   public Set<String> getDependentTables() {
diff --git a/src/main/java/io/ebeaninternal/api/SpiTransaction.java b/src/main/java/io/ebeaninternal/api/SpiTransaction.java
index 0882d88ba..9c49f8e02 100644
--- a/src/main/java/io/ebeaninternal/api/SpiTransaction.java
+++ b/src/main/java/io/ebeaninternal/api/SpiTransaction.java
@@ -98,7 +98,7 @@ public interface SpiTransaction extends Transaction {
   /**
    * Return the start timestamp for the transaction (JVM side).
    */
-  long getStartMillis();
+  long getStartNanoTime();
 
   /**
    * Return true if this transaction has updateAllLoadedProperties set.
diff --git a/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java b/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
index 999ac7320..804fb7143 100644
--- a/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
+++ b/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
@@ -29,8 +29,8 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public long getStartMillis() {
-    return transaction.getStartMillis();
+  public long getStartNanoTime() {
+    return transaction.getStartNanoTime();
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/api/TransactionEvent.java b/src/main/java/io/ebeaninternal/api/TransactionEvent.java
index 348dd2a0f..86ee5f474 100644
--- a/src/main/java/io/ebeaninternal/api/TransactionEvent.java
+++ b/src/main/java/io/ebeaninternal/api/TransactionEvent.java
@@ -30,8 +30,6 @@ public class TransactionEvent implements Serializable {
    */
   private final transient boolean local;
 
-  private final long startMillis;
-
   private TransactionEventTable eventTables;
 
   private transient List<PersistRequestBean<?>> listenerNotify;
@@ -43,8 +41,7 @@ public class TransactionEvent implements Serializable {
   /**
    * Create the TransactionEvent, one per Transaction.
    */
-  public TransactionEvent(long startMillis) {
-    this.startMillis = startMillis;
+  public TransactionEvent() {
     this.local = true;
   }
 
@@ -119,7 +116,7 @@ public class TransactionEvent implements Serializable {
     }
 
     if (changeSet == null) {
-      changeSet = new CacheChangeSet(manager.clockNowMillis());
+      changeSet = new CacheChangeSet();
     }
     if (eventTables != null && !eventTables.isEmpty()) {
       // notify cache with table based changes
@@ -154,7 +151,7 @@ public class TransactionEvent implements Serializable {
    */
   public CacheChangeSet obtainCacheChangeSet() {
     if (changeSet == null) {
-      changeSet = new CacheChangeSet(startMillis);
+      changeSet = new CacheChangeSet();
     }
     return changeSet;
   }
diff --git a/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java b/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
index 9a058444e..4fdde31ad 100644
--- a/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
+++ b/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
@@ -28,13 +28,10 @@ public class CacheChangeSet {
 
   private final Map<ManyKey, ManyChange> manyChangeMap = new HashMap<>();
 
-  private final long modificationTimestamp;
-
   /**
    * Construct specifying if we also need to process invalidation for entities based on views.
    */
-  public CacheChangeSet(long modificationTimestamp) {
-    this.modificationTimestamp = modificationTimestamp;
+  public CacheChangeSet() {
   }
 
   /**
@@ -172,13 +169,6 @@ public class CacheChangeSet {
     return manyChangeMap.computeIfAbsent(key, ManyChange::new);
   }
 
-  /**
-   * Return the modification timestamp for these changes.
-   */
-  public long modificationTimestamp() {
-    return modificationTimestamp;
-  }
-
   /**
    * Changes for a specific many property.
    */
diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index bfe2d756e..3d9486be9 100644
--- a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -169,7 +169,7 @@ public class InternalConfiguration {
     this.online = online;
     this.serverConfig = serverConfig;
     this.clockService = new ClockService(serverConfig.getClock());
-    this.tableModState = new TableModState(clockService);
+    this.tableModState = new TableModState();
     this.logManager = initLogManager();
     this.docStoreFactory = initDocStoreFactory(serverConfig.service(DocStoreFactory.class));
     this.jsonFactory = serverConfig.getJsonFactory();
diff --git a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index 9fa93e693..b7543c76d 100644
--- a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -696,9 +696,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
   }
 
   public void putToQueryCache(Object result) {
-    // use transaction start where as query statement start would be better at READ_COMMITTED
-    long asOfTimestamp = transaction.getStartMillis();
-    beanDescriptor.queryCachePut(cacheKey, new QueryCacheEntry(result, dependentTables, asOfTimestamp));
+    beanDescriptor.queryCachePut(cacheKey, new QueryCacheEntry(result, dependentTables, transaction.getStartNanoTime()));
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
index 12c13870f..9e0822e15 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
@@ -65,7 +65,6 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   private Map<String, Object> userObjects;
 
   private long startNanos;
-  private long startMillis;
 
   /**
    * Create without a tenantId.
@@ -78,7 +77,6 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
     this.connection = connection;
     this.persistenceContext = new DefaultPersistenceContext();
     this.startNanos = System.nanoTime();
-    this.startMillis = manager.clockNowMillis();
   }
 
   /**
@@ -90,9 +88,9 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public long getStartMillis() {
+  public long getStartNanoTime() {
     // not used on read only transaction
-    return startMillis;
+    return startNanos;
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index d9b153c16..5e1e258c2 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -185,7 +185,6 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   protected ProfileLocation profileLocation;
 
   protected final long startNanos;
-  private final long startMillis;
 
   /**
    * Create a new JdbcTransaction.
@@ -202,7 +201,6 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
       this.startNanos = System.nanoTime();
 
       if (manager == null) {
-        this.startMillis = System.currentTimeMillis();
         this.logSql = false;
         this.logSummary = false;
         this.skipCacheAfterWrite = true;
@@ -210,7 +208,6 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
         this.batchOnCascadeMode = false;
         this.onQueryOnly = OnQueryOnly.ROLLBACK;
       } else {
-        this.startMillis = manager.clockNowMillis();
         this.logSql = manager.isLogSql();
         this.logSummary = manager.isLogSummary();
         this.skipCacheAfterWrite = manager.isSkipCacheAfterWrite();
@@ -237,8 +234,8 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public long getStartMillis() {
-    return startMillis;
+  public long getStartNanoTime() {
+    return startNanos;
   }
 
   @Override
@@ -827,7 +824,7 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   public TransactionEvent getEvent() {
     queryOnly = false;
     if (event == null) {
-      event = new TransactionEvent(startMillis);
+      event = new TransactionEvent();
     }
     return event;
   }
@@ -1024,7 +1021,7 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
       // the event has been sent to the transaction manager
       // for postCommit processing (l2 cache updates etc)
       // start a new transaction event
-      event = new TransactionEvent(startMillis);
+      event = new TransactionEvent();
 
     } catch (Exception e) {
       doRollback(e);
diff --git a/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
index e357e5a79..e9ae56065 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
@@ -46,9 +46,9 @@ class NoTransaction implements SpiTransaction {
   }
 
   @Override
-  public long getStartMillis() {
+  public long getStartNanoTime() {
     // not used
-    return System.currentTimeMillis();
+    return System.nanoTime();
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java b/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
index 9797ef59f..77eec289d 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
@@ -145,9 +145,9 @@ final class PostCommitProcessing {
     if (cacheChanges != null) {
       Set<String> touched = cacheChanges.touchedTables();
       if (touched != null && !touched.isEmpty()) {
-        manager.processTouchedTables(touched, cacheChanges.modificationTimestamp());
+        manager.processTouchedTables(touched);
         if (remoteTransactionEvent != null) {
-          remoteTransactionEvent.addRemoteTableMod(new RemoteTableMod(cacheChanges.modificationTimestamp(), touched));
+          remoteTransactionEvent.addRemoteTableMod(new RemoteTableMod(touched));
         }
       }
       cacheChanges.apply();
diff --git a/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java b/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java
index 8e6316a58..f963aad71 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java
@@ -15,7 +15,12 @@ public class RemoteTableMod implements BinaryWritable {
 
   private final Set<String> tables;
 
-  public RemoteTableMod(long timestamp, Set<String> tables) {
+  public RemoteTableMod(Set<String> tables) {
+    this.tables = tables;
+    this.timestamp = System.currentTimeMillis();
+  }
+
+  private RemoteTableMod(long timestamp, Set<String> tables) {
     this.timestamp = timestamp;
     this.tables = tables;
   }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TableModState.java b/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
index 29b116aee..70d2ae6b2 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
@@ -4,7 +4,6 @@ import io.ebean.cache.QueryCacheEntry;
 import io.ebean.cache.QueryCacheEntryValidate;
 import io.ebean.cache.ServerCacheNotification;
 import io.ebean.cache.ServerCacheNotify;
-import io.ebeaninternal.server.core.ClockService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -22,33 +21,31 @@ public class TableModState implements QueryCacheEntryValidate, ServerCacheNotify
 
   private static final Logger log = LoggerFactory.getLogger("io.ebean.cache.TABLEMOD");
 
-  private final ClockService clockService;
+  private Map<String, Long> tableModStamp = new ConcurrentHashMap<>();
 
-  private Map<String,Long> tableModStamp = new ConcurrentHashMap<>();
-
-  public TableModState(ClockService clockService) {
-    this.clockService = clockService;
+  public TableModState() {
   }
 
   /**
    * Set the modified timestamp on the tables that have been touched.
    */
-  void touch(Set<String> touchedTables, long modTimestamp) {
+  void touch(Set<String> touchedTables) {
+    long modNanoTime = System.nanoTime();
     for (String tableName : touchedTables) {
-      tableModStamp.put(tableName, modTimestamp);
+      tableModStamp.put(tableName, modNanoTime);
     }
     if (log.isDebugEnabled()) {
-      log.debug("TableModState updated - touched:{} modTimestamp:{}", touchedTables, modTimestamp);
+      log.debug("TableModState updated - touched:{} modNanoTime:{}", touchedTables, modNanoTime);
     }
   }
 
   /**
    * Return true if all the tables are valid based on timestamp comparison.
    */
-  boolean isValid(Set<String> tables, long sinceTimestamp) {
+  boolean isValid(Set<String> tables, long sinceNanoTime) {
     for (String tableName : tables) {
       Long modTime = tableModStamp.get(tableName);
-      if (modTime != null && modTime >= sinceTimestamp ) {
+      if (modTime != null && modTime >= sinceNanoTime) {
         if (log.isTraceEnabled()) {
           log.trace("Invalidate on table:{}", tableName);
         }
@@ -81,7 +78,7 @@ public class TableModState implements QueryCacheEntryValidate, ServerCacheNotify
     if (log.isDebugEnabled()) {
       log.debug("ServerCacheNotification:{}", notification);
     }
-    touch(notification.getDependentTables(), clockService.nowMillis());
+    touch(notification.getDependentTables());
   }
 
   /**
@@ -97,6 +94,6 @@ public class TableModState implements QueryCacheEntryValidate, ServerCacheNotify
     if (log.isDebugEnabled()) {
       log.debug("RemoteTableMod:{}", tableMod);
     }
-    touch(tableMod.getTables(), clockService.nowMillis());
+    touch(tableMod.getTables());
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index 14d4e7d72..c1d5aadd9 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -452,7 +452,7 @@ public class TransactionManager implements SpiTransactionManager {
 
   private void externalModificationEvent(TransactionEventTable tableEvents) {
 
-    TransactionEvent event = new TransactionEvent(clockNowMillis());
+    TransactionEvent event = new TransactionEvent();
     event.add(tableEvents);
 
     PostCommitProcessing postCommit = new PostCommitProcessing(clusterManager, this, event);
@@ -469,7 +469,7 @@ public class TransactionManager implements SpiTransactionManager {
       clusterLogger.debug("processing {}", remoteEvent);
     }
 
-    CacheChangeSet changeSet = new CacheChangeSet(clockNowMillis());
+    CacheChangeSet changeSet = new CacheChangeSet();
 
     RemoteTableMod tableMod = remoteEvent.getRemoteTableMod();
     if (tableMod != null) {
@@ -522,12 +522,12 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Invalidate the query caches for entities based on views.
    */
-  public void processTouchedTables(Set<String> touchedTables, long modTimestamp) {
-    tableModState.touch(touchedTables, modTimestamp);
+  public void processTouchedTables(Set<String> touchedTables) {
+    tableModState.touch(touchedTables);
     if (viewInvalidation) {
       beanDescriptorManager.processViewInvalidation(touchedTables);
     }
-    cacheNotify.notify(new ServerCacheNotification(modTimestamp, touchedTables));
+    cacheNotify.notify(new ServerCacheNotification(touchedTables));
   }
 
   /**
diff --git a/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java b/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java
index 3b8a42ded..d88f42719 100644
--- a/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java
+++ b/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java
@@ -4,13 +4,10 @@ import io.ebean.cache.ServerCacheFactory;
 import io.ebean.cache.ServerCacheOptions;
 import io.ebean.cache.ServerCacheType;
 import io.ebean.config.ServerConfig;
-import io.ebeaninternal.server.core.ClockService;
 import io.ebeaninternal.server.transaction.TableModState;
+import org.junit.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
-import org.junit.Test;
-
-import java.time.Clock;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -25,7 +22,7 @@ public class DefaultCacheHolderTest {
   private CacheManagerOptions options() {
     return new CacheManagerOptions(null, new ServerConfig(), true)
       .with(defaultOptions, defaultOptions)
-      .with(cacheFactory, new TableModState(new ClockService(Clock.systemUTC())));
+      .with(cacheFactory, new TableModState());
   }
 
 
diff --git a/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java b/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java
index afeff01d3..9776ed6a5 100644
--- a/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java
+++ b/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java
@@ -41,11 +41,10 @@ public class BinaryTransactionEventReadWriteTest extends BaseTestCase {
 
     RemoteTransactionEvent event = new RemoteTransactionEvent("db");
 
-    long timestamp = System.currentTimeMillis();
     Set<String> tables = new HashSet<>();
     Collections.addAll(tables, "one", "two", "three");
 
-    event.addRemoteTableMod(new RemoteTableMod(timestamp, tables));
+    event.addRemoteTableMod(new RemoteTableMod(tables));
     event.addRemoteCacheEvent(new RemoteCacheEvent(Customer.class));
 
     event.addTableIUD(new TransactionEventTable.TableIUD("foo", true, false, true));
@@ -70,7 +69,6 @@ public class BinaryTransactionEventReadWriteTest extends BaseTestCase {
 
     // table mod
     RemoteTableMod remoteTableMod = read.getRemoteTableMod();
-    assertThat(remoteTableMod.getTimestamp()).isEqualTo(timestamp);
     assertThat(remoteTableMod.getTables()).isEqualTo(tables);
 
     // Bean persist ids
@@ -84,18 +82,15 @@ public class BinaryTransactionEventReadWriteTest extends BaseTestCase {
 
     RemoteTransactionEvent event = new RemoteTransactionEvent("db");
 
-    long timestamp = System.currentTimeMillis();
     Set<String> tables = new HashSet<>();
     Collections.addAll(tables, "one", "two", "three");
 
-    event.addRemoteTableMod(new RemoteTableMod(timestamp, tables));
+    event.addRemoteTableMod(new RemoteTableMod(tables));
 
     byte[] binaryMessage = event.writeBinaryAsBytes(256);
     RemoteTransactionEvent read = reader.read(binaryMessage);
 
     RemoteTableMod remoteTableMod = read.getRemoteTableMod();
-
-    assertThat(remoteTableMod.getTimestamp()).isEqualTo(timestamp);
     assertThat(remoteTableMod.getTables()).isEqualTo(tables);
   }
 
diff --git a/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java b/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java
index 1fb80996c..f2ab59bd9 100644
--- a/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java
+++ b/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java
@@ -1,25 +1,26 @@
 package io.ebeaninternal.server.transaction;
 
-import io.ebeaninternal.server.core.ClockService;
 import org.junit.Test;
 
-import java.time.Clock;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 public class TableModStateTest {
 
-  private TableModState tableModState = new TableModState(new ClockService(Clock.systemUTC()));
+  private TableModState tableModState = new TableModState();
 
   @Test
   public void isValid() {
 
-    long now = System.currentTimeMillis();
+    long before = System.nanoTime();
 
-    tableModState.touch(setOf("one", "two", "three"), now);
+    tableModState.touch(setOf("one", "two", "three"));
+
+    long after = System.nanoTime();
 
     // empty
     assertTrue(tableModState.isValid(Collections.emptySet(), 12L));
@@ -28,13 +29,13 @@ public class TableModStateTest {
     assertTrue(tableModState.isValid(setOf("noEntry"), 12L));
 
     // later timestamp
-    assertTrue(tableModState.isValid(setOf("one"), now + 1));
-    assertTrue(tableModState.isValid(setOf("one", "two", "noEntry"), now + 1));
+    assertTrue(tableModState.isValid(setOf("one"), after));
+    assertTrue(tableModState.isValid(setOf("one", "two", "noEntry"), after));
 
     // invalid
-    assertFalse(tableModState.isValid(setOf("one"), now - 1));
-    assertFalse(tableModState.isValid(setOf("one", "two"), now - 1));
-    assertFalse(tableModState.isValid(setOf("three", "two"), now - 1));
+    assertFalse(tableModState.isValid(setOf("one"), before));
+    assertFalse(tableModState.isValid(setOf("one", "two"), before));
+    assertFalse(tableModState.isValid(setOf("three", "two"), before));
 
   }
 
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
index 9dfb9aab1..8d4ee5d7c 100644
--- a/src/test/resources/logback-test.xml
+++ b/src/test/resources/logback-test.xml
@@ -83,6 +83,7 @@
 <!--  <logger name="io.ebean.TXN" level="TRACE"/>-->
 <!--  <logger name="io.ebean.SUM" level="TRACE"/>-->
 
+<!--  <logger name="io.ebean.cache" level="TRACE"/>-->
 <!--  <logger name="io.ebean.cache.REGION" level="TRACE"/>-->
 <!--  <logger name="io.ebean.cache.TABLEMOD" level="TRACE"/>-->
 

From 0762eaf0abee361cef25bb410df4f012a0a6fd9c Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 20 May 2019 23:12:43 +0200
Subject: [PATCH 0872/1036] changed test to detect issue #1717 (#1721)

---
 src/test/java/org/tests/model/basic/cache/ECacheChild.java | 2 +-
 src/test/java/org/tests/model/basic/cache/ECacheRoot.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/tests/model/basic/cache/ECacheChild.java b/src/test/java/org/tests/model/basic/cache/ECacheChild.java
index d14ae5e4d..fb96be1d3 100644
--- a/src/test/java/org/tests/model/basic/cache/ECacheChild.java
+++ b/src/test/java/org/tests/model/basic/cache/ECacheChild.java
@@ -12,7 +12,7 @@ import javax.validation.constraints.Size;
 import io.ebean.annotation.Cache;
 
 @Entity
-@Cache(enableQueryCache = true)
+@Cache(enableQueryCache = true, enableBeanCache = false)
 public class ECacheChild {
 
   @Id
diff --git a/src/test/java/org/tests/model/basic/cache/ECacheRoot.java b/src/test/java/org/tests/model/basic/cache/ECacheRoot.java
index 10b9ef9df..5c9925c35 100644
--- a/src/test/java/org/tests/model/basic/cache/ECacheRoot.java
+++ b/src/test/java/org/tests/model/basic/cache/ECacheRoot.java
@@ -10,7 +10,7 @@ import javax.validation.constraints.Size;
 import io.ebean.annotation.Cache;
 
 @Entity
-@Cache(enableQueryCache = true)
+@Cache(enableQueryCache = true, enableBeanCache = false)
 public class ECacheRoot {
 
   @Id

From 3829613c37260df89085ec205886d04caf4f70a3 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 21 May 2019 09:17:07 +1200
Subject: [PATCH 0873/1036] #1717 #1721 - Fix for table touch with query cache
 clear

---
 src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java  | 1 +
 .../io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java b/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
index 4fdde31ad..b25ba9ce5 100644
--- a/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
+++ b/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
@@ -83,6 +83,7 @@ public class CacheChangeSet {
    */
   public void addClearQuery(BeanDescriptor<?> descriptor) {
     queryCaches.add(descriptor);
+    touchedTables.add(descriptor.getBaseTable());
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index b59fc8a11..329846ff2 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -908,7 +908,6 @@ final class BeanDescriptorCacheHelp<T> {
     if (noCaching) {
       return;
     }
-    changeSet.addInvalidate(desc);
     changeSet.addClearQuery(desc);
     // inserts don't invalidate the bean cache
     if (tableIUD.isUpdateOrDelete()) {

From a94f5d74cac3e7519e7f5001258b6275f3644fb6 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 21 May 2019 16:59:39 +1200
Subject: [PATCH 0874/1036] No effective change - add test for select formula
 with positioned parameters

---
 .../java/io/ebean/DtoQueryFromOrmTest.java    | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
index 95e3830db..7b26a3181 100644
--- a/src/test/java/io/ebean/DtoQueryFromOrmTest.java
+++ b/src/test/java/io/ebean/DtoQueryFromOrmTest.java
@@ -12,6 +12,7 @@ import org.junit.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.ResetBasicData;
 
+import java.time.OffsetDateTime;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -69,6 +70,49 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     assertThat(stats.get(0).getCount()).isEqualTo(4);
   }
 
+  @ForPlatform(Platform.H2)
+  @Test
+  public void selectFormulaWith_bindPositionedParameters() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    List<Contact> list = DB.find(Contact.class)
+      .select("email, concat(lastName, ISO_WEEK(?)) as lastName")
+      .setMaxRows(10)
+      .setParameter(1, OffsetDateTime.now())
+      .findList();
+
+    assertThat(list).isNotEmpty();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("select t0.id, t0.email, concat(t0.last_name, ISO_WEEK(?)) lastName from contact");
+  }
+
+//  @ForPlatform(Platform.H2)
+//  @Test
+//  public void selectFormulaWith_bindNamedParameters_FAILS_namedParamsNotSupportedInSelectClause() {
+//
+//    ResetBasicData.reset();
+//
+//    LoggedSqlCollector.start();
+//
+//    List<Contact> list = DB.find(Contact.class)
+//      .select("email, concat(lastName, ISO_WEEK(:date)) as lastName")
+//      .setMaxRows(10)
+//      .setParameter("date", OffsetDateTime.now())
+//      .findList();
+//
+//
+//    assertThat(list).isNotEmpty();
+//
+//    List<String> sql = LoggedSqlCollector.stop();
+//    assertThat(sql).hasSize(2);
+//    assertThat(sql.get(0)).contains("select t0.id, t0.email, concat(t0.last_name, ISO_WEEK(?)) lastName from contact");
+//  }
+
   @Test
   public void asDto_withExplicitId() {
 

From b8fd2c7a0219754e090f75e598894e5c6088f00b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 22 May 2019 21:46:49 +1200
Subject: [PATCH 0875/1036] Bump to 11.39.1-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0b8c9e0a2..1eac10371 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.38.2-SNAPSHOT</version>
+  <version>11.39.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>

From 9b8b4414c48ceb27e4d240abb6071e1a49e7378f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 22 May 2019 22:21:35 +1200
Subject: [PATCH 0876/1036] Bump agent and ebean-migration

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1eac10371..313b33d53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>11.15.1</version>
+      <version>11.16.1</version>
     </dependency>
 
     <dependency>
@@ -250,7 +250,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-agent</artifactId>
-      <version>11.38.1</version>
+      <version>11.39.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -330,7 +330,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>11.38.1</version>
+        <version>11.39.1</version>
         <executions>
           <execution>
             <id>test</id>

From b4e22a4ca75106ccfb7834706ffd163958b7f962 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 22 May 2019 22:23:19 +1200
Subject: [PATCH 0877/1036] [maven-release-plugin] prepare release
 ebean-11.39.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 313b33d53..1b61a620b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.39.1-SNAPSHOT</version>
+  <version>11.39.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.39.1</tag>
   </scm>
 
   <profiles>

From aececa2199caa1b6e7c09997999e40b8d5712be2 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 22 May 2019 22:23:33 +1200
Subject: [PATCH 0878/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1b61a620b..ec712d065 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.39.1</version>
+  <version>11.39.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.39.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 3bf9dd6743382056cd0a96096386575a7c9ee8cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sn=C5=8Dwball?= <tobias@olsson.be>
Date: Thu, 23 May 2019 16:04:40 +0200
Subject: [PATCH 0879/1036] Testcase for ebean with circular dependences

1. While the javax.persistance api discourages the use of bidirectional
   cascades, it does not prohibit them. They're very useful and natural
   if you think of the database as a graph instead of a tree.
   test case 1 (testCircularCascade) tests this.
2. Second test case fetches the child, but saves the parent. If used like
   that, the child will not have it's changes saved.
---
 .../tests/update/TestUpdateCircularSave.java  | 75 +++++++++++++++++++
 .../java/org/tests/update/objects/Child.java  | 52 +++++++++++++
 .../java/org/tests/update/objects/Parent.java | 43 +++++++++++
 .../org/tests/update/objects/SiblingA.java    | 43 +++++++++++
 .../org/tests/update/objects/SiblingB.java    | 53 +++++++++++++
 5 files changed, 266 insertions(+)
 create mode 100644 src/test/java/org/tests/update/TestUpdateCircularSave.java
 create mode 100644 src/test/java/org/tests/update/objects/Child.java
 create mode 100644 src/test/java/org/tests/update/objects/Parent.java
 create mode 100644 src/test/java/org/tests/update/objects/SiblingA.java
 create mode 100644 src/test/java/org/tests/update/objects/SiblingB.java

diff --git a/src/test/java/org/tests/update/TestUpdateCircularSave.java b/src/test/java/org/tests/update/TestUpdateCircularSave.java
new file mode 100644
index 000000000..34b78c760
--- /dev/null
+++ b/src/test/java/org/tests/update/TestUpdateCircularSave.java
@@ -0,0 +1,75 @@
+package org.tests.update;
+
+import static org.junit.Assert.assertTrue;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.junit.Test;
+import org.tests.update.objects.SiblingA;
+import org.tests.update.objects.Parent;
+import org.tests.update.objects.SiblingB;
+import org.tests.update.objects.Child;
+
+public class TestUpdateCircularSave extends BaseTestCase {
+
+  @Test
+  public void testCircularCascade() {
+
+    long aId = createA();
+    modifyPropertyToTrue(aId);
+
+    SiblingA siblingA = Ebean.find(SiblingA.class, aId);
+    assert siblingA != null;
+    assertTrue(siblingA.getSiblingB().isTestProperty());
+  }
+
+  private void modifyPropertyToTrue(long aId) {
+    SiblingA siblingA = Ebean.find(SiblingA.class, aId);
+    assert siblingA != null;
+
+    final SiblingB siblingB = siblingA.getSiblingB();
+    siblingB.setTestProperty(true);
+    // Will get optimistic lock as version is increased twice on B
+    Ebean.save(siblingB);
+  }
+
+  private long createA() {
+    SiblingA siblingA = new SiblingA();
+    SiblingB siblingB = new SiblingB();
+    siblingA.setSiblingB(siblingB);
+
+    Ebean.save(siblingA);
+    return siblingA.getId();
+  }
+
+
+  @Test
+  public void testFetchChildSaveParent() {
+
+    long dId = createCAndD();
+    modifyPropertyToTrue2(dId);
+
+    Parent parent = Ebean.find(Parent.class, dId);
+    assert parent != null;
+    // Fails here because D was not saved even though C has cascade = ALL
+    assertTrue(parent.getChild().isTestProperty());
+  }
+
+  private void modifyPropertyToTrue2(long dId) {
+    Child child = Ebean.find(Child.class, dId);
+    assert child != null;
+
+    child.setTestProperty(true);
+    final Parent parent = child.getParent();
+    Ebean.save(parent);
+  }
+
+  private long createCAndD() {
+    Parent parent = new Parent();
+    Child child = new Child();
+    parent.setChild(child);
+
+    Ebean.save(parent);
+    return parent.getChild().getId();
+  }
+}
diff --git a/src/test/java/org/tests/update/objects/Child.java b/src/test/java/org/tests/update/objects/Child.java
new file mode 100644
index 000000000..37a70d9b6
--- /dev/null
+++ b/src/test/java/org/tests/update/objects/Child.java
@@ -0,0 +1,52 @@
+package org.tests.update.objects;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name = "e_save_test_d")
+public class Child {
+  @Id
+  private Long id;
+  @Version
+  private long version = 0L;
+  @OneToOne(mappedBy = "child")
+  private Parent parent;
+
+  private boolean testProperty = false;
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+
+  public Parent getParent() {
+    return parent;
+  }
+
+  public void setParent(Parent parent) {
+    this.parent = parent;
+  }
+
+  public boolean isTestProperty() {
+    return testProperty;
+  }
+
+  public void setTestProperty(boolean testProperty) {
+    this.testProperty = testProperty;
+  }
+}
diff --git a/src/test/java/org/tests/update/objects/Parent.java b/src/test/java/org/tests/update/objects/Parent.java
new file mode 100644
index 000000000..edd587969
--- /dev/null
+++ b/src/test/java/org/tests/update/objects/Parent.java
@@ -0,0 +1,43 @@
+package org.tests.update.objects;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name = "e_save_test_c")
+public class Parent {
+  @Id
+  private Long id;
+  @Version
+  private long version = 0L;
+  @OneToOne(cascade = CascadeType.ALL)
+  private Child child;
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+
+  public Child getChild() {
+    return child;
+  }
+
+  public void setChild(Child child) {
+    this.child = child;
+  }
+}
diff --git a/src/test/java/org/tests/update/objects/SiblingA.java b/src/test/java/org/tests/update/objects/SiblingA.java
new file mode 100644
index 000000000..2e5806657
--- /dev/null
+++ b/src/test/java/org/tests/update/objects/SiblingA.java
@@ -0,0 +1,43 @@
+package org.tests.update.objects;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name = "e_save_test_a")
+public class SiblingA {
+  @Id
+  private Long id;
+  @Version
+  private long version = 0L;
+  @OneToOne(cascade = CascadeType.ALL, mappedBy = "siblingA")
+  private SiblingB siblingB;
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+
+  public SiblingB getSiblingB() {
+    return siblingB;
+  }
+
+  public void setSiblingB(SiblingB siblingB) {
+    this.siblingB = siblingB;
+  }
+}
diff --git a/src/test/java/org/tests/update/objects/SiblingB.java b/src/test/java/org/tests/update/objects/SiblingB.java
new file mode 100644
index 000000000..63b358645
--- /dev/null
+++ b/src/test/java/org/tests/update/objects/SiblingB.java
@@ -0,0 +1,53 @@
+package org.tests.update.objects;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name = "e_save_test_b")
+public class SiblingB {
+  @Id
+  private Long id;
+  @Version
+  private long version = 0L;
+  @OneToOne(cascade = CascadeType.ALL)
+  private SiblingA siblingA;
+
+  private boolean testProperty = false;
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+
+  public SiblingA getSiblingA() {
+    return siblingA;
+  }
+
+  public void setSiblingA(SiblingA siblingA) {
+    this.siblingA = siblingA;
+  }
+
+  public boolean isTestProperty() {
+    return testProperty;
+  }
+
+  public void setTestProperty(boolean testProperty) {
+    this.testProperty = testProperty;
+  }
+}

From 52644647e404b177c1715b398661d75656ffcc25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sn=C5=8Dwball?= <tobias@olsson.be>
Date: Mon, 27 May 2019 10:06:09 +0200
Subject: [PATCH 0880/1036] Add another test case for circular dependencies

---
 .../tests/update/TestUpdateCircularSave.java  | 43 +++++++++++++------
 .../java/org/tests/update/objects/Child.java  |  2 +-
 .../java/org/tests/update/objects/Parent.java |  2 +-
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/test/java/org/tests/update/TestUpdateCircularSave.java b/src/test/java/org/tests/update/TestUpdateCircularSave.java
index 34b78c760..6d82e5fe0 100644
--- a/src/test/java/org/tests/update/TestUpdateCircularSave.java
+++ b/src/test/java/org/tests/update/TestUpdateCircularSave.java
@@ -1,5 +1,6 @@
 package org.tests.update;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import io.ebean.BaseTestCase;
@@ -44,32 +45,48 @@ public class TestUpdateCircularSave extends BaseTestCase {
 
 
   @Test
-  public void testFetchChildSaveParent() {
+  public void testFetchChildModifyChildSaveParent() {
 
-    long dId = createCAndD();
-    modifyPropertyToTrue2(dId);
+    long childId = createParentAndChild().getChild().getId();
 
-    Parent parent = Ebean.find(Parent.class, dId);
-    assert parent != null;
-    // Fails here because D was not saved even though C has cascade = ALL
-    assertTrue(parent.getChild().isTestProperty());
-  }
-
-  private void modifyPropertyToTrue2(long dId) {
-    Child child = Ebean.find(Child.class, dId);
+    Child child = Ebean.find(Child.class, childId);
     assert child != null;
 
     child.setTestProperty(true);
     final Parent parent = child.getParent();
     Ebean.save(parent);
+
+    assertChildModified(childId);
   }
 
-  private long createCAndD() {
+  private void assertChildModified(long childId) {
+    Parent parent = Ebean.find(Parent.class, childId);
+    assert parent != null;
+    // Fails here because D was not saved even though C has cascade = ALL
+    assertTrue(parent.getChild().isTestProperty());
+    assertEquals(parent.getChild().getVersion(), 2L);
+  }
+
+  private Parent createParentAndChild() {
     Parent parent = new Parent();
     Child child = new Child();
     parent.setChild(child);
 
     Ebean.save(parent);
-    return parent.getChild().getId();
+    return parent;
+  }
+
+
+  @Test
+  public void testFetchParentModifyChildSaveParent() {
+    long parentId = createParentAndChild().getId();
+
+    Parent parent = Ebean.find(Parent.class, parentId);
+    assert parent != null;
+
+    parent.getChild().setTestProperty(true);
+    Ebean.save(parent);
+
+    assertChildModified(parent.getChild().getId());
   }
 }
diff --git a/src/test/java/org/tests/update/objects/Child.java b/src/test/java/org/tests/update/objects/Child.java
index 37a70d9b6..b8a91a2b7 100644
--- a/src/test/java/org/tests/update/objects/Child.java
+++ b/src/test/java/org/tests/update/objects/Child.java
@@ -13,7 +13,7 @@ public class Child {
   private Long id;
   @Version
   private long version = 0L;
-  @OneToOne(mappedBy = "child")
+  @OneToOne
   private Parent parent;
 
   private boolean testProperty = false;
diff --git a/src/test/java/org/tests/update/objects/Parent.java b/src/test/java/org/tests/update/objects/Parent.java
index edd587969..bdcfa58f9 100644
--- a/src/test/java/org/tests/update/objects/Parent.java
+++ b/src/test/java/org/tests/update/objects/Parent.java
@@ -14,7 +14,7 @@ public class Parent {
   private Long id;
   @Version
   private long version = 0L;
-  @OneToOne(cascade = CascadeType.ALL)
+  @OneToOne(cascade = CascadeType.ALL, mappedBy = "parent")
   private Child child;
 
   public Long getId() {

From c14cb4b85ea1fdff6f2760723c18e012bee49eb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sn=C5=8Dwball?= <tobias@olsson.be>
Date: Tue, 4 Jun 2019 11:56:25 +0200
Subject: [PATCH 0881/1036] Add (failing) java 11 to travis - date time parsing
 with nanos precision (#1724)

* Add (failing) java 11 to travis

* Extra test-case for date parser
---
 .travis.yml                                                  | 1 +
 .../io/ebeaninternal/server/type/UtilDateTimeParserTest.java | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 2126f0a28..5fcaa8a7e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ sudo: required
 language: java
 jdk:
   - oraclejdk8
+  - openjdk11
 
 git:
   depth: 3
diff --git a/src/test/java/io/ebeaninternal/server/type/UtilDateTimeParserTest.java b/src/test/java/io/ebeaninternal/server/type/UtilDateTimeParserTest.java
index c27e73810..69ee6dde1 100644
--- a/src/test/java/io/ebeaninternal/server/type/UtilDateTimeParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/UtilDateTimeParserTest.java
@@ -36,6 +36,11 @@ public class UtilDateTimeParserTest {
     parseAndFormat("2016-02-28T20:39:00.000Z", "2016-02-28T20:39:00.000Z");
   }
 
+  @Test
+  public void parseFormat_when_millis_3dp_2() {
+    parseAndFormat("2016-02-28T20:39:32.999000Z", "2016-02-28T20:39:32.999Z");
+  }
+
   private void parseAndFormat(String input, String expected) {
     Timestamp timestamp = parser.parse(input);
     String format = parser.format(timestamp);

From 385cc76e349a50600b76fa3dc2cf9a7fc8ea9109 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 4 Jun 2019 22:20:28 +1200
Subject: [PATCH 0882/1036] #1724 - Fix, UtilDateTimeParser - date time parsing
 with nanos precision

---
 .../server/type/UtilDateTimeParser.java       | 51 ++++---------------
 1 file changed, 11 insertions(+), 40 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/type/UtilDateTimeParser.java b/src/main/java/io/ebeaninternal/server/type/UtilDateTimeParser.java
index 3b4a8ff84..0b1de6d3b 100644
--- a/src/main/java/io/ebeaninternal/server/type/UtilDateTimeParser.java
+++ b/src/main/java/io/ebeaninternal/server/type/UtilDateTimeParser.java
@@ -1,57 +1,28 @@
 package io.ebeaninternal.server.type;
 
 import java.sql.Timestamp;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.format.DateTimeParseException;
 import java.util.Date;
-import java.util.TimeZone;
 
 class UtilDateTimeParser {
 
-  private final SimpleDateFormat dateTimeProto20;
-  private final SimpleDateFormat dateTimeProto22;
-  private final SimpleDateFormat dateTimeProto23;
-  private final SimpleDateFormat dateTimeProto24;
-
-  UtilDateTimeParser() {
-    dateTimeProto20 = init("yyyy-MM-dd'T'HH:mm:ss'Z'");
-    dateTimeProto22 = init("yyyy-MM-dd'T'HH:mm:ss.S'Z'");
-    dateTimeProto23 = init("yyyy-MM-dd'T'HH:mm:ss.SS'Z'");
-    dateTimeProto24 = init("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
-  }
-
-  private SimpleDateFormat init(String dateTimeFormat) {
-    SimpleDateFormat sdf = new SimpleDateFormat(dateTimeFormat);
-    sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
-    return sdf;
-  }
-
-  private SimpleDateFormat dtFormat(int length) {
-    switch (length) {
-      case 24:
-        return (SimpleDateFormat) dateTimeProto24.clone();
-      case 23:
-        return (SimpleDateFormat) dateTimeProto23.clone();
-      case 22:
-        return (SimpleDateFormat) dateTimeProto22.clone();
-      case 20:
-        return (SimpleDateFormat) dateTimeProto20.clone();
-      default:
-        return (SimpleDateFormat) dateTimeProto24.clone();
-    }
-  }
+  private static final DateTimeFormatter ISO_MILLIS = new DateTimeFormatterBuilder()
+    .parseCaseInsensitive()
+    .appendInstant(3)
+    .toFormatter();
 
   public Timestamp parse(String jsonDateTime) {
     try {
-      java.util.Date d = dtFormat(jsonDateTime.length()).parse(jsonDateTime);
-      return new Timestamp(d.getTime());
-    } catch (ParseException e) {
+      return Timestamp.from(Instant.parse(jsonDateTime));
+    } catch (DateTimeParseException e) {
       throw new RuntimeException("Error parsing Datetime[" + jsonDateTime + "]", e);
     }
   }
 
   public String format(Date value) {
-    // always format with millisecond precision
-    return dtFormat(24).format(value);
+    return ISO_MILLIS.format(value.toInstant());
   }
 }

From 9067508e1d4e3048562f93a703a0bbb728d9559b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20P=C3=B6hler=20=28JPo=29?= <jonas.poehler@foconis.de>
Date: Fri, 7 Jun 2019 13:42:31 +0200
Subject: [PATCH 0883/1036] Add testcase for wrong batch sorting

---
 .../tests/cascade/TestMultiCascadeBatch.java  | 55 +++++++++++++
 .../org/tests/model/site/DataContainer.java   | 31 +++++++
 src/test/java/org/tests/model/site/Site.java  | 80 +++++++++++++++++++
 .../org/tests/model/site/SiteAddress.java     | 50 ++++++++++++
 4 files changed, 216 insertions(+)
 create mode 100644 src/test/java/org/tests/cascade/TestMultiCascadeBatch.java
 create mode 100644 src/test/java/org/tests/model/site/DataContainer.java
 create mode 100644 src/test/java/org/tests/model/site/Site.java
 create mode 100644 src/test/java/org/tests/model/site/SiteAddress.java

diff --git a/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java b/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java
new file mode 100644
index 000000000..1e23d0cb0
--- /dev/null
+++ b/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java
@@ -0,0 +1,55 @@
+package org.tests.cascade;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.Transaction;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.tests.model.site.DataContainer;
+import org.tests.model.site.Site;
+import org.tests.model.site.SiteAddress;
+
+public class TestMultiCascadeBatch extends BaseTestCase {
+
+  private Transaction txn;
+
+  @Before
+  public void before() {
+    txn = Ebean.beginTransaction();
+  }
+
+  @After
+  public void after() {
+    if (txn != null) {
+      txn.end();
+    }
+  }
+
+  @Test
+  public void testMultipleCascadeInsideTransaction() {
+    final Site mainSite = new Site();
+    mainSite.setName("mainSite");
+    Ebean.save(mainSite);
+
+    // create child including data
+    final Site childSite = new Site();
+    childSite.setName("childSite");
+
+    final SiteAddress childAddress = new SiteAddress();
+    childAddress.setCity("Some city");
+    childAddress.setStreet("some street");
+    childAddress.setZipCode("12345");
+    childSite.setSiteAddress(childAddress);
+
+    final DataContainer dataContainer = new DataContainer();
+    dataContainer.setContent("container content");
+    childSite.setDataContainer(dataContainer);
+
+    mainSite.getChildren().add(childSite);
+    mainSite.setName("a different name");
+
+    Ebean.save(mainSite);
+  }
+
+}
diff --git a/src/test/java/org/tests/model/site/DataContainer.java b/src/test/java/org/tests/model/site/DataContainer.java
new file mode 100644
index 000000000..47c91a6e1
--- /dev/null
+++ b/src/test/java/org/tests/model/site/DataContainer.java
@@ -0,0 +1,31 @@
+package org.tests.model.site;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import java.util.UUID;
+
+@Entity
+public class DataContainer {
+
+  @Id
+  private UUID id;
+
+  private String content;
+
+  public UUID getId() {
+    return id;
+  }
+
+  public void setId(final UUID id) {
+    this.id = id;
+  }
+
+  public String getContent() {
+    return content;
+  }
+
+  public void setContent(final String content) {
+    this.content = content;
+  }
+
+}
diff --git a/src/test/java/org/tests/model/site/Site.java b/src/test/java/org/tests/model/site/Site.java
new file mode 100644
index 000000000..0e49db5bb
--- /dev/null
+++ b/src/test/java/org/tests/model/site/Site.java
@@ -0,0 +1,80 @@
+package org.tests.model.site;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+@Entity
+public class Site {
+
+  @Id
+  private UUID id;
+
+  private String name;
+
+  @OneToMany(cascade = CascadeType.ALL, mappedBy = "parent")
+  private List<Site> children = new ArrayList<>();
+
+  @ManyToOne(cascade = {})
+  private Site parent;
+
+  @OneToOne(cascade = CascadeType.ALL)
+  private DataContainer dataContainer;
+
+  @OneToOne(cascade = CascadeType.ALL)
+  private SiteAddress siteAddress;
+
+  public UUID getId() {
+    return id;
+  }
+
+  public void setId(final UUID id) {
+    this.id = id;
+  }
+
+  public List<Site> getChildren() {
+    return children;
+  }
+
+  public void setChildren(final List<Site> children) {
+    this.children = children;
+  }
+
+  public Site getParent() {
+    return parent;
+  }
+
+  public void setParent(final Site parent) {
+    this.parent = parent;
+  }
+
+  public SiteAddress getSiteAddress() {
+    return siteAddress;
+  }
+
+  public void setSiteAddress(final SiteAddress siteAddress) {
+    this.siteAddress = siteAddress;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(final String name) {
+    this.name = name;
+  }
+
+  public DataContainer getDataContainer() {
+    return dataContainer;
+  }
+
+  public void setDataContainer(final DataContainer dataContainer) {
+    this.dataContainer = dataContainer;
+  }
+}
diff --git a/src/test/java/org/tests/model/site/SiteAddress.java b/src/test/java/org/tests/model/site/SiteAddress.java
new file mode 100644
index 000000000..179706233
--- /dev/null
+++ b/src/test/java/org/tests/model/site/SiteAddress.java
@@ -0,0 +1,50 @@
+package org.tests.model.site;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import java.util.UUID;
+
+@Entity
+public class SiteAddress {
+
+  @Id
+  private UUID id;
+
+  private String street;
+
+  private String city;
+
+  private String zipCode;
+
+  public String getStreet() {
+    return street;
+  }
+
+  public void setStreet(final String street) {
+    this.street = street;
+  }
+
+  public String getCity() {
+    return city;
+  }
+
+  public void setCity(final String city) {
+    this.city = city;
+  }
+
+  public String getZipCode() {
+    return zipCode;
+  }
+
+  public void setZipCode(final String zipCode) {
+    this.zipCode = zipCode;
+  }
+
+  public UUID getId() {
+    return id;
+  }
+
+  public void setId(final UUID id) {
+    this.id = id;
+  }
+}

From 2923dd1d9659769f3f4eb23357f0075c7a56c8ac Mon Sep 17 00:00:00 2001
From: jonasPoehler <jonas.poehler@foconis.de>
Date: Mon, 10 Jun 2019 06:09:12 +0200
Subject: [PATCH 0884/1036] Bugfix/create entity bean unload (#1729)

* #1726 Add a testcase to reveal wrong behaviour of createEntityBean

* #1726 FIX: createEntityBean must not unload properties for "new" beans

(cherry picked from commit 270721bdb54373a83ef00b19a3c35da50f2a2bf5)
---
 .../server/deploy/BeanDescriptor.java         | 13 ++---
 .../org/tests/basic/TestCreateEntityBean.java | 36 ++++++++++++++
 .../org/tests/model/basic/EDefaultProp.java   | 48 +++++++++++++++++++
 3 files changed, 91 insertions(+), 6 deletions(-)
 create mode 100644 src/test/java/org/tests/basic/TestCreateEntityBean.java
 create mode 100644 src/test/java/org/tests/model/basic/EDefaultProp.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index f190d5e3c..08d873a4f 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -1915,18 +1915,19 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
         beanPostConstructListener.autowire(bean); // calls all registered listeners
         beanPostConstructListener.postConstruct(bean); // calls first the @PostConstruct method and then the listeners
       }
-
-      if (unloadProperties.length > 0) {
+      if (isNew) {
+        if (beanPostConstructListener != null) {
+          beanPostConstructListener.postCreate(bean);
+          // if bean is not new, postLoad will be executed later in the bean's lifecycle
+        }
+        // do not unload properties for new beans!
+      } else if (unloadProperties.length > 0) {
         // 'unload' any properties initialised in the default constructor
         EntityBeanIntercept ebi = bean._ebean_getIntercept();
         for (int unloadProperty : unloadProperties) {
           ebi.setPropertyUnloaded(unloadProperty);
         }
       }
-      if (beanPostConstructListener != null && isNew) {
-        beanPostConstructListener.postCreate(bean);
-        // if bean is not new, postLoad will be executed later in the bean's lifecycle
-      }
       return bean;
 
     } catch (Exception ex) {
diff --git a/src/test/java/org/tests/basic/TestCreateEntityBean.java b/src/test/java/org/tests/basic/TestCreateEntityBean.java
new file mode 100644
index 000000000..47d59f76f
--- /dev/null
+++ b/src/test/java/org/tests/basic/TestCreateEntityBean.java
@@ -0,0 +1,36 @@
+package org.tests.basic;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import io.ebean.Ebean;
+import org.junit.Assert;
+import org.junit.Test;
+import org.tests.model.basic.EDefaultProp;
+
+public class TestCreateEntityBean extends BaseTestCase {
+
+  @Test
+  public void testDefaultRelation() {
+    // Use `new` to construct EntityBean
+    final EDefaultProp beanNew = new EDefaultProp();
+    Ebean.save(beanNew);
+
+    final EDefaultProp beanNewDb = Ebean.find(EDefaultProp.class, beanNew.getId());
+    Assert.assertNotNull(beanNewDb);
+    Assert.assertEquals("defaultName", beanNew.getName());
+    Assert.assertNotNull(beanNewDb.geteSimple());
+    Assert.assertEquals("Default prop eSimple", beanNewDb.geteSimple().getName());
+
+    // Use `createEntityBean` to construct EntityBean and check if it behaves the same as `new`
+    final EDefaultProp beanCreateEntityBean = DB.getDefault().createEntityBean(EDefaultProp.class);
+    Ebean.save(beanCreateEntityBean);
+
+    final EDefaultProp beanCreateEntityBeanDb = Ebean.find(EDefaultProp.class, beanCreateEntityBean.getId());
+    Assert.assertNotNull(beanCreateEntityBeanDb);
+    Assert.assertEquals("defaultName", beanCreateEntityBeanDb.getName());
+    Assert.assertNotNull(beanCreateEntityBeanDb.geteSimple());
+    Assert.assertEquals("Default prop eSimple", beanCreateEntityBeanDb.geteSimple().getName());
+
+  }
+
+}
diff --git a/src/test/java/org/tests/model/basic/EDefaultProp.java b/src/test/java/org/tests/model/basic/EDefaultProp.java
new file mode 100644
index 000000000..8635706c4
--- /dev/null
+++ b/src/test/java/org/tests/model/basic/EDefaultProp.java
@@ -0,0 +1,48 @@
+package org.tests.model.basic;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+
+@Entity
+public class EDefaultProp {
+
+  @Id
+  Integer id;
+
+  @OneToOne(cascade = CascadeType.ALL)
+  ESimple eSimple;
+
+  String name;
+
+  public EDefaultProp() {
+    eSimple = new ESimple();
+    eSimple.setName("Default prop eSimple");
+    name = "defaultName";
+  }
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(final Integer id) {
+    this.id = id;
+  }
+
+  public ESimple geteSimple() {
+    return eSimple;
+  }
+
+  public void seteSimple(final ESimple eSimple) {
+    this.eSimple = eSimple;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(final String name) {
+    this.name = name;
+  }
+}

From 1cdf68f1c0e01bf572c09f238a1321da495558f4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 10 Jun 2019 16:13:19 +1200
Subject: [PATCH 0885/1036] #1727 - No effective change, tests with static
 imports

---
 .../org/tests/basic/TestCreateEntityBean.java | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/test/java/org/tests/basic/TestCreateEntityBean.java b/src/test/java/org/tests/basic/TestCreateEntityBean.java
index 47d59f76f..6f544db53 100644
--- a/src/test/java/org/tests/basic/TestCreateEntityBean.java
+++ b/src/test/java/org/tests/basic/TestCreateEntityBean.java
@@ -3,33 +3,36 @@ package org.tests.basic;
 import io.ebean.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Ebean;
-import org.junit.Assert;
 import org.junit.Test;
 import org.tests.model.basic.EDefaultProp;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 public class TestCreateEntityBean extends BaseTestCase {
 
   @Test
   public void testDefaultRelation() {
+
     // Use `new` to construct EntityBean
     final EDefaultProp beanNew = new EDefaultProp();
     Ebean.save(beanNew);
 
     final EDefaultProp beanNewDb = Ebean.find(EDefaultProp.class, beanNew.getId());
-    Assert.assertNotNull(beanNewDb);
-    Assert.assertEquals("defaultName", beanNew.getName());
-    Assert.assertNotNull(beanNewDb.geteSimple());
-    Assert.assertEquals("Default prop eSimple", beanNewDb.geteSimple().getName());
+    assertNotNull(beanNewDb);
+    assertEquals("defaultName", beanNew.getName());
+    assertNotNull(beanNewDb.geteSimple());
+    assertEquals("Default prop eSimple", beanNewDb.geteSimple().getName());
 
     // Use `createEntityBean` to construct EntityBean and check if it behaves the same as `new`
     final EDefaultProp beanCreateEntityBean = DB.getDefault().createEntityBean(EDefaultProp.class);
     Ebean.save(beanCreateEntityBean);
 
     final EDefaultProp beanCreateEntityBeanDb = Ebean.find(EDefaultProp.class, beanCreateEntityBean.getId());
-    Assert.assertNotNull(beanCreateEntityBeanDb);
-    Assert.assertEquals("defaultName", beanCreateEntityBeanDb.getName());
-    Assert.assertNotNull(beanCreateEntityBeanDb.geteSimple());
-    Assert.assertEquals("Default prop eSimple", beanCreateEntityBeanDb.geteSimple().getName());
+    assertNotNull(beanCreateEntityBeanDb);
+    assertEquals("defaultName", beanCreateEntityBeanDb.getName());
+    assertNotNull(beanCreateEntityBeanDb.geteSimple());
+    assertEquals("Default prop eSimple", beanCreateEntityBeanDb.geteSimple().getName());
 
   }
 

From e26a38ecaa54846721b953f38f45bbca59f3496b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 10 Jun 2019 16:14:12 +1200
Subject: [PATCH 0886/1036] #1727 - No effective change, simplify
 DefaultServer.createEntityBean()

---
 src/main/java/io/ebeaninternal/server/core/DefaultServer.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index ff818e9cf..dc54b4b39 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -660,8 +660,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   @Override
   @SuppressWarnings("unchecked")
   public <T> T createEntityBean(Class<T> type) {
-    BeanDescriptor<T> desc = getBeanDescriptor(type);
-    return (T) desc.createEntityBean(true);
+    return getBeanDescriptor(type).createBean();
   }
 
   /**

From 6af5fae8e98b35caf7710bf521608bf16a767828 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 10 Jun 2019 16:16:04 +1200
Subject: [PATCH 0887/1036] #1727 - Refactor internals to use Instant for json
 parse on date time types (#1728)

---
 .../server/type/IsoJsonDateTimeParser.java    | 21 ++++++++++++++
 .../server/type/ScalarTypeBaseDateTime.java   | 25 ++++++++++++-----
 .../server/type/ScalarTypeCalendar.java       | 12 +++++++-
 .../server/type/ScalarTypeInstant.java        | 10 +++++++
 .../server/type/ScalarTypeJodaDateTime.java   |  6 ++++
 .../type/ScalarTypeJodaLocalDateTime.java     |  7 ++++-
 .../server/type/ScalarTypeLocalDateTime.java  |  6 ++++
 .../server/type/ScalarTypeOffsetDateTime.java | 13 +++++++--
 .../server/type/ScalarTypeTimestamp.java      | 10 ++++++-
 .../server/type/ScalarTypeUtilDate.java       | 10 ++++++-
 .../server/type/ScalarTypeZonedDateTime.java  |  9 ++++--
 .../server/type/UtilDateTimeParser.java       | 28 -------------------
 ...st.java => IsoJsonDateTimeParserTest.java} | 10 +++----
 .../server/type/ScalarTypeCalendarTest.java   | 24 ++++++++++++++++
 .../server/type/ScalarTypeInstantTest.java    | 17 +++++++++--
 .../type/ScalarTypeLocalDateTimeTest.java     | 17 ++++++++++-
 .../type/ScalarTypeOffsetDateTimeTest.java    | 17 ++++++++++-
 .../server/type/ScalarTypeTimestampTest.java  | 23 +++++++++++++++
 .../server/type/ScalarTypeUtilDateTest.java   | 12 ++++++++
 .../type/ScalarTypeZonedDateTimeTest.java     | 13 +++++++++
 20 files changed, 237 insertions(+), 53 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/type/IsoJsonDateTimeParser.java
 delete mode 100644 src/main/java/io/ebeaninternal/server/type/UtilDateTimeParser.java
 rename src/test/java/io/ebeaninternal/server/type/{UtilDateTimeParserTest.java => IsoJsonDateTimeParserTest.java} (81%)
 create mode 100644 src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java
 create mode 100644 src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java

diff --git a/src/main/java/io/ebeaninternal/server/type/IsoJsonDateTimeParser.java b/src/main/java/io/ebeaninternal/server/type/IsoJsonDateTimeParser.java
new file mode 100644
index 000000000..a6f8a8636
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/type/IsoJsonDateTimeParser.java
@@ -0,0 +1,21 @@
+package io.ebeaninternal.server.type;
+
+import java.time.Instant;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+
+class IsoJsonDateTimeParser {
+
+  private static final DateTimeFormatter ISO_MILLIS = new DateTimeFormatterBuilder()
+    .parseCaseInsensitive()
+    .appendInstant(3)
+    .toFormatter();
+
+  static Instant parseIso(String jsonDateTime) {
+    return Instant.parse(jsonDateTime);
+  }
+
+  static String formatIso(Instant value) {
+    return ISO_MILLIS.format(value);
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
index 17f7c320b..c89632ab7 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
@@ -1,9 +1,9 @@
 package io.ebeaninternal.server.type;
 
-import io.ebean.config.JsonConfig;
-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
+import io.ebean.config.JsonConfig;
+import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -12,15 +12,15 @@ import java.math.BigDecimal;
 import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.sql.Types;
+import java.time.Instant;
+
+import static io.ebeaninternal.server.type.IsoJsonDateTimeParser.parseIso;
 
 /**
  * Base type for DateTime types.
  */
 public abstract class ScalarTypeBaseDateTime<T> extends ScalarTypeBase<T> {
 
-
-  protected final UtilDateTimeParser dateTimeParser = new UtilDateTimeParser();
-
   protected final JsonConfig.DateTime mode;
 
   public ScalarTypeBaseDateTime(JsonConfig.DateTime mode, Class<T> type, boolean jdbcNative, int jdbcType) {
@@ -43,6 +43,11 @@ public abstract class ScalarTypeBaseDateTime<T> extends ScalarTypeBase<T> {
    */
   public abstract T convertFromTimestamp(Timestamp ts);
 
+  /**
+   * Convert to the value from a Instant.
+   */
+  public abstract T convertFromInstant(Instant ts);
+
   /**
    * Convert from epoch millis to the value.
    */
@@ -64,6 +69,13 @@ public abstract class ScalarTypeBaseDateTime<T> extends ScalarTypeBase<T> {
    */
   protected abstract String toJsonISO8601(T value);
 
+  /**
+   * Convert the value to ISO8601 format.
+   */
+  protected T fromJsonISO8601(String value) {
+    return convertFromInstant(parseIso(value));
+  }
+
   @Override
   public void bind(DataBind b, T value) throws SQLException {
     if (value == null) {
@@ -104,8 +116,7 @@ public abstract class ScalarTypeBaseDateTime<T> extends ScalarTypeBase<T> {
         return convertFromTimestamp(timestamp);
       }
       default: {
-        String jsonDateTime = parser.getText();
-        return convertFromTimestamp(dateTimeParser.parse(jsonDateTime));
+        return fromJsonISO8601(parser.getText());
       }
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java
index 056794583..519a66efb 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java
@@ -7,8 +7,11 @@ import java.sql.Date;
 import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.sql.Types;
+import java.time.Instant;
 import java.util.Calendar;
 
+import static io.ebeaninternal.server.type.IsoJsonDateTimeParser.formatIso;
+
 /**
  * ScalarType for java.util.Calendar.
  */
@@ -48,6 +51,13 @@ public class ScalarTypeCalendar extends ScalarTypeBaseDateTime<Calendar> {
     return calendar;
   }
 
+  @Override
+  public Calendar convertFromInstant(Instant ts) {
+    Calendar calendar = Calendar.getInstance();
+    calendar.setTimeInMillis(ts.toEpochMilli());
+    return calendar;
+  }
+
   @Override
   protected String toJsonNanos(Calendar value) {
     return String.valueOf(value.getTime());
@@ -55,7 +65,7 @@ public class ScalarTypeCalendar extends ScalarTypeBaseDateTime<Calendar> {
 
   @Override
   protected String toJsonISO8601(Calendar value) {
-    return dateTimeParser.format(value.getTime());
+    return formatIso(value.toInstant());
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java
index 3b98929ce..dd78f4a65 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java
@@ -25,6 +25,11 @@ public class ScalarTypeInstant extends ScalarTypeBaseDateTime<Instant> {
     return value.toString();
   }
 
+  @Override
+  protected Instant fromJsonISO8601(String value) {
+    return Instant.parse(value);
+  }
+
   @Override
   public long convertToMillis(Instant value) {
     return value.toEpochMilli();
@@ -40,6 +45,11 @@ public class ScalarTypeInstant extends ScalarTypeBaseDateTime<Instant> {
     return ts.toInstant();
   }
 
+  @Override
+  public Instant convertFromInstant(Instant ts) {
+    return ts;
+  }
+
   @Override
   public Timestamp convertToTimestamp(Instant t) {
     return Timestamp.from(t);
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java
index 171cd2c25..f8d9816ae 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java
@@ -6,6 +6,7 @@ import org.joda.time.DateTime;
 
 import java.sql.Timestamp;
 import java.sql.Types;
+import java.time.Instant;
 
 /**
  * ScalarType for Joda DateTime. This maps to a JDBC Timestamp.
@@ -41,6 +42,11 @@ public class ScalarTypeJodaDateTime extends ScalarTypeBaseDateTime<DateTime> {
     return new DateTime(ts.getTime());
   }
 
+  @Override
+  public DateTime convertFromInstant(Instant ts) {
+    return new DateTime(ts.toEpochMilli());
+  }
+
   @Override
   public Timestamp convertToTimestamp(DateTime t) {
     return new Timestamp(t.getMillis());
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java
index cf5d5aac3..bb5db7e37 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java
@@ -6,6 +6,7 @@ import org.joda.time.LocalDateTime;
 
 import java.sql.Timestamp;
 import java.sql.Types;
+import java.time.Instant;
 
 /**
  * ScalarType for Joda LocalDateTime. This maps to a JDBC Timestamp.
@@ -31,7 +32,6 @@ public class ScalarTypeJodaLocalDateTime extends ScalarTypeBaseDateTime<LocalDat
     return value.toDateTime().getMillis();
   }
 
-
   @Override
   public LocalDateTime convertFromMillis(long systemTimeMillis) {
     return new LocalDateTime(systemTimeMillis);
@@ -42,6 +42,11 @@ public class ScalarTypeJodaLocalDateTime extends ScalarTypeBaseDateTime<LocalDat
     return new LocalDateTime(ts.getTime());
   }
 
+  @Override
+  public LocalDateTime convertFromInstant(Instant ts) {
+    return new LocalDateTime(ts.toEpochMilli());
+  }
+
   @Override
   public Timestamp convertToTimestamp(LocalDateTime t) {
     return new Timestamp(t.toDateTime().getMillis());
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
index 05a6f1a2f..a4bc91aae 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
@@ -4,6 +4,7 @@ import io.ebean.config.JsonConfig;
 
 import java.sql.Timestamp;
 import java.sql.Types;
+import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 
@@ -41,6 +42,11 @@ public class ScalarTypeLocalDateTime extends ScalarTypeBaseDateTime<LocalDateTim
     return timestamp.toLocalDateTime();
   }
 
+  @Override
+  public LocalDateTime convertFromInstant(Instant ts) {
+    return LocalDateTime.ofInstant(ts, ZoneId.systemDefault());
+  }
+
   @Override
   public Timestamp convertToTimestamp(LocalDateTime dateTime) {
     return Timestamp.valueOf(dateTime);
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java
index 17a359a7a..b62c693d3 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java
@@ -8,6 +8,8 @@ import java.time.Instant;
 import java.time.OffsetDateTime;
 import java.time.ZoneId;
 
+import static io.ebeaninternal.server.type.IsoJsonDateTimeParser.formatIso;
+
 /**
  * ScalarType for java.sql.Timestamp.
  */
@@ -24,7 +26,7 @@ public class ScalarTypeOffsetDateTime extends ScalarTypeBaseDateTime<OffsetDateT
 
   @Override
   protected String toJsonISO8601(OffsetDateTime value) {
-    return value.toInstant().toString();
+    return formatIso(value.toInstant());
   }
 
   @Override
@@ -34,12 +36,17 @@ public class ScalarTypeOffsetDateTime extends ScalarTypeBaseDateTime<OffsetDateT
 
   @Override
   public OffsetDateTime convertFromMillis(long systemTimeMillis) {
-    return OffsetDateTime.ofInstant(Instant.ofEpochMilli(systemTimeMillis), ZoneId.systemDefault());
+    return convertFromInstant(Instant.ofEpochMilli(systemTimeMillis));
   }
 
   @Override
   public OffsetDateTime convertFromTimestamp(Timestamp ts) {
-    return OffsetDateTime.ofInstant(ts.toInstant(), ZoneId.systemDefault());
+    return convertFromInstant(ts.toInstant());
+  }
+
+  @Override
+  public OffsetDateTime convertFromInstant(Instant ts) {
+    return OffsetDateTime.ofInstant(ts, ZoneId.systemDefault());
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java
index f5bc88a79..08b1792e7 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java
@@ -6,6 +6,9 @@ import io.ebeaninternal.server.core.BasicTypeConverter;
 import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.sql.Types;
+import java.time.Instant;
+
+import static io.ebeaninternal.server.type.IsoJsonDateTimeParser.formatIso;
 
 /**
  * ScalarType for java.sql.Timestamp.
@@ -23,7 +26,7 @@ public class ScalarTypeTimestamp extends ScalarTypeBaseDateTime<Timestamp> {
 
   @Override
   protected String toJsonISO8601(Timestamp value) {
-    return dateTimeParser.format(value);
+    return formatIso(value.toInstant());
   }
 
   @Override
@@ -41,6 +44,11 @@ public class ScalarTypeTimestamp extends ScalarTypeBaseDateTime<Timestamp> {
     return ts;
   }
 
+  @Override
+  public Timestamp convertFromInstant(Instant ts) {
+    return Timestamp.from(ts);
+  }
+
   @Override
   public Timestamp convertToTimestamp(Timestamp t) {
     return t;
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
index 0d02b81dc..ec9a3ba46 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
@@ -6,8 +6,11 @@ import io.ebeaninternal.server.core.BasicTypeConverter;
 import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.sql.Types;
+import java.time.Instant;
 import java.util.Date;
 
+import static io.ebeaninternal.server.type.IsoJsonDateTimeParser.formatIso;
+
 /**
  * ScalarType for java.util.Date.
  */
@@ -26,7 +29,7 @@ public class ScalarTypeUtilDate {
 
     @Override
     protected String toJsonISO8601(Date value) {
-      return dateTimeParser.format(value);
+      return formatIso(value.toInstant());
     }
 
     @Override
@@ -69,6 +72,11 @@ public class ScalarTypeUtilDate {
       return new java.util.Date(ts.getTime());
     }
 
+    @Override
+    public Date convertFromInstant(Instant ts) {
+      return new java.util.Date(ts.toEpochMilli());
+    }
+
     @Override
     public Timestamp convertToTimestamp(Date date) {
       return new Timestamp(date.getTime());
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java
index d580f563b..52b777b6b 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java
@@ -34,12 +34,17 @@ public class ScalarTypeZonedDateTime extends ScalarTypeBaseDateTime<ZonedDateTim
 
   @Override
   public ZonedDateTime convertFromMillis(long systemTimeMillis) {
-    return ZonedDateTime.ofInstant(Instant.ofEpochMilli(systemTimeMillis), ZoneId.systemDefault());
+    return convertFromInstant(Instant.ofEpochMilli(systemTimeMillis));
   }
 
   @Override
   public ZonedDateTime convertFromTimestamp(Timestamp ts) {
-    return ZonedDateTime.ofInstant(ts.toInstant(), ZoneId.systemDefault());
+    return convertFromInstant(ts.toInstant());
+  }
+
+  @Override
+  public ZonedDateTime convertFromInstant(Instant ts) {
+    return ZonedDateTime.ofInstant(ts, ZoneId.systemDefault());
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/type/UtilDateTimeParser.java b/src/main/java/io/ebeaninternal/server/type/UtilDateTimeParser.java
deleted file mode 100644
index 0b1de6d3b..000000000
--- a/src/main/java/io/ebeaninternal/server/type/UtilDateTimeParser.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package io.ebeaninternal.server.type;
-
-import java.sql.Timestamp;
-import java.time.Instant;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
-import java.time.format.DateTimeParseException;
-import java.util.Date;
-
-class UtilDateTimeParser {
-
-  private static final DateTimeFormatter ISO_MILLIS = new DateTimeFormatterBuilder()
-    .parseCaseInsensitive()
-    .appendInstant(3)
-    .toFormatter();
-
-  public Timestamp parse(String jsonDateTime) {
-    try {
-      return Timestamp.from(Instant.parse(jsonDateTime));
-    } catch (DateTimeParseException e) {
-      throw new RuntimeException("Error parsing Datetime[" + jsonDateTime + "]", e);
-    }
-  }
-
-  public String format(Date value) {
-    return ISO_MILLIS.format(value.toInstant());
-  }
-}
diff --git a/src/test/java/io/ebeaninternal/server/type/UtilDateTimeParserTest.java b/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java
similarity index 81%
rename from src/test/java/io/ebeaninternal/server/type/UtilDateTimeParserTest.java
rename to src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java
index 69ee6dde1..0484ef0ba 100644
--- a/src/test/java/io/ebeaninternal/server/type/UtilDateTimeParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java
@@ -3,13 +3,13 @@ package io.ebeaninternal.server.type;
 
 import org.junit.Test;
 
-import java.sql.Timestamp;
+import java.time.Instant;
 
 import static org.assertj.core.api.StrictAssertions.assertThat;
 
-public class UtilDateTimeParserTest {
+public class IsoJsonDateTimeParserTest {
 
-  private UtilDateTimeParser parser = new UtilDateTimeParser();
+  private IsoJsonDateTimeParser parser = new IsoJsonDateTimeParser();
 
   @Test
   public void parseFormat_when_hasMillis() {
@@ -42,8 +42,8 @@ public class UtilDateTimeParserTest {
   }
 
   private void parseAndFormat(String input, String expected) {
-    Timestamp timestamp = parser.parse(input);
-    String format = parser.format(timestamp);
+    Instant timestamp = parser.parseIso(input);
+    String format = parser.formatIso(timestamp);
     assertThat(format).isEqualTo(expected);
   }
 }
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java
new file mode 100644
index 000000000..922beadeb
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java
@@ -0,0 +1,24 @@
+package io.ebeaninternal.server.type;
+
+import io.ebean.config.JsonConfig;
+import org.junit.Test;
+
+import java.sql.Types;
+import java.util.Calendar;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ScalarTypeCalendarTest {
+
+  private ScalarTypeCalendar type = new ScalarTypeCalendar(JsonConfig.DateTime.ISO8601, Types.TIMESTAMP);
+
+  @Test
+  public void toJsonISO8601() {
+
+    Calendar instance = Calendar.getInstance();
+    String asUtc = type.toJsonISO8601(instance);
+    Calendar calendar = type.fromJsonISO8601(asUtc);
+
+    assertThat(instance).isEqualTo(calendar);
+  }
+}
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java
index fccc8e355..07ecd0867 100644
--- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java
@@ -10,7 +10,10 @@ import java.io.ObjectOutputStream;
 import java.sql.Timestamp;
 import java.time.Instant;
 
-import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 public class ScalarTypeInstantTest {
 
@@ -123,7 +126,6 @@ public class ScalarTypeInstantTest {
   @Test
   public void testJsonRead() throws Exception {
 
-
     Instant now = now();
 
     JsonTester<Instant> jsonTester = new JsonTester<>(type);
@@ -139,4 +141,15 @@ public class ScalarTypeInstantTest {
 
   }
 
+  @Test
+  public void isoJsonParseFormat() {
+
+    ScalarTypeInstant typeIso = new ScalarTypeInstant(JsonConfig.DateTime.ISO8601);
+
+    Instant instant = Instant.now();
+    String asJson = typeIso.toJsonISO8601(instant);
+
+    Instant value = typeIso.fromJsonISO8601(asJson);
+    assertThat(instant).isEqualTo(value);
+  }
 }
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java
index 65850e947..88803da74 100644
--- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java
@@ -6,7 +6,10 @@ import org.junit.Test;
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
 
-import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 public class ScalarTypeLocalDateTimeTest {
 
@@ -87,4 +90,16 @@ public class ScalarTypeLocalDateTimeTest {
     jsonTester = new JsonTester<>(typeIso);
     jsonTester.test(now);
   }
+
+  @Test
+  public void isoJsonFormatParse() {
+
+    ScalarTypeLocalDateTime typeIso = new ScalarTypeLocalDateTime(JsonConfig.DateTime.ISO8601);
+
+    LocalDateTime localDateTime = LocalDateTime.now();
+    String asJson = typeIso.toJsonISO8601(localDateTime);
+
+    LocalDateTime value = typeIso.fromJsonISO8601(asJson);
+    assertThat(localDateTime).isEqualToIgnoringNanos(value);
+  }
 }
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java
index c950d5814..9661dd768 100644
--- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java
@@ -6,7 +6,10 @@ import org.junit.Test;
 import java.sql.Timestamp;
 import java.time.OffsetDateTime;
 
-import static org.junit.Assert.*;
+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 ScalarTypeOffsetDateTimeTest {
 
@@ -74,4 +77,16 @@ public class ScalarTypeOffsetDateTimeTest {
     jsonTester = new JsonTester<>(typeIso);
     jsonTester.test(now);
   }
+
+  @Test
+  public void isoJsonFormatParse() {
+
+    ScalarTypeOffsetDateTime typeIso = new ScalarTypeOffsetDateTime(JsonConfig.DateTime.ISO8601);
+
+    OffsetDateTime now = OffsetDateTime.now();
+    String asJson = typeIso.toJsonISO8601(now);
+
+    OffsetDateTime value = typeIso.fromJsonISO8601(asJson);
+    assertThat(now).isEqualToIgnoringNanos(value);
+  }
 }
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java
new file mode 100644
index 000000000..e5ff5d50a
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java
@@ -0,0 +1,23 @@
+package io.ebeaninternal.server.type;
+
+import io.ebean.config.JsonConfig;
+import org.junit.Test;
+
+import java.sql.Timestamp;
+
+import static org.assertj.core.api.StrictAssertions.assertThat;
+
+public class ScalarTypeTimestampTest {
+
+  @Test
+  public void toJsonISO8601() {
+
+    ScalarTypeTimestamp typeIso = new ScalarTypeTimestamp(JsonConfig.DateTime.ISO8601);
+
+    Timestamp now = new Timestamp(System.currentTimeMillis());
+    String asJson = typeIso.toJsonISO8601(now);
+
+    Timestamp value = typeIso.fromJsonISO8601(asJson);
+    assertThat(now).isEqualTo(value);
+  }
+}
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java
index 29be8e8fa..26e5b4511 100644
--- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java
@@ -24,4 +24,16 @@ public class ScalarTypeUtilDateTest {
     Date val1 = jsonIso.type.parse("2019-05-09");
     assertThat(jsonIso.test(val1)).isEqualTo("{\"key\":\"2019-05-09\"}");
   }
+
+  @Test
+  public void toJsonISO8601() {
+
+    ScalarTypeUtilDate.TimestampType typeIso = new ScalarTypeUtilDate.TimestampType(JsonConfig.DateTime.ISO8601);
+
+    Date now = new Date();
+    String asJson = typeIso.toJsonISO8601(now);
+
+    Date value = typeIso.fromJsonISO8601(asJson);
+    assertThat(now).isEqualTo(value);
+  }
 }
diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java
index be4570ac6..cf3b28aff 100644
--- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java
+++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java
@@ -6,6 +6,7 @@ import org.junit.Test;
 import java.sql.Timestamp;
 import java.time.ZonedDateTime;
 
+import static org.assertj.core.api.StrictAssertions.assertThat;
 import static org.junit.Assert.*;
 
 public class ScalarTypeZonedDateTimeTest {
@@ -75,4 +76,16 @@ public class ScalarTypeZonedDateTimeTest {
     jsonTester = new JsonTester<>(typeIso);
     jsonTester.test(now);
   }
+
+  @Test
+  public void toJsonISO8601() {
+
+    ScalarTypeZonedDateTime typeIso = new ScalarTypeZonedDateTime(JsonConfig.DateTime.ISO8601);
+
+    ZonedDateTime now = ZonedDateTime.now();
+    String asJson = typeIso.toJsonISO8601(now);
+
+    ZonedDateTime value = typeIso.fromJsonISO8601(asJson);
+    assertThat(now).isEqualTo(value);
+  }
 }

From 6e52bee91f0c2a61298613263e46e190d939ecd2 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 10 Jun 2019 23:31:47 +1200
Subject: [PATCH 0888/1036] #1723 - Fix for
 TestUpdateCircularSave.testCircularCascade()

---
 .../server/core/PersistRequestBean.java       |  8 +++
 .../server/persist/DefaultPersister.java      | 53 +++++++++++--------
 .../ebeaninternal/server/persist/Flags.java   |  2 +-
 .../server/persist/SaveManyBeans.java         |  2 +-
 .../tests/update/TestUpdateCircularSave.java  | 15 +++---
 5 files changed, 49 insertions(+), 31 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index 78c05e45e..ba7dcfb95 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -223,6 +223,12 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
       beanDescriptor.setDraftDirty(entityBean, true);
     }
     this.dirty = intercept.isDirty();
+  }
+
+  /**
+   * Init generated properties for soft delete (as it's an update).
+   */
+  public void initForSoftDelete() {
     initGeneratedProperties();
   }
 
@@ -1370,6 +1376,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    * Set the request flags indicating this is an insert.
    */
   public void flagInsert() {
+    initGeneratedProperties();
     if (intercept.isNew()) {
       flags = Flags.setInsertNormal(flags);
     } else {
@@ -1381,6 +1388,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    * Unset the request insert flag indicating this is an update.
    */
   public void flagUpdate() {
+    initGeneratedProperties();
     if (intercept.isLoaded()) {
       flags = Flags.setUpdateNormal(flags);
     } else {
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 0d02a49ef..28a22396a 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -377,7 +377,7 @@ public final class DefaultPersister implements Persister {
    * Recursively delete the bean. This calls back to the EbeanServer.
    */
   private int deleteRecurse(EntityBean detailBean, Transaction t, DeleteMode deleteMode) {
-    return deleteRequest(createRequest(detailBean, t, deleteMode.persistType()));
+    return deleteRequest(createDeleteRequest(detailBean, t, deleteMode.persistType()));
   }
 
   @Override
@@ -578,12 +578,11 @@ public final class DefaultPersister implements Persister {
   public int delete(EntityBean bean, Transaction t, boolean permanent) {
 
     Type deleteType = permanent ? Type.DELETE_PERMANENT : Type.DELETE;
-    PersistRequestBean<EntityBean> originalRequest = createRequest(bean, t, deleteType);
-
+    PersistRequestBean<EntityBean> originalRequest = createDeleteRequest(bean, t, deleteType);
     if (originalRequest.isHardDeleteDraft()) {
       // a hard delete of a draftable bean so first we need to  delete the associated 'live' bean
       // due to FK constraint and then after that execute the original delete of the draft bean
-      return deleteRequest(createPublishRequest(originalRequest.createReference(), t, Type.DELETE_PERMANENT, Flags.PUBLISH), originalRequest);
+      return deleteRequest(createDeleteRequest(originalRequest.createReference(), t, Type.DELETE_PERMANENT, Flags.PUBLISH), originalRequest);
 
     } else {
       // normal delete or soft delete
@@ -639,8 +638,8 @@ public final class DefaultPersister implements Persister {
       t.depth(-1);
       t.checkBatchEscalationOnCollection();
     }
-    for (Object aBeanList : beanList) {
-      deleteRecurse((EntityBean) aBeanList, t, deleteMode);
+    for (Object bean : beanList) {
+      deleteRecurse((EntityBean) bean, t, deleteMode);
     }
     if (children) {
       t.flushBatchOnCollection();
@@ -1248,21 +1247,11 @@ public final class DefaultPersister implements Persister {
     return createRequestInternal(bean, t, type, Flags.ZERO);
   }
 
-  /**
-   * Create the Persist Request Object additionally specifying the publish status.
-   */
-  <T> PersistRequestBean<T> createPublishRequest(T bean, Transaction t, PersistRequest.Type type, int flags) {
-    return createRequestInternal(bean, t, type, Flags.unsetRecuse(flags));
-  }
-
   /**
    * Create the Persist Request Object additionally specifying the publish status.
    */
   private <T> PersistRequestBean<T> createRequestInternal(T bean, Transaction t, PersistRequest.Type type, int flags) {
     BeanManager<T> mgr = getBeanManager(bean);
-    if (mgr == null) {
-      throw new PersistenceException(errNotRegistered(bean.getClass()));
-    }
     return createRequest(bean, t, null, mgr, type, flags);
   }
 
@@ -1273,9 +1262,6 @@ public final class DefaultPersister implements Persister {
    */
   private <T> PersistRequestBean<T> createRequestRecurse(T bean, Transaction t, Object parentBean, int flags) {
     BeanManager<T> mgr = getBeanManager(bean);
-    if (mgr == null) {
-      throw new PersistenceException(errNotRegistered(bean.getClass()));
-    }
     BeanDescriptor<T> desc = mgr.getBeanDescriptor();
     EntityBean entityBean = (EntityBean) bean;
     PersistRequest.Type type;
@@ -1298,6 +1284,23 @@ public final class DefaultPersister implements Persister {
   private <T> PersistRequestBean<T> createRequest(T bean, Transaction t, Object parentBean, BeanManager<?> mgr,
                                                   PersistRequest.Type type, int flags) {
 
+    // no delete requests come here
+    return new PersistRequestBean(server, bean, parentBean, mgr, (SpiTransaction) t, persistExecute, type, flags);
+  }
+
+  <T> PersistRequestBean<T> createDeleteRemoved(T bean, Transaction t, PersistRequest.Type type, int flags) {
+    return createDeleteRequest(bean, t, type, Flags.unsetRecurse(flags));
+  }
+
+  @SuppressWarnings({"unchecked", "rawtypes"})
+  private <T> PersistRequestBean<T> createDeleteRequest(EntityBean bean, Transaction t, Type type) {
+    return createDeleteRequest(bean, t, type, Flags.ZERO);
+  }
+
+  @SuppressWarnings({"unchecked", "rawtypes"})
+  public <T> PersistRequestBean<T> createDeleteRequest(Object bean, Transaction t, PersistRequest.Type type, int flags) {
+
+    BeanManager<T> mgr = getBeanManager(bean);
     if (type == Type.DELETE_PERMANENT) {
       type = Type.DELETE;
     } else if (type == Type.DELETE && mgr.getBeanDescriptor().isSoftDelete()) {
@@ -1305,7 +1308,9 @@ public final class DefaultPersister implements Persister {
       type = Type.DELETE_SOFT;
     }
 
-    return new PersistRequestBean(server, bean, parentBean, mgr, (SpiTransaction) t, persistExecute, type, flags);
+    PersistRequestBean<T> request =  new PersistRequestBean<T>(server, (T)bean, null, mgr, (SpiTransaction) t, persistExecute, type, flags);
+    request.initForSoftDelete();
+    return request;
   }
 
   private String errNotRegistered(Class<?> beanClass) {
@@ -1323,8 +1328,12 @@ public final class DefaultPersister implements Persister {
    * </p>
    */
   @SuppressWarnings("unchecked")
-  private <T> BeanManager<T> getBeanManager(T bean) {
+  private <T> BeanManager<T> getBeanManager(Object bean) {
 
-    return (BeanManager<T>) beanDescriptorManager.getBeanManager(bean.getClass());
+    BeanManager<T> mgr = (BeanManager<T>) beanDescriptorManager.getBeanManager(bean.getClass());
+    if (mgr == null) {
+      throw new PersistenceException(errNotRegistered(bean.getClass()));
+    }
+    return mgr;
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/persist/Flags.java b/src/main/java/io/ebeaninternal/server/persist/Flags.java
index 263dbb6e8..0d9a9ccf9 100644
--- a/src/main/java/io/ebeaninternal/server/persist/Flags.java
+++ b/src/main/java/io/ebeaninternal/server/persist/Flags.java
@@ -122,7 +122,7 @@ public final class Flags {
     return set(state, RECURSE);
   }
 
-  public static int unsetRecuse(int state) {
+  public static int unsetRecurse(int state) {
     return unset(state, RECURSE);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
index c67521686..8370104c1 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
@@ -356,7 +356,7 @@ public class SaveManyBeans extends SaveManyBase {
             EntityBean eb = (EntityBean) removedBean;
             if (!eb._ebean_getIntercept().isNew()) {
               // only delete if the bean was loaded meaning that it is known to exist in the DB
-              persister.deleteRequest(persister.createPublishRequest(removedBean, transaction, PersistRequest.Type.DELETE, request.getFlags()));
+              persister.deleteRequest(persister.createDeleteRemoved(removedBean, transaction, PersistRequest.Type.DELETE, request.getFlags()));
             }
           }
         }
diff --git a/src/test/java/org/tests/update/TestUpdateCircularSave.java b/src/test/java/org/tests/update/TestUpdateCircularSave.java
index 6d82e5fe0..b32046435 100644
--- a/src/test/java/org/tests/update/TestUpdateCircularSave.java
+++ b/src/test/java/org/tests/update/TestUpdateCircularSave.java
@@ -1,15 +1,16 @@
 package org.tests.update;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import org.junit.Ignore;
 import org.junit.Test;
-import org.tests.update.objects.SiblingA;
-import org.tests.update.objects.Parent;
-import org.tests.update.objects.SiblingB;
 import org.tests.update.objects.Child;
+import org.tests.update.objects.Parent;
+import org.tests.update.objects.SiblingA;
+import org.tests.update.objects.SiblingB;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 public class TestUpdateCircularSave extends BaseTestCase {
 
@@ -43,7 +44,7 @@ public class TestUpdateCircularSave extends BaseTestCase {
     return siblingA.getId();
   }
 
-
+  @Ignore
   @Test
   public void testFetchChildModifyChildSaveParent() {
 

From 7e768623e489478237e04376b18be923d71e0914 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 12 Jun 2019 23:41:48 +1200
Subject: [PATCH 0889/1036] #1730 - Fix for wrong JDBC batch sorting / ordering

This is a bit of a refactor that simplifies the ordering of
batch execution (BatchedBeanHolder ordering). In short we
batch by bean type and depth (rather than just type).

This means that there are some cases we are not optimal
(where we could batch by bean type in different depths)
but that is expected to be rare and problematic for
hierarchies of the same type.
---
 .../server/persist/BatchControl.java          | 103 +++++++-----------
 .../server/persist/BatchDepthOrder.java       |  33 ++++++
 .../server/persist/BatchedBeanHolder.java     |  24 ----
 .../server/persist/BatchDepthOrderTest.java   |  48 ++++++++
 .../server/persist/BatchedBeanHolderTest.java |  45 --------
 .../tests/cascade/TestMultiCascadeBatch.java  |   1 +
 .../TestInsertBatchThenFlushThenUpdate.java   |   8 +-
 7 files changed, 126 insertions(+), 136 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/persist/BatchDepthOrder.java
 create mode 100644 src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java
 delete mode 100644 src/test/java/io/ebeaninternal/server/persist/BatchedBeanHolderTest.java

diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchControl.java b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
index 0b6fd3a66..0b3bd28b3 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
@@ -5,12 +5,12 @@ import io.ebeaninternal.server.core.PersistRequest;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.core.PersistRequestUpdateSql;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.IdentityHashMap;
 import java.util.List;
 
 /**
@@ -29,6 +29,8 @@ import java.util.List;
  */
 public final class BatchControl {
 
+  private static final Object DUMMY = new Object();
+
   /**
    * Used to sort queue entries by depth.
    */
@@ -46,6 +48,17 @@ public final class BatchControl {
    */
   private final HashMap<String, BatchedBeanHolder> beanHoldMap = new HashMap<>();
 
+  /**
+   * Set of beans in this batch. This is used to ensure that a single bean instance is not included
+   * in the batch twice (two separate insert requests etc).
+   */
+  private final IdentityHashMap<Object, Object> persistedBeans = new IdentityHashMap<>();
+
+  /**
+   * Helper to determine statement ordering based on depth (and type).
+   */
+  private final BatchDepthOrder depthOrder = new BatchDepthOrder();
+
   private final SpiTransaction transaction;
 
   /**
@@ -63,13 +76,10 @@ public final class BatchControl {
 
   private boolean batchFlushOnMixed = true;
 
-  private int maxDepth;
-
   /**
    * Size of the largest buffer.
    */
   private int bufferMax;
-  private int topCounter;
 
   private Queue earlyQueue;
   private Queue lateQueue;
@@ -183,6 +193,14 @@ public final class BatchControl {
    */
   private boolean addToBatch(PersistRequestBean<?> request) throws BatchedSqlException {
 
+    Object alreadyInBatch = persistedBeans.put(request.getEntityBean(), DUMMY);
+    if (alreadyInBatch != null) {
+      // special case where the same bean instance has already been
+      // added to the batch (doesn't really occur with non-batching
+      // as the bean gets changed from dirty to loaded earlier)
+      return false;
+    }
+
     BatchedBeanHolder beanHolder = getBeanHolder(request);
     int bufferSize = beanHolder.append(request);
 
@@ -227,14 +245,14 @@ public final class BatchControl {
   }
 
   /**
-   * Flush without resetting the topOrder (maintains the depth info).
+   * Flush without resetting the depth info.
    */
   public void flush() throws BatchedSqlException {
     flushBuffer(false);
   }
 
   /**
-   * Flush with a reset the topOrder (fully empty the batch).
+   * Flush with a reset of the depth info.
    */
   public void flushReset() throws BatchedSqlException {
     flushBuffer(true);
@@ -246,8 +264,8 @@ public final class BatchControl {
   public void clear() {
     pstmtHolder.clear();
     beanHoldMap.clear();
-    maxDepth = 0;
-    topCounter = 0;
+    depthOrder.clear();
+    persistedBeans.clear();
   }
 
   private void flushBuffer(boolean resetTop) throws BatchedSqlException {
@@ -289,10 +307,10 @@ public final class BatchControl {
       for (BatchedBeanHolder beanHolder : bsArray) {
         beanHolder.executeNow();
       }
-
+      persistedBeans.clear();
       if (resetTop) {
         beanHoldMap.clear();
-        maxDepth = 0;
+        depthOrder.clear();
       }
     } catch (BatchedSqlException e) {
       // clear the batch on error in case we want to
@@ -306,69 +324,28 @@ public final class BatchControl {
    * Return an entry for the given type description. The type description is
    * typically the bean class name (or table name for MapBeans).
    */
-  private BatchedBeanHolder getBeanHolder(PersistRequestBean<?> request) throws BatchedSqlException {
+  private BatchedBeanHolder getBeanHolder(PersistRequestBean<?> request) {
 
-    BeanDescriptor<?> beanDescriptor = request.getBeanDescriptor();
-    BatchedBeanHolder batchBeanHolder = beanHoldMap.get(beanDescriptor.rootName());
+    int depth = transaction.depth();
+    BeanDescriptor<?> desc = request.getBeanDescriptor();
+
+    // batching by bean type AND depth
+    String key = desc.rootName() + ":" + depth;
+
+    BatchedBeanHolder batchBeanHolder = beanHoldMap.get(key);
     if (batchBeanHolder == null) {
-      int relativeDepth = transaction.depth();
-
-      int beanDepth = 100 + relativeDepth;
-      if (relativeDepth == 0 && !beanHoldMap.isEmpty()) {
-        // could be non-cascading or uni-directional relationship
-        // so see look for a 'parent' in the beanHoldMap
-        int maybe = relativeToParentDepth(beanDescriptor);
-        if (maybe != -1) {
-          beanDepth = maybe;
-        } else {
-          // additional "top level" bean type ordered by save() order
-          beanDepth += ++topCounter;
-        }
-      }
-
-      maxDepth = Math.max(maxDepth, beanDepth);
-      batchBeanHolder = new BatchedBeanHolder(this, beanDescriptor, beanDepth);
-      beanHoldMap.put(beanDescriptor.rootName(), batchBeanHolder);
+      int ordering = depthOrder.orderingFor(depth);
+      batchBeanHolder = new BatchedBeanHolder(this, desc, ordering);
+      beanHoldMap.put(key, batchBeanHolder);
     }
     return batchBeanHolder;
   }
 
-  /**
-   * Find a depth based on imported relationships (to a parent that is already in the buffer).
-   */
-  private int relativeToParentDepth(BeanDescriptor<?> beanDescriptor) {
-
-    BeanPropertyAssocOne<?>[] imported = beanDescriptor.propertiesOneImported();
-    if (imported.length == 0) {
-      // a top level type so just maintain the order relative to the current depth
-      return maxDepth + 1;
-    }
-
-    int parentMaxDepth = -1;
-
-    for (BeanPropertyAssocOne<?> parent : imported) {
-      BatchedBeanHolder parentBatch = beanHoldMap.get(parent.getTargetDescriptor().rootName());
-      if (parentBatch != null) {
-        // deeper that the parent
-        parentMaxDepth = Math.max(parentMaxDepth, parentBatch.getOrder() + 1);
-      }
-    }
-    return parentMaxDepth;
-  }
-
   /**
    * Return true if this holds no persist requests.
    */
   private boolean isBeansEmpty() {
-    if (beanHoldMap.isEmpty()) {
-      return true;
-    }
-    for (BatchedBeanHolder beanHolder : beanHoldMap.values()) {
-      if (!beanHolder.isEmpty()) {
-        return false;
-      }
-    }
-    return true;
+    return persistedBeans.isEmpty();
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchDepthOrder.java b/src/main/java/io/ebeaninternal/server/persist/BatchDepthOrder.java
new file mode 100644
index 000000000..7fe9c10b5
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchDepthOrder.java
@@ -0,0 +1,33 @@
+package io.ebeaninternal.server.persist;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Helper to determine batch execution order for BatchedBeanHolders.
+ */
+class BatchDepthOrder {
+
+  private final Map<Integer, Counter> map = new HashMap<>();
+
+  /**
+   * Return the batch order for the given depth.
+   */
+  int orderingFor(int depth) {
+    final Counter slot = map.computeIfAbsent(depth, integer -> new Counter());
+    return (depth * 100) + slot.increment();
+  }
+
+  void clear() {
+    map.clear();
+  }
+
+  private static class Counter {
+
+    int count;
+
+    public int increment() {
+      return count++;
+    }
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java b/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java
index 61c46ef0c..b32878494 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java
@@ -5,7 +5,6 @@ import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 
 import java.util.ArrayList;
-import java.util.IdentityHashMap;
 
 /**
  * Holds lists of persist requests for beans of a given type.
@@ -21,8 +20,6 @@ import java.util.IdentityHashMap;
  */
 public class BatchedBeanHolder {
 
-  private static final Object DUMMY = new Object();
-
   /**
    * The owning queue.
    */
@@ -50,12 +47,6 @@ public class BatchedBeanHolder {
    */
   private ArrayList<PersistRequest> deletes;
 
-  /**
-   * Set of beans in this batch. This is used to ensure that a single bean instance is not included
-   * in the batch twice (two separate insert requests etc).
-   */
-  private final IdentityHashMap<Object, Object> persistedBeans = new IdentityHashMap<>();
-
   /**
    * Create a new entry with a given type and depth.
    */
@@ -99,7 +90,6 @@ public class BatchedBeanHolder {
       updates = new ArrayList<>();
       control.executeNow(bufferedUpdates);
     }
-    persistedBeans.clear();
   }
 
   @Override
@@ -123,14 +113,6 @@ public class BatchedBeanHolder {
    */
   public int append(PersistRequestBean<?> request) {
 
-    Object alreadyInBatch = persistedBeans.put(request.getEntityBean(), DUMMY);
-    if (alreadyInBatch != null) {
-      // special case where the same bean instance has already been
-      // added to the batch (doesn't really occur with non-batching
-      // as the bean gets changed from dirty to loaded earlier)
-      return 0;
-    }
-
     request.setBatched();
 
     switch (request.getType()) {
@@ -161,10 +143,4 @@ public class BatchedBeanHolder {
     }
   }
 
-  /**
-   * Return true if this is empty containing no batched beans.
-   */
-  public boolean isEmpty() {
-    return persistedBeans.isEmpty();
-  }
 }
diff --git a/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java b/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java
new file mode 100644
index 000000000..d9640e7da
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java
@@ -0,0 +1,48 @@
+package io.ebeaninternal.server.persist;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class BatchDepthOrderTest {
+
+  @Test
+  public void orderingFor() {
+
+    BatchDepthOrder depthOrder = new BatchDepthOrder();
+
+    assertEquals(0, depthOrder.orderingFor(0));
+    assertEquals(1, depthOrder.orderingFor(0));
+    assertEquals(2, depthOrder.orderingFor(0));
+    assertEquals(100, depthOrder.orderingFor(1));
+    assertEquals(101, depthOrder.orderingFor(1));
+    assertEquals(200, depthOrder.orderingFor(2));
+    assertEquals(3, depthOrder.orderingFor(0));
+
+    assertEquals(-100, depthOrder.orderingFor(-1));
+    assertEquals(-99, depthOrder.orderingFor(-1));
+    assertEquals(-98, depthOrder.orderingFor(-1));
+
+    assertEquals(-200, depthOrder.orderingFor(-2));
+    assertEquals(-199, depthOrder.orderingFor(-2));
+  }
+
+
+  @Test
+  public void clear() {
+
+    BatchDepthOrder depthOrder = new BatchDepthOrder();
+
+    assertEquals(0, depthOrder.orderingFor(0));
+    assertEquals(1, depthOrder.orderingFor(0));
+    assertEquals(100, depthOrder.orderingFor(1));
+    assertEquals(101, depthOrder.orderingFor(1));
+
+    depthOrder.clear();
+
+    assertEquals(0, depthOrder.orderingFor(0));
+    assertEquals(100, depthOrder.orderingFor(1));
+    assertEquals(200, depthOrder.orderingFor(2));
+  }
+
+}
diff --git a/src/test/java/io/ebeaninternal/server/persist/BatchedBeanHolderTest.java b/src/test/java/io/ebeaninternal/server/persist/BatchedBeanHolderTest.java
deleted file mode 100644
index 12a7acef0..000000000
--- a/src/test/java/io/ebeaninternal/server/persist/BatchedBeanHolderTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package io.ebeaninternal.server.persist;
-
-import io.ebean.BaseTestCase;
-import io.ebeaninternal.api.TDSpiEbeanServer;
-import io.ebeaninternal.server.core.PersistRequest;
-import io.ebeaninternal.server.core.PersistRequestBean;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.deploy.BeanManager;
-import org.junit.Test;
-import org.tests.model.basic.Customer;
-
-import java.sql.Timestamp;
-
-import static org.junit.Assert.assertEquals;
-
-public class BatchedBeanHolderTest extends BaseTestCase {
-
-  @SuppressWarnings({ "rawtypes", "unchecked" })
-  @Test
-  public void testAppend() {
-
-    TDSpiEbeanServer server = new TDSpiEbeanServer("foo");
-
-    BeanDescriptor beanDescriptor = getBeanDescriptor(Customer.class);
-
-    //BeanDescriptor beanDescriptor = Mockito.mock(BeanDescriptor.class);
-    BeanManager beanManager = new BeanManager(beanDescriptor, null);
-
-
-    BatchedBeanHolder holder = new BatchedBeanHolder(null, beanDescriptor, 1);
-
-    Customer customer = new Customer();
-    customer.setUpdtime(new Timestamp(System.currentTimeMillis()));
-    PersistRequestBean req1 = new PersistRequestBean(server, customer, null, beanManager, null, null, PersistRequest.Type.INSERT, 0);
-
-
-    int size = holder.append(req1);
-    assertEquals(1, size);
-
-    PersistRequestBean req2 = new PersistRequestBean(server, customer, null, beanManager, null, null, PersistRequest.Type.INSERT, 0);
-    size = holder.append(req2);
-    assertEquals(0, size);
-
-  }
-}
diff --git a/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java b/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java
index 1e23d0cb0..d2733ddc3 100644
--- a/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java
+++ b/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java
@@ -28,6 +28,7 @@ public class TestMultiCascadeBatch extends BaseTestCase {
 
   @Test
   public void testMultipleCascadeInsideTransaction() {
+
     final Site mainSite = new Site();
     mainSite.setName("mainSite");
     Ebean.save(mainSite);
diff --git a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java
index 294e8d898..6fe2e0d18 100644
--- a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java
+++ b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java
@@ -38,7 +38,7 @@ public class TestInsertBatchThenFlushThenUpdate extends BaseTestCase {
       Ebean.save(parent);
 
       // nothing flushed yet
-      assertEquals(0, LoggedSqlCollector.start().size());
+      assertThat(LoggedSqlCollector.start()).isEmpty();
 
       txn.flushBatch();
 
@@ -49,14 +49,14 @@ public class TestInsertBatchThenFlushThenUpdate extends BaseTestCase {
       Ebean.save(parent);
 
       // nothing flushed yet
-      assertEquals(0, LoggedSqlCollector.start().size());
+      assertThat(LoggedSqlCollector.start()).isEmpty();
 
       Ebean.commitTransaction();
 
       // insert statements for EdExtendedParent
       List<String> loggedSql2 = LoggedSqlCollector.start();
-      assertEquals(2, loggedSql2.size());
-      assertTrue(loggedSql2.get(0).contains(" update td_parent "));
+      assertThat(loggedSql2).hasSize(2);
+      assertThat(loggedSql2.get(0)).contains(" update td_parent ");
     }
   }
 

From b7d5aa344fe08d51648533a81d6de2ddc005a15c Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 13 Jun 2019 00:11:34 +1200
Subject: [PATCH 0890/1036] Fix test only - add missing assert on
 NoopExpressionTest

---
 .../server/expression/NoopExpressionTest.java             | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java
index a6bac3e9a..732a9105c 100644
--- a/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java
+++ b/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java
@@ -2,10 +2,13 @@ package io.ebeaninternal.server.expression;
 
 import io.ebean.Ebean;
 import io.ebean.Query;
+import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.onetoone.album.Cover;
 
+import java.util.List;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 
@@ -32,7 +35,12 @@ public class NoopExpressionTest extends BaseExpressionTest {
       .where().add(NoopExpression.INSTANCE)
       .query();
 
+    LoggedSqlCollector.start();
+
     query.findCount();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select count(*) from cover t0 where 1=1 and");
   }
 
   @Test

From 3432c365f6eb5f4e4105db309b7a3203d85ffa6c Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 13 Jun 2019 00:14:20 +1200
Subject: [PATCH 0891/1036] Bump ebean-migration to 11.16.2 with fix for
 migration sql that ...

That includes semi-colon and new line in literal content
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ec712d065..735435e28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>11.16.1</version>
+      <version>11.16.2</version>
     </dependency>
 
     <dependency>

From 87ccb6e33358f4000acc98b77f1baae5551a11cc Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 13 Jun 2019 23:38:18 +1200
Subject: [PATCH 0892/1036] [maven-release-plugin] prepare release
 ebean-11.39.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 735435e28..ae42c7dd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.39.2-SNAPSHOT</version>
+  <version>11.39.2</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.39.2</tag>
   </scm>
 
   <profiles>

From 36f018b6aa9048ee50e9d19691e804246e5bd084 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 13 Jun 2019 23:38:28 +1200
Subject: [PATCH 0893/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ae42c7dd2..e1f5e4c3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.39.2</version>
+  <version>11.39.3-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.39.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From d1314124affffa4419023e20ef51c7be20c06287 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 14 Jun 2019 16:38:43 +1200
Subject: [PATCH 0894/1036] #1722 - Failing test for - L2 cache throw exception
 when query with custom ManyToMany relation model

---
 .../tests/cache/embeddedid/CEPCategory.java   | 48 ++++++++++++++
 .../tests/cache/embeddedid/CEPProduct.java    | 64 +++++++++++++++++++
 .../cache/embeddedid/CEPProductCategory.java  | 40 ++++++++++++
 .../embeddedid/CEPProductCategoryId.java      | 42 ++++++++++++
 .../TestBeanCacheEmbeddedIdPrimitives.java    | 44 +++++++++++++
 5 files changed, 238 insertions(+)
 create mode 100644 src/test/java/org/tests/cache/embeddedid/CEPCategory.java
 create mode 100644 src/test/java/org/tests/cache/embeddedid/CEPProduct.java
 create mode 100644 src/test/java/org/tests/cache/embeddedid/CEPProductCategory.java
 create mode 100644 src/test/java/org/tests/cache/embeddedid/CEPProductCategoryId.java
 create mode 100644 src/test/java/org/tests/cache/embeddedid/TestBeanCacheEmbeddedIdPrimitives.java

diff --git a/src/test/java/org/tests/cache/embeddedid/CEPCategory.java b/src/test/java/org/tests/cache/embeddedid/CEPCategory.java
new file mode 100644
index 000000000..80a543a11
--- /dev/null
+++ b/src/test/java/org/tests/cache/embeddedid/CEPCategory.java
@@ -0,0 +1,48 @@
+package org.tests.cache.embeddedid;
+
+import io.ebean.annotation.Cache;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Version;
+
+@Cache
+@Entity
+public class CEPCategory {
+
+  @Id
+  private Long id;
+
+  private String name;
+
+  @Version
+  private Long version;
+
+  public CEPCategory(String name) {
+    this.name = name;
+  }
+
+  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 Long getVersion() {
+    return version;
+  }
+
+  public void setVersion(Long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/cache/embeddedid/CEPProduct.java b/src/test/java/org/tests/cache/embeddedid/CEPProduct.java
new file mode 100644
index 000000000..064b76890
--- /dev/null
+++ b/src/test/java/org/tests/cache/embeddedid/CEPProduct.java
@@ -0,0 +1,64 @@
+package org.tests.cache.embeddedid;
+
+import io.ebean.annotation.Cache;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderColumn;
+import javax.persistence.Version;
+import java.util.List;
+
+@Cache
+@Entity
+public class CEPProduct {
+
+  @Id
+  private Long id;
+
+  private String name;
+
+  @OrderColumn(name = "priority")
+  @OneToMany(cascade = CascadeType.ALL, mappedBy = "product")
+  private List<CEPProductCategory> productCategories;
+
+  @Version
+  private Long version;
+
+  public CEPProduct(String name) {
+    this.name = name;
+  }
+
+  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 Long getVersion() {
+    return version;
+  }
+
+  public void setVersion(Long version) {
+    this.version = version;
+  }
+
+  public List<CEPProductCategory> getProductCategories() {
+    return productCategories;
+  }
+
+  public void setProductCategories(List<CEPProductCategory> productCategories) {
+    this.productCategories = productCategories;
+  }
+}
diff --git a/src/test/java/org/tests/cache/embeddedid/CEPProductCategory.java b/src/test/java/org/tests/cache/embeddedid/CEPProductCategory.java
new file mode 100644
index 000000000..3c18bbc1a
--- /dev/null
+++ b/src/test/java/org/tests/cache/embeddedid/CEPProductCategory.java
@@ -0,0 +1,40 @@
+package org.tests.cache.embeddedid;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.ManyToOne;
+
+@IdClass(CEPProductCategoryId.class)
+@Entity
+public class CEPProductCategory {
+
+  @Id
+  @ManyToOne
+  private CEPCategory category;
+
+  @Id
+  @ManyToOne
+  private CEPProduct product;
+
+  public CEPProductCategory(CEPCategory category, CEPProduct product) {
+    this.category = category;
+    this.product = product;
+  }
+
+  public CEPCategory getCategory() {
+    return category;
+  }
+
+  public void setCategory(CEPCategory category) {
+    this.category = category;
+  }
+
+  public CEPProduct getProduct() {
+    return product;
+  }
+
+  public void setProduct(CEPProduct product) {
+    this.product = product;
+  }
+}
diff --git a/src/test/java/org/tests/cache/embeddedid/CEPProductCategoryId.java b/src/test/java/org/tests/cache/embeddedid/CEPProductCategoryId.java
new file mode 100644
index 000000000..6c1ddc5c6
--- /dev/null
+++ b/src/test/java/org/tests/cache/embeddedid/CEPProductCategoryId.java
@@ -0,0 +1,42 @@
+package org.tests.cache.embeddedid;
+
+import javax.persistence.Embeddable;
+import java.util.Objects;
+
+@Embeddable
+public class CEPProductCategoryId {
+
+  // primitive id values as part of an EmbeddedId (NPE #1722)
+  private long customerId;
+  private long addressId;
+
+  public long getCustomerId() {
+    return customerId;
+  }
+
+  public void setCustomerId(long customerId) {
+    this.customerId = customerId;
+  }
+
+  public long getAddressId() {
+    return addressId;
+  }
+
+  public void setAddressId(long addressId) {
+    this.addressId = addressId;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    CEPProductCategoryId that = (CEPProductCategoryId) o;
+    return customerId == that.customerId &&
+      addressId == that.addressId;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(customerId, addressId);
+  }
+}
diff --git a/src/test/java/org/tests/cache/embeddedid/TestBeanCacheEmbeddedIdPrimitives.java b/src/test/java/org/tests/cache/embeddedid/TestBeanCacheEmbeddedIdPrimitives.java
new file mode 100644
index 000000000..c3d6ba97d
--- /dev/null
+++ b/src/test/java/org/tests/cache/embeddedid/TestBeanCacheEmbeddedIdPrimitives.java
@@ -0,0 +1,44 @@
+package org.tests.cache.embeddedid;
+
+import io.ebean.Ebean;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertNotNull;
+
+public class TestBeanCacheEmbeddedIdPrimitives {
+
+  @Test
+  public void findById() {
+
+    CEPProduct product1a = new CEPProduct("Product 01");
+    Ebean.save(product1a);
+
+    assertNotNull(product1a.getId());
+
+    CEPCategory category1a = new CEPCategory("Category 01");
+    Ebean.save(category1a);
+
+    assertNotNull(category1a.getId());
+
+    CEPProduct product1 = Ebean.find(CEPProduct.class).setUseCache(true).where().eq("id", product1a.getId()).findOne();
+
+    assertNotNull(product1);
+
+    product1.getProductCategories().forEach(customerAddress -> {
+      System.out.println(customerAddress.getCategory());
+    });
+    assertThat(product1.getProductCategories()).isEmpty();
+
+    CEPProduct product2 = Ebean.find(CEPProduct.class).setUseCache(true).where().eq("id", product1a.getId()).findOne();
+    assertNotNull(product2);
+
+    // fail here on null -> long conversion in embedded id
+    product2.getProductCategories().forEach(customerAddress -> {
+      System.out.println(customerAddress.getCategory());
+    });
+    assertThat(product2.getProductCategories()).isEmpty();
+  }
+
+
+}

From 8a4ffd21abb3624da55a923f99b9c2f8266e385b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 14 Jun 2019 16:38:58 +1200
Subject: [PATCH 0895/1036] #1722 - Fix for - L2 cache throw exception when
 query with custom ManyToMany relation model

---
 .../server/deploy/id/IdBinderEmbedded.java        | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java
index 6358a57c3..f1a93dfbb 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java
@@ -346,19 +346,20 @@ public final class IdBinderEmbedded implements IdBinder {
   public Object read(DbReadContext ctx) throws SQLException {
 
     EntityBean embId = idDesc.createEntityBean();
-    boolean notNull = true;
+    boolean nullValue = true;
 
     for (BeanProperty prop : props) {
-      Object value = prop.readSet(ctx, embId);
-      if (value == null) {
-        notNull = false;
+      Object value = prop.read(ctx);
+      if (value != null) {
+        prop.setValue(embId, value);
+        nullValue = false;
       }
     }
 
-    if (notNull) {
-      return embId;
-    } else {
+    if (nullValue) {
       return null;
+    } else {
+      return embId;
     }
   }
 

From 6077acf134606d608bd66eab50dc737db86cffd2 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 14 Jun 2019 16:45:05 +1200
Subject: [PATCH 0896/1036] [maven-release-plugin] prepare release
 ebean-11.39.3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e1f5e4c3b..714dae3f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.39.3-SNAPSHOT</version>
+  <version>11.39.3</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.39.3</tag>
   </scm>
 
   <profiles>

From 4b289332980190d282414b8690dc76d8bd8e7063 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 14 Jun 2019 16:45:16 +1200
Subject: [PATCH 0897/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 714dae3f0..174979518 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.39.3</version>
+  <version>11.39.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.39.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From e2a467ca5a1f5f6837ae3388735e4f7f81c7c317 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 19 Jun 2019 23:49:00 +1200
Subject: [PATCH 0898/1036] Create FUNDING.yml

---
 .github/FUNDING.yml | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 000000000..2e27fa4e0
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+custom: https://ebean.io/sponsors

From a1e185b0f651322ff04e60ad4065d1b410d550d0 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 24 Jun 2019 13:41:21 +1200
Subject: [PATCH 0899/1036] Refactor tidy internals - BatchedPstmtHolder,
 always true condition (no effective change)

Remove condition check on firstError == null ... as it is always true
---
 .../server/persist/BatchedPstmtHolder.java             | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java b/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java
index 3ac38f6c0..6b5eb26dd 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java
@@ -117,7 +117,6 @@ public class BatchedPstmtHolder {
     BatchedPstmt[] values = stmtMap.values().toArray(new BatchedPstmt[stmtMap.values().size()]);
     clear();
 
-    // this loop
     for (BatchedPstmt bs : values) {
       try {
         if (!isError) {
@@ -130,12 +129,8 @@ public class BatchedPstmtHolder {
           next = next.getNextException();
         }
 
-        if (firstError == null) {
-          firstError = ex;
-          errorSql = bs.getSql();
-        } else {
-          logger.error("Error executing batched PreparedStatement", ex);
-        }
+        firstError = ex;
+        errorSql = bs.getSql();
         isError = true;
 
       } finally {
@@ -147,7 +142,6 @@ public class BatchedPstmtHolder {
       }
     }
 
-
     if (firstError != null) {
       String msg = "Error when batch flush on sql: " + errorSql;
       throw new BatchedSqlException(msg, firstError);

From bb6c9c84ba0cf666ebc6f62443bd7f2c0e3a588c Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 28 Jun 2019 10:55:14 +1200
Subject: [PATCH 0900/1036] #1736 - Bump to ebean-agent 11.40.1 (with synthetic
 modifier on generated code)

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 174979518..a7cf555b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -250,7 +250,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-agent</artifactId>
-      <version>11.39.1</version>
+      <version>11.40.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -330,7 +330,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>11.39.1</version>
+        <version>11.40.1</version>
         <executions>
           <execution>
             <id>test</id>

From 24b08663af4778412c9b34af0615cd8646c01b4a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 28 Jun 2019 20:16:05 +1200
Subject: [PATCH 0901/1036] #1737 - PersistenceException while using aggregate
 query on related entity

Fix excluding the ability to additionally join (off the min(manyToOne))
---
 .../server/deploy/BeanDescriptor.java         |  2 +-
 .../server/deploy/BeanPropertyAssocOne.java   |  5 +
 .../DynamicPropertyAggregationFormula.java    |  2 +-
 .../DynamicPropertyAggregationFormulaMTO.java | 28 ++++++
 .../server/deploy/FormulaPropertyPath.java    | 97 +++++++++++--------
 .../server/query/STreePropertyAssocOne.java   |  2 +-
 .../deploy/FormulaPropertyPathTest.java       |  4 +-
 .../TestAggregateFormula.java                 | 52 ++++++++++
 8 files changed, 148 insertions(+), 44 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormulaMTO.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 08d873a4f..d6c6d722a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -2576,7 +2576,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    */
   private STreeProperty findSqlTreeFormula(String formula, String path) {
     String key = formula + "-" + path;
-    return dynamicProperty.computeIfAbsent(key, (fullKey) -> new FormulaPropertyPath(this, formula, path).build());
+    return dynamicProperty.computeIfAbsent(key, (fullKey) -> FormulaPropertyPath.create(this, formula, path));
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index a5ffe9413..1e23e340b 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -23,6 +23,7 @@ import io.ebeaninternal.server.query.SqlBeanLoad;
 import io.ebeaninternal.server.query.SqlJoinType;
 import io.ebeaninternal.server.type.DataReader;
 import io.ebeaninternal.server.type.ScalarDataReader;
+import io.ebeaninternal.server.type.ScalarType;
 
 import javax.persistence.PersistenceException;
 import java.io.IOException;
@@ -465,6 +466,10 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     return targetDescriptor.getIdProperty();
   }
 
+  public ScalarType getIdScalarType() {
+    return targetDescriptor.getIdProperty().scalarType;
+  }
+
   /**
    * Return the Id values from the given bean.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
index 394266489..5a584f15a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
@@ -16,7 +16,7 @@ class DynamicPropertyAggregationFormula extends DynamicPropertyBase {
 
   private final boolean aggregate;
 
-  private final BeanProperty asTarget;
+  final BeanProperty asTarget;
 
   private final String alias;
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormulaMTO.java b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormulaMTO.java
new file mode 100644
index 000000000..d539dfef5
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormulaMTO.java
@@ -0,0 +1,28 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebeaninternal.server.query.SqlBeanLoad;
+
+public class DynamicPropertyAggregationFormulaMTO extends DynamicPropertyAggregationFormula {
+
+  private final BeanPropertyAssocOne prop;
+
+  DynamicPropertyAggregationFormulaMTO(BeanPropertyAssocOne prop, String name, String parsedFormula, boolean aggregate, BeanProperty asTarget, String alias) {
+    super(name, prop.getIdScalarType(), parsedFormula, aggregate, asTarget, alias);
+    this.prop = prop;
+  }
+
+  @Override
+  public void load(SqlBeanLoad sqlBeanLoad) {
+    Object value;
+    try {
+      value = prop.read(sqlBeanLoad.ctx());
+    } catch (Exception e) {
+      sqlBeanLoad.ctx().handleLoadError(fullName, e);
+      return;
+    }
+    if (asTarget != null) {
+      sqlBeanLoad.load(asTarget, value);
+    }
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java b/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
index 20926ceb0..183e17ffd 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
@@ -6,7 +6,7 @@ import io.ebeaninternal.server.type.ScalarType;
 
 import java.sql.Types;
 
-class FormulaPropertyPath {
+final class FormulaPropertyPath {
 
   private static final String[] AGG_FUNCTIONS = {"count", "max", "min", "avg", "sum"};
 
@@ -20,17 +20,22 @@ class FormulaPropertyPath {
 
   private final String internalExpression;
 
-  private final String path;
+  private final ElPropertyDeploy firstProp;
+
+  private final String parsedAggregation;
 
   private boolean countDistinct;
 
   private String cast;
   private String alias;
 
+  static STreeProperty create(BeanDescriptor<?> descriptor, String formula, String path) {
+    return new FormulaPropertyPath(descriptor, formula, path).build();
+  }
+
   FormulaPropertyPath(BeanDescriptor<?> descriptor, String formula, String path) {
     this.descriptor = descriptor;
     this.formula = formula;
-    this.path = path;
 
     int openBracket = formula.indexOf('(');
     int closeBracket = formula.lastIndexOf(')');
@@ -38,13 +43,21 @@ class FormulaPropertyPath {
       throw new IllegalStateException("Unable to parse formula [" + formula + "]");
     }
     outerFunction = formula.substring(0, openBracket).trim();
-    internalExpression = trimDistinct(formula.substring(openBracket+1, closeBracket));
+    internalExpression = trimDistinct(formula.substring(openBracket + 1, closeBracket));
 
-    if (closeBracket < formula.length() -1) {
+    if (closeBracket < formula.length() - 1) {
       // ::CastType as foo
-      String suffix = formula.substring(closeBracket+1).trim();
-      parseSuffix(suffix);
+      parseSuffix(formula.substring(closeBracket + 1).trim());
     }
+
+    DeployPropertyParser parser = descriptor.parser().setCatchFirst(true);
+    String parsed = parser.parse(internalExpression);
+    if (path != null) {
+      // fetch("machineStats", "sum(hours), sum(totalKms)")
+      parsed = parsed.replace("${}", "${" + path + "}");
+    }
+    this.parsedAggregation = buildFormula(parsed);
+    this.firstProp = parser.getFirstProp();
   }
 
   private void parseSuffix(String suffix) {
@@ -93,42 +106,50 @@ class FormulaPropertyPath {
 
   STreeProperty build() {
 
-    DeployPropertyParser parser = descriptor.parser().setCatchFirst(true);
-
-    String parsed = parser.parse(internalExpression);
-    if (path != null) {
-      // fetch("machineStats", "sum(hours), sum(totalKms)")
-      parsed = parsed.replace("${}", "${" + path + "}");
-    }
-
-    ElPropertyDeploy firstProp = parser.getFirstProp();
-
-    ScalarType<?> scalarType;
     if (cast != null) {
-      scalarType = descriptor.getScalarType(cast);
+      ScalarType<?> scalarType = descriptor.getScalarType(cast);
       if (scalarType == null) {
-        throw new IllegalStateException("Unable to find scalarType for cast of ["+cast+"] on formula [" + formula + "] for type " + descriptor);
-      }
-
-    } else if (isCount()) {
-      scalarType = descriptor.getScalarType(Types.BIGINT);
-
-    } else if (isConcat()) {
-      scalarType = descriptor.getScalarType(Types.VARCHAR);
-
-    } else {
-      // determine scalarType based on first property found by parser
-      if (firstProp != null) {
-        scalarType = firstProp.getBeanProperty().getScalarType();
-      } else {
-        throw new IllegalStateException("unable to determine scalarType of formula [" + formula + "] for type " + descriptor + " - maybe use a cast like ::String ?");
+        throw new IllegalStateException("Unable to find scalarType for cast of [" + cast + "] on formula [" + formula + "] for type " + descriptor);
       }
+      return create(scalarType);
+    }
+    if (isCount()) {
+      return create(descriptor.getScalarType(Types.BIGINT));
+    }
+    if (isConcat()) {
+      return create(descriptor.getScalarType(Types.VARCHAR));
+    }
+    if (firstProp == null) {
+      throw new IllegalStateException("unable to determine scalarType of formula [" + formula + "] for type " + descriptor + " - maybe use a cast like ::String ?");
     }
 
-    String logicalName = (alias == null) ? internalExpression : alias;
-    BeanProperty targetProperty = descriptor._findBeanProperty(logicalName);
-    String parsedAggregation = buildFormula(parsed);
-    return new DynamicPropertyAggregationFormula(logicalName, scalarType, parsedAggregation, isAggregate(), targetProperty, alias);
+    // determine scalarType based on first property found by parser
+    final BeanProperty property = firstProp.getBeanProperty();
+    if (!property.isAssocId()) {
+      return create(property.getScalarType());
+    } else {
+      return createManyToOne(property);
+    }
+  }
+
+  private DynamicPropertyAggregationFormula create(ScalarType<?> scalarType) {
+
+    String logicalName = logicalName();
+    return new DynamicPropertyAggregationFormula(logicalName, scalarType, parsedAggregation, isAggregate(), target(logicalName), alias);
+  }
+
+  private DynamicPropertyAggregationFormula createManyToOne(BeanProperty property) {
+
+    String logicalName = logicalName();
+    return new DynamicPropertyAggregationFormulaMTO((BeanPropertyAssocOne) property, logicalName, parsedAggregation, isAggregate(), target(logicalName), alias);
+  }
+
+  private BeanProperty target(String logicalName) {
+    return descriptor._findBeanProperty(logicalName);
+  }
+
+  private String logicalName() {
+    return (alias == null) ? internalExpression : alias;
   }
 
   private boolean isAggregate() {
diff --git a/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocOne.java
index c7d9c8f85..d53879fce 100644
--- a/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocOne.java
@@ -23,5 +23,5 @@ public interface STreePropertyAssocOne extends STreePropertyAssoc {
   /**
    * Return the property value as an entity bean from the parent.
    */
-  public EntityBean getValueAsEntityBean(EntityBean parentBean);
+  EntityBean getValueAsEntityBean(EntityBean parentBean);
 }
diff --git a/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java b/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java
index 92b839fbb..681e82bf1 100644
--- a/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java
+++ b/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java
@@ -76,8 +76,6 @@ public class FormulaPropertyPathTest extends BaseTestCase {
       assertThat(propertyPath.alias()).isNull();
     }
 
-    STreeProperty treeProperty = propertyPath.build();
-
-    assertThat(treeProperty).isNotNull();
+    assertThat(propertyPath.build()).isNotNull();
   }
 }
diff --git a/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java b/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java
index 4605e283e..471171e79 100644
--- a/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java
+++ b/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java
@@ -14,6 +14,58 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestAggregateFormula extends BaseTestCase {
 
+  @Test
+  public void minOnManyToOne() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    List<Contact> contacts = Ebean.find(Contact.class)
+      .select("lastName, min(customer)")
+      .findList();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select t0.last_name, min(t0.customer_id) from contact t0 group by t0.last_name");
+
+    assertThat(contacts).isNotEmpty();
+
+    Contact contact = contacts.get(0);
+    assertThat(contact.getLastName()).isNotNull();
+    assertThat(contact.getCustomer()).isNotNull();
+    assertThat(contact.getCustomer().getId()).isNotNull();
+  }
+
+//  @Test
+//  public void minOnManyToOne_withFetchQuery() {
+//
+//    ResetBasicData.reset();
+//
+//    LoggedSqlCollector.start();
+//
+//    List<Contact> contacts = Ebean.find(Contact.class)
+//      .select("lastName, min(customer)")
+//      .fetchQuery("customer", "name, status")
+//      //.fetch("customer.billingAddress", "city, country")
+//      .findList();
+//
+//    for (Contact contact : contacts) {
+//      contact.getCustomer().getName();
+//    }
+//
+//    List<String> sql = LoggedSqlCollector.stop();
+//    assertThat(sql).hasSize(2);
+//    assertThat(sql.get(0)).contains("select t0.last_name, min(t0.customer_id) from contact t0 group by t0.last_name");
+//    assertThat(sql.get(1)).contains("select t0.id, t0.name, t0.status from o_customer t0 where");
+//
+//    assertThat(contacts).isNotEmpty();
+//
+//    Contact contact = contacts.get(0);
+//    assertThat(contact.getLastName()).isNotNull();
+//    assertThat(contact.getCustomer()).isNotNull();
+//    assertThat(contact.getCustomer().getId()).isNotNull();
+//  }
+
   @Test
   public void sum_withoutAlias() {
 

From a932d61a94da46a4bc4b48a9f96fa838f4a0c238 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 28 Jun 2019 21:03:14 +1200
Subject: [PATCH 0902/1036] #1737 - PersistenceException while using aggregate
 query on related entity

This part includes support for joins off an aggregation formula
on a ManyToOne.

e.g. We use min(customer) ... to 'query join' to customer
in the query below.

    List<Contact> contacts = Ebean.find(Contact.class)
      .select("lastName, min(customer)")
      .fetchQuery("customer", "name, status")
      .findList();
---
 .../DynamicPropertyAggregationFormulaMTO.java |  5 +
 .../server/query/STreeProperty.java           |  7 ++
 .../server/query/SqlTreeBuilder.java          | 19 +++-
 .../server/query/SqlTreeProperties.java       | 38 ++++----
 .../server/querydefn/OrmQueryProperties.java  | 20 +---
 .../java/io/ebean/plugin/BeanTypeTest.java    |  8 +-
 .../TestAggregateFormula.java                 | 97 +++++++++++++------
 7 files changed, 122 insertions(+), 72 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormulaMTO.java b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormulaMTO.java
index d539dfef5..eb8ba9997 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormulaMTO.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormulaMTO.java
@@ -11,6 +11,11 @@ public class DynamicPropertyAggregationFormulaMTO extends DynamicPropertyAggrega
     this.prop = prop;
   }
 
+  @Override
+  public boolean isAggregationManyToOne() {
+    return true;
+  }
+
   @Override
   public void load(SqlBeanLoad sqlBeanLoad) {
     Object value;
diff --git a/src/main/java/io/ebeaninternal/server/query/STreeProperty.java b/src/main/java/io/ebeaninternal/server/query/STreeProperty.java
index b0c2ee916..95911b026 100644
--- a/src/main/java/io/ebeaninternal/server/query/STreeProperty.java
+++ b/src/main/java/io/ebeaninternal/server/query/STreeProperty.java
@@ -39,6 +39,13 @@ public interface STreeProperty extends ScalarDataReader<Object> {
    */
   boolean isAggregation();
 
+  /**
+   * Return true if the property is an aggregation on a ManyToOne.
+   */
+  default boolean isAggregationManyToOne() {
+    return false;
+  }
+
   /**
    * Return true if the property is a formula.
    */
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 4d881ab2a..8d15d0085 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -273,10 +273,7 @@ public final class SqlTreeBuilder {
     OrmQueryProperties queryProps = queryDetail.getChunk(prefix, false);
     SqlTreeProperties props = getBaseSelect(desc, queryProps);
 
-    if (prefix != null) {
-      // check for aggregation on a fetch
-      props.checkAggregation();
-    } else if (!rawSql) {
+    if (prefix == null && !rawSql) {
       if (props.requireSqlDistinct(manyWhereJoins)) {
         sqlDistinct = true;
       }
@@ -479,12 +476,24 @@ public final class SqlTreeBuilder {
     // Also note that this can include transient properties.
     // This makes sense for transient properties used to
     // hold sum() count() type values (with SqlSelect)
-    for (String propName : queryProps.getSelectProperties()) {
+    final Set<String> selectInclude = queryProps.getSelectInclude();
+    for (String propName : selectInclude) {
       if (!propName.isEmpty()) {
         addProperty(selectProps, desc, queryProps, propName);
       }
     }
 
+    if (!selectProps.isAggregationManyToOne()) {
+      final Set<String> selectQueryJoin = queryProps.getSelectQueryJoin();
+      if (selectQueryJoin != null) {
+        for (String joinProperty : selectQueryJoin) {
+          if (!selectInclude.contains(joinProperty)) {
+            addProperty(selectProps, desc, queryProps, joinProperty);
+          }
+        }
+      }
+    }
+
     return selectProps;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
index f51240a12..d36a0f2cd 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
@@ -29,6 +29,8 @@ public class SqlTreeProperties {
 
   private boolean allProperties;
 
+  private boolean aggregationManyToOne;
+
   private boolean aggregation;
 
   private String aggregationPath;
@@ -47,6 +49,15 @@ public class SqlTreeProperties {
   public void add(STreeProperty prop) {
     propsList.add(prop);
     propNames.add(prop.getName());
+    if (prop.isAggregation()) {
+      if (!aggregation) {
+        aggregation = true;
+        aggregationPath = prop.getElPrefix();
+      }
+      if (prop.isAggregationManyToOne()) {
+        aggregationManyToOne = true;
+      }
+    }
   }
 
   public STreeProperty[] getProps() {
@@ -85,6 +96,13 @@ public class SqlTreeProperties {
     }
   }
 
+  /**
+   * Return true if this is an aggregation formula on a ManyToOne.
+   */
+  boolean isAggregationManyToOne() {
+    return aggregationManyToOne;
+  }
+
   /**
    * Return true if this contains an aggregation property.
    */
@@ -92,33 +110,17 @@ public class SqlTreeProperties {
     return aggregation;
   }
 
-  /**
-   * Check for aggregation (need for groug by clause).
-   */
-  public void checkAggregation() {
-    aggregationJoin();
-  }
-
   /**
    * Return the property to join for aggregation.
    */
   private String aggregationJoin() {
-    if (!allProperties) {
-      for (STreeProperty beanProperty : propsList) {
-        if (beanProperty.isAggregation()) {
-          aggregation = true;
-          aggregationPath = beanProperty.getElPrefix();
-          return aggregationPath;
-        }
-      }
-    }
-    return null;
+    return aggregationPath;
   }
 
   /**
    * Return true if a top level aggregation which means the Id property must be excluded.
    */
-  public boolean isAggregationRoot() {
+  boolean isAggregationRoot() {
     return aggregation && (aggregationPath == null);
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
index 964250c4a..ca7a4828e 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
@@ -348,22 +348,12 @@ public class OrmQueryProperties implements Serializable {
     includedBeanJoin.add(propertyName);
   }
 
-  /**
-   * This excludes the bean joined properties.
-   * <p>
-   * This is because bean joins will have there own node in the SqlTree.
-   * </p>
-   */
-  public Set<String> getSelectProperties() {
+  public Set<String> getSelectInclude() {
+    return included;
+  }
 
-    if (secondaryQueryJoins == null) {
-      return included;
-    }
-
-    LinkedHashSet<String> temp = new LinkedHashSet<>(2 * (secondaryQueryJoins.size() + included.size()));
-    temp.addAll(included);
-    temp.addAll(secondaryQueryJoins);
-    return temp;
+  public Set<String> getSelectQueryJoin() {
+    return secondaryQueryJoins;
   }
 
   void addSecondaryQueryJoin(String property) {
diff --git a/src/test/java/io/ebean/plugin/BeanTypeTest.java b/src/test/java/io/ebean/plugin/BeanTypeTest.java
index 42cfb3aa2..2b880805a 100644
--- a/src/test/java/io/ebean/plugin/BeanTypeTest.java
+++ b/src/test/java/io/ebean/plugin/BeanTypeTest.java
@@ -25,9 +25,9 @@ import static org.junit.Assert.assertTrue;
 
 public class BeanTypeTest {
 
-  static Database db = DB.getDefault();
+  private static Database db = DB.getDefault();
 
-  <T> BeanType<T> beanType(Class<T> cls) {
+  private <T> BeanType<T> beanType(Class<T> cls) {
     return db.getPluginApi().getBeanType(cls);
   }
 
@@ -177,11 +177,9 @@ public class BeanTypeTest {
     beanType(Order.class).docStore().applyPath(orderQuery);
 
     OrmQueryDetail detail = orderQuery.getDetail();
-    assertThat(detail.getChunk("customer", false).getSelectProperties())
-      .containsExactly("id", "name");
+    assertThat(detail.getChunk("customer", false).getSelectInclude()).containsExactly("id", "name");
   }
 
-
   @Test(expected = IllegalStateException.class)
   public void docStoreIndex() throws Exception {
     beanType(Order.class).docStore().index(1, new Order(), null);
diff --git a/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java b/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java
index 471171e79..16be122b1 100644
--- a/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java
+++ b/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java
@@ -4,13 +4,16 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
+import org.tests.model.basic.Address;
 import org.tests.model.basic.Contact;
+import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
 
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertNotNull;
 
 public class TestAggregateFormula extends BaseTestCase {
 
@@ -36,35 +39,71 @@ public class TestAggregateFormula extends BaseTestCase {
     assertThat(contact.getCustomer().getId()).isNotNull();
   }
 
-//  @Test
-//  public void minOnManyToOne_withFetchQuery() {
-//
-//    ResetBasicData.reset();
-//
-//    LoggedSqlCollector.start();
-//
-//    List<Contact> contacts = Ebean.find(Contact.class)
-//      .select("lastName, min(customer)")
-//      .fetchQuery("customer", "name, status")
-//      //.fetch("customer.billingAddress", "city, country")
-//      .findList();
-//
-//    for (Contact contact : contacts) {
-//      contact.getCustomer().getName();
-//    }
-//
-//    List<String> sql = LoggedSqlCollector.stop();
-//    assertThat(sql).hasSize(2);
-//    assertThat(sql.get(0)).contains("select t0.last_name, min(t0.customer_id) from contact t0 group by t0.last_name");
-//    assertThat(sql.get(1)).contains("select t0.id, t0.name, t0.status from o_customer t0 where");
-//
-//    assertThat(contacts).isNotEmpty();
-//
-//    Contact contact = contacts.get(0);
-//    assertThat(contact.getLastName()).isNotNull();
-//    assertThat(contact.getCustomer()).isNotNull();
-//    assertThat(contact.getCustomer().getId()).isNotNull();
-//  }
+  @Test
+  public void minOnManyToOne_withFetchQuery() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    List<Contact> contacts = Ebean.find(Contact.class)
+      .select("lastName, min(customer)")
+      .fetchQuery("customer", "name, status")
+      .findList();
+
+    for (Contact contact : contacts) {
+      Customer customer = contact.getCustomer();
+      assertNotNull(customer.getName());
+      assertNotNull(customer.getStatus());
+    }
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("select t0.last_name, min(t0.customer_id) from contact t0 group by t0.last_name");
+    assertThat(sql.get(1)).contains("select t0.id, t0.name, t0.status from o_customer t0 where");
+
+    assertThat(contacts).isNotEmpty();
+
+    Contact contact = contacts.get(0);
+    assertThat(contact.getLastName()).isNotNull();
+    assertThat(contact.getCustomer()).isNotNull();
+    assertThat(contact.getCustomer().getId()).isNotNull();
+  }
+
+  @Test
+  public void minOnManyToOne_withFetchQueryWithJoin() {
+
+    ResetBasicData.reset();
+    LoggedSqlCollector.start();
+
+    List<Contact> contacts = Ebean.find(Contact.class)
+      .select("lastName, min(customer)")
+      .fetchQuery("customer", "name, status")
+      .fetch("customer.billingAddress", "city, country")
+      .findList();
+
+    for (Contact contact : contacts) {
+      Customer customer = contact.getCustomer();
+      assertNotNull(customer.getName());
+      assertNotNull(customer.getStatus());
+      final Address billingAddress = customer.getBillingAddress();
+      if (billingAddress != null) {
+        assertNotNull(billingAddress.getCountry());
+      }
+    }
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("select t0.last_name, min(t0.customer_id) from contact t0 group by t0.last_name");
+    assertThat(sql.get(1)).contains("select t0.id, t0.name, t0.status, t1.id, t1.city, t1.country_code from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id  where");
+
+    assertThat(contacts).isNotEmpty();
+
+    Contact contact = contacts.get(0);
+    assertThat(contact.getLastName()).isNotNull();
+    assertThat(contact.getCustomer()).isNotNull();
+    assertThat(contact.getCustomer().getId()).isNotNull();
+  }
 
   @Test
   public void sum_withoutAlias() {

From 270369bd65c3f695a1cf0ff2a00a40be542dc47e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 28 Jun 2019 21:20:42 +1200
Subject: [PATCH 0903/1036] #1738 - Refactor tidy internals - DLoadContext

---
 .../server/loadcontext/DLoadContext.java      | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
index 1ecfe8e11..1f2e2e297 100644
--- a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
+++ b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
@@ -49,7 +49,7 @@ public class DLoadContext implements LoadContext {
   private final boolean disableLazyLoading;
   private final boolean disableReadAudit;
   private final boolean includeSoftDeletes;
-  protected final boolean useDocStore;
+  final boolean useDocStore;
 
   /**
    * The path relative to the root of the object graph.
@@ -137,7 +137,7 @@ public class DLoadContext implements LoadContext {
   /**
    * Return the query plan label of the origin query.
    */
-  public String getPlanLabel() {
+  String getPlanLabel() {
     return planLabel;
   }
 
@@ -180,7 +180,7 @@ public class DLoadContext implements LoadContext {
     registerSecondaryNode(many, props);
   }
 
-  protected boolean isBeanCacheGet() {
+  boolean isBeanCacheGet() {
     return useBeanCache.isGet();
   }
 
@@ -247,7 +247,7 @@ public class DLoadContext implements LoadContext {
     return new ObjectGraphNode(origin, path);
   }
 
-  protected String getFullPath(String path) {
+  String getFullPath(String path) {
     if (relativePath == null) {
       return path;
     } else {
@@ -295,12 +295,11 @@ public class DLoadContext implements LoadContext {
     getManyContext(path).register(bc);
   }
 
-  protected DLoadBeanContext getBeanContext(String path) {
+  DLoadBeanContext getBeanContext(String path) {
     if (path == null) {
       return rootBeanContext;
     }
-    DLoadBeanContext beanContext = beanMap.computeIfAbsent(path, p -> createBeanContext(p, defaultBatchSize, null));
-    return beanContext;
+    return beanMap.computeIfAbsent(path, p -> createBeanContext(p, defaultBatchSize, null));
   }
 
   private void registerSecondaryNode(boolean many, OrmQueryProperties props) {
@@ -321,27 +320,23 @@ public class DLoadContext implements LoadContext {
     }
   }
 
-  protected DLoadManyContext getManyContext(String path) {
+  DLoadManyContext getManyContext(String path) {
     if (path == null) {
       throw new RuntimeException("path is null?");
     }
-    DLoadManyContext ctx = manyMap.computeIfAbsent(path, p -> createManyContext(p, defaultBatchSize, null));
-    return ctx;
+    return manyMap.computeIfAbsent(path, p -> createManyContext(p, defaultBatchSize, null));
   }
 
   private DLoadManyContext createManyContext(String path, int batchSize, OrmQueryProperties queryProps) {
 
     BeanPropertyAssocMany<?> p = (BeanPropertyAssocMany<?>) getBeanProperty(rootDescriptor, path);
-
     return new DLoadManyContext(this, p, path, batchSize, queryProps);
   }
 
   private DLoadBeanContext createBeanContext(String path, int batchSize, OrmQueryProperties queryProps) {
 
     BeanPropertyAssoc<?> p = (BeanPropertyAssoc<?>) getBeanProperty(rootDescriptor, path);
-    BeanDescriptor<?> targetDescriptor = p.getTargetDescriptor();
-
-    return new DLoadBeanContext(this, targetDescriptor, path, batchSize, queryProps);
+    return new DLoadBeanContext(this, p.getTargetDescriptor(), path, batchSize, queryProps);
   }
 
   private BeanProperty getBeanProperty(BeanDescriptor<?> desc, String path) {
@@ -351,7 +346,7 @@ public class DLoadContext implements LoadContext {
   /**
    * Propagate the original query settings (draft, asOf etc) to the secondary queries.
    */
-  public void propagateQueryState(SpiQuery<?> query, boolean docStoreMapped) {
+  void propagateQueryState(SpiQuery<?> query, boolean docStoreMapped) {
     if (useDocStore && docStoreMapped) {
       query.setUseDocStore(true);
     }

From 2225d5b7e8391ec12f00afc81e483223dc2d45d9 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 28 Jun 2019 21:30:15 +1200
Subject: [PATCH 0904/1036] #1738 - Refactor tidy internals - refactor move
 DtoQueryRequest

---
 src/main/java/io/ebeaninternal/server/core/DefaultServer.java   | 2 +-
 src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java | 2 +-
 .../io/ebeaninternal/server/core/InternalConfiguration.java     | 2 +-
 .../io/ebeaninternal/server/query/{dto => }/DtoQueryEngine.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename src/main/java/io/ebeaninternal/server/query/{dto => }/DtoQueryEngine.java (97%)

diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index dc54b4b39..8fa29c15d 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -102,7 +102,7 @@ import io.ebeaninternal.server.query.LimitOffsetPagedList;
 import io.ebeaninternal.server.query.QueryFutureIds;
 import io.ebeaninternal.server.query.QueryFutureList;
 import io.ebeaninternal.server.query.QueryFutureRowCount;
-import io.ebeaninternal.server.query.dto.DtoQueryEngine;
+import io.ebeaninternal.server.query.DtoQueryEngine;
 import io.ebeaninternal.server.querydefn.DefaultDtoQuery;
 import io.ebeaninternal.server.querydefn.DefaultOrmQuery;
 import io.ebeaninternal.server.querydefn.DefaultOrmUpdate;
diff --git a/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
index 6fd5218df..922fc1a0d 100644
--- a/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
@@ -7,7 +7,7 @@ import io.ebeaninternal.server.dto.DtoColumn;
 import io.ebeaninternal.server.dto.DtoMappingRequest;
 import io.ebeaninternal.server.dto.DtoQueryPlan;
 import io.ebeaninternal.server.persist.Binder;
-import io.ebeaninternal.server.query.dto.DtoQueryEngine;
+import io.ebeaninternal.server.query.DtoQueryEngine;
 import io.ebeaninternal.server.type.DataReader;
 import io.ebeaninternal.server.type.RsetDataReader;
 
diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index 3d9486be9..a2aefa3ec 100644
--- a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -65,7 +65,7 @@ import io.ebeaninternal.server.persist.platform.PostgresMultiValueBind;
 import io.ebeaninternal.server.query.CQueryEngine;
 import io.ebeaninternal.server.query.DefaultOrmQueryEngine;
 import io.ebeaninternal.server.query.DefaultRelationalQueryEngine;
-import io.ebeaninternal.server.query.dto.DtoQueryEngine;
+import io.ebeaninternal.server.query.DtoQueryEngine;
 import io.ebeaninternal.server.readaudit.DefaultReadAuditLogger;
 import io.ebeaninternal.server.readaudit.DefaultReadAuditPrepare;
 import io.ebeaninternal.server.text.json.DJsonContext;
diff --git a/src/main/java/io/ebeaninternal/server/query/dto/DtoQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java
similarity index 97%
rename from src/main/java/io/ebeaninternal/server/query/dto/DtoQueryEngine.java
rename to src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java
index fceed1465..017a53695 100644
--- a/src/main/java/io/ebeaninternal/server/query/dto/DtoQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.query.dto;
+package io.ebeaninternal.server.query;
 
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.core.DtoQueryRequest;

From d70da1d805f56d0f86ab72a9ac4dc22d37d1e085 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 28 Jun 2019 21:32:15 +1200
Subject: [PATCH 0905/1036] #1738 - Refactor tidy internals - refactor move
 server.lib.Str

---
 .../server/core/AbstractSqlQueryRequest.java         |  2 +-
 .../server/core/PersistRequestUpdateSql.java         |  2 +-
 .../io/ebeaninternal/server/lib/{util => }/Str.java  |  2 +-
 .../io/ebeaninternal/server/lib/util/package.html    | 12 ------------
 .../ebeaninternal/server/persist/dml/DmlHandler.java |  2 +-
 .../io/ebeaninternal/server/query/CQueryEngine.java  |  2 +-
 .../server/transaction/JdbcTransaction.java          |  2 +-
 .../server/transaction/SavepointTransaction.java     |  2 +-
 8 files changed, 7 insertions(+), 19 deletions(-)
 rename src/main/java/io/ebeaninternal/server/lib/{util => }/Str.java (95%)
 delete mode 100644 src/main/java/io/ebeaninternal/server/lib/util/package.html

diff --git a/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
index bd7aa0de9..a2bf783db 100644
--- a/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
@@ -8,7 +8,7 @@ import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.SpiSqlBinding;
 import io.ebeaninternal.api.SpiTransaction;
-import io.ebeaninternal.server.lib.util.Str;
+import io.ebeaninternal.server.lib.Str;
 import io.ebeaninternal.server.persist.Binder;
 import io.ebeaninternal.server.persist.TrimLogSql;
 import io.ebeaninternal.server.util.BindParamsParser;
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
index 7efe8ac49..a0ebdbef1 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.core;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiSqlUpdate;
 import io.ebeaninternal.api.SpiTransaction;
-import io.ebeaninternal.server.lib.util.Str;
+import io.ebeaninternal.server.lib.Str;
 import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeaninternal.server.persist.PersistExecute;
 import io.ebeaninternal.server.persist.TrimLogSql;
diff --git a/src/main/java/io/ebeaninternal/server/lib/util/Str.java b/src/main/java/io/ebeaninternal/server/lib/Str.java
similarity index 95%
rename from src/main/java/io/ebeaninternal/server/lib/util/Str.java
rename to src/main/java/io/ebeaninternal/server/lib/Str.java
index 9f72e7127..2980331ec 100644
--- a/src/main/java/io/ebeaninternal/server/lib/util/Str.java
+++ b/src/main/java/io/ebeaninternal/server/lib/Str.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.lib.util;
+package io.ebeaninternal.server.lib;
 
 /**
  * String utility for adding strings together.
diff --git a/src/main/java/io/ebeaninternal/server/lib/util/package.html b/src/main/java/io/ebeaninternal/server/lib/util/package.html
deleted file mode 100644
index 4f128ef71..000000000
--- a/src/main/java/io/ebeaninternal/server/lib/util/package.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<HTML>
-<HEAD>
-  <META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=iso-8859-1">
-  <TITLE>AvajeLib</TITLE>
-</HEAD>
-<Body BGCOLOR="#ffffff">
-General utility objects.
-
-<P>Provides general utility objects.
-</P>
-</Body>
-</HTML>
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
index ad770bcaf..a7a528219 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.persist.dml;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.deploy.BeanProperty;
-import io.ebeaninternal.server.lib.util.Str;
+import io.ebeaninternal.server.lib.Str;
 import io.ebeaninternal.server.persist.BatchedPstmt;
 import io.ebeaninternal.server.persist.BatchedPstmtHolder;
 import io.ebeaninternal.server.persist.dmlbind.BindableRequest;
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
index 33f9bf143..9dedbaf7a 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
@@ -17,7 +17,7 @@ import io.ebeaninternal.server.core.Message;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.core.SpiResultSet;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.lib.util.Str;
+import io.ebeaninternal.server.lib.Str;
 import io.ebeaninternal.server.persist.Binder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index 5e1e258c2..fceefc682 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -14,7 +14,7 @@ import io.ebeaninternal.api.TransactionEvent;
 import io.ebeaninternal.api.TxnProfileEventCodes;
 import io.ebeaninternal.server.core.PersistDeferredRelationship;
 import io.ebeaninternal.server.core.PersistRequestBean;
-import io.ebeaninternal.server.lib.util.Str;
+import io.ebeaninternal.server.lib.Str;
 import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeaninternal.server.persist.BatchedSqlException;
 import io.ebeanservice.docstore.api.DocStoreTransaction;
diff --git a/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
index 7987201e2..271cb1144 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.transaction;
 
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.api.SpiTransactionProxy;
-import io.ebeaninternal.server.lib.util.Str;
+import io.ebeaninternal.server.lib.Str;
 
 import javax.persistence.PersistenceException;
 import java.sql.Connection;

From 5404dab5a3daa022935987047ad42276d6d083e4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 28 Jun 2019 21:35:02 +1200
Subject: [PATCH 0906/1036] Bump to 11.40.1-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a7cf555b1..89bf42dc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.39.4-SNAPSHOT</version>
+  <version>11.40.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>

From 93cc0399f1eb0f2e7258b551bbb9b2f63ba48e66 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 28 Jun 2019 22:35:36 +1200
Subject: [PATCH 0907/1036] #1738 - Refactor SqlTreeNodeBean load method

---
 .../server/query/SqlTreeNodeBean.java         | 331 +++++++++++-------
 1 file changed, 203 insertions(+), 128 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
index 10fcca6c0..7d34f44f6 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
@@ -218,28 +218,20 @@ class SqlTreeNodeBean implements SqlTreeNode {
   }
 
   /**
-   * read the properties from the resultSet.
+   * Load that takes into account inheritance.
    */
-  @Override
-  public EntityBean load(DbReadContext ctx, EntityBean parentBean, EntityBean contextParent) throws SQLException {
+  private class LoadInherit extends Load {
 
-    Object lazyLoadParentId = null;
-    if (lazyLoadParentIdBinder != null) {
-      lazyLoadParentId = lazyLoadParentIdBinder.read(ctx);
+    LoadInherit(DbReadContext ctx, EntityBean parentBean, EntityBean contextParent) {
+      super(ctx, parentBean, contextParent);
     }
 
-    Class<?> localType;
-    STreeType localDesc;
-    IdBinder localIdBinder;
-    EntityBean localBean;
-
-    if (inheritInfo != null) {
+    @Override
+    void initBeanType() throws SQLException {
       InheritInfo localInfo = inheritInfo.readType(ctx);
       if (localInfo == null) {
         // the bean must be null
         localIdBinder = idBinder;
-        localBean = null;
-        localType = null;
         localDesc = desc;
       } else {
         localBean = localInfo.createEntityBean();
@@ -247,65 +239,10 @@ class SqlTreeNodeBean implements SqlTreeNode {
         localIdBinder = localInfo.getIdBinder();
         localDesc = localInfo.desc();
       }
-
-    } else {
-      localType = null;
-      localDesc = desc;
-      localBean = desc.createEntityBean();
-      localIdBinder = idBinder;
     }
 
-    Mode queryMode = ctx.getQueryMode();
-
-    PersistenceContext persistenceContext = (!readId || temporalVersions) ? null : ctx.getPersistenceContext();
-
-    // bean already existing in the persistence context
-    EntityBean contextBean = null;
-    if (readId) {
-      Object id = localIdBinder.readSet(ctx, localBean);
-      if (id == null) {
-        // bean must be null...
-        localBean = null;
-
-        // ... but there may exist as reference bean in parent which has to be marked as deleted.
-        if (parentBean != null && nodeBeanProp instanceof STreePropertyAssocOne) {
-          contextBean = ((STreePropertyAssocOne)nodeBeanProp).getValueAsEntityBean(parentBean);
-          if (contextBean != null) {
-            desc.markAsDeleted(contextBean);
-          }
-        }
-      } else if (!temporalVersions) {
-        // check the PersistenceContext to see if the bean already exists
-        contextBean = (EntityBean) localDesc.contextPutIfAbsent(persistenceContext, id, localBean);
-        if (contextBean == null) {
-          // bean just added to the persistenceContext
-          contextBean = localBean;
-        } else {
-          // bean already exists in persistenceContext
-          if (isLoadContextBeanNeeded(queryMode, contextBean)) {
-            // refresh it anyway (lazy loading for example)
-            localBean = contextBean;
-          } else {
-            // ignore the DB data...
-            localBean = null;
-          }
-        }
-      }
-    }
-
-    ctx.setCurrentPrefix(prefix, pathMap);
-
-    ctx.propagateState(localBean);
-
-    SqlBeanLoad sqlBeanLoad = new SqlBeanLoad(ctx, localType, localBean, queryMode);
-
-    if (inheritInfo == null) {
-      // normal behavior with no inheritance
-      for (STreeProperty property : properties) {
-        property.load(sqlBeanLoad);
-      }
-
-    } else {
+    @Override
+    void loadProperties() {
       // take account of inheritance and due to subclassing approach
       // need to get a 'local' version of the property
       for (STreeProperty property : properties) {
@@ -313,82 +250,220 @@ class SqlTreeNodeBean implements SqlTreeNode {
         localDesc.inheritanceLoad(sqlBeanLoad, property, ctx);
       }
     }
+  }
 
-    boolean lazyLoadMany = false;
-    if (localBean == null && queryMode == Mode.LAZYLOAD_MANY) {
-      // batch lazy load many into existing contextBean
-      localBean = contextBean;
-      lazyLoadMany = true;
+  /**
+   * Load a bean instance.
+   */
+  private class Load {
+
+    final DbReadContext ctx;
+    final EntityBean parentBean;
+    final EntityBean contextParent;
+
+    Object lazyLoadParentId;
+    Class<?> localType;
+    STreeType localDesc;
+    IdBinder localIdBinder;
+    EntityBean localBean;
+
+    Mode queryMode;
+    PersistenceContext persistenceContext;
+    Object id;
+    EntityBean contextBean;
+    SqlBeanLoad sqlBeanLoad;
+    boolean lazyLoadMany;
+
+    Load(DbReadContext ctx, EntityBean parentBean, EntityBean contextParent) {
+      this.ctx = ctx;
+      this.parentBean = parentBean;
+      this.contextParent = contextParent;
     }
 
-    // recursively continue reading...
-    for (SqlTreeNode aChildren : children) {
-      // read each child... and let them set their
-      // values back to this localBean
-      aChildren.load(ctx, localBean, contextBean);
+    void initLazyParent() throws SQLException {
+      if (lazyLoadParentIdBinder != null) {
+        lazyLoadParentId = lazyLoadParentIdBinder.read(ctx);
+      }
     }
 
-    if (queryMode == Mode.LAZYLOAD_MANY && isRoot()) {
-      return contextBean;
+    void initBeanType() throws SQLException {
+      localDesc = desc;
+      localBean = desc.createEntityBean();
+      localIdBinder = idBinder;
     }
 
-    if (!lazyLoadMany && localBean != null) {
-      ctx.setCurrentPrefix(prefix, pathMap);
-      if (readId && !temporalVersions) {
-        createListProxies(localDesc, ctx, localBean, disableLazyLoad);
-      }
-      if (temporalMode == SpiQuery.TemporalMode.DRAFT) {
-        localDesc.setDraft(localBean);
-      }
-      localDesc.postLoad(localBean);
+    void initPersistenceContext() {
+      queryMode = ctx.getQueryMode();
+      persistenceContext = (!readId || temporalVersions) ? null : ctx.getPersistenceContext();
+    }
 
-      EntityBeanIntercept ebi = localBean._ebean_getIntercept();
-      ebi.setPersistenceContext(persistenceContext);
-      if (Mode.LAZYLOAD_BEAN == queryMode) {
-        // Lazy Load does not reset the dirty state
-        ebi.setLoadedLazy();
-      } else if (readId) {
-        // normal bean loading
-        ebi.setLoaded();
-      }
-
-      if (disableLazyLoad) {
-        // bean does not have an Id or is SqlSelect based
-        ebi.setDisableLazyLoad(true);
-
-      } else if (partialObject) {
-        if (readId) {
-          // register for lazy loading
-          ctx.register(null, ebi);
+    void readId() throws SQLException {
+      if (readId) {
+        id = localIdBinder.readSet(ctx, localBean);
+        if (id == null) {
+          readIdNullBean();
+        } else if (!temporalVersions) {
+          readIdBean();
         }
+      }
+    }
+
+    private void readIdBean() {
+      // check the PersistenceContext to see if the bean already exists
+      contextBean = (EntityBean) localDesc.contextPutIfAbsent(persistenceContext, id, localBean);
+      if (contextBean == null) {
+        // bean just added to the persistenceContext
+        contextBean = localBean;
       } else {
-        ebi.setFullyLoadedBean(true);
-      }
-
-      if (ctx.isAutoTuneProfiling() && !disableLazyLoad) {
-        // collect autoTune profiling for this bean...
-        ctx.profileBean(ebi, prefix);
+        // bean already exists in persistenceContext
+        if (isLoadContextBeanNeeded(queryMode, contextBean)) {
+          // refresh it anyway (lazy loading for example)
+          localBean = contextBean;
+        } else {
+          // ignore the DB data...
+          localBean = null;
+        }
       }
     }
 
-    if (parentBean != null) {
-      // set this back to the parentBean
-      nodeBeanProp.setValue(parentBean, contextBean);
+    private void readIdNullBean() {
+      // bean must be null...
+      localBean = null;
+
+      // ... but there may exist as reference bean in parent which has to be marked as deleted.
+      if (parentBean != null && nodeBeanProp instanceof STreePropertyAssocOne) {
+        contextBean = ((STreePropertyAssocOne)nodeBeanProp).getValueAsEntityBean(parentBean);
+        if (contextBean != null) {
+          desc.markAsDeleted(contextBean);
+        }
+      }
     }
 
-    if (!readId || temporalVersions) {
-      // a bean with no Id (never found in context)
-      if (lazyLoadParentId != null) {
-        ctx.setLazyLoadedChildBean(localBean, lazyLoadParentId);
-      }
-      return localBean;
+    void initSqlLoadBean() {
+      ctx.setCurrentPrefix(prefix, pathMap);
+      ctx.propagateState(localBean);
+      sqlBeanLoad = new SqlBeanLoad(ctx, localType, localBean, queryMode);
+    }
 
-    } else {
-      if (lazyLoadParentId != null) {
-        ctx.setLazyLoadedChildBean(contextBean, lazyLoadParentId);
+    void loadProperties() {
+      for (STreeProperty property : properties) {
+        property.load(sqlBeanLoad);
       }
+    }
+
+    void loadChildren() throws SQLException {
+      //boolean lazyLoadMany = false;
+      if (localBean == null && queryMode == Mode.LAZYLOAD_MANY) {
+        // batch lazy load many into existing contextBean
+        localBean = contextBean;
+        lazyLoadMany = true;
+      }
+
+      // recursively continue reading...
+      for (SqlTreeNode aChildren : children) {
+        // read each child... and let them set their
+        // values back to this localBean
+        aChildren.load(ctx, localBean, contextBean);
+      }
+    }
+
+    boolean isLazyLoadManyRoot() {
+      return queryMode == Mode.LAZYLOAD_MANY && isRoot();
+    }
+
+    EntityBean getContextBean() {
       return contextBean;
     }
+
+    void postLoad() {
+      if (!lazyLoadMany && localBean != null) {
+        ctx.setCurrentPrefix(prefix, pathMap);
+        if (readId && !temporalVersions) {
+          createListProxies(localDesc, ctx, localBean, disableLazyLoad);
+        }
+        if (temporalMode == SpiQuery.TemporalMode.DRAFT) {
+          localDesc.setDraft(localBean);
+        }
+        localDesc.postLoad(localBean);
+
+        EntityBeanIntercept ebi = localBean._ebean_getIntercept();
+        ebi.setPersistenceContext(persistenceContext);
+        if (Mode.LAZYLOAD_BEAN == queryMode) {
+          // Lazy Load does not reset the dirty state
+          ebi.setLoadedLazy();
+        } else if (readId) {
+          // normal bean loading
+          ebi.setLoaded();
+        }
+
+        if (disableLazyLoad) {
+          // bean does not have an Id or is SqlSelect based
+          ebi.setDisableLazyLoad(true);
+
+        } else if (partialObject) {
+          if (readId) {
+            // register for lazy loading
+            ctx.register(null, ebi);
+          }
+        } else {
+          ebi.setFullyLoadedBean(true);
+        }
+
+        if (ctx.isAutoTuneProfiling() && !disableLazyLoad) {
+          // collect autoTune profiling for this bean...
+          ctx.profileBean(ebi, prefix);
+        }
+      }
+    }
+
+    void setBeanToParent() {
+      if (parentBean != null) {
+        // set this back to the parentBean
+        nodeBeanProp.setValue(parentBean, contextBean);
+      }
+    }
+
+    EntityBean complete() {
+      if (!readId || temporalVersions) {
+        // a bean with no Id (never found in context)
+        if (lazyLoadParentId != null) {
+          ctx.setLazyLoadedChildBean(localBean, lazyLoadParentId);
+        }
+        return localBean;
+
+      } else {
+        if (lazyLoadParentId != null) {
+          ctx.setLazyLoadedChildBean(contextBean, lazyLoadParentId);
+        }
+        return contextBean;
+      }
+    }
+
+    void initialise() throws SQLException {
+      initLazyParent();
+      initBeanType();
+      initPersistenceContext();
+      readId();
+      initSqlLoadBean();
+      loadProperties();
+      loadChildren();
+    }
+  }
+
+  /**
+   * read the properties from the resultSet.
+   */
+  @Override
+  public EntityBean load(DbReadContext ctx, EntityBean parentBean, EntityBean contextParent) throws SQLException {
+
+    Load load = (inheritInfo != null) ? new LoadInherit(ctx, parentBean, contextParent) : new Load(ctx, parentBean, contextParent);
+    load.initialise();
+    if (load.isLazyLoadManyRoot()) {
+      return load.getContextBean();
+    }
+    load.postLoad();
+    load.setBeanToParent();
+    return load.complete();
   }
 
   /**

From b4182d4519a886de663f2fd577f230825806de37 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 28 Jun 2019 22:40:14 +1200
Subject: [PATCH 0908/1036] #1738 - Refactor SqlTreeNodeBean tidy

---
 .../server/query/SqlTreeNodeBean.java         | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
index 7d34f44f6..cbb9bec93 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
@@ -32,7 +32,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
 
   protected final STreeType desc;
 
-  protected final IdBinder idBinder;
+  final IdBinder idBinder;
 
   /**
    * The children which will be other SelectBean or SelectProxyBean.
@@ -56,7 +56,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
   /**
    * False if report bean and has no id property.
    */
-  protected final boolean readId;
+  final boolean readId;
 
   private final boolean disableLazyLoad;
 
@@ -68,7 +68,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
 
   final STreePropertyAssocMany lazyLoadParent;
 
-  final SpiQuery.TemporalMode temporalMode;
+  private final SpiQuery.TemporalMode temporalMode;
 
   private final boolean temporalVersions;
 
@@ -83,7 +83,6 @@ class SqlTreeNodeBean implements SqlTreeNode {
   private boolean intersectionAsOfTableAlias;
 
   private final boolean aggregation;
-  private final boolean aggregationRoot;
 
   /**
    * Construct for leaf node.
@@ -122,7 +121,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
     this.extraWhere = (beanProp == null) ? null : beanProp.getExtraWhere();
 
     this.aggregation = props.isAggregation();
-    this.aggregationRoot = props.isAggregationRoot();
+    boolean aggregationRoot = props.isAggregationRoot();
 
     // the bean has an Id property and we want to use it
     this.readId = !aggregationRoot && withId && desc.hasId();
@@ -130,7 +129,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
 
     this.partialObject = props.isPartialObject();
     this.properties = props.getProps();
-    this.children = myChildren == null ? NO_CHILDREN : myChildren.toArray(new SqlTreeNode[myChildren.size()]);
+    this.children = myChildren == null ? NO_CHILDREN : myChildren.toArray(new SqlTreeNode[0]);
 
     pathMap = createPathMap(prefix, desc);
   }
@@ -584,7 +583,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
     }
   }
 
-  protected void appendSelectId(DbSqlContext ctx, STreeProperty prop) {
+  void appendSelectId(DbSqlContext ctx, STreeProperty prop) {
     if (prop != null) {
       prop.appendSelect(ctx, false);
     }
@@ -742,13 +741,8 @@ class SqlTreeNodeBean implements SqlTreeNode {
       return true;
     }
 
-    if (contextBean._ebean_getIntercept().isFullyLoadedBean()) {
-      // reload if contextBean is partial object
-      return false;
-    }
-
-    // return true by default
-    return true;
+    // reload if contextBean is partial object
+    return !contextBean._ebean_getIntercept().isFullyLoadedBean();
   }
 
   @Override

From 30a0935300dab479d12708c4810076d5386a21ed Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 28 Jun 2019 23:04:20 +1200
Subject: [PATCH 0909/1036] #1738 - Refactor tidy suppressWarnings

---
 src/main/java/io/ebean/common/BeanMap.java        |  2 +-
 .../ebeaninternal/server/core/DefaultServer.java  |  1 -
 .../server/deploy/BeanDescriptorManager.java      |  3 +--
 .../server/deploy/meta/DeployBeanProperty.java    |  2 +-
 .../deploy/meta/DeployBeanPropertyLists.java      |  2 +-
 .../server/deploy/meta/DeployBeanTable.java       |  2 +-
 .../server/deploy/parse/AnnotationFields.java     |  2 +-
 .../deploy/parse/DeployCreateProperties.java      |  4 ++--
 .../ebeaninternal/server/el/ElMatchBuilder.java   |  2 +-
 .../server/persist/DefaultPersister.java          | 15 +++++++--------
 .../server/querydefn/OrmQueryProperties.java      |  3 +--
 .../server/type/ScalarTypeArraySetH2.java         |  2 +-
 12 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/main/java/io/ebean/common/BeanMap.java b/src/main/java/io/ebean/common/BeanMap.java
index 406bd9f17..8277223c0 100644
--- a/src/main/java/io/ebean/common/BeanMap.java
+++ b/src/main/java/io/ebean/common/BeanMap.java
@@ -237,7 +237,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
   }
 
   @Override
-  @SuppressWarnings({"unchecked", "rawtypes"})
+  @SuppressWarnings({"unchecked"})
   public Set<Entry<K, E>> entrySet() {
     init();
     if (isReadOnly()) {
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 8fa29c15d..b12ef4754 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -658,7 +658,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * </p>
    */
   @Override
-  @SuppressWarnings("unchecked")
   public <T> T createEntityBean(Class<T> type) {
     return getBeanDescriptor(type).createBean();
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index d00728013..6c2ab9114 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -815,7 +815,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     return new BeanTable(beanTable, this);
   }
 
-  @SuppressWarnings({"unchecked", "rawtypes"})
   private void readEntityRelationships() {
 
     // We only perform 'circular' checks etc after we have
@@ -1650,7 +1649,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     return changeLogListener;
   }
 
-  public void addPrimaryKeyJoin(DeployBeanPropertyAssocOne<?> prop) {
+  private void addPrimaryKeyJoin(DeployBeanPropertyAssocOne<?> prop) {
 
     String baseTable = prop.getDesc().getBaseTable();
     DeployTableJoin inverse = prop.getTableJoin().createInverse(baseTable);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
index 4b38812d5..a4790d1fd 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
@@ -249,7 +249,7 @@ public class DeployBeanProperty {
   /**
    * Wrap the ScalarType using a ScalarTypeConverter.
    */
-  @SuppressWarnings({"unchecked", "rawtypes"})
+  @SuppressWarnings({"unchecked"})
   private ScalarType<?> wrapScalarType(Class<?> propertyType, ScalarType<?> scalarType, ScalarTypeConverter<?, ?> typeConverter) {
     if (typeConverter == null) {
       return scalarType;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
index b35d0a32d..1e1f35989 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
@@ -71,7 +71,7 @@ public class DeployBeanPropertyLists {
   private final BeanPropertyAssocOne<?> unidirectional;
   private final BeanProperty orderColumn;
 
-  @SuppressWarnings({"unchecked", "rawtypes"})
+  @SuppressWarnings({"unchecked"})
   public DeployBeanPropertyLists(BeanDescriptorMap owner, BeanDescriptor<?> desc, DeployBeanDescriptor<?> deploy) {
     this.desc = desc;
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanTable.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanTable.java
index 0693210dc..de0166876 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanTable.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanTable.java
@@ -54,7 +54,7 @@ public class DeployBeanTable {
     return idProperty == null ? null : createProperty(owner, idProperty);
   }
 
-  @SuppressWarnings({"unchecked", "rawtypes"})
+  @SuppressWarnings({"unchecked"})
   private BeanProperty createProperty(BeanDescriptorMap owner, DeployBeanProperty prop) {
 
     if (prop instanceof DeployBeanPropertyAssocOne<?>) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
index c140b4cc0..986dd0d92 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
@@ -496,7 +496,7 @@ public class AnnotationFields extends AnnotationParser {
     }
   }
 
-  @SuppressWarnings({"unchecked", "rawtypes"})
+  @SuppressWarnings({"unchecked"})
   private ScalarTypeEncryptedWrapper<?> createScalarType(DeployBeanProperty prop, ScalarType<?> st) {
 
     // Use Java Encryptor wrapping the logical scalar type
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
index 1011eb23b..2ecb5ecd6 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
@@ -199,7 +199,7 @@ public class DeployCreateProperties {
     return null;
   }
 
-  @SuppressWarnings({"unchecked", "rawtypes"})
+  @SuppressWarnings({"unchecked"})
   private DeployBeanProperty createManyType(DeployBeanDescriptor<?> desc, Class<?> targetType, ManyType manyType) {
 
     try {
@@ -213,7 +213,7 @@ public class DeployCreateProperties {
     return new DeployBeanPropertyAssocMany(desc, targetType, manyType);
   }
 
-  @SuppressWarnings({"unchecked", "rawtypes"})
+  @SuppressWarnings({"unchecked"})
   private DeployBeanProperty createProp(DeployBeanDescriptor<?> desc, Field field) {
 
     Class<?> propertyType = field.getType();
diff --git a/src/main/java/io/ebeaninternal/server/el/ElMatchBuilder.java b/src/main/java/io/ebeaninternal/server/el/ElMatchBuilder.java
index 79c88d1d3..0cccfb9f4 100644
--- a/src/main/java/io/ebeaninternal/server/el/ElMatchBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/el/ElMatchBuilder.java
@@ -175,7 +175,7 @@ class ElMatchBuilder {
     final Set<?> set;
     final ElPropertyValue elGetValue;
 
-    @SuppressWarnings({"unchecked", "rawtypes"})
+    @SuppressWarnings({"unchecked"})
     public InSet(Set<?> set, ElPropertyValue elGetValue) {
       this.set = new HashSet(set);
       this.elGetValue = elGetValue;
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 28a22396a..1b8eea7bd 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -1244,15 +1244,15 @@ public final class DefaultPersister implements Persister {
    * perform an insert, update or delete.
    */
   private <T> PersistRequestBean<T> createRequest(T bean, Transaction t, PersistRequest.Type type) {
-    return createRequestInternal(bean, t, type, Flags.ZERO);
+    return createRequestInternal(bean, t, type);
   }
 
   /**
    * Create the Persist Request Object additionally specifying the publish status.
    */
-  private <T> PersistRequestBean<T> createRequestInternal(T bean, Transaction t, PersistRequest.Type type, int flags) {
+  private <T> PersistRequestBean<T> createRequestInternal(T bean, Transaction t, PersistRequest.Type type) {
     BeanManager<T> mgr = getBeanManager(bean);
-    return createRequest(bean, t, null, mgr, type, flags);
+    return createRequest(bean, t, null, mgr, type, Flags.ZERO);
   }
 
   /**
@@ -1280,7 +1280,7 @@ public final class DefaultPersister implements Persister {
    * Create the Persist Request Object that wraps all the objects used to
    * perform an insert, update or delete.
    */
-  @SuppressWarnings({"unchecked", "rawtypes"})
+  @SuppressWarnings({"unchecked"})
   private <T> PersistRequestBean<T> createRequest(T bean, Transaction t, Object parentBean, BeanManager<?> mgr,
                                                   PersistRequest.Type type, int flags) {
 
@@ -1292,13 +1292,12 @@ public final class DefaultPersister implements Persister {
     return createDeleteRequest(bean, t, type, Flags.unsetRecurse(flags));
   }
 
-  @SuppressWarnings({"unchecked", "rawtypes"})
   private <T> PersistRequestBean<T> createDeleteRequest(EntityBean bean, Transaction t, Type type) {
     return createDeleteRequest(bean, t, type, Flags.ZERO);
   }
 
-  @SuppressWarnings({"unchecked", "rawtypes"})
-  public <T> PersistRequestBean<T> createDeleteRequest(Object bean, Transaction t, PersistRequest.Type type, int flags) {
+  @SuppressWarnings({"unchecked"})
+  private <T> PersistRequestBean<T> createDeleteRequest(Object bean, Transaction t, PersistRequest.Type type, int flags) {
 
     BeanManager<T> mgr = getBeanManager(bean);
     if (type == Type.DELETE_PERMANENT) {
@@ -1308,7 +1307,7 @@ public final class DefaultPersister implements Persister {
       type = Type.DELETE_SOFT;
     }
 
-    PersistRequestBean<T> request =  new PersistRequestBean<T>(server, (T)bean, null, mgr, (SpiTransaction) t, persistExecute, type, flags);
+    PersistRequestBean<T> request =  new PersistRequestBean<>(server, (T)bean, null, mgr, (SpiTransaction) t, persistExecute, type, flags);
     request.initForSoftDelete();
     return request;
   }
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
index ca7a4828e..bc4d5d005 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
@@ -178,7 +178,6 @@ public class OrmQueryProperties implements Serializable {
   /**
    * Move a OrderBy.Property from the main query to this query join.
    */
-  @SuppressWarnings("rawtypes")
   void addSecJoinOrderProperty(OrderBy.Property orderProp) {
     if (orderBy == null) {
       orderBy = new OrderBy();
@@ -194,7 +193,7 @@ public class OrmQueryProperties implements Serializable {
    * Return the expressions used to filter on this path. This should be a many path to use this
    * method.
    */
-  @SuppressWarnings({"rawtypes", "unchecked"})
+  @SuppressWarnings({"unchecked"})
   public <T> SpiExpressionList<T> filterMany(Query<T> rootQuery) {
     if (filterMany == null) {
       FilterExprPath exprPath = new FilterExprPath(path);
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java
index 86bc471b5..d311d666b 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java
@@ -49,7 +49,7 @@ class ScalarTypeArraySetH2<T> extends ScalarTypeArraySet<T> {
     }
 
     @Override
-    @SuppressWarnings({"unchecked", "rawtypes"})
+    @SuppressWarnings({"rawtypes"})
     public ScalarTypeArraySetH2 typeForEnum(ScalarType<?> scalarType) {
       return new ScalarTypeArraySetH2("varchar", DocPropertyType.TEXT, new ArrayElementConverter.EnumConverter(scalarType));
     }

From e6c9f151c17ee37d9951b0e7ff3b395a28ad9119 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 28 Jun 2019 23:20:57 +1200
Subject: [PATCH 0910/1036] #1738 - Refactor tidy suppressWarnings and access

---
 .../java/io/ebean/config/ServerConfig.java    |  1 +
 .../java/io/ebean/plugin/ExpressionPath.java  |  2 +-
 .../server/deploy/BeanDescriptor.java         | 31 +++++++------------
 .../server/deploy/BeanPropertyAssoc.java      |  1 +
 .../server/deploy/BeanPropertyIdClass.java    |  1 +
 .../deploy/meta/DeployBeanDescriptor.java     |  1 +
 .../deploy/parse/AnnotationAssocManys.java    |  1 +
 .../expression/DefaultExpressionList.java     |  2 +-
 .../ebeaninternal/server/persist/Binder.java  |  2 +-
 .../io/ebeaninternal/server/query/CQuery.java |  7 ++---
 .../server/query/CQueryBindCapture.java       |  2 +-
 .../server/querydefn/DefaultOrmQuery.java     |  1 +
 12 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index d5fb6092e..76cb0654c 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -653,6 +653,7 @@ public class ServerConfig {
    * @param cls The type of the service object to obtain
    * @return The service object given the class type
    */
+  @SuppressWarnings("unchecked")
   public <P> P getServiceObject(Class<P> cls) {
     return (P) serviceObject.get(serviceObjectKey(cls));
   }
diff --git a/src/main/java/io/ebean/plugin/ExpressionPath.java b/src/main/java/io/ebean/plugin/ExpressionPath.java
index a1ab051f3..45de4c66b 100644
--- a/src/main/java/io/ebean/plugin/ExpressionPath.java
+++ b/src/main/java/io/ebean/plugin/ExpressionPath.java
@@ -77,7 +77,7 @@ public interface ExpressionPath {
   /**
    * Return the underlying bean property.
    */
-  public Property getProperty();
+  Property getProperty();
 
   /**
    * The ElPrefix plus name.
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index d6c6d722a..f0a269f57 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -235,7 +235,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Map of BeanProperty Linked so as to preserve order.
    */
-  protected final LinkedHashMap<String, BeanProperty> propMap;
+  private final LinkedHashMap<String, BeanProperty> propMap;
 
   /**
    * Map of DB column to property path (for nativeSql mapping).
@@ -252,7 +252,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    */
   final Class<T> beanType;
 
-  protected final Class<?> rootBeanType;
+  final Class<?> rootBeanType;
 
   /**
    * This is not sent to a remote client.
@@ -287,11 +287,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    */
   private final ChangeLogFilter changeLogFilter;
 
-  /**
-   * The table joins for this bean.
-   */
-  private final TableJoin[] derivedTableJoins;
-
   /**
    * Inheritance information. Server side only.
    */
@@ -374,7 +369,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * All non transient properties excluding the id properties.
    */
   private final BeanProperty[] propertiesNonTransient;
-  protected final BeanProperty[] propertiesIndex;
+  final BeanProperty[] propertiesIndex;
   private final BeanProperty[] propertiesGenInsert;
   private final BeanProperty[] propertiesGenUpdate;
   private final List<BeanProperty[]> propertiesUnique = new ArrayList<>();
@@ -423,7 +418,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
 
   private final BeanDescriptorDraftHelp<T> draftHelp;
   private final BeanDescriptorCacheHelp<T> cacheHelp;
-  final BeanDescriptorJsonHelp<T> jsonHelp;
+  private final BeanDescriptorJsonHelp<T> jsonHelp;
   private DocStoreBeanAdapter<T> docStoreAdapter;
   private DocumentMapping docMapping;
   private boolean docStoreEmbeddedInvalidation;
@@ -529,8 +524,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     this.propertiesGenInsert = listHelper.getGeneratedInsert();
     this.propertiesGenUpdate = listHelper.getGeneratedUpdate();
 
-    this.derivedTableJoins = listHelper.getTableJoin();
-
     boolean noRelationships = propertiesOne.length + propertiesMany.length == 0;
 
     this.cacheSharableBeans = noRelationships && deploy.getCacheOptions().isReadOnly();
@@ -655,7 +648,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Return true if this is an abstract type.
    */
-  public boolean isAbstractType() {
+  boolean isAbstractType() {
     return abstractType;
   }
 
@@ -689,7 +682,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * as they are used to get the imported and exported properties.
    * </p>
    */
-  public void initialiseId(BeanDescriptorInitContext initContext) {
+  void initialiseId(BeanDescriptorInitContext initContext) {
 
     if (logger.isTraceEnabled()) {
       logger.trace("BeanDescriptor initialise " + fullName);
@@ -783,7 +776,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Perform last initialisation for the descriptor.
    */
-  public void initLast() {
+  void initLast() {
 
     for (BeanProperty prop : propertiesNonTransient) {
       if (prop.isUnique()) {
@@ -825,7 +818,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * Initialise the document mapping.
    */
   @SuppressWarnings("unchecked")
-  public void initialiseDocMapping() {
+  void initialiseDocMapping() {
     for (BeanPropertyAssocMany<?> many : propertiesMany) {
       many.initialisePostTarget();
     }
@@ -840,7 +833,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     cacheHelp.deriveNotifyFlags();
   }
 
-  public void initInheritInfo() {
+  void initInheritInfo() {
     if (inheritInfo != null) {
       // need to check every BeanDescriptor in the inheritance hierarchy
       if (saveRecurseSkippable) {
@@ -894,7 +887,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Return the ReadAuditPrepare for preparing read audit events prior to logging.
    */
-  public ReadAuditPrepare getReadAuditPrepare() {
+  private ReadAuditPrepare getReadAuditPrepare() {
     return ebeanServer.getReadAuditPrepare();
   }
 
@@ -980,7 +973,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Populate the diff for inserts with flattened non-null property values.
    */
-  protected void jsonWriteForInsert(SpiJsonWriter jsonWriter, EntityBean newBean) throws IOException {
+  void jsonWriteForInsert(SpiJsonWriter jsonWriter, EntityBean newBean) throws IOException {
     jsonWriter.writeStartObject();
     for (BeanProperty prop : propertiesBaseScalar) {
       prop.jsonWriteForInsert(jsonWriter, newBean);
@@ -1057,7 +1050,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     elDeployCache.put(fkey.getName(), fkey);
   }
 
-  public void initialiseFkeys() {
+  void initialiseFkeys() {
     for (BeanPropertyAssocOne<?> aPropertiesOneImported : propertiesOneImported) {
       if (!aPropertiesOneImported.isFormula()) {
         aPropertiesOneImported.addFkey();
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
index 782ee8043..b8915f710 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
@@ -107,6 +107,7 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
   /**
    * Copy constructor for ManyToOne inside Embeddable.
    */
+  @SuppressWarnings("unchecked")
   public BeanPropertyAssoc(BeanPropertyAssoc source, BeanPropertyOverride override) {
     super(source, override);
     foreignKey = source.foreignKey;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyIdClass.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyIdClass.java
index bd8486b39..45d3614c3 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyIdClass.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyIdClass.java
@@ -8,6 +8,7 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
  */
 public class BeanPropertyIdClass extends BeanPropertyAssocOne {
 
+  @SuppressWarnings("unchecked")
   public BeanPropertyIdClass(BeanDescriptorMap owner, BeanDescriptor descriptor, DeployBeanPropertyAssocOne deploy) {
     super(owner, descriptor, deploy);
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index bf51ceea6..15f9e9723 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -1267,6 +1267,7 @@ public class DeployBeanDescriptor<T> {
   /**
    * Returns the jackson annotated class, if jackson is present.
    */
+  @SuppressWarnings("unchecked")
   public Object /*AnnotatedClass*/ getJacksonAnnotatedClass() {
     if (jacksonAnnotatedClass == null) {
       jacksonAnnotatedClass = new DeployBeanObtainJackson(serverConfig, beanType).obtain();
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index 1914051aa..1fd035739 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -183,6 +183,7 @@ class AnnotationAssocManys extends AnnotationParser {
     }
   }
 
+  @SuppressWarnings("unchecked")
   private void readElementCollection(DeployBeanPropertyAssocMany<?> prop, ElementCollection elementCollection) {
 
     prop.setElementCollection();
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 35a388094..33cd9dd2e 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -495,7 +495,7 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
   }
 
   @Override
-  public Query<T> select(FetchGroup fetchGroup) {
+  public Query<T> select(FetchGroup<T> fetchGroup) {
     return query.select(fetchGroup);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/Binder.java b/src/main/java/io/ebeaninternal/server/persist/Binder.java
index 666b3660a..ae1d23c04 100644
--- a/src/main/java/io/ebeaninternal/server/persist/Binder.java
+++ b/src/main/java/io/ebeaninternal/server/persist/Binder.java
@@ -108,7 +108,7 @@ public class Binder {
         if (isLob(dt)) {
           bindBuf.append("[LOB]");
         } else {
-          bindBuf.append(String.valueOf(val));
+          bindBuf.append(val);
         }
       }
     }
diff --git a/src/main/java/io/ebeaninternal/server/query/CQuery.java b/src/main/java/io/ebeaninternal/server/query/CQuery.java
index ae0a376ff..6d5a2637e 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQuery.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQuery.java
@@ -198,6 +198,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
   /**
    * Create the Sql select based on the request.
    */
+  @SuppressWarnings("unchecked")
   public CQuery(OrmQueryRequest<T> request, CQueryPredicates predicates, CQueryPlan queryPlan) {
     this.request = request;
     this.audit = request.isAuditReads();
@@ -569,13 +570,11 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
     return null;
   }
 
+  @SuppressWarnings("unchecked")
   BeanCollection<T> readCollection() throws SQLException {
-
     while (hasNext()) {
-      EntityBean bean = next();
-      help.add(collection, bean, false);
+      help.add(collection, next(), false);
     }
-
     updateExecutionStatistics();
     return collection;
   }
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java b/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
index 90c4a1e72..dceb4fc52 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
@@ -5,7 +5,7 @@ import io.ebeaninternal.server.type.bindcapture.BindCapture;
 
 class CQueryBindCapture {
 
-  private final double multiplier = 1.3d;
+  private static final double multiplier = 1.3d;
 
   private final CQueryPlan cQueryPlan;
   private final QueryPlanLogger planLogger;
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 56a7c35c2..1e9a40ada 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1718,6 +1718,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return beanDescriptor.getBeanType();
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   public Query<T> setInheritType(Class<? extends T> type) {
     if (type == beanType) {

From 8bfae9deefae054e014cf2a0e3b188f64e2153be Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 28 Jun 2019 23:48:03 +1200
Subject: [PATCH 0911/1036] #1738 - Refactor simplify switch and various

---
 .../io/ebean/text/PathPropertiesParser.java   | 13 ++++++------
 .../ebeaninternal/api/TransactionEvent.java   |  2 +-
 .../dbmigration/LastMigration.java            |  5 +----
 .../server/core/DefaultCallStackFactory.java  |  5 +----
 .../server/core/InternalConfiguration.java    |  8 +++-----
 .../server/core/PersistRequestBean.java       |  6 ++----
 .../deploy/DeployPropertyParserMap.java       |  8 +-------
 .../server/deploy/DeployUpdateParser.java     | 20 +++++++------------
 .../server/deploy/DetermineAggPath.java       |  3 +--
 .../expression/DefaultExampleExpression.java  |  4 +---
 .../ebeaninternal/server/expression/Same.java |  5 +++--
 .../server/grammer/EqlAdapter.java            |  5 +----
 .../server/persist/dml/DeleteMeta.java        |  9 ++-------
 .../server/persist/dml/UpdateMeta.java        |  9 ++-------
 .../server/query/CQueryBuilder.java           |  6 +++---
 .../server/query/CQueryPlan.java              |  8 ++++----
 .../server/querydefn/DefaultOrmQuery.java     |  3 +--
 17 files changed, 40 insertions(+), 79 deletions(-)

diff --git a/src/main/java/io/ebean/text/PathPropertiesParser.java b/src/main/java/io/ebean/text/PathPropertiesParser.java
index 6655122d1..b267cfe2a 100644
--- a/src/main/java/io/ebean/text/PathPropertiesParser.java
+++ b/src/main/java/io/ebean/text/PathPropertiesParser.java
@@ -49,13 +49,12 @@ class PathPropertiesParser {
   private String getPath() {
     do {
       char c1 = chars[pos++];
-      switch (c1) {
-        case '(':
-          return currentWord();
-        default:
-          if (pos == 1) {
-            return "";
-          }
+      if (c1 == '(') {
+        return currentWord();
+      } else {
+        if (pos == 1) {
+          return "";
+        }
       }
     } while (pos < eof);
     throw new RuntimeException("Hit EOF while reading sectionTitle from " + startPos);
diff --git a/src/main/java/io/ebeaninternal/api/TransactionEvent.java b/src/main/java/io/ebeaninternal/api/TransactionEvent.java
index 86ee5f474..52d87d23e 100644
--- a/src/main/java/io/ebeaninternal/api/TransactionEvent.java
+++ b/src/main/java/io/ebeaninternal/api/TransactionEvent.java
@@ -75,7 +75,7 @@ public class TransactionEvent implements Serializable {
    * Return the list of PersistRequestBean's for this transaction.
    */
   public List<PersistRequestBean<?>> getListenerNotify() {
-    return (listenerNotify == null) ? null : listenerNotify;
+    return listenerNotify;
   }
 
   public TransactionEventTable getEventTables() {
diff --git a/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java b/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java
index 1b063ba22..20b9a19c3 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java
@@ -60,10 +60,7 @@ class LastMigration {
   }
 
   private static boolean includeSqlFile(String lowerFileName) {
-    if (lowerFileName.startsWith("r") || lowerFileName.startsWith("i") || !lowerFileName.endsWith(SQL)) {
-      return false;
-    }
-    return true;
+    return !lowerFileName.startsWith("r") && !lowerFileName.startsWith("i") && lowerFileName.endsWith(SQL);
   }
 
   private static boolean includeModelFile(String lowerFileName) {
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultCallStackFactory.java b/src/main/java/io/ebeaninternal/server/core/DefaultCallStackFactory.java
index d7a949d03..169faa93d 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultCallStackFactory.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultCallStackFactory.java
@@ -55,10 +55,7 @@ public class DefaultCallStackFactory implements CallStackFactory {
     if (element.getClassName().startsWith(IO_EBEAN)) {
       return true;
     }
-    if (element.getMethodName().startsWith("_ebean_")) {
-      return true;
-    }
-    return false;
+    return element.getMethodName().startsWith("_ebean_");
   }
 
   private CallStack createCallStack(StackTraceElement[] finalTrace) {
diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index a2aefa3ec..cd3ab2e1c 100644
--- a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -328,12 +328,10 @@ public class InternalConfiguration {
 
   private MultiValueBind createMultiValueBind(Platform platform) {
     // only Postgres at this stage
-    switch (platform) {
-      case POSTGRES:
-        return new PostgresMultiValueBind();
-      default:
-        return new MultiValueBind();
+    if (platform == Platform.POSTGRES) {
+      return new PostgresMultiValueBind();
     }
+    return new MultiValueBind();
   }
 
   public SpiJsonContext createJsonContext(SpiEbeanServer server) {
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index ba7dcfb95..53c593457 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -1326,10 +1326,8 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    */
   public void docStorePersist() {
     idValue = beanDescriptor.getId(entityBean);
-    switch (type) {
-      case UPDATE:
-        dirtyProperties = intercept.getDirtyProperties();
-        break;
+    if (type == Type.UPDATE) {
+      dirtyProperties = intercept.getDirtyProperties();
     }
     // processing now so set IGNORE (unlike DB + DocStore processing with post-commit)
     docStoreMode = DocStoreMode.IGNORE;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParserMap.java b/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParserMap.java
index fc8aaadab..cd0ded26e 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParserMap.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParserMap.java
@@ -31,13 +31,7 @@ public class DeployPropertyParserMap extends DeployParser {
 
   @Override
   public String getDeployWord(String expression) {
-
-    String deployExpr = map.get(expression);
-    if (deployExpr == null) {
-      return null;
-    } else {
-      return deployExpr;
-    }
+    return map.get(expression);
   }
 
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java b/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java
index 3aa8ce83d..6669aeb9a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java
@@ -27,17 +27,19 @@ public final class DeployUpdateParser extends DeployParser {
   public String convertWord() {
 
     String dbWord = getDeployWord(word);
-
     if (dbWord != null) {
       return dbWord;
     }
     // maybe tableAlias.propertyName
-    return convertSubword(0, word, null);
+    return convertSubword(word);
   }
 
-  private String convertSubword(int start, String currentWord, StringBuilder localBuffer) {
-    while (true) {
+  private String convertSubword(String currentWord) {
 
+    int start = 0;
+    StringBuilder localBuffer = null;
+
+    while (true) {
       int dotPos = currentWord.indexOf('.', start);
       if (start == 0 && dotPos == -1) {
         return currentWord;
@@ -63,15 +65,11 @@ public final class DeployUpdateParser extends DeployParser {
       start = dotPos + 1;
       String remainder = currentWord.substring(start, currentWord.length());
 
-      //String dbWord = deployMap.get(remainder.toLowerCase());
       String dbWord = getDeployWord(remainder);
       if (dbWord != null) {
         // we have found a match for the remainder
         localBuffer.append(dbWord);
         return localBuffer.toString();
-      } else {
-        //
-
       }
     }
   }
@@ -84,11 +82,7 @@ public final class DeployUpdateParser extends DeployParser {
     }
 
     ElPropertyDeploy elProp = beanDescriptor.getElPropertyDeploy(expression);
-    if (elProp != null) {
-      return elProp.getDbColumn();
-    } else {
-      return null;
-    }
+    return elProp != null ? elProp.getDbColumn() : null;
   }
 
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java b/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java
index fff0a1438..4c5e22532 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java
@@ -92,8 +92,7 @@ class DetermineAggPath {
 
         } else if (details instanceof DeployBeanPropertyAssocOne<?>) {
           DeployBeanPropertyAssocOne<?> one = (DeployBeanPropertyAssocOne<?>) details;
-          DeployBeanDescriptor<?> targetDesc = one.getTargetDeploy();
-          desc = targetDesc;
+          desc = one.getTargetDeploy();
           pos = pos + 1;
           continue;
         }
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
index 2a0fd2bd8..2448c855e 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
@@ -303,9 +303,7 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
    */
   private boolean isZero(Object value) {
     if (value instanceof Number) {
-      Number num = (Number) value;
-      double doubleValue = num.doubleValue();
-      if (doubleValue == 0) {
+      if (((Number) value).doubleValue() == 0) {
         return true;
       }
     }
diff --git a/src/main/java/io/ebeaninternal/server/expression/Same.java b/src/main/java/io/ebeaninternal/server/expression/Same.java
index 8e4e343a4..931e3e3e3 100644
--- a/src/main/java/io/ebeaninternal/server/expression/Same.java
+++ b/src/main/java/io/ebeaninternal/server/expression/Same.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.expression;
 
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.Objects;
 
 /**
  * Utility to help isSame methods.
@@ -12,14 +13,14 @@ public class Same {
    * Return true if both values are null or both an not null.
    */
   public static boolean sameByNull(Object v1, Object v2) {
-    return v1 == null ? v2 == null : v2 != null;
+    return (v1 == null) == (v2 == null);
   }
 
   /**
    * Null safe equals check.
    */
   public static boolean sameByValue(Object v1, Object v2) {
-    return v1 == null ? v2 == null : v1.equals(v2);
+    return Objects.equals(v1, v2);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java
index 72110fb68..397bd7d6a 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java
@@ -261,10 +261,7 @@ class EqlAdapter<T> extends EQLBaseListener {
   }
 
   private boolean isValue(String text) {
-    if (text.length() == 1 && (text.equals("(") || text.equals(")") || text.equals(","))) {
-      return false;
-    }
-    return true;
+    return text.length() != 1 || (!text.equals("(") && !text.equals(")") && !text.equals(","));
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java b/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java
index a10e74bc8..97e964f0c 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java
@@ -72,13 +72,8 @@ public final class DeleteMeta {
       tenantId.dmlBind(bind, bean);
     }
 
-    switch (persist.getConcurrencyMode()) {
-      case VERSION:
-        version.dmlBind(bind, bean);
-        break;
-
-      default:
-        break;
+    if (persist.getConcurrencyMode() == ConcurrencyMode.VERSION) {
+      version.dmlBind(bind, bean);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java b/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java
index eb993c2c3..dcb07189e 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java
@@ -74,13 +74,8 @@ public final class UpdateMeta {
       tenantId.dmlBind(bind, bean);
     }
 
-    switch (persist.getConcurrencyMode()) {
-      case VERSION:
-        version.dmlBind(bind, bean);
-        break;
-
-      default:
-        break;
+    if (persist.getConcurrencyMode() == ConcurrencyMode.VERSION) {
+      version.dmlBind(bind, bean);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 6c1151815..438e8033b 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -128,7 +128,7 @@ class CQueryBuilder {
     }
 
     // cache the query plan
-    queryPlan = new CQueryPlan(request, sql, sqlTree, false, false, predicates.getLogWhereSql());
+    queryPlan = new CQueryPlan(request, sql, sqlTree, false, predicates.getLogWhereSql());
     request.putQueryPlan(queryPlan);
     return new CQueryUpdate(type, request, predicates, queryPlan);
   }
@@ -213,7 +213,7 @@ class CQueryBuilder {
     SqlTree sqlTree = createSqlTree(request, predicates);
     SqlLimitResponse s = buildSql(null, request, predicates, sqlTree);
 
-    queryPlan = new CQueryPlan(request, s.getSql(), sqlTree, false, s.isIncludesRowNumberColumn(), predicates.getLogWhereSql());
+    queryPlan = new CQueryPlan(request, s.getSql(), sqlTree, s.isIncludesRowNumberColumn(), predicates.getLogWhereSql());
     request.putQueryPlan(queryPlan);
     return new CQueryFetchSingleAttribute(request, predicates, queryPlan, query.isCountDistinct());
   }
@@ -314,7 +314,7 @@ class CQueryBuilder {
     }
 
     // cache the query plan
-    queryPlan = new CQueryPlan(request, sql, sqlTree, false, s.isIncludesRowNumberColumn(), predicates.getLogWhereSql());
+    queryPlan = new CQueryPlan(request, sql, sqlTree, s.isIncludesRowNumberColumn(), predicates.getLogWhereSql());
     request.putQueryPlan(queryPlan);
 
     return new CQueryRowCount(queryPlan, request, predicates);
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
index e1812802b..c630f1f3f 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
@@ -133,7 +133,7 @@ public class CQueryPlan {
   /**
    * Create a query plan for a raw sql query.
    */
-  CQueryPlan(OrmQueryRequest<?> request, String sql, SqlTree sqlTree, boolean rawSql, boolean rowNumberIncluded, String logWhereSql) {
+  CQueryPlan(OrmQueryRequest<?> request, String sql, SqlTree sqlTree, boolean rowNumberIncluded, String logWhereSql) {
 
     this.server = request.getServer();
     this.dataTimeZone = server.getDataTimeZone();
@@ -143,18 +143,18 @@ public class CQueryPlan {
     this.label = query.getPlanLabel();
     this.name = deriveName(label, query.getType());
     this.location = location();
-    this.planKey = buildPlanKey(sql, rawSql, rowNumberIncluded, logWhereSql);
+    this.planKey = buildPlanKey(sql, false, rowNumberIncluded, logWhereSql);
     this.autoTuned = false;
     this.asOfTableCount = 0;
     this.sql = sql;
     this.sqlHash = md5Hash(sql);
     this.sqlTree = sqlTree;
-    this.rawSql = rawSql;
+    this.rawSql = false;
     this.rowNumberIncluded = rowNumberIncluded;
     this.logWhereSql = logWhereSql;
     this.encryptedProps = sqlTree.getEncryptedProps();
     this.stats = new CQueryPlanStats(this, server.isCollectQueryOrigins());
-    this.dependentTables = (rawSql) ? Collections.emptySet() : sqlTree.dependentTables();
+    this.dependentTables = sqlTree.dependentTables();
     this.bindCapture = initBindCapture(server.getServerConfig(), query);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 1e9a40ada..a63e9380b 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1895,8 +1895,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
       namedParams = new HashMap<>();
     }
 
-    ONamedParam param = namedParams.computeIfAbsent(name, ONamedParam::new);
-    return param;
+    return namedParams.computeIfAbsent(name, ONamedParam::new);
   }
 
   @Override

From 7fa5e2aa8c4be6d2b61c79d96484ec007099f6b1 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 29 Jun 2019 00:23:12 +1200
Subject: [PATCH 0912/1036] #1738 - Refactor add final, Object.equals,
 Integer.compare

---
 src/main/java/io/ebean/CacheMode.java         |  4 +--
 .../java/io/ebean/bean/ObjectGraphNode.java   |  4 +--
 .../java/io/ebean/cache/ServerCacheType.java  |  2 +-
 src/main/java/io/ebean/config/TenantMode.java | 10 +++----
 .../config/dbplatform/DbDefaultValue.java     | 27 +++++++++----------
 .../dbplatform/DbPlatformTypeLookup.java      |  4 +--
 .../dbplatform/DbPlatformTypeMapping.java     |  2 +-
 .../config/dbplatform/SqlErrorCodes.java      |  2 +-
 .../java/io/ebean/meta/QueryPlanRequest.java  |  2 +-
 .../ebean/metric/MetricServiceProvider.java   |  2 +-
 .../io/ebeaninternal/api/BeanCacheResult.java |  2 +-
 .../io/ebeaninternal/api/NaturalKeyEntry.java |  4 +--
 .../ebeaninternal/api/ScopedTransaction.java  |  2 +-
 .../java/io/ebeaninternal/api/SpiQuery.java   |  6 ++---
 .../ddlgeneration/platform/BaseTableDdl.java  | 10 +++----
 .../dbmigration/model/MColumn.java            |  3 ++-
 .../io/ebeaninternal/json/DJsonService.java   |  2 +-
 .../server/autotune/AutoTuneCollection.java   |  2 +-
 .../core/DefaultBackgroundExecutor.java       | 16 +++++------
 .../server/core/DefaultServer.java            |  2 +-
 .../server/core/PersistRequest.java           |  2 +-
 .../server/core/PersistRequestBean.java       |  2 +-
 .../server/core/PersistRequestUpdateSql.java  |  2 +-
 .../server/deploy/BeanPropertyAssocMany.java  |  2 +-
 .../deploy/ChainedBeanPersistController.java  |  2 +-
 .../deploy/ChainedBeanQueryAdapter.java       |  5 +---
 .../server/deploy/DCacheRegionNone.java       |  2 +-
 .../server/deploy/DetermineAggPath.java       |  6 ++---
 .../server/deploy/ElementEntityBean.java      |  2 +-
 .../server/deploy/ElementHelpList.java        |  2 +-
 .../server/deploy/ElementHelpMap.java         |  2 +-
 .../server/deploy/ElementHelpSet.java         |  2 +-
 .../server/deploy/id/ImportedIdSimple.java    |  2 +-
 .../CaseInsensitiveEqualExpression.java       |  2 +-
 .../expression/DefaultExpressionList.java     |  2 +-
 .../server/expression/JsonPathExpression.java |  5 ++--
 .../server/grammer/OperatorMapping.java       |  2 +-
 .../server/persist/BatchDepthComparator.java  |  8 +-----
 .../server/persist/DeleteMode.java            |  4 +--
 .../server/persist/MultiValueWrapper.java     |  2 +-
 .../server/persist/SaveManyBeans.java         |  2 +-
 .../profile/TimedProfileLocationRegistry.java |  2 +-
 .../io/ebeaninternal/server/query/CQuery.java |  2 +-
 .../server/query/PlatformQueryPlan.java       |  8 +++---
 .../server/query/RawSqlQueryPlanKey.java      |  4 ++-
 .../server/querydefn/OrmQueryPlanKey.java     |  4 ++-
 .../querydefn/OrmQueryPropertiesParser.java   |  2 +-
 .../server/querydefn/OrmUpdateProperties.java |  2 +-
 .../server/rawsql/DRawSqlParser.java          |  8 ++----
 .../server/rawsql/SpiRawSql.java              |  5 ++--
 .../server/transaction/TableModState.java     |  2 +-
 .../api/mapping/DocMappingBuilder.java        | 15 ++++-------
 52 files changed, 102 insertions(+), 120 deletions(-)

diff --git a/src/main/java/io/ebean/CacheMode.java b/src/main/java/io/ebean/CacheMode.java
index 7d8d549f2..b74753e21 100644
--- a/src/main/java/io/ebean/CacheMode.java
+++ b/src/main/java/io/ebean/CacheMode.java
@@ -69,8 +69,8 @@ public enum CacheMode {
    */
   GET(true, false);
 
-  private boolean get;
-  private boolean put;
+  private final boolean get;
+  private final boolean put;
 
   CacheMode(boolean get, boolean put) {
     this.get = get;
diff --git a/src/main/java/io/ebean/bean/ObjectGraphNode.java b/src/main/java/io/ebean/bean/ObjectGraphNode.java
index 21f242360..4fc573962 100644
--- a/src/main/java/io/ebean/bean/ObjectGraphNode.java
+++ b/src/main/java/io/ebean/bean/ObjectGraphNode.java
@@ -1,6 +1,7 @@
 package io.ebean.bean;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
  * Identifies a unique node of an object graph.
@@ -85,8 +86,7 @@ public final class ObjectGraphNode implements Serializable {
     }
 
     ObjectGraphNode e = (ObjectGraphNode) obj;
-    //noinspection StringEquality
-    return ((e.path == path) || (e.path != null && e.path.equals(path)))
+    return (Objects.equals(e.path, path))
       && e.originQueryPoint.equals(originQueryPoint);
   }
 }
diff --git a/src/main/java/io/ebean/cache/ServerCacheType.java b/src/main/java/io/ebean/cache/ServerCacheType.java
index 1e78885c8..f71a78ae1 100644
--- a/src/main/java/io/ebean/cache/ServerCacheType.java
+++ b/src/main/java/io/ebean/cache/ServerCacheType.java
@@ -25,7 +25,7 @@ public enum ServerCacheType {
    */
   QUERY("_Q");
 
-  private String code;
+  private final String code;
 
   ServerCacheType(String code) {
     this.code = code;
diff --git a/src/main/java/io/ebean/config/TenantMode.java b/src/main/java/io/ebean/config/TenantMode.java
index 2f659704a..c86115741 100644
--- a/src/main/java/io/ebean/config/TenantMode.java
+++ b/src/main/java/io/ebean/config/TenantMode.java
@@ -35,9 +35,9 @@ public enum TenantMode {
    * (that holds configuration e.g.)
    */
   DB_WITH_MASTER(true, true);
-  
-  boolean dynamicDataSource;
-  boolean ddlEnabled;
+
+  final boolean dynamicDataSource;
+  final boolean ddlEnabled;
 
   TenantMode(boolean dynamicDataSource, boolean ddlEnabled) {
     this.dynamicDataSource = dynamicDataSource;
@@ -50,12 +50,12 @@ public enum TenantMode {
   public boolean isDynamicDataSource() {
     return dynamicDataSource;
   }
-  
+
   /**
    * Returns true, if DDL is enabled.
    */
   public boolean isDdlEnabled() {
     return ddlEnabled;
   }
- 
+
 }
diff --git a/src/main/java/io/ebean/config/dbplatform/DbDefaultValue.java b/src/main/java/io/ebean/config/dbplatform/DbDefaultValue.java
index f478bb7a6..6b74f4498 100644
--- a/src/main/java/io/ebean/config/dbplatform/DbDefaultValue.java
+++ b/src/main/java/io/ebean/config/dbplatform/DbDefaultValue.java
@@ -27,15 +27,13 @@ public class DbDefaultValue {
    * The key for the NOW / current timestamp.
    */
   public static final String NOW = "now";
-  
+
   /**
    * The 'null' literal.
    */
   public static final String NULL = "null";
-  
 
-
-  protected Map<String, String> map = new LinkedHashMap<>();
+  protected final Map<String, String> map = new LinkedHashMap<>();
 
   /**
    * Set the DB now function.
@@ -82,10 +80,9 @@ public class DbDefaultValue {
     return val != null ? val : dbDefaultLiteral;
   }
 
-  
   /**
    * This method checks & convert the {@link DbDefault#value()} to a valid SQL literal.
-   * 
+   *
    * This is mainly to quote string literals and verify integer/dates for correctness.
    * <p>
    * Note: There are some special cases:
@@ -98,24 +95,24 @@ public class DbDefaultValue {
    *        If you need really the String "null", you have to specify <code>@DbDefault("'null'")</code>
    *        which gives you the <code>default 'null'</code> statement.</li>
    *    <li>Any statement, that begins and ends with single quote will not be checked or get quoted again.</li>
-   *    <li>A statement that begins with "$RAW:", e.g <code>@DbDefault("$RAW:N'SANDNES'")</code> will lead to 
+   *    <li>A statement that begins with "$RAW:", e.g <code>@DbDefault("$RAW:N'SANDNES'")</code> will lead to
    *        a <code>default N'SANDNES'</code> in DDL. Note that this is platform specific!</li>
    * </ul>
    */
   public static String toSqlLiteral(String defaultValue, Class<?> propertyType, int sqlType) {
     if (propertyType == null
-        || defaultValue == null 
+        || defaultValue == null
         || NULL.equals(defaultValue)
         || (defaultValue.startsWith("'") && defaultValue.endsWith("'"))
-        || (defaultValue.startsWith("$RAW:"))) {  
+        || (defaultValue.startsWith("$RAW:"))) {
       return defaultValue;
     }
 
     if (Boolean.class.isAssignableFrom(propertyType) || Boolean.TYPE.isAssignableFrom(propertyType)) {
       return toBooleanLiteral(defaultValue);
     }
-    
-    if (Number.class.isAssignableFrom(propertyType) 
+
+    if (Number.class.isAssignableFrom(propertyType)
         || Byte.TYPE.equals(propertyType)
         || Short.TYPE.equals(propertyType)
         || Integer.TYPE.equals(propertyType)
@@ -126,7 +123,7 @@ public class DbDefaultValue {
       Double.valueOf(defaultValue); // verify if it is a number
       return defaultValue;
     }
-   
+
     // check if it is a date/time - in all other cases return quoted defaultValue
     switch (sqlType) {
       // date
@@ -155,7 +152,7 @@ public class DbDefaultValue {
     }
     throw new IllegalArgumentException("'" + value + "' is not a valid value for boolean");
   }
-  
+
   /**
    * This adds single qoutes around the <code>value</code> and doubles single quotes.
    * "User's home" will return "'User''s home'"
@@ -175,7 +172,7 @@ public class DbDefaultValue {
     return sb.toString();
 
   }
-  
+
   private static String toDateLiteral(String value) {
     if (NOW.equals(value)) {
       return value; // this will get translated later
@@ -191,7 +188,7 @@ public class DbDefaultValue {
     DatatypeConverter.parseTime(value); // verify
     return toTextLiteral(value);
   }
-  
+
   private static String toDateTimeLiteral(String value) {
     if (NOW.equals(value)) {
       return value; // this will get translated later
diff --git a/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeLookup.java b/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeLookup.java
index 762c40e7d..30d89e43f 100644
--- a/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeLookup.java
+++ b/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeLookup.java
@@ -11,12 +11,12 @@ class DbPlatformTypeLookup {
   /**
    * A map to lookup the type by name.
    */
-  private Map<String, DbType> nameLookup = new HashMap<>();
+  private final Map<String, DbType> nameLookup = new HashMap<>();
 
   /**
    * A map to lookup the type by JDBC int value.
    */
-  private Map<Integer, DbType> idLookup = new HashMap<>();
+  private final Map<Integer, DbType> idLookup = new HashMap<>();
 
   DbPlatformTypeLookup() {
     addAll();
diff --git a/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java b/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java
index 84fa3ba46..cc17d0fb3 100644
--- a/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java
+++ b/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java
@@ -23,7 +23,7 @@ public class DbPlatformTypeMapping {
     }
   }
 
-  private static DbPlatformTypeLookup lookup = new DbPlatformTypeLookup();
+  private static final DbPlatformTypeLookup lookup = new DbPlatformTypeLookup();
 
   private static final DbPlatformType BOOLEAN_LOGICAL = new BooleanLogicalType();
 
diff --git a/src/main/java/io/ebean/config/dbplatform/SqlErrorCodes.java b/src/main/java/io/ebean/config/dbplatform/SqlErrorCodes.java
index e52462ccf..a30020a08 100644
--- a/src/main/java/io/ebean/config/dbplatform/SqlErrorCodes.java
+++ b/src/main/java/io/ebean/config/dbplatform/SqlErrorCodes.java
@@ -8,7 +8,7 @@ import java.util.Map;
  */
 public class SqlErrorCodes {
 
-  private Map<String,DataErrorType> map = new HashMap<>();
+  private final Map<String,DataErrorType> map = new HashMap<>();
 
   /**
    * Map the codes to AcquireLockException.
diff --git a/src/main/java/io/ebean/meta/QueryPlanRequest.java b/src/main/java/io/ebean/meta/QueryPlanRequest.java
index 20b12c145..6f678c892 100644
--- a/src/main/java/io/ebean/meta/QueryPlanRequest.java
+++ b/src/main/java/io/ebean/meta/QueryPlanRequest.java
@@ -10,7 +10,7 @@ import java.util.Set;
  */
 public class QueryPlanRequest {
 
-  private List<MetaQueryPlan> plans = new ArrayList<>();
+  private final List<MetaQueryPlan> plans = new ArrayList<>();
 
   private Connection connection;
 
diff --git a/src/main/java/io/ebean/metric/MetricServiceProvider.java b/src/main/java/io/ebean/metric/MetricServiceProvider.java
index d6a5e3721..b7208cefd 100644
--- a/src/main/java/io/ebean/metric/MetricServiceProvider.java
+++ b/src/main/java/io/ebean/metric/MetricServiceProvider.java
@@ -10,7 +10,7 @@ import java.util.ServiceLoader;
  */
 class MetricServiceProvider {
 
-  private static MetricFactory metricFactory = init();
+  private static final MetricFactory metricFactory = init();
 
   private static MetricFactory init() {
 
diff --git a/src/main/java/io/ebeaninternal/api/BeanCacheResult.java b/src/main/java/io/ebeaninternal/api/BeanCacheResult.java
index 2196cac3c..c3b70e2e1 100644
--- a/src/main/java/io/ebeaninternal/api/BeanCacheResult.java
+++ b/src/main/java/io/ebeaninternal/api/BeanCacheResult.java
@@ -8,7 +8,7 @@ import java.util.List;
  */
 public class BeanCacheResult<T> {
 
-  private List<Entry<T>> list = new ArrayList<>();
+  private final List<Entry<T>> list = new ArrayList<>();
 
   /**
    * Add an entry.
diff --git a/src/main/java/io/ebeaninternal/api/NaturalKeyEntry.java b/src/main/java/io/ebeaninternal/api/NaturalKeyEntry.java
index 756b24006..9a979a6b4 100644
--- a/src/main/java/io/ebeaninternal/api/NaturalKeyEntry.java
+++ b/src/main/java/io/ebeaninternal/api/NaturalKeyEntry.java
@@ -12,8 +12,8 @@ import java.util.Map;
  */
 public class NaturalKeyEntry {
 
-  private Map<String,Object> map = new HashMap<>();
-  private Object key;
+  private final Map<String,Object> map = new HashMap<>();
+  private final Object key;
   private Object inValue;
 
   /**
diff --git a/src/main/java/io/ebeaninternal/api/ScopedTransaction.java b/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
index 8db8c316d..f5a1db07b 100644
--- a/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
+++ b/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
@@ -17,7 +17,7 @@ public class ScopedTransaction extends SpiTransactionProxy {
   /**
    * Stack of 'nested' transactions.
    */
-  private ArrayStack<ScopeTrans> stack = new ArrayStack<>();
+  private final ArrayStack<ScopeTrans> stack = new ArrayStack<>();
 
   private ScopeTrans current;
 
diff --git a/src/main/java/io/ebeaninternal/api/SpiQuery.java b/src/main/java/io/ebeaninternal/api/SpiQuery.java
index f162e950a..112c0c7b8 100644
--- a/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -106,9 +106,9 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
      */
     UPDATE(FIND_UPDATE, "update", true);
 
-    private boolean update;
-    private String profileEventId;
-    private String label;
+    private final boolean update;
+    private final String profileEventId;
+    private final String label;
 
     Type(String profileEventId, String label) {
       this(profileEventId, label, false);
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
index 54d0ec5be..0b958a291 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
@@ -62,14 +62,14 @@ public class BaseTableDdl implements TableDdl {
    * Used to check that indexes on foreign keys should be skipped as a unique index on the columns
    * already exists.
    */
-  protected IndexSet indexSet = new IndexSet();
+  protected final IndexSet indexSet = new IndexSet();
 
   /**
    * Used when unique constraints specifically for OneToOne can't be created normally (MsSqlServer).
    */
-  protected List<Column> externalUnique = new ArrayList<>();
+  protected final List<Column> externalUnique = new ArrayList<>();
 
-  protected List<UniqueConstraint> externalCompoundUnique = new ArrayList<>();
+  protected final List<UniqueConstraint> externalCompoundUnique = new ArrayList<>();
 
   // counters used when constraint names are truncated due to maximum length
   // and these counters are used to keep the constraint name unique
@@ -82,9 +82,9 @@ public class BaseTableDdl implements TableDdl {
    * Base tables that have associated history tables that need their triggers/functions regenerated as
    * columns have been added, removed, included or excluded.
    */
-  protected Map<String, HistoryTableUpdate> regenerateHistoryTriggers = new LinkedHashMap<>();
+  protected final Map<String, HistoryTableUpdate> regenerateHistoryTriggers = new LinkedHashMap<>();
 
-  private boolean strictMode;
+  private final boolean strictMode;
 
   private final HistorySupport historySupport;
 
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java b/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java
index 895613471..07ac9ad30 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java
@@ -8,6 +8,7 @@ import io.ebeaninternal.dbmigration.migration.DdlScript;
 import io.ebeaninternal.server.deploy.DbMigrationInfo;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * A column in the logical model.
@@ -309,7 +310,7 @@ public class MColumn {
   }
 
   protected static boolean different(String val1, String val2) {
-    return (val1 == null) ? val2 != null : !val1.equals(val2);
+    return !Objects.equals(val1, val2);
   }
 
   private boolean hasValue(String val) {
diff --git a/src/main/java/io/ebeaninternal/json/DJsonService.java b/src/main/java/io/ebeaninternal/json/DJsonService.java
index 0b4dc7412..d98aa6d7c 100644
--- a/src/main/java/io/ebeaninternal/json/DJsonService.java
+++ b/src/main/java/io/ebeaninternal/json/DJsonService.java
@@ -181,7 +181,7 @@ public class DJsonService implements SpiJsonService {
     if (modifyAware) {
       return ((ModifyAwareList<T>) list).asSet();
     } else {
-      return new LinkedHashSet<T>(list);
+      return new LinkedHashSet<>(list);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/autotune/AutoTuneCollection.java b/src/main/java/io/ebeaninternal/server/autotune/AutoTuneCollection.java
index bcff9b636..c86d3ce0a 100644
--- a/src/main/java/io/ebeaninternal/server/autotune/AutoTuneCollection.java
+++ b/src/main/java/io/ebeaninternal/server/autotune/AutoTuneCollection.java
@@ -11,7 +11,7 @@ import java.util.List;
  */
 public class AutoTuneCollection {
 
-  List<Entry> entries = new ArrayList<>();
+  final List<Entry> entries = new ArrayList<>();
 
   public Entry add(ObjectGraphOrigin origin, OrmQueryDetail detail, String sourceQuery) {
     Entry entry = new Entry(origin, detail, sourceQuery);
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultBackgroundExecutor.java b/src/main/java/io/ebeaninternal/server/core/DefaultBackgroundExecutor.java
index e458c5165..e48d7463d 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultBackgroundExecutor.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultBackgroundExecutor.java
@@ -91,17 +91,13 @@ public class DefaultBackgroundExecutor implements SpiBackgroundExecutor {
     if (map == null) {
       return schedulePool.schedule(c, delay, unit);
     } else {
-      return schedulePool.schedule(new Callable<V>() {
-        @Override
-        public V call() throws Exception {
-          MDC.setContextMap(map);
-          try {
-            return c.call();
-          } finally {
-            MDC.clear();
-          }
+      return schedulePool.schedule(() -> {
+        MDC.setContextMap(map);
+        try {
+          return c.call();
+        } finally {
+          MDC.clear();
         }
-
       }, delay, unit);
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index b12ef4754..85c4391db 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -160,7 +160,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Clock to use for WhenModified and WhenCreated.
    */
-  private ClockService clockService;
+  private final ClockService clockService;
 
   private final CallStackFactory callStackFactory;
 
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequest.java b/src/main/java/io/ebeaninternal/server/core/PersistRequest.java
index 42b8efae0..95481e61e 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequest.java
@@ -24,7 +24,7 @@ public abstract class PersistRequest extends BeanRequest implements BatchPostExe
     DELETE_PERMANENT(EVT_DELETE_PERMANENT),
     UPDATESQL(EVT_UPDATESQL),
     CALLABLESQL(EVT_CALLABLESQL);
-    String profileEventId;
+    final String profileEventId;
 
     Type(String profileEventId) {
       this.profileEventId = profileEventId;
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index 53c593457..42b126a5b 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -85,7 +85,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
 
   private DocStoreMode docStoreMode;
 
-  private ConcurrencyMode concurrencyMode;
+  private final ConcurrencyMode concurrencyMode;
 
   /**
    * The unique id used for logging summary.
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
index a0ebdbef1..dc3a06be3 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
@@ -29,7 +29,7 @@ public final class PersistRequestUpdateSql extends PersistRequest {
 
   private boolean addBatch;
 
-  private boolean forceNoBatch;
+  private final boolean forceNoBatch;
 
   private boolean batchThisRequest;
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index ad296978c..90a72710a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -79,7 +79,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   /**
    * Descriptor for the 'target' when the property maps to an element collection.
    */
-  BeanDescriptor<T> elementDescriptor;
+  final BeanDescriptor<T> elementDescriptor;
 
   /**
    * Order by used when fetch joining the associated many.
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java
index 639a856ad..db79a24e7 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java
@@ -185,7 +185,7 @@ public class ChainedBeanPersistController implements BeanPersistController {
 
       int i1 = o1.getExecutionOrder();
       int i2 = o2.getExecutionOrder();
-      return (i1 < i2 ? -1 : (i1 == i2 ? 0 : 1));
+      return Integer.compare(i1, i2);
     }
 
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java
index eff9a1c10..d96e69727 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java
@@ -89,10 +89,7 @@ public class ChainedBeanQueryAdapter implements BeanQueryAdapter {
 
     @Override
     public int compare(BeanQueryAdapter o1, BeanQueryAdapter o2) {
-
-      int i1 = o1.getExecutionOrder();
-      int i2 = o2.getExecutionOrder();
-      return (i1 < i2 ? -1 : (i1 == i2 ? 0 : 1));
+      return Integer.compare(o1.getExecutionOrder(), o2.getExecutionOrder());
     }
 
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DCacheRegionNone.java b/src/main/java/io/ebeaninternal/server/deploy/DCacheRegionNone.java
index 50c9ba33a..ff8dfeb17 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DCacheRegionNone.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DCacheRegionNone.java
@@ -4,7 +4,7 @@ import io.ebeaninternal.api.SpiCacheRegion;
 
 class DCacheRegionNone implements SpiCacheRegion {
 
-  static SpiCacheRegion INSTANCE = new DCacheRegionNone();
+  static final SpiCacheRegion INSTANCE = new DCacheRegionNone();
 
   @Override
   public String getName() {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java b/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java
index 4c5e22532..c2e576b0c 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java
@@ -16,7 +16,7 @@ class DetermineAggPath {
       // a top level aggregation (so here we need to exclude Id property)
       return null;
     }
-    return path.getManyPath(0, desc);
+    return path.getManyPath(desc);
   }
 
   static Path paths(String aggregation) {
@@ -82,9 +82,9 @@ class DetermineAggPath {
       }
     }
 
-    String getManyPath(int pos, DeployBeanDescriptor<?> desc) {
+    String getManyPath(DeployBeanDescriptor<?> desc) {
+      int pos = 0;
       while (true) {
-
         String path = paths[pos];
         DeployBeanProperty details = desc.getBeanProperty(path);
         if (details instanceof DeployBeanPropertyAssocMany<?>) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ElementEntityBean.java b/src/main/java/io/ebeaninternal/server/deploy/ElementEntityBean.java
index 53b1e69b1..366ba5a97 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ElementEntityBean.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ElementEntityBean.java
@@ -11,7 +11,7 @@ class ElementEntityBean implements EntityBean {
 
   private Object[] data;
 
-  private EntityBeanIntercept intercept;
+  private final EntityBeanIntercept intercept;
 
   ElementEntityBean(String[] properties) {
     this.properties = properties;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ElementHelpList.java b/src/main/java/io/ebeaninternal/server/deploy/ElementHelpList.java
index 8d23b23de..5c48b4f19 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ElementHelpList.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ElementHelpList.java
@@ -15,7 +15,7 @@ class ElementHelpList implements ElementHelp {
 
   private static class Collector implements ElementCollector {
 
-    private List<Object> list = new ArrayList<>();
+    private final List<Object> list = new ArrayList<>();
 
     @Override
     public void addElement(Object element) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ElementHelpMap.java b/src/main/java/io/ebeaninternal/server/deploy/ElementHelpMap.java
index 6436f6d53..985ab4248 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ElementHelpMap.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ElementHelpMap.java
@@ -15,7 +15,7 @@ class ElementHelpMap implements ElementHelp {
 
   private static class Collector implements ElementCollector {
 
-    private Map<Object, Object> map = new LinkedHashMap<>();
+    private final Map<Object, Object> map = new LinkedHashMap<>();
 
     @Override
     public void addElement(Object element) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ElementHelpSet.java b/src/main/java/io/ebeaninternal/server/deploy/ElementHelpSet.java
index 9f0e7602d..71c15aee3 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ElementHelpSet.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ElementHelpSet.java
@@ -15,7 +15,7 @@ class ElementHelpSet implements ElementHelp {
 
   private static class Collector implements ElementCollector {
 
-    private Set<Object> set = new LinkedHashSet<>();
+    private final Set<Object> set = new LinkedHashSet<>();
 
     @Override
     public void addElement(Object element) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
index 2ff4b60b1..8e7b10fc2 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
@@ -100,7 +100,7 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
 
   @Override
   public int compareTo(ImportedIdSimple other) {
-    return (position < other.position ? -1 : (position == other.position ? 0 : 1));
+    return Integer.compare(position, other.position);
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java b/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java
index 4eee83648..52e39fbfa 100644
--- a/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java
@@ -8,7 +8,7 @@ import java.io.IOException;
 
 class CaseInsensitiveEqualExpression extends AbstractValueExpression {
 
-  private boolean not;
+  private final boolean not;
 
   CaseInsensitiveEqualExpression(String propertyName, Object value, boolean not) {
     super(propertyName, value);
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 33cd9dd2e..7e88b2897 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -60,7 +60,7 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
 
   private final ExpressionList<T> parentExprList;
 
-  protected ExpressionFactory expr;
+  protected final ExpressionFactory expr;
 
   String allDocNestedPath;
 
diff --git a/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java b/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java
index 6f4cec83e..f60b125cb 100644
--- a/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java
@@ -4,6 +4,7 @@ import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 
 import java.io.IOException;
+import java.util.Objects;
 
 /**
  * Generally speaking tests the value at a given path in the JSON document.
@@ -91,8 +92,8 @@ class JsonPathExpression extends AbstractExpression {
   @Override
   public boolean isSameByBind(SpiExpression other) {
     JsonPathExpression that = (JsonPathExpression) other;
-    if (value != null ? !value.equals(that.value) : that.value != null) return false;
-    return upperValue != null ? upperValue.equals(that.upperValue) : that.upperValue == null;
+    if (!Objects.equals(value, that.value)) return false;
+    return Objects.equals(upperValue, that.upperValue);
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java b/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java
index 2bc0e202b..f00a52868 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java
@@ -5,7 +5,7 @@ import java.util.Map;
 
 class OperatorMapping {
 
-  Map<String, EqlOperator> map = new HashMap<>();
+  final Map<String, EqlOperator> map = new HashMap<>();
 
   public OperatorMapping() {
     map.put("eq", EqlOperator.EQ);
diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchDepthComparator.java b/src/main/java/io/ebeaninternal/server/persist/BatchDepthComparator.java
index cbc3a3cb6..84c86cc54 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchDepthComparator.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchDepthComparator.java
@@ -19,13 +19,7 @@ public class BatchDepthComparator implements Comparator<BatchedBeanHolder>, Seri
   @Override
   public int compare(BatchedBeanHolder b1, BatchedBeanHolder b2) {
 
-    if (b1.getOrder() < b2.getOrder()) {
-      return -1;
-    }
-    if (b1.getOrder() == b2.getOrder()) {
-      return 0;
-    }
-    return 1;
+    return Integer.compare(b1.getOrder(), b2.getOrder());
   }
 
 }
diff --git a/src/main/java/io/ebeaninternal/server/persist/DeleteMode.java b/src/main/java/io/ebeaninternal/server/persist/DeleteMode.java
index 9961a8bfc..e55ee0e0e 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DeleteMode.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DeleteMode.java
@@ -18,9 +18,9 @@ public enum DeleteMode {
    */
   HARD(PersistRequest.Type.DELETE_PERMANENT, true);
 
-  private boolean hard;
+  private final boolean hard;
 
-  private PersistRequest.Type persistType;
+  private final PersistRequest.Type persistType;
 
   DeleteMode(PersistRequest.Type persistType, boolean hard) {
     this.persistType = persistType;
diff --git a/src/main/java/io/ebeaninternal/server/persist/MultiValueWrapper.java b/src/main/java/io/ebeaninternal/server/persist/MultiValueWrapper.java
index 9e4d1528a..36104822a 100644
--- a/src/main/java/io/ebeaninternal/server/persist/MultiValueWrapper.java
+++ b/src/main/java/io/ebeaninternal/server/persist/MultiValueWrapper.java
@@ -8,7 +8,7 @@ import java.util.Collection;
  */
 public class MultiValueWrapper {
   private final Collection<?> values;
-  private Class<?> type;
+  private final Class<?> type;
 
   public MultiValueWrapper(Collection<?> values, Class<?> type) {
     this.values = values;
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
index 8370104c1..5acd88ba7 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
@@ -36,7 +36,7 @@ public class SaveManyBeans extends SaveManyBase {
   private final DeleteMode deleteMode;
 
   private Collection<?> collection;
-  private DefaultPersister persister;
+  private final DefaultPersister persister;
   private boolean deleteMissing;
   private int sortOrder;
 
diff --git a/src/main/java/io/ebeaninternal/server/profile/TimedProfileLocationRegistry.java b/src/main/java/io/ebeaninternal/server/profile/TimedProfileLocationRegistry.java
index 018130b2d..1a5f8ff07 100644
--- a/src/main/java/io/ebeaninternal/server/profile/TimedProfileLocationRegistry.java
+++ b/src/main/java/io/ebeaninternal/server/profile/TimedProfileLocationRegistry.java
@@ -9,7 +9,7 @@ import java.util.List;
  */
 public class TimedProfileLocationRegistry {
 
-  private static final List<TimedProfileLocation> list = Collections.synchronizedList(new ArrayList<TimedProfileLocation>());
+  private static final List<TimedProfileLocation> list = Collections.synchronizedList(new ArrayList<>());
 
   /**
    * Register the timed profile location instance.
diff --git a/src/main/java/io/ebeaninternal/server/query/CQuery.java b/src/main/java/io/ebeaninternal/server/query/CQuery.java
index 6d5a2637e..561b1638c 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQuery.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQuery.java
@@ -183,7 +183,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
   /**
    * Flag set when read auditing.
    */
-  private boolean audit;
+  private final boolean audit;
 
   /**
    * Flag set when findIterate is being read audited meaning we log in batches.
diff --git a/src/main/java/io/ebeaninternal/server/query/PlatformQueryPlan.java b/src/main/java/io/ebeaninternal/server/query/PlatformQueryPlan.java
index 6f65622d9..ad56eacb7 100644
--- a/src/main/java/io/ebeaninternal/server/query/PlatformQueryPlan.java
+++ b/src/main/java/io/ebeaninternal/server/query/PlatformQueryPlan.java
@@ -4,13 +4,13 @@ import io.ebean.annotation.Platform;
 
 public final class PlatformQueryPlan {
 
-  private static QueryPlanLogger explainLogger = new QueryPlanLoggerExplain();
+  private static final QueryPlanLogger explainLogger = new QueryPlanLoggerExplain();
 
-  private static QueryPlanLogger postgresLogger = new QueryPlanLoggerPostgres();
+  private static final QueryPlanLogger postgresLogger = new QueryPlanLoggerPostgres();
 
-  private static QueryPlanLogger sqlServerLogger = new QueryPlanLoggerSqlServer();
+  private static final QueryPlanLogger sqlServerLogger = new QueryPlanLoggerSqlServer();
 
-  private static QueryPlanLogger oracleLogger = new QueryPlanLoggerOracle();
+  private static final QueryPlanLogger oracleLogger = new QueryPlanLoggerOracle();
 
   /**
    * Returns the logger to log query plans for the given platform.
diff --git a/src/main/java/io/ebeaninternal/server/query/RawSqlQueryPlanKey.java b/src/main/java/io/ebeaninternal/server/query/RawSqlQueryPlanKey.java
index 04b2e282f..be4f4d3c6 100644
--- a/src/main/java/io/ebeaninternal/server/query/RawSqlQueryPlanKey.java
+++ b/src/main/java/io/ebeaninternal/server/query/RawSqlQueryPlanKey.java
@@ -2,6 +2,8 @@ package io.ebeaninternal.server.query;
 
 import io.ebeaninternal.api.CQueryPlanKey;
 
+import java.util.Objects;
+
 /**
  * QueryPlanKey for RawSql queries.
  */
@@ -49,7 +51,7 @@ class RawSqlQueryPlanKey implements CQueryPlanKey {
     if (rawSql != that.rawSql) return false;
     if (rowNumberIncluded != that.rowNumberIncluded) return false;
     if (!sql.equals(that.sql)) return false;
-    return logWhereSql != null ? logWhereSql.equals(that.logWhereSql) : that.logWhereSql == null;
+    return Objects.equals(logWhereSql, that.logWhereSql);
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
index 45bf4c802..c083eb3d5 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
@@ -3,6 +3,8 @@ package io.ebeaninternal.server.querydefn;
 import io.ebeaninternal.api.CQueryPlanKey;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
 
+import java.util.Objects;
+
 /**
  * Query plan key for ORM queries.
  */
@@ -55,6 +57,6 @@ class OrmQueryPlanKey implements CQueryPlanKey {
     if (maxRows != that.maxRows) return false;
     if (firstRow != that.firstRow) return false;
     if (!description.equals(that.description)) return false;
-    return rawSqlKey != null ? rawSqlKey.equals(that.rawSqlKey) : that.rawSqlKey == null;
+    return Objects.equals(rawSqlKey, that.rawSqlKey);
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java
index 1baa3409a..ce20f21b8 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java
@@ -12,7 +12,7 @@ import java.util.List;
  */
 class OrmQueryPropertiesParser {
 
-  private static Response EMPTY = new Response();
+  private static final Response EMPTY = new Response();
 
   /**
    * Immutable response of the parsed properties and options.
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java
index 81490f5a8..94adef13a 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java
@@ -116,7 +116,7 @@ public class OrmUpdateProperties {
   /**
    * The set properties/expressions and their bind values.
    */
-  private LinkedHashMap<String, Value> values = new LinkedHashMap<>();
+  private final LinkedHashMap<String, Value> values = new LinkedHashMap<>();
 
   /**
    * Normal set property.
diff --git a/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlParser.java b/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlParser.java
index 0d8552307..0e46cbe10 100644
--- a/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlParser.java
+++ b/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlParser.java
@@ -55,7 +55,7 @@ class DRawSqlParser {
 
   private Sql parse() {
 
-    parseSqlFindKeywords(true);
+    parseSqlFindKeywords();
 
     whereExprPos = findWhereExprPosition();
     havingExprPos = findHavingExprPosition();
@@ -165,7 +165,7 @@ class DRawSqlParser {
     }
   }
 
-  private void parseSqlFindKeywords(boolean allKeywords) {
+  private void parseSqlFindKeywords() {
 
     selectPos = textParser.findWordLower("select");
     if (selectPos == -1) {
@@ -184,10 +184,6 @@ class DRawSqlParser {
       throw new RuntimeException(msg + sql);
     }
 
-    if (!allKeywords) {
-      return;
-    }
-
     wherePos = textParser.findWordLower("where");
     if (wherePos == -1) {
       groupByPos = textParser.findWordLower("group", fromPos + 5);
diff --git a/src/main/java/io/ebeaninternal/server/rawsql/SpiRawSql.java b/src/main/java/io/ebeaninternal/server/rawsql/SpiRawSql.java
index e84ab7d94..73bc6ff19 100644
--- a/src/main/java/io/ebeaninternal/server/rawsql/SpiRawSql.java
+++ b/src/main/java/io/ebeaninternal/server/rawsql/SpiRawSql.java
@@ -11,6 +11,7 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * Internal service API for Raw Sql.
@@ -432,8 +433,8 @@ public interface SpiRawSql extends RawSql {
         Column that = (Column) o;
         if (indexPos != that.indexPos) return false;
         if (!dbColumn.equals(that.dbColumn)) return false;
-        if (dbAlias != null ? !dbAlias.equals(that.dbAlias) : that.dbAlias != null) return false;
-        return propertyName != null ? propertyName.equals(that.propertyName) : that.propertyName == null;
+        if (!Objects.equals(dbAlias, that.dbAlias)) return false;
+        return Objects.equals(propertyName, that.propertyName);
       }
 
       @Override
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TableModState.java b/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
index 70d2ae6b2..e16fa6d81 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
@@ -21,7 +21,7 @@ public class TableModState implements QueryCacheEntryValidate, ServerCacheNotify
 
   private static final Logger log = LoggerFactory.getLogger("io.ebean.cache.TABLEMOD");
 
-  private Map<String, Long> tableModStamp = new ConcurrentHashMap<>();
+  private final Map<String, Long> tableModStamp = new ConcurrentHashMap<>();
 
   public TableModState() {
   }
diff --git a/src/main/java/io/ebeanservice/docstore/api/mapping/DocMappingBuilder.java b/src/main/java/io/ebeanservice/docstore/api/mapping/DocMappingBuilder.java
index 6a4d8bd64..dc433105d 100644
--- a/src/main/java/io/ebeanservice/docstore/api/mapping/DocMappingBuilder.java
+++ b/src/main/java/io/ebeanservice/docstore/api/mapping/DocMappingBuilder.java
@@ -76,21 +76,16 @@ public class DocMappingBuilder {
    * Apply any override mappings from the top level docStore annotation.
    */
   public void applyMapping() {
-
-    DocMapping[] mapping = docStore.mapping();
-    for (DocMapping docMapping : mapping) {
-      applyFieldMapping(null, docMapping);
+    for (DocMapping docMapping : docStore.mapping()) {
+      applyFieldMapping(docMapping);
     }
   }
 
-  private void applyFieldMapping(String prefix, DocMapping docMapping) {
+  private void applyFieldMapping(DocMapping docMapping) {
 
-    String name = docMapping.name();
-    String fullName = SplitName.add(prefix, name);
-
-    DocPropertyMapping mapping = map.get(fullName);
+    DocPropertyMapping mapping = map.get(docMapping.name());
     if (mapping == null) {
-      throw new IllegalStateException("DocMapping for [" + fullName + "] but property not included in document?");
+      throw new IllegalStateException("DocMapping for [" + docMapping.name() + "] but property not included in document?");
     }
     mapping.apply(docMapping);
   }

From ddf200ffdd4667067dbd4b7dce8c5f2a8e75b1ce Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 29 Jun 2019 00:40:16 +1200
Subject: [PATCH 0913/1036] #1738 - Refactor toArray() plus various

---
 .../ebean/common/AbstractBeanCollection.java  |  1 -
 .../java/io/ebean/config/PlatformConfig.java  |  3 ++
 src/main/java/io/ebean/plugin/BeanType.java   |  1 -
 .../java/io/ebeaninternal/api/BindParams.java |  4 +--
 .../ddlgeneration/platform/BaseTableDdl.java  |  2 +-
 .../dbmigration/model/CurrentModel.java       |  2 +-
 .../dbmigration/model/MTable.java             |  2 +-
 .../server/core/RelationalQueryRequest.java   |  2 +-
 .../deploy/BeanDescriptorDraftHelp.java       |  2 +-
 .../deploy/BeanLifecycleAdapterFactory.java   |  2 +-
 .../server/deploy/BeanPropertyAssocMany.java  |  2 +-
 .../server/deploy/BeanPropertyAssocOne.java   |  7 ++---
 .../deploy/ChainedBeanPersistController.java  |  2 +-
 .../deploy/ChainedBeanPersistListener.java    |  2 +-
 .../ChainedBeanPostConstructListener.java     |  2 +-
 .../server/deploy/ChainedBeanPostLoad.java    |  2 +-
 .../deploy/ChainedBeanQueryAdapter.java       |  2 +-
 .../server/deploy/id/ImportedIdSimple.java    |  2 +-
 .../deploy/meta/DeployBeanDescriptor.java     |  2 +-
 .../deploy/meta/DeployBeanPropertyLists.java  | 30 +++++++++----------
 .../server/deploy/meta/DeployTableJoin.java   |  2 +-
 .../deploy/parse/AnnotationAssocOnes.java     |  2 +-
 .../server/el/ElPropertyChainBuilder.java     |  5 ++--
 .../server/persist/BatchControl.java          |  2 +-
 .../server/persist/BatchedPstmtHolder.java    |  2 +-
 .../persist/dmlbind/BindableEmbedded.java     |  2 +-
 .../server/persist/dmlbind/BindableList.java  |  2 +-
 .../server/query/CQueryBuilder.java           |  2 +-
 .../server/query/DefaultDbSqlContext.java     |  2 +-
 .../server/query/SqlTreeBuilder.java          |  2 +-
 .../server/query/SqlTreeProperties.java       |  2 +-
 .../server/rawsql/DRawSqlColumnsParser.java   |  2 +-
 .../server/text/csv/CsvUtilReader.java        |  2 +-
 33 files changed, 50 insertions(+), 53 deletions(-)

diff --git a/src/main/java/io/ebean/common/AbstractBeanCollection.java b/src/main/java/io/ebean/common/AbstractBeanCollection.java
index 33f05fb89..25001b91b 100644
--- a/src/main/java/io/ebean/common/AbstractBeanCollection.java
+++ b/src/main/java/io/ebean/common/AbstractBeanCollection.java
@@ -219,7 +219,6 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
 
   /**
    * Copies all relevant properties for a clone. See {@link #getShallowCopy()}
-   * @param other
    */
   protected void setFromOriginal(AbstractBeanCollection<E> other) {
     this.disableLazyLoad = other.disableLazyLoad;
diff --git a/src/main/java/io/ebean/config/PlatformConfig.java b/src/main/java/io/ebean/config/PlatformConfig.java
index 2aa48c3f0..d06868d1b 100644
--- a/src/main/java/io/ebean/config/PlatformConfig.java
+++ b/src/main/java/io/ebean/config/PlatformConfig.java
@@ -77,6 +77,9 @@ public class PlatformConfig {
     this.geometrySRID = platformConfig.geometrySRID;
     this.dbUuid = platformConfig.dbUuid;
     this.caseSensitiveCollation = platformConfig.caseSensitiveCollation;
+    this.allQuotedIdentifiers = platformConfig.allQuotedIdentifiers;
+    this.databaseInetAddressVarchar = platformConfig.databaseInetAddressVarchar;
+    this.customDbTypeMappings = platformConfig.customDbTypeMappings;
   }
 
   /**
diff --git a/src/main/java/io/ebean/plugin/BeanType.java b/src/main/java/io/ebean/plugin/BeanType.java
index bb487de35..e11aa32a0 100644
--- a/src/main/java/io/ebean/plugin/BeanType.java
+++ b/src/main/java/io/ebean/plugin/BeanType.java
@@ -223,7 +223,6 @@ public interface BeanType<T> {
 
   /**
    * Visit all children recursively
-   * @param visitor
    */
   void visitAllInheritanceChildren(Consumer<BeanType<?>> visitor);
 
diff --git a/src/main/java/io/ebeaninternal/api/BindParams.java b/src/main/java/io/ebeaninternal/api/BindParams.java
index 4188b20b2..5490164e3 100644
--- a/src/main/java/io/ebeaninternal/api/BindParams.java
+++ b/src/main/java/io/ebeaninternal/api/BindParams.java
@@ -115,10 +115,10 @@ public class BindParams implements Serializable {
    * Return a Natural Key bind param if supported.
    */
   public NaturalKeyBindParam getNaturalKeyBindParam() {
-    if (positionedParameters != null) {
+    if (!positionedParameters.isEmpty()) {
       return null;
     }
-    if (namedParameters != null && namedParameters.size() == 1) {
+    if (namedParameters.size() == 1) {
       Entry<String, Param> e = namedParameters.entrySet().iterator().next();
       return new NaturalKeyBindParam(e.getKey(), e.getValue().getInValue());
     }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
index 0b958a291..ff6745913 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
@@ -134,7 +134,7 @@ public class BaseTableDdl implements TableDdl {
         if (defaultValue == null) {
           handleStrictError(tableName, columnName);
         }
-        before = Arrays.asList(platformDdl.getUpdateNullWithDefault());
+        before = Collections.singletonList(platformDdl.getUpdateNullWithDefault());
       } else {
         before = getScriptsForPlatform(alter.getBefore(), platformDdl.getPlatform().getName());
       }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java b/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
index e37ca0377..811bad5c9 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
@@ -150,7 +150,7 @@ public class CurrentModel {
       List<DdlScript> ddlScript = extraDdl.getDdlScript();
       for (DdlScript script : ddlScript) {
         if (script.isInit() && ExtraDdlXmlReader.matchPlatform(server.getDatabasePlatform().getName(), script.getPlatforms())) {
-          ddl.append(prefix + script.getName()).append('\n');
+          ddl.append(prefix).append(script.getName()).append('\n');
           ddl.append(script.getValue());
         }
       }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
index c80281472..62eafd3e3 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
@@ -769,7 +769,7 @@ public class MTable {
           nullableColumns.add(columnName);
         }
       }
-      uniq.setNullableColumns(nullableColumns.toArray(new String[nullableColumns.size()]));
+      uniq.setNullableColumns(nullableColumns.toArray(new String[0]));
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
index c9a47fb90..7822f5aed 100644
--- a/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
@@ -100,7 +100,7 @@ public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
     for (int i = 1; i < columnsPlusOne; i++) {
       propNames.add(metaData.getColumnLabel(i));
     }
-    return propNames.toArray(new String[propNames.size()]);
+    return propNames.toArray(new String[0]);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java
index 89525901f..544f72297 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java
@@ -39,7 +39,7 @@ public final class BeanDescriptorDraftHelp<T> {
       }
     }
 
-    return list.toArray(new BeanProperty[list.size()]);
+    return list.toArray(new BeanProperty[0]);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java b/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java
index 0d525bb81..d563bf065 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java
@@ -142,7 +142,7 @@ class BeanLifecycleAdapterFactory {
    * Utility method to covert List of Method into array (because we care about performance here).
    */
   static Method[] toArray(List<Method> methodList) {
-    return methodList.toArray(new Method[methodList.size()]);
+    return methodList.toArray(new Method[0]);
   }
 
   static RuntimeException unwrapException(ReflectiveOperationException e) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index 90a72710a..05854d937 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -683,7 +683,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
       }
     }
 
-    return list.toArray(new ExportedProperty[list.size()]);
+    return list.toArray(new ExportedProperty[0]);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index 1e23e340b..c2cc6c843 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -582,7 +582,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
       }
     }
 
-    return list.toArray(new ExportedProperty[list.size()]);
+    return list.toArray(new ExportedProperty[0]);
   }
 
   /**
@@ -769,10 +769,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
       writeJson.writeNullField(name);
 
     } else {
-      if (writeJson.isParentBean(value)) {
-        // bi-directional and already rendered parent
-
-      } else {
+      if (!writeJson.isParentBean(value)) {
         // Hmmm, not writing complex non-entity bean
         if (value instanceof EntityBean) {
           writeJson.beginAssocOne(name, bean);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java
index db79a24e7..404336aca 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java
@@ -44,7 +44,7 @@ public class ChainedBeanPersistController implements BeanPersistController {
    */
   public ChainedBeanPersistController(List<BeanPersistController> list) {
     this.list = list;
-    BeanPersistController[] c = list.toArray(new BeanPersistController[list.size()]);
+    BeanPersistController[] c = list.toArray(new BeanPersistController[0]);
     Arrays.sort(c, SORTER);
     this.chain = c;
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java
index 6879320b1..b92aa4ec7 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java
@@ -50,7 +50,7 @@ public class ChainedBeanPersistListener implements BeanPersistListener {
    */
   public ChainedBeanPersistListener(List<BeanPersistListener> list) {
     this.list = list;
-    this.chain = list.toArray(new BeanPersistListener[list.size()]);
+    this.chain = list.toArray(new BeanPersistListener[0]);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java
index 123bed237..e9ba81c95 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java
@@ -19,7 +19,7 @@ public class ChainedBeanPostConstructListener implements BeanPostConstructListen
    */
   public ChainedBeanPostConstructListener(List<BeanPostConstructListener> list) {
     this.list = list;
-    this.chain = list.toArray(new BeanPostConstructListener[list.size()]);
+    this.chain = list.toArray(new BeanPostConstructListener[0]);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostLoad.java b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostLoad.java
index 38a26159f..9da1fdd66 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostLoad.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostLoad.java
@@ -19,7 +19,7 @@ public class ChainedBeanPostLoad implements BeanPostLoad {
    */
   public ChainedBeanPostLoad(List<BeanPostLoad> list) {
     this.list = list;
-    this.chain = list.toArray(new BeanPostLoad[list.size()]);
+    this.chain = list.toArray(new BeanPostLoad[0]);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java
index d96e69727..15501ef0e 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java
@@ -24,7 +24,7 @@ public class ChainedBeanQueryAdapter implements BeanQueryAdapter {
    */
   public ChainedBeanQueryAdapter(List<BeanQueryAdapter> list) {
     this.list = list;
-    BeanQueryAdapter[] c = list.toArray(new BeanQueryAdapter[list.size()]);
+    BeanQueryAdapter[] c = list.toArray(new BeanQueryAdapter[0]);
     Arrays.sort(c, SORTER);
     this.chain = c;
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
index 8e7b10fc2..e521dfbf3 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
@@ -78,7 +78,7 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
    */
   public static ImportedIdSimple[] sort(List<ImportedIdSimple> list) {
 
-    ImportedIdSimple[] importedIds = list.toArray(new ImportedIdSimple[list.size()]);
+    ImportedIdSimple[] importedIds = list.toArray(new ImportedIdSimple[0]);
 
     // sort into the same order as the BeanProperties
     Arrays.sort(importedIds, COMPARATOR);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index 15f9e9723..01ceca31a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -561,7 +561,7 @@ public class DeployBeanDescriptor<T> {
     if (indexDefinitions == null) {
       return null;
     } else {
-      return indexDefinitions.toArray(new IndexDefinition[indexDefinitions.size()]);
+      return indexDefinitions.toArray(new IndexDefinition[0]);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
index 1e1f35989..8475af9fc 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
@@ -284,7 +284,7 @@ public class DeployBeanPropertyLists {
    * properties).
    */
   public BeanProperty[] getBaseScalar() {
-    return baseScalar.toArray(new BeanProperty[baseScalar.size()]);
+    return baseScalar.toArray(new BeanProperty[0]);
   }
 
   public BeanProperty getId() {
@@ -292,11 +292,11 @@ public class DeployBeanPropertyLists {
   }
 
   public BeanProperty[] getNonTransients() {
-    return nonTransients.toArray(new BeanProperty[nonTransients.size()]);
+    return nonTransients.toArray(new BeanProperty[0]);
   }
 
   public BeanProperty[] getTransients() {
-    return transients.toArray(new BeanProperty[transients.size()]);
+    return transients.toArray(new BeanProperty[0]);
   }
 
   public BeanProperty getVersionProperty() {
@@ -304,23 +304,23 @@ public class DeployBeanPropertyLists {
   }
 
   public BeanProperty[] getLocal() {
-    return local.toArray(new BeanProperty[local.size()]);
+    return local.toArray(new BeanProperty[0]);
   }
 
   public BeanProperty[] getMutable() {
-    return mutable.toArray(new BeanProperty[mutable.size()]);
+    return mutable.toArray(new BeanProperty[0]);
   }
 
   public BeanPropertyAssocOne<?>[] getEmbedded() {
-    return embedded.toArray(new BeanPropertyAssocOne[embedded.size()]);
+    return embedded.toArray(new BeanPropertyAssocOne[0]);
   }
 
   public BeanPropertyAssocOne<?>[] getOneImported() {
-    return onesImported.toArray(new BeanPropertyAssocOne[onesImported.size()]);
+    return onesImported.toArray(new BeanPropertyAssocOne[0]);
   }
 
   public BeanPropertyAssocOne<?>[] getOnes() {
-    return ones.toArray(new BeanPropertyAssocOne[ones.size()]);
+    return ones.toArray(new BeanPropertyAssocOne[0]);
   }
 
   public BeanPropertyAssocOne<?>[] getOneExportedSave() {
@@ -340,11 +340,11 @@ public class DeployBeanPropertyLists {
   }
 
   public BeanProperty[] getNonMany() {
-    return nonManys.toArray(new BeanProperty[nonManys.size()]);
+    return nonManys.toArray(new BeanProperty[0]);
   }
 
   public BeanPropertyAssocMany<?>[] getMany() {
-    return manys.toArray(new BeanPropertyAssocMany[manys.size()]);
+    return manys.toArray(new BeanPropertyAssocMany[0]);
   }
 
   public BeanPropertyAssocMany<?>[] getManySave() {
@@ -397,7 +397,7 @@ public class DeployBeanPropertyLists {
         list.add(prop);
       }
     }
-    return list.toArray(new BeanProperty[list.size()]);
+    return list.toArray(new BeanProperty[0]);
   }
 
   /**
@@ -412,7 +412,7 @@ public class DeployBeanPropertyLists {
         list.add(prop);
       }
     }
-    return list.toArray(new BeanProperty[list.size()]);
+    return list.toArray(new BeanProperty[0]);
   }
 
   /**
@@ -443,7 +443,7 @@ public class DeployBeanPropertyLists {
       }
     }
 
-    return (BeanPropertyAssocOne[]) list.toArray(new BeanPropertyAssocOne[list.size()]);
+    return (BeanPropertyAssocOne[]) list.toArray(new BeanPropertyAssocOne[0]);
   }
 
   private BeanPropertyAssocMany<?>[] getMany2Many() {
@@ -454,7 +454,7 @@ public class DeployBeanPropertyLists {
       }
     }
 
-    return (BeanPropertyAssocMany[]) list.toArray(new BeanPropertyAssocMany[list.size()]);
+    return (BeanPropertyAssocMany[]) list.toArray(new BeanPropertyAssocMany[0]);
   }
 
   private BeanPropertyAssocMany<?>[] getMany(Mode mode) {
@@ -476,7 +476,7 @@ public class DeployBeanPropertyLists {
       }
     }
 
-    return (BeanPropertyAssocMany[]) list.toArray(new BeanPropertyAssocMany[list.size()]);
+    return (BeanPropertyAssocMany[]) list.toArray(new BeanPropertyAssocMany[0]);
   }
 
   @SuppressWarnings({"unchecked", "rawtypes"})
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java
index 3161e0dfc..a63f60531 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java
@@ -106,7 +106,7 @@ public class DeployTableJoin {
    * Return the join columns.
    */
   public DeployTableJoinColumn[] columns() {
-    return columns.toArray(new DeployTableJoinColumn[columns.size()]);
+    return columns.toArray(new DeployTableJoinColumn[0]);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index 1932970fe..a136dadb8 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -189,7 +189,7 @@ public class AnnotationAssocOnes extends AnnotationParser {
 
   private void checkForNoConstraint(DeployBeanPropertyAssocOne<?> prop, JoinColumn joinColumn) {
     ForeignKey foreignKey = joinColumn.foreignKey();
-    if (foreignKey != null && foreignKey.value() == ConstraintMode.NO_CONSTRAINT) {
+    if (foreignKey.value() == ConstraintMode.NO_CONSTRAINT) {
       prop.setForeignKey(new PropertyForeignKey());
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/el/ElPropertyChainBuilder.java b/src/main/java/io/ebeaninternal/server/el/ElPropertyChainBuilder.java
index 271af5c47..93b17b708 100644
--- a/src/main/java/io/ebeaninternal/server/el/ElPropertyChainBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/el/ElPropertyChainBuilder.java
@@ -58,13 +58,12 @@ public class ElPropertyChainBuilder {
    * Build the immutable ElGetChain from the build information.
    */
   public ElPropertyChain build() {
-    return new ElPropertyChain(containsMany, embedded, expression, chain.toArray(new ElPropertyValue[chain.size()]));
+    return new ElPropertyChain(containsMany, embedded, expression, chain.toArray(new ElPropertyValue[0]));
   }
 
   /**
    * Permits to set whole chain as embedded when the leaf is embedded
-   * @param embedded
-     */
+   */
   public void setEmbedded(boolean embedded) {
     this.embedded = embedded;
   }
diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchControl.java b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
index 0b3bd28b3..25b914f8c 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
@@ -352,7 +352,7 @@ public final class BatchControl {
    * Return the BatchedBeanHolder's ready for sorting and executing.
    */
   private BatchedBeanHolder[] getBeanHolderArray() {
-    return beanHoldMap.values().toArray(new BatchedBeanHolder[beanHoldMap.size()]);
+    return beanHoldMap.values().toArray(new BatchedBeanHolder[0]);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java b/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java
index 6b5eb26dd..58b80d766 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java
@@ -114,7 +114,7 @@ public class BatchedPstmtHolder {
     // the flush may get called recursively in executeBatch/postExecute.
     // which leads that we process stmtMap.values() twice in the loop.
     // So we copy the values, that we want to flush and clear it immediately.
-    BatchedPstmt[] values = stmtMap.values().toArray(new BatchedPstmt[stmtMap.values().size()]);
+    BatchedPstmt[] values = stmtMap.values().toArray(new BatchedPstmt[0]);
     clear();
 
     for (BatchedPstmt bs : values) {
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java
index 0f149ac76..44b9a201e 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java
@@ -20,7 +20,7 @@ public class BindableEmbedded implements Bindable {
 
   public BindableEmbedded(BeanPropertyAssocOne<?> embProp, List<Bindable> bindList) {
     this.embProp = embProp;
-    this.items = bindList.toArray(new Bindable[bindList.size()]);        //this.props = propList.toArray(new BeanProperty[propList.size()]);
+    this.items = bindList.toArray(new Bindable[0]);
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableList.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableList.java
index 2c76a1c52..e09e9e706 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableList.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableList.java
@@ -17,7 +17,7 @@ public class BindableList implements Bindable {
   private final Bindable[] items;
 
   public BindableList(List<Bindable> list) {
-    items = list.toArray(new Bindable[list.size()]);
+    items = list.toArray(new Bindable[0]);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 438e8033b..8fa4bc712 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -452,7 +452,7 @@ class CQueryBuilder {
         }
       }
 
-      RawSql rawSql = RawSqlBuilder.resultSet(resultSet, propertyNames.toArray(new String[propertyNames.size()]));
+      RawSql rawSql = RawSqlBuilder.resultSet(resultSet, propertyNames.toArray(new String[0]));
       query.setRawSql(rawSql);
       return createRawSqlSqlTree(request, predicates);
 
diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java b/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
index cb5ae732e..2d87d37ef 100644
--- a/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
+++ b/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
@@ -101,7 +101,7 @@ class DefaultDbSqlContext implements DbSqlContext {
       return null;
     }
 
-    return encryptedProps.toArray(new BeanProperty[encryptedProps.size()]);
+    return encryptedProps.toArray(new BeanProperty[0]);
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 8d15d0085..0e5891dad 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -719,7 +719,7 @@ public final class SqlTreeBuilder {
           extras.add(predProp);
         }
       }
-      return extras.toArray(new String[extras.size()]);
+      return extras.toArray(new String[0]);
     }
 
   }
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
index d36a0f2cd..face5d463 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
@@ -61,7 +61,7 @@ public class SqlTreeProperties {
   }
 
   public STreeProperty[] getProps() {
-    return propsList.toArray(new STreeProperty[propsList.size()]);
+    return propsList.toArray(new STreeProperty[0]);
   }
 
   boolean isPartialObject() {
diff --git a/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java b/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java
index 92e3e1078..2ee3b354d 100644
--- a/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java
+++ b/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java
@@ -49,7 +49,7 @@ final class DRawSqlColumnsParser {
           tmp.add(aSplit.trim());
         }
       }
-      split = tmp.toArray(new String[tmp.size()]);
+      split = tmp.toArray(new String[0]);
     }
 
     if (split.length == 0) {
diff --git a/src/main/java/io/ebeaninternal/server/text/csv/CsvUtilReader.java b/src/main/java/io/ebeaninternal/server/text/csv/CsvUtilReader.java
index 4db3da3b7..9b7ab4127 100644
--- a/src/main/java/io/ebeaninternal/server/text/csv/CsvUtilReader.java
+++ b/src/main/java/io/ebeaninternal/server/text/csv/CsvUtilReader.java
@@ -233,7 +233,7 @@ public class CsvUtilReader {
       }
     } while (inQuotes);
     tokensOnThisLine.add(sb.toString().trim());
-    return tokensOnThisLine.toArray(new String[tokensOnThisLine.size()]);
+    return tokensOnThisLine.toArray(new String[0]);
   }
 
   /**

From d5d9a897ae51491f5874f76749918b5229313579 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 29 Jun 2019 00:44:05 +1200
Subject: [PATCH 0914/1036] [maven-release-plugin] prepare release
 ebean-11.40.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 89bf42dc1..81f14fda9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.40.1-SNAPSHOT</version>
+  <version>11.40.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.40.1</tag>
   </scm>
 
   <profiles>

From 050ae49f6b939af1e1b944d01424f3ca7f0e9092 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 29 Jun 2019 00:44:16 +1200
Subject: [PATCH 0915/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 81f14fda9..0da55160b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.40.1</version>
+  <version>11.40.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.40.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From ed71e106df45bc0f3478773b9195413004fbb929 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 30 Jun 2019 19:00:42 +1200
Subject: [PATCH 0916/1036] #1742 - Bump to ebean-agent 11.41.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0da55160b..c43ae66e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -250,7 +250,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-agent</artifactId>
-      <version>11.40.1</version>
+      <version>11.41.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -330,7 +330,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>11.40.1</version>
+        <version>11.41.1</version>
         <executions>
           <execution>
             <id>test</id>

From eba521563abba40e8fdcd852e1b77d18c169c4a7 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 30 Jun 2019 19:37:49 +1200
Subject: [PATCH 0917/1036] #1739 - Entity with just @Id and @OneToMany fields
 produces broken insert query

---
 .../server/persist/dml/InsertMeta.java        | 16 ++++++++--
 .../server/persist/dmlbind/BindableList.java  |  4 +++
 .../java/org/tests/insert/OnlyIdEntity.java   | 19 +++++++++++
 .../org/tests/insert/TestOnlyIdEntity.java    | 32 +++++++++++++++++++
 4 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/org/tests/insert/OnlyIdEntity.java
 create mode 100644 src/test/java/org/tests/insert/TestOnlyIdEntity.java

diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java b/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java
index d38ae2952..58f9559c0 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java
@@ -177,8 +177,12 @@ public final class InsertMeta {
     request.setInsertSetMode();
 
     request.append("insert into ").append(table);
-    request.append(" (");
+    if (nullId && noColumnsForInsert(draftTable)) {
+      request.append(" default values");
+      return request.toString();
+    }
 
+    request.append(" (");
     if (!nullId) {
       id.dmlAppend(request);
     }
@@ -200,8 +204,16 @@ public final class InsertMeta {
     request.append(") values (");
     request.append(request.getInsertBindBuffer());
     request.append(")");
-
     return request.toString();
   }
 
+  /**
+   * Return true if the insert actually contains no columns.
+   */
+  private boolean noColumnsForInsert(boolean draftTable) {
+    return shadowFKey == null
+      && discriminator == null
+      && (draftTable ? all.isEmpty() : allExcludeDraftOnly.isEmpty());
+  }
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableList.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableList.java
index e09e9e706..de6957ad1 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableList.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableList.java
@@ -33,6 +33,10 @@ public class BindableList implements Bindable {
     return new BindableList(copy);
   }
 
+  public boolean isEmpty() {
+    return items.length == 0;
+  }
+
   @Override
   public boolean isDraftOnly() {
     return false;
diff --git a/src/test/java/org/tests/insert/OnlyIdEntity.java b/src/test/java/org/tests/insert/OnlyIdEntity.java
new file mode 100644
index 000000000..c251efd5a
--- /dev/null
+++ b/src/test/java/org/tests/insert/OnlyIdEntity.java
@@ -0,0 +1,19 @@
+package org.tests.insert;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class OnlyIdEntity {
+
+  @Id
+  long id;
+
+  public long getId() {
+    return id;
+  }
+
+  public void setId(long id) {
+    this.id = id;
+  }
+}
diff --git a/src/test/java/org/tests/insert/TestOnlyIdEntity.java b/src/test/java/org/tests/insert/TestOnlyIdEntity.java
new file mode 100644
index 000000000..c0dff68e9
--- /dev/null
+++ b/src/test/java/org/tests/insert/TestOnlyIdEntity.java
@@ -0,0 +1,32 @@
+package org.tests.insert;
+
+import io.ebean.DB;
+import io.ebean.Database;
+import io.ebean.annotation.ForPlatform;
+import io.ebean.annotation.Platform;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestOnlyIdEntity {
+
+  @ForPlatform({Platform.H2, Platform.POSTGRES})
+  @Test
+  public void insert() {
+
+    final Database database = DB.getDefault();
+
+    LoggedSqlCollector.start();
+    OnlyIdEntity bean = new OnlyIdEntity();
+    database.save(bean);
+
+    List<String> sql = LoggedSqlCollector.stop();
+
+    assertThat(bean.getId()).isGreaterThan(0);
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("insert into only_id_entity default values");
+  }
+}

From 8ffc9ede858a75cd82fa615e33ce6191b4bba801 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 30 Jun 2019 21:52:01 +1200
Subject: [PATCH 0918/1036] #1740 and #1744 Don't include the discriminator
 column on Inheritance query on a type that has no sub-types

Fix for #1740
---
 .../server/deploy/AssocOneHelpRefInherit.java |  2 +-
 .../server/deploy/InheritInfo.java            | 21 +++++++---
 .../deploy/parse/DeployInheritInfo.java       |  2 -
 .../server/query/SqlTreeNodeBean.java         |  3 +-
 .../aggregateformula/IAFBaseSegment.java      | 18 +++++++++
 .../aggregateformula/IAFPartialSegment.java   | 30 ++++++++++++++
 .../aggregateformula/IAFSegmentStatus.java    | 35 +++++++++++++++++
 .../TestAggregateInheritFormula.java          | 39 +++++++++++++++++++
 .../query/other/TestQuerySingleAttribute.java |  4 +-
 9 files changed, 140 insertions(+), 14 deletions(-)
 create mode 100644 src/test/java/org/tests/aggregateformula/IAFBaseSegment.java
 create mode 100644 src/test/java/org/tests/aggregateformula/IAFPartialSegment.java
 create mode 100644 src/test/java/org/tests/aggregateformula/IAFSegmentStatus.java
 create mode 100644 src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java
index c2506237a..563a36cce 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java
@@ -74,7 +74,7 @@ class AssocOneHelpRefInherit extends AssocOneHelp {
   @Override
   void appendSelect(DbSqlContext ctx, boolean subQuery) {
 
-    if (!subQuery) {
+    if (!subQuery && inherit.hasChildren()) {
       // add discriminator column
       String relativePrefix = ctx.getRelativePrefix(property.getName());
       String tableAlias = ctx.getTableAlias(relativePrefix);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java b/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
index 6d112329b..4476c2f81 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
@@ -6,8 +6,8 @@ import io.ebeaninternal.server.deploy.id.IdBinder;
 import io.ebeaninternal.server.deploy.parse.DeployInheritInfo;
 import io.ebeaninternal.server.query.SqlTreeProperties;
 
-import java.lang.reflect.Modifier;
 import javax.persistence.PersistenceException;
+import java.lang.reflect.Modifier;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -175,6 +175,16 @@ public class InheritInfo {
     return children;
   }
 
+  /**
+   * Return true if this node has children.
+   * <p>
+   * When an inheritance node has no children then we don't need
+   * the discriminator column as the type is effectively known.
+   */
+  public boolean hasChildren() {
+    return !children.isEmpty();
+  }
+
   /**
    * Get the bean property additionally looking in the sub types.
    */
@@ -200,7 +210,6 @@ public class InheritInfo {
 
     for (InheritInfo childInfo : children) {
       selectProps.add(childInfo.descriptor.propertiesLocal());
-
       childInfo.addChildrenProperties(selectProps);
     }
   }
@@ -209,9 +218,10 @@ public class InheritInfo {
    * Return the associated InheritInfo for this DB row read.
    */
   public InheritInfo readType(DbReadContext ctx) throws SQLException {
-
-    String discValue = ctx.getDataReader().getString();
-    return readType(discValue);
+    if (!hasChildren()) {
+      return this;
+    }
+    return readType(ctx.getDataReader().getString());
   }
 
   /**
@@ -327,7 +337,6 @@ public class InheritInfo {
    * Return the derived where for the discriminator.
    */
   public String getWhere() {
-
     return where;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
index 4c645457d..a7491f726 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
@@ -199,9 +199,7 @@ public class DeployInheritInfo {
   public String getWhere() {
 
     List<Object> discList = new ArrayList<>();
-
     appendDiscriminator(discList);
-
     return buildWhereLiteral(discList);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
index cbb9bec93..eeb2a05fd 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
@@ -543,10 +543,9 @@ class SqlTreeNodeBean implements SqlTreeNode {
     }
 
     if (readId) {
-      if (!subQuery && inheritInfo != null) {
+      if (!subQuery && inheritInfo != null && inheritInfo.hasChildren()) {
         ctx.appendColumn(inheritInfo.getDiscriminatorColumn());
       }
-
       appendSelectId(ctx, idBinder.getBeanProperty());
     }
     appendSelect(ctx, subQuery, properties);
diff --git a/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java b/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java
new file mode 100644
index 000000000..798fd7fd3
--- /dev/null
+++ b/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java
@@ -0,0 +1,18 @@
+package org.tests.aggregateformula;
+
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.Table;
+
+@Entity
+@Inheritance
+@Table(name = "iaf_segment")
+@DiscriminatorColumn(name = "ptype")
+public class IAFBaseSegment {
+
+  @Id
+  private Long id;
+
+}
diff --git a/src/test/java/org/tests/aggregateformula/IAFPartialSegment.java b/src/test/java/org/tests/aggregateformula/IAFPartialSegment.java
new file mode 100644
index 000000000..c1e2d1d44
--- /dev/null
+++ b/src/test/java/org/tests/aggregateformula/IAFPartialSegment.java
@@ -0,0 +1,30 @@
+package org.tests.aggregateformula;
+
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.ManyToOne;
+
+@Entity
+@Inheritance
+@DiscriminatorValue("target")
+public class IAFPartialSegment extends IAFBaseSegment {
+
+  private final long segmentIdZat;
+
+  @ManyToOne(optional = false)
+  private final IAFSegmentStatus status;
+
+  public IAFPartialSegment(long segmentIdZat, IAFSegmentStatus status) {
+    this.segmentIdZat = segmentIdZat;
+    this.status = status;
+  }
+
+  public long getSegmentIdZat() {
+    return segmentIdZat;
+  }
+
+  public IAFSegmentStatus getStatus() {
+    return status;
+  }
+}
diff --git a/src/test/java/org/tests/aggregateformula/IAFSegmentStatus.java b/src/test/java/org/tests/aggregateformula/IAFSegmentStatus.java
new file mode 100644
index 000000000..f0c4ac9b5
--- /dev/null
+++ b/src/test/java/org/tests/aggregateformula/IAFSegmentStatus.java
@@ -0,0 +1,35 @@
+package org.tests.aggregateformula;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "iaf_segment_status")
+public class IAFSegmentStatus {
+
+  @Id
+  private long id;
+
+  private String name;
+
+  public IAFSegmentStatus(String name) {
+    this.name = name;
+  }
+
+  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;
+  }
+}
diff --git a/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java b/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java
new file mode 100644
index 000000000..558e6f448
--- /dev/null
+++ b/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java
@@ -0,0 +1,39 @@
+package org.tests.aggregateformula;
+
+import io.ebean.DB;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestAggregateInheritFormula {
+
+  @Test
+  public void test() {
+
+    IAFSegmentStatus st0 = new IAFSegmentStatus("st0");
+    IAFSegmentStatus st1 = new IAFSegmentStatus("st1");
+
+    IAFPartialSegment p0 = new IAFPartialSegment(108, st0);
+    IAFPartialSegment p1 = new IAFPartialSegment(108, st1);
+    IAFPartialSegment p2 = new IAFPartialSegment(109, st0);
+
+    DB.saveAll(Arrays.asList(st0, st1, p0, p1));
+
+    LoggedSqlCollector.start();
+
+    List<IAFPartialSegment> segments =
+      DB.find(IAFPartialSegment.class)
+        .select("segmentIdZat, min(status)")
+        .where().eq("segmentIdZat", 108L)
+        .findList();
+
+    final List<String> sql = LoggedSqlCollector.stop();
+
+    assertThat(segments).hasSize(1);
+    assertThat(sql.get(0)).contains("select t0.segment_id_zat, min(t0.status_id) from iaf_segment t0 where t0.ptype = 'target'  and t0.segment_id_zat = ? group by t0.segment_id_zat");
+  }
+}
diff --git a/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
index ae8ca0e98..adfd3ff89 100644
--- a/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
+++ b/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
@@ -23,7 +23,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestQuerySingleAttribute extends BaseTestCase {
 
-
   @Test
   public void exampleUsage() {
 
@@ -236,8 +235,7 @@ public class TestQuerySingleAttribute extends BaseTestCase {
       .select("more");
 
     query.findSingleAttributeList();
-    assertThat(sqlOf(query)).contains("select distinct t0.more from rawinherit_parent t0 where t0.type = 'A' ");
-
+    assertThat(sqlOf(query)).contains("select distinct t0.more from rawinherit_parent t0 where t0.type = 'A'");
   }
 
   @Test

From d49a7c415f01d44a054f7927c811666ec528bb8d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 30 Jun 2019 21:53:59 +1200
Subject: [PATCH 0919/1036] Refactor tidy InheritInfo - no effective change

---
 .../ebeaninternal/server/deploy/InheritInfo.java  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java b/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
index 4476c2f81..6554edf59 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
@@ -11,6 +11,7 @@ import java.lang.reflect.Modifier;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -33,7 +34,7 @@ public class InheritInfo {
 
   private final Class<?> type;
 
-  private final ArrayList<InheritInfo> children = new ArrayList<>();
+  private final List<InheritInfo> children = new ArrayList<>();
 
   /**
    * Map of discriminator values to InheritInfo.
@@ -111,7 +112,7 @@ public class InheritInfo {
    * return true if anything in the inheritance hierarchy has a relationship with a save cascade on
    * it.
    */
-  public boolean isSaveRecurseSkippable() {
+  boolean isSaveRecurseSkippable() {
     return root.isNodeSaveRecurseSkippable();
   }
 
@@ -131,7 +132,7 @@ public class InheritInfo {
    * return true if anything in the inheritance hierarchy has a relationship with a delete cascade
    * on it.
    */
-  public boolean isDeleteRecurseSkippable() {
+  boolean isDeleteRecurseSkippable() {
     return root.isNodeDeleteRecurseSkippable();
   }
 
@@ -171,7 +172,7 @@ public class InheritInfo {
   /**
    * Return the children.
    */
-  public ArrayList<InheritInfo> getChildren() {
+  public List<InheritInfo> getChildren() {
     return children;
   }
 
@@ -188,7 +189,7 @@ public class InheritInfo {
   /**
    * Get the bean property additionally looking in the sub types.
    */
-  public BeanProperty findSubTypeProperty(String propertyName) {
+  BeanProperty findSubTypeProperty(String propertyName) {
 
     BeanProperty prop;
 
@@ -227,7 +228,7 @@ public class InheritInfo {
   /**
    * Return the associated InheritInfo for this discriminator value.
    */
-  public InheritInfo readType(String discValue) {
+  InheritInfo readType(String discValue) {
 
     if (discValue == null) {
       return null;
@@ -371,7 +372,7 @@ public class InheritInfo {
   /**
    * Return the discriminator value for this node.
    */
-  public String getDiscriminatorStringValue() {
+  String getDiscriminatorStringValue() {
     return discriminatorStringValue;
   }
 

From 9f19ed53760e222818a0b3a5a3e1dc0f49279d70 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 1 Jul 2019 00:07:14 +1200
Subject: [PATCH 0920/1036] #1743 - When using @PrimaryKeyJoinColumn, FK
 constraint generation cannot be disabled

---
 .../build/ModelBuildPropertyVisitor.java      | 12 ++++++---
 .../server/deploy/BeanDescriptorManager.java  |  3 +--
 .../server/deploy/BeanPropertyAssocOne.java   |  5 +++-
 .../server/deploy/TableJoin.java              | 26 ++++++++++++-------
 .../org/tests/model/onetoone/OtoUPrime.java   |  5 +++-
 5 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
index fa7950b45..94650eeec 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
@@ -256,9 +256,15 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
       }
       TableJoin primaryKeyJoin = p.getBeanDescriptor().getPrimaryKeyJoin();
       if (primaryKeyJoin != null && !table.isPartitioned()) {
-        TableJoinColumn[] columns = primaryKeyJoin.columns();
-        col.setReferences(primaryKeyJoin.getTable() + "." + columns[0].getForeignDbColumn());
-        col.setForeignKeyName(determineForeignKeyConstraintName(col.getName()));
+        final PropertyForeignKey foreignKey = primaryKeyJoin.getForeignKey();
+        if (foreignKey == null || !foreignKey.isNoConstraint()) {
+          TableJoinColumn[] columns = primaryKeyJoin.columns();
+          col.setReferences(primaryKeyJoin.getTable() + "." + columns[0].getForeignDbColumn());
+          col.setForeignKeyName(determineForeignKeyConstraintName(col.getName()));
+          if (foreignKey != null) {
+            col.setForeignKeyModes(foreignKey.getOnDelete(), foreignKey.getOnUpdate());
+          }
+        }
       }
     } else {
       col.setDefaultValue(p.getDbColumnDefault());
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 6c2ab9114..cca2e4e7e 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -1654,8 +1654,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     String baseTable = prop.getDesc().getBaseTable();
     DeployTableJoin inverse = prop.getTableJoin().createInverse(baseTable);
 
-    TableJoin inverseJoin = new TableJoin(inverse);
-
+    TableJoin inverseJoin = new TableJoin(inverse, prop.getForeignKey());
     DeployBeanInfo<?> target = deployInfoMap.get(prop.getTargetType());
     target.setPrimaryKeyJoin(inverseJoin);
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index c2cc6c843..23ba314cf 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -45,6 +45,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
   private final boolean orphanRemoval;
 
   private final boolean primaryKeyExport;
+  private final boolean primaryKeyJoin;
 
   private AssocOneHelp localHelp;
 
@@ -75,6 +76,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
 
     super(descriptor, deploy);
     primaryKeyExport = deploy.isPrimaryKeyExport();
+    primaryKeyJoin = deploy.isPrimaryKeyJoin();
     oneToOne = deploy.isOneToOne();
     oneToOneExported = deploy.isOneToOneExported();
     orphanRemoval = deploy.isOrphanRemoval();
@@ -100,6 +102,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
   public BeanPropertyAssocOne(BeanPropertyAssocOne source, BeanPropertyOverride override) {
     super(source, override);
     primaryKeyExport = source.primaryKeyExport;
+    primaryKeyJoin = source.primaryKeyJoin;
     oneToOne = source.oneToOne;
     oneToOneExported = source.oneToOneExported;
     orphanRemoval = source.orphanRemoval;
@@ -357,7 +360,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
   }
 
   public boolean hasForeignKey() {
-    return foreignKey == null || !foreignKey.isNoConstraint();
+    return foreignKey == null || primaryKeyJoin || !foreignKey.isNoConstraint();
   }
 
   public boolean hasForeignKeyIndex() {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java b/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java
index 03cb35d6c..5d805aa20 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java
@@ -33,11 +33,17 @@ public final class TableJoin {
    */
   private final int queryHash;
 
+  private final PropertyForeignKey foreignKey;
+
+  public TableJoin(DeployTableJoin deploy) {
+    this(deploy, null);
+  }
+
   /**
    * Create a TableJoin.
    */
-  public TableJoin(DeployTableJoin deploy) {
-
+  public TableJoin(DeployTableJoin deploy, PropertyForeignKey foreignKey) {
+    this.foreignKey = foreignKey;
     this.table = InternString.intern(deploy.getTable());
     this.type = deploy.getType();
     this.inheritInfo = deploy.getInheritInfo();
@@ -52,6 +58,7 @@ public final class TableJoin {
   }
 
   private TableJoin(TableJoin source, String overrideColumn) {
+    this.foreignKey = null;
     this.table = source.table;
     this.type = source.type;
     this.inheritInfo = source.inheritInfo;
@@ -96,14 +103,6 @@ public final class TableJoin {
     return true;
   }
 
-
-  /**
-   * Return a hash value for adding to a query plan.
-   */
-  public int queryHash() {
-    return queryHash;
-  }
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder(30);
@@ -114,6 +113,13 @@ public final class TableJoin {
     return sb.toString();
   }
 
+  /**
+   * Return the foreign key options.
+   */
+  public PropertyForeignKey getForeignKey() {
+    return foreignKey;
+  }
+
   /**
    * Return the join columns.
    */
diff --git a/src/test/java/org/tests/model/onetoone/OtoUPrime.java b/src/test/java/org/tests/model/onetoone/OtoUPrime.java
index 4b2bd894b..a8da23578 100644
--- a/src/test/java/org/tests/model/onetoone/OtoUPrime.java
+++ b/src/test/java/org/tests/model/onetoone/OtoUPrime.java
@@ -1,5 +1,7 @@
 package org.tests.model.onetoone;
 
+import io.ebean.annotation.DbForeignKey;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToOne;
@@ -21,6 +23,7 @@ public class OtoUPrime {
    */
   @OneToOne
   @PrimaryKeyJoinColumn
+  @DbForeignKey(noConstraint = true)
   OtoUPrimeExtra extra;
 
   @Version
@@ -32,7 +35,7 @@ public class OtoUPrime {
 
   @Override
   public String toString() {
-    return "id:"+ pid +" name:"+name+" extra:"+extra;
+    return "id:" + pid + " name:" + name + " extra:" + extra;
   }
 
   public UUID getPid() {

From 7f2e4f54ff6cb65cf20f400cc1561db26cbe5abd Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 1 Jul 2019 21:04:40 +1200
Subject: [PATCH 0921/1036] #1743 - Add hasForeignKeyConstraint()

Separate hasForeignKeyConstraint() for DDL use from hasForeignKey() used in query
---
 .../model/build/ModelBuildIntersectionTable.java |  3 +--
 .../model/build/ModelBuildPropertyVisitor.java   |  5 ++---
 .../server/deploy/BeanPropertyAssoc.java         | 16 +++++++++++++++-
 .../server/deploy/BeanPropertyAssocOne.java      |  4 ----
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java
index 9c2cf29ec..e117c3ead 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java
@@ -49,8 +49,7 @@ class ModelBuildIntersectionTable {
 
   private void buildFkConstraints() {
 
-    PropertyForeignKey foreignKey = manyProp.getForeignKey();
-    if (foreignKey == null || !foreignKey.isNoConstraint()) {
+    if (manyProp.hasForeignKeyConstraint()) {
       ctx.fkeyBuilder(intersectionTable)
         .addForeignKey(manyProp.getBeanDescriptor(), intersectionTableJoin, true)
         .addForeignKey(manyProp.getTargetDescriptor(), tableJoin, false);
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
index 94650eeec..338941122 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
@@ -170,8 +170,6 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
 
     List<MColumn> modelColumns = new ArrayList<>(columns.length);
 
-    PropertyForeignKey foreignKey = p.getForeignKey();
-
     MCompoundForeignKey compoundKey = null;
     if (columns.length > 1) {
       // compound foreign key
@@ -196,7 +194,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
       col.setDbMigrationInfos(p.getDbMigrationInfos());
       col.setDefaultValue(p.getDbColumnDefault());
       if (columns.length == 1) {
-        if (p.hasForeignKey() && !importedProperty.getBeanDescriptor().suppressForeignKey()) {
+        if (p.hasForeignKeyConstraint() && !importedProperty.getBeanDescriptor().suppressForeignKey()) {
           // single references column (put it on the column)
           String refTable = importedProperty.getBeanDescriptor().getBaseTable();
           if (refTable == null) {
@@ -208,6 +206,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
           if (p.hasForeignKeyIndex()) {
             col.setForeignKeyIndex(determineForeignKeyIndexName(col.getName()));
           }
+          PropertyForeignKey foreignKey = p.getForeignKey();
           if (foreignKey != null) {
             col.setForeignKeyModes(foreignKey.getOnDelete(), foreignKey.getOnUpdate());
           }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
index b8915f710..a03d1e713 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
@@ -155,6 +155,20 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
     return foreignKey;
   }
 
+  /**
+   * Return true if foreign key constraint is enabled on this relationship (not disabled).
+   */
+  public boolean hasForeignKeyConstraint() {
+    return foreignKey == null || !foreignKey.isNoConstraint();
+  }
+
+  /**
+   * Return true if foreign key index is enabled on this relationship (not disabled).
+   */
+  public boolean hasForeignKeyIndex() {
+    return foreignKey == null || !foreignKey.isNoIndex();
+  }
+
   /**
    * Create a ElPropertyValue for a *ToOne or *ToMany.
    */
@@ -228,7 +242,7 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
 
   /**
    * Create a new query for the target type.
-   *
+   * <p>
    * We use target descriptor rather than target property type to support ElementCollection.
    */
   public SpiQuery<T> newQuery(SpiEbeanServer server) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index 23ba314cf..5da1a43df 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -363,10 +363,6 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     return foreignKey == null || primaryKeyJoin || !foreignKey.isNoConstraint();
   }
 
-  public boolean hasForeignKeyIndex() {
-    return foreignKey == null || !foreignKey.isNoIndex();
-  }
-
   /**
    * Return true if this a OneToOne property. Otherwise assumed ManyToOne.
    */

From 52398317bc3270237bd93eb4820987e88b3f2cd5 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 1 Jul 2019 22:50:44 +1200
Subject: [PATCH 0922/1036] #1746 - Wrong SQL generated when using setDistinct
 and order by on aggregated column

---
 src/main/java/io/ebean/OrderBy.java           | 27 ++++++++++++++-----
 .../server/query/CQueryBuilder.java           |  6 ++++-
 .../TestAggregateFormula.java                 | 24 +++++++++++++++++
 .../orderby/TestOrderByWithDistinct.java      |  2 +-
 .../tests/unitinternal/TestOrderByParse.java  |  9 +++++++
 5 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/ebean/OrderBy.java b/src/main/java/io/ebean/OrderBy.java
index 10e6baf37..6b59e12bf 100644
--- a/src/main/java/io/ebean/OrderBy.java
+++ b/src/main/java/io/ebean/OrderBy.java
@@ -80,7 +80,6 @@ public final class OrderBy<T> implements Serializable {
    * Add a property with ascending order to this OrderBy.
    */
   public Query<T> asc(String propertyName, String collation) {
-
     list.add(new Property(propertyName, true, collation));
     return query;
   }
@@ -89,7 +88,6 @@ public final class OrderBy<T> implements Serializable {
    * Add a property with descending order to this OrderBy.
    */
   public Query<T> desc(String propertyName) {
-
     list.add(new Property(propertyName, false));
     return query;
   }
@@ -98,7 +96,6 @@ public final class OrderBy<T> implements Serializable {
    * Add a property with descending order to this OrderBy.
    */
   public Query<T> desc(String propertyName, String collation) {
-
     list.add(new Property(propertyName, false, collation));
     return query;
   }
@@ -108,7 +105,6 @@ public final class OrderBy<T> implements Serializable {
    * Return true if the property is known to be contained in the order by clause.
    */
   public boolean containsProperty(String propertyName) {
-
     for (Property aList : list) {
       if (propertyName.equals(aList.getProperty())) {
         return true;
@@ -161,10 +157,9 @@ public final class OrderBy<T> implements Serializable {
    * Return a copy of the OrderBy.
    */
   public OrderBy<T> copy() {
-
     OrderBy<T> copy = new OrderBy<>();
-    for (Property aList : list) {
-      copy.add(aList.copy());
+    for (Property property : list) {
+      copy.add(property.copy());
     }
     return copy;
   }
@@ -241,6 +236,18 @@ public final class OrderBy<T> implements Serializable {
     return this;
   }
 
+  /**
+   * Return true if this order by can be used in select clause.
+   */
+  public boolean supportsSelect() {
+    for (Property property : list) {
+      if (!property.supportsSelect()) {
+        return false;
+      }
+    }
+    return true;
+  }
+
   /**
    * A property and its ascending descending order.
    */
@@ -401,6 +408,12 @@ public final class OrderBy<T> implements Serializable {
       this.ascending = ascending;
     }
 
+    /**
+     * Support use in select clause if no collation or nulls ordering.
+     */
+    boolean supportsSelect() {
+      return nulls == null && collation == null;
+    }
   }
 
   private void parse(String orderByClause) {
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 8fa4bc712..2212e6b87 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.query;
 
 import io.ebean.CountDistinctOrder;
+import io.ebean.OrderBy;
 import io.ebean.Query;
 import io.ebean.RawSql;
 import io.ebean.RawSqlBuilder;
@@ -600,7 +601,10 @@ class CQueryBuilder {
       }
       if (distinct && dbOrderBy != null && !query.isSingleAttribute()) {
         // add the orderBy columns to the select clause (due to distinct)
-        sb.append(", ").append(DbOrderByTrim.trim(dbOrderBy));
+        final OrderBy<?> orderBy = query.getOrderBy();
+        if (orderBy != null && orderBy.supportsSelect()) {
+          sb.append(", ").append(DbOrderByTrim.trim(dbOrderBy));
+        }
       }
     }
 
diff --git a/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java b/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java
index 16be122b1..5d75c444a 100644
--- a/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java
+++ b/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java
@@ -17,6 +17,30 @@ import static org.junit.Assert.assertNotNull;
 
 public class TestAggregateFormula extends BaseTestCase {
 
+  @Test
+  public void minDistinctOrderByNulls() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    List<Contact> contacts = Ebean.find(Contact.class)
+      .setDistinct(true)
+      .select("lastName, min(customer)")
+      .orderBy("min(customer) asc nulls last")
+      .findList();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql.get(0)).contains("select distinct t0.last_name, min(t0.customer_id) from contact t0 group by t0.last_name order by min(t0.customer_id) nulls last");
+
+    assertThat(contacts).isNotEmpty();
+
+    Contact contact = contacts.get(0);
+    assertThat(contact.getLastName()).isNotNull();
+    assertThat(contact.getCustomer()).isNotNull();
+    assertThat(contact.getCustomer().getId()).isNotNull();
+  }
+
   @Test
   public void minOnManyToOne() {
 
diff --git a/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java b/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java
index 684678e1f..7e03b1b6f 100644
--- a/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java
+++ b/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java
@@ -57,7 +57,7 @@ public class TestOrderByWithDistinct extends BaseTestCase {
     if (isPostgres()) {
       assertThat(sql).contains("select distinct on (t0.user_name, t0.userid) t0.userid,");
     } else if (isH2()) {
-      assertThat(sql).contains("select distinct t0.userid, t0.user_name, t0.user_type_id,");
+      assertThat(sql).contains("select distinct t0.userid, t0.user_name, t0.user_type_id from muser t0");
     }
 
   }
diff --git a/src/test/java/org/tests/unitinternal/TestOrderByParse.java b/src/test/java/org/tests/unitinternal/TestOrderByParse.java
index 6cd43c5be..362086508 100644
--- a/src/test/java/org/tests/unitinternal/TestOrderByParse.java
+++ b/src/test/java/org/tests/unitinternal/TestOrderByParse.java
@@ -24,6 +24,7 @@ public class TestOrderByParse extends BaseTestCase {
     assertTrue(o1.getProperties().get(0).isAscending());
     assertThat(o1.toStringFormat()).isEqualTo("case when status='N' then 1 when status='F' then 2 else 99 end");
     assertThat(o1.getProperties().get(0).getProperty()).isEqualTo("case when status='N' then 1 when status='F' then 2 else 99 end");
+    assertTrue(o1.supportsSelect());
   }
 
   @Test
@@ -34,6 +35,7 @@ public class TestOrderByParse extends BaseTestCase {
     assertEquals("id", o1.getProperties().get(0).getProperty());
     assertTrue(o1.getProperties().get(0).isAscending());
     assertEquals("id", o1.toStringFormat());
+    assertTrue(o1.supportsSelect());
 
     o1 = new OrderBy<>("id asc");
     assertEquals(1, o1.getProperties().size());
@@ -65,6 +67,7 @@ public class TestOrderByParse extends BaseTestCase {
     assertEquals("id", o1.getProperties().get(0).getProperty());
     assertTrue(!o1.getProperties().get(0).isAscending());
     assertEquals("id desc nulls high", o1.toStringFormat());
+    assertFalse(o1.supportsSelect());
   }
 
   @Test
@@ -100,6 +103,7 @@ public class TestOrderByParse extends BaseTestCase {
     assertEquals("name", o1.getProperties().get(1).getProperty());
     assertTrue(o1.getProperties().get(1).isAscending());
     assertEquals("id, name", o1.toStringFormat());
+    assertTrue(o1.supportsSelect());
 
     o1 = new OrderBy<>("  id  , name ");
     assertEquals(2, o1.getProperties().size());
@@ -178,6 +182,7 @@ public class TestOrderByParse extends BaseTestCase {
     assertEquals("id", o1.getProperties().get(0).getProperty());
     assertTrue(o1.getProperties().get(0).isAscending());
     assertEquals("id collate latin_1", o1.toStringFormat());
+    assertFalse(o1.supportsSelect());
 
     o1 = new OrderBy<>();
     o1.desc("id", "latin_1");
@@ -185,6 +190,7 @@ public class TestOrderByParse extends BaseTestCase {
     assertEquals("id", o1.getProperties().get(0).getProperty());
     assertTrue(!o1.getProperties().get(0).isAscending());
     assertEquals("id collate latin_1 desc", o1.toStringFormat());
+    assertFalse(o1.supportsSelect());
 
     o1 = new OrderBy<>();
     o1.desc("id", "latin_1");
@@ -195,6 +201,7 @@ public class TestOrderByParse extends BaseTestCase {
     assertTrue(!o1.getProperties().get(0).isAscending());
     assertTrue(o1.getProperties().get(1).isAscending());
     assertEquals("id collate latin_1 desc, date", o1.toStringFormat());
+    assertFalse(o1.supportsSelect());
 
     o1 = new OrderBy<>();
     o1.desc("id", "latin_1");
@@ -205,6 +212,7 @@ public class TestOrderByParse extends BaseTestCase {
     assertTrue(!o1.getProperties().get(0).isAscending());
     assertTrue(o1.getProperties().get(1).isAscending());
     assertEquals("id collate latin_1 desc, name collate latin_2", o1.toStringFormat());
+    assertFalse(o1.supportsSelect());
 
     // functional (DB2) syntax
     o1 = new OrderBy<>();
@@ -213,6 +221,7 @@ public class TestOrderByParse extends BaseTestCase {
     assertEquals("id", o1.getProperties().get(0).getProperty());
     assertTrue(!o1.getProperties().get(0).isAscending());
     assertEquals("COLLATION_KEY(id, 'latin_1') desc", o1.toStringFormat());
+    assertFalse(o1.supportsSelect());
 
   }
 

From d3b3a793427a61cca78d394453d1405e6d40fc99 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 2 Jul 2019 19:41:26 +1200
Subject: [PATCH 0923/1036] #1747 - Refactor tidy on DeployUtil and
 AnnotationAssocMany

---
 .../deploy/parse/AnnotationAssocManys.java    | 80 +++++++------------
 .../server/deploy/parse/DeployUtil.java       | 37 +++------
 2 files changed, 41 insertions(+), 76 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index 1fd035739..72f275c96 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -10,7 +10,6 @@ import io.ebean.config.BeanNotRegisteredException;
 import io.ebean.config.NamingConvention;
 import io.ebean.config.TableName;
 import io.ebean.util.CamelCaseHelper;
-import io.ebean.util.StringHelper;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanTable;
@@ -41,6 +40,8 @@ import javax.persistence.OrderBy;
 import javax.persistence.OrderColumn;
 import java.util.Set;
 
+import static io.ebean.util.StringHelper.isNull;
+
 /**
  * Read the deployment annotation for Assoc Many beans.
  */
@@ -164,7 +165,6 @@ class AnnotationAssocManys extends AnnotationParser {
       return;
     }
 
-
     if (!prop.getTableJoin().hasJoinColumns() && beanTable != null) {
 
       // use naming convention to define join (based on the bean name for this side of relationship)
@@ -340,14 +340,18 @@ class AnnotationAssocManys extends AnnotationParser {
    * Return the full table name
    */
   private String getFullTableName(JoinTable joinTable) {
+    return append(joinTable.catalog(), joinTable.schema(), joinTable.name());
+  }
+
+  private String append(String catalog, String schema, String name) {
     StringBuilder sb = new StringBuilder();
-    if (!StringHelper.isNull(joinTable.catalog())) {
-      sb.append(joinTable.catalog()).append(".");
+    if (!isNull(catalog)) {
+      sb.append(catalog).append(".");
     }
-    if (!StringHelper.isNull(joinTable.schema())) {
-      sb.append(joinTable.schema()).append(".");
+    if (!isNull(schema)) {
+      sb.append(schema).append(".");
     }
-    sb.append(joinTable.name());
+    sb.append(name);
     return sb.toString();
   }
 
@@ -358,15 +362,7 @@ class AnnotationAssocManys extends AnnotationParser {
     if (collectionTable == null || collectionTable.name().isEmpty()) {
       return null;
     }
-    StringBuilder sb = new StringBuilder();
-    if (!StringHelper.isNull(collectionTable.catalog())) {
-      sb.append(collectionTable.catalog()).append(".");
-    }
-    if (!StringHelper.isNull(collectionTable.schema())) {
-      sb.append(collectionTable.schema()).append(".");
-    }
-    sb.append(collectionTable.name());
-    return sb.toString();
+    return append(collectionTable.catalog(), collectionTable.schema(), collectionTable.name());
   }
 
   /**
@@ -444,26 +440,11 @@ class AnnotationAssocManys extends AnnotationParser {
 
     manyProp.setMappedBy(propAnn.mappedBy());
     manyProp.setFetchType(propAnn.fetch());
-
     setCascadeTypes(propAnn.cascade(), manyProp.getCascadeInfo());
-
-    Class<?> targetType = propAnn.targetEntity();
-    if (targetType.equals(void.class)) {
-      // via reflection of generics type
-      targetType = manyProp.getTargetType();
-    } else {
-      manyProp.setTargetType(targetType);
-    }
-
-    // find the other many table (not intersection)
-    BeanTable assoc = factory.getBeanTable(targetType);
-    if (assoc == null) {
-      throw new BeanNotRegisteredException(errorMsgMissingBeanTable(targetType, manyProp.getFullBeanName()));
-    }
-
+    setTargetType(propAnn.targetEntity(), manyProp);
+    setBeanTable(manyProp);
     manyProp.setManyToMany();
     manyProp.setModifyListenMode(ModifyListenMode.ALL);
-    manyProp.setBeanTable(assoc);
     manyProp.getTableJoin().setType(SqlJoinType.OUTER);
   }
 
@@ -471,34 +452,31 @@ class AnnotationAssocManys extends AnnotationParser {
 
     manyProp.setMappedBy(propAnn.mappedBy());
     manyProp.setFetchType(propAnn.fetch());
-
     setCascadeTypes(propAnn.cascade(), manyProp.getCascadeInfo());
-
-    Class<?> targetType = propAnn.targetEntity();
-    if (targetType.equals(void.class)) {
-      // via reflection of generics type
-      targetType = manyProp.getTargetType();
-    } else {
-      manyProp.setTargetType(targetType);
-    }
-
-    BeanTable assoc = factory.getBeanTable(targetType);
-    if (assoc == null) {
-      throw new BeanNotRegisteredException(errorMsgMissingBeanTable(targetType, manyProp.getFullBeanName()));
-    }
-
-    manyProp.setBeanTable(assoc);
+    setTargetType(propAnn.targetEntity(), manyProp);
+    setBeanTable(manyProp);
     manyProp.getTableJoin().setType(SqlJoinType.OUTER);
   }
 
+  private void setTargetType(Class<?> targetType, DeployBeanPropertyAssocMany<?> prop) {
+    if (!targetType.equals(void.class)) {
+      prop.setTargetType(targetType);
+    }
+  }
+
+  private void setBeanTable(DeployBeanPropertyAssocMany<?> manyProp) {
+    BeanTable assoc = factory.getBeanTable(manyProp.getTargetType());
+    if (assoc == null) {
+      throw new BeanNotRegisteredException(errorMsgMissingBeanTable(manyProp.getTargetType(), manyProp.getFullBeanName()));
+    }
+    manyProp.setBeanTable(assoc);
+  }
 
   private String getM2MJoinTableName(BeanTable lhsTable, BeanTable rhsTable) {
 
     TableName lhs = new TableName(lhsTable.getBaseTable());
     TableName rhs = new TableName(rhsTable.getBaseTable());
-
     TableName joinTable = namingConvention.getM2MJoinTableName(lhs, rhs);
-
     return joinTable.getQualifiedName();
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
index 303135e91..68ab4fb46 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
@@ -21,8 +21,6 @@ import io.ebeaninternal.server.type.ScalarTypeArray;
 import io.ebeaninternal.server.type.ScalarTypeWrapper;
 import io.ebeaninternal.server.type.SimpleAesEncryptor;
 import io.ebeaninternal.server.type.TypeManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
@@ -34,8 +32,6 @@ import java.sql.Types;
  */
 public class DeployUtil {
 
-  private static final Logger logger = LoggerFactory.getLogger(DeployUtil.class);
-
   /**
    * Assumes CLOB rather than LONGVARCHAR.
    */
@@ -91,26 +87,26 @@ public class DeployUtil {
   /**
    * Check that the EncryptKeyManager has been defined.
    */
-  public void checkEncryptKeyManagerDefined(String fullPropName) {
+  void checkEncryptKeyManagerDefined(String fullPropName) {
     if (encryptKeyManager == null) {
       String msg = "Using encryption on " + fullPropName + " but no EncryptKeyManager defined!";
       throw new PersistenceException(msg);
     }
   }
 
-  public EncryptDeploy getEncryptDeploy(TableName table, String column) {
+  EncryptDeploy getEncryptDeploy(TableName table, String column) {
     if (encryptDeployManager == null) {
       return EncryptDeploy.ANNOTATION;
     }
     return encryptDeployManager.getEncryptDeploy(table, column);
   }
 
-  public DataEncryptSupport createDataEncryptSupport(String table, String column) {
+  DataEncryptSupport createDataEncryptSupport(String table, String column) {
     return new DataEncryptSupport(encryptKeyManager, bytesEncryptor, table, column);
   }
 
   @SuppressWarnings("unchecked")
-  public void setEnumScalarType(Enumerated enumerated, DeployBeanProperty prop) {
+  void setEnumScalarType(Enumerated enumerated, DeployBeanProperty prop) {
 
     Class<?> enumType = prop.getPropertyType();
     if (!enumType.isEnum()) {
@@ -159,19 +155,10 @@ public class DeployUtil {
     Class<?> propType = property.getPropertyType();
     try {
       ScalarType<?> scalarType = typeManager.getScalarType(propType, property.getDbType());
-      if (scalarType != null) {
+      if (scalarType != null || property.isTransient()) {
         return scalarType;
       }
-
-      String msg = property.getFullBeanName() + " has no ScalarType - type[" + propType.getName() + "]";
-      if (!property.isTransient()) {
-        throw new PersistenceException(msg);
-
-      } else {
-        // this is ok...
-        logger.trace("... transient property {}", msg);
-        return null;
-      }
+      throw new PersistenceException(property.getFullBeanName() + " has no ScalarType - type[" + propType.getName() + "]");
     } catch (IllegalArgumentException e) {
       if (property.isTransient()) {
         // expected for transient properties with unknown/non-mapped types
@@ -184,7 +171,7 @@ public class DeployUtil {
   /**
    * Map to Postgres HSTORE type (with fallback to JSON storage in VARCHAR).
    */
-  public void setDbHstore(DeployBeanProperty prop, DbHstore dbHstore) {
+  void setDbHstore(DeployBeanProperty prop, DbHstore dbHstore) {
 
     ScalarType<?> scalarType = typeManager.getHstoreScalarType();
     int dbType = scalarType.getJdbcType();
@@ -201,7 +188,7 @@ public class DeployUtil {
   /**
    * Set the DbArray type (effectively Postgres only).
    */
-  public void setDbArray(DeployBeanProperty prop, DbArray dbArray) {
+  void setDbArray(DeployBeanProperty prop, DbArray dbArray) {
 
     Class<?> type = prop.getPropertyType();
     ScalarType<?> scalarType = typeManager.getArrayScalarType(type, dbArray, prop.getGenericType());
@@ -227,13 +214,13 @@ public class DeployUtil {
   /**
    * This property is marked as a Lob object.
    */
-  public void setDbJsonType(DeployBeanProperty prop, DbJson dbJsonType) {
+  void setDbJsonType(DeployBeanProperty prop, DbJson dbJsonType) {
 
     int dbType = getDbJsonStorage(dbJsonType.storage());
     setDbJsonType(prop, dbType, dbJsonType.length());
   }
 
-  public void setDbJsonBType(DeployBeanProperty prop, DbJsonB dbJsonB) {
+  void setDbJsonBType(DeployBeanProperty prop, DbJsonB dbJsonB) {
     setDbJsonType(prop, DbPlatformType.JSONB, dbJsonB.length());
   }
 
@@ -276,7 +263,7 @@ public class DeployUtil {
   /**
    * This property is marked as a Lob object.
    */
-  public void setLobType(DeployBeanProperty prop) {
+  void setLobType(DeployBeanProperty prop) {
 
     ScalarType<?> scalarType = prop.getScalarType();
 
@@ -303,7 +290,7 @@ public class DeployUtil {
     return type.equals(String.class);
   }
 
-  public boolean isUseJavaxValidationNotNull() {
+  boolean isUseJavaxValidationNotNull() {
     return useJavaxValidationNotNull;
   }
 }

From f95b4b5c4be7c2c343850d46b7b258184e642273 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 2 Jul 2019 19:48:24 +1200
Subject: [PATCH 0924/1036] #1747 - Refactor tidy on AnnotationAssocOne,
 AnnotationAssocClass & Base

---
 .../java/io/ebean/util/AnnotationUtil.java    |  5 +-
 .../deploy/parse/AnnotationAssocOnes.java     | 35 ++++++-------
 .../server/deploy/parse/AnnotationBase.java   |  3 +-
 .../server/deploy/parse/AnnotationClass.java  | 50 +++++++++----------
 4 files changed, 43 insertions(+), 50 deletions(-)

diff --git a/src/main/java/io/ebean/util/AnnotationUtil.java b/src/main/java/io/ebean/util/AnnotationUtil.java
index de82dc460..536dd9ea4 100644
--- a/src/main/java/io/ebean/util/AnnotationUtil.java
+++ b/src/main/java/io/ebean/util/AnnotationUtil.java
@@ -9,6 +9,7 @@ import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Method;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -107,9 +108,7 @@ public class AnnotationUtil {
    * Finds all annotations recusively for a class and its superclasses or interfaces.
    */
   public static <A extends Annotation> Set<A> findAnnotationsRecursive(Class<?> clazz, Class<A> annotationType) {
-    if (annotationType == null) {
-      return null;
-    }
+    Objects.requireNonNull(annotationType);
     Set<A> ret = new LinkedHashSet<>();
     Set<Annotation> visited = new HashSet<>();
     Set<Class<?>> visitedInterfaces = new HashSet<>();
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index a136dadb8..1541f149b 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -133,16 +133,7 @@ public class AnnotationAssocOnes extends AnnotationParser {
     // check for manually defined joins
     BeanTable beanTable = prop.getBeanTable();
     for (JoinColumn joinColumn : getAll(prop, JoinColumn.class)) {
-      if (beanTable == null) {
-        throw new IllegalStateException("Looks like a missing @ManyToOne or @OneToOne on property " + prop.getFullBeanName()+" - no related 'BeanTable'");
-      }
-      prop.getTableJoin().addJoinColumn(false, joinColumn, beanTable);
-      if (!joinColumn.updatable()) {
-        prop.setDbUpdateable(false);
-      }
-      if (!joinColumn.nullable()) {
-        prop.setNullable(false);
-      }
+      setFromJoinColumn(prop, beanTable, joinColumn);
       checkForNoConstraint(prop, joinColumn);
     }
 
@@ -150,16 +141,7 @@ public class AnnotationAssocOnes extends AnnotationParser {
     JoinTable joinTable = get(prop, JoinTable.class);
     if (joinTable != null) {
       for (JoinColumn joinColumn : joinTable.joinColumns()) {
-        if (beanTable == null) {
-          throw new IllegalStateException("Looks like a missing @ManyToOne or @OneToOne on property " + prop.getFullBeanName()+" - no related 'BeanTable'");
-        }
-        prop.getTableJoin().addJoinColumn(false, joinColumn, beanTable);
-        if (!joinColumn.updatable()) {
-          prop.setDbUpdateable(false);
-        }
-        if (!joinColumn.nullable()) {
-          prop.setNullable(false);
-        }
+        setFromJoinColumn(prop, beanTable, joinColumn);
       }
     }
 
@@ -187,6 +169,19 @@ public class AnnotationAssocOnes extends AnnotationParser {
     }
   }
 
+  private void setFromJoinColumn(DeployBeanPropertyAssocOne<?> prop, BeanTable beanTable, JoinColumn joinColumn) {
+    if (beanTable == null) {
+      throw new IllegalStateException("Looks like a missing @ManyToOne or @OneToOne on property " + prop.getFullBeanName() + " - no related 'BeanTable'");
+    }
+    prop.getTableJoin().addJoinColumn(false, joinColumn, beanTable);
+    if (!joinColumn.updatable()) {
+      prop.setDbUpdateable(false);
+    }
+    if (!joinColumn.nullable()) {
+      prop.setNullable(false);
+    }
+  }
+
   private void checkForNoConstraint(DeployBeanPropertyAssocOne<?> prop, JoinColumn joinColumn) {
     ForeignKey foreignKey = joinColumn.foreignKey();
     if (foreignKey.value() == ConstraintMode.NO_CONSTRAINT) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java
index 3d6e6b7d4..b43aa736e 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java
@@ -45,7 +45,7 @@ public abstract class AnnotationBase {
   protected final NamingConvention namingConvention;
   protected final DeployUtil util;
 
-  protected AnnotationBase(DeployUtil util) {
+  AnnotationBase(DeployUtil util) {
     this.util = util;
     this.databasePlatform = util.getDbPlatform();
     this.platform = databasePlatform.getPlatform();
@@ -128,5 +128,4 @@ public abstract class AnnotationBase {
     }
     return a;
   }
- 
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
index a04b8db5e..540f5ca83 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
@@ -14,7 +14,6 @@ import io.ebean.annotation.StorageEngine;
 import io.ebean.annotation.UpdateMode;
 import io.ebean.annotation.View;
 import io.ebean.config.TableName;
-import io.ebean.util.AnnotationUtil;
 import io.ebeaninternal.server.deploy.BeanDescriptor.EntityType;
 import io.ebeaninternal.server.deploy.IndexDefinition;
 import io.ebeaninternal.server.deploy.InheritInfo;
@@ -31,7 +30,9 @@ import javax.persistence.IdClass;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
-import java.util.Set;
+
+import static io.ebean.util.AnnotationUtil.findAnnotationRecursive;
+import static io.ebean.util.AnnotationUtil.findAnnotationsRecursive;
 
 /**
  * Read the class level deployment annotations.
@@ -50,7 +51,7 @@ public class AnnotationClass extends AnnotationParser {
    * Create to parse AttributeOverride annotations which is run last
    * after all the properties/fields have been parsed fully.
    */
-  public AnnotationClass(DeployBeanInfo<?> info, ReadAnnotationConfig readConfig) {
+  AnnotationClass(DeployBeanInfo<?> info, ReadAnnotationConfig readConfig) {
     super(info, readConfig);
     this.asOfViewSuffix = readConfig.getAsOfViewSuffix();
     this.versionsBetweenSuffix = readConfig.getVersionsBetweenSuffix();
@@ -60,10 +61,10 @@ public class AnnotationClass extends AnnotationParser {
   /**
    * Parse any AttributeOverride set on the class.
    */
-  public void parseAttributeOverride() {
+  void parseAttributeOverride() {
 
     Class<?> cls = descriptor.getBeanType();
-    AttributeOverride override = AnnotationUtil.findAnnotationRecursive(cls, AttributeOverride.class);
+    AttributeOverride override = findAnnotationRecursive(cls, AttributeOverride.class);
     if (override != null) {
       String propertyName = override.name();
       Column column = override.column();
@@ -105,14 +106,14 @@ public class AnnotationClass extends AnnotationParser {
   private void read(Class<?> cls) {
 
     // maybe doc store only so check for this before @Entity
-    DocStore docStore = AnnotationUtil.findAnnotationRecursive(cls, DocStore.class);
+    DocStore docStore = findAnnotationRecursive(cls, DocStore.class);
     if (docStore != null) {
       descriptor.readDocStore(docStore);
       descriptor.setEntityType(EntityType.DOC);
       descriptor.setName(cls.getSimpleName());
     }
 
-    Entity entity = AnnotationUtil.findAnnotationRecursive(cls, Entity.class);
+    Entity entity = findAnnotationRecursive(cls, Entity.class);
     if (entity != null) {
       descriptor.setEntityType(EntityType.ORM);
       if (entity.name().isEmpty()) {
@@ -122,32 +123,31 @@ public class AnnotationClass extends AnnotationParser {
       }
     }
 
-    IdClass idClass = AnnotationUtil.findAnnotationRecursive(cls, IdClass.class);
+    IdClass idClass = findAnnotationRecursive(cls, IdClass.class);
     if (idClass != null) {
       descriptor.setIdClass(idClass.value());
     }
 
-    Embeddable embeddable = AnnotationUtil.findAnnotationRecursive(cls, Embeddable.class);
+    Embeddable embeddable = findAnnotationRecursive(cls, Embeddable.class);
     if (embeddable != null) {
       descriptor.setEntityType(EntityType.EMBEDDED);
       descriptor.setName("Embeddable:" + cls.getSimpleName());
     }
 
-    Set<Index> indices = AnnotationUtil.findAnnotationsRecursive(cls, Index.class);
-    for (Index index : indices) {
+    for (Index index : findAnnotationsRecursive(cls, Index.class)) {
       descriptor.addIndex(new IndexDefinition(index.columnNames(), index.name(), index.unique()));
     }
 
-    UniqueConstraint uc = AnnotationUtil.findAnnotationRecursive(cls, UniqueConstraint.class);
+    UniqueConstraint uc = findAnnotationRecursive(cls, UniqueConstraint.class);
     if (uc != null) {
       descriptor.addIndex(new IndexDefinition(uc.columnNames()));
     }
 
-    View view = AnnotationUtil.findAnnotationRecursive(cls, View.class);
+    View view = findAnnotationRecursive(cls, View.class);
     if (view != null) {
       descriptor.setView(view.name(), view.dependentTables());
     }
-    Table table = AnnotationUtil.findAnnotationRecursive(cls, Table.class);
+    Table table = findAnnotationRecursive(cls, Table.class);
     if (table != null) {
       UniqueConstraint[] uniqueConstraints = table.uniqueConstraints();
       for (UniqueConstraint c : uniqueConstraints) {
@@ -155,59 +155,59 @@ public class AnnotationClass extends AnnotationParser {
       }
     }
 
-    StorageEngine storage = AnnotationUtil.findAnnotationRecursive(cls, StorageEngine.class);
+    StorageEngine storage = findAnnotationRecursive(cls, StorageEngine.class);
     if (storage != null) {
       descriptor.setStorageEngine(storage.value());
     }
 
-    DbPartition partition = AnnotationUtil.findAnnotationRecursive(cls, DbPartition.class);
+    DbPartition partition = findAnnotationRecursive(cls, DbPartition.class);
     if (partition != null) {
       descriptor.setPartitionMeta(new PartitionMeta(partition.mode(), partition.property()));
     }
 
-    Draftable draftable = AnnotationUtil.findAnnotationRecursive(cls, Draftable.class);
+    Draftable draftable = findAnnotationRecursive(cls, Draftable.class);
     if (draftable != null) {
       descriptor.setDraftable();
     }
 
-    DraftableElement draftableElement = AnnotationUtil.findAnnotationRecursive(cls, DraftableElement.class);
+    DraftableElement draftableElement = findAnnotationRecursive(cls, DraftableElement.class);
     if (draftableElement != null) {
       descriptor.setDraftableElement();
     }
 
-    ReadAudit readAudit = AnnotationUtil.findAnnotationRecursive(cls, ReadAudit.class);
+    ReadAudit readAudit = findAnnotationRecursive(cls, ReadAudit.class);
     if (readAudit != null) {
       descriptor.setReadAuditing();
     }
 
-    History history = AnnotationUtil.findAnnotationRecursive(cls, History.class);
+    History history = findAnnotationRecursive(cls, History.class);
     if (history != null) {
       descriptor.setHistorySupport();
     }
 
-    DbComment comment = AnnotationUtil.findAnnotationRecursive(cls, DbComment.class);
+    DbComment comment = findAnnotationRecursive(cls, DbComment.class);
     if (comment != null) {
       descriptor.setDbComment(comment.value());
     }
 
-    UpdateMode updateMode = AnnotationUtil.findAnnotationRecursive(cls, UpdateMode.class);
+    UpdateMode updateMode = findAnnotationRecursive(cls, UpdateMode.class);
     if (updateMode != null) {
       descriptor.setUpdateChangesOnly(updateMode.updateChangesOnly());
     }
 
     if (!disableL2Cache) {
-      Cache cache = AnnotationUtil.findAnnotationRecursive(cls, Cache.class);
+      Cache cache = findAnnotationRecursive(cls, Cache.class);
       if (cache != null) {
         descriptor.setCache(cache);
       } else {
-        InvalidateQueryCache invalidateQueryCache = AnnotationUtil.findAnnotationRecursive(cls, InvalidateQueryCache.class);
+        InvalidateQueryCache invalidateQueryCache = findAnnotationRecursive(cls, InvalidateQueryCache.class);
         if (invalidateQueryCache != null) {
           descriptor.setInvalidateQueryCache(invalidateQueryCache.region());
         }
       }
     }
 
-    for (NamedQuery namedQuery : AnnotationUtil.findAnnotationsRecursive(cls, NamedQuery.class)) {
+    for (NamedQuery namedQuery : findAnnotationsRecursive(cls, NamedQuery.class)) {
       descriptor.addNamedQuery(namedQuery.name(), namedQuery.query());
     }
   }

From 140178bb47230d099ba58387359ce97dd3176b97 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 2 Jul 2019 19:52:10 +1200
Subject: [PATCH 0925/1036] #1747 - Refactor tidy on AnnotationParser,
 DeployBeanInfo

---
 .../server/deploy/parse/AnnotationParser.java | 24 +++++++---------
 .../server/deploy/parse/DeployBeanInfo.java   | 28 -------------------
 .../deploy/parse/DeployInheritInfo.java       |  2 +-
 .../deploy/parse/ReadAnnotationConfig.java    |  2 +-
 4 files changed, 12 insertions(+), 44 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
index a7ca30444..0d7ae956a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
@@ -25,11 +25,11 @@ public abstract class AnnotationParser extends AnnotationBase {
 
   protected final Class<?> beanType;
 
-  protected final boolean validationAnnotations;
+  final boolean validationAnnotations;
 
-  protected final ReadAnnotationConfig readConfig;
+  final ReadAnnotationConfig readConfig;
 
-  public AnnotationParser(DeployBeanInfo<?> info, ReadAnnotationConfig readConfig) {
+  AnnotationParser(DeployBeanInfo<?> info, ReadAnnotationConfig readConfig) {
     super(info.getUtil());
     this.readConfig = readConfig;
     this.validationAnnotations = readConfig.isJavaxValidationAnnotations();
@@ -47,7 +47,7 @@ public abstract class AnnotationParser extends AnnotationBase {
   /**
    * Read the Id annotation on an embeddedId.
    */
-  protected void readIdAssocOne(DeployBeanPropertyAssoc<?> prop) {
+  void readIdAssocOne(DeployBeanPropertyAssoc<?> prop) {
     prop.setNullable(false);
     if (prop.isIdClass()) {
       prop.setImportedPrimaryKey();
@@ -61,7 +61,7 @@ public abstract class AnnotationParser extends AnnotationBase {
   /**
    * Read the Id annotation on scalar property.
    */
-  protected void readIdScalar(DeployBeanProperty prop) {
+  void readIdScalar(DeployBeanProperty prop) {
     prop.setNullable(false);
     if (prop.isIdClass()) {
       prop.setImportedPrimaryKey();
@@ -78,7 +78,7 @@ public abstract class AnnotationParser extends AnnotationBase {
   /**
    * Helper method to set cascade types to the CascadeInfo on BeanProperty.
    */
-  protected void setCascadeTypes(CascadeType[] cascadeTypes, BeanCascadeInfo cascadeInfo) {
+  void setCascadeTypes(CascadeType[] cascadeTypes, BeanCascadeInfo cascadeInfo) {
     if (cascadeTypes != null && cascadeTypes.length > 0) {
       cascadeInfo.setTypes(cascadeTypes);
     }
@@ -87,7 +87,7 @@ public abstract class AnnotationParser extends AnnotationBase {
   /**
    * Read an AttributeOverrides if they exist for this embedded bean.
    */
-  protected void readEmbeddedAttributeOverrides(DeployBeanPropertyAssocOne<?> prop) {
+  void readEmbeddedAttributeOverrides(DeployBeanPropertyAssocOne<?> prop) {
 
     Set<AttributeOverride> attrOverrides = getAll(prop, AttributeOverride.class);
     if (!attrOverrides.isEmpty()) {
@@ -100,7 +100,7 @@ public abstract class AnnotationParser extends AnnotationBase {
 
   }
 
-  protected void readColumn(Column columnAnn, DeployBeanProperty prop) {
+  void readColumn(Column columnAnn, DeployBeanProperty prop) {
 
     if (!isEmpty(columnAnn.name())) {
       String dbColumn = databasePlatform.convertQuotedIdentifiers(columnAnn.name());
@@ -132,14 +132,10 @@ public abstract class AnnotationParser extends AnnotationBase {
    * Return true if the validation groups are {@link Default} (respectively empty)
    * can be applied to DDL generation.
    */
-  protected boolean isEbeanValidationGroups(Class<?>[] groups) {
+  boolean isEbeanValidationGroups(Class<?>[] groups) {
     if (!util.isUseJavaxValidationNotNull()) {
       return false;
     }
-    if (groups.length == 0
-      || groups.length == 1 && javax.validation.groups.Default.class.isAssignableFrom(groups[0])) {
-      return true;
-    }
-    return false;
+    return groups.length == 0 || groups.length == 1 && Default.class.isAssignableFrom(groups[0]);
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java
index 3b577d986..002cb5e0e 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java
@@ -4,22 +4,13 @@ import io.ebean.RawSql;
 import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc;
-import io.ebeaninternal.server.deploy.meta.DeployTableJoin;
-import io.ebeaninternal.server.query.SqlJoinType;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
 
-import java.util.HashMap;
-
 /**
  * Wraps information about a bean during deployment parsing.
  */
 public class DeployBeanInfo<T> {
 
-  /**
-   * Holds TableJoins for secondary table properties.
-   */
-  private final HashMap<String, DeployTableJoin> tableJoinMap = new HashMap<>();
-
   private final DeployUtil util;
 
   private final DeployBeanDescriptor<T> descriptor;
@@ -53,25 +44,6 @@ public class DeployBeanInfo<T> {
     return util;
   }
 
-  /**
-   * Appropriate TableJoin for a property mapped to a secondary table.
-   */
-  public DeployTableJoin getTableJoin(String tableName) {
-
-    String key = tableName.toLowerCase();
-
-    DeployTableJoin tableJoin = tableJoinMap.get(key);
-    if (tableJoin == null) {
-      tableJoin = new DeployTableJoin();
-      tableJoin.setTable(tableName);
-      tableJoin.setType(SqlJoinType.INNER);
-      descriptor.addTableJoin(tableJoin);
-
-      tableJoinMap.put(key, tableJoin);
-    }
-    return tableJoin;
-  }
-
   /**
    * Add named RawSql from ebean.xml.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
index a7491f726..60e1d353c 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
@@ -138,7 +138,7 @@ public class DeployInheritInfo {
   /**
    * Set the sql type of the discriminator.
    */
-  public void setColumnType(DiscriminatorType type) {
+  void setColumnType(DiscriminatorType type) {
     if (type == DiscriminatorType.INTEGER) {
       this.columnType = Types.INTEGER;
     } else {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java b/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java
index 545bcab0c..32e5573a5 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java
@@ -50,7 +50,7 @@ class ReadAnnotationConfig {
     return eagerFetchLobs;
   }
 
-  public boolean isIdGeneratorAutomatic() {
+  boolean isIdGeneratorAutomatic() {
     return idGeneratorAutomatic;
   }
 

From 5f2454831eaf2c92a8e165e0f4d042441e214557 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 2 Jul 2019 20:46:49 +1200
Subject: [PATCH 0926/1036] #1747 - Refactor tidy tighten access on
 ebeaninternal/server/deploy

Adds PropertyAssocMany to ensure public access on BeanPropertyAssocMany helper methods for ebean-elastic integration.
---
 .../io/ebean/plugin/PropertyAssocMany.java    |  16 ++
 .../server/deploy/AssocOneHelp.java           |   4 +-
 .../server/deploy/BaseCollectionHelp.java     |   2 +-
 .../server/deploy/BeanDescriptor.java         |  48 +++---
 .../deploy/BeanDescriptorDraftHelp.java       |   8 +-
 .../server/deploy/BeanDescriptorManager.java  |   2 +-
 .../server/deploy/BeanEmbeddedMeta.java       |   4 +-
 .../deploy/BeanEmbeddedMetaFactory.java       |   2 +-
 .../server/deploy/BeanFinderManager.java      |  11 +-
 .../deploy/BeanLifecycleAdapterFactory.java   |   4 +-
 .../server/deploy/BeanManagerFactory.java     |   7 +-
 .../server/deploy/BeanProperty.java           | 139 +++++++++---------
 .../server/deploy/BeanPropertyAssoc.java      |  35 ++---
 .../server/deploy/BeanPropertyAssocMany.java  |  26 ++--
 .../deploy/BeanPropertyAssocManySqlHelp.java  |  12 +-
 .../server/deploy/BeanPropertyAssocOne.java   |  10 +-
 .../server/deploy/BeanPropertyOverride.java   |   4 +-
 .../deploy/BeanQueryAdapterManager.java       |   8 +-
 .../server/deploy/DeployParser.java           |  36 ++---
 .../server/deploy/DynamicPropertyBase.java    |   4 +-
 .../server/deploy/ParamTypeUtil.java          |   2 +-
 .../deploy/PersistControllerManager.java      |   8 +-
 .../server/deploy/PersistListenerManager.java |   8 +-
 .../server/deploy/PostConstructManager.java   |   8 +-
 .../server/deploy/PostLoadManager.java        |   8 +-
 .../server/deploy/TableJoinColumn.java        |   6 +-
 .../generatedproperty/CounterFactory.java     |   6 +-
 .../generatedproperty/GeneratedCounter.java   |   4 +-
 .../GeneratedPropertyFactory.java             |   2 +-
 .../GeneratedWhoCreated.java                  |   4 +-
 .../GeneratedWhoModified.java                 |   4 +-
 .../InsertTimestampFactory.java               |  12 +-
 .../generatedproperty/JavaTimeUtils.java      |   8 +-
 .../UpdateTimestampFactory.java               |  12 +-
 .../server/deploy/id/ImportedIdSimple.java    |  14 +-
 .../deploy/meta/DeployBeanProperty.java       |  10 +-
 .../deploy/meta/DeployBeanPropertyAssoc.java  |   4 +-
 .../deploy/meta/DeployTableJoinColumn.java    |  17 +--
 .../server/deploy/parse/AnnotationBase.java   |  18 +--
 .../server/deploy/parse/AnnotationParser.java |   6 +-
 40 files changed, 275 insertions(+), 268 deletions(-)
 create mode 100644 src/main/java/io/ebean/plugin/PropertyAssocMany.java

diff --git a/src/main/java/io/ebean/plugin/PropertyAssocMany.java b/src/main/java/io/ebean/plugin/PropertyAssocMany.java
new file mode 100644
index 000000000..025b98e00
--- /dev/null
+++ b/src/main/java/io/ebean/plugin/PropertyAssocMany.java
@@ -0,0 +1,16 @@
+package io.ebean.plugin;
+
+import io.ebean.bean.EntityBean;
+
+/**
+ * Property of a entity bean that is a ToMany property.
+ */
+public interface PropertyAssocMany extends Property {
+
+  /**
+   * Add the loaded current bean to its associated parent.
+   * <p>
+   * Helper method used by Ebean Elastic integration when loading with a persistence context.
+   */
+  void lazyLoadMany(EntityBean current);
+}
diff --git a/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelp.java b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelp.java
index e41556a9f..6aa3082e5 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelp.java
@@ -13,9 +13,9 @@ import java.sql.SQLException;
  */
 abstract class AssocOneHelp {
 
-  protected final BeanPropertyAssocOne<?> property;
+  final BeanPropertyAssocOne<?> property;
 
-  protected final BeanDescriptor<?> target;
+  private final BeanDescriptor<?> target;
 
   private final String path;
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java
index 60ce3510b..f66ad8e4c 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java
@@ -11,7 +11,7 @@ import java.util.Collection;
 abstract class BaseCollectionHelp<T> implements BeanCollectionHelp<T> {
 
   final BeanPropertyAssocMany<T> many;
-  final BeanDescriptor<T> targetDescriptor;
+  private final BeanDescriptor<T> targetDescriptor;
   final String propertyName;
 
   BeanCollectionLoader loader;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index f0a269f57..73e061c52 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -290,14 +290,14 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Inheritance information. Server side only.
    */
-  protected final InheritInfo inheritInfo;
+  final InheritInfo inheritInfo;
 
   private final boolean abstractType;
 
   /**
    * Derived list of properties that make up the unique id.
    */
-  protected final BeanProperty idProperty;
+  private final BeanProperty idProperty;
 
   private final int idPropertyIndex;
 
@@ -609,7 +609,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Create an entity bean that is used as a prototype/factory to create new instances.
    */
-  protected EntityBean createPrototypeEntityBean(Class<T> beanType) {
+  EntityBean createPrototypeEntityBean(Class<T> beanType) {
     if (Modifier.isAbstract(beanType.getModifiers())) {
       return null;
     }
@@ -667,7 +667,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return entityType;
   }
 
-  public String[] getProperties() {
+  private String[] getProperties() {
     return properties;
   }
 
@@ -1508,7 +1508,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Invalidate parts of cache due to SqlUpdate or external modification etc.
    */
-  public void cachePersistTableIUD(TableIUD tableIUD, CacheChangeSet changeSet) {
+  void cachePersistTableIUD(TableIUD tableIUD, CacheChangeSet changeSet) {
     cacheHelp.persistTableIUD(tableIUD, changeSet);
   }
 
@@ -1626,7 +1626,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return new DeployUpdateParser(this).parse(ormUpdateStatement);
   }
 
-  public void collectQueryPlans(QueryPlanRequest request) {
+  void collectQueryPlans(QueryPlanRequest request) {
     for (CQueryPlan queryPlan : queryPlanCache.values()) {
       if (request.includeLabel(queryPlan.getLabel())) {
         queryPlan.collectQueryPlan(request);
@@ -1657,7 +1657,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Trim query plans not used since the passed in epoch time.
    */
-  public List<CQueryPlan> trimQueryPlans(long unusedSince) {
+  List<CQueryPlan> trimQueryPlans(long unusedSince) {
 
     List<CQueryPlan> list = new ArrayList<>();
 
@@ -1723,7 +1723,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * Return true if save does not recurse to other beans. That is return true if
    * there are no assoc one or assoc many beans that cascade save.
    */
-  public boolean isSaveRecurseSkippable() {
+  boolean isSaveRecurseSkippable() {
     return saveRecurseSkippable;
   }
 
@@ -1731,7 +1731,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * Return true if delete does not recurse to other beans. That is return true
    * if there are no assoc one or assoc many beans that cascade delete.
    */
-  public boolean isDeleteRecurseSkippable() {
+  boolean isDeleteRecurseSkippable() {
     return deleteRecurseSkippable;
   }
 
@@ -1813,7 +1813,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Return a raw expression for 'where parent id in ...' clause.
    */
-  public String getParentIdInExpr(int parentIdSize, String rawWhere) {
+  String getParentIdInExpr(int parentIdSize, String rawWhere) {
     String inClause = idBinder.getIdInValueExpr(false, parentIdSize);
     return idBinder.isIdInExpandedForm() ? inClause : rawWhere + inClause;
   }
@@ -1829,7 +1829,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Return true if this bean type has a simple single Id property.
    */
-  public boolean isSimpleId() {
+  boolean isSimpleId() {
     return idBinder instanceof IdBinderSimple;
   }
 
@@ -1897,7 +1897,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * a reference (then {@link BeanPostLoad#postLoad(Object)} will be invoked
    * on first access (lazy load) or immediately (eager load)
    */
-  public EntityBean createEntityBean(boolean isNew) {
+  private EntityBean createEntityBean(boolean isNew) {
     if (prototypeEntityBean == null) {
       throw new UnsupportedOperationException("cannot create entity bean for abstract entity " + getName());
     }
@@ -2248,7 +2248,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Return the cache key for the given bean (based on id value).
    */
-  public String cacheKeyForBean(EntityBean bean) {
+  String cacheKeyForBean(EntityBean bean) {
     return cacheKey(idProperty.getValue(bean));
   }
 
@@ -2285,7 +2285,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * The usage is to provide simple id types for JSON processing (for embeddedId's).
    * </p>
    */
-  public Object convertIdFromJson(Object idValue) {
+  Object convertIdFromJson(Object idValue) {
     return idBinder.convertIdFromJson(idValue);
   }
 
@@ -2510,7 +2510,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return elProp;
   }
 
-  protected ElPropertyValue buildElGetValue(String propName, ElPropertyChainBuilder chain, boolean propertyDeploy) {
+  ElPropertyValue buildElGetValue(String propName, ElPropertyChainBuilder chain, boolean propertyDeploy) {
 
     if (propertyDeploy && chain != null) {
       ElPropertyDeploy fk = elDeployCache.get(propName);
@@ -2928,7 +2928,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     softDeleteProperty.setSoftDeleteValue(bean);
   }
 
-  public String getSoftDeleteDbSet() {
+  String getSoftDeleteDbSet() {
     return softDeleteProperty.getSoftDeleteDbSet();
   }
 
@@ -2950,7 +2950,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     }
   }
 
-
   /**
    * Return true if this entity type is draftable.
    */
@@ -3000,7 +2999,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     }
   }
 
-  public void setUnmappedJson(EntityBean bean, Map<String, Object> unmappedProperties) {
+  void setUnmappedJson(EntityBean bean, Map<String, Object> unmappedProperties) {
     if (unmappedJson != null) {
       unmappedJson.setValueIntercept(bean, unmappedProperties);
     }
@@ -3229,7 +3228,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return ebi.isReference() || hasIdPropertyOnly(ebi);
   }
 
-  public boolean hasIdPropertyOnly(EntityBeanIntercept ebi) {
+  boolean hasIdPropertyOnly(EntityBeanIntercept ebi) {
     return ebi.hasIdOnly(idPropertyIndex);
   }
 
@@ -3237,11 +3236,11 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return ebi.isLoadedProperty(idPropertyIndex);
   }
 
-  public boolean hasIdValue(EntityBean bean) {
+  boolean hasIdValue(EntityBean bean) {
     return (idProperty != null && !DmlUtil.isNullOrZero(idProperty.getValue(bean)));
   }
 
-  public boolean hasVersionProperty(EntityBeanIntercept ebi) {
+  boolean hasVersionProperty(EntityBeanIntercept ebi) {
     return versionPropertyIndex > -1 && ebi.isLoadedProperty(versionPropertyIndex);
   }
 
@@ -3490,7 +3489,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     jsonHelp.jsonWriteDirty(writeJson, bean, dirtyProps);
   }
 
-  protected void jsonWriteDirtyProperties(SpiJsonWriter writeJson, EntityBean bean, boolean[] dirtyProps) throws IOException {
+  void jsonWriteDirtyProperties(SpiJsonWriter writeJson, EntityBean bean, boolean[] dirtyProps) throws IOException {
     jsonHelp.jsonWriteDirtyProperties(writeJson, bean, dirtyProps);
   }
 
@@ -3514,7 +3513,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     jsonHelp.jsonWrite(writeJson, bean, key);
   }
 
-  protected void jsonWriteProperties(SpiJsonWriter writeJson, EntityBean bean) throws IOException {
+  void jsonWriteProperties(SpiJsonWriter writeJson, EntityBean bean) throws IOException {
     jsonHelp.jsonWriteProperties(writeJson, bean);
   }
 
@@ -3522,7 +3521,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return jsonHelp.jsonRead(jsonRead, path, true);
   }
 
-  public T jsonReadObject(SpiJsonReader jsonRead, String path) throws IOException {
+  T jsonReadObject(SpiJsonReader jsonRead, String path) throws IOException {
     return jsonHelp.jsonRead(jsonRead, path, false);
   }
 
@@ -3553,5 +3552,4 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
       getInheritInfo().visitChildren(info -> visitor.accept(info.desc()));
     }
   }
-
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java
index 544f72297..4609b3b74 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java
@@ -11,7 +11,7 @@ import java.util.List;
  *
  * @param <T> The entity bean type
  */
-public final class BeanDescriptorDraftHelp<T> {
+final class BeanDescriptorDraftHelp<T> {
 
   private final BeanDescriptor<T> desc;
 
@@ -19,7 +19,7 @@ public final class BeanDescriptorDraftHelp<T> {
 
   private final BeanProperty[] resetProperties;
 
-  public BeanDescriptorDraftHelp(BeanDescriptor<T> desc) {
+  BeanDescriptorDraftHelp(BeanDescriptor<T> desc) {
     this.desc = desc;
     this.draftDirty = desc.getDraftDirty();
     this.resetProperties = resetProperties();
@@ -45,7 +45,7 @@ public final class BeanDescriptorDraftHelp<T> {
   /**
    * Set the value of all the 'reset properties' to null on the draft bean.
    */
-  public boolean draftReset(T draftBean) {
+  boolean draftReset(T draftBean) {
 
     EntityBean draftEntityBean = (EntityBean) draftBean;
 
@@ -102,7 +102,7 @@ public final class BeanDescriptorDraftHelp<T> {
   /**
    * Fetch draftable element relationships.
    */
-  public void draftQueryOptimise(Query<T> query) {
+  void draftQueryOptimise(Query<T> query) {
 
     BeanPropertyAssocOne<?>[] one = desc.propertiesOne();
     for (BeanPropertyAssocOne<?> anOne : one) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index cca2e4e7e..8e82965e4 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -663,7 +663,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     return (BeanManager<T>) getBeanManager(entityType.getName());
   }
 
-  public BeanManager<?> getBeanManager(String beanClassName) {
+  private BeanManager<?> getBeanManager(String beanClassName) {
     return beanManagerMap.get(beanClassName);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMeta.java b/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMeta.java
index 676db4497..cac179b62 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMeta.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMeta.java
@@ -3,9 +3,9 @@ package io.ebeaninternal.server.deploy;
 public class BeanEmbeddedMeta {
 
 
-  final BeanProperty[] properties;
+  private final BeanProperty[] properties;
 
-  public BeanEmbeddedMeta(BeanProperty[] properties) {
+  BeanEmbeddedMeta(BeanProperty[] properties) {
     this.properties = properties;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java b/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java
index 11f287025..2dd07b2a6 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java
@@ -9,7 +9,7 @@ import java.util.Map;
  * Creates BeanProperties for Embedded beans that have deployment information
  * such as the actual DB column name and table alias.
  */
-public class BeanEmbeddedMetaFactory {
+class BeanEmbeddedMetaFactory {
 
   /**
    * Create BeanProperties for embedded beans using the deployment specific DB column name and table alias.
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanFinderManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanFinderManager.java
index 9ffcb192c..a1e916310 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanFinderManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanFinderManager.java
@@ -11,25 +11,24 @@ import java.util.List;
 /**
  * Default implementation for BeanFinderFactory.
  */
-public class BeanFinderManager {
+class BeanFinderManager {
 
-  final Logger logger = LoggerFactory.getLogger(BeanFinderManager.class);
+  private final Logger logger = LoggerFactory.getLogger(BeanFinderManager.class);
 
   private final List<BeanFindController> list;
 
-  public BeanFinderManager(BootupClasses bootupClasses) {
+  BeanFinderManager(BootupClasses bootupClasses) {
     list = bootupClasses.getBeanFindControllers();
   }
 
-  public int getRegisterCount() {
+  int getRegisterCount() {
     return list.size();
   }
 
   /**
    * Return the BeanPersistController for a given entity type.
    */
-  public void addFindControllers(DeployBeanDescriptor<?> deployDesc) {
-
+  void addFindControllers(DeployBeanDescriptor<?> deployDesc) {
     for (BeanFindController c : list) {
       if (c.isRegisterFor(deployDesc.getBeanType())) {
         logger.debug("BeanFindController on[{}] {}", deployDesc.getFullName(), c.getClass().getName());
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java b/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java
index d563bf065..c27700b7d 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java
@@ -141,11 +141,11 @@ class BeanLifecycleAdapterFactory {
   /**
    * Utility method to covert List of Method into array (because we care about performance here).
    */
-  static Method[] toArray(List<Method> methodList) {
+  private static Method[] toArray(List<Method> methodList) {
     return methodList.toArray(new Method[0]);
   }
 
-  static RuntimeException unwrapException(ReflectiveOperationException e) {
+  private static RuntimeException unwrapException(ReflectiveOperationException e) {
     if (e instanceof InvocationTargetException) {
       Throwable targetException = ((InvocationTargetException)e).getTargetException();
       if (targetException instanceof RuntimeException) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanManagerFactory.java b/src/main/java/io/ebeaninternal/server/deploy/BeanManagerFactory.java
index dfca06bc2..e80cff573 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanManagerFactory.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanManagerFactory.java
@@ -7,16 +7,15 @@ import io.ebeaninternal.server.persist.dml.DmlBeanPersisterFactory;
 /**
  * Creates BeanManagers.
  */
-public class BeanManagerFactory {
+class BeanManagerFactory {
 
-  final BeanPersisterFactory persisterFactory;
+  private final BeanPersisterFactory persisterFactory;
 
-  public BeanManagerFactory(DatabasePlatform dbPlatform) {
+  BeanManagerFactory(DatabasePlatform dbPlatform) {
     persisterFactory = new DmlBeanPersisterFactory(dbPlatform);
   }
 
   public <T> BeanManager<T> create(BeanDescriptor<T> desc) {
-
     return new BeanManager<>(desc, persisterFactory.create(desc));
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index a2c7b0086..0f22dee27 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -43,6 +43,7 @@ import io.ebeanservice.docstore.api.support.DocStructure;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.annotation.Nonnull;
 import javax.persistence.PersistenceException;
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -65,19 +66,19 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   /**
    * Flag to mark this is the id property.
    */
-  final boolean id;
+  private final boolean id;
 
-  final boolean importedPrimaryKey;
+  private final boolean importedPrimaryKey;
 
   /**
    * Flag to make this as a dummy property for unidirecitonal relationships.
    */
-  final boolean unidirectionalShadow;
+  private final boolean unidirectionalShadow;
 
   /**
    * Flag set if this maps to the inheritance discriminator column
    */
-  final boolean discriminator;
+  private final boolean discriminator;
 
   /**
    * Flag to mark the property as embedded. This could be on
@@ -89,55 +90,55 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   /**
    * Flag indicating if this the version property.
    */
-  final boolean version;
+  private final boolean version;
 
-  final boolean naturalKey;
+  private final boolean naturalKey;
 
   /**
    * Set if this property is nullable.
    */
-  final boolean nullable;
+  private final boolean nullable;
 
-  final boolean unique;
+  private final boolean unique;
 
   /**
    * Is this property include in database resultSet.
    */
-  final boolean dbRead;
+  private final boolean dbRead;
 
   /**
    * Include in DB insert.
    */
-  final boolean dbInsertable;
+  private final boolean dbInsertable;
 
   /**
    * Include in DB update.
    */
-  final boolean dbUpdatable;
+  private final boolean dbUpdatable;
 
   /**
    * True if the property is based on a SECONDARY table.
    */
-  final boolean secondaryTable;
+  private final boolean secondaryTable;
 
-  final TableJoin secondaryTableJoin;
-  final String secondaryTableJoinPrefix;
+  private final TableJoin secondaryTableJoin;
+  private final String secondaryTableJoinPrefix;
 
   /**
    * The property is inherited from a super class.
    */
-  final boolean inherited;
+  private final boolean inherited;
 
-  final Class<?> owningType;
+  private final Class<?> owningType;
 
-  final boolean local;
+  private final boolean local;
 
   /**
    * True if the property is a Clob, Blob LongVarchar or LongVarbinary.
    */
-  final boolean lob;
+  private final boolean lob;
 
-  final boolean fetchEager;
+  private final boolean fetchEager;
 
   final boolean isTransient;
 
@@ -151,62 +152,62 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   /**
    * The reflected field.
    */
-  final Field field;
+  private final Field field;
 
   /**
    * The bean type.
    */
-  final Class<?> propertyType;
+  private final Class<?> propertyType;
 
-  final String dbBind;
+  private final String dbBind;
 
   /**
    * The database column. This can include quoted identifiers.
    */
   final String dbColumn;
 
-  final String elPrefix;
+  private final String elPrefix;
   final String elPlaceHolder;
   final String elPlaceHolderEncrypted;
 
   /**
    * Select part of a SQL Formula used to populate this property.
    */
-  final String sqlFormulaSelect;
+  private final String sqlFormulaSelect;
 
   /**
    * Join part of a SQL Formula.
    */
   final String sqlFormulaJoin;
 
-  final String aggregation;
+  private final String aggregation;
 
-  final boolean formula;
+  private final boolean formula;
 
   /**
    * Set to true if stored encrypted.
    */
-  final boolean dbEncrypted;
+  private final boolean dbEncrypted;
 
-  final boolean localEncrypted;
+  private final boolean localEncrypted;
 
-  final int dbEncryptedType;
+  private final int dbEncryptedType;
 
   /**
    * The jdbc data type this maps to.
    */
-  final int dbType;
+  private final int dbType;
 
   final boolean excludedFromHistory;
 
   /**
    * Generator for insert or update timestamp etc.
    */
-  final GeneratedProperty generatedProperty;
+  private final GeneratedProperty generatedProperty;
 
-  final BeanPropertyGetter getter;
+  private final BeanPropertyGetter getter;
 
-  final BeanPropertySetter setter;
+  private final BeanPropertySetter setter;
 
   final BeanDescriptor<?> descriptor;
 
@@ -217,56 +218,56 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   @SuppressWarnings("rawtypes")
   final ScalarType scalarType;
 
-  final DocPropertyOptions docOptions;
+  private final DocPropertyOptions docOptions;
 
   /**
    * The length or precision for DB column.
    */
-  final int dbLength;
+  private final int dbLength;
 
   /**
    * The scale for DB column (decimal).
    */
-  final int dbScale;
+  private final int dbScale;
 
   /**
    * Deployment defined DB column definition.
    */
-  final String dbColumnDefn;
+  private final String dbColumnDefn;
 
   /**
    * DB Column default value for DDL definition (FALSE, NOW etc).
    */
-  final String dbColumnDefault;
-  final List<DbMigrationInfo> dbMigrationInfos;
+  private final String dbColumnDefault;
+  private final List<DbMigrationInfo> dbMigrationInfos;
 
   /**
    * Database DDL column comment.
    */
-  final String dbComment;
+  private final String dbComment;
 
-  final DbEncryptFunction dbEncryptFunction;
+  private final DbEncryptFunction dbEncryptFunction;
 
-  int deployOrder;
+  private int deployOrder;
 
   final boolean jsonSerialize;
   final boolean jsonDeserialize;
-  final boolean unmappedJson;
-  final boolean tenantId;
+  private final boolean unmappedJson;
+  private final boolean tenantId;
 
-  final boolean draft;
+  private final boolean draft;
 
-  final boolean draftOnly;
+  private final boolean draftOnly;
 
-  final boolean draftDirty;
+  private final boolean draftDirty;
 
-  final boolean draftReset;
+  private final boolean draftReset;
 
-  final boolean softDelete;
+  private final boolean softDelete;
 
-  final String softDeleteDbSet;
+  private final String softDeleteDbSet;
 
-  final String softDeleteDbPredicate;
+  private final String softDeleteDbPredicate;
 
   public BeanProperty(DeployBeanProperty deploy) {
     this(null, deploy);
@@ -545,7 +546,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     return dbEncryptFunction.getDecryptSql(this.getDbColumn());
   }
 
-  public String getDecryptSql(String tableAlias) {
+  private String getDecryptSql(String tableAlias) {
     return dbEncryptFunction.getDecryptSql(tableAlias + "." + this.getDbColumn());
   }
 
@@ -702,7 +703,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   /**
    * Return true if this object is part of an inheritance hierarchy.
    */
-  public boolean isInherited() {
+  private boolean isInherited() {
     return inherited;
   }
 
@@ -728,21 +729,21 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   /**
    * Return the DB literal expression to set the deleted state to true.
    */
-  public String getSoftDeleteDbSet() {
+  String getSoftDeleteDbSet() {
     return softDeleteDbSet;
   }
 
   /**
    * Return the DB literal predicate used to filter out soft deleted rows from a query.
    */
-  public String getSoftDeleteDbPredicate(String tableAlias) {
+  String getSoftDeleteDbPredicate(String tableAlias) {
     return tableAlias + softDeleteDbPredicate;
   }
 
   /**
    * Set the soft delete property value on the bean without invoking lazy loading.
    */
-  public void setSoftDeleteValue(EntityBean bean) {
+  void setSoftDeleteValue(EntityBean bean) {
     // assumes boolean deleted true being set which is ok limitation for now
     setValue(bean, true);
     bean._ebean_getIntercept().setChangedProperty(propertyIndex);
@@ -909,7 +910,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   /**
    * Return the name of the property.
    */
-  @Override
+  @Override @Nonnull
   public String getName() {
     return name;
   }
@@ -1018,7 +1019,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
    * Return true if the mutable value is considered dirty.
    * This is only used for 'mutable' scalar types like hstore etc.
    */
-  public boolean isDirtyValue(Object value) {
+  boolean isDirtyValue(Object value) {
     return scalarType.isDirty(value);
   }
 
@@ -1061,14 +1062,14 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   /**
    * Return the DB scale for numeric columns.
    */
-  public int getDbScale() {
+  private int getDbScale() {
     return dbScale;
   }
 
   /**
    * Return a specific column DDL definition if specified (otherwise null).
    */
-  public String getDbColumnDefn() {
+  private String getDbColumnDefn() {
     return dbColumnDefn;
   }
 
@@ -1112,7 +1113,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   /**
    * Return the bean Field associated with this property.
    */
-  public Field getField() {
+  private Field getField() {
     return field;
   }
 
@@ -1148,14 +1149,14 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   /**
    * Return true if this is a generated property mapping to @WhenCreated or @CreatedTimestamp.
    */
-  public boolean isGeneratedWhenCreated() {
+  boolean isGeneratedWhenCreated() {
     return generatedProperty instanceof GeneratedWhenCreated;
   }
 
   /**
    * Return true if this is a generated property mapping to @WhenModified or @UpdatedTimestamp.
    */
-  public boolean isGeneratedWhenModified() {
+  boolean isGeneratedWhenModified() {
     return generatedProperty instanceof GeneratedWhenModified;
   }
 
@@ -1191,7 +1192,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
    * Return true if this is a draftOnly property on a non-asDraft query and as such this
    * property should not be included in a sql query.
    */
-  protected boolean ignoreDraftOnlyProperty(boolean draftQuery) {
+  private boolean ignoreDraftOnlyProperty(boolean draftQuery) {
     return draftOnly && !draftQuery;
   }
 
@@ -1232,7 +1233,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   /**
    * Perform DB to Logical type conversion (if necessary).
    */
-  public Object convertToLogicalType(Object value) {
+  private Object convertToLogicalType(Object value) {
     if (scalarType != null) {
       return scalarType.toBeanType(value);
     }
@@ -1358,7 +1359,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   /**
    * Return true if this property is reset/cleared on publish (on the draft bean).
    */
-  public boolean isDraftReset() {
+  boolean isDraftReset() {
     return draftReset;
   }
 
@@ -1386,7 +1387,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   /**
    * Return true if this property is included in database queries.
    */
-  public boolean isDbRead() {
+  private boolean isDbRead() {
     return dbRead;
   }
 
@@ -1401,7 +1402,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   /**
    * Return the property type.
    */
-  @Override
+  @Override @Nonnull
   public Class<?> getPropertyType() {
     return propertyType;
   }
@@ -1533,7 +1534,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   /**
    * Populate diff map comparing the property values.
    */
-  public void diffVal(String prefix, Map<String, ValuePair> map, Object newVal, Object oldVal) {
+  void diffVal(String prefix, Map<String, ValuePair> map, Object newVal, Object oldVal) {
     if (!ValueUtil.areEqual(newVal, oldVal)) {
       String propName = (prefix == null) ? name : prefix + "." + name;
       map.put(propName, new ValuePair(newVal, oldVal));
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
index a03d1e713..8aa6330ad 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
@@ -53,7 +53,7 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
   /**
    * Derived list of exported property and matching foreignKey
    */
-  protected ExportedProperty[] exportedProperties;
+  ExportedProperty[] exportedProperties;
 
   /**
    * Persist settings.
@@ -70,7 +70,7 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
   /**
    * The type of the joined bean.
    */
-  final Class<T> targetType;
+  private final Class<T> targetType;
 
   /**
    * The join table information.
@@ -79,18 +79,18 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
 
   final String mappedBy;
 
-  final String docStoreDoc;
+  private final String docStoreDoc;
 
-  final String extraWhere;
+  private final String extraWhere;
 
-  final int fetchPreference;
+  private final int fetchPreference;
 
-  boolean saveRecurseSkippable;
+  private boolean saveRecurseSkippable;
 
   /**
    * Construct the property.
    */
-  public BeanPropertyAssoc(BeanDescriptor<?> descriptor, DeployBeanPropertyAssoc<T> deploy) {
+  BeanPropertyAssoc(BeanDescriptor<?> descriptor, DeployBeanPropertyAssoc<T> deploy) {
     super(descriptor, deploy);
     this.foreignKey = deploy.getForeignKey();
     this.extraWhere = InternString.intern(deploy.getExtraWhere());
@@ -108,7 +108,7 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
    * Copy constructor for ManyToOne inside Embeddable.
    */
   @SuppressWarnings("unchecked")
-  public BeanPropertyAssoc(BeanPropertyAssoc source, BeanPropertyOverride override) {
+  BeanPropertyAssoc(BeanPropertyAssoc source, BeanPropertyOverride override) {
     super(source, override);
     foreignKey = source.foreignKey;
     extraWhere = source.extraWhere;
@@ -172,7 +172,7 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
   /**
    * Create a ElPropertyValue for a *ToOne or *ToMany.
    */
-  protected ElPropertyValue createElPropertyValue(String propName, String remainder, ElPropertyChainBuilder chain, boolean propertyDeploy) {
+  ElPropertyValue createElPropertyValue(String propName, String remainder, ElPropertyChainBuilder chain, boolean propertyDeploy) {
 
     // associated or embedded bean
     BeanDescriptor<?> embDesc = getTargetDescriptor();
@@ -269,12 +269,11 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
   /**
    * Return true if REFRESH should cascade.
    */
-  public boolean isCascadeRefresh() {
+  boolean isCascadeRefresh() {
     return cascadeInfo.isRefresh();
   }
 
   public boolean isSaveRecurseSkippable(Object bean) {
-
     return saveRecurseSkippable && bean instanceof EntityBean && !((EntityBean) bean)._ebean_getIntercept().isNewOrDirty();
   }
 
@@ -298,14 +297,8 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
 
     BeanDescriptor<?> targetDesc = getTargetDescriptor();
     BeanProperty idProp = targetDesc.getIdProperty();
-    if (idProp != null) {
-      Object value = idProp.getValue(bean);
-      if (value == null) {
-        return false;
-      }
-    }
     // all the unique properties are non-null
-    return true;
+    return idProp == null || idProp.getValue(bean) != null;
   }
 
   /**
@@ -331,7 +324,7 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
   /**
    * Return the elastic search doc for this embedded property.
    */
-  public String getDocStoreDoc() {
+  private String getDocStoreDoc() {
     return docStoreDoc;
   }
 
@@ -362,7 +355,7 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
   /**
    * Include the property in the document store by default.
    */
-  protected void docStoreIncludeByDefault(PathProperties pathProps) {
+  void docStoreIncludeByDefault(PathProperties pathProps) {
     pathProps.addToPath(null, name);
   }
 
@@ -444,7 +437,7 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
    * Build the list of imported property. Matches BeanProperty from the target
    * descriptor back to local database columns in the TableJoin.
    */
-  protected ImportedId createImportedId(BeanPropertyAssoc<?> owner, BeanDescriptor<?> target, TableJoin join) {
+  ImportedId createImportedId(BeanPropertyAssoc<?> owner, BeanDescriptor<?> target, TableJoin join) {
 
     BeanProperty idProp = target.getIdProperty();
     BeanProperty[] others = target.propertiesBaseScalar();
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index 05854d937..fd55ae6b2 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -9,6 +9,7 @@ import io.ebean.bean.BeanCollection.ModifyListenMode;
 import io.ebean.bean.BeanCollectionAdd;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.PersistenceContext;
+import io.ebean.plugin.PropertyAssocMany;
 import io.ebean.text.PathProperties;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -37,7 +38,7 @@ import java.util.Map;
 /**
  * Property mapped to a List Set or Map.
  */
-public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements STreePropertyAssocMany {
+public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements STreePropertyAssocMany, PropertyAssocMany {
 
   private static final Logger logger = LoggerFactory.getLogger(BeanPropertyAssocMany.class);
 
@@ -105,7 +106,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   /**
    * Property on the 'child' bean that links back to the 'master'.
    */
-  protected BeanPropertyAssocOne<?> childMasterProperty;
+  private BeanPropertyAssocOne<?> childMasterProperty;
 
   private String childMasterIdProperty;
 
@@ -201,7 +202,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   /**
    * Initialise after the target bean descriptors have been all set.
    */
-  public void initialisePostTarget() {
+  void initialisePostTarget() {
     if (childMasterProperty != null) {
       BeanProperty masterId = childMasterProperty.getTargetDescriptor().getIdProperty();
       if (masterId != null) { // in docstore only, the master-id may be not available
@@ -348,6 +349,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
    *
    * Helper method used by Elastic integration when loading with a persistence context.
    */
+  @Override
   public void lazyLoadMany(EntityBean current) {
     EntityBean parentBean = childMasterProperty.getValueAsEntityBean(current);
     if (parentBean != null) {
@@ -636,8 +638,8 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     return help.createEmpty(parentBean);
   }
 
-  public BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey) {
-    return help.getBeanCollectionAdd(bc, mapKey);
+  private BeanCollectionAdd getBeanCollectionAdd(Object bc) {
+    return help.getBeanCollectionAdd(bc, null);
   }
 
   public Object getParentId(EntityBean parentBean) {
@@ -782,7 +784,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   /**
    * Register the mapping of intersection table to associated draft table.
    */
-  public void registerDraftIntersectionTable(BeanDescriptorInitContext initContext) {
+  void registerDraftIntersectionTable(BeanDescriptorInitContext initContext) {
     if (hasDraftIntersection()) {
       initContext.addDraftIntersection(intersectionPublishTable, intersectionDraftTable);
     }
@@ -883,7 +885,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   }
 
   @SuppressWarnings("unchecked")
-  public void publishMany(EntityBean draft, EntityBean live) {
+  void publishMany(EntityBean draft, EntityBean live) {
 
     // collections will not be null due to enhancement
     BeanCollection<T> draftVal = (BeanCollection<T>) getValueIntercept(draft);
@@ -959,11 +961,11 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     return help;
   }
 
-  public void jsonWriteMapEntry(SpiJsonWriter ctx, Map.Entry<?, ?> entry) throws IOException {
+  void jsonWriteMapEntry(SpiJsonWriter ctx, Map.Entry<?, ?> entry) throws IOException {
     elementDescriptor.jsonWriteMapEntry(ctx, entry);
   }
 
-  public void jsonWriteElementValue(SpiJsonWriter ctx, Object element) {
+  void jsonWriteElementValue(SpiJsonWriter ctx, Object element) {
     elementDescriptor.jsonWriteElement(ctx, element);
   }
 
@@ -1011,7 +1013,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   /**
    * Read the collection as JSON.
    */
-  public Object jsonReadCollection(String json) throws IOException {
+  private Object jsonReadCollection(String json) throws IOException {
     SpiJsonReader ctx = descriptor.createJsonReader(json);
     JsonParser parser = ctx.getParser();
     JsonToken event = parser.nextToken();
@@ -1024,7 +1026,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   /**
    * Write the collection to JSON.
    */
-  public void jsonWriteCollection(SpiJsonWriter ctx, String name, Object value, boolean explicitInclude) throws IOException {
+  private void jsonWriteCollection(SpiJsonWriter ctx, String name, Object value, boolean explicitInclude) throws IOException {
     help.jsonWrite(ctx, name, value, explicitInclude);
   }
 
@@ -1038,7 +1040,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     }
 
     BeanCollection<?> collection = createEmpty(parentBean);
-    BeanCollectionAdd add = getBeanCollectionAdd(collection, null);
+    BeanCollectionAdd add = getBeanCollectionAdd(collection);
     do {
       EntityBean detailBean = (EntityBean) targetDescriptor.jsonRead(readJson, name);
       if (detailBean == null) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java
index 7f58aa511..e8aa4b4ca 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java
@@ -47,7 +47,7 @@ class BeanPropertyAssocManySqlHelp<T> {
 
     StringBuilder sb = new StringBuilder(200);
     sb.append("insert into ").append(many.targetTable()).append(" (");
-    append(sb, "", ",", "");
+    append(sb);
 
     Cols cols = new Cols(sb);
     VisitAllUsing.visitOne(many.targetDescriptor, cols);
@@ -59,7 +59,7 @@ class BeanPropertyAssocManySqlHelp<T> {
     return sb.toString();
   }
 
-  public String insertElementCollection() {
+  String insertElementCollection() {
     return elementCollectionInsertSql;
   }
 
@@ -191,16 +191,16 @@ class BeanPropertyAssocManySqlHelp<T> {
     }
   }
 
-  private void append(StringBuilder sb, String tableAlias, String prefix, String suffix) {
+  private void append(StringBuilder sb) {
     for (int i = 0; i < exportedProperties.length; i++) {
       String fkColumn = exportedProperties[i].getForeignDbColumn();
       if (i > 0) {
-        sb.append(prefix);
+        sb.append(",");
       }
-      sb.append(tableAlias).append(fkColumn);
-      sb.append(suffix);
+      sb.append(fkColumn);
     }
   }
+
   private String deriveWhereParentIdSql(boolean inClause, String tableAlias) {
 
     StringBuilder sb = new StringBuilder();
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index 5da1a43df..bd6b3ed55 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -49,11 +49,11 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
 
   private AssocOneHelp localHelp;
 
-  protected final BeanProperty[] embeddedProps;
+  final BeanProperty[] embeddedProps;
 
   private final HashMap<String, BeanProperty> embeddedPropsMap;
 
-  protected ImportedId importedId;
+  ImportedId importedId;
 
   private String deleteByParentIdSql;
   private String deleteByParentIdInSql;
@@ -157,7 +157,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
   /**
    * Derive late in lifecycle cache notification on this relationship.
    */
-  public void initialisePostTarget() {
+  void initialisePostTarget() {
     this.cacheNotifyRelationship = isCacheNotifyRelationship();
   }
 
@@ -465,7 +465,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     return targetDescriptor.getIdProperty();
   }
 
-  public ScalarType getIdScalarType() {
+  ScalarType getIdScalarType() {
     return targetDescriptor.getIdProperty().scalarType;
   }
 
@@ -674,7 +674,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     }
   }
 
-  void setEmbeddedOwner(EntityBean bean, Object value) {
+  private void setEmbeddedOwner(EntityBean bean, Object value) {
     ((EntityBean) value)._ebean_getIntercept().setEmbeddedOwner(bean, propertyIndex);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOverride.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOverride.java
index b8325ed24..2baadd46d 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOverride.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOverride.java
@@ -9,11 +9,11 @@ import io.ebeaninternal.server.core.InternString;
  * Typically this is for Embedded Beans.
  * </p>
  */
-public class BeanPropertyOverride {
+class BeanPropertyOverride {
 
   private final String dbColumn;
 
-  public BeanPropertyOverride(String dbColumn) {
+  BeanPropertyOverride(String dbColumn) {
     this.dbColumn = InternString.intern(dbColumn);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanQueryAdapterManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanQueryAdapterManager.java
index 5008425b3..7a50f2deb 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanQueryAdapterManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanQueryAdapterManager.java
@@ -11,25 +11,25 @@ import java.util.List;
 /**
  * Default implementation for creating BeanControllers.
  */
-public class BeanQueryAdapterManager {
+class BeanQueryAdapterManager {
 
   private static final Logger logger = LoggerFactory.getLogger(BeanQueryAdapterManager.class);
 
   private final List<BeanQueryAdapter> list;
 
-  public BeanQueryAdapterManager(BootupClasses bootupClasses) {
+  BeanQueryAdapterManager(BootupClasses bootupClasses) {
 
     list = bootupClasses.getBeanQueryAdapters();
   }
 
-  public int getRegisterCount() {
+  int getRegisterCount() {
     return list.size();
   }
 
   /**
    * Return the BeanPersistController for a given entity type.
    */
-  public void addQueryAdapter(DeployBeanDescriptor<?> deployDesc) {
+  void addQueryAdapter(DeployBeanDescriptor<?> deployDesc) {
 
     for (BeanQueryAdapter c : list) {
       if (c.isRegisterFor(deployDesc.getBeanType())) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java b/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java
index ecbfeb0a8..9c5245e21 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java
@@ -10,45 +10,45 @@ public abstract class DeployParser {
   /**
    * used to identify sql literal.
    */
-  protected static final char SINGLE_QUOTE = '\'';
+  private static final char SINGLE_QUOTE = '\'';
 
   /**
    * used to identify query named parameters.
    */
-  protected static final char COLON = ':';
+  private static final char COLON = ':';
 
   /**
    * Used to determine when a column name terminates.
    */
-  protected static final char UNDERSCORE = '_';
+  private static final char UNDERSCORE = '_';
 
-  protected static final char OPEN_SQUARE_BRACKET = '[';
-  protected static final char CLOSE_SQUARE_BRACKET = ']';
-  protected static final char DOUBLE_QUOTE = '\"';
-  protected static final char BACK_QUOTE = '`';
+  private static final char OPEN_SQUARE_BRACKET = '[';
+  private static final char CLOSE_SQUARE_BRACKET = ']';
+  private static final char DOUBLE_QUOTE = '\"';
+  private static final char BACK_QUOTE = '`';
 
   /**
    * Used to determine when a column name terminates.
    */
-  protected static final char PERIOD = '.';
+  private static final char PERIOD = '.';
 
-  protected static final char OPEN_BRACKET = '(';
+  private static final char OPEN_BRACKET = '(';
 
-  protected boolean encrypted;
+  boolean encrypted;
 
-  protected String source;
+  private String source;
 
-  protected StringBuilder sb;
+  private StringBuilder sb;
 
-  protected int sourceLength;
+  private int sourceLength;
 
-  protected int pos;
+  private int pos;
 
-  protected String priorWord;
+  String priorWord;
 
-  protected String word;
+  String word;
 
-  protected char wordTerminator;
+  private char wordTerminator;
 
   private StringBuilder wordBuffer;
 
@@ -98,7 +98,7 @@ public abstract class DeployParser {
     return sb.toString();
   }
 
-  protected boolean skipWordConvert() {
+  boolean skipWordConvert() {
     return false;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java
index 194f4eb47..5029514d5 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java
@@ -11,9 +11,9 @@ import java.util.List;
  */
 abstract class DynamicPropertyBase implements STreeProperty {
 
-  final String name;
+  private final String name;
   final String fullName;
-  final String elPrefix;
+  private final String elPrefix;
   final ScalarType<?> scalarType;
 
   DynamicPropertyBase(String name, String fullName, String elPrefix, ScalarType<?> scalarType) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ParamTypeUtil.java b/src/main/java/io/ebeaninternal/server/deploy/ParamTypeUtil.java
index 63a443dba..c19f06a52 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ParamTypeUtil.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ParamTypeUtil.java
@@ -6,7 +6,7 @@ import java.lang.reflect.Type;
 /**
  * Helper object to find generic parameter types for a given class.
  */
-public class ParamTypeUtil {
+class ParamTypeUtil {
 
   /**
    * Find and return the parameter type given a generic interface or class.
diff --git a/src/main/java/io/ebeaninternal/server/deploy/PersistControllerManager.java b/src/main/java/io/ebeaninternal/server/deploy/PersistControllerManager.java
index 06f4fae8d..e722d1e97 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/PersistControllerManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/PersistControllerManager.java
@@ -11,25 +11,25 @@ import java.util.List;
 /**
  * Default implementation for creating BeanControllers.
  */
-public class PersistControllerManager {
+class PersistControllerManager {
 
   private static final Logger logger = LoggerFactory.getLogger(PersistControllerManager.class);
 
   private final List<BeanPersistController> list;
 
-  public PersistControllerManager(BootupClasses bootupClasses) {
+  PersistControllerManager(BootupClasses bootupClasses) {
 
     list = bootupClasses.getBeanPersistControllers();
   }
 
-  public int getRegisterCount() {
+  int getRegisterCount() {
     return list.size();
   }
 
   /**
    * Return the BeanPersistController for a given entity type.
    */
-  public void addPersistControllers(DeployBeanDescriptor<?> deployDesc) {
+  void addPersistControllers(DeployBeanDescriptor<?> deployDesc) {
 
     for (BeanPersistController c : list) {
       if (c.isRegisterFor(deployDesc.getBeanType())) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/PersistListenerManager.java b/src/main/java/io/ebeaninternal/server/deploy/PersistListenerManager.java
index c83d3ffdc..0b1ea995d 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/PersistListenerManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/PersistListenerManager.java
@@ -12,24 +12,24 @@ import java.util.List;
  * Manages the assignment/registration of BeanPersistListener with their
  * respective DeployBeanDescriptor's.
  */
-public class PersistListenerManager {
+class PersistListenerManager {
 
   private static final Logger logger = LoggerFactory.getLogger(PersistListenerManager.class);
 
   private final List<BeanPersistListener> list;
 
-  public PersistListenerManager(BootupClasses bootupClasses) {
+  PersistListenerManager(BootupClasses bootupClasses) {
     list = bootupClasses.getBeanPersistListeners();
   }
 
-  public int getRegisterCount() {
+  int getRegisterCount() {
     return list.size();
   }
 
   /**
    * Return the BeanPersistController for a given entity type.
    */
-  public <T> void addPersistListeners(DeployBeanDescriptor<T> deployDesc) {
+  <T> void addPersistListeners(DeployBeanDescriptor<T> deployDesc) {
 
     for (BeanPersistListener listener : list) {
       if (listener.isRegisterFor(deployDesc.getBeanType())) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/PostConstructManager.java b/src/main/java/io/ebeaninternal/server/deploy/PostConstructManager.java
index 859abeb6f..d30e81873 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/PostConstructManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/PostConstructManager.java
@@ -11,24 +11,24 @@ import java.util.List;
 /**
  * Default implementation for creating BeanControllers.
  */
-public class PostConstructManager {
+class PostConstructManager {
 
   private static final Logger logger = LoggerFactory.getLogger(PostConstructManager.class);
 
   private final List<BeanPostConstructListener> list;
 
-  public PostConstructManager(BootupClasses bootupClasses) {
+  PostConstructManager(BootupClasses bootupClasses) {
     this.list = bootupClasses.getBeanPostConstructoListeners();
   }
 
-  public int getRegisterCount() {
+  int getRegisterCount() {
     return list.size();
   }
 
   /**
    * Register BeanPostLoad listeners for a given entity type.
    */
-  public void addPostConstructListeners(DeployBeanDescriptor<?> deployDesc) {
+  void addPostConstructListeners(DeployBeanDescriptor<?> deployDesc) {
 
     for (BeanPostConstructListener c : list) {
       if (c.isRegisterFor(deployDesc.getBeanType())) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/PostLoadManager.java b/src/main/java/io/ebeaninternal/server/deploy/PostLoadManager.java
index f2d9b7d86..affb9081d 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/PostLoadManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/PostLoadManager.java
@@ -11,24 +11,24 @@ import java.util.List;
 /**
  * Default implementation for creating BeanControllers.
  */
-public class PostLoadManager {
+class PostLoadManager {
 
   private static final Logger logger = LoggerFactory.getLogger(PostLoadManager.class);
 
   private final List<BeanPostLoad> list;
 
-  public PostLoadManager(BootupClasses bootupClasses) {
+  PostLoadManager(BootupClasses bootupClasses) {
     this.list = bootupClasses.getBeanPostLoaders();
   }
 
-  public int getRegisterCount() {
+  int getRegisterCount() {
     return list.size();
   }
 
   /**
    * Register BeanPostLoad listeners for a given entity type.
    */
-  public void addPostLoad(DeployBeanDescriptor<?> deployDesc) {
+  void addPostLoad(DeployBeanDescriptor<?> deployDesc) {
 
     for (BeanPostLoad c : list) {
       if (c.isRegisterFor(deployDesc.getBeanType())) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/TableJoinColumn.java b/src/main/java/io/ebeaninternal/server/deploy/TableJoinColumn.java
index a8209d3ff..26ad669ee 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/TableJoinColumn.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/TableJoinColumn.java
@@ -56,7 +56,7 @@ public class TableJoinColumn {
     this.queryHash = hash();
   }
 
-  int hash() {
+  private int hash() {
     int result = localDbColumn != null ? localDbColumn.hashCode() : 0;
     result = 92821 * result + (foreignDbColumn != null ? foreignDbColumn.hashCode() : 0);
     result = 92821 * result + (localSqlFormula != null ? localSqlFormula.hashCode() : 0);
@@ -93,7 +93,7 @@ public class TableJoinColumn {
   /**
    * Return a hash for including in a query plan.
    */
-  public int queryHash() {
+  int queryHash() {
     return queryHash;
   }
 
@@ -121,7 +121,7 @@ public class TableJoinColumn {
   /**
    * Return true if this column should be updateable.
    */
-  public boolean isUpdateable() {
+  boolean isUpdateable() {
     return updateable;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java
index 3eb037971..1bfd2542e 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java
@@ -13,11 +13,11 @@ import java.sql.Types;
  * Aka, Integer, Long, Short etc.
  * </p>
  */
-public class CounterFactory {
+class CounterFactory {
 
-  final GeneratedCounterInteger integerCounter = new GeneratedCounterInteger();
+  private final GeneratedCounterInteger integerCounter = new GeneratedCounterInteger();
 
-  final GeneratedCounterLong longCounter = new GeneratedCounterLong();
+  private final GeneratedCounterLong longCounter = new GeneratedCounterLong();
 
   public void setCounter(DeployBeanProperty property) {
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java
index 8ca83156a..319e6e40a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java
@@ -9,9 +9,9 @@ import io.ebeaninternal.server.deploy.BeanProperty;
  */
 public class GeneratedCounter implements GeneratedProperty {
 
-  final int numberType;
+  private final int numberType;
 
-  public GeneratedCounter(int numberType) {
+  GeneratedCounter(int numberType) {
     this.numberType = numberType;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java
index f5066cfbd..e9b7dac90 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java
@@ -87,7 +87,7 @@ public class GeneratedPropertyFactory {
     }
   }
 
-  public void setCounter(DeployBeanProperty property) {
+  private void setCounter(DeployBeanProperty property) {
 
     counterFactory.setCounter(property);
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoCreated.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoCreated.java
index 0387d1bf3..cdb719014 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoCreated.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoCreated.java
@@ -9,9 +9,9 @@ import io.ebeaninternal.server.deploy.BeanProperty;
  */
 public class GeneratedWhoCreated implements GeneratedProperty {
 
-  final CurrentUserProvider currentUserProvider;
+  private final CurrentUserProvider currentUserProvider;
 
-  public GeneratedWhoCreated(CurrentUserProvider currentUserProvider) {
+  GeneratedWhoCreated(CurrentUserProvider currentUserProvider) {
     this.currentUserProvider = currentUserProvider;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoModified.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoModified.java
index aac3ddbe2..e4e68a373 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoModified.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoModified.java
@@ -9,9 +9,9 @@ import io.ebeaninternal.server.deploy.BeanProperty;
  */
 public class GeneratedWhoModified implements GeneratedProperty {
 
-  final CurrentUserProvider currentUserProvider;
+  private final CurrentUserProvider currentUserProvider;
 
-  public GeneratedWhoModified(CurrentUserProvider currentUserProvider) {
+  GeneratedWhoModified(CurrentUserProvider currentUserProvider) {
     this.currentUserProvider = currentUserProvider;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java
index 0f69e5982..274834ab5 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java
@@ -15,13 +15,13 @@ import java.util.Map;
 /**
  * Helper for creating Insert timestamp GeneratedProperty objects.
  */
-public class InsertTimestampFactory {
+class InsertTimestampFactory {
 
-  final GeneratedInsertLong longTime = new GeneratedInsertLong();
+  private final GeneratedInsertLong longTime = new GeneratedInsertLong();
 
-  final Map<Class<?>, GeneratedProperty> map = new HashMap<>();
+  private final Map<Class<?>, GeneratedProperty> map = new HashMap<>();
 
-  public InsertTimestampFactory(ClassLoadConfig classLoadConfig) {
+  InsertTimestampFactory(ClassLoadConfig classLoadConfig) {
     map.put(Timestamp.class, new GeneratedInsertTimestamp());
     map.put(java.util.Date.class, new GeneratedInsertDate());
     map.put(Long.class, longTime);
@@ -40,7 +40,7 @@ public class InsertTimestampFactory {
 
   }
 
-  public void setInsertTimestamp(DeployBeanProperty property) {
+  void setInsertTimestamp(DeployBeanProperty property) {
 
     property.setGeneratedProperty(createInsertTimestamp(property));
   }
@@ -48,7 +48,7 @@ public class InsertTimestampFactory {
   /**
    * Create the insert GeneratedProperty depending on the property type.
    */
-  public GeneratedProperty createInsertTimestamp(DeployBeanProperty property) {
+  GeneratedProperty createInsertTimestamp(DeployBeanProperty property) {
 
     Class<?> propType = property.getPropertyType();
     GeneratedProperty generatedProperty = map.get(propType);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/JavaTimeUtils.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/JavaTimeUtils.java
index 986724938..bf3f6db12 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/JavaTimeUtils.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/JavaTimeUtils.java
@@ -9,7 +9,7 @@ import java.time.ZonedDateTime;
 /**
  * Helper methods for Java time conversion.
  */
-public class JavaTimeUtils {
+class JavaTimeUtils {
 
   /**
    * Return the system millis time as a LocalDateTime.
@@ -21,21 +21,21 @@ public class JavaTimeUtils {
   /**
    * Return the system millis time as a LocalDateTime.
    */
-  public static Object toLocalDateTime(long systemMillis) {
+  static Object toLocalDateTime(long systemMillis) {
     return new Timestamp(systemMillis).toLocalDateTime();
   }
 
   /**
    * Return the system millis time as a OffsetDateTime.
    */
-  public static Object toOffsetDateTime(long systemMillis) {
+  static Object toOffsetDateTime(long systemMillis) {
     return OffsetDateTime.ofInstant(Instant.ofEpochMilli(systemMillis), ZoneId.systemDefault());
   }
 
   /**
    * Return the system millis time as a ZonedDateTime.
    */
-  public static Object toZonedDateTime(long systemMillis) {
+  static Object toZonedDateTime(long systemMillis) {
     return ZonedDateTime.ofInstant(Instant.ofEpochMilli(systemMillis), ZoneId.systemDefault());
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java
index cb4c953f3..4a812064c 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java
@@ -15,13 +15,13 @@ import java.util.Map;
 /**
  * Helper for creating Update timestamp GeneratedProperty objects.
  */
-public class UpdateTimestampFactory {
+class UpdateTimestampFactory {
 
-  final GeneratedUpdateLong longTime = new GeneratedUpdateLong();
+  private final GeneratedUpdateLong longTime = new GeneratedUpdateLong();
 
-  final Map<Class<?>, GeneratedProperty> map = new HashMap<>();
+  private final Map<Class<?>, GeneratedProperty> map = new HashMap<>();
 
-  public UpdateTimestampFactory(ClassLoadConfig classLoadConfig) {
+  UpdateTimestampFactory(ClassLoadConfig classLoadConfig) {
     map.put(Timestamp.class, new GeneratedUpdateTimestamp());
     map.put(java.util.Date.class, new GeneratedUpdateDate());
     map.put(Long.class, longTime);
@@ -39,7 +39,7 @@ public class UpdateTimestampFactory {
     }
   }
 
-  public void setUpdateTimestamp(DeployBeanProperty property) {
+  void setUpdateTimestamp(DeployBeanProperty property) {
 
     property.setGeneratedProperty(createUpdateTimestamp(property));
   }
@@ -47,7 +47,7 @@ public class UpdateTimestampFactory {
   /**
    * Create the update GeneratedProperty depending on the property type.
    */
-  protected GeneratedProperty createUpdateTimestamp(DeployBeanProperty property) {
+  GeneratedProperty createUpdateTimestamp(DeployBeanProperty property) {
 
     Class<?> propType = property.getPropertyType();
     GeneratedProperty generatedProperty = map.get(propType);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
index e521dfbf3..5519ec523 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
@@ -35,17 +35,17 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
 
   private static final EntryComparator COMPARATOR = new EntryComparator();
 
-  protected final BeanPropertyAssoc<?> owner;
+  final BeanPropertyAssoc<?> owner;
 
-  protected final String localDbColumn;
+  final String localDbColumn;
 
-  protected final String localSqlFormula;
+  private final String localSqlFormula;
 
-  protected final String logicalName;
+  private final String logicalName;
 
-  protected final BeanProperty foreignProperty;
+  final BeanProperty foreignProperty;
 
-  protected final int position;
+  private final int position;
 
   /**
    * If true include in insert.
@@ -88,7 +88,7 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
   /**
    * Return true if it should be included in the update (or insert).
    */
-  public boolean isInclude(boolean update) {
+  boolean isInclude(boolean update) {
     return (update) ? updateable : insertable;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
index a4790d1fd..f5b28dfa7 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
@@ -206,7 +206,7 @@ public class DeployBeanProperty {
    */
   private GeneratedProperty generatedProperty;
 
-  protected final DeployBeanDescriptor<?> desc;
+  final DeployBeanDescriptor<?> desc;
 
   private boolean undirectionalShadow;
 
@@ -329,7 +329,7 @@ public class DeployBeanProperty {
   /**
    * Return the sortOrder for the properties.
    */
-  public int getSortOrder() {
+  int getSortOrder() {
     return sortOrder;
   }
 
@@ -357,7 +357,7 @@ public class DeployBeanProperty {
   /**
    * Mark this property as mapping to the discriminator column.
    */
-  public void setDiscriminator() {
+  void setDiscriminator() {
     this.discriminator = true;
   }
 
@@ -524,7 +524,7 @@ public class DeployBeanProperty {
     return naturalKey;
   }
 
-  public void setNaturalKey() {
+  void setNaturalKey() {
     this.naturalKey = true;
   }
 
@@ -763,7 +763,7 @@ public class DeployBeanProperty {
     return lob;
   }
 
-  public boolean isDbNumberType() {
+  boolean isDbNumberType() {
     return isNumericType(dbType);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java
index 69d9dc747..bd2ccc6be 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java
@@ -12,7 +12,7 @@ public abstract class DeployBeanPropertyAssoc<T> extends DeployBeanProperty {
   /**
    * The type of the joined bean.
    */
-  protected Class<T> targetType;
+  Class<T> targetType;
 
   /**
    * Persist settings.
@@ -27,7 +27,7 @@ public abstract class DeployBeanPropertyAssoc<T> extends DeployBeanProperty {
   /**
    * Join between the beans.
    */
-  protected final DeployTableJoin tableJoin = new DeployTableJoin();
+  final DeployTableJoin tableJoin = new DeployTableJoin();
 
   /**
    * Literal added to where clause of lazy loading query.
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java
index c45de396f..0e9d819ab 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java
@@ -13,27 +13,26 @@ public class DeployTableJoinColumn {
   /**
    * The local database column name.
    */
-  String localDbColumn;
+  private String localDbColumn;
 
   /**
    * SQL formula used for local column
    */
-  String localSqlFormula;
+  private String localSqlFormula;
 
   /**
    * The foreign database column name.
    */
-  String foreignDbColumn;
+  private String foreignDbColumn;
 
   /**
    * SQL formula used for foreign column
    */
-  String foreignSqlFormula;
+  private String foreignSqlFormula;
 
-  boolean insertable;
-
-  boolean updateable;
+  private boolean insertable;
 
+  private boolean updateable;
 
   /**
    * Construct when automatically determining the join.
@@ -55,7 +54,7 @@ public class DeployTableJoinColumn {
     this.updateable = updateable;
   }
 
-  public void setLocalSqlFormula(String localSqlFormula) {
+  void setLocalSqlFormula(String localSqlFormula) {
     if (localSqlFormula != null) {
       this.localSqlFormula = localSqlFormula;
       this.localDbColumn = null;
@@ -178,7 +177,7 @@ public class DeployTableJoinColumn {
   /**
    * Set the local database column name.
    */
-  public void setLocalDbColumn(String localDbColumn) {
+  void setLocalDbColumn(String localDbColumn) {
     this.localDbColumn = localDbColumn;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java
index b43aa736e..84fda2072 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java
@@ -38,12 +38,12 @@ import java.util.Set;
  * <p>This means, searching for <code>JoinColumn</code> will find them also if they are inside a
  * <code>JoinColumn<b>s</b></code> annotation</p>
  */
-public abstract class AnnotationBase {
+abstract class AnnotationBase {
 
-  protected final DatabasePlatform databasePlatform;
-  protected final Platform platform;
-  protected final NamingConvention namingConvention;
-  protected final DeployUtil util;
+  final DatabasePlatform databasePlatform;
+  private final Platform platform;
+  final NamingConvention namingConvention;
+  final DeployUtil util;
 
   AnnotationBase(DeployUtil util) {
     this.util = util;
@@ -60,7 +60,7 @@ public abstract class AnnotationBase {
   /**
    * Checks string is null or empty .
    */
-  protected boolean isEmpty(String s) {
+  boolean isEmpty(String s) {
     return s == null || s.trim().isEmpty();
   }
 
@@ -78,7 +78,7 @@ public abstract class AnnotationBase {
    * </p>
    * <p>
    */
-  protected <T extends Annotation> T get(DeployBeanProperty prop, Class<T> annClass) {
+  <T extends Annotation> T get(DeployBeanProperty prop, Class<T> annClass) {
     T a = null;
     Field field = prop.getField();
     if (field != null) {
@@ -97,7 +97,7 @@ public abstract class AnnotationBase {
    * Return all annotations for this property. Annotations are not filtered by platfrom and you'll get
    * really all annotations that are directly, indirectly or meta-present.
    */
-  protected <T extends Annotation> Set<T> getAll(DeployBeanProperty prop, Class<T> annClass) {
+  <T extends Annotation> Set<T> getAll(DeployBeanProperty prop, Class<T> annClass) {
     Set<T> ret = null;
     Field field = prop.getField();
     if (field != null) {
@@ -121,7 +121,7 @@ public abstract class AnnotationBase {
    * (This is used for SequenceGenerator e.g.)
    * </p>
    */
-  protected <T extends Annotation> T find(DeployBeanProperty prop, Class<T> annClass) {
+  <T extends Annotation> T find(DeployBeanProperty prop, Class<T> annClass) {
     T a = get(prop, annClass);
     if (a == null) {
       a = AnnotationUtil.findAnnotation(prop.getOwningType(), annClass, platform);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
index 0d7ae956a..6ef7056ab 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
@@ -19,11 +19,11 @@ import java.util.UUID;
  */
 public abstract class AnnotationParser extends AnnotationBase {
 
-  protected final DeployBeanInfo<?> info;
+  final DeployBeanInfo<?> info;
 
-  protected final DeployBeanDescriptor<?> descriptor;
+  final DeployBeanDescriptor<?> descriptor;
 
-  protected final Class<?> beanType;
+  final Class<?> beanType;
 
   final boolean validationAnnotations;
 

From 9b1fa43792353b851ebfcfb160aac35c900454b6 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 2 Jul 2019 20:48:19 +1200
Subject: [PATCH 0927/1036] #1747 - Refactor tidy remove unused ParamTypeUtil

---
 .../server/deploy/ParamTypeUtil.java          | 79 -------------------
 1 file changed, 79 deletions(-)
 delete mode 100644 src/main/java/io/ebeaninternal/server/deploy/ParamTypeUtil.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/ParamTypeUtil.java b/src/main/java/io/ebeaninternal/server/deploy/ParamTypeUtil.java
deleted file mode 100644
index c19f06a52..000000000
--- a/src/main/java/io/ebeaninternal/server/deploy/ParamTypeUtil.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package io.ebeaninternal.server.deploy;
-
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-
-/**
- * Helper object to find generic parameter types for a given class.
- */
-class ParamTypeUtil {
-
-  /**
-   * Find and return the parameter type given a generic interface or class.
-   * <p>
-   * This assumes there is only one generic parameter.
-   * </p>
-   * <p>
-   * Returns null if no match was found.
-   * </p>
-   *
-   * @param cls       the class to search for the parameter type
-   * @param matchType the type which has the generic parameter
-   */
-  public static Class<?> findParamType(Class<?> cls, Class<?> matchType) {
-
-    // search for: implementing a generic interface
-    Type paramType = matchByInterfaces(cls, matchType);
-    if (paramType == null) {
-      // search for: extending a generic class
-      Type genericSuperclass = cls.getGenericSuperclass();
-      if (genericSuperclass != null) {
-        paramType = matchParamType(genericSuperclass, matchType);
-      }
-    }
-
-    if (paramType instanceof Class<?>) {
-      // only interested in classes
-      return (Class<?>) paramType;
-    } else {
-      return null;
-    }
-  }
-
-  /**
-   * Check if the type is a generic one with parameters and of the correct type we are
-   * searching for. Return the parameter type if this matches otherwise return null.
-   */
-  private static Type matchParamType(Type type, Class<?> matchType) {
-    if (type instanceof ParameterizedType) {
-      ParameterizedType pt = (ParameterizedType) type;
-      Type rawType = pt.getRawType();
-      boolean isAssignable = matchType.isAssignableFrom((Class<?>) rawType);
-      if (isAssignable) {
-        // assume there is only one parameter type
-        Type[] typeArguments = pt.getActualTypeArguments();
-        if (typeArguments.length != 1) {
-          String m = "Expecting only 1 generic paramater but got " + typeArguments.length + " for " + type;
-          throw new RuntimeException(m);
-        }
-        return typeArguments[0];
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Search the interfaces this class implements.
-   */
-  private static Type matchByInterfaces(Class<?> cls, Class<?> matchType) {
-
-    Type[] gis = cls.getGenericInterfaces();
-    for (Type gi : gis) {
-      Type match = matchParamType(gi, matchType);
-      if (match != null) {
-        return match;
-      }
-    }
-    return null;
-  }
-}

From 68db6723d00adc15a072e86c79d78959bd611604 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 2 Jul 2019 21:08:13 +1200
Subject: [PATCH 0928/1036] #1747 - Refactor tidy finals, local fields,
 switches, unused methods

---
 .../server/deploy/BeanCascadeInfo.java        |  2 --
 .../server/deploy/BeanDescriptor.java         | 32 ++++---------------
 .../server/deploy/BeanProperty.java           | 12 +------
 .../server/deploy/BeanPropertyAssocMany.java  |  6 +---
 .../deploy/DeployDocPropertyOptions.java      |  2 +-
 .../server/deploy/DeployUpdateParser.java     |  4 +--
 .../DynamicPropertyAggregationFormula.java    |  3 +-
 .../server/deploy/ExportedProperty.java       |  4 +--
 .../server/deploy/TableJoin.java              |  5 ++-
 .../InsertTimestampFactory.java               |  4 +--
 .../UpdateTimestampFactory.java               |  3 +-
 .../server/deploy/id/IdBinderEmpty.java       | 10 +++---
 .../server/deploy/id/ImportedIdSimple.java    |  3 --
 .../deploy/meta/DeployBeanProperty.java       | 22 ++++---------
 .../server/deploy/parse/DeployUtil.java       |  2 --
 15 files changed, 30 insertions(+), 84 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java b/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java
index af231db1d..36b7b2152 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java
@@ -36,8 +36,6 @@ public class BeanCascadeInfo {
         refresh = true;
         break;
       case PERSIST:
-        save = true;
-        break;
       case MERGE:
         save = true;
         break;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 73e061c52..a3981eb5d 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -92,6 +92,7 @@ import io.ebeanservice.docstore.api.mapping.DocumentMapping;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.annotation.Nonnull;
 import javax.persistence.PersistenceException;
 import java.io.IOException;
 import java.io.StringWriter;
@@ -1289,13 +1290,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return cacheHelp.getNaturalKey();
   }
 
-  /**
-   * Return true if there is bean or query caching for this type.
-   */
-  public boolean isCaching() {
-    return cacheHelp.isCaching();
-  }
-
   /**
    * Return true if there is currently bean caching for this type of bean.
    */
@@ -2117,13 +2111,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     }
   }
 
-  /**
-   * Get a property value from a bean of this type.
-   */
-  public Object getValue(EntityBean bean, String property) {
-    return getBeanProperty(property).getValue(bean);
-  }
-
   /**
    * Return true if this bean type should use IdGeneration.
    * <p>
@@ -2145,7 +2132,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Return the class type this BeanDescriptor describes.
    */
-  @Override
+  @Override @Nonnull
   public Class<T> getBeanType() {
     return beanType;
   }
@@ -2157,7 +2144,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * instead.
    * </p>
    */
-  @Override
+  @Override @Nonnull
   public String getFullName() {
     return fullName;
   }
@@ -2165,7 +2152,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Return the short name of the entity bean.
    */
-  @Override
+  @Override @Nonnull
   public String getName() {
     return name;
   }
@@ -2626,13 +2613,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     }
   }
 
-  /**
-   * Return the name of the server this BeanDescriptor belongs to.
-   */
-  public String getServerName() {
-    return serverName;
-  }
-
   /**
    * Return true if this bean can cache sharable instances.
    * <p>
@@ -3139,7 +3119,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return selectLastInsertedId != null;
   }
 
-  @Override
+  @Override @Nonnull
   public Collection<? extends Property> allProperties() {
     return propertiesAll();
   }
@@ -3513,7 +3493,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     jsonHelp.jsonWrite(writeJson, bean, key);
   }
 
-  void jsonWriteProperties(SpiJsonWriter writeJson, EntityBean bean) throws IOException {
+  void jsonWriteProperties(SpiJsonWriter writeJson, EntityBean bean) {
     jsonHelp.jsonWriteProperties(writeJson, bean);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 0f22dee27..5fe365346 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -1259,12 +1259,9 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   public static boolean isLobType(int type) {
     switch (type) {
       case Types.CLOB:
-        return true;
       case Types.BLOB:
-        return true;
-      case Types.LONGVARBINARY:
-        return true;
       case Types.LONGVARCHAR:
+      case Types.LONGVARBINARY:
         return true;
 
       default:
@@ -1312,13 +1309,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     return excludedFromHistory;
   }
 
-  /**
-   * Return true if this is a ManyToMany with history support (on the intersection table).
-   */
-  public boolean isManyToManyWithHistory() {
-    return false;
-  }
-
   /**
    * Return true if this property hold unmapped JSON.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index fd55ae6b2..0b9946830 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -426,7 +426,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   }
 
   @Override
-  public Object read(DbReadContext ctx) throws SQLException {
+  public Object read(DbReadContext ctx) {
     return null;
   }
 
@@ -957,10 +957,6 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     return targetDescriptor.isDocStoreMapped();
   }
 
-  public BeanCollectionHelp<T> getHelp() {
-    return help;
-  }
-
   void jsonWriteMapEntry(SpiJsonWriter ctx, Map.Entry<?, ?> entry) throws IOException {
     elementDescriptor.jsonWriteMapEntry(ctx, entry);
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DeployDocPropertyOptions.java b/src/main/java/io/ebeaninternal/server/deploy/DeployDocPropertyOptions.java
index adb74e5ce..81d8ea3f8 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DeployDocPropertyOptions.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DeployDocPropertyOptions.java
@@ -10,7 +10,7 @@ import io.ebeanservice.docstore.api.mapping.DocPropertyOptions;
  */
 public class DeployDocPropertyOptions {
 
-  private static DocPropertyOptions EMPTY = new DocPropertyOptions();
+  private static final DocPropertyOptions EMPTY = new DocPropertyOptions();
 
   private DocPropertyOptions mapping;
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java b/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java
index 6669aeb9a..716820922 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java
@@ -54,7 +54,7 @@ public final class DeployUpdateParser extends DeployParser {
       }
 
       // append up to the dot
-      localBuffer.append(currentWord.substring(start, dotPos + 1));
+      localBuffer.append(currentWord, start, dotPos + 1);
 
       if (dotPos == currentWord.length() - 1) {
         // ends with a "." ???
@@ -63,7 +63,7 @@ public final class DeployUpdateParser extends DeployParser {
 
       // get the remainder after the dot
       start = dotPos + 1;
-      String remainder = currentWord.substring(start, currentWord.length());
+      String remainder = currentWord.substring(start);
 
       String dbWord = getDeployWord(remainder);
       if (dbWord != null) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
index 5a584f15a..7651aae52 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
@@ -5,7 +5,6 @@ import io.ebeaninternal.server.type.DataReader;
 import io.ebeaninternal.server.type.ScalarType;
 
 import javax.persistence.PersistenceException;
-import java.sql.SQLException;
 
 /**
  * Dynamic property based on aggregation (max, min, avg, count).
@@ -39,7 +38,7 @@ class DynamicPropertyAggregationFormula extends DynamicPropertyBase {
   }
 
   @Override
-  public Object read(DataReader dataReader) throws SQLException {
+  public Object read(DataReader dataReader) {
     try {
       return scalarType.read(dataReader);
     } catch (Exception e) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ExportedProperty.java b/src/main/java/io/ebeaninternal/server/deploy/ExportedProperty.java
index 235e89713..8c4b789ab 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ExportedProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ExportedProperty.java
@@ -9,7 +9,7 @@ import io.ebeaninternal.server.core.InternString;
  * Used to for Assoc Manys to create references etc.
  * </p>
  */
-public class ExportedProperty {
+class ExportedProperty {
 
   private final String foreignDbColumn;
 
@@ -17,7 +17,7 @@ public class ExportedProperty {
 
   private final boolean embedded;
 
-  public ExportedProperty(boolean embedded, String foreignDbColumn, BeanProperty property) {
+  ExportedProperty(boolean embedded, String foreignDbColumn, BeanProperty property) {
     this.embedded = embedded;
     this.foreignDbColumn = InternString.intern(foreignDbColumn);
     this.property = property;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java b/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java
index 5d805aa20..a2b07648c 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java
@@ -141,14 +141,13 @@ public final class TableJoin {
     return type;
   }
 
-  public SqlJoinType addJoin(SqlJoinType joinType, String prefix, DbSqlContext ctx, String predicate) {
+  public void addJoin(SqlJoinType joinType, String prefix, DbSqlContext ctx, String predicate) {
     String[] names = SplitName.split(prefix);
     String a1 = ctx.getTableAlias(names[0]);
     String a2 = ctx.getTableAlias(prefix);
 
-    SqlJoinType returnJoinType = addJoin(joinType, a1, a2, ctx);
+    addJoin(joinType, a1, a2, ctx);
     ctx.append("and ").append(a2).append(predicate);
-    return returnJoinType;
   }
 
   public SqlJoinType addJoin(SqlJoinType joinType, String prefix, DbSqlContext ctx) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java
index 274834ab5..5c1cafd6b 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java
@@ -17,13 +17,12 @@ import java.util.Map;
  */
 class InsertTimestampFactory {
 
-  private final GeneratedInsertLong longTime = new GeneratedInsertLong();
-
   private final Map<Class<?>, GeneratedProperty> map = new HashMap<>();
 
   InsertTimestampFactory(ClassLoadConfig classLoadConfig) {
     map.put(Timestamp.class, new GeneratedInsertTimestamp());
     map.put(java.util.Date.class, new GeneratedInsertDate());
+    GeneratedInsertLong longTime = new GeneratedInsertLong();
     map.put(Long.class, longTime);
     map.put(long.class, longTime);
 
@@ -37,7 +36,6 @@ class InsertTimestampFactory {
       map.put(org.joda.time.LocalDateTime.class, new GeneratedInsertJodaTime.LocalDT());
       map.put(org.joda.time.DateTime.class, new GeneratedInsertJodaTime.DateTimeDT());
     }
-
   }
 
   void setInsertTimestamp(DeployBeanProperty property) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java
index 4a812064c..5788569a7 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java
@@ -17,13 +17,12 @@ import java.util.Map;
  */
 class UpdateTimestampFactory {
 
-  private final GeneratedUpdateLong longTime = new GeneratedUpdateLong();
-
   private final Map<Class<?>, GeneratedProperty> map = new HashMap<>();
 
   UpdateTimestampFactory(ClassLoadConfig classLoadConfig) {
     map.put(Timestamp.class, new GeneratedUpdateTimestamp());
     map.put(java.util.Date.class, new GeneratedUpdateDate());
+    GeneratedUpdateLong longTime = new GeneratedUpdateLong();
     map.put(Long.class, longTime);
     map.put(long.class, longTime);
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java
index 651c995d2..97c05670e 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java
@@ -127,7 +127,7 @@ public final class IdBinderEmpty implements IdBinder {
   }
 
   @Override
-  public void bindId(DataBind dataBind, Object value) throws SQLException {
+  public void bindId(DataBind dataBind, Object value) {
 
   }
 
@@ -146,12 +146,12 @@ public final class IdBinderEmpty implements IdBinder {
   }
 
   @Override
-  public Object readSet(DbReadContext ctx, EntityBean bean) throws SQLException {
+  public Object readSet(DbReadContext ctx, EntityBean bean) {
     return null;
   }
 
   @Override
-  public Object read(DbReadContext ctx) throws SQLException {
+  public Object read(DbReadContext ctx) {
     return null;
   }
 
@@ -170,12 +170,12 @@ public final class IdBinderEmpty implements IdBinder {
   }
 
   @Override
-  public Object readData(DataInput dataOutput) throws IOException {
+  public Object readData(DataInput dataOutput) {
     return null;
   }
 
   @Override
-  public void writeData(DataOutput dataOutput, Object idValue) throws IOException {
+  public void writeData(DataOutput dataOutput, Object idValue) {
 
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
index 5519ec523..14afc2feb 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
@@ -41,8 +41,6 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
 
   private final String localSqlFormula;
 
-  private final String logicalName;
-
   final BeanProperty foreignProperty;
 
   private final int position;
@@ -66,7 +64,6 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
     this.position = position;
     this.insertable = insertable;
     this.updateable = updateable;
-    this.logicalName = InternString.intern(owner.getName() + "." + foreignProperty.getName());
   }
 
   public ImportedIdSimple(BeanPropertyAssoc<?> owner, String localDbColumn, String localSqlFormula, BeanProperty foreignProperty, int position) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
index f5b28dfa7..0d715f75e 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
@@ -188,7 +188,7 @@ public class DeployBeanProperty {
    */
   private int dbType;
 
-  private DeployDocPropertyOptions docMapping = new DeployDocPropertyOptions();
+  private final DeployDocPropertyOptions docMapping = new DeployDocPropertyOptions();
 
   /**
    * The method used to read the property.
@@ -770,22 +770,14 @@ public class DeployBeanProperty {
   private boolean isNumericType(int type) {
     switch (type) {
       case Types.BIGINT:
-        return true;
       case Types.DECIMAL:
-        return true;
-      case Types.DOUBLE:
-        return true;
-      case Types.FLOAT:
-        return true;
-      case Types.INTEGER:
-        return true;
-      case Types.NUMERIC:
-        return true;
-      case Types.REAL:
-        return true;
-      case Types.SMALLINT:
-        return true;
       case Types.TINYINT:
+      case Types.SMALLINT:
+      case Types.REAL:
+      case Types.NUMERIC:
+      case Types.INTEGER:
+      case Types.FLOAT:
+      case Types.DOUBLE:
         return true;
 
       default:
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
index 68ab4fb46..b8cafc39d 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
@@ -245,8 +245,6 @@ public class DeployUtil {
   private int getDbJsonStorage(DbJsonType dbJsonType) {
 
     switch (dbJsonType) {
-      case JSON:
-        return DbPlatformType.JSON;
       case JSONB:
         return DbPlatformType.JSONB;
       case VARCHAR:

From 87431482383425974c7a5a6c8955f6c11ef44972 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 2 Jul 2019 21:25:42 +1200
Subject: [PATCH 0929/1036] #1747 - Refactor BeanPropertyAssocOne.diff() next
 prefix

---
 .../ebeaninternal/server/deploy/BeanPropertyAssocOne.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index bd6b3ed55..718a2d23b 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -390,10 +390,11 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
       return;
     }
 
+    String nextPrefix = (prefix == null) ? name : prefix + "." + name;
+
     if (embedded) {
-      prefix = (prefix == null) ? name : prefix + "." + name;
       BeanDescriptor<T> targetDescriptor = getTargetDescriptor();
-      targetDescriptor.diff(prefix, map, (EntityBean) newEmb, (EntityBean) oldEmb);
+      targetDescriptor.diff(nextPrefix, map, (EntityBean) newEmb, (EntityBean) oldEmb);
 
     } else {
       // we are only interested in the Id value
@@ -406,8 +407,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
       Object newId = (newBean == null) ? null : idProperty.getValue(newBean);
       Object oldId = (oldBean == null) ? null : idProperty.getValue(oldBean);
       if (newId != null || oldId != null) {
-        prefix = (prefix == null) ? name : prefix + "." + name;
-        idProperty.diffVal(prefix, map, newId, oldId);
+        idProperty.diffVal(nextPrefix, map, newId, oldId);
       }
     }
   }

From bc5db1e46a0bce092ddc705e2e075760e28f172d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 2 Jul 2019 21:26:24 +1200
Subject: [PATCH 0930/1036] #1747 - Refactor remove unused methods

---
 .../server/deploy/BeanDescriptor.java         | 18 +++++------
 .../server/deploy/BeanPropertyAssocMany.java  |  1 -
 .../server/deploy/DbSqlContext.java           |  5 ---
 .../server/deploy/IndexDefinition.java        |  9 ------
 .../server/deploy/TableJoin.java              |  7 ----
 .../server/deploy/id/IdBinderEmpty.java       |  2 --
 .../server/deploy/id/ImportedIdSimple.java    |  1 -
 .../deploy/meta/DeployBeanDescriptor.java     | 32 +++----------------
 .../deploy/meta/DeployBeanPropertyLists.java  | 12 -------
 .../server/query/DefaultDbSqlContext.java     |  6 ----
 10 files changed, 12 insertions(+), 81 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index a3981eb5d..7e562342d 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -143,11 +143,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     ORM, EMBEDDED, VIEW, SQL, DOC
   }
 
-  /**
-   * The EbeanServer name. Same as the plugin name.
-   */
-  private final String serverName;
-
   /**
    * The nature/type of this bean.
    */
@@ -435,7 +430,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
 
     this.owner = owner;
     this.multiValueSupported = owner.isMultiValueSupported();
-    this.serverName = owner.getServerName();
     this.entityType = deploy.getEntityType();
     this.properties = deploy.getProperties();
     this.name = InternString.intern(deploy.getName());
@@ -2132,7 +2126,8 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Return the class type this BeanDescriptor describes.
    */
-  @Override @Nonnull
+  @Override
+  @Nonnull
   public Class<T> getBeanType() {
     return beanType;
   }
@@ -2144,7 +2139,8 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * instead.
    * </p>
    */
-  @Override @Nonnull
+  @Override
+  @Nonnull
   public String getFullName() {
     return fullName;
   }
@@ -2152,7 +2148,8 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Return the short name of the entity bean.
    */
-  @Override @Nonnull
+  @Override
+  @Nonnull
   public String getName() {
     return name;
   }
@@ -3119,7 +3116,8 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return selectLastInsertedId != null;
   }
 
-  @Override @Nonnull
+  @Override
+  @Nonnull
   public Collection<? extends Property> allProperties() {
     return propertiesAll();
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index 0b9946830..3fbfb49f7 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -28,7 +28,6 @@ import org.slf4j.LoggerFactory;
 import javax.persistence.PersistenceException;
 import java.io.IOException;
 import java.io.StringWriter;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java b/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java
index 3fd4e3666..99f085b6e 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java
@@ -32,11 +32,6 @@ public interface DbSqlContext {
    */
   BeanProperty[] getEncryptedProps();
 
-  /**
-   * Append a char directly to the SQL buffer.
-   */
-  DbSqlContext append(char s);
-
   /**
    * Append a string directly to the SQL buffer.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/IndexDefinition.java b/src/main/java/io/ebeaninternal/server/deploy/IndexDefinition.java
index dc3db84cc..3c9632bb8 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/IndexDefinition.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/IndexDefinition.java
@@ -11,15 +11,6 @@ public class IndexDefinition {
 
   private final boolean unique;
 
-  /**
-   * A single column index.
-   */
-  public IndexDefinition(String column, String name, boolean unique) {
-    this.columns = new String[]{column};
-    this.unique = unique;
-    this.name = name;
-  }
-
   public IndexDefinition(String[] columns, String name, boolean unique) {
     this.columns = columns;
     this.unique = unique;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java b/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java
index a2b07648c..41d99e130 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java
@@ -134,13 +134,6 @@ public final class TableJoin {
     return table;
   }
 
-  /**
-   * Return the type of join. LEFT JOIN etc.
-   */
-  public SqlJoinType getType() {
-    return type;
-  }
-
   public void addJoin(SqlJoinType joinType, String prefix, DbSqlContext ctx, String predicate) {
     String[] names = SplitName.split(prefix);
     String a1 = ctx.getTableAlias(names[0]);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java
index 97c05670e..7992c7431 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java
@@ -10,8 +10,6 @@ import io.ebeaninternal.server.type.DataBind;
 
 import java.io.DataInput;
 import java.io.DataOutput;
-import java.io.IOException;
-import java.sql.SQLException;
 import java.util.Collection;
 import java.util.List;
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
index 14afc2feb..a71414a76 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
@@ -155,7 +155,6 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
     }
   }
 
-
   @Override
   public void dmlAppend(GenerateDmlRequest request) {
     request.appendColumn(localDbColumn);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index 01ceca31a..c8c8a2a1c 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -37,7 +37,6 @@ import io.ebeaninternal.server.rawsql.SpiRawSql;
 
 import javax.persistence.Entity;
 import javax.persistence.MappedSuperclass;
-import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
@@ -181,11 +180,6 @@ public class DeployBeanDescriptor<T> {
    */
   private BeanFindController beanFinder;
 
-  /**
-   * The table joins for this bean. Server side only.
-   */
-  private final ArrayList<DeployTableJoin> tableJoinList = new ArrayList<>(2);
-
   /**
    * Inheritance information. Server side only.
    */
@@ -245,7 +239,7 @@ public class DeployBeanDescriptor<T> {
   /**
    * Return true if there is a IdClass set.
    */
-  public boolean isIdClass() {
+  boolean isIdClass() {
     return idClass != null;
   }
 
@@ -270,13 +264,6 @@ public class DeployBeanDescriptor<T> {
     return manager.getDeploy(cls);
   }
 
-  /**
-   * Return true if this beanType is an abstract class.
-   */
-  public boolean isAbstract() {
-    return Modifier.isAbstract(beanType.getModifiers());
-  }
-
   public void setStorageEngine(String storageEngine) {
     this.storageEngine = storageEngine;
   }
@@ -502,7 +489,7 @@ public class DeployBeanDescriptor<T> {
     return cacheOptions;
   }
 
-  public DeployBeanPropertyAssocOne<?> getIdClassProperty() {
+  DeployBeanPropertyAssocOne<?> getIdClassProperty() {
     return idClassProperty;
   }
 
@@ -518,7 +505,7 @@ public class DeployBeanDescriptor<T> {
     this.orderColumn = orderColumn;
   }
 
-  public DeployBeanProperty getOrderColumn() {
+  DeployBeanProperty getOrderColumn() {
     return orderColumn;
   }
 
@@ -949,17 +936,6 @@ public class DeployBeanDescriptor<T> {
     return getFullName();
   }
 
-  /**
-   * Add a TableJoin to this type of bean. For Secondary table properties.
-   */
-  public void addTableJoin(DeployTableJoin join) {
-    tableJoinList.add(join);
-  }
-
-  List<DeployTableJoin> getTableJoins() {
-    return tableJoinList;
-  }
-
   /**
    * Return a collection of all BeanProperty deployment information.
    */
@@ -1268,7 +1244,7 @@ public class DeployBeanDescriptor<T> {
    * Returns the jackson annotated class, if jackson is present.
    */
   @SuppressWarnings("unchecked")
-  public Object /*AnnotatedClass*/ getJacksonAnnotatedClass() {
+  Object /*AnnotatedClass*/ getJacksonAnnotatedClass() {
     if (jacksonAnnotatedClass == null) {
       jacksonAnnotatedClass = new DeployBeanObtainJackson(serverConfig, beanType).obtain();
     }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
index 8475af9fc..276e9821c 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
@@ -66,8 +66,6 @@ public class DeployBeanPropertyLists {
 
   private final List<BeanProperty> nonTransients = new ArrayList<>();
 
-  private final TableJoin[] tableJoins;
-
   private final BeanPropertyAssocOne<?> unidirectional;
   private final BeanProperty orderColumn;
 
@@ -138,12 +136,6 @@ public class DeployBeanPropertyLists {
       // (after the real properties have been organised into their lists)
       propertyMap.put(discProperty.getName(), discProperty);
     }
-
-    List<DeployTableJoin> deployTableJoins = deploy.getTableJoins();
-    tableJoins = new TableJoin[deployTableJoins.size()];
-    for (int i = 0; i < deployTableJoins.size(); i++) {
-      tableJoins[i] = new TableJoin(deployTableJoins.get(i));
-    }
   }
 
   /**
@@ -275,10 +267,6 @@ public class DeployBeanPropertyLists {
     return propertyMap;
   }
 
-  public TableJoin[] getTableJoin() {
-    return tableJoins;
-  }
-
   /**
    * Return the base scalar properties (excludes Id and secondary table
    * properties).
diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java b/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
index 2d87d37ef..0af0c3f24 100644
--- a/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
+++ b/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
@@ -231,12 +231,6 @@ class DefaultDbSqlContext implements DbSqlContext {
     return this;
   }
 
-  @Override
-  public DefaultDbSqlContext append(char s) {
-    sb.append(s);
-    return this;
-  }
-
   @Override
   public void appendFormulaJoin(String sqlFormulaJoin, SqlJoinType joinType) {
 

From f4a7d0b6ad8c28ff9c457487a80a44052cf9db7a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 2 Jul 2019 21:39:07 +1200
Subject: [PATCH 0931/1036] #1747 - Refactor ebeaninternal/server/persist
 access, switch

---
 .../server/persist/BatchControl.java          |  2 +-
 .../server/persist/BatchDepthOrder.java       |  2 +-
 .../server/persist/BatchedBeanHolder.java     |  2 +-
 .../server/persist/BindValues.java            |  6 +--
 .../ebeaninternal/server/persist/Binder.java  | 33 ++++-----------
 .../server/persist/MergeContext.java          |  2 +-
 .../server/persist/MergeHandler.java          |  2 +-
 .../server/persist/MergeNode.java             |  8 ++--
 .../server/persist/dml/DeleteMeta.java        |  2 +-
 .../server/persist/dml/DmlHandler.java        | 41 +++++++------------
 .../persist/dml/GeneratedProperties.java      |  4 +-
 .../dml/GeneratedPropertyCollector.java       |  2 +-
 .../server/persist/dml/InsertMeta.java        |  2 +-
 .../server/persist/dml/MetaFactory.java       |  2 +-
 .../server/persist/dml/PersistHandler.java    |  7 +---
 .../server/persist/dml/UpdateMeta.java        |  9 +---
 .../server/persist/dml/UpdatePlan.java        |  2 +-
 .../persist/dmlbind/BindableAssocOne.java     |  6 +--
 .../persist/dmlbind/BindableIdEmpty.java      |  2 +-
 .../persist/dmlbind/BindableProperty.java     |  2 +-
 .../dmlbind/BindablePropertyVersion.java      |  2 +-
 .../persist/dmlbind/FactoryProperty.java      |  2 +-
 .../dmlbind/MatchedImportedFactory.java       |  2 +-
 .../platform/AbstractMultiValueBind.java      |  2 +-
 .../persist/platform/MultiValueBind.java      |  2 +-
 25 files changed, 54 insertions(+), 94 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchControl.java b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
index 25b914f8c..bab8a3b6c 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
@@ -191,7 +191,7 @@ public final class BatchControl {
   /**
    * Add the request to the batch and return true if we should flush.
    */
-  private boolean addToBatch(PersistRequestBean<?> request) throws BatchedSqlException {
+  private boolean addToBatch(PersistRequestBean<?> request) {
 
     Object alreadyInBatch = persistedBeans.put(request.getEntityBean(), DUMMY);
     if (alreadyInBatch != null) {
diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchDepthOrder.java b/src/main/java/io/ebeaninternal/server/persist/BatchDepthOrder.java
index 7fe9c10b5..3817f43bd 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchDepthOrder.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchDepthOrder.java
@@ -26,7 +26,7 @@ class BatchDepthOrder {
 
     int count;
 
-    public int increment() {
+    int increment() {
       return count++;
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java b/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java
index b32878494..fa7bdfffa 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java
@@ -18,7 +18,7 @@ import java.util.ArrayList;
  * executed. The lowest depth is executed first.
  * </p>
  */
-public class BatchedBeanHolder {
+class BatchedBeanHolder {
 
   /**
    * The owning queue.
diff --git a/src/main/java/io/ebeaninternal/server/persist/BindValues.java b/src/main/java/io/ebeaninternal/server/persist/BindValues.java
index 169c37d2b..9e297d1b2 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BindValues.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BindValues.java
@@ -5,9 +5,9 @@ import java.util.ArrayList;
 /**
  * Holds a list of bind values for binding to a PreparedStatement.
  */
-public class BindValues {
+class BindValues {
 
-  final ArrayList<Value> list = new ArrayList<>();
+  private final ArrayList<Value> list = new ArrayList<>();
 
   /**
    * Create with a Binder.
@@ -53,7 +53,7 @@ public class BindValues {
     /**
      * Create the value.
      */
-    public Value(Object value, int dbType, String name) {
+    Value(Object value, int dbType, String name) {
       this.value = value;
       this.dbType = dbType;
       this.name = name;
diff --git a/src/main/java/io/ebeaninternal/server/persist/Binder.java b/src/main/java/io/ebeaninternal/server/persist/Binder.java
index ae1d23c04..6b1011e3c 100644
--- a/src/main/java/io/ebeaninternal/server/persist/Binder.java
+++ b/src/main/java/io/ebeaninternal/server/persist/Binder.java
@@ -124,7 +124,7 @@ public class Binder {
   /**
    * Bind the list of positionedParameters in BindParams.
    */
-  public String bind(BindParams bindParams, DataBind dataBind) throws SQLException {
+  private String bind(BindParams bindParams, DataBind dataBind) throws SQLException {
 
     StringBuilder bindLog = new StringBuilder();
     bind(bindParams, dataBind, bindLog);
@@ -142,7 +142,7 @@ public class Binder {
   /**
    * Bind the list of parameters..
    */
-  public void bind(List<BindParams.Param> list, DataBind dataBind, StringBuilder bindLog) throws SQLException {
+  private void bind(List<BindParams.Param> list, DataBind dataBind, StringBuilder bindLog) throws SQLException {
 
     CallableStatement cstmt = null;
 
@@ -261,7 +261,7 @@ public class Binder {
    * default is that both are converted to java.sql.Timestamp.
    * </p>
    */
-  public void bindObject(DataBind dataBind, Object data, int dbType) throws SQLException {
+  private void bindObject(DataBind dataBind, Object data, int dbType) throws SQLException {
 
     if (data == null) {
       dataBind.setNull(dbType);
@@ -298,8 +298,6 @@ public class Binder {
     try {
       switch (dataType) {
         case java.sql.Types.BOOLEAN:
-          b.setBoolean((Boolean) data);
-          break;
         case java.sql.Types.BIT:
           // Types.BIT should map to Java Boolean
           b.setBoolean((Boolean) data);
@@ -334,18 +332,12 @@ public class Binder {
           break;
 
         case java.sql.Types.FLOAT:
+        case java.sql.Types.DOUBLE:
           // DB Float in theory maps to Java Double type
           b.setDouble((Double) data);
           break;
 
-        case java.sql.Types.DOUBLE:
-          b.setDouble((Double) data);
-          break;
-
         case java.sql.Types.NUMERIC:
-          b.setBigDecimal((BigDecimal) data);
-          break;
-
         case java.sql.Types.DECIMAL:
           b.setBigDecimal((BigDecimal) data);
           break;
@@ -363,14 +355,13 @@ public class Binder {
           break;
 
         case java.sql.Types.BINARY:
-          b.setBytes((byte[]) data);
-          break;
-
         case java.sql.Types.VARBINARY:
           b.setBytes((byte[]) data);
           break;
 
         case DbPlatformType.UUID:
+        case java.sql.Types.JAVA_OBJECT:
+          // Not too sure about this.
           // native UUID support in H2 and Postgres
           b.setObject(data);
           break;
@@ -384,11 +375,6 @@ public class Binder {
           b.setObject(data, dataType);
           break;
 
-        case java.sql.Types.JAVA_OBJECT:
-          // Not too sure about this.
-          b.setObject(data);
-          break;
-
         default:
           String msg = Message.msg("persist.bind.datatype", String.valueOf(dataType), String.valueOf(b.currentPos()));
           throw new SQLException(msg);
@@ -440,12 +426,9 @@ public class Binder {
   private boolean isLob(int dbType) {
     switch (dbType) {
       case Types.CLOB:
-        return true;
-      case Types.LONGVARCHAR:
-        return true;
-      case Types.BLOB:
-        return true;
       case Types.LONGVARBINARY:
+      case Types.BLOB:
+      case Types.LONGVARCHAR:
         return true;
 
       default:
diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeContext.java b/src/main/java/io/ebeaninternal/server/persist/MergeContext.java
index d02a0944b..bdd6ce855 100644
--- a/src/main/java/io/ebeaninternal/server/persist/MergeContext.java
+++ b/src/main/java/io/ebeaninternal/server/persist/MergeContext.java
@@ -18,7 +18,7 @@ class MergeContext {
 
   private final List<EntityBean> deleteBeans = new ArrayList<>();
 
-  private boolean clientGeneratedIds;
+  private final boolean clientGeneratedIds;
 
   MergeContext(SpiEbeanServer server, SpiTransaction transaction, boolean clientGeneratedIds) {
     this.server = server;
diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java b/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java
index 5c7f74876..b2d53ba40 100644
--- a/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java
@@ -135,7 +135,7 @@ class MergeHandler {
   static MergeNode createMergeNode(String fullPath, BeanDescriptor<?> targetDesc, String path) {
 
     BeanProperty prop = targetDesc.getBeanProperty(path);
-    if (prop == null || !(prop instanceof BeanPropertyAssoc)) {
+    if (!(prop instanceof BeanPropertyAssoc)) {
       throw new PersistenceException("merge path [" + path + "] is not a ToMany or ToOne property of " + targetDesc.getFullName());
     }
     if (prop instanceof BeanPropertyAssocMany<?>) {
diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeNode.java b/src/main/java/io/ebeaninternal/server/persist/MergeNode.java
index 1bcede098..fa2dc398e 100644
--- a/src/main/java/io/ebeaninternal/server/persist/MergeNode.java
+++ b/src/main/java/io/ebeaninternal/server/persist/MergeNode.java
@@ -16,9 +16,9 @@ import java.util.Map;
  */
 abstract class MergeNode {
 
-  protected final String fullPath;
-  protected final BeanDescriptor<?> targetDescriptor;
-  protected Map<String,MergeNode> children;
+  private final String fullPath;
+  final BeanDescriptor<?> targetDescriptor;
+  private Map<String,MergeNode> children;
 
   MergeNode(String fullPath, BeanPropertyAssoc<?> property) {
     this.fullPath = fullPath;
@@ -80,7 +80,7 @@ abstract class MergeNode {
   /**
    * Cascade the merge processing if this has child nodes.
    */
-  protected void cascade(EntityBean entityBean, EntityBean outlineBean, MergeRequest request) {
+  void cascade(EntityBean entityBean, EntityBean outlineBean, MergeRequest request) {
 
     if (children != null && !children.isEmpty()) {
       MergeRequest sub = request.sub(entityBean, outlineBean);
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java b/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java
index 97e964f0c..3c007036c 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java
@@ -13,7 +13,7 @@ import java.sql.SQLException;
  * Meta data for delete handler. The meta data is for a particular bean type. It
  * is considered immutable and is thread safe.
  */
-public final class DeleteMeta {
+final class DeleteMeta {
 
   private final String sqlVersion;
   private final String sqlNone;
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
index a7a528219..58b96180b 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
@@ -30,33 +30,30 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
   /**
    * The originating request.
    */
-  protected final PersistRequestBean<?> persistRequest;
+  final PersistRequestBean<?> persistRequest;
 
-  protected final StringBuilder bindLog;
+  private final StringBuilder bindLog;
 
-  protected final SpiTransaction transaction;
+  final SpiTransaction transaction;
 
-  protected final boolean emptyStringToNull;
+  private final boolean logLevelSql;
 
-  protected final boolean logLevelSql;
-
-  protected final long now;
+  private final long now;
 
   /**
    * The PreparedStatement used for the dml.
    */
-  protected DataBind dataBind;
+  DataBind dataBind;
 
-  protected BatchedPstmt batchedPstmt;
+  BatchedPstmt batchedPstmt;
 
-  protected String sql;
+  String sql;
 
   private short batchedStatus;
 
-  protected DmlHandler(PersistRequestBean<?> persistRequest, boolean emptyStringToNull) {
+  DmlHandler(PersistRequestBean<?> persistRequest, boolean emptyStringToNull) {
     this.now = System.currentTimeMillis();
     this.persistRequest = persistRequest;
-    this.emptyStringToNull = emptyStringToNull;
     this.transaction = persistRequest.getTransaction();
     this.logLevelSql = transaction.isLogSql();
     if (logLevelSql) {
@@ -79,7 +76,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
   /**
    * Bind to the statement returning the DataBind.
    */
-  protected DataBind bind(PreparedStatement stmt) {
+  DataBind bind(PreparedStatement stmt) {
     return new DataBind(persistRequest.getDataTimeZone(), stmt, transaction.getInternalConnection());
   }
 
@@ -98,7 +95,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
   /**
    * Check the rowCount.
    */
-  protected void checkRowCount(int rowCount) throws OptimisticLockException {
+  void checkRowCount(int rowCount) throws OptimisticLockException {
     try {
       persistRequest.checkRowCount(rowCount);
       persistRequest.postExecute();
@@ -132,14 +129,6 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
     }
   }
 
-  /**
-   * Return the bind log.
-   */
-  @Override
-  public String getBindLog() {
-    return bindLog == null ? "" : bindLog.toString();
-  }
-
   /**
    * Set the Id value that was bound. This value is used for logging summary
    * level information.
@@ -152,7 +141,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
   /**
    * Log the sql to the transaction log.
    */
-  protected void logSql(String sql) {
+  void logSql(String sql) {
     if (logLevelSql) {
       switch (batchedStatus) {
         case BATCHED_FIRST: {
@@ -185,7 +174,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
       } else {
         String sval = value.toString();
         if (sval.length() > 50) {
-          bindLog.append(sval.substring(0, 47)).append("...");
+          bindLog.append(sval, 0, 47).append("...");
         } else {
           bindLog.append(sval);
         }
@@ -244,7 +233,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
   /**
    * Check with useGeneratedKeys to get appropriate PreparedStatement.
    */
-  protected PreparedStatement getPstmt(SpiTransaction t, String sql, boolean genKeys) throws SQLException {
+  PreparedStatement getPstmt(SpiTransaction t, String sql, boolean genKeys) throws SQLException {
 
     Connection conn = t.getInternalConnection();
     if (genKeys) {
@@ -261,7 +250,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
   /**
    * Return a prepared statement taking into account batch requirements.
    */
-  protected PreparedStatement getPstmt(SpiTransaction t, String sql, PersistRequestBean<?> request, boolean genKeys) throws SQLException {
+  PreparedStatement getPstmt(SpiTransaction t, String sql, PersistRequestBean<?> request, boolean genKeys) throws SQLException {
 
     BatchedPstmtHolder batch = t.getBatchControl().getPstmtHolder();
     batchedPstmt = batch.getBatchedPstmt(sql, request);
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedProperties.java b/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedProperties.java
index 3a36c0b0e..5f4090541 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedProperties.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedProperties.java
@@ -64,12 +64,12 @@ class GeneratedProperties {
       this.generatedProperty = property.getGeneratedProperty();
     }
 
-    public void preInsert(EntityBean bean, long now) {
+    void preInsert(EntityBean bean, long now) {
       Object value = generatedProperty.getInsertValue(property, bean, now);
       property.setValue(bean, value);
     }
 
-    public void preUpdate(EntityBean bean, long now) {
+    void preUpdate(EntityBean bean, long now) {
       Object value = generatedProperty.getUpdateValue(property, bean, now);
       property.setValue(bean, value);
     }
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedPropertyCollector.java b/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedPropertyCollector.java
index 08f1d054d..08036e143 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedPropertyCollector.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedPropertyCollector.java
@@ -25,7 +25,7 @@ class GeneratedPropertyCollector {
     return new GeneratedProperties(preInsert, preUpdate);
   }
 
-  void add(BeanProperty prop) {
+  private void add(BeanProperty prop) {
     GeneratedProperty gen = prop.getGeneratedProperty();
     if (gen != null) {
       if (gen.includeInInsert()) {
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java b/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java
index 58f9559c0..27860c6b8 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java
@@ -16,7 +16,7 @@ import java.sql.SQLException;
  * Meta data for insert handler. The meta data is for a particular bean type. It
  * is considered immutable and is thread safe.
  */
-public final class InsertMeta {
+final class InsertMeta {
 
   private final String sqlNullId;
   private final String sqlWithId;
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java b/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java
index 7bc370757..70196cfc4 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java
@@ -22,7 +22,7 @@ import java.util.List;
 /**
  * Factory for creating InsertMeta UpdateMeta and DeleteMeta.
  */
-public class MetaFactory {
+class MetaFactory {
 
   private final FactoryBaseProperties baseFact;
   private final FactoryEmbedded embeddedFact;
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/PersistHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/PersistHandler.java
index ec33ba500..299c5e9b1 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/PersistHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/PersistHandler.java
@@ -5,12 +5,7 @@ import java.sql.SQLException;
 /**
  * Implementation API for insert update and delete handlers.
  */
-public interface PersistHandler {
-
-  /**
-   * Return the bind log.
-   */
-  String getBindLog();
+interface PersistHandler {
 
   /**
    * Get the sql and bind the statement.
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java b/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java
index dcb07189e..5dc2752bc 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java
@@ -17,7 +17,7 @@ import java.util.List;
  * Meta data for update handler. The meta data is for a particular bean type. It
  * is considered immutable and is thread safe.
  */
-public final class UpdateMeta {
+final class UpdateMeta {
 
   private final BindableList set;
   private final BindableId id;
@@ -53,13 +53,6 @@ public final class UpdateMeta {
     return emptyStringAsNull;
   }
 
-  /**
-   * Return the base table name.
-   */
-  public String getTableName() {
-    return tableName;
-  }
-
   /**
    * Bind the request based on the concurrency mode.
    */
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/UpdatePlan.java b/src/main/java/io/ebeaninternal/server/persist/dml/UpdatePlan.java
index c641265b4..9422d83dd 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/UpdatePlan.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/UpdatePlan.java
@@ -10,7 +10,7 @@ import java.sql.SQLException;
 /**
  * Plan for executing bean updates for a given set of changed properties.
  */
-public class UpdatePlan implements SpiUpdatePlan {
+class UpdatePlan implements SpiUpdatePlan {
 
   private final String key;
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java
index bf4339410..9a9be58fc 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java
@@ -14,9 +14,9 @@ import java.util.List;
  */
 class BindableAssocOne implements Bindable {
 
-  protected final BeanPropertyAssocOne<?> assocOne;
+  final BeanPropertyAssocOne<?> assocOne;
 
-  protected final ImportedId importedId;
+  final ImportedId importedId;
 
   BindableAssocOne(BeanPropertyAssocOne<?> assocOne) {
     this.assocOne = assocOne;
@@ -55,7 +55,7 @@ class BindableAssocOne implements Bindable {
   /**
    * Bind and register a deferred relationship value.
    */
-  void registerDeferred(BindableRequest request, EntityBean bean, EntityBean assocBean) throws SQLException {
+  private void registerDeferred(BindableRequest request, EntityBean bean, EntityBean assocBean) throws SQLException {
     Object boundValue = importedId.bind(request, assocBean);
     if (boundValue == null && assocBean != null) {
       // this is the scenario for a derived foreign key
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java
index 2aee79b73..3ca0341d1 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java
@@ -30,7 +30,7 @@ public class BindableIdEmpty implements BindableId {
   }
 
   @Override
-  public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException {
+  public void dmlBind(BindableRequest request, EntityBean bean) {
     // nothing
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java
index 0d76baf3c..8716ddf91 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java
@@ -13,7 +13,7 @@ import java.util.List;
  */
 public class BindableProperty implements Bindable {
 
-  protected final BeanProperty prop;
+  final BeanProperty prop;
 
   public BindableProperty(BeanProperty prop) {
     this.prop = prop;
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyVersion.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyVersion.java
index 3d7fe1507..5cdea3e8b 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyVersion.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyVersion.java
@@ -13,7 +13,7 @@ import java.util.List;
  */
 public class BindablePropertyVersion implements Bindable {
 
-  protected final BeanProperty prop;
+  private final BeanProperty prop;
 
   public BindablePropertyVersion(BeanProperty prop) {
     this.prop = prop;
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java
index 5adf5124c..b47b4ecb6 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java
@@ -11,7 +11,7 @@ import io.ebeaninternal.server.persist.dml.DmlMode;
  * and BindablePropertyUpdateGenerated as required.
  * </p>
  */
-public class FactoryProperty {
+class FactoryProperty {
 
   private final boolean bindEncryptDataFirst;
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java
index f1ba04d9b..714e910dd 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java
@@ -9,7 +9,7 @@ class MatchedImportedFactory {
   /**
    * Create the array of matchedImportedProperty based on the properties and descriptor.
    */
-  protected static MatchedImportedProperty[] build(BeanProperty[] props, BeanDescriptor<?> desc) {
+  static MatchedImportedProperty[] build(BeanProperty[] props, BeanDescriptor<?> desc) {
 
     MatchedImportedProperty[] matches = new MatchedImportedProperty[props.length];
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java b/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java
index 30d68b757..3b5495dd6 100644
--- a/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java
+++ b/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java
@@ -52,7 +52,7 @@ abstract class AbstractMultiValueBind extends MultiValueBind {
     }
   }
 
-  protected String getArrayType(int dbType) {
+  String getArrayType(int dbType) {
     switch(dbType) {
       case TINYINT:
       case SMALLINT:
diff --git a/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java b/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java
index 41fbc3f6f..fe997312e 100644
--- a/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java
+++ b/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java
@@ -17,7 +17,7 @@ public class MultiValueBind {
     void bind(Object value) throws SQLException;
   }
 
-  protected Object[] toArray(Collection<?> values, ScalarType<?> type) {
+  Object[] toArray(Collection<?> values, ScalarType<?> type) {
     Object[] array = new Object[values.size()];
     int i = 0;
     for (Object value : values) {

From d9efeac0a159ab6b6345fd3d4c37b0b2acd1b470 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 2 Jul 2019 21:47:53 +1200
Subject: [PATCH 0932/1036] #1747 - Refactor ebeaninternal/server/persist
 remove unused emptyStringAsNull

- remove unused emptyStringAsNull
- tighten access
---
 .../server/persist/dml/DeleteHandler.java     |  2 +-
 .../server/persist/dml/DeleteMeta.java        |  9 +-----
 .../server/persist/dml/DmlBeanPersister.java  |  2 +-
 .../server/persist/dml/DmlHandler.java        |  2 +-
 .../persist/dml/GenerateDmlRequest.java       | 12 ++++----
 .../server/persist/dml/InsertHandler.java     |  2 +-
 .../server/persist/dml/InsertMeta.java        | 30 +++++--------------
 .../server/persist/dml/MetaFactory.java       | 10 ++-----
 .../server/persist/dml/UpdateHandler.java     |  2 +-
 .../server/persist/dml/UpdateMeta.java        | 15 +---------
 10 files changed, 21 insertions(+), 65 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java
index a5f65f257..e8d67baa9 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java
@@ -15,7 +15,7 @@ public class DeleteHandler extends DmlHandler {
   private final DeleteMeta meta;
 
   DeleteHandler(PersistRequestBean<?> persist, DeleteMeta meta) {
-    super(persist, meta.isEmptyStringAsNull());
+    super(persist);
     this.meta = meta;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java b/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java
index 3c007036c..b7dfc8bf9 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java
@@ -26,10 +26,7 @@ final class DeleteMeta {
 
   private final String tableName;
 
-  private final boolean emptyStringAsNull;
-
-  DeleteMeta(boolean emptyStringAsNull, BeanDescriptor<?> desc, BindableId id, Bindable version, Bindable tenantId) {
-    this.emptyStringAsNull = emptyStringAsNull;
+  DeleteMeta(BeanDescriptor<?> desc, BindableId id, Bindable version, Bindable tenantId) {
     this.tableName = desc.getBaseTable();
     this.id = id;
     this.version = version;
@@ -49,10 +46,6 @@ final class DeleteMeta {
     }
   }
 
-  boolean isEmptyStringAsNull() {
-    return emptyStringAsNull;
-  }
-
   /**
    * Return the table name.
    */
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java b/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java
index 0d62615f2..609ea3ab1 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java
@@ -26,7 +26,7 @@ public final class DmlBeanPersister implements BeanPersister {
 
   private final DeleteMeta deleteMeta;
 
-  public DmlBeanPersister(DatabasePlatform dbPlatform, UpdateMeta updateMeta, InsertMeta insertMeta, DeleteMeta deleteMeta) {
+  DmlBeanPersister(DatabasePlatform dbPlatform, UpdateMeta updateMeta, InsertMeta insertMeta, DeleteMeta deleteMeta) {
     this.dbPlatform = dbPlatform;
     this.updateMeta = updateMeta;
     this.insertMeta = insertMeta;
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
index 58b96180b..f20992d1f 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
@@ -51,7 +51,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
 
   private short batchedStatus;
 
-  DmlHandler(PersistRequestBean<?> persistRequest, boolean emptyStringToNull) {
+  DmlHandler(PersistRequestBean<?> persistRequest) {
     this.now = System.currentTimeMillis();
     this.persistRequest = persistRequest;
     this.transaction = persistRequest.getTransaction();
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/GenerateDmlRequest.java b/src/main/java/io/ebeaninternal/server/persist/dml/GenerateDmlRequest.java
index fab4485c3..5093ae111 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/GenerateDmlRequest.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/GenerateDmlRequest.java
@@ -5,8 +5,6 @@ package io.ebeaninternal.server.persist.dml;
  */
 public class GenerateDmlRequest {
 
-  private static final String IS_NULL = " is null";
-
   private final StringBuilder sb = new StringBuilder(100);
 
   private StringBuilder insertBindBuffer;
@@ -57,11 +55,11 @@ public class GenerateDmlRequest {
     }
   }
 
-  public int getBindColumnCount() {
+  int getBindColumnCount() {
     return bindColumnCount;
   }
 
-  public String getInsertBindBuffer() {
+  String getInsertBindBuffer() {
     return insertBindBuffer.toString();
   }
 
@@ -70,19 +68,19 @@ public class GenerateDmlRequest {
     return sb.toString();
   }
 
-  public void setWhereIdMode() {
+  void setWhereIdMode() {
     this.prefix = "";
     this.prefix2 = " and ";
   }
 
-  public void setInsertSetMode() {
+  void setInsertSetMode() {
     this.insertBindBuffer = new StringBuilder(100);
     this.insertMode = 1;
     this.prefix = "";
     this.prefix2 = ", ";
   }
 
-  public void setUpdateSetMode() {
+  void setUpdateSetMode() {
     this.prefix = "";
     this.prefix2 = ", ";
   }
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
index 70e2917c8..f886024c7 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
@@ -45,7 +45,7 @@ public class InsertHandler extends DmlHandler {
    * Create to handle the insert execution.
    */
   public InsertHandler(PersistRequestBean<?> persist, InsertMeta meta) {
-    super(persist, meta.isEmptyStringToNull());
+    super(persist);
     this.meta = meta;
     this.concatinatedKey = meta.isConcatenatedKey();
   }
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java b/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java
index 27860c6b8..49bfa1cde 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java
@@ -44,11 +44,7 @@ final class InsertMeta {
 
   private final String[] identityDbColumns;
 
-  private final boolean emptyStringToNull;
-
-  public InsertMeta(DatabasePlatform dbPlatform, BeanDescriptor<?> desc, Bindable shadowFKey, BindableId id, BindableList all) {
-
-    this.emptyStringToNull = dbPlatform.isTreatEmptyStringsAsNull();
+  InsertMeta(DatabasePlatform dbPlatform, BeanDescriptor<?> desc, Bindable shadowFKey, BindableId id, BindableList all) {
     this.discriminator = getDiscriminator(desc);
     this.id = id;
     this.all = all;
@@ -57,7 +53,6 @@ final class InsertMeta {
 
     String tableName = desc.getBaseTable();
     String draftTableName = desc.getDraftTable();
-
     this.sqlWithId = genSql(false, tableName, false);
     this.sqlDraftWithId = desc.isDraftable() ? genSql(false, draftTableName, true) : sqlWithId;
 
@@ -90,28 +85,17 @@ final class InsertMeta {
 
   private static Bindable getDiscriminator(BeanDescriptor<?> desc) {
     InheritInfo inheritInfo = desc.getInheritInfo();
-    if (inheritInfo != null) {
-      return new BindableDiscriminator(inheritInfo);
-    } else {
-      return null;
-    }
-  }
-
-  /**
-   * Return true if empty strings should be treated as null.
-   */
-  public boolean isEmptyStringToNull() {
-    return emptyStringToNull;
+    return inheritInfo != null ? new BindableDiscriminator(inheritInfo) : null;
   }
 
   /**
    * Return true if this is a concatenated key.
    */
-  public boolean isConcatenatedKey() {
+  boolean isConcatenatedKey() {
     return concatinatedKey;
   }
 
-  public String[] getIdentityDbColumns() {
+  String[] getIdentityDbColumns() {
     return identityDbColumns;
   }
 
@@ -119,7 +103,7 @@ final class InsertMeta {
    * Return true if we should use a SQL query to return the generated key.
    * This can not be used with JDBC batch mode.
    */
-  public boolean supportsSelectLastInsertedId() {
+  boolean supportsSelectLastInsertedId() {
     return supportsSelectLastInsertedId;
   }
 
@@ -127,14 +111,14 @@ final class InsertMeta {
    * Return true if getGeneratedKeys is supported by the underlying jdbc
    * driver and database.
    */
-  public boolean supportsGetGeneratedKeys() {
+  boolean supportsGetGeneratedKeys() {
     return supportsGetGeneratedKeys;
   }
 
   /**
    * Return true if the Id can be derived from other property values.
    */
-  public boolean deriveConcatenatedId(PersistRequestBean<?> persist) {
+  boolean deriveConcatenatedId(PersistRequestBean<?> persist) {
     return id.deriveConcatenatedId(persist);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java b/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java
index 70196cfc4..bbc795bd6 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java
@@ -39,16 +39,11 @@ class MetaFactory {
 
   private final DatabasePlatform dbPlatform;
 
-  private final boolean emptyStringAsNull;
-
   MetaFactory(DatabasePlatform dbPlatform) {
     this.dbPlatform = dbPlatform;
-    this.emptyStringAsNull = dbPlatform.isTreatEmptyStringsAsNull();
-
     // to bind encryption data before or after the encryption key
     DbEncrypt dbEncrypt = dbPlatform.getDbEncrypt();
     boolean bindEncryptDataFirst = dbEncrypt == null || dbEncrypt.isBindEncryptDataFirst();
-
     this.baseFact = new FactoryBaseProperties(bindEncryptDataFirst);
     this.embeddedFact = new FactoryEmbedded(bindEncryptDataFirst);
   }
@@ -75,7 +70,7 @@ class MetaFactory {
 
     BindableList setBindable = new BindableList(setList);
 
-    return new UpdateMeta(emptyStringAsNull, desc, setBindable, id, version, tenantId);
+    return new UpdateMeta(desc, setBindable, id, version, tenantId);
   }
 
   /**
@@ -86,8 +81,7 @@ class MetaFactory {
     BindableId id = idFact.createId(desc);
     Bindable version = versionFact.createForDelete(desc);
     Bindable tenantId = versionFact.createTenantId(desc);
-
-    return new DeleteMeta(emptyStringAsNull, desc, id, version, tenantId);
+    return new DeleteMeta(desc, id, version, tenantId);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java
index 4d3a261b4..6477c2fd3 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java
@@ -18,7 +18,7 @@ public class UpdateHandler extends DmlHandler {
   private boolean emptySetClause;
 
   UpdateHandler(PersistRequestBean<?> persist, UpdateMeta meta) {
-    super(persist, meta.isEmptyStringAsNull());
+    super(persist);
     this.meta = meta;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java b/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java
index 5dc2752bc..89c56752b 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java
@@ -24,16 +24,10 @@ final class UpdateMeta {
   private final Bindable version;
   private final Bindable tenantId;
 
-  private final String tableName;
-
   private final UpdatePlan modeNoneUpdatePlan;
   private final UpdatePlan modeVersionUpdatePlan;
 
-  private final boolean emptyStringAsNull;
-
-  UpdateMeta(boolean emptyStringAsNull, BeanDescriptor<?> desc, BindableList set, BindableId id, Bindable version, Bindable tenantId) {
-    this.emptyStringAsNull = emptyStringAsNull;
-    this.tableName = desc.getBaseTable();
+  UpdateMeta(BeanDescriptor<?> desc, BindableList set, BindableId id, Bindable version, Bindable tenantId) {
     this.set = set;
     this.id = id;
     this.version = version;
@@ -46,13 +40,6 @@ final class UpdateMeta {
     this.modeVersionUpdatePlan = new UpdatePlan(ConcurrencyMode.VERSION, sqlVersion, set);
   }
 
-  /**
-   * Return true if empty strings should be treated as null.
-   */
-  boolean isEmptyStringAsNull() {
-    return emptyStringAsNull;
-  }
-
   /**
    * Bind the request based on the concurrency mode.
    */

From 2c44c80f65e5e09a1ccb523289274d9bd613e19d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 2 Jul 2019 21:56:05 +1200
Subject: [PATCH 0933/1036] #1747 - Refactor ebeaninternal/server/persist
 remove unused part 2

---
 .../ebeaninternal/server/persist/DefaultPersister.java |  6 ++----
 .../ebeaninternal/server/persist/DeleteIdRequest.java  |  1 +
 .../io/ebeaninternal/server/persist/SaveManyBeans.java |  2 +-
 .../ebeaninternal/server/persist/dml/DeleteMeta.java   | 10 ----------
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 1b8eea7bd..6cfd8eb42 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -267,7 +267,6 @@ public final class DefaultPersister implements Persister {
 
     final BeanDescriptor<T> desc;
     final Transaction transaction;
-    final BeanProperty draftDirty;
     final List<T> draftUpdates = new ArrayList<>();
 
     /**
@@ -288,7 +287,6 @@ public final class DefaultPersister implements Persister {
     DraftHandler(BeanDescriptor<T> desc, Transaction transaction) {
       this.desc = desc;
       this.transaction = transaction;
-      this.draftDirty = desc.getDraftDirty();
     }
 
     /**
@@ -1288,8 +1286,8 @@ public final class DefaultPersister implements Persister {
     return new PersistRequestBean(server, bean, parentBean, mgr, (SpiTransaction) t, persistExecute, type, flags);
   }
 
-  <T> PersistRequestBean<T> createDeleteRemoved(T bean, Transaction t, PersistRequest.Type type, int flags) {
-    return createDeleteRequest(bean, t, type, Flags.unsetRecurse(flags));
+  <T> PersistRequestBean<T> createDeleteRemoved(T bean, Transaction t, int flags) {
+    return createDeleteRequest(bean, t, PersistRequest.Type.DELETE, Flags.unsetRecurse(flags));
   }
 
   private <T> PersistRequestBean<T> createDeleteRequest(EntityBean bean, Transaction t, Type type) {
diff --git a/src/main/java/io/ebeaninternal/server/persist/DeleteIdRequest.java b/src/main/java/io/ebeaninternal/server/persist/DeleteIdRequest.java
index 0cad9918a..e086e2630 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DeleteIdRequest.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DeleteIdRequest.java
@@ -14,6 +14,7 @@ class DeleteIdRequest implements BeanDeleteIdRequest {
   DeleteIdRequest(SpiEbeanServer server, Transaction transaction, Object id) {
     this.server = server;
     this.transaction = transaction;
+    this.id = id;
   }
 
   void setId(Object id) {
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
index 5acd88ba7..034a74910 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
@@ -356,7 +356,7 @@ public class SaveManyBeans extends SaveManyBase {
             EntityBean eb = (EntityBean) removedBean;
             if (!eb._ebean_getIntercept().isNew()) {
               // only delete if the bean was loaded meaning that it is known to exist in the DB
-              persister.deleteRequest(persister.createDeleteRemoved(removedBean, transaction, PersistRequest.Type.DELETE, request.getFlags()));
+              persister.deleteRequest(persister.createDeleteRemoved(removedBean, transaction, request.getFlags()));
             }
           }
         }
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java b/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java
index b7dfc8bf9..953c6ab84 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java
@@ -24,10 +24,7 @@ final class DeleteMeta {
   private final Bindable version;
   private final Bindable tenantId;
 
-  private final String tableName;
-
   DeleteMeta(BeanDescriptor<?> desc, BindableId id, Bindable version, Bindable tenantId) {
-    this.tableName = desc.getBaseTable();
     this.id = id;
     this.version = version;
     this.tenantId = tenantId;
@@ -46,13 +43,6 @@ final class DeleteMeta {
     }
   }
 
-  /**
-   * Return the table name.
-   */
-  public String getTableName() {
-    return tableName;
-  }
-
   /**
    * Bind the request based on the concurrency mode.
    */

From f251ca5431181ebbd4fdace2af099e12fe2b1983 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 2 Jul 2019 22:06:12 +1200
Subject: [PATCH 0934/1036] #1747 - Refactor ebeaninternal/server/persist
 remove unused part 3

---
 .../java/io/ebeaninternal/server/persist/BatchControl.java | 7 -------
 .../java/io/ebeaninternal/server/persist/BindValues.java   | 7 -------
 .../server/persist/DeleteUnloadedForeignKeys.java          | 4 ----
 .../io/ebeaninternal/server/persist/SaveManyBeans.java     | 1 -
 .../io/ebeaninternal/server/persist/dml/InsertHandler.java | 2 +-
 .../server/persist/dmlbind/BindableIdEmpty.java            | 1 -
 .../server/persist/dmlbind/MatchedImportedProperty.java    | 2 +-
 7 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchControl.java b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
index bab8a3b6c..0e9c09c19 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
@@ -108,13 +108,6 @@ public final class BatchControl {
     this.batchFlushOnMixed = flushBatchOnMixed;
   }
 
-  /**
-   * Return the batchSize.
-   */
-  public int getBatchSize() {
-    return batchSize;
-  }
-
   /**
    * Set the size of batch execution.
    * <p>
diff --git a/src/main/java/io/ebeaninternal/server/persist/BindValues.java b/src/main/java/io/ebeaninternal/server/persist/BindValues.java
index 9e297d1b2..6d71e8d79 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BindValues.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BindValues.java
@@ -15,13 +15,6 @@ class BindValues {
   public BindValues() {
   }
 
-  /**
-   * Return the number of bind values.
-   */
-  public int size() {
-    return list.size();
-  }
-
   /**
    * Add a bind value with its JDBC datatype.
    *
diff --git a/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java b/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java
index afb91da5f..c3065b779 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java
@@ -39,10 +39,6 @@ class DeleteUnloadedForeignKeys {
     this.deletePermanent = request.isHardDeleteCascade();
   }
 
-  public boolean isEmpty() {
-    return propList.isEmpty();
-  }
-
   public void add(BeanPropertyAssocOne<?> prop) {
     propList.add(prop);
   }
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
index 034a74910..b7545c163 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
@@ -4,7 +4,6 @@ import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebeaninternal.api.SpiSqlUpdate;
-import io.ebeaninternal.server.core.PersistRequest;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.deploy.BeanCollectionUtil;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
index f886024c7..7e7541557 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
@@ -106,7 +106,7 @@ public class InsertHandler extends DmlHandler {
    * Check with useGeneratedKeys to get appropriate PreparedStatement.
    */
   @Override
-  protected PreparedStatement getPstmt(SpiTransaction t, String sql, boolean useGeneratedKeys) throws SQLException {
+  PreparedStatement getPstmt(SpiTransaction t, String sql, boolean useGeneratedKeys) throws SQLException {
     Connection conn = t.getInternalConnection();
     if (useGeneratedKeys) {
       return conn.prepareStatement(sql, meta.getIdentityDbColumns());
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java
index 3ca0341d1..1f970ee25 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java
@@ -4,7 +4,6 @@ import io.ebean.bean.EntityBean;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.persist.dml.GenerateDmlRequest;
 
-import java.sql.SQLException;
 import java.util.List;
 
 public class BindableIdEmpty implements BindableId {
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedProperty.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedProperty.java
index cf0a37869..fa8497ca5 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedProperty.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedProperty.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.persist.dmlbind;
 
 import io.ebean.bean.EntityBean;
 
-public interface MatchedImportedProperty {
+interface MatchedImportedProperty {
 
   /**
    * Populate the embeddedId bean from the source entity.

From cd9a43c3ab230e7f58bf19798fc1fbd723e34199 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 2 Jul 2019 22:06:45 +1200
Subject: [PATCH 0935/1036] Bump ebean-annotation to 4.11

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c43ae66e4..0de8a9b08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.40.2-SNAPSHOT</version>
+  <version>11.41.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -117,7 +117,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>4.10</version>
+      <version>4.11</version>
     </dependency>
 
     <dependency>

From 2f8a99c3043a8a9f19f7f3f7465506032f4c3d90 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 2 Jul 2019 22:37:35 +1200
Subject: [PATCH 0936/1036] #1747 - Refactor io.ebeaninternal.server.query
 access and remove unused

---
 .../server/deploy/BeanDescriptor.java         |  5 ----
 .../server/deploy/BeanDescriptorElement.java  |  5 ----
 .../io/ebeaninternal/server/query/CQuery.java |  6 ++--
 .../server/query/CQueryBuilder.java           |  4 +--
 .../query/CQueryFetchSingleAttribute.java     |  8 +++---
 .../server/query/CQueryPlan.java              | 20 +++++--------
 .../server/query/CQueryUpdate.java            | 22 ++-------------
 .../server/query/CallableQuery.java           | 18 ++----------
 .../server/query/CallableQueryCount.java      |  2 +-
 .../server/query/CallableQueryIds.java        |  2 +-
 .../server/query/CallableQueryList.java       |  2 +-
 .../server/query/PlatformQueryPlan.java       |  2 +-
 .../server/query/QueryFutureRowCount.java     |  5 ----
 .../server/query/QueryPlanLogger.java         |  2 +-
 .../query/QueryPlanLoggerSqlServer.java       |  1 -
 .../ebeaninternal/server/query/STreeType.java |  5 ----
 .../server/query/SqlBeanLoad.java             |  7 -----
 .../server/query/SqlJoinType.java             | 13 ++-------
 .../ebeaninternal/server/query/SqlTree.java   | 27 ++----------------
 .../server/query/SqlTreeBuilder.java          |  4 +--
 .../server/query/SqlTreeNodeBean.java         | 28 +++++++++----------
 .../server/query/SqlTreeProperties.java       |  4 ---
 22 files changed, 45 insertions(+), 147 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 7e562342d..832539da7 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -2628,11 +2628,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return autoTunable;
   }
 
-  @Override
-  public boolean isElementType() {
-    return false;
-  }
-
   /**
    * Returns the Inheritance mapping information. This will be null if this type
    * of bean is not involved in any ORM inheritance mapping.
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java
index 0790ba10e..a9541e50f 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java
@@ -32,11 +32,6 @@ abstract class BeanDescriptorElement<T> extends BeanDescriptor<T> {
     return props[0].getScalarType();
   }
 
-  @Override
-  public boolean isElementType() {
-    return true;
-  }
-
   /**
    * Our entity beans used are somewhat fake ones (ElementEntityBean) such that we hold the unidirectional property
    * value (foreign key) and the actual element collection value (scalar or embedded plus map key).
diff --git a/src/main/java/io/ebeaninternal/server/query/CQuery.java b/src/main/java/io/ebeaninternal/server/query/CQuery.java
index 561b1638c..029fdf7d1 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQuery.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQuery.java
@@ -521,7 +521,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
     return result;
   }
 
-  protected EntityBean next() {
+  EntityBean next() {
     if (audit) {
       auditNextBean();
     }
@@ -532,7 +532,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
     return nextBean;
   }
 
-  protected boolean hasNext() throws SQLException {
+  boolean hasNext() throws SQLException {
 
     synchronized (this) {
       if (noMoreRows || cancelled) {
@@ -582,7 +582,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
   /**
    * Update execution stats and check for slow query.
    */
-  void updateExecutionStatistics() {
+  private void updateExecutionStatistics() {
     updateStatistics();
     request.slowQueryCheck(executionTimeMicros, rowCount);
   }
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 2212e6b87..7d19adb48 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -114,7 +114,7 @@ class CQueryBuilder {
     if (queryPlan != null) {
       // skip building the SqlTree and Sql string
       predicates.prepare(false);
-      return new CQueryUpdate(type, request, predicates, queryPlan);
+      return new CQueryUpdate(request, predicates, queryPlan);
     }
 
     predicates.prepare(true);
@@ -131,7 +131,7 @@ class CQueryBuilder {
     // cache the query plan
     queryPlan = new CQueryPlan(request, sql, sqlTree, false, predicates.getLogWhereSql());
     request.putQueryPlan(queryPlan);
-    return new CQueryUpdate(type, request, predicates, queryPlan);
+    return new CQueryUpdate(request, predicates, queryPlan);
   }
 
   private <T> String buildDeleteSql(OrmQueryRequest<T> request, String rootTableAlias, CQueryPredicates predicates, SqlTree sqlTree) {
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java b/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
index 7f0ea84e5..31c7a6602 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
@@ -84,7 +84,7 @@ class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent {
   /**
    * Return a summary description of this query.
    */
-  protected String getSummary() {
+  String getSummary() {
     StringBuilder sb = new StringBuilder(80);
     sb.append("FindAttr exeMicros[").append(executionTimeMicros)
       .append("] rows[").append(rowCount)
@@ -98,7 +98,7 @@ class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent {
   /**
    * Execute the query returning the row count.
    */
-  protected List<Object> findList() throws SQLException {
+  List<Object> findList() throws SQLException {
 
     long startNano = System.nanoTime();
     try {
@@ -136,14 +136,14 @@ class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent {
   /**
    * Return the bind log.
    */
-  protected String getBindLog() {
+  String getBindLog() {
     return bindLog;
   }
 
   /**
    * Return the generated sql.
    */
-  protected String getGeneratedSql() {
+  String getGeneratedSql() {
     return sql;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
index c630f1f3f..0faf049b9 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
@@ -27,7 +27,6 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.Collections;
 import java.util.Set;
 
 /**
@@ -53,7 +52,7 @@ public class CQueryPlan {
 
   private static final Logger logger = LoggerFactory.getLogger(CQueryPlan.class);
 
-  public static final String RESULT_SET_BASED_RAW_SQL = "--ResultSetBasedRawSql";
+  static final String RESULT_SET_BASED_RAW_SQL = "--ResultSetBasedRawSql";
 
   private final SpiEbeanServer server;
 
@@ -89,7 +88,7 @@ public class CQueryPlan {
 
   private final Class<?> beanType;
 
-  protected final DataTimeZone dataTimeZone;
+  final DataTimeZone dataTimeZone;
 
   private final int asOfTableCount;
 
@@ -143,7 +142,7 @@ public class CQueryPlan {
     this.label = query.getPlanLabel();
     this.name = deriveName(label, query.getType());
     this.location = location();
-    this.planKey = buildPlanKey(sql, false, rowNumberIncluded, logWhereSql);
+    this.planKey = buildPlanKey(sql, rowNumberIncluded, logWhereSql);
     this.autoTuned = false;
     this.asOfTableCount = 0;
     this.sql = sql;
@@ -180,9 +179,8 @@ public class CQueryPlan {
     return (profileLocation == null) ? "" : profileLocation.shortDescription();
   }
 
-  private CQueryPlanKey buildPlanKey(String sql, boolean rawSql, boolean rowNumberIncluded, String logWhereSql) {
-
-    return new RawSqlQueryPlanKey(sql, rawSql, rowNumberIncluded, logWhereSql);
+  private CQueryPlanKey buildPlanKey(String sql, boolean rowNumberIncluded, String logWhereSql) {
+    return new RawSqlQueryPlanKey(sql, false, rowNumberIncluded, logWhereSql);
   }
 
   @Override
@@ -249,10 +247,6 @@ public class CQueryPlan {
     return autoTuned;
   }
 
-  CQueryPlanKey getPlanKey() {
-    return planKey;
-  }
-
   /**
    * Return a key used in audit logging to identify the query.
    */
@@ -281,7 +275,7 @@ public class CQueryPlan {
     }
   }
 
-  public String getSqlHash() {
+  String getSqlHash() {
     return sqlHash;
   }
 
@@ -351,7 +345,7 @@ public class CQueryPlan {
     return stats.isEmpty();
   }
 
-  public TimedMetric createTimedMetric() {
+  TimedMetric createTimedMetric() {
     return MetricFactory.get().createTimedMetric(MetricType.ORM, label);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java b/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java
index 5782ae337..1570e438e 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java
@@ -34,8 +34,6 @@ class CQueryUpdate implements SpiProfileTransactionEvent {
    */
   private final String sql;
 
-  private final String type;
-
   /**
    * The statement used to create the resultSet.
    */
@@ -43,8 +41,6 @@ class CQueryUpdate implements SpiProfileTransactionEvent {
 
   private String bindLog;
 
-  private long executionTimeMicros;
-
   private int rowCount;
 
   private long profileOffset;
@@ -52,8 +48,7 @@ class CQueryUpdate implements SpiProfileTransactionEvent {
   /**
    * Create the Sql select based on the request.
    */
-  CQueryUpdate(String type, OrmQueryRequest<?> request, CQueryPredicates predicates, CQueryPlan queryPlan) {
-    this.type = type;
+  CQueryUpdate(OrmQueryRequest<?> request, CQueryPredicates predicates, CQueryPlan queryPlan) {
     this.request = request;
     this.queryPlan = queryPlan;
     this.query = request.getQuery();
@@ -63,19 +58,6 @@ class CQueryUpdate implements SpiProfileTransactionEvent {
     query.setGeneratedSql(sql);
   }
 
-  /**
-   * Return a summary description of this query.
-   */
-  public String getSummary() {
-    StringBuilder sb = new StringBuilder(80);
-    sb.append(type).append(" exeMicros[").append(executionTimeMicros)
-      .append("] rows[").append(rowCount)
-      .append("] type[").append(desc.getName())
-      .append("] predicates[").append(predicates.getLogWhereSql())
-      .append("] bind[").append(bindLog).append("]");
-    return sb.toString();
-  }
-
   /**
    * Return the bind log.
    */
@@ -109,7 +91,7 @@ class CQueryUpdate implements SpiProfileTransactionEvent {
       bindLog = predicates.bind(pstmt, conn);
       rowCount = pstmt.executeUpdate();
 
-      executionTimeMicros = (System.nanoTime() - startNano) / 1000L;
+      long executionTimeMicros = (System.nanoTime() - startNano) / 1000L;
       request.slowQueryCheck(executionTimeMicros, rowCount);
       if (queryPlan.executionTime(rowCount, executionTimeMicros, null)) {
         queryPlan.captureBindForQueryPlan(predicates, executionTimeMicros);
diff --git a/src/main/java/io/ebeaninternal/server/query/CallableQuery.java b/src/main/java/io/ebeaninternal/server/query/CallableQuery.java
index 4d29b0fe8..2a432b732 100644
--- a/src/main/java/io/ebeaninternal/server/query/CallableQuery.java
+++ b/src/main/java/io/ebeaninternal/server/query/CallableQuery.java
@@ -6,30 +6,18 @@ import io.ebeaninternal.api.SpiQuery;
 
 /**
  * Base object for making query execution into Callable's.
- *
- * @param <T> the entity bean type
- * @author rbygrave
  */
 abstract class CallableQuery<T> {
 
-  protected final SpiQuery<T> query;
+  final SpiQuery<T> query;
 
-  protected final SpiEbeanServer server;
+  final SpiEbeanServer server;
 
-  protected final Transaction transaction;
+  final Transaction transaction;
 
   CallableQuery(SpiEbeanServer server, SpiQuery<T> query, Transaction t) {
     this.server = server;
     this.query = query;
     this.transaction = t;
   }
-
-  public SpiQuery<T> getQuery() {
-    return query;
-  }
-
-  public Transaction getTransaction() {
-    return transaction;
-  }
-
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/CallableQueryCount.java b/src/main/java/io/ebeaninternal/server/query/CallableQueryCount.java
index d9486b2b1..a2076b363 100644
--- a/src/main/java/io/ebeaninternal/server/query/CallableQueryCount.java
+++ b/src/main/java/io/ebeaninternal/server/query/CallableQueryCount.java
@@ -25,7 +25,7 @@ public class CallableQueryCount<T> extends CallableQuery<T> implements Callable<
    * Execute the query returning the row count.
    */
   @Override
-  public Integer call() throws Exception {
+  public Integer call() {
     try {
       return server.findCountWithCopy(query, transaction);
     } finally {
diff --git a/src/main/java/io/ebeaninternal/server/query/CallableQueryIds.java b/src/main/java/io/ebeaninternal/server/query/CallableQueryIds.java
index fd4c3ac64..c8ae160f6 100644
--- a/src/main/java/io/ebeaninternal/server/query/CallableQueryIds.java
+++ b/src/main/java/io/ebeaninternal/server/query/CallableQueryIds.java
@@ -23,7 +23,7 @@ public class CallableQueryIds<T> extends CallableQuery<T> implements Callable<Li
    * Execute the find Id's query returning the list of Id's.
    */
   @Override
-  public List<Object> call() throws Exception {
+  public List<Object> call() {
     // we have already made a copy of the query
     // this way the same query instance is available to the
     // QueryFutureIds (as so has access to the List before it is done)
diff --git a/src/main/java/io/ebeaninternal/server/query/CallableQueryList.java b/src/main/java/io/ebeaninternal/server/query/CallableQueryList.java
index 9e638d942..b20e75a86 100644
--- a/src/main/java/io/ebeaninternal/server/query/CallableQueryList.java
+++ b/src/main/java/io/ebeaninternal/server/query/CallableQueryList.java
@@ -23,7 +23,7 @@ public class CallableQueryList<T> extends CallableQuery<T> implements Callable<L
    * Execute the query returning the resulting List.
    */
   @Override
-  public List<T> call() throws Exception {
+  public List<T> call() {
     try {
       return server.findList(query, transaction);
     } finally {
diff --git a/src/main/java/io/ebeaninternal/server/query/PlatformQueryPlan.java b/src/main/java/io/ebeaninternal/server/query/PlatformQueryPlan.java
index ad56eacb7..a0c8927f1 100644
--- a/src/main/java/io/ebeaninternal/server/query/PlatformQueryPlan.java
+++ b/src/main/java/io/ebeaninternal/server/query/PlatformQueryPlan.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.query;
 
 import io.ebean.annotation.Platform;
 
-public final class PlatformQueryPlan {
+final class PlatformQueryPlan {
 
   private static final QueryPlanLogger explainLogger = new QueryPlanLoggerExplain();
 
diff --git a/src/main/java/io/ebeaninternal/server/query/QueryFutureRowCount.java b/src/main/java/io/ebeaninternal/server/query/QueryFutureRowCount.java
index 4a8668ca8..f32506271 100644
--- a/src/main/java/io/ebeaninternal/server/query/QueryFutureRowCount.java
+++ b/src/main/java/io/ebeaninternal/server/query/QueryFutureRowCount.java
@@ -1,7 +1,6 @@
 package io.ebeaninternal.server.query;
 
 import io.ebean.FutureRowCount;
-import io.ebean.Query;
 import io.ebean.Transaction;
 
 import java.util.concurrent.FutureTask;
@@ -26,10 +25,6 @@ public class QueryFutureRowCount<T> extends BaseFuture<Integer> implements Futur
     return call.transaction;
   }
 
-  public Query<T> getQuery() {
-    return call.query;
-  }
-
   @Override
   public boolean cancel(boolean mayInterruptIfRunning) {
     call.query.cancel();
diff --git a/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java b/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java
index 0455aaa5b..52ebb6f35 100644
--- a/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java
+++ b/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java
@@ -25,7 +25,7 @@ public abstract class QueryPlanLogger {
     return createPlan(plan, bind.toString(), sb.toString());
   }
 
-  protected DQueryPlanOutput createPlan(CQueryPlan plan, String bind, String planString) {
+  DQueryPlanOutput createPlan(CQueryPlan plan, String bind, String planString) {
     return new DQueryPlanOutput(plan.getBeanType(), plan.getName(), plan.getSql(), bind, planString, plan.getProfileLocation());
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java b/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java
index ad45332cc..355494336 100644
--- a/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java
+++ b/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java
@@ -32,7 +32,6 @@ public class QueryPlanLoggerSqlServer extends QueryPlanLogger {
         String xml = null;
         if (explainStmt.getMoreResults()) {
           try (ResultSet rset = explainStmt.getResultSet()) {
-            StringBuilder sb = new StringBuilder();
             if (rset.next()) {
               xml = rset.getString(1);
             }
diff --git a/src/main/java/io/ebeaninternal/server/query/STreeType.java b/src/main/java/io/ebeaninternal/server/query/STreeType.java
index ee47e45f8..8348066ee 100644
--- a/src/main/java/io/ebeaninternal/server/query/STreeType.java
+++ b/src/main/java/io/ebeaninternal/server/query/STreeType.java
@@ -22,11 +22,6 @@ public interface STreeType {
    */
   boolean hasId();
 
-  /**
-   * Return true if the type is for ElementCollection (not mapped to an entity type/class).
-   */
-  boolean isElementType();
-
   /**
    * Return true if the type uses soft delete.
    */
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java b/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java
index 56fe4d4cd..ac1386e11 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java
@@ -49,13 +49,6 @@ public class SqlBeanLoad {
     return ctx;
   }
 
-  /**
-   * Increment the resultSet index 1.
-   */
-  public void loadIgnore(int increment) {
-    ctx.getDataReader().incrementPos(increment);
-  }
-
   public Object load(BeanProperty prop) {
 
     if (!rawSql && !prop.isLoadProperty(ctx.isDraftQuery())) {
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlJoinType.java b/src/main/java/io/ebeaninternal/server/query/SqlJoinType.java
index 0f1035ba3..8ad0d8a39 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlJoinType.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlJoinType.java
@@ -20,28 +20,21 @@ public enum SqlJoinType {
    */
   AUTO("JOIN-TYPE-AUTO-LITERAL-NOT-USED");
 
-  final String literal;
+  private final String literal;
 
   SqlJoinType(String literal) {
     this.literal = literal;
   }
 
-  /**
-   * Return the SQL join literal.
-   */
-  public String getLiteral() {
-    return literal;
-  }
-
   /**
    * Return the actual SQL join literal taking into account the current join type and the 'default
    * join type as per deployment cardinality and optionality'.
    */
   public String getLiteral(SqlJoinType deploymentJoinType) {
     if (this == SqlJoinType.AUTO) {
-      return deploymentJoinType.getLiteral();
+      return deploymentJoinType.literal;
     }
-    return this.getLiteral();
+    return this.literal;
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTree.java b/src/main/java/io/ebeaninternal/server/query/SqlTree.java
index ad9128f46..c0d6d1452 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTree.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTree.java
@@ -19,13 +19,6 @@ class SqlTree {
    */
   private final STreePropertyAssocMany manyProperty;
 
-  private final Set<String> includes;
-
-  /**
-   * Summary of the select being generated.
-   */
-  private final String summary;
-
   private final String distinctOn;
 
   private final String selectSql;
@@ -49,10 +42,9 @@ class SqlTree {
   /**
    * Create the SqlSelectClause.
    */
-  SqlTree(String summary, SqlTreeNode rootNode, String distinctOn, String selectSql, String fromSql, String groupBy, String inheritanceWhereSql,
-          STreeProperty[] encryptedProps, STreePropertyAssocMany manyProperty, Set<String> includes, boolean includeJoins) {
+  SqlTree(SqlTreeNode rootNode, String distinctOn, String selectSql, String fromSql, String groupBy, String inheritanceWhereSql,
+          STreeProperty[] encryptedProps, STreePropertyAssocMany manyProperty, boolean includeJoins) {
 
-    this.summary = summary;
     this.rootNode = rootNode;
     this.distinctOn = distinctOn;
     this.selectSql = selectSql;
@@ -61,7 +53,6 @@ class SqlTree {
     this.inheritanceWhereSql = inheritanceWhereSql;
     this.encryptedProps = encryptedProps;
     this.manyProperty = manyProperty;
-    this.includes = includes;
     this.includeJoins = includeJoins;
   }
 
@@ -102,13 +93,6 @@ class SqlTree {
     return list;
   }
 
-  /**
-   * Return the includes. Associated beans lists etc.
-   */
-  public Set<String> getIncludes() {
-    return includes;
-  }
-
   String getDistinctOn() {
     return distinctOn;
   }
@@ -138,13 +122,6 @@ class SqlTree {
     return inheritanceWhereSql;
   }
 
-  /**
-   * Return a summary of the select clause.
-   */
-  public String getSummary() {
-    return summary;
-  }
-
   SqlTreeNode getRootNode() {
     return rootNode;
   }
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 0e5891dad..42bd3f24b 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -148,9 +148,7 @@ public final class SqlTreeBuilder {
     }
 
     boolean includeJoins = alias != null && alias.isIncludeJoins();
-
-    return new SqlTree(summary.toString(), rootNode, distinctOn, selectSql, fromSql, groupBy, inheritanceWhereSql, encryptedProps,
-      manyProperty, queryDetail.getFetchPaths(), includeJoins);
+    return new SqlTree(rootNode, distinctOn, selectSql, fromSql, groupBy, inheritanceWhereSql, encryptedProps, manyProperty, includeJoins);
   }
 
   private String buildSelectClause() {
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
index eeb2a05fd..f03d60637 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
@@ -30,21 +30,21 @@ class SqlTreeNodeBean implements SqlTreeNode {
 
   private static final SqlTreeNode[] NO_CHILDREN = new SqlTreeNode[0];
 
-  protected final STreeType desc;
+  final STreeType desc;
 
   final IdBinder idBinder;
 
   /**
    * The children which will be other SelectBean or SelectProxyBean.
    */
-  protected final SqlTreeNode[] children;
+  final SqlTreeNode[] children;
 
   /**
    * Set to true if this is a partial object fetch.
    */
   private final boolean partialObject;
 
-  protected final STreeProperty[] properties;
+  private final STreeProperty[] properties;
 
   /**
    * Extra where clause added by Where annotation on associated many.
@@ -60,9 +60,9 @@ class SqlTreeNodeBean implements SqlTreeNode {
 
   private final boolean disableLazyLoad;
 
-  protected final InheritInfo inheritInfo;
+  private final InheritInfo inheritInfo;
 
-  protected final String prefix;
+  final String prefix;
 
   private final Map<String, String> pathMap;
 
@@ -134,7 +134,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
     pathMap = createPathMap(prefix, desc);
   }
 
-  protected boolean isRoot() {
+  boolean isRoot() {
     return false;
   }
 
@@ -221,8 +221,8 @@ class SqlTreeNodeBean implements SqlTreeNode {
    */
   private class LoadInherit extends Load {
 
-    LoadInherit(DbReadContext ctx, EntityBean parentBean, EntityBean contextParent) {
-      super(ctx, parentBean, contextParent);
+    LoadInherit(DbReadContext ctx, EntityBean parentBean) {
+      super(ctx, parentBean);
     }
 
     @Override
@@ -258,7 +258,6 @@ class SqlTreeNodeBean implements SqlTreeNode {
 
     final DbReadContext ctx;
     final EntityBean parentBean;
-    final EntityBean contextParent;
 
     Object lazyLoadParentId;
     Class<?> localType;
@@ -273,10 +272,9 @@ class SqlTreeNodeBean implements SqlTreeNode {
     SqlBeanLoad sqlBeanLoad;
     boolean lazyLoadMany;
 
-    Load(DbReadContext ctx, EntityBean parentBean, EntityBean contextParent) {
+    Load(DbReadContext ctx, EntityBean parentBean) {
       this.ctx = ctx;
       this.parentBean = parentBean;
-      this.contextParent = contextParent;
     }
 
     void initLazyParent() throws SQLException {
@@ -455,7 +453,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
   @Override
   public EntityBean load(DbReadContext ctx, EntityBean parentBean, EntityBean contextParent) throws SQLException {
 
-    Load load = (inheritInfo != null) ? new LoadInherit(ctx, parentBean, contextParent) : new Load(ctx, parentBean, contextParent);
+    Load load = (inheritInfo != null) ? new LoadInherit(ctx, parentBean) : new Load(ctx, parentBean);
     load.initialise();
     if (load.isLazyLoadManyRoot()) {
       return load.getContextBean();
@@ -612,7 +610,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
     }
   }
 
-  protected void appendExtraWhere(DbSqlContext ctx) {
+  void appendExtraWhere(DbSqlContext ctx) {
     if (extraWhere != null) {
       if (ctx.length() > 0) {
         ctx.append(" and");
@@ -691,7 +689,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
    * Join to base table for this node. This includes a join to the intersection
    * table if this is a ManyToMany node.
    */
-  public SqlJoinType appendFromBaseTable(DbSqlContext ctx, SqlJoinType joinType) {
+  SqlJoinType appendFromBaseTable(DbSqlContext ctx, SqlJoinType joinType) {
 
     SqlJoinType sqlJoinType = appendFromAsJoin(ctx, joinType);
     if (temporalMode != SpiQuery.TemporalMode.SOFT_DELETED && desc.isSoftDelete()) {
@@ -701,7 +699,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
     return sqlJoinType;
   }
 
-  protected SqlJoinType appendFromAsJoin(DbSqlContext ctx, SqlJoinType joinType) {
+  SqlJoinType appendFromAsJoin(DbSqlContext ctx, SqlJoinType joinType) {
 
     if (nodeBeanProp instanceof STreePropertyAssocMany) {
       STreePropertyAssocMany manyProp = (STreePropertyAssocMany) nodeBeanProp;
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
index face5d463..7a5f44a16 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
@@ -68,10 +68,6 @@ public class SqlTreeProperties {
     return !allProperties;
   }
 
-  public boolean isReadOnly() {
-    return readOnly;
-  }
-
   public void setReadOnly(boolean readOnly) {
     this.readOnly = readOnly;
   }

From f5c12a916d7fc9ae33ed228746bf15442e676f22 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 2 Jul 2019 22:58:31 +1200
Subject: [PATCH 0937/1036] #1747 - Refactor
 io.ebeaninternal.server.transaction access and remove unused

---
 .../server/core/InternalConfiguration.java    |  36 +++---
 .../DefaultTransactionScopeManager.java       |   4 -
 .../transaction/DocStoreOnlyTransaction.java  |   5 +-
 .../ExternalTransactionScopeManager.java      |   3 +-
 .../ImplicitReadOnlyTransaction.java          |   8 +-
 .../server/transaction/JdbcTransaction.java   | 108 +++++++++---------
 .../transaction/JtaTransactionManager.java    |  18 +--
 .../transaction/NoopPersistenceContext.java   |  60 ----------
 .../transaction/TransactionManager.java       |  87 ++++++--------
 .../transaction/TransactionScopeManager.java  |   6 -
 10 files changed, 122 insertions(+), 213 deletions(-)
 delete mode 100644 src/main/java/io/ebeaninternal/server/transaction/NoopPersistenceContext.java

diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index cd3ab2e1c..1139eede1 100644
--- a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -163,7 +163,7 @@ public class InternalConfiguration {
 
   private final SpiLogManager logManager;
 
-  public InternalConfiguration(boolean online, ClusterManager clusterManager, SpiBackgroundExecutor backgroundExecutor,
+  InternalConfiguration(boolean online, ClusterManager clusterManager, SpiBackgroundExecutor backgroundExecutor,
                                ServerConfig serverConfig, BootupClasses bootupClasses) {
 
     this.online = online;
@@ -237,7 +237,7 @@ public class InternalConfiguration {
     return docStoreFactory;
   }
 
-  public ClockService getClockService() {
+  ClockService getClockService() {
     return clockService;
   }
 
@@ -292,7 +292,7 @@ public class InternalConfiguration {
   /**
    * Return the ReadAuditLogger implementation to use.
    */
-  public ReadAuditLogger getReadAuditLogger() {
+  ReadAuditLogger getReadAuditLogger() {
     ReadAuditLogger found = bootupClasses.getReadAuditLogger();
     return plugin(found != null ? found : new DefaultReadAuditLogger());
   }
@@ -300,7 +300,7 @@ public class InternalConfiguration {
   /**
    * Return the ReadAuditPrepare implementation to use.
    */
-  public ReadAuditPrepare getReadAuditPrepare() {
+  ReadAuditPrepare getReadAuditPrepare() {
     ReadAuditPrepare found = bootupClasses.getReadAuditPrepare();
     return plugin(found != null ? found : new DefaultReadAuditPrepare());
   }
@@ -334,27 +334,27 @@ public class InternalConfiguration {
     return new MultiValueBind();
   }
 
-  public SpiJsonContext createJsonContext(SpiEbeanServer server) {
+  SpiJsonContext createJsonContext(SpiEbeanServer server) {
     return new DJsonContext(server, jsonFactory, typeManager);
   }
 
-  public AutoTuneService createAutoTuneService(SpiEbeanServer server) {
+  AutoTuneService createAutoTuneService(SpiEbeanServer server) {
     return AutoTuneServiceFactory.create(server, serverConfig);
   }
 
-  public DtoQueryEngine createDtoQueryEngine() {
+  DtoQueryEngine createDtoQueryEngine() {
     return new DtoQueryEngine(binder);
   }
 
-  public RelationalQueryEngine createRelationalQueryEngine() {
+  RelationalQueryEngine createRelationalQueryEngine() {
     return new DefaultRelationalQueryEngine(binder, serverConfig.getDatabaseBooleanTrue(), serverConfig.getPlatformConfig().getDbUuid().useBinaryOptimized());
   }
 
-  public OrmQueryEngine createOrmQueryEngine() {
+  OrmQueryEngine createOrmQueryEngine() {
     return new DefaultOrmQueryEngine(cQueryEngine, binder);
   }
 
-  public Persister createPersister(SpiEbeanServer server) {
+  Persister createPersister(SpiEbeanServer server) {
     return new DefaultPersister(server, binder, beanDescriptorManager);
   }
 
@@ -382,7 +382,7 @@ public class InternalConfiguration {
     return binder;
   }
 
-  public BeanDescriptorManager getBeanDescriptorManager() {
+  BeanDescriptorManager getBeanDescriptorManager() {
     return beanDescriptorManager;
   }
 
@@ -398,7 +398,7 @@ public class InternalConfiguration {
     return deployUtil;
   }
 
-  public CQueryEngine getCQueryEngine() {
+  CQueryEngine getCQueryEngine() {
     return cQueryEngine;
   }
 
@@ -414,14 +414,14 @@ public class InternalConfiguration {
   /**
    * Create the DocStoreIntegration components for the given server.
    */
-  public DocStoreIntegration createDocStoreIntegration(SpiServer server) {
+  DocStoreIntegration createDocStoreIntegration(SpiServer server) {
     return plugin(docStoreFactory.create(server));
   }
 
   /**
    * Create the TransactionManager taking into account autoCommit mode.
    */
-  public TransactionManager createTransactionManager(DocStoreUpdateProcessor indexUpdateProcessor) {
+  TransactionManager createTransactionManager(DocStoreUpdateProcessor indexUpdateProcessor) {
 
     TransactionScopeManager scopeManager = createTransactionScopeManager();
     boolean notifyL2CacheInForeground = cacheManager.isLocalL2Caching() || serverConfig.isNotifyL2CacheInForeground();
@@ -496,9 +496,9 @@ public class InternalConfiguration {
     }
     if (externalTransactionManager != null) {
       logger.info("Using Transaction Manager [" + externalTransactionManager.getClass() + "]");
-      return new ExternalTransactionScopeManager(serverConfig.getName(), externalTransactionManager);
+      return new ExternalTransactionScopeManager(externalTransactionManager);
     } else {
-      return new DefaultTransactionScopeManager(serverConfig.getName());
+      return new DefaultTransactionScopeManager();
     }
   }
 
@@ -559,11 +559,11 @@ public class InternalConfiguration {
     return multiValueBind;
   }
 
-  public DtoBeanManager getDtoBeanManager() {
+  DtoBeanManager getDtoBeanManager() {
     return dtoBeanManager;
   }
 
-  public SpiLogManager getLogManager() {
+  SpiLogManager getLogManager() {
     return logManager;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java
index 0134ff5ed..0cabba365 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java
@@ -12,10 +12,6 @@ public class DefaultTransactionScopeManager extends TransactionScopeManager {
 
   private final ThreadLocal<SpiTransaction> local = new ThreadLocal<>();
 
-  public DefaultTransactionScopeManager(String serverName) {
-    super(serverName);
-  }
-
   @Override
   public void register(TransactionManager manager) {
     // do nothing
diff --git a/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java
index 4bb23735e..43fb216a5 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java
@@ -1,7 +1,6 @@
 package io.ebeaninternal.server.transaction;
 
 import java.sql.Connection;
-import java.sql.SQLException;
 
 /**
  * Document store only transaction.
@@ -41,12 +40,12 @@ public class DocStoreOnlyTransaction extends JdbcTransaction {
   }
 
   @Override
-  protected void performRollback() throws SQLException {
+  protected void performRollback() {
     // do nothing (could perhaps throw not supported exception)
   }
 
   @Override
-  protected void performCommit() throws SQLException {
+  protected void performCommit() {
     if (docStoreTxn != null) {
       manager.docStoreUpdateProcessor.commit(docStoreTxn);
     }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java b/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java
index ffa3bdb1e..b033e277b 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java
@@ -13,8 +13,7 @@ public class ExternalTransactionScopeManager extends DefaultTransactionScopeMana
   /**
    * Instantiates  transaction scope manager.
    */
-  public ExternalTransactionScopeManager(String serverName, ExternalTransactionManager externalManager) {
-    super(serverName);
+  public ExternalTransactionScopeManager(ExternalTransactionManager externalManager) {
     this.externalManager = externalManager;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
index 9e0822e15..b43fa2190 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
@@ -47,24 +47,24 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   /**
    * The status of the transaction.
    */
-  protected boolean active;
+  private boolean active;
 
   /**
    * The underlying Connection which is expected to use autoCommit such that we avoid the
    * explicit commit call at the end of the 'transaction' (for performance).
    */
-  protected Connection connection;
+  private Connection connection;
 
   /**
    * Holder of the objects fetched to ensure unique objects are used.
    */
-  protected PersistenceContext persistenceContext;
+  private PersistenceContext persistenceContext;
 
   private Object tenantId;
 
   private Map<String, Object> userObjects;
 
-  private long startNanos;
+  private final long startNanos;
 
   /**
    * Create without a tenantId.
diff --git a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index fceefc682..20b93bd82 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -35,7 +35,7 @@ import java.util.Map;
 /**
  * JDBC Connection based transaction.
  */
-public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
+class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
 
   private static final Logger logger = LoggerFactory.getLogger(JdbcTransaction.class);
 
@@ -46,12 +46,12 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   /**
    * The associated TransactionManager.
    */
-  protected final TransactionManager manager;
+  final TransactionManager manager;
 
   /**
    * The transaction id.
    */
-  protected final String id;
+  private final String id;
 
   private final boolean logSql;
   private final boolean logSummary;
@@ -59,137 +59,137 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   /**
    * The user defined label to group execution statistics.
    */
-  protected String label;
+  private String label;
 
   /**
    * Flag to indicate if this was an explicitly created Transaction.
    */
-  protected final boolean explicit;
+  private final boolean explicit;
 
   /**
    * Behaviour for ending query only transactions.
    */
-  protected final OnQueryOnly onQueryOnly;
+  private final OnQueryOnly onQueryOnly;
 
   /**
    * The status of the transaction.
    */
-  protected boolean active;
+  private boolean active;
 
-  protected boolean rollbackOnly;
+  private boolean rollbackOnly;
 
-  protected boolean nestedUseSavepoint;
+  private boolean nestedUseSavepoint;
 
   /**
    * The underlying Connection.
    */
-  protected Connection connection;
+  Connection connection;
 
   /**
    * Used to queue up persist requests for batch execution.
    */
-  protected BatchControl batchControl;
+  private BatchControl batchControl;
 
   /**
    * The event which holds persisted beans.
    */
-  protected TransactionEvent event;
+  private TransactionEvent event;
 
   /**
    * Holder of the objects fetched to ensure unique objects are used.
    */
-  protected PersistenceContext persistenceContext;
+  private PersistenceContext persistenceContext;
 
   /**
    * Used to give developers more control over the insert update and delete
    * functionality.
    */
-  protected boolean persistCascade = true;
+  private boolean persistCascade = true;
 
   /**
    * Flag used for performance to skip commit or rollback of query only
    * transactions in read committed transaction isolation.
    */
-  protected boolean queryOnly = true;
+  private boolean queryOnly = true;
 
-  protected boolean localReadOnly;
+  private boolean localReadOnly;
 
-  protected Boolean updateAllLoadedProperties;
+  private Boolean updateAllLoadedProperties;
 
-  protected boolean oldBatchMode;
+  private boolean oldBatchMode;
 
-  protected boolean batchMode;
+  private boolean batchMode;
 
-  protected boolean batchOnCascadeMode;
+  private boolean batchOnCascadeMode;
 
-  protected int batchSize = -1;
+  private int batchSize = -1;
 
-  protected boolean batchFlushOnQuery = true;
+  private boolean batchFlushOnQuery = true;
 
-  protected Boolean batchGetGeneratedKeys;
+  private Boolean batchGetGeneratedKeys;
 
-  protected Boolean batchFlushOnMixed;
+  private Boolean batchFlushOnMixed;
 
-  protected String logPrefix;
+  private String logPrefix;
 
   private Object tenantId;
 
   /**
    * The depth used by batch processing to help the ordering of statements.
    */
-  protected int depth;
+  private int depth;
 
   /**
    * Set to true if the connection has autoCommit=true initially.
    */
-  protected boolean autoCommit;
+  private boolean autoCommit;
 
-  protected IdentityHashMap<Object, Object> persistingBeans;
+  private IdentityHashMap<Object, Object> persistingBeans;
 
-  protected HashSet<Integer> deletingBeansHash;
+  private HashSet<Integer> deletingBeansHash;
 
-  protected HashMap<String, String> m2mIntersectionSave;
+  private HashMap<String, String> m2mIntersectionSave;
 
-  protected Map<String, Object> userObjects;
+  private Map<String, Object> userObjects;
 
-  protected List<TransactionCallback> callbackList;
+  private List<TransactionCallback> callbackList;
 
-  protected boolean batchOnCascadeSet;
+  private boolean batchOnCascadeSet;
 
-  protected TChangeLogHolder changeLogHolder;
+  private TChangeLogHolder changeLogHolder;
 
-  protected List<PersistDeferredRelationship> deferredList;
+  private List<PersistDeferredRelationship> deferredList;
 
   /**
    * The mode for updating doc store indexes for this transaction.
    * Only set when you want to override the default behavior.
    */
-  protected DocStoreMode docStoreMode;
+  private DocStoreMode docStoreMode;
 
-  protected int docStoreBatchSize;
+  private int docStoreBatchSize;
 
   /**
    * Explicit control over skipCache.
    */
-  protected Boolean skipCache;
+  private Boolean skipCache;
 
   /**
    * Default skip cache behavior from {@link ServerConfig#isSkipCacheAfterWrite()}.
    */
-  protected final boolean skipCacheAfterWrite;
+  private final boolean skipCacheAfterWrite;
 
-  protected DocStoreTransaction docStoreTxn;
+  DocStoreTransaction docStoreTxn;
 
   private ProfileStream profileStream;
 
-  protected ProfileLocation profileLocation;
+  private ProfileLocation profileLocation;
 
-  protected final long startNanos;
+  private final long startNanos;
 
   /**
    * Create a new JdbcTransaction.
    */
-  public JdbcTransaction(String id, boolean explicit, Connection connection, TransactionManager manager) {
+  JdbcTransaction(String id, boolean explicit, Connection connection, TransactionManager manager) {
     try {
       this.active = true;
       this.id = id;
@@ -273,7 +273,7 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   /**
    * Overridden in AutoCommitJdbcTransaction as that expects to run/operate with autocommit true.
    */
-  protected void checkAutoCommit(Connection connection) throws SQLException {
+  void checkAutoCommit(Connection connection) throws SQLException {
     if (connection != null) {
       this.autoCommit = connection.getAutoCommit();
       if (this.autoCommit) {
@@ -341,7 +341,7 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
     callbackList.add(callback);
   }
 
-  protected void firePreRollback() {
+  private void firePreRollback() {
     if (callbackList != null) {
       for (TransactionCallback callback : callbackList) {
         try {
@@ -353,7 +353,7 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
     }
   }
 
-  protected void firePostRollback() {
+  private void firePostRollback() {
     if (callbackList != null) {
       for (TransactionCallback callback : callbackList) {
         try {
@@ -368,7 +368,7 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
     }
   }
 
-  protected void firePreCommit() {
+  private void firePreCommit() {
     if (callbackList != null) {
       for (TransactionCallback callback : callbackList) {
         try {
@@ -380,7 +380,7 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
     }
   }
 
-  protected void firePostCommit() {
+  private void firePostCommit() {
     if (callbackList != null) {
       for (TransactionCallback callback : callbackList) {
         try {
@@ -895,7 +895,7 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
     return getInternalConnection();
   }
 
-  protected void deactivate() {
+  void deactivate() {
     try {
       if (localReadOnly) {
         // reset readOnly status prior to returning to pool
@@ -927,7 +927,7 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   /**
    * Notify the transaction manager.
    */
-  protected void notifyCommit() {
+  void notifyCommit() {
     if (manager != null) {
       if (queryOnly) {
         manager.notifyOfQueryOnly(this);
@@ -940,7 +940,7 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   /**
    * Rollback or Commit for query only transaction.
    */
-  protected void connectionEndForQueryOnly() {
+  private void connectionEndForQueryOnly() {
     try {
       if (onQueryOnly == OnQueryOnly.COMMIT) {
         performCommit();
@@ -955,7 +955,7 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   /**
    * Perform the actual rollback on the connection.
    */
-  protected void performRollback() throws SQLException {
+  void performRollback() throws SQLException {
     long offset = profileOffset();
     connection.rollback();
     if (profileStream != null) {
@@ -966,7 +966,7 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   /**
    * Perform the actual commit on the connection.
    */
-  protected void performCommit() throws SQLException {
+  void performCommit() throws SQLException {
     long offset = profileOffset();
     connection.commit();
     if (profileStream != null) {
@@ -1071,7 +1071,7 @@ public class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   /**
    * Notify the transaction manager.
    */
-  protected void notifyRollback(Throwable cause) {
+  void notifyRollback(Throwable cause) {
     if (manager != null) {
       if (queryOnly) {
         manager.notifyOfQueryOnly(this);
diff --git a/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java
index 0bfd76e4f..3fbed7d84 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java
@@ -10,13 +10,8 @@ import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
 import javax.transaction.Status;
 import javax.transaction.Synchronization;
-import javax.transaction.SystemException;
 import javax.transaction.TransactionSynchronizationRegistry;
 import javax.transaction.UserTransaction;
 
@@ -149,29 +144,28 @@ public class JtaTransactionManager implements ExternalTransactionManager {
   private static class DummyUserTransaction implements UserTransaction {
 
     @Override
-    public void begin() throws NotSupportedException, SystemException {
+    public void begin() {
     }
 
     @Override
-    public void commit() throws RollbackException, HeuristicMixedException, HeuristicRollbackException,
-      SecurityException, IllegalStateException, SystemException {
+    public void commit() throws SecurityException, IllegalStateException {
     }
 
     @Override
-    public int getStatus() throws SystemException {
+    public int getStatus() {
       return 0;
     }
 
     @Override
-    public void rollback() throws IllegalStateException, SecurityException, SystemException {
+    public void rollback() throws IllegalStateException, SecurityException {
     }
 
     @Override
-    public void setRollbackOnly() throws IllegalStateException, SystemException {
+    public void setRollbackOnly() throws IllegalStateException {
     }
 
     @Override
-    public void setTransactionTimeout(int seconds) throws SystemException {
+    public void setTransactionTimeout(int seconds) {
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/transaction/NoopPersistenceContext.java b/src/main/java/io/ebeaninternal/server/transaction/NoopPersistenceContext.java
deleted file mode 100644
index e66dc8512..000000000
--- a/src/main/java/io/ebeaninternal/server/transaction/NoopPersistenceContext.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.ebeaninternal.server.transaction;
-
-import io.ebean.bean.PersistenceContext;
-
-/**
- * PersistenceContext used with scope of NONE.
- * <p>
- * When used effectively means no PersistenceContext is used at all. This is not expected to be used much and
- * actually is not recommended.
- */
-public class NoopPersistenceContext implements PersistenceContext {
-
-  @Override
-  public void put(Class<?> rootType, Object id, Object bean) {
-    // do nothing
-  }
-
-  @Override
-  public Object putIfAbsent(Class<?> rootType, Object id, Object bean) {
-    // do nothing
-    return null;
-  }
-
-  @Override
-  public Object get(Class<?> beanType, Object uid) {
-    // do nothing, return null
-    return null;
-  }
-
-  @Override
-  public WithOption getWithOption(Class<?> beanType, Object uid) {
-    // do nothing, return null
-    return null;
-  }
-
-  @Override
-  public void clear() {
-    // do nothing
-  }
-
-  @Override
-  public void clear(Class<?> beanType) {
-    // do nothing
-  }
-
-  @Override
-  public void clear(Class<?> beanType, Object uid) {
-    // do nothing
-  }
-
-  @Override
-  public void deleted(Class<?> beanType, Object id) {
-    // do nothing
-  }
-
-  @Override
-  public int size(Class<?> beanType) {
-    return 0;
-  }
-}
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index c1d5aadd9..8b5c87671 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -30,7 +30,6 @@ import io.ebeaninternal.api.TransactionEventTable;
 import io.ebeaninternal.api.TransactionEventTable.TableIUD;
 import io.ebeaninternal.server.cache.CacheChangeSet;
 import io.ebeaninternal.server.cluster.ClusterManager;
-import io.ebeaninternal.server.core.ClockService;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
 import io.ebeaninternal.server.profile.TimedProfileLocation;
 import io.ebeaninternal.server.profile.TimedProfileLocationRegistry;
@@ -57,9 +56,9 @@ public class TransactionManager implements SpiTransactionManager {
 
   private static final Logger logger = LoggerFactory.getLogger(TransactionManager.class);
 
-  public static final Logger clusterLogger = LoggerFactory.getLogger("io.ebean.Cluster");
+  private static final Logger clusterLogger = LoggerFactory.getLogger("io.ebean.Cluster");
 
-  protected final BeanDescriptorManager beanDescriptorManager;
+  private final BeanDescriptorManager beanDescriptorManager;
 
   /**
    * Ebean defaults this to true but for EJB compatible behaviour set this to
@@ -70,39 +69,39 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Prefix for transaction id's (logging).
    */
-  protected final String prefix;
+  final String prefix;
 
-  protected final String externalTransPrefix;
+  private final String externalTransPrefix;
 
   /**
    * The dataSource of connections.
    */
-  protected final DataSourceSupplier dataSourceSupplier;
+  private final DataSourceSupplier dataSourceSupplier;
 
   /**
    * Flag to indicate the default Isolation is READ COMMITTED. This enables us
    * to close queryOnly transactions rather than commit or rollback them.
    */
-  protected final OnQueryOnly onQueryOnly;
+  private final OnQueryOnly onQueryOnly;
 
-  protected final BackgroundExecutor backgroundExecutor;
+  private final BackgroundExecutor backgroundExecutor;
 
-  protected final ClusterManager clusterManager;
+  private final ClusterManager clusterManager;
 
-  protected final String serverName;
+  private final String serverName;
 
-  protected final boolean docStoreActive;
+  private final boolean docStoreActive;
 
   /**
    * The elastic search index update processor.
    */
-  protected final DocStoreUpdateProcessor docStoreUpdateProcessor;
+  final DocStoreUpdateProcessor docStoreUpdateProcessor;
 
-  protected final boolean persistBatch;
+  private final boolean persistBatch;
 
-  protected final boolean persistBatchOnCascade;
+  private final boolean persistBatchOnCascade;
 
-  protected final BulkEventListenerMap bulkEventListenerMap;
+  private final BulkEventListenerMap bulkEventListenerMap;
 
   /**
    * Used to prepare the change set setting user context information in the
@@ -120,9 +119,9 @@ public class TransactionManager implements SpiTransactionManager {
    */
   private final boolean changeLogAsync;
 
-  protected final boolean notifyL2CacheInForeground;
+  final boolean notifyL2CacheInForeground;
 
-  protected final boolean viewInvalidation;
+  private final boolean viewInvalidation;
 
   private final boolean skipCacheAfterWrite;
 
@@ -142,7 +141,6 @@ public class TransactionManager implements SpiTransactionManager {
 
   private final TableModState tableModState;
   private final ServerCacheNotify cacheNotify;
-  private final ClockService clockService;
 
   /**
    * Create the TransactionManager
@@ -167,7 +165,6 @@ public class TransactionManager implements SpiTransactionManager {
     this.scopeManager = options.scopeManager;
     this.tableModState = options.tableModState;
     this.cacheNotify = options.cacheNotify;
-    this.clockService = options.clockService;
     this.backgroundExecutor = options.backgroundExecutor;
     this.dataSourceSupplier = options.dataSourceSupplier;
     this.docStoreActive = options.config.getDocStoreConfig().isActive();
@@ -189,13 +186,6 @@ public class TransactionManager implements SpiTransactionManager {
     scopeManager.register(this);
   }
 
-  /**
-   * Return the NOW timestamp in epoch millis.
-   */
-  public long clockNowMillis() {
-    return clockService.nowMillis();
-  }
-
   /**
    * Create a new scoped transaction.
    */
@@ -228,7 +218,7 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Return the current active transaction as a scoped transaction.
    */
-  public ScopedTransaction getActiveScoped() {
+  private ScopedTransaction getActiveScoped() {
     return (ScopedTransaction) scopeManager.getActive();
   }
 
@@ -252,15 +242,15 @@ public class TransactionManager implements SpiTransactionManager {
     }
   }
 
-  public boolean isDocStoreActive() {
+  boolean isDocStoreActive() {
     return docStoreActive;
   }
 
-  public DocStoreTransaction createDocStoreTransaction(int docStoreBatchSize) {
+  DocStoreTransaction createDocStoreTransaction(int docStoreBatchSize) {
     return docStoreUpdateProcessor.createTransaction(docStoreBatchSize);
   }
 
-  public boolean isSkipCacheAfterWrite() {
+  boolean isSkipCacheAfterWrite() {
     return skipCacheAfterWrite;
   }
 
@@ -268,11 +258,11 @@ public class TransactionManager implements SpiTransactionManager {
     return beanDescriptorManager;
   }
 
-  public BulkEventListenerMap getBulkEventListenerMap() {
+  BulkEventListenerMap getBulkEventListenerMap() {
     return bulkEventListenerMap;
   }
 
-  public boolean getPersistBatch() {
+  boolean getPersistBatch() {
     return persistBatch;
   }
 
@@ -292,7 +282,7 @@ public class TransactionManager implements SpiTransactionManager {
    * just for queries do need to be committed or rollback after the query.
    * </p>
    */
-  protected OnQueryOnly initOnQueryOnly(OnQueryOnly dbPlatformOnQueryOnly) {
+  OnQueryOnly initOnQueryOnly(OnQueryOnly dbPlatformOnQueryOnly) {
 
     // first check for a system property 'override'
     String systemPropertyValue = System.getProperty("ebean.transaction.onqueryonly");
@@ -321,7 +311,7 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Defines the type of behavior to use when closing a transaction that was used to query data only.
    */
-  public OnQueryOnly getOnQueryOnly() {
+  OnQueryOnly getOnQueryOnly() {
     return onQueryOnly;
   }
 
@@ -329,14 +319,13 @@ public class TransactionManager implements SpiTransactionManager {
    * Wrap the externally supplied Connection.
    */
   public SpiTransaction wrapExternalConnection(Connection c) {
-
     return wrapExternalConnection(externalTransPrefix + c.hashCode(), c);
   }
 
   /**
    * Wrap an externally supplied Connection with a known transaction id.
    */
-  public SpiTransaction wrapExternalConnection(String id, Connection c) {
+  private SpiTransaction wrapExternalConnection(String id, Connection c) {
 
     ExternalJdbcTransaction t = new ExternalJdbcTransaction(id, true, c, this);
 
@@ -363,7 +352,7 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Create a new transaction.
    */
-  protected SpiTransaction createTransaction(boolean explicit, Connection c, long id) {
+  SpiTransaction createTransaction(boolean explicit, Connection c, long id) {
 
     return new JdbcTransaction(prefix + id, explicit, c, this);
   }
@@ -371,7 +360,7 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Process a local rolled back transaction.
    */
-  public void notifyOfRollback(SpiTransaction transaction, Throwable cause) {
+  void notifyOfRollback(SpiTransaction transaction, Throwable cause) {
 
     try {
       if (txnLogger.isDebug()) {
@@ -390,7 +379,7 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Query only transaction in read committed isolation.
    */
-  public void notifyOfQueryOnly(SpiTransaction transaction) {
+  void notifyOfQueryOnly(SpiTransaction transaction) {
 
     // Nothing that interesting here
     if (txnLogger.isTrace()) {
@@ -425,7 +414,7 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Process a local committed transaction.
    */
-  public void notifyOfCommit(SpiTransaction transaction) {
+  void notifyOfCommit(SpiTransaction transaction) {
 
     try {
       if (txnLogger.isDebug()) {
@@ -498,14 +487,14 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Process the docstore / ElasticSearch updates.
    */
-  public void processDocStoreUpdates(DocStoreUpdates docStoreUpdates, int bulkBatchSize) {
+  void processDocStoreUpdates(DocStoreUpdates docStoreUpdates, int bulkBatchSize) {
     docStoreUpdateProcessor.process(docStoreUpdates, bulkBatchSize);
   }
 
   /**
    * Prepare and then send/log the changeSet.
    */
-  public void sendChangeLog(final ChangeSet changeSet) {
+  void sendChangeLog(final ChangeSet changeSet) {
 
     // can set userId, userIpAddress & userContext if desired
     if (changeLogPrepare.prepare(changeSet)) {
@@ -522,7 +511,7 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Invalidate the query caches for entities based on views.
    */
-  public void processTouchedTables(Set<String> touchedTables) {
+  void processTouchedTables(Set<String> touchedTables) {
     tableModState.touch(touchedTables);
     if (viewInvalidation) {
       beanDescriptorManager.processViewInvalidation(touchedTables);
@@ -533,28 +522,28 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Process the collected transaction profiling information.
    */
-  public void profileCollect(TransactionProfile transactionProfile) {
+  void profileCollect(TransactionProfile transactionProfile) {
     profileHandler.collectTransactionProfile(transactionProfile);
   }
 
   /**
    * Collect execution time for an explicit transaction.
    */
-  public void collectMetric(long exeMicros) {
+  void collectMetric(long exeMicros) {
     txnMain.add(exeMicros);
   }
 
   /**
    * Collect execution time for implicit read only transaction.
    */
-  public void collectMetricReadOnly(long exeMicros) {
+  void collectMetricReadOnly(long exeMicros) {
     txnReadOnly.add(exeMicros);
   }
 
   /**
    * Collect execution time for a named transaction.
    */
-  public void collectMetricNamed(long exeMicros, String label) {
+  void collectMetricNamed(long exeMicros, String label) {
     txnNamed.add(label, exeMicros);
   }
 
@@ -712,6 +701,7 @@ public class TransactionManager implements SpiTransactionManager {
   private boolean isCreateNewTransaction(SpiTransaction current, TxType type) {
     switch (type) {
       case REQUIRED:
+      case SUPPORTS:
         return current == null;
 
       case REQUIRES_NEW:
@@ -723,9 +713,6 @@ public class TransactionManager implements SpiTransactionManager {
         }
         return false;
 
-      case SUPPORTS:
-        return current == null;
-
       case NEVER:
         if (current != null) {
           throw new PersistenceException("Transaction exists for Transactional NEVER");
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java
index ac5ce6616..0034ca2e4 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java
@@ -8,12 +8,6 @@ import io.ebeaninternal.api.SpiTransactionScopeManager;
  */
 public abstract class TransactionScopeManager implements SpiTransactionScopeManager {
 
-  protected final String serverName;
-
-  public TransactionScopeManager(String serverName) {
-    this.serverName = serverName;
-  }
-
   /**
    * Register the transaction manager (for use by external transaction scopes).
    */

From 8b18b2a20eae9312c2c4bb35cd74994aecef042e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 2 Jul 2019 23:10:21 +1200
Subject: [PATCH 0938/1036] #1747 - Refactor io.ebeaninternal.server.query
 invert boolean methods

---
 .../ebeaninternal/server/query/CQueryBuilder.java  | 14 +++++++-------
 .../server/query/CQueryBuilderRawSql.java          | 14 +++++++-------
 .../io/ebeaninternal/server/query/SqlTree.java     |  8 ++++----
 .../ebeaninternal/server/query/SqlTreeBuilder.java | 10 ++--------
 4 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 7d19adb48..2e1511548 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -137,7 +137,7 @@ class CQueryBuilder {
   private <T> String buildDeleteSql(OrmQueryRequest<T> request, String rootTableAlias, CQueryPredicates predicates, SqlTree sqlTree) {
 
     String alias = alias(rootTableAlias);
-    if (!sqlTree.isIncludeJoins()) {
+    if (sqlTree.noJoins()) {
       if (dbPlatform.isSupportsDeleteTableAlias()) {
         // delete from table <alias> ...
         return aliasReplace(buildSql("delete", request, predicates, sqlTree).getSql(), alias);
@@ -169,7 +169,7 @@ class CQueryBuilder {
     sb.append(" set ").append(predicates.getDbUpdateClause());
     String updateClause = sb.toString();
 
-    if (!sqlTree.isIncludeJoins()) {
+    if (sqlTree.noJoins()) {
       // simple - update table set ... where ...
       return aliasStrip(buildSqlUpdate(updateClause, request, predicates, sqlTree).getSql());
     }
@@ -645,7 +645,7 @@ class CQueryBuilder {
     }
 
     String dbWhere = predicates.getDbWhere();
-    if (!isEmpty(dbWhere)) {
+    if (hasValue(dbWhere)) {
       if (!hasWhere) {
         hasWhere = true;
         sb.append(" where ");
@@ -656,7 +656,7 @@ class CQueryBuilder {
     }
 
     String dbFilterMany = predicates.getDbFilterMany();
-    if (!isEmpty(dbFilterMany)) {
+    if (hasValue(dbFilterMany)) {
       if (!hasWhere) {
         hasWhere = true;
         sb.append(" where ");
@@ -689,7 +689,7 @@ class CQueryBuilder {
     }
 
     String dbHaving = predicates.getDbHaving();
-    if (!isEmpty(dbHaving)) {
+    if (hasValue(dbHaving)) {
       sb.append(" having ").append(dbHaving);
     }
 
@@ -744,8 +744,8 @@ class CQueryBuilder {
     return true;
   }
 
-  private boolean isEmpty(String s) {
-    return s == null || s.isEmpty();
+  private boolean hasValue(String s) {
+    return s != null && !s.isEmpty();
   }
 
   boolean isPlatformDistinctOn() {
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java
index 0d37f2344..dff090182 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java
@@ -90,7 +90,7 @@ class CQueryBuilderRawSql {
     }
 
     String dbWhere = predicates.getDbWhere();
-    if (!isEmpty(dbWhere)) {
+    if (hasValue(dbWhere)) {
       if (dynamicWhere == null) {
         dynamicWhere = dbWhere;
       } else {
@@ -98,7 +98,7 @@ class CQueryBuilderRawSql {
       }
     }
 
-    if (!isEmpty(dynamicWhere)) {
+    if (hasValue(dynamicWhere)) {
       if (sql.isAndWhereExpr()) {
         sb.append(" and ");
       } else {
@@ -109,13 +109,13 @@ class CQueryBuilderRawSql {
     }
 
     String preHaving = sql.getPreHaving();
-    if (!isEmpty(preHaving)) {
+    if (hasValue(preHaving)) {
       sb.append(preHaving);
       sb.append(" ");
     }
 
     String dbHaving = predicates.getDbHaving();
-    if (!isEmpty(dbHaving)) {
+    if (hasValue(dbHaving)) {
       sb.append(" ");
       if (sql.isAndHavingExpr()) {
         sb.append("and ");
@@ -126,15 +126,15 @@ class CQueryBuilderRawSql {
       sb.append(" ");
     }
 
-    if (!isEmpty(orderBy)) {
+    if (hasValue(orderBy)) {
       sb.append(" ").append(sql.getOrderByPrefix()).append(" ").append(orderBy);
     }
 
     return sb.toString().trim();
   }
 
-  private boolean isEmpty(String s) {
-    return s == null || s.isEmpty();
+  private boolean hasValue(String s) {
+    return s != null && !s.isEmpty();
   }
 
   private String getOrderBy(CQueryPredicates predicates, SpiRawSql.Sql sql) {
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTree.java b/src/main/java/io/ebeaninternal/server/query/SqlTree.java
index c0d6d1452..c537ace29 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTree.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTree.java
@@ -37,7 +37,7 @@ class SqlTree {
    */
   private final String inheritanceWhereSql;
 
-  private final boolean includeJoins;
+  private final boolean noJoins;
 
   /**
    * Create the SqlSelectClause.
@@ -53,7 +53,7 @@ class SqlTree {
     this.inheritanceWhereSql = inheritanceWhereSql;
     this.encryptedProps = encryptedProps;
     this.manyProperty = manyProperty;
-    this.includeJoins = includeJoins;
+    this.noJoins = !includeJoins;
   }
 
   /**
@@ -66,8 +66,8 @@ class SqlTree {
   /**
    * Return true if the query includes joins (not valid for rawSql).
    */
-  boolean isIncludeJoins() {
-    return includeJoins;
+  boolean noJoins() {
+    return noJoins;
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 42bd3f24b..66b9daaf0 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -35,8 +35,6 @@ public final class SqlTreeBuilder {
 
   private final OrmQueryDetail queryDetail;
 
-  private final StringBuilder summary = new StringBuilder();
-
   private final CQueryPredicates predicates;
 
   private final boolean subQuery;
@@ -75,7 +73,7 @@ public final class SqlTreeBuilder {
   /**
    * Construct for RawSql query.
    */
-  public SqlTreeBuilder(OrmQueryRequest<?> request, CQueryPredicates predicates, OrmQueryDetail queryDetail, boolean rawNoId) {
+  SqlTreeBuilder(OrmQueryRequest<?> request, CQueryPredicates predicates, OrmQueryDetail queryDetail, boolean rawNoId) {
 
     this.rawSql = true;
     this.desc = request.getBeanDescriptor();
@@ -98,7 +96,7 @@ public final class SqlTreeBuilder {
    * support the where and/or order by clause. If so these extra joins are added
    * to the root node.
    */
-  public SqlTreeBuilder(CQueryBuilder builder, OrmQueryRequest<?> request, CQueryPredicates predicates) {
+  SqlTreeBuilder(CQueryBuilder builder, OrmQueryRequest<?> request, CQueryPredicates predicates) {
 
     this.rawSql = false;
     this.rawNoId = false;
@@ -126,8 +124,6 @@ public final class SqlTreeBuilder {
    */
   public SqlTree build() {
 
-    summary.append(desc.getName());
-
     // build the appropriate chain of SelectAdapter's
     buildRoot(desc);
 
@@ -551,7 +547,6 @@ public final class SqlTreeBuilder {
       }
 
       manyProperty = manyProp;
-      summary.append(" +many:").append(propName);
       return true;
     }
     return false;
@@ -569,7 +564,6 @@ public final class SqlTreeBuilder {
 
     if (queryDetail.includesPath(prefix)) {
       // explicitly included
-      summary.append(", ").append(prefix);
       String[] splitNames = SplitName.split(prefix);
       queryDetail.includeBeanJoin(splitNames[0], splitNames[1]);
       return true;

From 576eb01187409579e10c008b0fcaf2914a3ea538 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 2 Jul 2019 23:15:41 +1200
Subject: [PATCH 0939/1036] #1747 - Refactor remove unused SqlTreeProperties
 readOnly

---
 .../io/ebeaninternal/server/query/SqlTreeBuilder.java    | 2 --
 .../io/ebeaninternal/server/query/SqlTreeProperties.java | 9 ---------
 2 files changed, 11 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 66b9daaf0..7b7530dfd 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -461,8 +461,6 @@ public final class SqlTreeBuilder {
   private SqlTreeProperties getBaseSelectPartial(STreeType desc, OrmQueryProperties queryProps) {
 
     SqlTreeProperties selectProps = new SqlTreeProperties();
-    selectProps.setReadOnly(queryProps.isReadOnly());
-
     // add properties in the order in which they appear
     // in the query. Gives predictable sql/properties for
     // use with SqlSelect type queries.
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
index 7a5f44a16..f46ca8088 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
@@ -12,11 +12,6 @@ import java.util.List;
  */
 public class SqlTreeProperties {
 
-  /**
-   * True if this node of the tree should have read only entity beans.
-   */
-  private boolean readOnly;
-
   /**
    * The bean properties in order.
    */
@@ -68,10 +63,6 @@ public class SqlTreeProperties {
     return !allProperties;
   }
 
-  public void setReadOnly(boolean readOnly) {
-    this.readOnly = readOnly;
-  }
-
   void setAllProperties() {
     this.allProperties = true;
   }

From 8c8f2b95dab9739032558eb53aa7958b510a674a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 2 Jul 2019 23:25:05 +1200
Subject: [PATCH 0940/1036] #1747 - Refactor DeleteMeta and UpdateMeta to
 extract common appendWhere() code

---
 .../server/persist/dml/BaseMeta.java          | 34 +++++++++++++++++++
 .../server/persist/dml/DeleteMeta.java        | 25 ++------------
 .../server/persist/dml/UpdateMeta.java        | 26 ++------------
 3 files changed, 40 insertions(+), 45 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/persist/dml/BaseMeta.java

diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/BaseMeta.java b/src/main/java/io/ebeaninternal/server/persist/dml/BaseMeta.java
new file mode 100644
index 000000000..d7ed5c90c
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/BaseMeta.java
@@ -0,0 +1,34 @@
+package io.ebeaninternal.server.persist.dml;
+
+import io.ebeaninternal.api.ConcurrencyMode;
+import io.ebeaninternal.server.persist.dmlbind.Bindable;
+import io.ebeaninternal.server.persist.dmlbind.BindableId;
+
+class BaseMeta {
+
+  final BindableId id;
+  final Bindable version;
+  final Bindable tenantId;
+
+  BaseMeta(BindableId id, Bindable version, Bindable tenantId) {
+    this.id = id;
+    this.version = version;
+    this.tenantId = tenantId;
+  }
+
+  String appendWhere(GenerateDmlRequest request, ConcurrencyMode conMode) {
+    request.setWhereIdMode();
+    id.dmlAppend(request);
+    if (tenantId != null) {
+      tenantId.dmlAppend(request);
+    }
+
+    if (ConcurrencyMode.VERSION == conMode) {
+      if (version != null) {
+        version.dmlAppend(request);
+      }
+    }
+
+    return request.toString();
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java b/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java
index 953c6ab84..c51a62531 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java
@@ -13,21 +13,15 @@ import java.sql.SQLException;
  * Meta data for delete handler. The meta data is for a particular bean type. It
  * is considered immutable and is thread safe.
  */
-final class DeleteMeta {
+final class DeleteMeta extends BaseMeta {
 
   private final String sqlVersion;
   private final String sqlNone;
   private final String sqlDraftVersion;
   private final String sqlDraftNone;
 
-  private final BindableId id;
-  private final Bindable version;
-  private final Bindable tenantId;
-
   DeleteMeta(BeanDescriptor<?> desc, BindableId id, Bindable version, Bindable tenantId) {
-    this.id = id;
-    this.version = version;
-    this.tenantId = tenantId;
+    super(id, version, tenantId);
 
     String tableName = desc.getBaseTable();
     this.sqlNone = genSql(ConcurrencyMode.NONE, tableName);
@@ -87,20 +81,7 @@ final class DeleteMeta {
     GenerateDmlRequest request = new GenerateDmlRequest();
     request.append("delete from ").append(table);
     request.append(" where ");
-
-    request.setWhereIdMode();
-    id.dmlAppend(request);
-    if (tenantId != null) {
-      tenantId.dmlAppend(request);
-    }
-
-    if (ConcurrencyMode.VERSION == conMode) {
-      if (version != null) {
-        version.dmlAppend(request);
-      }
-    }
-
-    return request.toString();
+    return appendWhere(request, conMode);
   }
 
 }
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java b/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java
index 89c56752b..6c16f7259 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java
@@ -17,25 +17,18 @@ import java.util.List;
  * Meta data for update handler. The meta data is for a particular bean type. It
  * is considered immutable and is thread safe.
  */
-final class UpdateMeta {
+final class UpdateMeta extends BaseMeta {
 
   private final BindableList set;
-  private final BindableId id;
-  private final Bindable version;
-  private final Bindable tenantId;
-
   private final UpdatePlan modeNoneUpdatePlan;
   private final UpdatePlan modeVersionUpdatePlan;
 
   UpdateMeta(BeanDescriptor<?> desc, BindableList set, BindableId id, Bindable version, Bindable tenantId) {
+    super(id, version, tenantId);
     this.set = set;
-    this.id = id;
-    this.version = version;
-    this.tenantId = tenantId;
 
     String sqlNone = genSql(ConcurrencyMode.NONE, set, desc.getBaseTable());
     String sqlVersion = genSql(ConcurrencyMode.VERSION, set, desc.getBaseTable());
-
     this.modeNoneUpdatePlan = new UpdatePlan(ConcurrencyMode.NONE, sqlNone, set);
     this.modeVersionUpdatePlan = new UpdatePlan(ConcurrencyMode.VERSION, sqlVersion, set);
   }
@@ -115,7 +108,6 @@ final class UpdateMeta {
 
     GenerateDmlRequest request = new GenerateDmlRequest();
     request.append("update ").append(tableName).append(" set ");
-
     request.setUpdateSetMode();
     bindableList.dmlAppend(request);
 
@@ -126,19 +118,7 @@ final class UpdateMeta {
     }
 
     request.append(" where ");
-
-    request.setWhereIdMode();
-    id.dmlAppend(request);
-    if (tenantId != null) {
-      tenantId.dmlAppend(request);
-    }
-    if (ConcurrencyMode.VERSION == conMode) {
-      if (version != null) {
-        version.dmlAppend(request);
-      }
-    }
-
-    return request.toString();
+    return appendWhere(request, conMode);
   }
 
 }

From e62db11f01d5db93f7848b1ddeaf6be68a457be8 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 2 Jul 2019 23:41:01 +1200
Subject: [PATCH 0941/1036] #1747 - Refactor extract common code for
 SaveManyElementCollection preElementCollectionUpdate()

---
 .../server/persist/SaveManyBase.java             |  7 +++++++
 .../persist/SaveManyElementCollection.java       | 16 ++--------------
 .../persist/SaveManyElementCollectionMap.java    | 13 ++-----------
 3 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java
index 2c7bde442..3c8ab0777 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java
@@ -41,6 +41,13 @@ abstract class SaveManyBase {
    */
   abstract void save();
 
+  void preElementCollectionUpdate(Object parentId) {
+    if (!insertedParent) {
+      request.preElementCollectionUpdate();
+      server.execute(many.deleteByParentId(parentId, null), transaction);
+    }
+  }
+
   void resetModifyState() {
     if (value instanceof BeanCollection<?>) {
       modifyListenReset((BeanCollection<?>) value);
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java
index 94097fd81..18f070556 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java
@@ -2,7 +2,6 @@ package io.ebeaninternal.server.persist;
 
 import io.ebean.SqlUpdate;
 import io.ebean.bean.EntityBean;
-import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.deploy.BeanCollectionUtil;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
@@ -27,26 +26,15 @@ class SaveManyElementCollection extends SaveManyBase {
     }
 
     Object parentId = request.getBeanId();
-    SpiEbeanServer server = request.getServer();
-
-    if (!insertedParent) {
-      request.preElementCollectionUpdate();
-      SqlUpdate sqlDelete = many.deleteByParentId(parentId, null);
-      server.execute(sqlDelete, transaction);
-    }
+    preElementCollectionUpdate(parentId);
 
     transaction.depth(+1);
-
-    String insert = many.insertElementCollection();
-    SqlUpdate sqlInsert = server.createSqlUpdate(insert);
-
+    SqlUpdate sqlInsert = server.createSqlUpdate(many.insertElementCollection());
     for (Object value : collection) {
-
       sqlInsert.setNextParameter(parentId);
       many.bindElementValue(sqlInsert, value);
       server.execute(sqlInsert, transaction);
     }
-
     transaction.depth(-1);
     resetModifyState();
     postElementCollectionUpdate();
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java
index f61ac4e0f..6da9b5c2c 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java
@@ -2,7 +2,6 @@ package io.ebeaninternal.server.persist;
 
 import io.ebean.SqlUpdate;
 import io.ebean.bean.EntityBean;
-import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.deploy.BeanCollectionUtil;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
@@ -29,18 +28,10 @@ class SaveManyElementCollectionMap extends SaveManyBase {
     }
 
     Object parentId = request.getBeanId();
-    SpiEbeanServer server = request.getServer();
-    if (!insertedParent) {
-      request.preElementCollectionUpdate();
-      SqlUpdate sqlDelete = many.deleteByParentId(parentId, null);
-      server.execute(sqlDelete, transaction);
-    }
+    preElementCollectionUpdate(parentId);
 
     transaction.depth(+1);
-
-    String insert = many.insertElementCollection();
-    SqlUpdate sqlInsert = server.createSqlUpdate(insert);
-
+    SqlUpdate sqlInsert = server.createSqlUpdate(many.insertElementCollection());
     for (Map.Entry<?, ?> entry : entries) {
       sqlInsert.setNextParameter(parentId);
       sqlInsert.setNextParameter(entry.getKey());

From 2a8fad73643f4920cd741ccac1f02e7663388167 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 3 Jul 2019 00:08:50 +1200
Subject: [PATCH 0942/1036] #1748 - Support older JPA API that doesn't have
 orphanRemoval() or joinColumn.foreignKey()

---
 .../deploy/parse/AnnotationAssocManys.java    | 11 ++++++++-
 .../deploy/parse/AnnotationAssocOnes.java     | 24 +++++++++++++------
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index 72f275c96..3550fc192 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -69,12 +69,21 @@ class AnnotationAssocManys extends AnnotationParser {
     }
   }
 
+  private boolean readOrphanRemoval(OneToMany property) {
+    try {
+      return property.orphanRemoval();
+    } catch (NoSuchMethodError e) {
+      // Support old JPA API
+      return false;
+    }
+  }
+
   private void read(DeployBeanPropertyAssocMany<?> prop) {
 
     OneToMany oneToMany = get(prop, OneToMany.class);
     if (oneToMany != null) {
       readToOne(oneToMany, prop);
-      if (oneToMany.orphanRemoval()) {
+      if (readOrphanRemoval(oneToMany)) {
         prop.setModifyListenMode(ModifyListenMode.REMOVALS);
         prop.getCascadeInfo().setDelete(true);
       }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index 1541f149b..dda924752 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -52,7 +52,6 @@ public class AnnotationAssocOnes extends AnnotationParser {
    */
   @Override
   public void parse() {
-
     for (DeployBeanProperty prop : descriptor.propertiesAll()) {
       if (prop instanceof DeployBeanPropertyAssocOne<?>) {
         readAssocOne((DeployBeanPropertyAssocOne<?>) prop);
@@ -183,9 +182,13 @@ public class AnnotationAssocOnes extends AnnotationParser {
   }
 
   private void checkForNoConstraint(DeployBeanPropertyAssocOne<?> prop, JoinColumn joinColumn) {
-    ForeignKey foreignKey = joinColumn.foreignKey();
-    if (foreignKey.value() == ConstraintMode.NO_CONSTRAINT) {
-      prop.setForeignKey(new PropertyForeignKey());
+    try {
+      ForeignKey foreignKey = joinColumn.foreignKey();
+      if (foreignKey.value() == ConstraintMode.NO_CONSTRAINT) {
+        prop.setForeignKey(new PropertyForeignKey());
+      }
+    } catch (NoSuchMethodError e) {
+      // support old JPA API
     }
   }
 
@@ -222,17 +225,24 @@ public class AnnotationAssocOnes extends AnnotationParser {
     prop.setNullable(propAnn.optional());
     prop.setFetchType(propAnn.fetch());
     prop.setMappedBy(propAnn.mappedBy());
+    prop.setOrphanRemoval(readOrphanRemoval(propAnn));
     if (!"".equals(propAnn.mappedBy())) {
       prop.setOneToOneExported();
-      prop.setOrphanRemoval(propAnn.orphanRemoval());
-    } else if (propAnn.orphanRemoval()) {
-      prop.setOrphanRemoval(true);
     }
 
     setCascadeTypes(propAnn.cascade(), prop.getCascadeInfo());
     prop.setBeanTable(beanTable(prop));
   }
 
+  private boolean readOrphanRemoval(OneToOne property) {
+    try {
+      return property.orphanRemoval();
+    } catch (NoSuchMethodError e) {
+      // Support old JPA API
+      return false;
+    }
+  }
+
   private void readPrimaryKeyJoin(PrimaryKeyJoinColumn primaryKeyJoin, DeployBeanPropertyAssocOne<?> prop) {
 
     if (!prop.isOneToOne()) {

From 03669dc3079701ebe1e7e6b56460795037f10603 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 3 Jul 2019 00:11:55 +1200
Subject: [PATCH 0943/1036] [maven-release-plugin] prepare release
 ebean-11.41.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0de8a9b08..7aa212f12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.41.1-SNAPSHOT</version>
+  <version>11.41.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.41.1</tag>
   </scm>
 
   <profiles>

From d949d4d6a283acac29bc17972e8c2c5f0310bbc8 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 3 Jul 2019 00:12:09 +1200
Subject: [PATCH 0944/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7aa212f12..82c81fb93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.41.1</version>
+  <version>11.41.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.41.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 84c3008db133e028d6691cef1117e69654374891 Mon Sep 17 00:00:00 2001
From: Thomas Fellner <thomas.fellner@foconis.de>
Date: Tue, 9 Jul 2019 17:25:50 +0200
Subject: [PATCH 0945/1036] Add query tests for @Formula-Properties

---
 .../query/joins/TestQueryJoinOnFormula.java   | 205 ++++++++++++++++++
 1 file changed, 205 insertions(+)
 create mode 100644 src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java

diff --git a/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java b/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java
new file mode 100644
index 000000000..e68561c49
--- /dev/null
+++ b/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java
@@ -0,0 +1,205 @@
+package org.tests.query.joins;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.FetchConfig;
+import io.ebean.Query;
+import org.tests.model.basic.Order;
+import org.tests.model.basic.ResetBasicData;
+import org.tests.model.family.ParentPerson;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.sql.Date;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.junit.Assert.assertEquals;
+
+public class TestQueryJoinOnFormula extends BaseTestCase {
+
+  
+  @Before
+  public void init() {
+    ResetBasicData.reset();
+  }
+  
+  /**
+   * If there is no query.select() or query.fetch() in the query, there should be a meaningful exception.
+   */
+  @Test
+  public void test_OrderFindIdsNoSelect() {
+
+    assertThatThrownBy(() -> {
+      Ebean.find(Order.class)
+        .where().eq("totalItems", 3)
+        .findIds();
+    }).hasMessageContaining("property 'totalItems' has to be selected explicitly");
+  }
+  
+  /**
+   * If there is no query.select() or query.fetch() in the query, there should be a meaningful exception.
+   */
+  @Test
+  public void test_OrderFindListNoSelect() {
+
+    assertThatThrownBy(() -> {
+      Ebean.find(Order.class)
+        .where().eq("totalItems", 3)
+        .findList();
+    }).hasMessageContaining("property 'totalItems' has to be selected explicitly");
+  }
+  
+  @Test
+  public void test_OrderFindIds() {
+
+    LoggedSqlCollector.start();
+
+    List<Integer> orderIds = Ebean.find(Order.class)
+        .select("totalItems")
+        .where().eq("totalItems", 3)
+        .findIds();
+    assertThat(orderIds).hasSize(2);
+    
+    List<String> loggedSql = LoggedSqlCollector.stop();
+    assertEquals(1, loggedSql.size());
+  }
+  
+  @Test
+  public void test_OrderFindList() {
+
+    LoggedSqlCollector.start();
+
+    List<Order> orders = Ebean.find(Order.class)
+        .select("totalItems")
+        .where().eq("totalItems", 3)
+        .findList();
+    assertThat(orders).hasSize(2);
+    
+    List<String> loggedSql = LoggedSqlCollector.stop();
+    assertEquals(1, loggedSql.size());
+  }
+  
+  @Test
+  public void test_OrderFindCount() {
+
+    LoggedSqlCollector.start();
+
+    int orders = Ebean.find(Order.class)
+        .select("totalItems")
+        .where().eq("totalItems", 3)
+        .findCount();
+    assertThat(orders).isEqualTo(2);
+    
+    List<String> loggedSql = LoggedSqlCollector.stop();
+    assertEquals(1, loggedSql.size());
+  }
+
+  @Test
+  public void test_OrderFindSingleAttributeList() {
+
+    LoggedSqlCollector.start();
+
+    List<Date> orderDates = Ebean.find(Order.class)
+        .select("orderDate,totalItems")
+        .where().eq("totalItems", 3)
+        .findSingleAttributeList();
+    assertThat(orderDates).hasSize(2);
+    
+    List<String> loggedSql = LoggedSqlCollector.stop();
+    assertEquals(1, loggedSql.size());
+  }
+  
+  @Test
+  public void test_OrderFindOne() {
+
+    LoggedSqlCollector.start();
+
+    Order order = Ebean.find(Order.class)
+        .select("totalItems")
+        .where().eq("totalItems", 3)
+        .setMaxRows(1)
+        .orderById(true)
+        .findOne();
+    
+    assertThat(order.getTotalItems()).isEqualTo(3);
+    
+    List<String> loggedSql = LoggedSqlCollector.stop();
+    assertEquals(1, loggedSql.size());
+  }
+  
+  @Test
+  public void test_ParentPersonFindIds() {
+
+    LoggedSqlCollector.start();
+
+    List<ParentPerson> orderIds = Ebean.find(ParentPerson.class)
+        .where().eq("totalAge", 3)
+        .findIds();
+    assertThat(orderIds).hasSize(2);
+    
+    List<String> loggedSql = LoggedSqlCollector.stop();
+    assertEquals(1, loggedSql.size());
+  }
+  
+  @Test
+  public void test_ParentPersonFindList() {
+
+    LoggedSqlCollector.start();
+
+    Ebean.find(ParentPerson.class)
+        .where().eq("totalAge", 3)
+        .findList();
+    // TODO: There are no beans in database, so for now only the query must run.
+    
+    List<String> loggedSql = LoggedSqlCollector.stop();
+    assertEquals(1, loggedSql.size());
+  }
+  
+  @Test
+  public void test_ParentPersonFindCount() {
+
+    LoggedSqlCollector.start();
+
+    Ebean.find(ParentPerson.class)
+      .where().eq("totalAge", 3)
+      .findCount();
+    // TODO: There are no beans in database, so for now only the query must run.
+    
+    List<String> loggedSql = LoggedSqlCollector.stop();
+    assertEquals(1, loggedSql.size());
+  }
+  
+  @Test
+  public void test_ParentPersonFindSingleAttributeList() {
+
+    LoggedSqlCollector.start();
+
+    Ebean.find(ParentPerson.class)
+      .select("address") // .select("address, totalAge") would work
+      .where().eq("totalAge", 3)
+      .findSingleAttributeList();
+    // TODO: There are no beans in database, so for now only the query must run.
+    
+    List<String> loggedSql = LoggedSqlCollector.stop();
+    assertEquals(1, loggedSql.size());
+  }
+  
+  @Test
+  public void test_ParentPersonFindOne() {
+
+    LoggedSqlCollector.start();
+
+    Ebean.find(ParentPerson.class)
+      .where().eq("totalAge", 3)
+      .setMaxRows(1)
+      .orderById(true)
+      .findOne();
+    // TODO: There are no beans in database, so for now only the query must run.
+    
+    List<String> loggedSql = LoggedSqlCollector.stop();
+    assertEquals(1, loggedSql.size());
+  }
+}

From 5544a2cc3e8dc67e4649e1ab13a6249155ad3104 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Fri, 12 Jul 2019 12:59:19 +0200
Subject: [PATCH 0946/1036] Possible fix

---
 .../io/ebeaninternal/api/ManyWhereJoins.java  |  21 ++--
 .../server/el/ElPropertyChain.java            |   3 +-
 .../server/query/CQueryBuilder.java           |   4 +-
 .../server/query/SqlTreeBuilder.java          |   7 ++
 .../query/SqlTreeNodeFormulaWhereJoin.java    | 115 ++++++++++++++++++
 .../query/joins/TestQueryJoinOnFormula.java   | 114 ++++++++---------
 6 files changed, 194 insertions(+), 70 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/query/SqlTreeNodeFormulaWhereJoin.java

diff --git a/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java b/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java
index 0b6499fec..0c6b128a2 100644
--- a/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java
+++ b/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java
@@ -7,7 +7,9 @@ import io.ebean.util.SplitName;
 import io.ebeaninternal.server.query.SqlJoinType;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
@@ -21,9 +23,7 @@ public class ManyWhereJoins implements Serializable {
 
   private final TreeMap<String, PropertyJoin> joins = new TreeMap<>();
 
-  private StringBuilder formulaProperties = new StringBuilder();
-
-  private boolean formulaWithJoin;
+  private List<String> formulaJoinProperties;
 
   private boolean aggregation;
 
@@ -125,27 +125,24 @@ public class ManyWhereJoins implements Serializable {
    * specifically for the findCount query.
    */
   public void addFormulaWithJoin(String propertyName) {
-    if (formulaWithJoin) {
-      formulaProperties.append(",");
-    } else {
-      formulaProperties = new StringBuilder();
-      formulaWithJoin = true;
+    if (formulaJoinProperties == null) {
+      formulaJoinProperties = new ArrayList<>();
     }
-    formulaProperties.append(propertyName);
+    formulaJoinProperties.add(propertyName);
   }
 
   /**
    * Return true if the query select includes a formula with join.
    */
   public boolean isFormulaWithJoin() {
-    return formulaWithJoin;
+    return formulaJoinProperties != null;
   }
 
   /**
    * Return the formula properties to build the select clause for a findCount query.
    */
-  public String getFormulaProperties() {
-    return formulaProperties.toString();
+  public List<String> getFormulaJoinProperties() {
+    return formulaJoinProperties;
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java b/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
index ee2732cbb..a7d0bd779 100644
--- a/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
+++ b/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
@@ -136,8 +136,7 @@ public class ElPropertyChain implements ElPropertyValue {
 
   @Override
   public boolean containsFormulaWithJoin() {
-    // Not cascading the check at this stage
-    return false;
+    return lastBeanProperty.containsFormulaWithJoin();
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 2e1511548..d73458791 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -265,7 +265,9 @@ class CQueryBuilder {
     if (!countDistinct) {
       // minimise select clause for standard count
       if (manyWhereJoins.isFormulaWithJoin()) {
-        query.select(manyWhereJoins.getFormulaProperties());
+        // FIXME: we join the strings here and on the other side we split them again
+        // this is not yet optimal
+        query.select(String.join(",",manyWhereJoins.getFormulaJoinProperties()));
       } else {
         query.setSelectId();
       }
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 7b7530dfd..6983de938 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -296,6 +296,13 @@ public final class SqlTreeBuilder {
       SqlTreeNodeManyWhereJoin nodeJoin = new SqlTreeNodeManyWhereJoin(joinProp.getProperty(), beanProperty, joinProp.getSqlJoinType());
       myJoinList.add(nodeJoin);
     }
+    if (manyWhereJoins.isFormulaWithJoin()) {
+      for (String property: manyWhereJoins.getFormulaJoinProperties()) {
+        STreeProperty beanProperty = desc.findPropertyFromPath(property);
+        SqlTreeNodeFormulaWhereJoin nodeJoin = new SqlTreeNodeFormulaWhereJoin(beanProperty, SqlJoinType.OUTER);
+        myJoinList.add(nodeJoin);
+      }
+    }
   }
 
   private SqlTreeNode buildNode(String prefix, STreePropertyAssoc prop, STreeType desc, List<SqlTreeNode> myList, SqlTreeProperties props) {
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeFormulaWhereJoin.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeFormulaWhereJoin.java
new file mode 100644
index 000000000..4ec6708b9
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeFormulaWhereJoin.java
@@ -0,0 +1,115 @@
+package io.ebeaninternal.server.query;
+
+import io.ebean.Version;
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.api.SpiQuery;
+import io.ebeaninternal.server.deploy.DbReadContext;
+import io.ebeaninternal.server.deploy.DbSqlContext;
+import io.ebeaninternal.server.type.ScalarType;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Join to Many (or child of a many) to support where clause predicates on many properties.
+ */
+class SqlTreeNodeFormulaWhereJoin implements SqlTreeNode {
+
+  private final STreeProperty nodeBeanProp;
+
+  /**
+   * The many where join which is either INNER or OUTER.
+   */
+  private final SqlJoinType manyJoinType;
+
+  SqlTreeNodeFormulaWhereJoin(STreeProperty prop, SqlJoinType manyJoinType) {
+    this.nodeBeanProp = prop;
+    this.manyJoinType = manyJoinType;
+  }
+
+  @Override
+  public boolean isSingleProperty() {
+    return true;
+  }
+
+  @Override
+  public ScalarType<?> getSingleAttributeReader() {
+    throw new IllegalStateException("No expected");
+  }
+
+  @Override
+  public void addAsOfTableAlias(SpiQuery<?> query) {
+    // do nothing here ...
+  }
+
+  @Override
+  public void addSoftDeletePredicate(SpiQuery<?> query) {
+    // do nothing here ...
+  }
+
+  @Override
+  public boolean isAggregation() {
+    return false;
+  }
+
+  @Override
+  public void appendDistinctOn(DbSqlContext ctx, boolean subQuery) {
+    // do nothing here ...
+  }
+
+  @Override
+  public void appendGroupBy(DbSqlContext ctx, boolean subQuery) {
+    // do nothing here
+  }
+
+  /**
+   * Append to the FROM clause for this node.
+   */
+  @Override
+  public void appendFrom(DbSqlContext ctx, SqlJoinType currentJoinType) {
+
+    // always use the join type as per this many where join
+    // (OUTER for disjunction and otherwise INNER)
+    nodeBeanProp.appendFrom(ctx, manyJoinType);
+  }
+
+
+
+  @Override
+  public void dependentTables(Set<String> tables) {
+    //FIXME: we cannot easily determine the dependent tables, this would require an enhancement
+    //of the @Formula(dependentTables=...) annotation
+  }
+
+  @Override
+  public void buildRawSqlSelectChain(List<String> selectChain) {
+    // nothing to add
+  }
+
+  @Override
+  public void appendSelect(DbSqlContext ctx, boolean subQuery) {
+    // nothing to do here
+  }
+
+  @Override
+  public void appendWhere(DbSqlContext ctx) {
+    // nothing to do here
+  }
+
+  @Override
+  public EntityBean load(DbReadContext ctx, EntityBean localBean, EntityBean parentBean) {
+    // nothing to do here
+    return null;
+  }
+
+  @Override
+  public <T> Version<T> loadVersion(DbReadContext ctx) {
+    // nothing to do here
+    return null;
+  }
+
+  @Override
+  public boolean hasMany() {
+    return true;
+  }
+}
diff --git a/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java b/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java
index e68561c49..3ce0e6051 100644
--- a/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java
+++ b/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java
@@ -2,13 +2,11 @@ package org.tests.query.joins;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
-import io.ebean.FetchConfig;
-import io.ebean.Query;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
+import org.tests.model.family.ChildPerson;
 import org.tests.model.family.ParentPerson;
 import org.ebeantest.LoggedSqlCollector;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -20,81 +18,55 @@ import static org.junit.Assert.assertEquals;
 
 public class TestQueryJoinOnFormula extends BaseTestCase {
 
-  
+
   @Before
   public void init() {
     ResetBasicData.reset();
   }
-  
-  /**
-   * If there is no query.select() or query.fetch() in the query, there should be a meaningful exception.
-   */
-  @Test
-  public void test_OrderFindIdsNoSelect() {
 
-    assertThatThrownBy(() -> {
-      Ebean.find(Order.class)
-        .where().eq("totalItems", 3)
-        .findIds();
-    }).hasMessageContaining("property 'totalItems' has to be selected explicitly");
-  }
-  
-  /**
-   * If there is no query.select() or query.fetch() in the query, there should be a meaningful exception.
-   */
-  @Test
-  public void test_OrderFindListNoSelect() {
-
-    assertThatThrownBy(() -> {
-      Ebean.find(Order.class)
-        .where().eq("totalItems", 3)
-        .findList();
-    }).hasMessageContaining("property 'totalItems' has to be selected explicitly");
-  }
-  
   @Test
   public void test_OrderFindIds() {
 
     LoggedSqlCollector.start();
 
     List<Integer> orderIds = Ebean.find(Order.class)
-        .select("totalItems")
         .where().eq("totalItems", 3)
         .findIds();
     assertThat(orderIds).hasSize(2);
-    
+
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
+    assertThat(loggedSql.get(0)).contains("join (select order_id, count(*) as total_items,");
   }
-  
+
   @Test
   public void test_OrderFindList() {
 
     LoggedSqlCollector.start();
 
     List<Order> orders = Ebean.find(Order.class)
-        .select("totalItems")
         .where().eq("totalItems", 3)
         .findList();
     assertThat(orders).hasSize(2);
-    
+
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
+    assertThat(loggedSql.get(0)).contains("join (select order_id, count(*) as total_items,");
   }
-  
+
   @Test
   public void test_OrderFindCount() {
 
     LoggedSqlCollector.start();
 
     int orders = Ebean.find(Order.class)
-        .select("totalItems")
         .where().eq("totalItems", 3)
         .findCount();
     assertThat(orders).isEqualTo(2);
-    
+
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
+    assertThat(loggedSql.get(0)).contains("join (select order_id, count(*) as total_items,");
   }
 
   @Test
@@ -103,15 +75,16 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
     LoggedSqlCollector.start();
 
     List<Date> orderDates = Ebean.find(Order.class)
-        .select("orderDate,totalItems")
+        .select("orderDate")
         .where().eq("totalItems", 3)
         .findSingleAttributeList();
     assertThat(orderDates).hasSize(2);
-    
+
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
+    assertThat(loggedSql.get(0)).contains("join (select order_id, count(*) as total_items,");
   }
-  
+
   @Test
   public void test_OrderFindOne() {
 
@@ -123,13 +96,14 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
         .setMaxRows(1)
         .orderById(true)
         .findOne();
-    
+
     assertThat(order.getTotalItems()).isEqualTo(3);
-    
+
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
+    assertThat(loggedSql.get(0)).contains("join (select order_id, count(*) as total_items,");
   }
-  
+
   @Test
   public void test_ParentPersonFindIds() {
 
@@ -138,26 +112,28 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
     List<ParentPerson> orderIds = Ebean.find(ParentPerson.class)
         .where().eq("totalAge", 3)
         .findIds();
-    assertThat(orderIds).hasSize(2);
-    
+    // TODO: There are no beans in database, so for now only the query must run.
+
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
   }
-  
+
   @Test
   public void test_ParentPersonFindList() {
 
     LoggedSqlCollector.start();
 
     Ebean.find(ParentPerson.class)
-        .where().eq("totalAge", 3)
+        .select("identifier")
+        //.where().eq("totalAge", 3)
+        .where().eq("familyName", "foo")
         .findList();
     // TODO: There are no beans in database, so for now only the query must run.
-    
+
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
   }
-  
+
   @Test
   public void test_ParentPersonFindCount() {
 
@@ -167,11 +143,11 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
       .where().eq("totalAge", 3)
       .findCount();
     // TODO: There are no beans in database, so for now only the query must run.
-    
+
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
   }
-  
+
   @Test
   public void test_ParentPersonFindSingleAttributeList() {
 
@@ -182,11 +158,11 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
       .where().eq("totalAge", 3)
       .findSingleAttributeList();
     // TODO: There are no beans in database, so for now only the query must run.
-    
+
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
   }
-  
+
   @Test
   public void test_ParentPersonFindOne() {
 
@@ -198,7 +174,35 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
       .orderById(true)
       .findOne();
     // TODO: There are no beans in database, so for now only the query must run.
-    
+
+    List<String> loggedSql = LoggedSqlCollector.stop();
+    assertEquals(1, loggedSql.size());
+  }
+
+  @Test
+  public void test_ChildPersonParentFindIds() {
+
+    LoggedSqlCollector.start();
+
+    Ebean.find(ChildPerson.class)
+        .where().eq("parent.totalAge", 3)
+        .findIds();
+    // TODO: There are no beans in database, so for now only the query must run.
+
+    List<String> loggedSql = LoggedSqlCollector.stop();
+    assertEquals(1, loggedSql.size());
+  }
+
+  @Test
+  public void test_ChildPersonParentFindCount() {
+
+    LoggedSqlCollector.start();
+
+    Ebean.find(ChildPerson.class)
+        .where().eq("parent.totalAge", 3)
+        .findCount();
+    // TODO: There are no beans in database, so for now only the query must run.
+
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
   }

From 53f1da32bea9e9695de3520e7705aa169140cdb9 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Fri, 12 Jul 2019 14:21:45 +0200
Subject: [PATCH 0947/1036] Add testcase for @DbForeignKey(noconstraint = true)

---
 .../org/tests/lazyforeignkeys/MainEntity.java | 41 ++++++++++++++
 .../lazyforeignkeys/MainEntityRelation.java   | 46 ++++++++++++++++
 .../lazyforeignkeys/TestLazyForeignKeys.java  | 53 +++++++++++++++++++
 .../tests/lazyforeignkeys/ViewMainEntity.java | 42 +++++++++++++++
 .../ViewMainEntityRelation.java               | 47 ++++++++++++++++
 .../migrationtest/h2/R__main_entity_views.sql |  8 +++
 src/test/resources/extra-ddl.xml              | 14 ++++-
 7 files changed, 250 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/org/tests/lazyforeignkeys/MainEntity.java
 create mode 100644 src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java
 create mode 100644 src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java
 create mode 100644 src/test/java/org/tests/lazyforeignkeys/ViewMainEntity.java
 create mode 100644 src/test/java/org/tests/lazyforeignkeys/ViewMainEntityRelation.java
 create mode 100644 src/test/resources/dbmigration/migrationtest/h2/R__main_entity_views.sql

diff --git a/src/test/java/org/tests/lazyforeignkeys/MainEntity.java b/src/test/java/org/tests/lazyforeignkeys/MainEntity.java
new file mode 100644
index 000000000..8d76a0a84
--- /dev/null
+++ b/src/test/java/org/tests/lazyforeignkeys/MainEntity.java
@@ -0,0 +1,41 @@
+package org.tests.lazyforeignkeys;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "main_entity")
+public class MainEntity {
+
+  @Id
+  private String id;
+
+  private String attr1;
+  
+  private String attr2;
+
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public String getAttr1() {
+    return attr1;
+  }
+
+  public void setAttr1(String attr1) {
+    this.attr1 = attr1;
+  }
+
+  public String getAttr2() {
+    return attr2;
+  }
+
+  public void setAttr2(String attr2) {
+    this.attr2 = attr2;
+  }
+}
diff --git a/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java b/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java
new file mode 100644
index 000000000..06554932a
--- /dev/null
+++ b/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java
@@ -0,0 +1,46 @@
+package org.tests.lazyforeignkeys;
+
+import java.util.UUID;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+
+@Entity
+@Table(name = "main_entity_relation")
+public class MainEntityRelation {
+
+  @Id
+  private UUID id;
+
+  private String id1;
+  
+  private String id2;
+  
+  private String attr1;
+
+  public String getId1() {
+    return id1;
+  }
+
+  public void setId1(String id1) {
+    this.id1 = id1;
+  }
+
+  public String getId2() {
+    return id2;
+  }
+
+  public void setId2(String id2) {
+    this.id2 = id2;
+  }
+  
+  public String getAttr1() {
+    return attr1;
+  }
+
+  public void setAttr1(String attr1) {
+    this.attr1 = attr1;
+  }
+}
diff --git a/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java b/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java
new file mode 100644
index 000000000..bb249ce9d
--- /dev/null
+++ b/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java
@@ -0,0 +1,53 @@
+package org.tests.lazyforeignkeys;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.util.List;
+
+import org.junit.Test;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import io.ebean.Ebean;
+import io.ebean.Query;
+import io.ebean.text.PathProperties;
+
+public class TestLazyForeignKeys extends BaseTestCase {
+
+  @Test
+  public void test() {
+    MainEntity ent1 = new MainEntity();
+    ent1.setId("ent1");
+    ent1.setAttr1("attr1");
+    DB.save(ent1);
+    
+    MainEntityRelation rel1 = new MainEntityRelation();
+    rel1.setId1("ent1");
+    rel1.setId2("ent2");
+    DB.save(rel1);
+    
+    ViewMainEntityRelation vwRel1 = DB.find(ViewMainEntityRelation.class).findOne();
+    
+    assertEquals("ent1", vwRel1.getEntity1().getId());
+    assertEquals("ent2", vwRel1.getEntity2().getId());
+    
+    assertEquals("attr1", vwRel1.getEntity1().getAttr1());
+    //assertNull(vwRel1.getEntity2().getAttr1());
+    
+    PathProperties pathProp = new PathProperties();
+    pathProp.addToPath(null, "attr1");
+    pathProp.addToPath("entity1", "id");
+    pathProp.addToPath("entity2", "id");
+    
+    Query<ViewMainEntityRelation> query = Ebean.find(ViewMainEntityRelation.class).apply(pathProp);
+    List<ViewMainEntityRelation> list = query.findList();
+    assertEquals(1, list.size());
+    
+    assertEquals("ent1", list.get(0).getEntity1().getId());
+    assertEquals("ent2", list.get(0).getEntity2().getId());
+    
+    assertEquals("select t0.id, t0.attr1, t0.id1, t0.id2 from vw_main_entity_relation t0",
+        query.getGeneratedSql());
+  }
+}
diff --git a/src/test/java/org/tests/lazyforeignkeys/ViewMainEntity.java b/src/test/java/org/tests/lazyforeignkeys/ViewMainEntity.java
new file mode 100644
index 000000000..66ecd74c9
--- /dev/null
+++ b/src/test/java/org/tests/lazyforeignkeys/ViewMainEntity.java
@@ -0,0 +1,42 @@
+package org.tests.lazyforeignkeys;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+import io.ebean.annotation.View;
+
+@View(name = "vw_main_entity")
+@Entity
+public class ViewMainEntity {
+
+  @Id
+  private String id;
+
+  private String attr1;
+  
+  private String attr2;
+
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public String getAttr1() {
+    return attr1;
+  }
+
+  public void setAttr1(String attr1) {
+    this.attr1 = attr1;
+  }
+
+  public String getAttr2() {
+    return attr2;
+  }
+
+  public void setAttr2(String attr2) {
+    this.attr2 = attr2;
+  }
+}
diff --git a/src/test/java/org/tests/lazyforeignkeys/ViewMainEntityRelation.java b/src/test/java/org/tests/lazyforeignkeys/ViewMainEntityRelation.java
new file mode 100644
index 000000000..050f76623
--- /dev/null
+++ b/src/test/java/org/tests/lazyforeignkeys/ViewMainEntityRelation.java
@@ -0,0 +1,47 @@
+package org.tests.lazyforeignkeys;
+
+import java.util.UUID;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+
+import io.ebean.annotation.DbForeignKey;
+import io.ebean.annotation.View;
+
+@View(name = "vw_main_entity_relation")
+@Entity
+public class ViewMainEntityRelation {
+
+  @Id
+  private UUID id;
+
+  @ManyToOne
+  @JoinColumn(name = "id1")
+  @DbForeignKey(noConstraint = true)
+  private MainEntity entity1;
+  
+  @ManyToOne
+  @JoinColumn(name = "id2")
+  @DbForeignKey(noConstraint = true)
+  private MainEntity entity2;
+  
+  private String attr1;
+
+  public String getAttr1() {
+    return attr1;
+  }
+
+  public void setAttr1(String attr1) {
+    this.attr1 = attr1;
+  }
+
+  public MainEntity getEntity1() {
+    return entity1;
+  }
+
+  public MainEntity getEntity2() {
+    return entity2;
+  }
+}
diff --git a/src/test/resources/dbmigration/migrationtest/h2/R__main_entity_views.sql b/src/test/resources/dbmigration/migrationtest/h2/R__main_entity_views.sql
new file mode 100644
index 000000000..c69bc088d
--- /dev/null
+++ b/src/test/resources/dbmigration/migrationtest/h2/R__main_entity_views.sql
@@ -0,0 +1,8 @@
+
+
+    create or replace view vw_main_entity as
+    select * from main_entity;
+    
+    create or replace view vw_main_entity_relation as
+    select * from main_entity_relation;
+  
\ No newline at end of file
diff --git a/src/test/resources/extra-ddl.xml b/src/test/resources/extra-ddl.xml
index aaf69b523..0f152469b 100644
--- a/src/test/resources/extra-ddl.xml
+++ b/src/test/resources/extra-ddl.xml
@@ -4,8 +4,12 @@
   <ddl-script name="order views" platforms="h2" drop="true">
       drop view order_agg_vw if exists;
   </ddl-script>
+  <ddl-script name="main entity views" platforms="h2" drop="true">
+      drop view vw_main_entity if exists;
+      drop view vw_main_entity_relation if exists;
+  </ddl-script>
+  
   <ddl-script name="order views" platforms="db2,h2,postgres,oracle,mysql">
-
     create or replace view order_agg_vw as
     select d.order_id, sum(d.order_qty * d.unit_price) as order_total,
            sum(d.ship_qty * d.unit_price) as ship_total
@@ -13,6 +17,14 @@
     group by d.order_id
   </ddl-script>
 
+  <ddl-script name="main entity views" platforms="db2,h2,postgres,oracle,mysql">
+    create or replace view vw_main_entity as
+    select * from main_entity;
+    
+    create or replace view vw_main_entity_relation as
+    select * from main_entity_relation;
+  </ddl-script>
+  
   <ddl-script name="order views hsqldb" platforms="hsqldb">
     drop view order_agg_vw if exists ;
     create view order_agg_vw as

From 081cb202607ebb1a016f07e3e562b609e820560f Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Fri, 12 Jul 2019 14:14:29 +0200
Subject: [PATCH 0948/1036] always add main ID property, if no foreign key
 (=noConstraint) is present

(cherry picked from commit ea562151a8e3043df13381abd0d076d592618340)
---
 .../server/query/SqlTreeBuilder.java          |  5 ++
 .../org/tests/lazyforeignkeys/MainEntity.java | 16 ++++-
 .../lazyforeignkeys/TestLazyForeignKeys.java  | 63 ++++++++++++++-----
 3 files changed, 66 insertions(+), 18 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 7b7530dfd..cfe96a5d8 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -248,10 +248,14 @@ public final class SqlTreeBuilder {
 
     List<SqlTreeNode> myJoinList = new ArrayList<>();
 
+    List<STreePropertyAssocOne> extraProps = new ArrayList<>();
     for (STreePropertyAssocOne one : desc.propsOne()) {
       String propPrefix = SplitName.add(prefix, one.getName());
       if (isIncludeBean(propPrefix)) {
         selectIncludes.add(propPrefix);
+        if (!one.hasForeignKey()) {
+          extraProps.add(one);
+        }
         buildSelectChain(propPrefix, one, one.target(), myJoinList);
       }
     }
@@ -273,6 +277,7 @@ public final class SqlTreeBuilder {
       }
       addManyWhereJoins(myJoinList);
     }
+    extraProps.forEach(props::add);
 
     SqlTreeNode selectNode = buildNode(prefix, prop, desc, myJoinList, props);
     if (joinList != null) {
diff --git a/src/test/java/org/tests/lazyforeignkeys/MainEntity.java b/src/test/java/org/tests/lazyforeignkeys/MainEntity.java
index 8d76a0a84..ec92722db 100644
--- a/src/test/java/org/tests/lazyforeignkeys/MainEntity.java
+++ b/src/test/java/org/tests/lazyforeignkeys/MainEntity.java
@@ -4,6 +4,10 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
+import io.ebean.annotation.Formula;
+import io.ebean.annotation.Platform;
+import io.ebean.annotation.SoftDelete;
+
 @Entity
 @Table(name = "main_entity")
 public class MainEntity {
@@ -12,9 +16,15 @@ public class MainEntity {
   private String id;
 
   private String attr1;
-  
+
   private String attr2;
 
+  @SoftDelete
+  @Formula(select = "${ta}.id is null")
+  @Formula(select = "CASE WHEN ${ta}.id is null THEN 1 ELSE 0 END", platforms = Platform.SQLSERVER17)
+  // evaluates to true in a left join if bean has been deleted.
+  boolean deleted;
+
   public String getId() {
     return id;
   }
@@ -38,4 +48,8 @@ public class MainEntity {
   public void setAttr2(String attr2) {
     this.attr2 = attr2;
   }
+
+  public boolean isDeleted() {
+    return deleted;
+  }
 }
diff --git a/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java b/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java
index bb249ce9d..5d5583903 100644
--- a/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java
+++ b/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java
@@ -1,10 +1,13 @@
 package org.tests.lazyforeignkeys;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.*;
 
 import java.util.List;
 
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 import io.ebean.BaseTestCase;
@@ -15,39 +18,65 @@ import io.ebean.text.PathProperties;
 
 public class TestLazyForeignKeys extends BaseTestCase {
 
-  @Test
-  public void test() {
+  @Before
+  public void prepare() {
     MainEntity ent1 = new MainEntity();
     ent1.setId("ent1");
     ent1.setAttr1("attr1");
     DB.save(ent1);
-    
+
     MainEntityRelation rel1 = new MainEntityRelation();
     rel1.setId1("ent1");
     rel1.setId2("ent2");
     DB.save(rel1);
-    
+  }
+  @After
+  public void cleanup() {
+    DB.find(MainEntity.class).delete();
+    DB.find(MainEntityRelation.class).delete();
+  }
+
+  @Test
+  public void testFindOne() throws Exception {
+    // use findOne without select, so lazy loading will occur
+    LoggedSqlCollector.start();
+
     ViewMainEntityRelation vwRel1 = DB.find(ViewMainEntityRelation.class).findOne();
-    
+
     assertEquals("ent1", vwRel1.getEntity1().getId());
     assertEquals("ent2", vwRel1.getEntity2().getId());
-    
+
     assertEquals("attr1", vwRel1.getEntity1().getAttr1());
-    //assertNull(vwRel1.getEntity2().getAttr1());
-    
+    assertFalse(vwRel1.getEntity1().isDeleted());
+    assertTrue(vwRel1.getEntity2().isDeleted());
+
+    List<String> loggedSql = LoggedSqlCollector.stop();
+    assertThat(loggedSql).hasSize(3);
+    assertThat(loggedSql.get(0)).contains("select t0.id, t0.attr1, t0.id1, t0.id2 from vw_main_entity_relation");
+    assertThat(loggedSql.get(1)).contains("select t0.id, t0.attr1, t0.attr2, t0.id is null from main_entity t0");
+    assertThat(loggedSql.get(2)).contains("select t0.id, t0.attr1, t0.attr2, t0.id is null from main_entity t0");
+  }
+  @Test
+  public void testFindListWithSelect() {
     PathProperties pathProp = new PathProperties();
     pathProp.addToPath(null, "attr1");
     pathProp.addToPath("entity1", "id");
     pathProp.addToPath("entity2", "id");
-    
+
     Query<ViewMainEntityRelation> query = Ebean.find(ViewMainEntityRelation.class).apply(pathProp);
     List<ViewMainEntityRelation> list = query.findList();
     assertEquals(1, list.size());
-    
-    assertEquals("ent1", list.get(0).getEntity1().getId());
-    assertEquals("ent2", list.get(0).getEntity2().getId());
-    
-    assertEquals("select t0.id, t0.attr1, t0.id1, t0.id2 from vw_main_entity_relation t0",
-        query.getGeneratedSql());
+
+    System.out.println(query.getGeneratedSql());
+    assertThat(query.getGeneratedSql()).contains("t0.id, t0.attr1, t0.id1, t0.id2, t1.id, t2.id");
+
+    ViewMainEntityRelation vwRel1 = list.get(0);
+    assertEquals("ent1", vwRel1.getEntity1().getId());
+    assertEquals("ent2", vwRel1.getEntity2().getId());
+
+    assertEquals("attr1", vwRel1.getEntity1().getAttr1());
+    assertFalse(vwRel1.getEntity1().isDeleted());
+    assertTrue(vwRel1.getEntity2().isDeleted());
+
   }
 }

From 333ac8edd9315c693c1eae8b5d2e1945842511d1 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 14 Jul 2019 15:17:34 +1200
Subject: [PATCH 0949/1036] Bump agent to 11.41.2

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 82c81fb93..145b98823 100644
--- a/pom.xml
+++ b/pom.xml
@@ -250,7 +250,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-agent</artifactId>
-      <version>11.41.1</version>
+      <version>11.41.2</version>
       <scope>test</scope>
     </dependency>
 
@@ -330,7 +330,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>11.41.1</version>
+        <version>11.41.2</version>
         <executions>
           <execution>
             <id>test</id>
@@ -393,7 +393,7 @@
           <overview>src/main/java/io/ebean/overview.html</overview>
           <source>1.8</source>
           <doclet>org.avaje.doclet.PygmentsDoclet</doclet>
-          <excludePackageNames>io.ebeaninternal.*:io.ebeanservice:io.ebean.common:io.ebean.bean:io.ebean.service:io.ebean.metric:io.ebean.util:io.ebean.config.properties:io.ebean.config.dbplatform*</excludePackageNames>
+          <excludePackageNames>io.ebeaninternal.*:io.ebeanservice:io.ebean.common:io.ebean.bean:io.ebean.service:io.ebean.metric:io.ebean.util:io.ebean.config.properties:io.ebean.config.dbplatform</excludePackageNames>
           <docletArtifact>
             <groupId>org.avaje</groupId>
             <artifactId>pygments-doclet</artifactId>

From 23cd9b6a93d95264485d1636050ee965d8521f27 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 14 Jul 2019 15:21:55 +1200
Subject: [PATCH 0950/1036] Remove use of agent-loader

Enhancement always done via maven plugin or Ebean IDE plugin (javaagent)
---
 pom.xml                                            | 14 --------------
 src/test/java/io/ebean/BaseTestCase.java           |  5 -----
 .../TransactionNotTerminatedAfterRollback.java     |  9 ---------
 .../java/org/tests/unitinternal/HelloMain.java     |  8 --------
 4 files changed, 36 deletions(-)

diff --git a/pom.xml b/pom.xml
index 145b98823..e91d11e58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -240,20 +240,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.avaje</groupId>
-      <artifactId>avaje-agentloader</artifactId>
-      <version>3.0.1</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-agent</artifactId>
-      <version>11.41.2</version>
-      <scope>test</scope>
-    </dependency>
-
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
          and not require a separate module for it -->
     <dependency>
diff --git a/src/test/java/io/ebean/BaseTestCase.java b/src/test/java/io/ebean/BaseTestCase.java
index c03988613..b53b095ec 100644
--- a/src/test/java/io/ebean/BaseTestCase.java
+++ b/src/test/java/io/ebean/BaseTestCase.java
@@ -16,7 +16,6 @@ import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandlerFactory;
 import io.ebeaninternal.server.transaction.TransactionScopeManager;
-import org.avaje.agentloader.AgentLoader;
 import org.junit.After;
 import org.junit.Rule;
 import org.junit.rules.TestName;
@@ -68,10 +67,6 @@ public abstract class BaseTestCase {
     } else {
       DB_CLOCK_DELTA = 100;
     }
-    logger.debug("... preStart");
-    if (!AgentLoader.loadAgentByMainClass("io.ebean.enhance.Transformer", "debug=1")) {
-      logger.info("avaje-ebeanorm-agent not found in classpath - not dynamically loaded");
-    }
     try {
       // First try, if we get the default server. If this fails, all tests will fail.
       Ebean.getDefaultServer();
diff --git a/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java b/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java
index 1645b0259..eb693ca48 100644
--- a/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java
+++ b/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java
@@ -2,8 +2,6 @@ package org.tests.transaction;
 
 import io.ebean.Ebean;
 import io.ebean.annotation.Transactional;
-import org.avaje.agentloader.AgentLoader;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,13 +21,6 @@ import static org.junit.Assert.fail;
 public class TransactionNotTerminatedAfterRollback {
   private static final Logger LOG = LoggerFactory.getLogger(TransactionNotTerminatedAfterRollback.class);
 
-  @BeforeClass
-  public static void preStart() {
-    LOG.debug("... preStart");
-    // display the log message to see if the UserService is enhanced
-    AgentLoader.loadAgentFromClasspath("avaje-ebeanorm-agent", "debug=1");
-  }
-
   @Test
   public void test() {
     try {
diff --git a/src/test/java/org/tests/unitinternal/HelloMain.java b/src/test/java/org/tests/unitinternal/HelloMain.java
index ca43af917..3ca929553 100644
--- a/src/test/java/org/tests/unitinternal/HelloMain.java
+++ b/src/test/java/org/tests/unitinternal/HelloMain.java
@@ -4,7 +4,6 @@ import io.ebean.EbeanServer;
 import io.ebean.EbeanServerFactory;
 import io.ebean.config.ServerConfig;
 import io.ebean.datasource.DataSourceConfig;
-import org.avaje.agentloader.AgentLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tests.model.basic.TOne;
@@ -15,13 +14,6 @@ public class HelloMain {
 
   protected static Logger logger = LoggerFactory.getLogger(HelloMain.class);
 
-  static {
-    logger.debug("... preStart");
-    if (!AgentLoader.loadAgentFromClasspath("avaje-ebeanorm-agent", "debug=1;packages=com.avaje.tests.**")) {
-      logger.info("avaje-ebeanorm-agent not found in classpath - not dynamically loaded");
-    }
-  }
-
   public static void main(String[] args) {
     // ### Configuration Objects ###
     ServerConfig serverConfig = new ServerConfig();

From 496672b394828f404067fc5d57f7bbcbe8d75cc6 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 14 Jul 2019 16:03:07 +1200
Subject: [PATCH 0951/1036] #1753 - Tidy for Issue with using the
 Formula-Properties

---
 .../server/query/CQueryBuilder.java           |  5 +--
 .../server/query/SqlTreeBuilder.java          |  3 +-
 .../query/SqlTreeNodeFormulaWhereJoin.java    |  7 +---
 .../query/joins/TestQueryJoinOnFormula.java   | 41 +++++++++++++++----
 4 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index d73458791..24953e857 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -265,9 +265,8 @@ class CQueryBuilder {
     if (!countDistinct) {
       // minimise select clause for standard count
       if (manyWhereJoins.isFormulaWithJoin()) {
-        // FIXME: we join the strings here and on the other side we split them again
-        // this is not yet optimal
-        query.select(String.join(",",manyWhereJoins.getFormulaJoinProperties()));
+        // Note that this is not yet optimal (split and join)
+        query.select(String.join(",", manyWhereJoins.getFormulaJoinProperties()));
       } else {
         query.setSelectId();
       }
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 6983de938..a0c17d128 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -299,8 +299,7 @@ public final class SqlTreeBuilder {
     if (manyWhereJoins.isFormulaWithJoin()) {
       for (String property: manyWhereJoins.getFormulaJoinProperties()) {
         STreeProperty beanProperty = desc.findPropertyFromPath(property);
-        SqlTreeNodeFormulaWhereJoin nodeJoin = new SqlTreeNodeFormulaWhereJoin(beanProperty, SqlJoinType.OUTER);
-        myJoinList.add(nodeJoin);
+        myJoinList.add(new SqlTreeNodeFormulaWhereJoin(beanProperty, SqlJoinType.OUTER));
       }
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeFormulaWhereJoin.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeFormulaWhereJoin.java
index 4ec6708b9..5eca4ed7a 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeFormulaWhereJoin.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeFormulaWhereJoin.java
@@ -67,18 +67,15 @@ class SqlTreeNodeFormulaWhereJoin implements SqlTreeNode {
    */
   @Override
   public void appendFrom(DbSqlContext ctx, SqlJoinType currentJoinType) {
-
     // always use the join type as per this many where join
     // (OUTER for disjunction and otherwise INNER)
     nodeBeanProp.appendFrom(ctx, manyJoinType);
   }
 
-
-
   @Override
   public void dependentTables(Set<String> tables) {
-    //FIXME: we cannot easily determine the dependent tables, this would require an enhancement
-    //of the @Formula(dependentTables=...) annotation
+    // FIXME: we cannot easily determine the dependent tables this would require an enhancement
+    // of the @Formula(dependentTables=...) annotation
   }
 
   @Override
diff --git a/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java b/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java
index 3ce0e6051..4171f8d58 100644
--- a/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java
+++ b/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java
@@ -67,6 +67,25 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
     assertThat(loggedSql.get(0)).contains("join (select order_id, count(*) as total_items,");
+    assertThat(loggedSql.get(0)).contains("elect count(*) from ( select t0.id, z_bt0.total_items from o_order t0 join (select order_id,");
+  }
+
+  @Test
+  public void test_OrderFindCount_multiFormula() {
+
+    LoggedSqlCollector.start();
+
+    int orders = Ebean.find(Order.class)
+      .where()
+      .eq("totalItems", 3)
+      .gt("totalAmount", 10)
+      .findCount();
+
+    assertThat(orders).isEqualTo(2);
+
+    List<String> loggedSql = LoggedSqlCollector.stop();
+    assertEquals(1, loggedSql.size());
+    assertThat(loggedSql.get(0)).contains("select count(*) from ( select t0.id, z_bt0.total_items, z_bt0.total_amount from o_order t0 join (select order_id,");
   }
 
   @Test
@@ -83,6 +102,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
     assertThat(loggedSql.get(0)).contains("join (select order_id, count(*) as total_items,");
+    assertThat(loggedSql.get(0)).contains("select t0.order_date from o_order t0");
   }
 
   @Test
@@ -102,6 +122,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
     assertThat(loggedSql.get(0)).contains("join (select order_id, count(*) as total_items,");
+    assertThat(loggedSql.get(0)).contains("select t0.id, z_bt0.total_items from o_order t0 join (select order_id");
   }
 
   @Test
@@ -112,10 +133,10 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
     List<ParentPerson> orderIds = Ebean.find(ParentPerson.class)
         .where().eq("totalAge", 3)
         .findIds();
-    // TODO: There are no beans in database, so for now only the query must run.
 
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
+    assertThat(loggedSql.get(0)).contains("where coalesce(f2.child_age, 0) = ?; --bind(3)");
   }
 
   @Test
@@ -128,10 +149,10 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
         //.where().eq("totalAge", 3)
         .where().eq("familyName", "foo")
         .findList();
-    // TODO: There are no beans in database, so for now only the query must run.
 
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
+    assertThat(loggedSql.get(0)).contains("select t0.identifier from parent_person t0 where t0.family_name = ?");
   }
 
   @Test
@@ -142,10 +163,11 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
     Ebean.find(ParentPerson.class)
       .where().eq("totalAge", 3)
       .findCount();
-    // TODO: There are no beans in database, so for now only the query must run.
 
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
+    assertThat(loggedSql.get(0)).contains("where coalesce(f2.child_age, 0) = ?)");
+    assertThat(loggedSql.get(0)).contains("select count(*) from ( select t0.identifier, coalesce(f2.child_age, 0) from parent_person t0");
   }
 
   @Test
@@ -154,13 +176,14 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
     LoggedSqlCollector.start();
 
     Ebean.find(ParentPerson.class)
-      .select("address") // .select("address, totalAge") would work
+      .select("address")
       .where().eq("totalAge", 3)
       .findSingleAttributeList();
-    // TODO: There are no beans in database, so for now only the query must run.
 
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
+    assertThat(loggedSql.get(0)).contains("select t0.address from parent_person t0 left join (select i2.parent_identifier");
+    assertThat(loggedSql.get(0)).contains("where coalesce(f2.child_age, 0) = ?; --bind(3)");
   }
 
   @Test
@@ -173,10 +196,10 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
       .setMaxRows(1)
       .orderById(true)
       .findOne();
-    // TODO: There are no beans in database, so for now only the query must run.
 
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
+    assertThat(loggedSql.get(0)).contains("where coalesce(f2.child_age, 0) = ? order by t0.identifier");
   }
 
   @Test
@@ -187,10 +210,11 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
     Ebean.find(ChildPerson.class)
         .where().eq("parent.totalAge", 3)
         .findIds();
-    // TODO: There are no beans in database, so for now only the query must run.
 
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
+    assertThat(loggedSql.get(0)).contains("select t0.identifier from child_person t0 left join (select i2.parent_identifier");
+    assertThat(loggedSql.get(0)).contains("where coalesce(f2.child_age, 0) = ?");
   }
 
   @Test
@@ -201,9 +225,10 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
     Ebean.find(ChildPerson.class)
         .where().eq("parent.totalAge", 3)
         .findCount();
-    // TODO: There are no beans in database, so for now only the query must run.
 
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
+    assertThat(loggedSql.get(0)).contains("select count(*) from ( select t0.identifier");
+    assertThat(loggedSql.get(0)).contains("where coalesce(f2.child_age, 0) = ?");
   }
 }

From 7d37c6cfd897c94f51a68c780e5becba0c9e51a4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 15 Jul 2019 19:04:43 +1200
Subject: [PATCH 0952/1036] #1753 - use selectId() for findCount() with Formula
 properties

---
 .../io/ebeaninternal/server/query/CQueryBuilder.java |  7 +------
 .../tests/query/joins/TestQueryJoinOnFormula.java    | 12 ++++++------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 24953e857..f6e3620a9 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -264,12 +264,7 @@ class CQueryBuilder {
     boolean countDistinct = query.isDistinct();
     if (!countDistinct) {
       // minimise select clause for standard count
-      if (manyWhereJoins.isFormulaWithJoin()) {
-        // Note that this is not yet optimal (split and join)
-        query.select(String.join(",", manyWhereJoins.getFormulaJoinProperties()));
-      } else {
-        query.setSelectId();
-      }
+      query.setSelectId();
     }
 
     CQueryPredicates predicates = new CQueryPredicates(binder, request);
diff --git a/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java b/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java
index 4171f8d58..d40430874 100644
--- a/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java
+++ b/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java
@@ -36,7 +36,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
 
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
-    assertThat(loggedSql.get(0)).contains("join (select order_id, count(*) as total_items,");
+    assertThat(loggedSql.get(0)).contains(" left join (select order_id, count(*) as total_items,");
   }
 
   @Test
@@ -51,7 +51,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
 
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
-    assertThat(loggedSql.get(0)).contains("join (select order_id, count(*) as total_items,");
+    assertThat(loggedSql.get(0)).contains(" left join (select order_id, count(*) as total_items,");
   }
 
   @Test
@@ -67,7 +67,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
     assertThat(loggedSql.get(0)).contains("join (select order_id, count(*) as total_items,");
-    assertThat(loggedSql.get(0)).contains("elect count(*) from ( select t0.id, z_bt0.total_items from o_order t0 join (select order_id,");
+    assertThat(loggedSql.get(0)).contains("select count(*) from ( select t0.id from o_order t0  left join (select order_id,");
   }
 
   @Test
@@ -85,7 +85,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
 
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
-    assertThat(loggedSql.get(0)).contains("select count(*) from ( select t0.id, z_bt0.total_items, z_bt0.total_amount from o_order t0 join (select order_id,");
+    assertThat(loggedSql.get(0)).contains("select count(*) from ( select t0.id from o_order t0  left join (select order_id,");
   }
 
   @Test
@@ -101,7 +101,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
 
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
-    assertThat(loggedSql.get(0)).contains("join (select order_id, count(*) as total_items,");
+    assertThat(loggedSql.get(0)).contains(" left join (select order_id, count(*) as total_items,");
     assertThat(loggedSql.get(0)).contains("select t0.order_date from o_order t0");
   }
 
@@ -167,7 +167,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
     assertThat(loggedSql.get(0)).contains("where coalesce(f2.child_age, 0) = ?)");
-    assertThat(loggedSql.get(0)).contains("select count(*) from ( select t0.identifier, coalesce(f2.child_age, 0) from parent_person t0");
+    assertThat(loggedSql.get(0)).contains("select count(*) from ( select t0.identifier from parent_person t0 left join (select i2.parent_identifier, count(*) as child_count");
   }
 
   @Test

From 945175c533b72c76cc47c3305c9a5b3d65143f51 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Tue, 16 Jul 2019 13:07:40 +0200
Subject: [PATCH 0953/1036] Throwing NotEnhancedException on _ebean_* method
 instead of enforce to implement them (#1755)

---
 src/main/java/io/ebean/bean/EntityBean.java   | 48 ++++++++++++++-----
 .../io/ebean/bean/NotEnhancedException.java   | 12 +++++
 2 files changed, 48 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/io/ebean/bean/NotEnhancedException.java

diff --git a/src/main/java/io/ebean/bean/EntityBean.java b/src/main/java/io/ebean/bean/EntityBean.java
index 305d67a78..03d1195c8 100644
--- a/src/main/java/io/ebean/bean/EntityBean.java
+++ b/src/main/java/io/ebean/bean/EntityBean.java
@@ -16,12 +16,16 @@ public interface EntityBean extends Serializable {
   /**
    * Return all the property names in defined order.
    */
-  String[] _ebean_getPropertyNames();
+  default String[] _ebean_getPropertyNames() {
+    throw new NotEnhancedException();
+  }
 
   /**
    * Return the property name at the given position.
    */
-  String _ebean_getPropertyName(int pos);
+  default String _ebean_getPropertyName(int pos) {
+    throw new NotEnhancedException();
+  }
 
   /**
    * Return the enhancement marker value.
@@ -30,28 +34,38 @@ public interface EntityBean extends Serializable {
    * entity classes are enhanced (specifically not just a super class).
    * </p>
    */
-  String _ebean_getMarker();
+  default String _ebean_getMarker() {
+    throw new NotEnhancedException();
+  }
 
   /**
    * Create and return a new entity bean instance.
    */
-  Object _ebean_newInstance();
+  default Object _ebean_newInstance() {
+    throw new NotEnhancedException();
+  }
 
   /**
    * Generated method that sets the loaded state on all the embedded beans on
    * this entity bean by using EntityBeanIntercept.setEmbeddedLoaded(Object o);
    */
-  void _ebean_setEmbeddedLoaded();
+  default void _ebean_setEmbeddedLoaded() {
+    throw new NotEnhancedException();
+  }
 
   /**
    * Return true if any embedded beans are new or dirty.
    */
-  boolean _ebean_isEmbeddedNewOrDirty();
+  default boolean _ebean_isEmbeddedNewOrDirty() {
+    throw new NotEnhancedException();
+  }
 
   /**
    * Return the intercept for this object.
    */
-  EntityBeanIntercept _ebean_getIntercept();
+  default EntityBeanIntercept _ebean_getIntercept() {
+    throw new NotEnhancedException();
+  }
 
   /**
    * Similar to _ebean_getIntercept() except it checks to see if the intercept
@@ -66,7 +80,9 @@ public interface EntityBean extends Serializable {
    * frameworks that can't take into account our ebean fields.
    * </p>
    */
-  EntityBeanIntercept _ebean_intercept();
+  default EntityBeanIntercept _ebean_intercept() {
+    throw new NotEnhancedException();
+  }
 
   /**
    * Set the value of a field of an entity bean of this type.
@@ -75,12 +91,16 @@ public interface EntityBean extends Serializable {
    * on entity beans. That means lazy loading and oldValues creation.
    * </p>
    */
-  void _ebean_setField(int fieldIndex, Object value);
+  default void _ebean_setField(int fieldIndex, Object value) {
+    throw new NotEnhancedException();
+  }
 
   /**
    * Set the field value with interception.
    */
-  void _ebean_setFieldIntercept(int fieldIndex, Object value);
+  default void _ebean_setFieldIntercept(int fieldIndex, Object value) {
+    throw new NotEnhancedException();
+  }
 
   /**
    * Return the value of a field from an entity bean of this type.
@@ -89,11 +109,15 @@ public interface EntityBean extends Serializable {
    * on entity beans. That means lazy loading.
    * </p>
    */
-  Object _ebean_getField(int fieldIndex);
+  default Object _ebean_getField(int fieldIndex) {
+    throw new NotEnhancedException();
+  }
 
   /**
    * Return the field value with interception.
    */
-  Object _ebean_getFieldIntercept(int fieldIndex);
+  default Object _ebean_getFieldIntercept(int fieldIndex) {
+    throw new NotEnhancedException();
+  }
 
 }
diff --git a/src/main/java/io/ebean/bean/NotEnhancedException.java b/src/main/java/io/ebean/bean/NotEnhancedException.java
new file mode 100644
index 000000000..cf4cf2142
--- /dev/null
+++ b/src/main/java/io/ebean/bean/NotEnhancedException.java
@@ -0,0 +1,12 @@
+package io.ebean.bean;
+
+/**
+ * This exception is thrown, when the default implementation of EntityBean is not or not properly overwritten by enhancer.
+ *
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+public class NotEnhancedException extends RuntimeException {
+  private static final long serialVersionUID = 1L;
+
+}

From f77388738b16a44bdf9cd1e359c4a38e68c308cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Camilo?= <ajcamilo@users.noreply.github.com>
Date: Tue, 16 Jul 2019 12:09:04 +0100
Subject: [PATCH 0954/1036] ENH: backdoor to disable @Transactional during unit
 testing (#1756)

---
 .../io/ebeaninternal/api/HelpScopeTrans.java  | 19 +++++++++++++++++--
 .../ebeaninternal/api/HelpScopeTransTest.java | 14 ++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/api/HelpScopeTrans.java b/src/main/java/io/ebeaninternal/api/HelpScopeTrans.java
index 6de5fb396..972a288f0 100644
--- a/src/main/java/io/ebeaninternal/api/HelpScopeTrans.java
+++ b/src/main/java/io/ebeaninternal/api/HelpScopeTrans.java
@@ -7,22 +7,37 @@ import io.ebean.TxScope;
  * Helper object to make AOP generated code simpler.
  */
 public class HelpScopeTrans {
+  private static boolean enabled = true;
 
   /**
    * Entering an enhanced transactional method.
    */
   public static void enter(TxScope txScope) {
-    server().scopedTransactionEnter(txScope);
+    if (enabled) {
+      server().scopedTransactionEnter(txScope);
+    }
   }
 
   /**
    * Exiting an enhanced transactional method.
    */
   public static void exit(Object returnOrThrowable, int opCode) {
-    server().scopedTransactionExit(returnOrThrowable, opCode);
+    if (enabled) {
+      server().scopedTransactionExit(returnOrThrowable, opCode);
+    }
   }
 
   private static SpiEbeanServer server() {
     return (SpiEbeanServer) Ebean.getDefaultServer();
   }
+
+  /**
+   * Defines if the @Transactional does what is supposed to do or is disabled
+   * (useful only unit testing)
+   *
+   * @param enabled if set to false, @Transactional will not create a transaction
+   */
+  public static void setEnabled(boolean enabled) {
+    HelpScopeTrans.enabled = enabled;
+  }
 }
diff --git a/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java b/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java
index a1bec1c87..6e7862580 100644
--- a/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java
+++ b/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.api;
 
 import io.ebean.Ebean;
 import io.ebean.TxScope;
+import org.junit.Assert;
 import org.junit.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
@@ -33,4 +34,17 @@ public class HelpScopeTransTest {
     HelpScopeTrans.exit(null, 1);
   }
 
+  @Test
+  public void disableTransaction() {
+    HelpScopeTrans.setEnabled(false);
+
+    try {
+      HelpScopeTrans.enter(TxScope.required());
+      Assert.assertNull(Ebean.getDefaultServer().currentTransaction());
+      HelpScopeTrans.exit(null, 1);
+    } finally {
+      HelpScopeTrans.setEnabled(true);
+    }
+  }
+
 }

From f31ab4d6a80cca2898d43bf4c44ca95c23334b77 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 17 Jul 2019 10:27:07 +1200
Subject: [PATCH 0955/1036] #1758 - Error when using ebean 11.41.1 and
 ebean-spring-txn 11.10.4

Fix method visibility restoring those methods as public
---
 .../ebeaninternal/api/SpiTransactionManager.java  | 15 +++++++++++++++
 .../server/transaction/TransactionManager.java    | 11 ++++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/api/SpiTransactionManager.java b/src/main/java/io/ebeaninternal/api/SpiTransactionManager.java
index d2c23ee67..1b6ae2894 100644
--- a/src/main/java/io/ebeaninternal/api/SpiTransactionManager.java
+++ b/src/main/java/io/ebeaninternal/api/SpiTransactionManager.java
@@ -40,4 +40,19 @@ public interface SpiTransactionManager {
    */
   void externalRemoveTransaction();
 
+  /**
+   * Notify of a transaction commit.
+   */
+  void notifyOfCommit(SpiTransaction transaction);
+
+  /**
+   * Notify of a transaction rollback.
+   */
+  void notifyOfRollback(SpiTransaction transaction, Throwable cause);
+
+  /**
+   * Notify of a query only transaction commit.
+   */
+  void notifyOfQueryOnly(SpiTransaction transaction);
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index 8b5c87671..396159846 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -360,7 +360,8 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Process a local rolled back transaction.
    */
-  void notifyOfRollback(SpiTransaction transaction, Throwable cause) {
+  @Override
+  public void notifyOfRollback(SpiTransaction transaction, Throwable cause) {
 
     try {
       if (txnLogger.isDebug()) {
@@ -379,8 +380,8 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Query only transaction in read committed isolation.
    */
-  void notifyOfQueryOnly(SpiTransaction transaction) {
-
+  @Override
+  public void notifyOfQueryOnly(SpiTransaction transaction) {
     // Nothing that interesting here
     if (txnLogger.isTrace()) {
       txnLogger.trace(transaction.getLogPrefix() + "Commit - query only");
@@ -414,8 +415,8 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Process a local committed transaction.
    */
-  void notifyOfCommit(SpiTransaction transaction) {
-
+  @Override
+  public void notifyOfCommit(SpiTransaction transaction) {
     try {
       if (txnLogger.isDebug()) {
         txnLogger.debug(transaction.getLogPrefix() + "Commit");

From 0663a97941b4b915aac4eac49eb10f08ffce076d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 17 Jul 2019 13:48:12 +1200
Subject: [PATCH 0956/1036] No effective change - update test for
 TestTransientMap

---
 .../org/tests/basic/type/BSimpleWithGen.java  | 10 ++++++---
 .../tests/basic/type/TestTransientMap.java    | 22 +++++++++++++++----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/test/java/org/tests/basic/type/BSimpleWithGen.java b/src/test/java/org/tests/basic/type/BSimpleWithGen.java
index a24e9a1ae..5de7ef9f2 100644
--- a/src/test/java/org/tests/basic/type/BSimpleWithGen.java
+++ b/src/test/java/org/tests/basic/type/BSimpleWithGen.java
@@ -10,12 +10,16 @@ import java.util.Map;
 public class BSimpleWithGen {
 
   @Id
-  Integer id;
+  private Integer id;
 
-  String name;
+  private String name;
 
   @Transient
-  Map<String, List<String>> someMap;
+  private Map<String, List<String>> someMap;
+
+  public BSimpleWithGen(String name) {
+    this.name = name;
+  }
 
   public Integer getId() {
     return id;
diff --git a/src/test/java/org/tests/basic/type/TestTransientMap.java b/src/test/java/org/tests/basic/type/TestTransientMap.java
index aebf7c69d..cb6f7b8c1 100644
--- a/src/test/java/org/tests/basic/type/TestTransientMap.java
+++ b/src/test/java/org/tests/basic/type/TestTransientMap.java
@@ -1,18 +1,32 @@
 package org.tests.basic.type;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import org.junit.Test;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class TestTransientMap extends BaseTestCase {
 
   @Test
   public void testMe() {
 
-    BSimpleWithGen b = new BSimpleWithGen();
-    b.setName("blah");
+    Map<String, List<String>> map = new HashMap<>();
+    map.put("foo", new ArrayList<>());
 
-    Ebean.save(b);
+    BSimpleWithGen b = new BSimpleWithGen("blah");
+    b.setSomeMap(map);
+    DB.save(b);
 
+    final BSimpleWithGen found = DB.find(BSimpleWithGen.class, b.getId());
+    assertThat(found.getName()).isEqualTo("blah");
+    assertThat(found.getSomeMap()).isNull();
+
+    DB.delete(b);
   }
 }

From dcf7b60d375f07dbbc28ae9be5af6d1212e97a99 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 17 Jul 2019 14:44:52 +1200
Subject: [PATCH 0957/1036] #1760 #1759 - ENH: Add
 ForTests.rollbackAll(closure) and ForTests.createRollbackAll()

---
 src/main/java/io/ebean/ForTests.java          | 113 ++++++++++++++++++
 .../org/tests/ForTestsBeforeAfterTest.java    |  49 ++++++++
 src/test/java/org/tests/ForTestsTest.java     |  54 +++++++++
 3 files changed, 216 insertions(+)
 create mode 100644 src/main/java/io/ebean/ForTests.java
 create mode 100644 src/test/java/org/tests/ForTestsBeforeAfterTest.java
 create mode 100644 src/test/java/org/tests/ForTestsTest.java

diff --git a/src/main/java/io/ebean/ForTests.java b/src/main/java/io/ebean/ForTests.java
new file mode 100644
index 000000000..d1b3d89b2
--- /dev/null
+++ b/src/main/java/io/ebean/ForTests.java
@@ -0,0 +1,113 @@
+package io.ebean;
+
+import io.ebeaninternal.api.HelpScopeTrans;
+
+/**
+ * Helper methods for testing.
+ */
+public class ForTests {
+
+  /**
+   * Enable or disable <code>@Transactional</code> methods.
+   * <p>
+   * This is intended for testing purposes such that tests
+   * on code with {@code @Transactional} methods don't actually
+   * start or complete transactions.
+   * </p>
+   *
+   * @param enable Set false to disable {@code @Transactional} methods
+   */
+  public static void enableTransactional(boolean enable) {
+    HelpScopeTrans.setEnabled(enable);
+  }
+
+  /**
+   * Run the closure with <code>@Transactional</code> methods
+   * effectively disabled (they won't create/commit transactions).
+   */
+  public static void noTransactional(Runnable run) {
+    try {
+      enableTransactional(false);
+      run.run();
+    } finally {
+      enableTransactional(true);
+    }
+  }
+
+  /**
+   * All transactions started in the closure are effectively rolled back.
+   * <p>
+   * This creates a wrapping transaction that uses {@link Transaction#setNestedUseSavepoint()}.
+   * All nested transactions are created as savepoints. On completion the wrapping
+   * transaction is rolled back.
+   * </p>
+   *
+   * @param run Closure that runs such that all the transactions are rolled back.
+   */
+  public static void rollbackAll(Runnable run) {
+
+    try (Transaction transaction = DB.beginTransaction()) {
+      transaction.setNestedUseSavepoint();
+      run.run();
+
+      transaction.rollback();
+    }
+  }
+
+  /**
+   * Create and return a RollbackAll which should be closed at the end of the test(s).
+   * <p>
+   * In tests for <code>@Before</code> we create the rollbackAll and on
+   * <code>@After</code> we <code>close()</code> it effectively rolling
+   * back all changes made during test execution.
+   * </p>
+   *
+   * <pre>{@code
+   *
+   *   private ForTests.RollbackAll rollbackAll;
+   *
+   *   @Before
+   *   public void before() {
+   *     rollbackAll = ForTests.createRollbackAll();
+   *   }
+   *
+   *   @After
+   *   public void after() {
+   *     rollbackAll.close();
+   *   }
+   *
+   *   ... tests execute and everything is rolled back
+   *
+   *
+   * }</pre>
+   */
+  public static RollbackAll createRollbackAll() {
+
+    final Transaction transaction = DB.beginTransaction();
+    transaction.setNestedUseSavepoint();
+    return new RollbackAll(transaction);
+  }
+
+  /**
+   * A wrapping transaction used in test code to rollback all changes.
+   * <p>
+   * We must ensure that <code>close()</code> is called.
+   * </p>
+   */
+  public static class RollbackAll implements AutoCloseable {
+
+    private final Transaction transaction;
+
+    private RollbackAll(Transaction transaction) {
+      this.transaction = transaction;
+    }
+
+    /**
+     * Rollback the wrapping transaction.
+     */
+    @Override
+    public void close() {
+      transaction.rollback();
+    }
+  }
+}
diff --git a/src/test/java/org/tests/ForTestsBeforeAfterTest.java b/src/test/java/org/tests/ForTestsBeforeAfterTest.java
new file mode 100644
index 000000000..f1832b4be
--- /dev/null
+++ b/src/test/java/org/tests/ForTestsBeforeAfterTest.java
@@ -0,0 +1,49 @@
+package org.tests;
+
+import io.ebean.DB;
+import io.ebean.ForTests;
+import io.ebean.annotation.Transactional;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.tests.basic.type.BSimpleWithGen;
+
+import static org.assertj.core.api.StrictAssertions.assertThat;
+
+public class ForTestsBeforeAfterTest {
+
+  private ForTests.RollbackAll rollbackAll;
+
+  @Before
+  public void before() {
+    rollbackAll = ForTests.createRollbackAll();
+  }
+
+  @After
+  public void after() {
+    rollbackAll.close();
+    assertThat(getCount()).isEqualTo(0);
+  }
+
+
+  @Test
+  public void createRollbackAll() {
+
+    doInsert();
+    assertThat(getCount()).isEqualTo(1);
+  }
+
+  private int getCount() {
+    return DB.find(BSimpleWithGen.class)
+        .where().eq("name", "ForTestsBeforeAfterTest")
+        .findCount();
+  }
+
+  @Transactional
+  private void doInsert() {
+
+    BSimpleWithGen bean = new BSimpleWithGen("ForTestsBeforeAfterTest");
+    DB.save(bean);
+  }
+
+}
diff --git a/src/test/java/org/tests/ForTestsTest.java b/src/test/java/org/tests/ForTestsTest.java
new file mode 100644
index 000000000..fb5052f82
--- /dev/null
+++ b/src/test/java/org/tests/ForTestsTest.java
@@ -0,0 +1,54 @@
+package org.tests;
+
+import io.ebean.DB;
+import io.ebean.ForTests;
+import io.ebean.Transaction;
+import io.ebean.annotation.Transactional;
+import org.junit.Test;
+import org.tests.basic.type.BSimpleWithGen;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ForTestsTest {
+
+  @Test
+  public void noTransactional_expect_noTransactionEnterExitCalled() {
+
+    ForTests.noTransactional(this::checkForTransactional);
+  }
+
+  @Test
+  public void enableTransactional() {
+
+    ForTests.enableTransactional(false);
+
+    checkForTransactional();
+
+    ForTests.enableTransactional(true);
+  }
+
+  @Transactional
+  private void checkForTransactional() {
+
+    final Transaction transaction = DB.currentTransaction();
+    assertThat(transaction).isNull();
+  }
+
+  @Test
+  public void rollbackTransactions() {
+
+    DB.find(BSimpleWithGen.class).delete();
+
+    ForTests.rollbackAll(this::doInsert);
+
+    final int count = DB.find(BSimpleWithGen.class).findCount();
+    assertThat(count).isEqualTo(0);
+  }
+
+  @Transactional
+  private void doInsert() {
+
+    BSimpleWithGen bean = new BSimpleWithGen("doInsert");
+    DB.save(bean);
+  }
+}

From ee4d1bf866ef040de4e2831285a7fe82e586890b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 17 Jul 2019 15:48:11 +1200
Subject: [PATCH 0958/1036] #1760 #1759 - move make available via
 ebean-test-config

---
 src/main/java/io/ebean/ForTests.java          | 113 ------------------
 .../org/tests/ForTestsBeforeAfterTest.java    |  49 --------
 src/test/java/org/tests/ForTestsTest.java     |  54 ---------
 3 files changed, 216 deletions(-)
 delete mode 100644 src/main/java/io/ebean/ForTests.java
 delete mode 100644 src/test/java/org/tests/ForTestsBeforeAfterTest.java
 delete mode 100644 src/test/java/org/tests/ForTestsTest.java

diff --git a/src/main/java/io/ebean/ForTests.java b/src/main/java/io/ebean/ForTests.java
deleted file mode 100644
index d1b3d89b2..000000000
--- a/src/main/java/io/ebean/ForTests.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package io.ebean;
-
-import io.ebeaninternal.api.HelpScopeTrans;
-
-/**
- * Helper methods for testing.
- */
-public class ForTests {
-
-  /**
-   * Enable or disable <code>@Transactional</code> methods.
-   * <p>
-   * This is intended for testing purposes such that tests
-   * on code with {@code @Transactional} methods don't actually
-   * start or complete transactions.
-   * </p>
-   *
-   * @param enable Set false to disable {@code @Transactional} methods
-   */
-  public static void enableTransactional(boolean enable) {
-    HelpScopeTrans.setEnabled(enable);
-  }
-
-  /**
-   * Run the closure with <code>@Transactional</code> methods
-   * effectively disabled (they won't create/commit transactions).
-   */
-  public static void noTransactional(Runnable run) {
-    try {
-      enableTransactional(false);
-      run.run();
-    } finally {
-      enableTransactional(true);
-    }
-  }
-
-  /**
-   * All transactions started in the closure are effectively rolled back.
-   * <p>
-   * This creates a wrapping transaction that uses {@link Transaction#setNestedUseSavepoint()}.
-   * All nested transactions are created as savepoints. On completion the wrapping
-   * transaction is rolled back.
-   * </p>
-   *
-   * @param run Closure that runs such that all the transactions are rolled back.
-   */
-  public static void rollbackAll(Runnable run) {
-
-    try (Transaction transaction = DB.beginTransaction()) {
-      transaction.setNestedUseSavepoint();
-      run.run();
-
-      transaction.rollback();
-    }
-  }
-
-  /**
-   * Create and return a RollbackAll which should be closed at the end of the test(s).
-   * <p>
-   * In tests for <code>@Before</code> we create the rollbackAll and on
-   * <code>@After</code> we <code>close()</code> it effectively rolling
-   * back all changes made during test execution.
-   * </p>
-   *
-   * <pre>{@code
-   *
-   *   private ForTests.RollbackAll rollbackAll;
-   *
-   *   @Before
-   *   public void before() {
-   *     rollbackAll = ForTests.createRollbackAll();
-   *   }
-   *
-   *   @After
-   *   public void after() {
-   *     rollbackAll.close();
-   *   }
-   *
-   *   ... tests execute and everything is rolled back
-   *
-   *
-   * }</pre>
-   */
-  public static RollbackAll createRollbackAll() {
-
-    final Transaction transaction = DB.beginTransaction();
-    transaction.setNestedUseSavepoint();
-    return new RollbackAll(transaction);
-  }
-
-  /**
-   * A wrapping transaction used in test code to rollback all changes.
-   * <p>
-   * We must ensure that <code>close()</code> is called.
-   * </p>
-   */
-  public static class RollbackAll implements AutoCloseable {
-
-    private final Transaction transaction;
-
-    private RollbackAll(Transaction transaction) {
-      this.transaction = transaction;
-    }
-
-    /**
-     * Rollback the wrapping transaction.
-     */
-    @Override
-    public void close() {
-      transaction.rollback();
-    }
-  }
-}
diff --git a/src/test/java/org/tests/ForTestsBeforeAfterTest.java b/src/test/java/org/tests/ForTestsBeforeAfterTest.java
deleted file mode 100644
index f1832b4be..000000000
--- a/src/test/java/org/tests/ForTestsBeforeAfterTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.tests;
-
-import io.ebean.DB;
-import io.ebean.ForTests;
-import io.ebean.annotation.Transactional;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.tests.basic.type.BSimpleWithGen;
-
-import static org.assertj.core.api.StrictAssertions.assertThat;
-
-public class ForTestsBeforeAfterTest {
-
-  private ForTests.RollbackAll rollbackAll;
-
-  @Before
-  public void before() {
-    rollbackAll = ForTests.createRollbackAll();
-  }
-
-  @After
-  public void after() {
-    rollbackAll.close();
-    assertThat(getCount()).isEqualTo(0);
-  }
-
-
-  @Test
-  public void createRollbackAll() {
-
-    doInsert();
-    assertThat(getCount()).isEqualTo(1);
-  }
-
-  private int getCount() {
-    return DB.find(BSimpleWithGen.class)
-        .where().eq("name", "ForTestsBeforeAfterTest")
-        .findCount();
-  }
-
-  @Transactional
-  private void doInsert() {
-
-    BSimpleWithGen bean = new BSimpleWithGen("ForTestsBeforeAfterTest");
-    DB.save(bean);
-  }
-
-}
diff --git a/src/test/java/org/tests/ForTestsTest.java b/src/test/java/org/tests/ForTestsTest.java
deleted file mode 100644
index fb5052f82..000000000
--- a/src/test/java/org/tests/ForTestsTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.tests;
-
-import io.ebean.DB;
-import io.ebean.ForTests;
-import io.ebean.Transaction;
-import io.ebean.annotation.Transactional;
-import org.junit.Test;
-import org.tests.basic.type.BSimpleWithGen;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class ForTestsTest {
-
-  @Test
-  public void noTransactional_expect_noTransactionEnterExitCalled() {
-
-    ForTests.noTransactional(this::checkForTransactional);
-  }
-
-  @Test
-  public void enableTransactional() {
-
-    ForTests.enableTransactional(false);
-
-    checkForTransactional();
-
-    ForTests.enableTransactional(true);
-  }
-
-  @Transactional
-  private void checkForTransactional() {
-
-    final Transaction transaction = DB.currentTransaction();
-    assertThat(transaction).isNull();
-  }
-
-  @Test
-  public void rollbackTransactions() {
-
-    DB.find(BSimpleWithGen.class).delete();
-
-    ForTests.rollbackAll(this::doInsert);
-
-    final int count = DB.find(BSimpleWithGen.class).findCount();
-    assertThat(count).isEqualTo(0);
-  }
-
-  @Transactional
-  private void doInsert() {
-
-    BSimpleWithGen bean = new BSimpleWithGen("doInsert");
-    DB.save(bean);
-  }
-}

From fa45c79bd26b862ef3643bc08a3a252560933a1c Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 17 Jul 2019 21:53:01 +1200
Subject: [PATCH 0959/1036] [maven-release-plugin] prepare release
 ebean-11.41.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e91d11e58..30f939f1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.41.2-SNAPSHOT</version>
+  <version>11.41.2</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.41.2</tag>
   </scm>
 
   <profiles>

From 502104eba82eb93ccd63ab9b6d6e161630f19b44 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 17 Jul 2019 21:53:14 +1200
Subject: [PATCH 0960/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 30f939f1c..664f6cb3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.41.2</version>
+  <version>11.41.3-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.41.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 272eae5f22ddf5d0abdafa9b2b754d2cc8db0da4 Mon Sep 17 00:00:00 2001
From: Alexander Wagner <alexander.wagner@foconis.de>
Date: Thu, 18 Jul 2019 11:00:32 +0200
Subject: [PATCH 0961/1036] Do not use @View for Test

---
 .../lazyforeignkeys/MainEntityRelation.java   | 46 +++++++++++-------
 .../lazyforeignkeys/TestLazyForeignKeys.java  | 42 ++++++++++-------
 .../tests/lazyforeignkeys/ViewMainEntity.java | 42 -----------------
 .../ViewMainEntityRelation.java               | 47 -------------------
 4 files changed, 52 insertions(+), 125 deletions(-)
 delete mode 100644 src/test/java/org/tests/lazyforeignkeys/ViewMainEntity.java
 delete mode 100644 src/test/java/org/tests/lazyforeignkeys/ViewMainEntityRelation.java

diff --git a/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java b/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java
index 06554932a..20c6ed4e9 100644
--- a/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java
+++ b/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java
@@ -4,8 +4,12 @@ import java.util.UUID;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
+import io.ebean.annotation.DbForeignKey;
+
 
 @Entity
 @Table(name = "main_entity_relation")
@@ -14,28 +18,34 @@ public class MainEntityRelation {
   @Id
   private UUID id;
 
-  private String id1;
+  @ManyToOne
+  @JoinColumn(name = "id1")
+  @DbForeignKey(noConstraint = true)
+  private MainEntity entity1;
   
-  private String id2;
+  @ManyToOne
+  @JoinColumn(name = "id2")
+  @DbForeignKey(noConstraint = true)
+  private MainEntity entity2;
   
   private String attr1;
-
-  public String getId1() {
-    return id1;
-  }
-
-  public void setId1(String id1) {
-    this.id1 = id1;
-  }
-
-  public String getId2() {
-    return id2;
-  }
-
-  public void setId2(String id2) {
-    this.id2 = id2;
-  }
   
+  public MainEntity getEntity1() {
+    return entity1;
+  }
+
+  public void setEntity1(MainEntity entity1) {
+    this.entity1 = entity1;
+  }
+
+  public MainEntity getEntity2() {
+    return entity2;
+  }
+
+  public void setEntity2(MainEntity entity2) {
+    this.entity2 = entity2;
+  }
+
   public String getAttr1() {
     return attr1;
   }
diff --git a/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java b/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java
index 5d5583903..ccafc56f5 100644
--- a/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java
+++ b/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java
@@ -26,10 +26,16 @@ public class TestLazyForeignKeys extends BaseTestCase {
     DB.save(ent1);
 
     MainEntityRelation rel1 = new MainEntityRelation();
-    rel1.setId1("ent1");
-    rel1.setId2("ent2");
+    MainEntity e1 = new MainEntity();
+    e1.setId("ent1");
+    MainEntity e2 = new MainEntity();
+    e2.setId("ent2");
+    
+    rel1.setEntity1(e1);
+    rel1.setEntity2(e2);
     DB.save(rel1);
   }
+  
   @After
   public void cleanup() {
     DB.find(MainEntity.class).delete();
@@ -41,21 +47,22 @@ public class TestLazyForeignKeys extends BaseTestCase {
     // use findOne without select, so lazy loading will occur
     LoggedSqlCollector.start();
 
-    ViewMainEntityRelation vwRel1 = DB.find(ViewMainEntityRelation.class).findOne();
+    MainEntityRelation rel1 = DB.find(MainEntityRelation.class).findOne();
 
-    assertEquals("ent1", vwRel1.getEntity1().getId());
-    assertEquals("ent2", vwRel1.getEntity2().getId());
+    assertEquals("ent1", rel1.getEntity1().getId());
+    assertEquals("ent2", rel1.getEntity2().getId());
 
-    assertEquals("attr1", vwRel1.getEntity1().getAttr1());
-    assertFalse(vwRel1.getEntity1().isDeleted());
-    assertTrue(vwRel1.getEntity2().isDeleted());
+    assertEquals("attr1", rel1.getEntity1().getAttr1());
+    assertFalse(rel1.getEntity1().isDeleted());
+    assertTrue(rel1.getEntity2().isDeleted());
 
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertThat(loggedSql).hasSize(3);
-    assertThat(loggedSql.get(0)).contains("select t0.id, t0.attr1, t0.id1, t0.id2 from vw_main_entity_relation");
+    assertThat(loggedSql.get(0)).contains("select t0.id, t0.attr1, t0.id1, t0.id2 from main_entity_relation");
     assertThat(loggedSql.get(1)).contains("select t0.id, t0.attr1, t0.attr2, t0.id is null from main_entity t0");
     assertThat(loggedSql.get(2)).contains("select t0.id, t0.attr1, t0.attr2, t0.id is null from main_entity t0");
   }
+  
   @Test
   public void testFindListWithSelect() {
     PathProperties pathProp = new PathProperties();
@@ -63,20 +70,19 @@ public class TestLazyForeignKeys extends BaseTestCase {
     pathProp.addToPath("entity1", "id");
     pathProp.addToPath("entity2", "id");
 
-    Query<ViewMainEntityRelation> query = Ebean.find(ViewMainEntityRelation.class).apply(pathProp);
-    List<ViewMainEntityRelation> list = query.findList();
+    Query<MainEntityRelation> query = Ebean.find(MainEntityRelation.class).apply(pathProp);
+    List<MainEntityRelation> list = query.findList();
     assertEquals(1, list.size());
 
     System.out.println(query.getGeneratedSql());
     assertThat(query.getGeneratedSql()).contains("t0.id, t0.attr1, t0.id1, t0.id2, t1.id, t2.id");
 
-    ViewMainEntityRelation vwRel1 = list.get(0);
-    assertEquals("ent1", vwRel1.getEntity1().getId());
-    assertEquals("ent2", vwRel1.getEntity2().getId());
-
-    assertEquals("attr1", vwRel1.getEntity1().getAttr1());
-    assertFalse(vwRel1.getEntity1().isDeleted());
-    assertTrue(vwRel1.getEntity2().isDeleted());
+    MainEntityRelation rel1 = list.get(0);
+    assertEquals("ent1", rel1.getEntity1().getId());
+    assertEquals("ent2", rel1.getEntity2().getId());
 
+    assertEquals("attr1", rel1.getEntity1().getAttr1());
+    assertFalse(rel1.getEntity1().isDeleted());
+    assertTrue(rel1.getEntity2().isDeleted());
   }
 }
diff --git a/src/test/java/org/tests/lazyforeignkeys/ViewMainEntity.java b/src/test/java/org/tests/lazyforeignkeys/ViewMainEntity.java
deleted file mode 100644
index 66ecd74c9..000000000
--- a/src/test/java/org/tests/lazyforeignkeys/ViewMainEntity.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.tests.lazyforeignkeys;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-import io.ebean.annotation.View;
-
-@View(name = "vw_main_entity")
-@Entity
-public class ViewMainEntity {
-
-  @Id
-  private String id;
-
-  private String attr1;
-  
-  private String attr2;
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public String getAttr1() {
-    return attr1;
-  }
-
-  public void setAttr1(String attr1) {
-    this.attr1 = attr1;
-  }
-
-  public String getAttr2() {
-    return attr2;
-  }
-
-  public void setAttr2(String attr2) {
-    this.attr2 = attr2;
-  }
-}
diff --git a/src/test/java/org/tests/lazyforeignkeys/ViewMainEntityRelation.java b/src/test/java/org/tests/lazyforeignkeys/ViewMainEntityRelation.java
deleted file mode 100644
index 050f76623..000000000
--- a/src/test/java/org/tests/lazyforeignkeys/ViewMainEntityRelation.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.tests.lazyforeignkeys;
-
-import java.util.UUID;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-
-import io.ebean.annotation.DbForeignKey;
-import io.ebean.annotation.View;
-
-@View(name = "vw_main_entity_relation")
-@Entity
-public class ViewMainEntityRelation {
-
-  @Id
-  private UUID id;
-
-  @ManyToOne
-  @JoinColumn(name = "id1")
-  @DbForeignKey(noConstraint = true)
-  private MainEntity entity1;
-  
-  @ManyToOne
-  @JoinColumn(name = "id2")
-  @DbForeignKey(noConstraint = true)
-  private MainEntity entity2;
-  
-  private String attr1;
-
-  public String getAttr1() {
-    return attr1;
-  }
-
-  public void setAttr1(String attr1) {
-    this.attr1 = attr1;
-  }
-
-  public MainEntity getEntity1() {
-    return entity1;
-  }
-
-  public MainEntity getEntity2() {
-    return entity2;
-  }
-}

From bfe46432dad375797041ca72ded0b046fc4ad37f Mon Sep 17 00:00:00 2001
From: Alexander Wagner <alexander.wagner@foconis.de>
Date: Thu, 18 Jul 2019 12:14:38 +0200
Subject: [PATCH 0962/1036] delete views from ddl

---
 .../migrationtest/h2/R__main_entity_views.sql        |  8 --------
 src/test/resources/extra-ddl.xml                     | 12 ------------
 2 files changed, 20 deletions(-)
 delete mode 100644 src/test/resources/dbmigration/migrationtest/h2/R__main_entity_views.sql

diff --git a/src/test/resources/dbmigration/migrationtest/h2/R__main_entity_views.sql b/src/test/resources/dbmigration/migrationtest/h2/R__main_entity_views.sql
deleted file mode 100644
index c69bc088d..000000000
--- a/src/test/resources/dbmigration/migrationtest/h2/R__main_entity_views.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-    create or replace view vw_main_entity as
-    select * from main_entity;
-    
-    create or replace view vw_main_entity_relation as
-    select * from main_entity_relation;
-  
\ No newline at end of file
diff --git a/src/test/resources/extra-ddl.xml b/src/test/resources/extra-ddl.xml
index 0f152469b..9e85e6b4d 100644
--- a/src/test/resources/extra-ddl.xml
+++ b/src/test/resources/extra-ddl.xml
@@ -4,10 +4,6 @@
   <ddl-script name="order views" platforms="h2" drop="true">
       drop view order_agg_vw if exists;
   </ddl-script>
-  <ddl-script name="main entity views" platforms="h2" drop="true">
-      drop view vw_main_entity if exists;
-      drop view vw_main_entity_relation if exists;
-  </ddl-script>
   
   <ddl-script name="order views" platforms="db2,h2,postgres,oracle,mysql">
     create or replace view order_agg_vw as
@@ -16,14 +12,6 @@
     from o_order_detail d
     group by d.order_id
   </ddl-script>
-
-  <ddl-script name="main entity views" platforms="db2,h2,postgres,oracle,mysql">
-    create or replace view vw_main_entity as
-    select * from main_entity;
-    
-    create or replace view vw_main_entity_relation as
-    select * from main_entity_relation;
-  </ddl-script>
   
   <ddl-script name="order views hsqldb" platforms="hsqldb">
     drop view order_agg_vw if exists ;

From 486a8cf1c01c0f324d67d676836d02db3381b344 Mon Sep 17 00:00:00 2001
From: Alexander Wagner <alexander.wagner@foconis.de>
Date: Thu, 18 Jul 2019 12:15:44 +0200
Subject: [PATCH 0963/1036] whitespaces

---
 src/test/resources/extra-ddl.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/test/resources/extra-ddl.xml b/src/test/resources/extra-ddl.xml
index 9e85e6b4d..b01ed35b2 100644
--- a/src/test/resources/extra-ddl.xml
+++ b/src/test/resources/extra-ddl.xml
@@ -4,7 +4,7 @@
   <ddl-script name="order views" platforms="h2" drop="true">
       drop view order_agg_vw if exists;
   </ddl-script>
-  
+
   <ddl-script name="order views" platforms="db2,h2,postgres,oracle,mysql">
     create or replace view order_agg_vw as
     select d.order_id, sum(d.order_qty * d.unit_price) as order_total,
@@ -12,7 +12,7 @@
     from o_order_detail d
     group by d.order_id
   </ddl-script>
-  
+
   <ddl-script name="order views hsqldb" platforms="hsqldb">
     drop view order_agg_vw if exists ;
     create view order_agg_vw as
@@ -21,7 +21,7 @@
     from o_order_detail d
     group by d.order_id;
   </ddl-script>
-  
+
   <ddl-script name="order views hana" platforms="hana">
     create view order_agg_vw as
     select d.order_id, sum(d.order_qty * d.unit_price) as order_total,
@@ -37,7 +37,6 @@
            sum(d.ship_qty * d.unit_price) as ship_total
     from o_order_detail d
     group by d.order_id;
-
   </ddl-script>
 
   <ddl-script name="order views mssql" platforms="sqlserver">

From ea13b322cad5abced7e5087b95e5ed849fd7509f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 18 Jul 2019 23:34:28 +1200
Subject: [PATCH 0964/1036] Bump agent to 11.41.3

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 664f6cb3a..51b1011b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -316,7 +316,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>11.41.2</version>
+        <version>11.41.3</version>
         <executions>
           <execution>
             <id>test</id>

From cbf7811f7cfae799ffba6fb8c645e448f80fcd71 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 18 Jul 2019 23:37:25 +1200
Subject: [PATCH 0965/1036] #1762 - Bump ebean-migration to 11.17.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 51b1011b7..b45c22c28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>11.16.2</version>
+      <version>11.17.1</version>
     </dependency>
 
     <dependency>

From 858c55c97872fb497f1b5fcb2cd8a5246677a42d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 19 Jul 2019 00:20:22 +1200
Subject: [PATCH 0966/1036] No effective change - format only test code

---
 .../org/tests/lazyforeignkeys/MainEntity.java |  8 +++---
 .../lazyforeignkeys/MainEntityRelation.java   | 11 ++++----
 .../lazyforeignkeys/TestLazyForeignKeys.java  | 28 +++++++++----------
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/test/java/org/tests/lazyforeignkeys/MainEntity.java b/src/test/java/org/tests/lazyforeignkeys/MainEntity.java
index ec92722db..3fa760583 100644
--- a/src/test/java/org/tests/lazyforeignkeys/MainEntity.java
+++ b/src/test/java/org/tests/lazyforeignkeys/MainEntity.java
@@ -1,13 +1,13 @@
 package org.tests.lazyforeignkeys;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 import io.ebean.annotation.Formula;
 import io.ebean.annotation.Platform;
 import io.ebean.annotation.SoftDelete;
 
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
 @Entity
 @Table(name = "main_entity")
 public class MainEntity {
diff --git a/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java b/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java
index 20c6ed4e9..6b4740512 100644
--- a/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java
+++ b/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java
@@ -1,14 +1,13 @@
 package org.tests.lazyforeignkeys;
 
-import java.util.UUID;
+import io.ebean.annotation.DbForeignKey;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
-
-import io.ebean.annotation.DbForeignKey;
+import java.util.UUID;
 
 
 @Entity
@@ -22,14 +21,14 @@ public class MainEntityRelation {
   @JoinColumn(name = "id1")
   @DbForeignKey(noConstraint = true)
   private MainEntity entity1;
-  
+
   @ManyToOne
   @JoinColumn(name = "id2")
   @DbForeignKey(noConstraint = true)
   private MainEntity entity2;
-  
+
   private String attr1;
-  
+
   public MainEntity getEntity1() {
     return entity1;
   }
diff --git a/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java b/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java
index ccafc56f5..d8d19dd56 100644
--- a/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java
+++ b/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java
@@ -1,20 +1,21 @@
 package org.tests.lazyforeignkeys;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
-
-import java.util.List;
-
-import org.ebeantest.LoggedSqlCollector;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
 import io.ebean.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.Query;
 import io.ebean.text.PathProperties;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 public class TestLazyForeignKeys extends BaseTestCase {
 
@@ -30,12 +31,12 @@ public class TestLazyForeignKeys extends BaseTestCase {
     e1.setId("ent1");
     MainEntity e2 = new MainEntity();
     e2.setId("ent2");
-    
+
     rel1.setEntity1(e1);
     rel1.setEntity2(e2);
     DB.save(rel1);
   }
-  
+
   @After
   public void cleanup() {
     DB.find(MainEntity.class).delete();
@@ -62,7 +63,7 @@ public class TestLazyForeignKeys extends BaseTestCase {
     assertThat(loggedSql.get(1)).contains("select t0.id, t0.attr1, t0.attr2, t0.id is null from main_entity t0");
     assertThat(loggedSql.get(2)).contains("select t0.id, t0.attr1, t0.attr2, t0.id is null from main_entity t0");
   }
-  
+
   @Test
   public void testFindListWithSelect() {
     PathProperties pathProp = new PathProperties();
@@ -74,7 +75,6 @@ public class TestLazyForeignKeys extends BaseTestCase {
     List<MainEntityRelation> list = query.findList();
     assertEquals(1, list.size());
 
-    System.out.println(query.getGeneratedSql());
     assertThat(query.getGeneratedSql()).contains("t0.id, t0.attr1, t0.id1, t0.id2, t1.id, t2.id");
 
     MainEntityRelation rel1 = list.get(0);

From 53bcc62a0c52f5bb9eb1bf064c0243d38c63a499 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 19 Jul 2019 00:21:04 +1200
Subject: [PATCH 0967/1036] No effective change - whitespace change to test
 generated migration ddl

---
 .../dbmigration/migrationtest-history/R__order_views.sql         | 1 -
 .../resources/dbmigration/migrationtest/db2/R__order_views.sql   | 1 -
 .../resources/dbmigration/migrationtest/h2/R__order_views.sql    | 1 -
 .../resources/dbmigration/migrationtest/mysql/R__order_views.sql | 1 -
 .../dbmigration/migrationtest/oracle/R__order_views.sql          | 1 -
 .../dbmigration/migrationtest/postgres/R__order_views.sql        | 1 -
 .../dbmigration/migrationtest/sqlite/R__order_views_sqlite.sql   | 1 -
 7 files changed, 7 deletions(-)

diff --git a/src/test/resources/dbmigration/migrationtest-history/R__order_views.sql b/src/test/resources/dbmigration/migrationtest-history/R__order_views.sql
index 2872cc37e..ccf30a2c6 100644
--- a/src/test/resources/dbmigration/migrationtest-history/R__order_views.sql
+++ b/src/test/resources/dbmigration/migrationtest-history/R__order_views.sql
@@ -1,5 +1,4 @@
 
-
     create or replace view order_agg_vw as
     select d.order_id, sum(d.order_qty * d.unit_price) as order_total,
            sum(d.ship_qty * d.unit_price) as ship_total
diff --git a/src/test/resources/dbmigration/migrationtest/db2/R__order_views.sql b/src/test/resources/dbmigration/migrationtest/db2/R__order_views.sql
index 2872cc37e..ccf30a2c6 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/R__order_views.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/R__order_views.sql
@@ -1,5 +1,4 @@
 
-
     create or replace view order_agg_vw as
     select d.order_id, sum(d.order_qty * d.unit_price) as order_total,
            sum(d.ship_qty * d.unit_price) as ship_total
diff --git a/src/test/resources/dbmigration/migrationtest/h2/R__order_views.sql b/src/test/resources/dbmigration/migrationtest/h2/R__order_views.sql
index 2872cc37e..ccf30a2c6 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/R__order_views.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/R__order_views.sql
@@ -1,5 +1,4 @@
 
-
     create or replace view order_agg_vw as
     select d.order_id, sum(d.order_qty * d.unit_price) as order_total,
            sum(d.ship_qty * d.unit_price) as ship_total
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/R__order_views.sql b/src/test/resources/dbmigration/migrationtest/mysql/R__order_views.sql
index 2872cc37e..ccf30a2c6 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/R__order_views.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/R__order_views.sql
@@ -1,5 +1,4 @@
 
-
     create or replace view order_agg_vw as
     select d.order_id, sum(d.order_qty * d.unit_price) as order_total,
            sum(d.ship_qty * d.unit_price) as ship_total
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/R__order_views.sql b/src/test/resources/dbmigration/migrationtest/oracle/R__order_views.sql
index 2872cc37e..ccf30a2c6 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/R__order_views.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/R__order_views.sql
@@ -1,5 +1,4 @@
 
-
     create or replace view order_agg_vw as
     select d.order_id, sum(d.order_qty * d.unit_price) as order_total,
            sum(d.ship_qty * d.unit_price) as ship_total
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/R__order_views.sql b/src/test/resources/dbmigration/migrationtest/postgres/R__order_views.sql
index 2872cc37e..ccf30a2c6 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/R__order_views.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/R__order_views.sql
@@ -1,5 +1,4 @@
 
-
     create or replace view order_agg_vw as
     select d.order_id, sum(d.order_qty * d.unit_price) as order_total,
            sum(d.ship_qty * d.unit_price) as ship_total
diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/R__order_views_sqlite.sql b/src/test/resources/dbmigration/migrationtest/sqlite/R__order_views_sqlite.sql
index e078ac639..9572b5c26 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlite/R__order_views_sqlite.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlite/R__order_views_sqlite.sql
@@ -5,5 +5,4 @@
            sum(d.ship_qty * d.unit_price) as ship_total
     from o_order_detail d
     group by d.order_id;
-
   
\ No newline at end of file

From 4513dbf29d7baf378947a6fe327e26515a7db105 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 19 Jul 2019 00:22:41 +1200
Subject: [PATCH 0968/1036] No effective change - whitespace change only to
 SqlTreeBuilder

---
 src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 2e9fa404b..a8ec12191 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -302,7 +302,7 @@ public final class SqlTreeBuilder {
       myJoinList.add(nodeJoin);
     }
     if (manyWhereJoins.isFormulaWithJoin()) {
-      for (String property: manyWhereJoins.getFormulaJoinProperties()) {
+      for (String property : manyWhereJoins.getFormulaJoinProperties()) {
         STreeProperty beanProperty = desc.findPropertyFromPath(property);
         myJoinList.add(new SqlTreeNodeFormulaWhereJoin(beanProperty, SqlJoinType.OUTER));
       }

From 007b06e9db44ff889147a1993702289f304467ae Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Thu, 18 Jul 2019 23:12:07 +0200
Subject: [PATCH 0969/1036] use local lookup instead of public lookup (#1764)

(cherry picked from commit dc0441aaea126efc23a9c2abc30a4dd67bac6752)
---
 .../server/dto/DtoMetaConstructor.java        | 31 ++++++++++---------
 .../server/dto/DtoMetaProperty.java           |  5 +--
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoMetaConstructor.java b/src/main/java/io/ebeaninternal/server/dto/DtoMetaConstructor.java
index 05aec36b6..79a5ee307 100644
--- a/src/main/java/io/ebeaninternal/server/dto/DtoMetaConstructor.java
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoMetaConstructor.java
@@ -12,11 +12,13 @@ import java.sql.SQLException;
 
 class DtoMetaConstructor {
 
-	private final Class<?>[] types;
-	private final MethodHandle handle;
+  private final Class<?>[] types;
+  private final MethodHandle handle;
+
+  private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
   private final ScalarType<?>[] scalarTypes;
 
-	DtoMetaConstructor(TypeManager typeManager, Constructor<?> constructor, Class<?> someClass) throws NoSuchMethodException, IllegalAccessException {
+  DtoMetaConstructor(TypeManager typeManager, Constructor<?> constructor, Class<?> someClass) throws NoSuchMethodException, IllegalAccessException {
 
     this.types = constructor.getParameterTypes();
     this.scalarTypes = new ScalarType[types.length];
@@ -24,13 +26,12 @@ class DtoMetaConstructor {
       scalarTypes[i] = typeManager.getScalarType(types[i]);
     }
 
-    MethodHandles.Lookup lookup = MethodHandles.publicLookup();
-		this.handle = lookup.findConstructor(someClass, typeFor(types));
-	}
+    this.handle = LOOKUP.findConstructor(someClass, typeFor(types));
+  }
 
-	private MethodType typeFor(Class<?>[] types) {
-		return MethodType.methodType(void.class, types);
-	}
+  private MethodType typeFor(Class<?>[] types) {
+    return MethodType.methodType(void.class, types);
+  }
 
   Class<?>[] getTypes() {
     return types;
@@ -48,7 +49,7 @@ class DtoMetaConstructor {
     }
   }
 
-	public Object process(DataReader dataReader) throws SQLException {
+  public Object process(DataReader dataReader) throws SQLException {
     Object[] values = new Object[scalarTypes.length];
     for (int i = 0; i < scalarTypes.length; i++) {
       values[i] = scalarTypes[i].read(dataReader);
@@ -56,12 +57,12 @@ class DtoMetaConstructor {
     return invoke(values);
   }
 
-	private Object invoke(Object... args) {
-	  try {
-	    return handle.invokeWithArguments(args);
+  private Object invoke(Object... args) {
+    try {
+      return handle.invokeWithArguments(args);
     } catch (Throwable e) {
-	    throw new RuntimeException("Unexpected error invoking constructor", e);
+      throw new RuntimeException("Unexpected error invoking constructor", e);
     }
-	}
+  }
 
 }
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoMetaProperty.java b/src/main/java/io/ebeaninternal/server/dto/DtoMetaProperty.java
index 3b672b100..69182e08b 100644
--- a/src/main/java/io/ebeaninternal/server/dto/DtoMetaProperty.java
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoMetaProperty.java
@@ -13,6 +13,8 @@ import java.sql.SQLException;
 
 class DtoMetaProperty implements DtoReadSet {
 
+  private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
+
   private final Class<?> dtoType;
   private final String name;
   private final MethodHandle setter;
@@ -28,8 +30,7 @@ class DtoMetaProperty implements DtoReadSet {
 
       Class<?> propertyType = descriptor.getPropertyType();
 
-      MethodHandles.Lookup lookup = MethodHandles.publicLookup();
-      this.setter = lookup.findVirtual(dtoType, writeMethod.getName(), MethodType.methodType(void.class, propertyType));
+      this.setter = LOOKUP.findVirtual(dtoType, writeMethod.getName(), MethodType.methodType(void.class, propertyType));
       this.scalarType = typeManager.getScalarType(propertyType);
 
     } else {

From 970bc8e973dcd5e106c5e77a273d496a22461145 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 19 Jul 2019 10:28:13 +1200
Subject: [PATCH 0970/1036] Fix tests for sql server

---
 src/test/java/org/tests/insert/TestOnlyIdEntity.java      | 3 ++-
 .../org/tests/lazyforeignkeys/TestLazyForeignKeys.java    | 8 ++++++--
 .../org/tests/query/joins/TestQueryJoinOnFormula.java     | 6 +++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/tests/insert/TestOnlyIdEntity.java b/src/test/java/org/tests/insert/TestOnlyIdEntity.java
index c0dff68e9..d085891f3 100644
--- a/src/test/java/org/tests/insert/TestOnlyIdEntity.java
+++ b/src/test/java/org/tests/insert/TestOnlyIdEntity.java
@@ -1,5 +1,6 @@
 package org.tests.insert;
 
+import io.ebean.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.annotation.ForPlatform;
@@ -11,7 +12,7 @@ import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TestOnlyIdEntity {
+public class TestOnlyIdEntity extends BaseTestCase {
 
   @ForPlatform({Platform.H2, Platform.POSTGRES})
   @Test
diff --git a/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java b/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java
index d8d19dd56..76fe3374c 100644
--- a/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java
+++ b/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java
@@ -60,8 +60,12 @@ public class TestLazyForeignKeys extends BaseTestCase {
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertThat(loggedSql).hasSize(3);
     assertThat(loggedSql.get(0)).contains("select t0.id, t0.attr1, t0.id1, t0.id2 from main_entity_relation");
-    assertThat(loggedSql.get(1)).contains("select t0.id, t0.attr1, t0.attr2, t0.id is null from main_entity t0");
-    assertThat(loggedSql.get(2)).contains("select t0.id, t0.attr1, t0.attr2, t0.id is null from main_entity t0");
+    if (isSqlServer()) {
+      assertThat(loggedSql.get(1)).contains("select t0.id, t0.attr1, t0.attr2, CASE WHEN t0.id is null THEN 1 ELSE 0 END from main_entity t0");
+    } else {
+      assertThat(loggedSql.get(1)).contains("select t0.id, t0.attr1, t0.attr2, t0.id is null from main_entity t0");
+      assertThat(loggedSql.get(2)).contains("select t0.id, t0.attr1, t0.attr2, t0.id is null from main_entity t0");
+    }
   }
 
   @Test
diff --git a/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java b/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java
index d40430874..d933f45e6 100644
--- a/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java
+++ b/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java
@@ -122,7 +122,11 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
     assertThat(loggedSql.get(0)).contains("join (select order_id, count(*) as total_items,");
-    assertThat(loggedSql.get(0)).contains("select t0.id, z_bt0.total_items from o_order t0 join (select order_id");
+    if (isSqlServer()) {
+      assertThat(loggedSql.get(0)).contains("select top 1 t0.id, z_bt0.total_items from o_order t0 join (select");
+    } else {
+      assertThat(loggedSql.get(0)).contains("select t0.id, z_bt0.total_items from o_order t0 join (select order_id");
+    }
   }
 
   @Test

From 8b670fd6159244b3656f758d5b080442e021f0d4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 19 Jul 2019 10:35:26 +1200
Subject: [PATCH 0971/1036] Fix tests for sql server which doesn't support
 order by nulls last

---
 .../java/org/tests/aggregateformula/TestAggregateFormula.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java b/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java
index 5d75c444a..46f723909 100644
--- a/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java
+++ b/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java
@@ -2,6 +2,8 @@ package org.tests.aggregateformula;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.annotation.IgnorePlatform;
+import io.ebean.annotation.Platform;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.model.basic.Address;
@@ -17,6 +19,7 @@ import static org.junit.Assert.assertNotNull;
 
 public class TestAggregateFormula extends BaseTestCase {
 
+  @IgnorePlatform(Platform.SQLSERVER)
   @Test
   public void minDistinctOrderByNulls() {
 

From bcb136b6924c783add4bd665e8af17ce7bcbf092 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 19 Jul 2019 10:43:07 +1200
Subject: [PATCH 0972/1036] #1765 - Wrong SQL generated on m2m and OrderBy
 (Regression of #1746)

---
 src/main/java/io/ebean/OrderBy.java           |  2 +-
 .../tests/m2m/TestM2MDistinct_sqlServer.java  | 36 +++++++++++++++++++
 .../tests/unitinternal/TestOrderByParse.java  | 11 +++---
 3 files changed, 42 insertions(+), 7 deletions(-)
 create mode 100644 src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java

diff --git a/src/main/java/io/ebean/OrderBy.java b/src/main/java/io/ebean/OrderBy.java
index 6b59e12bf..c7bacf7aa 100644
--- a/src/main/java/io/ebean/OrderBy.java
+++ b/src/main/java/io/ebean/OrderBy.java
@@ -412,7 +412,7 @@ public final class OrderBy<T> implements Serializable {
      * Support use in select clause if no collation or nulls ordering.
      */
     boolean supportsSelect() {
-      return nulls == null && collation == null;
+      return nulls == null;
     }
   }
 
diff --git a/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java b/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java
new file mode 100644
index 000000000..29c216ce7
--- /dev/null
+++ b/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java
@@ -0,0 +1,36 @@
+package org.tests.m2m;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import io.ebean.annotation.ForPlatform;
+import io.ebean.annotation.Platform;
+import io.ebeantest.LoggedSql;
+import org.junit.Test;
+import org.tests.model.m2m.Permission;
+import org.tests.model.m2m.Role;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestM2MDistinct_sqlServer extends BaseTestCase {
+
+  @ForPlatform(Platform.SQLSERVER)
+  @Test
+  public void testName() {
+
+    Permission perm = new Permission("TestPerm");
+    DB.save(perm);
+    LoggedSql.start();
+
+    List<Role> roles = DB.find(Role.class).where().eq("permissions", perm)
+      .order().asc("name", "Latin1_General_CI_AS")
+      .findList();
+
+    List<String> sqls = LoggedSql.stop();
+    assertThat(sqls.get(0)).startsWith("select distinct t0.id, t0.name, t0.version, t0.tenant_id, t0.name collate Latin1_General_CI_AS "
+      + "from mt_role t0 join mt_role_permission u1z_ on u1z_.mt_role_id = t0.id  "
+      + "join mt_permission u1 on u1.id = u1z_.mt_permission_id  where u1.id = ? "
+      + "order by t0.name collate Latin1_General_CI_AS;");
+  }
+}
diff --git a/src/test/java/org/tests/unitinternal/TestOrderByParse.java b/src/test/java/org/tests/unitinternal/TestOrderByParse.java
index 362086508..11136a786 100644
--- a/src/test/java/org/tests/unitinternal/TestOrderByParse.java
+++ b/src/test/java/org/tests/unitinternal/TestOrderByParse.java
@@ -182,7 +182,7 @@ public class TestOrderByParse extends BaseTestCase {
     assertEquals("id", o1.getProperties().get(0).getProperty());
     assertTrue(o1.getProperties().get(0).isAscending());
     assertEquals("id collate latin_1", o1.toStringFormat());
-    assertFalse(o1.supportsSelect());
+    assertTrue(o1.supportsSelect());
 
     o1 = new OrderBy<>();
     o1.desc("id", "latin_1");
@@ -190,7 +190,7 @@ public class TestOrderByParse extends BaseTestCase {
     assertEquals("id", o1.getProperties().get(0).getProperty());
     assertTrue(!o1.getProperties().get(0).isAscending());
     assertEquals("id collate latin_1 desc", o1.toStringFormat());
-    assertFalse(o1.supportsSelect());
+    assertTrue(o1.supportsSelect());
 
     o1 = new OrderBy<>();
     o1.desc("id", "latin_1");
@@ -201,7 +201,7 @@ public class TestOrderByParse extends BaseTestCase {
     assertTrue(!o1.getProperties().get(0).isAscending());
     assertTrue(o1.getProperties().get(1).isAscending());
     assertEquals("id collate latin_1 desc, date", o1.toStringFormat());
-    assertFalse(o1.supportsSelect());
+    assertTrue(o1.supportsSelect());
 
     o1 = new OrderBy<>();
     o1.desc("id", "latin_1");
@@ -212,7 +212,7 @@ public class TestOrderByParse extends BaseTestCase {
     assertTrue(!o1.getProperties().get(0).isAscending());
     assertTrue(o1.getProperties().get(1).isAscending());
     assertEquals("id collate latin_1 desc, name collate latin_2", o1.toStringFormat());
-    assertFalse(o1.supportsSelect());
+    assertTrue(o1.supportsSelect());
 
     // functional (DB2) syntax
     o1 = new OrderBy<>();
@@ -221,8 +221,7 @@ public class TestOrderByParse extends BaseTestCase {
     assertEquals("id", o1.getProperties().get(0).getProperty());
     assertTrue(!o1.getProperties().get(0).isAscending());
     assertEquals("COLLATION_KEY(id, 'latin_1') desc", o1.toStringFormat());
-    assertFalse(o1.supportsSelect());
-
+    assertTrue(o1.supportsSelect());
   }
 
   @Test

From 0c53efcbbc4bed79e89997630209c4772e3f7a3c Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 21 Jul 2019 16:49:51 +1200
Subject: [PATCH 0973/1036] [maven-release-plugin] prepare release
 ebean-11.41.3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b45c22c28..99ba97fbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.41.3-SNAPSHOT</version>
+  <version>11.41.3</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.41.3</tag>
   </scm>
 
   <profiles>

From f12f0d7f7a4b7f19413f67eb7db9c112f439f4c8 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 21 Jul 2019 16:50:02 +1200
Subject: [PATCH 0974/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 99ba97fbc..10f4118de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.41.3</version>
+  <version>11.41.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.41.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From a08cf548e77e4d1ad0f63bf4a6287ac059811f5b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 21 Jul 2019 22:57:56 +1200
Subject: [PATCH 0975/1036] #1770 - Support use of Savepoints with MySql and
 MariaDB (that barf on savepoint.getSavepointId())

---
 .../config/dbplatform/DatabasePlatform.java   |  9 ++++++
 .../dbplatform/mysql/MySqlPlatform.java       |  1 +
 .../AutoCommitTransactionManager.java         |  5 ++-
 .../DocStoreTransactionManager.java           | 10 ++----
 .../ExplicitTransactionManager.java           |  5 ++-
 .../transaction/SavepointTransaction.java     |  8 +++--
 .../transaction/TransactionFactory.java       |  3 --
 .../transaction/TransactionFactoryBasic.java  |  2 +-
 .../transaction/TransactionFactoryTenant.java |  2 +-
 .../transaction/TransactionManager.java       | 31 +++++++++++++++++--
 10 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
index 6a96724e8..445ec3d15 100644
--- a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
@@ -51,6 +51,8 @@ public class DatabasePlatform {
 
   protected boolean supportsDeleteTableAlias;
 
+  protected boolean supportsSavepointId = true;
+
   /**
    * The behaviour used when ending a read only transaction at read committed isolation level.
    */
@@ -328,6 +330,13 @@ public class DatabasePlatform {
     return caseSensitiveCollation;
   }
 
+  /**
+   * Return true if the platform supports SavepointId values.
+   */
+  public boolean isSupportsSavepointId() {
+    return supportsSavepointId;
+  }
+
   /**
    * Return the maximum table name length.
    * <p>
diff --git a/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java
index e9c769095..e744ecbad 100644
--- a/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java
@@ -27,6 +27,7 @@ public class MySqlPlatform extends DatabasePlatform {
     this.platform = Platform.MYSQL;
     this.useExtraTransactionOnIterateSecondaryQueries = true;
     this.selectCountWithAlias = true;
+    this.supportsSavepointId = false;
     this.dbEncrypt = new MySqlDbEncrypt();
     this.historySupport = new MySqlHistorySupport();
     this.columnAliasPrefix = null;
diff --git a/src/main/java/io/ebeaninternal/server/transaction/AutoCommitTransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/AutoCommitTransactionManager.java
index ca862ebfa..29fb720c0 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/AutoCommitTransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/AutoCommitTransactionManager.java
@@ -19,9 +19,8 @@ public class AutoCommitTransactionManager extends TransactionManager {
    * Create an autoCommit based Transaction.
    */
   @Override
-  protected SpiTransaction createTransaction(boolean explicit, Connection c, long id) {
-
-    return new AutoCommitJdbcTransaction(prefix + id, explicit, c, this);
+  protected SpiTransaction createTransaction(boolean explicit, Connection c) {
+    return new AutoCommitJdbcTransaction(nextTxnId(), explicit, c, this);
   }
 
 }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/DocStoreTransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/DocStoreTransactionManager.java
index 53f1f5c04..a4f8a0eff 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/DocStoreTransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/DocStoreTransactionManager.java
@@ -3,7 +3,6 @@ package io.ebeaninternal.server.transaction;
 import io.ebeaninternal.api.SpiTransaction;
 
 import java.sql.Connection;
-import java.util.concurrent.atomic.AtomicLong;
 
 /**
  * Transaction manager used for doc store only EbeanServer instance.
@@ -12,8 +11,6 @@ import java.util.concurrent.atomic.AtomicLong;
  */
 public class DocStoreTransactionManager extends TransactionManager {
 
-  private final AtomicLong counter = new AtomicLong(1000L);
-
   /**
    * Create the TransactionManager
    */
@@ -23,8 +20,7 @@ public class DocStoreTransactionManager extends TransactionManager {
 
   @Override
   public SpiTransaction createTransaction(boolean explicit, int isolationLevel) {
-    long id = counter.incrementAndGet();
-    return createTransaction(explicit, null, id);
+    return createTransaction(explicit, null);
   }
 
   @Override
@@ -33,7 +29,7 @@ public class DocStoreTransactionManager extends TransactionManager {
   }
 
   @Override
-  protected SpiTransaction createTransaction(boolean explicit, Connection c, long id) {
-    return new DocStoreOnlyTransaction(prefix + id, explicit, this);
+  protected SpiTransaction createTransaction(boolean explicit, Connection c) {
+    return new DocStoreOnlyTransaction(nextTxnId(), explicit, this);
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/ExplicitTransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/ExplicitTransactionManager.java
index 8d082c3e3..a9640cb10 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/ExplicitTransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/ExplicitTransactionManager.java
@@ -18,9 +18,8 @@ public class ExplicitTransactionManager extends TransactionManager {
    * Create a ExplicitJdbcTransaction.
    */
   @Override
-  protected SpiTransaction createTransaction(boolean explicit, Connection c, long id) {
-
-    return new ExplicitJdbcTransaction(prefix + id, explicit, c, this);
+  protected SpiTransaction createTransaction(boolean explicit, Connection c) {
+    return new ExplicitJdbcTransaction(nextTxnId(), explicit, c, this);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
index 271cb1144..b50122f5c 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
@@ -31,8 +31,12 @@ class SavepointTransaction extends SpiTransactionProxy {
     this.transaction = transaction;
     this.connection = transaction.getInternalConnection();
     this.savepoint = connection.setSavepoint();
-    int savepointId = savepoint.getSavepointId();
-    this.spPrefix = "sp[" + savepointId + "] ";
+    if (manager.isTxnDebug()) {
+      int savepointId = manager.isSupportsSavepointId() ? savepoint.getSavepointId() : 0;
+      this.spPrefix = "sp[" + savepointId + "] ";
+    } else {
+      this.spPrefix = "sp[] ";
+    }
     this.logPrefix = transaction.getLogPrefix() + spPrefix;
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java
index fedcd5f3a..3d45ad3eb 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java
@@ -6,15 +6,12 @@ import io.ebeaninternal.api.SpiTransaction;
 import javax.persistence.PersistenceException;
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.concurrent.atomic.AtomicLong;
 
 /**
  * Creates transactions with implementations for basic mode and multi-tenancy mode.
  */
 abstract class TransactionFactory {
 
-  final AtomicLong counter = new AtomicLong(1000);
-
   final TransactionManager manager;
 
   TransactionFactory(TransactionManager manager) {
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java
index 88959e921..a175f762a 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java
@@ -52,7 +52,7 @@ class TransactionFactoryBasic extends TransactionFactory {
   }
 
   private SpiTransaction create(boolean explicit, Connection c) {
-    return manager.createTransaction(explicit, c, counter.incrementAndGet());
+    return manager.createTransaction(explicit, c);
   }
 
 }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java
index fdb76e23e..63515c13f 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java
@@ -43,7 +43,7 @@ class TransactionFactoryTenant extends TransactionFactory {
         tenantId = tenantProvider.currentId();
       }
       connection = dataSourceSupplier.getConnection(tenantId);
-      SpiTransaction transaction = manager.createTransaction(explicit, connection, counter.incrementAndGet());
+      SpiTransaction transaction = manager.createTransaction(explicit, connection);
       transaction.setTenantId(tenantId);
       return transaction;
 
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index 396159846..46e0fb2fd 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -45,6 +45,7 @@ import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
 
 /**
  * Manages transactions.
@@ -73,6 +74,8 @@ public class TransactionManager implements SpiTransactionManager {
 
   private final String externalTransPrefix;
 
+  private final AtomicLong counter = new AtomicLong(1000L);
+
   /**
    * The dataSource of connections.
    */
@@ -129,6 +132,7 @@ public class TransactionManager implements SpiTransactionManager {
 
   private final SpiLogManager logManager;
   private final SpiLogger txnLogger;
+  private final boolean txnDebug;
 
   private final DatabasePlatform databasePlatform;
 
@@ -141,6 +145,7 @@ public class TransactionManager implements SpiTransactionManager {
 
   private final TableModState tableModState;
   private final ServerCacheNotify cacheNotify;
+  private final boolean supportsSavepointId;
 
   /**
    * Create the TransactionManager
@@ -149,7 +154,9 @@ public class TransactionManager implements SpiTransactionManager {
 
     this.logManager = options.logManager;
     this.txnLogger = logManager.txn();
+    this.txnDebug = txnLogger.isDebug();
     this.databasePlatform = options.config.getDatabasePlatform();
+    this.supportsSavepointId = databasePlatform.isSupportsSavepointId();
     this.skipCacheAfterWrite = options.config.isSkipCacheAfterWrite();
     this.notifyL2CacheInForeground = options.notifyL2CacheInForeground;
     this.persistBatch = PersistBatch.ALL == options.config.getPersistBatch();
@@ -242,6 +249,13 @@ public class TransactionManager implements SpiTransactionManager {
     }
   }
 
+  /**
+   * Return true if the DB platform supports SavepointId().
+   */
+  boolean isSupportsSavepointId() {
+    return supportsSavepointId;
+  }
+
   boolean isDocStoreActive() {
     return docStoreActive;
   }
@@ -352,9 +366,15 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Create a new transaction.
    */
-  SpiTransaction createTransaction(boolean explicit, Connection c, long id) {
+  SpiTransaction createTransaction(boolean explicit, Connection c) {
+    return new JdbcTransaction(nextTxnId(), explicit, c, this);
+  }
 
-    return new JdbcTransaction(prefix + id, explicit, c, this);
+  /**
+   * Return the next transaction id.
+   */
+  String nextTxnId() {
+    return txnDebug ? prefix + counter.incrementAndGet() : prefix;
   }
 
   /**
@@ -728,6 +748,13 @@ public class TransactionManager implements SpiTransactionManager {
     }
   }
 
+  /**
+   * Return true if Transaction debug is on.
+   */
+  public boolean isTxnDebug() {
+    return txnDebug;
+  }
+
   public SpiLogManager log() {
     return logManager;
   }

From f40eb011c39d61605551bd7d6ad13b21f2524d35 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 24 Jul 2019 21:57:47 +1200
Subject: [PATCH 0976/1036] #1773 - Wrong link to timerbee.de in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7a4dca828..85c3d36d2 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@
         </a>
       </td>
       <td align="center" valign="middle">
-        <a href="https://timerbe.de" target="_blank">
+        <a href="https://timerbee.de" target="_blank">
           <img width="222px" src="https://ebean.io/images/logo-timerbee.png">
         </a>
       </td>

From 5c38561049467ef84c903ae71dde778f4176d845 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 24 Jul 2019 23:36:36 +1200
Subject: [PATCH 0977/1036] #1774 - Change built in SQL Server I___create_procs
 DDL script to use GO (and not $$ delimiters)

---
 pom.xml                                       |  2 +-
 .../dbmigration/builtin-extra-ddl.xml         | 33 ++++++++++---------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 10f4118de..7ae2fee66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>11.17.1</version>
+      <version>11.18.2</version>
     </dependency>
 
     <dependency>
diff --git a/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml b/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml
index 5a11d4804..8002f6641 100644
--- a/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml
+++ b/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml
@@ -4,15 +4,21 @@
 <ddl-script name="create procs" platforms="sqlserver" init="true">-- Initial script to create stored procedures etc for sqlserver platform
 
 -- create table-value-parameters
-if not exists (select name  from sys.types where name = 'ebean_bigint_tvp') create type ebean_bigint_tvp as table (c1 bigint);
-if not exists (select name  from sys.types where name = 'ebean_float_tvp') create type ebean_float_tvp as table (c1 float);
-if not exists (select name  from sys.types where name = 'ebean_bit_tvp') create type ebean_bit_tvp as table (c1 bit);
-if not exists (select name  from sys.types where name = 'ebean_date_tvp') create type ebean_date_tvp as table (c1 date);
-if not exists (select name  from sys.types where name = 'ebean_time_tvp') create type ebean_time_tvp as table (c1 time);
-if not exists (select name  from sys.types where name = 'ebean_uniqueidentifier_tvp') create type ebean_uniqueidentifier_tvp as table (c1 uniqueidentifier);
-if not exists (select name  from sys.types where name = 'ebean_nvarchar_tvp') create type ebean_nvarchar_tvp as table (c1 nvarchar(max));
+if not exists (select name  from sys.types where name = 'ebean_bigint_tvp') create type ebean_bigint_tvp as table (c1 bigint)
+GO
+if not exists (select name  from sys.types where name = 'ebean_float_tvp') create type ebean_float_tvp as table (c1 float)
+GO
+if not exists (select name  from sys.types where name = 'ebean_bit_tvp') create type ebean_bit_tvp as table (c1 bit)
+GO
+if not exists (select name  from sys.types where name = 'ebean_date_tvp') create type ebean_date_tvp as table (c1 date)
+GO
+if not exists (select name  from sys.types where name = 'ebean_time_tvp') create type ebean_time_tvp as table (c1 time)
+GO
+if not exists (select name  from sys.types where name = 'ebean_uniqueidentifier_tvp') create type ebean_uniqueidentifier_tvp as table (c1 uniqueidentifier)
+GO
+if not exists (select name  from sys.types where name = 'ebean_nvarchar_tvp') create type ebean_nvarchar_tvp as table (c1 nvarchar(max))
+GO
 
-delimiter $$
 --
 -- PROCEDURE: usp_ebean_drop_indices TABLE, COLUMN
 -- deletes all indices referring to TABLE.COLUMN
@@ -38,9 +44,8 @@ BEGIN
   CLOSE index_cursor;
   DEALLOCATE index_cursor;
 END
-$$
+GO
 
-delimiter $$
 --
 -- PROCEDURE: usp_ebean_drop_default_constraint TABLE, COLUMN
 -- deletes the default constraint, which has a random name
@@ -55,9 +60,8 @@ BEGIN
 
   if @tmp is not null EXEC('alter table ' + @tableName +' drop constraint ' + @tmp);
 END
-$$
+GO
 
-delimiter $$
 --
 -- PROCEDURE: usp_ebean_drop_constraints TABLE, COLUMN
 -- deletes constraints and foreign keys refering to TABLE.COLUMN
@@ -89,9 +93,8 @@ BEGIN
   CLOSE name_cursor;
   DEALLOCATE name_cursor;
 END
-$$
+GO
 
-delimiter $$
 --
 -- PROCEDURE: usp_ebean_drop_column TABLE, COLUMN
 -- deletes the column annd ensures that all indices and constraints are dropped first
@@ -107,7 +110,7 @@ BEGIN
   set @sql = 'alter table ' + @tableName + ' drop column ' + @columnName;
   EXECUTE(@sql);
 END
-$$
+GO
 </ddl-script>
 
 <ddl-script name="create procs" platforms="mysql" init="true">-- Inital script to create stored procedures etc for mysql platform

From b04f887bc33d498029a05f14aa975046f4a894e8 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Jul 2019 21:19:08 +1200
Subject: [PATCH 0978/1036] Test only update generated resource - no effective
 change

---
 .../sqlserver17/I__create_procs.sql           | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/I__create_procs.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/I__create_procs.sql
index 0d6379544..6f916bcc9 100644
--- a/src/test/resources/dbmigration/migrationtest/sqlserver17/I__create_procs.sql
+++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/I__create_procs.sql
@@ -1,15 +1,21 @@
 -- Initial script to create stored procedures etc for sqlserver platform
 
 -- create table-value-parameters
-if not exists (select name  from sys.types where name = 'ebean_bigint_tvp') create type ebean_bigint_tvp as table (c1 bigint);
-if not exists (select name  from sys.types where name = 'ebean_float_tvp') create type ebean_float_tvp as table (c1 float);
-if not exists (select name  from sys.types where name = 'ebean_bit_tvp') create type ebean_bit_tvp as table (c1 bit);
-if not exists (select name  from sys.types where name = 'ebean_date_tvp') create type ebean_date_tvp as table (c1 date);
-if not exists (select name  from sys.types where name = 'ebean_time_tvp') create type ebean_time_tvp as table (c1 time);
-if not exists (select name  from sys.types where name = 'ebean_uniqueidentifier_tvp') create type ebean_uniqueidentifier_tvp as table (c1 uniqueidentifier);
-if not exists (select name  from sys.types where name = 'ebean_nvarchar_tvp') create type ebean_nvarchar_tvp as table (c1 nvarchar(max));
+if not exists (select name  from sys.types where name = 'ebean_bigint_tvp') create type ebean_bigint_tvp as table (c1 bigint)
+GO
+if not exists (select name  from sys.types where name = 'ebean_float_tvp') create type ebean_float_tvp as table (c1 float)
+GO
+if not exists (select name  from sys.types where name = 'ebean_bit_tvp') create type ebean_bit_tvp as table (c1 bit)
+GO
+if not exists (select name  from sys.types where name = 'ebean_date_tvp') create type ebean_date_tvp as table (c1 date)
+GO
+if not exists (select name  from sys.types where name = 'ebean_time_tvp') create type ebean_time_tvp as table (c1 time)
+GO
+if not exists (select name  from sys.types where name = 'ebean_uniqueidentifier_tvp') create type ebean_uniqueidentifier_tvp as table (c1 uniqueidentifier)
+GO
+if not exists (select name  from sys.types where name = 'ebean_nvarchar_tvp') create type ebean_nvarchar_tvp as table (c1 nvarchar(max))
+GO
 
-delimiter $$
 --
 -- PROCEDURE: usp_ebean_drop_indices TABLE, COLUMN
 -- deletes all indices referring to TABLE.COLUMN
@@ -35,9 +41,8 @@ BEGIN
   CLOSE index_cursor;
   DEALLOCATE index_cursor;
 END
-$$
+GO
 
-delimiter $$
 --
 -- PROCEDURE: usp_ebean_drop_default_constraint TABLE, COLUMN
 -- deletes the default constraint, which has a random name
@@ -52,9 +57,8 @@ BEGIN
 
   if @tmp is not null EXEC('alter table ' + @tableName +' drop constraint ' + @tmp);
 END
-$$
+GO
 
-delimiter $$
 --
 -- PROCEDURE: usp_ebean_drop_constraints TABLE, COLUMN
 -- deletes constraints and foreign keys refering to TABLE.COLUMN
@@ -86,9 +90,8 @@ BEGIN
   CLOSE name_cursor;
   DEALLOCATE name_cursor;
 END
-$$
+GO
 
-delimiter $$
 --
 -- PROCEDURE: usp_ebean_drop_column TABLE, COLUMN
 -- deletes the column annd ensures that all indices and constraints are dropped first
@@ -104,4 +107,4 @@ BEGIN
   set @sql = 'alter table ' + @tableName + ' drop column ' + @columnName;
   EXECUTE(@sql);
 END
-$$
+GO

From 5a39dcb39c2ca8eefe6857b279d8e6b4b011b548 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Jul 2019 21:25:38 +1200
Subject: [PATCH 0979/1036] #1775 - MySql 8 by default wants JDBC Date set and
 read with JVM Calendar (timezone)

---
 pom.xml                                       |  7 +++----
 .../server/core/InternalConfiguration.java    | 10 +++++++++-
 .../core/timezone/LocalDataTimeZone.java      | 20 +++++++++++++++++++
 .../ebeaninternal/server/type/DataBind.java   |  7 ++++++-
 .../server/type/RsetDataReader.java           |  7 ++++++-
 .../server/type/ScalarTypeBaseDate.java       |  2 +-
 src/test/java/main/StartMySql.java            |  4 ++--
 .../TestAggregateFormula.java                 |  2 +-
 .../tests/model/types/SomeNewTypesBean.java   | 11 ++++++++++
 .../java/org/tests/types/TestNewTypes.java    |  5 +++++
 .../org/tests/update/TestSqlUpdateUpsert.java |  2 +-
 src/test/resources/ebean.properties           |  2 +-
 12 files changed, 66 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/core/timezone/LocalDataTimeZone.java

diff --git a/pom.xml b/pom.xml
index 7ae2fee66..b7d4ee693 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>11.18.2</version>
+      <version>11.17.1</version>
     </dependency>
 
     <dependency>
@@ -229,7 +229,7 @@
     <dependency>
       <groupId>io.ebean.test</groupId>
       <artifactId>ebean-test-docker</artifactId>
-      <version>2.5.1</version>
+      <version>2.8.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -273,8 +273,7 @@
     <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
-      <!-- Do not upgrade to 6.0.6: https://bugs.mysql.com/bug.php?id=82896 -->
-      <version>5.1.43</version>
+      <version>8.0.17</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index 1139eede1..b755e8c3d 100644
--- a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -45,6 +45,7 @@ import io.ebeaninternal.server.cluster.ClusterManager;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
 import io.ebeaninternal.server.core.timezone.CloneDataTimeZone;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
+import io.ebeaninternal.server.core.timezone.LocalDataTimeZone;
 import io.ebeaninternal.server.core.timezone.NoDataTimeZone;
 import io.ebeaninternal.server.core.timezone.SimpleDataTimeZone;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
@@ -366,6 +367,10 @@ public class InternalConfiguration {
     return bootupClasses;
   }
 
+  private Platform getPlatform() {
+    return getDatabasePlatform().getPlatform();
+  }
+
   public DatabasePlatform getDatabasePlatform() {
     return serverConfig.getDatabasePlatform();
   }
@@ -509,9 +514,12 @@ public class InternalConfiguration {
 
     String tz = serverConfig.getDataTimeZone();
     if (tz == null) {
+      if (getPlatform() == Platform.MYSQL) {
+        return new LocalDataTimeZone();
+      }
       return new NoDataTimeZone();
     }
-    if (getDatabasePlatform().getPlatform() == Platform.ORACLE) {
+    if (getPlatform() == Platform.ORACLE) {
       return new CloneDataTimeZone(tz);
     } else {
       return new SimpleDataTimeZone(tz);
diff --git a/src/main/java/io/ebeaninternal/server/core/timezone/LocalDataTimeZone.java b/src/main/java/io/ebeaninternal/server/core/timezone/LocalDataTimeZone.java
new file mode 100644
index 000000000..d67defd7f
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/core/timezone/LocalDataTimeZone.java
@@ -0,0 +1,20 @@
+package io.ebeaninternal.server.core.timezone;
+
+import java.util.Calendar;
+
+/**
+ * Implementation of DataTimeZone when single Calendar instance is used with local timezone.
+ */
+public class LocalDataTimeZone implements DataTimeZone {
+
+  protected final Calendar zone;
+
+  public LocalDataTimeZone() {
+    this.zone = Calendar.getInstance();
+  }
+
+  @Override
+  public Calendar getTimeZone() {
+    return zone;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/type/DataBind.java b/src/main/java/io/ebeaninternal/server/type/DataBind.java
index 6c81384af..8ae786e87 100644
--- a/src/main/java/io/ebeaninternal/server/type/DataBind.java
+++ b/src/main/java/io/ebeaninternal/server/type/DataBind.java
@@ -141,7 +141,12 @@ public class DataBind {
   }
 
   public void setDate(java.sql.Date v) throws SQLException {
-    pstmt.setDate(++pos, v);
+    Calendar timeZone = dataTimeZone.getTimeZone();
+    if (timeZone != null) {
+      pstmt.setDate(++pos, v, timeZone);
+    } else {
+      pstmt.setDate(++pos, v);
+    }
   }
 
   public void setTimestamp(Timestamp v) throws SQLException {
diff --git a/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java b/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java
index 36cb9388d..a30d3ee49 100644
--- a/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java
+++ b/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java
@@ -106,7 +106,12 @@ public class RsetDataReader implements DataReader {
 
   @Override
   public Date getDate() throws SQLException {
-    return rset.getDate(pos());
+    Calendar cal = dataTimeZone.getTimeZone();
+    if (cal != null) {
+      return rset.getDate(pos(), cal);
+    } else {
+      return rset.getDate(pos());
+    }
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
index 22184cad0..149e20830 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
@@ -20,7 +20,7 @@ public abstract class ScalarTypeBaseDate<T> extends ScalarTypeBase<T> {
 
   protected final JsonConfig.Date mode;
 
-  public ScalarTypeBaseDate(JsonConfig.Date mode, Class<T> type, boolean jdbcNative, int jdbcType) {
+  ScalarTypeBaseDate(JsonConfig.Date mode, Class<T> type, boolean jdbcNative, int jdbcType) {
     super(type, jdbcNative, jdbcType);
     this.mode = mode;
   }
diff --git a/src/test/java/main/StartMySql.java b/src/test/java/main/StartMySql.java
index a93b2eacf..d7590c511 100644
--- a/src/test/java/main/StartMySql.java
+++ b/src/test/java/main/StartMySql.java
@@ -7,7 +7,7 @@ public class StartMySql {
 
   public static void main(String[] args) {
 
-    MySqlConfig config = new MySqlConfig("5.7");
+    MySqlConfig config = new MySqlConfig("8.0");
     config.setDbName("unit");
     config.setUser("unit");
     config.setPassword("unit");
@@ -23,6 +23,6 @@ public class StartMySql {
 //    config.setCharacterSet("utf8mb4");
 
     MySqlContainer container = new MySqlContainer(config);
-    container.start();
+    container.startWithDropCreate();
   }
 }
diff --git a/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java b/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java
index 46f723909..6bf12e1f6 100644
--- a/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java
+++ b/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java
@@ -19,7 +19,7 @@ import static org.junit.Assert.assertNotNull;
 
 public class TestAggregateFormula extends BaseTestCase {
 
-  @IgnorePlatform(Platform.SQLSERVER)
+  @IgnorePlatform({Platform.SQLSERVER, Platform.MYSQL})
   @Test
   public void minDistinctOrderByNulls() {
 
diff --git a/src/test/java/org/tests/model/types/SomeNewTypesBean.java b/src/test/java/org/tests/model/types/SomeNewTypesBean.java
index 35a133d8f..a3baf0074 100644
--- a/src/test/java/org/tests/model/types/SomeNewTypesBean.java
+++ b/src/test/java/org/tests/model/types/SomeNewTypesBean.java
@@ -5,6 +5,7 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Version;
 import java.nio.file.Path;
+import java.sql.Date;
 import java.time.DayOfWeek;
 import java.time.Duration;
 import java.time.Instant;
@@ -45,6 +46,8 @@ public class SomeNewTypesBean {
   @Column(name = "month_day")
   MonthDay monthDay;
 
+  java.sql.Date sqlDate;
+
   LocalDate localDate;
 
   LocalDateTime localDateTime;
@@ -123,6 +126,14 @@ public class SomeNewTypesBean {
     this.monthDay = monthDay;
   }
 
+  public Date getSqlDate() {
+    return sqlDate;
+  }
+
+  public void setSqlDate(Date sqlDate) {
+    this.sqlDate = sqlDate;
+  }
+
   public LocalDate getLocalDate() {
     return localDate;
   }
diff --git a/src/test/java/org/tests/types/TestNewTypes.java b/src/test/java/org/tests/types/TestNewTypes.java
index dab52d5c2..900b2f470 100644
--- a/src/test/java/org/tests/types/TestNewTypes.java
+++ b/src/test/java/org/tests/types/TestNewTypes.java
@@ -42,6 +42,7 @@ public class TestNewTypes extends BaseTestCase {
     bean.setOffsetDateTime(OffsetDateTime.now());
     bean.setZonedDateTime(ZonedDateTime.now());
     bean.setLocalTime(LocalTime.now());
+    bean.setSqlDate(java.sql.Date.valueOf("2019-07-21"));
     bean.setInstant(Instant.now());
     bean.setYear(Year.now());
     bean.setMonth(Month.APRIL);
@@ -77,6 +78,9 @@ public class TestNewTypes extends BaseTestCase {
     list = DB.find(SomeNewTypesBean.class).where().lt("zonedDateTime", ZonedDateTime.now()).findList();
     assertTrue(!list.isEmpty());
 
+    list = DB.find(SomeNewTypesBean.class).where().eq("sqlDate", bean.getSqlDate()).findList();
+    assertTrue(!list.isEmpty());
+
     list = DB.find(SomeNewTypesBean.class).where().le("localTime", LocalTime.now()).findList();
     assertTrue(!list.isEmpty());
 
@@ -113,6 +117,7 @@ public class TestNewTypes extends BaseTestCase {
     assertEquals(bean.getZoneOffset(), fetched.getZoneOffset());
     assertEquals(bean.getMonth(), fetched.getMonth());
     assertEquals(bean.getYear(), fetched.getYear());
+    assertEquals(bean.getSqlDate(), fetched.getSqlDate());
     assertEquals(bean.getYearMonth(), fetched.getYearMonth());
     assertEquals(bean.getMonthDay(), fetched.getMonthDay());
     assertEquals(bean.getLocalDate(), fetched.getLocalDate());
diff --git a/src/test/java/org/tests/update/TestSqlUpdateUpsert.java b/src/test/java/org/tests/update/TestSqlUpdateUpsert.java
index fe8669c82..7136541d2 100644
--- a/src/test/java/org/tests/update/TestSqlUpdateUpsert.java
+++ b/src/test/java/org/tests/update/TestSqlUpdateUpsert.java
@@ -121,7 +121,7 @@ public class TestSqlUpdateUpsert extends BaseTestCase {
 
     EPersonOnline found2 = Ebean.find(EPersonOnline.class, key2);
     assertThat(found2).isNotNull();
-    assertThat(found2.getId()).isEqualTo(key);
+    assertThat(found2.getId().toString()).isEqualTo(key.toString());
     assertThat(found2.getEmail()).isEqualTo("bar@one.com");
     assertThat(found2.isOnlineStatus()).isFalse();
 
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 43fd2954c..e5e709a90 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -138,7 +138,7 @@ datasource.mysql.databaseUrl=jdbc:mysql://127.0.0.1:4306/unit
 #datasource.mysql.username=test_ebean
 #datasource.mysql.password=test
 #datasource.mysql.databaseUrl=jdbc:mysql://127.0.0.1:4306/test_ebean
-datasource.mysql.databaseDriver=com.mysql.jdbc.Driver
+datasource.mysql.databaseDriver=com.mysql.cj.jdbc.Driver
 
 
 datasource.oracle.username=test_ebean

From 114693b7cd59fcd40961747b43d5009c02cc6a3d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Jul 2019 21:46:35 +1200
Subject: [PATCH 0980/1036] #1774 - Change built in SQL Server I___create_procs
 DDL script to use GO (and not $$ delimiters)

Bump ebean-migration with handling for stored procedures delimited with GO and $$ etc
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b7d4ee693..035cda735 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>11.17.1</version>
+      <version>11.19.1</version>
     </dependency>
 
     <dependency>

From b111fcfeccd35f383280d3ccf55140be13e6281b Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Fri, 26 Jul 2019 12:13:57 +0200
Subject: [PATCH 0981/1036] refresh does not work on oneToMany if property was
 not yet accessed

(cherry picked from commit 446103e6e06d7583f8b2bb847907d7fc77a8be9f)
---
 .../java/io/ebean/EbeanServer_refresh.java    | 75 +++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/src/test/java/io/ebean/EbeanServer_refresh.java b/src/test/java/io/ebean/EbeanServer_refresh.java
index 0c3e676a8..f9243082d 100644
--- a/src/test/java/io/ebean/EbeanServer_refresh.java
+++ b/src/test/java/io/ebean/EbeanServer_refresh.java
@@ -3,12 +3,14 @@ package io.ebean;
 import org.junit.Test;
 import org.tests.model.basic.EBasic;
 import org.tests.model.basic.Order;
+import org.tests.model.basic.OrderDetail;
 import org.tests.model.basic.ResetBasicData;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 
 public class EbeanServer_refresh {
@@ -77,4 +79,77 @@ public class EbeanServer_refresh {
     Ebean.refresh(order);
   }
 
+
+
+  @Test
+  public void refresh_on_details_new() {
+
+    ResetBasicData.reset();
+
+    Order order = Ebean.find(Order.class, 1);
+
+    DB.refresh(order); // call refresh BEFORE first access on "getDetail";
+
+    assertThat(order.getDetails()).hasSize(3);
+
+    OrderDetail detail = new OrderDetail();
+    detail.setOrder(order);
+    DB.save(detail);
+
+    try {
+
+      assertThat(order.getDetails()).hasSize(3);
+
+      DB.refresh(order);
+
+      assertThat(order.getDetails()).hasSize(4);
+
+    } finally {
+      DB.delete(detail); // restore old state
+    }
+
+    DB.refresh(order);
+
+    assertThat(order.getDetails()).hasSize(3);
+  }
+
+
+
+  @Test
+  public void refresh_on_details_changed() {
+
+    ResetBasicData.reset();
+
+    Order order = Ebean.find(Order.class, 1);
+
+    DB.refresh(order); // call refresh BEFORE first access on "getDetail"
+    // this changes the loader of the details-bean collection from DefaultServer to DLoadManyContext$LoadBuffer
+    // if this refresh is commented out, the test will pass
+
+    assertThat(order.getDetails().get(0).getOrderQty()).isEqualTo(5);
+
+    // search the detail in the DB and change qty to 42
+    OrderDetail detail = DB.find(OrderDetail.class, order.getDetails().get(0).getId());
+    assertThat(order.getDetails().get(0)).isEqualTo(detail).isNotSameAs(detail);
+    detail.setOrderQty(42);
+    DB.save(detail);
+
+    try {
+      assertThat(order.getDetails().get(0).getOrderQty()).isEqualTo(5);
+
+      DB.refresh(order);
+
+      assertThat(order.getDetails().get(0).getOrderQty()).isEqualTo(42);
+
+    } finally {
+      // restore old value
+      detail.setOrderQty(5);
+      DB.save(detail);
+    }
+
+    DB.refresh(order);
+
+    assertThat(order.getDetails().get(0).getOrderQty()).isEqualTo(5);
+
+  }
 }

From a780dc133ec1f45c728712abeb4788b044f671b5 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 29 Jul 2019 22:46:39 +1200
Subject: [PATCH 0982/1036] #1776 Fix for - refresh does not work on oneToMany
 if property was not yet accessed

---
 .../server/deploy/BeanPropertyAssocMany.java  |  7 ++-
 .../server/query/STreePropertyAssocMany.java  |  5 ++
 .../server/query/SqlTreeNodeBean.java         | 52 +++++++++----------
 3 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index 3fbfb49f7..969777472 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -613,8 +613,12 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   }
 
   @Override
-  public BeanCollection<?> createReferenceIfNull(EntityBean parentBean) {
+  public BeanCollection<?> createReference(EntityBean localBean, boolean forceNewReference) {
+    return forceNewReference ? createReference(localBean) : createReferenceIfNull(localBean);
+  }
 
+  @Override
+  public BeanCollection<?> createReferenceIfNull(EntityBean parentBean) {
     Object v = getValue(parentBean);
     if (v instanceof BeanCollection<?>) {
       BeanCollection<?> bc = (BeanCollection<?>) v;
@@ -627,7 +631,6 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   }
 
   public BeanCollection<?> createReference(EntityBean parentBean) {
-
     BeanCollection<?> ref = help.createReference(parentBean);
     setValue(parentBean, ref);
     return ref;
diff --git a/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocMany.java
index 9b6791e2f..49d4fb313 100644
--- a/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocMany.java
@@ -22,6 +22,11 @@ public interface STreePropertyAssocMany extends STreePropertyAssoc {
    */
   BeanCollection<?> createReferenceIfNull(EntityBean localBean);
 
+  /**
+   * Return a reference collection forcing a new reference on REFRESH query.
+   */
+  BeanCollection<?> createReference(EntityBean localBean, boolean forceNewReference);
+
   /**
    * Return true if the property has a join table.
    */
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
index f03d60637..fa60e1485 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
@@ -376,7 +376,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
       if (!lazyLoadMany && localBean != null) {
         ctx.setCurrentPrefix(prefix, pathMap);
         if (readId && !temporalVersions) {
-          createListProxies(localDesc, ctx, localBean, disableLazyLoad);
+          createListProxies();
         }
         if (temporalMode == SpiQuery.TemporalMode.DRAFT) {
           localDesc.setDraft(localBean);
@@ -413,6 +413,30 @@ class SqlTreeNodeBean implements SqlTreeNode {
       }
     }
 
+    /**
+     * Create lazy loading proxies for the Many's except for the one that is
+     * included in the actual query.
+     */
+    private void createListProxies() {
+      STreePropertyAssocMany fetchedMany = ctx.getManyProperty();
+      boolean forceNewReference = queryMode == Mode.REFRESH_BEAN;
+      // load the List/Set/Map proxy objects (deferred fetching of lists)
+      for (STreePropertyAssocMany many : localDesc.propsMany()) {
+        if (many != fetchedMany) {
+          // create a proxy for the many (deferred fetching)
+          BeanCollection<?> ref = many.createReference(localBean, forceNewReference);
+          if (ref != null) {
+            if (disableLazyLoad) {
+              ref.setDisableLazyLoad(true);
+            }
+            if (!ref.isRegisteredWithLoadContext()) {
+              ctx.register(many.getName(), ref);
+            }
+          }
+        }
+      }
+    }
+
     void setBeanToParent() {
       if (parentBean != null) {
         // set this back to the parentBean
@@ -463,32 +487,6 @@ class SqlTreeNodeBean implements SqlTreeNode {
     return load.complete();
   }
 
-  /**
-   * Create lazy loading proxies for the Many's except for the one that is
-   * included in the actual query.
-   */
-  private void createListProxies(STreeType localDesc, DbReadContext ctx, EntityBean localBean, boolean disableLazyLoad) {
-
-    STreePropertyAssocMany fetchedMany = ctx.getManyProperty();
-
-    // load the List/Set/Map proxy objects (deferred fetching of lists)
-    for (STreePropertyAssocMany many : localDesc.propsMany()) {
-
-      if (fetchedMany == null || !fetchedMany.equals(many)) {
-        // create a proxy for the many (deferred fetching)
-        BeanCollection<?> ref = many.createReferenceIfNull(localBean);
-        if (ref != null) {
-          if (disableLazyLoad) {
-            ref.setDisableLazyLoad(true);
-          }
-          if (!ref.isRegisteredWithLoadContext()) {
-            ctx.register(many.getName(), ref);
-          }
-        }
-      }
-    }
-  }
-
   @Override
   public void appendGroupBy(DbSqlContext ctx, boolean subQuery) {
 

From 0ff9a004273d4f70809545babe2efbd087e100aa Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 29 Jul 2019 22:49:36 +1200
Subject: [PATCH 0983/1036] [maven-release-plugin] prepare release
 ebean-11.41.4

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 035cda735..32da41a36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.41.4-SNAPSHOT</version>
+  <version>11.41.4</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.41.4</tag>
   </scm>
 
   <profiles>

From ecf1e53616a8f243f4d7b94940e25abe4b051709 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 29 Jul 2019 22:49:48 +1200
Subject: [PATCH 0984/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 32da41a36..c87c6b19e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.41.4</version>
+  <version>11.41.5-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.41.4</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 6dba4a3d2871d051b6d50160e77fd83195257f43 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 29 Jul 2019 23:26:45 +1200
Subject: [PATCH 0985/1036] #1763 - Change such that db-create-all.sql and
 db-drop-all.sql generated files go into target (maven) or build (gradle)
 directories

---
 .../dbmigration/DdlGenerator.java             | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
index fd533a8fd..338781f61 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
@@ -35,6 +35,7 @@ import java.sql.SQLException;
 public class DdlGenerator {
 
   private static final Logger log = LoggerFactory.getLogger(DdlGenerator.class);
+  private static final String[] BUILD_DIRS = {"target", "build"};
 
   private final SpiEbeanServer server;
 
@@ -50,6 +51,7 @@ public class DdlGenerator {
   private CurrentModel currentModel;
   private String dropAllContent;
   private String createAllContent;
+  private File baseDir;
 
   public DdlGenerator(SpiEbeanServer server, ServerConfig serverConfig) {
     this.server = server;
@@ -67,6 +69,17 @@ public class DdlGenerator {
       this.ddlCommitOnCreateIndex = server.getDatabasePlatform().isDdlCommitOnCreateIndex();
     }
     this.scriptTransform = createScriptTransform(serverConfig.getMigrationConfig());
+    this.baseDir = initBaseDir();
+  }
+
+  private File initBaseDir() {
+    for (String buildDir : BUILD_DIRS) {
+      File dir = new File(buildDir);
+      if (dir.exists() && dir.isDirectory()) {
+        return dir;
+      }
+    }
+    return new File(".");
   }
 
   /**
@@ -212,7 +225,6 @@ public class DdlGenerator {
    * extra-ddl.xml should have some partition initialisation but this helps people get going.
    */
   private void checkInitialTablePartitions(Connection connection) {
-
     DatabasePlatform databasePlatform = server.getDatabasePlatform();
     try {
       StringBuilder sb = new StringBuilder();
@@ -245,12 +257,11 @@ public class DdlGenerator {
   }
 
   protected void runResourceScript(Connection connection, String sqlScript) throws IOException {
-
     if (sqlScript != null) {
       try (InputStream is = getClassLoader().getResourceAsStream(sqlScript)) {
         if (is != null) {
           String content = readContent(new InputStreamReader(is));
-          runScript(connection,  false, content, sqlScript);
+          runScript(connection, false, content, sqlScript);
         }
       }
     }
@@ -268,7 +279,6 @@ public class DdlGenerator {
   }
 
   protected void writeDrop(String dropFile) {
-
     try {
       writeFile(dropFile, generateDropAllDdl());
     } catch (IOException e) {
@@ -277,7 +287,6 @@ public class DdlGenerator {
   }
 
   protected void writeCreate(String createFile) {
-
     try {
       writeFile(createFile, generateCreateAllDdl());
     } catch (IOException e) {
@@ -286,7 +295,6 @@ public class DdlGenerator {
   }
 
   protected String generateDropAllDdl() {
-
     try {
       dropAllContent = currentModel().getDropAllDdl();
       return dropAllContent;
@@ -296,7 +304,6 @@ public class DdlGenerator {
   }
 
   protected String generateCreateAllDdl() {
-
     try {
       createAllContent = currentModel().getCreateDdl();
       return createAllContent;
@@ -321,8 +328,7 @@ public class DdlGenerator {
   }
 
   protected void writeFile(String fileName, String fileContent) throws IOException {
-
-    File f = new File(fileName);
+    File f = new File(baseDir, fileName);
     try (FileWriter fw = new FileWriter(f)) {
       fw.write(fileContent);
       fw.flush();
@@ -330,17 +336,14 @@ public class DdlGenerator {
   }
 
   protected String readFile(String fileName) throws IOException {
-
-    File f = new File(fileName);
+    File f = new File(baseDir, fileName);
     if (!f.exists()) {
       return null;
     }
-
     return readContent(new FileReader(f));
   }
 
   protected String readContent(Reader reader) throws IOException {
-
     StringBuilder buf = new StringBuilder();
     try (LineNumberReader lineReader = new LineNumberReader(reader)) {
       String s;
@@ -355,7 +358,6 @@ public class DdlGenerator {
    * Create the ScriptTransform for placeholder key/value replacement.
    */
   private ScriptTransform createScriptTransform(DbMigrationConfig config) {
-
     return ScriptTransform.build(config.getRunPlaceholders(), config.getRunPlaceholderMap());
   }
 

From c63acad7e024973c2394b7b3a07110380854797c Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 29 Jul 2019 23:45:20 +1200
Subject: [PATCH 0986/1036] No effective change - updated review ddl

---
 src/test/ddl-review/h2-create-all.sql        | 1485 ++++++++++++++++--
 src/test/ddl-review/h2-drop-all.sql          |  516 +++++-
 src/test/ddl-review/mysql-create-all.sql     | 1485 ++++++++++++++++--
 src/test/ddl-review/mysql-drop-all.sql       |  516 +++++-
 src/test/ddl-review/pg-create-all.sql        | 1468 +++++++++++++++--
 src/test/ddl-review/pg-drop-all.sql          |  499 +++++-
 src/test/ddl-review/sqlserver-create-all.sql | 1447 ++++++++++++++++-
 src/test/ddl-review/sqlserver-drop-all.sql   |  576 ++++++-
 8 files changed, 7513 insertions(+), 479 deletions(-)

diff --git a/src/test/ddl-review/h2-create-all.sql b/src/test/ddl-review/h2-create-all.sql
index 207d6b517..6fa527144 100644
--- a/src/test/ddl-review/h2-create-all.sql
+++ b/src/test/ddl-review/h2-create-all.sql
@@ -1,4 +1,53 @@
--- Generated by ebean unknown at 2018-03-08T06:41:41.155Z
+-- Generated by ebean unknown at 2019-07-29T10:49:19.569Z
+-- init script create procs
+-- Inital script to create stored procedures etc for mysql platform
+DROP PROCEDURE IF EXISTS usp_ebean_drop_foreign_keys;
+
+delimiter $$
+--
+-- PROCEDURE: usp_ebean_drop_foreign_keys TABLE, COLUMN
+-- deletes all constraints and foreign keys referring to TABLE.COLUMN
+--
+CREATE PROCEDURE usp_ebean_drop_foreign_keys(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
+BEGIN
+  DECLARE done INT DEFAULT FALSE;
+  DECLARE c_fk_name CHAR(255);
+  DECLARE curs CURSOR FOR SELECT CONSTRAINT_NAME from information_schema.KEY_COLUMN_USAGE
+    WHERE TABLE_SCHEMA = DATABASE() and TABLE_NAME = p_table_name and COLUMN_NAME = p_column_name
+      AND REFERENCED_TABLE_NAME IS NOT NULL;
+  DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+
+  OPEN curs;
+
+  read_loop: LOOP
+    FETCH curs INTO c_fk_name;
+    IF done THEN
+      LEAVE read_loop;
+    END IF;
+    SET @sql = CONCAT('ALTER TABLE ', p_table_name, ' DROP FOREIGN KEY ', c_fk_name);
+    PREPARE stmt FROM @sql;
+    EXECUTE stmt;
+  END LOOP;
+
+  CLOSE curs;
+END
+$$
+
+DROP PROCEDURE IF EXISTS usp_ebean_drop_column;
+
+delimiter $$
+--
+-- PROCEDURE: usp_ebean_drop_column TABLE, COLUMN
+-- deletes the column and ensures that all indices and constraints are dropped first
+--
+CREATE PROCEDURE usp_ebean_drop_column(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
+BEGIN
+  CALL usp_ebean_drop_foreign_keys(p_table_name, p_column_name);
+  SET @sql = CONCAT('ALTER TABLE ', p_table_name, ' DROP COLUMN ', p_column_name);
+  PREPARE stmt FROM @sql;
+  EXECUTE stmt;
+END
+$$
 create table asimple_bean (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -13,6 +62,15 @@ create table bar (
   constraint pk_bar primary key (bar_id)
 );
 
+create table block (
+  case_type                     integer(31) not null,
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  notes                         varchar(255),
+  constraint pk_block primary key (id)
+);
+
 create table oto_account (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -22,6 +80,19 @@ create table oto_account (
   constraint pk_oto_account primary key (id)
 );
 
+create table acl (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_acl primary key (id)
+);
+
+create table acl_container_relation (
+  id                            bigint auto_increment not null,
+  container_id                  bigint not null,
+  acl_entry_id                  bigint not null,
+  constraint pk_acl_container_relation primary key (id)
+);
+
 create table addr (
   id                            bigint auto_increment not null,
   employee_id                   bigint,
@@ -123,12 +194,19 @@ create table bbookmark (
   constraint pk_bbookmark primary key (id)
 );
 
+create table bbookmark_org (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  constraint pk_bbookmark_org primary key (id)
+);
+
 create table bbookmark_user (
   id                            integer auto_increment not null,
   name                          varchar(255),
   password                      varchar(255),
   email_address                 varchar(255),
   country                       varchar(255),
+  org_id                        integer,
   constraint pk_bbookmark_user primary key (id)
 );
 
@@ -144,19 +222,18 @@ create table bsite (
   constraint pk_bsite primary key (id)
 );
 
-create table bsite_user (
+create table bsite_user_a (
   site_id                       varchar(40) not null,
   user_id                       varchar(40) not null,
   access_level                  integer,
-  constraint ck_bsite_user_access_level check ( access_level in (0,1,2)),
-  constraint pk_bsite_user primary key (site_id,user_id)
+  version                       bigint not null,
+  constraint pk_bsite_user_a primary key (site_id,user_id)
 );
 
 create table bsite_user_b (
   site                          varchar(40) not null,
   usr                           varchar(40) not null,
   access_level                  integer,
-  constraint ck_bsite_user_b_access_level check ( access_level in (0,1,2)),
   constraint pk_bsite_user_b primary key (site,usr)
 );
 
@@ -164,10 +241,22 @@ create table bsite_user_c (
   site_uid                      varchar(40) not null,
   user_uid                      varchar(40) not null,
   access_level                  integer,
-  constraint ck_bsite_user_c_access_level check ( access_level in (0,1,2)),
   constraint pk_bsite_user_c primary key (site_uid,user_uid)
 );
 
+create table bsite_user_d (
+  site_id                       varchar(40) not null,
+  user_id                       varchar(40) not null,
+  access_level                  integer,
+  version                       bigint not null
+);
+
+create table bsite_user_e (
+  site_id                       varchar(40) not null,
+  user_id                       varchar(40) not null,
+  access_level                  integer
+);
+
 create table buser (
   id                            varchar(40) not null,
   name                          varchar(255),
@@ -177,15 +266,35 @@ create table buser (
 create table bwith_qident (
   id                            integer auto_increment not null,
   `Name`                        varchar(191),
+  `CODE`                        varchar(255),
   last_updated                  datetime(6) not null,
   constraint uq_bwith_qident_name unique (`Name`),
   constraint pk_bwith_qident primary key (id)
 );
 
+create table basic_draftable_bean (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_basic_draftable_bean primary key (id)
+);
+
+create table basic_draftable_bean_draft (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_basic_draftable_bean_draft primary key (id)
+);
+
 create table basic_joda_entity (
   id                            bigint auto_increment not null,
   name                          varchar(255),
   period                        varchar(50),
+  local_date                    date,
   created                       datetime(6) not null,
   updated                       datetime(6) not null,
   version                       datetime(6) not null,
@@ -211,6 +320,45 @@ create table drel_booking (
   constraint pk_drel_booking primary key (id)
 );
 
+create table bw_bean (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  flags                         integer not null,
+  version                       bigint not null,
+  constraint pk_bw_bean primary key (id)
+);
+
+create table cepcategory (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_cepcategory primary key (id)
+);
+
+create table cepproduct (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_cepproduct primary key (id)
+);
+
+create table cepproduct_category (
+  customer_id                   bigint not null,
+  address_id                    bigint not null,
+  category_id                   bigint not null,
+  product_id                    bigint not null,
+  priority                      integer
+);
+
+create table cinh_ref (
+  id                            integer auto_increment not null,
+  ref_id                        integer,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  constraint pk_cinh_ref primary key (id)
+);
+
 create table cinh_root (
   dtype                         varchar(3) not null,
   id                            integer auto_increment not null,
@@ -263,14 +411,9 @@ create table cao_bean (
   constraint pk_cao_bean primary key (x_cust_id,x_type_id)
 );
 
-create table sa_car (
-  id                            bigint auto_increment not null,
-  version                       integer not null,
-  constraint pk_sa_car primary key (id)
-);
-
 create table sp_car_car (
   id                            bigint auto_increment not null,
+  name                          varchar(255),
   version                       integer not null,
   constraint pk_sp_car_car primary key (id)
 );
@@ -281,6 +424,18 @@ create table sp_car_car_wheels (
   constraint pk_sp_car_car_wheels primary key (car,wheel)
 );
 
+create table sp_car_car_doors (
+  car                           bigint not null,
+  door                          bigint not null,
+  constraint pk_sp_car_car_doors primary key (car,door)
+);
+
+create table sa_car (
+  id                            bigint auto_increment not null,
+  version                       integer not null,
+  constraint pk_sa_car primary key (id)
+);
+
 create table car_accessory (
   id                            integer auto_increment not null,
   name                          varchar(255),
@@ -306,6 +461,15 @@ create table category (
   constraint pk_category primary key (id)
 );
 
+create table e_save_test_d (
+  id                            bigint auto_increment not null,
+  parent_id                     bigint,
+  test_property                 tinyint(1) default 0 not null,
+  version                       bigint not null,
+  constraint uq_e_save_test_d_parent_id unique (parent_id),
+  constraint pk_e_save_test_d primary key (id)
+);
+
 create table child_person (
   identifier                    integer auto_increment not null,
   name                          varchar(255),
@@ -317,6 +481,34 @@ create table child_person (
   constraint pk_child_person primary key (identifier)
 );
 
+create table cke_client (
+  cod_cpny                      integer not null,
+  cod_client                    varchar(100) not null,
+  username                      varchar(100) not null,
+  notes                         varchar(255),
+  constraint pk_cke_client primary key (cod_cpny,cod_client)
+);
+
+create table cke_user (
+  username                      varchar(100) not null,
+  cod_cpny                      integer not null,
+  name                          varchar(255),
+  constraint pk_cke_user primary key (username,cod_cpny)
+);
+
+create table class_super (
+  dtype                         varchar(31) not null,
+  sid                           bigint auto_increment not null,
+  constraint pk_class_super primary key (sid)
+);
+
+create table class_super_monkey (
+  class_super_sid               bigint not null,
+  monkey_mid                    bigint not null,
+  constraint uq_class_super_monkey_mid unique (monkey_mid),
+  constraint pk_class_super_monkey primary key (class_super_sid,monkey_mid)
+);
+
 create table configuration (
   type                          varchar(21) not null,
   id                            integer auto_increment not null,
@@ -367,6 +559,19 @@ create table contact_note (
   constraint pk_contact_note primary key (id)
 );
 
+create table contract (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_contract primary key (id)
+);
+
+create table contract_costs (
+  id                            bigint auto_increment not null,
+  status                        varchar(255),
+  position_id                   bigint not null,
+  constraint pk_contract_costs primary key (id)
+);
+
 create table c_conversation (
   id                            bigint auto_increment not null,
   title                         varchar(255),
@@ -386,7 +591,7 @@ create table o_country (
 
 create table cover (
   id                            bigint auto_increment not null,
-  s3url                         varchar(255),
+  s3_url                        varchar(255),
   deleted                       tinyint(1) default 0 not null,
   constraint pk_cover primary key (id)
 );
@@ -402,7 +607,6 @@ create table o_customer (
   cretime                       datetime(6) not null,
   updtime                       datetime(6) not null,
   version                       bigint not null,
-  constraint ck_o_customer_status check ( status in ('N','A','I')),
   constraint pk_o_customer primary key (id)
 ) comment='Holds external customers';
 
@@ -426,6 +630,55 @@ create table dexh_entity (
   constraint pk_dexh_entity primary key (oid)
 );
 
+create table dmachine (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  organisation_id               bigint,
+  version                       bigint not null,
+  constraint pk_dmachine primary key (id)
+);
+
+create table d_machine_aux_use (
+  id                            bigint auto_increment not null,
+  machine_id                    bigint not null,
+  name                          varchar(255),
+  date                          date,
+  use_secs                      bigint not null,
+  fuel                          decimal(38),
+  version                       bigint not null,
+  constraint pk_d_machine_aux_use primary key (id)
+);
+
+create table d_machine_stats (
+  id                            bigint auto_increment not null,
+  machine_id                    bigint not null,
+  date                          date,
+  total_kms                     bigint not null,
+  hours                         bigint not null,
+  rate                          decimal(38),
+  cost                          decimal(38),
+  version                       bigint not null,
+  constraint pk_d_machine_stats primary key (id)
+);
+
+create table d_machine_use (
+  id                            bigint auto_increment not null,
+  machine_id                    bigint not null,
+  date                          date,
+  distance_kms                  bigint not null,
+  time_secs                     bigint not null,
+  fuel                          decimal(38),
+  version                       bigint not null,
+  constraint pk_d_machine_use primary key (id)
+);
+
+create table dorg (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_dorg primary key (id)
+);
+
 create table dperson (
   id                            bigint auto_increment not null,
   first_name                    varchar(255),
@@ -458,6 +711,27 @@ create table rawinherit_data (
   constraint pk_rawinherit_data primary key (id)
 );
 
+create table data_container (
+  id                            varchar(40) not null,
+  content                       varchar(255),
+  constraint pk_data_container primary key (id)
+);
+
+create table dc_detail (
+  id                            bigint auto_increment not null,
+  master_id                     bigint,
+  description                   varchar(255),
+  version                       bigint not null,
+  constraint pk_dc_detail primary key (id)
+);
+
+create table dc_master (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_dc_master primary key (id)
+);
+
 create table dfk_cascade (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -485,6 +759,18 @@ create table dfk_none_via_join (
   constraint pk_dfk_none_via_join primary key (id)
 );
 
+create table dfk_none_via_mto_m (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_dfk_none_via_mto_m primary key (id)
+);
+
+create table dfk_none_via_mto_m_dfk_one (
+  dfk_none_via_mto_m_id         bigint not null,
+  dfk_one_id                    bigint not null,
+  constraint pk_dfk_none_via_mto_m_dfk_one primary key (dfk_none_via_mto_m_id,dfk_one_id)
+);
+
 create table dfk_one (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -575,14 +861,24 @@ create table document_media_draft (
   constraint pk_document_media_draft primary key (id)
 );
 
+create table sp_car_door (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_sp_car_door primary key (id)
+);
+
 create table earray_bean (
   id                            bigint auto_increment not null,
+  foo                           integer,
   name                          varchar(255),
   phone_numbers                 varchar(300),
   uids                          varchar(1000),
   other_ids                     varchar(1000),
   doubs                         varchar(1000),
   statuses                      varchar(1000),
+  vc_enums                      varchar(1000),
+  int_enums                     varchar(1000),
   status2                       varchar(1000),
   version                       bigint not null,
   constraint pk_earray_bean primary key (id)
@@ -605,7 +901,6 @@ create table e_basic (
   name                          varchar(127),
   description                   varchar(255),
   some_date                     datetime(6),
-  constraint ck_e_basic_status check ( status in ('N','A','I')),
   constraint pk_e_basic primary key (id)
 );
 
@@ -667,11 +962,20 @@ create table e_basicenc_bin (
   constraint pk_e_basicenc_bin primary key (id)
 );
 
+create table e_basicenc_client (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  description                   varbinary(80),
+  dob                           varbinary(20),
+  status                        varbinary(20),
+  version                       bigint not null,
+  constraint pk_e_basicenc_client primary key (id)
+);
+
 create table e_basic_enum_id (
   status                        varchar(1) not null,
   name                          varchar(255),
   description                   varchar(255),
-  constraint ck_e_basic_enum_id_status check ( status in ('N','A','I')),
   constraint pk_e_basic_enum_id primary key (status)
 );
 
@@ -681,7 +985,6 @@ create table e_basic_eni (
   name                          varchar(255),
   description                   varchar(255),
   some_date                     datetime(6),
-  constraint ck_e_basic_eni_status check ( status in (1,2,3)),
   constraint pk_e_basic_eni primary key (id)
 );
 
@@ -693,6 +996,28 @@ create table ebasic_hstore (
   constraint pk_ebasic_hstore primary key (id)
 );
 
+create table ebasic_json_jackson (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  value_set                     varchar(700),
+  value_list                    longtext,
+  value_map                     varchar(700),
+  plain_value                   varchar(500),
+  version                       bigint not null,
+  constraint pk_ebasic_json_jackson primary key (id)
+);
+
+create table ebasic_json_jackson2 (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  value_set                     varchar(700),
+  value_list                    longtext,
+  value_map                     varchar(700),
+  plain_value                   varchar(500),
+  version                       bigint not null,
+  constraint pk_ebasic_json_jackson2 primary key (id)
+);
+
 create table ebasic_json_list (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -845,6 +1170,13 @@ create table e_basic_withlife (
   constraint pk_e_basic_withlife primary key (id)
 );
 
+create table e_basic_with_ex (
+  id                            bigint auto_increment not null,
+  deleted                       tinyint(1) default 0 not null,
+  version                       bigint not null,
+  constraint pk_e_basic_with_ex primary key (id)
+);
+
 create table e_basicverucon (
   id                            integer auto_increment not null,
   name                          varchar(127),
@@ -857,6 +1189,19 @@ create table e_basicverucon (
   constraint pk_e_basicverucon primary key (id)
 );
 
+create table ecache_child (
+  id                            varchar(40) not null,
+  name                          varchar(100),
+  root_id                       varchar(40) not null,
+  constraint pk_ecache_child primary key (id)
+);
+
+create table ecache_root (
+  id                            varchar(40) not null,
+  name                          varchar(100),
+  constraint pk_ecache_root primary key (id)
+);
+
 create table e_col_ab (
   id                            bigint auto_increment not null,
   column_a                      varchar(255),
@@ -870,6 +1215,14 @@ create table ecustom_id (
   constraint pk_ecustom_id primary key (id)
 );
 
+create table edefault_prop (
+  id                            integer auto_increment not null,
+  e_simple_usertypeid           integer,
+  name                          varchar(255),
+  constraint uq_edefault_prop_e_simple_usertypeid unique (e_simple_usertypeid),
+  constraint pk_edefault_prop primary key (id)
+);
+
 create table eemb_inner (
   id                            integer auto_increment not null,
   nome_inner                    varchar(255),
@@ -887,6 +1240,31 @@ create table eemb_outer (
   constraint pk_eemb_outer primary key (id)
 );
 
+create table efile2_no_fk (
+  file_name                     varchar(64) not null,
+  owner_id                      integer not null,
+  constraint pk_efile2_no_fk primary key (file_name)
+);
+
+create table efile_no_fk (
+  file_name                     varchar(64) not null,
+  owner_user_id                 integer,
+  owner_soft_del_user_id        integer,
+  constraint pk_efile_no_fk primary key (file_name)
+);
+
+create table efile_no_fk_euser_no_fk (
+  efile_no_fk_file_name         varchar(64) not null,
+  euser_no_fk_user_id           integer not null,
+  constraint pk_efile_no_fk_euser_no_fk primary key (efile_no_fk_file_name,euser_no_fk_user_id)
+);
+
+create table efile_no_fk_euser_no_fk_soft_del (
+  efile_no_fk_file_name         varchar(64) not null,
+  euser_no_fk_soft_del_user_id  integer not null,
+  constraint pk_efile_no_fk_euser_no_fk_soft_del primary key (efile_no_fk_file_name,euser_no_fk_soft_del_user_id)
+);
+
 create table egen_props (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -922,9 +1300,6 @@ create table einvoice (
   bill_city                     varchar(255),
   bill_status                   varchar(3),
   version                       bigint not null,
-  constraint ck_einvoice_state check ( state in (0,1,2)),
-  constraint ck_einvoice_ship_status check ( ship_status in ('ONE','TWO')),
-  constraint ck_einvoice_bill_status check ( bill_status in ('ONE','TWO')),
   constraint pk_einvoice primary key (id)
 );
 
@@ -978,6 +1353,17 @@ create table eopt_one_c (
   constraint pk_eopt_one_c primary key (id)
 );
 
+create table eper_addr (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  ma_street                     varchar(255),
+  ma_suburb                     varchar(255),
+  ma_city                       varchar(255),
+  ma_country_code               varchar(2),
+  version                       bigint not null,
+  constraint pk_eper_addr primary key (id)
+);
+
 create table eperson (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -987,7 +1373,6 @@ create table eperson (
   addr_city                     varchar(255),
   addr_status                   varchar(3),
   version                       bigint not null,
-  constraint ck_eperson_addr_status check ( addr_status in ('ONE','TWO')),
   constraint pk_eperson primary key (id)
 );
 
@@ -1130,6 +1515,18 @@ create table rawinherit_uncle (
   constraint pk_rawinherit_uncle primary key (id)
 );
 
+create table euser_no_fk (
+  user_id                       integer auto_increment not null,
+  user_name                     varchar(255),
+  constraint pk_euser_no_fk primary key (user_id)
+);
+
+create table euser_no_fk_soft_del (
+  user_id                       integer auto_increment not null,
+  user_name                     varchar(255),
+  constraint pk_euser_no_fk_soft_del primary key (user_id)
+);
+
 create table evanilla_collection (
   id                            integer auto_increment not null,
   name                          varchar(255),
@@ -1158,10 +1555,103 @@ create table e_withinet (
   id                            bigint auto_increment not null,
   name                          varchar(255),
   inet_address                  varchar(50),
+  inet2                         varchar(255),
+  cdir                          varchar(50),
   version                       bigint not null,
   constraint pk_e_withinet primary key (id)
 );
 
+create table ec_enum_person (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ec_enum_person primary key (id)
+);
+
+create table ec_enum_person_tags (
+  ec_enum_person_id             bigint not null,
+  value                         varchar(5) not null
+);
+
+create table ec_person (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ec_person primary key (id)
+);
+
+create table ec_person_phone (
+  owner_id                      bigint not null,
+  phone                         varchar(255) not null
+);
+
+create table ecbl_person (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecbl_person primary key (id)
+);
+
+create table ecbl_person_phone_numbers (
+  person_id                     bigint not null,
+  country_code                  varchar(2),
+  area                          varchar(6),
+  number                        varchar(20)
+);
+
+create table ecbm_person (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecbm_person primary key (id)
+);
+
+create table ecbm_person_phone_numbers (
+  person_id                     bigint not null,
+  mkey                          varchar(255) not null,
+  country_code                  varchar(2),
+  area                          varchar(6),
+  number                        varchar(20)
+);
+
+create table ecm_person (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecm_person primary key (id)
+);
+
+create table ecm_person_phone_numbers (
+  ecm_person_id                 bigint not null,
+  type                          varchar(4) not null,
+  number                        varchar(10) not null
+);
+
+create table ecmc_person (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecmc_person primary key (id)
+);
+
+create table ecmc_person_phone_numbers (
+  ecmc_person_id                bigint not null,
+  type                          varchar(4) not null,
+  value                         longtext not null
+);
+
+create table ecs_person (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecs_person primary key (id)
+);
+
+create table ecs_person_phone (
+  ecs_person_id                 bigint not null,
+  phone                         varchar(255) not null
+);
+
 create table td_child (
   child_id                      integer auto_increment not null,
   child_name                    varchar(255),
@@ -1185,6 +1675,23 @@ create table empl (
   constraint pk_empl primary key (id)
 );
 
+create table esd_detail (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  master_id                     bigint not null,
+  version                       bigint not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_esd_detail primary key (id)
+);
+
+create table esd_master (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_esd_master primary key (id)
+);
+
 create table feature_desc (
   id                            integer auto_increment not null,
   name                          varchar(255),
@@ -1268,6 +1775,7 @@ create table hx_link (
   version                       bigint not null,
   when_created                  datetime(6) not null,
   when_modified                 datetime(6) not null,
+  deleted                       tinyint(1) default 0 not null,
   constraint pk_hx_link primary key (id)
 );
 
@@ -1303,6 +1811,73 @@ create table hi_link_doc (
   constraint pk_hi_link_doc primary key (hi_link_id,hi_doc_id)
 );
 
+create table hi_tone (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  comments                      varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_hi_tone primary key (id)
+);
+
+create table hi_tthree (
+  id                            bigint auto_increment not null,
+  hi_ttwo_id                    bigint not null,
+  three                         varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_hi_tthree primary key (id)
+);
+
+create table hi_ttwo (
+  id                            bigint auto_increment not null,
+  hi_tone_id                    bigint not null,
+  two                           varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_hi_ttwo primary key (id)
+);
+
+create table hsd_setting (
+  id                            bigint auto_increment not null,
+  code                          varchar(255),
+  content                       varchar(255),
+  user_id                       bigint,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint uq_hsd_setting_user_id unique (user_id),
+  constraint pk_hsd_setting primary key (id)
+);
+
+create table hsd_user (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_hsd_user primary key (id)
+);
+
+create table iaf_segment (
+  ptype                         varchar(31) not null,
+  id                            bigint auto_increment not null,
+  segment_id_zat                bigint not null,
+  status_id                     bigint not null,
+  constraint pk_iaf_segment primary key (id)
+);
+
+create table iaf_segment_status (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_iaf_segment_status primary key (id)
+);
+
 create table imrelated (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -1388,6 +1963,20 @@ create table monkey (
   constraint pk_monkey primary key (mid)
 );
 
+create table mkeygroup (
+  pid                           bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_mkeygroup primary key (pid)
+);
+
+create table mkeygroup_monkey (
+  mkeygroup_pid                 bigint not null,
+  monkey_mid                    bigint not null,
+  constraint uq_mkeygroup_monkey_mid unique (monkey_mid),
+  constraint pk_mkeygroup_monkey primary key (mkeygroup_pid,monkey_mid)
+);
+
 create table trainer (
   tid                           bigint auto_increment not null,
   name                          varchar(255),
@@ -1512,6 +2101,70 @@ create table la_attr_value_attribute (
   constraint pk_la_attr_value_attribute primary key (la_attr_value_id,attribute_id)
 );
 
+create table looney (
+  id                            bigint auto_increment not null,
+  tune_id                       bigint,
+  name                          varchar(255),
+  constraint pk_looney primary key (id)
+);
+
+create table maddress (
+  id                            varchar(40) not null,
+  street                        varchar(255),
+  city                          varchar(255),
+  version                       bigint not null,
+  constraint pk_maddress primary key (id)
+);
+
+create table mcontact (
+  id                            varchar(40) not null,
+  email                         varchar(255),
+  first_name                    varchar(255),
+  last_name                     varchar(255),
+  customer_id                   varchar(40),
+  version                       bigint not null,
+  constraint pk_mcontact primary key (id)
+);
+
+create table mcontact_message (
+  id                            varchar(40) not null,
+  title                         varchar(255),
+  subject                       varchar(255),
+  notes                         varchar(255),
+  contact_id                    varchar(40) not null,
+  version                       bigint not null,
+  constraint pk_mcontact_message primary key (id)
+);
+
+create table mcustomer (
+  id                            varchar(40) not null,
+  name                          varchar(255),
+  notes                         varchar(255),
+  shipping_address_id           varchar(40),
+  billing_address_id            varchar(40),
+  version                       bigint not null,
+  constraint pk_mcustomer primary key (id)
+);
+
+create table mgroup (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_mgroup primary key (id)
+);
+
+create table mmachine (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_mmachine primary key (id)
+);
+
+create table mmachine_mgroup (
+  mmachine_id                   bigint not null,
+  mgroup_id                     bigint not null,
+  constraint pk_mmachine_mgroup primary key (mmachine_id,mgroup_id)
+);
+
 create table mmedia (
   type                          varchar(31) not null,
   id                            bigint auto_increment not null,
@@ -1525,7 +2178,6 @@ create table non_updateprop (
   non_enum                      varchar(5),
   name                          varchar(255),
   note                          varchar(255),
-  constraint ck_non_updateprop_non_enum check ( non_enum in ('BEGIN','END')),
   constraint pk_non_updateprop primary key (id)
 );
 
@@ -1624,6 +2276,21 @@ create table mail_user_outbox (
   constraint pk_mail_user_outbox primary key (mail_user_id,mail_box_id)
 );
 
+create table main_entity (
+  id                            varchar(255) not null,
+  attr1                         varchar(255),
+  attr2                         varchar(255),
+  constraint pk_main_entity primary key (id)
+);
+
+create table main_entity_relation (
+  id                            varchar(40) not null,
+  id1                           varchar(255),
+  id2                           varchar(255),
+  attr1                         varchar(255),
+  constraint pk_main_entity_relation primary key (id)
+);
+
 create table map_super_actual (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -1644,6 +2311,42 @@ create table c_message (
   constraint pk_c_message primary key (id)
 );
 
+create table meter_address_data (
+  id                            varchar(40) not null,
+  street                        varchar(255) not null,
+  constraint pk_meter_address_data primary key (id)
+);
+
+create table meter_contract_data (
+  id                            varchar(40) not null,
+  special_needs_client_id       varchar(40) not null,
+  constraint uq_meter_contract_data_special_needs_client_id unique (special_needs_client_id),
+  constraint pk_meter_contract_data primary key (id)
+);
+
+create table meter_special_needs_client (
+  id                            varchar(40) not null,
+  name                          varchar(255),
+  primary_id                    varchar(40),
+  constraint uq_meter_special_needs_client_primary_id unique (primary_id),
+  constraint pk_meter_special_needs_client primary key (id)
+);
+
+create table meter_special_needs_contact (
+  id                            varchar(40) not null,
+  name                          varchar(255),
+  constraint pk_meter_special_needs_contact primary key (id)
+);
+
+create table meter_version (
+  id                            varchar(40) not null,
+  address_data_id               varchar(40),
+  contract_data_id              varchar(40) not null,
+  constraint uq_meter_version_address_data_id unique (address_data_id),
+  constraint uq_meter_version_contract_data_id unique (contract_data_id),
+  constraint pk_meter_version primary key (id)
+);
+
 create table mnoc_role (
   role_id                       integer auto_increment not null,
   role_name                     varchar(255),
@@ -1793,6 +2496,15 @@ create table o_cached_bean_child (
   constraint pk_o_cached_bean_child primary key (id)
 );
 
+create table o_cached_inherit (
+  dtype                         varchar(31) not null,
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  child_adata                   varchar(255),
+  child_bdata                   varchar(255),
+  constraint pk_o_cached_inherit primary key (id)
+);
+
 create table o_cached_natkey (
   id                            bigint auto_increment not null,
   store                         varchar(255),
@@ -1875,6 +2587,11 @@ create table om_ordered_master (
   constraint pk_om_ordered_master primary key (id)
 );
 
+create table only_id_entity (
+  id                            bigint auto_increment not null,
+  constraint pk_only_id_entity primary key (id)
+);
+
 create table o_order (
   id                            integer auto_increment not null,
   status                        integer,
@@ -1883,7 +2600,6 @@ create table o_order (
   kcustomer_id                  integer not null,
   cretime                       datetime(6) not null,
   updtime                       datetime(6) not null,
-  constraint ck_o_order_status check ( status in (0,1,2,3)),
   constraint pk_o_order primary key (id)
 );
 
@@ -1932,8 +2648,68 @@ create table organisation (
   constraint pk_organisation primary key (id)
 );
 
+create table organization_node (
+  kind                          varchar(31) not null,
+  id                            bigint auto_increment not null,
+  parent_tree_node_id           bigint not null,
+  title                         varchar(255),
+  constraint uq_organization_node_parent_tree_node_id unique (parent_tree_node_id),
+  constraint pk_organization_node primary key (id)
+);
+
+create table organization_tree_node (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_organization_tree_node primary key (id)
+);
+
+create table orp_detail (
+  id                            varchar(100) not null,
+  detail                        varchar(255),
+  master_id                     varchar(100),
+  version                       bigint not null,
+  constraint pk_orp_detail primary key (id)
+);
+
+create table orp_detail2 (
+  id                            varchar(100) not null,
+  orp_master2_id                varchar(100) not null,
+  detail                        varchar(255),
+  master_id                     varchar(255),
+  version                       bigint not null,
+  constraint pk_orp_detail2 primary key (id)
+);
+
+create table orp_master (
+  id                            varchar(100) not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_orp_master primary key (id)
+);
+
+create table orp_master2 (
+  id                            varchar(100) not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_orp_master2 primary key (id)
+);
+
+create table oto_aone (
+  id                            varchar(100) not null,
+  description                   varchar(255),
+  constraint pk_oto_aone primary key (id)
+);
+
+create table oto_atwo (
+  id                            varchar(100) not null,
+  description                   varchar(255),
+  aone_id                       varchar(100),
+  constraint uq_oto_atwo_aone_id unique (aone_id),
+  constraint pk_oto_atwo primary key (id)
+);
+
 create table oto_bchild (
-  master_id                     bigint auto_increment not null,
+  master_id                     bigint not null,
   child                         varchar(255),
   constraint pk_oto_bchild primary key (master_id)
 );
@@ -1970,6 +2746,28 @@ create table oto_cust_address (
   constraint pk_oto_cust_address primary key (aid)
 );
 
+create table oto_level_a (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  b_id                          bigint,
+  constraint uq_oto_level_a_b_id unique (b_id),
+  constraint pk_oto_level_a primary key (id)
+);
+
+create table oto_level_b (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  c_id                          bigint,
+  constraint uq_oto_level_b_c_id unique (c_id),
+  constraint pk_oto_level_b primary key (id)
+);
+
+create table oto_level_c (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_oto_level_c primary key (id)
+);
+
 create table oto_master (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -1990,6 +2788,23 @@ create table oto_prime_extra (
   constraint pk_oto_prime_extra primary key (eid)
 );
 
+create table oto_sd_child (
+  id                            bigint auto_increment not null,
+  child                         varchar(255),
+  master_id                     bigint,
+  deleted                       tinyint(1) default 0 not null,
+  version                       bigint not null,
+  constraint uq_oto_sd_child_master_id unique (master_id),
+  constraint pk_oto_sd_child primary key (id)
+);
+
+create table oto_sd_master (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_sd_master primary key (id)
+);
+
 create table oto_th_many (
   id                            bigint auto_increment not null,
   oto_th_top_id                 bigint not null,
@@ -2048,6 +2863,26 @@ create table oto_uprime_extra (
   constraint pk_oto_uprime_extra primary key (eid)
 );
 
+create table oto_user_model (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  user_optional_id              bigint,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint uq_oto_user_model_user_optional_id unique (user_optional_id),
+  constraint pk_oto_user_model primary key (id)
+);
+
+create table oto_user_model_optional (
+  id                            bigint auto_increment not null,
+  optional                      varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_oto_user_model_optional primary key (id)
+);
+
 create table pfile (
   id                            integer auto_increment not null,
   name                          varchar(255),
@@ -2112,6 +2947,12 @@ create table rawinherit_parent_rawinherit_data (
   constraint pk_rawinherit_parent_rawinherit_data primary key (rawinherit_parent_id,rawinherit_data_id)
 );
 
+create table e_save_test_c (
+  id                            bigint auto_increment not null,
+  version                       bigint not null,
+  constraint pk_e_save_test_c primary key (id)
+);
+
 create table parent_person (
   identifier                    integer auto_increment not null,
   name                          varchar(255),
@@ -2132,10 +2973,23 @@ create table c_participation (
   version                       bigint not null,
   when_created                  datetime(6) not null,
   when_modified                 datetime(6) not null,
-  constraint ck_c_participation_type check ( type in (0,1)),
   constraint pk_c_participation primary key (id)
 );
 
+create table password_store_model (
+  id                            bigint auto_increment not null,
+  enc1                          varchar(30),
+  enc2                          varchar(40),
+  enc3                          longtext,
+  enc4                          varbinary(30),
+  enc5                          varbinary(40),
+  enc6                          longblob,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_password_store_model primary key (id)
+);
+
 create table mt_permission (
   id                            varchar(40) not null,
   name                          varchar(255),
@@ -2162,6 +3016,13 @@ create table persistent_file_content (
   constraint pk_persistent_file_content primary key (id)
 );
 
+create table person (
+  oid                           bigint auto_increment not null,
+  default_address_oid           bigint,
+  version                       integer not null,
+  constraint pk_person primary key (oid)
+);
+
 create table persons (
   id                            bigint auto_increment not null,
   surname                       varchar(64) not null,
@@ -2169,11 +3030,17 @@ create table persons (
   constraint pk_persons primary key (id)
 );
 
-create table person (
-  oid                           bigint auto_increment not null,
-  default_address_oid           bigint,
-  version                       integer not null,
-  constraint pk_person primary key (oid)
+create table person_cache_email (
+  id                            varchar(128) not null,
+  person_info_person_id         varchar(128),
+  email                         varchar(255),
+  constraint pk_person_cache_email primary key (id)
+);
+
+create table person_cache_info (
+  person_id                     varchar(128) not null,
+  name                          varchar(255),
+  constraint pk_person_cache_info primary key (person_id)
 );
 
 create table phones (
@@ -2184,6 +3051,13 @@ create table phones (
   constraint pk_phones primary key (id)
 );
 
+create table e_position (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  contract_id                   bigint not null,
+  constraint pk_e_position primary key (id)
+);
+
 create table primary_revision (
   id                            bigint not null,
   revision                      integer not null,
@@ -2245,6 +3119,21 @@ create table region (
   constraint pk_region primary key (customer,type)
 );
 
+create table rel_detail (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_rel_detail primary key (id)
+);
+
+create table rel_master (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  detail_id                     bigint,
+  version                       integer not null,
+  constraint pk_rel_master primary key (id)
+);
+
 create table resourcefile (
   id                            varchar(64) not null,
   parentresourcefileid          varchar(64),
@@ -2252,12 +3141,6 @@ create table resourcefile (
   constraint pk_resourcefile primary key (id)
 );
 
-create table em_role (
-  id                            bigint auto_increment not null,
-  name                          varchar(255),
-  constraint pk_em_role primary key (id)
-);
-
 create table mt_role (
   id                            varchar(40) not null,
   name                          varchar(50),
@@ -2272,6 +3155,12 @@ create table mt_role_permission (
   constraint pk_mt_role_permission primary key (mt_role_id,mt_permission_id)
 );
 
+create table em_role (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_em_role primary key (id)
+);
+
 create table f_second (
   id                            bigint auto_increment not null,
   mod_name                      varchar(255),
@@ -2289,7 +3178,6 @@ create table section (
   cretime                       datetime(6) not null,
   updtime                       datetime(6) not null,
   version                       bigint not null,
-  constraint ck_section_type check ( type in (0,1)),
   constraint pk_section primary key (id)
 );
 
@@ -2315,11 +3203,44 @@ create table self_ref_example (
   constraint pk_self_ref_example primary key (id)
 );
 
+create table e_save_test_a (
+  id                            bigint auto_increment not null,
+  version                       bigint not null,
+  constraint pk_e_save_test_a primary key (id)
+);
+
+create table e_save_test_b (
+  id                            bigint auto_increment not null,
+  sibling_a_id                  bigint,
+  test_property                 tinyint(1) default 0 not null,
+  version                       bigint not null,
+  constraint uq_e_save_test_b_sibling_a_id unique (sibling_a_id),
+  constraint pk_e_save_test_b primary key (id)
+);
+
+create table site (
+  id                            varchar(40) not null,
+  name                          varchar(255),
+  parent_id                     varchar(40),
+  data_container_id             varchar(40),
+  site_address_id               varchar(40),
+  constraint uq_site_data_container_id unique (data_container_id),
+  constraint uq_site_site_address_id unique (site_address_id),
+  constraint pk_site primary key (id)
+);
+
+create table site_address (
+  id                            varchar(40) not null,
+  street                        varchar(255),
+  city                          varchar(255),
+  zip_code                      varchar(255),
+  constraint pk_site_address primary key (id)
+);
+
 create table some_enum_bean (
   id                            bigint auto_increment not null,
   some_enum                     integer,
   name                          varchar(255),
-  constraint ck_some_enum_bean_some_enum check ( some_enum in (0,1)),
   constraint pk_some_enum_bean primary key (id)
 );
 
@@ -2337,18 +3258,20 @@ create table some_new_types_bean (
   mth                           integer(1),
   yr                            integer,
   yr_mth                        date,
+  month_day                     date,
+  sql_date                      date,
   local_date                    date,
   local_date_time               datetime(6),
   offset_date_time              datetime(6),
   zoned_date_time               datetime(6),
+  local_time                    time,
   instant                       datetime(6),
   zone_id                       varchar(60),
   zone_offset                   varchar(60),
   path                          varchar(255),
   period                        varchar(20),
+  duration                      bigint,
   version                       bigint not null,
-  constraint ck_some_new_types_bean_dow check ( dow in (1,2,3,4,5,6,7)),
-  constraint ck_some_new_types_bean_mth check ( mth in (1,2,3,4,5,6,7,8,9,10,11,12)),
   constraint pk_some_new_types_bean primary key (id)
 );
 
@@ -2425,7 +3348,6 @@ create table tevent_one (
   status                        integer,
   event_id                      bigint,
   version                       bigint not null,
-  constraint ck_tevent_one_status check ( status in (0,1)),
   constraint uq_tevent_one_event_id unique (event_id),
   constraint pk_tevent_one primary key (id)
 );
@@ -2564,7 +3486,13 @@ create table truck_ref (
   constraint pk_truck_ref primary key (id)
 );
 
-create table type (
+create table tune (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_tune primary key (id)
+);
+
+create table `type` (
   customer                      integer not null,
   type                          integer not null,
   description                   varchar(255),
@@ -2581,6 +3509,27 @@ create table tz_bean (
   constraint pk_tz_bean primary key (id)
 );
 
+create table usib_child (
+  id                            varchar(40) not null,
+  parent_id                     bigint,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_usib_child primary key (id)
+);
+
+create table usib_child_sibling (
+  id                            bigint auto_increment not null,
+  child_id                      varchar(40),
+  deleted                       tinyint(1) default 0 not null,
+  constraint uq_usib_child_sibling_child_id unique (child_id),
+  constraint pk_usib_child_sibling primary key (id)
+);
+
+create table usib_parent (
+  id                            bigint auto_increment not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_usib_parent primary key (id)
+);
+
 create table ut_detail (
   id                            integer auto_increment not null,
   utmaster_id                   integer not null,
@@ -2595,6 +3544,7 @@ create table ut_master (
   id                            integer auto_increment not null,
   name                          varchar(255),
   description                   varchar(255),
+  date                          date,
   version                       integer not null,
   constraint pk_ut_master primary key (id)
 );
@@ -2602,16 +3552,31 @@ create table ut_master (
 create table uuone (
   id                            varchar(40) not null,
   name                          varchar(255),
+  description                   varchar(255),
+  version                       bigint not null,
   constraint pk_uuone primary key (id)
 );
 
 create table uutwo (
   id                            varchar(40) not null,
   name                          varchar(255),
+  notes                         varchar(255),
   master_id                     varchar(40),
+  version                       bigint not null,
   constraint pk_uutwo primary key (id)
 );
 
+create table oto_user (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  account_id                    bigint not null,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint uq_oto_user_account_id unique (account_id),
+  constraint pk_oto_user primary key (id)
+);
+
 create table c_user (
   id                            bigint auto_increment not null,
   inactive                      tinyint(1) default 0 not null,
@@ -2644,17 +3609,6 @@ create table em_user (
   constraint pk_em_user primary key (id)
 );
 
-create table oto_user (
-  id                            bigint auto_increment not null,
-  name                          varchar(255),
-  account_id                    bigint not null,
-  version                       bigint not null,
-  when_created                  datetime(6) not null,
-  when_modified                 datetime(6) not null,
-  constraint uq_oto_user_account_id unique (account_id),
-  constraint pk_oto_user primary key (id)
-);
-
 create table em_user_role (
   user_id                       bigint not null,
   role_id                       bigint not null,
@@ -2666,16 +3620,16 @@ create table vehicle (
   id                            integer auto_increment not null,
   license_number                varchar(255),
   registration_date             datetime(6),
+  lease_id                      bigint,
   cretime                       datetime(6) not null,
   updtime                       datetime(6) not null,
   version                       bigint not null,
-  siz                           varchar(1),
+  siz                           varchar(3),
   driver                        varchar(255),
   car_ref_id                    integer,
   notes                         varchar(255),
   truck_ref_id                  integer,
   capacity                      double,
-  constraint ck_vehicle_siz check ( siz in ('S','M','L','H')),
   constraint pk_vehicle primary key (id)
 );
 
@@ -2691,6 +3645,20 @@ create table vehicle_driver (
   constraint pk_vehicle_driver primary key (id)
 );
 
+create table vehicle_lease (
+  dtype                         varchar(31) not null,
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  active_start                  date,
+  active_end                    date,
+  version                       bigint not null,
+  bond                          decimal(38),
+  min_duration                  integer not null,
+  day_rate                      decimal(38),
+  max_days                      integer,
+  constraint pk_vehicle_lease primary key (id)
+);
+
 create table warehouses (
   id                            integer auto_increment not null,
   officezoneid                  integer,
@@ -2703,6 +3671,12 @@ create table warehousesshippingzones (
   constraint pk_warehousesshippingzones primary key (warehouseid,shippingzoneid)
 );
 
+create table wheel (
+  id                            bigint auto_increment not null,
+  version                       integer not null,
+  constraint pk_wheel primary key (id)
+);
+
 create table sa_wheel (
   id                            bigint auto_increment not null,
   tire                          bigint,
@@ -2711,14 +3685,9 @@ create table sa_wheel (
   constraint pk_sa_wheel primary key (id)
 );
 
-create table wheel (
-  id                            bigint auto_increment not null,
-  version                       integer not null,
-  constraint pk_wheel primary key (id)
-);
-
 create table sp_car_wheel (
   id                            bigint auto_increment not null,
+  name                          varchar(255),
   version                       integer not null,
   constraint pk_sp_car_wheel primary key (id)
 );
@@ -2765,9 +3734,17 @@ create table zones (
 
 create index ix_contact_last_name_first_name on contact (last_name,first_name);
 create index ix_e_basic_name on e_basic (name);
+create index ix_efile2_no_fk_owner_id on efile2_no_fk (owner_id);
+create index ix_organization_node_kind on organization_node (kind);
 create index ix_bar_foo_id on bar (foo_id);
 alter table bar add constraint fk_bar_foo_id foreign key (foo_id) references foo (foo_id) on delete restrict on update restrict;
 
+create index ix_acl_container_relation_container_id on acl_container_relation (container_id);
+alter table acl_container_relation add constraint fk_acl_container_relation_container_id foreign key (container_id) references contract (id) on delete restrict on update restrict;
+
+create index ix_acl_container_relation_acl_entry_id on acl_container_relation (acl_entry_id);
+alter table acl_container_relation add constraint fk_acl_container_relation_acl_entry_id foreign key (acl_entry_id) references acl (id) on delete restrict on update restrict;
+
 create index ix_addr_employee_id on addr (employee_id);
 alter table addr add constraint fk_addr_employee_id foreign key (employee_id) references empl (id) on delete restrict on update restrict;
 
@@ -2785,11 +3762,14 @@ alter table attribute add constraint fk_attribute_attribute_holder_id foreign ke
 create index ix_bbookmark_user_id on bbookmark (user_id);
 alter table bbookmark add constraint fk_bbookmark_user_id foreign key (user_id) references bbookmark_user (id) on delete restrict on update restrict;
 
-create index ix_bsite_user_site_id on bsite_user (site_id);
-alter table bsite_user add constraint fk_bsite_user_site_id foreign key (site_id) references bsite (id) on delete restrict on update restrict;
+create index ix_bbookmark_user_org_id on bbookmark_user (org_id);
+alter table bbookmark_user add constraint fk_bbookmark_user_org_id foreign key (org_id) references bbookmark_org (id) on delete restrict on update restrict;
 
-create index ix_bsite_user_user_id on bsite_user (user_id);
-alter table bsite_user add constraint fk_bsite_user_user_id foreign key (user_id) references buser (id) on delete restrict on update restrict;
+create index ix_bsite_user_a_site_id on bsite_user_a (site_id);
+alter table bsite_user_a add constraint fk_bsite_user_a_site_id foreign key (site_id) references bsite (id) on delete restrict on update restrict;
+
+create index ix_bsite_user_a_user_id on bsite_user_a (user_id);
+alter table bsite_user_a add constraint fk_bsite_user_a_user_id foreign key (user_id) references buser (id) on delete restrict on update restrict;
 
 create index ix_bsite_user_b_site on bsite_user_b (site);
 alter table bsite_user_b add constraint fk_bsite_user_b_site foreign key (site) references bsite (id) on delete restrict on update restrict;
@@ -2803,10 +3783,27 @@ alter table bsite_user_c add constraint fk_bsite_user_c_site_uid foreign key (si
 create index ix_bsite_user_c_user_uid on bsite_user_c (user_uid);
 alter table bsite_user_c add constraint fk_bsite_user_c_user_uid foreign key (user_uid) references buser (id) on delete restrict on update restrict;
 
+create index ix_bsite_user_e_site_id on bsite_user_e (site_id);
+alter table bsite_user_e add constraint fk_bsite_user_e_site_id foreign key (site_id) references bsite (id) on delete restrict on update restrict;
+
+create index ix_bsite_user_e_user_id on bsite_user_e (user_id);
+alter table bsite_user_e add constraint fk_bsite_user_e_user_id foreign key (user_id) references buser (id) on delete restrict on update restrict;
+
+alter table basic_draftable_bean add constraint fk_basic_draftable_bean_id foreign key (id) references basic_draftable_bean_draft (id) on delete restrict on update restrict;
+
 alter table drel_booking add constraint fk_drel_booking_agent_invoice foreign key (agent_invoice) references drel_invoice (id) on delete restrict on update restrict;
 
 alter table drel_booking add constraint fk_drel_booking_client_invoice foreign key (client_invoice) references drel_invoice (id) on delete restrict on update restrict;
 
+create index ix_cepproduct_category_category_id on cepproduct_category (category_id);
+alter table cepproduct_category add constraint fk_cepproduct_category_category_id foreign key (category_id) references cepcategory (id) on delete restrict on update restrict;
+
+create index ix_cepproduct_category_product_id on cepproduct_category (product_id);
+alter table cepproduct_category add constraint fk_cepproduct_category_product_id foreign key (product_id) references cepproduct (id) on delete restrict on update restrict;
+
+create index ix_cinh_ref_ref_id on cinh_ref (ref_id);
+alter table cinh_ref add constraint fk_cinh_ref_ref_id foreign key (ref_id) references cinh_root (id) on delete restrict on update restrict;
+
 create index ix_ckey_detail_parent on ckey_detail (one_key,two_key);
 alter table ckey_detail add constraint fk_ckey_detail_parent foreign key (one_key,two_key) references ckey_parent (one_key,two_key) on delete restrict on update restrict;
 
@@ -2825,6 +3822,12 @@ alter table sp_car_car_wheels add constraint fk_sp_car_car_wheels_sp_car_car for
 create index ix_sp_car_car_wheels_sp_car_wheel on sp_car_car_wheels (wheel);
 alter table sp_car_car_wheels add constraint fk_sp_car_car_wheels_sp_car_wheel foreign key (wheel) references sp_car_wheel (id) on delete restrict on update restrict;
 
+create index ix_sp_car_car_doors_sp_car_car on sp_car_car_doors (car);
+alter table sp_car_car_doors add constraint fk_sp_car_car_doors_sp_car_car foreign key (car) references sp_car_car (id) on delete restrict on update restrict;
+
+create index ix_sp_car_car_doors_sp_car_door on sp_car_car_doors (door);
+alter table sp_car_car_doors add constraint fk_sp_car_car_doors_sp_car_door foreign key (door) references sp_car_door (id) on delete restrict on update restrict;
+
 create index ix_car_accessory_fuse_id on car_accessory (fuse_id);
 alter table car_accessory add constraint fk_car_accessory_fuse_id foreign key (fuse_id) references car_fuse (id) on delete restrict on update restrict;
 
@@ -2834,12 +3837,21 @@ alter table car_accessory add constraint fk_car_accessory_car_id foreign key (ca
 create index ix_category_surveyobjectid on category (surveyobjectid);
 alter table category add constraint fk_category_surveyobjectid foreign key (surveyobjectid) references survey (id) on delete restrict on update restrict;
 
+alter table e_save_test_d add constraint fk_e_save_test_d_parent_id foreign key (parent_id) references e_save_test_c (id) on delete restrict on update restrict;
+
 create index ix_child_person_some_bean_id on child_person (some_bean_id);
 alter table child_person add constraint fk_child_person_some_bean_id foreign key (some_bean_id) references e_basic (id) on delete restrict on update restrict;
 
 create index ix_child_person_parent_identifier on child_person (parent_identifier);
 alter table child_person add constraint fk_child_person_parent_identifier foreign key (parent_identifier) references parent_person (identifier) on delete restrict on update restrict;
 
+create index ix_cke_client_user on cke_client (username,cod_cpny);
+alter table cke_client add constraint fk_cke_client_user foreign key (username,cod_cpny) references cke_user (username,cod_cpny) on delete restrict on update restrict;
+
+alter table class_super_monkey add constraint fk_class_super_monkey_class_super foreign key (class_super_sid) references class_super (sid) on delete restrict on update restrict;
+
+alter table class_super_monkey add constraint fk_class_super_monkey_monkey foreign key (monkey_mid) references monkey (mid) on delete restrict on update restrict;
+
 create index ix_configuration_configurations_id on configuration (configurations_id);
 alter table configuration add constraint fk_configuration_configurations_id foreign key (configurations_id) references configurations (id) on delete restrict on update restrict;
 
@@ -2852,6 +3864,9 @@ alter table contact add constraint fk_contact_group_id foreign key (group_id) re
 create index ix_contact_note_contact_id on contact_note (contact_id);
 alter table contact_note add constraint fk_contact_note_contact_id foreign key (contact_id) references contact (id) on delete restrict on update restrict;
 
+create index ix_contract_costs_position_id on contract_costs (position_id);
+alter table contract_costs add constraint fk_contract_costs_position_id foreign key (position_id) references e_position (id) on delete restrict on update restrict;
+
 create index ix_c_conversation_group_id on c_conversation (group_id);
 alter table c_conversation add constraint fk_c_conversation_group_id foreign key (group_id) references c_group (id) on delete restrict on update restrict;
 
@@ -2867,12 +3882,27 @@ alter table dcredit_drol add constraint fk_dcredit_drol_dcredit foreign key (dcr
 create index ix_dcredit_drol_drol on dcredit_drol (drol_id);
 alter table dcredit_drol add constraint fk_dcredit_drol_drol foreign key (drol_id) references drol (id) on delete restrict on update restrict;
 
+create index ix_dmachine_organisation_id on dmachine (organisation_id);
+alter table dmachine add constraint fk_dmachine_organisation_id foreign key (organisation_id) references dorg (id) on delete restrict on update restrict;
+
+create index ix_d_machine_aux_use_machine_id on d_machine_aux_use (machine_id);
+alter table d_machine_aux_use add constraint fk_d_machine_aux_use_machine_id foreign key (machine_id) references dmachine (id) on delete restrict on update restrict;
+
+create index ix_d_machine_stats_machine_id on d_machine_stats (machine_id);
+alter table d_machine_stats add constraint fk_d_machine_stats_machine_id foreign key (machine_id) references dmachine (id) on delete restrict on update restrict;
+
+create index ix_d_machine_use_machine_id on d_machine_use (machine_id);
+alter table d_machine_use add constraint fk_d_machine_use_machine_id foreign key (machine_id) references dmachine (id) on delete restrict on update restrict;
+
 create index ix_drot_drol_drot on drot_drol (drot_id);
 alter table drot_drol add constraint fk_drot_drol_drot foreign key (drot_id) references drot (id) on delete restrict on update restrict;
 
 create index ix_drot_drol_drol on drot_drol (drol_id);
 alter table drot_drol add constraint fk_drot_drol_drol foreign key (drol_id) references drol (id) on delete restrict on update restrict;
 
+create index ix_dc_detail_master_id on dc_detail (master_id);
+alter table dc_detail add constraint fk_dc_detail_master_id foreign key (master_id) references dc_master (id) on delete restrict on update restrict;
+
 create index ix_dfk_cascade_one_id on dfk_cascade (one_id);
 alter table dfk_cascade add constraint fk_dfk_cascade_one_id foreign key (one_id) references dfk_cascade_one (id) on delete cascade on update cascade;
 
@@ -2910,6 +3940,11 @@ alter table ebasic_no_sdchild add constraint fk_ebasic_no_sdchild_owner_id forei
 create index ix_ebasic_sdchild_owner_id on ebasic_sdchild (owner_id);
 alter table ebasic_sdchild add constraint fk_ebasic_sdchild_owner_id foreign key (owner_id) references ebasic_soft_delete (id) on delete restrict on update restrict;
 
+create index ix_ecache_child_root_id on ecache_child (root_id);
+alter table ecache_child add constraint fk_ecache_child_root_id foreign key (root_id) references ecache_root (id) on delete restrict on update restrict;
+
+alter table edefault_prop add constraint fk_edefault_prop_e_simple_usertypeid foreign key (e_simple_usertypeid) references esimple (usertypeid) on delete restrict on update restrict;
+
 create index ix_eemb_inner_outer_id on eemb_inner (outer_id);
 alter table eemb_inner add constraint fk_eemb_inner_outer_id foreign key (outer_id) references eemb_outer (id) on delete restrict on update restrict;
 
@@ -2925,6 +3960,9 @@ alter table eopt_one_a add constraint fk_eopt_one_a_b_id foreign key (b_id) refe
 create index ix_eopt_one_b_c_id on eopt_one_b (c_id);
 alter table eopt_one_b add constraint fk_eopt_one_b_c_id foreign key (c_id) references eopt_one_c (id) on delete restrict on update restrict;
 
+create index ix_eper_addr_ma_country_code on eper_addr (ma_country_code);
+alter table eper_addr add constraint fk_eper_addr_ma_country_code foreign key (ma_country_code) references o_country (code) on delete restrict on update restrict;
+
 create index ix_esoft_del_book_lend_by_id on esoft_del_book (lend_by_id);
 alter table esoft_del_book add constraint fk_esoft_del_book_lend_by_id foreign key (lend_by_id) references esoft_del_user (id) on delete restrict on update restrict;
 
@@ -2963,12 +4001,36 @@ alter table rawinherit_uncle add constraint fk_rawinherit_uncle_parent_id foreig
 create index ix_evanilla_collection_detail_evanilla_collection_id on evanilla_collection_detail (evanilla_collection_id);
 alter table evanilla_collection_detail add constraint fk_evanilla_collection_detail_evanilla_collection_id foreign key (evanilla_collection_id) references evanilla_collection (id) on delete restrict on update restrict;
 
+create index ix_ec_enum_person_tags_ec_enum_person_id on ec_enum_person_tags (ec_enum_person_id);
+alter table ec_enum_person_tags add constraint fk_ec_enum_person_tags_ec_enum_person_id foreign key (ec_enum_person_id) references ec_enum_person (id) on delete restrict on update restrict;
+
+create index ix_ec_person_phone_owner_id on ec_person_phone (owner_id);
+alter table ec_person_phone add constraint fk_ec_person_phone_owner_id foreign key (owner_id) references ec_person (id) on delete restrict on update restrict;
+
+create index ix_ecbl_person_phone_numbers_person_id on ecbl_person_phone_numbers (person_id);
+alter table ecbl_person_phone_numbers add constraint fk_ecbl_person_phone_numbers_person_id foreign key (person_id) references ecbl_person (id) on delete restrict on update restrict;
+
+create index ix_ecbm_person_phone_numbers_person_id on ecbm_person_phone_numbers (person_id);
+alter table ecbm_person_phone_numbers add constraint fk_ecbm_person_phone_numbers_person_id foreign key (person_id) references ecbm_person (id) on delete restrict on update restrict;
+
+create index ix_ecm_person_phone_numbers_ecm_person_id on ecm_person_phone_numbers (ecm_person_id);
+alter table ecm_person_phone_numbers add constraint fk_ecm_person_phone_numbers_ecm_person_id foreign key (ecm_person_id) references ecm_person (id) on delete restrict on update restrict;
+
+create index ix_ecmc_person_phone_numbers_ecmc_person_id on ecmc_person_phone_numbers (ecmc_person_id);
+alter table ecmc_person_phone_numbers add constraint fk_ecmc_person_phone_numbers_ecmc_person_id foreign key (ecmc_person_id) references ecmc_person (id) on delete restrict on update restrict;
+
+create index ix_ecs_person_phone_ecs_person_id on ecs_person_phone (ecs_person_id);
+alter table ecs_person_phone add constraint fk_ecs_person_phone_ecs_person_id foreign key (ecs_person_id) references ecs_person (id) on delete restrict on update restrict;
+
 create index ix_td_child_parent_id on td_child (parent_id);
 alter table td_child add constraint fk_td_child_parent_id foreign key (parent_id) references td_parent (parent_id) on delete restrict on update restrict;
 
 create index ix_empl_default_address_id on empl (default_address_id);
 alter table empl add constraint fk_empl_default_address_id foreign key (default_address_id) references addr (id) on delete restrict on update restrict;
 
+create index ix_esd_detail_master_id on esd_detail (master_id);
+alter table esd_detail add constraint fk_esd_detail_master_id foreign key (master_id) references esd_master (id) on delete restrict on update restrict;
+
 create index ix_grand_parent_person_some_bean_id on grand_parent_person (some_bean_id);
 alter table grand_parent_person add constraint fk_grand_parent_person_some_bean_id foreign key (some_bean_id) references e_basic (id) on delete restrict on update restrict;
 
@@ -2987,6 +4049,17 @@ alter table hi_link_doc add constraint fk_hi_link_doc_hi_link foreign key (hi_li
 create index ix_hi_link_doc_hi_doc on hi_link_doc (hi_doc_id);
 alter table hi_link_doc add constraint fk_hi_link_doc_hi_doc foreign key (hi_doc_id) references hi_doc (id) on delete restrict on update restrict;
 
+create index ix_hi_tthree_hi_ttwo_id on hi_tthree (hi_ttwo_id);
+alter table hi_tthree add constraint fk_hi_tthree_hi_ttwo_id foreign key (hi_ttwo_id) references hi_ttwo (id) on delete restrict on update restrict;
+
+create index ix_hi_ttwo_hi_tone_id on hi_ttwo (hi_tone_id);
+alter table hi_ttwo add constraint fk_hi_ttwo_hi_tone_id foreign key (hi_tone_id) references hi_tone (id) on delete restrict on update restrict;
+
+alter table hsd_setting add constraint fk_hsd_setting_user_id foreign key (user_id) references hsd_user (id) on delete restrict on update restrict;
+
+create index ix_iaf_segment_status_id on iaf_segment (status_id);
+alter table iaf_segment add constraint fk_iaf_segment_status_id foreign key (status_id) references iaf_segment_status (id) on delete restrict on update restrict;
+
 create index ix_imrelated_owner_id on imrelated (owner_id);
 alter table imrelated add constraint fk_imrelated_owner_id foreign key (owner_id) references imroot (id) on delete restrict on update restrict;
 
@@ -3001,11 +4074,15 @@ create index ix_drel_invoice_booking on drel_invoice (booking);
 alter table drel_invoice add constraint fk_drel_invoice_booking foreign key (booking) references drel_booking (id) on delete restrict on update restrict;
 
 create index ix_item_etype on item (customer,type);
-alter table item add constraint fk_item_etype foreign key (customer,type) references type (customer,type) on delete restrict on update restrict;
+alter table item add constraint fk_item_etype foreign key (customer,type) references `type` (customer,type) on delete restrict on update restrict;
 
 create index ix_item_eregion on item (customer,region);
 alter table item add constraint fk_item_eregion foreign key (customer,region) references region (customer,type) on delete restrict on update restrict;
 
+alter table mkeygroup_monkey add constraint fk_mkeygroup_monkey_mkeygroup foreign key (mkeygroup_pid) references mkeygroup (pid) on delete restrict on update restrict;
+
+alter table mkeygroup_monkey add constraint fk_mkeygroup_monkey_monkey foreign key (monkey_mid) references monkey (mid) on delete restrict on update restrict;
+
 alter table trainer_monkey add constraint fk_trainer_monkey_trainer foreign key (trainer_tid) references trainer (tid) on delete restrict on update restrict;
 
 alter table trainer_monkey add constraint fk_trainer_monkey_monkey foreign key (monkey_mid) references monkey (mid) on delete restrict on update restrict;
@@ -3043,6 +4120,27 @@ alter table la_attr_value_attribute add constraint fk_la_attr_value_attribute_la
 create index ix_la_attr_value_attribute_attribute on la_attr_value_attribute (attribute_id);
 alter table la_attr_value_attribute add constraint fk_la_attr_value_attribute_attribute foreign key (attribute_id) references attribute (id) on delete restrict on update restrict;
 
+create index ix_looney_tune_id on looney (tune_id);
+alter table looney add constraint fk_looney_tune_id foreign key (tune_id) references tune (id) on delete restrict on update restrict;
+
+create index ix_mcontact_customer_id on mcontact (customer_id);
+alter table mcontact add constraint fk_mcontact_customer_id foreign key (customer_id) references mcustomer (id) on delete restrict on update restrict;
+
+create index ix_mcontact_message_contact_id on mcontact_message (contact_id);
+alter table mcontact_message add constraint fk_mcontact_message_contact_id foreign key (contact_id) references mcontact (id) on delete restrict on update restrict;
+
+create index ix_mcustomer_shipping_address_id on mcustomer (shipping_address_id);
+alter table mcustomer add constraint fk_mcustomer_shipping_address_id foreign key (shipping_address_id) references maddress (id) on delete restrict on update restrict;
+
+create index ix_mcustomer_billing_address_id on mcustomer (billing_address_id);
+alter table mcustomer add constraint fk_mcustomer_billing_address_id foreign key (billing_address_id) references maddress (id) on delete restrict on update restrict;
+
+create index ix_mmachine_mgroup_mmachine on mmachine_mgroup (mmachine_id);
+alter table mmachine_mgroup add constraint fk_mmachine_mgroup_mmachine foreign key (mmachine_id) references mmachine (id) on delete restrict on update restrict;
+
+create index ix_mmachine_mgroup_mgroup on mmachine_mgroup (mgroup_id);
+alter table mmachine_mgroup add constraint fk_mmachine_mgroup_mgroup foreign key (mgroup_id) references mgroup (id) on delete restrict on update restrict;
+
 create index ix_mprinter_current_state_id on mprinter (current_state_id);
 alter table mprinter add constraint fk_mprinter_current_state_id foreign key (current_state_id) references mprinter_state (id) on delete restrict on update restrict;
 
@@ -3087,6 +4185,14 @@ alter table c_message add constraint fk_c_message_conversation_id foreign key (c
 create index ix_c_message_user_id on c_message (user_id);
 alter table c_message add constraint fk_c_message_user_id foreign key (user_id) references c_user (id) on delete restrict on update restrict;
 
+alter table meter_contract_data add constraint fk_meter_contract_data_special_needs_client_id foreign key (special_needs_client_id) references meter_special_needs_client (id) on delete restrict on update restrict;
+
+alter table meter_special_needs_client add constraint fk_meter_special_needs_client_primary_id foreign key (primary_id) references meter_special_needs_contact (id) on delete restrict on update restrict;
+
+alter table meter_version add constraint fk_meter_version_address_data_id foreign key (address_data_id) references meter_address_data (id) on delete restrict on update restrict;
+
+alter table meter_version add constraint fk_meter_version_contract_data_id foreign key (contract_data_id) references meter_contract_data (id) on delete restrict on update restrict;
+
 create index ix_mnoc_user_mnoc_role_mnoc_user on mnoc_user_mnoc_role (mnoc_user_user_id);
 alter table mnoc_user_mnoc_role add constraint fk_mnoc_user_mnoc_role_mnoc_user foreign key (mnoc_user_user_id) references mnoc_user (user_id) on delete restrict on update restrict;
 
@@ -3159,14 +4265,30 @@ alter table s_order_items add constraint fk_s_order_items_order_uuid foreign key
 create index ix_or_order_ship_order_id on or_order_ship (order_id);
 alter table or_order_ship add constraint fk_or_order_ship_order_id foreign key (order_id) references o_order (id) on delete restrict on update restrict;
 
+alter table organization_node add constraint fk_organization_node_parent_tree_node_id foreign key (parent_tree_node_id) references organization_tree_node (id) on delete restrict on update restrict;
+
+create index ix_orp_detail_master_id on orp_detail (master_id);
+alter table orp_detail add constraint fk_orp_detail_master_id foreign key (master_id) references orp_master (id) on delete restrict on update restrict;
+
+create index ix_orp_detail2_orp_master2_id on orp_detail2 (orp_master2_id);
+alter table orp_detail2 add constraint fk_orp_detail2_orp_master2_id foreign key (orp_master2_id) references orp_master2 (id) on delete restrict on update restrict;
+
+alter table oto_atwo add constraint fk_oto_atwo_aone_id foreign key (aone_id) references oto_aone (id) on delete restrict on update restrict;
+
 alter table oto_bchild add constraint fk_oto_bchild_master_id foreign key (master_id) references oto_bmaster (id) on delete restrict on update restrict;
 
 alter table oto_child add constraint fk_oto_child_master_id foreign key (master_id) references oto_master (id) on delete restrict on update restrict;
 
 alter table oto_cust_address add constraint fk_oto_cust_address_customer_cid foreign key (customer_cid) references oto_cust (cid) on delete restrict on update restrict;
 
+alter table oto_level_a add constraint fk_oto_level_a_b_id foreign key (b_id) references oto_level_b (id) on delete restrict on update restrict;
+
+alter table oto_level_b add constraint fk_oto_level_b_c_id foreign key (c_id) references oto_level_c (id) on delete restrict on update restrict;
+
 alter table oto_prime_extra add constraint fk_oto_prime_extra_eid foreign key (eid) references oto_prime (pid) on delete restrict on update restrict;
 
+alter table oto_sd_child add constraint fk_oto_sd_child_master_id foreign key (master_id) references oto_sd_master (id) on delete restrict on update restrict;
+
 create index ix_oto_th_many_oto_th_top_id on oto_th_many (oto_th_top_id);
 alter table oto_th_many add constraint fk_oto_th_many_oto_th_top_id foreign key (oto_th_top_id) references oto_th_top (id) on delete restrict on update restrict;
 
@@ -3174,7 +4296,7 @@ alter table oto_th_one add constraint fk_oto_th_one_many_id foreign key (many_id
 
 alter table oto_ubprime_extra add constraint fk_oto_ubprime_extra_eid foreign key (eid) references oto_ubprime (pid) on delete restrict on update restrict;
 
-alter table oto_uprime_extra add constraint fk_oto_uprime_extra_eid foreign key (eid) references oto_uprime (pid) on delete restrict on update restrict;
+alter table oto_user_model add constraint fk_oto_user_model_user_optional_id foreign key (user_optional_id) references oto_user_model_optional (id) on delete restrict on update restrict;
 
 alter table pfile add constraint fk_pfile_file_content_id foreign key (file_content_id) references pfile_content (id) on delete restrict on update restrict;
 
@@ -3210,9 +4332,15 @@ alter table persistent_file_content add constraint fk_persistent_file_content_pe
 create index ix_person_default_address_oid on person (default_address_oid);
 alter table person add constraint fk_person_default_address_oid foreign key (default_address_oid) references address (oid) on delete restrict on update restrict;
 
+create index ix_person_cache_email_person_info_person_id on person_cache_email (person_info_person_id);
+alter table person_cache_email add constraint fk_person_cache_email_person_info_person_id foreign key (person_info_person_id) references person_cache_info (person_id) on delete restrict on update restrict;
+
 create index ix_phones_person_id on phones (person_id);
 alter table phones add constraint fk_phones_person_id foreign key (person_id) references persons (id) on delete restrict on update restrict;
 
+create index ix_e_position_contract_id on e_position (contract_id);
+alter table e_position add constraint fk_e_position_contract_id foreign key (contract_id) references contract (id) on delete restrict on update restrict;
+
 create index ix_pp_to_ww_pp on pp_to_ww (pp_id);
 alter table pp_to_ww add constraint fk_pp_to_ww_pp foreign key (pp_id) references pp (id) on delete restrict on update restrict;
 
@@ -3225,6 +4353,9 @@ alter table question add constraint fk_question_groupobjectid foreign key (group
 create index ix_r_orders_customer on r_orders (company,customername);
 alter table r_orders add constraint fk_r_orders_customer foreign key (company,customername) references rcustomer (company,name) on delete restrict on update restrict;
 
+create index ix_rel_master_detail_id on rel_master (detail_id);
+alter table rel_master add constraint fk_rel_master_detail_id foreign key (detail_id) references rel_detail (id) on delete restrict on update restrict;
+
 create index ix_resourcefile_parentresourcefileid on resourcefile (parentresourcefileid);
 alter table resourcefile add constraint fk_resourcefile_parentresourcefileid foreign key (parentresourcefileid) references resourcefile (id) on delete restrict on update restrict;
 
@@ -3251,6 +4382,15 @@ alter table self_ref_customer add constraint fk_self_ref_customer_referred_by_id
 create index ix_self_ref_example_parent_id on self_ref_example (parent_id);
 alter table self_ref_example add constraint fk_self_ref_example_parent_id foreign key (parent_id) references self_ref_example (id) on delete restrict on update restrict;
 
+alter table e_save_test_b add constraint fk_e_save_test_b_sibling_a_id foreign key (sibling_a_id) references e_save_test_a (id) on delete restrict on update restrict;
+
+create index ix_site_parent_id on site (parent_id);
+alter table site add constraint fk_site_parent_id foreign key (parent_id) references site (id) on delete restrict on update restrict;
+
+alter table site add constraint fk_site_data_container_id foreign key (data_container_id) references data_container (id) on delete restrict on update restrict;
+
+alter table site add constraint fk_site_site_address_id foreign key (site_address_id) references site_address (id) on delete restrict on update restrict;
+
 create index ix_stockforecast_inner_report_id on stockforecast (inner_report_id);
 alter table stockforecast add constraint fk_stockforecast_inner_report_id foreign key (inner_report_id) references inner_report (id) on delete restrict on update restrict;
 
@@ -3279,8 +4419,13 @@ alter table trip add constraint fk_trip_vehicle_driver_id foreign key (vehicle_d
 create index ix_trip_address_id on trip (address_id);
 alter table trip add constraint fk_trip_address_id foreign key (address_id) references o_address (id) on delete restrict on update restrict;
 
-create index ix_type_sub_type_id on type (sub_type_id);
-alter table type add constraint fk_type_sub_type_id foreign key (sub_type_id) references sub_type (sub_type_id) on delete restrict on update restrict;
+create index ix_type_sub_type_id on `type` (sub_type_id);
+alter table `type` add constraint fk_type_sub_type_id foreign key (sub_type_id) references sub_type (sub_type_id) on delete restrict on update restrict;
+
+create index ix_usib_child_parent_id on usib_child (parent_id);
+alter table usib_child add constraint fk_usib_child_parent_id foreign key (parent_id) references usib_parent (id) on delete restrict on update restrict;
+
+alter table usib_child_sibling add constraint fk_usib_child_sibling_child_id foreign key (child_id) references usib_child (id) on delete restrict on update restrict;
 
 create index ix_ut_detail_utmaster_id on ut_detail (utmaster_id);
 alter table ut_detail add constraint fk_ut_detail_utmaster_id foreign key (utmaster_id) references ut_master (id) on delete restrict on update restrict;
@@ -3288,17 +4433,20 @@ alter table ut_detail add constraint fk_ut_detail_utmaster_id foreign key (utmas
 create index ix_uutwo_master_id on uutwo (master_id);
 alter table uutwo add constraint fk_uutwo_master_id foreign key (master_id) references uuone (id) on delete restrict on update restrict;
 
+alter table oto_user add constraint fk_oto_user_account_id foreign key (account_id) references oto_account (id) on delete restrict on update restrict;
+
 create index ix_c_user_group_id on c_user (group_id);
 alter table c_user add constraint fk_c_user_group_id foreign key (group_id) references c_group (id) on delete restrict on update restrict;
 
-alter table oto_user add constraint fk_oto_user_account_id foreign key (account_id) references oto_account (id) on delete restrict on update restrict;
-
 create index ix_em_user_role_user_id on em_user_role (user_id);
 alter table em_user_role add constraint fk_em_user_role_user_id foreign key (user_id) references em_user (id) on delete restrict on update restrict;
 
 create index ix_em_user_role_role_id on em_user_role (role_id);
 alter table em_user_role add constraint fk_em_user_role_role_id foreign key (role_id) references em_role (id) on delete restrict on update restrict;
 
+create index ix_vehicle_lease_id on vehicle (lease_id);
+alter table vehicle add constraint fk_vehicle_lease_id foreign key (lease_id) references vehicle_lease (id) on delete restrict on update restrict;
+
 create index ix_vehicle_car_ref_id on vehicle (car_ref_id);
 alter table vehicle add constraint fk_vehicle_car_ref_id foreign key (car_ref_id) references truck_ref (id) on delete restrict on update restrict;
 
@@ -3346,20 +4494,12 @@ create table hx_link_history(
   version                       bigint,
   when_created                  datetime(6),
   when_modified                 datetime(6),
+  deleted                       tinyint(1),
   sys_period_start              datetime(6),
   sys_period_end                datetime(6)
 );
 create view hx_link_with_history as select * from hx_link union all select * from hx_link_history;
 
-delimiter $$
-create trigger hx_link_history_upd before update on hx_link for each row begin
-    insert into hx_link_history (sys_period_start,sys_period_end,id, name, location, comments, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
-    set NEW.sys_period_start = now(6);
-end$$
-delimiter $$
-create trigger hx_link_history_del before delete on hx_link for each row begin
-    insert into hx_link_history (sys_period_start,sys_period_end,id, name, location, comments, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
-end$$
 alter table hi_link add column sys_period_start datetime(6) default now(6);
 alter table hi_link add column sys_period_end datetime(6);
 update hi_link set sys_period_start = when_created;
@@ -3376,15 +4516,6 @@ create table hi_link_history(
 );
 create view hi_link_with_history as select * from hi_link union all select * from hi_link_history;
 
-delimiter $$
-create trigger hi_link_history_upd before update on hi_link for each row begin
-    insert into hi_link_history (sys_period_start,sys_period_end,id, name, location, comments, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
-    set NEW.sys_period_start = now(6);
-end$$
-delimiter $$
-create trigger hi_link_history_del before delete on hi_link for each row begin
-    insert into hi_link_history (sys_period_start,sys_period_end,id, name, location, comments, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
-end$$
 alter table hi_link_doc add column sys_period_start datetime(6) default now(6);
 alter table hi_link_doc add column sys_period_end datetime(6);
 create table hi_link_doc_history(
@@ -3395,15 +4526,83 @@ create table hi_link_doc_history(
 );
 create view hi_link_doc_with_history as select * from hi_link_doc union all select * from hi_link_doc_history;
 
-delimiter $$
-create trigger hi_link_doc_history_upd before update on hi_link_doc for each row begin
-    insert into hi_link_doc_history (sys_period_start,sys_period_end,hi_link_id, hi_doc_id) values (OLD.sys_period_start, now(6),OLD.hi_link_id, OLD.hi_doc_id);
-    set NEW.sys_period_start = now(6);
-end$$
-delimiter $$
-create trigger hi_link_doc_history_del before delete on hi_link_doc for each row begin
-    insert into hi_link_doc_history (sys_period_start,sys_period_end,hi_link_id, hi_doc_id) values (OLD.sys_period_start, now(6),OLD.hi_link_id, OLD.hi_doc_id);
-end$$
+alter table hi_tone add column sys_period_start datetime(6) default now(6);
+alter table hi_tone add column sys_period_end datetime(6);
+update hi_tone set sys_period_start = when_created;
+create table hi_tone_history(
+  id                            bigint,
+  name                          varchar(255),
+  comments                      varchar(255),
+  version                       bigint,
+  when_created                  datetime(6),
+  when_modified                 datetime(6),
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view hi_tone_with_history as select * from hi_tone union all select * from hi_tone_history;
+
+alter table hi_tthree add column sys_period_start datetime(6) default now(6);
+alter table hi_tthree add column sys_period_end datetime(6);
+update hi_tthree set sys_period_start = when_created;
+create table hi_tthree_history(
+  id                            bigint,
+  hi_ttwo_id                    bigint,
+  three                         varchar(255),
+  version                       bigint,
+  when_created                  datetime(6),
+  when_modified                 datetime(6),
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view hi_tthree_with_history as select * from hi_tthree union all select * from hi_tthree_history;
+
+alter table hi_ttwo add column sys_period_start datetime(6) default now(6);
+alter table hi_ttwo add column sys_period_end datetime(6);
+update hi_ttwo set sys_period_start = when_created;
+create table hi_ttwo_history(
+  id                            bigint,
+  hi_tone_id                    bigint,
+  two                           varchar(255),
+  version                       bigint,
+  when_created                  datetime(6),
+  when_modified                 datetime(6),
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view hi_ttwo_with_history as select * from hi_ttwo union all select * from hi_ttwo_history;
+
+alter table hsd_setting add column sys_period_start datetime(6) default now(6);
+alter table hsd_setting add column sys_period_end datetime(6);
+update hsd_setting set sys_period_start = when_created;
+create table hsd_setting_history(
+  id                            bigint,
+  code                          varchar(255),
+  content                       varchar(255),
+  user_id                       bigint,
+  version                       bigint,
+  when_created                  datetime(6),
+  when_modified                 datetime(6),
+  deleted                       tinyint(1),
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view hsd_setting_with_history as select * from hsd_setting union all select * from hsd_setting_history;
+
+alter table hsd_user add column sys_period_start datetime(6) default now(6);
+alter table hsd_user add column sys_period_end datetime(6);
+update hsd_user set sys_period_start = when_created;
+create table hsd_user_history(
+  id                            bigint,
+  name                          varchar(255),
+  version                       bigint,
+  when_created                  datetime(6),
+  when_modified                 datetime(6),
+  deleted                       tinyint(1),
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view hsd_user_with_history as select * from hsd_user union all select * from hsd_user_history;
+
 alter table link add column sys_period_start datetime(6) default now(6);
 alter table link add column sys_period_end datetime(6);
 update link set sys_period_start = when_created;
@@ -3422,15 +4621,6 @@ create table link_history(
 );
 create view link_with_history as select * from link union all select * from link_history;
 
-delimiter $$
-create trigger link_history_upd before update on link for each row begin
-    insert into link_history (sys_period_start,sys_period_end,id, name, location, when_publish, link_comment, version, when_created, when_modified, deleted) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.when_publish, OLD.link_comment, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
-    set NEW.sys_period_start = now(6);
-end$$
-delimiter $$
-create trigger link_history_del before delete on link for each row begin
-    insert into link_history (sys_period_start,sys_period_end,id, name, location, when_publish, link_comment, version, when_created, when_modified, deleted) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.when_publish, OLD.link_comment, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
-end$$
 alter table c_user add column sys_period_start datetime(6) default now(6);
 alter table c_user add column sys_period_end datetime(6);
 update c_user set sys_period_start = when_created;
@@ -3449,6 +4639,87 @@ create table c_user_history(
 );
 create view c_user_with_history as select * from c_user union all select * from c_user_history;
 
+delimiter $$
+create trigger hx_link_history_upd before update on hx_link for each row begin
+    insert into hx_link_history (sys_period_start,sys_period_end,id, name, location, comments, version, when_created, when_modified, deleted) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger hx_link_history_del before delete on hx_link for each row begin
+    insert into hx_link_history (sys_period_start,sys_period_end,id, name, location, comments, version, when_created, when_modified, deleted) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+end$$
+delimiter $$
+create trigger hi_link_history_upd before update on hi_link for each row begin
+    insert into hi_link_history (sys_period_start,sys_period_end,id, name, location, comments, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger hi_link_history_del before delete on hi_link for each row begin
+    insert into hi_link_history (sys_period_start,sys_period_end,id, name, location, comments, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
+end$$
+delimiter $$
+create trigger hi_link_doc_history_upd before update on hi_link_doc for each row begin
+    insert into hi_link_doc_history (sys_period_start,sys_period_end,hi_link_id, hi_doc_id) values (OLD.sys_period_start, now(6),OLD.hi_link_id, OLD.hi_doc_id);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger hi_link_doc_history_del before delete on hi_link_doc for each row begin
+    insert into hi_link_doc_history (sys_period_start,sys_period_end,hi_link_id, hi_doc_id) values (OLD.sys_period_start, now(6),OLD.hi_link_id, OLD.hi_doc_id);
+end$$
+delimiter $$
+create trigger hi_tone_history_upd before update on hi_tone for each row begin
+    insert into hi_tone_history (sys_period_start,sys_period_end,id, name, comments, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger hi_tone_history_del before delete on hi_tone for each row begin
+    insert into hi_tone_history (sys_period_start,sys_period_end,id, name, comments, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
+end$$
+delimiter $$
+create trigger hi_tthree_history_upd before update on hi_tthree for each row begin
+    insert into hi_tthree_history (sys_period_start,sys_period_end,id, hi_ttwo_id, three, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.hi_ttwo_id, OLD.three, OLD.version, OLD.when_created, OLD.when_modified);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger hi_tthree_history_del before delete on hi_tthree for each row begin
+    insert into hi_tthree_history (sys_period_start,sys_period_end,id, hi_ttwo_id, three, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.hi_ttwo_id, OLD.three, OLD.version, OLD.when_created, OLD.when_modified);
+end$$
+delimiter $$
+create trigger hi_ttwo_history_upd before update on hi_ttwo for each row begin
+    insert into hi_ttwo_history (sys_period_start,sys_period_end,id, hi_tone_id, two, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.hi_tone_id, OLD.two, OLD.version, OLD.when_created, OLD.when_modified);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger hi_ttwo_history_del before delete on hi_ttwo for each row begin
+    insert into hi_ttwo_history (sys_period_start,sys_period_end,id, hi_tone_id, two, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.hi_tone_id, OLD.two, OLD.version, OLD.when_created, OLD.when_modified);
+end$$
+delimiter $$
+create trigger hsd_setting_history_upd before update on hsd_setting for each row begin
+    insert into hsd_setting_history (sys_period_start,sys_period_end,id, code, content, user_id, version, when_created, when_modified, deleted) values (OLD.sys_period_start, now(6),OLD.id, OLD.code, OLD.content, OLD.user_id, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger hsd_setting_history_del before delete on hsd_setting for each row begin
+    insert into hsd_setting_history (sys_period_start,sys_period_end,id, code, content, user_id, version, when_created, when_modified, deleted) values (OLD.sys_period_start, now(6),OLD.id, OLD.code, OLD.content, OLD.user_id, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+end$$
+delimiter $$
+create trigger hsd_user_history_upd before update on hsd_user for each row begin
+    insert into hsd_user_history (sys_period_start,sys_period_end,id, name, version, when_created, when_modified, deleted) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger hsd_user_history_del before delete on hsd_user for each row begin
+    insert into hsd_user_history (sys_period_start,sys_period_end,id, name, version, when_created, when_modified, deleted) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+end$$
+delimiter $$
+create trigger link_history_upd before update on link for each row begin
+    insert into link_history (sys_period_start,sys_period_end,id, name, location, when_publish, link_comment, version, when_created, when_modified, deleted) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.when_publish, OLD.link_comment, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger link_history_del before delete on link for each row begin
+    insert into link_history (sys_period_start,sys_period_end,id, name, location, when_publish, link_comment, version, when_created, when_modified, deleted) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.when_publish, OLD.link_comment, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+end$$
 delimiter $$
 create trigger c_user_history_upd before update on c_user for each row begin
     insert into c_user_history (sys_period_start,sys_period_end,id, inactive, name, email, group_id, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.inactive, OLD.name, OLD.email, OLD.group_id, OLD.version, OLD.when_created, OLD.when_modified);
diff --git a/src/test/ddl-review/h2-drop-all.sql b/src/test/ddl-review/h2-drop-all.sql
index 1113deffc..cec35014a 100644
--- a/src/test/ddl-review/h2-drop-all.sql
+++ b/src/test/ddl-review/h2-drop-all.sql
@@ -1,7 +1,13 @@
--- Generated by ebean unknown at 2018-03-08T06:41:41.155Z
+-- Generated by ebean unknown at 2019-07-29T10:49:19.569Z
 alter table bar drop foreign key fk_bar_foo_id;
 drop index ix_bar_foo_id on bar;
 
+alter table acl_container_relation drop foreign key fk_acl_container_relation_container_id;
+drop index ix_acl_container_relation_container_id on acl_container_relation;
+
+alter table acl_container_relation drop foreign key fk_acl_container_relation_acl_entry_id;
+drop index ix_acl_container_relation_acl_entry_id on acl_container_relation;
+
 alter table addr drop foreign key fk_addr_employee_id;
 drop index ix_addr_employee_id on addr;
 
@@ -19,11 +25,14 @@ drop index ix_attribute_attribute_holder_id on attribute;
 alter table bbookmark drop foreign key fk_bbookmark_user_id;
 drop index ix_bbookmark_user_id on bbookmark;
 
-alter table bsite_user drop foreign key fk_bsite_user_site_id;
-drop index ix_bsite_user_site_id on bsite_user;
+alter table bbookmark_user drop foreign key fk_bbookmark_user_org_id;
+drop index ix_bbookmark_user_org_id on bbookmark_user;
 
-alter table bsite_user drop foreign key fk_bsite_user_user_id;
-drop index ix_bsite_user_user_id on bsite_user;
+alter table bsite_user_a drop foreign key fk_bsite_user_a_site_id;
+drop index ix_bsite_user_a_site_id on bsite_user_a;
+
+alter table bsite_user_a drop foreign key fk_bsite_user_a_user_id;
+drop index ix_bsite_user_a_user_id on bsite_user_a;
 
 alter table bsite_user_b drop foreign key fk_bsite_user_b_site;
 drop index ix_bsite_user_b_site on bsite_user_b;
@@ -37,10 +46,27 @@ drop index ix_bsite_user_c_site_uid on bsite_user_c;
 alter table bsite_user_c drop foreign key fk_bsite_user_c_user_uid;
 drop index ix_bsite_user_c_user_uid on bsite_user_c;
 
+alter table bsite_user_e drop foreign key fk_bsite_user_e_site_id;
+drop index ix_bsite_user_e_site_id on bsite_user_e;
+
+alter table bsite_user_e drop foreign key fk_bsite_user_e_user_id;
+drop index ix_bsite_user_e_user_id on bsite_user_e;
+
+alter table basic_draftable_bean drop foreign key fk_basic_draftable_bean_id;
+
 alter table drel_booking drop foreign key fk_drel_booking_agent_invoice;
 
 alter table drel_booking drop foreign key fk_drel_booking_client_invoice;
 
+alter table cepproduct_category drop foreign key fk_cepproduct_category_category_id;
+drop index ix_cepproduct_category_category_id on cepproduct_category;
+
+alter table cepproduct_category drop foreign key fk_cepproduct_category_product_id;
+drop index ix_cepproduct_category_product_id on cepproduct_category;
+
+alter table cinh_ref drop foreign key fk_cinh_ref_ref_id;
+drop index ix_cinh_ref_ref_id on cinh_ref;
+
 alter table ckey_detail drop foreign key fk_ckey_detail_parent;
 drop index ix_ckey_detail_parent on ckey_detail;
 
@@ -59,6 +85,12 @@ drop index ix_sp_car_car_wheels_sp_car_car on sp_car_car_wheels;
 alter table sp_car_car_wheels drop foreign key fk_sp_car_car_wheels_sp_car_wheel;
 drop index ix_sp_car_car_wheels_sp_car_wheel on sp_car_car_wheels;
 
+alter table sp_car_car_doors drop foreign key fk_sp_car_car_doors_sp_car_car;
+drop index ix_sp_car_car_doors_sp_car_car on sp_car_car_doors;
+
+alter table sp_car_car_doors drop foreign key fk_sp_car_car_doors_sp_car_door;
+drop index ix_sp_car_car_doors_sp_car_door on sp_car_car_doors;
+
 alter table car_accessory drop foreign key fk_car_accessory_fuse_id;
 drop index ix_car_accessory_fuse_id on car_accessory;
 
@@ -68,12 +100,21 @@ drop index ix_car_accessory_car_id on car_accessory;
 alter table category drop foreign key fk_category_surveyobjectid;
 drop index ix_category_surveyobjectid on category;
 
+alter table e_save_test_d drop foreign key fk_e_save_test_d_parent_id;
+
 alter table child_person drop foreign key fk_child_person_some_bean_id;
 drop index ix_child_person_some_bean_id on child_person;
 
 alter table child_person drop foreign key fk_child_person_parent_identifier;
 drop index ix_child_person_parent_identifier on child_person;
 
+alter table cke_client drop foreign key fk_cke_client_user;
+drop index ix_cke_client_user on cke_client;
+
+alter table class_super_monkey drop foreign key fk_class_super_monkey_class_super;
+
+alter table class_super_monkey drop foreign key fk_class_super_monkey_monkey;
+
 alter table configuration drop foreign key fk_configuration_configurations_id;
 drop index ix_configuration_configurations_id on configuration;
 
@@ -86,6 +127,9 @@ drop index ix_contact_group_id on contact;
 alter table contact_note drop foreign key fk_contact_note_contact_id;
 drop index ix_contact_note_contact_id on contact_note;
 
+alter table contract_costs drop foreign key fk_contract_costs_position_id;
+drop index ix_contract_costs_position_id on contract_costs;
+
 alter table c_conversation drop foreign key fk_c_conversation_group_id;
 drop index ix_c_conversation_group_id on c_conversation;
 
@@ -101,12 +145,27 @@ drop index ix_dcredit_drol_dcredit on dcredit_drol;
 alter table dcredit_drol drop foreign key fk_dcredit_drol_drol;
 drop index ix_dcredit_drol_drol on dcredit_drol;
 
+alter table dmachine drop foreign key fk_dmachine_organisation_id;
+drop index ix_dmachine_organisation_id on dmachine;
+
+alter table d_machine_aux_use drop foreign key fk_d_machine_aux_use_machine_id;
+drop index ix_d_machine_aux_use_machine_id on d_machine_aux_use;
+
+alter table d_machine_stats drop foreign key fk_d_machine_stats_machine_id;
+drop index ix_d_machine_stats_machine_id on d_machine_stats;
+
+alter table d_machine_use drop foreign key fk_d_machine_use_machine_id;
+drop index ix_d_machine_use_machine_id on d_machine_use;
+
 alter table drot_drol drop foreign key fk_drot_drol_drot;
 drop index ix_drot_drol_drot on drot_drol;
 
 alter table drot_drol drop foreign key fk_drot_drol_drol;
 drop index ix_drot_drol_drol on drot_drol;
 
+alter table dc_detail drop foreign key fk_dc_detail_master_id;
+drop index ix_dc_detail_master_id on dc_detail;
+
 alter table dfk_cascade drop foreign key fk_dfk_cascade_one_id;
 drop index ix_dfk_cascade_one_id on dfk_cascade;
 
@@ -144,6 +203,11 @@ drop index ix_ebasic_no_sdchild_owner_id on ebasic_no_sdchild;
 alter table ebasic_sdchild drop foreign key fk_ebasic_sdchild_owner_id;
 drop index ix_ebasic_sdchild_owner_id on ebasic_sdchild;
 
+alter table ecache_child drop foreign key fk_ecache_child_root_id;
+drop index ix_ecache_child_root_id on ecache_child;
+
+alter table edefault_prop drop foreign key fk_edefault_prop_e_simple_usertypeid;
+
 alter table eemb_inner drop foreign key fk_eemb_inner_outer_id;
 drop index ix_eemb_inner_outer_id on eemb_inner;
 
@@ -159,6 +223,9 @@ drop index ix_eopt_one_a_b_id on eopt_one_a;
 alter table eopt_one_b drop foreign key fk_eopt_one_b_c_id;
 drop index ix_eopt_one_b_c_id on eopt_one_b;
 
+alter table eper_addr drop foreign key fk_eper_addr_ma_country_code;
+drop index ix_eper_addr_ma_country_code on eper_addr;
+
 alter table esoft_del_book drop foreign key fk_esoft_del_book_lend_by_id;
 drop index ix_esoft_del_book_lend_by_id on esoft_del_book;
 
@@ -197,12 +264,36 @@ drop index ix_rawinherit_uncle_parent_id on rawinherit_uncle;
 alter table evanilla_collection_detail drop foreign key fk_evanilla_collection_detail_evanilla_collection_id;
 drop index ix_evanilla_collection_detail_evanilla_collection_id on evanilla_collection_detail;
 
+alter table ec_enum_person_tags drop foreign key fk_ec_enum_person_tags_ec_enum_person_id;
+drop index ix_ec_enum_person_tags_ec_enum_person_id on ec_enum_person_tags;
+
+alter table ec_person_phone drop foreign key fk_ec_person_phone_owner_id;
+drop index ix_ec_person_phone_owner_id on ec_person_phone;
+
+alter table ecbl_person_phone_numbers drop foreign key fk_ecbl_person_phone_numbers_person_id;
+drop index ix_ecbl_person_phone_numbers_person_id on ecbl_person_phone_numbers;
+
+alter table ecbm_person_phone_numbers drop foreign key fk_ecbm_person_phone_numbers_person_id;
+drop index ix_ecbm_person_phone_numbers_person_id on ecbm_person_phone_numbers;
+
+alter table ecm_person_phone_numbers drop foreign key fk_ecm_person_phone_numbers_ecm_person_id;
+drop index ix_ecm_person_phone_numbers_ecm_person_id on ecm_person_phone_numbers;
+
+alter table ecmc_person_phone_numbers drop foreign key fk_ecmc_person_phone_numbers_ecmc_person_id;
+drop index ix_ecmc_person_phone_numbers_ecmc_person_id on ecmc_person_phone_numbers;
+
+alter table ecs_person_phone drop foreign key fk_ecs_person_phone_ecs_person_id;
+drop index ix_ecs_person_phone_ecs_person_id on ecs_person_phone;
+
 alter table td_child drop foreign key fk_td_child_parent_id;
 drop index ix_td_child_parent_id on td_child;
 
 alter table empl drop foreign key fk_empl_default_address_id;
 drop index ix_empl_default_address_id on empl;
 
+alter table esd_detail drop foreign key fk_esd_detail_master_id;
+drop index ix_esd_detail_master_id on esd_detail;
+
 alter table grand_parent_person drop foreign key fk_grand_parent_person_some_bean_id;
 drop index ix_grand_parent_person_some_bean_id on grand_parent_person;
 
@@ -221,6 +312,17 @@ drop index ix_hi_link_doc_hi_link on hi_link_doc;
 alter table hi_link_doc drop foreign key fk_hi_link_doc_hi_doc;
 drop index ix_hi_link_doc_hi_doc on hi_link_doc;
 
+alter table hi_tthree drop foreign key fk_hi_tthree_hi_ttwo_id;
+drop index ix_hi_tthree_hi_ttwo_id on hi_tthree;
+
+alter table hi_ttwo drop foreign key fk_hi_ttwo_hi_tone_id;
+drop index ix_hi_ttwo_hi_tone_id on hi_ttwo;
+
+alter table hsd_setting drop foreign key fk_hsd_setting_user_id;
+
+alter table iaf_segment drop foreign key fk_iaf_segment_status_id;
+drop index ix_iaf_segment_status_id on iaf_segment;
+
 alter table imrelated drop foreign key fk_imrelated_owner_id;
 drop index ix_imrelated_owner_id on imrelated;
 
@@ -240,6 +342,10 @@ drop index ix_item_etype on item;
 alter table item drop foreign key fk_item_eregion;
 drop index ix_item_eregion on item;
 
+alter table mkeygroup_monkey drop foreign key fk_mkeygroup_monkey_mkeygroup;
+
+alter table mkeygroup_monkey drop foreign key fk_mkeygroup_monkey_monkey;
+
 alter table trainer_monkey drop foreign key fk_trainer_monkey_trainer;
 
 alter table trainer_monkey drop foreign key fk_trainer_monkey_monkey;
@@ -277,6 +383,27 @@ drop index ix_la_attr_value_attribute_la_attr_value on la_attr_value_attribute;
 alter table la_attr_value_attribute drop foreign key fk_la_attr_value_attribute_attribute;
 drop index ix_la_attr_value_attribute_attribute on la_attr_value_attribute;
 
+alter table looney drop foreign key fk_looney_tune_id;
+drop index ix_looney_tune_id on looney;
+
+alter table mcontact drop foreign key fk_mcontact_customer_id;
+drop index ix_mcontact_customer_id on mcontact;
+
+alter table mcontact_message drop foreign key fk_mcontact_message_contact_id;
+drop index ix_mcontact_message_contact_id on mcontact_message;
+
+alter table mcustomer drop foreign key fk_mcustomer_shipping_address_id;
+drop index ix_mcustomer_shipping_address_id on mcustomer;
+
+alter table mcustomer drop foreign key fk_mcustomer_billing_address_id;
+drop index ix_mcustomer_billing_address_id on mcustomer;
+
+alter table mmachine_mgroup drop foreign key fk_mmachine_mgroup_mmachine;
+drop index ix_mmachine_mgroup_mmachine on mmachine_mgroup;
+
+alter table mmachine_mgroup drop foreign key fk_mmachine_mgroup_mgroup;
+drop index ix_mmachine_mgroup_mgroup on mmachine_mgroup;
+
 alter table mprinter drop foreign key fk_mprinter_current_state_id;
 drop index ix_mprinter_current_state_id on mprinter;
 
@@ -321,6 +448,14 @@ drop index ix_c_message_conversation_id on c_message;
 alter table c_message drop foreign key fk_c_message_user_id;
 drop index ix_c_message_user_id on c_message;
 
+alter table meter_contract_data drop foreign key fk_meter_contract_data_special_needs_client_id;
+
+alter table meter_special_needs_client drop foreign key fk_meter_special_needs_client_primary_id;
+
+alter table meter_version drop foreign key fk_meter_version_address_data_id;
+
+alter table meter_version drop foreign key fk_meter_version_contract_data_id;
+
 alter table mnoc_user_mnoc_role drop foreign key fk_mnoc_user_mnoc_role_mnoc_user;
 drop index ix_mnoc_user_mnoc_role_mnoc_user on mnoc_user_mnoc_role;
 
@@ -393,14 +528,30 @@ drop index ix_s_order_items_order_uuid on s_order_items;
 alter table or_order_ship drop foreign key fk_or_order_ship_order_id;
 drop index ix_or_order_ship_order_id on or_order_ship;
 
+alter table organization_node drop foreign key fk_organization_node_parent_tree_node_id;
+
+alter table orp_detail drop foreign key fk_orp_detail_master_id;
+drop index ix_orp_detail_master_id on orp_detail;
+
+alter table orp_detail2 drop foreign key fk_orp_detail2_orp_master2_id;
+drop index ix_orp_detail2_orp_master2_id on orp_detail2;
+
+alter table oto_atwo drop foreign key fk_oto_atwo_aone_id;
+
 alter table oto_bchild drop foreign key fk_oto_bchild_master_id;
 
 alter table oto_child drop foreign key fk_oto_child_master_id;
 
 alter table oto_cust_address drop foreign key fk_oto_cust_address_customer_cid;
 
+alter table oto_level_a drop foreign key fk_oto_level_a_b_id;
+
+alter table oto_level_b drop foreign key fk_oto_level_b_c_id;
+
 alter table oto_prime_extra drop foreign key fk_oto_prime_extra_eid;
 
+alter table oto_sd_child drop foreign key fk_oto_sd_child_master_id;
+
 alter table oto_th_many drop foreign key fk_oto_th_many_oto_th_top_id;
 drop index ix_oto_th_many_oto_th_top_id on oto_th_many;
 
@@ -408,7 +559,7 @@ alter table oto_th_one drop foreign key fk_oto_th_one_many_id;
 
 alter table oto_ubprime_extra drop foreign key fk_oto_ubprime_extra_eid;
 
-alter table oto_uprime_extra drop foreign key fk_oto_uprime_extra_eid;
+alter table oto_user_model drop foreign key fk_oto_user_model_user_optional_id;
 
 alter table pfile drop foreign key fk_pfile_file_content_id;
 
@@ -444,9 +595,15 @@ alter table persistent_file_content drop foreign key fk_persistent_file_content_
 alter table person drop foreign key fk_person_default_address_oid;
 drop index ix_person_default_address_oid on person;
 
+alter table person_cache_email drop foreign key fk_person_cache_email_person_info_person_id;
+drop index ix_person_cache_email_person_info_person_id on person_cache_email;
+
 alter table phones drop foreign key fk_phones_person_id;
 drop index ix_phones_person_id on phones;
 
+alter table e_position drop foreign key fk_e_position_contract_id;
+drop index ix_e_position_contract_id on e_position;
+
 alter table pp_to_ww drop foreign key fk_pp_to_ww_pp;
 drop index ix_pp_to_ww_pp on pp_to_ww;
 
@@ -459,6 +616,9 @@ drop index ix_question_groupobjectid on question;
 alter table r_orders drop foreign key fk_r_orders_customer;
 drop index ix_r_orders_customer on r_orders;
 
+alter table rel_master drop foreign key fk_rel_master_detail_id;
+drop index ix_rel_master_detail_id on rel_master;
+
 alter table resourcefile drop foreign key fk_resourcefile_parentresourcefileid;
 drop index ix_resourcefile_parentresourcefileid on resourcefile;
 
@@ -485,6 +645,15 @@ drop index ix_self_ref_customer_referred_by_id on self_ref_customer;
 alter table self_ref_example drop foreign key fk_self_ref_example_parent_id;
 drop index ix_self_ref_example_parent_id on self_ref_example;
 
+alter table e_save_test_b drop foreign key fk_e_save_test_b_sibling_a_id;
+
+alter table site drop foreign key fk_site_parent_id;
+drop index ix_site_parent_id on site;
+
+alter table site drop foreign key fk_site_data_container_id;
+
+alter table site drop foreign key fk_site_site_address_id;
+
 alter table stockforecast drop foreign key fk_stockforecast_inner_report_id;
 drop index ix_stockforecast_inner_report_id on stockforecast;
 
@@ -513,8 +682,13 @@ drop index ix_trip_vehicle_driver_id on trip;
 alter table trip drop foreign key fk_trip_address_id;
 drop index ix_trip_address_id on trip;
 
-alter table type drop foreign key fk_type_sub_type_id;
-drop index ix_type_sub_type_id on type;
+alter table `type` drop foreign key fk_type_sub_type_id;
+drop index ix_type_sub_type_id on `type`;
+
+alter table usib_child drop foreign key fk_usib_child_parent_id;
+drop index ix_usib_child_parent_id on usib_child;
+
+alter table usib_child_sibling drop foreign key fk_usib_child_sibling_child_id;
 
 alter table ut_detail drop foreign key fk_ut_detail_utmaster_id;
 drop index ix_ut_detail_utmaster_id on ut_detail;
@@ -522,17 +696,20 @@ drop index ix_ut_detail_utmaster_id on ut_detail;
 alter table uutwo drop foreign key fk_uutwo_master_id;
 drop index ix_uutwo_master_id on uutwo;
 
+alter table oto_user drop foreign key fk_oto_user_account_id;
+
 alter table c_user drop foreign key fk_c_user_group_id;
 drop index ix_c_user_group_id on c_user;
 
-alter table oto_user drop foreign key fk_oto_user_account_id;
-
 alter table em_user_role drop foreign key fk_em_user_role_user_id;
 drop index ix_em_user_role_user_id on em_user_role;
 
 alter table em_user_role drop foreign key fk_em_user_role_role_id;
 drop index ix_em_user_role_role_id on em_user_role;
 
+alter table vehicle drop foreign key fk_vehicle_lease_id;
+drop index ix_vehicle_lease_id on vehicle;
+
 alter table vehicle drop foreign key fk_vehicle_car_ref_id;
 drop index ix_vehicle_car_ref_id on vehicle;
 
@@ -573,8 +750,14 @@ drop table if exists asimple_bean;
 
 drop table if exists bar;
 
+drop table if exists block;
+
 drop table if exists oto_account;
 
+drop table if exists acl;
+
+drop table if exists acl_container_relation;
+
 drop table if exists addr;
 
 drop table if exists address;
@@ -597,28 +780,48 @@ drop table if exists audit_log;
 
 drop table if exists bbookmark;
 
+drop table if exists bbookmark_org;
+
 drop table if exists bbookmark_user;
 
 drop table if exists bsimple_with_gen;
 
 drop table if exists bsite;
 
-drop table if exists bsite_user;
+drop table if exists bsite_user_a;
 
 drop table if exists bsite_user_b;
 
 drop table if exists bsite_user_c;
 
+drop table if exists bsite_user_d;
+
+drop table if exists bsite_user_e;
+
 drop table if exists buser;
 
 drop table if exists bwith_qident;
 
+drop table if exists basic_draftable_bean;
+
+drop table if exists basic_draftable_bean_draft;
+
 drop table if exists basic_joda_entity;
 
 drop table if exists bean_with_time_zone;
 
 drop table if exists drel_booking;
 
+drop table if exists bw_bean;
+
+drop table if exists cepcategory;
+
+drop table if exists cepproduct;
+
+drop table if exists cepproduct_category;
+
+drop table if exists cinh_ref;
+
 drop table if exists cinh_root;
 
 drop table if exists ckey_assoc;
@@ -631,20 +834,32 @@ drop table if exists calculation_result;
 
 drop table if exists cao_bean;
 
-drop table if exists sa_car;
-
 drop table if exists sp_car_car;
 
 drop table if exists sp_car_car_wheels;
 
+drop table if exists sp_car_car_doors;
+
+drop table if exists sa_car;
+
 drop table if exists car_accessory;
 
 drop table if exists car_fuse;
 
 drop table if exists category;
 
+drop table if exists e_save_test_d;
+
 drop table if exists child_person;
 
+drop table if exists cke_client;
+
+drop table if exists cke_user;
+
+drop table if exists class_super;
+
+drop table if exists class_super_monkey;
+
 drop table if exists configuration;
 
 drop table if exists configurations;
@@ -655,6 +870,10 @@ drop table if exists contact_group;
 
 drop table if exists contact_note;
 
+drop table if exists contract;
+
+drop table if exists contract_costs;
+
 drop table if exists c_conversation;
 
 drop table if exists o_country;
@@ -669,6 +888,16 @@ drop table if exists dcredit_drol;
 
 drop table if exists dexh_entity;
 
+drop table if exists dmachine;
+
+drop table if exists d_machine_aux_use;
+
+drop table if exists d_machine_stats;
+
+drop table if exists d_machine_use;
+
+drop table if exists dorg;
+
 drop table if exists dperson;
 
 drop table if exists drol;
@@ -679,6 +908,12 @@ drop table if exists drot_drol;
 
 drop table if exists rawinherit_data;
 
+drop table if exists data_container;
+
+drop table if exists dc_detail;
+
+drop table if exists dc_master;
+
 drop table if exists dfk_cascade;
 
 drop table if exists dfk_cascade_one;
@@ -687,6 +922,10 @@ drop table if exists dfk_none;
 
 drop table if exists dfk_none_via_join;
 
+drop table if exists dfk_none_via_mto_m;
+
+drop table if exists dfk_none_via_mto_m_dfk_one;
+
 drop table if exists dfk_one;
 
 drop table if exists dfk_set_null;
@@ -707,6 +946,8 @@ drop table if exists document_media;
 
 drop table if exists document_media_draft;
 
+drop table if exists sp_car_door;
+
 drop table if exists earray_bean;
 
 drop table if exists earray_set_bean;
@@ -725,12 +966,18 @@ drop table if exists e_basicenc;
 
 drop table if exists e_basicenc_bin;
 
+drop table if exists e_basicenc_client;
+
 drop table if exists e_basic_enum_id;
 
 drop table if exists e_basic_eni;
 
 drop table if exists ebasic_hstore;
 
+drop table if exists ebasic_json_jackson;
+
+drop table if exists ebasic_json_jackson2;
+
 drop table if exists ebasic_json_list;
 
 drop table if exists ebasic_json_map;
@@ -767,16 +1014,32 @@ drop table if exists e_basicver;
 
 drop table if exists e_basic_withlife;
 
+drop table if exists e_basic_with_ex;
+
 drop table if exists e_basicverucon;
 
+drop table if exists ecache_child;
+
+drop table if exists ecache_root;
+
 drop table if exists e_col_ab;
 
 drop table if exists ecustom_id;
 
+drop table if exists edefault_prop;
+
 drop table if exists eemb_inner;
 
 drop table if exists eemb_outer;
 
+drop table if exists efile2_no_fk;
+
+drop table if exists efile_no_fk;
+
+drop table if exists efile_no_fk_euser_no_fk;
+
+drop table if exists efile_no_fk_euser_no_fk_soft_del;
+
 drop table if exists egen_props;
 
 drop table if exists einvoice;
@@ -793,6 +1056,8 @@ drop table if exists eopt_one_b;
 
 drop table if exists eopt_one_c;
 
+drop table if exists eper_addr;
+
 drop table if exists eperson;
 
 drop table if exists e_person_online;
@@ -831,6 +1096,10 @@ drop table if exists etrans_many;
 
 drop table if exists rawinherit_uncle;
 
+drop table if exists euser_no_fk;
+
+drop table if exists euser_no_fk_soft_del;
+
 drop table if exists evanilla_collection;
 
 drop table if exists evanilla_collection_detail;
@@ -839,12 +1108,44 @@ drop table if exists ewho_props;
 
 drop table if exists e_withinet;
 
+drop table if exists ec_enum_person;
+
+drop table if exists ec_enum_person_tags;
+
+drop table if exists ec_person;
+
+drop table if exists ec_person_phone;
+
+drop table if exists ecbl_person;
+
+drop table if exists ecbl_person_phone_numbers;
+
+drop table if exists ecbm_person;
+
+drop table if exists ecbm_person_phone_numbers;
+
+drop table if exists ecm_person;
+
+drop table if exists ecm_person_phone_numbers;
+
+drop table if exists ecmc_person;
+
+drop table if exists ecmc_person_phone_numbers;
+
+drop table if exists ecs_person;
+
+drop table if exists ecs_person_phone;
+
 drop table if exists td_child;
 
 drop table if exists td_parent;
 
 drop table if exists empl;
 
+drop table if exists esd_detail;
+
+drop table if exists esd_master;
+
 drop table if exists feature_desc;
 
 drop table if exists f_first;
@@ -868,8 +1169,8 @@ drop table if exists he_doc;
 drop trigger hx_link_history_upd;
 drop trigger hx_link_history_del;
 drop view hx_link_with_history;
-alter table hx_link drop column sys_period_start;
-alter table hx_link drop column sys_period_end;
+CALL usp_ebean_drop_column('hx_link', 'sys_period_start');
+CALL usp_ebean_drop_column('hx_link', 'sys_period_end');
 drop table hx_link_history;
 
 drop table if exists hx_link;
@@ -881,8 +1182,8 @@ drop table if exists hi_doc;
 drop trigger hi_link_history_upd;
 drop trigger hi_link_history_del;
 drop view hi_link_with_history;
-alter table hi_link drop column sys_period_start;
-alter table hi_link drop column sys_period_end;
+CALL usp_ebean_drop_column('hi_link', 'sys_period_start');
+CALL usp_ebean_drop_column('hi_link', 'sys_period_end');
 drop table hi_link_history;
 
 drop table if exists hi_link;
@@ -890,12 +1191,61 @@ drop table if exists hi_link;
 drop trigger hi_link_doc_history_upd;
 drop trigger hi_link_doc_history_del;
 drop view hi_link_doc_with_history;
-alter table hi_link_doc drop column sys_period_start;
-alter table hi_link_doc drop column sys_period_end;
+CALL usp_ebean_drop_column('hi_link_doc', 'sys_period_start');
+CALL usp_ebean_drop_column('hi_link_doc', 'sys_period_end');
 drop table hi_link_doc_history;
 
 drop table if exists hi_link_doc;
 
+drop trigger hi_tone_history_upd;
+drop trigger hi_tone_history_del;
+drop view hi_tone_with_history;
+CALL usp_ebean_drop_column('hi_tone', 'sys_period_start');
+CALL usp_ebean_drop_column('hi_tone', 'sys_period_end');
+drop table hi_tone_history;
+
+drop table if exists hi_tone;
+
+drop trigger hi_tthree_history_upd;
+drop trigger hi_tthree_history_del;
+drop view hi_tthree_with_history;
+CALL usp_ebean_drop_column('hi_tthree', 'sys_period_start');
+CALL usp_ebean_drop_column('hi_tthree', 'sys_period_end');
+drop table hi_tthree_history;
+
+drop table if exists hi_tthree;
+
+drop trigger hi_ttwo_history_upd;
+drop trigger hi_ttwo_history_del;
+drop view hi_ttwo_with_history;
+CALL usp_ebean_drop_column('hi_ttwo', 'sys_period_start');
+CALL usp_ebean_drop_column('hi_ttwo', 'sys_period_end');
+drop table hi_ttwo_history;
+
+drop table if exists hi_ttwo;
+
+drop trigger hsd_setting_history_upd;
+drop trigger hsd_setting_history_del;
+drop view hsd_setting_with_history;
+CALL usp_ebean_drop_column('hsd_setting', 'sys_period_start');
+CALL usp_ebean_drop_column('hsd_setting', 'sys_period_end');
+drop table hsd_setting_history;
+
+drop table if exists hsd_setting;
+
+drop trigger hsd_user_history_upd;
+drop trigger hsd_user_history_del;
+drop view hsd_user_with_history;
+CALL usp_ebean_drop_column('hsd_user', 'sys_period_start');
+CALL usp_ebean_drop_column('hsd_user', 'sys_period_end');
+drop table hsd_user_history;
+
+drop table if exists hsd_user;
+
+drop table if exists iaf_segment;
+
+drop table if exists iaf_segment_status;
+
 drop table if exists imrelated;
 
 drop table if exists imroot;
@@ -916,6 +1266,10 @@ drop table if exists item;
 
 drop table if exists monkey;
 
+drop table if exists mkeygroup;
+
+drop table if exists mkeygroup_monkey;
+
 drop table if exists trainer;
 
 drop table if exists trainer_monkey;
@@ -945,8 +1299,8 @@ drop table if exists level4;
 drop trigger link_history_upd;
 drop trigger link_history_del;
 drop view link_with_history;
-alter table link drop column sys_period_start;
-alter table link drop column sys_period_end;
+CALL usp_ebean_drop_column('link', 'sys_period_start');
+CALL usp_ebean_drop_column('link', 'sys_period_end');
 drop table link_history;
 
 drop table if exists link;
@@ -957,6 +1311,22 @@ drop table if exists la_attr_value;
 
 drop table if exists la_attr_value_attribute;
 
+drop table if exists looney;
+
+drop table if exists maddress;
+
+drop table if exists mcontact;
+
+drop table if exists mcontact_message;
+
+drop table if exists mcustomer;
+
+drop table if exists mgroup;
+
+drop table if exists mmachine;
+
+drop table if exists mmachine_mgroup;
+
 drop table if exists mmedia;
 
 drop table if exists non_updateprop;
@@ -987,10 +1357,24 @@ drop table if exists mail_user_inbox;
 
 drop table if exists mail_user_outbox;
 
+drop table if exists main_entity;
+
+drop table if exists main_entity_relation;
+
 drop table if exists map_super_actual;
 
 drop table if exists c_message;
 
+drop table if exists meter_address_data;
+
+drop table if exists meter_contract_data;
+
+drop table if exists meter_special_needs_client;
+
+drop table if exists meter_special_needs_contact;
+
+drop table if exists meter_version;
+
 drop table if exists mnoc_role;
 
 drop table if exists mnoc_user;
@@ -1033,6 +1417,8 @@ drop table if exists o_cached_bean_country;
 
 drop table if exists o_cached_bean_child;
 
+drop table if exists o_cached_inherit;
+
 drop table if exists o_cached_natkey;
 
 drop table if exists o_cached_natkey3;
@@ -1051,6 +1437,8 @@ drop table if exists om_ordered_detail;
 
 drop table if exists om_ordered_master;
 
+drop table if exists only_id_entity;
+
 drop table if exists o_order;
 
 drop table if exists o_order_detail;
@@ -1063,6 +1451,22 @@ drop table if exists or_order_ship;
 
 drop table if exists organisation;
 
+drop table if exists organization_node;
+
+drop table if exists organization_tree_node;
+
+drop table if exists orp_detail;
+
+drop table if exists orp_detail2;
+
+drop table if exists orp_master;
+
+drop table if exists orp_master2;
+
+drop table if exists oto_aone;
+
+drop table if exists oto_atwo;
+
 drop table if exists oto_bchild;
 
 drop table if exists oto_bmaster;
@@ -1073,12 +1477,22 @@ drop table if exists oto_cust;
 
 drop table if exists oto_cust_address;
 
+drop table if exists oto_level_a;
+
+drop table if exists oto_level_b;
+
+drop table if exists oto_level_c;
+
 drop table if exists oto_master;
 
 drop table if exists oto_prime;
 
 drop table if exists oto_prime_extra;
 
+drop table if exists oto_sd_child;
+
+drop table if exists oto_sd_master;
+
 drop table if exists oto_th_many;
 
 drop table if exists oto_th_one;
@@ -1093,6 +1507,10 @@ drop table if exists oto_uprime;
 
 drop table if exists oto_uprime_extra;
 
+drop table if exists oto_user_model;
+
+drop table if exists oto_user_model_optional;
+
 drop table if exists pfile;
 
 drop table if exists pfile_content;
@@ -1109,22 +1527,32 @@ drop table if exists rawinherit_parent;
 
 drop table if exists rawinherit_parent_rawinherit_data;
 
+drop table if exists e_save_test_c;
+
 drop table if exists parent_person;
 
 drop table if exists c_participation;
 
+drop table if exists password_store_model;
+
 drop table if exists mt_permission;
 
 drop table if exists persistent_file;
 
 drop table if exists persistent_file_content;
 
-drop table if exists persons;
-
 drop table if exists person;
 
+drop table if exists persons;
+
+drop table if exists person_cache_email;
+
+drop table if exists person_cache_info;
+
 drop table if exists phones;
 
+drop table if exists e_position;
+
 drop table if exists primary_revision;
 
 drop table if exists o_product;
@@ -1141,14 +1569,18 @@ drop table if exists r_orders;
 
 drop table if exists region;
 
-drop table if exists resourcefile;
+drop table if exists rel_detail;
 
-drop table if exists em_role;
+drop table if exists rel_master;
+
+drop table if exists resourcefile;
 
 drop table if exists mt_role;
 
 drop table if exists mt_role_permission;
 
+drop table if exists em_role;
+
 drop table if exists f_second;
 
 drop table if exists section;
@@ -1159,6 +1591,14 @@ drop table if exists self_ref_customer;
 
 drop table if exists self_ref_example;
 
+drop table if exists e_save_test_a;
+
+drop table if exists e_save_test_b;
+
+drop table if exists site;
+
+drop table if exists site_address;
+
 drop table if exists some_enum_bean;
 
 drop table if exists some_file_bean;
@@ -1219,10 +1659,18 @@ drop table if exists trip;
 
 drop table if exists truck_ref;
 
-drop table if exists type;
+drop table if exists tune;
+
+drop table if exists `type`;
 
 drop table if exists tz_bean;
 
+drop table if exists usib_child;
+
+drop table if exists usib_child_sibling;
+
+drop table if exists usib_parent;
+
 drop table if exists ut_detail;
 
 drop table if exists ut_master;
@@ -1231,11 +1679,13 @@ drop table if exists uuone;
 
 drop table if exists uutwo;
 
+drop table if exists oto_user;
+
 drop trigger c_user_history_upd;
 drop trigger c_user_history_del;
 drop view c_user_with_history;
-alter table c_user drop column sys_period_start;
-alter table c_user drop column sys_period_end;
+CALL usp_ebean_drop_column('c_user', 'sys_period_start');
+CALL usp_ebean_drop_column('c_user', 'sys_period_end');
 drop table c_user_history;
 
 drop table if exists c_user;
@@ -1246,22 +1696,22 @@ drop table if exists g_user;
 
 drop table if exists em_user;
 
-drop table if exists oto_user;
-
 drop table if exists em_user_role;
 
 drop table if exists vehicle;
 
 drop table if exists vehicle_driver;
 
+drop table if exists vehicle_lease;
+
 drop table if exists warehouses;
 
 drop table if exists warehousesshippingzones;
 
-drop table if exists sa_wheel;
-
 drop table if exists wheel;
 
+drop table if exists sa_wheel;
+
 drop table if exists sp_car_wheel;
 
 drop table if exists g_who_props_otm;
@@ -1276,3 +1726,5 @@ drop table if exists zones;
 
 drop index ix_contact_last_name_first_name on contact;
 drop index ix_e_basic_name on e_basic;
+drop index ix_efile2_no_fk_owner_id on efile2_no_fk;
+drop index ix_organization_node_kind on organization_node;
diff --git a/src/test/ddl-review/mysql-create-all.sql b/src/test/ddl-review/mysql-create-all.sql
index 67fd4e368..76d40ecee 100644
--- a/src/test/ddl-review/mysql-create-all.sql
+++ b/src/test/ddl-review/mysql-create-all.sql
@@ -1,4 +1,53 @@
--- Generated by ebean unknown at 2018-03-08T06:38:18.344Z
+-- Generated by ebean unknown at 2019-07-25T09:30:19.924Z
+-- init script create procs
+-- Inital script to create stored procedures etc for mysql platform
+DROP PROCEDURE IF EXISTS usp_ebean_drop_foreign_keys;
+
+delimiter $$
+--
+-- PROCEDURE: usp_ebean_drop_foreign_keys TABLE, COLUMN
+-- deletes all constraints and foreign keys referring to TABLE.COLUMN
+--
+CREATE PROCEDURE usp_ebean_drop_foreign_keys(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
+BEGIN
+  DECLARE done INT DEFAULT FALSE;
+  DECLARE c_fk_name CHAR(255);
+  DECLARE curs CURSOR FOR SELECT CONSTRAINT_NAME from information_schema.KEY_COLUMN_USAGE
+    WHERE TABLE_SCHEMA = DATABASE() and TABLE_NAME = p_table_name and COLUMN_NAME = p_column_name
+      AND REFERENCED_TABLE_NAME IS NOT NULL;
+  DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+
+  OPEN curs;
+
+  read_loop: LOOP
+    FETCH curs INTO c_fk_name;
+    IF done THEN
+      LEAVE read_loop;
+    END IF;
+    SET @sql = CONCAT('ALTER TABLE ', p_table_name, ' DROP FOREIGN KEY ', c_fk_name);
+    PREPARE stmt FROM @sql;
+    EXECUTE stmt;
+  END LOOP;
+
+  CLOSE curs;
+END
+$$
+
+DROP PROCEDURE IF EXISTS usp_ebean_drop_column;
+
+delimiter $$
+--
+-- PROCEDURE: usp_ebean_drop_column TABLE, COLUMN
+-- deletes the column and ensures that all indices and constraints are dropped first
+--
+CREATE PROCEDURE usp_ebean_drop_column(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
+BEGIN
+  CALL usp_ebean_drop_foreign_keys(p_table_name, p_column_name);
+  SET @sql = CONCAT('ALTER TABLE ', p_table_name, ' DROP COLUMN ', p_column_name);
+  PREPARE stmt FROM @sql;
+  EXECUTE stmt;
+END
+$$
 create table asimple_bean (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -13,6 +62,15 @@ create table bar (
   constraint pk_bar primary key (bar_id)
 );
 
+create table block (
+  case_type                     integer(31) not null,
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  notes                         varchar(255),
+  constraint pk_block primary key (id)
+);
+
 create table oto_account (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -22,6 +80,19 @@ create table oto_account (
   constraint pk_oto_account primary key (id)
 );
 
+create table acl (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_acl primary key (id)
+);
+
+create table acl_container_relation (
+  id                            bigint auto_increment not null,
+  container_id                  bigint not null,
+  acl_entry_id                  bigint not null,
+  constraint pk_acl_container_relation primary key (id)
+);
+
 create table addr (
   id                            bigint auto_increment not null,
   employee_id                   bigint,
@@ -123,12 +194,19 @@ create table bbookmark (
   constraint pk_bbookmark primary key (id)
 );
 
+create table bbookmark_org (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  constraint pk_bbookmark_org primary key (id)
+);
+
 create table bbookmark_user (
   id                            integer auto_increment not null,
   name                          varchar(255),
   password                      varchar(255),
   email_address                 varchar(255),
   country                       varchar(255),
+  org_id                        integer,
   constraint pk_bbookmark_user primary key (id)
 );
 
@@ -144,19 +222,18 @@ create table bsite (
   constraint pk_bsite primary key (id)
 );
 
-create table bsite_user (
+create table bsite_user_a (
   site_id                       varchar(40) not null,
   user_id                       varchar(40) not null,
   access_level                  integer,
-  constraint ck_bsite_user_access_level check ( access_level in (0,1,2)),
-  constraint pk_bsite_user primary key (site_id,user_id)
+  version                       bigint not null,
+  constraint pk_bsite_user_a primary key (site_id,user_id)
 );
 
 create table bsite_user_b (
   site                          varchar(40) not null,
   usr                           varchar(40) not null,
   access_level                  integer,
-  constraint ck_bsite_user_b_access_level check ( access_level in (0,1,2)),
   constraint pk_bsite_user_b primary key (site,usr)
 );
 
@@ -164,10 +241,22 @@ create table bsite_user_c (
   site_uid                      varchar(40) not null,
   user_uid                      varchar(40) not null,
   access_level                  integer,
-  constraint ck_bsite_user_c_access_level check ( access_level in (0,1,2)),
   constraint pk_bsite_user_c primary key (site_uid,user_uid)
 );
 
+create table bsite_user_d (
+  site_id                       varchar(40) not null,
+  user_id                       varchar(40) not null,
+  access_level                  integer,
+  version                       bigint not null
+);
+
+create table bsite_user_e (
+  site_id                       varchar(40) not null,
+  user_id                       varchar(40) not null,
+  access_level                  integer
+);
+
 create table buser (
   id                            varchar(40) not null,
   name                          varchar(255),
@@ -177,15 +266,35 @@ create table buser (
 create table bwith_qident (
   id                            integer auto_increment not null,
   `Name`                        varchar(191),
+  `CODE`                        varchar(255),
   last_updated                  datetime(6) not null,
   constraint uq_bwith_qident_name unique (`Name`),
   constraint pk_bwith_qident primary key (id)
 );
 
+create table basic_draftable_bean (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_basic_draftable_bean primary key (id)
+);
+
+create table basic_draftable_bean_draft (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_basic_draftable_bean_draft primary key (id)
+);
+
 create table basic_joda_entity (
   id                            bigint auto_increment not null,
   name                          varchar(255),
   period                        varchar(50),
+  local_date                    date,
   created                       datetime(6) not null,
   updated                       datetime(6) not null,
   version                       datetime(6) not null,
@@ -211,6 +320,45 @@ create table drel_booking (
   constraint pk_drel_booking primary key (id)
 );
 
+create table bw_bean (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  flags                         integer not null,
+  version                       bigint not null,
+  constraint pk_bw_bean primary key (id)
+);
+
+create table cepcategory (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_cepcategory primary key (id)
+);
+
+create table cepproduct (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_cepproduct primary key (id)
+);
+
+create table cepproduct_category (
+  customer_id                   bigint not null,
+  address_id                    bigint not null,
+  category_id                   bigint not null,
+  product_id                    bigint not null,
+  priority                      integer
+);
+
+create table cinh_ref (
+  id                            integer auto_increment not null,
+  ref_id                        integer,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  constraint pk_cinh_ref primary key (id)
+);
+
 create table cinh_root (
   dtype                         varchar(3) not null,
   id                            integer auto_increment not null,
@@ -263,14 +411,9 @@ create table cao_bean (
   constraint pk_cao_bean primary key (x_cust_id,x_type_id)
 );
 
-create table sa_car (
-  id                            bigint auto_increment not null,
-  version                       integer not null,
-  constraint pk_sa_car primary key (id)
-);
-
 create table sp_car_car (
   id                            bigint auto_increment not null,
+  name                          varchar(255),
   version                       integer not null,
   constraint pk_sp_car_car primary key (id)
 );
@@ -281,6 +424,18 @@ create table sp_car_car_wheels (
   constraint pk_sp_car_car_wheels primary key (car,wheel)
 );
 
+create table sp_car_car_doors (
+  car                           bigint not null,
+  door                          bigint not null,
+  constraint pk_sp_car_car_doors primary key (car,door)
+);
+
+create table sa_car (
+  id                            bigint auto_increment not null,
+  version                       integer not null,
+  constraint pk_sa_car primary key (id)
+);
+
 create table car_accessory (
   id                            integer auto_increment not null,
   name                          varchar(255),
@@ -306,6 +461,15 @@ create table category (
   constraint pk_category primary key (id)
 );
 
+create table e_save_test_d (
+  id                            bigint auto_increment not null,
+  parent_id                     bigint,
+  test_property                 tinyint(1) default 0 not null,
+  version                       bigint not null,
+  constraint uq_e_save_test_d_parent_id unique (parent_id),
+  constraint pk_e_save_test_d primary key (id)
+);
+
 create table child_person (
   identifier                    integer auto_increment not null,
   name                          varchar(255),
@@ -317,6 +481,34 @@ create table child_person (
   constraint pk_child_person primary key (identifier)
 );
 
+create table cke_client (
+  cod_cpny                      integer not null,
+  cod_client                    varchar(100) not null,
+  username                      varchar(100) not null,
+  notes                         varchar(255),
+  constraint pk_cke_client primary key (cod_cpny,cod_client)
+);
+
+create table cke_user (
+  username                      varchar(100) not null,
+  cod_cpny                      integer not null,
+  name                          varchar(255),
+  constraint pk_cke_user primary key (username,cod_cpny)
+);
+
+create table class_super (
+  dtype                         varchar(31) not null,
+  sid                           bigint auto_increment not null,
+  constraint pk_class_super primary key (sid)
+);
+
+create table class_super_monkey (
+  class_super_sid               bigint not null,
+  monkey_mid                    bigint not null,
+  constraint uq_class_super_monkey_mid unique (monkey_mid),
+  constraint pk_class_super_monkey primary key (class_super_sid,monkey_mid)
+);
+
 create table configuration (
   type                          varchar(21) not null,
   id                            integer auto_increment not null,
@@ -367,6 +559,19 @@ create table contact_note (
   constraint pk_contact_note primary key (id)
 );
 
+create table contract (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_contract primary key (id)
+);
+
+create table contract_costs (
+  id                            bigint auto_increment not null,
+  status                        varchar(255),
+  position_id                   bigint not null,
+  constraint pk_contract_costs primary key (id)
+);
+
 create table c_conversation (
   id                            bigint auto_increment not null,
   title                         varchar(255),
@@ -386,7 +591,7 @@ create table o_country (
 
 create table cover (
   id                            bigint auto_increment not null,
-  s3url                         varchar(255),
+  s3_url                        varchar(255),
   deleted                       tinyint(1) default 0 not null,
   constraint pk_cover primary key (id)
 );
@@ -402,7 +607,6 @@ create table o_customer (
   cretime                       datetime(6) not null,
   updtime                       datetime(6) not null,
   version                       bigint not null,
-  constraint ck_o_customer_status check ( status in ('N','A','I')),
   constraint pk_o_customer primary key (id)
 ) comment='Holds external customers';
 
@@ -426,6 +630,55 @@ create table dexh_entity (
   constraint pk_dexh_entity primary key (oid)
 );
 
+create table dmachine (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  organisation_id               bigint,
+  version                       bigint not null,
+  constraint pk_dmachine primary key (id)
+);
+
+create table d_machine_aux_use (
+  id                            bigint auto_increment not null,
+  machine_id                    bigint not null,
+  name                          varchar(255),
+  date                          date,
+  use_secs                      bigint not null,
+  fuel                          decimal(38),
+  version                       bigint not null,
+  constraint pk_d_machine_aux_use primary key (id)
+);
+
+create table d_machine_stats (
+  id                            bigint auto_increment not null,
+  machine_id                    bigint not null,
+  date                          date,
+  total_kms                     bigint not null,
+  hours                         bigint not null,
+  rate                          decimal(38),
+  cost                          decimal(38),
+  version                       bigint not null,
+  constraint pk_d_machine_stats primary key (id)
+);
+
+create table d_machine_use (
+  id                            bigint auto_increment not null,
+  machine_id                    bigint not null,
+  date                          date,
+  distance_kms                  bigint not null,
+  time_secs                     bigint not null,
+  fuel                          decimal(38),
+  version                       bigint not null,
+  constraint pk_d_machine_use primary key (id)
+);
+
+create table dorg (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_dorg primary key (id)
+);
+
 create table dperson (
   id                            bigint auto_increment not null,
   first_name                    varchar(255),
@@ -458,6 +711,27 @@ create table rawinherit_data (
   constraint pk_rawinherit_data primary key (id)
 );
 
+create table data_container (
+  id                            varchar(40) not null,
+  content                       varchar(255),
+  constraint pk_data_container primary key (id)
+);
+
+create table dc_detail (
+  id                            bigint auto_increment not null,
+  master_id                     bigint,
+  description                   varchar(255),
+  version                       bigint not null,
+  constraint pk_dc_detail primary key (id)
+);
+
+create table dc_master (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_dc_master primary key (id)
+);
+
 create table dfk_cascade (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -485,6 +759,18 @@ create table dfk_none_via_join (
   constraint pk_dfk_none_via_join primary key (id)
 );
 
+create table dfk_none_via_mto_m (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_dfk_none_via_mto_m primary key (id)
+);
+
+create table dfk_none_via_mto_m_dfk_one (
+  dfk_none_via_mto_m_id         bigint not null,
+  dfk_one_id                    bigint not null,
+  constraint pk_dfk_none_via_mto_m_dfk_one primary key (dfk_none_via_mto_m_id,dfk_one_id)
+);
+
 create table dfk_one (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -575,14 +861,24 @@ create table document_media_draft (
   constraint pk_document_media_draft primary key (id)
 );
 
+create table sp_car_door (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_sp_car_door primary key (id)
+);
+
 create table earray_bean (
   id                            bigint auto_increment not null,
+  foo                           integer,
   name                          varchar(255),
   phone_numbers                 varchar(300),
   uids                          varchar(1000),
   other_ids                     varchar(1000),
   doubs                         varchar(1000),
   statuses                      varchar(1000),
+  vc_enums                      varchar(1000),
+  int_enums                     varchar(1000),
   status2                       varchar(1000),
   version                       bigint not null,
   constraint pk_earray_bean primary key (id)
@@ -605,7 +901,6 @@ create table e_basic (
   name                          varchar(127),
   description                   varchar(255),
   some_date                     datetime(6),
-  constraint ck_e_basic_status check ( status in ('N','A','I')),
   constraint pk_e_basic primary key (id)
 );
 
@@ -667,11 +962,20 @@ create table e_basicenc_bin (
   constraint pk_e_basicenc_bin primary key (id)
 );
 
+create table e_basicenc_client (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  description                   varbinary(80),
+  dob                           varbinary(20),
+  status                        varbinary(20),
+  version                       bigint not null,
+  constraint pk_e_basicenc_client primary key (id)
+);
+
 create table e_basic_enum_id (
   status                        varchar(1) not null,
   name                          varchar(255),
   description                   varchar(255),
-  constraint ck_e_basic_enum_id_status check ( status in ('N','A','I')),
   constraint pk_e_basic_enum_id primary key (status)
 );
 
@@ -681,7 +985,6 @@ create table e_basic_eni (
   name                          varchar(255),
   description                   varchar(255),
   some_date                     datetime(6),
-  constraint ck_e_basic_eni_status check ( status in (1,2,3)),
   constraint pk_e_basic_eni primary key (id)
 );
 
@@ -693,6 +996,28 @@ create table ebasic_hstore (
   constraint pk_ebasic_hstore primary key (id)
 );
 
+create table ebasic_json_jackson (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  value_set                     varchar(700),
+  value_list                    longtext,
+  value_map                     varchar(700),
+  plain_value                   varchar(500),
+  version                       bigint not null,
+  constraint pk_ebasic_json_jackson primary key (id)
+);
+
+create table ebasic_json_jackson2 (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  value_set                     varchar(700),
+  value_list                    longtext,
+  value_map                     varchar(700),
+  plain_value                   varchar(500),
+  version                       bigint not null,
+  constraint pk_ebasic_json_jackson2 primary key (id)
+);
+
 create table ebasic_json_list (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -845,6 +1170,13 @@ create table e_basic_withlife (
   constraint pk_e_basic_withlife primary key (id)
 );
 
+create table e_basic_with_ex (
+  id                            bigint auto_increment not null,
+  deleted                       tinyint(1) default 0 not null,
+  version                       bigint not null,
+  constraint pk_e_basic_with_ex primary key (id)
+);
+
 create table e_basicverucon (
   id                            integer auto_increment not null,
   name                          varchar(127),
@@ -857,6 +1189,19 @@ create table e_basicverucon (
   constraint pk_e_basicverucon primary key (id)
 );
 
+create table ecache_child (
+  id                            varchar(40) not null,
+  name                          varchar(100),
+  root_id                       varchar(40) not null,
+  constraint pk_ecache_child primary key (id)
+);
+
+create table ecache_root (
+  id                            varchar(40) not null,
+  name                          varchar(100),
+  constraint pk_ecache_root primary key (id)
+);
+
 create table e_col_ab (
   id                            bigint auto_increment not null,
   column_a                      varchar(255),
@@ -870,6 +1215,14 @@ create table ecustom_id (
   constraint pk_ecustom_id primary key (id)
 );
 
+create table edefault_prop (
+  id                            integer auto_increment not null,
+  e_simple_usertypeid           integer,
+  name                          varchar(255),
+  constraint uq_edefault_prop_e_simple_usertypeid unique (e_simple_usertypeid),
+  constraint pk_edefault_prop primary key (id)
+);
+
 create table eemb_inner (
   id                            integer auto_increment not null,
   nome_inner                    varchar(255),
@@ -887,6 +1240,31 @@ create table eemb_outer (
   constraint pk_eemb_outer primary key (id)
 );
 
+create table efile2_no_fk (
+  file_name                     varchar(64) not null,
+  owner_id                      integer not null,
+  constraint pk_efile2_no_fk primary key (file_name)
+);
+
+create table efile_no_fk (
+  file_name                     varchar(64) not null,
+  owner_user_id                 integer,
+  owner_soft_del_user_id        integer,
+  constraint pk_efile_no_fk primary key (file_name)
+);
+
+create table efile_no_fk_euser_no_fk (
+  efile_no_fk_file_name         varchar(64) not null,
+  euser_no_fk_user_id           integer not null,
+  constraint pk_efile_no_fk_euser_no_fk primary key (efile_no_fk_file_name,euser_no_fk_user_id)
+);
+
+create table efile_no_fk_euser_no_fk_soft_del (
+  efile_no_fk_file_name         varchar(64) not null,
+  euser_no_fk_soft_del_user_id  integer not null,
+  constraint pk_efile_no_fk_euser_no_fk_soft_del primary key (efile_no_fk_file_name,euser_no_fk_soft_del_user_id)
+);
+
 create table egen_props (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -922,9 +1300,6 @@ create table einvoice (
   bill_city                     varchar(255),
   bill_status                   varchar(3),
   version                       bigint not null,
-  constraint ck_einvoice_state check ( state in (0,1,2)),
-  constraint ck_einvoice_ship_status check ( ship_status in ('ONE','TWO')),
-  constraint ck_einvoice_bill_status check ( bill_status in ('ONE','TWO')),
   constraint pk_einvoice primary key (id)
 );
 
@@ -978,6 +1353,17 @@ create table eopt_one_c (
   constraint pk_eopt_one_c primary key (id)
 );
 
+create table eper_addr (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  ma_street                     varchar(255),
+  ma_suburb                     varchar(255),
+  ma_city                       varchar(255),
+  ma_country_code               varchar(2),
+  version                       bigint not null,
+  constraint pk_eper_addr primary key (id)
+);
+
 create table eperson (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -987,7 +1373,6 @@ create table eperson (
   addr_city                     varchar(255),
   addr_status                   varchar(3),
   version                       bigint not null,
-  constraint ck_eperson_addr_status check ( addr_status in ('ONE','TWO')),
   constraint pk_eperson primary key (id)
 );
 
@@ -1130,6 +1515,18 @@ create table rawinherit_uncle (
   constraint pk_rawinherit_uncle primary key (id)
 );
 
+create table euser_no_fk (
+  user_id                       integer auto_increment not null,
+  user_name                     varchar(255),
+  constraint pk_euser_no_fk primary key (user_id)
+);
+
+create table euser_no_fk_soft_del (
+  user_id                       integer auto_increment not null,
+  user_name                     varchar(255),
+  constraint pk_euser_no_fk_soft_del primary key (user_id)
+);
+
 create table evanilla_collection (
   id                            integer auto_increment not null,
   name                          varchar(255),
@@ -1158,10 +1555,103 @@ create table e_withinet (
   id                            bigint auto_increment not null,
   name                          varchar(255),
   inet_address                  varchar(50),
+  inet2                         varchar(255),
+  cdir                          varchar(50),
   version                       bigint not null,
   constraint pk_e_withinet primary key (id)
 );
 
+create table ec_enum_person (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ec_enum_person primary key (id)
+);
+
+create table ec_enum_person_tags (
+  ec_enum_person_id             bigint not null,
+  value                         varchar(5) not null
+);
+
+create table ec_person (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ec_person primary key (id)
+);
+
+create table ec_person_phone (
+  owner_id                      bigint not null,
+  phone                         varchar(255) not null
+);
+
+create table ecbl_person (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecbl_person primary key (id)
+);
+
+create table ecbl_person_phone_numbers (
+  person_id                     bigint not null,
+  country_code                  varchar(2),
+  area                          varchar(6),
+  number                        varchar(20)
+);
+
+create table ecbm_person (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecbm_person primary key (id)
+);
+
+create table ecbm_person_phone_numbers (
+  person_id                     bigint not null,
+  mkey                          varchar(255) not null,
+  country_code                  varchar(2),
+  area                          varchar(6),
+  number                        varchar(20)
+);
+
+create table ecm_person (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecm_person primary key (id)
+);
+
+create table ecm_person_phone_numbers (
+  ecm_person_id                 bigint not null,
+  type                          varchar(4) not null,
+  number                        varchar(10) not null
+);
+
+create table ecmc_person (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecmc_person primary key (id)
+);
+
+create table ecmc_person_phone_numbers (
+  ecmc_person_id                bigint not null,
+  type                          varchar(4) not null,
+  value                         longtext not null
+);
+
+create table ecs_person (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecs_person primary key (id)
+);
+
+create table ecs_person_phone (
+  ecs_person_id                 bigint not null,
+  phone                         varchar(255) not null
+);
+
 create table td_child (
   child_id                      integer auto_increment not null,
   child_name                    varchar(255),
@@ -1185,6 +1675,23 @@ create table empl (
   constraint pk_empl primary key (id)
 );
 
+create table esd_detail (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  master_id                     bigint not null,
+  version                       bigint not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_esd_detail primary key (id)
+);
+
+create table esd_master (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_esd_master primary key (id)
+);
+
 create table feature_desc (
   id                            integer auto_increment not null,
   name                          varchar(255),
@@ -1268,6 +1775,7 @@ create table hx_link (
   version                       bigint not null,
   when_created                  datetime(6) not null,
   when_modified                 datetime(6) not null,
+  deleted                       tinyint(1) default 0 not null,
   constraint pk_hx_link primary key (id)
 );
 
@@ -1303,6 +1811,73 @@ create table hi_link_doc (
   constraint pk_hi_link_doc primary key (hi_link_id,hi_doc_id)
 );
 
+create table hi_tone (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  comments                      varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_hi_tone primary key (id)
+);
+
+create table hi_tthree (
+  id                            bigint auto_increment not null,
+  hi_ttwo_id                    bigint not null,
+  three                         varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_hi_tthree primary key (id)
+);
+
+create table hi_ttwo (
+  id                            bigint auto_increment not null,
+  hi_tone_id                    bigint not null,
+  two                           varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_hi_ttwo primary key (id)
+);
+
+create table hsd_setting (
+  id                            bigint auto_increment not null,
+  code                          varchar(255),
+  content                       varchar(255),
+  user_id                       bigint,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint uq_hsd_setting_user_id unique (user_id),
+  constraint pk_hsd_setting primary key (id)
+);
+
+create table hsd_user (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_hsd_user primary key (id)
+);
+
+create table iaf_segment (
+  ptype                         varchar(31) not null,
+  id                            bigint auto_increment not null,
+  segment_id_zat                bigint not null,
+  status_id                     bigint not null,
+  constraint pk_iaf_segment primary key (id)
+);
+
+create table iaf_segment_status (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_iaf_segment_status primary key (id)
+);
+
 create table imrelated (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -1388,6 +1963,20 @@ create table monkey (
   constraint pk_monkey primary key (mid)
 );
 
+create table mkeygroup (
+  pid                           bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_mkeygroup primary key (pid)
+);
+
+create table mkeygroup_monkey (
+  mkeygroup_pid                 bigint not null,
+  monkey_mid                    bigint not null,
+  constraint uq_mkeygroup_monkey_mid unique (monkey_mid),
+  constraint pk_mkeygroup_monkey primary key (mkeygroup_pid,monkey_mid)
+);
+
 create table trainer (
   tid                           bigint auto_increment not null,
   name                          varchar(255),
@@ -1512,6 +2101,70 @@ create table la_attr_value_attribute (
   constraint pk_la_attr_value_attribute primary key (la_attr_value_id,attribute_id)
 );
 
+create table looney (
+  id                            bigint auto_increment not null,
+  tune_id                       bigint,
+  name                          varchar(255),
+  constraint pk_looney primary key (id)
+);
+
+create table maddress (
+  id                            varchar(40) not null,
+  street                        varchar(255),
+  city                          varchar(255),
+  version                       bigint not null,
+  constraint pk_maddress primary key (id)
+);
+
+create table mcontact (
+  id                            varchar(40) not null,
+  email                         varchar(255),
+  first_name                    varchar(255),
+  last_name                     varchar(255),
+  customer_id                   varchar(40),
+  version                       bigint not null,
+  constraint pk_mcontact primary key (id)
+);
+
+create table mcontact_message (
+  id                            varchar(40) not null,
+  title                         varchar(255),
+  subject                       varchar(255),
+  notes                         varchar(255),
+  contact_id                    varchar(40) not null,
+  version                       bigint not null,
+  constraint pk_mcontact_message primary key (id)
+);
+
+create table mcustomer (
+  id                            varchar(40) not null,
+  name                          varchar(255),
+  notes                         varchar(255),
+  shipping_address_id           varchar(40),
+  billing_address_id            varchar(40),
+  version                       bigint not null,
+  constraint pk_mcustomer primary key (id)
+);
+
+create table mgroup (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_mgroup primary key (id)
+);
+
+create table mmachine (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_mmachine primary key (id)
+);
+
+create table mmachine_mgroup (
+  mmachine_id                   bigint not null,
+  mgroup_id                     bigint not null,
+  constraint pk_mmachine_mgroup primary key (mmachine_id,mgroup_id)
+);
+
 create table mmedia (
   type                          varchar(31) not null,
   id                            bigint auto_increment not null,
@@ -1525,7 +2178,6 @@ create table non_updateprop (
   non_enum                      varchar(5),
   name                          varchar(255),
   note                          varchar(255),
-  constraint ck_non_updateprop_non_enum check ( non_enum in ('BEGIN','END')),
   constraint pk_non_updateprop primary key (id)
 );
 
@@ -1624,6 +2276,21 @@ create table mail_user_outbox (
   constraint pk_mail_user_outbox primary key (mail_user_id,mail_box_id)
 );
 
+create table main_entity (
+  id                            varchar(255) not null,
+  attr1                         varchar(255),
+  attr2                         varchar(255),
+  constraint pk_main_entity primary key (id)
+);
+
+create table main_entity_relation (
+  id                            varchar(40) not null,
+  id1                           varchar(255),
+  id2                           varchar(255),
+  attr1                         varchar(255),
+  constraint pk_main_entity_relation primary key (id)
+);
+
 create table map_super_actual (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -1644,6 +2311,42 @@ create table c_message (
   constraint pk_c_message primary key (id)
 );
 
+create table meter_address_data (
+  id                            varchar(40) not null,
+  street                        varchar(255) not null,
+  constraint pk_meter_address_data primary key (id)
+);
+
+create table meter_contract_data (
+  id                            varchar(40) not null,
+  special_needs_client_id       varchar(40) not null,
+  constraint uq_meter_contract_data_special_needs_client_id unique (special_needs_client_id),
+  constraint pk_meter_contract_data primary key (id)
+);
+
+create table meter_special_needs_client (
+  id                            varchar(40) not null,
+  name                          varchar(255),
+  primary_id                    varchar(40),
+  constraint uq_meter_special_needs_client_primary_id unique (primary_id),
+  constraint pk_meter_special_needs_client primary key (id)
+);
+
+create table meter_special_needs_contact (
+  id                            varchar(40) not null,
+  name                          varchar(255),
+  constraint pk_meter_special_needs_contact primary key (id)
+);
+
+create table meter_version (
+  id                            varchar(40) not null,
+  address_data_id               varchar(40),
+  contract_data_id              varchar(40) not null,
+  constraint uq_meter_version_address_data_id unique (address_data_id),
+  constraint uq_meter_version_contract_data_id unique (contract_data_id),
+  constraint pk_meter_version primary key (id)
+);
+
 create table mnoc_role (
   role_id                       integer auto_increment not null,
   role_name                     varchar(255),
@@ -1793,6 +2496,15 @@ create table o_cached_bean_child (
   constraint pk_o_cached_bean_child primary key (id)
 );
 
+create table o_cached_inherit (
+  dtype                         varchar(31) not null,
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  child_adata                   varchar(255),
+  child_bdata                   varchar(255),
+  constraint pk_o_cached_inherit primary key (id)
+);
+
 create table o_cached_natkey (
   id                            bigint auto_increment not null,
   store                         varchar(255),
@@ -1875,6 +2587,11 @@ create table om_ordered_master (
   constraint pk_om_ordered_master primary key (id)
 );
 
+create table only_id_entity (
+  id                            bigint auto_increment not null,
+  constraint pk_only_id_entity primary key (id)
+);
+
 create table o_order (
   id                            integer auto_increment not null,
   status                        integer,
@@ -1883,7 +2600,6 @@ create table o_order (
   kcustomer_id                  integer not null,
   cretime                       datetime(6) not null,
   updtime                       datetime(6) not null,
-  constraint ck_o_order_status check ( status in (0,1,2,3)),
   constraint pk_o_order primary key (id)
 );
 
@@ -1932,8 +2648,68 @@ create table organisation (
   constraint pk_organisation primary key (id)
 );
 
+create table organization_node (
+  kind                          varchar(31) not null,
+  id                            bigint auto_increment not null,
+  parent_tree_node_id           bigint not null,
+  title                         varchar(255),
+  constraint uq_organization_node_parent_tree_node_id unique (parent_tree_node_id),
+  constraint pk_organization_node primary key (id)
+);
+
+create table organization_tree_node (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_organization_tree_node primary key (id)
+);
+
+create table orp_detail (
+  id                            varchar(100) not null,
+  detail                        varchar(255),
+  master_id                     varchar(100),
+  version                       bigint not null,
+  constraint pk_orp_detail primary key (id)
+);
+
+create table orp_detail2 (
+  id                            varchar(100) not null,
+  orp_master2_id                varchar(100) not null,
+  detail                        varchar(255),
+  master_id                     varchar(255),
+  version                       bigint not null,
+  constraint pk_orp_detail2 primary key (id)
+);
+
+create table orp_master (
+  id                            varchar(100) not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_orp_master primary key (id)
+);
+
+create table orp_master2 (
+  id                            varchar(100) not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_orp_master2 primary key (id)
+);
+
+create table oto_aone (
+  id                            varchar(100) not null,
+  description                   varchar(255),
+  constraint pk_oto_aone primary key (id)
+);
+
+create table oto_atwo (
+  id                            varchar(100) not null,
+  description                   varchar(255),
+  aone_id                       varchar(100),
+  constraint uq_oto_atwo_aone_id unique (aone_id),
+  constraint pk_oto_atwo primary key (id)
+);
+
 create table oto_bchild (
-  master_id                     bigint auto_increment not null,
+  master_id                     bigint not null,
   child                         varchar(255),
   constraint pk_oto_bchild primary key (master_id)
 );
@@ -1970,6 +2746,28 @@ create table oto_cust_address (
   constraint pk_oto_cust_address primary key (aid)
 );
 
+create table oto_level_a (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  b_id                          bigint,
+  constraint uq_oto_level_a_b_id unique (b_id),
+  constraint pk_oto_level_a primary key (id)
+);
+
+create table oto_level_b (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  c_id                          bigint,
+  constraint uq_oto_level_b_c_id unique (c_id),
+  constraint pk_oto_level_b primary key (id)
+);
+
+create table oto_level_c (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_oto_level_c primary key (id)
+);
+
 create table oto_master (
   id                            bigint auto_increment not null,
   name                          varchar(255),
@@ -1990,6 +2788,23 @@ create table oto_prime_extra (
   constraint pk_oto_prime_extra primary key (eid)
 );
 
+create table oto_sd_child (
+  id                            bigint auto_increment not null,
+  child                         varchar(255),
+  master_id                     bigint,
+  deleted                       tinyint(1) default 0 not null,
+  version                       bigint not null,
+  constraint uq_oto_sd_child_master_id unique (master_id),
+  constraint pk_oto_sd_child primary key (id)
+);
+
+create table oto_sd_master (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_sd_master primary key (id)
+);
+
 create table oto_th_many (
   id                            bigint auto_increment not null,
   oto_th_top_id                 bigint not null,
@@ -2048,6 +2863,26 @@ create table oto_uprime_extra (
   constraint pk_oto_uprime_extra primary key (eid)
 );
 
+create table oto_user_model (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  user_optional_id              bigint,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint uq_oto_user_model_user_optional_id unique (user_optional_id),
+  constraint pk_oto_user_model primary key (id)
+);
+
+create table oto_user_model_optional (
+  id                            bigint auto_increment not null,
+  optional                      varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_oto_user_model_optional primary key (id)
+);
+
 create table pfile (
   id                            integer auto_increment not null,
   name                          varchar(255),
@@ -2112,6 +2947,12 @@ create table rawinherit_parent_rawinherit_data (
   constraint pk_rawinherit_parent_rawinherit_data primary key (rawinherit_parent_id,rawinherit_data_id)
 );
 
+create table e_save_test_c (
+  id                            bigint auto_increment not null,
+  version                       bigint not null,
+  constraint pk_e_save_test_c primary key (id)
+);
+
 create table parent_person (
   identifier                    integer auto_increment not null,
   name                          varchar(255),
@@ -2132,10 +2973,23 @@ create table c_participation (
   version                       bigint not null,
   when_created                  datetime(6) not null,
   when_modified                 datetime(6) not null,
-  constraint ck_c_participation_type check ( type in (0,1)),
   constraint pk_c_participation primary key (id)
 );
 
+create table password_store_model (
+  id                            bigint auto_increment not null,
+  enc1                          varchar(30),
+  enc2                          varchar(40),
+  enc3                          longtext,
+  enc4                          varbinary(30),
+  enc5                          varbinary(40),
+  enc6                          longblob,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_password_store_model primary key (id)
+);
+
 create table mt_permission (
   id                            varchar(40) not null,
   name                          varchar(255),
@@ -2162,6 +3016,13 @@ create table persistent_file_content (
   constraint pk_persistent_file_content primary key (id)
 );
 
+create table person (
+  oid                           bigint auto_increment not null,
+  default_address_oid           bigint,
+  version                       integer not null,
+  constraint pk_person primary key (oid)
+);
+
 create table persons (
   id                            bigint auto_increment not null,
   surname                       varchar(64) not null,
@@ -2169,11 +3030,17 @@ create table persons (
   constraint pk_persons primary key (id)
 );
 
-create table person (
-  oid                           bigint auto_increment not null,
-  default_address_oid           bigint,
-  version                       integer not null,
-  constraint pk_person primary key (oid)
+create table person_cache_email (
+  id                            varchar(128) not null,
+  person_info_person_id         varchar(128),
+  email                         varchar(255),
+  constraint pk_person_cache_email primary key (id)
+);
+
+create table person_cache_info (
+  person_id                     varchar(128) not null,
+  name                          varchar(255),
+  constraint pk_person_cache_info primary key (person_id)
 );
 
 create table phones (
@@ -2184,6 +3051,13 @@ create table phones (
   constraint pk_phones primary key (id)
 );
 
+create table e_position (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  contract_id                   bigint not null,
+  constraint pk_e_position primary key (id)
+);
+
 create table primary_revision (
   id                            bigint not null,
   revision                      integer not null,
@@ -2245,6 +3119,21 @@ create table region (
   constraint pk_region primary key (customer,type)
 );
 
+create table rel_detail (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_rel_detail primary key (id)
+);
+
+create table rel_master (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  detail_id                     bigint,
+  version                       integer not null,
+  constraint pk_rel_master primary key (id)
+);
+
 create table resourcefile (
   id                            varchar(64) not null,
   parentresourcefileid          varchar(64),
@@ -2252,12 +3141,6 @@ create table resourcefile (
   constraint pk_resourcefile primary key (id)
 );
 
-create table em_role (
-  id                            bigint auto_increment not null,
-  name                          varchar(255),
-  constraint pk_em_role primary key (id)
-);
-
 create table mt_role (
   id                            varchar(40) not null,
   name                          varchar(50),
@@ -2272,6 +3155,12 @@ create table mt_role_permission (
   constraint pk_mt_role_permission primary key (mt_role_id,mt_permission_id)
 );
 
+create table em_role (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_em_role primary key (id)
+);
+
 create table f_second (
   id                            bigint auto_increment not null,
   mod_name                      varchar(255),
@@ -2289,7 +3178,6 @@ create table section (
   cretime                       datetime(6) not null,
   updtime                       datetime(6) not null,
   version                       bigint not null,
-  constraint ck_section_type check ( type in (0,1)),
   constraint pk_section primary key (id)
 );
 
@@ -2315,11 +3203,44 @@ create table self_ref_example (
   constraint pk_self_ref_example primary key (id)
 );
 
+create table e_save_test_a (
+  id                            bigint auto_increment not null,
+  version                       bigint not null,
+  constraint pk_e_save_test_a primary key (id)
+);
+
+create table e_save_test_b (
+  id                            bigint auto_increment not null,
+  sibling_a_id                  bigint,
+  test_property                 tinyint(1) default 0 not null,
+  version                       bigint not null,
+  constraint uq_e_save_test_b_sibling_a_id unique (sibling_a_id),
+  constraint pk_e_save_test_b primary key (id)
+);
+
+create table site (
+  id                            varchar(40) not null,
+  name                          varchar(255),
+  parent_id                     varchar(40),
+  data_container_id             varchar(40),
+  site_address_id               varchar(40),
+  constraint uq_site_data_container_id unique (data_container_id),
+  constraint uq_site_site_address_id unique (site_address_id),
+  constraint pk_site primary key (id)
+);
+
+create table site_address (
+  id                            varchar(40) not null,
+  street                        varchar(255),
+  city                          varchar(255),
+  zip_code                      varchar(255),
+  constraint pk_site_address primary key (id)
+);
+
 create table some_enum_bean (
   id                            bigint auto_increment not null,
   some_enum                     integer,
   name                          varchar(255),
-  constraint ck_some_enum_bean_some_enum check ( some_enum in (0,1)),
   constraint pk_some_enum_bean primary key (id)
 );
 
@@ -2337,18 +3258,20 @@ create table some_new_types_bean (
   mth                           integer(1),
   yr                            integer,
   yr_mth                        date,
+  month_day                     date,
+  sql_date                      date,
   local_date                    date,
   local_date_time               datetime(6),
   offset_date_time              datetime(6),
   zoned_date_time               datetime(6),
+  local_time                    time,
   instant                       datetime(6),
   zone_id                       varchar(60),
   zone_offset                   varchar(60),
   path                          varchar(255),
   period                        varchar(20),
+  duration                      bigint,
   version                       bigint not null,
-  constraint ck_some_new_types_bean_dow check ( dow in (1,2,3,4,5,6,7)),
-  constraint ck_some_new_types_bean_mth check ( mth in (1,2,3,4,5,6,7,8,9,10,11,12)),
   constraint pk_some_new_types_bean primary key (id)
 );
 
@@ -2425,7 +3348,6 @@ create table tevent_one (
   status                        integer,
   event_id                      bigint,
   version                       bigint not null,
-  constraint ck_tevent_one_status check ( status in (0,1)),
   constraint uq_tevent_one_event_id unique (event_id),
   constraint pk_tevent_one primary key (id)
 );
@@ -2564,7 +3486,13 @@ create table truck_ref (
   constraint pk_truck_ref primary key (id)
 );
 
-create table type (
+create table tune (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_tune primary key (id)
+);
+
+create table `type` (
   customer                      integer not null,
   type                          integer not null,
   description                   varchar(255),
@@ -2581,6 +3509,27 @@ create table tz_bean (
   constraint pk_tz_bean primary key (id)
 );
 
+create table usib_child (
+  id                            varchar(40) not null,
+  parent_id                     bigint,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_usib_child primary key (id)
+);
+
+create table usib_child_sibling (
+  id                            bigint auto_increment not null,
+  child_id                      varchar(40),
+  deleted                       tinyint(1) default 0 not null,
+  constraint uq_usib_child_sibling_child_id unique (child_id),
+  constraint pk_usib_child_sibling primary key (id)
+);
+
+create table usib_parent (
+  id                            bigint auto_increment not null,
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_usib_parent primary key (id)
+);
+
 create table ut_detail (
   id                            integer auto_increment not null,
   utmaster_id                   integer not null,
@@ -2595,6 +3544,7 @@ create table ut_master (
   id                            integer auto_increment not null,
   name                          varchar(255),
   description                   varchar(255),
+  date                          date,
   version                       integer not null,
   constraint pk_ut_master primary key (id)
 );
@@ -2602,16 +3552,31 @@ create table ut_master (
 create table uuone (
   id                            varchar(40) not null,
   name                          varchar(255),
+  description                   varchar(255),
+  version                       bigint not null,
   constraint pk_uuone primary key (id)
 );
 
 create table uutwo (
   id                            varchar(40) not null,
   name                          varchar(255),
+  notes                         varchar(255),
   master_id                     varchar(40),
+  version                       bigint not null,
   constraint pk_uutwo primary key (id)
 );
 
+create table oto_user (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  account_id                    bigint not null,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint uq_oto_user_account_id unique (account_id),
+  constraint pk_oto_user primary key (id)
+);
+
 create table c_user (
   id                            bigint auto_increment not null,
   inactive                      tinyint(1) default 0 not null,
@@ -2644,17 +3609,6 @@ create table em_user (
   constraint pk_em_user primary key (id)
 );
 
-create table oto_user (
-  id                            bigint auto_increment not null,
-  name                          varchar(255),
-  account_id                    bigint not null,
-  version                       bigint not null,
-  when_created                  datetime(6) not null,
-  when_modified                 datetime(6) not null,
-  constraint uq_oto_user_account_id unique (account_id),
-  constraint pk_oto_user primary key (id)
-);
-
 create table em_user_role (
   user_id                       bigint not null,
   role_id                       bigint not null,
@@ -2666,16 +3620,16 @@ create table vehicle (
   id                            integer auto_increment not null,
   license_number                varchar(255),
   registration_date             datetime(6),
+  lease_id                      bigint,
   cretime                       datetime(6) not null,
   updtime                       datetime(6) not null,
   version                       bigint not null,
-  siz                           varchar(1),
+  siz                           varchar(3),
   driver                        varchar(255),
   car_ref_id                    integer,
   notes                         varchar(255),
   truck_ref_id                  integer,
   capacity                      double,
-  constraint ck_vehicle_siz check ( siz in ('S','M','L','H')),
   constraint pk_vehicle primary key (id)
 );
 
@@ -2691,6 +3645,20 @@ create table vehicle_driver (
   constraint pk_vehicle_driver primary key (id)
 );
 
+create table vehicle_lease (
+  dtype                         varchar(31) not null,
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  active_start                  date,
+  active_end                    date,
+  version                       bigint not null,
+  bond                          decimal(38),
+  min_duration                  integer not null,
+  day_rate                      decimal(38),
+  max_days                      integer,
+  constraint pk_vehicle_lease primary key (id)
+);
+
 create table warehouses (
   id                            integer auto_increment not null,
   officezoneid                  integer,
@@ -2703,6 +3671,12 @@ create table warehousesshippingzones (
   constraint pk_warehousesshippingzones primary key (warehouseid,shippingzoneid)
 );
 
+create table wheel (
+  id                            bigint auto_increment not null,
+  version                       integer not null,
+  constraint pk_wheel primary key (id)
+);
+
 create table sa_wheel (
   id                            bigint auto_increment not null,
   tire                          bigint,
@@ -2711,14 +3685,9 @@ create table sa_wheel (
   constraint pk_sa_wheel primary key (id)
 );
 
-create table wheel (
-  id                            bigint auto_increment not null,
-  version                       integer not null,
-  constraint pk_wheel primary key (id)
-);
-
 create table sp_car_wheel (
   id                            bigint auto_increment not null,
+  name                          varchar(255),
   version                       integer not null,
   constraint pk_sp_car_wheel primary key (id)
 );
@@ -2765,9 +3734,17 @@ create table zones (
 
 create index ix_contact_last_name_first_name on contact (last_name,first_name);
 create index ix_e_basic_name on e_basic (name);
+create index ix_efile2_no_fk_owner_id on efile2_no_fk (owner_id);
+create index ix_organization_node_kind on organization_node (kind);
 create index ix_bar_foo_id on bar (foo_id);
 alter table bar add constraint fk_bar_foo_id foreign key (foo_id) references foo (foo_id) on delete restrict on update restrict;
 
+create index ix_acl_container_relation_container_id on acl_container_relation (container_id);
+alter table acl_container_relation add constraint fk_acl_container_relation_container_id foreign key (container_id) references contract (id) on delete restrict on update restrict;
+
+create index ix_acl_container_relation_acl_entry_id on acl_container_relation (acl_entry_id);
+alter table acl_container_relation add constraint fk_acl_container_relation_acl_entry_id foreign key (acl_entry_id) references acl (id) on delete restrict on update restrict;
+
 create index ix_addr_employee_id on addr (employee_id);
 alter table addr add constraint fk_addr_employee_id foreign key (employee_id) references empl (id) on delete restrict on update restrict;
 
@@ -2785,11 +3762,14 @@ alter table attribute add constraint fk_attribute_attribute_holder_id foreign ke
 create index ix_bbookmark_user_id on bbookmark (user_id);
 alter table bbookmark add constraint fk_bbookmark_user_id foreign key (user_id) references bbookmark_user (id) on delete restrict on update restrict;
 
-create index ix_bsite_user_site_id on bsite_user (site_id);
-alter table bsite_user add constraint fk_bsite_user_site_id foreign key (site_id) references bsite (id) on delete restrict on update restrict;
+create index ix_bbookmark_user_org_id on bbookmark_user (org_id);
+alter table bbookmark_user add constraint fk_bbookmark_user_org_id foreign key (org_id) references bbookmark_org (id) on delete restrict on update restrict;
 
-create index ix_bsite_user_user_id on bsite_user (user_id);
-alter table bsite_user add constraint fk_bsite_user_user_id foreign key (user_id) references buser (id) on delete restrict on update restrict;
+create index ix_bsite_user_a_site_id on bsite_user_a (site_id);
+alter table bsite_user_a add constraint fk_bsite_user_a_site_id foreign key (site_id) references bsite (id) on delete restrict on update restrict;
+
+create index ix_bsite_user_a_user_id on bsite_user_a (user_id);
+alter table bsite_user_a add constraint fk_bsite_user_a_user_id foreign key (user_id) references buser (id) on delete restrict on update restrict;
 
 create index ix_bsite_user_b_site on bsite_user_b (site);
 alter table bsite_user_b add constraint fk_bsite_user_b_site foreign key (site) references bsite (id) on delete restrict on update restrict;
@@ -2803,10 +3783,27 @@ alter table bsite_user_c add constraint fk_bsite_user_c_site_uid foreign key (si
 create index ix_bsite_user_c_user_uid on bsite_user_c (user_uid);
 alter table bsite_user_c add constraint fk_bsite_user_c_user_uid foreign key (user_uid) references buser (id) on delete restrict on update restrict;
 
+create index ix_bsite_user_e_site_id on bsite_user_e (site_id);
+alter table bsite_user_e add constraint fk_bsite_user_e_site_id foreign key (site_id) references bsite (id) on delete restrict on update restrict;
+
+create index ix_bsite_user_e_user_id on bsite_user_e (user_id);
+alter table bsite_user_e add constraint fk_bsite_user_e_user_id foreign key (user_id) references buser (id) on delete restrict on update restrict;
+
+alter table basic_draftable_bean add constraint fk_basic_draftable_bean_id foreign key (id) references basic_draftable_bean_draft (id) on delete restrict on update restrict;
+
 alter table drel_booking add constraint fk_drel_booking_agent_invoice foreign key (agent_invoice) references drel_invoice (id) on delete restrict on update restrict;
 
 alter table drel_booking add constraint fk_drel_booking_client_invoice foreign key (client_invoice) references drel_invoice (id) on delete restrict on update restrict;
 
+create index ix_cepproduct_category_category_id on cepproduct_category (category_id);
+alter table cepproduct_category add constraint fk_cepproduct_category_category_id foreign key (category_id) references cepcategory (id) on delete restrict on update restrict;
+
+create index ix_cepproduct_category_product_id on cepproduct_category (product_id);
+alter table cepproduct_category add constraint fk_cepproduct_category_product_id foreign key (product_id) references cepproduct (id) on delete restrict on update restrict;
+
+create index ix_cinh_ref_ref_id on cinh_ref (ref_id);
+alter table cinh_ref add constraint fk_cinh_ref_ref_id foreign key (ref_id) references cinh_root (id) on delete restrict on update restrict;
+
 create index ix_ckey_detail_parent on ckey_detail (one_key,two_key);
 alter table ckey_detail add constraint fk_ckey_detail_parent foreign key (one_key,two_key) references ckey_parent (one_key,two_key) on delete restrict on update restrict;
 
@@ -2825,6 +3822,12 @@ alter table sp_car_car_wheels add constraint fk_sp_car_car_wheels_sp_car_car for
 create index ix_sp_car_car_wheels_sp_car_wheel on sp_car_car_wheels (wheel);
 alter table sp_car_car_wheels add constraint fk_sp_car_car_wheels_sp_car_wheel foreign key (wheel) references sp_car_wheel (id) on delete restrict on update restrict;
 
+create index ix_sp_car_car_doors_sp_car_car on sp_car_car_doors (car);
+alter table sp_car_car_doors add constraint fk_sp_car_car_doors_sp_car_car foreign key (car) references sp_car_car (id) on delete restrict on update restrict;
+
+create index ix_sp_car_car_doors_sp_car_door on sp_car_car_doors (door);
+alter table sp_car_car_doors add constraint fk_sp_car_car_doors_sp_car_door foreign key (door) references sp_car_door (id) on delete restrict on update restrict;
+
 create index ix_car_accessory_fuse_id on car_accessory (fuse_id);
 alter table car_accessory add constraint fk_car_accessory_fuse_id foreign key (fuse_id) references car_fuse (id) on delete restrict on update restrict;
 
@@ -2834,12 +3837,21 @@ alter table car_accessory add constraint fk_car_accessory_car_id foreign key (ca
 create index ix_category_surveyobjectid on category (surveyobjectid);
 alter table category add constraint fk_category_surveyobjectid foreign key (surveyobjectid) references survey (id) on delete restrict on update restrict;
 
+alter table e_save_test_d add constraint fk_e_save_test_d_parent_id foreign key (parent_id) references e_save_test_c (id) on delete restrict on update restrict;
+
 create index ix_child_person_some_bean_id on child_person (some_bean_id);
 alter table child_person add constraint fk_child_person_some_bean_id foreign key (some_bean_id) references e_basic (id) on delete restrict on update restrict;
 
 create index ix_child_person_parent_identifier on child_person (parent_identifier);
 alter table child_person add constraint fk_child_person_parent_identifier foreign key (parent_identifier) references parent_person (identifier) on delete restrict on update restrict;
 
+create index ix_cke_client_user on cke_client (username,cod_cpny);
+alter table cke_client add constraint fk_cke_client_user foreign key (username,cod_cpny) references cke_user (username,cod_cpny) on delete restrict on update restrict;
+
+alter table class_super_monkey add constraint fk_class_super_monkey_class_super foreign key (class_super_sid) references class_super (sid) on delete restrict on update restrict;
+
+alter table class_super_monkey add constraint fk_class_super_monkey_monkey foreign key (monkey_mid) references monkey (mid) on delete restrict on update restrict;
+
 create index ix_configuration_configurations_id on configuration (configurations_id);
 alter table configuration add constraint fk_configuration_configurations_id foreign key (configurations_id) references configurations (id) on delete restrict on update restrict;
 
@@ -2852,6 +3864,9 @@ alter table contact add constraint fk_contact_group_id foreign key (group_id) re
 create index ix_contact_note_contact_id on contact_note (contact_id);
 alter table contact_note add constraint fk_contact_note_contact_id foreign key (contact_id) references contact (id) on delete restrict on update restrict;
 
+create index ix_contract_costs_position_id on contract_costs (position_id);
+alter table contract_costs add constraint fk_contract_costs_position_id foreign key (position_id) references e_position (id) on delete restrict on update restrict;
+
 create index ix_c_conversation_group_id on c_conversation (group_id);
 alter table c_conversation add constraint fk_c_conversation_group_id foreign key (group_id) references c_group (id) on delete restrict on update restrict;
 
@@ -2867,12 +3882,27 @@ alter table dcredit_drol add constraint fk_dcredit_drol_dcredit foreign key (dcr
 create index ix_dcredit_drol_drol on dcredit_drol (drol_id);
 alter table dcredit_drol add constraint fk_dcredit_drol_drol foreign key (drol_id) references drol (id) on delete restrict on update restrict;
 
+create index ix_dmachine_organisation_id on dmachine (organisation_id);
+alter table dmachine add constraint fk_dmachine_organisation_id foreign key (organisation_id) references dorg (id) on delete restrict on update restrict;
+
+create index ix_d_machine_aux_use_machine_id on d_machine_aux_use (machine_id);
+alter table d_machine_aux_use add constraint fk_d_machine_aux_use_machine_id foreign key (machine_id) references dmachine (id) on delete restrict on update restrict;
+
+create index ix_d_machine_stats_machine_id on d_machine_stats (machine_id);
+alter table d_machine_stats add constraint fk_d_machine_stats_machine_id foreign key (machine_id) references dmachine (id) on delete restrict on update restrict;
+
+create index ix_d_machine_use_machine_id on d_machine_use (machine_id);
+alter table d_machine_use add constraint fk_d_machine_use_machine_id foreign key (machine_id) references dmachine (id) on delete restrict on update restrict;
+
 create index ix_drot_drol_drot on drot_drol (drot_id);
 alter table drot_drol add constraint fk_drot_drol_drot foreign key (drot_id) references drot (id) on delete restrict on update restrict;
 
 create index ix_drot_drol_drol on drot_drol (drol_id);
 alter table drot_drol add constraint fk_drot_drol_drol foreign key (drol_id) references drol (id) on delete restrict on update restrict;
 
+create index ix_dc_detail_master_id on dc_detail (master_id);
+alter table dc_detail add constraint fk_dc_detail_master_id foreign key (master_id) references dc_master (id) on delete restrict on update restrict;
+
 create index ix_dfk_cascade_one_id on dfk_cascade (one_id);
 alter table dfk_cascade add constraint fk_dfk_cascade_one_id foreign key (one_id) references dfk_cascade_one (id) on delete cascade on update cascade;
 
@@ -2910,6 +3940,11 @@ alter table ebasic_no_sdchild add constraint fk_ebasic_no_sdchild_owner_id forei
 create index ix_ebasic_sdchild_owner_id on ebasic_sdchild (owner_id);
 alter table ebasic_sdchild add constraint fk_ebasic_sdchild_owner_id foreign key (owner_id) references ebasic_soft_delete (id) on delete restrict on update restrict;
 
+create index ix_ecache_child_root_id on ecache_child (root_id);
+alter table ecache_child add constraint fk_ecache_child_root_id foreign key (root_id) references ecache_root (id) on delete restrict on update restrict;
+
+alter table edefault_prop add constraint fk_edefault_prop_e_simple_usertypeid foreign key (e_simple_usertypeid) references esimple (usertypeid) on delete restrict on update restrict;
+
 create index ix_eemb_inner_outer_id on eemb_inner (outer_id);
 alter table eemb_inner add constraint fk_eemb_inner_outer_id foreign key (outer_id) references eemb_outer (id) on delete restrict on update restrict;
 
@@ -2925,6 +3960,9 @@ alter table eopt_one_a add constraint fk_eopt_one_a_b_id foreign key (b_id) refe
 create index ix_eopt_one_b_c_id on eopt_one_b (c_id);
 alter table eopt_one_b add constraint fk_eopt_one_b_c_id foreign key (c_id) references eopt_one_c (id) on delete restrict on update restrict;
 
+create index ix_eper_addr_ma_country_code on eper_addr (ma_country_code);
+alter table eper_addr add constraint fk_eper_addr_ma_country_code foreign key (ma_country_code) references o_country (code) on delete restrict on update restrict;
+
 create index ix_esoft_del_book_lend_by_id on esoft_del_book (lend_by_id);
 alter table esoft_del_book add constraint fk_esoft_del_book_lend_by_id foreign key (lend_by_id) references esoft_del_user (id) on delete restrict on update restrict;
 
@@ -2963,12 +4001,36 @@ alter table rawinherit_uncle add constraint fk_rawinherit_uncle_parent_id foreig
 create index ix_evanilla_collection_detail_evanilla_collection_id on evanilla_collection_detail (evanilla_collection_id);
 alter table evanilla_collection_detail add constraint fk_evanilla_collection_detail_evanilla_collection_id foreign key (evanilla_collection_id) references evanilla_collection (id) on delete restrict on update restrict;
 
+create index ix_ec_enum_person_tags_ec_enum_person_id on ec_enum_person_tags (ec_enum_person_id);
+alter table ec_enum_person_tags add constraint fk_ec_enum_person_tags_ec_enum_person_id foreign key (ec_enum_person_id) references ec_enum_person (id) on delete restrict on update restrict;
+
+create index ix_ec_person_phone_owner_id on ec_person_phone (owner_id);
+alter table ec_person_phone add constraint fk_ec_person_phone_owner_id foreign key (owner_id) references ec_person (id) on delete restrict on update restrict;
+
+create index ix_ecbl_person_phone_numbers_person_id on ecbl_person_phone_numbers (person_id);
+alter table ecbl_person_phone_numbers add constraint fk_ecbl_person_phone_numbers_person_id foreign key (person_id) references ecbl_person (id) on delete restrict on update restrict;
+
+create index ix_ecbm_person_phone_numbers_person_id on ecbm_person_phone_numbers (person_id);
+alter table ecbm_person_phone_numbers add constraint fk_ecbm_person_phone_numbers_person_id foreign key (person_id) references ecbm_person (id) on delete restrict on update restrict;
+
+create index ix_ecm_person_phone_numbers_ecm_person_id on ecm_person_phone_numbers (ecm_person_id);
+alter table ecm_person_phone_numbers add constraint fk_ecm_person_phone_numbers_ecm_person_id foreign key (ecm_person_id) references ecm_person (id) on delete restrict on update restrict;
+
+create index ix_ecmc_person_phone_numbers_ecmc_person_id on ecmc_person_phone_numbers (ecmc_person_id);
+alter table ecmc_person_phone_numbers add constraint fk_ecmc_person_phone_numbers_ecmc_person_id foreign key (ecmc_person_id) references ecmc_person (id) on delete restrict on update restrict;
+
+create index ix_ecs_person_phone_ecs_person_id on ecs_person_phone (ecs_person_id);
+alter table ecs_person_phone add constraint fk_ecs_person_phone_ecs_person_id foreign key (ecs_person_id) references ecs_person (id) on delete restrict on update restrict;
+
 create index ix_td_child_parent_id on td_child (parent_id);
 alter table td_child add constraint fk_td_child_parent_id foreign key (parent_id) references td_parent (parent_id) on delete restrict on update restrict;
 
 create index ix_empl_default_address_id on empl (default_address_id);
 alter table empl add constraint fk_empl_default_address_id foreign key (default_address_id) references addr (id) on delete restrict on update restrict;
 
+create index ix_esd_detail_master_id on esd_detail (master_id);
+alter table esd_detail add constraint fk_esd_detail_master_id foreign key (master_id) references esd_master (id) on delete restrict on update restrict;
+
 create index ix_grand_parent_person_some_bean_id on grand_parent_person (some_bean_id);
 alter table grand_parent_person add constraint fk_grand_parent_person_some_bean_id foreign key (some_bean_id) references e_basic (id) on delete restrict on update restrict;
 
@@ -2987,6 +4049,17 @@ alter table hi_link_doc add constraint fk_hi_link_doc_hi_link foreign key (hi_li
 create index ix_hi_link_doc_hi_doc on hi_link_doc (hi_doc_id);
 alter table hi_link_doc add constraint fk_hi_link_doc_hi_doc foreign key (hi_doc_id) references hi_doc (id) on delete restrict on update restrict;
 
+create index ix_hi_tthree_hi_ttwo_id on hi_tthree (hi_ttwo_id);
+alter table hi_tthree add constraint fk_hi_tthree_hi_ttwo_id foreign key (hi_ttwo_id) references hi_ttwo (id) on delete restrict on update restrict;
+
+create index ix_hi_ttwo_hi_tone_id on hi_ttwo (hi_tone_id);
+alter table hi_ttwo add constraint fk_hi_ttwo_hi_tone_id foreign key (hi_tone_id) references hi_tone (id) on delete restrict on update restrict;
+
+alter table hsd_setting add constraint fk_hsd_setting_user_id foreign key (user_id) references hsd_user (id) on delete restrict on update restrict;
+
+create index ix_iaf_segment_status_id on iaf_segment (status_id);
+alter table iaf_segment add constraint fk_iaf_segment_status_id foreign key (status_id) references iaf_segment_status (id) on delete restrict on update restrict;
+
 create index ix_imrelated_owner_id on imrelated (owner_id);
 alter table imrelated add constraint fk_imrelated_owner_id foreign key (owner_id) references imroot (id) on delete restrict on update restrict;
 
@@ -3001,11 +4074,15 @@ create index ix_drel_invoice_booking on drel_invoice (booking);
 alter table drel_invoice add constraint fk_drel_invoice_booking foreign key (booking) references drel_booking (id) on delete restrict on update restrict;
 
 create index ix_item_etype on item (customer,type);
-alter table item add constraint fk_item_etype foreign key (customer,type) references type (customer,type) on delete restrict on update restrict;
+alter table item add constraint fk_item_etype foreign key (customer,type) references `type` (customer,type) on delete restrict on update restrict;
 
 create index ix_item_eregion on item (customer,region);
 alter table item add constraint fk_item_eregion foreign key (customer,region) references region (customer,type) on delete restrict on update restrict;
 
+alter table mkeygroup_monkey add constraint fk_mkeygroup_monkey_mkeygroup foreign key (mkeygroup_pid) references mkeygroup (pid) on delete restrict on update restrict;
+
+alter table mkeygroup_monkey add constraint fk_mkeygroup_monkey_monkey foreign key (monkey_mid) references monkey (mid) on delete restrict on update restrict;
+
 alter table trainer_monkey add constraint fk_trainer_monkey_trainer foreign key (trainer_tid) references trainer (tid) on delete restrict on update restrict;
 
 alter table trainer_monkey add constraint fk_trainer_monkey_monkey foreign key (monkey_mid) references monkey (mid) on delete restrict on update restrict;
@@ -3043,6 +4120,27 @@ alter table la_attr_value_attribute add constraint fk_la_attr_value_attribute_la
 create index ix_la_attr_value_attribute_attribute on la_attr_value_attribute (attribute_id);
 alter table la_attr_value_attribute add constraint fk_la_attr_value_attribute_attribute foreign key (attribute_id) references attribute (id) on delete restrict on update restrict;
 
+create index ix_looney_tune_id on looney (tune_id);
+alter table looney add constraint fk_looney_tune_id foreign key (tune_id) references tune (id) on delete restrict on update restrict;
+
+create index ix_mcontact_customer_id on mcontact (customer_id);
+alter table mcontact add constraint fk_mcontact_customer_id foreign key (customer_id) references mcustomer (id) on delete restrict on update restrict;
+
+create index ix_mcontact_message_contact_id on mcontact_message (contact_id);
+alter table mcontact_message add constraint fk_mcontact_message_contact_id foreign key (contact_id) references mcontact (id) on delete restrict on update restrict;
+
+create index ix_mcustomer_shipping_address_id on mcustomer (shipping_address_id);
+alter table mcustomer add constraint fk_mcustomer_shipping_address_id foreign key (shipping_address_id) references maddress (id) on delete restrict on update restrict;
+
+create index ix_mcustomer_billing_address_id on mcustomer (billing_address_id);
+alter table mcustomer add constraint fk_mcustomer_billing_address_id foreign key (billing_address_id) references maddress (id) on delete restrict on update restrict;
+
+create index ix_mmachine_mgroup_mmachine on mmachine_mgroup (mmachine_id);
+alter table mmachine_mgroup add constraint fk_mmachine_mgroup_mmachine foreign key (mmachine_id) references mmachine (id) on delete restrict on update restrict;
+
+create index ix_mmachine_mgroup_mgroup on mmachine_mgroup (mgroup_id);
+alter table mmachine_mgroup add constraint fk_mmachine_mgroup_mgroup foreign key (mgroup_id) references mgroup (id) on delete restrict on update restrict;
+
 create index ix_mprinter_current_state_id on mprinter (current_state_id);
 alter table mprinter add constraint fk_mprinter_current_state_id foreign key (current_state_id) references mprinter_state (id) on delete restrict on update restrict;
 
@@ -3087,6 +4185,14 @@ alter table c_message add constraint fk_c_message_conversation_id foreign key (c
 create index ix_c_message_user_id on c_message (user_id);
 alter table c_message add constraint fk_c_message_user_id foreign key (user_id) references c_user (id) on delete restrict on update restrict;
 
+alter table meter_contract_data add constraint fk_meter_contract_data_special_needs_client_id foreign key (special_needs_client_id) references meter_special_needs_client (id) on delete restrict on update restrict;
+
+alter table meter_special_needs_client add constraint fk_meter_special_needs_client_primary_id foreign key (primary_id) references meter_special_needs_contact (id) on delete restrict on update restrict;
+
+alter table meter_version add constraint fk_meter_version_address_data_id foreign key (address_data_id) references meter_address_data (id) on delete restrict on update restrict;
+
+alter table meter_version add constraint fk_meter_version_contract_data_id foreign key (contract_data_id) references meter_contract_data (id) on delete restrict on update restrict;
+
 create index ix_mnoc_user_mnoc_role_mnoc_user on mnoc_user_mnoc_role (mnoc_user_user_id);
 alter table mnoc_user_mnoc_role add constraint fk_mnoc_user_mnoc_role_mnoc_user foreign key (mnoc_user_user_id) references mnoc_user (user_id) on delete restrict on update restrict;
 
@@ -3159,14 +4265,30 @@ alter table s_order_items add constraint fk_s_order_items_order_uuid foreign key
 create index ix_or_order_ship_order_id on or_order_ship (order_id);
 alter table or_order_ship add constraint fk_or_order_ship_order_id foreign key (order_id) references o_order (id) on delete restrict on update restrict;
 
+alter table organization_node add constraint fk_organization_node_parent_tree_node_id foreign key (parent_tree_node_id) references organization_tree_node (id) on delete restrict on update restrict;
+
+create index ix_orp_detail_master_id on orp_detail (master_id);
+alter table orp_detail add constraint fk_orp_detail_master_id foreign key (master_id) references orp_master (id) on delete restrict on update restrict;
+
+create index ix_orp_detail2_orp_master2_id on orp_detail2 (orp_master2_id);
+alter table orp_detail2 add constraint fk_orp_detail2_orp_master2_id foreign key (orp_master2_id) references orp_master2 (id) on delete restrict on update restrict;
+
+alter table oto_atwo add constraint fk_oto_atwo_aone_id foreign key (aone_id) references oto_aone (id) on delete restrict on update restrict;
+
 alter table oto_bchild add constraint fk_oto_bchild_master_id foreign key (master_id) references oto_bmaster (id) on delete restrict on update restrict;
 
 alter table oto_child add constraint fk_oto_child_master_id foreign key (master_id) references oto_master (id) on delete restrict on update restrict;
 
 alter table oto_cust_address add constraint fk_oto_cust_address_customer_cid foreign key (customer_cid) references oto_cust (cid) on delete restrict on update restrict;
 
+alter table oto_level_a add constraint fk_oto_level_a_b_id foreign key (b_id) references oto_level_b (id) on delete restrict on update restrict;
+
+alter table oto_level_b add constraint fk_oto_level_b_c_id foreign key (c_id) references oto_level_c (id) on delete restrict on update restrict;
+
 alter table oto_prime_extra add constraint fk_oto_prime_extra_eid foreign key (eid) references oto_prime (pid) on delete restrict on update restrict;
 
+alter table oto_sd_child add constraint fk_oto_sd_child_master_id foreign key (master_id) references oto_sd_master (id) on delete restrict on update restrict;
+
 create index ix_oto_th_many_oto_th_top_id on oto_th_many (oto_th_top_id);
 alter table oto_th_many add constraint fk_oto_th_many_oto_th_top_id foreign key (oto_th_top_id) references oto_th_top (id) on delete restrict on update restrict;
 
@@ -3174,7 +4296,7 @@ alter table oto_th_one add constraint fk_oto_th_one_many_id foreign key (many_id
 
 alter table oto_ubprime_extra add constraint fk_oto_ubprime_extra_eid foreign key (eid) references oto_ubprime (pid) on delete restrict on update restrict;
 
-alter table oto_uprime_extra add constraint fk_oto_uprime_extra_eid foreign key (eid) references oto_uprime (pid) on delete restrict on update restrict;
+alter table oto_user_model add constraint fk_oto_user_model_user_optional_id foreign key (user_optional_id) references oto_user_model_optional (id) on delete restrict on update restrict;
 
 alter table pfile add constraint fk_pfile_file_content_id foreign key (file_content_id) references pfile_content (id) on delete restrict on update restrict;
 
@@ -3210,9 +4332,15 @@ alter table persistent_file_content add constraint fk_persistent_file_content_pe
 create index ix_person_default_address_oid on person (default_address_oid);
 alter table person add constraint fk_person_default_address_oid foreign key (default_address_oid) references address (oid) on delete restrict on update restrict;
 
+create index ix_person_cache_email_person_info_person_id on person_cache_email (person_info_person_id);
+alter table person_cache_email add constraint fk_person_cache_email_person_info_person_id foreign key (person_info_person_id) references person_cache_info (person_id) on delete restrict on update restrict;
+
 create index ix_phones_person_id on phones (person_id);
 alter table phones add constraint fk_phones_person_id foreign key (person_id) references persons (id) on delete restrict on update restrict;
 
+create index ix_e_position_contract_id on e_position (contract_id);
+alter table e_position add constraint fk_e_position_contract_id foreign key (contract_id) references contract (id) on delete restrict on update restrict;
+
 create index ix_pp_to_ww_pp on pp_to_ww (pp_id);
 alter table pp_to_ww add constraint fk_pp_to_ww_pp foreign key (pp_id) references pp (id) on delete restrict on update restrict;
 
@@ -3225,6 +4353,9 @@ alter table question add constraint fk_question_groupobjectid foreign key (group
 create index ix_r_orders_customer on r_orders (company,customername);
 alter table r_orders add constraint fk_r_orders_customer foreign key (company,customername) references rcustomer (company,name) on delete restrict on update restrict;
 
+create index ix_rel_master_detail_id on rel_master (detail_id);
+alter table rel_master add constraint fk_rel_master_detail_id foreign key (detail_id) references rel_detail (id) on delete restrict on update restrict;
+
 create index ix_resourcefile_parentresourcefileid on resourcefile (parentresourcefileid);
 alter table resourcefile add constraint fk_resourcefile_parentresourcefileid foreign key (parentresourcefileid) references resourcefile (id) on delete restrict on update restrict;
 
@@ -3251,6 +4382,15 @@ alter table self_ref_customer add constraint fk_self_ref_customer_referred_by_id
 create index ix_self_ref_example_parent_id on self_ref_example (parent_id);
 alter table self_ref_example add constraint fk_self_ref_example_parent_id foreign key (parent_id) references self_ref_example (id) on delete restrict on update restrict;
 
+alter table e_save_test_b add constraint fk_e_save_test_b_sibling_a_id foreign key (sibling_a_id) references e_save_test_a (id) on delete restrict on update restrict;
+
+create index ix_site_parent_id on site (parent_id);
+alter table site add constraint fk_site_parent_id foreign key (parent_id) references site (id) on delete restrict on update restrict;
+
+alter table site add constraint fk_site_data_container_id foreign key (data_container_id) references data_container (id) on delete restrict on update restrict;
+
+alter table site add constraint fk_site_site_address_id foreign key (site_address_id) references site_address (id) on delete restrict on update restrict;
+
 create index ix_stockforecast_inner_report_id on stockforecast (inner_report_id);
 alter table stockforecast add constraint fk_stockforecast_inner_report_id foreign key (inner_report_id) references inner_report (id) on delete restrict on update restrict;
 
@@ -3279,8 +4419,13 @@ alter table trip add constraint fk_trip_vehicle_driver_id foreign key (vehicle_d
 create index ix_trip_address_id on trip (address_id);
 alter table trip add constraint fk_trip_address_id foreign key (address_id) references o_address (id) on delete restrict on update restrict;
 
-create index ix_type_sub_type_id on type (sub_type_id);
-alter table type add constraint fk_type_sub_type_id foreign key (sub_type_id) references sub_type (sub_type_id) on delete restrict on update restrict;
+create index ix_type_sub_type_id on `type` (sub_type_id);
+alter table `type` add constraint fk_type_sub_type_id foreign key (sub_type_id) references sub_type (sub_type_id) on delete restrict on update restrict;
+
+create index ix_usib_child_parent_id on usib_child (parent_id);
+alter table usib_child add constraint fk_usib_child_parent_id foreign key (parent_id) references usib_parent (id) on delete restrict on update restrict;
+
+alter table usib_child_sibling add constraint fk_usib_child_sibling_child_id foreign key (child_id) references usib_child (id) on delete restrict on update restrict;
 
 create index ix_ut_detail_utmaster_id on ut_detail (utmaster_id);
 alter table ut_detail add constraint fk_ut_detail_utmaster_id foreign key (utmaster_id) references ut_master (id) on delete restrict on update restrict;
@@ -3288,17 +4433,20 @@ alter table ut_detail add constraint fk_ut_detail_utmaster_id foreign key (utmas
 create index ix_uutwo_master_id on uutwo (master_id);
 alter table uutwo add constraint fk_uutwo_master_id foreign key (master_id) references uuone (id) on delete restrict on update restrict;
 
+alter table oto_user add constraint fk_oto_user_account_id foreign key (account_id) references oto_account (id) on delete restrict on update restrict;
+
 create index ix_c_user_group_id on c_user (group_id);
 alter table c_user add constraint fk_c_user_group_id foreign key (group_id) references c_group (id) on delete restrict on update restrict;
 
-alter table oto_user add constraint fk_oto_user_account_id foreign key (account_id) references oto_account (id) on delete restrict on update restrict;
-
 create index ix_em_user_role_user_id on em_user_role (user_id);
 alter table em_user_role add constraint fk_em_user_role_user_id foreign key (user_id) references em_user (id) on delete restrict on update restrict;
 
 create index ix_em_user_role_role_id on em_user_role (role_id);
 alter table em_user_role add constraint fk_em_user_role_role_id foreign key (role_id) references em_role (id) on delete restrict on update restrict;
 
+create index ix_vehicle_lease_id on vehicle (lease_id);
+alter table vehicle add constraint fk_vehicle_lease_id foreign key (lease_id) references vehicle_lease (id) on delete restrict on update restrict;
+
 create index ix_vehicle_car_ref_id on vehicle (car_ref_id);
 alter table vehicle add constraint fk_vehicle_car_ref_id foreign key (car_ref_id) references truck_ref (id) on delete restrict on update restrict;
 
@@ -3346,20 +4494,12 @@ create table hx_link_history(
   version                       bigint,
   when_created                  datetime(6),
   when_modified                 datetime(6),
+  deleted                       tinyint(1),
   sys_period_start              datetime(6),
   sys_period_end                datetime(6)
 );
 create view hx_link_with_history as select * from hx_link union all select * from hx_link_history;
 
-delimiter $$
-create trigger hx_link_history_upd before update on hx_link for each row begin
-    insert into hx_link_history (sys_period_start,sys_period_end,id, name, location, comments, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
-    set NEW.sys_period_start = now(6);
-end$$
-delimiter $$
-create trigger hx_link_history_del before delete on hx_link for each row begin
-    insert into hx_link_history (sys_period_start,sys_period_end,id, name, location, comments, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
-end$$
 alter table hi_link add column sys_period_start datetime(6) default now(6);
 alter table hi_link add column sys_period_end datetime(6);
 update hi_link set sys_period_start = when_created;
@@ -3376,15 +4516,6 @@ create table hi_link_history(
 );
 create view hi_link_with_history as select * from hi_link union all select * from hi_link_history;
 
-delimiter $$
-create trigger hi_link_history_upd before update on hi_link for each row begin
-    insert into hi_link_history (sys_period_start,sys_period_end,id, name, location, comments, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
-    set NEW.sys_period_start = now(6);
-end$$
-delimiter $$
-create trigger hi_link_history_del before delete on hi_link for each row begin
-    insert into hi_link_history (sys_period_start,sys_period_end,id, name, location, comments, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
-end$$
 alter table hi_link_doc add column sys_period_start datetime(6) default now(6);
 alter table hi_link_doc add column sys_period_end datetime(6);
 create table hi_link_doc_history(
@@ -3395,15 +4526,83 @@ create table hi_link_doc_history(
 );
 create view hi_link_doc_with_history as select * from hi_link_doc union all select * from hi_link_doc_history;
 
-delimiter $$
-create trigger hi_link_doc_history_upd before update on hi_link_doc for each row begin
-    insert into hi_link_doc_history (sys_period_start,sys_period_end,hi_link_id, hi_doc_id) values (OLD.sys_period_start, now(6),OLD.hi_link_id, OLD.hi_doc_id);
-    set NEW.sys_period_start = now(6);
-end$$
-delimiter $$
-create trigger hi_link_doc_history_del before delete on hi_link_doc for each row begin
-    insert into hi_link_doc_history (sys_period_start,sys_period_end,hi_link_id, hi_doc_id) values (OLD.sys_period_start, now(6),OLD.hi_link_id, OLD.hi_doc_id);
-end$$
+alter table hi_tone add column sys_period_start datetime(6) default now(6);
+alter table hi_tone add column sys_period_end datetime(6);
+update hi_tone set sys_period_start = when_created;
+create table hi_tone_history(
+  id                            bigint,
+  name                          varchar(255),
+  comments                      varchar(255),
+  version                       bigint,
+  when_created                  datetime(6),
+  when_modified                 datetime(6),
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view hi_tone_with_history as select * from hi_tone union all select * from hi_tone_history;
+
+alter table hi_tthree add column sys_period_start datetime(6) default now(6);
+alter table hi_tthree add column sys_period_end datetime(6);
+update hi_tthree set sys_period_start = when_created;
+create table hi_tthree_history(
+  id                            bigint,
+  hi_ttwo_id                    bigint,
+  three                         varchar(255),
+  version                       bigint,
+  when_created                  datetime(6),
+  when_modified                 datetime(6),
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view hi_tthree_with_history as select * from hi_tthree union all select * from hi_tthree_history;
+
+alter table hi_ttwo add column sys_period_start datetime(6) default now(6);
+alter table hi_ttwo add column sys_period_end datetime(6);
+update hi_ttwo set sys_period_start = when_created;
+create table hi_ttwo_history(
+  id                            bigint,
+  hi_tone_id                    bigint,
+  two                           varchar(255),
+  version                       bigint,
+  when_created                  datetime(6),
+  when_modified                 datetime(6),
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view hi_ttwo_with_history as select * from hi_ttwo union all select * from hi_ttwo_history;
+
+alter table hsd_setting add column sys_period_start datetime(6) default now(6);
+alter table hsd_setting add column sys_period_end datetime(6);
+update hsd_setting set sys_period_start = when_created;
+create table hsd_setting_history(
+  id                            bigint,
+  code                          varchar(255),
+  content                       varchar(255),
+  user_id                       bigint,
+  version                       bigint,
+  when_created                  datetime(6),
+  when_modified                 datetime(6),
+  deleted                       tinyint(1),
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view hsd_setting_with_history as select * from hsd_setting union all select * from hsd_setting_history;
+
+alter table hsd_user add column sys_period_start datetime(6) default now(6);
+alter table hsd_user add column sys_period_end datetime(6);
+update hsd_user set sys_period_start = when_created;
+create table hsd_user_history(
+  id                            bigint,
+  name                          varchar(255),
+  version                       bigint,
+  when_created                  datetime(6),
+  when_modified                 datetime(6),
+  deleted                       tinyint(1),
+  sys_period_start              datetime(6),
+  sys_period_end                datetime(6)
+);
+create view hsd_user_with_history as select * from hsd_user union all select * from hsd_user_history;
+
 alter table link add column sys_period_start datetime(6) default now(6);
 alter table link add column sys_period_end datetime(6);
 update link set sys_period_start = when_created;
@@ -3422,15 +4621,6 @@ create table link_history(
 );
 create view link_with_history as select * from link union all select * from link_history;
 
-delimiter $$
-create trigger link_history_upd before update on link for each row begin
-    insert into link_history (sys_period_start,sys_period_end,id, name, location, when_publish, link_comment, version, when_created, when_modified, deleted) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.when_publish, OLD.link_comment, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
-    set NEW.sys_period_start = now(6);
-end$$
-delimiter $$
-create trigger link_history_del before delete on link for each row begin
-    insert into link_history (sys_period_start,sys_period_end,id, name, location, when_publish, link_comment, version, when_created, when_modified, deleted) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.when_publish, OLD.link_comment, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
-end$$
 alter table c_user add column sys_period_start datetime(6) default now(6);
 alter table c_user add column sys_period_end datetime(6);
 update c_user set sys_period_start = when_created;
@@ -3449,6 +4639,87 @@ create table c_user_history(
 );
 create view c_user_with_history as select * from c_user union all select * from c_user_history;
 
+delimiter $$
+create trigger hx_link_history_upd before update on hx_link for each row begin
+    insert into hx_link_history (sys_period_start,sys_period_end,id, name, location, comments, version, when_created, when_modified, deleted) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger hx_link_history_del before delete on hx_link for each row begin
+    insert into hx_link_history (sys_period_start,sys_period_end,id, name, location, comments, version, when_created, when_modified, deleted) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+end$$
+delimiter $$
+create trigger hi_link_history_upd before update on hi_link for each row begin
+    insert into hi_link_history (sys_period_start,sys_period_end,id, name, location, comments, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger hi_link_history_del before delete on hi_link for each row begin
+    insert into hi_link_history (sys_period_start,sys_period_end,id, name, location, comments, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
+end$$
+delimiter $$
+create trigger hi_link_doc_history_upd before update on hi_link_doc for each row begin
+    insert into hi_link_doc_history (sys_period_start,sys_period_end,hi_link_id, hi_doc_id) values (OLD.sys_period_start, now(6),OLD.hi_link_id, OLD.hi_doc_id);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger hi_link_doc_history_del before delete on hi_link_doc for each row begin
+    insert into hi_link_doc_history (sys_period_start,sys_period_end,hi_link_id, hi_doc_id) values (OLD.sys_period_start, now(6),OLD.hi_link_id, OLD.hi_doc_id);
+end$$
+delimiter $$
+create trigger hi_tone_history_upd before update on hi_tone for each row begin
+    insert into hi_tone_history (sys_period_start,sys_period_end,id, name, comments, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger hi_tone_history_del before delete on hi_tone for each row begin
+    insert into hi_tone_history (sys_period_start,sys_period_end,id, name, comments, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
+end$$
+delimiter $$
+create trigger hi_tthree_history_upd before update on hi_tthree for each row begin
+    insert into hi_tthree_history (sys_period_start,sys_period_end,id, hi_ttwo_id, three, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.hi_ttwo_id, OLD.three, OLD.version, OLD.when_created, OLD.when_modified);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger hi_tthree_history_del before delete on hi_tthree for each row begin
+    insert into hi_tthree_history (sys_period_start,sys_period_end,id, hi_ttwo_id, three, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.hi_ttwo_id, OLD.three, OLD.version, OLD.when_created, OLD.when_modified);
+end$$
+delimiter $$
+create trigger hi_ttwo_history_upd before update on hi_ttwo for each row begin
+    insert into hi_ttwo_history (sys_period_start,sys_period_end,id, hi_tone_id, two, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.hi_tone_id, OLD.two, OLD.version, OLD.when_created, OLD.when_modified);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger hi_ttwo_history_del before delete on hi_ttwo for each row begin
+    insert into hi_ttwo_history (sys_period_start,sys_period_end,id, hi_tone_id, two, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.hi_tone_id, OLD.two, OLD.version, OLD.when_created, OLD.when_modified);
+end$$
+delimiter $$
+create trigger hsd_setting_history_upd before update on hsd_setting for each row begin
+    insert into hsd_setting_history (sys_period_start,sys_period_end,id, code, content, user_id, version, when_created, when_modified, deleted) values (OLD.sys_period_start, now(6),OLD.id, OLD.code, OLD.content, OLD.user_id, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger hsd_setting_history_del before delete on hsd_setting for each row begin
+    insert into hsd_setting_history (sys_period_start,sys_period_end,id, code, content, user_id, version, when_created, when_modified, deleted) values (OLD.sys_period_start, now(6),OLD.id, OLD.code, OLD.content, OLD.user_id, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+end$$
+delimiter $$
+create trigger hsd_user_history_upd before update on hsd_user for each row begin
+    insert into hsd_user_history (sys_period_start,sys_period_end,id, name, version, when_created, when_modified, deleted) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger hsd_user_history_del before delete on hsd_user for each row begin
+    insert into hsd_user_history (sys_period_start,sys_period_end,id, name, version, when_created, when_modified, deleted) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+end$$
+delimiter $$
+create trigger link_history_upd before update on link for each row begin
+    insert into link_history (sys_period_start,sys_period_end,id, name, location, when_publish, link_comment, version, when_created, when_modified, deleted) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.when_publish, OLD.link_comment, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger link_history_del before delete on link for each row begin
+    insert into link_history (sys_period_start,sys_period_end,id, name, location, when_publish, link_comment, version, when_created, when_modified, deleted) values (OLD.sys_period_start, now(6),OLD.id, OLD.name, OLD.location, OLD.when_publish, OLD.link_comment, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+end$$
 delimiter $$
 create trigger c_user_history_upd before update on c_user for each row begin
     insert into c_user_history (sys_period_start,sys_period_end,id, inactive, name, email, group_id, version, when_created, when_modified) values (OLD.sys_period_start, now(6),OLD.id, OLD.inactive, OLD.name, OLD.email, OLD.group_id, OLD.version, OLD.when_created, OLD.when_modified);
diff --git a/src/test/ddl-review/mysql-drop-all.sql b/src/test/ddl-review/mysql-drop-all.sql
index 5be3cc07a..1484b2eba 100644
--- a/src/test/ddl-review/mysql-drop-all.sql
+++ b/src/test/ddl-review/mysql-drop-all.sql
@@ -1,7 +1,13 @@
--- Generated by ebean unknown at 2018-03-08T06:38:18.344Z
+-- Generated by ebean unknown at 2019-07-25T09:30:19.924Z
 alter table bar drop foreign key fk_bar_foo_id;
 drop index ix_bar_foo_id on bar;
 
+alter table acl_container_relation drop foreign key fk_acl_container_relation_container_id;
+drop index ix_acl_container_relation_container_id on acl_container_relation;
+
+alter table acl_container_relation drop foreign key fk_acl_container_relation_acl_entry_id;
+drop index ix_acl_container_relation_acl_entry_id on acl_container_relation;
+
 alter table addr drop foreign key fk_addr_employee_id;
 drop index ix_addr_employee_id on addr;
 
@@ -19,11 +25,14 @@ drop index ix_attribute_attribute_holder_id on attribute;
 alter table bbookmark drop foreign key fk_bbookmark_user_id;
 drop index ix_bbookmark_user_id on bbookmark;
 
-alter table bsite_user drop foreign key fk_bsite_user_site_id;
-drop index ix_bsite_user_site_id on bsite_user;
+alter table bbookmark_user drop foreign key fk_bbookmark_user_org_id;
+drop index ix_bbookmark_user_org_id on bbookmark_user;
 
-alter table bsite_user drop foreign key fk_bsite_user_user_id;
-drop index ix_bsite_user_user_id on bsite_user;
+alter table bsite_user_a drop foreign key fk_bsite_user_a_site_id;
+drop index ix_bsite_user_a_site_id on bsite_user_a;
+
+alter table bsite_user_a drop foreign key fk_bsite_user_a_user_id;
+drop index ix_bsite_user_a_user_id on bsite_user_a;
 
 alter table bsite_user_b drop foreign key fk_bsite_user_b_site;
 drop index ix_bsite_user_b_site on bsite_user_b;
@@ -37,10 +46,27 @@ drop index ix_bsite_user_c_site_uid on bsite_user_c;
 alter table bsite_user_c drop foreign key fk_bsite_user_c_user_uid;
 drop index ix_bsite_user_c_user_uid on bsite_user_c;
 
+alter table bsite_user_e drop foreign key fk_bsite_user_e_site_id;
+drop index ix_bsite_user_e_site_id on bsite_user_e;
+
+alter table bsite_user_e drop foreign key fk_bsite_user_e_user_id;
+drop index ix_bsite_user_e_user_id on bsite_user_e;
+
+alter table basic_draftable_bean drop foreign key fk_basic_draftable_bean_id;
+
 alter table drel_booking drop foreign key fk_drel_booking_agent_invoice;
 
 alter table drel_booking drop foreign key fk_drel_booking_client_invoice;
 
+alter table cepproduct_category drop foreign key fk_cepproduct_category_category_id;
+drop index ix_cepproduct_category_category_id on cepproduct_category;
+
+alter table cepproduct_category drop foreign key fk_cepproduct_category_product_id;
+drop index ix_cepproduct_category_product_id on cepproduct_category;
+
+alter table cinh_ref drop foreign key fk_cinh_ref_ref_id;
+drop index ix_cinh_ref_ref_id on cinh_ref;
+
 alter table ckey_detail drop foreign key fk_ckey_detail_parent;
 drop index ix_ckey_detail_parent on ckey_detail;
 
@@ -59,6 +85,12 @@ drop index ix_sp_car_car_wheels_sp_car_car on sp_car_car_wheels;
 alter table sp_car_car_wheels drop foreign key fk_sp_car_car_wheels_sp_car_wheel;
 drop index ix_sp_car_car_wheels_sp_car_wheel on sp_car_car_wheels;
 
+alter table sp_car_car_doors drop foreign key fk_sp_car_car_doors_sp_car_car;
+drop index ix_sp_car_car_doors_sp_car_car on sp_car_car_doors;
+
+alter table sp_car_car_doors drop foreign key fk_sp_car_car_doors_sp_car_door;
+drop index ix_sp_car_car_doors_sp_car_door on sp_car_car_doors;
+
 alter table car_accessory drop foreign key fk_car_accessory_fuse_id;
 drop index ix_car_accessory_fuse_id on car_accessory;
 
@@ -68,12 +100,21 @@ drop index ix_car_accessory_car_id on car_accessory;
 alter table category drop foreign key fk_category_surveyobjectid;
 drop index ix_category_surveyobjectid on category;
 
+alter table e_save_test_d drop foreign key fk_e_save_test_d_parent_id;
+
 alter table child_person drop foreign key fk_child_person_some_bean_id;
 drop index ix_child_person_some_bean_id on child_person;
 
 alter table child_person drop foreign key fk_child_person_parent_identifier;
 drop index ix_child_person_parent_identifier on child_person;
 
+alter table cke_client drop foreign key fk_cke_client_user;
+drop index ix_cke_client_user on cke_client;
+
+alter table class_super_monkey drop foreign key fk_class_super_monkey_class_super;
+
+alter table class_super_monkey drop foreign key fk_class_super_monkey_monkey;
+
 alter table configuration drop foreign key fk_configuration_configurations_id;
 drop index ix_configuration_configurations_id on configuration;
 
@@ -86,6 +127,9 @@ drop index ix_contact_group_id on contact;
 alter table contact_note drop foreign key fk_contact_note_contact_id;
 drop index ix_contact_note_contact_id on contact_note;
 
+alter table contract_costs drop foreign key fk_contract_costs_position_id;
+drop index ix_contract_costs_position_id on contract_costs;
+
 alter table c_conversation drop foreign key fk_c_conversation_group_id;
 drop index ix_c_conversation_group_id on c_conversation;
 
@@ -101,12 +145,27 @@ drop index ix_dcredit_drol_dcredit on dcredit_drol;
 alter table dcredit_drol drop foreign key fk_dcredit_drol_drol;
 drop index ix_dcredit_drol_drol on dcredit_drol;
 
+alter table dmachine drop foreign key fk_dmachine_organisation_id;
+drop index ix_dmachine_organisation_id on dmachine;
+
+alter table d_machine_aux_use drop foreign key fk_d_machine_aux_use_machine_id;
+drop index ix_d_machine_aux_use_machine_id on d_machine_aux_use;
+
+alter table d_machine_stats drop foreign key fk_d_machine_stats_machine_id;
+drop index ix_d_machine_stats_machine_id on d_machine_stats;
+
+alter table d_machine_use drop foreign key fk_d_machine_use_machine_id;
+drop index ix_d_machine_use_machine_id on d_machine_use;
+
 alter table drot_drol drop foreign key fk_drot_drol_drot;
 drop index ix_drot_drol_drot on drot_drol;
 
 alter table drot_drol drop foreign key fk_drot_drol_drol;
 drop index ix_drot_drol_drol on drot_drol;
 
+alter table dc_detail drop foreign key fk_dc_detail_master_id;
+drop index ix_dc_detail_master_id on dc_detail;
+
 alter table dfk_cascade drop foreign key fk_dfk_cascade_one_id;
 drop index ix_dfk_cascade_one_id on dfk_cascade;
 
@@ -144,6 +203,11 @@ drop index ix_ebasic_no_sdchild_owner_id on ebasic_no_sdchild;
 alter table ebasic_sdchild drop foreign key fk_ebasic_sdchild_owner_id;
 drop index ix_ebasic_sdchild_owner_id on ebasic_sdchild;
 
+alter table ecache_child drop foreign key fk_ecache_child_root_id;
+drop index ix_ecache_child_root_id on ecache_child;
+
+alter table edefault_prop drop foreign key fk_edefault_prop_e_simple_usertypeid;
+
 alter table eemb_inner drop foreign key fk_eemb_inner_outer_id;
 drop index ix_eemb_inner_outer_id on eemb_inner;
 
@@ -159,6 +223,9 @@ drop index ix_eopt_one_a_b_id on eopt_one_a;
 alter table eopt_one_b drop foreign key fk_eopt_one_b_c_id;
 drop index ix_eopt_one_b_c_id on eopt_one_b;
 
+alter table eper_addr drop foreign key fk_eper_addr_ma_country_code;
+drop index ix_eper_addr_ma_country_code on eper_addr;
+
 alter table esoft_del_book drop foreign key fk_esoft_del_book_lend_by_id;
 drop index ix_esoft_del_book_lend_by_id on esoft_del_book;
 
@@ -197,12 +264,36 @@ drop index ix_rawinherit_uncle_parent_id on rawinherit_uncle;
 alter table evanilla_collection_detail drop foreign key fk_evanilla_collection_detail_evanilla_collection_id;
 drop index ix_evanilla_collection_detail_evanilla_collection_id on evanilla_collection_detail;
 
+alter table ec_enum_person_tags drop foreign key fk_ec_enum_person_tags_ec_enum_person_id;
+drop index ix_ec_enum_person_tags_ec_enum_person_id on ec_enum_person_tags;
+
+alter table ec_person_phone drop foreign key fk_ec_person_phone_owner_id;
+drop index ix_ec_person_phone_owner_id on ec_person_phone;
+
+alter table ecbl_person_phone_numbers drop foreign key fk_ecbl_person_phone_numbers_person_id;
+drop index ix_ecbl_person_phone_numbers_person_id on ecbl_person_phone_numbers;
+
+alter table ecbm_person_phone_numbers drop foreign key fk_ecbm_person_phone_numbers_person_id;
+drop index ix_ecbm_person_phone_numbers_person_id on ecbm_person_phone_numbers;
+
+alter table ecm_person_phone_numbers drop foreign key fk_ecm_person_phone_numbers_ecm_person_id;
+drop index ix_ecm_person_phone_numbers_ecm_person_id on ecm_person_phone_numbers;
+
+alter table ecmc_person_phone_numbers drop foreign key fk_ecmc_person_phone_numbers_ecmc_person_id;
+drop index ix_ecmc_person_phone_numbers_ecmc_person_id on ecmc_person_phone_numbers;
+
+alter table ecs_person_phone drop foreign key fk_ecs_person_phone_ecs_person_id;
+drop index ix_ecs_person_phone_ecs_person_id on ecs_person_phone;
+
 alter table td_child drop foreign key fk_td_child_parent_id;
 drop index ix_td_child_parent_id on td_child;
 
 alter table empl drop foreign key fk_empl_default_address_id;
 drop index ix_empl_default_address_id on empl;
 
+alter table esd_detail drop foreign key fk_esd_detail_master_id;
+drop index ix_esd_detail_master_id on esd_detail;
+
 alter table grand_parent_person drop foreign key fk_grand_parent_person_some_bean_id;
 drop index ix_grand_parent_person_some_bean_id on grand_parent_person;
 
@@ -221,6 +312,17 @@ drop index ix_hi_link_doc_hi_link on hi_link_doc;
 alter table hi_link_doc drop foreign key fk_hi_link_doc_hi_doc;
 drop index ix_hi_link_doc_hi_doc on hi_link_doc;
 
+alter table hi_tthree drop foreign key fk_hi_tthree_hi_ttwo_id;
+drop index ix_hi_tthree_hi_ttwo_id on hi_tthree;
+
+alter table hi_ttwo drop foreign key fk_hi_ttwo_hi_tone_id;
+drop index ix_hi_ttwo_hi_tone_id on hi_ttwo;
+
+alter table hsd_setting drop foreign key fk_hsd_setting_user_id;
+
+alter table iaf_segment drop foreign key fk_iaf_segment_status_id;
+drop index ix_iaf_segment_status_id on iaf_segment;
+
 alter table imrelated drop foreign key fk_imrelated_owner_id;
 drop index ix_imrelated_owner_id on imrelated;
 
@@ -240,6 +342,10 @@ drop index ix_item_etype on item;
 alter table item drop foreign key fk_item_eregion;
 drop index ix_item_eregion on item;
 
+alter table mkeygroup_monkey drop foreign key fk_mkeygroup_monkey_mkeygroup;
+
+alter table mkeygroup_monkey drop foreign key fk_mkeygroup_monkey_monkey;
+
 alter table trainer_monkey drop foreign key fk_trainer_monkey_trainer;
 
 alter table trainer_monkey drop foreign key fk_trainer_monkey_monkey;
@@ -277,6 +383,27 @@ drop index ix_la_attr_value_attribute_la_attr_value on la_attr_value_attribute;
 alter table la_attr_value_attribute drop foreign key fk_la_attr_value_attribute_attribute;
 drop index ix_la_attr_value_attribute_attribute on la_attr_value_attribute;
 
+alter table looney drop foreign key fk_looney_tune_id;
+drop index ix_looney_tune_id on looney;
+
+alter table mcontact drop foreign key fk_mcontact_customer_id;
+drop index ix_mcontact_customer_id on mcontact;
+
+alter table mcontact_message drop foreign key fk_mcontact_message_contact_id;
+drop index ix_mcontact_message_contact_id on mcontact_message;
+
+alter table mcustomer drop foreign key fk_mcustomer_shipping_address_id;
+drop index ix_mcustomer_shipping_address_id on mcustomer;
+
+alter table mcustomer drop foreign key fk_mcustomer_billing_address_id;
+drop index ix_mcustomer_billing_address_id on mcustomer;
+
+alter table mmachine_mgroup drop foreign key fk_mmachine_mgroup_mmachine;
+drop index ix_mmachine_mgroup_mmachine on mmachine_mgroup;
+
+alter table mmachine_mgroup drop foreign key fk_mmachine_mgroup_mgroup;
+drop index ix_mmachine_mgroup_mgroup on mmachine_mgroup;
+
 alter table mprinter drop foreign key fk_mprinter_current_state_id;
 drop index ix_mprinter_current_state_id on mprinter;
 
@@ -321,6 +448,14 @@ drop index ix_c_message_conversation_id on c_message;
 alter table c_message drop foreign key fk_c_message_user_id;
 drop index ix_c_message_user_id on c_message;
 
+alter table meter_contract_data drop foreign key fk_meter_contract_data_special_needs_client_id;
+
+alter table meter_special_needs_client drop foreign key fk_meter_special_needs_client_primary_id;
+
+alter table meter_version drop foreign key fk_meter_version_address_data_id;
+
+alter table meter_version drop foreign key fk_meter_version_contract_data_id;
+
 alter table mnoc_user_mnoc_role drop foreign key fk_mnoc_user_mnoc_role_mnoc_user;
 drop index ix_mnoc_user_mnoc_role_mnoc_user on mnoc_user_mnoc_role;
 
@@ -393,14 +528,30 @@ drop index ix_s_order_items_order_uuid on s_order_items;
 alter table or_order_ship drop foreign key fk_or_order_ship_order_id;
 drop index ix_or_order_ship_order_id on or_order_ship;
 
+alter table organization_node drop foreign key fk_organization_node_parent_tree_node_id;
+
+alter table orp_detail drop foreign key fk_orp_detail_master_id;
+drop index ix_orp_detail_master_id on orp_detail;
+
+alter table orp_detail2 drop foreign key fk_orp_detail2_orp_master2_id;
+drop index ix_orp_detail2_orp_master2_id on orp_detail2;
+
+alter table oto_atwo drop foreign key fk_oto_atwo_aone_id;
+
 alter table oto_bchild drop foreign key fk_oto_bchild_master_id;
 
 alter table oto_child drop foreign key fk_oto_child_master_id;
 
 alter table oto_cust_address drop foreign key fk_oto_cust_address_customer_cid;
 
+alter table oto_level_a drop foreign key fk_oto_level_a_b_id;
+
+alter table oto_level_b drop foreign key fk_oto_level_b_c_id;
+
 alter table oto_prime_extra drop foreign key fk_oto_prime_extra_eid;
 
+alter table oto_sd_child drop foreign key fk_oto_sd_child_master_id;
+
 alter table oto_th_many drop foreign key fk_oto_th_many_oto_th_top_id;
 drop index ix_oto_th_many_oto_th_top_id on oto_th_many;
 
@@ -408,7 +559,7 @@ alter table oto_th_one drop foreign key fk_oto_th_one_many_id;
 
 alter table oto_ubprime_extra drop foreign key fk_oto_ubprime_extra_eid;
 
-alter table oto_uprime_extra drop foreign key fk_oto_uprime_extra_eid;
+alter table oto_user_model drop foreign key fk_oto_user_model_user_optional_id;
 
 alter table pfile drop foreign key fk_pfile_file_content_id;
 
@@ -444,9 +595,15 @@ alter table persistent_file_content drop foreign key fk_persistent_file_content_
 alter table person drop foreign key fk_person_default_address_oid;
 drop index ix_person_default_address_oid on person;
 
+alter table person_cache_email drop foreign key fk_person_cache_email_person_info_person_id;
+drop index ix_person_cache_email_person_info_person_id on person_cache_email;
+
 alter table phones drop foreign key fk_phones_person_id;
 drop index ix_phones_person_id on phones;
 
+alter table e_position drop foreign key fk_e_position_contract_id;
+drop index ix_e_position_contract_id on e_position;
+
 alter table pp_to_ww drop foreign key fk_pp_to_ww_pp;
 drop index ix_pp_to_ww_pp on pp_to_ww;
 
@@ -459,6 +616,9 @@ drop index ix_question_groupobjectid on question;
 alter table r_orders drop foreign key fk_r_orders_customer;
 drop index ix_r_orders_customer on r_orders;
 
+alter table rel_master drop foreign key fk_rel_master_detail_id;
+drop index ix_rel_master_detail_id on rel_master;
+
 alter table resourcefile drop foreign key fk_resourcefile_parentresourcefileid;
 drop index ix_resourcefile_parentresourcefileid on resourcefile;
 
@@ -485,6 +645,15 @@ drop index ix_self_ref_customer_referred_by_id on self_ref_customer;
 alter table self_ref_example drop foreign key fk_self_ref_example_parent_id;
 drop index ix_self_ref_example_parent_id on self_ref_example;
 
+alter table e_save_test_b drop foreign key fk_e_save_test_b_sibling_a_id;
+
+alter table site drop foreign key fk_site_parent_id;
+drop index ix_site_parent_id on site;
+
+alter table site drop foreign key fk_site_data_container_id;
+
+alter table site drop foreign key fk_site_site_address_id;
+
 alter table stockforecast drop foreign key fk_stockforecast_inner_report_id;
 drop index ix_stockforecast_inner_report_id on stockforecast;
 
@@ -513,8 +682,13 @@ drop index ix_trip_vehicle_driver_id on trip;
 alter table trip drop foreign key fk_trip_address_id;
 drop index ix_trip_address_id on trip;
 
-alter table type drop foreign key fk_type_sub_type_id;
-drop index ix_type_sub_type_id on type;
+alter table `type` drop foreign key fk_type_sub_type_id;
+drop index ix_type_sub_type_id on `type`;
+
+alter table usib_child drop foreign key fk_usib_child_parent_id;
+drop index ix_usib_child_parent_id on usib_child;
+
+alter table usib_child_sibling drop foreign key fk_usib_child_sibling_child_id;
 
 alter table ut_detail drop foreign key fk_ut_detail_utmaster_id;
 drop index ix_ut_detail_utmaster_id on ut_detail;
@@ -522,17 +696,20 @@ drop index ix_ut_detail_utmaster_id on ut_detail;
 alter table uutwo drop foreign key fk_uutwo_master_id;
 drop index ix_uutwo_master_id on uutwo;
 
+alter table oto_user drop foreign key fk_oto_user_account_id;
+
 alter table c_user drop foreign key fk_c_user_group_id;
 drop index ix_c_user_group_id on c_user;
 
-alter table oto_user drop foreign key fk_oto_user_account_id;
-
 alter table em_user_role drop foreign key fk_em_user_role_user_id;
 drop index ix_em_user_role_user_id on em_user_role;
 
 alter table em_user_role drop foreign key fk_em_user_role_role_id;
 drop index ix_em_user_role_role_id on em_user_role;
 
+alter table vehicle drop foreign key fk_vehicle_lease_id;
+drop index ix_vehicle_lease_id on vehicle;
+
 alter table vehicle drop foreign key fk_vehicle_car_ref_id;
 drop index ix_vehicle_car_ref_id on vehicle;
 
@@ -573,8 +750,14 @@ drop table if exists asimple_bean;
 
 drop table if exists bar;
 
+drop table if exists block;
+
 drop table if exists oto_account;
 
+drop table if exists acl;
+
+drop table if exists acl_container_relation;
+
 drop table if exists addr;
 
 drop table if exists address;
@@ -597,28 +780,48 @@ drop table if exists audit_log;
 
 drop table if exists bbookmark;
 
+drop table if exists bbookmark_org;
+
 drop table if exists bbookmark_user;
 
 drop table if exists bsimple_with_gen;
 
 drop table if exists bsite;
 
-drop table if exists bsite_user;
+drop table if exists bsite_user_a;
 
 drop table if exists bsite_user_b;
 
 drop table if exists bsite_user_c;
 
+drop table if exists bsite_user_d;
+
+drop table if exists bsite_user_e;
+
 drop table if exists buser;
 
 drop table if exists bwith_qident;
 
+drop table if exists basic_draftable_bean;
+
+drop table if exists basic_draftable_bean_draft;
+
 drop table if exists basic_joda_entity;
 
 drop table if exists bean_with_time_zone;
 
 drop table if exists drel_booking;
 
+drop table if exists bw_bean;
+
+drop table if exists cepcategory;
+
+drop table if exists cepproduct;
+
+drop table if exists cepproduct_category;
+
+drop table if exists cinh_ref;
+
 drop table if exists cinh_root;
 
 drop table if exists ckey_assoc;
@@ -631,20 +834,32 @@ drop table if exists calculation_result;
 
 drop table if exists cao_bean;
 
-drop table if exists sa_car;
-
 drop table if exists sp_car_car;
 
 drop table if exists sp_car_car_wheels;
 
+drop table if exists sp_car_car_doors;
+
+drop table if exists sa_car;
+
 drop table if exists car_accessory;
 
 drop table if exists car_fuse;
 
 drop table if exists category;
 
+drop table if exists e_save_test_d;
+
 drop table if exists child_person;
 
+drop table if exists cke_client;
+
+drop table if exists cke_user;
+
+drop table if exists class_super;
+
+drop table if exists class_super_monkey;
+
 drop table if exists configuration;
 
 drop table if exists configurations;
@@ -655,6 +870,10 @@ drop table if exists contact_group;
 
 drop table if exists contact_note;
 
+drop table if exists contract;
+
+drop table if exists contract_costs;
+
 drop table if exists c_conversation;
 
 drop table if exists o_country;
@@ -669,6 +888,16 @@ drop table if exists dcredit_drol;
 
 drop table if exists dexh_entity;
 
+drop table if exists dmachine;
+
+drop table if exists d_machine_aux_use;
+
+drop table if exists d_machine_stats;
+
+drop table if exists d_machine_use;
+
+drop table if exists dorg;
+
 drop table if exists dperson;
 
 drop table if exists drol;
@@ -679,6 +908,12 @@ drop table if exists drot_drol;
 
 drop table if exists rawinherit_data;
 
+drop table if exists data_container;
+
+drop table if exists dc_detail;
+
+drop table if exists dc_master;
+
 drop table if exists dfk_cascade;
 
 drop table if exists dfk_cascade_one;
@@ -687,6 +922,10 @@ drop table if exists dfk_none;
 
 drop table if exists dfk_none_via_join;
 
+drop table if exists dfk_none_via_mto_m;
+
+drop table if exists dfk_none_via_mto_m_dfk_one;
+
 drop table if exists dfk_one;
 
 drop table if exists dfk_set_null;
@@ -707,6 +946,8 @@ drop table if exists document_media;
 
 drop table if exists document_media_draft;
 
+drop table if exists sp_car_door;
+
 drop table if exists earray_bean;
 
 drop table if exists earray_set_bean;
@@ -725,12 +966,18 @@ drop table if exists e_basicenc;
 
 drop table if exists e_basicenc_bin;
 
+drop table if exists e_basicenc_client;
+
 drop table if exists e_basic_enum_id;
 
 drop table if exists e_basic_eni;
 
 drop table if exists ebasic_hstore;
 
+drop table if exists ebasic_json_jackson;
+
+drop table if exists ebasic_json_jackson2;
+
 drop table if exists ebasic_json_list;
 
 drop table if exists ebasic_json_map;
@@ -767,16 +1014,32 @@ drop table if exists e_basicver;
 
 drop table if exists e_basic_withlife;
 
+drop table if exists e_basic_with_ex;
+
 drop table if exists e_basicverucon;
 
+drop table if exists ecache_child;
+
+drop table if exists ecache_root;
+
 drop table if exists e_col_ab;
 
 drop table if exists ecustom_id;
 
+drop table if exists edefault_prop;
+
 drop table if exists eemb_inner;
 
 drop table if exists eemb_outer;
 
+drop table if exists efile2_no_fk;
+
+drop table if exists efile_no_fk;
+
+drop table if exists efile_no_fk_euser_no_fk;
+
+drop table if exists efile_no_fk_euser_no_fk_soft_del;
+
 drop table if exists egen_props;
 
 drop table if exists einvoice;
@@ -793,6 +1056,8 @@ drop table if exists eopt_one_b;
 
 drop table if exists eopt_one_c;
 
+drop table if exists eper_addr;
+
 drop table if exists eperson;
 
 drop table if exists e_person_online;
@@ -831,6 +1096,10 @@ drop table if exists etrans_many;
 
 drop table if exists rawinherit_uncle;
 
+drop table if exists euser_no_fk;
+
+drop table if exists euser_no_fk_soft_del;
+
 drop table if exists evanilla_collection;
 
 drop table if exists evanilla_collection_detail;
@@ -839,12 +1108,44 @@ drop table if exists ewho_props;
 
 drop table if exists e_withinet;
 
+drop table if exists ec_enum_person;
+
+drop table if exists ec_enum_person_tags;
+
+drop table if exists ec_person;
+
+drop table if exists ec_person_phone;
+
+drop table if exists ecbl_person;
+
+drop table if exists ecbl_person_phone_numbers;
+
+drop table if exists ecbm_person;
+
+drop table if exists ecbm_person_phone_numbers;
+
+drop table if exists ecm_person;
+
+drop table if exists ecm_person_phone_numbers;
+
+drop table if exists ecmc_person;
+
+drop table if exists ecmc_person_phone_numbers;
+
+drop table if exists ecs_person;
+
+drop table if exists ecs_person_phone;
+
 drop table if exists td_child;
 
 drop table if exists td_parent;
 
 drop table if exists empl;
 
+drop table if exists esd_detail;
+
+drop table if exists esd_master;
+
 drop table if exists feature_desc;
 
 drop table if exists f_first;
@@ -868,8 +1169,8 @@ drop table if exists he_doc;
 drop trigger hx_link_history_upd;
 drop trigger hx_link_history_del;
 drop view hx_link_with_history;
-alter table hx_link drop column sys_period_start;
-alter table hx_link drop column sys_period_end;
+CALL usp_ebean_drop_column('hx_link', 'sys_period_start');
+CALL usp_ebean_drop_column('hx_link', 'sys_period_end');
 drop table hx_link_history;
 
 drop table if exists hx_link;
@@ -881,8 +1182,8 @@ drop table if exists hi_doc;
 drop trigger hi_link_history_upd;
 drop trigger hi_link_history_del;
 drop view hi_link_with_history;
-alter table hi_link drop column sys_period_start;
-alter table hi_link drop column sys_period_end;
+CALL usp_ebean_drop_column('hi_link', 'sys_period_start');
+CALL usp_ebean_drop_column('hi_link', 'sys_period_end');
 drop table hi_link_history;
 
 drop table if exists hi_link;
@@ -890,12 +1191,61 @@ drop table if exists hi_link;
 drop trigger hi_link_doc_history_upd;
 drop trigger hi_link_doc_history_del;
 drop view hi_link_doc_with_history;
-alter table hi_link_doc drop column sys_period_start;
-alter table hi_link_doc drop column sys_period_end;
+CALL usp_ebean_drop_column('hi_link_doc', 'sys_period_start');
+CALL usp_ebean_drop_column('hi_link_doc', 'sys_period_end');
 drop table hi_link_doc_history;
 
 drop table if exists hi_link_doc;
 
+drop trigger hi_tone_history_upd;
+drop trigger hi_tone_history_del;
+drop view hi_tone_with_history;
+CALL usp_ebean_drop_column('hi_tone', 'sys_period_start');
+CALL usp_ebean_drop_column('hi_tone', 'sys_period_end');
+drop table hi_tone_history;
+
+drop table if exists hi_tone;
+
+drop trigger hi_tthree_history_upd;
+drop trigger hi_tthree_history_del;
+drop view hi_tthree_with_history;
+CALL usp_ebean_drop_column('hi_tthree', 'sys_period_start');
+CALL usp_ebean_drop_column('hi_tthree', 'sys_period_end');
+drop table hi_tthree_history;
+
+drop table if exists hi_tthree;
+
+drop trigger hi_ttwo_history_upd;
+drop trigger hi_ttwo_history_del;
+drop view hi_ttwo_with_history;
+CALL usp_ebean_drop_column('hi_ttwo', 'sys_period_start');
+CALL usp_ebean_drop_column('hi_ttwo', 'sys_period_end');
+drop table hi_ttwo_history;
+
+drop table if exists hi_ttwo;
+
+drop trigger hsd_setting_history_upd;
+drop trigger hsd_setting_history_del;
+drop view hsd_setting_with_history;
+CALL usp_ebean_drop_column('hsd_setting', 'sys_period_start');
+CALL usp_ebean_drop_column('hsd_setting', 'sys_period_end');
+drop table hsd_setting_history;
+
+drop table if exists hsd_setting;
+
+drop trigger hsd_user_history_upd;
+drop trigger hsd_user_history_del;
+drop view hsd_user_with_history;
+CALL usp_ebean_drop_column('hsd_user', 'sys_period_start');
+CALL usp_ebean_drop_column('hsd_user', 'sys_period_end');
+drop table hsd_user_history;
+
+drop table if exists hsd_user;
+
+drop table if exists iaf_segment;
+
+drop table if exists iaf_segment_status;
+
 drop table if exists imrelated;
 
 drop table if exists imroot;
@@ -916,6 +1266,10 @@ drop table if exists item;
 
 drop table if exists monkey;
 
+drop table if exists mkeygroup;
+
+drop table if exists mkeygroup_monkey;
+
 drop table if exists trainer;
 
 drop table if exists trainer_monkey;
@@ -945,8 +1299,8 @@ drop table if exists level4;
 drop trigger link_history_upd;
 drop trigger link_history_del;
 drop view link_with_history;
-alter table link drop column sys_period_start;
-alter table link drop column sys_period_end;
+CALL usp_ebean_drop_column('link', 'sys_period_start');
+CALL usp_ebean_drop_column('link', 'sys_period_end');
 drop table link_history;
 
 drop table if exists link;
@@ -957,6 +1311,22 @@ drop table if exists la_attr_value;
 
 drop table if exists la_attr_value_attribute;
 
+drop table if exists looney;
+
+drop table if exists maddress;
+
+drop table if exists mcontact;
+
+drop table if exists mcontact_message;
+
+drop table if exists mcustomer;
+
+drop table if exists mgroup;
+
+drop table if exists mmachine;
+
+drop table if exists mmachine_mgroup;
+
 drop table if exists mmedia;
 
 drop table if exists non_updateprop;
@@ -987,10 +1357,24 @@ drop table if exists mail_user_inbox;
 
 drop table if exists mail_user_outbox;
 
+drop table if exists main_entity;
+
+drop table if exists main_entity_relation;
+
 drop table if exists map_super_actual;
 
 drop table if exists c_message;
 
+drop table if exists meter_address_data;
+
+drop table if exists meter_contract_data;
+
+drop table if exists meter_special_needs_client;
+
+drop table if exists meter_special_needs_contact;
+
+drop table if exists meter_version;
+
 drop table if exists mnoc_role;
 
 drop table if exists mnoc_user;
@@ -1033,6 +1417,8 @@ drop table if exists o_cached_bean_country;
 
 drop table if exists o_cached_bean_child;
 
+drop table if exists o_cached_inherit;
+
 drop table if exists o_cached_natkey;
 
 drop table if exists o_cached_natkey3;
@@ -1051,6 +1437,8 @@ drop table if exists om_ordered_detail;
 
 drop table if exists om_ordered_master;
 
+drop table if exists only_id_entity;
+
 drop table if exists o_order;
 
 drop table if exists o_order_detail;
@@ -1063,6 +1451,22 @@ drop table if exists or_order_ship;
 
 drop table if exists organisation;
 
+drop table if exists organization_node;
+
+drop table if exists organization_tree_node;
+
+drop table if exists orp_detail;
+
+drop table if exists orp_detail2;
+
+drop table if exists orp_master;
+
+drop table if exists orp_master2;
+
+drop table if exists oto_aone;
+
+drop table if exists oto_atwo;
+
 drop table if exists oto_bchild;
 
 drop table if exists oto_bmaster;
@@ -1073,12 +1477,22 @@ drop table if exists oto_cust;
 
 drop table if exists oto_cust_address;
 
+drop table if exists oto_level_a;
+
+drop table if exists oto_level_b;
+
+drop table if exists oto_level_c;
+
 drop table if exists oto_master;
 
 drop table if exists oto_prime;
 
 drop table if exists oto_prime_extra;
 
+drop table if exists oto_sd_child;
+
+drop table if exists oto_sd_master;
+
 drop table if exists oto_th_many;
 
 drop table if exists oto_th_one;
@@ -1093,6 +1507,10 @@ drop table if exists oto_uprime;
 
 drop table if exists oto_uprime_extra;
 
+drop table if exists oto_user_model;
+
+drop table if exists oto_user_model_optional;
+
 drop table if exists pfile;
 
 drop table if exists pfile_content;
@@ -1109,22 +1527,32 @@ drop table if exists rawinherit_parent;
 
 drop table if exists rawinherit_parent_rawinherit_data;
 
+drop table if exists e_save_test_c;
+
 drop table if exists parent_person;
 
 drop table if exists c_participation;
 
+drop table if exists password_store_model;
+
 drop table if exists mt_permission;
 
 drop table if exists persistent_file;
 
 drop table if exists persistent_file_content;
 
-drop table if exists persons;
-
 drop table if exists person;
 
+drop table if exists persons;
+
+drop table if exists person_cache_email;
+
+drop table if exists person_cache_info;
+
 drop table if exists phones;
 
+drop table if exists e_position;
+
 drop table if exists primary_revision;
 
 drop table if exists o_product;
@@ -1141,14 +1569,18 @@ drop table if exists r_orders;
 
 drop table if exists region;
 
-drop table if exists resourcefile;
+drop table if exists rel_detail;
 
-drop table if exists em_role;
+drop table if exists rel_master;
+
+drop table if exists resourcefile;
 
 drop table if exists mt_role;
 
 drop table if exists mt_role_permission;
 
+drop table if exists em_role;
+
 drop table if exists f_second;
 
 drop table if exists section;
@@ -1159,6 +1591,14 @@ drop table if exists self_ref_customer;
 
 drop table if exists self_ref_example;
 
+drop table if exists e_save_test_a;
+
+drop table if exists e_save_test_b;
+
+drop table if exists site;
+
+drop table if exists site_address;
+
 drop table if exists some_enum_bean;
 
 drop table if exists some_file_bean;
@@ -1219,10 +1659,18 @@ drop table if exists trip;
 
 drop table if exists truck_ref;
 
-drop table if exists type;
+drop table if exists tune;
+
+drop table if exists `type`;
 
 drop table if exists tz_bean;
 
+drop table if exists usib_child;
+
+drop table if exists usib_child_sibling;
+
+drop table if exists usib_parent;
+
 drop table if exists ut_detail;
 
 drop table if exists ut_master;
@@ -1231,11 +1679,13 @@ drop table if exists uuone;
 
 drop table if exists uutwo;
 
+drop table if exists oto_user;
+
 drop trigger c_user_history_upd;
 drop trigger c_user_history_del;
 drop view c_user_with_history;
-alter table c_user drop column sys_period_start;
-alter table c_user drop column sys_period_end;
+CALL usp_ebean_drop_column('c_user', 'sys_period_start');
+CALL usp_ebean_drop_column('c_user', 'sys_period_end');
 drop table c_user_history;
 
 drop table if exists c_user;
@@ -1246,22 +1696,22 @@ drop table if exists g_user;
 
 drop table if exists em_user;
 
-drop table if exists oto_user;
-
 drop table if exists em_user_role;
 
 drop table if exists vehicle;
 
 drop table if exists vehicle_driver;
 
+drop table if exists vehicle_lease;
+
 drop table if exists warehouses;
 
 drop table if exists warehousesshippingzones;
 
-drop table if exists sa_wheel;
-
 drop table if exists wheel;
 
+drop table if exists sa_wheel;
+
 drop table if exists sp_car_wheel;
 
 drop table if exists g_who_props_otm;
@@ -1276,3 +1726,5 @@ drop table if exists zones;
 
 drop index ix_contact_last_name_first_name on contact;
 drop index ix_e_basic_name on e_basic;
+drop index ix_efile2_no_fk_owner_id on efile2_no_fk;
+drop index ix_organization_node_kind on organization_node;
diff --git a/src/test/ddl-review/pg-create-all.sql b/src/test/ddl-review/pg-create-all.sql
index d9f99e631..144956d0b 100644
--- a/src/test/ddl-review/pg-create-all.sql
+++ b/src/test/ddl-review/pg-create-all.sql
@@ -1,4 +1,4 @@
--- Generated by ebean unknown at 2018-03-08T06:39:45.063Z
+-- Generated by ebean unknown at 2019-07-25T09:29:05.607Z
 create table asimple_bean (
   id                            bigserial not null,
   name                          varchar(255),
@@ -13,6 +13,15 @@ create table bar (
   constraint pk_bar primary key (bar_id)
 );
 
+create table block (
+  case_type                     integer not null,
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  notes                         varchar(255),
+  constraint pk_block primary key (id)
+);
+
 create table oto_account (
   id                            bigserial not null,
   name                          varchar(255),
@@ -22,6 +31,19 @@ create table oto_account (
   constraint pk_oto_account primary key (id)
 );
 
+create table acl (
+  id                            bigserial not null,
+  name                          varchar(255),
+  constraint pk_acl primary key (id)
+);
+
+create table acl_container_relation (
+  id                            bigserial not null,
+  container_id                  bigint not null,
+  acl_entry_id                  bigint not null,
+  constraint pk_acl_container_relation primary key (id)
+);
+
 create table addr (
   id                            bigserial not null,
   employee_id                   bigint,
@@ -123,12 +145,19 @@ create table bbookmark (
   constraint pk_bbookmark primary key (id)
 );
 
+create table bbookmark_org (
+  id                            serial not null,
+  name                          varchar(255),
+  constraint pk_bbookmark_org primary key (id)
+);
+
 create table bbookmark_user (
   id                            serial not null,
   name                          varchar(255),
   password                      varchar(255),
   email_address                 varchar(255),
   country                       varchar(255),
+  org_id                        integer,
   constraint pk_bbookmark_user primary key (id)
 );
 
@@ -144,12 +173,13 @@ create table bsite (
   constraint pk_bsite primary key (id)
 );
 
-create table bsite_user (
+create table bsite_user_a (
   site_id                       uuid not null,
   user_id                       uuid not null,
   access_level                  integer,
-  constraint ck_bsite_user_access_level check ( access_level in (0,1,2)),
-  constraint pk_bsite_user primary key (site_id,user_id)
+  version                       bigint not null,
+  constraint ck_bsite_user_a_access_level check ( access_level in (0,1,2)),
+  constraint pk_bsite_user_a primary key (site_id,user_id)
 );
 
 create table bsite_user_b (
@@ -168,6 +198,21 @@ create table bsite_user_c (
   constraint pk_bsite_user_c primary key (site_uid,user_uid)
 );
 
+create table bsite_user_d (
+  site_id                       uuid not null,
+  user_id                       uuid not null,
+  access_level                  integer,
+  version                       bigint not null,
+  constraint ck_bsite_user_d_access_level check ( access_level in (0,1,2))
+);
+
+create table bsite_user_e (
+  site_id                       uuid not null,
+  user_id                       uuid not null,
+  access_level                  integer,
+  constraint ck_bsite_user_e_access_level check ( access_level in (0,1,2))
+);
+
 create table buser (
   id                            uuid not null,
   name                          varchar(255),
@@ -177,15 +222,35 @@ create table buser (
 create table bwith_qident (
   id                            serial not null,
   "Name"                        varchar(191),
+  "CODE"                        varchar(255),
   last_updated                  timestamptz not null,
   constraint uq_bwith_qident_name unique ("Name"),
   constraint pk_bwith_qident primary key (id)
 );
 
+create table basic_draftable_bean (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint pk_basic_draftable_bean primary key (id)
+);
+
+create table basic_draftable_bean_draft (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint pk_basic_draftable_bean_draft primary key (id)
+);
+
 create table basic_joda_entity (
   id                            bigserial not null,
   name                          varchar(255),
   period                        varchar(50),
+  local_date                    date,
   created                       timestamptz not null,
   updated                       timestamptz not null,
   version                       timestamptz not null,
@@ -212,6 +277,45 @@ create table drel_booking (
 );
 create sequence drel_booking_seq;
 
+create table bw_bean (
+  id                            bigserial not null,
+  name                          varchar(255),
+  flags                         integer not null,
+  version                       bigint not null,
+  constraint pk_bw_bean primary key (id)
+);
+
+create table cepcategory (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_cepcategory primary key (id)
+);
+
+create table cepproduct (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_cepproduct primary key (id)
+);
+
+create table cepproduct_category (
+  customer_id                   bigint not null,
+  address_id                    bigint not null,
+  category_id                   bigint not null,
+  product_id                    bigint not null,
+  priority                      integer
+);
+
+create table cinh_ref (
+  id                            serial not null,
+  ref_id                        integer,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
+  version                       bigint not null,
+  constraint pk_cinh_ref primary key (id)
+);
+
 create table cinh_root (
   dtype                         varchar(3) not null,
   id                            serial not null,
@@ -264,15 +368,9 @@ create table cao_bean (
   constraint pk_cao_bean primary key (x_cust_id,x_type_id)
 );
 
-create table sa_car (
-  id                            bigint not null,
-  version                       integer not null,
-  constraint pk_sa_car primary key (id)
-);
-create sequence sa_car_seq;
-
 create table sp_car_car (
   id                            bigint not null,
+  name                          varchar(255),
   version                       integer not null,
   constraint pk_sp_car_car primary key (id)
 );
@@ -284,6 +382,19 @@ create table sp_car_car_wheels (
   constraint pk_sp_car_car_wheels primary key (car,wheel)
 );
 
+create table sp_car_car_doors (
+  car                           bigint not null,
+  door                          bigint not null,
+  constraint pk_sp_car_car_doors primary key (car,door)
+);
+
+create table sa_car (
+  id                            bigint not null,
+  version                       integer not null,
+  constraint pk_sa_car primary key (id)
+);
+create sequence sa_car_seq;
+
 create table car_accessory (
   id                            serial not null,
   name                          varchar(255),
@@ -309,6 +420,15 @@ create table category (
   constraint pk_category primary key (id)
 );
 
+create table e_save_test_d (
+  id                            bigserial not null,
+  parent_id                     bigint,
+  test_property                 boolean default false not null,
+  version                       bigint not null,
+  constraint uq_e_save_test_d_parent_id unique (parent_id),
+  constraint pk_e_save_test_d primary key (id)
+);
+
 create table child_person (
   identifier                    serial not null,
   name                          varchar(255),
@@ -320,6 +440,34 @@ create table child_person (
   constraint pk_child_person primary key (identifier)
 );
 
+create table cke_client (
+  cod_cpny                      integer not null,
+  cod_client                    varchar(100) not null,
+  username                      varchar(100) not null,
+  notes                         varchar(255),
+  constraint pk_cke_client primary key (cod_cpny,cod_client)
+);
+
+create table cke_user (
+  username                      varchar(100) not null,
+  cod_cpny                      integer not null,
+  name                          varchar(255),
+  constraint pk_cke_user primary key (username,cod_cpny)
+);
+
+create table class_super (
+  dtype                         varchar(31) not null,
+  sid                           bigserial not null,
+  constraint pk_class_super primary key (sid)
+);
+
+create table class_super_monkey (
+  class_super_sid               bigint not null,
+  monkey_mid                    bigint not null,
+  constraint uq_class_super_monkey_mid unique (monkey_mid),
+  constraint pk_class_super_monkey primary key (class_super_sid,monkey_mid)
+);
+
 create table configuration (
   type                          varchar(21) not null,
   id                            serial not null,
@@ -370,6 +518,19 @@ create table contact_note (
   constraint pk_contact_note primary key (id)
 );
 
+create table contract (
+  id                            bigserial not null,
+  name                          varchar(255),
+  constraint pk_contract primary key (id)
+);
+
+create table contract_costs (
+  id                            bigserial not null,
+  status                        varchar(255),
+  position_id                   bigint not null,
+  constraint pk_contract_costs primary key (id)
+);
+
 create table c_conversation (
   id                            bigserial not null,
   title                         varchar(255),
@@ -389,7 +550,7 @@ create table o_country (
 
 create table cover (
   id                            bigserial not null,
-  s3url                         varchar(255),
+  s3_url                        varchar(255),
   deleted                       boolean default false not null,
   constraint pk_cover primary key (id)
 );
@@ -433,6 +594,55 @@ create table dexh_entity (
   constraint pk_dexh_entity primary key (oid)
 );
 
+create table dmachine (
+  id                            bigserial not null,
+  name                          varchar(255),
+  organisation_id               bigint,
+  version                       bigint not null,
+  constraint pk_dmachine primary key (id)
+);
+
+create table d_machine_aux_use (
+  id                            bigserial not null,
+  machine_id                    bigint not null,
+  name                          varchar(255),
+  date                          date,
+  use_secs                      bigint not null,
+  fuel                          decimal(38),
+  version                       bigint not null,
+  constraint pk_d_machine_aux_use primary key (id)
+);
+
+create table d_machine_stats (
+  id                            bigserial not null,
+  machine_id                    bigint not null,
+  date                          date,
+  total_kms                     bigint not null,
+  hours                         bigint not null,
+  rate                          decimal(38),
+  cost                          decimal(38),
+  version                       bigint not null,
+  constraint pk_d_machine_stats primary key (id)
+);
+
+create table d_machine_use (
+  id                            bigserial not null,
+  machine_id                    bigint not null,
+  date                          date,
+  distance_kms                  bigint not null,
+  time_secs                     bigint not null,
+  fuel                          decimal(38),
+  version                       bigint not null,
+  constraint pk_d_machine_use primary key (id)
+);
+
+create table dorg (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_dorg primary key (id)
+);
+
 create table dperson (
   id                            bigserial not null,
   first_name                    varchar(255),
@@ -465,6 +675,27 @@ create table rawinherit_data (
   constraint pk_rawinherit_data primary key (id)
 );
 
+create table data_container (
+  id                            uuid not null,
+  content                       varchar(255),
+  constraint pk_data_container primary key (id)
+);
+
+create table dc_detail (
+  id                            bigserial not null,
+  master_id                     bigint,
+  description                   varchar(255),
+  version                       bigint not null,
+  constraint pk_dc_detail primary key (id)
+);
+
+create table dc_master (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_dc_master primary key (id)
+);
+
 create table dfk_cascade (
   id                            bigserial not null,
   name                          varchar(255),
@@ -492,6 +723,18 @@ create table dfk_none_via_join (
   constraint pk_dfk_none_via_join primary key (id)
 );
 
+create table dfk_none_via_mto_m (
+  id                            bigserial not null,
+  name                          varchar(255),
+  constraint pk_dfk_none_via_mto_m primary key (id)
+);
+
+create table dfk_none_via_mto_m_dfk_one (
+  dfk_none_via_mto_m_id         bigint not null,
+  dfk_one_id                    bigint not null,
+  constraint pk_dfk_none_via_mto_m_dfk_one primary key (dfk_none_via_mto_m_id,dfk_one_id)
+);
+
 create table dfk_one (
   id                            bigserial not null,
   name                          varchar(255),
@@ -582,16 +825,28 @@ create table document_media_draft (
   constraint pk_document_media_draft primary key (id)
 );
 
+create table sp_car_door (
+  id                            bigint not null,
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_sp_car_door primary key (id)
+);
+create sequence sp_car_door_seq;
+
 create table earray_bean (
   id                            bigserial not null,
+  foo                           integer,
   name                          varchar(255),
   phone_numbers                 varchar[],
   uids                          uuid[],
   other_ids                     bigint[],
   doubs                         float[],
-  statuses                      varchar[],
-  status2                       varchar[],
+  statuses                      integer[],
+  vc_enums                      varchar[],
+  int_enums                     integer[],
+  status2                       integer[],
   version                       bigint not null,
+  constraint ck_earray_bean_foo check ( foo in (100,101,102)),
   constraint pk_earray_bean primary key (id)
 );
 
@@ -674,6 +929,16 @@ create table e_basicenc_bin (
   constraint pk_e_basicenc_bin primary key (id)
 );
 
+create table e_basicenc_client (
+  id                            bigserial not null,
+  name                          varchar(255),
+  description                   bytea,
+  dob                           bytea,
+  status                        bytea,
+  version                       bigint not null,
+  constraint pk_e_basicenc_client primary key (id)
+);
+
 create table e_basic_enum_id (
   status                        varchar(1) not null,
   name                          varchar(255),
@@ -700,6 +965,28 @@ create table ebasic_hstore (
   constraint pk_ebasic_hstore primary key (id)
 );
 
+create table ebasic_json_jackson (
+  id                            bigserial not null,
+  name                          varchar(255),
+  value_set                     json,
+  value_list                    jsonb,
+  value_map                     json,
+  plain_value                   json,
+  version                       bigint not null,
+  constraint pk_ebasic_json_jackson primary key (id)
+);
+
+create table ebasic_json_jackson2 (
+  id                            bigserial not null,
+  name                          varchar(255),
+  value_set                     json,
+  value_list                    jsonb,
+  value_map                     json,
+  plain_value                   json,
+  version                       bigint not null,
+  constraint pk_ebasic_json_jackson2 primary key (id)
+);
+
 create table ebasic_json_list (
   id                            bigserial not null,
   name                          varchar(255),
@@ -852,6 +1139,13 @@ create table e_basic_withlife (
   constraint pk_e_basic_withlife primary key (id)
 );
 
+create table e_basic_with_ex (
+  id                            bigserial not null,
+  deleted                       boolean default false not null,
+  version                       bigint not null,
+  constraint pk_e_basic_with_ex primary key (id)
+);
+
 create table e_basicverucon (
   id                            serial not null,
   name                          varchar(127),
@@ -864,6 +1158,19 @@ create table e_basicverucon (
   constraint pk_e_basicverucon primary key (id)
 );
 
+create table ecache_child (
+  id                            uuid not null,
+  name                          varchar(100),
+  root_id                       uuid not null,
+  constraint pk_ecache_child primary key (id)
+);
+
+create table ecache_root (
+  id                            uuid not null,
+  name                          varchar(100),
+  constraint pk_ecache_root primary key (id)
+);
+
 create table e_col_ab (
   id                            bigserial not null,
   column_a                      varchar(255),
@@ -877,6 +1184,14 @@ create table ecustom_id (
   constraint pk_ecustom_id primary key (id)
 );
 
+create table edefault_prop (
+  id                            serial not null,
+  e_simple_usertypeid           integer,
+  name                          varchar(255),
+  constraint uq_edefault_prop_e_simple_usertypeid unique (e_simple_usertypeid),
+  constraint pk_edefault_prop primary key (id)
+);
+
 create table eemb_inner (
   id                            serial not null,
   nome_inner                    varchar(255),
@@ -894,6 +1209,31 @@ create table eemb_outer (
   constraint pk_eemb_outer primary key (id)
 );
 
+create table efile2_no_fk (
+  file_name                     varchar(64) not null,
+  owner_id                      integer not null,
+  constraint pk_efile2_no_fk primary key (file_name)
+);
+
+create table efile_no_fk (
+  file_name                     varchar(64) not null,
+  owner_user_id                 integer,
+  owner_soft_del_user_id        integer,
+  constraint pk_efile_no_fk primary key (file_name)
+);
+
+create table efile_no_fk_euser_no_fk (
+  efile_no_fk_file_name         varchar(64) not null,
+  euser_no_fk_user_id           integer not null,
+  constraint pk_efile_no_fk_euser_no_fk primary key (efile_no_fk_file_name,euser_no_fk_user_id)
+);
+
+create table efile_no_fk_euser_no_fk_soft_del (
+  efile_no_fk_file_name         varchar(64) not null,
+  euser_no_fk_soft_del_user_id  integer not null,
+  constraint pk_efile_no_fk_euser_no_fk_soft_del primary key (efile_no_fk_file_name,euser_no_fk_soft_del_user_id)
+);
+
 create table egen_props (
   id                            bigserial not null,
   name                          varchar(255),
@@ -985,6 +1325,17 @@ create table eopt_one_c (
   constraint pk_eopt_one_c primary key (id)
 );
 
+create table eper_addr (
+  id                            bigserial not null,
+  name                          varchar(255),
+  ma_street                     varchar(255),
+  ma_suburb                     varchar(255),
+  ma_city                       varchar(255),
+  ma_country_code               varchar(2),
+  version                       bigint not null,
+  constraint pk_eper_addr primary key (id)
+);
+
 create table eperson (
   id                            bigserial not null,
   name                          varchar(255),
@@ -1137,6 +1488,18 @@ create table rawinherit_uncle (
   constraint pk_rawinherit_uncle primary key (id)
 );
 
+create table euser_no_fk (
+  user_id                       serial not null,
+  user_name                     varchar(255),
+  constraint pk_euser_no_fk primary key (user_id)
+);
+
+create table euser_no_fk_soft_del (
+  user_id                       serial not null,
+  user_name                     varchar(255),
+  constraint pk_euser_no_fk_soft_del primary key (user_id)
+);
+
 create table evanilla_collection (
   id                            serial not null,
   name                          varchar(255),
@@ -1164,11 +1527,105 @@ create table ewho_props (
 create table e_withinet (
   id                            bigserial not null,
   name                          varchar(255),
-  inet_address                  varchar(50),
+  inet_address                  inet,
+  inet2                         inet,
+  cdir                          inet,
   version                       bigint not null,
   constraint pk_e_withinet primary key (id)
 );
 
+create table ec_enum_person (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ec_enum_person primary key (id)
+);
+
+create table ec_enum_person_tags (
+  ec_enum_person_id             bigint not null,
+  value                         varchar(5) not null,
+  constraint ck_ec_enum_person_tags_value check ( value in ('RED','BLUE','GREEN'))
+);
+
+create table ec_person (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ec_person primary key (id)
+);
+
+create table ec_person_phone (
+  owner_id                      bigint not null,
+  phone                         varchar(255) not null
+);
+
+create table ecbl_person (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecbl_person primary key (id)
+);
+
+create table ecbl_person_phone_numbers (
+  person_id                     bigint not null,
+  country_code                  varchar(2),
+  area                          varchar(6),
+  number                        varchar(20)
+);
+
+create table ecbm_person (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecbm_person primary key (id)
+);
+
+create table ecbm_person_phone_numbers (
+  person_id                     bigint not null,
+  mkey                          varchar(255) not null,
+  country_code                  varchar(2),
+  area                          varchar(6),
+  number                        varchar(20)
+);
+
+create table ecm_person (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecm_person primary key (id)
+);
+
+create table ecm_person_phone_numbers (
+  ecm_person_id                 bigint not null,
+  type                          varchar(4) not null,
+  number                        varchar(10) not null
+);
+
+create table ecmc_person (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecmc_person primary key (id)
+);
+
+create table ecmc_person_phone_numbers (
+  ecmc_person_id                bigint not null,
+  type                          varchar(4) not null,
+  value                         text not null
+);
+
+create table ecs_person (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecs_person primary key (id)
+);
+
+create table ecs_person_phone (
+  ecs_person_id                 bigint not null,
+  phone                         varchar(255) not null
+);
+
 create table td_child (
   child_id                      serial not null,
   child_name                    varchar(255),
@@ -1192,6 +1649,23 @@ create table empl (
   constraint pk_empl primary key (id)
 );
 
+create table esd_detail (
+  id                            bigserial not null,
+  name                          varchar(255),
+  master_id                     bigint not null,
+  version                       bigint not null,
+  deleted                       boolean default false not null,
+  constraint pk_esd_detail primary key (id)
+);
+
+create table esd_master (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  deleted                       boolean default false not null,
+  constraint pk_esd_master primary key (id)
+);
+
 create table feature_desc (
   id                            serial not null,
   name                          varchar(255),
@@ -1276,6 +1750,7 @@ create table hx_link (
   version                       bigint not null,
   when_created                  timestamptz not null,
   when_modified                 timestamptz not null,
+  deleted                       boolean default false not null,
   constraint pk_hx_link primary key (id)
 );
 
@@ -1311,6 +1786,73 @@ create table hi_link_doc (
   constraint pk_hi_link_doc primary key (hi_link_id,hi_doc_id)
 );
 
+create table hi_tone (
+  id                            bigserial not null,
+  name                          varchar(255),
+  comments                      varchar(255),
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint pk_hi_tone primary key (id)
+);
+
+create table hi_tthree (
+  id                            bigserial not null,
+  hi_ttwo_id                    bigint not null,
+  three                         varchar(255),
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint pk_hi_tthree primary key (id)
+);
+
+create table hi_ttwo (
+  id                            bigserial not null,
+  hi_tone_id                    bigint not null,
+  two                           varchar(255),
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint pk_hi_ttwo primary key (id)
+);
+
+create table hsd_setting (
+  id                            bigserial not null,
+  code                          varchar(255),
+  content                       varchar(255),
+  user_id                       bigint,
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  deleted                       boolean default false not null,
+  constraint uq_hsd_setting_user_id unique (user_id),
+  constraint pk_hsd_setting primary key (id)
+);
+
+create table hsd_user (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  deleted                       boolean default false not null,
+  constraint pk_hsd_user primary key (id)
+);
+
+create table iaf_segment (
+  ptype                         varchar(31) not null,
+  id                            bigserial not null,
+  segment_id_zat                bigint not null,
+  status_id                     bigint not null,
+  constraint pk_iaf_segment primary key (id)
+);
+
+create table iaf_segment_status (
+  id                            bigserial not null,
+  name                          varchar(255),
+  constraint pk_iaf_segment_status primary key (id)
+);
+
 create table imrelated (
   id                            bigserial not null,
   name                          varchar(255),
@@ -1397,6 +1939,20 @@ create table monkey (
   constraint pk_monkey primary key (mid)
 );
 
+create table mkeygroup (
+  pid                           bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_mkeygroup primary key (pid)
+);
+
+create table mkeygroup_monkey (
+  mkeygroup_pid                 bigint not null,
+  monkey_mid                    bigint not null,
+  constraint uq_mkeygroup_monkey_mid unique (monkey_mid),
+  constraint pk_mkeygroup_monkey primary key (mkeygroup_pid,monkey_mid)
+);
+
 create table trainer (
   tid                           bigserial not null,
   name                          varchar(255),
@@ -1521,6 +2077,70 @@ create table la_attr_value_attribute (
   constraint pk_la_attr_value_attribute primary key (la_attr_value_id,attribute_id)
 );
 
+create table looney (
+  id                            bigserial not null,
+  tune_id                       bigint,
+  name                          varchar(255),
+  constraint pk_looney primary key (id)
+);
+
+create table maddress (
+  id                            uuid not null,
+  street                        varchar(255),
+  city                          varchar(255),
+  version                       bigint not null,
+  constraint pk_maddress primary key (id)
+);
+
+create table mcontact (
+  id                            uuid not null,
+  email                         varchar(255),
+  first_name                    varchar(255),
+  last_name                     varchar(255),
+  customer_id                   uuid,
+  version                       bigint not null,
+  constraint pk_mcontact primary key (id)
+);
+
+create table mcontact_message (
+  id                            uuid not null,
+  title                         varchar(255),
+  subject                       varchar(255),
+  notes                         varchar(255),
+  contact_id                    uuid not null,
+  version                       bigint not null,
+  constraint pk_mcontact_message primary key (id)
+);
+
+create table mcustomer (
+  id                            uuid not null,
+  name                          varchar(255),
+  notes                         varchar(255),
+  shipping_address_id           uuid,
+  billing_address_id            uuid,
+  version                       bigint not null,
+  constraint pk_mcustomer primary key (id)
+);
+
+create table mgroup (
+  id                            bigserial not null,
+  name                          varchar(255),
+  constraint pk_mgroup primary key (id)
+);
+
+create table mmachine (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_mmachine primary key (id)
+);
+
+create table mmachine_mgroup (
+  mmachine_id                   bigint not null,
+  mgroup_id                     bigint not null,
+  constraint pk_mmachine_mgroup primary key (mmachine_id,mgroup_id)
+);
+
 create table mmedia (
   type                          varchar(31) not null,
   id                            bigserial not null,
@@ -1633,6 +2253,21 @@ create table mail_user_outbox (
   constraint pk_mail_user_outbox primary key (mail_user_id,mail_box_id)
 );
 
+create table main_entity (
+  id                            varchar(255) not null,
+  attr1                         varchar(255),
+  attr2                         varchar(255),
+  constraint pk_main_entity primary key (id)
+);
+
+create table main_entity_relation (
+  id                            uuid not null,
+  id1                           varchar(255),
+  id2                           varchar(255),
+  attr1                         varchar(255),
+  constraint pk_main_entity_relation primary key (id)
+);
+
 create table map_super_actual (
   id                            bigserial not null,
   name                          varchar(255),
@@ -1653,6 +2288,42 @@ create table c_message (
   constraint pk_c_message primary key (id)
 );
 
+create table meter_address_data (
+  id                            uuid not null,
+  street                        varchar(255) not null,
+  constraint pk_meter_address_data primary key (id)
+);
+
+create table meter_contract_data (
+  id                            uuid not null,
+  special_needs_client_id       uuid not null,
+  constraint uq_meter_contract_data_special_needs_client_id unique (special_needs_client_id),
+  constraint pk_meter_contract_data primary key (id)
+);
+
+create table meter_special_needs_client (
+  id                            uuid not null,
+  name                          varchar(255),
+  primary_id                    uuid,
+  constraint uq_meter_special_needs_client_primary_id unique (primary_id),
+  constraint pk_meter_special_needs_client primary key (id)
+);
+
+create table meter_special_needs_contact (
+  id                            uuid not null,
+  name                          varchar(255),
+  constraint pk_meter_special_needs_contact primary key (id)
+);
+
+create table meter_version (
+  id                            uuid not null,
+  address_data_id               uuid,
+  contract_data_id              uuid not null,
+  constraint uq_meter_version_address_data_id unique (address_data_id),
+  constraint uq_meter_version_contract_data_id unique (contract_data_id),
+  constraint pk_meter_version primary key (id)
+);
+
 create table mnoc_role (
   role_id                       serial not null,
   role_name                     varchar(255),
@@ -1802,6 +2473,15 @@ create table o_cached_bean_child (
   constraint pk_o_cached_bean_child primary key (id)
 );
 
+create table o_cached_inherit (
+  dtype                         varchar(31) not null,
+  id                            bigserial not null,
+  name                          varchar(255),
+  child_adata                   varchar(255),
+  child_bdata                   varchar(255),
+  constraint pk_o_cached_inherit primary key (id)
+);
+
 create table o_cached_natkey (
   id                            bigserial not null,
   store                         varchar(255),
@@ -1884,6 +2564,11 @@ create table om_ordered_master (
   constraint pk_om_ordered_master primary key (id)
 );
 
+create table only_id_entity (
+  id                            bigserial not null,
+  constraint pk_only_id_entity primary key (id)
+);
+
 create table o_order (
   id                            serial not null,
   status                        integer,
@@ -1941,8 +2626,68 @@ create table organisation (
   constraint pk_organisation primary key (id)
 );
 
+create table organization_node (
+  kind                          varchar(31) not null,
+  id                            bigserial not null,
+  parent_tree_node_id           bigint not null,
+  title                         varchar(255),
+  constraint uq_organization_node_parent_tree_node_id unique (parent_tree_node_id),
+  constraint pk_organization_node primary key (id)
+);
+
+create table organization_tree_node (
+  id                            bigserial not null,
+  name                          varchar(255),
+  constraint pk_organization_tree_node primary key (id)
+);
+
+create table orp_detail (
+  id                            varchar(100) not null,
+  detail                        varchar(255),
+  master_id                     varchar(100),
+  version                       bigint not null,
+  constraint pk_orp_detail primary key (id)
+);
+
+create table orp_detail2 (
+  id                            varchar(100) not null,
+  orp_master2_id                varchar(100) not null,
+  detail                        varchar(255),
+  master_id                     varchar(255),
+  version                       bigint not null,
+  constraint pk_orp_detail2 primary key (id)
+);
+
+create table orp_master (
+  id                            varchar(100) not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_orp_master primary key (id)
+);
+
+create table orp_master2 (
+  id                            varchar(100) not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_orp_master2 primary key (id)
+);
+
+create table oto_aone (
+  id                            varchar(100) not null,
+  description                   varchar(255),
+  constraint pk_oto_aone primary key (id)
+);
+
+create table oto_atwo (
+  id                            varchar(100) not null,
+  description                   varchar(255),
+  aone_id                       varchar(100),
+  constraint uq_oto_atwo_aone_id unique (aone_id),
+  constraint pk_oto_atwo primary key (id)
+);
+
 create table oto_bchild (
-  master_id                     bigserial not null,
+  master_id                     bigint not null,
   child                         varchar(255),
   constraint pk_oto_bchild primary key (master_id)
 );
@@ -1979,6 +2724,28 @@ create table oto_cust_address (
   constraint pk_oto_cust_address primary key (aid)
 );
 
+create table oto_level_a (
+  id                            bigserial not null,
+  name                          varchar(255),
+  b_id                          bigint,
+  constraint uq_oto_level_a_b_id unique (b_id),
+  constraint pk_oto_level_a primary key (id)
+);
+
+create table oto_level_b (
+  id                            bigserial not null,
+  name                          varchar(255),
+  c_id                          bigint,
+  constraint uq_oto_level_b_c_id unique (c_id),
+  constraint pk_oto_level_b primary key (id)
+);
+
+create table oto_level_c (
+  id                            bigserial not null,
+  name                          varchar(255),
+  constraint pk_oto_level_c primary key (id)
+);
+
 create table oto_master (
   id                            bigserial not null,
   name                          varchar(255),
@@ -1999,6 +2766,23 @@ create table oto_prime_extra (
   constraint pk_oto_prime_extra primary key (eid)
 );
 
+create table oto_sd_child (
+  id                            bigserial not null,
+  child                         varchar(255),
+  master_id                     bigint,
+  deleted                       boolean default false not null,
+  version                       bigint not null,
+  constraint uq_oto_sd_child_master_id unique (master_id),
+  constraint pk_oto_sd_child primary key (id)
+);
+
+create table oto_sd_master (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_sd_master primary key (id)
+);
+
 create table oto_th_many (
   id                            bigserial not null,
   oto_th_top_id                 bigint not null,
@@ -2057,6 +2841,26 @@ create table oto_uprime_extra (
   constraint pk_oto_uprime_extra primary key (eid)
 );
 
+create table oto_user_model (
+  id                            bigserial not null,
+  name                          varchar(255),
+  user_optional_id              bigint,
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint uq_oto_user_model_user_optional_id unique (user_optional_id),
+  constraint pk_oto_user_model primary key (id)
+);
+
+create table oto_user_model_optional (
+  id                            bigserial not null,
+  optional                      varchar(255),
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint pk_oto_user_model_optional primary key (id)
+);
+
 create table pfile (
   id                            serial not null,
   name                          varchar(255),
@@ -2121,6 +2925,12 @@ create table rawinherit_parent_rawinherit_data (
   constraint pk_rawinherit_parent_rawinherit_data primary key (rawinherit_parent_id,rawinherit_data_id)
 );
 
+create table e_save_test_c (
+  id                            bigserial not null,
+  version                       bigint not null,
+  constraint pk_e_save_test_c primary key (id)
+);
+
 create table parent_person (
   identifier                    serial not null,
   name                          varchar(255),
@@ -2145,6 +2955,20 @@ create table c_participation (
   constraint pk_c_participation primary key (id)
 );
 
+create table password_store_model (
+  id                            bigserial not null,
+  enc1                          varchar(30),
+  enc2                          varchar(40),
+  enc3                          text,
+  enc4                          bytea,
+  enc5                          bytea,
+  enc6                          bytea,
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint pk_password_store_model primary key (id)
+);
+
 create table mt_permission (
   id                            uuid not null,
   name                          varchar(255),
@@ -2171,6 +2995,13 @@ create table persistent_file_content (
   constraint pk_persistent_file_content primary key (id)
 );
 
+create table person (
+  oid                           bigserial not null,
+  default_address_oid           bigint,
+  version                       integer not null,
+  constraint pk_person primary key (oid)
+);
+
 create table persons (
   id                            bigserial not null,
   surname                       varchar(64) not null,
@@ -2178,11 +3009,17 @@ create table persons (
   constraint pk_persons primary key (id)
 );
 
-create table person (
-  oid                           bigserial not null,
-  default_address_oid           bigint,
-  version                       integer not null,
-  constraint pk_person primary key (oid)
+create table person_cache_email (
+  id                            varchar(128) not null,
+  person_info_person_id         varchar(128),
+  email                         varchar(255),
+  constraint pk_person_cache_email primary key (id)
+);
+
+create table person_cache_info (
+  person_id                     varchar(128) not null,
+  name                          varchar(255),
+  constraint pk_person_cache_info primary key (person_id)
 );
 
 create table phones (
@@ -2193,6 +3030,13 @@ create table phones (
   constraint pk_phones primary key (id)
 );
 
+create table e_position (
+  id                            bigserial not null,
+  name                          varchar(255),
+  contract_id                   bigint not null,
+  constraint pk_e_position primary key (id)
+);
+
 create table primary_revision (
   id                            bigint not null,
   revision                      integer not null,
@@ -2254,6 +3098,21 @@ create table region (
   constraint pk_region primary key (customer,type)
 );
 
+create table rel_detail (
+  id                            bigserial not null,
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_rel_detail primary key (id)
+);
+
+create table rel_master (
+  id                            bigserial not null,
+  name                          varchar(255),
+  detail_id                     bigint,
+  version                       integer not null,
+  constraint pk_rel_master primary key (id)
+);
+
 create table resourcefile (
   id                            varchar(64) not null,
   parentresourcefileid          varchar(64),
@@ -2261,12 +3120,6 @@ create table resourcefile (
   constraint pk_resourcefile primary key (id)
 );
 
-create table em_role (
-  id                            bigserial not null,
-  name                          varchar(255),
-  constraint pk_em_role primary key (id)
-);
-
 create table mt_role (
   id                            uuid not null,
   name                          varchar(50),
@@ -2281,6 +3134,12 @@ create table mt_role_permission (
   constraint pk_mt_role_permission primary key (mt_role_id,mt_permission_id)
 );
 
+create table em_role (
+  id                            bigserial not null,
+  name                          varchar(255),
+  constraint pk_em_role primary key (id)
+);
+
 create table f_second (
   id                            bigserial not null,
   mod_name                      varchar(255),
@@ -2324,6 +3183,40 @@ create table self_ref_example (
   constraint pk_self_ref_example primary key (id)
 );
 
+create table e_save_test_a (
+  id                            bigserial not null,
+  version                       bigint not null,
+  constraint pk_e_save_test_a primary key (id)
+);
+
+create table e_save_test_b (
+  id                            bigserial not null,
+  sibling_a_id                  bigint,
+  test_property                 boolean default false not null,
+  version                       bigint not null,
+  constraint uq_e_save_test_b_sibling_a_id unique (sibling_a_id),
+  constraint pk_e_save_test_b primary key (id)
+);
+
+create table site (
+  id                            uuid not null,
+  name                          varchar(255),
+  parent_id                     uuid,
+  data_container_id             uuid,
+  site_address_id               uuid,
+  constraint uq_site_data_container_id unique (data_container_id),
+  constraint uq_site_site_address_id unique (site_address_id),
+  constraint pk_site primary key (id)
+);
+
+create table site_address (
+  id                            uuid not null,
+  street                        varchar(255),
+  city                          varchar(255),
+  zip_code                      varchar(255),
+  constraint pk_site_address primary key (id)
+);
+
 create table some_enum_bean (
   id                            bigserial not null,
   some_enum                     integer,
@@ -2346,15 +3239,19 @@ create table some_new_types_bean (
   mth                           integer,
   yr                            integer,
   yr_mth                        date,
+  month_day                     date,
+  sql_date                      date,
   local_date                    date,
   local_date_time               timestamptz,
   offset_date_time              timestamptz,
   zoned_date_time               timestamptz,
+  local_time                    time,
   instant                       timestamptz,
   zone_id                       varchar(60),
   zone_offset                   varchar(60),
   path                          varchar(255),
   period                        varchar(20),
+  duration                      bigint,
   version                       bigint not null,
   constraint ck_some_new_types_bean_dow check ( dow in (1,2,3,4,5,6,7)),
   constraint ck_some_new_types_bean_mth check ( mth in (1,2,3,4,5,6,7,8,9,10,11,12)),
@@ -2577,7 +3474,13 @@ create table truck_ref (
   constraint pk_truck_ref primary key (id)
 );
 
-create table type (
+create table tune (
+  id                            bigserial not null,
+  name                          varchar(255),
+  constraint pk_tune primary key (id)
+);
+
+create table "type" (
   customer                      integer not null,
   type                          integer not null,
   description                   varchar(255),
@@ -2594,6 +3497,27 @@ create table tz_bean (
   constraint pk_tz_bean primary key (id)
 );
 
+create table usib_child (
+  id                            uuid not null,
+  parent_id                     bigint,
+  deleted                       boolean default false not null,
+  constraint pk_usib_child primary key (id)
+);
+
+create table usib_child_sibling (
+  id                            bigserial not null,
+  child_id                      uuid,
+  deleted                       boolean default false not null,
+  constraint uq_usib_child_sibling_child_id unique (child_id),
+  constraint pk_usib_child_sibling primary key (id)
+);
+
+create table usib_parent (
+  id                            bigserial not null,
+  deleted                       boolean default false not null,
+  constraint pk_usib_parent primary key (id)
+);
+
 create table ut_detail (
   id                            serial not null,
   utmaster_id                   integer not null,
@@ -2608,6 +3532,7 @@ create table ut_master (
   id                            serial not null,
   name                          varchar(255),
   description                   varchar(255),
+  date                          date,
   version                       integer not null,
   constraint pk_ut_master primary key (id)
 );
@@ -2615,16 +3540,31 @@ create table ut_master (
 create table uuone (
   id                            uuid not null,
   name                          varchar(255),
+  description                   varchar(255),
+  version                       bigint not null,
   constraint pk_uuone primary key (id)
 );
 
 create table uutwo (
   id                            uuid not null,
   name                          varchar(255),
+  notes                         varchar(255),
   master_id                     uuid,
+  version                       bigint not null,
   constraint pk_uutwo primary key (id)
 );
 
+create table oto_user (
+  id                            bigserial not null,
+  name                          varchar(255),
+  account_id                    bigint not null,
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint uq_oto_user_account_id unique (account_id),
+  constraint pk_oto_user primary key (id)
+);
+
 create table c_user (
   id                            bigserial not null,
   inactive                      boolean default false not null,
@@ -2657,17 +3597,6 @@ create table em_user (
   constraint pk_em_user primary key (id)
 );
 
-create table oto_user (
-  id                            bigserial not null,
-  name                          varchar(255),
-  account_id                    bigint not null,
-  version                       bigint not null,
-  when_created                  timestamptz not null,
-  when_modified                 timestamptz not null,
-  constraint uq_oto_user_account_id unique (account_id),
-  constraint pk_oto_user primary key (id)
-);
-
 create table em_user_role (
   user_id                       bigint not null,
   role_id                       bigint not null,
@@ -2679,10 +3608,11 @@ create table vehicle (
   id                            serial not null,
   license_number                varchar(255),
   registration_date             timestamptz,
+  lease_id                      bigint,
   cretime                       timestamptz not null,
   updtime                       timestamptz not null,
   version                       bigint not null,
-  siz                           varchar(1),
+  siz                           varchar(3),
   driver                        varchar(255),
   car_ref_id                    integer,
   notes                         varchar(255),
@@ -2704,6 +3634,20 @@ create table vehicle_driver (
   constraint pk_vehicle_driver primary key (id)
 );
 
+create table vehicle_lease (
+  dtype                         varchar(31) not null,
+  id                            bigserial not null,
+  name                          varchar(255),
+  active_start                  date,
+  active_end                    date,
+  version                       bigint not null,
+  bond                          decimal(38),
+  min_duration                  integer not null,
+  day_rate                      decimal(38),
+  max_days                      integer,
+  constraint pk_vehicle_lease primary key (id)
+);
+
 create table warehouses (
   id                            serial not null,
   officezoneid                  integer,
@@ -2716,6 +3660,13 @@ create table warehousesshippingzones (
   constraint pk_warehousesshippingzones primary key (warehouseid,shippingzoneid)
 );
 
+create table wheel (
+  id                            bigint not null,
+  version                       integer not null,
+  constraint pk_wheel primary key (id)
+);
+create sequence wheel_seq;
+
 create table sa_wheel (
   id                            bigint not null,
   tire                          bigint,
@@ -2725,15 +3676,9 @@ create table sa_wheel (
 );
 create sequence sa_wheel_seq;
 
-create table wheel (
-  id                            bigint not null,
-  version                       integer not null,
-  constraint pk_wheel primary key (id)
-);
-create sequence wheel_seq;
-
 create table sp_car_wheel (
   id                            bigint not null,
+  name                          varchar(255),
   version                       integer not null,
   constraint pk_sp_car_wheel primary key (id)
 );
@@ -2781,9 +3726,17 @@ create table zones (
 
 create index ix_contact_last_name_first_name on contact (last_name,first_name);
 create index ix_e_basic_name on e_basic (name);
+create index ix_efile2_no_fk_owner_id on efile2_no_fk (owner_id);
+create index ix_organization_node_kind on organization_node (kind);
 create index ix_bar_foo_id on bar (foo_id);
 alter table bar add constraint fk_bar_foo_id foreign key (foo_id) references foo (foo_id) on delete restrict on update restrict;
 
+create index ix_acl_container_relation_container_id on acl_container_relation (container_id);
+alter table acl_container_relation add constraint fk_acl_container_relation_container_id foreign key (container_id) references contract (id) on delete restrict on update restrict;
+
+create index ix_acl_container_relation_acl_entry_id on acl_container_relation (acl_entry_id);
+alter table acl_container_relation add constraint fk_acl_container_relation_acl_entry_id foreign key (acl_entry_id) references acl (id) on delete restrict on update restrict;
+
 create index ix_addr_employee_id on addr (employee_id);
 alter table addr add constraint fk_addr_employee_id foreign key (employee_id) references empl (id) on delete restrict on update restrict;
 
@@ -2801,11 +3754,14 @@ alter table attribute add constraint fk_attribute_attribute_holder_id foreign ke
 create index ix_bbookmark_user_id on bbookmark (user_id);
 alter table bbookmark add constraint fk_bbookmark_user_id foreign key (user_id) references bbookmark_user (id) on delete restrict on update restrict;
 
-create index ix_bsite_user_site_id on bsite_user (site_id);
-alter table bsite_user add constraint fk_bsite_user_site_id foreign key (site_id) references bsite (id) on delete restrict on update restrict;
+create index ix_bbookmark_user_org_id on bbookmark_user (org_id);
+alter table bbookmark_user add constraint fk_bbookmark_user_org_id foreign key (org_id) references bbookmark_org (id) on delete restrict on update restrict;
 
-create index ix_bsite_user_user_id on bsite_user (user_id);
-alter table bsite_user add constraint fk_bsite_user_user_id foreign key (user_id) references buser (id) on delete restrict on update restrict;
+create index ix_bsite_user_a_site_id on bsite_user_a (site_id);
+alter table bsite_user_a add constraint fk_bsite_user_a_site_id foreign key (site_id) references bsite (id) on delete restrict on update restrict;
+
+create index ix_bsite_user_a_user_id on bsite_user_a (user_id);
+alter table bsite_user_a add constraint fk_bsite_user_a_user_id foreign key (user_id) references buser (id) on delete restrict on update restrict;
 
 create index ix_bsite_user_b_site on bsite_user_b (site);
 alter table bsite_user_b add constraint fk_bsite_user_b_site foreign key (site) references bsite (id) on delete restrict on update restrict;
@@ -2819,10 +3775,27 @@ alter table bsite_user_c add constraint fk_bsite_user_c_site_uid foreign key (si
 create index ix_bsite_user_c_user_uid on bsite_user_c (user_uid);
 alter table bsite_user_c add constraint fk_bsite_user_c_user_uid foreign key (user_uid) references buser (id) on delete restrict on update restrict;
 
+create index ix_bsite_user_e_site_id on bsite_user_e (site_id);
+alter table bsite_user_e add constraint fk_bsite_user_e_site_id foreign key (site_id) references bsite (id) on delete restrict on update restrict;
+
+create index ix_bsite_user_e_user_id on bsite_user_e (user_id);
+alter table bsite_user_e add constraint fk_bsite_user_e_user_id foreign key (user_id) references buser (id) on delete restrict on update restrict;
+
+alter table basic_draftable_bean add constraint fk_basic_draftable_bean_id foreign key (id) references basic_draftable_bean_draft (id) on delete restrict on update restrict;
+
 alter table drel_booking add constraint fk_drel_booking_agent_invoice foreign key (agent_invoice) references drel_invoice (id) on delete restrict on update restrict;
 
 alter table drel_booking add constraint fk_drel_booking_client_invoice foreign key (client_invoice) references drel_invoice (id) on delete restrict on update restrict;
 
+create index ix_cepproduct_category_category_id on cepproduct_category (category_id);
+alter table cepproduct_category add constraint fk_cepproduct_category_category_id foreign key (category_id) references cepcategory (id) on delete restrict on update restrict;
+
+create index ix_cepproduct_category_product_id on cepproduct_category (product_id);
+alter table cepproduct_category add constraint fk_cepproduct_category_product_id foreign key (product_id) references cepproduct (id) on delete restrict on update restrict;
+
+create index ix_cinh_ref_ref_id on cinh_ref (ref_id);
+alter table cinh_ref add constraint fk_cinh_ref_ref_id foreign key (ref_id) references cinh_root (id) on delete restrict on update restrict;
+
 create index ix_ckey_detail_parent on ckey_detail (one_key,two_key);
 alter table ckey_detail add constraint fk_ckey_detail_parent foreign key (one_key,two_key) references ckey_parent (one_key,two_key) on delete restrict on update restrict;
 
@@ -2841,6 +3814,12 @@ alter table sp_car_car_wheels add constraint fk_sp_car_car_wheels_sp_car_car for
 create index ix_sp_car_car_wheels_sp_car_wheel on sp_car_car_wheels (wheel);
 alter table sp_car_car_wheels add constraint fk_sp_car_car_wheels_sp_car_wheel foreign key (wheel) references sp_car_wheel (id) on delete restrict on update restrict;
 
+create index ix_sp_car_car_doors_sp_car_car on sp_car_car_doors (car);
+alter table sp_car_car_doors add constraint fk_sp_car_car_doors_sp_car_car foreign key (car) references sp_car_car (id) on delete restrict on update restrict;
+
+create index ix_sp_car_car_doors_sp_car_door on sp_car_car_doors (door);
+alter table sp_car_car_doors add constraint fk_sp_car_car_doors_sp_car_door foreign key (door) references sp_car_door (id) on delete restrict on update restrict;
+
 create index ix_car_accessory_fuse_id on car_accessory (fuse_id);
 alter table car_accessory add constraint fk_car_accessory_fuse_id foreign key (fuse_id) references car_fuse (id) on delete restrict on update restrict;
 
@@ -2850,12 +3829,21 @@ alter table car_accessory add constraint fk_car_accessory_car_id foreign key (ca
 create index ix_category_surveyobjectid on category (surveyobjectid);
 alter table category add constraint fk_category_surveyobjectid foreign key (surveyobjectid) references survey (id) on delete restrict on update restrict;
 
+alter table e_save_test_d add constraint fk_e_save_test_d_parent_id foreign key (parent_id) references e_save_test_c (id) on delete restrict on update restrict;
+
 create index ix_child_person_some_bean_id on child_person (some_bean_id);
 alter table child_person add constraint fk_child_person_some_bean_id foreign key (some_bean_id) references e_basic (id) on delete restrict on update restrict;
 
 create index ix_child_person_parent_identifier on child_person (parent_identifier);
 alter table child_person add constraint fk_child_person_parent_identifier foreign key (parent_identifier) references parent_person (identifier) on delete restrict on update restrict;
 
+create index ix_cke_client_user on cke_client (username,cod_cpny);
+alter table cke_client add constraint fk_cke_client_user foreign key (username,cod_cpny) references cke_user (username,cod_cpny) on delete restrict on update restrict;
+
+alter table class_super_monkey add constraint fk_class_super_monkey_class_super foreign key (class_super_sid) references class_super (sid) on delete restrict on update restrict;
+
+alter table class_super_monkey add constraint fk_class_super_monkey_monkey foreign key (monkey_mid) references monkey (mid) on delete restrict on update restrict;
+
 create index ix_configuration_configurations_id on configuration (configurations_id);
 alter table configuration add constraint fk_configuration_configurations_id foreign key (configurations_id) references configurations (id) on delete restrict on update restrict;
 
@@ -2868,6 +3856,9 @@ alter table contact add constraint fk_contact_group_id foreign key (group_id) re
 create index ix_contact_note_contact_id on contact_note (contact_id);
 alter table contact_note add constraint fk_contact_note_contact_id foreign key (contact_id) references contact (id) on delete restrict on update restrict;
 
+create index ix_contract_costs_position_id on contract_costs (position_id);
+alter table contract_costs add constraint fk_contract_costs_position_id foreign key (position_id) references e_position (id) on delete restrict on update restrict;
+
 create index ix_c_conversation_group_id on c_conversation (group_id);
 alter table c_conversation add constraint fk_c_conversation_group_id foreign key (group_id) references c_group (id) on delete restrict on update restrict;
 
@@ -2883,12 +3874,27 @@ alter table dcredit_drol add constraint fk_dcredit_drol_dcredit foreign key (dcr
 create index ix_dcredit_drol_drol on dcredit_drol (drol_id);
 alter table dcredit_drol add constraint fk_dcredit_drol_drol foreign key (drol_id) references drol (id) on delete restrict on update restrict;
 
+create index ix_dmachine_organisation_id on dmachine (organisation_id);
+alter table dmachine add constraint fk_dmachine_organisation_id foreign key (organisation_id) references dorg (id) on delete restrict on update restrict;
+
+create index ix_d_machine_aux_use_machine_id on d_machine_aux_use (machine_id);
+alter table d_machine_aux_use add constraint fk_d_machine_aux_use_machine_id foreign key (machine_id) references dmachine (id) on delete restrict on update restrict;
+
+create index ix_d_machine_stats_machine_id on d_machine_stats (machine_id);
+alter table d_machine_stats add constraint fk_d_machine_stats_machine_id foreign key (machine_id) references dmachine (id) on delete restrict on update restrict;
+
+create index ix_d_machine_use_machine_id on d_machine_use (machine_id);
+alter table d_machine_use add constraint fk_d_machine_use_machine_id foreign key (machine_id) references dmachine (id) on delete restrict on update restrict;
+
 create index ix_drot_drol_drot on drot_drol (drot_id);
 alter table drot_drol add constraint fk_drot_drol_drot foreign key (drot_id) references drot (id) on delete restrict on update restrict;
 
 create index ix_drot_drol_drol on drot_drol (drol_id);
 alter table drot_drol add constraint fk_drot_drol_drol foreign key (drol_id) references drol (id) on delete restrict on update restrict;
 
+create index ix_dc_detail_master_id on dc_detail (master_id);
+alter table dc_detail add constraint fk_dc_detail_master_id foreign key (master_id) references dc_master (id) on delete restrict on update restrict;
+
 create index ix_dfk_cascade_one_id on dfk_cascade (one_id);
 alter table dfk_cascade add constraint fk_dfk_cascade_one_id foreign key (one_id) references dfk_cascade_one (id) on delete cascade on update cascade;
 
@@ -2926,6 +3932,11 @@ alter table ebasic_no_sdchild add constraint fk_ebasic_no_sdchild_owner_id forei
 create index ix_ebasic_sdchild_owner_id on ebasic_sdchild (owner_id);
 alter table ebasic_sdchild add constraint fk_ebasic_sdchild_owner_id foreign key (owner_id) references ebasic_soft_delete (id) on delete restrict on update restrict;
 
+create index ix_ecache_child_root_id on ecache_child (root_id);
+alter table ecache_child add constraint fk_ecache_child_root_id foreign key (root_id) references ecache_root (id) on delete restrict on update restrict;
+
+alter table edefault_prop add constraint fk_edefault_prop_e_simple_usertypeid foreign key (e_simple_usertypeid) references esimple (usertypeid) on delete restrict on update restrict;
+
 create index ix_eemb_inner_outer_id on eemb_inner (outer_id);
 alter table eemb_inner add constraint fk_eemb_inner_outer_id foreign key (outer_id) references eemb_outer (id) on delete restrict on update restrict;
 
@@ -2941,6 +3952,9 @@ alter table eopt_one_a add constraint fk_eopt_one_a_b_id foreign key (b_id) refe
 create index ix_eopt_one_b_c_id on eopt_one_b (c_id);
 alter table eopt_one_b add constraint fk_eopt_one_b_c_id foreign key (c_id) references eopt_one_c (id) on delete restrict on update restrict;
 
+create index ix_eper_addr_ma_country_code on eper_addr (ma_country_code);
+alter table eper_addr add constraint fk_eper_addr_ma_country_code foreign key (ma_country_code) references o_country (code) on delete restrict on update restrict;
+
 create index ix_esoft_del_book_lend_by_id on esoft_del_book (lend_by_id);
 alter table esoft_del_book add constraint fk_esoft_del_book_lend_by_id foreign key (lend_by_id) references esoft_del_user (id) on delete restrict on update restrict;
 
@@ -2979,12 +3993,36 @@ alter table rawinherit_uncle add constraint fk_rawinherit_uncle_parent_id foreig
 create index ix_evanilla_collection_detail_evanilla_collection_id on evanilla_collection_detail (evanilla_collection_id);
 alter table evanilla_collection_detail add constraint fk_evanilla_collection_detail_evanilla_collection_id foreign key (evanilla_collection_id) references evanilla_collection (id) on delete restrict on update restrict;
 
+create index ix_ec_enum_person_tags_ec_enum_person_id on ec_enum_person_tags (ec_enum_person_id);
+alter table ec_enum_person_tags add constraint fk_ec_enum_person_tags_ec_enum_person_id foreign key (ec_enum_person_id) references ec_enum_person (id) on delete restrict on update restrict;
+
+create index ix_ec_person_phone_owner_id on ec_person_phone (owner_id);
+alter table ec_person_phone add constraint fk_ec_person_phone_owner_id foreign key (owner_id) references ec_person (id) on delete restrict on update restrict;
+
+create index ix_ecbl_person_phone_numbers_person_id on ecbl_person_phone_numbers (person_id);
+alter table ecbl_person_phone_numbers add constraint fk_ecbl_person_phone_numbers_person_id foreign key (person_id) references ecbl_person (id) on delete restrict on update restrict;
+
+create index ix_ecbm_person_phone_numbers_person_id on ecbm_person_phone_numbers (person_id);
+alter table ecbm_person_phone_numbers add constraint fk_ecbm_person_phone_numbers_person_id foreign key (person_id) references ecbm_person (id) on delete restrict on update restrict;
+
+create index ix_ecm_person_phone_numbers_ecm_person_id on ecm_person_phone_numbers (ecm_person_id);
+alter table ecm_person_phone_numbers add constraint fk_ecm_person_phone_numbers_ecm_person_id foreign key (ecm_person_id) references ecm_person (id) on delete restrict on update restrict;
+
+create index ix_ecmc_person_phone_numbers_ecmc_person_id on ecmc_person_phone_numbers (ecmc_person_id);
+alter table ecmc_person_phone_numbers add constraint fk_ecmc_person_phone_numbers_ecmc_person_id foreign key (ecmc_person_id) references ecmc_person (id) on delete restrict on update restrict;
+
+create index ix_ecs_person_phone_ecs_person_id on ecs_person_phone (ecs_person_id);
+alter table ecs_person_phone add constraint fk_ecs_person_phone_ecs_person_id foreign key (ecs_person_id) references ecs_person (id) on delete restrict on update restrict;
+
 create index ix_td_child_parent_id on td_child (parent_id);
 alter table td_child add constraint fk_td_child_parent_id foreign key (parent_id) references td_parent (parent_id) on delete restrict on update restrict;
 
 create index ix_empl_default_address_id on empl (default_address_id);
 alter table empl add constraint fk_empl_default_address_id foreign key (default_address_id) references addr (id) on delete restrict on update restrict;
 
+create index ix_esd_detail_master_id on esd_detail (master_id);
+alter table esd_detail add constraint fk_esd_detail_master_id foreign key (master_id) references esd_master (id) on delete restrict on update restrict;
+
 create index ix_grand_parent_person_some_bean_id on grand_parent_person (some_bean_id);
 alter table grand_parent_person add constraint fk_grand_parent_person_some_bean_id foreign key (some_bean_id) references e_basic (id) on delete restrict on update restrict;
 
@@ -3003,6 +4041,17 @@ alter table hi_link_doc add constraint fk_hi_link_doc_hi_link foreign key (hi_li
 create index ix_hi_link_doc_hi_doc on hi_link_doc (hi_doc_id);
 alter table hi_link_doc add constraint fk_hi_link_doc_hi_doc foreign key (hi_doc_id) references hi_doc (id) on delete restrict on update restrict;
 
+create index ix_hi_tthree_hi_ttwo_id on hi_tthree (hi_ttwo_id);
+alter table hi_tthree add constraint fk_hi_tthree_hi_ttwo_id foreign key (hi_ttwo_id) references hi_ttwo (id) on delete restrict on update restrict;
+
+create index ix_hi_ttwo_hi_tone_id on hi_ttwo (hi_tone_id);
+alter table hi_ttwo add constraint fk_hi_ttwo_hi_tone_id foreign key (hi_tone_id) references hi_tone (id) on delete restrict on update restrict;
+
+alter table hsd_setting add constraint fk_hsd_setting_user_id foreign key (user_id) references hsd_user (id) on delete restrict on update restrict;
+
+create index ix_iaf_segment_status_id on iaf_segment (status_id);
+alter table iaf_segment add constraint fk_iaf_segment_status_id foreign key (status_id) references iaf_segment_status (id) on delete restrict on update restrict;
+
 create index ix_imrelated_owner_id on imrelated (owner_id);
 alter table imrelated add constraint fk_imrelated_owner_id foreign key (owner_id) references imroot (id) on delete restrict on update restrict;
 
@@ -3017,11 +4066,15 @@ create index ix_drel_invoice_booking on drel_invoice (booking);
 alter table drel_invoice add constraint fk_drel_invoice_booking foreign key (booking) references drel_booking (id) on delete restrict on update restrict;
 
 create index ix_item_etype on item (customer,type);
-alter table item add constraint fk_item_etype foreign key (customer,type) references type (customer,type) on delete restrict on update restrict;
+alter table item add constraint fk_item_etype foreign key (customer,type) references "type" (customer,type) on delete restrict on update restrict;
 
 create index ix_item_eregion on item (customer,region);
 alter table item add constraint fk_item_eregion foreign key (customer,region) references region (customer,type) on delete restrict on update restrict;
 
+alter table mkeygroup_monkey add constraint fk_mkeygroup_monkey_mkeygroup foreign key (mkeygroup_pid) references mkeygroup (pid) on delete restrict on update restrict;
+
+alter table mkeygroup_monkey add constraint fk_mkeygroup_monkey_monkey foreign key (monkey_mid) references monkey (mid) on delete restrict on update restrict;
+
 alter table trainer_monkey add constraint fk_trainer_monkey_trainer foreign key (trainer_tid) references trainer (tid) on delete restrict on update restrict;
 
 alter table trainer_monkey add constraint fk_trainer_monkey_monkey foreign key (monkey_mid) references monkey (mid) on delete restrict on update restrict;
@@ -3059,6 +4112,27 @@ alter table la_attr_value_attribute add constraint fk_la_attr_value_attribute_la
 create index ix_la_attr_value_attribute_attribute on la_attr_value_attribute (attribute_id);
 alter table la_attr_value_attribute add constraint fk_la_attr_value_attribute_attribute foreign key (attribute_id) references attribute (id) on delete restrict on update restrict;
 
+create index ix_looney_tune_id on looney (tune_id);
+alter table looney add constraint fk_looney_tune_id foreign key (tune_id) references tune (id) on delete restrict on update restrict;
+
+create index ix_mcontact_customer_id on mcontact (customer_id);
+alter table mcontact add constraint fk_mcontact_customer_id foreign key (customer_id) references mcustomer (id) on delete restrict on update restrict;
+
+create index ix_mcontact_message_contact_id on mcontact_message (contact_id);
+alter table mcontact_message add constraint fk_mcontact_message_contact_id foreign key (contact_id) references mcontact (id) on delete restrict on update restrict;
+
+create index ix_mcustomer_shipping_address_id on mcustomer (shipping_address_id);
+alter table mcustomer add constraint fk_mcustomer_shipping_address_id foreign key (shipping_address_id) references maddress (id) on delete restrict on update restrict;
+
+create index ix_mcustomer_billing_address_id on mcustomer (billing_address_id);
+alter table mcustomer add constraint fk_mcustomer_billing_address_id foreign key (billing_address_id) references maddress (id) on delete restrict on update restrict;
+
+create index ix_mmachine_mgroup_mmachine on mmachine_mgroup (mmachine_id);
+alter table mmachine_mgroup add constraint fk_mmachine_mgroup_mmachine foreign key (mmachine_id) references mmachine (id) on delete restrict on update restrict;
+
+create index ix_mmachine_mgroup_mgroup on mmachine_mgroup (mgroup_id);
+alter table mmachine_mgroup add constraint fk_mmachine_mgroup_mgroup foreign key (mgroup_id) references mgroup (id) on delete restrict on update restrict;
+
 create index ix_mprinter_current_state_id on mprinter (current_state_id);
 alter table mprinter add constraint fk_mprinter_current_state_id foreign key (current_state_id) references mprinter_state (id) on delete restrict on update restrict;
 
@@ -3103,6 +4177,14 @@ alter table c_message add constraint fk_c_message_conversation_id foreign key (c
 create index ix_c_message_user_id on c_message (user_id);
 alter table c_message add constraint fk_c_message_user_id foreign key (user_id) references c_user (id) on delete restrict on update restrict;
 
+alter table meter_contract_data add constraint fk_meter_contract_data_special_needs_client_id foreign key (special_needs_client_id) references meter_special_needs_client (id) on delete restrict on update restrict;
+
+alter table meter_special_needs_client add constraint fk_meter_special_needs_client_primary_id foreign key (primary_id) references meter_special_needs_contact (id) on delete restrict on update restrict;
+
+alter table meter_version add constraint fk_meter_version_address_data_id foreign key (address_data_id) references meter_address_data (id) on delete restrict on update restrict;
+
+alter table meter_version add constraint fk_meter_version_contract_data_id foreign key (contract_data_id) references meter_contract_data (id) on delete restrict on update restrict;
+
 create index ix_mnoc_user_mnoc_role_mnoc_user on mnoc_user_mnoc_role (mnoc_user_user_id);
 alter table mnoc_user_mnoc_role add constraint fk_mnoc_user_mnoc_role_mnoc_user foreign key (mnoc_user_user_id) references mnoc_user (user_id) on delete restrict on update restrict;
 
@@ -3175,14 +4257,30 @@ alter table s_order_items add constraint fk_s_order_items_order_uuid foreign key
 create index ix_or_order_ship_order_id on or_order_ship (order_id);
 alter table or_order_ship add constraint fk_or_order_ship_order_id foreign key (order_id) references o_order (id) on delete restrict on update restrict;
 
+alter table organization_node add constraint fk_organization_node_parent_tree_node_id foreign key (parent_tree_node_id) references organization_tree_node (id) on delete restrict on update restrict;
+
+create index ix_orp_detail_master_id on orp_detail (master_id);
+alter table orp_detail add constraint fk_orp_detail_master_id foreign key (master_id) references orp_master (id) on delete restrict on update restrict;
+
+create index ix_orp_detail2_orp_master2_id on orp_detail2 (orp_master2_id);
+alter table orp_detail2 add constraint fk_orp_detail2_orp_master2_id foreign key (orp_master2_id) references orp_master2 (id) on delete restrict on update restrict;
+
+alter table oto_atwo add constraint fk_oto_atwo_aone_id foreign key (aone_id) references oto_aone (id) on delete restrict on update restrict;
+
 alter table oto_bchild add constraint fk_oto_bchild_master_id foreign key (master_id) references oto_bmaster (id) on delete restrict on update restrict;
 
 alter table oto_child add constraint fk_oto_child_master_id foreign key (master_id) references oto_master (id) on delete restrict on update restrict;
 
 alter table oto_cust_address add constraint fk_oto_cust_address_customer_cid foreign key (customer_cid) references oto_cust (cid) on delete restrict on update restrict;
 
+alter table oto_level_a add constraint fk_oto_level_a_b_id foreign key (b_id) references oto_level_b (id) on delete restrict on update restrict;
+
+alter table oto_level_b add constraint fk_oto_level_b_c_id foreign key (c_id) references oto_level_c (id) on delete restrict on update restrict;
+
 alter table oto_prime_extra add constraint fk_oto_prime_extra_eid foreign key (eid) references oto_prime (pid) on delete restrict on update restrict;
 
+alter table oto_sd_child add constraint fk_oto_sd_child_master_id foreign key (master_id) references oto_sd_master (id) on delete restrict on update restrict;
+
 create index ix_oto_th_many_oto_th_top_id on oto_th_many (oto_th_top_id);
 alter table oto_th_many add constraint fk_oto_th_many_oto_th_top_id foreign key (oto_th_top_id) references oto_th_top (id) on delete restrict on update restrict;
 
@@ -3190,7 +4288,7 @@ alter table oto_th_one add constraint fk_oto_th_one_many_id foreign key (many_id
 
 alter table oto_ubprime_extra add constraint fk_oto_ubprime_extra_eid foreign key (eid) references oto_ubprime (pid) on delete restrict on update restrict;
 
-alter table oto_uprime_extra add constraint fk_oto_uprime_extra_eid foreign key (eid) references oto_uprime (pid) on delete restrict on update restrict;
+alter table oto_user_model add constraint fk_oto_user_model_user_optional_id foreign key (user_optional_id) references oto_user_model_optional (id) on delete restrict on update restrict;
 
 alter table pfile add constraint fk_pfile_file_content_id foreign key (file_content_id) references pfile_content (id) on delete restrict on update restrict;
 
@@ -3226,9 +4324,15 @@ alter table persistent_file_content add constraint fk_persistent_file_content_pe
 create index ix_person_default_address_oid on person (default_address_oid);
 alter table person add constraint fk_person_default_address_oid foreign key (default_address_oid) references address (oid) on delete restrict on update restrict;
 
+create index ix_person_cache_email_person_info_person_id on person_cache_email (person_info_person_id);
+alter table person_cache_email add constraint fk_person_cache_email_person_info_person_id foreign key (person_info_person_id) references person_cache_info (person_id) on delete restrict on update restrict;
+
 create index ix_phones_person_id on phones (person_id);
 alter table phones add constraint fk_phones_person_id foreign key (person_id) references persons (id) on delete restrict on update restrict;
 
+create index ix_e_position_contract_id on e_position (contract_id);
+alter table e_position add constraint fk_e_position_contract_id foreign key (contract_id) references contract (id) on delete restrict on update restrict;
+
 create index ix_pp_to_ww_pp on pp_to_ww (pp_id);
 alter table pp_to_ww add constraint fk_pp_to_ww_pp foreign key (pp_id) references pp (id) on delete restrict on update restrict;
 
@@ -3241,6 +4345,9 @@ alter table question add constraint fk_question_groupobjectid foreign key (group
 create index ix_r_orders_customer on r_orders (company,customername);
 alter table r_orders add constraint fk_r_orders_customer foreign key (company,customername) references rcustomer (company,name) on delete restrict on update restrict;
 
+create index ix_rel_master_detail_id on rel_master (detail_id);
+alter table rel_master add constraint fk_rel_master_detail_id foreign key (detail_id) references rel_detail (id) on delete restrict on update restrict;
+
 create index ix_resourcefile_parentresourcefileid on resourcefile (parentresourcefileid);
 alter table resourcefile add constraint fk_resourcefile_parentresourcefileid foreign key (parentresourcefileid) references resourcefile (id) on delete restrict on update restrict;
 
@@ -3267,6 +4374,15 @@ alter table self_ref_customer add constraint fk_self_ref_customer_referred_by_id
 create index ix_self_ref_example_parent_id on self_ref_example (parent_id);
 alter table self_ref_example add constraint fk_self_ref_example_parent_id foreign key (parent_id) references self_ref_example (id) on delete restrict on update restrict;
 
+alter table e_save_test_b add constraint fk_e_save_test_b_sibling_a_id foreign key (sibling_a_id) references e_save_test_a (id) on delete restrict on update restrict;
+
+create index ix_site_parent_id on site (parent_id);
+alter table site add constraint fk_site_parent_id foreign key (parent_id) references site (id) on delete restrict on update restrict;
+
+alter table site add constraint fk_site_data_container_id foreign key (data_container_id) references data_container (id) on delete restrict on update restrict;
+
+alter table site add constraint fk_site_site_address_id foreign key (site_address_id) references site_address (id) on delete restrict on update restrict;
+
 create index ix_stockforecast_inner_report_id on stockforecast (inner_report_id);
 alter table stockforecast add constraint fk_stockforecast_inner_report_id foreign key (inner_report_id) references inner_report (id) on delete restrict on update restrict;
 
@@ -3295,8 +4411,13 @@ alter table trip add constraint fk_trip_vehicle_driver_id foreign key (vehicle_d
 create index ix_trip_address_id on trip (address_id);
 alter table trip add constraint fk_trip_address_id foreign key (address_id) references o_address (id) on delete restrict on update restrict;
 
-create index ix_type_sub_type_id on type (sub_type_id);
-alter table type add constraint fk_type_sub_type_id foreign key (sub_type_id) references sub_type (sub_type_id) on delete restrict on update restrict;
+create index ix_type_sub_type_id on "type" (sub_type_id);
+alter table "type" add constraint fk_type_sub_type_id foreign key (sub_type_id) references sub_type (sub_type_id) on delete restrict on update restrict;
+
+create index ix_usib_child_parent_id on usib_child (parent_id);
+alter table usib_child add constraint fk_usib_child_parent_id foreign key (parent_id) references usib_parent (id) on delete restrict on update restrict;
+
+alter table usib_child_sibling add constraint fk_usib_child_sibling_child_id foreign key (child_id) references usib_child (id) on delete restrict on update restrict;
 
 create index ix_ut_detail_utmaster_id on ut_detail (utmaster_id);
 alter table ut_detail add constraint fk_ut_detail_utmaster_id foreign key (utmaster_id) references ut_master (id) on delete restrict on update restrict;
@@ -3304,17 +4425,20 @@ alter table ut_detail add constraint fk_ut_detail_utmaster_id foreign key (utmas
 create index ix_uutwo_master_id on uutwo (master_id);
 alter table uutwo add constraint fk_uutwo_master_id foreign key (master_id) references uuone (id) on delete restrict on update restrict;
 
+alter table oto_user add constraint fk_oto_user_account_id foreign key (account_id) references oto_account (id) on delete restrict on update restrict;
+
 create index ix_c_user_group_id on c_user (group_id);
 alter table c_user add constraint fk_c_user_group_id foreign key (group_id) references c_group (id) on delete restrict on update restrict;
 
-alter table oto_user add constraint fk_oto_user_account_id foreign key (account_id) references oto_account (id) on delete restrict on update restrict;
-
 create index ix_em_user_role_user_id on em_user_role (user_id);
 alter table em_user_role add constraint fk_em_user_role_user_id foreign key (user_id) references em_user (id) on delete restrict on update restrict;
 
 create index ix_em_user_role_role_id on em_user_role (role_id);
 alter table em_user_role add constraint fk_em_user_role_role_id foreign key (role_id) references em_role (id) on delete restrict on update restrict;
 
+create index ix_vehicle_lease_id on vehicle (lease_id);
+alter table vehicle add constraint fk_vehicle_lease_id foreign key (lease_id) references vehicle_lease (id) on delete restrict on update restrict;
+
 create index ix_vehicle_car_ref_id on vehicle (car_ref_id);
 alter table vehicle add constraint fk_vehicle_car_ref_id foreign key (car_ref_id) references truck_ref (id) on delete restrict on update restrict;
 
@@ -3356,14 +4480,63 @@ update hx_link set sys_period = tstzrange(when_created, null);
 create table hx_link_history(like hx_link);
 create view hx_link_with_history as select * from hx_link union all select * from hx_link_history;
 
+alter table hi_link add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+update hi_link set sys_period = tstzrange(when_created, null);
+create table hi_link_history(like hi_link);
+create view hi_link_with_history as select * from hi_link union all select * from hi_link_history;
+
+alter table hi_link_doc add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+create table hi_link_doc_history(like hi_link_doc);
+create view hi_link_doc_with_history as select * from hi_link_doc union all select * from hi_link_doc_history;
+
+alter table hi_tone add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+update hi_tone set sys_period = tstzrange(when_created, null);
+create table hi_tone_history(like hi_tone);
+create view hi_tone_with_history as select * from hi_tone union all select * from hi_tone_history;
+
+alter table hi_tthree add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+update hi_tthree set sys_period = tstzrange(when_created, null);
+create table hi_tthree_history(like hi_tthree);
+create view hi_tthree_with_history as select * from hi_tthree union all select * from hi_tthree_history;
+
+alter table hi_ttwo add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+update hi_ttwo set sys_period = tstzrange(when_created, null);
+create table hi_ttwo_history(like hi_ttwo);
+create view hi_ttwo_with_history as select * from hi_ttwo union all select * from hi_ttwo_history;
+
+alter table hsd_setting add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+update hsd_setting set sys_period = tstzrange(when_created, null);
+create table hsd_setting_history(like hsd_setting);
+create view hsd_setting_with_history as select * from hsd_setting union all select * from hsd_setting_history;
+
+alter table hsd_user add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+update hsd_user set sys_period = tstzrange(when_created, null);
+create table hsd_user_history(like hsd_user);
+create view hsd_user_with_history as select * from hsd_user union all select * from hsd_user_history;
+
+alter table link add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+update link set sys_period = tstzrange(when_created, null);
+create table link_history(like link);
+create view link_with_history as select * from link union all select * from link_history;
+
+alter table c_user add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+update c_user set sys_period = tstzrange(when_created, null);
+create table c_user_history(like c_user);
+create view c_user_with_history as select * from c_user union all select * from c_user_history;
+
 create or replace function hx_link_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
 begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into hx_link_history (sys_period,id, name, location, comments, version, when_created, when_modified) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
-    NEW.sys_period = tstzrange(current_timestamp,null);
+    insert into hx_link_history (sys_period,id, name, location, comments, version, when_created, when_modified, deleted) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+    NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into hx_link_history (sys_period,id, name, location, comments, version, when_created, when_modified) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
+    insert into hx_link_history (sys_period,id, name, location, comments, version, when_created, when_modified, deleted) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
     return old;
   end if;
 end;
@@ -3373,19 +4546,19 @@ create trigger hx_link_history_upd
   before update or delete on hx_link
   for each row execute procedure hx_link_history_version();
 
-alter table hi_link add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
-update hi_link set sys_period = tstzrange(when_created, null);
-create table hi_link_history(like hi_link);
-create view hi_link_with_history as select * from hi_link union all select * from hi_link_history;
-
 create or replace function hi_link_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
 begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into hi_link_history (sys_period,id, name, location, comments, version, when_created, when_modified) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
-    NEW.sys_period = tstzrange(current_timestamp,null);
+    insert into hi_link_history (sys_period,id, name, location, comments, version, when_created, when_modified) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
+    NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into hi_link_history (sys_period,id, name, location, comments, version, when_created, when_modified) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
+    insert into hi_link_history (sys_period,id, name, location, comments, version, when_created, when_modified) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.name, OLD.location, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
     return old;
   end if;
 end;
@@ -3395,18 +4568,19 @@ create trigger hi_link_history_upd
   before update or delete on hi_link
   for each row execute procedure hi_link_history_version();
 
-alter table hi_link_doc add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
-create table hi_link_doc_history(like hi_link_doc);
-create view hi_link_doc_with_history as select * from hi_link_doc union all select * from hi_link_doc_history;
-
 create or replace function hi_link_doc_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
 begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into hi_link_doc_history (sys_period,hi_link_id, hi_doc_id) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.hi_link_id, OLD.hi_doc_id);
-    NEW.sys_period = tstzrange(current_timestamp,null);
+    insert into hi_link_doc_history (sys_period,hi_link_id, hi_doc_id) values (tstzrange(lowerTs,upperTs), OLD.hi_link_id, OLD.hi_doc_id);
+    NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into hi_link_doc_history (sys_period,hi_link_id, hi_doc_id) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.hi_link_id, OLD.hi_doc_id);
+    insert into hi_link_doc_history (sys_period,hi_link_id, hi_doc_id) values (tstzrange(lowerTs,upperTs), OLD.hi_link_id, OLD.hi_doc_id);
     return old;
   end if;
 end;
@@ -3416,19 +4590,129 @@ create trigger hi_link_doc_history_upd
   before update or delete on hi_link_doc
   for each row execute procedure hi_link_doc_history_version();
 
-alter table link add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
-update link set sys_period = tstzrange(when_created, null);
-create table link_history(like link);
-create view link_with_history as select * from link union all select * from link_history;
-
-create or replace function link_history_version() returns trigger as $$
+create or replace function hi_tone_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
 begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into link_history (sys_period,id, name, location, when_publish, link_comment, version, when_created, when_modified, deleted) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.name, OLD.location, OLD.when_publish, OLD.link_comment, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
-    NEW.sys_period = tstzrange(current_timestamp,null);
+    insert into hi_tone_history (sys_period,id, name, comments, version, when_created, when_modified) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.name, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
+    NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into link_history (sys_period,id, name, location, when_publish, link_comment, version, when_created, when_modified, deleted) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.name, OLD.location, OLD.when_publish, OLD.link_comment, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+    insert into hi_tone_history (sys_period,id, name, comments, version, when_created, when_modified) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.name, OLD.comments, OLD.version, OLD.when_created, OLD.when_modified);
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
+create trigger hi_tone_history_upd
+  before update or delete on hi_tone
+  for each row execute procedure hi_tone_history_version();
+
+create or replace function hi_tthree_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
+begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
+  if (TG_OP = 'UPDATE') then
+    insert into hi_tthree_history (sys_period,id, hi_ttwo_id, three, version, when_created, when_modified) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.hi_ttwo_id, OLD.three, OLD.version, OLD.when_created, OLD.when_modified);
+    NEW.sys_period = tstzrange(upperTs,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into hi_tthree_history (sys_period,id, hi_ttwo_id, three, version, when_created, when_modified) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.hi_ttwo_id, OLD.three, OLD.version, OLD.when_created, OLD.when_modified);
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
+create trigger hi_tthree_history_upd
+  before update or delete on hi_tthree
+  for each row execute procedure hi_tthree_history_version();
+
+create or replace function hi_ttwo_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
+begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
+  if (TG_OP = 'UPDATE') then
+    insert into hi_ttwo_history (sys_period,id, hi_tone_id, two, version, when_created, when_modified) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.hi_tone_id, OLD.two, OLD.version, OLD.when_created, OLD.when_modified);
+    NEW.sys_period = tstzrange(upperTs,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into hi_ttwo_history (sys_period,id, hi_tone_id, two, version, when_created, when_modified) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.hi_tone_id, OLD.two, OLD.version, OLD.when_created, OLD.when_modified);
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
+create trigger hi_ttwo_history_upd
+  before update or delete on hi_ttwo
+  for each row execute procedure hi_ttwo_history_version();
+
+create or replace function hsd_setting_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
+begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
+  if (TG_OP = 'UPDATE') then
+    insert into hsd_setting_history (sys_period,id, code, content, user_id, version, when_created, when_modified, deleted) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.code, OLD.content, OLD.user_id, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+    NEW.sys_period = tstzrange(upperTs,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into hsd_setting_history (sys_period,id, code, content, user_id, version, when_created, when_modified, deleted) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.code, OLD.content, OLD.user_id, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
+create trigger hsd_setting_history_upd
+  before update or delete on hsd_setting
+  for each row execute procedure hsd_setting_history_version();
+
+create or replace function hsd_user_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
+begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
+  if (TG_OP = 'UPDATE') then
+    insert into hsd_user_history (sys_period,id, name, version, when_created, when_modified, deleted) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.name, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+    NEW.sys_period = tstzrange(upperTs,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into hsd_user_history (sys_period,id, name, version, when_created, when_modified, deleted) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.name, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
+create trigger hsd_user_history_upd
+  before update or delete on hsd_user
+  for each row execute procedure hsd_user_history_version();
+
+create or replace function link_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
+begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
+  if (TG_OP = 'UPDATE') then
+    insert into link_history (sys_period,id, name, location, when_publish, link_comment, version, when_created, when_modified, deleted) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.name, OLD.location, OLD.when_publish, OLD.link_comment, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
+    NEW.sys_period = tstzrange(upperTs,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into link_history (sys_period,id, name, location, when_publish, link_comment, version, when_created, when_modified, deleted) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.name, OLD.location, OLD.when_publish, OLD.link_comment, OLD.version, OLD.when_created, OLD.when_modified, OLD.deleted);
     return old;
   end if;
 end;
@@ -3438,19 +4722,19 @@ create trigger link_history_upd
   before update or delete on link
   for each row execute procedure link_history_version();
 
-alter table c_user add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
-update c_user set sys_period = tstzrange(when_created, null);
-create table c_user_history(like c_user);
-create view c_user_with_history as select * from c_user union all select * from c_user_history;
-
 create or replace function c_user_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
 begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into c_user_history (sys_period,id, inactive, name, email, group_id, version, when_created, when_modified) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.inactive, OLD.name, OLD.email, OLD.group_id, OLD.version, OLD.when_created, OLD.when_modified);
-    NEW.sys_period = tstzrange(current_timestamp,null);
+    insert into c_user_history (sys_period,id, inactive, name, email, group_id, version, when_created, when_modified) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.inactive, OLD.name, OLD.email, OLD.group_id, OLD.version, OLD.when_created, OLD.when_modified);
+    NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into c_user_history (sys_period,id, inactive, name, email, group_id, version, when_created, when_modified) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.inactive, OLD.name, OLD.email, OLD.group_id, OLD.version, OLD.when_created, OLD.when_modified);
+    insert into c_user_history (sys_period,id, inactive, name, email, group_id, version, when_created, when_modified) values (tstzrange(lowerTs,upperTs), OLD.id, OLD.inactive, OLD.name, OLD.email, OLD.group_id, OLD.version, OLD.when_created, OLD.when_modified);
     return old;
   end if;
 end;
diff --git a/src/test/ddl-review/pg-drop-all.sql b/src/test/ddl-review/pg-drop-all.sql
index e02947028..e6433614a 100644
--- a/src/test/ddl-review/pg-drop-all.sql
+++ b/src/test/ddl-review/pg-drop-all.sql
@@ -1,7 +1,13 @@
--- Generated by ebean unknown at 2018-03-08T06:39:45.063Z
+-- Generated by ebean unknown at 2019-07-25T09:29:05.607Z
 alter table if exists bar drop constraint if exists fk_bar_foo_id;
 drop index if exists ix_bar_foo_id;
 
+alter table if exists acl_container_relation drop constraint if exists fk_acl_container_relation_container_id;
+drop index if exists ix_acl_container_relation_container_id;
+
+alter table if exists acl_container_relation drop constraint if exists fk_acl_container_relation_acl_entry_id;
+drop index if exists ix_acl_container_relation_acl_entry_id;
+
 alter table if exists addr drop constraint if exists fk_addr_employee_id;
 drop index if exists ix_addr_employee_id;
 
@@ -19,11 +25,14 @@ drop index if exists ix_attribute_attribute_holder_id;
 alter table if exists bbookmark drop constraint if exists fk_bbookmark_user_id;
 drop index if exists ix_bbookmark_user_id;
 
-alter table if exists bsite_user drop constraint if exists fk_bsite_user_site_id;
-drop index if exists ix_bsite_user_site_id;
+alter table if exists bbookmark_user drop constraint if exists fk_bbookmark_user_org_id;
+drop index if exists ix_bbookmark_user_org_id;
 
-alter table if exists bsite_user drop constraint if exists fk_bsite_user_user_id;
-drop index if exists ix_bsite_user_user_id;
+alter table if exists bsite_user_a drop constraint if exists fk_bsite_user_a_site_id;
+drop index if exists ix_bsite_user_a_site_id;
+
+alter table if exists bsite_user_a drop constraint if exists fk_bsite_user_a_user_id;
+drop index if exists ix_bsite_user_a_user_id;
 
 alter table if exists bsite_user_b drop constraint if exists fk_bsite_user_b_site;
 drop index if exists ix_bsite_user_b_site;
@@ -37,10 +46,27 @@ drop index if exists ix_bsite_user_c_site_uid;
 alter table if exists bsite_user_c drop constraint if exists fk_bsite_user_c_user_uid;
 drop index if exists ix_bsite_user_c_user_uid;
 
+alter table if exists bsite_user_e drop constraint if exists fk_bsite_user_e_site_id;
+drop index if exists ix_bsite_user_e_site_id;
+
+alter table if exists bsite_user_e drop constraint if exists fk_bsite_user_e_user_id;
+drop index if exists ix_bsite_user_e_user_id;
+
+alter table if exists basic_draftable_bean drop constraint if exists fk_basic_draftable_bean_id;
+
 alter table if exists drel_booking drop constraint if exists fk_drel_booking_agent_invoice;
 
 alter table if exists drel_booking drop constraint if exists fk_drel_booking_client_invoice;
 
+alter table if exists cepproduct_category drop constraint if exists fk_cepproduct_category_category_id;
+drop index if exists ix_cepproduct_category_category_id;
+
+alter table if exists cepproduct_category drop constraint if exists fk_cepproduct_category_product_id;
+drop index if exists ix_cepproduct_category_product_id;
+
+alter table if exists cinh_ref drop constraint if exists fk_cinh_ref_ref_id;
+drop index if exists ix_cinh_ref_ref_id;
+
 alter table if exists ckey_detail drop constraint if exists fk_ckey_detail_parent;
 drop index if exists ix_ckey_detail_parent;
 
@@ -59,6 +85,12 @@ drop index if exists ix_sp_car_car_wheels_sp_car_car;
 alter table if exists sp_car_car_wheels drop constraint if exists fk_sp_car_car_wheels_sp_car_wheel;
 drop index if exists ix_sp_car_car_wheels_sp_car_wheel;
 
+alter table if exists sp_car_car_doors drop constraint if exists fk_sp_car_car_doors_sp_car_car;
+drop index if exists ix_sp_car_car_doors_sp_car_car;
+
+alter table if exists sp_car_car_doors drop constraint if exists fk_sp_car_car_doors_sp_car_door;
+drop index if exists ix_sp_car_car_doors_sp_car_door;
+
 alter table if exists car_accessory drop constraint if exists fk_car_accessory_fuse_id;
 drop index if exists ix_car_accessory_fuse_id;
 
@@ -68,12 +100,21 @@ drop index if exists ix_car_accessory_car_id;
 alter table if exists category drop constraint if exists fk_category_surveyobjectid;
 drop index if exists ix_category_surveyobjectid;
 
+alter table if exists e_save_test_d drop constraint if exists fk_e_save_test_d_parent_id;
+
 alter table if exists child_person drop constraint if exists fk_child_person_some_bean_id;
 drop index if exists ix_child_person_some_bean_id;
 
 alter table if exists child_person drop constraint if exists fk_child_person_parent_identifier;
 drop index if exists ix_child_person_parent_identifier;
 
+alter table if exists cke_client drop constraint if exists fk_cke_client_user;
+drop index if exists ix_cke_client_user;
+
+alter table if exists class_super_monkey drop constraint if exists fk_class_super_monkey_class_super;
+
+alter table if exists class_super_monkey drop constraint if exists fk_class_super_monkey_monkey;
+
 alter table if exists configuration drop constraint if exists fk_configuration_configurations_id;
 drop index if exists ix_configuration_configurations_id;
 
@@ -86,6 +127,9 @@ drop index if exists ix_contact_group_id;
 alter table if exists contact_note drop constraint if exists fk_contact_note_contact_id;
 drop index if exists ix_contact_note_contact_id;
 
+alter table if exists contract_costs drop constraint if exists fk_contract_costs_position_id;
+drop index if exists ix_contract_costs_position_id;
+
 alter table if exists c_conversation drop constraint if exists fk_c_conversation_group_id;
 drop index if exists ix_c_conversation_group_id;
 
@@ -101,12 +145,27 @@ drop index if exists ix_dcredit_drol_dcredit;
 alter table if exists dcredit_drol drop constraint if exists fk_dcredit_drol_drol;
 drop index if exists ix_dcredit_drol_drol;
 
+alter table if exists dmachine drop constraint if exists fk_dmachine_organisation_id;
+drop index if exists ix_dmachine_organisation_id;
+
+alter table if exists d_machine_aux_use drop constraint if exists fk_d_machine_aux_use_machine_id;
+drop index if exists ix_d_machine_aux_use_machine_id;
+
+alter table if exists d_machine_stats drop constraint if exists fk_d_machine_stats_machine_id;
+drop index if exists ix_d_machine_stats_machine_id;
+
+alter table if exists d_machine_use drop constraint if exists fk_d_machine_use_machine_id;
+drop index if exists ix_d_machine_use_machine_id;
+
 alter table if exists drot_drol drop constraint if exists fk_drot_drol_drot;
 drop index if exists ix_drot_drol_drot;
 
 alter table if exists drot_drol drop constraint if exists fk_drot_drol_drol;
 drop index if exists ix_drot_drol_drol;
 
+alter table if exists dc_detail drop constraint if exists fk_dc_detail_master_id;
+drop index if exists ix_dc_detail_master_id;
+
 alter table if exists dfk_cascade drop constraint if exists fk_dfk_cascade_one_id;
 drop index if exists ix_dfk_cascade_one_id;
 
@@ -144,6 +203,11 @@ drop index if exists ix_ebasic_no_sdchild_owner_id;
 alter table if exists ebasic_sdchild drop constraint if exists fk_ebasic_sdchild_owner_id;
 drop index if exists ix_ebasic_sdchild_owner_id;
 
+alter table if exists ecache_child drop constraint if exists fk_ecache_child_root_id;
+drop index if exists ix_ecache_child_root_id;
+
+alter table if exists edefault_prop drop constraint if exists fk_edefault_prop_e_simple_usertypeid;
+
 alter table if exists eemb_inner drop constraint if exists fk_eemb_inner_outer_id;
 drop index if exists ix_eemb_inner_outer_id;
 
@@ -159,6 +223,9 @@ drop index if exists ix_eopt_one_a_b_id;
 alter table if exists eopt_one_b drop constraint if exists fk_eopt_one_b_c_id;
 drop index if exists ix_eopt_one_b_c_id;
 
+alter table if exists eper_addr drop constraint if exists fk_eper_addr_ma_country_code;
+drop index if exists ix_eper_addr_ma_country_code;
+
 alter table if exists esoft_del_book drop constraint if exists fk_esoft_del_book_lend_by_id;
 drop index if exists ix_esoft_del_book_lend_by_id;
 
@@ -197,12 +264,36 @@ drop index if exists ix_rawinherit_uncle_parent_id;
 alter table if exists evanilla_collection_detail drop constraint if exists fk_evanilla_collection_detail_evanilla_collection_id;
 drop index if exists ix_evanilla_collection_detail_evanilla_collection_id;
 
+alter table if exists ec_enum_person_tags drop constraint if exists fk_ec_enum_person_tags_ec_enum_person_id;
+drop index if exists ix_ec_enum_person_tags_ec_enum_person_id;
+
+alter table if exists ec_person_phone drop constraint if exists fk_ec_person_phone_owner_id;
+drop index if exists ix_ec_person_phone_owner_id;
+
+alter table if exists ecbl_person_phone_numbers drop constraint if exists fk_ecbl_person_phone_numbers_person_id;
+drop index if exists ix_ecbl_person_phone_numbers_person_id;
+
+alter table if exists ecbm_person_phone_numbers drop constraint if exists fk_ecbm_person_phone_numbers_person_id;
+drop index if exists ix_ecbm_person_phone_numbers_person_id;
+
+alter table if exists ecm_person_phone_numbers drop constraint if exists fk_ecm_person_phone_numbers_ecm_person_id;
+drop index if exists ix_ecm_person_phone_numbers_ecm_person_id;
+
+alter table if exists ecmc_person_phone_numbers drop constraint if exists fk_ecmc_person_phone_numbers_ecmc_person_id;
+drop index if exists ix_ecmc_person_phone_numbers_ecmc_person_id;
+
+alter table if exists ecs_person_phone drop constraint if exists fk_ecs_person_phone_ecs_person_id;
+drop index if exists ix_ecs_person_phone_ecs_person_id;
+
 alter table if exists td_child drop constraint if exists fk_td_child_parent_id;
 drop index if exists ix_td_child_parent_id;
 
 alter table if exists empl drop constraint if exists fk_empl_default_address_id;
 drop index if exists ix_empl_default_address_id;
 
+alter table if exists esd_detail drop constraint if exists fk_esd_detail_master_id;
+drop index if exists ix_esd_detail_master_id;
+
 alter table if exists grand_parent_person drop constraint if exists fk_grand_parent_person_some_bean_id;
 drop index if exists ix_grand_parent_person_some_bean_id;
 
@@ -221,6 +312,17 @@ drop index if exists ix_hi_link_doc_hi_link;
 alter table if exists hi_link_doc drop constraint if exists fk_hi_link_doc_hi_doc;
 drop index if exists ix_hi_link_doc_hi_doc;
 
+alter table if exists hi_tthree drop constraint if exists fk_hi_tthree_hi_ttwo_id;
+drop index if exists ix_hi_tthree_hi_ttwo_id;
+
+alter table if exists hi_ttwo drop constraint if exists fk_hi_ttwo_hi_tone_id;
+drop index if exists ix_hi_ttwo_hi_tone_id;
+
+alter table if exists hsd_setting drop constraint if exists fk_hsd_setting_user_id;
+
+alter table if exists iaf_segment drop constraint if exists fk_iaf_segment_status_id;
+drop index if exists ix_iaf_segment_status_id;
+
 alter table if exists imrelated drop constraint if exists fk_imrelated_owner_id;
 drop index if exists ix_imrelated_owner_id;
 
@@ -240,6 +342,10 @@ drop index if exists ix_item_etype;
 alter table if exists item drop constraint if exists fk_item_eregion;
 drop index if exists ix_item_eregion;
 
+alter table if exists mkeygroup_monkey drop constraint if exists fk_mkeygroup_monkey_mkeygroup;
+
+alter table if exists mkeygroup_monkey drop constraint if exists fk_mkeygroup_monkey_monkey;
+
 alter table if exists trainer_monkey drop constraint if exists fk_trainer_monkey_trainer;
 
 alter table if exists trainer_monkey drop constraint if exists fk_trainer_monkey_monkey;
@@ -277,6 +383,27 @@ drop index if exists ix_la_attr_value_attribute_la_attr_value;
 alter table if exists la_attr_value_attribute drop constraint if exists fk_la_attr_value_attribute_attribute;
 drop index if exists ix_la_attr_value_attribute_attribute;
 
+alter table if exists looney drop constraint if exists fk_looney_tune_id;
+drop index if exists ix_looney_tune_id;
+
+alter table if exists mcontact drop constraint if exists fk_mcontact_customer_id;
+drop index if exists ix_mcontact_customer_id;
+
+alter table if exists mcontact_message drop constraint if exists fk_mcontact_message_contact_id;
+drop index if exists ix_mcontact_message_contact_id;
+
+alter table if exists mcustomer drop constraint if exists fk_mcustomer_shipping_address_id;
+drop index if exists ix_mcustomer_shipping_address_id;
+
+alter table if exists mcustomer drop constraint if exists fk_mcustomer_billing_address_id;
+drop index if exists ix_mcustomer_billing_address_id;
+
+alter table if exists mmachine_mgroup drop constraint if exists fk_mmachine_mgroup_mmachine;
+drop index if exists ix_mmachine_mgroup_mmachine;
+
+alter table if exists mmachine_mgroup drop constraint if exists fk_mmachine_mgroup_mgroup;
+drop index if exists ix_mmachine_mgroup_mgroup;
+
 alter table if exists mprinter drop constraint if exists fk_mprinter_current_state_id;
 drop index if exists ix_mprinter_current_state_id;
 
@@ -321,6 +448,14 @@ drop index if exists ix_c_message_conversation_id;
 alter table if exists c_message drop constraint if exists fk_c_message_user_id;
 drop index if exists ix_c_message_user_id;
 
+alter table if exists meter_contract_data drop constraint if exists fk_meter_contract_data_special_needs_client_id;
+
+alter table if exists meter_special_needs_client drop constraint if exists fk_meter_special_needs_client_primary_id;
+
+alter table if exists meter_version drop constraint if exists fk_meter_version_address_data_id;
+
+alter table if exists meter_version drop constraint if exists fk_meter_version_contract_data_id;
+
 alter table if exists mnoc_user_mnoc_role drop constraint if exists fk_mnoc_user_mnoc_role_mnoc_user;
 drop index if exists ix_mnoc_user_mnoc_role_mnoc_user;
 
@@ -393,14 +528,30 @@ drop index if exists ix_s_order_items_order_uuid;
 alter table if exists or_order_ship drop constraint if exists fk_or_order_ship_order_id;
 drop index if exists ix_or_order_ship_order_id;
 
+alter table if exists organization_node drop constraint if exists fk_organization_node_parent_tree_node_id;
+
+alter table if exists orp_detail drop constraint if exists fk_orp_detail_master_id;
+drop index if exists ix_orp_detail_master_id;
+
+alter table if exists orp_detail2 drop constraint if exists fk_orp_detail2_orp_master2_id;
+drop index if exists ix_orp_detail2_orp_master2_id;
+
+alter table if exists oto_atwo drop constraint if exists fk_oto_atwo_aone_id;
+
 alter table if exists oto_bchild drop constraint if exists fk_oto_bchild_master_id;
 
 alter table if exists oto_child drop constraint if exists fk_oto_child_master_id;
 
 alter table if exists oto_cust_address drop constraint if exists fk_oto_cust_address_customer_cid;
 
+alter table if exists oto_level_a drop constraint if exists fk_oto_level_a_b_id;
+
+alter table if exists oto_level_b drop constraint if exists fk_oto_level_b_c_id;
+
 alter table if exists oto_prime_extra drop constraint if exists fk_oto_prime_extra_eid;
 
+alter table if exists oto_sd_child drop constraint if exists fk_oto_sd_child_master_id;
+
 alter table if exists oto_th_many drop constraint if exists fk_oto_th_many_oto_th_top_id;
 drop index if exists ix_oto_th_many_oto_th_top_id;
 
@@ -408,7 +559,7 @@ alter table if exists oto_th_one drop constraint if exists fk_oto_th_one_many_id
 
 alter table if exists oto_ubprime_extra drop constraint if exists fk_oto_ubprime_extra_eid;
 
-alter table if exists oto_uprime_extra drop constraint if exists fk_oto_uprime_extra_eid;
+alter table if exists oto_user_model drop constraint if exists fk_oto_user_model_user_optional_id;
 
 alter table if exists pfile drop constraint if exists fk_pfile_file_content_id;
 
@@ -444,9 +595,15 @@ alter table if exists persistent_file_content drop constraint if exists fk_persi
 alter table if exists person drop constraint if exists fk_person_default_address_oid;
 drop index if exists ix_person_default_address_oid;
 
+alter table if exists person_cache_email drop constraint if exists fk_person_cache_email_person_info_person_id;
+drop index if exists ix_person_cache_email_person_info_person_id;
+
 alter table if exists phones drop constraint if exists fk_phones_person_id;
 drop index if exists ix_phones_person_id;
 
+alter table if exists e_position drop constraint if exists fk_e_position_contract_id;
+drop index if exists ix_e_position_contract_id;
+
 alter table if exists pp_to_ww drop constraint if exists fk_pp_to_ww_pp;
 drop index if exists ix_pp_to_ww_pp;
 
@@ -459,6 +616,9 @@ drop index if exists ix_question_groupobjectid;
 alter table if exists r_orders drop constraint if exists fk_r_orders_customer;
 drop index if exists ix_r_orders_customer;
 
+alter table if exists rel_master drop constraint if exists fk_rel_master_detail_id;
+drop index if exists ix_rel_master_detail_id;
+
 alter table if exists resourcefile drop constraint if exists fk_resourcefile_parentresourcefileid;
 drop index if exists ix_resourcefile_parentresourcefileid;
 
@@ -485,6 +645,15 @@ drop index if exists ix_self_ref_customer_referred_by_id;
 alter table if exists self_ref_example drop constraint if exists fk_self_ref_example_parent_id;
 drop index if exists ix_self_ref_example_parent_id;
 
+alter table if exists e_save_test_b drop constraint if exists fk_e_save_test_b_sibling_a_id;
+
+alter table if exists site drop constraint if exists fk_site_parent_id;
+drop index if exists ix_site_parent_id;
+
+alter table if exists site drop constraint if exists fk_site_data_container_id;
+
+alter table if exists site drop constraint if exists fk_site_site_address_id;
+
 alter table if exists stockforecast drop constraint if exists fk_stockforecast_inner_report_id;
 drop index if exists ix_stockforecast_inner_report_id;
 
@@ -513,26 +682,34 @@ drop index if exists ix_trip_vehicle_driver_id;
 alter table if exists trip drop constraint if exists fk_trip_address_id;
 drop index if exists ix_trip_address_id;
 
-alter table if exists type drop constraint if exists fk_type_sub_type_id;
+alter table if exists "type" drop constraint if exists fk_type_sub_type_id;
 drop index if exists ix_type_sub_type_id;
 
+alter table if exists usib_child drop constraint if exists fk_usib_child_parent_id;
+drop index if exists ix_usib_child_parent_id;
+
+alter table if exists usib_child_sibling drop constraint if exists fk_usib_child_sibling_child_id;
+
 alter table if exists ut_detail drop constraint if exists fk_ut_detail_utmaster_id;
 drop index if exists ix_ut_detail_utmaster_id;
 
 alter table if exists uutwo drop constraint if exists fk_uutwo_master_id;
 drop index if exists ix_uutwo_master_id;
 
+alter table if exists oto_user drop constraint if exists fk_oto_user_account_id;
+
 alter table if exists c_user drop constraint if exists fk_c_user_group_id;
 drop index if exists ix_c_user_group_id;
 
-alter table if exists oto_user drop constraint if exists fk_oto_user_account_id;
-
 alter table if exists em_user_role drop constraint if exists fk_em_user_role_user_id;
 drop index if exists ix_em_user_role_user_id;
 
 alter table if exists em_user_role drop constraint if exists fk_em_user_role_role_id;
 drop index if exists ix_em_user_role_role_id;
 
+alter table if exists vehicle drop constraint if exists fk_vehicle_lease_id;
+drop index if exists ix_vehicle_lease_id;
+
 alter table if exists vehicle drop constraint if exists fk_vehicle_car_ref_id;
 drop index if exists ix_vehicle_car_ref_id;
 
@@ -573,8 +750,14 @@ drop table if exists asimple_bean cascade;
 
 drop table if exists bar cascade;
 
+drop table if exists block cascade;
+
 drop table if exists oto_account cascade;
 
+drop table if exists acl cascade;
+
+drop table if exists acl_container_relation cascade;
+
 drop table if exists addr cascade;
 
 drop table if exists address cascade;
@@ -597,22 +780,32 @@ drop table if exists audit_log cascade;
 
 drop table if exists bbookmark cascade;
 
+drop table if exists bbookmark_org cascade;
+
 drop table if exists bbookmark_user cascade;
 
 drop table if exists bsimple_with_gen cascade;
 
 drop table if exists bsite cascade;
 
-drop table if exists bsite_user cascade;
+drop table if exists bsite_user_a cascade;
 
 drop table if exists bsite_user_b cascade;
 
 drop table if exists bsite_user_c cascade;
 
+drop table if exists bsite_user_d cascade;
+
+drop table if exists bsite_user_e cascade;
+
 drop table if exists buser cascade;
 
 drop table if exists bwith_qident cascade;
 
+drop table if exists basic_draftable_bean cascade;
+
+drop table if exists basic_draftable_bean_draft cascade;
+
 drop table if exists basic_joda_entity cascade;
 
 drop table if exists bean_with_time_zone cascade;
@@ -620,6 +813,16 @@ drop table if exists bean_with_time_zone cascade;
 drop table if exists drel_booking cascade;
 drop sequence if exists drel_booking_seq;
 
+drop table if exists bw_bean cascade;
+
+drop table if exists cepcategory cascade;
+
+drop table if exists cepproduct cascade;
+
+drop table if exists cepproduct_category cascade;
+
+drop table if exists cinh_ref cascade;
+
 drop table if exists cinh_root cascade;
 
 drop table if exists ckey_assoc cascade;
@@ -632,22 +835,34 @@ drop table if exists calculation_result cascade;
 
 drop table if exists cao_bean cascade;
 
-drop table if exists sa_car cascade;
-drop sequence if exists sa_car_seq;
-
 drop table if exists sp_car_car cascade;
 drop sequence if exists sp_car_car_seq;
 
 drop table if exists sp_car_car_wheels cascade;
 
+drop table if exists sp_car_car_doors cascade;
+
+drop table if exists sa_car cascade;
+drop sequence if exists sa_car_seq;
+
 drop table if exists car_accessory cascade;
 
 drop table if exists car_fuse cascade;
 
 drop table if exists category cascade;
 
+drop table if exists e_save_test_d cascade;
+
 drop table if exists child_person cascade;
 
+drop table if exists cke_client cascade;
+
+drop table if exists cke_user cascade;
+
+drop table if exists class_super cascade;
+
+drop table if exists class_super_monkey cascade;
+
 drop table if exists configuration cascade;
 
 drop table if exists configurations cascade;
@@ -658,6 +873,10 @@ drop table if exists contact_group cascade;
 
 drop table if exists contact_note cascade;
 
+drop table if exists contract cascade;
+
+drop table if exists contract_costs cascade;
+
 drop table if exists c_conversation cascade;
 
 drop table if exists o_country cascade;
@@ -672,6 +891,16 @@ drop table if exists dcredit_drol cascade;
 
 drop table if exists dexh_entity cascade;
 
+drop table if exists dmachine cascade;
+
+drop table if exists d_machine_aux_use cascade;
+
+drop table if exists d_machine_stats cascade;
+
+drop table if exists d_machine_use cascade;
+
+drop table if exists dorg cascade;
+
 drop table if exists dperson cascade;
 
 drop table if exists drol cascade;
@@ -682,6 +911,12 @@ drop table if exists drot_drol cascade;
 
 drop table if exists rawinherit_data cascade;
 
+drop table if exists data_container cascade;
+
+drop table if exists dc_detail cascade;
+
+drop table if exists dc_master cascade;
+
 drop table if exists dfk_cascade cascade;
 
 drop table if exists dfk_cascade_one cascade;
@@ -690,6 +925,10 @@ drop table if exists dfk_none cascade;
 
 drop table if exists dfk_none_via_join cascade;
 
+drop table if exists dfk_none_via_mto_m cascade;
+
+drop table if exists dfk_none_via_mto_m_dfk_one cascade;
+
 drop table if exists dfk_one cascade;
 
 drop table if exists dfk_set_null cascade;
@@ -710,6 +949,9 @@ drop table if exists document_media cascade;
 
 drop table if exists document_media_draft cascade;
 
+drop table if exists sp_car_door cascade;
+drop sequence if exists sp_car_door_seq;
+
 drop table if exists earray_bean cascade;
 
 drop table if exists earray_set_bean cascade;
@@ -728,12 +970,18 @@ drop table if exists e_basicenc cascade;
 
 drop table if exists e_basicenc_bin cascade;
 
+drop table if exists e_basicenc_client cascade;
+
 drop table if exists e_basic_enum_id cascade;
 
 drop table if exists e_basic_eni cascade;
 
 drop table if exists ebasic_hstore cascade;
 
+drop table if exists ebasic_json_jackson cascade;
+
+drop table if exists ebasic_json_jackson2 cascade;
+
 drop table if exists ebasic_json_list cascade;
 
 drop table if exists ebasic_json_map cascade;
@@ -770,16 +1018,32 @@ drop table if exists e_basicver cascade;
 
 drop table if exists e_basic_withlife cascade;
 
+drop table if exists e_basic_with_ex cascade;
+
 drop table if exists e_basicverucon cascade;
 
+drop table if exists ecache_child cascade;
+
+drop table if exists ecache_root cascade;
+
 drop table if exists e_col_ab cascade;
 
 drop table if exists ecustom_id cascade;
 
+drop table if exists edefault_prop cascade;
+
 drop table if exists eemb_inner cascade;
 
 drop table if exists eemb_outer cascade;
 
+drop table if exists efile2_no_fk cascade;
+
+drop table if exists efile_no_fk cascade;
+
+drop table if exists efile_no_fk_euser_no_fk cascade;
+
+drop table if exists efile_no_fk_euser_no_fk_soft_del cascade;
+
 drop table if exists egen_props cascade;
 
 drop table if exists einvoice cascade;
@@ -796,6 +1060,8 @@ drop table if exists eopt_one_b cascade;
 
 drop table if exists eopt_one_c cascade;
 
+drop table if exists eper_addr cascade;
+
 drop table if exists eperson cascade;
 
 drop table if exists e_person_online cascade;
@@ -834,6 +1100,10 @@ drop table if exists etrans_many cascade;
 
 drop table if exists rawinherit_uncle cascade;
 
+drop table if exists euser_no_fk cascade;
+
+drop table if exists euser_no_fk_soft_del cascade;
+
 drop table if exists evanilla_collection cascade;
 
 drop table if exists evanilla_collection_detail cascade;
@@ -842,12 +1112,44 @@ drop table if exists ewho_props cascade;
 
 drop table if exists e_withinet cascade;
 
+drop table if exists ec_enum_person cascade;
+
+drop table if exists ec_enum_person_tags cascade;
+
+drop table if exists ec_person cascade;
+
+drop table if exists ec_person_phone cascade;
+
+drop table if exists ecbl_person cascade;
+
+drop table if exists ecbl_person_phone_numbers cascade;
+
+drop table if exists ecbm_person cascade;
+
+drop table if exists ecbm_person_phone_numbers cascade;
+
+drop table if exists ecm_person cascade;
+
+drop table if exists ecm_person_phone_numbers cascade;
+
+drop table if exists ecmc_person cascade;
+
+drop table if exists ecmc_person_phone_numbers cascade;
+
+drop table if exists ecs_person cascade;
+
+drop table if exists ecs_person_phone cascade;
+
 drop table if exists td_child cascade;
 
 drop table if exists td_parent cascade;
 
 drop table if exists empl cascade;
 
+drop table if exists esd_detail cascade;
+
+drop table if exists esd_master cascade;
+
 drop table if exists feature_desc cascade;
 
 drop table if exists f_first cascade;
@@ -900,6 +1202,55 @@ drop table hi_link_doc_history;
 
 drop table if exists hi_link_doc cascade;
 
+drop trigger if exists hi_tone_history_upd on hi_tone cascade;
+drop function if exists hi_tone_history_version();
+
+drop view hi_tone_with_history;
+alter table hi_tone drop column sys_period;
+drop table hi_tone_history;
+
+drop table if exists hi_tone cascade;
+
+drop trigger if exists hi_tthree_history_upd on hi_tthree cascade;
+drop function if exists hi_tthree_history_version();
+
+drop view hi_tthree_with_history;
+alter table hi_tthree drop column sys_period;
+drop table hi_tthree_history;
+
+drop table if exists hi_tthree cascade;
+
+drop trigger if exists hi_ttwo_history_upd on hi_ttwo cascade;
+drop function if exists hi_ttwo_history_version();
+
+drop view hi_ttwo_with_history;
+alter table hi_ttwo drop column sys_period;
+drop table hi_ttwo_history;
+
+drop table if exists hi_ttwo cascade;
+
+drop trigger if exists hsd_setting_history_upd on hsd_setting cascade;
+drop function if exists hsd_setting_history_version();
+
+drop view hsd_setting_with_history;
+alter table hsd_setting drop column sys_period;
+drop table hsd_setting_history;
+
+drop table if exists hsd_setting cascade;
+
+drop trigger if exists hsd_user_history_upd on hsd_user cascade;
+drop function if exists hsd_user_history_version();
+
+drop view hsd_user_with_history;
+alter table hsd_user drop column sys_period;
+drop table hsd_user_history;
+
+drop table if exists hsd_user cascade;
+
+drop table if exists iaf_segment cascade;
+
+drop table if exists iaf_segment_status cascade;
+
 drop table if exists imrelated cascade;
 
 drop table if exists imroot cascade;
@@ -921,6 +1272,10 @@ drop table if exists item cascade;
 
 drop table if exists monkey cascade;
 
+drop table if exists mkeygroup cascade;
+
+drop table if exists mkeygroup_monkey cascade;
+
 drop table if exists trainer cascade;
 
 drop table if exists trainer_monkey cascade;
@@ -962,6 +1317,22 @@ drop table if exists la_attr_value cascade;
 
 drop table if exists la_attr_value_attribute cascade;
 
+drop table if exists looney cascade;
+
+drop table if exists maddress cascade;
+
+drop table if exists mcontact cascade;
+
+drop table if exists mcontact_message cascade;
+
+drop table if exists mcustomer cascade;
+
+drop table if exists mgroup cascade;
+
+drop table if exists mmachine cascade;
+
+drop table if exists mmachine_mgroup cascade;
+
 drop table if exists mmedia cascade;
 
 drop table if exists non_updateprop cascade;
@@ -992,10 +1363,24 @@ drop table if exists mail_user_inbox cascade;
 
 drop table if exists mail_user_outbox cascade;
 
+drop table if exists main_entity cascade;
+
+drop table if exists main_entity_relation cascade;
+
 drop table if exists map_super_actual cascade;
 
 drop table if exists c_message cascade;
 
+drop table if exists meter_address_data cascade;
+
+drop table if exists meter_contract_data cascade;
+
+drop table if exists meter_special_needs_client cascade;
+
+drop table if exists meter_special_needs_contact cascade;
+
+drop table if exists meter_version cascade;
+
 drop table if exists mnoc_role cascade;
 
 drop table if exists mnoc_user cascade;
@@ -1038,6 +1423,8 @@ drop table if exists o_cached_bean_country cascade;
 
 drop table if exists o_cached_bean_child cascade;
 
+drop table if exists o_cached_inherit cascade;
+
 drop table if exists o_cached_natkey cascade;
 
 drop table if exists o_cached_natkey3 cascade;
@@ -1056,6 +1443,8 @@ drop table if exists om_ordered_detail cascade;
 
 drop table if exists om_ordered_master cascade;
 
+drop table if exists only_id_entity cascade;
+
 drop table if exists o_order cascade;
 
 drop table if exists o_order_detail cascade;
@@ -1068,6 +1457,22 @@ drop table if exists or_order_ship cascade;
 
 drop table if exists organisation cascade;
 
+drop table if exists organization_node cascade;
+
+drop table if exists organization_tree_node cascade;
+
+drop table if exists orp_detail cascade;
+
+drop table if exists orp_detail2 cascade;
+
+drop table if exists orp_master cascade;
+
+drop table if exists orp_master2 cascade;
+
+drop table if exists oto_aone cascade;
+
+drop table if exists oto_atwo cascade;
+
 drop table if exists oto_bchild cascade;
 
 drop table if exists oto_bmaster cascade;
@@ -1078,12 +1483,22 @@ drop table if exists oto_cust cascade;
 
 drop table if exists oto_cust_address cascade;
 
+drop table if exists oto_level_a cascade;
+
+drop table if exists oto_level_b cascade;
+
+drop table if exists oto_level_c cascade;
+
 drop table if exists oto_master cascade;
 
 drop table if exists oto_prime cascade;
 
 drop table if exists oto_prime_extra cascade;
 
+drop table if exists oto_sd_child cascade;
+
+drop table if exists oto_sd_master cascade;
+
 drop table if exists oto_th_many cascade;
 
 drop table if exists oto_th_one cascade;
@@ -1098,6 +1513,10 @@ drop table if exists oto_uprime cascade;
 
 drop table if exists oto_uprime_extra cascade;
 
+drop table if exists oto_user_model cascade;
+
+drop table if exists oto_user_model_optional cascade;
+
 drop table if exists pfile cascade;
 
 drop table if exists pfile_content cascade;
@@ -1114,22 +1533,32 @@ drop table if exists rawinherit_parent cascade;
 
 drop table if exists rawinherit_parent_rawinherit_data cascade;
 
+drop table if exists e_save_test_c cascade;
+
 drop table if exists parent_person cascade;
 
 drop table if exists c_participation cascade;
 
+drop table if exists password_store_model cascade;
+
 drop table if exists mt_permission cascade;
 
 drop table if exists persistent_file cascade;
 
 drop table if exists persistent_file_content cascade;
 
-drop table if exists persons cascade;
-
 drop table if exists person cascade;
 
+drop table if exists persons cascade;
+
+drop table if exists person_cache_email cascade;
+
+drop table if exists person_cache_info cascade;
+
 drop table if exists phones cascade;
 
+drop table if exists e_position cascade;
+
 drop table if exists primary_revision cascade;
 
 drop table if exists o_product cascade;
@@ -1146,14 +1575,18 @@ drop table if exists r_orders cascade;
 
 drop table if exists region cascade;
 
-drop table if exists resourcefile cascade;
+drop table if exists rel_detail cascade;
 
-drop table if exists em_role cascade;
+drop table if exists rel_master cascade;
+
+drop table if exists resourcefile cascade;
 
 drop table if exists mt_role cascade;
 
 drop table if exists mt_role_permission cascade;
 
+drop table if exists em_role cascade;
+
 drop table if exists f_second cascade;
 
 drop table if exists section cascade;
@@ -1164,6 +1597,14 @@ drop table if exists self_ref_customer cascade;
 
 drop table if exists self_ref_example cascade;
 
+drop table if exists e_save_test_a cascade;
+
+drop table if exists e_save_test_b cascade;
+
+drop table if exists site cascade;
+
+drop table if exists site_address cascade;
+
 drop table if exists some_enum_bean cascade;
 
 drop table if exists some_file_bean cascade;
@@ -1228,10 +1669,18 @@ drop table if exists trip cascade;
 
 drop table if exists truck_ref cascade;
 
-drop table if exists type cascade;
+drop table if exists tune cascade;
+
+drop table if exists "type" cascade;
 
 drop table if exists tz_bean cascade;
 
+drop table if exists usib_child cascade;
+
+drop table if exists usib_child_sibling cascade;
+
+drop table if exists usib_parent cascade;
+
 drop table if exists ut_detail cascade;
 
 drop table if exists ut_master cascade;
@@ -1240,6 +1689,8 @@ drop table if exists uuone cascade;
 
 drop table if exists uutwo cascade;
 
+drop table if exists oto_user cascade;
+
 drop trigger if exists c_user_history_upd on c_user cascade;
 drop function if exists c_user_history_version();
 
@@ -1255,24 +1706,24 @@ drop table if exists g_user cascade;
 
 drop table if exists em_user cascade;
 
-drop table if exists oto_user cascade;
-
 drop table if exists em_user_role cascade;
 
 drop table if exists vehicle cascade;
 
 drop table if exists vehicle_driver cascade;
 
+drop table if exists vehicle_lease cascade;
+
 drop table if exists warehouses cascade;
 
 drop table if exists warehousesshippingzones cascade;
 
-drop table if exists sa_wheel cascade;
-drop sequence if exists sa_wheel_seq;
-
 drop table if exists wheel cascade;
 drop sequence if exists wheel_seq;
 
+drop table if exists sa_wheel cascade;
+drop sequence if exists sa_wheel_seq;
+
 drop table if exists sp_car_wheel cascade;
 drop sequence if exists sp_car_wheel_seq;
 
@@ -1288,3 +1739,5 @@ drop table if exists zones cascade;
 
 drop index if exists ix_contact_last_name_first_name;
 drop index if exists ix_e_basic_name;
+drop index if exists ix_efile2_no_fk_owner_id;
+drop index if exists ix_organization_node_kind;
diff --git a/src/test/ddl-review/sqlserver-create-all.sql b/src/test/ddl-review/sqlserver-create-all.sql
index 166eb009d..0b76e79fa 100644
--- a/src/test/ddl-review/sqlserver-create-all.sql
+++ b/src/test/ddl-review/sqlserver-create-all.sql
@@ -1,4 +1,115 @@
--- Generated by ebean unknown at 2018-03-08T06:24:28.188Z
+-- Generated by ebean unknown at 2019-07-25T09:32:20.917Z
+-- init script create procs
+-- Initial script to create stored procedures etc for sqlserver platform
+
+-- create table-value-parameters
+if not exists (select name  from sys.types where name = 'ebean_bigint_tvp') create type ebean_bigint_tvp as table (c1 bigint)
+GO
+if not exists (select name  from sys.types where name = 'ebean_float_tvp') create type ebean_float_tvp as table (c1 float)
+GO
+if not exists (select name  from sys.types where name = 'ebean_bit_tvp') create type ebean_bit_tvp as table (c1 bit)
+GO
+if not exists (select name  from sys.types where name = 'ebean_date_tvp') create type ebean_date_tvp as table (c1 date)
+GO
+if not exists (select name  from sys.types where name = 'ebean_time_tvp') create type ebean_time_tvp as table (c1 time)
+GO
+if not exists (select name  from sys.types where name = 'ebean_uniqueidentifier_tvp') create type ebean_uniqueidentifier_tvp as table (c1 uniqueidentifier)
+GO
+if not exists (select name  from sys.types where name = 'ebean_nvarchar_tvp') create type ebean_nvarchar_tvp as table (c1 nvarchar(max))
+GO
+
+--
+-- PROCEDURE: usp_ebean_drop_indices TABLE, COLUMN
+-- deletes all indices referring to TABLE.COLUMN
+--
+CREATE OR ALTER PROCEDURE usp_ebean_drop_indices @tableName nvarchar(255), @columnName nvarchar(255)
+AS SET NOCOUNT ON
+declare @sql nvarchar(1000)
+declare @indexName nvarchar(255)
+BEGIN
+  DECLARE index_cursor CURSOR FOR SELECT i.name from sys.indexes i
+    join sys.index_columns ic on ic.object_id = i.object_id and ic.index_id = i.index_id
+    join sys.columns c on c.object_id = ic.object_id and c.column_id = ic.column_id
+    where i.object_id = OBJECT_ID(@tableName) AND c.name = @columnName;
+  OPEN index_cursor
+  FETCH NEXT FROM index_cursor INTO @indexName
+  WHILE @@FETCH_STATUS = 0
+    BEGIN
+      set @sql = 'drop index ' + @indexName + ' on ' + @tableName;
+      EXECUTE(@sql);
+
+      FETCH NEXT FROM index_cursor INTO @indexName
+    END;
+  CLOSE index_cursor;
+  DEALLOCATE index_cursor;
+END
+GO
+
+--
+-- PROCEDURE: usp_ebean_drop_default_constraint TABLE, COLUMN
+-- deletes the default constraint, which has a random name
+--
+CREATE OR ALTER PROCEDURE usp_ebean_drop_default_constraint @tableName nvarchar(255), @columnName nvarchar(255)
+AS SET NOCOUNT ON
+declare @tmp nvarchar(1000)
+BEGIN
+  select @tmp = t1.name from sys.default_constraints t1
+    join sys.columns t2 on t1.object_id = t2.default_object_id
+    where t1.parent_object_id = OBJECT_ID(@tableName) and t2.name = @columnName;
+
+  if @tmp is not null EXEC('alter table ' + @tableName +' drop constraint ' + @tmp);
+END
+GO
+
+--
+-- PROCEDURE: usp_ebean_drop_constraints TABLE, COLUMN
+-- deletes constraints and foreign keys refering to TABLE.COLUMN
+--
+CREATE OR ALTER PROCEDURE usp_ebean_drop_constraints @tableName nvarchar(255), @columnName nvarchar(255)
+AS SET NOCOUNT ON
+declare @sql nvarchar(1000)
+declare @constraintName nvarchar(255)
+BEGIN
+  DECLARE name_cursor CURSOR FOR
+  SELECT cc.name from sys.check_constraints cc
+    join sys.columns c on c.object_id = cc.parent_object_id and c.column_id = cc.parent_column_id
+    where parent_object_id = OBJECT_ID(@tableName) AND c.name = @columnName
+  UNION SELECT fk.name from sys.foreign_keys fk
+    join sys.foreign_key_columns fkc on fkc.constraint_object_id = fk.object_id
+      and  fkc.parent_object_id = fk.parent_object_id
+    join sys.columns c on c.object_id = fkc.parent_object_id and c.column_id = fkc.parent_column_id
+    where fkc.parent_object_id = OBJECT_ID(@tableName) AND c.name = @columnName;
+
+  OPEN name_cursor
+  FETCH NEXT FROM name_cursor INTO @constraintName
+  WHILE @@FETCH_STATUS = 0
+    BEGIN
+      set @sql = 'alter table ' + @tableName + ' drop constraint ' + @constraintName;
+      EXECUTE(@sql);
+
+      FETCH NEXT FROM name_cursor INTO @constraintName
+    END;
+  CLOSE name_cursor;
+  DEALLOCATE name_cursor;
+END
+GO
+
+--
+-- PROCEDURE: usp_ebean_drop_column TABLE, COLUMN
+-- deletes the column annd ensures that all indices and constraints are dropped first
+--
+CREATE OR ALTER PROCEDURE usp_ebean_drop_column @tableName nvarchar(255), @columnName nvarchar(255)
+AS SET NOCOUNT ON
+declare @sql nvarchar(1000)
+BEGIN
+  EXEC usp_ebean_drop_indices @tableName, @columnName;
+  EXEC usp_ebean_drop_default_constraint @tableName, @columnName;
+  EXEC usp_ebean_drop_constraints @tableName, @columnName;
+
+  set @sql = 'alter table ' + @tableName + ' drop column ' + @columnName;
+  EXECUTE(@sql);
+END
+GO
 create table asimple_bean (
   id                            numeric(19) not null,
   name                          nvarchar(255),
@@ -15,6 +126,16 @@ create table bar (
 );
 create sequence bar_seq as bigint  start with 1  increment by 50;
 
+create table block (
+  case_type                     integer not null,
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  notes                         nvarchar(255),
+  constraint pk_block primary key (id)
+);
+create sequence block_seq as bigint  start with 1  increment by 50;
+
 create table oto_account (
   id                            numeric(19) not null,
   name                          nvarchar(255),
@@ -25,6 +146,21 @@ create table oto_account (
 );
 create sequence oto_account_seq as bigint  start with 1  increment by 50;
 
+create table acl (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_acl primary key (id)
+);
+create sequence acl_seq as bigint  start with 1  increment by 50;
+
+create table acl_container_relation (
+  id                            numeric(19) not null,
+  container_id                  numeric(19) not null,
+  acl_entry_id                  numeric(19) not null,
+  constraint pk_acl_container_relation primary key (id)
+);
+create sequence acl_container_relation_seq as bigint  start with 1  increment by 50;
+
 create table addr (
   id                            numeric(19) not null,
   employee_id                   numeric(19),
@@ -137,12 +273,20 @@ create table bbookmark (
 );
 create sequence bbookmark_seq as bigint  start with 1  increment by 50;
 
+create table bbookmark_org (
+  id                            integer not null,
+  name                          nvarchar(255),
+  constraint pk_bbookmark_org primary key (id)
+);
+create sequence bbookmark_org_seq as bigint  start with 1  increment by 50;
+
 create table bbookmark_user (
   id                            integer not null,
   name                          nvarchar(255),
   password                      nvarchar(255),
   email_address                 nvarchar(255),
   country                       nvarchar(255),
+  org_id                        integer,
   constraint pk_bbookmark_user primary key (id)
 );
 create sequence bbookmark_user_seq as bigint  start with 1  increment by 50;
@@ -160,12 +304,13 @@ create table bsite (
   constraint pk_bsite primary key (id)
 );
 
-create table bsite_user (
+create table bsite_user_a (
   site_id                       uniqueidentifier not null,
   user_id                       uniqueidentifier not null,
   access_level                  integer,
-  constraint ck_bsite_user_access_level check ( access_level in (0,1,2)),
-  constraint pk_bsite_user primary key (site_id,user_id)
+  version                       numeric(19) not null,
+  constraint ck_bsite_user_a_access_level check ( access_level in (0,1,2)),
+  constraint pk_bsite_user_a primary key (site_id,user_id)
 );
 
 create table bsite_user_b (
@@ -184,6 +329,21 @@ create table bsite_user_c (
   constraint pk_bsite_user_c primary key (site_uid,user_uid)
 );
 
+create table bsite_user_d (
+  site_id                       uniqueidentifier not null,
+  user_id                       uniqueidentifier not null,
+  access_level                  integer,
+  version                       numeric(19) not null,
+  constraint ck_bsite_user_d_access_level check ( access_level in (0,1,2))
+);
+
+create table bsite_user_e (
+  site_id                       uniqueidentifier not null,
+  user_id                       uniqueidentifier not null,
+  access_level                  integer,
+  constraint ck_bsite_user_e_access_level check ( access_level in (0,1,2))
+);
+
 create table buser (
   id                            uniqueidentifier not null,
   name                          nvarchar(255),
@@ -193,16 +353,38 @@ create table buser (
 create table bwith_qident (
   id                            integer not null,
   [Name]                        nvarchar(191),
+  [CODE]                        nvarchar(255),
   last_updated                  datetime2 not null,
   constraint pk_bwith_qident primary key (id)
 );
 create unique nonclustered index uq_bwith_qident_name on bwith_qident([Name]) where [Name] is not null;
 create sequence bwith_qident_seq as bigint  start with 1  increment by 50;
 
+create table basic_draftable_bean (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_basic_draftable_bean primary key (id)
+);
+create sequence basic_draftable_bean_seq as bigint  start with 1  increment by 50;
+
+create table basic_draftable_bean_draft (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_basic_draftable_bean_draft primary key (id)
+);
+create sequence basic_draftable_bean_draft_seq as bigint  start with 1 ;
+
 create table basic_joda_entity (
   id                            numeric(19) not null,
   name                          nvarchar(255),
   period                        nvarchar(50),
+  local_date                    date,
   created                       datetime2 not null,
   updated                       datetime2 not null,
   version                       datetime2 not null,
@@ -231,6 +413,49 @@ create unique nonclustered index uq_drel_booking_agent_invoice on drel_booking(a
 create unique nonclustered index uq_drel_booking_client_invoice on drel_booking(client_invoice) where client_invoice is not null;
 create sequence drel_booking_seq as bigint  start with 1  increment by 50;
 
+create table bw_bean (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  flags                         integer not null,
+  version                       numeric(19) not null,
+  constraint pk_bw_bean primary key (id)
+);
+create sequence bw_bean_seq as bigint  start with 1  increment by 50;
+
+create table cepcategory (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_cepcategory primary key (id)
+);
+create sequence cepcategory_seq as bigint  start with 1  increment by 50;
+
+create table cepproduct (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_cepproduct primary key (id)
+);
+create sequence cepproduct_seq as bigint  start with 1  increment by 50;
+
+create table cepproduct_category (
+  customer_id                   numeric(19) not null,
+  address_id                    numeric(19) not null,
+  category_id                   numeric(19) not null,
+  product_id                    numeric(19) not null,
+  priority                      integer
+);
+
+create table cinh_ref (
+  id                            integer not null,
+  ref_id                        integer,
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  constraint pk_cinh_ref primary key (id)
+);
+create sequence cinh_ref_seq as bigint  start with 1  increment by 50;
+
 create table cinh_root (
   dtype                         nvarchar(3) not null,
   id                            integer not null,
@@ -287,15 +512,9 @@ create table cao_bean (
   constraint pk_cao_bean primary key (x_cust_id,x_type_id)
 );
 
-create table sa_car (
-  id                            numeric(19) not null,
-  version                       integer not null,
-  constraint pk_sa_car primary key (id)
-);
-create sequence sa_car_seq as bigint  start with 1  increment by 50;
-
 create table sp_car_car (
   id                            numeric(19) not null,
+  name                          nvarchar(255),
   version                       integer not null,
   constraint pk_sp_car_car primary key (id)
 );
@@ -307,6 +526,19 @@ create table sp_car_car_wheels (
   constraint pk_sp_car_car_wheels primary key (car,wheel)
 );
 
+create table sp_car_car_doors (
+  car                           numeric(19) not null,
+  door                          numeric(19) not null,
+  constraint pk_sp_car_car_doors primary key (car,door)
+);
+
+create table sa_car (
+  id                            numeric(19) not null,
+  version                       integer not null,
+  constraint pk_sa_car primary key (id)
+);
+create sequence sa_car_seq as bigint  start with 1  increment by 50;
+
 create table car_accessory (
   id                            integer not null,
   name                          nvarchar(255),
@@ -335,6 +567,16 @@ create table category (
 );
 create sequence category_seq as bigint  start with 1  increment by 50;
 
+create table e_save_test_d (
+  id                            numeric(19) not null,
+  parent_id                     numeric(19),
+  test_property                 integer default 0 not null,
+  version                       numeric(19) not null,
+  constraint pk_e_save_test_d primary key (id)
+);
+create unique nonclustered index uq_e_save_test_d_parent_id on e_save_test_d(parent_id) where parent_id is not null;
+create sequence e_save_test_d_seq as bigint  start with 1  increment by 50;
+
 create table child_person (
   identifier                    integer not null,
   name                          nvarchar(255),
@@ -347,6 +589,35 @@ create table child_person (
 );
 create sequence child_person_seq as bigint  start with 1  increment by 50;
 
+create table cke_client (
+  cod_cpny                      integer not null,
+  cod_client                    nvarchar(100) not null,
+  username                      nvarchar(100) not null,
+  notes                         nvarchar(255),
+  constraint pk_cke_client primary key (cod_cpny,cod_client)
+);
+
+create table cke_user (
+  username                      nvarchar(100) not null,
+  cod_cpny                      integer not null,
+  name                          nvarchar(255),
+  constraint pk_cke_user primary key (username,cod_cpny)
+);
+
+create table class_super (
+  dtype                         nvarchar(31) not null,
+  sid                           numeric(19) not null,
+  constraint pk_class_super primary key (sid)
+);
+create sequence class_super_seq as bigint  start with 1  increment by 50;
+
+create table class_super_monkey (
+  class_super_sid               numeric(19) not null,
+  monkey_mid                    numeric(19) not null,
+  constraint uq_class_super_monkey_mid unique (monkey_mid),
+  constraint pk_class_super_monkey primary key (class_super_sid,monkey_mid)
+);
+
 create table configuration (
   type                          nvarchar(21) not null,
   id                            integer not null,
@@ -402,6 +673,21 @@ create table contact_note (
 );
 create sequence contact_note_seq as bigint  start with 1  increment by 50;
 
+create table contract (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_contract primary key (id)
+);
+create sequence contract_seq as bigint  start with 1  increment by 50;
+
+create table contract_costs (
+  id                            numeric(19) not null,
+  status                        nvarchar(255),
+  position_id                   numeric(19) not null,
+  constraint pk_contract_costs primary key (id)
+);
+create sequence contract_costs_seq as bigint  start with 1  increment by 50;
+
 create table c_conversation (
   id                            numeric(19) not null,
   title                         nvarchar(255),
@@ -422,7 +708,7 @@ create table o_country (
 
 create table cover (
   id                            numeric(19) not null,
-  s3url                         nvarchar(255),
+  s3_url                        nvarchar(255),
   deleted                       integer default 0 not null,
   constraint pk_cover primary key (id)
 );
@@ -466,6 +752,60 @@ create table dexh_entity (
 );
 create sequence dexh_entity_seq as bigint  start with 1  increment by 50;
 
+create table dmachine (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  organisation_id               numeric(19),
+  version                       numeric(19) not null,
+  constraint pk_dmachine primary key (id)
+);
+create sequence dmachine_seq as bigint  start with 1  increment by 50;
+
+create table d_machine_aux_use (
+  id                            numeric(19) not null,
+  machine_id                    numeric(19) not null,
+  name                          nvarchar(255),
+  date                          date,
+  use_secs                      numeric(19) not null,
+  fuel                          numeric(28),
+  version                       numeric(19) not null,
+  constraint pk_d_machine_aux_use primary key (id)
+);
+create sequence d_machine_aux_use_seq as bigint  start with 1  increment by 50;
+
+create table d_machine_stats (
+  id                            numeric(19) not null,
+  machine_id                    numeric(19) not null,
+  date                          date,
+  total_kms                     numeric(19) not null,
+  hours                         numeric(19) not null,
+  rate                          numeric(28),
+  cost                          numeric(28),
+  version                       numeric(19) not null,
+  constraint pk_d_machine_stats primary key (id)
+);
+create sequence d_machine_stats_seq as bigint  start with 1  increment by 50;
+
+create table d_machine_use (
+  id                            numeric(19) not null,
+  machine_id                    numeric(19) not null,
+  date                          date,
+  distance_kms                  numeric(19) not null,
+  time_secs                     numeric(19) not null,
+  fuel                          numeric(28),
+  version                       numeric(19) not null,
+  constraint pk_d_machine_use primary key (id)
+);
+create sequence d_machine_use_seq as bigint  start with 1  increment by 50;
+
+create table dorg (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_dorg primary key (id)
+);
+create sequence dorg_seq as bigint  start with 1  increment by 50;
+
 create table dperson (
   id                            numeric(19) not null,
   first_name                    nvarchar(255),
@@ -502,6 +842,29 @@ create table rawinherit_data (
 );
 create sequence rawinherit_data_seq as bigint  start with 1  increment by 50;
 
+create table data_container (
+  id                            uniqueidentifier not null,
+  content                       nvarchar(255),
+  constraint pk_data_container primary key (id)
+);
+
+create table dc_detail (
+  id                            numeric(19) not null,
+  master_id                     numeric(19),
+  description                   nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_dc_detail primary key (id)
+);
+create sequence dc_detail_seq as bigint  start with 1  increment by 50;
+
+create table dc_master (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_dc_master primary key (id)
+);
+create sequence dc_master_seq as bigint  start with 1  increment by 50;
+
 create table dfk_cascade (
   id                            numeric(19) not null,
   name                          nvarchar(255),
@@ -533,6 +896,19 @@ create table dfk_none_via_join (
 );
 create sequence dfk_none_via_join_seq as bigint  start with 1  increment by 50;
 
+create table dfk_none_via_mto_m (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_dfk_none_via_mto_m primary key (id)
+);
+create sequence dfk_none_via_mto_m_seq as bigint  start with 1  increment by 50;
+
+create table dfk_none_via_mto_m_dfk_one (
+  dfk_none_via_mto_m_id         numeric(19) not null,
+  dfk_one_id                    numeric(19) not null,
+  constraint pk_dfk_none_via_mto_m_dfk_one primary key (dfk_none_via_mto_m_id,dfk_one_id)
+);
+
 create table dfk_one (
   id                            numeric(19) not null,
   name                          nvarchar(255),
@@ -631,16 +1007,28 @@ create table document_media_draft (
 );
 create sequence document_media_draft_seq as bigint  start with 1 ;
 
+create table sp_car_door (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       integer not null,
+  constraint pk_sp_car_door primary key (id)
+);
+create sequence sp_car_door_seq as bigint  start with 1  increment by 50;
+
 create table earray_bean (
   id                            numeric(19) not null,
+  foo                           integer,
   name                          nvarchar(255),
   phone_numbers                 varchar(300),
   uids                          varchar(1000),
   other_ids                     varchar(1000),
   doubs                         varchar(1000),
   statuses                      varchar(1000),
+  vc_enums                      varchar(1000),
+  int_enums                     varchar(1000),
   status2                       varchar(1000),
   version                       numeric(19) not null,
+  constraint ck_earray_bean_foo check ( foo in (100,101,102)),
   constraint pk_earray_bean primary key (id)
 );
 create sequence earray_bean_seq as bigint  start with 1  increment by 50;
@@ -732,6 +1120,17 @@ create table e_basicenc_bin (
 );
 create sequence e_basicenc_bin_seq as bigint  start with 1  increment by 50;
 
+create table e_basicenc_client (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  description                   varbinary(80),
+  dob                           varbinary(20),
+  status                        varbinary(20),
+  version                       numeric(19) not null,
+  constraint pk_e_basicenc_client primary key (id)
+);
+create sequence e_basicenc_client_seq as bigint  start with 1  increment by 50;
+
 create table e_basic_enum_id (
   status                        nvarchar(1) not null,
   name                          nvarchar(255),
@@ -760,6 +1159,30 @@ create table ebasic_hstore (
 );
 create sequence ebasic_hstore_seq as bigint  start with 1  increment by 50;
 
+create table ebasic_json_jackson (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  value_set                     nvarchar(700),
+  value_list                    nvarchar(max),
+  value_map                     nvarchar(700),
+  plain_value                   nvarchar(500),
+  version                       numeric(19) not null,
+  constraint pk_ebasic_json_jackson primary key (id)
+);
+create sequence ebasic_json_jackson_seq as bigint  start with 1  increment by 50;
+
+create table ebasic_json_jackson2 (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  value_set                     nvarchar(700),
+  value_list                    nvarchar(max),
+  value_map                     nvarchar(700),
+  plain_value                   nvarchar(500),
+  version                       numeric(19) not null,
+  constraint pk_ebasic_json_jackson2 primary key (id)
+);
+create sequence ebasic_json_jackson2_seq as bigint  start with 1  increment by 50;
+
 create table ebasic_json_list (
   id                            numeric(19) not null,
   name                          nvarchar(255),
@@ -930,6 +1353,14 @@ create table e_basic_withlife (
 );
 create sequence e_basic_withlife_seq as bigint  start with 1  increment by 50;
 
+create table e_basic_with_ex (
+  id                            numeric(19) not null,
+  deleted                       integer default 0 not null,
+  version                       numeric(19) not null,
+  constraint pk_e_basic_with_ex primary key (id)
+);
+create sequence e_basic_with_ex_seq as bigint  start with 1  increment by 50;
+
 create table e_basicverucon (
   id                            integer not null,
   name                          nvarchar(127),
@@ -943,6 +1374,19 @@ create unique nonclustered index uq_e_basicverucon_name on e_basicverucon(name)
 create unique nonclustered index uq_e_basicverucon_other_other_one on e_basicverucon(other,other_one) where other is not null and other_one is not null;
 create sequence e_basicverucon_seq as bigint  start with 1  increment by 50;
 
+create table ecache_child (
+  id                            uniqueidentifier not null,
+  name                          nvarchar(100),
+  root_id                       uniqueidentifier not null,
+  constraint pk_ecache_child primary key (id)
+);
+
+create table ecache_root (
+  id                            uniqueidentifier not null,
+  name                          nvarchar(100),
+  constraint pk_ecache_root primary key (id)
+);
+
 create table e_col_ab (
   id                            numeric(19) not null,
   column_a                      nvarchar(255),
@@ -957,6 +1401,15 @@ create table ecustom_id (
   constraint pk_ecustom_id primary key (id)
 );
 
+create table edefault_prop (
+  id                            integer not null,
+  e_simple_usertypeid           integer,
+  name                          nvarchar(255),
+  constraint pk_edefault_prop primary key (id)
+);
+create unique nonclustered index uq_edefault_prop_e_simple_usertypeid on edefault_prop(e_simple_usertypeid) where e_simple_usertypeid is not null;
+create sequence edefault_prop_seq as bigint  start with 1  increment by 50;
+
 create table eemb_inner (
   id                            integer not null,
   nome_inner                    nvarchar(255),
@@ -976,6 +1429,31 @@ create table eemb_outer (
 );
 create sequence eemb_outer_seq as bigint  start with 1  increment by 50;
 
+create table efile2_no_fk (
+  file_name                     nvarchar(64) not null,
+  owner_id                      integer not null,
+  constraint pk_efile2_no_fk primary key (file_name)
+);
+
+create table efile_no_fk (
+  file_name                     nvarchar(64) not null,
+  owner_user_id                 integer,
+  owner_soft_del_user_id        integer,
+  constraint pk_efile_no_fk primary key (file_name)
+);
+
+create table efile_no_fk_euser_no_fk (
+  efile_no_fk_file_name         nvarchar(64) not null,
+  euser_no_fk_user_id           integer not null,
+  constraint pk_efile_no_fk_euser_no_fk primary key (efile_no_fk_file_name,euser_no_fk_user_id)
+);
+
+create table efile_no_fk_euser_no_fk_soft_del (
+  efile_no_fk_file_name         nvarchar(64) not null,
+  euser_no_fk_soft_del_user_id  integer not null,
+  constraint pk_efile_no_fk_euser_no_fk_soft_del primary key (efile_no_fk_file_name,euser_no_fk_soft_del_user_id)
+);
+
 create table egen_props (
   id                            numeric(19) not null,
   name                          nvarchar(255),
@@ -1075,6 +1553,18 @@ create table eopt_one_c (
 );
 create sequence eopt_one_c_seq as bigint  start with 1  increment by 50;
 
+create table eper_addr (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  ma_street                     nvarchar(255),
+  ma_suburb                     nvarchar(255),
+  ma_city                       nvarchar(255),
+  ma_country_code               nvarchar(2),
+  version                       numeric(19) not null,
+  constraint pk_eper_addr primary key (id)
+);
+create sequence eper_addr_seq as bigint  start with 1  increment by 50;
+
 create table eperson (
   id                            numeric(19) not null,
   name                          nvarchar(255),
@@ -1242,6 +1732,20 @@ create table rawinherit_uncle (
 );
 create sequence rawinherit_uncle_seq as bigint  start with 1  increment by 50;
 
+create table euser_no_fk (
+  user_id                       integer not null,
+  user_name                     nvarchar(255),
+  constraint pk_euser_no_fk primary key (user_id)
+);
+create sequence euser_no_fk_seq as bigint  start with 1  increment by 50;
+
+create table euser_no_fk_soft_del (
+  user_id                       integer not null,
+  user_name                     nvarchar(255),
+  constraint pk_euser_no_fk_soft_del primary key (user_id)
+);
+create sequence euser_no_fk_soft_del_seq as bigint  start with 1  increment by 50;
+
 create table evanilla_collection (
   id                            integer not null,
   name                          nvarchar(255),
@@ -1273,11 +1777,112 @@ create table e_withinet (
   id                            numeric(19) not null,
   name                          nvarchar(255),
   inet_address                  nvarchar(50),
+  inet2                         nvarchar(255),
+  cdir                          varchar(50),
   version                       numeric(19) not null,
   constraint pk_e_withinet primary key (id)
 );
 create sequence e_withinet_seq as bigint  start with 1  increment by 50;
 
+create table ec_enum_person (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_ec_enum_person primary key (id)
+);
+create sequence ec_enum_person_seq as bigint  start with 1  increment by 50;
+
+create table ec_enum_person_tags (
+  ec_enum_person_id             numeric(19) not null,
+  value                         nvarchar(5) not null,
+  constraint ck_ec_enum_person_tags_value check ( value in ('RED','BLUE','GREEN'))
+);
+
+create table ec_person (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_ec_person primary key (id)
+);
+create sequence ec_person_seq as bigint  start with 1  increment by 50;
+
+create table ec_person_phone (
+  owner_id                      numeric(19) not null,
+  phone                         nvarchar(255) not null
+);
+
+create table ecbl_person (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_ecbl_person primary key (id)
+);
+create sequence ecbl_person_seq as bigint  start with 1  increment by 50;
+
+create table ecbl_person_phone_numbers (
+  person_id                     numeric(19) not null,
+  country_code                  nvarchar(2),
+  area                          nvarchar(6),
+  number                        nvarchar(20)
+);
+
+create table ecbm_person (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_ecbm_person primary key (id)
+);
+create sequence ecbm_person_seq as bigint  start with 1  increment by 50;
+
+create table ecbm_person_phone_numbers (
+  person_id                     numeric(19) not null,
+  mkey                          nvarchar(255) not null,
+  country_code                  nvarchar(2),
+  area                          nvarchar(6),
+  number                        nvarchar(20)
+);
+
+create table ecm_person (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_ecm_person primary key (id)
+);
+create sequence ecm_person_seq as bigint  start with 1  increment by 50;
+
+create table ecm_person_phone_numbers (
+  ecm_person_id                 numeric(19) not null,
+  type                          nvarchar(4) not null,
+  number                        nvarchar(10) not null
+);
+
+create table ecmc_person (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_ecmc_person primary key (id)
+);
+create sequence ecmc_person_seq as bigint  start with 1  increment by 50;
+
+create table ecmc_person_phone_numbers (
+  ecmc_person_id                numeric(19) not null,
+  type                          nvarchar(4) not null,
+  value                         nvarchar(max) not null
+);
+
+create table ecs_person (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_ecs_person primary key (id)
+);
+create sequence ecs_person_seq as bigint  start with 1  increment by 50;
+
+create table ecs_person_phone (
+  ecs_person_id                 numeric(19) not null,
+  phone                         nvarchar(255) not null
+);
+
 create table td_child (
   child_id                      integer not null,
   child_name                    nvarchar(255),
@@ -1304,6 +1909,25 @@ create table empl (
 );
 create sequence empl_seq as bigint  start with 1  increment by 50;
 
+create table esd_detail (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  master_id                     numeric(19) not null,
+  version                       numeric(19) not null,
+  deleted                       integer default 0 not null,
+  constraint pk_esd_detail primary key (id)
+);
+create sequence esd_detail_seq as bigint  start with 1  increment by 50;
+
+create table esd_master (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  deleted                       integer default 0 not null,
+  constraint pk_esd_master primary key (id)
+);
+create sequence esd_master_seq as bigint  start with 1  increment by 50;
+
 create table feature_desc (
   id                            integer not null,
   name                          nvarchar(255),
@@ -1396,6 +2020,7 @@ create table hx_link (
   version                       numeric(19) not null,
   when_created                  datetime2 not null,
   when_modified                 datetime2 not null,
+  deleted                       integer default 0 not null,
   constraint pk_hx_link primary key (id)
 );
 create sequence hx_link_seq as bigint  start with 1  increment by 50;
@@ -1434,6 +2059,80 @@ create table hi_link_doc (
   constraint pk_hi_link_doc primary key (hi_link_id,hi_doc_id)
 );
 
+create table hi_tone (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  comments                      nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_hi_tone primary key (id)
+);
+create sequence hi_tone_seq as bigint  start with 1  increment by 50;
+
+create table hi_tthree (
+  id                            numeric(19) not null,
+  hi_ttwo_id                    numeric(19) not null,
+  three                         nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_hi_tthree primary key (id)
+);
+create sequence hi_tthree_seq as bigint  start with 1  increment by 50;
+
+create table hi_ttwo (
+  id                            numeric(19) not null,
+  hi_tone_id                    numeric(19) not null,
+  two                           nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_hi_ttwo primary key (id)
+);
+create sequence hi_ttwo_seq as bigint  start with 1  increment by 50;
+
+create table hsd_setting (
+  id                            numeric(19) not null,
+  code                          nvarchar(255),
+  content                       nvarchar(255),
+  user_id                       numeric(19),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  deleted                       integer default 0 not null,
+  constraint pk_hsd_setting primary key (id)
+);
+create unique nonclustered index uq_hsd_setting_user_id on hsd_setting(user_id) where user_id is not null;
+create sequence hsd_setting_seq as bigint  start with 1  increment by 50;
+
+create table hsd_user (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  deleted                       integer default 0 not null,
+  constraint pk_hsd_user primary key (id)
+);
+create sequence hsd_user_seq as bigint  start with 1  increment by 50;
+
+create table iaf_segment (
+  ptype                         nvarchar(31) not null,
+  id                            numeric(19) not null,
+  segment_id_zat                numeric(19) not null,
+  status_id                     numeric(19) not null,
+  constraint pk_iaf_segment primary key (id)
+);
+create sequence iaf_segment_seq as bigint  start with 1  increment by 50;
+
+create table iaf_segment_status (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_iaf_segment_status primary key (id)
+);
+create sequence iaf_segment_status_seq as bigint  start with 1  increment by 50;
+
 create table imrelated (
   id                            numeric(19) not null,
   name                          nvarchar(255),
@@ -1527,6 +2226,21 @@ create table monkey (
 );
 create sequence monkey_seq as bigint  start with 1  increment by 50;
 
+create table mkeygroup (
+  pid                           numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_mkeygroup primary key (pid)
+);
+create sequence mkeygroup_seq as bigint  start with 1  increment by 50;
+
+create table mkeygroup_monkey (
+  mkeygroup_pid                 numeric(19) not null,
+  monkey_mid                    numeric(19) not null,
+  constraint uq_mkeygroup_monkey_mid unique (monkey_mid),
+  constraint pk_mkeygroup_monkey primary key (mkeygroup_pid,monkey_mid)
+);
+
 create table trainer (
   tid                           numeric(19) not null,
   name                          nvarchar(255),
@@ -1662,6 +2376,73 @@ create table la_attr_value_attribute (
   constraint pk_la_attr_value_attribute primary key (la_attr_value_id,attribute_id)
 );
 
+create table looney (
+  id                            numeric(19) not null,
+  tune_id                       numeric(19),
+  name                          nvarchar(255),
+  constraint pk_looney primary key (id)
+);
+create sequence looney_seq as bigint  start with 1  increment by 50;
+
+create table maddress (
+  id                            uniqueidentifier not null,
+  street                        nvarchar(255),
+  city                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_maddress primary key (id)
+);
+
+create table mcontact (
+  id                            uniqueidentifier not null,
+  email                         nvarchar(255),
+  first_name                    nvarchar(255),
+  last_name                     nvarchar(255),
+  customer_id                   uniqueidentifier,
+  version                       numeric(19) not null,
+  constraint pk_mcontact primary key (id)
+);
+
+create table mcontact_message (
+  id                            uniqueidentifier not null,
+  title                         nvarchar(255),
+  subject                       nvarchar(255),
+  notes                         nvarchar(255),
+  contact_id                    uniqueidentifier not null,
+  version                       numeric(19) not null,
+  constraint pk_mcontact_message primary key (id)
+);
+
+create table mcustomer (
+  id                            uniqueidentifier not null,
+  name                          nvarchar(255),
+  notes                         nvarchar(255),
+  shipping_address_id           uniqueidentifier,
+  billing_address_id            uniqueidentifier,
+  version                       numeric(19) not null,
+  constraint pk_mcustomer primary key (id)
+);
+
+create table mgroup (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_mgroup primary key (id)
+);
+create sequence mgroup_seq as bigint  start with 1  increment by 50;
+
+create table mmachine (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_mmachine primary key (id)
+);
+create sequence mmachine_seq as bigint  start with 1  increment by 50;
+
+create table mmachine_mgroup (
+  mmachine_id                   numeric(19) not null,
+  mgroup_id                     numeric(19) not null,
+  constraint pk_mmachine_mgroup primary key (mmachine_id,mgroup_id)
+);
+
 create table mmedia (
   type                          nvarchar(31) not null,
   id                            numeric(19) not null,
@@ -1786,6 +2567,21 @@ create table mail_user_outbox (
   constraint pk_mail_user_outbox primary key (mail_user_id,mail_box_id)
 );
 
+create table main_entity (
+  id                            nvarchar(255) not null,
+  attr1                         nvarchar(255),
+  attr2                         nvarchar(255),
+  constraint pk_main_entity primary key (id)
+);
+
+create table main_entity_relation (
+  id                            uniqueidentifier not null,
+  id1                           nvarchar(255),
+  id2                           nvarchar(255),
+  attr1                         nvarchar(255),
+  constraint pk_main_entity_relation primary key (id)
+);
+
 create table map_super_actual (
   id                            numeric(19) not null,
   name                          nvarchar(255),
@@ -1808,6 +2604,42 @@ create table c_message (
 );
 create sequence c_message_seq as bigint  start with 1  increment by 50;
 
+create table meter_address_data (
+  id                            uniqueidentifier not null,
+  street                        nvarchar(255) not null,
+  constraint pk_meter_address_data primary key (id)
+);
+
+create table meter_contract_data (
+  id                            uniqueidentifier not null,
+  special_needs_client_id       uniqueidentifier not null,
+  constraint uq_meter_contract_data_special_needs_client_id unique (special_needs_client_id),
+  constraint pk_meter_contract_data primary key (id)
+);
+
+create table meter_special_needs_client (
+  id                            uniqueidentifier not null,
+  name                          nvarchar(255),
+  primary_id                    uniqueidentifier,
+  constraint pk_meter_special_needs_client primary key (id)
+);
+create unique nonclustered index uq_meter_special_needs_client_primary_id on meter_special_needs_client(primary_id) where primary_id is not null;
+
+create table meter_special_needs_contact (
+  id                            uniqueidentifier not null,
+  name                          nvarchar(255),
+  constraint pk_meter_special_needs_contact primary key (id)
+);
+
+create table meter_version (
+  id                            uniqueidentifier not null,
+  address_data_id               uniqueidentifier,
+  contract_data_id              uniqueidentifier not null,
+  constraint uq_meter_version_contract_data_id unique (contract_data_id),
+  constraint pk_meter_version primary key (id)
+);
+create unique nonclustered index uq_meter_version_address_data_id on meter_version(address_data_id) where address_data_id is not null;
+
 create table mnoc_role (
   role_id                       integer not null,
   role_name                     nvarchar(255),
@@ -1971,6 +2803,16 @@ create table o_cached_bean_child (
 );
 create sequence o_cached_bean_child_seq as bigint  start with 1  increment by 50;
 
+create table o_cached_inherit (
+  dtype                         nvarchar(31) not null,
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  child_adata                   nvarchar(255),
+  child_bdata                   nvarchar(255),
+  constraint pk_o_cached_inherit primary key (id)
+);
+create sequence o_cached_inherit_seq as bigint  start with 1  increment by 50;
+
 create table o_cached_natkey (
   id                            numeric(19) not null,
   store                         nvarchar(255),
@@ -2060,6 +2902,12 @@ create table om_ordered_master (
 );
 create sequence om_ordered_master_seq as bigint  start with 1  increment by 50;
 
+create table only_id_entity (
+  id                            numeric(19) not null,
+  constraint pk_only_id_entity primary key (id)
+);
+create sequence only_id_entity_seq as bigint  start with 1  increment by 50;
+
 create table o_order (
   id                            integer not null,
   status                        integer,
@@ -2121,12 +2969,73 @@ create table organisation (
 );
 create sequence organisation_seq as bigint  start with 1  increment by 50;
 
+create table organization_node (
+  kind                          nvarchar(31) not null,
+  id                            numeric(19) not null,
+  parent_tree_node_id           numeric(19) not null,
+  title                         nvarchar(255),
+  constraint uq_organization_node_parent_tree_node_id unique (parent_tree_node_id),
+  constraint pk_organization_node primary key (id)
+);
+create sequence organization_node_seq as bigint  start with 1  increment by 50;
+
+create table organization_tree_node (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_organization_tree_node primary key (id)
+);
+create sequence organization_tree_node_seq as bigint  start with 1  increment by 50;
+
+create table orp_detail (
+  id                            nvarchar(100) not null,
+  detail                        nvarchar(255),
+  master_id                     nvarchar(100),
+  version                       numeric(19) not null,
+  constraint pk_orp_detail primary key (id)
+);
+
+create table orp_detail2 (
+  id                            nvarchar(100) not null,
+  orp_master2_id                nvarchar(100) not null,
+  detail                        nvarchar(255),
+  master_id                     nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_orp_detail2 primary key (id)
+);
+
+create table orp_master (
+  id                            nvarchar(100) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_orp_master primary key (id)
+);
+
+create table orp_master2 (
+  id                            nvarchar(100) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_orp_master2 primary key (id)
+);
+
+create table oto_aone (
+  id                            nvarchar(100) not null,
+  description                   nvarchar(255),
+  constraint pk_oto_aone primary key (id)
+);
+
+create table oto_atwo (
+  id                            nvarchar(100) not null,
+  description                   nvarchar(255),
+  aone_id                       nvarchar(100),
+  constraint pk_oto_atwo primary key (id)
+);
+create unique nonclustered index uq_oto_atwo_aone_id on oto_atwo(aone_id) where aone_id is not null;
+
 create table oto_bchild (
   master_id                     numeric(19) not null,
   child                         nvarchar(255),
   constraint pk_oto_bchild primary key (master_id)
 );
-create sequence oto_bchild_seq as bigint  start with 1  increment by 50;
 
 create table oto_bmaster (
   id                            numeric(19) not null,
@@ -2164,6 +3073,31 @@ create table oto_cust_address (
 create unique nonclustered index uq_oto_cust_address_customer_cid on oto_cust_address(customer_cid) where customer_cid is not null;
 create sequence oto_cust_address_seq as bigint  start with 1  increment by 50;
 
+create table oto_level_a (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  b_id                          numeric(19),
+  constraint pk_oto_level_a primary key (id)
+);
+create unique nonclustered index uq_oto_level_a_b_id on oto_level_a(b_id) where b_id is not null;
+create sequence oto_level_a_seq as bigint  start with 1  increment by 50;
+
+create table oto_level_b (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  c_id                          numeric(19),
+  constraint pk_oto_level_b primary key (id)
+);
+create unique nonclustered index uq_oto_level_b_c_id on oto_level_b(c_id) where c_id is not null;
+create sequence oto_level_b_seq as bigint  start with 1  increment by 50;
+
+create table oto_level_c (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_oto_level_c primary key (id)
+);
+create sequence oto_level_c_seq as bigint  start with 1  increment by 50;
+
 create table oto_master (
   id                            numeric(19) not null,
   name                          nvarchar(255),
@@ -2186,6 +3120,25 @@ create table oto_prime_extra (
   constraint pk_oto_prime_extra primary key (eid)
 );
 
+create table oto_sd_child (
+  id                            numeric(19) not null,
+  child                         nvarchar(255),
+  master_id                     numeric(19),
+  deleted                       integer default 0 not null,
+  version                       numeric(19) not null,
+  constraint pk_oto_sd_child primary key (id)
+);
+create unique nonclustered index uq_oto_sd_child_master_id on oto_sd_child(master_id) where master_id is not null;
+create sequence oto_sd_child_seq as bigint  start with 1  increment by 50;
+
+create table oto_sd_master (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_oto_sd_master primary key (id)
+);
+create sequence oto_sd_master_seq as bigint  start with 1  increment by 50;
+
 create table oto_th_many (
   id                            numeric(19) not null,
   oto_th_top_id                 numeric(19) not null,
@@ -2247,6 +3200,28 @@ create table oto_uprime_extra (
   constraint pk_oto_uprime_extra primary key (eid)
 );
 
+create table oto_user_model (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  user_optional_id              numeric(19),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_oto_user_model primary key (id)
+);
+create unique nonclustered index uq_oto_user_model_user_optional_id on oto_user_model(user_optional_id) where user_optional_id is not null;
+create sequence oto_user_model_seq as bigint  start with 1  increment by 50;
+
+create table oto_user_model_optional (
+  id                            numeric(19) not null,
+  optional                      nvarchar(255),
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_oto_user_model_optional primary key (id)
+);
+create sequence oto_user_model_optional_seq as bigint  start with 1  increment by 50;
+
 create table pfile (
   id                            integer not null,
   name                          nvarchar(255),
@@ -2299,7 +3274,7 @@ create table parcel_location (
   parcelid                      numeric(19),
   constraint pk_parcel_location primary key (parcellocid)
 );
-create unique nonclustered index uq_parcel_location_parcelid on parcel_location(parcelId) where parcelId is not null;
+create unique nonclustered index uq_parcel_location_parcelid on parcel_location(parcelid) where parcelid is not null;
 create sequence parcel_location_seq as bigint  start with 1  increment by 50;
 
 create table rawinherit_parent (
@@ -2317,6 +3292,13 @@ create table rawinherit_parent_rawinherit_data (
   constraint pk_rawinherit_parent_rawinherit_data primary key (rawinherit_parent_id,rawinherit_data_id)
 );
 
+create table e_save_test_c (
+  id                            numeric(19) not null,
+  version                       numeric(19) not null,
+  constraint pk_e_save_test_c primary key (id)
+);
+create sequence e_save_test_c_seq as bigint  start with 1  increment by 50;
+
 create table parent_person (
   identifier                    integer not null,
   name                          nvarchar(255),
@@ -2343,6 +3325,21 @@ create table c_participation (
 );
 create sequence c_participation_seq as bigint  start with 1  increment by 50;
 
+create table password_store_model (
+  id                            numeric(19) not null,
+  enc1                          nvarchar(30),
+  enc2                          nvarchar(40),
+  enc3                          nvarchar(max),
+  enc4                          varbinary(30),
+  enc5                          varbinary(40),
+  enc6                          image,
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint pk_password_store_model primary key (id)
+);
+create sequence password_store_model_seq as bigint  start with 1  increment by 50;
+
 create table mt_permission (
   id                            uniqueidentifier not null,
   name                          nvarchar(255),
@@ -2371,6 +3368,14 @@ create table persistent_file_content (
 create unique nonclustered index uq_persistent_file_content_persistent_file_id on persistent_file_content(persistent_file_id) where persistent_file_id is not null;
 create sequence persistent_file_content_seq as bigint  start with 1  increment by 50;
 
+create table person (
+  oid                           numeric(19) not null,
+  default_address_oid           numeric(19),
+  version                       integer not null,
+  constraint pk_person primary key (oid)
+);
+create sequence person_seq as bigint  start with 1  increment by 50;
+
 create table persons (
   id                            numeric(19) not null,
   surname                       nvarchar(64) not null,
@@ -2379,13 +3384,18 @@ create table persons (
 );
 create sequence PERSONS_seq as bigint  start with 1000 increment by 40;
 
-create table person (
-  oid                           numeric(19) not null,
-  default_address_oid           numeric(19),
-  version                       integer not null,
-  constraint pk_person primary key (oid)
+create table person_cache_email (
+  id                            nvarchar(128) not null,
+  person_info_person_id         nvarchar(128),
+  email                         nvarchar(255),
+  constraint pk_person_cache_email primary key (id)
+);
+
+create table person_cache_info (
+  person_id                     nvarchar(128) not null,
+  name                          nvarchar(255),
+  constraint pk_person_cache_info primary key (person_id)
 );
-create sequence person_seq as bigint  start with 1  increment by 50;
 
 create table phones (
   id                            numeric(19) not null,
@@ -2396,6 +3406,14 @@ create table phones (
 );
 create sequence PHONES_seq as bigint  start with 1  increment by 50;
 
+create table e_position (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  contract_id                   numeric(19) not null,
+  constraint pk_e_position primary key (id)
+);
+create sequence e_position_seq as bigint  start with 1  increment by 50;
+
 create table primary_revision (
   id                            numeric(19) not null,
   revision                      integer not null,
@@ -2459,6 +3477,23 @@ create table region (
   constraint pk_region primary key (customer,type)
 );
 
+create table rel_detail (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       integer not null,
+  constraint pk_rel_detail primary key (id)
+);
+create sequence rel_detail_seq as bigint  start with 1  increment by 50;
+
+create table rel_master (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  detail_id                     numeric(19),
+  version                       integer not null,
+  constraint pk_rel_master primary key (id)
+);
+create sequence rel_master_seq as bigint  start with 1  increment by 50;
+
 create table resourcefile (
   id                            nvarchar(64) not null,
   parentresourcefileid          nvarchar(64),
@@ -2466,13 +3501,6 @@ create table resourcefile (
   constraint pk_resourcefile primary key (id)
 );
 
-create table em_role (
-  id                            numeric(19) not null,
-  name                          nvarchar(255),
-  constraint pk_em_role primary key (id)
-);
-create sequence em_role_seq as bigint  start with 1  increment by 50;
-
 create table mt_role (
   id                            uniqueidentifier not null,
   name                          nvarchar(50),
@@ -2487,6 +3515,13 @@ create table mt_role_permission (
   constraint pk_mt_role_permission primary key (mt_role_id,mt_permission_id)
 );
 
+create table em_role (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_em_role primary key (id)
+);
+create sequence em_role_seq as bigint  start with 1  increment by 50;
+
 create table f_second (
   id                            numeric(19) not null,
   mod_name                      nvarchar(255),
@@ -2535,6 +3570,42 @@ create table self_ref_example (
 );
 create sequence self_ref_example_seq as bigint  start with 1  increment by 50;
 
+create table e_save_test_a (
+  id                            numeric(19) not null,
+  version                       numeric(19) not null,
+  constraint pk_e_save_test_a primary key (id)
+);
+create sequence e_save_test_a_seq as bigint  start with 1  increment by 50;
+
+create table e_save_test_b (
+  id                            numeric(19) not null,
+  sibling_a_id                  numeric(19),
+  test_property                 integer default 0 not null,
+  version                       numeric(19) not null,
+  constraint pk_e_save_test_b primary key (id)
+);
+create unique nonclustered index uq_e_save_test_b_sibling_a_id on e_save_test_b(sibling_a_id) where sibling_a_id is not null;
+create sequence e_save_test_b_seq as bigint  start with 1  increment by 50;
+
+create table site (
+  id                            uniqueidentifier not null,
+  name                          nvarchar(255),
+  parent_id                     uniqueidentifier,
+  data_container_id             uniqueidentifier,
+  site_address_id               uniqueidentifier,
+  constraint pk_site primary key (id)
+);
+create unique nonclustered index uq_site_data_container_id on site(data_container_id) where data_container_id is not null;
+create unique nonclustered index uq_site_site_address_id on site(site_address_id) where site_address_id is not null;
+
+create table site_address (
+  id                            uniqueidentifier not null,
+  street                        nvarchar(255),
+  city                          nvarchar(255),
+  zip_code                      nvarchar(255),
+  constraint pk_site_address primary key (id)
+);
+
 create table some_enum_bean (
   id                            numeric(19) not null,
   some_enum                     integer,
@@ -2559,15 +3630,19 @@ create table some_new_types_bean (
   mth                           integer,
   yr                            integer,
   yr_mth                        date,
+  month_day                     date,
+  sql_date                      date,
   local_date                    date,
   local_date_time               datetime2,
   offset_date_time              datetime2,
   zoned_date_time               datetime2,
+  local_time                    time,
   instant                       datetime2,
   zone_id                       nvarchar(60),
   zone_offset                   nvarchar(60),
   path                          nvarchar(255),
   period                        nvarchar(20),
+  duration                      numeric(19),
   version                       numeric(19) not null,
   constraint ck_some_new_types_bean_dow check ( dow in (1,2,3,4,5,6,7)),
   constraint ck_some_new_types_bean_mth check ( mth in (1,2,3,4,5,6,7,8,9,10,11,12)),
@@ -2810,7 +3885,14 @@ create table truck_ref (
 );
 create sequence truck_ref_seq as bigint  start with 1  increment by 50;
 
-create table type (
+create table tune (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_tune primary key (id)
+);
+create sequence tune_seq as bigint  start with 1  increment by 50;
+
+create table [type] (
   customer                      integer not null,
   type                          integer not null,
   description                   nvarchar(255),
@@ -2828,6 +3910,29 @@ create table tz_bean (
 );
 create sequence tz_bean_seq as bigint  start with 1  increment by 50;
 
+create table usib_child (
+  id                            uniqueidentifier not null,
+  parent_id                     numeric(19),
+  deleted                       integer default 0 not null,
+  constraint pk_usib_child primary key (id)
+);
+
+create table usib_child_sibling (
+  id                            numeric(19) not null,
+  child_id                      uniqueidentifier,
+  deleted                       integer default 0 not null,
+  constraint pk_usib_child_sibling primary key (id)
+);
+create unique nonclustered index uq_usib_child_sibling_child_id on usib_child_sibling(child_id) where child_id is not null;
+create sequence usib_child_sibling_seq as bigint  start with 1  increment by 50;
+
+create table usib_parent (
+  id                            numeric(19) not null,
+  deleted                       integer default 0 not null,
+  constraint pk_usib_parent primary key (id)
+);
+create sequence usib_parent_seq as bigint  start with 1  increment by 50;
+
 create table ut_detail (
   id                            integer not null,
   utmaster_id                   integer not null,
@@ -2843,6 +3948,7 @@ create table ut_master (
   id                            integer not null,
   name                          nvarchar(255),
   description                   nvarchar(255),
+  date                          date,
   version                       integer not null,
   constraint pk_ut_master primary key (id)
 );
@@ -2851,16 +3957,32 @@ create sequence ut_master_seq as bigint  start with 1  increment by 50;
 create table uuone (
   id                            uniqueidentifier not null,
   name                          nvarchar(255),
+  description                   nvarchar(255),
+  version                       numeric(19) not null,
   constraint pk_uuone primary key (id)
 );
 
 create table uutwo (
   id                            uniqueidentifier not null,
   name                          nvarchar(255),
+  notes                         nvarchar(255),
   master_id                     uniqueidentifier,
+  version                       numeric(19) not null,
   constraint pk_uutwo primary key (id)
 );
 
+create table oto_user (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  account_id                    numeric(19) not null,
+  version                       numeric(19) not null,
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  constraint uq_oto_user_account_id unique (account_id),
+  constraint pk_oto_user primary key (id)
+);
+create sequence oto_user_seq as bigint  start with 1  increment by 50;
+
 create table c_user (
   id                            numeric(19) not null,
   inactive                      integer default 0 not null,
@@ -2897,18 +4019,6 @@ create table em_user (
 );
 create sequence em_user_seq as bigint  start with 1  increment by 50;
 
-create table oto_user (
-  id                            numeric(19) not null,
-  name                          nvarchar(255),
-  account_id                    numeric(19) not null,
-  version                       numeric(19) not null,
-  when_created                  datetime2 not null,
-  when_modified                 datetime2 not null,
-  constraint uq_oto_user_account_id unique (account_id),
-  constraint pk_oto_user primary key (id)
-);
-create sequence oto_user_seq as bigint  start with 1  increment by 50;
-
 create table em_user_role (
   user_id                       numeric(19) not null,
   role_id                       numeric(19) not null,
@@ -2920,10 +4030,11 @@ create table vehicle (
   id                            integer not null,
   license_number                nvarchar(255),
   registration_date             datetime2,
+  lease_id                      numeric(19),
   cretime                       datetime2 not null,
   updtime                       datetime2 not null,
   version                       numeric(19) not null,
-  siz                           nvarchar(1),
+  siz                           nvarchar(3),
   driver                        nvarchar(255),
   car_ref_id                    integer,
   notes                         nvarchar(255),
@@ -2947,6 +4058,21 @@ create table vehicle_driver (
 );
 create sequence vehicle_driver_seq as bigint  start with 1  increment by 50;
 
+create table vehicle_lease (
+  dtype                         nvarchar(31) not null,
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  active_start                  date,
+  active_end                    date,
+  version                       numeric(19) not null,
+  bond                          numeric(28),
+  min_duration                  integer not null,
+  day_rate                      numeric(28),
+  max_days                      integer,
+  constraint pk_vehicle_lease primary key (id)
+);
+create sequence vehicle_lease_seq as bigint  start with 1  increment by 50;
+
 create table warehouses (
   id                            integer not null,
   officezoneid                  integer,
@@ -2960,6 +4086,13 @@ create table warehousesshippingzones (
   constraint pk_warehousesshippingzones primary key (warehouseid,shippingzoneid)
 );
 
+create table wheel (
+  id                            numeric(19) not null,
+  version                       integer not null,
+  constraint pk_wheel primary key (id)
+);
+create sequence wheel_seq as bigint  start with 1  increment by 50;
+
 create table sa_wheel (
   id                            numeric(19) not null,
   tire                          numeric(19),
@@ -2969,15 +4102,9 @@ create table sa_wheel (
 );
 create sequence sa_wheel_seq as bigint  start with 1  increment by 50;
 
-create table wheel (
-  id                            numeric(19) not null,
-  version                       integer not null,
-  constraint pk_wheel primary key (id)
-);
-create sequence wheel_seq as bigint  start with 1  increment by 50;
-
 create table sp_car_wheel (
   id                            numeric(19) not null,
+  name                          nvarchar(255),
   version                       integer not null,
   constraint pk_sp_car_wheel primary key (id)
 );
@@ -3029,9 +4156,17 @@ create sequence zones_seq as bigint  start with 1  increment by 50;
 
 create index ix_contact_last_name_first_name on contact (last_name,first_name);
 create index ix_e_basic_name on e_basic (name);
+create index ix_efile2_no_fk_owner_id on efile2_no_fk (owner_id);
+create index ix_organization_node_kind on organization_node (kind);
 create index ix_bar_foo_id on bar (foo_id);
 alter table bar add constraint fk_bar_foo_id foreign key (foo_id) references foo (foo_id);
 
+create index ix_acl_container_relation_container_id on acl_container_relation (container_id);
+alter table acl_container_relation add constraint fk_acl_container_relation_container_id foreign key (container_id) references contract (id);
+
+create index ix_acl_container_relation_acl_entry_id on acl_container_relation (acl_entry_id);
+alter table acl_container_relation add constraint fk_acl_container_relation_acl_entry_id foreign key (acl_entry_id) references acl (id);
+
 create index ix_addr_employee_id on addr (employee_id);
 alter table addr add constraint fk_addr_employee_id foreign key (employee_id) references empl (id);
 
@@ -3049,11 +4184,14 @@ alter table attribute add constraint fk_attribute_attribute_holder_id foreign ke
 create index ix_bbookmark_user_id on bbookmark (user_id);
 alter table bbookmark add constraint fk_bbookmark_user_id foreign key (user_id) references bbookmark_user (id);
 
-create index ix_bsite_user_site_id on bsite_user (site_id);
-alter table bsite_user add constraint fk_bsite_user_site_id foreign key (site_id) references bsite (id);
+create index ix_bbookmark_user_org_id on bbookmark_user (org_id);
+alter table bbookmark_user add constraint fk_bbookmark_user_org_id foreign key (org_id) references bbookmark_org (id);
 
-create index ix_bsite_user_user_id on bsite_user (user_id);
-alter table bsite_user add constraint fk_bsite_user_user_id foreign key (user_id) references buser (id);
+create index ix_bsite_user_a_site_id on bsite_user_a (site_id);
+alter table bsite_user_a add constraint fk_bsite_user_a_site_id foreign key (site_id) references bsite (id);
+
+create index ix_bsite_user_a_user_id on bsite_user_a (user_id);
+alter table bsite_user_a add constraint fk_bsite_user_a_user_id foreign key (user_id) references buser (id);
 
 create index ix_bsite_user_b_site on bsite_user_b (site);
 alter table bsite_user_b add constraint fk_bsite_user_b_site foreign key (site) references bsite (id);
@@ -3067,10 +4205,27 @@ alter table bsite_user_c add constraint fk_bsite_user_c_site_uid foreign key (si
 create index ix_bsite_user_c_user_uid on bsite_user_c (user_uid);
 alter table bsite_user_c add constraint fk_bsite_user_c_user_uid foreign key (user_uid) references buser (id);
 
+create index ix_bsite_user_e_site_id on bsite_user_e (site_id);
+alter table bsite_user_e add constraint fk_bsite_user_e_site_id foreign key (site_id) references bsite (id);
+
+create index ix_bsite_user_e_user_id on bsite_user_e (user_id);
+alter table bsite_user_e add constraint fk_bsite_user_e_user_id foreign key (user_id) references buser (id);
+
+alter table basic_draftable_bean add constraint fk_basic_draftable_bean_id foreign key (id) references basic_draftable_bean_draft (id);
+
 alter table drel_booking add constraint fk_drel_booking_agent_invoice foreign key (agent_invoice) references drel_invoice (id);
 
 alter table drel_booking add constraint fk_drel_booking_client_invoice foreign key (client_invoice) references drel_invoice (id);
 
+create index ix_cepproduct_category_category_id on cepproduct_category (category_id);
+alter table cepproduct_category add constraint fk_cepproduct_category_category_id foreign key (category_id) references cepcategory (id);
+
+create index ix_cepproduct_category_product_id on cepproduct_category (product_id);
+alter table cepproduct_category add constraint fk_cepproduct_category_product_id foreign key (product_id) references cepproduct (id);
+
+create index ix_cinh_ref_ref_id on cinh_ref (ref_id);
+alter table cinh_ref add constraint fk_cinh_ref_ref_id foreign key (ref_id) references cinh_root (id);
+
 create index ix_ckey_detail_parent on ckey_detail (one_key,two_key);
 alter table ckey_detail add constraint fk_ckey_detail_parent foreign key (one_key,two_key) references ckey_parent (one_key,two_key);
 
@@ -3089,6 +4244,12 @@ alter table sp_car_car_wheels add constraint fk_sp_car_car_wheels_sp_car_car for
 create index ix_sp_car_car_wheels_sp_car_wheel on sp_car_car_wheels (wheel);
 alter table sp_car_car_wheels add constraint fk_sp_car_car_wheels_sp_car_wheel foreign key (wheel) references sp_car_wheel (id);
 
+create index ix_sp_car_car_doors_sp_car_car on sp_car_car_doors (car);
+alter table sp_car_car_doors add constraint fk_sp_car_car_doors_sp_car_car foreign key (car) references sp_car_car (id);
+
+create index ix_sp_car_car_doors_sp_car_door on sp_car_car_doors (door);
+alter table sp_car_car_doors add constraint fk_sp_car_car_doors_sp_car_door foreign key (door) references sp_car_door (id);
+
 create index ix_car_accessory_fuse_id on car_accessory (fuse_id);
 alter table car_accessory add constraint fk_car_accessory_fuse_id foreign key (fuse_id) references car_fuse (id);
 
@@ -3098,12 +4259,21 @@ alter table car_accessory add constraint fk_car_accessory_car_id foreign key (ca
 create index ix_category_surveyobjectid on category (surveyobjectid);
 alter table category add constraint fk_category_surveyobjectid foreign key (surveyobjectid) references survey (id);
 
+alter table e_save_test_d add constraint fk_e_save_test_d_parent_id foreign key (parent_id) references e_save_test_c (id);
+
 create index ix_child_person_some_bean_id on child_person (some_bean_id);
 alter table child_person add constraint fk_child_person_some_bean_id foreign key (some_bean_id) references e_basic (id);
 
 create index ix_child_person_parent_identifier on child_person (parent_identifier);
 alter table child_person add constraint fk_child_person_parent_identifier foreign key (parent_identifier) references parent_person (identifier);
 
+create index ix_cke_client_user on cke_client (username,cod_cpny);
+alter table cke_client add constraint fk_cke_client_user foreign key (username,cod_cpny) references cke_user (username,cod_cpny);
+
+alter table class_super_monkey add constraint fk_class_super_monkey_class_super foreign key (class_super_sid) references class_super (sid);
+
+alter table class_super_monkey add constraint fk_class_super_monkey_monkey foreign key (monkey_mid) references monkey (mid);
+
 create index ix_configuration_configurations_id on configuration (configurations_id);
 alter table configuration add constraint fk_configuration_configurations_id foreign key (configurations_id) references configurations (id);
 
@@ -3116,6 +4286,9 @@ alter table contact add constraint fk_contact_group_id foreign key (group_id) re
 create index ix_contact_note_contact_id on contact_note (contact_id);
 alter table contact_note add constraint fk_contact_note_contact_id foreign key (contact_id) references contact (id);
 
+create index ix_contract_costs_position_id on contract_costs (position_id);
+alter table contract_costs add constraint fk_contract_costs_position_id foreign key (position_id) references e_position (id);
+
 create index ix_c_conversation_group_id on c_conversation (group_id);
 alter table c_conversation add constraint fk_c_conversation_group_id foreign key (group_id) references c_group (id);
 
@@ -3131,12 +4304,27 @@ alter table dcredit_drol add constraint fk_dcredit_drol_dcredit foreign key (dcr
 create index ix_dcredit_drol_drol on dcredit_drol (drol_id);
 alter table dcredit_drol add constraint fk_dcredit_drol_drol foreign key (drol_id) references drol (id);
 
+create index ix_dmachine_organisation_id on dmachine (organisation_id);
+alter table dmachine add constraint fk_dmachine_organisation_id foreign key (organisation_id) references dorg (id);
+
+create index ix_d_machine_aux_use_machine_id on d_machine_aux_use (machine_id);
+alter table d_machine_aux_use add constraint fk_d_machine_aux_use_machine_id foreign key (machine_id) references dmachine (id);
+
+create index ix_d_machine_stats_machine_id on d_machine_stats (machine_id);
+alter table d_machine_stats add constraint fk_d_machine_stats_machine_id foreign key (machine_id) references dmachine (id);
+
+create index ix_d_machine_use_machine_id on d_machine_use (machine_id);
+alter table d_machine_use add constraint fk_d_machine_use_machine_id foreign key (machine_id) references dmachine (id);
+
 create index ix_drot_drol_drot on drot_drol (drot_id);
 alter table drot_drol add constraint fk_drot_drol_drot foreign key (drot_id) references drot (id);
 
 create index ix_drot_drol_drol on drot_drol (drol_id);
 alter table drot_drol add constraint fk_drot_drol_drol foreign key (drol_id) references drol (id);
 
+create index ix_dc_detail_master_id on dc_detail (master_id);
+alter table dc_detail add constraint fk_dc_detail_master_id foreign key (master_id) references dc_master (id);
+
 create index ix_dfk_cascade_one_id on dfk_cascade (one_id);
 alter table dfk_cascade add constraint fk_dfk_cascade_one_id foreign key (one_id) references dfk_cascade_one (id) on delete cascade on update cascade;
 
@@ -3174,6 +4362,11 @@ alter table ebasic_no_sdchild add constraint fk_ebasic_no_sdchild_owner_id forei
 create index ix_ebasic_sdchild_owner_id on ebasic_sdchild (owner_id);
 alter table ebasic_sdchild add constraint fk_ebasic_sdchild_owner_id foreign key (owner_id) references ebasic_soft_delete (id);
 
+create index ix_ecache_child_root_id on ecache_child (root_id);
+alter table ecache_child add constraint fk_ecache_child_root_id foreign key (root_id) references ecache_root (id);
+
+alter table edefault_prop add constraint fk_edefault_prop_e_simple_usertypeid foreign key (e_simple_usertypeid) references esimple (usertypeid);
+
 create index ix_eemb_inner_outer_id on eemb_inner (outer_id);
 alter table eemb_inner add constraint fk_eemb_inner_outer_id foreign key (outer_id) references eemb_outer (id);
 
@@ -3189,6 +4382,9 @@ alter table eopt_one_a add constraint fk_eopt_one_a_b_id foreign key (b_id) refe
 create index ix_eopt_one_b_c_id on eopt_one_b (c_id);
 alter table eopt_one_b add constraint fk_eopt_one_b_c_id foreign key (c_id) references eopt_one_c (id);
 
+create index ix_eper_addr_ma_country_code on eper_addr (ma_country_code);
+alter table eper_addr add constraint fk_eper_addr_ma_country_code foreign key (ma_country_code) references o_country (code);
+
 create index ix_esoft_del_book_lend_by_id on esoft_del_book (lend_by_id);
 alter table esoft_del_book add constraint fk_esoft_del_book_lend_by_id foreign key (lend_by_id) references esoft_del_user (id);
 
@@ -3227,12 +4423,36 @@ alter table rawinherit_uncle add constraint fk_rawinherit_uncle_parent_id foreig
 create index ix_evanilla_collection_detail_evanilla_collection_id on evanilla_collection_detail (evanilla_collection_id);
 alter table evanilla_collection_detail add constraint fk_evanilla_collection_detail_evanilla_collection_id foreign key (evanilla_collection_id) references evanilla_collection (id);
 
+create index ix_ec_enum_person_tags_ec_enum_person_id on ec_enum_person_tags (ec_enum_person_id);
+alter table ec_enum_person_tags add constraint fk_ec_enum_person_tags_ec_enum_person_id foreign key (ec_enum_person_id) references ec_enum_person (id);
+
+create index ix_ec_person_phone_owner_id on ec_person_phone (owner_id);
+alter table ec_person_phone add constraint fk_ec_person_phone_owner_id foreign key (owner_id) references ec_person (id);
+
+create index ix_ecbl_person_phone_numbers_person_id on ecbl_person_phone_numbers (person_id);
+alter table ecbl_person_phone_numbers add constraint fk_ecbl_person_phone_numbers_person_id foreign key (person_id) references ecbl_person (id);
+
+create index ix_ecbm_person_phone_numbers_person_id on ecbm_person_phone_numbers (person_id);
+alter table ecbm_person_phone_numbers add constraint fk_ecbm_person_phone_numbers_person_id foreign key (person_id) references ecbm_person (id);
+
+create index ix_ecm_person_phone_numbers_ecm_person_id on ecm_person_phone_numbers (ecm_person_id);
+alter table ecm_person_phone_numbers add constraint fk_ecm_person_phone_numbers_ecm_person_id foreign key (ecm_person_id) references ecm_person (id);
+
+create index ix_ecmc_person_phone_numbers_ecmc_person_id on ecmc_person_phone_numbers (ecmc_person_id);
+alter table ecmc_person_phone_numbers add constraint fk_ecmc_person_phone_numbers_ecmc_person_id foreign key (ecmc_person_id) references ecmc_person (id);
+
+create index ix_ecs_person_phone_ecs_person_id on ecs_person_phone (ecs_person_id);
+alter table ecs_person_phone add constraint fk_ecs_person_phone_ecs_person_id foreign key (ecs_person_id) references ecs_person (id);
+
 create index ix_td_child_parent_id on td_child (parent_id);
 alter table td_child add constraint fk_td_child_parent_id foreign key (parent_id) references td_parent (parent_id);
 
 create index ix_empl_default_address_id on empl (default_address_id);
 alter table empl add constraint fk_empl_default_address_id foreign key (default_address_id) references addr (id);
 
+create index ix_esd_detail_master_id on esd_detail (master_id);
+alter table esd_detail add constraint fk_esd_detail_master_id foreign key (master_id) references esd_master (id);
+
 create index ix_grand_parent_person_some_bean_id on grand_parent_person (some_bean_id);
 alter table grand_parent_person add constraint fk_grand_parent_person_some_bean_id foreign key (some_bean_id) references e_basic (id);
 
@@ -3251,6 +4471,17 @@ alter table hi_link_doc add constraint fk_hi_link_doc_hi_link foreign key (hi_li
 create index ix_hi_link_doc_hi_doc on hi_link_doc (hi_doc_id);
 alter table hi_link_doc add constraint fk_hi_link_doc_hi_doc foreign key (hi_doc_id) references hi_doc (id);
 
+create index ix_hi_tthree_hi_ttwo_id on hi_tthree (hi_ttwo_id);
+alter table hi_tthree add constraint fk_hi_tthree_hi_ttwo_id foreign key (hi_ttwo_id) references hi_ttwo (id);
+
+create index ix_hi_ttwo_hi_tone_id on hi_ttwo (hi_tone_id);
+alter table hi_ttwo add constraint fk_hi_ttwo_hi_tone_id foreign key (hi_tone_id) references hi_tone (id);
+
+alter table hsd_setting add constraint fk_hsd_setting_user_id foreign key (user_id) references hsd_user (id);
+
+create index ix_iaf_segment_status_id on iaf_segment (status_id);
+alter table iaf_segment add constraint fk_iaf_segment_status_id foreign key (status_id) references iaf_segment_status (id);
+
 create index ix_imrelated_owner_id on imrelated (owner_id);
 alter table imrelated add constraint fk_imrelated_owner_id foreign key (owner_id) references imroot (id);
 
@@ -3265,11 +4496,15 @@ create index ix_drel_invoice_booking on drel_invoice (booking);
 alter table drel_invoice add constraint fk_drel_invoice_booking foreign key (booking) references drel_booking (id);
 
 create index ix_item_etype on item (customer,type);
-alter table item add constraint fk_item_etype foreign key (customer,type) references type (customer,type);
+alter table item add constraint fk_item_etype foreign key (customer,type) references [type] (customer,type);
 
 create index ix_item_eregion on item (customer,region);
 alter table item add constraint fk_item_eregion foreign key (customer,region) references region (customer,type);
 
+alter table mkeygroup_monkey add constraint fk_mkeygroup_monkey_mkeygroup foreign key (mkeygroup_pid) references mkeygroup (pid);
+
+alter table mkeygroup_monkey add constraint fk_mkeygroup_monkey_monkey foreign key (monkey_mid) references monkey (mid);
+
 alter table trainer_monkey add constraint fk_trainer_monkey_trainer foreign key (trainer_tid) references trainer (tid);
 
 alter table trainer_monkey add constraint fk_trainer_monkey_monkey foreign key (monkey_mid) references monkey (mid);
@@ -3307,6 +4542,27 @@ alter table la_attr_value_attribute add constraint fk_la_attr_value_attribute_la
 create index ix_la_attr_value_attribute_attribute on la_attr_value_attribute (attribute_id);
 alter table la_attr_value_attribute add constraint fk_la_attr_value_attribute_attribute foreign key (attribute_id) references attribute (id);
 
+create index ix_looney_tune_id on looney (tune_id);
+alter table looney add constraint fk_looney_tune_id foreign key (tune_id) references tune (id);
+
+create index ix_mcontact_customer_id on mcontact (customer_id);
+alter table mcontact add constraint fk_mcontact_customer_id foreign key (customer_id) references mcustomer (id);
+
+create index ix_mcontact_message_contact_id on mcontact_message (contact_id);
+alter table mcontact_message add constraint fk_mcontact_message_contact_id foreign key (contact_id) references mcontact (id);
+
+create index ix_mcustomer_shipping_address_id on mcustomer (shipping_address_id);
+alter table mcustomer add constraint fk_mcustomer_shipping_address_id foreign key (shipping_address_id) references maddress (id);
+
+create index ix_mcustomer_billing_address_id on mcustomer (billing_address_id);
+alter table mcustomer add constraint fk_mcustomer_billing_address_id foreign key (billing_address_id) references maddress (id);
+
+create index ix_mmachine_mgroup_mmachine on mmachine_mgroup (mmachine_id);
+alter table mmachine_mgroup add constraint fk_mmachine_mgroup_mmachine foreign key (mmachine_id) references mmachine (id);
+
+create index ix_mmachine_mgroup_mgroup on mmachine_mgroup (mgroup_id);
+alter table mmachine_mgroup add constraint fk_mmachine_mgroup_mgroup foreign key (mgroup_id) references mgroup (id);
+
 create index ix_mprinter_current_state_id on mprinter (current_state_id);
 alter table mprinter add constraint fk_mprinter_current_state_id foreign key (current_state_id) references mprinter_state (id);
 
@@ -3351,6 +4607,14 @@ alter table c_message add constraint fk_c_message_conversation_id foreign key (c
 create index ix_c_message_user_id on c_message (user_id);
 alter table c_message add constraint fk_c_message_user_id foreign key (user_id) references c_user (id);
 
+alter table meter_contract_data add constraint fk_meter_contract_data_special_needs_client_id foreign key (special_needs_client_id) references meter_special_needs_client (id);
+
+alter table meter_special_needs_client add constraint fk_meter_special_needs_client_primary_id foreign key (primary_id) references meter_special_needs_contact (id);
+
+alter table meter_version add constraint fk_meter_version_address_data_id foreign key (address_data_id) references meter_address_data (id);
+
+alter table meter_version add constraint fk_meter_version_contract_data_id foreign key (contract_data_id) references meter_contract_data (id);
+
 create index ix_mnoc_user_mnoc_role_mnoc_user on mnoc_user_mnoc_role (mnoc_user_user_id);
 alter table mnoc_user_mnoc_role add constraint fk_mnoc_user_mnoc_role_mnoc_user foreign key (mnoc_user_user_id) references mnoc_user (user_id);
 
@@ -3423,14 +4687,30 @@ alter table s_order_items add constraint fk_s_order_items_order_uuid foreign key
 create index ix_or_order_ship_order_id on or_order_ship (order_id);
 alter table or_order_ship add constraint fk_or_order_ship_order_id foreign key (order_id) references o_order (id);
 
+alter table organization_node add constraint fk_organization_node_parent_tree_node_id foreign key (parent_tree_node_id) references organization_tree_node (id);
+
+create index ix_orp_detail_master_id on orp_detail (master_id);
+alter table orp_detail add constraint fk_orp_detail_master_id foreign key (master_id) references orp_master (id);
+
+create index ix_orp_detail2_orp_master2_id on orp_detail2 (orp_master2_id);
+alter table orp_detail2 add constraint fk_orp_detail2_orp_master2_id foreign key (orp_master2_id) references orp_master2 (id);
+
+alter table oto_atwo add constraint fk_oto_atwo_aone_id foreign key (aone_id) references oto_aone (id);
+
 alter table oto_bchild add constraint fk_oto_bchild_master_id foreign key (master_id) references oto_bmaster (id);
 
 alter table oto_child add constraint fk_oto_child_master_id foreign key (master_id) references oto_master (id);
 
 alter table oto_cust_address add constraint fk_oto_cust_address_customer_cid foreign key (customer_cid) references oto_cust (cid);
 
+alter table oto_level_a add constraint fk_oto_level_a_b_id foreign key (b_id) references oto_level_b (id);
+
+alter table oto_level_b add constraint fk_oto_level_b_c_id foreign key (c_id) references oto_level_c (id);
+
 alter table oto_prime_extra add constraint fk_oto_prime_extra_eid foreign key (eid) references oto_prime (pid);
 
+alter table oto_sd_child add constraint fk_oto_sd_child_master_id foreign key (master_id) references oto_sd_master (id);
+
 create index ix_oto_th_many_oto_th_top_id on oto_th_many (oto_th_top_id);
 alter table oto_th_many add constraint fk_oto_th_many_oto_th_top_id foreign key (oto_th_top_id) references oto_th_top (id);
 
@@ -3438,7 +4718,7 @@ alter table oto_th_one add constraint fk_oto_th_one_many_id foreign key (many_id
 
 alter table oto_ubprime_extra add constraint fk_oto_ubprime_extra_eid foreign key (eid) references oto_ubprime (pid);
 
-alter table oto_uprime_extra add constraint fk_oto_uprime_extra_eid foreign key (eid) references oto_uprime (pid);
+alter table oto_user_model add constraint fk_oto_user_model_user_optional_id foreign key (user_optional_id) references oto_user_model_optional (id);
 
 alter table pfile add constraint fk_pfile_file_content_id foreign key (file_content_id) references pfile_content (id);
 
@@ -3474,9 +4754,15 @@ alter table persistent_file_content add constraint fk_persistent_file_content_pe
 create index ix_person_default_address_oid on person (default_address_oid);
 alter table person add constraint fk_person_default_address_oid foreign key (default_address_oid) references address (oid);
 
+create index ix_person_cache_email_person_info_person_id on person_cache_email (person_info_person_id);
+alter table person_cache_email add constraint fk_person_cache_email_person_info_person_id foreign key (person_info_person_id) references person_cache_info (person_id);
+
 create index ix_phones_person_id on phones (person_id);
 alter table phones add constraint fk_phones_person_id foreign key (person_id) references persons (id);
 
+create index ix_e_position_contract_id on e_position (contract_id);
+alter table e_position add constraint fk_e_position_contract_id foreign key (contract_id) references contract (id);
+
 create index ix_pp_to_ww_pp on pp_to_ww (pp_id);
 alter table pp_to_ww add constraint fk_pp_to_ww_pp foreign key (pp_id) references pp (id);
 
@@ -3489,6 +4775,9 @@ alter table question add constraint fk_question_groupobjectid foreign key (group
 create index ix_r_orders_customer on r_orders (company,customername);
 alter table r_orders add constraint fk_r_orders_customer foreign key (company,customername) references rcustomer (company,name);
 
+create index ix_rel_master_detail_id on rel_master (detail_id);
+alter table rel_master add constraint fk_rel_master_detail_id foreign key (detail_id) references rel_detail (id);
+
 create index ix_resourcefile_parentresourcefileid on resourcefile (parentresourcefileid);
 alter table resourcefile add constraint fk_resourcefile_parentresourcefileid foreign key (parentresourcefileid) references resourcefile (id);
 
@@ -3515,6 +4804,15 @@ alter table self_ref_customer add constraint fk_self_ref_customer_referred_by_id
 create index ix_self_ref_example_parent_id on self_ref_example (parent_id);
 alter table self_ref_example add constraint fk_self_ref_example_parent_id foreign key (parent_id) references self_ref_example (id);
 
+alter table e_save_test_b add constraint fk_e_save_test_b_sibling_a_id foreign key (sibling_a_id) references e_save_test_a (id);
+
+create index ix_site_parent_id on site (parent_id);
+alter table site add constraint fk_site_parent_id foreign key (parent_id) references site (id);
+
+alter table site add constraint fk_site_data_container_id foreign key (data_container_id) references data_container (id);
+
+alter table site add constraint fk_site_site_address_id foreign key (site_address_id) references site_address (id);
+
 create index ix_stockforecast_inner_report_id on stockforecast (inner_report_id);
 alter table stockforecast add constraint fk_stockforecast_inner_report_id foreign key (inner_report_id) references inner_report (id);
 
@@ -3543,8 +4841,13 @@ alter table trip add constraint fk_trip_vehicle_driver_id foreign key (vehicle_d
 create index ix_trip_address_id on trip (address_id);
 alter table trip add constraint fk_trip_address_id foreign key (address_id) references o_address (id);
 
-create index ix_type_sub_type_id on type (sub_type_id);
-alter table type add constraint fk_type_sub_type_id foreign key (sub_type_id) references sub_type (sub_type_id);
+create index ix_type_sub_type_id on [type] (sub_type_id);
+alter table [type] add constraint fk_type_sub_type_id foreign key (sub_type_id) references sub_type (sub_type_id);
+
+create index ix_usib_child_parent_id on usib_child (parent_id);
+alter table usib_child add constraint fk_usib_child_parent_id foreign key (parent_id) references usib_parent (id);
+
+alter table usib_child_sibling add constraint fk_usib_child_sibling_child_id foreign key (child_id) references usib_child (id);
 
 create index ix_ut_detail_utmaster_id on ut_detail (utmaster_id);
 alter table ut_detail add constraint fk_ut_detail_utmaster_id foreign key (utmaster_id) references ut_master (id);
@@ -3552,17 +4855,20 @@ alter table ut_detail add constraint fk_ut_detail_utmaster_id foreign key (utmas
 create index ix_uutwo_master_id on uutwo (master_id);
 alter table uutwo add constraint fk_uutwo_master_id foreign key (master_id) references uuone (id);
 
+alter table oto_user add constraint fk_oto_user_account_id foreign key (account_id) references oto_account (id);
+
 create index ix_c_user_group_id on c_user (group_id);
 alter table c_user add constraint fk_c_user_group_id foreign key (group_id) references c_group (id);
 
-alter table oto_user add constraint fk_oto_user_account_id foreign key (account_id) references oto_account (id);
-
 create index ix_em_user_role_user_id on em_user_role (user_id);
 alter table em_user_role add constraint fk_em_user_role_user_id foreign key (user_id) references em_user (id);
 
 create index ix_em_user_role_role_id on em_user_role (role_id);
 alter table em_user_role add constraint fk_em_user_role_role_id foreign key (role_id) references em_role (id);
 
+create index ix_vehicle_lease_id on vehicle (lease_id);
+alter table vehicle add constraint fk_vehicle_lease_id foreign key (lease_id) references vehicle_lease (id);
+
 create index ix_vehicle_car_ref_id on vehicle (car_ref_id);
 alter table vehicle add constraint fk_vehicle_car_ref_id foreign key (car_ref_id) references truck_ref (id);
 
@@ -3614,6 +4920,31 @@ alter table hi_link_doc
         sys_periodTo   datetime2 GENERATED ALWAYS AS ROW END   NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',
 period for system_time (sys_periodFrom, sys_periodTo);
 alter table hi_link_doc set (system_versioning = on (history_table=dbo.hi_link_doc_history));
+alter table hi_tone
+    add sys_periodFrom datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(),
+        sys_periodTo   datetime2 GENERATED ALWAYS AS ROW END   NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',
+period for system_time (sys_periodFrom, sys_periodTo);
+alter table hi_tone set (system_versioning = on (history_table=dbo.hi_tone_history));
+alter table hi_tthree
+    add sys_periodFrom datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(),
+        sys_periodTo   datetime2 GENERATED ALWAYS AS ROW END   NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',
+period for system_time (sys_periodFrom, sys_periodTo);
+alter table hi_tthree set (system_versioning = on (history_table=dbo.hi_tthree_history));
+alter table hi_ttwo
+    add sys_periodFrom datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(),
+        sys_periodTo   datetime2 GENERATED ALWAYS AS ROW END   NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',
+period for system_time (sys_periodFrom, sys_periodTo);
+alter table hi_ttwo set (system_versioning = on (history_table=dbo.hi_ttwo_history));
+alter table hsd_setting
+    add sys_periodFrom datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(),
+        sys_periodTo   datetime2 GENERATED ALWAYS AS ROW END   NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',
+period for system_time (sys_periodFrom, sys_periodTo);
+alter table hsd_setting set (system_versioning = on (history_table=dbo.hsd_setting_history));
+alter table hsd_user
+    add sys_periodFrom datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(),
+        sys_periodTo   datetime2 GENERATED ALWAYS AS ROW END   NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',
+period for system_time (sys_periodFrom, sys_periodTo);
+alter table hsd_user set (system_versioning = on (history_table=dbo.hsd_user_history));
 alter table link
     add sys_periodFrom datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(),
         sys_periodTo   datetime2 GENERATED ALWAYS AS ROW END   NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',
diff --git a/src/test/ddl-review/sqlserver-drop-all.sql b/src/test/ddl-review/sqlserver-drop-all.sql
index 15e5b3bf9..7b1853e27 100644
--- a/src/test/ddl-review/sqlserver-drop-all.sql
+++ b/src/test/ddl-review/sqlserver-drop-all.sql
@@ -1,7 +1,13 @@
--- Generated by ebean unknown at 2018-03-08T06:24:28.188Z
+-- Generated by ebean unknown at 2019-07-25T09:32:20.917Z
 IF OBJECT_ID('fk_bar_foo_id', 'F') IS NOT NULL alter table bar drop constraint fk_bar_foo_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('bar','U') AND name = 'ix_bar_foo_id') drop index ix_bar_foo_id ON bar;
 
+IF OBJECT_ID('fk_acl_container_relation_container_id', 'F') IS NOT NULL alter table acl_container_relation drop constraint fk_acl_container_relation_container_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('acl_container_relation','U') AND name = 'ix_acl_container_relation_container_id') drop index ix_acl_container_relation_container_id ON acl_container_relation;
+
+IF OBJECT_ID('fk_acl_container_relation_acl_entry_id', 'F') IS NOT NULL alter table acl_container_relation drop constraint fk_acl_container_relation_acl_entry_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('acl_container_relation','U') AND name = 'ix_acl_container_relation_acl_entry_id') drop index ix_acl_container_relation_acl_entry_id ON acl_container_relation;
+
 IF OBJECT_ID('fk_addr_employee_id', 'F') IS NOT NULL alter table addr drop constraint fk_addr_employee_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('addr','U') AND name = 'ix_addr_employee_id') drop index ix_addr_employee_id ON addr;
 
@@ -20,11 +26,14 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('attribute',
 IF OBJECT_ID('fk_bbookmark_user_id', 'F') IS NOT NULL alter table bbookmark drop constraint fk_bbookmark_user_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('bbookmark','U') AND name = 'ix_bbookmark_user_id') drop index ix_bbookmark_user_id ON bbookmark;
 
-IF OBJECT_ID('fk_bsite_user_site_id', 'F') IS NOT NULL alter table bsite_user drop constraint fk_bsite_user_site_id;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('bsite_user','U') AND name = 'ix_bsite_user_site_id') drop index ix_bsite_user_site_id ON bsite_user;
+IF OBJECT_ID('fk_bbookmark_user_org_id', 'F') IS NOT NULL alter table bbookmark_user drop constraint fk_bbookmark_user_org_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('bbookmark_user','U') AND name = 'ix_bbookmark_user_org_id') drop index ix_bbookmark_user_org_id ON bbookmark_user;
 
-IF OBJECT_ID('fk_bsite_user_user_id', 'F') IS NOT NULL alter table bsite_user drop constraint fk_bsite_user_user_id;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('bsite_user','U') AND name = 'ix_bsite_user_user_id') drop index ix_bsite_user_user_id ON bsite_user;
+IF OBJECT_ID('fk_bsite_user_a_site_id', 'F') IS NOT NULL alter table bsite_user_a drop constraint fk_bsite_user_a_site_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('bsite_user_a','U') AND name = 'ix_bsite_user_a_site_id') drop index ix_bsite_user_a_site_id ON bsite_user_a;
+
+IF OBJECT_ID('fk_bsite_user_a_user_id', 'F') IS NOT NULL alter table bsite_user_a drop constraint fk_bsite_user_a_user_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('bsite_user_a','U') AND name = 'ix_bsite_user_a_user_id') drop index ix_bsite_user_a_user_id ON bsite_user_a;
 
 IF OBJECT_ID('fk_bsite_user_b_site', 'F') IS NOT NULL alter table bsite_user_b drop constraint fk_bsite_user_b_site;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('bsite_user_b','U') AND name = 'ix_bsite_user_b_site') drop index ix_bsite_user_b_site ON bsite_user_b;
@@ -38,7 +47,15 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('bsite_user_
 IF OBJECT_ID('fk_bsite_user_c_user_uid', 'F') IS NOT NULL alter table bsite_user_c drop constraint fk_bsite_user_c_user_uid;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('bsite_user_c','U') AND name = 'ix_bsite_user_c_user_uid') drop index ix_bsite_user_c_user_uid ON bsite_user_c;
 
+IF OBJECT_ID('fk_bsite_user_e_site_id', 'F') IS NOT NULL alter table bsite_user_e drop constraint fk_bsite_user_e_site_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('bsite_user_e','U') AND name = 'ix_bsite_user_e_site_id') drop index ix_bsite_user_e_site_id ON bsite_user_e;
+
+IF OBJECT_ID('fk_bsite_user_e_user_id', 'F') IS NOT NULL alter table bsite_user_e drop constraint fk_bsite_user_e_user_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('bsite_user_e','U') AND name = 'ix_bsite_user_e_user_id') drop index ix_bsite_user_e_user_id ON bsite_user_e;
+
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('bwith_qident','U') AND name = 'uq_bwith_qident_name') drop index uq_bwith_qident_name ON bwith_qident;
+IF OBJECT_ID('fk_basic_draftable_bean_id', 'F') IS NOT NULL alter table basic_draftable_bean drop constraint fk_basic_draftable_bean_id;
+
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('drel_booking','U') AND name = 'uq_drel_booking_booking_uid') drop index uq_drel_booking_booking_uid ON drel_booking;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('drel_booking','U') AND name = 'uq_drel_booking_agent_invoice') drop index uq_drel_booking_agent_invoice ON drel_booking;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('drel_booking','U') AND name = 'uq_drel_booking_client_invoice') drop index uq_drel_booking_client_invoice ON drel_booking;
@@ -46,6 +63,15 @@ IF OBJECT_ID('fk_drel_booking_agent_invoice', 'F') IS NOT NULL alter table drel_
 
 IF OBJECT_ID('fk_drel_booking_client_invoice', 'F') IS NOT NULL alter table drel_booking drop constraint fk_drel_booking_client_invoice;
 
+IF OBJECT_ID('fk_cepproduct_category_category_id', 'F') IS NOT NULL alter table cepproduct_category drop constraint fk_cepproduct_category_category_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('cepproduct_category','U') AND name = 'ix_cepproduct_category_category_id') drop index ix_cepproduct_category_category_id ON cepproduct_category;
+
+IF OBJECT_ID('fk_cepproduct_category_product_id', 'F') IS NOT NULL alter table cepproduct_category drop constraint fk_cepproduct_category_product_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('cepproduct_category','U') AND name = 'ix_cepproduct_category_product_id') drop index ix_cepproduct_category_product_id ON cepproduct_category;
+
+IF OBJECT_ID('fk_cinh_ref_ref_id', 'F') IS NOT NULL alter table cinh_ref drop constraint fk_cinh_ref_ref_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('cinh_ref','U') AND name = 'ix_cinh_ref_ref_id') drop index ix_cinh_ref_ref_id ON cinh_ref;
+
 IF OBJECT_ID('fk_ckey_detail_parent', 'F') IS NOT NULL alter table ckey_detail drop constraint fk_ckey_detail_parent;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ckey_detail','U') AND name = 'ix_ckey_detail_parent') drop index ix_ckey_detail_parent ON ckey_detail;
 
@@ -64,6 +90,12 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('sp_car_car_
 IF OBJECT_ID('fk_sp_car_car_wheels_sp_car_wheel', 'F') IS NOT NULL alter table sp_car_car_wheels drop constraint fk_sp_car_car_wheels_sp_car_wheel;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('sp_car_car_wheels','U') AND name = 'ix_sp_car_car_wheels_sp_car_wheel') drop index ix_sp_car_car_wheels_sp_car_wheel ON sp_car_car_wheels;
 
+IF OBJECT_ID('fk_sp_car_car_doors_sp_car_car', 'F') IS NOT NULL alter table sp_car_car_doors drop constraint fk_sp_car_car_doors_sp_car_car;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('sp_car_car_doors','U') AND name = 'ix_sp_car_car_doors_sp_car_car') drop index ix_sp_car_car_doors_sp_car_car ON sp_car_car_doors;
+
+IF OBJECT_ID('fk_sp_car_car_doors_sp_car_door', 'F') IS NOT NULL alter table sp_car_car_doors drop constraint fk_sp_car_car_doors_sp_car_door;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('sp_car_car_doors','U') AND name = 'ix_sp_car_car_doors_sp_car_door') drop index ix_sp_car_car_doors_sp_car_door ON sp_car_car_doors;
+
 IF OBJECT_ID('fk_car_accessory_fuse_id', 'F') IS NOT NULL alter table car_accessory drop constraint fk_car_accessory_fuse_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('car_accessory','U') AND name = 'ix_car_accessory_fuse_id') drop index ix_car_accessory_fuse_id ON car_accessory;
 
@@ -73,12 +105,22 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('car_accesso
 IF OBJECT_ID('fk_category_surveyobjectid', 'F') IS NOT NULL alter table category drop constraint fk_category_surveyobjectid;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('category','U') AND name = 'ix_category_surveyobjectid') drop index ix_category_surveyobjectid ON category;
 
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('e_save_test_d','U') AND name = 'uq_e_save_test_d_parent_id') drop index uq_e_save_test_d_parent_id ON e_save_test_d;
+IF OBJECT_ID('fk_e_save_test_d_parent_id', 'F') IS NOT NULL alter table e_save_test_d drop constraint fk_e_save_test_d_parent_id;
+
 IF OBJECT_ID('fk_child_person_some_bean_id', 'F') IS NOT NULL alter table child_person drop constraint fk_child_person_some_bean_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('child_person','U') AND name = 'ix_child_person_some_bean_id') drop index ix_child_person_some_bean_id ON child_person;
 
 IF OBJECT_ID('fk_child_person_parent_identifier', 'F') IS NOT NULL alter table child_person drop constraint fk_child_person_parent_identifier;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('child_person','U') AND name = 'ix_child_person_parent_identifier') drop index ix_child_person_parent_identifier ON child_person;
 
+IF OBJECT_ID('fk_cke_client_user', 'F') IS NOT NULL alter table cke_client drop constraint fk_cke_client_user;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('cke_client','U') AND name = 'ix_cke_client_user') drop index ix_cke_client_user ON cke_client;
+
+IF OBJECT_ID('fk_class_super_monkey_class_super', 'F') IS NOT NULL alter table class_super_monkey drop constraint fk_class_super_monkey_class_super;
+
+IF OBJECT_ID('fk_class_super_monkey_monkey', 'F') IS NOT NULL alter table class_super_monkey drop constraint fk_class_super_monkey_monkey;
+
 IF OBJECT_ID('fk_configuration_configurations_id', 'F') IS NOT NULL alter table configuration drop constraint fk_configuration_configurations_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('configuration','U') AND name = 'ix_configuration_configurations_id') drop index ix_configuration_configurations_id ON configuration;
 
@@ -91,6 +133,9 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('contact','U
 IF OBJECT_ID('fk_contact_note_contact_id', 'F') IS NOT NULL alter table contact_note drop constraint fk_contact_note_contact_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('contact_note','U') AND name = 'ix_contact_note_contact_id') drop index ix_contact_note_contact_id ON contact_note;
 
+IF OBJECT_ID('fk_contract_costs_position_id', 'F') IS NOT NULL alter table contract_costs drop constraint fk_contract_costs_position_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('contract_costs','U') AND name = 'ix_contract_costs_position_id') drop index ix_contract_costs_position_id ON contract_costs;
+
 IF OBJECT_ID('fk_c_conversation_group_id', 'F') IS NOT NULL alter table c_conversation drop constraint fk_c_conversation_group_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('c_conversation','U') AND name = 'ix_c_conversation_group_id') drop index ix_c_conversation_group_id ON c_conversation;
 
@@ -106,12 +151,27 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('dcredit_dro
 IF OBJECT_ID('fk_dcredit_drol_drol', 'F') IS NOT NULL alter table dcredit_drol drop constraint fk_dcredit_drol_drol;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('dcredit_drol','U') AND name = 'ix_dcredit_drol_drol') drop index ix_dcredit_drol_drol ON dcredit_drol;
 
+IF OBJECT_ID('fk_dmachine_organisation_id', 'F') IS NOT NULL alter table dmachine drop constraint fk_dmachine_organisation_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('dmachine','U') AND name = 'ix_dmachine_organisation_id') drop index ix_dmachine_organisation_id ON dmachine;
+
+IF OBJECT_ID('fk_d_machine_aux_use_machine_id', 'F') IS NOT NULL alter table d_machine_aux_use drop constraint fk_d_machine_aux_use_machine_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('d_machine_aux_use','U') AND name = 'ix_d_machine_aux_use_machine_id') drop index ix_d_machine_aux_use_machine_id ON d_machine_aux_use;
+
+IF OBJECT_ID('fk_d_machine_stats_machine_id', 'F') IS NOT NULL alter table d_machine_stats drop constraint fk_d_machine_stats_machine_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('d_machine_stats','U') AND name = 'ix_d_machine_stats_machine_id') drop index ix_d_machine_stats_machine_id ON d_machine_stats;
+
+IF OBJECT_ID('fk_d_machine_use_machine_id', 'F') IS NOT NULL alter table d_machine_use drop constraint fk_d_machine_use_machine_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('d_machine_use','U') AND name = 'ix_d_machine_use_machine_id') drop index ix_d_machine_use_machine_id ON d_machine_use;
+
 IF OBJECT_ID('fk_drot_drol_drot', 'F') IS NOT NULL alter table drot_drol drop constraint fk_drot_drol_drot;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('drot_drol','U') AND name = 'ix_drot_drol_drot') drop index ix_drot_drol_drot ON drot_drol;
 
 IF OBJECT_ID('fk_drot_drol_drol', 'F') IS NOT NULL alter table drot_drol drop constraint fk_drot_drol_drol;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('drot_drol','U') AND name = 'ix_drot_drol_drol') drop index ix_drot_drol_drol ON drot_drol;
 
+IF OBJECT_ID('fk_dc_detail_master_id', 'F') IS NOT NULL alter table dc_detail drop constraint fk_dc_detail_master_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('dc_detail','U') AND name = 'ix_dc_detail_master_id') drop index ix_dc_detail_master_id ON dc_detail;
+
 IF OBJECT_ID('fk_dfk_cascade_one_id', 'F') IS NOT NULL alter table dfk_cascade drop constraint fk_dfk_cascade_one_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('dfk_cascade','U') AND name = 'ix_dfk_cascade_one_id') drop index ix_dfk_cascade_one_id ON dfk_cascade;
 
@@ -153,6 +213,12 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ebasic_sdch
 
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('e_basicverucon','U') AND name = 'uq_e_basicverucon_name') drop index uq_e_basicverucon_name ON e_basicverucon;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('e_basicverucon','U') AND name = 'uq_e_basicverucon_other_other_one') drop index uq_e_basicverucon_other_other_one ON e_basicverucon;
+IF OBJECT_ID('fk_ecache_child_root_id', 'F') IS NOT NULL alter table ecache_child drop constraint fk_ecache_child_root_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ecache_child','U') AND name = 'ix_ecache_child_root_id') drop index ix_ecache_child_root_id ON ecache_child;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('edefault_prop','U') AND name = 'uq_edefault_prop_e_simple_usertypeid') drop index uq_edefault_prop_e_simple_usertypeid ON edefault_prop;
+IF OBJECT_ID('fk_edefault_prop_e_simple_usertypeid', 'F') IS NOT NULL alter table edefault_prop drop constraint fk_edefault_prop_e_simple_usertypeid;
+
 IF OBJECT_ID('fk_eemb_inner_outer_id', 'F') IS NOT NULL alter table eemb_inner drop constraint fk_eemb_inner_outer_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('eemb_inner','U') AND name = 'ix_eemb_inner_outer_id') drop index ix_eemb_inner_outer_id ON eemb_inner;
 
@@ -168,6 +234,9 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('eopt_one_a'
 IF OBJECT_ID('fk_eopt_one_b_c_id', 'F') IS NOT NULL alter table eopt_one_b drop constraint fk_eopt_one_b_c_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('eopt_one_b','U') AND name = 'ix_eopt_one_b_c_id') drop index ix_eopt_one_b_c_id ON eopt_one_b;
 
+IF OBJECT_ID('fk_eper_addr_ma_country_code', 'F') IS NOT NULL alter table eper_addr drop constraint fk_eper_addr_ma_country_code;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('eper_addr','U') AND name = 'ix_eper_addr_ma_country_code') drop index ix_eper_addr_ma_country_code ON eper_addr;
+
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('e_person_online','U') AND name = 'uq_e_person_online_email') drop index uq_e_person_online_email ON e_person_online;
 IF OBJECT_ID('fk_esoft_del_book_lend_by_id', 'F') IS NOT NULL alter table esoft_del_book drop constraint fk_esoft_del_book_lend_by_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('esoft_del_book','U') AND name = 'ix_esoft_del_book_lend_by_id') drop index ix_esoft_del_book_lend_by_id ON esoft_del_book;
@@ -208,12 +277,36 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('rawinherit_
 IF OBJECT_ID('fk_evanilla_collection_detail_evanilla_collection_id', 'F') IS NOT NULL alter table evanilla_collection_detail drop constraint fk_evanilla_collection_detail_evanilla_collection_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('evanilla_collection_detail','U') AND name = 'ix_evanilla_collection_detail_evanilla_collection_id') drop index ix_evanilla_collection_detail_evanilla_collection_id ON evanilla_collection_detail;
 
+IF OBJECT_ID('fk_ec_enum_person_tags_ec_enum_person_id', 'F') IS NOT NULL alter table ec_enum_person_tags drop constraint fk_ec_enum_person_tags_ec_enum_person_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ec_enum_person_tags','U') AND name = 'ix_ec_enum_person_tags_ec_enum_person_id') drop index ix_ec_enum_person_tags_ec_enum_person_id ON ec_enum_person_tags;
+
+IF OBJECT_ID('fk_ec_person_phone_owner_id', 'F') IS NOT NULL alter table ec_person_phone drop constraint fk_ec_person_phone_owner_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ec_person_phone','U') AND name = 'ix_ec_person_phone_owner_id') drop index ix_ec_person_phone_owner_id ON ec_person_phone;
+
+IF OBJECT_ID('fk_ecbl_person_phone_numbers_person_id', 'F') IS NOT NULL alter table ecbl_person_phone_numbers drop constraint fk_ecbl_person_phone_numbers_person_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ecbl_person_phone_numbers','U') AND name = 'ix_ecbl_person_phone_numbers_person_id') drop index ix_ecbl_person_phone_numbers_person_id ON ecbl_person_phone_numbers;
+
+IF OBJECT_ID('fk_ecbm_person_phone_numbers_person_id', 'F') IS NOT NULL alter table ecbm_person_phone_numbers drop constraint fk_ecbm_person_phone_numbers_person_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ecbm_person_phone_numbers','U') AND name = 'ix_ecbm_person_phone_numbers_person_id') drop index ix_ecbm_person_phone_numbers_person_id ON ecbm_person_phone_numbers;
+
+IF OBJECT_ID('fk_ecm_person_phone_numbers_ecm_person_id', 'F') IS NOT NULL alter table ecm_person_phone_numbers drop constraint fk_ecm_person_phone_numbers_ecm_person_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ecm_person_phone_numbers','U') AND name = 'ix_ecm_person_phone_numbers_ecm_person_id') drop index ix_ecm_person_phone_numbers_ecm_person_id ON ecm_person_phone_numbers;
+
+IF OBJECT_ID('fk_ecmc_person_phone_numbers_ecmc_person_id', 'F') IS NOT NULL alter table ecmc_person_phone_numbers drop constraint fk_ecmc_person_phone_numbers_ecmc_person_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ecmc_person_phone_numbers','U') AND name = 'ix_ecmc_person_phone_numbers_ecmc_person_id') drop index ix_ecmc_person_phone_numbers_ecmc_person_id ON ecmc_person_phone_numbers;
+
+IF OBJECT_ID('fk_ecs_person_phone_ecs_person_id', 'F') IS NOT NULL alter table ecs_person_phone drop constraint fk_ecs_person_phone_ecs_person_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ecs_person_phone','U') AND name = 'ix_ecs_person_phone_ecs_person_id') drop index ix_ecs_person_phone_ecs_person_id ON ecs_person_phone;
+
 IF OBJECT_ID('fk_td_child_parent_id', 'F') IS NOT NULL alter table td_child drop constraint fk_td_child_parent_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('td_child','U') AND name = 'ix_td_child_parent_id') drop index ix_td_child_parent_id ON td_child;
 
 IF OBJECT_ID('fk_empl_default_address_id', 'F') IS NOT NULL alter table empl drop constraint fk_empl_default_address_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('empl','U') AND name = 'ix_empl_default_address_id') drop index ix_empl_default_address_id ON empl;
 
+IF OBJECT_ID('fk_esd_detail_master_id', 'F') IS NOT NULL alter table esd_detail drop constraint fk_esd_detail_master_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('esd_detail','U') AND name = 'ix_esd_detail_master_id') drop index ix_esd_detail_master_id ON esd_detail;
+
 IF OBJECT_ID('fk_grand_parent_person_some_bean_id', 'F') IS NOT NULL alter table grand_parent_person drop constraint fk_grand_parent_person_some_bean_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('grand_parent_person','U') AND name = 'ix_grand_parent_person_some_bean_id') drop index ix_grand_parent_person_some_bean_id ON grand_parent_person;
 
@@ -232,6 +325,18 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('hi_link_doc
 IF OBJECT_ID('fk_hi_link_doc_hi_doc', 'F') IS NOT NULL alter table hi_link_doc drop constraint fk_hi_link_doc_hi_doc;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('hi_link_doc','U') AND name = 'ix_hi_link_doc_hi_doc') drop index ix_hi_link_doc_hi_doc ON hi_link_doc;
 
+IF OBJECT_ID('fk_hi_tthree_hi_ttwo_id', 'F') IS NOT NULL alter table hi_tthree drop constraint fk_hi_tthree_hi_ttwo_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('hi_tthree','U') AND name = 'ix_hi_tthree_hi_ttwo_id') drop index ix_hi_tthree_hi_ttwo_id ON hi_tthree;
+
+IF OBJECT_ID('fk_hi_ttwo_hi_tone_id', 'F') IS NOT NULL alter table hi_ttwo drop constraint fk_hi_ttwo_hi_tone_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('hi_ttwo','U') AND name = 'ix_hi_ttwo_hi_tone_id') drop index ix_hi_ttwo_hi_tone_id ON hi_ttwo;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('hsd_setting','U') AND name = 'uq_hsd_setting_user_id') drop index uq_hsd_setting_user_id ON hsd_setting;
+IF OBJECT_ID('fk_hsd_setting_user_id', 'F') IS NOT NULL alter table hsd_setting drop constraint fk_hsd_setting_user_id;
+
+IF OBJECT_ID('fk_iaf_segment_status_id', 'F') IS NOT NULL alter table iaf_segment drop constraint fk_iaf_segment_status_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('iaf_segment','U') AND name = 'ix_iaf_segment_status_id') drop index ix_iaf_segment_status_id ON iaf_segment;
+
 IF OBJECT_ID('fk_imrelated_owner_id', 'F') IS NOT NULL alter table imrelated drop constraint fk_imrelated_owner_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('imrelated','U') AND name = 'ix_imrelated_owner_id') drop index ix_imrelated_owner_id ON imrelated;
 
@@ -253,6 +358,10 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('item','U')
 IF OBJECT_ID('fk_item_eregion', 'F') IS NOT NULL alter table item drop constraint fk_item_eregion;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('item','U') AND name = 'ix_item_eregion') drop index ix_item_eregion ON item;
 
+IF OBJECT_ID('fk_mkeygroup_monkey_mkeygroup', 'F') IS NOT NULL alter table mkeygroup_monkey drop constraint fk_mkeygroup_monkey_mkeygroup;
+
+IF OBJECT_ID('fk_mkeygroup_monkey_monkey', 'F') IS NOT NULL alter table mkeygroup_monkey drop constraint fk_mkeygroup_monkey_monkey;
+
 IF OBJECT_ID('fk_trainer_monkey_trainer', 'F') IS NOT NULL alter table trainer_monkey drop constraint fk_trainer_monkey_trainer;
 
 IF OBJECT_ID('fk_trainer_monkey_monkey', 'F') IS NOT NULL alter table trainer_monkey drop constraint fk_trainer_monkey_monkey;
@@ -290,6 +399,27 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('la_attr_val
 IF OBJECT_ID('fk_la_attr_value_attribute_attribute', 'F') IS NOT NULL alter table la_attr_value_attribute drop constraint fk_la_attr_value_attribute_attribute;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('la_attr_value_attribute','U') AND name = 'ix_la_attr_value_attribute_attribute') drop index ix_la_attr_value_attribute_attribute ON la_attr_value_attribute;
 
+IF OBJECT_ID('fk_looney_tune_id', 'F') IS NOT NULL alter table looney drop constraint fk_looney_tune_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('looney','U') AND name = 'ix_looney_tune_id') drop index ix_looney_tune_id ON looney;
+
+IF OBJECT_ID('fk_mcontact_customer_id', 'F') IS NOT NULL alter table mcontact drop constraint fk_mcontact_customer_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mcontact','U') AND name = 'ix_mcontact_customer_id') drop index ix_mcontact_customer_id ON mcontact;
+
+IF OBJECT_ID('fk_mcontact_message_contact_id', 'F') IS NOT NULL alter table mcontact_message drop constraint fk_mcontact_message_contact_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mcontact_message','U') AND name = 'ix_mcontact_message_contact_id') drop index ix_mcontact_message_contact_id ON mcontact_message;
+
+IF OBJECT_ID('fk_mcustomer_shipping_address_id', 'F') IS NOT NULL alter table mcustomer drop constraint fk_mcustomer_shipping_address_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mcustomer','U') AND name = 'ix_mcustomer_shipping_address_id') drop index ix_mcustomer_shipping_address_id ON mcustomer;
+
+IF OBJECT_ID('fk_mcustomer_billing_address_id', 'F') IS NOT NULL alter table mcustomer drop constraint fk_mcustomer_billing_address_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mcustomer','U') AND name = 'ix_mcustomer_billing_address_id') drop index ix_mcustomer_billing_address_id ON mcustomer;
+
+IF OBJECT_ID('fk_mmachine_mgroup_mmachine', 'F') IS NOT NULL alter table mmachine_mgroup drop constraint fk_mmachine_mgroup_mmachine;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mmachine_mgroup','U') AND name = 'ix_mmachine_mgroup_mmachine') drop index ix_mmachine_mgroup_mmachine ON mmachine_mgroup;
+
+IF OBJECT_ID('fk_mmachine_mgroup_mgroup', 'F') IS NOT NULL alter table mmachine_mgroup drop constraint fk_mmachine_mgroup_mgroup;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mmachine_mgroup','U') AND name = 'ix_mmachine_mgroup_mgroup') drop index ix_mmachine_mgroup_mgroup ON mmachine_mgroup;
+
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mprinter','U') AND name = 'uq_mprinter_last_swap_cyan_id') drop index uq_mprinter_last_swap_cyan_id ON mprinter;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mprinter','U') AND name = 'uq_mprinter_last_swap_magenta_id') drop index uq_mprinter_last_swap_magenta_id ON mprinter;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mprinter','U') AND name = 'uq_mprinter_last_swap_yellow_id') drop index uq_mprinter_last_swap_yellow_id ON mprinter;
@@ -338,6 +468,16 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('c_message',
 IF OBJECT_ID('fk_c_message_user_id', 'F') IS NOT NULL alter table c_message drop constraint fk_c_message_user_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('c_message','U') AND name = 'ix_c_message_user_id') drop index ix_c_message_user_id ON c_message;
 
+IF OBJECT_ID('fk_meter_contract_data_special_needs_client_id', 'F') IS NOT NULL alter table meter_contract_data drop constraint fk_meter_contract_data_special_needs_client_id;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('meter_special_needs_client','U') AND name = 'uq_meter_special_needs_client_primary_id') drop index uq_meter_special_needs_client_primary_id ON meter_special_needs_client;
+IF OBJECT_ID('fk_meter_special_needs_client_primary_id', 'F') IS NOT NULL alter table meter_special_needs_client drop constraint fk_meter_special_needs_client_primary_id;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('meter_version','U') AND name = 'uq_meter_version_address_data_id') drop index uq_meter_version_address_data_id ON meter_version;
+IF OBJECT_ID('fk_meter_version_address_data_id', 'F') IS NOT NULL alter table meter_version drop constraint fk_meter_version_address_data_id;
+
+IF OBJECT_ID('fk_meter_version_contract_data_id', 'F') IS NOT NULL alter table meter_version drop constraint fk_meter_version_contract_data_id;
+
 IF OBJECT_ID('fk_mnoc_user_mnoc_role_mnoc_user', 'F') IS NOT NULL alter table mnoc_user_mnoc_role drop constraint fk_mnoc_user_mnoc_role_mnoc_user;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mnoc_user_mnoc_role','U') AND name = 'ix_mnoc_user_mnoc_role_mnoc_user') drop index ix_mnoc_user_mnoc_role_mnoc_user ON mnoc_user_mnoc_role;
 
@@ -413,6 +553,17 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('s_order_ite
 IF OBJECT_ID('fk_or_order_ship_order_id', 'F') IS NOT NULL alter table or_order_ship drop constraint fk_or_order_ship_order_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('or_order_ship','U') AND name = 'ix_or_order_ship_order_id') drop index ix_or_order_ship_order_id ON or_order_ship;
 
+IF OBJECT_ID('fk_organization_node_parent_tree_node_id', 'F') IS NOT NULL alter table organization_node drop constraint fk_organization_node_parent_tree_node_id;
+
+IF OBJECT_ID('fk_orp_detail_master_id', 'F') IS NOT NULL alter table orp_detail drop constraint fk_orp_detail_master_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('orp_detail','U') AND name = 'ix_orp_detail_master_id') drop index ix_orp_detail_master_id ON orp_detail;
+
+IF OBJECT_ID('fk_orp_detail2_orp_master2_id', 'F') IS NOT NULL alter table orp_detail2 drop constraint fk_orp_detail2_orp_master2_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('orp_detail2','U') AND name = 'ix_orp_detail2_orp_master2_id') drop index ix_orp_detail2_orp_master2_id ON orp_detail2;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('oto_atwo','U') AND name = 'uq_oto_atwo_aone_id') drop index uq_oto_atwo_aone_id ON oto_atwo;
+IF OBJECT_ID('fk_oto_atwo_aone_id', 'F') IS NOT NULL alter table oto_atwo drop constraint fk_oto_atwo_aone_id;
+
 IF OBJECT_ID('fk_oto_bchild_master_id', 'F') IS NOT NULL alter table oto_bchild drop constraint fk_oto_bchild_master_id;
 
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('oto_child','U') AND name = 'uq_oto_child_master_id') drop index uq_oto_child_master_id ON oto_child;
@@ -421,8 +572,17 @@ IF OBJECT_ID('fk_oto_child_master_id', 'F') IS NOT NULL alter table oto_child dr
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('oto_cust_address','U') AND name = 'uq_oto_cust_address_customer_cid') drop index uq_oto_cust_address_customer_cid ON oto_cust_address;
 IF OBJECT_ID('fk_oto_cust_address_customer_cid', 'F') IS NOT NULL alter table oto_cust_address drop constraint fk_oto_cust_address_customer_cid;
 
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('oto_level_a','U') AND name = 'uq_oto_level_a_b_id') drop index uq_oto_level_a_b_id ON oto_level_a;
+IF OBJECT_ID('fk_oto_level_a_b_id', 'F') IS NOT NULL alter table oto_level_a drop constraint fk_oto_level_a_b_id;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('oto_level_b','U') AND name = 'uq_oto_level_b_c_id') drop index uq_oto_level_b_c_id ON oto_level_b;
+IF OBJECT_ID('fk_oto_level_b_c_id', 'F') IS NOT NULL alter table oto_level_b drop constraint fk_oto_level_b_c_id;
+
 IF OBJECT_ID('fk_oto_prime_extra_eid', 'F') IS NOT NULL alter table oto_prime_extra drop constraint fk_oto_prime_extra_eid;
 
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('oto_sd_child','U') AND name = 'uq_oto_sd_child_master_id') drop index uq_oto_sd_child_master_id ON oto_sd_child;
+IF OBJECT_ID('fk_oto_sd_child_master_id', 'F') IS NOT NULL alter table oto_sd_child drop constraint fk_oto_sd_child_master_id;
+
 IF OBJECT_ID('fk_oto_th_many_oto_th_top_id', 'F') IS NOT NULL alter table oto_th_many drop constraint fk_oto_th_many_oto_th_top_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('oto_th_many','U') AND name = 'ix_oto_th_many_oto_th_top_id') drop index ix_oto_th_many_oto_th_top_id ON oto_th_many;
 
@@ -431,7 +591,8 @@ IF OBJECT_ID('fk_oto_th_one_many_id', 'F') IS NOT NULL alter table oto_th_one dr
 
 IF OBJECT_ID('fk_oto_ubprime_extra_eid', 'F') IS NOT NULL alter table oto_ubprime_extra drop constraint fk_oto_ubprime_extra_eid;
 
-IF OBJECT_ID('fk_oto_uprime_extra_eid', 'F') IS NOT NULL alter table oto_uprime_extra drop constraint fk_oto_uprime_extra_eid;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('oto_user_model','U') AND name = 'uq_oto_user_model_user_optional_id') drop index uq_oto_user_model_user_optional_id ON oto_user_model;
+IF OBJECT_ID('fk_oto_user_model_user_optional_id', 'F') IS NOT NULL alter table oto_user_model drop constraint fk_oto_user_model_user_optional_id;
 
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('pfile','U') AND name = 'uq_pfile_file_content_id') drop index uq_pfile_file_content_id ON pfile;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('pfile','U') AND name = 'uq_pfile_file_content2_id') drop index uq_pfile_file_content2_id ON pfile;
@@ -472,9 +633,15 @@ IF OBJECT_ID('fk_persistent_file_content_persistent_file_id', 'F') IS NOT NULL a
 IF OBJECT_ID('fk_person_default_address_oid', 'F') IS NOT NULL alter table person drop constraint fk_person_default_address_oid;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('person','U') AND name = 'ix_person_default_address_oid') drop index ix_person_default_address_oid ON person;
 
+IF OBJECT_ID('fk_person_cache_email_person_info_person_id', 'F') IS NOT NULL alter table person_cache_email drop constraint fk_person_cache_email_person_info_person_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('person_cache_email','U') AND name = 'ix_person_cache_email_person_info_person_id') drop index ix_person_cache_email_person_info_person_id ON person_cache_email;
+
 IF OBJECT_ID('fk_phones_person_id', 'F') IS NOT NULL alter table phones drop constraint fk_phones_person_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('phones','U') AND name = 'ix_phones_person_id') drop index ix_phones_person_id ON phones;
 
+IF OBJECT_ID('fk_e_position_contract_id', 'F') IS NOT NULL alter table e_position drop constraint fk_e_position_contract_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('e_position','U') AND name = 'ix_e_position_contract_id') drop index ix_e_position_contract_id ON e_position;
+
 IF OBJECT_ID('fk_pp_to_ww_pp', 'F') IS NOT NULL alter table pp_to_ww drop constraint fk_pp_to_ww_pp;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('pp_to_ww','U') AND name = 'ix_pp_to_ww_pp') drop index ix_pp_to_ww_pp ON pp_to_ww;
 
@@ -487,6 +654,9 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('question','
 IF OBJECT_ID('fk_r_orders_customer', 'F') IS NOT NULL alter table r_orders drop constraint fk_r_orders_customer;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('r_orders','U') AND name = 'ix_r_orders_customer') drop index ix_r_orders_customer ON r_orders;
 
+IF OBJECT_ID('fk_rel_master_detail_id', 'F') IS NOT NULL alter table rel_master drop constraint fk_rel_master_detail_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('rel_master','U') AND name = 'ix_rel_master_detail_id') drop index ix_rel_master_detail_id ON rel_master;
+
 IF OBJECT_ID('fk_resourcefile_parentresourcefileid', 'F') IS NOT NULL alter table resourcefile drop constraint fk_resourcefile_parentresourcefileid;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('resourcefile','U') AND name = 'ix_resourcefile_parentresourcefileid') drop index ix_resourcefile_parentresourcefileid ON resourcefile;
 
@@ -514,6 +684,18 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('self_ref_cu
 IF OBJECT_ID('fk_self_ref_example_parent_id', 'F') IS NOT NULL alter table self_ref_example drop constraint fk_self_ref_example_parent_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('self_ref_example','U') AND name = 'ix_self_ref_example_parent_id') drop index ix_self_ref_example_parent_id ON self_ref_example;
 
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('e_save_test_b','U') AND name = 'uq_e_save_test_b_sibling_a_id') drop index uq_e_save_test_b_sibling_a_id ON e_save_test_b;
+IF OBJECT_ID('fk_e_save_test_b_sibling_a_id', 'F') IS NOT NULL alter table e_save_test_b drop constraint fk_e_save_test_b_sibling_a_id;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('site','U') AND name = 'uq_site_data_container_id') drop index uq_site_data_container_id ON site;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('site','U') AND name = 'uq_site_site_address_id') drop index uq_site_site_address_id ON site;
+IF OBJECT_ID('fk_site_parent_id', 'F') IS NOT NULL alter table site drop constraint fk_site_parent_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('site','U') AND name = 'ix_site_parent_id') drop index ix_site_parent_id ON site;
+
+IF OBJECT_ID('fk_site_data_container_id', 'F') IS NOT NULL alter table site drop constraint fk_site_data_container_id;
+
+IF OBJECT_ID('fk_site_site_address_id', 'F') IS NOT NULL alter table site drop constraint fk_site_site_address_id;
+
 IF OBJECT_ID('fk_stockforecast_inner_report_id', 'F') IS NOT NULL alter table stockforecast drop constraint fk_stockforecast_inner_report_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('stockforecast','U') AND name = 'ix_stockforecast_inner_report_id') drop index ix_stockforecast_inner_report_id ON stockforecast;
 
@@ -545,8 +727,14 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('trip','U')
 IF OBJECT_ID('fk_trip_address_id', 'F') IS NOT NULL alter table trip drop constraint fk_trip_address_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('trip','U') AND name = 'ix_trip_address_id') drop index ix_trip_address_id ON trip;
 
-IF OBJECT_ID('fk_type_sub_type_id', 'F') IS NOT NULL alter table type drop constraint fk_type_sub_type_id;
-IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('type','U') AND name = 'ix_type_sub_type_id') drop index ix_type_sub_type_id ON type;
+IF OBJECT_ID('fk_type_sub_type_id', 'F') IS NOT NULL alter table [type] drop constraint fk_type_sub_type_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('[type]','U') AND name = 'ix_type_sub_type_id') drop index ix_type_sub_type_id ON [type];
+
+IF OBJECT_ID('fk_usib_child_parent_id', 'F') IS NOT NULL alter table usib_child drop constraint fk_usib_child_parent_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('usib_child','U') AND name = 'ix_usib_child_parent_id') drop index ix_usib_child_parent_id ON usib_child;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('usib_child_sibling','U') AND name = 'uq_usib_child_sibling_child_id') drop index uq_usib_child_sibling_child_id ON usib_child_sibling;
+IF OBJECT_ID('fk_usib_child_sibling_child_id', 'F') IS NOT NULL alter table usib_child_sibling drop constraint fk_usib_child_sibling_child_id;
 
 IF OBJECT_ID('fk_ut_detail_utmaster_id', 'F') IS NOT NULL alter table ut_detail drop constraint fk_ut_detail_utmaster_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ut_detail','U') AND name = 'ix_ut_detail_utmaster_id') drop index ix_ut_detail_utmaster_id ON ut_detail;
@@ -554,17 +742,20 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ut_detail',
 IF OBJECT_ID('fk_uutwo_master_id', 'F') IS NOT NULL alter table uutwo drop constraint fk_uutwo_master_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('uutwo','U') AND name = 'ix_uutwo_master_id') drop index ix_uutwo_master_id ON uutwo;
 
+IF OBJECT_ID('fk_oto_user_account_id', 'F') IS NOT NULL alter table oto_user drop constraint fk_oto_user_account_id;
+
 IF OBJECT_ID('fk_c_user_group_id', 'F') IS NOT NULL alter table c_user drop constraint fk_c_user_group_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('c_user','U') AND name = 'ix_c_user_group_id') drop index ix_c_user_group_id ON c_user;
 
-IF OBJECT_ID('fk_oto_user_account_id', 'F') IS NOT NULL alter table oto_user drop constraint fk_oto_user_account_id;
-
 IF OBJECT_ID('fk_em_user_role_user_id', 'F') IS NOT NULL alter table em_user_role drop constraint fk_em_user_role_user_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('em_user_role','U') AND name = 'ix_em_user_role_user_id') drop index ix_em_user_role_user_id ON em_user_role;
 
 IF OBJECT_ID('fk_em_user_role_role_id', 'F') IS NOT NULL alter table em_user_role drop constraint fk_em_user_role_role_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('em_user_role','U') AND name = 'ix_em_user_role_role_id') drop index ix_em_user_role_role_id ON em_user_role;
 
+IF OBJECT_ID('fk_vehicle_lease_id', 'F') IS NOT NULL alter table vehicle drop constraint fk_vehicle_lease_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('vehicle','U') AND name = 'ix_vehicle_lease_id') drop index ix_vehicle_lease_id ON vehicle;
+
 IF OBJECT_ID('fk_vehicle_car_ref_id', 'F') IS NOT NULL alter table vehicle drop constraint fk_vehicle_car_ref_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('vehicle','U') AND name = 'ix_vehicle_car_ref_id') drop index ix_vehicle_car_ref_id ON vehicle;
 
@@ -601,15 +792,31 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('g_who_props
 IF OBJECT_ID('fk_with_zero_parent_id', 'F') IS NOT NULL alter table with_zero drop constraint fk_with_zero_parent_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('with_zero','U') AND name = 'ix_with_zero_parent_id') drop index ix_with_zero_parent_id ON with_zero;
 
+if exists (select name  from sys.types where name = 'ebean_bigint_tvp') drop type ebean_bigint_tvp;
+if exists (select name  from sys.types where name = 'ebean_float_tvp') drop type ebean_float_tvp;
+if exists (select name  from sys.types where name = 'ebean_bit_tvp') drop type ebean_bit_tvp;
+if exists (select name  from sys.types where name = 'ebean_date_tvp') drop type ebean_date_tvp;
+if exists (select name  from sys.types where name = 'ebean_time_tvp') drop type ebean_time_tvp;
+if exists (select name  from sys.types where name = 'ebean_uniqueidentifier_tvp') drop type ebean_uniqueidentifier_tvp;
+if exists (select name  from sys.types where name = 'ebean_nvarchar_tvp') drop type ebean_nvarchar_tvp;
 IF OBJECT_ID('asimple_bean', 'U') IS NOT NULL drop table asimple_bean;
 IF OBJECT_ID('asimple_bean_seq', 'SO') IS NOT NULL drop sequence asimple_bean_seq;
 
 IF OBJECT_ID('bar', 'U') IS NOT NULL drop table bar;
 IF OBJECT_ID('bar_seq', 'SO') IS NOT NULL drop sequence bar_seq;
 
+IF OBJECT_ID('block', 'U') IS NOT NULL drop table block;
+IF OBJECT_ID('block_seq', 'SO') IS NOT NULL drop sequence block_seq;
+
 IF OBJECT_ID('oto_account', 'U') IS NOT NULL drop table oto_account;
 IF OBJECT_ID('oto_account_seq', 'SO') IS NOT NULL drop sequence oto_account_seq;
 
+IF OBJECT_ID('acl', 'U') IS NOT NULL drop table acl;
+IF OBJECT_ID('acl_seq', 'SO') IS NOT NULL drop sequence acl_seq;
+
+IF OBJECT_ID('acl_container_relation', 'U') IS NOT NULL drop table acl_container_relation;
+IF OBJECT_ID('acl_container_relation_seq', 'SO') IS NOT NULL drop sequence acl_container_relation_seq;
+
 IF OBJECT_ID('addr', 'U') IS NOT NULL drop table addr;
 IF OBJECT_ID('addr_seq', 'SO') IS NOT NULL drop sequence addr_seq;
 
@@ -643,6 +850,9 @@ IF OBJECT_ID('audit_log_seq', 'SO') IS NOT NULL drop sequence audit_log_seq;
 IF OBJECT_ID('bbookmark', 'U') IS NOT NULL drop table bbookmark;
 IF OBJECT_ID('bbookmark_seq', 'SO') IS NOT NULL drop sequence bbookmark_seq;
 
+IF OBJECT_ID('bbookmark_org', 'U') IS NOT NULL drop table bbookmark_org;
+IF OBJECT_ID('bbookmark_org_seq', 'SO') IS NOT NULL drop sequence bbookmark_org_seq;
+
 IF OBJECT_ID('bbookmark_user', 'U') IS NOT NULL drop table bbookmark_user;
 IF OBJECT_ID('bbookmark_user_seq', 'SO') IS NOT NULL drop sequence bbookmark_user_seq;
 
@@ -651,17 +861,27 @@ IF OBJECT_ID('bsimple_with_gen_seq', 'SO') IS NOT NULL drop sequence bsimple_wit
 
 IF OBJECT_ID('bsite', 'U') IS NOT NULL drop table bsite;
 
-IF OBJECT_ID('bsite_user', 'U') IS NOT NULL drop table bsite_user;
+IF OBJECT_ID('bsite_user_a', 'U') IS NOT NULL drop table bsite_user_a;
 
 IF OBJECT_ID('bsite_user_b', 'U') IS NOT NULL drop table bsite_user_b;
 
 IF OBJECT_ID('bsite_user_c', 'U') IS NOT NULL drop table bsite_user_c;
 
+IF OBJECT_ID('bsite_user_d', 'U') IS NOT NULL drop table bsite_user_d;
+
+IF OBJECT_ID('bsite_user_e', 'U') IS NOT NULL drop table bsite_user_e;
+
 IF OBJECT_ID('buser', 'U') IS NOT NULL drop table buser;
 
 IF OBJECT_ID('bwith_qident', 'U') IS NOT NULL drop table bwith_qident;
 IF OBJECT_ID('bwith_qident_seq', 'SO') IS NOT NULL drop sequence bwith_qident_seq;
 
+IF OBJECT_ID('basic_draftable_bean', 'U') IS NOT NULL drop table basic_draftable_bean;
+IF OBJECT_ID('basic_draftable_bean_seq', 'SO') IS NOT NULL drop sequence basic_draftable_bean_seq;
+
+IF OBJECT_ID('basic_draftable_bean_draft', 'U') IS NOT NULL drop table basic_draftable_bean_draft;
+IF OBJECT_ID('basic_draftable_bean_draft_seq', 'SO') IS NOT NULL drop sequence basic_draftable_bean_draft_seq;
+
 IF OBJECT_ID('basic_joda_entity', 'U') IS NOT NULL drop table basic_joda_entity;
 IF OBJECT_ID('basic_joda_entity_seq', 'SO') IS NOT NULL drop sequence basic_joda_entity_seq;
 
@@ -671,6 +891,20 @@ IF OBJECT_ID('bean_with_time_zone_seq', 'SO') IS NOT NULL drop sequence bean_wit
 IF OBJECT_ID('drel_booking', 'U') IS NOT NULL drop table drel_booking;
 IF OBJECT_ID('drel_booking_seq', 'SO') IS NOT NULL drop sequence drel_booking_seq;
 
+IF OBJECT_ID('bw_bean', 'U') IS NOT NULL drop table bw_bean;
+IF OBJECT_ID('bw_bean_seq', 'SO') IS NOT NULL drop sequence bw_bean_seq;
+
+IF OBJECT_ID('cepcategory', 'U') IS NOT NULL drop table cepcategory;
+IF OBJECT_ID('cepcategory_seq', 'SO') IS NOT NULL drop sequence cepcategory_seq;
+
+IF OBJECT_ID('cepproduct', 'U') IS NOT NULL drop table cepproduct;
+IF OBJECT_ID('cepproduct_seq', 'SO') IS NOT NULL drop sequence cepproduct_seq;
+
+IF OBJECT_ID('cepproduct_category', 'U') IS NOT NULL drop table cepproduct_category;
+
+IF OBJECT_ID('cinh_ref', 'U') IS NOT NULL drop table cinh_ref;
+IF OBJECT_ID('cinh_ref_seq', 'SO') IS NOT NULL drop sequence cinh_ref_seq;
+
 IF OBJECT_ID('cinh_root', 'U') IS NOT NULL drop table cinh_root;
 IF OBJECT_ID('cinh_root_seq', 'SO') IS NOT NULL drop sequence cinh_root_seq;
 
@@ -687,14 +921,16 @@ IF OBJECT_ID('calculation_result_seq', 'SO') IS NOT NULL drop sequence calculati
 
 IF OBJECT_ID('cao_bean', 'U') IS NOT NULL drop table cao_bean;
 
-IF OBJECT_ID('sa_car', 'U') IS NOT NULL drop table sa_car;
-IF OBJECT_ID('sa_car_seq', 'SO') IS NOT NULL drop sequence sa_car_seq;
-
 IF OBJECT_ID('sp_car_car', 'U') IS NOT NULL drop table sp_car_car;
 IF OBJECT_ID('sp_car_car_seq', 'SO') IS NOT NULL drop sequence sp_car_car_seq;
 
 IF OBJECT_ID('sp_car_car_wheels', 'U') IS NOT NULL drop table sp_car_car_wheels;
 
+IF OBJECT_ID('sp_car_car_doors', 'U') IS NOT NULL drop table sp_car_car_doors;
+
+IF OBJECT_ID('sa_car', 'U') IS NOT NULL drop table sa_car;
+IF OBJECT_ID('sa_car_seq', 'SO') IS NOT NULL drop sequence sa_car_seq;
+
 IF OBJECT_ID('car_accessory', 'U') IS NOT NULL drop table car_accessory;
 IF OBJECT_ID('car_accessory_seq', 'SO') IS NOT NULL drop sequence car_accessory_seq;
 
@@ -704,9 +940,21 @@ IF OBJECT_ID('car_fuse_seq', 'SO') IS NOT NULL drop sequence car_fuse_seq;
 IF OBJECT_ID('category', 'U') IS NOT NULL drop table category;
 IF OBJECT_ID('category_seq', 'SO') IS NOT NULL drop sequence category_seq;
 
+IF OBJECT_ID('e_save_test_d', 'U') IS NOT NULL drop table e_save_test_d;
+IF OBJECT_ID('e_save_test_d_seq', 'SO') IS NOT NULL drop sequence e_save_test_d_seq;
+
 IF OBJECT_ID('child_person', 'U') IS NOT NULL drop table child_person;
 IF OBJECT_ID('child_person_seq', 'SO') IS NOT NULL drop sequence child_person_seq;
 
+IF OBJECT_ID('cke_client', 'U') IS NOT NULL drop table cke_client;
+
+IF OBJECT_ID('cke_user', 'U') IS NOT NULL drop table cke_user;
+
+IF OBJECT_ID('class_super', 'U') IS NOT NULL drop table class_super;
+IF OBJECT_ID('class_super_seq', 'SO') IS NOT NULL drop sequence class_super_seq;
+
+IF OBJECT_ID('class_super_monkey', 'U') IS NOT NULL drop table class_super_monkey;
+
 IF OBJECT_ID('configuration', 'U') IS NOT NULL drop table configuration;
 IF OBJECT_ID('configuration_seq', 'SO') IS NOT NULL drop sequence configuration_seq;
 
@@ -722,6 +970,12 @@ IF OBJECT_ID('contact_group_seq', 'SO') IS NOT NULL drop sequence contact_group_
 IF OBJECT_ID('contact_note', 'U') IS NOT NULL drop table contact_note;
 IF OBJECT_ID('contact_note_seq', 'SO') IS NOT NULL drop sequence contact_note_seq;
 
+IF OBJECT_ID('contract', 'U') IS NOT NULL drop table contract;
+IF OBJECT_ID('contract_seq', 'SO') IS NOT NULL drop sequence contract_seq;
+
+IF OBJECT_ID('contract_costs', 'U') IS NOT NULL drop table contract_costs;
+IF OBJECT_ID('contract_costs_seq', 'SO') IS NOT NULL drop sequence contract_costs_seq;
+
 IF OBJECT_ID('c_conversation', 'U') IS NOT NULL drop table c_conversation;
 IF OBJECT_ID('c_conversation_seq', 'SO') IS NOT NULL drop sequence c_conversation_seq;
 
@@ -741,6 +995,21 @@ IF OBJECT_ID('dcredit_drol', 'U') IS NOT NULL drop table dcredit_drol;
 IF OBJECT_ID('dexh_entity', 'U') IS NOT NULL drop table dexh_entity;
 IF OBJECT_ID('dexh_entity_seq', 'SO') IS NOT NULL drop sequence dexh_entity_seq;
 
+IF OBJECT_ID('dmachine', 'U') IS NOT NULL drop table dmachine;
+IF OBJECT_ID('dmachine_seq', 'SO') IS NOT NULL drop sequence dmachine_seq;
+
+IF OBJECT_ID('d_machine_aux_use', 'U') IS NOT NULL drop table d_machine_aux_use;
+IF OBJECT_ID('d_machine_aux_use_seq', 'SO') IS NOT NULL drop sequence d_machine_aux_use_seq;
+
+IF OBJECT_ID('d_machine_stats', 'U') IS NOT NULL drop table d_machine_stats;
+IF OBJECT_ID('d_machine_stats_seq', 'SO') IS NOT NULL drop sequence d_machine_stats_seq;
+
+IF OBJECT_ID('d_machine_use', 'U') IS NOT NULL drop table d_machine_use;
+IF OBJECT_ID('d_machine_use_seq', 'SO') IS NOT NULL drop sequence d_machine_use_seq;
+
+IF OBJECT_ID('dorg', 'U') IS NOT NULL drop table dorg;
+IF OBJECT_ID('dorg_seq', 'SO') IS NOT NULL drop sequence dorg_seq;
+
 IF OBJECT_ID('dperson', 'U') IS NOT NULL drop table dperson;
 IF OBJECT_ID('dperson_seq', 'SO') IS NOT NULL drop sequence dperson_seq;
 
@@ -755,6 +1024,14 @@ IF OBJECT_ID('drot_drol', 'U') IS NOT NULL drop table drot_drol;
 IF OBJECT_ID('rawinherit_data', 'U') IS NOT NULL drop table rawinherit_data;
 IF OBJECT_ID('rawinherit_data_seq', 'SO') IS NOT NULL drop sequence rawinherit_data_seq;
 
+IF OBJECT_ID('data_container', 'U') IS NOT NULL drop table data_container;
+
+IF OBJECT_ID('dc_detail', 'U') IS NOT NULL drop table dc_detail;
+IF OBJECT_ID('dc_detail_seq', 'SO') IS NOT NULL drop sequence dc_detail_seq;
+
+IF OBJECT_ID('dc_master', 'U') IS NOT NULL drop table dc_master;
+IF OBJECT_ID('dc_master_seq', 'SO') IS NOT NULL drop sequence dc_master_seq;
+
 IF OBJECT_ID('dfk_cascade', 'U') IS NOT NULL drop table dfk_cascade;
 IF OBJECT_ID('dfk_cascade_seq', 'SO') IS NOT NULL drop sequence dfk_cascade_seq;
 
@@ -767,6 +1044,11 @@ IF OBJECT_ID('dfk_none_seq', 'SO') IS NOT NULL drop sequence dfk_none_seq;
 IF OBJECT_ID('dfk_none_via_join', 'U') IS NOT NULL drop table dfk_none_via_join;
 IF OBJECT_ID('dfk_none_via_join_seq', 'SO') IS NOT NULL drop sequence dfk_none_via_join_seq;
 
+IF OBJECT_ID('dfk_none_via_mto_m', 'U') IS NOT NULL drop table dfk_none_via_mto_m;
+IF OBJECT_ID('dfk_none_via_mto_m_seq', 'SO') IS NOT NULL drop sequence dfk_none_via_mto_m_seq;
+
+IF OBJECT_ID('dfk_none_via_mto_m_dfk_one', 'U') IS NOT NULL drop table dfk_none_via_mto_m_dfk_one;
+
 IF OBJECT_ID('dfk_one', 'U') IS NOT NULL drop table dfk_one;
 IF OBJECT_ID('dfk_one_seq', 'SO') IS NOT NULL drop sequence dfk_one_seq;
 
@@ -795,6 +1077,9 @@ IF OBJECT_ID('document_media_seq', 'SO') IS NOT NULL drop sequence document_medi
 IF OBJECT_ID('document_media_draft', 'U') IS NOT NULL drop table document_media_draft;
 IF OBJECT_ID('document_media_draft_seq', 'SO') IS NOT NULL drop sequence document_media_draft_seq;
 
+IF OBJECT_ID('sp_car_door', 'U') IS NOT NULL drop table sp_car_door;
+IF OBJECT_ID('sp_car_door_seq', 'SO') IS NOT NULL drop sequence sp_car_door_seq;
+
 IF OBJECT_ID('earray_bean', 'U') IS NOT NULL drop table earray_bean;
 IF OBJECT_ID('earray_bean_seq', 'SO') IS NOT NULL drop sequence earray_bean_seq;
 
@@ -822,6 +1107,9 @@ IF OBJECT_ID('e_basicenc_seq', 'SO') IS NOT NULL drop sequence e_basicenc_seq;
 IF OBJECT_ID('e_basicenc_bin', 'U') IS NOT NULL drop table e_basicenc_bin;
 IF OBJECT_ID('e_basicenc_bin_seq', 'SO') IS NOT NULL drop sequence e_basicenc_bin_seq;
 
+IF OBJECT_ID('e_basicenc_client', 'U') IS NOT NULL drop table e_basicenc_client;
+IF OBJECT_ID('e_basicenc_client_seq', 'SO') IS NOT NULL drop sequence e_basicenc_client_seq;
+
 IF OBJECT_ID('e_basic_enum_id', 'U') IS NOT NULL drop table e_basic_enum_id;
 
 IF OBJECT_ID('e_basic_eni', 'U') IS NOT NULL drop table e_basic_eni;
@@ -830,6 +1118,12 @@ IF OBJECT_ID('e_basic_eni_seq', 'SO') IS NOT NULL drop sequence e_basic_eni_seq;
 IF OBJECT_ID('ebasic_hstore', 'U') IS NOT NULL drop table ebasic_hstore;
 IF OBJECT_ID('ebasic_hstore_seq', 'SO') IS NOT NULL drop sequence ebasic_hstore_seq;
 
+IF OBJECT_ID('ebasic_json_jackson', 'U') IS NOT NULL drop table ebasic_json_jackson;
+IF OBJECT_ID('ebasic_json_jackson_seq', 'SO') IS NOT NULL drop sequence ebasic_json_jackson_seq;
+
+IF OBJECT_ID('ebasic_json_jackson2', 'U') IS NOT NULL drop table ebasic_json_jackson2;
+IF OBJECT_ID('ebasic_json_jackson2_seq', 'SO') IS NOT NULL drop sequence ebasic_json_jackson2_seq;
+
 IF OBJECT_ID('ebasic_json_list', 'U') IS NOT NULL drop table ebasic_json_list;
 IF OBJECT_ID('ebasic_json_list_seq', 'SO') IS NOT NULL drop sequence ebasic_json_list_seq;
 
@@ -884,20 +1178,38 @@ IF OBJECT_ID('e_basicver_seq', 'SO') IS NOT NULL drop sequence e_basicver_seq;
 IF OBJECT_ID('e_basic_withlife', 'U') IS NOT NULL drop table e_basic_withlife;
 IF OBJECT_ID('e_basic_withlife_seq', 'SO') IS NOT NULL drop sequence e_basic_withlife_seq;
 
+IF OBJECT_ID('e_basic_with_ex', 'U') IS NOT NULL drop table e_basic_with_ex;
+IF OBJECT_ID('e_basic_with_ex_seq', 'SO') IS NOT NULL drop sequence e_basic_with_ex_seq;
+
 IF OBJECT_ID('e_basicverucon', 'U') IS NOT NULL drop table e_basicverucon;
 IF OBJECT_ID('e_basicverucon_seq', 'SO') IS NOT NULL drop sequence e_basicverucon_seq;
 
+IF OBJECT_ID('ecache_child', 'U') IS NOT NULL drop table ecache_child;
+
+IF OBJECT_ID('ecache_root', 'U') IS NOT NULL drop table ecache_root;
+
 IF OBJECT_ID('e_col_ab', 'U') IS NOT NULL drop table e_col_ab;
 IF OBJECT_ID('e_col_ab_seq', 'SO') IS NOT NULL drop sequence e_col_ab_seq;
 
 IF OBJECT_ID('ecustom_id', 'U') IS NOT NULL drop table ecustom_id;
 
+IF OBJECT_ID('edefault_prop', 'U') IS NOT NULL drop table edefault_prop;
+IF OBJECT_ID('edefault_prop_seq', 'SO') IS NOT NULL drop sequence edefault_prop_seq;
+
 IF OBJECT_ID('eemb_inner', 'U') IS NOT NULL drop table eemb_inner;
 IF OBJECT_ID('eemb_inner_seq', 'SO') IS NOT NULL drop sequence eemb_inner_seq;
 
 IF OBJECT_ID('eemb_outer', 'U') IS NOT NULL drop table eemb_outer;
 IF OBJECT_ID('eemb_outer_seq', 'SO') IS NOT NULL drop sequence eemb_outer_seq;
 
+IF OBJECT_ID('efile2_no_fk', 'U') IS NOT NULL drop table efile2_no_fk;
+
+IF OBJECT_ID('efile_no_fk', 'U') IS NOT NULL drop table efile_no_fk;
+
+IF OBJECT_ID('efile_no_fk_euser_no_fk', 'U') IS NOT NULL drop table efile_no_fk_euser_no_fk;
+
+IF OBJECT_ID('efile_no_fk_euser_no_fk_soft_del', 'U') IS NOT NULL drop table efile_no_fk_euser_no_fk_soft_del;
+
 IF OBJECT_ID('egen_props', 'U') IS NOT NULL drop table egen_props;
 IF OBJECT_ID('egen_props_seq', 'SO') IS NOT NULL drop sequence egen_props_seq;
 
@@ -922,6 +1234,9 @@ IF OBJECT_ID('eopt_one_b_seq', 'SO') IS NOT NULL drop sequence eopt_one_b_seq;
 IF OBJECT_ID('eopt_one_c', 'U') IS NOT NULL drop table eopt_one_c;
 IF OBJECT_ID('eopt_one_c_seq', 'SO') IS NOT NULL drop sequence eopt_one_c_seq;
 
+IF OBJECT_ID('eper_addr', 'U') IS NOT NULL drop table eper_addr;
+IF OBJECT_ID('eper_addr_seq', 'SO') IS NOT NULL drop sequence eper_addr_seq;
+
 IF OBJECT_ID('eperson', 'U') IS NOT NULL drop table eperson;
 IF OBJECT_ID('eperson_seq', 'SO') IS NOT NULL drop sequence eperson_seq;
 
@@ -975,6 +1290,12 @@ IF OBJECT_ID('etrans_many_seq', 'SO') IS NOT NULL drop sequence etrans_many_seq;
 IF OBJECT_ID('rawinherit_uncle', 'U') IS NOT NULL drop table rawinherit_uncle;
 IF OBJECT_ID('rawinherit_uncle_seq', 'SO') IS NOT NULL drop sequence rawinherit_uncle_seq;
 
+IF OBJECT_ID('euser_no_fk', 'U') IS NOT NULL drop table euser_no_fk;
+IF OBJECT_ID('euser_no_fk_seq', 'SO') IS NOT NULL drop sequence euser_no_fk_seq;
+
+IF OBJECT_ID('euser_no_fk_soft_del', 'U') IS NOT NULL drop table euser_no_fk_soft_del;
+IF OBJECT_ID('euser_no_fk_soft_del_seq', 'SO') IS NOT NULL drop sequence euser_no_fk_soft_del_seq;
+
 IF OBJECT_ID('evanilla_collection', 'U') IS NOT NULL drop table evanilla_collection;
 IF OBJECT_ID('evanilla_collection_seq', 'SO') IS NOT NULL drop sequence evanilla_collection_seq;
 
@@ -987,6 +1308,41 @@ IF OBJECT_ID('ewho_props_seq', 'SO') IS NOT NULL drop sequence ewho_props_seq;
 IF OBJECT_ID('e_withinet', 'U') IS NOT NULL drop table e_withinet;
 IF OBJECT_ID('e_withinet_seq', 'SO') IS NOT NULL drop sequence e_withinet_seq;
 
+IF OBJECT_ID('ec_enum_person', 'U') IS NOT NULL drop table ec_enum_person;
+IF OBJECT_ID('ec_enum_person_seq', 'SO') IS NOT NULL drop sequence ec_enum_person_seq;
+
+IF OBJECT_ID('ec_enum_person_tags', 'U') IS NOT NULL drop table ec_enum_person_tags;
+
+IF OBJECT_ID('ec_person', 'U') IS NOT NULL drop table ec_person;
+IF OBJECT_ID('ec_person_seq', 'SO') IS NOT NULL drop sequence ec_person_seq;
+
+IF OBJECT_ID('ec_person_phone', 'U') IS NOT NULL drop table ec_person_phone;
+
+IF OBJECT_ID('ecbl_person', 'U') IS NOT NULL drop table ecbl_person;
+IF OBJECT_ID('ecbl_person_seq', 'SO') IS NOT NULL drop sequence ecbl_person_seq;
+
+IF OBJECT_ID('ecbl_person_phone_numbers', 'U') IS NOT NULL drop table ecbl_person_phone_numbers;
+
+IF OBJECT_ID('ecbm_person', 'U') IS NOT NULL drop table ecbm_person;
+IF OBJECT_ID('ecbm_person_seq', 'SO') IS NOT NULL drop sequence ecbm_person_seq;
+
+IF OBJECT_ID('ecbm_person_phone_numbers', 'U') IS NOT NULL drop table ecbm_person_phone_numbers;
+
+IF OBJECT_ID('ecm_person', 'U') IS NOT NULL drop table ecm_person;
+IF OBJECT_ID('ecm_person_seq', 'SO') IS NOT NULL drop sequence ecm_person_seq;
+
+IF OBJECT_ID('ecm_person_phone_numbers', 'U') IS NOT NULL drop table ecm_person_phone_numbers;
+
+IF OBJECT_ID('ecmc_person', 'U') IS NOT NULL drop table ecmc_person;
+IF OBJECT_ID('ecmc_person_seq', 'SO') IS NOT NULL drop sequence ecmc_person_seq;
+
+IF OBJECT_ID('ecmc_person_phone_numbers', 'U') IS NOT NULL drop table ecmc_person_phone_numbers;
+
+IF OBJECT_ID('ecs_person', 'U') IS NOT NULL drop table ecs_person;
+IF OBJECT_ID('ecs_person_seq', 'SO') IS NOT NULL drop sequence ecs_person_seq;
+
+IF OBJECT_ID('ecs_person_phone', 'U') IS NOT NULL drop table ecs_person_phone;
+
 IF OBJECT_ID('td_child', 'U') IS NOT NULL drop table td_child;
 IF OBJECT_ID('td_child_seq', 'SO') IS NOT NULL drop sequence td_child_seq;
 
@@ -996,6 +1352,12 @@ IF OBJECT_ID('td_parent_seq', 'SO') IS NOT NULL drop sequence td_parent_seq;
 IF OBJECT_ID('empl', 'U') IS NOT NULL drop table empl;
 IF OBJECT_ID('empl_seq', 'SO') IS NOT NULL drop sequence empl_seq;
 
+IF OBJECT_ID('esd_detail', 'U') IS NOT NULL drop table esd_detail;
+IF OBJECT_ID('esd_detail_seq', 'SO') IS NOT NULL drop sequence esd_detail_seq;
+
+IF OBJECT_ID('esd_master', 'U') IS NOT NULL drop table esd_master;
+IF OBJECT_ID('esd_master_seq', 'SO') IS NOT NULL drop sequence esd_master_seq;
+
 IF OBJECT_ID('feature_desc', 'U') IS NOT NULL drop table feature_desc;
 IF OBJECT_ID('feature_desc_seq', 'SO') IS NOT NULL drop sequence feature_desc_seq;
 
@@ -1044,6 +1406,37 @@ IF OBJECT_ID('hi_link_doc', 'U') IS NOT NULL alter table hi_link_doc set (system
 IF OBJECT_ID('hi_link_doc_history', 'U') IS NOT NULL drop table hi_link_doc_history;
 IF OBJECT_ID('hi_link_doc', 'U') IS NOT NULL drop table hi_link_doc;
 
+IF OBJECT_ID('hi_tone', 'U') IS NOT NULL alter table hi_tone set (system_versioning = off);
+IF OBJECT_ID('hi_tone_history', 'U') IS NOT NULL drop table hi_tone_history;
+IF OBJECT_ID('hi_tone', 'U') IS NOT NULL drop table hi_tone;
+IF OBJECT_ID('hi_tone_seq', 'SO') IS NOT NULL drop sequence hi_tone_seq;
+
+IF OBJECT_ID('hi_tthree', 'U') IS NOT NULL alter table hi_tthree set (system_versioning = off);
+IF OBJECT_ID('hi_tthree_history', 'U') IS NOT NULL drop table hi_tthree_history;
+IF OBJECT_ID('hi_tthree', 'U') IS NOT NULL drop table hi_tthree;
+IF OBJECT_ID('hi_tthree_seq', 'SO') IS NOT NULL drop sequence hi_tthree_seq;
+
+IF OBJECT_ID('hi_ttwo', 'U') IS NOT NULL alter table hi_ttwo set (system_versioning = off);
+IF OBJECT_ID('hi_ttwo_history', 'U') IS NOT NULL drop table hi_ttwo_history;
+IF OBJECT_ID('hi_ttwo', 'U') IS NOT NULL drop table hi_ttwo;
+IF OBJECT_ID('hi_ttwo_seq', 'SO') IS NOT NULL drop sequence hi_ttwo_seq;
+
+IF OBJECT_ID('hsd_setting', 'U') IS NOT NULL alter table hsd_setting set (system_versioning = off);
+IF OBJECT_ID('hsd_setting_history', 'U') IS NOT NULL drop table hsd_setting_history;
+IF OBJECT_ID('hsd_setting', 'U') IS NOT NULL drop table hsd_setting;
+IF OBJECT_ID('hsd_setting_seq', 'SO') IS NOT NULL drop sequence hsd_setting_seq;
+
+IF OBJECT_ID('hsd_user', 'U') IS NOT NULL alter table hsd_user set (system_versioning = off);
+IF OBJECT_ID('hsd_user_history', 'U') IS NOT NULL drop table hsd_user_history;
+IF OBJECT_ID('hsd_user', 'U') IS NOT NULL drop table hsd_user;
+IF OBJECT_ID('hsd_user_seq', 'SO') IS NOT NULL drop sequence hsd_user_seq;
+
+IF OBJECT_ID('iaf_segment', 'U') IS NOT NULL drop table iaf_segment;
+IF OBJECT_ID('iaf_segment_seq', 'SO') IS NOT NULL drop sequence iaf_segment_seq;
+
+IF OBJECT_ID('iaf_segment_status', 'U') IS NOT NULL drop table iaf_segment_status;
+IF OBJECT_ID('iaf_segment_status_seq', 'SO') IS NOT NULL drop sequence iaf_segment_status_seq;
+
 IF OBJECT_ID('imrelated', 'U') IS NOT NULL drop table imrelated;
 IF OBJECT_ID('imrelated_seq', 'SO') IS NOT NULL drop sequence imrelated_seq;
 
@@ -1072,6 +1465,11 @@ IF OBJECT_ID('item', 'U') IS NOT NULL drop table item;
 IF OBJECT_ID('monkey', 'U') IS NOT NULL drop table monkey;
 IF OBJECT_ID('monkey_seq', 'SO') IS NOT NULL drop sequence monkey_seq;
 
+IF OBJECT_ID('mkeygroup', 'U') IS NOT NULL drop table mkeygroup;
+IF OBJECT_ID('mkeygroup_seq', 'SO') IS NOT NULL drop sequence mkeygroup_seq;
+
+IF OBJECT_ID('mkeygroup_monkey', 'U') IS NOT NULL drop table mkeygroup_monkey;
+
 IF OBJECT_ID('trainer', 'U') IS NOT NULL drop table trainer;
 IF OBJECT_ID('trainer_seq', 'SO') IS NOT NULL drop sequence trainer_seq;
 
@@ -1119,6 +1517,25 @@ IF OBJECT_ID('la_attr_value_seq', 'SO') IS NOT NULL drop sequence la_attr_value_
 
 IF OBJECT_ID('la_attr_value_attribute', 'U') IS NOT NULL drop table la_attr_value_attribute;
 
+IF OBJECT_ID('looney', 'U') IS NOT NULL drop table looney;
+IF OBJECT_ID('looney_seq', 'SO') IS NOT NULL drop sequence looney_seq;
+
+IF OBJECT_ID('maddress', 'U') IS NOT NULL drop table maddress;
+
+IF OBJECT_ID('mcontact', 'U') IS NOT NULL drop table mcontact;
+
+IF OBJECT_ID('mcontact_message', 'U') IS NOT NULL drop table mcontact_message;
+
+IF OBJECT_ID('mcustomer', 'U') IS NOT NULL drop table mcustomer;
+
+IF OBJECT_ID('mgroup', 'U') IS NOT NULL drop table mgroup;
+IF OBJECT_ID('mgroup_seq', 'SO') IS NOT NULL drop sequence mgroup_seq;
+
+IF OBJECT_ID('mmachine', 'U') IS NOT NULL drop table mmachine;
+IF OBJECT_ID('mmachine_seq', 'SO') IS NOT NULL drop sequence mmachine_seq;
+
+IF OBJECT_ID('mmachine_mgroup', 'U') IS NOT NULL drop table mmachine_mgroup;
+
 IF OBJECT_ID('mmedia', 'U') IS NOT NULL drop table mmedia;
 IF OBJECT_ID('mmedia_seq', 'SO') IS NOT NULL drop sequence mmedia_seq;
 
@@ -1161,12 +1578,26 @@ IF OBJECT_ID('mail_user_inbox', 'U') IS NOT NULL drop table mail_user_inbox;
 
 IF OBJECT_ID('mail_user_outbox', 'U') IS NOT NULL drop table mail_user_outbox;
 
+IF OBJECT_ID('main_entity', 'U') IS NOT NULL drop table main_entity;
+
+IF OBJECT_ID('main_entity_relation', 'U') IS NOT NULL drop table main_entity_relation;
+
 IF OBJECT_ID('map_super_actual', 'U') IS NOT NULL drop table map_super_actual;
 IF OBJECT_ID('map_super_actual_seq', 'SO') IS NOT NULL drop sequence map_super_actual_seq;
 
 IF OBJECT_ID('c_message', 'U') IS NOT NULL drop table c_message;
 IF OBJECT_ID('c_message_seq', 'SO') IS NOT NULL drop sequence c_message_seq;
 
+IF OBJECT_ID('meter_address_data', 'U') IS NOT NULL drop table meter_address_data;
+
+IF OBJECT_ID('meter_contract_data', 'U') IS NOT NULL drop table meter_contract_data;
+
+IF OBJECT_ID('meter_special_needs_client', 'U') IS NOT NULL drop table meter_special_needs_client;
+
+IF OBJECT_ID('meter_special_needs_contact', 'U') IS NOT NULL drop table meter_special_needs_contact;
+
+IF OBJECT_ID('meter_version', 'U') IS NOT NULL drop table meter_version;
+
 IF OBJECT_ID('mnoc_role', 'U') IS NOT NULL drop table mnoc_role;
 IF OBJECT_ID('mnoc_role_seq', 'SO') IS NOT NULL drop sequence mnoc_role_seq;
 
@@ -1223,6 +1654,9 @@ IF OBJECT_ID('o_cached_bean_country', 'U') IS NOT NULL drop table o_cached_bean_
 IF OBJECT_ID('o_cached_bean_child', 'U') IS NOT NULL drop table o_cached_bean_child;
 IF OBJECT_ID('o_cached_bean_child_seq', 'SO') IS NOT NULL drop sequence o_cached_bean_child_seq;
 
+IF OBJECT_ID('o_cached_inherit', 'U') IS NOT NULL drop table o_cached_inherit;
+IF OBJECT_ID('o_cached_inherit_seq', 'SO') IS NOT NULL drop sequence o_cached_inherit_seq;
+
 IF OBJECT_ID('o_cached_natkey', 'U') IS NOT NULL drop table o_cached_natkey;
 IF OBJECT_ID('o_cached_natkey_seq', 'SO') IS NOT NULL drop sequence o_cached_natkey_seq;
 
@@ -1248,6 +1682,9 @@ IF OBJECT_ID('om_ordered_detail_seq', 'SO') IS NOT NULL drop sequence om_ordered
 IF OBJECT_ID('om_ordered_master', 'U') IS NOT NULL drop table om_ordered_master;
 IF OBJECT_ID('om_ordered_master_seq', 'SO') IS NOT NULL drop sequence om_ordered_master_seq;
 
+IF OBJECT_ID('only_id_entity', 'U') IS NOT NULL drop table only_id_entity;
+IF OBJECT_ID('only_id_entity_seq', 'SO') IS NOT NULL drop sequence only_id_entity_seq;
+
 IF OBJECT_ID('o_order', 'U') IS NOT NULL drop table o_order;
 IF OBJECT_ID('o_order_seq', 'SO') IS NOT NULL drop sequence o_order_seq;
 
@@ -1264,8 +1701,25 @@ IF OBJECT_ID('or_order_ship_seq', 'SO') IS NOT NULL drop sequence or_order_ship_
 IF OBJECT_ID('organisation', 'U') IS NOT NULL drop table organisation;
 IF OBJECT_ID('organisation_seq', 'SO') IS NOT NULL drop sequence organisation_seq;
 
+IF OBJECT_ID('organization_node', 'U') IS NOT NULL drop table organization_node;
+IF OBJECT_ID('organization_node_seq', 'SO') IS NOT NULL drop sequence organization_node_seq;
+
+IF OBJECT_ID('organization_tree_node', 'U') IS NOT NULL drop table organization_tree_node;
+IF OBJECT_ID('organization_tree_node_seq', 'SO') IS NOT NULL drop sequence organization_tree_node_seq;
+
+IF OBJECT_ID('orp_detail', 'U') IS NOT NULL drop table orp_detail;
+
+IF OBJECT_ID('orp_detail2', 'U') IS NOT NULL drop table orp_detail2;
+
+IF OBJECT_ID('orp_master', 'U') IS NOT NULL drop table orp_master;
+
+IF OBJECT_ID('orp_master2', 'U') IS NOT NULL drop table orp_master2;
+
+IF OBJECT_ID('oto_aone', 'U') IS NOT NULL drop table oto_aone;
+
+IF OBJECT_ID('oto_atwo', 'U') IS NOT NULL drop table oto_atwo;
+
 IF OBJECT_ID('oto_bchild', 'U') IS NOT NULL drop table oto_bchild;
-IF OBJECT_ID('oto_bchild_seq', 'SO') IS NOT NULL drop sequence oto_bchild_seq;
 
 IF OBJECT_ID('oto_bmaster', 'U') IS NOT NULL drop table oto_bmaster;
 IF OBJECT_ID('oto_bmaster_seq', 'SO') IS NOT NULL drop sequence oto_bmaster_seq;
@@ -1279,6 +1733,15 @@ IF OBJECT_ID('oto_cust_seq', 'SO') IS NOT NULL drop sequence oto_cust_seq;
 IF OBJECT_ID('oto_cust_address', 'U') IS NOT NULL drop table oto_cust_address;
 IF OBJECT_ID('oto_cust_address_seq', 'SO') IS NOT NULL drop sequence oto_cust_address_seq;
 
+IF OBJECT_ID('oto_level_a', 'U') IS NOT NULL drop table oto_level_a;
+IF OBJECT_ID('oto_level_a_seq', 'SO') IS NOT NULL drop sequence oto_level_a_seq;
+
+IF OBJECT_ID('oto_level_b', 'U') IS NOT NULL drop table oto_level_b;
+IF OBJECT_ID('oto_level_b_seq', 'SO') IS NOT NULL drop sequence oto_level_b_seq;
+
+IF OBJECT_ID('oto_level_c', 'U') IS NOT NULL drop table oto_level_c;
+IF OBJECT_ID('oto_level_c_seq', 'SO') IS NOT NULL drop sequence oto_level_c_seq;
+
 IF OBJECT_ID('oto_master', 'U') IS NOT NULL drop table oto_master;
 IF OBJECT_ID('oto_master_seq', 'SO') IS NOT NULL drop sequence oto_master_seq;
 
@@ -1287,6 +1750,12 @@ IF OBJECT_ID('oto_prime_seq', 'SO') IS NOT NULL drop sequence oto_prime_seq;
 
 IF OBJECT_ID('oto_prime_extra', 'U') IS NOT NULL drop table oto_prime_extra;
 
+IF OBJECT_ID('oto_sd_child', 'U') IS NOT NULL drop table oto_sd_child;
+IF OBJECT_ID('oto_sd_child_seq', 'SO') IS NOT NULL drop sequence oto_sd_child_seq;
+
+IF OBJECT_ID('oto_sd_master', 'U') IS NOT NULL drop table oto_sd_master;
+IF OBJECT_ID('oto_sd_master_seq', 'SO') IS NOT NULL drop sequence oto_sd_master_seq;
+
 IF OBJECT_ID('oto_th_many', 'U') IS NOT NULL drop table oto_th_many;
 IF OBJECT_ID('oto_th_many_seq', 'SO') IS NOT NULL drop sequence oto_th_many_seq;
 
@@ -1304,6 +1773,12 @@ IF OBJECT_ID('oto_uprime', 'U') IS NOT NULL drop table oto_uprime;
 
 IF OBJECT_ID('oto_uprime_extra', 'U') IS NOT NULL drop table oto_uprime_extra;
 
+IF OBJECT_ID('oto_user_model', 'U') IS NOT NULL drop table oto_user_model;
+IF OBJECT_ID('oto_user_model_seq', 'SO') IS NOT NULL drop sequence oto_user_model_seq;
+
+IF OBJECT_ID('oto_user_model_optional', 'U') IS NOT NULL drop table oto_user_model_optional;
+IF OBJECT_ID('oto_user_model_optional_seq', 'SO') IS NOT NULL drop sequence oto_user_model_optional_seq;
+
 IF OBJECT_ID('pfile', 'U') IS NOT NULL drop table pfile;
 IF OBJECT_ID('pfile_seq', 'SO') IS NOT NULL drop sequence pfile_seq;
 
@@ -1326,12 +1801,18 @@ IF OBJECT_ID('rawinherit_parent_seq', 'SO') IS NOT NULL drop sequence rawinherit
 
 IF OBJECT_ID('rawinherit_parent_rawinherit_data', 'U') IS NOT NULL drop table rawinherit_parent_rawinherit_data;
 
+IF OBJECT_ID('e_save_test_c', 'U') IS NOT NULL drop table e_save_test_c;
+IF OBJECT_ID('e_save_test_c_seq', 'SO') IS NOT NULL drop sequence e_save_test_c_seq;
+
 IF OBJECT_ID('parent_person', 'U') IS NOT NULL drop table parent_person;
 IF OBJECT_ID('parent_person_seq', 'SO') IS NOT NULL drop sequence parent_person_seq;
 
 IF OBJECT_ID('c_participation', 'U') IS NOT NULL drop table c_participation;
 IF OBJECT_ID('c_participation_seq', 'SO') IS NOT NULL drop sequence c_participation_seq;
 
+IF OBJECT_ID('password_store_model', 'U') IS NOT NULL drop table password_store_model;
+IF OBJECT_ID('password_store_model_seq', 'SO') IS NOT NULL drop sequence password_store_model_seq;
+
 IF OBJECT_ID('mt_permission', 'U') IS NOT NULL drop table mt_permission;
 
 IF OBJECT_ID('persistent_file', 'U') IS NOT NULL drop table persistent_file;
@@ -1340,15 +1821,22 @@ IF OBJECT_ID('persistent_file_seq', 'SO') IS NOT NULL drop sequence persistent_f
 IF OBJECT_ID('persistent_file_content', 'U') IS NOT NULL drop table persistent_file_content;
 IF OBJECT_ID('persistent_file_content_seq', 'SO') IS NOT NULL drop sequence persistent_file_content_seq;
 
-IF OBJECT_ID('persons', 'U') IS NOT NULL drop table persons;
-IF OBJECT_ID('PERSONS_seq', 'SO') IS NOT NULL drop sequence PERSONS_seq;
-
 IF OBJECT_ID('person', 'U') IS NOT NULL drop table person;
 IF OBJECT_ID('person_seq', 'SO') IS NOT NULL drop sequence person_seq;
 
+IF OBJECT_ID('persons', 'U') IS NOT NULL drop table persons;
+IF OBJECT_ID('PERSONS_seq', 'SO') IS NOT NULL drop sequence PERSONS_seq;
+
+IF OBJECT_ID('person_cache_email', 'U') IS NOT NULL drop table person_cache_email;
+
+IF OBJECT_ID('person_cache_info', 'U') IS NOT NULL drop table person_cache_info;
+
 IF OBJECT_ID('phones', 'U') IS NOT NULL drop table phones;
 IF OBJECT_ID('PHONES_seq', 'SO') IS NOT NULL drop sequence PHONES_seq;
 
+IF OBJECT_ID('e_position', 'U') IS NOT NULL drop table e_position;
+IF OBJECT_ID('e_position_seq', 'SO') IS NOT NULL drop sequence e_position_seq;
+
 IF OBJECT_ID('primary_revision', 'U') IS NOT NULL drop table primary_revision;
 
 IF OBJECT_ID('o_product', 'U') IS NOT NULL drop table o_product;
@@ -1367,15 +1855,21 @@ IF OBJECT_ID('r_orders', 'U') IS NOT NULL drop table r_orders;
 
 IF OBJECT_ID('region', 'U') IS NOT NULL drop table region;
 
-IF OBJECT_ID('resourcefile', 'U') IS NOT NULL drop table resourcefile;
+IF OBJECT_ID('rel_detail', 'U') IS NOT NULL drop table rel_detail;
+IF OBJECT_ID('rel_detail_seq', 'SO') IS NOT NULL drop sequence rel_detail_seq;
 
-IF OBJECT_ID('em_role', 'U') IS NOT NULL drop table em_role;
-IF OBJECT_ID('em_role_seq', 'SO') IS NOT NULL drop sequence em_role_seq;
+IF OBJECT_ID('rel_master', 'U') IS NOT NULL drop table rel_master;
+IF OBJECT_ID('rel_master_seq', 'SO') IS NOT NULL drop sequence rel_master_seq;
+
+IF OBJECT_ID('resourcefile', 'U') IS NOT NULL drop table resourcefile;
 
 IF OBJECT_ID('mt_role', 'U') IS NOT NULL drop table mt_role;
 
 IF OBJECT_ID('mt_role_permission', 'U') IS NOT NULL drop table mt_role_permission;
 
+IF OBJECT_ID('em_role', 'U') IS NOT NULL drop table em_role;
+IF OBJECT_ID('em_role_seq', 'SO') IS NOT NULL drop sequence em_role_seq;
+
 IF OBJECT_ID('f_second', 'U') IS NOT NULL drop table f_second;
 IF OBJECT_ID('f_second_seq', 'SO') IS NOT NULL drop sequence f_second_seq;
 
@@ -1391,6 +1885,16 @@ IF OBJECT_ID('self_ref_customer_seq', 'SO') IS NOT NULL drop sequence self_ref_c
 IF OBJECT_ID('self_ref_example', 'U') IS NOT NULL drop table self_ref_example;
 IF OBJECT_ID('self_ref_example_seq', 'SO') IS NOT NULL drop sequence self_ref_example_seq;
 
+IF OBJECT_ID('e_save_test_a', 'U') IS NOT NULL drop table e_save_test_a;
+IF OBJECT_ID('e_save_test_a_seq', 'SO') IS NOT NULL drop sequence e_save_test_a_seq;
+
+IF OBJECT_ID('e_save_test_b', 'U') IS NOT NULL drop table e_save_test_b;
+IF OBJECT_ID('e_save_test_b_seq', 'SO') IS NOT NULL drop sequence e_save_test_b_seq;
+
+IF OBJECT_ID('site', 'U') IS NOT NULL drop table site;
+
+IF OBJECT_ID('site_address', 'U') IS NOT NULL drop table site_address;
+
 IF OBJECT_ID('some_enum_bean', 'U') IS NOT NULL drop table some_enum_bean;
 IF OBJECT_ID('some_enum_bean_seq', 'SO') IS NOT NULL drop sequence some_enum_bean_seq;
 
@@ -1477,11 +1981,22 @@ IF OBJECT_ID('trip_seq', 'SO') IS NOT NULL drop sequence trip_seq;
 IF OBJECT_ID('truck_ref', 'U') IS NOT NULL drop table truck_ref;
 IF OBJECT_ID('truck_ref_seq', 'SO') IS NOT NULL drop sequence truck_ref_seq;
 
-IF OBJECT_ID('type', 'U') IS NOT NULL drop table type;
+IF OBJECT_ID('tune', 'U') IS NOT NULL drop table tune;
+IF OBJECT_ID('tune_seq', 'SO') IS NOT NULL drop sequence tune_seq;
+
+IF OBJECT_ID('[type]', 'U') IS NOT NULL drop table [type];
 
 IF OBJECT_ID('tz_bean', 'U') IS NOT NULL drop table tz_bean;
 IF OBJECT_ID('tz_bean_seq', 'SO') IS NOT NULL drop sequence tz_bean_seq;
 
+IF OBJECT_ID('usib_child', 'U') IS NOT NULL drop table usib_child;
+
+IF OBJECT_ID('usib_child_sibling', 'U') IS NOT NULL drop table usib_child_sibling;
+IF OBJECT_ID('usib_child_sibling_seq', 'SO') IS NOT NULL drop sequence usib_child_sibling_seq;
+
+IF OBJECT_ID('usib_parent', 'U') IS NOT NULL drop table usib_parent;
+IF OBJECT_ID('usib_parent_seq', 'SO') IS NOT NULL drop sequence usib_parent_seq;
+
 IF OBJECT_ID('ut_detail', 'U') IS NOT NULL drop table ut_detail;
 IF OBJECT_ID('ut_detail_seq', 'SO') IS NOT NULL drop sequence ut_detail_seq;
 
@@ -1492,6 +2007,9 @@ IF OBJECT_ID('uuone', 'U') IS NOT NULL drop table uuone;
 
 IF OBJECT_ID('uutwo', 'U') IS NOT NULL drop table uutwo;
 
+IF OBJECT_ID('oto_user', 'U') IS NOT NULL drop table oto_user;
+IF OBJECT_ID('oto_user_seq', 'SO') IS NOT NULL drop sequence oto_user_seq;
+
 IF OBJECT_ID('c_user', 'U') IS NOT NULL alter table c_user set (system_versioning = off);
 IF OBJECT_ID('c_user_history', 'U') IS NOT NULL drop table c_user_history;
 IF OBJECT_ID('c_user', 'U') IS NOT NULL drop table c_user;
@@ -1506,9 +2024,6 @@ IF OBJECT_ID('g_user_seq', 'SO') IS NOT NULL drop sequence g_user_seq;
 IF OBJECT_ID('em_user', 'U') IS NOT NULL drop table em_user;
 IF OBJECT_ID('em_user_seq', 'SO') IS NOT NULL drop sequence em_user_seq;
 
-IF OBJECT_ID('oto_user', 'U') IS NOT NULL drop table oto_user;
-IF OBJECT_ID('oto_user_seq', 'SO') IS NOT NULL drop sequence oto_user_seq;
-
 IF OBJECT_ID('em_user_role', 'U') IS NOT NULL drop table em_user_role;
 
 IF OBJECT_ID('vehicle', 'U') IS NOT NULL drop table vehicle;
@@ -1517,17 +2032,20 @@ IF OBJECT_ID('vehicle_seq', 'SO') IS NOT NULL drop sequence vehicle_seq;
 IF OBJECT_ID('vehicle_driver', 'U') IS NOT NULL drop table vehicle_driver;
 IF OBJECT_ID('vehicle_driver_seq', 'SO') IS NOT NULL drop sequence vehicle_driver_seq;
 
+IF OBJECT_ID('vehicle_lease', 'U') IS NOT NULL drop table vehicle_lease;
+IF OBJECT_ID('vehicle_lease_seq', 'SO') IS NOT NULL drop sequence vehicle_lease_seq;
+
 IF OBJECT_ID('warehouses', 'U') IS NOT NULL drop table warehouses;
 IF OBJECT_ID('warehouses_seq', 'SO') IS NOT NULL drop sequence warehouses_seq;
 
 IF OBJECT_ID('warehousesshippingzones', 'U') IS NOT NULL drop table warehousesshippingzones;
 
-IF OBJECT_ID('sa_wheel', 'U') IS NOT NULL drop table sa_wheel;
-IF OBJECT_ID('sa_wheel_seq', 'SO') IS NOT NULL drop sequence sa_wheel_seq;
-
 IF OBJECT_ID('wheel', 'U') IS NOT NULL drop table wheel;
 IF OBJECT_ID('wheel_seq', 'SO') IS NOT NULL drop sequence wheel_seq;
 
+IF OBJECT_ID('sa_wheel', 'U') IS NOT NULL drop table sa_wheel;
+IF OBJECT_ID('sa_wheel_seq', 'SO') IS NOT NULL drop sequence sa_wheel_seq;
+
 IF OBJECT_ID('sp_car_wheel', 'U') IS NOT NULL drop table sp_car_wheel;
 IF OBJECT_ID('sp_car_wheel_seq', 'SO') IS NOT NULL drop sequence sp_car_wheel_seq;
 
@@ -1547,3 +2065,5 @@ IF OBJECT_ID('zones_seq', 'SO') IS NOT NULL drop sequence zones_seq;
 
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('contact','U') AND name = 'ix_contact_last_name_first_name') drop index ix_contact_last_name_first_name ON contact;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('e_basic','U') AND name = 'ix_e_basic_name') drop index ix_e_basic_name ON e_basic;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('efile2_no_fk','U') AND name = 'ix_efile2_no_fk_owner_id') drop index ix_efile2_no_fk_owner_id ON efile2_no_fk;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('organization_node','U') AND name = 'ix_organization_node_kind') drop index ix_organization_node_kind ON organization_node;

From 318f6ae3f518570ba3374de85b2e1e2a5887ad70 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 31 Jul 2019 23:21:01 +1200
Subject: [PATCH 0987/1036] Bump to 11.42.1-SNAPSHOT

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c87c6b19e..ace01fd8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.41.5-SNAPSHOT</version>
+  <version>11.42.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -315,7 +315,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>11.41.3</version>
+        <version>11.42.1</version>
         <executions>
           <execution>
             <id>test</id>

From 3655e2c6f87fcf33680e3493da05fb059d5cffe9 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 31 Jul 2019 23:25:30 +1200
Subject: [PATCH 0988/1036] #1778 - Bump jackson-core.version from 2.9.8 to
 2.9.9

---
 pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ace01fd8d..e8a998698 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,8 @@
   <url>http://ebean-orm.github.io/</url>
 
   <properties>
-    <jackson-core.version>2.9.8</jackson-core.version>
+    <jackson-core.version>2.9.9</jackson-core.version>
+    <jackson-databind.version>2.9.9.1</jackson-databind.version>
     <snakeyaml.version>1.21</snakeyaml.version>
   </properties>
 
@@ -161,7 +162,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>${jackson-core.version}</version>
+      <version>${jackson-databind.version}</version>
       <scope>provided</scope>
     </dependency>
 

From 462385c7d04ca68b2ff25da2c3b9246fd1d4f941 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 31 Jul 2019 23:27:42 +1200
Subject: [PATCH 0989/1036] [maven-release-plugin] prepare release
 ebean-11.42.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e8a998698..1b5f747ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.42.1-SNAPSHOT</version>
+  <version>11.42.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -23,7 +23,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.42.1</tag>
   </scm>
 
   <profiles>

From 410e9d475b011e4d6dbebd8dd2f0a272c04ddb58 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 31 Jul 2019 23:27:53 +1200
Subject: [PATCH 0990/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1b5f747ca..f1a46c97e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.42.1</version>
+  <version>11.42.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -23,7 +23,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.42.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From a115cdf0952cba857fd89adaf75510b4735d74c7 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 7 Aug 2019 21:38:52 +1200
Subject: [PATCH 0991/1036] #1784 - Tests related to NPE with IDEA plugin and
 mockito 3.0.0

---
 .../org/tests/mockito/TestMockitoMock.java    | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 src/test/java/org/tests/mockito/TestMockitoMock.java

diff --git a/src/test/java/org/tests/mockito/TestMockitoMock.java b/src/test/java/org/tests/mockito/TestMockitoMock.java
new file mode 100644
index 000000000..b9222f8b6
--- /dev/null
+++ b/src/test/java/org/tests/mockito/TestMockitoMock.java
@@ -0,0 +1,46 @@
+package org.tests.mockito;
+
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.tests.model.aggregation.DOrg;
+import org.tests.model.basic.PersistentFile;
+
+public class TestMockitoMock {
+
+  @Test
+  public void mockEntityBean() {
+
+    final DOrg mock = Mockito.mock(DOrg.class);
+    mock.setName("junk");
+    mock.save();
+
+    final PersistentFile mock1 = Mockito.mock(PersistentFile.class);
+    mock1.setName("foo");
+  }
+
+  @Test
+  public void spyEntityBean() {
+
+    final PersistentFile spy = Mockito.spy(PersistentFile.class);
+    spy.setName("foo");
+    spy.setVersion(42L);
+
+    final PersistentFile verify = Mockito.verify(spy);
+    verify.setName("foo");
+    verify.setVersion(42L);
+  }
+
+  @Test
+  public void spyInstanceEntityBean() {
+
+    PersistentFile file = new PersistentFile();
+    final PersistentFile spy = Mockito.spy(file);
+    spy.setName("foo");
+    spy.setVersion(42L);
+
+    final PersistentFile verify = Mockito.verify(spy);
+    verify.setName("foo");
+    verify.setVersion(42L);
+  }
+}
+

From b3d0c21a803d2c94f23d368c83e69129aa9f7a76 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 7 Aug 2019 22:28:51 +1200
Subject: [PATCH 0992/1036] #1783 - Save bean with only *ToMany relations with
 user generated ID

---
 .../server/deploy/BeanDescriptor.java         |  2 +-
 src/test/java/org/tests/o2m/OMVertex.java     | 38 ++++++++++++++++
 .../java/org/tests/o2m/OMVertexOther.java     | 18 ++++++++
 .../org/tests/o2m/TestOneToManyOnlyBean.java  | 44 +++++++++++++++++++
 4 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/org/tests/o2m/OMVertex.java
 create mode 100644 src/test/java/org/tests/o2m/OMVertexOther.java
 create mode 100644 src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 832539da7..c42f960a9 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -3202,7 +3202,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   }
 
   boolean hasIdPropertyOnly(EntityBeanIntercept ebi) {
-    return ebi.hasIdOnly(idPropertyIndex);
+    return propertiesBaseScalar.length > 0 && ebi.hasIdOnly(idPropertyIndex);
   }
 
   public boolean isIdLoaded(EntityBeanIntercept ebi) {
diff --git a/src/test/java/org/tests/o2m/OMVertex.java b/src/test/java/org/tests/o2m/OMVertex.java
new file mode 100644
index 000000000..95d57d133
--- /dev/null
+++ b/src/test/java/org/tests/o2m/OMVertex.java
@@ -0,0 +1,38 @@
+package org.tests.o2m;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import java.util.List;
+import java.util.UUID;
+
+@Entity
+public class OMVertex {
+
+  @Id
+  private UUID id;
+
+  @OneToMany(cascade = CascadeType.ALL)
+  private List<OMVertexOther> related;
+
+  public OMVertex(UUID id) {
+    this.id = id;
+  }
+
+  public UUID getId() {
+    return id;
+  }
+
+  public void setId(UUID id) {
+    this.id = id;
+  }
+
+  public List<OMVertexOther> getRelated() {
+    return related;
+  }
+
+  public void setRelated(List<OMVertexOther> related) {
+    this.related = related;
+  }
+}
diff --git a/src/test/java/org/tests/o2m/OMVertexOther.java b/src/test/java/org/tests/o2m/OMVertexOther.java
new file mode 100644
index 000000000..237e4aa01
--- /dev/null
+++ b/src/test/java/org/tests/o2m/OMVertexOther.java
@@ -0,0 +1,18 @@
+package org.tests.o2m;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import java.util.UUID;
+
+@Entity
+public class OMVertexOther {
+
+  @Id
+  private UUID id;
+
+  private final String name;
+
+  public OMVertexOther(String name) {
+    this.name = name;
+  }
+}
diff --git a/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java b/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java
new file mode 100644
index 000000000..2dccb4a1e
--- /dev/null
+++ b/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java
@@ -0,0 +1,44 @@
+package org.tests.o2m;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.BeanDescriptor;
+import org.junit.Test;
+
+import java.util.UUID;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class TestOneToManyOnlyBean extends BaseTestCase {
+
+  @Test
+  public void insert() {
+
+    OMVertex myBean = new OMVertex(UUID.randomUUID());
+    DB.save(myBean);
+
+    assertEquals(DB.find(OMVertex.class, myBean.getId()), myBean);
+  }
+
+  @Test
+  public void isReference_when_newWithId_expectFalse() {
+
+    OMVertex myBean = new OMVertex(UUID.randomUUID());
+    assertFalse(isReference(myBean));
+  }
+
+  @Test
+  public void isReference_when_getReference_expectTrue() {
+
+    OMVertex myBean = DB.getReference(OMVertex.class, UUID.randomUUID());
+    assertTrue(isReference(myBean));
+  }
+
+  private boolean isReference(Object myBean) {
+    final BeanDescriptor<OMVertex> desc = getBeanDescriptor(OMVertex.class);
+    return desc.isReference(((EntityBean) myBean)._ebean_getIntercept());
+  }
+}

From 481f82850774d9b01d4d211e099269f039e85975 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 7 Aug 2019 22:40:57 +1200
Subject: [PATCH 0993/1036] Bump provided scope jackson-databind version to
 2.9.9.2 for security warning

This should have no effect as the dependency is scope provided.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f1a46c97e..89f832c96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 
   <properties>
     <jackson-core.version>2.9.9</jackson-core.version>
-    <jackson-databind.version>2.9.9.1</jackson-databind.version>
+    <jackson-databind.version>2.9.9.2</jackson-databind.version>
     <snakeyaml.version>1.21</snakeyaml.version>
   </properties>
 

From 848d4f031e21729ea8a21bdbd8c0b36d140889f8 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 7 Aug 2019 22:42:59 +1200
Subject: [PATCH 0994/1036] [maven-release-plugin] prepare release
 ebean-11.42.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 89f832c96..8eb543632 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.42.2-SNAPSHOT</version>
+  <version>11.42.2</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -23,7 +23,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.42.2</tag>
   </scm>
 
   <profiles>

From 762899ef1049e6eaf32bee3e4751a77f12ab0e30 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 7 Aug 2019 22:43:12 +1200
Subject: [PATCH 0995/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8eb543632..1d07f2859 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.42.2</version>
+  <version>11.42.3-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -23,7 +23,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.42.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From cb6f0335b1d55220b742dc338f8f3252ee4ccef7 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Aug 2019 23:22:58 +1200
Subject: [PATCH 0996/1036] #1787 - Update CockroachDB support for DDL
 generation with autocommit and no history support

---
 .../io/ebean/config/dbplatform/DatabasePlatform.java |  2 +-
 .../dbplatform/cockroach/CockroachPlatform.java      |  2 +-
 .../io/ebeaninternal/dbmigration/DdlGenerator.java   | 12 +++++-------
 .../ddlgeneration/platform/CockroachDdl.java         |  1 -
 .../platform/DbTriggerBasedHistoryDdl.java           |  5 +----
 .../org/tests/transaction/TestCommitAndContinue.java |  6 +++---
 src/test/resources/ebean.properties                  |  4 ++++
 7 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
index 445ec3d15..f5f865dfc 100644
--- a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
@@ -577,7 +577,7 @@ public class DatabasePlatform {
   /**
    * Normally not needed - overridden in CockroachPlatform.
    */
-  public boolean isDdlCommitOnCreateIndex() {
+  public boolean isDdlAutoCommit() {
     return false;
   }
 
diff --git a/src/main/java/io/ebean/config/dbplatform/cockroach/CockroachPlatform.java b/src/main/java/io/ebean/config/dbplatform/cockroach/CockroachPlatform.java
index 502e33cf6..91a627510 100644
--- a/src/main/java/io/ebean/config/dbplatform/cockroach/CockroachPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/cockroach/CockroachPlatform.java
@@ -21,7 +21,7 @@ public class CockroachPlatform extends PostgresPlatform {
    * Needs a commit after create index such that alter table add foreign key ... succeeds.
    */
   @Override
-  public boolean isDdlCommitOnCreateIndex() {
+  public boolean isDdlAutoCommit() {
     return true;
   }
 
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
index 338781f61..45282cd2d 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
@@ -44,7 +44,7 @@ public class DdlGenerator {
   private final boolean extraDdl;
   private final boolean createOnly;
   private final boolean jaxbPresent;
-  private final boolean ddlCommitOnCreateIndex;
+  private final boolean ddlAutoCommit;
   private final String dbSchema;
   private final ScriptTransform scriptTransform;
 
@@ -63,10 +63,10 @@ public class DdlGenerator {
     if (!serverConfig.getTenantMode().isDdlEnabled() && serverConfig.isDdlRun()) {
       log.warn("DDL can't be run on startup with TenantMode " + serverConfig.getTenantMode());
       this.runDdl = false;
-      this.ddlCommitOnCreateIndex = false;
+      this.ddlAutoCommit = false;
     } else {
       this.runDdl = serverConfig.isDdlRun();
-      this.ddlCommitOnCreateIndex = server.getDatabasePlatform().isDdlCommitOnCreateIndex();
+      this.ddlAutoCommit = server.getDatabasePlatform().isDdlAutoCommit();
     }
     this.scriptTransform = createScriptTransform(serverConfig.getMigrationConfig());
     this.baseDir = initBaseDir();
@@ -160,13 +160,11 @@ public class DdlGenerator {
 
     DdlRunner runner = new DdlRunner(expectErrors, scriptName);
     try {
-      if (expectErrors) {
+      if (expectErrors || ddlAutoCommit) {
         connection.setAutoCommit(true);
-      } else if (ddlCommitOnCreateIndex) {
-        runner.setCommitOnCreateIndex();
       }
       int count = runner.runAll(scriptTransform.transform(content), connection);
-      if (expectErrors) {
+      if (expectErrors || ddlAutoCommit) {
         connection.setAutoCommit(false);
       }
       connection.commit();
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/CockroachDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/CockroachDdl.java
index f1fa243ef..556fcd7dc 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/CockroachDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/CockroachDdl.java
@@ -10,7 +10,6 @@ public class CockroachDdl extends PlatformDdl {
 
   public CockroachDdl(DatabasePlatform platform) {
     super(platform);
-    this.historyDdl = new PostgresHistoryDdl();
     this.dropTableCascade = " cascade";
     this.columnSetType = "type ";
     this.alterTableIfExists = "if exists ";
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
index a425cf9be..5a5583139 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
@@ -33,7 +33,7 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl {
   protected String currentTimestamp = "now(6)";
   protected String sysPeriodType = "datetime(6)";
 
-  public DbTriggerBasedHistoryDdl() {
+  DbTriggerBasedHistoryDdl() {
   }
 
   @Override
@@ -252,7 +252,6 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl {
   }
 
   protected void appendColumnNames(DdlBuffer buffer, List<String> columns, String columnPrefix) throws IOException {
-
     for (int i = 0; i < columns.size(); i++) {
       if (i > 0) {
         buffer.append(", ");
@@ -266,7 +265,6 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl {
    * Append a single column to the buffer if it is not null.
    */
   protected void appendColumnName(DdlBuffer buffer, String prefix, String columnName) throws IOException {
-
     if (columnName != null) {
       buffer.append(prefix).append(columnName);
     }
@@ -281,7 +279,6 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl {
    * </p>
    */
   protected List<String> columnNamesForApply(MTable table) {
-
     return table.allHistoryColumns(true);
   }
 
diff --git a/src/test/java/org/tests/transaction/TestCommitAndContinue.java b/src/test/java/org/tests/transaction/TestCommitAndContinue.java
index 1dc705a3d..157a20056 100644
--- a/src/test/java/org/tests/transaction/TestCommitAndContinue.java
+++ b/src/test/java/org/tests/transaction/TestCommitAndContinue.java
@@ -21,7 +21,7 @@ public class TestCommitAndContinue extends BaseTestCase {
 
   @Test
   @Transactional
-  @IgnorePlatform({Platform.SQLSERVER, Platform.HSQLDB}) // they will dead lock
+  @IgnorePlatform({Platform.SQLSERVER, Platform.HSQLDB, Platform.COCKROACH}) // they will dead lock
   public void transactional_partialSuccess() {
 
     MnyB a = new MnyB("a100");
@@ -57,7 +57,7 @@ public class TestCommitAndContinue extends BaseTestCase {
    * The @Transactional is nicer to me.
    */
   @Test
-  @IgnorePlatform({Platform.SQLSERVER, Platform.HSQLDB}) // they will dead lock
+  @IgnorePlatform({Platform.SQLSERVER, Platform.HSQLDB, Platform.COCKROACH}) // they will dead lock
   public void tryFinally_partialSuccess() {
 
     MnyB a = new MnyB("a100");
@@ -101,7 +101,7 @@ public class TestCommitAndContinue extends BaseTestCase {
 
   @Test
   @Transactional
-  @IgnorePlatform({Platform.SQLSERVER, Platform.HSQLDB}) // they will dead lock
+  @IgnorePlatform({Platform.SQLSERVER, Platform.HSQLDB, Platform.COCKROACH}) // they will dead lock
   public void transactional_partialSuccess_secondTransactionInsert() {
 
     MnyB a = new MnyB("a100");
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index e5e709a90..45f5209aa 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -140,6 +140,10 @@ datasource.mysql.databaseUrl=jdbc:mysql://127.0.0.1:4306/unit
 #datasource.mysql.databaseUrl=jdbc:mysql://127.0.0.1:4306/test_ebean
 datasource.mysql.databaseDriver=com.mysql.cj.jdbc.Driver
 
+datasource.cockroach.username=root
+datasource.cockroach.password=
+datasource.cockroach.url=jdbc:postgresql://localhost:26257/unit?sslmode=disable
+datasource.cockroach.driver=org.postgresql.Driver
 
 datasource.oracle.username=test_ebean
 datasource.oracle.password=test

From bb7df713912783c1e5de33d8996cdb0cdea40a68 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 10 Aug 2019 21:40:23 +1200
Subject: [PATCH 0997/1036] #1782 - ENH: Add truncate(Class<?>... types) and
 truncate(String... tables)

---
 src/main/java/io/ebean/DB.java                | 14 +++++
 src/main/java/io/ebean/Database.java          | 11 ++++
 .../config/dbplatform/DatabasePlatform.java   | 25 +++++++++
 .../config/dbplatform/db2/DB2Platform.java    |  1 +
 .../config/dbplatform/h2/H2Platform.java      |  3 +-
 .../config/dbplatform/hana/HanaPlatform.java  |  1 -
 .../dbplatform/hsqldb/HsqldbPlatform.java     |  2 +-
 .../dbplatform/mysql/MySqlPlatform.java       |  3 +-
 .../dbplatform/oracle/OraclePlatform.java     |  2 +-
 .../dbplatform/postgres/PostgresPlatform.java |  2 +-
 .../dbplatform/sqlite/SQLitePlatform.java     |  2 +-
 .../server/core/DefaultServer.java            | 34 ++++++++++++
 .../ebeaninternal/api/TDSpiEbeanServer.java   | 53 +++----------------
 src/test/java/main/StartCockroach.java        | 16 ++++++
 .../java/org/tests/model/nofk/Test2NoFk.java  |  6 +--
 .../org/tests/model/nofk/TestTruncate.java    | 46 ++++++++++++++++
 src/test/resources/logback-test.xml           |  2 +-
 17 files changed, 167 insertions(+), 56 deletions(-)
 create mode 100644 src/test/java/main/StartCockroach.java
 create mode 100644 src/test/java/org/tests/model/nofk/TestTruncate.java

diff --git a/src/main/java/io/ebean/DB.java b/src/main/java/io/ebean/DB.java
index db386a5e5..0379bae6d 100644
--- a/src/main/java/io/ebean/DB.java
+++ b/src/main/java/io/ebean/DB.java
@@ -1237,4 +1237,18 @@ public class DB {
     return getDefault().json();
   }
 
+  /**
+   * Truncate the base tables for the given bean types.
+   */
+  public static void truncate(Class<?>... types) {
+    getDefault().truncate(types);
+  }
+
+  /**
+   * Truncate the given tables.
+   */
+  public static void truncate(String... tables) {
+    getDefault().truncate(tables);
+  }
+
 }
diff --git a/src/main/java/io/ebean/Database.java b/src/main/java/io/ebean/Database.java
index 8a7b3a9f4..ee9ece29d 100644
--- a/src/main/java/io/ebean/Database.java
+++ b/src/main/java/io/ebean/Database.java
@@ -1580,4 +1580,15 @@ public interface Database {
    * </p>
    */
   <T> Set<String> validateQuery(Query<T> query);
+
+  /**
+   * Truncate all the given tables.
+   */
+  void truncate(String... tables);
+
+  /**
+   * Truncate the base tables for the given bean types.
+   */
+  void truncate(Class<?>... tables);
+
 }
diff --git a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
index f5f865dfc..8f5e4b41c 100644
--- a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
@@ -139,6 +139,10 @@ public class DatabasePlatform {
    */
   protected Platform platform = Platform.GENERIC;
 
+  protected String truncateTable = "truncate table %s";
+  protected String truncateTableBefore;
+  protected String truncateTableAfter;
+
   protected String columnAliasPrefix = "c";
 
   protected String tableAliasPlaceHolder = "${ta}";
@@ -708,6 +712,27 @@ public class DatabasePlatform {
     return persistBatchOnCascade;
   }
 
+  /**
+   * Return a statement to truncate a table.
+   */
+  public String truncateStatement(String table) {
+    return String.format(truncateTable, table);
+  }
+
+  /**
+   * Return a statement to execute prior to truncate (like disable foreign keys for mysql).
+   */
+  public String truncateStatementBefore() {
+    return truncateTableBefore;
+  }
+
+  /**
+   * Return a statement to execute after truncate (like enable foreign keys for mysql).
+   */
+  public String truncateStatementAfter() {
+    return truncateTableAfter;
+  }
+
   /**
    * Create the DB schema if it does not exist.
    */
diff --git a/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java b/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java
index b8ba7d227..df76c6064 100644
--- a/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java
+++ b/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java
@@ -22,6 +22,7 @@ public class DB2Platform extends DatabasePlatform {
     this.platform = Platform.DB2;
     this.maxTableNameLength = 18;
     this.maxConstraintNameLength = 18;
+    this.truncateTable = "truncate table %s reuse storage ignore delete triggers immediate";
     this.sqlLimiter = new Db2SqlLimiter();
 
     this.dbIdentity.setSupportsGetGeneratedKeys(true);
diff --git a/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java b/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java
index d3418904d..c914559eb 100644
--- a/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java
+++ b/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java
@@ -26,7 +26,8 @@ public class H2Platform extends DatabasePlatform {
     this.supportsDeleteTableAlias = true;
     this.dbDefaultValue.setNow("now()");
     this.columnAliasPrefix = null;
-
+    //this.truncateTableBefore = "set referential_integrity false";
+    //this.truncateTableAfter = "set referential_integrity true";
     this.exceptionTranslator =
       new SqlErrorCodes()
         .addAcquireLock("50200","HYT00")
diff --git a/src/main/java/io/ebean/config/dbplatform/hana/HanaPlatform.java b/src/main/java/io/ebean/config/dbplatform/hana/HanaPlatform.java
index 3e06d0094..6422f7c81 100644
--- a/src/main/java/io/ebean/config/dbplatform/hana/HanaPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/hana/HanaPlatform.java
@@ -18,7 +18,6 @@ public class HanaPlatform extends DatabasePlatform {
     this.persistBatchOnCascade = PersistBatch.NONE;
     this.supportsResultSetConcurrencyModeUpdatable = false;
     this.columnAliasPrefix = null;
-
     this.historySupport = new HanaHistorySupport();
     this.basicSqlLimiter = new HanaBasicSqlLimiter();
 
diff --git a/src/main/java/io/ebean/config/dbplatform/hsqldb/HsqldbPlatform.java b/src/main/java/io/ebean/config/dbplatform/hsqldb/HsqldbPlatform.java
index 1450b01f7..b8cb1e0dd 100644
--- a/src/main/java/io/ebean/config/dbplatform/hsqldb/HsqldbPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/hsqldb/HsqldbPlatform.java
@@ -21,7 +21,7 @@ public class HsqldbPlatform extends DatabasePlatform {
     super();
     this.platform = Platform.HSQLDB;
     this.dbEncrypt = new H2DbEncrypt();
-
+    this.truncateTable = "delete from %s";
     this.dbIdentity.setIdType(IdType.IDENTITY);
     this.dbIdentity.setSupportsGetGeneratedKeys(true);
     this.dbIdentity.setSupportsSequence(true);
diff --git a/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java
index e744ecbad..977ea97f0 100644
--- a/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java
@@ -31,7 +31,8 @@ public class MySqlPlatform extends DatabasePlatform {
     this.dbEncrypt = new MySqlDbEncrypt();
     this.historySupport = new MySqlHistorySupport();
     this.columnAliasPrefix = null;
-
+    //this.truncateTableBefore = "set foreign_key_checks = 0";
+    //this.truncateTableAfter = "set foreign_key_checks = 1";
     this.dbIdentity.setIdType(IdType.IDENTITY);
     this.dbIdentity.setSupportsGetGeneratedKeys(true);
     this.dbIdentity.setSupportsIdentity(true);
diff --git a/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java b/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java
index cedd2a481..5ba237428 100644
--- a/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java
@@ -30,7 +30,7 @@ public class OraclePlatform extends DatabasePlatform {
     this.sqlLimiter = new RownumSqlLimiter();
     this.basicSqlLimiter = new BasicSqlAnsiLimiter();
     this.historySupport = new OracleDbHistorySupport();
-
+    this.truncateTable = "truncate table %s cascade";
     dbIdentity.setIdType(IdType.SEQUENCE);
     dbIdentity.setSupportsSequence(true);
     dbIdentity.setSupportsIdentity(true);
diff --git a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
index 938f5b3b3..f7a4f63d9 100644
--- a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
@@ -36,7 +36,7 @@ public class PostgresPlatform extends DatabasePlatform {
     this.clobDbType = Types.VARCHAR;
     this.nativeUuidType = true;
     this.columnAliasPrefix = null;
-
+    this.truncateTable = "truncate table %s cascade";
     this.dbEncrypt = new PostgresDbEncrypt();
     this.historySupport = new PostgresHistorySupport();
 
diff --git a/src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java b/src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java
index 2e15fd007..09db19312 100644
--- a/src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java
@@ -17,7 +17,7 @@ public class SQLitePlatform extends DatabasePlatform {
     this.dbIdentity.setSupportsGetGeneratedKeys(false);
     this.dbIdentity.setSupportsSequence(false);
     this.dbIdentity.setSelectLastInsertedIdTemplate("select last_insert_rowid()");
-
+    this.truncateTable = "delete from %s";
     this.booleanDbType = Types.INTEGER;
     this.likeClauseRaw = "like ?";
     this.likeClauseEscaped = "like ?";
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 85c4391db..9818052c3 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -124,8 +124,10 @@ import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.sql.Connection;
+import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.time.Clock;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -639,6 +641,38 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     externalModification(evt);
   }
 
+  @Override
+  public void truncate(Class<?>... types) {
+    List<String> tableNames = new ArrayList<>();
+    for (Class<?> type : types) {
+      tableNames.add(getBeanDescriptor(type).getBaseTable());
+    }
+    truncate(tableNames.toArray(new String[0]));
+  }
+
+  @Override
+  public void truncate(String... tables) {
+    try (Connection connection = getDataSource().getConnection()) {
+      executeSql(connection, databasePlatform.truncateStatementBefore());
+      for (String table : tables) {
+        executeSql(connection, databasePlatform.truncateStatement(table));
+      }
+      executeSql(connection, databasePlatform.truncateStatementAfter());
+      connection.commit();
+    } catch(SQLException e) {
+      throw new PersistenceException("Error executing truncate", e);
+    }
+  }
+
+  private void executeSql(Connection connection, String sql) throws SQLException {
+    if (sql != null) {
+      try (PreparedStatement stmt = connection.prepareStatement(sql)) {
+        transactionManager.log().sql().debug(sql);
+        stmt.execute();
+      }
+    }
+  }
+
   /**
    * Clear the query execution statistics.
    */
diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index bde5e8b34..e52dda337 100644
--- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -94,7 +94,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
 
   @Override
   public void setClock(Clock clock) {
-
   }
 
   @Override
@@ -104,7 +103,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
 
   @Override
   public void shutdownManaged() {
-
   }
 
   @Override
@@ -113,8 +111,15 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
   }
 
   @Override
-  public void scopedTransactionEnter(TxScope txScope) {
+  public void truncate(String... tables) {
+  }
 
+  @Override
+  public void truncate(Class<?>... tables) {
+  }
+
+  @Override
+  public void scopedTransactionEnter(TxScope txScope) {
   }
 
   @Override
@@ -229,7 +234,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
 
   @Override
   public void clearServerTransaction() {
-    
   }
 
   @Override
@@ -249,7 +253,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
 
   @Override
   public void remoteTransactionEvent(RemoteTransactionEvent event) {
-
   }
 
   @Override
@@ -274,17 +277,14 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
 
   @Override
   public void merge(Object bean) {
-
   }
 
   @Override
   public void merge(Object bean, MergeOptions options) {
-
   }
 
   @Override
   public void merge(Object bean, MergeOptions options, Transaction transaction) {
-
   }
 
   @Override
@@ -304,12 +304,10 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
 
   @Override
   public void loadBean(LoadBeanRequest loadRequest) {
-
   }
 
   @Override
   public void loadMany(LoadManyRequest loadRequest) {
-
   }
 
   @Override
@@ -324,27 +322,22 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
 
   @Override
   public void collectQueryStats(ObjectGraphNode objectGraphNode, long loadedBeanCount, long timeMicros) {
-
   }
 
   @Override
   public void visitMetrics(MetricVisitor visitor) {
-
   }
 
   @Override
   public void loadMany(BeanCollection<?> collection, boolean onlyIds) {
-
   }
 
   @Override
   public void loadBean(EntityBeanIntercept ebi) {
-
   }
 
   @Override
   public void shutdown(boolean shutdownDataSource, boolean deregisterDriver) {
-
   }
 
   @Override
@@ -439,7 +432,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
 
   @Override
   public <T> void sort(List<T> list, String sortByClause) {
-
   }
 
   @Override
@@ -449,12 +441,10 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
 
   @Override
   public <T> void findDtoEach(SpiDtoQuery<T> query, Consumer<T> consumer) {
-
   }
 
   @Override
   public <T> void findDtoEachWhile(SpiDtoQuery<T> query, Predicate<T> consumer) {
-
   }
 
   @Override
@@ -509,7 +499,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
 
   @Override
   public void findEachRow(SpiSqlQuery query, RowConsumer consumer) {
-
   }
 
   @Override
@@ -539,7 +528,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
 
   @Override
   public void register(TransactionCallback transactionCallback) throws PersistenceException {
-
   }
 
   @Override
@@ -614,32 +602,26 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
 
   @Override
   public void flush() {
-
   }
 
   @Override
   public void commitTransaction() {
-
   }
 
   @Override
   public void rollbackTransaction() {
-
   }
 
   @Override
   public void endTransaction() {
-
   }
 
   @Override
   public void refresh(Object bean) {
-
   }
 
   @Override
   public void refreshMany(Object bean, String propertyName) {
-
   }
 
   @Override
@@ -679,12 +661,10 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
 
   @Override
   public <T> void findEach(Query<T> query, Consumer<T> consumer, Transaction transaction) {
-
   }
 
   @Override
   public <T> void findEachWhile(Query<T> query, Predicate<T> consumer, Transaction transaction) {
-
   }
 
   @Override
@@ -757,7 +737,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
 
   @Override
   public void save(Object bean) throws OptimisticLockException {
-
   }
 
   @Override
@@ -807,7 +786,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
 
   @Override
   public void externalModification(String tableName, boolean inserted, boolean updated, boolean deleted) {
-
   }
 
   @Override
@@ -817,37 +795,30 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
 
   @Override
   public void save(Object bean, Transaction transaction) throws OptimisticLockException {
-
   }
 
   @Override
   public void markAsDirty(Object bean) {
-
   }
 
   @Override
   public void update(Object bean) throws OptimisticLockException {
-
   }
 
   @Override
   public void update(Object bean, Transaction t) throws OptimisticLockException {
-
   }
 
   @Override
   public void update(Object bean, Transaction transaction, boolean deleteMissingChildren) throws OptimisticLockException {
-
   }
 
   @Override
   public void insert(Object bean) {
-
   }
 
   @Override
   public void insert(Object bean, Transaction t) {
-
   }
 
   @Override
@@ -887,7 +858,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
 
   @Override
   public void addBatch(SpiSqlUpdate sqlUpdate, SpiTransaction transaction) {
-
   }
 
   @Override
@@ -902,12 +872,10 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
 
   @Override
   public void execute(TxScope scope, Runnable r) {
-
   }
 
   @Override
   public void execute(Runnable r) {
-
   }
 
   @Override
@@ -982,27 +950,22 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
 
   @Override
   public void updateAll(Collection<?> beans) throws OptimisticLockException {
-
   }
 
   @Override
   public void updateAll(Collection<?> beans, Transaction transaction) throws OptimisticLockException {
-
   }
 
   @Override
   public void insertAll(Collection<?> beans) {
-
   }
 
   @Override
   public void insertAll(Collection<?> beans, Transaction transaction) {
-
   }
 
   @Override
   public void slowQueryCheck(long executionTimeMicros, int rowCount, SpiQuery<?> query) {
-
   }
 
   @Override
diff --git a/src/test/java/main/StartCockroach.java b/src/test/java/main/StartCockroach.java
new file mode 100644
index 000000000..5aa4a87a5
--- /dev/null
+++ b/src/test/java/main/StartCockroach.java
@@ -0,0 +1,16 @@
+package main;
+
+import io.ebean.docker.commands.CockroachConfig;
+import io.ebean.docker.commands.CockroachContainer;
+
+public class StartCockroach {
+
+  public static void main(String[] args) {
+
+    CockroachConfig config = new CockroachConfig();
+    config.setDbName("unit");
+
+    CockroachContainer container = new CockroachContainer(config);
+    container.startWithDropCreate();
+  }
+}
diff --git a/src/test/java/org/tests/model/nofk/Test2NoFk.java b/src/test/java/org/tests/model/nofk/Test2NoFk.java
index a6851bf9b..bf00656a8 100644
--- a/src/test/java/org/tests/model/nofk/Test2NoFk.java
+++ b/src/test/java/org/tests/model/nofk/Test2NoFk.java
@@ -1,6 +1,7 @@
 package org.tests.model.nofk;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
@@ -21,9 +22,8 @@ public class Test2NoFk extends BaseTestCase {
   @Before
   public void setup() {
     // Reset t
-    Ebean.find(EFile2NoFk.class).delete();
-    Ebean.find(EUserNoFk.class).delete();
-    Ebean.find(EUserNoFkSoftDel.class).delete();
+    DB.truncate(EFile2NoFk.class, EUserNoFk.class, EUserNoFkSoftDel.class);
+    assertThat(DB.find(EFile2NoFk.class).findCount()).isEqualTo(0);
 
     // There are two user accounts persisted in our database
     EUserNoFk root = new EUserNoFk();
diff --git a/src/test/java/org/tests/model/nofk/TestTruncate.java b/src/test/java/org/tests/model/nofk/TestTruncate.java
new file mode 100644
index 000000000..bf22cb284
--- /dev/null
+++ b/src/test/java/org/tests/model/nofk/TestTruncate.java
@@ -0,0 +1,46 @@
+package org.tests.model.nofk;
+
+import io.ebean.DB;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestTruncate {
+
+  @Test
+  public void test_truncateByClass() {
+    DB.truncate(EUserNoFkSoftDel.class, EUserNoFk.class);
+
+    insertRows();
+    assertRowCounts(1);
+
+    DB.truncate(EUserNoFkSoftDel.class, EUserNoFk.class);
+    assertRowCounts(0);
+  }
+
+  @Test
+  public void test_truncateByTable() {
+    DB.truncate(EUserNoFkSoftDel.class, EUserNoFk.class);
+
+    insertRows();
+    assertRowCounts(1);
+
+    DB.truncate("euser_no_fk_soft_del", "euser_no_fk");
+    assertRowCounts(0);
+  }
+
+  private void insertRows() {
+    EUserNoFk root = new EUserNoFk();
+    root.setUserName("root");
+    DB.save(root);
+
+    EUserNoFkSoftDel rootSoftDel = new EUserNoFkSoftDel();
+    rootSoftDel.setUserName("root");
+    DB.save(rootSoftDel);
+  }
+
+  private void assertRowCounts(int expected) {
+    assertThat(DB.find(EUserNoFk.class).findCount()).isEqualTo(expected);
+    assertThat(DB.find(EUserNoFkSoftDel.class).findCount()).isEqualTo(expected);
+  }
+}
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
index 8d4ee5d7c..50294ed9b 100644
--- a/src/test/resources/logback-test.xml
+++ b/src/test/resources/logback-test.xml
@@ -79,7 +79,7 @@
   <logger name="io.ebean.docker" level="TRACE"/>
   <!--<logger name="io.ebean.DDL" level="DEBUG"/>-->
 
-<!--  <logger name="io.ebean.SQL" level="TRACE"/>-->
+  <logger name="io.ebean.SQL" level="TRACE"/>
 <!--  <logger name="io.ebean.TXN" level="TRACE"/>-->
 <!--  <logger name="io.ebean.SUM" level="TRACE"/>-->
 

From fea840c859bd385c11aaf7dc268d6cd90be46a07 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 10 Aug 2019 21:44:48 +1200
Subject: [PATCH 0998/1036] #1782 - ENH: Add truncate(Class<?>... types) and
 truncate(String... tables)

Remove truncateTableBefore and truncateTableAfter for now
---
 .../config/dbplatform/DatabasePlatform.java      | 16 ----------------
 .../ebean/config/dbplatform/h2/H2Platform.java   |  2 --
 .../config/dbplatform/mysql/MySqlPlatform.java   |  2 --
 .../ebeaninternal/server/core/DefaultServer.java |  2 --
 src/test/java/main/StartCockroach.java           | 14 +++++++-------
 5 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
index 8f5e4b41c..43396fab9 100644
--- a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
@@ -140,8 +140,6 @@ public class DatabasePlatform {
   protected Platform platform = Platform.GENERIC;
 
   protected String truncateTable = "truncate table %s";
-  protected String truncateTableBefore;
-  protected String truncateTableAfter;
 
   protected String columnAliasPrefix = "c";
 
@@ -719,20 +717,6 @@ public class DatabasePlatform {
     return String.format(truncateTable, table);
   }
 
-  /**
-   * Return a statement to execute prior to truncate (like disable foreign keys for mysql).
-   */
-  public String truncateStatementBefore() {
-    return truncateTableBefore;
-  }
-
-  /**
-   * Return a statement to execute after truncate (like enable foreign keys for mysql).
-   */
-  public String truncateStatementAfter() {
-    return truncateTableAfter;
-  }
-
   /**
    * Create the DB schema if it does not exist.
    */
diff --git a/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java b/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java
index c914559eb..b7a3b1660 100644
--- a/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java
+++ b/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java
@@ -26,8 +26,6 @@ public class H2Platform extends DatabasePlatform {
     this.supportsDeleteTableAlias = true;
     this.dbDefaultValue.setNow("now()");
     this.columnAliasPrefix = null;
-    //this.truncateTableBefore = "set referential_integrity false";
-    //this.truncateTableAfter = "set referential_integrity true";
     this.exceptionTranslator =
       new SqlErrorCodes()
         .addAcquireLock("50200","HYT00")
diff --git a/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java
index 977ea97f0..83d509da4 100644
--- a/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java
@@ -31,8 +31,6 @@ public class MySqlPlatform extends DatabasePlatform {
     this.dbEncrypt = new MySqlDbEncrypt();
     this.historySupport = new MySqlHistorySupport();
     this.columnAliasPrefix = null;
-    //this.truncateTableBefore = "set foreign_key_checks = 0";
-    //this.truncateTableAfter = "set foreign_key_checks = 1";
     this.dbIdentity.setIdType(IdType.IDENTITY);
     this.dbIdentity.setSupportsGetGeneratedKeys(true);
     this.dbIdentity.setSupportsIdentity(true);
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 9818052c3..708a379d7 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -653,11 +653,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   @Override
   public void truncate(String... tables) {
     try (Connection connection = getDataSource().getConnection()) {
-      executeSql(connection, databasePlatform.truncateStatementBefore());
       for (String table : tables) {
         executeSql(connection, databasePlatform.truncateStatement(table));
       }
-      executeSql(connection, databasePlatform.truncateStatementAfter());
       connection.commit();
     } catch(SQLException e) {
       throw new PersistenceException("Error executing truncate", e);
diff --git a/src/test/java/main/StartCockroach.java b/src/test/java/main/StartCockroach.java
index 5aa4a87a5..dfdd96a40 100644
--- a/src/test/java/main/StartCockroach.java
+++ b/src/test/java/main/StartCockroach.java
@@ -1,16 +1,16 @@
 package main;
 
-import io.ebean.docker.commands.CockroachConfig;
-import io.ebean.docker.commands.CockroachContainer;
+//import io.ebean.docker.commands.CockroachConfig;
+//import io.ebean.docker.commands.CockroachContainer;
 
 public class StartCockroach {
 
   public static void main(String[] args) {
 
-    CockroachConfig config = new CockroachConfig();
-    config.setDbName("unit");
-
-    CockroachContainer container = new CockroachContainer(config);
-    container.startWithDropCreate();
+//    CockroachConfig config = new CockroachConfig();
+//    config.setDbName("unit");
+//
+//    CockroachContainer container = new CockroachContainer(config);
+//    container.startWithDropCreate();
   }
 }

From c640524bfc4f0dd5fd1c01f65b476775064fd248 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 11 Aug 2019 16:24:37 +1200
Subject: [PATCH 0999/1036] #1788 - ENH: Add support for NuoDB database
 platform

---
 pom.xml                                       | 20 ++++-
 .../dbplatform/nuodb/NuoDbHistorySupport.java | 10 +++
 .../dbplatform/nuodb/NuoDbPlatform.java       | 61 ++++++++++++++
 .../dbplatform/nuodb/NuoDbSequence.java       | 24 ++++++
 .../dbmigration/DefaultDbMigration.java       |  3 +
 .../platform/DbTriggerBasedHistoryDdl.java    | 14 ++--
 .../ddlgeneration/platform/H2HistoryDdl.java  |  5 +-
 .../platform/MySqlHistoryDdl.java             |  4 +-
 .../ddlgeneration/platform/NuoDbDdl.java      | 41 ++++++++++
 .../platform/NuoDbHistoryDdl.java             | 79 +++++++++++++++++++
 .../platform/PostgresHistoryDdl.java          |  8 +-
 .../server/core/DatabasePlatformFactory.java  |  8 +-
 .../server/core/PlatformDdlBuilder.java       |  3 +
 src/test/java/io/ebean/BaseTestCase.java      |  4 +
 src/test/java/io/ebean/SqlRowBooleanTest.java |  2 +-
 .../dbmigration/DbMigrationTest.java          |  2 +-
 .../server/cache/CacheBeanDataTest.java       |  2 +-
 .../cache/CachedBeanDataFromBeanTest.java     |  2 +-
 src/test/java/main/StartNuoDB.java            | 17 ++++
 .../TestAggregateFormula.java                 |  2 +-
 .../tests/basic/TestAssocOneEqExpression.java |  2 +-
 .../TestBatchOnCascadeExceptionHandling.java  |  5 +-
 .../java/org/tests/cache/TestQueryCache.java  |  4 +-
 .../TestPrivateOwnedNoCascadeRemove.java      |  3 +
 .../tests/compositekeys/TestCKeyDelete.java   | 19 ++---
 .../org/tests/ddl/TestForeignKeyModes.java    |  4 +
 .../java/org/tests/el/TestPathExpression.java |  6 +-
 .../TestInsertDataIntegrityException.java     |  6 +-
 .../m2m/TestM2MDeleteCascadeFromParent.java   |  3 +
 .../org/tests/m2m/TestM2MDeleteNoCascade.java |  3 +
 .../java/org/tests/model/basic/Address.java   |  6 +-
 .../TestElementCollectionBasic.java           |  2 +
 .../TestElementCollectionBasicCache.java      |  2 +
 .../TestElementCollectionBasicMap.java        |  2 +
 .../TestElementCollectionBasicMapAsLob.java   |  2 +
 .../TestElementCollectionBasicMapCache.java   |  2 +
 .../TestElementCollectionBasicSet.java        |  2 +
 .../TestElementCollectionEmbeddedList.java    |  2 +
 ...estElementCollectionEmbeddedListCache.java |  2 +
 .../TestElementCollectionEmbeddedMap.java     |  2 +
 ...TestElementCollectionEmbeddedMapCache.java |  2 +
 .../TestElementCollectionEnumSet.java         |  2 +
 .../model/lazywithid/TestColumnIdName.java    | 11 +--
 .../orderby/TestOrderByWithDistinct.java      |  2 +-
 .../query/other/TestWhereLikeWithSlash.java   |  2 +-
 .../tests/repository/TestBeanRepository.java  |  2 +
 .../tests/softdelete/TestSoftDeleteBasic.java |  2 +
 src/test/resources/ebean.properties           |  8 +-
 src/test/resources/extra-ddl.xml              |  2 +-
 src/test/resources/logback-test.xml           |  2 +-
 50 files changed, 371 insertions(+), 54 deletions(-)
 create mode 100644 src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbHistorySupport.java
 create mode 100644 src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbPlatform.java
 create mode 100644 src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbSequence.java
 create mode 100644 src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NuoDbDdl.java
 create mode 100644 src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NuoDbHistoryDdl.java
 create mode 100644 src/test/java/main/StartNuoDB.java

diff --git a/pom.xml b/pom.xml
index 1d07f2859..a51556f80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>4.11</version>
+      <version>4.12</version>
     </dependency>
 
     <dependency>
@@ -130,7 +130,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-datasource</artifactId>
-      <version>4.5.2</version>
+      <version>4.6.1</version>
     </dependency>
 
     <dependency>
@@ -220,6 +220,13 @@
 
     <!-- Test scope -->
 
+    <dependency>
+      <groupId>com.nuodb.jdbc</groupId>
+      <artifactId>nuodb-jdbc</artifactId>
+      <version>20.2.0</version>
+      <scope>test</scope>
+    </dependency>
+
     <!--<dependency>-->
     <!--<groupId>oracle</groupId>-->
     <!--<artifactId>oracle-jdbc</artifactId>-->
@@ -230,7 +237,7 @@
     <dependency>
       <groupId>io.ebean.test</groupId>
       <artifactId>ebean-test-docker</artifactId>
-      <version>2.8.1</version>
+      <version>2.10.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -285,6 +292,13 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>3.0.0</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.avaje.composite</groupId>
       <artifactId>avaje-composite-testing</artifactId>
diff --git a/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbHistorySupport.java b/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbHistorySupport.java
new file mode 100644
index 000000000..2bb0918fc
--- /dev/null
+++ b/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbHistorySupport.java
@@ -0,0 +1,10 @@
+package io.ebean.config.dbplatform.nuodb;
+
+import io.ebean.config.dbplatform.DbViewHistorySupport;
+
+/**
+ * Runtime support for @History with NuoDB.
+ */
+public class NuoDbHistorySupport extends DbViewHistorySupport {
+
+}
diff --git a/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbPlatform.java b/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbPlatform.java
new file mode 100644
index 000000000..f58cedb54
--- /dev/null
+++ b/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbPlatform.java
@@ -0,0 +1,61 @@
+package io.ebean.config.dbplatform.nuodb;
+
+import io.ebean.BackgroundExecutor;
+import io.ebean.Query;
+import io.ebean.annotation.Platform;
+import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebean.config.dbplatform.DbPlatformType;
+import io.ebean.config.dbplatform.DbType;
+import io.ebean.config.dbplatform.IdType;
+import io.ebean.config.dbplatform.PlatformIdGenerator;
+import io.ebean.config.dbplatform.SqlErrorCodes;
+
+import javax.sql.DataSource;
+
+/**
+ * NuoDb specific platform.
+ */
+public class NuoDbPlatform extends DatabasePlatform {
+
+  public NuoDbPlatform() {
+    super();
+    this.platform = Platform.NUODB;
+    this.idInExpandedForm = true;
+    this.supportsResultSetConcurrencyModeUpdatable = false;
+    this.supportsDeleteTableAlias = true;
+    this.columnAliasPrefix = null;
+    this.likeClauseRaw = "like ?";
+    this.historySupport = new NuoDbHistorySupport();
+    //this.dbEncrypt = ...
+    dbIdentity.setIdType(IdType.IDENTITY);
+    dbIdentity.setSupportsIdentity(true);
+    dbIdentity.setSupportsSequence(true);
+    dbIdentity.setSupportsGetGeneratedKeys(true);
+
+    // No referential integrity exception to map
+    this.exceptionTranslator =
+      new SqlErrorCodes()
+        //.addAcquireLock("")
+        .addDuplicateKey("23000")
+        .build();
+
+    dbTypeMap.put(DbType.INTEGER, new DbPlatformType("integer", false));
+  }
+
+  @Override
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
+    return new NuoDbSequence(be, ds, seqName, stepSize);
+  }
+
+  @Override
+  protected String withForUpdate(String sql, Query.ForUpdate forUpdateMode) {
+    switch (forUpdateMode) {
+      case NOWAIT:
+        return sql + " for update nowait";
+      case SKIPLOCKED:
+      default:
+        return sql + " for update";
+    }
+  }
+
+}
diff --git a/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbSequence.java b/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbSequence.java
new file mode 100644
index 000000000..6767231c4
--- /dev/null
+++ b/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbSequence.java
@@ -0,0 +1,24 @@
+package io.ebean.config.dbplatform.nuodb;
+
+import io.ebean.BackgroundExecutor;
+import io.ebean.config.dbplatform.SequenceStepIdGenerator;
+
+import javax.sql.DataSource;
+
+public class NuoDbSequence extends SequenceStepIdGenerator {
+
+  private final String nextSql;
+
+  /**
+   * Construct where batchSize is the sequence step size.
+   */
+  public NuoDbSequence(BackgroundExecutor be, DataSource ds, String seqName, int stepSize) {
+    super(be, ds, seqName, stepSize);
+    this.nextSql = "select next value for " + seqName + " from dual";
+  }
+
+  @Override
+  public String getSql(int batchSize) {
+    return nextSql;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index 0ce03379c..d886c7433 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -15,6 +15,7 @@ import io.ebean.config.dbplatform.h2.H2Platform;
 import io.ebean.config.dbplatform.hana.HanaPlatform;
 import io.ebean.config.dbplatform.hsqldb.HsqldbPlatform;
 import io.ebean.config.dbplatform.mysql.MySqlPlatform;
+import io.ebean.config.dbplatform.nuodb.NuoDbPlatform;
 import io.ebean.config.dbplatform.oracle.OraclePlatform;
 import io.ebean.config.dbplatform.postgres.PostgresPlatform;
 import io.ebean.config.dbplatform.sqlanywhere.SqlAnywherePlatform;
@@ -804,6 +805,8 @@ public class DefaultDbMigration implements DbMigration {
         return new SQLitePlatform();
       case HANA:
         return new HanaPlatform();
+      case NUODB:
+        return new NuoDbPlatform();
       case COCKROACH:
         return new CockroachPlatform();
       case CLICKHOUSE:
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
index 5a5583139..78d3839ca 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
@@ -29,9 +29,9 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl {
   protected String viewSuffix;
   protected String historySuffix;
 
-
-  protected String currentTimestamp = "now(6)";
   protected String sysPeriodType = "datetime(6)";
+  protected String now = "now(6)";
+  protected String sysPeriodEndValue = "now(6)";
 
   DbTriggerBasedHistoryDdl() {
   }
@@ -164,7 +164,7 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl {
   protected void addSysPeriodColumns(DdlBuffer apply, String baseTableName, String whenCreatedColumn) throws IOException {
 
     apply.append("alter table ").append(baseTableName).append(" add column ")
-      .append(sysPeriodStart).append(" ").append(sysPeriodType).append(" default ").append(currentTimestamp).endOfStatement();
+      .append(sysPeriodStart).append(" ").append(sysPeriodType).append(" default ").append(now).endOfStatement();
     apply.append("alter table ").append(baseTableName).append(" add column ")
       .append(sysPeriodEnd).append(" ").append(sysPeriodType).endOfStatement();
 
@@ -246,12 +246,12 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl {
 
     buffer.append("    insert into ").append(historyTable).append(" (").append(sysPeriodStart).append(",").append(sysPeriodEnd).append(",");
     appendColumnNames(buffer, columns, "");
-    buffer.append(") values (OLD.").append(sysPeriodStart).append(", ").append(currentTimestamp).append(",");
+    buffer.append(") values (OLD.").append(sysPeriodStart).append(", ").append(sysPeriodEndValue).append(",");
     appendColumnNames(buffer, columns, "OLD.");
     buffer.append(");").newLine();
   }
 
-  protected void appendColumnNames(DdlBuffer buffer, List<String> columns, String columnPrefix) throws IOException {
+  void appendColumnNames(DdlBuffer buffer, List<String> columns, String columnPrefix) throws IOException {
     for (int i = 0; i < columns.size(); i++) {
       if (i > 0) {
         buffer.append(", ");
@@ -264,7 +264,7 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl {
   /**
    * Append a single column to the buffer if it is not null.
    */
-  protected void appendColumnName(DdlBuffer buffer, String prefix, String columnName) throws IOException {
+  void appendColumnName(DdlBuffer buffer, String prefix, String columnName) throws IOException {
     if (columnName != null) {
       buffer.append(prefix).append(columnName);
     }
@@ -278,7 +278,7 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl {
    * the column.
    * </p>
    */
-  protected List<String> columnNamesForApply(MTable table) {
+  List<String> columnNamesForApply(MTable table) {
     return table.allHistoryColumns(true);
   }
 
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
index a1f8f1806..bb474c1e4 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
@@ -14,9 +14,10 @@ public class H2HistoryDdl extends DbTriggerBasedHistoryDdl {
 
   private static final String TRIGGER_CLASS = H2HistoryTrigger.class.getName();
 
-  public H2HistoryDdl() {
+  H2HistoryDdl() {
     this.sysPeriodType = "timestamp";
-    this.currentTimestamp = "now()";
+    this.now = "now()";
+    this.sysPeriodEndValue = "now()";
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java
index d67e1c08a..16d07136e 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java
@@ -11,13 +11,11 @@ import java.io.IOException;
  */
 public class MySqlHistoryDdl extends DbTriggerBasedHistoryDdl {
 
-
-  public MySqlHistoryDdl() {
+  MySqlHistoryDdl() {
   }
 
   @Override
   protected void dropTriggers(DdlBuffer buffer, String baseTable) throws IOException {
-
     buffer.append("drop trigger ").append(updateTriggerName(baseTable)).endOfStatement();
     buffer.append("drop trigger ").append(deleteTriggerName(baseTable)).endOfStatement();
   }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NuoDbDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NuoDbDdl.java
new file mode 100644
index 000000000..0f0c15871
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NuoDbDdl.java
@@ -0,0 +1,41 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+import io.ebean.annotation.ConstraintMode;
+import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+
+public class NuoDbDdl extends PlatformDdl {
+
+  public NuoDbDdl(DatabasePlatform platform) {
+    super(platform);
+    this.historyDdl = new NuoDbHistoryDdl();
+    this.identitySuffix = " generated by default as identity";
+    this.dropConstraintIfExists = "drop constraint";
+  }
+
+  @Override
+  public void addTableComment(DdlBuffer apply, String tableName, String tableComment) {
+    // do nothing
+  }
+
+  @Override
+  public void addColumnComment(DdlBuffer apply, String table, String column, String comment) {
+    // do nothing
+  }
+
+  @Override
+  protected void appendForeignKeyOnUpdate(StringBuilder buffer, ConstraintMode mode) {
+    // do nothing
+  }
+
+  @Override
+  protected void appendForeignKeyOnDelete(StringBuilder buffer, ConstraintMode mode) {
+    if (mode == ConstraintMode.RESTRICT) {
+      // do nothing
+    } else if (mode == ConstraintMode.SET_NULL) {
+      // do nothing
+    } else {
+      super.appendForeignKeyOnDelete(buffer, mode);
+    }
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NuoDbHistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NuoDbHistoryDdl.java
new file mode 100644
index 000000000..89d81eb9b
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NuoDbHistoryDdl.java
@@ -0,0 +1,79 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.model.MTable;
+
+import java.io.IOException;
+
+/**
+ * NuoDB history support using DB triggers to maintain a history table.
+ */
+public class NuoDbHistoryDdl extends DbTriggerBasedHistoryDdl {
+
+  NuoDbHistoryDdl() {
+    this.now = "now()";
+    this.sysPeriodEndValue = "NEW.sys_period_start";
+  }
+
+  @Override
+  protected void dropTriggers(DdlBuffer buffer, String baseTable) throws IOException {
+
+    buffer.append("drop trigger ").append(updateTriggerName(baseTable)).endOfStatement();
+    buffer.append("drop trigger ").append(deleteTriggerName(baseTable)).endOfStatement();
+  }
+
+  @Override
+  protected void createTriggers(DdlWrite writer, MTable table) throws IOException {
+
+    DbTriggerUpdate update = createDbTriggerUpdate(writer, table);
+
+    addBeforeUpdate(updateTriggerName(update.getBaseTable()), update);
+    addBeforeDelete(deleteTriggerName(update.getBaseTable()), update);
+  }
+
+  @Override
+  protected void updateHistoryTriggers(DbTriggerUpdate update) throws IOException {
+
+    recreateHistoryView(update);
+
+    DdlBuffer buffer = update.historyTriggerBuffer();
+    String baseTable = update.getBaseTable();
+
+    dropTriggers(buffer, baseTable);
+    addBeforeUpdate(updateTriggerName(baseTable), update);
+    addBeforeDelete(deleteTriggerName(baseTable), update);
+  }
+
+  private void addBeforeUpdate(String triggerName, DbTriggerUpdate update) throws IOException {
+
+    DdlBuffer apply = update.historyTriggerBuffer();
+    addTriggerStart(triggerName, update, apply, " before update for each row as ");
+    apply.append("    NEW.sys_period_start = greatest(current_timestamp, date_add(OLD.sys_period_start, interval 1 microsecond))").endOfStatement();
+    appendInsertIntoHistory(apply, update.getHistoryTable(), update.getColumns());
+    addEndTrigger(apply);
+  }
+
+  private void addBeforeDelete(String triggerName, DbTriggerUpdate update) throws IOException {
+
+    DdlBuffer apply = update.historyTriggerBuffer();
+    addTriggerStart(triggerName, update, apply, " before delete for each row as");
+    appendInsertIntoHistory(apply, update.getHistoryTable(), update.getColumns());
+    addEndTrigger(apply);
+  }
+
+  private void addTriggerStart(String triggerName, DbTriggerUpdate update, DdlBuffer apply, String s) throws IOException {
+    apply
+      .append("delimiter $$").newLine()
+      .append("create or replace trigger ").append(triggerName).append(" for ").append(update.getBaseTable())
+      .append(s).newLine();
+  }
+
+  private void addEndTrigger(DdlBuffer apply) throws IOException {
+    apply.append("end_trigger")
+      .endOfStatement()
+      .append("$$").newLine()
+      .newLine();
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java
index d1b34b976..fe9b17f1b 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java
@@ -12,9 +12,9 @@ import java.util.List;
  */
 public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl {
 
-
-  public PostgresHistoryDdl() {
-    this.currentTimestamp = "current_timestamp";
+  PostgresHistoryDdl() {
+    this.now = "current_timestamp";
+    this.sysPeriodEndValue = "current_timestamp";
   }
 
   /**
@@ -36,7 +36,7 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl {
   protected void addSysPeriodColumns(DdlBuffer apply, String baseTableName, String whenCreatedColumn) throws IOException {
     apply
       .append("alter table ").append(baseTableName)
-      .append(" add column ").append(sysPeriod).append(" tstzrange not null default tstzrange(").append(currentTimestamp).append(", null)")
+      .append(" add column ").append(sysPeriod).append(" tstzrange not null default tstzrange(").append(now).append(", null)")
       .endOfStatement();
 
     if (whenCreatedColumn != null) {
diff --git a/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java b/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
index 9cd221c92..0854ae4f3 100644
--- a/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
+++ b/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
@@ -9,6 +9,7 @@ import io.ebean.config.dbplatform.h2.H2Platform;
 import io.ebean.config.dbplatform.hana.HanaPlatform;
 import io.ebean.config.dbplatform.hsqldb.HsqldbPlatform;
 import io.ebean.config.dbplatform.mysql.MySqlPlatform;
+import io.ebean.config.dbplatform.nuodb.NuoDbPlatform;
 import io.ebean.config.dbplatform.oracle.OraclePlatform;
 import io.ebean.config.dbplatform.postgres.Postgres8Platform;
 import io.ebean.config.dbplatform.postgres.PostgresPlatform;
@@ -108,6 +109,9 @@ public class DatabasePlatformFactory {
     if (dbName.equals("clickhouse")) {
       return new ClickHousePlatform();
     }
+    if (dbName.equals("nuodb")) {
+      return new NuoDbPlatform();
+    }
     if (dbName.equals("sqlite")) {
       return new SQLitePlatform();
     }
@@ -158,6 +162,8 @@ public class DatabasePlatformFactory {
       return new HsqldbPlatform();
     } else if (dbProductName.contains("postgres")) {
       return readPostgres(connection);
+    } else if (dbProductName.contains("nuo")) {
+      return new NuoDbPlatform();
     } else if (dbProductName.contains("sqlite")) {
       return new SQLitePlatform();
     } else if (dbProductName.contains("db2")) {
@@ -177,7 +183,7 @@ public class DatabasePlatformFactory {
   /**
    * Use a select version() query as it could be Postgres or CockroachDB.
    */
-  private static PostgresPlatform readPostgres(Connection connection) {
+  private static DatabasePlatform readPostgres(Connection connection) {
     // Postgres driver uses a hardcoded product name so use version() query
     PreparedStatement statement = null;
     ResultSet resultSet = null;
diff --git a/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java b/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java
index 34e696735..bacee903e 100644
--- a/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java
@@ -8,6 +8,7 @@ import io.ebeaninternal.dbmigration.ddlgeneration.platform.H2Ddl;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.HanaColumnStoreDdl;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.HsqldbDdl;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.MySqlDdl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.NuoDbDdl;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.Oracle10Ddl;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.PostgresDdl;
@@ -33,6 +34,8 @@ public class PlatformDdlBuilder {
         return new MySqlDdl(platform);
       case HSQLDB:
         return new HsqldbDdl(platform);
+      case NUODB:
+        return new NuoDbDdl(platform);
       case ORACLE:
         return new Oracle10Ddl(platform);
       case SQLITE:
diff --git a/src/test/java/io/ebean/BaseTestCase.java b/src/test/java/io/ebean/BaseTestCase.java
index b53b095ec..c9fe57ba1 100644
--- a/src/test/java/io/ebean/BaseTestCase.java
+++ b/src/test/java/io/ebean/BaseTestCase.java
@@ -170,6 +170,10 @@ public abstract class BaseTestCase {
     return Platform.ORACLE == platform();
   }
 
+  public boolean isNuoDb() {
+    return Platform.NUODB == platform();
+  }
+
   public boolean isDb2() {
     return Platform.DB2 == platform();
   }
diff --git a/src/test/java/io/ebean/SqlRowBooleanTest.java b/src/test/java/io/ebean/SqlRowBooleanTest.java
index e5aa7d148..172b24787 100644
--- a/src/test/java/io/ebean/SqlRowBooleanTest.java
+++ b/src/test/java/io/ebean/SqlRowBooleanTest.java
@@ -12,7 +12,7 @@ public class SqlRowBooleanTest extends BaseTestCase {
     SqlQuery sqlQuery;
     if (isSqlServer()) {
       sqlQuery = Ebean.createSqlQuery("SELECT 1 AS ISNT_NULL");
-    } else if (isOracle()) {
+    } else if (isOracle() || isNuoDb()) {
       sqlQuery = Ebean.createSqlQuery("SELECT 1 AS ISNT_NULL from dual");
     } else if (isDb2()) {
       sqlQuery = Ebean.createSqlQuery("SELECT 1 AS ISNT_NULL from SYSIBM.SYSDUMMY1");
diff --git a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
index d8a0caef0..ee53a1ef7 100644
--- a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
+++ b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
@@ -50,7 +50,7 @@ public class DbMigrationTest extends BaseTestCase {
     }
   }
 
-  @IgnorePlatform(Platform.ORACLE)
+  @IgnorePlatform({Platform.ORACLE, Platform.NUODB})
   @Test
   public void testRunMigration() throws IOException {
     // first clean up previously created objects
diff --git a/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java b/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java
index 6ac8e78b7..2ba1b9747 100644
--- a/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java
+++ b/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java
@@ -37,7 +37,7 @@ public class CacheBeanDataTest extends BaseTestCase {
     c.setSmallnote("somenote");
 
     Address billingAddress = new Address();
-    billingAddress.setId((short) 12);
+    billingAddress.setId(12);
     billingAddress.setCity("Auckland");
     billingAddress.setCountry(server.getReference(Country.class, "NZ"));
     billingAddress.setLine1("92 Someplace Else");
diff --git a/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java b/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java
index 3dc2077fb..1490bead6 100644
--- a/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java
+++ b/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java
@@ -31,7 +31,7 @@ public class CachedBeanDataFromBeanTest extends BaseTestCase {
     customer.setAnniversary(largeDate);
 
     Address billingAddress = new Address();
-    billingAddress.setId(Short.valueOf("12"));
+    billingAddress.setId(12);
     billingAddress.setCity("SomePlace");
 
     customer.setBillingAddress(billingAddress);
diff --git a/src/test/java/main/StartNuoDB.java b/src/test/java/main/StartNuoDB.java
new file mode 100644
index 000000000..e80beb78b
--- /dev/null
+++ b/src/test/java/main/StartNuoDB.java
@@ -0,0 +1,17 @@
+package main;
+
+import io.ebean.docker.commands.NuoDBConfig;
+import io.ebean.docker.commands.NuoDBContainer;
+
+public class StartNuoDB {
+
+  public static void main(String[] args) {
+
+    NuoDBConfig config = new NuoDBConfig();
+    config.setDbName("unit");
+
+    NuoDBContainer container = new NuoDBContainer(config);
+    container.stopRemove();
+    container.startWithDropCreate();
+  }
+}
diff --git a/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java b/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java
index 6bf12e1f6..f06cc223b 100644
--- a/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java
+++ b/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java
@@ -19,7 +19,7 @@ import static org.junit.Assert.assertNotNull;
 
 public class TestAggregateFormula extends BaseTestCase {
 
-  @IgnorePlatform({Platform.SQLSERVER, Platform.MYSQL})
+  @IgnorePlatform({Platform.SQLSERVER, Platform.MYSQL, Platform.NUODB})
   @Test
   public void minDistinctOrderByNulls() {
 
diff --git a/src/test/java/org/tests/basic/TestAssocOneEqExpression.java b/src/test/java/org/tests/basic/TestAssocOneEqExpression.java
index 9d4ad50c7..77d987761 100644
--- a/src/test/java/org/tests/basic/TestAssocOneEqExpression.java
+++ b/src/test/java/org/tests/basic/TestAssocOneEqExpression.java
@@ -29,7 +29,7 @@ public class TestAssocOneEqExpression extends BaseTestCase {
     Assert.assertTrue(sql.contains("where t0.kcustomer_id = ?"));
 
     Address b = new Address();
-    b.setId((short) 1);
+    b.setId(1);
 
     Query<Order> q2 = Ebean.find(Order.class)
       .where().eq("customer.billingAddress", b)
diff --git a/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java b/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java
index 757a79881..a1a084dcb 100644
--- a/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java
+++ b/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java
@@ -22,7 +22,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestBatchOnCascadeExceptionHandling extends BaseTestCase {
 
-  @IgnorePlatform(Platform.HANA)
+  @IgnorePlatform({Platform.HANA, Platform.NUODB})
   @Test
   public void testBatchScenarioWithSavepoint() throws SQLException {
     server().save(createEntityWithName("conflict", "before"));
@@ -52,6 +52,7 @@ public class TestBatchOnCascadeExceptionHandling extends BaseTestCase {
     assertThat(winner.getDescription()).isEqualTo("after");
   }
 
+  @IgnorePlatform(Platform.NUODB)
   @Test
   public void testBatchedInsertFailure() {
     server().save(createEntityWithName("foo"));
@@ -60,6 +61,7 @@ public class TestBatchOnCascadeExceptionHandling extends BaseTestCase {
     });
   }
 
+  @IgnorePlatform(Platform.NUODB)
   @Test
   public void testBatchedUpdateFailure() {
     server().save(createEntityWithName("bla"));
@@ -71,6 +73,7 @@ public class TestBatchOnCascadeExceptionHandling extends BaseTestCase {
     });
   }
 
+  @IgnorePlatform(Platform.NUODB)
   @Test
   public void testBatchedDeleteFailure() {
     final EOptOneC c = new EOptOneC();
diff --git a/src/test/java/org/tests/cache/TestQueryCache.java b/src/test/java/org/tests/cache/TestQueryCache.java
index 31b59ff70..f9e732220 100644
--- a/src/test/java/org/tests/cache/TestQueryCache.java
+++ b/src/test/java/org/tests/cache/TestQueryCache.java
@@ -2,6 +2,7 @@ package org.tests.cache;
 
 import io.ebean.BaseTestCase;
 import io.ebean.CacheMode;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.bean.BeanCollection;
 import io.ebean.cache.ServerCache;
@@ -52,6 +53,7 @@ public class TestQueryCache extends BaseTestCase {
   @Test
   public void findSingleAttribute() {
 
+    DB.find(EColAB.class).delete();
     new EColAB("03", "SingleAttribute").save();
     new EColAB("03", "SingleAttribute").save();
 
@@ -260,11 +262,11 @@ public class TestQueryCache extends BaseTestCase {
   @Test
   public void findIds() {
 
+    DB.find(EColAB.class).delete();
     new EColAB("03", "someId").save();
     new EColAB("04", "someId").save();
     new EColAB("05", "someId").save();
 
-
     LoggedSqlCollector.start();
 
     List<Integer> colA_first = Ebean.find(EColAB.class)
diff --git a/src/test/java/org/tests/cascade/TestPrivateOwnedNoCascadeRemove.java b/src/test/java/org/tests/cascade/TestPrivateOwnedNoCascadeRemove.java
index d521f672f..473f96d88 100644
--- a/src/test/java/org/tests/cascade/TestPrivateOwnedNoCascadeRemove.java
+++ b/src/test/java/org/tests/cascade/TestPrivateOwnedNoCascadeRemove.java
@@ -2,6 +2,8 @@ package org.tests.cascade;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.annotation.IgnorePlatform;
+import io.ebean.annotation.Platform;
 import io.ebean.bean.BeanCollection;
 import org.tests.model.basic.TSDetailTwo;
 import org.tests.model.basic.TSMasterTwo;
@@ -13,6 +15,7 @@ import java.util.Set;
 
 public class TestPrivateOwnedNoCascadeRemove extends BaseTestCase {
 
+  @IgnorePlatform(Platform.NUODB)
   @Test
   public void test() {
 
diff --git a/src/test/java/org/tests/compositekeys/TestCKeyDelete.java b/src/test/java/org/tests/compositekeys/TestCKeyDelete.java
index c3697e043..22a032854 100644
--- a/src/test/java/org/tests/compositekeys/TestCKeyDelete.java
+++ b/src/test/java/org/tests/compositekeys/TestCKeyDelete.java
@@ -1,7 +1,7 @@
 package org.tests.compositekeys;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import org.junit.Test;
 import org.tests.model.basic.CKeyParent;
 import org.tests.model.basic.CKeyParentId;
@@ -24,20 +24,21 @@ public class TestCKeyDelete extends BaseTestCase {
     p.setId(id);
     p.setName("testDelete");
 
-    Ebean.save(p);
+    DB.save(p);
 
-    CKeyParent found = Ebean.find(CKeyParent.class).where().idEq(searchId).findOne();
+    CKeyParent found = DB.find(CKeyParent.class).where().idEq(searchId).findOne();
     assertNotNull(found);
 
-    Ebean.delete(CKeyParent.class, searchId);
+    DB.delete(CKeyParent.class, searchId);
 
-    CKeyParent notFound = Ebean.find(CKeyParent.class).where().idEq(searchId).findOne();
+    CKeyParent notFound = DB.find(CKeyParent.class).where().idEq(searchId).findOne();
     assertNull(notFound);
 
   }
 
   @Test
   public void testDeleteWhere() {
+    DB.truncate(CKeyParent.class);
 
     CKeyParentId id = new CKeyParentId(101, "deleteMe2");
     CKeyParentId searchId = new CKeyParentId(101, "deleteMe2");
@@ -46,18 +47,18 @@ public class TestCKeyDelete extends BaseTestCase {
     p.setId(id);
     p.setName("testDelete");
 
-    Ebean.save(p);
+    DB.save(p);
 
-    List<CKeyParentId> ids = Ebean.find(CKeyParent.class).where().eq("id.oneKey", 101).findIds();
+    List<CKeyParentId> ids = DB.find(CKeyParent.class).where().eq("id.oneKey", 101).findIds();
     assertThat(ids).hasSize(1);
 
     CKeyParentId foundId = ids.get(0);
     assertThat(foundId.getOneKey()).isEqualTo(101);
     assertThat(foundId.getTwoKey()).isEqualTo("deleteMe2");
 
-    Ebean.createQuery(CKeyParent.class).where().eq("id.oneKey", 101).delete();
+    DB.createQuery(CKeyParent.class).where().eq("id.oneKey", 101).delete();
 
-    CKeyParent found = Ebean.find(CKeyParent.class).where().idEq(searchId).findOne();
+    CKeyParent found = DB.find(CKeyParent.class).where().idEq(searchId).findOne();
     assertNull(found);
   }
 }
diff --git a/src/test/java/org/tests/ddl/TestForeignKeyModes.java b/src/test/java/org/tests/ddl/TestForeignKeyModes.java
index 113c72e16..e0eab0a7b 100644
--- a/src/test/java/org/tests/ddl/TestForeignKeyModes.java
+++ b/src/test/java/org/tests/ddl/TestForeignKeyModes.java
@@ -2,6 +2,8 @@ package org.tests.ddl;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.annotation.IgnorePlatform;
+import io.ebean.annotation.Platform;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -82,6 +84,7 @@ public class TestForeignKeyModes extends BaseTestCase {
     assertThat(sql.get(1)).contains("delete from dfk_none_via_mto_m where id=?");
   }
 
+  @IgnorePlatform(Platform.NUODB)
   @Test
   public void setNullOnDelete() {
 
@@ -99,6 +102,7 @@ public class TestForeignKeyModes extends BaseTestCase {
     assertThat(found.getOne()).isNull();
   }
 
+  @IgnorePlatform(Platform.NUODB)
   @Test
   public void onDeleteCascade() {
 
diff --git a/src/test/java/org/tests/el/TestPathExpression.java b/src/test/java/org/tests/el/TestPathExpression.java
index c5254a305..1fa061269 100644
--- a/src/test/java/org/tests/el/TestPathExpression.java
+++ b/src/test/java/org/tests/el/TestPathExpression.java
@@ -47,7 +47,7 @@ public class TestPathExpression {
     assertEquals(c1.getStatus(), Customer.Status.ACTIVE);
     assertEquals(c1.getBillingAddress().getLine1(), "12 someplace");
     assertEquals(c1.getBillingAddress().getCity(), "Auckland");
-    assertEquals(c1.getBillingAddress().getId(), Short.valueOf("4"));
+    assertEquals(c1.getBillingAddress().getId(), Integer.valueOf("4"));
 
     assertEquals(c1.getBillingAddress().getCountry().getCode(), "NZ");
     assertEquals(c1.getBillingAddress().getCountry().getName(), "New Zealand");
@@ -57,7 +57,7 @@ public class TestPathExpression {
   public void pathGet() {
 
     Address billingAddress = new Address();
-    billingAddress.setId((short) 12);
+    billingAddress.setId(12);
     billingAddress.setLine1("line1");
     billingAddress.setCity("Auckland");
 
@@ -72,7 +72,7 @@ public class TestPathExpression {
     EntityBean e0 = (EntityBean) c0;
     assertEquals(line1.pathGet(e0), "line1");
     assertEquals(city.pathGet(e0), "Auckland");
-    assertEquals(billingId.pathGet(e0), Short.valueOf("12"));
+    assertEquals(billingId.pathGet(e0), Integer.valueOf("12"));
 
 
     assertEquals(beanType.getExpressionPath("billingAddress.country.code").pathGet(e0), "NZ");
diff --git a/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java b/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java
index 94518ddce..539f05f8d 100644
--- a/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java
+++ b/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java
@@ -1,8 +1,11 @@
 package org.tests.insert;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.DataIntegrityException;
 import io.ebean.Ebean;
+import io.ebean.annotation.IgnorePlatform;
+import io.ebean.annotation.Platform;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
@@ -11,6 +14,7 @@ import org.tests.model.basic.ResetBasicData;
 public class TestInsertDataIntegrityException extends BaseTestCase {
 
 
+  @IgnorePlatform(Platform.NUODB)
   @Test(expected = DataIntegrityException.class)
   public void insert_invalidForeignKey() {
 
@@ -23,6 +27,6 @@ public class TestInsertDataIntegrityException extends BaseTestCase {
     order.setStatus(Order.Status.NEW);
     order.setCustomer(invalidCustomer);
 
-    Ebean.save(order);
+    DB.save(order);
   }
 }
diff --git a/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java b/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java
index 491c605db..4df6c7efb 100644
--- a/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java
+++ b/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java
@@ -1,6 +1,7 @@
 package org.tests.m2m;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
@@ -16,6 +17,8 @@ public class TestM2MDeleteCascadeFromParent extends BaseTestCase {
   @Test
   public void test() {
 
+    DB.truncate("mny_b_mny_c","mny_c","mny_b", "mny_a");
+
     MnyC c0 = new MnyC();
     c0.setName("c0");
     c0.save();
diff --git a/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java b/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java
index a3717b0b7..dcb4f984e 100644
--- a/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java
+++ b/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java
@@ -2,6 +2,8 @@ package org.tests.m2m;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.annotation.IgnorePlatform;
+import io.ebean.annotation.Platform;
 import org.tests.model.basic.MnocRole;
 import org.tests.model.basic.MnocUser;
 import org.junit.Assert;
@@ -12,6 +14,7 @@ import java.util.List;
 
 public class TestM2MDeleteNoCascade extends BaseTestCase {
 
+  @IgnorePlatform(Platform.NUODB)
   @Test
   public void test() {
 
diff --git a/src/test/java/org/tests/model/basic/Address.java b/src/test/java/org/tests/model/basic/Address.java
index a11d38a0d..3b68776bd 100644
--- a/src/test/java/org/tests/model/basic/Address.java
+++ b/src/test/java/org/tests/model/basic/Address.java
@@ -25,7 +25,7 @@ import java.sql.Timestamp;
 public class Address {
 
   @Id
-  Short id;
+  Integer id;
 
   @Size(max = 100)
   @Column(name = "line_1")
@@ -55,14 +55,14 @@ public class Address {
   /**
    * Return id.
    */
-  public Short getId() {
+  public Integer getId() {
     return id;
   }
 
   /**
    * Set id.
    */
-  public void setId(Short id) {
+  public void setId(Integer id) {
     this.id = id;
   }
 
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
index c4bd282d0..2bf32672a 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
@@ -1,6 +1,7 @@
 package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.Transaction;
 import org.ebeantest.LoggedSqlCollector;
@@ -18,6 +19,7 @@ public class TestElementCollectionBasic extends BaseTestCase {
 
   @Test
   public void test() {
+    DB.truncate(EcPerson.class);
 
     eventLog();
     LoggedSqlCollector.start();
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java
index e36c86a53..a91ce35d0 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java
@@ -1,6 +1,7 @@
 package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.annotation.PersistBatch;
 import io.ebeaninternal.api.SpiEbeanServer;
@@ -15,6 +16,7 @@ public class TestElementCollectionBasicCache extends BaseTestCase {
 
   @Test
   public void test() {
+    DB.truncate(EcPerson.class);
 
     EcPerson person = new EcPerson("Cache1");
     person.getPhoneNumbers().add("021 1234");
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
index 225a7316d..ed4f219a1 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
@@ -1,6 +1,7 @@
 package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
@@ -15,6 +16,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase {
 
   @Test
   public void test() {
+    DB.truncate(EcmPerson.class);
 
     LoggedSqlCollector.start();
 
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java
index 3b65b22ba..830cb5b5b 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java
@@ -1,6 +1,7 @@
 package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
@@ -13,6 +14,7 @@ public class TestElementCollectionBasicMapAsLob extends BaseTestCase {
 
   @Test
   public void test() {
+    DB.truncate(EcmcPerson.class);
 
     LoggedSqlCollector.start();
 
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java
index 3e33693c9..7830a62af 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java
@@ -1,6 +1,7 @@
 package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.annotation.PersistBatch;
 import io.ebeaninternal.api.SpiEbeanServer;
@@ -15,6 +16,7 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase {
 
   @Test
   public void test() {
+    DB.truncate(EcmPerson.class);
 
     EcmPerson person = new EcmPerson("CacheMap");
     person.getPhoneNumbers().put("home", "021 1234");
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java
index ea0e3c213..57b7500be 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java
@@ -1,6 +1,7 @@
 package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
@@ -14,6 +15,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase {
 
   @Test
   public void test() {
+    DB.truncate(EcsPerson.class);
 
     LoggedSqlCollector.start();
 
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java
index 923054961..145081116 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java
@@ -1,6 +1,7 @@
 package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
@@ -13,6 +14,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase {
 
   @Test
   public void test() {
+    DB.truncate(EcblPerson.class);
 
     LoggedSqlCollector.start();
 
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java
index a1153b074..b6dc16487 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java
@@ -1,6 +1,7 @@
 package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
@@ -13,6 +14,7 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase {
 
   @Test
   public void test() {
+    DB.truncate(EcblPerson.class);
 
     EcblPerson person = new EcblPerson("CacheL");
     person.getPhoneNumbers().add(new EcPhone("64", "021","1234"));
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java
index 5d13fcf5e..bad87bc76 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java
@@ -1,6 +1,7 @@
 package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
@@ -14,6 +15,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase {
 
   @Test
   public void test() {
+    DB.truncate(EcbmPerson.class);
 
     LoggedSqlCollector.start();
 
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java
index 9fe0ecc21..e4f6af4c3 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java
@@ -1,6 +1,7 @@
 package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
@@ -13,6 +14,7 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase {
 
   @Test
   public void test() {
+    DB.truncate(EcbmPerson.class);
 
     EcbmPerson person = new EcbmPerson("Cache1");
     person.getPhoneNumbers().put("home", new EcPhone("64", "021", "1234"));
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java
index 988097da5..ae03beeb6 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java
@@ -1,6 +1,7 @@
 package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import org.junit.Test;
 
@@ -10,6 +11,7 @@ public class TestElementCollectionEnumSet extends BaseTestCase {
 
   @Test
   public void test() {
+    DB.truncate(EcEnumPerson.class);
 
     EcEnumPerson person = new EcEnumPerson("Enum Person");
     person.getTags().add(EcEnumPerson.Tags.BLUE);
diff --git a/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java b/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java
index 4d8a16106..b36bb48cb 100644
--- a/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java
+++ b/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java
@@ -1,17 +1,18 @@
 package org.tests.model.lazywithid;
 
-import static org.junit.Assert.assertEquals;
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import io.ebean.Ebean;
+import org.junit.Test;
 
 import java.util.List;
 
-import org.junit.Test;
-
-import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import static org.junit.Assert.assertEquals;
 
 public class TestColumnIdName extends BaseTestCase {
   @Test
   public void test() {
+    DB.truncate(Tune.class);
 
     Tune tune = new Tune();
     tune.getLoonies().add(new Looney("Taz"));
diff --git a/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java b/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java
index 7e03b1b6f..37a9c2ea3 100644
--- a/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java
+++ b/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java
@@ -41,7 +41,7 @@ public class TestOrderByWithDistinct extends BaseTestCase {
   }
 
   @Test
-  @IgnorePlatform({Platform.MYSQL, Platform.SQLSERVER}) // do not support nulls first/last
+  @IgnorePlatform({Platform.MYSQL, Platform.SQLSERVER, Platform.NUODB}) // do not support nulls first/last
   public void testDistinctOn() {
 
     MRole role = Ebean.getReference(MRole.class, 1);
diff --git a/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java b/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java
index 328682e7a..71dfe5600 100644
--- a/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java
+++ b/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java
@@ -26,7 +26,7 @@ public class TestWhereLikeWithSlash extends BaseTestCase {
     Query<EBasic> query1 = Ebean.find(EBasic.class).where().like("name", "slash\\mon%").query();
     List<EBasic> list1 = query1.findList();
 
-    if (!isMySql()) {
+    if (!isMySql() && !isNuoDb()) {
       // For mysql this assert depends on no_backslash_escapes setting so we won't assert here
       // Still good on Postgres which was the original issue
       assertEquals(1, list1.size());
diff --git a/src/test/java/org/tests/repository/TestBeanRepository.java b/src/test/java/org/tests/repository/TestBeanRepository.java
index 3649dccc5..6bb90a87d 100644
--- a/src/test/java/org/tests/repository/TestBeanRepository.java
+++ b/src/test/java/org/tests/repository/TestBeanRepository.java
@@ -1,6 +1,7 @@
 package org.tests.repository;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
@@ -15,6 +16,7 @@ public class TestBeanRepository extends BaseTestCase {
 
   @Test
   public void test() {
+    DB.find(Customer.class).where().in("name", "c0", "c1").delete();
 
     ResetBasicData.reset();
 
diff --git a/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java b/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
index e9557baeb..605d9a3e6 100644
--- a/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
+++ b/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
@@ -1,6 +1,7 @@
 package org.tests.softdelete;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.Query;
 import io.ebean.SqlQuery;
@@ -113,6 +114,7 @@ public class TestSoftDeleteBasic extends BaseTestCase {
 
   @Test
   public void testFindSoftDeleted() {
+    DB.truncate(EBasicSoftDelete.class);
 
     EBasicSoftDelete bean = new EBasicSoftDelete();
     bean.setName("softDelFetch");
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 45f5209aa..66205aa64 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -21,7 +21,7 @@ ebean.ddl.generate=true
 ebean.ddl.run=true
 ebean.ddl.header=-- Generated by ebean ${version} at ${timestamp}
 ebean.packages=org.tests
-datasource.default=h2
+datasource.default=nuodb
 
 ebean.dumpMetricsOnShutdown=true
 ebean.dumpMetricsOptions=sql,hash
@@ -172,6 +172,12 @@ datasource.sqlserver.password=SqlS3rv#r
 datasource.sqlserver.url=jdbc:sqlserver://localhost:1433;databaseName=test_ebean;sendTimeAsDateTime=false
 datasource.sqlserver.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
 
+datasource.nuodb.schema=test_user
+datasource.nuodb.username=test_user
+datasource.nuodb.password=test
+datasource.nuodb.url=jdbc:com.nuodb://localhost/unit
+datasource.nuodb.driver=com.nuodb.jdbc.Driver
+
 datasource.db2.username=db2admin
 datasource.db2.password=veryverysecret#1234
 datasource.db2.databaseUrl=jdbc:db2://127.0.0.1:50000/SAMPLE
diff --git a/src/test/resources/extra-ddl.xml b/src/test/resources/extra-ddl.xml
index b01ed35b2..c8e1ed92a 100644
--- a/src/test/resources/extra-ddl.xml
+++ b/src/test/resources/extra-ddl.xml
@@ -5,7 +5,7 @@
       drop view order_agg_vw if exists;
   </ddl-script>
 
-  <ddl-script name="order views" platforms="db2,h2,postgres,oracle,mysql">
+  <ddl-script name="order views" platforms="db2,h2,postgres,oracle,mysql,nuodb">
     create or replace view order_agg_vw as
     select d.order_id, sum(d.order_qty * d.unit_price) as order_total,
            sum(d.ship_qty * d.unit_price) as ship_total
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
index 50294ed9b..0e19a7c4b 100644
--- a/src/test/resources/logback-test.xml
+++ b/src/test/resources/logback-test.xml
@@ -77,7 +77,7 @@
   <logger name="io.ebean" level="INFO"/>
 
   <logger name="io.ebean.docker" level="TRACE"/>
-  <!--<logger name="io.ebean.DDL" level="DEBUG"/>-->
+<!--  <logger name="io.ebean.DDL" level="DEBUG"/>-->
 
   <logger name="io.ebean.SQL" level="TRACE"/>
 <!--  <logger name="io.ebean.TXN" level="TRACE"/>-->

From ad7e18561bab1be96889f6a491ec4d0f91d40c4e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 11 Aug 2019 16:43:24 +1200
Subject: [PATCH 1000/1036] #1788 - ENH: Add support for NuoDB database
 platform

Remove the extra truncate
---
 src/test/java/org/tests/compositekeys/TestCKeyDelete.java    | 1 -
 .../java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java   | 5 +----
 .../model/elementcollection/TestElementCollectionBasic.java  | 2 --
 .../elementcollection/TestElementCollectionBasicCache.java   | 2 --
 .../elementcollection/TestElementCollectionBasicMap.java     | 2 --
 .../TestElementCollectionBasicMapAsLob.java                  | 2 --
 .../TestElementCollectionBasicMapCache.java                  | 2 --
 .../elementcollection/TestElementCollectionBasicSet.java     | 2 --
 .../elementcollection/TestElementCollectionEmbeddedList.java | 2 --
 .../TestElementCollectionEmbeddedListCache.java              | 2 --
 .../elementcollection/TestElementCollectionEmbeddedMap.java  | 2 --
 .../TestElementCollectionEmbeddedMapCache.java               | 2 --
 .../elementcollection/TestElementCollectionEnumSet.java      | 2 --
 .../java/org/tests/model/lazywithid/TestColumnIdName.java    | 2 --
 src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java  | 2 --
 src/test/resources/ebean.properties                          | 2 +-
 16 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/src/test/java/org/tests/compositekeys/TestCKeyDelete.java b/src/test/java/org/tests/compositekeys/TestCKeyDelete.java
index 22a032854..acd40ad4c 100644
--- a/src/test/java/org/tests/compositekeys/TestCKeyDelete.java
+++ b/src/test/java/org/tests/compositekeys/TestCKeyDelete.java
@@ -38,7 +38,6 @@ public class TestCKeyDelete extends BaseTestCase {
 
   @Test
   public void testDeleteWhere() {
-    DB.truncate(CKeyParent.class);
 
     CKeyParentId id = new CKeyParentId(101, "deleteMe2");
     CKeyParentId searchId = new CKeyParentId(101, "deleteMe2");
diff --git a/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java b/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java
index 4df6c7efb..55983234b 100644
--- a/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java
+++ b/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java
@@ -1,14 +1,13 @@
 package org.tests.m2m;
 
 import io.ebean.BaseTestCase;
-import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
+import org.junit.Test;
 import org.tests.model.m2m.MnyA;
 import org.tests.model.m2m.MnyB;
 import org.tests.model.m2m.MnyC;
-import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
@@ -17,8 +16,6 @@ public class TestM2MDeleteCascadeFromParent extends BaseTestCase {
   @Test
   public void test() {
 
-    DB.truncate("mny_b_mny_c","mny_c","mny_b", "mny_a");
-
     MnyC c0 = new MnyC();
     c0.setName("c0");
     c0.save();
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
index 2bf32672a..c4bd282d0 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
@@ -1,7 +1,6 @@
 package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
-import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.Transaction;
 import org.ebeantest.LoggedSqlCollector;
@@ -19,7 +18,6 @@ public class TestElementCollectionBasic extends BaseTestCase {
 
   @Test
   public void test() {
-    DB.truncate(EcPerson.class);
 
     eventLog();
     LoggedSqlCollector.start();
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java
index a91ce35d0..e36c86a53 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java
@@ -1,7 +1,6 @@
 package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
-import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.annotation.PersistBatch;
 import io.ebeaninternal.api.SpiEbeanServer;
@@ -16,7 +15,6 @@ public class TestElementCollectionBasicCache extends BaseTestCase {
 
   @Test
   public void test() {
-    DB.truncate(EcPerson.class);
 
     EcPerson person = new EcPerson("Cache1");
     person.getPhoneNumbers().add("021 1234");
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
index ed4f219a1..225a7316d 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
@@ -1,7 +1,6 @@
 package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
-import io.ebean.DB;
 import io.ebean.Ebean;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
@@ -16,7 +15,6 @@ public class TestElementCollectionBasicMap extends BaseTestCase {
 
   @Test
   public void test() {
-    DB.truncate(EcmPerson.class);
 
     LoggedSqlCollector.start();
 
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java
index 830cb5b5b..3b65b22ba 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java
@@ -1,7 +1,6 @@
 package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
-import io.ebean.DB;
 import io.ebean.Ebean;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
@@ -14,7 +13,6 @@ public class TestElementCollectionBasicMapAsLob extends BaseTestCase {
 
   @Test
   public void test() {
-    DB.truncate(EcmcPerson.class);
 
     LoggedSqlCollector.start();
 
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java
index 7830a62af..3e33693c9 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java
@@ -1,7 +1,6 @@
 package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
-import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.annotation.PersistBatch;
 import io.ebeaninternal.api.SpiEbeanServer;
@@ -16,7 +15,6 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase {
 
   @Test
   public void test() {
-    DB.truncate(EcmPerson.class);
 
     EcmPerson person = new EcmPerson("CacheMap");
     person.getPhoneNumbers().put("home", "021 1234");
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java
index 57b7500be..ea0e3c213 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java
@@ -1,7 +1,6 @@
 package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
-import io.ebean.DB;
 import io.ebean.Ebean;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
@@ -15,7 +14,6 @@ public class TestElementCollectionBasicSet extends BaseTestCase {
 
   @Test
   public void test() {
-    DB.truncate(EcsPerson.class);
 
     LoggedSqlCollector.start();
 
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java
index 145081116..923054961 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java
@@ -1,7 +1,6 @@
 package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
-import io.ebean.DB;
 import io.ebean.Ebean;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
@@ -14,7 +13,6 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase {
 
   @Test
   public void test() {
-    DB.truncate(EcblPerson.class);
 
     LoggedSqlCollector.start();
 
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java
index b6dc16487..a1153b074 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java
@@ -1,7 +1,6 @@
 package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
-import io.ebean.DB;
 import io.ebean.Ebean;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
@@ -14,7 +13,6 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase {
 
   @Test
   public void test() {
-    DB.truncate(EcblPerson.class);
 
     EcblPerson person = new EcblPerson("CacheL");
     person.getPhoneNumbers().add(new EcPhone("64", "021","1234"));
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java
index bad87bc76..5d13fcf5e 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java
@@ -1,7 +1,6 @@
 package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
-import io.ebean.DB;
 import io.ebean.Ebean;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
@@ -15,7 +14,6 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase {
 
   @Test
   public void test() {
-    DB.truncate(EcbmPerson.class);
 
     LoggedSqlCollector.start();
 
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java
index e4f6af4c3..9fe0ecc21 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java
@@ -1,7 +1,6 @@
 package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
-import io.ebean.DB;
 import io.ebean.Ebean;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
@@ -14,7 +13,6 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase {
 
   @Test
   public void test() {
-    DB.truncate(EcbmPerson.class);
 
     EcbmPerson person = new EcbmPerson("Cache1");
     person.getPhoneNumbers().put("home", new EcPhone("64", "021", "1234"));
diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java
index ae03beeb6..988097da5 100644
--- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java
+++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java
@@ -1,7 +1,6 @@
 package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
-import io.ebean.DB;
 import io.ebean.Ebean;
 import org.junit.Test;
 
@@ -11,7 +10,6 @@ public class TestElementCollectionEnumSet extends BaseTestCase {
 
   @Test
   public void test() {
-    DB.truncate(EcEnumPerson.class);
 
     EcEnumPerson person = new EcEnumPerson("Enum Person");
     person.getTags().add(EcEnumPerson.Tags.BLUE);
diff --git a/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java b/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java
index b36bb48cb..f422f8414 100644
--- a/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java
+++ b/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java
@@ -1,7 +1,6 @@
 package org.tests.model.lazywithid;
 
 import io.ebean.BaseTestCase;
-import io.ebean.DB;
 import io.ebean.Ebean;
 import org.junit.Test;
 
@@ -12,7 +11,6 @@ import static org.junit.Assert.assertEquals;
 public class TestColumnIdName extends BaseTestCase {
   @Test
   public void test() {
-    DB.truncate(Tune.class);
 
     Tune tune = new Tune();
     tune.getLoonies().add(new Looney("Taz"));
diff --git a/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java b/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
index 605d9a3e6..e9557baeb 100644
--- a/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
+++ b/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
@@ -1,7 +1,6 @@
 package org.tests.softdelete;
 
 import io.ebean.BaseTestCase;
-import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.Query;
 import io.ebean.SqlQuery;
@@ -114,7 +113,6 @@ public class TestSoftDeleteBasic extends BaseTestCase {
 
   @Test
   public void testFindSoftDeleted() {
-    DB.truncate(EBasicSoftDelete.class);
 
     EBasicSoftDelete bean = new EBasicSoftDelete();
     bean.setName("softDelFetch");
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 66205aa64..ccca26091 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -21,7 +21,7 @@ ebean.ddl.generate=true
 ebean.ddl.run=true
 ebean.ddl.header=-- Generated by ebean ${version} at ${timestamp}
 ebean.packages=org.tests
-datasource.default=nuodb
+datasource.default=h2
 
 ebean.dumpMetricsOnShutdown=true
 ebean.dumpMetricsOptions=sql,hash

From ee6452cfb01459d919d13e96625ff650442ddafb Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 12 Aug 2019 20:41:45 +1200
Subject: [PATCH 1001/1036] #1788 - ENH: Add support for NuoDB database
 platform

---
 src/test/java/main/StartNuoDB.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/main/StartNuoDB.java b/src/test/java/main/StartNuoDB.java
index e80beb78b..0bba1f98d 100644
--- a/src/test/java/main/StartNuoDB.java
+++ b/src/test/java/main/StartNuoDB.java
@@ -8,7 +8,7 @@ public class StartNuoDB {
   public static void main(String[] args) {
 
     NuoDBConfig config = new NuoDBConfig();
-    config.setDbName("unit");
+    config.setSchema("unit");
 
     NuoDBContainer container = new NuoDBContainer(config);
     container.stopRemove();

From f5459920e97d32cc49496b9a30c637ffef161998 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 12 Aug 2019 21:05:32 +1200
Subject: [PATCH 1002/1036] #1785 - Bean gets replaced on json deserialization
 with primitive 'null' id

---
 .../server/deploy/BeanDescriptor.java         |  4 ++-
 .../server/deploy/BeanDescriptorJsonHelp.java |  4 ++-
 .../server/persist/DefaultPersister.java      |  6 ++---
 .../server/persist/SaveManyBeans.java         |  4 ++-
 .../server/persist/dml/InsertHandler.java     |  5 ++--
 .../java/org/tests/cascade/RelMaster.java     |  6 ++---
 .../tests/cascade/TestJsonMarshallingOTM.java | 27 +++++++++++++++++++
 7 files changed, 45 insertions(+), 11 deletions(-)
 create mode 100644 src/test/java/org/tests/cascade/TestJsonMarshallingOTM.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index c42f960a9..cb38766e4 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -112,6 +112,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+import static io.ebeaninternal.server.persist.DmlUtil.isNullOrZero;
+
 /**
  * Describes Beans including their deployment information.
  */
@@ -3210,7 +3212,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   }
 
   boolean hasIdValue(EntityBean bean) {
-    return (idProperty != null && !DmlUtil.isNullOrZero(idProperty.getValue(bean)));
+    return (idProperty != null && !isNullOrZero(idProperty.getValue(bean)));
   }
 
   boolean hasVersionProperty(EntityBeanIntercept ebi) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java
index a2355bdb9..059b368a0 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java
@@ -14,6 +14,8 @@ import java.io.IOException;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import static io.ebeaninternal.server.persist.DmlUtil.isNullOrZero;
+
 class BeanDescriptorJsonHelp<T> {
 
   private final BeanDescriptor<T> desc;
@@ -158,7 +160,7 @@ class BeanDescriptorJsonHelp<T> {
     }
     Object contextBean = null;
     Object id = desc.beanId(bean);
-    if (id != null) {
+    if (!isNullOrZero(id)) {
       // check if the bean has already been loaded
       contextBean = readJson.persistenceContextPutIfAbsent(id, bean, desc);
     }
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 6cfd8eb42..e3a93cfad 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -43,6 +43,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import static io.ebeaninternal.server.persist.DmlUtil.isNullOrZero;
+
 /**
  * Persister implementation using DML.
  * <p>
@@ -1227,11 +1229,9 @@ public final class DefaultPersister implements Persister {
     EntityBean bean = request.getEntityBean();
     Object uid = idProp.getValue(bean);
 
-    if (DmlUtil.isNullOrZero(uid)) {
-
+    if (isNullOrZero(uid)) {
       // generate the nextId and set it to the property
       Object nextId = desc.nextId(request.getTransaction());
-
       // cast the data type if required and set it
       desc.convertSetId(nextId, bean);
     }
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
index b7545c163..afbf394cd 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
@@ -20,6 +20,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import static io.ebeaninternal.server.persist.DmlUtil.isNullOrZero;
+
 /**
  * Saves the details for a OneToMany or ManyToMany relationship (entity beans).
  */
@@ -222,7 +224,7 @@ public class SaveManyBeans extends SaveManyBase {
       }
       if (detailBean instanceof EntityBean) {
         Object id = targetDescriptor.getId((EntityBean) detailBean);
-        if (!DmlUtil.isNullOrZero(id)) {
+        if (!isNullOrZero(id)) {
           // remember the Id (other details not in the collection) will be removed
           detailIds.add(id);
         }
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
index 7e7541557..a56912651 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
@@ -6,7 +6,6 @@ import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.core.Message;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.persist.DmlUtil;
 
 import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
@@ -15,6 +14,8 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import static io.ebeaninternal.server.persist.DmlUtil.isNullOrZero;
+
 /**
  * Insert bean handler.
  */
@@ -66,7 +67,7 @@ public class InsertHandler extends DmlHandler {
 
     Object idValue = desc.getId(bean);
 
-    boolean withId = !DmlUtil.isNullOrZero(idValue);
+    boolean withId = !isNullOrZero(idValue);
 
     // check to see if we are going to use generated keys
     if (!withId) {
diff --git a/src/test/java/org/tests/cascade/RelMaster.java b/src/test/java/org/tests/cascade/RelMaster.java
index 37409306a..e7a736b0f 100644
--- a/src/test/java/org/tests/cascade/RelMaster.java
+++ b/src/test/java/org/tests/cascade/RelMaster.java
@@ -10,7 +10,7 @@ import javax.persistence.Version;
 public class RelMaster {
 
   @Id
-  Long id;
+  long id;
 
   String name;
 
@@ -20,11 +20,11 @@ public class RelMaster {
   @ManyToOne(cascade = CascadeType.REMOVE)
   private RelDetail detail;
 
-  public Long getId() {
+  public long getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(long id) {
     this.id = id;
   }
 
diff --git a/src/test/java/org/tests/cascade/TestJsonMarshallingOTM.java b/src/test/java/org/tests/cascade/TestJsonMarshallingOTM.java
new file mode 100644
index 000000000..63e47b301
--- /dev/null
+++ b/src/test/java/org/tests/cascade/TestJsonMarshallingOTM.java
@@ -0,0 +1,27 @@
+package org.tests.cascade;
+
+import io.ebean.DB;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestJsonMarshallingOTM {
+
+  @Test
+  public void test() {
+
+    String json = ("" +
+      "{ 'masterRel': [" +
+      "  { 'name': 'a' }," +
+      "  { 'name': 'b' }" +
+      "] }"
+    ).replaceAll("'", "\"");
+
+    RelDetail bean = DB.json().toBean(RelDetail.class, json);
+
+    final RelMaster m0 = bean.getMasterRel().get(0);
+    assertThat(m0.getName()).isEqualTo("a");
+    final RelMaster m1 = bean.getMasterRel().get(1);
+    assertThat(m1.getName()).isEqualTo("b");
+  }
+}

From 196645e7a25dadb7ad91a28cc6aad970c9aec83b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 12 Aug 2019 21:09:31 +1200
Subject: [PATCH 1003/1036] #1789 - Add default constructor to
 EntityBeanIntercept for serialisation framework use only

---
 src/main/java/io/ebean/bean/EntityBeanIntercept.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/src/main/java/io/ebean/bean/EntityBeanIntercept.java
index 22b667608..2a6f3e720 100644
--- a/src/main/java/io/ebean/bean/EntityBeanIntercept.java
+++ b/src/main/java/io/ebean/bean/EntityBeanIntercept.java
@@ -116,6 +116,14 @@ public final class EntityBeanIntercept implements Serializable {
     this.flags = new byte[owner._ebean_getPropertyNames().length];
   }
 
+  /**
+   * EXPERIMENTAL - Constructor only for use by serialization frameworks.
+   */
+  public EntityBeanIntercept() {
+    this.owner = null;
+    this.flags = null;
+  }
+
   /**
    * Return the 'owning' entity bean.
    */

From 3fd130ac4c7701721b8f99e1327a546b909cd1d8 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 12 Aug 2019 21:12:34 +1200
Subject: [PATCH 1004/1036] [maven-release-plugin] prepare release
 ebean-11.42.3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a51556f80..b09cb4ff7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.42.3-SNAPSHOT</version>
+  <version>11.42.3</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -23,7 +23,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.42.3</tag>
   </scm>
 
   <profiles>

From 3825dea00aaa99a5a6b58d6825b49e607613c9a5 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 12 Aug 2019 21:12:45 +1200
Subject: [PATCH 1005/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b09cb4ff7..847881e6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.42.3</version>
+  <version>11.42.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -23,7 +23,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.42.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 1d471fee92c3ff45d7cdfe582c0ccbc61748921a Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 14 Aug 2019 17:02:57 +1200
Subject: [PATCH 1006/1036] #1768 - Initial refactor extracting CallOrigin
 interface (#1791)

---
 src/main/java/io/ebean/bean/CallOrigin.java   | 22 +++++
 src/main/java/io/ebean/bean/CallStack.java    | 81 +++++--------------
 .../java/io/ebean/bean/ObjectGraphOrigin.java | 22 ++---
 .../java/io/ebean/config/ServerConfig.java    |  1 +
 src/main/java/io/ebean/util/EncodeB64.java    | 32 ++++++++
 .../io/ebeaninternal/api/SpiEbeanServer.java  |  4 +-
 .../java/io/ebeaninternal/api/SpiQuery.java   |  4 +-
 .../service/AutoTuneDiffCollection.java       |  2 +-
 .../autotune/service/BaseQueryTuner.java      | 12 +--
 .../server/core/CallOriginFactory.java        | 14 ++++
 .../server/core/CallStackFactory.java         | 14 ----
 ...ory.java => DefaultCallOriginFactory.java} |  9 ++-
 .../server/core/DefaultServer.java            | 16 ++--
 .../server/core/DefaultSlowQueryListener.java |  2 +-
 .../server/core/NoopCallOriginFactory.java    | 17 ++++
 .../server/core/NoopCallStackFactory.java     | 16 ----
 .../server/loadcontext/DLoadContext.java      |  6 +-
 .../server/querydefn/DefaultOrmQuery.java     |  6 +-
 .../ebeaninternal/api/TDSpiEbeanServer.java   |  4 +-
 .../query/autotune/TestAutoTuneProfiling.java |  4 +-
 .../org/tests/unitinternal/TestEncodeB64.java | 29 +++++++
 .../unitinternal/TestOriginIntEncoding.java   | 30 -------
 src/test/resources/ebean.properties           |  1 +
 23 files changed, 184 insertions(+), 164 deletions(-)
 create mode 100644 src/main/java/io/ebean/bean/CallOrigin.java
 create mode 100644 src/main/java/io/ebean/util/EncodeB64.java
 create mode 100644 src/main/java/io/ebeaninternal/server/core/CallOriginFactory.java
 delete mode 100644 src/main/java/io/ebeaninternal/server/core/CallStackFactory.java
 rename src/main/java/io/ebeaninternal/server/core/{DefaultCallStackFactory.java => DefaultCallOriginFactory.java} (88%)
 create mode 100644 src/main/java/io/ebeaninternal/server/core/NoopCallOriginFactory.java
 delete mode 100644 src/main/java/io/ebeaninternal/server/core/NoopCallStackFactory.java
 create mode 100644 src/test/java/org/tests/unitinternal/TestEncodeB64.java
 delete mode 100644 src/test/java/org/tests/unitinternal/TestOriginIntEncoding.java

diff --git a/src/main/java/io/ebean/bean/CallOrigin.java b/src/main/java/io/ebean/bean/CallOrigin.java
new file mode 100644
index 000000000..4ef531944
--- /dev/null
+++ b/src/main/java/io/ebean/bean/CallOrigin.java
@@ -0,0 +1,22 @@
+package io.ebean.bean;
+
+/**
+ * A call origin for query execution profiling to collect graph use (for query tuning).
+ */
+public interface CallOrigin {
+
+  /**
+   * Return the top element. Typically the top stack element with class and line.
+   */
+  String getTopElement();
+
+  /**
+   * Return the full description of the call origin.
+   */
+  String getFullDescription();
+
+  /**
+   * Compute and return an origin key based on the query hash.
+   */
+  String getOriginKey(int queryHash);
+}
diff --git a/src/main/java/io/ebean/bean/CallStack.java b/src/main/java/io/ebean/bean/CallStack.java
index d9006a026..2d2a5ffe5 100644
--- a/src/main/java/io/ebean/bean/CallStack.java
+++ b/src/main/java/io/ebean/bean/CallStack.java
@@ -3,6 +3,8 @@ package io.ebean.bean;
 import java.io.Serializable;
 import java.util.Arrays;
 
+import static io.ebean.util.EncodeB64.enc;
+
 /**
  * Represent the call stack (stack trace elements).
  * <p>
@@ -17,15 +19,15 @@ import java.util.Arrays;
  * Note the call stack is trimmed to remove the common ebean internal elements.
  * </p>
  */
-public final class CallStack implements Serializable {
+public final class CallStack implements Serializable, CallOrigin {
 
   private static final long serialVersionUID = -8590644046907438579L;
 
+  private static final String NEWLINE = "\n";
+
   private final String zeroHash;
   private final String pathHash;
-
   private final StackTraceElement[] callStack;
-
   private final int hc;
 
   public CallStack(StackTraceElement[] callStack, int zeroHash, int pathHash) {
@@ -37,12 +39,17 @@ public final class CallStack implements Serializable {
 
   private int computeHashCode() {
     int hc = 0;
-    for (StackTraceElement aCallStack : callStack) {
-      hc = 92821 * hc + aCallStack.hashCode();
+    for (StackTraceElement element : callStack) {
+      hc = 92821 * hc + element.hashCode();
     }
     return hc;
   }
 
+  @Override
+  public String toString() {
+    return zeroHash + ":" + pathHash + ":" + callStack[0];
+  }
+
   @Override
   public int hashCode() {
     return hc;
@@ -63,73 +70,29 @@ public final class CallStack implements Serializable {
   /**
    * Return the first element of the call stack.
    */
-  public StackTraceElement getFirstStackTraceElement() {
-    return callStack[0];
-  }
-
-  /**
-   * Return the call stack.
-   */
-  public StackTraceElement[] getCallStack() {
-    return callStack;
-  }
-
-  /**
-   * Return the hash for the first stack element.
-   */
-  public String getZeroHash() {
-    return zeroHash;
-  }
-
-  /**
-   * Return the hash for the stack elements (excluding first stack element).
-   */
-  public String getPathHash() {
-    return pathHash;
-  }
-
   @Override
-  public String toString() {
-    return zeroHash + ":" + pathHash + ":" + callStack[0];
+  public String getTopElement() {
+    return callStack[0].toString();
   }
 
   /**
    * Return the call stack lines appended with the given newLine string.
    */
-  public String description(String newLine) {
+  @Override
+  public String getFullDescription() {
     StringBuilder sb = new StringBuilder(400);
-    for (StackTraceElement aCallStack : callStack) {
-      sb.append(aCallStack.toString()).append(newLine);
+    for (int i = 0; i < callStack.length; i++) {
+      if (i > 0) {
+        sb.append(NEWLINE);
+      }
+      sb.append(callStack[i].toString());
     }
     return sb.toString();
   }
 
+  @Override
   public String getOriginKey(int queryHash) {
     return enc(queryHash) + "." + zeroHash + "." + pathHash;
   }
 
-  private static final int radix = 1 << 6;
-  private static final int mask = radix - 1;
-
-  /**
-   * Convert the integer to unsigned base 64.
-   */
-  public static String enc(int i) {
-    char[] buf = new char[32];
-    int charPos = 32;
-    do {
-      buf[--charPos] = intToBase64[i & mask];
-      i >>>= 6;
-    } while (i != 0);
-
-    return new String(buf, charPos, (32 - charPos));
-  }
-
-  private static final char intToBase64[] = {
-    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
-    'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-    'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
-    'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-    '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '_'
-  };
 }
diff --git a/src/main/java/io/ebean/bean/ObjectGraphOrigin.java b/src/main/java/io/ebean/bean/ObjectGraphOrigin.java
index 5f32f44ef..07d636a01 100644
--- a/src/main/java/io/ebean/bean/ObjectGraphOrigin.java
+++ b/src/main/java/io/ebean/bean/ObjectGraphOrigin.java
@@ -16,7 +16,7 @@ public final class ObjectGraphOrigin implements Serializable {
 
   private static final long serialVersionUID = 410937765287968708L;
 
-  private final CallStack callStack;
+  private final CallOrigin callOrigin;
 
   private final String beanType;
 
@@ -24,11 +24,11 @@ public final class ObjectGraphOrigin implements Serializable {
 
   private final String key;
 
-  public ObjectGraphOrigin(int queryHash, CallStack callStack, String beanType) {
-    this.callStack = callStack;
+  public ObjectGraphOrigin(int queryHash, CallOrigin callOrigin, String beanType) {
+    this.callOrigin = callOrigin;
     this.beanType = beanType;
     this.queryHash = queryHash;
-    this.key = callStack.getOriginKey(queryHash);
+    this.key = callOrigin.getOriginKey(queryHash);
   }
 
   /**
@@ -49,22 +49,22 @@ public final class ObjectGraphOrigin implements Serializable {
   /**
    * The call stack involved.
    */
-  public CallStack getCallStack() {
-    return callStack;
+  public CallOrigin getCallOrigin() {
+    return callOrigin;
   }
 
-  public String getFirstStackElement() {
-    return callStack.getFirstStackTraceElement().toString();
+  public String getTopElement() {
+    return callOrigin.getTopElement();
   }
 
   @Override
   public String toString() {
-    return "key[" + key + "] type[" + beanType + "] " + callStack.getFirstStackTraceElement() + " ";
+    return "key[" + key + "] type[" + beanType + "] " + callOrigin.getTopElement();
   }
 
   @Override
   public int hashCode() {
-    int hc = 92821 * callStack.hashCode();
+    int hc = 92821 * callOrigin.hashCode();
     hc = 92821 * hc + beanType.hashCode();
     hc = 92821 * hc + queryHash;
     return hc;
@@ -82,6 +82,6 @@ public final class ObjectGraphOrigin implements Serializable {
     ObjectGraphOrigin e = (ObjectGraphOrigin) obj;
     return e.queryHash == queryHash
       && e.beanType.equals(beanType)
-      && e.callStack.equals(callStack);
+      && e.callOrigin.equals(callOrigin);
   }
 }
diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 76cb0654c..3603fa9d2 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -2929,6 +2929,7 @@ public class ServerConfig {
     }
     loadDocStoreSettings(p);
 
+    maxCallStack = p.getInt("maxCallStack", maxCallStack);
     dumpMetricsOnShutdown = p.getBoolean("dumpMetricsOnShutdown", dumpMetricsOnShutdown);
     dumpMetricsOptions = p.get("dumpMetricsOptions", dumpMetricsOptions);
     queryPlanTTLSeconds = p.getInt("queryPlanTTLSeconds", queryPlanTTLSeconds);
diff --git a/src/main/java/io/ebean/util/EncodeB64.java b/src/main/java/io/ebean/util/EncodeB64.java
new file mode 100644
index 000000000..9eedf9c02
--- /dev/null
+++ b/src/main/java/io/ebean/util/EncodeB64.java
@@ -0,0 +1,32 @@
+package io.ebean.util;
+
+/**
+ * Integer to base64 encoder.
+ */
+public final class EncodeB64 {
+
+  private static final int radix = 1 << 6;
+  private static final int mask = radix - 1;
+
+  /**
+   * Convert the integer to unsigned base 64.
+   */
+  public static String enc(int i) {
+    char[] buf = new char[32];
+    int charPos = 32;
+    do {
+      buf[--charPos] = intToBase64[i & mask];
+      i >>>= 6;
+    } while (i != 0);
+
+    return new String(buf, charPos, (32 - charPos));
+  }
+
+  private static final char intToBase64[] = {
+    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+    'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+    'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+    'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+    '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '_'
+  };
+}
diff --git a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
index b8e4e9b7c..e594395d2 100644
--- a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
+++ b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
@@ -11,7 +11,7 @@ import io.ebean.Transaction;
 import io.ebean.TxScope;
 import io.ebean.bean.BeanCollectionLoader;
 import io.ebean.bean.BeanLoader;
-import io.ebean.bean.CallStack;
+import io.ebean.bean.CallOrigin;
 import io.ebean.bean.ObjectGraphNode;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
@@ -81,7 +81,7 @@ public interface SpiEbeanServer extends ExtendedServer, EbeanServer, BeanLoader,
    * graph costing.
    * </p>
    */
-  CallStack createCallStack();
+  CallOrigin createCallOrigin();
 
   /**
    * Return the PersistenceContextScope to use defined at query or server level.
diff --git a/src/main/java/io/ebeaninternal/api/SpiQuery.java b/src/main/java/io/ebeaninternal/api/SpiQuery.java
index 112c0c7b8..7f3f5596f 100644
--- a/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -7,7 +7,7 @@ import io.ebean.OrderBy;
 import io.ebean.PersistenceContextScope;
 import io.ebean.ProfileLocation;
 import io.ebean.Query;
-import io.ebean.bean.CallStack;
+import io.ebean.bean.CallOrigin;
 import io.ebean.bean.ObjectGraphNode;
 import io.ebean.bean.PersistenceContext;
 import io.ebean.event.readaudit.ReadEvent;
@@ -558,7 +558,7 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
    * because the queryPlanHash is used to identify the query point.
    * </p>
    */
-  ObjectGraphNode setOrigin(CallStack callStack);
+  ObjectGraphNode setOrigin(CallOrigin callOrigin);
 
   /**
    * Set the profile point of the bean or collection that is lazy loading.
diff --git a/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneDiffCollection.java b/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneDiffCollection.java
index 4f8213388..2d3d3e04c 100644
--- a/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneDiffCollection.java
+++ b/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneDiffCollection.java
@@ -149,7 +149,7 @@ public class AutoTuneDiffCollection {
     origin.setKey(point.getKey());
     origin.setBeanType(point.getBeanType());
     origin.setDetail(entry.getDetail().toString());
-    origin.setCallStack(point.getCallStack().description("\n"));
+    origin.setCallStack(point.getCallOrigin().getFullDescription());
     origin.setOriginal(query);
 
     if (updateTuning) {
diff --git a/src/main/java/io/ebeaninternal/server/autotune/service/BaseQueryTuner.java b/src/main/java/io/ebeaninternal/server/autotune/service/BaseQueryTuner.java
index 8219b179c..5a9a99130 100644
--- a/src/main/java/io/ebeaninternal/server/autotune/service/BaseQueryTuner.java
+++ b/src/main/java/io/ebeaninternal/server/autotune/service/BaseQueryTuner.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.autotune.service;
 
-import io.ebean.bean.CallStack;
+import io.ebean.bean.CallOrigin;
 import io.ebean.bean.ObjectGraphNode;
 import io.ebean.config.AutoTuneConfig;
 import io.ebean.config.AutoTuneMode;
@@ -97,7 +97,7 @@ public class BaseQueryTuner {
 
     if (!useTuning(query)) {
       if (profiling) {
-        profiling(query, server.createCallStack());
+        profiling(query, server.createCallOrigin());
       }
       return false;
     }
@@ -110,8 +110,8 @@ public class BaseQueryTuner {
     }
 
     // create a query point to identify the query
-    CallStack stack = server.createCallStack();
-    ObjectGraphNode origin = query.setOrigin(stack);
+    CallOrigin callOrigin = server.createCallOrigin();
+    ObjectGraphNode origin = query.setOrigin(callOrigin);
 
     if (profiling) {
       if (profilingListener.isProfileRequest(origin, query)) {
@@ -154,10 +154,10 @@ public class BaseQueryTuner {
     }
   }
 
-  private void profiling(SpiQuery<?> query, CallStack stack) {
+  private void profiling(SpiQuery<?> query, CallOrigin call) {
 
     // create a query point to identify the query
-    ObjectGraphNode origin = query.setOrigin(stack);
+    ObjectGraphNode origin = query.setOrigin(call);
     if (profilingListener.isProfileRequest(origin, query)) {
       // collect more profiling based on profiling rate etc
       query.setProfilingListener(profilingListener);
diff --git a/src/main/java/io/ebeaninternal/server/core/CallOriginFactory.java b/src/main/java/io/ebeaninternal/server/core/CallOriginFactory.java
new file mode 100644
index 000000000..5de09a508
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/core/CallOriginFactory.java
@@ -0,0 +1,14 @@
+package io.ebeaninternal.server.core;
+
+import io.ebean.bean.CallOrigin;
+
+/**
+ * Creates CallOrigin based on the stack trace.
+ */
+public interface CallOriginFactory {
+
+  /**
+   * Create and return the CallStack given the stack trace elements.
+   */
+  CallOrigin createCallOrigin();
+}
diff --git a/src/main/java/io/ebeaninternal/server/core/CallStackFactory.java b/src/main/java/io/ebeaninternal/server/core/CallStackFactory.java
deleted file mode 100644
index b61c40370..000000000
--- a/src/main/java/io/ebeaninternal/server/core/CallStackFactory.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package io.ebeaninternal.server.core;
-
-import io.ebean.bean.CallStack;
-
-/**
- * Creates CallStack based on the stack trace.
- */
-public interface CallStackFactory {
-
-  /**
-   * Create and return the CallStack given the stack trace elements.
-   */
-  CallStack createCallStack();
-}
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultCallStackFactory.java b/src/main/java/io/ebeaninternal/server/core/DefaultCallOriginFactory.java
similarity index 88%
rename from src/main/java/io/ebeaninternal/server/core/DefaultCallStackFactory.java
rename to src/main/java/io/ebeaninternal/server/core/DefaultCallOriginFactory.java
index 169faa93d..249f4dbdb 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultCallStackFactory.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultCallOriginFactory.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.core;
 
+import io.ebean.bean.CallOrigin;
 import io.ebean.bean.CallStack;
 
 import java.util.Arrays;
@@ -7,7 +8,7 @@ import java.util.Arrays;
 /**
  * Default CallStackFactory where the Hash function for StackTraceElement includes the line number.
  */
-public class DefaultCallStackFactory implements CallStackFactory {
+public class DefaultCallOriginFactory implements CallOriginFactory {
 
   private static final int IGNORE_LEADING_ELEMENTS = 5;
 
@@ -15,12 +16,12 @@ public class DefaultCallStackFactory implements CallStackFactory {
 
   private final int maxCallStack;
 
-  DefaultCallStackFactory(int maxCallStack) {
+  DefaultCallOriginFactory(int maxCallStack) {
     this.maxCallStack = maxCallStack;
   }
 
   @Override
-  public CallStack createCallStack() {
+  public CallOrigin createCallOrigin() {
      StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
 
     // ignore the first 6 as they are always avaje stack elements
@@ -58,7 +59,7 @@ public class DefaultCallStackFactory implements CallStackFactory {
     return element.getMethodName().startsWith("_ebean_");
   }
 
-  private CallStack createCallStack(StackTraceElement[] finalTrace) {
+  private CallOrigin createCallStack(StackTraceElement[] finalTrace) {
     return new CallStack(finalTrace, finalTrace[0].hashCode(), pathHash(finalTrace));
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 708a379d7..7f141146a 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -35,7 +35,7 @@ import io.ebean.ValuePair;
 import io.ebean.Version;
 import io.ebean.annotation.TxIsolation;
 import io.ebean.bean.BeanCollection;
-import io.ebean.bean.CallStack;
+import io.ebean.bean.CallOrigin;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.bean.ObjectGraphNode;
@@ -164,7 +164,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    */
   private final ClockService clockService;
 
-  private final CallStackFactory callStackFactory;
+  private final CallOriginFactory callStackFactory;
 
   /**
    * Handles the save, delete, updateSql CallableSql.
@@ -312,12 +312,12 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Create the CallStackFactory depending if AutoTune is being used.
    */
-  private CallStackFactory initCallStackFactory(ServerConfig serverConfig) {
+  private CallOriginFactory initCallStackFactory(ServerConfig serverConfig) {
     if (!serverConfig.getAutoTuneConfig().isActive()) {
       // use a common CallStack for performance as we don't care with no AutoTune
-      return new NoopCallStackFactory();
+      return new NoopCallOriginFactory();
     }
-    return new DefaultCallStackFactory(serverConfig.getMaxCallStack());
+    return new DefaultCallOriginFactory(serverConfig.getMaxCallStack());
   }
 
   private void configureServerPlugins() {
@@ -1135,7 +1135,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
     // if determine cost and no origin for AutoTune
     if (query.getParentNode() == null) {
-      query.setOrigin(createCallStack());
+      query.setOrigin(createCallOrigin());
     }
 
     return new OrmQueryRequest<>(this, queryEngine, query, (SpiTransaction) t);
@@ -2309,8 +2309,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * </p>
    */
   @Override
-  public CallStack createCallStack() {
-    return callStackFactory.createCallStack();
+  public CallOrigin createCallOrigin() {
+    return callStackFactory.createCallOrigin();
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultSlowQueryListener.java b/src/main/java/io/ebeaninternal/server/core/DefaultSlowQueryListener.java
index e6e02833e..b271a513e 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultSlowQueryListener.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultSlowQueryListener.java
@@ -19,7 +19,7 @@ class DefaultSlowQueryListener implements SlowQueryListener {
     String firstStack = "";
     ObjectGraphNode node = event.getOriginNode();
     if (node != null) {
-      firstStack = node.getOriginQueryPoint().getFirstStackElement();
+      firstStack = node.getOriginQueryPoint().getTopElement();
     }
     log.warn("Slow query warning - millis:{} rows:{} caller[{}] sql[{}]", event.getTimeMillis(), event.getRowCount(), firstStack, event.getSql());
   }
diff --git a/src/main/java/io/ebeaninternal/server/core/NoopCallOriginFactory.java b/src/main/java/io/ebeaninternal/server/core/NoopCallOriginFactory.java
new file mode 100644
index 000000000..314b32c68
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/core/NoopCallOriginFactory.java
@@ -0,0 +1,17 @@
+package io.ebeaninternal.server.core;
+
+import io.ebean.bean.CallOrigin;
+import io.ebean.bean.CallStack;
+
+/**
+ * A CallOriginFactory we can use when we don't use AutoTune.
+ */
+class NoopCallOriginFactory implements CallOriginFactory {
+
+  private final CallOrigin COMMON = new CallStack(Thread.currentThread().getStackTrace(), 0, 0);
+
+  @Override
+  public CallOrigin createCallOrigin() {
+    return COMMON;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/core/NoopCallStackFactory.java b/src/main/java/io/ebeaninternal/server/core/NoopCallStackFactory.java
deleted file mode 100644
index 8e04cd414..000000000
--- a/src/main/java/io/ebeaninternal/server/core/NoopCallStackFactory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.ebeaninternal.server.core;
-
-import io.ebean.bean.CallStack;
-
-/**
- * A CallStackFactory we can use when we don't use AutoTune.
- */
-class NoopCallStackFactory implements CallStackFactory {
-
-  private final CallStack COMMON = new CallStack(Thread.currentThread().getStackTrace(), 0, 0);
-
-  @Override
-  public CallStack createCallStack() {
-    return COMMON;
-  }
-}
diff --git a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
index 1f2e2e297..bac4528e8 100644
--- a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
+++ b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.loadcontext;
 import io.ebean.CacheMode;
 import io.ebean.ProfileLocation;
 import io.ebean.bean.BeanCollection;
-import io.ebean.bean.CallStack;
+import io.ebean.bean.CallOrigin;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.bean.ObjectGraphNode;
 import io.ebean.bean.ObjectGraphOrigin;
@@ -94,8 +94,8 @@ public class DLoadContext implements LoadContext {
   }
 
   private ObjectGraphOrigin initOrigin() {
-    CallStack callStack = ebeanServer.createCallStack();
-    return new ObjectGraphOrigin(0, callStack, rootDescriptor.getFullName());
+    CallOrigin callOrigin = ebeanServer.createCallOrigin();
+    return new ObjectGraphOrigin(0, callOrigin, rootDescriptor.getFullName());
   }
 
   public DLoadContext(OrmQueryRequest<?> request, SpiQuerySecondary secondaryQueries) {
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index a63e9380b..b03596175 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -24,7 +24,7 @@ import io.ebean.RawSql;
 import io.ebean.Transaction;
 import io.ebean.UpdateQuery;
 import io.ebean.Version;
-import io.ebean.bean.CallStack;
+import io.ebean.bean.CallOrigin;
 import io.ebean.bean.ObjectGraphNode;
 import io.ebean.bean.ObjectGraphOrigin;
 import io.ebean.bean.PersistenceContext;
@@ -1073,10 +1073,10 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public ObjectGraphNode setOrigin(CallStack callStack) {
+  public ObjectGraphNode setOrigin(CallOrigin callOrigin) {
 
     // create a 'origin' which links this query to the profiling information
-    ObjectGraphOrigin o = new ObjectGraphOrigin(calculateOriginQueryHash(), callStack, beanType.getName());
+    ObjectGraphOrigin o = new ObjectGraphOrigin(calculateOriginQueryHash(), callOrigin, beanType.getName());
     parentNode = new ObjectGraphNode(o, null);
     return parentNode;
   }
diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index e52dda337..5da3fdabf 100644
--- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -32,7 +32,7 @@ import io.ebean.ValuePair;
 import io.ebean.Version;
 import io.ebean.annotation.TxIsolation;
 import io.ebean.bean.BeanCollection;
-import io.ebean.bean.CallStack;
+import io.ebean.bean.CallOrigin;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.bean.ObjectGraphNode;
 import io.ebean.cache.ServerCacheManager;
@@ -168,7 +168,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
   }
 
   @Override
-  public CallStack createCallStack() {
+  public CallOrigin createCallOrigin() {
     return null;
   }
 
diff --git a/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java b/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java
index 6f1a020fd..e12491f64 100644
--- a/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java
+++ b/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java
@@ -21,7 +21,7 @@ public class TestAutoTuneProfiling extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    for (int i = 0; i < 1; i++) {
+    for (int i = 0; i < 10; i++) {
       execute();
     }
     collectUsage();
@@ -35,7 +35,7 @@ public class TestAutoTuneProfiling extends BaseTestCase {
 
     sortOfBusy();
 
-    for (int i = 0; i < 1; i++) {
+    for (int i = 0; i < 10; i++) {
       execute();
     }
   }
diff --git a/src/test/java/org/tests/unitinternal/TestEncodeB64.java b/src/test/java/org/tests/unitinternal/TestEncodeB64.java
new file mode 100644
index 000000000..95124fcad
--- /dev/null
+++ b/src/test/java/org/tests/unitinternal/TestEncodeB64.java
@@ -0,0 +1,29 @@
+package org.tests.unitinternal;
+
+import org.junit.Test;
+
+import static io.ebean.util.EncodeB64.enc;
+import static org.junit.Assert.assertEquals;
+
+public class TestEncodeB64 {
+
+  @Test
+  public void test() {
+
+    assertEquals("A", enc(0));
+    assertEquals("B", enc(1));
+    assertEquals("Z", enc(25));
+    assertEquals("a", enc(26));
+    assertEquals("z", enc(51));
+    assertEquals("0", enc(52));
+    assertEquals("9", enc(61));
+    assertEquals("-", enc(62));
+    assertEquals("_", enc(63));
+    assertEquals("BA", enc(64));
+    assertEquals("Bk", enc(100));
+    assertEquals("B9", enc(125));
+    assertEquals("B-", enc(126));
+    assertEquals("B_", enc(127));
+    assertEquals("CA", enc(128));
+  }
+}
diff --git a/src/test/java/org/tests/unitinternal/TestOriginIntEncoding.java b/src/test/java/org/tests/unitinternal/TestOriginIntEncoding.java
deleted file mode 100644
index 78a6267be..000000000
--- a/src/test/java/org/tests/unitinternal/TestOriginIntEncoding.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.tests.unitinternal;
-
-import io.ebean.BaseTestCase;
-import io.ebean.bean.CallStack;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class TestOriginIntEncoding extends BaseTestCase {
-
-  @Test
-  public void test() {
-
-    Assert.assertEquals("A", CallStack.enc(0));
-    Assert.assertEquals("B", CallStack.enc(1));
-    Assert.assertEquals("Z", CallStack.enc(25));
-    Assert.assertEquals("a", CallStack.enc(26));
-    Assert.assertEquals("z", CallStack.enc(51));
-    Assert.assertEquals("0", CallStack.enc(52));
-    Assert.assertEquals("9", CallStack.enc(61));
-    Assert.assertEquals("-", CallStack.enc(62));
-    Assert.assertEquals("_", CallStack.enc(63));
-    Assert.assertEquals("BA", CallStack.enc(64));
-    Assert.assertEquals("Bk", CallStack.enc(100));
-    Assert.assertEquals("B9", CallStack.enc(125));
-    Assert.assertEquals("B-", CallStack.enc(126));
-    Assert.assertEquals("B_", CallStack.enc(127));
-    Assert.assertEquals("CA", CallStack.enc(128));
-
-  }
-}
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index ccca26091..e1c4edbc6 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -12,6 +12,7 @@
 ebean.encryptKeyManager=org.tests.basic.encrypt.BasicEncyptKeyManager
 
 #ebean.disableL2Cache=true
+#ebean.maxCallStack=1
 #ebean.autoTune.queryTuning=true
 #ebean.autoTune.mode=DEFAULT_ON
 #ebean.autoTune.profiling=true

From 4b5365e708cc4dafc0d7bf44086942da7820bcfe Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 14 Aug 2019 22:52:18 +1200
Subject: [PATCH 1007/1036] #1792 - ENH: Support using Query beans for building
 FetchGroup (in a type safe manor)

---
 src/main/java/io/ebean/FetchGroup.java        |   9 +
 src/main/java/io/ebean/XServiceProvider.java  |   8 +
 .../io/ebean/service/SpiFetchGroupQuery.java  |  15 +
 .../ebean/service/SpiFetchGroupService.java   |   6 +
 .../server/query/DFetchGroupService.java      |   6 +
 .../server/query/DefaultFetchGroupQuery.java  | 580 ++++++++++++++++++
 src/test/java/io/ebean/FetchGroupTest.java    |  23 +
 7 files changed, 647 insertions(+)
 create mode 100644 src/main/java/io/ebean/service/SpiFetchGroupQuery.java
 create mode 100644 src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java

diff --git a/src/main/java/io/ebean/FetchGroup.java b/src/main/java/io/ebean/FetchGroup.java
index 2d45ee4f1..95ea70412 100644
--- a/src/main/java/io/ebean/FetchGroup.java
+++ b/src/main/java/io/ebean/FetchGroup.java
@@ -1,5 +1,7 @@
 package io.ebean;
 
+import io.ebean.service.SpiFetchGroupQuery;
+
 import javax.annotation.Nonnull;
 
 /**
@@ -111,4 +113,11 @@ public interface FetchGroup<T> {
     return XServiceProvider.fetchGroupOf(cls);
   }
 
+  /**
+   * Return a query to be used by query beans for constructing FetchGroup.
+   */
+  static <T> SpiFetchGroupQuery<T> queryFor(Class<T> beanType) {
+    return XServiceProvider.fetchGroupQueryFor(beanType);
+  }
+
 }
diff --git a/src/main/java/io/ebean/XServiceProvider.java b/src/main/java/io/ebean/XServiceProvider.java
index 81976df38..bc6c36d71 100644
--- a/src/main/java/io/ebean/XServiceProvider.java
+++ b/src/main/java/io/ebean/XServiceProvider.java
@@ -1,5 +1,6 @@
 package io.ebean;
 
+import io.ebean.service.SpiFetchGroupQuery;
 import io.ebean.service.SpiFetchGroupService;
 import io.ebean.service.SpiProfileLocationFactory;
 import io.ebean.service.SpiRawSqlService;
@@ -71,4 +72,11 @@ class XServiceProvider {
   static <T> FetchGroupBuilder<T> fetchGroupOf(Class<T> cls) {
     return fetchGroupService.of(cls);
   }
+
+  /**
+   * Return the FetchGroup Query for building fetch groups via query beans.
+   */
+  static <T> SpiFetchGroupQuery<T> fetchGroupQueryFor(Class<T> cls) {
+    return fetchGroupService.queryFor(cls);
+  }
 }
diff --git a/src/main/java/io/ebean/service/SpiFetchGroupQuery.java b/src/main/java/io/ebean/service/SpiFetchGroupQuery.java
new file mode 100644
index 000000000..c620d247a
--- /dev/null
+++ b/src/main/java/io/ebean/service/SpiFetchGroupQuery.java
@@ -0,0 +1,15 @@
+package io.ebean.service;
+
+import io.ebean.FetchGroup;
+import io.ebean.Query;
+
+/**
+ * Extension of Query to build FetchGroup via query beans.
+ */
+public interface SpiFetchGroupQuery<T> extends Query<T> {
+
+  /**
+   * Build the fetch group with select and fetch clauses.
+   */
+  FetchGroup<T> buildFetchGroup();
+}
diff --git a/src/main/java/io/ebean/service/SpiFetchGroupService.java b/src/main/java/io/ebean/service/SpiFetchGroupService.java
index b486d4ae1..e47ac5d63 100644
--- a/src/main/java/io/ebean/service/SpiFetchGroupService.java
+++ b/src/main/java/io/ebean/service/SpiFetchGroupService.java
@@ -23,4 +23,10 @@ public interface SpiFetchGroupService {
    * @return The FetchGroupBuilder to add additional select and fetch clauses
    */
   <T> FetchGroupBuilder<T> of(Class<T> beanType);
+
+  /**
+   * Return a new FetchGroupQuery for building FetchGroup via query beans.
+   */
+  <T> SpiFetchGroupQuery<T> queryFor(Class<T> beanType);
+
 }
diff --git a/src/main/java/io/ebeaninternal/server/query/DFetchGroupService.java b/src/main/java/io/ebeaninternal/server/query/DFetchGroupService.java
index 3dc53a83a..1a31ef613 100644
--- a/src/main/java/io/ebeaninternal/server/query/DFetchGroupService.java
+++ b/src/main/java/io/ebeaninternal/server/query/DFetchGroupService.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.query;
 
 import io.ebean.FetchGroup;
 import io.ebean.FetchGroupBuilder;
+import io.ebean.service.SpiFetchGroupQuery;
 import io.ebean.service.SpiFetchGroupService;
 import io.ebeaninternal.server.querydefn.OrmQueryDetail;
 
@@ -20,6 +21,11 @@ public final class DFetchGroupService implements SpiFetchGroupService {
     return new DFetchGroupBuilder<>();
   }
 
+  @Override
+  public <T> SpiFetchGroupQuery<T> queryFor(Class<T> beanType) {
+    return new DefaultFetchGroupQuery<>();
+  }
+
   private OrmQueryDetail detail(String select) {
     OrmQueryDetail detail = new OrmQueryDetail();
     detail.select(select);
diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java b/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
new file mode 100644
index 000000000..ff0632949
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
@@ -0,0 +1,580 @@
+package io.ebeaninternal.server.query;
+
+import io.ebean.CacheMode;
+import io.ebean.CountDistinctOrder;
+import io.ebean.DtoQuery;
+import io.ebean.Expression;
+import io.ebean.ExpressionFactory;
+import io.ebean.ExpressionList;
+import io.ebean.FetchConfig;
+import io.ebean.FetchGroup;
+import io.ebean.FetchPath;
+import io.ebean.FutureIds;
+import io.ebean.FutureList;
+import io.ebean.FutureRowCount;
+import io.ebean.OrderBy;
+import io.ebean.PagedList;
+import io.ebean.PersistenceContextScope;
+import io.ebean.ProfileLocation;
+import io.ebean.Query;
+import io.ebean.QueryIterator;
+import io.ebean.QueryType;
+import io.ebean.RawSql;
+import io.ebean.Transaction;
+import io.ebean.UpdateQuery;
+import io.ebean.Version;
+import io.ebean.service.SpiFetchGroupQuery;
+import io.ebeaninternal.server.querydefn.OrmQueryDetail;
+import io.ebeaninternal.server.querydefn.SpiFetchGroup;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.sql.Connection;
+import java.sql.Timestamp;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+/**
+ * Implementation of FetchGroup query for use to create FetchGroup via query beans.
+ */
+class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T> {
+
+  private static final FetchConfig FETCH_QUERY = new FetchConfig().query();
+
+  private static final FetchConfig FETCH_LAZY = new FetchConfig().lazy();
+
+  private OrmQueryDetail detail = new OrmQueryDetail();
+
+  @Override
+  public FetchGroup<T> buildFetchGroup() {
+    return new DFetchGroup<>(detail);
+  }
+
+  @Override
+  public Query<T> select(String columns) {
+    detail.select(columns);
+    return this;
+  }
+
+  @Override
+  public Query<T> select(FetchGroup fetchGroup) {
+    this.detail = ((SpiFetchGroup) fetchGroup).detail();
+    return this;
+  }
+
+  @Override
+  public Query<T> fetch(String property) {
+    return fetch(property, null, null);
+  }
+
+  @Override
+  public Query<T> fetchQuery(String property) {
+    return fetch(property, null, FETCH_QUERY);
+  }
+
+  @Override
+  public Query<T> fetchLazy(String property) {
+    return fetch(property, null, FETCH_LAZY);
+  }
+
+  @Override
+  public Query<T> fetch(String property, FetchConfig joinConfig) {
+    return fetch(property, null, joinConfig);
+  }
+
+  @Override
+  public Query<T> fetch(String property, String columns) {
+    return fetch(property, columns, null);
+  }
+
+  @Override
+  public Query<T> fetchQuery(String property, String columns) {
+    return fetch(property, columns, FETCH_QUERY);
+  }
+
+  @Override
+  public Query<T> fetchLazy(String property, String columns) {
+    return fetch(property, columns, FETCH_LAZY);
+  }
+
+  @Override
+  public Query<T> fetch(String property, String columns, FetchConfig config) {
+    detail.fetch(property, columns, config);
+    return this;
+  }
+
+  @Override
+  public Query<T> setProfileId(int profileId) {
+    return this;
+  }
+
+  @Override
+  public Query<T> setProfileLocation(ProfileLocation profileLocation) {
+    return this;
+  }
+
+  @Override
+  public Query<T> setLabel(String label) {
+    return this;
+  }
+
+  // Everything else deemed invalid
+
+  @Override
+  public Query<T> copy() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setRawSql(RawSql rawSql) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> asOf(Timestamp asOf) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> asDraft() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public <D> DtoQuery<D> asDto(Class<D> dtoClass) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public UpdateQuery<T> asUpdate() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public void cancel() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setPersistenceContextScope(PersistenceContextScope scope) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setDocIndexName(String indexName) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public ExpressionFactory getExpressionFactory() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public boolean isAutoTuned() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setAutoTune(boolean autoTune) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setAllowLoadErrors() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setLazyLoadBatchSize(int lazyLoadBatchSize) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setIncludeSoftDeletes() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setDisableReadAuditing() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> apply(FetchPath fetchPath) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> usingTransaction(Transaction transaction) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> usingConnection(Connection connection) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Nonnull
+  @Override
+  public <A> List<A> findIds() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Nonnull
+  @Override
+  public QueryIterator<T> findIterate() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public void findEach(Consumer<T> consumer) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public void findEachWhile(Predicate<T> consumer) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Nonnull
+  @Override
+  public List<T> findList() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Nonnull
+  @Override
+  public Set<T> findSet() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Nonnull
+  @Override
+  public <K> Map<K, T> findMap() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Nonnull
+  @Override
+  public <A> List<A> findSingleAttributeList() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public <A> A findSingleAttribute() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public boolean isCountDistinct() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public boolean exists() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Nullable
+  @Override
+  public T findOne() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Nonnull
+  @Override
+  public Optional<T> findOneOrEmpty() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Nonnull
+  @Override
+  public List<Version<T>> findVersions() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Nonnull
+  @Override
+  public List<Version<T>> findVersionsBetween(Timestamp start, Timestamp end) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public int delete() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public int delete(Transaction transaction) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public int update() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public int update(Transaction transaction) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public int findCount() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Nonnull
+  @Override
+  public FutureRowCount<T> findFutureCount() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Nonnull
+  @Override
+  public FutureIds<T> findFutureIds() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Nonnull
+  @Override
+  public FutureList<T> findFutureList() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Nonnull
+  @Override
+  public PagedList<T> findPagedList() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setParameter(String name, Object value) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setParameter(int position, Object value) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setId(Object id) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Object getId() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> where(Expression expression) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public ExpressionList<T> where() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public ExpressionList<T> text() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public ExpressionList<T> filterMany(String propertyName) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public ExpressionList<T> having() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> having(Expression addExpressionToHaving) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> orderBy(String orderByClause) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> order(String orderByClause) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public OrderBy<T> order() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public OrderBy<T> orderBy() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setOrder(OrderBy<T> orderBy) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setOrderBy(OrderBy<T> orderBy) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setDistinct(boolean isDistinct) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setCountDistinct(CountDistinctOrder orderBy) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public int getFirstRow() {
+    return 0;
+  }
+
+  @Override
+  public Query<T> setFirstRow(int firstRow) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public int getMaxRows() {
+    return 0;
+  }
+
+  @Override
+  public Query<T> setMaxRows(int maxRows) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setMapKey(String mapKey) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setBeanCacheMode(CacheMode beanCacheMode) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setUseQueryCache(CacheMode queryCacheMode) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setUseDocStore(boolean useDocStore) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setReadOnly(boolean readOnly) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setLoadBeanCache(boolean loadBeanCache) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setTimeout(int secs) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setBufferFetchSizeHint(int fetchSize) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public String getGeneratedSql() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> forUpdate() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> forUpdateNoWait() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> forUpdateSkipLocked() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public boolean isForUpdate() {
+    return false;
+  }
+
+  @Override
+  public ForUpdate getForUpdateMode() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> alias(String alias) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setBaseTable(String baseTable) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Class<T> getBeanType() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setInheritType(Class<? extends T> type) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Class<? extends T> getInheritType() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public QueryType getQueryType() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> setDisableLazyLoading(boolean disableLazyLoading) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Set<String> validate() {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+
+  @Override
+  public Query<T> orderById(boolean orderById) {
+    throw new RuntimeException("Not allowed on fetch group query ");
+  }
+}
diff --git a/src/test/java/io/ebean/FetchGroupTest.java b/src/test/java/io/ebean/FetchGroupTest.java
index 148cc7230..8d0fd9c53 100644
--- a/src/test/java/io/ebean/FetchGroupTest.java
+++ b/src/test/java/io/ebean/FetchGroupTest.java
@@ -1,5 +1,6 @@
 package io.ebean;
 
+import io.ebean.service.SpiFetchGroupQuery;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.model.basic.Address;
@@ -112,4 +113,26 @@ public class FetchGroupTest extends BaseTestCase {
     assertThat(sql.get(0)).contains("select t0.id, t0.name, t0.version, t1.id, t1.line_1, t1.line_2, t1.city, t2.code, t2.name from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id  left join o_country t2 on t2.code = t1.country_code ");
   }
 
+  @Test
+  public void fetchGroupQuery() {
+
+    // in practice this query is used by query beans for type safe FetchGroup construction
+    final SpiFetchGroupQuery<Customer> query = FetchGroup.queryFor(Customer.class);
+    query.select("name");
+
+    final FetchGroup<Customer> fetchGroup = query.buildFetchGroup();
+
+    LoggedSqlCollector.start();
+
+    Customer.find
+      .query()
+      .where()
+      .ilike("name", "rob")
+      .select(fetchGroup)
+      .findList();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(trimSql(sql.get(0))).contains("select t0.id, t0.name from o_customer t0 where");
+  }
 }

From 06542b031e2723e8bf644f6fbe7f49fbd3739396 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 15 Aug 2019 20:21:01 +1200
Subject: [PATCH 1008/1036] Initial refactor to extract EqlWhereListener

---
 .../server/grammer/EqlAdapter.java            | 294 +------------
 .../server/grammer/EqlAdapterHelper.java      | 148 -------
 .../server/grammer/EqlParser.java             |  21 +-
 .../server/grammer/EqlValueType.java          |   8 +
 .../server/grammer/EqlWhereAdapter.java       |  30 ++
 .../server/grammer/EqlWhereListener.java      | 407 ++++++++++++++++++
 .../server/grammer/EqlParserTest.java         |  30 +-
 7 files changed, 503 insertions(+), 435 deletions(-)
 delete mode 100644 src/main/java/io/ebeaninternal/server/grammer/EqlAdapterHelper.java
 create mode 100644 src/main/java/io/ebeaninternal/server/grammer/EqlValueType.java
 create mode 100644 src/main/java/io/ebeaninternal/server/grammer/EqlWhereAdapter.java
 create mode 100644 src/main/java/io/ebeaninternal/server/grammer/EqlWhereListener.java

diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java
index 397bd7d6a..503f4dc81 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java
@@ -1,25 +1,15 @@
 package io.ebeaninternal.server.grammer;
 
-import io.ebean.Expression;
+import io.ebean.ExpressionFactory;
 import io.ebean.ExpressionList;
 import io.ebean.FetchConfig;
-import io.ebean.LikeType;
 import io.ebean.OrderBy;
 import io.ebeaninternal.api.SpiQuery;
-import io.ebeaninternal.server.grammer.antlr.EQLBaseListener;
-import io.ebeaninternal.server.grammer.antlr.EQLLexer;
 import io.ebeaninternal.server.grammer.antlr.EQLParser;
 import io.ebeaninternal.server.util.ArrayStack;
-import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ParseTree;
-import org.antlr.v4.runtime.tree.TerminalNode;
 
-import java.util.ArrayList;
-import java.util.List;
-
-class EqlAdapter<T> extends EQLBaseListener {
-
-  private static final OperatorMapping operatorMapping = new OperatorMapping();
+class EqlAdapter<T> extends EqlWhereListener<T> {
 
   private static final String DISTINCT = "distinct";
 
@@ -29,27 +19,28 @@ class EqlAdapter<T> extends EQLBaseListener {
 
   private final SpiQuery<T> query;
 
-  private final EqlAdapterHelper helper;
+  private final ExpressionFactory expressionFactory;
 
-  private ArrayStack<ExpressionList<T>> textStack;
-
-  private ArrayStack<ExpressionList<T>> whereStack;
-
-  private boolean textMode;
-
-  private List<Object> inValues;
-
-  private String inPropertyName;
-
-  public EqlAdapter(SpiQuery<T> query) {
+  EqlAdapter(SpiQuery<T> query) {
     this.query = query;
-    this.helper = new EqlAdapterHelper(this);
+    this.expressionFactory = query.getExpressionFactory();
+  }
+
+  @Override
+  ExpressionFactory expressionFactory() {
+    return expressionFactory;
+  }
+
+  @Override
+  Object namedParam(String parameterName) {
+    return query.createNamedParameter(parameterName);
   }
 
   /**
    * Return the current expression list that expressions should be added to.
    */
-  protected ExpressionList<T> peekExprList() {
+  @Override
+  ExpressionList<T> peekExprList() {
 
     if (textMode) {
       // return the current text expression list
@@ -74,28 +65,6 @@ class EqlAdapter<T> extends EQLBaseListener {
     return textStack.peek();
   }
 
-  /**
-   * Push the expression list onto the appropriate stack.
-   */
-  private void pushExprList(ExpressionList<T> list) {
-    if (textMode) {
-      textStack.push(list);
-    } else {
-      whereStack.push(list);
-    }
-  }
-
-  /**
-   * End a list of expressions added by 'OR'.
-   */
-  private void popJunction() {
-    if (textMode) {
-      textStack.pop();
-    } else {
-      whereStack.pop();
-    }
-  }
-
   @Override
   public void enterSelect_clause(EQLParser.Select_clauseContext ctx) {
 
@@ -199,233 +168,4 @@ class EqlAdapter<T> extends EQLBaseListener {
     }
   }
 
-  private String getLeftHandSidePath(ParserRuleContext ctx) {
-    TerminalNode pathToken = ctx.getToken(EQLLexer.PATH_VARIABLE, 0);
-    return pathToken.getText();
-  }
-
-  @Override
-  public void enterInrange_expression(EQLParser.Inrange_expressionContext ctx) {
-    checkChildren(ctx, 5);
-    String path = getLeftHandSidePath(ctx);
-    EqlOperator op = getOperator(ctx);
-    if (op != EqlOperator.INRANGE) {
-      throw new IllegalStateException("Expecting INRANGE operator but got " + op);
-    }
-    helper.addInRange(path, child(ctx, 2), child(ctx, 4));
-  }
-
-  @Override
-  public void enterBetween_expression(EQLParser.Between_expressionContext ctx) {
-
-    checkChildren(ctx, 5);
-    String path = getLeftHandSidePath(ctx);
-    EqlOperator op = getOperator(ctx);
-    if (op != EqlOperator.BETWEEN) {
-      throw new IllegalStateException("Expecting BETWEEN operator but got " + op);
-    }
-    helper.addBetween(path, child(ctx, 2), child(ctx, 4));
-  }
-
-  @Override
-  public void enterPropertyBetween_expression(EQLParser.PropertyBetween_expressionContext ctx) {
-    checkChildren(ctx, 5);
-    String rawValue = child(ctx, 0);
-    EqlOperator op = getOperator(ctx);
-    if (op != EqlOperator.BETWEEN) {
-      throw new IllegalStateException("Expecting BETWEEN operator but got " + op);
-    }
-    helper.addBetweenProperty(rawValue, child(ctx, 2), child(ctx, 4));
-  }
-
-  @Override
-  public void enterIn_expression(EQLParser.In_expressionContext ctx) {
-    this.inValues = new ArrayList<>();
-    this.inPropertyName = getLeftHandSidePath(ctx);
-  }
-
-  @Override
-  public void enterIn_value(EQLParser.In_valueContext ctx) {
-    int childCount = ctx.getChildCount();
-    for (int i = 0; i < childCount; i++) {
-      String text = child(ctx, i);
-      if (isValue(text)) {
-        inValues.add(helper.bind(text));
-      }
-    }
-  }
-
-  private String child(ParserRuleContext ctx, int position) {
-    ParseTree child = ctx.getChild(position);
-    return child.getText();
-  }
-
-  private boolean isValue(String text) {
-    return text.length() != 1 || (!text.equals("(") && !text.equals(")") && !text.equals(","));
-  }
-
-  @Override
-  public void exitIn_expression(EQLParser.In_expressionContext ctx) {
-    helper.addIn(inPropertyName, inValues);
-  }
-
-  @Override
-  public void enterIsNull_expression(EQLParser.IsNull_expressionContext ctx) {
-    String path = getLeftHandSidePath(ctx);
-    peekExprList().isNull(path);
-  }
-
-  @Override
-  public void enterIsNotNull_expression(EQLParser.IsNotNull_expressionContext ctx) {
-    String path = getLeftHandSidePath(ctx);
-    peekExprList().isNotNull(path);
-  }
-
-  @Override
-  public void enterIsEmpty_expression(EQLParser.IsEmpty_expressionContext ctx) {
-    String path = getLeftHandSidePath(ctx);
-    peekExprList().isEmpty(path);
-  }
-
-  @Override
-  public void enterIsNotEmpty_expression(EQLParser.IsNotEmpty_expressionContext ctx) {
-    String path = getLeftHandSidePath(ctx);
-    peekExprList().isNotEmpty(path);
-  }
-
-  @Override
-  public void enterLike_expression(EQLParser.Like_expressionContext ctx) {
-    addExpression(ctx);
-  }
-
-  @Override
-  public void enterComparison_expression(EQLParser.Comparison_expressionContext ctx) {
-    addExpression(ctx);
-  }
-
-  private void addExpression(ParserRuleContext ctx) {
-    int childCount = ctx.getChildCount();
-    if (childCount < 3) {
-      throw new IllegalStateException("expecting 3 children for comparison? " + ctx);
-    }
-    String operator = child(ctx, 1);
-    EqlOperator op = operatorMapping.get(operator);
-    if (op == null) {
-      throw new IllegalStateException("No operator found for " + operator);
-    }
-    String path = getLeftHandSidePath(ctx);
-    String rhs = child(ctx, 2);
-    if (path.equals(rhs)) {
-      // the 'value operator path' form
-      // invert the operator and use LHS as RHS
-      op = invert(op);
-      rhs = child(ctx, 0);
-    }
-
-    // RHS is Path, Literal or Named input parameter
-    helper.addExpression(path, op, rhs);
-  }
-
-  private EqlOperator invert(EqlOperator op) {
-    switch (op) {
-      // no change
-      case EQ:
-        return EqlOperator.EQ;
-      case IEQ:
-        return EqlOperator.IEQ;
-      case INE:
-        return EqlOperator.INE;
-      case NE:
-        return EqlOperator.NE;
-      // invert
-      case LT:
-        return EqlOperator.GT;
-      case LTE:
-        return EqlOperator.GTE;
-      case GT:
-        return EqlOperator.LT;
-      case GTE:
-        return EqlOperator.LTE;
-      default:
-        throw new IllegalStateException("Can not invert operator " + op);
-    }
-  }
-
-
-  @Override
-  public void enterConditional_term(EQLParser.Conditional_termContext ctx) {
-    int childCount = ctx.getChildCount();
-    if (childCount > 1) {
-      pushExprList(peekExprList().and());
-    }
-  }
-
-  @Override
-  public void exitConditional_term(EQLParser.Conditional_termContext ctx) {
-    if (ctx.getChildCount() > 1) {
-      popJunction();
-    }
-  }
-
-  @Override
-  public void enterConditional_expression(EQLParser.Conditional_expressionContext ctx) {
-    if (ctx.getChildCount() > 1) {
-      pushExprList(peekExprList().or());
-    }
-  }
-
-  @Override
-  public void exitConditional_expression(EQLParser.Conditional_expressionContext ctx) {
-    if (ctx.getChildCount() > 1) {
-      popJunction();
-    }
-  }
-
-  @Override
-  public void enterConditional_factor(EQLParser.Conditional_factorContext ctx) {
-    if (ctx.getChildCount() > 1) {
-      pushExprList(peekExprList().not());
-    }
-  }
-
-  @Override
-  public void exitConditional_factor(EQLParser.Conditional_factorContext ctx) {
-    if (ctx.getChildCount() > 1) {
-      popJunction();
-    }
-  }
-
-  private EqlOperator getOperator(ParserRuleContext ctx) {
-    String operator = child(ctx, 1);
-    EqlOperator op = operatorMapping.get(operator);
-    if (op == null) {
-      throw new IllegalStateException("No operator found for " + operator);
-    }
-    return op;
-  }
-
-  /**
-   * Check for the minimum number of children.
-   */
-  private void checkChildren(ParserRuleContext ctx, int min) {
-    if (ctx.getChildCount() < min) {
-      throw new IllegalStateException("expecting " + min + " children for comparison but got " + ctx.getChildCount());
-    }
-  }
-
-  public Object namedParam(String parameterName) {
-    return query.createNamedParameter(parameterName);
-  }
-
-  public Expression like(boolean caseInsensitive, LikeType likeType, String property, Object bindValue) {
-    return query.getExpressionFactory().like(property, bindValue, caseInsensitive, likeType);
-  }
-
-  public Expression ieq(String property, Object bindValue) {
-    return query.getExpressionFactory().ieqObject(property, bindValue);
-  }
-
-  public Expression ine(String property, Object bindValue) {
-    return query.getExpressionFactory().ineObject(property, bindValue);
-  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlAdapterHelper.java b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapterHelper.java
deleted file mode 100644
index 70b9355ab..000000000
--- a/src/main/java/io/ebeaninternal/server/grammer/EqlAdapterHelper.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package io.ebeaninternal.server.grammer;
-
-import io.ebean.ExpressionList;
-import io.ebean.LikeType;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-class EqlAdapterHelper {
-
-  private final EqlAdapter<?> owner;
-
-  public EqlAdapterHelper(EqlAdapter<?> owner) {
-    this.owner = owner;
-  }
-
-  enum ValueType {
-    NAMED_PARAM,
-    STRING,
-    BOOL,
-    NUMBER
-  }
-
-  private ValueType getValueType(String valueAsText) {
-
-    char firstChar = Character.toLowerCase(valueAsText.charAt(0));
-    switch (firstChar) {
-      case ':':
-        return ValueType.NAMED_PARAM;
-      case 't':
-        return ValueType.BOOL;
-      case 'f':
-        return ValueType.BOOL;
-      case '\'':
-        return ValueType.STRING;
-      default:
-        if (Character.isDigit(firstChar)) {
-          return ValueType.NUMBER;
-        }
-        throw new IllegalArgumentException("Unexpected first character in value [" + valueAsText + "]");
-    }
-  }
-
-  protected void addBetweenProperty(String rawValue, String lowProperty, String highProperty) {
-    peekExprList().betweenProperties(lowProperty, highProperty, bind(rawValue));
-  }
-
-  protected void addBetween(String path, String value1, String value2) {
-    peekExprList().between(path, bind(value1), bind(value2));
-  }
-
-  protected void addInRange(String path, String value1, String value2) {
-    peekExprList().inRange(path, bind(value1), bind(value2));
-  }
-
-  protected void addIn(String path, List<Object> inValues) {
-    peekExprList().in(path, inValues);
-  }
-
-  protected void addExpression(String path, EqlOperator op, String value) {
-
-    switch (op) {
-      case EQ:
-        peekExprList().eq(path, bind(value));
-        break;
-      case IEQ:
-        peekExprList().add(owner.ieq(path, bind(value)));
-        break;
-      case NE:
-        peekExprList().ne(path, bind(value));
-        break;
-      case INE:
-        peekExprList().add(owner.ine(path, bind(value)));
-        break;
-      case GT:
-        peekExprList().gt(path, bind(value));
-        break;
-      case LT:
-        peekExprList().lt(path, bind(value));
-        break;
-      case GTE:
-        peekExprList().ge(path, bind(value));
-        break;
-      case LTE:
-        peekExprList().le(path, bind(value));
-        break;
-      case LIKE:
-        addLike(false, LikeType.RAW, path, bind(value));
-        break;
-      case CONTAINS:
-        addLike(false, LikeType.CONTAINS, path, bind(value));
-        break;
-      case STARTS_WITH:
-        addLike(false, LikeType.STARTS_WITH, path, bind(value));
-        break;
-      case ENDS_WITH:
-        addLike(false, LikeType.ENDS_WITH, path, bind(value));
-        break;
-      case ILIKE:
-        addLike(true, LikeType.RAW, path, bind(value));
-        break;
-      case ICONTAINS:
-        addLike(true, LikeType.CONTAINS, path, bind(value));
-        break;
-      case ISTARTS_WITH:
-        addLike(true, LikeType.STARTS_WITH, path, bind(value));
-        break;
-      case IENDS_WITH:
-        addLike(true, LikeType.ENDS_WITH, path, bind(value));
-        break;
-      default:
-        throw new IllegalStateException("Unhandled operator " + op);
-    }
-
-  }
-
-  private void addLike(boolean caseInsensitive, LikeType likeType, String path, Object bindValue) {
-    peekExprList().add(owner.like(caseInsensitive, likeType, path, bindValue));
-  }
-
-  protected Object bind(String value) {
-    ValueType valueType = getValueType(value);
-    return getBindValue(valueType, value);
-  }
-
-  private ExpressionList<?> peekExprList() {
-    return owner.peekExprList();
-  }
-
-  private Object getBindValue(ValueType valueType, String value) {
-    switch (valueType) {
-      case BOOL:
-        return Boolean.parseBoolean(value);
-      case NUMBER:
-        return new BigDecimal(value);
-      case STRING:
-        return unquote(value);
-      case NAMED_PARAM:
-        return owner.namedParam(value.substring(1));
-      default:
-        throw new IllegalArgumentException("Unhandled valueType " + valueType);
-    }
-  }
-
-  private String unquote(String value) {
-    return value.substring(1, value.length() - 1);
-  }
-}
diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlParser.java b/src/main/java/io/ebeaninternal/server/grammer/EqlParser.java
index b65b8ada5..949c3442c 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/EqlParser.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlParser.java
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.grammer;
 
+import io.ebean.ExpressionFactory;
+import io.ebean.ExpressionList;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.grammer.antlr.EQLLexer;
 import io.ebeaninternal.server.grammer.antlr.EQLParser;
@@ -22,20 +24,21 @@ public class EqlParser {
    */
   public static <T> void parse(String raw, SpiQuery<T> query) {
 
-    EQLLexer lexer = new EQLLexer(CharStreams.fromString(raw));
-    CommonTokenStream tokens = new CommonTokenStream(lexer);
-    EQLParser parser = new EQLParser(tokens);
+    EQLParser parser = new EQLParser(new CommonTokenStream(new EQLLexer(CharStreams.fromString(raw))));
     parser.addErrorListener(errorListener);
-    EQLParser.Select_statementContext context = parser.select_statement();
-
-    EqlAdapter<T> adapter = new EqlAdapter<>(query);
-
-    ParseTreeWalker walker = new ParseTreeWalker();
-    walker.walk(adapter, context);
 
+    new ParseTreeWalker().walk(new EqlAdapter<>(query), parser.select_statement());
     query.simplifyExpressions();
   }
 
+  public static <T> void parseWhere(String raw, ExpressionList<T> where, ExpressionFactory expr, Object[] params) {
+
+    EQLParser parser = new EQLParser(new CommonTokenStream(new EQLLexer(CharStreams.fromString(raw))));
+    parser.addErrorListener(errorListener);
+
+    new ParseTreeWalker().walk(new EqlWhereAdapter<>(where, expr), parser.conditional_expression());
+  }
+
   static class ErrorListener extends BaseErrorListener {
 
     @Override
diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlValueType.java b/src/main/java/io/ebeaninternal/server/grammer/EqlValueType.java
new file mode 100644
index 000000000..a1156796c
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlValueType.java
@@ -0,0 +1,8 @@
+package io.ebeaninternal.server.grammer;
+
+enum EqlValueType {
+  NAMED_PARAM,
+  STRING,
+  BOOL,
+  NUMBER
+}
diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlWhereAdapter.java b/src/main/java/io/ebeaninternal/server/grammer/EqlWhereAdapter.java
new file mode 100644
index 000000000..47ccf6a46
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlWhereAdapter.java
@@ -0,0 +1,30 @@
+package io.ebeaninternal.server.grammer;
+
+import io.ebean.ExpressionFactory;
+import io.ebean.ExpressionList;
+
+class EqlWhereAdapter<T> extends EqlWhereListener<T> {
+
+  private final ExpressionList<T> where;
+  private final ExpressionFactory expr;
+
+  EqlWhereAdapter(ExpressionList<T> where, ExpressionFactory expr) {
+    this.where = where;
+    this.expr = expr;
+  }
+
+  @Override
+  ExpressionList<T> peekExprList() {
+    return where;
+  }
+
+  @Override
+  ExpressionFactory expressionFactory() {
+    return expr;
+  }
+
+  @Override
+  Object namedParam(String substring) {
+    return null;
+  }
+}
diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlWhereListener.java b/src/main/java/io/ebeaninternal/server/grammer/EqlWhereListener.java
new file mode 100644
index 000000000..0e2f5015f
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlWhereListener.java
@@ -0,0 +1,407 @@
+package io.ebeaninternal.server.grammer;
+
+import io.ebean.Expression;
+import io.ebean.ExpressionFactory;
+import io.ebean.ExpressionList;
+import io.ebean.LikeType;
+import io.ebeaninternal.server.grammer.antlr.EQLBaseListener;
+import io.ebeaninternal.server.grammer.antlr.EQLLexer;
+import io.ebeaninternal.server.grammer.antlr.EQLParser;
+import io.ebeaninternal.server.util.ArrayStack;
+import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.antlr.v4.runtime.tree.TerminalNode;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+abstract class EqlWhereListener<T> extends EQLBaseListener {
+
+  private static final OperatorMapping operatorMapping = new OperatorMapping();
+
+  ArrayStack<ExpressionList<T>> textStack;
+
+  ArrayStack<ExpressionList<T>> whereStack;
+
+  boolean textMode;
+
+  private List<Object> inValues;
+
+  private String inPropertyName;
+
+  /**
+   * Return the current expression list that expressions should be added to.
+   */
+  abstract ExpressionList<T> peekExprList();
+
+  abstract ExpressionFactory expressionFactory();
+
+  abstract Object namedParam(String substring);
+
+  /**
+   * Push the expression list onto the appropriate stack.
+   */
+  private void pushExprList(ExpressionList<T> list) {
+    if (textMode) {
+      textStack.push(list);
+    } else {
+      whereStack.push(list);
+    }
+  }
+
+  /**
+   * End a list of expressions added by 'OR'.
+   */
+  private void popJunction() {
+    if (textMode) {
+      textStack.pop();
+    } else {
+      whereStack.pop();
+    }
+  }
+
+  private String getLeftHandSidePath(ParserRuleContext ctx) {
+    TerminalNode pathToken = ctx.getToken(EQLLexer.PATH_VARIABLE, 0);
+    return pathToken.getText();
+  }
+
+  @Override
+  public void enterInrange_expression(EQLParser.Inrange_expressionContext ctx) {
+    checkChildren(ctx, 5);
+    String path = getLeftHandSidePath(ctx);
+    EqlOperator op = getOperator(ctx);
+    if (op != EqlOperator.INRANGE) {
+      throw new IllegalStateException("Expecting INRANGE operator but got " + op);
+    }
+    addInRange(path, child(ctx, 2), child(ctx, 4));
+  }
+
+  @Override
+  public void enterBetween_expression(EQLParser.Between_expressionContext ctx) {
+
+    checkChildren(ctx, 5);
+    String path = getLeftHandSidePath(ctx);
+    EqlOperator op = getOperator(ctx);
+    if (op != EqlOperator.BETWEEN) {
+      throw new IllegalStateException("Expecting BETWEEN operator but got " + op);
+    }
+    addBetween(path, child(ctx, 2), child(ctx, 4));
+  }
+
+  @Override
+  public void enterPropertyBetween_expression(EQLParser.PropertyBetween_expressionContext ctx) {
+    checkChildren(ctx, 5);
+    String rawValue = child(ctx, 0);
+    EqlOperator op = getOperator(ctx);
+    if (op != EqlOperator.BETWEEN) {
+      throw new IllegalStateException("Expecting BETWEEN operator but got " + op);
+    }
+    addBetweenProperty(rawValue, child(ctx, 2), child(ctx, 4));
+  }
+
+  @Override
+  public void enterIn_expression(EQLParser.In_expressionContext ctx) {
+    this.inValues = new ArrayList<>();
+    this.inPropertyName = getLeftHandSidePath(ctx);
+  }
+
+  @Override
+  public void enterIn_value(EQLParser.In_valueContext ctx) {
+    int childCount = ctx.getChildCount();
+    for (int i = 0; i < childCount; i++) {
+      String text = child(ctx, i);
+      if (isValue(text)) {
+        inValues.add(bind(text));
+      }
+    }
+  }
+
+  String child(ParserRuleContext ctx, int position) {
+    ParseTree child = ctx.getChild(position);
+    return child.getText();
+  }
+
+  private boolean isValue(String text) {
+    return text.length() != 1 || (!text.equals("(") && !text.equals(")") && !text.equals(","));
+  }
+
+  @Override
+  public void exitIn_expression(EQLParser.In_expressionContext ctx) {
+    addIn(inPropertyName, inValues);
+  }
+
+  @Override
+  public void enterIsNull_expression(EQLParser.IsNull_expressionContext ctx) {
+    String path = getLeftHandSidePath(ctx);
+    peekExprList().isNull(path);
+  }
+
+  @Override
+  public void enterIsNotNull_expression(EQLParser.IsNotNull_expressionContext ctx) {
+    String path = getLeftHandSidePath(ctx);
+    peekExprList().isNotNull(path);
+  }
+
+  @Override
+  public void enterIsEmpty_expression(EQLParser.IsEmpty_expressionContext ctx) {
+    String path = getLeftHandSidePath(ctx);
+    peekExprList().isEmpty(path);
+  }
+
+  @Override
+  public void enterIsNotEmpty_expression(EQLParser.IsNotEmpty_expressionContext ctx) {
+    String path = getLeftHandSidePath(ctx);
+    peekExprList().isNotEmpty(path);
+  }
+
+  @Override
+  public void enterLike_expression(EQLParser.Like_expressionContext ctx) {
+    addExpression(ctx);
+  }
+
+  @Override
+  public void enterComparison_expression(EQLParser.Comparison_expressionContext ctx) {
+    addExpression(ctx);
+  }
+
+  private void addExpression(ParserRuleContext ctx) {
+    int childCount = ctx.getChildCount();
+    if (childCount < 3) {
+      throw new IllegalStateException("expecting 3 children for comparison? " + ctx);
+    }
+    String operator = child(ctx, 1);
+    EqlOperator op = operatorMapping.get(operator);
+    if (op == null) {
+      throw new IllegalStateException("No operator found for " + operator);
+    }
+    String path = getLeftHandSidePath(ctx);
+    String rhs = child(ctx, 2);
+    if (path.equals(rhs)) {
+      // the 'value operator path' form
+      // invert the operator and use LHS as RHS
+      op = invert(op);
+      rhs = child(ctx, 0);
+    }
+
+    // RHS is Path, Literal or Named input parameter
+    addExpression(path, op, rhs);
+  }
+
+  private EqlOperator invert(EqlOperator op) {
+    switch (op) {
+      // no change
+      case EQ:
+        return EqlOperator.EQ;
+      case IEQ:
+        return EqlOperator.IEQ;
+      case INE:
+        return EqlOperator.INE;
+      case NE:
+        return EqlOperator.NE;
+      // invert
+      case LT:
+        return EqlOperator.GT;
+      case LTE:
+        return EqlOperator.GTE;
+      case GT:
+        return EqlOperator.LT;
+      case GTE:
+        return EqlOperator.LTE;
+      default:
+        throw new IllegalStateException("Can not invert operator " + op);
+    }
+  }
+
+  @Override
+  public void enterConditional_term(EQLParser.Conditional_termContext ctx) {
+    int childCount = ctx.getChildCount();
+    if (childCount > 1) {
+      pushExprList(peekExprList().and());
+    }
+  }
+
+  @Override
+  public void exitConditional_term(EQLParser.Conditional_termContext ctx) {
+    if (ctx.getChildCount() > 1) {
+      popJunction();
+    }
+  }
+
+  @Override
+  public void enterConditional_expression(EQLParser.Conditional_expressionContext ctx) {
+    if (ctx.getChildCount() > 1) {
+      pushExprList(peekExprList().or());
+    }
+  }
+
+  @Override
+  public void exitConditional_expression(EQLParser.Conditional_expressionContext ctx) {
+    if (ctx.getChildCount() > 1) {
+      popJunction();
+    }
+  }
+
+  @Override
+  public void enterConditional_factor(EQLParser.Conditional_factorContext ctx) {
+    if (ctx.getChildCount() > 1) {
+      pushExprList(peekExprList().not());
+    }
+  }
+
+  @Override
+  public void exitConditional_factor(EQLParser.Conditional_factorContext ctx) {
+    if (ctx.getChildCount() > 1) {
+      popJunction();
+    }
+  }
+
+  private EqlOperator getOperator(ParserRuleContext ctx) {
+    String operator = child(ctx, 1);
+    EqlOperator op = operatorMapping.get(operator);
+    if (op == null) {
+      throw new IllegalStateException("No operator found for " + operator);
+    }
+    return op;
+  }
+
+  /**
+   * Check for the minimum number of children.
+   */
+  void checkChildren(ParserRuleContext ctx, int min) {
+    if (ctx.getChildCount() < min) {
+      throw new IllegalStateException("expecting " + min + " children for comparison but got " + ctx.getChildCount());
+    }
+  }
+
+  private Expression like(boolean caseInsensitive, LikeType likeType, String property, Object bindValue) {
+    return expressionFactory().like(property, bindValue, caseInsensitive, likeType);
+  }
+
+  private Expression ieq(String property, Object bindValue) {
+    return expressionFactory().ieqObject(property, bindValue);
+  }
+
+  private Expression ine(String property, Object bindValue) {
+    return expressionFactory().ineObject(property, bindValue);
+  }
+
+  private EqlValueType getValueType(String valueAsText) {
+
+    char firstChar = Character.toLowerCase(valueAsText.charAt(0));
+    switch (firstChar) {
+      case ':':
+        return EqlValueType.NAMED_PARAM;
+      case 't':
+        return EqlValueType.BOOL;
+      case 'f':
+        return EqlValueType.BOOL;
+      case '\'':
+        return EqlValueType.STRING;
+      default:
+        if (Character.isDigit(firstChar)) {
+          return EqlValueType.NUMBER;
+        }
+        throw new IllegalArgumentException("Unexpected first character in value [" + valueAsText + "]");
+    }
+  }
+
+  private void addBetweenProperty(String rawValue, String lowProperty, String highProperty) {
+    peekExprList().betweenProperties(lowProperty, highProperty, bind(rawValue));
+  }
+
+  private void addBetween(String path, String value1, String value2) {
+    peekExprList().between(path, bind(value1), bind(value2));
+  }
+
+  private void addInRange(String path, String value1, String value2) {
+    peekExprList().inRange(path, bind(value1), bind(value2));
+  }
+
+  private void addIn(String path, List<Object> inValues) {
+    peekExprList().in(path, inValues);
+  }
+
+  private void addExpression(String path, EqlOperator op, String value) {
+
+    switch (op) {
+      case EQ:
+        peekExprList().eq(path, bind(value));
+        break;
+      case IEQ:
+        peekExprList().add(ieq(path, bind(value)));
+        break;
+      case NE:
+        peekExprList().ne(path, bind(value));
+        break;
+      case INE:
+        peekExprList().add(ine(path, bind(value)));
+        break;
+      case GT:
+        peekExprList().gt(path, bind(value));
+        break;
+      case LT:
+        peekExprList().lt(path, bind(value));
+        break;
+      case GTE:
+        peekExprList().ge(path, bind(value));
+        break;
+      case LTE:
+        peekExprList().le(path, bind(value));
+        break;
+      case LIKE:
+        addLike(false, LikeType.RAW, path, bind(value));
+        break;
+      case CONTAINS:
+        addLike(false, LikeType.CONTAINS, path, bind(value));
+        break;
+      case STARTS_WITH:
+        addLike(false, LikeType.STARTS_WITH, path, bind(value));
+        break;
+      case ENDS_WITH:
+        addLike(false, LikeType.ENDS_WITH, path, bind(value));
+        break;
+      case ILIKE:
+        addLike(true, LikeType.RAW, path, bind(value));
+        break;
+      case ICONTAINS:
+        addLike(true, LikeType.CONTAINS, path, bind(value));
+        break;
+      case ISTARTS_WITH:
+        addLike(true, LikeType.STARTS_WITH, path, bind(value));
+        break;
+      case IENDS_WITH:
+        addLike(true, LikeType.ENDS_WITH, path, bind(value));
+        break;
+      default:
+        throw new IllegalStateException("Unhandled operator " + op);
+    }
+  }
+
+  private void addLike(boolean caseInsensitive, LikeType likeType, String path, Object bindValue) {
+    peekExprList().add(like(caseInsensitive, likeType, path, bindValue));
+  }
+
+  private Object bind(String value) {
+    return getBindValue(getValueType(value), value);
+  }
+
+  private Object getBindValue(EqlValueType valueType, String value) {
+    switch (valueType) {
+      case BOOL:
+        return Boolean.parseBoolean(value);
+      case NUMBER:
+        return new BigDecimal(value);
+      case STRING:
+        return unquote(value);
+      case NAMED_PARAM:
+        return namedParam(value.substring(1));
+      default:
+        throw new IllegalArgumentException("Unhandled valueType " + valueType);
+    }
+  }
+
+  private String unquote(String value) {
+    return value.substring(1, value.length() - 1);
+  }
+}
diff --git a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
index 43f79b915..9d0bf98e2 100644
--- a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.grammer;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.Query;
 import io.ebean.annotation.ForPlatform;
@@ -675,9 +676,36 @@ public class EqlParserTest extends BaseTestCase {
 
   private Query<Customer> parse(String raw) {
 
-    Query<Customer> query = Ebean.find(Customer.class);
+    Query<Customer> query = DB.find(Customer.class);
     EqlParser.parse(raw, (SpiQuery<?>) query);
     return query;
   }
 
+  @Test
+  public void where_simple() {
+
+    final Query<Customer> query = where("name isNotNull");
+    query.findList();
+    if (isH2()) {
+      assertThat(query.getGeneratedSql()).contains(" from o_customer t0 where t0.name is not null");
+    }
+  }
+
+//  @Test
+//  public void where_withParams() {
+//
+//    final Query<Customer> query = where("name = ? and smallnote istartsWith ?", "Rob", "Foo");
+//    query.findList();
+//    if (isH2()) {
+//      assertThat(query.getGeneratedSql()).contains(" from o_customer t0 where t0.name is not null");
+//    }
+//  }
+
+  private Query<Customer> where(String where, Object... params) {
+
+    Query<Customer> query = DB.find(Customer.class);
+    EqlParser.parseWhere(where, query.where(), query.getExpressionFactory(), params);
+
+    return query;
+  }
 }

From c530883e5e0876263ab861199c63808265b43c21 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 15 Aug 2019 22:05:46 +1200
Subject: [PATCH 1009/1036] #1793 - ENH: Add filterMany() that takes
 expressions ... as a simpler option

---
 src/main/java/io/ebean/ExpressionFactory.java |   8 +
 src/main/java/io/ebean/ExpressionList.java    |  39 ++-
 .../expression/DefaultExpressionFactory.java  |   6 +
 .../expression/DefaultExpressionList.java     |  16 +-
 .../server/expression/JunctionExpression.java |  10 +
 .../server/grammer/EqlAdapter.java            |   5 +
 .../server/grammer/EqlParser.java             |   2 +-
 .../server/grammer/EqlValueType.java          |   1 +
 .../server/grammer/EqlWhereAdapter.java       |  24 +-
 .../server/grammer/EqlWhereListener.java      |   8 +-
 .../server/grammer/antlr/EQLLexer.interp      |   2 +-
 .../server/grammer/antlr/EQLLexer.java        | 222 +++++++++---------
 .../server/grammer/EqlParserTest.java         |  48 +++-
 .../org/tests/query/TestQueryFilterMany.java  |  19 ++
 src/test/resources/EQL.g4                     |   1 +
 15 files changed, 279 insertions(+), 132 deletions(-)

diff --git a/src/main/java/io/ebean/ExpressionFactory.java b/src/main/java/io/ebean/ExpressionFactory.java
index 42177057d..a27955d92 100644
--- a/src/main/java/io/ebean/ExpressionFactory.java
+++ b/src/main/java/io/ebean/ExpressionFactory.java
@@ -536,4 +536,12 @@ public interface ExpressionFactory {
    */
   <T> Junction<T> junction(Junction.Type type, Query<T> query, ExpressionList<T> parent);
 
+  /**
+   * Add the expressions to the given expression list.
+   *
+   * @param where       The expression list to add the expressions to
+   * @param expressions The expressions that are parsed
+   * @param params      Bind parameters to match ? or ?1 bind positions.
+   */
+  <T> void where(ExpressionList<T> where, String expressions, Object[] params);
 }
diff --git a/src/main/java/io/ebean/ExpressionList.java b/src/main/java/io/ebean/ExpressionList.java
index 4480251e1..c40cd0845 100644
--- a/src/main/java/io/ebean/ExpressionList.java
+++ b/src/main/java/io/ebean/ExpressionList.java
@@ -489,7 +489,26 @@ public interface ExpressionList<T> {
    * Add some filter predicate expressions to the many property.
    */
   @Nonnull
-  ExpressionList<T> filterMany(String prop);
+  ExpressionList<T> filterMany(String manyProperty);
+
+  /**
+   * Add filter expressions to the many property.
+   *
+   * <pre>{@code
+   *
+   *   DB.find(Customer.class)
+   *   .where()
+   *   .eq("name", "Rob")
+   *   .filterMany("orders", "status = ?", Status.NEW)
+   *   .findList();
+   *
+   * }</pre>
+   *
+   * @param manyProperty The many property
+   * @param expressions  Filter expressions with and, or and ? or ?1 type bind parameters
+   * @param params       Bind parameters used in the expressions
+   */
+  Query<T> filterMany(String manyProperty, String expressions, Object... params);
 
   /**
    * Specify specific properties to fetch on the main/root bean (aka partial
@@ -663,6 +682,14 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> where();
 
+  /**
+   * Add the expressions to this expression list.
+   *
+   * @param expressions The expressions that are parsed and added to this expression list
+   * @param params      Bind parameters to match ? or ?1 bind positions.
+   */
+  ExpressionList<T> where(String expressions, Object... params);
+
   /**
    * Path exists - for the given path in a JSON document.
    * <pre>{@code
@@ -831,9 +858,9 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> inRange(String propertyName, Object value1, Object value2);
 
-    /**
-     * Between - property between the two given values.
-     */
+  /**
+   * Between - property between the two given values.
+   */
   ExpressionList<T> between(String propertyName, Object value1, Object value2);
 
   /**
@@ -1327,7 +1354,7 @@ public interface ExpressionList<T> {
    *
    * }</pre>
    * <p>
-   *   Note that we need to cast the Postgres array for UUID types like:
+   * Note that we need to cast the Postgres array for UUID types like:
    * </p>
    * <pre>{@code
    *
@@ -1335,7 +1362,7 @@ public interface ExpressionList<T> {
    *
    * }</pre>
    *
-   * @param raw The raw expression that is typically a subquery
+   * @param raw    The raw expression that is typically a subquery
    * @param values The values which is typically a list or set of id values.
    */
   ExpressionList<T> rawOrEmpty(String raw, Collection<?> values);
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
index e568c2cbd..2e234c844 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
@@ -16,6 +16,7 @@ import io.ebean.search.TextQueryString;
 import io.ebean.search.TextSimple;
 import io.ebeaninternal.api.SpiExpressionFactory;
 import io.ebeaninternal.api.SpiQuery;
+import io.ebeaninternal.server.grammer.EqlParser;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -151,6 +152,11 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
     return new BitwiseExpression(propertyName, BitwiseOp.AND, flags, "=", match);
   }
 
+  @Override
+  public <T> void where(ExpressionList<T> list, String expressions, Object[] params) {
+    EqlParser.parseWhere(expressions, list, this, params);
+  }
+
   /**
    * Equal To - property equal to the given value.
    */
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 7e88b2897..e5b9fe230 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -470,8 +470,14 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
   }
 
   @Override
-  public ExpressionList<T> filterMany(String prop) {
-    return query.filterMany(prop);
+  public ExpressionList<T> filterMany(String manyProperty) {
+    return query.filterMany(manyProperty);
+  }
+
+  @Override
+  public Query<T> filterMany(String manyProperty, String expressions, Object... params) {
+    query.filterMany(manyProperty).where(expressions, params);
+    return query;
   }
 
   @Override
@@ -745,6 +751,12 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return this;
   }
 
+  @Override
+  public ExpressionList<T> where(String expressions, Object... params) {
+    expr.where(this, expressions, params);
+    return this;
+  }
+
   @Override
   public ExpressionList<T> bitwiseAny(String propertyName, long flags) {
     add(expr.bitwiseAny(propertyName, flags));
diff --git a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index 32fb51f20..2b31a746a 100644
--- a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -326,11 +326,21 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.exampleLike(example);
   }
 
+  @Override
+  public ExpressionList<T> where(String expressions, Object... params) {
+    throw new IllegalStateException("where not allowed on Junction expression list");
+  }
+
   @Override
   public ExpressionList<T> filterMany(String prop) {
     throw new IllegalStateException("filterMany not allowed on Junction expression list");
   }
 
+  @Override
+  public Query<T> filterMany(String manyProperty, String expressions, Object... params) {
+    throw new IllegalStateException("filterMany not allowed on Junction expression list");
+  }
+
   @Override
   public Query<T> usingTransaction(Transaction transaction) {
     return exprList.usingTransaction(transaction);
diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java
index 503f4dc81..77287903b 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java
@@ -36,6 +36,11 @@ class EqlAdapter<T> extends EqlWhereListener<T> {
     return query.createNamedParameter(parameterName);
   }
 
+  @Override
+  Object positionParam(String paramPosition) {
+    return query.createNamedParameter(paramPosition);
+  }
+
   /**
    * Return the current expression list that expressions should be added to.
    */
diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlParser.java b/src/main/java/io/ebeaninternal/server/grammer/EqlParser.java
index 949c3442c..8cd5089d6 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/EqlParser.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlParser.java
@@ -36,7 +36,7 @@ public class EqlParser {
     EQLParser parser = new EQLParser(new CommonTokenStream(new EQLLexer(CharStreams.fromString(raw))));
     parser.addErrorListener(errorListener);
 
-    new ParseTreeWalker().walk(new EqlWhereAdapter<>(where, expr), parser.conditional_expression());
+    new ParseTreeWalker().walk(new EqlWhereAdapter<>(where, expr, params), parser.conditional_expression());
   }
 
   static class ErrorListener extends BaseErrorListener {
diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlValueType.java b/src/main/java/io/ebeaninternal/server/grammer/EqlValueType.java
index a1156796c..7d9fc61a1 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/EqlValueType.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlValueType.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.grammer;
 
 enum EqlValueType {
+  POS_PARAM,
   NAMED_PARAM,
   STRING,
   BOOL,
diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlWhereAdapter.java b/src/main/java/io/ebeaninternal/server/grammer/EqlWhereAdapter.java
index 47ccf6a46..0620e3ee8 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/EqlWhereAdapter.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlWhereAdapter.java
@@ -2,20 +2,29 @@ package io.ebeaninternal.server.grammer;
 
 import io.ebean.ExpressionFactory;
 import io.ebean.ExpressionList;
+import io.ebeaninternal.server.util.ArrayStack;
 
 class EqlWhereAdapter<T> extends EqlWhereListener<T> {
 
   private final ExpressionList<T> where;
   private final ExpressionFactory expr;
+  private final Object[] params;
 
-  EqlWhereAdapter(ExpressionList<T> where, ExpressionFactory expr) {
+  private int paramIndex;
+
+  EqlWhereAdapter(ExpressionList<T> where, ExpressionFactory expr, Object[] params) {
     this.where = where;
     this.expr = expr;
+    this.params = params;
   }
 
   @Override
   ExpressionList<T> peekExprList() {
-    return where;
+    if (whereStack == null) {
+      whereStack = new ArrayStack<>();
+      whereStack.push(where);
+    }
+    return whereStack.peek();
   }
 
   @Override
@@ -23,8 +32,17 @@ class EqlWhereAdapter<T> extends EqlWhereListener<T> {
     return expr;
   }
 
+  @Override
+  Object positionParam(String paramPosition) {
+    if ("?".equals(paramPosition)) {
+      return params[paramIndex++];
+    }
+    final int pos = Integer.parseInt(paramPosition.substring(1));
+    return params[pos -1];
+  }
+
   @Override
   Object namedParam(String substring) {
-    return null;
+    throw new RuntimeException("Not supported");
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlWhereListener.java b/src/main/java/io/ebeaninternal/server/grammer/EqlWhereListener.java
index 0e2f5015f..2c623125b 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/EqlWhereListener.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlWhereListener.java
@@ -37,7 +37,9 @@ abstract class EqlWhereListener<T> extends EQLBaseListener {
 
   abstract ExpressionFactory expressionFactory();
 
-  abstract Object namedParam(String substring);
+  abstract Object namedParam(String paramName);
+
+  abstract Object positionParam(String paramPosition);
 
   /**
    * Push the expression list onto the appropriate stack.
@@ -290,6 +292,8 @@ abstract class EqlWhereListener<T> extends EQLBaseListener {
 
     char firstChar = Character.toLowerCase(valueAsText.charAt(0));
     switch (firstChar) {
+      case '?':
+        return EqlValueType.POS_PARAM;
       case ':':
         return EqlValueType.NAMED_PARAM;
       case 't':
@@ -394,6 +398,8 @@ abstract class EqlWhereListener<T> extends EQLBaseListener {
         return new BigDecimal(value);
       case STRING:
         return unquote(value);
+      case POS_PARAM:
+        return positionParam(value);
       case NAMED_PARAM:
         return namedParam(value.substring(1));
       default:
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp
index 971c21a1d..32fc89a55 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp
@@ -227,4 +227,4 @@ mode names:
 DEFAULT_MODE
 
 atn:
-[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 73, 585, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 4, 45, 9, 45, 4, 46, 9, 46, 4, 47, 9, 47, 4, 48, 9, 48, 4, 49, 9, 49, 4, 50, 9, 50, 4, 51, 9, 51, 4, 52, 9, 52, 4, 53, 9, 53, 4, 54, 9, 54, 4, 55, 9, 55, 4, 56, 9, 56, 4, 57, 9, 57, 4, 58, 9, 58, 4, 59, 9, 59, 4, 60, 9, 60, 4, 61, 9, 61, 4, 62, 9, 62, 4, 63, 9, 63, 4, 64, 9, 64, 4, 65, 9, 65, 4, 66, 9, 66, 4, 67, 9, 67, 4, 68, 9, 68, 4, 69, 9, 69, 4, 70, 9, 70, 4, 71, 9, 71, 4, 72, 9, 72, 3, 2, 3, 2, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 23, 3, 23, 3, 24, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 27, 3, 27, 3, 27, 3, 28, 3, 28, 3, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 45, 3, 45, 3, 46, 3, 46, 3, 46, 3, 47, 3, 47, 3, 48, 3, 48, 3, 48, 3, 49, 3, 49, 3, 49, 3, 50, 3, 50, 3, 50, 3, 51, 3, 51, 3, 51, 3, 51, 3, 52, 3, 52, 3, 53, 3, 53, 3, 53, 3, 54, 3, 54, 3, 54, 3, 55, 3, 55, 3, 55, 3, 56, 3, 56, 3, 56, 3, 56, 3, 57, 3, 57, 3, 57, 3, 58, 3, 58, 3, 58, 3, 59, 3, 59, 3, 59, 3, 60, 3, 60, 3, 60, 3, 60, 3, 61, 3, 61, 3, 61, 3, 61, 3, 62, 3, 62, 3, 62, 7, 62, 468, 10, 62, 12, 62, 14, 62, 471, 11, 62, 3, 63, 3, 63, 7, 63, 475, 10, 63, 12, 63, 14, 63, 478, 11, 63, 3, 64, 3, 64, 3, 64, 3, 64, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 5, 65, 526, 10, 65, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 5, 66, 537, 10, 66, 3, 67, 5, 67, 540, 10, 67, 3, 67, 3, 67, 5, 67, 544, 10, 67, 3, 67, 3, 67, 5, 67, 548, 10, 67, 3, 68, 6, 68, 551, 10, 68, 13, 68, 14, 68, 552, 3, 68, 3, 68, 7, 68, 557, 10, 68, 12, 68, 14, 68, 560, 11, 68, 3, 69, 3, 69, 7, 69, 564, 10, 69, 12, 69, 14, 69, 567, 11, 69, 3, 70, 3, 70, 3, 71, 3, 71, 3, 71, 3, 71, 7, 71, 575, 10, 71, 12, 71, 14, 71, 578, 11, 71, 3, 71, 3, 71, 3, 72, 3, 72, 3, 72, 3, 72, 2, 2, 73, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13, 8, 15, 9, 17, 10, 19, 11, 21, 12, 23, 13, 25, 14, 27, 15, 29, 16, 31, 17, 33, 18, 35, 19, 37, 20, 39, 21, 41, 22, 43, 23, 45, 24, 47, 25, 49, 26, 51, 27, 53, 28, 55, 29, 57, 30, 59, 31, 61, 32, 63, 33, 65, 34, 67, 35, 69, 36, 71, 37, 73, 38, 75, 39, 77, 40, 79, 41, 81, 42, 83, 43, 85, 44, 87, 45, 89, 46, 91, 47, 93, 48, 95, 49, 97, 50, 99, 51, 101, 52, 103, 53, 105, 54, 107, 55, 109, 56, 111, 57, 113, 58, 115, 59, 117, 60, 119, 61, 121, 62, 123, 63, 125, 64, 127, 65, 129, 66, 131, 67, 133, 68, 135, 69, 137, 70, 139, 71, 141, 72, 143, 73, 3, 2, 9, 5, 2, 67, 92, 97, 97, 99, 124, 6, 2, 50, 59, 67, 92, 97, 97, 99, 124, 7, 2, 48, 48, 50, 59, 67, 92, 97, 97, 99, 124, 3, 2, 50, 59, 3, 2, 51, 59, 3, 2, 41, 41, 5, 2, 11, 12, 15, 15, 34, 34, 2, 600, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 2, 35, 3, 2, 2, 2, 2, 37, 3, 2, 2, 2, 2, 39, 3, 2, 2, 2, 2, 41, 3, 2, 2, 2, 2, 43, 3, 2, 2, 2, 2, 45, 3, 2, 2, 2, 2, 47, 3, 2, 2, 2, 2, 49, 3, 2, 2, 2, 2, 51, 3, 2, 2, 2, 2, 53, 3, 2, 2, 2, 2, 55, 3, 2, 2, 2, 2, 57, 3, 2, 2, 2, 2, 59, 3, 2, 2, 2, 2, 61, 3, 2, 2, 2, 2, 63, 3, 2, 2, 2, 2, 65, 3, 2, 2, 2, 2, 67, 3, 2, 2, 2, 2, 69, 3, 2, 2, 2, 2, 71, 3, 2, 2, 2, 2, 73, 3, 2, 2, 2, 2, 75, 3, 2, 2, 2, 2, 77, 3, 2, 2, 2, 2, 79, 3, 2, 2, 2, 2, 81, 3, 2, 2, 2, 2, 83, 3, 2, 2, 2, 2, 85, 3, 2, 2, 2, 2, 87, 3, 2, 2, 2, 2, 89, 3, 2, 2, 2, 2, 91, 3, 2, 2, 2, 2, 93, 3, 2, 2, 2, 2, 95, 3, 2, 2, 2, 2, 97, 3, 2, 2, 2, 2, 99, 3, 2, 2, 2, 2, 101, 3, 2, 2, 2, 2, 103, 3, 2, 2, 2, 2, 105, 3, 2, 2, 2, 2, 107, 3, 2, 2, 2, 2, 109, 3, 2, 2, 2, 2, 111, 3, 2, 2, 2, 2, 113, 3, 2, 2, 2, 2, 115, 3, 2, 2, 2, 2, 117, 3, 2, 2, 2, 2, 119, 3, 2, 2, 2, 2, 121, 3, 2, 2, 2, 2, 123, 3, 2, 2, 2, 2, 125, 3, 2, 2, 2, 2, 127, 3, 2, 2, 2, 2, 129, 3, 2, 2, 2, 2, 131, 3, 2, 2, 2, 2, 133, 3, 2, 2, 2, 2, 135, 3, 2, 2, 2, 2, 137, 3, 2, 2, 2, 2, 139, 3, 2, 2, 2, 2, 141, 3, 2, 2, 2, 2, 143, 3, 2, 2, 2, 3, 145, 3, 2, 2, 2, 5, 147, 3, 2, 2, 2, 7, 149, 3, 2, 2, 2, 9, 156, 3, 2, 2, 2, 11, 165, 3, 2, 2, 2, 13, 171, 3, 2, 2, 2, 15, 177, 3, 2, 2, 2, 17, 180, 3, 2, 2, 2, 19, 182, 3, 2, 2, 2, 21, 188, 3, 2, 2, 2, 23, 194, 3, 2, 2, 2, 25, 199, 3, 2, 2, 2, 27, 203, 3, 2, 2, 2, 29, 208, 3, 2, 2, 2, 31, 214, 3, 2, 2, 2, 33, 221, 3, 2, 2, 2, 35, 227, 3, 2, 2, 2, 37, 229, 3, 2, 2, 2, 39, 235, 3, 2, 2, 2, 41, 240, 3, 2, 2, 2, 43, 243, 3, 2, 2, 2, 45, 247, 3, 2, 2, 2, 47, 251, 3, 2, 2, 2, 49, 254, 3, 2, 2, 2, 51, 262, 3, 2, 2, 2, 53, 270, 3, 2, 2, 2, 55, 273, 3, 2, 2, 2, 57, 276, 3, 2, 2, 2, 59, 281, 3, 2, 2, 2, 61, 288, 3, 2, 2, 2, 63, 298, 3, 2, 2, 2, 65, 306, 3, 2, 2, 2, 67, 312, 3, 2, 2, 2, 69, 320, 3, 2, 2, 2, 71, 331, 3, 2, 2, 2, 73, 340, 3, 2, 2, 2, 75, 345, 3, 2, 2, 2, 77, 351, 3, 2, 2, 2, 79, 360, 3, 2, 2, 2, 81, 370, 3, 2, 2, 2, 83, 381, 3, 2, 2, 2, 85, 393, 3, 2, 2, 2, 87, 402, 3, 2, 2, 2, 89, 412, 3, 2, 2, 2, 91, 414, 3, 2, 2, 2, 93, 417, 3, 2, 2, 2, 95, 419, 3, 2, 2, 2, 97, 422, 3, 2, 2, 2, 99, 425, 3, 2, 2, 2, 101, 428, 3, 2, 2, 2, 103, 432, 3, 2, 2, 2, 105, 434, 3, 2, 2, 2, 107, 437, 3, 2, 2, 2, 109, 440, 3, 2, 2, 2, 111, 443, 3, 2, 2, 2, 113, 447, 3, 2, 2, 2, 115, 450, 3, 2, 2, 2, 117, 453, 3, 2, 2, 2, 119, 456, 3, 2, 2, 2, 121, 460, 3, 2, 2, 2, 123, 464, 3, 2, 2, 2, 125, 472, 3, 2, 2, 2, 127, 479, 3, 2, 2, 2, 129, 525, 3, 2, 2, 2, 131, 536, 3, 2, 2, 2, 133, 547, 3, 2, 2, 2, 135, 550, 3, 2, 2, 2, 137, 561, 3, 2, 2, 2, 139, 568, 3, 2, 2, 2, 141, 570, 3, 2, 2, 2, 143, 581, 3, 2, 2, 2, 145, 146, 7, 42, 2, 2, 146, 4, 3, 2, 2, 2, 147, 148, 7, 43, 2, 2, 148, 6, 3, 2, 2, 2, 149, 150, 7, 117, 2, 2, 150, 151, 7, 103, 2, 2, 151, 152, 7, 110, 2, 2, 152, 153, 7, 103, 2, 2, 153, 154, 7, 101, 2, 2, 154, 155, 7, 118, 2, 2, 155, 8, 3, 2, 2, 2, 156, 157, 7, 102, 2, 2, 157, 158, 7, 107, 2, 2, 158, 159, 7, 117, 2, 2, 159, 160, 7, 118, 2, 2, 160, 161, 7, 107, 2, 2, 161, 162, 7, 112, 2, 2, 162, 163, 7, 101, 2, 2, 163, 164, 7, 118, 2, 2, 164, 10, 3, 2, 2, 2, 165, 166, 7, 121, 2, 2, 166, 167, 7, 106, 2, 2, 167, 168, 7, 103, 2, 2, 168, 169, 7, 116, 2, 2, 169, 170, 7, 103, 2, 2, 170, 12, 3, 2, 2, 2, 171, 172, 7, 113, 2, 2, 172, 173, 7, 116, 2, 2, 173, 174, 7, 102, 2, 2, 174, 175, 7, 103, 2, 2, 175, 176, 7, 116, 2, 2, 176, 14, 3, 2, 2, 2, 177, 178, 7, 100, 2, 2, 178, 179, 7, 123, 2, 2, 179, 16, 3, 2, 2, 2, 180, 181, 7, 46, 2, 2, 181, 18, 3, 2, 2, 2, 182, 183, 7, 112, 2, 2, 183, 184, 7, 119, 2, 2, 184, 185, 7, 110, 2, 2, 185, 186, 7, 110, 2, 2, 186, 187, 7, 117, 2, 2, 187, 20, 3, 2, 2, 2, 188, 189, 7, 104, 2, 2, 189, 190, 7, 107, 2, 2, 190, 191, 7, 116, 2, 2, 191, 192, 7, 117, 2, 2, 192, 193, 7, 118, 2, 2, 193, 22, 3, 2, 2, 2, 194, 195, 7, 110, 2, 2, 195, 196, 7, 99, 2, 2, 196, 197, 7, 117, 2, 2, 197, 198, 7, 118, 2, 2, 198, 24, 3, 2, 2, 2, 199, 200, 7, 99, 2, 2, 200, 201, 7, 117, 2, 2, 201, 202, 7, 101, 2, 2, 202, 26, 3, 2, 2, 2, 203, 204, 7, 102, 2, 2, 204, 205, 7, 103, 2, 2, 205, 206, 7, 117, 2, 2, 206, 207, 7, 101, 2, 2, 207, 28, 3, 2, 2, 2, 208, 209, 7, 110, 2, 2, 209, 210, 7, 107, 2, 2, 210, 211, 7, 111, 2, 2, 211, 212, 7, 107, 2, 2, 212, 213, 7, 118, 2, 2, 213, 30, 3, 2, 2, 2, 214, 215, 7, 113, 2, 2, 215, 216, 7, 104, 2, 2, 216, 217, 7, 104, 2, 2, 217, 218, 7, 117, 2, 2, 218, 219, 7, 103, 2, 2, 219, 220, 7, 118, 2, 2, 220, 32, 3, 2, 2, 2, 221, 222, 7, 104, 2, 2, 222, 223, 7, 103, 2, 2, 223, 224, 7, 118, 2, 2, 224, 225, 7, 101, 2, 2, 225, 226, 7, 106, 2, 2, 226, 34, 3, 2, 2, 2, 227, 228, 7, 45, 2, 2, 228, 36, 3, 2, 2, 2, 229, 230, 7, 115, 2, 2, 230, 231, 7, 119, 2, 2, 231, 232, 7, 103, 2, 2, 232, 233, 7, 116, 2, 2, 233, 234, 7, 123, 2, 2, 234, 38, 3, 2, 2, 2, 235, 236, 7, 110, 2, 2, 236, 237, 7, 99, 2, 2, 237, 238, 7, 124, 2, 2, 238, 239, 7, 123, 2, 2, 239, 40, 3, 2, 2, 2, 240, 241, 7, 113, 2, 2, 241, 242, 7, 116, 2, 2, 242, 42, 3, 2, 2, 2, 243, 244, 7, 99, 2, 2, 244, 245, 7, 112, 2, 2, 245, 246, 7, 102, 2, 2, 246, 44, 3, 2, 2, 2, 247, 248, 7, 112, 2, 2, 248, 249, 7, 113, 2, 2, 249, 250, 7, 118, 2, 2, 250, 46, 3, 2, 2, 2, 251, 252, 7, 107, 2, 2, 252, 253, 7, 112, 2, 2, 253, 48, 3, 2, 2, 2, 254, 255, 7, 100, 2, 2, 255, 256, 7, 103, 2, 2, 256, 257, 7, 118, 2, 2, 257, 258, 7, 121, 2, 2, 258, 259, 7, 103, 2, 2, 259, 260, 7, 103, 2, 2, 260, 261, 7, 112, 2, 2, 261, 50, 3, 2, 2, 2, 262, 263, 7, 107, 2, 2, 263, 264, 7, 112, 2, 2, 264, 265, 7, 116, 2, 2, 265, 266, 7, 99, 2, 2, 266, 267, 7, 112, 2, 2, 267, 268, 7, 105, 2, 2, 268, 269, 7, 103, 2, 2, 269, 52, 3, 2, 2, 2, 270, 271, 7, 118, 2, 2, 271, 272, 7, 113, 2, 2, 272, 54, 3, 2, 2, 2, 273, 274, 7, 107, 2, 2, 274, 275, 7, 117, 2, 2, 275, 56, 3, 2, 2, 2, 276, 277, 7, 112, 2, 2, 277, 278, 7, 119, 2, 2, 278, 279, 7, 110, 2, 2, 279, 280, 7, 110, 2, 2, 280, 58, 3, 2, 2, 2, 281, 282, 7, 107, 2, 2, 282, 283, 7, 117, 2, 2, 283, 284, 7, 80, 2, 2, 284, 285, 7, 119, 2, 2, 285, 286, 7, 110, 2, 2, 286, 287, 7, 110, 2, 2, 287, 60, 3, 2, 2, 2, 288, 289, 7, 107, 2, 2, 289, 290, 7, 117, 2, 2, 290, 291, 7, 80, 2, 2, 291, 292, 7, 113, 2, 2, 292, 293, 7, 118, 2, 2, 293, 294, 7, 80, 2, 2, 294, 295, 7, 119, 2, 2, 295, 296, 7, 110, 2, 2, 296, 297, 7, 110, 2, 2, 297, 62, 3, 2, 2, 2, 298, 299, 7, 112, 2, 2, 299, 300, 7, 113, 2, 2, 300, 301, 7, 118, 2, 2, 301, 302, 7, 80, 2, 2, 302, 303, 7, 119, 2, 2, 303, 304, 7, 110, 2, 2, 304, 305, 7, 110, 2, 2, 305, 64, 3, 2, 2, 2, 306, 307, 7, 103, 2, 2, 307, 308, 7, 111, 2, 2, 308, 309, 7, 114, 2, 2, 309, 310, 7, 118, 2, 2, 310, 311, 7, 123, 2, 2, 311, 66, 3, 2, 2, 2, 312, 313, 7, 107, 2, 2, 313, 314, 7, 117, 2, 2, 314, 315, 7, 71, 2, 2, 315, 316, 7, 111, 2, 2, 316, 317, 7, 114, 2, 2, 317, 318, 7, 118, 2, 2, 318, 319, 7, 123, 2, 2, 319, 68, 3, 2, 2, 2, 320, 321, 7, 107, 2, 2, 321, 322, 7, 117, 2, 2, 322, 323, 7, 80, 2, 2, 323, 324, 7, 113, 2, 2, 324, 325, 7, 118, 2, 2, 325, 326, 7, 71, 2, 2, 326, 327, 7, 111, 2, 2, 327, 328, 7, 114, 2, 2, 328, 329, 7, 118, 2, 2, 329, 330, 7, 123, 2, 2, 330, 70, 3, 2, 2, 2, 331, 332, 7, 112, 2, 2, 332, 333, 7, 113, 2, 2, 333, 334, 7, 118, 2, 2, 334, 335, 7, 71, 2, 2, 335, 336, 7, 111, 2, 2, 336, 337, 7, 114, 2, 2, 337, 338, 7, 118, 2, 2, 338, 339, 7, 123, 2, 2, 339, 72, 3, 2, 2, 2, 340, 341, 7, 110, 2, 2, 341, 342, 7, 107, 2, 2, 342, 343, 7, 109, 2, 2, 343, 344, 7, 103, 2, 2, 344, 74, 3, 2, 2, 2, 345, 346, 7, 107, 2, 2, 346, 347, 7, 110, 2, 2, 347, 348, 7, 107, 2, 2, 348, 349, 7, 109, 2, 2, 349, 350, 7, 103, 2, 2, 350, 76, 3, 2, 2, 2, 351, 352, 7, 101, 2, 2, 352, 353, 7, 113, 2, 2, 353, 354, 7, 112, 2, 2, 354, 355, 7, 118, 2, 2, 355, 356, 7, 99, 2, 2, 356, 357, 7, 107, 2, 2, 357, 358, 7, 112, 2, 2, 358, 359, 7, 117, 2, 2, 359, 78, 3, 2, 2, 2, 360, 361, 7, 107, 2, 2, 361, 362, 7, 101, 2, 2, 362, 363, 7, 113, 2, 2, 363, 364, 7, 112, 2, 2, 364, 365, 7, 118, 2, 2, 365, 366, 7, 99, 2, 2, 366, 367, 7, 107, 2, 2, 367, 368, 7, 112, 2, 2, 368, 369, 7, 117, 2, 2, 369, 80, 3, 2, 2, 2, 370, 371, 7, 117, 2, 2, 371, 372, 7, 118, 2, 2, 372, 373, 7, 99, 2, 2, 373, 374, 7, 116, 2, 2, 374, 375, 7, 118, 2, 2, 375, 376, 7, 117, 2, 2, 376, 377, 7, 89, 2, 2, 377, 378, 7, 107, 2, 2, 378, 379, 7, 118, 2, 2, 379, 380, 7, 106, 2, 2, 380, 82, 3, 2, 2, 2, 381, 382, 7, 107, 2, 2, 382, 383, 7, 117, 2, 2, 383, 384, 7, 118, 2, 2, 384, 385, 7, 99, 2, 2, 385, 386, 7, 116, 2, 2, 386, 387, 7, 118, 2, 2, 387, 388, 7, 117, 2, 2, 388, 389, 7, 89, 2, 2, 389, 390, 7, 107, 2, 2, 390, 391, 7, 118, 2, 2, 391, 392, 7, 106, 2, 2, 392, 84, 3, 2, 2, 2, 393, 394, 7, 103, 2, 2, 394, 395, 7, 112, 2, 2, 395, 396, 7, 102, 2, 2, 396, 397, 7, 117, 2, 2, 397, 398, 7, 89, 2, 2, 398, 399, 7, 107, 2, 2, 399, 400, 7, 118, 2, 2, 400, 401, 7, 106, 2, 2, 401, 86, 3, 2, 2, 2, 402, 403, 7, 107, 2, 2, 403, 404, 7, 103, 2, 2, 404, 405, 7, 112, 2, 2, 405, 406, 7, 102, 2, 2, 406, 407, 7, 117, 2, 2, 407, 408, 7, 89, 2, 2, 408, 409, 7, 107, 2, 2, 409, 410, 7, 118, 2, 2, 410, 411, 7, 106, 2, 2, 411, 88, 3, 2, 2, 2, 412, 413, 7, 63, 2, 2, 413, 90, 3, 2, 2, 2, 414, 415, 7, 103, 2, 2, 415, 416, 7, 115, 2, 2, 416, 92, 3, 2, 2, 2, 417, 418, 7, 64, 2, 2, 418, 94, 3, 2, 2, 2, 419, 420, 7, 105, 2, 2, 420, 421, 7, 118, 2, 2, 421, 96, 3, 2, 2, 2, 422, 423, 7, 64, 2, 2, 423, 424, 7, 63, 2, 2, 424, 98, 3, 2, 2, 2, 425, 426, 7, 105, 2, 2, 426, 427, 7, 103, 2, 2, 427, 100, 3, 2, 2, 2, 428, 429, 7, 105, 2, 2, 429, 430, 7, 118, 2, 2, 430, 431, 7, 103, 2, 2, 431, 102, 3, 2, 2, 2, 432, 433, 7, 62, 2, 2, 433, 104, 3, 2, 2, 2, 434, 435, 7, 110, 2, 2, 435, 436, 7, 118, 2, 2, 436, 106, 3, 2, 2, 2, 437, 438, 7, 62, 2, 2, 438, 439, 7, 63, 2, 2, 439, 108, 3, 2, 2, 2, 440, 441, 7, 110, 2, 2, 441, 442, 7, 103, 2, 2, 442, 110, 3, 2, 2, 2, 443, 444, 7, 110, 2, 2, 444, 445, 7, 118, 2, 2, 445, 446, 7, 103, 2, 2, 446, 112, 3, 2, 2, 2, 447, 448, 7, 62, 2, 2, 448, 449, 7, 64, 2, 2, 449, 114, 3, 2, 2, 2, 450, 451, 7, 35, 2, 2, 451, 452, 7, 63, 2, 2, 452, 116, 3, 2, 2, 2, 453, 454, 7, 112, 2, 2, 454, 455, 7, 103, 2, 2, 455, 118, 3, 2, 2, 2, 456, 457, 7, 107, 2, 2, 457, 458, 7, 103, 2, 2, 458, 459, 7, 115, 2, 2, 459, 120, 3, 2, 2, 2, 460, 461, 7, 107, 2, 2, 461, 462, 7, 112, 2, 2, 462, 463, 7, 103, 2, 2, 463, 122, 3, 2, 2, 2, 464, 465, 7, 60, 2, 2, 465, 469, 9, 2, 2, 2, 466, 468, 9, 3, 2, 2, 467, 466, 3, 2, 2, 2, 468, 471, 3, 2, 2, 2, 469, 467, 3, 2, 2, 2, 469, 470, 3, 2, 2, 2, 470, 124, 3, 2, 2, 2, 471, 469, 3, 2, 2, 2, 472, 476, 9, 2, 2, 2, 473, 475, 9, 4, 2, 2, 474, 473, 3, 2, 2, 2, 475, 478, 3, 2, 2, 2, 476, 474, 3, 2, 2, 2, 476, 477, 3, 2, 2, 2, 477, 126, 3, 2, 2, 2, 478, 476, 3, 2, 2, 2, 479, 480, 7, 98, 2, 2, 480, 481, 5, 125, 63, 2, 481, 482, 7, 98, 2, 2, 482, 128, 3, 2, 2, 2, 483, 484, 7, 117, 2, 2, 484, 485, 7, 119, 2, 2, 485, 486, 7, 111, 2, 2, 486, 487, 7, 42, 2, 2, 487, 488, 3, 2, 2, 2, 488, 489, 5, 125, 63, 2, 489, 490, 7, 43, 2, 2, 490, 526, 3, 2, 2, 2, 491, 492, 7, 111, 2, 2, 492, 493, 7, 99, 2, 2, 493, 494, 7, 122, 2, 2, 494, 495, 7, 42, 2, 2, 495, 496, 3, 2, 2, 2, 496, 497, 5, 125, 63, 2, 497, 498, 7, 43, 2, 2, 498, 526, 3, 2, 2, 2, 499, 500, 7, 111, 2, 2, 500, 501, 7, 107, 2, 2, 501, 502, 7, 112, 2, 2, 502, 503, 7, 42, 2, 2, 503, 504, 3, 2, 2, 2, 504, 505, 5, 125, 63, 2, 505, 506, 7, 43, 2, 2, 506, 526, 3, 2, 2, 2, 507, 508, 7, 99, 2, 2, 508, 509, 7, 120, 2, 2, 509, 510, 7, 105, 2, 2, 510, 511, 7, 42, 2, 2, 511, 512, 3, 2, 2, 2, 512, 513, 5, 125, 63, 2, 513, 514, 7, 43, 2, 2, 514, 526, 3, 2, 2, 2, 515, 516, 7, 101, 2, 2, 516, 517, 7, 113, 2, 2, 517, 518, 7, 119, 2, 2, 518, 519, 7, 112, 2, 2, 519, 520, 7, 118, 2, 2, 520, 521, 7, 42, 2, 2, 521, 522, 3, 2, 2, 2, 522, 523, 5, 125, 63, 2, 523, 524, 7, 43, 2, 2, 524, 526, 3, 2, 2, 2, 525, 483, 3, 2, 2, 2, 525, 491, 3, 2, 2, 2, 525, 499, 3, 2, 2, 2, 525, 507, 3, 2, 2, 2, 525, 515, 3, 2, 2, 2, 526, 130, 3, 2, 2, 2, 527, 528, 7, 118, 2, 2, 528, 529, 7, 116, 2, 2, 529, 530, 7, 119, 2, 2, 530, 537, 7, 103, 2, 2, 531, 532, 7, 104, 2, 2, 532, 533, 7, 99, 2, 2, 533, 534, 7, 110, 2, 2, 534, 535, 7, 117, 2, 2, 535, 537, 7, 103, 2, 2, 536, 527, 3, 2, 2, 2, 536, 531, 3, 2, 2, 2, 537, 132, 3, 2, 2, 2, 538, 540, 7, 47, 2, 2, 539, 538, 3, 2, 2, 2, 539, 540, 3, 2, 2, 2, 540, 541, 3, 2, 2, 2, 541, 548, 5, 135, 68, 2, 542, 544, 7, 47, 2, 2, 543, 542, 3, 2, 2, 2, 543, 544, 3, 2, 2, 2, 544, 545, 3, 2, 2, 2, 545, 548, 5, 137, 69, 2, 546, 548, 5, 139, 70, 2, 547, 539, 3, 2, 2, 2, 547, 543, 3, 2, 2, 2, 547, 546, 3, 2, 2, 2, 548, 134, 3, 2, 2, 2, 549, 551, 9, 5, 2, 2, 550, 549, 3, 2, 2, 2, 551, 552, 3, 2, 2, 2, 552, 550, 3, 2, 2, 2, 552, 553, 3, 2, 2, 2, 553, 554, 3, 2, 2, 2, 554, 558, 7, 48, 2, 2, 555, 557, 9, 5, 2, 2, 556, 555, 3, 2, 2, 2, 557, 560, 3, 2, 2, 2, 558, 556, 3, 2, 2, 2, 558, 559, 3, 2, 2, 2, 559, 136, 3, 2, 2, 2, 560, 558, 3, 2, 2, 2, 561, 565, 9, 6, 2, 2, 562, 564, 9, 5, 2, 2, 563, 562, 3, 2, 2, 2, 564, 567, 3, 2, 2, 2, 565, 563, 3, 2, 2, 2, 565, 566, 3, 2, 2, 2, 566, 138, 3, 2, 2, 2, 567, 565, 3, 2, 2, 2, 568, 569, 7, 50, 2, 2, 569, 140, 3, 2, 2, 2, 570, 576, 7, 41, 2, 2, 571, 575, 10, 7, 2, 2, 572, 573, 7, 41, 2, 2, 573, 575, 7, 41, 2, 2, 574, 571, 3, 2, 2, 2, 574, 572, 3, 2, 2, 2, 575, 578, 3, 2, 2, 2, 576, 574, 3, 2, 2, 2, 576, 577, 3, 2, 2, 2, 577, 579, 3, 2, 2, 2, 578, 576, 3, 2, 2, 2, 579, 580, 7, 41, 2, 2, 580, 142, 3, 2, 2, 2, 581, 582, 9, 8, 2, 2, 582, 583, 3, 2, 2, 2, 583, 584, 8, 72, 2, 2, 584, 144, 3, 2, 2, 2, 15, 2, 469, 476, 525, 536, 539, 543, 547, 552, 558, 565, 574, 576, 3, 8, 2, 2]
\ No newline at end of file
+[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 73, 594, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 4, 45, 9, 45, 4, 46, 9, 46, 4, 47, 9, 47, 4, 48, 9, 48, 4, 49, 9, 49, 4, 50, 9, 50, 4, 51, 9, 51, 4, 52, 9, 52, 4, 53, 9, 53, 4, 54, 9, 54, 4, 55, 9, 55, 4, 56, 9, 56, 4, 57, 9, 57, 4, 58, 9, 58, 4, 59, 9, 59, 4, 60, 9, 60, 4, 61, 9, 61, 4, 62, 9, 62, 4, 63, 9, 63, 4, 64, 9, 64, 4, 65, 9, 65, 4, 66, 9, 66, 4, 67, 9, 67, 4, 68, 9, 68, 4, 69, 9, 69, 4, 70, 9, 70, 4, 71, 9, 71, 4, 72, 9, 72, 3, 2, 3, 2, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 23, 3, 23, 3, 24, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 27, 3, 27, 3, 27, 3, 28, 3, 28, 3, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 45, 3, 45, 3, 46, 3, 46, 3, 46, 3, 47, 3, 47, 3, 48, 3, 48, 3, 48, 3, 49, 3, 49, 3, 49, 3, 50, 3, 50, 3, 50, 3, 51, 3, 51, 3, 51, 3, 51, 3, 52, 3, 52, 3, 53, 3, 53, 3, 53, 3, 54, 3, 54, 3, 54, 3, 55, 3, 55, 3, 55, 3, 56, 3, 56, 3, 56, 3, 56, 3, 57, 3, 57, 3, 57, 3, 58, 3, 58, 3, 58, 3, 59, 3, 59, 3, 59, 3, 60, 3, 60, 3, 60, 3, 60, 3, 61, 3, 61, 3, 61, 3, 61, 3, 62, 3, 62, 3, 62, 7, 62, 468, 10, 62, 12, 62, 14, 62, 471, 11, 62, 3, 62, 3, 62, 7, 62, 475, 10, 62, 12, 62, 14, 62, 478, 11, 62, 5, 62, 480, 10, 62, 3, 63, 3, 63, 7, 63, 484, 10, 63, 12, 63, 14, 63, 487, 11, 63, 3, 64, 3, 64, 3, 64, 3, 64, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 5, 65, 535, 10, 65, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 5, 66, 546, 10, 66, 3, 67, 5, 67, 549, 10, 67, 3, 67, 3, 67, 5, 67, 553, 10, 67, 3, 67, 3, 67, 5, 67, 557, 10, 67, 3, 68, 6, 68, 560, 10, 68, 13, 68, 14, 68, 561, 3, 68, 3, 68, 7, 68, 566, 10, 68, 12, 68, 14, 68, 569, 11, 68, 3, 69, 3, 69, 7, 69, 573, 10, 69, 12, 69, 14, 69, 576, 11, 69, 3, 70, 3, 70, 3, 71, 3, 71, 3, 71, 3, 71, 7, 71, 584, 10, 71, 12, 71, 14, 71, 587, 11, 71, 3, 71, 3, 71, 3, 72, 3, 72, 3, 72, 3, 72, 2, 2, 73, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13, 8, 15, 9, 17, 10, 19, 11, 21, 12, 23, 13, 25, 14, 27, 15, 29, 16, 31, 17, 33, 18, 35, 19, 37, 20, 39, 21, 41, 22, 43, 23, 45, 24, 47, 25, 49, 26, 51, 27, 53, 28, 55, 29, 57, 30, 59, 31, 61, 32, 63, 33, 65, 34, 67, 35, 69, 36, 71, 37, 73, 38, 75, 39, 77, 40, 79, 41, 81, 42, 83, 43, 85, 44, 87, 45, 89, 46, 91, 47, 93, 48, 95, 49, 97, 50, 99, 51, 101, 52, 103, 53, 105, 54, 107, 55, 109, 56, 111, 57, 113, 58, 115, 59, 117, 60, 119, 61, 121, 62, 123, 63, 125, 64, 127, 65, 129, 66, 131, 67, 133, 68, 135, 69, 137, 70, 139, 71, 141, 72, 143, 73, 3, 2, 9, 5, 2, 67, 92, 97, 97, 99, 124, 6, 2, 50, 59, 67, 92, 97, 97, 99, 124, 7, 2, 48, 48, 50, 59, 67, 92, 97, 97, 99, 124, 3, 2, 50, 59, 3, 2, 51, 59, 3, 2, 41, 41, 5, 2, 11, 12, 15, 15, 34, 34, 2, 611, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 2, 35, 3, 2, 2, 2, 2, 37, 3, 2, 2, 2, 2, 39, 3, 2, 2, 2, 2, 41, 3, 2, 2, 2, 2, 43, 3, 2, 2, 2, 2, 45, 3, 2, 2, 2, 2, 47, 3, 2, 2, 2, 2, 49, 3, 2, 2, 2, 2, 51, 3, 2, 2, 2, 2, 53, 3, 2, 2, 2, 2, 55, 3, 2, 2, 2, 2, 57, 3, 2, 2, 2, 2, 59, 3, 2, 2, 2, 2, 61, 3, 2, 2, 2, 2, 63, 3, 2, 2, 2, 2, 65, 3, 2, 2, 2, 2, 67, 3, 2, 2, 2, 2, 69, 3, 2, 2, 2, 2, 71, 3, 2, 2, 2, 2, 73, 3, 2, 2, 2, 2, 75, 3, 2, 2, 2, 2, 77, 3, 2, 2, 2, 2, 79, 3, 2, 2, 2, 2, 81, 3, 2, 2, 2, 2, 83, 3, 2, 2, 2, 2, 85, 3, 2, 2, 2, 2, 87, 3, 2, 2, 2, 2, 89, 3, 2, 2, 2, 2, 91, 3, 2, 2, 2, 2, 93, 3, 2, 2, 2, 2, 95, 3, 2, 2, 2, 2, 97, 3, 2, 2, 2, 2, 99, 3, 2, 2, 2, 2, 101, 3, 2, 2, 2, 2, 103, 3, 2, 2, 2, 2, 105, 3, 2, 2, 2, 2, 107, 3, 2, 2, 2, 2, 109, 3, 2, 2, 2, 2, 111, 3, 2, 2, 2, 2, 113, 3, 2, 2, 2, 2, 115, 3, 2, 2, 2, 2, 117, 3, 2, 2, 2, 2, 119, 3, 2, 2, 2, 2, 121, 3, 2, 2, 2, 2, 123, 3, 2, 2, 2, 2, 125, 3, 2, 2, 2, 2, 127, 3, 2, 2, 2, 2, 129, 3, 2, 2, 2, 2, 131, 3, 2, 2, 2, 2, 133, 3, 2, 2, 2, 2, 135, 3, 2, 2, 2, 2, 137, 3, 2, 2, 2, 2, 139, 3, 2, 2, 2, 2, 141, 3, 2, 2, 2, 2, 143, 3, 2, 2, 2, 3, 145, 3, 2, 2, 2, 5, 147, 3, 2, 2, 2, 7, 149, 3, 2, 2, 2, 9, 156, 3, 2, 2, 2, 11, 165, 3, 2, 2, 2, 13, 171, 3, 2, 2, 2, 15, 177, 3, 2, 2, 2, 17, 180, 3, 2, 2, 2, 19, 182, 3, 2, 2, 2, 21, 188, 3, 2, 2, 2, 23, 194, 3, 2, 2, 2, 25, 199, 3, 2, 2, 2, 27, 203, 3, 2, 2, 2, 29, 208, 3, 2, 2, 2, 31, 214, 3, 2, 2, 2, 33, 221, 3, 2, 2, 2, 35, 227, 3, 2, 2, 2, 37, 229, 3, 2, 2, 2, 39, 235, 3, 2, 2, 2, 41, 240, 3, 2, 2, 2, 43, 243, 3, 2, 2, 2, 45, 247, 3, 2, 2, 2, 47, 251, 3, 2, 2, 2, 49, 254, 3, 2, 2, 2, 51, 262, 3, 2, 2, 2, 53, 270, 3, 2, 2, 2, 55, 273, 3, 2, 2, 2, 57, 276, 3, 2, 2, 2, 59, 281, 3, 2, 2, 2, 61, 288, 3, 2, 2, 2, 63, 298, 3, 2, 2, 2, 65, 306, 3, 2, 2, 2, 67, 312, 3, 2, 2, 2, 69, 320, 3, 2, 2, 2, 71, 331, 3, 2, 2, 2, 73, 340, 3, 2, 2, 2, 75, 345, 3, 2, 2, 2, 77, 351, 3, 2, 2, 2, 79, 360, 3, 2, 2, 2, 81, 370, 3, 2, 2, 2, 83, 381, 3, 2, 2, 2, 85, 393, 3, 2, 2, 2, 87, 402, 3, 2, 2, 2, 89, 412, 3, 2, 2, 2, 91, 414, 3, 2, 2, 2, 93, 417, 3, 2, 2, 2, 95, 419, 3, 2, 2, 2, 97, 422, 3, 2, 2, 2, 99, 425, 3, 2, 2, 2, 101, 428, 3, 2, 2, 2, 103, 432, 3, 2, 2, 2, 105, 434, 3, 2, 2, 2, 107, 437, 3, 2, 2, 2, 109, 440, 3, 2, 2, 2, 111, 443, 3, 2, 2, 2, 113, 447, 3, 2, 2, 2, 115, 450, 3, 2, 2, 2, 117, 453, 3, 2, 2, 2, 119, 456, 3, 2, 2, 2, 121, 460, 3, 2, 2, 2, 123, 479, 3, 2, 2, 2, 125, 481, 3, 2, 2, 2, 127, 488, 3, 2, 2, 2, 129, 534, 3, 2, 2, 2, 131, 545, 3, 2, 2, 2, 133, 556, 3, 2, 2, 2, 135, 559, 3, 2, 2, 2, 137, 570, 3, 2, 2, 2, 139, 577, 3, 2, 2, 2, 141, 579, 3, 2, 2, 2, 143, 590, 3, 2, 2, 2, 145, 146, 7, 42, 2, 2, 146, 4, 3, 2, 2, 2, 147, 148, 7, 43, 2, 2, 148, 6, 3, 2, 2, 2, 149, 150, 7, 117, 2, 2, 150, 151, 7, 103, 2, 2, 151, 152, 7, 110, 2, 2, 152, 153, 7, 103, 2, 2, 153, 154, 7, 101, 2, 2, 154, 155, 7, 118, 2, 2, 155, 8, 3, 2, 2, 2, 156, 157, 7, 102, 2, 2, 157, 158, 7, 107, 2, 2, 158, 159, 7, 117, 2, 2, 159, 160, 7, 118, 2, 2, 160, 161, 7, 107, 2, 2, 161, 162, 7, 112, 2, 2, 162, 163, 7, 101, 2, 2, 163, 164, 7, 118, 2, 2, 164, 10, 3, 2, 2, 2, 165, 166, 7, 121, 2, 2, 166, 167, 7, 106, 2, 2, 167, 168, 7, 103, 2, 2, 168, 169, 7, 116, 2, 2, 169, 170, 7, 103, 2, 2, 170, 12, 3, 2, 2, 2, 171, 172, 7, 113, 2, 2, 172, 173, 7, 116, 2, 2, 173, 174, 7, 102, 2, 2, 174, 175, 7, 103, 2, 2, 175, 176, 7, 116, 2, 2, 176, 14, 3, 2, 2, 2, 177, 178, 7, 100, 2, 2, 178, 179, 7, 123, 2, 2, 179, 16, 3, 2, 2, 2, 180, 181, 7, 46, 2, 2, 181, 18, 3, 2, 2, 2, 182, 183, 7, 112, 2, 2, 183, 184, 7, 119, 2, 2, 184, 185, 7, 110, 2, 2, 185, 186, 7, 110, 2, 2, 186, 187, 7, 117, 2, 2, 187, 20, 3, 2, 2, 2, 188, 189, 7, 104, 2, 2, 189, 190, 7, 107, 2, 2, 190, 191, 7, 116, 2, 2, 191, 192, 7, 117, 2, 2, 192, 193, 7, 118, 2, 2, 193, 22, 3, 2, 2, 2, 194, 195, 7, 110, 2, 2, 195, 196, 7, 99, 2, 2, 196, 197, 7, 117, 2, 2, 197, 198, 7, 118, 2, 2, 198, 24, 3, 2, 2, 2, 199, 200, 7, 99, 2, 2, 200, 201, 7, 117, 2, 2, 201, 202, 7, 101, 2, 2, 202, 26, 3, 2, 2, 2, 203, 204, 7, 102, 2, 2, 204, 205, 7, 103, 2, 2, 205, 206, 7, 117, 2, 2, 206, 207, 7, 101, 2, 2, 207, 28, 3, 2, 2, 2, 208, 209, 7, 110, 2, 2, 209, 210, 7, 107, 2, 2, 210, 211, 7, 111, 2, 2, 211, 212, 7, 107, 2, 2, 212, 213, 7, 118, 2, 2, 213, 30, 3, 2, 2, 2, 214, 215, 7, 113, 2, 2, 215, 216, 7, 104, 2, 2, 216, 217, 7, 104, 2, 2, 217, 218, 7, 117, 2, 2, 218, 219, 7, 103, 2, 2, 219, 220, 7, 118, 2, 2, 220, 32, 3, 2, 2, 2, 221, 222, 7, 104, 2, 2, 222, 223, 7, 103, 2, 2, 223, 224, 7, 118, 2, 2, 224, 225, 7, 101, 2, 2, 225, 226, 7, 106, 2, 2, 226, 34, 3, 2, 2, 2, 227, 228, 7, 45, 2, 2, 228, 36, 3, 2, 2, 2, 229, 230, 7, 115, 2, 2, 230, 231, 7, 119, 2, 2, 231, 232, 7, 103, 2, 2, 232, 233, 7, 116, 2, 2, 233, 234, 7, 123, 2, 2, 234, 38, 3, 2, 2, 2, 235, 236, 7, 110, 2, 2, 236, 237, 7, 99, 2, 2, 237, 238, 7, 124, 2, 2, 238, 239, 7, 123, 2, 2, 239, 40, 3, 2, 2, 2, 240, 241, 7, 113, 2, 2, 241, 242, 7, 116, 2, 2, 242, 42, 3, 2, 2, 2, 243, 244, 7, 99, 2, 2, 244, 245, 7, 112, 2, 2, 245, 246, 7, 102, 2, 2, 246, 44, 3, 2, 2, 2, 247, 248, 7, 112, 2, 2, 248, 249, 7, 113, 2, 2, 249, 250, 7, 118, 2, 2, 250, 46, 3, 2, 2, 2, 251, 252, 7, 107, 2, 2, 252, 253, 7, 112, 2, 2, 253, 48, 3, 2, 2, 2, 254, 255, 7, 100, 2, 2, 255, 256, 7, 103, 2, 2, 256, 257, 7, 118, 2, 2, 257, 258, 7, 121, 2, 2, 258, 259, 7, 103, 2, 2, 259, 260, 7, 103, 2, 2, 260, 261, 7, 112, 2, 2, 261, 50, 3, 2, 2, 2, 262, 263, 7, 107, 2, 2, 263, 264, 7, 112, 2, 2, 264, 265, 7, 116, 2, 2, 265, 266, 7, 99, 2, 2, 266, 267, 7, 112, 2, 2, 267, 268, 7, 105, 2, 2, 268, 269, 7, 103, 2, 2, 269, 52, 3, 2, 2, 2, 270, 271, 7, 118, 2, 2, 271, 272, 7, 113, 2, 2, 272, 54, 3, 2, 2, 2, 273, 274, 7, 107, 2, 2, 274, 275, 7, 117, 2, 2, 275, 56, 3, 2, 2, 2, 276, 277, 7, 112, 2, 2, 277, 278, 7, 119, 2, 2, 278, 279, 7, 110, 2, 2, 279, 280, 7, 110, 2, 2, 280, 58, 3, 2, 2, 2, 281, 282, 7, 107, 2, 2, 282, 283, 7, 117, 2, 2, 283, 284, 7, 80, 2, 2, 284, 285, 7, 119, 2, 2, 285, 286, 7, 110, 2, 2, 286, 287, 7, 110, 2, 2, 287, 60, 3, 2, 2, 2, 288, 289, 7, 107, 2, 2, 289, 290, 7, 117, 2, 2, 290, 291, 7, 80, 2, 2, 291, 292, 7, 113, 2, 2, 292, 293, 7, 118, 2, 2, 293, 294, 7, 80, 2, 2, 294, 295, 7, 119, 2, 2, 295, 296, 7, 110, 2, 2, 296, 297, 7, 110, 2, 2, 297, 62, 3, 2, 2, 2, 298, 299, 7, 112, 2, 2, 299, 300, 7, 113, 2, 2, 300, 301, 7, 118, 2, 2, 301, 302, 7, 80, 2, 2, 302, 303, 7, 119, 2, 2, 303, 304, 7, 110, 2, 2, 304, 305, 7, 110, 2, 2, 305, 64, 3, 2, 2, 2, 306, 307, 7, 103, 2, 2, 307, 308, 7, 111, 2, 2, 308, 309, 7, 114, 2, 2, 309, 310, 7, 118, 2, 2, 310, 311, 7, 123, 2, 2, 311, 66, 3, 2, 2, 2, 312, 313, 7, 107, 2, 2, 313, 314, 7, 117, 2, 2, 314, 315, 7, 71, 2, 2, 315, 316, 7, 111, 2, 2, 316, 317, 7, 114, 2, 2, 317, 318, 7, 118, 2, 2, 318, 319, 7, 123, 2, 2, 319, 68, 3, 2, 2, 2, 320, 321, 7, 107, 2, 2, 321, 322, 7, 117, 2, 2, 322, 323, 7, 80, 2, 2, 323, 324, 7, 113, 2, 2, 324, 325, 7, 118, 2, 2, 325, 326, 7, 71, 2, 2, 326, 327, 7, 111, 2, 2, 327, 328, 7, 114, 2, 2, 328, 329, 7, 118, 2, 2, 329, 330, 7, 123, 2, 2, 330, 70, 3, 2, 2, 2, 331, 332, 7, 112, 2, 2, 332, 333, 7, 113, 2, 2, 333, 334, 7, 118, 2, 2, 334, 335, 7, 71, 2, 2, 335, 336, 7, 111, 2, 2, 336, 337, 7, 114, 2, 2, 337, 338, 7, 118, 2, 2, 338, 339, 7, 123, 2, 2, 339, 72, 3, 2, 2, 2, 340, 341, 7, 110, 2, 2, 341, 342, 7, 107, 2, 2, 342, 343, 7, 109, 2, 2, 343, 344, 7, 103, 2, 2, 344, 74, 3, 2, 2, 2, 345, 346, 7, 107, 2, 2, 346, 347, 7, 110, 2, 2, 347, 348, 7, 107, 2, 2, 348, 349, 7, 109, 2, 2, 349, 350, 7, 103, 2, 2, 350, 76, 3, 2, 2, 2, 351, 352, 7, 101, 2, 2, 352, 353, 7, 113, 2, 2, 353, 354, 7, 112, 2, 2, 354, 355, 7, 118, 2, 2, 355, 356, 7, 99, 2, 2, 356, 357, 7, 107, 2, 2, 357, 358, 7, 112, 2, 2, 358, 359, 7, 117, 2, 2, 359, 78, 3, 2, 2, 2, 360, 361, 7, 107, 2, 2, 361, 362, 7, 101, 2, 2, 362, 363, 7, 113, 2, 2, 363, 364, 7, 112, 2, 2, 364, 365, 7, 118, 2, 2, 365, 366, 7, 99, 2, 2, 366, 367, 7, 107, 2, 2, 367, 368, 7, 112, 2, 2, 368, 369, 7, 117, 2, 2, 369, 80, 3, 2, 2, 2, 370, 371, 7, 117, 2, 2, 371, 372, 7, 118, 2, 2, 372, 373, 7, 99, 2, 2, 373, 374, 7, 116, 2, 2, 374, 375, 7, 118, 2, 2, 375, 376, 7, 117, 2, 2, 376, 377, 7, 89, 2, 2, 377, 378, 7, 107, 2, 2, 378, 379, 7, 118, 2, 2, 379, 380, 7, 106, 2, 2, 380, 82, 3, 2, 2, 2, 381, 382, 7, 107, 2, 2, 382, 383, 7, 117, 2, 2, 383, 384, 7, 118, 2, 2, 384, 385, 7, 99, 2, 2, 385, 386, 7, 116, 2, 2, 386, 387, 7, 118, 2, 2, 387, 388, 7, 117, 2, 2, 388, 389, 7, 89, 2, 2, 389, 390, 7, 107, 2, 2, 390, 391, 7, 118, 2, 2, 391, 392, 7, 106, 2, 2, 392, 84, 3, 2, 2, 2, 393, 394, 7, 103, 2, 2, 394, 395, 7, 112, 2, 2, 395, 396, 7, 102, 2, 2, 396, 397, 7, 117, 2, 2, 397, 398, 7, 89, 2, 2, 398, 399, 7, 107, 2, 2, 399, 400, 7, 118, 2, 2, 400, 401, 7, 106, 2, 2, 401, 86, 3, 2, 2, 2, 402, 403, 7, 107, 2, 2, 403, 404, 7, 103, 2, 2, 404, 405, 7, 112, 2, 2, 405, 406, 7, 102, 2, 2, 406, 407, 7, 117, 2, 2, 407, 408, 7, 89, 2, 2, 408, 409, 7, 107, 2, 2, 409, 410, 7, 118, 2, 2, 410, 411, 7, 106, 2, 2, 411, 88, 3, 2, 2, 2, 412, 413, 7, 63, 2, 2, 413, 90, 3, 2, 2, 2, 414, 415, 7, 103, 2, 2, 415, 416, 7, 115, 2, 2, 416, 92, 3, 2, 2, 2, 417, 418, 7, 64, 2, 2, 418, 94, 3, 2, 2, 2, 419, 420, 7, 105, 2, 2, 420, 421, 7, 118, 2, 2, 421, 96, 3, 2, 2, 2, 422, 423, 7, 64, 2, 2, 423, 424, 7, 63, 2, 2, 424, 98, 3, 2, 2, 2, 425, 426, 7, 105, 2, 2, 426, 427, 7, 103, 2, 2, 427, 100, 3, 2, 2, 2, 428, 429, 7, 105, 2, 2, 429, 430, 7, 118, 2, 2, 430, 431, 7, 103, 2, 2, 431, 102, 3, 2, 2, 2, 432, 433, 7, 62, 2, 2, 433, 104, 3, 2, 2, 2, 434, 435, 7, 110, 2, 2, 435, 436, 7, 118, 2, 2, 436, 106, 3, 2, 2, 2, 437, 438, 7, 62, 2, 2, 438, 439, 7, 63, 2, 2, 439, 108, 3, 2, 2, 2, 440, 441, 7, 110, 2, 2, 441, 442, 7, 103, 2, 2, 442, 110, 3, 2, 2, 2, 443, 444, 7, 110, 2, 2, 444, 445, 7, 118, 2, 2, 445, 446, 7, 103, 2, 2, 446, 112, 3, 2, 2, 2, 447, 448, 7, 62, 2, 2, 448, 449, 7, 64, 2, 2, 449, 114, 3, 2, 2, 2, 450, 451, 7, 35, 2, 2, 451, 452, 7, 63, 2, 2, 452, 116, 3, 2, 2, 2, 453, 454, 7, 112, 2, 2, 454, 455, 7, 103, 2, 2, 455, 118, 3, 2, 2, 2, 456, 457, 7, 107, 2, 2, 457, 458, 7, 103, 2, 2, 458, 459, 7, 115, 2, 2, 459, 120, 3, 2, 2, 2, 460, 461, 7, 107, 2, 2, 461, 462, 7, 112, 2, 2, 462, 463, 7, 103, 2, 2, 463, 122, 3, 2, 2, 2, 464, 465, 7, 60, 2, 2, 465, 469, 9, 2, 2, 2, 466, 468, 9, 3, 2, 2, 467, 466, 3, 2, 2, 2, 468, 471, 3, 2, 2, 2, 469, 467, 3, 2, 2, 2, 469, 470, 3, 2, 2, 2, 470, 480, 3, 2, 2, 2, 471, 469, 3, 2, 2, 2, 472, 476, 7, 65, 2, 2, 473, 475, 4, 50, 59, 2, 474, 473, 3, 2, 2, 2, 475, 478, 3, 2, 2, 2, 476, 474, 3, 2, 2, 2, 476, 477, 3, 2, 2, 2, 477, 480, 3, 2, 2, 2, 478, 476, 3, 2, 2, 2, 479, 464, 3, 2, 2, 2, 479, 472, 3, 2, 2, 2, 480, 124, 3, 2, 2, 2, 481, 485, 9, 2, 2, 2, 482, 484, 9, 4, 2, 2, 483, 482, 3, 2, 2, 2, 484, 487, 3, 2, 2, 2, 485, 483, 3, 2, 2, 2, 485, 486, 3, 2, 2, 2, 486, 126, 3, 2, 2, 2, 487, 485, 3, 2, 2, 2, 488, 489, 7, 98, 2, 2, 489, 490, 5, 125, 63, 2, 490, 491, 7, 98, 2, 2, 491, 128, 3, 2, 2, 2, 492, 493, 7, 117, 2, 2, 493, 494, 7, 119, 2, 2, 494, 495, 7, 111, 2, 2, 495, 496, 7, 42, 2, 2, 496, 497, 3, 2, 2, 2, 497, 498, 5, 125, 63, 2, 498, 499, 7, 43, 2, 2, 499, 535, 3, 2, 2, 2, 500, 501, 7, 111, 2, 2, 501, 502, 7, 99, 2, 2, 502, 503, 7, 122, 2, 2, 503, 504, 7, 42, 2, 2, 504, 505, 3, 2, 2, 2, 505, 506, 5, 125, 63, 2, 506, 507, 7, 43, 2, 2, 507, 535, 3, 2, 2, 2, 508, 509, 7, 111, 2, 2, 509, 510, 7, 107, 2, 2, 510, 511, 7, 112, 2, 2, 511, 512, 7, 42, 2, 2, 512, 513, 3, 2, 2, 2, 513, 514, 5, 125, 63, 2, 514, 515, 7, 43, 2, 2, 515, 535, 3, 2, 2, 2, 516, 517, 7, 99, 2, 2, 517, 518, 7, 120, 2, 2, 518, 519, 7, 105, 2, 2, 519, 520, 7, 42, 2, 2, 520, 521, 3, 2, 2, 2, 521, 522, 5, 125, 63, 2, 522, 523, 7, 43, 2, 2, 523, 535, 3, 2, 2, 2, 524, 525, 7, 101, 2, 2, 525, 526, 7, 113, 2, 2, 526, 527, 7, 119, 2, 2, 527, 528, 7, 112, 2, 2, 528, 529, 7, 118, 2, 2, 529, 530, 7, 42, 2, 2, 530, 531, 3, 2, 2, 2, 531, 532, 5, 125, 63, 2, 532, 533, 7, 43, 2, 2, 533, 535, 3, 2, 2, 2, 534, 492, 3, 2, 2, 2, 534, 500, 3, 2, 2, 2, 534, 508, 3, 2, 2, 2, 534, 516, 3, 2, 2, 2, 534, 524, 3, 2, 2, 2, 535, 130, 3, 2, 2, 2, 536, 537, 7, 118, 2, 2, 537, 538, 7, 116, 2, 2, 538, 539, 7, 119, 2, 2, 539, 546, 7, 103, 2, 2, 540, 541, 7, 104, 2, 2, 541, 542, 7, 99, 2, 2, 542, 543, 7, 110, 2, 2, 543, 544, 7, 117, 2, 2, 544, 546, 7, 103, 2, 2, 545, 536, 3, 2, 2, 2, 545, 540, 3, 2, 2, 2, 546, 132, 3, 2, 2, 2, 547, 549, 7, 47, 2, 2, 548, 547, 3, 2, 2, 2, 548, 549, 3, 2, 2, 2, 549, 550, 3, 2, 2, 2, 550, 557, 5, 135, 68, 2, 551, 553, 7, 47, 2, 2, 552, 551, 3, 2, 2, 2, 552, 553, 3, 2, 2, 2, 553, 554, 3, 2, 2, 2, 554, 557, 5, 137, 69, 2, 555, 557, 5, 139, 70, 2, 556, 548, 3, 2, 2, 2, 556, 552, 3, 2, 2, 2, 556, 555, 3, 2, 2, 2, 557, 134, 3, 2, 2, 2, 558, 560, 9, 5, 2, 2, 559, 558, 3, 2, 2, 2, 560, 561, 3, 2, 2, 2, 561, 559, 3, 2, 2, 2, 561, 562, 3, 2, 2, 2, 562, 563, 3, 2, 2, 2, 563, 567, 7, 48, 2, 2, 564, 566, 9, 5, 2, 2, 565, 564, 3, 2, 2, 2, 566, 569, 3, 2, 2, 2, 567, 565, 3, 2, 2, 2, 567, 568, 3, 2, 2, 2, 568, 136, 3, 2, 2, 2, 569, 567, 3, 2, 2, 2, 570, 574, 9, 6, 2, 2, 571, 573, 9, 5, 2, 2, 572, 571, 3, 2, 2, 2, 573, 576, 3, 2, 2, 2, 574, 572, 3, 2, 2, 2, 574, 575, 3, 2, 2, 2, 575, 138, 3, 2, 2, 2, 576, 574, 3, 2, 2, 2, 577, 578, 7, 50, 2, 2, 578, 140, 3, 2, 2, 2, 579, 585, 7, 41, 2, 2, 580, 584, 10, 7, 2, 2, 581, 582, 7, 41, 2, 2, 582, 584, 7, 41, 2, 2, 583, 580, 3, 2, 2, 2, 583, 581, 3, 2, 2, 2, 584, 587, 3, 2, 2, 2, 585, 583, 3, 2, 2, 2, 585, 586, 3, 2, 2, 2, 586, 588, 3, 2, 2, 2, 587, 585, 3, 2, 2, 2, 588, 589, 7, 41, 2, 2, 589, 142, 3, 2, 2, 2, 590, 591, 9, 8, 2, 2, 591, 592, 3, 2, 2, 2, 592, 593, 8, 72, 2, 2, 593, 144, 3, 2, 2, 2, 17, 2, 469, 476, 479, 485, 534, 545, 548, 552, 556, 561, 567, 574, 583, 585, 3, 8, 2, 2]
\ No newline at end of file
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
index f0d4414a5..149bdca4c 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
@@ -140,7 +140,7 @@ public class EQLLexer extends Lexer {
 	public ATN getATN() { return _ATN; }
 
 	public static final String _serializedATN =
-		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2I\u0249\b\1\4\2\t"+
+		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2I\u0252\b\1\4\2\t"+
 		"\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13"+
 		"\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"+
 		"\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"+
@@ -167,76 +167,77 @@ public class EQLLexer extends Lexer {
 		",\3,\3,\3,\3,\3,\3,\3,\3-\3-\3.\3.\3.\3/\3/\3\60\3\60\3\60\3\61\3\61\3"+
 		"\61\3\62\3\62\3\62\3\63\3\63\3\63\3\63\3\64\3\64\3\65\3\65\3\65\3\66\3"+
 		"\66\3\66\3\67\3\67\3\67\38\38\38\38\39\39\39\3:\3:\3:\3;\3;\3;\3<\3<\3"+
-		"<\3<\3=\3=\3=\3=\3>\3>\3>\7>\u01d4\n>\f>\16>\u01d7\13>\3?\3?\7?\u01db"+
-		"\n?\f?\16?\u01de\13?\3@\3@\3@\3@\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3"+
-		"A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3"+
-		"A\3A\3A\3A\3A\3A\3A\5A\u020e\nA\3B\3B\3B\3B\3B\3B\3B\3B\3B\5B\u0219\n"+
-		"B\3C\5C\u021c\nC\3C\3C\5C\u0220\nC\3C\3C\5C\u0224\nC\3D\6D\u0227\nD\r"+
-		"D\16D\u0228\3D\3D\7D\u022d\nD\fD\16D\u0230\13D\3E\3E\7E\u0234\nE\fE\16"+
-		"E\u0237\13E\3F\3F\3G\3G\3G\3G\7G\u023f\nG\fG\16G\u0242\13G\3G\3G\3H\3"+
-		"H\3H\3H\2\2I\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16"+
-		"\33\17\35\20\37\21!\22#\23%\24\'\25)\26+\27-\30/\31\61\32\63\33\65\34"+
-		"\67\359\36;\37= ?!A\"C#E$G%I&K\'M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63e\64g"+
-		"\65i\66k\67m8o9q:s;u<w=y>{?}@\177A\u0081B\u0083C\u0085D\u0087E\u0089F"+
-		"\u008bG\u008dH\u008fI\3\2\t\5\2C\\aac|\6\2\62;C\\aac|\7\2\60\60\62;C\\"+
-		"aac|\3\2\62;\3\2\63;\3\2))\5\2\13\f\17\17\"\"\2\u0258\2\3\3\2\2\2\2\5"+
-		"\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2"+
-		"\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33"+
-		"\3\2\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2"+
-		"\'\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2\2\2\2/\3\2\2\2\2\61\3\2\2\2\2"+
-		"\63\3\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2\29\3\2\2\2\2;\3\2\2\2\2=\3\2\2\2"+
-		"\2?\3\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3\2\2\2\2G\3\2\2\2\2I\3\2\2\2\2K"+
-		"\3\2\2\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2\2\2S\3\2\2\2\2U\3\2\2\2\2W\3\2"+
-		"\2\2\2Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2\2_\3\2\2\2\2a\3\2\2\2\2c\3\2\2\2"+
-		"\2e\3\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2k\3\2\2\2\2m\3\2\2\2\2o\3\2\2\2\2q"+
-		"\3\2\2\2\2s\3\2\2\2\2u\3\2\2\2\2w\3\2\2\2\2y\3\2\2\2\2{\3\2\2\2\2}\3\2"+
-		"\2\2\2\177\3\2\2\2\2\u0081\3\2\2\2\2\u0083\3\2\2\2\2\u0085\3\2\2\2\2\u0087"+
-		"\3\2\2\2\2\u0089\3\2\2\2\2\u008b\3\2\2\2\2\u008d\3\2\2\2\2\u008f\3\2\2"+
-		"\2\3\u0091\3\2\2\2\5\u0093\3\2\2\2\7\u0095\3\2\2\2\t\u009c\3\2\2\2\13"+
-		"\u00a5\3\2\2\2\r\u00ab\3\2\2\2\17\u00b1\3\2\2\2\21\u00b4\3\2\2\2\23\u00b6"+
-		"\3\2\2\2\25\u00bc\3\2\2\2\27\u00c2\3\2\2\2\31\u00c7\3\2\2\2\33\u00cb\3"+
-		"\2\2\2\35\u00d0\3\2\2\2\37\u00d6\3\2\2\2!\u00dd\3\2\2\2#\u00e3\3\2\2\2"+
-		"%\u00e5\3\2\2\2\'\u00eb\3\2\2\2)\u00f0\3\2\2\2+\u00f3\3\2\2\2-\u00f7\3"+
-		"\2\2\2/\u00fb\3\2\2\2\61\u00fe\3\2\2\2\63\u0106\3\2\2\2\65\u010e\3\2\2"+
-		"\2\67\u0111\3\2\2\29\u0114\3\2\2\2;\u0119\3\2\2\2=\u0120\3\2\2\2?\u012a"+
-		"\3\2\2\2A\u0132\3\2\2\2C\u0138\3\2\2\2E\u0140\3\2\2\2G\u014b\3\2\2\2I"+
-		"\u0154\3\2\2\2K\u0159\3\2\2\2M\u015f\3\2\2\2O\u0168\3\2\2\2Q\u0172\3\2"+
-		"\2\2S\u017d\3\2\2\2U\u0189\3\2\2\2W\u0192\3\2\2\2Y\u019c\3\2\2\2[\u019e"+
-		"\3\2\2\2]\u01a1\3\2\2\2_\u01a3\3\2\2\2a\u01a6\3\2\2\2c\u01a9\3\2\2\2e"+
-		"\u01ac\3\2\2\2g\u01b0\3\2\2\2i\u01b2\3\2\2\2k\u01b5\3\2\2\2m\u01b8\3\2"+
-		"\2\2o\u01bb\3\2\2\2q\u01bf\3\2\2\2s\u01c2\3\2\2\2u\u01c5\3\2\2\2w\u01c8"+
-		"\3\2\2\2y\u01cc\3\2\2\2{\u01d0\3\2\2\2}\u01d8\3\2\2\2\177\u01df\3\2\2"+
-		"\2\u0081\u020d\3\2\2\2\u0083\u0218\3\2\2\2\u0085\u0223\3\2\2\2\u0087\u0226"+
-		"\3\2\2\2\u0089\u0231\3\2\2\2\u008b\u0238\3\2\2\2\u008d\u023a\3\2\2\2\u008f"+
-		"\u0245\3\2\2\2\u0091\u0092\7*\2\2\u0092\4\3\2\2\2\u0093\u0094\7+\2\2\u0094"+
-		"\6\3\2\2\2\u0095\u0096\7u\2\2\u0096\u0097\7g\2\2\u0097\u0098\7n\2\2\u0098"+
-		"\u0099\7g\2\2\u0099\u009a\7e\2\2\u009a\u009b\7v\2\2\u009b\b\3\2\2\2\u009c"+
-		"\u009d\7f\2\2\u009d\u009e\7k\2\2\u009e\u009f\7u\2\2\u009f\u00a0\7v\2\2"+
-		"\u00a0\u00a1\7k\2\2\u00a1\u00a2\7p\2\2\u00a2\u00a3\7e\2\2\u00a3\u00a4"+
-		"\7v\2\2\u00a4\n\3\2\2\2\u00a5\u00a6\7y\2\2\u00a6\u00a7\7j\2\2\u00a7\u00a8"+
-		"\7g\2\2\u00a8\u00a9\7t\2\2\u00a9\u00aa\7g\2\2\u00aa\f\3\2\2\2\u00ab\u00ac"+
-		"\7q\2\2\u00ac\u00ad\7t\2\2\u00ad\u00ae\7f\2\2\u00ae\u00af\7g\2\2\u00af"+
-		"\u00b0\7t\2\2\u00b0\16\3\2\2\2\u00b1\u00b2\7d\2\2\u00b2\u00b3\7{\2\2\u00b3"+
-		"\20\3\2\2\2\u00b4\u00b5\7.\2\2\u00b5\22\3\2\2\2\u00b6\u00b7\7p\2\2\u00b7"+
-		"\u00b8\7w\2\2\u00b8\u00b9\7n\2\2\u00b9\u00ba\7n\2\2\u00ba\u00bb\7u\2\2"+
-		"\u00bb\24\3\2\2\2\u00bc\u00bd\7h\2\2\u00bd\u00be\7k\2\2\u00be\u00bf\7"+
-		"t\2\2\u00bf\u00c0\7u\2\2\u00c0\u00c1\7v\2\2\u00c1\26\3\2\2\2\u00c2\u00c3"+
-		"\7n\2\2\u00c3\u00c4\7c\2\2\u00c4\u00c5\7u\2\2\u00c5\u00c6\7v\2\2\u00c6"+
-		"\30\3\2\2\2\u00c7\u00c8\7c\2\2\u00c8\u00c9\7u\2\2\u00c9\u00ca\7e\2\2\u00ca"+
-		"\32\3\2\2\2\u00cb\u00cc\7f\2\2\u00cc\u00cd\7g\2\2\u00cd\u00ce\7u\2\2\u00ce"+
-		"\u00cf\7e\2\2\u00cf\34\3\2\2\2\u00d0\u00d1\7n\2\2\u00d1\u00d2\7k\2\2\u00d2"+
-		"\u00d3\7o\2\2\u00d3\u00d4\7k\2\2\u00d4\u00d5\7v\2\2\u00d5\36\3\2\2\2\u00d6"+
-		"\u00d7\7q\2\2\u00d7\u00d8\7h\2\2\u00d8\u00d9\7h\2\2\u00d9\u00da\7u\2\2"+
-		"\u00da\u00db\7g\2\2\u00db\u00dc\7v\2\2\u00dc \3\2\2\2\u00dd\u00de\7h\2"+
-		"\2\u00de\u00df\7g\2\2\u00df\u00e0\7v\2\2\u00e0\u00e1\7e\2\2\u00e1\u00e2"+
-		"\7j\2\2\u00e2\"\3\2\2\2\u00e3\u00e4\7-\2\2\u00e4$\3\2\2\2\u00e5\u00e6"+
-		"\7s\2\2\u00e6\u00e7\7w\2\2\u00e7\u00e8\7g\2\2\u00e8\u00e9\7t\2\2\u00e9"+
-		"\u00ea\7{\2\2\u00ea&\3\2\2\2\u00eb\u00ec\7n\2\2\u00ec\u00ed\7c\2\2\u00ed"+
-		"\u00ee\7|\2\2\u00ee\u00ef\7{\2\2\u00ef(\3\2\2\2\u00f0\u00f1\7q\2\2\u00f1"+
-		"\u00f2\7t\2\2\u00f2*\3\2\2\2\u00f3\u00f4\7c\2\2\u00f4\u00f5\7p\2\2\u00f5"+
-		"\u00f6\7f\2\2\u00f6,\3\2\2\2\u00f7\u00f8\7p\2\2\u00f8\u00f9\7q\2\2\u00f9"+
-		"\u00fa\7v\2\2\u00fa.\3\2\2\2\u00fb\u00fc\7k\2\2\u00fc\u00fd\7p\2\2\u00fd"+
-		"\60\3\2\2\2\u00fe\u00ff\7d\2\2\u00ff\u0100\7g\2\2\u0100\u0101\7v\2\2\u0101"+
+		"<\3<\3=\3=\3=\3=\3>\3>\3>\7>\u01d4\n>\f>\16>\u01d7\13>\3>\3>\7>\u01db"+
+		"\n>\f>\16>\u01de\13>\5>\u01e0\n>\3?\3?\7?\u01e4\n?\f?\16?\u01e7\13?\3"+
+		"@\3@\3@\3@\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3"+
+		"A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\5"+
+		"A\u0217\nA\3B\3B\3B\3B\3B\3B\3B\3B\3B\5B\u0222\nB\3C\5C\u0225\nC\3C\3"+
+		"C\5C\u0229\nC\3C\3C\5C\u022d\nC\3D\6D\u0230\nD\rD\16D\u0231\3D\3D\7D\u0236"+
+		"\nD\fD\16D\u0239\13D\3E\3E\7E\u023d\nE\fE\16E\u0240\13E\3F\3F\3G\3G\3"+
+		"G\3G\7G\u0248\nG\fG\16G\u024b\13G\3G\3G\3H\3H\3H\3H\2\2I\3\3\5\4\7\5\t"+
+		"\6\13\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16\33\17\35\20\37\21!\22#\23"+
+		"%\24\'\25)\26+\27-\30/\31\61\32\63\33\65\34\67\359\36;\37= ?!A\"C#E$G"+
+		"%I&K\'M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63e\64g\65i\66k\67m8o9q:s;u<w=y>{"+
+		"?}@\177A\u0081B\u0083C\u0085D\u0087E\u0089F\u008bG\u008dH\u008fI\3\2\t"+
+		"\5\2C\\aac|\6\2\62;C\\aac|\7\2\60\60\62;C\\aac|\3\2\62;\3\2\63;\3\2))"+
+		"\5\2\13\f\17\17\"\"\2\u0263\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3"+
+		"\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2"+
+		"\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2\37"+
+		"\3\2\2\2\2!\3\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2\2+\3"+
+		"\2\2\2\2-\3\2\2\2\2/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2\2"+
+		"\67\3\2\2\2\29\3\2\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2\2C"+
+		"\3\2\2\2\2E\3\2\2\2\2G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O\3\2"+
+		"\2\2\2Q\3\2\2\2\2S\3\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2\2\2"+
+		"\2]\3\2\2\2\2_\3\2\2\2\2a\3\2\2\2\2c\3\2\2\2\2e\3\2\2\2\2g\3\2\2\2\2i"+
+		"\3\2\2\2\2k\3\2\2\2\2m\3\2\2\2\2o\3\2\2\2\2q\3\2\2\2\2s\3\2\2\2\2u\3\2"+
+		"\2\2\2w\3\2\2\2\2y\3\2\2\2\2{\3\2\2\2\2}\3\2\2\2\2\177\3\2\2\2\2\u0081"+
+		"\3\2\2\2\2\u0083\3\2\2\2\2\u0085\3\2\2\2\2\u0087\3\2\2\2\2\u0089\3\2\2"+
+		"\2\2\u008b\3\2\2\2\2\u008d\3\2\2\2\2\u008f\3\2\2\2\3\u0091\3\2\2\2\5\u0093"+
+		"\3\2\2\2\7\u0095\3\2\2\2\t\u009c\3\2\2\2\13\u00a5\3\2\2\2\r\u00ab\3\2"+
+		"\2\2\17\u00b1\3\2\2\2\21\u00b4\3\2\2\2\23\u00b6\3\2\2\2\25\u00bc\3\2\2"+
+		"\2\27\u00c2\3\2\2\2\31\u00c7\3\2\2\2\33\u00cb\3\2\2\2\35\u00d0\3\2\2\2"+
+		"\37\u00d6\3\2\2\2!\u00dd\3\2\2\2#\u00e3\3\2\2\2%\u00e5\3\2\2\2\'\u00eb"+
+		"\3\2\2\2)\u00f0\3\2\2\2+\u00f3\3\2\2\2-\u00f7\3\2\2\2/\u00fb\3\2\2\2\61"+
+		"\u00fe\3\2\2\2\63\u0106\3\2\2\2\65\u010e\3\2\2\2\67\u0111\3\2\2\29\u0114"+
+		"\3\2\2\2;\u0119\3\2\2\2=\u0120\3\2\2\2?\u012a\3\2\2\2A\u0132\3\2\2\2C"+
+		"\u0138\3\2\2\2E\u0140\3\2\2\2G\u014b\3\2\2\2I\u0154\3\2\2\2K\u0159\3\2"+
+		"\2\2M\u015f\3\2\2\2O\u0168\3\2\2\2Q\u0172\3\2\2\2S\u017d\3\2\2\2U\u0189"+
+		"\3\2\2\2W\u0192\3\2\2\2Y\u019c\3\2\2\2[\u019e\3\2\2\2]\u01a1\3\2\2\2_"+
+		"\u01a3\3\2\2\2a\u01a6\3\2\2\2c\u01a9\3\2\2\2e\u01ac\3\2\2\2g\u01b0\3\2"+
+		"\2\2i\u01b2\3\2\2\2k\u01b5\3\2\2\2m\u01b8\3\2\2\2o\u01bb\3\2\2\2q\u01bf"+
+		"\3\2\2\2s\u01c2\3\2\2\2u\u01c5\3\2\2\2w\u01c8\3\2\2\2y\u01cc\3\2\2\2{"+
+		"\u01df\3\2\2\2}\u01e1\3\2\2\2\177\u01e8\3\2\2\2\u0081\u0216\3\2\2\2\u0083"+
+		"\u0221\3\2\2\2\u0085\u022c\3\2\2\2\u0087\u022f\3\2\2\2\u0089\u023a\3\2"+
+		"\2\2\u008b\u0241\3\2\2\2\u008d\u0243\3\2\2\2\u008f\u024e\3\2\2\2\u0091"+
+		"\u0092\7*\2\2\u0092\4\3\2\2\2\u0093\u0094\7+\2\2\u0094\6\3\2\2\2\u0095"+
+		"\u0096\7u\2\2\u0096\u0097\7g\2\2\u0097\u0098\7n\2\2\u0098\u0099\7g\2\2"+
+		"\u0099\u009a\7e\2\2\u009a\u009b\7v\2\2\u009b\b\3\2\2\2\u009c\u009d\7f"+
+		"\2\2\u009d\u009e\7k\2\2\u009e\u009f\7u\2\2\u009f\u00a0\7v\2\2\u00a0\u00a1"+
+		"\7k\2\2\u00a1\u00a2\7p\2\2\u00a2\u00a3\7e\2\2\u00a3\u00a4\7v\2\2\u00a4"+
+		"\n\3\2\2\2\u00a5\u00a6\7y\2\2\u00a6\u00a7\7j\2\2\u00a7\u00a8\7g\2\2\u00a8"+
+		"\u00a9\7t\2\2\u00a9\u00aa\7g\2\2\u00aa\f\3\2\2\2\u00ab\u00ac\7q\2\2\u00ac"+
+		"\u00ad\7t\2\2\u00ad\u00ae\7f\2\2\u00ae\u00af\7g\2\2\u00af\u00b0\7t\2\2"+
+		"\u00b0\16\3\2\2\2\u00b1\u00b2\7d\2\2\u00b2\u00b3\7{\2\2\u00b3\20\3\2\2"+
+		"\2\u00b4\u00b5\7.\2\2\u00b5\22\3\2\2\2\u00b6\u00b7\7p\2\2\u00b7\u00b8"+
+		"\7w\2\2\u00b8\u00b9\7n\2\2\u00b9\u00ba\7n\2\2\u00ba\u00bb\7u\2\2\u00bb"+
+		"\24\3\2\2\2\u00bc\u00bd\7h\2\2\u00bd\u00be\7k\2\2\u00be\u00bf\7t\2\2\u00bf"+
+		"\u00c0\7u\2\2\u00c0\u00c1\7v\2\2\u00c1\26\3\2\2\2\u00c2\u00c3\7n\2\2\u00c3"+
+		"\u00c4\7c\2\2\u00c4\u00c5\7u\2\2\u00c5\u00c6\7v\2\2\u00c6\30\3\2\2\2\u00c7"+
+		"\u00c8\7c\2\2\u00c8\u00c9\7u\2\2\u00c9\u00ca\7e\2\2\u00ca\32\3\2\2\2\u00cb"+
+		"\u00cc\7f\2\2\u00cc\u00cd\7g\2\2\u00cd\u00ce\7u\2\2\u00ce\u00cf\7e\2\2"+
+		"\u00cf\34\3\2\2\2\u00d0\u00d1\7n\2\2\u00d1\u00d2\7k\2\2\u00d2\u00d3\7"+
+		"o\2\2\u00d3\u00d4\7k\2\2\u00d4\u00d5\7v\2\2\u00d5\36\3\2\2\2\u00d6\u00d7"+
+		"\7q\2\2\u00d7\u00d8\7h\2\2\u00d8\u00d9\7h\2\2\u00d9\u00da\7u\2\2\u00da"+
+		"\u00db\7g\2\2\u00db\u00dc\7v\2\2\u00dc \3\2\2\2\u00dd\u00de\7h\2\2\u00de"+
+		"\u00df\7g\2\2\u00df\u00e0\7v\2\2\u00e0\u00e1\7e\2\2\u00e1\u00e2\7j\2\2"+
+		"\u00e2\"\3\2\2\2\u00e3\u00e4\7-\2\2\u00e4$\3\2\2\2\u00e5\u00e6\7s\2\2"+
+		"\u00e6\u00e7\7w\2\2\u00e7\u00e8\7g\2\2\u00e8\u00e9\7t\2\2\u00e9\u00ea"+
+		"\7{\2\2\u00ea&\3\2\2\2\u00eb\u00ec\7n\2\2\u00ec\u00ed\7c\2\2\u00ed\u00ee"+
+		"\7|\2\2\u00ee\u00ef\7{\2\2\u00ef(\3\2\2\2\u00f0\u00f1\7q\2\2\u00f1\u00f2"+
+		"\7t\2\2\u00f2*\3\2\2\2\u00f3\u00f4\7c\2\2\u00f4\u00f5\7p\2\2\u00f5\u00f6"+
+		"\7f\2\2\u00f6,\3\2\2\2\u00f7\u00f8\7p\2\2\u00f8\u00f9\7q\2\2\u00f9\u00fa"+
+		"\7v\2\2\u00fa.\3\2\2\2\u00fb\u00fc\7k\2\2\u00fc\u00fd\7p\2\2\u00fd\60"+
+		"\3\2\2\2\u00fe\u00ff\7d\2\2\u00ff\u0100\7g\2\2\u0100\u0101\7v\2\2\u0101"+
 		"\u0102\7y\2\2\u0102\u0103\7g\2\2\u0103\u0104\7g\2\2\u0104\u0105\7p\2\2"+
 		"\u0105\62\3\2\2\2\u0106\u0107\7k\2\2\u0107\u0108\7p\2\2\u0108\u0109\7"+
 		"t\2\2\u0109\u010a\7c\2\2\u010a\u010b\7p\2\2\u010b\u010c\7i\2\2\u010c\u010d"+
@@ -292,44 +293,47 @@ public class EQLLexer extends Lexer {
 		"\7s\2\2\u01cbx\3\2\2\2\u01cc\u01cd\7k\2\2\u01cd\u01ce\7p\2\2\u01ce\u01cf"+
 		"\7g\2\2\u01cfz\3\2\2\2\u01d0\u01d1\7<\2\2\u01d1\u01d5\t\2\2\2\u01d2\u01d4"+
 		"\t\3\2\2\u01d3\u01d2\3\2\2\2\u01d4\u01d7\3\2\2\2\u01d5\u01d3\3\2\2\2\u01d5"+
-		"\u01d6\3\2\2\2\u01d6|\3\2\2\2\u01d7\u01d5\3\2\2\2\u01d8\u01dc\t\2\2\2"+
-		"\u01d9\u01db\t\4\2\2\u01da\u01d9\3\2\2\2\u01db\u01de\3\2\2\2\u01dc\u01da"+
-		"\3\2\2\2\u01dc\u01dd\3\2\2\2\u01dd~\3\2\2\2\u01de\u01dc\3\2\2\2\u01df"+
-		"\u01e0\7b\2\2\u01e0\u01e1\5}?\2\u01e1\u01e2\7b\2\2\u01e2\u0080\3\2\2\2"+
-		"\u01e3\u01e4\7u\2\2\u01e4\u01e5\7w\2\2\u01e5\u01e6\7o\2\2\u01e6\u01e7"+
-		"\7*\2\2\u01e7\u01e8\3\2\2\2\u01e8\u01e9\5}?\2\u01e9\u01ea\7+\2\2\u01ea"+
-		"\u020e\3\2\2\2\u01eb\u01ec\7o\2\2\u01ec\u01ed\7c\2\2\u01ed\u01ee\7z\2"+
-		"\2\u01ee\u01ef\7*\2\2\u01ef\u01f0\3\2\2\2\u01f0\u01f1\5}?\2\u01f1\u01f2"+
-		"\7+\2\2\u01f2\u020e\3\2\2\2\u01f3\u01f4\7o\2\2\u01f4\u01f5\7k\2\2\u01f5"+
-		"\u01f6\7p\2\2\u01f6\u01f7\7*\2\2\u01f7\u01f8\3\2\2\2\u01f8\u01f9\5}?\2"+
-		"\u01f9\u01fa\7+\2\2\u01fa\u020e\3\2\2\2\u01fb\u01fc\7c\2\2\u01fc\u01fd"+
-		"\7x\2\2\u01fd\u01fe\7i\2\2\u01fe\u01ff\7*\2\2\u01ff\u0200\3\2\2\2\u0200"+
-		"\u0201\5}?\2\u0201\u0202\7+\2\2\u0202\u020e\3\2\2\2\u0203\u0204\7e\2\2"+
-		"\u0204\u0205\7q\2\2\u0205\u0206\7w\2\2\u0206\u0207\7p\2\2\u0207\u0208"+
-		"\7v\2\2\u0208\u0209\7*\2\2\u0209\u020a\3\2\2\2\u020a\u020b\5}?\2\u020b"+
-		"\u020c\7+\2\2\u020c\u020e\3\2\2\2\u020d\u01e3\3\2\2\2\u020d\u01eb\3\2"+
-		"\2\2\u020d\u01f3\3\2\2\2\u020d\u01fb\3\2\2\2\u020d\u0203\3\2\2\2\u020e"+
-		"\u0082\3\2\2\2\u020f\u0210\7v\2\2\u0210\u0211\7t\2\2\u0211\u0212\7w\2"+
-		"\2\u0212\u0219\7g\2\2\u0213\u0214\7h\2\2\u0214\u0215\7c\2\2\u0215\u0216"+
-		"\7n\2\2\u0216\u0217\7u\2\2\u0217\u0219\7g\2\2\u0218\u020f\3\2\2\2\u0218"+
-		"\u0213\3\2\2\2\u0219\u0084\3\2\2\2\u021a\u021c\7/\2\2\u021b\u021a\3\2"+
-		"\2\2\u021b\u021c\3\2\2\2\u021c\u021d\3\2\2\2\u021d\u0224\5\u0087D\2\u021e"+
-		"\u0220\7/\2\2\u021f\u021e\3\2\2\2\u021f\u0220\3\2\2\2\u0220\u0221\3\2"+
-		"\2\2\u0221\u0224\5\u0089E\2\u0222\u0224\5\u008bF\2\u0223\u021b\3\2\2\2"+
-		"\u0223\u021f\3\2\2\2\u0223\u0222\3\2\2\2\u0224\u0086\3\2\2\2\u0225\u0227"+
-		"\t\5\2\2\u0226\u0225\3\2\2\2\u0227\u0228\3\2\2\2\u0228\u0226\3\2\2\2\u0228"+
-		"\u0229\3\2\2\2\u0229\u022a\3\2\2\2\u022a\u022e\7\60\2\2\u022b\u022d\t"+
-		"\5\2\2\u022c\u022b\3\2\2\2\u022d\u0230\3\2\2\2\u022e\u022c\3\2\2\2\u022e"+
-		"\u022f\3\2\2\2\u022f\u0088\3\2\2\2\u0230\u022e\3\2\2\2\u0231\u0235\t\6"+
-		"\2\2\u0232\u0234\t\5\2\2\u0233\u0232\3\2\2\2\u0234\u0237\3\2\2\2\u0235"+
-		"\u0233\3\2\2\2\u0235\u0236\3\2\2\2\u0236\u008a\3\2\2\2\u0237\u0235\3\2"+
-		"\2\2\u0238\u0239\7\62\2\2\u0239\u008c\3\2\2\2\u023a\u0240\7)\2\2\u023b"+
-		"\u023f\n\7\2\2\u023c\u023d\7)\2\2\u023d\u023f\7)\2\2\u023e\u023b\3\2\2"+
-		"\2\u023e\u023c\3\2\2\2\u023f\u0242\3\2\2\2\u0240\u023e\3\2\2\2\u0240\u0241"+
-		"\3\2\2\2\u0241\u0243\3\2\2\2\u0242\u0240\3\2\2\2\u0243\u0244\7)\2\2\u0244"+
-		"\u008e\3\2\2\2\u0245\u0246\t\b\2\2\u0246\u0247\3\2\2\2\u0247\u0248\bH"+
-		"\2\2\u0248\u0090\3\2\2\2\17\2\u01d5\u01dc\u020d\u0218\u021b\u021f\u0223"+
-		"\u0228\u022e\u0235\u023e\u0240\3\b\2\2";
+		"\u01d6\3\2\2\2\u01d6\u01e0\3\2\2\2\u01d7\u01d5\3\2\2\2\u01d8\u01dc\7A"+
+		"\2\2\u01d9\u01db\4\62;\2\u01da\u01d9\3\2\2\2\u01db\u01de\3\2\2\2\u01dc"+
+		"\u01da\3\2\2\2\u01dc\u01dd\3\2\2\2\u01dd\u01e0\3\2\2\2\u01de\u01dc\3\2"+
+		"\2\2\u01df\u01d0\3\2\2\2\u01df\u01d8\3\2\2\2\u01e0|\3\2\2\2\u01e1\u01e5"+
+		"\t\2\2\2\u01e2\u01e4\t\4\2\2\u01e3\u01e2\3\2\2\2\u01e4\u01e7\3\2\2\2\u01e5"+
+		"\u01e3\3\2\2\2\u01e5\u01e6\3\2\2\2\u01e6~\3\2\2\2\u01e7\u01e5\3\2\2\2"+
+		"\u01e8\u01e9\7b\2\2\u01e9\u01ea\5}?\2\u01ea\u01eb\7b\2\2\u01eb\u0080\3"+
+		"\2\2\2\u01ec\u01ed\7u\2\2\u01ed\u01ee\7w\2\2\u01ee\u01ef\7o\2\2\u01ef"+
+		"\u01f0\7*\2\2\u01f0\u01f1\3\2\2\2\u01f1\u01f2\5}?\2\u01f2\u01f3\7+\2\2"+
+		"\u01f3\u0217\3\2\2\2\u01f4\u01f5\7o\2\2\u01f5\u01f6\7c\2\2\u01f6\u01f7"+
+		"\7z\2\2\u01f7\u01f8\7*\2\2\u01f8\u01f9\3\2\2\2\u01f9\u01fa\5}?\2\u01fa"+
+		"\u01fb\7+\2\2\u01fb\u0217\3\2\2\2\u01fc\u01fd\7o\2\2\u01fd\u01fe\7k\2"+
+		"\2\u01fe\u01ff\7p\2\2\u01ff\u0200\7*\2\2\u0200\u0201\3\2\2\2\u0201\u0202"+
+		"\5}?\2\u0202\u0203\7+\2\2\u0203\u0217\3\2\2\2\u0204\u0205\7c\2\2\u0205"+
+		"\u0206\7x\2\2\u0206\u0207\7i\2\2\u0207\u0208\7*\2\2\u0208\u0209\3\2\2"+
+		"\2\u0209\u020a\5}?\2\u020a\u020b\7+\2\2\u020b\u0217\3\2\2\2\u020c\u020d"+
+		"\7e\2\2\u020d\u020e\7q\2\2\u020e\u020f\7w\2\2\u020f\u0210\7p\2\2\u0210"+
+		"\u0211\7v\2\2\u0211\u0212\7*\2\2\u0212\u0213\3\2\2\2\u0213\u0214\5}?\2"+
+		"\u0214\u0215\7+\2\2\u0215\u0217\3\2\2\2\u0216\u01ec\3\2\2\2\u0216\u01f4"+
+		"\3\2\2\2\u0216\u01fc\3\2\2\2\u0216\u0204\3\2\2\2\u0216\u020c\3\2\2\2\u0217"+
+		"\u0082\3\2\2\2\u0218\u0219\7v\2\2\u0219\u021a\7t\2\2\u021a\u021b\7w\2"+
+		"\2\u021b\u0222\7g\2\2\u021c\u021d\7h\2\2\u021d\u021e\7c\2\2\u021e\u021f"+
+		"\7n\2\2\u021f\u0220\7u\2\2\u0220\u0222\7g\2\2\u0221\u0218\3\2\2\2\u0221"+
+		"\u021c\3\2\2\2\u0222\u0084\3\2\2\2\u0223\u0225\7/\2\2\u0224\u0223\3\2"+
+		"\2\2\u0224\u0225\3\2\2\2\u0225\u0226\3\2\2\2\u0226\u022d\5\u0087D\2\u0227"+
+		"\u0229\7/\2\2\u0228\u0227\3\2\2\2\u0228\u0229\3\2\2\2\u0229\u022a\3\2"+
+		"\2\2\u022a\u022d\5\u0089E\2\u022b\u022d\5\u008bF\2\u022c\u0224\3\2\2\2"+
+		"\u022c\u0228\3\2\2\2\u022c\u022b\3\2\2\2\u022d\u0086\3\2\2\2\u022e\u0230"+
+		"\t\5\2\2\u022f\u022e\3\2\2\2\u0230\u0231\3\2\2\2\u0231\u022f\3\2\2\2\u0231"+
+		"\u0232\3\2\2\2\u0232\u0233\3\2\2\2\u0233\u0237\7\60\2\2\u0234\u0236\t"+
+		"\5\2\2\u0235\u0234\3\2\2\2\u0236\u0239\3\2\2\2\u0237\u0235\3\2\2\2\u0237"+
+		"\u0238\3\2\2\2\u0238\u0088\3\2\2\2\u0239\u0237\3\2\2\2\u023a\u023e\t\6"+
+		"\2\2\u023b\u023d\t\5\2\2\u023c\u023b\3\2\2\2\u023d\u0240\3\2\2\2\u023e"+
+		"\u023c\3\2\2\2\u023e\u023f\3\2\2\2\u023f\u008a\3\2\2\2\u0240\u023e\3\2"+
+		"\2\2\u0241\u0242\7\62\2\2\u0242\u008c\3\2\2\2\u0243\u0249\7)\2\2\u0244"+
+		"\u0248\n\7\2\2\u0245\u0246\7)\2\2\u0246\u0248\7)\2\2\u0247\u0244\3\2\2"+
+		"\2\u0247\u0245\3\2\2\2\u0248\u024b\3\2\2\2\u0249\u0247\3\2\2\2\u0249\u024a"+
+		"\3\2\2\2\u024a\u024c\3\2\2\2\u024b\u0249\3\2\2\2\u024c\u024d\7)\2\2\u024d"+
+		"\u008e\3\2\2\2\u024e\u024f\t\b\2\2\u024f\u0250\3\2\2\2\u0250\u0251\bH"+
+		"\2\2\u0251\u0090\3\2\2\2\21\2\u01d5\u01dc\u01df\u01e5\u0216\u0221\u0224"+
+		"\u0228\u022c\u0231\u0237\u023e\u0247\u0249\3\b\2\2";
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {
diff --git a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
index 9d0bf98e2..eac2aefdf 100644
--- a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
@@ -691,15 +691,45 @@ public class EqlParserTest extends BaseTestCase {
     }
   }
 
-//  @Test
-//  public void where_withParams() {
-//
-//    final Query<Customer> query = where("name = ? and smallnote istartsWith ?", "Rob", "Foo");
-//    query.findList();
-//    if (isH2()) {
-//      assertThat(query.getGeneratedSql()).contains(" from o_customer t0 where t0.name is not null");
-//    }
-//  }
+  @Test
+  public void where_withParams() {
+
+    final Query<Customer> query = where("id isNotNull and name = ? and smallnote istartsWith ?", "Rob", "Foo");
+    query.findList();
+    if (isH2()) {
+      assertThat(query.getGeneratedSql()).contains("where (t0.id is not null and t0.name = ? and lower(t0.smallnote) like ? escape'|' )");
+    }
+  }
+
+  @Test
+  public void where_withParamsQuPos() {
+
+    final Query<Customer> query = where("name = ?1 and smallnote istartsWith ?2 and name like ?1", "Rob", "Foo");
+    query.findList();
+    if (isH2()) {
+      assertThat(query.getGeneratedSql()).contains(" where (t0.name = ? and lower(t0.smallnote) like ? escape'|'  and t0.name like ? escape'' )");
+    }
+  }
+
+  @Test
+  public void where_orSimple() {
+
+    final Query<Customer> query = where("id isNotNull or name = ?", "Rob", "Foo");
+    query.findList();
+    if (isH2()) {
+      assertThat(query.getGeneratedSql()).contains("where (t0.id is not null or t0.name = ?)");
+    }
+  }
+
+  @Test
+  public void where_orWithParams() {
+
+    final Query<Customer> query = where("(id isNotNull or name = ?) and smallnote istartsWith ?", "Rob", "Foo");
+    query.findList();
+    if (isH2()) {
+      assertThat(query.getGeneratedSql()).contains("where ((t0.id is not null or t0.name = ?) and lower(t0.smallnote) like ? escape'|' )");
+    }
+  }
 
   private Query<Customer> where(String where, Object... params) {
 
diff --git a/src/test/java/org/tests/query/TestQueryFilterMany.java b/src/test/java/org/tests/query/TestQueryFilterMany.java
index 448bcd173..2dff48308 100644
--- a/src/test/java/org/tests/query/TestQueryFilterMany.java
+++ b/src/test/java/org/tests/query/TestQueryFilterMany.java
@@ -176,4 +176,23 @@ public class TestQueryFilterMany extends BaseTestCase {
     platformAssertIn(sql.get(2), " from contact_note t0 where (t0.contact_id)");
     assertThat(sql.get(2)).contains(" and lower(t0.title) like");
   }
+
+  @Test
+  public void testFilterManyUsingExpression() {
+
+    ResetBasicData.reset();
+    LoggedSqlCollector.start();
+
+    Ebean.find(Customer.class)
+      .where()
+      .filterMany("contacts", "firstName isNotNull and email istartsWith ?", "rob")
+      .findList();
+
+    List<String> sql = LoggedSqlCollector.stop();
+
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains(" from o_customer t0");
+    assertThat(sql.get(1)).contains("from contact t0 where ");
+    assertThat(sql.get(1)).contains("and (t0.first_name is not null and lower(t0.email) like ? escape'|' )");
+  }
 }
diff --git a/src/test/resources/EQL.g4 b/src/test/resources/EQL.g4
index 3b6d1d702..121425b92 100644
--- a/src/test/resources/EQL.g4
+++ b/src/test/resources/EQL.g4
@@ -215,6 +215,7 @@ literal
 
 INPUT_VARIABLE
    : ':' ('a' .. 'z' | 'A' .. 'Z' | '_') ('a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_')*
+   | '?' ('0' .. '9')*
    ;
 
 PATH_VARIABLE

From ba6810891e3d66ebf3b0aa3fde532392a1467049 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 15 Aug 2019 22:20:09 +1200
Subject: [PATCH 1010/1036] Bump to 11.43.1-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 847881e6b..02c600b65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.42.4-SNAPSHOT</version>
+  <version>11.43.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>

From c3f556f0dcc21befdfa2d488691cbb77a0c57118 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 15 Aug 2019 23:40:19 +1200
Subject: [PATCH 1011/1036] #1794 - Extend EQL to support inOrEmpty, eqOrNull,
 gtOrNull, ltOrNull

---
 .../server/grammer/EqlOperator.java           |   3 +
 .../server/grammer/EqlWhereListener.java      |  70 +-
 .../server/grammer/OperatorMapping.java       |   7 +-
 .../server/grammer/antlr/EQL.interp           |  11 +-
 .../server/grammer/antlr/EQL.tokens           | 108 +--
 .../server/grammer/antlr/EQLBaseListener.java |  12 +
 .../server/grammer/antlr/EQLLexer.interp      |  14 +-
 .../server/grammer/antlr/EQLLexer.java        | 420 ++++-----
 .../server/grammer/antlr/EQLLexer.tokens      | 108 +--
 .../server/grammer/antlr/EQLListener.java     |  10 +
 .../server/grammer/antlr/EQLParser.java       | 798 ++++++++++--------
 .../server/grammer/EqlParserTest.java         | 115 +++
 src/test/resources/EQL.g4                     |   6 +
 13 files changed, 994 insertions(+), 688 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlOperator.java b/src/main/java/io/ebeaninternal/server/grammer/EqlOperator.java
index 809413fd2..b47b84998 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/EqlOperator.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlOperator.java
@@ -10,6 +10,9 @@ enum EqlOperator {
   LTE,
   GT,
   GTE,
+  EQORNULL,
+  LTORNULL,
+  GTORNULL,
   CONTAINS,
   STARTS_WITH,
   ENDS_WITH,
diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlWhereListener.java b/src/main/java/io/ebeaninternal/server/grammer/EqlWhereListener.java
index 2c623125b..9394918ca 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/EqlWhereListener.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlWhereListener.java
@@ -15,6 +15,7 @@ import org.antlr.v4.runtime.tree.TerminalNode;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 abstract class EqlWhereListener<T> extends EQLBaseListener {
 
@@ -26,6 +27,8 @@ abstract class EqlWhereListener<T> extends EQLBaseListener {
 
   boolean textMode;
 
+  private boolean inWithEmpty;
+
   private List<Object> inValues;
 
   private String inPropertyName;
@@ -102,6 +105,13 @@ abstract class EqlWhereListener<T> extends EQLBaseListener {
     addBetweenProperty(rawValue, child(ctx, 2), child(ctx, 4));
   }
 
+  @Override
+  public void enterInOrEmpty_expression(EQLParser.InOrEmpty_expressionContext ctx) {
+    this.inWithEmpty = true;
+    this.inValues = new ArrayList<>();
+    this.inPropertyName = getLeftHandSidePath(ctx);
+  }
+
   @Override
   public void enterIn_expression(EQLParser.In_expressionContext ctx) {
     this.inValues = new ArrayList<>();
@@ -113,12 +123,42 @@ abstract class EqlWhereListener<T> extends EQLBaseListener {
     int childCount = ctx.getChildCount();
     for (int i = 0; i < childCount; i++) {
       String text = child(ctx, i);
-      if (isValue(text)) {
-        inValues.add(bind(text));
+      if (text.startsWith("?")) {
+        inValues = toList(getBindValue(EqlValueType.POS_PARAM, text));
+      } else {
+        if (inWithEmpty) {
+          throw new IllegalArgumentException("Sorry, can only use inOrEmpty with positioned parameters");
+        }
+        if (isValue(text)) {
+          inValues.add(bind(text));
+        }
       }
     }
   }
 
+  @SuppressWarnings("unchecked")
+  private List<Object> toList(Object value) {
+    if (value == null) return null;
+    if (value instanceof List) {
+      return (List<Object>)value;
+    }
+    if (value instanceof Set) {
+      return new ArrayList<>((Set)value);
+    }
+    throw new IllegalArgumentException("Expected List of Set but got " + value);
+  }
+
+  @Override
+  public void exitIn_expression(EQLParser.In_expressionContext ctx) {
+    peekExprList().in(inPropertyName, inValues);
+  }
+
+  @Override
+  public void exitInOrEmpty_expression(EQLParser.InOrEmpty_expressionContext ctx) {
+    inWithEmpty = false;
+    peekExprList().inOrEmpty(inPropertyName, inValues);
+  }
+
   String child(ParserRuleContext ctx, int position) {
     ParseTree child = ctx.getChild(position);
     return child.getText();
@@ -128,11 +168,6 @@ abstract class EqlWhereListener<T> extends EQLBaseListener {
     return text.length() != 1 || (!text.equals("(") && !text.equals(")") && !text.equals(","));
   }
 
-  @Override
-  public void exitIn_expression(EQLParser.In_expressionContext ctx) {
-    addIn(inPropertyName, inValues);
-  }
-
   @Override
   public void enterIsNull_expression(EQLParser.IsNull_expressionContext ctx) {
     String path = getLeftHandSidePath(ctx);
@@ -210,6 +245,12 @@ abstract class EqlWhereListener<T> extends EQLBaseListener {
         return EqlOperator.LT;
       case GTE:
         return EqlOperator.LTE;
+      case EQORNULL:
+        return EqlOperator.EQORNULL;
+      case GTORNULL:
+        return EqlOperator.LTORNULL;
+      case LTORNULL:
+        return EqlOperator.GTORNULL;
       default:
         throw new IllegalStateException("Can not invert operator " + op);
     }
@@ -322,12 +363,7 @@ abstract class EqlWhereListener<T> extends EQLBaseListener {
     peekExprList().inRange(path, bind(value1), bind(value2));
   }
 
-  private void addIn(String path, List<Object> inValues) {
-    peekExprList().in(path, inValues);
-  }
-
   private void addExpression(String path, EqlOperator op, String value) {
-
     switch (op) {
       case EQ:
         peekExprList().eq(path, bind(value));
@@ -377,6 +413,16 @@ abstract class EqlWhereListener<T> extends EQLBaseListener {
       case IENDS_WITH:
         addLike(true, LikeType.ENDS_WITH, path, bind(value));
         break;
+      case EQORNULL:
+        peekExprList().eqOrNull(path, bind(value));
+        break;
+      case GTORNULL:
+        peekExprList().gtOrNull(path, bind(value));
+        break;
+      case LTORNULL:
+        peekExprList().ltOrNull(path, bind(value));
+        break;
+
       default:
         throw new IllegalStateException("Unhandled operator " + op);
     }
diff --git a/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java b/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java
index f00a52868..e0e197a49 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java
@@ -5,9 +5,9 @@ import java.util.Map;
 
 class OperatorMapping {
 
-  final Map<String, EqlOperator> map = new HashMap<>();
+  private final Map<String, EqlOperator> map = new HashMap<>();
 
-  public OperatorMapping() {
+  OperatorMapping() {
     map.put("eq", EqlOperator.EQ);
     map.put("=", EqlOperator.EQ);
     map.put("ieq", EqlOperator.IEQ);
@@ -43,6 +43,9 @@ class OperatorMapping {
 
     map.put("inrange", EqlOperator.INRANGE);
     map.put("between", EqlOperator.BETWEEN);
+    map.put("eqOrNull", EqlOperator.EQORNULL);
+    map.put("gtOrNull", EqlOperator.GTORNULL);
+    map.put("ltOrNull", EqlOperator.LTORNULL);
   }
 
   public EqlOperator get(String key) {
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.interp b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.interp
index cbba0145d..507556a81 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.interp
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.interp
@@ -22,6 +22,7 @@ null
 'or'
 'and'
 'not'
+'inOrEmpty'
 'in'
 'between'
 'inrange'
@@ -60,6 +61,9 @@ null
 'ne'
 'ieq'
 'ine'
+'eqOrNull'
+'gtOrNull'
+'ltOrNull'
 null
 null
 null
@@ -134,6 +138,10 @@ null
 null
 null
 null
+null
+null
+null
+null
 INPUT_VARIABLE
 PATH_VARIABLE
 QUOTED_PATH_VARIABLE
@@ -175,6 +183,7 @@ conditional_term
 conditional_factor
 conditional_primary
 any_expression
+inOrEmpty_expression
 in_expression
 in_value
 between_expression
@@ -193,4 +202,4 @@ literal
 
 
 atn:
-[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 73, 350, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 3, 2, 5, 2, 90, 10, 2, 3, 2, 7, 2, 93, 10, 2, 12, 2, 14, 2, 96, 11, 2, 3, 2, 5, 2, 99, 10, 2, 3, 2, 5, 2, 102, 10, 2, 3, 2, 5, 2, 105, 10, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 3, 114, 10, 3, 3, 4, 3, 4, 5, 4, 118, 10, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 7, 8, 134, 10, 8, 12, 8, 14, 8, 137, 11, 8, 3, 9, 3, 9, 5, 9, 141, 10, 9, 3, 9, 5, 9, 144, 10, 9, 3, 10, 3, 10, 3, 10, 3, 10, 5, 10, 150, 10, 10, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 5, 12, 157, 10, 12, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 5, 14, 164, 10, 14, 3, 14, 3, 14, 5, 14, 168, 10, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 7, 16, 177, 10, 16, 12, 16, 14, 16, 180, 11, 16, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 18, 5, 18, 188, 10, 18, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 5, 21, 198, 10, 21, 3, 22, 3, 22, 5, 22, 202, 10, 22, 3, 23, 3, 23, 5, 23, 206, 10, 23, 3, 24, 3, 24, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 7, 25, 215, 10, 25, 12, 25, 14, 25, 218, 11, 25, 3, 26, 3, 26, 3, 26, 7, 26, 223, 10, 26, 12, 26, 14, 26, 226, 11, 26, 3, 27, 5, 27, 229, 10, 27, 3, 27, 3, 27, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 5, 28, 238, 10, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 5, 29, 254, 10, 29, 3, 30, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 7, 31, 265, 10, 31, 12, 31, 14, 31, 268, 11, 31, 3, 31, 3, 31, 5, 31, 272, 10, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 5, 35, 297, 10, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 5, 36, 307, 10, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 5, 37, 314, 10, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 5, 38, 324, 10, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 40, 3, 40, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 5, 41, 340, 10, 41, 3, 42, 3, 42, 3, 43, 3, 43, 5, 43, 346, 10, 43, 3, 44, 3, 44, 3, 44, 2, 2, 45, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 2, 7, 3, 2, 14, 15, 3, 2, 64, 65, 3, 2, 38, 45, 3, 2, 46, 62, 4, 2, 67, 68, 72, 72, 2, 351, 2, 89, 3, 2, 2, 2, 4, 113, 3, 2, 2, 2, 6, 115, 3, 2, 2, 2, 8, 121, 3, 2, 2, 2, 10, 123, 3, 2, 2, 2, 12, 125, 3, 2, 2, 2, 14, 128, 3, 2, 2, 2, 16, 138, 3, 2, 2, 2, 18, 149, 3, 2, 2, 2, 20, 151, 3, 2, 2, 2, 22, 153, 3, 2, 2, 2, 24, 158, 3, 2, 2, 2, 26, 161, 3, 2, 2, 2, 28, 169, 3, 2, 2, 2, 30, 173, 3, 2, 2, 2, 32, 181, 3, 2, 2, 2, 34, 187, 3, 2, 2, 2, 36, 189, 3, 2, 2, 2, 38, 192, 3, 2, 2, 2, 40, 197, 3, 2, 2, 2, 42, 199, 3, 2, 2, 2, 44, 203, 3, 2, 2, 2, 46, 207, 3, 2, 2, 2, 48, 211, 3, 2, 2, 2, 50, 219, 3, 2, 2, 2, 52, 228, 3, 2, 2, 2, 54, 237, 3, 2, 2, 2, 56, 253, 3, 2, 2, 2, 58, 255, 3, 2, 2, 2, 60, 271, 3, 2, 2, 2, 62, 273, 3, 2, 2, 2, 64, 279, 3, 2, 2, 2, 66, 285, 3, 2, 2, 2, 68, 296, 3, 2, 2, 2, 70, 306, 3, 2, 2, 2, 72, 313, 3, 2, 2, 2, 74, 323, 3, 2, 2, 2, 76, 325, 3, 2, 2, 2, 78, 329, 3, 2, 2, 2, 80, 339, 3, 2, 2, 2, 82, 341, 3, 2, 2, 2, 84, 345, 3, 2, 2, 2, 86, 347, 3, 2, 2, 2, 88, 90, 5, 6, 4, 2, 89, 88, 3, 2, 2, 2, 89, 90, 3, 2, 2, 2, 90, 94, 3, 2, 2, 2, 91, 93, 5, 10, 6, 2, 92, 91, 3, 2, 2, 2, 93, 96, 3, 2, 2, 2, 94, 92, 3, 2, 2, 2, 94, 95, 3, 2, 2, 2, 95, 98, 3, 2, 2, 2, 96, 94, 3, 2, 2, 2, 97, 99, 5, 12, 7, 2, 98, 97, 3, 2, 2, 2, 98, 99, 3, 2, 2, 2, 99, 101, 3, 2, 2, 2, 100, 102, 5, 14, 8, 2, 101, 100, 3, 2, 2, 2, 101, 102, 3, 2, 2, 2, 102, 104, 3, 2, 2, 2, 103, 105, 5, 22, 12, 2, 104, 103, 3, 2, 2, 2, 104, 105, 3, 2, 2, 2, 105, 106, 3, 2, 2, 2, 106, 107, 7, 2, 2, 3, 107, 3, 3, 2, 2, 2, 108, 109, 7, 3, 2, 2, 109, 110, 5, 30, 16, 2, 110, 111, 7, 4, 2, 2, 111, 114, 3, 2, 2, 2, 112, 114, 5, 30, 16, 2, 113, 108, 3, 2, 2, 2, 113, 112, 3, 2, 2, 2, 114, 5, 3, 2, 2, 2, 115, 117, 7, 5, 2, 2, 116, 118, 5, 8, 5, 2, 117, 116, 3, 2, 2, 2, 117, 118, 3, 2, 2, 2, 118, 119, 3, 2, 2, 2, 119, 120, 5, 4, 3, 2, 120, 7, 3, 2, 2, 2, 121, 122, 7, 6, 2, 2, 122, 9, 3, 2, 2, 2, 123, 124, 5, 26, 14, 2, 124, 11, 3, 2, 2, 2, 125, 126, 7, 7, 2, 2, 126, 127, 5, 48, 25, 2, 127, 13, 3, 2, 2, 2, 128, 129, 7, 8, 2, 2, 129, 130, 7, 9, 2, 2, 130, 135, 5, 16, 9, 2, 131, 132, 7, 10, 2, 2, 132, 134, 5, 16, 9, 2, 133, 131, 3, 2, 2, 2, 134, 137, 3, 2, 2, 2, 135, 133, 3, 2, 2, 2, 135, 136, 3, 2, 2, 2, 136, 15, 3, 2, 2, 2, 137, 135, 3, 2, 2, 2, 138, 140, 7, 64, 2, 2, 139, 141, 5, 20, 11, 2, 140, 139, 3, 2, 2, 2, 140, 141, 3, 2, 2, 2, 141, 143, 3, 2, 2, 2, 142, 144, 5, 18, 10, 2, 143, 142, 3, 2, 2, 2, 143, 144, 3, 2, 2, 2, 144, 17, 3, 2, 2, 2, 145, 146, 7, 11, 2, 2, 146, 150, 7, 12, 2, 2, 147, 148, 7, 11, 2, 2, 148, 150, 7, 13, 2, 2, 149, 145, 3, 2, 2, 2, 149, 147, 3, 2, 2, 2, 150, 19, 3, 2, 2, 2, 151, 152, 9, 2, 2, 2, 152, 21, 3, 2, 2, 2, 153, 154, 7, 16, 2, 2, 154, 156, 7, 68, 2, 2, 155, 157, 5, 24, 13, 2, 156, 155, 3, 2, 2, 2, 156, 157, 3, 2, 2, 2, 157, 23, 3, 2, 2, 2, 158, 159, 7, 17, 2, 2, 159, 160, 7, 68, 2, 2, 160, 25, 3, 2, 2, 2, 161, 163, 7, 18, 2, 2, 162, 164, 5, 40, 21, 2, 163, 162, 3, 2, 2, 2, 163, 164, 3, 2, 2, 2, 164, 165, 3, 2, 2, 2, 165, 167, 5, 32, 17, 2, 166, 168, 5, 28, 15, 2, 167, 166, 3, 2, 2, 2, 167, 168, 3, 2, 2, 2, 168, 27, 3, 2, 2, 2, 169, 170, 7, 3, 2, 2, 170, 171, 5, 30, 16, 2, 171, 172, 7, 4, 2, 2, 172, 29, 3, 2, 2, 2, 173, 178, 5, 34, 18, 2, 174, 175, 7, 10, 2, 2, 175, 177, 5, 34, 18, 2, 176, 174, 3, 2, 2, 2, 177, 180, 3, 2, 2, 2, 178, 176, 3, 2, 2, 2, 178, 179, 3, 2, 2, 2, 179, 31, 3, 2, 2, 2, 180, 178, 3, 2, 2, 2, 181, 182, 9, 3, 2, 2, 182, 33, 3, 2, 2, 2, 183, 188, 7, 64, 2, 2, 184, 188, 5, 36, 19, 2, 185, 188, 5, 38, 20, 2, 186, 188, 7, 66, 2, 2, 187, 183, 3, 2, 2, 2, 187, 184, 3, 2, 2, 2, 187, 185, 3, 2, 2, 2, 187, 186, 3, 2, 2, 2, 188, 35, 3, 2, 2, 2, 189, 190, 7, 19, 2, 2, 190, 191, 5, 42, 22, 2, 191, 37, 3, 2, 2, 2, 192, 193, 7, 19, 2, 2, 193, 194, 5, 44, 23, 2, 194, 39, 3, 2, 2, 2, 195, 198, 5, 42, 22, 2, 196, 198, 5, 44, 23, 2, 197, 195, 3, 2, 2, 2, 197, 196, 3, 2, 2, 2, 198, 41, 3, 2, 2, 2, 199, 201, 7, 20, 2, 2, 200, 202, 5, 46, 24, 2, 201, 200, 3, 2, 2, 2, 201, 202, 3, 2, 2, 2, 202, 43, 3, 2, 2, 2, 203, 205, 7, 21, 2, 2, 204, 206, 5, 46, 24, 2, 205, 204, 3, 2, 2, 2, 205, 206, 3, 2, 2, 2, 206, 45, 3, 2, 2, 2, 207, 208, 7, 3, 2, 2, 208, 209, 7, 68, 2, 2, 209, 210, 7, 4, 2, 2, 210, 47, 3, 2, 2, 2, 211, 216, 5, 50, 26, 2, 212, 213, 7, 22, 2, 2, 213, 215, 5, 50, 26, 2, 214, 212, 3, 2, 2, 2, 215, 218, 3, 2, 2, 2, 216, 214, 3, 2, 2, 2, 216, 217, 3, 2, 2, 2, 217, 49, 3, 2, 2, 2, 218, 216, 3, 2, 2, 2, 219, 224, 5, 52, 27, 2, 220, 221, 7, 23, 2, 2, 221, 223, 5, 52, 27, 2, 222, 220, 3, 2, 2, 2, 223, 226, 3, 2, 2, 2, 224, 222, 3, 2, 2, 2, 224, 225, 3, 2, 2, 2, 225, 51, 3, 2, 2, 2, 226, 224, 3, 2, 2, 2, 227, 229, 7, 24, 2, 2, 228, 227, 3, 2, 2, 2, 228, 229, 3, 2, 2, 2, 229, 230, 3, 2, 2, 2, 230, 231, 5, 54, 28, 2, 231, 53, 3, 2, 2, 2, 232, 238, 5, 56, 29, 2, 233, 234, 7, 3, 2, 2, 234, 235, 5, 48, 25, 2, 235, 236, 7, 4, 2, 2, 236, 238, 3, 2, 2, 2, 237, 232, 3, 2, 2, 2, 237, 233, 3, 2, 2, 2, 238, 55, 3, 2, 2, 2, 239, 254, 5, 80, 41, 2, 240, 254, 5, 76, 39, 2, 241, 254, 5, 64, 33, 2, 242, 254, 5, 62, 32, 2, 243, 254, 5, 66, 34, 2, 244, 254, 5, 58, 30, 2, 245, 254, 5, 68, 35, 2, 246, 254, 5, 70, 36, 2, 247, 254, 5, 72, 37, 2, 248, 254, 5, 74, 38, 2, 249, 250, 7, 3, 2, 2, 250, 251, 5, 56, 29, 2, 251, 252, 7, 4, 2, 2, 252, 254, 3, 2, 2, 2, 253, 239, 3, 2, 2, 2, 253, 240, 3, 2, 2, 2, 253, 241, 3, 2, 2, 2, 253, 242, 3, 2, 2, 2, 253, 243, 3, 2, 2, 2, 253, 244, 3, 2, 2, 2, 253, 245, 3, 2, 2, 2, 253, 246, 3, 2, 2, 2, 253, 247, 3, 2, 2, 2, 253, 248, 3, 2, 2, 2, 253, 249, 3, 2, 2, 2, 254, 57, 3, 2, 2, 2, 255, 256, 7, 64, 2, 2, 256, 257, 7, 25, 2, 2, 257, 258, 5, 60, 31, 2, 258, 59, 3, 2, 2, 2, 259, 272, 7, 63, 2, 2, 260, 261, 7, 3, 2, 2, 261, 266, 5, 84, 43, 2, 262, 263, 7, 10, 2, 2, 263, 265, 5, 84, 43, 2, 264, 262, 3, 2, 2, 2, 265, 268, 3, 2, 2, 2, 266, 264, 3, 2, 2, 2, 266, 267, 3, 2, 2, 2, 267, 269, 3, 2, 2, 2, 268, 266, 3, 2, 2, 2, 269, 270, 7, 4, 2, 2, 270, 272, 3, 2, 2, 2, 271, 259, 3, 2, 2, 2, 271, 260, 3, 2, 2, 2, 272, 61, 3, 2, 2, 2, 273, 274, 7, 64, 2, 2, 274, 275, 7, 26, 2, 2, 275, 276, 5, 84, 43, 2, 276, 277, 7, 23, 2, 2, 277, 278, 5, 84, 43, 2, 278, 63, 3, 2, 2, 2, 279, 280, 7, 64, 2, 2, 280, 281, 7, 27, 2, 2, 281, 282, 5, 84, 43, 2, 282, 283, 7, 28, 2, 2, 283, 284, 5, 84, 43, 2, 284, 65, 3, 2, 2, 2, 285, 286, 5, 84, 43, 2, 286, 287, 7, 26, 2, 2, 287, 288, 7, 64, 2, 2, 288, 289, 7, 23, 2, 2, 289, 290, 7, 64, 2, 2, 290, 67, 3, 2, 2, 2, 291, 292, 7, 64, 2, 2, 292, 293, 7, 29, 2, 2, 293, 297, 7, 30, 2, 2, 294, 295, 7, 64, 2, 2, 295, 297, 7, 31, 2, 2, 296, 291, 3, 2, 2, 2, 296, 294, 3, 2, 2, 2, 297, 69, 3, 2, 2, 2, 298, 299, 7, 64, 2, 2, 299, 300, 7, 29, 2, 2, 300, 301, 7, 24, 2, 2, 301, 307, 7, 30, 2, 2, 302, 303, 7, 64, 2, 2, 303, 307, 7, 32, 2, 2, 304, 305, 7, 64, 2, 2, 305, 307, 7, 33, 2, 2, 306, 298, 3, 2, 2, 2, 306, 302, 3, 2, 2, 2, 306, 304, 3, 2, 2, 2, 307, 71, 3, 2, 2, 2, 308, 309, 7, 64, 2, 2, 309, 310, 7, 29, 2, 2, 310, 314, 7, 34, 2, 2, 311, 312, 7, 64, 2, 2, 312, 314, 7, 35, 2, 2, 313, 308, 3, 2, 2, 2, 313, 311, 3, 2, 2, 2, 314, 73, 3, 2, 2, 2, 315, 316, 7, 64, 2, 2, 316, 317, 7, 29, 2, 2, 317, 318, 7, 24, 2, 2, 318, 324, 7, 34, 2, 2, 319, 320, 7, 64, 2, 2, 320, 324, 7, 36, 2, 2, 321, 322, 7, 64, 2, 2, 322, 324, 7, 37, 2, 2, 323, 315, 3, 2, 2, 2, 323, 319, 3, 2, 2, 2, 323, 321, 3, 2, 2, 2, 324, 75, 3, 2, 2, 2, 325, 326, 7, 64, 2, 2, 326, 327, 5, 78, 40, 2, 327, 328, 5, 84, 43, 2, 328, 77, 3, 2, 2, 2, 329, 330, 9, 4, 2, 2, 330, 79, 3, 2, 2, 2, 331, 332, 7, 64, 2, 2, 332, 333, 5, 82, 42, 2, 333, 334, 5, 84, 43, 2, 334, 340, 3, 2, 2, 2, 335, 336, 5, 84, 43, 2, 336, 337, 5, 82, 42, 2, 337, 338, 7, 64, 2, 2, 338, 340, 3, 2, 2, 2, 339, 331, 3, 2, 2, 2, 339, 335, 3, 2, 2, 2, 340, 81, 3, 2, 2, 2, 341, 342, 9, 5, 2, 2, 342, 83, 3, 2, 2, 2, 343, 346, 5, 86, 44, 2, 344, 346, 7, 63, 2, 2, 345, 343, 3, 2, 2, 2, 345, 344, 3, 2, 2, 2, 346, 85, 3, 2, 2, 2, 347, 348, 9, 6, 2, 2, 348, 87, 3, 2, 2, 2, 34, 89, 94, 98, 101, 104, 113, 117, 135, 140, 143, 149, 156, 163, 167, 178, 187, 197, 201, 205, 216, 224, 228, 237, 253, 266, 271, 296, 306, 313, 323, 339, 345]
\ No newline at end of file
+[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 77, 357, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 4, 45, 9, 45, 3, 2, 5, 2, 92, 10, 2, 3, 2, 7, 2, 95, 10, 2, 12, 2, 14, 2, 98, 11, 2, 3, 2, 5, 2, 101, 10, 2, 3, 2, 5, 2, 104, 10, 2, 3, 2, 5, 2, 107, 10, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 3, 116, 10, 3, 3, 4, 3, 4, 5, 4, 120, 10, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 7, 8, 136, 10, 8, 12, 8, 14, 8, 139, 11, 8, 3, 9, 3, 9, 5, 9, 143, 10, 9, 3, 9, 5, 9, 146, 10, 9, 3, 10, 3, 10, 3, 10, 3, 10, 5, 10, 152, 10, 10, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 5, 12, 159, 10, 12, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 5, 14, 166, 10, 14, 3, 14, 3, 14, 5, 14, 170, 10, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 7, 16, 179, 10, 16, 12, 16, 14, 16, 182, 11, 16, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 18, 5, 18, 190, 10, 18, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 5, 21, 200, 10, 21, 3, 22, 3, 22, 5, 22, 204, 10, 22, 3, 23, 3, 23, 5, 23, 208, 10, 23, 3, 24, 3, 24, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 7, 25, 217, 10, 25, 12, 25, 14, 25, 220, 11, 25, 3, 26, 3, 26, 3, 26, 7, 26, 225, 10, 26, 12, 26, 14, 26, 228, 11, 26, 3, 27, 5, 27, 231, 10, 27, 3, 27, 3, 27, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 5, 28, 240, 10, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 5, 29, 257, 10, 29, 3, 30, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 7, 32, 272, 10, 32, 12, 32, 14, 32, 275, 11, 32, 3, 32, 3, 32, 5, 32, 279, 10, 32, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 5, 36, 304, 10, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 5, 37, 314, 10, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 5, 38, 321, 10, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 5, 39, 331, 10, 39, 3, 40, 3, 40, 3, 40, 3, 40, 3, 41, 3, 41, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 5, 42, 347, 10, 42, 3, 43, 3, 43, 3, 44, 3, 44, 5, 44, 353, 10, 44, 3, 45, 3, 45, 3, 45, 2, 2, 46, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 2, 7, 3, 2, 14, 15, 3, 2, 68, 69, 3, 2, 39, 46, 3, 2, 47, 66, 4, 2, 71, 72, 76, 76, 2, 358, 2, 91, 3, 2, 2, 2, 4, 115, 3, 2, 2, 2, 6, 117, 3, 2, 2, 2, 8, 123, 3, 2, 2, 2, 10, 125, 3, 2, 2, 2, 12, 127, 3, 2, 2, 2, 14, 130, 3, 2, 2, 2, 16, 140, 3, 2, 2, 2, 18, 151, 3, 2, 2, 2, 20, 153, 3, 2, 2, 2, 22, 155, 3, 2, 2, 2, 24, 160, 3, 2, 2, 2, 26, 163, 3, 2, 2, 2, 28, 171, 3, 2, 2, 2, 30, 175, 3, 2, 2, 2, 32, 183, 3, 2, 2, 2, 34, 189, 3, 2, 2, 2, 36, 191, 3, 2, 2, 2, 38, 194, 3, 2, 2, 2, 40, 199, 3, 2, 2, 2, 42, 201, 3, 2, 2, 2, 44, 205, 3, 2, 2, 2, 46, 209, 3, 2, 2, 2, 48, 213, 3, 2, 2, 2, 50, 221, 3, 2, 2, 2, 52, 230, 3, 2, 2, 2, 54, 239, 3, 2, 2, 2, 56, 256, 3, 2, 2, 2, 58, 258, 3, 2, 2, 2, 60, 262, 3, 2, 2, 2, 62, 278, 3, 2, 2, 2, 64, 280, 3, 2, 2, 2, 66, 286, 3, 2, 2, 2, 68, 292, 3, 2, 2, 2, 70, 303, 3, 2, 2, 2, 72, 313, 3, 2, 2, 2, 74, 320, 3, 2, 2, 2, 76, 330, 3, 2, 2, 2, 78, 332, 3, 2, 2, 2, 80, 336, 3, 2, 2, 2, 82, 346, 3, 2, 2, 2, 84, 348, 3, 2, 2, 2, 86, 352, 3, 2, 2, 2, 88, 354, 3, 2, 2, 2, 90, 92, 5, 6, 4, 2, 91, 90, 3, 2, 2, 2, 91, 92, 3, 2, 2, 2, 92, 96, 3, 2, 2, 2, 93, 95, 5, 10, 6, 2, 94, 93, 3, 2, 2, 2, 95, 98, 3, 2, 2, 2, 96, 94, 3, 2, 2, 2, 96, 97, 3, 2, 2, 2, 97, 100, 3, 2, 2, 2, 98, 96, 3, 2, 2, 2, 99, 101, 5, 12, 7, 2, 100, 99, 3, 2, 2, 2, 100, 101, 3, 2, 2, 2, 101, 103, 3, 2, 2, 2, 102, 104, 5, 14, 8, 2, 103, 102, 3, 2, 2, 2, 103, 104, 3, 2, 2, 2, 104, 106, 3, 2, 2, 2, 105, 107, 5, 22, 12, 2, 106, 105, 3, 2, 2, 2, 106, 107, 3, 2, 2, 2, 107, 108, 3, 2, 2, 2, 108, 109, 7, 2, 2, 3, 109, 3, 3, 2, 2, 2, 110, 111, 7, 3, 2, 2, 111, 112, 5, 30, 16, 2, 112, 113, 7, 4, 2, 2, 113, 116, 3, 2, 2, 2, 114, 116, 5, 30, 16, 2, 115, 110, 3, 2, 2, 2, 115, 114, 3, 2, 2, 2, 116, 5, 3, 2, 2, 2, 117, 119, 7, 5, 2, 2, 118, 120, 5, 8, 5, 2, 119, 118, 3, 2, 2, 2, 119, 120, 3, 2, 2, 2, 120, 121, 3, 2, 2, 2, 121, 122, 5, 4, 3, 2, 122, 7, 3, 2, 2, 2, 123, 124, 7, 6, 2, 2, 124, 9, 3, 2, 2, 2, 125, 126, 5, 26, 14, 2, 126, 11, 3, 2, 2, 2, 127, 128, 7, 7, 2, 2, 128, 129, 5, 48, 25, 2, 129, 13, 3, 2, 2, 2, 130, 131, 7, 8, 2, 2, 131, 132, 7, 9, 2, 2, 132, 137, 5, 16, 9, 2, 133, 134, 7, 10, 2, 2, 134, 136, 5, 16, 9, 2, 135, 133, 3, 2, 2, 2, 136, 139, 3, 2, 2, 2, 137, 135, 3, 2, 2, 2, 137, 138, 3, 2, 2, 2, 138, 15, 3, 2, 2, 2, 139, 137, 3, 2, 2, 2, 140, 142, 7, 68, 2, 2, 141, 143, 5, 20, 11, 2, 142, 141, 3, 2, 2, 2, 142, 143, 3, 2, 2, 2, 143, 145, 3, 2, 2, 2, 144, 146, 5, 18, 10, 2, 145, 144, 3, 2, 2, 2, 145, 146, 3, 2, 2, 2, 146, 17, 3, 2, 2, 2, 147, 148, 7, 11, 2, 2, 148, 152, 7, 12, 2, 2, 149, 150, 7, 11, 2, 2, 150, 152, 7, 13, 2, 2, 151, 147, 3, 2, 2, 2, 151, 149, 3, 2, 2, 2, 152, 19, 3, 2, 2, 2, 153, 154, 9, 2, 2, 2, 154, 21, 3, 2, 2, 2, 155, 156, 7, 16, 2, 2, 156, 158, 7, 72, 2, 2, 157, 159, 5, 24, 13, 2, 158, 157, 3, 2, 2, 2, 158, 159, 3, 2, 2, 2, 159, 23, 3, 2, 2, 2, 160, 161, 7, 17, 2, 2, 161, 162, 7, 72, 2, 2, 162, 25, 3, 2, 2, 2, 163, 165, 7, 18, 2, 2, 164, 166, 5, 40, 21, 2, 165, 164, 3, 2, 2, 2, 165, 166, 3, 2, 2, 2, 166, 167, 3, 2, 2, 2, 167, 169, 5, 32, 17, 2, 168, 170, 5, 28, 15, 2, 169, 168, 3, 2, 2, 2, 169, 170, 3, 2, 2, 2, 170, 27, 3, 2, 2, 2, 171, 172, 7, 3, 2, 2, 172, 173, 5, 30, 16, 2, 173, 174, 7, 4, 2, 2, 174, 29, 3, 2, 2, 2, 175, 180, 5, 34, 18, 2, 176, 177, 7, 10, 2, 2, 177, 179, 5, 34, 18, 2, 178, 176, 3, 2, 2, 2, 179, 182, 3, 2, 2, 2, 180, 178, 3, 2, 2, 2, 180, 181, 3, 2, 2, 2, 181, 31, 3, 2, 2, 2, 182, 180, 3, 2, 2, 2, 183, 184, 9, 3, 2, 2, 184, 33, 3, 2, 2, 2, 185, 190, 7, 68, 2, 2, 186, 190, 5, 36, 19, 2, 187, 190, 5, 38, 20, 2, 188, 190, 7, 70, 2, 2, 189, 185, 3, 2, 2, 2, 189, 186, 3, 2, 2, 2, 189, 187, 3, 2, 2, 2, 189, 188, 3, 2, 2, 2, 190, 35, 3, 2, 2, 2, 191, 192, 7, 19, 2, 2, 192, 193, 5, 42, 22, 2, 193, 37, 3, 2, 2, 2, 194, 195, 7, 19, 2, 2, 195, 196, 5, 44, 23, 2, 196, 39, 3, 2, 2, 2, 197, 200, 5, 42, 22, 2, 198, 200, 5, 44, 23, 2, 199, 197, 3, 2, 2, 2, 199, 198, 3, 2, 2, 2, 200, 41, 3, 2, 2, 2, 201, 203, 7, 20, 2, 2, 202, 204, 5, 46, 24, 2, 203, 202, 3, 2, 2, 2, 203, 204, 3, 2, 2, 2, 204, 43, 3, 2, 2, 2, 205, 207, 7, 21, 2, 2, 206, 208, 5, 46, 24, 2, 207, 206, 3, 2, 2, 2, 207, 208, 3, 2, 2, 2, 208, 45, 3, 2, 2, 2, 209, 210, 7, 3, 2, 2, 210, 211, 7, 72, 2, 2, 211, 212, 7, 4, 2, 2, 212, 47, 3, 2, 2, 2, 213, 218, 5, 50, 26, 2, 214, 215, 7, 22, 2, 2, 215, 217, 5, 50, 26, 2, 216, 214, 3, 2, 2, 2, 217, 220, 3, 2, 2, 2, 218, 216, 3, 2, 2, 2, 218, 219, 3, 2, 2, 2, 219, 49, 3, 2, 2, 2, 220, 218, 3, 2, 2, 2, 221, 226, 5, 52, 27, 2, 222, 223, 7, 23, 2, 2, 223, 225, 5, 52, 27, 2, 224, 222, 3, 2, 2, 2, 225, 228, 3, 2, 2, 2, 226, 224, 3, 2, 2, 2, 226, 227, 3, 2, 2, 2, 227, 51, 3, 2, 2, 2, 228, 226, 3, 2, 2, 2, 229, 231, 7, 24, 2, 2, 230, 229, 3, 2, 2, 2, 230, 231, 3, 2, 2, 2, 231, 232, 3, 2, 2, 2, 232, 233, 5, 54, 28, 2, 233, 53, 3, 2, 2, 2, 234, 240, 5, 56, 29, 2, 235, 236, 7, 3, 2, 2, 236, 237, 5, 48, 25, 2, 237, 238, 7, 4, 2, 2, 238, 240, 3, 2, 2, 2, 239, 234, 3, 2, 2, 2, 239, 235, 3, 2, 2, 2, 240, 55, 3, 2, 2, 2, 241, 257, 5, 82, 42, 2, 242, 257, 5, 78, 40, 2, 243, 257, 5, 66, 34, 2, 244, 257, 5, 64, 33, 2, 245, 257, 5, 68, 35, 2, 246, 257, 5, 58, 30, 2, 247, 257, 5, 60, 31, 2, 248, 257, 5, 70, 36, 2, 249, 257, 5, 72, 37, 2, 250, 257, 5, 74, 38, 2, 251, 257, 5, 76, 39, 2, 252, 253, 7, 3, 2, 2, 253, 254, 5, 56, 29, 2, 254, 255, 7, 4, 2, 2, 255, 257, 3, 2, 2, 2, 256, 241, 3, 2, 2, 2, 256, 242, 3, 2, 2, 2, 256, 243, 3, 2, 2, 2, 256, 244, 3, 2, 2, 2, 256, 245, 3, 2, 2, 2, 256, 246, 3, 2, 2, 2, 256, 247, 3, 2, 2, 2, 256, 248, 3, 2, 2, 2, 256, 249, 3, 2, 2, 2, 256, 250, 3, 2, 2, 2, 256, 251, 3, 2, 2, 2, 256, 252, 3, 2, 2, 2, 257, 57, 3, 2, 2, 2, 258, 259, 7, 68, 2, 2, 259, 260, 7, 25, 2, 2, 260, 261, 5, 62, 32, 2, 261, 59, 3, 2, 2, 2, 262, 263, 7, 68, 2, 2, 263, 264, 7, 26, 2, 2, 264, 265, 5, 62, 32, 2, 265, 61, 3, 2, 2, 2, 266, 279, 7, 67, 2, 2, 267, 268, 7, 3, 2, 2, 268, 273, 5, 86, 44, 2, 269, 270, 7, 10, 2, 2, 270, 272, 5, 86, 44, 2, 271, 269, 3, 2, 2, 2, 272, 275, 3, 2, 2, 2, 273, 271, 3, 2, 2, 2, 273, 274, 3, 2, 2, 2, 274, 276, 3, 2, 2, 2, 275, 273, 3, 2, 2, 2, 276, 277, 7, 4, 2, 2, 277, 279, 3, 2, 2, 2, 278, 266, 3, 2, 2, 2, 278, 267, 3, 2, 2, 2, 279, 63, 3, 2, 2, 2, 280, 281, 7, 68, 2, 2, 281, 282, 7, 27, 2, 2, 282, 283, 5, 86, 44, 2, 283, 284, 7, 23, 2, 2, 284, 285, 5, 86, 44, 2, 285, 65, 3, 2, 2, 2, 286, 287, 7, 68, 2, 2, 287, 288, 7, 28, 2, 2, 288, 289, 5, 86, 44, 2, 289, 290, 7, 29, 2, 2, 290, 291, 5, 86, 44, 2, 291, 67, 3, 2, 2, 2, 292, 293, 5, 86, 44, 2, 293, 294, 7, 27, 2, 2, 294, 295, 7, 68, 2, 2, 295, 296, 7, 23, 2, 2, 296, 297, 7, 68, 2, 2, 297, 69, 3, 2, 2, 2, 298, 299, 7, 68, 2, 2, 299, 300, 7, 30, 2, 2, 300, 304, 7, 31, 2, 2, 301, 302, 7, 68, 2, 2, 302, 304, 7, 32, 2, 2, 303, 298, 3, 2, 2, 2, 303, 301, 3, 2, 2, 2, 304, 71, 3, 2, 2, 2, 305, 306, 7, 68, 2, 2, 306, 307, 7, 30, 2, 2, 307, 308, 7, 24, 2, 2, 308, 314, 7, 31, 2, 2, 309, 310, 7, 68, 2, 2, 310, 314, 7, 33, 2, 2, 311, 312, 7, 68, 2, 2, 312, 314, 7, 34, 2, 2, 313, 305, 3, 2, 2, 2, 313, 309, 3, 2, 2, 2, 313, 311, 3, 2, 2, 2, 314, 73, 3, 2, 2, 2, 315, 316, 7, 68, 2, 2, 316, 317, 7, 30, 2, 2, 317, 321, 7, 35, 2, 2, 318, 319, 7, 68, 2, 2, 319, 321, 7, 36, 2, 2, 320, 315, 3, 2, 2, 2, 320, 318, 3, 2, 2, 2, 321, 75, 3, 2, 2, 2, 322, 323, 7, 68, 2, 2, 323, 324, 7, 30, 2, 2, 324, 325, 7, 24, 2, 2, 325, 331, 7, 35, 2, 2, 326, 327, 7, 68, 2, 2, 327, 331, 7, 37, 2, 2, 328, 329, 7, 68, 2, 2, 329, 331, 7, 38, 2, 2, 330, 322, 3, 2, 2, 2, 330, 326, 3, 2, 2, 2, 330, 328, 3, 2, 2, 2, 331, 77, 3, 2, 2, 2, 332, 333, 7, 68, 2, 2, 333, 334, 5, 80, 41, 2, 334, 335, 5, 86, 44, 2, 335, 79, 3, 2, 2, 2, 336, 337, 9, 4, 2, 2, 337, 81, 3, 2, 2, 2, 338, 339, 7, 68, 2, 2, 339, 340, 5, 84, 43, 2, 340, 341, 5, 86, 44, 2, 341, 347, 3, 2, 2, 2, 342, 343, 5, 86, 44, 2, 343, 344, 5, 84, 43, 2, 344, 345, 7, 68, 2, 2, 345, 347, 3, 2, 2, 2, 346, 338, 3, 2, 2, 2, 346, 342, 3, 2, 2, 2, 347, 83, 3, 2, 2, 2, 348, 349, 9, 5, 2, 2, 349, 85, 3, 2, 2, 2, 350, 353, 5, 88, 45, 2, 351, 353, 7, 67, 2, 2, 352, 350, 3, 2, 2, 2, 352, 351, 3, 2, 2, 2, 353, 87, 3, 2, 2, 2, 354, 355, 9, 6, 2, 2, 355, 89, 3, 2, 2, 2, 34, 91, 96, 100, 103, 106, 115, 119, 137, 142, 145, 151, 158, 165, 169, 180, 189, 199, 203, 207, 218, 226, 230, 239, 256, 273, 278, 303, 313, 320, 330, 346, 352]
\ No newline at end of file
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens
index d6d4462ab..8a595f026 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens
@@ -58,17 +58,21 @@ T__56=57
 T__57=58
 T__58=59
 T__59=60
-INPUT_VARIABLE=61
-PATH_VARIABLE=62
-QUOTED_PATH_VARIABLE=63
-PROP_FORMULA=64
-BOOLEAN_LITERAL=65
-NUMBER_LITERAL=66
-DOUBLE=67
-INT=68
-ZERO=69
-STRING_LITERAL=70
-WS=71
+T__60=61
+T__61=62
+T__62=63
+T__63=64
+INPUT_VARIABLE=65
+PATH_VARIABLE=66
+QUOTED_PATH_VARIABLE=67
+PROP_FORMULA=68
+BOOLEAN_LITERAL=69
+NUMBER_LITERAL=70
+DOUBLE=71
+INT=72
+ZERO=73
+STRING_LITERAL=74
+WS=75
 '('=1
 ')'=2
 'select'=3
@@ -91,42 +95,46 @@ WS=71
 'or'=20
 'and'=21
 'not'=22
-'in'=23
-'between'=24
-'inrange'=25
-'to'=26
-'is'=27
-'null'=28
-'isNull'=29
-'isNotNull'=30
-'notNull'=31
-'empty'=32
-'isEmpty'=33
-'isNotEmpty'=34
-'notEmpty'=35
-'like'=36
-'ilike'=37
-'contains'=38
-'icontains'=39
-'startsWith'=40
-'istartsWith'=41
-'endsWith'=42
-'iendsWith'=43
-'='=44
-'eq'=45
-'>'=46
-'gt'=47
-'>='=48
-'ge'=49
-'gte'=50
-'<'=51
-'lt'=52
-'<='=53
-'le'=54
-'lte'=55
-'<>'=56
-'!='=57
-'ne'=58
-'ieq'=59
-'ine'=60
-'0'=69
+'inOrEmpty'=23
+'in'=24
+'between'=25
+'inrange'=26
+'to'=27
+'is'=28
+'null'=29
+'isNull'=30
+'isNotNull'=31
+'notNull'=32
+'empty'=33
+'isEmpty'=34
+'isNotEmpty'=35
+'notEmpty'=36
+'like'=37
+'ilike'=38
+'contains'=39
+'icontains'=40
+'startsWith'=41
+'istartsWith'=42
+'endsWith'=43
+'iendsWith'=44
+'='=45
+'eq'=46
+'>'=47
+'gt'=48
+'>='=49
+'ge'=50
+'gte'=51
+'<'=52
+'lt'=53
+'<='=54
+'le'=55
+'lte'=56
+'<>'=57
+'!='=58
+'ne'=59
+'ieq'=60
+'ine'=61
+'eqOrNull'=62
+'gtOrNull'=63
+'ltOrNull'=64
+'0'=73
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
index 53ac70d05..0d295160a 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
@@ -347,6 +347,18 @@ public class EQLBaseListener implements EQLListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitAny_expression(EQLParser.Any_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterInOrEmpty_expression(EQLParser.InOrEmpty_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitInOrEmpty_expression(EQLParser.InOrEmpty_expressionContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp
index 32fc89a55..56b063fbf 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp
@@ -22,6 +22,7 @@ null
 'or'
 'and'
 'not'
+'inOrEmpty'
 'in'
 'between'
 'inrange'
@@ -60,6 +61,9 @@ null
 'ne'
 'ieq'
 'ine'
+'eqOrNull'
+'gtOrNull'
+'ltOrNull'
 null
 null
 null
@@ -134,6 +138,10 @@ null
 null
 null
 null
+null
+null
+null
+null
 INPUT_VARIABLE
 PATH_VARIABLE
 QUOTED_PATH_VARIABLE
@@ -207,6 +215,10 @@ T__56
 T__57
 T__58
 T__59
+T__60
+T__61
+T__62
+T__63
 INPUT_VARIABLE
 PATH_VARIABLE
 QUOTED_PATH_VARIABLE
@@ -227,4 +239,4 @@ mode names:
 DEFAULT_MODE
 
 atn:
-[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 73, 594, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 4, 45, 9, 45, 4, 46, 9, 46, 4, 47, 9, 47, 4, 48, 9, 48, 4, 49, 9, 49, 4, 50, 9, 50, 4, 51, 9, 51, 4, 52, 9, 52, 4, 53, 9, 53, 4, 54, 9, 54, 4, 55, 9, 55, 4, 56, 9, 56, 4, 57, 9, 57, 4, 58, 9, 58, 4, 59, 9, 59, 4, 60, 9, 60, 4, 61, 9, 61, 4, 62, 9, 62, 4, 63, 9, 63, 4, 64, 9, 64, 4, 65, 9, 65, 4, 66, 9, 66, 4, 67, 9, 67, 4, 68, 9, 68, 4, 69, 9, 69, 4, 70, 9, 70, 4, 71, 9, 71, 4, 72, 9, 72, 3, 2, 3, 2, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 23, 3, 23, 3, 24, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 27, 3, 27, 3, 27, 3, 28, 3, 28, 3, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 45, 3, 45, 3, 46, 3, 46, 3, 46, 3, 47, 3, 47, 3, 48, 3, 48, 3, 48, 3, 49, 3, 49, 3, 49, 3, 50, 3, 50, 3, 50, 3, 51, 3, 51, 3, 51, 3, 51, 3, 52, 3, 52, 3, 53, 3, 53, 3, 53, 3, 54, 3, 54, 3, 54, 3, 55, 3, 55, 3, 55, 3, 56, 3, 56, 3, 56, 3, 56, 3, 57, 3, 57, 3, 57, 3, 58, 3, 58, 3, 58, 3, 59, 3, 59, 3, 59, 3, 60, 3, 60, 3, 60, 3, 60, 3, 61, 3, 61, 3, 61, 3, 61, 3, 62, 3, 62, 3, 62, 7, 62, 468, 10, 62, 12, 62, 14, 62, 471, 11, 62, 3, 62, 3, 62, 7, 62, 475, 10, 62, 12, 62, 14, 62, 478, 11, 62, 5, 62, 480, 10, 62, 3, 63, 3, 63, 7, 63, 484, 10, 63, 12, 63, 14, 63, 487, 11, 63, 3, 64, 3, 64, 3, 64, 3, 64, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 5, 65, 535, 10, 65, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 5, 66, 546, 10, 66, 3, 67, 5, 67, 549, 10, 67, 3, 67, 3, 67, 5, 67, 553, 10, 67, 3, 67, 3, 67, 5, 67, 557, 10, 67, 3, 68, 6, 68, 560, 10, 68, 13, 68, 14, 68, 561, 3, 68, 3, 68, 7, 68, 566, 10, 68, 12, 68, 14, 68, 569, 11, 68, 3, 69, 3, 69, 7, 69, 573, 10, 69, 12, 69, 14, 69, 576, 11, 69, 3, 70, 3, 70, 3, 71, 3, 71, 3, 71, 3, 71, 7, 71, 584, 10, 71, 12, 71, 14, 71, 587, 11, 71, 3, 71, 3, 71, 3, 72, 3, 72, 3, 72, 3, 72, 2, 2, 73, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13, 8, 15, 9, 17, 10, 19, 11, 21, 12, 23, 13, 25, 14, 27, 15, 29, 16, 31, 17, 33, 18, 35, 19, 37, 20, 39, 21, 41, 22, 43, 23, 45, 24, 47, 25, 49, 26, 51, 27, 53, 28, 55, 29, 57, 30, 59, 31, 61, 32, 63, 33, 65, 34, 67, 35, 69, 36, 71, 37, 73, 38, 75, 39, 77, 40, 79, 41, 81, 42, 83, 43, 85, 44, 87, 45, 89, 46, 91, 47, 93, 48, 95, 49, 97, 50, 99, 51, 101, 52, 103, 53, 105, 54, 107, 55, 109, 56, 111, 57, 113, 58, 115, 59, 117, 60, 119, 61, 121, 62, 123, 63, 125, 64, 127, 65, 129, 66, 131, 67, 133, 68, 135, 69, 137, 70, 139, 71, 141, 72, 143, 73, 3, 2, 9, 5, 2, 67, 92, 97, 97, 99, 124, 6, 2, 50, 59, 67, 92, 97, 97, 99, 124, 7, 2, 48, 48, 50, 59, 67, 92, 97, 97, 99, 124, 3, 2, 50, 59, 3, 2, 51, 59, 3, 2, 41, 41, 5, 2, 11, 12, 15, 15, 34, 34, 2, 611, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 2, 35, 3, 2, 2, 2, 2, 37, 3, 2, 2, 2, 2, 39, 3, 2, 2, 2, 2, 41, 3, 2, 2, 2, 2, 43, 3, 2, 2, 2, 2, 45, 3, 2, 2, 2, 2, 47, 3, 2, 2, 2, 2, 49, 3, 2, 2, 2, 2, 51, 3, 2, 2, 2, 2, 53, 3, 2, 2, 2, 2, 55, 3, 2, 2, 2, 2, 57, 3, 2, 2, 2, 2, 59, 3, 2, 2, 2, 2, 61, 3, 2, 2, 2, 2, 63, 3, 2, 2, 2, 2, 65, 3, 2, 2, 2, 2, 67, 3, 2, 2, 2, 2, 69, 3, 2, 2, 2, 2, 71, 3, 2, 2, 2, 2, 73, 3, 2, 2, 2, 2, 75, 3, 2, 2, 2, 2, 77, 3, 2, 2, 2, 2, 79, 3, 2, 2, 2, 2, 81, 3, 2, 2, 2, 2, 83, 3, 2, 2, 2, 2, 85, 3, 2, 2, 2, 2, 87, 3, 2, 2, 2, 2, 89, 3, 2, 2, 2, 2, 91, 3, 2, 2, 2, 2, 93, 3, 2, 2, 2, 2, 95, 3, 2, 2, 2, 2, 97, 3, 2, 2, 2, 2, 99, 3, 2, 2, 2, 2, 101, 3, 2, 2, 2, 2, 103, 3, 2, 2, 2, 2, 105, 3, 2, 2, 2, 2, 107, 3, 2, 2, 2, 2, 109, 3, 2, 2, 2, 2, 111, 3, 2, 2, 2, 2, 113, 3, 2, 2, 2, 2, 115, 3, 2, 2, 2, 2, 117, 3, 2, 2, 2, 2, 119, 3, 2, 2, 2, 2, 121, 3, 2, 2, 2, 2, 123, 3, 2, 2, 2, 2, 125, 3, 2, 2, 2, 2, 127, 3, 2, 2, 2, 2, 129, 3, 2, 2, 2, 2, 131, 3, 2, 2, 2, 2, 133, 3, 2, 2, 2, 2, 135, 3, 2, 2, 2, 2, 137, 3, 2, 2, 2, 2, 139, 3, 2, 2, 2, 2, 141, 3, 2, 2, 2, 2, 143, 3, 2, 2, 2, 3, 145, 3, 2, 2, 2, 5, 147, 3, 2, 2, 2, 7, 149, 3, 2, 2, 2, 9, 156, 3, 2, 2, 2, 11, 165, 3, 2, 2, 2, 13, 171, 3, 2, 2, 2, 15, 177, 3, 2, 2, 2, 17, 180, 3, 2, 2, 2, 19, 182, 3, 2, 2, 2, 21, 188, 3, 2, 2, 2, 23, 194, 3, 2, 2, 2, 25, 199, 3, 2, 2, 2, 27, 203, 3, 2, 2, 2, 29, 208, 3, 2, 2, 2, 31, 214, 3, 2, 2, 2, 33, 221, 3, 2, 2, 2, 35, 227, 3, 2, 2, 2, 37, 229, 3, 2, 2, 2, 39, 235, 3, 2, 2, 2, 41, 240, 3, 2, 2, 2, 43, 243, 3, 2, 2, 2, 45, 247, 3, 2, 2, 2, 47, 251, 3, 2, 2, 2, 49, 254, 3, 2, 2, 2, 51, 262, 3, 2, 2, 2, 53, 270, 3, 2, 2, 2, 55, 273, 3, 2, 2, 2, 57, 276, 3, 2, 2, 2, 59, 281, 3, 2, 2, 2, 61, 288, 3, 2, 2, 2, 63, 298, 3, 2, 2, 2, 65, 306, 3, 2, 2, 2, 67, 312, 3, 2, 2, 2, 69, 320, 3, 2, 2, 2, 71, 331, 3, 2, 2, 2, 73, 340, 3, 2, 2, 2, 75, 345, 3, 2, 2, 2, 77, 351, 3, 2, 2, 2, 79, 360, 3, 2, 2, 2, 81, 370, 3, 2, 2, 2, 83, 381, 3, 2, 2, 2, 85, 393, 3, 2, 2, 2, 87, 402, 3, 2, 2, 2, 89, 412, 3, 2, 2, 2, 91, 414, 3, 2, 2, 2, 93, 417, 3, 2, 2, 2, 95, 419, 3, 2, 2, 2, 97, 422, 3, 2, 2, 2, 99, 425, 3, 2, 2, 2, 101, 428, 3, 2, 2, 2, 103, 432, 3, 2, 2, 2, 105, 434, 3, 2, 2, 2, 107, 437, 3, 2, 2, 2, 109, 440, 3, 2, 2, 2, 111, 443, 3, 2, 2, 2, 113, 447, 3, 2, 2, 2, 115, 450, 3, 2, 2, 2, 117, 453, 3, 2, 2, 2, 119, 456, 3, 2, 2, 2, 121, 460, 3, 2, 2, 2, 123, 479, 3, 2, 2, 2, 125, 481, 3, 2, 2, 2, 127, 488, 3, 2, 2, 2, 129, 534, 3, 2, 2, 2, 131, 545, 3, 2, 2, 2, 133, 556, 3, 2, 2, 2, 135, 559, 3, 2, 2, 2, 137, 570, 3, 2, 2, 2, 139, 577, 3, 2, 2, 2, 141, 579, 3, 2, 2, 2, 143, 590, 3, 2, 2, 2, 145, 146, 7, 42, 2, 2, 146, 4, 3, 2, 2, 2, 147, 148, 7, 43, 2, 2, 148, 6, 3, 2, 2, 2, 149, 150, 7, 117, 2, 2, 150, 151, 7, 103, 2, 2, 151, 152, 7, 110, 2, 2, 152, 153, 7, 103, 2, 2, 153, 154, 7, 101, 2, 2, 154, 155, 7, 118, 2, 2, 155, 8, 3, 2, 2, 2, 156, 157, 7, 102, 2, 2, 157, 158, 7, 107, 2, 2, 158, 159, 7, 117, 2, 2, 159, 160, 7, 118, 2, 2, 160, 161, 7, 107, 2, 2, 161, 162, 7, 112, 2, 2, 162, 163, 7, 101, 2, 2, 163, 164, 7, 118, 2, 2, 164, 10, 3, 2, 2, 2, 165, 166, 7, 121, 2, 2, 166, 167, 7, 106, 2, 2, 167, 168, 7, 103, 2, 2, 168, 169, 7, 116, 2, 2, 169, 170, 7, 103, 2, 2, 170, 12, 3, 2, 2, 2, 171, 172, 7, 113, 2, 2, 172, 173, 7, 116, 2, 2, 173, 174, 7, 102, 2, 2, 174, 175, 7, 103, 2, 2, 175, 176, 7, 116, 2, 2, 176, 14, 3, 2, 2, 2, 177, 178, 7, 100, 2, 2, 178, 179, 7, 123, 2, 2, 179, 16, 3, 2, 2, 2, 180, 181, 7, 46, 2, 2, 181, 18, 3, 2, 2, 2, 182, 183, 7, 112, 2, 2, 183, 184, 7, 119, 2, 2, 184, 185, 7, 110, 2, 2, 185, 186, 7, 110, 2, 2, 186, 187, 7, 117, 2, 2, 187, 20, 3, 2, 2, 2, 188, 189, 7, 104, 2, 2, 189, 190, 7, 107, 2, 2, 190, 191, 7, 116, 2, 2, 191, 192, 7, 117, 2, 2, 192, 193, 7, 118, 2, 2, 193, 22, 3, 2, 2, 2, 194, 195, 7, 110, 2, 2, 195, 196, 7, 99, 2, 2, 196, 197, 7, 117, 2, 2, 197, 198, 7, 118, 2, 2, 198, 24, 3, 2, 2, 2, 199, 200, 7, 99, 2, 2, 200, 201, 7, 117, 2, 2, 201, 202, 7, 101, 2, 2, 202, 26, 3, 2, 2, 2, 203, 204, 7, 102, 2, 2, 204, 205, 7, 103, 2, 2, 205, 206, 7, 117, 2, 2, 206, 207, 7, 101, 2, 2, 207, 28, 3, 2, 2, 2, 208, 209, 7, 110, 2, 2, 209, 210, 7, 107, 2, 2, 210, 211, 7, 111, 2, 2, 211, 212, 7, 107, 2, 2, 212, 213, 7, 118, 2, 2, 213, 30, 3, 2, 2, 2, 214, 215, 7, 113, 2, 2, 215, 216, 7, 104, 2, 2, 216, 217, 7, 104, 2, 2, 217, 218, 7, 117, 2, 2, 218, 219, 7, 103, 2, 2, 219, 220, 7, 118, 2, 2, 220, 32, 3, 2, 2, 2, 221, 222, 7, 104, 2, 2, 222, 223, 7, 103, 2, 2, 223, 224, 7, 118, 2, 2, 224, 225, 7, 101, 2, 2, 225, 226, 7, 106, 2, 2, 226, 34, 3, 2, 2, 2, 227, 228, 7, 45, 2, 2, 228, 36, 3, 2, 2, 2, 229, 230, 7, 115, 2, 2, 230, 231, 7, 119, 2, 2, 231, 232, 7, 103, 2, 2, 232, 233, 7, 116, 2, 2, 233, 234, 7, 123, 2, 2, 234, 38, 3, 2, 2, 2, 235, 236, 7, 110, 2, 2, 236, 237, 7, 99, 2, 2, 237, 238, 7, 124, 2, 2, 238, 239, 7, 123, 2, 2, 239, 40, 3, 2, 2, 2, 240, 241, 7, 113, 2, 2, 241, 242, 7, 116, 2, 2, 242, 42, 3, 2, 2, 2, 243, 244, 7, 99, 2, 2, 244, 245, 7, 112, 2, 2, 245, 246, 7, 102, 2, 2, 246, 44, 3, 2, 2, 2, 247, 248, 7, 112, 2, 2, 248, 249, 7, 113, 2, 2, 249, 250, 7, 118, 2, 2, 250, 46, 3, 2, 2, 2, 251, 252, 7, 107, 2, 2, 252, 253, 7, 112, 2, 2, 253, 48, 3, 2, 2, 2, 254, 255, 7, 100, 2, 2, 255, 256, 7, 103, 2, 2, 256, 257, 7, 118, 2, 2, 257, 258, 7, 121, 2, 2, 258, 259, 7, 103, 2, 2, 259, 260, 7, 103, 2, 2, 260, 261, 7, 112, 2, 2, 261, 50, 3, 2, 2, 2, 262, 263, 7, 107, 2, 2, 263, 264, 7, 112, 2, 2, 264, 265, 7, 116, 2, 2, 265, 266, 7, 99, 2, 2, 266, 267, 7, 112, 2, 2, 267, 268, 7, 105, 2, 2, 268, 269, 7, 103, 2, 2, 269, 52, 3, 2, 2, 2, 270, 271, 7, 118, 2, 2, 271, 272, 7, 113, 2, 2, 272, 54, 3, 2, 2, 2, 273, 274, 7, 107, 2, 2, 274, 275, 7, 117, 2, 2, 275, 56, 3, 2, 2, 2, 276, 277, 7, 112, 2, 2, 277, 278, 7, 119, 2, 2, 278, 279, 7, 110, 2, 2, 279, 280, 7, 110, 2, 2, 280, 58, 3, 2, 2, 2, 281, 282, 7, 107, 2, 2, 282, 283, 7, 117, 2, 2, 283, 284, 7, 80, 2, 2, 284, 285, 7, 119, 2, 2, 285, 286, 7, 110, 2, 2, 286, 287, 7, 110, 2, 2, 287, 60, 3, 2, 2, 2, 288, 289, 7, 107, 2, 2, 289, 290, 7, 117, 2, 2, 290, 291, 7, 80, 2, 2, 291, 292, 7, 113, 2, 2, 292, 293, 7, 118, 2, 2, 293, 294, 7, 80, 2, 2, 294, 295, 7, 119, 2, 2, 295, 296, 7, 110, 2, 2, 296, 297, 7, 110, 2, 2, 297, 62, 3, 2, 2, 2, 298, 299, 7, 112, 2, 2, 299, 300, 7, 113, 2, 2, 300, 301, 7, 118, 2, 2, 301, 302, 7, 80, 2, 2, 302, 303, 7, 119, 2, 2, 303, 304, 7, 110, 2, 2, 304, 305, 7, 110, 2, 2, 305, 64, 3, 2, 2, 2, 306, 307, 7, 103, 2, 2, 307, 308, 7, 111, 2, 2, 308, 309, 7, 114, 2, 2, 309, 310, 7, 118, 2, 2, 310, 311, 7, 123, 2, 2, 311, 66, 3, 2, 2, 2, 312, 313, 7, 107, 2, 2, 313, 314, 7, 117, 2, 2, 314, 315, 7, 71, 2, 2, 315, 316, 7, 111, 2, 2, 316, 317, 7, 114, 2, 2, 317, 318, 7, 118, 2, 2, 318, 319, 7, 123, 2, 2, 319, 68, 3, 2, 2, 2, 320, 321, 7, 107, 2, 2, 321, 322, 7, 117, 2, 2, 322, 323, 7, 80, 2, 2, 323, 324, 7, 113, 2, 2, 324, 325, 7, 118, 2, 2, 325, 326, 7, 71, 2, 2, 326, 327, 7, 111, 2, 2, 327, 328, 7, 114, 2, 2, 328, 329, 7, 118, 2, 2, 329, 330, 7, 123, 2, 2, 330, 70, 3, 2, 2, 2, 331, 332, 7, 112, 2, 2, 332, 333, 7, 113, 2, 2, 333, 334, 7, 118, 2, 2, 334, 335, 7, 71, 2, 2, 335, 336, 7, 111, 2, 2, 336, 337, 7, 114, 2, 2, 337, 338, 7, 118, 2, 2, 338, 339, 7, 123, 2, 2, 339, 72, 3, 2, 2, 2, 340, 341, 7, 110, 2, 2, 341, 342, 7, 107, 2, 2, 342, 343, 7, 109, 2, 2, 343, 344, 7, 103, 2, 2, 344, 74, 3, 2, 2, 2, 345, 346, 7, 107, 2, 2, 346, 347, 7, 110, 2, 2, 347, 348, 7, 107, 2, 2, 348, 349, 7, 109, 2, 2, 349, 350, 7, 103, 2, 2, 350, 76, 3, 2, 2, 2, 351, 352, 7, 101, 2, 2, 352, 353, 7, 113, 2, 2, 353, 354, 7, 112, 2, 2, 354, 355, 7, 118, 2, 2, 355, 356, 7, 99, 2, 2, 356, 357, 7, 107, 2, 2, 357, 358, 7, 112, 2, 2, 358, 359, 7, 117, 2, 2, 359, 78, 3, 2, 2, 2, 360, 361, 7, 107, 2, 2, 361, 362, 7, 101, 2, 2, 362, 363, 7, 113, 2, 2, 363, 364, 7, 112, 2, 2, 364, 365, 7, 118, 2, 2, 365, 366, 7, 99, 2, 2, 366, 367, 7, 107, 2, 2, 367, 368, 7, 112, 2, 2, 368, 369, 7, 117, 2, 2, 369, 80, 3, 2, 2, 2, 370, 371, 7, 117, 2, 2, 371, 372, 7, 118, 2, 2, 372, 373, 7, 99, 2, 2, 373, 374, 7, 116, 2, 2, 374, 375, 7, 118, 2, 2, 375, 376, 7, 117, 2, 2, 376, 377, 7, 89, 2, 2, 377, 378, 7, 107, 2, 2, 378, 379, 7, 118, 2, 2, 379, 380, 7, 106, 2, 2, 380, 82, 3, 2, 2, 2, 381, 382, 7, 107, 2, 2, 382, 383, 7, 117, 2, 2, 383, 384, 7, 118, 2, 2, 384, 385, 7, 99, 2, 2, 385, 386, 7, 116, 2, 2, 386, 387, 7, 118, 2, 2, 387, 388, 7, 117, 2, 2, 388, 389, 7, 89, 2, 2, 389, 390, 7, 107, 2, 2, 390, 391, 7, 118, 2, 2, 391, 392, 7, 106, 2, 2, 392, 84, 3, 2, 2, 2, 393, 394, 7, 103, 2, 2, 394, 395, 7, 112, 2, 2, 395, 396, 7, 102, 2, 2, 396, 397, 7, 117, 2, 2, 397, 398, 7, 89, 2, 2, 398, 399, 7, 107, 2, 2, 399, 400, 7, 118, 2, 2, 400, 401, 7, 106, 2, 2, 401, 86, 3, 2, 2, 2, 402, 403, 7, 107, 2, 2, 403, 404, 7, 103, 2, 2, 404, 405, 7, 112, 2, 2, 405, 406, 7, 102, 2, 2, 406, 407, 7, 117, 2, 2, 407, 408, 7, 89, 2, 2, 408, 409, 7, 107, 2, 2, 409, 410, 7, 118, 2, 2, 410, 411, 7, 106, 2, 2, 411, 88, 3, 2, 2, 2, 412, 413, 7, 63, 2, 2, 413, 90, 3, 2, 2, 2, 414, 415, 7, 103, 2, 2, 415, 416, 7, 115, 2, 2, 416, 92, 3, 2, 2, 2, 417, 418, 7, 64, 2, 2, 418, 94, 3, 2, 2, 2, 419, 420, 7, 105, 2, 2, 420, 421, 7, 118, 2, 2, 421, 96, 3, 2, 2, 2, 422, 423, 7, 64, 2, 2, 423, 424, 7, 63, 2, 2, 424, 98, 3, 2, 2, 2, 425, 426, 7, 105, 2, 2, 426, 427, 7, 103, 2, 2, 427, 100, 3, 2, 2, 2, 428, 429, 7, 105, 2, 2, 429, 430, 7, 118, 2, 2, 430, 431, 7, 103, 2, 2, 431, 102, 3, 2, 2, 2, 432, 433, 7, 62, 2, 2, 433, 104, 3, 2, 2, 2, 434, 435, 7, 110, 2, 2, 435, 436, 7, 118, 2, 2, 436, 106, 3, 2, 2, 2, 437, 438, 7, 62, 2, 2, 438, 439, 7, 63, 2, 2, 439, 108, 3, 2, 2, 2, 440, 441, 7, 110, 2, 2, 441, 442, 7, 103, 2, 2, 442, 110, 3, 2, 2, 2, 443, 444, 7, 110, 2, 2, 444, 445, 7, 118, 2, 2, 445, 446, 7, 103, 2, 2, 446, 112, 3, 2, 2, 2, 447, 448, 7, 62, 2, 2, 448, 449, 7, 64, 2, 2, 449, 114, 3, 2, 2, 2, 450, 451, 7, 35, 2, 2, 451, 452, 7, 63, 2, 2, 452, 116, 3, 2, 2, 2, 453, 454, 7, 112, 2, 2, 454, 455, 7, 103, 2, 2, 455, 118, 3, 2, 2, 2, 456, 457, 7, 107, 2, 2, 457, 458, 7, 103, 2, 2, 458, 459, 7, 115, 2, 2, 459, 120, 3, 2, 2, 2, 460, 461, 7, 107, 2, 2, 461, 462, 7, 112, 2, 2, 462, 463, 7, 103, 2, 2, 463, 122, 3, 2, 2, 2, 464, 465, 7, 60, 2, 2, 465, 469, 9, 2, 2, 2, 466, 468, 9, 3, 2, 2, 467, 466, 3, 2, 2, 2, 468, 471, 3, 2, 2, 2, 469, 467, 3, 2, 2, 2, 469, 470, 3, 2, 2, 2, 470, 480, 3, 2, 2, 2, 471, 469, 3, 2, 2, 2, 472, 476, 7, 65, 2, 2, 473, 475, 4, 50, 59, 2, 474, 473, 3, 2, 2, 2, 475, 478, 3, 2, 2, 2, 476, 474, 3, 2, 2, 2, 476, 477, 3, 2, 2, 2, 477, 480, 3, 2, 2, 2, 478, 476, 3, 2, 2, 2, 479, 464, 3, 2, 2, 2, 479, 472, 3, 2, 2, 2, 480, 124, 3, 2, 2, 2, 481, 485, 9, 2, 2, 2, 482, 484, 9, 4, 2, 2, 483, 482, 3, 2, 2, 2, 484, 487, 3, 2, 2, 2, 485, 483, 3, 2, 2, 2, 485, 486, 3, 2, 2, 2, 486, 126, 3, 2, 2, 2, 487, 485, 3, 2, 2, 2, 488, 489, 7, 98, 2, 2, 489, 490, 5, 125, 63, 2, 490, 491, 7, 98, 2, 2, 491, 128, 3, 2, 2, 2, 492, 493, 7, 117, 2, 2, 493, 494, 7, 119, 2, 2, 494, 495, 7, 111, 2, 2, 495, 496, 7, 42, 2, 2, 496, 497, 3, 2, 2, 2, 497, 498, 5, 125, 63, 2, 498, 499, 7, 43, 2, 2, 499, 535, 3, 2, 2, 2, 500, 501, 7, 111, 2, 2, 501, 502, 7, 99, 2, 2, 502, 503, 7, 122, 2, 2, 503, 504, 7, 42, 2, 2, 504, 505, 3, 2, 2, 2, 505, 506, 5, 125, 63, 2, 506, 507, 7, 43, 2, 2, 507, 535, 3, 2, 2, 2, 508, 509, 7, 111, 2, 2, 509, 510, 7, 107, 2, 2, 510, 511, 7, 112, 2, 2, 511, 512, 7, 42, 2, 2, 512, 513, 3, 2, 2, 2, 513, 514, 5, 125, 63, 2, 514, 515, 7, 43, 2, 2, 515, 535, 3, 2, 2, 2, 516, 517, 7, 99, 2, 2, 517, 518, 7, 120, 2, 2, 518, 519, 7, 105, 2, 2, 519, 520, 7, 42, 2, 2, 520, 521, 3, 2, 2, 2, 521, 522, 5, 125, 63, 2, 522, 523, 7, 43, 2, 2, 523, 535, 3, 2, 2, 2, 524, 525, 7, 101, 2, 2, 525, 526, 7, 113, 2, 2, 526, 527, 7, 119, 2, 2, 527, 528, 7, 112, 2, 2, 528, 529, 7, 118, 2, 2, 529, 530, 7, 42, 2, 2, 530, 531, 3, 2, 2, 2, 531, 532, 5, 125, 63, 2, 532, 533, 7, 43, 2, 2, 533, 535, 3, 2, 2, 2, 534, 492, 3, 2, 2, 2, 534, 500, 3, 2, 2, 2, 534, 508, 3, 2, 2, 2, 534, 516, 3, 2, 2, 2, 534, 524, 3, 2, 2, 2, 535, 130, 3, 2, 2, 2, 536, 537, 7, 118, 2, 2, 537, 538, 7, 116, 2, 2, 538, 539, 7, 119, 2, 2, 539, 546, 7, 103, 2, 2, 540, 541, 7, 104, 2, 2, 541, 542, 7, 99, 2, 2, 542, 543, 7, 110, 2, 2, 543, 544, 7, 117, 2, 2, 544, 546, 7, 103, 2, 2, 545, 536, 3, 2, 2, 2, 545, 540, 3, 2, 2, 2, 546, 132, 3, 2, 2, 2, 547, 549, 7, 47, 2, 2, 548, 547, 3, 2, 2, 2, 548, 549, 3, 2, 2, 2, 549, 550, 3, 2, 2, 2, 550, 557, 5, 135, 68, 2, 551, 553, 7, 47, 2, 2, 552, 551, 3, 2, 2, 2, 552, 553, 3, 2, 2, 2, 553, 554, 3, 2, 2, 2, 554, 557, 5, 137, 69, 2, 555, 557, 5, 139, 70, 2, 556, 548, 3, 2, 2, 2, 556, 552, 3, 2, 2, 2, 556, 555, 3, 2, 2, 2, 557, 134, 3, 2, 2, 2, 558, 560, 9, 5, 2, 2, 559, 558, 3, 2, 2, 2, 560, 561, 3, 2, 2, 2, 561, 559, 3, 2, 2, 2, 561, 562, 3, 2, 2, 2, 562, 563, 3, 2, 2, 2, 563, 567, 7, 48, 2, 2, 564, 566, 9, 5, 2, 2, 565, 564, 3, 2, 2, 2, 566, 569, 3, 2, 2, 2, 567, 565, 3, 2, 2, 2, 567, 568, 3, 2, 2, 2, 568, 136, 3, 2, 2, 2, 569, 567, 3, 2, 2, 2, 570, 574, 9, 6, 2, 2, 571, 573, 9, 5, 2, 2, 572, 571, 3, 2, 2, 2, 573, 576, 3, 2, 2, 2, 574, 572, 3, 2, 2, 2, 574, 575, 3, 2, 2, 2, 575, 138, 3, 2, 2, 2, 576, 574, 3, 2, 2, 2, 577, 578, 7, 50, 2, 2, 578, 140, 3, 2, 2, 2, 579, 585, 7, 41, 2, 2, 580, 584, 10, 7, 2, 2, 581, 582, 7, 41, 2, 2, 582, 584, 7, 41, 2, 2, 583, 580, 3, 2, 2, 2, 583, 581, 3, 2, 2, 2, 584, 587, 3, 2, 2, 2, 585, 583, 3, 2, 2, 2, 585, 586, 3, 2, 2, 2, 586, 588, 3, 2, 2, 2, 587, 585, 3, 2, 2, 2, 588, 589, 7, 41, 2, 2, 589, 142, 3, 2, 2, 2, 590, 591, 9, 8, 2, 2, 591, 592, 3, 2, 2, 2, 592, 593, 8, 72, 2, 2, 593, 144, 3, 2, 2, 2, 17, 2, 469, 476, 479, 485, 534, 545, 548, 552, 556, 561, 567, 574, 583, 585, 3, 8, 2, 2]
\ No newline at end of file
+[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 77, 639, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 4, 45, 9, 45, 4, 46, 9, 46, 4, 47, 9, 47, 4, 48, 9, 48, 4, 49, 9, 49, 4, 50, 9, 50, 4, 51, 9, 51, 4, 52, 9, 52, 4, 53, 9, 53, 4, 54, 9, 54, 4, 55, 9, 55, 4, 56, 9, 56, 4, 57, 9, 57, 4, 58, 9, 58, 4, 59, 9, 59, 4, 60, 9, 60, 4, 61, 9, 61, 4, 62, 9, 62, 4, 63, 9, 63, 4, 64, 9, 64, 4, 65, 9, 65, 4, 66, 9, 66, 4, 67, 9, 67, 4, 68, 9, 68, 4, 69, 9, 69, 4, 70, 9, 70, 4, 71, 9, 71, 4, 72, 9, 72, 4, 73, 9, 73, 4, 74, 9, 74, 4, 75, 9, 75, 4, 76, 9, 76, 3, 2, 3, 2, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 23, 3, 23, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 28, 3, 28, 3, 28, 3, 29, 3, 29, 3, 29, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 45, 3, 45, 3, 45, 3, 45, 3, 45, 3, 45, 3, 45, 3, 45, 3, 45, 3, 45, 3, 46, 3, 46, 3, 47, 3, 47, 3, 47, 3, 48, 3, 48, 3, 49, 3, 49, 3, 49, 3, 50, 3, 50, 3, 50, 3, 51, 3, 51, 3, 51, 3, 52, 3, 52, 3, 52, 3, 52, 3, 53, 3, 53, 3, 54, 3, 54, 3, 54, 3, 55, 3, 55, 3, 55, 3, 56, 3, 56, 3, 56, 3, 57, 3, 57, 3, 57, 3, 57, 3, 58, 3, 58, 3, 58, 3, 59, 3, 59, 3, 59, 3, 60, 3, 60, 3, 60, 3, 61, 3, 61, 3, 61, 3, 61, 3, 62, 3, 62, 3, 62, 3, 62, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 66, 3, 66, 3, 66, 7, 66, 513, 10, 66, 12, 66, 14, 66, 516, 11, 66, 3, 66, 3, 66, 7, 66, 520, 10, 66, 12, 66, 14, 66, 523, 11, 66, 5, 66, 525, 10, 66, 3, 67, 3, 67, 7, 67, 529, 10, 67, 12, 67, 14, 67, 532, 11, 67, 3, 68, 3, 68, 3, 68, 3, 68, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 5, 69, 580, 10, 69, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 5, 70, 591, 10, 70, 3, 71, 5, 71, 594, 10, 71, 3, 71, 3, 71, 5, 71, 598, 10, 71, 3, 71, 3, 71, 5, 71, 602, 10, 71, 3, 72, 6, 72, 605, 10, 72, 13, 72, 14, 72, 606, 3, 72, 3, 72, 7, 72, 611, 10, 72, 12, 72, 14, 72, 614, 11, 72, 3, 73, 3, 73, 7, 73, 618, 10, 73, 12, 73, 14, 73, 621, 11, 73, 3, 74, 3, 74, 3, 75, 3, 75, 3, 75, 3, 75, 7, 75, 629, 10, 75, 12, 75, 14, 75, 632, 11, 75, 3, 75, 3, 75, 3, 76, 3, 76, 3, 76, 3, 76, 2, 2, 77, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13, 8, 15, 9, 17, 10, 19, 11, 21, 12, 23, 13, 25, 14, 27, 15, 29, 16, 31, 17, 33, 18, 35, 19, 37, 20, 39, 21, 41, 22, 43, 23, 45, 24, 47, 25, 49, 26, 51, 27, 53, 28, 55, 29, 57, 30, 59, 31, 61, 32, 63, 33, 65, 34, 67, 35, 69, 36, 71, 37, 73, 38, 75, 39, 77, 40, 79, 41, 81, 42, 83, 43, 85, 44, 87, 45, 89, 46, 91, 47, 93, 48, 95, 49, 97, 50, 99, 51, 101, 52, 103, 53, 105, 54, 107, 55, 109, 56, 111, 57, 113, 58, 115, 59, 117, 60, 119, 61, 121, 62, 123, 63, 125, 64, 127, 65, 129, 66, 131, 67, 133, 68, 135, 69, 137, 70, 139, 71, 141, 72, 143, 73, 145, 74, 147, 75, 149, 76, 151, 77, 3, 2, 9, 5, 2, 67, 92, 97, 97, 99, 124, 6, 2, 50, 59, 67, 92, 97, 97, 99, 124, 7, 2, 48, 48, 50, 59, 67, 92, 97, 97, 99, 124, 3, 2, 50, 59, 3, 2, 51, 59, 3, 2, 41, 41, 5, 2, 11, 12, 15, 15, 34, 34, 2, 656, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 2, 35, 3, 2, 2, 2, 2, 37, 3, 2, 2, 2, 2, 39, 3, 2, 2, 2, 2, 41, 3, 2, 2, 2, 2, 43, 3, 2, 2, 2, 2, 45, 3, 2, 2, 2, 2, 47, 3, 2, 2, 2, 2, 49, 3, 2, 2, 2, 2, 51, 3, 2, 2, 2, 2, 53, 3, 2, 2, 2, 2, 55, 3, 2, 2, 2, 2, 57, 3, 2, 2, 2, 2, 59, 3, 2, 2, 2, 2, 61, 3, 2, 2, 2, 2, 63, 3, 2, 2, 2, 2, 65, 3, 2, 2, 2, 2, 67, 3, 2, 2, 2, 2, 69, 3, 2, 2, 2, 2, 71, 3, 2, 2, 2, 2, 73, 3, 2, 2, 2, 2, 75, 3, 2, 2, 2, 2, 77, 3, 2, 2, 2, 2, 79, 3, 2, 2, 2, 2, 81, 3, 2, 2, 2, 2, 83, 3, 2, 2, 2, 2, 85, 3, 2, 2, 2, 2, 87, 3, 2, 2, 2, 2, 89, 3, 2, 2, 2, 2, 91, 3, 2, 2, 2, 2, 93, 3, 2, 2, 2, 2, 95, 3, 2, 2, 2, 2, 97, 3, 2, 2, 2, 2, 99, 3, 2, 2, 2, 2, 101, 3, 2, 2, 2, 2, 103, 3, 2, 2, 2, 2, 105, 3, 2, 2, 2, 2, 107, 3, 2, 2, 2, 2, 109, 3, 2, 2, 2, 2, 111, 3, 2, 2, 2, 2, 113, 3, 2, 2, 2, 2, 115, 3, 2, 2, 2, 2, 117, 3, 2, 2, 2, 2, 119, 3, 2, 2, 2, 2, 121, 3, 2, 2, 2, 2, 123, 3, 2, 2, 2, 2, 125, 3, 2, 2, 2, 2, 127, 3, 2, 2, 2, 2, 129, 3, 2, 2, 2, 2, 131, 3, 2, 2, 2, 2, 133, 3, 2, 2, 2, 2, 135, 3, 2, 2, 2, 2, 137, 3, 2, 2, 2, 2, 139, 3, 2, 2, 2, 2, 141, 3, 2, 2, 2, 2, 143, 3, 2, 2, 2, 2, 145, 3, 2, 2, 2, 2, 147, 3, 2, 2, 2, 2, 149, 3, 2, 2, 2, 2, 151, 3, 2, 2, 2, 3, 153, 3, 2, 2, 2, 5, 155, 3, 2, 2, 2, 7, 157, 3, 2, 2, 2, 9, 164, 3, 2, 2, 2, 11, 173, 3, 2, 2, 2, 13, 179, 3, 2, 2, 2, 15, 185, 3, 2, 2, 2, 17, 188, 3, 2, 2, 2, 19, 190, 3, 2, 2, 2, 21, 196, 3, 2, 2, 2, 23, 202, 3, 2, 2, 2, 25, 207, 3, 2, 2, 2, 27, 211, 3, 2, 2, 2, 29, 216, 3, 2, 2, 2, 31, 222, 3, 2, 2, 2, 33, 229, 3, 2, 2, 2, 35, 235, 3, 2, 2, 2, 37, 237, 3, 2, 2, 2, 39, 243, 3, 2, 2, 2, 41, 248, 3, 2, 2, 2, 43, 251, 3, 2, 2, 2, 45, 255, 3, 2, 2, 2, 47, 259, 3, 2, 2, 2, 49, 269, 3, 2, 2, 2, 51, 272, 3, 2, 2, 2, 53, 280, 3, 2, 2, 2, 55, 288, 3, 2, 2, 2, 57, 291, 3, 2, 2, 2, 59, 294, 3, 2, 2, 2, 61, 299, 3, 2, 2, 2, 63, 306, 3, 2, 2, 2, 65, 316, 3, 2, 2, 2, 67, 324, 3, 2, 2, 2, 69, 330, 3, 2, 2, 2, 71, 338, 3, 2, 2, 2, 73, 349, 3, 2, 2, 2, 75, 358, 3, 2, 2, 2, 77, 363, 3, 2, 2, 2, 79, 369, 3, 2, 2, 2, 81, 378, 3, 2, 2, 2, 83, 388, 3, 2, 2, 2, 85, 399, 3, 2, 2, 2, 87, 411, 3, 2, 2, 2, 89, 420, 3, 2, 2, 2, 91, 430, 3, 2, 2, 2, 93, 432, 3, 2, 2, 2, 95, 435, 3, 2, 2, 2, 97, 437, 3, 2, 2, 2, 99, 440, 3, 2, 2, 2, 101, 443, 3, 2, 2, 2, 103, 446, 3, 2, 2, 2, 105, 450, 3, 2, 2, 2, 107, 452, 3, 2, 2, 2, 109, 455, 3, 2, 2, 2, 111, 458, 3, 2, 2, 2, 113, 461, 3, 2, 2, 2, 115, 465, 3, 2, 2, 2, 117, 468, 3, 2, 2, 2, 119, 471, 3, 2, 2, 2, 121, 474, 3, 2, 2, 2, 123, 478, 3, 2, 2, 2, 125, 482, 3, 2, 2, 2, 127, 491, 3, 2, 2, 2, 129, 500, 3, 2, 2, 2, 131, 524, 3, 2, 2, 2, 133, 526, 3, 2, 2, 2, 135, 533, 3, 2, 2, 2, 137, 579, 3, 2, 2, 2, 139, 590, 3, 2, 2, 2, 141, 601, 3, 2, 2, 2, 143, 604, 3, 2, 2, 2, 145, 615, 3, 2, 2, 2, 147, 622, 3, 2, 2, 2, 149, 624, 3, 2, 2, 2, 151, 635, 3, 2, 2, 2, 153, 154, 7, 42, 2, 2, 154, 4, 3, 2, 2, 2, 155, 156, 7, 43, 2, 2, 156, 6, 3, 2, 2, 2, 157, 158, 7, 117, 2, 2, 158, 159, 7, 103, 2, 2, 159, 160, 7, 110, 2, 2, 160, 161, 7, 103, 2, 2, 161, 162, 7, 101, 2, 2, 162, 163, 7, 118, 2, 2, 163, 8, 3, 2, 2, 2, 164, 165, 7, 102, 2, 2, 165, 166, 7, 107, 2, 2, 166, 167, 7, 117, 2, 2, 167, 168, 7, 118, 2, 2, 168, 169, 7, 107, 2, 2, 169, 170, 7, 112, 2, 2, 170, 171, 7, 101, 2, 2, 171, 172, 7, 118, 2, 2, 172, 10, 3, 2, 2, 2, 173, 174, 7, 121, 2, 2, 174, 175, 7, 106, 2, 2, 175, 176, 7, 103, 2, 2, 176, 177, 7, 116, 2, 2, 177, 178, 7, 103, 2, 2, 178, 12, 3, 2, 2, 2, 179, 180, 7, 113, 2, 2, 180, 181, 7, 116, 2, 2, 181, 182, 7, 102, 2, 2, 182, 183, 7, 103, 2, 2, 183, 184, 7, 116, 2, 2, 184, 14, 3, 2, 2, 2, 185, 186, 7, 100, 2, 2, 186, 187, 7, 123, 2, 2, 187, 16, 3, 2, 2, 2, 188, 189, 7, 46, 2, 2, 189, 18, 3, 2, 2, 2, 190, 191, 7, 112, 2, 2, 191, 192, 7, 119, 2, 2, 192, 193, 7, 110, 2, 2, 193, 194, 7, 110, 2, 2, 194, 195, 7, 117, 2, 2, 195, 20, 3, 2, 2, 2, 196, 197, 7, 104, 2, 2, 197, 198, 7, 107, 2, 2, 198, 199, 7, 116, 2, 2, 199, 200, 7, 117, 2, 2, 200, 201, 7, 118, 2, 2, 201, 22, 3, 2, 2, 2, 202, 203, 7, 110, 2, 2, 203, 204, 7, 99, 2, 2, 204, 205, 7, 117, 2, 2, 205, 206, 7, 118, 2, 2, 206, 24, 3, 2, 2, 2, 207, 208, 7, 99, 2, 2, 208, 209, 7, 117, 2, 2, 209, 210, 7, 101, 2, 2, 210, 26, 3, 2, 2, 2, 211, 212, 7, 102, 2, 2, 212, 213, 7, 103, 2, 2, 213, 214, 7, 117, 2, 2, 214, 215, 7, 101, 2, 2, 215, 28, 3, 2, 2, 2, 216, 217, 7, 110, 2, 2, 217, 218, 7, 107, 2, 2, 218, 219, 7, 111, 2, 2, 219, 220, 7, 107, 2, 2, 220, 221, 7, 118, 2, 2, 221, 30, 3, 2, 2, 2, 222, 223, 7, 113, 2, 2, 223, 224, 7, 104, 2, 2, 224, 225, 7, 104, 2, 2, 225, 226, 7, 117, 2, 2, 226, 227, 7, 103, 2, 2, 227, 228, 7, 118, 2, 2, 228, 32, 3, 2, 2, 2, 229, 230, 7, 104, 2, 2, 230, 231, 7, 103, 2, 2, 231, 232, 7, 118, 2, 2, 232, 233, 7, 101, 2, 2, 233, 234, 7, 106, 2, 2, 234, 34, 3, 2, 2, 2, 235, 236, 7, 45, 2, 2, 236, 36, 3, 2, 2, 2, 237, 238, 7, 115, 2, 2, 238, 239, 7, 119, 2, 2, 239, 240, 7, 103, 2, 2, 240, 241, 7, 116, 2, 2, 241, 242, 7, 123, 2, 2, 242, 38, 3, 2, 2, 2, 243, 244, 7, 110, 2, 2, 244, 245, 7, 99, 2, 2, 245, 246, 7, 124, 2, 2, 246, 247, 7, 123, 2, 2, 247, 40, 3, 2, 2, 2, 248, 249, 7, 113, 2, 2, 249, 250, 7, 116, 2, 2, 250, 42, 3, 2, 2, 2, 251, 252, 7, 99, 2, 2, 252, 253, 7, 112, 2, 2, 253, 254, 7, 102, 2, 2, 254, 44, 3, 2, 2, 2, 255, 256, 7, 112, 2, 2, 256, 257, 7, 113, 2, 2, 257, 258, 7, 118, 2, 2, 258, 46, 3, 2, 2, 2, 259, 260, 7, 107, 2, 2, 260, 261, 7, 112, 2, 2, 261, 262, 7, 81, 2, 2, 262, 263, 7, 116, 2, 2, 263, 264, 7, 71, 2, 2, 264, 265, 7, 111, 2, 2, 265, 266, 7, 114, 2, 2, 266, 267, 7, 118, 2, 2, 267, 268, 7, 123, 2, 2, 268, 48, 3, 2, 2, 2, 269, 270, 7, 107, 2, 2, 270, 271, 7, 112, 2, 2, 271, 50, 3, 2, 2, 2, 272, 273, 7, 100, 2, 2, 273, 274, 7, 103, 2, 2, 274, 275, 7, 118, 2, 2, 275, 276, 7, 121, 2, 2, 276, 277, 7, 103, 2, 2, 277, 278, 7, 103, 2, 2, 278, 279, 7, 112, 2, 2, 279, 52, 3, 2, 2, 2, 280, 281, 7, 107, 2, 2, 281, 282, 7, 112, 2, 2, 282, 283, 7, 116, 2, 2, 283, 284, 7, 99, 2, 2, 284, 285, 7, 112, 2, 2, 285, 286, 7, 105, 2, 2, 286, 287, 7, 103, 2, 2, 287, 54, 3, 2, 2, 2, 288, 289, 7, 118, 2, 2, 289, 290, 7, 113, 2, 2, 290, 56, 3, 2, 2, 2, 291, 292, 7, 107, 2, 2, 292, 293, 7, 117, 2, 2, 293, 58, 3, 2, 2, 2, 294, 295, 7, 112, 2, 2, 295, 296, 7, 119, 2, 2, 296, 297, 7, 110, 2, 2, 297, 298, 7, 110, 2, 2, 298, 60, 3, 2, 2, 2, 299, 300, 7, 107, 2, 2, 300, 301, 7, 117, 2, 2, 301, 302, 7, 80, 2, 2, 302, 303, 7, 119, 2, 2, 303, 304, 7, 110, 2, 2, 304, 305, 7, 110, 2, 2, 305, 62, 3, 2, 2, 2, 306, 307, 7, 107, 2, 2, 307, 308, 7, 117, 2, 2, 308, 309, 7, 80, 2, 2, 309, 310, 7, 113, 2, 2, 310, 311, 7, 118, 2, 2, 311, 312, 7, 80, 2, 2, 312, 313, 7, 119, 2, 2, 313, 314, 7, 110, 2, 2, 314, 315, 7, 110, 2, 2, 315, 64, 3, 2, 2, 2, 316, 317, 7, 112, 2, 2, 317, 318, 7, 113, 2, 2, 318, 319, 7, 118, 2, 2, 319, 320, 7, 80, 2, 2, 320, 321, 7, 119, 2, 2, 321, 322, 7, 110, 2, 2, 322, 323, 7, 110, 2, 2, 323, 66, 3, 2, 2, 2, 324, 325, 7, 103, 2, 2, 325, 326, 7, 111, 2, 2, 326, 327, 7, 114, 2, 2, 327, 328, 7, 118, 2, 2, 328, 329, 7, 123, 2, 2, 329, 68, 3, 2, 2, 2, 330, 331, 7, 107, 2, 2, 331, 332, 7, 117, 2, 2, 332, 333, 7, 71, 2, 2, 333, 334, 7, 111, 2, 2, 334, 335, 7, 114, 2, 2, 335, 336, 7, 118, 2, 2, 336, 337, 7, 123, 2, 2, 337, 70, 3, 2, 2, 2, 338, 339, 7, 107, 2, 2, 339, 340, 7, 117, 2, 2, 340, 341, 7, 80, 2, 2, 341, 342, 7, 113, 2, 2, 342, 343, 7, 118, 2, 2, 343, 344, 7, 71, 2, 2, 344, 345, 7, 111, 2, 2, 345, 346, 7, 114, 2, 2, 346, 347, 7, 118, 2, 2, 347, 348, 7, 123, 2, 2, 348, 72, 3, 2, 2, 2, 349, 350, 7, 112, 2, 2, 350, 351, 7, 113, 2, 2, 351, 352, 7, 118, 2, 2, 352, 353, 7, 71, 2, 2, 353, 354, 7, 111, 2, 2, 354, 355, 7, 114, 2, 2, 355, 356, 7, 118, 2, 2, 356, 357, 7, 123, 2, 2, 357, 74, 3, 2, 2, 2, 358, 359, 7, 110, 2, 2, 359, 360, 7, 107, 2, 2, 360, 361, 7, 109, 2, 2, 361, 362, 7, 103, 2, 2, 362, 76, 3, 2, 2, 2, 363, 364, 7, 107, 2, 2, 364, 365, 7, 110, 2, 2, 365, 366, 7, 107, 2, 2, 366, 367, 7, 109, 2, 2, 367, 368, 7, 103, 2, 2, 368, 78, 3, 2, 2, 2, 369, 370, 7, 101, 2, 2, 370, 371, 7, 113, 2, 2, 371, 372, 7, 112, 2, 2, 372, 373, 7, 118, 2, 2, 373, 374, 7, 99, 2, 2, 374, 375, 7, 107, 2, 2, 375, 376, 7, 112, 2, 2, 376, 377, 7, 117, 2, 2, 377, 80, 3, 2, 2, 2, 378, 379, 7, 107, 2, 2, 379, 380, 7, 101, 2, 2, 380, 381, 7, 113, 2, 2, 381, 382, 7, 112, 2, 2, 382, 383, 7, 118, 2, 2, 383, 384, 7, 99, 2, 2, 384, 385, 7, 107, 2, 2, 385, 386, 7, 112, 2, 2, 386, 387, 7, 117, 2, 2, 387, 82, 3, 2, 2, 2, 388, 389, 7, 117, 2, 2, 389, 390, 7, 118, 2, 2, 390, 391, 7, 99, 2, 2, 391, 392, 7, 116, 2, 2, 392, 393, 7, 118, 2, 2, 393, 394, 7, 117, 2, 2, 394, 395, 7, 89, 2, 2, 395, 396, 7, 107, 2, 2, 396, 397, 7, 118, 2, 2, 397, 398, 7, 106, 2, 2, 398, 84, 3, 2, 2, 2, 399, 400, 7, 107, 2, 2, 400, 401, 7, 117, 2, 2, 401, 402, 7, 118, 2, 2, 402, 403, 7, 99, 2, 2, 403, 404, 7, 116, 2, 2, 404, 405, 7, 118, 2, 2, 405, 406, 7, 117, 2, 2, 406, 407, 7, 89, 2, 2, 407, 408, 7, 107, 2, 2, 408, 409, 7, 118, 2, 2, 409, 410, 7, 106, 2, 2, 410, 86, 3, 2, 2, 2, 411, 412, 7, 103, 2, 2, 412, 413, 7, 112, 2, 2, 413, 414, 7, 102, 2, 2, 414, 415, 7, 117, 2, 2, 415, 416, 7, 89, 2, 2, 416, 417, 7, 107, 2, 2, 417, 418, 7, 118, 2, 2, 418, 419, 7, 106, 2, 2, 419, 88, 3, 2, 2, 2, 420, 421, 7, 107, 2, 2, 421, 422, 7, 103, 2, 2, 422, 423, 7, 112, 2, 2, 423, 424, 7, 102, 2, 2, 424, 425, 7, 117, 2, 2, 425, 426, 7, 89, 2, 2, 426, 427, 7, 107, 2, 2, 427, 428, 7, 118, 2, 2, 428, 429, 7, 106, 2, 2, 429, 90, 3, 2, 2, 2, 430, 431, 7, 63, 2, 2, 431, 92, 3, 2, 2, 2, 432, 433, 7, 103, 2, 2, 433, 434, 7, 115, 2, 2, 434, 94, 3, 2, 2, 2, 435, 436, 7, 64, 2, 2, 436, 96, 3, 2, 2, 2, 437, 438, 7, 105, 2, 2, 438, 439, 7, 118, 2, 2, 439, 98, 3, 2, 2, 2, 440, 441, 7, 64, 2, 2, 441, 442, 7, 63, 2, 2, 442, 100, 3, 2, 2, 2, 443, 444, 7, 105, 2, 2, 444, 445, 7, 103, 2, 2, 445, 102, 3, 2, 2, 2, 446, 447, 7, 105, 2, 2, 447, 448, 7, 118, 2, 2, 448, 449, 7, 103, 2, 2, 449, 104, 3, 2, 2, 2, 450, 451, 7, 62, 2, 2, 451, 106, 3, 2, 2, 2, 452, 453, 7, 110, 2, 2, 453, 454, 7, 118, 2, 2, 454, 108, 3, 2, 2, 2, 455, 456, 7, 62, 2, 2, 456, 457, 7, 63, 2, 2, 457, 110, 3, 2, 2, 2, 458, 459, 7, 110, 2, 2, 459, 460, 7, 103, 2, 2, 460, 112, 3, 2, 2, 2, 461, 462, 7, 110, 2, 2, 462, 463, 7, 118, 2, 2, 463, 464, 7, 103, 2, 2, 464, 114, 3, 2, 2, 2, 465, 466, 7, 62, 2, 2, 466, 467, 7, 64, 2, 2, 467, 116, 3, 2, 2, 2, 468, 469, 7, 35, 2, 2, 469, 470, 7, 63, 2, 2, 470, 118, 3, 2, 2, 2, 471, 472, 7, 112, 2, 2, 472, 473, 7, 103, 2, 2, 473, 120, 3, 2, 2, 2, 474, 475, 7, 107, 2, 2, 475, 476, 7, 103, 2, 2, 476, 477, 7, 115, 2, 2, 477, 122, 3, 2, 2, 2, 478, 479, 7, 107, 2, 2, 479, 480, 7, 112, 2, 2, 480, 481, 7, 103, 2, 2, 481, 124, 3, 2, 2, 2, 482, 483, 7, 103, 2, 2, 483, 484, 7, 115, 2, 2, 484, 485, 7, 81, 2, 2, 485, 486, 7, 116, 2, 2, 486, 487, 7, 80, 2, 2, 487, 488, 7, 119, 2, 2, 488, 489, 7, 110, 2, 2, 489, 490, 7, 110, 2, 2, 490, 126, 3, 2, 2, 2, 491, 492, 7, 105, 2, 2, 492, 493, 7, 118, 2, 2, 493, 494, 7, 81, 2, 2, 494, 495, 7, 116, 2, 2, 495, 496, 7, 80, 2, 2, 496, 497, 7, 119, 2, 2, 497, 498, 7, 110, 2, 2, 498, 499, 7, 110, 2, 2, 499, 128, 3, 2, 2, 2, 500, 501, 7, 110, 2, 2, 501, 502, 7, 118, 2, 2, 502, 503, 7, 81, 2, 2, 503, 504, 7, 116, 2, 2, 504, 505, 7, 80, 2, 2, 505, 506, 7, 119, 2, 2, 506, 507, 7, 110, 2, 2, 507, 508, 7, 110, 2, 2, 508, 130, 3, 2, 2, 2, 509, 510, 7, 60, 2, 2, 510, 514, 9, 2, 2, 2, 511, 513, 9, 3, 2, 2, 512, 511, 3, 2, 2, 2, 513, 516, 3, 2, 2, 2, 514, 512, 3, 2, 2, 2, 514, 515, 3, 2, 2, 2, 515, 525, 3, 2, 2, 2, 516, 514, 3, 2, 2, 2, 517, 521, 7, 65, 2, 2, 518, 520, 4, 50, 59, 2, 519, 518, 3, 2, 2, 2, 520, 523, 3, 2, 2, 2, 521, 519, 3, 2, 2, 2, 521, 522, 3, 2, 2, 2, 522, 525, 3, 2, 2, 2, 523, 521, 3, 2, 2, 2, 524, 509, 3, 2, 2, 2, 524, 517, 3, 2, 2, 2, 525, 132, 3, 2, 2, 2, 526, 530, 9, 2, 2, 2, 527, 529, 9, 4, 2, 2, 528, 527, 3, 2, 2, 2, 529, 532, 3, 2, 2, 2, 530, 528, 3, 2, 2, 2, 530, 531, 3, 2, 2, 2, 531, 134, 3, 2, 2, 2, 532, 530, 3, 2, 2, 2, 533, 534, 7, 98, 2, 2, 534, 535, 5, 133, 67, 2, 535, 536, 7, 98, 2, 2, 536, 136, 3, 2, 2, 2, 537, 538, 7, 117, 2, 2, 538, 539, 7, 119, 2, 2, 539, 540, 7, 111, 2, 2, 540, 541, 7, 42, 2, 2, 541, 542, 3, 2, 2, 2, 542, 543, 5, 133, 67, 2, 543, 544, 7, 43, 2, 2, 544, 580, 3, 2, 2, 2, 545, 546, 7, 111, 2, 2, 546, 547, 7, 99, 2, 2, 547, 548, 7, 122, 2, 2, 548, 549, 7, 42, 2, 2, 549, 550, 3, 2, 2, 2, 550, 551, 5, 133, 67, 2, 551, 552, 7, 43, 2, 2, 552, 580, 3, 2, 2, 2, 553, 554, 7, 111, 2, 2, 554, 555, 7, 107, 2, 2, 555, 556, 7, 112, 2, 2, 556, 557, 7, 42, 2, 2, 557, 558, 3, 2, 2, 2, 558, 559, 5, 133, 67, 2, 559, 560, 7, 43, 2, 2, 560, 580, 3, 2, 2, 2, 561, 562, 7, 99, 2, 2, 562, 563, 7, 120, 2, 2, 563, 564, 7, 105, 2, 2, 564, 565, 7, 42, 2, 2, 565, 566, 3, 2, 2, 2, 566, 567, 5, 133, 67, 2, 567, 568, 7, 43, 2, 2, 568, 580, 3, 2, 2, 2, 569, 570, 7, 101, 2, 2, 570, 571, 7, 113, 2, 2, 571, 572, 7, 119, 2, 2, 572, 573, 7, 112, 2, 2, 573, 574, 7, 118, 2, 2, 574, 575, 7, 42, 2, 2, 575, 576, 3, 2, 2, 2, 576, 577, 5, 133, 67, 2, 577, 578, 7, 43, 2, 2, 578, 580, 3, 2, 2, 2, 579, 537, 3, 2, 2, 2, 579, 545, 3, 2, 2, 2, 579, 553, 3, 2, 2, 2, 579, 561, 3, 2, 2, 2, 579, 569, 3, 2, 2, 2, 580, 138, 3, 2, 2, 2, 581, 582, 7, 118, 2, 2, 582, 583, 7, 116, 2, 2, 583, 584, 7, 119, 2, 2, 584, 591, 7, 103, 2, 2, 585, 586, 7, 104, 2, 2, 586, 587, 7, 99, 2, 2, 587, 588, 7, 110, 2, 2, 588, 589, 7, 117, 2, 2, 589, 591, 7, 103, 2, 2, 590, 581, 3, 2, 2, 2, 590, 585, 3, 2, 2, 2, 591, 140, 3, 2, 2, 2, 592, 594, 7, 47, 2, 2, 593, 592, 3, 2, 2, 2, 593, 594, 3, 2, 2, 2, 594, 595, 3, 2, 2, 2, 595, 602, 5, 143, 72, 2, 596, 598, 7, 47, 2, 2, 597, 596, 3, 2, 2, 2, 597, 598, 3, 2, 2, 2, 598, 599, 3, 2, 2, 2, 599, 602, 5, 145, 73, 2, 600, 602, 5, 147, 74, 2, 601, 593, 3, 2, 2, 2, 601, 597, 3, 2, 2, 2, 601, 600, 3, 2, 2, 2, 602, 142, 3, 2, 2, 2, 603, 605, 9, 5, 2, 2, 604, 603, 3, 2, 2, 2, 605, 606, 3, 2, 2, 2, 606, 604, 3, 2, 2, 2, 606, 607, 3, 2, 2, 2, 607, 608, 3, 2, 2, 2, 608, 612, 7, 48, 2, 2, 609, 611, 9, 5, 2, 2, 610, 609, 3, 2, 2, 2, 611, 614, 3, 2, 2, 2, 612, 610, 3, 2, 2, 2, 612, 613, 3, 2, 2, 2, 613, 144, 3, 2, 2, 2, 614, 612, 3, 2, 2, 2, 615, 619, 9, 6, 2, 2, 616, 618, 9, 5, 2, 2, 617, 616, 3, 2, 2, 2, 618, 621, 3, 2, 2, 2, 619, 617, 3, 2, 2, 2, 619, 620, 3, 2, 2, 2, 620, 146, 3, 2, 2, 2, 621, 619, 3, 2, 2, 2, 622, 623, 7, 50, 2, 2, 623, 148, 3, 2, 2, 2, 624, 630, 7, 41, 2, 2, 625, 629, 10, 7, 2, 2, 626, 627, 7, 41, 2, 2, 627, 629, 7, 41, 2, 2, 628, 625, 3, 2, 2, 2, 628, 626, 3, 2, 2, 2, 629, 632, 3, 2, 2, 2, 630, 628, 3, 2, 2, 2, 630, 631, 3, 2, 2, 2, 631, 633, 3, 2, 2, 2, 632, 630, 3, 2, 2, 2, 633, 634, 7, 41, 2, 2, 634, 150, 3, 2, 2, 2, 635, 636, 9, 8, 2, 2, 636, 637, 3, 2, 2, 2, 637, 638, 8, 76, 2, 2, 638, 152, 3, 2, 2, 2, 17, 2, 514, 521, 524, 530, 579, 590, 593, 597, 601, 606, 612, 619, 628, 630, 3, 8, 2, 2]
\ No newline at end of file
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
index 149bdca4c..461b7199a 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
@@ -28,9 +28,9 @@ public class EQLLexer extends Lexer {
 		T__38=39, T__39=40, T__40=41, T__41=42, T__42=43, T__43=44, T__44=45,
 		T__45=46, T__46=47, T__47=48, T__48=49, T__49=50, T__50=51, T__51=52,
 		T__52=53, T__53=54, T__54=55, T__55=56, T__56=57, T__57=58, T__58=59,
-		T__59=60, INPUT_VARIABLE=61, PATH_VARIABLE=62, QUOTED_PATH_VARIABLE=63,
-		PROP_FORMULA=64, BOOLEAN_LITERAL=65, NUMBER_LITERAL=66, DOUBLE=67, INT=68,
-		ZERO=69, STRING_LITERAL=70, WS=71;
+		T__59=60, T__60=61, T__61=62, T__62=63, T__63=64, INPUT_VARIABLE=65, PATH_VARIABLE=66,
+		QUOTED_PATH_VARIABLE=67, PROP_FORMULA=68, BOOLEAN_LITERAL=69, NUMBER_LITERAL=70,
+		DOUBLE=71, INT=72, ZERO=73, STRING_LITERAL=74, WS=75;
 	public static String[] channelNames = {
 		"DEFAULT_TOKEN_CHANNEL", "HIDDEN"
 	};
@@ -48,9 +48,9 @@ public class EQLLexer extends Lexer {
 			"T__33", "T__34", "T__35", "T__36", "T__37", "T__38", "T__39", "T__40",
 			"T__41", "T__42", "T__43", "T__44", "T__45", "T__46", "T__47", "T__48",
 			"T__49", "T__50", "T__51", "T__52", "T__53", "T__54", "T__55", "T__56",
-			"T__57", "T__58", "T__59", "INPUT_VARIABLE", "PATH_VARIABLE", "QUOTED_PATH_VARIABLE",
-			"PROP_FORMULA", "BOOLEAN_LITERAL", "NUMBER_LITERAL", "DOUBLE", "INT",
-			"ZERO", "STRING_LITERAL", "WS"
+			"T__57", "T__58", "T__59", "T__60", "T__61", "T__62", "T__63", "INPUT_VARIABLE",
+			"PATH_VARIABLE", "QUOTED_PATH_VARIABLE", "PROP_FORMULA", "BOOLEAN_LITERAL",
+			"NUMBER_LITERAL", "DOUBLE", "INT", "ZERO", "STRING_LITERAL", "WS"
 		};
 	}
 	public static final String[] ruleNames = makeRuleNames();
@@ -60,12 +60,13 @@ public class EQLLexer extends Lexer {
 			null, "'('", "')'", "'select'", "'distinct'", "'where'", "'order'", "'by'",
 			"','", "'nulls'", "'first'", "'last'", "'asc'", "'desc'", "'limit'",
 			"'offset'", "'fetch'", "'+'", "'query'", "'lazy'", "'or'", "'and'", "'not'",
-			"'in'", "'between'", "'inrange'", "'to'", "'is'", "'null'", "'isNull'",
-			"'isNotNull'", "'notNull'", "'empty'", "'isEmpty'", "'isNotEmpty'", "'notEmpty'",
-			"'like'", "'ilike'", "'contains'", "'icontains'", "'startsWith'", "'istartsWith'",
-			"'endsWith'", "'iendsWith'", "'='", "'eq'", "'>'", "'gt'", "'>='", "'ge'",
-			"'gte'", "'<'", "'lt'", "'<='", "'le'", "'lte'", "'<>'", "'!='", "'ne'",
-			"'ieq'", "'ine'", null, null, null, null, null, null, null, null, "'0'"
+			"'inOrEmpty'", "'in'", "'between'", "'inrange'", "'to'", "'is'", "'null'",
+			"'isNull'", "'isNotNull'", "'notNull'", "'empty'", "'isEmpty'", "'isNotEmpty'",
+			"'notEmpty'", "'like'", "'ilike'", "'contains'", "'icontains'", "'startsWith'",
+			"'istartsWith'", "'endsWith'", "'iendsWith'", "'='", "'eq'", "'>'", "'gt'",
+			"'>='", "'ge'", "'gte'", "'<'", "'lt'", "'<='", "'le'", "'lte'", "'<>'",
+			"'!='", "'ne'", "'ieq'", "'ine'", "'eqOrNull'", "'gtOrNull'", "'ltOrNull'",
+			null, null, null, null, null, null, null, null, "'0'"
 		};
 	}
 	private static final String[] _LITERAL_NAMES = makeLiteralNames();
@@ -76,9 +77,9 @@ public class EQLLexer extends Lexer {
 			null, null, null, null, null, null, null, null, null, null, null, null,
 			null, null, null, null, null, null, null, null, null, null, null, null,
 			null, null, null, null, null, null, null, null, null, null, null, null,
-			null, "INPUT_VARIABLE", "PATH_VARIABLE", "QUOTED_PATH_VARIABLE", "PROP_FORMULA",
-			"BOOLEAN_LITERAL", "NUMBER_LITERAL", "DOUBLE", "INT", "ZERO", "STRING_LITERAL",
-			"WS"
+			null, null, null, null, null, "INPUT_VARIABLE", "PATH_VARIABLE", "QUOTED_PATH_VARIABLE",
+			"PROP_FORMULA", "BOOLEAN_LITERAL", "NUMBER_LITERAL", "DOUBLE", "INT",
+			"ZERO", "STRING_LITERAL", "WS"
 		};
 	}
 	private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
@@ -140,7 +141,7 @@ public class EQLLexer extends Lexer {
 	public ATN getATN() { return _ATN; }
 
 	public static final String _serializedATN =
-		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2I\u0252\b\1\4\2\t"+
+		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2M\u027f\b\1\4\2\t"+
 		"\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13"+
 		"\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"+
 		"\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"+
@@ -148,192 +149,207 @@ public class EQLLexer extends Lexer {
 		"\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\4*\t*\4+\t+\4"+
 		",\t,\4-\t-\4.\t.\4/\t/\4\60\t\60\4\61\t\61\4\62\t\62\4\63\t\63\4\64\t"+
 		"\64\4\65\t\65\4\66\t\66\4\67\t\67\48\t8\49\t9\4:\t:\4;\t;\4<\t<\4=\t="+
-		"\4>\t>\4?\t?\4@\t@\4A\tA\4B\tB\4C\tC\4D\tD\4E\tE\4F\tF\4G\tG\4H\tH\3\2"+
-		"\3\2\3\3\3\3\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3"+
-		"\5\3\5\3\6\3\6\3\6\3\6\3\6\3\6\3\7\3\7\3\7\3\7\3\7\3\7\3\b\3\b\3\b\3\t"+
-		"\3\t\3\n\3\n\3\n\3\n\3\n\3\n\3\13\3\13\3\13\3\13\3\13\3\13\3\f\3\f\3\f"+
-		"\3\f\3\f\3\r\3\r\3\r\3\r\3\16\3\16\3\16\3\16\3\16\3\17\3\17\3\17\3\17"+
-		"\3\17\3\17\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\21\3\21\3\21\3\21\3\21"+
-		"\3\21\3\22\3\22\3\23\3\23\3\23\3\23\3\23\3\23\3\24\3\24\3\24\3\24\3\24"+
-		"\3\25\3\25\3\25\3\26\3\26\3\26\3\26\3\27\3\27\3\27\3\27\3\30\3\30\3\30"+
-		"\3\31\3\31\3\31\3\31\3\31\3\31\3\31\3\31\3\32\3\32\3\32\3\32\3\32\3\32"+
-		"\3\32\3\32\3\33\3\33\3\33\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\35\3\36"+
-		"\3\36\3\36\3\36\3\36\3\36\3\36\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3\37"+
-		"\3\37\3\37\3 \3 \3 \3 \3 \3 \3 \3 \3!\3!\3!\3!\3!\3!\3\"\3\"\3\"\3\"\3"+
-		"\"\3\"\3\"\3\"\3#\3#\3#\3#\3#\3#\3#\3#\3#\3#\3#\3$\3$\3$\3$\3$\3$\3$\3"+
-		"$\3$\3%\3%\3%\3%\3%\3&\3&\3&\3&\3&\3&\3\'\3\'\3\'\3\'\3\'\3\'\3\'\3\'"+
-		"\3\'\3(\3(\3(\3(\3(\3(\3(\3(\3(\3(\3)\3)\3)\3)\3)\3)\3)\3)\3)\3)\3)\3"+
-		"*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3+\3+\3+\3+\3+\3+\3+\3+\3+\3,\3,\3"+
-		",\3,\3,\3,\3,\3,\3,\3,\3-\3-\3.\3.\3.\3/\3/\3\60\3\60\3\60\3\61\3\61\3"+
-		"\61\3\62\3\62\3\62\3\63\3\63\3\63\3\63\3\64\3\64\3\65\3\65\3\65\3\66\3"+
-		"\66\3\66\3\67\3\67\3\67\38\38\38\38\39\39\39\3:\3:\3:\3;\3;\3;\3<\3<\3"+
-		"<\3<\3=\3=\3=\3=\3>\3>\3>\7>\u01d4\n>\f>\16>\u01d7\13>\3>\3>\7>\u01db"+
-		"\n>\f>\16>\u01de\13>\5>\u01e0\n>\3?\3?\7?\u01e4\n?\f?\16?\u01e7\13?\3"+
-		"@\3@\3@\3@\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3"+
-		"A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\5"+
-		"A\u0217\nA\3B\3B\3B\3B\3B\3B\3B\3B\3B\5B\u0222\nB\3C\5C\u0225\nC\3C\3"+
-		"C\5C\u0229\nC\3C\3C\5C\u022d\nC\3D\6D\u0230\nD\rD\16D\u0231\3D\3D\7D\u0236"+
-		"\nD\fD\16D\u0239\13D\3E\3E\7E\u023d\nE\fE\16E\u0240\13E\3F\3F\3G\3G\3"+
-		"G\3G\7G\u0248\nG\fG\16G\u024b\13G\3G\3G\3H\3H\3H\3H\2\2I\3\3\5\4\7\5\t"+
-		"\6\13\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16\33\17\35\20\37\21!\22#\23"+
-		"%\24\'\25)\26+\27-\30/\31\61\32\63\33\65\34\67\359\36;\37= ?!A\"C#E$G"+
-		"%I&K\'M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63e\64g\65i\66k\67m8o9q:s;u<w=y>{"+
-		"?}@\177A\u0081B\u0083C\u0085D\u0087E\u0089F\u008bG\u008dH\u008fI\3\2\t"+
-		"\5\2C\\aac|\6\2\62;C\\aac|\7\2\60\60\62;C\\aac|\3\2\62;\3\2\63;\3\2))"+
-		"\5\2\13\f\17\17\"\"\2\u0263\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3"+
-		"\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2"+
-		"\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2\37"+
-		"\3\2\2\2\2!\3\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2\2+\3"+
-		"\2\2\2\2-\3\2\2\2\2/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2\2"+
-		"\67\3\2\2\2\29\3\2\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2\2C"+
-		"\3\2\2\2\2E\3\2\2\2\2G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O\3\2"+
-		"\2\2\2Q\3\2\2\2\2S\3\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2\2\2"+
-		"\2]\3\2\2\2\2_\3\2\2\2\2a\3\2\2\2\2c\3\2\2\2\2e\3\2\2\2\2g\3\2\2\2\2i"+
-		"\3\2\2\2\2k\3\2\2\2\2m\3\2\2\2\2o\3\2\2\2\2q\3\2\2\2\2s\3\2\2\2\2u\3\2"+
-		"\2\2\2w\3\2\2\2\2y\3\2\2\2\2{\3\2\2\2\2}\3\2\2\2\2\177\3\2\2\2\2\u0081"+
-		"\3\2\2\2\2\u0083\3\2\2\2\2\u0085\3\2\2\2\2\u0087\3\2\2\2\2\u0089\3\2\2"+
-		"\2\2\u008b\3\2\2\2\2\u008d\3\2\2\2\2\u008f\3\2\2\2\3\u0091\3\2\2\2\5\u0093"+
-		"\3\2\2\2\7\u0095\3\2\2\2\t\u009c\3\2\2\2\13\u00a5\3\2\2\2\r\u00ab\3\2"+
-		"\2\2\17\u00b1\3\2\2\2\21\u00b4\3\2\2\2\23\u00b6\3\2\2\2\25\u00bc\3\2\2"+
-		"\2\27\u00c2\3\2\2\2\31\u00c7\3\2\2\2\33\u00cb\3\2\2\2\35\u00d0\3\2\2\2"+
-		"\37\u00d6\3\2\2\2!\u00dd\3\2\2\2#\u00e3\3\2\2\2%\u00e5\3\2\2\2\'\u00eb"+
-		"\3\2\2\2)\u00f0\3\2\2\2+\u00f3\3\2\2\2-\u00f7\3\2\2\2/\u00fb\3\2\2\2\61"+
-		"\u00fe\3\2\2\2\63\u0106\3\2\2\2\65\u010e\3\2\2\2\67\u0111\3\2\2\29\u0114"+
-		"\3\2\2\2;\u0119\3\2\2\2=\u0120\3\2\2\2?\u012a\3\2\2\2A\u0132\3\2\2\2C"+
-		"\u0138\3\2\2\2E\u0140\3\2\2\2G\u014b\3\2\2\2I\u0154\3\2\2\2K\u0159\3\2"+
-		"\2\2M\u015f\3\2\2\2O\u0168\3\2\2\2Q\u0172\3\2\2\2S\u017d\3\2\2\2U\u0189"+
-		"\3\2\2\2W\u0192\3\2\2\2Y\u019c\3\2\2\2[\u019e\3\2\2\2]\u01a1\3\2\2\2_"+
-		"\u01a3\3\2\2\2a\u01a6\3\2\2\2c\u01a9\3\2\2\2e\u01ac\3\2\2\2g\u01b0\3\2"+
-		"\2\2i\u01b2\3\2\2\2k\u01b5\3\2\2\2m\u01b8\3\2\2\2o\u01bb\3\2\2\2q\u01bf"+
-		"\3\2\2\2s\u01c2\3\2\2\2u\u01c5\3\2\2\2w\u01c8\3\2\2\2y\u01cc\3\2\2\2{"+
-		"\u01df\3\2\2\2}\u01e1\3\2\2\2\177\u01e8\3\2\2\2\u0081\u0216\3\2\2\2\u0083"+
-		"\u0221\3\2\2\2\u0085\u022c\3\2\2\2\u0087\u022f\3\2\2\2\u0089\u023a\3\2"+
-		"\2\2\u008b\u0241\3\2\2\2\u008d\u0243\3\2\2\2\u008f\u024e\3\2\2\2\u0091"+
-		"\u0092\7*\2\2\u0092\4\3\2\2\2\u0093\u0094\7+\2\2\u0094\6\3\2\2\2\u0095"+
-		"\u0096\7u\2\2\u0096\u0097\7g\2\2\u0097\u0098\7n\2\2\u0098\u0099\7g\2\2"+
-		"\u0099\u009a\7e\2\2\u009a\u009b\7v\2\2\u009b\b\3\2\2\2\u009c\u009d\7f"+
-		"\2\2\u009d\u009e\7k\2\2\u009e\u009f\7u\2\2\u009f\u00a0\7v\2\2\u00a0\u00a1"+
-		"\7k\2\2\u00a1\u00a2\7p\2\2\u00a2\u00a3\7e\2\2\u00a3\u00a4\7v\2\2\u00a4"+
-		"\n\3\2\2\2\u00a5\u00a6\7y\2\2\u00a6\u00a7\7j\2\2\u00a7\u00a8\7g\2\2\u00a8"+
-		"\u00a9\7t\2\2\u00a9\u00aa\7g\2\2\u00aa\f\3\2\2\2\u00ab\u00ac\7q\2\2\u00ac"+
-		"\u00ad\7t\2\2\u00ad\u00ae\7f\2\2\u00ae\u00af\7g\2\2\u00af\u00b0\7t\2\2"+
-		"\u00b0\16\3\2\2\2\u00b1\u00b2\7d\2\2\u00b2\u00b3\7{\2\2\u00b3\20\3\2\2"+
-		"\2\u00b4\u00b5\7.\2\2\u00b5\22\3\2\2\2\u00b6\u00b7\7p\2\2\u00b7\u00b8"+
-		"\7w\2\2\u00b8\u00b9\7n\2\2\u00b9\u00ba\7n\2\2\u00ba\u00bb\7u\2\2\u00bb"+
-		"\24\3\2\2\2\u00bc\u00bd\7h\2\2\u00bd\u00be\7k\2\2\u00be\u00bf\7t\2\2\u00bf"+
-		"\u00c0\7u\2\2\u00c0\u00c1\7v\2\2\u00c1\26\3\2\2\2\u00c2\u00c3\7n\2\2\u00c3"+
-		"\u00c4\7c\2\2\u00c4\u00c5\7u\2\2\u00c5\u00c6\7v\2\2\u00c6\30\3\2\2\2\u00c7"+
-		"\u00c8\7c\2\2\u00c8\u00c9\7u\2\2\u00c9\u00ca\7e\2\2\u00ca\32\3\2\2\2\u00cb"+
-		"\u00cc\7f\2\2\u00cc\u00cd\7g\2\2\u00cd\u00ce\7u\2\2\u00ce\u00cf\7e\2\2"+
-		"\u00cf\34\3\2\2\2\u00d0\u00d1\7n\2\2\u00d1\u00d2\7k\2\2\u00d2\u00d3\7"+
-		"o\2\2\u00d3\u00d4\7k\2\2\u00d4\u00d5\7v\2\2\u00d5\36\3\2\2\2\u00d6\u00d7"+
-		"\7q\2\2\u00d7\u00d8\7h\2\2\u00d8\u00d9\7h\2\2\u00d9\u00da\7u\2\2\u00da"+
-		"\u00db\7g\2\2\u00db\u00dc\7v\2\2\u00dc \3\2\2\2\u00dd\u00de\7h\2\2\u00de"+
-		"\u00df\7g\2\2\u00df\u00e0\7v\2\2\u00e0\u00e1\7e\2\2\u00e1\u00e2\7j\2\2"+
-		"\u00e2\"\3\2\2\2\u00e3\u00e4\7-\2\2\u00e4$\3\2\2\2\u00e5\u00e6\7s\2\2"+
-		"\u00e6\u00e7\7w\2\2\u00e7\u00e8\7g\2\2\u00e8\u00e9\7t\2\2\u00e9\u00ea"+
-		"\7{\2\2\u00ea&\3\2\2\2\u00eb\u00ec\7n\2\2\u00ec\u00ed\7c\2\2\u00ed\u00ee"+
-		"\7|\2\2\u00ee\u00ef\7{\2\2\u00ef(\3\2\2\2\u00f0\u00f1\7q\2\2\u00f1\u00f2"+
-		"\7t\2\2\u00f2*\3\2\2\2\u00f3\u00f4\7c\2\2\u00f4\u00f5\7p\2\2\u00f5\u00f6"+
-		"\7f\2\2\u00f6,\3\2\2\2\u00f7\u00f8\7p\2\2\u00f8\u00f9\7q\2\2\u00f9\u00fa"+
-		"\7v\2\2\u00fa.\3\2\2\2\u00fb\u00fc\7k\2\2\u00fc\u00fd\7p\2\2\u00fd\60"+
-		"\3\2\2\2\u00fe\u00ff\7d\2\2\u00ff\u0100\7g\2\2\u0100\u0101\7v\2\2\u0101"+
-		"\u0102\7y\2\2\u0102\u0103\7g\2\2\u0103\u0104\7g\2\2\u0104\u0105\7p\2\2"+
-		"\u0105\62\3\2\2\2\u0106\u0107\7k\2\2\u0107\u0108\7p\2\2\u0108\u0109\7"+
-		"t\2\2\u0109\u010a\7c\2\2\u010a\u010b\7p\2\2\u010b\u010c\7i\2\2\u010c\u010d"+
-		"\7g\2\2\u010d\64\3\2\2\2\u010e\u010f\7v\2\2\u010f\u0110\7q\2\2\u0110\66"+
-		"\3\2\2\2\u0111\u0112\7k\2\2\u0112\u0113\7u\2\2\u01138\3\2\2\2\u0114\u0115"+
-		"\7p\2\2\u0115\u0116\7w\2\2\u0116\u0117\7n\2\2\u0117\u0118\7n\2\2\u0118"+
-		":\3\2\2\2\u0119\u011a\7k\2\2\u011a\u011b\7u\2\2\u011b\u011c\7P\2\2\u011c"+
-		"\u011d\7w\2\2\u011d\u011e\7n\2\2\u011e\u011f\7n\2\2\u011f<\3\2\2\2\u0120"+
-		"\u0121\7k\2\2\u0121\u0122\7u\2\2\u0122\u0123\7P\2\2\u0123\u0124\7q\2\2"+
-		"\u0124\u0125\7v\2\2\u0125\u0126\7P\2\2\u0126\u0127\7w\2\2\u0127\u0128"+
-		"\7n\2\2\u0128\u0129\7n\2\2\u0129>\3\2\2\2\u012a\u012b\7p\2\2\u012b\u012c"+
-		"\7q\2\2\u012c\u012d\7v\2\2\u012d\u012e\7P\2\2\u012e\u012f\7w\2\2\u012f"+
-		"\u0130\7n\2\2\u0130\u0131\7n\2\2\u0131@\3\2\2\2\u0132\u0133\7g\2\2\u0133"+
-		"\u0134\7o\2\2\u0134\u0135\7r\2\2\u0135\u0136\7v\2\2\u0136\u0137\7{\2\2"+
-		"\u0137B\3\2\2\2\u0138\u0139\7k\2\2\u0139\u013a\7u\2\2\u013a\u013b\7G\2"+
-		"\2\u013b\u013c\7o\2\2\u013c\u013d\7r\2\2\u013d\u013e\7v\2\2\u013e\u013f"+
-		"\7{\2\2\u013fD\3\2\2\2\u0140\u0141\7k\2\2\u0141\u0142\7u\2\2\u0142\u0143"+
-		"\7P\2\2\u0143\u0144\7q\2\2\u0144\u0145\7v\2\2\u0145\u0146\7G\2\2\u0146"+
-		"\u0147\7o\2\2\u0147\u0148\7r\2\2\u0148\u0149\7v\2\2\u0149\u014a\7{\2\2"+
-		"\u014aF\3\2\2\2\u014b\u014c\7p\2\2\u014c\u014d\7q\2\2\u014d\u014e\7v\2"+
-		"\2\u014e\u014f\7G\2\2\u014f\u0150\7o\2\2\u0150\u0151\7r\2\2\u0151\u0152"+
-		"\7v\2\2\u0152\u0153\7{\2\2\u0153H\3\2\2\2\u0154\u0155\7n\2\2\u0155\u0156"+
-		"\7k\2\2\u0156\u0157\7m\2\2\u0157\u0158\7g\2\2\u0158J\3\2\2\2\u0159\u015a"+
-		"\7k\2\2\u015a\u015b\7n\2\2\u015b\u015c\7k\2\2\u015c\u015d\7m\2\2\u015d"+
-		"\u015e\7g\2\2\u015eL\3\2\2\2\u015f\u0160\7e\2\2\u0160\u0161\7q\2\2\u0161"+
-		"\u0162\7p\2\2\u0162\u0163\7v\2\2\u0163\u0164\7c\2\2\u0164\u0165\7k\2\2"+
-		"\u0165\u0166\7p\2\2\u0166\u0167\7u\2\2\u0167N\3\2\2\2\u0168\u0169\7k\2"+
-		"\2\u0169\u016a\7e\2\2\u016a\u016b\7q\2\2\u016b\u016c\7p\2\2\u016c\u016d"+
-		"\7v\2\2\u016d\u016e\7c\2\2\u016e\u016f\7k\2\2\u016f\u0170\7p\2\2\u0170"+
-		"\u0171\7u\2\2\u0171P\3\2\2\2\u0172\u0173\7u\2\2\u0173\u0174\7v\2\2\u0174"+
-		"\u0175\7c\2\2\u0175\u0176\7t\2\2\u0176\u0177\7v\2\2\u0177\u0178\7u\2\2"+
-		"\u0178\u0179\7Y\2\2\u0179\u017a\7k\2\2\u017a\u017b\7v\2\2\u017b\u017c"+
-		"\7j\2\2\u017cR\3\2\2\2\u017d\u017e\7k\2\2\u017e\u017f\7u\2\2\u017f\u0180"+
-		"\7v\2\2\u0180\u0181\7c\2\2\u0181\u0182\7t\2\2\u0182\u0183\7v\2\2\u0183"+
-		"\u0184\7u\2\2\u0184\u0185\7Y\2\2\u0185\u0186\7k\2\2\u0186\u0187\7v\2\2"+
-		"\u0187\u0188\7j\2\2\u0188T\3\2\2\2\u0189\u018a\7g\2\2\u018a\u018b\7p\2"+
-		"\2\u018b\u018c\7f\2\2\u018c\u018d\7u\2\2\u018d\u018e\7Y\2\2\u018e\u018f"+
-		"\7k\2\2\u018f\u0190\7v\2\2\u0190\u0191\7j\2\2\u0191V\3\2\2\2\u0192\u0193"+
-		"\7k\2\2\u0193\u0194\7g\2\2\u0194\u0195\7p\2\2\u0195\u0196\7f\2\2\u0196"+
-		"\u0197\7u\2\2\u0197\u0198\7Y\2\2\u0198\u0199\7k\2\2\u0199\u019a\7v\2\2"+
-		"\u019a\u019b\7j\2\2\u019bX\3\2\2\2\u019c\u019d\7?\2\2\u019dZ\3\2\2\2\u019e"+
-		"\u019f\7g\2\2\u019f\u01a0\7s\2\2\u01a0\\\3\2\2\2\u01a1\u01a2\7@\2\2\u01a2"+
-		"^\3\2\2\2\u01a3\u01a4\7i\2\2\u01a4\u01a5\7v\2\2\u01a5`\3\2\2\2\u01a6\u01a7"+
-		"\7@\2\2\u01a7\u01a8\7?\2\2\u01a8b\3\2\2\2\u01a9\u01aa\7i\2\2\u01aa\u01ab"+
-		"\7g\2\2\u01abd\3\2\2\2\u01ac\u01ad\7i\2\2\u01ad\u01ae\7v\2\2\u01ae\u01af"+
-		"\7g\2\2\u01aff\3\2\2\2\u01b0\u01b1\7>\2\2\u01b1h\3\2\2\2\u01b2\u01b3\7"+
-		"n\2\2\u01b3\u01b4\7v\2\2\u01b4j\3\2\2\2\u01b5\u01b6\7>\2\2\u01b6\u01b7"+
-		"\7?\2\2\u01b7l\3\2\2\2\u01b8\u01b9\7n\2\2\u01b9\u01ba\7g\2\2\u01ban\3"+
-		"\2\2\2\u01bb\u01bc\7n\2\2\u01bc\u01bd\7v\2\2\u01bd\u01be\7g\2\2\u01be"+
-		"p\3\2\2\2\u01bf\u01c0\7>\2\2\u01c0\u01c1\7@\2\2\u01c1r\3\2\2\2\u01c2\u01c3"+
-		"\7#\2\2\u01c3\u01c4\7?\2\2\u01c4t\3\2\2\2\u01c5\u01c6\7p\2\2\u01c6\u01c7"+
-		"\7g\2\2\u01c7v\3\2\2\2\u01c8\u01c9\7k\2\2\u01c9\u01ca\7g\2\2\u01ca\u01cb"+
-		"\7s\2\2\u01cbx\3\2\2\2\u01cc\u01cd\7k\2\2\u01cd\u01ce\7p\2\2\u01ce\u01cf"+
-		"\7g\2\2\u01cfz\3\2\2\2\u01d0\u01d1\7<\2\2\u01d1\u01d5\t\2\2\2\u01d2\u01d4"+
-		"\t\3\2\2\u01d3\u01d2\3\2\2\2\u01d4\u01d7\3\2\2\2\u01d5\u01d3\3\2\2\2\u01d5"+
-		"\u01d6\3\2\2\2\u01d6\u01e0\3\2\2\2\u01d7\u01d5\3\2\2\2\u01d8\u01dc\7A"+
-		"\2\2\u01d9\u01db\4\62;\2\u01da\u01d9\3\2\2\2\u01db\u01de\3\2\2\2\u01dc"+
-		"\u01da\3\2\2\2\u01dc\u01dd\3\2\2\2\u01dd\u01e0\3\2\2\2\u01de\u01dc\3\2"+
-		"\2\2\u01df\u01d0\3\2\2\2\u01df\u01d8\3\2\2\2\u01e0|\3\2\2\2\u01e1\u01e5"+
-		"\t\2\2\2\u01e2\u01e4\t\4\2\2\u01e3\u01e2\3\2\2\2\u01e4\u01e7\3\2\2\2\u01e5"+
-		"\u01e3\3\2\2\2\u01e5\u01e6\3\2\2\2\u01e6~\3\2\2\2\u01e7\u01e5\3\2\2\2"+
-		"\u01e8\u01e9\7b\2\2\u01e9\u01ea\5}?\2\u01ea\u01eb\7b\2\2\u01eb\u0080\3"+
-		"\2\2\2\u01ec\u01ed\7u\2\2\u01ed\u01ee\7w\2\2\u01ee\u01ef\7o\2\2\u01ef"+
-		"\u01f0\7*\2\2\u01f0\u01f1\3\2\2\2\u01f1\u01f2\5}?\2\u01f2\u01f3\7+\2\2"+
-		"\u01f3\u0217\3\2\2\2\u01f4\u01f5\7o\2\2\u01f5\u01f6\7c\2\2\u01f6\u01f7"+
-		"\7z\2\2\u01f7\u01f8\7*\2\2\u01f8\u01f9\3\2\2\2\u01f9\u01fa\5}?\2\u01fa"+
-		"\u01fb\7+\2\2\u01fb\u0217\3\2\2\2\u01fc\u01fd\7o\2\2\u01fd\u01fe\7k\2"+
-		"\2\u01fe\u01ff\7p\2\2\u01ff\u0200\7*\2\2\u0200\u0201\3\2\2\2\u0201\u0202"+
-		"\5}?\2\u0202\u0203\7+\2\2\u0203\u0217\3\2\2\2\u0204\u0205\7c\2\2\u0205"+
-		"\u0206\7x\2\2\u0206\u0207\7i\2\2\u0207\u0208\7*\2\2\u0208\u0209\3\2\2"+
-		"\2\u0209\u020a\5}?\2\u020a\u020b\7+\2\2\u020b\u0217\3\2\2\2\u020c\u020d"+
-		"\7e\2\2\u020d\u020e\7q\2\2\u020e\u020f\7w\2\2\u020f\u0210\7p\2\2\u0210"+
-		"\u0211\7v\2\2\u0211\u0212\7*\2\2\u0212\u0213\3\2\2\2\u0213\u0214\5}?\2"+
-		"\u0214\u0215\7+\2\2\u0215\u0217\3\2\2\2\u0216\u01ec\3\2\2\2\u0216\u01f4"+
-		"\3\2\2\2\u0216\u01fc\3\2\2\2\u0216\u0204\3\2\2\2\u0216\u020c\3\2\2\2\u0217"+
-		"\u0082\3\2\2\2\u0218\u0219\7v\2\2\u0219\u021a\7t\2\2\u021a\u021b\7w\2"+
-		"\2\u021b\u0222\7g\2\2\u021c\u021d\7h\2\2\u021d\u021e\7c\2\2\u021e\u021f"+
-		"\7n\2\2\u021f\u0220\7u\2\2\u0220\u0222\7g\2\2\u0221\u0218\3\2\2\2\u0221"+
-		"\u021c\3\2\2\2\u0222\u0084\3\2\2\2\u0223\u0225\7/\2\2\u0224\u0223\3\2"+
-		"\2\2\u0224\u0225\3\2\2\2\u0225\u0226\3\2\2\2\u0226\u022d\5\u0087D\2\u0227"+
-		"\u0229\7/\2\2\u0228\u0227\3\2\2\2\u0228\u0229\3\2\2\2\u0229\u022a\3\2"+
-		"\2\2\u022a\u022d\5\u0089E\2\u022b\u022d\5\u008bF\2\u022c\u0224\3\2\2\2"+
-		"\u022c\u0228\3\2\2\2\u022c\u022b\3\2\2\2\u022d\u0086\3\2\2\2\u022e\u0230"+
-		"\t\5\2\2\u022f\u022e\3\2\2\2\u0230\u0231\3\2\2\2\u0231\u022f\3\2\2\2\u0231"+
-		"\u0232\3\2\2\2\u0232\u0233\3\2\2\2\u0233\u0237\7\60\2\2\u0234\u0236\t"+
-		"\5\2\2\u0235\u0234\3\2\2\2\u0236\u0239\3\2\2\2\u0237\u0235\3\2\2\2\u0237"+
-		"\u0238\3\2\2\2\u0238\u0088\3\2\2\2\u0239\u0237\3\2\2\2\u023a\u023e\t\6"+
-		"\2\2\u023b\u023d\t\5\2\2\u023c\u023b\3\2\2\2\u023d\u0240\3\2\2\2\u023e"+
-		"\u023c\3\2\2\2\u023e\u023f\3\2\2\2\u023f\u008a\3\2\2\2\u0240\u023e\3\2"+
-		"\2\2\u0241\u0242\7\62\2\2\u0242\u008c\3\2\2\2\u0243\u0249\7)\2\2\u0244"+
-		"\u0248\n\7\2\2\u0245\u0246\7)\2\2\u0246\u0248\7)\2\2\u0247\u0244\3\2\2"+
-		"\2\u0247\u0245\3\2\2\2\u0248\u024b\3\2\2\2\u0249\u0247\3\2\2\2\u0249\u024a"+
-		"\3\2\2\2\u024a\u024c\3\2\2\2\u024b\u0249\3\2\2\2\u024c\u024d\7)\2\2\u024d"+
-		"\u008e\3\2\2\2\u024e\u024f\t\b\2\2\u024f\u0250\3\2\2\2\u0250\u0251\bH"+
-		"\2\2\u0251\u0090\3\2\2\2\21\2\u01d5\u01dc\u01df\u01e5\u0216\u0221\u0224"+
-		"\u0228\u022c\u0231\u0237\u023e\u0247\u0249\3\b\2\2";
+		"\4>\t>\4?\t?\4@\t@\4A\tA\4B\tB\4C\tC\4D\tD\4E\tE\4F\tF\4G\tG\4H\tH\4I"+
+		"\tI\4J\tJ\4K\tK\4L\tL\3\2\3\2\3\3\3\3\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\5"+
+		"\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\6\3\6\3\6\3\6\3\6\3\6\3\7\3\7\3\7\3"+
+		"\7\3\7\3\7\3\b\3\b\3\b\3\t\3\t\3\n\3\n\3\n\3\n\3\n\3\n\3\13\3\13\3\13"+
+		"\3\13\3\13\3\13\3\f\3\f\3\f\3\f\3\f\3\r\3\r\3\r\3\r\3\16\3\16\3\16\3\16"+
+		"\3\16\3\17\3\17\3\17\3\17\3\17\3\17\3\20\3\20\3\20\3\20\3\20\3\20\3\20"+
+		"\3\21\3\21\3\21\3\21\3\21\3\21\3\22\3\22\3\23\3\23\3\23\3\23\3\23\3\23"+
+		"\3\24\3\24\3\24\3\24\3\24\3\25\3\25\3\25\3\26\3\26\3\26\3\26\3\27\3\27"+
+		"\3\27\3\27\3\30\3\30\3\30\3\30\3\30\3\30\3\30\3\30\3\30\3\30\3\31\3\31"+
+		"\3\31\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3\33\3\33\3\33\3\33\3\33"+
+		"\3\33\3\33\3\33\3\34\3\34\3\34\3\35\3\35\3\35\3\36\3\36\3\36\3\36\3\36"+
+		"\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3 \3 \3 \3 \3 \3 \3 \3 \3 \3 \3!\3"+
+		"!\3!\3!\3!\3!\3!\3!\3\"\3\"\3\"\3\"\3\"\3\"\3#\3#\3#\3#\3#\3#\3#\3#\3"+
+		"$\3$\3$\3$\3$\3$\3$\3$\3$\3$\3$\3%\3%\3%\3%\3%\3%\3%\3%\3%\3&\3&\3&\3"+
+		"&\3&\3\'\3\'\3\'\3\'\3\'\3\'\3(\3(\3(\3(\3(\3(\3(\3(\3(\3)\3)\3)\3)\3"+
+		")\3)\3)\3)\3)\3)\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3+\3+\3+\3+\3+\3+\3"+
+		"+\3+\3+\3+\3+\3+\3,\3,\3,\3,\3,\3,\3,\3,\3,\3-\3-\3-\3-\3-\3-\3-\3-\3"+
+		"-\3-\3.\3.\3/\3/\3/\3\60\3\60\3\61\3\61\3\61\3\62\3\62\3\62\3\63\3\63"+
+		"\3\63\3\64\3\64\3\64\3\64\3\65\3\65\3\66\3\66\3\66\3\67\3\67\3\67\38\3"+
+		"8\38\39\39\39\39\3:\3:\3:\3;\3;\3;\3<\3<\3<\3=\3=\3=\3=\3>\3>\3>\3>\3"+
+		"?\3?\3?\3?\3?\3?\3?\3?\3?\3@\3@\3@\3@\3@\3@\3@\3@\3@\3A\3A\3A\3A\3A\3"+
+		"A\3A\3A\3A\3B\3B\3B\7B\u0201\nB\fB\16B\u0204\13B\3B\3B\7B\u0208\nB\fB"+
+		"\16B\u020b\13B\5B\u020d\nB\3C\3C\7C\u0211\nC\fC\16C\u0214\13C\3D\3D\3"+
+		"D\3D\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3"+
+		"E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\5E\u0244"+
+		"\nE\3F\3F\3F\3F\3F\3F\3F\3F\3F\5F\u024f\nF\3G\5G\u0252\nG\3G\3G\5G\u0256"+
+		"\nG\3G\3G\5G\u025a\nG\3H\6H\u025d\nH\rH\16H\u025e\3H\3H\7H\u0263\nH\f"+
+		"H\16H\u0266\13H\3I\3I\7I\u026a\nI\fI\16I\u026d\13I\3J\3J\3K\3K\3K\3K\7"+
+		"K\u0275\nK\fK\16K\u0278\13K\3K\3K\3L\3L\3L\3L\2\2M\3\3\5\4\7\5\t\6\13"+
+		"\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16\33\17\35\20\37\21!\22#\23%\24\'"+
+		"\25)\26+\27-\30/\31\61\32\63\33\65\34\67\359\36;\37= ?!A\"C#E$G%I&K\'"+
+		"M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63e\64g\65i\66k\67m8o9q:s;u<w=y>{?}@\177"+
+		"A\u0081B\u0083C\u0085D\u0087E\u0089F\u008bG\u008dH\u008fI\u0091J\u0093"+
+		"K\u0095L\u0097M\3\2\t\5\2C\\aac|\6\2\62;C\\aac|\7\2\60\60\62;C\\aac|\3"+
+		"\2\62;\3\2\63;\3\2))\5\2\13\f\17\17\"\"\2\u0290\2\3\3\2\2\2\2\5\3\2\2"+
+		"\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21"+
+		"\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2"+
+		"\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3"+
+		"\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2\2\2\2/\3\2\2\2\2\61\3\2\2\2\2\63\3"+
+		"\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2\29\3\2\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3"+
+		"\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3\2\2\2\2G\3\2\2\2\2I\3\2\2\2\2K\3\2\2"+
+		"\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2\2\2S\3\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2"+
+		"Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2\2_\3\2\2\2\2a\3\2\2\2\2c\3\2\2\2\2e\3"+
+		"\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2k\3\2\2\2\2m\3\2\2\2\2o\3\2\2\2\2q\3\2\2"+
+		"\2\2s\3\2\2\2\2u\3\2\2\2\2w\3\2\2\2\2y\3\2\2\2\2{\3\2\2\2\2}\3\2\2\2\2"+
+		"\177\3\2\2\2\2\u0081\3\2\2\2\2\u0083\3\2\2\2\2\u0085\3\2\2\2\2\u0087\3"+
+		"\2\2\2\2\u0089\3\2\2\2\2\u008b\3\2\2\2\2\u008d\3\2\2\2\2\u008f\3\2\2\2"+
+		"\2\u0091\3\2\2\2\2\u0093\3\2\2\2\2\u0095\3\2\2\2\2\u0097\3\2\2\2\3\u0099"+
+		"\3\2\2\2\5\u009b\3\2\2\2\7\u009d\3\2\2\2\t\u00a4\3\2\2\2\13\u00ad\3\2"+
+		"\2\2\r\u00b3\3\2\2\2\17\u00b9\3\2\2\2\21\u00bc\3\2\2\2\23\u00be\3\2\2"+
+		"\2\25\u00c4\3\2\2\2\27\u00ca\3\2\2\2\31\u00cf\3\2\2\2\33\u00d3\3\2\2\2"+
+		"\35\u00d8\3\2\2\2\37\u00de\3\2\2\2!\u00e5\3\2\2\2#\u00eb\3\2\2\2%\u00ed"+
+		"\3\2\2\2\'\u00f3\3\2\2\2)\u00f8\3\2\2\2+\u00fb\3\2\2\2-\u00ff\3\2\2\2"+
+		"/\u0103\3\2\2\2\61\u010d\3\2\2\2\63\u0110\3\2\2\2\65\u0118\3\2\2\2\67"+
+		"\u0120\3\2\2\29\u0123\3\2\2\2;\u0126\3\2\2\2=\u012b\3\2\2\2?\u0132\3\2"+
+		"\2\2A\u013c\3\2\2\2C\u0144\3\2\2\2E\u014a\3\2\2\2G\u0152\3\2\2\2I\u015d"+
+		"\3\2\2\2K\u0166\3\2\2\2M\u016b\3\2\2\2O\u0171\3\2\2\2Q\u017a\3\2\2\2S"+
+		"\u0184\3\2\2\2U\u018f\3\2\2\2W\u019b\3\2\2\2Y\u01a4\3\2\2\2[\u01ae\3\2"+
+		"\2\2]\u01b0\3\2\2\2_\u01b3\3\2\2\2a\u01b5\3\2\2\2c\u01b8\3\2\2\2e\u01bb"+
+		"\3\2\2\2g\u01be\3\2\2\2i\u01c2\3\2\2\2k\u01c4\3\2\2\2m\u01c7\3\2\2\2o"+
+		"\u01ca\3\2\2\2q\u01cd\3\2\2\2s\u01d1\3\2\2\2u\u01d4\3\2\2\2w\u01d7\3\2"+
+		"\2\2y\u01da\3\2\2\2{\u01de\3\2\2\2}\u01e2\3\2\2\2\177\u01eb\3\2\2\2\u0081"+
+		"\u01f4\3\2\2\2\u0083\u020c\3\2\2\2\u0085\u020e\3\2\2\2\u0087\u0215\3\2"+
+		"\2\2\u0089\u0243\3\2\2\2\u008b\u024e\3\2\2\2\u008d\u0259\3\2\2\2\u008f"+
+		"\u025c\3\2\2\2\u0091\u0267\3\2\2\2\u0093\u026e\3\2\2\2\u0095\u0270\3\2"+
+		"\2\2\u0097\u027b\3\2\2\2\u0099\u009a\7*\2\2\u009a\4\3\2\2\2\u009b\u009c"+
+		"\7+\2\2\u009c\6\3\2\2\2\u009d\u009e\7u\2\2\u009e\u009f\7g\2\2\u009f\u00a0"+
+		"\7n\2\2\u00a0\u00a1\7g\2\2\u00a1\u00a2\7e\2\2\u00a2\u00a3\7v\2\2\u00a3"+
+		"\b\3\2\2\2\u00a4\u00a5\7f\2\2\u00a5\u00a6\7k\2\2\u00a6\u00a7\7u\2\2\u00a7"+
+		"\u00a8\7v\2\2\u00a8\u00a9\7k\2\2\u00a9\u00aa\7p\2\2\u00aa\u00ab\7e\2\2"+
+		"\u00ab\u00ac\7v\2\2\u00ac\n\3\2\2\2\u00ad\u00ae\7y\2\2\u00ae\u00af\7j"+
+		"\2\2\u00af\u00b0\7g\2\2\u00b0\u00b1\7t\2\2\u00b1\u00b2\7g\2\2\u00b2\f"+
+		"\3\2\2\2\u00b3\u00b4\7q\2\2\u00b4\u00b5\7t\2\2\u00b5\u00b6\7f\2\2\u00b6"+
+		"\u00b7\7g\2\2\u00b7\u00b8\7t\2\2\u00b8\16\3\2\2\2\u00b9\u00ba\7d\2\2\u00ba"+
+		"\u00bb\7{\2\2\u00bb\20\3\2\2\2\u00bc\u00bd\7.\2\2\u00bd\22\3\2\2\2\u00be"+
+		"\u00bf\7p\2\2\u00bf\u00c0\7w\2\2\u00c0\u00c1\7n\2\2\u00c1\u00c2\7n\2\2"+
+		"\u00c2\u00c3\7u\2\2\u00c3\24\3\2\2\2\u00c4\u00c5\7h\2\2\u00c5\u00c6\7"+
+		"k\2\2\u00c6\u00c7\7t\2\2\u00c7\u00c8\7u\2\2\u00c8\u00c9\7v\2\2\u00c9\26"+
+		"\3\2\2\2\u00ca\u00cb\7n\2\2\u00cb\u00cc\7c\2\2\u00cc\u00cd\7u\2\2\u00cd"+
+		"\u00ce\7v\2\2\u00ce\30\3\2\2\2\u00cf\u00d0\7c\2\2\u00d0\u00d1\7u\2\2\u00d1"+
+		"\u00d2\7e\2\2\u00d2\32\3\2\2\2\u00d3\u00d4\7f\2\2\u00d4\u00d5\7g\2\2\u00d5"+
+		"\u00d6\7u\2\2\u00d6\u00d7\7e\2\2\u00d7\34\3\2\2\2\u00d8\u00d9\7n\2\2\u00d9"+
+		"\u00da\7k\2\2\u00da\u00db\7o\2\2\u00db\u00dc\7k\2\2\u00dc\u00dd\7v\2\2"+
+		"\u00dd\36\3\2\2\2\u00de\u00df\7q\2\2\u00df\u00e0\7h\2\2\u00e0\u00e1\7"+
+		"h\2\2\u00e1\u00e2\7u\2\2\u00e2\u00e3\7g\2\2\u00e3\u00e4\7v\2\2\u00e4 "+
+		"\3\2\2\2\u00e5\u00e6\7h\2\2\u00e6\u00e7\7g\2\2\u00e7\u00e8\7v\2\2\u00e8"+
+		"\u00e9\7e\2\2\u00e9\u00ea\7j\2\2\u00ea\"\3\2\2\2\u00eb\u00ec\7-\2\2\u00ec"+
+		"$\3\2\2\2\u00ed\u00ee\7s\2\2\u00ee\u00ef\7w\2\2\u00ef\u00f0\7g\2\2\u00f0"+
+		"\u00f1\7t\2\2\u00f1\u00f2\7{\2\2\u00f2&\3\2\2\2\u00f3\u00f4\7n\2\2\u00f4"+
+		"\u00f5\7c\2\2\u00f5\u00f6\7|\2\2\u00f6\u00f7\7{\2\2\u00f7(\3\2\2\2\u00f8"+
+		"\u00f9\7q\2\2\u00f9\u00fa\7t\2\2\u00fa*\3\2\2\2\u00fb\u00fc\7c\2\2\u00fc"+
+		"\u00fd\7p\2\2\u00fd\u00fe\7f\2\2\u00fe,\3\2\2\2\u00ff\u0100\7p\2\2\u0100"+
+		"\u0101\7q\2\2\u0101\u0102\7v\2\2\u0102.\3\2\2\2\u0103\u0104\7k\2\2\u0104"+
+		"\u0105\7p\2\2\u0105\u0106\7Q\2\2\u0106\u0107\7t\2\2\u0107\u0108\7G\2\2"+
+		"\u0108\u0109\7o\2\2\u0109\u010a\7r\2\2\u010a\u010b\7v\2\2\u010b\u010c"+
+		"\7{\2\2\u010c\60\3\2\2\2\u010d\u010e\7k\2\2\u010e\u010f\7p\2\2\u010f\62"+
+		"\3\2\2\2\u0110\u0111\7d\2\2\u0111\u0112\7g\2\2\u0112\u0113\7v\2\2\u0113"+
+		"\u0114\7y\2\2\u0114\u0115\7g\2\2\u0115\u0116\7g\2\2\u0116\u0117\7p\2\2"+
+		"\u0117\64\3\2\2\2\u0118\u0119\7k\2\2\u0119\u011a\7p\2\2\u011a\u011b\7"+
+		"t\2\2\u011b\u011c\7c\2\2\u011c\u011d\7p\2\2\u011d\u011e\7i\2\2\u011e\u011f"+
+		"\7g\2\2\u011f\66\3\2\2\2\u0120\u0121\7v\2\2\u0121\u0122\7q\2\2\u01228"+
+		"\3\2\2\2\u0123\u0124\7k\2\2\u0124\u0125\7u\2\2\u0125:\3\2\2\2\u0126\u0127"+
+		"\7p\2\2\u0127\u0128\7w\2\2\u0128\u0129\7n\2\2\u0129\u012a\7n\2\2\u012a"+
+		"<\3\2\2\2\u012b\u012c\7k\2\2\u012c\u012d\7u\2\2\u012d\u012e\7P\2\2\u012e"+
+		"\u012f\7w\2\2\u012f\u0130\7n\2\2\u0130\u0131\7n\2\2\u0131>\3\2\2\2\u0132"+
+		"\u0133\7k\2\2\u0133\u0134\7u\2\2\u0134\u0135\7P\2\2\u0135\u0136\7q\2\2"+
+		"\u0136\u0137\7v\2\2\u0137\u0138\7P\2\2\u0138\u0139\7w\2\2\u0139\u013a"+
+		"\7n\2\2\u013a\u013b\7n\2\2\u013b@\3\2\2\2\u013c\u013d\7p\2\2\u013d\u013e"+
+		"\7q\2\2\u013e\u013f\7v\2\2\u013f\u0140\7P\2\2\u0140\u0141\7w\2\2\u0141"+
+		"\u0142\7n\2\2\u0142\u0143\7n\2\2\u0143B\3\2\2\2\u0144\u0145\7g\2\2\u0145"+
+		"\u0146\7o\2\2\u0146\u0147\7r\2\2\u0147\u0148\7v\2\2\u0148\u0149\7{\2\2"+
+		"\u0149D\3\2\2\2\u014a\u014b\7k\2\2\u014b\u014c\7u\2\2\u014c\u014d\7G\2"+
+		"\2\u014d\u014e\7o\2\2\u014e\u014f\7r\2\2\u014f\u0150\7v\2\2\u0150\u0151"+
+		"\7{\2\2\u0151F\3\2\2\2\u0152\u0153\7k\2\2\u0153\u0154\7u\2\2\u0154\u0155"+
+		"\7P\2\2\u0155\u0156\7q\2\2\u0156\u0157\7v\2\2\u0157\u0158\7G\2\2\u0158"+
+		"\u0159\7o\2\2\u0159\u015a\7r\2\2\u015a\u015b\7v\2\2\u015b\u015c\7{\2\2"+
+		"\u015cH\3\2\2\2\u015d\u015e\7p\2\2\u015e\u015f\7q\2\2\u015f\u0160\7v\2"+
+		"\2\u0160\u0161\7G\2\2\u0161\u0162\7o\2\2\u0162\u0163\7r\2\2\u0163\u0164"+
+		"\7v\2\2\u0164\u0165\7{\2\2\u0165J\3\2\2\2\u0166\u0167\7n\2\2\u0167\u0168"+
+		"\7k\2\2\u0168\u0169\7m\2\2\u0169\u016a\7g\2\2\u016aL\3\2\2\2\u016b\u016c"+
+		"\7k\2\2\u016c\u016d\7n\2\2\u016d\u016e\7k\2\2\u016e\u016f\7m\2\2\u016f"+
+		"\u0170\7g\2\2\u0170N\3\2\2\2\u0171\u0172\7e\2\2\u0172\u0173\7q\2\2\u0173"+
+		"\u0174\7p\2\2\u0174\u0175\7v\2\2\u0175\u0176\7c\2\2\u0176\u0177\7k\2\2"+
+		"\u0177\u0178\7p\2\2\u0178\u0179\7u\2\2\u0179P\3\2\2\2\u017a\u017b\7k\2"+
+		"\2\u017b\u017c\7e\2\2\u017c\u017d\7q\2\2\u017d\u017e\7p\2\2\u017e\u017f"+
+		"\7v\2\2\u017f\u0180\7c\2\2\u0180\u0181\7k\2\2\u0181\u0182\7p\2\2\u0182"+
+		"\u0183\7u\2\2\u0183R\3\2\2\2\u0184\u0185\7u\2\2\u0185\u0186\7v\2\2\u0186"+
+		"\u0187\7c\2\2\u0187\u0188\7t\2\2\u0188\u0189\7v\2\2\u0189\u018a\7u\2\2"+
+		"\u018a\u018b\7Y\2\2\u018b\u018c\7k\2\2\u018c\u018d\7v\2\2\u018d\u018e"+
+		"\7j\2\2\u018eT\3\2\2\2\u018f\u0190\7k\2\2\u0190\u0191\7u\2\2\u0191\u0192"+
+		"\7v\2\2\u0192\u0193\7c\2\2\u0193\u0194\7t\2\2\u0194\u0195\7v\2\2\u0195"+
+		"\u0196\7u\2\2\u0196\u0197\7Y\2\2\u0197\u0198\7k\2\2\u0198\u0199\7v\2\2"+
+		"\u0199\u019a\7j\2\2\u019aV\3\2\2\2\u019b\u019c\7g\2\2\u019c\u019d\7p\2"+
+		"\2\u019d\u019e\7f\2\2\u019e\u019f\7u\2\2\u019f\u01a0\7Y\2\2\u01a0\u01a1"+
+		"\7k\2\2\u01a1\u01a2\7v\2\2\u01a2\u01a3\7j\2\2\u01a3X\3\2\2\2\u01a4\u01a5"+
+		"\7k\2\2\u01a5\u01a6\7g\2\2\u01a6\u01a7\7p\2\2\u01a7\u01a8\7f\2\2\u01a8"+
+		"\u01a9\7u\2\2\u01a9\u01aa\7Y\2\2\u01aa\u01ab\7k\2\2\u01ab\u01ac\7v\2\2"+
+		"\u01ac\u01ad\7j\2\2\u01adZ\3\2\2\2\u01ae\u01af\7?\2\2\u01af\\\3\2\2\2"+
+		"\u01b0\u01b1\7g\2\2\u01b1\u01b2\7s\2\2\u01b2^\3\2\2\2\u01b3\u01b4\7@\2"+
+		"\2\u01b4`\3\2\2\2\u01b5\u01b6\7i\2\2\u01b6\u01b7\7v\2\2\u01b7b\3\2\2\2"+
+		"\u01b8\u01b9\7@\2\2\u01b9\u01ba\7?\2\2\u01bad\3\2\2\2\u01bb\u01bc\7i\2"+
+		"\2\u01bc\u01bd\7g\2\2\u01bdf\3\2\2\2\u01be\u01bf\7i\2\2\u01bf\u01c0\7"+
+		"v\2\2\u01c0\u01c1\7g\2\2\u01c1h\3\2\2\2\u01c2\u01c3\7>\2\2\u01c3j\3\2"+
+		"\2\2\u01c4\u01c5\7n\2\2\u01c5\u01c6\7v\2\2\u01c6l\3\2\2\2\u01c7\u01c8"+
+		"\7>\2\2\u01c8\u01c9\7?\2\2\u01c9n\3\2\2\2\u01ca\u01cb\7n\2\2\u01cb\u01cc"+
+		"\7g\2\2\u01ccp\3\2\2\2\u01cd\u01ce\7n\2\2\u01ce\u01cf\7v\2\2\u01cf\u01d0"+
+		"\7g\2\2\u01d0r\3\2\2\2\u01d1\u01d2\7>\2\2\u01d2\u01d3\7@\2\2\u01d3t\3"+
+		"\2\2\2\u01d4\u01d5\7#\2\2\u01d5\u01d6\7?\2\2\u01d6v\3\2\2\2\u01d7\u01d8"+
+		"\7p\2\2\u01d8\u01d9\7g\2\2\u01d9x\3\2\2\2\u01da\u01db\7k\2\2\u01db\u01dc"+
+		"\7g\2\2\u01dc\u01dd\7s\2\2\u01ddz\3\2\2\2\u01de\u01df\7k\2\2\u01df\u01e0"+
+		"\7p\2\2\u01e0\u01e1\7g\2\2\u01e1|\3\2\2\2\u01e2\u01e3\7g\2\2\u01e3\u01e4"+
+		"\7s\2\2\u01e4\u01e5\7Q\2\2\u01e5\u01e6\7t\2\2\u01e6\u01e7\7P\2\2\u01e7"+
+		"\u01e8\7w\2\2\u01e8\u01e9\7n\2\2\u01e9\u01ea\7n\2\2\u01ea~\3\2\2\2\u01eb"+
+		"\u01ec\7i\2\2\u01ec\u01ed\7v\2\2\u01ed\u01ee\7Q\2\2\u01ee\u01ef\7t\2\2"+
+		"\u01ef\u01f0\7P\2\2\u01f0\u01f1\7w\2\2\u01f1\u01f2\7n\2\2\u01f2\u01f3"+
+		"\7n\2\2\u01f3\u0080\3\2\2\2\u01f4\u01f5\7n\2\2\u01f5\u01f6\7v\2\2\u01f6"+
+		"\u01f7\7Q\2\2\u01f7\u01f8\7t\2\2\u01f8\u01f9\7P\2\2\u01f9\u01fa\7w\2\2"+
+		"\u01fa\u01fb\7n\2\2\u01fb\u01fc\7n\2\2\u01fc\u0082\3\2\2\2\u01fd\u01fe"+
+		"\7<\2\2\u01fe\u0202\t\2\2\2\u01ff\u0201\t\3\2\2\u0200\u01ff\3\2\2\2\u0201"+
+		"\u0204\3\2\2\2\u0202\u0200\3\2\2\2\u0202\u0203\3\2\2\2\u0203\u020d\3\2"+
+		"\2\2\u0204\u0202\3\2\2\2\u0205\u0209\7A\2\2\u0206\u0208\4\62;\2\u0207"+
+		"\u0206\3\2\2\2\u0208\u020b\3\2\2\2\u0209\u0207\3\2\2\2\u0209\u020a\3\2"+
+		"\2\2\u020a\u020d\3\2\2\2\u020b\u0209\3\2\2\2\u020c\u01fd\3\2\2\2\u020c"+
+		"\u0205\3\2\2\2\u020d\u0084\3\2\2\2\u020e\u0212\t\2\2\2\u020f\u0211\t\4"+
+		"\2\2\u0210\u020f\3\2\2\2\u0211\u0214\3\2\2\2\u0212\u0210\3\2\2\2\u0212"+
+		"\u0213\3\2\2\2\u0213\u0086\3\2\2\2\u0214\u0212\3\2\2\2\u0215\u0216\7b"+
+		"\2\2\u0216\u0217\5\u0085C\2\u0217\u0218\7b\2\2\u0218\u0088\3\2\2\2\u0219"+
+		"\u021a\7u\2\2\u021a\u021b\7w\2\2\u021b\u021c\7o\2\2\u021c\u021d\7*\2\2"+
+		"\u021d\u021e\3\2\2\2\u021e\u021f\5\u0085C\2\u021f\u0220\7+\2\2\u0220\u0244"+
+		"\3\2\2\2\u0221\u0222\7o\2\2\u0222\u0223\7c\2\2\u0223\u0224\7z\2\2\u0224"+
+		"\u0225\7*\2\2\u0225\u0226\3\2\2\2\u0226\u0227\5\u0085C\2\u0227\u0228\7"+
+		"+\2\2\u0228\u0244\3\2\2\2\u0229\u022a\7o\2\2\u022a\u022b\7k\2\2\u022b"+
+		"\u022c\7p\2\2\u022c\u022d\7*\2\2\u022d\u022e\3\2\2\2\u022e\u022f\5\u0085"+
+		"C\2\u022f\u0230\7+\2\2\u0230\u0244\3\2\2\2\u0231\u0232\7c\2\2\u0232\u0233"+
+		"\7x\2\2\u0233\u0234\7i\2\2\u0234\u0235\7*\2\2\u0235\u0236\3\2\2\2\u0236"+
+		"\u0237\5\u0085C\2\u0237\u0238\7+\2\2\u0238\u0244\3\2\2\2\u0239\u023a\7"+
+		"e\2\2\u023a\u023b\7q\2\2\u023b\u023c\7w\2\2\u023c\u023d\7p\2\2\u023d\u023e"+
+		"\7v\2\2\u023e\u023f\7*\2\2\u023f\u0240\3\2\2\2\u0240\u0241\5\u0085C\2"+
+		"\u0241\u0242\7+\2\2\u0242\u0244\3\2\2\2\u0243\u0219\3\2\2\2\u0243\u0221"+
+		"\3\2\2\2\u0243\u0229\3\2\2\2\u0243\u0231\3\2\2\2\u0243\u0239\3\2\2\2\u0244"+
+		"\u008a\3\2\2\2\u0245\u0246\7v\2\2\u0246\u0247\7t\2\2\u0247\u0248\7w\2"+
+		"\2\u0248\u024f\7g\2\2\u0249\u024a\7h\2\2\u024a\u024b\7c\2\2\u024b\u024c"+
+		"\7n\2\2\u024c\u024d\7u\2\2\u024d\u024f\7g\2\2\u024e\u0245\3\2\2\2\u024e"+
+		"\u0249\3\2\2\2\u024f\u008c\3\2\2\2\u0250\u0252\7/\2\2\u0251\u0250\3\2"+
+		"\2\2\u0251\u0252\3\2\2\2\u0252\u0253\3\2\2\2\u0253\u025a\5\u008fH\2\u0254"+
+		"\u0256\7/\2\2\u0255\u0254\3\2\2\2\u0255\u0256\3\2\2\2\u0256\u0257\3\2"+
+		"\2\2\u0257\u025a\5\u0091I\2\u0258\u025a\5\u0093J\2\u0259\u0251\3\2\2\2"+
+		"\u0259\u0255\3\2\2\2\u0259\u0258\3\2\2\2\u025a\u008e\3\2\2\2\u025b\u025d"+
+		"\t\5\2\2\u025c\u025b\3\2\2\2\u025d\u025e\3\2\2\2\u025e\u025c\3\2\2\2\u025e"+
+		"\u025f\3\2\2\2\u025f\u0260\3\2\2\2\u0260\u0264\7\60\2\2\u0261\u0263\t"+
+		"\5\2\2\u0262\u0261\3\2\2\2\u0263\u0266\3\2\2\2\u0264\u0262\3\2\2\2\u0264"+
+		"\u0265\3\2\2\2\u0265\u0090\3\2\2\2\u0266\u0264\3\2\2\2\u0267\u026b\t\6"+
+		"\2\2\u0268\u026a\t\5\2\2\u0269\u0268\3\2\2\2\u026a\u026d\3\2\2\2\u026b"+
+		"\u0269\3\2\2\2\u026b\u026c\3\2\2\2\u026c\u0092\3\2\2\2\u026d\u026b\3\2"+
+		"\2\2\u026e\u026f\7\62\2\2\u026f\u0094\3\2\2\2\u0270\u0276\7)\2\2\u0271"+
+		"\u0275\n\7\2\2\u0272\u0273\7)\2\2\u0273\u0275\7)\2\2\u0274\u0271\3\2\2"+
+		"\2\u0274\u0272\3\2\2\2\u0275\u0278\3\2\2\2\u0276\u0274\3\2\2\2\u0276\u0277"+
+		"\3\2\2\2\u0277\u0279\3\2\2\2\u0278\u0276\3\2\2\2\u0279\u027a\7)\2\2\u027a"+
+		"\u0096\3\2\2\2\u027b\u027c\t\b\2\2\u027c\u027d\3\2\2\2\u027d\u027e\bL"+
+		"\2\2\u027e\u0098\3\2\2\2\21\2\u0202\u0209\u020c\u0212\u0243\u024e\u0251"+
+		"\u0255\u0259\u025e\u0264\u026b\u0274\u0276\3\b\2\2";
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens
index d6d4462ab..8a595f026 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens
@@ -58,17 +58,21 @@ T__56=57
 T__57=58
 T__58=59
 T__59=60
-INPUT_VARIABLE=61
-PATH_VARIABLE=62
-QUOTED_PATH_VARIABLE=63
-PROP_FORMULA=64
-BOOLEAN_LITERAL=65
-NUMBER_LITERAL=66
-DOUBLE=67
-INT=68
-ZERO=69
-STRING_LITERAL=70
-WS=71
+T__60=61
+T__61=62
+T__62=63
+T__63=64
+INPUT_VARIABLE=65
+PATH_VARIABLE=66
+QUOTED_PATH_VARIABLE=67
+PROP_FORMULA=68
+BOOLEAN_LITERAL=69
+NUMBER_LITERAL=70
+DOUBLE=71
+INT=72
+ZERO=73
+STRING_LITERAL=74
+WS=75
 '('=1
 ')'=2
 'select'=3
@@ -91,42 +95,46 @@ WS=71
 'or'=20
 'and'=21
 'not'=22
-'in'=23
-'between'=24
-'inrange'=25
-'to'=26
-'is'=27
-'null'=28
-'isNull'=29
-'isNotNull'=30
-'notNull'=31
-'empty'=32
-'isEmpty'=33
-'isNotEmpty'=34
-'notEmpty'=35
-'like'=36
-'ilike'=37
-'contains'=38
-'icontains'=39
-'startsWith'=40
-'istartsWith'=41
-'endsWith'=42
-'iendsWith'=43
-'='=44
-'eq'=45
-'>'=46
-'gt'=47
-'>='=48
-'ge'=49
-'gte'=50
-'<'=51
-'lt'=52
-'<='=53
-'le'=54
-'lte'=55
-'<>'=56
-'!='=57
-'ne'=58
-'ieq'=59
-'ine'=60
-'0'=69
+'inOrEmpty'=23
+'in'=24
+'between'=25
+'inrange'=26
+'to'=27
+'is'=28
+'null'=29
+'isNull'=30
+'isNotNull'=31
+'notNull'=32
+'empty'=33
+'isEmpty'=34
+'isNotEmpty'=35
+'notEmpty'=36
+'like'=37
+'ilike'=38
+'contains'=39
+'icontains'=40
+'startsWith'=41
+'istartsWith'=42
+'endsWith'=43
+'iendsWith'=44
+'='=45
+'eq'=46
+'>'=47
+'gt'=48
+'>='=49
+'ge'=50
+'gte'=51
+'<'=52
+'lt'=53
+'<='=54
+'le'=55
+'lte'=56
+'<>'=57
+'!='=58
+'ne'=59
+'ieq'=60
+'ine'=61
+'eqOrNull'=62
+'gtOrNull'=63
+'ltOrNull'=64
+'0'=73
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java
index e8e252998..5f9f0121e 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java
@@ -287,6 +287,16 @@ public interface EQLListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitAny_expression(EQLParser.Any_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#inOrEmpty_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterInOrEmpty_expression(EQLParser.InOrEmpty_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#inOrEmpty_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitInOrEmpty_expression(EQLParser.InOrEmpty_expressionContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link EQLParser#in_expression}.
 	 * @param ctx the parse tree
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
index 9649ffd87..4b1e1cef5 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
@@ -36,9 +36,9 @@ public class EQLParser extends Parser {
 		T__38=39, T__39=40, T__40=41, T__41=42, T__42=43, T__43=44, T__44=45,
 		T__45=46, T__46=47, T__47=48, T__48=49, T__49=50, T__50=51, T__51=52,
 		T__52=53, T__53=54, T__54=55, T__55=56, T__56=57, T__57=58, T__58=59,
-		T__59=60, INPUT_VARIABLE=61, PATH_VARIABLE=62, QUOTED_PATH_VARIABLE=63,
-		PROP_FORMULA=64, BOOLEAN_LITERAL=65, NUMBER_LITERAL=66, DOUBLE=67, INT=68,
-		ZERO=69, STRING_LITERAL=70, WS=71;
+		T__59=60, T__60=61, T__61=62, T__62=63, T__63=64, INPUT_VARIABLE=65, PATH_VARIABLE=66,
+		QUOTED_PATH_VARIABLE=67, PROP_FORMULA=68, BOOLEAN_LITERAL=69, NUMBER_LITERAL=70,
+		DOUBLE=71, INT=72, ZERO=73, STRING_LITERAL=74, WS=75;
 	public static final int
 		RULE_select_statement = 0, RULE_select_properties = 1, RULE_select_clause = 2,
 		RULE_distinct = 3, RULE_fetch_clause = 4, RULE_where_clause = 5, RULE_orderby_clause = 6,
@@ -49,11 +49,12 @@ public class EQLParser extends Parser {
 		RULE_fetch_option = 19, RULE_fetch_query_option = 20, RULE_fetch_lazy_option = 21,
 		RULE_fetch_batch_size = 22, RULE_conditional_expression = 23, RULE_conditional_term = 24,
 		RULE_conditional_factor = 25, RULE_conditional_primary = 26, RULE_any_expression = 27,
-		RULE_in_expression = 28, RULE_in_value = 29, RULE_between_expression = 30,
-		RULE_inrange_expression = 31, RULE_propertyBetween_expression = 32, RULE_isNull_expression = 33,
-		RULE_isNotNull_expression = 34, RULE_isEmpty_expression = 35, RULE_isNotEmpty_expression = 36,
-		RULE_like_expression = 37, RULE_like_op = 38, RULE_comparison_expression = 39,
-		RULE_comparison_operator = 40, RULE_value_expression = 41, RULE_literal = 42;
+		RULE_inOrEmpty_expression = 28, RULE_in_expression = 29, RULE_in_value = 30,
+		RULE_between_expression = 31, RULE_inrange_expression = 32, RULE_propertyBetween_expression = 33,
+		RULE_isNull_expression = 34, RULE_isNotNull_expression = 35, RULE_isEmpty_expression = 36,
+		RULE_isNotEmpty_expression = 37, RULE_like_expression = 38, RULE_like_op = 39,
+		RULE_comparison_expression = 40, RULE_comparison_operator = 41, RULE_value_expression = 42,
+		RULE_literal = 43;
 	private static String[] makeRuleNames() {
 		return new String[] {
 			"select_statement", "select_properties", "select_clause", "distinct",
@@ -62,11 +63,11 @@ public class EQLParser extends Parser {
 			"fetch_property_set", "fetch_property_group", "fetch_path_path", "fetch_property",
 			"fetch_query_hint", "fetch_lazy_hint", "fetch_option", "fetch_query_option",
 			"fetch_lazy_option", "fetch_batch_size", "conditional_expression", "conditional_term",
-			"conditional_factor", "conditional_primary", "any_expression", "in_expression",
-			"in_value", "between_expression", "inrange_expression", "propertyBetween_expression",
-			"isNull_expression", "isNotNull_expression", "isEmpty_expression", "isNotEmpty_expression",
-			"like_expression", "like_op", "comparison_expression", "comparison_operator",
-			"value_expression", "literal"
+			"conditional_factor", "conditional_primary", "any_expression", "inOrEmpty_expression",
+			"in_expression", "in_value", "between_expression", "inrange_expression",
+			"propertyBetween_expression", "isNull_expression", "isNotNull_expression",
+			"isEmpty_expression", "isNotEmpty_expression", "like_expression", "like_op",
+			"comparison_expression", "comparison_operator", "value_expression", "literal"
 		};
 	}
 	public static final String[] ruleNames = makeRuleNames();
@@ -76,12 +77,13 @@ public class EQLParser extends Parser {
 			null, "'('", "')'", "'select'", "'distinct'", "'where'", "'order'", "'by'",
 			"','", "'nulls'", "'first'", "'last'", "'asc'", "'desc'", "'limit'",
 			"'offset'", "'fetch'", "'+'", "'query'", "'lazy'", "'or'", "'and'", "'not'",
-			"'in'", "'between'", "'inrange'", "'to'", "'is'", "'null'", "'isNull'",
-			"'isNotNull'", "'notNull'", "'empty'", "'isEmpty'", "'isNotEmpty'", "'notEmpty'",
-			"'like'", "'ilike'", "'contains'", "'icontains'", "'startsWith'", "'istartsWith'",
-			"'endsWith'", "'iendsWith'", "'='", "'eq'", "'>'", "'gt'", "'>='", "'ge'",
-			"'gte'", "'<'", "'lt'", "'<='", "'le'", "'lte'", "'<>'", "'!='", "'ne'",
-			"'ieq'", "'ine'", null, null, null, null, null, null, null, null, "'0'"
+			"'inOrEmpty'", "'in'", "'between'", "'inrange'", "'to'", "'is'", "'null'",
+			"'isNull'", "'isNotNull'", "'notNull'", "'empty'", "'isEmpty'", "'isNotEmpty'",
+			"'notEmpty'", "'like'", "'ilike'", "'contains'", "'icontains'", "'startsWith'",
+			"'istartsWith'", "'endsWith'", "'iendsWith'", "'='", "'eq'", "'>'", "'gt'",
+			"'>='", "'ge'", "'gte'", "'<'", "'lt'", "'<='", "'le'", "'lte'", "'<>'",
+			"'!='", "'ne'", "'ieq'", "'ine'", "'eqOrNull'", "'gtOrNull'", "'ltOrNull'",
+			null, null, null, null, null, null, null, null, "'0'"
 		};
 	}
 	private static final String[] _LITERAL_NAMES = makeLiteralNames();
@@ -92,9 +94,9 @@ public class EQLParser extends Parser {
 			null, null, null, null, null, null, null, null, null, null, null, null,
 			null, null, null, null, null, null, null, null, null, null, null, null,
 			null, null, null, null, null, null, null, null, null, null, null, null,
-			null, "INPUT_VARIABLE", "PATH_VARIABLE", "QUOTED_PATH_VARIABLE", "PROP_FORMULA",
-			"BOOLEAN_LITERAL", "NUMBER_LITERAL", "DOUBLE", "INT", "ZERO", "STRING_LITERAL",
-			"WS"
+			null, null, null, null, null, "INPUT_VARIABLE", "PATH_VARIABLE", "QUOTED_PATH_VARIABLE",
+			"PROP_FORMULA", "BOOLEAN_LITERAL", "NUMBER_LITERAL", "DOUBLE", "INT",
+			"ZERO", "STRING_LITERAL", "WS"
 		};
 	}
 	private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
@@ -189,61 +191,61 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(87);
+			setState(89);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__2) {
 				{
-				setState(86);
+				setState(88);
 				select_clause();
 				}
 			}
 
-			setState(92);
+			setState(94);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__15) {
 				{
 				{
-				setState(89);
+				setState(91);
 				fetch_clause();
 				}
 				}
-				setState(94);
+				setState(96);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
-			setState(96);
+			setState(98);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__4) {
 				{
-				setState(95);
+				setState(97);
 				where_clause();
 				}
 			}
 
-			setState(99);
+			setState(101);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__5) {
 				{
-				setState(98);
+				setState(100);
 				orderby_clause();
 				}
 			}
 
-			setState(102);
+			setState(104);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__13) {
 				{
-				setState(101);
+				setState(103);
 				limit_clause();
 				}
 			}
 
-			setState(104);
+			setState(106);
 			match(EOF);
 			}
 		}
@@ -280,17 +282,17 @@ public class EQLParser extends Parser {
 		Select_propertiesContext _localctx = new Select_propertiesContext(_ctx, getState());
 		enterRule(_localctx, 2, RULE_select_properties);
 		try {
-			setState(111);
+			setState(113);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case T__0:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(106);
-				match(T__0);
-				setState(107);
-				fetch_property_group();
 				setState(108);
+				match(T__0);
+				setState(109);
+				fetch_property_group();
+				setState(110);
 				match(T__1);
 				}
 				break;
@@ -299,7 +301,7 @@ public class EQLParser extends Parser {
 			case PROP_FORMULA:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(110);
+				setState(112);
 				fetch_property_group();
 				}
 				break;
@@ -346,19 +348,19 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(113);
-			match(T__2);
 			setState(115);
+			match(T__2);
+			setState(117);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__3) {
 				{
-				setState(114);
+				setState(116);
 				distinct();
 				}
 			}
 
-			setState(117);
+			setState(119);
 			select_properties();
 			}
 		}
@@ -394,7 +396,7 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(119);
+			setState(121);
 			match(T__3);
 			}
 		}
@@ -433,7 +435,7 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(121);
+			setState(123);
 			fetch_path();
 			}
 		}
@@ -472,9 +474,9 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(123);
+			setState(125);
 			match(T__4);
-			setState(124);
+			setState(126);
 			conditional_expression();
 			}
 		}
@@ -517,25 +519,25 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(126);
-			match(T__5);
-			setState(127);
-			match(T__6);
 			setState(128);
+			match(T__5);
+			setState(129);
+			match(T__6);
+			setState(130);
 			orderby_property();
-			setState(133);
+			setState(135);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__7) {
 				{
 				{
-				setState(129);
+				setState(131);
 				match(T__7);
-				setState(130);
+				setState(132);
 				orderby_property();
 				}
 				}
-				setState(135);
+				setState(137);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -581,24 +583,24 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(136);
-			match(PATH_VARIABLE);
 			setState(138);
+			match(PATH_VARIABLE);
+			setState(140);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__11 || _la==T__12) {
 				{
-				setState(137);
+				setState(139);
 				asc_desc();
 				}
 			}
 
-			setState(141);
+			setState(143);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__8) {
 				{
-				setState(140);
+				setState(142);
 				nulls_firstlast();
 				}
 			}
@@ -635,24 +637,24 @@ public class EQLParser extends Parser {
 		Nulls_firstlastContext _localctx = new Nulls_firstlastContext(_ctx, getState());
 		enterRule(_localctx, 16, RULE_nulls_firstlast);
 		try {
-			setState(147);
+			setState(149);
 			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,10,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(143);
+				setState(145);
 				match(T__8);
-				setState(144);
+				setState(146);
 				match(T__9);
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(145);
+				setState(147);
 				match(T__8);
-				setState(146);
+				setState(148);
 				match(T__10);
 				}
 				break;
@@ -691,7 +693,7 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(149);
+			setState(151);
 			_la = _input.LA(1);
 			if ( !(_la==T__11 || _la==T__12) ) {
 			_errHandler.recoverInline(this);
@@ -740,16 +742,16 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(151);
+			setState(153);
 			match(T__13);
-			setState(152);
-			match(NUMBER_LITERAL);
 			setState(154);
+			match(NUMBER_LITERAL);
+			setState(156);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__14) {
 				{
-				setState(153);
+				setState(155);
 				offset_clause();
 				}
 			}
@@ -789,9 +791,9 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(156);
+			setState(158);
 			match(T__14);
-			setState(157);
+			setState(159);
 			match(NUMBER_LITERAL);
 			}
 		}
@@ -837,26 +839,26 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(159);
-			match(T__15);
 			setState(161);
+			match(T__15);
+			setState(163);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__17 || _la==T__18) {
 				{
-				setState(160);
+				setState(162);
 				fetch_option();
 				}
 			}
 
-			setState(163);
-			fetch_path_path();
 			setState(165);
+			fetch_path_path();
+			setState(167);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__0) {
 				{
-				setState(164);
+				setState(166);
 				fetch_property_set();
 				}
 			}
@@ -898,11 +900,11 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(167);
-			match(T__0);
-			setState(168);
-			fetch_property_group();
 			setState(169);
+			match(T__0);
+			setState(170);
+			fetch_property_group();
+			setState(171);
 			match(T__1);
 			}
 		}
@@ -945,21 +947,21 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(171);
+			setState(173);
 			fetch_property();
-			setState(176);
+			setState(178);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__7) {
 				{
 				{
-				setState(172);
+				setState(174);
 				match(T__7);
-				setState(173);
+				setState(175);
 				fetch_property();
 				}
 				}
-				setState(178);
+				setState(180);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -1000,7 +1002,7 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(179);
+			setState(181);
 			_la = _input.LA(1);
 			if ( !(_la==PATH_VARIABLE || _la==QUOTED_PATH_VARIABLE) ) {
 			_errHandler.recoverInline(this);
@@ -1050,34 +1052,34 @@ public class EQLParser extends Parser {
 		Fetch_propertyContext _localctx = new Fetch_propertyContext(_ctx, getState());
 		enterRule(_localctx, 32, RULE_fetch_property);
 		try {
-			setState(185);
+			setState(187);
 			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,15,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(181);
+				setState(183);
 				match(PATH_VARIABLE);
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(182);
+				setState(184);
 				fetch_query_hint();
 				}
 				break;
 			case 3:
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(183);
+				setState(185);
 				fetch_lazy_hint();
 				}
 				break;
 			case 4:
 				enterOuterAlt(_localctx, 4);
 				{
-				setState(184);
+				setState(186);
 				match(PROP_FORMULA);
 				}
 				break;
@@ -1118,9 +1120,9 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(187);
+			setState(189);
 			match(T__16);
-			setState(188);
+			setState(190);
 			fetch_query_option();
 			}
 		}
@@ -1159,9 +1161,9 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(190);
+			setState(192);
 			match(T__16);
-			setState(191);
+			setState(193);
 			fetch_lazy_option();
 			}
 		}
@@ -1201,20 +1203,20 @@ public class EQLParser extends Parser {
 		Fetch_optionContext _localctx = new Fetch_optionContext(_ctx, getState());
 		enterRule(_localctx, 38, RULE_fetch_option);
 		try {
-			setState(195);
+			setState(197);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case T__17:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(193);
+				setState(195);
 				fetch_query_option();
 				}
 				break;
 			case T__18:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(194);
+				setState(196);
 				fetch_lazy_option();
 				}
 				break;
@@ -1258,14 +1260,14 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(197);
-			match(T__17);
 			setState(199);
+			match(T__17);
+			setState(201);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__0) {
 				{
-				setState(198);
+				setState(200);
 				fetch_batch_size();
 				}
 			}
@@ -1308,14 +1310,14 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(201);
-			match(T__18);
 			setState(203);
+			match(T__18);
+			setState(205);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__0) {
 				{
-				setState(202);
+				setState(204);
 				fetch_batch_size();
 				}
 			}
@@ -1355,11 +1357,11 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(205);
-			match(T__0);
-			setState(206);
-			match(NUMBER_LITERAL);
 			setState(207);
+			match(T__0);
+			setState(208);
+			match(NUMBER_LITERAL);
+			setState(209);
 			match(T__1);
 			}
 		}
@@ -1402,21 +1404,21 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(209);
+			setState(211);
 			conditional_term();
-			setState(214);
+			setState(216);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__19) {
 				{
 				{
-				setState(210);
+				setState(212);
 				match(T__19);
-				setState(211);
+				setState(213);
 				conditional_term();
 				}
 				}
-				setState(216);
+				setState(218);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -1461,21 +1463,21 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(217);
+			setState(219);
 			conditional_factor();
-			setState(222);
+			setState(224);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__20) {
 				{
 				{
-				setState(218);
+				setState(220);
 				match(T__20);
-				setState(219);
+				setState(221);
 				conditional_factor();
 				}
 				}
-				setState(224);
+				setState(226);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -1517,17 +1519,17 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(226);
+			setState(228);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__21) {
 				{
-				setState(225);
+				setState(227);
 				match(T__21);
 				}
 			}
 
-			setState(228);
+			setState(230);
 			conditional_primary();
 			}
 		}
@@ -1567,24 +1569,24 @@ public class EQLParser extends Parser {
 		Conditional_primaryContext _localctx = new Conditional_primaryContext(_ctx, getState());
 		enterRule(_localctx, 52, RULE_conditional_primary);
 		try {
-			setState(235);
+			setState(237);
 			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,22,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(230);
+				setState(232);
 				any_expression();
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(231);
-				match(T__0);
-				setState(232);
-				conditional_expression();
 				setState(233);
+				match(T__0);
+				setState(234);
+				conditional_expression();
+				setState(235);
 				match(T__1);
 				}
 				break;
@@ -1617,6 +1619,9 @@ public class EQLParser extends Parser {
 		public PropertyBetween_expressionContext propertyBetween_expression() {
 			return getRuleContext(PropertyBetween_expressionContext.class,0);
 		}
+		public InOrEmpty_expressionContext inOrEmpty_expression() {
+			return getRuleContext(InOrEmpty_expressionContext.class,0);
+		}
 		public In_expressionContext in_expression() {
 			return getRuleContext(In_expressionContext.class,0);
 		}
@@ -1653,87 +1658,94 @@ public class EQLParser extends Parser {
 		Any_expressionContext _localctx = new Any_expressionContext(_ctx, getState());
 		enterRule(_localctx, 54, RULE_any_expression);
 		try {
-			setState(251);
+			setState(254);
 			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,23,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(237);
+				setState(239);
 				comparison_expression();
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(238);
+				setState(240);
 				like_expression();
 				}
 				break;
 			case 3:
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(239);
+				setState(241);
 				inrange_expression();
 				}
 				break;
 			case 4:
 				enterOuterAlt(_localctx, 4);
 				{
-				setState(240);
+				setState(242);
 				between_expression();
 				}
 				break;
 			case 5:
 				enterOuterAlt(_localctx, 5);
 				{
-				setState(241);
+				setState(243);
 				propertyBetween_expression();
 				}
 				break;
 			case 6:
 				enterOuterAlt(_localctx, 6);
 				{
-				setState(242);
-				in_expression();
+				setState(244);
+				inOrEmpty_expression();
 				}
 				break;
 			case 7:
 				enterOuterAlt(_localctx, 7);
 				{
-				setState(243);
-				isNull_expression();
+				setState(245);
+				in_expression();
 				}
 				break;
 			case 8:
 				enterOuterAlt(_localctx, 8);
 				{
-				setState(244);
-				isNotNull_expression();
+				setState(246);
+				isNull_expression();
 				}
 				break;
 			case 9:
 				enterOuterAlt(_localctx, 9);
 				{
-				setState(245);
-				isEmpty_expression();
+				setState(247);
+				isNotNull_expression();
 				}
 				break;
 			case 10:
 				enterOuterAlt(_localctx, 10);
 				{
-				setState(246);
-				isNotEmpty_expression();
+				setState(248);
+				isEmpty_expression();
 				}
 				break;
 			case 11:
 				enterOuterAlt(_localctx, 11);
 				{
-				setState(247);
-				match(T__0);
-				setState(248);
-				any_expression();
 				setState(249);
+				isNotEmpty_expression();
+				}
+				break;
+			case 12:
+				enterOuterAlt(_localctx, 12);
+				{
+				setState(250);
+				match(T__0);
+				setState(251);
+				any_expression();
+				setState(252);
 				match(T__1);
 				}
 				break;
@@ -1750,6 +1762,50 @@ public class EQLParser extends Parser {
 		return _localctx;
 	}
 
+	public static class InOrEmpty_expressionContext extends ParserRuleContext {
+		public TerminalNode PATH_VARIABLE() { return getToken(EQLParser.PATH_VARIABLE, 0); }
+		public In_valueContext in_value() {
+			return getRuleContext(In_valueContext.class,0);
+		}
+		public InOrEmpty_expressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_inOrEmpty_expression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterInOrEmpty_expression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitInOrEmpty_expression(this);
+		}
+	}
+
+	public final InOrEmpty_expressionContext inOrEmpty_expression() throws RecognitionException {
+		InOrEmpty_expressionContext _localctx = new InOrEmpty_expressionContext(_ctx, getState());
+		enterRule(_localctx, 56, RULE_inOrEmpty_expression);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(256);
+			match(PATH_VARIABLE);
+			setState(257);
+			match(T__22);
+			setState(258);
+			in_value();
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
 	public static class In_expressionContext extends ParserRuleContext {
 		public TerminalNode PATH_VARIABLE() { return getToken(EQLParser.PATH_VARIABLE, 0); }
 		public In_valueContext in_value() {
@@ -1771,15 +1827,15 @@ public class EQLParser extends Parser {
 
 	public final In_expressionContext in_expression() throws RecognitionException {
 		In_expressionContext _localctx = new In_expressionContext(_ctx, getState());
-		enterRule(_localctx, 56, RULE_in_expression);
+		enterRule(_localctx, 58, RULE_in_expression);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(253);
+			setState(260);
 			match(PATH_VARIABLE);
-			setState(254);
-			match(T__22);
-			setState(255);
+			setState(261);
+			match(T__23);
+			setState(262);
 			in_value();
 			}
 		}
@@ -1818,43 +1874,43 @@ public class EQLParser extends Parser {
 
 	public final In_valueContext in_value() throws RecognitionException {
 		In_valueContext _localctx = new In_valueContext(_ctx, getState());
-		enterRule(_localctx, 58, RULE_in_value);
+		enterRule(_localctx, 60, RULE_in_value);
 		int _la;
 		try {
-			setState(269);
+			setState(276);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case INPUT_VARIABLE:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(257);
+				setState(264);
 				match(INPUT_VARIABLE);
 				}
 				break;
 			case T__0:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(258);
+				setState(265);
 				match(T__0);
-				setState(259);
+				setState(266);
 				value_expression();
-				setState(264);
+				setState(271);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 				while (_la==T__7) {
 					{
 					{
-					setState(260);
+					setState(267);
 					match(T__7);
-					setState(261);
+					setState(268);
 					value_expression();
 					}
 					}
-					setState(266);
+					setState(273);
 					_errHandler.sync(this);
 					_la = _input.LA(1);
 				}
-				setState(267);
+				setState(274);
 				match(T__1);
 				}
 				break;
@@ -1897,19 +1953,19 @@ public class EQLParser extends Parser {
 
 	public final Between_expressionContext between_expression() throws RecognitionException {
 		Between_expressionContext _localctx = new Between_expressionContext(_ctx, getState());
-		enterRule(_localctx, 60, RULE_between_expression);
+		enterRule(_localctx, 62, RULE_between_expression);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(271);
+			setState(278);
 			match(PATH_VARIABLE);
-			setState(272);
-			match(T__23);
-			setState(273);
+			setState(279);
+			match(T__24);
+			setState(280);
 			value_expression();
-			setState(274);
+			setState(281);
 			match(T__20);
-			setState(275);
+			setState(282);
 			value_expression();
 			}
 		}
@@ -1948,19 +2004,19 @@ public class EQLParser extends Parser {
 
 	public final Inrange_expressionContext inrange_expression() throws RecognitionException {
 		Inrange_expressionContext _localctx = new Inrange_expressionContext(_ctx, getState());
-		enterRule(_localctx, 62, RULE_inrange_expression);
+		enterRule(_localctx, 64, RULE_inrange_expression);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(277);
+			setState(284);
 			match(PATH_VARIABLE);
-			setState(278);
-			match(T__24);
-			setState(279);
-			value_expression();
-			setState(280);
+			setState(285);
 			match(T__25);
-			setState(281);
+			setState(286);
+			value_expression();
+			setState(287);
+			match(T__26);
+			setState(288);
 			value_expression();
 			}
 		}
@@ -1999,19 +2055,19 @@ public class EQLParser extends Parser {
 
 	public final PropertyBetween_expressionContext propertyBetween_expression() throws RecognitionException {
 		PropertyBetween_expressionContext _localctx = new PropertyBetween_expressionContext(_ctx, getState());
-		enterRule(_localctx, 64, RULE_propertyBetween_expression);
+		enterRule(_localctx, 66, RULE_propertyBetween_expression);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(283);
+			setState(290);
 			value_expression();
-			setState(284);
-			match(T__23);
-			setState(285);
+			setState(291);
+			match(T__24);
+			setState(292);
 			match(PATH_VARIABLE);
-			setState(286);
+			setState(293);
 			match(T__20);
-			setState(287);
+			setState(294);
 			match(PATH_VARIABLE);
 			}
 		}
@@ -2044,29 +2100,29 @@ public class EQLParser extends Parser {
 
 	public final IsNull_expressionContext isNull_expression() throws RecognitionException {
 		IsNull_expressionContext _localctx = new IsNull_expressionContext(_ctx, getState());
-		enterRule(_localctx, 66, RULE_isNull_expression);
+		enterRule(_localctx, 68, RULE_isNull_expression);
 		try {
-			setState(294);
+			setState(301);
 			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,26,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(289);
+				setState(296);
 				match(PATH_VARIABLE);
-				setState(290);
-				match(T__26);
-				setState(291);
+				setState(297);
 				match(T__27);
+				setState(298);
+				match(T__28);
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(292);
+				setState(299);
 				match(PATH_VARIABLE);
-				setState(293);
-				match(T__28);
+				setState(300);
+				match(T__29);
 				}
 				break;
 			}
@@ -2100,40 +2156,40 @@ public class EQLParser extends Parser {
 
 	public final IsNotNull_expressionContext isNotNull_expression() throws RecognitionException {
 		IsNotNull_expressionContext _localctx = new IsNotNull_expressionContext(_ctx, getState());
-		enterRule(_localctx, 68, RULE_isNotNull_expression);
+		enterRule(_localctx, 70, RULE_isNotNull_expression);
 		try {
-			setState(304);
+			setState(311);
 			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,27,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(296);
+				setState(303);
 				match(PATH_VARIABLE);
-				setState(297);
-				match(T__26);
-				setState(298);
-				match(T__21);
-				setState(299);
+				setState(304);
 				match(T__27);
+				setState(305);
+				match(T__21);
+				setState(306);
+				match(T__28);
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(300);
+				setState(307);
 				match(PATH_VARIABLE);
-				setState(301);
-				match(T__29);
+				setState(308);
+				match(T__30);
 				}
 				break;
 			case 3:
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(302);
+				setState(309);
 				match(PATH_VARIABLE);
-				setState(303);
-				match(T__30);
+				setState(310);
+				match(T__31);
 				}
 				break;
 			}
@@ -2167,29 +2223,29 @@ public class EQLParser extends Parser {
 
 	public final IsEmpty_expressionContext isEmpty_expression() throws RecognitionException {
 		IsEmpty_expressionContext _localctx = new IsEmpty_expressionContext(_ctx, getState());
-		enterRule(_localctx, 70, RULE_isEmpty_expression);
+		enterRule(_localctx, 72, RULE_isEmpty_expression);
 		try {
-			setState(311);
+			setState(318);
 			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,28,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(306);
+				setState(313);
 				match(PATH_VARIABLE);
-				setState(307);
-				match(T__26);
-				setState(308);
-				match(T__31);
+				setState(314);
+				match(T__27);
+				setState(315);
+				match(T__32);
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(309);
+				setState(316);
 				match(PATH_VARIABLE);
-				setState(310);
-				match(T__32);
+				setState(317);
+				match(T__33);
 				}
 				break;
 			}
@@ -2223,40 +2279,40 @@ public class EQLParser extends Parser {
 
 	public final IsNotEmpty_expressionContext isNotEmpty_expression() throws RecognitionException {
 		IsNotEmpty_expressionContext _localctx = new IsNotEmpty_expressionContext(_ctx, getState());
-		enterRule(_localctx, 72, RULE_isNotEmpty_expression);
+		enterRule(_localctx, 74, RULE_isNotEmpty_expression);
 		try {
-			setState(321);
+			setState(328);
 			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,29,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(313);
+				setState(320);
 				match(PATH_VARIABLE);
-				setState(314);
-				match(T__26);
-				setState(315);
+				setState(321);
+				match(T__27);
+				setState(322);
 				match(T__21);
-				setState(316);
-				match(T__31);
+				setState(323);
+				match(T__32);
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(317);
+				setState(324);
 				match(PATH_VARIABLE);
-				setState(318);
-				match(T__33);
+				setState(325);
+				match(T__34);
 				}
 				break;
 			case 3:
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(319);
+				setState(326);
 				match(PATH_VARIABLE);
-				setState(320);
-				match(T__34);
+				setState(327);
+				match(T__35);
 				}
 				break;
 			}
@@ -2296,15 +2352,15 @@ public class EQLParser extends Parser {
 
 	public final Like_expressionContext like_expression() throws RecognitionException {
 		Like_expressionContext _localctx = new Like_expressionContext(_ctx, getState());
-		enterRule(_localctx, 74, RULE_like_expression);
+		enterRule(_localctx, 76, RULE_like_expression);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(323);
+			setState(330);
 			match(PATH_VARIABLE);
-			setState(324);
+			setState(331);
 			like_op();
-			setState(325);
+			setState(332);
 			value_expression();
 			}
 		}
@@ -2336,14 +2392,14 @@ public class EQLParser extends Parser {
 
 	public final Like_opContext like_op() throws RecognitionException {
 		Like_opContext _localctx = new Like_opContext(_ctx, getState());
-		enterRule(_localctx, 76, RULE_like_op);
+		enterRule(_localctx, 78, RULE_like_op);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(327);
+			setState(334);
 			_la = _input.LA(1);
-			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__35) | (1L << T__36) | (1L << T__37) | (1L << T__38) | (1L << T__39) | (1L << T__40) | (1L << T__41) | (1L << T__42))) != 0)) ) {
+			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__36) | (1L << T__37) | (1L << T__38) | (1L << T__39) | (1L << T__40) | (1L << T__41) | (1L << T__42) | (1L << T__43))) != 0)) ) {
 			_errHandler.recoverInline(this);
 			}
 			else {
@@ -2388,19 +2444,19 @@ public class EQLParser extends Parser {
 
 	public final Comparison_expressionContext comparison_expression() throws RecognitionException {
 		Comparison_expressionContext _localctx = new Comparison_expressionContext(_ctx, getState());
-		enterRule(_localctx, 78, RULE_comparison_expression);
+		enterRule(_localctx, 80, RULE_comparison_expression);
 		try {
-			setState(337);
+			setState(344);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case PATH_VARIABLE:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(329);
+				setState(336);
 				match(PATH_VARIABLE);
-				setState(330);
+				setState(337);
 				comparison_operator();
-				setState(331);
+				setState(338);
 				value_expression();
 				}
 				break;
@@ -2410,11 +2466,11 @@ public class EQLParser extends Parser {
 			case STRING_LITERAL:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(333);
+				setState(340);
 				value_expression();
-				setState(334);
+				setState(341);
 				comparison_operator();
-				setState(335);
+				setState(342);
 				match(PATH_VARIABLE);
 				}
 				break;
@@ -2450,14 +2506,14 @@ public class EQLParser extends Parser {
 
 	public final Comparison_operatorContext comparison_operator() throws RecognitionException {
 		Comparison_operatorContext _localctx = new Comparison_operatorContext(_ctx, getState());
-		enterRule(_localctx, 80, RULE_comparison_operator);
+		enterRule(_localctx, 82, RULE_comparison_operator);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(339);
+			setState(346);
 			_la = _input.LA(1);
-			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__43) | (1L << T__44) | (1L << T__45) | (1L << T__46) | (1L << T__47) | (1L << T__48) | (1L << T__49) | (1L << T__50) | (1L << T__51) | (1L << T__52) | (1L << T__53) | (1L << T__54) | (1L << T__55) | (1L << T__56) | (1L << T__57) | (1L << T__58) | (1L << T__59))) != 0)) ) {
+			if ( !(((((_la - 45)) & ~0x3f) == 0 && ((1L << (_la - 45)) & ((1L << (T__44 - 45)) | (1L << (T__45 - 45)) | (1L << (T__46 - 45)) | (1L << (T__47 - 45)) | (1L << (T__48 - 45)) | (1L << (T__49 - 45)) | (1L << (T__50 - 45)) | (1L << (T__51 - 45)) | (1L << (T__52 - 45)) | (1L << (T__53 - 45)) | (1L << (T__54 - 45)) | (1L << (T__55 - 45)) | (1L << (T__56 - 45)) | (1L << (T__57 - 45)) | (1L << (T__58 - 45)) | (1L << (T__59 - 45)) | (1L << (T__60 - 45)) | (1L << (T__61 - 45)) | (1L << (T__62 - 45)) | (1L << (T__63 - 45)))) != 0)) ) {
 			_errHandler.recoverInline(this);
 			}
 			else {
@@ -2499,9 +2555,9 @@ public class EQLParser extends Parser {
 
 	public final Value_expressionContext value_expression() throws RecognitionException {
 		Value_expressionContext _localctx = new Value_expressionContext(_ctx, getState());
-		enterRule(_localctx, 82, RULE_value_expression);
+		enterRule(_localctx, 84, RULE_value_expression);
 		try {
-			setState(343);
+			setState(350);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case BOOLEAN_LITERAL:
@@ -2509,14 +2565,14 @@ public class EQLParser extends Parser {
 			case STRING_LITERAL:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(341);
+				setState(348);
 				literal();
 				}
 				break;
 			case INPUT_VARIABLE:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(342);
+				setState(349);
 				match(INPUT_VARIABLE);
 				}
 				break;
@@ -2555,14 +2611,14 @@ public class EQLParser extends Parser {
 
 	public final LiteralContext literal() throws RecognitionException {
 		LiteralContext _localctx = new LiteralContext(_ctx, getState());
-		enterRule(_localctx, 84, RULE_literal);
+		enterRule(_localctx, 86, RULE_literal);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(345);
+			setState(352);
 			_la = _input.LA(1);
-			if ( !(((((_la - 65)) & ~0x3f) == 0 && ((1L << (_la - 65)) & ((1L << (BOOLEAN_LITERAL - 65)) | (1L << (NUMBER_LITERAL - 65)) | (1L << (STRING_LITERAL - 65)))) != 0)) ) {
+			if ( !(((((_la - 69)) & ~0x3f) == 0 && ((1L << (_la - 69)) & ((1L << (BOOLEAN_LITERAL - 69)) | (1L << (NUMBER_LITERAL - 69)) | (1L << (STRING_LITERAL - 69)))) != 0)) ) {
 			_errHandler.recoverInline(this);
 			}
 			else {
@@ -2584,122 +2640,124 @@ public class EQLParser extends Parser {
 	}
 
 	public static final String _serializedATN =
-		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3I\u015e\4\2\t\2\4"+
+		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3M\u0165\4\2\t\2\4"+
 		"\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t"+
 		"\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"+
 		"\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"+
 		"\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\4\36\t\36\4\37\t\37\4 \t \4!"+
 		"\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\4*\t*\4+\t+\4"+
-		",\t,\3\2\5\2Z\n\2\3\2\7\2]\n\2\f\2\16\2`\13\2\3\2\5\2c\n\2\3\2\5\2f\n"+
-		"\2\3\2\5\2i\n\2\3\2\3\2\3\3\3\3\3\3\3\3\3\3\5\3r\n\3\3\4\3\4\5\4v\n\4"+
-		"\3\4\3\4\3\5\3\5\3\6\3\6\3\7\3\7\3\7\3\b\3\b\3\b\3\b\3\b\7\b\u0086\n\b"+
-		"\f\b\16\b\u0089\13\b\3\t\3\t\5\t\u008d\n\t\3\t\5\t\u0090\n\t\3\n\3\n\3"+
-		"\n\3\n\5\n\u0096\n\n\3\13\3\13\3\f\3\f\3\f\5\f\u009d\n\f\3\r\3\r\3\r\3"+
-		"\16\3\16\5\16\u00a4\n\16\3\16\3\16\5\16\u00a8\n\16\3\17\3\17\3\17\3\17"+
-		"\3\20\3\20\3\20\7\20\u00b1\n\20\f\20\16\20\u00b4\13\20\3\21\3\21\3\22"+
-		"\3\22\3\22\3\22\5\22\u00bc\n\22\3\23\3\23\3\23\3\24\3\24\3\24\3\25\3\25"+
-		"\5\25\u00c6\n\25\3\26\3\26\5\26\u00ca\n\26\3\27\3\27\5\27\u00ce\n\27\3"+
-		"\30\3\30\3\30\3\30\3\31\3\31\3\31\7\31\u00d7\n\31\f\31\16\31\u00da\13"+
-		"\31\3\32\3\32\3\32\7\32\u00df\n\32\f\32\16\32\u00e2\13\32\3\33\5\33\u00e5"+
-		"\n\33\3\33\3\33\3\34\3\34\3\34\3\34\3\34\5\34\u00ee\n\34\3\35\3\35\3\35"+
-		"\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\5\35\u00fe\n\35"+
-		"\3\36\3\36\3\36\3\36\3\37\3\37\3\37\3\37\3\37\7\37\u0109\n\37\f\37\16"+
-		"\37\u010c\13\37\3\37\3\37\5\37\u0110\n\37\3 \3 \3 \3 \3 \3 \3!\3!\3!\3"+
-		"!\3!\3!\3\"\3\"\3\"\3\"\3\"\3\"\3#\3#\3#\3#\3#\5#\u0129\n#\3$\3$\3$\3"+
-		"$\3$\3$\3$\3$\5$\u0133\n$\3%\3%\3%\3%\3%\5%\u013a\n%\3&\3&\3&\3&\3&\3"+
-		"&\3&\3&\5&\u0144\n&\3\'\3\'\3\'\3\'\3(\3(\3)\3)\3)\3)\3)\3)\3)\3)\5)\u0154"+
-		"\n)\3*\3*\3+\3+\5+\u015a\n+\3,\3,\3,\2\2-\2\4\6\b\n\f\16\20\22\24\26\30"+
-		"\32\34\36 \"$&(*,.\60\62\64\668:<>@BDFHJLNPRTV\2\7\3\2\16\17\3\2@A\3\2"+
-		"&-\3\2.>\4\2CDHH\2\u015f\2Y\3\2\2\2\4q\3\2\2\2\6s\3\2\2\2\by\3\2\2\2\n"+
-		"{\3\2\2\2\f}\3\2\2\2\16\u0080\3\2\2\2\20\u008a\3\2\2\2\22\u0095\3\2\2"+
-		"\2\24\u0097\3\2\2\2\26\u0099\3\2\2\2\30\u009e\3\2\2\2\32\u00a1\3\2\2\2"+
-		"\34\u00a9\3\2\2\2\36\u00ad\3\2\2\2 \u00b5\3\2\2\2\"\u00bb\3\2\2\2$\u00bd"+
-		"\3\2\2\2&\u00c0\3\2\2\2(\u00c5\3\2\2\2*\u00c7\3\2\2\2,\u00cb\3\2\2\2."+
-		"\u00cf\3\2\2\2\60\u00d3\3\2\2\2\62\u00db\3\2\2\2\64\u00e4\3\2\2\2\66\u00ed"+
-		"\3\2\2\28\u00fd\3\2\2\2:\u00ff\3\2\2\2<\u010f\3\2\2\2>\u0111\3\2\2\2@"+
-		"\u0117\3\2\2\2B\u011d\3\2\2\2D\u0128\3\2\2\2F\u0132\3\2\2\2H\u0139\3\2"+
-		"\2\2J\u0143\3\2\2\2L\u0145\3\2\2\2N\u0149\3\2\2\2P\u0153\3\2\2\2R\u0155"+
-		"\3\2\2\2T\u0159\3\2\2\2V\u015b\3\2\2\2XZ\5\6\4\2YX\3\2\2\2YZ\3\2\2\2Z"+
-		"^\3\2\2\2[]\5\n\6\2\\[\3\2\2\2]`\3\2\2\2^\\\3\2\2\2^_\3\2\2\2_b\3\2\2"+
-		"\2`^\3\2\2\2ac\5\f\7\2ba\3\2\2\2bc\3\2\2\2ce\3\2\2\2df\5\16\b\2ed\3\2"+
-		"\2\2ef\3\2\2\2fh\3\2\2\2gi\5\26\f\2hg\3\2\2\2hi\3\2\2\2ij\3\2\2\2jk\7"+
-		"\2\2\3k\3\3\2\2\2lm\7\3\2\2mn\5\36\20\2no\7\4\2\2or\3\2\2\2pr\5\36\20"+
-		"\2ql\3\2\2\2qp\3\2\2\2r\5\3\2\2\2su\7\5\2\2tv\5\b\5\2ut\3\2\2\2uv\3\2"+
-		"\2\2vw\3\2\2\2wx\5\4\3\2x\7\3\2\2\2yz\7\6\2\2z\t\3\2\2\2{|\5\32\16\2|"+
-		"\13\3\2\2\2}~\7\7\2\2~\177\5\60\31\2\177\r\3\2\2\2\u0080\u0081\7\b\2\2"+
-		"\u0081\u0082\7\t\2\2\u0082\u0087\5\20\t\2\u0083\u0084\7\n\2\2\u0084\u0086"+
-		"\5\20\t\2\u0085\u0083\3\2\2\2\u0086\u0089\3\2\2\2\u0087\u0085\3\2\2\2"+
-		"\u0087\u0088\3\2\2\2\u0088\17\3\2\2\2\u0089\u0087\3\2\2\2\u008a\u008c"+
-		"\7@\2\2\u008b\u008d\5\24\13\2\u008c\u008b\3\2\2\2\u008c\u008d\3\2\2\2"+
-		"\u008d\u008f\3\2\2\2\u008e\u0090\5\22\n\2\u008f\u008e\3\2\2\2\u008f\u0090"+
-		"\3\2\2\2\u0090\21\3\2\2\2\u0091\u0092\7\13\2\2\u0092\u0096\7\f\2\2\u0093"+
-		"\u0094\7\13\2\2\u0094\u0096\7\r\2\2\u0095\u0091\3\2\2\2\u0095\u0093\3"+
-		"\2\2\2\u0096\23\3\2\2\2\u0097\u0098\t\2\2\2\u0098\25\3\2\2\2\u0099\u009a"+
-		"\7\20\2\2\u009a\u009c\7D\2\2\u009b\u009d\5\30\r\2\u009c\u009b\3\2\2\2"+
-		"\u009c\u009d\3\2\2\2\u009d\27\3\2\2\2\u009e\u009f\7\21\2\2\u009f\u00a0"+
-		"\7D\2\2\u00a0\31\3\2\2\2\u00a1\u00a3\7\22\2\2\u00a2\u00a4\5(\25\2\u00a3"+
-		"\u00a2\3\2\2\2\u00a3\u00a4\3\2\2\2\u00a4\u00a5\3\2\2\2\u00a5\u00a7\5 "+
-		"\21\2\u00a6\u00a8\5\34\17\2\u00a7\u00a6\3\2\2\2\u00a7\u00a8\3\2\2\2\u00a8"+
-		"\33\3\2\2\2\u00a9\u00aa\7\3\2\2\u00aa\u00ab\5\36\20\2\u00ab\u00ac\7\4"+
-		"\2\2\u00ac\35\3\2\2\2\u00ad\u00b2\5\"\22\2\u00ae\u00af\7\n\2\2\u00af\u00b1"+
-		"\5\"\22\2\u00b0\u00ae\3\2\2\2\u00b1\u00b4\3\2\2\2\u00b2\u00b0\3\2\2\2"+
-		"\u00b2\u00b3\3\2\2\2\u00b3\37\3\2\2\2\u00b4\u00b2\3\2\2\2\u00b5\u00b6"+
-		"\t\3\2\2\u00b6!\3\2\2\2\u00b7\u00bc\7@\2\2\u00b8\u00bc\5$\23\2\u00b9\u00bc"+
-		"\5&\24\2\u00ba\u00bc\7B\2\2\u00bb\u00b7\3\2\2\2\u00bb\u00b8\3\2\2\2\u00bb"+
-		"\u00b9\3\2\2\2\u00bb\u00ba\3\2\2\2\u00bc#\3\2\2\2\u00bd\u00be\7\23\2\2"+
-		"\u00be\u00bf\5*\26\2\u00bf%\3\2\2\2\u00c0\u00c1\7\23\2\2\u00c1\u00c2\5"+
-		",\27\2\u00c2\'\3\2\2\2\u00c3\u00c6\5*\26\2\u00c4\u00c6\5,\27\2\u00c5\u00c3"+
-		"\3\2\2\2\u00c5\u00c4\3\2\2\2\u00c6)\3\2\2\2\u00c7\u00c9\7\24\2\2\u00c8"+
-		"\u00ca\5.\30\2\u00c9\u00c8\3\2\2\2\u00c9\u00ca\3\2\2\2\u00ca+\3\2\2\2"+
-		"\u00cb\u00cd\7\25\2\2\u00cc\u00ce\5.\30\2\u00cd\u00cc\3\2\2\2\u00cd\u00ce"+
-		"\3\2\2\2\u00ce-\3\2\2\2\u00cf\u00d0\7\3\2\2\u00d0\u00d1\7D\2\2\u00d1\u00d2"+
-		"\7\4\2\2\u00d2/\3\2\2\2\u00d3\u00d8\5\62\32\2\u00d4\u00d5\7\26\2\2\u00d5"+
-		"\u00d7\5\62\32\2\u00d6\u00d4\3\2\2\2\u00d7\u00da\3\2\2\2\u00d8\u00d6\3"+
-		"\2\2\2\u00d8\u00d9\3\2\2\2\u00d9\61\3\2\2\2\u00da\u00d8\3\2\2\2\u00db"+
-		"\u00e0\5\64\33\2\u00dc\u00dd\7\27\2\2\u00dd\u00df\5\64\33\2\u00de\u00dc"+
-		"\3\2\2\2\u00df\u00e2\3\2\2\2\u00e0\u00de\3\2\2\2\u00e0\u00e1\3\2\2\2\u00e1"+
-		"\63\3\2\2\2\u00e2\u00e0\3\2\2\2\u00e3\u00e5\7\30\2\2\u00e4\u00e3\3\2\2"+
-		"\2\u00e4\u00e5\3\2\2\2\u00e5\u00e6\3\2\2\2\u00e6\u00e7\5\66\34\2\u00e7"+
-		"\65\3\2\2\2\u00e8\u00ee\58\35\2\u00e9\u00ea\7\3\2\2\u00ea\u00eb\5\60\31"+
-		"\2\u00eb\u00ec\7\4\2\2\u00ec\u00ee\3\2\2\2\u00ed\u00e8\3\2\2\2\u00ed\u00e9"+
-		"\3\2\2\2\u00ee\67\3\2\2\2\u00ef\u00fe\5P)\2\u00f0\u00fe\5L\'\2\u00f1\u00fe"+
-		"\5@!\2\u00f2\u00fe\5> \2\u00f3\u00fe\5B\"\2\u00f4\u00fe\5:\36\2\u00f5"+
-		"\u00fe\5D#\2\u00f6\u00fe\5F$\2\u00f7\u00fe\5H%\2\u00f8\u00fe\5J&\2\u00f9"+
-		"\u00fa\7\3\2\2\u00fa\u00fb\58\35\2\u00fb\u00fc\7\4\2\2\u00fc\u00fe\3\2"+
-		"\2\2\u00fd\u00ef\3\2\2\2\u00fd\u00f0\3\2\2\2\u00fd\u00f1\3\2\2\2\u00fd"+
-		"\u00f2\3\2\2\2\u00fd\u00f3\3\2\2\2\u00fd\u00f4\3\2\2\2\u00fd\u00f5\3\2"+
-		"\2\2\u00fd\u00f6\3\2\2\2\u00fd\u00f7\3\2\2\2\u00fd\u00f8\3\2\2\2\u00fd"+
-		"\u00f9\3\2\2\2\u00fe9\3\2\2\2\u00ff\u0100\7@\2\2\u0100\u0101\7\31\2\2"+
-		"\u0101\u0102\5<\37\2\u0102;\3\2\2\2\u0103\u0110\7?\2\2\u0104\u0105\7\3"+
-		"\2\2\u0105\u010a\5T+\2\u0106\u0107\7\n\2\2\u0107\u0109\5T+\2\u0108\u0106"+
-		"\3\2\2\2\u0109\u010c\3\2\2\2\u010a\u0108\3\2\2\2\u010a\u010b\3\2\2\2\u010b"+
-		"\u010d\3\2\2\2\u010c\u010a\3\2\2\2\u010d\u010e\7\4\2\2\u010e\u0110\3\2"+
-		"\2\2\u010f\u0103\3\2\2\2\u010f\u0104\3\2\2\2\u0110=\3\2\2\2\u0111\u0112"+
-		"\7@\2\2\u0112\u0113\7\32\2\2\u0113\u0114\5T+\2\u0114\u0115\7\27\2\2\u0115"+
-		"\u0116\5T+\2\u0116?\3\2\2\2\u0117\u0118\7@\2\2\u0118\u0119\7\33\2\2\u0119"+
-		"\u011a\5T+\2\u011a\u011b\7\34\2\2\u011b\u011c\5T+\2\u011cA\3\2\2\2\u011d"+
-		"\u011e\5T+\2\u011e\u011f\7\32\2\2\u011f\u0120\7@\2\2\u0120\u0121\7\27"+
-		"\2\2\u0121\u0122\7@\2\2\u0122C\3\2\2\2\u0123\u0124\7@\2\2\u0124\u0125"+
-		"\7\35\2\2\u0125\u0129\7\36\2\2\u0126\u0127\7@\2\2\u0127\u0129\7\37\2\2"+
-		"\u0128\u0123\3\2\2\2\u0128\u0126\3\2\2\2\u0129E\3\2\2\2\u012a\u012b\7"+
-		"@\2\2\u012b\u012c\7\35\2\2\u012c\u012d\7\30\2\2\u012d\u0133\7\36\2\2\u012e"+
-		"\u012f\7@\2\2\u012f\u0133\7 \2\2\u0130\u0131\7@\2\2\u0131\u0133\7!\2\2"+
-		"\u0132\u012a\3\2\2\2\u0132\u012e\3\2\2\2\u0132\u0130\3\2\2\2\u0133G\3"+
-		"\2\2\2\u0134\u0135\7@\2\2\u0135\u0136\7\35\2\2\u0136\u013a\7\"\2\2\u0137"+
-		"\u0138\7@\2\2\u0138\u013a\7#\2\2\u0139\u0134\3\2\2\2\u0139\u0137\3\2\2"+
-		"\2\u013aI\3\2\2\2\u013b\u013c\7@\2\2\u013c\u013d\7\35\2\2\u013d\u013e"+
-		"\7\30\2\2\u013e\u0144\7\"\2\2\u013f\u0140\7@\2\2\u0140\u0144\7$\2\2\u0141"+
-		"\u0142\7@\2\2\u0142\u0144\7%\2\2\u0143\u013b\3\2\2\2\u0143\u013f\3\2\2"+
-		"\2\u0143\u0141\3\2\2\2\u0144K\3\2\2\2\u0145\u0146\7@\2\2\u0146\u0147\5"+
-		"N(\2\u0147\u0148\5T+\2\u0148M\3\2\2\2\u0149\u014a\t\4\2\2\u014aO\3\2\2"+
-		"\2\u014b\u014c\7@\2\2\u014c\u014d\5R*\2\u014d\u014e\5T+\2\u014e\u0154"+
-		"\3\2\2\2\u014f\u0150\5T+\2\u0150\u0151\5R*\2\u0151\u0152\7@\2\2\u0152"+
-		"\u0154\3\2\2\2\u0153\u014b\3\2\2\2\u0153\u014f\3\2\2\2\u0154Q\3\2\2\2"+
-		"\u0155\u0156\t\5\2\2\u0156S\3\2\2\2\u0157\u015a\5V,\2\u0158\u015a\7?\2"+
-		"\2\u0159\u0157\3\2\2\2\u0159\u0158\3\2\2\2\u015aU\3\2\2\2\u015b\u015c"+
-		"\t\6\2\2\u015cW\3\2\2\2\"Y^behqu\u0087\u008c\u008f\u0095\u009c\u00a3\u00a7"+
-		"\u00b2\u00bb\u00c5\u00c9\u00cd\u00d8\u00e0\u00e4\u00ed\u00fd\u010a\u010f"+
-		"\u0128\u0132\u0139\u0143\u0153\u0159";
+		",\t,\4-\t-\3\2\5\2\\\n\2\3\2\7\2_\n\2\f\2\16\2b\13\2\3\2\5\2e\n\2\3\2"+
+		"\5\2h\n\2\3\2\5\2k\n\2\3\2\3\2\3\3\3\3\3\3\3\3\3\3\5\3t\n\3\3\4\3\4\5"+
+		"\4x\n\4\3\4\3\4\3\5\3\5\3\6\3\6\3\7\3\7\3\7\3\b\3\b\3\b\3\b\3\b\7\b\u0088"+
+		"\n\b\f\b\16\b\u008b\13\b\3\t\3\t\5\t\u008f\n\t\3\t\5\t\u0092\n\t\3\n\3"+
+		"\n\3\n\3\n\5\n\u0098\n\n\3\13\3\13\3\f\3\f\3\f\5\f\u009f\n\f\3\r\3\r\3"+
+		"\r\3\16\3\16\5\16\u00a6\n\16\3\16\3\16\5\16\u00aa\n\16\3\17\3\17\3\17"+
+		"\3\17\3\20\3\20\3\20\7\20\u00b3\n\20\f\20\16\20\u00b6\13\20\3\21\3\21"+
+		"\3\22\3\22\3\22\3\22\5\22\u00be\n\22\3\23\3\23\3\23\3\24\3\24\3\24\3\25"+
+		"\3\25\5\25\u00c8\n\25\3\26\3\26\5\26\u00cc\n\26\3\27\3\27\5\27\u00d0\n"+
+		"\27\3\30\3\30\3\30\3\30\3\31\3\31\3\31\7\31\u00d9\n\31\f\31\16\31\u00dc"+
+		"\13\31\3\32\3\32\3\32\7\32\u00e1\n\32\f\32\16\32\u00e4\13\32\3\33\5\33"+
+		"\u00e7\n\33\3\33\3\33\3\34\3\34\3\34\3\34\3\34\5\34\u00f0\n\34\3\35\3"+
+		"\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\5"+
+		"\35\u0101\n\35\3\36\3\36\3\36\3\36\3\37\3\37\3\37\3\37\3 \3 \3 \3 \3 "+
+		"\7 \u0110\n \f \16 \u0113\13 \3 \3 \5 \u0117\n \3!\3!\3!\3!\3!\3!\3\""+
+		"\3\"\3\"\3\"\3\"\3\"\3#\3#\3#\3#\3#\3#\3$\3$\3$\3$\3$\5$\u0130\n$\3%\3"+
+		"%\3%\3%\3%\3%\3%\3%\5%\u013a\n%\3&\3&\3&\3&\3&\5&\u0141\n&\3\'\3\'\3\'"+
+		"\3\'\3\'\3\'\3\'\3\'\5\'\u014b\n\'\3(\3(\3(\3(\3)\3)\3*\3*\3*\3*\3*\3"+
+		"*\3*\3*\5*\u015b\n*\3+\3+\3,\3,\5,\u0161\n,\3-\3-\3-\2\2.\2\4\6\b\n\f"+
+		"\16\20\22\24\26\30\32\34\36 \"$&(*,.\60\62\64\668:<>@BDFHJLNPRTVX\2\7"+
+		"\3\2\16\17\3\2DE\3\2\'.\3\2/B\4\2GHLL\2\u0166\2[\3\2\2\2\4s\3\2\2\2\6"+
+		"u\3\2\2\2\b{\3\2\2\2\n}\3\2\2\2\f\177\3\2\2\2\16\u0082\3\2\2\2\20\u008c"+
+		"\3\2\2\2\22\u0097\3\2\2\2\24\u0099\3\2\2\2\26\u009b\3\2\2\2\30\u00a0\3"+
+		"\2\2\2\32\u00a3\3\2\2\2\34\u00ab\3\2\2\2\36\u00af\3\2\2\2 \u00b7\3\2\2"+
+		"\2\"\u00bd\3\2\2\2$\u00bf\3\2\2\2&\u00c2\3\2\2\2(\u00c7\3\2\2\2*\u00c9"+
+		"\3\2\2\2,\u00cd\3\2\2\2.\u00d1\3\2\2\2\60\u00d5\3\2\2\2\62\u00dd\3\2\2"+
+		"\2\64\u00e6\3\2\2\2\66\u00ef\3\2\2\28\u0100\3\2\2\2:\u0102\3\2\2\2<\u0106"+
+		"\3\2\2\2>\u0116\3\2\2\2@\u0118\3\2\2\2B\u011e\3\2\2\2D\u0124\3\2\2\2F"+
+		"\u012f\3\2\2\2H\u0139\3\2\2\2J\u0140\3\2\2\2L\u014a\3\2\2\2N\u014c\3\2"+
+		"\2\2P\u0150\3\2\2\2R\u015a\3\2\2\2T\u015c\3\2\2\2V\u0160\3\2\2\2X\u0162"+
+		"\3\2\2\2Z\\\5\6\4\2[Z\3\2\2\2[\\\3\2\2\2\\`\3\2\2\2]_\5\n\6\2^]\3\2\2"+
+		"\2_b\3\2\2\2`^\3\2\2\2`a\3\2\2\2ad\3\2\2\2b`\3\2\2\2ce\5\f\7\2dc\3\2\2"+
+		"\2de\3\2\2\2eg\3\2\2\2fh\5\16\b\2gf\3\2\2\2gh\3\2\2\2hj\3\2\2\2ik\5\26"+
+		"\f\2ji\3\2\2\2jk\3\2\2\2kl\3\2\2\2lm\7\2\2\3m\3\3\2\2\2no\7\3\2\2op\5"+
+		"\36\20\2pq\7\4\2\2qt\3\2\2\2rt\5\36\20\2sn\3\2\2\2sr\3\2\2\2t\5\3\2\2"+
+		"\2uw\7\5\2\2vx\5\b\5\2wv\3\2\2\2wx\3\2\2\2xy\3\2\2\2yz\5\4\3\2z\7\3\2"+
+		"\2\2{|\7\6\2\2|\t\3\2\2\2}~\5\32\16\2~\13\3\2\2\2\177\u0080\7\7\2\2\u0080"+
+		"\u0081\5\60\31\2\u0081\r\3\2\2\2\u0082\u0083\7\b\2\2\u0083\u0084\7\t\2"+
+		"\2\u0084\u0089\5\20\t\2\u0085\u0086\7\n\2\2\u0086\u0088\5\20\t\2\u0087"+
+		"\u0085\3\2\2\2\u0088\u008b\3\2\2\2\u0089\u0087\3\2\2\2\u0089\u008a\3\2"+
+		"\2\2\u008a\17\3\2\2\2\u008b\u0089\3\2\2\2\u008c\u008e\7D\2\2\u008d\u008f"+
+		"\5\24\13\2\u008e\u008d\3\2\2\2\u008e\u008f\3\2\2\2\u008f\u0091\3\2\2\2"+
+		"\u0090\u0092\5\22\n\2\u0091\u0090\3\2\2\2\u0091\u0092\3\2\2\2\u0092\21"+
+		"\3\2\2\2\u0093\u0094\7\13\2\2\u0094\u0098\7\f\2\2\u0095\u0096\7\13\2\2"+
+		"\u0096\u0098\7\r\2\2\u0097\u0093\3\2\2\2\u0097\u0095\3\2\2\2\u0098\23"+
+		"\3\2\2\2\u0099\u009a\t\2\2\2\u009a\25\3\2\2\2\u009b\u009c\7\20\2\2\u009c"+
+		"\u009e\7H\2\2\u009d\u009f\5\30\r\2\u009e\u009d\3\2\2\2\u009e\u009f\3\2"+
+		"\2\2\u009f\27\3\2\2\2\u00a0\u00a1\7\21\2\2\u00a1\u00a2\7H\2\2\u00a2\31"+
+		"\3\2\2\2\u00a3\u00a5\7\22\2\2\u00a4\u00a6\5(\25\2\u00a5\u00a4\3\2\2\2"+
+		"\u00a5\u00a6\3\2\2\2\u00a6\u00a7\3\2\2\2\u00a7\u00a9\5 \21\2\u00a8\u00aa"+
+		"\5\34\17\2\u00a9\u00a8\3\2\2\2\u00a9\u00aa\3\2\2\2\u00aa\33\3\2\2\2\u00ab"+
+		"\u00ac\7\3\2\2\u00ac\u00ad\5\36\20\2\u00ad\u00ae\7\4\2\2\u00ae\35\3\2"+
+		"\2\2\u00af\u00b4\5\"\22\2\u00b0\u00b1\7\n\2\2\u00b1\u00b3\5\"\22\2\u00b2"+
+		"\u00b0\3\2\2\2\u00b3\u00b6\3\2\2\2\u00b4\u00b2\3\2\2\2\u00b4\u00b5\3\2"+
+		"\2\2\u00b5\37\3\2\2\2\u00b6\u00b4\3\2\2\2\u00b7\u00b8\t\3\2\2\u00b8!\3"+
+		"\2\2\2\u00b9\u00be\7D\2\2\u00ba\u00be\5$\23\2\u00bb\u00be\5&\24\2\u00bc"+
+		"\u00be\7F\2\2\u00bd\u00b9\3\2\2\2\u00bd\u00ba\3\2\2\2\u00bd\u00bb\3\2"+
+		"\2\2\u00bd\u00bc\3\2\2\2\u00be#\3\2\2\2\u00bf\u00c0\7\23\2\2\u00c0\u00c1"+
+		"\5*\26\2\u00c1%\3\2\2\2\u00c2\u00c3\7\23\2\2\u00c3\u00c4\5,\27\2\u00c4"+
+		"\'\3\2\2\2\u00c5\u00c8\5*\26\2\u00c6\u00c8\5,\27\2\u00c7\u00c5\3\2\2\2"+
+		"\u00c7\u00c6\3\2\2\2\u00c8)\3\2\2\2\u00c9\u00cb\7\24\2\2\u00ca\u00cc\5"+
+		".\30\2\u00cb\u00ca\3\2\2\2\u00cb\u00cc\3\2\2\2\u00cc+\3\2\2\2\u00cd\u00cf"+
+		"\7\25\2\2\u00ce\u00d0\5.\30\2\u00cf\u00ce\3\2\2\2\u00cf\u00d0\3\2\2\2"+
+		"\u00d0-\3\2\2\2\u00d1\u00d2\7\3\2\2\u00d2\u00d3\7H\2\2\u00d3\u00d4\7\4"+
+		"\2\2\u00d4/\3\2\2\2\u00d5\u00da\5\62\32\2\u00d6\u00d7\7\26\2\2\u00d7\u00d9"+
+		"\5\62\32\2\u00d8\u00d6\3\2\2\2\u00d9\u00dc\3\2\2\2\u00da\u00d8\3\2\2\2"+
+		"\u00da\u00db\3\2\2\2\u00db\61\3\2\2\2\u00dc\u00da\3\2\2\2\u00dd\u00e2"+
+		"\5\64\33\2\u00de\u00df\7\27\2\2\u00df\u00e1\5\64\33\2\u00e0\u00de\3\2"+
+		"\2\2\u00e1\u00e4\3\2\2\2\u00e2\u00e0\3\2\2\2\u00e2\u00e3\3\2\2\2\u00e3"+
+		"\63\3\2\2\2\u00e4\u00e2\3\2\2\2\u00e5\u00e7\7\30\2\2\u00e6\u00e5\3\2\2"+
+		"\2\u00e6\u00e7\3\2\2\2\u00e7\u00e8\3\2\2\2\u00e8\u00e9\5\66\34\2\u00e9"+
+		"\65\3\2\2\2\u00ea\u00f0\58\35\2\u00eb\u00ec\7\3\2\2\u00ec\u00ed\5\60\31"+
+		"\2\u00ed\u00ee\7\4\2\2\u00ee\u00f0\3\2\2\2\u00ef\u00ea\3\2\2\2\u00ef\u00eb"+
+		"\3\2\2\2\u00f0\67\3\2\2\2\u00f1\u0101\5R*\2\u00f2\u0101\5N(\2\u00f3\u0101"+
+		"\5B\"\2\u00f4\u0101\5@!\2\u00f5\u0101\5D#\2\u00f6\u0101\5:\36\2\u00f7"+
+		"\u0101\5<\37\2\u00f8\u0101\5F$\2\u00f9\u0101\5H%\2\u00fa\u0101\5J&\2\u00fb"+
+		"\u0101\5L\'\2\u00fc\u00fd\7\3\2\2\u00fd\u00fe\58\35\2\u00fe\u00ff\7\4"+
+		"\2\2\u00ff\u0101\3\2\2\2\u0100\u00f1\3\2\2\2\u0100\u00f2\3\2\2\2\u0100"+
+		"\u00f3\3\2\2\2\u0100\u00f4\3\2\2\2\u0100\u00f5\3\2\2\2\u0100\u00f6\3\2"+
+		"\2\2\u0100\u00f7\3\2\2\2\u0100\u00f8\3\2\2\2\u0100\u00f9\3\2\2\2\u0100"+
+		"\u00fa\3\2\2\2\u0100\u00fb\3\2\2\2\u0100\u00fc\3\2\2\2\u01019\3\2\2\2"+
+		"\u0102\u0103\7D\2\2\u0103\u0104\7\31\2\2\u0104\u0105\5> \2\u0105;\3\2"+
+		"\2\2\u0106\u0107\7D\2\2\u0107\u0108\7\32\2\2\u0108\u0109\5> \2\u0109="+
+		"\3\2\2\2\u010a\u0117\7C\2\2\u010b\u010c\7\3\2\2\u010c\u0111\5V,\2\u010d"+
+		"\u010e\7\n\2\2\u010e\u0110\5V,\2\u010f\u010d\3\2\2\2\u0110\u0113\3\2\2"+
+		"\2\u0111\u010f\3\2\2\2\u0111\u0112\3\2\2\2\u0112\u0114\3\2\2\2\u0113\u0111"+
+		"\3\2\2\2\u0114\u0115\7\4\2\2\u0115\u0117\3\2\2\2\u0116\u010a\3\2\2\2\u0116"+
+		"\u010b\3\2\2\2\u0117?\3\2\2\2\u0118\u0119\7D\2\2\u0119\u011a\7\33\2\2"+
+		"\u011a\u011b\5V,\2\u011b\u011c\7\27\2\2\u011c\u011d\5V,\2\u011dA\3\2\2"+
+		"\2\u011e\u011f\7D\2\2\u011f\u0120\7\34\2\2\u0120\u0121\5V,\2\u0121\u0122"+
+		"\7\35\2\2\u0122\u0123\5V,\2\u0123C\3\2\2\2\u0124\u0125\5V,\2\u0125\u0126"+
+		"\7\33\2\2\u0126\u0127\7D\2\2\u0127\u0128\7\27\2\2\u0128\u0129\7D\2\2\u0129"+
+		"E\3\2\2\2\u012a\u012b\7D\2\2\u012b\u012c\7\36\2\2\u012c\u0130\7\37\2\2"+
+		"\u012d\u012e\7D\2\2\u012e\u0130\7 \2\2\u012f\u012a\3\2\2\2\u012f\u012d"+
+		"\3\2\2\2\u0130G\3\2\2\2\u0131\u0132\7D\2\2\u0132\u0133\7\36\2\2\u0133"+
+		"\u0134\7\30\2\2\u0134\u013a\7\37\2\2\u0135\u0136\7D\2\2\u0136\u013a\7"+
+		"!\2\2\u0137\u0138\7D\2\2\u0138\u013a\7\"\2\2\u0139\u0131\3\2\2\2\u0139"+
+		"\u0135\3\2\2\2\u0139\u0137\3\2\2\2\u013aI\3\2\2\2\u013b\u013c\7D\2\2\u013c"+
+		"\u013d\7\36\2\2\u013d\u0141\7#\2\2\u013e\u013f\7D\2\2\u013f\u0141\7$\2"+
+		"\2\u0140\u013b\3\2\2\2\u0140\u013e\3\2\2\2\u0141K\3\2\2\2\u0142\u0143"+
+		"\7D\2\2\u0143\u0144\7\36\2\2\u0144\u0145\7\30\2\2\u0145\u014b\7#\2\2\u0146"+
+		"\u0147\7D\2\2\u0147\u014b\7%\2\2\u0148\u0149\7D\2\2\u0149\u014b\7&\2\2"+
+		"\u014a\u0142\3\2\2\2\u014a\u0146\3\2\2\2\u014a\u0148\3\2\2\2\u014bM\3"+
+		"\2\2\2\u014c\u014d\7D\2\2\u014d\u014e\5P)\2\u014e\u014f\5V,\2\u014fO\3"+
+		"\2\2\2\u0150\u0151\t\4\2\2\u0151Q\3\2\2\2\u0152\u0153\7D\2\2\u0153\u0154"+
+		"\5T+\2\u0154\u0155\5V,\2\u0155\u015b\3\2\2\2\u0156\u0157\5V,\2\u0157\u0158"+
+		"\5T+\2\u0158\u0159\7D\2\2\u0159\u015b\3\2\2\2\u015a\u0152\3\2\2\2\u015a"+
+		"\u0156\3\2\2\2\u015bS\3\2\2\2\u015c\u015d\t\5\2\2\u015dU\3\2\2\2\u015e"+
+		"\u0161\5X-\2\u015f\u0161\7C\2\2\u0160\u015e\3\2\2\2\u0160\u015f\3\2\2"+
+		"\2\u0161W\3\2\2\2\u0162\u0163\t\6\2\2\u0163Y\3\2\2\2\"[`dgjsw\u0089\u008e"+
+		"\u0091\u0097\u009e\u00a5\u00a9\u00b4\u00bd\u00c7\u00cb\u00cf\u00da\u00e2"+
+		"\u00e6\u00ef\u0100\u0111\u0116\u012f\u0139\u0140\u014a\u015a\u0160";
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {
diff --git a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
index eac2aefdf..6feacaa30 100644
--- a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
@@ -14,7 +14,9 @@ import org.tests.model.basic.Customer;
 import org.tests.model.basic.OrderDetail;
 import org.tests.model.basic.ResetBasicData;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -36,6 +38,63 @@ public class EqlParserTest extends BaseTestCase {
     assertThat(query.getGeneratedSql()).contains("where t0.name = ?");
   }
 
+  @Test
+  public void where_eqOrNull_bindVal() {
+    Query<Customer> query = parse("where name eqOrNull 'Rob'");
+    query.findList();
+
+    assertThat(query.getGeneratedSql()).contains("where (t0.name = ? or t0.name is null)");
+  }
+
+  @Test
+  public void where_eqOrNull_bindNamed() {
+    Query<Customer> query = parse("where name eqOrNull :name");
+    query.setParameter("name", "Rob");
+    query.findList();
+
+    assertThat(query.getGeneratedSql()).contains("where (t0.name = ? or t0.name is null)");
+  }
+
+  @Test
+  public void where_eqOrNull_bindPositioned() {
+
+    final Query<Customer> query = where("name eqOrNull ?", "Rob");
+    query.findList();
+    if (isH2()) {
+      assertThat(query.getGeneratedSql()).contains("where (t0.name = ? or t0.name is null)");
+    }
+  }
+
+  @Test
+  public void where_eqOrNull_bindPositioned_asNull() {
+
+    final Query<Customer> query = where("name eqOrNull ?", (String)null);
+    query.findList();
+    if (isH2()) {
+      assertThat(query.getGeneratedSql()).contains("(t0.name is null or t0.name is null)");
+    }
+  }
+
+  @Test
+  public void where_gtOrNull_bindPositioned() {
+
+    final Query<Customer> query = where("name gtOrNull ?", "Rob");
+    query.findList();
+    if (isH2()) {
+      assertThat(query.getGeneratedSql()).contains("where (t0.name > ? or t0.name is null)");
+    }
+  }
+
+  @Test
+  public void where_ltOrNull_bindPositioned() {
+
+    final Query<Customer> query = where("name ltOrNull ?", "Rob");
+    query.findList();
+    if (isH2()) {
+      assertThat(query.getGeneratedSql()).contains("where (t0.name < ? or t0.name is null)");
+    }
+  }
+
   @Test
   public void where_eq_reverse() {
 
@@ -276,6 +335,62 @@ public class EqlParserTest extends BaseTestCase {
     platformAssertIn(query.getGeneratedSql(), "where t0.name");
   }
 
+  @Test
+  public void where_inOrEmpty_withVals() {
+
+    final Query<Customer> query = where("name inOrEmpty ?", Arrays.asList("Baz", "Maz", "Jim"));
+    query.findList();
+    platformAssertIn(query.getGeneratedSql(), "where t0.name");
+  }
+
+  @Test
+  public void where_inOrEmpty_withValsAsSet() {
+
+    final Query<Customer> query = where("name inOrEmpty ?", new HashSet<>(Arrays.asList("Baz", "Maz", "Jim")));
+    query.findList();
+    platformAssertIn(query.getGeneratedSql(), "where t0.name");
+  }
+
+  @Test
+  public void where_inOrEmpty_withEmpty() {
+
+    final Query<Customer> query = where("name inOrEmpty ?", new ArrayList());
+    query.findList();
+    assertThat(query.getGeneratedSql()).doesNotContain("where");
+  }
+
+  @Test
+  public void where_inOrEmpty_withNull() {
+
+    List<String> names = null;
+    final Query<Customer> query = where("name inOrEmpty ?", names);
+    query.findList();
+    assertThat(query.getGeneratedSql()).doesNotContain("where");
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void query_inOrEmpty_withVals() {
+
+    Query<Customer> query = parse("where name inOrEmpty (:names)");
+    query.setParameter("names", Arrays.asList("Baz", "Maz", "Jim"));
+    query.findList();
+
+    platformAssertIn(query.getGeneratedSql(), "where t0.name");
+  }
+
+  /**
+   * This test fails in that we can't use inOrEmpty with named parameters.
+   */
+  @Test(expected = IllegalArgumentException.class)
+  public void query_inOrEmpty_withNamedParams_expect_IllegalArgument() {
+
+    Query<Customer> query = parse("where name inOrEmpty (:names)");
+    query.setParameter("names", new ArrayList<>());
+    query.findList();
+
+    assertThat(query.getGeneratedSql()).doesNotContain("where");
+  }
+
   @Test
   public void where_inrange() {
 
diff --git a/src/test/resources/EQL.g4 b/src/test/resources/EQL.g4
index 121425b92..1a8904045 100644
--- a/src/test/resources/EQL.g4
+++ b/src/test/resources/EQL.g4
@@ -123,6 +123,7 @@ any_expression
    | inrange_expression
    | between_expression
    | propertyBetween_expression
+   | inOrEmpty_expression
    | in_expression
    | isNull_expression
    | isNotNull_expression
@@ -131,6 +132,10 @@ any_expression
    | '(' any_expression ')'
    ;
 
+inOrEmpty_expression
+   : PATH_VARIABLE 'inOrEmpty' in_value
+   ;
+
 in_expression
    : PATH_VARIABLE 'in' in_value
    ;
@@ -199,6 +204,7 @@ comparison_operator
    | '<>' | '!=' | 'ne'
    | 'ieq'
    | 'ine'
+   | 'eqOrNull' | 'gtOrNull' | 'ltOrNull'
    ;
 
 value_expression

From 464ed4322e7ccc771b5a7bf0b63ed853cbe1d473 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 15 Aug 2019 23:58:58 +1200
Subject: [PATCH 1012/1036] #1794 - Also support "inRange" camelcase version of
 "inrange" in EQL

---
 .../server/grammer/OperatorMapping.java       |   1 +
 .../server/grammer/antlr/EQL.interp           |   7 +-
 .../server/grammer/antlr/EQL.tokens           | 104 +--
 .../server/grammer/antlr/EQLBaseListener.java |  12 +
 .../server/grammer/antlr/EQLLexer.interp      |   7 +-
 .../server/grammer/antlr/EQLLexer.java        | 440 +++++-----
 .../server/grammer/antlr/EQLLexer.tokens      | 104 +--
 .../server/grammer/antlr/EQLListener.java     |  10 +
 .../server/grammer/antlr/EQLParser.java       | 782 ++++++++++--------
 .../server/grammer/EqlParserTest.java         |  21 +
 src/test/resources/EQL.g4                     |   6 +-
 11 files changed, 804 insertions(+), 690 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java b/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java
index e0e197a49..d3c193c6d 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java
@@ -42,6 +42,7 @@ class OperatorMapping {
     map.put("ilike", EqlOperator.ILIKE);
 
     map.put("inrange", EqlOperator.INRANGE);
+    map.put("inRange", EqlOperator.INRANGE);
     map.put("between", EqlOperator.BETWEEN);
     map.put("eqOrNull", EqlOperator.EQORNULL);
     map.put("gtOrNull", EqlOperator.GTORNULL);
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.interp b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.interp
index 507556a81..3dbccc3ba 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.interp
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.interp
@@ -25,8 +25,9 @@ null
 'inOrEmpty'
 'in'
 'between'
-'inrange'
 'to'
+'inrange'
+'inRange'
 'is'
 'null'
 'isNull'
@@ -142,6 +143,7 @@ null
 null
 null
 null
+null
 INPUT_VARIABLE
 PATH_VARIABLE
 QUOTED_PATH_VARIABLE
@@ -188,6 +190,7 @@ in_expression
 in_value
 between_expression
 inrange_expression
+inrange_op
 propertyBetween_expression
 isNull_expression
 isNotNull_expression
@@ -202,4 +205,4 @@ literal
 
 
 atn:
-[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 77, 357, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 4, 45, 9, 45, 3, 2, 5, 2, 92, 10, 2, 3, 2, 7, 2, 95, 10, 2, 12, 2, 14, 2, 98, 11, 2, 3, 2, 5, 2, 101, 10, 2, 3, 2, 5, 2, 104, 10, 2, 3, 2, 5, 2, 107, 10, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 3, 116, 10, 3, 3, 4, 3, 4, 5, 4, 120, 10, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 7, 8, 136, 10, 8, 12, 8, 14, 8, 139, 11, 8, 3, 9, 3, 9, 5, 9, 143, 10, 9, 3, 9, 5, 9, 146, 10, 9, 3, 10, 3, 10, 3, 10, 3, 10, 5, 10, 152, 10, 10, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 5, 12, 159, 10, 12, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 5, 14, 166, 10, 14, 3, 14, 3, 14, 5, 14, 170, 10, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 7, 16, 179, 10, 16, 12, 16, 14, 16, 182, 11, 16, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 18, 5, 18, 190, 10, 18, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 5, 21, 200, 10, 21, 3, 22, 3, 22, 5, 22, 204, 10, 22, 3, 23, 3, 23, 5, 23, 208, 10, 23, 3, 24, 3, 24, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 7, 25, 217, 10, 25, 12, 25, 14, 25, 220, 11, 25, 3, 26, 3, 26, 3, 26, 7, 26, 225, 10, 26, 12, 26, 14, 26, 228, 11, 26, 3, 27, 5, 27, 231, 10, 27, 3, 27, 3, 27, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 5, 28, 240, 10, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 5, 29, 257, 10, 29, 3, 30, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 7, 32, 272, 10, 32, 12, 32, 14, 32, 275, 11, 32, 3, 32, 3, 32, 5, 32, 279, 10, 32, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 5, 36, 304, 10, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 5, 37, 314, 10, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 5, 38, 321, 10, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 5, 39, 331, 10, 39, 3, 40, 3, 40, 3, 40, 3, 40, 3, 41, 3, 41, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 5, 42, 347, 10, 42, 3, 43, 3, 43, 3, 44, 3, 44, 5, 44, 353, 10, 44, 3, 45, 3, 45, 3, 45, 2, 2, 46, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 2, 7, 3, 2, 14, 15, 3, 2, 68, 69, 3, 2, 39, 46, 3, 2, 47, 66, 4, 2, 71, 72, 76, 76, 2, 358, 2, 91, 3, 2, 2, 2, 4, 115, 3, 2, 2, 2, 6, 117, 3, 2, 2, 2, 8, 123, 3, 2, 2, 2, 10, 125, 3, 2, 2, 2, 12, 127, 3, 2, 2, 2, 14, 130, 3, 2, 2, 2, 16, 140, 3, 2, 2, 2, 18, 151, 3, 2, 2, 2, 20, 153, 3, 2, 2, 2, 22, 155, 3, 2, 2, 2, 24, 160, 3, 2, 2, 2, 26, 163, 3, 2, 2, 2, 28, 171, 3, 2, 2, 2, 30, 175, 3, 2, 2, 2, 32, 183, 3, 2, 2, 2, 34, 189, 3, 2, 2, 2, 36, 191, 3, 2, 2, 2, 38, 194, 3, 2, 2, 2, 40, 199, 3, 2, 2, 2, 42, 201, 3, 2, 2, 2, 44, 205, 3, 2, 2, 2, 46, 209, 3, 2, 2, 2, 48, 213, 3, 2, 2, 2, 50, 221, 3, 2, 2, 2, 52, 230, 3, 2, 2, 2, 54, 239, 3, 2, 2, 2, 56, 256, 3, 2, 2, 2, 58, 258, 3, 2, 2, 2, 60, 262, 3, 2, 2, 2, 62, 278, 3, 2, 2, 2, 64, 280, 3, 2, 2, 2, 66, 286, 3, 2, 2, 2, 68, 292, 3, 2, 2, 2, 70, 303, 3, 2, 2, 2, 72, 313, 3, 2, 2, 2, 74, 320, 3, 2, 2, 2, 76, 330, 3, 2, 2, 2, 78, 332, 3, 2, 2, 2, 80, 336, 3, 2, 2, 2, 82, 346, 3, 2, 2, 2, 84, 348, 3, 2, 2, 2, 86, 352, 3, 2, 2, 2, 88, 354, 3, 2, 2, 2, 90, 92, 5, 6, 4, 2, 91, 90, 3, 2, 2, 2, 91, 92, 3, 2, 2, 2, 92, 96, 3, 2, 2, 2, 93, 95, 5, 10, 6, 2, 94, 93, 3, 2, 2, 2, 95, 98, 3, 2, 2, 2, 96, 94, 3, 2, 2, 2, 96, 97, 3, 2, 2, 2, 97, 100, 3, 2, 2, 2, 98, 96, 3, 2, 2, 2, 99, 101, 5, 12, 7, 2, 100, 99, 3, 2, 2, 2, 100, 101, 3, 2, 2, 2, 101, 103, 3, 2, 2, 2, 102, 104, 5, 14, 8, 2, 103, 102, 3, 2, 2, 2, 103, 104, 3, 2, 2, 2, 104, 106, 3, 2, 2, 2, 105, 107, 5, 22, 12, 2, 106, 105, 3, 2, 2, 2, 106, 107, 3, 2, 2, 2, 107, 108, 3, 2, 2, 2, 108, 109, 7, 2, 2, 3, 109, 3, 3, 2, 2, 2, 110, 111, 7, 3, 2, 2, 111, 112, 5, 30, 16, 2, 112, 113, 7, 4, 2, 2, 113, 116, 3, 2, 2, 2, 114, 116, 5, 30, 16, 2, 115, 110, 3, 2, 2, 2, 115, 114, 3, 2, 2, 2, 116, 5, 3, 2, 2, 2, 117, 119, 7, 5, 2, 2, 118, 120, 5, 8, 5, 2, 119, 118, 3, 2, 2, 2, 119, 120, 3, 2, 2, 2, 120, 121, 3, 2, 2, 2, 121, 122, 5, 4, 3, 2, 122, 7, 3, 2, 2, 2, 123, 124, 7, 6, 2, 2, 124, 9, 3, 2, 2, 2, 125, 126, 5, 26, 14, 2, 126, 11, 3, 2, 2, 2, 127, 128, 7, 7, 2, 2, 128, 129, 5, 48, 25, 2, 129, 13, 3, 2, 2, 2, 130, 131, 7, 8, 2, 2, 131, 132, 7, 9, 2, 2, 132, 137, 5, 16, 9, 2, 133, 134, 7, 10, 2, 2, 134, 136, 5, 16, 9, 2, 135, 133, 3, 2, 2, 2, 136, 139, 3, 2, 2, 2, 137, 135, 3, 2, 2, 2, 137, 138, 3, 2, 2, 2, 138, 15, 3, 2, 2, 2, 139, 137, 3, 2, 2, 2, 140, 142, 7, 68, 2, 2, 141, 143, 5, 20, 11, 2, 142, 141, 3, 2, 2, 2, 142, 143, 3, 2, 2, 2, 143, 145, 3, 2, 2, 2, 144, 146, 5, 18, 10, 2, 145, 144, 3, 2, 2, 2, 145, 146, 3, 2, 2, 2, 146, 17, 3, 2, 2, 2, 147, 148, 7, 11, 2, 2, 148, 152, 7, 12, 2, 2, 149, 150, 7, 11, 2, 2, 150, 152, 7, 13, 2, 2, 151, 147, 3, 2, 2, 2, 151, 149, 3, 2, 2, 2, 152, 19, 3, 2, 2, 2, 153, 154, 9, 2, 2, 2, 154, 21, 3, 2, 2, 2, 155, 156, 7, 16, 2, 2, 156, 158, 7, 72, 2, 2, 157, 159, 5, 24, 13, 2, 158, 157, 3, 2, 2, 2, 158, 159, 3, 2, 2, 2, 159, 23, 3, 2, 2, 2, 160, 161, 7, 17, 2, 2, 161, 162, 7, 72, 2, 2, 162, 25, 3, 2, 2, 2, 163, 165, 7, 18, 2, 2, 164, 166, 5, 40, 21, 2, 165, 164, 3, 2, 2, 2, 165, 166, 3, 2, 2, 2, 166, 167, 3, 2, 2, 2, 167, 169, 5, 32, 17, 2, 168, 170, 5, 28, 15, 2, 169, 168, 3, 2, 2, 2, 169, 170, 3, 2, 2, 2, 170, 27, 3, 2, 2, 2, 171, 172, 7, 3, 2, 2, 172, 173, 5, 30, 16, 2, 173, 174, 7, 4, 2, 2, 174, 29, 3, 2, 2, 2, 175, 180, 5, 34, 18, 2, 176, 177, 7, 10, 2, 2, 177, 179, 5, 34, 18, 2, 178, 176, 3, 2, 2, 2, 179, 182, 3, 2, 2, 2, 180, 178, 3, 2, 2, 2, 180, 181, 3, 2, 2, 2, 181, 31, 3, 2, 2, 2, 182, 180, 3, 2, 2, 2, 183, 184, 9, 3, 2, 2, 184, 33, 3, 2, 2, 2, 185, 190, 7, 68, 2, 2, 186, 190, 5, 36, 19, 2, 187, 190, 5, 38, 20, 2, 188, 190, 7, 70, 2, 2, 189, 185, 3, 2, 2, 2, 189, 186, 3, 2, 2, 2, 189, 187, 3, 2, 2, 2, 189, 188, 3, 2, 2, 2, 190, 35, 3, 2, 2, 2, 191, 192, 7, 19, 2, 2, 192, 193, 5, 42, 22, 2, 193, 37, 3, 2, 2, 2, 194, 195, 7, 19, 2, 2, 195, 196, 5, 44, 23, 2, 196, 39, 3, 2, 2, 2, 197, 200, 5, 42, 22, 2, 198, 200, 5, 44, 23, 2, 199, 197, 3, 2, 2, 2, 199, 198, 3, 2, 2, 2, 200, 41, 3, 2, 2, 2, 201, 203, 7, 20, 2, 2, 202, 204, 5, 46, 24, 2, 203, 202, 3, 2, 2, 2, 203, 204, 3, 2, 2, 2, 204, 43, 3, 2, 2, 2, 205, 207, 7, 21, 2, 2, 206, 208, 5, 46, 24, 2, 207, 206, 3, 2, 2, 2, 207, 208, 3, 2, 2, 2, 208, 45, 3, 2, 2, 2, 209, 210, 7, 3, 2, 2, 210, 211, 7, 72, 2, 2, 211, 212, 7, 4, 2, 2, 212, 47, 3, 2, 2, 2, 213, 218, 5, 50, 26, 2, 214, 215, 7, 22, 2, 2, 215, 217, 5, 50, 26, 2, 216, 214, 3, 2, 2, 2, 217, 220, 3, 2, 2, 2, 218, 216, 3, 2, 2, 2, 218, 219, 3, 2, 2, 2, 219, 49, 3, 2, 2, 2, 220, 218, 3, 2, 2, 2, 221, 226, 5, 52, 27, 2, 222, 223, 7, 23, 2, 2, 223, 225, 5, 52, 27, 2, 224, 222, 3, 2, 2, 2, 225, 228, 3, 2, 2, 2, 226, 224, 3, 2, 2, 2, 226, 227, 3, 2, 2, 2, 227, 51, 3, 2, 2, 2, 228, 226, 3, 2, 2, 2, 229, 231, 7, 24, 2, 2, 230, 229, 3, 2, 2, 2, 230, 231, 3, 2, 2, 2, 231, 232, 3, 2, 2, 2, 232, 233, 5, 54, 28, 2, 233, 53, 3, 2, 2, 2, 234, 240, 5, 56, 29, 2, 235, 236, 7, 3, 2, 2, 236, 237, 5, 48, 25, 2, 237, 238, 7, 4, 2, 2, 238, 240, 3, 2, 2, 2, 239, 234, 3, 2, 2, 2, 239, 235, 3, 2, 2, 2, 240, 55, 3, 2, 2, 2, 241, 257, 5, 82, 42, 2, 242, 257, 5, 78, 40, 2, 243, 257, 5, 66, 34, 2, 244, 257, 5, 64, 33, 2, 245, 257, 5, 68, 35, 2, 246, 257, 5, 58, 30, 2, 247, 257, 5, 60, 31, 2, 248, 257, 5, 70, 36, 2, 249, 257, 5, 72, 37, 2, 250, 257, 5, 74, 38, 2, 251, 257, 5, 76, 39, 2, 252, 253, 7, 3, 2, 2, 253, 254, 5, 56, 29, 2, 254, 255, 7, 4, 2, 2, 255, 257, 3, 2, 2, 2, 256, 241, 3, 2, 2, 2, 256, 242, 3, 2, 2, 2, 256, 243, 3, 2, 2, 2, 256, 244, 3, 2, 2, 2, 256, 245, 3, 2, 2, 2, 256, 246, 3, 2, 2, 2, 256, 247, 3, 2, 2, 2, 256, 248, 3, 2, 2, 2, 256, 249, 3, 2, 2, 2, 256, 250, 3, 2, 2, 2, 256, 251, 3, 2, 2, 2, 256, 252, 3, 2, 2, 2, 257, 57, 3, 2, 2, 2, 258, 259, 7, 68, 2, 2, 259, 260, 7, 25, 2, 2, 260, 261, 5, 62, 32, 2, 261, 59, 3, 2, 2, 2, 262, 263, 7, 68, 2, 2, 263, 264, 7, 26, 2, 2, 264, 265, 5, 62, 32, 2, 265, 61, 3, 2, 2, 2, 266, 279, 7, 67, 2, 2, 267, 268, 7, 3, 2, 2, 268, 273, 5, 86, 44, 2, 269, 270, 7, 10, 2, 2, 270, 272, 5, 86, 44, 2, 271, 269, 3, 2, 2, 2, 272, 275, 3, 2, 2, 2, 273, 271, 3, 2, 2, 2, 273, 274, 3, 2, 2, 2, 274, 276, 3, 2, 2, 2, 275, 273, 3, 2, 2, 2, 276, 277, 7, 4, 2, 2, 277, 279, 3, 2, 2, 2, 278, 266, 3, 2, 2, 2, 278, 267, 3, 2, 2, 2, 279, 63, 3, 2, 2, 2, 280, 281, 7, 68, 2, 2, 281, 282, 7, 27, 2, 2, 282, 283, 5, 86, 44, 2, 283, 284, 7, 23, 2, 2, 284, 285, 5, 86, 44, 2, 285, 65, 3, 2, 2, 2, 286, 287, 7, 68, 2, 2, 287, 288, 7, 28, 2, 2, 288, 289, 5, 86, 44, 2, 289, 290, 7, 29, 2, 2, 290, 291, 5, 86, 44, 2, 291, 67, 3, 2, 2, 2, 292, 293, 5, 86, 44, 2, 293, 294, 7, 27, 2, 2, 294, 295, 7, 68, 2, 2, 295, 296, 7, 23, 2, 2, 296, 297, 7, 68, 2, 2, 297, 69, 3, 2, 2, 2, 298, 299, 7, 68, 2, 2, 299, 300, 7, 30, 2, 2, 300, 304, 7, 31, 2, 2, 301, 302, 7, 68, 2, 2, 302, 304, 7, 32, 2, 2, 303, 298, 3, 2, 2, 2, 303, 301, 3, 2, 2, 2, 304, 71, 3, 2, 2, 2, 305, 306, 7, 68, 2, 2, 306, 307, 7, 30, 2, 2, 307, 308, 7, 24, 2, 2, 308, 314, 7, 31, 2, 2, 309, 310, 7, 68, 2, 2, 310, 314, 7, 33, 2, 2, 311, 312, 7, 68, 2, 2, 312, 314, 7, 34, 2, 2, 313, 305, 3, 2, 2, 2, 313, 309, 3, 2, 2, 2, 313, 311, 3, 2, 2, 2, 314, 73, 3, 2, 2, 2, 315, 316, 7, 68, 2, 2, 316, 317, 7, 30, 2, 2, 317, 321, 7, 35, 2, 2, 318, 319, 7, 68, 2, 2, 319, 321, 7, 36, 2, 2, 320, 315, 3, 2, 2, 2, 320, 318, 3, 2, 2, 2, 321, 75, 3, 2, 2, 2, 322, 323, 7, 68, 2, 2, 323, 324, 7, 30, 2, 2, 324, 325, 7, 24, 2, 2, 325, 331, 7, 35, 2, 2, 326, 327, 7, 68, 2, 2, 327, 331, 7, 37, 2, 2, 328, 329, 7, 68, 2, 2, 329, 331, 7, 38, 2, 2, 330, 322, 3, 2, 2, 2, 330, 326, 3, 2, 2, 2, 330, 328, 3, 2, 2, 2, 331, 77, 3, 2, 2, 2, 332, 333, 7, 68, 2, 2, 333, 334, 5, 80, 41, 2, 334, 335, 5, 86, 44, 2, 335, 79, 3, 2, 2, 2, 336, 337, 9, 4, 2, 2, 337, 81, 3, 2, 2, 2, 338, 339, 7, 68, 2, 2, 339, 340, 5, 84, 43, 2, 340, 341, 5, 86, 44, 2, 341, 347, 3, 2, 2, 2, 342, 343, 5, 86, 44, 2, 343, 344, 5, 84, 43, 2, 344, 345, 7, 68, 2, 2, 345, 347, 3, 2, 2, 2, 346, 338, 3, 2, 2, 2, 346, 342, 3, 2, 2, 2, 347, 83, 3, 2, 2, 2, 348, 349, 9, 5, 2, 2, 349, 85, 3, 2, 2, 2, 350, 353, 5, 88, 45, 2, 351, 353, 7, 67, 2, 2, 352, 350, 3, 2, 2, 2, 352, 351, 3, 2, 2, 2, 353, 87, 3, 2, 2, 2, 354, 355, 9, 6, 2, 2, 355, 89, 3, 2, 2, 2, 34, 91, 96, 100, 103, 106, 115, 119, 137, 142, 145, 151, 158, 165, 169, 180, 189, 199, 203, 207, 218, 226, 230, 239, 256, 273, 278, 303, 313, 320, 330, 346, 352]
\ No newline at end of file
+[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 78, 361, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 4, 45, 9, 45, 4, 46, 9, 46, 3, 2, 5, 2, 94, 10, 2, 3, 2, 7, 2, 97, 10, 2, 12, 2, 14, 2, 100, 11, 2, 3, 2, 5, 2, 103, 10, 2, 3, 2, 5, 2, 106, 10, 2, 3, 2, 5, 2, 109, 10, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 3, 118, 10, 3, 3, 4, 3, 4, 5, 4, 122, 10, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 7, 8, 138, 10, 8, 12, 8, 14, 8, 141, 11, 8, 3, 9, 3, 9, 5, 9, 145, 10, 9, 3, 9, 5, 9, 148, 10, 9, 3, 10, 3, 10, 3, 10, 3, 10, 5, 10, 154, 10, 10, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 5, 12, 161, 10, 12, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 5, 14, 168, 10, 14, 3, 14, 3, 14, 5, 14, 172, 10, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 7, 16, 181, 10, 16, 12, 16, 14, 16, 184, 11, 16, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 18, 5, 18, 192, 10, 18, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 5, 21, 202, 10, 21, 3, 22, 3, 22, 5, 22, 206, 10, 22, 3, 23, 3, 23, 5, 23, 210, 10, 23, 3, 24, 3, 24, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 7, 25, 219, 10, 25, 12, 25, 14, 25, 222, 11, 25, 3, 26, 3, 26, 3, 26, 7, 26, 227, 10, 26, 12, 26, 14, 26, 230, 11, 26, 3, 27, 5, 27, 233, 10, 27, 3, 27, 3, 27, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 5, 28, 242, 10, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 5, 29, 259, 10, 29, 3, 30, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 7, 32, 274, 10, 32, 12, 32, 14, 32, 277, 11, 32, 3, 32, 3, 32, 5, 32, 281, 10, 32, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 5, 37, 308, 10, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 5, 38, 318, 10, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 5, 39, 325, 10, 39, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 5, 40, 335, 10, 40, 3, 41, 3, 41, 3, 41, 3, 41, 3, 42, 3, 42, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 5, 43, 351, 10, 43, 3, 44, 3, 44, 3, 45, 3, 45, 5, 45, 357, 10, 45, 3, 46, 3, 46, 3, 46, 2, 2, 47, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 2, 8, 3, 2, 14, 15, 3, 2, 69, 70, 3, 2, 29, 30, 3, 2, 40, 47, 3, 2, 48, 67, 4, 2, 72, 73, 77, 77, 2, 361, 2, 93, 3, 2, 2, 2, 4, 117, 3, 2, 2, 2, 6, 119, 3, 2, 2, 2, 8, 125, 3, 2, 2, 2, 10, 127, 3, 2, 2, 2, 12, 129, 3, 2, 2, 2, 14, 132, 3, 2, 2, 2, 16, 142, 3, 2, 2, 2, 18, 153, 3, 2, 2, 2, 20, 155, 3, 2, 2, 2, 22, 157, 3, 2, 2, 2, 24, 162, 3, 2, 2, 2, 26, 165, 3, 2, 2, 2, 28, 173, 3, 2, 2, 2, 30, 177, 3, 2, 2, 2, 32, 185, 3, 2, 2, 2, 34, 191, 3, 2, 2, 2, 36, 193, 3, 2, 2, 2, 38, 196, 3, 2, 2, 2, 40, 201, 3, 2, 2, 2, 42, 203, 3, 2, 2, 2, 44, 207, 3, 2, 2, 2, 46, 211, 3, 2, 2, 2, 48, 215, 3, 2, 2, 2, 50, 223, 3, 2, 2, 2, 52, 232, 3, 2, 2, 2, 54, 241, 3, 2, 2, 2, 56, 258, 3, 2, 2, 2, 58, 260, 3, 2, 2, 2, 60, 264, 3, 2, 2, 2, 62, 280, 3, 2, 2, 2, 64, 282, 3, 2, 2, 2, 66, 288, 3, 2, 2, 2, 68, 294, 3, 2, 2, 2, 70, 296, 3, 2, 2, 2, 72, 307, 3, 2, 2, 2, 74, 317, 3, 2, 2, 2, 76, 324, 3, 2, 2, 2, 78, 334, 3, 2, 2, 2, 80, 336, 3, 2, 2, 2, 82, 340, 3, 2, 2, 2, 84, 350, 3, 2, 2, 2, 86, 352, 3, 2, 2, 2, 88, 356, 3, 2, 2, 2, 90, 358, 3, 2, 2, 2, 92, 94, 5, 6, 4, 2, 93, 92, 3, 2, 2, 2, 93, 94, 3, 2, 2, 2, 94, 98, 3, 2, 2, 2, 95, 97, 5, 10, 6, 2, 96, 95, 3, 2, 2, 2, 97, 100, 3, 2, 2, 2, 98, 96, 3, 2, 2, 2, 98, 99, 3, 2, 2, 2, 99, 102, 3, 2, 2, 2, 100, 98, 3, 2, 2, 2, 101, 103, 5, 12, 7, 2, 102, 101, 3, 2, 2, 2, 102, 103, 3, 2, 2, 2, 103, 105, 3, 2, 2, 2, 104, 106, 5, 14, 8, 2, 105, 104, 3, 2, 2, 2, 105, 106, 3, 2, 2, 2, 106, 108, 3, 2, 2, 2, 107, 109, 5, 22, 12, 2, 108, 107, 3, 2, 2, 2, 108, 109, 3, 2, 2, 2, 109, 110, 3, 2, 2, 2, 110, 111, 7, 2, 2, 3, 111, 3, 3, 2, 2, 2, 112, 113, 7, 3, 2, 2, 113, 114, 5, 30, 16, 2, 114, 115, 7, 4, 2, 2, 115, 118, 3, 2, 2, 2, 116, 118, 5, 30, 16, 2, 117, 112, 3, 2, 2, 2, 117, 116, 3, 2, 2, 2, 118, 5, 3, 2, 2, 2, 119, 121, 7, 5, 2, 2, 120, 122, 5, 8, 5, 2, 121, 120, 3, 2, 2, 2, 121, 122, 3, 2, 2, 2, 122, 123, 3, 2, 2, 2, 123, 124, 5, 4, 3, 2, 124, 7, 3, 2, 2, 2, 125, 126, 7, 6, 2, 2, 126, 9, 3, 2, 2, 2, 127, 128, 5, 26, 14, 2, 128, 11, 3, 2, 2, 2, 129, 130, 7, 7, 2, 2, 130, 131, 5, 48, 25, 2, 131, 13, 3, 2, 2, 2, 132, 133, 7, 8, 2, 2, 133, 134, 7, 9, 2, 2, 134, 139, 5, 16, 9, 2, 135, 136, 7, 10, 2, 2, 136, 138, 5, 16, 9, 2, 137, 135, 3, 2, 2, 2, 138, 141, 3, 2, 2, 2, 139, 137, 3, 2, 2, 2, 139, 140, 3, 2, 2, 2, 140, 15, 3, 2, 2, 2, 141, 139, 3, 2, 2, 2, 142, 144, 7, 69, 2, 2, 143, 145, 5, 20, 11, 2, 144, 143, 3, 2, 2, 2, 144, 145, 3, 2, 2, 2, 145, 147, 3, 2, 2, 2, 146, 148, 5, 18, 10, 2, 147, 146, 3, 2, 2, 2, 147, 148, 3, 2, 2, 2, 148, 17, 3, 2, 2, 2, 149, 150, 7, 11, 2, 2, 150, 154, 7, 12, 2, 2, 151, 152, 7, 11, 2, 2, 152, 154, 7, 13, 2, 2, 153, 149, 3, 2, 2, 2, 153, 151, 3, 2, 2, 2, 154, 19, 3, 2, 2, 2, 155, 156, 9, 2, 2, 2, 156, 21, 3, 2, 2, 2, 157, 158, 7, 16, 2, 2, 158, 160, 7, 73, 2, 2, 159, 161, 5, 24, 13, 2, 160, 159, 3, 2, 2, 2, 160, 161, 3, 2, 2, 2, 161, 23, 3, 2, 2, 2, 162, 163, 7, 17, 2, 2, 163, 164, 7, 73, 2, 2, 164, 25, 3, 2, 2, 2, 165, 167, 7, 18, 2, 2, 166, 168, 5, 40, 21, 2, 167, 166, 3, 2, 2, 2, 167, 168, 3, 2, 2, 2, 168, 169, 3, 2, 2, 2, 169, 171, 5, 32, 17, 2, 170, 172, 5, 28, 15, 2, 171, 170, 3, 2, 2, 2, 171, 172, 3, 2, 2, 2, 172, 27, 3, 2, 2, 2, 173, 174, 7, 3, 2, 2, 174, 175, 5, 30, 16, 2, 175, 176, 7, 4, 2, 2, 176, 29, 3, 2, 2, 2, 177, 182, 5, 34, 18, 2, 178, 179, 7, 10, 2, 2, 179, 181, 5, 34, 18, 2, 180, 178, 3, 2, 2, 2, 181, 184, 3, 2, 2, 2, 182, 180, 3, 2, 2, 2, 182, 183, 3, 2, 2, 2, 183, 31, 3, 2, 2, 2, 184, 182, 3, 2, 2, 2, 185, 186, 9, 3, 2, 2, 186, 33, 3, 2, 2, 2, 187, 192, 7, 69, 2, 2, 188, 192, 5, 36, 19, 2, 189, 192, 5, 38, 20, 2, 190, 192, 7, 71, 2, 2, 191, 187, 3, 2, 2, 2, 191, 188, 3, 2, 2, 2, 191, 189, 3, 2, 2, 2, 191, 190, 3, 2, 2, 2, 192, 35, 3, 2, 2, 2, 193, 194, 7, 19, 2, 2, 194, 195, 5, 42, 22, 2, 195, 37, 3, 2, 2, 2, 196, 197, 7, 19, 2, 2, 197, 198, 5, 44, 23, 2, 198, 39, 3, 2, 2, 2, 199, 202, 5, 42, 22, 2, 200, 202, 5, 44, 23, 2, 201, 199, 3, 2, 2, 2, 201, 200, 3, 2, 2, 2, 202, 41, 3, 2, 2, 2, 203, 205, 7, 20, 2, 2, 204, 206, 5, 46, 24, 2, 205, 204, 3, 2, 2, 2, 205, 206, 3, 2, 2, 2, 206, 43, 3, 2, 2, 2, 207, 209, 7, 21, 2, 2, 208, 210, 5, 46, 24, 2, 209, 208, 3, 2, 2, 2, 209, 210, 3, 2, 2, 2, 210, 45, 3, 2, 2, 2, 211, 212, 7, 3, 2, 2, 212, 213, 7, 73, 2, 2, 213, 214, 7, 4, 2, 2, 214, 47, 3, 2, 2, 2, 215, 220, 5, 50, 26, 2, 216, 217, 7, 22, 2, 2, 217, 219, 5, 50, 26, 2, 218, 216, 3, 2, 2, 2, 219, 222, 3, 2, 2, 2, 220, 218, 3, 2, 2, 2, 220, 221, 3, 2, 2, 2, 221, 49, 3, 2, 2, 2, 222, 220, 3, 2, 2, 2, 223, 228, 5, 52, 27, 2, 224, 225, 7, 23, 2, 2, 225, 227, 5, 52, 27, 2, 226, 224, 3, 2, 2, 2, 227, 230, 3, 2, 2, 2, 228, 226, 3, 2, 2, 2, 228, 229, 3, 2, 2, 2, 229, 51, 3, 2, 2, 2, 230, 228, 3, 2, 2, 2, 231, 233, 7, 24, 2, 2, 232, 231, 3, 2, 2, 2, 232, 233, 3, 2, 2, 2, 233, 234, 3, 2, 2, 2, 234, 235, 5, 54, 28, 2, 235, 53, 3, 2, 2, 2, 236, 242, 5, 56, 29, 2, 237, 238, 7, 3, 2, 2, 238, 239, 5, 48, 25, 2, 239, 240, 7, 4, 2, 2, 240, 242, 3, 2, 2, 2, 241, 236, 3, 2, 2, 2, 241, 237, 3, 2, 2, 2, 242, 55, 3, 2, 2, 2, 243, 259, 5, 84, 43, 2, 244, 259, 5, 80, 41, 2, 245, 259, 5, 66, 34, 2, 246, 259, 5, 64, 33, 2, 247, 259, 5, 70, 36, 2, 248, 259, 5, 58, 30, 2, 249, 259, 5, 60, 31, 2, 250, 259, 5, 72, 37, 2, 251, 259, 5, 74, 38, 2, 252, 259, 5, 76, 39, 2, 253, 259, 5, 78, 40, 2, 254, 255, 7, 3, 2, 2, 255, 256, 5, 56, 29, 2, 256, 257, 7, 4, 2, 2, 257, 259, 3, 2, 2, 2, 258, 243, 3, 2, 2, 2, 258, 244, 3, 2, 2, 2, 258, 245, 3, 2, 2, 2, 258, 246, 3, 2, 2, 2, 258, 247, 3, 2, 2, 2, 258, 248, 3, 2, 2, 2, 258, 249, 3, 2, 2, 2, 258, 250, 3, 2, 2, 2, 258, 251, 3, 2, 2, 2, 258, 252, 3, 2, 2, 2, 258, 253, 3, 2, 2, 2, 258, 254, 3, 2, 2, 2, 259, 57, 3, 2, 2, 2, 260, 261, 7, 69, 2, 2, 261, 262, 7, 25, 2, 2, 262, 263, 5, 62, 32, 2, 263, 59, 3, 2, 2, 2, 264, 265, 7, 69, 2, 2, 265, 266, 7, 26, 2, 2, 266, 267, 5, 62, 32, 2, 267, 61, 3, 2, 2, 2, 268, 281, 7, 68, 2, 2, 269, 270, 7, 3, 2, 2, 270, 275, 5, 88, 45, 2, 271, 272, 7, 10, 2, 2, 272, 274, 5, 88, 45, 2, 273, 271, 3, 2, 2, 2, 274, 277, 3, 2, 2, 2, 275, 273, 3, 2, 2, 2, 275, 276, 3, 2, 2, 2, 276, 278, 3, 2, 2, 2, 277, 275, 3, 2, 2, 2, 278, 279, 7, 4, 2, 2, 279, 281, 3, 2, 2, 2, 280, 268, 3, 2, 2, 2, 280, 269, 3, 2, 2, 2, 281, 63, 3, 2, 2, 2, 282, 283, 7, 69, 2, 2, 283, 284, 7, 27, 2, 2, 284, 285, 5, 88, 45, 2, 285, 286, 7, 23, 2, 2, 286, 287, 5, 88, 45, 2, 287, 65, 3, 2, 2, 2, 288, 289, 7, 69, 2, 2, 289, 290, 5, 68, 35, 2, 290, 291, 5, 88, 45, 2, 291, 292, 7, 28, 2, 2, 292, 293, 5, 88, 45, 2, 293, 67, 3, 2, 2, 2, 294, 295, 9, 4, 2, 2, 295, 69, 3, 2, 2, 2, 296, 297, 5, 88, 45, 2, 297, 298, 7, 27, 2, 2, 298, 299, 7, 69, 2, 2, 299, 300, 7, 23, 2, 2, 300, 301, 7, 69, 2, 2, 301, 71, 3, 2, 2, 2, 302, 303, 7, 69, 2, 2, 303, 304, 7, 31, 2, 2, 304, 308, 7, 32, 2, 2, 305, 306, 7, 69, 2, 2, 306, 308, 7, 33, 2, 2, 307, 302, 3, 2, 2, 2, 307, 305, 3, 2, 2, 2, 308, 73, 3, 2, 2, 2, 309, 310, 7, 69, 2, 2, 310, 311, 7, 31, 2, 2, 311, 312, 7, 24, 2, 2, 312, 318, 7, 32, 2, 2, 313, 314, 7, 69, 2, 2, 314, 318, 7, 34, 2, 2, 315, 316, 7, 69, 2, 2, 316, 318, 7, 35, 2, 2, 317, 309, 3, 2, 2, 2, 317, 313, 3, 2, 2, 2, 317, 315, 3, 2, 2, 2, 318, 75, 3, 2, 2, 2, 319, 320, 7, 69, 2, 2, 320, 321, 7, 31, 2, 2, 321, 325, 7, 36, 2, 2, 322, 323, 7, 69, 2, 2, 323, 325, 7, 37, 2, 2, 324, 319, 3, 2, 2, 2, 324, 322, 3, 2, 2, 2, 325, 77, 3, 2, 2, 2, 326, 327, 7, 69, 2, 2, 327, 328, 7, 31, 2, 2, 328, 329, 7, 24, 2, 2, 329, 335, 7, 36, 2, 2, 330, 331, 7, 69, 2, 2, 331, 335, 7, 38, 2, 2, 332, 333, 7, 69, 2, 2, 333, 335, 7, 39, 2, 2, 334, 326, 3, 2, 2, 2, 334, 330, 3, 2, 2, 2, 334, 332, 3, 2, 2, 2, 335, 79, 3, 2, 2, 2, 336, 337, 7, 69, 2, 2, 337, 338, 5, 82, 42, 2, 338, 339, 5, 88, 45, 2, 339, 81, 3, 2, 2, 2, 340, 341, 9, 5, 2, 2, 341, 83, 3, 2, 2, 2, 342, 343, 7, 69, 2, 2, 343, 344, 5, 86, 44, 2, 344, 345, 5, 88, 45, 2, 345, 351, 3, 2, 2, 2, 346, 347, 5, 88, 45, 2, 347, 348, 5, 86, 44, 2, 348, 349, 7, 69, 2, 2, 349, 351, 3, 2, 2, 2, 350, 342, 3, 2, 2, 2, 350, 346, 3, 2, 2, 2, 351, 85, 3, 2, 2, 2, 352, 353, 9, 6, 2, 2, 353, 87, 3, 2, 2, 2, 354, 357, 5, 90, 46, 2, 355, 357, 7, 68, 2, 2, 356, 354, 3, 2, 2, 2, 356, 355, 3, 2, 2, 2, 357, 89, 3, 2, 2, 2, 358, 359, 9, 7, 2, 2, 359, 91, 3, 2, 2, 2, 34, 93, 98, 102, 105, 108, 117, 121, 139, 144, 147, 153, 160, 167, 171, 182, 191, 201, 205, 209, 220, 228, 232, 241, 258, 275, 280, 307, 317, 324, 334, 350, 356]
\ No newline at end of file
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens
index 8a595f026..ec5d9571b 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens
@@ -62,17 +62,18 @@ T__60=61
 T__61=62
 T__62=63
 T__63=64
-INPUT_VARIABLE=65
-PATH_VARIABLE=66
-QUOTED_PATH_VARIABLE=67
-PROP_FORMULA=68
-BOOLEAN_LITERAL=69
-NUMBER_LITERAL=70
-DOUBLE=71
-INT=72
-ZERO=73
-STRING_LITERAL=74
-WS=75
+T__64=65
+INPUT_VARIABLE=66
+PATH_VARIABLE=67
+QUOTED_PATH_VARIABLE=68
+PROP_FORMULA=69
+BOOLEAN_LITERAL=70
+NUMBER_LITERAL=71
+DOUBLE=72
+INT=73
+ZERO=74
+STRING_LITERAL=75
+WS=76
 '('=1
 ')'=2
 'select'=3
@@ -98,43 +99,44 @@ WS=75
 'inOrEmpty'=23
 'in'=24
 'between'=25
-'inrange'=26
-'to'=27
-'is'=28
-'null'=29
-'isNull'=30
-'isNotNull'=31
-'notNull'=32
-'empty'=33
-'isEmpty'=34
-'isNotEmpty'=35
-'notEmpty'=36
-'like'=37
-'ilike'=38
-'contains'=39
-'icontains'=40
-'startsWith'=41
-'istartsWith'=42
-'endsWith'=43
-'iendsWith'=44
-'='=45
-'eq'=46
-'>'=47
-'gt'=48
-'>='=49
-'ge'=50
-'gte'=51
-'<'=52
-'lt'=53
-'<='=54
-'le'=55
-'lte'=56
-'<>'=57
-'!='=58
-'ne'=59
-'ieq'=60
-'ine'=61
-'eqOrNull'=62
-'gtOrNull'=63
-'ltOrNull'=64
-'0'=73
+'to'=26
+'inrange'=27
+'inRange'=28
+'is'=29
+'null'=30
+'isNull'=31
+'isNotNull'=32
+'notNull'=33
+'empty'=34
+'isEmpty'=35
+'isNotEmpty'=36
+'notEmpty'=37
+'like'=38
+'ilike'=39
+'contains'=40
+'icontains'=41
+'startsWith'=42
+'istartsWith'=43
+'endsWith'=44
+'iendsWith'=45
+'='=46
+'eq'=47
+'>'=48
+'gt'=49
+'>='=50
+'ge'=51
+'gte'=52
+'<'=53
+'lt'=54
+'<='=55
+'le'=56
+'lte'=57
+'<>'=58
+'!='=59
+'ne'=60
+'ieq'=61
+'ine'=62
+'eqOrNull'=63
+'gtOrNull'=64
+'ltOrNull'=65
+'0'=74
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
index 0d295160a..1da226018 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
@@ -407,6 +407,18 @@ public class EQLBaseListener implements EQLListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitInrange_expression(EQLParser.Inrange_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterInrange_op(EQLParser.Inrange_opContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitInrange_op(EQLParser.Inrange_opContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp
index 56b063fbf..f52d40a4f 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp
@@ -25,8 +25,9 @@ null
 'inOrEmpty'
 'in'
 'between'
-'inrange'
 'to'
+'inrange'
+'inRange'
 'is'
 'null'
 'isNull'
@@ -142,6 +143,7 @@ null
 null
 null
 null
+null
 INPUT_VARIABLE
 PATH_VARIABLE
 QUOTED_PATH_VARIABLE
@@ -219,6 +221,7 @@ T__60
 T__61
 T__62
 T__63
+T__64
 INPUT_VARIABLE
 PATH_VARIABLE
 QUOTED_PATH_VARIABLE
@@ -239,4 +242,4 @@ mode names:
 DEFAULT_MODE
 
 atn:
-[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 77, 639, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 4, 45, 9, 45, 4, 46, 9, 46, 4, 47, 9, 47, 4, 48, 9, 48, 4, 49, 9, 49, 4, 50, 9, 50, 4, 51, 9, 51, 4, 52, 9, 52, 4, 53, 9, 53, 4, 54, 9, 54, 4, 55, 9, 55, 4, 56, 9, 56, 4, 57, 9, 57, 4, 58, 9, 58, 4, 59, 9, 59, 4, 60, 9, 60, 4, 61, 9, 61, 4, 62, 9, 62, 4, 63, 9, 63, 4, 64, 9, 64, 4, 65, 9, 65, 4, 66, 9, 66, 4, 67, 9, 67, 4, 68, 9, 68, 4, 69, 9, 69, 4, 70, 9, 70, 4, 71, 9, 71, 4, 72, 9, 72, 4, 73, 9, 73, 4, 74, 9, 74, 4, 75, 9, 75, 4, 76, 9, 76, 3, 2, 3, 2, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 23, 3, 23, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 28, 3, 28, 3, 28, 3, 29, 3, 29, 3, 29, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 45, 3, 45, 3, 45, 3, 45, 3, 45, 3, 45, 3, 45, 3, 45, 3, 45, 3, 45, 3, 46, 3, 46, 3, 47, 3, 47, 3, 47, 3, 48, 3, 48, 3, 49, 3, 49, 3, 49, 3, 50, 3, 50, 3, 50, 3, 51, 3, 51, 3, 51, 3, 52, 3, 52, 3, 52, 3, 52, 3, 53, 3, 53, 3, 54, 3, 54, 3, 54, 3, 55, 3, 55, 3, 55, 3, 56, 3, 56, 3, 56, 3, 57, 3, 57, 3, 57, 3, 57, 3, 58, 3, 58, 3, 58, 3, 59, 3, 59, 3, 59, 3, 60, 3, 60, 3, 60, 3, 61, 3, 61, 3, 61, 3, 61, 3, 62, 3, 62, 3, 62, 3, 62, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 66, 3, 66, 3, 66, 7, 66, 513, 10, 66, 12, 66, 14, 66, 516, 11, 66, 3, 66, 3, 66, 7, 66, 520, 10, 66, 12, 66, 14, 66, 523, 11, 66, 5, 66, 525, 10, 66, 3, 67, 3, 67, 7, 67, 529, 10, 67, 12, 67, 14, 67, 532, 11, 67, 3, 68, 3, 68, 3, 68, 3, 68, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 5, 69, 580, 10, 69, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 5, 70, 591, 10, 70, 3, 71, 5, 71, 594, 10, 71, 3, 71, 3, 71, 5, 71, 598, 10, 71, 3, 71, 3, 71, 5, 71, 602, 10, 71, 3, 72, 6, 72, 605, 10, 72, 13, 72, 14, 72, 606, 3, 72, 3, 72, 7, 72, 611, 10, 72, 12, 72, 14, 72, 614, 11, 72, 3, 73, 3, 73, 7, 73, 618, 10, 73, 12, 73, 14, 73, 621, 11, 73, 3, 74, 3, 74, 3, 75, 3, 75, 3, 75, 3, 75, 7, 75, 629, 10, 75, 12, 75, 14, 75, 632, 11, 75, 3, 75, 3, 75, 3, 76, 3, 76, 3, 76, 3, 76, 2, 2, 77, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13, 8, 15, 9, 17, 10, 19, 11, 21, 12, 23, 13, 25, 14, 27, 15, 29, 16, 31, 17, 33, 18, 35, 19, 37, 20, 39, 21, 41, 22, 43, 23, 45, 24, 47, 25, 49, 26, 51, 27, 53, 28, 55, 29, 57, 30, 59, 31, 61, 32, 63, 33, 65, 34, 67, 35, 69, 36, 71, 37, 73, 38, 75, 39, 77, 40, 79, 41, 81, 42, 83, 43, 85, 44, 87, 45, 89, 46, 91, 47, 93, 48, 95, 49, 97, 50, 99, 51, 101, 52, 103, 53, 105, 54, 107, 55, 109, 56, 111, 57, 113, 58, 115, 59, 117, 60, 119, 61, 121, 62, 123, 63, 125, 64, 127, 65, 129, 66, 131, 67, 133, 68, 135, 69, 137, 70, 139, 71, 141, 72, 143, 73, 145, 74, 147, 75, 149, 76, 151, 77, 3, 2, 9, 5, 2, 67, 92, 97, 97, 99, 124, 6, 2, 50, 59, 67, 92, 97, 97, 99, 124, 7, 2, 48, 48, 50, 59, 67, 92, 97, 97, 99, 124, 3, 2, 50, 59, 3, 2, 51, 59, 3, 2, 41, 41, 5, 2, 11, 12, 15, 15, 34, 34, 2, 656, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 2, 35, 3, 2, 2, 2, 2, 37, 3, 2, 2, 2, 2, 39, 3, 2, 2, 2, 2, 41, 3, 2, 2, 2, 2, 43, 3, 2, 2, 2, 2, 45, 3, 2, 2, 2, 2, 47, 3, 2, 2, 2, 2, 49, 3, 2, 2, 2, 2, 51, 3, 2, 2, 2, 2, 53, 3, 2, 2, 2, 2, 55, 3, 2, 2, 2, 2, 57, 3, 2, 2, 2, 2, 59, 3, 2, 2, 2, 2, 61, 3, 2, 2, 2, 2, 63, 3, 2, 2, 2, 2, 65, 3, 2, 2, 2, 2, 67, 3, 2, 2, 2, 2, 69, 3, 2, 2, 2, 2, 71, 3, 2, 2, 2, 2, 73, 3, 2, 2, 2, 2, 75, 3, 2, 2, 2, 2, 77, 3, 2, 2, 2, 2, 79, 3, 2, 2, 2, 2, 81, 3, 2, 2, 2, 2, 83, 3, 2, 2, 2, 2, 85, 3, 2, 2, 2, 2, 87, 3, 2, 2, 2, 2, 89, 3, 2, 2, 2, 2, 91, 3, 2, 2, 2, 2, 93, 3, 2, 2, 2, 2, 95, 3, 2, 2, 2, 2, 97, 3, 2, 2, 2, 2, 99, 3, 2, 2, 2, 2, 101, 3, 2, 2, 2, 2, 103, 3, 2, 2, 2, 2, 105, 3, 2, 2, 2, 2, 107, 3, 2, 2, 2, 2, 109, 3, 2, 2, 2, 2, 111, 3, 2, 2, 2, 2, 113, 3, 2, 2, 2, 2, 115, 3, 2, 2, 2, 2, 117, 3, 2, 2, 2, 2, 119, 3, 2, 2, 2, 2, 121, 3, 2, 2, 2, 2, 123, 3, 2, 2, 2, 2, 125, 3, 2, 2, 2, 2, 127, 3, 2, 2, 2, 2, 129, 3, 2, 2, 2, 2, 131, 3, 2, 2, 2, 2, 133, 3, 2, 2, 2, 2, 135, 3, 2, 2, 2, 2, 137, 3, 2, 2, 2, 2, 139, 3, 2, 2, 2, 2, 141, 3, 2, 2, 2, 2, 143, 3, 2, 2, 2, 2, 145, 3, 2, 2, 2, 2, 147, 3, 2, 2, 2, 2, 149, 3, 2, 2, 2, 2, 151, 3, 2, 2, 2, 3, 153, 3, 2, 2, 2, 5, 155, 3, 2, 2, 2, 7, 157, 3, 2, 2, 2, 9, 164, 3, 2, 2, 2, 11, 173, 3, 2, 2, 2, 13, 179, 3, 2, 2, 2, 15, 185, 3, 2, 2, 2, 17, 188, 3, 2, 2, 2, 19, 190, 3, 2, 2, 2, 21, 196, 3, 2, 2, 2, 23, 202, 3, 2, 2, 2, 25, 207, 3, 2, 2, 2, 27, 211, 3, 2, 2, 2, 29, 216, 3, 2, 2, 2, 31, 222, 3, 2, 2, 2, 33, 229, 3, 2, 2, 2, 35, 235, 3, 2, 2, 2, 37, 237, 3, 2, 2, 2, 39, 243, 3, 2, 2, 2, 41, 248, 3, 2, 2, 2, 43, 251, 3, 2, 2, 2, 45, 255, 3, 2, 2, 2, 47, 259, 3, 2, 2, 2, 49, 269, 3, 2, 2, 2, 51, 272, 3, 2, 2, 2, 53, 280, 3, 2, 2, 2, 55, 288, 3, 2, 2, 2, 57, 291, 3, 2, 2, 2, 59, 294, 3, 2, 2, 2, 61, 299, 3, 2, 2, 2, 63, 306, 3, 2, 2, 2, 65, 316, 3, 2, 2, 2, 67, 324, 3, 2, 2, 2, 69, 330, 3, 2, 2, 2, 71, 338, 3, 2, 2, 2, 73, 349, 3, 2, 2, 2, 75, 358, 3, 2, 2, 2, 77, 363, 3, 2, 2, 2, 79, 369, 3, 2, 2, 2, 81, 378, 3, 2, 2, 2, 83, 388, 3, 2, 2, 2, 85, 399, 3, 2, 2, 2, 87, 411, 3, 2, 2, 2, 89, 420, 3, 2, 2, 2, 91, 430, 3, 2, 2, 2, 93, 432, 3, 2, 2, 2, 95, 435, 3, 2, 2, 2, 97, 437, 3, 2, 2, 2, 99, 440, 3, 2, 2, 2, 101, 443, 3, 2, 2, 2, 103, 446, 3, 2, 2, 2, 105, 450, 3, 2, 2, 2, 107, 452, 3, 2, 2, 2, 109, 455, 3, 2, 2, 2, 111, 458, 3, 2, 2, 2, 113, 461, 3, 2, 2, 2, 115, 465, 3, 2, 2, 2, 117, 468, 3, 2, 2, 2, 119, 471, 3, 2, 2, 2, 121, 474, 3, 2, 2, 2, 123, 478, 3, 2, 2, 2, 125, 482, 3, 2, 2, 2, 127, 491, 3, 2, 2, 2, 129, 500, 3, 2, 2, 2, 131, 524, 3, 2, 2, 2, 133, 526, 3, 2, 2, 2, 135, 533, 3, 2, 2, 2, 137, 579, 3, 2, 2, 2, 139, 590, 3, 2, 2, 2, 141, 601, 3, 2, 2, 2, 143, 604, 3, 2, 2, 2, 145, 615, 3, 2, 2, 2, 147, 622, 3, 2, 2, 2, 149, 624, 3, 2, 2, 2, 151, 635, 3, 2, 2, 2, 153, 154, 7, 42, 2, 2, 154, 4, 3, 2, 2, 2, 155, 156, 7, 43, 2, 2, 156, 6, 3, 2, 2, 2, 157, 158, 7, 117, 2, 2, 158, 159, 7, 103, 2, 2, 159, 160, 7, 110, 2, 2, 160, 161, 7, 103, 2, 2, 161, 162, 7, 101, 2, 2, 162, 163, 7, 118, 2, 2, 163, 8, 3, 2, 2, 2, 164, 165, 7, 102, 2, 2, 165, 166, 7, 107, 2, 2, 166, 167, 7, 117, 2, 2, 167, 168, 7, 118, 2, 2, 168, 169, 7, 107, 2, 2, 169, 170, 7, 112, 2, 2, 170, 171, 7, 101, 2, 2, 171, 172, 7, 118, 2, 2, 172, 10, 3, 2, 2, 2, 173, 174, 7, 121, 2, 2, 174, 175, 7, 106, 2, 2, 175, 176, 7, 103, 2, 2, 176, 177, 7, 116, 2, 2, 177, 178, 7, 103, 2, 2, 178, 12, 3, 2, 2, 2, 179, 180, 7, 113, 2, 2, 180, 181, 7, 116, 2, 2, 181, 182, 7, 102, 2, 2, 182, 183, 7, 103, 2, 2, 183, 184, 7, 116, 2, 2, 184, 14, 3, 2, 2, 2, 185, 186, 7, 100, 2, 2, 186, 187, 7, 123, 2, 2, 187, 16, 3, 2, 2, 2, 188, 189, 7, 46, 2, 2, 189, 18, 3, 2, 2, 2, 190, 191, 7, 112, 2, 2, 191, 192, 7, 119, 2, 2, 192, 193, 7, 110, 2, 2, 193, 194, 7, 110, 2, 2, 194, 195, 7, 117, 2, 2, 195, 20, 3, 2, 2, 2, 196, 197, 7, 104, 2, 2, 197, 198, 7, 107, 2, 2, 198, 199, 7, 116, 2, 2, 199, 200, 7, 117, 2, 2, 200, 201, 7, 118, 2, 2, 201, 22, 3, 2, 2, 2, 202, 203, 7, 110, 2, 2, 203, 204, 7, 99, 2, 2, 204, 205, 7, 117, 2, 2, 205, 206, 7, 118, 2, 2, 206, 24, 3, 2, 2, 2, 207, 208, 7, 99, 2, 2, 208, 209, 7, 117, 2, 2, 209, 210, 7, 101, 2, 2, 210, 26, 3, 2, 2, 2, 211, 212, 7, 102, 2, 2, 212, 213, 7, 103, 2, 2, 213, 214, 7, 117, 2, 2, 214, 215, 7, 101, 2, 2, 215, 28, 3, 2, 2, 2, 216, 217, 7, 110, 2, 2, 217, 218, 7, 107, 2, 2, 218, 219, 7, 111, 2, 2, 219, 220, 7, 107, 2, 2, 220, 221, 7, 118, 2, 2, 221, 30, 3, 2, 2, 2, 222, 223, 7, 113, 2, 2, 223, 224, 7, 104, 2, 2, 224, 225, 7, 104, 2, 2, 225, 226, 7, 117, 2, 2, 226, 227, 7, 103, 2, 2, 227, 228, 7, 118, 2, 2, 228, 32, 3, 2, 2, 2, 229, 230, 7, 104, 2, 2, 230, 231, 7, 103, 2, 2, 231, 232, 7, 118, 2, 2, 232, 233, 7, 101, 2, 2, 233, 234, 7, 106, 2, 2, 234, 34, 3, 2, 2, 2, 235, 236, 7, 45, 2, 2, 236, 36, 3, 2, 2, 2, 237, 238, 7, 115, 2, 2, 238, 239, 7, 119, 2, 2, 239, 240, 7, 103, 2, 2, 240, 241, 7, 116, 2, 2, 241, 242, 7, 123, 2, 2, 242, 38, 3, 2, 2, 2, 243, 244, 7, 110, 2, 2, 244, 245, 7, 99, 2, 2, 245, 246, 7, 124, 2, 2, 246, 247, 7, 123, 2, 2, 247, 40, 3, 2, 2, 2, 248, 249, 7, 113, 2, 2, 249, 250, 7, 116, 2, 2, 250, 42, 3, 2, 2, 2, 251, 252, 7, 99, 2, 2, 252, 253, 7, 112, 2, 2, 253, 254, 7, 102, 2, 2, 254, 44, 3, 2, 2, 2, 255, 256, 7, 112, 2, 2, 256, 257, 7, 113, 2, 2, 257, 258, 7, 118, 2, 2, 258, 46, 3, 2, 2, 2, 259, 260, 7, 107, 2, 2, 260, 261, 7, 112, 2, 2, 261, 262, 7, 81, 2, 2, 262, 263, 7, 116, 2, 2, 263, 264, 7, 71, 2, 2, 264, 265, 7, 111, 2, 2, 265, 266, 7, 114, 2, 2, 266, 267, 7, 118, 2, 2, 267, 268, 7, 123, 2, 2, 268, 48, 3, 2, 2, 2, 269, 270, 7, 107, 2, 2, 270, 271, 7, 112, 2, 2, 271, 50, 3, 2, 2, 2, 272, 273, 7, 100, 2, 2, 273, 274, 7, 103, 2, 2, 274, 275, 7, 118, 2, 2, 275, 276, 7, 121, 2, 2, 276, 277, 7, 103, 2, 2, 277, 278, 7, 103, 2, 2, 278, 279, 7, 112, 2, 2, 279, 52, 3, 2, 2, 2, 280, 281, 7, 107, 2, 2, 281, 282, 7, 112, 2, 2, 282, 283, 7, 116, 2, 2, 283, 284, 7, 99, 2, 2, 284, 285, 7, 112, 2, 2, 285, 286, 7, 105, 2, 2, 286, 287, 7, 103, 2, 2, 287, 54, 3, 2, 2, 2, 288, 289, 7, 118, 2, 2, 289, 290, 7, 113, 2, 2, 290, 56, 3, 2, 2, 2, 291, 292, 7, 107, 2, 2, 292, 293, 7, 117, 2, 2, 293, 58, 3, 2, 2, 2, 294, 295, 7, 112, 2, 2, 295, 296, 7, 119, 2, 2, 296, 297, 7, 110, 2, 2, 297, 298, 7, 110, 2, 2, 298, 60, 3, 2, 2, 2, 299, 300, 7, 107, 2, 2, 300, 301, 7, 117, 2, 2, 301, 302, 7, 80, 2, 2, 302, 303, 7, 119, 2, 2, 303, 304, 7, 110, 2, 2, 304, 305, 7, 110, 2, 2, 305, 62, 3, 2, 2, 2, 306, 307, 7, 107, 2, 2, 307, 308, 7, 117, 2, 2, 308, 309, 7, 80, 2, 2, 309, 310, 7, 113, 2, 2, 310, 311, 7, 118, 2, 2, 311, 312, 7, 80, 2, 2, 312, 313, 7, 119, 2, 2, 313, 314, 7, 110, 2, 2, 314, 315, 7, 110, 2, 2, 315, 64, 3, 2, 2, 2, 316, 317, 7, 112, 2, 2, 317, 318, 7, 113, 2, 2, 318, 319, 7, 118, 2, 2, 319, 320, 7, 80, 2, 2, 320, 321, 7, 119, 2, 2, 321, 322, 7, 110, 2, 2, 322, 323, 7, 110, 2, 2, 323, 66, 3, 2, 2, 2, 324, 325, 7, 103, 2, 2, 325, 326, 7, 111, 2, 2, 326, 327, 7, 114, 2, 2, 327, 328, 7, 118, 2, 2, 328, 329, 7, 123, 2, 2, 329, 68, 3, 2, 2, 2, 330, 331, 7, 107, 2, 2, 331, 332, 7, 117, 2, 2, 332, 333, 7, 71, 2, 2, 333, 334, 7, 111, 2, 2, 334, 335, 7, 114, 2, 2, 335, 336, 7, 118, 2, 2, 336, 337, 7, 123, 2, 2, 337, 70, 3, 2, 2, 2, 338, 339, 7, 107, 2, 2, 339, 340, 7, 117, 2, 2, 340, 341, 7, 80, 2, 2, 341, 342, 7, 113, 2, 2, 342, 343, 7, 118, 2, 2, 343, 344, 7, 71, 2, 2, 344, 345, 7, 111, 2, 2, 345, 346, 7, 114, 2, 2, 346, 347, 7, 118, 2, 2, 347, 348, 7, 123, 2, 2, 348, 72, 3, 2, 2, 2, 349, 350, 7, 112, 2, 2, 350, 351, 7, 113, 2, 2, 351, 352, 7, 118, 2, 2, 352, 353, 7, 71, 2, 2, 353, 354, 7, 111, 2, 2, 354, 355, 7, 114, 2, 2, 355, 356, 7, 118, 2, 2, 356, 357, 7, 123, 2, 2, 357, 74, 3, 2, 2, 2, 358, 359, 7, 110, 2, 2, 359, 360, 7, 107, 2, 2, 360, 361, 7, 109, 2, 2, 361, 362, 7, 103, 2, 2, 362, 76, 3, 2, 2, 2, 363, 364, 7, 107, 2, 2, 364, 365, 7, 110, 2, 2, 365, 366, 7, 107, 2, 2, 366, 367, 7, 109, 2, 2, 367, 368, 7, 103, 2, 2, 368, 78, 3, 2, 2, 2, 369, 370, 7, 101, 2, 2, 370, 371, 7, 113, 2, 2, 371, 372, 7, 112, 2, 2, 372, 373, 7, 118, 2, 2, 373, 374, 7, 99, 2, 2, 374, 375, 7, 107, 2, 2, 375, 376, 7, 112, 2, 2, 376, 377, 7, 117, 2, 2, 377, 80, 3, 2, 2, 2, 378, 379, 7, 107, 2, 2, 379, 380, 7, 101, 2, 2, 380, 381, 7, 113, 2, 2, 381, 382, 7, 112, 2, 2, 382, 383, 7, 118, 2, 2, 383, 384, 7, 99, 2, 2, 384, 385, 7, 107, 2, 2, 385, 386, 7, 112, 2, 2, 386, 387, 7, 117, 2, 2, 387, 82, 3, 2, 2, 2, 388, 389, 7, 117, 2, 2, 389, 390, 7, 118, 2, 2, 390, 391, 7, 99, 2, 2, 391, 392, 7, 116, 2, 2, 392, 393, 7, 118, 2, 2, 393, 394, 7, 117, 2, 2, 394, 395, 7, 89, 2, 2, 395, 396, 7, 107, 2, 2, 396, 397, 7, 118, 2, 2, 397, 398, 7, 106, 2, 2, 398, 84, 3, 2, 2, 2, 399, 400, 7, 107, 2, 2, 400, 401, 7, 117, 2, 2, 401, 402, 7, 118, 2, 2, 402, 403, 7, 99, 2, 2, 403, 404, 7, 116, 2, 2, 404, 405, 7, 118, 2, 2, 405, 406, 7, 117, 2, 2, 406, 407, 7, 89, 2, 2, 407, 408, 7, 107, 2, 2, 408, 409, 7, 118, 2, 2, 409, 410, 7, 106, 2, 2, 410, 86, 3, 2, 2, 2, 411, 412, 7, 103, 2, 2, 412, 413, 7, 112, 2, 2, 413, 414, 7, 102, 2, 2, 414, 415, 7, 117, 2, 2, 415, 416, 7, 89, 2, 2, 416, 417, 7, 107, 2, 2, 417, 418, 7, 118, 2, 2, 418, 419, 7, 106, 2, 2, 419, 88, 3, 2, 2, 2, 420, 421, 7, 107, 2, 2, 421, 422, 7, 103, 2, 2, 422, 423, 7, 112, 2, 2, 423, 424, 7, 102, 2, 2, 424, 425, 7, 117, 2, 2, 425, 426, 7, 89, 2, 2, 426, 427, 7, 107, 2, 2, 427, 428, 7, 118, 2, 2, 428, 429, 7, 106, 2, 2, 429, 90, 3, 2, 2, 2, 430, 431, 7, 63, 2, 2, 431, 92, 3, 2, 2, 2, 432, 433, 7, 103, 2, 2, 433, 434, 7, 115, 2, 2, 434, 94, 3, 2, 2, 2, 435, 436, 7, 64, 2, 2, 436, 96, 3, 2, 2, 2, 437, 438, 7, 105, 2, 2, 438, 439, 7, 118, 2, 2, 439, 98, 3, 2, 2, 2, 440, 441, 7, 64, 2, 2, 441, 442, 7, 63, 2, 2, 442, 100, 3, 2, 2, 2, 443, 444, 7, 105, 2, 2, 444, 445, 7, 103, 2, 2, 445, 102, 3, 2, 2, 2, 446, 447, 7, 105, 2, 2, 447, 448, 7, 118, 2, 2, 448, 449, 7, 103, 2, 2, 449, 104, 3, 2, 2, 2, 450, 451, 7, 62, 2, 2, 451, 106, 3, 2, 2, 2, 452, 453, 7, 110, 2, 2, 453, 454, 7, 118, 2, 2, 454, 108, 3, 2, 2, 2, 455, 456, 7, 62, 2, 2, 456, 457, 7, 63, 2, 2, 457, 110, 3, 2, 2, 2, 458, 459, 7, 110, 2, 2, 459, 460, 7, 103, 2, 2, 460, 112, 3, 2, 2, 2, 461, 462, 7, 110, 2, 2, 462, 463, 7, 118, 2, 2, 463, 464, 7, 103, 2, 2, 464, 114, 3, 2, 2, 2, 465, 466, 7, 62, 2, 2, 466, 467, 7, 64, 2, 2, 467, 116, 3, 2, 2, 2, 468, 469, 7, 35, 2, 2, 469, 470, 7, 63, 2, 2, 470, 118, 3, 2, 2, 2, 471, 472, 7, 112, 2, 2, 472, 473, 7, 103, 2, 2, 473, 120, 3, 2, 2, 2, 474, 475, 7, 107, 2, 2, 475, 476, 7, 103, 2, 2, 476, 477, 7, 115, 2, 2, 477, 122, 3, 2, 2, 2, 478, 479, 7, 107, 2, 2, 479, 480, 7, 112, 2, 2, 480, 481, 7, 103, 2, 2, 481, 124, 3, 2, 2, 2, 482, 483, 7, 103, 2, 2, 483, 484, 7, 115, 2, 2, 484, 485, 7, 81, 2, 2, 485, 486, 7, 116, 2, 2, 486, 487, 7, 80, 2, 2, 487, 488, 7, 119, 2, 2, 488, 489, 7, 110, 2, 2, 489, 490, 7, 110, 2, 2, 490, 126, 3, 2, 2, 2, 491, 492, 7, 105, 2, 2, 492, 493, 7, 118, 2, 2, 493, 494, 7, 81, 2, 2, 494, 495, 7, 116, 2, 2, 495, 496, 7, 80, 2, 2, 496, 497, 7, 119, 2, 2, 497, 498, 7, 110, 2, 2, 498, 499, 7, 110, 2, 2, 499, 128, 3, 2, 2, 2, 500, 501, 7, 110, 2, 2, 501, 502, 7, 118, 2, 2, 502, 503, 7, 81, 2, 2, 503, 504, 7, 116, 2, 2, 504, 505, 7, 80, 2, 2, 505, 506, 7, 119, 2, 2, 506, 507, 7, 110, 2, 2, 507, 508, 7, 110, 2, 2, 508, 130, 3, 2, 2, 2, 509, 510, 7, 60, 2, 2, 510, 514, 9, 2, 2, 2, 511, 513, 9, 3, 2, 2, 512, 511, 3, 2, 2, 2, 513, 516, 3, 2, 2, 2, 514, 512, 3, 2, 2, 2, 514, 515, 3, 2, 2, 2, 515, 525, 3, 2, 2, 2, 516, 514, 3, 2, 2, 2, 517, 521, 7, 65, 2, 2, 518, 520, 4, 50, 59, 2, 519, 518, 3, 2, 2, 2, 520, 523, 3, 2, 2, 2, 521, 519, 3, 2, 2, 2, 521, 522, 3, 2, 2, 2, 522, 525, 3, 2, 2, 2, 523, 521, 3, 2, 2, 2, 524, 509, 3, 2, 2, 2, 524, 517, 3, 2, 2, 2, 525, 132, 3, 2, 2, 2, 526, 530, 9, 2, 2, 2, 527, 529, 9, 4, 2, 2, 528, 527, 3, 2, 2, 2, 529, 532, 3, 2, 2, 2, 530, 528, 3, 2, 2, 2, 530, 531, 3, 2, 2, 2, 531, 134, 3, 2, 2, 2, 532, 530, 3, 2, 2, 2, 533, 534, 7, 98, 2, 2, 534, 535, 5, 133, 67, 2, 535, 536, 7, 98, 2, 2, 536, 136, 3, 2, 2, 2, 537, 538, 7, 117, 2, 2, 538, 539, 7, 119, 2, 2, 539, 540, 7, 111, 2, 2, 540, 541, 7, 42, 2, 2, 541, 542, 3, 2, 2, 2, 542, 543, 5, 133, 67, 2, 543, 544, 7, 43, 2, 2, 544, 580, 3, 2, 2, 2, 545, 546, 7, 111, 2, 2, 546, 547, 7, 99, 2, 2, 547, 548, 7, 122, 2, 2, 548, 549, 7, 42, 2, 2, 549, 550, 3, 2, 2, 2, 550, 551, 5, 133, 67, 2, 551, 552, 7, 43, 2, 2, 552, 580, 3, 2, 2, 2, 553, 554, 7, 111, 2, 2, 554, 555, 7, 107, 2, 2, 555, 556, 7, 112, 2, 2, 556, 557, 7, 42, 2, 2, 557, 558, 3, 2, 2, 2, 558, 559, 5, 133, 67, 2, 559, 560, 7, 43, 2, 2, 560, 580, 3, 2, 2, 2, 561, 562, 7, 99, 2, 2, 562, 563, 7, 120, 2, 2, 563, 564, 7, 105, 2, 2, 564, 565, 7, 42, 2, 2, 565, 566, 3, 2, 2, 2, 566, 567, 5, 133, 67, 2, 567, 568, 7, 43, 2, 2, 568, 580, 3, 2, 2, 2, 569, 570, 7, 101, 2, 2, 570, 571, 7, 113, 2, 2, 571, 572, 7, 119, 2, 2, 572, 573, 7, 112, 2, 2, 573, 574, 7, 118, 2, 2, 574, 575, 7, 42, 2, 2, 575, 576, 3, 2, 2, 2, 576, 577, 5, 133, 67, 2, 577, 578, 7, 43, 2, 2, 578, 580, 3, 2, 2, 2, 579, 537, 3, 2, 2, 2, 579, 545, 3, 2, 2, 2, 579, 553, 3, 2, 2, 2, 579, 561, 3, 2, 2, 2, 579, 569, 3, 2, 2, 2, 580, 138, 3, 2, 2, 2, 581, 582, 7, 118, 2, 2, 582, 583, 7, 116, 2, 2, 583, 584, 7, 119, 2, 2, 584, 591, 7, 103, 2, 2, 585, 586, 7, 104, 2, 2, 586, 587, 7, 99, 2, 2, 587, 588, 7, 110, 2, 2, 588, 589, 7, 117, 2, 2, 589, 591, 7, 103, 2, 2, 590, 581, 3, 2, 2, 2, 590, 585, 3, 2, 2, 2, 591, 140, 3, 2, 2, 2, 592, 594, 7, 47, 2, 2, 593, 592, 3, 2, 2, 2, 593, 594, 3, 2, 2, 2, 594, 595, 3, 2, 2, 2, 595, 602, 5, 143, 72, 2, 596, 598, 7, 47, 2, 2, 597, 596, 3, 2, 2, 2, 597, 598, 3, 2, 2, 2, 598, 599, 3, 2, 2, 2, 599, 602, 5, 145, 73, 2, 600, 602, 5, 147, 74, 2, 601, 593, 3, 2, 2, 2, 601, 597, 3, 2, 2, 2, 601, 600, 3, 2, 2, 2, 602, 142, 3, 2, 2, 2, 603, 605, 9, 5, 2, 2, 604, 603, 3, 2, 2, 2, 605, 606, 3, 2, 2, 2, 606, 604, 3, 2, 2, 2, 606, 607, 3, 2, 2, 2, 607, 608, 3, 2, 2, 2, 608, 612, 7, 48, 2, 2, 609, 611, 9, 5, 2, 2, 610, 609, 3, 2, 2, 2, 611, 614, 3, 2, 2, 2, 612, 610, 3, 2, 2, 2, 612, 613, 3, 2, 2, 2, 613, 144, 3, 2, 2, 2, 614, 612, 3, 2, 2, 2, 615, 619, 9, 6, 2, 2, 616, 618, 9, 5, 2, 2, 617, 616, 3, 2, 2, 2, 618, 621, 3, 2, 2, 2, 619, 617, 3, 2, 2, 2, 619, 620, 3, 2, 2, 2, 620, 146, 3, 2, 2, 2, 621, 619, 3, 2, 2, 2, 622, 623, 7, 50, 2, 2, 623, 148, 3, 2, 2, 2, 624, 630, 7, 41, 2, 2, 625, 629, 10, 7, 2, 2, 626, 627, 7, 41, 2, 2, 627, 629, 7, 41, 2, 2, 628, 625, 3, 2, 2, 2, 628, 626, 3, 2, 2, 2, 629, 632, 3, 2, 2, 2, 630, 628, 3, 2, 2, 2, 630, 631, 3, 2, 2, 2, 631, 633, 3, 2, 2, 2, 632, 630, 3, 2, 2, 2, 633, 634, 7, 41, 2, 2, 634, 150, 3, 2, 2, 2, 635, 636, 9, 8, 2, 2, 636, 637, 3, 2, 2, 2, 637, 638, 8, 76, 2, 2, 638, 152, 3, 2, 2, 2, 17, 2, 514, 521, 524, 530, 579, 590, 593, 597, 601, 606, 612, 619, 628, 630, 3, 8, 2, 2]
\ No newline at end of file
+[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 78, 649, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 4, 45, 9, 45, 4, 46, 9, 46, 4, 47, 9, 47, 4, 48, 9, 48, 4, 49, 9, 49, 4, 50, 9, 50, 4, 51, 9, 51, 4, 52, 9, 52, 4, 53, 9, 53, 4, 54, 9, 54, 4, 55, 9, 55, 4, 56, 9, 56, 4, 57, 9, 57, 4, 58, 9, 58, 4, 59, 9, 59, 4, 60, 9, 60, 4, 61, 9, 61, 4, 62, 9, 62, 4, 63, 9, 63, 4, 64, 9, 64, 4, 65, 9, 65, 4, 66, 9, 66, 4, 67, 9, 67, 4, 68, 9, 68, 4, 69, 9, 69, 4, 70, 9, 70, 4, 71, 9, 71, 4, 72, 9, 72, 4, 73, 9, 73, 4, 74, 9, 74, 4, 75, 9, 75, 4, 76, 9, 76, 4, 77, 9, 77, 3, 2, 3, 2, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 23, 3, 23, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 27, 3, 27, 3, 27, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 45, 3, 45, 3, 45, 3, 45, 3, 45, 3, 45, 3, 45, 3, 45, 3, 45, 3, 46, 3, 46, 3, 46, 3, 46, 3, 46, 3, 46, 3, 46, 3, 46, 3, 46, 3, 46, 3, 47, 3, 47, 3, 48, 3, 48, 3, 48, 3, 49, 3, 49, 3, 50, 3, 50, 3, 50, 3, 51, 3, 51, 3, 51, 3, 52, 3, 52, 3, 52, 3, 53, 3, 53, 3, 53, 3, 53, 3, 54, 3, 54, 3, 55, 3, 55, 3, 55, 3, 56, 3, 56, 3, 56, 3, 57, 3, 57, 3, 57, 3, 58, 3, 58, 3, 58, 3, 58, 3, 59, 3, 59, 3, 59, 3, 60, 3, 60, 3, 60, 3, 61, 3, 61, 3, 61, 3, 62, 3, 62, 3, 62, 3, 62, 3, 63, 3, 63, 3, 63, 3, 63, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 67, 3, 67, 3, 67, 7, 67, 523, 10, 67, 12, 67, 14, 67, 526, 11, 67, 3, 67, 3, 67, 7, 67, 530, 10, 67, 12, 67, 14, 67, 533, 11, 67, 5, 67, 535, 10, 67, 3, 68, 3, 68, 7, 68, 539, 10, 68, 12, 68, 14, 68, 542, 11, 68, 3, 69, 3, 69, 3, 69, 3, 69, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 5, 70, 590, 10, 70, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 5, 71, 601, 10, 71, 3, 72, 5, 72, 604, 10, 72, 3, 72, 3, 72, 5, 72, 608, 10, 72, 3, 72, 3, 72, 5, 72, 612, 10, 72, 3, 73, 6, 73, 615, 10, 73, 13, 73, 14, 73, 616, 3, 73, 3, 73, 7, 73, 621, 10, 73, 12, 73, 14, 73, 624, 11, 73, 3, 74, 3, 74, 7, 74, 628, 10, 74, 12, 74, 14, 74, 631, 11, 74, 3, 75, 3, 75, 3, 76, 3, 76, 3, 76, 3, 76, 7, 76, 639, 10, 76, 12, 76, 14, 76, 642, 11, 76, 3, 76, 3, 76, 3, 77, 3, 77, 3, 77, 3, 77, 2, 2, 78, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13, 8, 15, 9, 17, 10, 19, 11, 21, 12, 23, 13, 25, 14, 27, 15, 29, 16, 31, 17, 33, 18, 35, 19, 37, 20, 39, 21, 41, 22, 43, 23, 45, 24, 47, 25, 49, 26, 51, 27, 53, 28, 55, 29, 57, 30, 59, 31, 61, 32, 63, 33, 65, 34, 67, 35, 69, 36, 71, 37, 73, 38, 75, 39, 77, 40, 79, 41, 81, 42, 83, 43, 85, 44, 87, 45, 89, 46, 91, 47, 93, 48, 95, 49, 97, 50, 99, 51, 101, 52, 103, 53, 105, 54, 107, 55, 109, 56, 111, 57, 113, 58, 115, 59, 117, 60, 119, 61, 121, 62, 123, 63, 125, 64, 127, 65, 129, 66, 131, 67, 133, 68, 135, 69, 137, 70, 139, 71, 141, 72, 143, 73, 145, 74, 147, 75, 149, 76, 151, 77, 153, 78, 3, 2, 9, 5, 2, 67, 92, 97, 97, 99, 124, 6, 2, 50, 59, 67, 92, 97, 97, 99, 124, 7, 2, 48, 48, 50, 59, 67, 92, 97, 97, 99, 124, 3, 2, 50, 59, 3, 2, 51, 59, 3, 2, 41, 41, 5, 2, 11, 12, 15, 15, 34, 34, 2, 666, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 2, 35, 3, 2, 2, 2, 2, 37, 3, 2, 2, 2, 2, 39, 3, 2, 2, 2, 2, 41, 3, 2, 2, 2, 2, 43, 3, 2, 2, 2, 2, 45, 3, 2, 2, 2, 2, 47, 3, 2, 2, 2, 2, 49, 3, 2, 2, 2, 2, 51, 3, 2, 2, 2, 2, 53, 3, 2, 2, 2, 2, 55, 3, 2, 2, 2, 2, 57, 3, 2, 2, 2, 2, 59, 3, 2, 2, 2, 2, 61, 3, 2, 2, 2, 2, 63, 3, 2, 2, 2, 2, 65, 3, 2, 2, 2, 2, 67, 3, 2, 2, 2, 2, 69, 3, 2, 2, 2, 2, 71, 3, 2, 2, 2, 2, 73, 3, 2, 2, 2, 2, 75, 3, 2, 2, 2, 2, 77, 3, 2, 2, 2, 2, 79, 3, 2, 2, 2, 2, 81, 3, 2, 2, 2, 2, 83, 3, 2, 2, 2, 2, 85, 3, 2, 2, 2, 2, 87, 3, 2, 2, 2, 2, 89, 3, 2, 2, 2, 2, 91, 3, 2, 2, 2, 2, 93, 3, 2, 2, 2, 2, 95, 3, 2, 2, 2, 2, 97, 3, 2, 2, 2, 2, 99, 3, 2, 2, 2, 2, 101, 3, 2, 2, 2, 2, 103, 3, 2, 2, 2, 2, 105, 3, 2, 2, 2, 2, 107, 3, 2, 2, 2, 2, 109, 3, 2, 2, 2, 2, 111, 3, 2, 2, 2, 2, 113, 3, 2, 2, 2, 2, 115, 3, 2, 2, 2, 2, 117, 3, 2, 2, 2, 2, 119, 3, 2, 2, 2, 2, 121, 3, 2, 2, 2, 2, 123, 3, 2, 2, 2, 2, 125, 3, 2, 2, 2, 2, 127, 3, 2, 2, 2, 2, 129, 3, 2, 2, 2, 2, 131, 3, 2, 2, 2, 2, 133, 3, 2, 2, 2, 2, 135, 3, 2, 2, 2, 2, 137, 3, 2, 2, 2, 2, 139, 3, 2, 2, 2, 2, 141, 3, 2, 2, 2, 2, 143, 3, 2, 2, 2, 2, 145, 3, 2, 2, 2, 2, 147, 3, 2, 2, 2, 2, 149, 3, 2, 2, 2, 2, 151, 3, 2, 2, 2, 2, 153, 3, 2, 2, 2, 3, 155, 3, 2, 2, 2, 5, 157, 3, 2, 2, 2, 7, 159, 3, 2, 2, 2, 9, 166, 3, 2, 2, 2, 11, 175, 3, 2, 2, 2, 13, 181, 3, 2, 2, 2, 15, 187, 3, 2, 2, 2, 17, 190, 3, 2, 2, 2, 19, 192, 3, 2, 2, 2, 21, 198, 3, 2, 2, 2, 23, 204, 3, 2, 2, 2, 25, 209, 3, 2, 2, 2, 27, 213, 3, 2, 2, 2, 29, 218, 3, 2, 2, 2, 31, 224, 3, 2, 2, 2, 33, 231, 3, 2, 2, 2, 35, 237, 3, 2, 2, 2, 37, 239, 3, 2, 2, 2, 39, 245, 3, 2, 2, 2, 41, 250, 3, 2, 2, 2, 43, 253, 3, 2, 2, 2, 45, 257, 3, 2, 2, 2, 47, 261, 3, 2, 2, 2, 49, 271, 3, 2, 2, 2, 51, 274, 3, 2, 2, 2, 53, 282, 3, 2, 2, 2, 55, 285, 3, 2, 2, 2, 57, 293, 3, 2, 2, 2, 59, 301, 3, 2, 2, 2, 61, 304, 3, 2, 2, 2, 63, 309, 3, 2, 2, 2, 65, 316, 3, 2, 2, 2, 67, 326, 3, 2, 2, 2, 69, 334, 3, 2, 2, 2, 71, 340, 3, 2, 2, 2, 73, 348, 3, 2, 2, 2, 75, 359, 3, 2, 2, 2, 77, 368, 3, 2, 2, 2, 79, 373, 3, 2, 2, 2, 81, 379, 3, 2, 2, 2, 83, 388, 3, 2, 2, 2, 85, 398, 3, 2, 2, 2, 87, 409, 3, 2, 2, 2, 89, 421, 3, 2, 2, 2, 91, 430, 3, 2, 2, 2, 93, 440, 3, 2, 2, 2, 95, 442, 3, 2, 2, 2, 97, 445, 3, 2, 2, 2, 99, 447, 3, 2, 2, 2, 101, 450, 3, 2, 2, 2, 103, 453, 3, 2, 2, 2, 105, 456, 3, 2, 2, 2, 107, 460, 3, 2, 2, 2, 109, 462, 3, 2, 2, 2, 111, 465, 3, 2, 2, 2, 113, 468, 3, 2, 2, 2, 115, 471, 3, 2, 2, 2, 117, 475, 3, 2, 2, 2, 119, 478, 3, 2, 2, 2, 121, 481, 3, 2, 2, 2, 123, 484, 3, 2, 2, 2, 125, 488, 3, 2, 2, 2, 127, 492, 3, 2, 2, 2, 129, 501, 3, 2, 2, 2, 131, 510, 3, 2, 2, 2, 133, 534, 3, 2, 2, 2, 135, 536, 3, 2, 2, 2, 137, 543, 3, 2, 2, 2, 139, 589, 3, 2, 2, 2, 141, 600, 3, 2, 2, 2, 143, 611, 3, 2, 2, 2, 145, 614, 3, 2, 2, 2, 147, 625, 3, 2, 2, 2, 149, 632, 3, 2, 2, 2, 151, 634, 3, 2, 2, 2, 153, 645, 3, 2, 2, 2, 155, 156, 7, 42, 2, 2, 156, 4, 3, 2, 2, 2, 157, 158, 7, 43, 2, 2, 158, 6, 3, 2, 2, 2, 159, 160, 7, 117, 2, 2, 160, 161, 7, 103, 2, 2, 161, 162, 7, 110, 2, 2, 162, 163, 7, 103, 2, 2, 163, 164, 7, 101, 2, 2, 164, 165, 7, 118, 2, 2, 165, 8, 3, 2, 2, 2, 166, 167, 7, 102, 2, 2, 167, 168, 7, 107, 2, 2, 168, 169, 7, 117, 2, 2, 169, 170, 7, 118, 2, 2, 170, 171, 7, 107, 2, 2, 171, 172, 7, 112, 2, 2, 172, 173, 7, 101, 2, 2, 173, 174, 7, 118, 2, 2, 174, 10, 3, 2, 2, 2, 175, 176, 7, 121, 2, 2, 176, 177, 7, 106, 2, 2, 177, 178, 7, 103, 2, 2, 178, 179, 7, 116, 2, 2, 179, 180, 7, 103, 2, 2, 180, 12, 3, 2, 2, 2, 181, 182, 7, 113, 2, 2, 182, 183, 7, 116, 2, 2, 183, 184, 7, 102, 2, 2, 184, 185, 7, 103, 2, 2, 185, 186, 7, 116, 2, 2, 186, 14, 3, 2, 2, 2, 187, 188, 7, 100, 2, 2, 188, 189, 7, 123, 2, 2, 189, 16, 3, 2, 2, 2, 190, 191, 7, 46, 2, 2, 191, 18, 3, 2, 2, 2, 192, 193, 7, 112, 2, 2, 193, 194, 7, 119, 2, 2, 194, 195, 7, 110, 2, 2, 195, 196, 7, 110, 2, 2, 196, 197, 7, 117, 2, 2, 197, 20, 3, 2, 2, 2, 198, 199, 7, 104, 2, 2, 199, 200, 7, 107, 2, 2, 200, 201, 7, 116, 2, 2, 201, 202, 7, 117, 2, 2, 202, 203, 7, 118, 2, 2, 203, 22, 3, 2, 2, 2, 204, 205, 7, 110, 2, 2, 205, 206, 7, 99, 2, 2, 206, 207, 7, 117, 2, 2, 207, 208, 7, 118, 2, 2, 208, 24, 3, 2, 2, 2, 209, 210, 7, 99, 2, 2, 210, 211, 7, 117, 2, 2, 211, 212, 7, 101, 2, 2, 212, 26, 3, 2, 2, 2, 213, 214, 7, 102, 2, 2, 214, 215, 7, 103, 2, 2, 215, 216, 7, 117, 2, 2, 216, 217, 7, 101, 2, 2, 217, 28, 3, 2, 2, 2, 218, 219, 7, 110, 2, 2, 219, 220, 7, 107, 2, 2, 220, 221, 7, 111, 2, 2, 221, 222, 7, 107, 2, 2, 222, 223, 7, 118, 2, 2, 223, 30, 3, 2, 2, 2, 224, 225, 7, 113, 2, 2, 225, 226, 7, 104, 2, 2, 226, 227, 7, 104, 2, 2, 227, 228, 7, 117, 2, 2, 228, 229, 7, 103, 2, 2, 229, 230, 7, 118, 2, 2, 230, 32, 3, 2, 2, 2, 231, 232, 7, 104, 2, 2, 232, 233, 7, 103, 2, 2, 233, 234, 7, 118, 2, 2, 234, 235, 7, 101, 2, 2, 235, 236, 7, 106, 2, 2, 236, 34, 3, 2, 2, 2, 237, 238, 7, 45, 2, 2, 238, 36, 3, 2, 2, 2, 239, 240, 7, 115, 2, 2, 240, 241, 7, 119, 2, 2, 241, 242, 7, 103, 2, 2, 242, 243, 7, 116, 2, 2, 243, 244, 7, 123, 2, 2, 244, 38, 3, 2, 2, 2, 245, 246, 7, 110, 2, 2, 246, 247, 7, 99, 2, 2, 247, 248, 7, 124, 2, 2, 248, 249, 7, 123, 2, 2, 249, 40, 3, 2, 2, 2, 250, 251, 7, 113, 2, 2, 251, 252, 7, 116, 2, 2, 252, 42, 3, 2, 2, 2, 253, 254, 7, 99, 2, 2, 254, 255, 7, 112, 2, 2, 255, 256, 7, 102, 2, 2, 256, 44, 3, 2, 2, 2, 257, 258, 7, 112, 2, 2, 258, 259, 7, 113, 2, 2, 259, 260, 7, 118, 2, 2, 260, 46, 3, 2, 2, 2, 261, 262, 7, 107, 2, 2, 262, 263, 7, 112, 2, 2, 263, 264, 7, 81, 2, 2, 264, 265, 7, 116, 2, 2, 265, 266, 7, 71, 2, 2, 266, 267, 7, 111, 2, 2, 267, 268, 7, 114, 2, 2, 268, 269, 7, 118, 2, 2, 269, 270, 7, 123, 2, 2, 270, 48, 3, 2, 2, 2, 271, 272, 7, 107, 2, 2, 272, 273, 7, 112, 2, 2, 273, 50, 3, 2, 2, 2, 274, 275, 7, 100, 2, 2, 275, 276, 7, 103, 2, 2, 276, 277, 7, 118, 2, 2, 277, 278, 7, 121, 2, 2, 278, 279, 7, 103, 2, 2, 279, 280, 7, 103, 2, 2, 280, 281, 7, 112, 2, 2, 281, 52, 3, 2, 2, 2, 282, 283, 7, 118, 2, 2, 283, 284, 7, 113, 2, 2, 284, 54, 3, 2, 2, 2, 285, 286, 7, 107, 2, 2, 286, 287, 7, 112, 2, 2, 287, 288, 7, 116, 2, 2, 288, 289, 7, 99, 2, 2, 289, 290, 7, 112, 2, 2, 290, 291, 7, 105, 2, 2, 291, 292, 7, 103, 2, 2, 292, 56, 3, 2, 2, 2, 293, 294, 7, 107, 2, 2, 294, 295, 7, 112, 2, 2, 295, 296, 7, 84, 2, 2, 296, 297, 7, 99, 2, 2, 297, 298, 7, 112, 2, 2, 298, 299, 7, 105, 2, 2, 299, 300, 7, 103, 2, 2, 300, 58, 3, 2, 2, 2, 301, 302, 7, 107, 2, 2, 302, 303, 7, 117, 2, 2, 303, 60, 3, 2, 2, 2, 304, 305, 7, 112, 2, 2, 305, 306, 7, 119, 2, 2, 306, 307, 7, 110, 2, 2, 307, 308, 7, 110, 2, 2, 308, 62, 3, 2, 2, 2, 309, 310, 7, 107, 2, 2, 310, 311, 7, 117, 2, 2, 311, 312, 7, 80, 2, 2, 312, 313, 7, 119, 2, 2, 313, 314, 7, 110, 2, 2, 314, 315, 7, 110, 2, 2, 315, 64, 3, 2, 2, 2, 316, 317, 7, 107, 2, 2, 317, 318, 7, 117, 2, 2, 318, 319, 7, 80, 2, 2, 319, 320, 7, 113, 2, 2, 320, 321, 7, 118, 2, 2, 321, 322, 7, 80, 2, 2, 322, 323, 7, 119, 2, 2, 323, 324, 7, 110, 2, 2, 324, 325, 7, 110, 2, 2, 325, 66, 3, 2, 2, 2, 326, 327, 7, 112, 2, 2, 327, 328, 7, 113, 2, 2, 328, 329, 7, 118, 2, 2, 329, 330, 7, 80, 2, 2, 330, 331, 7, 119, 2, 2, 331, 332, 7, 110, 2, 2, 332, 333, 7, 110, 2, 2, 333, 68, 3, 2, 2, 2, 334, 335, 7, 103, 2, 2, 335, 336, 7, 111, 2, 2, 336, 337, 7, 114, 2, 2, 337, 338, 7, 118, 2, 2, 338, 339, 7, 123, 2, 2, 339, 70, 3, 2, 2, 2, 340, 341, 7, 107, 2, 2, 341, 342, 7, 117, 2, 2, 342, 343, 7, 71, 2, 2, 343, 344, 7, 111, 2, 2, 344, 345, 7, 114, 2, 2, 345, 346, 7, 118, 2, 2, 346, 347, 7, 123, 2, 2, 347, 72, 3, 2, 2, 2, 348, 349, 7, 107, 2, 2, 349, 350, 7, 117, 2, 2, 350, 351, 7, 80, 2, 2, 351, 352, 7, 113, 2, 2, 352, 353, 7, 118, 2, 2, 353, 354, 7, 71, 2, 2, 354, 355, 7, 111, 2, 2, 355, 356, 7, 114, 2, 2, 356, 357, 7, 118, 2, 2, 357, 358, 7, 123, 2, 2, 358, 74, 3, 2, 2, 2, 359, 360, 7, 112, 2, 2, 360, 361, 7, 113, 2, 2, 361, 362, 7, 118, 2, 2, 362, 363, 7, 71, 2, 2, 363, 364, 7, 111, 2, 2, 364, 365, 7, 114, 2, 2, 365, 366, 7, 118, 2, 2, 366, 367, 7, 123, 2, 2, 367, 76, 3, 2, 2, 2, 368, 369, 7, 110, 2, 2, 369, 370, 7, 107, 2, 2, 370, 371, 7, 109, 2, 2, 371, 372, 7, 103, 2, 2, 372, 78, 3, 2, 2, 2, 373, 374, 7, 107, 2, 2, 374, 375, 7, 110, 2, 2, 375, 376, 7, 107, 2, 2, 376, 377, 7, 109, 2, 2, 377, 378, 7, 103, 2, 2, 378, 80, 3, 2, 2, 2, 379, 380, 7, 101, 2, 2, 380, 381, 7, 113, 2, 2, 381, 382, 7, 112, 2, 2, 382, 383, 7, 118, 2, 2, 383, 384, 7, 99, 2, 2, 384, 385, 7, 107, 2, 2, 385, 386, 7, 112, 2, 2, 386, 387, 7, 117, 2, 2, 387, 82, 3, 2, 2, 2, 388, 389, 7, 107, 2, 2, 389, 390, 7, 101, 2, 2, 390, 391, 7, 113, 2, 2, 391, 392, 7, 112, 2, 2, 392, 393, 7, 118, 2, 2, 393, 394, 7, 99, 2, 2, 394, 395, 7, 107, 2, 2, 395, 396, 7, 112, 2, 2, 396, 397, 7, 117, 2, 2, 397, 84, 3, 2, 2, 2, 398, 399, 7, 117, 2, 2, 399, 400, 7, 118, 2, 2, 400, 401, 7, 99, 2, 2, 401, 402, 7, 116, 2, 2, 402, 403, 7, 118, 2, 2, 403, 404, 7, 117, 2, 2, 404, 405, 7, 89, 2, 2, 405, 406, 7, 107, 2, 2, 406, 407, 7, 118, 2, 2, 407, 408, 7, 106, 2, 2, 408, 86, 3, 2, 2, 2, 409, 410, 7, 107, 2, 2, 410, 411, 7, 117, 2, 2, 411, 412, 7, 118, 2, 2, 412, 413, 7, 99, 2, 2, 413, 414, 7, 116, 2, 2, 414, 415, 7, 118, 2, 2, 415, 416, 7, 117, 2, 2, 416, 417, 7, 89, 2, 2, 417, 418, 7, 107, 2, 2, 418, 419, 7, 118, 2, 2, 419, 420, 7, 106, 2, 2, 420, 88, 3, 2, 2, 2, 421, 422, 7, 103, 2, 2, 422, 423, 7, 112, 2, 2, 423, 424, 7, 102, 2, 2, 424, 425, 7, 117, 2, 2, 425, 426, 7, 89, 2, 2, 426, 427, 7, 107, 2, 2, 427, 428, 7, 118, 2, 2, 428, 429, 7, 106, 2, 2, 429, 90, 3, 2, 2, 2, 430, 431, 7, 107, 2, 2, 431, 432, 7, 103, 2, 2, 432, 433, 7, 112, 2, 2, 433, 434, 7, 102, 2, 2, 434, 435, 7, 117, 2, 2, 435, 436, 7, 89, 2, 2, 436, 437, 7, 107, 2, 2, 437, 438, 7, 118, 2, 2, 438, 439, 7, 106, 2, 2, 439, 92, 3, 2, 2, 2, 440, 441, 7, 63, 2, 2, 441, 94, 3, 2, 2, 2, 442, 443, 7, 103, 2, 2, 443, 444, 7, 115, 2, 2, 444, 96, 3, 2, 2, 2, 445, 446, 7, 64, 2, 2, 446, 98, 3, 2, 2, 2, 447, 448, 7, 105, 2, 2, 448, 449, 7, 118, 2, 2, 449, 100, 3, 2, 2, 2, 450, 451, 7, 64, 2, 2, 451, 452, 7, 63, 2, 2, 452, 102, 3, 2, 2, 2, 453, 454, 7, 105, 2, 2, 454, 455, 7, 103, 2, 2, 455, 104, 3, 2, 2, 2, 456, 457, 7, 105, 2, 2, 457, 458, 7, 118, 2, 2, 458, 459, 7, 103, 2, 2, 459, 106, 3, 2, 2, 2, 460, 461, 7, 62, 2, 2, 461, 108, 3, 2, 2, 2, 462, 463, 7, 110, 2, 2, 463, 464, 7, 118, 2, 2, 464, 110, 3, 2, 2, 2, 465, 466, 7, 62, 2, 2, 466, 467, 7, 63, 2, 2, 467, 112, 3, 2, 2, 2, 468, 469, 7, 110, 2, 2, 469, 470, 7, 103, 2, 2, 470, 114, 3, 2, 2, 2, 471, 472, 7, 110, 2, 2, 472, 473, 7, 118, 2, 2, 473, 474, 7, 103, 2, 2, 474, 116, 3, 2, 2, 2, 475, 476, 7, 62, 2, 2, 476, 477, 7, 64, 2, 2, 477, 118, 3, 2, 2, 2, 478, 479, 7, 35, 2, 2, 479, 480, 7, 63, 2, 2, 480, 120, 3, 2, 2, 2, 481, 482, 7, 112, 2, 2, 482, 483, 7, 103, 2, 2, 483, 122, 3, 2, 2, 2, 484, 485, 7, 107, 2, 2, 485, 486, 7, 103, 2, 2, 486, 487, 7, 115, 2, 2, 487, 124, 3, 2, 2, 2, 488, 489, 7, 107, 2, 2, 489, 490, 7, 112, 2, 2, 490, 491, 7, 103, 2, 2, 491, 126, 3, 2, 2, 2, 492, 493, 7, 103, 2, 2, 493, 494, 7, 115, 2, 2, 494, 495, 7, 81, 2, 2, 495, 496, 7, 116, 2, 2, 496, 497, 7, 80, 2, 2, 497, 498, 7, 119, 2, 2, 498, 499, 7, 110, 2, 2, 499, 500, 7, 110, 2, 2, 500, 128, 3, 2, 2, 2, 501, 502, 7, 105, 2, 2, 502, 503, 7, 118, 2, 2, 503, 504, 7, 81, 2, 2, 504, 505, 7, 116, 2, 2, 505, 506, 7, 80, 2, 2, 506, 507, 7, 119, 2, 2, 507, 508, 7, 110, 2, 2, 508, 509, 7, 110, 2, 2, 509, 130, 3, 2, 2, 2, 510, 511, 7, 110, 2, 2, 511, 512, 7, 118, 2, 2, 512, 513, 7, 81, 2, 2, 513, 514, 7, 116, 2, 2, 514, 515, 7, 80, 2, 2, 515, 516, 7, 119, 2, 2, 516, 517, 7, 110, 2, 2, 517, 518, 7, 110, 2, 2, 518, 132, 3, 2, 2, 2, 519, 520, 7, 60, 2, 2, 520, 524, 9, 2, 2, 2, 521, 523, 9, 3, 2, 2, 522, 521, 3, 2, 2, 2, 523, 526, 3, 2, 2, 2, 524, 522, 3, 2, 2, 2, 524, 525, 3, 2, 2, 2, 525, 535, 3, 2, 2, 2, 526, 524, 3, 2, 2, 2, 527, 531, 7, 65, 2, 2, 528, 530, 4, 50, 59, 2, 529, 528, 3, 2, 2, 2, 530, 533, 3, 2, 2, 2, 531, 529, 3, 2, 2, 2, 531, 532, 3, 2, 2, 2, 532, 535, 3, 2, 2, 2, 533, 531, 3, 2, 2, 2, 534, 519, 3, 2, 2, 2, 534, 527, 3, 2, 2, 2, 535, 134, 3, 2, 2, 2, 536, 540, 9, 2, 2, 2, 537, 539, 9, 4, 2, 2, 538, 537, 3, 2, 2, 2, 539, 542, 3, 2, 2, 2, 540, 538, 3, 2, 2, 2, 540, 541, 3, 2, 2, 2, 541, 136, 3, 2, 2, 2, 542, 540, 3, 2, 2, 2, 543, 544, 7, 98, 2, 2, 544, 545, 5, 135, 68, 2, 545, 546, 7, 98, 2, 2, 546, 138, 3, 2, 2, 2, 547, 548, 7, 117, 2, 2, 548, 549, 7, 119, 2, 2, 549, 550, 7, 111, 2, 2, 550, 551, 7, 42, 2, 2, 551, 552, 3, 2, 2, 2, 552, 553, 5, 135, 68, 2, 553, 554, 7, 43, 2, 2, 554, 590, 3, 2, 2, 2, 555, 556, 7, 111, 2, 2, 556, 557, 7, 99, 2, 2, 557, 558, 7, 122, 2, 2, 558, 559, 7, 42, 2, 2, 559, 560, 3, 2, 2, 2, 560, 561, 5, 135, 68, 2, 561, 562, 7, 43, 2, 2, 562, 590, 3, 2, 2, 2, 563, 564, 7, 111, 2, 2, 564, 565, 7, 107, 2, 2, 565, 566, 7, 112, 2, 2, 566, 567, 7, 42, 2, 2, 567, 568, 3, 2, 2, 2, 568, 569, 5, 135, 68, 2, 569, 570, 7, 43, 2, 2, 570, 590, 3, 2, 2, 2, 571, 572, 7, 99, 2, 2, 572, 573, 7, 120, 2, 2, 573, 574, 7, 105, 2, 2, 574, 575, 7, 42, 2, 2, 575, 576, 3, 2, 2, 2, 576, 577, 5, 135, 68, 2, 577, 578, 7, 43, 2, 2, 578, 590, 3, 2, 2, 2, 579, 580, 7, 101, 2, 2, 580, 581, 7, 113, 2, 2, 581, 582, 7, 119, 2, 2, 582, 583, 7, 112, 2, 2, 583, 584, 7, 118, 2, 2, 584, 585, 7, 42, 2, 2, 585, 586, 3, 2, 2, 2, 586, 587, 5, 135, 68, 2, 587, 588, 7, 43, 2, 2, 588, 590, 3, 2, 2, 2, 589, 547, 3, 2, 2, 2, 589, 555, 3, 2, 2, 2, 589, 563, 3, 2, 2, 2, 589, 571, 3, 2, 2, 2, 589, 579, 3, 2, 2, 2, 590, 140, 3, 2, 2, 2, 591, 592, 7, 118, 2, 2, 592, 593, 7, 116, 2, 2, 593, 594, 7, 119, 2, 2, 594, 601, 7, 103, 2, 2, 595, 596, 7, 104, 2, 2, 596, 597, 7, 99, 2, 2, 597, 598, 7, 110, 2, 2, 598, 599, 7, 117, 2, 2, 599, 601, 7, 103, 2, 2, 600, 591, 3, 2, 2, 2, 600, 595, 3, 2, 2, 2, 601, 142, 3, 2, 2, 2, 602, 604, 7, 47, 2, 2, 603, 602, 3, 2, 2, 2, 603, 604, 3, 2, 2, 2, 604, 605, 3, 2, 2, 2, 605, 612, 5, 145, 73, 2, 606, 608, 7, 47, 2, 2, 607, 606, 3, 2, 2, 2, 607, 608, 3, 2, 2, 2, 608, 609, 3, 2, 2, 2, 609, 612, 5, 147, 74, 2, 610, 612, 5, 149, 75, 2, 611, 603, 3, 2, 2, 2, 611, 607, 3, 2, 2, 2, 611, 610, 3, 2, 2, 2, 612, 144, 3, 2, 2, 2, 613, 615, 9, 5, 2, 2, 614, 613, 3, 2, 2, 2, 615, 616, 3, 2, 2, 2, 616, 614, 3, 2, 2, 2, 616, 617, 3, 2, 2, 2, 617, 618, 3, 2, 2, 2, 618, 622, 7, 48, 2, 2, 619, 621, 9, 5, 2, 2, 620, 619, 3, 2, 2, 2, 621, 624, 3, 2, 2, 2, 622, 620, 3, 2, 2, 2, 622, 623, 3, 2, 2, 2, 623, 146, 3, 2, 2, 2, 624, 622, 3, 2, 2, 2, 625, 629, 9, 6, 2, 2, 626, 628, 9, 5, 2, 2, 627, 626, 3, 2, 2, 2, 628, 631, 3, 2, 2, 2, 629, 627, 3, 2, 2, 2, 629, 630, 3, 2, 2, 2, 630, 148, 3, 2, 2, 2, 631, 629, 3, 2, 2, 2, 632, 633, 7, 50, 2, 2, 633, 150, 3, 2, 2, 2, 634, 640, 7, 41, 2, 2, 635, 639, 10, 7, 2, 2, 636, 637, 7, 41, 2, 2, 637, 639, 7, 41, 2, 2, 638, 635, 3, 2, 2, 2, 638, 636, 3, 2, 2, 2, 639, 642, 3, 2, 2, 2, 640, 638, 3, 2, 2, 2, 640, 641, 3, 2, 2, 2, 641, 643, 3, 2, 2, 2, 642, 640, 3, 2, 2, 2, 643, 644, 7, 41, 2, 2, 644, 152, 3, 2, 2, 2, 645, 646, 9, 8, 2, 2, 646, 647, 3, 2, 2, 2, 647, 648, 8, 77, 2, 2, 648, 154, 3, 2, 2, 2, 17, 2, 524, 531, 534, 540, 589, 600, 603, 607, 611, 616, 622, 629, 638, 640, 3, 8, 2, 2]
\ No newline at end of file
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
index 461b7199a..71dc477ae 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
@@ -28,9 +28,9 @@ public class EQLLexer extends Lexer {
 		T__38=39, T__39=40, T__40=41, T__41=42, T__42=43, T__43=44, T__44=45,
 		T__45=46, T__46=47, T__47=48, T__48=49, T__49=50, T__50=51, T__51=52,
 		T__52=53, T__53=54, T__54=55, T__55=56, T__56=57, T__57=58, T__58=59,
-		T__59=60, T__60=61, T__61=62, T__62=63, T__63=64, INPUT_VARIABLE=65, PATH_VARIABLE=66,
-		QUOTED_PATH_VARIABLE=67, PROP_FORMULA=68, BOOLEAN_LITERAL=69, NUMBER_LITERAL=70,
-		DOUBLE=71, INT=72, ZERO=73, STRING_LITERAL=74, WS=75;
+		T__59=60, T__60=61, T__61=62, T__62=63, T__63=64, T__64=65, INPUT_VARIABLE=66,
+		PATH_VARIABLE=67, QUOTED_PATH_VARIABLE=68, PROP_FORMULA=69, BOOLEAN_LITERAL=70,
+		NUMBER_LITERAL=71, DOUBLE=72, INT=73, ZERO=74, STRING_LITERAL=75, WS=76;
 	public static String[] channelNames = {
 		"DEFAULT_TOKEN_CHANNEL", "HIDDEN"
 	};
@@ -48,9 +48,10 @@ public class EQLLexer extends Lexer {
 			"T__33", "T__34", "T__35", "T__36", "T__37", "T__38", "T__39", "T__40",
 			"T__41", "T__42", "T__43", "T__44", "T__45", "T__46", "T__47", "T__48",
 			"T__49", "T__50", "T__51", "T__52", "T__53", "T__54", "T__55", "T__56",
-			"T__57", "T__58", "T__59", "T__60", "T__61", "T__62", "T__63", "INPUT_VARIABLE",
-			"PATH_VARIABLE", "QUOTED_PATH_VARIABLE", "PROP_FORMULA", "BOOLEAN_LITERAL",
-			"NUMBER_LITERAL", "DOUBLE", "INT", "ZERO", "STRING_LITERAL", "WS"
+			"T__57", "T__58", "T__59", "T__60", "T__61", "T__62", "T__63", "T__64",
+			"INPUT_VARIABLE", "PATH_VARIABLE", "QUOTED_PATH_VARIABLE", "PROP_FORMULA",
+			"BOOLEAN_LITERAL", "NUMBER_LITERAL", "DOUBLE", "INT", "ZERO", "STRING_LITERAL",
+			"WS"
 		};
 	}
 	public static final String[] ruleNames = makeRuleNames();
@@ -60,13 +61,14 @@ public class EQLLexer extends Lexer {
 			null, "'('", "')'", "'select'", "'distinct'", "'where'", "'order'", "'by'",
 			"','", "'nulls'", "'first'", "'last'", "'asc'", "'desc'", "'limit'",
 			"'offset'", "'fetch'", "'+'", "'query'", "'lazy'", "'or'", "'and'", "'not'",
-			"'inOrEmpty'", "'in'", "'between'", "'inrange'", "'to'", "'is'", "'null'",
-			"'isNull'", "'isNotNull'", "'notNull'", "'empty'", "'isEmpty'", "'isNotEmpty'",
-			"'notEmpty'", "'like'", "'ilike'", "'contains'", "'icontains'", "'startsWith'",
-			"'istartsWith'", "'endsWith'", "'iendsWith'", "'='", "'eq'", "'>'", "'gt'",
-			"'>='", "'ge'", "'gte'", "'<'", "'lt'", "'<='", "'le'", "'lte'", "'<>'",
-			"'!='", "'ne'", "'ieq'", "'ine'", "'eqOrNull'", "'gtOrNull'", "'ltOrNull'",
-			null, null, null, null, null, null, null, null, "'0'"
+			"'inOrEmpty'", "'in'", "'between'", "'to'", "'inrange'", "'inRange'",
+			"'is'", "'null'", "'isNull'", "'isNotNull'", "'notNull'", "'empty'",
+			"'isEmpty'", "'isNotEmpty'", "'notEmpty'", "'like'", "'ilike'", "'contains'",
+			"'icontains'", "'startsWith'", "'istartsWith'", "'endsWith'", "'iendsWith'",
+			"'='", "'eq'", "'>'", "'gt'", "'>='", "'ge'", "'gte'", "'<'", "'lt'",
+			"'<='", "'le'", "'lte'", "'<>'", "'!='", "'ne'", "'ieq'", "'ine'", "'eqOrNull'",
+			"'gtOrNull'", "'ltOrNull'", null, null, null, null, null, null, null,
+			null, "'0'"
 		};
 	}
 	private static final String[] _LITERAL_NAMES = makeLiteralNames();
@@ -77,9 +79,9 @@ public class EQLLexer extends Lexer {
 			null, null, null, null, null, null, null, null, null, null, null, null,
 			null, null, null, null, null, null, null, null, null, null, null, null,
 			null, null, null, null, null, null, null, null, null, null, null, null,
-			null, null, null, null, null, "INPUT_VARIABLE", "PATH_VARIABLE", "QUOTED_PATH_VARIABLE",
-			"PROP_FORMULA", "BOOLEAN_LITERAL", "NUMBER_LITERAL", "DOUBLE", "INT",
-			"ZERO", "STRING_LITERAL", "WS"
+			null, null, null, null, null, null, "INPUT_VARIABLE", "PATH_VARIABLE",
+			"QUOTED_PATH_VARIABLE", "PROP_FORMULA", "BOOLEAN_LITERAL", "NUMBER_LITERAL",
+			"DOUBLE", "INT", "ZERO", "STRING_LITERAL", "WS"
 		};
 	}
 	private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
@@ -141,7 +143,7 @@ public class EQLLexer extends Lexer {
 	public ATN getATN() { return _ATN; }
 
 	public static final String _serializedATN =
-		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2M\u027f\b\1\4\2\t"+
+		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2N\u0289\b\1\4\2\t"+
 		"\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13"+
 		"\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"+
 		"\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"+
@@ -150,206 +152,210 @@ public class EQLLexer extends Lexer {
 		",\t,\4-\t-\4.\t.\4/\t/\4\60\t\60\4\61\t\61\4\62\t\62\4\63\t\63\4\64\t"+
 		"\64\4\65\t\65\4\66\t\66\4\67\t\67\48\t8\49\t9\4:\t:\4;\t;\4<\t<\4=\t="+
 		"\4>\t>\4?\t?\4@\t@\4A\tA\4B\tB\4C\tC\4D\tD\4E\tE\4F\tF\4G\tG\4H\tH\4I"+
-		"\tI\4J\tJ\4K\tK\4L\tL\3\2\3\2\3\3\3\3\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\5"+
-		"\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\6\3\6\3\6\3\6\3\6\3\6\3\7\3\7\3\7\3"+
-		"\7\3\7\3\7\3\b\3\b\3\b\3\t\3\t\3\n\3\n\3\n\3\n\3\n\3\n\3\13\3\13\3\13"+
-		"\3\13\3\13\3\13\3\f\3\f\3\f\3\f\3\f\3\r\3\r\3\r\3\r\3\16\3\16\3\16\3\16"+
-		"\3\16\3\17\3\17\3\17\3\17\3\17\3\17\3\20\3\20\3\20\3\20\3\20\3\20\3\20"+
-		"\3\21\3\21\3\21\3\21\3\21\3\21\3\22\3\22\3\23\3\23\3\23\3\23\3\23\3\23"+
-		"\3\24\3\24\3\24\3\24\3\24\3\25\3\25\3\25\3\26\3\26\3\26\3\26\3\27\3\27"+
-		"\3\27\3\27\3\30\3\30\3\30\3\30\3\30\3\30\3\30\3\30\3\30\3\30\3\31\3\31"+
-		"\3\31\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3\33\3\33\3\33\3\33\3\33"+
-		"\3\33\3\33\3\33\3\34\3\34\3\34\3\35\3\35\3\35\3\36\3\36\3\36\3\36\3\36"+
-		"\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3 \3 \3 \3 \3 \3 \3 \3 \3 \3 \3!\3"+
-		"!\3!\3!\3!\3!\3!\3!\3\"\3\"\3\"\3\"\3\"\3\"\3#\3#\3#\3#\3#\3#\3#\3#\3"+
-		"$\3$\3$\3$\3$\3$\3$\3$\3$\3$\3$\3%\3%\3%\3%\3%\3%\3%\3%\3%\3&\3&\3&\3"+
-		"&\3&\3\'\3\'\3\'\3\'\3\'\3\'\3(\3(\3(\3(\3(\3(\3(\3(\3(\3)\3)\3)\3)\3"+
-		")\3)\3)\3)\3)\3)\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3+\3+\3+\3+\3+\3+\3"+
-		"+\3+\3+\3+\3+\3+\3,\3,\3,\3,\3,\3,\3,\3,\3,\3-\3-\3-\3-\3-\3-\3-\3-\3"+
-		"-\3-\3.\3.\3/\3/\3/\3\60\3\60\3\61\3\61\3\61\3\62\3\62\3\62\3\63\3\63"+
-		"\3\63\3\64\3\64\3\64\3\64\3\65\3\65\3\66\3\66\3\66\3\67\3\67\3\67\38\3"+
-		"8\38\39\39\39\39\3:\3:\3:\3;\3;\3;\3<\3<\3<\3=\3=\3=\3=\3>\3>\3>\3>\3"+
-		"?\3?\3?\3?\3?\3?\3?\3?\3?\3@\3@\3@\3@\3@\3@\3@\3@\3@\3A\3A\3A\3A\3A\3"+
-		"A\3A\3A\3A\3B\3B\3B\7B\u0201\nB\fB\16B\u0204\13B\3B\3B\7B\u0208\nB\fB"+
-		"\16B\u020b\13B\5B\u020d\nB\3C\3C\7C\u0211\nC\fC\16C\u0214\13C\3D\3D\3"+
-		"D\3D\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3"+
-		"E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\3E\5E\u0244"+
-		"\nE\3F\3F\3F\3F\3F\3F\3F\3F\3F\5F\u024f\nF\3G\5G\u0252\nG\3G\3G\5G\u0256"+
-		"\nG\3G\3G\5G\u025a\nG\3H\6H\u025d\nH\rH\16H\u025e\3H\3H\7H\u0263\nH\f"+
-		"H\16H\u0266\13H\3I\3I\7I\u026a\nI\fI\16I\u026d\13I\3J\3J\3K\3K\3K\3K\7"+
-		"K\u0275\nK\fK\16K\u0278\13K\3K\3K\3L\3L\3L\3L\2\2M\3\3\5\4\7\5\t\6\13"+
-		"\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16\33\17\35\20\37\21!\22#\23%\24\'"+
-		"\25)\26+\27-\30/\31\61\32\63\33\65\34\67\359\36;\37= ?!A\"C#E$G%I&K\'"+
-		"M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63e\64g\65i\66k\67m8o9q:s;u<w=y>{?}@\177"+
-		"A\u0081B\u0083C\u0085D\u0087E\u0089F\u008bG\u008dH\u008fI\u0091J\u0093"+
-		"K\u0095L\u0097M\3\2\t\5\2C\\aac|\6\2\62;C\\aac|\7\2\60\60\62;C\\aac|\3"+
-		"\2\62;\3\2\63;\3\2))\5\2\13\f\17\17\"\"\2\u0290\2\3\3\2\2\2\2\5\3\2\2"+
-		"\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21"+
-		"\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2"+
-		"\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3"+
-		"\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2\2\2\2/\3\2\2\2\2\61\3\2\2\2\2\63\3"+
-		"\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2\29\3\2\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3"+
-		"\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3\2\2\2\2G\3\2\2\2\2I\3\2\2\2\2K\3\2\2"+
-		"\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2\2\2S\3\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2"+
-		"Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2\2_\3\2\2\2\2a\3\2\2\2\2c\3\2\2\2\2e\3"+
-		"\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2k\3\2\2\2\2m\3\2\2\2\2o\3\2\2\2\2q\3\2\2"+
-		"\2\2s\3\2\2\2\2u\3\2\2\2\2w\3\2\2\2\2y\3\2\2\2\2{\3\2\2\2\2}\3\2\2\2\2"+
-		"\177\3\2\2\2\2\u0081\3\2\2\2\2\u0083\3\2\2\2\2\u0085\3\2\2\2\2\u0087\3"+
-		"\2\2\2\2\u0089\3\2\2\2\2\u008b\3\2\2\2\2\u008d\3\2\2\2\2\u008f\3\2\2\2"+
-		"\2\u0091\3\2\2\2\2\u0093\3\2\2\2\2\u0095\3\2\2\2\2\u0097\3\2\2\2\3\u0099"+
-		"\3\2\2\2\5\u009b\3\2\2\2\7\u009d\3\2\2\2\t\u00a4\3\2\2\2\13\u00ad\3\2"+
-		"\2\2\r\u00b3\3\2\2\2\17\u00b9\3\2\2\2\21\u00bc\3\2\2\2\23\u00be\3\2\2"+
-		"\2\25\u00c4\3\2\2\2\27\u00ca\3\2\2\2\31\u00cf\3\2\2\2\33\u00d3\3\2\2\2"+
-		"\35\u00d8\3\2\2\2\37\u00de\3\2\2\2!\u00e5\3\2\2\2#\u00eb\3\2\2\2%\u00ed"+
-		"\3\2\2\2\'\u00f3\3\2\2\2)\u00f8\3\2\2\2+\u00fb\3\2\2\2-\u00ff\3\2\2\2"+
-		"/\u0103\3\2\2\2\61\u010d\3\2\2\2\63\u0110\3\2\2\2\65\u0118\3\2\2\2\67"+
-		"\u0120\3\2\2\29\u0123\3\2\2\2;\u0126\3\2\2\2=\u012b\3\2\2\2?\u0132\3\2"+
-		"\2\2A\u013c\3\2\2\2C\u0144\3\2\2\2E\u014a\3\2\2\2G\u0152\3\2\2\2I\u015d"+
-		"\3\2\2\2K\u0166\3\2\2\2M\u016b\3\2\2\2O\u0171\3\2\2\2Q\u017a\3\2\2\2S"+
-		"\u0184\3\2\2\2U\u018f\3\2\2\2W\u019b\3\2\2\2Y\u01a4\3\2\2\2[\u01ae\3\2"+
-		"\2\2]\u01b0\3\2\2\2_\u01b3\3\2\2\2a\u01b5\3\2\2\2c\u01b8\3\2\2\2e\u01bb"+
-		"\3\2\2\2g\u01be\3\2\2\2i\u01c2\3\2\2\2k\u01c4\3\2\2\2m\u01c7\3\2\2\2o"+
-		"\u01ca\3\2\2\2q\u01cd\3\2\2\2s\u01d1\3\2\2\2u\u01d4\3\2\2\2w\u01d7\3\2"+
-		"\2\2y\u01da\3\2\2\2{\u01de\3\2\2\2}\u01e2\3\2\2\2\177\u01eb\3\2\2\2\u0081"+
-		"\u01f4\3\2\2\2\u0083\u020c\3\2\2\2\u0085\u020e\3\2\2\2\u0087\u0215\3\2"+
-		"\2\2\u0089\u0243\3\2\2\2\u008b\u024e\3\2\2\2\u008d\u0259\3\2\2\2\u008f"+
-		"\u025c\3\2\2\2\u0091\u0267\3\2\2\2\u0093\u026e\3\2\2\2\u0095\u0270\3\2"+
-		"\2\2\u0097\u027b\3\2\2\2\u0099\u009a\7*\2\2\u009a\4\3\2\2\2\u009b\u009c"+
-		"\7+\2\2\u009c\6\3\2\2\2\u009d\u009e\7u\2\2\u009e\u009f\7g\2\2\u009f\u00a0"+
-		"\7n\2\2\u00a0\u00a1\7g\2\2\u00a1\u00a2\7e\2\2\u00a2\u00a3\7v\2\2\u00a3"+
-		"\b\3\2\2\2\u00a4\u00a5\7f\2\2\u00a5\u00a6\7k\2\2\u00a6\u00a7\7u\2\2\u00a7"+
-		"\u00a8\7v\2\2\u00a8\u00a9\7k\2\2\u00a9\u00aa\7p\2\2\u00aa\u00ab\7e\2\2"+
-		"\u00ab\u00ac\7v\2\2\u00ac\n\3\2\2\2\u00ad\u00ae\7y\2\2\u00ae\u00af\7j"+
-		"\2\2\u00af\u00b0\7g\2\2\u00b0\u00b1\7t\2\2\u00b1\u00b2\7g\2\2\u00b2\f"+
-		"\3\2\2\2\u00b3\u00b4\7q\2\2\u00b4\u00b5\7t\2\2\u00b5\u00b6\7f\2\2\u00b6"+
-		"\u00b7\7g\2\2\u00b7\u00b8\7t\2\2\u00b8\16\3\2\2\2\u00b9\u00ba\7d\2\2\u00ba"+
-		"\u00bb\7{\2\2\u00bb\20\3\2\2\2\u00bc\u00bd\7.\2\2\u00bd\22\3\2\2\2\u00be"+
-		"\u00bf\7p\2\2\u00bf\u00c0\7w\2\2\u00c0\u00c1\7n\2\2\u00c1\u00c2\7n\2\2"+
-		"\u00c2\u00c3\7u\2\2\u00c3\24\3\2\2\2\u00c4\u00c5\7h\2\2\u00c5\u00c6\7"+
-		"k\2\2\u00c6\u00c7\7t\2\2\u00c7\u00c8\7u\2\2\u00c8\u00c9\7v\2\2\u00c9\26"+
-		"\3\2\2\2\u00ca\u00cb\7n\2\2\u00cb\u00cc\7c\2\2\u00cc\u00cd\7u\2\2\u00cd"+
-		"\u00ce\7v\2\2\u00ce\30\3\2\2\2\u00cf\u00d0\7c\2\2\u00d0\u00d1\7u\2\2\u00d1"+
-		"\u00d2\7e\2\2\u00d2\32\3\2\2\2\u00d3\u00d4\7f\2\2\u00d4\u00d5\7g\2\2\u00d5"+
-		"\u00d6\7u\2\2\u00d6\u00d7\7e\2\2\u00d7\34\3\2\2\2\u00d8\u00d9\7n\2\2\u00d9"+
-		"\u00da\7k\2\2\u00da\u00db\7o\2\2\u00db\u00dc\7k\2\2\u00dc\u00dd\7v\2\2"+
-		"\u00dd\36\3\2\2\2\u00de\u00df\7q\2\2\u00df\u00e0\7h\2\2\u00e0\u00e1\7"+
-		"h\2\2\u00e1\u00e2\7u\2\2\u00e2\u00e3\7g\2\2\u00e3\u00e4\7v\2\2\u00e4 "+
-		"\3\2\2\2\u00e5\u00e6\7h\2\2\u00e6\u00e7\7g\2\2\u00e7\u00e8\7v\2\2\u00e8"+
-		"\u00e9\7e\2\2\u00e9\u00ea\7j\2\2\u00ea\"\3\2\2\2\u00eb\u00ec\7-\2\2\u00ec"+
-		"$\3\2\2\2\u00ed\u00ee\7s\2\2\u00ee\u00ef\7w\2\2\u00ef\u00f0\7g\2\2\u00f0"+
-		"\u00f1\7t\2\2\u00f1\u00f2\7{\2\2\u00f2&\3\2\2\2\u00f3\u00f4\7n\2\2\u00f4"+
-		"\u00f5\7c\2\2\u00f5\u00f6\7|\2\2\u00f6\u00f7\7{\2\2\u00f7(\3\2\2\2\u00f8"+
-		"\u00f9\7q\2\2\u00f9\u00fa\7t\2\2\u00fa*\3\2\2\2\u00fb\u00fc\7c\2\2\u00fc"+
-		"\u00fd\7p\2\2\u00fd\u00fe\7f\2\2\u00fe,\3\2\2\2\u00ff\u0100\7p\2\2\u0100"+
-		"\u0101\7q\2\2\u0101\u0102\7v\2\2\u0102.\3\2\2\2\u0103\u0104\7k\2\2\u0104"+
-		"\u0105\7p\2\2\u0105\u0106\7Q\2\2\u0106\u0107\7t\2\2\u0107\u0108\7G\2\2"+
-		"\u0108\u0109\7o\2\2\u0109\u010a\7r\2\2\u010a\u010b\7v\2\2\u010b\u010c"+
-		"\7{\2\2\u010c\60\3\2\2\2\u010d\u010e\7k\2\2\u010e\u010f\7p\2\2\u010f\62"+
-		"\3\2\2\2\u0110\u0111\7d\2\2\u0111\u0112\7g\2\2\u0112\u0113\7v\2\2\u0113"+
-		"\u0114\7y\2\2\u0114\u0115\7g\2\2\u0115\u0116\7g\2\2\u0116\u0117\7p\2\2"+
-		"\u0117\64\3\2\2\2\u0118\u0119\7k\2\2\u0119\u011a\7p\2\2\u011a\u011b\7"+
-		"t\2\2\u011b\u011c\7c\2\2\u011c\u011d\7p\2\2\u011d\u011e\7i\2\2\u011e\u011f"+
-		"\7g\2\2\u011f\66\3\2\2\2\u0120\u0121\7v\2\2\u0121\u0122\7q\2\2\u01228"+
-		"\3\2\2\2\u0123\u0124\7k\2\2\u0124\u0125\7u\2\2\u0125:\3\2\2\2\u0126\u0127"+
-		"\7p\2\2\u0127\u0128\7w\2\2\u0128\u0129\7n\2\2\u0129\u012a\7n\2\2\u012a"+
-		"<\3\2\2\2\u012b\u012c\7k\2\2\u012c\u012d\7u\2\2\u012d\u012e\7P\2\2\u012e"+
-		"\u012f\7w\2\2\u012f\u0130\7n\2\2\u0130\u0131\7n\2\2\u0131>\3\2\2\2\u0132"+
-		"\u0133\7k\2\2\u0133\u0134\7u\2\2\u0134\u0135\7P\2\2\u0135\u0136\7q\2\2"+
-		"\u0136\u0137\7v\2\2\u0137\u0138\7P\2\2\u0138\u0139\7w\2\2\u0139\u013a"+
-		"\7n\2\2\u013a\u013b\7n\2\2\u013b@\3\2\2\2\u013c\u013d\7p\2\2\u013d\u013e"+
-		"\7q\2\2\u013e\u013f\7v\2\2\u013f\u0140\7P\2\2\u0140\u0141\7w\2\2\u0141"+
-		"\u0142\7n\2\2\u0142\u0143\7n\2\2\u0143B\3\2\2\2\u0144\u0145\7g\2\2\u0145"+
-		"\u0146\7o\2\2\u0146\u0147\7r\2\2\u0147\u0148\7v\2\2\u0148\u0149\7{\2\2"+
-		"\u0149D\3\2\2\2\u014a\u014b\7k\2\2\u014b\u014c\7u\2\2\u014c\u014d\7G\2"+
-		"\2\u014d\u014e\7o\2\2\u014e\u014f\7r\2\2\u014f\u0150\7v\2\2\u0150\u0151"+
-		"\7{\2\2\u0151F\3\2\2\2\u0152\u0153\7k\2\2\u0153\u0154\7u\2\2\u0154\u0155"+
-		"\7P\2\2\u0155\u0156\7q\2\2\u0156\u0157\7v\2\2\u0157\u0158\7G\2\2\u0158"+
-		"\u0159\7o\2\2\u0159\u015a\7r\2\2\u015a\u015b\7v\2\2\u015b\u015c\7{\2\2"+
-		"\u015cH\3\2\2\2\u015d\u015e\7p\2\2\u015e\u015f\7q\2\2\u015f\u0160\7v\2"+
-		"\2\u0160\u0161\7G\2\2\u0161\u0162\7o\2\2\u0162\u0163\7r\2\2\u0163\u0164"+
-		"\7v\2\2\u0164\u0165\7{\2\2\u0165J\3\2\2\2\u0166\u0167\7n\2\2\u0167\u0168"+
-		"\7k\2\2\u0168\u0169\7m\2\2\u0169\u016a\7g\2\2\u016aL\3\2\2\2\u016b\u016c"+
-		"\7k\2\2\u016c\u016d\7n\2\2\u016d\u016e\7k\2\2\u016e\u016f\7m\2\2\u016f"+
-		"\u0170\7g\2\2\u0170N\3\2\2\2\u0171\u0172\7e\2\2\u0172\u0173\7q\2\2\u0173"+
-		"\u0174\7p\2\2\u0174\u0175\7v\2\2\u0175\u0176\7c\2\2\u0176\u0177\7k\2\2"+
-		"\u0177\u0178\7p\2\2\u0178\u0179\7u\2\2\u0179P\3\2\2\2\u017a\u017b\7k\2"+
-		"\2\u017b\u017c\7e\2\2\u017c\u017d\7q\2\2\u017d\u017e\7p\2\2\u017e\u017f"+
-		"\7v\2\2\u017f\u0180\7c\2\2\u0180\u0181\7k\2\2\u0181\u0182\7p\2\2\u0182"+
-		"\u0183\7u\2\2\u0183R\3\2\2\2\u0184\u0185\7u\2\2\u0185\u0186\7v\2\2\u0186"+
-		"\u0187\7c\2\2\u0187\u0188\7t\2\2\u0188\u0189\7v\2\2\u0189\u018a\7u\2\2"+
-		"\u018a\u018b\7Y\2\2\u018b\u018c\7k\2\2\u018c\u018d\7v\2\2\u018d\u018e"+
-		"\7j\2\2\u018eT\3\2\2\2\u018f\u0190\7k\2\2\u0190\u0191\7u\2\2\u0191\u0192"+
-		"\7v\2\2\u0192\u0193\7c\2\2\u0193\u0194\7t\2\2\u0194\u0195\7v\2\2\u0195"+
-		"\u0196\7u\2\2\u0196\u0197\7Y\2\2\u0197\u0198\7k\2\2\u0198\u0199\7v\2\2"+
-		"\u0199\u019a\7j\2\2\u019aV\3\2\2\2\u019b\u019c\7g\2\2\u019c\u019d\7p\2"+
-		"\2\u019d\u019e\7f\2\2\u019e\u019f\7u\2\2\u019f\u01a0\7Y\2\2\u01a0\u01a1"+
-		"\7k\2\2\u01a1\u01a2\7v\2\2\u01a2\u01a3\7j\2\2\u01a3X\3\2\2\2\u01a4\u01a5"+
-		"\7k\2\2\u01a5\u01a6\7g\2\2\u01a6\u01a7\7p\2\2\u01a7\u01a8\7f\2\2\u01a8"+
-		"\u01a9\7u\2\2\u01a9\u01aa\7Y\2\2\u01aa\u01ab\7k\2\2\u01ab\u01ac\7v\2\2"+
-		"\u01ac\u01ad\7j\2\2\u01adZ\3\2\2\2\u01ae\u01af\7?\2\2\u01af\\\3\2\2\2"+
-		"\u01b0\u01b1\7g\2\2\u01b1\u01b2\7s\2\2\u01b2^\3\2\2\2\u01b3\u01b4\7@\2"+
-		"\2\u01b4`\3\2\2\2\u01b5\u01b6\7i\2\2\u01b6\u01b7\7v\2\2\u01b7b\3\2\2\2"+
-		"\u01b8\u01b9\7@\2\2\u01b9\u01ba\7?\2\2\u01bad\3\2\2\2\u01bb\u01bc\7i\2"+
-		"\2\u01bc\u01bd\7g\2\2\u01bdf\3\2\2\2\u01be\u01bf\7i\2\2\u01bf\u01c0\7"+
-		"v\2\2\u01c0\u01c1\7g\2\2\u01c1h\3\2\2\2\u01c2\u01c3\7>\2\2\u01c3j\3\2"+
-		"\2\2\u01c4\u01c5\7n\2\2\u01c5\u01c6\7v\2\2\u01c6l\3\2\2\2\u01c7\u01c8"+
-		"\7>\2\2\u01c8\u01c9\7?\2\2\u01c9n\3\2\2\2\u01ca\u01cb\7n\2\2\u01cb\u01cc"+
-		"\7g\2\2\u01ccp\3\2\2\2\u01cd\u01ce\7n\2\2\u01ce\u01cf\7v\2\2\u01cf\u01d0"+
-		"\7g\2\2\u01d0r\3\2\2\2\u01d1\u01d2\7>\2\2\u01d2\u01d3\7@\2\2\u01d3t\3"+
-		"\2\2\2\u01d4\u01d5\7#\2\2\u01d5\u01d6\7?\2\2\u01d6v\3\2\2\2\u01d7\u01d8"+
-		"\7p\2\2\u01d8\u01d9\7g\2\2\u01d9x\3\2\2\2\u01da\u01db\7k\2\2\u01db\u01dc"+
-		"\7g\2\2\u01dc\u01dd\7s\2\2\u01ddz\3\2\2\2\u01de\u01df\7k\2\2\u01df\u01e0"+
-		"\7p\2\2\u01e0\u01e1\7g\2\2\u01e1|\3\2\2\2\u01e2\u01e3\7g\2\2\u01e3\u01e4"+
-		"\7s\2\2\u01e4\u01e5\7Q\2\2\u01e5\u01e6\7t\2\2\u01e6\u01e7\7P\2\2\u01e7"+
-		"\u01e8\7w\2\2\u01e8\u01e9\7n\2\2\u01e9\u01ea\7n\2\2\u01ea~\3\2\2\2\u01eb"+
-		"\u01ec\7i\2\2\u01ec\u01ed\7v\2\2\u01ed\u01ee\7Q\2\2\u01ee\u01ef\7t\2\2"+
-		"\u01ef\u01f0\7P\2\2\u01f0\u01f1\7w\2\2\u01f1\u01f2\7n\2\2\u01f2\u01f3"+
-		"\7n\2\2\u01f3\u0080\3\2\2\2\u01f4\u01f5\7n\2\2\u01f5\u01f6\7v\2\2\u01f6"+
-		"\u01f7\7Q\2\2\u01f7\u01f8\7t\2\2\u01f8\u01f9\7P\2\2\u01f9\u01fa\7w\2\2"+
-		"\u01fa\u01fb\7n\2\2\u01fb\u01fc\7n\2\2\u01fc\u0082\3\2\2\2\u01fd\u01fe"+
-		"\7<\2\2\u01fe\u0202\t\2\2\2\u01ff\u0201\t\3\2\2\u0200\u01ff\3\2\2\2\u0201"+
-		"\u0204\3\2\2\2\u0202\u0200\3\2\2\2\u0202\u0203\3\2\2\2\u0203\u020d\3\2"+
-		"\2\2\u0204\u0202\3\2\2\2\u0205\u0209\7A\2\2\u0206\u0208\4\62;\2\u0207"+
-		"\u0206\3\2\2\2\u0208\u020b\3\2\2\2\u0209\u0207\3\2\2\2\u0209\u020a\3\2"+
-		"\2\2\u020a\u020d\3\2\2\2\u020b\u0209\3\2\2\2\u020c\u01fd\3\2\2\2\u020c"+
-		"\u0205\3\2\2\2\u020d\u0084\3\2\2\2\u020e\u0212\t\2\2\2\u020f\u0211\t\4"+
-		"\2\2\u0210\u020f\3\2\2\2\u0211\u0214\3\2\2\2\u0212\u0210\3\2\2\2\u0212"+
-		"\u0213\3\2\2\2\u0213\u0086\3\2\2\2\u0214\u0212\3\2\2\2\u0215\u0216\7b"+
-		"\2\2\u0216\u0217\5\u0085C\2\u0217\u0218\7b\2\2\u0218\u0088\3\2\2\2\u0219"+
-		"\u021a\7u\2\2\u021a\u021b\7w\2\2\u021b\u021c\7o\2\2\u021c\u021d\7*\2\2"+
-		"\u021d\u021e\3\2\2\2\u021e\u021f\5\u0085C\2\u021f\u0220\7+\2\2\u0220\u0244"+
-		"\3\2\2\2\u0221\u0222\7o\2\2\u0222\u0223\7c\2\2\u0223\u0224\7z\2\2\u0224"+
-		"\u0225\7*\2\2\u0225\u0226\3\2\2\2\u0226\u0227\5\u0085C\2\u0227\u0228\7"+
-		"+\2\2\u0228\u0244\3\2\2\2\u0229\u022a\7o\2\2\u022a\u022b\7k\2\2\u022b"+
-		"\u022c\7p\2\2\u022c\u022d\7*\2\2\u022d\u022e\3\2\2\2\u022e\u022f\5\u0085"+
-		"C\2\u022f\u0230\7+\2\2\u0230\u0244\3\2\2\2\u0231\u0232\7c\2\2\u0232\u0233"+
-		"\7x\2\2\u0233\u0234\7i\2\2\u0234\u0235\7*\2\2\u0235\u0236\3\2\2\2\u0236"+
-		"\u0237\5\u0085C\2\u0237\u0238\7+\2\2\u0238\u0244\3\2\2\2\u0239\u023a\7"+
-		"e\2\2\u023a\u023b\7q\2\2\u023b\u023c\7w\2\2\u023c\u023d\7p\2\2\u023d\u023e"+
-		"\7v\2\2\u023e\u023f\7*\2\2\u023f\u0240\3\2\2\2\u0240\u0241\5\u0085C\2"+
-		"\u0241\u0242\7+\2\2\u0242\u0244\3\2\2\2\u0243\u0219\3\2\2\2\u0243\u0221"+
-		"\3\2\2\2\u0243\u0229\3\2\2\2\u0243\u0231\3\2\2\2\u0243\u0239\3\2\2\2\u0244"+
-		"\u008a\3\2\2\2\u0245\u0246\7v\2\2\u0246\u0247\7t\2\2\u0247\u0248\7w\2"+
-		"\2\u0248\u024f\7g\2\2\u0249\u024a\7h\2\2\u024a\u024b\7c\2\2\u024b\u024c"+
-		"\7n\2\2\u024c\u024d\7u\2\2\u024d\u024f\7g\2\2\u024e\u0245\3\2\2\2\u024e"+
-		"\u0249\3\2\2\2\u024f\u008c\3\2\2\2\u0250\u0252\7/\2\2\u0251\u0250\3\2"+
-		"\2\2\u0251\u0252\3\2\2\2\u0252\u0253\3\2\2\2\u0253\u025a\5\u008fH\2\u0254"+
-		"\u0256\7/\2\2\u0255\u0254\3\2\2\2\u0255\u0256\3\2\2\2\u0256\u0257\3\2"+
-		"\2\2\u0257\u025a\5\u0091I\2\u0258\u025a\5\u0093J\2\u0259\u0251\3\2\2\2"+
-		"\u0259\u0255\3\2\2\2\u0259\u0258\3\2\2\2\u025a\u008e\3\2\2\2\u025b\u025d"+
-		"\t\5\2\2\u025c\u025b\3\2\2\2\u025d\u025e\3\2\2\2\u025e\u025c\3\2\2\2\u025e"+
-		"\u025f\3\2\2\2\u025f\u0260\3\2\2\2\u0260\u0264\7\60\2\2\u0261\u0263\t"+
-		"\5\2\2\u0262\u0261\3\2\2\2\u0263\u0266\3\2\2\2\u0264\u0262\3\2\2\2\u0264"+
-		"\u0265\3\2\2\2\u0265\u0090\3\2\2\2\u0266\u0264\3\2\2\2\u0267\u026b\t\6"+
-		"\2\2\u0268\u026a\t\5\2\2\u0269\u0268\3\2\2\2\u026a\u026d\3\2\2\2\u026b"+
-		"\u0269\3\2\2\2\u026b\u026c\3\2\2\2\u026c\u0092\3\2\2\2\u026d\u026b\3\2"+
-		"\2\2\u026e\u026f\7\62\2\2\u026f\u0094\3\2\2\2\u0270\u0276\7)\2\2\u0271"+
-		"\u0275\n\7\2\2\u0272\u0273\7)\2\2\u0273\u0275\7)\2\2\u0274\u0271\3\2\2"+
-		"\2\u0274\u0272\3\2\2\2\u0275\u0278\3\2\2\2\u0276\u0274\3\2\2\2\u0276\u0277"+
-		"\3\2\2\2\u0277\u0279\3\2\2\2\u0278\u0276\3\2\2\2\u0279\u027a\7)\2\2\u027a"+
-		"\u0096\3\2\2\2\u027b\u027c\t\b\2\2\u027c\u027d\3\2\2\2\u027d\u027e\bL"+
-		"\2\2\u027e\u0098\3\2\2\2\21\2\u0202\u0209\u020c\u0212\u0243\u024e\u0251"+
-		"\u0255\u0259\u025e\u0264\u026b\u0274\u0276\3\b\2\2";
+		"\tI\4J\tJ\4K\tK\4L\tL\4M\tM\3\2\3\2\3\3\3\3\3\4\3\4\3\4\3\4\3\4\3\4\3"+
+		"\4\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\6\3\6\3\6\3\6\3\6\3\6\3\7\3\7"+
+		"\3\7\3\7\3\7\3\7\3\b\3\b\3\b\3\t\3\t\3\n\3\n\3\n\3\n\3\n\3\n\3\13\3\13"+
+		"\3\13\3\13\3\13\3\13\3\f\3\f\3\f\3\f\3\f\3\r\3\r\3\r\3\r\3\16\3\16\3\16"+
+		"\3\16\3\16\3\17\3\17\3\17\3\17\3\17\3\17\3\20\3\20\3\20\3\20\3\20\3\20"+
+		"\3\20\3\21\3\21\3\21\3\21\3\21\3\21\3\22\3\22\3\23\3\23\3\23\3\23\3\23"+
+		"\3\23\3\24\3\24\3\24\3\24\3\24\3\25\3\25\3\25\3\26\3\26\3\26\3\26\3\27"+
+		"\3\27\3\27\3\27\3\30\3\30\3\30\3\30\3\30\3\30\3\30\3\30\3\30\3\30\3\31"+
+		"\3\31\3\31\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3\33\3\33\3\33\3\34"+
+		"\3\34\3\34\3\34\3\34\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\35\3\35\3\35"+
+		"\3\35\3\36\3\36\3\36\3\37\3\37\3\37\3\37\3\37\3 \3 \3 \3 \3 \3 \3 \3!"+
+		"\3!\3!\3!\3!\3!\3!\3!\3!\3!\3\"\3\"\3\"\3\"\3\"\3\"\3\"\3\"\3#\3#\3#\3"+
+		"#\3#\3#\3$\3$\3$\3$\3$\3$\3$\3$\3%\3%\3%\3%\3%\3%\3%\3%\3%\3%\3%\3&\3"+
+		"&\3&\3&\3&\3&\3&\3&\3&\3\'\3\'\3\'\3\'\3\'\3(\3(\3(\3(\3(\3(\3)\3)\3)"+
+		"\3)\3)\3)\3)\3)\3)\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3+\3+\3+\3+\3+\3+\3+"+
+		"\3+\3+\3+\3+\3,\3,\3,\3,\3,\3,\3,\3,\3,\3,\3,\3,\3-\3-\3-\3-\3-\3-\3-"+
+		"\3-\3-\3.\3.\3.\3.\3.\3.\3.\3.\3.\3.\3/\3/\3\60\3\60\3\60\3\61\3\61\3"+
+		"\62\3\62\3\62\3\63\3\63\3\63\3\64\3\64\3\64\3\65\3\65\3\65\3\65\3\66\3"+
+		"\66\3\67\3\67\3\67\38\38\38\39\39\39\3:\3:\3:\3:\3;\3;\3;\3<\3<\3<\3="+
+		"\3=\3=\3>\3>\3>\3>\3?\3?\3?\3?\3@\3@\3@\3@\3@\3@\3@\3@\3@\3A\3A\3A\3A"+
+		"\3A\3A\3A\3A\3A\3B\3B\3B\3B\3B\3B\3B\3B\3B\3C\3C\3C\7C\u020b\nC\fC\16"+
+		"C\u020e\13C\3C\3C\7C\u0212\nC\fC\16C\u0215\13C\5C\u0217\nC\3D\3D\7D\u021b"+
+		"\nD\fD\16D\u021e\13D\3E\3E\3E\3E\3F\3F\3F\3F\3F\3F\3F\3F\3F\3F\3F\3F\3"+
+		"F\3F\3F\3F\3F\3F\3F\3F\3F\3F\3F\3F\3F\3F\3F\3F\3F\3F\3F\3F\3F\3F\3F\3"+
+		"F\3F\3F\3F\3F\3F\3F\5F\u024e\nF\3G\3G\3G\3G\3G\3G\3G\3G\3G\5G\u0259\n"+
+		"G\3H\5H\u025c\nH\3H\3H\5H\u0260\nH\3H\3H\5H\u0264\nH\3I\6I\u0267\nI\r"+
+		"I\16I\u0268\3I\3I\7I\u026d\nI\fI\16I\u0270\13I\3J\3J\7J\u0274\nJ\fJ\16"+
+		"J\u0277\13J\3K\3K\3L\3L\3L\3L\7L\u027f\nL\fL\16L\u0282\13L\3L\3L\3M\3"+
+		"M\3M\3M\2\2N\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16"+
+		"\33\17\35\20\37\21!\22#\23%\24\'\25)\26+\27-\30/\31\61\32\63\33\65\34"+
+		"\67\359\36;\37= ?!A\"C#E$G%I&K\'M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63e\64g"+
+		"\65i\66k\67m8o9q:s;u<w=y>{?}@\177A\u0081B\u0083C\u0085D\u0087E\u0089F"+
+		"\u008bG\u008dH\u008fI\u0091J\u0093K\u0095L\u0097M\u0099N\3\2\t\5\2C\\"+
+		"aac|\6\2\62;C\\aac|\7\2\60\60\62;C\\aac|\3\2\62;\3\2\63;\3\2))\5\2\13"+
+		"\f\17\17\"\"\2\u029a\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2"+
+		"\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3"+
+		"\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2\37\3\2\2"+
+		"\2\2!\3\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2"+
+		"\2-\3\2\2\2\2/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2\2\67\3\2"+
+		"\2\2\29\3\2\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2\2C\3\2\2\2"+
+		"\2E\3\2\2\2\2G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O\3\2\2\2\2Q"+
+		"\3\2\2\2\2S\3\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2\2\2\2]\3\2"+
+		"\2\2\2_\3\2\2\2\2a\3\2\2\2\2c\3\2\2\2\2e\3\2\2\2\2g\3\2\2\2\2i\3\2\2\2"+
+		"\2k\3\2\2\2\2m\3\2\2\2\2o\3\2\2\2\2q\3\2\2\2\2s\3\2\2\2\2u\3\2\2\2\2w"+
+		"\3\2\2\2\2y\3\2\2\2\2{\3\2\2\2\2}\3\2\2\2\2\177\3\2\2\2\2\u0081\3\2\2"+
+		"\2\2\u0083\3\2\2\2\2\u0085\3\2\2\2\2\u0087\3\2\2\2\2\u0089\3\2\2\2\2\u008b"+
+		"\3\2\2\2\2\u008d\3\2\2\2\2\u008f\3\2\2\2\2\u0091\3\2\2\2\2\u0093\3\2\2"+
+		"\2\2\u0095\3\2\2\2\2\u0097\3\2\2\2\2\u0099\3\2\2\2\3\u009b\3\2\2\2\5\u009d"+
+		"\3\2\2\2\7\u009f\3\2\2\2\t\u00a6\3\2\2\2\13\u00af\3\2\2\2\r\u00b5\3\2"+
+		"\2\2\17\u00bb\3\2\2\2\21\u00be\3\2\2\2\23\u00c0\3\2\2\2\25\u00c6\3\2\2"+
+		"\2\27\u00cc\3\2\2\2\31\u00d1\3\2\2\2\33\u00d5\3\2\2\2\35\u00da\3\2\2\2"+
+		"\37\u00e0\3\2\2\2!\u00e7\3\2\2\2#\u00ed\3\2\2\2%\u00ef\3\2\2\2\'\u00f5"+
+		"\3\2\2\2)\u00fa\3\2\2\2+\u00fd\3\2\2\2-\u0101\3\2\2\2/\u0105\3\2\2\2\61"+
+		"\u010f\3\2\2\2\63\u0112\3\2\2\2\65\u011a\3\2\2\2\67\u011d\3\2\2\29\u0125"+
+		"\3\2\2\2;\u012d\3\2\2\2=\u0130\3\2\2\2?\u0135\3\2\2\2A\u013c\3\2\2\2C"+
+		"\u0146\3\2\2\2E\u014e\3\2\2\2G\u0154\3\2\2\2I\u015c\3\2\2\2K\u0167\3\2"+
+		"\2\2M\u0170\3\2\2\2O\u0175\3\2\2\2Q\u017b\3\2\2\2S\u0184\3\2\2\2U\u018e"+
+		"\3\2\2\2W\u0199\3\2\2\2Y\u01a5\3\2\2\2[\u01ae\3\2\2\2]\u01b8\3\2\2\2_"+
+		"\u01ba\3\2\2\2a\u01bd\3\2\2\2c\u01bf\3\2\2\2e\u01c2\3\2\2\2g\u01c5\3\2"+
+		"\2\2i\u01c8\3\2\2\2k\u01cc\3\2\2\2m\u01ce\3\2\2\2o\u01d1\3\2\2\2q\u01d4"+
+		"\3\2\2\2s\u01d7\3\2\2\2u\u01db\3\2\2\2w\u01de\3\2\2\2y\u01e1\3\2\2\2{"+
+		"\u01e4\3\2\2\2}\u01e8\3\2\2\2\177\u01ec\3\2\2\2\u0081\u01f5\3\2\2\2\u0083"+
+		"\u01fe\3\2\2\2\u0085\u0216\3\2\2\2\u0087\u0218\3\2\2\2\u0089\u021f\3\2"+
+		"\2\2\u008b\u024d\3\2\2\2\u008d\u0258\3\2\2\2\u008f\u0263\3\2\2\2\u0091"+
+		"\u0266\3\2\2\2\u0093\u0271\3\2\2\2\u0095\u0278\3\2\2\2\u0097\u027a\3\2"+
+		"\2\2\u0099\u0285\3\2\2\2\u009b\u009c\7*\2\2\u009c\4\3\2\2\2\u009d\u009e"+
+		"\7+\2\2\u009e\6\3\2\2\2\u009f\u00a0\7u\2\2\u00a0\u00a1\7g\2\2\u00a1\u00a2"+
+		"\7n\2\2\u00a2\u00a3\7g\2\2\u00a3\u00a4\7e\2\2\u00a4\u00a5\7v\2\2\u00a5"+
+		"\b\3\2\2\2\u00a6\u00a7\7f\2\2\u00a7\u00a8\7k\2\2\u00a8\u00a9\7u\2\2\u00a9"+
+		"\u00aa\7v\2\2\u00aa\u00ab\7k\2\2\u00ab\u00ac\7p\2\2\u00ac\u00ad\7e\2\2"+
+		"\u00ad\u00ae\7v\2\2\u00ae\n\3\2\2\2\u00af\u00b0\7y\2\2\u00b0\u00b1\7j"+
+		"\2\2\u00b1\u00b2\7g\2\2\u00b2\u00b3\7t\2\2\u00b3\u00b4\7g\2\2\u00b4\f"+
+		"\3\2\2\2\u00b5\u00b6\7q\2\2\u00b6\u00b7\7t\2\2\u00b7\u00b8\7f\2\2\u00b8"+
+		"\u00b9\7g\2\2\u00b9\u00ba\7t\2\2\u00ba\16\3\2\2\2\u00bb\u00bc\7d\2\2\u00bc"+
+		"\u00bd\7{\2\2\u00bd\20\3\2\2\2\u00be\u00bf\7.\2\2\u00bf\22\3\2\2\2\u00c0"+
+		"\u00c1\7p\2\2\u00c1\u00c2\7w\2\2\u00c2\u00c3\7n\2\2\u00c3\u00c4\7n\2\2"+
+		"\u00c4\u00c5\7u\2\2\u00c5\24\3\2\2\2\u00c6\u00c7\7h\2\2\u00c7\u00c8\7"+
+		"k\2\2\u00c8\u00c9\7t\2\2\u00c9\u00ca\7u\2\2\u00ca\u00cb\7v\2\2\u00cb\26"+
+		"\3\2\2\2\u00cc\u00cd\7n\2\2\u00cd\u00ce\7c\2\2\u00ce\u00cf\7u\2\2\u00cf"+
+		"\u00d0\7v\2\2\u00d0\30\3\2\2\2\u00d1\u00d2\7c\2\2\u00d2\u00d3\7u\2\2\u00d3"+
+		"\u00d4\7e\2\2\u00d4\32\3\2\2\2\u00d5\u00d6\7f\2\2\u00d6\u00d7\7g\2\2\u00d7"+
+		"\u00d8\7u\2\2\u00d8\u00d9\7e\2\2\u00d9\34\3\2\2\2\u00da\u00db\7n\2\2\u00db"+
+		"\u00dc\7k\2\2\u00dc\u00dd\7o\2\2\u00dd\u00de\7k\2\2\u00de\u00df\7v\2\2"+
+		"\u00df\36\3\2\2\2\u00e0\u00e1\7q\2\2\u00e1\u00e2\7h\2\2\u00e2\u00e3\7"+
+		"h\2\2\u00e3\u00e4\7u\2\2\u00e4\u00e5\7g\2\2\u00e5\u00e6\7v\2\2\u00e6 "+
+		"\3\2\2\2\u00e7\u00e8\7h\2\2\u00e8\u00e9\7g\2\2\u00e9\u00ea\7v\2\2\u00ea"+
+		"\u00eb\7e\2\2\u00eb\u00ec\7j\2\2\u00ec\"\3\2\2\2\u00ed\u00ee\7-\2\2\u00ee"+
+		"$\3\2\2\2\u00ef\u00f0\7s\2\2\u00f0\u00f1\7w\2\2\u00f1\u00f2\7g\2\2\u00f2"+
+		"\u00f3\7t\2\2\u00f3\u00f4\7{\2\2\u00f4&\3\2\2\2\u00f5\u00f6\7n\2\2\u00f6"+
+		"\u00f7\7c\2\2\u00f7\u00f8\7|\2\2\u00f8\u00f9\7{\2\2\u00f9(\3\2\2\2\u00fa"+
+		"\u00fb\7q\2\2\u00fb\u00fc\7t\2\2\u00fc*\3\2\2\2\u00fd\u00fe\7c\2\2\u00fe"+
+		"\u00ff\7p\2\2\u00ff\u0100\7f\2\2\u0100,\3\2\2\2\u0101\u0102\7p\2\2\u0102"+
+		"\u0103\7q\2\2\u0103\u0104\7v\2\2\u0104.\3\2\2\2\u0105\u0106\7k\2\2\u0106"+
+		"\u0107\7p\2\2\u0107\u0108\7Q\2\2\u0108\u0109\7t\2\2\u0109\u010a\7G\2\2"+
+		"\u010a\u010b\7o\2\2\u010b\u010c\7r\2\2\u010c\u010d\7v\2\2\u010d\u010e"+
+		"\7{\2\2\u010e\60\3\2\2\2\u010f\u0110\7k\2\2\u0110\u0111\7p\2\2\u0111\62"+
+		"\3\2\2\2\u0112\u0113\7d\2\2\u0113\u0114\7g\2\2\u0114\u0115\7v\2\2\u0115"+
+		"\u0116\7y\2\2\u0116\u0117\7g\2\2\u0117\u0118\7g\2\2\u0118\u0119\7p\2\2"+
+		"\u0119\64\3\2\2\2\u011a\u011b\7v\2\2\u011b\u011c\7q\2\2\u011c\66\3\2\2"+
+		"\2\u011d\u011e\7k\2\2\u011e\u011f\7p\2\2\u011f\u0120\7t\2\2\u0120\u0121"+
+		"\7c\2\2\u0121\u0122\7p\2\2\u0122\u0123\7i\2\2\u0123\u0124\7g\2\2\u0124"+
+		"8\3\2\2\2\u0125\u0126\7k\2\2\u0126\u0127\7p\2\2\u0127\u0128\7T\2\2\u0128"+
+		"\u0129\7c\2\2\u0129\u012a\7p\2\2\u012a\u012b\7i\2\2\u012b\u012c\7g\2\2"+
+		"\u012c:\3\2\2\2\u012d\u012e\7k\2\2\u012e\u012f\7u\2\2\u012f<\3\2\2\2\u0130"+
+		"\u0131\7p\2\2\u0131\u0132\7w\2\2\u0132\u0133\7n\2\2\u0133\u0134\7n\2\2"+
+		"\u0134>\3\2\2\2\u0135\u0136\7k\2\2\u0136\u0137\7u\2\2\u0137\u0138\7P\2"+
+		"\2\u0138\u0139\7w\2\2\u0139\u013a\7n\2\2\u013a\u013b\7n\2\2\u013b@\3\2"+
+		"\2\2\u013c\u013d\7k\2\2\u013d\u013e\7u\2\2\u013e\u013f\7P\2\2\u013f\u0140"+
+		"\7q\2\2\u0140\u0141\7v\2\2\u0141\u0142\7P\2\2\u0142\u0143\7w\2\2\u0143"+
+		"\u0144\7n\2\2\u0144\u0145\7n\2\2\u0145B\3\2\2\2\u0146\u0147\7p\2\2\u0147"+
+		"\u0148\7q\2\2\u0148\u0149\7v\2\2\u0149\u014a\7P\2\2\u014a\u014b\7w\2\2"+
+		"\u014b\u014c\7n\2\2\u014c\u014d\7n\2\2\u014dD\3\2\2\2\u014e\u014f\7g\2"+
+		"\2\u014f\u0150\7o\2\2\u0150\u0151\7r\2\2\u0151\u0152\7v\2\2\u0152\u0153"+
+		"\7{\2\2\u0153F\3\2\2\2\u0154\u0155\7k\2\2\u0155\u0156\7u\2\2\u0156\u0157"+
+		"\7G\2\2\u0157\u0158\7o\2\2\u0158\u0159\7r\2\2\u0159\u015a\7v\2\2\u015a"+
+		"\u015b\7{\2\2\u015bH\3\2\2\2\u015c\u015d\7k\2\2\u015d\u015e\7u\2\2\u015e"+
+		"\u015f\7P\2\2\u015f\u0160\7q\2\2\u0160\u0161\7v\2\2\u0161\u0162\7G\2\2"+
+		"\u0162\u0163\7o\2\2\u0163\u0164\7r\2\2\u0164\u0165\7v\2\2\u0165\u0166"+
+		"\7{\2\2\u0166J\3\2\2\2\u0167\u0168\7p\2\2\u0168\u0169\7q\2\2\u0169\u016a"+
+		"\7v\2\2\u016a\u016b\7G\2\2\u016b\u016c\7o\2\2\u016c\u016d\7r\2\2\u016d"+
+		"\u016e\7v\2\2\u016e\u016f\7{\2\2\u016fL\3\2\2\2\u0170\u0171\7n\2\2\u0171"+
+		"\u0172\7k\2\2\u0172\u0173\7m\2\2\u0173\u0174\7g\2\2\u0174N\3\2\2\2\u0175"+
+		"\u0176\7k\2\2\u0176\u0177\7n\2\2\u0177\u0178\7k\2\2\u0178\u0179\7m\2\2"+
+		"\u0179\u017a\7g\2\2\u017aP\3\2\2\2\u017b\u017c\7e\2\2\u017c\u017d\7q\2"+
+		"\2\u017d\u017e\7p\2\2\u017e\u017f\7v\2\2\u017f\u0180\7c\2\2\u0180\u0181"+
+		"\7k\2\2\u0181\u0182\7p\2\2\u0182\u0183\7u\2\2\u0183R\3\2\2\2\u0184\u0185"+
+		"\7k\2\2\u0185\u0186\7e\2\2\u0186\u0187\7q\2\2\u0187\u0188\7p\2\2\u0188"+
+		"\u0189\7v\2\2\u0189\u018a\7c\2\2\u018a\u018b\7k\2\2\u018b\u018c\7p\2\2"+
+		"\u018c\u018d\7u\2\2\u018dT\3\2\2\2\u018e\u018f\7u\2\2\u018f\u0190\7v\2"+
+		"\2\u0190\u0191\7c\2\2\u0191\u0192\7t\2\2\u0192\u0193\7v\2\2\u0193\u0194"+
+		"\7u\2\2\u0194\u0195\7Y\2\2\u0195\u0196\7k\2\2\u0196\u0197\7v\2\2\u0197"+
+		"\u0198\7j\2\2\u0198V\3\2\2\2\u0199\u019a\7k\2\2\u019a\u019b\7u\2\2\u019b"+
+		"\u019c\7v\2\2\u019c\u019d\7c\2\2\u019d\u019e\7t\2\2\u019e\u019f\7v\2\2"+
+		"\u019f\u01a0\7u\2\2\u01a0\u01a1\7Y\2\2\u01a1\u01a2\7k\2\2\u01a2\u01a3"+
+		"\7v\2\2\u01a3\u01a4\7j\2\2\u01a4X\3\2\2\2\u01a5\u01a6\7g\2\2\u01a6\u01a7"+
+		"\7p\2\2\u01a7\u01a8\7f\2\2\u01a8\u01a9\7u\2\2\u01a9\u01aa\7Y\2\2\u01aa"+
+		"\u01ab\7k\2\2\u01ab\u01ac\7v\2\2\u01ac\u01ad\7j\2\2\u01adZ\3\2\2\2\u01ae"+
+		"\u01af\7k\2\2\u01af\u01b0\7g\2\2\u01b0\u01b1\7p\2\2\u01b1\u01b2\7f\2\2"+
+		"\u01b2\u01b3\7u\2\2\u01b3\u01b4\7Y\2\2\u01b4\u01b5\7k\2\2\u01b5\u01b6"+
+		"\7v\2\2\u01b6\u01b7\7j\2\2\u01b7\\\3\2\2\2\u01b8\u01b9\7?\2\2\u01b9^\3"+
+		"\2\2\2\u01ba\u01bb\7g\2\2\u01bb\u01bc\7s\2\2\u01bc`\3\2\2\2\u01bd\u01be"+
+		"\7@\2\2\u01beb\3\2\2\2\u01bf\u01c0\7i\2\2\u01c0\u01c1\7v\2\2\u01c1d\3"+
+		"\2\2\2\u01c2\u01c3\7@\2\2\u01c3\u01c4\7?\2\2\u01c4f\3\2\2\2\u01c5\u01c6"+
+		"\7i\2\2\u01c6\u01c7\7g\2\2\u01c7h\3\2\2\2\u01c8\u01c9\7i\2\2\u01c9\u01ca"+
+		"\7v\2\2\u01ca\u01cb\7g\2\2\u01cbj\3\2\2\2\u01cc\u01cd\7>\2\2\u01cdl\3"+
+		"\2\2\2\u01ce\u01cf\7n\2\2\u01cf\u01d0\7v\2\2\u01d0n\3\2\2\2\u01d1\u01d2"+
+		"\7>\2\2\u01d2\u01d3\7?\2\2\u01d3p\3\2\2\2\u01d4\u01d5\7n\2\2\u01d5\u01d6"+
+		"\7g\2\2\u01d6r\3\2\2\2\u01d7\u01d8\7n\2\2\u01d8\u01d9\7v\2\2\u01d9\u01da"+
+		"\7g\2\2\u01dat\3\2\2\2\u01db\u01dc\7>\2\2\u01dc\u01dd\7@\2\2\u01ddv\3"+
+		"\2\2\2\u01de\u01df\7#\2\2\u01df\u01e0\7?\2\2\u01e0x\3\2\2\2\u01e1\u01e2"+
+		"\7p\2\2\u01e2\u01e3\7g\2\2\u01e3z\3\2\2\2\u01e4\u01e5\7k\2\2\u01e5\u01e6"+
+		"\7g\2\2\u01e6\u01e7\7s\2\2\u01e7|\3\2\2\2\u01e8\u01e9\7k\2\2\u01e9\u01ea"+
+		"\7p\2\2\u01ea\u01eb\7g\2\2\u01eb~\3\2\2\2\u01ec\u01ed\7g\2\2\u01ed\u01ee"+
+		"\7s\2\2\u01ee\u01ef\7Q\2\2\u01ef\u01f0\7t\2\2\u01f0\u01f1\7P\2\2\u01f1"+
+		"\u01f2\7w\2\2\u01f2\u01f3\7n\2\2\u01f3\u01f4\7n\2\2\u01f4\u0080\3\2\2"+
+		"\2\u01f5\u01f6\7i\2\2\u01f6\u01f7\7v\2\2\u01f7\u01f8\7Q\2\2\u01f8\u01f9"+
+		"\7t\2\2\u01f9\u01fa\7P\2\2\u01fa\u01fb\7w\2\2\u01fb\u01fc\7n\2\2\u01fc"+
+		"\u01fd\7n\2\2\u01fd\u0082\3\2\2\2\u01fe\u01ff\7n\2\2\u01ff\u0200\7v\2"+
+		"\2\u0200\u0201\7Q\2\2\u0201\u0202\7t\2\2\u0202\u0203\7P\2\2\u0203\u0204"+
+		"\7w\2\2\u0204\u0205\7n\2\2\u0205\u0206\7n\2\2\u0206\u0084\3\2\2\2\u0207"+
+		"\u0208\7<\2\2\u0208\u020c\t\2\2\2\u0209\u020b\t\3\2\2\u020a\u0209\3\2"+
+		"\2\2\u020b\u020e\3\2\2\2\u020c\u020a\3\2\2\2\u020c\u020d\3\2\2\2\u020d"+
+		"\u0217\3\2\2\2\u020e\u020c\3\2\2\2\u020f\u0213\7A\2\2\u0210\u0212\4\62"+
+		";\2\u0211\u0210\3\2\2\2\u0212\u0215\3\2\2\2\u0213\u0211\3\2\2\2\u0213"+
+		"\u0214\3\2\2\2\u0214\u0217\3\2\2\2\u0215\u0213\3\2\2\2\u0216\u0207\3\2"+
+		"\2\2\u0216\u020f\3\2\2\2\u0217\u0086\3\2\2\2\u0218\u021c\t\2\2\2\u0219"+
+		"\u021b\t\4\2\2\u021a\u0219\3\2\2\2\u021b\u021e\3\2\2\2\u021c\u021a\3\2"+
+		"\2\2\u021c\u021d\3\2\2\2\u021d\u0088\3\2\2\2\u021e\u021c\3\2\2\2\u021f"+
+		"\u0220\7b\2\2\u0220\u0221\5\u0087D\2\u0221\u0222\7b\2\2\u0222\u008a\3"+
+		"\2\2\2\u0223\u0224\7u\2\2\u0224\u0225\7w\2\2\u0225\u0226\7o\2\2\u0226"+
+		"\u0227\7*\2\2\u0227\u0228\3\2\2\2\u0228\u0229\5\u0087D\2\u0229\u022a\7"+
+		"+\2\2\u022a\u024e\3\2\2\2\u022b\u022c\7o\2\2\u022c\u022d\7c\2\2\u022d"+
+		"\u022e\7z\2\2\u022e\u022f\7*\2\2\u022f\u0230\3\2\2\2\u0230\u0231\5\u0087"+
+		"D\2\u0231\u0232\7+\2\2\u0232\u024e\3\2\2\2\u0233\u0234\7o\2\2\u0234\u0235"+
+		"\7k\2\2\u0235\u0236\7p\2\2\u0236\u0237\7*\2\2\u0237\u0238\3\2\2\2\u0238"+
+		"\u0239\5\u0087D\2\u0239\u023a\7+\2\2\u023a\u024e\3\2\2\2\u023b\u023c\7"+
+		"c\2\2\u023c\u023d\7x\2\2\u023d\u023e\7i\2\2\u023e\u023f\7*\2\2\u023f\u0240"+
+		"\3\2\2\2\u0240\u0241\5\u0087D\2\u0241\u0242\7+\2\2\u0242\u024e\3\2\2\2"+
+		"\u0243\u0244\7e\2\2\u0244\u0245\7q\2\2\u0245\u0246\7w\2\2\u0246\u0247"+
+		"\7p\2\2\u0247\u0248\7v\2\2\u0248\u0249\7*\2\2\u0249\u024a\3\2\2\2\u024a"+
+		"\u024b\5\u0087D\2\u024b\u024c\7+\2\2\u024c\u024e\3\2\2\2\u024d\u0223\3"+
+		"\2\2\2\u024d\u022b\3\2\2\2\u024d\u0233\3\2\2\2\u024d\u023b\3\2\2\2\u024d"+
+		"\u0243\3\2\2\2\u024e\u008c\3\2\2\2\u024f\u0250\7v\2\2\u0250\u0251\7t\2"+
+		"\2\u0251\u0252\7w\2\2\u0252\u0259\7g\2\2\u0253\u0254\7h\2\2\u0254\u0255"+
+		"\7c\2\2\u0255\u0256\7n\2\2\u0256\u0257\7u\2\2\u0257\u0259\7g\2\2\u0258"+
+		"\u024f\3\2\2\2\u0258\u0253\3\2\2\2\u0259\u008e\3\2\2\2\u025a\u025c\7/"+
+		"\2\2\u025b\u025a\3\2\2\2\u025b\u025c\3\2\2\2\u025c\u025d\3\2\2\2\u025d"+
+		"\u0264\5\u0091I\2\u025e\u0260\7/\2\2\u025f\u025e\3\2\2\2\u025f\u0260\3"+
+		"\2\2\2\u0260\u0261\3\2\2\2\u0261\u0264\5\u0093J\2\u0262\u0264\5\u0095"+
+		"K\2\u0263\u025b\3\2\2\2\u0263\u025f\3\2\2\2\u0263\u0262\3\2\2\2\u0264"+
+		"\u0090\3\2\2\2\u0265\u0267\t\5\2\2\u0266\u0265\3\2\2\2\u0267\u0268\3\2"+
+		"\2\2\u0268\u0266\3\2\2\2\u0268\u0269\3\2\2\2\u0269\u026a\3\2\2\2\u026a"+
+		"\u026e\7\60\2\2\u026b\u026d\t\5\2\2\u026c\u026b\3\2\2\2\u026d\u0270\3"+
+		"\2\2\2\u026e\u026c\3\2\2\2\u026e\u026f\3\2\2\2\u026f\u0092\3\2\2\2\u0270"+
+		"\u026e\3\2\2\2\u0271\u0275\t\6\2\2\u0272\u0274\t\5\2\2\u0273\u0272\3\2"+
+		"\2\2\u0274\u0277\3\2\2\2\u0275\u0273\3\2\2\2\u0275\u0276\3\2\2\2\u0276"+
+		"\u0094\3\2\2\2\u0277\u0275\3\2\2\2\u0278\u0279\7\62\2\2\u0279\u0096\3"+
+		"\2\2\2\u027a\u0280\7)\2\2\u027b\u027f\n\7\2\2\u027c\u027d\7)\2\2\u027d"+
+		"\u027f\7)\2\2\u027e\u027b\3\2\2\2\u027e\u027c\3\2\2\2\u027f\u0282\3\2"+
+		"\2\2\u0280\u027e\3\2\2\2\u0280\u0281\3\2\2\2\u0281\u0283\3\2\2\2\u0282"+
+		"\u0280\3\2\2\2\u0283\u0284\7)\2\2\u0284\u0098\3\2\2\2\u0285\u0286\t\b"+
+		"\2\2\u0286\u0287\3\2\2\2\u0287\u0288\bM\2\2\u0288\u009a\3\2\2\2\21\2\u020c"+
+		"\u0213\u0216\u021c\u024d\u0258\u025b\u025f\u0263\u0268\u026e\u0275\u027e"+
+		"\u0280\3\b\2\2";
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens
index 8a595f026..ec5d9571b 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens
@@ -62,17 +62,18 @@ T__60=61
 T__61=62
 T__62=63
 T__63=64
-INPUT_VARIABLE=65
-PATH_VARIABLE=66
-QUOTED_PATH_VARIABLE=67
-PROP_FORMULA=68
-BOOLEAN_LITERAL=69
-NUMBER_LITERAL=70
-DOUBLE=71
-INT=72
-ZERO=73
-STRING_LITERAL=74
-WS=75
+T__64=65
+INPUT_VARIABLE=66
+PATH_VARIABLE=67
+QUOTED_PATH_VARIABLE=68
+PROP_FORMULA=69
+BOOLEAN_LITERAL=70
+NUMBER_LITERAL=71
+DOUBLE=72
+INT=73
+ZERO=74
+STRING_LITERAL=75
+WS=76
 '('=1
 ')'=2
 'select'=3
@@ -98,43 +99,44 @@ WS=75
 'inOrEmpty'=23
 'in'=24
 'between'=25
-'inrange'=26
-'to'=27
-'is'=28
-'null'=29
-'isNull'=30
-'isNotNull'=31
-'notNull'=32
-'empty'=33
-'isEmpty'=34
-'isNotEmpty'=35
-'notEmpty'=36
-'like'=37
-'ilike'=38
-'contains'=39
-'icontains'=40
-'startsWith'=41
-'istartsWith'=42
-'endsWith'=43
-'iendsWith'=44
-'='=45
-'eq'=46
-'>'=47
-'gt'=48
-'>='=49
-'ge'=50
-'gte'=51
-'<'=52
-'lt'=53
-'<='=54
-'le'=55
-'lte'=56
-'<>'=57
-'!='=58
-'ne'=59
-'ieq'=60
-'ine'=61
-'eqOrNull'=62
-'gtOrNull'=63
-'ltOrNull'=64
-'0'=73
+'to'=26
+'inrange'=27
+'inRange'=28
+'is'=29
+'null'=30
+'isNull'=31
+'isNotNull'=32
+'notNull'=33
+'empty'=34
+'isEmpty'=35
+'isNotEmpty'=36
+'notEmpty'=37
+'like'=38
+'ilike'=39
+'contains'=40
+'icontains'=41
+'startsWith'=42
+'istartsWith'=43
+'endsWith'=44
+'iendsWith'=45
+'='=46
+'eq'=47
+'>'=48
+'gt'=49
+'>='=50
+'ge'=51
+'gte'=52
+'<'=53
+'lt'=54
+'<='=55
+'le'=56
+'lte'=57
+'<>'=58
+'!='=59
+'ne'=60
+'ieq'=61
+'ine'=62
+'eqOrNull'=63
+'gtOrNull'=64
+'ltOrNull'=65
+'0'=74
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java
index 5f9f0121e..355826a6b 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java
@@ -337,6 +337,16 @@ public interface EQLListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitInrange_expression(EQLParser.Inrange_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#inrange_op}.
+	 * @param ctx the parse tree
+	 */
+	void enterInrange_op(EQLParser.Inrange_opContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#inrange_op}.
+	 * @param ctx the parse tree
+	 */
+	void exitInrange_op(EQLParser.Inrange_opContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link EQLParser#propertyBetween_expression}.
 	 * @param ctx the parse tree
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
index 4b1e1cef5..4fe33f9bc 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
@@ -36,9 +36,9 @@ public class EQLParser extends Parser {
 		T__38=39, T__39=40, T__40=41, T__41=42, T__42=43, T__43=44, T__44=45,
 		T__45=46, T__46=47, T__47=48, T__48=49, T__49=50, T__50=51, T__51=52,
 		T__52=53, T__53=54, T__54=55, T__55=56, T__56=57, T__57=58, T__58=59,
-		T__59=60, T__60=61, T__61=62, T__62=63, T__63=64, INPUT_VARIABLE=65, PATH_VARIABLE=66,
-		QUOTED_PATH_VARIABLE=67, PROP_FORMULA=68, BOOLEAN_LITERAL=69, NUMBER_LITERAL=70,
-		DOUBLE=71, INT=72, ZERO=73, STRING_LITERAL=74, WS=75;
+		T__59=60, T__60=61, T__61=62, T__62=63, T__63=64, T__64=65, INPUT_VARIABLE=66,
+		PATH_VARIABLE=67, QUOTED_PATH_VARIABLE=68, PROP_FORMULA=69, BOOLEAN_LITERAL=70,
+		NUMBER_LITERAL=71, DOUBLE=72, INT=73, ZERO=74, STRING_LITERAL=75, WS=76;
 	public static final int
 		RULE_select_statement = 0, RULE_select_properties = 1, RULE_select_clause = 2,
 		RULE_distinct = 3, RULE_fetch_clause = 4, RULE_where_clause = 5, RULE_orderby_clause = 6,
@@ -50,11 +50,11 @@ public class EQLParser extends Parser {
 		RULE_fetch_batch_size = 22, RULE_conditional_expression = 23, RULE_conditional_term = 24,
 		RULE_conditional_factor = 25, RULE_conditional_primary = 26, RULE_any_expression = 27,
 		RULE_inOrEmpty_expression = 28, RULE_in_expression = 29, RULE_in_value = 30,
-		RULE_between_expression = 31, RULE_inrange_expression = 32, RULE_propertyBetween_expression = 33,
-		RULE_isNull_expression = 34, RULE_isNotNull_expression = 35, RULE_isEmpty_expression = 36,
-		RULE_isNotEmpty_expression = 37, RULE_like_expression = 38, RULE_like_op = 39,
-		RULE_comparison_expression = 40, RULE_comparison_operator = 41, RULE_value_expression = 42,
-		RULE_literal = 43;
+		RULE_between_expression = 31, RULE_inrange_expression = 32, RULE_inrange_op = 33,
+		RULE_propertyBetween_expression = 34, RULE_isNull_expression = 35, RULE_isNotNull_expression = 36,
+		RULE_isEmpty_expression = 37, RULE_isNotEmpty_expression = 38, RULE_like_expression = 39,
+		RULE_like_op = 40, RULE_comparison_expression = 41, RULE_comparison_operator = 42,
+		RULE_value_expression = 43, RULE_literal = 44;
 	private static String[] makeRuleNames() {
 		return new String[] {
 			"select_statement", "select_properties", "select_clause", "distinct",
@@ -65,7 +65,7 @@ public class EQLParser extends Parser {
 			"fetch_lazy_option", "fetch_batch_size", "conditional_expression", "conditional_term",
 			"conditional_factor", "conditional_primary", "any_expression", "inOrEmpty_expression",
 			"in_expression", "in_value", "between_expression", "inrange_expression",
-			"propertyBetween_expression", "isNull_expression", "isNotNull_expression",
+			"inrange_op", "propertyBetween_expression", "isNull_expression", "isNotNull_expression",
 			"isEmpty_expression", "isNotEmpty_expression", "like_expression", "like_op",
 			"comparison_expression", "comparison_operator", "value_expression", "literal"
 		};
@@ -77,13 +77,14 @@ public class EQLParser extends Parser {
 			null, "'('", "')'", "'select'", "'distinct'", "'where'", "'order'", "'by'",
 			"','", "'nulls'", "'first'", "'last'", "'asc'", "'desc'", "'limit'",
 			"'offset'", "'fetch'", "'+'", "'query'", "'lazy'", "'or'", "'and'", "'not'",
-			"'inOrEmpty'", "'in'", "'between'", "'inrange'", "'to'", "'is'", "'null'",
-			"'isNull'", "'isNotNull'", "'notNull'", "'empty'", "'isEmpty'", "'isNotEmpty'",
-			"'notEmpty'", "'like'", "'ilike'", "'contains'", "'icontains'", "'startsWith'",
-			"'istartsWith'", "'endsWith'", "'iendsWith'", "'='", "'eq'", "'>'", "'gt'",
-			"'>='", "'ge'", "'gte'", "'<'", "'lt'", "'<='", "'le'", "'lte'", "'<>'",
-			"'!='", "'ne'", "'ieq'", "'ine'", "'eqOrNull'", "'gtOrNull'", "'ltOrNull'",
-			null, null, null, null, null, null, null, null, "'0'"
+			"'inOrEmpty'", "'in'", "'between'", "'to'", "'inrange'", "'inRange'",
+			"'is'", "'null'", "'isNull'", "'isNotNull'", "'notNull'", "'empty'",
+			"'isEmpty'", "'isNotEmpty'", "'notEmpty'", "'like'", "'ilike'", "'contains'",
+			"'icontains'", "'startsWith'", "'istartsWith'", "'endsWith'", "'iendsWith'",
+			"'='", "'eq'", "'>'", "'gt'", "'>='", "'ge'", "'gte'", "'<'", "'lt'",
+			"'<='", "'le'", "'lte'", "'<>'", "'!='", "'ne'", "'ieq'", "'ine'", "'eqOrNull'",
+			"'gtOrNull'", "'ltOrNull'", null, null, null, null, null, null, null,
+			null, "'0'"
 		};
 	}
 	private static final String[] _LITERAL_NAMES = makeLiteralNames();
@@ -94,9 +95,9 @@ public class EQLParser extends Parser {
 			null, null, null, null, null, null, null, null, null, null, null, null,
 			null, null, null, null, null, null, null, null, null, null, null, null,
 			null, null, null, null, null, null, null, null, null, null, null, null,
-			null, null, null, null, null, "INPUT_VARIABLE", "PATH_VARIABLE", "QUOTED_PATH_VARIABLE",
-			"PROP_FORMULA", "BOOLEAN_LITERAL", "NUMBER_LITERAL", "DOUBLE", "INT",
-			"ZERO", "STRING_LITERAL", "WS"
+			null, null, null, null, null, null, "INPUT_VARIABLE", "PATH_VARIABLE",
+			"QUOTED_PATH_VARIABLE", "PROP_FORMULA", "BOOLEAN_LITERAL", "NUMBER_LITERAL",
+			"DOUBLE", "INT", "ZERO", "STRING_LITERAL", "WS"
 		};
 	}
 	private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
@@ -191,61 +192,61 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(89);
+			setState(91);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__2) {
 				{
-				setState(88);
+				setState(90);
 				select_clause();
 				}
 			}
 
-			setState(94);
+			setState(96);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__15) {
 				{
 				{
-				setState(91);
+				setState(93);
 				fetch_clause();
 				}
 				}
-				setState(96);
+				setState(98);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
-			setState(98);
+			setState(100);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__4) {
 				{
-				setState(97);
+				setState(99);
 				where_clause();
 				}
 			}
 
-			setState(101);
+			setState(103);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__5) {
 				{
-				setState(100);
+				setState(102);
 				orderby_clause();
 				}
 			}
 
-			setState(104);
+			setState(106);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__13) {
 				{
-				setState(103);
+				setState(105);
 				limit_clause();
 				}
 			}
 
-			setState(106);
+			setState(108);
 			match(EOF);
 			}
 		}
@@ -282,17 +283,17 @@ public class EQLParser extends Parser {
 		Select_propertiesContext _localctx = new Select_propertiesContext(_ctx, getState());
 		enterRule(_localctx, 2, RULE_select_properties);
 		try {
-			setState(113);
+			setState(115);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case T__0:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(108);
-				match(T__0);
-				setState(109);
-				fetch_property_group();
 				setState(110);
+				match(T__0);
+				setState(111);
+				fetch_property_group();
+				setState(112);
 				match(T__1);
 				}
 				break;
@@ -301,7 +302,7 @@ public class EQLParser extends Parser {
 			case PROP_FORMULA:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(112);
+				setState(114);
 				fetch_property_group();
 				}
 				break;
@@ -348,19 +349,19 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(115);
-			match(T__2);
 			setState(117);
+			match(T__2);
+			setState(119);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__3) {
 				{
-				setState(116);
+				setState(118);
 				distinct();
 				}
 			}
 
-			setState(119);
+			setState(121);
 			select_properties();
 			}
 		}
@@ -396,7 +397,7 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(121);
+			setState(123);
 			match(T__3);
 			}
 		}
@@ -435,7 +436,7 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(123);
+			setState(125);
 			fetch_path();
 			}
 		}
@@ -474,9 +475,9 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(125);
+			setState(127);
 			match(T__4);
-			setState(126);
+			setState(128);
 			conditional_expression();
 			}
 		}
@@ -519,25 +520,25 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(128);
-			match(T__5);
-			setState(129);
-			match(T__6);
 			setState(130);
+			match(T__5);
+			setState(131);
+			match(T__6);
+			setState(132);
 			orderby_property();
-			setState(135);
+			setState(137);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__7) {
 				{
 				{
-				setState(131);
+				setState(133);
 				match(T__7);
-				setState(132);
+				setState(134);
 				orderby_property();
 				}
 				}
-				setState(137);
+				setState(139);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -583,24 +584,24 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(138);
-			match(PATH_VARIABLE);
 			setState(140);
+			match(PATH_VARIABLE);
+			setState(142);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__11 || _la==T__12) {
 				{
-				setState(139);
+				setState(141);
 				asc_desc();
 				}
 			}
 
-			setState(143);
+			setState(145);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__8) {
 				{
-				setState(142);
+				setState(144);
 				nulls_firstlast();
 				}
 			}
@@ -637,24 +638,24 @@ public class EQLParser extends Parser {
 		Nulls_firstlastContext _localctx = new Nulls_firstlastContext(_ctx, getState());
 		enterRule(_localctx, 16, RULE_nulls_firstlast);
 		try {
-			setState(149);
+			setState(151);
 			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,10,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(145);
+				setState(147);
 				match(T__8);
-				setState(146);
+				setState(148);
 				match(T__9);
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(147);
+				setState(149);
 				match(T__8);
-				setState(148);
+				setState(150);
 				match(T__10);
 				}
 				break;
@@ -693,7 +694,7 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(151);
+			setState(153);
 			_la = _input.LA(1);
 			if ( !(_la==T__11 || _la==T__12) ) {
 			_errHandler.recoverInline(this);
@@ -742,16 +743,16 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(153);
+			setState(155);
 			match(T__13);
-			setState(154);
-			match(NUMBER_LITERAL);
 			setState(156);
+			match(NUMBER_LITERAL);
+			setState(158);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__14) {
 				{
-				setState(155);
+				setState(157);
 				offset_clause();
 				}
 			}
@@ -791,9 +792,9 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(158);
+			setState(160);
 			match(T__14);
-			setState(159);
+			setState(161);
 			match(NUMBER_LITERAL);
 			}
 		}
@@ -839,26 +840,26 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(161);
-			match(T__15);
 			setState(163);
+			match(T__15);
+			setState(165);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__17 || _la==T__18) {
 				{
-				setState(162);
+				setState(164);
 				fetch_option();
 				}
 			}
 
-			setState(165);
-			fetch_path_path();
 			setState(167);
+			fetch_path_path();
+			setState(169);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__0) {
 				{
-				setState(166);
+				setState(168);
 				fetch_property_set();
 				}
 			}
@@ -900,11 +901,11 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(169);
-			match(T__0);
-			setState(170);
-			fetch_property_group();
 			setState(171);
+			match(T__0);
+			setState(172);
+			fetch_property_group();
+			setState(173);
 			match(T__1);
 			}
 		}
@@ -947,21 +948,21 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(173);
+			setState(175);
 			fetch_property();
-			setState(178);
+			setState(180);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__7) {
 				{
 				{
-				setState(174);
+				setState(176);
 				match(T__7);
-				setState(175);
+				setState(177);
 				fetch_property();
 				}
 				}
-				setState(180);
+				setState(182);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -1002,7 +1003,7 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(181);
+			setState(183);
 			_la = _input.LA(1);
 			if ( !(_la==PATH_VARIABLE || _la==QUOTED_PATH_VARIABLE) ) {
 			_errHandler.recoverInline(this);
@@ -1052,34 +1053,34 @@ public class EQLParser extends Parser {
 		Fetch_propertyContext _localctx = new Fetch_propertyContext(_ctx, getState());
 		enterRule(_localctx, 32, RULE_fetch_property);
 		try {
-			setState(187);
+			setState(189);
 			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,15,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(183);
+				setState(185);
 				match(PATH_VARIABLE);
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(184);
+				setState(186);
 				fetch_query_hint();
 				}
 				break;
 			case 3:
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(185);
+				setState(187);
 				fetch_lazy_hint();
 				}
 				break;
 			case 4:
 				enterOuterAlt(_localctx, 4);
 				{
-				setState(186);
+				setState(188);
 				match(PROP_FORMULA);
 				}
 				break;
@@ -1120,9 +1121,9 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(189);
+			setState(191);
 			match(T__16);
-			setState(190);
+			setState(192);
 			fetch_query_option();
 			}
 		}
@@ -1161,9 +1162,9 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(192);
+			setState(194);
 			match(T__16);
-			setState(193);
+			setState(195);
 			fetch_lazy_option();
 			}
 		}
@@ -1203,20 +1204,20 @@ public class EQLParser extends Parser {
 		Fetch_optionContext _localctx = new Fetch_optionContext(_ctx, getState());
 		enterRule(_localctx, 38, RULE_fetch_option);
 		try {
-			setState(197);
+			setState(199);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case T__17:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(195);
+				setState(197);
 				fetch_query_option();
 				}
 				break;
 			case T__18:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(196);
+				setState(198);
 				fetch_lazy_option();
 				}
 				break;
@@ -1260,14 +1261,14 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(199);
-			match(T__17);
 			setState(201);
+			match(T__17);
+			setState(203);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__0) {
 				{
-				setState(200);
+				setState(202);
 				fetch_batch_size();
 				}
 			}
@@ -1310,14 +1311,14 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(203);
-			match(T__18);
 			setState(205);
+			match(T__18);
+			setState(207);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__0) {
 				{
-				setState(204);
+				setState(206);
 				fetch_batch_size();
 				}
 			}
@@ -1357,11 +1358,11 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(207);
-			match(T__0);
-			setState(208);
-			match(NUMBER_LITERAL);
 			setState(209);
+			match(T__0);
+			setState(210);
+			match(NUMBER_LITERAL);
+			setState(211);
 			match(T__1);
 			}
 		}
@@ -1404,21 +1405,21 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(211);
+			setState(213);
 			conditional_term();
-			setState(216);
+			setState(218);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__19) {
 				{
 				{
-				setState(212);
+				setState(214);
 				match(T__19);
-				setState(213);
+				setState(215);
 				conditional_term();
 				}
 				}
-				setState(218);
+				setState(220);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -1463,21 +1464,21 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(219);
+			setState(221);
 			conditional_factor();
-			setState(224);
+			setState(226);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__20) {
 				{
 				{
-				setState(220);
+				setState(222);
 				match(T__20);
-				setState(221);
+				setState(223);
 				conditional_factor();
 				}
 				}
-				setState(226);
+				setState(228);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -1519,17 +1520,17 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(228);
+			setState(230);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__21) {
 				{
-				setState(227);
+				setState(229);
 				match(T__21);
 				}
 			}
 
-			setState(230);
+			setState(232);
 			conditional_primary();
 			}
 		}
@@ -1569,24 +1570,24 @@ public class EQLParser extends Parser {
 		Conditional_primaryContext _localctx = new Conditional_primaryContext(_ctx, getState());
 		enterRule(_localctx, 52, RULE_conditional_primary);
 		try {
-			setState(237);
+			setState(239);
 			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,22,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(232);
+				setState(234);
 				any_expression();
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(233);
-				match(T__0);
-				setState(234);
-				conditional_expression();
 				setState(235);
+				match(T__0);
+				setState(236);
+				conditional_expression();
+				setState(237);
 				match(T__1);
 				}
 				break;
@@ -1658,94 +1659,94 @@ public class EQLParser extends Parser {
 		Any_expressionContext _localctx = new Any_expressionContext(_ctx, getState());
 		enterRule(_localctx, 54, RULE_any_expression);
 		try {
-			setState(254);
+			setState(256);
 			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,23,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(239);
+				setState(241);
 				comparison_expression();
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(240);
+				setState(242);
 				like_expression();
 				}
 				break;
 			case 3:
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(241);
+				setState(243);
 				inrange_expression();
 				}
 				break;
 			case 4:
 				enterOuterAlt(_localctx, 4);
 				{
-				setState(242);
+				setState(244);
 				between_expression();
 				}
 				break;
 			case 5:
 				enterOuterAlt(_localctx, 5);
 				{
-				setState(243);
+				setState(245);
 				propertyBetween_expression();
 				}
 				break;
 			case 6:
 				enterOuterAlt(_localctx, 6);
 				{
-				setState(244);
+				setState(246);
 				inOrEmpty_expression();
 				}
 				break;
 			case 7:
 				enterOuterAlt(_localctx, 7);
 				{
-				setState(245);
+				setState(247);
 				in_expression();
 				}
 				break;
 			case 8:
 				enterOuterAlt(_localctx, 8);
 				{
-				setState(246);
+				setState(248);
 				isNull_expression();
 				}
 				break;
 			case 9:
 				enterOuterAlt(_localctx, 9);
 				{
-				setState(247);
+				setState(249);
 				isNotNull_expression();
 				}
 				break;
 			case 10:
 				enterOuterAlt(_localctx, 10);
 				{
-				setState(248);
+				setState(250);
 				isEmpty_expression();
 				}
 				break;
 			case 11:
 				enterOuterAlt(_localctx, 11);
 				{
-				setState(249);
+				setState(251);
 				isNotEmpty_expression();
 				}
 				break;
 			case 12:
 				enterOuterAlt(_localctx, 12);
 				{
-				setState(250);
-				match(T__0);
-				setState(251);
-				any_expression();
 				setState(252);
+				match(T__0);
+				setState(253);
+				any_expression();
+				setState(254);
 				match(T__1);
 				}
 				break;
@@ -1787,11 +1788,11 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(256);
-			match(PATH_VARIABLE);
-			setState(257);
-			match(T__22);
 			setState(258);
+			match(PATH_VARIABLE);
+			setState(259);
+			match(T__22);
+			setState(260);
 			in_value();
 			}
 		}
@@ -1831,11 +1832,11 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(260);
-			match(PATH_VARIABLE);
-			setState(261);
-			match(T__23);
 			setState(262);
+			match(PATH_VARIABLE);
+			setState(263);
+			match(T__23);
+			setState(264);
 			in_value();
 			}
 		}
@@ -1877,40 +1878,40 @@ public class EQLParser extends Parser {
 		enterRule(_localctx, 60, RULE_in_value);
 		int _la;
 		try {
-			setState(276);
+			setState(278);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case INPUT_VARIABLE:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(264);
+				setState(266);
 				match(INPUT_VARIABLE);
 				}
 				break;
 			case T__0:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(265);
+				setState(267);
 				match(T__0);
-				setState(266);
+				setState(268);
 				value_expression();
-				setState(271);
+				setState(273);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 				while (_la==T__7) {
 					{
 					{
-					setState(267);
+					setState(269);
 					match(T__7);
-					setState(268);
+					setState(270);
 					value_expression();
 					}
 					}
-					setState(273);
+					setState(275);
 					_errHandler.sync(this);
 					_la = _input.LA(1);
 				}
-				setState(274);
+				setState(276);
 				match(T__1);
 				}
 				break;
@@ -1957,16 +1958,16 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(278);
-			match(PATH_VARIABLE);
-			setState(279);
-			match(T__24);
 			setState(280);
-			value_expression();
+			match(PATH_VARIABLE);
 			setState(281);
-			match(T__20);
+			match(T__24);
 			setState(282);
 			value_expression();
+			setState(283);
+			match(T__20);
+			setState(284);
+			value_expression();
 			}
 		}
 		catch (RecognitionException re) {
@@ -1982,6 +1983,9 @@ public class EQLParser extends Parser {
 
 	public static class Inrange_expressionContext extends ParserRuleContext {
 		public TerminalNode PATH_VARIABLE() { return getToken(EQLParser.PATH_VARIABLE, 0); }
+		public Inrange_opContext inrange_op() {
+			return getRuleContext(Inrange_opContext.class,0);
+		}
 		public List<Value_expressionContext> value_expression() {
 			return getRuleContexts(Value_expressionContext.class);
 		}
@@ -2008,16 +2012,61 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(284);
-			match(PATH_VARIABLE);
-			setState(285);
-			match(T__25);
 			setState(286);
-			value_expression();
+			match(PATH_VARIABLE);
 			setState(287);
-			match(T__26);
+			inrange_op();
 			setState(288);
 			value_expression();
+			setState(289);
+			match(T__25);
+			setState(290);
+			value_expression();
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Inrange_opContext extends ParserRuleContext {
+		public Inrange_opContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_inrange_op; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterInrange_op(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitInrange_op(this);
+		}
+	}
+
+	public final Inrange_opContext inrange_op() throws RecognitionException {
+		Inrange_opContext _localctx = new Inrange_opContext(_ctx, getState());
+		enterRule(_localctx, 66, RULE_inrange_op);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(292);
+			_la = _input.LA(1);
+			if ( !(_la==T__26 || _la==T__27) ) {
+			_errHandler.recoverInline(this);
+			}
+			else {
+				if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
+				_errHandler.reportMatch(this);
+				consume();
+			}
 			}
 		}
 		catch (RecognitionException re) {
@@ -2055,19 +2104,19 @@ public class EQLParser extends Parser {
 
 	public final PropertyBetween_expressionContext propertyBetween_expression() throws RecognitionException {
 		PropertyBetween_expressionContext _localctx = new PropertyBetween_expressionContext(_ctx, getState());
-		enterRule(_localctx, 66, RULE_propertyBetween_expression);
+		enterRule(_localctx, 68, RULE_propertyBetween_expression);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(290);
-			value_expression();
-			setState(291);
-			match(T__24);
-			setState(292);
-			match(PATH_VARIABLE);
-			setState(293);
-			match(T__20);
 			setState(294);
+			value_expression();
+			setState(295);
+			match(T__24);
+			setState(296);
+			match(PATH_VARIABLE);
+			setState(297);
+			match(T__20);
+			setState(298);
 			match(PATH_VARIABLE);
 			}
 		}
@@ -2100,29 +2149,29 @@ public class EQLParser extends Parser {
 
 	public final IsNull_expressionContext isNull_expression() throws RecognitionException {
 		IsNull_expressionContext _localctx = new IsNull_expressionContext(_ctx, getState());
-		enterRule(_localctx, 68, RULE_isNull_expression);
+		enterRule(_localctx, 70, RULE_isNull_expression);
 		try {
-			setState(301);
+			setState(305);
 			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,26,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(296);
+				setState(300);
 				match(PATH_VARIABLE);
-				setState(297);
-				match(T__27);
-				setState(298);
+				setState(301);
 				match(T__28);
+				setState(302);
+				match(T__29);
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(299);
+				setState(303);
 				match(PATH_VARIABLE);
-				setState(300);
-				match(T__29);
+				setState(304);
+				match(T__30);
 				}
 				break;
 			}
@@ -2156,40 +2205,40 @@ public class EQLParser extends Parser {
 
 	public final IsNotNull_expressionContext isNotNull_expression() throws RecognitionException {
 		IsNotNull_expressionContext _localctx = new IsNotNull_expressionContext(_ctx, getState());
-		enterRule(_localctx, 70, RULE_isNotNull_expression);
+		enterRule(_localctx, 72, RULE_isNotNull_expression);
 		try {
-			setState(311);
+			setState(315);
 			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,27,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(303);
+				setState(307);
 				match(PATH_VARIABLE);
-				setState(304);
-				match(T__27);
-				setState(305);
-				match(T__21);
-				setState(306);
+				setState(308);
 				match(T__28);
+				setState(309);
+				match(T__21);
+				setState(310);
+				match(T__29);
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(307);
+				setState(311);
 				match(PATH_VARIABLE);
-				setState(308);
-				match(T__30);
+				setState(312);
+				match(T__31);
 				}
 				break;
 			case 3:
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(309);
+				setState(313);
 				match(PATH_VARIABLE);
-				setState(310);
-				match(T__31);
+				setState(314);
+				match(T__32);
 				}
 				break;
 			}
@@ -2223,29 +2272,29 @@ public class EQLParser extends Parser {
 
 	public final IsEmpty_expressionContext isEmpty_expression() throws RecognitionException {
 		IsEmpty_expressionContext _localctx = new IsEmpty_expressionContext(_ctx, getState());
-		enterRule(_localctx, 72, RULE_isEmpty_expression);
+		enterRule(_localctx, 74, RULE_isEmpty_expression);
 		try {
-			setState(318);
+			setState(322);
 			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,28,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(313);
+				setState(317);
 				match(PATH_VARIABLE);
-				setState(314);
-				match(T__27);
-				setState(315);
-				match(T__32);
+				setState(318);
+				match(T__28);
+				setState(319);
+				match(T__33);
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(316);
+				setState(320);
 				match(PATH_VARIABLE);
-				setState(317);
-				match(T__33);
+				setState(321);
+				match(T__34);
 				}
 				break;
 			}
@@ -2279,40 +2328,40 @@ public class EQLParser extends Parser {
 
 	public final IsNotEmpty_expressionContext isNotEmpty_expression() throws RecognitionException {
 		IsNotEmpty_expressionContext _localctx = new IsNotEmpty_expressionContext(_ctx, getState());
-		enterRule(_localctx, 74, RULE_isNotEmpty_expression);
+		enterRule(_localctx, 76, RULE_isNotEmpty_expression);
 		try {
-			setState(328);
+			setState(332);
 			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,29,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(320);
+				setState(324);
 				match(PATH_VARIABLE);
-				setState(321);
-				match(T__27);
-				setState(322);
+				setState(325);
+				match(T__28);
+				setState(326);
 				match(T__21);
-				setState(323);
-				match(T__32);
+				setState(327);
+				match(T__33);
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(324);
+				setState(328);
 				match(PATH_VARIABLE);
-				setState(325);
-				match(T__34);
+				setState(329);
+				match(T__35);
 				}
 				break;
 			case 3:
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(326);
+				setState(330);
 				match(PATH_VARIABLE);
-				setState(327);
-				match(T__35);
+				setState(331);
+				match(T__36);
 				}
 				break;
 			}
@@ -2352,15 +2401,15 @@ public class EQLParser extends Parser {
 
 	public final Like_expressionContext like_expression() throws RecognitionException {
 		Like_expressionContext _localctx = new Like_expressionContext(_ctx, getState());
-		enterRule(_localctx, 76, RULE_like_expression);
+		enterRule(_localctx, 78, RULE_like_expression);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(330);
+			setState(334);
 			match(PATH_VARIABLE);
-			setState(331);
+			setState(335);
 			like_op();
-			setState(332);
+			setState(336);
 			value_expression();
 			}
 		}
@@ -2392,14 +2441,14 @@ public class EQLParser extends Parser {
 
 	public final Like_opContext like_op() throws RecognitionException {
 		Like_opContext _localctx = new Like_opContext(_ctx, getState());
-		enterRule(_localctx, 78, RULE_like_op);
+		enterRule(_localctx, 80, RULE_like_op);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(334);
+			setState(338);
 			_la = _input.LA(1);
-			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__36) | (1L << T__37) | (1L << T__38) | (1L << T__39) | (1L << T__40) | (1L << T__41) | (1L << T__42) | (1L << T__43))) != 0)) ) {
+			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__37) | (1L << T__38) | (1L << T__39) | (1L << T__40) | (1L << T__41) | (1L << T__42) | (1L << T__43) | (1L << T__44))) != 0)) ) {
 			_errHandler.recoverInline(this);
 			}
 			else {
@@ -2444,19 +2493,19 @@ public class EQLParser extends Parser {
 
 	public final Comparison_expressionContext comparison_expression() throws RecognitionException {
 		Comparison_expressionContext _localctx = new Comparison_expressionContext(_ctx, getState());
-		enterRule(_localctx, 80, RULE_comparison_expression);
+		enterRule(_localctx, 82, RULE_comparison_expression);
 		try {
-			setState(344);
+			setState(348);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case PATH_VARIABLE:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(336);
+				setState(340);
 				match(PATH_VARIABLE);
-				setState(337);
+				setState(341);
 				comparison_operator();
-				setState(338);
+				setState(342);
 				value_expression();
 				}
 				break;
@@ -2466,11 +2515,11 @@ public class EQLParser extends Parser {
 			case STRING_LITERAL:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(340);
+				setState(344);
 				value_expression();
-				setState(341);
+				setState(345);
 				comparison_operator();
-				setState(342);
+				setState(346);
 				match(PATH_VARIABLE);
 				}
 				break;
@@ -2506,14 +2555,14 @@ public class EQLParser extends Parser {
 
 	public final Comparison_operatorContext comparison_operator() throws RecognitionException {
 		Comparison_operatorContext _localctx = new Comparison_operatorContext(_ctx, getState());
-		enterRule(_localctx, 82, RULE_comparison_operator);
+		enterRule(_localctx, 84, RULE_comparison_operator);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(346);
+			setState(350);
 			_la = _input.LA(1);
-			if ( !(((((_la - 45)) & ~0x3f) == 0 && ((1L << (_la - 45)) & ((1L << (T__44 - 45)) | (1L << (T__45 - 45)) | (1L << (T__46 - 45)) | (1L << (T__47 - 45)) | (1L << (T__48 - 45)) | (1L << (T__49 - 45)) | (1L << (T__50 - 45)) | (1L << (T__51 - 45)) | (1L << (T__52 - 45)) | (1L << (T__53 - 45)) | (1L << (T__54 - 45)) | (1L << (T__55 - 45)) | (1L << (T__56 - 45)) | (1L << (T__57 - 45)) | (1L << (T__58 - 45)) | (1L << (T__59 - 45)) | (1L << (T__60 - 45)) | (1L << (T__61 - 45)) | (1L << (T__62 - 45)) | (1L << (T__63 - 45)))) != 0)) ) {
+			if ( !(((((_la - 46)) & ~0x3f) == 0 && ((1L << (_la - 46)) & ((1L << (T__45 - 46)) | (1L << (T__46 - 46)) | (1L << (T__47 - 46)) | (1L << (T__48 - 46)) | (1L << (T__49 - 46)) | (1L << (T__50 - 46)) | (1L << (T__51 - 46)) | (1L << (T__52 - 46)) | (1L << (T__53 - 46)) | (1L << (T__54 - 46)) | (1L << (T__55 - 46)) | (1L << (T__56 - 46)) | (1L << (T__57 - 46)) | (1L << (T__58 - 46)) | (1L << (T__59 - 46)) | (1L << (T__60 - 46)) | (1L << (T__61 - 46)) | (1L << (T__62 - 46)) | (1L << (T__63 - 46)) | (1L << (T__64 - 46)))) != 0)) ) {
 			_errHandler.recoverInline(this);
 			}
 			else {
@@ -2555,9 +2604,9 @@ public class EQLParser extends Parser {
 
 	public final Value_expressionContext value_expression() throws RecognitionException {
 		Value_expressionContext _localctx = new Value_expressionContext(_ctx, getState());
-		enterRule(_localctx, 84, RULE_value_expression);
+		enterRule(_localctx, 86, RULE_value_expression);
 		try {
-			setState(350);
+			setState(354);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case BOOLEAN_LITERAL:
@@ -2565,14 +2614,14 @@ public class EQLParser extends Parser {
 			case STRING_LITERAL:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(348);
+				setState(352);
 				literal();
 				}
 				break;
 			case INPUT_VARIABLE:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(349);
+				setState(353);
 				match(INPUT_VARIABLE);
 				}
 				break;
@@ -2611,14 +2660,14 @@ public class EQLParser extends Parser {
 
 	public final LiteralContext literal() throws RecognitionException {
 		LiteralContext _localctx = new LiteralContext(_ctx, getState());
-		enterRule(_localctx, 86, RULE_literal);
+		enterRule(_localctx, 88, RULE_literal);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(352);
+			setState(356);
 			_la = _input.LA(1);
-			if ( !(((((_la - 69)) & ~0x3f) == 0 && ((1L << (_la - 69)) & ((1L << (BOOLEAN_LITERAL - 69)) | (1L << (NUMBER_LITERAL - 69)) | (1L << (STRING_LITERAL - 69)))) != 0)) ) {
+			if ( !(((((_la - 70)) & ~0x3f) == 0 && ((1L << (_la - 70)) & ((1L << (BOOLEAN_LITERAL - 70)) | (1L << (NUMBER_LITERAL - 70)) | (1L << (STRING_LITERAL - 70)))) != 0)) ) {
 			_errHandler.recoverInline(this);
 			}
 			else {
@@ -2640,124 +2689,125 @@ public class EQLParser extends Parser {
 	}
 
 	public static final String _serializedATN =
-		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3M\u0165\4\2\t\2\4"+
+		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3N\u0169\4\2\t\2\4"+
 		"\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t"+
 		"\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"+
 		"\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"+
 		"\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\4\36\t\36\4\37\t\37\4 \t \4!"+
 		"\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\4*\t*\4+\t+\4"+
-		",\t,\4-\t-\3\2\5\2\\\n\2\3\2\7\2_\n\2\f\2\16\2b\13\2\3\2\5\2e\n\2\3\2"+
-		"\5\2h\n\2\3\2\5\2k\n\2\3\2\3\2\3\3\3\3\3\3\3\3\3\3\5\3t\n\3\3\4\3\4\5"+
-		"\4x\n\4\3\4\3\4\3\5\3\5\3\6\3\6\3\7\3\7\3\7\3\b\3\b\3\b\3\b\3\b\7\b\u0088"+
-		"\n\b\f\b\16\b\u008b\13\b\3\t\3\t\5\t\u008f\n\t\3\t\5\t\u0092\n\t\3\n\3"+
-		"\n\3\n\3\n\5\n\u0098\n\n\3\13\3\13\3\f\3\f\3\f\5\f\u009f\n\f\3\r\3\r\3"+
-		"\r\3\16\3\16\5\16\u00a6\n\16\3\16\3\16\5\16\u00aa\n\16\3\17\3\17\3\17"+
-		"\3\17\3\20\3\20\3\20\7\20\u00b3\n\20\f\20\16\20\u00b6\13\20\3\21\3\21"+
-		"\3\22\3\22\3\22\3\22\5\22\u00be\n\22\3\23\3\23\3\23\3\24\3\24\3\24\3\25"+
-		"\3\25\5\25\u00c8\n\25\3\26\3\26\5\26\u00cc\n\26\3\27\3\27\5\27\u00d0\n"+
-		"\27\3\30\3\30\3\30\3\30\3\31\3\31\3\31\7\31\u00d9\n\31\f\31\16\31\u00dc"+
-		"\13\31\3\32\3\32\3\32\7\32\u00e1\n\32\f\32\16\32\u00e4\13\32\3\33\5\33"+
-		"\u00e7\n\33\3\33\3\33\3\34\3\34\3\34\3\34\3\34\5\34\u00f0\n\34\3\35\3"+
-		"\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\5"+
-		"\35\u0101\n\35\3\36\3\36\3\36\3\36\3\37\3\37\3\37\3\37\3 \3 \3 \3 \3 "+
-		"\7 \u0110\n \f \16 \u0113\13 \3 \3 \5 \u0117\n \3!\3!\3!\3!\3!\3!\3\""+
-		"\3\"\3\"\3\"\3\"\3\"\3#\3#\3#\3#\3#\3#\3$\3$\3$\3$\3$\5$\u0130\n$\3%\3"+
-		"%\3%\3%\3%\3%\3%\3%\5%\u013a\n%\3&\3&\3&\3&\3&\5&\u0141\n&\3\'\3\'\3\'"+
-		"\3\'\3\'\3\'\3\'\3\'\5\'\u014b\n\'\3(\3(\3(\3(\3)\3)\3*\3*\3*\3*\3*\3"+
-		"*\3*\3*\5*\u015b\n*\3+\3+\3,\3,\5,\u0161\n,\3-\3-\3-\2\2.\2\4\6\b\n\f"+
-		"\16\20\22\24\26\30\32\34\36 \"$&(*,.\60\62\64\668:<>@BDFHJLNPRTVX\2\7"+
-		"\3\2\16\17\3\2DE\3\2\'.\3\2/B\4\2GHLL\2\u0166\2[\3\2\2\2\4s\3\2\2\2\6"+
-		"u\3\2\2\2\b{\3\2\2\2\n}\3\2\2\2\f\177\3\2\2\2\16\u0082\3\2\2\2\20\u008c"+
-		"\3\2\2\2\22\u0097\3\2\2\2\24\u0099\3\2\2\2\26\u009b\3\2\2\2\30\u00a0\3"+
-		"\2\2\2\32\u00a3\3\2\2\2\34\u00ab\3\2\2\2\36\u00af\3\2\2\2 \u00b7\3\2\2"+
-		"\2\"\u00bd\3\2\2\2$\u00bf\3\2\2\2&\u00c2\3\2\2\2(\u00c7\3\2\2\2*\u00c9"+
-		"\3\2\2\2,\u00cd\3\2\2\2.\u00d1\3\2\2\2\60\u00d5\3\2\2\2\62\u00dd\3\2\2"+
-		"\2\64\u00e6\3\2\2\2\66\u00ef\3\2\2\28\u0100\3\2\2\2:\u0102\3\2\2\2<\u0106"+
-		"\3\2\2\2>\u0116\3\2\2\2@\u0118\3\2\2\2B\u011e\3\2\2\2D\u0124\3\2\2\2F"+
-		"\u012f\3\2\2\2H\u0139\3\2\2\2J\u0140\3\2\2\2L\u014a\3\2\2\2N\u014c\3\2"+
-		"\2\2P\u0150\3\2\2\2R\u015a\3\2\2\2T\u015c\3\2\2\2V\u0160\3\2\2\2X\u0162"+
-		"\3\2\2\2Z\\\5\6\4\2[Z\3\2\2\2[\\\3\2\2\2\\`\3\2\2\2]_\5\n\6\2^]\3\2\2"+
-		"\2_b\3\2\2\2`^\3\2\2\2`a\3\2\2\2ad\3\2\2\2b`\3\2\2\2ce\5\f\7\2dc\3\2\2"+
-		"\2de\3\2\2\2eg\3\2\2\2fh\5\16\b\2gf\3\2\2\2gh\3\2\2\2hj\3\2\2\2ik\5\26"+
-		"\f\2ji\3\2\2\2jk\3\2\2\2kl\3\2\2\2lm\7\2\2\3m\3\3\2\2\2no\7\3\2\2op\5"+
-		"\36\20\2pq\7\4\2\2qt\3\2\2\2rt\5\36\20\2sn\3\2\2\2sr\3\2\2\2t\5\3\2\2"+
-		"\2uw\7\5\2\2vx\5\b\5\2wv\3\2\2\2wx\3\2\2\2xy\3\2\2\2yz\5\4\3\2z\7\3\2"+
-		"\2\2{|\7\6\2\2|\t\3\2\2\2}~\5\32\16\2~\13\3\2\2\2\177\u0080\7\7\2\2\u0080"+
-		"\u0081\5\60\31\2\u0081\r\3\2\2\2\u0082\u0083\7\b\2\2\u0083\u0084\7\t\2"+
-		"\2\u0084\u0089\5\20\t\2\u0085\u0086\7\n\2\2\u0086\u0088\5\20\t\2\u0087"+
-		"\u0085\3\2\2\2\u0088\u008b\3\2\2\2\u0089\u0087\3\2\2\2\u0089\u008a\3\2"+
-		"\2\2\u008a\17\3\2\2\2\u008b\u0089\3\2\2\2\u008c\u008e\7D\2\2\u008d\u008f"+
-		"\5\24\13\2\u008e\u008d\3\2\2\2\u008e\u008f\3\2\2\2\u008f\u0091\3\2\2\2"+
-		"\u0090\u0092\5\22\n\2\u0091\u0090\3\2\2\2\u0091\u0092\3\2\2\2\u0092\21"+
-		"\3\2\2\2\u0093\u0094\7\13\2\2\u0094\u0098\7\f\2\2\u0095\u0096\7\13\2\2"+
-		"\u0096\u0098\7\r\2\2\u0097\u0093\3\2\2\2\u0097\u0095\3\2\2\2\u0098\23"+
-		"\3\2\2\2\u0099\u009a\t\2\2\2\u009a\25\3\2\2\2\u009b\u009c\7\20\2\2\u009c"+
-		"\u009e\7H\2\2\u009d\u009f\5\30\r\2\u009e\u009d\3\2\2\2\u009e\u009f\3\2"+
-		"\2\2\u009f\27\3\2\2\2\u00a0\u00a1\7\21\2\2\u00a1\u00a2\7H\2\2\u00a2\31"+
-		"\3\2\2\2\u00a3\u00a5\7\22\2\2\u00a4\u00a6\5(\25\2\u00a5\u00a4\3\2\2\2"+
-		"\u00a5\u00a6\3\2\2\2\u00a6\u00a7\3\2\2\2\u00a7\u00a9\5 \21\2\u00a8\u00aa"+
-		"\5\34\17\2\u00a9\u00a8\3\2\2\2\u00a9\u00aa\3\2\2\2\u00aa\33\3\2\2\2\u00ab"+
-		"\u00ac\7\3\2\2\u00ac\u00ad\5\36\20\2\u00ad\u00ae\7\4\2\2\u00ae\35\3\2"+
-		"\2\2\u00af\u00b4\5\"\22\2\u00b0\u00b1\7\n\2\2\u00b1\u00b3\5\"\22\2\u00b2"+
-		"\u00b0\3\2\2\2\u00b3\u00b6\3\2\2\2\u00b4\u00b2\3\2\2\2\u00b4\u00b5\3\2"+
-		"\2\2\u00b5\37\3\2\2\2\u00b6\u00b4\3\2\2\2\u00b7\u00b8\t\3\2\2\u00b8!\3"+
-		"\2\2\2\u00b9\u00be\7D\2\2\u00ba\u00be\5$\23\2\u00bb\u00be\5&\24\2\u00bc"+
-		"\u00be\7F\2\2\u00bd\u00b9\3\2\2\2\u00bd\u00ba\3\2\2\2\u00bd\u00bb\3\2"+
-		"\2\2\u00bd\u00bc\3\2\2\2\u00be#\3\2\2\2\u00bf\u00c0\7\23\2\2\u00c0\u00c1"+
-		"\5*\26\2\u00c1%\3\2\2\2\u00c2\u00c3\7\23\2\2\u00c3\u00c4\5,\27\2\u00c4"+
-		"\'\3\2\2\2\u00c5\u00c8\5*\26\2\u00c6\u00c8\5,\27\2\u00c7\u00c5\3\2\2\2"+
-		"\u00c7\u00c6\3\2\2\2\u00c8)\3\2\2\2\u00c9\u00cb\7\24\2\2\u00ca\u00cc\5"+
-		".\30\2\u00cb\u00ca\3\2\2\2\u00cb\u00cc\3\2\2\2\u00cc+\3\2\2\2\u00cd\u00cf"+
-		"\7\25\2\2\u00ce\u00d0\5.\30\2\u00cf\u00ce\3\2\2\2\u00cf\u00d0\3\2\2\2"+
-		"\u00d0-\3\2\2\2\u00d1\u00d2\7\3\2\2\u00d2\u00d3\7H\2\2\u00d3\u00d4\7\4"+
-		"\2\2\u00d4/\3\2\2\2\u00d5\u00da\5\62\32\2\u00d6\u00d7\7\26\2\2\u00d7\u00d9"+
-		"\5\62\32\2\u00d8\u00d6\3\2\2\2\u00d9\u00dc\3\2\2\2\u00da\u00d8\3\2\2\2"+
-		"\u00da\u00db\3\2\2\2\u00db\61\3\2\2\2\u00dc\u00da\3\2\2\2\u00dd\u00e2"+
-		"\5\64\33\2\u00de\u00df\7\27\2\2\u00df\u00e1\5\64\33\2\u00e0\u00de\3\2"+
-		"\2\2\u00e1\u00e4\3\2\2\2\u00e2\u00e0\3\2\2\2\u00e2\u00e3\3\2\2\2\u00e3"+
-		"\63\3\2\2\2\u00e4\u00e2\3\2\2\2\u00e5\u00e7\7\30\2\2\u00e6\u00e5\3\2\2"+
-		"\2\u00e6\u00e7\3\2\2\2\u00e7\u00e8\3\2\2\2\u00e8\u00e9\5\66\34\2\u00e9"+
-		"\65\3\2\2\2\u00ea\u00f0\58\35\2\u00eb\u00ec\7\3\2\2\u00ec\u00ed\5\60\31"+
-		"\2\u00ed\u00ee\7\4\2\2\u00ee\u00f0\3\2\2\2\u00ef\u00ea\3\2\2\2\u00ef\u00eb"+
-		"\3\2\2\2\u00f0\67\3\2\2\2\u00f1\u0101\5R*\2\u00f2\u0101\5N(\2\u00f3\u0101"+
-		"\5B\"\2\u00f4\u0101\5@!\2\u00f5\u0101\5D#\2\u00f6\u0101\5:\36\2\u00f7"+
-		"\u0101\5<\37\2\u00f8\u0101\5F$\2\u00f9\u0101\5H%\2\u00fa\u0101\5J&\2\u00fb"+
-		"\u0101\5L\'\2\u00fc\u00fd\7\3\2\2\u00fd\u00fe\58\35\2\u00fe\u00ff\7\4"+
-		"\2\2\u00ff\u0101\3\2\2\2\u0100\u00f1\3\2\2\2\u0100\u00f2\3\2\2\2\u0100"+
-		"\u00f3\3\2\2\2\u0100\u00f4\3\2\2\2\u0100\u00f5\3\2\2\2\u0100\u00f6\3\2"+
-		"\2\2\u0100\u00f7\3\2\2\2\u0100\u00f8\3\2\2\2\u0100\u00f9\3\2\2\2\u0100"+
-		"\u00fa\3\2\2\2\u0100\u00fb\3\2\2\2\u0100\u00fc\3\2\2\2\u01019\3\2\2\2"+
-		"\u0102\u0103\7D\2\2\u0103\u0104\7\31\2\2\u0104\u0105\5> \2\u0105;\3\2"+
-		"\2\2\u0106\u0107\7D\2\2\u0107\u0108\7\32\2\2\u0108\u0109\5> \2\u0109="+
-		"\3\2\2\2\u010a\u0117\7C\2\2\u010b\u010c\7\3\2\2\u010c\u0111\5V,\2\u010d"+
-		"\u010e\7\n\2\2\u010e\u0110\5V,\2\u010f\u010d\3\2\2\2\u0110\u0113\3\2\2"+
-		"\2\u0111\u010f\3\2\2\2\u0111\u0112\3\2\2\2\u0112\u0114\3\2\2\2\u0113\u0111"+
-		"\3\2\2\2\u0114\u0115\7\4\2\2\u0115\u0117\3\2\2\2\u0116\u010a\3\2\2\2\u0116"+
-		"\u010b\3\2\2\2\u0117?\3\2\2\2\u0118\u0119\7D\2\2\u0119\u011a\7\33\2\2"+
-		"\u011a\u011b\5V,\2\u011b\u011c\7\27\2\2\u011c\u011d\5V,\2\u011dA\3\2\2"+
-		"\2\u011e\u011f\7D\2\2\u011f\u0120\7\34\2\2\u0120\u0121\5V,\2\u0121\u0122"+
-		"\7\35\2\2\u0122\u0123\5V,\2\u0123C\3\2\2\2\u0124\u0125\5V,\2\u0125\u0126"+
-		"\7\33\2\2\u0126\u0127\7D\2\2\u0127\u0128\7\27\2\2\u0128\u0129\7D\2\2\u0129"+
-		"E\3\2\2\2\u012a\u012b\7D\2\2\u012b\u012c\7\36\2\2\u012c\u0130\7\37\2\2"+
-		"\u012d\u012e\7D\2\2\u012e\u0130\7 \2\2\u012f\u012a\3\2\2\2\u012f\u012d"+
-		"\3\2\2\2\u0130G\3\2\2\2\u0131\u0132\7D\2\2\u0132\u0133\7\36\2\2\u0133"+
-		"\u0134\7\30\2\2\u0134\u013a\7\37\2\2\u0135\u0136\7D\2\2\u0136\u013a\7"+
-		"!\2\2\u0137\u0138\7D\2\2\u0138\u013a\7\"\2\2\u0139\u0131\3\2\2\2\u0139"+
-		"\u0135\3\2\2\2\u0139\u0137\3\2\2\2\u013aI\3\2\2\2\u013b\u013c\7D\2\2\u013c"+
-		"\u013d\7\36\2\2\u013d\u0141\7#\2\2\u013e\u013f\7D\2\2\u013f\u0141\7$\2"+
-		"\2\u0140\u013b\3\2\2\2\u0140\u013e\3\2\2\2\u0141K\3\2\2\2\u0142\u0143"+
-		"\7D\2\2\u0143\u0144\7\36\2\2\u0144\u0145\7\30\2\2\u0145\u014b\7#\2\2\u0146"+
-		"\u0147\7D\2\2\u0147\u014b\7%\2\2\u0148\u0149\7D\2\2\u0149\u014b\7&\2\2"+
-		"\u014a\u0142\3\2\2\2\u014a\u0146\3\2\2\2\u014a\u0148\3\2\2\2\u014bM\3"+
-		"\2\2\2\u014c\u014d\7D\2\2\u014d\u014e\5P)\2\u014e\u014f\5V,\2\u014fO\3"+
-		"\2\2\2\u0150\u0151\t\4\2\2\u0151Q\3\2\2\2\u0152\u0153\7D\2\2\u0153\u0154"+
-		"\5T+\2\u0154\u0155\5V,\2\u0155\u015b\3\2\2\2\u0156\u0157\5V,\2\u0157\u0158"+
-		"\5T+\2\u0158\u0159\7D\2\2\u0159\u015b\3\2\2\2\u015a\u0152\3\2\2\2\u015a"+
-		"\u0156\3\2\2\2\u015bS\3\2\2\2\u015c\u015d\t\5\2\2\u015dU\3\2\2\2\u015e"+
-		"\u0161\5X-\2\u015f\u0161\7C\2\2\u0160\u015e\3\2\2\2\u0160\u015f\3\2\2"+
-		"\2\u0161W\3\2\2\2\u0162\u0163\t\6\2\2\u0163Y\3\2\2\2\"[`dgjsw\u0089\u008e"+
-		"\u0091\u0097\u009e\u00a5\u00a9\u00b4\u00bd\u00c7\u00cb\u00cf\u00da\u00e2"+
-		"\u00e6\u00ef\u0100\u0111\u0116\u012f\u0139\u0140\u014a\u015a\u0160";
+		",\t,\4-\t-\4.\t.\3\2\5\2^\n\2\3\2\7\2a\n\2\f\2\16\2d\13\2\3\2\5\2g\n\2"+
+		"\3\2\5\2j\n\2\3\2\5\2m\n\2\3\2\3\2\3\3\3\3\3\3\3\3\3\3\5\3v\n\3\3\4\3"+
+		"\4\5\4z\n\4\3\4\3\4\3\5\3\5\3\6\3\6\3\7\3\7\3\7\3\b\3\b\3\b\3\b\3\b\7"+
+		"\b\u008a\n\b\f\b\16\b\u008d\13\b\3\t\3\t\5\t\u0091\n\t\3\t\5\t\u0094\n"+
+		"\t\3\n\3\n\3\n\3\n\5\n\u009a\n\n\3\13\3\13\3\f\3\f\3\f\5\f\u00a1\n\f\3"+
+		"\r\3\r\3\r\3\16\3\16\5\16\u00a8\n\16\3\16\3\16\5\16\u00ac\n\16\3\17\3"+
+		"\17\3\17\3\17\3\20\3\20\3\20\7\20\u00b5\n\20\f\20\16\20\u00b8\13\20\3"+
+		"\21\3\21\3\22\3\22\3\22\3\22\5\22\u00c0\n\22\3\23\3\23\3\23\3\24\3\24"+
+		"\3\24\3\25\3\25\5\25\u00ca\n\25\3\26\3\26\5\26\u00ce\n\26\3\27\3\27\5"+
+		"\27\u00d2\n\27\3\30\3\30\3\30\3\30\3\31\3\31\3\31\7\31\u00db\n\31\f\31"+
+		"\16\31\u00de\13\31\3\32\3\32\3\32\7\32\u00e3\n\32\f\32\16\32\u00e6\13"+
+		"\32\3\33\5\33\u00e9\n\33\3\33\3\33\3\34\3\34\3\34\3\34\3\34\5\34\u00f2"+
+		"\n\34\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35"+
+		"\3\35\3\35\5\35\u0103\n\35\3\36\3\36\3\36\3\36\3\37\3\37\3\37\3\37\3 "+
+		"\3 \3 \3 \3 \7 \u0112\n \f \16 \u0115\13 \3 \3 \5 \u0119\n \3!\3!\3!\3"+
+		"!\3!\3!\3\"\3\"\3\"\3\"\3\"\3\"\3#\3#\3$\3$\3$\3$\3$\3$\3%\3%\3%\3%\3"+
+		"%\5%\u0134\n%\3&\3&\3&\3&\3&\3&\3&\3&\5&\u013e\n&\3\'\3\'\3\'\3\'\3\'"+
+		"\5\'\u0145\n\'\3(\3(\3(\3(\3(\3(\3(\3(\5(\u014f\n(\3)\3)\3)\3)\3*\3*\3"+
+		"+\3+\3+\3+\3+\3+\3+\3+\5+\u015f\n+\3,\3,\3-\3-\5-\u0165\n-\3.\3.\3.\2"+
+		"\2/\2\4\6\b\n\f\16\20\22\24\26\30\32\34\36 \"$&(*,.\60\62\64\668:<>@B"+
+		"DFHJLNPRTVXZ\2\b\3\2\16\17\3\2EF\3\2\35\36\3\2(/\3\2\60C\4\2HIMM\2\u0169"+
+		"\2]\3\2\2\2\4u\3\2\2\2\6w\3\2\2\2\b}\3\2\2\2\n\177\3\2\2\2\f\u0081\3\2"+
+		"\2\2\16\u0084\3\2\2\2\20\u008e\3\2\2\2\22\u0099\3\2\2\2\24\u009b\3\2\2"+
+		"\2\26\u009d\3\2\2\2\30\u00a2\3\2\2\2\32\u00a5\3\2\2\2\34\u00ad\3\2\2\2"+
+		"\36\u00b1\3\2\2\2 \u00b9\3\2\2\2\"\u00bf\3\2\2\2$\u00c1\3\2\2\2&\u00c4"+
+		"\3\2\2\2(\u00c9\3\2\2\2*\u00cb\3\2\2\2,\u00cf\3\2\2\2.\u00d3\3\2\2\2\60"+
+		"\u00d7\3\2\2\2\62\u00df\3\2\2\2\64\u00e8\3\2\2\2\66\u00f1\3\2\2\28\u0102"+
+		"\3\2\2\2:\u0104\3\2\2\2<\u0108\3\2\2\2>\u0118\3\2\2\2@\u011a\3\2\2\2B"+
+		"\u0120\3\2\2\2D\u0126\3\2\2\2F\u0128\3\2\2\2H\u0133\3\2\2\2J\u013d\3\2"+
+		"\2\2L\u0144\3\2\2\2N\u014e\3\2\2\2P\u0150\3\2\2\2R\u0154\3\2\2\2T\u015e"+
+		"\3\2\2\2V\u0160\3\2\2\2X\u0164\3\2\2\2Z\u0166\3\2\2\2\\^\5\6\4\2]\\\3"+
+		"\2\2\2]^\3\2\2\2^b\3\2\2\2_a\5\n\6\2`_\3\2\2\2ad\3\2\2\2b`\3\2\2\2bc\3"+
+		"\2\2\2cf\3\2\2\2db\3\2\2\2eg\5\f\7\2fe\3\2\2\2fg\3\2\2\2gi\3\2\2\2hj\5"+
+		"\16\b\2ih\3\2\2\2ij\3\2\2\2jl\3\2\2\2km\5\26\f\2lk\3\2\2\2lm\3\2\2\2m"+
+		"n\3\2\2\2no\7\2\2\3o\3\3\2\2\2pq\7\3\2\2qr\5\36\20\2rs\7\4\2\2sv\3\2\2"+
+		"\2tv\5\36\20\2up\3\2\2\2ut\3\2\2\2v\5\3\2\2\2wy\7\5\2\2xz\5\b\5\2yx\3"+
+		"\2\2\2yz\3\2\2\2z{\3\2\2\2{|\5\4\3\2|\7\3\2\2\2}~\7\6\2\2~\t\3\2\2\2\177"+
+		"\u0080\5\32\16\2\u0080\13\3\2\2\2\u0081\u0082\7\7\2\2\u0082\u0083\5\60"+
+		"\31\2\u0083\r\3\2\2\2\u0084\u0085\7\b\2\2\u0085\u0086\7\t\2\2\u0086\u008b"+
+		"\5\20\t\2\u0087\u0088\7\n\2\2\u0088\u008a\5\20\t\2\u0089\u0087\3\2\2\2"+
+		"\u008a\u008d\3\2\2\2\u008b\u0089\3\2\2\2\u008b\u008c\3\2\2\2\u008c\17"+
+		"\3\2\2\2\u008d\u008b\3\2\2\2\u008e\u0090\7E\2\2\u008f\u0091\5\24\13\2"+
+		"\u0090\u008f\3\2\2\2\u0090\u0091\3\2\2\2\u0091\u0093\3\2\2\2\u0092\u0094"+
+		"\5\22\n\2\u0093\u0092\3\2\2\2\u0093\u0094\3\2\2\2\u0094\21\3\2\2\2\u0095"+
+		"\u0096\7\13\2\2\u0096\u009a\7\f\2\2\u0097\u0098\7\13\2\2\u0098\u009a\7"+
+		"\r\2\2\u0099\u0095\3\2\2\2\u0099\u0097\3\2\2\2\u009a\23\3\2\2\2\u009b"+
+		"\u009c\t\2\2\2\u009c\25\3\2\2\2\u009d\u009e\7\20\2\2\u009e\u00a0\7I\2"+
+		"\2\u009f\u00a1\5\30\r\2\u00a0\u009f\3\2\2\2\u00a0\u00a1\3\2\2\2\u00a1"+
+		"\27\3\2\2\2\u00a2\u00a3\7\21\2\2\u00a3\u00a4\7I\2\2\u00a4\31\3\2\2\2\u00a5"+
+		"\u00a7\7\22\2\2\u00a6\u00a8\5(\25\2\u00a7\u00a6\3\2\2\2\u00a7\u00a8\3"+
+		"\2\2\2\u00a8\u00a9\3\2\2\2\u00a9\u00ab\5 \21\2\u00aa\u00ac\5\34\17\2\u00ab"+
+		"\u00aa\3\2\2\2\u00ab\u00ac\3\2\2\2\u00ac\33\3\2\2\2\u00ad\u00ae\7\3\2"+
+		"\2\u00ae\u00af\5\36\20\2\u00af\u00b0\7\4\2\2\u00b0\35\3\2\2\2\u00b1\u00b6"+
+		"\5\"\22\2\u00b2\u00b3\7\n\2\2\u00b3\u00b5\5\"\22\2\u00b4\u00b2\3\2\2\2"+
+		"\u00b5\u00b8\3\2\2\2\u00b6\u00b4\3\2\2\2\u00b6\u00b7\3\2\2\2\u00b7\37"+
+		"\3\2\2\2\u00b8\u00b6\3\2\2\2\u00b9\u00ba\t\3\2\2\u00ba!\3\2\2\2\u00bb"+
+		"\u00c0\7E\2\2\u00bc\u00c0\5$\23\2\u00bd\u00c0\5&\24\2\u00be\u00c0\7G\2"+
+		"\2\u00bf\u00bb\3\2\2\2\u00bf\u00bc\3\2\2\2\u00bf\u00bd\3\2\2\2\u00bf\u00be"+
+		"\3\2\2\2\u00c0#\3\2\2\2\u00c1\u00c2\7\23\2\2\u00c2\u00c3\5*\26\2\u00c3"+
+		"%\3\2\2\2\u00c4\u00c5\7\23\2\2\u00c5\u00c6\5,\27\2\u00c6\'\3\2\2\2\u00c7"+
+		"\u00ca\5*\26\2\u00c8\u00ca\5,\27\2\u00c9\u00c7\3\2\2\2\u00c9\u00c8\3\2"+
+		"\2\2\u00ca)\3\2\2\2\u00cb\u00cd\7\24\2\2\u00cc\u00ce\5.\30\2\u00cd\u00cc"+
+		"\3\2\2\2\u00cd\u00ce\3\2\2\2\u00ce+\3\2\2\2\u00cf\u00d1\7\25\2\2\u00d0"+
+		"\u00d2\5.\30\2\u00d1\u00d0\3\2\2\2\u00d1\u00d2\3\2\2\2\u00d2-\3\2\2\2"+
+		"\u00d3\u00d4\7\3\2\2\u00d4\u00d5\7I\2\2\u00d5\u00d6\7\4\2\2\u00d6/\3\2"+
+		"\2\2\u00d7\u00dc\5\62\32\2\u00d8\u00d9\7\26\2\2\u00d9\u00db\5\62\32\2"+
+		"\u00da\u00d8\3\2\2\2\u00db\u00de\3\2\2\2\u00dc\u00da\3\2\2\2\u00dc\u00dd"+
+		"\3\2\2\2\u00dd\61\3\2\2\2\u00de\u00dc\3\2\2\2\u00df\u00e4\5\64\33\2\u00e0"+
+		"\u00e1\7\27\2\2\u00e1\u00e3\5\64\33\2\u00e2\u00e0\3\2\2\2\u00e3\u00e6"+
+		"\3\2\2\2\u00e4\u00e2\3\2\2\2\u00e4\u00e5\3\2\2\2\u00e5\63\3\2\2\2\u00e6"+
+		"\u00e4\3\2\2\2\u00e7\u00e9\7\30\2\2\u00e8\u00e7\3\2\2\2\u00e8\u00e9\3"+
+		"\2\2\2\u00e9\u00ea\3\2\2\2\u00ea\u00eb\5\66\34\2\u00eb\65\3\2\2\2\u00ec"+
+		"\u00f2\58\35\2\u00ed\u00ee\7\3\2\2\u00ee\u00ef\5\60\31\2\u00ef\u00f0\7"+
+		"\4\2\2\u00f0\u00f2\3\2\2\2\u00f1\u00ec\3\2\2\2\u00f1\u00ed\3\2\2\2\u00f2"+
+		"\67\3\2\2\2\u00f3\u0103\5T+\2\u00f4\u0103\5P)\2\u00f5\u0103\5B\"\2\u00f6"+
+		"\u0103\5@!\2\u00f7\u0103\5F$\2\u00f8\u0103\5:\36\2\u00f9\u0103\5<\37\2"+
+		"\u00fa\u0103\5H%\2\u00fb\u0103\5J&\2\u00fc\u0103\5L\'\2\u00fd\u0103\5"+
+		"N(\2\u00fe\u00ff\7\3\2\2\u00ff\u0100\58\35\2\u0100\u0101\7\4\2\2\u0101"+
+		"\u0103\3\2\2\2\u0102\u00f3\3\2\2\2\u0102\u00f4\3\2\2\2\u0102\u00f5\3\2"+
+		"\2\2\u0102\u00f6\3\2\2\2\u0102\u00f7\3\2\2\2\u0102\u00f8\3\2\2\2\u0102"+
+		"\u00f9\3\2\2\2\u0102\u00fa\3\2\2\2\u0102\u00fb\3\2\2\2\u0102\u00fc\3\2"+
+		"\2\2\u0102\u00fd\3\2\2\2\u0102\u00fe\3\2\2\2\u01039\3\2\2\2\u0104\u0105"+
+		"\7E\2\2\u0105\u0106\7\31\2\2\u0106\u0107\5> \2\u0107;\3\2\2\2\u0108\u0109"+
+		"\7E\2\2\u0109\u010a\7\32\2\2\u010a\u010b\5> \2\u010b=\3\2\2\2\u010c\u0119"+
+		"\7D\2\2\u010d\u010e\7\3\2\2\u010e\u0113\5X-\2\u010f\u0110\7\n\2\2\u0110"+
+		"\u0112\5X-\2\u0111\u010f\3\2\2\2\u0112\u0115\3\2\2\2\u0113\u0111\3\2\2"+
+		"\2\u0113\u0114\3\2\2\2\u0114\u0116\3\2\2\2\u0115\u0113\3\2\2\2\u0116\u0117"+
+		"\7\4\2\2\u0117\u0119\3\2\2\2\u0118\u010c\3\2\2\2\u0118\u010d\3\2\2\2\u0119"+
+		"?\3\2\2\2\u011a\u011b\7E\2\2\u011b\u011c\7\33\2\2\u011c\u011d\5X-\2\u011d"+
+		"\u011e\7\27\2\2\u011e\u011f\5X-\2\u011fA\3\2\2\2\u0120\u0121\7E\2\2\u0121"+
+		"\u0122\5D#\2\u0122\u0123\5X-\2\u0123\u0124\7\34\2\2\u0124\u0125\5X-\2"+
+		"\u0125C\3\2\2\2\u0126\u0127\t\4\2\2\u0127E\3\2\2\2\u0128\u0129\5X-\2\u0129"+
+		"\u012a\7\33\2\2\u012a\u012b\7E\2\2\u012b\u012c\7\27\2\2\u012c\u012d\7"+
+		"E\2\2\u012dG\3\2\2\2\u012e\u012f\7E\2\2\u012f\u0130\7\37\2\2\u0130\u0134"+
+		"\7 \2\2\u0131\u0132\7E\2\2\u0132\u0134\7!\2\2\u0133\u012e\3\2\2\2\u0133"+
+		"\u0131\3\2\2\2\u0134I\3\2\2\2\u0135\u0136\7E\2\2\u0136\u0137\7\37\2\2"+
+		"\u0137\u0138\7\30\2\2\u0138\u013e\7 \2\2\u0139\u013a\7E\2\2\u013a\u013e"+
+		"\7\"\2\2\u013b\u013c\7E\2\2\u013c\u013e\7#\2\2\u013d\u0135\3\2\2\2\u013d"+
+		"\u0139\3\2\2\2\u013d\u013b\3\2\2\2\u013eK\3\2\2\2\u013f\u0140\7E\2\2\u0140"+
+		"\u0141\7\37\2\2\u0141\u0145\7$\2\2\u0142\u0143\7E\2\2\u0143\u0145\7%\2"+
+		"\2\u0144\u013f\3\2\2\2\u0144\u0142\3\2\2\2\u0145M\3\2\2\2\u0146\u0147"+
+		"\7E\2\2\u0147\u0148\7\37\2\2\u0148\u0149\7\30\2\2\u0149\u014f\7$\2\2\u014a"+
+		"\u014b\7E\2\2\u014b\u014f\7&\2\2\u014c\u014d\7E\2\2\u014d\u014f\7\'\2"+
+		"\2\u014e\u0146\3\2\2\2\u014e\u014a\3\2\2\2\u014e\u014c\3\2\2\2\u014fO"+
+		"\3\2\2\2\u0150\u0151\7E\2\2\u0151\u0152\5R*\2\u0152\u0153\5X-\2\u0153"+
+		"Q\3\2\2\2\u0154\u0155\t\5\2\2\u0155S\3\2\2\2\u0156\u0157\7E\2\2\u0157"+
+		"\u0158\5V,\2\u0158\u0159\5X-\2\u0159\u015f\3\2\2\2\u015a\u015b\5X-\2\u015b"+
+		"\u015c\5V,\2\u015c\u015d\7E\2\2\u015d\u015f\3\2\2\2\u015e\u0156\3\2\2"+
+		"\2\u015e\u015a\3\2\2\2\u015fU\3\2\2\2\u0160\u0161\t\6\2\2\u0161W\3\2\2"+
+		"\2\u0162\u0165\5Z.\2\u0163\u0165\7D\2\2\u0164\u0162\3\2\2\2\u0164\u0163"+
+		"\3\2\2\2\u0165Y\3\2\2\2\u0166\u0167\t\7\2\2\u0167[\3\2\2\2\"]bfiluy\u008b"+
+		"\u0090\u0093\u0099\u00a0\u00a7\u00ab\u00b6\u00bf\u00c9\u00cd\u00d1\u00dc"+
+		"\u00e4\u00e8\u00f1\u0102\u0113\u0118\u0133\u013d\u0144\u014e\u015e\u0164";
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {
diff --git a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
index 6feacaa30..3ba726544 100644
--- a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
@@ -14,6 +14,7 @@ import org.tests.model.basic.Customer;
 import org.tests.model.basic.OrderDetail;
 import org.tests.model.basic.ResetBasicData;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -846,6 +847,26 @@ public class EqlParserTest extends BaseTestCase {
     }
   }
 
+  @Test
+  public void where_dateInRange() {
+
+    final Query<Customer> query = where("anniversary inrange ? to ?", LocalDate.now().minusDays(7), LocalDate.now());
+    query.findList();
+    if (isH2()) {
+      assertThat(query.getGeneratedSql()).contains("where (t0.anniversary >= ? and t0.anniversary < ?)");
+    }
+  }
+
+  @Test
+  public void where_dateInRange_camelCase() {
+
+    final Query<Customer> query = where("anniversary inRange ? to ?", LocalDate.now().minusDays(7), LocalDate.now());
+    query.findList();
+    if (isH2()) {
+      assertThat(query.getGeneratedSql()).contains("where (t0.anniversary >= ? and t0.anniversary < ?)");
+    }
+  }
+
   private Query<Customer> where(String where, Object... params) {
 
     Query<Customer> query = DB.find(Customer.class);
diff --git a/src/test/resources/EQL.g4 b/src/test/resources/EQL.g4
index 1a8904045..103a79279 100644
--- a/src/test/resources/EQL.g4
+++ b/src/test/resources/EQL.g4
@@ -150,7 +150,11 @@ between_expression
    ;
 
 inrange_expression
-   : PATH_VARIABLE 'inrange' value_expression 'to' value_expression
+   : PATH_VARIABLE inrange_op value_expression 'to' value_expression
+   ;
+
+inrange_op
+   : 'inrange' | 'inRange'
    ;
 
 propertyBetween_expression

From fea6dfd62bb27fbb755fc9ac9a490ae2c7872d88 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 16 Aug 2019 00:00:31 +1200
Subject: [PATCH 1013/1036] [maven-release-plugin] prepare release
 ebean-11.43.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 02c600b65..45883cbbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.43.1-SNAPSHOT</version>
+  <version>11.43.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -23,7 +23,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.43.1</tag>
   </scm>
 
   <profiles>

From 16f6f2ee7f18621b98d4b18cfd2feb16498df6a2 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 16 Aug 2019 00:00:42 +1200
Subject: [PATCH 1014/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 45883cbbb..0b6f28be0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.43.1</version>
+  <version>11.43.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -23,7 +23,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.43.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From d7d8c3e6514d01b851a497d1542df2a6f5cb2135 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 18 Aug 2019 12:17:36 +1200
Subject: [PATCH 1015/1036] Refactor tidy on Load context

---
 .../server/core/DefaultBeanLoader.java        | 16 +++++++-------
 .../server/loadcontext/DLoadBaseContext.java  | 21 +++++++++----------
 .../server/loadcontext/DLoadBeanContext.java  | 16 +++++++-------
 .../server/loadcontext/DLoadContext.java      |  5 +----
 .../server/loadcontext/DLoadManyContext.java  | 13 +++++++-----
 5 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
index c6c7b44f3..e66c590d2 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
@@ -25,7 +25,7 @@ import java.util.List;
 /**
  * Helper to handle lazy loading and refreshing of beans.
  */
-public class DefaultBeanLoader {
+class DefaultBeanLoader {
 
   private static final Logger logger = LoggerFactory.getLogger(DefaultBeanLoader.class);
 
@@ -33,7 +33,7 @@ public class DefaultBeanLoader {
 
   private final boolean onIterateUseExtraTxn;
 
-  protected DefaultBeanLoader(DefaultServer server) {
+  DefaultBeanLoader(DefaultServer server) {
     this.server = server;
     this.onIterateUseExtraTxn = server.getDatabasePlatform().useExtraTransactionOnIterateSecondaryQueries();
   }
@@ -73,11 +73,11 @@ public class DefaultBeanLoader {
     return batchSize;
   }
 
-  public void refreshMany(EntityBean parentBean, String propertyName) {
+  void refreshMany(EntityBean parentBean, String propertyName) {
     refreshMany(parentBean, propertyName, null);
   }
 
-  public void loadMany(LoadManyRequest loadRequest) {
+  void loadMany(LoadManyRequest loadRequest) {
 
     List<BeanCollection<?>> batch = loadRequest.getBatch();
 
@@ -89,7 +89,7 @@ public class DefaultBeanLoader {
     loadRequest.postLoad();
   }
 
-  public void loadMany(BeanCollection<?> bc, boolean onlyIds) {
+  void loadMany(BeanCollection<?> bc, boolean onlyIds) {
 
     EntityBean parentBean = bc.getOwnerBean();
     String propertyName = bc.getPropertyName();
@@ -97,7 +97,7 @@ public class DefaultBeanLoader {
     loadManyInternal(parentBean, propertyName, null, false, onlyIds);
   }
 
-  public void refreshMany(EntityBean parentBean, String propertyName, Transaction t) {
+  void refreshMany(EntityBean parentBean, String propertyName, Transaction t) {
     loadManyInternal(parentBean, propertyName, t, true, false);
   }
 
@@ -185,7 +185,7 @@ public class DefaultBeanLoader {
   /**
    * Load a batch of beans for +query or +lazy loading.
    */
-  public void loadBean(LoadBeanRequest loadRequest) {
+  void loadBean(LoadBeanRequest loadRequest) {
 
     List<EntityBeanIntercept> batch = loadRequest.getBatch();
     if (batch.isEmpty()) {
@@ -228,7 +228,7 @@ public class DefaultBeanLoader {
     refreshBeanInternal(bean, SpiQuery.Mode.REFRESH_BEAN, -1);
   }
 
-  public void loadBean(EntityBeanIntercept ebi) {
+  void loadBean(EntityBeanIntercept ebi) {
     refreshBeanInternal(ebi.getOwner(), SpiQuery.Mode.LAZYLOAD_BEAN, -1);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java
index 3eda74298..9c06c90d7 100644
--- a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java
+++ b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java
@@ -10,7 +10,7 @@ import io.ebeaninternal.server.querydefn.OrmQueryProperties;
 /**
  * Base class for Bean and BeanCollection loading (lazy loading and query join loading).
  */
-public abstract class DLoadBaseContext {
+abstract class DLoadBaseContext {
 
   protected final DLoadContext parent;
 
@@ -18,22 +18,21 @@ public abstract class DLoadBaseContext {
 
   protected final String fullPath;
 
-  protected final OrmQueryProperties queryProps;
-
-  protected final boolean hitCache;
-
   protected final String serverName;
 
-  protected final int firstBatchSize;
+  final OrmQueryProperties queryProps;
 
-  protected final int secondaryBatchSize;
+  final boolean hitCache;
 
-  protected final ObjectGraphNode objectGraphNode;
+  final int firstBatchSize;
 
-  protected final boolean queryFetch;
+  final int secondaryBatchSize;
 
+  final ObjectGraphNode objectGraphNode;
 
-  public DLoadBaseContext(DLoadContext parent, BeanDescriptor<?> desc, String path, int defaultBatchSize, OrmQueryProperties queryProps) {
+  final boolean queryFetch;
+
+  DLoadBaseContext(DLoadContext parent, BeanDescriptor<?> desc, String path, int defaultBatchSize, OrmQueryProperties queryProps) {
 
     this.parent = parent;
     this.serverName = parent.getEbeanServer().getName();
@@ -92,7 +91,7 @@ public abstract class DLoadBaseContext {
     }
   }
 
-  protected PersistenceContext getPersistenceContext() {
+  PersistenceContext getPersistenceContext() {
     return parent.getPersistenceContext();
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
index f5207c7bf..d919a251c 100644
--- a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
+++ b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
@@ -16,15 +16,15 @@ import java.util.List;
 import java.util.Set;
 
 /**
- * Default implementation of LoadBeanContext.
+ * ToOne bean load context.
  */
-public class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext {
+class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext {
 
   private List<LoadBuffer> bufferList;
 
   private LoadBuffer currentBuffer;
 
-  public DLoadBeanContext(DLoadContext parent, BeanDescriptor<?> desc, String path, int defaultBatchSize, OrmQueryProperties queryProps) {
+  DLoadBeanContext(DLoadContext parent, BeanDescriptor<?> desc, String path, int defaultBatchSize, OrmQueryProperties queryProps) {
     super(parent, desc, path, defaultBatchSize, queryProps);
     // bufferList only required when using query joins (queryFetch)
     this.bufferList = (!queryFetch) ? null : new ArrayList<>();
@@ -41,7 +41,7 @@ public class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContex
     currentBuffer = createBuffer(secondaryBatchSize);
   }
 
-  protected void configureQuery(SpiQuery<?> query, String lazyLoadProperty) {
+  private void configureQuery(SpiQuery<?> query, String lazyLoadProperty) {
 
     setLabel(query);
     parent.propagateQueryState(query, desc.isDocStoreMapped());
@@ -79,8 +79,7 @@ public class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContex
       if (bufferList != null) {
         for (LoadBuffer loadBuffer : bufferList) {
           if (!loadBuffer.list.isEmpty()) {
-            LoadBeanRequest req = new LoadBeanRequest(loadBuffer, parentRequest);
-            parent.getEbeanServer().loadBean(req);
+            parent.getEbeanServer().loadBean(new LoadBeanRequest(loadBuffer, parentRequest));
             if (!queryProps.isQueryFetchAll()) {
               // Stop - only fetch the first batch ... the rest will be lazy loaded
               break;
@@ -97,18 +96,17 @@ public class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContex
     }
   }
 
-
   /**
    * A buffer for batch loading beans on a given path.
    */
-  public static class LoadBuffer implements BeanLoader, LoadBeanBuffer {
+  static class LoadBuffer implements BeanLoader, LoadBeanBuffer {
 
     private final DLoadBeanContext context;
     private final int batchSize;
     private final List<EntityBeanIntercept> list;
     private PersistenceContext persistenceContext;
 
-    public LoadBuffer(DLoadBeanContext context, int batchSize) {
+    LoadBuffer(DLoadBeanContext context, int batchSize) {
       this.context = context;
       this.batchSize = batchSize;
       this.list = new ArrayList<>(batchSize);
diff --git a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
index bac4528e8..79af02d1f 100644
--- a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
+++ b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
@@ -224,10 +224,7 @@ public class DLoadContext implements LoadContext {
    */
   private LoadSecondaryQuery getLoadSecondaryQuery(String path) {
     LoadSecondaryQuery beanLoad = beanMap.get(path);
-    if (beanLoad == null) {
-      beanLoad = manyMap.get(path);
-    }
-    return beanLoad;
+    return beanLoad == null ? manyMap.get(path) : beanLoad;
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java
index 07123109e..a1cdb0fb6 100644
--- a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java
+++ b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java
@@ -17,7 +17,10 @@ import io.ebeaninternal.server.querydefn.OrmQueryProperties;
 import java.util.ArrayList;
 import java.util.List;
 
-public class DLoadManyContext extends DLoadBaseContext implements LoadManyContext {
+/**
+ * ToMany bean load context.
+ */
+class DLoadManyContext extends DLoadBaseContext implements LoadManyContext {
 
   protected final BeanPropertyAssocMany<?> property;
 
@@ -27,7 +30,7 @@ public class DLoadManyContext extends DLoadBaseContext implements LoadManyContex
 
   private LoadBuffer currentBuffer;
 
-  public DLoadManyContext(DLoadContext parent, BeanPropertyAssocMany<?> property,
+  DLoadManyContext(DLoadContext parent, BeanPropertyAssocMany<?> property,
                           String path, int defaultBatchSize, OrmQueryProperties queryProps) {
 
     super(parent, property.getBeanDescriptor(), path, defaultBatchSize, queryProps);
@@ -57,7 +60,7 @@ public class DLoadManyContext extends DLoadBaseContext implements LoadManyContex
     currentBuffer = createBuffer(secondaryBatchSize);
   }
 
-  public void configureQuery(SpiQuery<?> query) {
+  private void configureQuery(SpiQuery<?> query) {
 
     setLabel(query);
     parent.propagateQueryState(query, docStoreMapped);
@@ -122,14 +125,14 @@ public class DLoadManyContext extends DLoadBaseContext implements LoadManyContex
    * A buffer for batch loading bean collections on a given path.
    * Supports batch lazy loading and secondary query loading.
    */
-  public static class LoadBuffer implements BeanCollectionLoader, LoadManyBuffer {
+  static class LoadBuffer implements BeanCollectionLoader, LoadManyBuffer {
 
     private final PersistenceContext persistenceContext;
     private final DLoadManyContext context;
     private final int batchSize;
     private final List<BeanCollection<?>> list;
 
-    public LoadBuffer(DLoadManyContext context, int batchSize) {
+    LoadBuffer(DLoadManyContext context, int batchSize) {
       this.context = context;
       // set the persistence context as at this moment in
       // case it changes as part of a findIterate etc

From 91557167524306f04b8aaee61e679441bad1ab52 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 18 Aug 2019 16:33:36 +1200
Subject: [PATCH 1016/1036] #1795 - Refactor bind padding for Id IN expressions
 (based on internal multiValueSupport and simple id)

---
 .../java/io/ebean/event/BeanQueryRequest.java |  5 ++
 .../io/ebeaninternal/api/LoadBeanRequest.java | 37 ++----------
 .../io/ebeaninternal/api/LoadManyRequest.java | 33 +++--------
 .../server/core/BindPadding.java              | 57 +++++++++++++++++++
 .../server/core/DefaultBeanLoader.java        | 52 ++---------------
 .../server/core/OrmQueryRequest.java          |  5 ++
 .../server/deploy/BeanDescriptor.java         |  7 +++
 .../server/expression/IdInExpression.java     |  5 ++
 .../server/loadcontext/DLoadBeanContext.java  |  7 +++
 .../server/core/BindPaddingTest.java          | 51 +++++++++++++++++
 .../server/expression/BaseExpressionTest.java | 13 +++--
 .../java/org/tests/cache/TestBeanCache.java   |  4 +-
 .../tests/cache/TestBeanFetchJoinCache.java   | 45 +++++++++++++++
 src/test/resources/logback-test.xml           |  6 +-
 14 files changed, 214 insertions(+), 113 deletions(-)
 create mode 100644 src/main/java/io/ebeaninternal/server/core/BindPadding.java
 create mode 100644 src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java
 create mode 100644 src/test/java/org/tests/cache/TestBeanFetchJoinCache.java

diff --git a/src/main/java/io/ebean/event/BeanQueryRequest.java b/src/main/java/io/ebean/event/BeanQueryRequest.java
index ce327e67c..4c13aee54 100644
--- a/src/main/java/io/ebean/event/BeanQueryRequest.java
+++ b/src/main/java/io/ebean/event/BeanQueryRequest.java
@@ -24,6 +24,11 @@ public interface BeanQueryRequest<T> {
    */
   Query<T> getQuery();
 
+  /**
+   * Return true if an Id IN expression should have the bind parameters padded.
+   */
+  boolean isPadInExpression();
+
   /**
    * Return true if multi-value binding using Array or Table Values is supported.
    */
diff --git a/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java b/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java
index 3a5d9b79e..5f40bc89b 100644
--- a/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java
+++ b/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java
@@ -4,8 +4,6 @@ import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -17,8 +15,6 @@ import java.util.Set;
  */
 public class LoadBeanRequest extends LoadRequest {
 
-  private static final Logger logger = LoggerFactory.getLogger(LoadBeanRequest.class);
-
   private final List<EntityBeanIntercept> batch;
 
   private final LoadBeanBuffer loadBuffer;
@@ -56,7 +52,7 @@ public class LoadBeanRequest extends LoadRequest {
     return loadBuffer.getBeanDescriptor().getBeanType();
   }
 
-  public boolean isLoadCache() {
+  private boolean isLoadCache() {
     return loadCache;
   }
 
@@ -75,17 +71,10 @@ public class LoadBeanRequest extends LoadRequest {
   /**
    * Return the load context.
    */
-  public LoadBeanBuffer getLoadContext() {
+  private LoadBeanBuffer getLoadContext() {
     return loadBuffer;
   }
 
-  /**
-   * Return the property that invoked the lazy loading.
-   */
-  public String getLazyLoadProperty() {
-    return lazyLoadProperty;
-  }
-
   public int getBatchSize() {
     return getLoadContext().getBatchSize();
   }
@@ -93,30 +82,14 @@ public class LoadBeanRequest extends LoadRequest {
   /**
    * Return the list of Id values for the beans in the lazy load buffer.
    */
-  public List<Object> getIdList(int batchSize) {
+  public List<Object> getIdList() {
 
-    List<Object> idList = new ArrayList<>(batchSize);
+    List<Object> idList = new ArrayList<>();
 
     BeanDescriptor<?> desc = loadBuffer.getBeanDescriptor();
     for (EntityBeanIntercept ebi : batch) {
-      EntityBean bean = ebi.getOwner();
-      idList.add(desc.getId(bean));
+      idList.add(desc.getId(ebi.getOwner()));
     }
-
-
-    if (!desc.isMultiValueIdSupported() && !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;
   }
 
diff --git a/src/main/java/io/ebeaninternal/api/LoadManyRequest.java b/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
index 1b28ed2c3..0e234536f 100644
--- a/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
+++ b/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.api;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebean.util.StringHelper;
+import io.ebeaninternal.server.core.BindPadding;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
@@ -65,13 +66,6 @@ public class LoadManyRequest extends LoadRequest {
     return batch;
   }
 
-  /**
-   * Return the load context.
-   */
-  public LoadManyBuffer getLoadContext() {
-    return loadContext;
-  }
-
   /**
    * Return true if lazy loading should only load the id values.
    * <p>
@@ -80,14 +74,14 @@ public class LoadManyRequest extends LoadRequest {
    * used.
    * </p>
    */
-  public boolean isOnlyIds() {
+  private boolean isOnlyIds() {
     return onlyIds;
   }
 
   /**
    * Return true if we should load the Collection ids into the cache.
    */
-  public boolean isLoadCache() {
+  private boolean isLoadCache() {
     return loadCache;
   }
 
@@ -98,22 +92,16 @@ public class LoadManyRequest extends LoadRequest {
     return loadContext.getBatchSize();
   }
 
-  private List<Object> getParentIdList(int batchSize) {
+  private List<Object> getParentIdList() {
 
-    ArrayList<Object> idList = new ArrayList<>(batchSize);
+    List<Object> idList = new ArrayList<>();
 
     BeanPropertyAssocMany<?> many = getMany();
     for (BeanCollection<?> bc : batch) {
       idList.add(many.getParentId(bc.getOwnerBean()));
     }
-    if (!many.getTargetDescriptor().isMultiValueIdSupported()) {
-      int extraIds = batchSize - batch.size();
-      if (extraIds > 0) {
-        Object firstId = idList.get(0);
-        for (int i = 0; i < extraIds; i++) {
-          idList.add(firstId);
-        }
-      }
+    if (many.getTargetDescriptor().isPadInExpression()) {
+      BindPadding.padIds(idList);
     }
 
     return idList;
@@ -123,7 +111,7 @@ public class LoadManyRequest extends LoadRequest {
     return loadContext.getBeanProperty();
   }
 
-  public SpiQuery<?> createQuery(SpiEbeanServer server, int batchSize) {
+  public SpiQuery<?> createQuery(SpiEbeanServer server) {
 
     BeanPropertyAssocMany<?> many = getMany();
 
@@ -142,10 +130,7 @@ public class LoadManyRequest extends LoadRequest {
     }
 
     query.setLazyLoadForParents(many);
-
-    List<Object> idList = getParentIdList(batchSize);
-    many.addWhereParentIdIn(query, idList, loadContext.isUseDocStore());
-
+    many.addWhereParentIdIn(query, getParentIdList(), loadContext.isUseDocStore());
     query.setPersistenceContext(loadContext.getPersistenceContext());
 
     String mode = isLazy() ? "+lazy" : "+query";
diff --git a/src/main/java/io/ebeaninternal/server/core/BindPadding.java b/src/main/java/io/ebeaninternal/server/core/BindPadding.java
new file mode 100644
index 000000000..75963723e
--- /dev/null
+++ b/src/main/java/io/ebeaninternal/server/core/BindPadding.java
@@ -0,0 +1,57 @@
+package io.ebeaninternal.server.core;
+
+import java.util.List;
+
+/**
+ * Supports padding bind parameters for IN expressions.
+ * <p>
+ * We do this in order to get better hit ratio on DB query plans.
+ * </p>
+ */
+public final class BindPadding {
+
+  /**
+   * Pad out the Ids into common bucket sizes.
+   *
+   * @param idCollection The collection of Ids values being bound.
+   */
+  public static void padIds(List<Object> idCollection) {
+
+    int extraIds = padding(idCollection.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 = idCollection.get(0);
+      for (int i = 0; i < extraIds; i++) {
+        // just add the first Id again
+        idCollection.add(firstId);
+      }
+    }
+  }
+
+  /**
+   * Extra padding on binding id's in order to get better hit ratio on DB prepared statements / query plans.
+   */
+  static int padding(int size) {
+    if (size == 1) {
+      return 0;
+    }
+    if (size <= 5) {
+      return 5 - size;
+    }
+    if (size <= 10) {
+      return 10 - size;
+    }
+    if (size <= 20) {
+      return 20 - size;
+    }
+    if (size <= 40) {
+      return 40 - size;
+    }
+    if (size <= 50) {
+      return 50 - size;
+    }
+    return size <= 100 ? 100 - size : 0;
+  }
+
+}
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
index e66c590d2..0a4487c52 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
@@ -38,54 +38,14 @@ class DefaultBeanLoader {
     this.onIterateUseExtraTxn = server.getDatabasePlatform().useExtraTransactionOnIterateSecondaryQueries();
   }
 
-  /**
-   * Return a batch size that might be less than the requestedBatchSize.
-   * <p>
-   * This means we can have large and variable requestedBatchSizes.
-   * </p>
-   * <p>
-   * We want to restrict the number of different batch sizes as we want to
-   * re-use the query plan cache and get DB statement re-use.
-   * </p>
-   */
-  private int getBatchSize(int batchSize) {
-
-    if (batchSize == 1) {
-      // there is only one bean/collection to load
-      return 1;
-    }
-    if (batchSize <= 5) {
-      // anything less than 5 becomes 5
-      return 5;
-    }
-    if (batchSize <= 10) {
-      return 10;
-    }
-    if (batchSize <= 20) {
-      return 20;
-    }
-    if (batchSize <= 50) {
-      return 50;
-    }
-    if (batchSize <= 100) {
-      return 100;
-    }
-    return batchSize;
-  }
-
   void refreshMany(EntityBean parentBean, String propertyName) {
     refreshMany(parentBean, propertyName, null);
   }
 
   void loadMany(LoadManyRequest loadRequest) {
 
-    List<BeanCollection<?>> batch = loadRequest.getBatch();
-
-    int batchSize = getBatchSize(batch.size());
-
-    SpiQuery<?> query = loadRequest.createQuery(server, batchSize);
+    SpiQuery<?> query = loadRequest.createQuery(server);
     executeQuery(loadRequest, query);
-
     loadRequest.postLoad();
   }
 
@@ -97,7 +57,7 @@ class DefaultBeanLoader {
     loadManyInternal(parentBean, propertyName, null, false, onlyIds);
   }
 
-  void refreshMany(EntityBean parentBean, String propertyName, Transaction t) {
+  private void refreshMany(EntityBean parentBean, String propertyName, Transaction t) {
     loadManyInternal(parentBean, propertyName, t, true, false);
   }
 
@@ -147,8 +107,7 @@ class DefaultBeanLoader {
       query.setLoadDescription("+lazy", null);
     }
 
-    String idProperty = parentDesc.getIdBinder().getIdProperty();
-    query.select(idProperty);
+    query.select(parentDesc.getIdBinder().getIdProperty());
 
     if (onlyIds) {
       query.fetch(many.getName(), many.getTargetIdProperty());
@@ -192,9 +151,7 @@ class DefaultBeanLoader {
       throw new RuntimeException("Nothing in batch?");
     }
 
-    int batchSize = getBatchSize(batch.size());
-
-    List<Object> idList = loadRequest.getIdList(batchSize);
+    List<Object> idList = loadRequest.getIdList();
     if (idList.isEmpty()) {
       // everything was loaded from cache
       return;
@@ -315,6 +272,5 @@ class DefaultBeanLoader {
     }
 
     desc.resetManyProperties(dbBean);
-
   }
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index b7543c76d..4a9fa0625 100644
--- a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -115,6 +115,11 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
     }
   }
 
+  @Override
+  public boolean isPadInExpression() {
+    return beanDescriptor.isPadInExpression();
+  }
+
   @Override
   public boolean isMultiValueIdSupported() {
     return beanDescriptor.isMultiValueIdSupported();
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index cb38766e4..ae11750bb 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -1835,6 +1835,13 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return multiValueSupported && isSimpleId();
   }
 
+  /**
+   * Return true if Id IN expression should have bind parameters padded.
+   */
+  public boolean isPadInExpression() {
+    return !multiValueSupported && isSimpleId();
+  }
+
   /**
    * Return the sql for binding an id. This is the columns with table alias that
    * make up the id.
diff --git a/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java b/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java
index e37e9d150..d9d82d4e3 100644
--- a/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java
@@ -5,6 +5,7 @@ import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.api.SpiExpressionValidation;
+import io.ebeaninternal.server.core.BindPadding;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.id.IdBinder;
 
@@ -46,6 +47,10 @@ public class IdInExpression extends NonPrepareExpression {
   @Override
   public void prepareExpression(BeanQueryRequest<?> request) {
     multiValueIdSupported = request.isMultiValueIdSupported();
+    if (!multiValueIdSupported && !idCollection.isEmpty() && request.isPadInExpression()) {
+      // pad out the ids for better hit ratio on DB query plans
+      BindPadding.padIds(idCollection);
+    }
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
index d919a251c..492a0902c 100644
--- a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
+++ b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.loadcontext;
 
+import io.ebean.CacheMode;
 import io.ebean.bean.BeanLoader;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.bean.PersistenceContext;
@@ -20,6 +21,8 @@ import java.util.Set;
  */
 class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext {
 
+  private final boolean cache;
+
   private List<LoadBuffer> bufferList;
 
   private LoadBuffer currentBuffer;
@@ -29,6 +32,7 @@ class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext {
     // bufferList only required when using query joins (queryFetch)
     this.bufferList = (!queryFetch) ? null : new ArrayList<>();
     this.currentBuffer = createBuffer(firstBatchSize);
+    this.cache = (queryProps == null) ? false : queryProps.isCache();
   }
 
   /**
@@ -43,6 +47,9 @@ class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext {
 
   private void configureQuery(SpiQuery<?> query, String lazyLoadProperty) {
 
+    if (cache) {
+      query.setBeanCacheMode(CacheMode.ON);
+    }
     setLabel(query);
     parent.propagateQueryState(query, desc.isDocStoreMapped());
     query.setParentNode(objectGraphNode);
diff --git a/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java b/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java
new file mode 100644
index 000000000..d0363d2c6
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java
@@ -0,0 +1,51 @@
+package io.ebeaninternal.server.core;
+
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+
+public class BindPaddingTest {
+
+  @Test
+  public void padIds() {
+
+    final List<Object> input = asList(1, 2);
+    BindPadding.padIds(input);
+    assertThat(input).contains(1,2,1,1,1);
+    assertThat(input).hasSize(5);
+  }
+
+  private List<Object> asList(int... id) {
+    List<Object> list = new ArrayList<>();
+    for (int i : id) {
+      list.add(i);
+    }
+    return list;
+  }
+
+  @Test
+  public void padding() {
+
+    assertEquals(0, BindPadding.padding(1));
+    assertEquals(3, BindPadding.padding(2));
+    assertEquals(2, BindPadding.padding(3));
+    assertEquals(1, BindPadding.padding(4));
+    assertEquals(0, BindPadding.padding(5));
+    assertEquals(4, BindPadding.padding(6));
+    assertEquals(1, BindPadding.padding(9));
+    assertEquals(0, BindPadding.padding(10));
+    assertEquals(9, BindPadding.padding(11));
+    assertEquals(0, BindPadding.padding(20));
+    assertEquals(19, BindPadding.padding(21));
+    assertEquals(0, BindPadding.padding(40));
+    assertEquals(9, BindPadding.padding(41));
+    assertEquals(0, BindPadding.padding(50));
+    assertEquals(49, BindPadding.padding(51));
+    assertEquals(0, BindPadding.padding(100));
+    assertEquals(0, BindPadding.padding(101));
+  }
+}
diff --git a/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java
index a9a8e939a..d1b01da21 100644
--- a/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java
+++ b/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java
@@ -20,18 +20,18 @@ public abstract class BaseExpressionTest extends BaseTestCase {
   }
 
   protected String hash(SpiExpression expression) {
-    StringBuilder sb  = new StringBuilder();
+    StringBuilder sb = new StringBuilder();
     if (expression != null) {
       expression.queryPlanHash(sb);
     }
     return sb.toString();
   }
 
-  protected void same(SpiExpression one, SpiExpression two){
+  protected void same(SpiExpression one, SpiExpression two) {
     assertThat(hash(one)).isEqualTo(hash(two));
   }
 
-  protected void different(SpiExpression one, SpiExpression two){
+  protected void different(SpiExpression one, SpiExpression two) {
     assertThat(hash(one)).isNotEqualTo(hash(two));
   }
 
@@ -50,7 +50,7 @@ public abstract class BaseExpressionTest extends BaseTestCase {
   }
 
 
-  private static final TDQueryRequest<Customer> MULTI_VALUE= new TDQueryRequest<>(true);
+  private static final TDQueryRequest<Customer> MULTI_VALUE = new TDQueryRequest<>(true);
   private static final TDQueryRequest<Customer> NO_MULTI_VALUE = new TDQueryRequest<>(false);
 
   static class TDQueryRequest<T> implements BeanQueryRequest<T> {
@@ -76,6 +76,11 @@ public abstract class BaseExpressionTest extends BaseTestCase {
       return null;
     }
 
+    @Override
+    public boolean isPadInExpression() {
+      return supported;
+    }
+
     @Override
     public boolean isMultiValueIdSupported() {
       return supported;
diff --git a/src/test/java/org/tests/cache/TestBeanCache.java b/src/test/java/org/tests/cache/TestBeanCache.java
index 783c300a5..448b824a9 100644
--- a/src/test/java/org/tests/cache/TestBeanCache.java
+++ b/src/test/java/org/tests/cache/TestBeanCache.java
@@ -76,7 +76,7 @@ public class TestBeanCache extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.current();
     assertThat(sql).hasSize(1);
     if (isH2()) {
-      assertThat(sql.get(0)).contains("from o_cached_bean t0 where t0.id in (?,?,?)");
+      assertThat(sql.get(0)).contains("from o_cached_bean t0 where t0.id in (?,?,?,?,?)");
     }
 
     log.info("All hits (3 of 3) ...");
@@ -124,7 +124,7 @@ public class TestBeanCache extends BaseTestCase {
     assertThat(sql).hasSize(1);
     if (isH2()) {
       // fetch the misses from DB
-      assertThat(sql.get(0)).contains("from o_cached_bean t0 where t0.id in (?,?)");
+      assertThat(sql.get(0)).contains("from o_cached_bean t0 where t0.id in (?,?,?,?,?)");
     }
   }
 
diff --git a/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java b/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java
new file mode 100644
index 000000000..118d0e114
--- /dev/null
+++ b/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java
@@ -0,0 +1,45 @@
+package org.tests.cache;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import org.junit.Test;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.Order;
+import org.tests.model.basic.ResetBasicData;
+
+import java.util.List;
+
+import static io.ebean.CacheMode.ON;
+
+public class TestBeanFetchJoinCache extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    ResetBasicData.reset();
+
+//    DB.find(Customer.class)
+//      .setBeanCacheMode(ON)
+//      .findList();
+
+
+    DB.find(Customer.class)
+      .where().idIn(1,2,3)
+      //.setBeanCacheMode(ON)
+      .findList();
+
+    List<Order> orders = DB.find(Order.class)
+      .fetchQuery("customer", "name")
+      .findList();
+
+
+    orders = DB.find(Order.class)
+      .fetchQuery("customer", "+cache, name")
+      .findList();
+
+    for (Order order : orders) {
+      order.getCustomer().getName();
+    }
+
+  }
+}
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
index 0e19a7c4b..7dec55bb6 100644
--- a/src/test/resources/logback-test.xml
+++ b/src/test/resources/logback-test.xml
@@ -80,10 +80,10 @@
 <!--  <logger name="io.ebean.DDL" level="DEBUG"/>-->
 
   <logger name="io.ebean.SQL" level="TRACE"/>
-<!--  <logger name="io.ebean.TXN" level="TRACE"/>-->
-<!--  <logger name="io.ebean.SUM" level="TRACE"/>-->
+  <logger name="io.ebean.TXN" level="TRACE"/>
+  <logger name="io.ebean.SUM" level="TRACE"/>
 
-<!--  <logger name="io.ebean.cache" level="TRACE"/>-->
+  <logger name="io.ebean.cache" level="TRACE"/>
 <!--  <logger name="io.ebean.cache.REGION" level="TRACE"/>-->
 <!--  <logger name="io.ebean.cache.TABLEMOD" level="TRACE"/>-->
 

From 96747115165794c329fca4346ab4135e566d400c Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 19 Aug 2019 21:36:19 +1200
Subject: [PATCH 1017/1036] #1796 - ENH: add query.fetchCache(path) ... for
 explicitly building part of graph from L2 cache

---
 pom.xml                                       |   4 +-
 src/main/java/io/ebean/FetchConfig.java       |  22 +++
 src/main/java/io/ebean/FetchGroupBuilder.java |  14 ++
 src/main/java/io/ebean/Query.java             |  13 ++
 .../io/ebean/bean/EntityBeanIntercept.java    |  23 ++-
 .../io/ebeaninternal/api/LoadBeanRequest.java |  15 +-
 .../server/cache/CachedBeanDataToBean.java    |   2 +
 .../server/core/DefaultBeanLoader.java        |  12 +-
 .../server/core/DefaultServer.java            |   6 -
 .../server/core/OrmQueryRequest.java          |   1 +
 .../server/deploy/BeanDescriptor.java         |   7 +
 .../deploy/BeanDescriptorCacheHelp.java       |  31 +--
 .../server/deploy/id/IdBinderFactory.java     |   2 -
 .../server/loadcontext/DLoadBeanContext.java  |   2 +-
 .../server/query/DFetchGroupBuilder.java      |  14 ++
 .../server/query/DefaultFetchGroupQuery.java  |  12 ++
 .../server/querydefn/DefaultOrmQuery.java     |  11 ++
 .../server/querydefn/OrmQueryProperties.java  |   3 +
 .../tests/cache/TestBeanFetchJoinCache.java   | 177 ++++++++++++++++--
 src/test/resources/ebean.properties           |   2 +-
 20 files changed, 319 insertions(+), 54 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0b6f28be0..d29290d7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -237,7 +237,7 @@
     <dependency>
       <groupId>io.ebean.test</groupId>
       <artifactId>ebean-test-docker</artifactId>
-      <version>2.10.1</version>
+      <version>2.10.3</version>
       <scope>test</scope>
     </dependency>
 
@@ -330,7 +330,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>11.42.1</version>
+        <version>11.43.2</version>
         <executions>
           <execution>
             <id>test</id>
diff --git a/src/main/java/io/ebean/FetchConfig.java b/src/main/java/io/ebean/FetchConfig.java
index 76324c33c..39823b2c7 100644
--- a/src/main/java/io/ebean/FetchConfig.java
+++ b/src/main/java/io/ebean/FetchConfig.java
@@ -148,6 +148,8 @@ public class FetchConfig implements Serializable {
 
   private boolean queryAll;
 
+  private boolean cache;
+
   /**
    * Construct the fetch configuration object.
    */
@@ -188,6 +190,17 @@ public class FetchConfig implements Serializable {
     return this;
   }
 
+  /**
+   * Eagerly fetch the beans fetching the beans from the L2 bean cache
+   * and using the DB for beans not in the cache.
+   */
+  public FetchConfig cache() {
+    this.cache = true;
+    this.queryBatchSize = 0;
+    this.queryAll = true;
+    return this;
+  }
+
   /**
    * Eagerly fetch the beans in this path as a separate query (rather than as
    * part of the main query).
@@ -247,6 +260,13 @@ public class FetchConfig implements Serializable {
     return queryAll;
   }
 
+  /**
+   * Return true if this uses L2 bean cache.
+   */
+  public boolean isCache() {
+    return cache;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;
@@ -255,6 +275,7 @@ public class FetchConfig implements Serializable {
     FetchConfig that = (FetchConfig) o;
     if (lazyBatchSize != that.lazyBatchSize) return false;
     if (queryBatchSize != that.queryBatchSize) return false;
+    if (cache != that.cache) return false;
     return queryAll == that.queryAll;
   }
 
@@ -263,6 +284,7 @@ public class FetchConfig implements Serializable {
     int result = lazyBatchSize;
     result = 92821 * result + queryBatchSize;
     result = 92821 * result + (queryAll ? 1 : 0);
+    result = 92821 * result + (cache ? 1 : 0);
     return result;
   }
 }
diff --git a/src/main/java/io/ebean/FetchGroupBuilder.java b/src/main/java/io/ebean/FetchGroupBuilder.java
index 5b4f8ad3a..121cceb53 100644
--- a/src/main/java/io/ebean/FetchGroupBuilder.java
+++ b/src/main/java/io/ebean/FetchGroupBuilder.java
@@ -67,12 +67,26 @@ public interface FetchGroupBuilder<T> {
   @Nonnull
   FetchGroupBuilder<T> fetchQuery(String path);
 
+  /**
+   * Fetch the path including all its properties using L2 cache.
+   * Cache misses fallback to fetchQuery().
+   */
+  @Nonnull
+  FetchGroupBuilder<T> fetchCache(String path);
+
   /**
    * Fetch the path including specified properties using a query join.
    */
   @Nonnull
   FetchGroupBuilder<T> fetchQuery(String path, String properties);
 
+  /**
+   * Fetch the path including specified properties using L2 cache.
+   * Cache misses fallback to fetchQuery().
+   */
+  @Nonnull
+  FetchGroupBuilder<T> fetchCache(String path, String properties);
+
   /**
    * Fetch the path including all its properties lazily.
    */
diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index 218f12a43..0ed9f4622 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -501,6 +501,14 @@ public interface Query<T> {
    */
   Query<T> fetchQuery(String path, String fetchProperties);
 
+  /**
+   * Fetch the path and properties using L2 bean cache.
+   *
+   * @param path            The path of the beans we are fetching from L2 cache.
+   * @param fetchProperties The properties that should be loaded.
+   */
+  Query<T> fetchCache(String path, String fetchProperties);
+
   /**
    * Fetch the path and properties lazily (via batch lazy loading).
    * <p>
@@ -587,6 +595,11 @@ public interface Query<T> {
    */
   Query<T> fetchQuery(String path);
 
+  /**
+   * Fetch the path eagerly using L2 cache.
+   */
+  Query<T> fetchCache(String path);
+
   /**
    * Fetch the path lazily (via batch lazy loading).
    * <p>
diff --git a/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/src/main/java/io/ebean/bean/EntityBeanIntercept.java
index 2a6f3e720..37922364b 100644
--- a/src/main/java/io/ebean/bean/EntityBeanIntercept.java
+++ b/src/main/java/io/ebean/bean/EntityBeanIntercept.java
@@ -95,13 +95,10 @@ public final class EntityBeanIntercept implements Serializable {
   private final byte[] flags;
 
   private boolean fullyLoadedBean;
-
+  private boolean loadedFromCache;
   private Object[] origValues;
-
   private Exception[] loadErrors;
-
   private int lazyLoadProperty = -1;
-
   private Object ownerId;
   private int sortOrder;
 
@@ -311,6 +308,22 @@ public final class EntityBeanIntercept implements Serializable {
     }
   }
 
+  /**
+   * Set true when the bean has been loaded from L2 bean cache.
+   * The effect of this is that we should skip the cache if there
+   * is subsequent lazy loading (bean cache partially populated).
+   */
+  public void setLoadedFromCache(boolean loadedFromCache) {
+    this.loadedFromCache = loadedFromCache;
+  }
+
+  /**
+   * Return true if this bean was loaded from L2 bean cache.
+   */
+  public boolean isLoadedFromCache() {
+    return loadedFromCache;
+  }
+
   /**
    * Return true if the bean should be treated as readOnly. If a setter method
    * is called when it is readOnly an Exception is thrown.
@@ -780,7 +793,7 @@ public final class EntityBeanIntercept implements Serializable {
   }
 
   public boolean[] getLoaded() {
-    boolean[] ret= new boolean[flags.length];
+    boolean[] ret = new boolean[flags.length];
     for (int i = 0; i < ret.length; i++) {
       ret[i] = (flags[i] & FLAG_LOADED_PROP) != 0;
     }
diff --git a/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java b/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java
index 5f40bc89b..fef666a63 100644
--- a/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java
+++ b/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java
@@ -23,11 +23,14 @@ public class LoadBeanRequest extends LoadRequest {
 
   private final boolean loadCache;
 
+  private boolean loadedFromCache;
+
   /**
    * Construct for lazy load request.
    */
-  public LoadBeanRequest(LoadBeanBuffer LoadBuffer, String lazyLoadProperty, boolean loadCache) {
-    this(LoadBuffer, null, true, lazyLoadProperty, loadCache);
+  public LoadBeanRequest(LoadBeanBuffer LoadBuffer, EntityBeanIntercept ebi, boolean loadCache) {
+    this(LoadBuffer, null, true, ebi.getLazyLoadProperty(), loadCache);
+    this.loadedFromCache = ebi.isLoadedFromCache();
   }
 
   /**
@@ -52,11 +55,17 @@ public class LoadBeanRequest extends LoadRequest {
     return loadBuffer.getBeanDescriptor().getBeanType();
   }
 
+  /**
+   * Return true if the beans invoking lazy loading were previously loaded from cache.
+   */
+  public boolean isLoadedFromCache() {
+    return loadedFromCache;
+  }
+
   private boolean isLoadCache() {
     return loadCache;
   }
 
-
   public String getDescription() {
     return "path:" + loadBuffer.getFullPath() + " batch:" + batch.size();
   }
diff --git a/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java b/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java
index bb3bc4b75..6dbdae1ff 100644
--- a/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java
+++ b/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java
@@ -13,6 +13,8 @@ public class CachedBeanDataToBean {
   public static void load(BeanDescriptor<?> desc, EntityBean bean, CachedBeanData cacheBeanData, PersistenceContext context) {
 
     EntityBeanIntercept ebi = bean._ebean_getIntercept();
+    // any future lazy loading skips L2 bean cache
+    ebi.setLoadedFromCache(true);
 
     BeanProperty idProperty = desc.getIdProperty();
     if (desc.getInheritInfo() != null) {
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
index 0a4487c52..fc8d42027 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.core;
 
+import io.ebean.CacheMode;
 import io.ebean.ExpressionList;
 import io.ebean.Transaction;
 import io.ebean.bean.BeanCollection;
@@ -38,10 +39,6 @@ class DefaultBeanLoader {
     this.onIterateUseExtraTxn = server.getDatabasePlatform().useExtraTransactionOnIterateSecondaryQueries();
   }
 
-  void refreshMany(EntityBean parentBean, String propertyName) {
-    refreshMany(parentBean, propertyName, null);
-  }
-
   void loadMany(LoadManyRequest loadRequest) {
 
     SpiQuery<?> query = loadRequest.createQuery(server);
@@ -57,8 +54,8 @@ class DefaultBeanLoader {
     loadManyInternal(parentBean, propertyName, null, false, onlyIds);
   }
 
-  private void refreshMany(EntityBean parentBean, String propertyName, Transaction t) {
-    loadManyInternal(parentBean, propertyName, t, true, false);
+  void refreshMany(EntityBean parentBean, String propertyName) {
+    loadManyInternal(parentBean, propertyName, null, true, false);
   }
 
   private void loadManyInternal(EntityBean parentBean, String propertyName, Transaction t, boolean refresh, boolean onlyIds) {
@@ -159,6 +156,9 @@ class DefaultBeanLoader {
 
     SpiQuery<?> query = server.createQuery(loadRequest.getBeanType());
     loadRequest.configureQuery(query, idList);
+    if (loadRequest.isLoadedFromCache()) {
+      query.setBeanCacheMode(CacheMode.PUT);
+    }
 
     List<?> list = executeQuery(loadRequest, query);
     loadRequest.postLoad(list);
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 7f141146a..87adc2066 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -570,37 +570,31 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   @Override
   public void refreshMany(Object parentBean, String propertyName) {
-
     beanLoader.refreshMany(checkEntityBean(parentBean), propertyName);
   }
 
   @Override
   public void loadMany(LoadManyRequest loadRequest) {
-
     beanLoader.loadMany(loadRequest);
   }
 
   @Override
   public void loadMany(BeanCollection<?> bc, boolean onlyIds) {
-
     beanLoader.loadMany(bc, onlyIds);
   }
 
   @Override
   public void refresh(Object bean) {
-
     beanLoader.refresh(checkEntityBean(bean));
   }
 
   @Override
   public void loadBean(LoadBeanRequest loadRequest) {
-
     beanLoader.loadBean(loadRequest);
   }
 
   @Override
   public void loadBean(EntityBeanIntercept ebi) {
-
     beanLoader.loadBean(ebi);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index 4a9fa0625..d48539a6a 100644
--- a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -97,6 +97,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
     this.queryEngine = queryEngine;
     this.query = query;
     this.readOnly = query.isReadOnly();
+    this.persistenceContext = query.getPersistenceContext();
   }
 
   public PersistenceException translate(String bindLog, String sql, SQLException e) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index ae11750bb..de4bf14e6 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -2316,6 +2316,13 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return idBinder.convertSetId(idValue, bean);
   }
 
+  /**
+   * Set the Id value to the bean (without type conversion).
+   */
+  public void setId(Object idValue, EntityBean bean) {
+    idProperty.setValueIntercept(bean, idValue);
+  }
+
   @Override
   public Property getProperty(String propName) {
     return findProperty(propName);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index 329846ff2..5c6c72ced 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -675,25 +675,30 @@ final class BeanDescriptorCacheHelp<T> {
    */
   EntityBean loadBeanDirect(Object id, Boolean readOnly, CachedBeanData data, PersistenceContext context) {
 
+    id = desc.convertId(id);
+    EntityBean bean = null;
     if (context == null) {
       context = new DefaultPersistenceContext();
+    } else {
+      bean = (EntityBean)desc.contextGet(context, id);
+    }
+
+    if (bean == null) {
+      bean = desc.createEntityBean();
+      desc.setId(id, bean);
+      desc.contextPut(context, id, bean);
+
+      EntityBeanIntercept ebi = bean._ebean_getIntercept();
+      // Not using loadContext here so no batch lazy loading for these beans
+      ebi.setBeanLoader(desc.getEbeanServer());
+      if (Boolean.TRUE.equals(readOnly)) {
+        ebi.setReadOnly(true);
+      }
+      ebi.setPersistenceContext(context);
     }
 
-    EntityBean bean = desc.createEntityBean();
-    id = desc.convertSetId(id, bean);
     CachedBeanDataToBean.load(desc, bean, data, context);
 
-    EntityBeanIntercept ebi = bean._ebean_getIntercept();
-
-    // Not using a loadContext for beans coming out of L2 cache
-    // so that means no batch lazy loading for these beans
-    ebi.setBeanLoader(desc.getEbeanServer());
-    if (Boolean.TRUE.equals(readOnly)) {
-      ebi.setReadOnly(true);
-    }
-    ebi.setPersistenceContext(context);
-    desc.contextPut(context, id, bean);
-
     if (desc.isReadAuditing()) {
       desc.readAuditBean("l2", "", bean);
     }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderFactory.java b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderFactory.java
index d5140f589..70f8a1175 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderFactory.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderFactory.java
@@ -24,11 +24,9 @@ public class IdBinderFactory {
    * Create the IdConvertSet for the given type of Id properties.
    */
   public IdBinder createIdBinder(BeanProperty id) {
-
     if (id == null) {
       // for report type beans that don't need an id
       return EMPTY;
-
     }
     if (id.isEmbedded()) {
       return new IdBinderEmbedded(idInExpandedForm, (BeanPropertyAssocOne<?>) id);
diff --git a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
index 492a0902c..96c696c21 100644
--- a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
+++ b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
@@ -191,7 +191,7 @@ class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext {
         }
       }
 
-      LoadBeanRequest req = new LoadBeanRequest(this, ebi.getLazyLoadProperty(), context.hitCache);
+      LoadBeanRequest req = new LoadBeanRequest(this, ebi, context.hitCache);
       context.desc.getEbeanServer().loadBean(req);
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/query/DFetchGroupBuilder.java b/src/main/java/io/ebeaninternal/server/query/DFetchGroupBuilder.java
index 15c876b0d..1c858f3ab 100644
--- a/src/main/java/io/ebeaninternal/server/query/DFetchGroupBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/DFetchGroupBuilder.java
@@ -11,6 +11,8 @@ import io.ebeaninternal.server.querydefn.SpiFetchGroup;
  */
 class DFetchGroupBuilder<T> implements FetchGroupBuilder<T> {
 
+  private static final FetchConfig FETCH_CACHE = new FetchConfig().cache();
+
   private static final FetchConfig FETCH_QUERY = new FetchConfig().query();
 
   private static final FetchConfig FETCH_LAZY = new FetchConfig().lazy();
@@ -61,6 +63,12 @@ class DFetchGroupBuilder<T> implements FetchGroupBuilder<T> {
     return this;
   }
 
+  @Override
+  public FetchGroupBuilder<T> fetchCache(String path) {
+    detail.fetch(path, null, FETCH_CACHE);
+    return this;
+  }
+
   @Override
   public FetchGroupBuilder<T> fetchLazy(String path) {
     detail.fetch(path, null, FETCH_LAZY);
@@ -79,6 +87,12 @@ class DFetchGroupBuilder<T> implements FetchGroupBuilder<T> {
     return this;
   }
 
+  @Override
+  public FetchGroupBuilder<T> fetchCache(String path, String properties) {
+    detail.fetch(path, properties, FETCH_CACHE);
+    return this;
+  }
+
   @Override
   public FetchGroupBuilder<T> fetchLazy(String path, String properties) {
     detail.fetch(path, properties, FETCH_LAZY);
diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java b/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
index ff0632949..e7912546f 100644
--- a/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
+++ b/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
@@ -43,6 +43,8 @@ import java.util.function.Predicate;
  */
 class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T> {
 
+  private static final FetchConfig FETCH_CACHE = new FetchConfig().cache();
+
   private static final FetchConfig FETCH_QUERY = new FetchConfig().query();
 
   private static final FetchConfig FETCH_LAZY = new FetchConfig().lazy();
@@ -76,6 +78,11 @@ class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T> {
     return fetch(property, null, FETCH_QUERY);
   }
 
+  @Override
+  public Query<T> fetchCache(String property) {
+    return fetch(property, null, FETCH_CACHE);
+  }
+
   @Override
   public Query<T> fetchLazy(String property) {
     return fetch(property, null, FETCH_LAZY);
@@ -96,6 +103,11 @@ class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T> {
     return fetch(property, columns, FETCH_QUERY);
   }
 
+  @Override
+  public Query<T> fetchCache(String property, String columns) {
+    return fetch(property, columns, FETCH_CACHE);
+  }
+
   @Override
   public Query<T> fetchLazy(String property, String columns) {
     return fetch(property, columns, FETCH_LAZY);
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index b03596175..dfdb3708d 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -79,6 +79,8 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   private static final String DEFAULT_QUERY_NAME = "default";
 
+  private static final FetchConfig FETCH_CACHE = new FetchConfig().cache();
+
   private static final FetchConfig FETCH_QUERY = new FetchConfig().query();
 
   private static final FetchConfig FETCH_LAZY = new FetchConfig().lazy();
@@ -1405,6 +1407,10 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return fetch(property, null, FETCH_QUERY);
   }
 
+  public Query<T> fetchCache(String property) {
+    return fetch(property, null, FETCH_CACHE);
+  }
+
   @Override
   public Query<T> fetchLazy(String property) {
     return fetch(property, null, FETCH_LAZY);
@@ -1425,6 +1431,11 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return fetch(property, columns, FETCH_QUERY);
   }
 
+  @Override
+  public Query<T> fetchCache(String property, String columns) {
+    return fetch(property, columns, FETCH_CACHE);
+  }
+
   @Override
   public Query<T> fetchLazy(String property, String columns) {
     return fetch(property, columns, FETCH_LAZY);
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
index bc4d5d005..cf03b0188 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
@@ -107,6 +107,9 @@ public class OrmQueryProperties implements Serializable {
     this.readOnly = response.readOnly;
     if (fetchConfig != null) {
       this.fetchConfig = fetchConfig;
+      if (fetchConfig.isCache()) {
+        this.cache = true;
+      }
     } else {
       this.fetchConfig = response.fetchConfig;
     }
diff --git a/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java b/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java
index 118d0e114..25eb97ca1 100644
--- a/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java
+++ b/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java
@@ -2,6 +2,10 @@ package org.tests.cache;
 
 import io.ebean.BaseTestCase;
 import io.ebean.DB;
+import io.ebean.FetchGroup;
+import io.ebean.cache.ServerCache;
+import io.ebean.cache.ServerCacheStatistics;
+import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
@@ -10,36 +14,179 @@ import org.tests.model.basic.ResetBasicData;
 import java.util.List;
 
 import static io.ebean.CacheMode.ON;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestBeanFetchJoinCache extends BaseTestCase {
 
+  private final ServerCache customerBeanCache = server().getServerCacheManager().getBeanCache(Customer.class);
+
   @Test
-  public void test() {
+  public void fetchCache_when_allHits() {
 
-    ResetBasicData.reset();
+    initDataClearCache();
+    loadCustomerBeanCache();
 
-//    DB.find(Customer.class)
-//      .setBeanCacheMode(ON)
-//      .findList();
+    customerBeanCache.getStatistics(true);
 
-
-    DB.find(Customer.class)
-      .where().idIn(1,2,3)
-      //.setBeanCacheMode(ON)
-      .findList();
+    LoggedSqlCollector.start();
 
     List<Order> orders = DB.find(Order.class)
-      .fetchQuery("customer", "name")
+      .fetchCache("customer", "status, name")
       .findList();
 
+    final List<String> sql0 = LoggedSqlCollector.current();
+    assertThat(sql0).hasSize(1);
 
-    orders = DB.find(Order.class)
-      .fetchQuery("customer", "+cache, name")
-      .findList();
+    final ServerCacheStatistics statistics = customerBeanCache.getStatistics(true);
+    assertThat(statistics.getHitCount()).isEqualTo(2);
+
+    assertThat(trimSql(sql0.get(0))).doesNotContain("t1.status");
 
     for (Order order : orders) {
-      order.getCustomer().getName();
+      final Customer customer = order.getCustomer();
+      assertThat(customer.getName()).isNotNull();
+      assertThat(customer.getStatus()).isNotNull();
     }
 
+    assertThat(LoggedSqlCollector.stop()).isEmpty();
+  }
+
+  private void loadCustomerBeanCache() {
+    DB.find(Customer.class)
+      .setBeanCacheMode(ON)
+      .findList();
+  }
+
+  @Test
+  public void fetchCache_when_someHits() {
+
+    initDataClearCache();
+
+    DB.find(Customer.class)
+      .setBeanCacheMode(ON)
+      .where().lt("id", 2)
+      .findList();
+
+    customerBeanCache.getStatistics(true);
+
+    LoggedSqlCollector.start();
+
+    List<Order> orders = DB.find(Order.class)
+      .fetchCache("customer")
+      .findList();
+
+    final List<String> sql0 = LoggedSqlCollector.current();
+    assertThat(sql0).hasSize(2);
+    assertThat(sql0.get(0)).contains(" from o_order ");
+    assertThat(sql0.get(1)).contains(" from o_customer t0 where t0.id ");
+
+    final ServerCacheStatistics statistics = customerBeanCache.getStatistics(true);
+    assertThat(statistics.getHitCount()).isEqualTo(1);
+
+    for (Order order : orders) {
+      final Customer customer = order.getCustomer();
+      assertThat(customer.getName()).isNotNull();
+      assertThat(customer.getStatus()).isNotNull();
+    }
+
+    assertThat(LoggedSqlCollector.stop()).isEmpty();
+  }
+
+  @Test
+  public void fetchCache_when_hitsButBeanCachePartiallyLoaded() {
+
+    initDataClearCache();
+
+    DB.find(Customer.class)
+      .setBeanCacheMode(ON)
+      .select("name") // not included status in bean cache
+      .findList();
+
+    customerBeanCache.getStatistics(true);
+
+    LoggedSqlCollector.start();
+
+    List<Order> orders = DB.find(Order.class)
+      .fetchCache("customer")
+      .findList();
+
+    final List<String> sql0 = LoggedSqlCollector.current();
+    assertThat(sql0).hasSize(1);
+
+    final ServerCacheStatistics statistics = customerBeanCache.getStatistics(true);
+    assertThat(statistics.getHitCount()).isEqualTo(2);
+
+    assertThat(trimSql(sql0.get(0))).doesNotContain("t1.status");
+
+    for (Order order : orders) {
+      final Customer customer = order.getCustomer();
+      assertThat(customer.getName()).isNotNull();
+      assertThat(customer.getStatus()).isNotNull(); // We hit the DB here as previously hit bean cache
+    }
+
+    // assert we didn't hit the L2 bean cache the second time around
+    final ServerCacheStatistics statistics1 = customerBeanCache.getStatistics(true);
+    assertThat(statistics1.getHitCount()).isEqualTo(0);
+
+    // assert we did hit the DB the second time around
+    final List<String> sql1 = LoggedSqlCollector.stop();
+    assertThat(sql1).hasSize(1);
+    assertThat(sql1.get(0)).contains(" from o_customer t0 ");
+  }
+
+  private final FetchGroup<Order> fgBasic = FetchGroup.of(Order.class)
+    .fetchCache("customer")
+    .build();
+
+  @Test
+  public void fetchGroup_fetchCache() {
+
+    initDataClearCache();
+
+    loadCustomerBeanCache();
+    customerBeanCache.getStatistics(true);
+
+    List<Order> orders = DB.find(Order.class)
+      .select(fgBasic)
+      .findList();
+
+    assertThat(orders).isNotEmpty();
+
+    final ServerCacheStatistics statistics1 = customerBeanCache.getStatistics(true);
+    assertThat(statistics1.getHitCount()).isEqualTo(2);
+  }
+
+  private final FetchGroup<Order> fgCachePartial = FetchGroup.of(Order.class)
+    .fetchCache("customer", "name")
+    .build();
+
+
+  @Test
+  public void fetchGroup_fetchCache_partial() {
+
+    initDataClearCache();
+
+    customerBeanCache.getStatistics(true);
+
+    LoggedSqlCollector.start();
+
+    List<Order> orders = DB.find(Order.class)
+      .select(fgCachePartial)
+      .findList();
+
+    assertThat(orders).isNotEmpty();
+
+    final ServerCacheStatistics statistics1 = customerBeanCache.getStatistics(true);
+    assertThat(statistics1.getMissCount()).isEqualTo(2);
+
+    final List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains(" from o_order ");
+    assertThat(sql.get(1)).contains(" from o_customer ");
+  }
+
+  private void initDataClearCache() {
+    ResetBasicData.reset();
+    server().getServerCacheManager().clearAll();
   }
 }
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index e1c4edbc6..85fd153cc 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -176,7 +176,7 @@ datasource.sqlserver.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
 datasource.nuodb.schema=test_user
 datasource.nuodb.username=test_user
 datasource.nuodb.password=test
-datasource.nuodb.url=jdbc:com.nuodb://localhost/unit
+datasource.nuodb.url=jdbc:com.nuodb://localhost/testdb
 datasource.nuodb.driver=com.nuodb.jdbc.Driver
 
 datasource.db2.username=db2admin

From 57ccd19fe607ad5ed50cdda6debd7772de040353 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 19 Aug 2019 21:37:01 +1200
Subject: [PATCH 1018/1036] #1797 - Bump ebean-migration to 11.20.1 ... which
 inserts a <init> row into db_migration table

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d29290d7f..99b4c480c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>11.19.1</version>
+      <version>11.20.1</version>
     </dependency>
 
     <dependency>

From 0d175557b06ac890f8ab934a209fff3b3a66135b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 19 Aug 2019 21:50:17 +1200
Subject: [PATCH 1019/1036] No effective change - update test clearing data

---
 src/test/java/main/StartNuoDB.java             |  2 +-
 .../m2m/TestM2MDeleteCascadeFromParent.java    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/test/java/main/StartNuoDB.java b/src/test/java/main/StartNuoDB.java
index 0bba1f98d..e6b6f240a 100644
--- a/src/test/java/main/StartNuoDB.java
+++ b/src/test/java/main/StartNuoDB.java
@@ -8,7 +8,7 @@ public class StartNuoDB {
   public static void main(String[] args) {
 
     NuoDBConfig config = new NuoDBConfig();
-    config.setSchema("unit");
+    config.setSchema("test_user");
 
     NuoDBContainer container = new NuoDBContainer(config);
     container.stopRemove();
diff --git a/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java b/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java
index 55983234b..f8e2189e3 100644
--- a/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java
+++ b/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java
@@ -1,8 +1,7 @@
 package org.tests.m2m;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
-import io.ebean.SqlQuery;
+import io.ebean.DB;
 import io.ebean.SqlRow;
 import org.junit.Test;
 import org.tests.model.m2m.MnyA;
@@ -16,6 +15,11 @@ public class TestM2MDeleteCascadeFromParent extends BaseTestCase {
   @Test
   public void test() {
 
+    DB.sqlUpdate("delete from mny_b_mny_c").execute();
+    DB.sqlUpdate("delete from mny_c").execute();
+    DB.sqlUpdate("delete from mny_b").execute();
+    DB.sqlUpdate("delete from mny_a").execute();
+
     MnyC c0 = new MnyC();
     c0.setName("c0");
     c0.save();
@@ -30,16 +34,12 @@ public class TestM2MDeleteCascadeFromParent extends BaseTestCase {
     b0.save();
 
     c0.getBs().add(b0);
-    Ebean.save(c0);
+    DB.save(c0);
 
-    SqlQuery sqlQuery = Ebean.createSqlQuery("select count(*) as count from mny_b_mny_c");
-    SqlRow unique = sqlQuery.findOne();
-    assertEquals(Long.valueOf(1), unique.getLong("count"));
+    SqlRow row = DB.sqlQuery("select count(*) as count from mny_b_mny_c").findOne();
+    assertEquals(Long.valueOf(1), row.getLong("count"));
 
-
-    //Ebean.deleteManyToManyAssociations(b0, "cs");
     a0.delete();
-
   }
 
 

From 21a3f322e1c77240f3b3125c76a2989ea6019de6 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 19 Aug 2019 23:15:27 +1200
Subject: [PATCH 1020/1036] #1798 - Fix automatic query label set on nested
 secondary query when using profileLocation

---
 src/main/java/io/ebeaninternal/api/SpiQuery.java            | 5 +++++
 .../ebeaninternal/server/loadcontext/DLoadBaseContext.java  | 4 +---
 .../io/ebeaninternal/server/querydefn/DefaultOrmQuery.java  | 6 ++++++
 .../org/tests/query/autotune/TestAutoTuneProfiling.java     | 5 +++++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/api/SpiQuery.java b/src/main/java/io/ebeaninternal/api/SpiQuery.java
index 7f3f5596f..fd8c7ce28 100644
--- a/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -289,6 +289,11 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
    */
   boolean selectAllForLazyLoadProperty();
 
+  /**
+   * Set the on a secondary query given the label, relativePath and profile location of the parent query.
+   */
+  void setProfilePath(String label, String relativePath, ProfileLocation profileLocation);
+
   /**
    * Set the query mode.
    */
diff --git a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java
index 9c06c90d7..e9a7c8d61 100644
--- a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java
+++ b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java
@@ -85,9 +85,7 @@ abstract class DLoadBaseContext {
 
     String label = parent.getPlanLabel();
     if (label != null) {
-      label += "_" + fullPath;
-      query.setLabel(label);
-      query.setProfileLocation(parent.getProfileLocation());
+      query.setProfilePath(label, fullPath, parent.getProfileLocation());
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index dfdb3708d..7e39dbb27 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -380,6 +380,12 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return null;
   }
 
+  @Override
+  public void setProfilePath(String label, String relativePath, ProfileLocation profileLocation) {
+    this.profileLocation = profileLocation;
+    this.label = ((profileLocation == null) ? label : profileLocation.label()) + "_" + relativePath;
+  }
+
   @Override
   public Query<T> setLabel(String label) {
     this.label = label;
diff --git a/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java b/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java
index e12491f64..65ccbc893 100644
--- a/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java
+++ b/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java
@@ -2,6 +2,7 @@ package org.tests.query.autotune;
 
 import io.ebean.BaseTestCase;
 import io.ebean.DB;
+import io.ebean.ProfileLocation;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.tests.model.basic.Address;
@@ -55,8 +56,12 @@ public class TestAutoTuneProfiling extends BaseTestCase {
     useLotUntuned();
   }
 
+  private static final ProfileLocation loc0 = ProfileLocation.create();
+
   private Order findById(long id) {
+
     return DB.find(Order.class)
+      .setProfileLocation(loc0)
       .select("status, orderDate, shipDate")
       .setId(id)
       .setUseCache(false)

From 722692d934761a9b870bda8aa066eff6bb748aa5 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 20 Aug 2019 10:29:31 +1200
Subject: [PATCH 1021/1036] reduce logging for testing

---
 src/test/resources/logback-test.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
index 7dec55bb6..1135a49e0 100644
--- a/src/test/resources/logback-test.xml
+++ b/src/test/resources/logback-test.xml
@@ -79,11 +79,11 @@
   <logger name="io.ebean.docker" level="TRACE"/>
 <!--  <logger name="io.ebean.DDL" level="DEBUG"/>-->
 
-  <logger name="io.ebean.SQL" level="TRACE"/>
-  <logger name="io.ebean.TXN" level="TRACE"/>
-  <logger name="io.ebean.SUM" level="TRACE"/>
+<!--  <logger name="io.ebean.SQL" level="TRACE"/> -->
+<!--  <logger name="io.ebean.TXN" level="TRACE"/> -->
+<!--  <logger name="io.ebean.SUM" level="TRACE"/> -->
 
-  <logger name="io.ebean.cache" level="TRACE"/>
+<!--  <logger name="io.ebean.cache" level="TRACE"/> -->
 <!--  <logger name="io.ebean.cache.REGION" level="TRACE"/>-->
 <!--  <logger name="io.ebean.cache.TABLEMOD" level="TRACE"/>-->
 

From ae68d41519dae706800bdfa316afb1ea283796e9 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 20 Aug 2019 22:01:04 +1200
Subject: [PATCH 1022/1036] [maven-release-plugin] prepare release
 ebean-11.43.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 99b4c480c..6f2274ac3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.43.2-SNAPSHOT</version>
+  <version>11.43.2</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -23,7 +23,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.43.2</tag>
   </scm>
 
   <profiles>

From 4a3eabbd6b8b1b6ad6803bc7e21bd0af6dfbff6c Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 20 Aug 2019 22:01:16 +1200
Subject: [PATCH 1023/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6f2274ac3..e1e931ec9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.43.2</version>
+  <version>11.43.3-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -23,7 +23,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.43.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From e08333ef26af8077bea52d350fcd3fe94c1600a9 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 20 Aug 2019 22:47:14 +1200
Subject: [PATCH 1024/1036] Improve error message when trying to use predicates
 etc when creating FetchGroup

---
 .../server/query/DefaultFetchGroupQuery.java  | 170 +++++++++---------
 1 file changed, 85 insertions(+), 85 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java b/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
index e7912546f..8ddc0e9e6 100644
--- a/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
+++ b/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
@@ -138,321 +138,321 @@ class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T> {
 
   @Override
   public Query<T> copy() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setRawSql(RawSql rawSql) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> asOf(Timestamp asOf) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> asDraft() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public <D> DtoQuery<D> asDto(Class<D> dtoClass) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public UpdateQuery<T> asUpdate() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public void cancel() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setPersistenceContextScope(PersistenceContextScope scope) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setDocIndexName(String indexName) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public ExpressionFactory getExpressionFactory() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public boolean isAutoTuned() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setAutoTune(boolean autoTune) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setAllowLoadErrors() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setLazyLoadBatchSize(int lazyLoadBatchSize) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setIncludeSoftDeletes() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setDisableReadAuditing() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> apply(FetchPath fetchPath) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> usingTransaction(Transaction transaction) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> usingConnection(Connection connection) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Nonnull
   @Override
   public <A> List<A> findIds() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Nonnull
   @Override
   public QueryIterator<T> findIterate() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public void findEach(Consumer<T> consumer) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public void findEachWhile(Predicate<T> consumer) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Nonnull
   @Override
   public List<T> findList() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Nonnull
   @Override
   public Set<T> findSet() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Nonnull
   @Override
   public <K> Map<K, T> findMap() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Nonnull
   @Override
   public <A> List<A> findSingleAttributeList() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public <A> A findSingleAttribute() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public boolean isCountDistinct() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public boolean exists() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Nullable
   @Override
   public T findOne() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Nonnull
   @Override
   public Optional<T> findOneOrEmpty() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Nonnull
   @Override
   public List<Version<T>> findVersions() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Nonnull
   @Override
   public List<Version<T>> findVersionsBetween(Timestamp start, Timestamp end) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public int delete() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public int delete(Transaction transaction) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public int update() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public int update(Transaction transaction) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public int findCount() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Nonnull
   @Override
   public FutureRowCount<T> findFutureCount() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Nonnull
   @Override
   public FutureIds<T> findFutureIds() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Nonnull
   @Override
   public FutureList<T> findFutureList() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Nonnull
   @Override
   public PagedList<T> findPagedList() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setParameter(String name, Object value) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setParameter(int position, Object value) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setId(Object id) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Object getId() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> where(Expression expression) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public ExpressionList<T> where() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public ExpressionList<T> text() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public ExpressionList<T> filterMany(String propertyName) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public ExpressionList<T> having() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> having(Expression addExpressionToHaving) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> orderBy(String orderByClause) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> order(String orderByClause) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public OrderBy<T> order() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public OrderBy<T> orderBy() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setOrder(OrderBy<T> orderBy) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setOrderBy(OrderBy<T> orderBy) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setDistinct(boolean isDistinct) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setCountDistinct(CountDistinctOrder orderBy) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
@@ -462,7 +462,7 @@ class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T> {
 
   @Override
   public Query<T> setFirstRow(int firstRow) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
@@ -472,67 +472,67 @@ class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T> {
 
   @Override
   public Query<T> setMaxRows(int maxRows) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setMapKey(String mapKey) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setBeanCacheMode(CacheMode beanCacheMode) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setUseQueryCache(CacheMode queryCacheMode) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setUseDocStore(boolean useDocStore) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setReadOnly(boolean readOnly) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setLoadBeanCache(boolean loadBeanCache) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setTimeout(int secs) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setBufferFetchSizeHint(int fetchSize) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public String getGeneratedSql() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> forUpdate() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> forUpdateNoWait() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> forUpdateSkipLocked() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
@@ -542,51 +542,51 @@ class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T> {
 
   @Override
   public ForUpdate getForUpdateMode() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> alias(String alias) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setBaseTable(String baseTable) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Class<T> getBeanType() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setInheritType(Class<? extends T> type) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Class<? extends T> getInheritType() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public QueryType getQueryType() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> setDisableLazyLoading(boolean disableLazyLoading) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Set<String> validate() {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
   @Override
   public Query<T> orderById(boolean orderById) {
-    throw new RuntimeException("Not allowed on fetch group query ");
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 }

From e734c0010ca34928faac6ff7e22440ebccb3c676 Mon Sep 17 00:00:00 2001
From: Manuel Danisch <40798549+focdanisch@users.noreply.github.com>
Date: Sun, 25 Aug 2019 01:09:32 +0200
Subject: [PATCH 1025/1036] If the map already contains the column name, add
 schema and table names before the key to make it unique again (#1800)

---
 .../server/rawsql/DRawSqlService.java         |   3 +
 .../server/rawsql/TestRawSqlService.java      | 163 ++++++++++++++++++
 2 files changed, 166 insertions(+)
 create mode 100644 src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java

diff --git a/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java b/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
index dd573111b..139c7c4fe 100644
--- a/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
+++ b/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
@@ -45,6 +45,9 @@ public class DRawSqlService implements SpiRawSqlService {
       if (name == null) {
         name = meta.getColumnName(i);
       }
+      if (ret.containsKey(name)) {
+        name = meta.getSchemaName(i) + "." + meta.getTableName(i) + "." + name;
+      }
       ret.put(name, resultSet.getObject(i));
     }
     return ret;
diff --git a/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java b/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java
new file mode 100644
index 000000000..eb7c440a4
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java
@@ -0,0 +1,163 @@
+package io.ebeaninternal.server.rawsql;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.Query;
+import io.ebean.RawSql;
+import io.ebean.RawSqlBuilder;
+import io.ebean.SqlRow;
+import io.ebeaninternal.server.rawsql.SpiRawSql.Sql;
+import org.assertj.core.api.StrictAssertions;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
+import org.tests.model.rawsql.ERawSqlAggBean;
+
+import com.mysql.cj.protocol.Resultset;
+
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.sql.CallableStatement;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+
+public class TestRawSqlService extends BaseTestCase {
+
+  @Test
+  public void testDistinctColumnNames() throws SQLException {
+
+    ResultSetMetaData rsetmeta = Mockito.mock(ResultSetMetaData.class);
+    ResultSet rset = Mockito.mock(ResultSet.class);
+
+    Mockito.when(rsetmeta.getColumnCount()).thenReturn(3);
+    Mockito.when(rset.getMetaData()).thenReturn(rsetmeta);
+    for (int i = 1; i < 4; i++) {
+      Mockito.when(rsetmeta.getColumnLabel(i)).thenReturn(null);
+      Mockito.when(rsetmeta.getColumnName(i)).thenReturn("col" + i);
+      Mockito.when(rsetmeta.getSchemaName(i)).thenReturn("schema" + i);
+      Mockito.when(rsetmeta.getTableName(i)).thenReturn("table" + i);
+
+      Mockito.when(rset.getObject(i)).thenReturn("dat1_" + i).thenReturn("dat2_" + i);
+    }
+
+    DRawSqlService service = new DRawSqlService();
+    SqlRow result = service.sqlRow(rset, "1", false);
+    
+    assertThat(result.keySet()).contains("col1", "col2", "col3");
+    for (int i = 1; i < 4; i++) {
+      assertThat(result.get("col" + i)).isEqualTo("dat1_" + i);
+    }
+
+    result = service.sqlRow(rset, "1", false);
+
+    assertThat(result.keySet()).contains("col1", "col2", "col3");
+    for (int i = 1; i < 4; i++) {
+      assertThat(result.get("col" + i)).isEqualTo("dat2_" + i);
+    }
+  }
+
+  @Test
+  public void testDistinctColumnLabels() throws SQLException {
+
+    ResultSetMetaData rsetmeta = Mockito.mock(ResultSetMetaData.class);
+    ResultSet rset = Mockito.mock(ResultSet.class);
+
+    Mockito.when(rsetmeta.getColumnCount()).thenReturn(3);
+    Mockito.when(rset.getMetaData()).thenReturn(rsetmeta);
+    for (int i = 1; i < 4; i++) {
+      Mockito.when(rsetmeta.getColumnLabel(i)).thenReturn("label" + i);
+      Mockito.when(rsetmeta.getColumnName(i)).thenReturn("col" + i);
+      Mockito.when(rsetmeta.getSchemaName(i)).thenReturn("schema" + i);
+      Mockito.when(rsetmeta.getTableName(i)).thenReturn("table" + i);
+
+      Mockito.when(rset.getObject(i)).thenReturn("dat1_" + i).thenReturn("dat2_" + i);
+    }
+
+    DRawSqlService service = new DRawSqlService();
+    SqlRow result = service.sqlRow(rset, "1", false);
+
+    assertThat(result.keySet()).contains("label1", "label2", "label3");
+    for (int i = 1; i < 4; i++) {
+      assertThat(result.get("label" + i)).isEqualTo("dat1_" + i);
+    }
+
+    result = service.sqlRow(rset, "1", false);
+
+    assertThat(result.keySet()).contains("label1", "label2", "label3");
+    for (int i = 1; i < 4; i++) {
+      assertThat(result.get("label" + i)).isEqualTo("dat2_" + i);
+    }
+  }
+
+  @Test
+  public void testIdenticalColumnNames() throws SQLException {
+
+    ResultSetMetaData rsetmeta = Mockito.mock(ResultSetMetaData.class);
+    ResultSet rset = Mockito.mock(ResultSet.class);
+
+    Mockito.when(rsetmeta.getColumnCount()).thenReturn(3);
+    Mockito.when(rset.getMetaData()).thenReturn(rsetmeta);
+    for (int i = 1; i < 4; i++) {
+      Mockito.when(rsetmeta.getColumnLabel(i)).thenReturn(null);
+      Mockito.when(rsetmeta.getColumnName(i)).thenReturn("col");
+      Mockito.when(rsetmeta.getSchemaName(i)).thenReturn("schema" + i);
+      Mockito.when(rsetmeta.getTableName(i)).thenReturn("table" + i);
+
+      Mockito.when(rset.getObject(i)).thenReturn("dat1_" + i).thenReturn("dat2_" + i);
+    }
+
+    DRawSqlService service = new DRawSqlService();
+    SqlRow result = service.sqlRow(rset, "1", false);
+
+    assertThat(result.keySet()).contains("col", "schema2.table2.col", "schema3.table3.col");
+    assertThat(result.get("col")).isEqualTo("dat1_1");
+    assertThat(result.get("schema2.table2.col")).isEqualTo("dat1_2");
+    assertThat(result.get("schema3.table3.col")).isEqualTo("dat1_3");
+
+    result = service.sqlRow(rset, "1", false);
+
+    assertThat(result.keySet()).contains("col", "schema2.table2.col", "schema3.table3.col");
+    assertThat(result.get("col")).isEqualTo("dat2_1");
+    assertThat(result.get("schema2.table2.col")).isEqualTo("dat2_2");
+    assertThat(result.get("schema3.table3.col")).isEqualTo("dat2_3");
+  }
+
+  @Test
+  public void testIdenticalColumnLabels() throws SQLException {
+
+    ResultSetMetaData rsetmeta = Mockito.mock(ResultSetMetaData.class);
+    ResultSet rset = Mockito.mock(ResultSet.class);
+
+    Mockito.when(rsetmeta.getColumnCount()).thenReturn(3);
+    Mockito.when(rset.getMetaData()).thenReturn(rsetmeta);
+    for (int i = 1; i < 4; i++) {
+      Mockito.when(rsetmeta.getColumnLabel(i)).thenReturn("label");
+      Mockito.when(rsetmeta.getColumnName(i)).thenReturn("col");
+      Mockito.when(rsetmeta.getSchemaName(i)).thenReturn("schema" + i);
+      Mockito.when(rsetmeta.getTableName(i)).thenReturn("table" + i);
+
+      Mockito.when(rset.getObject(i)).thenReturn("dat1_" + i).thenReturn("dat2_" + i);
+    }
+
+    DRawSqlService service = new DRawSqlService();
+    SqlRow result = service.sqlRow(rset, "1", false);
+
+    assertThat(result.keySet()).contains("label", "schema2.table2.label", "schema3.table3.label");
+    assertThat(result.get("label")).isEqualTo("dat1_1");
+    assertThat(result.get("schema2.table2.label")).isEqualTo("dat1_2");
+    assertThat(result.get("schema3.table3.label")).isEqualTo("dat1_3");
+
+    result = service.sqlRow(rset, "1", false);
+
+    assertThat(result.keySet()).contains("label", "schema2.table2.label", "schema3.table3.label");
+    assertThat(result.get("label")).isEqualTo("dat2_1");
+    assertThat(result.get("schema2.table2.label")).isEqualTo("dat2_2");
+    assertThat(result.get("schema3.table3.label")).isEqualTo("dat2_3");
+  }
+
+}

From 0b8613fd4ca26d25b10c44cf94d2ceff3d1bd9df Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 25 Aug 2019 11:16:07 +1200
Subject: [PATCH 1026/1036] #1800 - Additional test exercising
 RawSqlBuilder.sqlRow(resultSet, ...);

---
 .../server/rawsql/TestRawSqlBuilder.java      | 56 +++++++++++++++++--
 1 file changed, 51 insertions(+), 5 deletions(-)

diff --git a/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java b/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java
index f8f0bd0f0..0b8fae135 100644
--- a/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java
+++ b/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java
@@ -1,16 +1,26 @@
 package io.ebeaninternal.server.rawsql;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.Query;
 import io.ebean.RawSql;
 import io.ebean.RawSqlBuilder;
+import io.ebean.SqlRow;
+import io.ebean.annotation.ForPlatform;
+import io.ebean.annotation.Platform;
 import io.ebeaninternal.server.rawsql.SpiRawSql.Sql;
 import org.assertj.core.api.StrictAssertions;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
 import org.tests.model.rawsql.ERawSqlAggBean;
-import org.junit.Test;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
@@ -30,7 +40,7 @@ public class TestRawSqlBuilder extends BaseTestCase {
 
   private Sql getSql(String sqlStatement) {
     RawSql r = RawSqlBuilder.parse(sqlStatement).create();
-    return ((SpiRawSql)r).getSql();
+    return ((SpiRawSql) r).getSql();
   }
 
   @Test
@@ -159,7 +169,7 @@ public class TestRawSqlBuilder extends BaseTestCase {
       "order by o.id, d.id asc";
 
 
-    SpiRawSql rawSql = (SpiRawSql)RawSqlBuilder.parse(rs)
+    SpiRawSql rawSql = (SpiRawSql) RawSqlBuilder.parse(rs)
       .tableAliasMapping("c", "customer")
       .tableAliasMapping("d", "details")
       .tableAliasMapping("p", "details.product")
@@ -189,7 +199,7 @@ public class TestRawSqlBuilder extends BaseTestCase {
 
     RawSqlBuilder builder = RawSqlBuilder.parse(rs);
 
-    SpiRawSql rawSql = (SpiRawSql)builder.create();
+    SpiRawSql rawSql = (SpiRawSql) builder.create();
     SpiRawSql.ColumnMapping columnMapping = rawSql.getColumnMapping();
 
     assertEquals(0, columnMapping.getIndexPosition("id"));
@@ -216,7 +226,7 @@ public class TestRawSqlBuilder extends BaseTestCase {
       " from o_order d" +
       " group by DATE_TRUNC('DAY', d.order_date)";
 
-    SpiRawSql rawSql = (SpiRawSql)RawSqlBuilder.parse(sql).create();
+    SpiRawSql rawSql = (SpiRawSql) RawSqlBuilder.parse(sql).create();
 
     SpiRawSql.ColumnMapping columnMapping = rawSql.getColumnMapping();
 
@@ -238,4 +248,40 @@ public class TestRawSqlBuilder extends BaseTestCase {
 
   }
 
+  @ForPlatform(Platform.H2)
+  @Test
+  public void findDuplicateColumnName() throws SQLException {
+
+    ResetBasicData.reset();
+
+    String sql = "select o.id, c.id, c.name " +
+      "from o_order o " +
+      "join o_customer c on o.kcustomer_id = c.id " +
+      "where c.id = ? and o.id > ?";
+
+    final DataSource dataSource = DB.getDefault().getPluginApi().getDataSource();
+
+    try (Connection connection = dataSource.getConnection()) {
+      try (PreparedStatement stmt = connection.prepareStatement(sql)) {
+        stmt.setLong(1, 1L);
+        stmt.setLong(2, 1L);
+
+        try (ResultSet resultSet = stmt.executeQuery()) {
+          while (resultSet.next()) {
+
+            final SqlRow row = RawSqlBuilder.sqlRow(resultSet, "true", false);
+
+            final Integer orderId = row.getInteger("id");
+            final Integer custId = row.getInteger("public.o_customer.id");
+            final String name = row.getString("name");
+
+            assertThat(orderId).isNotEqualTo(1);
+            assertThat(custId).isEqualTo(1);
+            assertThat(name).isNotNull();
+          }
+        }
+      }
+    }
+  }
+
 }

From 85a0354d423841e743f6a808774f0204ec9683fc Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 25 Aug 2019 11:19:07 +1200
Subject: [PATCH 1027/1036] #1800 No effective change, test only, static
 imports and organise imports

---
 .../server/rawsql/TestRawSqlService.java      | 96 ++++++++-----------
 1 file changed, 41 insertions(+), 55 deletions(-)

diff --git a/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java b/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java
index eb7c440a4..699e33ac7 100644
--- a/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java
+++ b/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java
@@ -1,53 +1,39 @@
 package io.ebeaninternal.server.rawsql;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
-import io.ebean.Query;
-import io.ebean.RawSql;
-import io.ebean.RawSqlBuilder;
 import io.ebean.SqlRow;
-import io.ebeaninternal.server.rawsql.SpiRawSql.Sql;
-import org.assertj.core.api.StrictAssertions;
-import org.tests.model.basic.Customer;
-import org.tests.model.basic.ResetBasicData;
-import org.tests.model.rawsql.ERawSqlAggBean;
-
-import com.mysql.cj.protocol.Resultset;
-
 import org.junit.Test;
-import org.mockito.Mockito;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import java.sql.CallableStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 public class TestRawSqlService extends BaseTestCase {
 
   @Test
   public void testDistinctColumnNames() throws SQLException {
 
-    ResultSetMetaData rsetmeta = Mockito.mock(ResultSetMetaData.class);
-    ResultSet rset = Mockito.mock(ResultSet.class);
+    ResultSetMetaData rsetmeta = mock(ResultSetMetaData.class);
+    ResultSet rset = mock(ResultSet.class);
 
-    Mockito.when(rsetmeta.getColumnCount()).thenReturn(3);
-    Mockito.when(rset.getMetaData()).thenReturn(rsetmeta);
+    when(rsetmeta.getColumnCount()).thenReturn(3);
+    when(rset.getMetaData()).thenReturn(rsetmeta);
     for (int i = 1; i < 4; i++) {
-      Mockito.when(rsetmeta.getColumnLabel(i)).thenReturn(null);
-      Mockito.when(rsetmeta.getColumnName(i)).thenReturn("col" + i);
-      Mockito.when(rsetmeta.getSchemaName(i)).thenReturn("schema" + i);
-      Mockito.when(rsetmeta.getTableName(i)).thenReturn("table" + i);
+      when(rsetmeta.getColumnLabel(i)).thenReturn(null);
+      when(rsetmeta.getColumnName(i)).thenReturn("col" + i);
+      when(rsetmeta.getSchemaName(i)).thenReturn("schema" + i);
+      when(rsetmeta.getTableName(i)).thenReturn("table" + i);
 
-      Mockito.when(rset.getObject(i)).thenReturn("dat1_" + i).thenReturn("dat2_" + i);
+      when(rset.getObject(i)).thenReturn("dat1_" + i).thenReturn("dat2_" + i);
     }
 
     DRawSqlService service = new DRawSqlService();
     SqlRow result = service.sqlRow(rset, "1", false);
-    
+
     assertThat(result.keySet()).contains("col1", "col2", "col3");
     for (int i = 1; i < 4; i++) {
       assertThat(result.get("col" + i)).isEqualTo("dat1_" + i);
@@ -64,18 +50,18 @@ public class TestRawSqlService extends BaseTestCase {
   @Test
   public void testDistinctColumnLabels() throws SQLException {
 
-    ResultSetMetaData rsetmeta = Mockito.mock(ResultSetMetaData.class);
-    ResultSet rset = Mockito.mock(ResultSet.class);
+    ResultSetMetaData rsetmeta = mock(ResultSetMetaData.class);
+    ResultSet rset = mock(ResultSet.class);
 
-    Mockito.when(rsetmeta.getColumnCount()).thenReturn(3);
-    Mockito.when(rset.getMetaData()).thenReturn(rsetmeta);
+    when(rsetmeta.getColumnCount()).thenReturn(3);
+    when(rset.getMetaData()).thenReturn(rsetmeta);
     for (int i = 1; i < 4; i++) {
-      Mockito.when(rsetmeta.getColumnLabel(i)).thenReturn("label" + i);
-      Mockito.when(rsetmeta.getColumnName(i)).thenReturn("col" + i);
-      Mockito.when(rsetmeta.getSchemaName(i)).thenReturn("schema" + i);
-      Mockito.when(rsetmeta.getTableName(i)).thenReturn("table" + i);
+      when(rsetmeta.getColumnLabel(i)).thenReturn("label" + i);
+      when(rsetmeta.getColumnName(i)).thenReturn("col" + i);
+      when(rsetmeta.getSchemaName(i)).thenReturn("schema" + i);
+      when(rsetmeta.getTableName(i)).thenReturn("table" + i);
 
-      Mockito.when(rset.getObject(i)).thenReturn("dat1_" + i).thenReturn("dat2_" + i);
+      when(rset.getObject(i)).thenReturn("dat1_" + i).thenReturn("dat2_" + i);
     }
 
     DRawSqlService service = new DRawSqlService();
@@ -97,18 +83,18 @@ public class TestRawSqlService extends BaseTestCase {
   @Test
   public void testIdenticalColumnNames() throws SQLException {
 
-    ResultSetMetaData rsetmeta = Mockito.mock(ResultSetMetaData.class);
-    ResultSet rset = Mockito.mock(ResultSet.class);
+    ResultSetMetaData rsetmeta = mock(ResultSetMetaData.class);
+    ResultSet rset = mock(ResultSet.class);
 
-    Mockito.when(rsetmeta.getColumnCount()).thenReturn(3);
-    Mockito.when(rset.getMetaData()).thenReturn(rsetmeta);
+    when(rsetmeta.getColumnCount()).thenReturn(3);
+    when(rset.getMetaData()).thenReturn(rsetmeta);
     for (int i = 1; i < 4; i++) {
-      Mockito.when(rsetmeta.getColumnLabel(i)).thenReturn(null);
-      Mockito.when(rsetmeta.getColumnName(i)).thenReturn("col");
-      Mockito.when(rsetmeta.getSchemaName(i)).thenReturn("schema" + i);
-      Mockito.when(rsetmeta.getTableName(i)).thenReturn("table" + i);
+      when(rsetmeta.getColumnLabel(i)).thenReturn(null);
+      when(rsetmeta.getColumnName(i)).thenReturn("col");
+      when(rsetmeta.getSchemaName(i)).thenReturn("schema" + i);
+      when(rsetmeta.getTableName(i)).thenReturn("table" + i);
 
-      Mockito.when(rset.getObject(i)).thenReturn("dat1_" + i).thenReturn("dat2_" + i);
+      when(rset.getObject(i)).thenReturn("dat1_" + i).thenReturn("dat2_" + i);
     }
 
     DRawSqlService service = new DRawSqlService();
@@ -130,18 +116,18 @@ public class TestRawSqlService extends BaseTestCase {
   @Test
   public void testIdenticalColumnLabels() throws SQLException {
 
-    ResultSetMetaData rsetmeta = Mockito.mock(ResultSetMetaData.class);
-    ResultSet rset = Mockito.mock(ResultSet.class);
+    ResultSetMetaData rsetmeta = mock(ResultSetMetaData.class);
+    ResultSet rset = mock(ResultSet.class);
 
-    Mockito.when(rsetmeta.getColumnCount()).thenReturn(3);
-    Mockito.when(rset.getMetaData()).thenReturn(rsetmeta);
+    when(rsetmeta.getColumnCount()).thenReturn(3);
+    when(rset.getMetaData()).thenReturn(rsetmeta);
     for (int i = 1; i < 4; i++) {
-      Mockito.when(rsetmeta.getColumnLabel(i)).thenReturn("label");
-      Mockito.when(rsetmeta.getColumnName(i)).thenReturn("col");
-      Mockito.when(rsetmeta.getSchemaName(i)).thenReturn("schema" + i);
-      Mockito.when(rsetmeta.getTableName(i)).thenReturn("table" + i);
+      when(rsetmeta.getColumnLabel(i)).thenReturn("label");
+      when(rsetmeta.getColumnName(i)).thenReturn("col");
+      when(rsetmeta.getSchemaName(i)).thenReturn("schema" + i);
+      when(rsetmeta.getTableName(i)).thenReturn("table" + i);
 
-      Mockito.when(rset.getObject(i)).thenReturn("dat1_" + i).thenReturn("dat2_" + i);
+      when(rset.getObject(i)).thenReturn("dat1_" + i).thenReturn("dat2_" + i);
     }
 
     DRawSqlService service = new DRawSqlService();

From be668722495630c89a3eb9472c45eddb5b216d5a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 25 Aug 2019 11:32:08 +1200
Subject: [PATCH 1028/1036] #1800 Adjust to allow for null schema and table
 names

---
 .../server/rawsql/DRawSqlService.java         | 17 ++++++++++++++++-
 .../server/rawsql/DRawSqlServiceTest.java     | 19 +++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java

diff --git a/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java b/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
index 139c7c4fe..0b5eb4ad6 100644
--- a/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
+++ b/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
@@ -46,10 +46,25 @@ public class DRawSqlService implements SpiRawSqlService {
         name = meta.getColumnName(i);
       }
       if (ret.containsKey(name)) {
-        name = meta.getSchemaName(i) + "." + meta.getTableName(i) + "." + name;
+        name = combine(meta.getSchemaName(i), meta.getTableName(i), name);
       }
       ret.put(name, resultSet.getObject(i));
     }
     return ret;
   }
+
+  /**
+   * Combine schema table and column names allowing for null schema and table.
+   */
+  String combine(String schemaName, String tableName, String name) {
+
+    StringBuilder sb = new StringBuilder();
+    if (schemaName != null) {
+      sb.append(schemaName).append(".");
+    }
+    if (tableName != null) {
+      sb.append(tableName).append(".");
+    }
+    return sb.append(name).toString();
+  }
 }
diff --git a/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java b/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java
new file mode 100644
index 000000000..58391ece3
--- /dev/null
+++ b/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java
@@ -0,0 +1,19 @@
+package io.ebeaninternal.server.rawsql;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class DRawSqlServiceTest {
+
+  private final DRawSqlService dRawSqlService = new DRawSqlService();
+
+  @Test
+  public void combine() {
+
+    assertEquals("mycol", dRawSqlService.combine(null, null, "mycol"));
+    assertEquals("mytable.mycol", dRawSqlService.combine(null, "mytable", "mycol"));
+    assertEquals("myschema.mytable.mycol", dRawSqlService.combine("myschema", "mytable", "mycol"));
+    assertEquals("myschema.mycol", dRawSqlService.combine("myschema", null, "mycol"));
+  }
+}

From 0e65efea57ae2bb8b5786563572cee474f7e297d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 25 Aug 2019 15:58:46 +1200
Subject: [PATCH 1029/1036] #1804 - Kotlin: Generating collection with wildcard
 type - Get error BeanNotRegisteredException: Error with association to [null]
 from [...Foo.manyProperty]. Is null registered?

---
 .../deploy/parse/DeployCreateProperties.java  |  9 ++-
 src/test/java/org/tests/o2m/OmBasicChild.java | 50 ++++++++++++++++
 .../java/org/tests/o2m/OmBasicParent.java     | 60 +++++++++++++++++++
 .../org/tests/o2m/TestOneToManyWildcard.java  | 35 +++++++++++
 4 files changed, 153 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/org/tests/o2m/OmBasicChild.java
 create mode 100644 src/test/java/org/tests/o2m/OmBasicParent.java
 create mode 100644 src/test/java/org/tests/o2m/TestOneToManyWildcard.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
index 2ecb5ecd6..b32320ad7 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
@@ -313,10 +313,17 @@ public class DeployCreateProperties {
 
       Type[] typeArgs = ptype.getActualTypeArguments();
       if (typeArgs.length == 1) {
-        // probably a Set or List
+        // expecting set or list
         if (typeArgs[0] instanceof Class<?>) {
           return (Class<?>) typeArgs[0];
         }
+        if (typeArgs[0] instanceof WildcardType) {
+          final Type[] upperBounds = ((WildcardType) typeArgs[0]).getUpperBounds();
+          if (upperBounds.length == 1 && upperBounds[0] instanceof Class<?>) {
+            // kotlin generated wildcard type
+            return (Class<?>) upperBounds[0];
+          }
+        }
         // throw new RuntimeException("Unexpected Parameterised Type? "+typeArgs[0]);
         return null;
       }
diff --git a/src/test/java/org/tests/o2m/OmBasicChild.java b/src/test/java/org/tests/o2m/OmBasicChild.java
new file mode 100644
index 000000000..b94ca0a66
--- /dev/null
+++ b/src/test/java/org/tests/o2m/OmBasicChild.java
@@ -0,0 +1,50 @@
+package org.tests.o2m;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Version;
+
+@Entity
+public class OmBasicChild {
+
+  @Id
+  private long id;
+
+  private final String name;
+
+  @ManyToOne
+  private final OmBasicParent parent;
+
+  @Version
+  private long version;
+
+  public OmBasicChild(String name, OmBasicParent parent) {
+    this.name = name;
+    this.parent = parent;
+  }
+
+  public long getId() {
+    return id;
+  }
+
+  public void setId(long id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public OmBasicParent getParent() {
+    return parent;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/src/test/java/org/tests/o2m/OmBasicParent.java b/src/test/java/org/tests/o2m/OmBasicParent.java
new file mode 100644
index 000000000..76faeca0e
--- /dev/null
+++ b/src/test/java/org/tests/o2m/OmBasicParent.java
@@ -0,0 +1,60 @@
+package org.tests.o2m;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Version;
+import java.util.List;
+
+import static javax.persistence.CascadeType.ALL;
+
+@Entity
+public class OmBasicParent {
+
+  @Id
+  private long id;
+
+  private final String name;
+
+  @Version
+  private long version;
+
+  /**
+   * Not really sensible Java code here but Kotlin can generate
+   * a collection type that looks like this
+   */
+  @OneToMany(cascade = ALL, mappedBy = "parent")
+  private List<? extends OmBasicChild> children;
+
+  public OmBasicParent(String name) {
+    this.name = name;
+  }
+
+  public long getId() {
+    return id;
+  }
+
+  public void setId(long id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+
+  public List<? extends OmBasicChild> getChildren() {
+    return children;
+  }
+
+  public void setChildren(List<? extends OmBasicChild> children) {
+    this.children = children;
+  }
+}
diff --git a/src/test/java/org/tests/o2m/TestOneToManyWildcard.java b/src/test/java/org/tests/o2m/TestOneToManyWildcard.java
new file mode 100644
index 000000000..2cf5561c8
--- /dev/null
+++ b/src/test/java/org/tests/o2m/TestOneToManyWildcard.java
@@ -0,0 +1,35 @@
+package org.tests.o2m;
+
+import io.ebean.DB;
+import org.junit.Test;
+
+import java.util.Arrays;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestOneToManyWildcard {
+
+  @Test
+  public void test() {
+
+    OmBasicParent parent = new OmBasicParent("p1");
+    OmBasicChild c1 = new OmBasicChild("c1", parent);
+    OmBasicChild c2 = new OmBasicChild("c2", parent);
+
+    DB.save(parent);
+    DB.saveAll(Arrays.asList(c1, c2));
+
+    // we can't add to this in Java but Kotlin can
+    //parent.getChildren().add(c1);
+
+    // exercise
+    final OmBasicParent found = DB.find(OmBasicParent.class)
+      .where().idEq(parent.getId())
+      .findOne();
+
+    assertThat(found).isNotNull();
+    assertThat(found.getChildren()).hasSize(2);
+
+    DB.delete(parent);
+  }
+}

From 589191f3f4b27373459d80bbb289271f2711769d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 25 Aug 2019 17:02:47 +1200
Subject: [PATCH 1030/1036] [maven-release-plugin] prepare release
 ebean-11.43.3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e1e931ec9..82d4b4de7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.43.3-SNAPSHOT</version>
+  <version>11.43.3</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -23,7 +23,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.43.3</tag>
   </scm>
 
   <profiles>

From 533be356f276e3048a322c1ad9aabfe44e820e1d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 25 Aug 2019 17:02:57 +1200
Subject: [PATCH 1031/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 82d4b4de7..ea82cf306 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.43.3</version>
+  <version>11.43.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -23,7 +23,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.43.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>

From 81c2c804a60d1dc77d33e5293b91880492ee5e9f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 26 Aug 2019 21:12:07 +1200
Subject: [PATCH 1032/1036] #1806 - SQLException:Data conversion error
 converting "c5866ffb-2e1c-457e-bdad-61ba4466f86e" [22018-197] Bind values:[1,
 ] Query was:

---
 .../server/deploy/AssocOneHelpRefInherit.java |  4 +-
 .../model/carwheeltruck/TTruckHolder.java     | 85 +++++++++++++++++++
 .../model/carwheeltruck/TTruckHolderItem.java | 49 +++++++++++
 .../TestMTOInheritNoDiscriminator.java        | 54 ++++++++++++
 4 files changed, 191 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java
 create mode 100644 src/test/java/org/tests/model/carwheeltruck/TTruckHolderItem.java
 create mode 100644 src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java

diff --git a/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java
index 563a36cce..319dc89f0 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java
@@ -21,7 +21,9 @@ class AssocOneHelpRefInherit extends AssocOneHelp {
   @Override
   void loadIgnore(DbReadContext ctx) {
     property.targetIdBinder.loadIgnore(ctx);
-    ctx.getDataReader().incrementPos(1);
+    if (inherit.hasChildren()) {
+      ctx.getDataReader().incrementPos(1);
+    }
   }
 
   /**
diff --git a/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java b/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java
new file mode 100644
index 000000000..74f9e8248
--- /dev/null
+++ b/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java
@@ -0,0 +1,85 @@
+package org.tests.model.carwheeltruck;
+
+import org.tests.model.basic.EBasic;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Version;
+import java.util.List;
+
+import static javax.persistence.CascadeType.ALL;
+
+@Entity
+public class TTruckHolder {
+
+  @Id
+  private long id;
+
+  @Version
+  private long version;
+
+  private final String name;
+
+  /**
+   * Inheritance but at BOTTOM layer (so no discriminator needed).
+   */
+  @ManyToOne(optional = false)
+  private TTruck truck;
+
+  @ManyToOne
+  private EBasic basic;
+
+  @OneToMany(cascade = ALL, mappedBy = "owner")
+  private List<TTruckHolderItem> items;
+
+  public TTruckHolder(String name, TTruck truck) {
+    this.name = name;
+    this.truck = truck;
+  }
+
+  public long getId() {
+    return id;
+  }
+
+  public void setId(long id) {
+    this.id = id;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public TTruck getTruck() {
+    return truck;
+  }
+
+  public void setTruck(TTruck truck) {
+    this.truck = truck;
+  }
+
+  public EBasic getBasic() {
+    return basic;
+  }
+
+  public void setBasic(EBasic basic) {
+    this.basic = basic;
+  }
+
+  public List<TTruckHolderItem> getItems() {
+    return items;
+  }
+
+  public void setItems(List<TTruckHolderItem> items) {
+    this.items = items;
+  }
+}
diff --git a/src/test/java/org/tests/model/carwheeltruck/TTruckHolderItem.java b/src/test/java/org/tests/model/carwheeltruck/TTruckHolderItem.java
new file mode 100644
index 000000000..1498b263a
--- /dev/null
+++ b/src/test/java/org/tests/model/carwheeltruck/TTruckHolderItem.java
@@ -0,0 +1,49 @@
+package org.tests.model.carwheeltruck;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import java.util.UUID;
+
+@Entity
+public class TTruckHolderItem {
+
+  @Id
+  private Long id;
+
+  private final UUID someUid;
+
+  private final String foo;
+
+  @ManyToOne(optional = false)
+  private TTruckHolder owner;
+
+  public TTruckHolderItem(String foo) {
+    this.someUid = UUID.randomUUID();
+    this.foo = foo;
+  }
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public UUID getSomeUid() {
+    return someUid;
+  }
+
+  public String getFoo() {
+    return foo;
+  }
+
+  public TTruckHolder getOwner() {
+    return owner;
+  }
+
+  public void setOwner(TTruckHolder owner) {
+    this.owner = owner;
+  }
+}
diff --git a/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java b/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java
new file mode 100644
index 000000000..f353b2e34
--- /dev/null
+++ b/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java
@@ -0,0 +1,54 @@
+package org.tests.model.carwheeltruck;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestMTOInheritNoDiscriminator extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    final TTruckHolder holder = setup();
+
+    LoggedSqlCollector.start();
+
+    final TTruckHolder found = DB.find(TTruckHolder.class)
+      .fetch("items")
+      .where().idEq(holder.getId())
+      .findOne();
+
+    assertThat(found).isNotNull();
+    assertThat(found.getItems()).hasSize(2);
+    assertThat(found.getItems()).extracting(TTruckHolderItem::getFoo).contains("a","b");
+
+
+    final List<String> sql = LoggedSqlCollector.stop();
+
+    assertThat(sql).hasSize(1);
+    if (isH2() || isPostgres()) {
+      assertThat(sql.get(0)).contains(" and t2.type = 'truck' ");
+    }
+  }
+
+  private TTruckHolder setup() {
+    TTruck truck = new TTruck();
+    truck.setPlateNo("J78");
+    truck.setLoad(43L);
+
+    DB.save(truck);
+
+    TTruckHolder holder = new TTruckHolder("h1", truck);
+    holder.getItems().add(new TTruckHolderItem("a"));
+    holder.getItems().add(new TTruckHolderItem("b"));
+
+    DB.save(holder);
+
+    return holder;
+  }
+}

From 730d43c008d9619f6e70603c21ff5ecd8ee90cce Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 30 Aug 2019 23:43:00 +1200
Subject: [PATCH 1033/1036] #1807 - ENH: Add SerializableConflictException

---
 .../ebean/SerializableConflictException.java   | 18 ++++++++++++++++++
 .../ebean/config/dbplatform/DataErrorType.java |  7 ++++++-
 .../config/dbplatform/SqlCodeTranslator.java   |  7 +++++--
 .../ebean/config/dbplatform/SqlErrorCodes.java |  9 ++++++++-
 .../config/dbplatform/nuodb/NuoDbPlatform.java |  1 +
 .../dbplatform/oracle/OraclePlatform.java      |  1 +
 .../dbplatform/postgres/PostgresPlatform.java  |  1 +
 7 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/io/ebean/SerializableConflictException.java

diff --git a/src/main/java/io/ebean/SerializableConflictException.java b/src/main/java/io/ebean/SerializableConflictException.java
new file mode 100644
index 000000000..a1ee9fee4
--- /dev/null
+++ b/src/main/java/io/ebean/SerializableConflictException.java
@@ -0,0 +1,18 @@
+package io.ebean;
+
+import javax.persistence.OptimisticLockException;
+
+/**
+ * Thrown at SERIALIZABLE isolation level for non-recoverable concurrent conflict.
+ */
+public class SerializableConflictException extends OptimisticLockException {
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * Create with a message and cause.
+   */
+  public SerializableConflictException(String message, Throwable cause) {
+    super(message, cause);
+  }
+}
diff --git a/src/main/java/io/ebean/config/dbplatform/DataErrorType.java b/src/main/java/io/ebean/config/dbplatform/DataErrorType.java
index dd42c9e8c..808730f34 100644
--- a/src/main/java/io/ebean/config/dbplatform/DataErrorType.java
+++ b/src/main/java/io/ebean/config/dbplatform/DataErrorType.java
@@ -18,5 +18,10 @@ public enum DataErrorType {
   /**
    * Data integrity error like an invalid foreign key.
    */
-  DataIntegrity
+  DataIntegrity,
+
+  /**
+   * Non recoverable concurrency conflict.
+   */
+  SerializableConflict
 }
diff --git a/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java b/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java
index 71d56c7a1..90ef29de6 100644
--- a/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java
+++ b/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java
@@ -3,6 +3,7 @@ package io.ebean.config.dbplatform;
 import io.ebean.AcquireLockException;
 import io.ebean.DataIntegrityException;
 import io.ebean.DuplicateKeyException;
+import io.ebean.SerializableConflictException;
 
 import javax.persistence.PersistenceException;
 import java.sql.SQLException;
@@ -14,12 +15,12 @@ import java.util.Map;
  */
 public class SqlCodeTranslator implements SqlExceptionTranslator {
 
-  private final Map<String,DataErrorType> map;
+  private final Map<String, DataErrorType> map;
 
   /**
    * Create given the map of SQLState codes to error types.
    */
-  public SqlCodeTranslator(Map<String,DataErrorType> map) {
+  public SqlCodeTranslator(Map<String, DataErrorType> map) {
     this.map = map;
   }
 
@@ -46,6 +47,8 @@ public class SqlCodeTranslator implements SqlExceptionTranslator {
           return new DuplicateKeyException(message, e);
         case DataIntegrity:
           return new DataIntegrityException(message, e);
+        case SerializableConflict:
+          return new SerializableConflictException(message, e);
       }
     }
     // return a generic exception
diff --git a/src/main/java/io/ebean/config/dbplatform/SqlErrorCodes.java b/src/main/java/io/ebean/config/dbplatform/SqlErrorCodes.java
index a30020a08..6c06d4d96 100644
--- a/src/main/java/io/ebean/config/dbplatform/SqlErrorCodes.java
+++ b/src/main/java/io/ebean/config/dbplatform/SqlErrorCodes.java
@@ -8,7 +8,7 @@ import java.util.Map;
  */
 public class SqlErrorCodes {
 
-  private final Map<String,DataErrorType> map = new HashMap<>();
+  private final Map<String, DataErrorType> map = new HashMap<>();
 
   /**
    * Map the codes to AcquireLockException.
@@ -31,6 +31,13 @@ public class SqlErrorCodes {
     return add(DataErrorType.DuplicateKey, codes);
   }
 
+  /**
+   * Map the codes to SerializableConflictException.
+   */
+  public SqlErrorCodes addSerializableConflict(String... codes) {
+    return add(DataErrorType.SerializableConflict, codes);
+  }
+
   private SqlErrorCodes add(DataErrorType type, String... codes) {
     for (String code : codes) {
       map.put(code, type);
diff --git a/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbPlatform.java b/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbPlatform.java
index f58cedb54..fb4a264a8 100644
--- a/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbPlatform.java
@@ -37,6 +37,7 @@ public class NuoDbPlatform extends DatabasePlatform {
       new SqlErrorCodes()
         //.addAcquireLock("")
         .addDuplicateKey("23000")
+        .addSerializableConflict("40002")
         .build();
 
     dbTypeMap.put(DbType.INTEGER, new DbPlatformType("integer", false));
diff --git a/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java b/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java
index 5ba237428..1112688ce 100644
--- a/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java
@@ -48,6 +48,7 @@ public class OraclePlatform extends DatabasePlatform {
         //.addAcquireLock("")
         .addDuplicateKey("1")
         .addDataIntegrity("2291")
+        .addSerializableConflict("72000")
         .build();
 
     this.openQuote = "\"";
diff --git a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
index f7a4f63d9..b280d1a61 100644
--- a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
+++ b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java
@@ -52,6 +52,7 @@ public class PostgresPlatform extends DatabasePlatform {
         .addAcquireLock("55P03")
         .addDuplicateKey("23505")
         .addDataIntegrity("23000","23502","23503","23514")
+        .addSerializableConflict("40001")
         .build();
 
     this.openQuote = "\"";

From df51ccd2c454ebaf9d7cd22db9611c35e970002f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 31 Aug 2019 00:15:03 +1200
Subject: [PATCH 1034/1036] Bump to 11.44.1-SNAPSHOT

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ea82cf306..4b2e38f36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.43.4-SNAPSHOT</version>
+  <version>11.44.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -330,7 +330,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>11.43.2</version>
+        <version>11.44.1</version>
         <executions>
           <execution>
             <id>test</id>

From 46f3b74b384fb326a0e1ad77b9cae750d5caf369 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 31 Aug 2019 00:16:37 +1200
Subject: [PATCH 1035/1036] [maven-release-plugin] prepare release
 ebean-11.44.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4b2e38f36..f555a4053 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.44.1-SNAPSHOT</version>
+  <version>11.44.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -23,7 +23,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-11.44.1</tag>
   </scm>
 
   <profiles>

From 8ae2ae7f8bc2ce3e423660ff81a46c9ac7e56adc Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 31 Aug 2019 00:16:48 +1200
Subject: [PATCH 1036/1036] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f555a4053..2b1fc0bc7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.44.1</version>
+  <version>11.44.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -23,7 +23,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.44.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <profiles>